From 27046fcc14239d36604790c993a90394361ec873 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 21 Nov 2022 13:48:23 +0000
Subject: SL-18629 - moving createNewCategory to AIS3

---
 indra/llmessage/message.cpp        | 1 +
 indra/newview/llappearancemgr.cpp  | 7 +++++--
 indra/newview/llinventorymodel.cpp | 9 +++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 19146c64f4..31acc65642 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -3402,6 +3402,7 @@ typedef std::map<const char*, LLMessageBuilder*> BuilderMap;
 
 void LLMessageSystem::newMessageFast(const char *name)
 {
+	//LL_DEBUGS("Messaging") << "creating new message: " << name << LL_ENDL;
 	LLMessageConfig::Flavor message_flavor =
 		LLMessageConfig::getMessageFlavor(name);
 	LLMessageConfig::Flavor server_flavor =
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 909f32cd21..ab7adeeedc 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1701,6 +1701,7 @@ void LLAppearanceMgr::shallowCopyCategory(const LLUUID& src_id, const LLUUID& ds
 	{
 		parent_id = gInventory.getRootFolderID();
 	}
+	// USES UDP PATH
 	LLUUID subfolder_id = gInventory.createNewCategory( parent_id,
 														LLFolderType::FT_NONE,
 														src_cat->getName());
@@ -2725,7 +2726,8 @@ void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool ap
 		{
 			pid = gInventory.getRootFolderID();
 		}
-		
+
+		// UDP PATH
 		LLUUID new_cat_id = gInventory.createNewCategory(
 			pid,
 			LLFolderType::FT_NONE,
@@ -3994,7 +3996,8 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 			func);
 	}
 	else
-	{		
+	{
+		// UDP PATH
 		LLUUID folder_id = gInventory.createNewCategory(
 			parent_id,
 			LLFolderType::FT_OUTFIT,
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index fab7ae8f1a..36797a3f28 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -664,24 +664,25 @@ const LLUUID LLInventoryModel::findLibraryCategoryUUIDForType(LLFolderType::ETyp
 // updateCategory() with a newly generated UUID category, but this
 // version will take care of details like what the name should be
 // based on preferred type. Returns the UUID of the new category.
+//
+// On failure, returns a null UUID.
+// FIXME: callers do not check for or handle a null results currently.
 LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 										   LLFolderType::EType preferred_type,
 										   const std::string& pname,
 										   inventory_func_type callback)
 {
-	LLUUID id;
+	LLUUID id; // Initially null.
 	if (!isInventoryUsable())
 	{
 		LL_WARNS(LOG_INV) << "Inventory is not usable; can't create requested category of type "
 						  << preferred_type << LL_ENDL;
-		// FIXME failing but still returning an id?
 		return id;
 	}
 
 	if(LLFolderType::lookup(preferred_type) == LLFolderType::badLookup())
 	{
 		LL_DEBUGS(LOG_INV) << "Attempt to create undefined category." << LL_ENDL;
-		// FIXME failing but still returning an id?
 		return id;
 	}
 
@@ -708,7 +709,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	std::string url;
 	if ( viewer_region )
 		url = viewer_region->getCapability("CreateInventoryCategory");
-	
+
 	if (!url.empty() && callback)
 	{
 		//Let's use the new capability.
-- 
cgit v1.2.3


From f6208020f5b27b84aeb9ca258e8dbddce9c49bce Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 22 Nov 2022 15:46:08 +0000
Subject: SL-18629 - use AISAPI for some paths of new category creation

---
 indra/newview/llaisapi.cpp         | 30 +++++++++++++++++++++++++++---
 indra/newview/llaisapi.h           |  3 ++-
 indra/newview/llappearancemgr.cpp  |  1 +
 indra/newview/llinventorymodel.cpp | 35 +++++++++--------------------------
 4 files changed, 39 insertions(+), 30 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 005259bcb8..d2c59cfaba 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -100,7 +100,7 @@ void AISAPI::CreateInventory(const LLUUID& parentId, const LLSD& newInventory, c
     tid.generate();
 
     std::string url = cap + std::string("/category/") + parentId.asString() + "?tid=" + tid.asString();
-    LL_DEBUGS("Inventory") << "url: " << url << LL_ENDL;
+    LL_DEBUGS("Inventory") << "url: " << url << " parentID " << parentId << " newInventory " << newInventory << LL_ENDL;
 
     // I may be suffering from golden hammer here, but the first part of this bind 
     // is actually a static cast for &HttpCoroutineAdapter::postAndSuspend so that 
@@ -124,7 +124,7 @@ void AISAPI::CreateInventory(const LLUUID& parentId, const LLSD& newInventory, c
         (&LLCoreHttpUtil::HttpCoroutineAdapter::postAndSuspend), _1, _2, _3, _4, _5, _6);
 
     LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
-        _1, postFn, url, parentId, newInventory, callback, COPYINVENTORY));
+        _1, postFn, url, parentId, newInventory, callback, CREATEINVENTORY));
     EnqueueAISCommand("CreateInventory", proc);
 }
 
@@ -478,6 +478,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;
     }
 
+	LL_DEBUGS("Inventory") << result << LL_ENDL;
     gInventory.onAISUpdateReceived("AISCommand", result);
 
     if (callback && !callback.empty())
@@ -487,9 +488,32 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         if (result.has("category_id") && (type == COPYLIBRARYCATEGORY))
 	    {
 		    id = result["category_id"];
+			callback(id);
 	    }
+		if (type == CREATEINVENTORY)
+		{
+			if (result.has("_created_categories"))
+			{
+				LLSD& cats = result["_created_categories"];
+				LLSD::array_const_iterator cat_iter;
+				for (cat_iter = cats.beginArray(); cat_iter != cats.endArray(); ++cat_iter)
+				{
+					LLUUID cat_id = *cat_iter;
+					callback(cat_id);
+				}
+			}
+			if (result.has("_created_items"))
+			{
+				LLSD& items = result["_created_items"];
+				LLSD::array_const_iterator item_iter;
+				for (item_iter = items.beginArray(); item_iter != items.endArray(); ++item_iter)
+				{
+					LLUUID item_id = *item_iter;
+					callback(item_id);
+				}
+			}
+		}
 
-        callback(id);
     }
 
 }
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 856f3fc180..6e9cc19baa 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -61,7 +61,8 @@ private:
         PURGEDESCENDENTS,
         UPDATECATEGORY,
         UPDATEITEM,
-        COPYLIBRARYCATEGORY
+        COPYLIBRARYCATEGORY,
+        CREATEINVENTORY
     } COMMAND_TYPE;
 
     static const std::string INVENTORY_CAP_NAME;
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index ab7adeeedc..4fc09c7739 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3989,6 +3989,7 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 		// existence of AIS as an indicator the fix is present. Does
 		// not actually use AIS to create the category.
 		inventory_func_type func = boost::bind(&LLAppearanceMgr::onOutfitFolderCreated,this,_1,show_panel);
+
 		LLUUID folder_id = gInventory.createNewCategory(
 			parent_id,
 			LLFolderType::FT_OUTFIT,
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 36797a3f28..a7b3076e52 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -694,38 +694,20 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		LL_WARNS(LOG_INV) << "Creating new system folder, type " << preferred_type << LL_ENDL;
 	}
 
-	id.generate();
 	std::string name = pname;
-	if(!pname.empty())
-	{
-		name.assign(pname);
-	}
-	else
+	if (pname.empty())
 	{
 		name.assign(LLViewerFolderType::lookupNewCategoryName(preferred_type));
 	}
 	
-	LLViewerRegion* viewer_region = gAgent.getRegion();
-	std::string url;
-	if ( viewer_region )
-		url = viewer_region->getCapability("CreateInventoryCategory");
-
-	if (!url.empty() && callback)
+	if (callback)
 	{
-		//Let's use the new capability.
-		
-		LLSD request, body;
-		body["folder_id"] = id;
-		body["parent_id"] = parent_id;
-		body["type"] = (LLSD::Integer) preferred_type;
-		body["name"] = name;
-		
-		request["message"] = "CreateInventoryCategory";
-		request["payload"] = body;
-
-		LL_DEBUGS(LOG_INV) << "Creating category via request: " << ll_pretty_print_sd(request) << LL_ENDL;
-        LLCoros::instance().launch("LLInventoryModel::createNewCategoryCoro",
-            boost::bind(&LLInventoryModel::createNewCategoryCoro, this, url, body, callback));
+		LLSD new_inventory = LLSD::emptyMap();
+		new_inventory["categories"] = LLSD::emptyArray();
+		LLViewerInventoryCategory cat(LLUUID::null, parent_id, preferred_type, name, gAgent.getID());
+		LLSD cat_sd = cat.asLLSD();
+		new_inventory["categories"].append(cat_sd);
+		AISAPI::CreateInventory(parent_id, new_inventory, callback);
 
 		return LLUUID::null;
 	}
@@ -740,6 +722,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	// assuming instant success.
 
 	// Add the category to the internal representation
+	id.generate();
 	LLPointer<LLViewerInventoryCategory> cat =
 		new LLViewerInventoryCategory(id, parent_id, preferred_type, name, gAgent.getID());
 	cat->setVersion(LLViewerInventoryCategory::VERSION_INITIAL - 1); // accountForUpdate() will icrease version by 1
-- 
cgit v1.2.3


From abe62c23d74d5319691a49881719b03cc9b5b090 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 22 Nov 2022 16:21:44 -0500
Subject: SL-18330: Make LLSDSerialize::deserialize() default to notation.

LLSDSerialize::serialize() emits a header string, e.g. "<? llsd/notation ?>"
for notation format. Until now, LLSDSerialize::deserialize() has required that
header to properly decode the input stream.

But none of LLSDBinaryFormatter, LLSDXMLFormatter or LLSDNotationFormatter
emit that header themselves. Nor do any of the Python llsd.format_binary(),
format_xml() or format_notation() functions. Until now, you could not use
LLSD::deserialize() to parse an arbitrary-format LLSD stream serialized by
anything but LLSDSerialize::serialize().

Change LLSDSerialize::deserialize() so that if no header is recognized,
instead of failing, it attempts to parse as notation. Add tests to exercise
this case.

The tricky part about this processing is that deserialize() necessarily reads
some number of bytes from the input stream first, to try to recognize the
header. If it fails to do so, it must prepend the bytes it has already read to
the rest of the input stream since they're probably the beginning of the
serialized data.

To support this use case, introduce cat_streambuf, a std::streambuf subclass
that (virtually) concatenates other std::streambuf instances. When read by a
std::istream, the sequence of underlying std::streambufs appears to the
consumer as a single continuous stream.
---
 indra/llcommon/llsdserialize.cpp            |  87 ++++++++-----
 indra/llcommon/llstreamtools.cpp            |  26 ++++
 indra/llcommon/llstreamtools.h              |  27 +++-
 indra/llcommon/tests/llsdserialize_test.cpp | 192 +++++++++++++++++++---------
 4 files changed, 233 insertions(+), 99 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 8b4a0ee6d8..9ff4676b95 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -45,6 +45,7 @@
 #endif
 
 #include "lldate.h"
+#include "llmemorystream.h"
 #include "llsd.h"
 #include "llstring.h"
 #include "lluri.h"
@@ -61,6 +62,23 @@ const std::string LLSD_NOTATION_HEADER("llsd/notation");
 #define windowBits 15
 #define ENABLE_ZLIB_GZIP 32
 
+// If we published this in llsdserialize.h, we could use it in the
+// implementation of LLSDOStreamer's operator<<().
+template <class Formatter>
+void format_using(const LLSD& data, std::ostream& ostr,
+                  LLSDFormatter::EFormatterOptions options=LLSDFormatter::OPTIONS_PRETTY_BINARY)
+{
+    LLPointer<Formatter> f{ new Formatter };
+    f->format(data, ostr, options);
+}
+
+template <class Parser>
+S32 parse_using(std::istream& istr, LLSD& data, size_t max_bytes, S32 max_depth=-1)
+{
+    LLPointer<Parser> p{ new Parser };
+    return p->parse(istr, data, max_bytes, max_depth);
+}
+
 /**
  * LLSDSerialize
  */
@@ -83,10 +101,10 @@ void LLSDSerialize::serialize(const LLSD& sd, std::ostream& str, ELLSD_Serialize
 		f = new LLSDXMLFormatter;
 		break;
 
-    case LLSD_NOTATION:
-        str << "<? " << LLSD_NOTATION_HEADER << " ?>\n";
-        f = new LLSDNotationFormatter;
-        break;
+	case LLSD_NOTATION:
+		str << "<? " << LLSD_NOTATION_HEADER << " ?>\n";
+		f = new LLSDNotationFormatter;
+		break;
 
 	default:
 		LL_WARNS() << "serialize request for unknown ELLSD_Serialize" << LL_ENDL;
@@ -101,10 +119,7 @@ void LLSDSerialize::serialize(const LLSD& sd, std::ostream& str, ELLSD_Serialize
 // static
 bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 {
-	LLPointer<LLSDParser> p = NULL;
 	char hdr_buf[MAX_HDR_LEN + 1] = ""; /* Flawfinder: ignore */
-	int i;
-	int inbuf = 0;
 	bool legacy_no_header = false;
 	bool fail_if_not_legacy = false;
 	std::string header;
@@ -112,7 +127,10 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	/*
 	 * Get the first line before anything.
 	 */
-	str.get(hdr_buf, MAX_HDR_LEN, '\n');
+	// Remember str's original input position: if there's no header, we'll
+	// want to back up and retry.
+	str.get(hdr_buf, sizeof(hdr_buf), '\n');
+	auto inbuf = str.gcount();
 	if (str.fail())
 	{
 		str.clear();
@@ -122,16 +140,18 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	if (!strncasecmp(LEGACY_NON_HEADER, hdr_buf, strlen(LEGACY_NON_HEADER))) /* Flawfinder: ignore */
 	{
 		legacy_no_header = true;
-		inbuf = (int)str.gcount();
 	}
 	else
 	{
 		if (fail_if_not_legacy)
-			goto fail;
+		{
+			LL_WARNS() << "deserialize LLSD parse failure" << LL_ENDL;
+			return false;
+		}
 		/*
 		* Remove the newline chars
 		*/
-		for (i = 0; i < MAX_HDR_LEN; i++)
+		for (size_t i = 0; i < sizeof(hdr_buf); i++)
 		{
 			if (hdr_buf[i] == 0 || hdr_buf[i] == '\r' ||
 				hdr_buf[i] == '\n')
@@ -149,50 +169,47 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 		{
 			end = header.find_first_of(" ?", start);
 		}
-		if ((start == std::string::npos) || (end == std::string::npos))
-			goto fail;
-
-		header = header.substr(start, end - start);
-		ws(str);
+		if (! (start == std::string::npos) || (end == std::string::npos))
+		{
+			header = header.substr(start, end - start);
+			ws(str);
+		}
 	}
 	/*
 	 * Create the parser as appropriate
 	 */
 	if (legacy_no_header)
 	{	// Create a LLSD XML parser, and parse the first chunk read above
-		LLSDXMLParser* x = new LLSDXMLParser();
-		x->parsePart(hdr_buf, inbuf);	// Parse the first part that was already read
-		x->parseLines(str, sd);			// Parse the rest of it
-		delete x;
-		return true;
+		LLSDXMLParser x;
+		x.parsePart(hdr_buf, inbuf);	// Parse the first part that was already read
+		auto parsed = x.parseLines(str, sd); // Parse the rest of it
+		// Formally we should probably check (parsed != PARSE_FAILURE &&
+		// parsed > 0), but since PARSE_FAILURE is -1, this suffices.
+		return (parsed > 0);
 	}
 
 	if (header == LLSD_BINARY_HEADER)
 	{
-		p = new LLSDBinaryParser;
+		return (parse_using<LLSDBinaryParser>(str, sd, max_bytes) > 0);
 	}
 	else if (header == LLSD_XML_HEADER)
 	{
-		p = new LLSDXMLParser;
+		return (parse_using<LLSDXMLParser>(str, sd, max_bytes) > 0);
 	}
 	else if (header == LLSD_NOTATION_HEADER)
 	{
-		p = new LLSDNotationParser;
+		return (parse_using<LLSDNotationParser>(str, sd, max_bytes) > 0);
 	}
 	else
 	{
-		LL_WARNS() << "deserialize request for unknown ELLSD_Serialize" << LL_ENDL;
+		LL_DEBUGS() << "deserialize request with no header, assuming notation" << LL_ENDL;
+		// Since we've already read 'inbuf' bytes into 'hdr_buf', prepend that
+		// data to whatever remains in 'str'.
+		LLMemoryStreamBuf already(reinterpret_cast<const U8*>(hdr_buf), inbuf);
+		cat_streambuf prebuff(&already, str.rdbuf());
+		std::istream  prepend(&prebuff);
+		return (parse_using<LLSDNotationParser>(prepend, sd, max_bytes) > 0);
 	}
-
-	if (p.notNull())
-	{
-		p->parse(str, sd, max_bytes);
-		return true;
-	}
-
-fail:
-	LL_WARNS() << "deserialize LLSD parse failure" << LL_ENDL;
-	return false;
 }
 
 /**
diff --git a/indra/llcommon/llstreamtools.cpp b/indra/llcommon/llstreamtools.cpp
index d7a6f47932..1674f6edc2 100644
--- a/indra/llcommon/llstreamtools.cpp
+++ b/indra/llcommon/llstreamtools.cpp
@@ -523,3 +523,29 @@ std::istream& operator>>(std::istream& str, const char *tocheck)
 	}
 	return str;
 }
+
+int cat_streambuf::underflow()
+{
+    if (gptr() == egptr())
+    {
+        // here because our buffer is empty
+        std::streamsize size;
+        // Until we've run out of mInputs, try reading the first of them
+        // into mBuffer. If that fetches some characters, break the loop.
+        while (! mInputs.empty()
+               && ! (size = mInputs.front()->sgetn(mBuffer.data(), mBuffer.size())))
+        {
+            // We tried to read mInputs.front() but got zero characters.
+            // Discard the first streambuf and try the next one.
+            mInputs.pop_front();
+        }
+        // Either we ran out of mInputs or we succeeded in reading some
+        // characters, that is, size != 0. Tell base class what we have.
+        setg(mBuffer.data(), mBuffer.data(), mBuffer.data() + size);
+    }
+    // If we fell out of the above loop with mBuffer still empty, return
+    // eof(), otherwise return the next character.
+    return (gptr() == egptr())
+        ? std::char_traits<char>::eof()
+        : std::char_traits<char>::to_int_type(*gptr());
+}
diff --git a/indra/llcommon/llstreamtools.h b/indra/llcommon/llstreamtools.h
index 1b04bf91d7..997f738840 100644
--- a/indra/llcommon/llstreamtools.h
+++ b/indra/llcommon/llstreamtools.h
@@ -27,8 +27,10 @@
 #ifndef LL_STREAM_TOOLS_H
 #define LL_STREAM_TOOLS_H
 
+#include <deque>
 #include <iostream>
 #include <string>
+#include <vector>
 
 // unless specifed otherwise these all return input_stream.good()
 
@@ -113,6 +115,27 @@ LL_COMMON_API std::streamsize fullread(
 
 LL_COMMON_API std::istream& operator>>(std::istream& str, const char *tocheck);
 
-#endif
-
+/**
+ * cat_streambuf is a std::streambuf subclass that accepts a variadic number
+ * of std::streambuf* (e.g. some_istream.rdbuf()) and virtually concatenates
+ * their contents.
+ */
+// derived from https://stackoverflow.com/a/49441066/5533635
+class cat_streambuf: public std::streambuf
+{
+private:
+    std::deque<std::streambuf*> mInputs;
+    std::vector<char> mBuffer;
+
+public:
+    // only valid for std::streambuf* arguments
+    template <typename... Inputs>
+    cat_streambuf(Inputs... inputs):
+        mInputs{inputs...},
+        mBuffer(1024)
+    {}
+
+    int underflow();
+};
 
+#endif
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index c246f5ee56..0334699c7f 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -60,6 +60,7 @@ using namespace boost::phoenix;
 #include "../test/lltut.h"
 #include "../test/namedtempfile.h"
 #include "stringize.h"
+#include <functional>
 
 std::vector<U8> string_to_vector(const std::string& str)
 {
@@ -112,7 +113,7 @@ namespace tut
 		mSD = LLUUID::null;
 		expected = "<llsd><uuid /></llsd>\n";
 		xml_test("null uuid", expected);
-		
+
 		mSD = LLUUID("c96f9b1e-f589-4100-9774-d98643ce0bed");
 		expected = "<llsd><uuid>c96f9b1e-f589-4100-9774-d98643ce0bed</uuid></llsd>\n";
 		xml_test("uuid", expected);
@@ -136,7 +137,7 @@ namespace tut
 		expected = "<llsd><binary encoding=\"base64\">aGVsbG8=</binary></llsd>\n";
 		xml_test("binary", expected);
 	}
-	
+
 	template<> template<>
 	void sd_xml_object::test<2>()
 	{
@@ -225,7 +226,7 @@ namespace tut
 		expected = "<llsd><map><key>baz</key><undef /><key>foo</key><string>bar</string></map></llsd>\n";
 		xml_test("2 element map", expected);
 	}
-	
+
 	template<> template<>
 	void sd_xml_object::test<6>()
 	{
@@ -241,7 +242,7 @@ namespace tut
 		expected = "<llsd><binary encoding=\"base64\">Nnw2fGFzZGZoYXBweWJveHw2MGU0NGVjNS0zMDVjLTQzYzItOWExOS1iNGI4OWIxYWUyYTZ8NjBlNDRlYzUtMzA1Yy00M2MyLTlhMTktYjRiODliMWFlMmE2fDYwZTQ0ZWM1LTMwNWMtNDNjMi05YTE5LWI0Yjg5YjFhZTJhNnwwMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC0wMDAwMDAwMDAwMDB8N2ZmZmZmZmZ8N2ZmZmZmZmZ8MHwwfDgyMDAwfDQ1MGZlMzk0LTI5MDQtYzlhZC0yMTRjLWEwN2ViN2ZlZWMyOXwoTm8gRGVzY3JpcHRpb24pfDB8MTB8MA==</binary></llsd>\n";
 		xml_test("binary", expected);
 	}
-	
+
 	class TestLLSDSerializeData
 	{
 	public:
@@ -250,9 +251,34 @@ namespace tut
 
 		void doRoundTripTests(const std::string&);
 		void checkRoundTrip(const std::string&, const LLSD& v);
-		
-		LLPointer<LLSDFormatter> mFormatter;
-		LLPointer<LLSDParser> mParser;
+
+		void setFormatterParser(LLPointer<LLSDFormatter> formatter, LLPointer<LLSDParser> parser)
+		{
+			mFormatter = [formatter](const LLSD& data, std::ostream& str)
+			{
+				formatter->format(data, str);
+			};
+			// this lambda must be mutable since otherwise the bound 'parser'
+			// is assumed to point to a const LLSDParser
+			mParser = [parser](std::istream& istr, LLSD& data, size_t max_bytes) mutable
+			{
+				// reset() call is needed since test code re-uses parser object
+				parser->reset();
+				return (parser->parse(istr, data, max_bytes) > 0);
+			};
+		}
+
+		void setParser(bool (*parser)(LLSD&, std::istream&, size_t))
+		{
+			// why does LLSDSerialize::deserialize() reverse the parse() params??
+			mParser = [parser](std::istream& istr, LLSD& data, size_t max_bytes)
+			{
+				return (parser(data, istr, max_bytes) > 0);
+			};
+		}
+
+		std::function<void(const LLSD& data, std::ostream& str)> mFormatter;
+		std::function<bool(std::istream& istr, LLSD& data, size_t max_bytes)> mParser;
 	};
 
 	TestLLSDSerializeData::TestLLSDSerializeData()
@@ -265,12 +291,11 @@ namespace tut
 
 	void TestLLSDSerializeData::checkRoundTrip(const std::string& msg, const LLSD& v)
 	{
-		std::stringstream stream;	
-		mFormatter->format(v, stream);
+		std::stringstream stream;
+		mFormatter(v, stream);
 		//LL_INFOS() << "checkRoundTrip: length " << stream.str().length() << LL_ENDL;
 		LLSD w;
-		mParser->reset();	// reset() call is needed since test code re-uses mParser
-		mParser->parse(stream, w, stream.str().size());
+		mParser(stream, w, stream.str().size());
 
 		try
 		{
@@ -299,52 +324,52 @@ namespace tut
 			fillmap(root[key], width, depth - 1);
 		}
 	}
-	
+
 	void TestLLSDSerializeData::doRoundTripTests(const std::string& msg)
 	{
 		LLSD v;
 		checkRoundTrip(msg + " undefined", v);
-		
+
 		v = true;
 		checkRoundTrip(msg + " true bool", v);
-		
+
 		v = false;
 		checkRoundTrip(msg + " false bool", v);
-		
+
 		v = 1;
 		checkRoundTrip(msg + " positive int", v);
-		
+
 		v = 0;
 		checkRoundTrip(msg + " zero int", v);
-		
+
 		v = -1;
 		checkRoundTrip(msg + " negative int", v);
-		
+
 		v = 1234.5f;
 		checkRoundTrip(msg + " positive float", v);
-		
+
 		v = 0.0f;
 		checkRoundTrip(msg + " zero float", v);
-		
+
 		v = -1234.5f;
 		checkRoundTrip(msg + " negative float", v);
-		
+
 		// FIXME: need a NaN test
-		
+
 		v = LLUUID::null;
 		checkRoundTrip(msg + " null uuid", v);
-		
+
 		LLUUID newUUID;
 		newUUID.generate();
 		v = newUUID;
 		checkRoundTrip(msg + " new uuid", v);
-		
+
 		v = "";
 		checkRoundTrip(msg + " empty string", v);
-		
+
 		v = "some string";
 		checkRoundTrip(msg + " non-empty string", v);
-		
+
 		v =
 "Second Life is a 3-D virtual world entirely built and owned by its residents. "
 "Since opening to the public in 2003, it has grown explosively and today is "
@@ -372,7 +397,7 @@ namespace tut
 		for (U32 block = 0x000000; block <= 0x10ffff; block += block_size)
 		{
 			std::ostringstream out;
-			
+
 			for (U32 c = block; c < block + block_size; ++c)
 			{
 				if (c <= 0x000001f
@@ -386,7 +411,7 @@ namespace tut
 				if (0x00fdd0 <= c  &&  c <= 0x00fdef) { continue; }
 				if ((c & 0x00fffe) == 0x00fffe) { continue; }		
 					// see Unicode standard, section 15.8 
-				
+
 				if (c <= 0x00007f)
 				{
 					out << (char)(c & 0x7f);
@@ -410,55 +435,55 @@ namespace tut
 					out << (char)(0x80 | ((c >>  0) & 0x3f));
 				}
 			}
-			
+
 			v = out.str();
 
 			std::ostringstream blockmsg;
 			blockmsg << msg << " unicode string block 0x" << std::hex << block; 
 			checkRoundTrip(blockmsg.str(), v);
 		}
-		
+
 		LLDate epoch;
 		v = epoch;
 		checkRoundTrip(msg + " epoch date", v);
-		
+
 		LLDate aDay("2002-12-07T05:07:15.00Z");
 		v = aDay;
 		checkRoundTrip(msg + " date", v);
-		
+
 		LLURI path("http://slurl.com/secondlife/Ambleside/57/104/26/");
 		v = path;
 		checkRoundTrip(msg + " url", v);
-		
+
 		const char source[] = "it must be a blue moon again";
 		std::vector<U8> data;
 		// note, includes terminating '\0'
 		copy(&source[0], &source[sizeof(source)], back_inserter(data));
-		
+
 		v = data;
 		checkRoundTrip(msg + " binary", v);
-		
+
 		v = LLSD::emptyMap();
 		checkRoundTrip(msg + " empty map", v);
-		
+
 		v = LLSD::emptyMap();
 		v["name"] = "luke";		//v.insert("name", "luke");
 		v["age"] = 3;			//v.insert("age", 3);
 		checkRoundTrip(msg + " map", v);
-		
+
 		v.clear();
 		v["a"]["1"] = true;
 		v["b"]["0"] = false;
 		checkRoundTrip(msg + " nested maps", v);
-		
+
 		v = LLSD::emptyArray();
 		checkRoundTrip(msg + " empty array", v);
-		
+
 		v = LLSD::emptyArray();
 		v.append("ali");
 		v.append(28);
 		checkRoundTrip(msg + " array", v);
-		
+
 		v.clear();
 		v[0][0] = true;
 		v[1][0] = false;
@@ -468,7 +493,7 @@ namespace tut
 		fillmap(v, 10, 3); // 10^6 maps
 		checkRoundTrip(msg + " many nested maps", v);
 	}
-	
+
 	typedef tut::test_group<TestLLSDSerializeData> TestLLSDSerializeGroup;
 	typedef TestLLSDSerializeGroup::object TestLLSDSerializeObject;
 	TestLLSDSerializeGroup gTestLLSDSerializeGroup("llsd serialization");
@@ -476,35 +501,78 @@ namespace tut
 	template<> template<> 
 	void TestLLSDSerializeObject::test<1>()
 	{
-		mFormatter = new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_PRETTY_BINARY);
-		mParser = new LLSDNotationParser();
+		setFormatterParser(new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_PRETTY_BINARY),
+						   new LLSDNotationParser());
 		doRoundTripTests("pretty binary notation serialization");
 	}
 
 	template<> template<> 
 	void TestLLSDSerializeObject::test<2>()
 	{
-		mFormatter = new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_NONE);
-		mParser = new LLSDNotationParser();
+		setFormatterParser(new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_NONE),
+						   new LLSDNotationParser());
 		doRoundTripTests("raw binary notation serialization");
 	}
 
 	template<> template<> 
 	void TestLLSDSerializeObject::test<3>()
 	{
-		mFormatter = new LLSDXMLFormatter();
-		mParser = new LLSDXMLParser();
+		setFormatterParser(new LLSDXMLFormatter(), new LLSDXMLParser());
 		doRoundTripTests("xml serialization");
 	}
 
 	template<> template<> 
 	void TestLLSDSerializeObject::test<4>()
 	{
-		mFormatter = new LLSDBinaryFormatter();
-		mParser = new LLSDBinaryParser();
+		setFormatterParser(new LLSDBinaryFormatter(), new LLSDBinaryParser());
 		doRoundTripTests("binary serialization");
 	}
 
+	template<> template<>
+	void TestLLSDSerializeObject::test<5>()
+	{
+		mFormatter = [](const LLSD& sd, std::ostream& str)
+		{
+			LLSDSerialize::serialize(sd, str, LLSDSerialize::LLSD_BINARY);
+		};
+		setParser(LLSDSerialize::deserialize);
+		doRoundTripTests("serialize(LLSD_BINARY)");
+	};
+
+	template<> template<>
+	void TestLLSDSerializeObject::test<6>()
+	{
+		mFormatter = [](const LLSD& sd, std::ostream& str)
+		{
+			LLSDSerialize::serialize(sd, str, LLSDSerialize::LLSD_XML);
+		};
+		setParser(LLSDSerialize::deserialize);
+		doRoundTripTests("serialize(LLSD_XML)");
+	};
+
+	template<> template<>
+	void TestLLSDSerializeObject::test<7>()
+	{
+		mFormatter = [](const LLSD& sd, std::ostream& str)
+		{
+			LLSDSerialize::serialize(sd, str, LLSDSerialize::LLSD_NOTATION);
+		};
+		setParser(LLSDSerialize::deserialize);
+		// In this test, serialize(LLSD_NOTATION) emits a header recognized by
+		// deserialize().
+		doRoundTripTests("serialize(LLSD_NOTATION)");
+	};
+
+	template<> template<>
+	void TestLLSDSerializeObject::test<8>()
+	{
+		setFormatterParser(new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_NONE),
+						   new LLSDNotationParser());
+		setParser(LLSDSerialize::deserialize);
+		// This is an interesting test because LLSDNotationFormatter does not
+		// emit an llsd/notation header.
+		doRoundTripTests("LLSDNotationFormatter -> deserialize");
+	};
 
 	/**
 	 * @class TestLLSDParsing
@@ -555,7 +623,7 @@ namespace tut
 	public:
 		TestLLSDXMLParsing() {}
 	};
-	
+
 	typedef tut::test_group<TestLLSDXMLParsing> TestLLSDXMLParsingGroup;
 	typedef TestLLSDXMLParsingGroup::object TestLLSDXMLParsingObject;
 	TestLLSDXMLParsingGroup gTestLLSDXMLParsingGroup("llsd XML parsing");
@@ -586,8 +654,8 @@ namespace tut
 			LLSD(),
 			LLSDParser::PARSE_FAILURE);
 	}
-	
-	
+
+
 	template<> template<> 
 	void TestLLSDXMLParsingObject::test<2>()
 	{
@@ -596,7 +664,7 @@ namespace tut
 		v["amy"] = 23;
 		v["bob"] = LLSD();
 		v["cam"] = 1.23;
-		
+
 		ensureParse(
 			"unknown data type",
 			"<llsd><map>"
@@ -607,16 +675,16 @@ namespace tut
 			v,
 			v.size() + 1);
 	}
-	
+
 	template<> template<> 
 	void TestLLSDXMLParsingObject::test<3>()
 	{
 		// test handling of nested bad data
-		
+
 		LLSD v;
 		v["amy"] = 23;
 		v["cam"] = 1.23;
-		
+
 		ensureParse(
 			"map with html",
 			"<llsd><map>"
@@ -626,7 +694,7 @@ namespace tut
 			"</map></llsd>",
 			v,
 			v.size() + 1);
-			
+
 		v.clear();
 		v["amy"] = 23;
 		v["cam"] = 1.23;
@@ -639,7 +707,7 @@ namespace tut
 			"</map></llsd>",
 			v,
 			v.size() + 1);
-			
+
 		v.clear();
 		v["amy"] = 23;
 		v["bob"] = LLSD::emptyMap();
@@ -661,7 +729,7 @@ namespace tut
 		v[0] = 23;
 		v[1] = LLSD();
 		v[2] = 1.23;
-		
+
 		ensureParse(
 			"array value of html",
 			"<llsd><array>"
@@ -671,7 +739,7 @@ namespace tut
 			"</array></llsd>",
 			v,
 			v.size() + 1);
-			
+
 		v.clear();
 		v[0] = 23;
 		v[1] = LLSD::emptyMap();
@@ -1225,7 +1293,7 @@ namespace tut
 		vec[0] = 'a'; vec[1] = 'b'; vec[2] = 'c';
 		vec[3] = '3'; vec[4] = '2'; vec[5] = '1';
 		LLSD value = vec;
-		
+
 		vec.resize(11);
 		vec[0] = 'b';  // for binary
 		vec[5] = 'a'; vec[6] = 'b'; vec[7] = 'c';
@@ -1909,6 +1977,6 @@ namespace tut
                       "This string\n"
                       "has several\n"
                       "lines.");
-        
+
     }
 }
-- 
cgit v1.2.3


From 42e0787446d35bf967ff088148f8ad5f902e929b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 23 Nov 2022 17:15:15 -0500
Subject: SL-18330: LLSDSerialize::deserialize() w/o hdr uses XML or notation

Absent a header from LLSDSerialize::serialize(), make deserialize()
distinguish between XML or notation by recognizing an initial '<'.
---
 indra/llcommon/llsdserialize.cpp            | 87 ++++++++++++++---------------
 indra/llcommon/tests/llsdserialize_test.cpp | 28 ++++++++++
 2 files changed, 70 insertions(+), 45 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 9ff4676b95..dc8f8f5737 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -120,9 +120,7 @@ void LLSDSerialize::serialize(const LLSD& sd, std::ostream& str, ELLSD_Serialize
 bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 {
 	char hdr_buf[MAX_HDR_LEN + 1] = ""; /* Flawfinder: ignore */
-	bool legacy_no_header = false;
 	bool fail_if_not_legacy = false;
-	std::string header;
 
 	/*
 	 * Get the first line before anything.
@@ -131,6 +129,7 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	// want to back up and retry.
 	str.get(hdr_buf, sizeof(hdr_buf), '\n');
 	auto inbuf = str.gcount();
+	std::string header{ hdr_buf, inbuf };
 	if (str.fail())
 	{
 		str.clear();
@@ -138,38 +137,36 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	}
 
 	if (!strncasecmp(LEGACY_NON_HEADER, hdr_buf, strlen(LEGACY_NON_HEADER))) /* Flawfinder: ignore */
+	{	// Create a LLSD XML parser, and parse the first chunk read above.
+		LLSDXMLParser x;
+		x.parsePart(hdr_buf, inbuf);	// Parse the first part that was already read
+		auto parsed = x.parse(str, sd, max_bytes - inbuf); // Parse the rest of it
+		// Formally we should probably check (parsed != PARSE_FAILURE &&
+		// parsed > 0), but since PARSE_FAILURE is -1, this suffices.
+		return (parsed > 0);
+	}
+
+	if (fail_if_not_legacy)
 	{
-		legacy_no_header = true;
+		LL_WARNS() << "deserialize LLSD parse failure" << LL_ENDL;
+		return false;
 	}
-	else
+
+	/*
+	* Remove the newline chars
+	*/
+	auto lastchar = header.find_last_not_of("\r\n");
+	if (lastchar != std::string::npos)
 	{
-		if (fail_if_not_legacy)
-		{
-			LL_WARNS() << "deserialize LLSD parse failure" << LL_ENDL;
-			return false;
-		}
-		/*
-		* Remove the newline chars
-		*/
-		for (size_t i = 0; i < sizeof(hdr_buf); i++)
-		{
-			if (hdr_buf[i] == 0 || hdr_buf[i] == '\r' ||
-				hdr_buf[i] == '\n')
-			{
-				hdr_buf[i] = 0;
-				break;
-			}
-		}
-		header = hdr_buf;
+		header.erase(lastchar+1);
+	}
 
-		std::string::size_type start = std::string::npos;
-		std::string::size_type end = std::string::npos;
-		start = header.find_first_not_of("<? ");
-		if (start != std::string::npos)
-		{
-			end = header.find_first_of(" ?", start);
-		}
-		if (! (start == std::string::npos) || (end == std::string::npos))
+	// trim off the <? ... ?> header syntax
+	auto start = header.find_first_not_of("<? ");
+	if (start != std::string::npos)
+	{
+		auto end = header.find_first_of(" ?", start);
+		if (end != std::string::npos)
 		{
 			header = header.substr(start, end - start);
 			ws(str);
@@ -178,16 +175,6 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	/*
 	 * Create the parser as appropriate
 	 */
-	if (legacy_no_header)
-	{	// Create a LLSD XML parser, and parse the first chunk read above
-		LLSDXMLParser x;
-		x.parsePart(hdr_buf, inbuf);	// Parse the first part that was already read
-		auto parsed = x.parseLines(str, sd); // Parse the rest of it
-		// Formally we should probably check (parsed != PARSE_FAILURE &&
-		// parsed > 0), but since PARSE_FAILURE is -1, this suffices.
-		return (parsed > 0);
-	}
-
 	if (header == LLSD_BINARY_HEADER)
 	{
 		return (parse_using<LLSDBinaryParser>(str, sd, max_bytes) > 0);
@@ -200,15 +187,27 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	{
 		return (parse_using<LLSDNotationParser>(str, sd, max_bytes) > 0);
 	}
-	else
+	else // no header we recognize
 	{
-		LL_DEBUGS() << "deserialize request with no header, assuming notation" << LL_ENDL;
+		LLPointer<LLSDParser> p;
+		if (inbuf && hdr_buf[0] == '<')
+		{
+			// looks like XML
+			LL_DEBUGS() << "deserialize request with no header, assuming XML" << LL_ENDL;
+			p = new LLSDXMLParser;
+		}
+		else
+		{
+			// assume notation
+			LL_DEBUGS() << "deserialize request with no header, assuming notation" << LL_ENDL;
+			p = new LLSDNotationParser;
+		}
 		// Since we've already read 'inbuf' bytes into 'hdr_buf', prepend that
 		// data to whatever remains in 'str'.
 		LLMemoryStreamBuf already(reinterpret_cast<const U8*>(hdr_buf), inbuf);
 		cat_streambuf prebuff(&already, str.rdbuf());
 		std::istream  prepend(&prebuff);
-		return (parse_using<LLSDNotationParser>(prepend, sd, max_bytes) > 0);
+		return (p->parse(prepend, sd, max_bytes) > 0);
 	}
 }
 
@@ -2411,5 +2410,3 @@ U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize, std::istream& is, S32
 
 	return result;
 }
-
-
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 0334699c7f..bbbc32214b 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -574,6 +574,34 @@ namespace tut
 		doRoundTripTests("LLSDNotationFormatter -> deserialize");
 	};
 
+	template<> template<>
+	void TestLLSDSerializeObject::test<9>()
+	{
+		setFormatterParser(new LLSDXMLFormatter(false, "", LLSDFormatter::OPTIONS_NONE),
+						   new LLSDXMLParser());
+		setParser(LLSDSerialize::deserialize);
+		// This is an interesting test because LLSDXMLFormatter does not
+		// emit an LLSD/XML header.
+		doRoundTripTests("LLSDXMLFormatter -> deserialize");
+	};
+
+/*==========================================================================*|
+	// We do not expect this test to succeed. Without a header, neither
+	// notation LLSD nor binary LLSD reliably start with a distinct character,
+	// the way XML LLSD starts with '<'. By convention, we default to notation
+	// rather than binary.
+	template<> template<>
+	void TestLLSDSerializeObject::test<10>()
+	{
+		setFormatterParser(new LLSDBinaryFormatter(false, "", LLSDFormatter::OPTIONS_NONE),
+						   new LLSDBinaryParser());
+		setParser(LLSDSerialize::deserialize);
+		// This is an interesting test because LLSDBinaryFormatter does not
+		// emit an LLSD/Binary header.
+		doRoundTripTests("LLSDBinaryFormatter -> deserialize");
+	};
+|*==========================================================================*/
+
 	/**
 	 * @class TestLLSDParsing
 	 * @brief Base class for of a parse tester.
-- 
cgit v1.2.3


From b180e4de23cb54ec385e2d999fc5fdd4ea804ba4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 29 Nov 2022 14:03:02 -0500
Subject: SL-18330: WIP: Send LLLeap to child as binary LLSD; generic parser.

Since parsing binary LLSD is faster than parsing notation LLSD, send data from
the viewer to the LEAP plugin child process's stdin in binary instead of
notation.

Similarly, instead of parsing the child process's stdout using specifically a
notation parser, use the generic LLSDSerialize::deserialize() LLSD parser.

Add more LLSDSerialize Python compatibility tests.
---
 indra/llcommon/llleap.cpp                   |  28 +--
 indra/llcommon/tests/llsdserialize_test.cpp | 286 +++++++++++++++++++---------
 2 files changed, 211 insertions(+), 103 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index 2704f8b6de..f71eaf92c4 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -204,30 +204,35 @@ public:
         LLSD packet(LLSDMap("pump", pump)("data", data));
 
         std::ostringstream buffer;
-        buffer << LLSDNotationStreamer(packet);
+        // SL-18330: for large data blocks, it's much faster to parse binary
+        // LLSD than notation LLSD. Use serialize(LLSD_BINARY) rather than
+        // directly calling LLSDBinaryFormatter because, unlike the latter,
+        // serialize() prepends the relevant header, needed by a general-
+        // purpose LLSD parser to distinguish binary from notation.
+        LLSDSerialize::serialize(packet, buffer, LLSDSerialize::LLSD_BINARY,
+                                 LLSDFormatter::OPTIONS_NONE);
 
 /*==========================================================================*|
         // DEBUGGING ONLY: don't copy str() if we can avoid it.
         std::string strdata(buffer.str());
         if (std::size_t(buffer.tellp()) != strdata.length())
         {
-            LL_ERRS("LLLeap") << "tellp() -> " << buffer.tellp() << " != "
+            LL_ERRS("LLLeap") << "tellp() -> " << static_cast<U64>(buffer.tellp()) << " != "
                               << "str().length() -> " << strdata.length() << LL_ENDL;
         }
         // DEBUGGING ONLY: reading back is terribly inefficient.
         std::istringstream readback(strdata);
         LLSD echo;
-        LLPointer<LLSDParser> parser(new LLSDNotationParser());
-        S32 parse_status(parser->parse(readback, echo, strdata.length()));
-        if (parse_status == LLSDParser::PARSE_FAILURE)
+        bool parse_status(LLSDSerialize::deserialize(echo, readback, strdata.length()));
+        if (! parse_status)
         {
-            LL_ERRS("LLLeap") << "LLSDNotationParser() cannot parse output of "
-                              << "LLSDNotationStreamer()" << LL_ENDL;
+            LL_ERRS("LLLeap") << "LLSDSerialize::deserialize() cannot parse output of "
+                              << "LLSDSerialize::serialize(LLSD_BINARY)" << LL_ENDL;
         }
         if (! llsd_equals(echo, packet))
         {
-            LL_ERRS("LLLeap") << "LLSDNotationParser() produced different LLSD "
-                              << "than passed to LLSDNotationStreamer()" << LL_ENDL;
+            LL_ERRS("LLLeap") << "LLSDSerialize::deserialize() returned different LLSD "
+                              << "than passed to LLSDSerialize::serialize()" << LL_ENDL;
         }
 |*==========================================================================*/
 
@@ -312,9 +317,8 @@ public:
             LL_DEBUGS("LLLeap") << "needed " << mExpect << " bytes, got "
                                 << childout.size() << ", parsing LLSD" << LL_ENDL;
             LLSD data;
-            LLPointer<LLSDParser> parser(new LLSDNotationParser());
-            S32 parse_status(parser->parse(childout.get_istream(), data, mExpect));
-            if (parse_status == LLSDParser::PARSE_FAILURE)
+            bool parse_status(LLSDSerialize::deserialize(data, childout.get_istream(), mExpect));
+            if (! parse_status)
             {
                 bad_protocol("unparseable LLSD data");
             }
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index bbbc32214b..601f2c580d 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -46,7 +46,6 @@ typedef U32 uint32_t;
 
 #include "boost/range.hpp"
 #include "boost/foreach.hpp"
-#include "boost/function.hpp"
 #include "boost/bind.hpp"
 #include "boost/phoenix/bind/bind_function.hpp"
 #include "boost/phoenix/core/argument.hpp"
@@ -62,6 +61,9 @@ using namespace boost::phoenix;
 #include "stringize.h"
 #include <functional>
 
+typedef std::function<void(const LLSD& data, std::ostream& str)> FormatterFunction;
+typedef std::function<bool(std::istream& istr, LLSD& data, size_t max_bytes)> ParserFunction;
+
 std::vector<U8> string_to_vector(const std::string& str)
 {
 	return std::vector<U8>(str.begin(), str.end());
@@ -277,8 +279,8 @@ namespace tut
 			};
 		}
 
-		std::function<void(const LLSD& data, std::ostream& str)> mFormatter;
-		std::function<bool(std::istream& istr, LLSD& data, size_t max_bytes)> mParser;
+		FormatterFunction mFormatter;
+		ParserFunction mParser;
 	};
 
 	TestLLSDSerializeData::TestLLSDSerializeData()
@@ -1790,85 +1792,83 @@ namespace tut
 		ensureBinaryAndXML("map", test);
 	}
 
-    struct TestPythonCompatible
+    // helper for TestPythonCompatible
+    static std::string import_llsd("import os.path\n"
+                                   "import sys\n"
+                                   "try:\n"
+                                   // new freestanding llsd package
+                                   "    import llsd\n"
+                                   "except ImportError:\n"
+                                   // older llbase.llsd module
+                                   "    from llbase import llsd\n");
+
+    // helper for TestPythonCompatible
+    template <typename CONTENT>
+    void python(const std::string& desc, const CONTENT& script, int expect=0)
     {
-        TestPythonCompatible():
-            // Note the peculiar insertion of __FILE__ into this string. Since
-            // this script is being written into a platform-dependent temp
-            // directory, we can't locate indra/lib/python relative to
-            // Python's __file__. Use __FILE__ instead, navigating relative
-            // to this C++ source file. Use Python raw-string syntax so
-            // Windows pathname backslashes won't mislead Python's string
-            // scanner.
-            import_llsd("import os.path\n"
-                        "import sys\n"
-                        "from llbase import llsd\n")
-        {}
-        ~TestPythonCompatible() {}
+        auto PYTHON(LLStringUtil::getenv("PYTHON"));
+        ensure("Set $PYTHON to the Python interpreter", !PYTHON.empty());
 
-        std::string import_llsd;
+        NamedTempFile scriptfile("py", script);
 
-        template <typename CONTENT>
-        void python(const std::string& desc, const CONTENT& script, int expect=0)
+#if LL_WINDOWS
+        std::string q("\"");
+        std::string qPYTHON(q + PYTHON + q);
+        std::string qscript(q + scriptfile.getName() + q);
+        int rc = _spawnl(_P_WAIT, PYTHON.c_str(), qPYTHON.c_str(), qscript.c_str(), NULL);
+        if (rc == -1)
         {
-            auto PYTHON(LLStringUtil::getenv("PYTHON"));
-            ensure("Set $PYTHON to the Python interpreter", !PYTHON.empty());
-
-            NamedTempFile scriptfile("py", script);
+            char buffer[256];
+            strerror_s(buffer, errno); // C++ can infer the buffer size!  :-O
+            ensure(STRINGIZE("Couldn't run Python " << desc << "script: " << buffer), false);
+        }
+        else
+        {
+            ensure_equals(STRINGIZE(desc << " script terminated with rc " << rc), rc, expect);
+        }
 
-#if LL_WINDOWS
-            std::string q("\"");
-            std::string qPYTHON(q + PYTHON + q);
-            std::string qscript(q + scriptfile.getName() + q);
-            int rc = _spawnl(_P_WAIT, PYTHON.c_str(), qPYTHON.c_str(), qscript.c_str(), NULL);
-            if (rc == -1)
-            {
-                char buffer[256];
-                strerror_s(buffer, errno); // C++ can infer the buffer size!  :-O
-                ensure(STRINGIZE("Couldn't run Python " << desc << "script: " << buffer), false);
-            }
-            else
+#else  // LL_DARWIN, LL_LINUX
+        LLProcess::Params params;
+        params.executable = PYTHON;
+        params.args.add(scriptfile.getName());
+        LLProcessPtr py(LLProcess::create(params));
+        ensure(STRINGIZE("Couldn't launch " << desc << " script"), bool(py));
+        // Implementing timeout would mean messing with alarm() and
+        // catching SIGALRM... later maybe...
+        int status(0);
+        if (waitpid(py->getProcessID(), &status, 0) == -1)
+        {
+            int waitpid_errno(errno);
+            ensure_equals(STRINGIZE("Couldn't retrieve rc from " << desc << " script: "
+                                    "waitpid() errno " << waitpid_errno),
+                          waitpid_errno, ECHILD);
+        }
+        else
+        {
+            if (WIFEXITED(status))
             {
-                ensure_equals(STRINGIZE(desc << " script terminated with rc " << rc), rc, expect);
+                int rc(WEXITSTATUS(status));
+                ensure_equals(STRINGIZE(desc << " script terminated with rc " << rc),
+                              rc, expect);
             }
-
-#else  // LL_DARWIN, LL_LINUX
-            LLProcess::Params params;
-            params.executable = PYTHON;
-            params.args.add(scriptfile.getName());
-            LLProcessPtr py(LLProcess::create(params));
-            ensure(STRINGIZE("Couldn't launch " << desc << " script"), bool(py));
-            // Implementing timeout would mean messing with alarm() and
-            // catching SIGALRM... later maybe...
-            int status(0);
-            if (waitpid(py->getProcessID(), &status, 0) == -1)
+            else if (WIFSIGNALED(status))
             {
-                int waitpid_errno(errno);
-                ensure_equals(STRINGIZE("Couldn't retrieve rc from " << desc << " script: "
-                                        "waitpid() errno " << waitpid_errno),
-                              waitpid_errno, ECHILD);
+                ensure(STRINGIZE(desc << " script terminated by signal " << WTERMSIG(status)),
+                       false);
             }
             else
             {
-                if (WIFEXITED(status))
-                {
-                    int rc(WEXITSTATUS(status));
-                    ensure_equals(STRINGIZE(desc << " script terminated with rc " << rc),
-                                  rc, expect);
-                }
-                else if (WIFSIGNALED(status))
-                {
-                    ensure(STRINGIZE(desc << " script terminated by signal " << WTERMSIG(status)),
-                           false);
-                }
-                else
-                {
-                    ensure(STRINGIZE(desc << " script produced impossible status " << status),
-                           false);
-                }
+                ensure(STRINGIZE(desc << " script produced impossible status " << status),
+                       false);
             }
-#endif
         }
+#endif
+    }
+
+    struct TestPythonCompatible
+    {
+        TestPythonCompatible() {}
+        ~TestPythonCompatible() {}
     };
 
     typedef tut::test_group<TestPythonCompatible> TestPythonCompatibleGroup;
@@ -1894,12 +1894,13 @@ namespace tut
                "print('Running on', sys.platform)\n");
     }
 
-    // helper for test<3>
-    static void writeLLSDArray(std::ostream& out, const LLSD& array)
+    // helper for test<3> - test<7>
+    static void writeLLSDArray(const FormatterFunction& serialize,
+                               std::ostream& out, const LLSD& array)
     {
         BOOST_FOREACH(LLSD item, llsd::inArray(array))
         {
-            LLSDSerialize::toNotation(item, out);
+            serialize(item, out);
             // It's important to separate with newlines because Python's llsd
             // module doesn't support parsing from a file stream, only from a
             // string, so we have to know how much of the file to read into a
@@ -1908,11 +1909,10 @@ namespace tut
         }
     }
 
-    template<> template<>
-    void TestPythonCompatibleObject::test<3>()
+    // helper for test<3> - test<7>
+    static void toPythonUsing(const std::string& desc,
+                              const FormatterFunction& serialize)
     {
-        set_test_name("verify sequence to Python");
-
         LLSD cdata(LLSDArray(17)(3.14)
                   ("This string\n"
                    "has several\n"
@@ -1941,9 +1941,11 @@ namespace tut
                            // takes a callable. To this callable it passes the
                            // std::ostream with which it's writing the
                            // NamedTempFile.
-                           boost::bind(writeLLSDArray, _1, cdata));
+                           [serialize, cdata]
+                           (std::ostream& out)
+                           { writeLLSDArray(serialize, out, cdata); });
 
-        python("read C++ notation",
+        python("read C++ " + desc,
                placeholders::arg1 <<
                import_llsd <<
                "def parse_each(iterable):\n"
@@ -1954,17 +1956,70 @@ namespace tut
                "verify(parse_each(open(r'" << file.getName() << "', 'rb')))\n");
     }
 
+    template<> template<>
+    void TestPythonCompatibleObject::test<3>()
+    {
+        set_test_name("to Python using LLSDSerialize::serialize(LLSD_XML)");
+        toPythonUsing("LLSD_XML",
+                      [](const LLSD& sd, std::ostream& out)
+        { LLSDSerialize::serialize(sd, out, LLSDSerialize::LLSD_XML); });
+    }
+
     template<> template<>
     void TestPythonCompatibleObject::test<4>()
     {
-        set_test_name("verify sequence from Python");
+        set_test_name("to Python using LLSDSerialize::serialize(LLSD_NOTATION)");
+        toPythonUsing("LLSD_NOTATION",
+                      [](const LLSD& sd, std::ostream& out)
+        { LLSDSerialize::serialize(sd, out, LLSDSerialize::LLSD_NOTATION); });
+    }
+
+    template<> template<>
+    void TestPythonCompatibleObject::test<5>()
+    {
+        set_test_name("to Python using LLSDSerialize::serialize(LLSD_BINARY)");
+        toPythonUsing("LLSD_BINARY",
+                      [](const LLSD& sd, std::ostream& out)
+        { LLSDSerialize::serialize(sd, out, LLSDSerialize::LLSD_BINARY); });
+    }
+
+    template<> template<>
+    void TestPythonCompatibleObject::test<6>()
+    {
+        set_test_name("to Python using LLSDSerialize::toXML()");
+        toPythonUsing("toXML()", LLSDSerialize::toXML);
+    }
+
+    template<> template<>
+    void TestPythonCompatibleObject::test<7>()
+    {
+        set_test_name("to Python using LLSDSerialize::toNotation()");
+        toPythonUsing("toNotation()", LLSDSerialize::toNotation);
+    }
+
+/*==========================================================================*|
+    template<> template<>
+    void TestPythonCompatibleObject::test<8>()
+    {
+        set_test_name("to Python using LLSDSerialize::toBinary()");
+        // We don't expect this to work because, without a header,
+        // llsd.parse() will assume notation rather than binary.
+        toPythonUsing("toBinary()", LLSDSerialize::toBinary);
+    }
+|*==========================================================================*/
 
+    // helper for test<8> - test<12>
+    void fromPythonUsing(const std::string& pyformatter,
+                         const ParserFunction& parse=
+                         [](std::istream& istr, LLSD& data, size_t max_bytes)
+                         { return LLSDSerialize::deserialize(data, istr, max_bytes); })
+    {
         // Create an empty data file. This is just a placeholder for our
         // script to write into. Create it to establish a unique name that
         // we know.
         NamedTempFile file("llsd", "");
 
-        python("write Python notation",
+        python("Python " + pyformatter,
                placeholders::arg1 <<
                import_llsd <<
                "DATA = [\n"
@@ -1977,9 +2032,9 @@ namespace tut
                "]\n"
                // Don't forget raw-string syntax for Windows pathnames.
                // N.B. Using 'print' implicitly adds newlines.
-               "with open(r'" << file.getName() << "', 'w') as f:\n"
+               "with open(r'" << file.getName() << "', 'wb') as f:\n"
                "    for item in DATA:\n"
-               "        print(llsd.format_notation(item).decode(), file=f)\n");
+               "        print(llsd." << pyformatter << "(item), file=f)\n");
 
         std::ifstream inf(file.getName().c_str());
         LLSD item;
@@ -1989,22 +2044,71 @@ namespace tut
         // want to ensure that notation-separated-by-newlines works in both
         // directions -- since in practice, a given file might be read by
         // either language.
-        ensure_equals("Failed to read LLSD::Integer from Python",
-                      LLSDSerialize::fromNotation(item, inf, LLSDSerialize::SIZE_UNLIMITED),
-                      1);
+        ensure("Failed to read LLSD::Integer from Python",
+               parse(inf, item, LLSDSerialize::SIZE_UNLIMITED));
         ensure_equals(item.asInteger(), 17);
-        ensure_equals("Failed to read LLSD::Real from Python",
-                      LLSDSerialize::fromNotation(item, inf, LLSDSerialize::SIZE_UNLIMITED),
-                      1);
+        ensure("Failed to read LLSD::Real from Python",
+               parse(inf, item, LLSDSerialize::SIZE_UNLIMITED));
         ensure_approximately_equals("Bad LLSD::Real value from Python",
                                     item.asReal(), 3.14, 7); // 7 bits ~= 0.01
-        ensure_equals("Failed to read LLSD::String from Python",
-                      LLSDSerialize::fromNotation(item, inf, LLSDSerialize::SIZE_UNLIMITED),
-                      1);
+        ensure("Failed to read LLSD::String from Python",
+               parse(inf, item, LLSDSerialize::SIZE_UNLIMITED));
         ensure_equals(item.asString(), 
                       "This string\n"
                       "has several\n"
                       "lines.");
+    }
 
+    template<> template<>
+    void TestPythonCompatibleObject::test<8>()
+    {
+        set_test_name("from Python XML using LLSDSerialize::deserialize()");
+        fromPythonUsing("format_xml");
     }
+
+    template<> template<>
+    void TestPythonCompatibleObject::test<9>()
+    {
+        set_test_name("from Python notation using LLSDSerialize::deserialize()");
+        fromPythonUsing("format_notation");
+    }
+
+    template<> template<>
+    void TestPythonCompatibleObject::test<10>()
+    {
+        set_test_name("from Python binary using LLSDSerialize::deserialize()");
+        fromPythonUsing("format_binary");
+    }
+
+    template<> template<>
+    void TestPythonCompatibleObject::test<11>()
+    {
+        set_test_name("from Python XML using fromXML()");
+        // fromXML()'s optional 3rd param isn't max_bytes, it's emit_errors
+        fromPythonUsing("format_xml",
+                        [](std::istream& istr, LLSD& data, size_t)
+                        { return LLSDSerialize::fromXML(data, istr) > 0; });
+    }
+
+    template<> template<>
+    void TestPythonCompatibleObject::test<12>()
+    {
+        set_test_name("from Python notation using fromNotation()");
+        fromPythonUsing("format_notation",
+                        [](std::istream& istr, LLSD& data, size_t max_bytes)
+                        { return LLSDSerialize::fromNotation(data, istr, max_bytes) > 0; });
+    }
+
+/*==========================================================================*|
+    template<> template<>
+    void TestPythonCompatibleObject::test<13>()
+    {
+        set_test_name("from Python binary using fromBinary()");
+        // We don't expect this to work because format_binary() emits a
+        // header, but fromBinary() won't recognize a header.
+        fromPythonUsing("format_binary",
+                        [](std::istream& istr, LLSD& data, size_t max_bytes)
+                        { return LLSDSerialize::fromBinary(data, istr, max_bytes) > 0; });
+    }
+|*==========================================================================*/
 }
-- 
cgit v1.2.3


From 2f557cd7faceec36acace1eee4ee38904ff06130 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 2 Dec 2022 15:17:56 -0500
Subject: SL-18330: Fix new C++ <-> Python LLSD compatibility tests.

When sending multiple LEAP packets in the same file (for testing convenience),
use a length prefix instead of delimiting with '\n'. Now that we allow a
serialization format that includes an LLSD format header (e.g.
"<?llsd/binary?>"), '\n' is part of the packet content. But in fact, testing
binary LLSD means we can't pick any delimiter guaranteed not to appear in the
packet content.

Using a length prefix also lets us pass a specific max_bytes to the subject
C++ LLSD parser.

Make llleap_test.cpp use new freestanding Python llsd package when available.
Update Python-side LEAP protocol code to work directly with encoded bytes
stream, avoiding bytes<->str encoding and decoding, which breaks binary LLSD.

Make LLSDSerialize::deserialize() recognize LLSD format header case-
insensitively. Python emits and checks for "llsd/binary", while LLSDSerialize
emits and checks for "LLSD/Binary". Once any of the headers is recognized,
pass corrected max_bytes to the specific parser.

Make deserialize() more careful about the no-header case: preserve '\n' in
content. Introduce debugging code (disabled) because it's a little tricky to
recreate.

Revert LLLeap child process stdout parser from LLSDSerialize::deserialize() to
the specific LLSDNotationParser(), as at present: the generic parser fails one
of LLLeap's integration tests for reasons that remain mysterious.
---
 indra/llcommon/llleap.cpp                   |   9 +++
 indra/llcommon/llsdserialize.cpp            |  49 +++++++++---
 indra/llcommon/tests/llleap_test.cpp        |  32 ++++----
 indra/llcommon/tests/llsdserialize_test.cpp | 118 +++++++++++++++++++---------
 4 files changed, 147 insertions(+), 61 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index f71eaf92c4..e8ccc4300d 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -317,8 +317,17 @@ public:
             LL_DEBUGS("LLLeap") << "needed " << mExpect << " bytes, got "
                                 << childout.size() << ", parsing LLSD" << LL_ENDL;
             LLSD data;
+#if 1
+            // specifically require notation LLSD from child
+            LLPointer<LLSDParser> parser(new LLSDNotationParser());
+            S32 parse_status(parser->parse(childout.get_istream(), data, mExpect));
+            if (parse_status == LLSDParser::PARSE_FAILURE)
+#else
+            // SL-18330: accept any valid LLSD serialization format from child
+            // Unfortunately this runs into trouble we have not yet debugged.
             bool parse_status(LLSDSerialize::deserialize(data, childout.get_istream(), mExpect));
             if (! parse_status)
+#endif
             {
                 bad_protocol("unparseable LLSD data");
             }
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index dc8f8f5737..97bf51eeaa 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -123,12 +123,26 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	bool fail_if_not_legacy = false;
 
 	/*
-	 * Get the first line before anything.
+	 * Get the first line before anything. Don't read more than max_bytes:
+	 * this get() overload reads no more than (count-1) bytes into the
+	 * specified buffer. In the usual case when max_bytes exceeds
+	 * sizeof(hdr_buf), get() will read no more than sizeof(hdr_buf)-2.
 	 */
-	// Remember str's original input position: if there's no header, we'll
-	// want to back up and retry.
-	str.get(hdr_buf, sizeof(hdr_buf), '\n');
+	str.get(hdr_buf, std::min(max_bytes+1, sizeof(hdr_buf)-1), '\n');
 	auto inbuf = str.gcount();
+	// https://en.cppreference.com/w/cpp/io/basic_istream/get
+	// When the get() above sees the specified delimiter '\n', it stops there
+	// without pulling it from the stream. If it turns out that the stream
+	// does NOT contain a header, and the content includes meaningful '\n',
+	// it's important to pull that into hdr_buf too.
+	if (inbuf < max_bytes && str.get(hdr_buf[inbuf]))
+	{
+		// got the delimiting '\n'
+		++inbuf;
+		// None of the following requires that hdr_buf contain a final '\0'
+		// byte. We could store one if needed, since even the incremented
+		// inbuf won't exceed sizeof(hdr_buf)-1, but there's no need.
+	}
 	std::string header{ hdr_buf, inbuf };
 	if (str.fail())
 	{
@@ -175,17 +189,17 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	/*
 	 * Create the parser as appropriate
 	 */
-	if (header == LLSD_BINARY_HEADER)
+	if (0 == LLStringUtil::compareInsensitive(header, LLSD_BINARY_HEADER))
 	{
-		return (parse_using<LLSDBinaryParser>(str, sd, max_bytes) > 0);
+		return (parse_using<LLSDBinaryParser>(str, sd, max_bytes-inbuf) > 0);
 	}
-	else if (header == LLSD_XML_HEADER)
+	else if (0 == LLStringUtil::compareInsensitive(header, LLSD_XML_HEADER))
 	{
-		return (parse_using<LLSDXMLParser>(str, sd, max_bytes) > 0);
+		return (parse_using<LLSDXMLParser>(str, sd, max_bytes-inbuf) > 0);
 	}
-	else if (header == LLSD_NOTATION_HEADER)
+	else if (0 == LLStringUtil::compareInsensitive(header, LLSD_NOTATION_HEADER))
 	{
-		return (parse_using<LLSDNotationParser>(str, sd, max_bytes) > 0);
+		return (parse_using<LLSDNotationParser>(str, sd, max_bytes-inbuf) > 0);
 	}
 	else // no header we recognize
 	{
@@ -207,7 +221,22 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 		LLMemoryStreamBuf already(reinterpret_cast<const U8*>(hdr_buf), inbuf);
 		cat_streambuf prebuff(&already, str.rdbuf());
 		std::istream  prepend(&prebuff);
+#if 1
 		return (p->parse(prepend, sd, max_bytes) > 0);
+#else
+		// debugging the reconstituted 'prepend' stream
+		// allocate a buffer that we hope is big enough for the whole thing
+		std::vector<char> wholemsg((max_bytes == size_t(SIZE_UNLIMITED))? 1024 : max_bytes);
+		prepend.read(wholemsg.data(), std::min(max_bytes, wholemsg.size()));
+		LLMemoryStream replay(reinterpret_cast<const U8*>(wholemsg.data()), prepend.gcount());
+		auto success{ p->parse(replay, sd, prepend.gcount()) > 0 };
+		{
+			LL_DEBUGS() << (success? "parsed: $$" : "failed: '")
+						<< std::string(wholemsg.data(), llmin(prepend.gcount(), 100)) << "$$"
+						<< LL_ENDL;
+		}
+		return success;
+#endif
 	}
 }
 
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 9754353ab0..6c799b7993 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -110,12 +110,12 @@ namespace tut
                    "import os\n"
                    "import sys\n"
                    "\n"
-                   // Don't forget that this Python script is written to some
-                   // temp directory somewhere! Its __file__ is useless in
-                   // finding indra/lib/python. Use our __FILE__, with
-                   // raw-string syntax to deal with Windows pathnames.
-                   "mydir = os.path.dirname(r'" << __FILE__ << "')\n"
-                   "from llbase import llsd\n"
+                   "try:\n"
+                   // new freestanding llsd package
+                   "    import llsd\n"
+                   "except ImportError:\n"
+                   // older llbase.llsd module
+                   "    from llbase import llsd\n"
                    "\n"
                    "class ProtocolError(Exception):\n"
                    "    def __init__(self, msg, data):\n"
@@ -126,26 +126,26 @@ namespace tut
                    "    pass\n"
                    "\n"
                    "def get():\n"
-                   "    hdr = ''\n"
-                   "    while ':' not in hdr and len(hdr) < 20:\n"
-                   "        hdr += sys.stdin.read(1)\n"
+                   "    hdr = []\n"
+                   "    while b':' not in hdr and len(hdr) < 20:\n"
+                   "        hdr.append(sys.stdin.buffer.read(1))\n"
                    "        if not hdr:\n"
                    "            sys.exit(0)\n"
-                   "    if not hdr.endswith(':'):\n"
+                   "    if not hdr[-1] == b':':\n"
                    "        raise ProtocolError('Expected len:data, got %r' % hdr, hdr)\n"
                    "    try:\n"
-                   "        length = int(hdr[:-1])\n"
+                   "        length = int(b''.join(hdr[:-1]))\n"
                    "    except ValueError:\n"
                    "        raise ProtocolError('Non-numeric len %r' % hdr[:-1], hdr[:-1])\n"
                    "    parts = []\n"
                    "    received = 0\n"
                    "    while received < length:\n"
-                   "        parts.append(sys.stdin.read(length - received))\n"
+                   "        parts.append(sys.stdin.buffer.read(length - received))\n"
                    "        received += len(parts[-1])\n"
-                   "    data = ''.join(parts)\n"
+                   "    data = b''.join(parts)\n"
                    "    assert len(data) == length\n"
                    "    try:\n"
-                   "        return llsd.parse(data.encode())\n"
+                   "        return llsd.parse(data)\n"
                    //   Seems the old indra.base.llsd module didn't properly
                    //   convert IndexError (from running off end of string) to
                    //   LLSDParseError.
@@ -185,11 +185,11 @@ namespace tut
                    "    return _reply\n"
                    "\n"
                    "def put(req):\n"
-                   "    sys.stdout.write(':'.join((str(len(req)), req)))\n"
+                   "    sys.stdout.buffer.write(b'%d:%b' % (len(req), req))\n"
                    "    sys.stdout.flush()\n"
                    "\n"
                    "def send(pump, data):\n"
-                   "    put(llsd.format_notation(dict(pump=pump, data=data)).decode())\n"
+                   "    put(llsd.format_notation(dict(pump=pump, data=data)))\n"
                    "\n"
                    "def request(pump, data):\n"
                    "    # we expect 'data' is a dict\n"
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 601f2c580d..39b93cf335 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -51,10 +51,11 @@ typedef U32 uint32_t;
 #include "boost/phoenix/core/argument.hpp"
 using namespace boost::phoenix;
 
-#include "../llsd.h"
-#include "../llsdserialize.h"
+#include "llsd.h"
+#include "llsdserialize.h"
 #include "llsdutil.h"
-#include "../llformat.h"
+#include "llformat.h"
+#include "llmemorystream.h"
 
 #include "../test/lltut.h"
 #include "../test/namedtempfile.h"
@@ -1898,14 +1899,22 @@ namespace tut
     static void writeLLSDArray(const FormatterFunction& serialize,
                                std::ostream& out, const LLSD& array)
     {
-        BOOST_FOREACH(LLSD item, llsd::inArray(array))
+        for (const LLSD& item : llsd::inArray(array))
         {
-            serialize(item, out);
-            // It's important to separate with newlines because Python's llsd
-            // module doesn't support parsing from a file stream, only from a
-            // string, so we have to know how much of the file to read into a
-            // string.
-            out << '\n';
+            // It's important to delimit the entries in this file somehow
+            // because, although Python's llsd.parse() can accept a file
+            // stream, the XML parser expects EOF after a single outer element
+            // -- it doesn't just stop. So we must extract a sequence of bytes
+            // strings from the file. But since one of the serialization
+            // formats we want to test is binary, we can't pick any single
+            // byte value as a delimiter! Use a binary integer length prefix
+            // instead.
+            std::ostringstream buffer;
+            serialize(item, buffer);
+            auto buffstr{ buffer.str() };
+            int bufflen{ static_cast<int>(buffstr.length()) };
+            out.write(reinterpret_cast<const char*>(&bufflen), sizeof(bufflen));
+            out.write(buffstr.c_str(), buffstr.length());
         }
     }
 
@@ -1932,7 +1941,7 @@ namespace tut
             "    except StopIteration:\n"
             "        pass\n"
             "    else:\n"
-            "        assert False, 'Too many data items'\n";
+            "        raise AssertionError('Too many data items')\n";
 
         // Create an llsdXXXXXX file containing 'data' serialized to
         // notation.
@@ -1948,10 +1957,23 @@ namespace tut
         python("read C++ " + desc,
                placeholders::arg1 <<
                import_llsd <<
-               "def parse_each(iterable):\n"
-               "    for item in iterable:\n"
-               "        yield llsd.parse(item)\n" <<
-               pydata <<
+               "from functools import partial\n"
+               "import struct\n"
+               "lenformat = struct.Struct('i')\n"
+               "def parse_each(inf):\n"
+               "    for rawlen in iter(partial(inf.read, lenformat.size), b''):\n"
+               "        len = lenformat.unpack(rawlen)[0]\n"
+               // Since llsd.parse() has no max_bytes argument, instead of
+               // passing the input stream directly to parse(), read the item
+               // into a distinct bytes object and parse that.
+               "        data = inf.read(len)\n"
+               "        try:\n"
+               "            yield llsd.parse(data)\n"
+               "        except llsd.LLSDParseError as err:\n"
+               "            print(f'*** {err}')\n"
+               "            print(f'Bad content:\\n{data!r}')\n"
+               "            raise\n"
+               << pydata <<
                // Don't forget raw-string syntax for Windows pathnames.
                "verify(parse_each(open(r'" << file.getName() << "', 'rb')))\n");
     }
@@ -2008,6 +2030,26 @@ namespace tut
     }
 |*==========================================================================*/
 
+    // helper for test<8> - test<12>
+    bool itemFromStream(std::istream& istr, LLSD& item, const ParserFunction& parse)
+    {
+        // reset the output value for debugging clarity
+        item.clear();
+        // We use an int length prefix as a foolproof delimiter even for
+        // binary serialized streams.
+        int length{ 0 };
+        istr.read(reinterpret_cast<char*>(&length), sizeof(length));
+//      return parse(istr, item, length);
+        // Sadly, as of 2022-12-01 it seems we can't really trust our LLSD
+        // parsers to honor max_bytes: this test works better when we read
+        // each item into its own distinct LLMemoryStream, instead of passing
+        // the original istr with a max_bytes constraint.
+        std::vector<U8> buffer(length);
+        istr.read(reinterpret_cast<char*>(buffer.data()), length);
+        LLMemoryStream stream(buffer.data(), length);
+        return parse(stream, item, length);
+    }
+
     // helper for test<8> - test<12>
     void fromPythonUsing(const std::string& pyformatter,
                          const ParserFunction& parse=
@@ -2022,6 +2064,8 @@ namespace tut
         python("Python " + pyformatter,
                placeholders::arg1 <<
                import_llsd <<
+               "import struct\n"
+               "lenformat = struct.Struct('i')\n"
                "DATA = [\n"
                "    17,\n"
                "    3.14,\n"
@@ -2034,29 +2078,33 @@ namespace tut
                // N.B. Using 'print' implicitly adds newlines.
                "with open(r'" << file.getName() << "', 'wb') as f:\n"
                "    for item in DATA:\n"
-               "        print(llsd." << pyformatter << "(item), file=f)\n");
+               "        serialized = llsd." << pyformatter << "(item)\n"
+               "        f.write(lenformat.pack(len(serialized)))\n"
+               "        f.write(serialized)\n");
 
         std::ifstream inf(file.getName().c_str());
         LLSD item;
-        // Notice that we're not doing anything special to parse out the
-        // newlines: LLSDSerialize::fromNotation ignores them. While it would
-        // seem they're not strictly necessary, going in this direction, we
-        // want to ensure that notation-separated-by-newlines works in both
-        // directions -- since in practice, a given file might be read by
-        // either language.
-        ensure("Failed to read LLSD::Integer from Python",
-               parse(inf, item, LLSDSerialize::SIZE_UNLIMITED));
-        ensure_equals(item.asInteger(), 17);
-        ensure("Failed to read LLSD::Real from Python",
-               parse(inf, item, LLSDSerialize::SIZE_UNLIMITED));
-        ensure_approximately_equals("Bad LLSD::Real value from Python",
-                                    item.asReal(), 3.14, 7); // 7 bits ~= 0.01
-        ensure("Failed to read LLSD::String from Python",
-               parse(inf, item, LLSDSerialize::SIZE_UNLIMITED));
-        ensure_equals(item.asString(), 
-                      "This string\n"
-                      "has several\n"
-                      "lines.");
+        try
+        {
+            ensure("Failed to read LLSD::Integer from Python",
+                   itemFromStream(inf, item, parse));
+            ensure_equals(item.asInteger(), 17);
+            ensure("Failed to read LLSD::Real from Python",
+                   itemFromStream(inf, item, parse));
+            ensure_approximately_equals("Bad LLSD::Real value from Python",
+                                        item.asReal(), 3.14, 7); // 7 bits ~= 0.01
+            ensure("Failed to read LLSD::String from Python",
+                   itemFromStream(inf, item, parse));
+            ensure_equals(item.asString(), 
+                          "This string\n"
+                          "has several\n"
+                          "lines.");
+        }
+        catch (const tut::failure& err)
+        {
+            std::cout << "for " << err.what() << ", item = " << item << std::endl;
+            throw;
+        }
     }
 
     template<> template<>
-- 
cgit v1.2.3


From 761d8337fb70cea9cfb326f06a8b1b35438ed96b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 2 Dec 2022 17:14:31 -0500
Subject: SL-18330: Test Python llsd.parse() both from bytes and from stream.

---
 indra/llcommon/tests/llsdserialize_test.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 39b93cf335..6e5d8a26e1 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1958,6 +1958,7 @@ namespace tut
                placeholders::arg1 <<
                import_llsd <<
                "from functools import partial\n"
+               "import io\n"
                "import struct\n"
                "lenformat = struct.Struct('i')\n"
                "def parse_each(inf):\n"
@@ -1968,11 +1969,16 @@ namespace tut
                // into a distinct bytes object and parse that.
                "        data = inf.read(len)\n"
                "        try:\n"
-               "            yield llsd.parse(data)\n"
+               "            frombytes = llsd.parse(data)\n"
                "        except llsd.LLSDParseError as err:\n"
                "            print(f'*** {err}')\n"
                "            print(f'Bad content:\\n{data!r}')\n"
                "            raise\n"
+               // Also try parsing from a distinct stream.
+               "        stream = io.BytesIO(data)\n"
+               "        fromstream = llsd.parse(stream)\n"
+               "        assert frombytes == fromstream\n"
+               "        yield frombytes\n"
                << pydata <<
                // Don't forget raw-string syntax for Windows pathnames.
                "verify(parse_each(open(r'" << file.getName() << "', 'rb')))\n");
-- 
cgit v1.2.3


From 590e158cf36b6e6fca07f54837db084fe8a163c6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 6 Dec 2022 16:30:35 -0500
Subject: SL-18330: Adapt LLSDSerialize and tests to llssize max_bytes params.

---
 indra/llcommon/llsdserialize.cpp            |  2 +-
 indra/llcommon/tests/llsdserialize_test.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 97bf51eeaa..c1b24d8138 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -128,7 +128,7 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	 * specified buffer. In the usual case when max_bytes exceeds
 	 * sizeof(hdr_buf), get() will read no more than sizeof(hdr_buf)-2.
 	 */
-	str.get(hdr_buf, std::min(max_bytes+1, sizeof(hdr_buf)-1), '\n');
+	str.get(hdr_buf, llmin(max_bytes+1, sizeof(hdr_buf)-1), '\n');
 	auto inbuf = str.gcount();
 	// https://en.cppreference.com/w/cpp/io/basic_istream/get
 	// When the get() above sees the specified delimiter '\n', it stops there
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 6e5d8a26e1..29e3007aff 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -63,7 +63,7 @@ using namespace boost::phoenix;
 #include <functional>
 
 typedef std::function<void(const LLSD& data, std::ostream& str)> FormatterFunction;
-typedef std::function<bool(std::istream& istr, LLSD& data, size_t max_bytes)> ParserFunction;
+typedef std::function<bool(std::istream& istr, LLSD& data, llssize max_bytes)> ParserFunction;
 
 std::vector<U8> string_to_vector(const std::string& str)
 {
@@ -263,7 +263,7 @@ namespace tut
 			};
 			// this lambda must be mutable since otherwise the bound 'parser'
 			// is assumed to point to a const LLSDParser
-			mParser = [parser](std::istream& istr, LLSD& data, size_t max_bytes) mutable
+			mParser = [parser](std::istream& istr, LLSD& data, llssize max_bytes) mutable
 			{
 				// reset() call is needed since test code re-uses parser object
 				parser->reset();
@@ -271,10 +271,10 @@ namespace tut
 			};
 		}
 
-		void setParser(bool (*parser)(LLSD&, std::istream&, size_t))
+		void setParser(bool (*parser)(LLSD&, std::istream&, llssize))
 		{
 			// why does LLSDSerialize::deserialize() reverse the parse() params??
-			mParser = [parser](std::istream& istr, LLSD& data, size_t max_bytes)
+			mParser = [parser](std::istream& istr, LLSD& data, llssize max_bytes)
 			{
 				return (parser(data, istr, max_bytes) > 0);
 			};
@@ -2059,7 +2059,7 @@ namespace tut
     // helper for test<8> - test<12>
     void fromPythonUsing(const std::string& pyformatter,
                          const ParserFunction& parse=
-                         [](std::istream& istr, LLSD& data, size_t max_bytes)
+                         [](std::istream& istr, LLSD& data, llssize max_bytes)
                          { return LLSDSerialize::deserialize(data, istr, max_bytes); })
     {
         // Create an empty data file. This is just a placeholder for our
@@ -2140,7 +2140,7 @@ namespace tut
         set_test_name("from Python XML using fromXML()");
         // fromXML()'s optional 3rd param isn't max_bytes, it's emit_errors
         fromPythonUsing("format_xml",
-                        [](std::istream& istr, LLSD& data, size_t)
+                        [](std::istream& istr, LLSD& data, llssize)
                         { return LLSDSerialize::fromXML(data, istr) > 0; });
     }
 
@@ -2149,7 +2149,7 @@ namespace tut
     {
         set_test_name("from Python notation using fromNotation()");
         fromPythonUsing("format_notation",
-                        [](std::istream& istr, LLSD& data, size_t max_bytes)
+                        [](std::istream& istr, LLSD& data, llssize max_bytes)
                         { return LLSDSerialize::fromNotation(data, istr, max_bytes) > 0; });
     }
 
@@ -2161,7 +2161,7 @@ namespace tut
         // We don't expect this to work because format_binary() emits a
         // header, but fromBinary() won't recognize a header.
         fromPythonUsing("format_binary",
-                        [](std::istream& istr, LLSD& data, size_t max_bytes)
+                        [](std::istream& istr, LLSD& data, llssize max_bytes)
                         { return LLSDSerialize::fromBinary(data, istr, max_bytes) > 0; });
     }
 |*==========================================================================*/
-- 
cgit v1.2.3


From 819eec6f8c3abbf71ec3bdaaf4891068574fdc46 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 9 Jan 2023 21:14:16 +0000
Subject: SL-18924 - basic get/set functions for thumbnail UUID, removed
 obsolete binary pack/unpack functions for inventory

---
 indra/llinventory/llinventory.cpp              | 148 ++++---------------------
 indra/llinventory/llinventory.h                |   6 +-
 indra/llinventory/tests/inventorymisc_test.cpp |  20 ----
 3 files changed, 22 insertions(+), 152 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 81261f0767..b897198d10 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -40,9 +40,11 @@
 ///----------------------------------------------------------------------------
 /// Exported functions
 ///----------------------------------------------------------------------------
+// FIXME D567 - what's the point of these, especially if we don't even use them consistently?
 static const std::string INV_ITEM_ID_LABEL("item_id");
 static const std::string INV_FOLDER_ID_LABEL("cat_id");
 static const std::string INV_PARENT_ID_LABEL("parent_id");
+static const std::string INV_THUMBNAIL_ID_LABEL("thumbnail_id");
 static const std::string INV_ASSET_TYPE_LABEL("type");
 static const std::string INV_PREFERRED_TYPE_LABEL("preferred_type");
 static const std::string INV_INVENTORY_TYPE_LABEL("inv_type");
@@ -99,6 +101,7 @@ void LLInventoryObject::copyObject(const LLInventoryObject* other)
 	mParentUUID = other->mParentUUID;
 	mType = other->mType;
 	mName = other->mName;
+	mThumbnailUUID = other->mThumbnailUUID;
 }
 
 const LLUUID& LLInventoryObject::getUUID() const
@@ -111,6 +114,11 @@ const LLUUID& LLInventoryObject::getParentUUID() const
 	return mParentUUID;
 }
 
+const LLUUID& LLInventoryObject::getThumbnailUUID() const
+{
+	return mThumbnailUUID;
+}
+
 const std::string& LLInventoryObject::getName() const
 {
 	return mName;
@@ -160,6 +168,11 @@ void LLInventoryObject::setParent(const LLUUID& new_parent)
 	mParentUUID = new_parent;
 }
 
+void LLInventoryObject::setThumbnailUUID(const LLUUID& thumbnail_uuid)
+{
+	mThumbnailUUID = thumbnail_uuid;
+}
+
 void LLInventoryObject::setType(LLAssetType::EType type)
 {
 	mType = type;
@@ -972,135 +985,6 @@ fail:
 
 }
 
-// Deleted LLInventoryItem::exportFileXML() and LLInventoryItem::importXML()
-// because I can't find any non-test code references to it. 2009-05-04 JC
-
-S32 LLInventoryItem::packBinaryBucket(U8* bin_bucket, LLPermissions* perm_override) const
-{
-	// Figure out which permissions to use.
-	LLPermissions perm;
-	if (perm_override)
-	{
-		// Use the permissions override.
-		perm = *perm_override;
-	}
-	else
-	{
-		// Use the current permissions.
-		perm = getPermissions();
-	}
-
-	// describe the inventory item
-	char* buffer = (char*) bin_bucket;
-	std::string creator_id_str;
-
-	perm.getCreator().toString(creator_id_str);
-	std::string owner_id_str;
-	perm.getOwner().toString(owner_id_str);
-	std::string last_owner_id_str;
-	perm.getLastOwner().toString(last_owner_id_str);
-	std::string group_id_str;
-	perm.getGroup().toString(group_id_str);
-	std::string asset_id_str;
-	getAssetUUID().toString(asset_id_str);
-	S32 size = sprintf(buffer,	/* Flawfinder: ignore */
-					   "%d|%d|%s|%s|%s|%s|%s|%x|%x|%x|%x|%x|%s|%s|%d|%d|%x",
-					   getType(),
-					   getInventoryType(),
-					   getName().c_str(),
-					   creator_id_str.c_str(),
-					   owner_id_str.c_str(),
-					   last_owner_id_str.c_str(),
-					   group_id_str.c_str(),
-					   perm.getMaskBase(),
-					   perm.getMaskOwner(),
-					   perm.getMaskGroup(),
-					   perm.getMaskEveryone(),
-					   perm.getMaskNextOwner(),
-					   asset_id_str.c_str(),
-					   getDescription().c_str(),
-					   getSaleInfo().getSaleType(),
-					   getSaleInfo().getSalePrice(),
-					   getFlags()) + 1;
-
-	return size;
-}
-
-void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
-{	
-	// Early exit on an empty binary bucket.
-	if (bin_bucket_size <= 1) return;
-
-	if (NULL == bin_bucket)
-	{
-		LL_ERRS() << "unpackBinaryBucket failed.  bin_bucket is NULL." << LL_ENDL;
-		return;
-	}
-
-	// Convert the bin_bucket into a string.
-	std::vector<char> item_buffer(bin_bucket_size+1);
-	memcpy(&item_buffer[0], bin_bucket, bin_bucket_size);	/* Flawfinder: ignore */
-	item_buffer[bin_bucket_size] = '\0';
-	std::string str(&item_buffer[0]);
-
-	LL_DEBUGS() << "item buffer: " << str << LL_ENDL;
-
-	// Tokenize the string.
-	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-	boost::char_separator<char> sep("|", "", boost::keep_empty_tokens);
-	tokenizer tokens(str, sep);
-	tokenizer::iterator iter = tokens.begin();
-
-	// Extract all values.
-	LLUUID item_id;
-	item_id.generate();
-	setUUID(item_id);
-
-	LLAssetType::EType type;
-	type = (LLAssetType::EType)(atoi((*(iter++)).c_str()));
-	setType( type );
-	
-	LLInventoryType::EType inv_type;
-	inv_type = (LLInventoryType::EType)(atoi((*(iter++)).c_str()));
-	setInventoryType( inv_type );
-
-	std::string name((*(iter++)).c_str());
-	rename( name );
-	
-	LLUUID creator_id((*(iter++)).c_str());
-	LLUUID owner_id((*(iter++)).c_str());
-	LLUUID last_owner_id((*(iter++)).c_str());
-	LLUUID group_id((*(iter++)).c_str());
-	PermissionMask mask_base = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_owner = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_group = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_every = strtoul((*(iter++)).c_str(), NULL, 16);
-	PermissionMask mask_next = strtoul((*(iter++)).c_str(), NULL, 16);
-	LLPermissions perm;
-	perm.init(creator_id, owner_id, last_owner_id, group_id);
-	perm.initMasks(mask_base, mask_owner, mask_group, mask_every, mask_next);
-	setPermissions(perm);
-	//LL_DEBUGS() << "perm: " << perm << LL_ENDL;
-
-	LLUUID asset_id((*(iter++)).c_str());
-	setAssetUUID(asset_id);
-
-	std::string desc((*(iter++)).c_str());
-	setDescription(desc);
-	
-	LLSaleInfo::EForSale sale_type;
-	sale_type = (LLSaleInfo::EForSale)(atoi((*(iter++)).c_str()));
-	S32 price = atoi((*(iter++)).c_str());
-	LLSaleInfo sale_info(sale_type, price);
-	setSaleInfo(sale_info);
-	
-	U32 flags = strtoul((*(iter++)).c_str(), NULL, 16);
-	setFlags(flags);
-
-	time_t now = time(NULL);
-	setCreationDate(now);
-}
-
 ///----------------------------------------------------------------------------
 /// Class LLInventoryCategory
 ///----------------------------------------------------------------------------
@@ -1152,6 +1036,7 @@ LLSD LLInventoryCategory::asLLSD() const
     LLSD sd = LLSD();
     sd["item_id"] = mUUID;
     sd["parent_id"] = mParentUUID;
+    sd["thumbnail_id"] = mThumbnailUUID;
     S8 type = static_cast<S8>(mPreferredType);
     sd["type"]      = type;
     sd["name"] = mName;
@@ -1184,6 +1069,11 @@ bool LLInventoryCategory::fromLLSD(const LLSD& sd)
     {
         mParentUUID = sd[w];
     }
+    w = INV_THUMBNAIL_ID_LABEL;
+    if (sd.has(w))
+    {
+        mThumbnailUUID = sd[w];
+    }
     w = INV_ASSET_TYPE_LABEL;
     if (sd.has(w))
     {
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 7d9f9704f1..dfe8b7659b 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -70,6 +70,7 @@ public:
 	virtual const LLUUID& getUUID() const; // inventoryID that this item points to
 	virtual const LLUUID& getLinkedUUID() const; // inventoryID that this item points to, else this item's inventoryID
 	const LLUUID& getParentUUID() const;
+	virtual const LLUUID& getThumbnailUUID() const;
 	virtual const std::string& getName() const;
 	virtual LLAssetType::EType getType() const;
 	LLAssetType::EType getActualType() const; // bypasses indirection for linked items
@@ -84,6 +85,7 @@ public:
 	void setUUID(const LLUUID& new_uuid);
 	virtual void rename(const std::string& new_name);
 	void setParent(const LLUUID& new_parent);
+	virtual void setThumbnailUUID(const LLUUID& thumbnail_uuid);
 	void setType(LLAssetType::EType type);
 	virtual void setCreationDate(time_t creation_date_utc); // only stored for items
 
@@ -108,6 +110,7 @@ public:
 protected:
 	LLUUID mUUID;
 	LLUUID mParentUUID; // Parent category.  Root categories have LLUUID::NULL.
+	LLUUID mThumbnailUUID;
 	LLAssetType::EType mType;
 	std::string mName;
 	time_t mCreationDate; // seconds from 1/1/1970, UTC
@@ -203,9 +206,6 @@ public:
 	// Helper Functions
 	//--------------------------------------------------------------------
 public:
-	// Pack all information needed to reconstruct this item into the given binary bucket.
-	S32 packBinaryBucket(U8* bin_bucket, LLPermissions* perm_override = NULL) const;
-	void unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size);
 	LLSD asLLSD() const;
 	void asLLSD( LLSD& sd ) const;
 	bool fromLLSD(const LLSD& sd, bool is_new = true);
diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp
index e8b063bffe..039fa938dd 100644
--- a/indra/llinventory/tests/inventorymisc_test.cpp
+++ b/indra/llinventory/tests/inventorymisc_test.cpp
@@ -400,27 +400,7 @@ namespace tut
 		// Deleted LLInventoryItem::exportFileXML() and LLInventoryItem::importXML()
 		// because I can't find any non-test code references to it. 2009-05-04 JC
 	}
-		
-	template<> template<>
-	void inventory_object::test<10>()
-	{
-		LLPointer<LLInventoryItem> src1 = create_random_inventory_item();
-		U8* bin_bucket = new U8[300];
-		S32 bin_bucket_size = src1->packBinaryBucket(bin_bucket, NULL);
-
-		LLPointer<LLInventoryItem> src2 = new LLInventoryItem();
-		src2->unpackBinaryBucket(bin_bucket, bin_bucket_size);
 
-		ensure_equals("1.sale price::getSalePrice() failed price", src1->getSaleInfo().getSalePrice(), src2->getSaleInfo().getSalePrice());
-		ensure_equals("2.sale type::getSaleType() failed type", src1->getSaleInfo().getSaleType(), src2->getSaleInfo().getSaleType());
-		ensure_equals("3.type::getType() failed", src1->getType(), src2->getType());
-		ensure_equals("4.inventory type::getInventoryType() failed type", src1->getInventoryType(), src2->getInventoryType());
-		ensure_equals("5.name::getName() failed", src1->getName(), src2->getName());
-		ensure_equals("6.description::getDescription() failed", src1->getDescription(), src2->getDescription());				
-		ensure_equals("7.flags::getFlags() failed", src1->getFlags(), src2->getFlags());
-	
-	}
-	
 	template<> template<>
 	void inventory_object::test<11>()
 	{
-- 
cgit v1.2.3


From ce5ac93883b71b6abf8cffa35204541e257c6b02 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 24 Jan 2023 20:15:22 +0000
Subject: SL-18629 - various notes on work for D567

---
 indra/newview/llappearancemgr.cpp      |  7 ++++++-
 indra/newview/llfloateropenobject.cpp  |  2 ++
 indra/newview/llinventoryfunctions.cpp |  1 +
 indra/newview/llinventorymodel.cpp     | 37 +++++++++++++++++++++++++++++++++-
 4 files changed, 45 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4fc09c7739..d05c30d722 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1702,6 +1702,7 @@ void LLAppearanceMgr::shallowCopyCategory(const LLUUID& src_id, const LLUUID& ds
 		parent_id = gInventory.getRootFolderID();
 	}
 	// USES UDP PATH
+	// D567 needs to carry over thumbnail info
 	LLUUID subfolder_id = gInventory.createNewCategory( parent_id,
 														LLFolderType::FT_NONE,
 														src_cat->getName());
@@ -2728,6 +2729,7 @@ void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool ap
 		}
 
 		// UDP PATH
+		// D567 needs to carry over thumbnail info if present
 		LLUUID new_cat_id = gInventory.createNewCategory(
 			pid,
 			LLFolderType::FT_NONE,
@@ -3983,6 +3985,7 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 
 	// First, make a folder in the My Outfits directory.
 	const LLUUID parent_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+	// D567 replace with coros
     if (AISAPI::isAvailable())
 	{
 		// cap-based category creation was buggy until recently. use
@@ -3990,6 +3993,7 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 		// not actually use AIS to create the category.
 		inventory_func_type func = boost::bind(&LLAppearanceMgr::onOutfitFolderCreated,this,_1,show_panel);
 
+		// D567 copy thumbnail info from source folder
 		LLUUID folder_id = gInventory.createNewCategory(
 			parent_id,
 			LLFolderType::FT_OUTFIT,
@@ -3998,7 +4002,8 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 	}
 	else
 	{
-		// UDP PATH
+		// UDP PATH, should remove
+		// D567 copy thumbnail info from source folder
 		LLUUID folder_id = gInventory.createNewCategory(
 			parent_id,
 			LLFolderType::FT_OUTFIT,
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 2a1749bd42..cff42f72b7 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -166,6 +166,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear, bool replace)
 	}
 
 	inventory_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear,replace);
+	// D567 copy thumbnail info
 	LLUUID category_id = gInventory.createNewCategory(parent_category_id, 
 													  LLFolderType::FT_NONE, 
 													  name,
@@ -173,6 +174,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear, bool replace)
 
 	//If we get a null category ID, we are using a capability in createNewCategory and we will
 	//handle the following in the callbackCreateInventoryCategory routine.
+	// D567 review
 	if ( category_id.notNull() )
 	{
 		LLCatAndWear* data = new LLCatAndWear;
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 27edc8148e..145cdf6476 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -403,6 +403,7 @@ void copy_inventory_category(LLInventoryModel* model,
 							 bool move_no_copy_items )
 {
 	// Create the initial folder
+	// D567 needs to handle new fields
 	inventory_func_type func = boost::bind(&copy_inventory_category_content, _1, model, cat, root_copy_id, move_no_copy_items);
 	gInventory.createNewCategory(parent_id, LLFolderType::FT_NONE, cat->getName(), func);
 }
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index a7b3076e52..b64dd431db 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -700,8 +700,13 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		name.assign(LLViewerFolderType::lookupNewCategoryName(preferred_type));
 	}
 	
+#ifdef USE_AIS_FOR_NC
+	// D567 currently this doesn't really work due to limitations in
+	// AIS3, also violates the common caller assumption that we can
+	// assign the id and return immediately.
 	if (callback)
 	{
+		// D567 note that we no longer assign the UUID in the viewer, so various workflows need to change.
 		LLSD new_inventory = LLSD::emptyMap();
 		new_inventory["categories"] = LLSD::emptyArray();
 		LLViewerInventoryCategory cat(LLUUID::null, parent_id, preferred_type, name, gAgent.getID());
@@ -711,17 +716,47 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 
 		return LLUUID::null;
 	}
+#else
+	LLViewerRegion* viewer_region = gAgent.getRegion();
+	std::string url;
+	if ( viewer_region )
+		url = viewer_region->getCapability("CreateInventoryCategory");
+	
+	if (!url.empty() && callback)
+	{
+		//Let's use the new capability.
+		
+		id.generate();
+		LLSD request, body;
+		body["folder_id"] = id;
+		body["parent_id"] = parent_id;
+		body["type"] = (LLSD::Integer) preferred_type;
+		body["name"] = name;
+		
+		request["message"] = "CreateInventoryCategory";
+		request["payload"] = body;
+
+		LL_DEBUGS(LOG_INV) << "Creating category via request: " << ll_pretty_print_sd(request) << LL_ENDL;
+        LLCoros::instance().launch("LLInventoryModel::createNewCategoryCoro",
+            boost::bind(&LLInventoryModel::createNewCategoryCoro, this, url, body, callback));
+
+		return LLUUID::null;
+	}
+#endif
+
 
 	if (!gMessageSystem)
 	{
 		return LLUUID::null;
 	}
 
-	// FIXME this UDP code path needs to be removed. Requires
+	// D567 FIXME this UDP code path needs to be removed. Requires
 	// reworking many of the callers to use callbacks rather than
 	// assuming instant success.
 
 	// Add the category to the internal representation
+	LL_WARNS() << "D567 need to remove this usage" << LL_ENDL;
+	
 	id.generate();
 	LLPointer<LLViewerInventoryCategory> cat =
 		new LLViewerInventoryCategory(id, parent_id, preferred_type, name, gAgent.getID());
-- 
cgit v1.2.3


From 1140ae3489a9e260a0abb808b4152f2d57384d67 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 29 Dec 2022 19:51:33 +0100
Subject: Add a texture inspector and show it when hovering over an inventory
 textory (or folder containing - among others - exactly one texture) and when
 hovering over notecard embedded textures

---
 indra/llui/llfolderview.cpp                        |  16 ++
 indra/llui/llfolderview.h                          |   5 +
 indra/llui/llfolderviewitem.cpp                    |  12 +-
 indra/llui/lltooltip.cpp                           |  36 ++-
 indra/llui/lltooltip.h                             |  12 +-
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llinspecttexture.cpp                 | 301 +++++++++++++++++++++
 indra/newview/llinspecttexture.h                   |  52 ++++
 indra/newview/llinventorymodel.cpp                 |  25 ++
 indra/newview/llinventorymodel.h                   |   1 +
 indra/newview/llinventorypanel.cpp                 |  23 ++
 indra/newview/llinventorypanel.h                   |   1 +
 indra/newview/llviewerfloaterreg.cpp               |   2 +
 indra/newview/llviewertexteditor.cpp               |  11 +
 .../skins/default/xui/en/inspect_texture.xml       |  63 +++++
 15 files changed, 548 insertions(+), 14 deletions(-)
 create mode 100644 indra/newview/llinspecttexture.cpp
 create mode 100644 indra/newview/llinspecttexture.h
 create mode 100644 indra/newview/skins/default/xui/en/inspect_texture.xml

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index ea2ca68e47..a6d4a2ae52 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1506,6 +1506,22 @@ BOOL LLFolderView::handleHover( S32 x, S32 y, MASK mask )
 	return LLView::handleHover( x, y, mask );
 }
 
+LLFolderViewItem* LLFolderView::getHoveredItem() const
+{
+	return dynamic_cast<LLFolderViewItem*>(mHoveredItem.get());
+}
+
+void LLFolderView::setHoveredItem(LLFolderViewItem* itemp)
+{
+	if (mHoveredItem.get() != itemp)
+	{
+		if (itemp)
+			mHoveredItem = itemp->getHandle();
+		else
+			mHoveredItem.markDead();
+	}
+}
+
 BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 									 EDragAndDropType cargo_type,
 									 void* cargo_data, 
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 6bb5e6c02e..bd38d93b33 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -144,6 +144,10 @@ public:
 	// applies filters to control visibility of items
 	virtual void filter( LLFolderViewFilter& filter);
 
+	void              clearHoveredItem() { setHoveredItem(nullptr); }
+	LLFolderViewItem* getHoveredItem() const;
+	void              setHoveredItem(LLFolderViewItem* itemp);
+
 	// Get the last selected item
 	virtual LLFolderViewItem* getCurSelectedItem( void );
     selected_items_t& getSelectedItems( void );
@@ -273,6 +277,7 @@ protected:
 protected:
 	LLHandle<LLView>					mPopupMenuHandle;
 	
+	LLHandle<LLView>				mHoveredItem;
 	selected_items_t				mSelectedItems;
 	bool							mKeyboardSelection,
 									mAllowMultiSelect,
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index eba93beed9..d10130619a 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -624,11 +624,14 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
 			getWindow()->setCursor(UI_CURSOR_NOLOCKED);
 		}
 
+		root->clearHoveredItem();
 		return TRUE;
 	}
 	else
 	{
-		getRoot()->setShowSelectionContext(FALSE);
+		LLFolderView* pRoot = getRoot();
+		pRoot->setHoveredItem(this);
+		pRoot->setShowSelectionContext(FALSE);
 		getWindow()->setCursor(UI_CURSOR_ARROW);
 		// let parent handle this then...
 		return FALSE;
@@ -683,6 +686,13 @@ BOOL LLFolderViewItem::handleMouseUp( S32 x, S32 y, MASK mask )
 void LLFolderViewItem::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	mIsMouseOverTitle = false;
+
+	// NOTE: LLViewerWindow::updateUI() calls "enter" before "leave"; if the mouse moved to another item, we can't just outright clear it
+	LLFolderView* pRoot = getRoot();
+	if (this == pRoot->getHoveredItem())
+	{
+		pRoot->clearHoveredItem();
+	}
 }
 
 BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 2f56a8b1d0..a6552d4ff1 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -163,6 +163,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
 :	LLPanel(p),
 	mHasClickCallback(p.click_callback.isProvided()),
 	mPadding(p.padding),
+	mMaxWidth(p.max_width),
 	mTextBox(NULL),
 	mInfoButton(NULL),
 	mPlayMediaButton(NULL),
@@ -272,7 +273,7 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p)
 
 	// do this *after* we've had our size set in LLPanel::initFromParams();
 	const S32 REALLY_LARGE_HEIGHT = 10000;
-	mTextBox->reshape(p.max_width, REALLY_LARGE_HEIGHT);
+	mTextBox->reshape(mMaxWidth, REALLY_LARGE_HEIGHT);
 
 	if (p.styled_message.isProvided())
 	{
@@ -288,16 +289,19 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p)
 		mTextBox->setText(p.message());
 	}
 
-	S32 text_width = llmin(p.max_width(), mTextBox->getTextPixelWidth() + 1);
+	updateTextBox();
+	snapToChildren();
+}
+
+void LLToolTip::updateTextBox()
+{
+	S32 text_width = llmin(mMaxWidth, mTextBox->getTextPixelWidth() + 1);
 	S32 text_height = mTextBox->getTextPixelHeight();
 	mTextBox->reshape(text_width, text_height);
-	if (mInfoButton)
-	{
-		LLRect text_rect = mTextBox->getRect();
-		LLRect icon_rect = mInfoButton->getRect();
-		mTextBox->translate(0, icon_rect.getCenterY() - text_rect.getCenterY());
-	}
-
+}
+ 
+void LLToolTip::snapToChildren()
+{
 	// reshape tooltip panel to fit text box
 	LLRect tooltip_rect = calcBoundingRect();
 	tooltip_rect.mTop += mPadding;
@@ -305,7 +309,14 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p)
 	tooltip_rect.mBottom = 0;
 	tooltip_rect.mLeft = 0;
 
-	mTextBox->reshape(mTextBox->getRect().getWidth(), llmax(mTextBox->getRect().getHeight(), tooltip_rect.getHeight() - 2 * mPadding));
+	if (mInfoButton)
+	{
+		mTextBox->reshape(mTextBox->getRect().getWidth(), llmax(mTextBox->getRect().getHeight(), tooltip_rect.getHeight() - 2 * mPadding));
+
+		LLRect text_rect = mTextBox->getRect();
+		LLRect icon_rect = mInfoButton->getRect();
+		mInfoButton->translate(0, text_rect.getCenterY() - icon_rect.getCenterY());
+	}
 
 	setShape(tooltip_rect);
 }
@@ -428,7 +439,10 @@ void LLToolTipMgr::createToolTip(const LLToolTip::Params& params)
 	}
 	tooltip_params.rect = LLRect (0, 1, 1, 0);
 
-	mToolTip = LLUICtrlFactory::create<LLToolTip> (tooltip_params);
+	if (tooltip_params.create_callback.isProvided())
+		mToolTip = tooltip_params.create_callback()(tooltip_params);
+	else
+		mToolTip = LLUICtrlFactory::create<LLToolTip> (tooltip_params);
 
 	gToolTipView->addChild(mToolTip);
 
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index 0b1fbe5367..86943625ff 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -68,6 +68,7 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLPanel::Params> 
 	{
 		typedef boost::function<void(void)> click_callback_t;
+		typedef boost::function<LLToolTip*(LLToolTip::Params)> create_callback_t;
 
 		Optional<std::string>		message;
 		Multiple<StyledText>		styled_message;
@@ -84,6 +85,8 @@ public:
 		Optional<bool>				time_based_media,
 									web_based_media,
 									media_playing;
+		Optional<create_callback_t>	create_callback;
+		Optional<LLSD>				create_params;
 		Optional<click_callback_t>	click_callback,
 									click_playmedia_callback,
 									click_homepage_callback;
@@ -103,11 +106,15 @@ public:
 	bool hasClickCallback();
 
 	LLToolTip(const Params& p);
-	void initFromParams(const LLToolTip::Params& params);
+	virtual void initFromParams(const LLToolTip::Params& params);
 
 	void getToolTipMessage(std::string & message);
 
-private:
+protected:
+	void updateTextBox();
+	void snapToChildren();
+
+protected:
 	class LLTextBox*	mTextBox;
 	class LLButton*     mInfoButton;
 	class LLButton*     mPlayMediaButton;
@@ -117,6 +124,7 @@ private:
 	LLFrameTimer	mVisibleTimer;
 	bool			mHasClickCallback;
 	S32				mPadding;	// pixels
+	S32				mMaxWidth;
 };
 
 // used for the inspector tooltips which need different background images etc.
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9eee5338ec..b94a1415a2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -374,6 +374,7 @@ set(viewer_SOURCE_FILES
     llinspectgroup.cpp
     llinspectobject.cpp
     llinspectremoteobject.cpp
+    llinspecttexture.cpp
     llinspecttoast.cpp
     llinventorybridge.cpp
     llinventoryfilter.cpp
@@ -1014,6 +1015,7 @@ set(viewer_HEADER_FILES
     llinspectgroup.h
     llinspectobject.h
     llinspectremoteobject.h
+    llinspecttexture.h
     llinspecttoast.h
     llinventorybridge.h
     llinventoryfilter.h
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
new file mode 100644
index 0000000000..cd288e9603
--- /dev/null
+++ b/indra/newview/llinspecttexture.cpp
@@ -0,0 +1,301 @@
+/**
+ * @file llinspecttexture.cpp
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterreg.h"
+#include "llinspect.h"
+#include "llinspecttexture.h"
+#include "llinventoryfunctions.h"
+#include "llinventorymodel.h"
+#include "lltexturectrl.h"
+#include "lltrans.h"
+#include "llviewertexturelist.h"
+
+// ============================================================================
+// LLInspectTexture class
+//
+
+class LLInspectTexture : public LLInspect
+{
+	friend class LLFloaterReg;
+public:
+	LLInspectTexture(const LLSD& sdKey);
+	~LLInspectTexture();
+
+public:
+	void onOpen(const LLSD& sdData) override;
+	BOOL postBuild() override;
+
+public:
+	const LLUUID& getAssetId() const { return mAssetId; }
+	const LLUUID& getItemId() const  { return mItemId; }
+
+protected:
+	LLUUID         mAssetId;
+	LLUUID         mItemId;		// Item UUID relative to gInventoryModel (or null if not displaying an inventory texture)
+	LLUUID         mNotecardId;
+	LLTextureCtrl* mTextureCtrl = nullptr;
+	LLTextBox*     mTextureName = nullptr;
+};
+
+LLInspectTexture::LLInspectTexture(const LLSD& sdKey)
+	: LLInspect(LLSD())
+{
+}
+
+LLInspectTexture::~LLInspectTexture()
+{
+}
+
+void LLInspectTexture::onOpen(const LLSD& sdData)
+{
+	// Start fade animation
+	LLInspect::onOpen(sdData);
+
+	bool fIsAsset = sdData.has("asset_id");
+	bool fIsInventory = sdData.has("item_id");
+
+	// Skip if we're being asked to display the same thing
+	const LLUUID idAsset = (fIsAsset) ? sdData["asset_id"].asUUID() : LLUUID::null;
+	const LLUUID idItem = (fIsInventory) ? sdData["item_id"].asUUID() : LLUUID::null;
+	if ( (getVisible()) && ( ((fIsAsset) && (idAsset == mAssetId)) || ((fIsInventory) && (idItem == mItemId)) ) )
+	{
+		return;
+	}
+
+	// Position the inspector relative to the mouse cursor
+	// Similar to how tooltips are positioned [see LLToolTipMgr::createToolTip()]
+	if (sdData.has("pos"))
+		LLUI::instance().positionViewNearMouse(this, sdData["pos"]["x"].asInteger(), sdData["pos"]["y"].asInteger());
+	else
+		LLUI::instance().positionViewNearMouse(this);
+
+	std::string strName = sdData["name"].asString();
+	if (fIsAsset)
+	{
+		mAssetId = idAsset;
+		mItemId = idItem;		// Will be non-null in the case of a notecard
+		mNotecardId = sdData["notecard_id"].asUUID();
+	}
+	else if (fIsInventory)
+	{
+		const LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
+		if ( (pItem) && (LLAssetType::AT_TEXTURE == pItem->getType()) )
+		{
+			if (strName.empty())
+				strName = pItem->getName();
+			mAssetId = pItem->getAssetUUID();
+			mItemId = idItem;
+		}
+		else
+		{
+			mAssetId.setNull();
+			mItemId.setNull();
+		}
+		mNotecardId = LLUUID::null;
+	}
+
+	mTextureCtrl->setImageAssetID(mAssetId);
+	mTextureName->setText(strName);
+}
+
+BOOL LLInspectTexture::postBuild()
+{
+	mTextureCtrl = getChild<LLTextureCtrl>("texture_ctrl");
+	mTextureName = getChild<LLTextBox>("texture_name");
+
+	return TRUE;
+}
+
+// ============================================================================
+// Helper functions
+//
+
+LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
+{
+	const LLSD& sdTooltip = p.create_params;
+
+	LLInventoryType::EType eInvType = (sdTooltip.has("inv_type")) ? (LLInventoryType::EType)sdTooltip["inv_type"].asInteger() : LLInventoryType::IT_NONE;
+	switch (eInvType)
+	{
+		case LLInventoryType::IT_SNAPSHOT:
+		case LLInventoryType::IT_TEXTURE:
+			return LLUICtrlFactory::create<LLTextureToolTip>(p);
+		case LLInventoryType::IT_CATEGORY:
+			{
+				if (sdTooltip.has("item_id"))
+				{
+					const LLUUID idCategory = sdTooltip["item_id"].asUUID();
+
+					LLInventoryModel::cat_array_t cats;
+					LLInventoryModel::item_array_t items;
+					LLIsOfAssetType f(LLAssetType::AT_TEXTURE);
+					gInventory.getDirectDescendentsOf(idCategory, cats, items, f);
+
+					// Exactly one texture found => show the texture tooltip
+					if (1 == items.size())
+					{
+						p.create_params.getValue()["asset_id"] = items.front()->getAssetUUID();
+						return LLUICtrlFactory::create<LLTextureToolTip>(p);
+					}
+				}
+
+				// No or more than one texture found => show default tooltip
+				return LLUICtrlFactory::create<LLToolTip>(p);
+			}
+		default:
+			return LLUICtrlFactory::create<LLToolTip>(p);
+	}
+}
+
+void LLInspectTextureUtil::registerFloater()
+{
+	LLFloaterReg::add("inspect_texture", "inspect_texture.xml", &LLFloaterReg::build<LLInspectTexture>);
+}
+
+// ============================================================================
+// LLTexturePreviewView helper class
+//
+
+class LLTexturePreviewView : public LLView
+{
+public:
+	LLTexturePreviewView(const LLView::Params& p);
+	~LLTexturePreviewView();
+
+public:
+	void draw() override;
+
+public:
+	void setImageFromAssetId(const LLUUID& idAsset);
+	void setImageFromItemId(const LLUUID& idItem);
+
+protected:
+	LLPointer<LLViewerFetchedTexture> m_Image;
+	S32         mImageBoostLevel = LLGLTexture::BOOST_NONE;
+	std::string mLoadingText;
+};
+
+
+LLTexturePreviewView::LLTexturePreviewView(const LLView::Params& p)
+	: LLView(p)
+{
+	mLoadingText = LLTrans::getString("texture_loading");
+}
+
+LLTexturePreviewView::~LLTexturePreviewView()
+{
+	if (m_Image)
+	{
+		m_Image->setBoostLevel(mImageBoostLevel);
+		m_Image = nullptr;
+	}
+}
+
+void LLTexturePreviewView::draw()
+{
+	if (m_Image)
+	{
+		LLRect rctClient = getLocalRect();
+
+		gl_rect_2d(rctClient, LLColor4::black);
+		rctClient.stretch(-2);
+		if (4 == m_Image->getComponents())
+			gl_rect_2d_checkerboard(rctClient);
+		gl_draw_scaled_image(rctClient.mLeft, rctClient.mBottom, rctClient.getWidth(), rctClient.getHeight(), m_Image);
+
+		bool isLoading = (!m_Image->isFullyLoaded()) && (m_Image->getDiscardLevel() > 0);
+		if (isLoading)
+			LLFontGL::getFontSansSerif()->renderUTF8(mLoadingText, 0, llfloor(rctClient.mLeft + 3),  llfloor(rctClient.mTop - 25), LLColor4::white, LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::DROP_SHADOW);
+		m_Image->addTextureStats((isLoading) ? MAX_IMAGE_AREA : (F32)(rctClient.getWidth() * rctClient.getHeight()));
+	}
+}
+
+void LLTexturePreviewView::setImageFromAssetId(const LLUUID& idAsset)
+{
+	m_Image = LLViewerTextureManager::getFetchedTexture(idAsset, FTT_DEFAULT, MIPMAP_TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+	if (m_Image)
+	{
+		mImageBoostLevel = m_Image->getBoostLevel();
+		m_Image->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
+		m_Image->forceToSaveRawImage(0);
+		if ( (!m_Image->isFullyLoaded()) && (!m_Image->hasFetcher()) )
+		{
+			if (m_Image->isInFastCacheList())
+			{
+				m_Image->loadFromFastCache();
+			}
+			gTextureList.forceImmediateUpdate(m_Image);
+		}
+	}
+}
+
+void LLTexturePreviewView::setImageFromItemId(const LLUUID& idItem)
+{
+	const LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
+	setImageFromAssetId( (pItem) ? pItem->getAssetUUID() : LLUUID::null );
+}
+
+// ============================================================================
+// LLTextureToolTip class
+//
+
+LLTextureToolTip::LLTextureToolTip(const LLToolTip::Params& p)
+	: LLToolTip(p)
+	, mPreviewView(nullptr)
+	, mPreviewSize(256)
+{
+	mMaxWidth = llmax(mMaxWidth, mPreviewSize);
+}
+
+LLTextureToolTip::~LLTextureToolTip()
+{
+}
+
+void LLTextureToolTip::initFromParams(const LLToolTip::Params& p)
+{
+	LLToolTip::initFromParams(p);
+
+	// Create and add the preview control
+	LLView::Params p_preview;
+	p_preview.name = "texture_preview";
+	LLRect rctPreview;
+	rctPreview.setOriginAndSize(mPadding, mTextBox->getRect().mTop, mPreviewSize, mPreviewSize);
+	p_preview.rect = rctPreview;
+	mPreviewView = LLUICtrlFactory::create<LLTexturePreviewView>(p_preview);
+	addChild(mPreviewView);
+
+	// Parse the control params
+	const LLSD& sdTextureParams = p.create_params;
+	if (sdTextureParams.has("asset_id"))
+		mPreviewView->setImageFromAssetId(sdTextureParams["asset_id"].asUUID());
+	else if (sdTextureParams.has("item_id"))
+		mPreviewView->setImageFromItemId(sdTextureParams["item_id"].asUUID());
+
+	snapToChildren();
+}
+
+// ============================================================================
diff --git a/indra/newview/llinspecttexture.h b/indra/newview/llinspecttexture.h
new file mode 100644
index 0000000000..192aafc3b4
--- /dev/null
+++ b/indra/newview/llinspecttexture.h
@@ -0,0 +1,52 @@
+/**
+ * @file llinspecttexture.h
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#pragma once
+
+#include "lltooltip.h"
+
+class LLTexturePreviewView;
+
+namespace LLInspectTextureUtil
+{
+	LLToolTip* createInventoryToolTip(LLToolTip::Params p);
+
+	// Register with LLFloaterReg
+	void registerFloater();
+}
+
+class LLTextureToolTip : public LLToolTip
+{
+public:
+	LLTextureToolTip(const LLToolTip::Params& p);
+	~LLTextureToolTip();
+
+public:
+	void initFromParams(const LLToolTip::Params& p) override;
+
+protected:
+	LLTexturePreviewView* mPreviewView;
+	S32                   mPreviewSize;
+};
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 8b2a1a14f0..edd489f021 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -451,6 +451,31 @@ void LLInventoryModel::getDirectDescendentsOf(const LLUUID& cat_id,
 	items = get_ptr_in_map(mParentChildItemTree, cat_id);
 }
 
+void LLInventoryModel::getDirectDescendentsOf(const LLUUID& cat_id, cat_array_t& categories, item_array_t& items, LLInventoryCollectFunctor& f) const
+{
+    if (cat_array_t* categoriesp = get_ptr_in_map(mParentChildCategoryTree, cat_id))
+    {
+        for (LLViewerInventoryCategory* pFolder : *categoriesp)
+        {
+			if (f(pFolder, nullptr))
+			{
+				categories.push_back(pFolder);
+			}
+        }
+    }
+
+    if (item_array_t* itemsp = get_ptr_in_map(mParentChildItemTree, cat_id))
+    {
+        for (LLViewerInventoryItem* pItem : *itemsp)
+        {
+			if (f(nullptr, pItem))
+			{
+				items.push_back(pItem);
+			}
+        }
+    }
+}
+
 LLMD5 LLInventoryModel::hashDirectDescendentNames(const LLUUID& cat_id) const
 {
 	LLInventoryModel::cat_array_t* cat_array;
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index c4133ff9bb..b03181d646 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -256,6 +256,7 @@ public:
 	void getDirectDescendentsOf(const LLUUID& cat_id,
 								cat_array_t*& categories,
 								item_array_t*& items) const;
+    void getDirectDescendentsOf(const LLUUID& cat_id, cat_array_t& categories, item_array_t& items, LLInventoryCollectFunctor& f) const;
 
 	// Compute a hash of direct descendant names (for detecting child name changes)
 	LLMD5 hashDirectDescendentNames(const LLUUID& cat_id) const;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 6b102c7500..dabe633b8c 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -40,6 +40,7 @@
 #include "llfolderviewitem.h"
 #include "llfloaterimcontainer.h"
 #include "llimview.h"
+#include "llinspecttexture.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
@@ -1278,6 +1279,28 @@ BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 
+BOOL LLInventoryPanel::handleToolTip(S32 x, S32 y, MASK mask)
+{
+	if (const LLFolderViewItem* hover_item_p = (!mFolderRoot.isDead()) ? mFolderRoot.get()->getHoveredItem() : nullptr)
+	{
+		if (const LLFolderViewModelItemInventory* vm_item_p = static_cast<const LLFolderViewModelItemInventory*>(hover_item_p->getViewModelItem()))
+		{
+			// Copy/pasted from LLView::handleToolTip()
+			F32 nTimeout = LLToolTipMgr::instance().toolTipVisible()
+					? LLUI::getInstance()->mSettingGroups["config"]->getF32("ToolTipFastDelay")
+					: LLUI::getInstance()->mSettingGroups["config"]->getF32("ToolTipDelay");
+			LLToolTipMgr::instance().show(LLToolTip::Params()
+					.message(hover_item_p->getToolTip())
+					.sticky_rect(hover_item_p->calcScreenRect())
+					.delay_time(nTimeout)
+					.create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
+					.create_params(LLSD().with("inv_type", vm_item_p->getInventoryType()).with("item_id", vm_item_p->getUUID())));
+			return TRUE;
+		}
+	}
+	return LLPanel::handleToolTip(x, y, mask);
+}
+
 BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 552c61b915..d5dc8cdba6 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -168,6 +168,7 @@ public:
 								   void* cargo_data,
 								   EAcceptance* accept,
 								   std::string& tooltip_msg);
+	            BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
 	// LLUICtrl methods
 	 /*virtual*/ void onFocusLost();
 	 /*virtual*/ void onFocusReceived();
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 59654350e4..77a7fd21a8 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -153,6 +153,7 @@
 #include "llinspectgroup.h"
 #include "llinspectobject.h"
 #include "llinspectremoteobject.h"
+#include "llinspecttexture.h"
 #include "llinspecttoast.h"
 #include "llmoveview.h"
 #include "llfloaterimnearbychat.h"
@@ -281,6 +282,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLInspectAvatarUtil::registerFloater();
 	LLInspectGroupUtil::registerFloater();
 	LLInspectObjectUtil::registerFloater();
+	LLInspectTextureUtil::registerFloater();
 	LLInspectRemoteObjectUtil::registerFloater();
 	LLFloaterVoiceVolumeUtil::registerFloater();
 	LLNotificationsUI::registerFloater();
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index e2de7ac825..299047d91b 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -36,6 +36,7 @@
 #include "llfloatersidepanelcontainer.h"
 #include "llfloaterworldmap.h"
 #include "llfocusmgr.h"
+#include "llinspecttexture.h"
 #include "llinventorybridge.h"
 #include "llinventorydefines.h"
 #include "llinventorymodel.h"
@@ -245,6 +246,16 @@ public:
 	}
 	virtual BOOL				handleToolTip(S32 x, S32 y, MASK mask )
 	{ 
+		if (LLAssetType::AT_TEXTURE == mItem->getType())
+		{
+			LLToolTipMgr::instance().show(LLToolTip::Params()
+					.message(mToolTip)
+					.create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
+					.create_params(LLSD().with("inv_type", mItem->getInventoryType()).with("asset_id", mItem->getAssetUUID())));
+
+			return TRUE;
+		}
+
 		if (!mToolTip.empty())
 		{
 			LLToolTipMgr::instance().show(mToolTip);
diff --git a/indra/newview/skins/default/xui/en/inspect_texture.xml b/indra/newview/skins/default/xui/en/inspect_texture.xml
new file mode 100644
index 0000000000..30be90cfa0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/inspect_texture.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background" 
+ can_close="false"
+ can_minimize="false"
+ height="295"
+ layout="topleft"
+ name="inspect_texture"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="250">
+  <texture_picker
+   enabled="false"
+   fallback_image="default_land_picture.j2c"
+   follows="all"
+   height="262"
+   layout="topleft"
+   left="5"
+   name="texture_ctrl"
+   top_pad="5"
+   width="240" />
+  <text
+   follows="top|left"
+   font="SansSerifSmall"
+   height="16"
+   left="7"
+   name="texture_name"
+   parse_urls="false"
+   right="-7"
+   top_delta="244"
+   text_color="White"
+   translate="false"
+   use_ellipses="true"
+   word_wrap="true"
+   value="Name of the texture goes here" />
+  <button
+   bottom="-5"
+   follows="bottom|left"
+   height="23"
+   label="Open"
+   left="7"
+   name="open_btn"
+   width="115"
+   commit_callback.function="InspectTexture.Open"
+   enable_callback.function="InspectTexture.CanOpen" />
+  <button
+   bottom="-5"
+   follows="bottom|left"
+   height="23"
+   label="Copy to Inventory"
+   left_pad="5"
+   name="copy_btn"
+   width="115"
+   commit_callback.function="InspectTexture.CopyToInv"
+   enable_callback.function="InspectTexture.CanCopyToInv" />
+</floater>
-- 
cgit v1.2.3


From aa6c7902af2ab2cc10bc86000a91078edafb522f Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 18 Jan 2023 05:03:00 +0200
Subject: SL-18988 OSX buildfix

---
 indra/newview/llinventorypanel.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index d5dc8cdba6..0932482ad7 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -159,23 +159,23 @@ public:
 	LLFolderViewModelInventory& getRootViewModel() { return mInventoryViewModel; }
 
 	// LLView methods
-	/*virtual*/ void onVisibilityChange(BOOL new_visibility);
-	void draw();
-	/*virtual*/ BOOL handleKeyHere( KEY key, MASK mask );
-	BOOL handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ void onVisibilityChange(BOOL new_visibility) override;
+	void draw() override;
+	/*virtual*/ BOOL handleKeyHere( KEY key, MASK mask ) override;
+	BOOL handleHover(S32 x, S32 y, MASK mask) override;
 	/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   std::string& tooltip_msg);
+								   std::string& tooltip_msg) override;
 	            BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
 	// LLUICtrl methods
-	 /*virtual*/ void onFocusLost();
-	 /*virtual*/ void onFocusReceived();
+	 /*virtual*/ void onFocusLost() override;
+	 /*virtual*/ void onFocusReceived() override;
      void onFolderOpening(const LLUUID &id);
 
 	// LLBadgeHolder methods
-	bool addBadge(LLBadge * badge);
+	bool addBadge(LLBadge * badge) override;
 
 	// Call this method to set the selection.
 	void openAllFolders();
-- 
cgit v1.2.3


From 6ada89ce0b9372d6a7f49ac45bad6713ad5d3355 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 1 Feb 2023 00:35:22 +0200
Subject: SL-19117 Extend texture preview to show thumbnails when present

---
 indra/llui/llview.cpp                | 20 +++++++++------
 indra/llui/llview.h                  |  1 +
 indra/newview/llinspecttexture.cpp   | 49 ++++++++++++++++++++----------------
 indra/newview/llinventorypanel.cpp   | 12 ++++-----
 indra/newview/llviewertexteditor.cpp |  9 +++++--
 5 files changed, 54 insertions(+), 37 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 9ba71913d0..10e4755cd3 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -877,6 +877,17 @@ LLView*	LLView::childFromPoint(S32 x, S32 y, bool recur)
 	return 0;
 }
 
+F32 LLView::getTooltipTimeout()
+{
+    static LLCachedControl<F32> tooltip_fast_delay(*LLUI::getInstance()->mSettingGroups["config"], "ToolTipFastDelay", 0.1f);
+    static LLCachedControl<F32> tooltip_delay(*LLUI::getInstance()->mSettingGroups["config"], "ToolTipDelay", 0.7f);
+    // allow "scrubbing" over ui by showing next tooltip immediately
+    // if previous one was still visible
+    return (F32)(LLToolTipMgr::instance().toolTipVisible()
+    ? tooltip_fast_delay
+    : tooltip_delay);
+}
+
 BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask)
 {
 	BOOL handled = FALSE;
@@ -886,14 +897,7 @@ BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask)
 	std::string tooltip = getToolTip();
 	if (!tooltip.empty())
 	{
-        static LLCachedControl<F32> tooltip_fast_delay(*LLUI::getInstance()->mSettingGroups["config"], "ToolTipFastDelay", 0.1f);
-        static LLCachedControl<F32> tooltip_delay(*LLUI::getInstance()->mSettingGroups["config"], "ToolTipDelay", 0.7f);
         static LLCachedControl<bool> allow_ui_tooltips(*LLUI::getInstance()->mSettingGroups["config"], "BasicUITooltips", true);
-		// allow "scrubbing" over ui by showing next tooltip immediately
-		// if previous one was still visible
-		F32 timeout = LLToolTipMgr::instance().toolTipVisible() 
-		              ? tooltip_fast_delay
-		              : tooltip_delay;
 
 		// Even if we don't show tooltips, consume the event, nothing below should show tooltip
 		if (allow_ui_tooltips)
@@ -901,7 +905,7 @@ BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask)
 			LLToolTipMgr::instance().show(LLToolTip::Params()
 			                              .message(tooltip)
 			                              .sticky_rect(calcScreenRect())
-			                              .delay_time(timeout));
+			                              .delay_time(getTooltipTimeout()));
 		}
 		handled = TRUE;
 	}
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index bec45df78a..444a4c3cb5 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -243,6 +243,7 @@ public:
 
 	ECursorType	getHoverCursor() { return mHoverCursor; }
 
+    static F32 getTooltipTimeout();
 	virtual const std::string getToolTip() const			{ return mToolTipMsg.getString(); }
 
 	void		sendChildToFront(LLView* child);
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index cd288e9603..af96561c45 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -136,14 +136,17 @@ BOOL LLInspectTexture::postBuild()
 
 LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
 {
-	const LLSD& sdTooltip = p.create_params;
+    const LLSD& sdTooltip = p.create_params;
+    
+    if (sdTooltip.has("thumbnail_id"))
+    {
+        // go straight for tooltip regardless of type
+        return LLUICtrlFactory::create<LLTextureToolTip>(p);
+    }
 
 	LLInventoryType::EType eInvType = (sdTooltip.has("inv_type")) ? (LLInventoryType::EType)sdTooltip["inv_type"].asInteger() : LLInventoryType::IT_NONE;
 	switch (eInvType)
 	{
-		case LLInventoryType::IT_SNAPSHOT:
-		case LLInventoryType::IT_TEXTURE:
-			return LLUICtrlFactory::create<LLTextureToolTip>(p);
 		case LLInventoryType::IT_CATEGORY:
 			{
 				if (sdTooltip.has("item_id"))
@@ -277,23 +280,27 @@ LLTextureToolTip::~LLTextureToolTip()
 
 void LLTextureToolTip::initFromParams(const LLToolTip::Params& p)
 {
-	LLToolTip::initFromParams(p);
-
-	// Create and add the preview control
-	LLView::Params p_preview;
-	p_preview.name = "texture_preview";
-	LLRect rctPreview;
-	rctPreview.setOriginAndSize(mPadding, mTextBox->getRect().mTop, mPreviewSize, mPreviewSize);
-	p_preview.rect = rctPreview;
-	mPreviewView = LLUICtrlFactory::create<LLTexturePreviewView>(p_preview);
-	addChild(mPreviewView);
-
-	// Parse the control params
-	const LLSD& sdTextureParams = p.create_params;
-	if (sdTextureParams.has("asset_id"))
-		mPreviewView->setImageFromAssetId(sdTextureParams["asset_id"].asUUID());
-	else if (sdTextureParams.has("item_id"))
-		mPreviewView->setImageFromItemId(sdTextureParams["item_id"].asUUID());
+    LLToolTip::initFromParams(p);
+    
+    // Create and add the preview control
+    LLView::Params p_preview;
+    p_preview.name = "texture_preview";
+    LLRect rctPreview;
+    rctPreview.setOriginAndSize(mPadding, mTextBox->getRect().mTop, mPreviewSize, mPreviewSize);
+    p_preview.rect = rctPreview;
+    mPreviewView = LLUICtrlFactory::create<LLTexturePreviewView>(p_preview);
+    addChild(mPreviewView);
+    
+    // Parse the control params
+    const LLSD& sdTextureParams = p.create_params;
+    if (sdTextureParams.has("thumbnail_id"))
+    {
+        mPreviewView->setImageFromAssetId(sdTextureParams["thumbnail_id"].asUUID());
+    }
+    else if (sdTextureParams.has("item_id"))
+    {
+        mPreviewView->setImageFromItemId(sdTextureParams["item_id"].asUUID());
+    }
 
 	snapToChildren();
 }
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index dabe633b8c..d6f4b8f103 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1285,16 +1285,16 @@ BOOL LLInventoryPanel::handleToolTip(S32 x, S32 y, MASK mask)
 	{
 		if (const LLFolderViewModelItemInventory* vm_item_p = static_cast<const LLFolderViewModelItemInventory*>(hover_item_p->getViewModelItem()))
 		{
-			// Copy/pasted from LLView::handleToolTip()
-			F32 nTimeout = LLToolTipMgr::instance().toolTipVisible()
-					? LLUI::getInstance()->mSettingGroups["config"]->getF32("ToolTipFastDelay")
-					: LLUI::getInstance()->mSettingGroups["config"]->getF32("ToolTipDelay");
+            LLSD params;
+            params["inv_type"] = vm_item_p->getInventoryType();
+            params["item_id"] = vm_item_p->getUUID();
+            
 			LLToolTipMgr::instance().show(LLToolTip::Params()
 					.message(hover_item_p->getToolTip())
 					.sticky_rect(hover_item_p->calcScreenRect())
-					.delay_time(nTimeout)
+					.delay_time(LLView::getTooltipTimeout())
 					.create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
-					.create_params(LLSD().with("inv_type", vm_item_p->getInventoryType()).with("item_id", vm_item_p->getUUID())));
+					.create_params(params));
 			return TRUE;
 		}
 	}
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 299047d91b..13505a2cf3 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -246,12 +246,17 @@ public:
 	}
 	virtual BOOL				handleToolTip(S32 x, S32 y, MASK mask )
 	{ 
-		if (LLAssetType::AT_TEXTURE == mItem->getType())
+		if (mItem->getThumbnailUUID().notNull())
 		{
+            LLSD params;
+            params["inv_type"] = mItem->getInventoryType();
+            params["thumbnail_id"] = mItem->getThumbnailUUID();
+            params["asset_id"] = mItem->getAssetUUID();
+            
 			LLToolTipMgr::instance().show(LLToolTip::Params()
 					.message(mToolTip)
 					.create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
-					.create_params(LLSD().with("inv_type", mItem->getInventoryType()).with("asset_id", mItem->getAssetUUID())));
+					.create_params(params));
 
 			return TRUE;
 		}
-- 
cgit v1.2.3


From 999c8cd3b92cdc64549167a261c8c629edc03c55 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 1 Feb 2023 01:33:30 +0200
Subject: SL-19117 Textures should return asset id when thumbnail is not set

---
 indra/llinventory/llinventory.cpp          | 11 +++++++++++
 indra/llinventory/llinventory.h            |  1 +
 indra/newview/llfolderviewmodelinventory.h |  1 +
 indra/newview/llinspecttexture.cpp         |  2 +-
 indra/newview/llinventorybridge.cpp        | 15 +++++++++++++++
 indra/newview/llinventorybridge.h          |  2 ++
 indra/newview/llinventorypanel.cpp         |  1 +
 indra/newview/llpanelobjectinventory.cpp   |  1 +
 8 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index b897198d10..e00f652622 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -349,6 +349,7 @@ void LLInventoryItem::copyItem(const LLInventoryItem* other)
 	copyObject(other);
 	mPermissions = other->mPermissions;
 	mAssetUUID = other->mAssetUUID;
+    mThumbnailUUID = other->mThumbnailUUID;
 	mDescription = other->mDescription;
 	mSaleInfo = other->mSaleInfo;
 	mInventoryType = other->mInventoryType;
@@ -413,6 +414,7 @@ U32 LLInventoryItem::getCRC32() const
 	//LL_DEBUGS() << "8 crc: " << std::hex << crc << std::dec << LL_ENDL;
 	crc += (U32)mCreationDate;
 	//LL_DEBUGS() << "9 crc: " << std::hex << crc << std::dec << LL_ENDL;
+    crc += mThumbnailUUID.getCRC32();
 	return crc;
 }
 
@@ -502,6 +504,15 @@ void LLInventoryItem::setSaleInfo(const LLSaleInfo& sale_info)
 	mSaleInfo = sale_info;
 }
 
+const LLUUID& LLInventoryItem::getThumbnailUUID() const
+{
+    if (mThumbnailUUID.isNull() && mType == LLAssetType::AT_TEXTURE)
+    {
+        return mAssetUUID;
+    }
+    return mThumbnailUUID;
+}
+
 LLInventoryType::EType LLInventoryItem::getInventoryType() const
 {
 	return mInventoryType;
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index dfe8b7659b..7af542c49a 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -162,6 +162,7 @@ public:
 	virtual const std::string& getDescription() const;
 	virtual const std::string& getActualDescription() const; // Does not follow links
 	virtual const LLSaleInfo& getSaleInfo() const;
+    virtual const LLUUID& getThumbnailUUID() const;
 	virtual LLInventoryType::EType getInventoryType() const;
 	virtual U32 getFlags() const;
 	virtual time_t getCreationDate() const;
diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h
index de28091c32..87e49189d8 100644
--- a/indra/newview/llfolderviewmodelinventory.h
+++ b/indra/newview/llfolderviewmodelinventory.h
@@ -39,6 +39,7 @@ class LLFolderViewModelItemInventory
 public:
 	LLFolderViewModelItemInventory(class LLFolderViewModelInventory& root_view_model);
 	virtual const LLUUID& getUUID() const = 0;
+    virtual const LLUUID& getThumbnailUUID() const = 0;
 	virtual time_t getCreationDate() const = 0;	// UTC seconds
 	virtual void setCreationDate(time_t creation_date_utc) = 0;
 	virtual PermissionMask getPermissionMask() const = 0;
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index af96561c45..8a8d7ed1bb 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -138,7 +138,7 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
 {
     const LLSD& sdTooltip = p.create_params;
     
-    if (sdTooltip.has("thumbnail_id"))
+    if (sdTooltip.has("thumbnail_id") && sdTooltip["thumbnail_id"].asUUID().notNull())
     {
         // go straight for tooltip regardless of type
         return LLUICtrlFactory::create<LLTextureToolTip>(p);
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 7793b71f56..405c1f884a 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2154,6 +2154,21 @@ LLViewerInventoryItem* LLItemBridge::getItem() const
 	return item;
 }
 
+const LLUUID& LLItemBridge::getThumbnailUUID() const
+{
+    LLViewerInventoryItem* item = NULL;
+    LLInventoryModel* model = getInventoryModel();
+    if(model)
+    {
+        item = (LLViewerInventoryItem*)model->getItem(mUUID);
+    }
+    if (item)
+    {
+        return item->getThumbnailUUID();
+    }
+    return LLUUID::null;
+}
+
 BOOL LLItemBridge::isItemPermissive() const
 {
 	LLViewerInventoryItem* item = getItem();
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index bdffecf1c6..d56e0b778d 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -84,6 +84,7 @@ public:
 	// LLInvFVBridge functionality
 	//--------------------------------------------------------------------
 	virtual const LLUUID& getUUID() const { return mUUID; }
+    virtual const LLUUID& getThumbnailUUID() const { return LLUUID::null; }
 	virtual void clearDisplayName() { mDisplayName.clear(); }
 	virtual void restoreItem() {}
 	virtual void restoreToWorld() {}
@@ -251,6 +252,7 @@ public:
 	virtual LLUIImagePtr getIconOverlay() const;
 
 	LLViewerInventoryItem* getItem() const;
+    virtual const LLUUID& getThumbnailUUID() const;
 
 protected:
 	BOOL confirmRemoveItem(const LLSD& notification, const LLSD& response);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index d6f4b8f103..e013de2491 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1287,6 +1287,7 @@ BOOL LLInventoryPanel::handleToolTip(S32 x, S32 y, MASK mask)
 		{
             LLSD params;
             params["inv_type"] = vm_item_p->getInventoryType();
+            params["thumbnail_id"] = vm_item_p->getThumbnailUUID();
             params["item_id"] = vm_item_p->getUUID();
             
 			LLToolTipMgr::instance().show(LLToolTip::Params()
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index fff25c6c61..70da9e430a 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -116,6 +116,7 @@ public:
 	virtual PermissionMask getPermissionMask() const { return PERM_NONE; }
 	/*virtual*/ LLFolderType::EType getPreferredType() const { return LLFolderType::FT_NONE; }
 	virtual const LLUUID& getUUID() const { return mUUID; }
+    virtual const LLUUID& getThumbnailUUID() const { return LLUUID::null;}
 	virtual time_t getCreationDate() const;
 	virtual void setCreationDate(time_t creation_date_utc);
 
-- 
cgit v1.2.3


From ac3f1b54ec6484442ea302570c14707e8bb263d2 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <mnikolenko@productengine.com>
Date: Wed, 1 Feb 2023 18:44:26 +0200
Subject: SL-19104 Clean up inventory UI to prepare for thumbnails (#66)

---
 indra/newview/llfolderviewmodelinventory.h         |   1 +
 indra/newview/llinventorybridge.cpp                |  10 ++
 indra/newview/llinventorybridge.h                  |   1 +
 indra/newview/llinventoryfilter.cpp                |  21 +++
 indra/newview/llinventoryfilter.h                  |   4 +-
 indra/newview/llpanelmaininventory.cpp             |  46 ++----
 indra/newview/llpanelmaininventory.h               |   5 +-
 indra/newview/llpanelmarketplaceinbox.cpp          |   3 -
 indra/newview/llsidepanelinventory.cpp             | 156 +--------------------
 indra/newview/llsidepanelinventory.h               |  15 --
 .../default/xui/en/menu_inventory_gear_default.xml |  93 ++++--------
 .../xui/en/menu_inventory_search_visibility.xml    |  11 ++
 .../default/xui/en/menu_inventory_view_default.xml |  53 +++++++
 .../skins/default/xui/en/panel_main_inventory.xml  | 151 ++++++++------------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 125 +----------------
 15 files changed, 210 insertions(+), 485 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_inventory_view_default.xml

(limited to 'indra')

diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h
index 87e49189d8..1649b2eed7 100644
--- a/indra/newview/llfolderviewmodelinventory.h
+++ b/indra/newview/llfolderviewmodelinventory.h
@@ -46,6 +46,7 @@ public:
 	virtual LLFolderType::EType getPreferredType() const = 0;
 	virtual void showProperties(void) = 0;
 	virtual BOOL isItemInTrash( void) const { return FALSE; } // TODO: make   into pure virtual.
+    virtual bool isItemInOutfits() const { return false; }
 	virtual BOOL isAgentInventory() const { return FALSE; }
 	virtual BOOL isUpToDate() const = 0;
     virtual void addChild(LLFolderViewModelItem* child);
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 405c1f884a..8197a698e4 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1244,6 +1244,16 @@ BOOL LLInvFVBridge::isLinkedObjectInTrash() const
 	return FALSE;
 }
 
+bool LLInvFVBridge::isItemInOutfits() const
+{
+    const LLInventoryModel* model = getInventoryModel();
+    if(!model) return false;
+
+    const LLUUID my_outfits_cat = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+
+    return isCOFFolder() || (my_outfits_cat == mUUID) || model->isObjectDescendentOf(mUUID, my_outfits_cat);
+}
+
 BOOL LLInvFVBridge::isLinkedObjectMissing() const
 {
 	const LLInventoryObject *obj = getInventoryObject();
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index d56e0b778d..e560dff0e4 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -115,6 +115,7 @@ public:
 	virtual BOOL isItemRemovable() const;
 	virtual BOOL isItemMovable() const;
 	virtual BOOL isItemInTrash() const;
+    virtual bool isItemInOutfits() const;
 	virtual BOOL isLink() const;
 	virtual BOOL isLibraryItem() const;
 	//virtual BOOL removeItem() = 0;
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 707ff2b7b6..855de7a362 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -596,6 +596,9 @@ bool LLInventoryFilter::checkAgainstSearchVisibility(const LLFolderViewModelItem
 	if (is_link && ((mFilterOps.mSearchVisibility & VISIBILITY_LINKS) == 0))
 		return FALSE;
 
+    if (listener->isItemInOutfits() && ((mFilterOps.mSearchVisibility & VISIBILITY_OUTFITS) == 0))
+        return FALSE;
+
 	if (listener->isItemInTrash() && ((mFilterOps.mSearchVisibility & VISIBILITY_TRASH) == 0))
 		return FALSE;
 
@@ -792,6 +795,24 @@ void LLInventoryFilter::toggleSearchVisibilityLinks()
 	}
 }
 
+void LLInventoryFilter::toggleSearchVisibilityOutfits()
+{
+    bool hide_outfits = mFilterOps.mSearchVisibility & VISIBILITY_OUTFITS;
+    if (hide_outfits)
+    {
+        mFilterOps.mSearchVisibility &= ~VISIBILITY_OUTFITS;
+    }
+    else
+    {
+        mFilterOps.mSearchVisibility |= VISIBILITY_OUTFITS;
+    }
+
+    if (hasFilterString())
+    {
+        setModified(hide_outfits ? FILTER_MORE_RESTRICTIVE : FILTER_LESS_RESTRICTIVE);
+    }
+}
+
 void LLInventoryFilter::toggleSearchVisibilityTrash()
 {
 	bool hide_trash = mFilterOps.mSearchVisibility & VISIBILITY_TRASH;
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 384de3e889..72deb7c76b 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -104,7 +104,8 @@ public:
 		VISIBILITY_NONE = 0,
 		VISIBILITY_TRASH = 0x1 << 0,
 		VISIBILITY_LIBRARY = 0x1 << 1,
-		VISIBILITY_LINKS	= 0x1 << 2
+		VISIBILITY_LINKS	= 0x1 << 2,
+        VISIBILITY_OUTFITS    = 0x1 << 3
 	};
 
 	struct FilterOps
@@ -228,6 +229,7 @@ public:
 
 	void				toggleSearchVisibilityLinks();
 	void				toggleSearchVisibilityTrash();
+    void                toggleSearchVisibilityOutfits();
 	void				toggleSearchVisibilityLibrary();
 	void 				setSearchVisibilityTypes(U32 types);
 	void 				setSearchVisibilityTypes(const Params& params);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 89256b40c4..b2953e9c99 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -113,7 +113,8 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	  mMenuGearDefault(NULL),
 	  mMenuVisibility(NULL),
 	  mMenuAddHandle(),
-	  mNeedUploadCost(true)
+	  mNeedUploadCost(true),
+      mMenuViewDefault(NULL)
 {
 	// Menu Callbacks (non contex menus)
 	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2));
@@ -237,6 +238,7 @@ BOOL LLPanelMainInventory::postBuild()
 
 	mGearMenuButton = getChild<LLMenuButton>("options_gear_btn");
 	mVisibilityMenuButton = getChild<LLMenuButton>("options_visibility_btn");
+    mViewMenuButton = getChild<LLMenuButton>("view_btn");
 
 	initListCommandsHandlers();
 
@@ -1163,21 +1165,15 @@ void LLFloaterInventoryFinder::selectNoTypes(void* user_data)
 
 void LLPanelMainInventory::initListCommandsHandlers()
 {
-	childSetAction("trash_btn", boost::bind(&LLPanelMainInventory::onTrashButtonClick, this));
 	childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddButtonClick, this));
 
-	mTrashButton = getChild<LLDragAndDropButton>("trash_btn");
-	mTrashButton->setDragAndDropHandler(boost::bind(&LLPanelMainInventory::handleDragAndDropToTrash, this
-			,	_4 // BOOL drop
-			,	_5 // EDragAndDropType cargo_type
-			,	_7 // EAcceptance* accept
-			));
-
 	mCommitCallbackRegistrar.add("Inventory.GearDefault.Custom.Action", boost::bind(&LLPanelMainInventory::onCustomAction, this, _2));
 	mEnableCallbackRegistrar.add("Inventory.GearDefault.Check", boost::bind(&LLPanelMainInventory::isActionChecked, this, _2));
 	mEnableCallbackRegistrar.add("Inventory.GearDefault.Enable", boost::bind(&LLPanelMainInventory::isActionEnabled, this, _2));
 	mMenuGearDefault = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_inventory_gear_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	mGearMenuButton->setMenu(mMenuGearDefault);
+    mMenuViewDefault = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_inventory_view_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+    mViewMenuButton->setMenu(mMenuViewDefault);
 	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory_add.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	mMenuAddHandle = menu->getHandle();
 
@@ -1191,9 +1187,6 @@ void LLPanelMainInventory::initListCommandsHandlers()
 
 void LLPanelMainInventory::updateListCommands()
 {
-	bool trash_enabled = isActionEnabled("delete");
-
-	mTrashButton->setEnabled(trash_enabled);
 }
 
 void LLPanelMainInventory::onAddButtonClick()
@@ -1227,11 +1220,6 @@ void LLPanelMainInventory::showActionMenu(LLMenuGL* menu, std::string spawning_v
 	}
 }
 
-void LLPanelMainInventory::onTrashButtonClick()
-{
-	onClipboardAction("delete");
-}
-
 void LLPanelMainInventory::onClipboardAction(const LLSD& userdata)
 {
 	std::string command_name = userdata.asString();
@@ -1375,6 +1363,11 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 		LLFloaterReg::showInstance("linkreplace", params);
 	}
 
+    if (command_name == "toggle_search_outfits")
+    {
+        mActivePanel->getFilter().toggleSearchVisibilityOutfits();
+    }
+
 	if (command_name == "toggle_search_trash")
 	{
 		mActivePanel->getFilter().toggleSearchVisibilityTrash();
@@ -1534,6 +1527,11 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 		return sort_order_mask & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
 	}
 
+    if (command_name == "toggle_search_outfits")
+    {
+        return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_OUTFITS) != 0;
+    }
+
 	if (command_name == "toggle_search_trash")
 	{
 		return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_TRASH) != 0;
@@ -1552,20 +1550,6 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 	return FALSE;
 }
 
-bool LLPanelMainInventory::handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, EAcceptance* accept)
-{
-	*accept = ACCEPT_NO;
-
-	const bool is_enabled = isActionEnabled("delete");
-	if (is_enabled) *accept = ACCEPT_YES_MULTI;
-
-	if (is_enabled && drop)
-	{
-		onClipboardAction("delete");
-	}
-	return true;
-}
-
 void LLPanelMainInventory::setUploadCostIfNeeded()
 {
 	LLMenuGL* menu = (LLMenuGL*)mMenuAddHandle.get();
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 257bce930c..1f07d381ba 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -158,22 +158,21 @@ protected:
 	void updateListCommands();
 	void onAddButtonClick();
 	void showActionMenu(LLMenuGL* menu, std::string spawning_view_name);
-	void onTrashButtonClick();
 	void onClipboardAction(const LLSD& userdata);
 	BOOL isActionEnabled(const LLSD& command_name);
 	BOOL isActionChecked(const LLSD& userdata);
 	void onCustomAction(const LLSD& command_name);
-	bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, EAcceptance* accept);
     static bool hasSettingsInventory();
 	/**
 	 * Set upload cost in "Upload" sub menu.
 	 */
 	void setUploadCostIfNeeded();
 private:
-	LLDragAndDropButton*		mTrashButton;
 	LLToggleableMenu*			mMenuGearDefault;
+    LLToggleableMenu*           mMenuViewDefault;
 	LLToggleableMenu*			mMenuVisibility;
 	LLMenuButton*				mGearMenuButton;
+    LLMenuButton*               mViewMenuButton;
 	LLMenuButton*				mVisibilityMenuButton;
 	LLHandle<LLView>			mMenuAddHandle;
 
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index 8a86f4f63d..3638ee14fc 100644
--- a/indra/newview/llpanelmarketplaceinbox.cpp
+++ b/indra/newview/llpanelmarketplaceinbox.cpp
@@ -75,9 +75,6 @@ BOOL LLPanelMarketplaceInbox::postBuild()
 
 void LLPanelMarketplaceInbox::onSelectionChange()
 {
-	LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
-		
-	sidepanel_inventory->updateVerbs();
 }
 
 
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index a5dcdc41ed..4843e481e8 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -158,29 +158,11 @@ BOOL LLSidepanelInventory::postBuild()
 	// UI elements from inventory panel
 	{
 		mInventoryPanel = getChild<LLPanel>("sidepanel_inventory_panel");
-
-		mInfoBtn = mInventoryPanel->getChild<LLButton>("info_btn");
-		mInfoBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onInfoButtonClicked, this));
-		
-		mShareBtn = mInventoryPanel->getChild<LLButton>("share_btn");
-		mShareBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onShareButtonClicked, this));
-		
-		mShopBtn = mInventoryPanel->getChild<LLButton>("shop_btn");
-		mShopBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onShopButtonClicked, this));
-
-		mWearBtn = mInventoryPanel->getChild<LLButton>("wear_btn");
-		mWearBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onWearButtonClicked, this));
-		
-		mPlayBtn = mInventoryPanel->getChild<LLButton>("play_btn");
-		mPlayBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onPlayButtonClicked, this));
-		
-		mTeleportBtn = mInventoryPanel->getChild<LLButton>("teleport_btn");
-		mTeleportBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onTeleportButtonClicked, this));
 		
 		mPanelMainInventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
 		mPanelMainInventory->setSelectCallback(boost::bind(&LLSidepanelInventory::onSelectionChange, this, _1, _2));
-		LLTabContainer* tabs = mPanelMainInventory->getChild<LLTabContainer>("inventory filter tabs");
-		tabs->setCommitCallback(boost::bind(&LLSidepanelInventory::updateVerbs, this));
+		//LLTabContainer* tabs = mPanelMainInventory->getChild<LLTabContainer>("inventory filter tabs");
+		//tabs->setCommitCallback(boost::bind(&LLSidepanelInventory::updateVerbs, this));
 
 		/* 
 		   EXT-4846 : "Can we suppress the "Landmarks" and "My Favorites" folder since they have their own Task Panel?"
@@ -190,7 +172,7 @@ BOOL LLSidepanelInventory::postBuild()
 		my_inventory_panel->addHideFolderType(LLFolderType::FT_FAVORITE);
 		*/
 
-		LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&LLSidepanelInventory::updateVerbs, this));
+		//LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&LLSidepanelInventory::updateVerbs, this));
 	}
 
 	// UI elements from item panel
@@ -240,9 +222,6 @@ BOOL LLSidepanelInventory::postBuild()
 
 	gSavedSettings.getControl("InventoryDisplayInbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayInboxChanged));
 
-	// Update the verbs buttons state.
-	updateVerbs();
-
 	return TRUE;
 }
 
@@ -431,27 +410,6 @@ void LLSidepanelInventory::onOpen(const LLSD& key)
 	}
 }
 
-void LLSidepanelInventory::onInfoButtonClicked()
-{
-	LLInventoryItem *item = getSelectedItem();
-	if (item)
-	{
-		mItemPanel->reset();
-		mItemPanel->setItemID(item->getUUID());
-		showItemInfoPanel();
-	}
-}
-
-void LLSidepanelInventory::onShareButtonClicked()
-{
-	LLAvatarActions::shareWithAvatars(this);
-}
-
-void LLSidepanelInventory::onShopButtonClicked()
-{
-	LLWeb::loadURL(gSavedSettings.getString("MarketplaceURL"));
-}
-
 void LLSidepanelInventory::performActionOnSelection(const std::string &action)
 {
 	LLFolderViewItem* current_item = mPanelMainInventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
@@ -471,47 +429,6 @@ void LLSidepanelInventory::performActionOnSelection(const std::string &action)
 	static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->performAction(mPanelMainInventory->getActivePanel()->getModel(), action);
 }
 
-void LLSidepanelInventory::onWearButtonClicked()
-{
-	// Get selected items set.
-	const std::set<LLUUID> selected_uuids_set = LLAvatarActions::getInventorySelectedUUIDs();
-	if (selected_uuids_set.empty()) return; // nothing selected
-
-	// Convert the set to a vector.
-	uuid_vec_t selected_uuids_vec;
-	for (std::set<LLUUID>::const_iterator it = selected_uuids_set.begin(); it != selected_uuids_set.end(); ++it)
-	{
-		selected_uuids_vec.push_back(*it);
-	}
-
-	// Wear all selected items.
-	wear_multiple(selected_uuids_vec, true);
-}
-
-void LLSidepanelInventory::onPlayButtonClicked()
-{
-	const LLInventoryItem *item = getSelectedItem();
-	if (!item)
-	{
-		return;
-	}
-
-	switch(item->getInventoryType())
-	{
-	case LLInventoryType::IT_GESTURE:
-		performActionOnSelection("play");
-		break;
-	default:
-		performActionOnSelection("open");
-		break;
-	}
-}
-
-void LLSidepanelInventory::onTeleportButtonClicked()
-{
-	performActionOnSelection("teleport");
-}
-
 void LLSidepanelInventory::onBackButtonClicked()
 {
 	showInventoryPanel();
@@ -519,7 +436,7 @@ void LLSidepanelInventory::onBackButtonClicked()
 
 void LLSidepanelInventory::onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action)
 {
-	updateVerbs();
+
 }
 
 void LLSidepanelInventory::showItemInfoPanel()
@@ -552,69 +469,6 @@ void LLSidepanelInventory::showInventoryPanel()
 	if (mTaskPanel)
 		mTaskPanel->setVisible(FALSE);
 	mInventoryPanel->setVisible(TRUE);
-	updateVerbs();
-}
-
-void LLSidepanelInventory::updateVerbs()
-{
-	mInfoBtn->setEnabled(FALSE);
-	mShareBtn->setEnabled(FALSE);
-
-	mWearBtn->setVisible(FALSE);
-	mWearBtn->setEnabled(FALSE);
-	mPlayBtn->setVisible(FALSE);
-	mPlayBtn->setEnabled(FALSE);
-	mPlayBtn->setToolTip(std::string(""));
- 	mTeleportBtn->setVisible(FALSE);
- 	mTeleportBtn->setEnabled(FALSE);
- 	mShopBtn->setVisible(TRUE);
-
-	mShareBtn->setEnabled(canShare());
-
-	const LLInventoryItem *item = getSelectedItem();
-	if (!item)
-		return;
-
-	bool is_single_selection = getSelectedCount() == 1;
-
-	mInfoBtn->setEnabled(is_single_selection);
-
-	switch(item->getInventoryType())
-	{
-		case LLInventoryType::IT_WEARABLE:
-		case LLInventoryType::IT_OBJECT:
-		case LLInventoryType::IT_ATTACHMENT:
-			mWearBtn->setVisible(TRUE);
-			mWearBtn->setEnabled(canWearSelected());
-		 	mShopBtn->setVisible(FALSE);
-			break;
-		case LLInventoryType::IT_SOUND:
-			mPlayBtn->setVisible(TRUE);
-			mPlayBtn->setEnabled(TRUE);
-			mPlayBtn->setToolTip(LLTrans::getString("InventoryPlaySoundTooltip"));
-			mShopBtn->setVisible(FALSE);
-			break;
-		case LLInventoryType::IT_GESTURE:
-			mPlayBtn->setVisible(TRUE);
-			mPlayBtn->setEnabled(TRUE);
-			mPlayBtn->setToolTip(LLTrans::getString("InventoryPlayGestureTooltip"));
-			mShopBtn->setVisible(FALSE);
-			break;
-		case LLInventoryType::IT_ANIMATION:
-			mPlayBtn->setVisible(TRUE);
-			mPlayBtn->setEnabled(TRUE);
-			mPlayBtn->setEnabled(TRUE);
-			mPlayBtn->setToolTip(LLTrans::getString("InventoryPlayAnimationTooltip"));
-			mShopBtn->setVisible(FALSE);
-			break;
-		case LLInventoryType::IT_LANDMARK:
-			mTeleportBtn->setVisible(TRUE);
-			mTeleportBtn->setEnabled(TRUE);
-		 	mShopBtn->setVisible(FALSE);
-			break;
-		default:
-			break;
-	}
 }
 
 bool LLSidepanelInventory::canShare()
@@ -741,8 +595,6 @@ void LLSidepanelInventory::clearSelections(bool clearMain, bool clearInbox)
 	{
 		mInventoryPanelInbox.get()->getRootFolder()->clearSelection();
 	}
-	
-	updateVerbs();
 }
 
 std::set<LLFolderViewItem*> LLSidepanelInventory::getInboxSelectionList()
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
index a3cd20a2c6..731eb7cba7 100644
--- a/indra/newview/llsidepanelinventory.h
+++ b/indra/newview/llsidepanelinventory.h
@@ -81,8 +81,6 @@ public:
 	
 	bool isInboxEnabled() const { return mInboxEnabled; }
 
-	void updateVerbs();
-
 	static void cleanup();
 
 protected:
@@ -108,22 +106,9 @@ private:
 	LLPanelMainInventory*		mPanelMainInventory;
 
 protected:
-	void 						onInfoButtonClicked();
-	void 						onShareButtonClicked();
-	void 						onShopButtonClicked();
-	void 						onWearButtonClicked();
-	void 						onPlayButtonClicked();
-	void 						onTeleportButtonClicked();
 	void 						onBackButtonClicked();
 
 private:
-	LLButton*					mInfoBtn;
-	LLButton*					mShareBtn;
-	LLButton*					mWearBtn;
-	LLButton*					mPlayBtn;
-	LLButton*					mTeleportBtn;
-	LLButton*					mShopBtn;
-
 	bool						mInboxEnabled;
 
 	LLInventoryCategoriesObserver* 	mCategoriesObserver;
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 3eacdbc781..3fb2e01e5b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -7,60 +7,32 @@
  name="menu_gear_default"
  visible="false">
     <menu_item_call
-     label="New Inventory Window"
+     label="New Folder Window"
      layout="topleft"
-     shortcut="control|shift|I"
-     name="new_window">
+     shortcut="control|shift|J"
+     enabled="false"
+     name="new_single_folder">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="new_window" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_check
-     label="Sort by Name"
-     layout="topleft"
-     name="sort_by_name">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort by Most Recent"
-     layout="topleft"
-     name="sort_by_recent">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_recent" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_recent" />         
-    </menu_item_check>
-    <menu_item_check
-     label="Sort Folders Always by Name"
+    <menu_item_call
+     label="New Inventory Window"
      layout="topleft"
-     name="sort_folders_by_name">
+     shortcut="control|shift|I"
+     name="new_window">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_folders_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_folders_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort System Folders to Top"
+         parameter="new_window" />
+    </menu_item_call>
+    <menu_item_call
+     label="Close All Folders"
      layout="topleft"
-     name="sort_system_folders_to_top">
+     name="close_folders">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_system_folders_to_top" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_system_folders_to_top" />
-    </menu_item_check>
+         parameter="close_folders" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
@@ -79,29 +51,6 @@
          function="Inventory.GearDefault.Custom.Action"
          parameter="reset_filters" />
     </menu_item_call>
-    <menu_item_call
-     label="Close All Folders"
-     layout="topleft"
-     name="close_folders">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="close_folders" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_call
-     label="Empty Lost and Found"
-     layout="topleft"
-     name="empty_lostnfound">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_lostnfound" />
-        <on_enable
-         function="Inventory.GearDefault.Enable"
-         parameter="empty_lostnfound" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
     <menu_item_call 
          label="Save Texture As"
          layout="topleft"
@@ -156,7 +105,17 @@
         </menu_item_call>
     <menu_item_separator
      layout="topleft" />
-
+    <menu_item_call
+     label="Empty Lost and Found"
+     layout="topleft"
+     name="empty_lostnfound">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_lostnfound" />
+        <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="empty_lostnfound" />
+    </menu_item_call>
     <menu_item_call
      label="Empty Trash"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
index 46193f4a7a..8e34f52f3a 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
@@ -6,6 +6,17 @@
  mouse_opaque="false"
  name="menu_search_visibility"
  visible="false">
+  <menu_item_check
+   label="Search outfit folders"
+   layout="topleft"
+   name="search_outfits">
+    <on_click
+     function="Inventory.GearDefault.Custom.Action"
+     parameter="toggle_search_outfits" />
+    <on_check
+     function="Inventory.GearDefault.Check"
+     parameter="toggle_search_outfits" />
+  </menu_item_check>
   <menu_item_check
    label="Search Trash"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
new file mode 100644
index 0000000000..6e3cfd9cee
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_view_default"
+ visible="false">
+    <menu_item_check
+     label="Sort by Name"
+     layout="topleft"
+     name="sort_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort by Most Recent"
+     layout="topleft"
+     name="sort_by_recent">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_recent" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_recent" />         
+    </menu_item_check>
+    <menu_item_check
+     label="Sort Folders Always by Name"
+     layout="topleft"
+     name="sort_folders_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_folders_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_folders_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort System Folders to Top"
+     layout="topleft"
+     name="sort_system_folders_to_top">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_system_folders_to_top" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_system_folders_to_top" />
+    </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 2ff58035ed..d437f98e91 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -7,7 +7,7 @@
  min_height="300"
  min_width="240"
  name="main inventory panel"
- width="330">
+ width="355">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -41,11 +41,11 @@
   <combo_box
    height="23"
    layout="topleft"
-   left="10"
+   left="3"
    top="18"
    name="search_type"
    follows="top|left"
-   width="88">
+   width="67">
     <item
      label="Name"
      name="Name"
@@ -69,7 +69,7 @@
    height="23"
    image_overlay="Inv_Toolbar_SearchVisibility"
    layout="topleft"
-   left_pad="3"
+   left_pad="1"
    name="options_visibility_btn"
    width="31" />
   <filter_editor
@@ -78,15 +78,64 @@
    height="23"
    label="Enter search text"
    layout="topleft"
-   left_pad="3"
+   left_pad="1"
    max_length_chars="300"
    highlight_text_field="true"
    name="inventory search editor"
-   width="177" />
+   width="99" />
+  <menu_button
+   follows="top|right"
+   tool_tip="Show additional options"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="OptionsMenu_Off"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   name="options_gear_btn"
+   width="31" />
+  <menu_button
+   follows="top|right"
+   tool_tip="View/sort options"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="Conv_toolbar_sort"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   name="view_btn"
+   width="31" />
+  <button
+   follows="top|right"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="AddItem_Off"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   name="add_btn"
+   tool_tip="Add new item"
+   width="31" />
+  <button
+   follows="top|right"
+   tool_tip="Toggles between traditional and single-folder views"
+   height="23"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="Command_Map_Icon"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   layout="topleft"
+   left_pad="1"
+   enabled="false"
+   name="view_mode_btn"
+   width="31" />
   <tab_container
      follows="all"
      halign="center"
-     height="339"
+     height="372"
      layout="topleft"
      left="7"
      name="inventory filter tabs"
@@ -142,92 +191,4 @@
       scroll.reserve_scroll_corner="false">
   </inventory_panel>
   </tab_container>
-  <layout_stack
-   animate="false"
-   border_size="0"
-   follows="left|right|bottom"
-   height="25"
-   layout="topleft"
-   orientation="horizontal"
-   top_pad="0"
-   left="10"
-   name="bottom_panel"
-   width="307">
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="options_gear_btn_panel"
-       width="32">
-          <menu_button
-           follows="bottom|left"
-           tool_tip="Show additional options"
-           height="25"
-           image_hover_unselected="Toolbar_Left_Over"
-           image_overlay="OptionsMenu_Off"
-           image_selected="Toolbar_Left_Selected"
-           image_unselected="Toolbar_Left_Off"
-           layout="topleft"
-           left="0"
-           name="options_gear_btn"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="add_btn_panel"
-       width="32">
-          <button
-           follows="bottom|left"
-           height="25"
-           image_hover_unselected="Toolbar_Middle_Over"
-           image_overlay="AddItem_Off"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           name="add_btn"
-           tool_tip="Add new item"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="true"
-       height="25"
-       layout="topleft"
-       name="dummy_panel"
-       width="212">
-          <icon
-           follows="bottom|left|right"
-           height="25"
-           image_name="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           top="0"
-           name="dummy_icon"
-           width="211" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="trash_btn_panel"
-       width="31">
-          <dnd_button
-           follows="bottom|left"
-           height="25"
-           image_hover_unselected="Toolbar_Right_Over"
-           image_overlay="TrashItem_Off"
-           image_selected="Toolbar_Right_Selected"
-           image_unselected="Toolbar_Right_Off"
-           left="0"
-           layout="topleft"
-           name="trash_btn"
-           tool_tip="Remove selected item"
-           top="0"
-           width="31"/>
-      </layout_panel>
-  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 9995523e61..bf50b1adfd 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -7,7 +7,7 @@
 	  min_height="350"
 	  min_width="240"
 	  name="objects panel"
-	  width="333">
+	  width="358">
     <panel
 		 follows="all"
 		 layout="topleft"
@@ -18,7 +18,7 @@
 		 height="570"
 		 visible="true"
 		 default_tab_group="1"
-		 width="330">
+		 width="355">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
@@ -27,15 +27,15 @@
 							tab_group="1"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="535"
-              width="330">
+              height="565"
+              width="355">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="330"
+                 width="355"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -48,10 +48,10 @@
                       top="0"
                       label=""
                       height="300"
-                      width="330" />
+                      width="355" />
              </layout_panel>
 			    <layout_panel
-                 width="330"
+                 width="355"
                  layout="topleft"
                  auto_resize="false"
                  user_resize="true"
@@ -133,117 +133,6 @@ Purchases from the marketplace will be delivered here.
                  </panel>
              </layout_panel>
          </layout_stack>
-			<panel follows="bottom|left|right"
-					 height="30"
-					 layout="topleft"
-					 name="button_panel"
-					 left="9"
-					 top_pad="7"
-					 width="308">
-				<layout_stack follows="bottom|left|right"
-											height="23"
-											layout="topleft"
-											mouse_opaque="false"
-											name="button_panel_ls"
-											left="0"
-											orientation="horizontal"
-											top="0"
-											width="308">	
-			    <layout_panel follows="bottom|left|right"
-												height="23"
-												layout="bottomleft"
-												left="0"			
-												mouse_opaque="false"
-												name="info_btn_lp"
-												auto_resize="true"
-												width="101">
-						<button enabled="true"
-										follows="bottom|left|right"
-										height="23"
-										label="Profile"
-										layout="topleft"
-										left="1"
-										name="info_btn"
-										tool_tip="Show object profile"
-										top="0"
-										width="100" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="share_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Share"
-                         layout="topleft"
-                         left="1"
-                         name="share_btn"
-                         tool_tip="Share an inventory item"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="shop_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Shop"
-                         layout="topleft"
-                         left="1"
-                         name="shop_btn"
-                         tool_tip="Open Marketplace webpage"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Wear"
-                         layout="topleft"
-                         left="1"
-                         name="wear_btn"
-                         tool_tip="Wear seleceted outfit"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Play"
-                         layout="topleft"
-                         name="play_btn"
-                         left="1"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Teleport"
-                         layout="topleft"
-                         left="1"
-                         name="teleport_btn"
-                         tool_tip="Teleport to the selected area"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			</layout_stack>
-		</panel>
 	</panel>
 	<panel
 		 follows="all"
-- 
cgit v1.2.3


From db80fdb55b646164a71c58e9f4751b368afa3b9f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 1 Feb 2023 23:56:42 +0200
Subject: SL-19104 update label and permissions display

---
 indra/llui/llfolderviewitem.cpp                |  7 ++++---
 indra/newview/llinventorybridge.cpp            | 13 ++++++++-----
 indra/newview/llinventorypanel.cpp             |  2 +-
 indra/newview/skins/default/xui/en/strings.xml |  7 +++++--
 4 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index d10130619a..5d08d62b4b 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -162,7 +162,7 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 		sMouseOverColor = LLUIColorTable::instance().getColor("InventoryMouseOverColor", DEFAULT_WHITE);
 		sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
 		sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
-		sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemColor", DEFAULT_WHITE);
+		sSuffixColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
 		sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 		sColorSetInitialized = true;
 	}
@@ -395,7 +395,7 @@ S32 LLFolderViewItem::arrange( S32* width, S32* height )
             // it is purely visual, so it is fine to do at our laisure
             refreshSuffix();
         }
-		mLabelWidth = getLabelXPos() + getLabelFontForStyle(mLabelStyle)->getWidth(mLabel) + getLabelFontForStyle(mLabelStyle)->getWidth(mLabelSuffix) + mLabelPaddingRight; 
+		mLabelWidth = getLabelXPos() + getLabelFontForStyle(mLabelStyle)->getWidth(mLabel) + getLabelFontForStyle(LLFontGL::NORMAL)->getWidth(mLabelSuffix) + mLabelPaddingRight; 
 		mLabelWidthDirty = false;
 	}
 
@@ -961,7 +961,8 @@ void LLFolderViewItem::draw()
 	//
 	if (!mLabelSuffix.empty())
 	{
-		font->renderUTF8( mLabelSuffix, 0, right_x, y, isFadeItem() ? color : (LLColor4)sSuffixColor,
+        const LLFontGL* suffix_font = getLabelFontForStyle(LLFontGL::NORMAL);
+        suffix_font->renderUTF8( mLabelSuffix, 0, right_x, y, isFadeItem() ? color : (LLColor4)sSuffixColor,
 						  LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
 						  S32_MAX, S32_MAX, &right_x, FALSE );
 	}
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 8197a698e4..ae1ac6cc1e 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1963,9 +1963,9 @@ std::string LLItemBridge::getLabelSuffix() const
 {
 	// String table is loaded before login screen and inventory items are
 	// loaded after login, so LLTrans should be ready.
-	static std::string NO_COPY = LLTrans::getString("no_copy");
-	static std::string NO_MOD = LLTrans::getString("no_modify");
-	static std::string NO_XFER = LLTrans::getString("no_transfer");
+	static std::string NO_COPY = LLTrans::getString("no_copy_lbl");
+	static std::string NO_MOD = LLTrans::getString("no_modify_lbl");
+	static std::string NO_XFER = LLTrans::getString("no_transfer_lbl");
 	static std::string LINK = LLTrans::getString("link");
 	static std::string BROKEN_LINK = LLTrans::getString("broken_link");
 	std::string suffix;
@@ -1986,17 +1986,20 @@ std::string LLItemBridge::getLabelSuffix() const
 			BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID());
 			if (!copy)
 			{
+                suffix += " ";
 				suffix += NO_COPY;
 			}
 			BOOL mod = item->getPermissions().allowModifyBy(gAgent.getID());
 			if (!mod)
 			{
-				suffix += NO_MOD;
+                suffix += suffix.empty() ? " " : ",";
+                suffix += NO_MOD;
 			}
 			BOOL xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER,
 																gAgent.getID());
 			if (!xfer)
 			{
+                suffix += suffix.empty() ? " " : ",";
 				suffix += NO_XFER;
 			}
 		}
@@ -5987,7 +5990,7 @@ std::string LLCallingCardBridge::getLabelSuffix() const
 	LLViewerInventoryItem* item = getItem();
 	if( item && LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID()) )
 	{
-		return LLItemBridge::getLabelSuffix() + " (online)";
+		return LLItemBridge::getLabelSuffix() + "  online";
 	}
 	else
 	{
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index e013de2491..a825d04d7d 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -167,7 +167,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 
 	if (!sColorSetInitialized)
 	{
-		sDefaultColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
+		sDefaultColor = LLUIColorTable::instance().getColor("InventoryItemColor", DEFAULT_WHITE);
 		sDefaultHighlightColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
 		sLibraryColor = LLUIColorTable::instance().getColor("InventoryItemLibraryColor", DEFAULT_WHITE);
 		sLinkColor = LLUIColorTable::instance().getColor("InventoryItemLinkColor", DEFAULT_WHITE);
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cf5d98aa9a..a3dfb9a618 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2395,8 +2395,11 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="no_modify"   value=" (no modify)" />
 	<string name="no_copy"     value=" (no copy)" />
 	<string name="worn"        value=" (worn)" />
-	<string name="link"        value=" (link)" />
-	<string name="broken_link" value=" (broken_link)" />
+	<string name="link"        value="  link" />
+	<string name="broken_link" value="  broken_link" />
+    <string name="no_transfer_lbl" value=" no transfer" />
+    <string name="no_modify_lbl"   value=" no modify" />
+    <string name="no_copy_lbl"     value=" no copy" />
 	<string name="LoadingContents">Loading contents...</string>
 	<string name="NoContents">No contents</string>
 	<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
-- 
cgit v1.2.3


From 2d6edb088e185fe1116c29fd028e9019ffe53607 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 3 Feb 2023 22:22:11 +0200
Subject: SL-19149 Highlight string match is misplaced when searching worn
 items

---
 indra/llui/llfolderviewitem.cpp | 65 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 5d08d62b4b..115cfcf3a0 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -935,16 +935,43 @@ void LLFolderViewItem::draw()
 	F32 text_left = (F32)getLabelXPos();
 	std::string combined_string = mLabel + mLabelSuffix;
 
+    const LLFontGL* suffix_font = getLabelFontForStyle(LLFontGL::NORMAL);
+    S32 filter_offset = mViewModelItem->getFilterStringOffset();
 	if (filter_string_length > 0)
 	{
-		S32 left = ll_round(text_left) + font->getWidth(combined_string, 0, mViewModelItem->getFilterStringOffset()) - 2;
+        S32 bottom = llfloor(getRect().getHeight() - font->getLineHeight() - 3 - TOP_PAD);
+        S32 top = getRect().getHeight() - TOP_PAD;
+        if(mLabelSuffix.empty() || (font == suffix_font))
+        {
+        S32 left = ll_round(text_left) + font->getWidth(combined_string, 0, mViewModelItem->getFilterStringOffset()) - 2;
 		S32 right = left + font->getWidth(combined_string, mViewModelItem->getFilterStringOffset(), filter_string_length) + 2;
-		S32 bottom = llfloor(getRect().getHeight() - font->getLineHeight() - 3 - TOP_PAD);
-		S32 top = getRect().getHeight() - TOP_PAD;
 
 		LLUIImage* box_image = default_params.selection_image;
 		LLRect box_rect(left, top, right, bottom);
 		box_image->draw(box_rect, sFilterBGColor);
+        }
+        else
+        {
+            S32 label_filter_length = llmin((S32)mLabel.size() - filter_offset, (S32)filter_string_length);
+            if(label_filter_length > 0)
+            {
+                S32 left = ll_round(text_left) + font->getWidthF32(mLabel, 0, llmin(filter_offset, (S32)mLabel.size())) - 2;
+                S32 right = left + font->getWidthF32(mLabel, filter_offset, label_filter_length) + 2;
+                LLUIImage* box_image = default_params.selection_image;
+                LLRect box_rect(left, top, right, bottom);
+                box_image->draw(box_rect, sFilterBGColor);
+            }
+            S32 suffix_filter_length = label_filter_length > 0 ? filter_string_length - label_filter_length : filter_string_length;
+            if(suffix_filter_length > 0)
+            {
+                S32 suffix_offset = llmax(0, filter_offset - (S32)mLabel.size());
+                S32 left = ll_round(text_left) + font->getWidthF32(mLabel, 0, mLabel.size()) + suffix_font->getWidthF32(mLabelSuffix, 0, suffix_offset) - 2;
+                S32 right = left + suffix_font->getWidthF32(mLabelSuffix, suffix_offset, suffix_filter_length) + 2;
+                LLUIImage* box_image = default_params.selection_image;
+                LLRect box_rect(left, top, right, bottom);
+                box_image->draw(box_rect, sFilterBGColor);
+            }
+        }
     }
 
     LLColor4 color = (mIsSelected && filled) ? mFontHighlightColor : mFontColor;
@@ -961,7 +988,6 @@ void LLFolderViewItem::draw()
 	//
 	if (!mLabelSuffix.empty())
 	{
-        const LLFontGL* suffix_font = getLabelFontForStyle(LLFontGL::NORMAL);
         suffix_font->renderUTF8( mLabelSuffix, 0, right_x, y, isFadeItem() ? color : (LLColor4)sSuffixColor,
 						  LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
 						  S32_MAX, S32_MAX, &right_x, FALSE );
@@ -972,12 +998,35 @@ void LLFolderViewItem::draw()
 	//
     if (filter_string_length > 0)
     {
-        S32 filter_offset = mViewModelItem->getFilterStringOffset();
-        F32 match_string_left = text_left + font->getWidthF32(combined_string, 0, filter_offset + filter_string_length) - font->getWidthF32(combined_string, filter_offset, filter_string_length);
-        F32 yy = (F32)getRect().getHeight() - font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
-        font->renderUTF8( combined_string, filter_offset, match_string_left, yy,
+        if(mLabelSuffix.empty() || (font == suffix_font))
+        {
+            F32 match_string_left = text_left + font->getWidthF32(combined_string, 0, filter_offset + filter_string_length) - font->getWidthF32(combined_string, filter_offset, filter_string_length);
+            F32 yy = (F32)getRect().getHeight() - font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
+            font->renderUTF8( combined_string, filter_offset, match_string_left, yy,
             sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
             filter_string_length, S32_MAX, &right_x, FALSE );
+        }
+        else
+        {
+            S32 label_filter_length = llmin((S32)mLabel.size() - filter_offset, (S32)filter_string_length);
+            if(label_filter_length > 0)
+            {
+                F32 match_string_left = text_left + font->getWidthF32(mLabel, 0, filter_offset + label_filter_length) - font->getWidthF32(mLabel, filter_offset, label_filter_length);
+                F32 yy = (F32)getRect().getHeight() - font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
+                font->renderUTF8( mLabel, filter_offset, match_string_left, yy,
+ sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, label_filter_length, S32_MAX, &right_x, FALSE );
+            }
+            
+            S32 suffix_filter_length = label_filter_length > 0 ? filter_string_length - label_filter_length : filter_string_length;
+            if(suffix_filter_length > 0)
+            {
+                S32 suffix_offset = llmax(0, filter_offset - (S32)mLabel.size());
+                F32 match_string_left = text_left + font->getWidthF32(mLabel, 0, mLabel.size()) + suffix_font->getWidthF32(mLabelSuffix, 0, suffix_offset + suffix_filter_length) - suffix_font->getWidthF32(mLabelSuffix, suffix_offset, suffix_filter_length);
+                F32 yy = (F32)getRect().getHeight() - suffix_font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
+                suffix_font->renderUTF8( mLabelSuffix, suffix_offset, match_string_left, yy, sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, suffix_filter_length, S32_MAX, &right_x, FALSE );
+            }
+        }
+
     }
 
     //Gilbert Linden 9-20-2012: Although this should be legal, removing it because it causes the mLabelSuffix rendering to
-- 
cgit v1.2.3


From c5fcf3066f4a5c75635c774422ff1db59b8624f7 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 4 Nov 2022 18:18:46 +0200
Subject: SL-7277 show Advanced permissions in Item profile that was opened
 from inventory

---
 .../skins/default/xui/en/sidepanel_item_info.xml   | 68 +++++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 9a68479d05..ff7ea08251 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -461,8 +461,72 @@
         max_val="999999999"
         top_pad="10"
         tool_tip="Object cost." />
-    </panel>
-
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="10"
+        name="BaseMaskDebug"
+        text_color="White"
+        top_pad="30"
+        width="130">
+        B:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="OwnerMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="270">
+        O:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="GroupMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="210">
+        G:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="EveryoneMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="150">
+        E:
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="10"
+       layout="topleft"
+       left_delta="60"
+       name="NextMaskDebug"
+       text_color="White"
+       top_delta="0"
+       width="90">
+        N:
+      </text>
+    </panel>   
   </scroll_container>
   <panel
     height="30"
-- 
cgit v1.2.3


From c9ba8f1fce4665f19ec9485c5ceb5bfa7f290321 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Feb 2023 23:56:35 +0200
Subject: SL-19109 Decouple object profiles from inventory

Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
---
 indra/newview/llfloatermarketplacelistings.cpp     | 30 +++++++++++++++++-----
 indra/newview/llinspectobject.cpp                  |  4 +--
 indra/newview/llinventoryfunctions.cpp             |  8 ++++--
 indra/newview/llviewerfloaterreg.cpp               |  1 +
 indra/newview/llviewermenu.cpp                     |  4 +--
 .../default/xui/en/floater_item_properties.xml     |  2 +-
 .../default/xui/en/floater_task_properties.xml     | 24 +++++++++++++++++
 7 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_task_properties.xml

(limited to 'indra')

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index e755e9924c..478b6a9a50 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -41,6 +41,7 @@
 #include "llnotificationmanager.h"
 #include "llnotificationsutil.h"
 #include "llsidepaneliteminfo.h"
+#include "llsidepaneltaskinfo.h"
 #include "lltextbox.h"
 #include "lltrans.h"
 
@@ -955,17 +956,34 @@ LLFloaterItemProperties::~LLFloaterItemProperties()
 BOOL LLFloaterItemProperties::postBuild()
 {
     // On the standalone properties floater, we have no need for a back button...
-    LLSidepanelItemInfo* panel = getChild<LLSidepanelItemInfo>("item_panel");
-    LLButton* back_btn = panel->getChild<LLButton>("back_btn");
-    back_btn->setVisible(FALSE);
-    
+    LLSidepanelInventorySubpanel* panel = findChild<LLSidepanelInventorySubpanel>("sidepanel");
+    if (panel)
+    {
+        LLButton* back_btn = panel->getChild<LLButton>("back_btn");
+        back_btn->setVisible(FALSE);
+    }
 	return LLFloater::postBuild();
 }
 
 void LLFloaterItemProperties::onOpen(const LLSD& key)
 {
     // Tell the panel which item it needs to visualize
-    LLSidepanelItemInfo* panel = getChild<LLSidepanelItemInfo>("item_panel");
-    panel->setItemID(key["id"].asUUID());
+    LLSidepanelInventorySubpanel* panel = findChild<LLSidepanelInventorySubpanel>("sidepanel");
+    
+    LLSidepanelItemInfo* item_panel = dynamic_cast<LLSidepanelItemInfo*>(panel);
+    if (item_panel)
+    {
+        item_panel->setItemID(key["id"].asUUID());
+        if (key.has("object"))
+        {
+            item_panel->setObjectID(key["object"].asUUID());
+        }
+    }
+    
+    LLSidepanelTaskInfo* task_panel = dynamic_cast<LLSidepanelTaskInfo*>(panel);
+    if (task_panel)
+    {
+        task_panel->setObjectSelection(LLSelectMgr::getInstance()->getSelection());
+    }
 }
 
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
index 5329f10612..c52d0be213 100644
--- a/indra/newview/llinspectobject.cpp
+++ b/indra/newview/llinspectobject.cpp
@@ -662,9 +662,7 @@ void LLInspectObject::onClickOpen()
 
 void LLInspectObject::onClickMoreInfo()
 {
-	LLSD key;
-	key["task"] = "task";
-	LLFloaterSidePanelContainer::showPanel("inventory", key);
+    LLFloaterReg::showInstance("task_properties");
 	closeFloater();
 }
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 73df764893..21430a6507 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -765,13 +765,17 @@ BOOL get_is_category_renameable(const LLInventoryModel* model, const LLUUID& id)
 
 void show_task_item_profile(const LLUUID& item_uuid, const LLUUID& object_id)
 {
-	LLFloaterSidePanelContainer::showPanel("inventory", LLSD().with("id", item_uuid).with("object", object_id));
+    LLSD params;
+    params["id"] = item_uuid;
+    params["object"] = object_id;
+    
+    LLFloaterReg::showInstance("item_properties", params);
 }
 
 void show_item_profile(const LLUUID& item_uuid)
 {
 	LLUUID linked_uuid = gInventory.getLinkedItemID(item_uuid);
-	LLFloaterSidePanelContainer::showPanel("inventory", LLSD().with("id", linked_uuid));
+    LLFloaterReg::showInstance("item_properties", LLSD().with("id", linked_uuid));
 }
 
 void show_item_original(const LLUUID& item_uuid)
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 469df37f8e..2c57b56a3d 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -371,6 +371,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("inspect", "floater_inspect.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInspect>);
 	LLFloaterReg::add("item_properties", "floater_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterItemProperties>);
+    LLFloaterReg::add("task_properties", "floater_task_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterItemProperties>);
 	LLInspectAvatarUtil::registerFloater();
 	LLInspectGroupUtil::registerFloater();
 	LLInspectObjectUtil::registerFloater();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a0223a5dbb..015a887e9f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3042,9 +3042,7 @@ void handle_object_inspect()
 	LLViewerObject* selected_objectp = selection->getFirstRootObject();
 	if (selected_objectp)
 	{
-		LLSD key;
-		key["task"] = "task";
-		LLFloaterSidePanelContainer::showPanel("inventory", key);
+        LLFloaterReg::showInstance("task_properties");
 	}
 	
 	/*
diff --git a/indra/newview/skins/default/xui/en/floater_item_properties.xml b/indra/newview/skins/default/xui/en/floater_item_properties.xml
index 0fc54a9c8b..336bb902ca 100644
--- a/indra/newview/skins/default/xui/en/floater_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_item_properties.xml
@@ -13,7 +13,7 @@
    left="0"
    class="sidepanel_item_info"
    filename="sidepanel_item_info.xml"
-   name="item_panel"
+   name="sidepanel"
    top="20"
    label=""
    height="570"
diff --git a/indra/newview/skins/default/xui/en/floater_task_properties.xml b/indra/newview/skins/default/xui/en/floater_task_properties.xml
new file mode 100644
index 0000000000..4b5c207577
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_task_properties.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="570"
+ layout="topleft"
+ name="Task Properties"
+ help_topic="item+properties"
+ title="ITEM PROPERTIES"
+ single_instance="true"
+ width="330">
+ <panel
+   follows="all"
+   layout="topleft"
+   left="0"
+   class="sidepanel_task_info"
+   filename="sidepanel_task_info.xml"
+   name="sidepanel"
+   top="20"
+   label=""
+   height="550"
+   visible="true"
+   width="330">
+ </panel>
+</floater>
-- 
cgit v1.2.3


From c1e1f1e423d6afa1b5f954296726a49e42a3fe74 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Fri, 3 Feb 2023 16:21:01 -0800
Subject: SL-17761: Replace 'Grid emergency' message with generic error

The viewer currently presents a startling "Grid emergency" warning if an
unrecognized error is returned from login. Let's tone this down a bit
and present the error as it is: an unrecognized login failure rather
than SLearth exploding.
---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cf5d98aa9a..269df1349b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -126,7 +126,7 @@ http://secondlife.com/download
 
 For more information, see our FAQ below:
 http://secondlife.com/viewer-access-faq</string>
-	<string name="LoginFailed">Grid emergency login failure.
+	<string name="LoginFailed">Login failure.
 If you feel this is an error, please contact support@secondlife.com.</string>
 	<string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string>
 	<string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string>
-- 
cgit v1.2.3


From 25b42dd1902e1ba855856878aec7b2f7c41e2624 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 4 Feb 2023 18:35:20 +0200
Subject: SL-19109 Cut out object profiles from inventory

---
 indra/newview/llsidepanelinventory.cpp | 67 ----------------------------------
 indra/newview/llsidepanelinventory.h   |  4 --
 2 files changed, 71 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 4843e481e8..9f2003bbb2 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -115,7 +115,6 @@ private:
 
 LLSidepanelInventory::LLSidepanelInventory()
 	: LLPanel()
-	, mItemPanel(NULL)
 	, mPanelMainInventory(NULL)
 	, mInboxEnabled(false)
 	, mCategoriesObserver(NULL)
@@ -174,24 +173,6 @@ BOOL LLSidepanelInventory::postBuild()
 
 		//LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&LLSidepanelInventory::updateVerbs, this));
 	}
-
-	// UI elements from item panel
-	{
-		mItemPanel = getChild<LLSidepanelItemInfo>("sidepanel__item_panel");
-		
-		LLButton* back_btn = mItemPanel->getChild<LLButton>("back_btn");
-		back_btn->setClickedCallback(boost::bind(&LLSidepanelInventory::onBackButtonClicked, this));
-	}
-
-	// UI elements from task panel
-	{
-		mTaskPanel = findChild<LLSidepanelTaskInfo>("sidepanel__task_panel");
-		if (mTaskPanel)
-		{
-			LLButton* back_btn = mTaskPanel->getChild<LLButton>("back_btn");
-			back_btn->setClickedCallback(boost::bind(&LLSidepanelInventory::onBackButtonClicked, this));
-		}
-	}
 	
 	// Received items inbox setup
 	{
@@ -387,27 +368,6 @@ void LLSidepanelInventory::onOpen(const LLSD& key)
 		gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());
 	}
 #endif
-
-	if(key.size() == 0)
-		return;
-
-	mItemPanel->reset();
-
-	if (key.has("id"))
-	{
-		mItemPanel->setItemID(key["id"].asUUID());
-		if (key.has("object"))
-		{
-			mItemPanel->setObjectID(key["object"].asUUID());
-		}
-		showItemInfoPanel();
-	}
-	if (key.has("task"))
-	{
-		if (mTaskPanel)
-			mTaskPanel->setObjectSelection(LLSelectMgr::getInstance()->getSelection());
-		showTaskInfoPanel();
-	}
 }
 
 void LLSidepanelInventory::performActionOnSelection(const std::string &action)
@@ -439,35 +399,8 @@ void LLSidepanelInventory::onSelectionChange(const std::deque<LLFolderViewItem*>
 
 }
 
-void LLSidepanelInventory::showItemInfoPanel()
-{
-	mItemPanel->setVisible(TRUE);
-	if (mTaskPanel)
-		mTaskPanel->setVisible(FALSE);
-	mInventoryPanel->setVisible(FALSE);
-
-	mItemPanel->dirty();
-	mItemPanel->setIsEditing(FALSE);
-}
-
-void LLSidepanelInventory::showTaskInfoPanel()
-{
-	mItemPanel->setVisible(FALSE);
-	mInventoryPanel->setVisible(FALSE);
-
-	if (mTaskPanel)
-	{
-		mTaskPanel->setVisible(TRUE);
-		mTaskPanel->dirty();
-		mTaskPanel->setIsEditing(FALSE);
-	}
-}
-
 void LLSidepanelInventory::showInventoryPanel()
 {
-	mItemPanel->setVisible(FALSE);
-	if (mTaskPanel)
-		mTaskPanel->setVisible(FALSE);
 	mInventoryPanel->setVisible(TRUE);
 }
 
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
index 731eb7cba7..fbbd657f9e 100644
--- a/indra/newview/llsidepanelinventory.h
+++ b/indra/newview/llsidepanelinventory.h
@@ -66,8 +66,6 @@ public:
 	void clearSelections(bool clearMain, bool clearInbox);
     std::set<LLFolderViewItem*> getInboxSelectionList();
 
-	void showItemInfoPanel();
-	void showTaskInfoPanel();
 	void showInventoryPanel();
 
 	// checks can share selected item(s)
@@ -101,8 +99,6 @@ protected:
 private:
 	LLPanel*					mInventoryPanel; // Main inventory view
 	LLHandle<LLInventoryPanel>	mInventoryPanelInbox;
-	LLSidepanelItemInfo*		mItemPanel; // Individual item view
-	LLSidepanelTaskInfo*		mTaskPanel; // Individual in-world object view
 	LLPanelMainInventory*		mPanelMainInventory;
 
 protected:
-- 
cgit v1.2.3


From 13a65319e0648cf228a82950e96a84d3a69bf6e3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 4 Feb 2023 19:23:45 +0200
Subject: SL-19109 Turn LLSidepanelItemInfo into a normal panel

---
 indra/newview/llfloatermarketplacelistings.cpp     |  10 +-
 indra/newview/llsidepaneliteminfo.cpp              | 155 +++++++++------------
 indra/newview/llsidepaneliteminfo.h                |  22 ++-
 .../skins/default/xui/en/sidepanel_item_info.xml   |  32 +----
 4 files changed, 82 insertions(+), 137 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 478b6a9a50..4c8e365dd0 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -955,20 +955,13 @@ LLFloaterItemProperties::~LLFloaterItemProperties()
 
 BOOL LLFloaterItemProperties::postBuild()
 {
-    // On the standalone properties floater, we have no need for a back button...
-    LLSidepanelInventorySubpanel* panel = findChild<LLSidepanelInventorySubpanel>("sidepanel");
-    if (panel)
-    {
-        LLButton* back_btn = panel->getChild<LLButton>("back_btn");
-        back_btn->setVisible(FALSE);
-    }
 	return LLFloater::postBuild();
 }
 
 void LLFloaterItemProperties::onOpen(const LLSD& key)
 {
     // Tell the panel which item it needs to visualize
-    LLSidepanelInventorySubpanel* panel = findChild<LLSidepanelInventorySubpanel>("sidepanel");
+    LLPanel* panel = findChild<LLPanel>("sidepanel");
     
     LLSidepanelItemInfo* item_panel = dynamic_cast<LLSidepanelItemInfo*>(panel);
     if (item_panel)
@@ -978,6 +971,7 @@ void LLFloaterItemProperties::onOpen(const LLSD& key)
         {
             item_panel->setObjectID(key["object"].asUUID());
         }
+        item_panel->setParentFloater(this);
     }
     
     LLSidepanelTaskInfo* task_panel = dynamic_cast<LLSidepanelTaskInfo*>(panel);
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index b23e24a222..e5e6afac19 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -32,8 +32,9 @@
 #include "llagent.h"
 #include "llavataractions.h"
 #include "llbutton.h"
+#include "llcallbacklist.h"
 #include "llcombobox.h"
-#include "llfloaterreg.h"
+#include "llfloater.h"
 #include "llgroupactions.h"
 #include "llinventorydefines.h"
 #include "llinventorymodel.h"
@@ -72,49 +73,6 @@ private:
     S32 mId;
 };
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLItemPropertiesObserver
-//
-// Helper class to watch for changes to the item.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLItemPropertiesObserver : public LLInventoryObserver
-{
-public:
-	LLItemPropertiesObserver(LLSidepanelItemInfo* floater)
-		: mFloater(floater)
-	{
-		gInventory.addObserver(this);
-	}
-	virtual ~LLItemPropertiesObserver()
-	{
-		gInventory.removeObserver(this);
-	}
-	virtual void changed(U32 mask);
-private:
-	LLSidepanelItemInfo* mFloater; // Not a handle because LLSidepanelItemInfo is managing LLItemPropertiesObserver
-};
-
-void LLItemPropertiesObserver::changed(U32 mask)
-{
-	const std::set<LLUUID>& mChangedItemIDs = gInventory.getChangedIDs();
-	std::set<LLUUID>::const_iterator it;
-
-	const LLUUID& item_id = mFloater->getItemID();
-
-	for (it = mChangedItemIDs.begin(); it != mChangedItemIDs.end(); it++)
-	{
-		// set dirty for 'item profile panel' only if changed item is the item for which 'item profile panel' is shown (STORM-288)
-		if (*it == item_id)
-		{
-			// if there's a change we're interested in.
-			if((mask & (LLInventoryObserver::LABEL | LLInventoryObserver::INTERNAL | LLInventoryObserver::REMOVE)) != 0)
-			{
-				mFloater->dirty();
-			}
-		}
-	}
-}
-
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLObjectInventoryObserver
 //
@@ -158,19 +116,22 @@ static LLPanelInjector<LLSidepanelItemInfo> t_item_info("sidepanel_item_info");
 
 // Default constructor
 LLSidepanelItemInfo::LLSidepanelItemInfo(const LLPanel::Params& p)
-	: LLSidepanelInventorySubpanel(p)
+	: LLPanel(p)
 	, mItemID(LLUUID::null)
 	, mObjectInventoryObserver(NULL)
 	, mUpdatePendingId(-1)
+    , mIsDirty(false) /*Not ready*/
+    , mParentFloater(NULL)
 {
-	mPropertiesObserver = new LLItemPropertiesObserver(this);
+    gInventory.addObserver(this);
+    gIdleCallbacks.addFunction(&LLSidepanelItemInfo::onIdle, (void*)this);
 }
 
 // Destroys the object
 LLSidepanelItemInfo::~LLSidepanelItemInfo()
 {
-	delete mPropertiesObserver;
-	mPropertiesObserver = NULL;
+    gInventory.removeObserver(this);
+    gIdleCallbacks.deleteFunction(&LLSidepanelItemInfo::onIdle, (void*)this);
 
 	stopObjectInventoryObserver();
 }
@@ -178,8 +139,6 @@ LLSidepanelItemInfo::~LLSidepanelItemInfo()
 // virtual
 BOOL LLSidepanelItemInfo::postBuild()
 {
-	LLSidepanelInventorySubpanel::postBuild();
-
 	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
 	getChild<LLLineEditor>("LabelItemDesc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
@@ -226,6 +185,12 @@ void LLSidepanelItemInfo::setItemID(const LLUUID& item_id)
         mItemID = item_id;
         mUpdatePendingId = -1;
     }
+    dirty();
+}
+
+void LLSidepanelItemInfo::setParentFloater(LLFloater* parent)
+{
+    mParentFloater = parent;
 }
 
 const LLUUID& LLSidepanelItemInfo::getObjectID() const
@@ -249,12 +214,11 @@ void LLSidepanelItemInfo::onUpdateCallback(const LLUUID& item_id, S32 received_u
 
 void LLSidepanelItemInfo::reset()
 {
-	LLSidepanelInventorySubpanel::reset();
-
 	mObjectID = LLUUID::null;
 	mItemID = LLUUID::null;
 
 	stopObjectInventoryObserver();
+    dirty();
 }
 
 void LLSidepanelItemInfo::refresh()
@@ -263,45 +227,8 @@ void LLSidepanelItemInfo::refresh()
 	if(item)
 	{
 		refreshFromItem(item);
-		updateVerbs();
 		return;
 	}
-	else
-	{
-		if (getIsEditing())
-		{
-			setIsEditing(FALSE);
-		}
-	}
-
-	if (!getIsEditing())
-	{
-		const std::string no_item_names[]={
-			"LabelItemName",
-			"LabelItemDesc",
-			"LabelCreatorName",
-			"LabelOwnerName"
-		};
-
-		for(size_t t=0; t<LL_ARRAY_SIZE(no_item_names); ++t)
-		{
-			getChildView(no_item_names[t])->setEnabled(false);
-		}
-
-		setPropertiesFieldsEnabled(false);
-
-		const std::string hide_names[]={
-			"BaseMaskDebug",
-			"OwnerMaskDebug",
-			"GroupMaskDebug",
-			"EveryoneMaskDebug",
-			"NextMaskDebug"
-		};
-		for(size_t t=0; t<LL_ARRAY_SIZE(hide_names); ++t)
-		{
-			getChildView(hide_names[t])->setVisible(false);
-		}
-	}
 
 	if (!item)
 	{
@@ -314,8 +241,12 @@ void LLSidepanelItemInfo::refresh()
 			getChildView(no_edit_mode_names[t])->setEnabled(false);
 		}
 	}
-
-	updateVerbs();
+    
+    if (mParentFloater)
+    {
+        // if we failed to get item, it likely no longer exists
+        mParentFloater->closeFloater();
+    }
 }
 
 void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
@@ -731,6 +662,48 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	}
 }
 
+void LLSidepanelItemInfo::changed(U32 mask)
+{
+    const LLUUID& item_id = getItemID();
+    if (getObjectID().notNull() || item_id.isNull())
+    {
+        // Tasl inventory or not set up yet
+        return;
+    }
+    
+    const std::set<LLUUID>& mChangedItemIDs = gInventory.getChangedIDs();
+    std::set<LLUUID>::const_iterator it;
+
+    for (it = mChangedItemIDs.begin(); it != mChangedItemIDs.end(); it++)
+    {
+        // set dirty for 'item profile panel' only if changed item is the item for which 'item profile panel' is shown (STORM-288)
+        if (*it == item_id)
+        {
+            // if there's a change we're interested in.
+            if((mask & (LLInventoryObserver::LABEL | LLInventoryObserver::INTERNAL | LLInventoryObserver::REMOVE)) != 0)
+            {
+                dirty();
+            }
+        }
+    }
+}
+
+void LLSidepanelItemInfo::dirty()
+{
+    mIsDirty = true;
+}
+
+// static
+void LLSidepanelItemInfo::onIdle( void* user_data )
+{
+    LLSidepanelItemInfo* self = reinterpret_cast<LLSidepanelItemInfo*>(user_data);
+
+    if( self->mIsDirty )
+    {
+        self->refresh();
+        self->mIsDirty = false;
+    }
+}
 
 void LLSidepanelItemInfo::setAssociatedExperience( LLHandle<LLSidepanelItemInfo> hInfo, const LLSD& experience )
 {
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index 5f29254182..67f8683802 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -27,7 +27,8 @@
 #ifndef LL_LLSIDEPANELITEMINFO_H
 #define LL_LLSIDEPANELITEMINFO_H
 
-#include "llsidepanelinventorysubpanel.h"
+#include "llinventoryobserver.h"
+#include "llpanel.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLSidepanelItemInfo
@@ -35,34 +36,40 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 class LLButton;
+class LLFloater;
 class LLViewerInventoryItem;
 class LLItemPropertiesObserver;
 class LLObjectInventoryObserver;
 class LLViewerObject;
 class LLPermissions;
 
-class LLSidepanelItemInfo : public LLSidepanelInventorySubpanel
+class LLSidepanelItemInfo : public LLPanel, public LLInventoryObserver
 {
 public:
 	LLSidepanelItemInfo(const LLPanel::Params& p = getDefaultParams());
 	virtual ~LLSidepanelItemInfo();
 	
-	/*virtual*/ BOOL postBuild();
+	/*virtual*/ BOOL postBuild() override;
 	/*virtual*/ void reset();
 
 	void setObjectID(const LLUUID& object_id);
 	void setItemID(const LLUUID& item_id);
-	void setEditMode(BOOL edit);
+    void setParentFloater(LLFloater* parent); // For simplicity
 
 	const LLUUID& getObjectID() const;
 	const LLUUID& getItemID() const;
 
 	// if received update and item id (from callback) matches internal ones, update UI
 	void onUpdateCallback(const LLUUID& item_id, S32 received_update_id);
+    
+    void changed(U32 mask) override;
+    void dirty();
+    
+    static void onIdle( void* user_data );
 
 protected:
-	/*virtual*/ void refresh();
-	/*virtual*/ void save();
+	void refresh() override;
+	void save();
 
 	LLViewerInventoryItem* findItem() const;
 	LLViewerObject*  findObject() const;
@@ -78,11 +85,12 @@ private:
 
 	LLUUID mItemID; 	// inventory UUID for the inventory item.
 	LLUUID mObjectID; 	// in-world task UUID, or null if in agent inventory.
-	LLItemPropertiesObserver* mPropertiesObserver; // for syncing changes to item
 	LLObjectInventoryObserver* mObjectInventoryObserver; // for syncing changes to items inside an object
 
 	// We can send multiple properties updates simultaneously, make sure only last response counts and there won't be a race condition.
 	S32 mUpdatePendingId;
+    bool mIsDirty;         // item properties need to be updated
+    LLFloater* mParentFloater;
 
 	//
 	// UI Elements
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index ff7ea08251..813294cf83 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -53,25 +53,12 @@
     name="IconLocked"
     top="8"
     width="18" />
-  <button
-    follows="top|left"
-    height="24"
-    image_hover_unselected="BackButton_Over"
-    image_pressed="BackButton_Press"
-    image_unselected="BackButton_Off"
-    layout="topleft"
-    left="12"
-    name="back_btn"
-    tab_stop="false"
-    top="2"
-    width="30"
-    use_draw_context_alpha="false" />
   <text
     follows="top|left|right"
     font="SansSerifHugeBold"
     height="26"
     layout="topleft"
-    left_pad="3"
+    left="45"
     name="title"
     text_color="LtGray"
     top="2"
@@ -528,21 +515,4 @@
       </text>
     </panel>   
   </scroll_container>
-  <panel
-    height="30"
-    layout="topleft"
-    name="button_panel"
-    left="5"
-    top_pad="0"
-    width="313"
-    follows="top|right|left">
-    <button
-      follows="top|right"
-      height="23"
-      label="Cancel"
-      layout="topleft"
-      name="cancel_btn"
-      right="-1"
-      width="100" />
-  </panel>
 </panel>
-- 
cgit v1.2.3


From 7a99ce16d1a505a5c65722245dc6e4fc9ea9330d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 4 Feb 2023 19:29:35 +0200
Subject: SL-19109 Turn LLSidepanelTaskInfo into a normal panel

---
 indra/newview/llsidepaneltaskinfo.cpp              | 61 ++++++++--------------
 indra/newview/llsidepaneltaskinfo.h                | 18 ++++---
 .../skins/default/xui/en/sidepanel_task_info.xml   | 17 +-----
 3 files changed, 35 insertions(+), 61 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 7fa06f51e3..5e363fc9b1 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -42,6 +42,7 @@
 #include "llresmgr.h"
 #include "lltextbox.h"
 #include "llbutton.h"
+#include "llcallbacklist.h"
 #include "llcheckboxctrl.h"
 #include "llviewerobject.h"
 #include "llselectmgr.h"
@@ -78,6 +79,7 @@ LLSidepanelTaskInfo::LLSidepanelTaskInfo()
 {
 	setMouseOpaque(FALSE);
 	LLSelectMgr::instance().mUpdateSignal.connect(boost::bind(&LLSidepanelTaskInfo::refreshAll, this));
+    gIdleCallbacks.addFunction(&LLSidepanelTaskInfo::onIdle, (void*)this);
 }
 
 
@@ -85,13 +87,12 @@ LLSidepanelTaskInfo::~LLSidepanelTaskInfo()
 {
 	if (sActivePanel == this)
 		sActivePanel = NULL;
+    gIdleCallbacks.deleteFunction(&LLSidepanelTaskInfo::onIdle, (void*)this);
 }
 
 // virtual
 BOOL LLSidepanelTaskInfo::postBuild()
 {
-	LLSidepanelInventorySubpanel::postBuild();
-
 	mOpenBtn = getChild<LLButton>("open_btn");
 	mOpenBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onOpenButtonClicked, this));
 	mPayBtn = getChild<LLButton>("pay_btn");
@@ -253,6 +254,8 @@ void LLSidepanelTaskInfo::disablePermissions()
 
 void LLSidepanelTaskInfo::refresh()
 {
+    mIsDirty = false;
+    
 	LLButton* btn_deed_to_group = mDeedBtn; 
 	if (btn_deed_to_group)
 	{	
@@ -864,33 +867,6 @@ void LLSidepanelTaskInfo::refresh()
 	getChildView("label click action")->setEnabled(is_perm_modify && is_nonpermanent_enforced && all_volume);
 	getChildView("clickaction")->setEnabled(is_perm_modify && is_nonpermanent_enforced && all_volume);
 
-	if (!getIsEditing())
-	{
-		const std::string no_item_names[] = 
-			{
-				"Object Name",
-				"Object Description",
-				"button set group",
-				"checkbox share with group",
-				"button deed",
-				"checkbox allow everyone move",
-				"checkbox allow everyone copy",
-				"checkbox for sale",
-				"sale type",
-				"Edit Cost",
-				"checkbox next owner can modify",
-				"checkbox next owner can copy",
-				"checkbox next owner can transfer",
-				"clickaction",
-				"search_check",
-				"perm_modify",
-				"Group Name",
-			};
-		for (size_t t=0; t<LL_ARRAY_SIZE(no_item_names); ++t)
-		{
-			getChildView(no_item_names[t])->setEnabled(	FALSE);
-		}
-	}
 	updateVerbs();
 }
 
@@ -1202,16 +1178,6 @@ void LLSidepanelTaskInfo::onCommitIncludeInSearch(LLUICtrl* ctrl, void* data)
 // virtual
 void LLSidepanelTaskInfo::updateVerbs()
 {
-	LLSidepanelInventorySubpanel::updateVerbs();
-
-	/*
-	mOpenBtn->setVisible(!getIsEditing());
-	mPayBtn->setVisible(!getIsEditing());
-	mBuyBtn->setVisible(!getIsEditing());
-	//const LLViewerObject *obj = getFirstSelectedObject();
-	//mEditBtn->setEnabled(obj && obj->permModify());
-	*/
-
 	LLSafeHandle<LLObjectSelection> object_selection = LLSelectMgr::getInstance()->getSelection();
 	const BOOL any_selected = (object_selection->getNumNodes() > 0);
 
@@ -1296,6 +1262,23 @@ LLSidepanelTaskInfo* LLSidepanelTaskInfo::getActivePanel()
 	return sActivePanel;
 }
 
+void LLSidepanelTaskInfo::dirty()
+{
+    mIsDirty = true;
+}
+
+// static
+void LLSidepanelTaskInfo::onIdle( void* user_data )
+{
+    LLSidepanelTaskInfo* self = reinterpret_cast<LLSidepanelTaskInfo*>(user_data);
+
+    if( self->mIsDirty )
+    {
+        self->refresh();
+        self->mIsDirty = false;
+    }
+}
+
 LLViewerObject* LLSidepanelTaskInfo::getObject()
 {
 	if (!mObject->isDead())
diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index dc259cb22d..fbecf6f79f 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -27,8 +27,8 @@
 #ifndef LL_LLSIDEPANELTASKINFO_H
 #define LL_LLSIDEPANELTASKINFO_H
 
-#include "llsidepanelinventorysubpanel.h"
 #include "lluuid.h"
+#include "llpanel.h"
 #include "llselectmgr.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -43,14 +43,14 @@ class LLNameBox;
 class LLViewerObject;
 class LLTextBase;
 
-class LLSidepanelTaskInfo : public LLSidepanelInventorySubpanel
+class LLSidepanelTaskInfo : public LLPanel
 {
 public:
 	LLSidepanelTaskInfo();
 	virtual ~LLSidepanelTaskInfo();
 
-	/*virtual*/	BOOL postBuild();
-	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );
+	BOOL postBuild() override;
+	void onVisibilityChange ( BOOL new_visibility ) override;
 
 	void setObjectSelection(LLObjectSelectionHandle selection);
 
@@ -58,10 +58,12 @@ public:
 	LLViewerObject* getFirstSelectedObject();
 
 	static LLSidepanelTaskInfo *getActivePanel();
+    void dirty();
+    static void onIdle( void* user_data );
 protected:
-	/*virtual*/ void refresh();	// refresh all labels as needed
-	/*virtual*/ void save();
-	/*virtual*/ void updateVerbs();
+	void refresh() override;	// refresh all labels as needed
+	void save();
+	void updateVerbs();
 
 	void refreshAll(); // ignore current keyboard focus and update all fields
 
@@ -103,6 +105,8 @@ private:
 	LLUUID			mCreatorID;
 	LLUUID			mOwnerID;
 	LLUUID			mLastOwnerID;
+    
+    bool mIsDirty;
 
 protected:
 	void 						onOpenButtonClicked();
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 1c9d750aa6..8f7a62fb8a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -62,25 +62,12 @@
              name="Sale Mixed">
                 Mixed Sale
             </panel.string>
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     left="8"
-     name="back_btn"
-     tab_stop="false"
-     top="0"
-     width="30"
-     use_draw_context_alpha="false" />
-        <text
+    <text
      follows="top|left|right"
      font="SansSerifHuge"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left="48"
      name="title"
      text_color="LtGray"
      top="0"
-- 
cgit v1.2.3


From bf7faa3267e549b01131c6746202a5b6cda8e68a Mon Sep 17 00:00:00 2001
From: Henri Beauchamp <sldev@free.fr>
Date: Mon, 6 Feb 2023 11:30:23 +0100
Subject: Faster and simpler inventory category hashing.

This commit changes inventory category hashing from slow LLMD5 to fast HBXX128 hashing, and allows to use a simple LLUUID for the hash, instead of an LLMD5 instance.
It also removes some old cruft dealing with unused baked texture hashing.
---
 indra/llappearance/llwearable.h       |  4 ----
 indra/llappearance/llwearabledata.cpp | 40 -----------------------------------
 indra/llappearance/llwearabledata.h   |  9 --------
 indra/newview/llagentwearables.cpp    |  1 -
 indra/newview/llinventorymodel.cpp    | 11 +++++-----
 indra/newview/llinventorymodel.h      |  3 +--
 indra/newview/llinventoryobserver.cpp |  7 +++---
 indra/newview/llinventoryobserver.h   |  5 ++---
 indra/newview/lloutfitobserver.cpp    |  3 +--
 indra/newview/lloutfitobserver.h      |  3 +--
 indra/newview/llviewerwearable.h      |  1 -
 11 files changed, 13 insertions(+), 74 deletions(-)

(limited to 'indra')

diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h
index 875c2932f1..d86db236a3 100644
--- a/indra/llappearance/llwearable.h
+++ b/indra/llappearance/llwearable.h
@@ -32,7 +32,6 @@
 #include "llsaleinfo.h"
 #include "llwearabletype.h"
 
-class LLMD5;
 class LLVisualParam;
 class LLTexGlobalColorInfo;
 class LLTexGlobalColor;
@@ -110,9 +109,6 @@ public:
 	// Something happened that requires the wearable to be updated (e.g. worn/unworn).
 	virtual void		setUpdated() const = 0;
 
-	// Update the baked texture hash.
-	virtual void		addToBakedTextureHash(LLMD5& hash) const = 0;
-
 	typedef std::map<S32, LLVisualParam *>    visual_param_index_map_t;
 	visual_param_index_map_t mVisualParamIndexMap;
 
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
index 0eaeedb6ee..9fbbc57c87 100644
--- a/indra/llappearance/llwearabledata.cpp
+++ b/indra/llappearance/llwearabledata.cpp
@@ -31,7 +31,6 @@
 #include "llavatarappearance.h"
 #include "llavatarappearancedefines.h"
 #include "lldriverparam.h"
-#include "llmd5.h"
 
 LLWearableData::LLWearableData() :
 	mAvatarAppearance(NULL)
@@ -343,42 +342,3 @@ U32 LLWearableData::getWearableCount(const U32 tex_index) const
 	const LLWearableType::EType wearable_type = LLAvatarAppearance::getDictionary()->getTEWearableType((LLAvatarAppearanceDefines::ETextureIndex)tex_index);
 	return getWearableCount(wearable_type);
 }
-
-LLUUID LLWearableData::computeBakedTextureHash(LLAvatarAppearanceDefines::EBakedTextureIndex baked_index,
-												 BOOL generate_valid_hash) // Set to false if you want to upload the baked texture w/o putting it in the cache
-{
-	LLUUID hash_id;
-	bool hash_computed = false;
-	LLMD5 hash;
-	const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = LLAvatarAppearance::getDictionary()->getBakedTexture(baked_index);
-
-	for (U8 i=0; i < baked_dict->mWearables.size(); i++)
-	{
-		const LLWearableType::EType baked_type = baked_dict->mWearables[i];
-		const U32 num_wearables = getWearableCount(baked_type);
-		for (U32 index = 0; index < num_wearables; ++index)
-		{
-			const LLWearable* wearable = getWearable(baked_type,index);
-			if (wearable)
-			{
-				wearable->addToBakedTextureHash(hash);
-				hash_computed = true;
-			}
-		}
-	}
-	if (hash_computed)
-	{
-		hash.update((const unsigned char*)baked_dict->mWearablesHashID.mData, UUID_BYTES);
-
-		if (!generate_valid_hash)
-		{
-			invalidateBakedTextureHash(hash);
-		}
-		hash.finalize();
-		hash.raw_digest(hash_id.mData);
-	}
-
-	return hash_id;
-}
-
-
diff --git a/indra/llappearance/llwearabledata.h b/indra/llappearance/llwearabledata.h
index a0c446ea9e..b8e0bf8bd1 100644
--- a/indra/llappearance/llwearabledata.h
+++ b/indra/llappearance/llwearabledata.h
@@ -85,15 +85,6 @@ protected:
 private:
 	void			pullCrossWearableValues(const LLWearableType::EType type);
 
-	//--------------------------------------------------------------------
-	// Server Communication
-	//--------------------------------------------------------------------
-public:
-	LLUUID			computeBakedTextureHash(LLAvatarAppearanceDefines::EBakedTextureIndex baked_index,
-											BOOL generate_valid_hash = TRUE);
-protected:
-	virtual void	invalidateBakedTextureHash(LLMD5& hash) const {}
-
 	//--------------------------------------------------------------------
 	// Member variables
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 2e769dc737..53397978e0 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -41,7 +41,6 @@
 #include "llinventoryobserver.h"
 #include "llinventorypanel.h"
 #include "lllocaltextureobject.h"
-#include "llmd5.h"
 #include "llnotificationsutil.h"
 #include "lloutfitobserver.h"
 #include "llsidepanelappearance.h"
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 6ba04cdff2..b41ad51fa4 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -62,6 +62,7 @@
 #include "bufferarray.h"
 #include "bufferstream.h"
 #include "llcorehttputil.h"
+#include "hbxxh.h"
 
 //#define DIFF_INVENTORY_FILES
 #ifdef DIFF_INVENTORY_FILES
@@ -451,17 +452,16 @@ void LLInventoryModel::getDirectDescendentsOf(const LLUUID& cat_id,
 	items = get_ptr_in_map(mParentChildItemTree, cat_id);
 }
 
-LLMD5 LLInventoryModel::hashDirectDescendentNames(const LLUUID& cat_id) const
+LLUUID LLInventoryModel::hashDirectDescendentNames(const LLUUID& cat_id) const
 {
 	LLInventoryModel::cat_array_t* cat_array;
 	LLInventoryModel::item_array_t* item_array;
 	getDirectDescendentsOf(cat_id,cat_array,item_array);
-	LLMD5 item_name_hash;
 	if (!item_array)
 	{
-		item_name_hash.finalize();
-		return item_name_hash;
+		return LLUUID::null;
 	}
+	HBXXH128 item_name_hash;
 	for (LLInventoryModel::item_array_t::const_iterator iter = item_array->begin();
 		 iter != item_array->end();
 		 iter++)
@@ -471,8 +471,7 @@ LLMD5 LLInventoryModel::hashDirectDescendentNames(const LLUUID& cat_id) const
 			continue;
 		item_name_hash.update(item->getName());
 	}
-	item_name_hash.finalize();
-	return item_name_hash;
+	return item_name_hash.digest();
 }
 
 // SJB: Added version to lock the arrays to catch potential logic bugs
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index c4133ff9bb..ac10488d14 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -39,7 +39,6 @@
 #include "llpermissionsflags.h"
 #include "llviewerinventory.h"
 #include "llstring.h"
-#include "llmd5.h"
 #include "httpcommon.h"
 #include "httprequest.h"
 #include "httpoptions.h"
@@ -258,7 +257,7 @@ public:
 								item_array_t*& items) const;
 
 	// Compute a hash of direct descendant names (for detecting child name changes)
-	LLMD5 hashDirectDescendentNames(const LLUUID& cat_id) const;
+	LLUUID hashDirectDescendentNames(const LLUUID& cat_id) const;
 	
 	// Starting with the object specified, add its descendants to the
 	// array provided, but do not add the inventory object specified
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 26d7a7a28a..2b252e369d 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -640,7 +640,7 @@ void LLInventoryCategoriesObserver::changed(U32 mask)
 		// computed, or (b) a name has changed.
 		if (!cat_data.mIsNameHashInitialized || (mask & LLInventoryObserver::LABEL))
 		{
-			LLMD5 item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
+			LLUUID item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
 			if (cat_data.mItemNameHash != item_name_hash)
 			{
 				cat_data.mIsNameHashInitialized = true;
@@ -701,7 +701,7 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
 	{
 		if(init_name_hash)
 		{
-			LLMD5 item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
+			LLUUID item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
 			mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, cb, version, current_num_known_descendents,item_name_hash)));
 		}
 		else
@@ -727,11 +727,10 @@ LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
 	, mDescendentsCount(num_descendents)
 	, mIsNameHashInitialized(false)
 {
-	mItemNameHash.finalize();
 }
 
 LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
-	const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, LLMD5 name_hash)
+	const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, const LLUUID& name_hash)
 
 	: mCatID(cat_id)
 	, mCallback(cb)
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index 36d8ee3f59..ec42e0449b 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -28,7 +28,6 @@
 #define LL_LLINVENTORYOBSERVERS_H
 
 #include "lluuid.h"
-#include "llmd5.h"
 #include <string>
 #include <vector>
 
@@ -274,11 +273,11 @@ protected:
 	struct LLCategoryData
 	{
 		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents);
-		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, LLMD5 name_hash);
+		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, const LLUUID& name_hash);
 		callback_t	mCallback;
 		S32			mVersion;
 		S32			mDescendentsCount;
-		LLMD5		mItemNameHash;
+		LLUUID		mItemNameHash;
 		bool		mIsNameHashInitialized;
 		LLUUID		mCatID;
 	};
diff --git a/indra/newview/lloutfitobserver.cpp b/indra/newview/lloutfitobserver.cpp
index 5bb69367aa..3ec5bcd9fc 100644
--- a/indra/newview/lloutfitobserver.cpp
+++ b/indra/newview/lloutfitobserver.cpp
@@ -34,7 +34,6 @@
 LLOutfitObserver::LLOutfitObserver() :
 	mCOFLastVersion(LLViewerInventoryCategory::VERSION_UNKNOWN)
 {
-	mItemNameHash.finalize();
 	gInventory.addObserver(this);
 }
 
@@ -83,7 +82,7 @@ bool LLOutfitObserver::checkCOF()
 		return false;
 
 	bool cof_changed = false;
-	LLMD5 item_name_hash = gInventory.hashDirectDescendentNames(cof);
+	LLUUID item_name_hash = gInventory.hashDirectDescendentNames(cof);
 	if (item_name_hash != mItemNameHash)
 	{
 		cof_changed = true;
diff --git a/indra/newview/lloutfitobserver.h b/indra/newview/lloutfitobserver.h
index 77041db68d..2f136d48e8 100644
--- a/indra/newview/lloutfitobserver.h
+++ b/indra/newview/lloutfitobserver.h
@@ -28,7 +28,6 @@
 #define LL_OUTFITOBSERVER_H
 
 #include "llsingleton.h"
-#include "llmd5.h"
 
 /**
  * Outfit observer facade that provides simple possibility to subscribe on
@@ -78,7 +77,7 @@ protected:
 
 	bool mLastOutfitDirtiness;
 
-	LLMD5 mItemNameHash;
+	LLUUID mItemNameHash;
 
 private:
 	signal_t mBOFReplaced;
diff --git a/indra/newview/llviewerwearable.h b/indra/newview/llviewerwearable.h
index cc99f6af2f..24b1323b2b 100644
--- a/indra/newview/llviewerwearable.h
+++ b/indra/newview/llviewerwearable.h
@@ -93,7 +93,6 @@ public:
 	// the wearable was worn. make sure the name of the wearable object matches the LLViewerInventoryItem,
 	// not the wearable asset itself.
 	void				refreshName();
-	/*virtual*/void		addToBakedTextureHash(LLMD5& hash) const {}
 
 protected:
 	LLAssetID			mAssetID;
-- 
cgit v1.2.3


From 3ecfeda2fdb83c9d89f4e8743f9c99a8ec7b01f6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Feb 2023 20:52:56 +0200
Subject: SL-19134 Thumbnail ctrl

LLIconCtrl stores icons indefinitely which is undesired for fairly large and expected to be numerous thumbnails, LLTextureCtrl is tied to texture picker and has a number of limitations (already processes clicks, enforces label area). Intent behind LLThumbnailCtrl is to bridge the gap - to not store texture indefinitely and to allow further customisation.
---
 indra/newview/CMakeLists.txt      |   2 +
 indra/newview/llthumbnailctrl.cpp | 204 ++++++++++++++++++++++++++++++++++++++
 indra/newview/llthumbnailctrl.h   |  85 ++++++++++++++++
 3 files changed, 291 insertions(+)
 create mode 100644 indra/newview/llthumbnailctrl.cpp
 create mode 100644 indra/newview/llthumbnailctrl.h

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 126b6c0a11..84b80617e5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -604,6 +604,7 @@ set(viewer_SOURCE_FILES
     lltextureinfodetails.cpp
     lltexturestats.cpp
     lltextureview.cpp
+    llthumbnailctrl.cpp
     lltoast.cpp
     lltoastalertpanel.cpp
     lltoastgroupnotifypanel.cpp
@@ -1236,6 +1237,7 @@ set(viewer_HEADER_FILES
     lltextureinfodetails.h
     lltexturestats.h
     lltextureview.h
+    llthumbnailctrl.h
     lltoast.h
     lltoastalertpanel.h
     lltoastgroupnotifypanel.h
diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
new file mode 100644
index 0000000000..35bf9cb04c
--- /dev/null
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -0,0 +1,204 @@
+/** 
+ * @file llthumbnailctrl.cpp
+ * @brief LLThumbnailCtrl base class
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llthumbnailctrl.h"
+
+#include "linden_common.h"
+#include "llagent.h"
+#include "lluictrlfactory.h"
+#include "lluuid.h"
+#include "lltrans.h"
+#include "llviewborder.h"
+#include "llviewertexture.h"
+#include "llviewertexturelist.h"
+#include "llwindow.h"
+
+static LLDefaultChildRegistry::Register<LLThumbnailCtrl> r("thumbnail");
+
+LLThumbnailCtrl::Params::Params()
+: border("border")
+, border_color("border_color")
+, image_name("image_name")
+, border_visible("show_visible", false)
+, interactable("interactable", false)
+, show_loading("show_loading", true)
+{}
+
+LLThumbnailCtrl::LLThumbnailCtrl(const LLThumbnailCtrl::Params& p)
+:	LLUICtrl(p)
+,   mBorderColor(p.border_color())
+,   mBorderVisible(p.border_visible())
+,   mInteractable(p.interactable())
+,   mShowLoadingPlaceholder(p.show_loading())
+,	mPriority(LLGLTexture::BOOST_PREVIEW)
+{
+    mLoadingPlaceholderString = LLTrans::getString("texture_loading");
+    
+    LLRect border_rect = getLocalRect();
+    LLViewBorder::Params vbparams(p.border);
+    vbparams.name("border");
+    vbparams.rect(border_rect);
+    mBorder = LLUICtrlFactory::create<LLViewBorder> (vbparams);
+    addChild(mBorder);
+    
+    if (p.image_name.isProvided())
+    {
+        setValue(p.image_name());
+    }
+}
+
+LLThumbnailCtrl::~LLThumbnailCtrl()
+{
+	mTexturep = nullptr;
+    mImagep = nullptr;
+}
+
+
+void LLThumbnailCtrl::draw()
+{
+    LLRect draw_rect = getLocalRect();
+    
+    if (mBorderVisible)
+    {
+        mBorder->setKeyboardFocusHighlight(hasFocus());
+        
+        gl_rect_2d( draw_rect, mBorderColor.get(), FALSE );
+        draw_rect.stretch( -1 );
+    }
+
+    // If we're in a focused floater, don't apply the floater's alpha to the texture.
+    const F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
+    if( mTexturep )
+    {
+        if( mTexturep->getComponents() == 4 )
+        {
+            gl_rect_2d_checkerboard( draw_rect, alpha );
+        }
+        
+        //LLRectf uv_rect(0, 0, draw_rect.getWidth()/32.f, draw_rect.getHeight()/32.f);
+        gl_draw_scaled_image( draw_rect.mLeft, draw_rect.mBottom, draw_rect.getWidth(), draw_rect.getHeight(), mTexturep, UI_VERTEX_COLOR % alpha);
+        //mTexturep->addTextureStats( (F32)(draw_rect.getWidth() * draw_rect.getHeight()) );
+        
+        mTexturep->setKnownDrawSize(draw_rect.getWidth(), draw_rect.getHeight());
+    }
+    else if( mImagep.notNull() )
+    {
+        mImagep->draw(getLocalRect(), UI_VERTEX_COLOR % alpha );
+    }
+    else
+    {
+        gl_rect_2d( draw_rect, LLColor4::grey % alpha, TRUE );
+
+        // Draw X
+        gl_draw_x( draw_rect, LLColor4::black );
+    }
+
+    // Show "Loading..." string on the top left corner while this texture is loading.
+    // Using the discard level, do not show the string if the texture is almost but not
+    // fully loaded.
+    if (mTexturep.notNull()
+        && mShowLoadingPlaceholder
+        && !mTexturep->isFullyLoaded())
+    {
+        U32 v_offset = 25;
+        LLFontGL* font = LLFontGL::getFontSansSerif();
+
+        // Don't show as loaded if the texture is almost fully loaded (i.e. discard1) unless god
+        if ((mTexturep->getDiscardLevel() > 1) || gAgent.isGodlike())
+        {
+            font->renderUTF8(
+                mLoadingPlaceholderString,
+                0,
+                llfloor(draw_rect.mLeft+3),
+                llfloor(draw_rect.mTop-v_offset),
+                LLColor4::white,
+                LLFontGL::LEFT,
+                LLFontGL::BASELINE,
+                LLFontGL::DROP_SHADOW);
+        }
+    }
+
+    LLUICtrl::draw();
+}
+
+// virtual
+// value might be a string or a UUID
+void LLThumbnailCtrl::setValue(const LLSD& value)
+{
+	LLSD tvalue(value);
+	if (value.isString() && LLUUID::validate(value.asString()))
+	{
+		//RN: support UUIDs masquerading as strings
+		tvalue = LLSD(LLUUID(value.asString()));
+	}
+    
+	LLUICtrl::setValue(tvalue);
+    
+    mImageAssetID = LLUUID::null;
+    mTexturep = nullptr;
+    mImagep = nullptr;
+    
+	if (tvalue.isUUID())
+	{
+        mImageAssetID = tvalue.asUUID();
+        // Should it support baked textures?
+        mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, MIPMAP_YES, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+            
+        mTexturep->setBoostLevel(mPriority);
+        mTexturep->forceToSaveRawImage(0);
+        
+        S32 desired_draw_width = mTexturep->getWidth();
+        S32 desired_draw_height = mTexturep->getHeight();
+
+        mTexturep->setKnownDrawSize(desired_draw_width, desired_draw_height);
+	}
+    else if (tvalue.isString())
+    {
+        mImagep = LLUI::getUIImage(tvalue.asString(), LLGLTexture::BOOST_UI);
+        if (mImagep)
+        {
+            LLViewerFetchedTexture* texture = dynamic_cast<LLViewerFetchedTexture*>(mImagep->getImage().get());
+            if(texture)
+            {
+                mImageAssetID = texture->getID();
+            }
+        }
+    }
+}
+
+BOOL LLThumbnailCtrl::handleHover(S32 x, S32 y, MASK mask)
+{
+    if (mInteractable && getEnabled())
+    {
+        getWindow()->setCursor(UI_CURSOR_HAND);
+        return TRUE;
+    }
+    return LLUICtrl::handleHover(x, y, mask);
+}
+
+
diff --git a/indra/newview/llthumbnailctrl.h b/indra/newview/llthumbnailctrl.h
new file mode 100644
index 0000000000..978da8d71c
--- /dev/null
+++ b/indra/newview/llthumbnailctrl.h
@@ -0,0 +1,85 @@
+/** 
+ * @file llthumbnailctrl.h
+ * @brief LLThumbnailCtrl base class
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023 Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLTHUMBNAILCTRL_H
+#define LL_LLTHUMBNAILCTRL_H
+
+#include "llui.h"
+#include "lluictrl.h"
+#include "llviewborder.h" // for params
+
+class LLUICtrlFactory;
+class LLUUID;
+class LLViewerFetchedTexture;
+
+//
+// Classes
+//
+
+// 
+class LLThumbnailCtrl
+: public LLUICtrl
+{
+public:
+	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+	{
+        Optional<LLViewBorder::Params> border;
+        Optional<LLUIColor>        border_color;
+        Optional<std::string>      image_name;
+        Optional<bool>             border_visible;
+        Optional<bool>             interactable;
+        Optional<bool>             show_loading;
+        
+		Params();
+	};
+protected:
+    LLThumbnailCtrl(const Params&);
+	friend class LLUICtrlFactory;
+
+public:
+	virtual ~LLThumbnailCtrl();
+
+	virtual void draw() override;
+
+	virtual void setValue(const LLSD& value ) override;
+    
+    virtual BOOL handleHover(S32 x, S32 y, MASK mask) override;
+	
+private:
+	S32 mPriority;
+    bool mBorderVisible;
+    bool mInteractable;
+    bool mShowLoadingPlaceholder;
+    std::string mLoadingPlaceholderString;
+    LLUUID mImageAssetID;
+    LLViewBorder* mBorder;
+    LLUIColor mBorderColor;
+    
+	LLPointer<LLViewerFetchedTexture> mTexturep;
+    LLPointer<LLUIImage> mImagep;
+};
+
+#endif
-- 
cgit v1.2.3


From a654989812853484733c1d03af98f64821323a7a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Feb 2023 00:11:46 +0200
Subject: SL-19134 Replace icon in profiles with thumbnail

Mostly to make sure it works, but avatar images can be fairly large, so this prevents them from being permanently stored
---
 indra/newview/llpanelprofile.cpp                                | 5 +++--
 indra/newview/llpanelprofile.h                                  | 5 +++--
 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 708ff26ced..bc3c8ae6b1 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -71,6 +71,7 @@
 #include "llpanelblockedlist.h"
 #include "llpanelprofileclassifieds.h"
 #include "llpanelprofilepicks.h"
+#include "llthumbnailctrl.h"
 #include "lltrans.h"
 #include "llviewercontrol.h"
 #include "llviewermenu.h" //is_agent_mappable
@@ -908,7 +909,7 @@ BOOL LLPanelProfileSecondLife::postBuild()
 {
     mGroupList              = getChild<LLGroupList>("group_list");
     mShowInSearchCombo      = getChild<LLComboBox>("show_in_search");
-    mSecondLifePic          = getChild<LLIconCtrl>("2nd_life_pic");
+    mSecondLifePic          = getChild<LLThumbnailCtrl>("2nd_life_pic");
     mSecondLifePicLayout    = getChild<LLPanel>("image_panel");
     mDescriptionEdit        = getChild<LLTextEditor>("sl_description_edit");
     mAgentActionMenuButton  = getChild<LLMenuButton>("agent_actions_menu");
@@ -2133,7 +2134,7 @@ LLPanelProfileFirstLife::~LLPanelProfileFirstLife()
 BOOL LLPanelProfileFirstLife::postBuild()
 {
     mDescriptionEdit = getChild<LLTextEditor>("fl_description_edit");
-    mPicture = getChild<LLIconCtrl>("real_world_pic");
+    mPicture = getChild<LLThumbnailCtrl>("real_world_pic");
 
     mUploadPhoto = getChild<LLButton>("fl_upload_image");
     mChangePhoto = getChild<LLButton>("fl_change_image");
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index d32bb943bd..11632a10ae 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -58,6 +58,7 @@ class LLTextBase;
 class LLMenuButton;
 class LLLineEditor;
 class LLTextEditor;
+class LLThumbnailCtrl;
 class LLPanelProfileClassifieds;
 class LLPanelProfilePicks;
 class LLViewerFetchedTexture;
@@ -192,7 +193,7 @@ private:
 
 	LLGroupList*		mGroupList;
     LLComboBox*			mShowInSearchCombo;
-    LLIconCtrl*			mSecondLifePic;
+    LLThumbnailCtrl*	mSecondLifePic;
 	LLPanel*			mSecondLifePicLayout;
     LLTextEditor*		mDescriptionEdit;
     LLMenuButton*		mAgentActionMenuButton;
@@ -301,7 +302,7 @@ protected:
     void onDiscardDescriptionChanges();
 
 	LLTextEditor*	mDescriptionEdit;
-    LLIconCtrl*		mPicture;
+    LLThumbnailCtrl* mPicture;
     LLButton* mUploadPhoto;
     LLButton* mChangePhoto;
     LLButton* mRemovePhoto;
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index ca1e405a62..f899f83ad4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -19,7 +19,7 @@
      layout="topleft"
      visible="false"
     />
-    <icon
+    <thumbnail
      name="real_world_pic"
      image_name="Generic_Person_Large"
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 777b37d666..ebedbf20c7 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -48,7 +48,7 @@ Account: [ACCTTYPE]
      auto_resize="false"
      user_resize="false">
 
-      <icon
+      <thumbnail
        name="2nd_life_pic"
        image_name="Generic_Person_Large"
        layout="topleft"
-- 
cgit v1.2.3


From 61b93e778bf58f6db4d2f3d8dd6ec67de25598ea Mon Sep 17 00:00:00 2001
From: Henri Beauchamp <sldevel@users.noreply.github.com>
Date: Tue, 7 Feb 2023 00:17:22 +0100
Subject: SL-19110 Make HBXXH* classes no-copy. (#72)

These classes are not trivially copyable because of the mState pointer on an internal
XXH3 state that would have to be explicitely copied.
While it would be possible to add custom copy constructor and operator for them, it
does not really make sense to allow copying an instance of these classes, since all we
care about storing and copying is the digest (which is either an U64 or an LLUUID).
---
 indra/llcommon/hbxxh.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'indra')

diff --git a/indra/llcommon/hbxxh.h b/indra/llcommon/hbxxh.h
index 236716722a..9c0e9cf172 100644
--- a/indra/llcommon/hbxxh.h
+++ b/indra/llcommon/hbxxh.h
@@ -96,6 +96,15 @@ public:
         }
     }
 
+    // Make this class no-copy (it would be possible, with custom copy
+    // operators, but it is not trivially copyable, because of the mState
+    // pointer): it does not really make sense to allow copying it anyway,
+    // since all we care about is the resulting digest (so you should only
+    // need and care about storing/copying the digest and not a class
+    // instance).
+    HBXXH64(const HBXXH64&) noexcept = delete;
+    HBXXH64& operator=(const HBXXH64&) noexcept = delete;
+
     ~HBXXH64();
 
     void update(const void* buffer, size_t len);
@@ -199,6 +208,15 @@ public:
         }
     }
 
+    // Make this class no-copy (it would be possible, with custom copy
+    // operators, but it is not trivially copyable, because of the mState
+    // pointer): it does not really make sense to allow copying it anyway,
+    // since all we care about is the resulting digest (so you should only
+    // need and care about storing/copying the digest and not a class
+    // instance).
+    HBXXH128(const HBXXH128&) noexcept = delete;
+    HBXXH128& operator=(const HBXXH128&) noexcept = delete;
+
     ~HBXXH128();
 
     void update(const void* buffer, size_t len);
-- 
cgit v1.2.3


From 627c7de801bcf1f2a706c2c077a3fecf54a3bfe8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Feb 2023 12:36:20 +0200
Subject: SL-19134 Some texture related adjustments

---
 indra/llappearance/CMakeLists.txt             |  2 --
 indra/llappearance/lltexturemanagerbridge.cpp | 32 ------------------
 indra/llappearance/lltexturemanagerbridge.h   | 48 ---------------------------
 indra/llrender/CMakeLists.txt                 |  2 ++
 indra/llrender/lltexturemanagerbridge.cpp     | 32 ++++++++++++++++++
 indra/llrender/lltexturemanagerbridge.h       | 47 ++++++++++++++++++++++++++
 indra/llui/lliconctrl.h                       |  4 ++-
 indra/newview/llthumbnailctrl.cpp             |  2 --
 8 files changed, 84 insertions(+), 85 deletions(-)
 delete mode 100644 indra/llappearance/lltexturemanagerbridge.cpp
 delete mode 100644 indra/llappearance/lltexturemanagerbridge.h
 create mode 100644 indra/llrender/lltexturemanagerbridge.cpp
 create mode 100644 indra/llrender/lltexturemanagerbridge.h

(limited to 'indra')

diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index 268849ad74..b3f6c7e32c 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -40,7 +40,6 @@ set(llappearance_SOURCE_FILES
     lltexglobalcolor.cpp
     lltexlayer.cpp
     lltexlayerparams.cpp
-    lltexturemanagerbridge.cpp
     llwearable.cpp
     llwearabledata.cpp
     llwearabletype.cpp
@@ -63,7 +62,6 @@ set(llappearance_HEADER_FILES
     lltexglobalcolor.h
     lltexlayer.h
     lltexlayerparams.h
-    lltexturemanagerbridge.h
     llwearable.h
     llwearabledata.h
     llwearabletype.h
diff --git a/indra/llappearance/lltexturemanagerbridge.cpp b/indra/llappearance/lltexturemanagerbridge.cpp
deleted file mode 100644
index 33f2185e4f..0000000000
--- a/indra/llappearance/lltexturemanagerbridge.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
- /** 
- * @file lltexturemanagerbridge.cpp
- * @brief Defined a null texture manager bridge.  Applications must provide their own bridge implementaton.
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "lltexturemanagerbridge.h"
-
-// Define a null texture manager bridge.  Applications must provide their own bridge implementaton.
-LLTextureManagerBridge* gTextureManagerBridgep = NULL;
-
-
diff --git a/indra/llappearance/lltexturemanagerbridge.h b/indra/llappearance/lltexturemanagerbridge.h
deleted file mode 100644
index 101704b162..0000000000
--- a/indra/llappearance/lltexturemanagerbridge.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/** 
- * @file lltexturemanagerbridge.h
- * @brief Bridge to an application-specific texture manager.
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_TEXTUREMANAGERBRIDGE_H
-#define LL_TEXTUREMANAGERBRIDGE_H
-
-#include "llavatarappearancedefines.h"
-#include "llpointer.h"
-#include "llgltexture.h"
-
-// Abstract bridge interface
-class LLTextureManagerBridge
-{
-public:
-    virtual ~LLTextureManagerBridge() {}
-
-	virtual LLPointer<LLGLTexture> getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE) = 0;
-	virtual LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE) = 0;
-	virtual LLGLTexture* getFetchedTexture(const LLUUID &image_id) = 0;
-};
-
-extern LLTextureManagerBridge* gTextureManagerBridgep;
-
-#endif // LL_TEXTUREMANAGERBRIDGE_H
-
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index baab09a104..94b09127be 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -48,6 +48,7 @@ set(llrender_SOURCE_FILES
     llrendertarget.cpp
     llshadermgr.cpp
     lltexture.cpp
+    lltexturemanagerbridge.cpp
     lluiimage.cpp
     llvertexbuffer.cpp
     llglcommonfunc.cpp
@@ -77,6 +78,7 @@ set(llrender_HEADER_FILES
     llrendersphere.h
     llshadermgr.h
     lltexture.h
+    lltexturemanagerbridge.h
     lluiimage.h
     lluiimage.inl
     llvertexbuffer.h
diff --git a/indra/llrender/lltexturemanagerbridge.cpp b/indra/llrender/lltexturemanagerbridge.cpp
new file mode 100644
index 0000000000..33f2185e4f
--- /dev/null
+++ b/indra/llrender/lltexturemanagerbridge.cpp
@@ -0,0 +1,32 @@
+ /** 
+ * @file lltexturemanagerbridge.cpp
+ * @brief Defined a null texture manager bridge.  Applications must provide their own bridge implementaton.
+ *
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "lltexturemanagerbridge.h"
+
+// Define a null texture manager bridge.  Applications must provide their own bridge implementaton.
+LLTextureManagerBridge* gTextureManagerBridgep = NULL;
+
+
diff --git a/indra/llrender/lltexturemanagerbridge.h b/indra/llrender/lltexturemanagerbridge.h
new file mode 100644
index 0000000000..f61433ea4d
--- /dev/null
+++ b/indra/llrender/lltexturemanagerbridge.h
@@ -0,0 +1,47 @@
+/** 
+ * @file lltexturemanagerbridge.h
+ * @brief Bridge to an application-specific texture manager.
+ *
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_TEXTUREMANAGERBRIDGE_H
+#define LL_TEXTUREMANAGERBRIDGE_H
+
+#include "llpointer.h"
+#include "llgltexture.h"
+
+// Abstract bridge interface
+class LLTextureManagerBridge
+{
+public:
+    virtual ~LLTextureManagerBridge() {}
+
+	virtual LLPointer<LLGLTexture> getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE) = 0;
+	virtual LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE) = 0;
+	virtual LLGLTexture* getFetchedTexture(const LLUUID &image_id) = 0;
+};
+
+extern LLTextureManagerBridge* gTextureManagerBridgep;
+
+#endif // LL_TEXTUREMANAGERBRIDGE_H
+
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index 9c3b517bca..b5aad17ca6 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -39,7 +39,9 @@ class LLUICtrlFactory;
 // Classes
 //
 
-// 
+// Class for diplaying named UI textures
+// Do not use for displaying textures from network,
+// UI textures are stored permanently!
 class LLIconCtrl
 : public LLUICtrl
 {
diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
index 35bf9cb04c..8f51f2c80d 100644
--- a/indra/newview/llthumbnailctrl.cpp
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -100,9 +100,7 @@ void LLThumbnailCtrl::draw()
             gl_rect_2d_checkerboard( draw_rect, alpha );
         }
         
-        //LLRectf uv_rect(0, 0, draw_rect.getWidth()/32.f, draw_rect.getHeight()/32.f);
         gl_draw_scaled_image( draw_rect.mLeft, draw_rect.mBottom, draw_rect.getWidth(), draw_rect.getHeight(), mTexturep, UI_VERTEX_COLOR % alpha);
-        //mTexturep->addTextureStats( (F32)(draw_rect.getWidth() * draw_rect.getHeight()) );
         
         mTexturep->setKnownDrawSize(draw_rect.getWidth(), draw_rect.getHeight());
     }
-- 
cgit v1.2.3


From c97de5ac48c21ba7014ad2258a670db8810fdf5c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Feb 2023 19:34:04 +0200
Subject: SL-19134 [WIP] Item Profile redesign #3

---
 indra/newview/llsidepaneliteminfo.cpp              |   1 +
 .../skins/default/xui/en/sidepanel_item_info.xml   | 677 ++++++++++-----------
 2 files changed, 335 insertions(+), 343 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index e5e6afac19..ad0bace91a 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -318,6 +318,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	getChildView("LabelItemDesc")->setEnabled(is_modifiable);
 	getChildView("IconLocked")->setVisible(!is_modifiable);
 	getChild<LLUICtrl>("LabelItemDesc")->setValue(item->getDescription());
+    getChild<LLUICtrl>("item_thumbnail")->setValue(item->getThumbnailUUID());
 
 	//////////////////
 	// CREATOR NAME //
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 813294cf83..5f1c9e74bf 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -43,201 +43,121 @@
     name="origin_inworld">
     (Inworld)
   </panel.string>
-  <icon
-    follows="top|right"
-    height="18"
-    image_name="Lock"
-    layout="topleft"
-    right="-15"
-    mouse_opaque="true"
-    name="IconLocked"
-    top="8"
-    width="18" />
-  <text
-    follows="top|left|right"
-    font="SansSerifHugeBold"
-    height="26"
-    layout="topleft"
-    left="45"
-    name="title"
-    text_color="LtGray"
-    top="2"
-    use_ellipses="true"
-    value="Item Profile"
-    width="275" />
-  <text
-    follows="top|left|right"
-    height="13"
-    layout="topleft"
-    left="45"
-    name="origin"
-    text_color="LtGray_50"
-    use_ellipses="true"
-    value="(Inventory)"
-    width="275" />
-  <scroll_container
-    color="DkGray2"
-    follows="all"
-    layout="topleft"
-    left="9"
-    name="item_profile_scroll"
-    opaque="true"
-    height="493"
-    width="313"
-    top="45">
-    <panel
-      follows="left|top|right"
-      height="390"
-      help_topic=""
-      label=""
+
+<layout_stack
+  animate="false"
+  name="main_stack"
+  layout="topleft"
+  follows="all"
+  orientation="vertical"
+  left="0"
+  top="0"
+  right="-1"
+  bottom="-1">
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_name"
       layout="topleft"
-      left="0"
-      name="item_profile"
-      top="0"
-      width="295">
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left="5"
-        name="LabelItemNameTitle"
-        top="10"
-        width="78">
-        Name:
-      </text>
+      follows="all"
+      height="35">
       <line_editor
         border_style="line"
         border_thickness="1"
         follows="left|top|right"
-        height="20"
         layout="topleft"
-        left_delta="78"
+        left="5"
+        top="0"
+        right="-25"
+        height="20"
         max_length_bytes="63"
         name="LabelItemName"
-        top_delta="0"
-        width="210"
         tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
+      <icon
+        follows="top|right"
+        height="18"
+        image_name="Lock"
         layout="topleft"
-        left="5"
-        name="LabelItemDescTitle"
-        top_pad="10"
-        width="78">
-        Description:
-      </text>
-      <line_editor
-        border_style="line"
-        border_thickness="1"
-        follows="left|top|right"
-        height="23"
+        right="-5"
+        mouse_opaque="true"
+        name="IconLocked"
+        top="2"
+        width="18" />
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_details"
+      layout="topleft"
+      follows="all"
+      height="130">
+      
+      <thumbnail
+        name="item_thumbnail"
+        follows="top|left"
         layout="topleft"
-        left_delta="78"
-        max_length_bytes="127"
-        name="LabelItemDesc"
-        top_delta="-5"
-        width="210"
-        tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
+        left="5"
+        top="0"
+        height="128"
+        width="128"
+        />
+        
       <text
         type="string"
         length="1"
         follows="left|top"
         height="23"
         layout="topleft"
-        left="5"
-        name="LabelCreatorTitle"
-        top_pad="10"
+        left_pad="5"
+        name="LabelOwnerTitle"
+        top="0"
         width="78">
-        Creator:
+        Owner:
       </text>
-      <avatar_icon
-        follows="top|left"
-        height="20"
-        default_icon_name="Generic_Person"
-        layout="topleft"
-        left_pad="0"
-        top_delta="-6"
-        mouse_opaque="true"
-        width="20" />
       <text
         type="string"
         follows="left|right|top"
         font="SansSerifSmall"
         height="15"
         layout="topleft"
-        left_pad="5"
-        name="LabelCreatorName"
-        top_delta="6"
+        left_delta="0"
+        name="LabelOwnerName"
+        top_pad="2"
         use_ellipses="true"
         width="165">
       </text>
-      <button
-        follows="top|right"
-        height="16"
-        image_selected="Inspector_I"
-        image_unselected="Inspector_I"
-        layout="topleft"
-        right="-5"
-        name="BtnCreator"
-        top_delta="-6"
-        width="16" />
       <text
         type="string"
         length="1"
         follows="left|top"
         height="23"
         layout="topleft"
-        left="5"
-        name="LabelOwnerTitle"
-        top_pad="10"
+        left_delta="0"
+        name="LabelCreatorTitle"
+        top_pad="2"
         width="78">
-        Owner:
+        Creator:
       </text>
-      <avatar_icon
-        follows="top|left"
-        height="20"
-        default_icon_name="Generic_Person"
-        layout="topleft"
-        left_pad="0"
-        top_delta="-6"
-        mouse_opaque="true"
-        width="20" />
       <text
         type="string"
         follows="left|right|top"
         font="SansSerifSmall"
         height="15"
         layout="topleft"
-        left_pad="5"
-        name="LabelOwnerName"
-        top_delta="6"
+        left_delta="0"
+        name="LabelCreatorName"
+        top_pad="2"
         use_ellipses="true"
         width="165">
       </text>
-      <button
-        follows="top|right"
-        height="16"
-        image_selected="Inspector_I"
-        image_unselected="Inspector_I"
-        layout="topleft"
-        right="-5"
-        name="BtnOwner"
-        top_delta="-3"
-        width="16" />
       <text
         type="string"
         length="1"
         follows="left|top"
         height="23"
         layout="topleft"
-        left="5"
+        left_delta="0"
         name="LabelAcquiredTitle"
-        top_pad="10"
+        top_pad="2"
         width="78">
         Acquired:
       </text>
@@ -247,11 +167,19 @@
         follows="left|top|right"
         height="23"
         layout="topleft"
-        left_delta="78"
+        left_delta="0"
         name="LabelAcquiredDate"
-        top_delta="0"
+        top_pad="2"
         width="210">
       </text>
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_description"
+      layout="topleft"
+      follows="all"
+      height="54">
       <text
         type="string"
         length="1"
@@ -259,150 +187,204 @@
         height="10"
         layout="topleft"
         left="5"
-        name="LabelItemExperienceTitle"
-        top_pad="0"
-        width="78"
-        visible="true">
-        Experience:
+        name="LabelItemDescTitle"
+        top="0"
+        width="78">
+        Description:
       </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top|right"
-        height="10"
-        layout="topleft"
-        left_delta="78"
-        name="LabelItemExperience"
-        top_delta="0"
-        width="210"
-        visible="true"
-        />
-      <panel
-        border="false"
+      <line_editor
+        border_style="line"
+        border_thickness="1"
         follows="left|top|right"
         layout="topleft"
-        mouse_opaque="false"
-        name="perms_inv"
-        left="0"
-        top_pad="25"
-        height="155"
-        width="313">
-        <text
-          type="string"
-          length="1"
-          left="10"
-          top_pad="13"
-          text_color="EmphasisColor"
-          height="15"
-          follows="left|top|right"
-          layout="topleft"
-          name="perm_modify"
-          width="200">
-          You can:
-        </text>
-        <check_box
-          height="18"
-          label="Modify"
-          layout="topleft"
-          left="20"
-          name="CheckOwnerModify"
-          top_pad="0"
-          width="90" />
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckOwnerCopy"
-          width="90" />
-        <check_box
-          height="18"
-          label="Transfer"
-          layout="topleft"
-          left_pad="0"
-          name="CheckOwnerTransfer"
-          width="106" />
-        <text
-          type="string"
-          length="1"
-          follows="left|top"
-          height="16"
-          layout="topleft"
-          left="10"
-          name="AnyoneLabel"
-          top_pad="8"
-          width="100">
-          Anyone:
-        </text>
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckEveryoneCopy"
-          tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive."
-          top_delta="-2"
-          width="150" />
+        left="5"
+        top_pad="5"
+        right="-5"
+        height="23"
+        max_length_bytes="127"
+        name="LabelItemDesc"
+        tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
+        
         <text
           type="string"
           length="1"
           follows="left|top"
-          height="16"
+          height="10"
           layout="topleft"
-          left="10"
-          name="GroupLabel"
-          top_pad="8"
-          width="100">
-          Group:
+          left="5"
+          name="LabelItemExperienceTitle"
+          top_pad="0"
+          width="78"
+          visible="true">
+          Experience:
         </text>
-        <check_box
-          height="18"
-          label="Share"
-          layout="topleft"
-          left_pad="0"
-          top_delta="-2"
-          name="CheckShareWithGroup"
-          tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-          width="150" />
         <text
           type="string"
           length="1"
-          follows="left|top"
-          height="16"
-          layout="topleft"
-          left="10"
-          name="NextOwnerLabel"
-          top_pad="8"
-          width="200"
-          word_wrap="true">
-          Next owner:
-        </text>
-        <check_box
-          height="18"
-          label="Modify"
-          layout="topleft"
-          left="20"
-          top_pad="0"
-          name="CheckNextOwnerModify"
-          tool_tip="Next owner can edit properties like item name or scale of this object."
-          width="90" />
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckNextOwnerCopy"
-          tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
-          width="90" />
-        <check_box
-          height="18"
-          label="Transfer"
+          follows="left|top|right"
+          height="10"
           layout="topleft"
-          left_pad="0"
-          name="CheckNextOwnerTransfer"
-          tool_tip="Next owner can give away or resell this object."
-          width="106" />
-      </panel>
+          left_delta="78"
+          name="LabelItemExperience"
+          top_delta="0"
+          width="210"
+          visible="true"
+          />
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_permissions_sale"
+      layout="topleft"
+      follows="all"
+      height="300">
+      
+      <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="0"
+        right="-1"
+        name="cost_text_border"
+        top="1"/>
+        
+      <text
+        type="string"
+        length="1"
+        left="10"
+        top_pad="5"
+        height="15"
+        follows="left|top|right"
+        layout="topleft"
+        name="perm_modify"
+        width="200">
+        Permissions
+      </text>
+
+      <text
+        type="string"
+        length="1"
+        left="10"
+        top_pad="5"
+        height="15"
+        follows="left|top|right"
+        layout="topleft"
+        name="perm_modify"
+        width="200">
+        You can:
+      </text>
+      <check_box
+        height="18"
+        label="Modify"
+        layout="topleft"
+        left="20"
+        name="CheckOwnerModify"
+        top_pad="0"
+        width="90" />
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckOwnerCopy"
+        width="90" />
+      <check_box
+        height="18"
+        label="Transfer"
+        layout="topleft"
+        left_pad="0"
+        name="CheckOwnerTransfer"
+        width="106" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="AnyoneLabel"
+        top_pad="8"
+        width="100">
+        Anyone:
+      </text>
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckEveryoneCopy"
+        tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive."
+        top_delta="-2"
+        width="150" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="GroupLabel"
+        top_pad="8"
+        width="100">
+        Group:
+      </text>
+      <check_box
+        height="18"
+        label="Share"
+        layout="topleft"
+        left_pad="0"
+        top_delta="-2"
+        name="CheckShareWithGroup"
+        tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+        width="150" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="NextOwnerLabel"
+        top_pad="8"
+        width="200"
+        word_wrap="true">
+        Next owner:
+      </text>
+      <check_box
+        height="18"
+        label="Modify"
+        layout="topleft"
+        left="20"
+        top_pad="0"
+        name="CheckNextOwnerModify"
+        tool_tip="Next owner can edit properties like item name or scale of this object."
+        width="90" />
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckNextOwnerCopy"
+        tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
+        width="90" />
+      <check_box
+        height="18"
+        label="Transfer"
+        layout="topleft"
+        left_pad="0"
+        name="CheckNextOwnerTransfer"
+        tool_tip="Next owner can give away or resell this object."
+        width="106" />
+        
+    <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="0"
+        right="-1"
+        name="cost_text_border"
+        top_pad="7"/>
+        
       <check_box
         height="18"
         label="For Sale"
@@ -448,71 +430,80 @@
         max_val="999999999"
         top_pad="10"
         tool_tip="Object cost." />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left="10"
-        name="BaseMaskDebug"
-        text_color="White"
-        top_pad="30"
-        width="130">
-        B:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="OwnerMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="270">
-        O:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="GroupMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="210">
-        G:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="EveryoneMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="150">
-        E:
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="10"
-       layout="topleft"
-       left_delta="60"
-       name="NextMaskDebug"
-       text_color="White"
-       top_delta="0"
-       width="90">
-        N:
-      </text>
-    </panel>   
-  </scroll_container>
+      
+    </layout_panel>
+
+    <layout_panel
+     auto_resize="false"
+     name="layout_debug_permissions"
+     layout="topleft"
+     follows="all"
+     height="30">
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left="10"
+          name="BaseMaskDebug"
+          text_color="White"
+          top="2"
+          width="130">
+          B:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="OwnerMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="270">
+          O:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="GroupMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="210">
+          G:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="EveryoneMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="150">
+          E:
+        </text>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="60"
+         name="NextMaskDebug"
+         text_color="White"
+         top_delta="0"
+         width="90">
+          N:
+        </text>
+    </layout_panel>
+  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 1eb2b23f4b254052924b198d446c052df9ca3124 Mon Sep 17 00:00:00 2001
From: Henri Beauchamp <sldevel@users.noreply.github.com>
Date: Tue, 7 Feb 2023 13:51:53 +0100
Subject: SL-19159 Faster LLUUID and LLMaterialID hashing for std and boost
 containers keys (#70)

LLUUID and LLMaterialID already have an excellent entropy and value dispersion; there is therefore strictly no need to further (slowly) hash their value for use with std and boost libraries containers.

This commit adds a trivial getDigest64() method to both LLUUID and LLMaterialID (which simply returns the XOR of the two 64 bits long words their value is made of), and uses it in std::hash and hash_value() specializations for use with containers.
---
 indra/llcommon/lluuid.cpp        |  2 +-
 indra/llcommon/lluuid.h          | 50 +++++++++++++++++-----------------------
 indra/llprimitive/llmaterialid.h | 26 +++++++++++++++++++++
 indra/newview/llmaterialmgr.h    | 27 +++++++++++++++-------
 4 files changed, 67 insertions(+), 38 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index 8ff6c45760..aa8045e6ab 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -878,7 +878,7 @@ U32 LLUUID::getRandomSeed()
    seed[7]=(unsigned char)(pid);
    getSystemTime((uuid_time_t *)(&seed[8]));
 
-   U64 seed64 = HBXXH64((const void*)seed, 16).digest();
+   U64 seed64 = HBXXH64::digest((const void*)seed, 16);
    return U32(seed64) ^ U32(seed64 >> 32);
 }
 
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index 86a396ab06..2c36a1d222 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -119,6 +119,14 @@ public:
 	U16 getCRC16() const;
 	U32 getCRC32() const;
 
+	// Returns a 64 bits digest of the UUID, by XORing its two 64 bits long
+	// words. HB
+	inline U64 getDigest64() const
+	{
+		U64* tmp = (U64*)mData;
+		return tmp[0] ^ tmp[1];
+	}
+
 	static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal.
 
 	static const LLUUID null;
@@ -165,36 +173,20 @@ public:
 	LLAssetID makeAssetID(const LLUUID& session) const;
 };
 
-// Generate a hash of an LLUUID object using the boost hash templates. 
-template <>
-struct boost::hash<LLUUID>
-{
-    typedef LLUUID argument_type;
-    typedef std::size_t result_type;
-    result_type operator()(argument_type const& s) const
-    {
-        result_type seed(0);
-
-        for (S32 i = 0; i < UUID_BYTES; ++i)
-        {
-            boost::hash_combine(seed, s.mData[i]);
-        }
-
-        return seed;
-    }
-};
-
-// Adapt boost hash to std hash
+// std::hash implementation for LLUUID
 namespace std
 {
-    template<> struct hash<LLUUID>
-    {
-        std::size_t operator()(LLUUID const& s) const noexcept
-        {
-            return boost::hash<LLUUID>()(s);
-        }
-    };
+	template<> struct hash<LLUUID>
+	{
+		inline size_t operator()(const LLUUID& id) const noexcept
+		{
+			return (size_t)id.getDigest64();
+		}
+	};
 }
-#endif
-
 
+// For use with boost containers.
+inline size_t hash_value(const LLUUID& id) noexcept
+{
+	return (size_t)id.getDigest64();
+}
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h
index ee663f8f99..c66e3e30a3 100644
--- a/indra/llprimitive/llmaterialid.h
+++ b/indra/llprimitive/llmaterialid.h
@@ -66,6 +66,14 @@ public:
 
 	static const LLMaterialID null;
 
+	// Returns a 64 bits digest of the material Id, by XORing its two 64 bits
+	// long words. HB
+	inline U64 getDigest64() const
+	{
+		U64* tmp = (U64*)mID;
+		return tmp[0] ^ tmp[1];
+	}
+
 private:
 	void parseFromBinary(const LLSD::Binary& pMaterialID);
 	void copyFromOtherMaterialID(const LLMaterialID& pOtherMaterialID);
@@ -74,5 +82,23 @@ private:
 	U8 mID[MATERIAL_ID_SIZE];
 } ;
 
+// std::hash implementation for LLMaterialID
+namespace std
+{
+	template<> struct hash<LLMaterialID>
+	{
+		inline size_t operator()(const LLMaterialID& id) const noexcept
+		{
+			return (size_t)id.getDigest64();
+		}
+	};
+}
+
+// For use with boost containers.
+inline size_t hash_value(const LLMaterialID& id) noexcept
+{
+	return (size_t)id.getDigest64();
+}
+
 #endif // LL_LLMATERIALID_H
 
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index 843dc66fbc..47c322357a 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -102,13 +102,6 @@ private:
 			(lhs.materialID < rhs.materialID);
 	}
 
-	struct TEMaterialPairHasher
-	{
-		enum { bucket_size = 8 };
-		size_t operator()(const TEMaterialPair& key_value) const { return *((size_t*)key_value.materialID.get());  } // cheesy, but effective
-		bool   operator()(const TEMaterialPair& left, const TEMaterialPair& right) const { return left < right; }
-	};
-
 	typedef std::set<LLMaterialID> material_queue_t;
 	typedef std::map<LLUUID, material_queue_t> get_queue_t;
 	typedef std::pair<const LLUUID, LLMaterialID> pending_material_t;
@@ -116,7 +109,7 @@ private:
 	typedef std::map<LLMaterialID, get_callback_t*> get_callback_map_t;
 
 
-	typedef boost::unordered_map<TEMaterialPair, get_callback_te_t*, TEMaterialPairHasher> get_callback_te_map_t;
+	typedef boost::unordered_map<TEMaterialPair, get_callback_te_t*> get_callback_te_map_t;
 	typedef std::set<LLUUID> getall_queue_t;
 	typedef std::map<LLUUID, F64> getall_pending_map_t;
 	typedef std::map<LLUUID, getall_callback_t*> getall_callback_map_t;
@@ -146,5 +139,23 @@ private:
 	U32 getMaxEntries(const LLViewerRegion* regionp);
 };
 
+// std::hash implementation for TEMaterialPair
+namespace std
+{
+	template<> struct hash<LLMaterialMgr::TEMaterialPair>
+	{
+		inline size_t operator()(const LLMaterialMgr::TEMaterialPair& p) const noexcept
+		{
+			return size_t((p.te + 1) * p.materialID.getDigest64());
+		}
+	};
+}
+
+// For use with boost containers.
+inline size_t hash_value(const LLMaterialMgr::TEMaterialPair& p) noexcept
+{
+	return size_t((p.te + 1) * p.materialID.getDigest64());
+}
+
 #endif // LL_LLMATERIALMGR_H
 
-- 
cgit v1.2.3


From 97d58e6184756c25d905cd05ab3073d7560a05ab Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Feb 2023 21:55:18 +0200
Subject: SL-19134 Item Profile redesign #4

---
 indra/newview/llsidepaneliteminfo.cpp              | 152 +++++++++++++++------
 indra/newview/llsidepaneliteminfo.h                |  11 ++
 .../skins/default/xui/en/sidepanel_inventory.xml   |  26 ----
 .../skins/default/xui/en/sidepanel_item_info.xml   |  64 +++++----
 .../skins/default/xui/en/sidepanel_task_info.xml   |   1 -
 5 files changed, 154 insertions(+), 100 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index ad0bace91a..82a7719c52 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -31,11 +31,13 @@
 
 #include "llagent.h"
 #include "llavataractions.h"
+#include "llavatarnamecache.h"
 #include "llbutton.h"
 #include "llcallbacklist.h"
 #include "llcombobox.h"
 #include "llfloater.h"
 #include "llgroupactions.h"
+#include "llgroupmgr.h"
 #include "llinventorydefines.h"
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
@@ -134,19 +136,27 @@ LLSidepanelItemInfo::~LLSidepanelItemInfo()
     gIdleCallbacks.deleteFunction(&LLSidepanelItemInfo::onIdle, (void*)this);
 
 	stopObjectInventoryObserver();
+    
+    if (mOwnerCacheConnection.connected())
+    {
+        mOwnerCacheConnection.disconnect();
+    }
+    if (mCreatorCacheConnection.connected())
+    {
+        mCreatorCacheConnection.disconnect();
+    }
 }
 
 // virtual
 BOOL LLSidepanelItemInfo::postBuild()
 {
+    mLabelOwnerName = getChild<LLTextBox>("LabelOwnerName");
+    mLabelCreatorName = getChild<LLTextBox>("LabelCreatorName");
+    
 	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
 	getChild<LLLineEditor>("LabelItemDesc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
-	// Creator information
-	getChild<LLUICtrl>("BtnCreator")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onClickCreator,this));
-	// owner information
-	getChild<LLUICtrl>("BtnOwner")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onClickOwner,this));
 	// acquired date
 	// owner permissions
 	// Permissions debug text
@@ -229,18 +239,6 @@ void LLSidepanelItemInfo::refresh()
 		refreshFromItem(item);
 		return;
 	}
-
-	if (!item)
-	{
-		const std::string no_edit_mode_names[]={
-			"BtnCreator",
-			"BtnOwner",
-		};
-		for(size_t t=0; t<LL_ARRAY_SIZE(no_edit_mode_names); ++t)
-		{
-			getChildView(no_edit_mode_names[t])->setEnabled(false);
-		}
-	}
     
     if (mParentFloater)
     {
@@ -319,6 +317,17 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	getChildView("IconLocked")->setVisible(!is_modifiable);
 	getChild<LLUICtrl>("LabelItemDesc")->setValue(item->getDescription());
     getChild<LLUICtrl>("item_thumbnail")->setValue(item->getThumbnailUUID());
+    
+    // Style for creator and owner links
+    LLStyle::Params style_params;
+    LLColor4 link_color = LLUIColorTable::instance().getColor("HTMLLinkColor");
+    style_params.color = link_color;
+    style_params.readonly_color = link_color;
+    style_params.is_link = true; // link will be added later
+    const LLFontGL* fontp = mLabelCreatorName->getFont();
+    style_params.font.name = LLFontGL::nameFromFont(fontp);
+    style_params.font.size = LLFontGL::sizeFromFont(fontp);
+    style_params.font.style = "UNDERLINE";
 
 	//////////////////
 	// CREATOR NAME //
@@ -329,19 +338,34 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	if (item->getCreatorUUID().notNull())
 	{
 		LLUUID creator_id = item->getCreatorUUID();
-		std::string name =
-			LLSLURL("agent", creator_id, "completename").getSLURLString();
-		getChildView("BtnCreator")->setEnabled(TRUE);
+		std::string slurl =
+			LLSLURL("agent", creator_id, "inspect").getSLURLString();
+
+        style_params.link_href = slurl;
+        
+        LLAvatarName av_name;
+        if (LLAvatarNameCache::get(creator_id, &av_name))
+        {
+            updateCreatorName(creator_id, av_name, style_params);
+        }
+        else
+        {
+            if (mCreatorCacheConnection.connected())
+            {
+                mCreatorCacheConnection.disconnect();
+            }
+            mLabelCreatorName->setText(LLTrans::getString("None"));
+            mCreatorCacheConnection = LLAvatarNameCache::get(creator_id, boost::bind(&LLSidepanelItemInfo::updateCreatorName, this, _1, _2, style_params));
+        }
+        
 		getChildView("LabelCreatorTitle")->setEnabled(TRUE);
-		getChildView("LabelCreatorName")->setEnabled(FALSE);
-		getChild<LLUICtrl>("LabelCreatorName")->setValue(name);
+        mLabelCreatorName->setEnabled(FALSE);
 	}
 	else
 	{
-		getChildView("BtnCreator")->setEnabled(FALSE);
 		getChildView("LabelCreatorTitle")->setEnabled(FALSE);
-		getChildView("LabelCreatorName")->setEnabled(FALSE);
-		getChild<LLUICtrl>("LabelCreatorName")->setValue(getString("unknown_multiple"));
+        mLabelCreatorName->setEnabled(FALSE);
+        mLabelCreatorName->setValue(getString("unknown_multiple"));
 	}
 
 	////////////////
@@ -349,27 +373,56 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	////////////////
 	if(perm.isOwned())
 	{
-		std::string name;
+        std::string slurl;
 		if (perm.isGroupOwned())
 		{
-			gCacheName->getGroupName(perm.getGroup(), name);
+            LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(perm.getGroup());
+            
+            slurl = LLSLURL("group", perm.getGroup(), "inspect").getSLURLString();
+            style_params.link_href = slurl;
+            if (group_data && group_data->isGroupPropertiesDataComplete())
+            {
+                mLabelOwnerName->setText(group_data->mName, style_params);
+            }
+            else
+            {
+                // Triggers refresh
+                LLGroupMgr::getInstance()->sendGroupPropertiesRequest(perm.getGroup());
+                
+                std::string name;
+                gCacheName->getGroupName(perm.getGroup(), name);
+                mLabelOwnerName->setText(name, style_params);
+            }
 		}
 		else
 		{
 			LLUUID owner_id = perm.getOwner();
-			name = LLSLURL("agent", owner_id, "completename").getSLURLString();
+            slurl = LLSLURL("agent", owner_id, "inspect").getSLURLString();
+            
+            style_params.link_href = slurl;
+            LLAvatarName av_name;
+            if (LLAvatarNameCache::get(owner_id, &av_name))
+            {
+                updateOwnerName(owner_id, av_name, style_params);
+            }
+            else
+            {
+                if (mOwnerCacheConnection.connected())
+                {
+                    mOwnerCacheConnection.disconnect();
+                }
+                mLabelOwnerName->setText(LLTrans::getString("None"));
+                mOwnerCacheConnection = LLAvatarNameCache::get(owner_id, boost::bind(&LLSidepanelItemInfo::updateOwnerName, this, _1, _2, style_params));
+            }
 		}
-		getChildView("BtnOwner")->setEnabled(TRUE);
 		getChildView("LabelOwnerTitle")->setEnabled(TRUE);
-		getChildView("LabelOwnerName")->setEnabled(FALSE);
-		getChild<LLUICtrl>("LabelOwnerName")->setValue(name);
+        mLabelOwnerName->setEnabled(FALSE);
 	}
 	else
 	{
-		getChildView("BtnOwner")->setEnabled(FALSE);
 		getChildView("LabelOwnerTitle")->setEnabled(FALSE);
-		getChildView("LabelOwnerName")->setEnabled(FALSE);
-		getChild<LLUICtrl>("LabelOwnerName")->setValue(getString("public"));
+        mLabelOwnerName->setEnabled(FALSE);
+        mLabelOwnerName->setValue(getString("public"));
 	}
 	
 	////////////
@@ -480,6 +533,8 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 
 	if( gSavedSettings.getBOOL("DebugPermissions") )
 	{
+        childSetVisible("layout_debug_permissions", true);
+        
 		BOOL slam_perm 			= FALSE;
 		BOOL overwrite_group	= FALSE;
 		BOOL overwrite_everyone	= FALSE;
@@ -497,38 +552,29 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 		perm_string = "B: ";
 		perm_string += mask_to_string(base_mask);
 		getChild<LLUICtrl>("BaseMaskDebug")->setValue(perm_string);
-		getChildView("BaseMaskDebug")->setVisible(TRUE);
 		
 		perm_string = "O: ";
 		perm_string += mask_to_string(owner_mask);
 		getChild<LLUICtrl>("OwnerMaskDebug")->setValue(perm_string);
-		getChildView("OwnerMaskDebug")->setVisible(TRUE);
 		
 		perm_string = "G";
 		perm_string += overwrite_group ? "*: " : ": ";
 		perm_string += mask_to_string(group_mask);
 		getChild<LLUICtrl>("GroupMaskDebug")->setValue(perm_string);
-		getChildView("GroupMaskDebug")->setVisible(TRUE);
 		
 		perm_string = "E";
 		perm_string += overwrite_everyone ? "*: " : ": ";
 		perm_string += mask_to_string(everyone_mask);
 		getChild<LLUICtrl>("EveryoneMaskDebug")->setValue(perm_string);
-		getChildView("EveryoneMaskDebug")->setVisible(TRUE);
 		
 		perm_string = "N";
 		perm_string += slam_perm ? "*: " : ": ";
 		perm_string += mask_to_string(next_owner_mask);
 		getChild<LLUICtrl>("NextMaskDebug")->setValue(perm_string);
-		getChildView("NextMaskDebug")->setVisible(TRUE);
 	}
 	else
 	{
-		getChildView("BaseMaskDebug")->setVisible(FALSE);
-		getChildView("OwnerMaskDebug")->setVisible(FALSE);
-		getChildView("GroupMaskDebug")->setVisible(FALSE);
-		getChildView("EveryoneMaskDebug")->setVisible(FALSE);
-		getChildView("NextMaskDebug")->setVisible(FALSE);
+        childSetVisible("layout_debug_permissions", false);
 	}
 
 	/////////////
@@ -663,6 +709,26 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	}
 }
 
+void LLSidepanelItemInfo::updateCreatorName(const LLUUID& creator_id, const LLAvatarName& creator_name, const LLStyle::Params& style_params)
+{
+    if (mCreatorCacheConnection.connected())
+    {
+        mCreatorCacheConnection.disconnect();
+    }
+    std::string name = creator_name.getCompleteName();
+    mLabelCreatorName->setText(name, style_params);
+}
+
+void LLSidepanelItemInfo::updateOwnerName(const LLUUID& owner_id, const LLAvatarName& owner_name, const LLStyle::Params& style_params)
+{
+    if (mOwnerCacheConnection.connected())
+    {
+        mOwnerCacheConnection.disconnect();
+    }
+    std::string name = owner_name.getCompleteName();
+    mLabelOwnerName->setText(name, style_params);
+}
+
 void LLSidepanelItemInfo::changed(U32 mask)
 {
     const LLUUID& item_id = getItemID();
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index 67f8683802..249fd34e8a 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -29,12 +29,14 @@
 
 #include "llinventoryobserver.h"
 #include "llpanel.h"
+#include "llstyle.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLSidepanelItemInfo
 // Object properties for inventory side panel.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+class LLAvatarName;
 class LLButton;
 class LLFloater;
 class LLViewerInventoryItem;
@@ -42,6 +44,7 @@ class LLItemPropertiesObserver;
 class LLObjectInventoryObserver;
 class LLViewerObject;
 class LLPermissions;
+class LLTextBox;
 
 class LLSidepanelItemInfo : public LLPanel, public LLInventoryObserver
 {
@@ -66,6 +69,8 @@ public:
     void dirty();
     
     static void onIdle( void* user_data );
+    void updateOwnerName(const LLUUID& owner_id, const LLAvatarName& owner_name, const LLStyle::Params& style_params);
+    void updateCreatorName(const LLUUID& creator_id, const LLAvatarName& creator_name, const LLStyle::Params& style_params);
 
 protected:
 	void refresh() override;
@@ -82,6 +87,9 @@ private:
 	void startObjectInventoryObserver();
 	void stopObjectInventoryObserver();
 	void setPropertiesFieldsEnabled(bool enabled);
+    
+    boost::signals2::connection mOwnerCacheConnection;
+    boost::signals2::connection mCreatorCacheConnection;
 
 	LLUUID mItemID; 	// inventory UUID for the inventory item.
 	LLUUID mObjectID; 	// in-world task UUID, or null if in agent inventory.
@@ -91,6 +99,9 @@ private:
 	S32 mUpdatePendingId;
     bool mIsDirty;         // item properties need to be updated
     LLFloater* mParentFloater;
+    
+    LLTextBox* mLabelOwnerName;
+    LLTextBox* mLabelCreatorName;
 
 	//
 	// UI Elements
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index bf50b1adfd..82eb629670 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -134,30 +134,4 @@ Purchases from the marketplace will be delivered here.
              </layout_panel>
          </layout_stack>
 	</panel>
-	<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_item_info"
-		 filename="sidepanel_item_info.xml"
-		 name="sidepanel__item_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
-	<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_task_info"
-		 filename="sidepanel_task_info.xml"
-		 name="sidepanel__task_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 5f1c9e74bf..320c20deb6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -59,14 +59,14 @@
       name="layout_item_name"
       layout="topleft"
       follows="all"
-      height="35">
+      height="25">
       <line_editor
         border_style="line"
         border_thickness="1"
         follows="left|top|right"
         layout="topleft"
         left="5"
-        top="0"
+        top="1"
         right="-25"
         height="20"
         max_length_bytes="63"
@@ -80,7 +80,7 @@
         right="-5"
         mouse_opaque="true"
         name="IconLocked"
-        top="2"
+        top="3"
         width="18" />
     </layout_panel>
     
@@ -105,7 +105,7 @@
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="17"
         layout="topleft"
         left_pad="5"
         name="LabelOwnerTitle"
@@ -115,49 +115,53 @@
       </text>
       <text
         type="string"
-        follows="left|right|top"
         font="SansSerifSmall"
-        height="15"
+        follows="left|right|top"
         layout="topleft"
+        height="15"
+        width="187"
         left_delta="0"
+        top_pad="0"
         name="LabelOwnerName"
-        top_pad="2"
         use_ellipses="true"
-        width="165">
+        translate="false">
+TestString PleaseIgnore
       </text>
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="17"
         layout="topleft"
         left_delta="0"
         name="LabelCreatorTitle"
-        top_pad="2"
+        top_pad="7"
         width="78">
         Creator:
       </text>
       <text
         type="string"
-        follows="left|right|top"
         font="SansSerifSmall"
-        height="15"
+        follows="left|right|top"
         layout="topleft"
         left_delta="0"
+        top_pad="0"
+        width="187"
+        height="15"
         name="LabelCreatorName"
-        top_pad="2"
         use_ellipses="true"
-        width="165">
+        translate="false">
+TestString PleaseIgnore
       </text>
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="17"
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredTitle"
-        top_pad="2"
+        top_pad="7"
         width="78">
         Acquired:
       </text>
@@ -169,8 +173,8 @@
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredDate"
-        top_pad="2"
-        width="210">
+        top_pad="0"
+        width="187">
       </text>
     </layout_panel>
     
@@ -179,7 +183,7 @@
       name="layout_item_description"
       layout="topleft"
       follows="all"
-      height="54">
+      height="61">
       <text
         type="string"
         length="1"
@@ -213,7 +217,7 @@
           layout="topleft"
           left="5"
           name="LabelItemExperienceTitle"
-          top_pad="0"
+          top_pad="7"
           width="78"
           visible="true">
           Experience:
@@ -237,14 +241,14 @@
       name="layout_item_permissions_sale"
       layout="topleft"
       follows="all"
-      height="300">
+      height="235">
       
       <view_border
         bevel_style="none"
         height="0"
         layout="topleft"
-        left="0"
-        right="-1"
+        left="5"
+        right="-6"
         name="cost_text_border"
         top="1"/>
         
@@ -252,9 +256,9 @@
         type="string"
         length="1"
         left="10"
-        top_pad="5"
+        top_pad="7"
         height="15"
-        follows="left|top|right"
+        follows="left|top"
         layout="topleft"
         name="perm_modify"
         width="200">
@@ -267,7 +271,7 @@
         left="10"
         top_pad="5"
         height="15"
-        follows="left|top|right"
+        follows="left|top"
         layout="topleft"
         name="perm_modify"
         width="200">
@@ -380,10 +384,10 @@
         bevel_style="none"
         height="0"
         layout="topleft"
-        left="0"
-        right="-1"
+        left="5"
+        right="-6"
         name="cost_text_border"
-        top_pad="7"/>
+        top_pad="9"/>
         
       <check_box
         height="18"
@@ -391,7 +395,7 @@
         layout="topleft"
         left="20"
         name="CheckPurchase"
-        top_pad="20"
+        top_pad="15"
         width="100"
         tool_tip="Lets people buy this object, its content or it copy inworld for specified price." />
       <combo_box
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 8f7a62fb8a..ddabbbe4cf 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -168,7 +168,6 @@
 		     translate="false"
          use_ellipses="true" 
 		     width="225">
-	        TestString PleaseIgnore
 	     </text>
 	    <text
 			 type="string"
-- 
cgit v1.2.3


From c3ab9487245ac77016f3b651e2db47d239941659 Mon Sep 17 00:00:00 2001
From: Henri Beauchamp <sldev@free.fr>
Date: Tue, 7 Feb 2023 22:18:44 +0100
Subject: Added a digest_t typedef to clarify the usage of the digest LLUUID

As suggested in comments for previous commit.
---
 indra/newview/llinventorymodel.cpp    | 2 +-
 indra/newview/llinventorymodel.h      | 3 ++-
 indra/newview/llinventoryobserver.cpp | 6 +++---
 indra/newview/llinventoryobserver.h   | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b41ad51fa4..e56a0ba414 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -452,7 +452,7 @@ void LLInventoryModel::getDirectDescendentsOf(const LLUUID& cat_id,
 	items = get_ptr_in_map(mParentChildItemTree, cat_id);
 }
 
-LLUUID LLInventoryModel::hashDirectDescendentNames(const LLUUID& cat_id) const
+LLInventoryModel::digest_t LLInventoryModel::hashDirectDescendentNames(const LLUUID& cat_id) const
 {
 	LLInventoryModel::cat_array_t* cat_array;
 	LLInventoryModel::item_array_t* item_array;
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index ac10488d14..ef4a7d984d 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -256,8 +256,9 @@ public:
 								cat_array_t*& categories,
 								item_array_t*& items) const;
 
+	typedef LLUUID digest_t; // To clarify the actual usage of this "UUID"
 	// Compute a hash of direct descendant names (for detecting child name changes)
-	LLUUID hashDirectDescendentNames(const LLUUID& cat_id) const;
+	digest_t hashDirectDescendentNames(const LLUUID& cat_id) const;
 	
 	// Starting with the object specified, add its descendants to the
 	// array provided, but do not add the inventory object specified
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 2b252e369d..db0751cb89 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -640,7 +640,7 @@ void LLInventoryCategoriesObserver::changed(U32 mask)
 		// computed, or (b) a name has changed.
 		if (!cat_data.mIsNameHashInitialized || (mask & LLInventoryObserver::LABEL))
 		{
-			LLUUID item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
+			digest_t item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
 			if (cat_data.mItemNameHash != item_name_hash)
 			{
 				cat_data.mIsNameHashInitialized = true;
@@ -701,7 +701,7 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
 	{
 		if(init_name_hash)
 		{
-			LLUUID item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
+			digest_t item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
 			mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, cb, version, current_num_known_descendents,item_name_hash)));
 		}
 		else
@@ -730,7 +730,7 @@ LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
 }
 
 LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
-	const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, const LLUUID& name_hash)
+	const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, const digest_t& name_hash)
 
 	: mCatID(cat_id)
 	, mCallback(cb)
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index ec42e0449b..4af8102055 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -270,14 +270,15 @@ public:
 	void removeCategory(const LLUUID& cat_id);
 
 protected:
+	typedef LLUUID digest_t; // To clarify the actual usage of this "UUID"
 	struct LLCategoryData
 	{
 		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents);
-		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, const LLUUID& name_hash);
+		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, const digest_t& name_hash);
 		callback_t	mCallback;
 		S32			mVersion;
 		S32			mDescendentsCount;
-		LLUUID		mItemNameHash;
+		digest_t	mItemNameHash;
 		bool		mIsNameHashInitialized;
 		LLUUID		mCatID;
 	};
-- 
cgit v1.2.3


From 1cc41cb9c4c4dfaa7e385e63dac25ff97c18e63a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 14:02:09 +0200
Subject: SL-19134 Remove llfloaterproperties

Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
---
 indra/newview/CMakeLists.txt                       |   2 -
 indra/newview/llfloatermarketplacelistings.cpp     |   1 +
 indra/newview/llfloaterproperties.cpp              | 891 ---------------------
 indra/newview/llfloaterproperties.h                |  98 ---
 indra/newview/llinventorybridge.cpp                |   3 -
 indra/newview/llinventorybridge.h                  |   1 -
 indra/newview/llinventoryfunctions.cpp             |  11 +-
 indra/newview/llpanelobjectinventory.cpp           |  15 -
 indra/newview/llselectmgr.cpp                      |   3 -
 indra/newview/llviewerfloaterreg.cpp               |   2 -
 indra/newview/llviewerobject.cpp                   |   4 -
 .../xui/da/floater_inventory_item_properties.xml   |  67 --
 .../xui/de/floater_inventory_item_properties.xml   |  36 -
 .../xui/en/floater_inventory_item_properties.xml   | 422 ----------
 .../xui/es/floater_inventory_item_properties.xml   |  36 -
 .../xui/fr/floater_inventory_item_properties.xml   |  36 -
 .../xui/it/floater_inventory_item_properties.xml   |  36 -
 .../xui/ja/floater_inventory_item_properties.xml   |  36 -
 .../xui/pl/floater_inventory_item_properties.xml   |  59 --
 .../xui/pt/floater_inventory_item_properties.xml   |  36 -
 .../xui/ru/floater_inventory_item_properties.xml   |  36 -
 .../xui/tr/floater_inventory_item_properties.xml   |  36 -
 .../xui/zh/floater_inventory_item_properties.xml   |  36 -
 23 files changed, 3 insertions(+), 1900 deletions(-)
 delete mode 100644 indra/newview/llfloaterproperties.cpp
 delete mode 100644 indra/newview/llfloaterproperties.h
 delete mode 100644 indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 84b80617e5..402cc70a64 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -302,7 +302,6 @@ set(viewer_SOURCE_FILES
     llfloaterpreferenceviewadvanced.cpp
     llfloaterpreviewtrash.cpp
     llfloaterprofiletexture.cpp
-    llfloaterproperties.cpp
     llfloaterregiondebugconsole.cpp
     llfloaterregioninfo.cpp
     llfloaterreporter.cpp
@@ -946,7 +945,6 @@ set(viewer_HEADER_FILES
     llfloaterpreferenceviewadvanced.h
     llfloaterpreviewtrash.h
     llfloaterprofiletexture.h
-    llfloaterproperties.h
     llfloaterregiondebugconsole.h
     llfloaterregioninfo.h
     llfloaterreporter.h
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 4c8e365dd0..56cdd3446f 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -42,6 +42,7 @@
 #include "llnotificationsutil.h"
 #include "llsidepaneliteminfo.h"
 #include "llsidepaneltaskinfo.h"
+#include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "lltrans.h"
 
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
deleted file mode 100644
index 64ad40f419..0000000000
--- a/indra/newview/llfloaterproperties.cpp
+++ /dev/null
@@ -1,891 +0,0 @@
-/** 
- * @file llfloaterproperties.cpp
- * @brief A floater which shows an inventory item's properties.
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llfloaterproperties.h"
-
-#include <algorithm>
-#include <functional>
-#include "llcachename.h"
-#include "llavatarnamecache.h"
-#include "lldbstrings.h"
-#include "llfloaterreg.h"
-
-#include "llagent.h"
-#include "llbutton.h"
-#include "llcheckboxctrl.h"
-#include "llcombobox.h"
-#include "llavataractions.h"
-#include "llinventorydefines.h"
-#include "llinventoryobserver.h"
-#include "llinventorymodel.h"
-#include "lllineeditor.h"
-//#include "llspinctrl.h"
-#include "llradiogroup.h"
-#include "llresmgr.h"
-#include "roles_constants.h"
-#include "llselectmgr.h"
-#include "lltextbox.h"
-#include "lltrans.h"
-#include "lluiconstants.h"
-#include "llviewerinventory.h"
-#include "llviewerobjectlist.h"
-#include "llviewerregion.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llgroupactions.h"
-
-#include "lluictrlfactory.h"
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLPropertiesObserver
-//
-// helper class to watch the inventory. 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-// Ugh. This can't be a singleton because it needs to remove itself
-//  from the inventory observer list when destroyed, which could
-//  happen after gInventory has already been destroyed if a singleton.
-// Instead, do our own ref counting and create / destroy it as needed
-class LLPropertiesObserver : public LLInventoryObserver
-{
-public:
-	LLPropertiesObserver(LLFloaterProperties* floater)
-		: mFloater(floater)
-	{
-		gInventory.addObserver(this);
-	}
-	virtual ~LLPropertiesObserver()
-	{
-		gInventory.removeObserver(this);
-	}
-	virtual void changed(U32 mask);
-private:
-	LLFloaterProperties* mFloater; // Not a handle because LLFloaterProperties is managing LLPropertiesObserver
-};
-
-void LLPropertiesObserver::changed(U32 mask)
-{
-	// if there's a change we're interested in.
-	if((mask & (LLInventoryObserver::LABEL | LLInventoryObserver::INTERNAL | LLInventoryObserver::REMOVE)) != 0)
-	{
-		mFloater->dirty();
-	}
-}
-
-
-
-///----------------------------------------------------------------------------
-/// Class LLFloaterProperties
-///----------------------------------------------------------------------------
-
-// Default constructor
-LLFloaterProperties::LLFloaterProperties(const LLUUID& item_id)
-  : LLFloater(mItemID),
-	mItemID(item_id),
-	mDirty(TRUE)
-{
-	mPropertiesObserver = new LLPropertiesObserver(this);
-}
-
-// Destroys the object
-LLFloaterProperties::~LLFloaterProperties()
-{
-	delete mPropertiesObserver;
-	mPropertiesObserver = NULL;
-}
-
-// virtual
-BOOL LLFloaterProperties::postBuild()
-{
-	// build the UI
-	// item name & description
-	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
-	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitName,this));
-	getChild<LLLineEditor>("LabelItemDesc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
-	getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLFloaterProperties:: onCommitDescription, this));
-	// Creator information
-	getChild<LLUICtrl>("BtnCreator")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickCreator,this));
-	// owner information
-	getChild<LLUICtrl>("BtnOwner")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickOwner,this));
-	// acquired date
-	// owner permissions
-	// Permissions debug text
-	// group permissions
-	getChild<LLUICtrl>("CheckShareWithGroup")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitPermissions, this));
-	// everyone permissions
-	getChild<LLUICtrl>("CheckEveryoneCopy")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitPermissions, this));
-	// next owner permissions
-	getChild<LLUICtrl>("CheckNextOwnerModify")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitPermissions, this));
-	getChild<LLUICtrl>("CheckNextOwnerCopy")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitPermissions, this));
-	getChild<LLUICtrl>("CheckNextOwnerTransfer")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitPermissions, this));
-	// Mark for sale or not, and sale info
-	getChild<LLUICtrl>("CheckPurchase")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleInfo, this));
-	getChild<LLUICtrl>("ComboBoxSaleType")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleType, this));
-	// "Price" label for edit
-	getChild<LLUICtrl>("Edit Cost")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleInfo, this));
-	// The UI has been built, now fill in all the values
-	refresh();
-
-	return TRUE;
-}
-
-// virtual
-void LLFloaterProperties::onOpen(const LLSD& key)
-{
-	refresh();
-}
-
-void LLFloaterProperties::refresh()
-{
-	LLInventoryItem* item = findItem();
-	if(item)
-	{
-		refreshFromItem(item);
-	}
-	else
-	{
-		//RN: it is possible that the container object is in the middle of an inventory refresh
-		// causing findItem() to fail, so just temporarily disable everything
-		
-		mDirty = TRUE;
-
-		const char* enableNames[]={
-			"LabelItemName",
-			"LabelItemDesc",
-			"LabelCreatorName",
-			"BtnCreator",
-			"LabelOwnerName",
-			"BtnOwner",
-			"CheckOwnerModify",
-			"CheckOwnerCopy",
-			"CheckOwnerTransfer",
-			"CheckShareWithGroup",
-			"CheckEveryoneCopy",
-			"CheckNextOwnerModify",
-			"CheckNextOwnerCopy",
-			"CheckNextOwnerTransfer",
-			"CheckPurchase",
-			"ComboBoxSaleType",
-			"Edit Cost"
-		};
-		for(size_t t=0; t<LL_ARRAY_SIZE(enableNames); ++t)
-		{
-			getChildView(enableNames[t])->setEnabled(false);
-		}
-		const char* hideNames[]={
-			"BaseMaskDebug",
-			"OwnerMaskDebug",
-			"GroupMaskDebug",
-			"EveryoneMaskDebug",
-			"NextMaskDebug"
-		};
-		for(size_t t=0; t<LL_ARRAY_SIZE(hideNames); ++t)
-		{
-			getChildView(hideNames[t])->setVisible(false);
-		}
-	}
-}
-
-void LLFloaterProperties::draw()
-{
-	if (mDirty)
-	{
-		// RN: clear dirty first because refresh can set dirty to TRUE
-		mDirty = FALSE;
-		refresh();
-	}
-
-	LLFloater::draw();
-}
-
-void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
-{
-	////////////////////////
-	// PERMISSIONS LOOKUP //
-	////////////////////////
-
-	// do not enable the UI for incomplete items.
-	LLViewerInventoryItem* i = (LLViewerInventoryItem*)item;
-	BOOL is_complete = i->isFinished();
-	const BOOL cannot_restrict_permissions = LLInventoryType::cannotRestrictPermissions(i->getInventoryType());
-	const BOOL is_calling_card = (i->getInventoryType() == LLInventoryType::IT_CALLINGCARD);
-	const LLPermissions& perm = item->getPermissions();
-	const BOOL can_agent_manipulate = gAgent.allowOperation(PERM_OWNER, perm, 
-															GP_OBJECT_MANIPULATE);
-	const BOOL can_agent_sell = gAgent.allowOperation(PERM_OWNER, perm, 
-													  GP_OBJECT_SET_SALE) &&
-		!cannot_restrict_permissions;
-	const BOOL is_link = i->getIsLinkType();
-
-	// You need permission to modify the object to modify an inventory
-	// item in it.
-	LLViewerObject* object = NULL;
-	if(!mObjectID.isNull()) object = gObjectList.findObject(mObjectID);
-	BOOL is_obj_modify = TRUE;
-	if(object)
-	{
-		is_obj_modify = object->permOwnerModify();
-	}
-
-	//////////////////////
-	// ITEM NAME & DESC //
-	//////////////////////
-	BOOL is_modifiable = gAgent.allowOperation(PERM_MODIFY, perm,
-											   GP_OBJECT_MANIPULATE)
-		&& is_obj_modify && is_complete;
-
-	getChildView("LabelItemNameTitle")->setEnabled(TRUE);
-	getChildView("LabelItemName")->setEnabled(is_modifiable && !is_calling_card); // for now, don't allow rename of calling cards
-	getChild<LLUICtrl>("LabelItemName")->setValue(item->getName());
-	getChildView("LabelItemDescTitle")->setEnabled(TRUE);
-	getChildView("LabelItemDesc")->setEnabled(is_modifiable);
-	getChildView("IconLocked")->setVisible(!is_modifiable);
-	getChild<LLUICtrl>("LabelItemDesc")->setValue(item->getDescription());
-
-	//////////////////
-	// CREATOR NAME //
-	//////////////////
-	if(!gCacheName) return;
-	if(!gAgent.getRegion()) return;
-
-	if (item->getCreatorUUID().notNull())
-	{
-		LLAvatarName av_name;
-		LLAvatarNameCache::get(item->getCreatorUUID(), &av_name);
-		getChildView("BtnCreator")->setEnabled(TRUE);
-		getChildView("LabelCreatorTitle")->setEnabled(TRUE);
-		getChildView("LabelCreatorName")->setEnabled(TRUE);
-		getChild<LLUICtrl>("LabelCreatorName")->setValue(av_name.getUserName());
-	}
-	else
-	{
-		getChildView("BtnCreator")->setEnabled(FALSE);
-		getChildView("LabelCreatorTitle")->setEnabled(FALSE);
-		getChildView("LabelCreatorName")->setEnabled(FALSE);
-		getChild<LLUICtrl>("LabelCreatorName")->setValue(getString("unknown"));
-	}
-
-	////////////////
-	// OWNER NAME //
-	////////////////
-	if(perm.isOwned())
-	{
-		std::string name;
-		if (perm.isGroupOwned())
-		{
-			gCacheName->getGroupName(perm.getGroup(), name);
-		}
-		else
-		{
-			LLAvatarName av_name;
-			LLAvatarNameCache::get(perm.getOwner(), &av_name);
-			name = av_name.getUserName();
-		}
-		getChildView("BtnOwner")->setEnabled(TRUE);
-		getChildView("LabelOwnerTitle")->setEnabled(TRUE);
-		getChildView("LabelOwnerName")->setEnabled(TRUE);
-		getChild<LLUICtrl>("LabelOwnerName")->setValue(name);
-	}
-	else
-	{
-		getChildView("BtnOwner")->setEnabled(FALSE);
-		getChildView("LabelOwnerTitle")->setEnabled(FALSE);
-		getChildView("LabelOwnerName")->setEnabled(FALSE);
-		getChild<LLUICtrl>("LabelOwnerName")->setValue(getString("public"));
-	}
-	
-	//////////////////
-	// ACQUIRE DATE //
-	//////////////////
-	
-	time_t time_utc = item->getCreationDate();
-	if (0 == time_utc)
-	{
-		getChild<LLUICtrl>("LabelAcquiredDate")->setValue(getString("unknown"));
-	}
-	else
-	{
-		std::string timeStr = getString("acquiredDate");
-		LLSD substitution;
-		substitution["datetime"] = (S32) time_utc;
-		LLStringUtil::format (timeStr, substitution);
-		getChild<LLUICtrl>("LabelAcquiredDate")->setValue(timeStr);
-	}
-
-	///////////////////////
-	// OWNER PERMISSIONS //
-	///////////////////////
-	if(can_agent_manipulate)
-	{
-		getChild<LLUICtrl>("OwnerLabel")->setValue(getString("you_can"));
-	}
-	else
-	{
-		getChild<LLUICtrl>("OwnerLabel")->setValue(getString("owner_can"));
-	}
-
-	U32 base_mask		= perm.getMaskBase();
-	U32 owner_mask		= perm.getMaskOwner();
-	U32 group_mask		= perm.getMaskGroup();
-	U32 everyone_mask	= perm.getMaskEveryone();
-	U32 next_owner_mask	= perm.getMaskNextOwner();
-
-	getChildView("OwnerLabel")->setEnabled(TRUE);
-	getChildView("CheckOwnerModify")->setEnabled(FALSE);
-	getChild<LLUICtrl>("CheckOwnerModify")->setValue(LLSD((BOOL)(owner_mask & PERM_MODIFY)));
-	getChildView("CheckOwnerCopy")->setEnabled(FALSE);
-	getChild<LLUICtrl>("CheckOwnerCopy")->setValue(LLSD((BOOL)(owner_mask & PERM_COPY)));
-	getChildView("CheckOwnerTransfer")->setEnabled(FALSE);
-	getChild<LLUICtrl>("CheckOwnerTransfer")->setValue(LLSD((BOOL)(owner_mask & PERM_TRANSFER)));
-
-	///////////////////////
-	// DEBUG PERMISSIONS //
-	///////////////////////
-
-	if( gSavedSettings.getBOOL("DebugPermissions") )
-	{
-		BOOL slam_perm 			= FALSE;
-		BOOL overwrite_group	= FALSE;
-		BOOL overwrite_everyone	= FALSE;
-
-		if (item->getType() == LLAssetType::AT_OBJECT)
-		{
-			U32 flags = item->getFlags();
-			slam_perm 			= flags & LLInventoryItemFlags::II_FLAGS_OBJECT_SLAM_PERM;
-			overwrite_everyone	= flags & LLInventoryItemFlags::II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE;
-			overwrite_group		= flags & LLInventoryItemFlags::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP;
-		}
-		
-		std::string perm_string;
-
-		perm_string = "B: ";
-		perm_string += mask_to_string(base_mask);
-		getChild<LLUICtrl>("BaseMaskDebug")->setValue(perm_string);
-		getChildView("BaseMaskDebug")->setVisible(TRUE);
-		
-		perm_string = "O: ";
-		perm_string += mask_to_string(owner_mask);
-		getChild<LLUICtrl>("OwnerMaskDebug")->setValue(perm_string);
-		getChildView("OwnerMaskDebug")->setVisible(TRUE);
-		
-		perm_string = "G";
-		perm_string += overwrite_group ? "*: " : ": ";
-		perm_string += mask_to_string(group_mask);
-		getChild<LLUICtrl>("GroupMaskDebug")->setValue(perm_string);
-		getChildView("GroupMaskDebug")->setVisible(TRUE);
-		
-		perm_string = "E";
-		perm_string += overwrite_everyone ? "*: " : ": ";
-		perm_string += mask_to_string(everyone_mask);
-		getChild<LLUICtrl>("EveryoneMaskDebug")->setValue(perm_string);
-		getChildView("EveryoneMaskDebug")->setVisible(TRUE);
-		
-		perm_string = "N";
-		perm_string += slam_perm ? "*: " : ": ";
-		perm_string += mask_to_string(next_owner_mask);
-		getChild<LLUICtrl>("NextMaskDebug")->setValue(perm_string);
-		getChildView("NextMaskDebug")->setVisible(TRUE);
-	}
-	else
-	{
-		getChildView("BaseMaskDebug")->setVisible(FALSE);
-		getChildView("OwnerMaskDebug")->setVisible(FALSE);
-		getChildView("GroupMaskDebug")->setVisible(FALSE);
-		getChildView("EveryoneMaskDebug")->setVisible(FALSE);
-		getChildView("NextMaskDebug")->setVisible(FALSE);
-	}
-
-	/////////////
-	// SHARING //
-	/////////////
-
-	// Check for ability to change values.
-	if (is_link || cannot_restrict_permissions)
-	{
-		getChildView("CheckShareWithGroup")->setEnabled(FALSE);
-		getChildView("CheckEveryoneCopy")->setEnabled(FALSE);
-	}
-	else if (is_obj_modify && can_agent_manipulate)
-	{
-		getChildView("CheckShareWithGroup")->setEnabled(TRUE);
-		getChildView("CheckEveryoneCopy")->setEnabled((owner_mask & PERM_COPY) && (owner_mask & PERM_TRANSFER));
-	}
-	else
-	{
-		getChildView("CheckShareWithGroup")->setEnabled(FALSE);
-		getChildView("CheckEveryoneCopy")->setEnabled(FALSE);
-	}
-
-	// Set values.
-	BOOL is_group_copy = (group_mask & PERM_COPY) ? TRUE : FALSE;
-	BOOL is_group_modify = (group_mask & PERM_MODIFY) ? TRUE : FALSE;
-	BOOL is_group_move = (group_mask & PERM_MOVE) ? TRUE : FALSE;
-
-	if (is_group_copy && is_group_modify && is_group_move)
-	{
-		getChild<LLUICtrl>("CheckShareWithGroup")->setValue(LLSD((BOOL)TRUE));
-
-		LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-		if(ctl)
-		{
-			ctl->setTentative(FALSE);
-		}
-	}
-	else if (!is_group_copy && !is_group_modify && !is_group_move)
-	{
-		getChild<LLUICtrl>("CheckShareWithGroup")->setValue(LLSD((BOOL)FALSE));
-		LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-		if(ctl)
-		{
-			ctl->setTentative(FALSE);
-		}
-	}
-	else
-	{
-		LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-		if(ctl)
-		{
-			ctl->setTentative(TRUE);
-			ctl->set(TRUE);
-		}
-	}
-	
-	getChild<LLUICtrl>("CheckEveryoneCopy")->setValue(LLSD((BOOL)(everyone_mask & PERM_COPY)));
-
-	///////////////
-	// SALE INFO //
-	///////////////
-
-	const LLSaleInfo& sale_info = item->getSaleInfo();
-	BOOL is_for_sale = sale_info.isForSale();
-	LLComboBox* combo_sale_type = getChild<LLComboBox>("ComboBoxSaleType");
-	LLUICtrl* edit_cost = getChild<LLUICtrl>("Edit Cost");
-
-	// Check for ability to change values.
-	if (is_obj_modify && can_agent_sell 
-		&& gAgent.allowOperation(PERM_TRANSFER, perm, GP_OBJECT_MANIPULATE))
-	{
-		getChildView("CheckPurchase")->setEnabled(is_complete);
-
-		getChildView("NextOwnerLabel")->setEnabled(TRUE);
-		getChildView("CheckNextOwnerModify")->setEnabled((base_mask & PERM_MODIFY) && !cannot_restrict_permissions);
-		getChildView("CheckNextOwnerCopy")->setEnabled((base_mask & PERM_COPY) && !cannot_restrict_permissions);
-		getChildView("CheckNextOwnerTransfer")->setEnabled((next_owner_mask & PERM_COPY) && !cannot_restrict_permissions);
-
-		combo_sale_type->setEnabled(is_complete && is_for_sale);
-		edit_cost->setEnabled(is_complete && is_for_sale);
-	}
-	else
-	{
-		getChildView("CheckPurchase")->setEnabled(FALSE);
-
-		getChildView("NextOwnerLabel")->setEnabled(FALSE);
-		getChildView("CheckNextOwnerModify")->setEnabled(FALSE);
-		getChildView("CheckNextOwnerCopy")->setEnabled(FALSE);
-		getChildView("CheckNextOwnerTransfer")->setEnabled(FALSE);
-
-		combo_sale_type->setEnabled(FALSE);
-		edit_cost->setEnabled(FALSE);
-	}
-
-	// Set values.
-	getChild<LLUICtrl>("CheckPurchase")->setValue(is_for_sale);
-	getChild<LLUICtrl>("CheckNextOwnerModify")->setValue(LLSD(BOOL(next_owner_mask & PERM_MODIFY)));
-	getChild<LLUICtrl>("CheckNextOwnerCopy")->setValue(LLSD(BOOL(next_owner_mask & PERM_COPY)));
-	getChild<LLUICtrl>("CheckNextOwnerTransfer")->setValue(LLSD(BOOL(next_owner_mask & PERM_TRANSFER)));
-
-	if (is_for_sale)
-	{
-		S32 numerical_price;
-		numerical_price = sale_info.getSalePrice();
-		edit_cost->setValue(llformat("%d",numerical_price));
-		combo_sale_type->setValue(sale_info.getSaleType());
-	}
-	else
-	{
-		edit_cost->setValue(llformat("%d",0));
-		combo_sale_type->setValue(LLSaleInfo::FS_COPY);
-	}
-}
-
-void LLFloaterProperties::onClickCreator()
-{
-	LLInventoryItem* item = findItem();
-	if(!item) return;
-	if(!item->getCreatorUUID().isNull())
-	{
-		LLAvatarActions::showProfile(item->getCreatorUUID());
-	}
-}
-
-// static
-void LLFloaterProperties::onClickOwner()
-{
-	LLInventoryItem* item = findItem();
-	if(!item) return;
-	if(item->getPermissions().isGroupOwned())
-	{
-		LLGroupActions::show(item->getPermissions().getGroup());
-	}
-	else
-	{
-		LLAvatarActions::showProfile(item->getPermissions().getOwner());
-	}
-}
-
-// static
-void LLFloaterProperties::onCommitName()
-{
-	//LL_INFOS() << "LLFloaterProperties::onCommitName()" << LL_ENDL;
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
-	if(!item)
-	{
-		return;
-	}
-	LLLineEditor* labelItemName = getChild<LLLineEditor>("LabelItemName");
-
-	if(labelItemName&&
-	   (item->getName() != labelItemName->getText()) && 
-	   (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE)) )
-	{
-		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-		new_item->rename(labelItemName->getText());
-		if(mObjectID.isNull())
-		{
-			new_item->updateServer(FALSE);
-			gInventory.updateItem(new_item);
-			gInventory.notifyObservers();
-		}
-		else
-		{
-			LLViewerObject* object = gObjectList.findObject(mObjectID);
-			if(object)
-			{
-				object->updateInventory(
-					new_item,
-					TASK_INVENTORY_ITEM_KEY,
-					false);
-			}
-		}
-	}
-}
-
-void LLFloaterProperties::onCommitDescription()
-{
-	//LL_INFOS() << "LLFloaterProperties::onCommitDescription()" << LL_ENDL;
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
-	if(!item) return;
-
-	LLLineEditor* labelItemDesc = getChild<LLLineEditor>("LabelItemDesc");
-	if(!labelItemDesc)
-	{
-		return;
-	}
-	if((item->getDescription() != labelItemDesc->getText()) && 
-	   (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE)))
-	{
-		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-
-		new_item->setDescription(labelItemDesc->getText());
-		if(mObjectID.isNull())
-		{
-			new_item->updateServer(FALSE);
-			gInventory.updateItem(new_item);
-			gInventory.notifyObservers();
-		}
-		else
-		{
-			LLViewerObject* object = gObjectList.findObject(mObjectID);
-			if(object)
-			{
-				object->updateInventory(
-					new_item,
-					TASK_INVENTORY_ITEM_KEY,
-					false);
-			}
-		}
-	}
-}
-
-// static
-void LLFloaterProperties::onCommitPermissions()
-{
-	//LL_INFOS() << "LLFloaterProperties::onCommitPermissions()" << LL_ENDL;
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
-	if(!item) return;
-	LLPermissions perm(item->getPermissions());
-
-
-	LLCheckBoxCtrl* CheckShareWithGroup = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-
-	if(CheckShareWithGroup)
-	{
-		perm.setGroupBits(gAgent.getID(), gAgent.getGroupID(),
-						CheckShareWithGroup->get(),
-						PERM_MODIFY | PERM_MOVE | PERM_COPY);
-	}
-	LLCheckBoxCtrl* CheckEveryoneCopy = getChild<LLCheckBoxCtrl>("CheckEveryoneCopy");
-	if(CheckEveryoneCopy)
-	{
-		perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(),
-						 CheckEveryoneCopy->get(), PERM_COPY);
-	}
-
-	LLCheckBoxCtrl* CheckNextOwnerModify = getChild<LLCheckBoxCtrl>("CheckNextOwnerModify");
-	if(CheckNextOwnerModify)
-	{
-		perm.setNextOwnerBits(gAgent.getID(), gAgent.getGroupID(),
-							CheckNextOwnerModify->get(), PERM_MODIFY);
-	}
-	LLCheckBoxCtrl* CheckNextOwnerCopy = getChild<LLCheckBoxCtrl>("CheckNextOwnerCopy");
-	if(CheckNextOwnerCopy)
-	{
-		perm.setNextOwnerBits(gAgent.getID(), gAgent.getGroupID(),
-							CheckNextOwnerCopy->get(), PERM_COPY);
-	}
-	LLCheckBoxCtrl* CheckNextOwnerTransfer = getChild<LLCheckBoxCtrl>("CheckNextOwnerTransfer");
-	if(CheckNextOwnerTransfer)
-	{
-		perm.setNextOwnerBits(gAgent.getID(), gAgent.getGroupID(),
-							CheckNextOwnerTransfer->get(), PERM_TRANSFER);
-	}
-	if(perm != item->getPermissions()
-		&& item->isFinished())
-	{
-		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-		new_item->setPermissions(perm);
-		U32 flags = new_item->getFlags();
-		// If next owner permissions have changed (and this is an object)
-		// then set the slam permissions flag so that they are applied on rez.
-		if((perm.getMaskNextOwner()!=item->getPermissions().getMaskNextOwner())
-		   && (item->getType() == LLAssetType::AT_OBJECT))
-		{
-			flags |= LLInventoryItemFlags::II_FLAGS_OBJECT_SLAM_PERM;
-		}
-		// If everyone permissions have changed (and this is an object)
-		// then set the overwrite everyone permissions flag so they
-		// are applied on rez.
-		if ((perm.getMaskEveryone()!=item->getPermissions().getMaskEveryone())
-			&& (item->getType() == LLAssetType::AT_OBJECT))
-		{
-			flags |= LLInventoryItemFlags::II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE;
-		}
-		// If group permissions have changed (and this is an object)
-		// then set the overwrite group permissions flag so they
-		// are applied on rez.
-		if ((perm.getMaskGroup()!=item->getPermissions().getMaskGroup())
-			&& (item->getType() == LLAssetType::AT_OBJECT))
-		{
-			flags |= LLInventoryItemFlags::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP;
-		}
-		new_item->setFlags(flags);
-		if(mObjectID.isNull())
-		{
-			new_item->updateServer(FALSE);
-			gInventory.updateItem(new_item);
-			gInventory.notifyObservers();
-		}
-		else
-		{
-			LLViewerObject* object = gObjectList.findObject(mObjectID);
-			if(object)
-			{
-				object->updateInventory(
-					new_item,
-					TASK_INVENTORY_ITEM_KEY,
-					false);
-			}
-		}
-	}
-	else
-	{
-		// need to make sure we don't just follow the click
-		refresh();
-	}
-}
-
-// static
-void LLFloaterProperties::onCommitSaleInfo()
-{
-	//LL_INFOS() << "LLFloaterProperties::onCommitSaleInfo()" << LL_ENDL;
-	updateSaleInfo();
-}
-
-// static
-void LLFloaterProperties::onCommitSaleType()
-{
-	//LL_INFOS() << "LLFloaterProperties::onCommitSaleType()" << LL_ENDL;
-	updateSaleInfo();
-}
-
-void LLFloaterProperties::updateSaleInfo()
-{
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
-	if(!item) return;
-	LLSaleInfo sale_info(item->getSaleInfo());
-	if(!gAgent.allowOperation(PERM_TRANSFER, item->getPermissions(), GP_OBJECT_SET_SALE))
-	{
-		getChild<LLUICtrl>("CheckPurchase")->setValue(LLSD((BOOL)FALSE));
-	}
-
-	if((BOOL)getChild<LLUICtrl>("CheckPurchase")->getValue())
-	{
-		// turn on sale info
-		LLSaleInfo::EForSale sale_type = LLSaleInfo::FS_COPY;
-
-		LLComboBox* combo_sale_type = getChild<LLComboBox>("ComboBoxSaleType");
-		if (combo_sale_type)
-		{
-			sale_type = static_cast<LLSaleInfo::EForSale>(combo_sale_type->getValue().asInteger());
-		}
-
-		if (sale_type == LLSaleInfo::FS_COPY 
-			&& !gAgent.allowOperation(PERM_COPY, item->getPermissions(), 
-									  GP_OBJECT_SET_SALE))
-		{
-			sale_type = LLSaleInfo::FS_ORIGINAL;
-		}
-
-	     
-		
-		S32 price = -1;
-		price =  getChild<LLUICtrl>("Edit Cost")->getValue().asInteger();;
-
-		// Invalid data - turn off the sale
-		if (price < 0)
-		{
-			sale_type = LLSaleInfo::FS_NOT;
-			price = 0;
-		}
-
-		sale_info.setSaleType(sale_type);
-		sale_info.setSalePrice(price);
-	}
-	else
-	{
-		sale_info.setSaleType(LLSaleInfo::FS_NOT);
-	}
-	if(sale_info != item->getSaleInfo()
-		&& item->isFinished())
-	{
-		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-
-		// Force an update on the sale price at rez
-		if (item->getType() == LLAssetType::AT_OBJECT)
-		{
-			U32 flags = new_item->getFlags();
-			flags |= LLInventoryItemFlags::II_FLAGS_OBJECT_SLAM_SALE;
-			new_item->setFlags(flags);
-		}
-
-		new_item->setSaleInfo(sale_info);
-		if(mObjectID.isNull())
-		{
-			// This is in the agent's inventory.
-			new_item->updateServer(FALSE);
-			gInventory.updateItem(new_item);
-			gInventory.notifyObservers();
-		}
-		else
-		{
-			// This is in an object's contents.
-			LLViewerObject* object = gObjectList.findObject(mObjectID);
-			if(object)
-			{
-				object->updateInventory(
-					new_item,
-					TASK_INVENTORY_ITEM_KEY,
-					false);
-			}
-		}
-	}
-	else
-	{
-		// need to make sure we don't just follow the click
-		refresh();
-	}
-}
-
-LLInventoryItem* LLFloaterProperties::findItem() const
-{
-	LLInventoryItem* item = NULL;
-	if(mObjectID.isNull())
-	{
-		// it is in agent inventory
-		item = gInventory.getItem(mItemID);
-	}
-	else
-	{
-		LLViewerObject* object = gObjectList.findObject(mObjectID);
-		if(object)
-		{
-			item = (LLInventoryItem*)object->getInventoryObject(mItemID);
-		}
-	}
-	return item;
-}
-
-//static
-void LLFloaterProperties::dirtyAll()
-{
-	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("properties");
-	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin();
-		 iter != inst_list.end(); ++iter)
-	{
-		LLFloaterProperties* floater = dynamic_cast<LLFloaterProperties*>(*iter);
-		llassert(floater); // else cast failed - wrong type D:
-		if (floater)
-		{
-			floater->dirty();
-		}
-	}
-}
-
-///----------------------------------------------------------------------------
-/// LLMultiProperties
-///----------------------------------------------------------------------------
-
-LLMultiProperties::LLMultiProperties()
-	: LLMultiFloater(LLSD())
-{
-	// start with a small rect in the top-left corner ; will get resized
-	LLRect rect;
-	rect.setLeftTopAndSize(0, gViewerWindow->getWindowHeightScaled(), 20, 20);
-	setRect(rect);
-	LLFloater* last_floater = LLFloaterReg::getLastFloaterInGroup("properties");
-	if (last_floater)
-	{
-		stackWith(*last_floater);
-	}
-	setTitle(LLTrans::getString("MultiPropertiesTitle"));
-	buildTabContainer();
-}
-
-///----------------------------------------------------------------------------
-/// Local function definitions
-///----------------------------------------------------------------------------
diff --git a/indra/newview/llfloaterproperties.h b/indra/newview/llfloaterproperties.h
deleted file mode 100644
index aa3fcec337..0000000000
--- a/indra/newview/llfloaterproperties.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/** 
- * @file llfloaterproperties.h
- * @brief A floater which shows an inventory item's properties.
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERPROPERTIES_H
-#define LL_LLFLOATERPROPERTIES_H
-
-#include <map>
-#include "llmultifloater.h"
-#include "lliconctrl.h"
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLFloaterProperties
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLButton;
-class LLCheckBoxCtrl;
-class LLInventoryItem;
-class LLLineEditor;
-class LLRadioGroup;
-class LLTextBox;
-
-class LLPropertiesObserver;
-
-class LLFloaterProperties : public LLFloater
-{
-public:
-	LLFloaterProperties(const LLUUID& item_id);
-	/*virtual*/ ~LLFloaterProperties();
-	
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-	void setObjectID(const LLUUID& object_id) { mObjectID = object_id; }
-
-	void dirty() { mDirty = TRUE; }
-	void refresh();
-	
-	static void dirtyAll();
-	
-protected:
-	// ui callbacks
-	void onClickCreator();
-	void onClickOwner();
-	void onCommitName();
-	void onCommitDescription();
-	void onCommitPermissions();
-	void onCommitSaleInfo();
-	void onCommitSaleType();
-	void updateSaleInfo();
-
-	LLInventoryItem* findItem() const;
-
-	void refreshFromItem(LLInventoryItem* item);
-	virtual void draw();
-
-protected:
-	// The item id of the inventory item in question.
-	LLUUID mItemID;
-
-	// mObjectID will have a value if it is associated with a task in
-	// the world, and will be == LLUUID::null if it's in the agent
-	// inventory.
-	LLUUID mObjectID;
-
-	BOOL mDirty;
-
-	LLPropertiesObserver* mPropertiesObserver;
-};
-
-class LLMultiProperties : public LLMultiFloater
-{
-public:
-	LLMultiProperties();
-};
-
-#endif // LL_LLFLOATERPROPERTIES_H
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5ca5446d23..2dd5d12ee6 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -7586,9 +7586,6 @@ class LLObjectBridgeAction: public LLInvFVBridgeAction
 public:
 	virtual void doIt()
 	{
-		/*
-		  LLFloaterReg::showInstance("properties", mUUID);
-		*/
 		LLInvFVBridgeAction::doIt();
 	}
 	virtual ~LLObjectBridgeAction(){}
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index e560dff0e4..988e58a661 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -28,7 +28,6 @@
 #define LL_LLINVENTORYBRIDGE_H
 
 #include "llcallingcard.h"
-#include "llfloaterproperties.h"
 #include "llfolderviewmodel.h"
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 21430a6507..c3c8945556 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2561,7 +2561,6 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 
 
 	LLMultiPreview* multi_previewp = NULL;
-	LLMultiProperties* multi_propertiesp = NULL;
 
 	if (("task_open" == action  || "open" == action) && selected_items.size() > 1)
 	{
@@ -2595,10 +2594,8 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	}
 	else if (("task_properties" == action || "properties" == action) && selected_items.size() > 1)
 	{
-		multi_propertiesp = new LLMultiProperties();
-		gFloaterView->addChild(multi_propertiesp);
-
-		LLFloater::setFloaterHost(multi_propertiesp);
+        // Isn't supported (previously used LLMultiProperties)
+        LL_WARNS() << "Tried to open properties for multiple items" << LL_ENDL;
 	}
 
 	std::set<LLUUID> selected_uuid_set = LLAvatarActions::getInventorySelectedUUIDs();
@@ -2771,10 +2768,6 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	{
 		multi_previewp->openFloater(LLSD());
 	}
-	else if (multi_propertiesp)
-	{
-		multi_propertiesp->openFloater(LLSD());
-	}
 }
 
 void LLInventoryAction::saveMultipleTextures(const std::vector<std::string>& filenames, std::set<LLFolderViewItem*> selected_items, LLInventoryModel* model)
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 43c1ee44a4..14c9f812f4 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1398,21 +1398,6 @@ void LLPanelObjectInventory::inventoryChanged(LLViewerObject* object,
 	{
 		mInventoryNeedsUpdate = TRUE;
 	}
-
-	// refresh any properties floaters that are hanging around.
-	if(inventory)
-	{
-		for (LLInventoryObject::object_list_t::const_iterator iter = inventory->begin();
-			 iter != inventory->end(); )
-		{
-			LLInventoryObject* item = *iter++;
-			LLFloaterProperties* floater = LLFloaterReg::findTypedInstance<LLFloaterProperties>("properties", item->getUUID());
-			if(floater)
-			{
-				floater->refresh();
-			}
-		}
-	}
 }
 
 void LLPanelObjectInventory::updateInventory()
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 86f7d2bf25..17daff3676 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -57,7 +57,6 @@
 #include "llviewerwindow.h"
 #include "lldrawable.h"
 #include "llfloaterinspect.h"
-#include "llfloaterproperties.h"
 #include "llfloaterreporter.h"
 #include "llfloaterreg.h"
 #include "llfloatertools.h"
@@ -6850,8 +6849,6 @@ void dialog_refresh_all()
 		gMenuAttachmentOther->arrange();
 	}
 
-	LLFloaterProperties::dirtyAll();
-
 	LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance<LLFloaterInspect>("inspect");
 	if(inspect_instance)
 	{
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 2c57b56a3d..6b854065a6 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -114,7 +114,6 @@
 #include "llfloaterpreferenceviewadvanced.h"
 #include "llfloaterpreviewtrash.h"
 #include "llfloaterprofile.h"
-#include "llfloaterproperties.h"
 #include "llfloaterregiondebugconsole.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterregionrestarting.h"
@@ -435,7 +434,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("preview_sound", "floater_preview_sound.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewSound>, "preview");
 	LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview");
 	LLFloaterReg::add("preview_trash", "floater_preview_trash.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreviewTrash>);
-	LLFloaterReg::add("properties", "floater_inventory_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProperties>);
 	LLFloaterReg::add("publish_classified", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPublishClassifiedFloater>);
 	LLFloaterReg::add("save_pref_preset", "floater_save_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSavePrefPreset>);
 	LLFloaterReg::add("save_camera_preset", "floater_save_camera_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSaveCameraPreset>);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f47f0b4572..011bea71a4 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -63,7 +63,6 @@
 #include "llcontrolavatar.h"
 #include "lldrawable.h"
 #include "llface.h"
-#include "llfloaterproperties.h"
 #include "llfloatertools.h"
 #include "llfollowcam.h"
 #include "llhudtext.h"
@@ -3474,9 +3473,6 @@ void LLViewerObject::doInventoryCallback()
 
 void LLViewerObject::removeInventory(const LLUUID& item_id)
 {
-	// close any associated floater properties
-	LLFloaterReg::hideInstance("properties", item_id);
-
 	LLMessageSystem* msg = gMessageSystem;
 	msg->newMessageFast(_PREHASH_RemoveTaskInventory);
 	msg->nextBlockFast(_PREHASH_AgentData);
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
deleted file mode 100644
index 59dcc87140..0000000000
--- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="OPLYSNINGER OM BEHOLDNINGSGENSTAND">
-	<floater.string name="unknown">
-		(ukendt)
-	</floater.string>
-	<floater.string name="public">
-		(offentlig)
-	</floater.string>
-	<floater.string name="you_can">
-		Du kan:
-	</floater.string>
-	<floater.string name="owner_can">
-		Ejer kan:
-	</floater.string>
-	<floater.string name="acquiredDate">
-		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-	</floater.string>
-	<text name="LabelItemNameTitle">
-		Navn:
-	</text>
-	<text name="LabelItemDescTitle">
-		Beskrivelse:
-	</text>
-	<text name="LabelCreatorTitle">
-		Skaber:
-	</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">
-		Ejer:
-	</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">
-		Erhvervet:
-	</text>
-	<text name="LabelAcquiredDate">
-		Wed May 24 12:50:46 2006
-	</text>
-	<text name="OwnerLabel">
-		Dig:
-	</text>
-	<check_box label="Redigér" name="CheckOwnerModify"/>
-	<check_box label="Kopiere" name="CheckOwnerCopy"/>
-	<check_box label="Sælg" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">
-		Enhver:
-	</text>
-	<check_box label="Kopiér" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">
-		Gruppe:
-	</text>
-	<check_box label="Del" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">
-		Næste ejer:
-	</text>
-	<check_box label="Redigér" name="CheckNextOwnerModify"/>
-	<check_box label="Kopiere" name="CheckNextOwnerCopy"/>
-	<check_box label="Sælg" name="CheckNextOwnerTransfer"/>
-	<check_box label="Til salg" name="CheckPurchase"/>
-	<combo_box name="combobox sale copy">
-		<combo_box.item label="Kopiér" name="Copy"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Pris:" name="Edit Cost"/>
-	<text name="CurrencySymbol">
-		L$
-	</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
deleted file mode 100644
index 92c038057f..0000000000
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="EIGENSCHAFTEN: INVENTAROBJEKT">
-	<floater.string name="unknown">(unbekannt)</floater.string>
-	<floater.string name="public">(öffentlich)</floater.string>
-	<floater.string name="you_can">Sie können:</floater.string>
-	<floater.string name="owner_can">Eigentümer kann:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Name:</text>
-	<text name="LabelItemDescTitle">Beschreibung:</text>
-	<text name="LabelCreatorTitle">Ersteller:</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Eigentümer:</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Erworben:</text>
-	<text name="LabelAcquiredDate">Mittwoch, 24. Mai 2006, 12:50:46</text>
-	<text name="OwnerLabel">Sie:</text>
-	<check_box label="Bearbeiten" name="CheckOwnerModify"/>
-	<check_box label="Kopieren" left_delta="85" name="CheckOwnerCopy"/>
-	<check_box label="Wiederverkaufen" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Jeder:</text>
-	<check_box label="Kopieren" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Gruppe:</text>
-	<check_box label="Teilen" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="150">Nächster Eigentümer:</text>
-	<check_box label="Bearbeiten" name="CheckNextOwnerModify"/>
-	<check_box label="Kopieren" left_delta="55" name="CheckNextOwnerCopy"/>
-	<check_box label="Wiederverkaufen" name="CheckNextOwnerTransfer"/>
-	<check_box label="Zum Verkauf" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopie" name="Copy"/>
-		<combo_box.item label="Inhalt" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Preis:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
deleted file mode 100644
index 45e16c59ae..0000000000
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="340"
- layout="topleft"
- name="item properties"
- help_topic="item_properties"
- save_rect="true"
- title="INVENTORY ITEM PROPERTIES"
- width="350">
-    <floater.string
-     name="unknown">
-        (unknown)
-    </floater.string>
-    <floater.string
-     name="public">
-        (public)
-    </floater.string>
-    <floater.string
-     name="you_can">
-        You can:
-    </floater.string>
-    <floater.string
-     name="owner_can">
-        Owner can:
-    </floater.string>
-    <floater.string
-     name="acquiredDate">
-        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-    </floater.string>
-    <icon
-     follows="top|right"
-     height="18"
-     image_name="Lock"
-     layout="topleft"
-     left="276"
-     mouse_opaque="true"
-     name="IconLocked"
-     top="4"
-     width="18" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="LabelItemNameTitle"
-     top="25"
-     width="78">
-        Name:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     max_length_bytes="63"
-     name="LabelItemName"
-     top_delta="0"
-     width="252" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="LabelItemDescTitle"
-     top="45"
-     width="78">
-        Description:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     max_length_bytes="127"
-     name="LabelItemDesc"
-     top_delta="0"
-     width="252" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelCreatorTitle"
-     top="65"
-     width="78">
-        Creator:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelCreatorName"
-     top_delta="0"
-     translate="false"
-     use_ellipses="true" 
-     width="170">
-        TestString PleaseIgnore
-    </text>
-    <button
-     follows="top|right"
-     height="16"
-     label="Profile..."
-     layout="topleft"
-     left_delta="174"
-     name="BtnCreator"
-     top_delta="0"
-     width="78" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelOwnerTitle"
-     top="85"
-     width="78">
-        Owner:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelOwnerName"
-     top_delta="0"
-     translate="false"
-     use_ellipses="true"
-     width="170">
-      TestString PleaseIgnore
-    </text>
-    <button
-     follows="top|right"
-     height="16"
-     label="Profile..."
-     layout="topleft"
-     left_delta="174"
-     name="BtnOwner"
-     top_delta="0"
-     width="78" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelAcquiredTitle"
-     top="105"
-     width="78">
-        Acquired:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelAcquiredDate"
-     top_delta="0"
-     width="252">
-        Wed May 24 12:50:46 2006
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="OwnerLabel"
-     top="125"
-     width="78">
-        You:
-    </text>
-    <check_box
-     height="16"
-     label="Edit"
-     layout="topleft"
-     left_pad="5"
-     name="CheckOwnerModify"
-     top_delta="0"
-     width="78" />
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_delta="0"
-     name="CheckOwnerCopy"
-     top_pad="5"
-     width="88" />
-    <check_box
-     height="16"
-     label="Resell"
-     layout="topleft"
-     left_delta="0"
-     name="CheckOwnerTransfer"
-     top_pad="5"
-     width="106" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="AnyoneLabel"
-     top_pad="5"
-     width="78">
-        Anyone:
-    </text>
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_pad="5"
-     name="CheckEveryoneCopy"
-     top_delta="0"
-     width="130" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="GroupLabel"
-     top_pad="5"
-     width="78">
-        Group:
-    </text>
-    <check_box
-     height="16"
-     label="Share"
-     layout="topleft"
-     left_pad="5"
-     name="CheckShareWithGroup"
-     top_delta="5"
-     width="106" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="25"
-     layout="topleft"
-     left="10"
-     name="NextOwnerLabel"
-     top_pad="5"
-     width="78"
-     word_wrap="true">
-        Next owner:
-    </text>
-    <check_box
-     height="16"
-     label="Edit"
-     layout="topleft"
-     left_pad="5"
-     name="CheckNextOwnerModify"
-     top_delta="0"
-     width="78" />
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_delta="0"
-     name="CheckNextOwnerCopy"
-     top_pad="5"
-     width="88" />
-    <check_box
-     height="16"
-     label="Resell"
-     layout="topleft"
-     left_delta="0"
-     name="CheckNextOwnerTransfer"
-     top_pad="5"
-     width="106" />
-    <check_box
-     height="16"
-     label="For Sale"
-     layout="topleft"
-     left="10"
-     name="CheckPurchase"
-     top_pad="5"
-     width="78" />
-     <combo_box
-     height="19"
-     left_pad="5"
-     layout="topleft"
-     follows="left|top"
-     name="ComboBoxSaleType"
-     width="110">
-       <combo_box.item
-         name="Copy"
-         label="Copy"
-         value="2" />
-       <combo_box.item
-         name="Contents"
-         label="Contents"
-         value="3" />
-       <combo_box.item
-         name="Original"
-         label="Original"
-         value="1" />
-    </combo_box>
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        control_name="Edit Cost"
-        name="Edit Cost"
-        label="Price:"
-        label_width="100"
-        left="10"
-        width="192"
-        min_val="1"
-        height="19"
-        max_val="999999999"
-        top_pad="5"/>
-    <text
-        type="string"
-        length="1"
-        height="15"
-        follows="left|top"
-        layout="topleft"
-        left_delta="82"
-        name="CurrencySymbol"
-        top_delta="1"
-        width="18">
-      L$
-    </text>
-
-    <!--line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     max_length_bytes="25"
-     name="EditPrice"
-     top_delta="0"
-     width="242" /-->
-
-    <!--text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="BaseMaskDebug"
-     top="155"
-     width="330">
-        B:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="OwnerMaskDebug"
-     top_delta="0"
-     width="270">
-        O:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="GroupMaskDebug"
-     top_delta="0"
-     width="210">
-        G:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="EveryoneMaskDebug"
-     top_delta="0"
-     width="150">
-        E:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="NextMaskDebug"
-     top_delta="0"
-     width="90">
-        N:
-    </text-->
-
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
deleted file mode 100644
index a8a3ad08f8..0000000000
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPIEDADES DEL ÍTEM DEL INVENTARIO">
-	<floater.string name="unknown">(desconocido)</floater.string>
-	<floater.string name="public">(público)</floater.string>
-	<floater.string name="you_can">Usted puede:</floater.string>
-	<floater.string name="owner_can">El propietario puede:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nombre:</text>
-	<text name="LabelItemDescTitle">Descripción:</text>
-	<text name="LabelCreatorTitle">Creador:</text>
-	<button label="Perfil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Propietario:</text>
-	<button label="Perfil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Adquirido:</text>
-	<text name="LabelAcquiredDate">May Mié 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Tú:</text>
-	<check_box label="Editar" name="CheckOwnerModify"/>
-	<check_box label="Copiarlo" left_delta="88" name="CheckOwnerCopy"/>
-	<check_box label="Revender" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Cualquiera:</text>
-	<check_box label="Copiar" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grupo:</text>
-	<check_box label="Compartir" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Próximo propietario:</text>
-	<check_box label="Editar" name="CheckNextOwnerModify"/>
-	<check_box label="Copiarlo" left_delta="88" name="CheckNextOwnerCopy"/>
-	<check_box label="Revender" name="CheckNextOwnerTransfer"/>
-	<check_box label="En venta" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copiar" name="Copy"/>
-		<combo_box.item label="Contenidos" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Precio:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
deleted file mode 100644
index 1d4e7c818f..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPRIÉTÉS DES ARTICLES DE L&apos;INVENTAIRE">
-	<floater.string name="unknown">(inconnu)</floater.string>
-	<floater.string name="public">(public)</floater.string>
-	<floater.string name="you_can">Vous pouvez :</floater.string>
-	<floater.string name="owner_can">Le propriétaire peut :</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nom :</text>
-	<text name="LabelItemDescTitle">Description :</text>
-	<text name="LabelCreatorTitle">Créateur :</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Propriétaire :</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Acquis :</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Vous :</text>
-	<check_box label="Modifier" name="CheckOwnerModify"/>
-	<check_box label="Copier" name="CheckOwnerCopy"/>
-	<check_box label="Revendre" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel" width="80">N&apos;importe qui :</text>
-	<check_box label="Copier" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel" width="80">Groupe :</text>
-	<check_box label="Partager" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="192">Le prochain propriétaire :</text>
-	<check_box label="Modifier" name="CheckNextOwnerModify"/>
-	<check_box label="Copier" name="CheckNextOwnerCopy"/>
-	<check_box label="Revendre" name="CheckNextOwnerTransfer"/>
-	<check_box label="À vendre" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copier" name="Copy"/>
-		<combo_box.item label="Contenu" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Prix :" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
deleted file mode 100644
index 8cf680b3f0..0000000000
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="CARATTERISTICHE DELL&apos;ARTICOLO IN INVENTARIO">
-	<floater.string name="unknown">(sconosciuto)</floater.string>
-	<floater.string name="public">(pubblico)</floater.string>
-	<floater.string name="you_can">Tu puoi:</floater.string>
-	<floater.string name="owner_can">Il proprietario può:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nome:</text>
-	<text name="LabelItemDescTitle">Descrizione:</text>
-	<text name="LabelCreatorTitle">Creatore:</text>
-	<button label="Profilo..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">proprietario:</text>
-	<button label="Profilo..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Acquisito:</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Tu:</text>
-	<check_box label="Modifica" name="CheckOwnerModify"/>
-	<check_box label="Copiare" left_delta="88" name="CheckOwnerCopy"/>
-	<check_box label="Rivendi" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Chiunque:</text>
-	<check_box label="Copia" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Gruppo:</text>
-	<check_box label="Condividi" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Proprietario successivo:</text>
-	<check_box label="Modifica" name="CheckNextOwnerModify"/>
-	<check_box label="Copiare" left_delta="88" name="CheckNextOwnerCopy"/>
-	<check_box label="Rivendi" name="CheckNextOwnerTransfer"/>
-	<check_box label="In vendita" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copia" name="Copy"/>
-		<combo_box.item label="Contenuti" name="Contents"/>
-		<combo_box.item label="Originale" name="Original"/>
-	</combo_box>
-	<spinner label="Prezzo:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
deleted file mode 100644
index 8d3a655a06..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="インベントリアイテムのプロパティ">
-	<floater.string name="unknown">(不明）</floater.string>
-	<floater.string name="public">(公共)</floater.string>
-	<floater.string name="you_can">できること：</floater.string>
-	<floater.string name="owner_can">オーナーは次のことができます：</floater.string>
-	<floater.string name="acquiredDate">[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">名前：</text>
-	<text name="LabelItemDescTitle">説明：</text>
-	<text name="LabelCreatorTitle">クリエーター</text>
-	<button label="プロフィール..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">オーナー：</text>
-	<button label="プロフィール..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">入手日時：</text>
-	<text name="LabelAcquiredDate">2006年5月24日水曜日12:50:46</text>
-	<text name="OwnerLabel">あなた：</text>
-	<check_box label="編集" name="CheckOwnerModify"/>
-	<check_box label="コピー" name="CheckOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">全員：</text>
-	<check_box label="コピー" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">グループ：</text>
-	<check_box label="共有" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="158">次の所有者：</text>
-	<check_box label="編集" name="CheckNextOwnerModify"/>
-	<check_box label="コピー" name="CheckNextOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckNextOwnerTransfer"/>
-	<check_box label="売り出し中" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="コピー" name="Copy"/>
-		<combo_box.item label="コンテンツ" name="Contents"/>
-		<combo_box.item label="オリジナル" name="Original"/>
-	</combo_box>
-	<spinner label="価格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
deleted file mode 100644
index d2844e117f..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties" title="WŁAŚCIWOŚCI OBIEKTÓW W SZAFIE">
-	<floater.string name="unknown">
-		(nieznany)
-	</floater.string>
-	<floater.string name="public">
-		(publiczny)
-	</floater.string>
-	<floater.string name="you_can">
-		Ty możesz:
-	</floater.string>
-	<floater.string name="owner_can">
-		Właściciel może:
-	</floater.string>
-	<text name="LabelItemNameTitle">
-		Nazwa:
-	</text>
-	<text name="LabelItemDescTitle">
-		Opis:
-	</text>
-	<text name="LabelCreatorTitle">
-		Twórca:
-	</text>
-	<button label="Profil..." name="BtnCreator" />
-	<text name="LabelOwnerTitle">
-		Właściciel:
-	</text>
-	<button label="Profil..." name="BtnOwner" />
-	<text name="LabelAcquiredTitle">
-		Nabyte:
-	</text>
-	<text name="OwnerLabel">
-		Ty:
-	</text>
-	<check_box label="Modyfikacja" name="CheckOwnerModify" />
-	<check_box label="Kopiowanie" name="CheckOwnerCopy" />
-	<check_box label="Transferowanie" name="CheckOwnerTransfer" />
-	<text name="AnyoneLabel">
-		Każdy:
-	</text>
-	<check_box label="Kopiowanie" name="CheckEveryoneCopy" />
-	<text name="GroupLabel">
-		Grupa:
-	</text>
-	<check_box label="Udostępnij" name="CheckShareWithGroup" />
-	<text name="NextOwnerLabel">
-		Nast. właściciel:
-	</text>
-	<check_box label="Modyfikacja" name="CheckNextOwnerModify" />
-	<check_box label="Kopiowanie" name="CheckNextOwnerCopy" />
-	<check_box label="Transferowanie" name="CheckNextOwnerTransfer" />
-	<check_box label="Sprzedaż" name="CheckPurchase" />
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopia" name="Copy" />
-		<combo_box.item label="Zawartość" name="Contents" />
-		<combo_box.item label="Oryginał" name="Original" />
-	</combo_box>
-	<spinner name="Edit Cost" label="Cena:" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
deleted file mode 100644
index 5f04c08531..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPRIEDADES DE ITEM NO INVENTÁRIO">
-	<floater.string name="unknown">(desconhecido)</floater.string>
-	<floater.string name="public">(público)</floater.string>
-	<floater.string name="you_can">Você pode:</floater.string>
-	<floater.string name="owner_can">Proprietário pode :</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nome:</text>
-	<text name="LabelItemDescTitle">Descrição:</text>
-	<text name="LabelCreatorTitle">Criador:</text>
-	<button label="Perfil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Dono:</text>
-	<button label="Perfil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Adquirido:</text>
-	<text name="LabelAcquiredDate">Qua Mai 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Você:</text>
-	<check_box label="Editar" name="CheckOwnerModify"/>
-	<check_box label="Copiar" name="CheckOwnerCopy"/>
-	<check_box label="Revender" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Todos:</text>
-	<check_box label="Cortar" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grupo:</text>
-	<check_box label="Compartilhar" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Próximo proprietário:</text>
-	<check_box label="Editar" name="CheckNextOwnerModify"/>
-	<check_box label="Copiar" name="CheckNextOwnerCopy"/>
-	<check_box label="Revender" name="CheckNextOwnerTransfer"/>
-	<check_box label="À venda" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Cortar" name="Copy"/>
-		<combo_box.item label="Conteúdo" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Preço:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
deleted file mode 100644
index c988825756..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="СВОЙСТВА ПРЕДМЕТА">
-	<floater.string name="unknown">(неизвестно)</floater.string>
-	<floater.string name="public">(публичное)</floater.string>
-	<floater.string name="you_can">Вы можете:</floater.string>
-	<floater.string name="owner_can">Владелец может:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Название:</text>
-	<text name="LabelItemDescTitle">Описание:</text>
-	<text name="LabelCreatorTitle">Создатель:</text>
-	<button label="Профиль…" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Владелец:</text>
-	<button label="Профиль…" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Приобретено:</text>
-	<text name="LabelAcquiredDate">Ср 24 Май 12:50:46 2006</text>
-	<text name="OwnerLabel">Вы:</text>
-	<check_box label="Изменить" name="CheckOwnerModify"/>
-	<check_box label="Копировать" name="CheckOwnerCopy"/>
-	<check_box label="Перепродать" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Все:</text>
-	<check_box label="Копировать" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Группа:</text>
-	<check_box label="Поделиться" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">Следующий владелец:</text>
-	<check_box label="Изменить" name="CheckNextOwnerModify"/>
-	<check_box label="Копировать" name="CheckNextOwnerCopy"/>
-	<check_box label="Перепродать" name="CheckNextOwnerTransfer"/>
-	<check_box label="Для продажи" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Копировать" name="Copy"/>
-		<combo_box.item label="Содержимое" name="Contents"/>
-		<combo_box.item label="Оригинал" name="Original"/>
-	</combo_box>
-	<spinner label="Цена:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
deleted file mode 100644
index c6a5515c6e..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="ENVANTER ÖGESİ ÖZELLİKLERİ">
-	<floater.string name="unknown">(bilinmiyor)</floater.string>
-	<floater.string name="public">(kamuya açık)</floater.string>
-	<floater.string name="you_can">Şunu yapabilirsiniz:</floater.string>
-	<floater.string name="owner_can">Sahip şunu yapabilir:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Ad:</text>
-	<text name="LabelItemDescTitle">Açıklama:</text>
-	<text name="LabelCreatorTitle">Oluşturan:</text>
-	<button label="Profil..." name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Sahip:</text>
-	<button label="Profil..." name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Alınan:</text>
-	<text name="LabelAcquiredDate">24 Mayıs Çarş 12:50:46 2006</text>
-	<text name="OwnerLabel">Siz:</text>
-	<check_box label="Düzenle" name="CheckOwnerModify"/>
-	<check_box label="Kopyala" name="CheckOwnerCopy"/>
-	<check_box label="Tekrar Sat" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Herkes:</text>
-	<check_box label="Kopyala" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grup:</text>
-	<check_box label="Paylaş" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">Sonraki sahip:</text>
-	<check_box label="Düzenle" name="CheckNextOwnerModify"/>
-	<check_box label="Kopyala" name="CheckNextOwnerCopy"/>
-	<check_box label="Tekrar Sat" name="CheckNextOwnerTransfer"/>
-	<check_box label="Satılık" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopyala" name="Copy"/>
-		<combo_box.item label="İçerik" name="Contents"/>
-		<combo_box.item label="Orijinal" name="Original"/>
-	</combo_box>
-	<spinner label="Fiyat:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
deleted file mode 100644
index 4f17b96579..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="收納區物品屬性">
-	<floater.string name="unknown">（未知）</floater.string>
-	<floater.string name="public">（公開）</floater.string>
-	<floater.string name="you_can">你可以：</floater.string>
-	<floater.string name="owner_can">所有人可以：</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">名稱：</text>
-	<text name="LabelItemDescTitle">描述：</text>
-	<text name="LabelCreatorTitle">創造者：</text>
-	<button label="檔案..." name="BtnCreator"/>
-	<text name="LabelOwnerTitle">所有人：</text>
-	<button label="檔案..." name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">取得於：</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">你：</text>
-	<check_box label="編輯" name="CheckOwnerModify"/>
-	<check_box label="恚庨" name="CheckOwnerCopy"/>
-	<check_box label="轉售" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">任何人：</text>
-	<check_box label="恚庨" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">群組：</text>
-	<check_box label="分享" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">下一個所有人：</text>
-	<check_box label="編輯" name="CheckNextOwnerModify"/>
-	<check_box label="恚庨" name="CheckNextOwnerCopy"/>
-	<check_box label="轉售" name="CheckNextOwnerTransfer"/>
-	<check_box label="出售" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="複製" name="Copy"/>
-		<combo_box.item label="內容" name="Contents"/>
-		<combo_box.item label="原件" name="Original"/>
-	</combo_box>
-	<spinner label="價格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
-- 
cgit v1.2.3


From 693825158f478c478c1ab510c6f7304ae7f4a2ed Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 14:35:56 +0200
Subject: SL-19134 Remove lock icon, add item type icon

---
 indra/newview/llsidepaneliteminfo.cpp              |  9 +++++--
 indra/newview/llsidepaneliteminfo.h                |  2 ++
 .../skins/default/xui/en/sidepanel_item_info.xml   | 28 +++++++++++-----------
 3 files changed, 23 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 82a7719c52..8849e792c5 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -38,7 +38,9 @@
 #include "llfloater.h"
 #include "llgroupactions.h"
 #include "llgroupmgr.h"
+#include "lliconctrl.h"
 #include "llinventorydefines.h"
+#include "llinventoryicon.h"
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
 #include "lllineeditor.h"
@@ -152,6 +154,7 @@ BOOL LLSidepanelItemInfo::postBuild()
 {
     mLabelOwnerName = getChild<LLTextBox>("LabelOwnerName");
     mLabelCreatorName = getChild<LLTextBox>("LabelCreatorName");
+    mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
     
 	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
@@ -314,10 +317,12 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	getChild<LLUICtrl>("LabelItemName")->setValue(item->getName());
 	getChildView("LabelItemDescTitle")->setEnabled(TRUE);
 	getChildView("LabelItemDesc")->setEnabled(is_modifiable);
-	getChildView("IconLocked")->setVisible(!is_modifiable);
 	getChild<LLUICtrl>("LabelItemDesc")->setValue(item->getDescription());
     getChild<LLUICtrl>("item_thumbnail")->setValue(item->getThumbnailUUID());
-    
+
+    LLUIImagePtr icon_img = LLInventoryIcon::getIcon(item->getType(), item->getInventoryType(), item->getFlags(), FALSE);
+    mItemTypeIcon->setImage(icon_img);
+ 
     // Style for creator and owner links
     LLStyle::Params style_params;
     LLColor4 link_color = LLUIColorTable::instance().getColor("HTMLLinkColor");
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index 249fd34e8a..d75de34fb8 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -39,6 +39,7 @@
 class LLAvatarName;
 class LLButton;
 class LLFloater;
+class LLIconCtrl;
 class LLViewerInventoryItem;
 class LLItemPropertiesObserver;
 class LLObjectInventoryObserver;
@@ -102,6 +103,7 @@ private:
     
     LLTextBox* mLabelOwnerName;
     LLTextBox* mLabelCreatorName;
+    LLIconCtrl* mItemTypeIcon;
 
 	//
 	// UI Elements
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 320c20deb6..7fb9fb828d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -60,28 +60,28 @@
       layout="topleft"
       follows="all"
       height="25">
+      <icon
+        follows="top|left"
+        height="16"
+        image_name="Inv_Object"
+        layout="topleft"
+        left="5"
+        mouse_opaque="true"
+        name="item_type_icon"
+        top="3"
+        width="16" />
       <line_editor
         border_style="line"
         border_thickness="1"
         follows="left|top|right"
         layout="topleft"
-        left="5"
+        left_pad="5"
         top="1"
-        right="-25"
+        right="-5"
         height="20"
         max_length_bytes="63"
         name="LabelItemName"
         tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
-      <icon
-        follows="top|right"
-        height="18"
-        image_name="Lock"
-        layout="topleft"
-        right="-5"
-        mouse_opaque="true"
-        name="IconLocked"
-        top="3"
-        width="18" />
     </layout_panel>
     
     <layout_panel
@@ -248,7 +248,7 @@ TestString PleaseIgnore
         height="0"
         layout="topleft"
         left="5"
-        right="-6"
+        right="-5"
         name="cost_text_border"
         top="1"/>
         
@@ -385,7 +385,7 @@ TestString PleaseIgnore
         height="0"
         layout="topleft"
         left="5"
-        right="-6"
+        right="-5"
         name="cost_text_border"
         top_pad="9"/>
         
-- 
cgit v1.2.3


From 6e6ec9d10eee9c3cfab3b9309b7bdb322803bee0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 15:45:54 +0200
Subject: SL-19134 Hide item properties when moving to trash

---
 indra/newview/llsidepaneliteminfo.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 8849e792c5..d9b2ee7763 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -239,7 +239,18 @@ void LLSidepanelItemInfo::refresh()
 	LLViewerInventoryItem* item = findItem();
 	if(item)
 	{
-		refreshFromItem(item);
+        const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+        bool in_trash = (item->getUUID() == trash_id) || gInventory.isObjectDescendentOf(item->getUUID(), trash_id);
+        if (in_trash && mParentFloater)
+        {
+            // Close properties when moving to trash
+            // Aren't supposed to view properties from trash
+            mParentFloater->closeFloater();
+        }
+        else
+        {
+            refreshFromItem(item);
+        }
 		return;
 	}
     
-- 
cgit v1.2.3


From 83cd767b2403a99f1e558c959ded65846bb8c1af Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 16:37:45 +0200
Subject: SL-19134 Fix owner and creator names not being clickable

---
 indra/newview/llsidepaneliteminfo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index d9b2ee7763..2402827ca0 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -375,7 +375,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
         }
         
 		getChildView("LabelCreatorTitle")->setEnabled(TRUE);
-        mLabelCreatorName->setEnabled(FALSE);
+        mLabelCreatorName->setEnabled(TRUE);
 	}
 	else
 	{
@@ -432,7 +432,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
             }
 		}
 		getChildView("LabelOwnerTitle")->setEnabled(TRUE);
-        mLabelOwnerName->setEnabled(FALSE);
+        mLabelOwnerName->setEnabled(TRUE);
 	}
 	else
 	{
-- 
cgit v1.2.3


From e06c322971aeba9a065efb6f53139010243aa428 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 17:43:49 +0200
Subject: SL-19134 Multiline description field

---
 indra/newview/llsidepaneliteminfo.cpp                    |  4 ++--
 .../newview/skins/default/xui/en/sidepanel_item_info.xml | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 2402827ca0..ccc57c63ab 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -46,6 +46,7 @@
 #include "lllineeditor.h"
 #include "llradiogroup.h"
 #include "llslurl.h"
+#include "lltexteditor.h"
 #include "llviewercontrol.h"
 #include "llviewerinventory.h"
 #include "llviewerobjectlist.h"
@@ -158,7 +159,6 @@ BOOL LLSidepanelItemInfo::postBuild()
     
 	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
-	getChild<LLLineEditor>("LabelItemDesc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
 	// acquired date
 	// owner permissions
@@ -909,7 +909,7 @@ void LLSidepanelItemInfo::onCommitDescription()
 	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 
-	LLLineEditor* labelItemDesc = getChild<LLLineEditor>("LabelItemDesc");
+    LLTextEditor* labelItemDesc = getChild<LLTextEditor>("LabelItemDesc");
 	if(!labelItemDesc)
 	{
 		return;
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 7fb9fb828d..8b0f8f7550 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -183,7 +183,7 @@ TestString PleaseIgnore
       name="layout_item_description"
       layout="topleft"
       follows="all"
-      height="61">
+      height="84">
       <text
         type="string"
         length="1"
@@ -196,19 +196,23 @@ TestString PleaseIgnore
         width="78">
         Description:
       </text>
-      <line_editor
+      <text_editor
+        text_type="ascii_printable_no_pipe"
+        commit_on_focus_lost="true"
         border_style="line"
         border_thickness="1"
-        follows="left|top|right"
+        word_wrap="true"
+        use_ellipses="false"
+        follows="all"
         layout="topleft"
         left="5"
         top_pad="5"
         right="-5"
-        height="23"
-        max_length_bytes="127"
+        height="46"
+        max_length="127"
         name="LabelItemDesc"
         tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
-        
+
         <text
           type="string"
           length="1"
-- 
cgit v1.2.3


From 39a50b0face299bbcae2a63f3fd51a41f8bb35cd Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Feb 2023 21:41:43 +0200
Subject: SL-19134 Fix thumbnail ctrl not drawing an 'X' for empty texture

---
 indra/newview/llthumbnailctrl.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
index 8f51f2c80d..4245237529 100644
--- a/indra/newview/llthumbnailctrl.cpp
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -164,16 +164,19 @@ void LLThumbnailCtrl::setValue(const LLSD& value)
 	if (tvalue.isUUID())
 	{
         mImageAssetID = tvalue.asUUID();
-        // Should it support baked textures?
-        mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, MIPMAP_YES, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+        if (mImageAssetID.notNull())
+        {
+            // Should it support baked textures?
+            mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, MIPMAP_YES, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
             
-        mTexturep->setBoostLevel(mPriority);
-        mTexturep->forceToSaveRawImage(0);
-        
-        S32 desired_draw_width = mTexturep->getWidth();
-        S32 desired_draw_height = mTexturep->getHeight();
-
-        mTexturep->setKnownDrawSize(desired_draw_width, desired_draw_height);
+            mTexturep->setBoostLevel(mPriority);
+            mTexturep->forceToSaveRawImage(0);
+            
+            S32 desired_draw_width = mTexturep->getWidth();
+            S32 desired_draw_height = mTexturep->getHeight();
+            
+            mTexturep->setKnownDrawSize(desired_draw_width, desired_draw_height);
+        }
 	}
     else if (tvalue.isString())
     {
-- 
cgit v1.2.3


From c364d878b34434177ad6030707f8b66f2792ec8d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 Feb 2023 12:46:36 +0200
Subject: SL-19167 Preview on outfit snapshot tool is too small

In thin windows preview can be tiny, make sure it displays properly
---
 indra/newview/llfloatersimpleoutfitsnapshot.cpp | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatersimpleoutfitsnapshot.cpp b/indra/newview/llfloatersimpleoutfitsnapshot.cpp
index bab2efbbd5..703112a0fa 100644
--- a/indra/newview/llfloatersimpleoutfitsnapshot.cpp
+++ b/indra/newview/llfloatersimpleoutfitsnapshot.cpp
@@ -161,10 +161,7 @@ BOOL LLFloaterSimpleOutfitSnapshot::postBuild()
     LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(p);
     LLView* parent_view = gSnapshotFloaterView->getParent();
 
-    parent_view->removeChild(gSnapshotFloaterView);
-    // make sure preview is below snapshot floater
     parent_view->addChild(previewp);
-    parent_view->addChild(gSnapshotFloaterView);
 
     //move snapshot floater to special purpose snapshotfloaterview
     gFloaterView->removeChild(this);
@@ -179,10 +176,11 @@ BOOL LLFloaterSimpleOutfitSnapshot::postBuild()
     previewp->mKeepAspectRatio = FALSE;
     previewp->setThumbnailPlaceholderRect(getThumbnailPlaceholderRect());
     previewp->setAllowRenderUI(false);
+    previewp->setThumbnailSubsampled(TRUE);
 
     return TRUE;
 }
-const S32 PREVIEW_OFFSET_X = 12;
+
 const S32 PREVIEW_OFFSET_Y = 70;
 
 void LLFloaterSimpleOutfitSnapshot::draw()
@@ -202,11 +200,11 @@ void LLFloaterSimpleOutfitSnapshot::draw()
         if(previewp->getThumbnailImage())
         {
             bool working = impl->getStatus() == ImplBase::STATUS_WORKING;
-            const LLRect& thumbnail_rect = getThumbnailPlaceholderRect();
             const S32 thumbnail_w = previewp->getThumbnailWidth();
             const S32 thumbnail_h = previewp->getThumbnailHeight();
 
-            S32 offset_x = PREVIEW_OFFSET_X;
+            LLRect local_rect = getLocalRect();
+            S32 offset_x = (local_rect.getWidth() - thumbnail_w) / 2;
             S32 offset_y = PREVIEW_OFFSET_Y;
 
             gGL.matrixMode(LLRender::MM_MODELVIEW);
@@ -216,18 +214,6 @@ void LLFloaterSimpleOutfitSnapshot::draw()
             gl_draw_scaled_image(offset_x, offset_y, 
                 thumbnail_w, thumbnail_h,
                 previewp->getThumbnailImage(), color % alpha);
-#if LL_DARWIN
-            std::string alpha_color = getTransparencyType() == TT_ACTIVE ? "OutfitSnapshotMacMask" : "OutfitSnapshotMacMask2";
-#else
-            std::string alpha_color = getTransparencyType() == TT_ACTIVE ? "FloaterFocusBackgroundColor" : "DkGray";
-#endif
-
-            previewp->drawPreviewRect(offset_x, offset_y, LLUIColorTable::instance().getColor(alpha_color));
-
-            gGL.pushUIMatrix();
-            LLUI::translate((F32) thumbnail_rect.mLeft, (F32) thumbnail_rect.mBottom);
-            mThumbnailPlaceholder->draw();
-            gGL.popUIMatrix();
         }
     }
     impl->updateLayout(this);
-- 
cgit v1.2.3


From e145a829bb2099e4c40342cf4c7a15cd9344c56f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 11 Feb 2023 04:16:22 +0200
Subject: SL-19203 Change default link color from green to blue

---
 indra/newview/skins/default/colors.xml                  | 2 +-
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 8bb3feaeb0..87ccccbff0 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -407,7 +407,7 @@
      value="0.43 0.06 0.06 1" />
     <color
      name="HTMLLinkColor"
-     reference="EmphasisColor" />
+     value="0.3 0.82 1 1" />
     <color
      name="HealthTextColor"
      reference="White" />
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f441e3cbd7..fcd24d83bb 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -440,7 +440,7 @@
     length="1"
     halign="right"
     name="360_label"
-    text_color="0.3 0.82 1 1"
+    text_color="HTMLLinkColor"
     top_delta="0"
     type="string"
     width="115">
-- 
cgit v1.2.3


From da3002bd0c25cfe922db1e40e46e48de9201501f Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Sun, 12 Feb 2023 13:37:08 +0100
Subject: SL-18964 Move creating of LLViewerFetchedTexture::sSmokeImagep to
 LLDrawPoolAlpha::renderDebugAlpha()

---
 indra/newview/lldrawpoolalpha.cpp | 7 +++++++
 indra/newview/llviewertexture.cpp | 4 ++++
 2 files changed, 11 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 6c1abb24c9..d4797321bb 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -280,6 +280,13 @@ void LLDrawPoolAlpha::renderDebugAlpha()
 	{
         gHighlightProgram.bind();
         gGL.diffuseColor4f(1, 0, 0, 1);
+
+        // SL-18964 : The creating of this texture was moved here from LLViewerTextureManager::init() to make the texture transparent before adding to cache
+        if (!LLViewerFetchedTexture::sSmokeImagep)
+        {
+            LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI);
+            LLViewerFetchedTexture::sSmokeImagep->setNoDelete();
+        }
         LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f * 1024.f);
         gGL.getTexUnit(0)->bindFast(LLViewerFetchedTexture::sSmokeImagep);
 
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index e3ac56d0d3..0d82aced23 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -402,8 +402,12 @@ void LLViewerTextureManager::init()
 	LLViewerFetchedTexture::sDefaultImagep->dontDiscard();
 	LLViewerFetchedTexture::sDefaultImagep->setCategory(LLGLTexture::OTHER);
 
+#if 0
+	// When called first time after clearing cache this call creates (and adds to cache) an opaque texture instead of transparent
+	// SL-18964 : The creating of this texture was moved to LLDrawPoolAlpha::renderDebugAlpha()
  	LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI);
 	LLViewerFetchedTexture::sSmokeImagep->setNoDelete();
+#endif
 
 	image_raw = new LLImageRaw(32,32,3);
 	data = image_raw->getData();
-- 
cgit v1.2.3


From e2836313a8d2b5e2acd4fd20bde50521613ed0ef Mon Sep 17 00:00:00 2001
From: Henri Beauchamp <sldevel@users.noreply.github.com>
Date: Mon, 13 Feb 2023 18:34:00 +0100
Subject: SL-19110 revert LLUUID::combine() to old algorithm to match server
 code. (#75)

As it happens, the change in the LLUUID::combine() algorithm introduced by one
of my previous commits is causing invalid assets creation (seen with
some clothing items, such as Shape and Universal types); obviously, the server
is using the old algorithm for UUID validation purpose of these assets.

This commit reverts LLUUID::combine() code to use LLMD5.
---
 indra/llcommon/lluuid.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index aa8045e6ab..adf31b2d28 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -44,6 +44,7 @@
 #include "lltimer.h"
 #include "llthread.h"
 #include "llmutex.h"
+#include "llmd5.h"
 #include "hbxxh.h"
 
 const LLUUID LLUUID::null;
@@ -400,11 +401,16 @@ LLUUID LLUUID::operator^(const LLUUID& rhs) const
 	return id;
 }
 
+// WARNING: this algorithm SHALL NOT be changed. It is also used by the server
+// and plays a role in some assets validation (e.g. clothing items). Changing
+// it would cause invalid assets.
 void LLUUID::combine(const LLUUID& other, LLUUID& result) const
 {
-	HBXXH128 hash((const void*)mData, 16, false);	// false = do not finalize
-	hash.update((const void*)other.mData, 16);
-	hash.digest(result);
+	LLMD5 md5_uuid;
+	md5_uuid.update((unsigned char*)mData, 16);
+	md5_uuid.update((unsigned char*)other.mData, 16);
+	md5_uuid.finalize();
+	md5_uuid.raw_digest(result.mData);
 }
 
 LLUUID LLUUID::combine(const LLUUID &other) const
-- 
cgit v1.2.3


From 177267415a8c86e524955b7619db3c29ad193e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pantera=20P=C3=B3=C5=82nocy?= <panterapolnocy@gmail.com>
Date: Mon, 13 Feb 2023 19:33:55 +0100
Subject: SL-19207 Polish translation: notifications, strings, a few floaters;
 Minor changes in /en/ (#78)

---
 .../default/xui/en/panel_script_experience.xml     |   17 +-
 indra/newview/skins/default/xui/en/strings.xml     |    2 +-
 .../newview/skins/default/xui/pl/floater_about.xml |    4 +-
 .../skins/default/xui/pl/floater_about_land.xml    |  120 ++-
 .../xui/pl/floater_animation_anim_preview.xml      |    2 +-
 .../xui/pl/floater_animation_bvh_preview.xml       |    2 +-
 .../default/xui/pl/floater_associate_listing.xml   |    5 +-
 .../newview/skins/default/xui/pl/notifications.xml | 1134 ++++++++++++++------
 indra/newview/skins/default/xui/pl/strings.xml     |  938 ++++++++++++----
 9 files changed, 1665 insertions(+), 559 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_script_experience.xml b/indra/newview/skins/default/xui/en/panel_script_experience.xml
index e798638751..9ae5b201a6 100644
--- a/indra/newview/skins/default/xui/en/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_experience.xml
@@ -48,23 +48,28 @@
     layout="topleft"
     visible="false">
     <layout_panel  width="120"
-                   height="140">
-      <text >
+                   height="140"
+                   name="xp_layout_panel">
+      <text name="lbl_script">
         Script:
       </text>
-      <text bottom_delta="25">
+      <text bottom_delta="25"
+            name="lbl_associated">
         Associated with:
       </text>
-      <text bottom_delta="25">
+      <text bottom_delta="25"
+            name="lbl_contribute">
         You can contribute:
       </text>
-      <text bottom_delta="25">
+      <text bottom_delta="25"
+            name="lbl_associate">
         Associate with:
       </text>
     </layout_panel>
 
     <layout_panel width="250"
-                  height="140">
+                  height="140"
+                  name="xp_choose_panel">
       <text >
         EasySit Animator 1.2.4
       </text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 269df1349b..efc70440d2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -233,7 +233,7 @@ If you feel this is an error, please contact support@secondlife.com</string>
 	<string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->
 	<string name="TooltipFlagGroupBuild">Group Build</string>
 	<string name="TooltipFlagNoBuild">No Build</string>
-	<string name="TooltipFlagNoEdit">Group Build</string>
+	<string name="TooltipFlagNoEdit">No Edit</string>
 	<string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area -->
 	<string name="TooltipFlagNoFly">No Fly</string>
 	<string name="TooltipFlagGroupScripts">Group Scripts</string>
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
index b9c75e8e88..b8d75315de 100644
--- a/indra/newview/skins/default/xui/pl/floater_about.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about.xml
@@ -6,8 +6,8 @@
 		</panel>
 		<panel label="Podziękowania"  name="credits_panel">
 			<text name="linden_intro">
-				Second Life zostało dla Ciebie stworzone przez Lindenów, 
-				z wkładem open source od:
+Second Life zostało dla Ciebie stworzone przez Lindenów, 
+z wkładem open source od:
 			</text>
 		</panel>
 		<panel label="Licencje" name="licenses_panel" />
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
index 1646db897a..9f8e110dd6 100644
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floaterland" title="O DZIAŁCE">
+	<floater.string name="Hours">
+		[HOURS] godz.
+	</floater.string>
+	<floater.string name="Hour">
+		godz.
+	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] minuty
+		[MINUTES] min.
 	</floater.string>
 	<floater.string name="Minute">
-		minuta
+		min.
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] sekund
+		[SECONDS] sek.
 	</floater.string>
 	<floater.string name="Remaining">
 		pozostało
 	</floater.string>
+	<floater.string name="Always">
+		Zawsze
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="OGÓLNE" name="land_general_panel">
 			<panel.string name="new users only">
@@ -65,16 +74,10 @@
 			<text name="Owner:">
 				Właściciel:
 			</text>
-			<text name="OwnerText">
-				Ładowanie...
-			</text>
 			<button label="Profil" name="Profile..." />
 			<text name="Group:">
 				Grupa:
 			</text>
-			<text name="GroupText">
-				Ładowanie...
-			</text>
 			<button label="Ustaw" name="Set..." />
 			<check_box label="Udostępnij przypisywanie na Grupę" name="check deed" tool_tip="Oficer Grupy ma prawo przepisać prawo własności działki na Grupę. Działka wspierana jest przez przydziały pochodzące od członków Grupy." />
 			<button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania działki na Grupę może dokonać jedynie oficer Grupy." />
@@ -111,7 +114,7 @@
 			<text name="DwellText">
 				Wczytywanie...
 			</text>
-			<button label="Kup działkę" name="Buy Land..." />
+			<button label="Kup działkę" label_selected="Kup działkę" name="Buy Land..." />
 			<button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Działka musi mieć Właściciela, zawartość oraz nie może być wystawiona na Aukcję." />
 			<button label="Skrypty" name="Scripts..."/>
 			<button label="Kup dla Grupy" name="Buy For Group..." />
@@ -130,7 +133,7 @@
 				Działka zakupiona w tym Regionie może być łączona/dzielona.
 			</panel.string>
 			<panel.string name="can_not_change">
-				Działka zakupiona w tym Regionie nie może być 
+				Działka zakupiona w tym Regionie nie może być
 łączona/dzielona.
 			</panel.string>
 			<text name="estate_section_lbl">
@@ -151,9 +154,6 @@
 			<text name="covenant_timestamp_text">
 				Ostatnia modyfikacja Wed Dec 31 16:00:00 1969
 			</text>
-			<text name="region_name_text">
-				Wczytywanie...
-			</text>
 			<text name="region_landtype_lbl">
 				Typ:
 			</text>
@@ -220,8 +220,8 @@
 			<text name="Object Owners:">
 				Właściciele:
 			</text>
-			<button name="Refresh List" tool_tip="Odśwież listę obiektów" />
-			<button label="Zwróć obiekty" name="Return objects..." />
+			<button label="Odśwież listę" label_selected="Odśwież listę" name="Refresh List" tool_tip="Odśwież listę obiektów" />
+			<button label="Zwróć obiekty" label_selected="Zwróć obiekty" name="Return objects..." />
 			<name_list name="owner list">
 				<name_list.columns label="Typ" name="type" />
 				<name_list.columns label="Nazwa" name="name" />
@@ -250,7 +250,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Moderate.
 			</panel.string>
 			<panel.string name="mature_check_adult_tooltip">
-				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Adult
+				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Adult.
 			</panel.string>
 			<panel.string name="landing_point_none">
 				(brak)
@@ -271,21 +271,21 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 			<text name="allow_label2">
 				Budowanie:
 			</text>
-			<check_box label="Wszyscy" name="edit objects check" />
-			<check_box label="Grupa" name="edit group objects check" />
+			<check_box label="Wszyscy" name="edit objects check" tool_tip="Gdy ta opcja jest włączona, to Rezydenci mogą tworzyć i rezzować obiekty na Twojej działce." />
+			<check_box label="Grupa" name="edit group objects check" tool_tip="Gdy ta opcja jest włączona, to osoby będące w grupie przypisanej do Twojej działki mogą na niej tworzyć i rezzować obiekty." />
 			<text name="allow_label3">
 				Nowe obiekty:
 			</text>
-			<check_box label="Wszyscy" name="all object entry check" />
-			<check_box label="Grupa" name="group object entry check" />
+			<check_box label="Wszyscy" name="all object entry check" tool_tip="Gdy ta opcja jest włączona, to Rezydenci mogą przenosić istniejące obiekty z innych działek na tę działkę." />
+			<check_box label="Grupa" name="group object entry check" tool_tip="Gdy ta opcja jest włączona, to osoby będące w grupie przypisanej do tej działki mogą na nią przenosić istniejące obiekty z innych działek." />
 			<text name="allow_label4">
 				Skrypty:
 			</text>
-			<check_box label="Wszyscy" name="check other scripts" />
-			<check_box label="Grupa" name="check group scripts" />
+			<check_box label="Wszyscy" name="check other scripts" tool_tip="Gdy ta opcja jest włączona, to Rezydenci mogą uruchamiać skrypty na Twojej działce, włączając w to te z dodatków." />
+			<check_box label="Grupa" name="check group scripts" tool_tip="Gdy ta opcja jest włączona, to osoby będące w grupie przypisanej do Twojej działki mogą na niej uruchamiać skrypty, włączając w to te z dodatków." />
 			<check_box label="Bezpieczna (brak uszkodzeń)" name="check safe" tool_tip="Wybrana - działka jest bezpieczna - uszkodzenia w walce są zablokowane. Nie jest wybrana - uszkodzenia w walce są włączone." />
 			<check_box label="Popychanie niedozwolone" name="PushRestrictCheck" tool_tip="Nie pozwalaj skryptom na popychanie. Wybranie tej opcji może być przydatne do ograniczenia zakłóceń spokoju na Twojej działce." />
-			<check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy działki w wyszukiwarce" />
+			<check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy działki w wyszukiwarce"/>
 			<combo_box name="land category">
 				<combo_box.item label="Każda kategoria" name="item0" />
 				<combo_box.item label="Lokalizacja Lindenów" name="item1" />
@@ -301,24 +301,24 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				<combo_box.item label="Wynajem" name="item13" />
 				<combo_box.item label="Inna" name="item12" />
 			</combo_box>
-			<check_box label="Treść Moderate" name="MatureCheck" />
+			<check_box label="Treść Moderate" name="MatureCheck"/>
 			<text name="Snapshot:">
 				Zdjęcie:
 			</text>
 			<texture_picker name="snapshot_ctrl" tool_tip="Kliknij by wybrać zdjęcie" />
-			<text name="allow_label5">
+			<text name="allow_see_label">
 				Awatary na innych działkach mogą rozmawiać/widzieć awatary na tej działce
 			</text>
-			<check_box name="SeeAvatarsCheck" tool_tip="Pozwala Rezydentom z innych działek widzieć i rozmawiać z Rezydentami na tej działce - oraz Tobie, widzieć ich i rozmawiać z nimi." />
+			<check_box label="Widzieć awatary" name="SeeAvatarsCheck" tool_tip="Pozwala Rezydentom z innych działek widzieć i rozmawiać z Rezydentami na tej działce - oraz Tobie, widzieć ich i rozmawiać z nimi." />
 			<text name="landing_point">
 				Punkt Lądowania: [LANDING]
 			</text>
 			<button label="Ustaw" label_selected="Ustaw" name="Set" tool_tip="Ustal miejsce lądowania dla przybywających gości. Używa położenia Twojego awatara na tej działce." />
-			<button label="Wyczyść" label_selected="Wyczyść" name="Clear" tool_tip="Usuń dotychczasowe miejsce lądowania" />
+			<button label="Wyczyść" label_selected="Wyczyść" name="Clear" tool_tip="Usuń dotychczasowe miejsce lądowania." />
 			<text name="Teleport Routing: ">
 				Trasa teleportacji:
 			</text>
-			<combo_box name="landing type" tool_tip="Trasa teleportacji - ustaw w jaki sposób będzie się odbywać proces teleportacji na działce">
+			<combo_box name="landing type" tool_tip="Trasa teleportacji - ustaw w jaki sposób będzie się odbywać proces teleportacji na działce.">
 				<combo_box.item label="Zablokowana" name="Blocked" />
 				<combo_box.item label="Punkt Lądowania" name="LandingPoint" />
 				<combo_box.item label="Gdziekolwiek" name="Anywhere" />
@@ -345,18 +345,18 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				Obiekty używające tej tekstury będą wyświetlały film lub stronę internetową po naciśnięciu przycisku odtwarzania. Wybierz miniaturę, jeśli chcesz zmienić teksturę.
 			</text>
 			<check_box label="Skaluj automatycznie" name="media_auto_scale" tool_tip="Wybranie tej opcji dobierze rozmiar zawartości mediów dla tej działki automatycznie. Może to mieć znaczący wpływ na jakość odtwarzanego materiału - może on być odtwarzany wolniej i w gorszej jakości, ale żadne dalsze działania nie będą potrzebne." />
-			<text name="media_size" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych.">
+			<text name="media_size" tool_tip="Rozmiar dla przesyłanych mediów internetowych. Zostaw 0 dla ustawień domyślnych.">
 				Rozmiar:
 			</text>
-			<spinner name="media_size_width" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych." />
-			<spinner name="media_size_height" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych." />
+			<spinner name="media_size_width" tool_tip="Rozmiar dla przesyłanych mediów internetowych. Zostaw 0 dla ustawień domyślnych." />
+			<spinner name="media_size_height" tool_tip="Rozmiar dla przesyłanych mediów internetowych. Zostaw 0 dla ustawień domyślnych." />
 			<text name="pixels">
 				pikseli
 			</text>
 			<text name="Options:">
 				Opcje:
 			</text>
-			<check_box label="Odtwarzanie mediów w pętli" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku." />
+			<check_box label="Odtwarzaj w pętli" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku." />
 		</panel>
 		<panel label="DŹWIĘK" name="land_audio_panel">
 			<text name="MusicURL:">
@@ -377,6 +377,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 			<check_box label="Rozmowy włączone" name="parcel_enable_voice_channel" />
 			<check_box label="Rozmowy włączone (ustawione przez Majątek)" name="parcel_enable_voice_channel_is_estate_disabled" />
 			<check_box label="Ogranicz komunikację głosową do obszaru tej działki" name="parcel_enable_voice_channel_local" />
+			<check_box label="Ogranicz MOAP do obecnej działki" name="obscure_moap" tool_tip="Media na primach znajdujących się poza tą działką nie powinny odtwarzać się automatycznie dla rezydentów będących na niej - i odwrotnie." />
 		</panel>
 		<panel label="DOSTĘP" name="land_access_panel">
 			<panel.string name="access_estate_defined">
@@ -385,13 +386,10 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 			<panel.string name="estate_override">
 				Jedna lub więcej z tych opcji ustawiona jest z poziomu Majątku
 			</panel.string>
-			<check_box name="public_access" label="Dostęp publiczny (brak zaznaczenia tej opcji = widoczne linie zakazu)" />
-			<text name="Only Allow">
-				Umożliwiaj dostęp tylko dla:
-			</text>
-			<check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
-			<check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
-			<check_box label="Udostępnij wejście grupie [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce." />
+			<check_box label="Każdy może odwiedzać (brak zaznaczenia = widoczne linie zakazu)" name="public_access" />
+			<check_box label="Osoba musi mieć 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
+			<check_box label="Osoba musi mieć dane płatnicze w systemie Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
+			<check_box label="Umożliwiaj wejście bez ograniczeń grupie [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce." />
 			<check_box label="Sprzedaj przepustki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej działki" />
 			<combo_box name="pass_combo">
 				<combo_box.item label="Każdemu" name="Anyone" />
@@ -399,22 +397,32 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 			</combo_box>
 			<spinner label="Cena w L$:" name="PriceSpin" />
 			<spinner label="Godziny dostępu:" name="HoursSpin" />
-			<panel name="Allowed_layout_panel">
-				<text label="Zawsze Zezwalaj" name="AllowedText">
-					Dozwoleni Rezydenci
-				</text>
-				<name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] maksimum)" />
-				<button label="Dodaj" name="add_allowed" />
-				<button label="Usuń" label_selected="Usuń" name="remove_allowed" />
-			</panel>
-			<panel name="Banned_layout_panel">
-				<text label="Banuj" name="BanCheck">
-					Zbanowani Rezydenci
-				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] na liście, [MAX] maksimum)" />
-				<button label="Dodaj" name="add_banned" />
-				<button label="Usuń" label_selected="Usuń" name="remove_banned" />
-			</panel>
+			<text name="OwnerLimited">
+				(właściciel Majątku może ograniczać te wybory)
+			</text>
+			<layout_stack name="access_stack">
+				<layout_panel name="Allowed_layout_panel">
+					<text label="Zawsze zezwalaj" name="AllowedText">
+						Zawsze zezwalaj ([COUNT]/[MAX])
+					</text>
+					<name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
+					<button label="Dodaj" name="add_allowed"/>
+					<button label="Usuń" label_selected="Usuń" name="remove_allowed"/>
+				</layout_panel>
+				<layout_panel name="Banned_layout_panel">
+					<text label="Banuj" name="BanCheck">
+						Zbanowani ([COUNT]/[MAX])
+					</text>
+					<name_list name="BannedList" tool_tip="([LISTED] na liście, [MAX] maksimum)">
+						<columns label="Imię" name="name" />
+						<columns label="Czas" name="duration" />
+					</name_list>
+					<button label="Dodaj" name="add_banned"/>
+					<button label="Usuń" label_selected="Usuń" name="remove_banned"/>
+				</layout_panel>
+			</layout_stack>
 		</panel>
+		<panel label="PRZYGODY" name="land_experiences_panel"/>
+		<panel label="OTOCZENIE" name="land_environment_panel" />
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_anim_preview.xml
index ff2fee6f2f..c56f103d21 100644
--- a/indra/newview/skins/default/xui/pl/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_animation_anim_preview.xml
@@ -6,6 +6,6 @@
 	<text name="description_label">
 		Opis:
 	</text>
-	<button label="Załaduj ([AMOUNT]L$)" name="ok_btn" />
+	<button label="Prześlij ([AMOUNT]L$)" name="ok_btn" />
 	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
index 18212fad9c..63b0931b2b 100644
--- a/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
@@ -173,6 +173,6 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund.
 		Nie można wczytać pliku animacji.
 Doradzamy eksport plików BVH z Poser 4.
 	</text>
-	<button label="Załaduj ([AMOUNT]L$)" name="ok_btn" />
+	<button label="Prześlij ([AMOUNT]L$)" name="ok_btn" />
 	<button label="Anuluj" name="cancel_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_associate_listing.xml b/indra/newview/skins/default/xui/pl/floater_associate_listing.xml
index b5464dd59b..7ef99457c9 100644
--- a/indra/newview/skins/default/xui/pl/floater_associate_listing.xml
+++ b/indra/newview/skins/default/xui/pl/floater_associate_listing.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="associate listing" title="PRZYPISANE PRZEDMIOTY">
-	<text name="message">ID przedmiotu:</text>
+<floater name="associate listing" title="PRZYPISZ RZECZ">
+	<text name="message">ID rzeczy:</text>
 	<line_editor name="listing_id">Wpisz tutaj ID</line_editor>
-	<button label="OK" name="OK"/>
 	<button label="Anuluj" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 87e318be1b..e668c6cc20 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <notifications>
 	<global name="skipnexttime">
-		Nie pokazuj tego następnym razem
+		Nie pokazuj tego ponownie
+	</global>
+	<global name="skipnexttimesessiononly">
+		Nie pokazuj tego ponownie
+(dla obecnej sesji)
 	</global>
 	<global name="alwayschoose">
-		Zawsze wybieraj tą opcję
+		Zawsze wybieraj tę opcję
 	</global>
 	<global name="implicitclosebutton">
 		Zamknij
@@ -20,19 +24,24 @@ Szczegóły błędu: Błąd o nazwie &apos;[_NAME]&apos; nie został odnaleziony
 [CONTROLS]
 	</notification>
 	<notification name="TutorialNotFound">
-		Brak samouczka na ten temat
+		Brak samouczka na ten temat.
 	</notification>
 	<notification name="GenericAlertYesCancel">
 		[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak" />
 	</notification>
 	<notification name="BadInstallation">
-		Podczas aktualizacji [APP_NAME] wystąpił błąd. Proszę [http://get.secondlife.com odwiedzić stronę] aby ściągnąć ostatnią wersję klienta.
+		Instalacja [APP_NAME] jest uszkodzona. Proszę [http://get.secondlife.com pobrać nową kopię] przeglądarki i ponownie ją zainstalować.
 	</notification>
 	<notification name="LoginFailedNoNetwork">
 		Nie można połączyć z [SECOND_LIFE_GRID].
 &apos;[DIAGNOSTIC]&apos;
 Upewnij się, że Twoje połączenie z internetem działa.
+	</notification>
+	<notification name="LoginFailedToParse">
+		Przeglądarka otrzymała zniekształconą odpowiedź z serwera. Upewnij się, że połączenie internetowe działa prawidłowo i spróbuj ponownie później.
+
+Jeśli uważasz, że to błąd - skontaktuj się z pomocą techniczną.
 	</notification>
 	<notification name="MessageTemplateNotFound">
 		Szablon komunikatu dla [PATH] nie został odnaleziony.
@@ -72,11 +81,96 @@ Foldery nie zostały wysłane na Marketplace z powodu błędu sieci lub systemu.
 
 Inicjalizacja Marketplace nieudana z powodu błędu sieci lub systemu. Spróbuj później.
 	</notification>
+	<notification name="StockPasteFailed">
+		Kopiowanie lub przeniesienie do folderu Magazynowego nie powiodło się:
+
+&apos;[ERROR_CODE]&apos;
+	</notification>
+	<notification name="MyOutfitsPasteFailed">
+		Jeden lub więcej przedmiotów nie może być użyty w "Strojach"
+	</notification>
+	<notification name="MerchantPasteFailed">
+		Kopiowanie lub przenoszenie przedmiotów na Marketplace nie powiodło się:
+
+&apos;[ERROR_CODE]&apos;
+	</notification>
+	<notification name="MerchantTransactionFailed">
+		Transakcja z Marketplace nie powiodła się:
+
+[ERROR_REASON][ERROR_DESCRIPTION]
+	</notification>
+	<notification name="MerchantUnprocessableEntity">
+		Wylistowanie tej rzeczy lub aktywowanie folderu z wersją nie było możliwe. Zazwyczaj jest to spowodowane brakującymi informacjami w formularzu z opisem przedmiotu, ale może to również wynikać z błędów w strukturze folderów. Zmień opis przedmiotu lub sprawdź foldery, aby znaleźć błędy.
+	</notification>
+	<notification name="MerchantListingFailed">
+		Listowanie na Marketplace nie powiodło się:
+
+        &apos;[ERROR_CODE]&apos;
+	</notification>
+	<notification name="MerchantFolderActivationFailed">
+		Aktywacja tego folderu wersji nie powiodła się:
+
+        &apos;[ERROR_CODE]&apos;
+	</notification>
+	<notification name="MerchantForceValidateListing">
+		Aby wylistowanie tej rzeczy było możliwe hierarchia w jej zawartości została automatycznie naprawiona.
+		<usetemplate ignoretext="Ostrzegaj, gdy wylistowanie rzeczy automatycznie naprawia hierarchię zawartości" name="okignore" />
+    </notification>
+	<notification name="ConfirmMerchantActiveChange">
+		Jeśli kontynuujesz, to zmieni się aktywna zawartość tej rzeczy. Czy chcesz kontynuować?
+		<usetemplate ignoretext="Potwierdź przed zmodyfikowaniem aktywnej rzeczy na Marketplace" name="okcancelignore" notext="Anuluj" />
+	</notification>
+	<notification name="ConfirmMerchantMoveInventory">
+		Przedmioty przeciągnięte do okna listowania na Marketplace są przenoszone z ich oryginalnych lokalizacji, a nie kopiowane. Czy chcesz kontynuować?
+		<usetemplate ignoretext="Potwierdź, zanim prześlę na Marketplace przedmiot z mojej Szafy" name="okcancelignore" notext="Anuluj" />
+	</notification>
+	<notification name="ConfirmListingCutOrDelete">
+		Przeniesienie lub usunięcie folderu usunie również Twój przedmiot na Marketplace. Jeśli chcesz, aby przedmiot był ciągle widoczny na Marketplace musisz przesunąć lub usunąć zawartość folderu z wersją, którą chcesz zmodyfikować. Czy chcesz kontynuować?
+		<usetemplate ignoretext="Potwierdź, zanim usunę lub przeniosę przedmiot z Marketplace" name="okcancelignore" notext="Anuluj" />
+	</notification>
+	<notification name="ConfirmCopyToMarketplace">
+		Nie masz praw do skopiowania jednego lub więcej obiektów na Marketplace. Możesz je przenieść lub pozostawić.
+		<usetemplate canceltext="Anuluj" ignoretext="Potwierdź, zanim wyślę na Marketplace przedmioty bez praw kopiowania" name="yesnocancelbuttons" notext="Nie przenoś" yestext="Przenieś"/>
+	</notification>
+	<notification name="ConfirmMerchantUnlist">
+		Jeśli kontynuujesz, to ta rzecz zostanie usunięta z listy. Czy chcesz kontynuować?
+		<usetemplate ignoretext="Potwierdź, zanim usunę z listy rzecz na Marketplace" name="okcancelignore" notext="Anuluj" />
+	</notification>
+	<notification name="ConfirmMerchantClearVersion">
+		Jeśli kontynuujesz, to folder wersji tej rzeczy zostanie zdeaktywowany. Czy chcesz kontynuować?
+		<usetemplate ignoretext="Potwierdź przed wyłączeniem folderu wersji dla rzeczy na Marketplace" name="okcancelignore" notext="Anuluj" />
+	</notification>
+	<notification name="AlertMerchantListingNotUpdated">
+		Ta rzecz nie może zostać zaktualizowana.
+[[URL] Kliknij tutaj] aby zaktualizować ją na Marketplace.
+	</notification>
+	<notification name="AlertMerchantListingCannotWear">
+		Nie możesz założyć ubrań lub części ciała, które znajdują się w folderze listy rzeczy Marketplace.
+	</notification>
+	<notification name="AlertMerchantListingInvalidID">
+		Nieprawidłowy ID rzeczy.
+	</notification>
+	<notification name="AlertMerchantListingActivateRequired">
+		Istnieje kilka, lub żadna, wersji folderu dla tej rzeczy. Będziesz musiał/a wybrać i uaktywnić jedną oddzielnie później.
+		<usetemplate ignoretext="Powiadamiaj o aktywacji folderu wersji, gdy tworzę rzecz z kilkoma folderami wersji" name="okignore" />
+	</notification>
+	<notification name="AlertMerchantStockFolderSplit">
+		Przedmioty z ograniczonymi zasobami magazynowymi różnych typów zostały rozdzielone do osobnych folderów, aby ogólna hierarchia katalogów umożliwiała ich listowanie.
+		<usetemplate ignoretext="Powiadom, gdy folder Magazynowy jest dzielony przed listowaniem" name="okignore" />
+	</notification>
+	<notification name="AlertMerchantStockFolderEmpty">
+		Twoja rzecz została usunięta z listy, ponieważ nie ma jej już w Magazynie. Musisz dodać więcej jej jednostek do folderu Magazynowego, aby można było ją ponownie wyświetlać na liście.
+		<usetemplate ignoretext="Powiadom, gdy rzecz jest zdjęta z listy, bo folder zasobów Magazynowych jest pusty" name="okignore" />
+	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		Twoja rzecz została usunięta z listy, ponieważ folder wersji jest pusty. Musisz dodać więcej jej jednostek do folderu wersji, aby można było ją ponownie wyświetlać na liście.
+		<usetemplate ignoretext="Powiadom, gdy rzecz jest zdjęta z listy, bo folder wersji jest pusty" name="okignore" />
+	</notification>
 	<notification name="WriteAnimationFail">
 		Problem w zapisywaniu danych animacji. Spróbuj ponownie za kilka minut.
 	</notification>
 	<notification name="UploadAuctionSnapshotFail">
-		W trakcie ładowania obrazu aukcji pojawił się problem z następującego powodu: [REASON].
+		W trakcie przesyłania obrazu aukcji pojawił się problem z następującego powodu: [REASON].
 	</notification>
 	<notification name="UnableToViewContentsMoreThanOne">
 		Nie można przeglądać zawartości więcej niż jednego obiektu naraz.
@@ -89,9 +183,12 @@ Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
 	<notification name="FriendsAndGroupsOnly">
 		Osoby spoza listy znajomych nie będą wiedzieć, że zdecydowałeś/aś się ignorować ich rozmowy głosowe i wiadomości IM.
 	</notification>
-	<notification name="FavoritesOnLogin">	
+	<notification name="FavoritesOnLogin">
 		Pamiętaj: kiedy włączysz tą opcję to każdy kto używa tego komputera będzie mógł zobaczyć Twoją listę ulubionych miejsc.
 	</notification>
+	<notification name="AllowMultipleViewers">
+		Uruchamianie kilku przeglądarek Second Life nie podlega wsparciu. Może prowadzić do kolizji pamięci podręcznej tekstur, jej uszkodzeń, pogorszenia efektów wizualnych oraz wydajności.
+	</notification>
 	<notification name="GrantModifyRights">
 		Udzielenie praw modyfikacji innemu Rezydentowi umożliwia modyfikację, usuwanie lub wzięcie JAKIEGOKOLWIEK z Twoich obiektów. Używaj tej opcji z rozwagą!
 Czy chcesz udzielić prawa do modyfikacji [NAME]?
@@ -110,6 +207,9 @@ Czy chcesz dać prawa modyfikacji wybranym osobom?
 		Czy chcesz odebrać prawa modyfikacji wybranym Rezydentom?
 		<usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
 	</notification>
+	<notification name="GroupNameLengthWarning">
+		Nazwa grupy musi zawierać od [MIN_LEN] do [MAX_LEN] znaków.
+	</notification>
 	<notification name="UnableToCreateGroup">
 		Założenie grupy nie jest możliwe.
 [MESSAGE]
@@ -171,6 +271,17 @@ Jeśli nie chcesz, aby te przywileje były dłużej przypisane do tej roli, to w
 		Zamierzasz wyrzucić [COUNT] osób z grupy.
 		<usetemplate ignoretext="Potwierdź wyrzucenie kilku osób z grupy" name="okcancelignore" notext="Anuluj" yestext="Wyrzuć" />
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		Zamierzasz zbanować [AVATAR_NAME] z grupy.
+		<usetemplate ignoretext="Potwierdź przed zbanowaniem osoby z grupy" name="okcancelignore" notext="Anuluj" yestext="Banuj" />
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		Zamierzasz zbanować [COUNT] osób z grupy.
+		<usetemplate ignoretext="Potwierdź przed zbanowaniem z grupy kilku osób na raz" name="okcancelignore" notext="Anuluj" yestext="Banuj" />
+	</notification>
+	<notification name="GroupBanUserOnBanlist">
+		Niektórzy rezydenci nie dostali zaproszenia, ponieważ są zbanowani w grupie.
+	</notification>
 	<notification name="AttachmentDrop">
 		Wybrałeś/aś opcję upuszczenia swojego dodatku.
 Czy chcesz kontynuować?
@@ -182,7 +293,7 @@ Chcesz kontynuować?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Dołącz" />
 	</notification>
 	<notification name="JoinGroupNoCost">
-		Dołączasz do grupy [NAME].
+		Dołączasz do grupy &lt;nolink&gt;[NAME]&lt;/nolink&gt;.
 Czy chcesz kontynuować?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Dołącz" />
 	</notification>
@@ -194,7 +305,30 @@ Masz za mało L$ żeby do niej dołączyć.
 		Stworzenie tej grupy kosztuje [COST]L$.
 W grupie powinna być więcej niż jedna osoba, w przeciwnym razie zostanie ona na zawsze skasowana.
 Zaproś kogoś w ciągu 48 godzin.
-		<usetemplate canceltext="Anuluj" name="okcancelbuttons" notext="Anuluj" yestext="Stwórz grupę za 100L$" />
+		<usetemplate canceltext="Anuluj" name="okcancelbuttons" notext="Anuluj" yestext="Stwórz grupę za [COST]L$" />
+	</notification>
+	<notification name="JoinGroupInaccessible">
+		Ta grupa nie jest dla Ciebie dostępna.
+	</notification>
+	<notification name="JoinGroupError">
+		Wystąpił błąd podczas próby dołączenia do grupy.
+	</notification>
+	<notification name="JoinGroupErrorReason">
+		Nie można dołączyć do grupy: [reason]
+	</notification>
+	<notification name="JoinGroupTrialUser">
+		Przepraszamy, ale konta próbne nie mogą dołączać do grup.
+	</notification>
+	<notification name="JoinGroupMaxGroups">
+		Nie możesz dołączyć do &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;:
+Jesteś już w [group_count] grupach, a maksymalny dozwolony limit to [max_groups]
+	</notification>
+	<notification name="JoinGroupClosedEnrollment">
+		Nie możesz dołączyć do &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;:
+Grupa nie umożliwia już swobodnego dołączania.
+	</notification>
+	<notification name="JoinGroupInsufficientFunds">
+		Nie można przekazać wymaganej opłaty wstępu ([membership_fee] L$).
 	</notification>
 	<notification name="LandBuyPass">
 		Za [COST]L$ możesz odwiedzić tą działkę (&apos;[PARCEL_NAME]&apos;) na [TIME] godzin. Chcesz kupić przepustkę?
@@ -217,10 +351,9 @@ Cena wynosi [SALE_PRICE]L$, a sprzedaż będzie autoryzowana dla [NAME].
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
-		Czy na pewno chcesz zwrócić wszystkie obiekty udostępnione grupie &apos;[NAME]&apos; na tej działce do szaf ich poprzednich właścicieli?
+		Czy na pewno chcesz zwrócić wszystkie obiekty udostępnione grupie &apos;&lt;nolink&gt;[NAME]&lt;/nolink&gt;&apos; na tej działce do szaf ich poprzednich właścicieli?
 
-*UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów
-udostępnionych grupie, które nie mają praw transferu!
+*UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów udostępnionych grupie, które nie mają praw transferu!
 
 Obiekty: [N]
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
@@ -256,7 +389,7 @@ Obiekty: [N]
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Czy na pewno chcesz zwrócić wszystkie wymienione obiekty znajdujące się na tej działce do szaf ich właścicieli?
+		Czy na pewno chcesz zwrócić wszystkie wymienione obiekty znajdujące się na tej działce do szaf ich właścicieli? Spowoduje to zwrot WSZYSTKICH oskryptowanych obiektów w regionie!
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -264,7 +397,7 @@ Obiekty: [N]
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsNotOwnedByGroup">
-		Zwrócić obiekty z tej działki, które NIE są udostępnione grupie [NAME] do ich właścicieli?
+		Zwrócić obiekty z tej działki, które NIE są udostępnione grupie &lt;nolink&gt;[NAME]&lt;/nolink&gt; do ich właścicieli?
 
 Obiekty: [N]
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
@@ -299,14 +432,23 @@ W celu umieszczenia mediów tylko na jednej powierzchni skorzystaj z narzędzia
 	<notification name="ErrorEncodingSnapshot">
 		Błąd w kodowaniu zdjęcia.
 	</notification>
+	<notification name="ErrorPhotoCannotAfford">
+		Potrzebujesz [COST]L$ aby zapisać zdjęcie do swojej Szafy. Możesz zamiast tego kupić L$ lub zapisać zdjęcie na swoim komputerze.
+	</notification>
+	<notification name="ErrorCannotAffordUpload">
+		Potrzebujesz [COST]L$ aby przesłać ten element.
+	</notification>
+	<notification name="ErrorTextureCannotAfford">
+		Potrzebujesz [COST]L$ aby zapisać teksturę do swojej Szafy. Możesz zamiast tego kupić L$ lub zapisać teksturę na swoim komputerze.
+	</notification>
 	<notification name="ErrorUploadingPostcard">
-		W trakcie ładowania zdjęcia pojawił się problem z następującego powodu: [REASON]
+		W trakcie przesyłania zdjęcia pojawił się problem z następującego powodu: [REASON]
 	</notification>
 	<notification name="ErrorUploadingReportScreenshot">
-		W trakcie ładowania zdjęcia ekranu do raportu pojawił się problem z następującego powodu: [REASON]
+		W trakcie przesyłania zdjęcia ekranu do raportu pojawił się problem z następującego powodu: [REASON]
 	</notification>
 	<notification name="MustAgreeToLogIn">
-		Musisz zaakceptować Warunki Umowy (Terms of Service) by kontynuować logowanie się do [SECOND_LIFE].
+		Musisz zaakceptować Regulamin (Terms and Conditions), Politykę Prywatności (Privacy Policy) i Warunki korzystania z Usług (Terms of Service) by kontynuować logowanie się do [SECOND_LIFE].
 	</notification>
 	<notification name="CouldNotPutOnOutfit">
 		Założenie stroju nie powiodło się.
@@ -322,6 +464,9 @@ Limit [MAX_ATTACHMENTS] dodatków został przekroczony. Proszę najpierw odłąc
 	<notification name="CannotWearInfoNotComplete">
 		Nie możesz założyć tego przedmiotu, ponieważ jeszcze się nie załadował do końca. Spróbuj ponownie za kilka minut.
 	</notification>
+	<notification name="MustEnterPasswordToLogIn">
+		Należy wprowadzić hasło.
+	</notification>
 	<notification name="MustHaveAccountToLogIn">
 		Należy wprowadzić nazwę użytkownika.
 
@@ -332,10 +477,10 @@ Potrzebujesz konta aby się zalogować do [SECOND_LIFE]. Czy chcesz utworzyć je
 		Należy wprowadzić nazwę użytkownika lub imię oraz nazwisko Twojego awatara w pole nazwy użytkownika, a następnie ponownie się zalogować.
 	</notification>
 	<notification name="InvalidGrid">
-		'[GRID]' nie jest prawidłowym identyfikatorem siatki.
+		'[GRID]' nie jest prawidłowym identyfikatorem świata.
 	</notification>
 	<notification name="InvalidLocationSLURL">
-		Twój punkt startowy nie znajduje się na prawidłowej siatce.
+		Twój punkt startowy nie znajduje się w prawidłowym świecie.
 	</notification>
 	<notification name="DeleteClassified">
 		Usunąć reklamę &apos;[NAME]&apos;?
@@ -354,10 +499,22 @@ Czy na pewno chcesz kontynuować?
 	<notification name="ClassifiedInsufficientFunds">
 		Nie posiadasz wystarczających środków aby dodać reklamę.
 	</notification>
-	<notification name="DeleteAvatarPick">
+	<notification name="ProfileDeleteClassified">
+		Usunąć reklamę &lt;nolink&gt;[CLASSIFIED]&lt;/nolink&gt;?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
+	</notification>
+	<notification name="ProfileDeletePick">
 		Usunąć miejsce &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
+	<notification name="ProfileUnpublishedClassified">
+		Masz nieopublikowane reklamy. Przepadną, jeśli zamkniesz okno.
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
+	</notification>
+	<notification name="ProfileUnsavedChanges">
+		Masz niezapisane zmiany.
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Odrzuć" yestext="Zapisz" />
+	</notification>
 	<notification name="DeleteOutfits">
 		Skasować wybrane stroje?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
@@ -372,14 +529,6 @@ Czy na pewno chcesz kontynuować?
 	<notification name="SelectHistoryItemToView">
 		Wybierz obiekt z historii, który chcesz zobaczyć.
 	</notification>
-	<notification name="ResetShowNextTimeDialogs">
-		Czy chcesz aktywować ponownie wszystkie te powiadomienia, przy których wcześniej zaznaczono &apos;nie pokazuj ponownie&apos;?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" />
-	</notification>
-	<notification name="SkipShowNextTimeDialogs">
-		Czy chcesz dezaktywować wszystkie powiadomienia, jakie tylko można?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" />
-	</notification>
 	<notification name="CacheWillClear">
 		Bufor danych zostanie wyczyszczony po restarcie aplikacji [APP_NAME].
 	</notification>
@@ -390,6 +539,9 @@ Pamiętaj: Opcja ta wyczyszcza bufor danych.
 	<notification name="ChangeConnectionPort">
 		Ustawienia portu zostają zaktualizowane po restarcie aplikacji [APP_NAME].
 	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		To ustawienie debugowania zostanie zaktualizowane po restarcie aplikacji [APP_NAME].
+	</notification>
 	<notification name="ChangeSkin">
 		Nowa skórka pojawi się po restarcie aplikacji [APP_NAME].
 	</notification>
@@ -405,7 +557,11 @@ Pamiętaj: Opcja ta wyczyszcza bufor danych.
 		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz" />
 	</notification>
 	<notification name="DeleteNotecard">
-		Usunąć notkę?
+		Czy na pewno chcesz usunąć tą notkę?
+		<usetemplate ignoretext="Potwierdź usuwanie notki" name="okcancelignore" notext="Anuluj" />
+	</notification>
+	<notification name="LoadPreviousReportScreenshot">
+		Czy chcesz użyć poprzedniego zrzutu ekranu dla swojego zgłoszenia?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="GestureSaveFailedTooManySteps">
@@ -451,6 +607,10 @@ Obiekt może znajdować się zbyt daleko albo został usunięty.
 	<notification name="CannotDownloadFile">
 		Nie można pobrać pliku
 	</notification>
+	<notification name="MediaFileDownloadUnsupported">
+		Zażądano pobrania pliku, jaki nie jest obsługiwany w [SECOND_LIFE].
+		<usetemplate ignoretext="Ostrzegaj o pobieraniu nieobsługiwanych typów plików" name="okignore" />
+	</notification>
 	<notification name="CannotWriteFile">
 		Nie można zapisać pliku [[FILE]]
 	</notification>
@@ -460,23 +620,11 @@ Obiekt może znajdować się zbyt daleko albo został usunięty.
 Odwiedzić [_URL], aby uzyskać więcej informacji?
 		<usetemplate ignoretext="Sprzęt w moim komputerze nie jest wspierany" name="okcancelignore" notext="Nie" yestext="Tak" />
 	</notification>
-	<notification name="IntelOldDriver">
-		Prawdopodobnie istnieje nowszy sterownik dla Twojej karty graficznej. Aktualizacja sterowników graficznych może znacznie zwiększyć wydajność.
-
-Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
-		<usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak" />
-	</notification>
-	<notification name="AMDOldDriver">
-		Prawdopodobnie istnieje nowszy sterownik dla Twojej karty graficznej. Aktualizacja sterowników graficznych może znacznie zwiększyć wydajność.
-
-Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
-		<usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak" />
-	</notification>
-	<notification name="NVIDIAOldDriver">
+	<notification name="OldGPUDriver">
 		Prawdopodobnie istnieje nowszy sterownik dla Twojej karty graficznej. Aktualizacja sterowników graficznych może znacznie zwiększyć wydajność.
 
-Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
-		<usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak" />
+Odwiedzić [URL] aby sprawdzić, czy są nowsze sterowniki?
+		<usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak"/>
 	</notification>
 	<notification name="UnknownGPU">
 		Twój system jest wyposażony w kartę graficzną, która nie jest rozpoznana przez [APP_NAME].
@@ -500,7 +648,7 @@ Możesz podnieść jakość grafiki pod Ustawienia &gt; Grafika.
 	</notification>
 	<notification name="CannotCopyWarning">
 		Nie masz pozwolenia na kopiowanie następujących obiektów:
-[ITEMS]
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 i stracisz je w momencie przekazania. Czy na pewno chcesz oddać te obiekty?
 		<usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
 	</notification>
@@ -547,7 +695,7 @@ Ta osoba tymczasowo nie będzie mogła się poruszać, używać czatu (IM) lub o
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Wyrzuć" />
 	</notification>
 	<notification name="EjectAvatarFromGroup">
-		Wyrzuciłeś/aś [AVATAR_NAME] z grupy [GROUP_NAME]
+		Wyrzuciłeś/aś [AVATAR_NAME] z grupy &lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;.
 	</notification>
 	<notification name="AcquireErrorTooManyObjects">
 		BŁĄD OTRZYMYWANIA: Zbyt wiele wybranych obiektów.
@@ -562,6 +710,9 @@ Przemieść wszystkie otrzymywane obiekty do jednego regionu.
 Odwiedzić [_URL] po więcej informacji na temat zakupu L$?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
+	<notification name="MuteLimitReached">
+		Nie można dodać kolejnego wpisu do listy zablokowanych, ponieważ limit [MUTE_LIMIT] rekordów został osiągnięty.
+	</notification>
 	<notification name="UnableToLinkObjects">
 		Nie można połączyć [COUNT] obiektów.
 Maksymalnie można połączyć [MAX] obiektów.
@@ -577,6 +728,9 @@ Upewnij się, że żaden z obiektów nie jest zablokowany i wszystkie należą d
 	<notification name="CannotLinkPermanent">
 		Nie możesz łączyć obiektów przez granice regionów.
 	</notification>
+	<notification name="CannotLinkAcrossRegions">
+		Nie możesz łączyć obiektów przez granice regionów.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Nie możesz połączyć obiektów, ponieważ należą one do różnych osób.
 
@@ -592,7 +746,7 @@ Upewnij się, że nazwa pliku ma poprawne rozszerzenie.
 Oczekiwane: [VALIDS]
 	</notification>
 	<notification name="CannotUploadSoundFile">
-		Nie można otworzyć załadowanego pliku dźwiękowego:
+		Nie można otworzyć przesłanego pliku dźwiękowego:
 [FILE]
 	</notification>
 	<notification name="SoundFileNotRIFF">
@@ -624,7 +778,7 @@ Oczekiwane: [VALIDS]
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidTooLong">
-		Plik audio jest zbyt długi (10 sekund maksimum):
+		Plik audio jest zbyt długi (maksymalnie 30 sekund):
 [FILE]
 	</notification>
 	<notification name="ProblemWithFile">
@@ -655,10 +809,10 @@ To może się zdarzyć, kiedy zmieniasz ustawienia sieci. Zrestartowanie Przegl
 		Nie można utworzyć pliku wyjściowego: [FILE]
 	</notification>
 	<notification name="DoNotSupportBulkAnimationUpload">
-		[APP_NAME] obecnie nie wspomaga ładowania grupowego plików animacji w formacie BVH.
+		[APP_NAME] obecnie nie wspomaga przesyłania grupowego plików animacji w formacie BVH.
 	</notification>
 	<notification name="CannotUploadReason">
-		Ładowanie pliku [FILE] nie powiodło się z powodu: [REASON]
+		Przesyłanie pliku [FILE] nie powiodło się z powodu: [REASON]
 Spróbuj jeszcze raz później.
 	</notification>
 	<notification name="LandmarkCreated">
@@ -670,6 +824,12 @@ Spróbuj jeszcze raz później.
 	<notification name="CannotCreateLandmarkNotOwner">
 		Nie możesz zapamiętać tego miejsca (LM) ponieważ właściciel działki nie pozwala na to.
 	</notification>
+	<notification label="Utwórz folder" name="CreateLandmarkFolder">
+		Wybierz nazwę folderu:
+		<form name="form">
+			<button name="Cancel" text="Anuluj" />
+		</form>
+	</notification>
 	<notification name="CannotRecompileSelectObjectsNoScripts">
 		&apos;Rekompilacja&apos; nie powiodła się.
 
@@ -719,8 +879,7 @@ Nowe zapytanie: [FINALQUERY]
 [REASON]
 	</notification>
 	<notification name="invalid_tport">
-		Niestety, pojawił się błąd podczas próby teleportacji. Proponujemy wylogowanie się i spróbowanie teleportacji ponownie.
-Jeżeli nadal otrzymujesz tę wiadomość proponujemy odwiedzić stronę [SUPPORT_SITE].
+		Próby teleportacji są ograniczone do 6 na minutę. Jeśli masz problemy odczekaj minutę i spróbuj ponownie się teleportować. Jeśli problem będzie się powtarzał wyloguj się i zaloguj ponownie.
 	</notification>
 	<notification name="invalid_region_handoff">
 		Niestety, pojawił się błąd podczas próby przedostania się na drugi region. Proponujemy wylogowanie się i spróbowanie przedostania się na drugi region ponownie.
@@ -750,6 +909,9 @@ Jeżeli nadal otrzymujesz tę wiadomość proponujemy odwiedzić stronę [SUPPOR
 	<notification name="expired_region_handoff">
 		Przepraszamy, ale nie udało się przeprowadzić zmiany regionu wystarczająco szybko. Spróbuj jeszcze raz za kilka minut.
 	</notification>
+	<notification name="preexisting_tport">
+		Przepraszamy, ale system nie mógł zainicjować teleportacji. Spróbuj jeszcze raz za kilka minut.
+	</notification>
 	<notification name="no_host">
 		Nie można znaleźć miejsca docelowego. To miejsce może być chwilowo nieosiągalne albo przestało istnieć. Spróbuj jeszcze raz za kilka minut.
 	</notification>
@@ -937,13 +1099,16 @@ Zazwyczaj jest to tymczasowy problem. Możesz kontynuować modyfikacje i zapisa
 	<notification name="YouHaveBeenLoggedOut">
 		Nastąpiło wylogowanie z [SECOND_LIFE]
 [MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pokaż IM/czat" />
+		<usetemplate name="okcancelbuttons" notext="Zakończ" yestext="Pokaż IM/czat" />
+	</notification>
+	<notification name="InventoryUnusable">
+		Wystąpił problem podczas ładowania szafy. Spróbuj się wylogować i zalogować ponownie. Jeśli zobaczysz ten komunikat jeszcze raz, to skontaktuj się z pomocą techniczną, aby rozwiązać problem.
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
 		Nie możesz kupić działek dla grupy.
 Nie masz praw kupowania działek dla Twojej aktywnej grupy.
 	</notification>
-	<notification label="Add Friend" name="AddFriendWithMessage">
+	<notification label="Dodaj znajomego" name="AddFriendWithMessage">
 		Znajomi mogą pozwalać na odnajdywanie się wzajemnie na mapie i na otrzymywanie informacji o statusie online.
 
 Zaproponować znajomość [NAME]?
@@ -1006,6 +1171,18 @@ do
 	</notification>
 	<notification label="Zmień nazwę stroju" name="RenameOutfit">
 		Nowa nazwa stroju:
+		<form name="form">
+			<button name="Cancel" text="Anuluj"/>
+		</form>
+	</notification>
+	<notification label="Zmień nazwę gestu" name="RenameGesture">
+		Nowa nazwa gestu:
+		<form name="form">
+			<button name="Cancel" text="Anuluj"/>
+		</form>
+	</notification>
+	<notification label="Zmień nazwę Landmarka" name="RenameLandmark">
+		Wybierz nową nazwę dla [NAME]
 		<form name="form">
 			<button name="Cancel" text="Anuluj" />
 		</form>
@@ -1127,7 +1304,7 @@ Wybierz mniejszy obszar i spróbuj jeszcze raz.
 		Po przekazaniu tej działki grupa będzie musiała mieć i utrzymywać wystarczający kredyt na używanie działki.
 Cena zakupu działki nie jest zwracana właścicielowi. Jeżeli przekazana działka zostanie sprzedana, cena sprzedaży zostanie podzielona pomiędzy członków grupy.
 
-Przekazać tą działkę o powierzchni [AREA] m² grupie &apos;[GROUP_NAME]&apos;?
+Przekazać tą działkę o powierzchni [AREA] m² grupie &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DeedLandToGroupWithContribution">
@@ -1135,7 +1312,7 @@ Przekazać tą działkę o powierzchni [AREA] m² grupie &apos;[GROUP_NAME]&apos
 Przekazanie będzie zawierać równoczesne przypisanie działki do grupy od &apos;[NAME]&apos;.
 Cena zakupu działki nie jest zwracana właścicielowi. Jeżeli przekazana działka zostanie sprzedana, cena sprzedaży zostanie podzielona pomiędzy członków grupy.
 
-Przekazać tą działkę o powierzchni [AREA] m² grupie &apos;[GROUP_NAME]&apos;?
+Przekazać tą działkę o powierzchni [AREA] m² grupie &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DisplaySetToSafe">
@@ -1169,12 +1346,32 @@ Możesz normalnie używać [SECOND_LIFE], inni użytkownicy będą Cię widzieli
 			<ignore name="ignore" text="Ładowanie ubrań nadal trwa" />
 		</form>
 	</notification>
+	<notification name="AgentComplexityWithVisibility">
+		Twój [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 stopień złożoności awatara] to [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+		<usetemplate ignoretext="Ostrzegaj mnie, gdy stopień złożoności mojego awatara jest zbyt wysoki" name="notifyignore" />
+	</notification>
+	<notification name="AgentComplexity">
+		Twój [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 stopień złożoności awatara] to [AGENT_COMPLEXITY].
+		<usetemplate ignoretext="Ostrzegaj mnie, gdy zmienia się stopień złożoności mojego awatara" name="notifyignore"/>
+	</notification>
+	<notification name="HUDComplexityWarning">
+		[HUD_REASON]. Bardzo prawdopodobne, że wpłynie to negatywnie na Twoją wydajność.
+		<usetemplate ignoretext="Ostrzegaj mnie, gdy stopień złożoności moich dodatków HUD jest zbyt wysoki" name="notifyignore"/>
+	</notification>
 	<notification name="FirstRun">
 		Instalacja [APP_NAME] zakończona.
 
 Jeżeli używasz [SECOND_LIFE] po raz pierwszy to musisz stworzyć konto żeby móc się zalogować.
 		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Stwórz konto..." />
 	</notification>
+	<notification name="LoginCantRemoveUsername">
+		Zapamiętany użytkownik może zostać zapomniany w Awatar &gt; Ustawienia &gt; Zaawansowane &gt; Zapamiętani użytkownicy.
+	</notification>
+	<notification name="LoginCantRemoveCurUsername">
+		Zapomnienie zalogowanego użytkownika wymaga jego wylogowania.
+		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Potwierdź i wyloguj się" />
+	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Problemy z połączeniem. Problem może być spowodowany Twoim połączeniem z Internetem albo może istnieć po stronie [SECOND_LIFE_GRID].
 
@@ -1184,6 +1381,18 @@ Możesz sprawdzić swoje połączenie z Internetem i spróbować ponownie za kil
 			<button name="Teleport" text="Teleportuj" />
 		</form>
 	</notification>
+	<notification name="LoginPacketNeverReceivedNoTP">
+		Problemy z połączeniem. Problem może być spowodowany Twoim połączeniem z Internetem albo może istnieć po stronie [SECOND_LIFE_GRID].
+
+Możesz sprawdzić swoje połączenie z Internetem i spróbować ponownie za kilka minut lub połączyć się ze stroną pomocy technicznej [SUPPORT_SITE].
+		<form name="form">
+			<button name="Help" text="Pomoc"/>
+		</form>
+	</notification>
+	<notification name="LoginRemoveMultiGridUserData">
+		Usuwane Dane Lokalne są współużytkowane przez wiele światów, czy na pewno chcesz je usunąć?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Potwierdź" />
+	</notification>
 	<notification name="WelcomeChooseSex">
 		Twoja postać pojawi się za moment.
 
@@ -1193,7 +1402,11 @@ Wybierz awatara właściwej płci. Ten wybór będzie można później zmienić.
 		<usetemplate name="okcancelbuttons" notext="Kobieta" yestext="Mężczyzna" />
 	</notification>
 	<notification name="CantTeleportToGrid">
-		Nie można teleportować do [SLURL], ponieważ jest na innej siatce ([GRID]) niż obecna siatka ([CURRENT_GRID]). Proszę zamknąć przeglądarkę i spróbować ponownie.
+		Nie można teleportować do [SLURL], ponieważ jest w innym świecie ([GRID]) niż obecny ([CURRENT_GRID]). Proszę zamknąć przeglądarkę i spróbować ponownie.
+	</notification>
+	<notification name="GeneralCertificateErrorShort">
+		Połączenie z serwerem nie mogło zostać nawiązane.
+[REASON]
 	</notification>
 	<notification name="GeneralCertificateError">
 		Połączenie z serwerem nie mogło zostać nawiązane.
@@ -1208,7 +1421,6 @@ Odcisk palca SHA1: [MD5_DIGEST]
 Użycie klucza: [KEYUSAGE]
 Rozszerzone użycie klucza: [EXTENDEDKEYUSAGE]
 Identyfikator klucza podmiotu: [SUBJECTKEYIDENTIFIER]
-		
 	</notification>
 	<notification name="TrustCertificateError">
 		Wydawca certyfikatu dla tego serwera nie jest znany.
@@ -1254,6 +1466,10 @@ Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
 		Teleportować wszystkich Rezydentów z tego regionu do ich miejsc startu?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
+	<notification name="ChangeObjectBonusFactor">
+		Obniżenie limitu obiektów bonusowych po tym, gdy konstrukcje zostały już poustawiane w regionie może spowodować, że część z nich może zostać zwrócona lub usunięta. Na pewno chcesz zmienić tą wartość?
+		<usetemplate ignoretext="Potwierdź zmianę mnożnika obiektów bonusowych" name="okcancelignore" notext="Anuluj"/>
+	</notification>
 	<notification name="EstateObjectReturn">
 		Na pewno chcesz odesłać wszystkie obiekty należące do [USER_NAME]?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
@@ -1262,21 +1478,25 @@ Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
 		Nie można ustawić tekstur regionu:
 Tekstura terenu [TEXTURE_NUM] ma niewłaściwą głębię koloru - [TEXTURE_BIT_DEPTH].
 
-Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze 1024x1024 lub mniejszą i ponownie kliknij na &quot;Zastosuj&quot;.
+Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze [MAX_SIZE]x[MAX_SIZE] lub mniejszą i ponownie kliknij na &quot;Zastosuj&quot;.
 	</notification>
 	<notification name="InvalidTerrainSize">
 		Nie można ustawić tekstur regionu:
 Tekstura terenu [TEXTURE_NUM] jest za duża - [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 
-Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze 1024x1024 lub mniejszą i ponownie kliknij na &quot;Zastosuj&quot;.
+Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze [MAX_SIZE]x[MAX_SIZE] lub mniejszą i ponownie kliknij na &quot;Zastosuj&quot;.
 	</notification>
 	<notification name="RawUploadStarted">
-		Ładowanie rozpoczęte. Może potrwać do dwóch minut zależnie od prędkości Twojego połączenia.
+		Przesyłanie rozpoczęte. Może potrwać do dwóch minut zależnie od prędkości Twojego połączenia.
 	</notification>
 	<notification name="ConfirmBakeTerrain">
 		Na pewno chcesz zapisać obecne ukształtowanie terenu jako punkt odniesienia dla górnego i dolnego limitu terenu oraz jako domyślną wartość dla opcji &apos;Odtwórz&apos;?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
+	<notification name="ConfirmTextureHeights">
+		Zamierzasz użyć wartości 'niższych' większych niż 'wyższe' dla zakresów elewacji. Chcesz kontynuować?
+		<usetemplate name="yesnocancelbuttons" notext="Anuluj" canceltext="Nie pytaj" />
+	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Maksymalna liczba Rezydentów wynosi [MAX_AGENTS].
 	</notification>
@@ -1295,7 +1515,34 @@ Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze 1024x1024 lub
 		Możesz mieć maksymalnie [MAX_MANAGER] zarządców Majątku.
 	</notification>
 	<notification name="OwnerCanNotBeDenied">
-		Nie możesz dodać właściciela majątku do listy &apos;Niepożądanych Rezydentów (banów)&apos; majątku.
+		Nie możesz dodać właściciela Majątku do listy &apos;Niepożądanych Rezydentów (banów)&apos; Majątku.
+	</notification>
+	<notification name="ProblemAddingEstateManagerBanned">
+		Nie możesz dodać zbanowanego rezydenta do listy zarządców Majątku.
+	</notification>
+	<notification name="ProblemBanningEstateManager">
+		Nie można dodać zarządcy Majątku [AGENT] do listy zbanowanych.
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; już jest na liście dostępu grup.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] już jest na Twojej liście: [LIST_TYPE].
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] już są na Twojej liście: [LIST_TYPE].
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] został/a dodany/a do listy: [LIST_TYPE] w: [ESTATE].
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] zostali dodani do listy: [LIST_TYPE] w: [ESTATE].
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] został/a usunięty/a z listy: [LIST_TYPE] w: [ESTATE].
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] zostali usunięci z listy: [LIST_TYPE] w: [ESTATE].
 	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Nie możesz zmienić wyglądu podczas ładowania ubrań i kształtu.
@@ -1311,133 +1558,36 @@ Wybierz obiekt na sprzedaż i spróbuj jeszcze raz.
 		Plik surowego terenu pobrany do:
 [DOWNLOAD_PATH].
 	</notification>
-	<notification name="DownloadWindowsMandatory">
-		Nowa wersja [APP_NAME] została opublikowana.
-[MESSAGE]
-Musisz zainstalować nową wersję żeby używać [APP_NAME].
-		<usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pobierz" />
-	</notification>
-	<notification name="DownloadWindows">
-		Uaktualniona wersja [APP_NAME] została opublikowana.
-[MESSAGE]
-Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
-		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
+	<notification name="RequiredUpdate">
+		Do zalogowania się wymagana jest wersja [VERSION].
+Pobierz ją z https://secondlife.com/support/downloads/
 	</notification>
-	<notification name="DownloadWindowsReleaseForDownload">
-		Uaktualniona wersja [APP_NAME] została opublikowana.
-[MESSAGE]
-Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
-		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
-	</notification>
-	<notification name="DownloadLinuxMandatory">
-		Nowa wersja [APP_NAME] jest dostępna.
-[MESSAGE]
-Musisz pobrać aktualizację aby korzystać z [APP_NAME].
-		<usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pobierz" />
-	</notification>
-	<notification name="DownloadLinux">
-		Aktualizacja [APP_NAME] jest dostępna.
-[MESSAGE]
-Ta aktualizacja nie jest wymagana, ale zaleca się jej instalację w celu poprawienia wydajności i stabilności.
-		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
-	</notification>
-	<notification name="DownloadLinuxReleaseForDownload">
-		Uaktualniona wersja [APP_NAME]została opublikowana.
-[MESSAGE]
-Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
-		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
+	<notification name="PauseForUpdate">
+		Do zalogowania się wymagana jest wersja [VERSION].
+Informacje o wydaniu: [URL]
+
+Kliknij OK, aby pobrać i zainstalować.
 	</notification>
-	<notification name="DownloadMacMandatory">
-		Nowa wersja [APP_NAME] została opublikowana.
-[MESSAGE]
-Musisz zainstalować nową wersję żeby używać [APP_NAME].
+	<notification name="OptionalUpdateReady">
+		Wersja [VERSION] została pobrana i jest gotowa do zainstalowania.
+Informacje o wydaniu: [URL]
 
-Pobrać i zapisać w folderze Aplikacje?
-		<usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pobierz" />
+Kliknij OK, aby zainstalować.
 	</notification>
-	<notification name="DownloadMac">
-		Uaktualniona wersja [APP_NAME] została opublikowana.
-[MESSAGE]
-Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
+	<notification name="PromptOptionalUpdate">
+		Wersja [VERSION] została pobrana i jest gotowa do zainstalowania.
+Informacje o wydaniu: [URL]
 
-Pobrać i zapisać w folderze Aplikacje?
-		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
+Kontynuować?
+		<usetemplate canceltext="Nie teraz" name="yesnocancelbuttons" notext="Pomiń" yestext="Instaluj" />
 	</notification>
-	<notification name="DownloadMacReleaseForDownload">
-		Uaktualniona wersja [APP_NAME] została opublikowana.
-[MESSAGE]
-Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
-
-Pobrać i zapisać w folderze Aplikacje?
-		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
-	</notification>
-	<notification name="FailedUpdateInstall">
-		Podczas aktualizacji pojawił się błąd.
-Proszę pobrać i zainstalować najnowszego klienta z
-http://secondlife.com/download
-	</notification>
-	<notification name="FailedRequiredUpdateInstall">
-		Nie można zainstalować wymaganej aktualizacji.
-Nie będzie można zalogować się dopóki [APP_NAME] nie zostanie zaktualizowana.
-Proszę pobrać i zainstalować najnowszą wersję z
-http://secondlife.com/download
-		<usetemplate name="okbutton" yestext="Wyjdź" />
-	</notification>
-	<notification name="UpdaterServiceNotRunning">
-		Istnieje obowiązkowa aktualizacja dla Second Life.
-Możesz ją pobrać z http://www.secondlife.com/downloads
-lub zainstalować teraz.
-		<usetemplate name="okcancelbuttons" notext="Opuść Second Life" yestext="Pobierz i instaluj teraz" />
-	</notification>
-	<notification name="DownloadBackgroundTip">
-		Aktualizacja dla [APP_NAME] została pobrana.
-Wersja [VERSION] [[INFO_URL] Informacja o tej aktualizacji]
-		<usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i restartuj [APP_NAME]" />
-	</notification>
-	<notification name="DownloadBackgroundDialog">
-		Aktualizacja [APP_NAME] została pobrana.
-Wersja [VERSION] [[INFO_URL] Informacja o aktualizacji]
-		<usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i restartuj [APP_NAME]" />
-	</notification>
-	<notification name="RequiredUpdateDownloadedVerboseDialog">
-		Pobrano wymaganą aktualizację.
-Wersja [VERSION] [[INFO_URL] Informacje o tej aktualizacji]
-
-W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
-	</notification>
-	<notification name="RequiredUpdateDownloadedDialog">
-		W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
-[[INFO_URL] Informacje o tej aktualizacji]
-	</notification>
-	<notification name="OtherChannelDownloadBackgroundTip">
-		Została pobrana aktualizacja dla Twojej instalacji [APP_NAME].
-Wersja [VERSION]
-Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
-		<usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i zrestartuj [APP_NAME]" />
-	</notification>
-	<notification name="OtherChannelDownloadBackgroundDialog">
-		Została pobrana aktualizacja dla Twojej instalacji [APP_NAME].
-Wersja [VERSION]
-Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
-		<usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i zrestartuj [APP_NAME]" />
-	</notification>
-	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
-		Została pobrana wymagana aktualizacja.
-Wersja [VERSION]
-Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
-
-W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
-	</notification>
-	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
-		W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
-Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
+	<notification name="LoginFailedUnknown">
+		Przepraszamy, ale nie udało się zalogować - powód jest nieznany.
+Jeśli ciągle widzisz tą wiadomość sprawdź [SUPPORT_SITE].
+		<usetemplate name="okbutton" yestext="Wyjdź"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
-		Przekazanie tego obiektu spowoduje, że grupa:
+		Przypisanie tego obiektu spowoduje, że grupa:
 * Otrzyma L$ zapłacone temu obiektowi
 		<usetemplate ignoretext="Potwierdź decyzję przypisania obiektu do grupy" name="okcancelignore" notext="Anuluj" yestext="Przekaż" />
 	</notification>
@@ -1489,14 +1639,11 @@ Chcesz ją opuścić?
 		Nie możesz opuścić tej grupy, ponieważ jesteś ostatnim z jej właścicieli. Przydziel najpierw innemu użytkownikowi rolę właściciela.
 	</notification>
 	<notification name="GroupDepartError">
-		Nie można opuścić grupy: [reason].
-	</notification>
-	<notification name="GroupDepart">
-		Opuściłeś/aś grupę [group_name].
+		Nie możesz opuścić tej grupy.
 	</notification>
 	<notification name="ConfirmKick">
-		Na pewno chcesz wyrzucić wszystkich Rezydentów z siatki?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Wyrzuć Rezydentów" />
+		Na pewno chcesz wyrzucić wszystkich Rezydentów ze świata?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Wyrzuć Rezydentów"/>
 	</notification>
 	<notification name="MuteLinden">
 		Przepraszamy, ale nie możesz zablokować Lindena.
@@ -1520,8 +1667,7 @@ Chcesz ją opuścić?
 	<notification name="DoNotDisturbModeSet">
 		Tryb Zajętości jest włączony. Nie będziesz powiadamiany/a o nadchodzących rozmowach.
 
-- Inni Rezydenci będą otrzymywać Twoją wiadomość Trybu Zajętości (Ustawienia &gt; Prywatność &gt; Autoodpowiedzi).
-- Propozycje teleportacji będą odrzucane.
+- Inni Rezydenci będą otrzymywać Twoją wiadomość Trybu Zajętości (Ustawienia &gt; Ogólne).
 - Propozycje rozmów głosowych będą odrzucane.
 		<usetemplate ignoretext="Status zmieniony na Tryb Zajętości" name="okignore" />
 	</notification>
@@ -1533,6 +1679,17 @@ Chcesz ją opuścić?
 	<notification name="JoinedTooManyGroups">
 		Należysz już do maksymalnej ilości grup. Opuść proszę przynajmniej jedną grupę żeby przyjąć członkostwo w tej grupie, albo odmów.
 	</notification>
+	<notification name="GroupLimitInfo">
+		Rezydenci z członkostwem podstawowym mogą dołączyć do [MAX_BASIC] grup.
+Członkostwo premium pozwala na [MAX_PREMIUM]. [https://secondlife.com/my/account/membership.php? Dowiedz się więcej]
+		<usetemplate name="okbutton" yestext="Zamknij" />
+	</notification>
+	<notification name="GroupLimitInfoPlus">
+		Rezydenci z członkostwem podstawowym mogą dołączyć do [MAX_BASIC] grup.
+Członkostwo premium pozwala na [MAX_PREMIUM]. Członkostwo
+Premium Plus pozwala na [MAX_PREMIUM_PLUS]. [https://secondlife.com/my/account/membership.php? Dowiedz się więcej]
+		<usetemplate name="okbutton" yestext="Zamknij" />
+	</notification>
 	<notification name="KickUser">
 		Wyrzuć tego Rezydenta, wysyłając następujący komunikat.
 		<form name="form">
@@ -1543,7 +1700,7 @@ Chcesz ją opuścić?
 		</form>
 	</notification>
 	<notification name="KickAllUsers">
-		Z jakim komunikatem wyrzucić wszystkich użytkowników z regionu?
+		Z jakim komunikatem wyrzucić wszystkich użytkowników ze świata?
 		<form name="form">
 			<input name="message">
 				Administrator wylogował Cię.
@@ -1644,7 +1801,7 @@ co przekracza limit [LIMIT].
 	<notification name="TeleportViaSLAPP">
 		Na pewno chcesz się teleportować do &lt;nolink&gt;[LOCATION]&lt;/nolink&gt;?
 		<usetemplate ignoretext="Potwierdź próbę teleportacji przez SLAPP" name="okcancelignore" notext="Anuluj" yestext="Teleportuj" />
-	</notification>	
+	</notification>
 	<notification name="TeleportToPick">
 		Teleportować do [PICK]?
 		<usetemplate ignoretext="Potwierdź, że chcesz teleportować się do miejsca w Ulubionych" name="okcancelignore" notext="Anuluj" yestext="Teleportuj" />
@@ -1674,7 +1831,7 @@ Kontynuować?
 	<notification label="Zmiana dostępu do Majątku Lindenów" name="ChangeLindenAccess">
 		Dokonujesz zmiany w liście dostępu Regionu głównego należącego do Lindenów (Regiony Główne, Teen Grid, Orientacja).
 
-Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie i powinna być używana wyłącznie w celu zablokowania opcji pozwalającej na przeniesienie obiektów/L$ do/z sieci.
+Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie i powinna być używana wyłącznie w celu zablokowania opcji pozwalającej na przeniesienie obiektów/L$ do/ze świata.
 Dodatkowo, zmiany dokonane w Regionie Głównym mogą spowodować problemy przestrzeni serwerowej innych regionów.
 
 Kontynuować?
@@ -1712,6 +1869,30 @@ Kontynuować?
 		Usunąć zarządcę majątku tylko z tego majątku czy z [ALL_ESTATES]?
 		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek" />
 	</notification>
+	<notification label="Wybierz Majątek" name="EstateAllowedExperienceAdd">
+		Dodać do listy dostępu tylko do tego majątku czy do [ALL_ESTATES]?
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/>
+	</notification>
+	<notification label="Wybierz Majątek" name="EstateAllowedExperienceRemove">
+		Usunąć z listy dostępu tylko z tego majątku czy do [ALL_ESTATES]?
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/>
+	</notification>
+	<notification label="Wybierz Majątek" name="EstateBlockedExperienceAdd">
+		Zablokować dostęp tylko dla tego majątku czy dla [ALL_ESTATES]?
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/>
+	</notification>
+	<notification label="Wybierz Majątek" name="EstateBlockedExperienceRemove">
+		Odblokować dostęp tylko dla tego majątku czy dla [ALL_ESTATES]?
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/>
+	</notification>
+	<notification label="Wybierz Majątek" name="EstateTrustedExperienceAdd">
+		Dodać do listy kluczy tylko dla tego majątku czy dla [ALL_ESTATES]?
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/>
+	</notification>
+	<notification label="Wybierz Majątek" name="EstateTrustedExperienceRemove">
+		Usunąć z listy kluczy tylko dla tego majątku czy dla [ALL_ESTATES]?
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/>
+	</notification>
 	<notification label="Potwierdź Wyrzucenie" name="EstateKickUser">
 		Wyrzucić [EVIL_USER] z tego majątku?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
@@ -1720,8 +1901,18 @@ Kontynuować?
 		Na pewno chcesz zmienić treść umowy dla tego majątku?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
+	<notification name="EstateParcelAccessOverride">
+		Odznaczenie tej opcji może usunąć ograniczenia nadane przez właścicieli działek w celu zapobiegania dokuczaniu, zachowaniu prywatności lub aby chronić nieletnich przed materiałami dla dorosłych. Porozmawiaj z właścicielami działek, jeśli to konieczne.
+	</notification>
+	<notification name="EstateParcelEnvironmentOverride">
+		(Zmiana w całym majątku: [ESTATENAME]) Odznaczenie tej opcji spowoduje usunięcie wszelkich niestandardowych otoczeń, które zostały dodane do działek przez ich właścicieli. Przedyskutuj zmianę z właścicielami działek w razie potrzeby.
+Czy chcesz kontynuować?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
+	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Region, który próbujesz odwiedzić zawiera treści przekraczające Twoje bieżące preferencje. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne.
+		Region, który próbujesz odwiedzić, ma klasyfikację treści przekraczającą Twoje maksymalne preferencje. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne.
+
+Pełne informacje na temat klasyfikacji treści można znaleźć [https://community.secondlife.com/knowledgebase/english/maturity-ratings-r52/ tutaj].
 	</notification>
 	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
 		Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], które są dostępne tylko dla dorosłych.
@@ -1745,7 +1936,9 @@ Kontynuować?
 		Mamy trudności techniczne z Twoim wejściem w region, ponieważ Twoje preferencje są rozsynchronizowane z serwerem.
 	</notification>
 	<notification name="TeleportEntryAccessBlocked">
-		Region, który próbujesz odwiedzić zawiera treści przekraczające Twoje bieżące preferencje. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne.
+		Region, który próbujesz odwiedzić, ma klasyfikację treści przekraczającą Twoje maksymalne preferencje. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne.
+
+Pełne informacje na temat klasyfikacji treści można znaleźć [https://community.secondlife.com/knowledgebase/english/maturity-ratings-r52/ tutaj].
 	</notification>
 	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
 		Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], które są dostępne tylko dla dorosłych.
@@ -1777,7 +1970,7 @@ Kontynuować?
 		Mamy trudności techniczne z Twoim teleportem, ponieważ Twoje preferencje są rozsynchronizowane z serwerem.
 	</notification>
 	<notification name="RegionTPSpecialUsageBlocked">
-		Nie można wejść do tego regionu. '[REGION_NAME]' jest miejscem z grami (Skill Gaming Region) - musisz spełnić określone wymagania, jeśli chcesz go odwiedzić. Aby dowiedzieć się więcej zapoznaj się z [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+		Nie można wejść do tego regionu. '[REGION_NAME]' jest miejscem z grami (Skill Gaming Region) - musisz spełnić określone wymagania, jeśli chcesz go odwiedzić. Aby dowiedzieć się więcej zapoznaj się z [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Second_Life_Skill_Gaming_FAQ Skill Gaming FAQ].
 	</notification>
 	<notification name="PreferredMaturityChanged">
 		Nie będziesz już otrzymywać żadnych powiadomień związanych z odwiedzaniem regionów z treściami [RATING]. Możesz zmienić swoją preferencję treści w przyszłości używając Ja &gt; Ustawienia &gt; Ogólne w pasku menu.
@@ -1787,6 +1980,8 @@ Kontynuować?
 	</notification>
 	<notification name="LandClaimAccessBlocked">
 		Ziemia, którą próbujesz odzyskać ma klasyfikację treści przekraczającą Twoje obecne preferencje treści. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne w pasku menu.
+
+Pełne informacje na temat klasyfikacji treści można znaleźć [https://community.secondlife.com/knowledgebase/english/maturity-ratings-r52/ tutaj].
 	</notification>
 	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
 		Tylko dorośli mogą odzyskać tą ziemię.
@@ -1808,6 +2003,8 @@ Kontynuować?
 	</notification>
 	<notification name="LandBuyAccessBlocked">
 		Ziemia, którą próbujesz kupić ma klasyfikację treści przekraczającą Twoje obecne preferencje treści. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne w pasku menu.
+
+Pełne informacje na temat klasyfikacji treści można znaleźć [https://community.secondlife.com/knowledgebase/english/maturity-ratings-r52/ tutaj].
 	</notification>
 	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
 		Tylko dorośli mogą kupić tą ziemię.
@@ -1830,6 +2027,9 @@ Kontynuować?
 	<notification name="TooManyPrimsSelected">
 		Zbyt wiele wybranych obiektów. Wybierz [MAX_PRIM_COUNT] lub mniej i spróbuj ponownie
 	</notification>
+	<notification name="TooManyScriptsSelected">
+		Zbyt wiele skryptów w wybranych obiektach. Wybierz mniej obiektów i spróbuj ponownie
+	</notification>
 	<notification name="ProblemImportingEstateCovenant">
 		Problem z importem umowy majątku.
 	</notification>
@@ -1956,7 +2156,6 @@ Wpisz hasło ponownie i kliknij na OK.
 	<notification name="SetPickLocation">
 		Uwaga:
 Lokalizacja tego miejsca została zaktualizowana, ale pozostałe szczegóły zachowają oryginalne wartości.
-		
 	</notification>
 	<notification name="MoveInventoryFromObject">
 		Wybrane obiekty Szafy nie mają praw kopiowania.
@@ -1986,6 +2185,9 @@ Przenieść obiekty szafy?
 	<notification name="PayObjectFailed">
 		Płatność nie powiodła się: nie można znaleźć obiektu.
 	</notification>
+	<notification name="PaymentBlockedButtonMismatch">
+		Płatność nie powiodła się: zapłacona suma nie pasuje do żadnego z przycisków płatności dla tego obiektu.
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		W tym obiekcie nie ma elementów które możesz skopiować.
 	</notification>
@@ -1998,8 +2200,8 @@ Przenieść obiekty szafy?
 		<usetemplate ignoretext="Potwierdź dodanie uczestników rozmowy" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmQuit">
-		Na pewno chcesz zakończyć?
-		<usetemplate ignoretext="Na pewno chcesz zakończyć?" name="okcancelignore" notext="Nie kończ" yestext="Wyłącz" />
+		Na pewno chcesz zakończyć sesję i wyłączyć przeglądarkę?
+		<usetemplate ignoretext="Na pewno chcesz zakończyć sesję?" name="okcancelignore" notext="Anuluj" yestext="Zakończ"/>
 	</notification>
 	<notification name="ConfirmRestoreToybox">
 		Ta akcja przywróci domyślny układ przycisków i pasków.
@@ -2015,12 +2217,24 @@ Nie możesz tego cofnąć.
 	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
-		<usetemplate ignoretext="Potwierdź, że na pewno chcesz skasować obiekty" name="okcancelignore" notext="Anuluj" />
+		<form name="form">
+			<ignore name="ignore" text="Potwierdź przed kasowaniem obiektów" />
+			<button name="No" text="Anuluj" />
+		</form>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Używaj tej opcji do zgłaszania nadużyć [http://secondlife.com/corporate/tos.php Warunków Umowy (Terms of Service)] i [http://secondlife.com/corporate/cs.php Standardów Społeczeństwa (Community Standards)].
+	<notification name="DeleteFilteredItems">
+		Twoja Szafa jest obecnie filtrowana i nie wszystkie obiekty jakie masz zamiar usunąć są teraz widoczne.
 
-Wszystkie zgłoszone nadużycia są badane i rozwiązywane.
+Czy na pewno chcesz je skasować?
+		<usetemplate ignoretext="Potwierdź przed kasowaniem filtrowanych obiektów" name="okcancelignore" notext="Anuluj" />
+	</notification>
+	<notification name="ConfirmUnlink">
+		To duże zaznaczenie z wieloma zestawami obiektów. Jeśli rozłączysz, to ponowne połączenie może nie być możliwe. Możesz chcieć na wszelki wypadek wziąć kopie zestawów obiektów do swojej szafy.
+		<usetemplate ignoretext="Potwierdź podczas rozłączania zestawu obiektów" name="okcancelignore" notext="Anuluj" yestext="Rozłącz" />
+	</notification>
+	<notification name="HelpReportAbuseConfirm">
+		Dziękujemy za poświęcenie czasu na poinformowanie nas o tym problemie.
+Przejrzymy Twoje zgłoszenie pod kątem ewentualnych nadużyć i podejmiemy odpowiednią akcję.
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Wybierz kategorię dla tego raportu o nadużyciu.
@@ -2048,7 +2262,7 @@ Dokładne dane pomogą nam w klasyfikacji i przetwarzaniu raportu.
 
 Jeżeli składasz raport dotyczący naruszenia praw autorskich proszę się upewnić, że robisz to poprawnie:
 
-(1) Przypadek Nadużycia. Możesz złożyć raport jeżeli sądzisz, że Rezydent narusza system przywilejów [SECOND_LIFE], na przykład używając CopyBot lub podobnych narzędzi robiących kopie, naruszając prawa autorskie. Komisja Nadużyć bada wykroczenia i stosuje akcje dyscyplinarne za zachowania sprzeczne z zasadami [http://secondlife.com/corporate/tos.php Warunków Umowy] i [http://secondlife.com/corporate/cs.php Standardów Społeczeństwa] w [SECOND_LIFE]. Komisja Nadużyć nie zajmuje się i nie odpowiada na żądania usunięcia treści ze środowiska [SECOND_LIFE].
+(1) Przypadek Nadużycia. Możesz złożyć raport jeżeli sądzisz, że Rezydent narusza system przywilejów [SECOND_LIFE], na przykład używając CopyBot lub podobnych narzędzi robiących kopie, naruszając prawa autorskie. Komisja Nadużyć bada wykroczenia i stosuje akcje dyscyplinarne za zachowania sprzeczne z zasadami Warunków Umowy [http://secondlife.com/corporate/tos.php Warunków Umowy] i [http://secondlife.com/corporate/cs.php Standardów Społeczeństwa] w [SECOND_LIFE]. Komisja Nadużyć nie zajmuje się i nie odpowiada na żądania usunięcia treści ze środowiska [SECOND_LIFE].
 
 (2) Przypadek DMCA lub Usuwanie Treści. Aby wystąpić z żądaniem o usunięcie treści ze środowiska [SECOND_LIFE] MUSISZ przedłożyć ważne zawiadomienie o nadużyciu zgodne z naszą polityką DMCA [http://secondlife.com/corporate/dmca.php DMCA Policy].
 
@@ -2084,13 +2298,31 @@ Chcesz wyłączyć Tryb Zajętości przed zakończeniem tej transakcji?
 			<button ignore="Nigdy nie wyłączaj trybu Zajętości" name="No" text="Anuluj" />
 		</form>
 	</notification>
+	<notification label="Działka odtwarza media" name="ParcelPlayingMedia">
+		Ta lokalizacja odtwarza media:
+[URL]
+Czy chcesz je odtworzyć?
+		<form name="form">
+			<ignore name="ignore" text="Zawsze wybieraj tę opcję dla tej ziemi."/>
+			<button ignore="Odtwarzaj media" name="Yes" text="Odtwarzaj"/>
+			<button ignore="Ignoruj media" name="No" text="Nie odtwarzaj"/>
+		</form>
+	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
 		Ten folder &apos;[FOLDERNAME]&apos; to folder systemowy. Usunięcie folderu systemowego spowoduje niestabilność. Czy na pewno chcesz go skasować?
 		<usetemplate ignoretext="Potwierdź zanim folder systemu zostanie skasowany" name="okcancelignore" notext="Anuluj" />
 	</notification>
+	<notification name="PurgeSelectedItems">
+		[COUNT] przedmiotów zostanie usuniętych. Na pewno chcesz permanentnie usunąć zaznaczoną zawartość Kosza?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
+	</notification>
 	<notification name="ConfirmEmptyTrash">
-		Na pewno chcesz permanentnie usunąć zawartość Kosza?
-		<usetemplate ignoretext="Potwierdź przed usunięciem zawartości Kosza" name="okcancelignore" notext="Anuluj" />
+		[COUNT] przedmiotów i folderów zostanie usuniętych. Na pewno chcesz permanentnie usunąć zawartość Kosza?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
+	</notification>
+	<notification name="TrashIsFull">
+		Twój kosz się przepełnia. Może to sprawić, że będziesz mieć problemy z zalogowaniem się.
+		<usetemplate name="okcancelbuttons" notext="Wyczyszczę kosz ręcznie później" yestext="Sprawdź kosz teraz" />
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Na pewno chcesz wyczyścić bufory przeglądarki internetowej, wyszukiwania i podróży?
@@ -2112,6 +2344,12 @@ Chcesz wyłączyć Tryb Zajętości przed zakończeniem tej transakcji?
 		Na pewno chcesz permanentnie usunąć zawartość Twojego folderu Zagubione i odnalezione?
 		<usetemplate ignoretext="Potwierdź przed usunięciem zawartości foldera Zagubione i odnalezione" name="okcancelignore" notext="Nie" yestext="Tak" />
 	</notification>
+	<notification name="ConfirmReplaceLink">
+		Zamierzasz zastąpić link do części ciała o typie '[TYPE]' elementem, który nie pasuje do tego typu.
+
+Na pewno chcesz kontynuować?
+		<usetemplate ignoretext="Potwierdź przed zamianą linku" name="okcancelignore" notext="Nie" yestext="Tak" />
+	</notification>
 	<notification name="CopySLURL">
 		Następujący link SLurl został skopiowany do schowka:
 [SLURL]
@@ -2132,7 +2370,15 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
 		Ten plik cyklu dziennego używa brakującego pliku nieba: [SKY].
 	</notification>
 	<notification name="WLRegionApplyFail">
-		Ustawienia nie mogą zostać zastosowane w regionie. Opuszczenie regionu, a następnie powrócenie do niego może naprawić problem. Powód: [FAIL_REASON]
+		Ustawienia nie mogą zostać zastosowane w regionie. Powód: [FAIL_REASON]
+	</notification>
+	<notification name="WLLocalTextureDayBlock">
+		Lokalna tekstura jest używana na ścieżce [TRACK], klatce #[FRAMENO] ([FRAME]%) w polu [FIELD].
+Otoczenia nie mogą zostać zapisane gdy lokalne tekstury są w użyciu.
+	</notification>
+	<notification name="WLLocalTextureFixedBlock">
+		Lokalna tekstura jest używana w polu [FIELD].
+Otoczenia nie mogą zostać zapisane gdy lokalne tekstury są w użyciu.
 	</notification>
 	<notification name="EnvCannotDeleteLastDayCycleKey">
 		Nie można usunąć ostatniego klucza w cyklu dnia, bo nie może on być pusty. Zmodyfikuj ten klucz zamiast go usuwać, a potem dodaj nowy.
@@ -2182,13 +2428,10 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
 		Ciąg [STRING_NAME] nie został znaleziony w strings.xml
 	</notification>
 	<notification name="Cancelled">
-		Anulowane
-	</notification>
-	<notification name="CancelledSit">
-		Siadanie anulowane
+		Anulowane.
 	</notification>
 	<notification name="CancelledAttach">
-		Dołączanie anulowane
+		Dołączanie anulowane.
 	</notification>
 	<notification name="ReplacedMissingWearable">
 		Brakujące ubranie/części ciała zastąpiono domyślnymi obiektami.
@@ -2197,23 +2440,26 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
 		Temat: [SUBJECT], Treść: [MESSAGE]
 	</notification>
 	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; jest [STATUS]
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; jest [STATUS].
 	</notification>
 	<notification name="AddSelfFriend">
 		Niewątpliwie znasz siebie najlepiej, ale nie możesz dodać swojej własnej osoby do listy znajomych.
 	</notification>
+	<notification name="AddSelfRenderExceptions">
+		Nie możesz dodać siebie do listy wyjątków renderowania.
+	</notification>
 	<notification name="UploadingAuctionSnapshot">
-		Ładowanie obrazów z Internetu...
+		Przesyłanie obrazów...
 (Zajmuje około 5 minut.)
 	</notification>
 	<notification name="UploadPayment">
-		Ładowanie kosztowało [AMOUNT]L$.
+		Przesyłanie kosztowało [AMOUNT]L$.
 	</notification>
 	<notification name="UploadWebSnapshotDone">
-		Ładowanie obrazu z Internetu zakończone pomyślnie.
+		Przesyłanie obrazu do sieci zakończone pomyślnie.
 	</notification>
 	<notification name="UploadSnapshotDone">
-		Ładowanie zdjęcia zakończone pomyślnie.
+		Przesyłanie zdjęcia zakończone pomyślnie.
 	</notification>
 	<notification name="TerrainDownloaded">
 		Plik terrain.raw ściągnięty.
@@ -2377,7 +2623,7 @@ Zainstaluj wtyczki ponownie lub skontaktuj się z dostawcą, jeśli problem nada
 		Obiekty z działki należącej do Rezydenta [NAME] zostały zwrócone do jego Szafy.
 	</notification>
 	<notification name="GroupObjectsReturned">
-		Obiekty z wybranej działki przypisane do grupy [GROUPNAME] zostały zwrócone do szaf ich właścicieli.
+		Obiekty z wybranej działki przypisane do grupy &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; zostały zwrócone do szaf ich właścicieli.
 Przekazywalne obiekty przekazane grupie zostały zwrócone do ich poprzednich właścicieli.
 Nieprzekazywalne obiekty przekazane grupie zostały usunięte.
 	</notification>
@@ -2400,7 +2646,7 @@ Nie możesz tutaj latać.
 		Popychanie niedozwolone. Nie możesz tutaj popychać innych chyba, że jesteś właścicielem tej działki.
 	</notification>
 	<notification name="NoVoice">
-		Ta działka nie pozwala na rozmowy głosowe.
+		Ta działka nie pozwala na rozmowy głosowe. Nie będziesz słyszeć, jak ktoś rozmawia.
 	</notification>
 	<notification name="NoBuild">
 		Ta działka nie pozwala na budowanie. Nie możesz tworzyć tutaj obiektów.
@@ -2408,6 +2654,10 @@ Nie możesz tutaj latać.
 	<notification name="PathfindingDirty">
 		W tym regionie są oczekujące zmiany w odnajdywaniu ścieżek. Jeśli posiadasz prawa budowania możesz odświeżyć region klikając na przycisk “Odśwież region”.
 	</notification>
+	<notification name="PathfindingDirtyRebake">
+		W tym regionie są oczekujące zmiany w odnajdywaniu ścieżek. Jeśli posiadasz prawa budowania możesz odświeżyć region klikając na przycisk “Odśwież region”.
+		<usetemplate name="okbutton" yestext="Odśwież" />
+	</notification>
 	<notification name="DynamicPathfindingDisabled">
 		Dynamiczne odnajdywanie ścieżek nie jest włączone w tym regionie. Oskryptowane obiekty używające odwołań LSL wykorzystujących odnajdywanie ścieżek mogą nie działać zgodnie z oczekiwaniami.
 	</notification>
@@ -2432,13 +2682,15 @@ Nie możesz tutaj latać.
 		Tylko publiczne działki w tym regionie, co Ty, mogą być przejęte.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Region, który próbujesz odwiedzić ma klasyfikację treści przekraczającą Twoje obecne preferencje treści. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne w pasku menu.
+		Region, który próbujesz odwiedzić, ma klasyfikację treści przekraczającą Twoje maksymalne preferencje. Możesz je zmienić używając Ja &gt; Ustawienia &gt; Ogólne.
+
+Pełne informacje na temat klasyfikacji treści można znaleźć [https://community.secondlife.com/knowledgebase/english/maturity-ratings-r52/ tutaj].
 	</notification>
 	<notification name="RegionAboutToShutdown">
 		Region, do którego próbujesz się dostać, właśnie się wyłącza.
 	</notification>
 	<notification name="URBannedFromRegion">
-		Zostałeś zbanowany w regionie.
+		Zostałeś/aś zbanowany/a w regionie.
 	</notification>
 	<notification name="NoTeenGridAccess">
 		Twoje konto nie może zostać połączone z podanym regionem Teen Grid.
@@ -2529,7 +2781,7 @@ Spróbuj ponownie za kilka minut.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Pokaż" />
-			<button name="Discard" text="Wyrzuć" />
+			<button name="Discard" text="Odrzuć" />
 			<button name="Mute" text="Zablokuj" />
 		</form>
 	</notification>
@@ -2673,22 +2925,80 @@ Czy się zgadzasz?
 			<button name="Mute" text="Zablokuj" />
 		</form>
 	</notification>
-	<notification name="ScriptQuestionCaution">
-		Obiekt &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; chciałby uzyskać zgodę na pobieranie Linden Dolarów (L$) z Twojego konta. Jeśli zezwolisz, to będzie on mógł brać z niego wszystkie lub część środków, w dowolnej chwili, bez dodatkowych ostrzeżeń.
+	<notification name="ExperienceAcquireFailed">
+		Nie można uzyskać nowej przygody:
+[ERROR_MESSAGE]
+	</notification>
+	<notification name="NotInGroupExperienceProfileMessage">
+		Zmiana do grupy przygody została zignorowana, ponieważ właściciel nie jest członkiem wybranej grupy.
+	</notification>
+	<notification name="UneditableExperienceProfileMessage">
+		Niemodyfikowalne pole '[field]' zostało zignorowane podczas aktualizacji profilu przygody.
+	</notification>
+	<notification name="RestrictedToOwnerExperienceProfileMessage">
+		Zignorowano zmiany dla pola '[field]', ponieważ może ono być zmieniane tylko przez właściciela przygody.
+	</notification>
+	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+		Nie możesz ustawić poziomu treści dla przygody większego, niż ten właściciela.
+	</notification>
+	<notification name="RestrictedTermExperienceProfileMessage">
+		Następujące rzeczy uniemożliwiły zaktualizowanie nazwy/opisu profilu przygody: [extra_info]
+	</notification>
+	<notification name="TeleportedHomeExperienceRemoved">
+		Zostałeś/aś wyteleportowany/a z regionu [region_name] za usunięcie przygody secondlife:///app/experience/[public_id]/profile i wobec tego nie możesz tam dłużej przebywać.
+		<form name="form">
+			<ignore name="ignore" text="Wyteleportowanie z regionu za usunięcie przygody"/>
+		</form>
+	</notification>
+	<notification name="TrustedExperienceEntry">
+		Dostałeś/aś przyzwolenie na przebywanie w regionie [region_name], ponieważ zgodziłeś/aś się uczestniczyć w przygodzie secondlife:///app/experience/[public_id]/profile - usunięcie jej może spowodować, że zostaniesz usunięty/a z regionu.
+		<form name="form">
+			<ignore name="ignore" text="Przyzwolenie na przebywanie w regionie po akceptacji przygody"/>
+		</form>
+	</notification>
+	<notification name="TrustedExperiencesAvailable">
+		Nie masz dostępu do tego miejsca. Może będziesz go mieć, jeśli zaakceptujesz następującą przygodę:
 
-Zanim zezwolisz na dostęp upewnij się, że wiesz jaki to obiekt i dlaczego pyta o zgodę - oraz że ufasz jego twórcy. Jeśli nie masz pewności kliknij na Odmów.
+[EXPERIENCE_LIST]
+
+Inne przygody również mogą stać się dostępne.
+	</notification>
+	<notification name="ExperienceEvent">
+		Obiekt dostał zezwolenie: [EventType] - poprzez przygodę: secondlife:///app/experience/[public_id]/profile
+Właściciel: secondlife:///app/agent/[OwnerID]/inspect
+Nazwa obiektu: [ObjectName]
+Nazwa działki: [ParcelName]
+	</notification>
+	<notification name="ExperienceEventAttachment">
+		Dodatek na Tobie dostał zezwolenie: [EventType] - poprzez przygodę: secondlife:///app/experience/[public_id]/profile
+Właściciel: secondlife:///app/agent/[OwnerID]/inspect
+	</notification>
+	<notification name="ScriptQuestionExperience">
+		Obiekt &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; którego właścicielem jest &apos;[NAME]&apos; prosi Cię o udział w przygodzie ([GRID_WIDE]):
+
+[EXPERIENCE]
+
+Gdy zezwolenie zostanie zatwierdzone nie zobaczysz tej wiadomości ponownie, dla tej przygody - chyba, że zostanie ono cofnięte w profilu przygody.
+
+Skrypty powiązane z tą przygodą będą mogły robić następujące rzeczy w regionach, gdzie przygoda jest aktywna:
+
+[QUESTIONS]
+
+Czy wyrażasz na to zgodę?
 		<form name="form">
-			<button name="Grant" text="Zezwól na dostęp" />
-			<button name="Deny" text="Odmów" />
+			<button name="BlockExperience" text="Zablokuj przygodę"/>
+			<button name="Mute" text="Zablokuj obiekt"/>
+			<button name="Yes" text="Tak"/>
+			<button name="No" text="Nie"/>
 		</form>
 	</notification>
-	<notification name="UnknownScriptQuestion">
-		Zezwolenia, o jakie prosi skrypt z &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, którego właścicielem jest &apos;[NAME]&apos;, nie są rozpoznawane przez przeglądarkę i nie mogą zostać udzielone.
+	<notification name="ScriptQuestionCaution">
+		Obiekt &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; chciałby uzyskać zgodę na pobieranie Linden Dolarów (L$) z Twojego konta. Jeśli zezwolisz, to będzie on mógł brać z niego wszystkie lub część środków, w dowolnej chwili, bez dodatkowych ostrzeżeń.
 
-Aby ich udzielić prosimy zaktualizować przeglądarkę do najnowszej wersji z [DOWNLOADURL].
+Zanim zezwolisz na dostęp upewnij się, że wiesz jaki to obiekt i dlaczego pyta o zgodę - oraz że ufasz jego twórcy. Jeśli nie masz pewności kliknij na Odmów.
 		<form name="form">
-			<button name="Deny" text="Ok, odmów jednorazowo" />
-			<button name="Mute" text="Zablokuj/Wycisz" />
+			<button name="Grant" text="Zezwól na dostęp"/>
+			<button name="Deny" text="Odmów"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2700,21 +3010,13 @@ Aby ich udzielić prosimy zaktualizować przeglądarkę do najnowszej wersji z [
 		</form>
 	</notification>
 	<notification name="ScriptDialogGroup">
-		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; - [GROUPNAME]
+		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; - &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;
 [MESSAGE]
 		<form name="form">
 			<button name="Client_Side_Mute" text="Blokuj" />
 			<button name="Client_Side_Ignore" text="Zignoruj" />
 		</form>
 	</notification>
-	<notification name="FirstBalanceIncrease">
-		Właśnie otrzymałeś/aś [AMOUNT] L$.
-Twój stan L$ jest widoczny w prawym górnym narożniku ekranu.
-	</notification>
-	<notification name="FirstBalanceDecrease">
-		Właśnie wydałeś/aś [AMOUNT] L$.
-Twój stan L$ jest widoczny w prawym górnym narożniku ekranu.
-	</notification>
 	<notification name="BuyLindenDollarSuccess">
 		Dziękujemy za wpłatę!
 
@@ -2756,7 +3058,7 @@ Wybierz Zablokuj żeby wyciszyć wszystkie wiadomości od tej osoby.
 		Zaoferowano [NAME] obiekty i ta osoba została automatycznie odblokowana.
 	</notification>
 	<notification name="VoiceInviteGroup">
-		[NAME] zaczyna rozmowę głosową z grupą [GROUP].
+		[NAME] zaczyna rozmowę głosową z grupą &lt;nolink&gt;[GROUP]&lt;/nolink&gt;.
 Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
 Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
 		<form name="form">
@@ -2792,31 +3094,34 @@ Wybierz Zablokuj żeby wyciszyć tą osobę.
 		Przepraszamy. Limit rozmów został przekroczony w tym obszarze. Spróbuj w innym miejscu.
 	</notification>
 	<notification name="VoiceChannelDisconnected">
-		[VOICE_CHANNEL_NAME] odłączył się. Przełączanie do rozmowy w czacie lokalnym.
+		[VOICE_CHANNEL_NAME] odłączył się. Przełączanie do rozmowy w czacie w pobliżu.
 	</notification>
 	<notification name="VoiceChannelDisconnectedP2P">
-		[VOICE_CHANNEL_NAME] skończył rozmowę. Przełączanie do rozmowy w czacie lokalnym.
+		[VOICE_CHANNEL_NAME] skończył rozmowę. Przełączanie do rozmowy w czacie w pobliżu.
 	</notification>
 	<notification name="P2PCallDeclined">
-		[VOICE_CHANNEL_NAME] odmówił połączenia. Przełączanie do rozmowy w czacie lokalnym.
+		[VOICE_CHANNEL_NAME] odmówił połączenia. Przełączanie do rozmowy w czacie w pobliżu.
 	</notification>
 	<notification name="P2PCallNoAnswer">
-		[VOICE_CHANNEL_NAME] nie odpowiada. Przełączanie do rozmowy w czacie lokalnym.
+		[VOICE_CHANNEL_NAME] nie odpowiada. Przełączanie do rozmowy w czacie w pobliżu.
 	</notification>
 	<notification name="VoiceChannelJoinFailed">
-		Brak połączenia z [VOICE_CHANNEL_NAME], spróbuj później. Przełączanie do rozmowy w czacie lokalnym.
+		Brak połączenia z [VOICE_CHANNEL_NAME], spróbuj później. Przełączanie do rozmowy w czacie w pobliżu.
 	</notification>
 	<notification name="VoiceEffectsExpired">
 		Subskrypcja jednego lub więcej Przekształceń Głosu wygasła.
 [[URL] Kliknij tutaj] oby odnowić subskrypcję.
+Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrzymać swój perk Przekształceń Głosu.
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
 		Czas aktywności Przekształcenia Głosu wygasł, normalne ustawienia Twojego głosu zostały zastosowane.
 [[URL] Kliknij tutaj] aby odnowić subskrypcję.
+Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrzymać swój perk Przekształceń Głosu.
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
 		Jedno lub więcej z Twoich Przekształceń Głosu wygaśnie za mniej niż [INTERVAL] dni.
 [[URL] Kliknij tutaj] aby odnowić subskrypcję.
+Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrzymać swój perk Przekształceń Głosu.
 	</notification>
 	<notification name="VoiceEffectsNew">
 		Nowe Przekształcenia Głosu są dostępne!
@@ -2859,6 +3164,31 @@ Zostaną zablokowane na kilka sekund dla bezpieczeństwa.
 	<notification name="AttachmentSaved">
 		Załącznik został zapisany.
 	</notification>
+	<notification name="AppearanceToXMLSaved">
+		Wygląd został zapisany do XML, w [PATH]
+	</notification>
+	<notification name="AppearanceToXMLFailed">
+		Nie udało się zapisać wyglądu do XML.
+	</notification>
+	<notification name="SnapshotToComputerFailed">
+		Nie można zapisać zrzutu ekranu do [PATH]: Dysk jest pełny. Potrzeba [NEED_MEMORY]KB, ale wolnego jest [FREE_MEMORY]KB.
+	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Nie można zapisać zrzutu ekranu do [PATH]: Katalog nie istnieje.
+	</notification>
+	<notification name="PresetNotSaved">
+		Błąd podczas zapisywania ustawienia [NAME].
+	</notification>
+	<notification name="DefaultPresetNotSaved">
+		Nie można zastąpić domyślnego ustawienia.
+	</notification>
+	<notification name="PresetAlreadyExists">
+		&apos;[NAME]&apos; jest w użyciu. Możesz zastąpić
+to ustawienie lub wybrać inną nazwę.
+	</notification>
+	<notification name="PresetNotDeleted">
+		Błąd podczas usuwania ustawienia [NAME].
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Nie można znaleźć tematu pomocy dla tego elementu.
 	</notification>
@@ -2872,12 +3202,25 @@ Zostaną zablokowane na kilka sekund dla bezpieczeństwa.
 	<notification name="VoiceIsMutedByModerator">
 		Twoja rozmowa głosowa została wyciszona przez moderatora.
 	</notification>
+	<notification name="FailedToGetBenefits">
+		Niestety nie udało nam się uzyskać informacji o korzyściach dla tej sesji. Nie powinno się to zdarzyć w normalnym środowisku produkcyjnym. Skontaktuj się z pomocą techniczną. Ta sesja nie będzie działać normalnie i zalecamy restart.
+	</notification>
+	<notification name="BulkUploadCostConfirmation">
+		Spowoduje to przesłanie [COUNT] elementów o łącznym koszcie [COST]L$. Czy chcesz kontynuować przesyłanie?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Prześlij"/>
+	</notification>
+	<notification name="BulkUploadNoCompatibleFiles">
+		Wybranych plików nie można przesłać zbiorczo.
+	</notification>
+	<notification name="BulkUploadIncompatibleFiles">
+		Niektórych z wybranych plików nie można przesłać zbiorczo.
+	</notification>
 	<notification name="UploadCostConfirmation">
-		Załadowanie tego na serwer będzie kosztować [PRICE]L$, chcesz kontynuować?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Załaduj" />
+		Przesłanie tego na serwer będzie kosztować [PRICE]L$, chcesz kontynuować?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Prześlij"/>
 	</notification>
 	<notification name="ConfirmClearTeleportHistory">
-		Czy na pewno chcesz usunąć historię teleportacji?
+		Spowoduje to usunięcie całej listy odwiedzonych przez Ciebie miejsc i nie będzie można tego cofnąć. Kontynuować?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BottomTrayButtonCanNotBeShown">
@@ -2887,13 +3230,16 @@ Przycisk zostanie wyświetlony w przypadku dostatecznej ilości przestrzeni.
 	<notification name="ShareNotification">
 		Zaznacz Rezydentów, z którymi chcesz się podzielić.
 	</notification>
+	<notification name="MeshUploadErrorDetails">
+		Nie można przesłać [LABEL]: [MESSAGE]
+[DETAILS] Zobacz SecondLife.log, aby dowiedzieć się więcej.
+	</notification>
 	<notification name="MeshUploadError">
-		Nie można załadować [LABEL]: [MESSAGE] [IDENTIFIER]
-
-Zobacz log, aby dowiedzieć się więcej.
+		Nie można przesłać [LABEL]: [MESSAGE]
+Zobacz SecondLife.log, aby dowiedzieć się więcej.
 	</notification>
 	<notification name="MeshUploadPermError">
-		Wystąpił błąd podczas pobierania uprawnień ładowania meszy.
+		Wystąpił błąd podczas pobierania uprawnień przesyłania meszy.
 	</notification>
 	<notification name="RegionCapabilityRequestError">
 		Nie udało się uzyskać zdolności regionu: &apos;[CAPABILITY]&apos;.
@@ -2973,14 +3319,26 @@ Awatar &apos;[NAME]&apos; rozpoczął edycję wyglądu.
 Awatar &apos;[NAME]&apos; opuścił edycję wyglądu.
 	</notification>
 	<notification name="NoConnect">
-		Występuje problem z połączeniem [PROTOCOL] [HOSTID].
+		Występuje problem z połączeniem [PROTOCOL] &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;.
 Proszę sprawdź swoją sieć i ustawienia firewall.
 	</notification>
 	<notification name="NoVoiceConnect">
-		Występuje problem z Twoim połączeniem głosowym:
+		Nie możemy połączyć się z serwerem głosowym:
 
 [HOSTID]
 
+Porty, które muszą być otwarte dla połączeń głosowych, to:
+:TCP: 80, 443
+:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
+
+Proszę sprawdź swoją sieć i ustawienia firewall.
+Wyłącz wszelkie funkcjonalności SIP ALG (Application Layer Gateway) w swoim routerze.
+
+Komunikacja głosowa nie będzie dostępna.
+	</notification>
+	<notification name="NoVoiceConnect-GIAB">
+		Występuje problem z Twoim połączeniem głosowym.
+
 Komunikacja głosowa nie będzie dostępna.
 Proszę sprawdź swoją sieć i ustawienia firewall.
 	</notification>
@@ -2990,20 +3348,27 @@ Awatar &apos;[NAME]&apos; pozostał w pełni załadowany.
 	</notification>
 	<notification name="AvatarRezSelfBakedTextureUploadNotification">
 		( [EXISTENCE] sekund w Second Life )
-Wstępnie przetworzone tekstury [RESOLUTION] dla &apos;[BODYREGION]&apos; zostały załadowane po [TIME] sekundach.
+Wstępnie przetworzone tekstury [RESOLUTION] dla &apos;[BODYREGION]&apos; zostały przesłane po [TIME] sekundach.
 	</notification>
 	<notification name="AvatarRezSelfBakedTextureUpdateNotification">
 		( [EXISTENCE] sekund w Second Life )
 Wstępnie przetworzone tekstury [RESOLUTION] zostały lokalnie zaktualizowane dla &apos;[BODYREGION]&apos; po [TIME] sekundach.
 	</notification>
 	<notification name="CannotUploadTexture">
-		Nie można załadować tekstury.
-[REASON]   
-  	</notification>
+		Nie można przesłać tekstury.
+[REASON]
+	</notification>
 	<notification name="LivePreviewUnavailable">
 		Nie można wyświetlić podglądu tej tekstury - jest niekopiowalna lub/oraz nietransferowalna.
 		<usetemplate ignoretext="Ostrzegaj, gdy podgląd na żywo nie może wyświetlić niekopiowalnych/nietransferowalnych tekstur" name="okignore" />
 	</notification>
+	<notification name="FacePasteFailed">
+		Wklejanie nie powiodło się. [REASON]
+	</notification>
+	<notification name="FacePasteTexturePermissions">
+		Zastosowano teksturę z ograniczonymi uprawnieniami, obiekt odziedziczy więc te uprawnienia.
+		<usetemplate ignoretext="Wklejanie: zastosowano teksturę z ograniczonymi uprawnieniami" name="notifyignore" />
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Czy jesteś pewien/pewna, że chcesz zakończyć rozmowę?
 		<usetemplate ignoretext="Potwierdź zanim rozmowa głosowa zostanie zakończona" name="okcancelignore" notext="Nie" yestext="Tak" />
@@ -3063,13 +3428,6 @@ Kliknij i przeciągnij gdziekolwiek aby obrócić widok.
 	<notification name="ForceQuitDueToLowMemory">
 		SL zostanie wyłączone za 30 sekund, brak pamięci.
 	</notification>
-	<notification name="PopupAttempt">
-		Wyskakujące okienko zostało zablokowane.
-		<form name="form">
-			<ignore name="ignore" text="Zezwól na wyskakujące okienka" />
-			<button name="open" text="Otwórz wyskakujące okno" />
-		</form>
-	</notification>
 	<notification name="SOCKS_NOT_PERMITTED">
 		Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmawia połączenia, brak dostępu na podstawie zestawu reguł.
 	</notification>
@@ -3161,7 +3519,7 @@ Kliknij i przeciągnij gdziekolwiek aby obrócić widok.
 	</notification>
 	<notification name="ConfirmHideUI">
 		Ta akcja ukryje wszystkie menu i przyciski. Aby je pokazać użyj skrótu [SHORTCUT] ponownie.
-		<usetemplate name="okcancelignore"  notext="Anuluj" ignoretext="Potwierdź przed ukryciem interfejsu" />
+		<usetemplate name="okcancelignore" notext="Anuluj" ignoretext="Potwierdź przed ukryciem interfejsu" />
 	</notification>
 	<notification name="PathfindingLinksets_WarnOnPhantom">
 		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
@@ -3219,10 +3577,10 @@ Czy chcesz kontynuować?
 		Wybrany obiekt ma wpływ na Navmesh. Dodanie elastyczności spowoduje usunięcie go z Navmesha.
 		<usetemplate ignoretext="Wybrany obiekt ma wpływ na Navmesh. Dodanie elastyczności spowoduje usunięcie go z Navmesha." name="okcancelignore" notext="Anuluj" />
 	</notification>
-	<global name="UnsupportedGLRequirements">
-		Wygląda na to, że Twój system nie spełnia wymagań sprzętowych [APP_NAME]. [APP_NAME] wymaga karty graficznej kompatybilnej z OpenGL z multiteksturami. Jeżeli masz taką kartę zainstaluj najnowsze sterowniki do niej i uaktualnienia systemu operacyjnego.
+	<global name="UnsupportedIntelDriver">
+		Zainstalowany sterownik graficzny Intela dla [GPUNAME], wersja [VERSION], jest przestarzały i jest znany z powodowania awarii. Zdecydowanie zaleca się aktualizację do aktualnego sterownika Intel.
 
-Jeżeli wciąż masz problemy sprawdź: [SUPPORT_SITE].
+Czy chcesz sprawdzić witrynę sterowników firmy Intel?
 	</global>
 	<global name="UnsupportedGPU">
 		- Twoja karta graficzna nie spełnia minimalnych wymagań.
@@ -3230,9 +3588,12 @@ Jeżeli wciąż masz problemy sprawdź: [SUPPORT_SITE].
 	<global name="UnsupportedRAM">
 		- Pamięć Twojego systemu nie spełnia minimalnych wymagań.
 	</global>
+	<global name="LLLeapUpdaterFailure">
+		Nie udało się uruchomić usługi aktualizatora [UPDATER_APP]. Sprawdź, czy przeglądarka jest poprawnie zainstalowana i czy ma niezbędne uprawnienia do uruchomienia. Jeśli nadal będziesz mieć problemy, odwiedź [SUPPORT_SITE].
+	</global>
 	<global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
-		If you own a piece of land, you can make it your home location.
-Otherwise, you can look at the Map and find places marked &quot;Infohub&quot;.
+		Jeśli jesteś właścicielem działki, to możesz ustawić na niej miejsce startu.
+W innym przypadku możesz poszukać na mapie miejsc oznaczonych jako &quot;Infohub&quot;.
 	</global>
 	<global name="You died and have been teleported to your home location">
 		Nastąpiła śmierć i teleportacja do Miejsca Startu.
@@ -3309,13 +3670,13 @@ Anulowano.
 		Nie możesz tworzyć drzew i trawy na ziemi, która nie należy do Ciebie.
 	</notification>
 	<notification name="NoCopyPermsNoObject">
-		Kopiowanie nie powiodło się, ponieważ nie masz zezwoleń na kopiowanie obiektu '[OBJ_NAME]'.
+		Kopiowanie nie powiodło się, ponieważ nie masz zezwoleń na kopiowanie obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
 	</notification>
 	<notification name="NoTransPermsNoObject">
-		Kopiowanie nie powiodło się, ponieważ obiekt '[OBJ_NAME]' nie może zostać przetransferowany do Ciebie.
+		Kopiowanie nie powiodło się, ponieważ obiekt &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; nie może zostać przetransferowany do Ciebie.
 	</notification>
 	<notification name="AddToNavMeshNoCopy">
-		Kopiowanie nie powiodło się, ponieważ obiekt '[OBJ_NAME]' ma wpływ na Navmesh.
+		Kopiowanie nie powiodło się, ponieważ obiekt &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; ma wpływ na Navmesh.
 	</notification>
 	<notification name="DupeWithNoRootsSelected">
 		Wybrano duplikat bez obiektów głównych.
@@ -3362,34 +3723,37 @@ Spróbuj ponownie za minutę.
 		Zabieranie z powrotem do Szafy zostało wyłączone.
 	</notification>
 	<notification name="NoExistNoSaveToContents">
-		Nie można zapisać '[OBJ_NAME]' do zawartości obiektu, ponieważ obiekt z którego został zrezzowany już nie istnieje.
+		Nie można zapisać &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; do zawartości obiektu, ponieważ obiekt z którego został zrezzowany już nie istnieje.
 	</notification>
 	<notification name="NoModNoSaveToContents">
-		Nie można zapisać '[OBJ_NAME]' do zawartości obiektu, ponieważ nie masz praw do modyfikacji obiektu '[DEST_NAME]'.
+		Nie można zapisać &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; do zawartości obiektu, ponieważ nie masz praw do modyfikacji obiektu &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt;.
 	</notification>
 	<notification name="NoSaveBackToInvDisabled">
-		Nie można zabrać '[OBJ_NAME]' z powrotem do Szafy -- ta operacja została wyłączona.
+		Nie można zabrać &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; z powrotem do Szafy -- ta operacja została wyłączona.
 	</notification>
 	<notification name="NoCopyNoSelCopy">
-		Nie możesz skopiować tego, co jest zaznaczone, ponieważ nie masz prawa do skopiowania obiektu '[OBJ_NAME]'.
+		Nie możesz skopiować tego, co jest zaznaczone, ponieważ nie masz prawa do skopiowania obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
 	</notification>
 	<notification name="NoTransNoSelCopy">
-		Nie możesz skopiować tego, co jest zaznaczone, ponieważ obiektu '[OBJ_NAME]' nie można transferować.
+		Nie możesz skopiować tego, co jest zaznaczone, ponieważ obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; nie można transferować.
 	</notification>
 	<notification name="NoTransNoCopy">
-		Nie możesz skopiować tego, co jest zaznaczone, ponieważ obiektu '[OBJ_NAME]' nie można transferować.
+		Nie możesz skopiować tego, co jest zaznaczone, ponieważ obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; nie można transferować.
 	</notification>
 	<notification name="NoPermsNoRemoval">
-		Usunięcie obiektu '[OBJ_NAME]' z symulatora zostało wzbronione przez system zezwoleń.
+		Usunięcie obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; z symulatora zostało wzbronione przez system zezwoleń.
 	</notification>
 	<notification name="NoModNoSaveSelection">
-		Nie możesz zapisać tego, co jest zaznaczone, ponieważ nie masz prawa do modyfikacji obiektu '[OBJ_NAME]'.
+		Nie możesz zapisać tego, co jest zaznaczone, ponieważ nie masz prawa do modyfikacji obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
+	</notification>
+	<notification name="NoTransNoSaveToContents">
+		Nie można zapisać &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; do zawartości obiektu, ponieważ nie masz uprawnień do przeniesienia praw własności obiektu.
 	</notification>
 	<notification name="NoCopyNoSaveSelection">
-		Nie możesz zapisać tego, co jest zaznaczone, ponieważ obiektu '[OBJ_NAME]' nie można kopiować.
+		Nie możesz zapisać tego, co jest zaznaczone, ponieważ obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; nie można kopiować.
 	</notification>
 	<notification name="NoModNoTaking">
-		Nie możesz zabrać tego, co jest zaznaczone, ponieważ nie masz prawa do modyfikacji obiektu '[OBJ_NAME]'.
+		Nie możesz zabrać tego, co jest zaznaczone, ponieważ nie masz prawa do modyfikacji obiektu &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
 	</notification>
 	<notification name="RezDestInternalError">
 		Błąd wewnętrzny: Nieznany typ lokalizacji docelowej.
@@ -3415,33 +3779,39 @@ Spróbuj ponownie za minutę.
 	<notification name="AvatarEjectFailed">
 		Wyrzucenie nie powiodło się, ponieważ nie masz uprawnień administratora na tej działce.
 	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Nie można przesunąć obiektu '[OBJECT_NAME]' do
-[OBJ_POSITION] w regionie [REGION_NAME], ponieważ działka jest zbyt pełna.
+	<notification name="CMOParcelFull">
+		Nie można przesunąć obiektu '[O]' do
+[P] w regionie [R], ponieważ działka jest zbyt pełna.
+	</notification>
+	<notification name="CMOParcelPerms">
+		Nie można przesunąć obiektu '[O]' do
+[P] w regionie [R], ponieważ Twoje obiekty nie są dozwolone na tej działce.
 	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Nie można przesunąć obiektu '[OBJECT_NAME]' do
-[OBJ_POSITION] w regionie [REGION_NAME], ponieważ Twoje obiekty nie są dozwolone na tej działce.
+	<notification name="CMOParcelResources">
+		Nie można przesunąć obiektu '[O]' do
+[P] w regionie [R], ponieważ nie ma wystarczającej ilości zasobów na tej działce.
 	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Nie można przesunąć obiektu '[OBJECT_NAME]' do
-[OBJ_POSITION] w regionie [REGION_NAME], ponieważ nie ma wystarczającej ilości zasobów na tej działce.
+	<notification name="NoParcelPermsNoObject">
+		Kopiowanie nie powiodło się, ponieważ nie masz dostępu do tej działki.
 	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Nie można przesunąć obiektu '[OBJECT_NAME]' do
-[OBJ_POSITION] w regionie [REGION_NAME], ponieważ the region działa na starszej wersji symulatora, która nie obsługuje otrzymywania obiektów przez granice działek.
+	<notification name="CMORegionVersion">
+		Nie można przesunąć obiektu '[O]' do
+[P] w regionie [R], ponieważ the region działa na starszej wersji symulatora, która nie obsługuje otrzymywania obiektów przez granice działek.
 	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Nie można przesunąć obiektu '[OBJECT_NAME]' do
-[OBJ_POSITION] w regionie [REGION_NAME], ponieważ nie możesz modyfikować Navmesha przez granice regionów.
+	<notification name="CMONavMesh">
+		Nie można przesunąć obiektu '[O]' do
+[P] w regionie [R], ponieważ nie możesz modyfikować Navmesha przez granice regionów.
 	</notification>
-	<notification name="CantMoveObjectWTF">
-		Nie można przesunąć obiektu '[OBJECT_NAME]' do
-[OBJ_POSITION] w regionie [REGION_NAME] ze względu na nieznany powód. ([FAILURE_TYPE])
+	<notification name="CMOWTF">
+		Nie można przesunąć obiektu '[O]' do
+[P] w regionie [R] ze względu na nieznany powód. ([F])
 	</notification>
 	<notification name="NoPermModifyObject">
 		Nie masz uprawnień do modyfikowania tego obiektu
 	</notification>
+	<notification name="TooMuchObjectInventorySelected">
+		Zbyt wiele obiektów z dużą zawartością zostało zaznaczonych. Zaznacz mniej obiektów i spróbuj ponownie.
+	</notification>
 	<notification name="CantEnablePhysObjContributesToNav">
 		Nie można włączyć fizyki dla obiektu, który ma wpływ na Navmesh.
 	</notification>
@@ -3478,6 +3848,12 @@ Spróbuj ponownie za minutę.
 	<notification name="CantSaveModifyAttachment">
 		Nie można zapisać do zawartości obiektu: To zmodyfikowałoby prawa dodatku.
 	</notification>
+	<notification name="AttachmentHasTooMuchInventory">
+		Twoje dodatki zawierają w sobie zbyt dużo obiektów, aby dodać więcej.
+	</notification>
+	<notification name="IllegalAttachment">
+		Dodatek chciał się doczepić do punktu, jaki nie istnieje na awatarze. Został on zamiast tego dołączony do klatki piersiowej.
+	</notification>
 	<notification name="TooManyScripts">
 		Za dużo skryptów.
 	</notification>
@@ -3485,7 +3861,7 @@ Spróbuj ponownie za minutę.
 		Nie można dodać skryptu!
 	</notification>
 	<notification name="AssetServerTimeoutObjReturn">
-		Czas odpowiedzi z serwera zasobów danych przekroczył dozwolony limit. Obiekt został zwrócony do sima.
+		Czas odpowiedzi z serwera zasobów danych przekroczył dozwolony limit. Obiekt został zwrócony do regionu.
 	</notification>
 	<notification name="RegionDisablePhysicsShapes">
 		Ten region nie ma włączonych kształtów fizycznych.
@@ -3518,7 +3894,7 @@ Spróbuj ponownie za minutę.
 		Nie możesz zmieniać kształtu obiektu meszowego.
 	</notification>
 	<notification name="FullRegionCantEnter">
-		Nie możesz wejść do tego regionu, \nponieważ jest pełny.
+		Nie możesz wejść do tego regionu, ponieważ jest pełny.
 	</notification>
 	<notification name="LinkFailedOwnersDiffer">
 		Scalanie nie powiodło się -- właściciele są różni
@@ -3570,9 +3946,18 @@ Spróbuj ponownie za minutę.
 	<notification name="TeleportedByObjectUnknownUser">
 		Zostałeś/aś teleportowany/a przez obiekt '[OBJECT_NAME]' należący do nieznanej osoby.
 	</notification>
+	<notification name="StandDeniedByObject">
+		'[OBJECT_NAME]' nie pozwala Ci w tej chwili stać.
+	</notification>
+	<notification name="ResitDeniedByObject">
+		'[OBJECT_NAME]' nie pozwala Ci w tej chwili zmieniać siedzeń.
+	</notification>
 	<notification name="CantCreateObjectRegionFull">
 		Nie można utworzyć żądanego obiektu. Region jest pełny.
 	</notification>
+	<notification name="CantCreateAnimatedObjectTooLarge">
+		Nie można utworzyć żądanego obiektu animowanego, ponieważ przekracza on limit trójkątów riggowania.
+	</notification>
 	<notification name="CantAttackMultipleObjOneSpot">
 		Nie możesz podłączyć wielu obiektów do jednego punktu.
 	</notification>
@@ -3621,6 +4006,21 @@ Spróbuj ponownie za minutę.
 	<notification name="CantChangeShape">
 		Nie masz pozwolenia na zmianę tego kształtu.
 	</notification>
+	<notification name="NoPermsTooManyAttachedAnimatedObjects">
+		Operacja spowodowałaby przekroczenie limitu liczby dołączonych animowanych obiektów.
+	</notification>
+	<notification name="NoPermsLinkAnimatedObjectTooLarge">
+		Nie można połączyć tych obiektów, ponieważ powstały animowany obiekt przekroczyłby limit trójkątów riggowania.
+	</notification>
+	<notification name="NoPermsSetFlagAnimatedObjectTooLarge">
+		Nie można przekształcić tego obiektu w animowany obiekt, ponieważ przekroczyłby limit trójkątów riggowania.
+	</notification>
+	<notification name="CantChangeAnimatedObjectStateInsufficientLand">
+		Nie można zmienić stanu animowanego obiektu dla tej rzeczy, ponieważ spowodowałoby to przekroczenie limitu działki.
+	</notification>
+	<notification name="ErrorNoMeshData">
+		Błąd serwera: nie można ukończyć tej operacji, ponieważ dane meszu nie zostały załadowane.
+	</notification>
 	<notification name="NoAccessToClaimObjects">
 		Twoje uprawnienia nie pozwalają Ci na żądanie obiektów w tym miejscu.
 	</notification>
@@ -3679,7 +4079,7 @@ Spróbuj ponownie za minutę.
 		Sprecyzuj proszę swoje parametry usuwania.
 	</notification>
 	<notification name="UnableToUploadAsset">
-		Nie można załadować zasobu danych (assetu).
+		Nie można przesłać zasobu danych (assetu).
 	</notification>
 	<notification name="CantTeleportCouldNotFindUser">
 		Nie można znaleźć użytkownika, aby teleportować do domu
@@ -3691,7 +4091,7 @@ Spróbuj ponownie za minutę.
 		żądanie ogólne nie powiodło się
 	</notification>
 	<notification name="CantUploadPostcard">
-		Nie można załadować pocztówki. Spróbuj ponownie później.
+		Nie można przesłać pocztówki. Spróbuj ponownie później.
 	</notification>
 	<notification name="CantFetchInventoryForGroupNotice">
 		Nie można pobrać szczegółów dołączonego przedmiotu dla ogłoszenia grupy.
@@ -3706,7 +4106,7 @@ Spróbuj ponownie za minutę.
 		Nie można zanalizować przedmiotu z ogłoszenia.
 	</notification>
 	<notification name="TerrainUploadFailed">
-		Ładowanie podłoża na serwer nie powiodło się.
+		Przesyłanie podłoża na serwer nie powiodło się.
 	</notification>
 	<notification name="TerrainFileWritten">
 		Plik podłoża zapisany.
@@ -3799,7 +4199,7 @@ Spróbuj zaznaczyć mniejszy obszar ziemi.
 		Nie można w tej chwili kupić przepustki. Spróbuj ponownie później.
 	</notification>
 	<notification name="CantCreateObjectParcelFull">
-		Nie można utworzyć obiektu, \n ponieważ działka jest pełna.
+		Nie można utworzyć obiektu, ponieważ działka jest pełna.
 	</notification>
 	<notification name="FailedPlacingObject">
 		Nie udało się umieścić obiektu w żądanej lokalizacji. Spróbuj ponownie.
@@ -3870,6 +4270,9 @@ Spróbuj zaznaczyć mniejszy obszar ziemi.
 	<notification name="CantTransfterMoneyRegionDisabled">
 		Transfery pieniędzy do obiektów są obecnie wyłączone w tym regionie.
 	</notification>
+	<notification name="DroppedMoneyTransferRequest">
+		Nie udało się dokonać płatności ze względu na obciążenie systemu.
+	</notification>
 	<notification name="CantPayNoAgent">
 		Nie udało się ustalić, komu zapłacić.
 	</notification>
@@ -3883,12 +4286,16 @@ Spróbuj zaznaczyć mniejszy obszar ziemi.
 		Błąd wewnętrzny uniemożliwił poprawną aktualizację danych przeglądarki. Stan konta L$ lub posiadane działki wyświetlane w przeglądarce mogą nie odzwierciedlać faktycznego stanu posiadania na serwerach.
 	</notification>
 	<notification name="LargePrimAgentIntersect">
-		Nie można utworzyć wielkich prim, które nachodzą na innych rezydentów. Spróbuj jeszcze raz, gdy przesuną się oni.
+		Nie można tworzyć wielkich prim, które nachodzą na innych rezydentów. Spróbuj jeszcze raz, gdy się oni przesuną.
 	</notification>
 	<notification name="PreferenceChatClearLog">
 		Ta opcja usunie dzienniki poprzednich rozmów i wszelkie kopie zapasowe tego pliku.
 		<usetemplate ignoretext="Potwierdź, zanim usunę dzienniki poprzednich rozmów." name="okcancelignore" notext="Anuluj" />
 	</notification>
+	<notification name="PreferenceControlsDefaults">
+		Czy chcesz przywrócić domyślne ustawienia klawiszy sterowania?
+		<usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Obecny tryb" yestext="Wszystkie tryby" />
+	</notification>
 	<notification name="PreferenceChatDeleteTranscripts">
 		Ta opcja usunie logi wszystkich poprzednich rozmów. Nie będzie to miało wpływu na listę rozmów odbytych w przeszłości. Wszystkie pliki z przyrostkami .txt oraz txt.backup w folderze [FOLDER] zostaną usunięte.
 		<usetemplate ignoretext="Potwierdź, zanim usunę logi rozmów." name="okcancelignore" notext="Anuluj" />
@@ -3903,4 +4310,113 @@ Spróbuj zaznaczyć mniejszy obszar ziemi.
 	<notification name="ChatHistoryIsBusyAlert">
 		Plik historii czatu jest w tej chwili przetwarzany przez poprzednią operację. Spróbuj ponownie za kilka minut lub wybierz czat innej osoby.
 	</notification>
+	<notification name="AddPaymentMethod">
+		Na następnej stronie wybierz kwotę L$
+i kliknij przycisk składania zamówienia.
+Będziesz mógł/a dodać metodę płatności w kasie.
+		<form name="form">
+			<button name="Continue" text="Kontynuuj" />
+			<button name="Cancel" text="Anuluj" />
+		</form>
+	</notification>
+	<notification name="FailedToFindSettings">
+		Nie można załadować ustawień dla [NAME] z bazy danych.
+	</notification>
+	<notification name="FailedToLoadSettingsApply">
+		Nie można zastosować tych ustawień do otoczenia.
+	</notification>
+	<notification name="FailedToBuildSettingsDay">
+		Nie można zastosować tych ustawień do otoczenia.
+	</notification>
+	<notification name="NoEnvironmentSettings">
+		Ten region nie obsługuje ustawień otoczenia.
+	</notification>
+	<notification label="Zapisz otoczenie" name="SaveSettingAs">
+		Zapisz bieżące ustawienia otoczenia jako:
+		<form name="form">
+			<input name="message">
+				[DESC] (nowe)
+			</input>
+			<button name="Cancel" text="Anuluj" />
+		</form>
+	</notification>
+	<notification name="WLImportFail">
+		Nie można zaimportować starszych ustawień Windlight [NAME] z
+[FILE].
+
+[REASONS]
+	</notification>
+	<notification name="WLParcelApplyFail">
+		Nie można ustawić otoczenia dla tej działki.
+Odwiedź lub wybierz działkę, którą masz prawo zmodyfikować.
+	</notification>
+	<notification name="SettingsUnsuported">
+		Otoczenia nie są obsługiwane w tym regionie.
+Przejdź do regionu z włączonymi otoczeniami i spróbuj ponownie.
+	</notification>
+	<notification name="SettingsConfirmLoss">
+		Za chwilę stracisz zmiany wprowadzone dla [TYPE] o nazwie "[NAME]".
+Czy na pewno chcesz kontynuować?
+		<usetemplate ignoretext="Czy na pewno chcesz stracić zmiany?" name="okcancelignore" notext="Nie" yestext="Tak" />
+	</notification>
+	<notification name="SettingsConfirmReset">
+		Za chwilę usuniesz wszystkie zastosowane otoczenia.
+Czy na pewno chcesz kontynuować?
+		<usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
+	</notification>
+	<notification name="PersonalSettingsConfirmReset">
+		Za chwilę usuniesz wszystkie zastosowane ustawienia własnego oświetlenia.
+Czy na pewno chcesz kontynuować?
+		<usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
+	</notification>
+	<notification name="SettingsMakeNoTrans">
+		Zamierzasz zaimportować nietransferowalne otoczenia do tego cyklu dnia. Kontynuowanie spowoduje, że edytowane otoczenia również staną się nietransferowalne.
+
+Tej zmiany nie można cofnąć.
+
+Czy na pewno chcesz kontynuować?
+		<usetemplate ignoretext="Czy na pewno chcesz, aby otoczenia były nietransferowalne?" name="okcancelignore" notext="Nie" yestext="Tak" />
+	</notification>
+	<notification name="NoEditFromLibrary">
+		Nie możesz edytować otoczeń bezpośrednio w bibliotece.
+Skopiuj do własnej szafy i spróbuj ponownie.
+	</notification>
+	<notification name="EnvironmentApplyFailed">
+		Napotkaliśmy problem z tymi ustawieniami otoczenia. Nie można ich teraz zapisać ani zastosować.
+	</notification>
+	<notification name="TrackLoadFailed">
+		Nie można załadować ścieżki do [TRACK].
+	</notification>
+	<notification name="TrackLoadMismatch">
+		Nie można załadować ścieżki z [TRACK1] do [TRACK2].
+	</notification>
+	<notification name="CompressionTestResults">
+Wynik testu kompresji pliku dla gzip na poziomie 6 z [FILE] o rozmiarze [SIZE] KB:
+Pakowanie: [PACK_TIME]s [PSIZE]KB
+Rozpakowywanie: [UNPACK_TIME]s [USIZE]KB
+	</notification>
+	<notification label="Monituj o token usługi MFA" name="PromptMFAToken">
+		[MESSAGE]
+		<form name="form">
+			<button name="continue" text="Kontynuuj" />
+			<button name="cancel" text="Anuluj" />
+		</form>
+	</notification>
+	<notification label="Utwórz podfolder" name="CreateSubfolder">
+		Nazwij nowy folder:
+		<form name="form">
+			<button name="Cancel" text="Anuluj" />
+		</form>
+	</notification>
+	<notification name="SameFolderRequired">
+		Wybrane elementy muszą znajdować się w tym samym folderze.
+	</notification>
+	<notification name="RiggedMeshAttachedToHUD">
+		Dodatek o nazwie "[NAME]" dołączony do HUD "[POINT]" zawiera riggowany mesz.
+
+Riggowane mesze są przeznaczone do dodawania do samego awatara. Ani ty, ani nikt inny nie zobaczy tego obiektu.
+
+Jeśli chcesz zobaczyć ten obiekt, to usuń go i ponownie dołącz do punktu doczepienia na awatarze.
+		<usetemplate ignoretext="Ostrzegaj, gdy dodatek z riggowanym meszem jest dołączany do punktu HUD" name="okignore" />
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 90d2d86c02..26ec6cc9dc 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -18,8 +18,11 @@
 	<string name="StartupRequireDriverUpdate">
 		Nie można zainicjować grafiki. Zaktualizuj sterowniki!
 	</string>
+	<string name="BuildConfig">
+		Konfiguracja budowania: [BUILD_CONFIG]
+	</string>
 	<string name="AboutPosition">
-Położenie [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] w [REGION] zlokalizowanym w &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+Położenie [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] w [REGION] zlokalizowanym w &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (koordynaty globalne [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
@@ -28,28 +31,53 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 	<string name="AboutSystem">
 Procesor (CPU): [CPU]
 Pamięć (Memory): [MEMORY_MB] MB
-Wersja OS (OS Version): [OS_VERSION]
-Sprzedawca karty graficznej (Graphics Card Vendor): [GRAPHICS_CARD_VENDOR]
+System operacyjny (OS Version): [OS_VERSION]
+Dostawca karty graficznej (Graphics Card Vendor): [GRAPHICS_CARD_VENDOR]
 Karta graficzna (Graphics Card): [GRAPHICS_CARD]
 	</string>
 	<string name="AboutDriver">
-		Sterownik karty graficznej Windows (Driver Version): [GRAPHICS_DRIVER_VERSION]
+		Sterownik karty graficznej (Driver Version): [GRAPHICS_DRIVER_VERSION]
+	</string>
+	<string name="AboutOGL">
+		Wersja OpenGL: [OPENGL_VERSION]
+	</string>
+	<string name="AboutSettings">
+Rozmiar okna (Window size): [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+Dostrojenie rozmiaru czcionki: [FONT_SIZE_ADJUSTMENT]pt
+Skalowanie interfejsu (UI Scaling): [UI_SCALE]
+Pole widzenia (Draw Distance): [DRAW_DISTANCE]m
+Przepustowość (Bandwidth): [NET_BANDWITH]kbit/s
+Mnożnik poziomu detali (LOD Factor): [LOD_FACTOR]
+Jakość wyświetlania (Render quality): [RENDER_QUALITY]
+Zaawansowane oświetlenie (Advanced Lighting Model): [GPU_SHADERS]
+Pamięć tekstur (Texture memory): [TEXTURE_MEMORY]MB
+Pamięć podręczna dysku (Disk cache): [DISK_CACHE_INFO]
+	</string>
+	<string name="AboutOSXHiDPI">
+		Tryb obrazu HiDPI: [HIDPI]
 	</string>
 	<string name="AboutLibs">
-Wersja OpenGL: [OPENGL_VERSION]
-
 Wersja dekodera J2C: [J2C_VERSION]
 Wersja sterownika dźwięku (Audio Driver): [AUDIO_DRIVER_VERSION]
-Wersja CEF: [LIBCEF_VERSION]
+[LIBCEF_VERSION]
 Wersja LibVLC: [LIBVLC_VERSION]
 Wersja serwera głosu (Voice Server): [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
 		Pakiety utracone: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
 	</string>
+	<string name="AboutTime">
+		[day, datetime, slt] [month, datetime, slt] [year, datetime, slt], [hour24, datetime, slt]:[min, datetime, slt]:[second, datetime, slt] SLT
+	</string>
+	<string name="LocalTime">
+		[day, datetime, local] [month, datetime, local] [year, datetime, local], [hour24, datetime, local]:[min, datetime, local]:[second, datetime, local]
+	</string>
 	<string name="ErrorFetchingServerReleaseNotesURL">
 		Błąd podczas pobierania informacji o wydaniu.
 	</string>
+	<string name="BuildConfiguration">
+		Konfiguracja budowania
+	</string>
 	<string name="ProgressRestoring">
 		Przywracanie...
 	</string>
@@ -123,22 +151,28 @@ Wersja serwera głosu (Voice Server): [VOICE_VERSION]
 		Pobieranie ubrania...
 	</string>
 	<string name="InvalidCertificate">
-		Serwer zwrócił nieważny lub zniekształcony certyfikat. Proszę skontaktuj się z administratorem siatki.
+		Serwer zwrócił nieważny lub zniekształcony certyfikat. Proszę skontaktuj się z administratorem świata.
 	</string>
 	<string name="CertInvalidHostname">
-		Nazwa hosta jest nieważna, proszę sprawdź SLURL lub nazwę hosta siatki.
+		Nazwa hosta jest nieważna, proszę sprawdź SLURL lub nazwę hosta świata.
 	</string>
 	<string name="CertExpired">
-		Termin ważności certyfikatu zwróconego przez siatkę minął. Proszę sprawdzić swój zegar systemowy lub skontaktować się z administratorem siatki.
+		Termin ważności certyfikatu zwróconego przez świat minął. Proszę sprawdzić swój zegar systemowy lub skontaktować się z administratorem świata.
 	</string>
 	<string name="CertKeyUsage">
-		Certyfikat zwrócony przez serwer nie może być użyty dla SSL. Proszę skontaktuj się z administratorem siatki.
+		Certyfikat zwrócony przez serwer nie może być użyty dla SSL. Proszę skontaktuj się z administratorem świata.
 	</string>
 	<string name="CertBasicConstraints">
-		Zbyt wiele certyfikatów w łańcuchu certyfikatów serwera. Proszę skontaktować się z administratorem siatki.
+		Zbyt wiele certyfikatów w łańcuchu certyfikatów serwera. Proszę skontaktować się z administratorem świata.
+	</string>
+	<string name="CertInvalid">
+		Nie udało się załadować certyfikatu. Skontaktuj się ze swoim administratorem świata.
 	</string>
 	<string name="CertInvalidSignature">
-		Podpis certyfikatu zwrócony przez siatkę nie mógł zostać zweryfikowany. Proszę skontaktować się z administratorem siatki.
+		Podpis certyfikatu zwrócony przez świat nie mógł zostać zweryfikowany. Proszę skontaktować się z administratorem świata.
+	</string>
+	<string name="CertAllocationFailure">
+		Nie udało się przydzielić pamięci openssl dla certyfikatu.
 	</string>
 	<string name="LoginFailedNoNetwork">
 		Błąd sieci: Brak połączenia z siecią, sprawdź status swojego połączenia internetowego.
@@ -149,12 +183,22 @@ Wersja serwera głosu (Voice Server): [VOICE_VERSION]
 	<string name="Quit">
 		Wyłącz
 	</string>
+	<string name="AgniGridLabel">
+		Second Life: świat główny (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Second Life Beta: świat testowy (Aditi)
+	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Przeglądarka używana przez Ciebie nie ma już dostępu do Second Life. Proszę przejść na poniższą stronę i pobrać nową:
 http://secondlife.com/download
 
 Więcej informacji w naszym FAQ:
 http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginFailed">
+		Logowanie nieudane.
+Jeśli uważasz, że to błąd, skontaktuj się z support@secondlife.com.
 	</string>
 	<string name="LoginIntermediateOptionalUpdateAvailable">
 		Opcjonalna aktualizacja jest dostępna: [VERSION].
@@ -170,6 +214,7 @@ http://secondlife.com/viewer-access-faq
 Upewnij się, że wpisano poprawnie:
     * Login (np. bobsmith12 czy steller.sunshine)
     * Hasło
+	* Token weryfikacji dwuetapowej (gdy włączona)
 Sprawdź też, czy klawisz Caps Lock nie jest wciśnięty.
 	</string>
 	<string name="LoginFailedPasswordChanged">
@@ -199,14 +244,17 @@ Osoby posiadające darmowe konta nie mogą się teraz zalogować, aby ludzie pos
 Jeśli myślisz, że to błąd skontaktuj się z
 support@secondlife.com
 	</string>
+	<string name="PacificTime">
+		czas pacyficzny
+	</string>
 	<string name="LoginFailedAcountSuspended">
 		Twoje konto jest niedostępne do
-[TIME] czasu pacyficznego.
+[TIME].
+Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
 	</string>
 	<string name="LoginFailedAccountDisabled">
 		Nie jesteśmy w stanie na tą chwilę wykonać Twojego żądania.
-Aby uzyskać pomoc skontaktuj się ze wsparciem: http://secondlife.com/support
-Jeśli nie możesz zmienić swojego hasła zadzwoń pod numer (866) 476-9763.
+Aby uzyskać pomoc skontaktuj się ze wsparciem: http://support.secondlife.com
 	</string>
 	<string name="LoginFailedTransformError">
 		Podczas logowania wykryto niespójność danych.
@@ -215,7 +263,7 @@ Skontaktuj się z nami: support@secondlife.com
 	<string name="LoginFailedAccountMaintenance">
 		Twoje konto jest w trakcie drobnych konserwacji.
 Nie będzie ono dostępne do
-[TIME] czasu pacyficznego.
+[TIME].
 Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
 	</string>
 	<string name="LoginFailedPendingLogoutFault">
@@ -223,8 +271,7 @@ Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
 	</string>
 	<string name="LoginFailedPendingLogout">
 		System w tej chwili Cię wylogowywuje.
-Twoje konto będzie niedostępne do
-[TIME] czasu pacyficznego.
+Poczekaj chwilę, zanim spróbujesz zalogować się ponownie.
 	</string>
 	<string name="LoginFailedUnableToCreateSession">
 		Nie można utworzyć poprawnej sesji.
@@ -281,6 +328,10 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="LoginFailedLoggingOutSession">
 		System rozpoczął wylogowywanie Twojej ostatniej sesji.
 Spróbuj zalogować się ponownie za minutę.
+	</string>
+	<string name="LoginFailedAuthenticationMFARequired">
+		Wprowadź nowy token z aplikacji do uwierzytelniania wieloskładnikowego.
+Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
 	</string>
 	<string name="AgentLostConnection">
 		Ten region może mieć problemy. Sprawdź podłączenie do Internetu.
@@ -303,60 +354,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="TestingDisconnect">
 		Testowanie rozłączenia klienta
 	</string>
-	<string name="SocialFacebookConnecting">
-		Łączenie z Facebookiem...
-	</string>
-	<string name="SocialFacebookPosting">
-		Wysyłanie...
-	</string>
-	<string name="SocialFacebookDisconnecting">
-		Rozłączanie z Facebookiem...
-	</string>
-	<string name="SocialFacebookErrorConnecting">
-		Problem z łączeniem z Facebookiem
-	</string>
-	<string name="SocialFacebookErrorPosting">
-		Problem z wysyłaniem na Facebooka
-	</string>
-	<string name="SocialFacebookErrorDisconnecting">
-		Problem z rozłączaniem z Facebookiem
-	</string>
-	<string name="SocialFlickrConnecting">
-		Łączenie z Flickr...
-	</string>
-	<string name="SocialFlickrPosting">
-		Wysyłanie...
-	</string>
-	<string name="SocialFlickrDisconnecting">
-		Rozłączanie z Flickr...
-	</string>
-	<string name="SocialFlickrErrorConnecting">
-		Problem z łączeniem z Flickr
-	</string>
-	<string name="SocialFlickrErrorPosting">
-		Problem z wysyłaniem na Flickr
-	</string>
-	<string name="SocialFlickrErrorDisconnecting">
-		Problem z rozłączaniem z Flickr
-	</string>
-	<string name="SocialTwitterConnecting">
-		Łączenie z Twitterem...
-	</string>
-	<string name="SocialTwitterPosting">
-		Wysyłanie...
-	</string>
-	<string name="SocialTwitterDisconnecting">
-		Rozłączanie z Twitterem...
-	</string>
-	<string name="SocialTwitterErrorConnecting">
-		Problem z łączeniem z Twitterem
-	</string>
-	<string name="SocialTwitterErrorPosting">
-		Problem z wysyłaniem na Twittera
-	</string>
-	<string name="SocialTwitterErrorDisconnecting">
-		Problem z rozłączaniem z Twittera
-	</string>
 	<string name="BlackAndWhite">
 		Czerń i biel
 	</string>
@@ -436,29 +433,56 @@ Spróbuj zalogować się ponownie za minutę.
 		Nie możesz założyć folderu, który zawiera więcej niż [AMOUNT] przedmiotów. Możesz zmienić ten limit w Zaawansowane &gt; Pokaż ustawienia debugowania &gt; WearFolderLimit.
 	</string>
 	<string name="TooltipPrice" value="[AMOUNT]L$: "/>
+	<string name="TooltipSLIcon">
+		Link do strony znajdującej się w oficjalnej domenie SecondLife.com lub LindenLab.com.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
-		Nie możesz rezzować obiektów w skrzynce nadawczej kupca
+		Nie możesz rezzować obiektów z folderu rzeczy na Marketplace
+	</string>
+	<string name="TooltipOutboxWorn">
+		Nie możesz umieszczać na Marketplace przedmiotów, które masz na sobie założone
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		Głębokość zagnieżdżonych folderów przekracza [AMOUNT]. Zmniejsz ilość zagdzieżdżeń; Spakuj przedmioty w pudełka, jeśli to pomoże.
+	</string>
+	<string name="TooltipOutboxTooManyFolders">
+		Ilość podfolderów przekracza [AMOUNT]. Zmniejsz ilość folderów; Spakuj przedmioty w pudełka, jeśli to pomoże.
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		Ilość rzeczy przekracza [AMOUNT]. Jeśli chcesz sprzedać więcej, niż [AMOUNT] rzeczy jako jedną pozycję, to musisz je spakować w pudełka.
+	</string>
+	<string name="TooltipOutboxTooManyStockItems">
+		Ilość przedmiotów w folderze Magazynowym przekracza [AMOUNT].
+	</string>
+	<string name="TooltipOutboxCannotDropOnRoot">
+		Możesz przenosić foldery lub przedmioty wyłącznie do kart WSZYSTKO lub NIEPRZYPISANE. Wybierz teraz jedną z tych kart i spróbuj ponownie.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
-		Jeden lub kilka z tych obiektów nie może zostać sprzedany / przetransferowany.
+		Jeden lub kilka z tych obiektów nie może zostać sprzedany / przetransferowany
 	</string>
 	<string name="TooltipOutboxNotInInventory">
-		Twoja skrzynka nadawcza kupca akceptuje tylko przedmioty bezpośrednio z Twojej Szafy.
+		Marketplace akceptuje tylko przedmioty bezpośrednio z Twojej Szafy.
 	</string>
-	<string name="TooltipOutboxWorn">
-		Nie możesz umieszczać w skrzynce nadawczej kupca przedmiotów, które masz na sobie założone
+	<string name="TooltipOutboxLinked">
+		Nie możesz sprzedać zlinkowanych folderów lub przedmiotów na Marketplace
 	</string>
 	<string name="TooltipOutboxCallingCard">
-		Nie możesz umieszczać wizytówek w skrzynce nadawczej kupca
+		Nie możesz umieszczać wizytówek na Marketplace
 	</string>
-	<string name="TooltipOutboxFolderLevels">
-		Głębokość zagnieżdżonych folderów przekracza 3
+	<string name="TooltipOutboxDragActive">
+		Nie można przenieść wylistowanej rzeczy
 	</string>
-	<string name="TooltipOutboxTooManyFolders">
-		Ilość podfolderów w folderze najwyższego poziomu przekracza 20
+	<string name="TooltipOutboxCannotMoveRoot">
+		Nie możesz przenieść folderu głównego rzeczy na Marketplace
 	</string>
-	<string name="TooltipOutboxTooManyObjects">
-		Ilość pozycji w folderze najwyższego poziomu przekracza 200
+	<string name="TooltipOutboxMixedStock">
+		Wszystkie rzeczy w folderze Magazynowym muszą mieć ten sam typ i zezwolenia
+	</string>
+	<string name="TooltipOutfitNotInInventory">
+		W "Strojach" możesz umieszczać tylko przedmioty lub stroje z własnej Szafy
+	</string>
+	<string name="TooltipCantCreateOutfit">
+		Jeden lub więcej przedmiotów nie może być użyty w "Strojach"
 	</string>
 	<string name="TooltipDragOntoOwnChild">
 		Nie możesz przenieść folderu do jego obiektu podrzędnego
@@ -521,6 +545,9 @@ Spróbuj zalogować się ponownie za minutę.
 		Kliknij aby uruchomić komendę secondlife://
 	</string>
 	<string name="CurrentURL" value=" Obecny URL: [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Kliknij aby utworzyć wiadomość e-mail
+	</string>
 	<string name="SLurlLabelTeleport">
 		Teleportuj do
 	</string>
@@ -569,6 +596,15 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="BUTTON_HELP">
 		Pokaż Pomoc
 	</string>
+	<string name="TooltipNotecardNotAllowedTypeDrop">
+Przedmioty tego typu nie mogą być dołączane
+do notek z tego regionu.
+	</string>
+	<string name="TooltipNotecardOwnerRestrictedDrop">
+Tylko przedmioty z nieograniczonymi
+uprawnieniami 'następnego właściciela'
+mogą być dołączane do notek.
+	</string>
 	<string name="Searching">
 		Wyszukiwanie...
 	</string>
@@ -588,7 +624,7 @@ Spróbuj zalogować się ponownie za minutę.
 		(brak danych)
 	</string>
 	<string name="AvatarNameWaiting">
-		(ładowanie)
+		(Wczytywanie...)
 	</string>
 	<string name="AvatarNameMultiple">
 		(kilka)
@@ -629,6 +665,31 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="AssetErrorUnknownStatus">
 		Status nieznany
 	</string>
+	<string name="AssetUploadServerUnreacheble">
+		Usługa niedostępna.
+	</string>
+	<string name="AssetUploadServerDifficulties">
+		Serwer doświadcza nieoczekiwanych trudności.
+	</string>
+	<string name="AssetUploadServerUnavaliable">
+		Usługa niedostępna lub osiągnięto limit czasu.
+	</string>
+	<string name="AssetUploadRequestInvalid">
+		Błąd podczas przesyłania. Odwiedź
+http://secondlife.com/support aby uzyskać pomoc.
+	</string>
+	<string name="SettingValidationError">
+		Walidacja nie powiodła się - importowanie ustawień [NAME]
+	</string>
+	<string name="SettingImportFileError">
+		Nie można otworzyć pliku [FILE]
+	</string>
+	<string name="SettingParseFileError">
+		Nie można otworzyć pliku [FILE]
+	</string>
+	<string name="SettingTranslateError">
+		Nie można przetłumaczyć windlight [NAME]
+	</string>
 	<string name="texture">
 		tekstury
 	</string>
@@ -698,15 +759,18 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="favorite">
 		ulubione
 	</string>
+	<string name="symbolic link">
+		link
+	</string>
 	<string name="symbolic folder link">
 		link folderu
 	</string>
+	<string name="settings blob">
+		otoczenie
+	</string>
 	<string name="mesh">
 		mesz
 	</string>
-    <string name="settings">
-        ustawień
-    </string>
 	<string name="AvatarEditingAppearance">
 		(Edycja wyglądu)
 	</string>
@@ -714,7 +778,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Śpi
 	</string>
 	<string name="AvatarDoNotDisturb">
-		Zajęty
+		Zajęty/a
 	</string>
 	<string name="AvatarMuted">
 		Wyciszony
@@ -957,10 +1021,10 @@ Spróbuj zalogować się ponownie za minutę.
 		Nie można znaleźć Podstawy lub Stawu.
 	</string>
 	<string name="NearbyChatTitle">
-		Czat lokalny
+		Czat w pobliżu
 	</string>
 	<string name="NearbyChatLabel">
-		(Czat lokalny)
+		(Czat w pobliżu)
 	</string>
 	<string name="whisper">
 		szepcze:
@@ -1034,15 +1098,18 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="ChangeYourDefaultAnimations">
 		Zmieniać Twoje domyślne animacje
 	</string>
+	<string name="ForceSitAvatar">
+		Zmuszać Twojego awatara do siadania
+	</string>
+	<string name="ChangeEnvSettings">
+		Zmieniać Twoje ustawienia otoczenia
+	</string>
 	<string name="NotConnected">
 		Brak połączenia
 	</string>
 	<string name="AgentNameSubst">
 		(Ty)
 	</string>
-	<string name="JoinAnExperience">
-		Rozpocznij przygodę
-	</string>
 	<string name="SilentlyManageEstateAccess">
 		Wyciszyć powiadomienia o zmianach zezwoleń Majątku
 	</string>
@@ -1172,6 +1239,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="tattoo">
 		Tatuaż
 	</string>
+	<string name="universal">
+		Warstwa uniwersalna
+	</string>
 	<string name="physics">
 		Fizyka
 	</string>
@@ -1214,6 +1284,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="tattoo_not_worn">
 		Tatuaż nie jest założony
 	</string>
+	<string name="universal_not_worn">
+		Warstwa uniwersalna nie jest założona
+	</string>
 	<string name="physics_not_worn">
 		Fizyka nie jest założona
 	</string>
@@ -1260,13 +1333,16 @@ Spróbuj zalogować się ponownie za minutę.
 		Nowa spódnica
 	</string>
 	<string name="create_new_alpha">
-		Nowe alpha
+		Nowa warstwa alpha
 	</string>
 	<string name="create_new_tattoo">
 		Nowy tatuaż
 	</string>
+	<string name="create_new_universal">
+		Nowa warstwa uniwersalna
+	</string>
 	<string name="create_new_physics">
-		Nową fizyka
+		Nowa fizyka
 	</string>
 	<string name="create_new_invalid">
 		nieprawidłowy
@@ -1284,7 +1360,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Ogłoszenia grupowe
 	</string>
 	<string name="GroupNotifySentBy">
-		Wysłane przez
+		Wysłał/a
 	</string>
 	<string name="GroupNotifyAttached">
 		Załączone:
@@ -1325,6 +1401,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="BodyPartsRightLeg">
 		Prawa noga
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Rozszerzony szkielet
+	</string>
 	<string name="GraphicsQualityLow">
 		Niska
 	</string>
@@ -1340,11 +1419,20 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="InventoryNoMatchingItems">
 		Nie udało Ci się znaleźć tego, czego szukasz? Spróbuj [secondlife:///app/search/all/[SEARCH_TERM] Wyszukiwarki].
 	</string>
+	<string name="InventoryNoMatchingRecentItems">
+		Nie udało Ci się znaleźć tego, czego szukasz? Spróbuj [secondlife:///app/inventory/filters Filtrowania].
+	</string>
 	<string name="PlacesNoMatchingItems">
-		Nie udało Ci się znaleźć tego, czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] Wyszukiwarki].
+		Aby dodać miejsce do ulubionych, kliknij gwiazdkę po prawej stronie nazwy lokalizacji.
 	</string>
 	<string name="FavoritesNoMatchingItems">
-		Przeciągnij landmark tutaj aby dodać go do swoich ulubionych.
+		Aby dodać miejsce do ulubionych, kliknij gwiazdkę po prawej stronie nazwy lokalizacji, a następnie zapisz landmark na pasku "Ulubione".
+	</string>
+	<string name="MarketplaceNoListing">
+		Nie masz jeszcze żadnych przedmiotów na Marketplace.
+	</string>
+	<string name="MarketplaceNoMatchingItems">
+		Niczego nie znaleziono. Sprawdź pisownię i spróbuj ponownie.
 	</string>
 	<string name="InventoryNoTexture">
 		Nie posiadasz kopii tej tekstury w swojej Szafie.
@@ -1352,6 +1440,15 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="InventoryInboxNoItems">
 		Przedmioty zakupione na Marketplace pojawią się tutaj. Możesz następnie przeciągnąć je do głównej części Szafy.
 	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		Otwórz okno z opcjami odtwarzania.
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		Odtwarzaj wybrany gest w świecie.
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		Otwórz okno z opcjami odtwarzania.
+	</string>
 	<string name="InventoryOutboxNotMerchantTitle">
 		Każdy może sprzedawać przedmioty na Marketplace.
 	</string>
@@ -1376,29 +1473,110 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="InventoryOutboxError">
 		[[MARKETPLACE_CREATE_STORE_URL] Sklep na Marketplace] zwraca błędy.
 	</string>
+	<string name="InventoryMarketplaceError">
+		Wystapił błąd podczas otwierania listy rzeczy z Marketplace.
+Jeśli ciągle otrzymujesz tą wiadomość, to skontaktuj się z pomocą techniczną Second Life: http://support.secondlife.com
+	</string>
+	<string name="InventoryMarketplaceConnectionError">
+		Wystapił błąd podczas łączenia z Marketplace.
+Jeśli ciągle otrzymujesz tą wiadomość, to skontaktuj się z pomocą techniczną Second Life: http://support.secondlife.com
+	</string>
+	<string name="InventoryMarketplaceConnectionErrorReason">
+		Wystapił błąd podczas łączenia z Marketplace. Powód: [REASON]
+Jeśli ciągle otrzymujesz tą wiadomość, to skontaktuj się z pomocą techniczną Second Life: http://support.secondlife.com
+	</string>
+	<string name="InventoryMarketplaceListingsNoItemsTitle">
+		Twój folder rzeczy na Marketplace jest pusty.
+	</string>
+	<string name="InventoryMarketplaceListingsNoItems">
+		Przeciągnij foldery do tego obszaru, aby dodać je na listę sprzedaży w [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+	</string>
+	<string name="InventoryItemsCount">
+		( [ITEMS_COUNT] elementów )
+	</string>
+	<string name="Marketplace Validation Warning Stock">
+		folder Magazynowy musi być zawarty w folderze wersji
+	</string>
+	<string name="Marketplace Validation Error Mixed Stock">
+		: Błąd: wszystkie przedmioty w folderze Magazynowym muszą mieć ten sam typ i być niekopiowalne
+	</string>
+	<string name="Marketplace Validation Error Subfolder In Stock">
+		: Błąd: folder Magazynowy nie może zawierać podfolderów
+	</string>
+	<string name="Marketplace Validation Warning Empty">
+		: Uwaga: folder jest pusty
+	</string>
+	<string name="Marketplace Validation Warning Create Stock">
+		: Uwaga: tworzę folder Magazynowy
+	</string>
+	<string name="Marketplace Validation Warning Create Version">
+		: Uwaga: tworzę folder wersji
+	</string>
+	<string name="Marketplace Validation Warning Move">
+		: Uwaga: przenoszę przedmioty
+	</string>
+	<string name="Marketplace Validation Warning Delete">
+		: Uwaga: zawartość folderu przeniesiona do folderu Magazynowego, usuwam pusty katalog
+	</string>
+	<string name="Marketplace Validation Error Stock Item">
+		: Błąd: przedmioty bez praw kopiowania muszą się znajdować w folderze Magazynowym
+	</string>
+	<string name="Marketplace Validation Warning Unwrapped Item">
+		: Uwaga: przedmioty muszą się znajdować w folderze wersji
+	</string>
+	<string name="Marketplace Validation Error">
+		: Błąd:
+	</string>
+	<string name="Marketplace Validation Warning">
+		: Uwaga:
+	</string>
+	<string name="Marketplace Validation Error Empty Version">
+		: Uwaga: folder wersji musi zawierać przynajmniej jedną pozycję
+	</string>
+	<string name="Marketplace Validation Error Empty Stock">
+		: Uwaga: folder Magazynowy musi zawierać przynajmniej jedną pozycję
+	</string>
+	<string name="Marketplace Validation No Error">
+		Brak błędów lub ostrzeżeń
+	</string>
 	<string name="Marketplace Error None">
 		Brak błędów
 	</string>
+	<string name="Marketplace Error Prefix">
+		Błąd:
+	</string>
 	<string name="Marketplace Error Not Merchant">
-		Błąd: Przed wysłaniem przedmiotów na Marketplace musisz zostać kupcem (darmowe).
+		Przed wysłaniem przedmiotów na Marketplace musisz zostać kupcem (darmowe).
 	</string>
-	<string name="Marketplace Error Empty Folder">
-		Błąd: Ten folder nie ma zawartości.
+	<string name="Marketplace Error Not Accepted">
+		Nie można przenieść tego przedmiotu.
 	</string>
-	<string name="Marketplace Error Unassociated Products">
-		Błąd: Ta pozycja nie może zostać załadowana, ponieważ Twoje konto kupca ma zbyt wiele nieprzypisanych przedmiotów. Aby naprawić ten błąd zaloguj się na stronę Marketplace i zmniejsz ilość nieprzypisanych (unassociated) przedmiotów.
+	<string name="Marketplace Error Unsellable Item">
+		Ta pozycja nie może być sprzedana na Marketplace.
 	</string>
-	<string name="Marketplace Error Object Limit">
-		Błąd: Ta pozycja zawiera zbyt wiele elementów. Umieść przedmioty razem w pudełkach, aby zmniejszyć ich całkowitą liczbę do mniej niż 200.
+	<string name="MarketplaceNoID">
+		Brak Mkt ID
 	</string>
-	<string name="Marketplace Error Folder Depth">
-		Błąd: Ta pozycja zawiera zbyt wiele zagnieżdżonych folderów. Zreorganizuj wszystko tak, aby były obecne maksymalnie 3 poziomy zagnieżdżonych folderów.
+	<string name="MarketplaceLive">
+		na liście
 	</string>
-	<string name="Marketplace Error Unsellable Item">
-		Błąd: Ta pozycja nie może być sprzedana na Marketplace.
+	<string name="MarketplaceActive">
+		aktywne
+	</string>
+	<string name="MarketplaceMax">
+		maks
+	</string>
+	<string name="MarketplaceStock">
+		magazyn
 	</string>
-	<string name="Marketplace Error Internal Import">
-		Błąd: Wystąpił problem z tą pozycją. Spróbuj ponownie później.
+	<string name="MarketplaceNoStock">
+		brak w Magazynie
+	</string>
+	<string name="MarketplaceUpdating">
+		aktualizacja...
+	</string>
+	<string name="UploadFeeInfo">
+		Opłata zależy od Twojego poziomu członkostwa. Wyższe poziomy to niższe opłaty. [https://secondlife.com/my/account/membership.php? Więcej]
 	</string>
 	<string name="Open landmarks">
 		Otwórz landmarki
@@ -1445,6 +1623,7 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="Scripts" value=" Skrypty,"/>
 	<string name="Sounds" value=" Dźwięki,"/>
 	<string name="Textures" value=" Tekstury,"/>
+	<string name="Settings" value=" Otoczenia," />
 	<string name="Snapshots" value=" Zdjęcia,"/>
 	<string name="No Filters" value="Nie "/>
 	<string name="Since Logoff" value=" - od wylogowania"/>
@@ -1614,7 +1793,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Usta
 	</string>
 	<string name="Chin">
-		Szczęka
+		Podbródek
 	</string>
 	<string name="Left Ear">
 		Lewe ucho
@@ -1676,6 +1855,51 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="Avatar Center">
 		Środek awatara
 	</string>
+	<string name="Left Ring Finger">
+		Lewy palec serdeczny
+	</string>
+	<string name="Right Ring Finger">
+		Prawy palec serdeczny
+	</string>
+	<string name="Tail Base">
+		Podstawa ogona
+	</string>
+	<string name="Tail Tip">
+		Koniec ogona
+	</string>
+	<string name="Left Wing">
+		Lewe skrzydło
+	</string>
+	<string name="Right Wing">
+		Prawe skrzydło
+	</string>
+	<string name="Jaw">
+		Szczęka
+	</string>
+	<string name="Alt Left Ear">
+		Lewe ucho 2
+	</string>
+	<string name="Alt Right Ear">
+		Prawe ucho 2
+	</string>
+	<string name="Alt Left Eye">
+		Lewe oko 2
+	</string>
+	<string name="Alt Right Eye">
+		Prawe oko 2
+	</string>
+	<string name="Tongue">
+		Język
+	</string>
+	<string name="Groin">
+		Krocze
+	</string>
+	<string name="Left Hind Foot">
+		Lewa tylna stopa
+	</string>
+	<string name="Right Hind Foot">
+		Prawa tylna stopa
+	</string>
 	<string name="Invalid Attachment">
 		Nieprawidłowy punkt dodatku
 	</string>
@@ -1706,6 +1930,42 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="TodayOld">
 		Dołączył dzisiaj
 	</string>
+	<string name="av_render_everyone_now">
+		Wszyscy mogą Cię obecnie widzieć.
+	</string>
+	<string name="av_render_not_everyone">
+		Możesz nie być widziany/a przez niektóre osoby wokół Ciebie.
+	</string>
+	<string name="av_render_over_half">
+		Możesz nie być widziany/a przez ponad połowę osób wokół Ciebie.
+	</string>
+	<string name="av_render_most_of">
+		Możesz nie być widziany/a przez większość osób wokół Ciebie.
+	</string>
+	<string name="av_render_anyone">
+		Wszystkie osoby znajdujące się wokół Ciebie nie mogą Cię widzieć.
+	</string>
+	<string name="hud_description_total">
+		Twój HUD
+	</string>
+	<string name="hud_name_with_joint">
+		[OBJ_NAME] (założone na [JNT_NAME])
+	</string>
+	<string name="hud_render_memory_warning">
+		[HUD_DETAILS] używa dużo pamięci tekstur
+	</string>
+	<string name="hud_render_cost_warning">
+		[HUD_DETAILS] zawiera dużo obiektów i tekstur, jakie są ciężkie w renderowaniu
+	</string>
+	<string name="hud_render_heavy_textures_warning">
+		[HUD_DETAILS] zawiera dużo tekstur w wielkich rozmiarach
+	</string>
+	<string name="hud_render_cramped_warning">
+		[HUD_DETAILS] zawiera zbyt dużo obiektów
+	</string>
+	<string name="hud_render_textures_warning">
+		[HUD_DETAILS] zawiera zbyt dużo tekstur
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] rok
 	</string>
@@ -1764,10 +2024,10 @@ Spróbuj zalogować się ponownie za minutę.
 		Pracownik Linden Lab
 	</string>
 	<string name="PaymentInfoUsed">
-		Płatności: Dane użyte
+		Płatności: Dane w użyciu
 	</string>
 	<string name="PaymentInfoOnFile">
-		Płatności: Dane znane
+		Płatności: Dane przypisane
 	</string>
 	<string name="NoPaymentInfoOnFile">
 		Płatności: Dane nieznane
@@ -1823,6 +2083,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="CompileQueueUnknownFailure">
 		Nieznany błąd podczas pobierania
 	</string>
+	<string name="CompileNoExperiencePerm">
+		Pomijanie skryptu [SCRIPT] z Przygodą [EXPERIENCE].
+	</string>
 	<string name="CompileQueueTitle">
 		Postęp rekompilacji
 	</string>
@@ -1857,11 +2120,14 @@ Spróbuj zalogować się ponownie za minutę.
 		Zapisywanie zakończone.
 	</string>
 	<string name="UploadFailed">
-		Ładowanie nieudane:
+		Przesyłanie nieudane:
 	</string>
 	<string name="ObjectOutOfRange">
 		Skrypt (obiekt poza zasięgiem)
 	</string>
+	<string name="ScriptWasDeleted">
+		Skrypt (usunięty z zawartości obiektu)
+	</string>
 	<string name="GodToolsObjectOwnedBy">
 		Obiekt [OBJECT] należący do [OWNER]
 	</string>
@@ -1894,6 +2160,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="NoGroupDataFound">
 		Brak informacji na temat grupy
 	</string>
+	<string name="AlreadyInGroup">
+		Jesteś już w tej grupie
+	</string>
 	<string name="IMParentEstate">
 		majątek rodziców
 	</string>
@@ -1916,22 +2185,34 @@ Spróbuj zalogować się ponownie za minutę.
 		wszystkie majątki, które nadzorujesz dla [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">
-		Dozwoleni Rezydenci: ([ALLOWEDAGENTS], maks. [MAXACCESS])
+		Zawsze dozwoleni: ([ALLOWEDAGENTS], maks. [MAXACCESS])
 	</string>
 	<string name="RegionInfoAllowedGroups">
-		Dozwolone Grupy: ([ALLOWEDGROUPS], maks. [MAXACCESS])
+		Zawsze dozwolone grupy: ([ALLOWEDGROUPS], maks. [MAXACCESS])
 	</string>
 	<string name="RegionInfoEstateManagers">
 		Zarządcy Majątku: ([ESTATEMANAGERS], maks. [MAXMANAGERS])
 	</string>
 	<string name="RegionInfoBannedResidents">
-		Zbanowani Rezydenci: ([BANNEDAGENTS], maks. [MAXBANNED])
+		Zawsze zbanowani: ([BANNEDAGENTS], maks. [MAXBANNED])
 	</string>
 	<string name="RegionInfoListTypeAllowedAgents">
-		Dozwoleni Rezydenci
+		zawsze dozwoleni rezydenci
 	</string>
 	<string name="RegionInfoListTypeBannedAgents">
-		Zbanowani Rezydenci
+		zawsze zbanowani rezydenci
+	</string>
+	<string name="RegionInfoAllEstates">
+		wszystkie majątki
+	</string>
+	<string name="RegionInfoManagedEstates">
+		zarządzane majątki
+	</string>
+	<string name="RegionInfoThisEstate">
+		ten majątek
+	</string>
+	<string name="AndNMore">
+		i [EXTRA_COUNT] więcej
 	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Pamięć skryptów działki
@@ -1976,7 +2257,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Klatka piersiowa
 	</string>
 	<string name="ATTACH_HEAD">
-		Głowa
+		Czaszka
 	</string>
 	<string name="ATTACH_LSHOULDER">
 		Lewe ramię
@@ -1997,7 +2278,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Prawa stopa
 	</string>
 	<string name="ATTACH_BACK">
-		Plecy
+		Kręgosłup
 	</string>
 	<string name="ATTACH_PELVIS">
 		Miednica
@@ -2027,13 +2308,13 @@ Spróbuj zalogować się ponownie za minutę.
 		Prawe górne ramię
 	</string>
 	<string name="ATTACH_RLARM">
-		Prawe dolne ramię
+		Prawe przedramię
 	</string>
 	<string name="ATTACH_LUARM">
 		Lewe górne ramię
 	</string>
 	<string name="ATTACH_LLARM">
-		Lewe dolne ramię
+		Lewe przedramię
 	</string>
 	<string name="ATTACH_RHIP">
 		Biodro prawe
@@ -2056,12 +2337,12 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="ATTACH_BELLY">
 		Brzuch
 	</string>
-	<string name="ATTACH_RPEC">
-		Prawa pierś
-	</string>
-	<string name="ATTACH_LPEC">
+	<string name="ATTACH_LEFT_PEC">
 		Lewa pierś
 	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		Prawa pierś
+	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD środek 2
 	</string>
@@ -2092,6 +2373,51 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="ATTACH_AVATAR_CENTER">
 		Środek awatara
 	</string>
+	<string name="ATTACH_LHAND_RING1">
+		Lewy palec serdeczny
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		Prawy palec serdeczny
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		Podstawa ogona
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		Koniec ogona
+	</string>
+	<string name="ATTACH_LWING">
+		Lewe skrzydło
+	</string>
+	<string name="ATTACH_RWING">
+		Prawe skrzydło
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		Szczęka
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		Lewe ucho 2
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		Prawe ucho 2
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		Lewe oko 2
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		Prawe oko 2
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		Język
+	</string>
+	<string name="ATTACH_GROIN">
+		Krocze
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		Lewa tylna stopa
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		Prawa tylna stopa
+	</string>
 	<string name="CursorPos">
 		Linia [LINE], Kolumna [COLUMN]
 	</string>
@@ -2129,7 +2455,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Brak umowy dla tego majątku.
 	</string>
 	<string name="RegionNoCovenantOtherOwner">
-		Brak umowy dla tego majątku. Działka w tym majątku została sprzedana przez właściciela majątku, a nie przez Linden Lab. Skontaktuj się z właścicielem majątku w celu uzyskania szczegółów sprzedaży.
+		Brak umowy dla tego majątku. Działka w tym majątku została sprzedana przez właściciela majątku. Skontaktuj się z właścicielem majątku w celu uzyskania szczegółów sprzedaży.
 	</string>
 	<string name="covenant_last_modified" value="Ostatnia modyfikacja: "/>
 	<string name="none_text" value=" (brak) "/>
@@ -2146,6 +2472,27 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="RegionSettings">
 		Ustawienia regionu
 	</string>
+	<string name="NoEnvironmentSettings">
+		Ten region nie obsługuje ustawień otoczenia.
+	</string>
+	<string name="EnvironmentSun">
+		Słońce
+	</string>
+	<string name="EnvironmentMoon">
+		Księżyc
+	</string>
+	<string name="EnvironmentBloom">
+		Blask
+	</string>
+	<string name="EnvironmentCloudNoise">
+		Szum chmur
+	</string>
+	<string name="EnvironmentNormalMap">
+		Mapa normalnych
+	</string>
+	<string name="EnvironmentTransparent">
+		Przezroczyste
+	</string>
 	<string name="ClassifiedClicksTxt">
 		Kliknij: [TELEPORT] teleportuj, [MAP] mapa, [PROFILE] profil
 	</string>
@@ -2153,11 +2500,23 @@ Spróbuj zalogować się ponownie za minutę.
 		(zostanie zaktualizowane po publikacji)
 	</string>
 	<string name="NoPicksClassifiedsText">
-		Nie dodałeś/aś nic do Ulubionych i Reklam. Kliknij na przycisk + poniżej, aby dodać miejsce do Ulubionych lub Reklam.
+		Nie dodano nic do Miejsc i Reklam. Kliknij na przycisk Nowe, aby utworzyć Miejsce lub Reklamę.
+	</string>
+	<string name="NoPicksText">
+		Nie dodano żadnych Miejsc. Kliknij na przycisk Nowe, aby utworzyć Miejsce.
+	</string>
+	<string name="NoClassifiedsText">
+		Nie dodano żadnych reklam. Kliknij na przycisk Nowa, aby utworzyć reklamę.
 	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		Brak ulubionych miejsc/reklam
 	</string>
+	<string name="NoAvatarPicksText">
+		Brak ulubionych miejsc
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		Brak reklam
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Ładowanie...
 	</string>
@@ -2228,14 +2587,11 @@ Spróbuj zalogować się ponownie za minutę.
 		Anuluj
 	</string>
 	<string name="UploadingCosts">
-		Załadowanie [NAME] kosztuje [AMOUNT]L$
-	</string>
-	<string name="BuyingCosts">
-		Cena zakupu tego wynosi [AMOUNT]L$
+		Przesyłanie [NAME] kosztuje [AMOUNT]L$
 	</string>
 	<string name="UnknownFileExtension">
 		Nieznane rozszerzenie pliku .%s
-Oczekiwane .wav, .tga, .bmp, .jpg, .jpeg, lub .bvh
+Oczekiwane .wav, .tga, .bmp, .jpg, .jpeg, lub .anim
 	</string>
 	<string name="MuteObject2">
 		Zablokuj
@@ -2327,6 +2683,9 @@ Oczekiwane .wav, .tga, .bmp, .jpg, .jpeg, lub .bvh
 	<string name="Linden Location">
 		Lokalizacja Lindenów
 	</string>
+	<string name="Adult">
+		Dla dorosłych
+	</string>
 	<string name="Arts&amp;Culture">
 		Sztuka i Kultura
 	</string>
@@ -2383,7 +2742,7 @@ Błąd:
 	<string name="MBUnableToAccessFile">
 		Aplikacja [APP_NAME] nie odnalazła poszukiwanego pliku.
 
-Może być to spowodowane aktywnością kilku kopii oprogramowania w tej samej chwili lub Twój system błędnie odczytuje proces zakończenia dla uruchomionych aplikacji.
+Może być to spowodowane aktywnością kilku kopii oprogramowania w tej samej chwili lub Twój system błędnie uważa, że plik jest otwarty / zablokowany.
 Jeżeli nadal otrzymujesz ten komunikat, uruchom swój komputer ponownie.
 Jeżeli problem nadal występuje, proponujemy całkowite odinstalowanie aplikacji [APP_NAME] oraz ponowną jej instalację.
 	</string>
@@ -2448,7 +2807,7 @@ Uruchomione w oknie.
 Ustaw tryb koloru swojego wyświetlacza na 32-bity.
 	</string>
 	<string name="MBAlpha">
-		Aplikacja [APP_NAME] nie może zostać uruchomiona, ponieważ nie jest możliwe dostanie się na kanał 8 bitowy alpha. Najczęściej jest to spowodowane błędami sterowników karty video.
+		Aplikacja [APP_NAME] nie może zostać uruchomiona, ponieważ nie może uzyskać dostępu do 8 bitowego kanału alpha. Najczęściej jest to spowodowane błędami sterowników karty video.
 Upewnij się, że posiadasz najnowsze aktualizacje sterowników karty video.
 Dodatkowo, sprawdź czy Twój monitor posiada poprawną konfigurację koloru (32-bity) w Panel Sterowania &gt; Ekran &gt; Ustawienia.
 Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
@@ -2467,7 +2826,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 
 Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	</string>
-	<string name="5 O&apos;Clock Shadow">
+	<string name="5 O'Clock Shadow">
 		Cień na godzinie 5
 	</string>
 	<string name="All White">
@@ -3997,9 +4356,6 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	<string name="IM_to_label">
 		Do
 	</string>
-	<string name="IM_moderator_label">
-		(Moderator)
-	</string>
 	<string name="Saved_message">
 		(Zapisano [LONG_TIMESTAMP])
 	</string>
@@ -4012,6 +4368,12 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	<string name="OfflineStatus">
 		niedostępny/a
 	</string>
+	<string name="not_online_msg">
+		Ta osoba jest niedostępna - wiadomość zostanie zapisana i dostarczona później.
+	</string>
+	<string name="not_online_inventory">
+		Ta osoba jest niedostępna - przedmiot został zapisany.
+	</string>
 	<string name="answered_call">
 		Twoja rozmowa głosowa została odebrana
 	</string>
@@ -4046,20 +4408,14 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 		Konferencja z [AGENT_NAME]
 	</string>
 	<string name="inventory_item_offered-im">
-		Zaoferowano przedmiot
+		Zaoferowano przedmiot: '[ITEM_NAME]'
+	</string>
+	<string name="inventory_folder_offered-im">
+		Zaoferowano folder: '[ITEM_NAME]'
 	</string>
 	<string name="share_alert">
 		Przeciągaj tutaj rzeczy z Szafy
 	</string>
-	<string name="facebook_post_success">
-		Wysłałeś/aś post na Facebooka.
-	</string>
-	<string name="flickr_post_success">
-		Wysłałeś/aś post na Flickr.
-	</string>
-	<string name="twitter_post_success">
-		Wysłałeś/aś post na Twittera.
-	</string>
 	<string name="no_session_message">
 		(Sesja IM wygasła)
 	</string>
@@ -4076,10 +4432,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 		Zablokowałeś/aś tego Rezydenta. Wysłanie wiadomości odblokuje go automatycznie.
 	</string>
 	<string name="generic">
-		Błąd zapytania, proszę spróbować później
+		Zamknij i ponownie otwórz rozmowę - lub przeloguj się i spróbuj ponownie.
 	</string>
 	<string name="generic_request_error">
-		Błąd. Spróbuj ponownie za kilka minut.
+		Zamknij i ponownie otwórz rozmowę - lub przeloguj się i spróbuj ponownie.
 	</string>
 	<string name="insufficient_perms_error">
 		Nie masz wystarczających uprawnień.
@@ -4131,6 +4487,9 @@ Jeśli nie pojawi się w ciągu kilku minut może to oznaczać, że została pom
 	<string name="unread_chat_multiple">
 		[SOURCES] powiedział/a coś nowego
 	</string>
+	<string name="teleport_preamble_compact_chat">
+		Jesteś teraz w
+	</string>
 	<string name="session_initialization_timed_out_error">
 		Inicjalizacja sesji wygasła
 	</string>
@@ -4140,12 +4499,18 @@ Jeśli nie pojawi się w ciągu kilku minut może to oznaczać, że została pom
 	<string name="paid_you_ldollars">
 		[NAME] zapłacił/a Tobie [AMOUNT]L$ [REASON].
 	</string>
+	<string name="paid_you_ldollars_gift">
+		[NAME] zapłacił/a Tobie [AMOUNT]L$: [REASON]
+	</string>
 	<string name="paid_you_ldollars_no_reason">
 		[NAME] zapłacił/a Tobie [AMOUNT]L$.
 	</string>
 	<string name="you_paid_ldollars">
 		Zapłacono [NAME] [AMOUNT]L$ [REASON].
 	</string>
+	<string name="you_paid_ldollars_gift">
+		Zapłacono [NAME] [AMOUNT]L$: [REASON]
+	</string>
 	<string name="you_paid_ldollars_no_info">
 		Zapłacono [AMOUNT]L$.
 	</string>
@@ -4158,6 +4523,9 @@ Jeśli nie pojawi się w ciągu kilku minut może to oznaczać, że została pom
 	<string name="you_paid_failure_ldollars">
 		Nie udało się zapłacić [NAME] [AMOUNT]L$ [REASON].
 	</string>
+	<string name="you_paid_failure_ldollars_gift">
+		Nie udało się zapłacić [NAME] [AMOUNT]L$: [REASON]
+	</string>
 	<string name="you_paid_failure_ldollars_no_info">
 		Nie udało się zapłacić [AMOUNT]L$.
 	</string>
@@ -4186,25 +4554,25 @@ Jeśli nie pojawi się w ciągu kilku minut może to oznaczać, że została pom
 		aby dołączyć do grupy
 	</string>
 	<string name="to upload">
-		aby załadować
+		aby przesłać
 	</string>
 	<string name="to publish a classified ad">
 		publikacja reklamy
 	</string>
-	<string name="giving">
-		Dajesz [AMOUNT]L$
-	</string>
 	<string name="uploading_costs">
-		Ładowanie kosztuje [AMOUNT]L$
+		Przesyłanie kosztuje [AMOUNT]L$
 	</string>
 	<string name="this_costs">
 		To kosztuje [AMOUNT]L$
 	</string>
 	<string name="buying_selected_land">
-		Kupno wybranej działki za [AMOUNT]L$
+		Działka kosztuje
 	</string>
 	<string name="this_object_costs">
-		Ten obiekt kosztuje [AMOUNT]L$
+		Obiekt kosztuje
+	</string>
+	<string name="giving">
+		Chcesz dać
 	</string>
 	<string name="group_role_everyone">
 		Każdy
@@ -4219,7 +4587,7 @@ Jeśli nie pojawi się w ciągu kilku minut może to oznaczać, że została pom
 		Obecnie w SL
 	</string>
 	<string name="uploading_abuse_report">
-		Ładowanie...
+		Przesyłanie...
 
 Raport o Nadużyciu
 	</string>
@@ -4268,6 +4636,9 @@ Raport o Nadużyciu
 	<string name="New Tattoo">
 		Nowy tatuaż
 	</string>
+	<string name="New Universal">
+		Nowa warstwa uniwersalna
+	</string>
 	<string name="New Physics">
 		Nowa fizyka
 	</string>
@@ -4394,6 +4765,15 @@ Raport o Nadużyciu
 	<string name="Female - Wow">
 		Kobieta - Wow
 	</string>
+	<string name="New Day">
+		Nowy cykl dnia
+	</string>
+	<string name="New Water">
+		Nowa woda
+	</string>
+	<string name="New Sky">
+		Nowe niebo
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt].[mthnum,datetime,slt].[year,datetime,slt]
 	</string>
@@ -4403,10 +4783,19 @@ Raport o Nadużyciu
 	<string name="texture_load_dimensions_error">
 		Nie można załadować obrazów większych niż [WIDTH]*[HEIGHT]
 	</string>
+	<string name="outfit_photo_load_dimensions_error">
+		Maks. rozmiar zdjęcia stroju to [WIDTH]*[HEIGHT]. Przeskaluj lub użyj innego.
+	</string>
+	<string name="outfit_photo_select_dimensions_error">
+		Maks. rozmiar zdjęcia stroju to [WIDTH]*[HEIGHT]. Użyj innej tekstury.
+	</string>
+	<string name="outfit_photo_verify_dimensions_error">
+		Nie można sprawdzić wymiarów zdjęcia. Poczekaj, aż pojawi się na podglądzie.
+	</string>
 	<string name="server_is_down">
 		Pomimo naszych najlepszych starań wystąpił niespodziewany problem.
 
-Proszę sprawdzić czy na stronie status.secondlifegrid.net nie zostały umieszczone informacje o rozpoznanych problemach serwera.
+Proszę sprawdzić czy na https://status.secondlifegrid.net nie zostały umieszczone informacje o rozpoznanych problemach serwera.
 Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia firewall.
 	</string>
 	<string name="dateTimeWeekdaysNames">
@@ -4466,6 +4855,18 @@ Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia
 	<string name="Chat">
 		Czat
 	</string>
+	<string name="BaseMembership">
+		Podstawowe
+	</string>
+	<string name="InternalMembership">
+		Wewnętrzne
+	</string>
+	<string name="MembershipUpgradeText">
+		Zmień plan członkostwa
+	</string>
+	<string name="MembershipPremiumText">
+		Moje członkostwo Premium
+	</string>
 	<string name="DeleteItems">
 		Usunąć zaznaczone obiekty?
 	</string>
@@ -4476,7 +4877,7 @@ Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia
 		W tym stroju nie ma elementów
 	</string>
 	<string name="ExternalEditorNotSet">
-		Wybierz edytor używając ustawień ExternalEditor.
+		Wybierz edytor poprzez ustawienie zmiennej środowiska LL_SCRIPT_EDITOR lub ustawienie ExternalEditor.
 	</string>
 	<string name="ExternalEditorNotFound">
 		Nie odnaleziono zewnętrznego edytora wskazanego przez Ciebie.
@@ -4507,6 +4908,24 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Divide">
 		Podziel
 	</string>
+	<string name="LMB">
+		LPM
+	</string>
+	<string name="MMB">
+		ŚPM
+	</string>
+	<string name="RMB">
+		PPM
+	</string>
+	<string name="MB4">
+		Mysz4
+	</string>
+	<string name="MB5">
+		Mysz5
+	</string>
+	<string name="Double LMB">
+		Podwójny LPM
+	</string>
 	<string name="BeaconParticle">
 		Emitery cząsteczek (niebieski)
 	</string>
@@ -4525,9 +4944,18 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="BeaconMedia">
 		Emitery mediów (biały)
 	</string>
+	<string name="BeaconSun">
+		Emiter kierunku Słońca (pomarańczowy)
+	</string>
+	<string name="BeaconMoon">
+		Emiter kierunku Księżyca (purpurowy)
+	</string>
 	<string name="ParticleHiding">
 		Ukryj cząsteczki
 	</string>
+	<string name="Command_360_Capture_Label">
+		Zdjęcie 360°
+	</string>
 	<string name="Command_AboutLand_Label">
 		O działce
 	</string>
@@ -4535,7 +4963,7 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 		Wygląd
 	</string>
 	<string name="Command_Avatar_Label">
-		Awatar
+		Biblioteka awatarów
 	</string>
 	<string name="Command_Build_Label">
 		Buduj
@@ -4552,9 +4980,15 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Destinations_Label">
 		Cele podróży
 	</string>
+	<string name="Command_Environments_Label">
+		Otoczenia
+	</string>
 	<string name="Command_Gestures_Label">
 		Gesty
 	</string>
+	<string name="Command_Grid_Status_Label">
+		Status świata
+	</string>
 	<string name="Command_HowTo_Label">
 		Samouczek
 	</string>
@@ -4564,18 +4998,12 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Map_Label">
 		Mapa
 	</string>
-	<string name="Command_Marketplace_Label">
-		Marketplace
-	</string>
 	<string name="Command_MiniMap_Label">
 		Minimapa
 	</string>
 	<string name="Command_Move_Label">
 		Ruch
 	</string>
-	<string name="Command_Outbox_Label">
-		Skrzynka nadawcza kupca
-	</string>
 	<string name="Command_People_Label">
 		Ludzie
 	</string>
@@ -4591,6 +5019,9 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Profile_Label">
 		Profil
 	</string>
+	<string name="Command_Report_Abuse_Label">
+		Zgłoś nadużycie
+	</string>
 	<string name="Command_Search_Label">
 		Szukaj
 	</string>
@@ -4606,6 +5037,9 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Voice_Label">
 		Pobliski głos
 	</string>
+	<string name="Command_360_Capture_Tooltip">
+		Uchwyć równoprostokątny obraz 360°
+	</string>
 	<string name="Command_AboutLand_Tooltip">
 		Informacje o miejscu, które odwiedzasz
 	</string>
@@ -4630,15 +5064,15 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Destinations_Tooltip">
 		Punkty, jakie mogą być interesujące
 	</string>
-	<string name="Command_Facebook_Tooltip">
-		Wyślij na Facebooka
-	</string>
-	<string name="Command_Flickr_Tooltip">
-		Wyślij na Flickr
+	<string name="Command_Environments_Tooltip">
+		Otoczenia
 	</string>
 	<string name="Command_Gestures_Tooltip">
 		Gesty Twojego awatara
 	</string>
+	<string name="Command_Grid_Status_Tooltip">
+		Pokaż obecny status świata
+	</string>
 	<string name="Command_HowTo_Tooltip">
 		Jak wykonywać zwyczajne rzeczy
 	</string>
@@ -4651,15 +5085,15 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Marketplace_Tooltip">
 		Idź na zakupy
 	</string>
+	<string name="Command_MarketplaceListings_Tooltip">
+		Sprzedawaj owoce swojej kreatywności
+	</string>
 	<string name="Command_MiniMap_Tooltip">
 		Pokaż ludzi w pobliżu
 	</string>
 	<string name="Command_Move_Tooltip">
 		Poruszanie Twoim awatarem
 	</string>
-	<string name="Command_Outbox_Tooltip">
-		Przenieś przedmioty na Marketplace, aby je sprzedać
-	</string>
 	<string name="Command_People_Tooltip">
 		Znajomi, grupy i ludzie w pobliżu
 	</string>
@@ -4675,6 +5109,9 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Profile_Tooltip">
 		Edytuj lub zobacz swój profil
 	</string>
+	<string name="Command_Report_Abuse_Tooltip">
+		Zgłoś nadużycie
+	</string>
 	<string name="Command_Search_Tooltip">
 		Znajdź miejsca, wydarzenia i ludzi
 	</string>
@@ -4756,6 +5193,99 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="UserDictionary">
 		[Użytkownika]
 	</string>
+	<string name="experience_tools_experience">
+		Przygoda
+	</string>
+	<string name="ExperienceNameNull">
+		(bez przygody)
+	</string>
+	<string name="ExperienceNameUntitled">
+		(przygoda bez nazwy)
+	</string>
+	<string name="Land-Scope">
+		Zakres: Ziemia
+	</string>
+	<string name="Grid-Scope">
+		Zakres: Cały świat
+	</string>
+	<string name="Allowed_Experiences_Tab">
+		ZEZWALAM
+	</string>
+	<string name="Blocked_Experiences_Tab">
+		BLOKUJĘ
+	</string>
+	<string name="Contrib_Experiences_Tab">
+		TWORZĘ
+	</string>
+	<string name="Admin_Experiences_Tab">
+		ZARZĄDZAM
+	</string>
+	<string name="Recent_Experiences_Tab">
+		OSTATNIE
+	</string>
+	<string name="Owned_Experiences_Tab">
+		MOJE
+	</string>
+	<string name="ExperiencesCounter">
+		([EXPERIENCES], maks. [MAXEXPERIENCES])
+	</string>
+	<string name="ExperiencePermission1">
+		kontrolować klawisze
+	</string>
+	<string name="ExperiencePermission3">
+		animować Twojego awatara
+	</string>
+	<string name="ExperiencePermission4">
+		dołączać do Twojego awatara
+	</string>
+	<string name="ExperiencePermission9">
+		śledzić Twoją kamerę
+	</string>
+	<string name="ExperiencePermission10">
+		kontrolować Twoją kamerę
+	</string>
+	<string name="ExperiencePermission11">
+		teleportować Cię
+	</string>
+	<string name="ExperiencePermission12">
+		automatycznie akceptować uprawnienia przygody
+	</string>
+	<string name="ExperiencePermission16">
+		zmuszać Twojego awatara do siadania
+	</string>
+	<string name="ExperiencePermission17">
+		zmieniać Twoje ustawienia otoczenia
+	</string>
+	<string name="ExperiencePermissionShortUnknown">
+		wykonać nieznaną operację: [Permission]
+	</string>
+	<string name="ExperiencePermissionShort1">
+		Kontrola klawiszy
+	</string>
+	<string name="ExperiencePermissionShort3">
+		Rozpoczynanie animacji
+	</string>
+	<string name="ExperiencePermissionShort4">
+		Dołączanie
+	</string>
+	<string name="ExperiencePermissionShort9">
+		Śledzenie kamery
+	</string>
+	<string name="ExperiencePermissionShort10">
+		Kontrola kamery
+	</string>
+	<string name="ExperiencePermissionShort11">
+		Teleportacja
+	</string>
+	<string name="ExperiencePermissionShort12">
+		Uprawnienia
+	</string>
+	<string name="ExperiencePermissionShort16">
+		Siadanie
+	</string>
+	<string name="ExperiencePermissionShort17">
+		Otoczenie
+	</string>
 	<string name="logging_calls_disabled_log_empty">
 		Rozmowy nie są zapisywane do dziennika. Jeśli chcesz zacząć je logować wybierz "Zapisywanie: tylko dziennik" lub "Zapisywanie: dziennik i logi rozmów" w Preferencje > Czat.
 	</string>
@@ -4768,4 +5298,52 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="loading_chat_logs">
 		Wczytywanie...
 	</string>
+	<string name="na">
+		n/d
+	</string>
+	<string name="preset_combo_label">
+		-Lista jest pusta-
+	</string>
+	<string name="Default">
+		Domyślne
+	</string>
+	<string name="none_paren_cap">
+		(Brak)
+	</string>
+	<string name="no_limit">
+		Bez limitu
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		Kształt fizyczny zawiera trójkąty, które są zbyt małe. Spróbuj uprościć model fizyczny.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		Kształt fizyczny zawiera uszkodzone dane. Spróbuj poprawić model fizyczny.
+	</string>
+	<string name="Mav_Details_MAV_BLOCK_MISSING">
+		Brakujące dane. Upewnij się, że wysoki LOD jest obecny i prawidłowy. Ustaw model fizyczny, jeśli nie jest obecny.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		Kształt fizyczny zawiera niepoprawną wersję. Ustaw poprawną wersję dla modelu fizycznego.
+	</string>
+	<string name="couldnt_resolve_host">
+		DNS nie mógł znaleźć nazwy hosta ([HOSTNAME]).
+Sprawdź, czy możesz połączyć się z www.secondlife.com
+Jeśli możesz, ale nadal otrzymujesz ten błąd, to przejdź
+do sekcji pomocy technicznej i zgłoś ten problem.
+	</string>
+	<string name="ssl_peer_certificate">
+		Serwer logowania nie mógł zweryfikować się poprzez SSL.
+Jeśli nadal będziesz otrzymywać ten błąd, to przejdź
+do sekcji wsparcia witryny SecondLife.com i zgłoś problem.
+	</string>
+	<string name="ssl_connect_error">
+		Często oznacza to, że zegar komputera jest ustawiony nieprawidłowo.
+Przejdź do Panelu Sterowania i upewnij się, że godzina i data
+są ustawione prawidłowo.
+Sprawdź również, czy twoja sieć i zapora są poprawnie skonfigurowane.
+Jeśli nadal będziesz otrzymywać ten błąd, to przejdź
+do sekcji wsparcia witryny SecondLife.com i zgłoś problem.
+
+[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Knowledge Base]
+	</string>
 </strings>
-- 
cgit v1.2.3


From a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 13 Feb 2023 15:08:51 -0800
Subject: Fix up a couple of tiny merge conflicts after a merge with main

---
 indra/llcommon/llsdserialize.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index cf6c1ab73a..2f12c6d1ff 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -870,7 +870,7 @@ public:
 LL_COMMON_API std::string zip_llsd(LLSD& data);
 
 
-LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size);
+LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size);
 
 // returns a pointer to the array or past the array if the deprecated header exists
 LL_COMMON_API char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size = nullptr);
-- 
cgit v1.2.3


From c5a3c97b6b3a65a4f0c34e74db925f8ed71c8109 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 14 Feb 2023 00:40:01 +0100
Subject: Add multi item properties floater support

---
 indra/newview/llfloatermarketplacelistings.cpp | 16 ++++++++++++++++
 indra/newview/llfloatermarketplacelistings.h   |  7 +++++++
 indra/newview/llinventoryfunctions.cpp         | 10 ++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 56cdd3446f..58bd4bc82b 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -45,6 +45,7 @@
 #include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "lltrans.h"
+#include "llviewerwindow.h"
 
 ///----------------------------------------------------------------------------
 /// LLPanelMarketplaceListings
@@ -982,3 +983,18 @@ void LLFloaterItemProperties::onOpen(const LLSD& key)
     }
 }
 
+LLMultiItemProperties::LLMultiItemProperties(const LLSD& key)
+	: LLMultiFloater(LLSD())
+{
+	// start with a small rect in the top-left corner ; will get resized
+	LLRect rect;
+	rect.setLeftTopAndSize(0, gViewerWindow->getWindowHeightScaled(), 350, 350);
+	setRect(rect);
+	LLFloater* last_floater = LLFloaterReg::getLastFloaterInGroup(key.asString());
+	if (last_floater)
+	{
+		stackWith(*last_floater);
+	}
+	setTitle(LLTrans::getString("MultiPropertiesTitle"));
+	buildTabContainer();
+}
diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h
index ffc098e28a..77e855fd2a 100644
--- a/indra/newview/llfloatermarketplacelistings.h
+++ b/indra/newview/llfloatermarketplacelistings.h
@@ -33,6 +33,7 @@
 #include "llinventorypanel.h"
 #include "llnotificationptr.h"
 #include "llmodaldialog.h"
+#include "llmultifloater.h"
 #include "lltexteditor.h"
 
 class LLInventoryCategoriesObserver;
@@ -223,4 +224,10 @@ public:
 private:
 };
 
+class LLMultiItemProperties : public LLMultiFloater
+{
+public:
+	LLMultiItemProperties(const LLSD& key);
+};
+
 #endif // LL_LLFLOATERMARKETPLACELISTINGS_H
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index c3c8945556..38f79620bb 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2561,6 +2561,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 
 
 	LLMultiPreview* multi_previewp = NULL;
+	LLMultiItemProperties* multi_itempropertiesp = nullptr;
 
 	if (("task_open" == action  || "open" == action) && selected_items.size() > 1)
 	{
@@ -2594,8 +2595,9 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	}
 	else if (("task_properties" == action || "properties" == action) && selected_items.size() > 1)
 	{
-        // Isn't supported (previously used LLMultiProperties)
-        LL_WARNS() << "Tried to open properties for multiple items" << LL_ENDL;
+		multi_itempropertiesp = new LLMultiItemProperties("item_properties");
+		gFloaterView->addChild(multi_itempropertiesp);
+		LLFloater::setFloaterHost(multi_itempropertiesp);
 	}
 
 	std::set<LLUUID> selected_uuid_set = LLAvatarActions::getInventorySelectedUUIDs();
@@ -2768,6 +2770,10 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	{
 		multi_previewp->openFloater(LLSD());
 	}
+	else if (multi_itempropertiesp)
+	{
+		multi_itempropertiesp->openFloater(LLSD());
+	}
 }
 
 void LLInventoryAction::saveMultipleTextures(const std::vector<std::string>& filenames, std::set<LLFolderViewItem*> selected_items, LLInventoryModel* model)
-- 
cgit v1.2.3


From 90b272680e5e8d9781e135a07aa36f39a8427206 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 14 Feb 2023 01:00:17 +0100
Subject: Re-enable properties menu option for inventory multi-selections

---
 indra/newview/llinventorybridge.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 2dd5d12ee6..81db0c45c2 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -921,12 +921,6 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
 	addDeleteContextMenuOptions(items, disabled_items);
 
-	// If multiple items are selected, disable properties (if it exists).
-	if ((flags & FIRST_SELECTED_ITEM) == 0)
-	{
-		disabled_items.push_back(std::string("Properties"));
-	}
-
 	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
 	if (active_panel && (active_panel->getName() != "All Items"))
 	{
-- 
cgit v1.2.3


From 23a781317a12e7e46124a05efd1a6849a39438b3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 14 Feb 2023 02:45:58 +0200
Subject: SL-19196 Nearby chat bar moves down every time it gains focus

---
 indra/newview/llfloaterimnearbychat.cpp | 2 ++
 indra/newview/llfloaterimsessiontab.cpp | 6 ++++++
 indra/newview/llfloaterimsessiontab.h   | 1 +
 3 files changed, 9 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index f1807f1c5b..0d2c6d8e4c 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -108,6 +108,8 @@ LLFloaterIMNearbyChat::LLFloaterIMNearbyChat(const LLSD& llsd)
 	mEnableCallbackRegistrar.add("Avatar.EnableGearItem", boost::bind(&cb_do_nothing));
 	mCommitCallbackRegistrar.add("Avatar.GearDoToSelected", boost::bind(&cb_do_nothing));
 	mEnableCallbackRegistrar.add("Avatar.CheckGearItem", boost::bind(&cb_do_nothing));
+
+    mMinFloaterHeight = EXPANDED_MIN_HEIGHT;
 }
 
 //static
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 78271369d2..af4e7f5aff 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -92,6 +92,8 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
     mEnableCallbackRegistrar.add("Avatar.EnableItem", boost::bind(&LLFloaterIMSessionTab::enableContextMenuItem, this, _2));
     mCommitCallbackRegistrar.add("Avatar.DoToSelected", boost::bind(&LLFloaterIMSessionTab::doToSelected, this, _2));
     mCommitCallbackRegistrar.add("Group.DoToSelected", boost::bind(&cb_group_do_nothing));
+
+    mMinFloaterHeight = getMinHeight();
 }
 
 LLFloaterIMSessionTab::~LLFloaterIMSessionTab()
@@ -934,10 +936,13 @@ void LLFloaterIMSessionTab::reshapeFloater(bool collapse)
 		S32 height = mContentPanel->getRect().getHeight() + mToolbarPanel->getRect().getHeight()
 			+ mChatLayoutPanel->getRect().getHeight() - mChatLayoutPanelHeight + 2;
 		floater_rect.mTop -= height;
+
+        setResizeLimits(getMinWidth(), floater_rect.getHeight());
 	}
 	else
 	{
 		floater_rect.mTop = floater_rect.mBottom + mFloaterHeight;
+        setResizeLimits(getMinWidth(), mMinFloaterHeight);
 	}
 
 	enableResizeCtrls(true, true, !collapse);
@@ -962,6 +967,7 @@ void LLFloaterIMSessionTab::restoreFloater()
 		setShape(floater_rect, true);
 		mBodyStack->updateLayout();
 		mExpandCollapseLineBtn->setImageOverlay(getString("expandline_icon"));
+        setResizeLimits(getMinWidth(), mMinFloaterHeight);
 		setMessagePaneExpanded(true);
 		saveCollapsedState();
 		mInputEditor->enableSingleLineMode(false);
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 9f00917647..d478922617 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -152,6 +152,7 @@ protected:
 
 	bool mMessagePaneExpanded;
 	bool mIsParticipantListExpanded;
+    S32 mMinFloaterHeight;
 
 
 	LLIMModel::LLIMSession* mSession;
-- 
cgit v1.2.3


From 4bc9331dddbacb9c0c36252b32f2514b9080dcf5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 14 Feb 2023 18:04:46 +0200
Subject: SL-19140 Fix contribution doc

---
 indra/newview/llinventoryfunctions.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 38f79620bb..5e5be39c0c 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -49,6 +49,7 @@
 #include "llclipboard.h"
 #include "lldirpicker.h"
 #include "lldonotdisturbnotificationstorage.h"
+#include "llfloatermarketplacelistings.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llfocusmgr.h"
 #include "llfolderview.h"
-- 
cgit v1.2.3


From 23a3da37a91ea80311b5820c48a12d56b989f69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pantera=20P=C3=B3=C5=82nocy?= <panterapolnocy@gmail.com>
Date: Tue, 14 Feb 2023 17:58:45 +0100
Subject: SL-19207 Skins cleanup; Remove unused files (not present in /en/)
 across all translations (#80)

---
 .../default/xui/da/floater_animation_preview.xml   | 187 ---------------------
 .../skins/default/xui/da/floater_inventory.xml     |  16 --
 .../skins/default/xui/da/floater_nearby_chat.xml   |   4 -
 .../skins/default/xui/da/floater_perm_prefs.xml    |  16 --
 .../skins/default/xui/da/floater_postcard.xml      |  36 ----
 .../default/xui/da/floater_voice_controls.xml      |  30 ----
 .../skins/default/xui/da/menu_bottomtray.xml       |  17 --
 .../default/xui/da/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/da/menu_inspect_self_gear.xml      |  31 ----
 .../xui/da/menu_people_friends_view_sort.xml       |   8 -
 .../xui/da/menu_people_groups_view_sort.xml        |   5 -
 .../xui/da/menu_people_nearby_view_sort.xml        |   8 -
 .../xui/da/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/da/panel_adhoc_control_panel.xml   |  14 --
 .../skins/default/xui/da/panel_bottomtray.xml      |  47 ------
 .../default/xui/da/panel_group_control_panel.xml   |  17 --
 .../default/xui/da/panel_im_control_panel.xml      |  29 ----
 .../skins/default/xui/da/panel_region_texture.xml  |  57 -------
 .../skins/default/xui/de/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/de/floater_perm_prefs.xml    |  16 --
 .../default/xui/de/floater_voice_controls.xml      |  30 ----
 .../default/xui/de/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/de/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/de/menu_name_field.xml       |   6 -
 .../xui/de/menu_people_friends_view_sort.xml       |   8 -
 .../xui/de/menu_people_groups_view_sort.xml        |   5 -
 .../xui/de/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/de/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/de/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/de/panel_facebook_account.xml      |  15 --
 .../default/xui/de/panel_group_control_panel.xml   |  17 --
 .../default/xui/de/panel_im_control_panel.xml      |  30 ----
 .../default/xui/de/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/es/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/es/floater_perm_prefs.xml    |  16 --
 .../default/xui/es/floater_voice_controls.xml      |  30 ----
 .../default/xui/es/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/es/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/es/menu_name_field.xml       |   6 -
 .../xui/es/menu_people_friends_view_sort.xml       |   8 -
 .../xui/es/menu_people_groups_view_sort.xml        |   5 -
 .../xui/es/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/es/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/es/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/es/panel_facebook_account.xml      |  15 --
 .../default/xui/es/panel_group_control_panel.xml   |  17 --
 .../default/xui/es/panel_im_control_panel.xml      |  29 ----
 .../default/xui/es/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/fr/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/fr/floater_perm_prefs.xml    |  16 --
 .../default/xui/fr/floater_voice_controls.xml      |  30 ----
 .../default/xui/fr/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/fr/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/fr/menu_name_field.xml       |   6 -
 .../xui/fr/menu_people_friends_view_sort.xml       |   8 -
 .../xui/fr/menu_people_groups_view_sort.xml        |   5 -
 .../xui/fr/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/fr/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/fr/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/fr/panel_facebook_account.xml      |  15 --
 .../default/xui/fr/panel_group_control_panel.xml   |  17 --
 .../default/xui/fr/panel_im_control_panel.xml      |  30 ----
 .../default/xui/fr/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/it/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/it/floater_perm_prefs.xml    |  16 --
 .../default/xui/it/floater_voice_controls.xml      |  30 ----
 .../default/xui/it/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/it/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/it/menu_name_field.xml       |   6 -
 .../xui/it/menu_people_friends_view_sort.xml       |   8 -
 .../xui/it/menu_people_groups_view_sort.xml        |   5 -
 .../xui/it/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/it/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/it/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/it/panel_facebook_account.xml      |  15 --
 .../default/xui/it/panel_group_control_panel.xml   |  17 --
 .../default/xui/it/panel_im_control_panel.xml      |  29 ----
 .../default/xui/it/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/ja/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/ja/floater_perm_prefs.xml    |  16 --
 .../default/xui/ja/floater_voice_controls.xml      |  30 ----
 .../default/xui/ja/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/ja/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/ja/menu_name_field.xml       |   6 -
 .../xui/ja/menu_people_friends_view_sort.xml       |   8 -
 .../xui/ja/menu_people_groups_view_sort.xml        |   5 -
 .../xui/ja/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/ja/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/ja/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/ja/panel_facebook_account.xml      |  15 --
 .../default/xui/ja/panel_group_control_panel.xml   |  17 --
 .../default/xui/ja/panel_im_control_panel.xml      |  30 ----
 .../default/xui/ja/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/pt/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/pt/floater_perm_prefs.xml    |  16 --
 .../default/xui/pt/floater_voice_controls.xml      |  30 ----
 .../default/xui/pt/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/pt/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/pt/menu_name_field.xml       |   6 -
 .../xui/pt/menu_people_friends_view_sort.xml       |   8 -
 .../xui/pt/menu_people_groups_view_sort.xml        |   5 -
 .../xui/pt/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/pt/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/pt/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/pt/panel_facebook_account.xml      |  15 --
 .../default/xui/pt/panel_group_control_panel.xml   |  17 --
 .../default/xui/pt/panel_im_control_panel.xml      |  29 ----
 .../default/xui/pt/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/ru/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/ru/floater_perm_prefs.xml    |  15 --
 .../default/xui/ru/floater_voice_controls.xml      |  30 ----
 .../default/xui/ru/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/ru/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/ru/menu_name_field.xml       |   6 -
 .../xui/ru/menu_people_friends_view_sort.xml       |   8 -
 .../xui/ru/menu_people_groups_view_sort.xml        |   5 -
 .../xui/ru/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/ru/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/ru/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/ru/panel_facebook_account.xml      |  15 --
 .../default/xui/ru/panel_group_control_panel.xml   |  17 --
 .../default/xui/ru/panel_im_control_panel.xml      |  29 ----
 .../default/xui/ru/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/tr/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/tr/floater_perm_prefs.xml    |  15 --
 .../default/xui/tr/floater_voice_controls.xml      |  30 ----
 .../default/xui/tr/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/tr/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/tr/menu_name_field.xml       |   6 -
 .../xui/tr/menu_people_friends_view_sort.xml       |   8 -
 .../xui/tr/menu_people_groups_view_sort.xml        |   5 -
 .../xui/tr/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/tr/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/tr/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/tr/panel_facebook_account.xml      |  15 --
 .../default/xui/tr/panel_group_control_panel.xml   |  17 --
 .../default/xui/tr/panel_im_control_panel.xml      |  29 ----
 .../default/xui/tr/panel_profile_interests.xml     |  35 ----
 .../skins/default/xui/zh/floater_chat_bar.xml      |   7 -
 .../skins/default/xui/zh/floater_perm_prefs.xml    |  15 --
 .../default/xui/zh/floater_voice_controls.xml      |  30 ----
 .../default/xui/zh/menu_inspect_avatar_gear.xml    |  21 ---
 .../default/xui/zh/menu_inspect_self_gear.xml      |  31 ----
 .../skins/default/xui/zh/menu_name_field.xml       |   6 -
 .../xui/zh/menu_people_friends_view_sort.xml       |   8 -
 .../xui/zh/menu_people_groups_view_sort.xml        |   5 -
 .../xui/zh/menu_people_nearby_view_sort.xml        |   9 -
 .../xui/zh/menu_people_recent_view_sort.xml        |   7 -
 .../default/xui/zh/panel_adhoc_control_panel.xml   |  14 --
 .../default/xui/zh/panel_facebook_account.xml      |  15 --
 .../default/xui/zh/panel_group_control_panel.xml   |  17 --
 .../default/xui/zh/panel_im_control_panel.xml      |  29 ----
 .../skins/default/xui/zh/panel_navmesh_rebake.xml  |   6 -
 .../default/xui/zh/panel_profile_interests.xml     |  35 ----
 154 files changed, 2806 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/da/floater_animation_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_inventory.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_nearby_chat.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_postcard.xml
 delete mode 100644 indra/newview/skins/default/xui/da/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_bottomtray.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/da/panel_bottomtray.xml
 delete mode 100644 indra/newview/skins/default/xui/da/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/da/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/da/panel_region_texture.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_profile_interests.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_profile_interests.xml

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
deleted file mode 100644
index adf96841c0..0000000000
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Fejlede at starte bevægelse
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Animations filen er [LENGTH] sekunder lang.
-
-Maksimal animations længde er [MAX_LENGTH] sekunder.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Kan ikke læse animations fil.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		OK
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fil afsluttet for tidligt.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Kan ikke læse &quot;constraint definition&quot;.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Kan ikke åbne BVH fil.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Ugyldig header i HIERARCHY.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Kan ikke finde &quot;ROOT&quot; eller &quot;JOINT&quot;.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Kan ikke finde JOINT navn.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Kan ikke finde OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Kan ikke finde CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Kan ikke læse &quot;rotation order&quot;.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Kan ikke finde rotationsakser.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Kan ikke finde MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Kan ikke læse antal &quot;frames&quot;.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Kan ikke læse &quot;frame time&quot;.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Kan ikke læse positionsværdier.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Kan ikke læse rotationsværdier.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		kan ikke åbne &quot;translation file&quot;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Kan ikke læse &quot;translation header.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Kan ikke aflæse &quot;translation&quot; navne.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Kan ikke læse &quot;translation ignore&quot; værdi.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Kan ikke læse &quot;translation relative&quot; værdi.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Kan ikke læse &quot;translation outname&quot; værdi.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Kan ikke læse &quot;translation matrix&quot;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Kan ikke læse &quot;mergechild&quot; navn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Kan ikke læse &quot;mergeparent&quot; navn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Kan ikke finde prioritetsværdi.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Kan ikke læse &quot;loop&quot; værdi.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		kan ikke læse &quot;easeIn&quot; værdier.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Kan ikke læse &quot;easeOut&quot; værdier.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Kan ikke læse &quot;hand morph&quot; værdi.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		kan ikke læse &quot;emote&quot; navn.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Incorrect root joint name, use &quot;hip&quot;.
-	</floater.string>
-	<text name="name_label">
-		Navn:
-	</text>
-	<text name="description_label">
-		Beskrivelse:
-	</text>
-	<spinner label="Prioritet" name="priority" tool_tip="Vælg hvilke andre animationer der &quot;overstyres&quot; af denne"/>
-	<check_box label="Gentag" name="loop_check" tool_tip="Gentager animationen konstant"/>
-	<spinner label="Ind(%)" label_width="40" left="76" name="loop_in_point" tool_tip="Sætter punktet hvor gentagelsen genstarter fra" width="105"/>
-	<spinner label="Ud (%)" name="loop_out_point" tool_tip="Sætter punktet i animationen der afslutter gentagelsen"/>
-	<text name="hand_label">
-		Hånd posering
-	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Kontrollerer hvad hænderne går i løbet af animationen" width="140">
-		<combo_box.item label="Spredt" name="Spread"/>
-		<combo_box.item label="Afslappet" name="Relaxed"/>
-		<combo_box.item label="Peg begge" name="PointBoth"/>
-		<combo_box.item label="Knytnæver" name="Fist"/>
-		<combo_box.item label="Afslappet venstre" name="RelaxedLeft"/>
-		<combo_box.item label="Peg venstre" name="PointLeft"/>
-		<combo_box.item label="Knytnæve venstre" name="FistLeft"/>
-		<combo_box.item label="Afslappet højre" name="RelaxedRight"/>
-		<combo_box.item label="peg højre" name="PointRight"/>
-		<combo_box.item label="knytnæve højre" name="FistRight"/>
-		<combo_box.item label="Honnør højre" name="SaluteRight"/>
-		<combo_box.item label="Skrivende" name="Typing"/>
-		<combo_box.item label="Fredstegn højre" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Ansigtsudtryk
-	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Angiver hvad ansigtet gør under animationen" width="140">
-		<item label="(Intet)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Bange" name="Afraid" value="Bange"/>
-		<item label="Vred" name="Angry" value="Vred"/>
-		<item label="Stort smil" name="BigSmile" value="Stort smil"/>
-		<item label="Keder sig" name="Bored" value="Keder sig"/>
-		<item label="Græder" name="Cry" value="Grædende"/>
-		<item label="Forarget" name="Disdain" value="Foragt"/>
-		<item label="Flov" name="Embarrassed" value="Embarrassed"/>
-		<item label="Skuler" name="Frown" value="Alvorlig"/>
-		<item label="Kysser" name="Kiss" value="Kys"/>
-		<item label="Griner" name="Laugh" value="Leende"/>
-		<item label="Plllppt" name="Plllppt" value="Plllppt"/>
-		<item label="Frastødt" name="Repulsed" value="Frastødt"/>
-		<item label="Ked af det" name="Sad" value="Ked af det"/>
-		<item label="Skuldertræk" name="Shrug" value="Skuldertræk"/>
-		<item label="Smil" name="Smile" value="Smilende"/>
-		<item label="Overrasket" name="Surprise" value="Overrasket"/>
-		<item label="Blinker" name="Wink" value="Blink"/>
-		<item label="Bekymret" name="Worry" value="Bekymret"/>
-	</combo_box>
-	<text name="preview_label">
-		Vis mens
-	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer." width="140">
-		<item label="Stående" name="Standing" value="Stående"/>
-		<item label="Gående" name="Walking" value="Gående"/>
-		<item label="Sidder" name="Sitting" value="Siddende"/>
-		<item label="Flyver" name="Flying" value="Flyvende"/>
-	</combo_box>
-	<spinner label="start (sec)" name="ease_in_time" tool_tip="Tid (i sekunder) animationen bruger på at komme i gang."/>
-	<spinner label="Afslut (sec)" name="ease_out_time" tool_tip="Tid (i sekunder) animationen bruger på at afslutte"/>
-	<button label="" name="play_btn" tool_tip="Start din animation"/>
-	<button name="pause_btn" tool_tip="Pause din animation"/>
-	<button label="" name="stop_btn" tool_tip="Stop afspilning af animation"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		Kan ikke læse animations fil.
-
-Vi anbefaler BVH filer der er exporteret fra Poser 4.
-	</text>
-	<button label="Hent (L$[AMOUNT])" name="ok_btn"/>
-	<button label="Annullér" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
deleted file mode 100644
index 3a4b0fbd6b..0000000000
--- a/indra/newview/skins/default/xui/da/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MIN BEHOLDNING">
-	<floater.string name="Title">
-		MIN BEHOLDNING
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MIN BEHOLDNING (Henter [ITEM_COUNT] genstande...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MIN BEHOLDNING ([ITEM_COUNT] genstande) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Hentet
-	</floater.string>
-	<panel label="Beholdningspanel" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
deleted file mode 100644
index 76bc40edac..0000000000
--- a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT NÆRVED">
-	<check_box label="Oversæt chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
deleted file mode 100644
index eecddbcdb0..0000000000
--- a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="STANDARD RETTIGHEDER">
-	<panel label="Tilladelser" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Del med gruppe" name="share_with_group"/>
-		<check_box label="Tillad enhver at kopiere" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Næste ejer kan:
-		</text>
-		<check_box label="Redigere" name="next_owner_modify"/>
-		<check_box label="Kopiére" name="next_owner_copy"/>
-		<check_box label="Sælge/Give væk" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Annullér" label_selected="Annullér" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml
deleted file mode 100644
index 44b0fd4faa..0000000000
--- a/indra/newview/skins/default/xui/da/floater_postcard.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="EMAIL FOTO">
-	<text name="to_label">
-		Send til:
-	</text>
-	<text name="from_label">
-		Din e-mail:
-	</text>
-	<text name="name_label">
-		Dit navn:
-	</text>
-	<text name="subject_label">
-		Emne:
-	</text>
-	<line_editor label="Skriv dit emne her." name="subject_form"/>
-	<text name="msg_label">
-		Besked:
-	</text>
-	<text_editor name="msg_form">
-		Skriv din besked her.
-	</text_editor>
-	<text name="fine_print">
-		Hvis din modtager opretter en konto i SL, vil du få en henvisnings bonus.
-	</text>
-	<button label="Annullér" name="cancel_btn"/>
-	<button label="Send" name="send_btn"/>
-	<string name="default_subject">
-		Postkort fra [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Tjek det her ud!
-	</string>
-	<string name="upload_message">
-		Sender...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
deleted file mode 100644
index 69de696bf5..0000000000
--- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="Stemme opsætning">
-	<string name="title_nearby">
-		STEMMER NÆR
-	</string>
-	<string name="title_group">
-		Gruppe opkald med [GROUP]
-	</string>
-	<string name="title_adhoc">
-		Konference kald
-	</string>
-	<string name="title_peer_2_peer">
-		Opkald med [NAME]
-	</string>
-	<string name="no_one_near">
-		Ingen i nærheden har aktiveret stemmer
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Min avatar:"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Forlad samtale" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
deleted file mode 100644
index a0d74db36d..0000000000
--- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Tal knap" name="EnableVoiceChat"/>
-	<menu_item_check label="Faste bevægelser" name="ShowGestureButton"/>
-	<menu_item_check label="Bevægelse knap" name="ShowMoveButton"/>
-	<menu_item_check label="Vis knap" name="ShowCameraButton"/>
-	<menu_item_check label="Foto knap" name="ShowSnapshotButton"/>
-	<menu_item_check label="Bygge knap" name="ShowBuildButton"/>
-	<menu_item_check label="Søge knap" name="ShowSearchButton"/>
-	<menu_item_check label="Kort knap" name="ShowWorldMapButton"/>
-	<menu_item_check label="Mini-Map button" name="ShowMiniMapButton"/>
-	<menu_item_call label="Klip" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Kopiér" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Sæt ind" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Slet" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Vælg alt" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 8da35adb1b..0000000000
--- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Profil" name="view_profile"/>
-	<menu_item_call label="Tilføj ven" name="add_friend"/>
-	<menu_item_call label="Besked" name="im"/>
-	<menu_item_call label="Opkald" name="call"/>
-	<menu_item_call label="Teleportér" name="teleport"/>
-	<menu_item_call label="Invitér til gruppe" name="invite_to_group"/>
-	<menu_item_call label="Blokér" name="block"/>
-	<menu_item_call label="Fjern blokering" name="unblock"/>
-	<menu_item_call label="Rapportér" name="report"/>
-	<menu_item_call label="Frys" name="freeze"/>
-	<menu_item_call label="Smid ud" name="eject"/>
-	<menu_item_call label="Spark" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Debug teksturer" name="debug"/>
-	<menu_item_call label="Find på kort" name="find_on_map"/>
-	<menu_item_call label="Zoom ind" name="zoom_in"/>
-	<menu_item_call label="Betal" name="pay"/>
-	<menu_item_call label="Del" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
deleted file mode 100644
index 887c6484bc..0000000000
--- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Sid ned" name="Sit Down Here"/>
-	<menu_item_call label="Stå op" name="Stand Up"/>
-	<context_menu label="Tag af" name="Take Off &gt;">
-		<context_menu label="Tøj" name="Clothes &gt;">
-			<menu_item_call label="Trøje" name="Shirt"/>
-			<menu_item_call label="Bukser" name="Pants"/>
-			<menu_item_call label="Nederdel" name="Skirt"/>
-			<menu_item_call label="Sko" name="Shoes"/>
-			<menu_item_call label="Strømper" name="Socks"/>
-			<menu_item_call label="Jakke" name="Jacket"/>
-			<menu_item_call label="Handsker" name="Gloves"/>
-			<menu_item_call label="Undertrøje" name="Self Undershirt"/>
-			<menu_item_call label="Underbukser" name="Self Underpants"/>
-			<menu_item_call label="Tatovering" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="Alt tøj" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Tag af" name="Object Detach"/>
-		<menu_item_call label="Tag alt af" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Skift sæt" name="Chenge Outfit"/>
-	<menu_item_call label="Redigér sæt" name="Edit Outfit"/>
-	<menu_item_call label="Redigér min figur" name="Edit My Shape"/>
-	<menu_item_call label="Mine venner" name="Friends..."/>
-	<menu_item_call label="Mine grupper" name="Groups..."/>
-	<menu_item_call label="Min profil" name="Profile..."/>
-	<menu_item_call label="Debug teksturer" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
deleted file mode 100644
index 32c5e6a6c7..0000000000
--- a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Sortér efter navn" name="sort_name"/>
-	<menu_item_check label="Sortér efter status" name="sort_status"/>
-	<menu_item_check label="Vis person ikoner" name="view_icons"/>
-	<menu_item_check label="Vis tildelte rettigheder" name="view_permissions"/>
-	<menu_item_call label="Vis blokerede beboere og objekter" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
deleted file mode 100644
index 0b9a791530..0000000000
--- a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Vis gruppe ikoner" name="Display Group Icons"/>
-	<menu_item_call label="Forlad valgte gruppe" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 2f35ff3c92..0000000000
--- a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Sortér efter tidligere talere" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Sortér efter navn" name="sort_name"/>
-	<menu_item_check label="Sortér efter afstand" name="sort_distance"/>
-	<menu_item_check label="Se ikoner for personer" name="view_icons"/>
-	<menu_item_call label="Vis blokerede beboere og objekter" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
deleted file mode 100644
index d081f637f2..0000000000
--- a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Sortér efter nyeste" name="sort_most"/>
-	<menu_item_check label="Sortér efter navn" name="sort_name"/>
-	<menu_item_check label="Vis person ikoner" name="view_icons"/>
-	<menu_item_call label="Vis blokerede beboere og objekter" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
deleted file mode 100644
index 1953fad31f..0000000000
--- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Opkald" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Forlad opkald" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Stemmekontroller" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
deleted file mode 100644
index 3cd9d55dd0..0000000000
--- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Slå mikrofon til/fra"/>
-	<string name="VoiceControlBtnToolTip" value="Vis/skjul stemme kontrolpanel"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Tal" label_selected="Tal" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Flyt" name="movement_btn" tool_tip="Vis/skjul bevægelseskontroller"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Vis" name="camera_btn" tool_tip="Vis/Skjul kamerakontroller"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Tag foto"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Byg" name="build_btn" tool_tip="Vis/skjul byggeværktøjer"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Søg" name="search_btn" tool_tip="Vis/skjul søgning"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Kort" name="world_map_btn" tool_tip="Vis/skjul verdenskort"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini-kort" name="mini_map_btn" tool_tip="Vis/skjul Mini-kort"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Konversationer"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notifikationer"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
deleted file mode 100644
index 26fe4f6ebe..0000000000
--- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Gruppe profil" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Opkald gruppe" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Forlad opkald" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Åben stemmekontroller" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
deleted file mode 100644
index 5cecb93d40..0000000000
--- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Profil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Tilføj ven" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport til denne person"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Del" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Betal" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Opkald" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Afslut kald" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Stemme kontroller" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
deleted file mode 100644
index c8a3ad328e..0000000000
--- a/indra/newview/skins/default/xui/da/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terræn textures" name="Textures">
-	<text name="region_text_lbl">
-		Region:
-	</text>
-	<text name="region_text">
-		ukendt
-	</text>
-	<text name="detail_texture_text">
-    Terræn teksturer (kræver 1024x1024, 24 bit .tga filer)
-  </text>
-	<text name="height_text_lbl">
-		1 (Lav)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Høj)
-	</text>
-	<text name="height_text_lbl5">
-		Texture højde intervaller
-	</text>
-	<text name="height_text_lbl6">
-		Nordvest
-	</text>
-	<text name="height_text_lbl7">
-		Nordøst
-	</text>
-	<text name="height_text_lbl8">
-		Sydvest
-	</text>
-	<text name="height_text_lbl9">
-		Sydøst
-	</text>
-	<spinner label="Lav" name="height_start_spin_0"/>
-	<spinner label="Lav" name="height_start_spin_1"/>
-	<spinner label="Lav" name="height_start_spin_2"/>
-	<spinner label="Lav" name="height_start_spin_3"/>
-	<spinner label="Høj" name="height_range_spin_0"/>
-	<spinner label="Høj" name="height_range_spin_1"/>
-	<spinner label="Høj" name="height_range_spin_2"/>
-	<spinner label="Høj" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Disse værdier repræsenterer blandingsforhold for teksturer ovenfor.
-	</text>
-	<text name="height_text_lbl11">
-		Målt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1 og HØJ værdien er MINIMUMSshøjden for tekstur 4.
-	</text>
-	<text name="height_text_lbl12">
-		og HØJ værdien er MIMIMUM højde for texture nummer 4.
-	</text>
-	<button label="Gem" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
deleted file mode 100644
index ab77d4dae5..0000000000
--- a/indra/newview/skins/default/xui/de/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT IN DER NÄHE">
-	<panel name="bottom_panel">
-		<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabetaste zum Sprechen, Strg+Eingabe zum Rufen"/>
-		<button name="show_nearby_chat" tool_tip="Chatprotokoll in der Nähe ein-/ausblenden"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
deleted file mode 100644
index 9be22f3ccb..0000000000
--- a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="STANDARD-BERECHTIGUNGEN FÜR HOCHLADEN">
-	<panel label="Berechtigungen" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Mit Gruppe teilen" name="share_with_group"/>
-		<check_box label="Kopieren allen erlauben" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Nächster Eigentümer kann:
-		</text>
-		<check_box label="Bearbeiten" name="next_owner_modify"/>
-		<check_box label="Kopieren" name="next_owner_copy"/>
-		<check_box label="Verkaufen/Weggeben" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
deleted file mode 100644
index 5efda4136e..0000000000
--- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="SPRACHSTEUERUNGEN">
-	<string name="title_nearby">
-		VOICE-EINSTELLUNGEN
-	</string>
-	<string name="title_group">
-		GRUPPENGESPRÄCH MIT [GROUP]
-	</string>
-	<string name="title_adhoc">
-		KONFERENZGESPRÄCH
-	</string>
-	<string name="title_peer_2_peer">
-		GESPRÄCH MIT [NAME]
-	</string>
-	<string name="no_one_near">
-		Es ist niemand in der Nähe, der Voice aktiviert hat.
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Mein Avatar:"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Anruf beenden" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 641a0ceebe..0000000000
--- a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Profil anzeigen" name="view_profile"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Anrufen" name="call"/>
-	<menu_item_call label="Teleportieren" name="teleport"/>
-	<menu_item_call label="In Gruppe einladen" name="invite_to_group"/>
-	<menu_item_call label="Ignorieren" name="block"/>
-	<menu_item_call label="Freischalten" name="unblock"/>
-	<menu_item_call label="Melden" name="report"/>
-	<menu_item_call label="Einfrieren" name="freeze"/>
-	<menu_item_call label="Hinauswerfen" name="eject"/>
-	<menu_item_call label="Hinauswerfen" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Fehler in Texturen beseitigen" name="debug"/>
-	<menu_item_call label="Auf Karte anzeigen" name="find_on_map"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_call label="Teilen" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
deleted file mode 100644
index 5979194bfb..0000000000
--- a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Hinsetzen" name="Sit Down Here"/>
-	<menu_item_call label="Aufstehen" name="Stand Up"/>
-	<context_menu label="Ausziehen" name="Take Off &gt;">
-		<context_menu label="Kleidung" name="Clothes &gt;">
-			<menu_item_call label="Hemd" name="Shirt"/>
-			<menu_item_call label="Hose" name="Pants"/>
-			<menu_item_call label="Rock" name="Skirt"/>
-			<menu_item_call label="Schuhe" name="Shoes"/>
-			<menu_item_call label="Strümpfe" name="Socks"/>
-			<menu_item_call label="Jacke" name="Jacket"/>
-			<menu_item_call label="Handschuhe" name="Gloves"/>
-			<menu_item_call label="Unterhemd" name="Self Undershirt"/>
-			<menu_item_call label="Unterhose" name="Self Underpants"/>
-			<menu_item_call label="Tätowierung" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="Alle Kleider" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Abnehmen" name="Object Detach"/>
-		<menu_item_call label="Alles abnehmen" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Outfit ändern" name="Chenge Outfit"/>
-	<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
-	<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
-	<menu_item_call label="Meine Freunde" name="Friends..."/>
-	<menu_item_call label="Meine Gruppen" name="Groups..."/>
-	<menu_item_call label="Mein Profil" name="Profile..."/>
-	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_name_field.xml b/indra/newview/skins/default/xui/de/menu_name_field.xml
deleted file mode 100644
index 1d293c9361..0000000000
--- a/indra/newview/skins/default/xui/de/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Anzeigenamen kopieren" name="copy_display"/>
-	<menu_item_call label="Agent-Namen kopieren" name="copy_name"/>
-	<menu_item_call label="Agent-ID kopieren" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
deleted file mode 100644
index 84d9d8938c..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
-	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
deleted file mode 100644
index b68597d8aa..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
-	<menu_item_call label="Ausgewählte Gruppe verlassen" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
deleted file mode 100644
index a001544f3e..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Entfernung sortieren" name="sort_distance"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Karte anzeigen" name="view_map"/>
-	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
deleted file mode 100644
index 1ef020f5e1..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Nach aktuellesten Sprechern sortieren" name="sort_most"/>
-	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
deleted file mode 100644
index 6ad18781f5..0000000000
--- a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Anrufen" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Anruf beenden" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice-Steuerung" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_account.xml b/indra/newview/skins/default/xui/de/panel_facebook_account.xml
deleted file mode 100644
index caa5f55186..0000000000
--- a/indra/newview/skins/default/xui/de/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Sie sind mit Facebook verbunden als:"/>
-	<string name="facebook_disconnected" value="Nicht mit Facebook verbunden"/>
-	<text name="account_caption_label">
-		Nicht mit Facebook verbunden.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Verbinden..." name="connect_btn"/>
-		<button label="Trennen" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Anweisungen zum Posten auf Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
deleted file mode 100644
index 9cb72fafff..0000000000
--- a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Gruppenprofil" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Gruppe anrufen" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Anruf beenden" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice-Steuerung öffnen" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
deleted file mode 100644
index abf8011d9d..0000000000
--- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<text name="avatar_name" value="Unbekannt"/>
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Profil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Freund hinzufügen" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportieren" name="teleport_btn" tool_tip="Dieser Person einen Teleport anbieten."/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Teilen" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Bezahlen" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Anrufen" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Anruf beenden" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice-Steuerung" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_interests.xml b/indra/newview/skins/default/xui/de/panel_profile_interests.xml
deleted file mode 100644
index 0f36f76aa0..0000000000
--- a/indra/newview/skins/default/xui/de/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Interessen" name="panel_profile_interests">
-	<text name="I Want To:">
-		Ich möchte:
-	</text>
-	<check_box label="Erstellen" name="chk0"/>
-	<check_box label="Erkunden" name="chk1"/>
-	<check_box label="Treffen" name="chk2"/>
-	<check_box label="Angestellt werden" name="chk6"/>
-	<check_box label="Gruppe" name="chk3"/>
-	<check_box label="Kaufen" name="chk4"/>
-	<check_box label="Verkaufen" name="chk5"/>
-	<check_box label="Anstellen" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(wird geladen...)
-	</line_editor>
-	<text name="Skills:">
-		Fähigkeiten:
-	</text>
-	<check_box label="Texturen" name="schk0"/>
-	<check_box label="Architektur" name="schk1"/>
-	<check_box label="Modellierung" name="schk3"/>
-	<check_box label="Eventplanung" name="schk2"/>
-	<check_box label="Scripting" name="schk4"/>
-	<check_box label="Benutzerdefinierte Charaktere" name="schk5"/>
-	<line_editor name="skills_edit">
-		(wird geladen...)
-	</line_editor>
-	<text name="Languages:">
-		Sprachen:
-	</text>
-	<line_editor name="languages_edit">
-		(wird geladen...)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
deleted file mode 100644
index 02369c9a43..0000000000
--- a/indra/newview/skins/default/xui/es/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT">
-	<panel name="bottom_panel">
-		<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
-		<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
deleted file mode 100644
index 93e2088aba..0000000000
--- a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="PERMISOS POR DEFECTO DE SUBIDA">
-	<panel label="Permisos" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Compartir con el grupo" name="share_with_group"/>
-		<check_box label="Permitir a cualquiera que lo copie" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			El próximo propietario puede:
-		</text>
-		<check_box label="Modificarlo" name="next_owner_modify"/>
-		<check_box label="Copiarlo" name="next_owner_copy"/>
-		<check_box label="Revenderlo/Darlo" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml
deleted file mode 100644
index eff21239be..0000000000
--- a/indra/newview/skins/default/xui/es/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="CONTROLES DE LA VOZ">
-	<string name="title_nearby">
-		CONFIGURACIÓN DE VOZ
-	</string>
-	<string name="title_group">
-		MULTICONFERENCIA DE VOZ CON [GROUP]
-	</string>
-	<string name="title_adhoc">
-		MULTICONFERENCIA DE VOZ
-	</string>
-	<string name="title_peer_2_peer">
-		LLAMADA A [NAME]
-	</string>
-	<string name="no_one_near">
-		Nadie cercano tiene activada la voz
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Mi avatar:"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Colgar" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 82fc8ddd39..0000000000
--- a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Ver el perfil" name="view_profile"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Llamada" name="call"/>
-	<menu_item_call label="Teleportar" name="teleport"/>
-	<menu_item_call label="Invitar al grupo" name="invite_to_group"/>
-	<menu_item_call label="Ignorar" name="block"/>
-	<menu_item_call label="Designorar" name="unblock"/>
-	<menu_item_call label="Denunciar" name="report"/>
-	<menu_item_call label="Congelar" name="freeze"/>
-	<menu_item_call label="Expulsar" name="eject"/>
-	<menu_item_call label="Expulsar" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Depurar las texturas" name="debug"/>
-	<menu_item_call label="Encontrar en el mapa" name="find_on_map"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Compartir" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
deleted file mode 100644
index 29ad718fdd..0000000000
--- a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Sentarme" name="Sit Down Here"/>
-	<menu_item_call label="Levantarme" name="Stand Up"/>
-	<context_menu label="Quitarme" name="Take Off &gt;">
-		<context_menu label="Ropas" name="Clothes &gt;">
-			<menu_item_call label="Camisa" name="Shirt"/>
-			<menu_item_call label="Pantalones" name="Pants"/>
-			<menu_item_call label="Falda" name="Skirt"/>
-			<menu_item_call label="Zapatos" name="Shoes"/>
-			<menu_item_call label="Calcetines" name="Socks"/>
-			<menu_item_call label="Chaqueta" name="Jacket"/>
-			<menu_item_call label="Guantes" name="Gloves"/>
-			<menu_item_call label="Camiseta" name="Self Undershirt"/>
-			<menu_item_call label="Ropa interior" name="Self Underpants"/>
-			<menu_item_call label="Tatuaje" name="Self Tattoo"/>
-			<menu_item_call label="Alfa" name="Self Alpha"/>
-			<menu_item_call label="Toda la ropa" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Quitar" name="Object Detach"/>
-		<menu_item_call label="Quitarse todo" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Cambiar vestuario" name="Chenge Outfit"/>
-	<menu_item_call label="Editar mi vestuario" name="Edit Outfit"/>
-	<menu_item_call label="Editar mi anatomía" name="Edit My Shape"/>
-	<menu_item_call label="Mis amigos" name="Friends..."/>
-	<menu_item_call label="Mis grupos" name="Groups..."/>
-	<menu_item_call label="Mi perfil" name="Profile..."/>
-	<menu_item_call label="Depurar las texturas" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_name_field.xml b/indra/newview/skins/default/xui/es/menu_name_field.xml
deleted file mode 100644
index 0d51fbffeb..0000000000
--- a/indra/newview/skins/default/xui/es/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Copiar Nombre mostrado" name="copy_display"/>
-	<menu_item_call label="Copiar Nombre de agente" name="copy_name"/>
-	<menu_item_call label="Copiar ID de agente" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
deleted file mode 100644
index 3899ad9e96..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
-	<menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
deleted file mode 100644
index 1bd3efb611..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/>
-	<menu_item_call label="Dejar el grupo seleccionado" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 1403e4db01..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver mapa" name="view_map"/>
-	<menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
deleted file mode 100644
index e4aaa89110..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por los más recientes" name="sort_most"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
deleted file mode 100644
index c64a93e0e5..0000000000
--- a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Llamar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Colgar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de la voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_account.xml b/indra/newview/skins/default/xui/es/panel_facebook_account.xml
deleted file mode 100644
index 2b6d407ad7..0000000000
--- a/indra/newview/skins/default/xui/es/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Estás conectado a Facebook como:"/>
-	<string name="facebook_disconnected" value="No conectado a Facebook"/>
-	<text name="account_caption_label">
-		No conectado a Facebook.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Conectar..." name="connect_btn"/>
-		<button label="Desconectar" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Aprende a publicar en Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
deleted file mode 100644
index b398293175..0000000000
--- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Perfil del grupo" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Llamar al grupo" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Colgar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Abrir los controles de la voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
deleted file mode 100644
index f218324d50..0000000000
--- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Perfil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Añadir como amigo" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Compartir" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Pagar" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Llamar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Colgar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de la voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_interests.xml b/indra/newview/skins/default/xui/es/panel_profile_interests.xml
deleted file mode 100644
index 86dd63390c..0000000000
--- a/indra/newview/skins/default/xui/es/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Intereses" name="panel_profile_interests">
-	<text name="I Want To:">
-		Quiero:
-	</text>
-	<check_box label="Construye" name="chk0"/>
-	<check_box label="Explora" name="chk1"/>
-	<check_box label="Conoce" name="chk2"/>
-	<check_box label="Encuentra empleo" name="chk6"/>
-	<check_box label="Agrupa" name="chk3"/>
-	<check_box label="Compra" name="chk4"/>
-	<check_box label="Vende" name="chk5"/>
-	<check_box label="Contrata" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(cargando...)
-	</line_editor>
-	<text name="Skills:">
-		Habilidades:
-	</text>
-	<check_box label="Texturas" name="schk0"/>
-	<check_box label="Arquitectura" name="schk1"/>
-	<check_box label="Modelo" name="schk3"/>
-	<check_box label="Planificación de eventos" name="schk2"/>
-	<check_box label="Preparación de scripts" name="schk4"/>
-	<check_box label="Personajes personalizados" name="schk5"/>
-	<line_editor name="skills_edit">
-		(cargando...)
-	</line_editor>
-	<text name="Languages:">
-		Idiomas:
-	</text>
-	<line_editor name="languages_edit">
-		(cargando...)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
deleted file mode 100644
index 7dcb9a280d..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
-	<panel name="bottom_panel">
-		<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl+Entrée pour crier"/>
-		<button name="show_nearby_chat" tool_tip="Afficher/masquer le journal de chat près de vous."/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
deleted file mode 100644
index 36bec80561..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="DROITS DE CHARGEMENT PAR DÉFAUT">
-	<panel label="Droits" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Partager avec le groupe" name="share_with_group"/>
-		<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Le prochain propriétaire pourra :
-		</text>
-		<check_box label="Modifier" name="next_owner_modify"/>
-		<check_box label="Copier" name="next_owner_copy"/>
-		<check_box label="Revendre/Donner" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Annuler" label_selected="Annuler" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
deleted file mode 100644
index fc4de4a5a6..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="CONTROLES DE LA VOIX">
-	<string name="title_nearby">
-		PARAMÈTRES VOCAUX
-	</string>
-	<string name="title_group">
-		APPEL DE GROUPE AVEC [GROUP]
-	</string>
-	<string name="title_adhoc">
-		CONFÉRENCE
-	</string>
-	<string name="title_peer_2_peer">
-		APPEL AVEC [NAME]
-	</string>
-	<string name="no_one_near">
-		Il n&apos;y a personne près de vous avec le chat vocal activé
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Mon avatar :"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Quitter l&apos;appel" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 53f22bb44a..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Voir le profil" name="view_profile"/>
-	<menu_item_call label="Devenir amis" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Appel" name="call"/>
-	<menu_item_call label="Téléporter" name="teleport"/>
-	<menu_item_call label="Inviter dans le groupe" name="invite_to_group"/>
-	<menu_item_call label="Ignorer" name="block"/>
-	<menu_item_call label="Ne plus ignorer" name="unblock"/>
-	<menu_item_call label="Signaler" name="report"/>
-	<menu_item_call label="Figer" name="freeze"/>
-	<menu_item_call label="Expulser" name="eject"/>
-	<menu_item_call label="Éjecter" name="kick"/>
-	<menu_item_call label="Représentant de l&apos;Assistance client" name="csr"/>
-	<menu_item_call label="Déboguer les textures" name="debug"/>
-	<menu_item_call label="Situer sur la carte" name="find_on_map"/>
-	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
-	<menu_item_call label="Payer" name="pay"/>
-	<menu_item_call label="Partager" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
deleted file mode 100644
index ac70df472d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="M&apos;asseoir" name="Sit Down Here"/>
-	<menu_item_call label="Me lever" name="Stand Up"/>
-	<context_menu label="Enlever" name="Take Off &gt;">
-		<context_menu label="Habits" name="Clothes &gt;">
-			<menu_item_call label="Chemise" name="Shirt"/>
-			<menu_item_call label="Pantalon" name="Pants"/>
-			<menu_item_call label="Jupe" name="Skirt"/>
-			<menu_item_call label="Chaussures" name="Shoes"/>
-			<menu_item_call label="Chaussettes" name="Socks"/>
-			<menu_item_call label="Veste" name="Jacket"/>
-			<menu_item_call label="Gants" name="Gloves"/>
-			<menu_item_call label="Débardeur" name="Self Undershirt"/>
-			<menu_item_call label="Caleçon" name="Self Underpants"/>
-			<menu_item_call label="Tatouage" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="Tous les habits" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Détacher" name="Object Detach"/>
-		<menu_item_call label="Tout détacher" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Changer de tenue" name="Chenge Outfit"/>
-	<menu_item_call label="Modifier ma tenue" name="Edit Outfit"/>
-	<menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/>
-	<menu_item_call label="Mes amis" name="Friends..."/>
-	<menu_item_call label="Mes groupes" name="Groups..."/>
-	<menu_item_call label="Mon profil" name="Profile..."/>
-	<menu_item_call label="Déboguer les textures" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_name_field.xml b/indra/newview/skins/default/xui/fr/menu_name_field.xml
deleted file mode 100644
index 6c3fba4110..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Copier le Nom d&apos;affichage" name="copy_display"/>
-	<menu_item_call label="Copier le  Nom de l&apos;agent" name="copy_name"/>
-	<menu_item_call label="Copier l&apos;ID de l&apos;agent" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
deleted file mode 100644
index a6170a6c16..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Trier par statut" name="sort_status"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-	<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
-	<menu_item_call label="Afficher les résidents et les objets ignorés" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
deleted file mode 100644
index 34f949cf2c..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
-	<menu_item_call label="Quitter le groupe sélectionné" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 8bb466b8d6..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Trier par distance" name="sort_distance"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-	<menu_item_check label="Afficher la carte" name="view_map"/>
-	<menu_item_call label="Afficher les résidents et les objets ignorés" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
deleted file mode 100644
index 93b90ae61c..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-	<menu_item_call label="Afficher les résidents et les objets ignorés" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
deleted file mode 100644
index 4191ba42f9..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Appeler" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Quitter l&apos;appel" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Contrôles vocaux" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_account.xml b/indra/newview/skins/default/xui/fr/panel_facebook_account.xml
deleted file mode 100644
index 6406ae4ae7..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Vous êtes connecté(e) à Facebook en tant que :"/>
-	<string name="facebook_disconnected" value="Pas connecté(e) à Facebook"/>
-	<text name="account_caption_label">
-		Pas connecté(e) à Facebook.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Connexion..." name="connect_btn"/>
-		<button label="Déconnexion" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Apprenez comment publier sur Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
deleted file mode 100644
index 3e66b3c72a..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Profil du groupe" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Appeler le groupe" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Quitter l&apos;appel" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Ouvrir contrôles vocaux" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
deleted file mode 100644
index 1f2169e22c..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<text name="avatar_name" value="Inconnu"/>
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Profil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Devenir amis" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Téléporter" name="teleport_btn" tool_tip="Proposer de téléporter cette personne"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Partager" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Payer" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Appeler" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Quitter l&apos;appel" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Contrôles vocaux" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_interests.xml b/indra/newview/skins/default/xui/fr/panel_profile_interests.xml
deleted file mode 100644
index e8212817d2..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Centres d&apos;intérêt" name="panel_profile_interests">
-	<text name="I Want To:">
-		Je veux :
-	</text>
-	<check_box label="Construire" name="chk0"/>
-	<check_box label="Explorer" name="chk1"/>
-	<check_box label="Rencontrer" name="chk2"/>
-	<check_box label="Être recruté" name="chk6"/>
-	<check_box label="Grouper" name="chk3"/>
-	<check_box label="Acheter" name="chk4"/>
-	<check_box label="Vendre" name="chk5"/>
-	<check_box label="Louer" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(en cours de chargement...)
-	</line_editor>
-	<text name="Skills:">
-		Compétences :
-	</text>
-	<check_box label="Textures" name="schk0"/>
-	<check_box label="Architecture" name="schk1"/>
-	<check_box label="Modèle" name="schk3"/>
-	<check_box label="Planification des événements" name="schk2"/>
-	<check_box label="Langage de scripts" name="schk4"/>
-	<check_box label="Personnages personnalisés" name="schk5"/>
-	<line_editor name="skills_edit">
-		(en cours de chargement...)
-	</line_editor>
-	<text name="Languages:">
-		Langues :
-	</text>
-	<line_editor name="languages_edit">
-		(en cours de chargement...)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
deleted file mode 100644
index b47e32ce90..0000000000
--- a/indra/newview/skins/default/xui/it/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT NEI DINTORNI">
-	<panel name="bottom_panel">
-		<line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per parlare, Ctrl+Invio per gridare"/>
-		<button name="show_nearby_chat" tool_tip="Mostra/Nasconde il registro della chat nei dintorni"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml
deleted file mode 100644
index a02b3b5075..0000000000
--- a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="DIRITTI DI CARICAMENTO PREDEFINITI">
-	<panel label="Permessi" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Condividi con il gruppo" name="share_with_group"/>
-		<check_box label="Permetti a chiunque di copiare" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Il prossimo possessore può:
-		</text>
-		<check_box label="Modificare" name="next_owner_modify"/>
-		<check_box label="Copiare" name="next_owner_copy"/>
-		<check_box label="Rivendere/Regalare" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Annulla" label_selected="Annulla" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
deleted file mode 100644
index 77973eef1e..0000000000
--- a/indra/newview/skins/default/xui/it/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="CONTROLLI VOCE">
-	<string name="title_nearby">
-		IMPOSTAZIONI VOCE
-	</string>
-	<string name="title_group">
-		CHIAMATA DI GRUPPO CON [GROUP]
-	</string>
-	<string name="title_adhoc">
-		CHIAMATA IN CONFERENZA
-	</string>
-	<string name="title_peer_2_peer">
-		CHIAMATA CON [NAME]
-	</string>
-	<string name="no_one_near">
-		Nessuno nei dintorni ha attivato la funzione voce
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Il mio avatar:"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Abbandona chiamata" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 1f10734c4a..0000000000
--- a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Vedi profilo" name="view_profile"/>
-	<menu_item_call label="Aggiungi amico" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Chiama" name="call"/>
-	<menu_item_call label="Teleport" name="teleport"/>
-	<menu_item_call label="Invita al gruppo" name="invite_to_group"/>
-	<menu_item_call label="Blocca" name="block"/>
-	<menu_item_call label="Sblocca" name="unblock"/>
-	<menu_item_call label="Segnala" name="report"/>
-	<menu_item_call label="Congela" name="freeze"/>
-	<menu_item_call label="Espelli" name="eject"/>
-	<menu_item_call label="Espelli" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Debug delle texture" name="debug"/>
-	<menu_item_call label="Trova sulla mappa" name="find_on_map"/>
-	<menu_item_call label="Zoom avanti" name="zoom_in"/>
-	<menu_item_call label="Paga" name="pay"/>
-	<menu_item_call label="Condividi" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
deleted file mode 100644
index 4f62ccaa9c..0000000000
--- a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Siedi" name="Sit Down Here"/>
-	<menu_item_call label="Alzati" name="Stand Up"/>
-	<context_menu label="Togli" name="Take Off &gt;">
-		<context_menu label="Abiti" name="Clothes &gt;">
-			<menu_item_call label="Camicia" name="Shirt"/>
-			<menu_item_call label="Pantaloni" name="Pants"/>
-			<menu_item_call label="Gonna" name="Skirt"/>
-			<menu_item_call label="Scarpe" name="Shoes"/>
-			<menu_item_call label="Calzini" name="Socks"/>
-			<menu_item_call label="Giacca" name="Jacket"/>
-			<menu_item_call label="Guanti" name="Gloves"/>
-			<menu_item_call label="Maglietta intima" name="Self Undershirt"/>
-			<menu_item_call label="Slip" name="Self Underpants"/>
-			<menu_item_call label="Tatuaggio" name="Self Tattoo"/>
-			<menu_item_call label="Alpha (Trasparenza)" name="Self Alpha"/>
-			<menu_item_call label="Tutti gli abiti" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Stacca" name="Object Detach"/>
-		<menu_item_call label="Stacca tutto" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Cambia vestiario" name="Chenge Outfit"/>
-	<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
-	<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
-	<menu_item_call label="I miei amici" name="Friends..."/>
-	<menu_item_call label="I miei gruppi" name="Groups..."/>
-	<menu_item_call label="Il mio profilo" name="Profile..."/>
-	<menu_item_call label="Debug delle texture" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_name_field.xml b/indra/newview/skins/default/xui/it/menu_name_field.xml
deleted file mode 100644
index 9ac863323c..0000000000
--- a/indra/newview/skins/default/xui/it/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Copia Nome Visualizzato" name="copy_display"/>
-	<menu_item_call label="Copia Nome Agente" name="copy_name"/>
-	<menu_item_call label="Copia ID Agente" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
deleted file mode 100644
index 3a799f44eb..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
-	<menu_item_check label="Icone persone" name="view_icons"/>
-	<menu_item_check label="Visualizza autorizzazioni concesse" name="view_permissions"/>
-	<menu_item_call label="Mostra oggetti e residenti bloccati" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
deleted file mode 100644
index d31ddaf1aa..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Visualizza le icone di gruppo" name="Display Group Icons"/>
-	<menu_item_call label="Lascia i gruppi selezionati" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 2b5c235706..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
-	<menu_item_check label="Icone persone" name="view_icons"/>
-	<menu_item_check label="Visualizza mappa" name="view_map"/>
-	<menu_item_call label="Mostra oggetti e residenti bloccati" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
deleted file mode 100644
index 7fccd1621a..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Mostra prima i più recenti" name="sort_most"/>
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Icone persone" name="view_icons"/>
-	<menu_item_call label="Mostra oggetti e residenti bloccati" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
deleted file mode 100644
index be001d09f8..0000000000
--- a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Chiama" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Abbandona chiamata" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Regolazione voce" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_account.xml b/indra/newview/skins/default/xui/it/panel_facebook_account.xml
deleted file mode 100644
index e887e7e4dc..0000000000
--- a/indra/newview/skins/default/xui/it/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Sei in collegamento con Facebook come:"/>
-	<string name="facebook_disconnected" value="Non in collegamento con Facebook"/>
-	<text name="account_caption_label">
-		Non in collegamento con Facebook.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Collegamento..." name="connect_btn"/>
-		<button label="Interrompi collegamento" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Come pubblicare su Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml
deleted file mode 100644
index 2d17e4a0cd..0000000000
--- a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Profilo del gruppo" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Chiama il gruppo" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Abbandona chiamata" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Apri la regolazione voce" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml
deleted file mode 100644
index 76b28eab24..0000000000
--- a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Profilo" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Aggiungi amico" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport a questa persona"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Condividi" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Paga" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Chiama" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Chiudi chiamata" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Regolazione voce" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_interests.xml b/indra/newview/skins/default/xui/it/panel_profile_interests.xml
deleted file mode 100644
index 9fe7331e5c..0000000000
--- a/indra/newview/skins/default/xui/it/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Interessi" name="panel_profile_interests">
-	<text name="I Want To:">
-		Desidero:
-	</text>
-	<check_box label="Costruire" name="chk0"/>
-	<check_box label="Esplorare" name="chk1"/>
-	<check_box label="Incontrare" name="chk2"/>
-	<check_box label="Essere assunto" name="chk6"/>
-	<check_box label="Gruppo" name="chk3"/>
-	<check_box label="Acquistare" name="chk4"/>
-	<check_box label="Vendere" name="chk5"/>
-	<check_box label="Assumere" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(caricamento in corso...)
-	</line_editor>
-	<text name="Skills:">
-		Abilità:
-	</text>
-	<check_box label="Texture" name="schk0"/>
-	<check_box label="Architettura" name="schk1"/>
-	<check_box label="Realizzazione modelli 3D" name="schk3"/>
-	<check_box label="Organizzazione eventi" name="schk2"/>
-	<check_box label="Scripting" name="schk4"/>
-	<check_box label="Personaggi personalizzati" name="schk5"/>
-	<line_editor name="skills_edit">
-		(caricamento in corso...)
-	</line_editor>
-	<text name="Languages:">
-		Lingue:
-	</text>
-	<line_editor name="languages_edit">
-		(caricamento in corso...)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
deleted file mode 100644
index 9f5df6fb85..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="近くのチャット">
-	<panel name="bottom_panel">
-		<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して話し、Ctrl + Enter キーで叫びます。"/>
-		<button name="show_nearby_chat" tool_tip="近くのチャットログを表示／非表示"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
deleted file mode 100644
index 98cda25a81..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="デフォルトのアップロード権限">
-	<panel label="権限" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="グループで共同管理" name="share_with_group"/>
-		<check_box label="誰に対してもコピーを許可" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			次の所有者ができる操作：
-		</text>
-		<check_box label="修正" name="next_owner_modify"/>
-		<check_box label="コピー" name="next_owner_copy"/>
-		<check_box label="再販・プレゼント" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
deleted file mode 100644
index f7d3fd11e0..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="ボイスコントロール">
-	<string name="title_nearby">
-		ボイス設定
-	</string>
-	<string name="title_group">
-		[GROUP] とグループコール
-	</string>
-	<string name="title_adhoc">
-		コンファレンスコール
-	</string>
-	<string name="title_peer_2_peer">
-		[NAME] とコール
-	</string>
-	<string name="no_one_near">
-		近くにボイスを有効にしている人はいません。
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="マイ アバター："/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="コール終了" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 9d0d0f10a6..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="プロフィールの表示" name="view_profile"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="コール" name="call"/>
-	<menu_item_call label="テレポート" name="teleport"/>
-	<menu_item_call label="グループに招待" name="invite_to_group"/>
-	<menu_item_call label="ブロック" name="block"/>
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="報告" name="report"/>
-	<menu_item_call label="フリーズ" name="freeze"/>
-	<menu_item_call label="追放" name="eject"/>
-	<menu_item_call label="追放" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="テクスチャのデバッグ" name="debug"/>
-	<menu_item_call label="地図で探す" name="find_on_map"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="支払う" name="pay"/>
-	<menu_item_call label="共有" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
deleted file mode 100644
index e3e206f3aa..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="座る" name="Sit Down Here"/>
-	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<context_menu label="取り外す" name="Take Off &gt;">
-		<context_menu label="衣類" name="Clothes &gt;">
-			<menu_item_call label="シャツ" name="Shirt"/>
-			<menu_item_call label="パンツ" name="Pants"/>
-			<menu_item_call label="スカート" name="Skirt"/>
-			<menu_item_call label="靴" name="Shoes"/>
-			<menu_item_call label="靴下" name="Socks"/>
-			<menu_item_call label="ジャケット" name="Jacket"/>
-			<menu_item_call label="手袋" name="Gloves"/>
-			<menu_item_call label="下着シャツ" name="Self Undershirt"/>
-			<menu_item_call label="下着パンツ" name="Self Underpants"/>
-			<menu_item_call label="タトゥ" name="Self Tattoo"/>
-			<menu_item_call label="アルファ" name="Self Alpha"/>
-			<menu_item_call label="すべての衣類" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="取り外す" name="Object Detach"/>
-		<menu_item_call label="すべて取り外す" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="アウトフィットの変更" name="Chenge Outfit"/>
-	<menu_item_call label="アウトフィットの編集" name="Edit Outfit"/>
-	<menu_item_call label="シェイプの編集" name="Edit My Shape"/>
-	<menu_item_call label="フレンド" name="Friends..."/>
-	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="プロフィール" name="Profile..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_name_field.xml b/indra/newview/skins/default/xui/ja/menu_name_field.xml
deleted file mode 100644
index 8c37d95073..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="表示名をコピー" name="copy_display"/>
-	<menu_item_call label="エージェント名をコピー" name="copy_name"/>
-	<menu_item_call label="エージェント ID をコピー" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
deleted file mode 100644
index 76340e4d76..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="オンライン状態で並べ替え" name="sort_status"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
-	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
deleted file mode 100644
index bfc7d15017..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
-	<menu_item_call label="選択したグループから脱退" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 44c5438509..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="地図を表示" name="view_map"/>
-	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
deleted file mode 100644
index b4f177a068..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
deleted file mode 100644
index 17e1283d24..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="コール" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="コール終了" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="ボイスコントロール" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_account.xml b/indra/newview/skins/default/xui/ja/panel_facebook_account.xml
deleted file mode 100644
index 5269e5a2da..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="次のユーザーとして Facebook に接続:"/>
-	<string name="facebook_disconnected" value="Facebook に接続していません"/>
-	<text name="account_caption_label">
-		Facebook に接続していません。
-	</text>
-	<panel name="panel_buttons">
-		<button label="接続..." name="connect_btn"/>
-		<button label="切断" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook への投稿について]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
deleted file mode 100644
index 49749732c9..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="グループプロフィール" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="グループコール" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="コール終了" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="ボイスコントロールを開く" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
deleted file mode 100644
index f2429ac12a..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<text name="avatar_name" value="不明"/>
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="プロフィール" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="フレンド登録" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="テレポート" name="teleport_btn" tool_tip="この人にテレポートを送ります"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="共有" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="支払う" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="コール" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="コール終了" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="ボイスコントロール" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_interests.xml b/indra/newview/skins/default/xui/ja/panel_profile_interests.xml
deleted file mode 100644
index 93cde6ffec..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="趣味" name="panel_profile_interests">
-	<text name="I Want To:">
-		次の内容を実行：
-	</text>
-	<check_box label="作る" name="chk0"/>
-	<check_box label="探検" name="chk1"/>
-	<check_box label="出会う" name="chk2"/>
-	<check_box label="雇ってもらう" name="chk6"/>
-	<check_box label="グループ" name="chk3"/>
-	<check_box label="買う" name="chk4"/>
-	<check_box label="販売する" name="chk5"/>
-	<check_box label="雇う" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(ロード中...)
-	</line_editor>
-	<text name="Skills:">
-		スキル：
-	</text>
-	<check_box label="テクスチャ" name="schk0"/>
-	<check_box label="建築" name="schk1"/>
-	<check_box label="モデリング" name="schk3"/>
-	<check_box label="イベント計画" name="schk2"/>
-	<check_box label="スクリプト" name="schk4"/>
-	<check_box label="キャラクターのカスタマイズ" name="schk5"/>
-	<line_editor name="skills_edit">
-		(ロード中...)
-	</line_editor>
-	<text name="Languages:">
-		言語：
-	</text>
-	<line_editor name="languages_edit">
-		(ロード中...)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
deleted file mode 100644
index 2eb2c94940..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="BATE-PAPO LOCAL">
-	<panel name="bottom_panel">
-		<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
-		<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
deleted file mode 100644
index 33a0d6a456..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="PERMISSÕES PADRÃO DE UPLOAD">
-	<panel label="Permissões" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Compartilhar com o grupo" name="share_with_group"/>
-		<check_box label="Permitir que qualquer um copie" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			O próximo dono pode:
-		</text>
-		<check_box label="Modificar" name="next_owner_modify"/>
-		<check_box label="Copiar" name="next_owner_copy"/>
-		<check_box label="Revender/Dar" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
deleted file mode 100644
index 745a7d0e00..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="CONTROLES DE VOZ">
-	<string name="title_nearby">
-		CONFIGURAÇÕES DE VOZ
-	</string>
-	<string name="title_group">
-		LIGAÇÃO DE GRUPO COM [GROUP]
-	</string>
-	<string name="title_adhoc">
-		TELECONFERÊNCIA
-	</string>
-	<string name="title_peer_2_peer">
-		LIGAÇÃO PARA [NAME]
-	</string>
-	<string name="no_one_near">
-		Ninguém por perto ativou a voz
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Meu avatar:"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Desligar" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 2b5aa7508b..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Ver perfil" name="view_profile"/>
-	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ligar" name="call"/>
-	<menu_item_call label="Teletransportar" name="teleport"/>
-	<menu_item_call label="Convidar para entrar no grupo" name="invite_to_group"/>
-	<menu_item_call label="Bloquear" name="block"/>
-	<menu_item_call label="Desbloquear" name="unblock"/>
-	<menu_item_call label="Denunciar" name="report"/>
-	<menu_item_call label="Congelar" name="freeze"/>
-	<menu_item_call label="Ejetar" name="eject"/>
-	<menu_item_call label="Chutar" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Depurar texturas" name="debug"/>
-	<menu_item_call label="Localizar no mapa" name="find_on_map"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
deleted file mode 100644
index e8fafa58a9..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Sentar" name="Sit Down Here"/>
-	<menu_item_call label="Ficar de pé" name="Stand Up"/>
-	<context_menu label="Tirar" name="Take Off &gt;">
-		<context_menu label="Roupa" name="Clothes &gt;">
-			<menu_item_call label="Camisa" name="Shirt"/>
-			<menu_item_call label="Calças" name="Pants"/>
-			<menu_item_call label="Saia" name="Skirt"/>
-			<menu_item_call label="Sapatos" name="Shoes"/>
-			<menu_item_call label="Meias" name="Socks"/>
-			<menu_item_call label="Jaqueta" name="Jacket"/>
-			<menu_item_call label="Luvas" name="Gloves"/>
-			<menu_item_call label="Camiseta" name="Self Undershirt"/>
-			<menu_item_call label="Roupa de baixo" name="Self Underpants"/>
-			<menu_item_call label="Tatuagem" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="Todas as roupas" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="Separar" name="Object Detach"/>
-		<menu_item_call label="Separar tudo" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Trocar de look" name="Chenge Outfit"/>
-	<menu_item_call label="Editar meu look" name="Edit Outfit"/>
-	<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
-	<menu_item_call label="Meus amigos" name="Friends..."/>
-	<menu_item_call label="Meus grupos" name="Groups..."/>
-	<menu_item_call label="Meu perfil" name="Profile..."/>
-	<menu_item_call label="Depurar texturas" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_name_field.xml b/indra/newview/skins/default/xui/pt/menu_name_field.xml
deleted file mode 100644
index 2157de9813..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Exibir Cópia do Nome" name="copy_display"/>
-	<menu_item_call label="Copiar Nome do Agente" name="copy_name"/>
-	<menu_item_call label="Copiar Id do Agente" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
deleted file mode 100644
index e7c325010f..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por status" name="sort_status"/>
-	<menu_item_check label="Ver ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Autorizações de visualização dadas" name="view_permissions"/>
-	<menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
deleted file mode 100644
index 86a9d2263f..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
-	<menu_item_call label="Sair do grupo selecionado" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 0d32d58de4..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
-	<menu_item_check label="Ver ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Ver Mapa" name="view_map"/>
-	<menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
deleted file mode 100644
index f3b89e01cd..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ver ícones de pessoas" name="view_icons"/>
-	<menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
deleted file mode 100644
index bd50d4953d..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Ligar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Desligar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_account.xml b/indra/newview/skins/default/xui/pt/panel_facebook_account.xml
deleted file mode 100644
index b449e7959d..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Você está conectado ao Facebook como:"/>
-	<string name="facebook_disconnected" value="Não conectado ao Facebook"/>
-	<text name="account_caption_label">
-		Não conectado ao Facebook.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Conectar..." name="connect_btn"/>
-		<button label="Desconectar" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Aprenda a publicar no Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
deleted file mode 100644
index 502dae8d67..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Perfil do grupo" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Ligar para o grupo" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Desligar" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Abrir controles de voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
deleted file mode 100644
index 91b7d1b7cd..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Perfil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Adicionar amigo" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Compartilhar" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Pagar" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Ligar" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Encerrar ligação" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de voz" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_interests.xml b/indra/newview/skins/default/xui/pt/panel_profile_interests.xml
deleted file mode 100644
index edf74115f2..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Interesses" name="panel_profile_interests">
-	<text name="I Want To:">
-		Quero:
-	</text>
-	<check_box label="Crie" name="chk0"/>
-	<check_box label="Explore" name="chk1"/>
-	<check_box label="Encontrar" name="chk2"/>
-	<check_box label="Seja contratado" name="chk6"/>
-	<check_box label="Grupo" name="chk3"/>
-	<check_box label="Comprar" name="chk4"/>
-	<check_box label="Venda" name="chk5"/>
-	<check_box label="Contratar" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(carregando...)
-	</line_editor>
-	<text name="Skills:">
-		Habilidades:
-	</text>
-	<check_box label="Texturas" name="schk0"/>
-	<check_box label="Arquitetura" name="schk1"/>
-	<check_box label="Modelo" name="schk3"/>
-	<check_box label="Planejamento de evento" name="schk2"/>
-	<check_box label="Scripts" name="schk4"/>
-	<check_box label="Personagens personalizados" name="schk5"/>
-	<line_editor name="skills_edit">
-		(carregando...)
-	</line_editor>
-	<text name="Languages:">
-		Idiomas:
-	</text>
-	<line_editor name="languages_edit">
-		(carregando...)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
deleted file mode 100644
index f6b2fc81e1..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ">
-	<panel name="bottom_panel">
-		<line_editor label="Щелкните здесь для общения." name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/>
-		<button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
deleted file mode 100644
index 626f3c9321..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="СТАНДАРТНЫЕ РАЗРЕШЕНИЯ НА ПЕРЕДАЧУ">
-	<panel label="Разрешения" name="permissions">
-		<check_box label="Поделиться с группой" name="share_with_group"/>
-		<check_box label="Разрешить всем копировать" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Следующий владелец может:
-		</text>
-		<check_box label="изменять" name="next_owner_modify"/>
-		<check_box label="копировать" name="next_owner_copy"/>
-		<check_box initial_value="true" label="перепродавать/отдавать" name="next_owner_transfer"/>
-	</panel>
-	<button label="ОК" label_selected="ОК" name="ok"/>
-	<button label="Отмена" label_selected="Отмена" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
deleted file mode 100644
index 2b23086062..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="УПРАВЛЕНИЕ ГОЛОСОМ">
-	<string name="title_nearby">
-		НАСТРОЙКИ ГОЛОСА
-	</string>
-	<string name="title_group">
-		ЗВОНОК ГРУППЕ [GROUP]
-	</string>
-	<string name="title_adhoc">
-		КОНФЕРЕНЦИЯ
-	</string>
-	<string name="title_peer_2_peer">
-		ЗВОНОК ПОЛЬЗОВАТЕЛЮ [NAME]
-	</string>
-	<string name="no_one_near">
-		Нет никого с включенным голосом
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Мой аватар:"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Прервать звонок" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 957609a7a3..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Смотреть профиль" name="view_profile"/>
-	<menu_item_call label="В друзья" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Звонок" name="call"/>
-	<menu_item_call label="Телепорт" name="teleport"/>
-	<menu_item_call label="Пригласить в группу" name="invite_to_group"/>
-	<menu_item_call label="Заблокировать" name="block"/>
-	<menu_item_call label="Разблокировать" name="unblock"/>
-	<menu_item_call label="Пожаловаться" name="report"/>
-	<menu_item_call label="Заморозить" name="freeze"/>
-	<menu_item_call label="Выкинуть" name="eject"/>
-	<menu_item_call label="Выкинуть" name="kick"/>
-	<menu_item_call label="Поддержка" name="csr"/>
-	<menu_item_call label="Отладка текстур" name="debug"/>
-	<menu_item_call label="Найти на карте" name="find_on_map"/>
-	<menu_item_call label="Приблизить" name="zoom_in"/>
-	<menu_item_call label="Заплатить" name="pay"/>
-	<menu_item_call label="Поделиться" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
deleted file mode 100644
index 901bb615e0..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Self Pie">
-	<menu_item_call label="Сесть" name="Sit Down Here"/>
-	<menu_item_call label="Встать" name="Stand Up"/>
-	<context_menu label="Снять" name="Take Off &gt;">
-		<context_menu label="одежду" name="Clothes &gt;">
-			<menu_item_call label="рубашку" name="Shirt"/>
-			<menu_item_call label="брюки" name="Pants"/>
-			<menu_item_call label="юбку" name="Skirt"/>
-			<menu_item_call label="обувь" name="Shoes"/>
-			<menu_item_call label="носки" name="Socks"/>
-			<menu_item_call label="пиджак" name="Jacket"/>
-			<menu_item_call label="перчатки" name="Gloves"/>
-			<menu_item_call label="майку" name="Self Undershirt"/>
-			<menu_item_call label="трусы" name="Self Underpants"/>
-			<menu_item_call label="тату" name="Self Tattoo"/>
-			<menu_item_call label="альфа-маску" name="Self Alpha"/>
-			<menu_item_call label="всю одежду" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="данные в игре" name="Object Detach HUD"/>
-		<context_menu label="Отсоединить" name="Object Detach"/>
-		<menu_item_call label="Отсоединить все" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Сменить костюм" name="Chenge Outfit"/>
-	<menu_item_call label="Изменить костюм" name="Edit Outfit"/>
-	<menu_item_call label="Изменить фигуру" name="Edit My Shape"/>
-	<menu_item_call label="Мои друзья" name="Friends..."/>
-	<menu_item_call label="Мои группы" name="Groups..."/>
-	<menu_item_call label="Мой профиль" name="Profile..."/>
-	<menu_item_call label="Отладка текстур" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_name_field.xml b/indra/newview/skins/default/xui/ru/menu_name_field.xml
deleted file mode 100644
index 889f3c37ab..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Копировать отображаемое имя" name="copy_display"/>
-	<menu_item_call label="Копировать имя агента" name="copy_name"/>
-	<menu_item_call label="Копировать Id агента" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
deleted file mode 100644
index 0fa252aa99..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Сортировать по статусу" name="sort_status"/>
-	<menu_item_check label="Показывать значки" name="view_icons"/>
-	<menu_item_check label="Показывать разрешенные действия" name="view_permissions"/>
-	<menu_item_call label="Показать черный список" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
deleted file mode 100644
index 0358068db9..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Показывать значки группы" name="Display Group Icons"/>
-	<menu_item_call label="Покинуть выбранную группу" name="Leave Selected Group"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 4589815f6b..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Сортировать по расстоянию" name="sort_distance"/>
-	<menu_item_check label="Показывать значки участников" name="view_icons"/>
-	<menu_item_check label="Смотреть карту" name="view_map"/>
-	<menu_item_call label="Показать черный список жителей и объектов" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
deleted file mode 100644
index 2ac83ffe52..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по времени" name="sort_most"/>
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Показывать значки людей" name="view_icons"/>
-	<menu_item_call label="Показать черный список" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
deleted file mode 100644
index ae2240593d..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Звонок" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Прервать звонок" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Управление голосом" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_account.xml b/indra/newview/skins/default/xui/ru/panel_facebook_account.xml
deleted file mode 100644
index 22b4e46897..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Вы подключились к Facebook как:"/>
-	<string name="facebook_disconnected" value="Не подключено к Facebook"/>
-	<text name="account_caption_label">
-		Не подключено к Facebook.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Подключение..." name="connect_btn"/>
-		<button label="Отключить" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 О публикации в Facebook]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
deleted file mode 100644
index 2e6f3502b6..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Профиль группы" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Звонок группе" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Прервать звонок" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Открыть голосовое управление" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
deleted file mode 100644
index 2a23cdb800..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Профиль" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Добавить в друзья" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию этому жителю"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Поделиться" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Заплатить" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Звонок" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Завершить звонок" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Управление голосом" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_interests.xml b/indra/newview/skins/default/xui/ru/panel_profile_interests.xml
deleted file mode 100644
index ba1c3d0357..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Круг интересов" name="panel_profile_interests">
-	<text name="I Want To:">
-		Я собираюсь:
-	</text>
-	<check_box label="Построить" name="chk0"/>
-	<check_box label="Просмотреть" name="chk1"/>
-	<check_box label="Встретить" name="chk2"/>
-	<check_box label="Получить работу" name="chk6"/>
-	<check_box label="Группа" name="chk3"/>
-	<check_box label="Купить" name="chk4"/>
-	<check_box label="Продать" name="chk5"/>
-	<check_box label="Нанять" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(загрузка…)
-	</line_editor>
-	<text name="Skills:">
-		Навыки:
-	</text>
-	<check_box label="Текстуры" name="schk0"/>
-	<check_box label="Архитектура" name="schk1"/>
-	<check_box label="Моделирование" name="schk3"/>
-	<check_box label="Планирование мероприятия" name="schk2"/>
-	<check_box label="Создавать сценарии" name="schk4"/>
-	<check_box label="Пользовательские символы" name="schk5"/>
-	<line_editor name="skills_edit">
-		(загрузка…)
-	</line_editor>
-	<text name="Languages:">
-		Языки:
-	</text>
-	<line_editor name="languages_edit">
-		(загрузка…)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
deleted file mode 100644
index cd999b4b7a..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="YAKINDAKİ SOHBET">
-	<panel name="bottom_panel">
-		<line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/>
-		<button name="show_nearby_chat" tool_tip="Yakın sohbet günlüğünü gösterir/gizler"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
deleted file mode 100644
index 669b833c26..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="VARSAYILAN KARŞIYA YÜKLEME İZİNLERİ">
-	<panel label="İzinler" name="permissions">
-		<check_box label="Grupla paylaş" name="share_with_group"/>
-		<check_box label="Herkese kopyalama izni ver" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Sonraki sahip şunu yapabilir:
-		</text>
-		<check_box label="Değiştir" name="next_owner_modify"/>
-		<check_box label="Kopyala" name="next_owner_copy"/>
-		<check_box initial_value="true" label="Tekrar sat/Ver" name="next_owner_transfer"/>
-	</panel>
-	<button label="Tamam" label_selected="Tamam" name="ok"/>
-	<button label="İptal" label_selected="İptal" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml
deleted file mode 100644
index 5ff0804f17..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="SES DENETİMLERİ">
-	<string name="title_nearby">
-		SES AYARLARI
-	</string>
-	<string name="title_group">
-		[GROUP] İLE GRUP ARAMASI
-	</string>
-	<string name="title_adhoc">
-		KONFERANS ARAMASI
-	</string>
-	<string name="title_peer_2_peer">
-		[NAME] İLE ARAMA
-	</string>
-	<string name="no_one_near">
-		Yakındaki kimsede ses etkin değil
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="Avatarım:"/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="Aramadan Ayrıl" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 69432e967b..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="Profili Göster" name="view_profile"/>
-	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
-	<menu_item_call label="Aİ" name="im"/>
-	<menu_item_call label="Ara" name="call"/>
-	<menu_item_call label="Işınla" name="teleport"/>
-	<menu_item_call label="Gruba Davet Et" name="invite_to_group"/>
-	<menu_item_call label="Engelle" name="block"/>
-	<menu_item_call label="Engellemeyi Kaldır" name="unblock"/>
-	<menu_item_call label="Raporla" name="report"/>
-	<menu_item_call label="Dondur" name="freeze"/>
-	<menu_item_call label="Çıkar" name="eject"/>
-	<menu_item_call label="Çıkar" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Dokularda Hata Ayıkla" name="debug"/>
-	<menu_item_call label="Haritada Bul" name="find_on_map"/>
-	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
-	<menu_item_call label="Öde" name="pay"/>
-	<menu_item_call label="Paylaş" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
deleted file mode 100644
index 0655db8196..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Self Pie">
-	<menu_item_call label="Otur" name="Sit Down Here"/>
-	<menu_item_call label="Kalk" name="Stand Up"/>
-	<context_menu label="Çıkar" name="Take Off &gt;">
-		<context_menu label="Giysiler" name="Clothes &gt;">
-			<menu_item_call label="Gömlek" name="Shirt"/>
-			<menu_item_call label="Pantolon" name="Pants"/>
-			<menu_item_call label="Etek" name="Skirt"/>
-			<menu_item_call label="Ayakkabılar" name="Shoes"/>
-			<menu_item_call label="Çoraplar" name="Socks"/>
-			<menu_item_call label="Ceket" name="Jacket"/>
-			<menu_item_call label="Eldivenler" name="Gloves"/>
-			<menu_item_call label="Fanila" name="Self Undershirt"/>
-			<menu_item_call label="Külot" name="Self Underpants"/>
-			<menu_item_call label="Dövme" name="Self Tattoo"/>
-			<menu_item_call label="Alfa" name="Self Alpha"/>
-			<menu_item_call label="Tüm Giysiler" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="BÜG" name="Object Detach HUD"/>
-		<context_menu label="Ayır" name="Object Detach"/>
-		<menu_item_call label="Tümünü Ayır" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="Dış Görünümü Değiştir" name="Chenge Outfit"/>
-	<menu_item_call label="Dış Görünümümü Düzenle" name="Edit Outfit"/>
-	<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
-	<menu_item_call label="Arkadaşlarım" name="Friends..."/>
-	<menu_item_call label="Gruplarım" name="Groups..."/>
-	<menu_item_call label="Profilim" name="Profile..."/>
-	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_name_field.xml b/indra/newview/skins/default/xui/tr/menu_name_field.xml
deleted file mode 100644
index b1afd737c3..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="Görünen Adı Kopyala" name="copy_display"/>
-	<menu_item_call label="Aracı Adını Kopyala" name="copy_name"/>
-	<menu_item_call label="Aracı Kimliğini Kopyala" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
deleted file mode 100644
index 404fab17e6..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-	<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
-	<menu_item_call label="Engellenmiş Sakinleri ve Nesneleri Göster" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
deleted file mode 100644
index a1e5ad9a50..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/>
-	<menu_item_call label="Seçilen Gruptan Ayrıl" name="Leave Selected Group"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 0ff2111e9e..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-	<menu_item_check label="Haritayı Göster" name="view_map"/>
-	<menu_item_call label="Engellenmiş Sakinleri ve Nesneleri Göster" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
deleted file mode 100644
index adfba50138..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/>
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-	<menu_item_call label="Engellenmiş Sakinleri ve Nesneleri Göster" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
deleted file mode 100644
index 602818de94..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="Ara" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Aramadan Ayrıl" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Ses Denetimleri" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_account.xml b/indra/newview/skins/default/xui/tr/panel_facebook_account.xml
deleted file mode 100644
index e2d2b193a6..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="Facebook&apos;a şu kimlikle bağlandınız:"/>
-	<string name="facebook_disconnected" value="Facebook&apos;a bağlanılmadı"/>
-	<text name="account_caption_label">
-		Facebook&apos;a bağlanılmadı.
-	</text>
-	<panel name="panel_buttons">
-		<button label="Bağlan..." name="connect_btn"/>
-		<button label="Bağlantıyı kes" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook&apos;ta içerik yayınlama hakkında bilgi edinin]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
deleted file mode 100644
index 58bb68a5c3..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="Grup Profili" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Grubu Ara" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Aramadan Ayrıl" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Ses Denetimlerini Aç" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
deleted file mode 100644
index aebdc6b48d..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="Profil" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="Arkadaş Ekle" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="Işınla" name="teleport_btn" tool_tip="Bu kişiyi ışınlamayı teklif et"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Paylaş" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Öde" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="Ara" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="Aramayı Bitir" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Ses Denetimleri" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_interests.xml b/indra/newview/skins/default/xui/tr/panel_profile_interests.xml
deleted file mode 100644
index b068aa3dad..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="İlgi alanları" name="panel_profile_interests">
-	<text name="I Want To:">
-		Şunu Yapmak İstiyorum:
-	</text>
-	<check_box label="İnşa Et" name="chk0"/>
-	<check_box label="Keşfet" name="chk1"/>
-	<check_box label="Tanış" name="chk2"/>
-	<check_box label="İşe Gir" name="chk6"/>
-	<check_box label="Gruplandır" name="chk3"/>
-	<check_box label="Satın Al" name="chk4"/>
-	<check_box label="Sat" name="chk5"/>
-	<check_box label="İşe Al" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(yükleniyor...)
-	</line_editor>
-	<text name="Skills:">
-		Beceriler:
-	</text>
-	<check_box label="Dokular" name="schk0"/>
-	<check_box label="Mimari" name="schk1"/>
-	<check_box label="Modelleme" name="schk3"/>
-	<check_box label="Etkinlik Planlama" name="schk2"/>
-	<check_box label="Kodlama" name="schk4"/>
-	<check_box label="Özel Karakterler" name="schk5"/>
-	<line_editor name="skills_edit">
-		(yükleniyor...)
-	</line_editor>
-	<text name="Languages:">
-		Diller:
-	</text>
-	<line_editor name="languages_edit">
-		(yükleniyor...)
-	</line_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
deleted file mode 100644
index f1a69a7688..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="附近的聊天">
-	<panel name="bottom_panel">
-		<line_editor label="點按此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
-		<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
deleted file mode 100644
index b38db59ff3..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="預設上傳權限">
-	<panel label="權限" name="permissions">
-		<check_box label="與群組分享" name="share_with_group"/>
-		<check_box label="允許任何人覆製" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			下一個所有人可以：
-		</text>
-		<check_box label="修改" name="next_owner_modify"/>
-		<check_box label="恚庨" name="next_owner_copy"/>
-		<check_box initial_value="true" label="轉售 / 送人" name="next_owner_transfer"/>
-	</panel>
-	<button label="確定" label_selected="確定" name="ok"/>
-	<button label="取消" label_selected="取消" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
deleted file mode 100644
index a3a7679957..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="語音控制">
-	<string name="title_nearby">
-		語音設定
-	</string>
-	<string name="title_group">
-		與 [GROUP] 進行群組通話
-	</string>
-	<string name="title_adhoc">
-		多方通話
-	</string>
-	<string name="title_peer_2_peer">
-		和 [NAME] 通話
-	</string>
-	<string name="no_one_near">
-		附近沒有一人開啟語音
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="我的化身："/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="離開通話" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
deleted file mode 100644
index f4e886ff67..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="察看檔案" name="view_profile"/>
-	<menu_item_call label="加為朋友" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="通話" name="call"/>
-	<menu_item_call label="瞬間傳送" name="teleport"/>
-	<menu_item_call label="邀請加入群組" name="invite_to_group"/>
-	<menu_item_call label="封鎖" name="block"/>
-	<menu_item_call label="解除封鎖" name="unblock"/>
-	<menu_item_call label="回報" name="report"/>
-	<menu_item_call label="凍結" name="freeze"/>
-	<menu_item_call label="踢出" name="eject"/>
-	<menu_item_call label="踢出" name="kick"/>
-	<menu_item_call label="客服" name="csr"/>
-	<menu_item_call label="材質除錯" name="debug"/>
-	<menu_item_call label="在地圖上尋找" name="find_on_map"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_call label="分享" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
deleted file mode 100644
index c48ee0c9be..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Self Pie">
-	<menu_item_call label="坐下" name="Sit Down Here"/>
-	<menu_item_call label="起立" name="Stand Up"/>
-	<context_menu label="脫下" name="Take Off &gt;">
-		<context_menu label="衣服" name="Clothes &gt;">
-			<menu_item_call label="襯衫" name="Shirt"/>
-			<menu_item_call label="褲子" name="Pants"/>
-			<menu_item_call label="裙子" name="Skirt"/>
-			<menu_item_call label="鞋子" name="Shoes"/>
-			<menu_item_call label="襪子" name="Socks"/>
-			<menu_item_call label="夾克" name="Jacket"/>
-			<menu_item_call label="手套" name="Gloves"/>
-			<menu_item_call label="內衣" name="Self Undershirt"/>
-			<menu_item_call label="內褲" name="Self Underpants"/>
-			<menu_item_call label="刺青" name="Self Tattoo"/>
-			<menu_item_call label="半透明" name="Self Alpha"/>
-			<menu_item_call label="全部衣服" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="擡頭顯示" name="Object Detach HUD"/>
-		<context_menu label="卸下" name="Object Detach"/>
-		<menu_item_call label="全部卸下" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="變更裝扮" name="Chenge Outfit"/>
-	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
-	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
-	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的群組" name="Groups..."/>
-	<menu_item_call label="我的個人檔案" name="Profile..."/>
-	<menu_item_call label="材質除錯" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_name_field.xml b/indra/newview/skins/default/xui/zh/menu_name_field.xml
deleted file mode 100644
index 5eaf3461cd..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="複製顯示名稱" name="copy_display"/>
-	<menu_item_call label="複製代理名稱" name="copy_name"/>
-	<menu_item_call label="複製代理ID" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
deleted file mode 100644
index 59854faeec..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依狀態排序" name="sort_status"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看許可權限" name="view_permissions"/>
-	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
deleted file mode 100644
index 1be5c69b94..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
-	<menu_item_call label="脫離所選擇的群組" name="Leave Selected Group"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 6cb0ac3c89..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依距離排序" name="sort_distance"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看地圖" name="view_map"/>
-	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
deleted file mode 100644
index 5b6e7335d6..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近排序" name="sort_most"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
deleted file mode 100644
index 7d16ac4129..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="通話" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="離開通話" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="語音控制" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_account.xml b/indra/newview/skins/default/xui/zh/panel_facebook_account.xml
deleted file mode 100644
index e8c31c69c5..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="已成功連通臉書，身分為："/>
-	<string name="facebook_disconnected" value="未連通臉書"/>
-	<text name="account_caption_label">
-		未連通臉書。
-	</text>
-	<panel name="panel_buttons">
-		<button label="連通…" name="connect_btn"/>
-		<button label="中斷" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 如何發佈到臉書]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
deleted file mode 100644
index f468aba514..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="群組檔案" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="群組通話" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="離開通話" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="開啟語音控制" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
deleted file mode 100644
index e937368a2b..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="檔案" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="加為朋友" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請給此人"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="分享" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="支付" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="通話" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="結束通話" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="語音控制" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
deleted file mode 100644
index bb52c13a11..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="重新產出地區" name="navmesh_btn" tool_tip="點按即可重新產出該地區的導航網面。"/>
-	<button label="正在請求重新產出" name="navmesh_btn_sending" tool_tip="正向伺服器發送重新產出請求。"/>
-	<button label="地區正在重新產出" name="navmesh_btn_baking" tool_tip="地區正在重新產出。  完成後，這個按鈕將會消失。"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_interests.xml b/indra/newview/skins/default/xui/zh/panel_profile_interests.xml
deleted file mode 100644
index 150f3cca4f..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="興趣" name="panel_profile_interests">
-	<text name="I Want To:">
-		我想要：
-	</text>
-	<check_box label="建造" name="chk0"/>
-	<check_box label="探索" name="chk1"/>
-	<check_box label="見面" name="chk2"/>
-	<check_box label="受雇" name="chk6"/>
-	<check_box label="群組" name="chk3"/>
-	<check_box label="購買" name="chk4"/>
-	<check_box label="出售" name="chk5"/>
-	<check_box label="招人" name="chk7"/>
-	<line_editor name="want_to_edit">
-		（載入中...）
-	</line_editor>
-	<text name="Skills:">
-		技能：
-	</text>
-	<check_box label="材質" name="schk0"/>
-	<check_box label="架構" name="schk1"/>
-	<check_box label="建模" name="schk3"/>
-	<check_box label="計畫活動" name="schk2"/>
-	<check_box label="建腳本" name="schk4"/>
-	<check_box label="定製角色" name="schk5"/>
-	<line_editor name="skills_edit">
-		（載入中...）
-	</line_editor>
-	<text name="Languages:">
-		語言：
-	</text>
-	<line_editor name="languages_edit">
-		（載入中...）
-	</line_editor>
-</panel>
-- 
cgit v1.2.3


From e2496eff18315a82a82e50784c5959dfb038d02f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Feb 2023 23:42:58 +0200
Subject: SL-19159 Build fixes

---
 indra/llcommon/lluuid.h             | 2 ++
 indra/newview/llappearancemgr.cpp   | 1 +
 indra/newview/llmaterialmgr.h       | 5 +++--
 indra/newview/llpreviewnotecard.cpp | 1 +
 indra/newview/llpreviewscript.cpp   | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index 2c36a1d222..cc36797bc1 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -190,3 +190,5 @@ inline size_t hash_value(const LLUUID& id) noexcept
 {
 	return (size_t)id.getDigest64();
 }
+
+#endif
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 909f32cd21..9dfa29e848 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -42,6 +42,7 @@
 #include "llinventoryfunctions.h"
 #include "llinventoryobserver.h"
 #include "llnotificationsutil.h"
+#include "llmd5.h"
 #include "lloutfitobserver.h"
 #include "lloutfitslist.h"
 #include "llselectmgr.h"
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index 47c322357a..00b3321737 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -82,7 +82,7 @@ private:
 	void onPutResponse(bool success, const LLSD& content);
 	void onRegionRemoved(LLViewerRegion* regionp);
 
-private:
+public:
 	// struct for TE-specific material ID query
 	class TEMaterialPair
 	{
@@ -93,7 +93,8 @@ private:
 
 		bool operator==(const TEMaterialPair& b) const { return (materialID == b.materialID) && (te == b.te); }
 	};
-	
+
+private:
 	friend inline bool operator<(
 		const LLMaterialMgr::TEMaterialPair& lhs,
 		const LLMaterialMgr::TEMaterialPair& rhs)
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 3fd4f51559..085356d9ed 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -40,6 +40,7 @@
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
 #include "llnotificationsutil.h"
+#include "llmd5.h"
 #include "llresmgr.h"
 #include "roles_constants.h"
 #include "llscrollbar.h"
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index d677a996c1..23c6cc01f5 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -40,6 +40,7 @@
 #include "llinventorymodel.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
+#include "llmd5.h"
 #include "llhelp.h"
 #include "llnotificationsutil.h"
 #include "llresmgr.h"
-- 
cgit v1.2.3


From 152f32918d15e9343658b728adaf1d5c8c3c3e10 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Feb 2023 16:50:18 -0500
Subject: SL-18330: Fix egregious existing build errors in contribute branch.

---
 indra/llcommon/lluuid.h             | 2 +-
 indra/newview/llappearancemgr.cpp   | 1 +
 indra/newview/llmaterialmgr.h       | 7 +++++--
 indra/newview/llpreviewnotecard.cpp | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index cc36797bc1..0d4896ee97 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -191,4 +191,4 @@ inline size_t hash_value(const LLUUID& id) noexcept
 	return (size_t)id.getDigest64();
 }
 
-#endif
+#endif // LL_LLUUID_H
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 9dfa29e848..eff69df087 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -41,6 +41,7 @@
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
 #include "llinventoryobserver.h"
+#include "llmd5.h"
 #include "llnotificationsutil.h"
 #include "llmd5.h"
 #include "lloutfitobserver.h"
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index 00b3321737..8f1ec8584b 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -82,7 +82,7 @@ private:
 	void onPutResponse(bool success, const LLSD& content);
 	void onRegionRemoved(LLViewerRegion* regionp);
 
-public:
+private:
 	// struct for TE-specific material ID query
 	class TEMaterialPair
 	{
@@ -94,7 +94,10 @@ public:
 		bool operator==(const TEMaterialPair& b) const { return (materialID == b.materialID) && (te == b.te); }
 	};
 
-private:
+	// definitions follow class
+	friend std::hash<TEMaterialPair>;
+	friend size_t hash_value(const TEMaterialPair&) noexcept;
+
 	friend inline bool operator<(
 		const LLMaterialMgr::TEMaterialPair& lhs,
 		const LLMaterialMgr::TEMaterialPair& rhs)
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 085356d9ed..ac6167ec01 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -39,6 +39,7 @@
 #include "llinventorydefines.h"
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
+#include "llmd5.h"
 #include "llnotificationsutil.h"
 #include "llmd5.h"
 #include "llresmgr.h"
-- 
cgit v1.2.3


From 292bb3991b589d39d61cf721b82fe7bdae460785 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Feb 2023 17:29:48 -0500
Subject: SL-18330: Fix per PR review comments.

---
 indra/llcommon/llsdserialize.cpp | 6 +++++-
 indra/llcommon/llstreamtools.cpp | 2 +-
 indra/llcommon/llstreamtools.h   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 0a5e3652c7..a14a6b5b1b 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -169,9 +169,13 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, llssize max_bytes)
 	/*
 	* Remove the newline chars
 	*/
-	auto lastchar = header.find_last_not_of("\r\n");
+	std::string::size_type lastchar = header.find_last_not_of("\r\n");
 	if (lastchar != std::string::npos)
 	{
+		// It's important that find_last_not_of() returns size_type, which is
+		// why lastchar explicitly declares the type above. erase(size_type)
+		// erases from that offset to the end of the string, whereas
+		// erase(iterator) erases only a single character.
 		header.erase(lastchar+1);
 	}
 
diff --git a/indra/llcommon/llstreamtools.cpp b/indra/llcommon/llstreamtools.cpp
index 979e96b848..bc32b6fd9e 100644
--- a/indra/llcommon/llstreamtools.cpp
+++ b/indra/llcommon/llstreamtools.cpp
@@ -519,7 +519,7 @@ int cat_streambuf::underflow()
     if (gptr() == egptr())
     {
         // here because our buffer is empty
-        std::streamsize size;
+        std::streamsize size = 0;
         // Until we've run out of mInputs, try reading the first of them
         // into mBuffer. If that fetches some characters, break the loop.
         while (! mInputs.empty()
diff --git a/indra/llcommon/llstreamtools.h b/indra/llcommon/llstreamtools.h
index 997f738840..bb7bc20327 100644
--- a/indra/llcommon/llstreamtools.h
+++ b/indra/llcommon/llstreamtools.h
@@ -135,7 +135,7 @@ public:
         mBuffer(1024)
     {}
 
-    int underflow();
+    int underflow() override;
 };
 
 #endif
-- 
cgit v1.2.3


From 53c33ebf993a4c0424bd5ae8f5e9c42b528dc5e5 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Thu, 16 Feb 2023 02:11:46 +0100
Subject: SL-18246 Highlight 100% transparent faces for scripted objects

---
 indra/newview/llvovolume.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 2e7ccc8334..108f5cd1d3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5850,15 +5850,18 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 						}
 						else
 						{
-                            if (te->getColor().mV[3] > 0.f || te->getGlow() > 0.f)
-                            { //only treat as alpha in the pipeline if < 100% transparent
-                                drawablep->setState(LLDrawable::HAS_ALPHA);
-                                add_face(sAlphaFaces, alpha_count, facep);
-                            }
-                            else if (LLDrawPoolAlpha::sShowDebugAlpha)
-                            {
-                                add_face(sAlphaFaces, alpha_count, facep);
-                            }
+							if (te->getColor().mV[3] > 0.f || te->getGlow() > 0.f)
+							{ //only treat as alpha in the pipeline if < 100% transparent
+								drawablep->setState(LLDrawable::HAS_ALPHA);
+								add_face(sAlphaFaces, alpha_count, facep);
+							}
+							else if (LLDrawPoolAlpha::sShowDebugAlpha ||
+								gPipeline.sRenderHighlight &&
+								(LLPipeline::getRenderScriptedBeacons() || LLPipeline::getRenderScriptedTouchBeacons()) &&
+								drawablep->getVObj() && drawablep->getVObj()->flagScripted())
+							{ //draw the transparent face for debugging purposes using a custom texture
+								add_face(sAlphaFaces, alpha_count, facep);
+							}
 						}
 					}
 					else
-- 
cgit v1.2.3


From 734b1b5d421254c45b3eb0fe0a5bbc8159e489fc Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 15:47:03 +0200
Subject: SL-19105 WIP Single-folder inventory view

---
 indra/llui/llfolderview.h                          |   2 +
 indra/llui/llfolderviewitem.cpp                    |  24 +-
 indra/llui/llfolderviewitem.h                      |   2 +
 indra/llui/llfolderviewmodel.h                     |   2 +
 indra/newview/llconversationmodel.h                |   1 +
 indra/newview/llinventorybridge.cpp                |  56 ++-
 indra/newview/llinventorybridge.h                  |   1 +
 indra/newview/llinventoryfilter.cpp                |   5 +-
 indra/newview/llinventoryfilter.h                  |   4 +
 indra/newview/llinventorypanel.cpp                 | 138 ++++++++
 indra/newview/llinventorypanel.h                   |  41 +++
 indra/newview/llpanelmaininventory.cpp             | 173 ++++++++-
 indra/newview/llpanelmaininventory.h               |  12 +
 indra/newview/llpanelobjectinventory.cpp           |   1 +
 indra/newview/llviewermenu.cpp                     |   1 +
 .../skins/default/xui/en/floater_my_inventory.xml  |   4 +-
 .../skins/default/xui/en/menu_inventory.xml        |  14 +
 .../default/xui/en/menu_inventory_gear_default.xml |  37 +-
 .../default/xui/en/menu_inventory_view_default.xml |   3 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |   9 +
 .../skins/default/xui/en/panel_main_inventory.xml  | 394 +++++++++++++--------
 .../skins/default/xui/en/sidepanel_inventory.xml   |   8 +-
 22 files changed, 761 insertions(+), 171 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 237239c5d1..fbd8522b19 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -246,6 +246,8 @@ public:
 	void dumpSelectionInformation();
 
 	virtual S32	notify(const LLSD& info) ;
+
+	void setShowEmptyMessage(bool show_msg) { mShowEmptyMessage = show_msg; }
 	
 	bool useLabelSuffix() { return mUseLabelSuffix; }
 	virtual void updateMenu();
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 115cfcf3a0..c7e47e26e0 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -113,6 +113,7 @@ LLFolderViewItem::Params::Params()
     icon_width("icon_width", 0),
     text_pad("text_pad", 0),
     text_pad_right("text_pad_right", 0),
+    single_folder_mode("single_folder_mode", false),
     arrow_size("arrow_size", 0),
     max_folder_item_overlap("max_folder_item_overlap", 0)
 { }
@@ -151,6 +152,7 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
     mTextPad(p.text_pad),
     mTextPadRight(p.text_pad_right),
     mArrowSize(p.arrow_size),
+    mSingleFolderMode(p.single_folder_mode),
     mMaxFolderItemOverlap(p.max_folder_item_overlap)
 {
 	if (!sColorSetInitialized)
@@ -899,7 +901,10 @@ void LLFolderViewItem::draw()
 
     getViewModelItem()->update();
 
-    drawOpenFolderArrow(default_params, sFgColor);
+    if(!mSingleFolderMode)
+    {
+        drawOpenFolderArrow(default_params, sFgColor);
+    }
 
     drawHighlight(show_context, filled, sHighlightBgColor, sFlashBgColor, sFocusOutlineColor, sMouseOverColor);
 
@@ -1830,7 +1835,14 @@ void LLFolderViewFolder::toggleOpen()
 // Force a folder open or closed
 void LLFolderViewFolder::setOpen(BOOL openitem)
 {
-	setOpenArrangeRecursively(openitem);
+    if(mSingleFolderMode)
+    {
+        getViewModelItem()->navigateToFolder();
+    }
+    else
+    {
+        setOpenArrangeRecursively(openitem);
+    }
 }
 
 void LLFolderViewFolder::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
@@ -2033,7 +2045,8 @@ BOOL LLFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )
 	}
 	if( !handled )
 	{
-		if(mIndentation < x && x < mIndentation + (isCollapsed() ? 0 : mArrowSize) + mTextPad)
+		if((mIndentation < x && x < mIndentation + (isCollapsed() ? 0 : mArrowSize) + mTextPad)
+           && !mSingleFolderMode)
 		{
 			toggleOpen();
 			handled = TRUE;
@@ -2051,6 +2064,11 @@ BOOL LLFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )
 BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
 	BOOL handled = FALSE;
+    if(mSingleFolderMode)
+    {
+        getViewModelItem()->navigateToFolder();
+        return TRUE;
+    }
 	if( isOpen() )
 	{
 		handled = childrenHandleDoubleClick( x, y, mask ) != NULL;
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index ee20d048fd..fe751be6b9 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -72,6 +72,7 @@ public:
                                                     text_pad_right,
                                                     arrow_size,
                                                     max_folder_item_overlap;
+        Optional<bool>                              single_folder_mode;
 		Params();
 	};
 
@@ -121,6 +122,7 @@ protected:
 								mIsMouseOverTitle,
 								mAllowWear,
                                 mAllowDrop,
+                                mSingleFolderMode,
 								mSelectPending,
 								mIsItemCut;
 
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index c5e027d314..7a18ed4a45 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -159,6 +159,8 @@ public:
 	virtual void openItem( void ) = 0;
 	virtual void closeItem( void ) = 0;
 	virtual void selectItem(void) = 0;
+
+    virtual void navigateToFolder() = 0;
     
     virtual BOOL isItemWearable() const { return FALSE; }
 
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 7c6980a7e6..5999ab3925 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -111,6 +111,7 @@ public:
 	virtual void previewItem( void );
 	virtual void selectItem(void) { } 
 	virtual void showProperties(void);
+    virtual void navigateToFolder() {}
 
 	// Methods used in sorting (see LLConversationSort::operator())
 	EConversationType const getType() const { return mConvType; }
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 81db0c45c2..31801c0aa0 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -138,6 +138,12 @@ bool isMarketplaceSendAction(const std::string& action)
 	return ("send_to_marketplace" == action);
 }
 
+bool isPanelActive(const std::string& panel_name)
+{
+    LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
+    return (active_panel && (active_panel->getName() == panel_name));
+}
+
 // Used by LLFolderBridge as callback for directory fetching recursion
 class LLRightClickInventoryFetchDescendentsObserver : public LLInventoryFetchDescendentsObserver
 {
@@ -407,6 +413,25 @@ void LLInvFVBridge::showProperties()
     }
 }
 
+void LLInvFVBridge::navigateToFolder()
+{
+    LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get());
+    if (!panel)
+    {
+        return;
+    }
+    LLInventoryModel* model = getInventoryModel();
+    if (!model)
+    {
+        return;
+    }
+    if (mUUID.isNull())
+    {
+        return;
+    }
+    panel->changeFolderRoot(mUUID);
+}
+
 void LLInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch)
 {
 	// Deactivate gestures when moving them into Trash
@@ -921,8 +946,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
 	addDeleteContextMenuOptions(items, disabled_items);
 
-	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
-	if (active_panel && (active_panel->getName() != "All Items"))
+	if (!isPanelActive("All Items") && !isPanelActive("single_folder_inv"))
 	{
 		items.push_back(std::string("Show in Main Panel"));
 	}
@@ -1013,7 +1037,7 @@ void LLInvFVBridge::addDeleteContextMenuOptions(menuentry_vec_t &items,
 
 	items.push_back(std::string("Delete"));
 
-	if (!isItemRemovable())
+	if (!isItemRemovable() || isPanelActive("Favorite Items"))
 	{
 		disabled_items.push_back(std::string("Delete"));
 	}
@@ -4141,14 +4165,14 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
         disabled_items.push_back(std::string("Cut"));
         disabled_items.push_back(std::string("Delete"));
     }
+
+	if (isPanelActive("Favorite Items"))
+	{
+		disabled_items.push_back(std::string("Delete"));
+	}
 	if(trash_id == mUUID)
 	{
-		bool is_recent_panel = false;
-		LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
-		if (active_panel && (active_panel->getName() == "Recent Items"))
-		{
-			is_recent_panel = true;
-		}
+		bool is_recent_panel = isPanelActive("Recent Items");
 
 		// This is the trash.
 		items.push_back(std::string("Empty Trash"));
@@ -4369,6 +4393,20 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
         disabled_items.push_back(std::string("New folder from selected"));
     }
 
+    items.push_back(std::string("open_in_new_window"));
+    if ((flags & FIRST_SELECTED_ITEM) == 0)
+    {
+        disabled_items.push_back(std::string("open_in_new_window"));
+    }
+    if(isPanelActive("single_folder_inv"))
+    {
+        items.push_back(std::string("open_in_current_window"));
+        if ((flags & FIRST_SELECTED_ITEM) == 0)
+        {
+            disabled_items.push_back(std::string("open_in_current_window"));
+        }
+    }
+
 #ifndef LL_RELEASE_FOR_DOWNLOAD
 	if (LLFolderType::lookupIsProtectedType(type) && is_agent_inventory)
 	{
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 988e58a661..39dd268115 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -107,6 +107,7 @@ public:
 	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
 	virtual void openItem() {}
 	virtual void closeItem() {}
+    virtual void navigateToFolder();
 	virtual void showProperties();
 	virtual BOOL isItemRenameable() const { return TRUE; }
 	virtual BOOL isMultiPreviewAllowed() { return TRUE; }
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index ea3525205a..d6110b3cd5 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -81,7 +81,8 @@ LLInventoryFilter::LLInventoryFilter(const Params& p)
 	mCurrentGeneration(0),
 	mFirstRequiredGeneration(0),
 	mFirstSuccessGeneration(0),
-	mSearchType(SEARCHTYPE_NAME)
+	mSearchType(SEARCHTYPE_NAME),
+    mSingleFolderMode(false)
 {
 	// copy mFilterOps into mDefaultFilterOps
 	markDefault();
@@ -1626,7 +1627,7 @@ bool LLInventoryFilter::areDateLimitsSet()
 
 bool LLInventoryFilter::showAllResults() const
 {
-	return hasFilterString();
+	return hasFilterString() && !mSingleFolderMode;
 }
 
 
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 72deb7c76b..e127ef03ab 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -239,6 +239,8 @@ public:
 	const std::string& 	getFilterSubStringOrig() const { return mFilterSubStringOrig; } 
 	bool 				hasFilterString() const;
 
+    void                setSingleFolderMode(bool is_single_folder) { mSingleFolderMode = is_single_folder; }
+
 	void 				setFilterPermissions(PermissionMask perms);
 	PermissionMask 		getFilterPermissions() const;
 
@@ -361,6 +363,8 @@ private:
 
 	std::vector<std::string> mFilterTokens;
 	std::string				 mExactToken;
+
+    bool mSingleFolderMode;
 };
 
 #endif
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index f418b2eed3..91fa856d5e 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -183,6 +183,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this));
 	mCommitCallbackRegistrar.add("Inventory.Share",  boost::bind(&LLAvatarActions::shareWithAvatars, this));
 	mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryPanel::fileUploadLocation, this, _2));
+    mCommitCallbackRegistrar.add("Inventory.OpenNewFolderWindow", boost::bind(&LLInventoryPanel::openSingleViewInventory, this, _2));
 }
 
 LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
@@ -1643,6 +1644,11 @@ void LLInventoryPanel::fileUploadLocation(const LLSD& userdata)
     }
 }
 
+void LLInventoryPanel::openSingleViewInventory(const LLSD& userdata)
+{
+    LLPanelMainInventory::newFolderWindow(LLFolderBridge::sSelf.get()->getUUID());
+}
+
 void LLInventoryPanel::purgeSelectedItems()
 {
     if (!mFolderRoot.get()) return;
@@ -2033,6 +2039,138 @@ LLInventoryRecentItemsPanel::LLInventoryRecentItemsPanel( const Params& params)
 	mInvFVBridgeBuilder = &RECENT_ITEMS_BUILDER;
 }
 
+static LLDefaultChildRegistry::Register<LLInventorySingleFolderPanel> t_single_folder_inventory_panel("single_folder_inventory_panel");
+
+LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
+    : LLInventoryPanel(params)
+{
+    getFilter().setSingleFolderMode(true);
+
+    mCommitCallbackRegistrar.add("Inventory.OpenSelectedFolder", boost::bind(&LLInventorySingleFolderPanel::openInCurrentWindow, this, _2));
+}
+
+LLInventorySingleFolderPanel::~LLInventorySingleFolderPanel()
+{
+}
+
+void LLInventorySingleFolderPanel::setSelectCallback(const boost::function<void(const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb)
+{
+    if (mFolderRoot.get())
+    {
+        mFolderRoot.get()->setSelectCallback(cb);
+        mSelectionCallback = cb;
+    }
+}
+
+void LLInventorySingleFolderPanel::initFromParams(const Params& p)
+{
+    Params fav_params(p);
+    fav_params.start_folder.id = gInventory.getRootFolderID();
+    LLInventoryPanel::initFromParams(p);
+    changeFolderRoot(gInventory.getRootFolderID());
+}
+
+void LLInventorySingleFolderPanel::openInCurrentWindow(const LLSD& userdata)
+{
+    changeFolderRoot(LLFolderBridge::sSelf.get()->getUUID());
+}
+
+void LLInventorySingleFolderPanel::changeFolderRoot(const LLUUID& new_id)
+{
+    if(mFolderID.notNull())
+    {
+        mBackwardFolders.push_back(mFolderID);
+    }
+    mFolderID = new_id;
+    updateSingleFolderRoot();
+}
+
+void LLInventorySingleFolderPanel::onForwardFolder()
+{
+    if(!mForwardFolders.empty() && (mFolderID != mForwardFolders.back()))
+    {
+        mBackwardFolders.push_back(mFolderID);
+        mFolderID = mForwardFolders.back();
+        mForwardFolders.pop_back();
+        updateSingleFolderRoot();
+    }
+}
+
+void LLInventorySingleFolderPanel::onBackwardFolder()
+{
+    if(!mBackwardFolders.empty() && (mFolderID != mBackwardFolders.back()))
+    {
+        mForwardFolders.push_back(mFolderID);
+        mFolderID = mBackwardFolders.back();
+        mBackwardFolders.pop_back();
+        updateSingleFolderRoot();
+    }
+}
+
+void LLInventorySingleFolderPanel::clearNavigationHistory()
+{
+    mForwardFolders.clear();
+    mBackwardFolders.clear();
+}
+
+boost::signals2::connection LLInventorySingleFolderPanel::setRootChangedCallback(root_changed_callback_t cb)
+{
+    return mRootChangedSignal.connect(cb);
+}
+
+void LLInventorySingleFolderPanel::updateSingleFolderRoot()
+{
+    if (mFolderID != getRootFolderID())
+    {
+        mRootChangedSignal();
+
+        LLUUID root_id = mFolderID;
+        if (mFolderRoot.get())
+        {
+            removeItemID(getRootFolderID());
+            mFolderRoot.get()->destroyView();
+        }
+
+        mCommitCallbackRegistrar.pushScope();
+        {
+            LLFolderView* folder_view = createFolderRoot(root_id);
+            folder_view->setChildrenInited(false);
+            mFolderRoot = folder_view->getHandle();
+
+            addItemID(root_id, mFolderRoot.get());
+
+            LLRect scroller_view_rect = getRect();
+            scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
+            LLScrollContainer::Params scroller_params(mParams.scroll());
+            scroller_params.rect(scroller_view_rect);
+
+            if (mScroller)
+            {
+                removeChild(mScroller);
+                delete mScroller;
+                mScroller = NULL;
+            }
+            mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
+            addChild(mScroller);
+            mScroller->addChild(mFolderRoot.get());
+            mFolderRoot.get()->setScrollContainer(mScroller);
+            mFolderRoot.get()->setFollowsAll();
+            mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
+
+            if (!mSelectionCallback.empty())
+            {
+                mFolderRoot.get()->setSelectCallback(mSelectionCallback);
+            }
+        }
+        mCommitCallbackRegistrar.popScope();
+        mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
+
+        buildNewViews(mFolderID);
+
+        mFolderRoot.get()->setShowEmptyMessage(false);
+    }
+}
+
 /************************************************************************/
 /* Asset Pre-Filtered Inventory Panel related class                     */
 /************************************************************************/
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 0932482ad7..981bef62a8 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -222,6 +222,7 @@ public:
 	void doCreate(const LLSD& userdata);
 	bool beginIMSession();
 	void fileUploadLocation(const LLSD& userdata);
+    void openSingleViewInventory(const LLSD& userdata);
 	void purgeSelectedItems();
 	bool attachObject(const LLSD& userdata);
 	static void idle(void* user_data);
@@ -263,6 +264,8 @@ public:
 
     void callbackPurgeSelectedItems(const LLSD& notification, const LLSD& response);
 
+    void changeFolderRoot(const LLUUID& new_id) {};
+
 protected:
 	void openStartFolderOrMyInventory(); // open the first level of inventory
 	void onItemsCompletion();			// called when selected items are complete
@@ -382,6 +385,44 @@ private:
     std::deque<LLUUID>			mBuildViewsQueue;
 };
 
+
+class LLInventorySingleFolderPanel : public LLInventoryPanel
+{
+public:
+    struct Params : public LLInitParam::Block<Params, LLInventoryPanel::Params>
+    {};
+
+    void initFromParams(const Params& p);
+    bool isSelectionRemovable() { return false; }
+    //void setSelectCallback(const boost::function<void(const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
+
+    void openInCurrentWindow(const LLSD& userdata);
+    void changeFolderRoot(const LLUUID& new_id);
+    void onForwardFolder();
+    void onBackwardFolder();
+    void clearNavigationHistory();
+    LLUUID getSingleFolderRoot() { return mFolderID; }
+
+    void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
+
+    typedef boost::function<void()> root_changed_callback_t;
+    boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
+
+protected:
+    LLInventorySingleFolderPanel(const Params& params);
+    ~LLInventorySingleFolderPanel();
+    void updateSingleFolderRoot();
+
+    boost::function<void(const std::deque<LLFolderViewItem*>& items, BOOL user_action)> mSelectionCallback;
+    friend class LLUICtrlFactory;
+    
+    LLUUID mFolderID;
+    std::list<LLUUID> mBackwardFolders;
+    std::list<LLUUID> mForwardFolders;
+
+    boost::signals2::signal<void()> mRootChangedSignal;
+};
+
 /************************************************************************/
 /* Asset Pre-Filtered Inventory Panel related class                     */
 /* Exchanges filter's flexibility for speed of generation and           */
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a517fae0a5..d13c691abd 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -38,7 +38,6 @@
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
-#include "llinventorypanel.h"
 #include "llfiltereditor.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llfloaterreg.h"
@@ -114,7 +113,9 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	  mMenuVisibility(NULL),
 	  mMenuAddHandle(),
 	  mNeedUploadCost(true),
-      mMenuViewDefault(NULL)
+      mMenuViewDefault(NULL),
+      mSingleFolderMode(false),
+      mFolderRootChangedConnection()
 {
 	// Menu Callbacks (non contex menus)
 	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2));
@@ -240,6 +241,9 @@ BOOL LLPanelMainInventory::postBuild()
 	mVisibilityMenuButton = getChild<LLMenuButton>("options_visibility_btn");
     mViewMenuButton = getChild<LLMenuButton>("view_btn");
 
+    mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
+    mFolderRootChangedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
+
 	initListCommandsHandlers();
 
 	const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
@@ -316,6 +320,11 @@ LLPanelMainInventory::~LLPanelMainInventory( void )
         menu->die();
         mMenuAddHandle.markDead();
     }
+
+    if (mFolderRootChangedConnection.connected())
+    {
+        mFolderRootChangedConnection.disconnect();
+    }
 }
 
 LLInventoryPanel* LLPanelMainInventory::getAllItemsPanel()
@@ -383,10 +392,17 @@ void LLPanelMainInventory::closeAllFolders()
 	getPanel()->getRootFolder()->closeAllFolders();
 }
 
+S32 get_instance_num()
+{
+    static S32 instance_num = 0;
+    instance_num = (instance_num + 1) % S32_MAX;
+
+    return instance_num;
+}
+
 void LLPanelMainInventory::newWindow()
 {
-	static S32 instance_num = 0;
-	instance_num = (instance_num + 1) % S32_MAX;
+    S32 instance_num = get_instance_num();
 
 	if (!gAgentCamera.cameraMouselook())
 	{
@@ -394,10 +410,45 @@ void LLPanelMainInventory::newWindow()
 	}
 }
 
+void LLPanelMainInventory::newFolderWindow(const LLUUID& folder_id)
+{
+    S32 instance_num = get_instance_num();
+
+    LLFloaterSidePanelContainer* inventory_container = LLFloaterReg::showTypedInstance<LLFloaterSidePanelContainer>("inventory", LLSD(instance_num));
+    if(inventory_container)
+    {
+        LLSidepanelInventory* sidepanel_inventory = dynamic_cast<LLSidepanelInventory*>(inventory_container->findChild<LLPanel>("main_panel", true));
+        if (sidepanel_inventory)
+        {
+            LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
+            if (main_inventory)
+            {
+                main_inventory->onViewModeClick();
+                if(folder_id.notNull())
+                {
+                    main_inventory->setSingleFolderViewRoot(folder_id);
+                }
+            }
+        }
+    }
+}
+
 void LLPanelMainInventory::doCreate(const LLSD& userdata)
 {
 	reset_inventory_filter();
-	menu_create_inventory_item(getPanel(), NULL, userdata);
+    if(mSingleFolderMode)
+    {
+        LLFolderViewItem* current_folder = getActivePanel()->getRootFolder();
+        if (current_folder)
+        {
+            LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
+            menu_create_inventory_item(getPanel(), bridge, userdata);
+        }
+    }
+    else
+    {
+        menu_create_inventory_item(getPanel(), NULL, userdata);
+    }
 }
 
 void LLPanelMainInventory::resetFilters()
@@ -527,7 +578,7 @@ void LLPanelMainInventory::onClearSearch()
 	}
 
 	// re-open folders that were initially open in case filter was active
-	if (mActivePanel && (mFilterSubString.size() || initially_active))
+	if (mActivePanel && (mFilterSubString.size() || initially_active) && !mSingleFolderMode)
 	{
 		mSavedFolderState->setApply(TRUE);
 		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
@@ -1173,10 +1224,15 @@ void LLFloaterInventoryFinder::selectNoTypes(void* user_data)
 void LLPanelMainInventory::initListCommandsHandlers()
 {
 	childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddButtonClick, this));
+    childSetAction("view_mode_btn", boost::bind(&LLPanelMainInventory::onViewModeClick, this));
+    childSetAction("up_btn", boost::bind(&LLPanelMainInventory::onUpFolderClicked, this));
+    childSetAction("back_btn", boost::bind(&LLPanelMainInventory::onBackFolderClicked, this));
+    childSetAction("forward_btn", boost::bind(&LLPanelMainInventory::onForwardFolderClicked, this));
 
 	mCommitCallbackRegistrar.add("Inventory.GearDefault.Custom.Action", boost::bind(&LLPanelMainInventory::onCustomAction, this, _2));
 	mEnableCallbackRegistrar.add("Inventory.GearDefault.Check", boost::bind(&LLPanelMainInventory::isActionChecked, this, _2));
 	mEnableCallbackRegistrar.add("Inventory.GearDefault.Enable", boost::bind(&LLPanelMainInventory::isActionEnabled, this, _2));
+    mEnableCallbackRegistrar.add("Inventory.GearDefault.Visible", boost::bind(&LLPanelMainInventory::isActionVisible, this, _2));
 	mMenuGearDefault = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_inventory_gear_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	mGearMenuButton->setMenu(mMenuGearDefault, LLMenuButton::MP_TOP_LEFT, true);
     mMenuViewDefault = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_inventory_view_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
@@ -1211,6 +1267,47 @@ void LLPanelMainInventory::onAddButtonClick()
 	}
 }
 
+void LLPanelMainInventory::onViewModeClick()
+{
+    mSingleFolderMode = !mSingleFolderMode;
+
+    getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
+    getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode);
+    getChild<LLLayoutPanel>("nav_buttons")->setVisible(mSingleFolderMode);
+    getChild<LLButton>("view_mode_btn")->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
+
+    mActivePanel = mSingleFolderMode ? getChild<LLInventoryPanel>("single_folder_inv") : (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
+    updateTitle();
+}
+
+void LLPanelMainInventory::onUpFolderClicked()
+{
+    const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+    if (cat)
+    {
+        if (cat->getParentUUID().notNull())
+        {
+            mSingleFolderPanelInventory->changeFolderRoot(cat->getParentUUID());
+        }
+    }
+}
+
+void LLPanelMainInventory::onBackFolderClicked()
+{
+    mSingleFolderPanelInventory->onBackwardFolder();
+}
+
+void LLPanelMainInventory::onForwardFolderClicked()
+{
+    mSingleFolderPanelInventory->onForwardFolder();
+}
+
+void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id)
+{
+    mSingleFolderPanelInventory->changeFolderRoot(folder_id);
+    mSingleFolderPanelInventory->clearNavigationHistory();
+}
+
 void LLPanelMainInventory::showActionMenu(LLMenuGL* menu, std::string spawning_view_name)
 {
 	if (menu)
@@ -1254,6 +1351,27 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 		return;
 
 	const std::string command_name = userdata.asString();
+    if (command_name == "new_single_folder_window")
+    {
+        newFolderWindow(LLUUID());
+    }
+    if ((command_name == "open_in_current_window") || (command_name == "open_in_new_window"))
+    {
+        LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
+        if (!current_item)
+        {
+            return;
+        }
+        const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+        if((command_name == "open_in_current_window"))
+        {
+            mSingleFolderPanelInventory->changeFolderRoot(folder_id);
+        }
+        if((command_name == "open_in_new_window"))
+        {
+            newFolderWindow(folder_id);
+        }
+    }
 	if (command_name == "new_window")
 	{
 		newWindow();
@@ -1505,10 +1623,34 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 		LLInventoryModel::EHasChildren children = gInventory.categoryHasChildren(trash_id);
 		return children != LLInventoryModel::CHILDREN_NO && gInventory.isCategoryComplete(trash_id);
 	}
+    if (command_name == "open_folder")
+    {
+        LLFolderView* root = getActivePanel()->getRootFolder();
+        std::set<LLFolderViewItem*> selection_set = root->getSelectionList();
+        if (selection_set.size() != 1) return FALSE;
+        LLFolderViewItem* current_item = *selection_set.begin();
+        if (!current_item) return FALSE;
+        const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+        return (gInventory.getCategory(folder_id) != NULL);
+    }
 
 	return TRUE;
 }
 
+bool LLPanelMainInventory::isActionVisible(const LLSD& userdata)
+{
+    const std::string param_str = userdata.asString();
+    if (param_str == "single_folder_view")
+    {
+        return mSingleFolderMode;
+    }
+    if (param_str == "multi_folder_view")
+    {
+        return !mSingleFolderMode;
+    }
+    return true;
+}
+
 BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 {
 	U32 sort_order_mask = getActivePanel()->getSortOrder();
@@ -1576,5 +1718,24 @@ bool LLPanelMainInventory::hasSettingsInventory()
     return LLEnvironment::instance().isInventoryEnabled();
 }
 
+void LLPanelMainInventory::updateTitle()
+{
+    LLFloater* inventory_floater = gFloaterView->getParentFloater(this);
+    if(inventory_floater)
+    {
+        if(mSingleFolderMode)
+        {
+            const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+            if (cat)
+            {
+                inventory_floater->setTitle(cat->getName());
+            }
+        }
+        else
+        {
+            inventory_floater->setTitle(getString("inventory_title"));
+        }
+    }
+}
 // List Commands                                                              //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 1f07d381ba..923ebba98b 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -30,6 +30,7 @@
 
 #include "llpanel.h"
 #include "llinventoryobserver.h"
+#include "llinventorypanel.h"
 #include "lldndbutton.h"
 
 #include "llfolderview.h"
@@ -92,10 +93,16 @@ public:
 	void setFocusFilterEditor();
 
 	static void newWindow();
+    static void newFolderWindow(const LLUUID& folder_id);
 
 	void toggleFindOptions();
 
     void resetFilters();
+    void onViewModeClick();
+    void onUpFolderClicked();
+    void onBackFolderClicked();
+    void onForwardFolderClicked();
+    void setSingleFolderViewRoot(const LLUUID& folder_id);
 
 protected:
 	//
@@ -149,7 +156,10 @@ private:
 	std::string					mCategoryCountString;
 	LLComboBox*					mSearchTypeCombo;
 
+    bool mSingleFolderMode;
+    LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
 
+    boost::signals2::connection mFolderRootChangedConnection;
 
 	//////////////////////////////////////////////////////////////////////////////////
 	// List Commands                                                                //
@@ -162,7 +172,9 @@ protected:
 	BOOL isActionEnabled(const LLSD& command_name);
 	BOOL isActionChecked(const LLSD& userdata);
 	void onCustomAction(const LLSD& command_name);
+    bool isActionVisible(const LLSD& userdata);
     static bool hasSettingsInventory();
+    void updateTitle();
 	/**
 	 * Set upload cost in "Upload" sub menu.
 	 */
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 14c9f812f4..c9169fdc8f 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -125,6 +125,7 @@ public:
 	virtual BOOL canOpenItem() const { return FALSE; }
 	virtual void closeItem() {}
 	virtual void selectItem() {}
+    virtual void navigateToFolder() {}
 	virtual BOOL isItemRenameable() const;
 	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL isItemMovable() const;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 015a887e9f..09fd4b04cb 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9703,6 +9703,7 @@ void initialize_menus()
 	commit.add("PayObject", boost::bind(&handle_give_money_dialog));
 
 	commit.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow));
+    commit.add("Inventory.NewFolderWindow", boost::bind(&LLPanelMainInventory::newFolderWindow, LLUUID()));
 
 	enable.add("EnablePayObject", boost::bind(&enable_pay_object));
 	enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar));
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index f182d27da8..1b4f323d04 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -5,14 +5,14 @@
  can_resize="true"
  height="570"
  help_topic="sidebar_inventory"
- min_width="333"
+ min_width="363"
  min_height="590"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
  reuse_instance="true"
  title="INVENTORY"
- width="333" >
+ width="363" >
    <panel
     class="sidepanel_inventory"
     name="main_panel"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index aa3d0ae071..5fe53526c7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -401,6 +401,20 @@
          parameter="model" />
       </menu_item_call>
     </menu>
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+      <menu_item_call.on_click
+       function="Inventory.OpenSelectedFolder"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+      <menu_item_call.on_click
+       function="Inventory.OpenNewFolderWindow"/>
+    </menu_item_call>
     <menu
      label="Change Type"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 3fb2e01e5b..027dd40d08 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -6,15 +6,39 @@
  mouse_opaque="false"
  name="menu_gear_default"
  visible="false">
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+       <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="open_in_current_window" />
+       <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="open_folder" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="open_in_new_window" />
+        <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="open_folder" />
+    </menu_item_call>
     <menu_item_call
      label="New Folder Window"
      layout="topleft"
      shortcut="control|shift|J"
-     enabled="false"
      name="new_single_folder">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="new_window" />
+         parameter="new_single_folder_window" />
     </menu_item_call>
     <menu_item_call
      label="New Inventory Window"
@@ -32,6 +56,9 @@
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="close_folders" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
@@ -115,6 +142,9 @@
         <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="empty_lostnfound" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
     <menu_item_call
      label="Empty Trash"
@@ -126,5 +156,8 @@
         <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="empty_trash" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 6e3cfd9cee..0fcdb1cda0 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -49,5 +49,8 @@
         <on_check
          function="Inventory.GearDefault.Check"
          parameter="sort_system_folders_to_top" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 58584345a9..de11a2c0e9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -36,6 +36,15 @@
          function="Inventory.NewWindow"
          parameter="" />
       </menu_item_call>
+      <menu_item_call
+       label="New Folder Window"
+       name="new_single_folder"
+       shortcut="control|shift|J"
+       visible="false">
+        <menu_item_call.on_click
+         function="Inventory.NewFolderWindow"
+         parameter="" />
+      </menu_item_call>
       <menu_item_call
        label="Places..."
        name="Places"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d437f98e91..606c2175d8 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -23,6 +23,9 @@
    name="ItemcountUnknown">
     Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
   </panel.string>
+  <panel.string name="inventory_title">INVENTORY</panel.string>
+  <panel.string name="default_mode_btn">Command_AboutLand_Icon</panel.string>
+  <panel.string name="single_folder_mode_btn">Command_Map_Icon</panel.string>
   <text
 		     type="string"
 		     length="1"
@@ -38,157 +41,262 @@
 		     width="300">
     Items:
   </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left="3"
-   top="18"
-   name="search_type"
-   follows="top|left"
-   width="67">
-    <item
-     label="Name"
-     name="Name"
-     value="search_by_name"/>
-    <item
-     label="Creator"
-     name="Creator"
-     value="search_by_creator"/>
-    <item
-     label="Description"
-     name="Description"
-     value="search_by_description"/>
-    <item
-     label="UUID"
-     name="UUID"
-     value="search_by_UUID"/>
-  </combo_box>
-  <menu_button
-   follows="top|left"
-   tool_tip="Show search visibility options"
-   height="23"
-   image_overlay="Inv_Toolbar_SearchVisibility"
-   layout="topleft"
-   left_pad="1"
-   name="options_visibility_btn"
-   width="31" />
-  <filter_editor
-   text_pad_left="10"
+  <layout_stack
    follows="left|top|right"
-   height="23"
-   label="Enter search text"
-   layout="topleft"
-   left_pad="1"
-   max_length_chars="300"
-   highlight_text_field="true"
-   name="inventory search editor"
-   width="99" />
-  <menu_button
-   follows="top|right"
-   tool_tip="Show additional options"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="OptionsMenu_Off"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="options_gear_btn"
-   width="31" />
-  <menu_button
-   follows="top|right"
-   tool_tip="View/sort options"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="Conv_toolbar_sort"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="view_btn"
-   width="31" />
-  <button
-   follows="top|right"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="AddItem_Off"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="add_btn"
-   tool_tip="Add new item"
-   width="31" />
-  <button
-   follows="top|right"
-   tool_tip="Toggles between traditional and single-folder views"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="Command_Map_Icon"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   enabled="false"
-   name="view_mode_btn"
-   width="31" />
-  <tab_container
+   height="25"
+   animate="false"
+   top_pad="10"
+   left="2"
+   orientation="horizontal">
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="25"
+     width="65"
+     name="nav_buttons"
+     visible="false">
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Left"
+      image_pressed="Arrow_Left"
+      image_unselected="Arrow_Left"
+      scale_image="false"
+      layout="topleft"
+      left="3"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Right"
+      image_pressed="Arrow_Right"
+      image_unselected="Arrow_Right"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Up"
+      image_pressed="Arrow_Up"
+      image_unselected="Arrow_Up"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
+    </layout_panel>
+    <layout_panel
+      border="false"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="375"
+      visible="true">
+      <combo_box
+       height="23"
+       layout="topleft"
+       left="2"
+       top="0"
+       name="search_type"
+       tool_tip="Search by"
+       follows="top|left"
+       width="67">
+       <item
+        label="Name"
+        name="Name"
+        value="search_by_name"/>
+       <item
+        label="Creator"
+        name="Creator"
+        value="search_by_creator"/>
+       <item
+        label="Description"
+        name="Description"
+        value="search_by_description"/>
+       <item
+        label="UUID"
+        name="UUID"
+        value="search_by_UUID"/>
+      </combo_box>
+      <menu_button
+       follows="top|left"
+       tool_tip="Search visibility options"
+       height="23"
+       image_overlay="Inv_Toolbar_SearchVisibility"
+       layout="topleft"
+       left_pad="1"
+       name="options_visibility_btn"
+       width="31" />
+      <filter_editor
+       text_pad_left="10"
+       follows="left|top|right"
+       height="23"
+       label="Enter search text"
+       layout="topleft"
+       left_pad="1"
+       max_length_chars="300"
+       highlight_text_field="true"
+       name="inventory search editor"
+       width="150" />
+      <menu_button
+       follows="top|right"
+       tool_tip="Actions"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="OptionsMenu_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="options_gear_btn"
+       width="31" />
+      <menu_button
+       follows="top|right"
+       tool_tip="View &amp; sort options"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Conv_toolbar_sort"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_btn"
+       width="31" />
+      <button
+       follows="top|right"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="AddItem_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="add_btn"
+       tool_tip="Create new item"
+       width="31" />
+      <button
+       follows="top|right"
+       tool_tip="Switch between views"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Command_Map_Icon"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_mode_btn"
+       width="31" />
+    </layout_panel>
+    </layout_stack>
+    <panel
      follows="all"
      halign="center"
      height="372"
      layout="topleft"
      left="7"
-     name="inventory filter tabs"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
+     name="default_inventory_panel"
      top_pad="10"
      width="312">
-    <inventory_panel
-     bg_opaque_color="DkGray2"
-     bg_alpha_color="DkGray2"
-     background_visible="true"
-     border="false"
-     bevel_style="none"
+      <tab_container
+       follows="all"
+       halign="center"
+       height="372"
+       layout="topleft"
+       left="0"
+       name="inventory filter tabs"
+       tab_height="30"
+       tab_position="top"
+       tab_min_width="100"
+       top="0"
+       width="312">
+        <inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="MY INVENTORY"
+         help_topic="my_inventory_tab"
+         layout="topleft"
+         left="0"
+         name="All Items"
+         sort_order_setting="InventorySortOrder"
+         show_item_link_overlays="true"
+         top="16"
+         width="288" />
+        <recent_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="RECENT"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         left_delta="0"
+         name="Recent Items"
+         show_item_link_overlays="true"
+         width="290" />
+        <inventory_panel
+         name="Worn Items"
+         label="WORN"
+         show_empty_message="false"
+         follows="all"
+         layout="topleft"
+         width="290"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+        </inventory_panel>
+      </tab_container>
+    </panel>
+    <panel
      follows="all"
-     height="338"
-     label="MY INVENTORY"
-     help_topic="my_inventory_tab"
-     layout="topleft"
-     left="0"
-     name="All Items"
-     sort_order_setting="InventorySortOrder"
-     show_item_link_overlays="true"
-     top="16"
-     width="288" />
-    <recent_inventory_panel
-     bg_opaque_color="DkGray2"
-     bg_alpha_color="DkGray2"
-     background_visible="true"
-     border="false"
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="RECENT"
-     help_topic="recent_inventory_tab"
+     halign="center"
+     height="372"
      layout="topleft"
-     left_delta="0"
-     name="Recent Items"
-     show_item_link_overlays="true"
-     width="290" />
-       <inventory_panel
-      name="Worn Items"
-      label="WORN"
-      show_empty_message="false"
-      follows="all"
-      layout="topleft"
-      width="290"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      scroll.reserve_scroll_corner="false">
-  </inventory_panel>
-  </tab_container>
+     left="7"
+     name="single_folder_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+      <single_folder_inventory_panel
+       name="single_folder_inv"
+       show_empty_message="false"
+       follows="all"
+       left="0"
+       top="0"
+       top_pad="5"
+       height="372"
+       width="312"
+       layout="topleft"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       border="false"
+       bevel_style="none"
+       scroll.reserve_scroll_corner="false">
+        <item folder_indentation="0"/>
+        <folder
+         single_folder_mode="true"
+         folder_indentation="0"/>
+      </single_folder_inventory_panel>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 82eb629670..a4b7f48c5e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -18,7 +18,7 @@
 		 height="570"
 		 visible="true"
 		 default_tab_group="1"
-		 width="355">
+		 width="395">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
@@ -28,14 +28,14 @@
               orientation="vertical"
               name="inventory_layout_stack"
               height="565"
-              width="355">
+              width="395">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="355"
+                 width="395"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -48,7 +48,7 @@
                       top="0"
                       label=""
                       height="300"
-                      width="355" />
+                      width="395" />
              </layout_panel>
 			    <layout_panel
                  width="355"
-- 
cgit v1.2.3


From ec02220f068c7e7ec61e8c8af7a3c4c96c112172 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Feb 2023 02:19:49 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #1

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llfloaterchangeitemthumbnail.cpp     |  41 +++++++
 indra/newview/llfloaterchangeitemthumbnail.h       |  38 +++++++
 indra/newview/llinventorybridge.cpp                |   6 ++
 indra/newview/llviewerfloaterreg.cpp               |   2 +
 .../xui/en/floater_change_item_thumbnail.xml       | 118 +++++++++++++++++++++
 .../skins/default/xui/en/menu_inventory.xml        |   8 ++
 7 files changed, 215 insertions(+)
 create mode 100644 indra/newview/llfloaterchangeitemthumbnail.cpp
 create mode 100644 indra/newview/llfloaterchangeitemthumbnail.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 402cc70a64..da9c9c5320 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -233,6 +233,7 @@ set(viewer_SOURCE_FILES
     llfloaterbuyland.cpp
     llfloatercamera.cpp
     llfloatercamerapresets.cpp
+	llfloaterchangeitemthumbnail.cpp
     llfloaterchatvoicevolume.cpp
     llfloaterclassified.cpp
     llfloatercolorpicker.cpp
@@ -872,6 +873,7 @@ set(viewer_HEADER_FILES
     llfloaterbuycurrencyhtml.h
     llfloaterbuyland.h
     llfloatercamerapresets.h
+	llfloaterchangeitemthumbnail.h
     llfloatercamera.h
     llfloaterchatvoicevolume.h
     llfloaterclassified.h
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
new file mode 100644
index 0000000000..7590fc35d1
--- /dev/null
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -0,0 +1,41 @@
+/** 
+ * @file llfloaterchangeitemthumbnail.cpp
+ * @brief LLFloaterChangeItemThumbnail class implementation
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterchangeitemthumbnail.h"
+
+#include "lllineeditor.h"
+
+
+LLFloaterChangeItemThumbnail::LLFloaterChangeItemThumbnail(const LLSD& key)
+	: LLPreview(key)
+{
+}
+
+LLFloaterChangeItemThumbnail::~LLFloaterChangeItemThumbnail()
+{
+}
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
new file mode 100644
index 0000000000..94792f07b6
--- /dev/null
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -0,0 +1,38 @@
+/** 
+ * @file llfloaterchangeitemthumbnail.h
+ * @brief LLFloaterChangeItemThumbnail class definition
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
+#define LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
+
+#include "llfloater.h"
+
+class LLFloaterChangeItemThumbnail : public LLFloater
+{
+public:
+    LLFloaterChangeItemThumbnail(const LLSD& key);
+	~LLFloaterChangeItemThumbnail();
+};
+#endif  // LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 31801c0aa0..1b36c718f5 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1719,6 +1719,12 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action)
 		restoreItem();
 		return;
 	}
+    else if ("thumbnail" == action)
+    {
+        LLSD data(mUUID);
+        LLFloaterReg::showInstance("change_item_thumbnail", data);
+        return;
+    }
 	else if ("copy_uuid" == action)
 	{
 		// Single item only
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 6b854065a6..06fba187bb 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -56,6 +56,7 @@
 #include "llfloaterbvhpreview.h"
 #include "llfloatercamera.h"
 #include "llfloatercamerapresets.h"
+#include "llfloaterchangeitemthumbnail.h"
 #include "llfloaterchatvoicevolume.h"
 #include "llfloaterclassified.h"
 #include "llfloaterconversationlog.h"
@@ -327,6 +328,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
 	LLFloaterReg::add("camera_presets", "floater_camera_presets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCameraPresets>);
 	LLFloaterReg::add("chat_voice", "floater_voice_chat_volume.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChatVoiceVolume>);
+    LLFloaterReg::add("change_item_thumbnail", "floater_change_item_thumbnail.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChangeItemThumbnail>);
 	LLFloaterReg::add("nearby_chat", "floater_im_session.xml", (LLFloaterBuildFunc)&LLFloaterIMNearbyChat::buildFloater);
     LLFloaterReg::add("classified", "floater_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterClassified>);
 	LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
new file mode 100644
index 0000000000..c2c4c07ca1
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="false"
+ height="366"
+ layout="topleft"
+ name="change_item_thumbnail"
+ help_topic="change_item_thumbnail"
+ title="CHANGE ITEM IMAGE"
+ width="320">
+  <icon
+    follows="top|left"
+    height="16"
+    image_name="Inv_Object"
+    layout="topleft"
+    left="5"
+    mouse_opaque="true"
+    name="item_type_icon"
+    top="5"
+    width="16" />
+  <line_editor
+    border_style="line"
+    border_thickness="1"
+    follows="left|top|right"
+    font="SansSerif"
+    height="19"
+    layout="topleft"
+    top_delta="-2"
+    left_pad="5"
+    max_length_bytes="127"
+    name="item_name"
+    width="286" />
+
+  <thumbnail
+    name="item_thumbnail"
+    follows="top|left"
+    layout="topleft"
+    left="31"
+    top_pad="9"
+    height="256"
+    width="256"
+        />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="A"
+    layout="topleft"
+    left="37"
+    name="upload_local"
+    top_pad="9"
+    width="32" />
+  
+  <button
+    follows="right|bottom"
+    height="32"
+    label="B"
+    layout="topleft"
+    left_pad="10"
+    name="upload_snapshot"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="C"
+    layout="topleft"
+    left_pad="10"
+    name="use_texture"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="D"
+    layout="topleft"
+    left_pad="10"
+    name="to_clipboard"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="E"
+    layout="topleft"
+    left_pad="10"
+    name="from_clipboard"
+    top_delta="0"
+    width="32" />
+
+  <button
+    follows="right|bottom"
+    height="32"
+    label="F"
+    layout="topleft"
+    left_pad="10"
+    name="remove"
+    top_delta="0"
+    width="32" />
+
+  <text
+    type="string"
+    halign="center"
+    length="1"
+    follows="left|top"
+    height="17"
+    layout="topleft"
+    left="5"
+    right="-5"
+    name="LabelOwnerTitle"
+    top_pad="12"
+    width="78">
+    tooltip
+  </text>
+  
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 5fe53526c7..97a93245ff 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -618,6 +618,14 @@
          function="Inventory.DoToSelected"
          parameter="rename" />
     </menu_item_call>
+    <menu_item_call
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="thumbnail" />
+    </menu_item_call>
     <menu_item_call
      label="Copy Asset UUID"
      layout="topleft"
-- 
cgit v1.2.3


From f2d46651b92d949a63d2b3a5dd774dce6a6752c7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Feb 2023 23:56:49 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #2

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 249 ++++++++++++++++++++-
 indra/newview/llfloaterchangeitemthumbnail.h       |  62 ++++-
 indra/newview/llinventorybridge.cpp                |   8 +-
 indra/newview/llsidepaneliteminfo.cpp              |   2 +-
 .../xui/en/floater_change_item_thumbnail.xml       |  48 ++--
 5 files changed, 352 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 7590fc35d1..05b9b89dd3 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -28,14 +28,261 @@
 
 #include "llfloaterchangeitemthumbnail.h"
 
+#include "llbutton.h"
+#include "lliconctrl.h"
+#include "llinventoryicon.h"
+#include "llinventorymodel.h"
+#include "llinventoryobserver.h"
 #include "lllineeditor.h"
+#include "lltextbox.h"
+#include "llthumbnailctrl.h"
+#include "llviewerobjectlist.h"
 
 
 LLFloaterChangeItemThumbnail::LLFloaterChangeItemThumbnail(const LLSD& key)
-	: LLPreview(key)
+    : LLFloater(key)
+    , mObserverInitialized(false)
+    , mTooltipState(TOOLTIP_NONE)
 {
 }
 
 LLFloaterChangeItemThumbnail::~LLFloaterChangeItemThumbnail()
 {
+    gInventory.removeObserver(this);
+    removeVOInventoryListener();
 }
+
+BOOL LLFloaterChangeItemThumbnail::postBuild()
+{
+    mItemNameText = getChild<LLUICtrl>("item_name");
+    mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
+    mThumbnailCtrl = getChild<LLThumbnailCtrl>("item_thumbnail");
+    mToolTipTextBox = getChild<LLTextBox>("tooltip_text");
+
+    LLSD tooltip_text;
+    mToolTipTextBox->setValue(tooltip_text);
+
+    LLButton *upload_local = getChild<LLButton>("upload_local");
+    upload_local->setClickedCallback(onUploadLocal, (void*)this);
+    upload_local->setMouseEnterCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseEnter, this, _1, _2, TOOLTIP_UPLOAD_LOCAL));
+    upload_local->setMouseLeaveCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseLeave, this, _1, _2, TOOLTIP_UPLOAD_LOCAL));
+
+    LLButton *upload_snapshot = getChild<LLButton>("upload_snapshot");
+    upload_snapshot->setClickedCallback(onUploadSnapshot, (void*)this);
+    upload_snapshot->setMouseEnterCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseEnter, this, _1, _2, TOOLTIP_UPLOAD_SNAPSHOT));
+    upload_snapshot->setMouseLeaveCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseLeave, this, _1, _2, TOOLTIP_UPLOAD_SNAPSHOT));
+
+    LLButton *use_texture = getChild<LLButton>("use_texture");
+    use_texture->setClickedCallback(onUseTexture, (void*)this);
+    use_texture->setMouseEnterCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseEnter, this, _1, _2, TOOLTIP_USE_TEXTURE));
+    use_texture->setMouseLeaveCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseLeave, this, _1, _2, TOOLTIP_USE_TEXTURE));
+
+    mCopyToClipboardBtn = getChild<LLButton>("copy_to_clipboard");
+    mCopyToClipboardBtn->setClickedCallback(onCopyToClipboard, (void*)this);
+    mCopyToClipboardBtn->setMouseEnterCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseEnter, this, _1, _2, TOOLTIP_COPY_TO_CLIPBOARD));
+    mCopyToClipboardBtn->setMouseLeaveCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseLeave, this, _1, _2, TOOLTIP_COPY_TO_CLIPBOARD));
+
+    mPasteFromClipboardBtn = getChild<LLButton>("paste_from_clipboard");
+    mPasteFromClipboardBtn->setClickedCallback(onPasteFromClipboard, (void*)this);
+    mPasteFromClipboardBtn->setMouseEnterCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseEnter, this, _1, _2, TOOLTIP_COPY_FROM_CLIPBOARD));
+    mPasteFromClipboardBtn->setMouseLeaveCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseLeave, this, _1, _2, TOOLTIP_COPY_FROM_CLIPBOARD));
+
+    mRemoveImageBtn = getChild<LLButton>("remove_image");
+    mRemoveImageBtn->setClickedCallback(onRemove, (void*)this);
+    mRemoveImageBtn->setMouseEnterCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseEnter, this, _1, _2, TOOLTIP_REMOVE));
+    mRemoveImageBtn->setMouseLeaveCallback(boost::bind(&LLFloaterChangeItemThumbnail::onButtonMouseLeave, this, _1, _2, TOOLTIP_REMOVE));
+
+    return LLFloater::postBuild();
+}
+
+void LLFloaterChangeItemThumbnail::onOpen(const LLSD& key)
+{
+    if (!key.has("item_id") && !key.isUUID())
+    {
+        closeFloater();
+    }
+
+    if (key.isUUID())
+    {
+        mItemId = key.asUUID();
+    }
+    else
+    {
+        mItemId = key["item_id"].asUUID();
+        mTaskId = key["task_id"].asUUID();
+    }
+
+    refreshFromInventory();
+}
+
+void LLFloaterChangeItemThumbnail::changed(U32 mask)
+{
+    //LLInventoryObserver
+
+    if (mTaskId.notNull() || mItemId.isNull())
+    {
+        // Task inventory or not set up yet
+        return;
+    }
+
+    const std::set<LLUUID>& mChangedItemIDs = gInventory.getChangedIDs();
+    std::set<LLUUID>::const_iterator it;
+
+    for (it = mChangedItemIDs.begin(); it != mChangedItemIDs.end(); it++)
+    {
+        // set dirty for 'item profile panel' only if changed item is the item for which 'item profile panel' is shown (STORM-288)
+        if (*it == mItemId)
+        {
+            // if there's a change we're interested in.
+            if ((mask & (LLInventoryObserver::LABEL | LLInventoryObserver::INTERNAL | LLInventoryObserver::REMOVE)) != 0)
+            {
+                refreshFromInventory();
+            }
+        }
+    }
+}
+
+void LLFloaterChangeItemThumbnail::inventoryChanged(LLViewerObject* object,
+    LLInventoryObject::object_list_t* inventory,
+    S32 serial_num,
+    void* user_data)
+{
+    //LLVOInventoryListener
+    refreshFromInventory();
+}
+
+void LLFloaterChangeItemThumbnail::refreshFromInventory()
+{
+    LLViewerInventoryItem* item = NULL;
+    if (mTaskId.isNull())
+    {
+        // it is in agent inventory
+        if (!mObserverInitialized)
+        {
+            gInventory.addObserver(this);
+            mObserverInitialized = true;
+        }
+
+        item = gInventory.getItem(mItemId);
+    }
+    else
+    {
+        LLViewerObject* object = gObjectList.findObject(mTaskId);
+        if (object)
+        {
+            if (!mObserverInitialized)
+            {
+                registerVOInventoryListener(object, NULL);
+                mObserverInitialized = false;
+            }
+
+            item = static_cast<LLViewerInventoryItem*>(object->getInventoryObject(mItemId));
+        }
+        else
+        {
+            closeFloater();
+        }
+    }
+
+    if (item)
+    {
+        // This floater probably shouldn't be be possible to open
+        // for imcomplete items
+        llassert(item->isFinished());
+
+        const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+        bool in_trash = (item->getUUID() == trash_id) || gInventory.isObjectDescendentOf(item->getUUID(), trash_id);
+        if (in_trash)
+        {
+            // Close properties when moving to trash
+            // Aren't supposed to view properties from trash
+            closeFloater();
+        }
+        else
+        {
+            refreshFromItem(item);
+        }
+    }
+    else
+    {
+        closeFloater();
+    }
+}
+
+void LLFloaterChangeItemThumbnail::refreshFromItem(LLViewerInventoryItem* item)
+{
+    LLUIImagePtr icon_img = LLInventoryIcon::getIcon(item->getType(), item->getInventoryType(), item->getFlags(), FALSE);
+    mItemTypeIcon->setImage(icon_img);
+    mItemNameText->setValue(item->getName());
+
+    LLUUID thumbnail_id = item->getThumbnailUUID();
+    mThumbnailCtrl->setValue(thumbnail_id);
+
+    mCopyToClipboardBtn->setEnabled(thumbnail_id.notNull());
+    mRemoveImageBtn->setEnabled(thumbnail_id.notNull() && (item->getActualType() != LLAssetType::AT_TEXTURE) || (item->getAssetUUID() != thumbnail_id));
+}
+
+void LLFloaterChangeItemThumbnail::startObjectInventoryObserver()
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::stopObjectInventoryObserver()
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::onUploadLocal(void *userdata)
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::onUploadSnapshot(void *userdata)
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::onUseTexture(void *userdata)
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::onCopyToClipboard(void *userdata)
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::onRemove(void *userdata)
+{
+
+}
+
+void LLFloaterChangeItemThumbnail::onButtonMouseEnter(LLUICtrl* button, const LLSD& param, EToolTipState state)
+{
+    mTooltipState = state;
+
+    std::string tooltip_text;
+    std::string tooltip_name = "tooltip_" + button->getName();
+    if (hasString(tooltip_name))
+    {
+        tooltip_text = getString(tooltip_name);
+    }
+
+    mToolTipTextBox->setValue(tooltip_text);
+}
+
+void LLFloaterChangeItemThumbnail::onButtonMouseLeave(LLUICtrl* button, const LLSD& param, EToolTipState state)
+{
+    if (mTooltipState == state)
+    {
+        mTooltipState = TOOLTIP_NONE;
+        LLSD tooltip_text;
+        mToolTipTextBox->setValue(tooltip_text);
+    }
+}
+
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 94792f07b6..a219adb6f5 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -28,11 +28,71 @@
 #define LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
 
 #include "llfloater.h"
+#include "llinventoryobserver.h"
+#include "llvoinventorylistener.h"
 
-class LLFloaterChangeItemThumbnail : public LLFloater
+class LLButton;
+class LLIconCtrl;
+class LLTextBox;
+class LLThumbnailCtrl;
+class LLUICtrl;
+class LLViewerInventoryItem;
+
+class LLFloaterChangeItemThumbnail : public LLFloater, public LLInventoryObserver, public LLVOInventoryListener
 {
 public:
     LLFloaterChangeItemThumbnail(const LLSD& key);
 	~LLFloaterChangeItemThumbnail();
+
+    BOOL postBuild() override;
+    void onOpen(const LLSD& key) override;
+
+    void changed(U32 mask) override;
+    void inventoryChanged(LLViewerObject* object,
+        LLInventoryObject::object_list_t* inventory,
+        S32 serial_num,
+        void* user_data) override;
+
+private:
+
+    void refreshFromInventory();
+    void refreshFromItem(LLViewerInventoryItem* item);
+
+    void startObjectInventoryObserver();
+    void stopObjectInventoryObserver();
+
+    static void onUploadLocal(void*);
+    static void onUploadSnapshot(void*);
+    static void onUseTexture(void*);
+    static void onCopyToClipboard(void*);
+    static void onPasteFromClipboard(void*);
+    static void onRemove(void*);
+
+    enum EToolTipState
+    {
+        TOOLTIP_NONE,
+        TOOLTIP_UPLOAD_LOCAL,
+        TOOLTIP_UPLOAD_SNAPSHOT,
+        TOOLTIP_USE_TEXTURE,
+        TOOLTIP_COPY_TO_CLIPBOARD,
+        TOOLTIP_COPY_FROM_CLIPBOARD,
+        TOOLTIP_REMOVE,
+    };
+
+    void onButtonMouseEnter(LLUICtrl* button, const LLSD& param, EToolTipState state);
+    void onButtonMouseLeave(LLUICtrl* button, const LLSD& param, EToolTipState state);
+
+    bool mObserverInitialized;
+    EToolTipState mTooltipState;
+    LLUUID mItemId;
+    LLUUID mTaskId;
+
+    LLIconCtrl *mItemTypeIcon;
+    LLUICtrl *mItemNameText;
+    LLThumbnailCtrl *mThumbnailCtrl;
+    LLTextBox *mToolTipTextBox;
+    LLButton *mCopyToClipboardBtn;
+    LLButton *mPasteFromClipboardBtn;
+    LLButton *mRemoveImageBtn;
 };
 #endif  // LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1b36c718f5..664ba3e336 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -878,6 +878,13 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 					disabled_items.push_back(std::string("Rename"));
 				}
 			}
+
+            LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID);
+            items.push_back(std::string("thumbnail"));
+            if (!inv_item || !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+            {
+                disabled_items.push_back(std::string("thumbnail"));
+            }
 			
 			if (show_asset_id)
 			{
@@ -885,7 +892,6 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
 				bool is_asset_knowable = false;
 
-				LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID);
 				if (inv_item)
 				{
 					is_asset_knowable = LLAssetType::lookupIsAssetIDKnowable(inv_item->getType());
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index ccc57c63ab..7d9fb6565c 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -750,7 +750,7 @@ void LLSidepanelItemInfo::changed(U32 mask)
     const LLUUID& item_id = getItemID();
     if (getObjectID().notNull() || item_id.isNull())
     {
-        // Tasl inventory or not set up yet
+        // Task inventory or not set up yet
         return;
     }
     
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index c2c4c07ca1..f177ed0c0b 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -6,7 +6,33 @@
  name="change_item_thumbnail"
  help_topic="change_item_thumbnail"
  title="CHANGE ITEM IMAGE"
- width="320">
+ width="319">
+
+  <floater.string
+    name="tooltip_upload_local">
+    Upload from computer
+  </floater.string>
+  <floater.string
+    name="tooltip_upload_snapshot">
+    Use snapshot tool
+  </floater.string>
+  <floater.string
+    name="tooltip_use_texture">
+    Choose texture
+  </floater.string>
+  <floater.string
+    name="tooltip_copy_to_clipboard">
+    Copy to clipboard
+  </floater.string>
+  <floater.string
+    name="tooltip_paste_from_clipboard">
+    Paste from clipboard
+  </floater.string>
+  <floater.string
+    name="tooltip_remove_image">
+    Remove image
+  </floater.string>
+  
   <icon
     follows="top|left"
     height="16"
@@ -28,13 +54,14 @@
     left_pad="5"
     max_length_bytes="127"
     name="item_name"
-    width="286" />
+    width="286"
+    enabled="false"/>
 
   <thumbnail
     name="item_thumbnail"
     follows="top|left"
     layout="topleft"
-    left="31"
+    left="32"
     top_pad="9"
     height="256"
     width="256"
@@ -45,11 +72,10 @@
     height="32"
     label="A"
     layout="topleft"
-    left="37"
+    left="38"
     name="upload_local"
     top_pad="9"
     width="32" />
-  
   <button
     follows="right|bottom"
     height="32"
@@ -59,7 +85,6 @@
     name="upload_snapshot"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
@@ -69,34 +94,31 @@
     name="use_texture"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
     label="D"
     layout="topleft"
     left_pad="10"
-    name="to_clipboard"
+    name="copy_to_clipboard"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
     label="E"
     layout="topleft"
     left_pad="10"
-    name="from_clipboard"
+    name="paste_from_clipboard"
     top_delta="0"
     width="32" />
-
   <button
     follows="right|bottom"
     height="32"
     label="F"
     layout="topleft"
     left_pad="10"
-    name="remove"
+    name="remove_image"
     top_delta="0"
     width="32" />
 
@@ -109,7 +131,7 @@
     layout="topleft"
     left="5"
     right="-5"
-    name="LabelOwnerTitle"
+    name="tooltip_text"
     top_pad="12"
     width="78">
     tooltip
-- 
cgit v1.2.3


From 8fdd6849995748b144b811d2e9585aeb2c56562d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 18:54:50 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #3

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 125 ++++++++++++++++++---
 indra/newview/llfloaterchangeitemthumbnail.h       |   9 +-
 indra/newview/llsidepaneliteminfo.cpp              |  12 +-
 indra/newview/llsidepaneliteminfo.h                |   1 +
 .../xui/en/floater_change_item_thumbnail.xml       |   4 +-
 .../skins/default/xui/en/sidepanel_item_info.xml   |  22 +++-
 6 files changed, 145 insertions(+), 28 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 05b9b89dd3..90fecd07ba 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -29,14 +29,17 @@
 #include "llfloaterchangeitemthumbnail.h"
 
 #include "llbutton.h"
+#include "llclipboard.h"
 #include "lliconctrl.h"
 #include "llinventoryicon.h"
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
 #include "lllineeditor.h"
 #include "lltextbox.h"
+#include "lltexturectrl.h"
 #include "llthumbnailctrl.h"
 #include "llviewerobjectlist.h"
+#include "llwindow.h"
 
 
 LLFloaterChangeItemThumbnail::LLFloaterChangeItemThumbnail(const LLSD& key)
@@ -151,7 +154,7 @@ void LLFloaterChangeItemThumbnail::inventoryChanged(LLViewerObject* object,
     refreshFromInventory();
 }
 
-void LLFloaterChangeItemThumbnail::refreshFromInventory()
+LLViewerInventoryItem* LLFloaterChangeItemThumbnail::getItem()
 {
     LLViewerInventoryItem* item = NULL;
     if (mTaskId.isNull())
@@ -178,10 +181,16 @@ void LLFloaterChangeItemThumbnail::refreshFromInventory()
 
             item = static_cast<LLViewerInventoryItem*>(object->getInventoryObject(mItemId));
         }
-        else
-        {
-            closeFloater();
-        }
+    }
+    return item;
+}
+
+void LLFloaterChangeItemThumbnail::refreshFromInventory()
+{
+    LLViewerInventoryItem* item = getItem();
+    if (!item)
+    {
+        closeFloater();
     }
 
     if (item)
@@ -220,16 +229,9 @@ void LLFloaterChangeItemThumbnail::refreshFromItem(LLViewerInventoryItem* item)
 
     mCopyToClipboardBtn->setEnabled(thumbnail_id.notNull());
     mRemoveImageBtn->setEnabled(thumbnail_id.notNull() && (item->getActualType() != LLAssetType::AT_TEXTURE) || (item->getAssetUUID() != thumbnail_id));
-}
-
-void LLFloaterChangeItemThumbnail::startObjectInventoryObserver()
-{
-
-}
-
-void LLFloaterChangeItemThumbnail::stopObjectInventoryObserver()
-{
 
+    // todo: some elements might not support setting thumbnails
+    // since they already have them
 }
 
 void LLFloaterChangeItemThumbnail::onUploadLocal(void *userdata)
@@ -244,22 +246,113 @@ void LLFloaterChangeItemThumbnail::onUploadSnapshot(void *userdata)
 
 void LLFloaterChangeItemThumbnail::onUseTexture(void *userdata)
 {
+    LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
+    LLViewerInventoryItem* item = self->getItem();
+    if (item)
+    {
+        self->showTexturePicker(item->getThumbnailUUID());
+    }
 
 }
 
 void LLFloaterChangeItemThumbnail::onCopyToClipboard(void *userdata)
 {
-
+    LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
+    LLViewerInventoryItem* item = self->getItem();
+    if (item)
+    {
+        LLClipboard::instance().addToClipboard(item->getThumbnailUUID());
+    }
 }
 
 void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
 {
-
+    LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+    if (objects.size() > 0)
+    {
+        LLViewerInventoryItem* item = self->getItem();
+        if (item)
+        {
+            item->setThumbnailUUID(objects[0]);
+        }
+    }
 }
 
 void LLFloaterChangeItemThumbnail::onRemove(void *userdata)
 {
+    LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
+    LLViewerInventoryItem* item = self->getItem();
+    if (item)
+    {
+        item->setThumbnailUUID(LLUUID::null);
+    }
+}
+
+void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
+{
+    // show hourglass cursor when loading inventory window
+    getWindow()->setCursor(UI_CURSOR_WAIT);
 
+    LLFloater* floaterp = mPickerHandle.get();
+    // Show the dialog
+    if (floaterp)
+    {
+        floaterp->openFloater();
+    }
+    else
+    {
+        floaterp = new LLFloaterTexturePicker(
+            this,
+            thumbnail_id,
+            thumbnail_id,
+            thumbnail_id,
+            FALSE,
+            TRUE,
+            "SELECT PHOTO",
+            PERM_NONE,
+            PERM_NONE,
+            PERM_NONE,
+            FALSE,
+            NULL);
+
+        mPickerHandle = floaterp->getHandle();
+
+        LLFloaterTexturePicker* texture_floaterp = dynamic_cast<LLFloaterTexturePicker*>(floaterp);
+        if (texture_floaterp)
+        {
+            //texture_floaterp->setTextureSelectedCallback();
+            //texture_floaterp->setOnUpdateImageStatsCallback();
+            texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLUUID id)
+            {
+                if (op == LLTextureCtrl::TEXTURE_SELECT)
+                {
+                    onTexturePickerCommit(id);
+                }
+            }
+            );
+
+            texture_floaterp->setLocalTextureEnabled(FALSE);
+            texture_floaterp->setBakeTextureEnabled(FALSE);
+            texture_floaterp->setCanApplyImmediately(false);
+            texture_floaterp->setCanApply(false, true);
+        }
+
+        floaterp->openFloater();
+    }
+    floaterp->setFocus(TRUE);
+}
+
+void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
+{
+    LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mPickerHandle.get();
+    LLViewerInventoryItem* item = getItem();
+
+    if (item && floaterp)
+    {
+        item->setThumbnailUUID(floaterp->getAssetID());
+    }
 }
 
 void LLFloaterChangeItemThumbnail::onButtonMouseEnter(LLUICtrl* button, const LLSD& param, EToolTipState state)
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index a219adb6f5..340d5cf05e 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -55,12 +55,10 @@ public:
 
 private:
 
+    LLViewerInventoryItem* getItem();
     void refreshFromInventory();
     void refreshFromItem(LLViewerInventoryItem* item);
 
-    void startObjectInventoryObserver();
-    void stopObjectInventoryObserver();
-
     static void onUploadLocal(void*);
     static void onUploadSnapshot(void*);
     static void onUseTexture(void*);
@@ -68,6 +66,9 @@ private:
     static void onPasteFromClipboard(void*);
     static void onRemove(void*);
 
+    void showTexturePicker(const LLUUID &thumbnail_id);
+    void onTexturePickerCommit(LLUUID id);
+
     enum EToolTipState
     {
         TOOLTIP_NONE,
@@ -94,5 +95,7 @@ private:
     LLButton *mCopyToClipboardBtn;
     LLButton *mPasteFromClipboardBtn;
     LLButton *mRemoveImageBtn;
+
+    LLHandle<LLFloater> mPickerHandle;
 };
 #endif  // LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 7d9fb6565c..312dee8c93 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -36,6 +36,7 @@
 #include "llcallbacklist.h"
 #include "llcombobox.h"
 #include "llfloater.h"
+#include "llfloaterreg.h"
 #include "llgroupactions.h"
 #include "llgroupmgr.h"
 #include "lliconctrl.h"
@@ -160,6 +161,8 @@ BOOL LLSidepanelItemInfo::postBuild()
 	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
 	getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
+    // Thumnail edition
+    getChild<LLUICtrl>("change_thumbnail_btn")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onEditThumbnail, this));
 	// acquired date
 	// owner permissions
 	// Permissions debug text
@@ -1022,7 +1025,14 @@ void LLSidepanelItemInfo::updatePermissions()
 	}
 }
 
-// static
+void LLSidepanelItemInfo::onEditThumbnail()
+{
+    LLSD data;
+    data["task_id"] = mObjectID;
+    data["item_id"] = mItemID;
+    LLFloaterReg::showInstance("change_item_thumbnail", data);
+}
+
 void LLSidepanelItemInfo::onCommitSaleInfo(LLUICtrl* ctrl)
 {
     if (ctrl)
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index d75de34fb8..ba1d5c263a 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -115,6 +115,7 @@ protected:
 	void 						onCommitDescription();
 	void 						onCommitPermissions(LLUICtrl* ctrl);
 	void 						updatePermissions();
+    void 						onEditThumbnail();
 	void 						onCommitSaleInfo(LLUICtrl* ctrl);
 	void 						updateSaleInfo();
 	void 						onCommitChanges(LLPointer<LLViewerInventoryItem> item);
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index f177ed0c0b..c30a3ba761 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -41,7 +41,7 @@
     left="5"
     mouse_opaque="true"
     name="item_type_icon"
-    top="5"
+    top="4"
     width="16" />
   <line_editor
     border_style="line"
@@ -50,7 +50,7 @@
     font="SansSerif"
     height="19"
     layout="topleft"
-    top_delta="-2"
+    top_delta="-1"
     left_pad="5"
     max_length_bytes="127"
     name="item_name"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 8b0f8f7550..f755ec0ec4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -89,14 +89,14 @@
       name="layout_item_details"
       layout="topleft"
       follows="all"
-      height="130">
+      height="133">
       
       <thumbnail
         name="item_thumbnail"
         follows="top|left"
         layout="topleft"
         left="5"
-        top="0"
+        top="2"
         height="128"
         width="128"
         />
@@ -105,7 +105,7 @@
         type="string"
         length="1"
         follows="left|top"
-        height="17"
+        height="16"
         layout="topleft"
         left_pad="5"
         name="LabelOwnerTitle"
@@ -131,7 +131,7 @@ TestString PleaseIgnore
         type="string"
         length="1"
         follows="left|top"
-        height="17"
+        height="16"
         layout="topleft"
         left_delta="0"
         name="LabelCreatorTitle"
@@ -157,7 +157,7 @@ TestString PleaseIgnore
         type="string"
         length="1"
         follows="left|top"
-        height="17"
+        height="16"
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredTitle"
@@ -169,13 +169,23 @@ TestString PleaseIgnore
         type="string"
         length="1"
         follows="left|top|right"
-        height="23"
+        height="18"
         layout="topleft"
         left_delta="0"
         name="LabelAcquiredDate"
         top_pad="0"
         width="187">
+        00/00/00
       </text>
+      <button
+        follows="left|top"
+        height="21"
+        label="Image..."
+        layout="topleft"
+        left_delta="0"
+        name="change_thumbnail_btn"
+        top_pad="0"
+        width="120" />
     </layout_panel>
     
     <layout_panel
-- 
cgit v1.2.3


From 69f6caac73d406b0f0fe9b913e9d2f439677b279 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 23:08:31 +0200
Subject: SL-19117 Fix thumbnail preview not working for outfits

---
 indra/newview/llinspecttexture.cpp | 57 ++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 15 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index 8a8d7ed1bb..de0d65eb7e 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -75,11 +75,11 @@ void LLInspectTexture::onOpen(const LLSD& sdData)
 	// Start fade animation
 	LLInspect::onOpen(sdData);
 
-	bool fIsAsset = sdData.has("asset_id");
+	bool fIsAsset = sdData.has("thumbnail_id");
 	bool fIsInventory = sdData.has("item_id");
 
 	// Skip if we're being asked to display the same thing
-	const LLUUID idAsset = (fIsAsset) ? sdData["asset_id"].asUUID() : LLUUID::null;
+	const LLUUID idAsset = (fIsAsset) ? sdData["thumbnail_id"].asUUID() : LLUUID::null;
 	const LLUUID idItem = (fIsInventory) ? sdData["item_id"].asUUID() : LLUUID::null;
 	if ( (getVisible()) && ( ((fIsAsset) && (idAsset == mAssetId)) || ((fIsInventory) && (idItem == mItemId)) ) )
 	{
@@ -134,13 +134,27 @@ BOOL LLInspectTexture::postBuild()
 // Helper functions
 //
 
+class LLIsTextureType : public LLInventoryCollectFunctor
+{
+public:
+    LLIsTextureType() {}
+    virtual ~LLIsTextureType() {}
+    virtual bool operator()(LLInventoryCategory* cat,
+        LLInventoryItem* item);
+};
+
+bool LLIsTextureType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+{
+    return item && (item->getType() == LLAssetType::AT_TEXTURE);
+}
+
 LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
 {
     const LLSD& sdTooltip = p.create_params;
     
     if (sdTooltip.has("thumbnail_id") && sdTooltip["thumbnail_id"].asUUID().notNull())
     {
-        // go straight for tooltip regardless of type
+        // go straight for thumbnail regardless of type
         return LLUICtrlFactory::create<LLTextureToolTip>(p);
     }
 
@@ -152,18 +166,31 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
 				if (sdTooltip.has("item_id"))
 				{
 					const LLUUID idCategory = sdTooltip["item_id"].asUUID();
-
-					LLInventoryModel::cat_array_t cats;
-					LLInventoryModel::item_array_t items;
-					LLIsOfAssetType f(LLAssetType::AT_TEXTURE);
-					gInventory.getDirectDescendentsOf(idCategory, cats, items, f);
-
-					// Exactly one texture found => show the texture tooltip
-					if (1 == items.size())
-					{
-						p.create_params.getValue()["asset_id"] = items.front()->getAssetUUID();
-						return LLUICtrlFactory::create<LLTextureToolTip>(p);
-					}
+                    LLViewerInventoryCategory* cat = gInventory.getCategory(idCategory);
+                    if (cat && cat->getPreferredType() == LLFolderType::FT_OUTFIT)
+                    {
+                        LLInventoryModel::cat_array_t cats;
+                        LLInventoryModel::item_array_t items;
+                        // Not LLIsOfAssetType, because we allow links
+                        LLIsTextureType f;
+                        gInventory.getDirectDescendentsOf(idCategory, cats, items, f);
+
+                        // Exactly one texture found => show the texture tooltip
+                        if (1 == items.size())
+                        {
+                            LLViewerInventoryItem* item = items.front();
+                            if (item && item->getIsLinkType())
+                            {
+                                item = item->getLinkedItem();
+                            }
+                            if (item)
+                            {
+                                // Todo: write this into folder's thumbnail id
+                                p.create_params.getValue()["thumbnail_id"] = item->getAssetUUID();
+                                return LLUICtrlFactory::create<LLTextureToolTip>(p);
+                            }
+                        }
+                    }
 				}
 
 				// No or more than one texture found => show default tooltip
-- 
cgit v1.2.3


From 6ea8e9d7163f2d8d0b71f262e445a993b3c3aea1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 23:37:22 +0200
Subject: SL-19108 Build fix

---
 indra/newview/CMakeLists.txt                                         | 4 ++--
 indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index da9c9c5320..c570052908 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -233,7 +233,7 @@ set(viewer_SOURCE_FILES
     llfloaterbuyland.cpp
     llfloatercamera.cpp
     llfloatercamerapresets.cpp
-	llfloaterchangeitemthumbnail.cpp
+    llfloaterchangeitemthumbnail.cpp
     llfloaterchatvoicevolume.cpp
     llfloaterclassified.cpp
     llfloatercolorpicker.cpp
@@ -873,7 +873,7 @@ set(viewer_HEADER_FILES
     llfloaterbuycurrencyhtml.h
     llfloaterbuyland.h
     llfloatercamerapresets.h
-	llfloaterchangeitemthumbnail.h
+    llfloaterchangeitemthumbnail.h
     llfloatercamera.h
     llfloaterchatvoicevolume.h
     llfloaterclassified.h
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index c30a3ba761..97c6ecee20 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -38,7 +38,7 @@
     height="16"
     image_name="Inv_Object"
     layout="topleft"
-    left="5"
+    left="7"
     mouse_opaque="true"
     name="item_type_icon"
     top="4"
@@ -51,7 +51,7 @@
     height="19"
     layout="topleft"
     top_delta="-1"
-    left_pad="5"
+    left_pad="3"
     max_length_bytes="127"
     name="item_name"
     width="286"
-- 
cgit v1.2.3


From 603053807cb0bb0026058c8b01decd042300bd93 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 19 Feb 2023 18:51:55 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #4

Added icons
---
 .../default/textures/icons/copy_clipboard.png      | Bin 0 -> 3443 bytes
 .../skins/default/textures/icons/delete_icon.png   | Bin 0 -> 3570 bytes
 .../skins/default/textures/icons/file_upload.png   | Bin 0 -> 3191 bytes
 .../default/textures/icons/paste_clipboard.png     | Bin 0 -> 3412 bytes
 .../skins/default/textures/icons/snapshot_icon.png | Bin 0 -> 3341 bytes
 .../skins/default/textures/icons/texture_icon.png  | Bin 0 -> 2812 bytes
 indra/newview/skins/default/textures/textures.xml  |  12 +++++
 .../xui/en/floater_change_item_thumbnail.xml       |  54 ++++++++++++++-------
 8 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/copy_clipboard.png
 create mode 100644 indra/newview/skins/default/textures/icons/delete_icon.png
 create mode 100644 indra/newview/skins/default/textures/icons/file_upload.png
 create mode 100644 indra/newview/skins/default/textures/icons/paste_clipboard.png
 create mode 100644 indra/newview/skins/default/textures/icons/snapshot_icon.png
 create mode 100644 indra/newview/skins/default/textures/icons/texture_icon.png

(limited to 'indra')

diff --git a/indra/newview/skins/default/textures/icons/copy_clipboard.png b/indra/newview/skins/default/textures/icons/copy_clipboard.png
new file mode 100644
index 0000000000..bb1ceff1ce
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/copy_clipboard.png differ
diff --git a/indra/newview/skins/default/textures/icons/delete_icon.png b/indra/newview/skins/default/textures/icons/delete_icon.png
new file mode 100644
index 0000000000..37ce374653
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/delete_icon.png differ
diff --git a/indra/newview/skins/default/textures/icons/file_upload.png b/indra/newview/skins/default/textures/icons/file_upload.png
new file mode 100644
index 0000000000..58f2757136
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/file_upload.png differ
diff --git a/indra/newview/skins/default/textures/icons/paste_clipboard.png b/indra/newview/skins/default/textures/icons/paste_clipboard.png
new file mode 100644
index 0000000000..e1589ab098
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/paste_clipboard.png differ
diff --git a/indra/newview/skins/default/textures/icons/snapshot_icon.png b/indra/newview/skins/default/textures/icons/snapshot_icon.png
new file mode 100644
index 0000000000..41d524678f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/snapshot_icon.png differ
diff --git a/indra/newview/skins/default/textures/icons/texture_icon.png b/indra/newview/skins/default/textures/icons/texture_icon.png
new file mode 100644
index 0000000000..278760a5b0
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/texture_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1f2c0867c4..1941c388b7 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -252,10 +252,16 @@ with the same filename but different name
   <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
   <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
   <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" />
+  
+  <texture name="Icon_Copy" file_name="icons/copy_clipboard.png" preload="true" />
+  
+  <texture name="Icon_Delete" file_name="icons/delete_icon.png" preload="true" />
 
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
+  <texture name="Icon_File_Upload" file_name="icons/file_upload.png" preload="true" />
+  
   <texture name="Icon_For_Sale" file_name="icons/Icon_For_Sale.png" preload="false" />
 
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
@@ -268,10 +274,16 @@ with the same filename but different name
 
   <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
   <texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" />
+  
+  <texture name="Icon_Paste" file_name="icons/paste_clipboard.png" preload="true" />
 
   <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
   <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
 
+  <texture name="Icon_Snapshot" file_name="icons/snapshot_icon.png" preload="true" />
+  
+  <texture name="Icon_Use_Texture" file_name="icons/texture_icon.png" preload="true" />
+
   <texture name="Info" file_name="icons/Info.png" preload="false" />
   <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
   <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 97c6ecee20..9657290f1f 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -69,57 +69,75 @@
 
   <button
     follows="right|bottom"
-    height="32"
-    label="A"
     layout="topleft"
-    left="38"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_File_Upload"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="upload_local"
+    left="38"
     top_pad="9"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="B"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Snapshot"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="upload_snapshot"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="C"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Use_Texture"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="use_texture"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="D"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Copy"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="copy_to_clipboard"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="E"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Paste"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="paste_from_clipboard"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
   <button
     follows="right|bottom"
-    height="32"
-    label="F"
     layout="topleft"
-    left_pad="10"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Delete"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
     name="remove_image"
+    left_pad="10"
     top_delta="0"
+    height="32"
     width="32" />
 
   <text
-- 
cgit v1.2.3


From e45dce1b75bd04459d5e6839bee8bf8b93dd0a5b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 20 Feb 2023 18:37:18 +0200
Subject: mac build fix

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 90fecd07ba..bd528f43dc 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -228,7 +228,7 @@ void LLFloaterChangeItemThumbnail::refreshFromItem(LLViewerInventoryItem* item)
     mThumbnailCtrl->setValue(thumbnail_id);
 
     mCopyToClipboardBtn->setEnabled(thumbnail_id.notNull());
-    mRemoveImageBtn->setEnabled(thumbnail_id.notNull() && (item->getActualType() != LLAssetType::AT_TEXTURE) || (item->getAssetUUID() != thumbnail_id));
+    mRemoveImageBtn->setEnabled(thumbnail_id.notNull() && ((item->getActualType() != LLAssetType::AT_TEXTURE) || (item->getAssetUUID() != thumbnail_id)));
 
     // todo: some elements might not support setting thumbnails
     // since they already have them
-- 
cgit v1.2.3


From 4f5d7f12563f1829856023d6967507fe783bbe5e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 20 Feb 2023 18:42:46 +0200
Subject: SL-19105 WIP Allow setting on_visible in XML for menu separator

---
 indra/llui/llmenugl.cpp | 17 +++++++++++++----
 indra/llui/llmenugl.h   |  9 ++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 5cb840fd61..35f2930800 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -576,13 +576,13 @@ void LLMenuItemGL::onVisibilityChange(BOOL new_visibility)
 //
 // This class represents a separator.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LLMenuItemSeparatorGL::Params::Params()
-{
-}
-
 LLMenuItemSeparatorGL::LLMenuItemSeparatorGL(const LLMenuItemSeparatorGL::Params& p) :
 	LLMenuItemGL( p )
 {
+    if (p.on_visible.isProvided())
+    {
+        mVisibleSignal.connect(initEnableCallback(p.on_visible));
+    }
 }
 
 //virtual
@@ -599,6 +599,15 @@ void LLMenuItemSeparatorGL::draw( void )
 	gl_line_2d( PAD, y, getRect().getWidth() - PAD, y );
 }
 
+void LLMenuItemSeparatorGL::buildDrawLabel( void )
+{
+    if (mVisibleSignal.num_slots() > 0)
+    {
+        bool visible = mVisibleSignal(this, LLSD());
+        setVisible(visible);
+    }
+}
+
 BOOL LLMenuItemSeparatorGL::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	LLMenuGL* parent_menu = getMenu();
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index f84c4d41eb..47a46510b3 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -234,7 +234,9 @@ class LLMenuItemSeparatorGL : public LLMenuItemGL
 public:
 	struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
 	{
-		Params();
+        Optional<EnableCallbackParam > on_visible;
+        Params() : on_visible("on_visible")
+        {}
 	};
 	LLMenuItemSeparatorGL(const LLMenuItemSeparatorGL::Params& p = LLMenuItemSeparatorGL::Params());
 
@@ -243,7 +245,12 @@ public:
 	/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
 
+    virtual void buildDrawLabel();
+
 	/*virtual*/ U32 getNominalHeight( void ) const;
+
+private:
+    enable_signal_t mVisibleSignal;
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- 
cgit v1.2.3


From e40f9af831c1257dea37a4565aafd73baa5005b6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 20 Feb 2023 22:06:15 +0200
Subject: SL-19108 WIP Managing inventory thumbnail #5

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 201 +++++++++++++++++++++++++
 indra/newview/llpanelprofile.cpp               |  14 +-
 indra/newview/llviewerregion.cpp               |   2 +
 3 files changed, 212 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index bd528f43dc..b267c7e0a3 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -38,10 +38,204 @@
 #include "lltextbox.h"
 #include "lltexturectrl.h"
 #include "llthumbnailctrl.h"
+#include "llviewermenufile.h"
 #include "llviewerobjectlist.h"
 #include "llwindow.h"
 
 
+//TODO: this part is likely to be moved into outfit snapshot floater
+// and flaoter is likely to become a thumbnail snapshot floater
+
+#include "llagent.h"
+#include "llnotificationsutil.h"
+#include "llviewertexturelist.h"
+
+static const std::string THUMBNAIL_ITEM_UPLOAD_CAP = "InventoryItemThumbnailUpload";
+static const std::string THUMBNAIL_CATEGORY_UPLOAD_CAP = "InventoryCategoryThumbnailUpload";
+
+void post_thumbnail_image_coro(std::string cap_url, std::string path_to_image, LLSD first_data)
+{
+    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
+    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
+        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("post_profile_image_coro", httpPolicy));
+    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
+    LLCore::HttpHeaders::ptr_t httpHeaders;
+
+    LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
+    httpOpts->setFollowRedirects(true);
+
+    LLSD result = httpAdapter->postAndSuspend(httpRequest, cap_url, first_data, httpOpts, httpHeaders);
+
+    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    if (!status)
+    {
+        // todo: notification?
+        LL_WARNS("AvatarProperties") << "Failed to get uploader cap " << status.toString() << LL_ENDL;
+        return;
+    }
+    if (!result.has("uploader"))
+    {
+        // todo: notification?
+        LL_WARNS("AvatarProperties") << "Failed to get uploader cap, response contains no data." << LL_ENDL;
+        return;
+    }
+    std::string uploader_cap = result["uploader"].asString();
+    if (uploader_cap.empty())
+    {
+        LL_WARNS("AvatarProperties") << "Failed to get uploader cap, cap invalid." << LL_ENDL;
+        return;
+    }
+
+    // Upload the image
+
+    LLCore::HttpRequest::ptr_t uploaderhttpRequest(new LLCore::HttpRequest);
+    LLCore::HttpHeaders::ptr_t uploaderhttpHeaders(new LLCore::HttpHeaders);
+    LLCore::HttpOptions::ptr_t uploaderhttpOpts(new LLCore::HttpOptions);
+    S64 length;
+
+    {
+        llifstream instream(path_to_image.c_str(), std::iostream::binary | std::iostream::ate);
+        if (!instream.is_open())
+        {
+            LL_WARNS("AvatarProperties") << "Failed to open file " << path_to_image << LL_ENDL;
+            return;
+        }
+        length = instream.tellg();
+    }
+
+    uploaderhttpHeaders->append(HTTP_OUT_HEADER_CONTENT_TYPE, "application/jp2"); // optional
+    uploaderhttpHeaders->append(HTTP_OUT_HEADER_CONTENT_LENGTH, llformat("%d", length)); // required!
+    uploaderhttpOpts->setFollowRedirects(true);
+
+    result = httpAdapter->postFileAndSuspend(uploaderhttpRequest, uploader_cap, path_to_image, uploaderhttpOpts, uploaderhttpHeaders);
+
+    httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    LL_DEBUGS("Thumbnail") << result << LL_ENDL;
+
+    if (!status)
+    {
+        LL_WARNS("Thumbnail") << "Failed to upload image " << status.toString() << LL_ENDL;
+        return;
+    }
+    
+    if (result["state"].asString() != "complete")
+    {
+        if (result.has("message"))
+        {
+            LL_WARNS("Thumbnail") << "Failed to upload image, state " << result["state"] << " message: " << result["message"] << LL_ENDL;
+        }
+        else
+        {
+            LL_WARNS("Thumbnail") << "Failed to upload image " << result << LL_ENDL;
+        }
+        return;
+    }
+
+    // todo: issue an inventory udpate?
+    //return result["new_asset"].asUUID();
+}
+
+class LLThumbnailImagePicker : public LLFilePickerThread
+{
+public:
+    LLThumbnailImagePicker(const LLUUID &item_id, LLHandle<LLFloater> *handle);
+    LLThumbnailImagePicker(const LLUUID &item_id, const LLUUID &task_id, LLHandle<LLFloater> *handle);
+    ~LLThumbnailImagePicker();
+    void notify(const std::vector<std::string>& filenames) override;
+
+private:
+    LLHandle<LLFloater> *mHandle;
+    LLUUID mInventoryId;
+    LLUUID mTaskId;
+};
+
+LLThumbnailImagePicker::LLThumbnailImagePicker(const LLUUID &item_id, LLHandle<LLFloater> *handle)
+    : LLFilePickerThread(LLFilePicker::FFLOAD_IMAGE)
+    , mHandle(handle)
+    , mInventoryId(item_id)
+{
+}
+
+LLThumbnailImagePicker::LLThumbnailImagePicker(const LLUUID &item_id, const LLUUID &task_id, LLHandle<LLFloater> *handle)
+    : LLFilePickerThread(LLFilePicker::FFLOAD_IMAGE)
+    , mHandle(handle)
+    , mInventoryId(item_id)
+    , mTaskId(task_id)
+{
+}
+
+LLThumbnailImagePicker::~LLThumbnailImagePicker()
+{
+    delete mHandle;
+}
+
+void LLThumbnailImagePicker::notify(const std::vector<std::string>& filenames)
+{
+    if (mHandle->isDead())
+    {
+        return;
+    }
+    if (filenames.empty())
+    {
+        return;
+    }
+    std::string file_path = filenames[0];
+    if (file_path.empty())
+    {
+        return;
+    }
+
+    // generate a temp texture file for coroutine
+    std::string temp_file = gDirUtilp->getTempFilename();
+    U32 codec = LLImageBase::getCodecFromExtension(gDirUtilp->getExtension(file_path));
+    const S32 MAX_DIM = 256;
+    if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, MAX_DIM))
+    {
+        LLSD notif_args;
+        notif_args["REASON"] = LLImage::getLastError().c_str();
+        LLNotificationsUtil::add("CannotUploadTexture", notif_args);
+        LL_WARNS("Thumbnail") << "Failed to upload thumbnail for " << mInventoryId << " " << mTaskId << ", reason: " << notif_args["REASON"].asString() << LL_ENDL;
+        return;
+    }
+
+    std::string cap_name;
+    LLSD data;
+
+    if (mTaskId.notNull())
+    {
+        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
+        data["item_id"] = mInventoryId;
+        data["task_id"] = mTaskId;
+    }
+    else if (gInventory.getCategory(mInventoryId))
+    {
+        cap_name = THUMBNAIL_CATEGORY_UPLOAD_CAP;
+        data["category_id"] = mInventoryId;
+    }
+    else
+    {
+        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
+        data["item_id"] = mInventoryId;
+    }
+
+    std::string cap_url = gAgent.getRegionCapability(cap_name);
+    if (cap_url.empty())
+    {
+        LLSD args;
+        args["CAPABILITY"] = cap_url;
+        LLNotificationsUtil::add("RegionCapabilityRequestError", args);
+        LL_WARNS("Thumbnail") << "Failed to upload profile image for item " << mInventoryId << " " << mTaskId << ", no cap found" << LL_ENDL;
+        return;
+    }
+
+    LLCoros::instance().launch("postAgentUserImageCoro",
+        boost::bind(post_thumbnail_image_coro, cap_url, temp_file, data));
+}
+
 LLFloaterChangeItemThumbnail::LLFloaterChangeItemThumbnail(const LLSD& key)
     : LLFloater(key)
     , mObserverInitialized(false)
@@ -236,7 +430,14 @@ void LLFloaterChangeItemThumbnail::refreshFromItem(LLViewerInventoryItem* item)
 
 void LLFloaterChangeItemThumbnail::onUploadLocal(void *userdata)
 {
+    LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
+    (new LLThumbnailImagePicker(self->mItemId, self->mTaskId, new LLHandle<LLFloater>(self->getHandle())))->getFile();
 
+    LLFloater* floaterp = self->mPickerHandle.get();
+    if (floaterp)
+    {
+        floaterp->closeFloater();
+    }
 }
 
 void LLFloaterChangeItemThumbnail::onUploadSnapshot(void *userdata)
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index bc3c8ae6b1..078c1370ee 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -366,7 +366,7 @@ LLUUID post_profile_image(std::string cap_url, const LLSD &first_data, std::stri
     httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
 
-    LL_WARNS("AvatarProperties") << result << LL_ENDL;
+    LL_DEBUGS("AvatarProperties") << result << LL_ENDL;
 
     if (!status)
     {
@@ -1438,7 +1438,6 @@ void LLPanelProfileSecondLife::setLoaded()
 }
 
 
-
 class LLProfileImagePicker : public LLFilePickerThread
 {
 public:
@@ -1485,15 +1484,20 @@ void LLProfileImagePicker::notify(const std::vector<std::string>& filenames)
     const S32 MAX_DIM = 256;
     if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, MAX_DIM))
     {
-        //todo: image not supported notification
-        LL_WARNS("AvatarProperties") << "Failed to upload profile image of type " << (S32)PROFILE_IMAGE_SL << ", failed to open image" << LL_ENDL;
+        LLSD notif_args;
+        notif_args["REASON"] = LLImage::getLastError().c_str();
+        LLNotificationsUtil::add("CannotUploadTexture", notif_args);
+        LL_WARNS("AvatarProperties") << "Failed to upload profile image of type " << (S32)mType << ", " << notif_args["REASON"].asString() << LL_ENDL;
         return;
     }
 
     std::string cap_url = gAgent.getRegionCapability(PROFILE_IMAGE_UPLOAD_CAP);
     if (cap_url.empty())
     {
-        LL_WARNS("AvatarProperties") << "Failed to upload profile image of type " << (S32)PROFILE_IMAGE_SL << ", no cap found" << LL_ENDL;
+        LLSD args;
+        args["CAPABILITY"] = PROFILE_IMAGE_UPLOAD_CAP;
+        LLNotificationsUtil::add("RegionCapabilityRequestError", args);
+        LL_WARNS("AvatarProperties") << "Failed to upload profile image of type " << (S32)mType << ", no cap found" << LL_ENDL;
         return;
     }
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index ad7321ca4b..e5d703a6ee 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3024,6 +3024,8 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 
 	capabilityNames.append("InterestList");
 
+    capabilityNames.append("InventoryCategoryThumbnailUpload");
+    capabilityNames.append("InventoryItemThumbnailUpload");
 	capabilityNames.append("GetDisplayNames");
 	capabilityNames.append("GetExperiences");
 	capabilityNames.append("AgentExperiences");
-- 
cgit v1.2.3


From 6a260bb3f0bc5bf726ad1c3f98e39d3fb9679484 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 20 Feb 2023 22:24:46 +0200
Subject: SL-19108 Rename outfit snapshot floater

---
 indra/newview/CMakeLists.txt                       |   4 +-
 indra/newview/llappviewer.cpp                      |   4 +-
 indra/newview/llfloatersimpleoutfitsnapshot.cpp    | 319 --------------------
 indra/newview/llfloatersimpleoutfitsnapshot.h      | 129 ---------
 indra/newview/llfloatersimplesnapshot.cpp          | 320 +++++++++++++++++++++
 indra/newview/llfloatersimplesnapshot.h            | 130 +++++++++
 indra/newview/lloutfitgallery.cpp                  |   4 +-
 indra/newview/llviewerfloaterreg.cpp               |   4 +-
 indra/newview/llviewermenufile.cpp                 |   6 +-
 .../xui/en/floater_simple_outfit_snapshot.xml      |  50 ----
 .../default/xui/en/floater_simple_snapshot.xml     |  50 ++++
 11 files changed, 511 insertions(+), 509 deletions(-)
 delete mode 100644 indra/newview/llfloatersimpleoutfitsnapshot.cpp
 delete mode 100644 indra/newview/llfloatersimpleoutfitsnapshot.h
 create mode 100644 indra/newview/llfloatersimplesnapshot.cpp
 create mode 100644 indra/newview/llfloatersimplesnapshot.h
 delete mode 100644 indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_simple_snapshot.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c570052908..08cce23852 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -290,7 +290,7 @@ set(viewer_SOURCE_FILES
     llfloateroutfitphotopreview.cpp 
     llfloaterobjectweights.cpp
     llfloateropenobject.cpp
-    llfloatersimpleoutfitsnapshot.cpp
+    llfloatersimplesnapshot.cpp
     llfloaterpathfindingcharacters.cpp
     llfloaterpathfindingconsole.cpp
     llfloaterpathfindinglinksets.cpp
@@ -934,7 +934,7 @@ set(viewer_HEADER_FILES
     llfloateroutfitphotopreview.h
     llfloaterobjectweights.h
     llfloateropenobject.h
-    llfloatersimpleoutfitsnapshot.h
+    llfloatersimplesnapshot.h
     llfloaterpathfindingcharacters.h
     llfloaterpathfindingconsole.h
     llfloaterpathfindinglinksets.h
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index dc9f7bb403..0f419d8243 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -213,7 +213,7 @@
 #include "llcommandlineparser.h"
 #include "llfloatermemleak.h"
 #include "llfloaterreg.h"
-#include "llfloatersimpleoutfitsnapshot.h"
+#include "llfloatersimplesnapshot.h"
 #include "llfloatersnapshot.h"
 #include "llsidepanelinventory.h"
 #include "llatmosphere.h"
@@ -1525,7 +1525,7 @@ bool LLAppViewer::doFrame()
 					LL_PROFILE_ZONE_NAMED_CATEGORY_APP( "df Snapshot" )
 				pingMainloopTimeout("Main:Snapshot");
 				LLFloaterSnapshot::update(); // take snapshots
-                LLFloaterSimpleOutfitSnapshot::update();
+                LLFloaterSimpleSnapshot::update();
 				gGLActive = FALSE;
 			}
 		}
diff --git a/indra/newview/llfloatersimpleoutfitsnapshot.cpp b/indra/newview/llfloatersimpleoutfitsnapshot.cpp
deleted file mode 100644
index 703112a0fa..0000000000
--- a/indra/newview/llfloatersimpleoutfitsnapshot.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/** 
-* @file llfloatersimpleoutfitsnapshot.cpp
-* @brief Snapshot preview window for saving as an outfit thumbnail in visual outfit gallery
-*
-* $LicenseInfo:firstyear=2022&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2022, Linden Research, Inc.
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation;
-* version 2.1 of the License only.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-* 
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-* 
-* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-* $/LicenseInfo$
-*/
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloatersimpleoutfitsnapshot.h"
-
-#include "llfloaterreg.h"
-#include "llimagefiltersmanager.h"
-#include "llstatusbar.h" // can_afford_transaction()
-#include "llnotificationsutil.h"
-#include "llagentbenefits.h"
-#include "llviewercontrol.h"
-
-LLSimpleOutfitSnapshotFloaterView* gSimpleOutfitSnapshotFloaterView = NULL;
-
-const S32 OUTFIT_SNAPSHOT_WIDTH = 256;
-const S32 OUTFIT_SNAPSHOT_HEIGHT = 256;
-
-static LLDefaultChildRegistry::Register<LLSimpleOutfitSnapshotFloaterView> r("simple_snapshot_outfit_floater_view");
-
-///----------------------------------------------------------------------------
-/// Class LLFloaterSimpleOutfitSnapshot::Impl
-///----------------------------------------------------------------------------
-
-LLSnapshotModel::ESnapshotFormat LLFloaterSimpleOutfitSnapshot::Impl::getImageFormat(LLFloaterSnapshotBase* floater)
-{
-    return LLSnapshotModel::SNAPSHOT_FORMAT_PNG;
-}
-
-LLSnapshotModel::ESnapshotLayerType LLFloaterSimpleOutfitSnapshot::Impl::getLayerType(LLFloaterSnapshotBase* floater)
-{
-    return LLSnapshotModel::SNAPSHOT_TYPE_COLOR;
-}
-
-void LLFloaterSimpleOutfitSnapshot::Impl::updateControls(LLFloaterSnapshotBase* floater)
-{
-    LLSnapshotLivePreview* previewp = getPreviewView();
-    updateResolution(floater);
-    if (previewp)
-    {
-        previewp->setSnapshotType(LLSnapshotModel::ESnapshotType::SNAPSHOT_TEXTURE);
-        previewp->setSnapshotFormat(LLSnapshotModel::ESnapshotFormat::SNAPSHOT_FORMAT_PNG);
-        previewp->setSnapshotBufferType(LLSnapshotModel::ESnapshotLayerType::SNAPSHOT_TYPE_COLOR);
-    }
-}
-
-std::string LLFloaterSimpleOutfitSnapshot::Impl::getSnapshotPanelPrefix()
-{
-    return "panel_outfit_snapshot_";
-}
-
-void LLFloaterSimpleOutfitSnapshot::Impl::updateResolution(void* data)
-{
-    LLFloaterSimpleOutfitSnapshot *view = (LLFloaterSimpleOutfitSnapshot *)data;
-
-    if (!view)
-    {
-        llassert(view);
-        return;
-    }
-
-    S32 width = OUTFIT_SNAPSHOT_WIDTH;
-    S32 height = OUTFIT_SNAPSHOT_HEIGHT;
-
-    LLSnapshotLivePreview* previewp = getPreviewView();
-    if (previewp)
-    {
-        S32 original_width = 0, original_height = 0;
-        previewp->getSize(original_width, original_height);
-
-        if (gSavedSettings.getBOOL("RenderHUDInSnapshot"))
-        { //clamp snapshot resolution to window size when showing UI HUD in snapshot
-            width = llmin(width, gViewerWindow->getWindowWidthRaw());
-            height = llmin(height, gViewerWindow->getWindowHeightRaw());
-        }
-
-        llassert(width > 0 && height > 0);
-
-        previewp->setSize(width, height);
-
-        if (original_width != width || original_height != height)
-        {
-            // hide old preview as the aspect ratio could be wrong
-            checkAutoSnapshot(previewp, FALSE);
-            previewp->updateSnapshot(TRUE);
-        }
-    }
-}
-
-void LLFloaterSimpleOutfitSnapshot::Impl::setStatus(EStatus status, bool ok, const std::string& msg)
-{
-    switch (status)
-    {
-    case STATUS_READY:
-        mFloater->setCtrlsEnabled(true);
-        break;
-    case STATUS_WORKING:
-        mFloater->setCtrlsEnabled(false);
-        break;
-    case STATUS_FINISHED:
-        mFloater->setCtrlsEnabled(true);
-        break;
-    }
-
-    mStatus = status;
-}
-
-///----------------------------------------------------------------re------------
-/// Class LLFloaterSimpleOutfitSnapshot
-///----------------------------------------------------------------------------
-
-LLFloaterSimpleOutfitSnapshot::LLFloaterSimpleOutfitSnapshot(const LLSD& key)
-    : LLFloaterSnapshotBase(key),
-    mOutfitGallery(NULL)
-{
-    impl = new Impl(this);
-}
-
-LLFloaterSimpleOutfitSnapshot::~LLFloaterSimpleOutfitSnapshot()
-{
-}
-
-BOOL LLFloaterSimpleOutfitSnapshot::postBuild()
-{
-    getChild<LLUICtrl>("save_btn")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()));
-
-    childSetAction("new_snapshot_btn", ImplBase::onClickNewSnapshot, this);
-    childSetAction("save_btn", boost::bind(&LLFloaterSimpleOutfitSnapshot::onSend, this));
-    childSetAction("cancel_btn", boost::bind(&LLFloaterSimpleOutfitSnapshot::onCancel, this));
-
-    mThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder");
-
-    // create preview window
-    LLRect full_screen_rect = getRootView()->getRect();
-    LLSnapshotLivePreview::Params p;
-    p.rect(full_screen_rect);
-    LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(p);
-    LLView* parent_view = gSnapshotFloaterView->getParent();
-
-    parent_view->addChild(previewp);
-
-    //move snapshot floater to special purpose snapshotfloaterview
-    gFloaterView->removeChild(this);
-    gSnapshotFloaterView->addChild(this);
-
-    impl->mPreviewHandle = previewp->getHandle();
-    previewp->setContainer(this);
-    impl->updateControls(this);
-    impl->setAdvanced(true);
-    impl->setSkipReshaping(true);
-
-    previewp->mKeepAspectRatio = FALSE;
-    previewp->setThumbnailPlaceholderRect(getThumbnailPlaceholderRect());
-    previewp->setAllowRenderUI(false);
-    previewp->setThumbnailSubsampled(TRUE);
-
-    return TRUE;
-}
-
-const S32 PREVIEW_OFFSET_Y = 70;
-
-void LLFloaterSimpleOutfitSnapshot::draw()
-{
-    LLSnapshotLivePreview* previewp = getPreviewView();
-
-    if (previewp && (previewp->isSnapshotActive() || previewp->getThumbnailLock()))
-    {
-        // don't render snapshot window in snapshot, even if "show ui" is turned on
-        return;
-    }
-
-    LLFloater::draw();
-
-    if (previewp && !isMinimized() && mThumbnailPlaceholder->getVisible())
-    {		
-        if(previewp->getThumbnailImage())
-        {
-            bool working = impl->getStatus() == ImplBase::STATUS_WORKING;
-            const S32 thumbnail_w = previewp->getThumbnailWidth();
-            const S32 thumbnail_h = previewp->getThumbnailHeight();
-
-            LLRect local_rect = getLocalRect();
-            S32 offset_x = (local_rect.getWidth() - thumbnail_w) / 2;
-            S32 offset_y = PREVIEW_OFFSET_Y;
-
-            gGL.matrixMode(LLRender::MM_MODELVIEW);
-            // Apply floater transparency to the texture unless the floater is focused.
-            F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
-            LLColor4 color = working ? LLColor4::grey4 : LLColor4::white;
-            gl_draw_scaled_image(offset_x, offset_y, 
-                thumbnail_w, thumbnail_h,
-                previewp->getThumbnailImage(), color % alpha);
-        }
-    }
-    impl->updateLayout(this);
-}
-
-void LLFloaterSimpleOutfitSnapshot::onOpen(const LLSD& key)
-{
-    LLSnapshotLivePreview* preview = getPreviewView();
-    if (preview)
-    {
-        preview->updateSnapshot(TRUE);
-    }
-    focusFirstItem(FALSE);
-    gSnapshotFloaterView->setEnabled(TRUE);
-    gSnapshotFloaterView->setVisible(TRUE);
-    gSnapshotFloaterView->adjustToFitScreen(this, FALSE);
-
-    impl->updateControls(this);
-    impl->setStatus(ImplBase::STATUS_READY);
-}
-
-void LLFloaterSimpleOutfitSnapshot::onCancel()
-{
-    closeFloater();
-}
-
-void LLFloaterSimpleOutfitSnapshot::onSend()
-{
-    S32 expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
-    if (can_afford_transaction(expected_upload_cost))
-    {
-        saveTexture();
-        postSave();
-    }
-    else
-    {
-        LLSD args;
-        args["COST"] = llformat("%d", expected_upload_cost);
-        LLNotificationsUtil::add("ErrorPhotoCannotAfford", args);
-        inventorySaveFailed();
-    }
-}
-
-void LLFloaterSimpleOutfitSnapshot::postSave()
-{
-    impl->setStatus(ImplBase::STATUS_WORKING);
-}
-
-// static 
-void LLFloaterSimpleOutfitSnapshot::update()
-{
-    LLFloaterSimpleOutfitSnapshot* inst = findInstance();
-    if (inst != NULL)
-    {
-        inst->impl->updateLivePreview();
-    }
-}
-
-
-// static
-LLFloaterSimpleOutfitSnapshot* LLFloaterSimpleOutfitSnapshot::findInstance()
-{
-    return LLFloaterReg::findTypedInstance<LLFloaterSimpleOutfitSnapshot>("simple_outfit_snapshot");
-}
-
-// static
-LLFloaterSimpleOutfitSnapshot* LLFloaterSimpleOutfitSnapshot::getInstance()
-{
-    return LLFloaterReg::getTypedInstance<LLFloaterSimpleOutfitSnapshot>("simple_outfit_snapshot");
-}
-
-void LLFloaterSimpleOutfitSnapshot::saveTexture()
-{
-     LLSnapshotLivePreview* previewp = getPreviewView();
-    if (!previewp)
-    {
-        llassert(previewp != NULL);
-        return;
-    }
-
-    if (mOutfitGallery)
-    {
-        mOutfitGallery->onBeforeOutfitSnapshotSave();
-    }
-    previewp->saveTexture(TRUE, getOutfitID().asString());
-    if (mOutfitGallery)
-    {
-        mOutfitGallery->onAfterOutfitSnapshotSave();
-    }
-    closeFloater();
-}
-
-///----------------------------------------------------------------------------
-/// Class LLSimpleOutfitSnapshotFloaterView
-///----------------------------------------------------------------------------
-
-LLSimpleOutfitSnapshotFloaterView::LLSimpleOutfitSnapshotFloaterView(const Params& p) : LLFloaterView(p)
-{
-}
-
-LLSimpleOutfitSnapshotFloaterView::~LLSimpleOutfitSnapshotFloaterView()
-{
-}
diff --git a/indra/newview/llfloatersimpleoutfitsnapshot.h b/indra/newview/llfloatersimpleoutfitsnapshot.h
deleted file mode 100644
index cc9a6c5d1e..0000000000
--- a/indra/newview/llfloatersimpleoutfitsnapshot.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
-* @file llfloatersimpleoutfitsnapshot.h
-* @brief Snapshot preview window for saving as an outfit thumbnail in visual outfit gallery
-*
-* $LicenseInfo:firstyear=2022&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2022, Linden Research, Inc.
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation;
-* version 2.1 of the License only.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-* $/LicenseInfo$
-*/
-
-#ifndef LL_LLFLOATERSIMPLEOUTFITSNAPSHOT_H
-#define LL_LLFLOATERSIMPLEOUTFITSNAPSHOT_H
-
-#include "llfloater.h"
-#include "llfloatersnapshot.h"
-#include "lloutfitgallery.h"
-#include "llsnapshotlivepreview.h"
-
-///----------------------------------------------------------------------------
-/// Class LLFloaterSimpleOutfitSnapshot
-///----------------------------------------------------------------------------
-
-class LLFloaterSimpleOutfitSnapshot : public LLFloaterSnapshotBase
-{
-    LOG_CLASS(LLFloaterSimpleOutfitSnapshot);
-
-public:
-
-    LLFloaterSimpleOutfitSnapshot(const LLSD& key);
-    ~LLFloaterSimpleOutfitSnapshot();
-
-    BOOL postBuild();
-    void onOpen(const LLSD& key);
-    void draw();
-
-    static void update();
-
-    static LLFloaterSimpleOutfitSnapshot* getInstance();
-    static LLFloaterSimpleOutfitSnapshot* findInstance();
-    void saveTexture();
-
-    const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }
-
-    void setOutfitID(LLUUID id) { mOutfitID = id; }
-    LLUUID getOutfitID() { return mOutfitID; }
-    void setGallery(LLOutfitGallery* gallery) { mOutfitGallery = gallery; }
-
-    void postSave();
-
-    class Impl;
-    friend class Impl;
-
-private:
-    void onSend();
-    void onCancel();
-
-    LLUUID mOutfitID;
-    LLOutfitGallery* mOutfitGallery;
-};
-
-///----------------------------------------------------------------------------
-/// Class LLFloaterSimpleOutfitSnapshot::Impl
-///----------------------------------------------------------------------------
-
-class LLFloaterSimpleOutfitSnapshot::Impl : public LLFloaterSnapshotBase::ImplBase
-{
-    LOG_CLASS(LLFloaterSimpleOutfitSnapshot::Impl);
-public:
-    Impl(LLFloaterSnapshotBase* floater)
-        : LLFloaterSnapshotBase::ImplBase(floater)
-    {}
-    ~Impl()
-    {}
-    void updateResolution(void* data);
-
-    static void onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status);
-
-    LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true) { return NULL; }
-    LLSnapshotModel::ESnapshotFormat getImageFormat(LLFloaterSnapshotBase* floater);
-    std::string getSnapshotPanelPrefix();
-
-    void updateControls(LLFloaterSnapshotBase* floater);
-
-    void setStatus(EStatus status, bool ok = true, const std::string& msg = LLStringUtil::null);
-
-private:
-    LLSnapshotModel::ESnapshotLayerType getLayerType(LLFloaterSnapshotBase* floater);
-    void setFinished(bool finished, bool ok = true, const std::string& msg = LLStringUtil::null) {};
-};
-
-///----------------------------------------------------------------------------
-/// Class LLSimpleOutfitSnapshotFloaterView
-///----------------------------------------------------------------------------
-
-class LLSimpleOutfitSnapshotFloaterView : public LLFloaterView
-{
-public:
-    struct Params
-        : public LLInitParam::Block<Params, LLFloaterView::Params>
-    {
-    };
-
-protected:
-    LLSimpleOutfitSnapshotFloaterView(const Params& p);
-    friend class LLUICtrlFactory;
-
-public:
-    virtual ~LLSimpleOutfitSnapshotFloaterView();
-};
-
-extern LLSimpleOutfitSnapshotFloaterView* gSimpleOutfitSnapshotFloaterView;
-
-#endif // LL_LLFLOATERSIMPLEOUTFITSNAPSHOT_H
diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
new file mode 100644
index 0000000000..05625e6817
--- /dev/null
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -0,0 +1,320 @@
+/** 
+* @file llfloatersimplesnapshot.cpp
+* @brief Snapshot preview window for saving as a thumbnail
+*
+* $LicenseInfo:firstyear=2022&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2022, Linden Research, Inc.
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+* 
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+* 
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+* 
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatersimplesnapshot.h"
+
+#include "llfloaterreg.h"
+#include "llimagefiltersmanager.h"
+#include "llstatusbar.h" // can_afford_transaction()
+#include "llnotificationsutil.h"
+#include "lloutfitgallery.h"
+#include "llagentbenefits.h"
+#include "llviewercontrol.h"
+
+LLSimpleSnapshotFloaterView* gSimpleSnapshotFloaterView = NULL;
+
+const S32 THUMBNAIL_SNAPSHOT_WIDTH = 256;
+const S32 THUMBNAIL_SNAPSHOT_HEIGHT = 256;
+
+static LLDefaultChildRegistry::Register<LLSimpleSnapshotFloaterView> r("simple_snapshot_floater_view");
+
+///----------------------------------------------------------------------------
+/// Class LLFloaterSimpleSnapshot::Impl
+///----------------------------------------------------------------------------
+
+LLSnapshotModel::ESnapshotFormat LLFloaterSimpleSnapshot::Impl::getImageFormat(LLFloaterSnapshotBase* floater)
+{
+    return LLSnapshotModel::SNAPSHOT_FORMAT_PNG;
+}
+
+LLSnapshotModel::ESnapshotLayerType LLFloaterSimpleSnapshot::Impl::getLayerType(LLFloaterSnapshotBase* floater)
+{
+    return LLSnapshotModel::SNAPSHOT_TYPE_COLOR;
+}
+
+void LLFloaterSimpleSnapshot::Impl::updateControls(LLFloaterSnapshotBase* floater)
+{
+    LLSnapshotLivePreview* previewp = getPreviewView();
+    updateResolution(floater);
+    if (previewp)
+    {
+        previewp->setSnapshotType(LLSnapshotModel::ESnapshotType::SNAPSHOT_TEXTURE);
+        previewp->setSnapshotFormat(LLSnapshotModel::ESnapshotFormat::SNAPSHOT_FORMAT_PNG);
+        previewp->setSnapshotBufferType(LLSnapshotModel::ESnapshotLayerType::SNAPSHOT_TYPE_COLOR);
+    }
+}
+
+std::string LLFloaterSimpleSnapshot::Impl::getSnapshotPanelPrefix()
+{
+    return "panel_outfit_snapshot_";
+}
+
+void LLFloaterSimpleSnapshot::Impl::updateResolution(void* data)
+{
+    LLFloaterSimpleSnapshot *view = (LLFloaterSimpleSnapshot *)data;
+
+    if (!view)
+    {
+        llassert(view);
+        return;
+    }
+
+    S32 width = THUMBNAIL_SNAPSHOT_WIDTH;
+    S32 height = THUMBNAIL_SNAPSHOT_HEIGHT;
+
+    LLSnapshotLivePreview* previewp = getPreviewView();
+    if (previewp)
+    {
+        S32 original_width = 0, original_height = 0;
+        previewp->getSize(original_width, original_height);
+
+        if (gSavedSettings.getBOOL("RenderHUDInSnapshot"))
+        { //clamp snapshot resolution to window size when showing UI HUD in snapshot
+            width = llmin(width, gViewerWindow->getWindowWidthRaw());
+            height = llmin(height, gViewerWindow->getWindowHeightRaw());
+        }
+
+        llassert(width > 0 && height > 0);
+
+        previewp->setSize(width, height);
+
+        if (original_width != width || original_height != height)
+        {
+            // hide old preview as the aspect ratio could be wrong
+            checkAutoSnapshot(previewp, FALSE);
+            previewp->updateSnapshot(TRUE);
+        }
+    }
+}
+
+void LLFloaterSimpleSnapshot::Impl::setStatus(EStatus status, bool ok, const std::string& msg)
+{
+    switch (status)
+    {
+    case STATUS_READY:
+        mFloater->setCtrlsEnabled(true);
+        break;
+    case STATUS_WORKING:
+        mFloater->setCtrlsEnabled(false);
+        break;
+    case STATUS_FINISHED:
+        mFloater->setCtrlsEnabled(true);
+        break;
+    }
+
+    mStatus = status;
+}
+
+///----------------------------------------------------------------re------------
+/// Class LLFloaterSimpleSnapshot
+///----------------------------------------------------------------------------
+
+LLFloaterSimpleSnapshot::LLFloaterSimpleSnapshot(const LLSD& key)
+    : LLFloaterSnapshotBase(key),
+    mOutfitGallery(NULL)
+{
+    impl = new Impl(this);
+}
+
+LLFloaterSimpleSnapshot::~LLFloaterSimpleSnapshot()
+{
+}
+
+BOOL LLFloaterSimpleSnapshot::postBuild()
+{
+    getChild<LLUICtrl>("save_btn")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()));
+
+    childSetAction("new_snapshot_btn", ImplBase::onClickNewSnapshot, this);
+    childSetAction("save_btn", boost::bind(&LLFloaterSimpleSnapshot::onSend, this));
+    childSetAction("cancel_btn", boost::bind(&LLFloaterSimpleSnapshot::onCancel, this));
+
+    mThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder");
+
+    // create preview window
+    LLRect full_screen_rect = getRootView()->getRect();
+    LLSnapshotLivePreview::Params p;
+    p.rect(full_screen_rect);
+    LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(p);
+    LLView* parent_view = gSnapshotFloaterView->getParent();
+
+    parent_view->addChild(previewp);
+
+    //move snapshot floater to special purpose snapshotfloaterview
+    gFloaterView->removeChild(this);
+    gSnapshotFloaterView->addChild(this);
+
+    impl->mPreviewHandle = previewp->getHandle();
+    previewp->setContainer(this);
+    impl->updateControls(this);
+    impl->setAdvanced(true);
+    impl->setSkipReshaping(true);
+
+    previewp->mKeepAspectRatio = FALSE;
+    previewp->setThumbnailPlaceholderRect(getThumbnailPlaceholderRect());
+    previewp->setAllowRenderUI(false);
+    previewp->setThumbnailSubsampled(TRUE);
+
+    return TRUE;
+}
+
+const S32 PREVIEW_OFFSET_Y = 70;
+
+void LLFloaterSimpleSnapshot::draw()
+{
+    LLSnapshotLivePreview* previewp = getPreviewView();
+
+    if (previewp && (previewp->isSnapshotActive() || previewp->getThumbnailLock()))
+    {
+        // don't render snapshot window in snapshot, even if "show ui" is turned on
+        return;
+    }
+
+    LLFloater::draw();
+
+    if (previewp && !isMinimized() && mThumbnailPlaceholder->getVisible())
+    {		
+        if(previewp->getThumbnailImage())
+        {
+            bool working = impl->getStatus() == ImplBase::STATUS_WORKING;
+            const S32 thumbnail_w = previewp->getThumbnailWidth();
+            const S32 thumbnail_h = previewp->getThumbnailHeight();
+
+            LLRect local_rect = getLocalRect();
+            S32 offset_x = (local_rect.getWidth() - thumbnail_w) / 2;
+            S32 offset_y = PREVIEW_OFFSET_Y;
+
+            gGL.matrixMode(LLRender::MM_MODELVIEW);
+            // Apply floater transparency to the texture unless the floater is focused.
+            F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
+            LLColor4 color = working ? LLColor4::grey4 : LLColor4::white;
+            gl_draw_scaled_image(offset_x, offset_y, 
+                thumbnail_w, thumbnail_h,
+                previewp->getThumbnailImage(), color % alpha);
+        }
+    }
+    impl->updateLayout(this);
+}
+
+void LLFloaterSimpleSnapshot::onOpen(const LLSD& key)
+{
+    LLSnapshotLivePreview* preview = getPreviewView();
+    if (preview)
+    {
+        preview->updateSnapshot(TRUE);
+    }
+    focusFirstItem(FALSE);
+    gSnapshotFloaterView->setEnabled(TRUE);
+    gSnapshotFloaterView->setVisible(TRUE);
+    gSnapshotFloaterView->adjustToFitScreen(this, FALSE);
+
+    impl->updateControls(this);
+    impl->setStatus(ImplBase::STATUS_READY);
+}
+
+void LLFloaterSimpleSnapshot::onCancel()
+{
+    closeFloater();
+}
+
+void LLFloaterSimpleSnapshot::onSend()
+{
+    S32 expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
+    if (can_afford_transaction(expected_upload_cost))
+    {
+        saveTexture();
+        postSave();
+    }
+    else
+    {
+        LLSD args;
+        args["COST"] = llformat("%d", expected_upload_cost);
+        LLNotificationsUtil::add("ErrorPhotoCannotAfford", args);
+        inventorySaveFailed();
+    }
+}
+
+void LLFloaterSimpleSnapshot::postSave()
+{
+    impl->setStatus(ImplBase::STATUS_WORKING);
+}
+
+// static 
+void LLFloaterSimpleSnapshot::update()
+{
+    LLFloaterSimpleSnapshot* inst = findInstance();
+    if (inst != NULL)
+    {
+        inst->impl->updateLivePreview();
+    }
+}
+
+
+// static
+LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::findInstance()
+{
+    return LLFloaterReg::findTypedInstance<LLFloaterSimpleSnapshot>("simple_outfit_snapshot");
+}
+
+// static
+LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::getInstance()
+{
+    return LLFloaterReg::getTypedInstance<LLFloaterSimpleSnapshot>("simple_outfit_snapshot");
+}
+
+void LLFloaterSimpleSnapshot::saveTexture()
+{
+     LLSnapshotLivePreview* previewp = getPreviewView();
+    if (!previewp)
+    {
+        llassert(previewp != NULL);
+        return;
+    }
+
+    if (mOutfitGallery)
+    {
+        mOutfitGallery->onBeforeOutfitSnapshotSave();
+    }
+    previewp->saveTexture(TRUE, getOutfitID().asString());
+    if (mOutfitGallery)
+    {
+        mOutfitGallery->onAfterOutfitSnapshotSave();
+    }
+    closeFloater();
+}
+
+///----------------------------------------------------------------------------
+/// Class LLSimpleOutfitSnapshotFloaterView
+///----------------------------------------------------------------------------
+
+LLSimpleSnapshotFloaterView::LLSimpleSnapshotFloaterView(const Params& p) : LLFloaterView(p)
+{
+}
+
+LLSimpleSnapshotFloaterView::~LLSimpleSnapshotFloaterView()
+{
+}
diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
new file mode 100644
index 0000000000..f9a1d9b9bf
--- /dev/null
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -0,0 +1,130 @@
+/**
+* @file llfloatersimplesnapshot.h
+* @brief Snapshot preview window for saving as a thumbnail
+*
+* $LicenseInfo:firstyear=2022&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2022, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLFLOATERSIMPLESNAPSHOT_H
+#define LL_LLFLOATERSIMPLESNAPSHOT_H
+
+#include "llfloater.h"
+#include "llfloatersnapshot.h"
+#include "llsnapshotlivepreview.h"
+
+class LLOutfitGallery;
+
+///----------------------------------------------------------------------------
+/// Class LLFloaterSimpleSnapshot
+///----------------------------------------------------------------------------
+
+class LLFloaterSimpleSnapshot : public LLFloaterSnapshotBase
+{
+    LOG_CLASS(LLFloaterSimpleSnapshot);
+
+public:
+
+    LLFloaterSimpleSnapshot(const LLSD& key);
+    ~LLFloaterSimpleSnapshot();
+
+    BOOL postBuild();
+    void onOpen(const LLSD& key);
+    void draw();
+
+    static void update();
+
+    static LLFloaterSimpleSnapshot* getInstance();
+    static LLFloaterSimpleSnapshot* findInstance();
+    void saveTexture();
+
+    const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }
+
+    void setOutfitID(LLUUID id) { mOutfitID = id; }
+    LLUUID getOutfitID() { return mOutfitID; }
+    void setGallery(LLOutfitGallery* gallery) { mOutfitGallery = gallery; }
+
+    void postSave();
+
+    class Impl;
+    friend class Impl;
+
+private:
+    void onSend();
+    void onCancel();
+
+    LLUUID mOutfitID;
+    LLOutfitGallery* mOutfitGallery;
+};
+
+///----------------------------------------------------------------------------
+/// Class LLFloaterSimpleSnapshot::Impl
+///----------------------------------------------------------------------------
+
+class LLFloaterSimpleSnapshot::Impl : public LLFloaterSnapshotBase::ImplBase
+{
+    LOG_CLASS(LLFloaterSimpleSnapshot::Impl);
+public:
+    Impl(LLFloaterSnapshotBase* floater)
+        : LLFloaterSnapshotBase::ImplBase(floater)
+    {}
+    ~Impl()
+    {}
+    void updateResolution(void* data);
+
+    static void onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status);
+
+    LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true) { return NULL; }
+    LLSnapshotModel::ESnapshotFormat getImageFormat(LLFloaterSnapshotBase* floater);
+    std::string getSnapshotPanelPrefix();
+
+    void updateControls(LLFloaterSnapshotBase* floater);
+
+    void setStatus(EStatus status, bool ok = true, const std::string& msg = LLStringUtil::null);
+
+private:
+    LLSnapshotModel::ESnapshotLayerType getLayerType(LLFloaterSnapshotBase* floater);
+    void setFinished(bool finished, bool ok = true, const std::string& msg = LLStringUtil::null) {};
+};
+
+///----------------------------------------------------------------------------
+/// Class LLSimpleOutfitSnapshotFloaterView
+///----------------------------------------------------------------------------
+
+class LLSimpleSnapshotFloaterView : public LLFloaterView
+{
+public:
+    struct Params
+        : public LLInitParam::Block<Params, LLFloaterView::Params>
+    {
+    };
+
+protected:
+    LLSimpleSnapshotFloaterView(const Params& p);
+    friend class LLUICtrlFactory;
+
+public:
+    virtual ~LLSimpleSnapshotFloaterView();
+};
+
+extern LLSimpleSnapshotFloaterView* gSimpleOutfitSnapshotFloaterView;
+
+#endif // LL_LLFLOATERSIMPLESNAPSHOT_H
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 602b7412a4..ce1330dfe1 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -41,7 +41,7 @@
 #include "llfilepicker.h"
 #include "llfloaterperms.h"
 #include "llfloaterreg.h"
-#include "llfloatersimpleoutfitsnapshot.h"
+#include "llfloatersimplesnapshot.h"
 #include "llimagedimensionsinfo.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
@@ -1387,7 +1387,7 @@ void LLOutfitGallery::onSelectPhoto(LLUUID selected_outfit_id)
 void LLOutfitGallery::onTakeSnapshot(LLUUID selected_outfit_id)
 {
     LLFloaterReg::toggleInstanceOrBringToFront("simple_outfit_snapshot");
-    LLFloaterSimpleOutfitSnapshot* snapshot_floater = LLFloaterSimpleOutfitSnapshot::getInstance();
+    LLFloaterSimpleSnapshot* snapshot_floater = LLFloaterSimpleSnapshot::getInstance();
     if (snapshot_floater)
     {
         snapshot_floater->setOutfitID(selected_outfit_id);
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 06fba187bb..4d51d56569 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -104,7 +104,7 @@
 #include "llfloaterobjectweights.h"
 #include "llfloateropenobject.h"
 #include "llfloateroutfitphotopreview.h"
-#include "llfloatersimpleoutfitsnapshot.h"
+#include "llfloatersimplesnapshot.h"
 #include "llfloaterpathfindingcharacters.h"
 #include "llfloaterpathfindingconsole.h"
 #include "llfloaterpathfindinglinksets.h"
@@ -469,7 +469,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("scene_load_stats", "floater_scene_load_stats.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSceneLoadStats>);
 	LLFloaterReg::add("stop_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotRunQueue>);
 	LLFloaterReg::add("snapshot", "floater_snapshot.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSnapshot>);
-    LLFloaterReg::add("simple_outfit_snapshot", "floater_simple_outfit_snapshot.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSimpleOutfitSnapshot>);
+    LLFloaterReg::add("simple_snapshot", "floater_simple_snapshot.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSimpleSnapshot>);
     LLFloaterReg::add("search", "floater_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearch>);
     LLFloaterReg::add("profile", "floater_profile.xml",(LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProfile>);
 	LLFloaterReg::add("guidebook", "floater_how_to.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHowTo>);
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index fdf1d04c09..ab8ec8a288 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -38,7 +38,7 @@
 #include "llfloatermap.h"
 #include "llfloatermodelpreview.h"
 #include "llfloatersnapshot.h"
-#include "llfloatersimpleoutfitsnapshot.h"
+#include "llfloatersimplesnapshot.h"
 #include "llimage.h"
 #include "llimagebmp.h"
 #include "llimagepng.h"
@@ -664,7 +664,7 @@ class LLFileEnableCloseAllWindows : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
-		LLFloaterSimpleOutfitSnapshot* floater_outfit_snapshot = LLFloaterSimpleOutfitSnapshot::findInstance();
+		LLFloaterSimpleSnapshot* floater_outfit_snapshot = LLFloaterSimpleSnapshot::findInstance();
 		bool is_floaters_snapshot_opened = (floater_snapshot && floater_snapshot->isInVisibleChain())
 			|| (floater_outfit_snapshot && floater_outfit_snapshot->isInVisibleChain());
 		bool open_children = gFloaterView->allChildrenClosed() && !is_floaters_snapshot_opened;
@@ -681,7 +681,7 @@ class LLFileCloseAllWindows : public view_listener_t
 		LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
 		if (floater_snapshot)
 			floater_snapshot->closeFloater(app_quitting);
-        LLFloaterSimpleOutfitSnapshot* floater_outfit_snapshot = LLFloaterSimpleOutfitSnapshot::findInstance();
+        LLFloaterSimpleSnapshot* floater_outfit_snapshot = LLFloaterSimpleSnapshot::findInstance();
 		if (floater_outfit_snapshot)
 			floater_outfit_snapshot->closeFloater(app_quitting);
 		if (gMenuHolder) gMenuHolder->hideMenus();
diff --git a/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
deleted file mode 100644
index 5ece7b85d5..0000000000
--- a/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="cascading"
- legacy_header_height="18"
- can_minimize="true"
- can_resize="false"
- can_close="true"
- height="305"
- layout="topleft"
- name="simple_outfit_snapshot"
- single_instance="true"
- help_topic="snapshot"
- save_rect="true"
- save_visibility="false"
- title="OUTFIT SNAPSHOT"
- width="351">
-  <ui_ctrl
-   layout="topleft"
-   name="thumbnail_placeholder"
-   top="18"
-   left="22"
-   width="335"
-   height="200"
-   follows="top|left"/>
-  <button
-   follows="left|bottom"
-   height="22"
-   layout="topleft"
-   left="29"
-   label="Take photo"
-   name="new_snapshot_btn"
-   bottom="-15"
-   width="90" />
-  <button
-   follows="left|bottom"
-   height="22"
-   layout="topleft"
-   left_pad="10"
-   label="Save (L$[UPLOAD_COST])"
-   name="save_btn"
-   width="90" />
-  <button
-   follows="left|bottom"
-   height="22"
-   layout="topleft"
-   left_pad="10"
-   label="Cancel"
-   name="cancel_btn"
-   width="90" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
new file mode 100644
index 0000000000..1e47a3b35d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ positioning="cascading"
+ legacy_header_height="18"
+ can_minimize="true"
+ can_resize="false"
+ can_close="true"
+ height="305"
+ layout="topleft"
+ name="simple_snapshot"
+ single_instance="true"
+ help_topic="snapshot"
+ save_rect="true"
+ save_visibility="false"
+ title="OUTFIT SNAPSHOT"
+ width="351">
+  <ui_ctrl
+   layout="topleft"
+   name="thumbnail_placeholder"
+   top="18"
+   left="22"
+   width="335"
+   height="200"
+   follows="top|left"/>
+  <button
+   follows="left|bottom"
+   height="22"
+   layout="topleft"
+   left="29"
+   label="Take photo"
+   name="new_snapshot_btn"
+   bottom="-15"
+   width="90" />
+  <button
+   follows="left|bottom"
+   height="22"
+   layout="topleft"
+   left_pad="10"
+   label="Save (L$[UPLOAD_COST])"
+   name="save_btn"
+   width="90" />
+  <button
+   follows="left|bottom"
+   height="22"
+   layout="topleft"
+   left_pad="10"
+   label="Cancel"
+   name="cancel_btn"
+   width="90" />
+</floater>
-- 
cgit v1.2.3


From 6786e43fcb315eb10b5ab4a205163fb424c18bc6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 00:13:41 +0200
Subject: SL-19108 Managing inventory thumbnail

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 253 ++++++---------------
 indra/newview/llfloaterchangeitemthumbnail.h       |   4 +-
 indra/newview/llfloatersimplesnapshot.cpp          | 155 ++++++++++++-
 indra/newview/llfloatersimplesnapshot.h            |   3 +
 indra/newview/lloutfitgallery.cpp                  |   2 +-
 .../default/xui/en/floater_simple_snapshot.xml     |   2 +-
 6 files changed, 223 insertions(+), 196 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index b267c7e0a3..4d76194b48 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -34,116 +34,23 @@
 #include "llinventoryicon.h"
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
+#include "llfloaterreg.h"
+#include "llfloatersimplesnapshot.h"
 #include "lllineeditor.h"
 #include "lltextbox.h"
 #include "lltexturectrl.h"
 #include "llthumbnailctrl.h"
+#include "llviewerfoldertype.h"
 #include "llviewermenufile.h"
 #include "llviewerobjectlist.h"
 #include "llwindow.h"
 
 
-//TODO: this part is likely to be moved into outfit snapshot floater
-// and flaoter is likely to become a thumbnail snapshot floater
-
-#include "llagent.h"
-#include "llnotificationsutil.h"
-#include "llviewertexturelist.h"
-
-static const std::string THUMBNAIL_ITEM_UPLOAD_CAP = "InventoryItemThumbnailUpload";
-static const std::string THUMBNAIL_CATEGORY_UPLOAD_CAP = "InventoryCategoryThumbnailUpload";
-
-void post_thumbnail_image_coro(std::string cap_url, std::string path_to_image, LLSD first_data)
-{
-    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
-    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
-        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("post_profile_image_coro", httpPolicy));
-    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
-    LLCore::HttpHeaders::ptr_t httpHeaders;
-
-    LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
-    httpOpts->setFollowRedirects(true);
-
-    LLSD result = httpAdapter->postAndSuspend(httpRequest, cap_url, first_data, httpOpts, httpHeaders);
-
-    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
-    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
-
-    if (!status)
-    {
-        // todo: notification?
-        LL_WARNS("AvatarProperties") << "Failed to get uploader cap " << status.toString() << LL_ENDL;
-        return;
-    }
-    if (!result.has("uploader"))
-    {
-        // todo: notification?
-        LL_WARNS("AvatarProperties") << "Failed to get uploader cap, response contains no data." << LL_ENDL;
-        return;
-    }
-    std::string uploader_cap = result["uploader"].asString();
-    if (uploader_cap.empty())
-    {
-        LL_WARNS("AvatarProperties") << "Failed to get uploader cap, cap invalid." << LL_ENDL;
-        return;
-    }
-
-    // Upload the image
-
-    LLCore::HttpRequest::ptr_t uploaderhttpRequest(new LLCore::HttpRequest);
-    LLCore::HttpHeaders::ptr_t uploaderhttpHeaders(new LLCore::HttpHeaders);
-    LLCore::HttpOptions::ptr_t uploaderhttpOpts(new LLCore::HttpOptions);
-    S64 length;
-
-    {
-        llifstream instream(path_to_image.c_str(), std::iostream::binary | std::iostream::ate);
-        if (!instream.is_open())
-        {
-            LL_WARNS("AvatarProperties") << "Failed to open file " << path_to_image << LL_ENDL;
-            return;
-        }
-        length = instream.tellg();
-    }
-
-    uploaderhttpHeaders->append(HTTP_OUT_HEADER_CONTENT_TYPE, "application/jp2"); // optional
-    uploaderhttpHeaders->append(HTTP_OUT_HEADER_CONTENT_LENGTH, llformat("%d", length)); // required!
-    uploaderhttpOpts->setFollowRedirects(true);
-
-    result = httpAdapter->postFileAndSuspend(uploaderhttpRequest, uploader_cap, path_to_image, uploaderhttpOpts, uploaderhttpHeaders);
-
-    httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
-    status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
-
-    LL_DEBUGS("Thumbnail") << result << LL_ENDL;
-
-    if (!status)
-    {
-        LL_WARNS("Thumbnail") << "Failed to upload image " << status.toString() << LL_ENDL;
-        return;
-    }
-    
-    if (result["state"].asString() != "complete")
-    {
-        if (result.has("message"))
-        {
-            LL_WARNS("Thumbnail") << "Failed to upload image, state " << result["state"] << " message: " << result["message"] << LL_ENDL;
-        }
-        else
-        {
-            LL_WARNS("Thumbnail") << "Failed to upload image " << result << LL_ENDL;
-        }
-        return;
-    }
-
-    // todo: issue an inventory udpate?
-    //return result["new_asset"].asUUID();
-}
-
 class LLThumbnailImagePicker : public LLFilePickerThread
 {
 public:
-    LLThumbnailImagePicker(const LLUUID &item_id, LLHandle<LLFloater> *handle);
-    LLThumbnailImagePicker(const LLUUID &item_id, const LLUUID &task_id, LLHandle<LLFloater> *handle);
+    LLThumbnailImagePicker(const LLUUID &item_id);
+    LLThumbnailImagePicker(const LLUUID &item_id, const LLUUID &task_id);
     ~LLThumbnailImagePicker();
     void notify(const std::vector<std::string>& filenames) override;
 
@@ -153,16 +60,14 @@ private:
     LLUUID mTaskId;
 };
 
-LLThumbnailImagePicker::LLThumbnailImagePicker(const LLUUID &item_id, LLHandle<LLFloater> *handle)
+LLThumbnailImagePicker::LLThumbnailImagePicker(const LLUUID &item_id)
     : LLFilePickerThread(LLFilePicker::FFLOAD_IMAGE)
-    , mHandle(handle)
     , mInventoryId(item_id)
 {
 }
 
-LLThumbnailImagePicker::LLThumbnailImagePicker(const LLUUID &item_id, const LLUUID &task_id, LLHandle<LLFloater> *handle)
+LLThumbnailImagePicker::LLThumbnailImagePicker(const LLUUID &item_id, const LLUUID &task_id)
     : LLFilePickerThread(LLFilePicker::FFLOAD_IMAGE)
-    , mHandle(handle)
     , mInventoryId(item_id)
     , mTaskId(task_id)
 {
@@ -170,15 +75,10 @@ LLThumbnailImagePicker::LLThumbnailImagePicker(const LLUUID &item_id, const LLUU
 
 LLThumbnailImagePicker::~LLThumbnailImagePicker()
 {
-    delete mHandle;
 }
 
 void LLThumbnailImagePicker::notify(const std::vector<std::string>& filenames)
 {
-    if (mHandle->isDead())
-    {
-        return;
-    }
     if (filenames.empty())
     {
         return;
@@ -188,52 +88,8 @@ void LLThumbnailImagePicker::notify(const std::vector<std::string>& filenames)
     {
         return;
     }
-
-    // generate a temp texture file for coroutine
-    std::string temp_file = gDirUtilp->getTempFilename();
-    U32 codec = LLImageBase::getCodecFromExtension(gDirUtilp->getExtension(file_path));
-    const S32 MAX_DIM = 256;
-    if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, MAX_DIM))
-    {
-        LLSD notif_args;
-        notif_args["REASON"] = LLImage::getLastError().c_str();
-        LLNotificationsUtil::add("CannotUploadTexture", notif_args);
-        LL_WARNS("Thumbnail") << "Failed to upload thumbnail for " << mInventoryId << " " << mTaskId << ", reason: " << notif_args["REASON"].asString() << LL_ENDL;
-        return;
-    }
-
-    std::string cap_name;
-    LLSD data;
-
-    if (mTaskId.notNull())
-    {
-        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
-        data["item_id"] = mInventoryId;
-        data["task_id"] = mTaskId;
-    }
-    else if (gInventory.getCategory(mInventoryId))
-    {
-        cap_name = THUMBNAIL_CATEGORY_UPLOAD_CAP;
-        data["category_id"] = mInventoryId;
-    }
-    else
-    {
-        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
-        data["item_id"] = mInventoryId;
-    }
-
-    std::string cap_url = gAgent.getRegionCapability(cap_name);
-    if (cap_url.empty())
-    {
-        LLSD args;
-        args["CAPABILITY"] = cap_url;
-        LLNotificationsUtil::add("RegionCapabilityRequestError", args);
-        LL_WARNS("Thumbnail") << "Failed to upload profile image for item " << mInventoryId << " " << mTaskId << ", no cap found" << LL_ENDL;
-        return;
-    }
-
-    LLCoros::instance().launch("postAgentUserImageCoro",
-        boost::bind(post_thumbnail_image_coro, cap_url, temp_file, data));
+    
+    LLFloaterSimpleSnapshot::uploadThumbnail(file_path, mInventoryId, mTaskId);
 }
 
 LLFloaterChangeItemThumbnail::LLFloaterChangeItemThumbnail(const LLSD& key)
@@ -348,9 +204,9 @@ void LLFloaterChangeItemThumbnail::inventoryChanged(LLViewerObject* object,
     refreshFromInventory();
 }
 
-LLViewerInventoryItem* LLFloaterChangeItemThumbnail::getItem()
+LLInventoryObject* LLFloaterChangeItemThumbnail::getInventoryObject()
 {
-    LLViewerInventoryItem* item = NULL;
+    LLInventoryObject* obj = NULL;
     if (mTaskId.isNull())
     {
         // it is in agent inventory
@@ -360,7 +216,7 @@ LLViewerInventoryItem* LLFloaterChangeItemThumbnail::getItem()
             mObserverInitialized = true;
         }
 
-        item = gInventory.getItem(mItemId);
+        obj = gInventory.getObject(mItemId);
     }
     else
     {
@@ -373,28 +229,24 @@ LLViewerInventoryItem* LLFloaterChangeItemThumbnail::getItem()
                 mObserverInitialized = false;
             }
 
-            item = static_cast<LLViewerInventoryItem*>(object->getInventoryObject(mItemId));
+            obj = object->getInventoryObject(mItemId);
         }
     }
-    return item;
+    return obj;
 }
 
 void LLFloaterChangeItemThumbnail::refreshFromInventory()
 {
-    LLViewerInventoryItem* item = getItem();
-    if (!item)
+    LLInventoryObject* obj = getInventoryObject();
+    if (!obj)
     {
         closeFloater();
     }
 
-    if (item)
+    if (obj)
     {
-        // This floater probably shouldn't be be possible to open
-        // for imcomplete items
-        llassert(item->isFinished());
-
         const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-        bool in_trash = (item->getUUID() == trash_id) || gInventory.isObjectDescendentOf(item->getUUID(), trash_id);
+        bool in_trash = (obj->getUUID() == trash_id) || gInventory.isObjectDescendentOf(obj->getUUID(), trash_id);
         if (in_trash)
         {
             // Close properties when moving to trash
@@ -403,7 +255,7 @@ void LLFloaterChangeItemThumbnail::refreshFromInventory()
         }
         else
         {
-            refreshFromItem(item);
+            refreshFromObject(obj);
         }
     }
     else
@@ -412,17 +264,37 @@ void LLFloaterChangeItemThumbnail::refreshFromInventory()
     }
 }
 
-void LLFloaterChangeItemThumbnail::refreshFromItem(LLViewerInventoryItem* item)
+void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
 {
-    LLUIImagePtr icon_img = LLInventoryIcon::getIcon(item->getType(), item->getInventoryType(), item->getFlags(), FALSE);
+    LLUIImagePtr icon_img;
+    LLUUID thumbnail_id = obj->getThumbnailUUID();
+
+    LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(obj);
+    if (item)
+    {
+        // This floater probably shouldn't be be possible to open
+        // for imcomplete items
+        llassert(item->isFinished());
+
+        icon_img = LLInventoryIcon::getIcon(item->getType(), item->getInventoryType(), item->getFlags(), FALSE);
+        mRemoveImageBtn->setEnabled(thumbnail_id.notNull() && ((item->getActualType() != LLAssetType::AT_TEXTURE) || (item->getAssetUUID() != thumbnail_id)));
+    }
+    else
+    {
+        LLViewerInventoryCategory* cat = dynamic_cast<LLViewerInventoryCategory*>(obj);
+
+        if (cat)
+        {
+            icon_img = LLUI::getUIImage(LLViewerFolderType::lookupIconName(cat->getPreferredType(), true));
+            mRemoveImageBtn->setEnabled(thumbnail_id.notNull());
+        }
+    }
     mItemTypeIcon->setImage(icon_img);
-    mItemNameText->setValue(item->getName());
+    mItemNameText->setValue(obj->getName());
 
-    LLUUID thumbnail_id = item->getThumbnailUUID();
     mThumbnailCtrl->setValue(thumbnail_id);
 
     mCopyToClipboardBtn->setEnabled(thumbnail_id.notNull());
-    mRemoveImageBtn->setEnabled(thumbnail_id.notNull() && ((item->getActualType() != LLAssetType::AT_TEXTURE) || (item->getAssetUUID() != thumbnail_id)));
 
     // todo: some elements might not support setting thumbnails
     // since they already have them
@@ -431,7 +303,8 @@ void LLFloaterChangeItemThumbnail::refreshFromItem(LLViewerInventoryItem* item)
 void LLFloaterChangeItemThumbnail::onUploadLocal(void *userdata)
 {
     LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
-    (new LLThumbnailImagePicker(self->mItemId, self->mTaskId, new LLHandle<LLFloater>(self->getHandle())))->getFile();
+
+    (new LLThumbnailImagePicker(self->mItemId, self->mTaskId))->getFile();
 
     LLFloater* floaterp = self->mPickerHandle.get();
     if (floaterp)
@@ -442,16 +315,24 @@ void LLFloaterChangeItemThumbnail::onUploadLocal(void *userdata)
 
 void LLFloaterChangeItemThumbnail::onUploadSnapshot(void *userdata)
 {
+    LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
 
+    LLFloaterReg::toggleInstanceOrBringToFront("simple_snapshot");
+    LLFloaterSimpleSnapshot* snapshot_floater = LLFloaterSimpleSnapshot::getInstance();
+    if (snapshot_floater)
+    {
+        snapshot_floater->setInventoryId(self->mItemId);
+        snapshot_floater->setTaskId(self->mTaskId);
+    }
 }
 
 void LLFloaterChangeItemThumbnail::onUseTexture(void *userdata)
 {
     LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
-    LLViewerInventoryItem* item = self->getItem();
-    if (item)
+    LLInventoryObject* obj = self->getInventoryObject();
+    if (obj)
     {
-        self->showTexturePicker(item->getThumbnailUUID());
+        self->showTexturePicker(obj->getThumbnailUUID());
     }
 
 }
@@ -459,10 +340,10 @@ void LLFloaterChangeItemThumbnail::onUseTexture(void *userdata)
 void LLFloaterChangeItemThumbnail::onCopyToClipboard(void *userdata)
 {
     LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
-    LLViewerInventoryItem* item = self->getItem();
-    if (item)
+    LLInventoryObject* obj = self->getInventoryObject();
+    if (obj)
     {
-        LLClipboard::instance().addToClipboard(item->getThumbnailUUID());
+        LLClipboard::instance().addToClipboard(obj->getThumbnailUUID());
     }
 }
 
@@ -473,10 +354,10 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
     LLClipboard::instance().pasteFromClipboard(objects);
     if (objects.size() > 0)
     {
-        LLViewerInventoryItem* item = self->getItem();
-        if (item)
+        LLInventoryObject* obj = self->getInventoryObject();
+        if (obj)
         {
-            item->setThumbnailUUID(objects[0]);
+            obj->setThumbnailUUID(objects[0]);
         }
     }
 }
@@ -484,7 +365,7 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
 void LLFloaterChangeItemThumbnail::onRemove(void *userdata)
 {
     LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
-    LLViewerInventoryItem* item = self->getItem();
+    LLInventoryObject* item = self->getInventoryObject();
     if (item)
     {
         item->setThumbnailUUID(LLUUID::null);
@@ -548,11 +429,11 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
 void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
 {
     LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mPickerHandle.get();
-    LLViewerInventoryItem* item = getItem();
+    LLInventoryObject* obj = getInventoryObject();
 
-    if (item && floaterp)
+    if (obj && floaterp)
     {
-        item->setThumbnailUUID(floaterp->getAssetID());
+        obj->setThumbnailUUID(floaterp->getAssetID());
     }
 }
 
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 340d5cf05e..b3ae0a18f6 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -55,9 +55,9 @@ public:
 
 private:
 
-    LLViewerInventoryItem* getItem();
+    LLInventoryObject* getInventoryObject();
     void refreshFromInventory();
-    void refreshFromItem(LLViewerInventoryItem* item);
+    void refreshFromObject(LLInventoryObject* obj);
 
     static void onUploadLocal(void*);
     static void onUploadSnapshot(void*);
diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
index 05625e6817..ca2b9b919a 100644
--- a/indra/newview/llfloatersimplesnapshot.cpp
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -33,16 +33,110 @@
 #include "llstatusbar.h" // can_afford_transaction()
 #include "llnotificationsutil.h"
 #include "lloutfitgallery.h"
+#include "llagent.h"
 #include "llagentbenefits.h"
 #include "llviewercontrol.h"
+#include "llviewertexturelist.h"
+
+
 
 LLSimpleSnapshotFloaterView* gSimpleSnapshotFloaterView = NULL;
 
-const S32 THUMBNAIL_SNAPSHOT_WIDTH = 256;
-const S32 THUMBNAIL_SNAPSHOT_HEIGHT = 256;
+const S32 THUMBNAIL_SNAPSHOT_DIM = 256;
 
 static LLDefaultChildRegistry::Register<LLSimpleSnapshotFloaterView> r("simple_snapshot_floater_view");
 
+// Thumbnail posting coro
+
+static const std::string THUMBNAIL_ITEM_UPLOAD_CAP = "InventoryItemThumbnailUpload";
+static const std::string THUMBNAIL_CATEGORY_UPLOAD_CAP = "InventoryCategoryThumbnailUpload";
+
+void post_thumbnail_image_coro(std::string cap_url, std::string path_to_image, LLSD first_data)
+{
+    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
+    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
+        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("post_profile_image_coro", httpPolicy));
+    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
+    LLCore::HttpHeaders::ptr_t httpHeaders;
+
+    LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
+    httpOpts->setFollowRedirects(true);
+
+    LLSD result = httpAdapter->postAndSuspend(httpRequest, cap_url, first_data, httpOpts, httpHeaders);
+
+    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    if (!status)
+    {
+        // todo: notification?
+        LL_WARNS("AvatarProperties") << "Failed to get uploader cap " << status.toString() << LL_ENDL;
+        return;
+    }
+    if (!result.has("uploader"))
+    {
+        // todo: notification?
+        LL_WARNS("AvatarProperties") << "Failed to get uploader cap, response contains no data." << LL_ENDL;
+        return;
+    }
+    std::string uploader_cap = result["uploader"].asString();
+    if (uploader_cap.empty())
+    {
+        LL_WARNS("AvatarProperties") << "Failed to get uploader cap, cap invalid." << LL_ENDL;
+        return;
+    }
+
+    // Upload the image
+
+    LLCore::HttpRequest::ptr_t uploaderhttpRequest(new LLCore::HttpRequest);
+    LLCore::HttpHeaders::ptr_t uploaderhttpHeaders(new LLCore::HttpHeaders);
+    LLCore::HttpOptions::ptr_t uploaderhttpOpts(new LLCore::HttpOptions);
+    S64 length;
+
+    {
+        llifstream instream(path_to_image.c_str(), std::iostream::binary | std::iostream::ate);
+        if (!instream.is_open())
+        {
+            LL_WARNS("AvatarProperties") << "Failed to open file " << path_to_image << LL_ENDL;
+            return;
+        }
+        length = instream.tellg();
+    }
+
+    uploaderhttpHeaders->append(HTTP_OUT_HEADER_CONTENT_TYPE, "application/jp2"); // optional
+    uploaderhttpHeaders->append(HTTP_OUT_HEADER_CONTENT_LENGTH, llformat("%d", length)); // required!
+    uploaderhttpOpts->setFollowRedirects(true);
+
+    result = httpAdapter->postFileAndSuspend(uploaderhttpRequest, uploader_cap, path_to_image, uploaderhttpOpts, uploaderhttpHeaders);
+
+    httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    LL_DEBUGS("Thumbnail") << result << LL_ENDL;
+
+    if (!status)
+    {
+        LL_WARNS("Thumbnail") << "Failed to upload image " << status.toString() << LL_ENDL;
+        return;
+    }
+
+    if (result["state"].asString() != "complete")
+    {
+        if (result.has("message"))
+        {
+            LL_WARNS("Thumbnail") << "Failed to upload image, state " << result["state"] << " message: " << result["message"] << LL_ENDL;
+        }
+        else
+        {
+            LL_WARNS("Thumbnail") << "Failed to upload image " << result << LL_ENDL;
+        }
+        return;
+    }
+
+    // todo: issue an inventory udpate?
+    //return result["new_asset"].asUUID();
+}
+
 ///----------------------------------------------------------------------------
 /// Class LLFloaterSimpleSnapshot::Impl
 ///----------------------------------------------------------------------------
@@ -84,8 +178,8 @@ void LLFloaterSimpleSnapshot::Impl::updateResolution(void* data)
         return;
     }
 
-    S32 width = THUMBNAIL_SNAPSHOT_WIDTH;
-    S32 height = THUMBNAIL_SNAPSHOT_HEIGHT;
+    S32 width = THUMBNAIL_SNAPSHOT_DIM;
+    S32 height = THUMBNAIL_SNAPSHOT_DIM;
 
     LLSnapshotLivePreview* previewp = getPreviewView();
     if (previewp)
@@ -263,6 +357,55 @@ void LLFloaterSimpleSnapshot::postSave()
     impl->setStatus(ImplBase::STATUS_WORKING);
 }
 
+// static
+void LLFloaterSimpleSnapshot::uploadThumbnail(const std::string &file_path, const LLUUID &inventory_id, const LLUUID &task_id)
+{
+    // generate a temp texture file for coroutine
+    std::string temp_file = gDirUtilp->getTempFilename();
+    U32 codec = LLImageBase::getCodecFromExtension(gDirUtilp->getExtension(file_path));
+    if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, THUMBNAIL_SNAPSHOT_DIM))
+    {
+        LLSD notif_args;
+        notif_args["REASON"] = LLImage::getLastError().c_str();
+        LLNotificationsUtil::add("CannotUploadTexture", notif_args);
+        LL_WARNS("Thumbnail") << "Failed to upload thumbnail for " << inventory_id << " " << task_id << ", reason: " << notif_args["REASON"].asString() << LL_ENDL;
+        return;
+    }
+
+    std::string cap_name;
+    LLSD data;
+
+    if (task_id.notNull())
+    {
+        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
+        data["item_id"] = inventory_id;
+        data["task_id"] = task_id;
+    }
+    else if (gInventory.getCategory(inventory_id))
+    {
+        cap_name = THUMBNAIL_CATEGORY_UPLOAD_CAP;
+        data["category_id"] = inventory_id;
+    }
+    else
+    {
+        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
+        data["item_id"] = inventory_id;
+    }
+
+    std::string cap_url = gAgent.getRegionCapability(cap_name);
+    if (cap_url.empty())
+    {
+        LLSD args;
+        args["CAPABILITY"] = cap_url;
+        LLNotificationsUtil::add("RegionCapabilityRequestError", args);
+        LL_WARNS("Thumbnail") << "Failed to upload profile image for item " << inventory_id << " " << task_id << ", no cap found" << LL_ENDL;
+        return;
+    }
+
+    LLCoros::instance().launch("postAgentUserImageCoro",
+        boost::bind(post_thumbnail_image_coro, cap_url, temp_file, data));
+}
+
 // static 
 void LLFloaterSimpleSnapshot::update()
 {
@@ -277,13 +420,13 @@ void LLFloaterSimpleSnapshot::update()
 // static
 LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::findInstance()
 {
-    return LLFloaterReg::findTypedInstance<LLFloaterSimpleSnapshot>("simple_outfit_snapshot");
+    return LLFloaterReg::findTypedInstance<LLFloaterSimpleSnapshot>("simple_snapshot");
 }
 
 // static
 LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::getInstance()
 {
-    return LLFloaterReg::getTypedInstance<LLFloaterSimpleSnapshot>("simple_outfit_snapshot");
+    return LLFloaterReg::getTypedInstance<LLFloaterSimpleSnapshot>("simple_snapshot");
 }
 
 void LLFloaterSimpleSnapshot::saveTexture()
diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
index f9a1d9b9bf..55253b38e8 100644
--- a/indra/newview/llfloatersimplesnapshot.h
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -61,8 +61,11 @@ public:
     void setOutfitID(LLUUID id) { mOutfitID = id; }
     LLUUID getOutfitID() { return mOutfitID; }
     void setGallery(LLOutfitGallery* gallery) { mOutfitGallery = gallery; }
+    void setInventoryId(const LLUUID &inventory_id) {}
+    void setTaskId(const LLUUID &task_id) {}
 
     void postSave();
+    static void uploadThumbnail(const std::string &file_path, const LLUUID &inventory_id, const LLUUID &task_id);
 
     class Impl;
     friend class Impl;
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index ce1330dfe1..06dbf50bee 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -1386,7 +1386,7 @@ void LLOutfitGallery::onSelectPhoto(LLUUID selected_outfit_id)
 
 void LLOutfitGallery::onTakeSnapshot(LLUUID selected_outfit_id)
 {
-    LLFloaterReg::toggleInstanceOrBringToFront("simple_outfit_snapshot");
+    LLFloaterReg::toggleInstanceOrBringToFront("simple_snapshot");
     LLFloaterSimpleSnapshot* snapshot_floater = LLFloaterSimpleSnapshot::getInstance();
     if (snapshot_floater)
     {
diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index 1e47a3b35d..a53d42be2e 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -12,7 +12,7 @@
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
- title="OUTFIT SNAPSHOT"
+ title="THUMBNAIL SNAPSHOT"
  width="351">
   <ui_ctrl
    layout="topleft"
-- 
cgit v1.2.3


From d6f1ba31da4a40d62fe781419cdd7db9843f6a30 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 14:44:45 +0200
Subject: SL-19105 Updated icons, menus and Received items panel visibility in
 single-folder mode

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     |   1 -
 indra/newview/llpanelmaininventory.cpp             |  57 +++++++++++++++++----
 indra/newview/llpanelmaininventory.h               |   4 ++
 indra/newview/llsidepanelinventory.cpp             |  36 ++++++++-----
 indra/newview/llsidepanelinventory.h               |   4 ++
 .../default/textures/icons/multi_folder_mode.png   | Bin 0 -> 2786 bytes
 .../default/textures/icons/single_folder_back.png  | Bin 0 -> 3276 bytes
 .../textures/icons/single_folder_forward.png       | Bin 0 -> 3260 bytes
 .../default/textures/icons/single_folder_mode.png  | Bin 0 -> 2780 bytes
 .../default/textures/icons/single_folder_up.png    | Bin 0 -> 3118 bytes
 indra/newview/skins/default/textures/textures.xml  |   6 +++
 .../default/xui/en/menu_inventory_gear_default.xml |  16 +++---
 .../default/xui/en/menu_inventory_view_default.xml |  56 ++++++++++++++++++++
 .../skins/default/xui/en/panel_main_inventory.xml  |  24 ++++-----
 14 files changed, 160 insertions(+), 44 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/multi_folder_mode.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_back.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_forward.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_mode.png
 create mode 100644 indra/newview/skins/default/textures/icons/single_folder_up.png

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 4d76194b48..2187fda7c7 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -55,7 +55,6 @@ public:
     void notify(const std::vector<std::string>& filenames) override;
 
 private:
-    LLHandle<LLFloater> *mHandle;
     LLUUID mInventoryId;
     LLUUID mTaskId;
 };
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index d13c691abd..5b7678987e 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1278,6 +1278,20 @@ void LLPanelMainInventory::onViewModeClick()
 
     mActivePanel = mSingleFolderMode ? getChild<LLInventoryPanel>("single_folder_inv") : (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
     updateTitle();
+
+    LLSidepanelInventory* sidepanel_inventory = getParentSidepanelInventory();
+    if (sidepanel_inventory)
+    {
+        if(mSingleFolderMode)
+        {
+            sidepanel_inventory->hideInbox();
+        }
+        else
+        {
+            sidepanel_inventory->toggleInbox();
+        }
+    }
+
 }
 
 void LLPanelMainInventory::onUpFolderClicked()
@@ -1623,16 +1637,6 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 		LLInventoryModel::EHasChildren children = gInventory.categoryHasChildren(trash_id);
 		return children != LLInventoryModel::CHILDREN_NO && gInventory.isCategoryComplete(trash_id);
 	}
-    if (command_name == "open_folder")
-    {
-        LLFolderView* root = getActivePanel()->getRootFolder();
-        std::set<LLFolderViewItem*> selection_set = root->getSelectionList();
-        if (selection_set.size() != 1) return FALSE;
-        LLFolderViewItem* current_item = *selection_set.begin();
-        if (!current_item) return FALSE;
-        const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
-        return (gInventory.getCategory(folder_id) != NULL);
-    }
 
 	return TRUE;
 }
@@ -1648,6 +1652,16 @@ bool LLPanelMainInventory::isActionVisible(const LLSD& userdata)
     {
         return !mSingleFolderMode;
     }
+    if (param_str == "open_folder")
+    {
+        LLFolderView* root = getActivePanel()->getRootFolder();
+        std::set<LLFolderViewItem*> selection_set = root->getSelectionList();
+        if (selection_set.size() != 1) return FALSE;
+        LLFolderViewItem* current_item = *selection_set.begin();
+        if (!current_item) return FALSE;
+        const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+        return (gInventory.getCategory(folder_id) != NULL);
+    }
     return true;
 }
 
@@ -1695,6 +1709,19 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 		return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) != 0;	
 	}	
 
+    if (command_name == "list_view")
+    {
+        return true;
+    }
+    if (command_name == "gallery_view")
+    {
+        return false;
+    }
+    if (command_name == "combination_view")
+    {
+        return false;
+    }
+
 	return FALSE;
 }
 
@@ -1737,5 +1764,15 @@ void LLPanelMainInventory::updateTitle()
         }
     }
 }
+
+LLSidepanelInventory* LLPanelMainInventory::getParentSidepanelInventory()
+{
+    LLFloaterSidePanelContainer* inventory_container = dynamic_cast<LLFloaterSidePanelContainer*>(gFloaterView->getParentFloater(this));
+    if(inventory_container)
+    {
+        return dynamic_cast<LLSidepanelInventory*>(inventory_container->findChild<LLPanel>("main_panel", true));
+    }
+    return NULL;
+}
 // List Commands                                                              //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 923ebba98b..e5262540cf 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -44,6 +44,7 @@ class LLTabContainer;
 class LLFloaterInventoryFinder;
 class LLMenuButton;
 class LLMenuGL;
+class LLSidepanelInventory;
 class LLToggleableMenu;
 class LLFloater;
 
@@ -103,6 +104,7 @@ public:
     void onBackFolderClicked();
     void onForwardFolderClicked();
     void setSingleFolderViewRoot(const LLUUID& folder_id);
+    bool isSingleFolderMode() { return mSingleFolderMode; }
 
 protected:
 	//
@@ -137,6 +139,8 @@ protected:
 	void onSelectSearchType();
 	void updateSearchTypeCombo();
 
+    LLSidepanelInventory* getParentSidepanelInventory();
+
 private:
 	LLFloaterInventoryFinder* getFinder();
 
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 9f2003bbb2..3a0302e531 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -119,16 +119,15 @@ LLSidepanelInventory::LLSidepanelInventory()
 	, mInboxEnabled(false)
 	, mCategoriesObserver(NULL)
 	, mInboxAddedObserver(NULL)
+    , mInboxLayoutPanel(NULL)
 {
 	//buildFromFile( "panel_inventory.xml"); // Called from LLRegisterPanelClass::defaultPanelClassBuilder()
 }
 
 LLSidepanelInventory::~LLSidepanelInventory()
 {
-	LLLayoutPanel* inbox_layout_panel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
-
 	// Save the InventoryMainPanelHeight in settings per account
-	gSavedPerAccountSettings.setS32("InventoryInboxHeight", inbox_layout_panel->getTargetDim());
+	gSavedPerAccountSettings.setS32("InventoryInboxHeight", mInboxLayoutPanel->getTargetDim());
 
 	if (mCategoriesObserver && gInventory.containsObserver(mCategoriesObserver))
 	{
@@ -187,11 +186,11 @@ BOOL LLSidepanelInventory::postBuild()
 		bool is_inbox_collapsed = !inbox_button->getToggleState();
 
 		// Restore the collapsed inbox panel state
-		LLLayoutPanel* inbox_panel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
-		inv_stack->collapsePanel(inbox_panel, is_inbox_collapsed);
+        mInboxLayoutPanel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
+		inv_stack->collapsePanel(mInboxLayoutPanel, is_inbox_collapsed);
 		if (!is_inbox_collapsed)
 		{
-			inbox_panel->setTargetDim(gSavedPerAccountSettings.getS32("InventoryInboxHeight"));
+            mInboxLayoutPanel->setTargetDim(gSavedPerAccountSettings.getS32("InventoryInboxHeight"));
 		}
 
 		// Set the inbox visible based on debug settings (final setting comes from http request below)
@@ -296,8 +295,20 @@ void LLSidepanelInventory::enableInbox(bool enabled)
 {
 	mInboxEnabled = enabled;
 	
-	LLLayoutPanel * inbox_layout_panel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
-	inbox_layout_panel->setVisible(enabled);
+    if(!enabled || !mPanelMainInventory->isSingleFolderMode())
+    {
+        toggleInbox();
+    }
+}
+
+void LLSidepanelInventory::hideInbox()
+{
+    mInboxLayoutPanel->setVisible(false);
+}
+
+void LLSidepanelInventory::toggleInbox()
+{
+    mInboxLayoutPanel->setVisible(mInboxEnabled);
 }
 
 void LLSidepanelInventory::openInbox()
@@ -327,25 +338,24 @@ void LLSidepanelInventory::onInboxChanged(const LLUUID& inbox_id)
 void LLSidepanelInventory::onToggleInboxBtn()
 {
 	LLButton* inboxButton = getChild<LLButton>(INBOX_BUTTON_NAME);
-	LLLayoutPanel* inboxPanel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
 	LLLayoutStack* inv_stack = getChild<LLLayoutStack>(INVENTORY_LAYOUT_STACK_NAME);
 	
 	const bool inbox_expanded = inboxButton->getToggleState();
 	
 	// Expand/collapse the indicated panel
-	inv_stack->collapsePanel(inboxPanel, !inbox_expanded);
+	inv_stack->collapsePanel(mInboxLayoutPanel, !inbox_expanded);
 
 	if (inbox_expanded)
 	{
-		inboxPanel->setTargetDim(gSavedPerAccountSettings.getS32("InventoryInboxHeight"));
-		if (inboxPanel->isInVisibleChain())
+        mInboxLayoutPanel->setTargetDim(gSavedPerAccountSettings.getS32("InventoryInboxHeight"));
+		if (mInboxLayoutPanel->isInVisibleChain())
 	{
 		gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());
 	}
 }
 	else
 	{
-		gSavedPerAccountSettings.setS32("InventoryInboxHeight", inboxPanel->getTargetDim());
+		gSavedPerAccountSettings.setS32("InventoryInboxHeight", mInboxLayoutPanel->getTargetDim());
 	}
 
 }
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
index fbbd657f9e..3a252a87c6 100644
--- a/indra/newview/llsidepanelinventory.h
+++ b/indra/newview/llsidepanelinventory.h
@@ -74,6 +74,8 @@ public:
 	void onToggleInboxBtn();
 
 	void enableInbox(bool enabled);
+    void toggleInbox();
+    void hideInbox();
 	
 	void openInbox();
 	
@@ -101,6 +103,8 @@ private:
 	LLHandle<LLInventoryPanel>	mInventoryPanelInbox;
 	LLPanelMainInventory*		mPanelMainInventory;
 
+    LLLayoutPanel* mInboxLayoutPanel;
+
 protected:
 	void 						onBackButtonClicked();
 
diff --git a/indra/newview/skins/default/textures/icons/multi_folder_mode.png b/indra/newview/skins/default/textures/icons/multi_folder_mode.png
new file mode 100644
index 0000000000..8cda3efc36
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/multi_folder_mode.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_back.png b/indra/newview/skins/default/textures/icons/single_folder_back.png
new file mode 100644
index 0000000000..b614e9ef9b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_back.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_forward.png b/indra/newview/skins/default/textures/icons/single_folder_forward.png
new file mode 100644
index 0000000000..c7bee3522d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_forward.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_mode.png b/indra/newview/skins/default/textures/icons/single_folder_mode.png
new file mode 100644
index 0000000000..f70b754123
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_mode.png differ
diff --git a/indra/newview/skins/default/textures/icons/single_folder_up.png b/indra/newview/skins/default/textures/icons/single_folder_up.png
new file mode 100644
index 0000000000..651b2b1af1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/single_folder_up.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1941c388b7..5d9c362e78 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -886,4 +886,10 @@ with the same filename but different name
   <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
   <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png"	preload="true"/>
   <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png"	preload="true"/>
+
+  <texture name="Single_Folder_Mode" file_name="icons/single_folder_mode.png" preload="true"/>
+  <texture name="Multi_Folder_Mode" file_name="icons/multi_folder_mode.png" preload="true"/>
+  <texture name="Single_Folder_Back" file_name="icons/single_folder_back.png" preload="true"/>
+  <texture name="Single_Folder_Forward" file_name="icons/single_folder_forward.png" preload="true"/>
+  <texture name="Single_Folder_Up" file_name="icons/single_folder_up.png" preload="true"/>
 </textures>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 027dd40d08..e58eaf79a3 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -13,12 +13,9 @@
        <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="open_in_current_window" />
-       <on_enable
-         function="Inventory.GearDefault.Enable"
-         parameter="open_folder" />
         <on_visible
          function="Inventory.GearDefault.Visible"
-         parameter="single_folder_view" />
+         parameter="open_folder" />
     </menu_item_call>
     <menu_item_call
      label="Open in new window"
@@ -27,8 +24,8 @@
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="open_in_new_window" />
-        <on_enable
-         function="Inventory.GearDefault.Enable"
+        <on_visible
+         function="Inventory.GearDefault.Visible"
          parameter="open_folder" />
     </menu_item_call>
     <menu_item_call
@@ -130,8 +127,11 @@
              function="Inventory.GearDefault.Custom.Action"
              parameter="replace_links" />
         </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
+    <menu_item_separator>
+        <menu_item_separator.on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+    </menu_item_separator>
     <menu_item_call
      label="Empty Lost and Found"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 0fcdb1cda0..b89ff832b9 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -53,4 +53,60 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_check>
+    <menu_item_separator>
+        <menu_item_separator.on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_separator>
+    <menu_item_check
+     label="List view"
+     layout="topleft"
+     name="list_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="list_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="list_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_check
+     label="Gallery view"
+     layout="topleft"
+     name="gallery_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="gallery_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="gallery_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_check
+     label="Combination view"
+     layout="topleft"
+     name="combination_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="combination_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="combination_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_separator/>
+    <menu_item_call
+     label="Inventory settings..."
+     layout="topleft"
+     name="inv_settings">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="inv_settings" />
+    </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 606c2175d8..16ad6f60db 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -24,8 +24,8 @@
     Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
   </panel.string>
   <panel.string name="inventory_title">INVENTORY</panel.string>
-  <panel.string name="default_mode_btn">Command_AboutLand_Icon</panel.string>
-  <panel.string name="single_folder_mode_btn">Command_Map_Icon</panel.string>
+  <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
+  <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
 		     type="string"
 		     length="1"
@@ -60,9 +60,9 @@
      <button
       follows="top|left"
       height="23"
-      image_selected="Arrow_Left"
-      image_pressed="Arrow_Left"
-      image_unselected="Arrow_Left"
+      image_selected="Single_Folder_Back"
+      image_pressed="Single_Folder_Back"
+      image_unselected="Single_Folder_Back"
       scale_image="false"
       layout="topleft"
       left="3"
@@ -73,9 +73,9 @@
      <button
       follows="top|left"
       height="23"
-      image_selected="Arrow_Right"
-      image_pressed="Arrow_Right"
-      image_unselected="Arrow_Right"
+      image_selected="Single_Folder_Forward"
+      image_pressed="Single_Folder_Forward"
+      image_unselected="Single_Folder_Forward"
       scale_image="false"
       layout="topleft"
       left_pad="1"
@@ -85,9 +85,9 @@
      <button
       follows="top|left"
       height="23"
-      image_selected="Arrow_Up"
-      image_pressed="Arrow_Up"
-      image_unselected="Arrow_Up"
+      image_selected="Single_Folder_Up"
+      image_pressed="Single_Folder_Up"
+      image_unselected="Single_Folder_Up"
       scale_image="false"
       layout="topleft"
       left_pad="1"
@@ -189,7 +189,7 @@
        tool_tip="Switch between views"
        height="23"
        image_hover_unselected="Toolbar_Middle_Over"
-       image_overlay="Command_Map_Icon"
+       image_overlay="Single_Folder_Mode"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
        layout="topleft"
-- 
cgit v1.2.3


From d6c0e40559fa090495b237bbbacf30578ac10aac Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 17:53:47 +0200
Subject: SL-19108 Enabled Image changing floater for folders

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 23 +++++++++++++++++++---
 indra/newview/llfloaterchangeitemthumbnail.h       |  1 +
 indra/newview/llinventorybridge.cpp                |  8 +++++++-
 .../newview/skins/default/xui/en/notifications.xml | 16 ++++++++++++++-
 4 files changed, 43 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 2187fda7c7..378f5bc132 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -37,6 +37,7 @@
 #include "llfloaterreg.h"
 #include "llfloatersimplesnapshot.h"
 #include "lllineeditor.h"
+#include "llnotificationsutil.h"
 #include "lltextbox.h"
 #include "lltexturectrl.h"
 #include "llthumbnailctrl.h"
@@ -364,10 +365,26 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
 void LLFloaterChangeItemThumbnail::onRemove(void *userdata)
 {
     LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
-    LLInventoryObject* item = self->getInventoryObject();
-    if (item)
+
+    LLSD payload;
+    payload["item_id"] = self->mItemId;
+    payload["object_id"] = self->mTaskId;
+    LLNotificationsUtil::add("DeleteThumbnail", LLSD(), payload, boost::bind(&LLFloaterChangeItemThumbnail::onRemovalConfirmation, _1, _2, self->getHandle()));
+}
+
+// static 
+void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (option == 0 && !handle.isDead() && !handle.get()->isDead())
     {
-        item->setThumbnailUUID(LLUUID::null);
+        LLFloaterChangeItemThumbnail* self = (LLFloaterChangeItemThumbnail*)handle.get();
+
+        LLInventoryObject* obj = self->getInventoryObject();
+        if (obj)
+        {
+            obj->setThumbnailUUID(LLUUID::null);
+        }
     }
 }
 
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index b3ae0a18f6..e40d649361 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -65,6 +65,7 @@ private:
     static void onCopyToClipboard(void*);
     static void onPasteFromClipboard(void*);
     static void onRemove(void*);
+    static void onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle);
 
     void showTexturePicker(const LLUUID &thumbnail_id);
     void onTexturePickerCommit(LLUUID id);
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 664ba3e336..986ab88cda 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -881,7 +881,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
             LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID);
             items.push_back(std::string("thumbnail"));
-            if (!inv_item || !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+            if (inv_item && !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
             {
                 disabled_items.push_back(std::string("thumbnail"));
             }
@@ -3289,6 +3289,12 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 		
 		return;
 	}
+    else if ("thumbnail" == action)
+    {
+        LLSD data(mUUID);
+        LLFloaterReg::showInstance("change_item_thumbnail", data);
+        return;
+    }
 	else if ("paste" == action)
 	{
 		pasteFromClipboard();
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d1a99133f0..ceae31967e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6094,7 +6094,21 @@ Are you sure you want to delete them?
      notext="Cancel"
      yestext="OK"/>
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteThumbnail"
+   type="alertmodal">
+    <unique/>
+    Delete the image for this item? There is no undo.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Don't show me this again"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Delete"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From 2d68a7c33622aa28c49989e959c2a9be1f053d03 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 23:03:00 +0200
Subject: SL-19108 Update Simple snapshot floater

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 47 ++++++++++++++++++++++
 indra/newview/llfloatersimplesnapshot.cpp          | 42 ++++++++-----------
 indra/newview/llfloatersimplesnapshot.h            | 17 ++++----
 indra/newview/llinspecttexture.cpp                 |  3 +-
 indra/newview/lloutfitgallery.cpp                  | 40 +++---------------
 indra/newview/lloutfitgallery.h                    |  5 +--
 indra/newview/lloutfitslist.cpp                    | 27 +++----------
 indra/newview/lloutfitslist.h                      |  5 +--
 indra/newview/llsnapshotlivepreview.cpp            | 26 ++++++++++++
 indra/newview/llsnapshotlivepreview.h              |  1 +
 .../default/xui/en/floater_simple_snapshot.xml     |  4 +-
 .../default/xui/en/menu_gallery_outfit_tab.xml     | 32 ++-------------
 .../skins/default/xui/en/menu_outfit_gear.xml      |  6 +--
 13 files changed, 123 insertions(+), 132 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 378f5bc132..5b47c483fb 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -31,6 +31,7 @@
 #include "llbutton.h"
 #include "llclipboard.h"
 #include "lliconctrl.h"
+#include "llinventoryfunctions.h"
 #include "llinventoryicon.h"
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
@@ -264,6 +265,20 @@ void LLFloaterChangeItemThumbnail::refreshFromInventory()
     }
 }
 
+class LLIsOutfitTextureType : public LLInventoryCollectFunctor
+{
+public:
+    LLIsOutfitTextureType() {}
+    virtual ~LLIsOutfitTextureType() {}
+    virtual bool operator()(LLInventoryCategory* cat,
+        LLInventoryItem* item);
+};
+
+bool LLIsOutfitTextureType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+{
+    return item && (item->getType() == LLAssetType::AT_TEXTURE);
+}
+
 void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
 {
     LLUIImagePtr icon_img;
@@ -286,6 +301,35 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
         if (cat)
         {
             icon_img = LLUI::getUIImage(LLViewerFolderType::lookupIconName(cat->getPreferredType(), true));
+
+            if (thumbnail_id.isNull() && (cat->getPreferredType() == LLFolderType::FT_OUTFIT))
+            {
+                // Legacy support, check if there is an image inside
+
+                LLInventoryModel::cat_array_t cats;
+                LLInventoryModel::item_array_t items;
+                // Not LLIsOfAssetType, because we allow links
+                LLIsOutfitTextureType f;
+                gInventory.getDirectDescendentsOf(mItemId, cats, items, f);
+
+                if (1 == items.size())
+                {
+                    LLViewerInventoryItem* item = items.front();
+                    if (item && item->getIsLinkType())
+                    {
+                        item = item->getLinkedItem();
+                    }
+                    if (item)
+                    {
+                        thumbnail_id = item->getAssetUUID();
+
+                        // per SL-19188, set this image as a thumbnail
+                        cat->setThumbnailUUID(thumbnail_id);
+                        // todo: needs to trigger send/update once server support is done
+                    }
+                }
+            }
+
             mRemoveImageBtn->setEnabled(thumbnail_id.notNull());
         }
     }
@@ -358,6 +402,7 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
         if (obj)
         {
             obj->setThumbnailUUID(objects[0]);
+            // todo: need to trigger send/update once server support is done
         }
     }
 }
@@ -384,6 +429,7 @@ void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notificatio
         if (obj)
         {
             obj->setThumbnailUUID(LLUUID::null);
+            // todo: need to trigger send/update once server support is done
         }
     }
 }
@@ -450,6 +496,7 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
     if (obj && floaterp)
     {
         obj->setThumbnailUUID(floaterp->getAssetID());
+        // todo: need to trigger send/update once server support is done
     }
 }
 
diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
index ca2b9b919a..096db132ac 100644
--- a/indra/newview/llfloatersimplesnapshot.cpp
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -30,9 +30,9 @@
 
 #include "llfloaterreg.h"
 #include "llimagefiltersmanager.h"
+#include "llinventorymodel.h"
 #include "llstatusbar.h" // can_afford_transaction()
 #include "llnotificationsutil.h"
-#include "lloutfitgallery.h"
 #include "llagent.h"
 #include "llagentbenefits.h"
 #include "llviewercontrol.h"
@@ -44,8 +44,6 @@ LLSimpleSnapshotFloaterView* gSimpleSnapshotFloaterView = NULL;
 
 const S32 THUMBNAIL_SNAPSHOT_DIM = 256;
 
-static LLDefaultChildRegistry::Register<LLSimpleSnapshotFloaterView> r("simple_snapshot_floater_view");
-
 // Thumbnail posting coro
 
 static const std::string THUMBNAIL_ITEM_UPLOAD_CAP = "InventoryItemThumbnailUpload";
@@ -229,8 +227,7 @@ void LLFloaterSimpleSnapshot::Impl::setStatus(EStatus status, bool ok, const std
 ///----------------------------------------------------------------------------
 
 LLFloaterSimpleSnapshot::LLFloaterSimpleSnapshot(const LLSD& key)
-    : LLFloaterSnapshotBase(key),
-    mOutfitGallery(NULL)
+    : LLFloaterSnapshotBase(key)
 {
     impl = new Impl(this);
 }
@@ -241,8 +238,6 @@ LLFloaterSimpleSnapshot::~LLFloaterSimpleSnapshot()
 
 BOOL LLFloaterSimpleSnapshot::postBuild()
 {
-    getChild<LLUICtrl>("save_btn")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()));
-
     childSetAction("new_snapshot_btn", ImplBase::onClickNewSnapshot, this);
     childSetAction("save_btn", boost::bind(&LLFloaterSimpleSnapshot::onSend, this));
     childSetAction("cancel_btn", boost::bind(&LLFloaterSimpleSnapshot::onCancel, this));
@@ -337,18 +332,18 @@ void LLFloaterSimpleSnapshot::onCancel()
 
 void LLFloaterSimpleSnapshot::onSend()
 {
-    S32 expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
-    if (can_afford_transaction(expected_upload_cost))
+    LLSnapshotLivePreview* previewp = getPreviewView();
+
+    std::string temp_file = gDirUtilp->getTempFilename();
+    if (previewp->createUploadFile(temp_file, THUMBNAIL_SNAPSHOT_DIM))
     {
-        saveTexture();
-        postSave();
+        uploadImageUploadFile(temp_file, mInventoryId, mTaskId);
     }
     else
     {
-        LLSD args;
-        args["COST"] = llformat("%d", expected_upload_cost);
-        LLNotificationsUtil::add("ErrorPhotoCannotAfford", args);
-        inventorySaveFailed();
+        LLSD notif_args;
+        notif_args["REASON"] = LLImage::getLastError().c_str();
+        LLNotificationsUtil::add("CannotUploadTexture", notif_args);
     }
 }
 
@@ -371,7 +366,12 @@ void LLFloaterSimpleSnapshot::uploadThumbnail(const std::string &file_path, cons
         LL_WARNS("Thumbnail") << "Failed to upload thumbnail for " << inventory_id << " " << task_id << ", reason: " << notif_args["REASON"].asString() << LL_ENDL;
         return;
     }
+    uploadImageUploadFile(temp_file, inventory_id, task_id);
+}
 
+// static
+void LLFloaterSimpleSnapshot::uploadImageUploadFile(const std::string &temp_file, const LLUUID &inventory_id, const LLUUID &task_id)
+{
     std::string cap_name;
     LLSD data;
 
@@ -431,22 +431,14 @@ LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::getInstance()
 
 void LLFloaterSimpleSnapshot::saveTexture()
 {
-     LLSnapshotLivePreview* previewp = getPreviewView();
+    LLSnapshotLivePreview* previewp = getPreviewView();
     if (!previewp)
     {
         llassert(previewp != NULL);
         return;
     }
 
-    if (mOutfitGallery)
-    {
-        mOutfitGallery->onBeforeOutfitSnapshotSave();
-    }
-    previewp->saveTexture(TRUE, getOutfitID().asString());
-    if (mOutfitGallery)
-    {
-        mOutfitGallery->onAfterOutfitSnapshotSave();
-    }
+    previewp->saveTexture(TRUE, getInventoryId().asString());
     closeFloater();
 }
 
diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
index 55253b38e8..59cb526704 100644
--- a/indra/newview/llfloatersimplesnapshot.h
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -31,8 +31,6 @@
 #include "llfloatersnapshot.h"
 #include "llsnapshotlivepreview.h"
 
-class LLOutfitGallery;
-
 ///----------------------------------------------------------------------------
 /// Class LLFloaterSimpleSnapshot
 ///----------------------------------------------------------------------------
@@ -58,11 +56,9 @@ public:
 
     const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }
 
-    void setOutfitID(LLUUID id) { mOutfitID = id; }
-    LLUUID getOutfitID() { return mOutfitID; }
-    void setGallery(LLOutfitGallery* gallery) { mOutfitGallery = gallery; }
-    void setInventoryId(const LLUUID &inventory_id) {}
-    void setTaskId(const LLUUID &task_id) {}
+    void setInventoryId(const LLUUID &inventory_id) { mInventoryId = inventory_id; }
+    LLUUID getInventoryId() { return mInventoryId; }
+    void setTaskId(const LLUUID &task_id) { mTaskId = task_id; }
 
     void postSave();
     static void uploadThumbnail(const std::string &file_path, const LLUUID &inventory_id, const LLUUID &task_id);
@@ -74,8 +70,11 @@ private:
     void onSend();
     void onCancel();
 
-    LLUUID mOutfitID;
-    LLOutfitGallery* mOutfitGallery;
+    // uploads upload-ready file
+    static void uploadImageUploadFile(const std::string &temp_file, const LLUUID &inventory_id, const LLUUID &task_id);
+
+    LLUUID mInventoryId;
+    LLUUID mTaskId;
 };
 
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index de0d65eb7e..2e8273d6cf 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -185,7 +185,8 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
                             }
                             if (item)
                             {
-                                // Todo: write this into folder's thumbnail id
+                                // Note: LLFloaterChangeItemThumbnail will attempt to write this
+                                // into folder's thumbnail id when opened
                                 p.create_params.getValue()["thumbnail_id"] = item->getAssetUUID();
                                 return LLUICtrlFactory::create<LLTextureToolTip>(p);
                             }
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 06dbf50bee..d30cc66a38 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -837,52 +837,23 @@ LLContextMenu* LLOutfitGalleryContextMenu::createMenu()
     registrar.add("Outfit.Rename", boost::bind(renameOutfit, selected_id));
     registrar.add("Outfit.Delete", boost::bind(&LLOutfitGalleryContextMenu::onRemoveOutfit, this, selected_id));
     registrar.add("Outfit.Create", boost::bind(&LLOutfitGalleryContextMenu::onCreate, this, _2));
-    registrar.add("Outfit.UploadPhoto", boost::bind(&LLOutfitGalleryContextMenu::onUploadPhoto, this, selected_id));
-    registrar.add("Outfit.SelectPhoto", boost::bind(&LLOutfitGalleryContextMenu::onSelectPhoto, this, selected_id));
-    registrar.add("Outfit.TakeSnapshot", boost::bind(&LLOutfitGalleryContextMenu::onTakeSnapshot, this, selected_id));
-    registrar.add("Outfit.RemovePhoto", boost::bind(&LLOutfitGalleryContextMenu::onRemovePhoto, this, selected_id));
+    registrar.add("Outfit.Thumbnail", boost::bind(&LLOutfitGalleryContextMenu::onThumbnail, this, selected_id));
     enable_registrar.add("Outfit.OnEnable", boost::bind(&LLOutfitGalleryContextMenu::onEnable, this, _2));
     enable_registrar.add("Outfit.OnVisible", boost::bind(&LLOutfitGalleryContextMenu::onVisible, this, _2));
     
     return createFromFile("menu_gallery_outfit_tab.xml");
 }
 
-void LLOutfitGalleryContextMenu::onUploadPhoto(const LLUUID& outfit_cat_id)
+void LLOutfitGalleryContextMenu::onThumbnail(const LLUUID& outfit_cat_id)
 {
     LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
     if (gallery && outfit_cat_id.notNull())
     {
-        gallery->uploadPhoto(outfit_cat_id);
+        LLSD data(outfit_cat_id);
+        LLFloaterReg::showInstance("change_item_thumbnail", data);
     }
 }
 
-void LLOutfitGalleryContextMenu::onSelectPhoto(const LLUUID& outfit_cat_id)
-{
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    if (gallery && outfit_cat_id.notNull())
-    {
-        gallery->onSelectPhoto(outfit_cat_id);
-    }
-}
-
-void LLOutfitGalleryContextMenu::onRemovePhoto(const LLUUID& outfit_cat_id)
-{
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    if (gallery && outfit_cat_id.notNull())
-    {
-        gallery->checkRemovePhoto(outfit_cat_id);
-        gallery->refreshOutfit(outfit_cat_id);
-    }
-}
-
-void LLOutfitGalleryContextMenu::onTakeSnapshot(const LLUUID& outfit_cat_id)
-{
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    if (gallery && outfit_cat_id.notNull())
-    {
-        gallery->onTakeSnapshot(outfit_cat_id);
-    }
-}
 
 void LLOutfitGalleryContextMenu::onRemoveOutfit(const LLUUID& outfit_cat_id)
 {
@@ -1390,8 +1361,7 @@ void LLOutfitGallery::onTakeSnapshot(LLUUID selected_outfit_id)
     LLFloaterSimpleSnapshot* snapshot_floater = LLFloaterSimpleSnapshot::getInstance();
     if (snapshot_floater)
     {
-        snapshot_floater->setOutfitID(selected_outfit_id);
-        snapshot_floater->getInstance()->setGallery(this);
+        snapshot_floater->setInventoryId(selected_outfit_id);
     }
 }
 
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index ce5c090134..4839477cb2 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -215,10 +215,7 @@ protected:
     /* virtual */ LLContextMenu* createMenu();
     bool onEnable(LLSD::String param);
     bool onVisible(LLSD::String param);
-    void onUploadPhoto(const LLUUID& outfit_cat_id);
-    void onSelectPhoto(const LLUUID& outfit_cat_id);
-    void onRemovePhoto(const LLUUID& outfit_cat_id);
-    void onTakeSnapshot(const LLUUID& outfit_cat_id);
+    void onThumbnail(const LLUUID& outfit_cat_id);
     void onCreate(const LLSD& data);
     void onRemoveOutfit(const LLUUID& outfit_cat_id);
     void onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response, const LLUUID& outfit_cat_id);
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 4171fd8822..2f7d1c433a 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -36,6 +36,7 @@
 #include "llagentwearables.h"
 #include "llappearancemgr.h"
 #include "llagentbenefits.h"
+#include "llfloaterreg.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
@@ -1112,10 +1113,7 @@ LLOutfitListGearMenuBase::LLOutfitListGearMenuBase(LLOutfitListBase* olist)
 
     registrar.add("Gear.WearAdd", boost::bind(&LLOutfitListGearMenuBase::onAdd, this));
 
-    registrar.add("Gear.UploadPhoto", boost::bind(&LLOutfitListGearMenuBase::onUploadFoto, this));
-    registrar.add("Gear.SelectPhoto", boost::bind(&LLOutfitListGearMenuBase::onSelectPhoto, this));
-    registrar.add("Gear.TakeSnapshot", boost::bind(&LLOutfitListGearMenuBase::onTakeSnapshot, this));
-    registrar.add("Gear.RemovePhoto", boost::bind(&LLOutfitListGearMenuBase::onRemovePhoto, this));
+    registrar.add("Gear.Thumbnail", boost::bind(&LLOutfitListGearMenuBase::onThumbnail, this));
     registrar.add("Gear.SortByName", boost::bind(&LLOutfitListGearMenuBase::onChangeSortOrder, this));
 
     enable_registrar.add("Gear.OnEnable", boost::bind(&LLOutfitListGearMenuBase::onEnable, this, _2));
@@ -1251,24 +1249,11 @@ bool LLOutfitListGearMenuBase::onVisible(LLSD::String param)
     return true;
 }
 
-void LLOutfitListGearMenuBase::onUploadFoto()
+void LLOutfitListGearMenuBase::onThumbnail()
 {
-
-}
-
-void LLOutfitListGearMenuBase::onSelectPhoto()
-{
-
-}
-
-void LLOutfitListGearMenuBase::onTakeSnapshot()
-{
-
-}
-
-void LLOutfitListGearMenuBase::onRemovePhoto()
-{
-
+    const LLUUID& selected_outfit_id = getSelectedOutfitID();
+    LLSD data(selected_outfit_id);
+    LLFloaterReg::showInstance("change_item_thumbnail", data);
 }
 
 void LLOutfitListGearMenuBase::onChangeSortOrder()
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index 81be8de94f..66b3165169 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -163,10 +163,7 @@ public:
 
 protected:
     virtual void onUpdateItemsVisibility();
-    virtual void onUploadFoto();
-    virtual void onSelectPhoto();
-    virtual void onTakeSnapshot();
-    virtual void onRemovePhoto();
+    virtual void onThumbnail();
     virtual void onChangeSortOrder();
 
     const LLUUID& getSelectedOutfitID();
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index ed7e18fadc..273e3a403d 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -51,6 +51,7 @@
 #include "llviewercontrol.h"
 #include "llviewermenufile.h"	// upload_new_resource()
 #include "llviewerstats.h"
+#include "llviewertexturelist.h"
 #include "llwindow.h"
 #include "llworld.h"
 #include <boost/filesystem.hpp>
@@ -873,6 +874,31 @@ LLPointer<LLImageRaw> LLSnapshotLivePreview::getEncodedImage()
     return mPreviewImageEncoded;
 }
 
+bool LLSnapshotLivePreview::createUploadFile(const std::string &out_filename, const S32 max_image_dimentions)
+{
+    // make a copy, since convertToUploadFile modifies raw image
+    LLPointer<LLImageRaw> raw_image = new LLImageRaw(
+        mPreviewImage->getData(),
+        mPreviewImage->getWidth(),
+        mPreviewImage->getHeight(),
+        mPreviewImage->getComponents());
+
+    LLPointer<LLImageJ2C> compressedImage = LLViewerTextureList::convertToUploadFile(raw_image, max_image_dimentions);
+    if (compressedImage.isNull())
+    {
+        compressedImage->setLastError("Couldn't convert the image to jpeg2000.");
+        LL_INFOS() << "Couldn't convert to j2c, file : " << out_filename << LL_ENDL;
+        return false;
+    }
+    if (!compressedImage->save(out_filename))
+    {
+        compressedImage->setLastError("Couldn't create the jpeg2000 image for upload.");
+        LL_INFOS() << "Couldn't create output file : " << out_filename << LL_ENDL;
+        return false;
+    }
+    return true;
+}
+
 // We actually estimate the data size so that we do not require actual compression when showing the preview
 // Note : whenever formatted image is computed, mDataSize will be updated to reflect the true size
 void LLSnapshotLivePreview::estimateDataSize()
diff --git a/indra/newview/llsnapshotlivepreview.h b/indra/newview/llsnapshotlivepreview.h
index 1f81307976..e78c885789 100644
--- a/indra/newview/llsnapshotlivepreview.h
+++ b/indra/newview/llsnapshotlivepreview.h
@@ -106,6 +106,7 @@ public:
 
 	LLPointer<LLImageFormatted>	getFormattedImage();
 	LLPointer<LLImageRaw>		getEncodedImage();
+    bool createUploadFile(const std::string &out_file, const S32 max_image_dimentions);
 
 	/// Sets size of preview thumbnail image and the surrounding rect.
 	void setThumbnailPlaceholderRect(const LLRect& rect) {mThumbnailPlaceholderRect = rect; }
diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index a53d42be2e..97ea59593e 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -12,7 +12,7 @@
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
- title="THUMBNAIL SNAPSHOT"
+ title="ITEM SNAPSHOT"
  width="351">
   <ui_ctrl
    layout="topleft"
@@ -36,7 +36,7 @@
    height="22"
    layout="topleft"
    left_pad="10"
-   label="Save (L$[UPLOAD_COST])"
+   label="Save"
    name="save_btn"
    width="90" />
   <button
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 99ca910062..0ca505dd5d 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -42,35 +42,11 @@
         parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-        label="Upload Photo (L$[UPLOAD_COST])"
-        layout="topleft"
-        name="upload_photo">
-        <on_click
-        function="Outfit.UploadPhoto" />
-    </menu_item_call>
-    <menu_item_call
-        label="Select Photo"
-        layout="topleft"
-        name="select_photo">
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
         <on_click
-        function="Outfit.SelectPhoto" />
-    </menu_item_call>
-    <menu_item_call
-        label="Take a Snapshot"
-        layout="topleft"
-        name="take_snapshot">
-        <on_click
-        function="Outfit.TakeSnapshot" />
-    </menu_item_call>
-    <menu_item_call
-        label="Remove Photo"
-        layout="topleft"
-        name="remove_photo">
-        <on_click
-        function="Outfit.RemovePhoto" />
-        <on_visible
-        function="Outfit.OnVisible"
-        parameter="remove_photo" />
+         function="Outfit.Thumbnail" />
     </menu_item_call>
     <menu_item_separator name="sepatator1" />
     <menu
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 32d9d28434..0f7a7e8d56 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -40,11 +40,11 @@
          parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-     label="Upload Photo (L$[UPLOAD_COST])"
+     label="Image..."
      layout="topleft"
-     name="upload_photo">
+     name="thumbnail">
         <on_click
-         function="Gear.UploadPhoto" />
+         function="Gear.Thumbnail" />
     </menu_item_call>
     <menu_item_call
      label="Select Photo"
-- 
cgit v1.2.3


From 682c9aa3c20db25c4fbaa8f5811ea0e44fa115a0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Feb 2023 23:56:47 +0200
Subject: SL-19108 Cleanup Outfit Galery

Is supposed to use thumbnails now
---
 indra/newview/llfloaterchangeitemthumbnail.cpp |   1 +
 indra/newview/lloutfitgallery.cpp              | 455 ++++---------------------
 indra/newview/lloutfitgallery.h                |  17 -
 3 files changed, 60 insertions(+), 413 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 5b47c483fb..a78100374d 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -321,6 +321,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
                     }
                     if (item)
                     {
+                        LL_INFOS() << "Setting image from outfit as a thumbnail" << LL_ENDL;
                         thumbnail_id = item->getAssetUUID();
 
                         // per SL-19188, set this image as a thumbnail
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index d30cc66a38..4eb596e0b5 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -125,7 +125,6 @@ void LLOutfitGallery::onOpen(const LLSD& info)
     LLOutfitListBase::onOpen(info);
     if (!mGalleryCreated)
     {
-        loadPhotos();
         uuid_vec_t cats;
         getCurrentCategories(cats);
         int n = cats.size();
@@ -854,7 +853,6 @@ void LLOutfitGalleryContextMenu::onThumbnail(const LLUUID& outfit_cat_id)
     }
 }
 
-
 void LLOutfitGalleryContextMenu::onRemoveOutfit(const LLUUID& outfit_cat_id)
 {
     LLNotificationsUtil::add("DeleteOutfits", LLSD(), LLSD(), boost::bind(&LLOutfitGalleryContextMenu::onOutfitsRemovalConfirmation, this, _1, _2, outfit_cat_id));
@@ -923,47 +921,6 @@ void LLOutfitGalleryGearMenu::onUpdateItemsVisibility()
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
 }
 
-void LLOutfitGalleryGearMenu::onUploadFoto()
-{
-    LLUUID selected_outfit_id = getSelectedOutfitID();
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    if (gallery && selected_outfit_id.notNull())
-    {
-        gallery->uploadPhoto(selected_outfit_id);
-    }
-}
-
-void LLOutfitGalleryGearMenu::onSelectPhoto()
-{
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    LLUUID selected_outfit_id = getSelectedOutfitID();
-    if (gallery && !selected_outfit_id.isNull())
-    {
-        gallery->onSelectPhoto(selected_outfit_id);
-    }
-}
-
-void LLOutfitGalleryGearMenu::onRemovePhoto()
-{
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    LLUUID selected_outfit_id = getSelectedOutfitID();
-    if (gallery && !selected_outfit_id.isNull())
-    {
-        gallery->checkRemovePhoto(selected_outfit_id);
-        gallery->refreshOutfit(selected_outfit_id);
-    }
-}
-
-void LLOutfitGalleryGearMenu::onTakeSnapshot()
-{
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    LLUUID selected_outfit_id = getSelectedOutfitID();
-    if (gallery && !selected_outfit_id.isNull())
-    {
-        gallery->onTakeSnapshot(selected_outfit_id);
-    }
-}
-
 void LLOutfitGalleryGearMenu::onChangeSortOrder()
 {
     bool sort_by_name = !gSavedSettings.getBOOL("OutfitGallerySortByName");
@@ -990,236 +947,89 @@ void LLOutfitGallery::onTextureSelectionChanged(LLInventoryItem* itemp)
 {
 }
 
-void LLOutfitGallery::loadPhotos()
-{
-    //Iterate over inventory
-    mSnapshotFolderID = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_TEXTURE);
-    LLViewerInventoryCategory* textures_category = gInventory.getCategory(mSnapshotFolderID);
-    if (!textures_category)
-        return;
-    if (mTexturesObserver == NULL)
-    {
-        mTexturesObserver = new LLInventoryCategoriesObserver();
-        gInventory.addObserver(mTexturesObserver);
-    }
-
-    // Start observing changes in "Textures" category.
-    mTexturesObserver->addCategory(mSnapshotFolderID,
-        boost::bind(&LLOutfitGallery::refreshTextures, this, mSnapshotFolderID));
-
-    textures_category->fetch();
-}
-
-void LLOutfitGallery::updateSnapshotFolderObserver()
-{
-    if(mSnapshotFolderID != gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_TEXTURE))
-    {
-        if (gInventory.containsObserver(mTexturesObserver))
-        {
-            gInventory.removeObserver(mTexturesObserver);
-        }
-        delete mTexturesObserver;
-        mTexturesObserver = NULL;
-        loadPhotos();
-    }
-}
-
 void LLOutfitGallery::refreshOutfit(const LLUUID& category_id)
 {
     LLViewerInventoryCategory* category = gInventory.getCategory(category_id);
     if (category)
     {
         bool photo_loaded = false;
-        LLInventoryModel::cat_array_t sub_cat_array;
-        LLInventoryModel::item_array_t outfit_item_array;
-        // Collect all sub-categories of a given category.
-        gInventory.collectDescendents(
-            category->getUUID(),
-            sub_cat_array,
-            outfit_item_array,
-            LLInventoryModel::EXCLUDE_TRASH);
-        BOOST_FOREACH(LLViewerInventoryItem* outfit_item, outfit_item_array)
+        LLUUID asset_id = category->getThumbnailUUID();
+        if (asset_id.isNull())
         {
-            LLViewerInventoryItem* linked_item = outfit_item->getLinkedItem();
-            LLUUID asset_id, inv_id;
-            std::string item_name;
-            if (linked_item != NULL)
+            LLInventoryModel::cat_array_t sub_cat_array;
+            LLInventoryModel::item_array_t outfit_item_array;
+            // Collect all sub-categories of a given category.
+            gInventory.collectDescendents(
+                category->getUUID(),
+                sub_cat_array,
+                outfit_item_array,
+                LLInventoryModel::EXCLUDE_TRASH);
+            BOOST_FOREACH(LLViewerInventoryItem* outfit_item, outfit_item_array)
             {
-                if (linked_item->getActualType() == LLAssetType::AT_TEXTURE)
+                LLViewerInventoryItem* linked_item = outfit_item->getLinkedItem();
+                LLUUID asset_id, inv_id;
+                std::string item_name;
+                if (linked_item != NULL)
                 {
-                    asset_id = linked_item->getAssetUUID();
-                    inv_id = linked_item->getUUID();
-                    item_name = linked_item->getName();
+                    if (linked_item->getActualType() == LLAssetType::AT_TEXTURE)
+                    {
+                        asset_id = linked_item->getAssetUUID();
+                        inv_id = linked_item->getUUID();
+                        item_name = linked_item->getName();
+                    }
                 }
-            }
-            else if (outfit_item->getActualType() == LLAssetType::AT_TEXTURE)
-            {
-                asset_id = outfit_item->getAssetUUID();
-                inv_id = outfit_item->getUUID();
-                item_name = outfit_item->getName();
-            }
-            if (asset_id.notNull())
-            {
-                photo_loaded |= mOutfitMap[category_id]->setImageAssetId(asset_id);
-                // Rename links
-                if (!mOutfitRenamePending.isNull() && mOutfitRenamePending.asString() == item_name)
+                else if (outfit_item->getActualType() == LLAssetType::AT_TEXTURE)
+                {
+                    asset_id = outfit_item->getAssetUUID();
+                    inv_id = outfit_item->getUUID();
+                    item_name = outfit_item->getName();
+                }
+                if (category->getThumbnailUUID().notNull())
                 {
-                    LLViewerInventoryCategory *outfit_cat = gInventory.getCategory(mOutfitRenamePending);
-                    LLStringUtil::format_map_t photo_string_args;
-                    photo_string_args["OUTFIT_NAME"] = outfit_cat->getName();
-                    std::string new_name = getString("outfit_photo_string", photo_string_args);
-                    LLSD updates;
-                    updates["name"] = new_name;
-                    update_inventory_item(inv_id, updates, NULL);
-                    mOutfitRenamePending.setNull();
-                    LLFloater* appearance_floater = LLFloaterReg::getInstance("appearance");
-                    if (appearance_floater)
+                    asset_id = category->getThumbnailUUID();
+                }
+                if (asset_id.notNull())
+                {
+                    photo_loaded |= mOutfitMap[category_id]->setImageAssetId(asset_id);
+                    // Rename links
+                    if (!mOutfitRenamePending.isNull() && mOutfitRenamePending.asString() == item_name)
                     {
-                        appearance_floater->setFocus(TRUE);
+                        LLViewerInventoryCategory *outfit_cat = gInventory.getCategory(mOutfitRenamePending);
+                        LLStringUtil::format_map_t photo_string_args;
+                        photo_string_args["OUTFIT_NAME"] = outfit_cat->getName();
+                        std::string new_name = getString("outfit_photo_string", photo_string_args);
+                        LLSD updates;
+                        updates["name"] = new_name;
+                        update_inventory_item(inv_id, updates, NULL);
+                        mOutfitRenamePending.setNull();
+                        LLFloater* appearance_floater = LLFloaterReg::getInstance("appearance");
+                        if (appearance_floater)
+                        {
+                            appearance_floater->setFocus(TRUE);
+                        }
+                    }
+                    if (item_name == LLAppearanceMgr::sExpectedTextureName)
+                    {
+                        // Images with "appropriate" name take priority
+                        break;
                     }
                 }
-                if (item_name == LLAppearanceMgr::sExpectedTextureName)
+                if (!photo_loaded)
                 {
-                    // Images with "appropriate" name take priority
-                    break;
+                    mOutfitMap[category_id]->setDefaultImage();
                 }
             }
-            if (!photo_loaded)
-            {
-                mOutfitMap[category_id]->setDefaultImage();
-            }
-        }
-    }
-    
-    if (mGalleryCreated && !LLApp::isExiting())
-    {
-        reArrangeRows();
-    }
-}
-
-// Refresh linked textures from "textures" uploads folder
-void LLOutfitGallery::refreshTextures(const LLUUID& category_id)
-{
-    LLInventoryModel::cat_array_t cat_array;
-    LLInventoryModel::item_array_t item_array;
-
-    // Collect all sub-categories of a given category.
-    LLIsType is_texture(LLAssetType::AT_TEXTURE);
-    gInventory.collectDescendentsIf(
-        category_id,
-        cat_array,
-        item_array,
-        LLInventoryModel::EXCLUDE_TRASH,
-        is_texture);
-
-    //Find texture which contain pending outfit ID string in name
-    LLViewerInventoryItem* photo_upload_item = NULL;
-    BOOST_FOREACH(LLViewerInventoryItem* item, item_array)
-    {
-        std::string name = item->getName();
-        if (!mOutfitLinkPending.isNull() && name == mOutfitLinkPending.asString())
-        {
-            photo_upload_item = item;
-            break;
-        }
-    }
-
-    if (photo_upload_item != NULL)
-    {
-        LLUUID photo_item_id = photo_upload_item->getUUID();
-        LLInventoryObject* upload_object = gInventory.getObject(photo_item_id);
-        if (!upload_object)
-        {
-            LL_WARNS() << "LLOutfitGallery::refreshTextures added_object is null!" << LL_ENDL;
         }
         else
         {
-            linkPhotoToOutfit(photo_item_id, mOutfitLinkPending);
-            mOutfitRenamePending = mOutfitLinkPending;
-            mOutfitLinkPending.setNull();
+            mOutfitMap[category_id]->setImageAssetId(asset_id);
         }
     }
-}
-
-void LLOutfitGallery::uploadPhoto(LLUUID outfit_id)
-{
-	outfit_map_t::iterator outfit_it = mOutfitMap.find(outfit_id);
-	if (outfit_it == mOutfitMap.end() || outfit_it->first.isNull())
-	{
-		return;
-	}
-    (new LLFilePickerReplyThread(boost::bind(&LLOutfitGallery::uploadOutfitImage, this, _1, outfit_id), LLFilePicker::FFLOAD_IMAGE, false))->getFile();
-}
-
-void LLOutfitGallery::uploadOutfitImage(const std::vector<std::string>& filenames, LLUUID outfit_id)
-{
-    std::string filename = filenames[0];
-    LLLocalBitmap* unit = new LLLocalBitmap(filename);
-    if (unit->getValid())
+    
+    if (mGalleryCreated && !LLApp::isExiting())
     {
-        std::string exten = gDirUtilp->getExtension(filename);
-        U32 codec = LLImageBase::getCodecFromExtension(exten);
-
-        LLImageDimensionsInfo image_info;
-        std::string image_load_error;
-        if (!image_info.load(filename, codec))
-        {
-            image_load_error = image_info.getLastError();
-        }
-
-        S32 max_width = MAX_OUTFIT_PHOTO_WIDTH;
-        S32 max_height = MAX_OUTFIT_PHOTO_HEIGHT;
-
-        if ((image_info.getWidth() > max_width) || (image_info.getHeight() > max_height))
-        {
-            LLStringUtil::format_map_t args;
-            args["WIDTH"] = llformat("%d", max_width);
-            args["HEIGHT"] = llformat("%d", max_height);
-
-            image_load_error = LLTrans::getString("outfit_photo_load_dimensions_error", args);
-        }
-
-        if (!image_load_error.empty())
-        {
-            LLSD subst;
-            subst["REASON"] = image_load_error;
-            LLNotificationsUtil::add("OutfitPhotoLoadError", subst);
-            return;
-        }
-
-        S32 expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
-        void *nruserdata = NULL;
-        nruserdata = (void *)&outfit_id;
-
-        LLViewerInventoryCategory *outfit_cat = gInventory.getCategory(outfit_id);
-        if (!outfit_cat) return;
-        updateSnapshotFolderObserver();
-        checkRemovePhoto(outfit_id);
-        std::string upload_pending_name = outfit_id.asString();
-        std::string upload_pending_desc = "";
-        upload_new_resource(filename, // file
-            upload_pending_name,
-            upload_pending_desc,
-            0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE,
-            LLFloaterPerms::getNextOwnerPerms("Uploads"),
-            LLFloaterPerms::getGroupPerms("Uploads"),
-            LLFloaterPerms::getEveryonePerms("Uploads"),
-            upload_pending_name, LLAssetStorage::LLStoreAssetCallback(), expected_upload_cost, nruserdata, false);
-        mOutfitLinkPending = outfit_id;
+        reArrangeRows();
     }
-    delete unit;
-}
-
-void LLOutfitGallery::linkPhotoToOutfit(LLUUID photo_id, LLUUID outfit_id)
-{
-    LLPointer<LLInventoryCallback> cb = new LLUpdateGalleryOnPhotoLinked();
-    link_inventory_object(outfit_id, photo_id, cb);
-}
-
-bool LLOutfitGallery::checkRemovePhoto(LLUUID outfit_id)
-{
-    LLAppearanceMgr::instance().removeOutfitPhoto(outfit_id);
-    return true;
 }
 
 void LLUpdateGalleryOnPhotoLinked::fire(const LLUUID& inv_item_id)
@@ -1241,150 +1051,3 @@ LLUUID LLOutfitGallery::getDefaultPhoto()
     return LLUUID();
 }
 
-void LLOutfitGallery::onTexturePickerCommit(LLTextureCtrl::ETexturePickOp op, LLUUID id)
-{
-    LLUUID selected_outfit_id = getSelectedOutfitUUID();
-
-    if (selected_outfit_id.isNull())
-    {
-        return;
-    }
-
-    LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
-
-    if (floaterp && op == LLTextureCtrl::TEXTURE_SELECT)
-    {
-        LLUUID image_item_id;
-        if (id.notNull())
-        {
-            image_item_id = id;
-        }
-        else
-        {
-            image_item_id = floaterp->findItemID(floaterp->getAssetID(), FALSE, TRUE);
-            if (image_item_id.isNull())
-            {
-                LL_WARNS() << "id or image_item_id is NULL!" << LL_ENDL;
-                return;
-            }
-        }
-
-        std::string image_load_error;
-        S32 max_width = MAX_OUTFIT_PHOTO_WIDTH;
-        S32 max_height = MAX_OUTFIT_PHOTO_HEIGHT;
-        if (mTextureSelected.isNull() ||
-            mTextureSelected->getFullWidth() == 0 ||
-            mTextureSelected->getFullHeight() == 0)
-        {
-            image_load_error = LLTrans::getString("outfit_photo_verify_dimensions_error");
-            LL_WARNS() << "Cannot verify selected texture dimensions" << LL_ENDL;
-            return;
-        }
-        S32 width = mTextureSelected->getFullWidth();
-        S32 height = mTextureSelected->getFullHeight();
-        if ((width > max_width) || (height > max_height))
-        {
-            LLStringUtil::format_map_t args;
-            args["WIDTH"] = llformat("%d", max_width);
-            args["HEIGHT"] = llformat("%d", max_height);
-
-            image_load_error = LLTrans::getString("outfit_photo_select_dimensions_error", args);
-        }
-
-        if (!image_load_error.empty())
-        {
-            LLSD subst;
-            subst["REASON"] = image_load_error;
-            LLNotificationsUtil::add("OutfitPhotoLoadError", subst);
-            return;
-        }
-
-        checkRemovePhoto(selected_outfit_id);
-        linkPhotoToOutfit(image_item_id, selected_outfit_id);
-    }
-}
-
-void LLOutfitGallery::onSelectPhoto(LLUUID selected_outfit_id)
-{
-    if (selected_outfit_id.notNull())
-    {
-
-        // show hourglass cursor when loading inventory window
-        // because inventory construction is slooow
-        getWindow()->setCursor(UI_CURSOR_WAIT);
-        LLFloater* floaterp = mFloaterHandle.get();
-
-        // Show the dialog
-        if (floaterp)
-        {
-            floaterp->openFloater();
-        }
-        else
-        {
-            floaterp = new LLFloaterTexturePicker(
-                this,
-                getPhotoAssetId(selected_outfit_id),
-                getPhotoAssetId(selected_outfit_id),
-                getPhotoAssetId(selected_outfit_id),
-                FALSE,
-                TRUE,
-                "SELECT PHOTO",
-                PERM_NONE,
-                PERM_NONE,
-                PERM_NONE,
-                FALSE,
-                NULL);
-
-            mFloaterHandle = floaterp->getHandle();
-            mTextureSelected = NULL;
-
-            LLFloaterTexturePicker* texture_floaterp = dynamic_cast<LLFloaterTexturePicker*>(floaterp);
-            if (texture_floaterp)
-            {
-                texture_floaterp->setTextureSelectedCallback(boost::bind(&LLOutfitGallery::onTextureSelectionChanged, this, _1));
-                texture_floaterp->setOnFloaterCommitCallback(boost::bind(&LLOutfitGallery::onTexturePickerCommit, this, _1, _2));
-                texture_floaterp->setOnUpdateImageStatsCallback(boost::bind(&LLOutfitGallery::onTexturePickerUpdateImageStats, this, _1));
-                texture_floaterp->setLocalTextureEnabled(FALSE);
-                texture_floaterp->setBakeTextureEnabled(FALSE);
-                texture_floaterp->setCanApply(false, true);
-            }
-
-            floaterp->openFloater();
-        }
-        floaterp->setFocus(TRUE);
-    }
-}
-
-void LLOutfitGallery::onTakeSnapshot(LLUUID selected_outfit_id)
-{
-    LLFloaterReg::toggleInstanceOrBringToFront("simple_snapshot");
-    LLFloaterSimpleSnapshot* snapshot_floater = LLFloaterSimpleSnapshot::getInstance();
-    if (snapshot_floater)
-    {
-        snapshot_floater->setInventoryId(selected_outfit_id);
-    }
-}
-
-void LLOutfitGallery::onBeforeOutfitSnapshotSave()
-{
-    LLUUID selected_outfit_id = getSelectedOutfitUUID();
-    if (!selected_outfit_id.isNull())
-    {
-        checkRemovePhoto(selected_outfit_id);
-        updateSnapshotFolderObserver();
-    }
-}
-
-void LLOutfitGallery::onAfterOutfitSnapshotSave()
-{
-    LLUUID selected_outfit_id = getSelectedOutfitUUID();
-    if (!selected_outfit_id.isNull())
-    {
-        mOutfitLinkPending = selected_outfit_id;
-    }
-}
-
-void LLOutfitGallery::onTexturePickerUpdateImageStats(LLPointer<LLViewerTexture> texture)
-{
-    mTextureSelected = texture;
-}
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 4839477cb2..210e436b96 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -33,7 +33,6 @@
 #include "lllayoutstack.h"
 #include "lloutfitslist.h"
 #include "llpanelappearancetab.h"
-#include "lltexturectrl.h"
 #include "llviewertexture.h"
 
 #include <vector>
@@ -106,14 +105,8 @@ public:
     void updateMessageVisibility();
     bool hasDefaultImage(const LLUUID& outfit_cat_id);
 
-    void refreshTextures(const LLUUID& category_id);
     void refreshOutfit(const LLUUID& category_id);
 
-    void onTexturePickerCommit(LLTextureCtrl::ETexturePickOp op, LLUUID id);
-    void onTexturePickerUpdateImageStats(LLPointer<LLViewerTexture> texture);
-    void onBeforeOutfitSnapshotSave();
-    void onAfterOutfitSnapshotSave();
-
 protected:
     /*virtual*/ void onHighlightBaseOutfit(LLUUID base_id, LLUUID prev_id);
     /*virtual*/ void onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid);
@@ -127,14 +120,10 @@ protected:
     void applyFilter(LLOutfitGalleryItem* item, const std::string& filter_substring);
 
 private:
-    void loadPhotos();
     void uploadPhoto(LLUUID outfit_id);
     void uploadOutfitImage(const std::vector<std::string>& filenames, LLUUID outfit_id);
-    void updateSnapshotFolderObserver();
     LLUUID getPhotoAssetId(const LLUUID& outfit_id);
     LLUUID getDefaultPhoto();
-    void linkPhotoToOutfit(LLUUID outfit_id, LLUUID photo_id);
-    bool checkRemovePhoto(LLUUID outfit_id);
     void addToGallery(LLOutfitGalleryItem* item);
     void removeFromGalleryLast(LLOutfitGalleryItem* item);
     void removeFromGalleryMiddle(LLOutfitGalleryItem* item);
@@ -190,8 +179,6 @@ private:
     
     LLListContextMenu* mOutfitGalleryMenu;
 
-    LLHandle<LLFloater> mFloaterHandle;
-
     typedef std::map<LLUUID, LLOutfitGalleryItem*>      outfit_map_t;
     typedef outfit_map_t::value_type                    outfit_map_value_t;
     outfit_map_t                                        mOutfitMap;
@@ -233,10 +220,6 @@ public:
 protected:
     /*virtual*/ void onUpdateItemsVisibility();
 private:
-    /*virtual*/ void onUploadFoto();
-    /*virtual*/ void onSelectPhoto();
-    /*virtual*/ void onTakeSnapshot();
-    /*virtual*/ void onRemovePhoto();
     /*virtual*/ void onChangeSortOrder();
 
     bool hasDefaultImage();
-- 
cgit v1.2.3


From 4eee501517e756b6bbb942585290b806fc46d278 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 01:41:49 +0200
Subject: SL-19108 Cleanup Outfit Galery #2

---
 indra/newview/lloutfitgallery.cpp                   | 16 +---------------
 indra/newview/lloutfitslist.cpp                     | 11 +++--------
 .../skins/default/xui/en/menu_outfit_gear.xml       | 21 ---------------------
 3 files changed, 4 insertions(+), 44 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 4eb596e0b5..6ef8080d8c 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -36,7 +36,6 @@
 
 #include "llaccordionctrltab.h"
 #include "llappearancemgr.h"
-#include "llagentbenefits.h"
 #include "llerror.h"
 #include "llfilepicker.h"
 #include "llfloaterperms.h"
@@ -888,16 +887,6 @@ bool LLOutfitGalleryContextMenu::onEnable(LLSD::String param)
 
 bool LLOutfitGalleryContextMenu::onVisible(LLSD::String param)
 {
-	mMenuHandle.get()->getChild<LLUICtrl>("upload_photo")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()));
-    if ("remove_photo" == param)
-    {
-        LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-        LLUUID selected_id = mUUIDs.front();
-        if (gallery && selected_id.notNull())
-        {
-            return !gallery->hasDefaultImage(selected_id);
-        }
-    }
     return LLOutfitContextMenu::onVisible(param);
 }
 
@@ -912,10 +901,7 @@ void LLOutfitGalleryGearMenu::onUpdateItemsVisibility()
     bool have_selection = getSelectedOutfitID().notNull();
     mMenu->setItemVisible("expand", FALSE);
     mMenu->setItemVisible("collapse", FALSE);
-    mMenu->setItemVisible("upload_photo", have_selection);
-    mMenu->setItemVisible("select_photo", have_selection);
-    mMenu->setItemVisible("take_snapshot", have_selection);
-    mMenu->setItemVisible("remove_photo", !hasDefaultImage());
+    mMenu->setItemVisible("thumbnail", have_selection);
     mMenu->setItemVisible("sepatator3", TRUE);
     mMenu->setItemVisible("sort_folders_by_name", TRUE);
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 2f7d1c433a..fe15d21e36 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -35,7 +35,6 @@
 #include "llaccordionctrltab.h"
 #include "llagentwearables.h"
 #include "llappearancemgr.h"
-#include "llagentbenefits.h"
 #include "llfloaterreg.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llinventoryfunctions.h"
@@ -1230,7 +1229,6 @@ bool LLOutfitListGearMenuBase::onEnable(LLSD::String param)
 
 bool LLOutfitListGearMenuBase::onVisible(LLSD::String param)
 {
-	getMenu()->getChild<LLUICtrl>("upload_photo")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()));
     const LLUUID& selected_outfit_id = getSelectedOutfitID();
     if (selected_outfit_id.isNull()) // no selection or invalid outfit selected
     {
@@ -1251,8 +1249,8 @@ bool LLOutfitListGearMenuBase::onVisible(LLSD::String param)
 
 void LLOutfitListGearMenuBase::onThumbnail()
 {
-    const LLUUID& selected_outfit_id = getSelectedOutfitID();
-    LLSD data(selected_outfit_id);
+    const LLUUID& selected_outfit_id = getSelectedOutfitID();
+    LLSD data(selected_outfit_id);
     LLFloaterReg::showInstance("change_item_thumbnail", data);
 }
 
@@ -1273,10 +1271,7 @@ void LLOutfitListGearMenu::onUpdateItemsVisibility()
     if (!mMenu) return;
     mMenu->setItemVisible("expand", TRUE);
     mMenu->setItemVisible("collapse", TRUE);
-    mMenu->setItemVisible("upload_photo", FALSE);
-    mMenu->setItemVisible("select_photo", FALSE);
-    mMenu->setItemVisible("take_snapshot", FALSE);
-    mMenu->setItemVisible("remove_photo", FALSE);
+    mMenu->setItemVisible("thumbnail", FALSE); // Never visible?
     mMenu->setItemVisible("sepatator3", FALSE);
     mMenu->setItemVisible("sort_folders_by_name", FALSE);
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 0f7a7e8d56..e216962d12 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -46,27 +46,6 @@
         <on_click
          function="Gear.Thumbnail" />
     </menu_item_call>
-    <menu_item_call
-     label="Select Photo"
-     layout="topleft"
-     name="select_photo">
-        <on_click
-         function="Gear.SelectPhoto" />
-    </menu_item_call>
-    <menu_item_call
-     label="Take a Snapshot"
-     layout="topleft"
-     name="take_snapshot">
-        <on_click
-         function="Gear.TakeSnapshot" />
-    </menu_item_call>
-    <menu_item_call
-     label="Remove Photo"
-     layout="topleft"
-     name="remove_photo">
-        <on_click
-         function="Gear.RemovePhoto" />
-    </menu_item_call>
   <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
-- 
cgit v1.2.3


From 7904649923eddb1291c336ac59b51b78e90c9137 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 20:29:01 +0200
Subject: SL-19105 Update menu items; show items count on selection in
 single-folder mode

---
 indra/newview/llinventorybridge.cpp                |  38 +--
 indra/newview/llpanelmaininventory.cpp             |  10 +-
 .../skins/default/xui/en/menu_inventory.xml        | 326 ++++-----------------
 .../default/xui/en/menu_inventory_gear_default.xml |   2 +-
 4 files changed, 76 insertions(+), 300 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 986ab88cda..db88ca0b9b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4141,12 +4141,6 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 		}
 
 		disabled_items.push_back(std::string("New Folder"));
-		disabled_items.push_back(std::string("New Script"));
-		disabled_items.push_back(std::string("New Note"));
-		disabled_items.push_back(std::string("New Settings"));
-		disabled_items.push_back(std::string("New Gesture"));
-		disabled_items.push_back(std::string("New Clothes"));
-		disabled_items.push_back(std::string("New Body Parts"));
 		disabled_items.push_back(std::string("upload_def"));
 	}
 	if (favorites == mUUID)
@@ -4169,11 +4163,6 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
     if (getPreferredType() == LLFolderType::FT_MARKETPLACE_STOCK)
     {
         disabled_items.push_back(std::string("New Folder"));
-		disabled_items.push_back(std::string("New Script"));
-		disabled_items.push_back(std::string("New Note"));
-		disabled_items.push_back(std::string("New Gesture"));
-		disabled_items.push_back(std::string("New Clothes"));
-		disabled_items.push_back(std::string("New Body Parts"));
 		disabled_items.push_back(std::string("upload_def"));
     }
     if (marketplace_listings_id == mUUID)
@@ -4233,19 +4222,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 				}
                 if (!isMarketplaceListingsFolder())
                 {
-                    items.push_back(std::string("New Script"));
-                    items.push_back(std::string("New Note"));
-                    items.push_back(std::string("New Gesture"));
-                    items.push_back(std::string("New Clothes"));
-                    items.push_back(std::string("New Body Parts"));
-                    items.push_back(std::string("New Settings"));
                     items.push_back(std::string("upload_def"));
-
-                    if (!LLEnvironment::instance().isInventoryEnabled())
-                    {
-                        disabled_items.push_back("New Settings");
-                    }
-
                 }
 			}
 			getClipboardEntries(false, items, disabled_items, flags);
@@ -4411,17 +4388,14 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
         disabled_items.push_back(std::string("New folder from selected"));
     }
 
-    items.push_back(std::string("open_in_new_window"));
-    if ((flags & FIRST_SELECTED_ITEM) == 0)
-    {
-        disabled_items.push_back(std::string("open_in_new_window"));
-    }
-    if(isPanelActive("single_folder_inv"))
+
+    if ((flags & ITEM_IN_MULTI_SELECTION) == 0)
     {
-        items.push_back(std::string("open_in_current_window"));
-        if ((flags & FIRST_SELECTED_ITEM) == 0)
+        items.push_back(std::string("open_in_new_window"));
+        items.push_back(std::string("Open Folder Separator"));
+        if(isPanelActive("single_folder_inv"))
         {
-            disabled_items.push_back(std::string("open_in_current_window"));
+            items.push_back(std::string("open_in_current_window"));
         }
     }
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 5b7678987e..2b32bd649e 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -243,6 +243,7 @@ BOOL LLPanelMainInventory::postBuild()
 
     mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
     mFolderRootChangedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
+    mSingleFolderPanelInventory->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mSingleFolderPanelInventory, _1, _2));
 
 	initListCommandsHandlers();
 
@@ -1652,13 +1653,16 @@ bool LLPanelMainInventory::isActionVisible(const LLSD& userdata)
     {
         return !mSingleFolderMode;
     }
-    if (param_str == "open_folder")
+    if (param_str == "open_folder" || param_str == "open_new_folder")
     {
+        if (!mSingleFolderMode && (param_str == "open_folder")) return false;
+
         LLFolderView* root = getActivePanel()->getRootFolder();
         std::set<LLFolderViewItem*> selection_set = root->getSelectionList();
-        if (selection_set.size() != 1) return FALSE;
+        if (selection_set.size() != 1) return false;
+
         LLFolderViewItem* current_item = *selection_set.begin();
-        if (!current_item) return FALSE;
+        if (!current_item) return false;
         const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
         return (gInventory.getCategory(folder_id) != NULL);
     }
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 97a93245ff..8374e63219 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -159,262 +159,6 @@
          function="Inventory.DoCreate"
          parameter="outfit" />
     </menu_item_call>
-    <menu_item_call
-     label="New Script"
-     layout="topleft"
-     name="New Script">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="lsl" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Notecard"
-     layout="topleft"
-     name="New Note">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="notecard" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Gesture"
-     layout="topleft"
-     name="New Gesture">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="gesture" />
-    </menu_item_call>
-    <menu
-     label="New Clothes"
-     layout="topleft"
-     name="New Clothes">
-        <menu_item_call
-         label="New Shirt"
-         layout="topleft"
-         name="New Shirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Pants"
-         layout="topleft"
-         name="New Pants">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="pants" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Shoes"
-         layout="topleft"
-         name="New Shoes">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shoes" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Socks"
-         layout="topleft"
-         name="New Socks">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="socks" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Jacket"
-         layout="topleft"
-         name="New Jacket">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="jacket" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Skirt"
-         layout="topleft"
-         name="New Skirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="skirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Gloves"
-         layout="topleft"
-         name="New Gloves">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="gloves" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Undershirt"
-         layout="topleft"
-         name="New Undershirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="undershirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Underpants"
-         layout="topleft"
-         name="New Underpants">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="underpants" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Alpha Mask"
-         layout="topleft"
-         name="New Alpha Mask">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="alpha" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Tattoo"
-         layout="topleft"
-         name="New Tattoo">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="tattoo" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Universal"
-         layout="topleft"
-         name="New Universal">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="universal" />
-      </menu_item_call>
-        <menu_item_call
-         label="New Physics"
-         layout="topleft"
-         name="New Physics">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="physics" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="New Body Parts"
-     layout="topleft"
-     name="New Body Parts">
-        <menu_item_call
-         label="New Shape"
-         layout="topleft"
-         name="New Shape">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shape" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Skin"
-         layout="topleft"
-         name="New Skin">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="skin" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Hair"
-         layout="topleft"
-         name="New Hair">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="hair" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Eyes"
-         layout="topleft"
-         name="New Eyes">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="eyes" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="New Settings"
-     layout="topleft"
-     name="New Settings">
-        <menu_item_call
-         label="New Sky"
-         layout="topleft"
-         name="New Sky">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="sky"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Water"
-         layout="topleft"
-         name="New Water">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="water"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Day Cycle"
-         layout="topleft"
-         name="New Day Cycle">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="daycycle"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="Use as default for"
-     layout="topleft"
-     name="upload_def">
-      <menu_item_call
-       label="Image uploads"
-       layout="topleft"
-       name="Image uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="texture" />
-      </menu_item_call>
-      <menu_item_call
-       label="Sound uploads"
-       layout="topleft"
-       name="Sound uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="sound" />
-      </menu_item_call>
-      <menu_item_call
-       label="Animation uploads"
-       layout="topleft"
-       name="Animation uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="animation" />
-      </menu_item_call>
-      <menu_item_call
-       label="Model uploads"
-       layout="topleft"
-       name="Model uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="model" />
-      </menu_item_call>
-    </menu>
-    <menu_item_call
-     label="Open"
-     layout="topleft"
-     name="open_in_current_window">
-      <menu_item_call.on_click
-       function="Inventory.OpenSelectedFolder"/>
-    </menu_item_call>
-    <menu_item_call
-     label="Open in new window"
-     layout="topleft"
-     name="open_in_new_window">
-      <menu_item_call.on_click
-       function="Inventory.OpenNewFolderWindow"/>
-    </menu_item_call>
     <menu
      label="Change Type"
      layout="topleft"
@@ -610,14 +354,6 @@
          function="Inventory.DoToSelected"
          parameter="properties" />
     </menu_item_call>
-    <menu_item_call
-     label="Rename"
-     layout="topleft"
-     name="Rename">
-        <menu_item_call.on_click
-         function="Inventory.DoToSelected"
-         parameter="rename" />
-    </menu_item_call>
     <menu_item_call
      label="Image..."
      layout="topleft"
@@ -645,6 +381,31 @@
     <menu_item_separator
      layout="topleft" 
      name="Copy Separator" />
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+        <menu_item_call.on_click
+         function="Inventory.OpenSelectedFolder"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <menu_item_call.on_click
+         function="Inventory.OpenNewFolderWindow"/>
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Open Folder Separator" />
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="Rename">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="rename" />
+    </menu_item_call>
     <menu_item_call
      label="Cut"
      layout="topleft"
@@ -953,6 +714,43 @@
      function="Inventory.DoToSelected"
      parameter="ungroup_folder_items" />
   </menu_item_call>
+  <menu
+   label="Use as default for"
+   layout="topleft"
+   name="upload_def">
+    <menu_item_call
+     label="Image uploads"
+     layout="topleft"
+     name="Image uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+        parameter="texture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound uploads"
+     layout="topleft"
+     name="Sound uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="sound" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation uploads"
+     layout="topleft"
+     name="Animation uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="animation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model uploads"
+     layout="topleft"
+     name="Model uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="model" />
+    </menu_item_call>
+  </menu>
 	<menu_item_separator
 	 layout="topleft"
 	 name="Marketplace Separator" />
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index e58eaf79a3..f778742ed9 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -26,7 +26,7 @@
          parameter="open_in_new_window" />
         <on_visible
          function="Inventory.GearDefault.Visible"
-         parameter="open_folder" />
+         parameter="open_new_folder" />
     </menu_item_call>
     <menu_item_call
      label="New Folder Window"
-- 
cgit v1.2.3


From e9ba3a1d437935cf7fe0756928896c929758dc54 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 21:18:53 +0200
Subject: SL-19246 FIXED Search text from 'New inventory' applies to Received
 items from main Inventory

---
 indra/newview/llpanelmaininventory.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2b32bd649e..fa40f13d00 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -589,7 +589,7 @@ void LLPanelMainInventory::onClearSearch()
 	}
 	mFilterSubString = "";
 
-	LLSidepanelInventory * sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
+	LLSidepanelInventory * sidepanel_inventory = getParentSidepanelInventory();
 	if (sidepanel_inventory)
 	{
 		LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
@@ -630,7 +630,7 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
 	// set new filter string
 	setFilterSubString(mFilterSubString);
 
-	LLSidepanelInventory * sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
+    LLSidepanelInventory * sidepanel_inventory = getParentSidepanelInventory();
 	if (sidepanel_inventory)
 	{
 		LLPanelMarketplaceInbox* inbox_panel = sidepanel_inventory->getChild<LLPanelMarketplaceInbox>("marketplace_inbox");
-- 
cgit v1.2.3


From 4886682d0458f901fc5b24ed8b58300b93489ac9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 21:28:04 +0200
Subject: SL-19108 Multi instance snapshot floater

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 40 +++++++++++++++++++---
 indra/newview/llfloaterchangeitemthumbnail.h       |  1 +
 indra/newview/llfloatersimplesnapshot.cpp          | 40 ++++++++++++++--------
 indra/newview/llfloatersimplesnapshot.h            |  8 +++--
 indra/newview/llviewermenufile.cpp                 |  7 +---
 .../default/xui/en/floater_simple_snapshot.xml     |  4 +--
 6 files changed, 71 insertions(+), 29 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index a78100374d..ab9d6135f8 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -356,18 +356,41 @@ void LLFloaterChangeItemThumbnail::onUploadLocal(void *userdata)
     {
         floaterp->closeFloater();
     }
+    floaterp = self->mSnapshotHandle.get();
+    if (floaterp)
+    {
+        floaterp->closeFloater();
+    }
 }
 
 void LLFloaterChangeItemThumbnail::onUploadSnapshot(void *userdata)
 {
     LLFloaterChangeItemThumbnail *self = (LLFloaterChangeItemThumbnail*)userdata;
 
-    LLFloaterReg::toggleInstanceOrBringToFront("simple_snapshot");
-    LLFloaterSimpleSnapshot* snapshot_floater = LLFloaterSimpleSnapshot::getInstance();
-    if (snapshot_floater)
+    LLFloater* floaterp = self->mSnapshotHandle.get();
+    // Show the dialog
+    if (floaterp)
+    {
+        floaterp->openFloater();
+    }
+    else
+    {
+        LLSD key;
+        key["item_id"] = self->mItemId;
+        key["task_id"] = self->mTaskId;
+        LLFloaterSimpleSnapshot* snapshot_floater = (LLFloaterSimpleSnapshot*)LLFloaterReg::showInstance("simple_snapshot", key, true);
+        if (snapshot_floater)
+        {
+            self->addDependentFloater(snapshot_floater);
+            self->mSnapshotHandle = snapshot_floater->getHandle();
+            snapshot_floater->setOwner(self);
+        }
+    }
+
+    floaterp = self->mPickerHandle.get();
+    if (floaterp)
     {
-        snapshot_floater->setInventoryId(self->mItemId);
-        snapshot_floater->setTaskId(self->mTaskId);
+        floaterp->closeFloater();
     }
 }
 
@@ -380,6 +403,11 @@ void LLFloaterChangeItemThumbnail::onUseTexture(void *userdata)
         self->showTexturePicker(obj->getThumbnailUUID());
     }
 
+    LLFloater* floaterp = self->mSnapshotHandle.get();
+    if (floaterp)
+    {
+        floaterp->closeFloater();
+    }
 }
 
 void LLFloaterChangeItemThumbnail::onCopyToClipboard(void *userdata)
@@ -482,6 +510,8 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
             texture_floaterp->setBakeTextureEnabled(FALSE);
             texture_floaterp->setCanApplyImmediately(false);
             texture_floaterp->setCanApply(false, true);
+
+            addDependentFloater(texture_floaterp);
         }
 
         floaterp->openFloater();
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index e40d649361..250f895078 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -98,5 +98,6 @@ private:
     LLButton *mRemoveImageBtn;
 
     LLHandle<LLFloater> mPickerHandle;
+    LLHandle<LLFloater> mSnapshotHandle;
 };
 #endif  // LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
index 096db132ac..0bf4bb4fc3 100644
--- a/indra/newview/llfloatersimplesnapshot.cpp
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -228,6 +228,8 @@ void LLFloaterSimpleSnapshot::Impl::setStatus(EStatus status, bool ok, const std
 
 LLFloaterSimpleSnapshot::LLFloaterSimpleSnapshot(const LLSD& key)
     : LLFloaterSnapshotBase(key)
+    , mOwner(NULL)
+    , mContextConeOpacity(0.f)
 {
     impl = new Impl(this);
 }
@@ -249,13 +251,9 @@ BOOL LLFloaterSimpleSnapshot::postBuild()
     LLSnapshotLivePreview::Params p;
     p.rect(full_screen_rect);
     LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(p);
-    LLView* parent_view = gSnapshotFloaterView->getParent();
 
-    parent_view->addChild(previewp);
-
-    //move snapshot floater to special purpose snapshotfloaterview
-    gFloaterView->removeChild(this);
-    gSnapshotFloaterView->addChild(this);
+    // Do not move LLFloaterSimpleSnapshot floater into gSnapshotFloaterView
+    // since it can be a dependednt floater and does not draw UI
 
     impl->mPreviewHandle = previewp->getHandle();
     previewp->setContainer(this);
@@ -275,6 +273,12 @@ const S32 PREVIEW_OFFSET_Y = 70;
 
 void LLFloaterSimpleSnapshot::draw()
 {
+    if (mOwner)
+    {
+        static LLCachedControl<F32> max_opacity(gSavedSettings, "PickerContextOpacity", 0.4f);
+        drawConeToOwner(mContextConeOpacity, max_opacity, mOwner);
+    }
+
     LLSnapshotLivePreview* previewp = getPreviewView();
 
     if (previewp && (previewp->isSnapshotActive() || previewp->getThumbnailLock()))
@@ -323,6 +327,9 @@ void LLFloaterSimpleSnapshot::onOpen(const LLSD& key)
 
     impl->updateControls(this);
     impl->setStatus(ImplBase::STATUS_READY);
+
+    mInventoryId = key["item_id"].asUUID();
+    mTaskId = key["task_id"].asUUID();
 }
 
 void LLFloaterSimpleSnapshot::onCancel()
@@ -406,27 +413,32 @@ void LLFloaterSimpleSnapshot::uploadImageUploadFile(const std::string &temp_file
         boost::bind(post_thumbnail_image_coro, cap_url, temp_file, data));
 }
 
-// static 
 void LLFloaterSimpleSnapshot::update()
 {
-    LLFloaterSimpleSnapshot* inst = findInstance();
-    if (inst != NULL)
+    // initializes snapshots when needed
+    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("simple_snapshot");
+    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin();
+        iter != inst_list.end(); ++iter)
     {
-        inst->impl->updateLivePreview();
+        LLFloaterSimpleSnapshot* floater = dynamic_cast<LLFloaterSimpleSnapshot*>(*iter);
+        if (floater)
+        {
+            floater->impl->updateLivePreview();
+        }
     }
 }
 
 
 // static
-LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::findInstance()
+LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::findInstance(const LLSD &key)
 {
-    return LLFloaterReg::findTypedInstance<LLFloaterSimpleSnapshot>("simple_snapshot");
+    return LLFloaterReg::findTypedInstance<LLFloaterSimpleSnapshot>("simple_snapshot", key);
 }
 
 // static
-LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::getInstance()
+LLFloaterSimpleSnapshot* LLFloaterSimpleSnapshot::getInstance(const LLSD &key)
 {
-    return LLFloaterReg::getTypedInstance<LLFloaterSimpleSnapshot>("simple_snapshot");
+    return LLFloaterReg::getTypedInstance<LLFloaterSimpleSnapshot>("simple_snapshot", key);
 }
 
 void LLFloaterSimpleSnapshot::saveTexture()
diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
index 59cb526704..1b51325afc 100644
--- a/indra/newview/llfloatersimplesnapshot.h
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -50,8 +50,8 @@ public:
 
     static void update();
 
-    static LLFloaterSimpleSnapshot* getInstance();
-    static LLFloaterSimpleSnapshot* findInstance();
+    static LLFloaterSimpleSnapshot* getInstance(const LLSD &key);
+    static LLFloaterSimpleSnapshot* findInstance(const LLSD &key);
     void saveTexture();
 
     const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }
@@ -59,6 +59,7 @@ public:
     void setInventoryId(const LLUUID &inventory_id) { mInventoryId = inventory_id; }
     LLUUID getInventoryId() { return mInventoryId; }
     void setTaskId(const LLUUID &task_id) { mTaskId = task_id; }
+    void setOwner(LLView *owner_view) { mOwner = owner_view; }
 
     void postSave();
     static void uploadThumbnail(const std::string &file_path, const LLUUID &inventory_id, const LLUUID &task_id);
@@ -75,6 +76,9 @@ private:
 
     LLUUID mInventoryId;
     LLUUID mTaskId;
+
+    LLView* mOwner;
+    F32	 mContextConeOpacity;
 };
 
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index ab8ec8a288..6c07c28d81 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -664,9 +664,7 @@ class LLFileEnableCloseAllWindows : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
-		LLFloaterSimpleSnapshot* floater_outfit_snapshot = LLFloaterSimpleSnapshot::findInstance();
-		bool is_floaters_snapshot_opened = (floater_snapshot && floater_snapshot->isInVisibleChain())
-			|| (floater_outfit_snapshot && floater_outfit_snapshot->isInVisibleChain());
+		bool is_floaters_snapshot_opened = (floater_snapshot && floater_snapshot->isInVisibleChain());
 		bool open_children = gFloaterView->allChildrenClosed() && !is_floaters_snapshot_opened;
 		return !open_children && !LLNotificationsUI::LLToast::isAlertToastShown();
 	}
@@ -681,9 +679,6 @@ class LLFileCloseAllWindows : public view_listener_t
 		LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
 		if (floater_snapshot)
 			floater_snapshot->closeFloater(app_quitting);
-        LLFloaterSimpleSnapshot* floater_outfit_snapshot = LLFloaterSimpleSnapshot::findInstance();
-		if (floater_outfit_snapshot)
-			floater_outfit_snapshot->closeFloater(app_quitting);
 		if (gMenuHolder) gMenuHolder->hideMenus();
 		return true;
 	}
diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index 97ea59593e..484ad159d1 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -2,13 +2,13 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- can_minimize="true"
+ can_minimize="false"
  can_resize="false"
  can_close="true"
  height="305"
  layout="topleft"
  name="simple_snapshot"
- single_instance="true"
+ single_instance="false"
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
-- 
cgit v1.2.3


From a2c61cfe35cfe3edb6fcedc09e9529c9a2940ed0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Feb 2023 21:40:23 +0200
Subject: SL-19108 Remove grey background fron name in 'change item thumbnail'

---
 .../skins/default/xui/en/floater_change_item_thumbnail.xml    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 9657290f1f..f5c266c553 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -38,24 +38,21 @@
     height="16"
     image_name="Inv_Object"
     layout="topleft"
-    left="7"
+    left="10"
     mouse_opaque="true"
     name="item_type_icon"
     top="4"
     width="16" />
-  <line_editor
-    border_style="line"
-    border_thickness="1"
+  <text
     follows="left|top|right"
     font="SansSerif"
     height="19"
     layout="topleft"
-    top_delta="-1"
+    top_delta="1"
     left_pad="3"
     max_length_bytes="127"
     name="item_name"
-    width="286"
-    enabled="false"/>
+    width="286"/>
 
   <thumbnail
     name="item_thumbnail"
-- 
cgit v1.2.3


From fe21f3fdf1e98eb2393449963f6bfd97b1885d44 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 23 Feb 2023 11:58:17 +0200
Subject: SL-19252 Remove "#ifdef _CORY_TESTING" code

---
 indra/newview/llfilepicker.cpp     | 34 ----------------------------------
 indra/newview/llfilepicker.h       |  6 ------
 indra/newview/llviewermenu.cpp     |  4 ----
 indra/newview/llviewermenufile.cpp |  7 -------
 indra/newview/llvovolume.cpp       |  4 ++--
 5 files changed, 2 insertions(+), 53 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index e3a695fc79..7379ac0da4 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -55,9 +55,6 @@ LLFilePicker LLFilePicker::sInstance;
 #define IMAGE_FILTER L"Images (*.tga; *.bmp; *.jpg; *.jpeg; *.png)\0*.tga;*.bmp;*.jpg;*.jpeg;*.png\0"
 #define ANIM_FILTER L"Animations (*.bvh; *.anim)\0*.bvh;*.anim\0"
 #define COLLADA_FILTER L"Scene (*.dae)\0*.dae\0"
-#ifdef _CORY_TESTING
-#define GEOMETRY_FILTER L"SL Geometry (*.slg)\0*.slg\0"
-#endif
 #define XML_FILTER L"XML files (*.xml)\0*.xml\0"
 #define SLOBJECT_FILTER L"Objects (*.slobject)\0*.slobject\0"
 #define RAW_FILTER L"RAW files (*.raw)\0*.raw\0"
@@ -197,12 +194,6 @@ BOOL LLFilePicker::setupFilter(ELoadFilter filter)
 		mOFN.lpstrFilter = COLLADA_FILTER \
 			L"\0";
 		break;
-#ifdef _CORY_TESTING
-	case FFLOAD_GEOMETRY:
-		mOFN.lpstrFilter = GEOMETRY_FILTER \
-			L"\0";
-		break;
-#endif
 	case FFLOAD_XML:
 		mOFN.lpstrFilter = XML_FILTER \
 			L"\0";
@@ -480,18 +471,6 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename,
 			L"XAF Anim File (*.xaf)\0*.xaf\0" \
 			L"\0";
 		break;
-#ifdef _CORY_TESTING
-	case FFSAVE_GEOMETRY:
-		if (filename.empty())
-		{
-			wcsncpy( mFilesW,L"untitled.slg", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
-		}
-		mOFN.lpstrDefExt = L"slg";
-		mOFN.lpstrFilter =
-			L"SLG SL Geometry File (*.slg)\0*.slg\0" \
-			L"\0";
-		break;
-#endif
 	case FFSAVE_XML:
 		if (filename.empty())
 		{
@@ -624,11 +603,6 @@ std::unique_ptr<std::vector<std::string>> LLFilePicker::navOpenFilterProc(ELoadF
         case FFLOAD_COLLADA:
             allowedv->push_back("dae");
             break;
-#ifdef _CORY_TESTING
-        case FFLOAD_GEOMETRY:
-            allowedv->push_back("slg");
-            break;
-#endif
         case FFLOAD_XML:
             allowedv->push_back("xml");
             break;
@@ -727,14 +701,6 @@ bool	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena
 			creator = "\?\?\?\?";
 			extension = "xaf";
 			break;
-
-#ifdef _CORY_TESTING
-		case FFSAVE_GEOMETRY:
-			type = "\?\?\?\?";
-			creator = "\?\?\?\?";
-			extension = "slg";
-			break;
-#endif	
 			
 		case FFSAVE_XML:
 			type = "\?\?\?\?";
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 73baeca1c0..8f2274024c 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -77,9 +77,6 @@ public:
 		FFLOAD_WAV = 2,
 		FFLOAD_IMAGE = 3,
 		FFLOAD_ANIM = 4,
-#ifdef _CORY_TESTING
-		FFLOAD_GEOMETRY = 5,
-#endif
 		FFLOAD_XML = 6,
 		FFLOAD_SLOBJECT = 7,
 		FFLOAD_RAW = 8,
@@ -99,9 +96,6 @@ public:
 		FFSAVE_BMP = 5,
 		FFSAVE_AVI = 6,
 		FFSAVE_ANIM = 7,
-#ifdef _CORY_TESTING
-		FFSAVE_GEOMETRY = 8,
-#endif
 		FFSAVE_XML = 9,
 		FFSAVE_COLLADA = 10,
 		FFSAVE_RAW = 11,
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a0223a5dbb..8177353083 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -276,10 +276,6 @@ void handle_object_owner_permissive(void*);
 void handle_object_lock(void*);
 void handle_object_asset_ids(void*);
 void force_take_copy(void*);
-#ifdef _CORY_TESTING
-void force_export_copy(void*);
-void force_import_geometry(void*);
-#endif
 
 void handle_force_parcel_owner_to_me(void*);
 void handle_force_parcel_to_content(void*);
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index fdf1d04c09..f9ec1115a6 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -277,9 +277,6 @@ void LLMediaFilePicker::notify(const std::vector<std::string>& filenames)
 static std::string SOUND_EXTENSIONS = "wav";
 static std::string IMAGE_EXTENSIONS = "tga bmp jpg jpeg png";
 static std::string ANIM_EXTENSIONS =  "bvh anim";
-#ifdef _CORY_TESTING
-static std::string GEOMETRY_EXTENSIONS = "slg";
-#endif
 static std::string XML_EXTENSIONS = "xml";
 static std::string SLOBJECT_EXTENSIONS = "slobject";
 #endif
@@ -301,10 +298,6 @@ std::string build_extensions_string(LLFilePicker::ELoadFilter filter)
 		return SLOBJECT_EXTENSIONS;
 	case LLFilePicker::FFLOAD_MODEL:
 		return MODEL_EXTENSIONS;
-#ifdef _CORY_TESTING
-	case LLFilePicker::FFLOAD_GEOMETRY:
-		return GEOMETRY_EXTENSIONS;
-#endif
 	case LLFilePicker::FFLOAD_XML:
 	    return XML_EXTENSIONS;
     case LLFilePicker::FFLOAD_ALL:
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 108f5cd1d3..b910c4f93c 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5856,9 +5856,9 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 								add_face(sAlphaFaces, alpha_count, facep);
 							}
 							else if (LLDrawPoolAlpha::sShowDebugAlpha ||
-								gPipeline.sRenderHighlight &&
+								(gPipeline.sRenderHighlight &&
 								(LLPipeline::getRenderScriptedBeacons() || LLPipeline::getRenderScriptedTouchBeacons()) &&
-								drawablep->getVObj() && drawablep->getVObj()->flagScripted())
+								drawablep->getVObj() && drawablep->getVObj()->flagScripted()))
 							{ //draw the transparent face for debugging purposes using a custom texture
 								add_face(sAlphaFaces, alpha_count, facep);
 							}
-- 
cgit v1.2.3


From 49da5288bd0425241823186bfd56a159fe2f9a60 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Feb 2023 03:05:30 +0200
Subject: SL-19234 add Inventory settings floater

---
 indra/llui/llfolderviewitem.cpp                    |  10 +-
 indra/llui/llfolderviewmodel.h                     |   2 +-
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/app_settings/settings.xml            |  33 ++++
 indra/newview/llconversationmodel.h                |   2 +-
 indra/newview/llfloaterinventorysettings.cpp       |  44 ++++++
 indra/newview/llfloaterinventorysettings.h         |  45 ++++++
 indra/newview/llinventorybridge.cpp                |  31 ++--
 indra/newview/llinventorybridge.h                  |   2 +-
 indra/newview/llinventoryfunctions.cpp             |  22 ++-
 indra/newview/llinventorypanel.cpp                 |   6 +-
 indra/newview/llinventorypanel.h                   |   2 +-
 indra/newview/llpanelmaininventory.cpp             |   8 +-
 indra/newview/llpanelmaininventory.h               |   2 +-
 indra/newview/llpanelobjectinventory.cpp           |   2 +-
 indra/newview/llviewerfloaterreg.cpp               |   2 +
 indra/newview/llviewermenu.cpp                     |   2 +-
 .../default/xui/en/floater_inventory_settings.xml  | 169 +++++++++++++++++++++
 .../default/xui/en/menu_inventory_view_default.xml |  14 +-
 19 files changed, 368 insertions(+), 32 deletions(-)
 create mode 100644 indra/newview/llfloaterinventorysettings.cpp
 create mode 100644 indra/newview/llfloaterinventorysettings.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_inventory_settings.xml

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index c7e47e26e0..4a9ac56d9f 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -2066,15 +2066,23 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
 	BOOL handled = FALSE;
     if(mSingleFolderMode)
     {
-        getViewModelItem()->navigateToFolder();
+        static LLUICachedControl<bool> double_click_new_window("SingleModeDoubleClickOpenWindow", false);
+        getViewModelItem()->navigateToFolder(double_click_new_window);
         return TRUE;
     }
+
 	if( isOpen() )
 	{
 		handled = childrenHandleDoubleClick( x, y, mask ) != NULL;
 	}
 	if( !handled )
 	{
+        static LLUICachedControl<bool> double_click_new_window("MultiModeDoubleClickOpenWindow", false);
+        if (double_click_new_window)
+        {
+            getViewModelItem()->navigateToFolder(true);
+            return TRUE;
+        }
 		if(mIndentation < x && x < mIndentation + (isCollapsed() ? 0 : mArrowSize) + mTextPad)
 		{
 			// don't select when user double-clicks plus sign
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index 7a18ed4a45..b1db9489fd 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -160,7 +160,7 @@ public:
 	virtual void closeItem( void ) = 0;
 	virtual void selectItem(void) = 0;
 
-    virtual void navigateToFolder() = 0;
+    virtual void navigateToFolder(bool new_window = false) = 0;
     
     virtual BOOL isItemWearable() const { return FALSE; }
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 08cce23852..7c30d8eba8 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -270,6 +270,7 @@ set(viewer_SOURCE_FILES
     llfloaterimsession.cpp
     llfloaterimcontainer.cpp
     llfloaterinspect.cpp
+    llfloaterinventorysettings.cpp
     llfloaterjoystick.cpp
     llfloaterlagmeter.cpp
     llfloaterland.cpp
@@ -914,6 +915,7 @@ set(viewer_HEADER_FILES
     llfloaterimsession.h
     llfloaterimcontainer.h
     llfloaterinspect.h
+    llfloaterinventorysettings.h
     llfloaterjoystick.h
     llfloaterlagmeter.h
     llfloaterland.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 411f77e6a7..3a896b4f5f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16898,5 +16898,38 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>FindOriginalOpenWindow</key>
+  <map>
+    <key>Comment</key>
+    <string>Sets the action for 'Find original' and 'Show in Inventory' (0 - shows item in main Inventory, 1 - opens a new single-folder window)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+<key>MultiModeDoubleClickOpenWindow</key>
+<map>
+  <key>Comment</key>
+  <string>Sets the action for Double-click on folder in multi-folder view (0 - expands and collapses folder, 1 - opens a new window)</string>
+  <key>Persist</key>
+  <integer>1</integer>
+  <key>Type</key>
+  <string>Boolean</string>
+  <key>Value</key>
+  <integer>0</integer>
+</map>
+<key>SingleModeDoubleClickOpenWindow</key>
+<map>
+  <key>Comment</key>
+  <string>Sets the action for Double-click on folder in single-folder view (0 - stays in current window, 1 - opens a new window)</string>
+  <key>Persist</key>
+  <integer>1</integer>
+  <key>Type</key>
+  <string>Boolean</string>
+  <key>Value</key>
+  <integer>0</integer>
+</map>
 </map>
 </llsd>
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 5999ab3925..c7da060f33 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -111,7 +111,7 @@ public:
 	virtual void previewItem( void );
 	virtual void selectItem(void) { } 
 	virtual void showProperties(void);
-    virtual void navigateToFolder() {}
+    virtual void navigateToFolder(bool new_window = false) {}
 
 	// Methods used in sorting (see LLConversationSort::operator())
 	EConversationType const getType() const { return mConvType; }
diff --git a/indra/newview/llfloaterinventorysettings.cpp b/indra/newview/llfloaterinventorysettings.cpp
new file mode 100644
index 0000000000..29d6e90a33
--- /dev/null
+++ b/indra/newview/llfloaterinventorysettings.cpp
@@ -0,0 +1,44 @@
+/**
+ * @file llfloaterinventorysettings.cpp
+ * @brief LLFloaterInventorySettings class implementation
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterinventorysettings.h"
+
+LLFloaterInventorySettings::LLFloaterInventorySettings(const LLSD& key)
+  : LLFloater(key)
+{
+}
+
+LLFloaterInventorySettings::~LLFloaterInventorySettings()
+{}
+
+BOOL LLFloaterInventorySettings::postBuild()
+{
+    getChild<LLButton>("ok_btn")->setCommitCallback(boost::bind(&LLFloater::closeFloater, this, false));
+    return TRUE;
+}
+
diff --git a/indra/newview/llfloaterinventorysettings.h b/indra/newview/llfloaterinventorysettings.h
new file mode 100644
index 0000000000..50304276c7
--- /dev/null
+++ b/indra/newview/llfloaterinventorysettings.h
@@ -0,0 +1,45 @@
+/**
+ * @file llfloaterinventorysettings.h
+ * @brief LLFloaterInventorySettings class definition
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERINVENTORYSETTINGS_H
+#define LL_LLFLOATERINVENTORYSETTINGS_H
+
+#include "llfloater.h"
+
+class LLFloaterInventorySettings
+    :    public LLFloater
+{
+    friend class LLFloaterReg;
+
+public:
+    virtual BOOL postBuild();
+
+private:
+    LLFloaterInventorySettings(const LLSD& key);
+    ~LLFloaterInventorySettings();
+};
+
+#endif
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index db88ca0b9b..f7b7a6635e 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -413,23 +413,30 @@ void LLInvFVBridge::showProperties()
     }
 }
 
-void LLInvFVBridge::navigateToFolder()
+void LLInvFVBridge::navigateToFolder(bool new_window)
 {
-    LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get());
-    if (!panel)
-    {
-        return;
-    }
-    LLInventoryModel* model = getInventoryModel();
-    if (!model)
+    if(new_window)
     {
-        return;
+        mInventoryPanel.get()->openSingleViewInventory(mUUID);
     }
-    if (mUUID.isNull())
+    else
     {
-        return;
+        LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get());
+        if (!panel)
+        {
+            return;
+        }
+        LLInventoryModel* model = getInventoryModel();
+        if (!model)
+        {
+            return;
+        }
+        if (mUUID.isNull())
+        {
+            return;
+        }
+        panel->changeFolderRoot(mUUID);
     }
-    panel->changeFolderRoot(mUUID);
 }
 
 void LLInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch)
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 39dd268115..b2cc33aadd 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -107,7 +107,7 @@ public:
 	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
 	virtual void openItem() {}
 	virtual void closeItem() {}
-    virtual void navigateToFolder();
+    virtual void navigateToFolder(bool new_window = false);
 	virtual void showProperties();
 	virtual BOOL isItemRenameable() const { return TRUE; }
 	virtual BOOL isMultiPreviewAllowed() { return TRUE; }
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 5e5be39c0c..15916ffaba 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -781,7 +781,22 @@ void show_item_profile(const LLUUID& item_uuid)
 
 void show_item_original(const LLUUID& item_uuid)
 {
-    LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
+    static LLUICachedControl<bool> find_original_new_floater("FindOriginalOpenWindow", false);
+
+    //show in a new single-folder window
+    if(find_original_new_floater)
+    {
+        const LLUUID& linked_item_uuid = gInventory.getLinkedItemID(item_uuid);
+        const LLInventoryObject *obj = gInventory.getObject(linked_item_uuid);
+        if (obj && obj->getParentUUID().notNull())
+        {
+            LLPanelMainInventory::newFolderWindow(obj->getParentUUID(), linked_item_uuid);
+        }
+    }
+    //show in main Inventory
+    else
+    {
+        LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
     if (!floater_inventory)
     {
         LL_WARNS() << "Could not find My Inventory floater" << LL_ENDL;
@@ -793,6 +808,10 @@ void show_item_original(const LLUUID& item_uuid)
         LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
         if (main_inventory)
         {
+            if(main_inventory->isSingleFolderMode())
+            {
+                main_inventory->onViewModeClick();
+            }
             main_inventory->resetFilters();
         }
         reset_inventory_filter();
@@ -820,6 +839,7 @@ void show_item_original(const LLUUID& item_uuid)
             }
         }
     }
+    }
 }
 
 
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 91fa856d5e..80d9b69937 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -183,7 +183,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this));
 	mCommitCallbackRegistrar.add("Inventory.Share",  boost::bind(&LLAvatarActions::shareWithAvatars, this));
 	mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryPanel::fileUploadLocation, this, _2));
-    mCommitCallbackRegistrar.add("Inventory.OpenNewFolderWindow", boost::bind(&LLInventoryPanel::openSingleViewInventory, this, _2));
+    mCommitCallbackRegistrar.add("Inventory.OpenNewFolderWindow", boost::bind(&LLInventoryPanel::openSingleViewInventory, this, LLUUID()));
 }
 
 LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
@@ -1644,9 +1644,9 @@ void LLInventoryPanel::fileUploadLocation(const LLSD& userdata)
     }
 }
 
-void LLInventoryPanel::openSingleViewInventory(const LLSD& userdata)
+void LLInventoryPanel::openSingleViewInventory(LLUUID folder_id)
 {
-    LLPanelMainInventory::newFolderWindow(LLFolderBridge::sSelf.get()->getUUID());
+    LLPanelMainInventory::newFolderWindow(folder_id.isNull() ? LLFolderBridge::sSelf.get()->getUUID() : folder_id);
 }
 
 void LLInventoryPanel::purgeSelectedItems()
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 981bef62a8..baaefe5dd7 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -222,7 +222,7 @@ public:
 	void doCreate(const LLSD& userdata);
 	bool beginIMSession();
 	void fileUploadLocation(const LLSD& userdata);
-    void openSingleViewInventory(const LLSD& userdata);
+    void openSingleViewInventory(LLUUID folder_id = LLUUID());
 	void purgeSelectedItems();
 	bool attachObject(const LLSD& userdata);
 	static void idle(void* user_data);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index fa40f13d00..0fd4eb0c15 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -411,7 +411,7 @@ void LLPanelMainInventory::newWindow()
 	}
 }
 
-void LLPanelMainInventory::newFolderWindow(const LLUUID& folder_id)
+void LLPanelMainInventory::newFolderWindow(LLUUID folder_id, LLUUID item_to_select)
 {
     S32 instance_num = get_instance_num();
 
@@ -428,6 +428,10 @@ void LLPanelMainInventory::newFolderWindow(const LLUUID& folder_id)
                 if(folder_id.notNull())
                 {
                     main_inventory->setSingleFolderViewRoot(folder_id);
+                    if(item_to_select.notNull())
+                    {
+                        sidepanel_inventory->getActivePanel()->setSelection(item_to_select, TAKE_FOCUS_YES);
+                    }
                 }
             }
         }
@@ -1368,7 +1372,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 	const std::string command_name = userdata.asString();
     if (command_name == "new_single_folder_window")
     {
-        newFolderWindow(LLUUID());
+        newFolderWindow();
     }
     if ((command_name == "open_in_current_window") || (command_name == "open_in_new_window"))
     {
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index e5262540cf..85373d7de3 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -94,7 +94,7 @@ public:
 	void setFocusFilterEditor();
 
 	static void newWindow();
-    static void newFolderWindow(const LLUUID& folder_id);
+    static void newFolderWindow(LLUUID folder_id = LLUUID(), LLUUID item_to_select = LLUUID());
 
 	void toggleFindOptions();
 
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index c9169fdc8f..c22915c3ab 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -125,7 +125,7 @@ public:
 	virtual BOOL canOpenItem() const { return FALSE; }
 	virtual void closeItem() {}
 	virtual void selectItem() {}
-    virtual void navigateToFolder() {}
+    virtual void navigateToFolder(bool new_window = false) {}
 	virtual BOOL isItemRenameable() const;
 	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL isItemMovable() const;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 4d51d56569..581c6779ab 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -85,6 +85,7 @@
 #include "llfloaterimagepreview.h"
 #include "llfloaterimsession.h"
 #include "llfloaterinspect.h"
+#include "llfloaterinventorysettings.h"
 #include "llfloaterjoystick.h"
 #include "llfloaterlagmeter.h"
 #include "llfloaterland.h"
@@ -373,6 +374,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("inspect", "floater_inspect.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInspect>);
 	LLFloaterReg::add("item_properties", "floater_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterItemProperties>);
     LLFloaterReg::add("task_properties", "floater_task_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterItemProperties>);
+    LLFloaterReg::add("inventory_settings", "floater_inventory_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInventorySettings>);
 	LLInspectAvatarUtil::registerFloater();
 	LLInspectGroupUtil::registerFloater();
 	LLInspectObjectUtil::registerFloater();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 09fd4b04cb..19930e0e03 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9703,7 +9703,7 @@ void initialize_menus()
 	commit.add("PayObject", boost::bind(&handle_give_money_dialog));
 
 	commit.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow));
-    commit.add("Inventory.NewFolderWindow", boost::bind(&LLPanelMainInventory::newFolderWindow, LLUUID()));
+    commit.add("Inventory.NewFolderWindow", boost::bind(&LLPanelMainInventory::newFolderWindow, LLUUID(), LLUUID()));
 
 	enable.add("EnablePayObject", boost::bind(&enable_pay_object));
 	enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar));
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
new file mode 100644
index 0000000000..c3e81a5523
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_minimize="true"
+ can_resize="false"
+ save_rect="true"
+ height="350"
+ width="370"
+ name="inventory_settings"
+ title="Inventory settings">
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Multi_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="multi_folder_icon"
+  top="25"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="multi_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in multi-folder view:
+ </text>
+ <radio_group
+  control_name="MultiModeDoubleClickOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="multi_double_click_setting">
+     <radio_item
+      height="20"
+      label="Expands &amp; collapses folder"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Single_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="single_folder_icon"
+  top_pad="30"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="single_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in single-folder view:
+ </text>
+ <radio_group
+  control_name="SingleModeDoubleClickOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="single_double_click_setting">
+     <radio_item
+      height="20"
+      label="Stays in current window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left="48"
+   name="find_original_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   top_pad="30"
+   width="300">
+   Clicking on "Show in inventory" or "Find original"
+ </text>
+ <radio_group
+  control_name="FindOriginalOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="find_original_settings">
+     <radio_item
+      height="20"
+      label="Shows item in main inventory window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new single-folder window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <button
+  height="20"
+  label="OK"
+  layout="topleft"
+  left="140"
+  bottom="-20"
+  name="ok_btn"
+  label_color="White"
+  width="90" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index b89ff832b9..c7f9822e41 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -101,12 +101,14 @@
          parameter="single_folder_view" />
     </menu_item_check>
     <menu_item_separator/>
-    <menu_item_call
+    <menu_item_check
      label="Inventory settings..."
-     layout="topleft"
      name="inv_settings">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="inv_settings" />
-    </menu_item_call>
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="inventory_settings" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="inventory_settings" />
+    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 2b56570c6867dc39aa4c8a19d2657ffed6c596b2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Feb 2023 12:51:03 +0200
Subject: SL-19108 Fallback thumbnail

---
 indra/newview/llthumbnailctrl.cpp                  |  28 ++++++++++++++++++++-
 indra/newview/llthumbnailctrl.h                    |   2 ++
 .../textures/icons/thumbnail_fallback_icon.png     | Bin 0 -> 6162 bytes
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../xui/en/floater_change_item_thumbnail.xml       |   1 +
 .../skins/default/xui/en/sidepanel_item_info.xml   |   1 +
 6 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png

(limited to 'indra')

diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
index 4245237529..1b054b4c27 100644
--- a/indra/newview/llthumbnailctrl.cpp
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -43,6 +43,7 @@ static LLDefaultChildRegistry::Register<LLThumbnailCtrl> r("thumbnail");
 LLThumbnailCtrl::Params::Params()
 : border("border")
 , border_color("border_color")
+, fallback_image("fallback_image")
 , image_name("image_name")
 , border_visible("show_visible", false)
 , interactable("interactable", false)
@@ -53,6 +54,7 @@ LLThumbnailCtrl::LLThumbnailCtrl(const LLThumbnailCtrl::Params& p)
 :	LLUICtrl(p)
 ,   mBorderColor(p.border_color())
 ,   mBorderVisible(p.border_visible())
+,   mFallbackImagep(p.fallback_image)
 ,   mInteractable(p.interactable())
 ,   mShowLoadingPlaceholder(p.show_loading())
 ,	mPriority(LLGLTexture::BOOST_PREVIEW)
@@ -76,6 +78,7 @@ LLThumbnailCtrl::~LLThumbnailCtrl()
 {
 	mTexturep = nullptr;
     mImagep = nullptr;
+    mFallbackImagep = nullptr;
 }
 
 
@@ -106,7 +109,30 @@ void LLThumbnailCtrl::draw()
     }
     else if( mImagep.notNull() )
     {
-        mImagep->draw(getLocalRect(), UI_VERTEX_COLOR % alpha );
+        mImagep->draw(draw_rect, UI_VERTEX_COLOR % alpha );
+    }
+    else if (mFallbackImagep.notNull())
+    {
+        if (draw_rect.getWidth() > mFallbackImagep->getWidth()
+            && draw_rect.getHeight() > mFallbackImagep->getHeight())
+        {
+            S32 img_width = mFallbackImagep->getWidth();
+            S32 img_height = mFallbackImagep->getHeight();
+            S32 rect_width = draw_rect.getWidth();
+            S32 rect_height = draw_rect.getHeight();
+
+            LLRect fallback_rect;
+            fallback_rect.mLeft = draw_rect.mLeft + (rect_width - img_width) / 2;
+            fallback_rect.mRight = fallback_rect.mLeft + img_width;
+            fallback_rect.mBottom = draw_rect.mBottom + (rect_height - img_height) / 2;
+            fallback_rect.mTop = fallback_rect.mBottom + img_height;
+
+            mFallbackImagep->draw(fallback_rect, UI_VERTEX_COLOR % alpha);
+        }
+        else
+        {
+            mFallbackImagep->draw(draw_rect, UI_VERTEX_COLOR % alpha);
+        }
     }
     else
     {
diff --git a/indra/newview/llthumbnailctrl.h b/indra/newview/llthumbnailctrl.h
index 978da8d71c..dc21046841 100644
--- a/indra/newview/llthumbnailctrl.h
+++ b/indra/newview/llthumbnailctrl.h
@@ -49,6 +49,7 @@ public:
         Optional<LLViewBorder::Params> border;
         Optional<LLUIColor>        border_color;
         Optional<std::string>      image_name;
+        Optional<LLUIImage*>       fallback_image;
         Optional<bool>             border_visible;
         Optional<bool>             interactable;
         Optional<bool>             show_loading;
@@ -80,6 +81,7 @@ private:
     
 	LLPointer<LLViewerFetchedTexture> mTexturep;
     LLPointer<LLUIImage> mImagep;
+    LLPointer<LLUIImage> mFallbackImagep;
 };
 
 #endif
diff --git a/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png b/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png
new file mode 100644
index 0000000000..8d5ca624af
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 5d9c362e78..424fc851fd 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -690,6 +690,7 @@ with the same filename but different name
   <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Search_Highlight" file_name="widgets/TextField_Search_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
+  <texture name="Thumbnail_Fallback" file_name="icons/thumbnail_fallback_icon.png" preload="true" />
 
   <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
   <texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true"
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index f5c266c553..95e868a696 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -56,6 +56,7 @@
 
   <thumbnail
     name="item_thumbnail"
+    fallback_image="Thumbnail_Fallback"
     follows="top|left"
     layout="topleft"
     left="32"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index f755ec0ec4..ad521cb1af 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -93,6 +93,7 @@
       
       <thumbnail
         name="item_thumbnail"
+        fallback_image="Thumbnail_Fallback"
         follows="top|left"
         layout="topleft"
         left="5"
-- 
cgit v1.2.3


From dd656390c3b6cbdfc6e88c8ff3e6a011238b6f6e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 25 Feb 2023 23:08:38 +0200
Subject: SL-19108 Only permit 64 to 256 px images for thumbnails

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 60 +++++++++++++++++++---
 indra/newview/llfloaterchangeitemthumbnail.h       |  2 +
 indra/newview/llfloatersimplesnapshot.cpp          | 11 ++--
 indra/newview/llfloatersimplesnapshot.h            |  3 ++
 indra/newview/llsnapshotlivepreview.cpp            | 12 ++++-
 indra/newview/llsnapshotlivepreview.h              |  2 +-
 indra/newview/llviewertexturelist.cpp              | 13 ++++-
 indra/newview/llviewertexturelist.h                |  3 +-
 .../xui/en/floater_change_item_thumbnail.xml       |  9 ++--
 .../newview/skins/default/xui/en/notifications.xml | 11 ++++
 10 files changed, 106 insertions(+), 20 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index ab9d6135f8..cdb09f4c6c 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -324,9 +324,12 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
                         LL_INFOS() << "Setting image from outfit as a thumbnail" << LL_ENDL;
                         thumbnail_id = item->getAssetUUID();
 
-                        // per SL-19188, set this image as a thumbnail
-                        cat->setThumbnailUUID(thumbnail_id);
-                        // todo: needs to trigger send/update once server support is done
+                        if (validateAsset(thumbnail_id))
+                        {
+                            // per SL-19188, set this image as a thumbnail
+                            cat->setThumbnailUUID(thumbnail_id);
+                            // todo: needs to trigger send/update once server support is done
+                        }
                     }
                 }
             }
@@ -430,8 +433,16 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
         LLInventoryObject* obj = self->getInventoryObject();
         if (obj)
         {
-            obj->setThumbnailUUID(objects[0]);
-            // todo: need to trigger send/update once server support is done
+            LLUUID asset_id = objects[0];
+            if (validateAsset(asset_id))
+            {
+                obj->setThumbnailUUID(asset_id);
+                // todo: need to trigger send/update once server support is done
+            }
+            else
+            {
+                LLNotificationsUtil::add("ThumbnailDimantionsLimit");
+            }
         }
     }
 }
@@ -463,6 +474,33 @@ void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notificatio
     }
 }
 
+bool LLFloaterChangeItemThumbnail::validateAsset(const LLUUID &asset_id)
+{
+    LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::getFetchedTexture(asset_id);
+
+    if (!texturep)
+    {
+        return false;
+    }
+
+    if (texturep->getFullWidth() != texturep->getFullHeight())
+    {
+        return false;
+    }
+
+    if (texturep->getFullWidth() > LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX
+        || texturep->getFullHeight() > LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX)
+    {
+        return false;
+    }
+
+    if (texturep->getFullWidth() < LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN
+        || texturep->getFullHeight() < LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN)
+    {
+        return false;
+    }
+}
+
 void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
 {
     // show hourglass cursor when loading inventory window
@@ -526,8 +564,16 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
 
     if (obj && floaterp)
     {
-        obj->setThumbnailUUID(floaterp->getAssetID());
-        // todo: need to trigger send/update once server support is done
+        LLUUID asset_id = floaterp->getAssetID();
+        if (validateAsset(asset_id))
+        {
+            obj->setThumbnailUUID(asset_id);
+            // todo: need to trigger send/update once server support is done
+        }
+        else
+        {
+            LLNotificationsUtil::add("ThumbnailDimantionsLimit");
+        }
     }
 }
 
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 250f895078..bc85e4be0b 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -67,6 +67,8 @@ private:
     static void onRemove(void*);
     static void onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle);
 
+    static bool validateAsset(const LLUUID &asset_id);
+
     void showTexturePicker(const LLUUID &thumbnail_id);
     void onTexturePickerCommit(LLUUID id);
 
diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
index 0bf4bb4fc3..83f4f1ace9 100644
--- a/indra/newview/llfloatersimplesnapshot.cpp
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -42,7 +42,8 @@
 
 LLSimpleSnapshotFloaterView* gSimpleSnapshotFloaterView = NULL;
 
-const S32 THUMBNAIL_SNAPSHOT_DIM = 256;
+const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX = 256;
+const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN = 64;
 
 // Thumbnail posting coro
 
@@ -176,8 +177,8 @@ void LLFloaterSimpleSnapshot::Impl::updateResolution(void* data)
         return;
     }
 
-    S32 width = THUMBNAIL_SNAPSHOT_DIM;
-    S32 height = THUMBNAIL_SNAPSHOT_DIM;
+    S32 width = THUMBNAIL_SNAPSHOT_DIM_MAX;
+    S32 height = THUMBNAIL_SNAPSHOT_DIM_MAX;
 
     LLSnapshotLivePreview* previewp = getPreviewView();
     if (previewp)
@@ -342,7 +343,7 @@ void LLFloaterSimpleSnapshot::onSend()
     LLSnapshotLivePreview* previewp = getPreviewView();
 
     std::string temp_file = gDirUtilp->getTempFilename();
-    if (previewp->createUploadFile(temp_file, THUMBNAIL_SNAPSHOT_DIM))
+    if (previewp->createUploadFile(temp_file, THUMBNAIL_SNAPSHOT_DIM_MAX, THUMBNAIL_SNAPSHOT_DIM_MIN))
     {
         uploadImageUploadFile(temp_file, mInventoryId, mTaskId);
     }
@@ -365,7 +366,7 @@ void LLFloaterSimpleSnapshot::uploadThumbnail(const std::string &file_path, cons
     // generate a temp texture file for coroutine
     std::string temp_file = gDirUtilp->getTempFilename();
     U32 codec = LLImageBase::getCodecFromExtension(gDirUtilp->getExtension(file_path));
-    if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, THUMBNAIL_SNAPSHOT_DIM))
+    if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, THUMBNAIL_SNAPSHOT_DIM_MAX, THUMBNAIL_SNAPSHOT_DIM_MIN))
     {
         LLSD notif_args;
         notif_args["REASON"] = LLImage::getLastError().c_str();
diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
index 1b51325afc..7fae5be30a 100644
--- a/indra/newview/llfloatersimplesnapshot.h
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -67,6 +67,9 @@ public:
     class Impl;
     friend class Impl;
 
+    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX = 256;
+    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN = 64;
+
 private:
     void onSend();
     void onCancel();
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index 273e3a403d..37ebcd1266 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -874,7 +874,7 @@ LLPointer<LLImageRaw> LLSnapshotLivePreview::getEncodedImage()
     return mPreviewImageEncoded;
 }
 
-bool LLSnapshotLivePreview::createUploadFile(const std::string &out_filename, const S32 max_image_dimentions)
+bool LLSnapshotLivePreview::createUploadFile(const std::string &out_filename, const S32 max_image_dimentions, const S32 min_image_dimentions)
 {
     // make a copy, since convertToUploadFile modifies raw image
     LLPointer<LLImageRaw> raw_image = new LLImageRaw(
@@ -884,6 +884,16 @@ bool LLSnapshotLivePreview::createUploadFile(const std::string &out_filename, co
         mPreviewImage->getComponents());
 
     LLPointer<LLImageJ2C> compressedImage = LLViewerTextureList::convertToUploadFile(raw_image, max_image_dimentions);
+    if (compressedImage->getWidth() < min_image_dimentions || compressedImage->getHeight() < min_image_dimentions)
+    {
+        std::string reason = llformat("Images below %d x %d pixels are not allowed. Actual size: %d x %dpx",
+            min_image_dimentions,
+            min_image_dimentions,
+            compressedImage->getWidth(),
+            compressedImage->getHeight());
+        compressedImage->setLastError(reason);
+        return FALSE;
+    }
     if (compressedImage.isNull())
     {
         compressedImage->setLastError("Couldn't convert the image to jpeg2000.");
diff --git a/indra/newview/llsnapshotlivepreview.h b/indra/newview/llsnapshotlivepreview.h
index e78c885789..6e38a957b4 100644
--- a/indra/newview/llsnapshotlivepreview.h
+++ b/indra/newview/llsnapshotlivepreview.h
@@ -106,7 +106,7 @@ public:
 
 	LLPointer<LLImageFormatted>	getFormattedImage();
 	LLPointer<LLImageRaw>		getEncodedImage();
-    bool createUploadFile(const std::string &out_file, const S32 max_image_dimentions);
+    bool createUploadFile(const std::string &out_file, const S32 max_image_dimentions, const S32 min_image_dimentions);
 
 	/// Sets size of preview thumbnail image and the surrounding rect.
 	void setThumbnailPlaceholderRect(const LLRect& rect) {mThumbnailPlaceholderRect = rect; }
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 93ae1670c8..901747ce57 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1286,7 +1286,8 @@ void LLViewerTextureList::decodeAllImages(F32 max_time)
 BOOL LLViewerTextureList::createUploadFile(const std::string& filename,
 										 const std::string& out_filename,
 										 const U8 codec,
-										 const S32 max_image_dimentions)
+										 const S32 max_image_dimentions,
+										 const S32 min_image_dimentions)
 {	
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
 	// Load the image
@@ -1314,6 +1315,16 @@ BOOL LLViewerTextureList::createUploadFile(const std::string& filename,
 		image->setLastError("Image files with less than 3 or more than 4 components are not supported.");
 		return FALSE;
 	}
+    if (image->getWidth() < min_image_dimentions || image->getHeight() < min_image_dimentions)
+    {
+        std::string reason = llformat("Images below %d x %d pixels are not allowed. Actual size: %d x %dpx",
+            min_image_dimentions,
+            min_image_dimentions,
+            image->getWidth(),
+            image->getHeight());
+        image->setLastError(reason);
+        return FALSE;
+    }
 	// Convert to j2c (JPEG2000) and save the file locally
 	LLPointer<LLImageJ2C> compressedImage = convertToUploadFile(raw_image, max_image_dimentions);
 	if (compressedImage.isNull())
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 0018e78d45..eac26ab0eb 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -95,7 +95,8 @@ public:
     static BOOL createUploadFile(const std::string& filename,
                                  const std::string& out_filename,
                                  const U8 codec,
-                                 const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT);
+                                 const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,
+                                 const S32 min_image_dimentions = 0);
 	static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image, const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT);
 	static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );
 
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 95e868a696..f3f8ee0daa 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -44,14 +44,15 @@
     top="4"
     width="16" />
   <text
-    follows="left|top|right"
+    name="item_name"
     font="SansSerif"
-    height="19"
+    max_length_bytes="127"
+    use_ellipses="true"
+    follows="left|top|right"
     layout="topleft"
+    height="19"
     top_delta="1"
     left_pad="3"
-    max_length_bytes="127"
-    name="item_name"
     width="286"/>
 
   <thumbnail
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ceae31967e..d2d3cb4523 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6109,6 +6109,17 @@ Are you sure you want to delete them?
      yestext="Delete"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailDimantionsLimit"
+   type="alertmodal">
+    <unique/>
+    Only square images from 64 to 256 pixels per side are allowed.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From 8795da7c831c61cfa1cb8c14ebcea7cd6c484e23 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 26 Feb 2023 13:14:06 +0200
Subject: SL-19108 Only permit 64 to 256 px images for thumbnails #2

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 1 +
 indra/newview/llfloatersimplesnapshot.h        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index cdb09f4c6c..626265fd4b 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -499,6 +499,7 @@ bool LLFloaterChangeItemThumbnail::validateAsset(const LLUUID &asset_id)
     {
         return false;
     }
+    return true;
 }
 
 void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
index 7fae5be30a..ad25d0ce76 100644
--- a/indra/newview/llfloatersimplesnapshot.h
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -67,8 +67,8 @@ public:
     class Impl;
     friend class Impl;
 
-    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX = 256;
-    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN = 64;
+    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX;
+    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN;
 
 private:
     void onSend();
-- 
cgit v1.2.3


From a6ea3fa741c90b4fe88550085f9a6b52d71447fd Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Mon, 27 Feb 2023 08:15:29 +0100
Subject: SL-18882: Show diffuse non-alpha textures opaque on editing

---
 indra/llprimitive/llmaterial.cpp | 18 +++++++++---------
 indra/llprimitive/llmaterial.h   |  2 +-
 indra/newview/llvovolume.cpp     |  7 ++++---
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index a219ac1450..fa22145972 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -426,18 +426,18 @@ bool LLMaterial::operator != (const LLMaterial& rhs) const
 }
 
 
-U32 LLMaterial::getShaderMask(U32 alpha_mode)
+U32 LLMaterial::getShaderMask(U32 alpha_mode, BOOL is_alpha)
 { //NEVER incorporate this value into the message system -- this function will vary depending on viewer implementation
-    U32 ret = 0;
 
-    //two least significant bits are "diffuse alpha mode"
-    if (alpha_mode != DIFFUSE_ALPHA_MODE_DEFAULT)
+	//two least significant bits are "diffuse alpha mode"
+	U32 ret = alpha_mode;
+    if (ret == DIFFUSE_ALPHA_MODE_DEFAULT)
     {
-        ret = alpha_mode;
-    }
-    else
-    {
-        ret = getDiffuseAlphaMode();
+		ret = getDiffuseAlphaMode();
+		if (ret == DIFFUSE_ALPHA_MODE_BLEND && !is_alpha)
+		{
+			ret = DIFFUSE_ALPHA_MODE_NONE;
+		}
     }
 
     llassert(ret < SHADER_COUNT);
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h
index d58b7ee812..d92ef1dfba 100644
--- a/indra/llprimitive/llmaterial.h
+++ b/indra/llprimitive/llmaterial.h
@@ -126,7 +126,7 @@ public:
     bool        operator == (const LLMaterial& rhs) const;
     bool        operator != (const LLMaterial& rhs) const;
 
-    U32         getShaderMask(U32 alpha_mode = DIFFUSE_ALPHA_MODE_DEFAULT);
+    U32         getShaderMask(U32 alpha_mode, BOOL is_alpha);
 
 protected:
     LLUUID      mNormalID;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index b910c4f93c..086e751965 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5295,13 +5295,14 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
 
 	if (mat)
 	{
+		BOOL is_alpha = (facep->getPoolType() == LLDrawPool::POOL_ALPHA) || (facep->getTextureEntry()->getColor().mV[3] < 0.999f) ? TRUE : FALSE;
 		if (type == LLRenderPass::PASS_ALPHA)
 		{
-			shader_mask = mat->getShaderMask(LLMaterial::DIFFUSE_ALPHA_MODE_BLEND);
+			shader_mask = mat->getShaderMask(LLMaterial::DIFFUSE_ALPHA_MODE_BLEND, is_alpha);
 		}
 		else
 		{
-			shader_mask = mat->getShaderMask();
+			shader_mask = mat->getShaderMask(LLMaterial::DIFFUSE_ALPHA_MODE_DEFAULT, is_alpha);
 		}
 	}
 
@@ -6676,7 +6677,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
 						LLRenderPass::PASS_NORMSPEC_EMISSIVE,
 					};
 
-					U32 mask = mat->getShaderMask();
+					U32 mask = mat->getShaderMask(LLMaterial::DIFFUSE_ALPHA_MODE_DEFAULT, is_alpha);
 
 					llassert(mask < sizeof(pass)/sizeof(U32));
 
-- 
cgit v1.2.3


From cb7debd70dc880a9cdeef983dc99281780c5e89a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 27 Feb 2023 18:02:19 +0200
Subject: SL-19273 Show message when folder is empty or if no search results

---
 indra/newview/llfloatersimplesnapshot.h                     | 4 ++--
 indra/newview/llinventorypanel.cpp                          | 4 ++--
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 1 -
 indra/newview/skins/default/xui/en/strings.xml              | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
index ad25d0ce76..a2bf2946d4 100644
--- a/indra/newview/llfloatersimplesnapshot.h
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -67,8 +67,8 @@ public:
     class Impl;
     friend class Impl;
 
-    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX;
-    static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN;
+    static const S32 THUMBNAIL_SNAPSHOT_DIM_MAX;
+    static const S32 THUMBNAIL_SNAPSHOT_DIM_MIN;
 
 private:
     void onSend();
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 80d9b69937..77588c8716 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2045,6 +2045,8 @@ LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     : LLInventoryPanel(params)
 {
     getFilter().setSingleFolderMode(true);
+    getFilter().setEmptyLookupMessage("InventorySingleFolderNoMatches");
+    getFilter().setDefaultEmptyLookupMessage("InventorySingleFolderEmpty");
 
     mCommitCallbackRegistrar.add("Inventory.OpenSelectedFolder", boost::bind(&LLInventorySingleFolderPanel::openInCurrentWindow, this, _2));
 }
@@ -2166,8 +2168,6 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
         mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
 
         buildNewViews(mFolderID);
-
-        mFolderRoot.get()->setShowEmptyMessage(false);
     }
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 16ad6f60db..5f6859622d 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -279,7 +279,6 @@
      width="312">
       <single_folder_inventory_panel
        name="single_folder_inv"
-       show_empty_message="false"
        follows="all"
        left="0"
        top="0"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3e6c7f0829..39fcc35580 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2306,6 +2306,8 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="FavoritesNoMatchingItems">To add a place to your favorites, click the star to the right of the location name, then save the landmark to "Favorites bar".</string>
 	<string name="MarketplaceNoListing">You have no listings yet.</string>
 	<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
+	<string name="InventorySingleFolderEmpty">Folder is empty.</string>
+	<string name="InventorySingleFolderNoMatches">No matches.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-- 
cgit v1.2.3


From f377e27f0b8ddabf755c6efe71d6bc0e53e751c1 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 27 Feb 2023 20:27:11 +0200
Subject: SL-19274 Add new double-click option to Inventory settings

---
 indra/llui/llfolderviewitem.cpp                    |  9 +++++--
 indra/llui/llfolderviewmodel.h                     |  2 +-
 indra/newview/app_settings/settings.xml            |  6 ++---
 indra/newview/llconversationmodel.h                |  2 +-
 indra/newview/llinventorybridge.cpp                | 24 +++++++++----------
 indra/newview/llinventorybridge.h                  |  2 +-
 indra/newview/llinventorypanel.cpp                 | 18 ++++++++++++++
 indra/newview/llinventorypanel.h                   |  2 +-
 indra/newview/llpanelmaininventory.cpp             |  7 ++++--
 indra/newview/llpanelmaininventory.h               |  2 +-
 indra/newview/llpanelobjectinventory.cpp           |  2 +-
 .../default/xui/en/floater_inventory_settings.xml  | 28 +++++++++++++++-------
 12 files changed, 70 insertions(+), 34 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 4a9ac56d9f..6ddbf26639 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -2077,11 +2077,16 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
 	}
 	if( !handled )
 	{
-        static LLUICachedControl<bool> double_click_new_window("MultiModeDoubleClickOpenWindow", false);
-        if (double_click_new_window)
+        static LLUICachedControl<U32> double_click_action("MultiModeDoubleClickFolder", false);
+        if (double_click_action == 1)
         {
             getViewModelItem()->navigateToFolder(true);
             return TRUE;
+        }
+        if (double_click_action == 2)
+        {
+            getViewModelItem()->navigateToFolder(false, true);
+            return TRUE;
         }
 		if(mIndentation < x && x < mIndentation + (isCollapsed() ? 0 : mArrowSize) + mTextPad)
 		{
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index b1db9489fd..b5a765fab3 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -160,7 +160,7 @@ public:
 	virtual void closeItem( void ) = 0;
 	virtual void selectItem(void) = 0;
 
-    virtual void navigateToFolder(bool new_window = false) = 0;
+    virtual void navigateToFolder(bool new_window = false, bool change_mode = false) = 0;
     
     virtual BOOL isItemWearable() const { return FALSE; }
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3a896b4f5f..23521351ca 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16909,14 +16909,14 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-<key>MultiModeDoubleClickOpenWindow</key>
+<key>MultiModeDoubleClickFolder</key>
 <map>
   <key>Comment</key>
-  <string>Sets the action for Double-click on folder in multi-folder view (0 - expands and collapses folder, 1 - opens a new window)</string>
+  <string>Sets the action for Double-click on folder in multi-folder view (0 - expands and collapses folder, 1 - opens a new window, 2 – stays in current floater but switches to SFV)</string>
   <key>Persist</key>
   <integer>1</integer>
   <key>Type</key>
-  <string>Boolean</string>
+  <string>U32</string>
   <key>Value</key>
   <integer>0</integer>
 </map>
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index c7da060f33..22d2d60905 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -111,7 +111,7 @@ public:
 	virtual void previewItem( void );
 	virtual void selectItem(void) { } 
 	virtual void showProperties(void);
-    virtual void navigateToFolder(bool new_window = false) {}
+    virtual void navigateToFolder(bool new_window = false, bool change_mode = false) {}
 
 	// Methods used in sorting (see LLConversationSort::operator())
 	EConversationType const getType() const { return mConvType; }
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f7b7a6635e..5f1db0895c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -413,7 +413,7 @@ void LLInvFVBridge::showProperties()
     }
 }
 
-void LLInvFVBridge::navigateToFolder(bool new_window)
+void LLInvFVBridge::navigateToFolder(bool new_window, bool change_mode)
 {
     if(new_window)
     {
@@ -421,21 +421,21 @@ void LLInvFVBridge::navigateToFolder(bool new_window)
     }
     else
     {
-        LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get());
-        if (!panel)
+        if(change_mode)
         {
-            return;
-        }
-        LLInventoryModel* model = getInventoryModel();
-        if (!model)
-        {
-            return;
+            LLInventoryPanel::setSFViewAndOpenFolder(mInventoryPanel.get(), mUUID);
         }
-        if (mUUID.isNull())
+        else
         {
-            return;
+            LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get());
+            if (!panel || !getInventoryModel() || mUUID.isNull())
+            {
+                return;
+            }
+
+            panel->changeFolderRoot(mUUID);
         }
-        panel->changeFolderRoot(mUUID);
+
     }
 }
 
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index b2cc33aadd..958d284854 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -107,7 +107,7 @@ public:
 	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
 	virtual void openItem() {}
 	virtual void closeItem() {}
-    virtual void navigateToFolder(bool new_window = false);
+    virtual void navigateToFolder(bool new_window = false, bool change_mode = false);
 	virtual void showProperties();
 	virtual BOOL isItemRenameable() const { return TRUE; }
 	virtual BOOL isMultiPreviewAllowed() { return TRUE; }
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 77588c8716..82f791a171 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1831,6 +1831,24 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
 	}
 }
 
+void LLInventoryPanel::setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id)
+{
+
+    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
+    {
+        LLFloaterSidePanelContainer* inventory_floater = dynamic_cast<LLFloaterSidePanelContainer*>(*iter);
+        LLSidepanelInventory* sidepanel_inventory = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
+
+        LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
+        if (main_inventory && panel->hasAncestor(main_inventory) && !main_inventory->isSingleFolderMode())
+        {
+            main_inventory->onViewModeClick();
+            main_inventory->setSingleFolderViewRoot(folder_id, false);
+        }
+    }
+}
+
 void LLInventoryPanel::addHideFolderType(LLFolderType::EType folder_type)
 {
 	getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << folder_type));
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index baaefe5dd7..e9eaaa232d 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -246,7 +246,7 @@ public:
 													BOOL main_panel = FALSE,
 													BOOL take_keyboard_focus = TAKE_FOCUS_YES,
 													BOOL reset_filter = FALSE);
-
+    static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id);
 	void addItemID(const LLUUID& id, LLFolderViewItem* itemp);
 	void removeItemID(const LLUUID& id);
 	LLFolderViewItem* getItemByID(const LLUUID& id);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 0fd4eb0c15..5da53cc928 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1321,10 +1321,13 @@ void LLPanelMainInventory::onForwardFolderClicked()
     mSingleFolderPanelInventory->onForwardFolder();
 }
 
-void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id)
+void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history)
 {
     mSingleFolderPanelInventory->changeFolderRoot(folder_id);
-    mSingleFolderPanelInventory->clearNavigationHistory();
+    if(clear_nav_history)
+    {
+        mSingleFolderPanelInventory->clearNavigationHistory();
+    }
 }
 
 void LLPanelMainInventory::showActionMenu(LLMenuGL* menu, std::string spawning_view_name)
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 85373d7de3..6382f44bc9 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -103,7 +103,7 @@ public:
     void onUpFolderClicked();
     void onBackFolderClicked();
     void onForwardFolderClicked();
-    void setSingleFolderViewRoot(const LLUUID& folder_id);
+    void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true);
     bool isSingleFolderMode() { return mSingleFolderMode; }
 
 protected:
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index c22915c3ab..1348996136 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -125,7 +125,7 @@ public:
 	virtual BOOL canOpenItem() const { return FALSE; }
 	virtual void closeItem() {}
 	virtual void selectItem() {}
-    virtual void navigateToFolder(bool new_window = false) {}
+    virtual void navigateToFolder(bool new_window = false, bool change_mode = false) {}
 	virtual BOOL isItemRenameable() const;
 	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL isItemMovable() const;
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index c3e81a5523..bfac79ac46 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -4,10 +4,10 @@
  can_minimize="true"
  can_resize="false"
  save_rect="true"
- height="350"
+ height="370"
  width="370"
  name="inventory_settings"
- title="Inventory settings">
+ title="INVENTORY SETTINGS">
  <icon
   follows="top|left"
   height="18"
@@ -33,14 +33,14 @@
    Double-click on folder in multi-folder view:
  </text>
  <radio_group
-  control_name="MultiModeDoubleClickOpenWindow"
+  control_name="MultiModeDoubleClickFolder"
   follows="left|top"
   top_pad="8"
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
-  height="45"
+  width="300"
+  height="70"
   name="multi_double_click_setting">
      <radio_item
       height="20"
@@ -48,7 +48,7 @@
       label_text.text_color="White"
       follows="left|top"
       layout="topleft"
-      name="false"
+      name="0"
       width="200"/>
      <radio_item
       height="20"
@@ -57,7 +57,17 @@
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
-      name="true"
+      name="1"
+      top_pad ="5"
+      width="200" />
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Switch view"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="2"
       top_pad ="5"
       width="200" />
  </radio_group>
@@ -92,7 +102,7 @@
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
+  width="300"
   height="45"
   name="single_double_click_setting">
      <radio_item
@@ -135,7 +145,7 @@
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
+  width="300"
   height="45"
   name="find_original_settings">
      <radio_item
-- 
cgit v1.2.3


From 0e837fbaad136722fbad4b59e1402df2af8e4ea4 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Mon, 27 Feb 2023 21:46:54 +0100
Subject: Fix formatting in indra/newview/llpanelface.* files

---
 indra/newview/llpanelface.cpp |  131 +++--
 indra/newview/llpanelface.h   | 1129 ++++++++++++++++++++---------------------
 2 files changed, 627 insertions(+), 633 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 178aba11a3..cbb87f63bb 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -831,7 +831,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 { //set state of UI to match state of texture entry(ies)  (calls setEnabled, setValue, etc, but NOT setVisible)
 	LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 
-	if( objectp
+	if (objectp
 		&& objectp->getPCode() == LL_PCODE_VOLUME
 		&& objectp->permModify())
 	{
@@ -854,7 +854,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		}
 
 		LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
-		if(radio_mat_type)
+		if (radio_mat_type)
 		{
 		    if (radio_mat_type->getSelectedIndex() < MATTYPE_DIFFUSE)
 		    {
@@ -871,10 +871,10 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		childSetValue("checkbox_sync_settings", gSavedSettings.getBOOL("SyncMaterialSettings"));
 		updateVisibility();
 
-		bool identical				= true;	// true because it is anded below
-      bool identical_diffuse	= false;
-      bool identical_norm		= false;
-      bool identical_spec		= false;
+		bool identical			= true;	// true because it is anded below
+		bool identical_diffuse	= false;
+		bool identical_norm		= false;
+		bool identical_spec		= false;
 
 		LLTextureCtrl*	texture_ctrl = getChild<LLTextureCtrl>("texture control");
 		LLTextureCtrl*	shinytexture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
@@ -888,12 +888,12 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		{
 			getChildView("color label")->setEnabled(editable);
 		}
-		LLColorSwatchCtrl*	color_swatch = findChild<LLColorSwatchCtrl>("colorswatch");
+		LLColorSwatchCtrl* color_swatch = findChild<LLColorSwatchCtrl>("colorswatch");
 
-		LLColor4 color					= LLColor4::white;
-		bool		identical_color	= false;
+		LLColor4 color = LLColor4::white;
+		bool identical_color = false;
 
-		if(color_swatch)
+		if (color_swatch)
 		{
 			LLSelectedTE::getColor(color, identical_color);
 			LLColor4 prev_color = color_swatch->get();
@@ -927,7 +927,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
 		LLCtrlSelectionInterface* combobox_shininess = childGetSelectionInterface("combobox shininess");
 		if (combobox_shininess)
-				{
+		{
 			combobox_shininess->selectNthItem((S32)shiny);
 		}
 
@@ -947,8 +947,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		getChild<LLUICtrl>("shinycolorswatch")->setTentative(!identical_spec);
 					
 		LLColorSwatchCtrl*	mShinyColorSwatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
-		if(mShinyColorSwatch)
-					{
+		if (mShinyColorSwatch)
+		{
 			mShinyColorSwatch->setValid(editable);
 			mShinyColorSwatch->setEnabled( editable );
 			mShinyColorSwatch->setCanApplyImmediately( editable );
@@ -956,7 +956,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
 		U8 bumpy = 0;
 		// Bumpy
-						{
+		{
 			bool identical_bumpy = false;
 			LLSelectedTE::getBumpmap(bumpy,identical_bumpy);
 
@@ -966,18 +966,18 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 			bumpy = norm_map_id.isNull() ? bumpy : BUMPY_TEXTURE;
 
 			if (combobox_bumpiness)
-							{
+			{
 				combobox_bumpiness->selectNthItem((S32)bumpy);
-							}
+			}
 			else
-							{
+			{
 				LL_WARNS() << "failed childGetSelectionInterface for 'combobox bumpiness'" << LL_ENDL;
-							}
+			}
 
 			getChildView("combobox bumpiness")->setEnabled(editable);
 			getChild<LLUICtrl>("combobox bumpiness")->setTentative(!identical_bumpy);
 			getChildView("label bumpiness")->setEnabled(editable);
-						}
+		}
 
 		// Texture
 		{
@@ -991,25 +991,25 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 			bool identical_image_format = false;
 			LLSelectedTE::getImageFormat(image_format, identical_image_format);
             
-         mIsAlpha = FALSE;
-         switch (image_format)
-         {
-               case GL_RGBA:
-               case GL_ALPHA:
-               {
-                  mIsAlpha = TRUE;
-               }
-               break;
-
-               case GL_RGB: break;
-               default:
-               {
-                  LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
-					}
-               break;
+			mIsAlpha = FALSE;
+			switch (image_format)
+			{
+				case GL_RGBA:
+				case GL_ALPHA:
+				{
+					mIsAlpha = TRUE;
+				}
+				break;
+
+				case GL_RGB: break;
+				default:
+				{
+					LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
 				}
+				break;
+			}
 
-			if(LLViewerMedia::getInstance()->textureHasMedia(id))
+			if (LLViewerMedia::getInstance()->textureHasMedia(id))
 			{
 				getChildView("button align")->setEnabled(editable);
 			}
@@ -1046,7 +1046,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 			updateAlphaControls();
 
 			if (texture_ctrl)
-				{
+			{
 				if (identical_diffuse)
 				{
 					texture_ctrl->setTentative(FALSE);
@@ -1060,8 +1060,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 					texture_ctrl->setBakeTextureEnabled(TRUE);
 				}
 				else if (id.isNull())
-					{
-						// None selected
+				{
+					// None selected
 					texture_ctrl->setTentative(FALSE);
 					texture_ctrl->setEnabled(FALSE);
 					texture_ctrl->setImageAssetID(LLUUID::null);
@@ -1071,10 +1071,10 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 					getChildView("label maskcutoff")->setEnabled(FALSE);
 
 					texture_ctrl->setBakeTextureEnabled(false);
-					}
-					else
-					{
-						// Tentative: multiple selected with different textures
+				}
+				else
+				{
+					// Tentative: multiple selected with different textures
 					texture_ctrl->setTentative(TRUE);
 					texture_ctrl->setEnabled(editable);
 					texture_ctrl->setImageAssetID(id);
@@ -1085,7 +1085,6 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 					
 					texture_ctrl->setBakeTextureEnabled(TRUE);
 				}
-				
 			}
 
 			if (shinytexture_ctrl)
@@ -1343,15 +1342,14 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 				combobox_texgen->selectNthItem(((S32)selected_texgen) >> 1);
 			}
 			else
-				{
+			{
 				LL_WARNS() << "failed childGetSelectionInterface for 'combobox texgen'" << LL_ENDL;
-				}
+			}
 
 			getChildView("combobox texgen")->setEnabled(editable);
 			getChild<LLUICtrl>("combobox texgen")->setTentative(!identical);
 			getChildView("tex gen")->setEnabled(editable);
-
-			}
+		}
 
 		{
 			U8 fullbright_flag = 0;
@@ -1380,7 +1378,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
 			LLComboBox*	mComboTexGen = getChild<LLComboBox>("combobox texgen");
 			if (mComboTexGen)
-		{
+			{
 				S32 index = mComboTexGen ? mComboTexGen->getCurrentIndex() : 0;
 				BOOL enabled = editable && (index != 1);
 				BOOL identical_repeats = true;
@@ -1390,26 +1388,26 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 				LLSelectMgr::getInstance()->setTextureChannel(LLRender::eTexIndex(material_type));
 
 				switch (material_type)
-			{
+				{
 					default:
 					case MATTYPE_DIFFUSE:
-				{
+					{
 						enabled = editable && !id.isNull();
 						identical_repeats = identical_diff_repeats;
 						repeats = repeats_diff;
-				}
+					}
 					break;
 
 					case MATTYPE_SPECULAR:
-			{
+					{
 						enabled = (editable && ((shiny == SHINY_TEXTURE) && !specmap_id.isNull()));
 						identical_repeats = identical_spec_repeats;
 						repeats = repeats_spec;
-			}
+					}
 					break;
 
 					case MATTYPE_NORMAL:
-			{
+					{
 						enabled = (editable && ((bumpy == BUMPY_TEXTURE) && !normmap_id.isNull()));
 						identical_repeats = identical_norm_repeats;
 						repeats = repeats_norm;
@@ -1458,14 +1456,14 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 					if (!mIsAlpha)
 					{ // ... unless there is no alpha channel in the texture, in which case alpha mode MUST ebe none
 						alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-				}
+					}
 
 					combobox_alphamode->selectNthItem(alpha_mode);
-			}
-			else
-			{
+				}
+				else
+				{
 					LL_WARNS() << "failed childGetSelectionInterface for 'combobox alphamode'" << LL_ENDL;
-			}
+				}
 				getChild<LLUICtrl>("maskcutoff")->setValue(material->getAlphaMaskCutoff());
 				updateAlphaControls();
 
@@ -1477,15 +1475,15 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 				texture_ctrl->setImageAssetID(material->getSpecularID());
 
 				if (!material->getSpecularID().isNull() && (shiny == SHINY_TEXTURE))
-			{
+				{
 					material->getSpecularOffset(offset_x,offset_y);
 					material->getSpecularRepeat(repeat_x,repeat_y);
 
 					if (identical_planar_texgen)
-			{
+					{
 						repeat_x *= 2.0f;
 						repeat_y *= 2.0f;
-			}
+					}
 
 					rot = material->getSpecularRotation();
 					getChild<LLUICtrl>("shinyScaleU")->setValue(repeat_x);
@@ -1497,7 +1495,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 					getChild<LLUICtrl>("environment")->setValue(material->getEnvironmentIntensity());
 
 					updateShinyControls(!material->getSpecularID().isNull(), true);
-		}
+				}
 
 				// Assert desired colorswatch color to match material AFTER updateShinyControls
 				// to avoid getting overwritten with the default on some UI state changes.
@@ -1559,14 +1557,14 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
 		// Disable non-UICtrls
 		LLTextureCtrl*	texture_ctrl = getChild<LLTextureCtrl>("texture control"); 
-		if(texture_ctrl)
+		if (texture_ctrl)
 		{
 			texture_ctrl->setImageAssetID( LLUUID::null );
 			texture_ctrl->setEnabled( FALSE );  // this is a LLUICtrl, but we don't want it to have keyboard focus so we add it as a child, not a ctrl.
 // 			texture_ctrl->setValid(FALSE);
 		}
 		LLColorSwatchCtrl* mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
-		if(mColorSwatch)
+		if (mColorSwatch)
 		{
 			mColorSwatch->setEnabled( FALSE );			
 			mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image.j2c") );
@@ -1609,7 +1607,6 @@ void LLPanelFace::updateCopyTexButton()
                                                     && (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1));
     std::string tooltip = (objectp && objectp->isInventoryPending()) ? LLTrans::getString("LoadingContents") : getString("paste_options");
     mMenuClipboardTexture->setToolTip(tooltip);
-
 }
 
 void LLPanelFace::refresh()
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 44bc442bbb..787eb0c51b 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -1,566 +1,563 @@
-/** 
- * @file llpanelface.h
- * @brief Panel in the tools floater for editing face textures, colors, etc.
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLPANELFACE_H
-#define LL_LLPANELFACE_H
-
-#include "v4color.h"
-#include "llpanel.h"
-#include "llmaterial.h"
-#include "llmaterialmgr.h"
-#include "lltextureentry.h"
-#include "llselectmgr.h"
-
-class LLButton;
-class LLCheckBoxCtrl;
-class LLColorSwatchCtrl;
-class LLComboBox;
-class LLInventoryItem;
-class LLLineEditor;
-class LLSpinCtrl;
-class LLTextBox;
-class LLTextureCtrl;
-class LLUICtrl;
-class LLViewerObject;
-class LLFloater;
-class LLMaterialID;
-class LLMediaCtrl;
-class LLMenuButton;
-
-// Represents an edit for use in replicating the op across one or more materials in the selection set.
-//
-// The apply function optionally performs the edit which it implements
-// as a functor taking Data that calls member func MaterialFunc taking SetValueType
-// on an instance of the LLMaterial class.
-//
-// boost who?
-//
-template<
-	typename DataType,
-	typename SetValueType,
-	void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
-class LLMaterialEditFunctor
-{
-public:
-	LLMaterialEditFunctor(const DataType& data) : _data(data) {}
-	virtual ~LLMaterialEditFunctor() {}
-	virtual void apply(LLMaterialPtr& material) { (material->*(MaterialEditFunc))(_data); }
-	DataType _data;
-};
-
-template<
-	typename DataType,
-	DataType (LLMaterial::*MaterialGetFunc)() >
-class LLMaterialGetFunctor
-{
-public:
-	LLMaterialGetFunctor() {}
-	virtual DataType get(LLMaterialPtr& material) { return (material->*(MaterialGetFunc)); }
-};
-
-template<
-	typename DataType,
-	DataType (LLTextureEntry::*TEGetFunc)() >
-class LLTEGetFunctor
-{
-public:
-	LLTEGetFunctor() {}
-	virtual DataType get(LLTextureEntry* entry) { return (entry*(TEGetFunc)); }
-};
-
-class LLPanelFace : public LLPanel
-{
-public:
-	virtual BOOL	postBuild();
-	LLPanelFace();
-	virtual ~LLPanelFace();
-
-	void			refresh();
-    void			refreshMedia();
-    void			unloadMedia();
-
-    /*virtual*/ void draw();
-
-	LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material)
-	{
-		LLMaterialPtr new_material(!current_material.isNull() ? new LLMaterial(current_material->asLLSD()) : new LLMaterial());
-		llassert_always(new_material);
-
-		// Preserve old diffuse alpha mode or assert correct default blend mode as appropriate for the alpha channel content of the diffuse texture
-		//
-		new_material->setDiffuseAlphaMode(current_material.isNull() ? (isAlpha() ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE) : current_material->getDiffuseAlphaMode());
-		return new_material;
-	}
-
-	LLRender::eTexIndex getTextureChannelToEdit();
-
-protected:
-    void			navigateToTitleMedia(const std::string url);
-    bool			selectedMediaEditable();
-    void			clearMediaSettings();
-    void			updateMediaSettings();
-    void			updateMediaTitle();
-
-	void			getState();
-
-	void			sendTexture();			// applies and sends texture
-	void			sendTextureInfo();		// applies and sends texture scale, offset, etc.
-	void			sendColor();			// applies and sends color
-	void			sendAlpha();			// applies and sends transparency
-	void			sendBump(U32 bumpiness);				// applies and sends bump map
-	void			sendTexGen();				// applies and sends bump map
-	void			sendShiny(U32 shininess);			// applies and sends shininess
-	void			sendFullbright();		// applies and sends full bright
-	void        sendGlow();
-	void			sendMedia();
-    void            alignTestureLayer();
-
-    void            updateCopyTexButton();
-
-	// this function is to return TRUE if the drag should succeed.
-	static BOOL onDragTexture(LLUICtrl* ctrl, LLInventoryItem* item);
-
-	void 	onCommitTexture(const LLSD& data);
-	void 	onCancelTexture(const LLSD& data);
-	void 	onSelectTexture(const LLSD& data);
-	void 	onCommitSpecularTexture(const LLSD& data);
-	void 	onCancelSpecularTexture(const LLSD& data);
-	void 	onSelectSpecularTexture(const LLSD& data);
-	void 	onCommitNormalTexture(const LLSD& data);
-	void 	onCancelNormalTexture(const LLSD& data);
-	void 	onSelectNormalTexture(const LLSD& data);
-	void 	onCommitColor(const LLSD& data);
-	void 	onCommitShinyColor(const LLSD& data);
-	void 	onCommitAlpha(const LLSD& data);
-	void 	onCancelColor(const LLSD& data);
-	void 	onCancelShinyColor(const LLSD& data);
-	void 	onSelectColor(const LLSD& data);
-	void 	onSelectShinyColor(const LLSD& data);
-
-	void 	onCloseTexturePicker(const LLSD& data);
-
-    static bool deleteMediaConfirm(const LLSD& notification, const LLSD& response);
-    static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
-
-	// Make UI reflect state of currently selected material (refresh)
-	// and UI mode (e.g. editing normal map v diffuse map)
-	//
-	// @param force_set_values forces spinners to set value even if they are focused
-	void updateUI(bool force_set_values = false);
-
-	// Convenience func to determine if all faces in selection have
-	// identical planar texgen settings during edits
-	// 
-	bool isIdenticalPlanarTexgen();
-
-	// Callback funcs for individual controls
-	//
-	static void		onCommitTextureInfo(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureScaleX(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureScaleY(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureRot(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureOffsetX(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureOffsetY(LLUICtrl* ctrl, void* userdata);
-
-	static void		onCommitMaterialBumpyScaleX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyScaleY(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyRot(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyOffsetX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyOffsetY(	LLUICtrl* ctrl, void* userdata);
-
-	static void		syncRepeatX(LLPanelFace* self, F32 scaleU);
-	static void		syncRepeatY(LLPanelFace* self, F32 scaleV);
-	static void		syncOffsetX(LLPanelFace* self, F32 offsetU);
-	static void		syncOffsetY(LLPanelFace* self, F32 offsetV);
-	static void 	syncMaterialRot(LLPanelFace* self, F32 rot, int te = -1);
-
-	static void		onCommitMaterialShinyScaleX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyScaleY(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyRot(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyOffsetX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyOffsetY(	LLUICtrl* ctrl, void* userdata);
-
-	static void		onCommitMaterialGloss(			LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialEnv(				LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialMaskCutoff(	LLUICtrl* ctrl, void* userdata);
-
-	static void		onCommitMaterialsMedia(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialType(	LLUICtrl* ctrl, void* userdata);
-	static void 	onClickBtnEditMedia(LLUICtrl* ctrl, void* userdata);
-	static void 	onClickBtnDeleteMedia(LLUICtrl* ctrl, void* userdata);
-	static void 	onClickBtnAddMedia(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitBump(				LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTexGen(			LLUICtrl* ctrl, void* userdata);
-	static void		onCommitShiny(				LLUICtrl* ctrl, void* userdata);
-	static void		onCommitAlphaMode(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitFullbright(		LLUICtrl* ctrl, void* userdata);
-	static void    onCommitGlow(				LLUICtrl* ctrl, void *userdata);
-	static void		onCommitPlanarAlign(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitRepeatsPerMeter(	LLUICtrl* ctrl, void* userinfo);
-	static void		onClickAutoFix(void*);
-    static void		onAlignTexture(void*);
-
-public: // needs to be accessible to selection manager
-    void            onCopyColor(); // records all selected faces
-    void            onPasteColor(); // to specific face
-    void            onPasteColor(LLViewerObject* objectp, S32 te); // to specific face
-    void            onCopyTexture();
-    void            onPasteTexture();
-    void            onPasteTexture(LLViewerObject* objectp, S32 te);
-
-protected:
-    void            menuDoToSelected(const LLSD& userdata);
-    bool            menuEnableItem(const LLSD& userdata);
-
-	static F32     valueGlow(LLViewerObject* object, S32 face);
-
-	
-
-private:
-
-	bool		isAlpha() { return mIsAlpha; }
-
-	// Convenience funcs to keep the visual flack to a minimum
-	//
-	LLUUID	getCurrentNormalMap();
-	LLUUID	getCurrentSpecularMap();
-	U32		getCurrentShininess();
-	U32		getCurrentBumpiness();
-	U8			getCurrentDiffuseAlphaMode();
-	U8			getCurrentAlphaMaskCutoff();
-	U8			getCurrentEnvIntensity();
-	U8			getCurrentGlossiness();
-	F32		getCurrentBumpyRot();
-	F32		getCurrentBumpyScaleU();
-	F32		getCurrentBumpyScaleV();
-	F32		getCurrentBumpyOffsetU();
-	F32		getCurrentBumpyOffsetV();
-	F32		getCurrentShinyRot();
-	F32		getCurrentShinyScaleU();
-	F32		getCurrentShinyScaleV();
-	F32		getCurrentShinyOffsetU();
-	F32		getCurrentShinyOffsetV();
-
-    LLComboBox *mComboMatMedia;
-    LLMediaCtrl *mTitleMedia;
-    LLTextBox *mTitleMediaText;
-
-	// Update visibility of controls to match current UI mode
-	// (e.g. materials vs media editing)
-	//
-	// Do NOT call updateUI from within this function.
-	//
-	void updateVisibility();
-
-	// Hey look everyone, a type-safe alternative to copy and paste! :)
-	//
-
-	// Update material parameters by applying 'edit_func' to selected TEs
-	//
-	template<
-		typename DataType,
-		typename SetValueType,
-		void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
-	static void edit(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())
-	{
-		LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc > edit(data);
-		struct LLSelectedTEEditMaterial : public LLSelectedTEMaterialFunctor
-		{
-			LLSelectedTEEditMaterial(LLPanelFace* panel, LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* editp, const LLUUID &only_for_object_id) : _panel(panel), _edit(editp), _only_for_object_id(only_for_object_id) {}
-			virtual ~LLSelectedTEEditMaterial() {};
-			virtual LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material)
-			{
-				if (_edit && (_only_for_object_id.isNull() || _only_for_object_id == object->getID()))
-				{
-					LLMaterialPtr new_material = _panel->createDefaultMaterial(current_material);
-					llassert_always(new_material);
-
-					// Determine correct alpha mode for current diffuse texture
-					// (i.e. does it have an alpha channel that makes alpha mode useful)
-					//
-					// _panel->isAlpha() "lies" when one face has alpha and the rest do not (NORSPEC-329)
-					// need to get per-face answer to this question for sane alpha mode retention on updates.
-					//					
-					bool is_alpha_face = object->isImageAlphaBlended(face);
-
-					// need to keep this original answer for valid comparisons in logic below
-					//
-					U8 original_default_alpha_mode = is_alpha_face ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-					
-					U8 default_alpha_mode = original_default_alpha_mode;
-
-					if (!current_material.isNull())
-					{
-						default_alpha_mode = current_material->getDiffuseAlphaMode();
-					}
-
-					// Insure we don't inherit the default of blend by accident...
-					// this will be stomped by a legit request to change the alpha mode by the apply() below
-					//
-					new_material->setDiffuseAlphaMode(default_alpha_mode);
-
-					// Do "It"!
-					//
-					_edit->apply(new_material);
-
-					U32		new_alpha_mode			= new_material->getDiffuseAlphaMode();
-					LLUUID	new_normal_map_id		= new_material->getNormalID();
-					LLUUID	new_spec_map_id		= new_material->getSpecularID();
-
-					if ((new_alpha_mode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) && !is_alpha_face)
-					{
-						new_alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-						new_material->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE);
-					}
-
-					bool is_default_blend_mode		= (new_alpha_mode == original_default_alpha_mode);
-					bool is_need_material			= !is_default_blend_mode || !new_normal_map_id.isNull() || !new_spec_map_id.isNull();
-
-					if (!is_need_material)
-					{
-						LL_DEBUGS("Materials") << "Removing material from object " << object->getID() << " face " << face << LL_ENDL;
-						LLMaterialMgr::getInstance()->remove(object->getID(),face);
-						new_material = NULL;
-					}
-					else
-					{
-						LL_DEBUGS("Materials") << "Putting material on object " << object->getID() << " face " << face << ", material: " << new_material->asLLSD() << LL_ENDL;
-						LLMaterialMgr::getInstance()->put(object->getID(),face,*new_material);
-					}
-
-					object->setTEMaterialParams(face, new_material);
-					return new_material;
-				}
-				return NULL;
-			}
-			LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >*	_edit;
-			LLPanelFace *_panel;
-			const LLUUID & _only_for_object_id;
-		} editor(p, &edit, only_for_object_id);
-		LLSelectMgr::getInstance()->selectionSetMaterialParams(&editor, te);
-	}
-
-	template<
-		typename DataType,
-		typename ReturnType,
-		ReturnType (LLMaterial::* const MaterialGetFunc)() const  >
-	static void getTEMaterialValue(DataType& data_to_return, bool& identical,DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
-	{
-		DataType data_value;
-		struct GetTEMaterialVal : public LLSelectedTEGetFunctor<DataType>
-		{
-			GetTEMaterialVal(DataType default_value) : _default(default_value) {}
-			virtual ~GetTEMaterialVal() {}
-
-			DataType get(LLViewerObject* object, S32 face)
-			{
-				DataType ret = _default;
-				LLMaterialPtr material_ptr;
-				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
-				if (tep)
-				{
-					material_ptr = tep->getMaterialParams();
-					if (!material_ptr.isNull())
-					{
-						ret = (material_ptr->*(MaterialGetFunc))();
-					}
-				}
-				return ret;
-			}
-			DataType _default;
-		} GetFunc(default_value);
-		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetFunc, data_value, has_tolerance, tolerance);
-		data_to_return = data_value;
-	}
-
-	template<
-		typename DataType,
-		typename ReturnType, // some kids just have to different...
-		ReturnType (LLTextureEntry::* const TEGetFunc)() const >
-	static void getTEValue(DataType& data_to_return, bool& identical, DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
-	{
-		DataType data_value;
-		struct GetTEVal : public LLSelectedTEGetFunctor<DataType>
-		{
-			GetTEVal(DataType default_value) : _default(default_value) {}
-			virtual ~GetTEVal() {}
-
-			DataType get(LLViewerObject* object, S32 face) {
-				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
-				return tep ? ((tep->*(TEGetFunc))()) : _default;
-			}
-			DataType _default;
-		} GetTEValFunc(default_value);
-		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetTEValFunc, data_value, has_tolerance, tolerance );
-		data_to_return = data_value;
-	}
-
-	// Update vis and enabling of specific subsets of controls based on material params
-	// (e.g. hide the spec controls if no spec texture is applied)
-	//
-	void updateShinyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
-	void updateBumpyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
-	void updateAlphaControls();
-
-	/*
-	 * Checks whether the selected texture from the LLFloaterTexturePicker can be applied to the currently selected object.
-	 * If agent selects texture which is not allowed to be applied for the currently selected object,
-	 * all controls of the floater texture picker which allow to apply the texture will be disabled.
-	 */
-    void onTextureSelectionChanged(LLInventoryItem* itemp);
-
-    LLMenuButton*   mMenuClipboardColor;
-    LLMenuButton*   mMenuClipboardTexture;
-
-	bool mIsAlpha;
-	
-	/* These variables interlock processing of materials updates sent to
-	 * the sim.  mUpdateInFlight is set to flag that an update has been
-	 * sent to the sim and not acknowledged yet, and cleared when an
-	 * update is received from the sim.  mUpdatePending is set when
-	 * there's an update in flight and another UI change has been made
-	 * that needs to be sent as a materials update, and cleared when the
-	 * update is sent.  This prevents the sim from getting spammed with
-	 * update messages when, for example, the user holds down the
-	 * up-arrow on a spinner, and avoids running afoul of its throttle.
-	 */
-	bool mUpdateInFlight;
-    bool mUpdatePending;
-
-    LLSD            mClipboardParams;
-
-    LLSD mMediaSettings;
-    bool mNeedMediaTitle;
-
-public:
-	#if defined(DEF_GET_MAT_STATE)
-		#undef DEF_GET_MAT_STATE
-	#endif
-
-	#if defined(DEF_GET_TE_STATE)
-		#undef DEF_GET_TE_STATE
-	#endif
-
-	#if defined(DEF_EDIT_MAT_STATE)
-		DEF_EDIT_MAT_STATE
-	#endif
-
-    // Accessors for selected TE material state
-    //
-    #define DEF_GET_MAT_STATE(DataType,ReturnType,MaterialMemberFunc,DefaultValue,HasTolerance,Tolerance)                                           \
-        static void MaterialMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)          \
-        {                                                                                                                                           \
-            getTEMaterialValue< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
-        }
-
-    // Mutators for selected TE material
-    //
-    #define DEF_EDIT_MAT_STATE(DataType,ReturnType,MaterialMemberFunc)                                                              \
-        static void MaterialMemberFunc(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())     \
-        {                                                                                                                           \
-            edit< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(p, data, te, only_for_object_id);                         \
-        }
-
-    // Accessors for selected TE state proper (legacy settings etc)
-    //
-    #define DEF_GET_TE_STATE(DataType,ReturnType,TexEntryMemberFunc,DefaultValue,HasTolerance,Tolerance)                                        \
-        static void TexEntryMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)      \
-        {                                                                                                                                       \
-            getTEValue< DataType, ReturnType, &LLTextureEntry::TexEntryMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
-        }
-
-	class LLSelectedTEMaterial
-	{
-	public:
-		static void getCurrent(LLMaterialPtr& material_ptr, bool& identical_material);
-		static void getMaxSpecularRepeats(F32& repeats, bool& identical);
-		static void getMaxNormalRepeats(F32& repeats, bool& identical);
-		static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical, bool diffuse_texture_has_alpha);
-
-		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getNormalID,LLUUID::null, false, LLUUID::null)
-		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getSpecularID,LLUUID::null, false, LLUUID::null)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatX,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatY,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetX,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetY,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularRotation,0.0f, true, 0.001f)
-
-		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatX,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatY,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetX,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetY,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalRotation,0.0f, true, 0.001f)
-
-		DEF_EDIT_MAT_STATE(U8,U8,setDiffuseAlphaMode);
-		DEF_EDIT_MAT_STATE(U8,U8,setAlphaMaskCutoff);
-
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetX);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetY);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatX);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatY);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalRotation);
-
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetX);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetY);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatX);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatY);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRotation);
-
-		DEF_EDIT_MAT_STATE(U8,U8,setEnvironmentIntensity);
-		DEF_EDIT_MAT_STATE(U8,U8,setSpecularLightExponent);
-
-		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID);
-		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID);
-		DEF_EDIT_MAT_STATE(LLColor4U,	const LLColor4U&,setSpecularLightColor);
-	};
-
-	class LLSelectedTE
-	{
-	public:
-
-		static void getFace(class LLFace*& face_to_return, bool& identical_face);
-		static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face);
-		static void getTexId(LLUUID& id, bool& identical);
-		static void getObjectScaleS(F32& scale_s, bool& identical);
-		static void getObjectScaleT(F32& scale_t, bool& identical);
-		static void getMaxDiffuseRepeats(F32& repeats, bool& identical);
-
-		DEF_GET_TE_STATE(U8,U8,getBumpmap,0, false, 0)
-		DEF_GET_TE_STATE(U8,U8,getShiny,0, false, 0)
-		DEF_GET_TE_STATE(U8,U8,getFullbright,0, false, 0)
-		DEF_GET_TE_STATE(F32,F32,getRotation,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getOffsetS,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getOffsetT,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getScaleS,1.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getScaleT,1.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getGlow,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(LLTextureEntry::e_texgen,LLTextureEntry::e_texgen,getTexGen,LLTextureEntry::TEX_GEN_DEFAULT, false, LLTextureEntry::TEX_GEN_DEFAULT)
-		DEF_GET_TE_STATE(LLColor4,const LLColor4&,getColor,LLColor4::white, false, LLColor4::black);
-	};
-};
-
-#endif
-
+/** 
+ * @file llpanelface.h
+ * @brief Panel in the tools floater for editing face textures, colors, etc.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPANELFACE_H
+#define LL_LLPANELFACE_H
+
+#include "v4color.h"
+#include "llpanel.h"
+#include "llmaterial.h"
+#include "llmaterialmgr.h"
+#include "lltextureentry.h"
+#include "llselectmgr.h"
+
+class LLButton;
+class LLCheckBoxCtrl;
+class LLColorSwatchCtrl;
+class LLComboBox;
+class LLInventoryItem;
+class LLLineEditor;
+class LLSpinCtrl;
+class LLTextBox;
+class LLTextureCtrl;
+class LLUICtrl;
+class LLViewerObject;
+class LLFloater;
+class LLMaterialID;
+class LLMediaCtrl;
+class LLMenuButton;
+
+// Represents an edit for use in replicating the op across one or more materials in the selection set.
+//
+// The apply function optionally performs the edit which it implements
+// as a functor taking Data that calls member func MaterialFunc taking SetValueType
+// on an instance of the LLMaterial class.
+//
+// boost who?
+//
+template<
+	typename DataType,
+	typename SetValueType,
+	void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
+class LLMaterialEditFunctor
+{
+public:
+	LLMaterialEditFunctor(const DataType& data) : _data(data) {}
+	virtual ~LLMaterialEditFunctor() {}
+	virtual void apply(LLMaterialPtr& material) { (material->*(MaterialEditFunc))(_data); }
+	DataType _data;
+};
+
+template<
+	typename DataType,
+	DataType (LLMaterial::*MaterialGetFunc)() >
+class LLMaterialGetFunctor
+{
+public:
+	LLMaterialGetFunctor() {}
+	virtual DataType get(LLMaterialPtr& material) { return (material->*(MaterialGetFunc)); }
+};
+
+template<
+	typename DataType,
+	DataType (LLTextureEntry::*TEGetFunc)() >
+class LLTEGetFunctor
+{
+public:
+	LLTEGetFunctor() {}
+	virtual DataType get(LLTextureEntry* entry) { return (entry*(TEGetFunc)); }
+};
+
+class LLPanelFace : public LLPanel
+{
+public:
+	virtual BOOL	postBuild();
+	LLPanelFace();
+	virtual ~LLPanelFace();
+
+	void			refresh();
+    void			refreshMedia();
+    void			unloadMedia();
+
+    /*virtual*/ void draw();
+
+	LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material)
+	{
+		LLMaterialPtr new_material(!current_material.isNull() ? new LLMaterial(current_material->asLLSD()) : new LLMaterial());
+		llassert_always(new_material);
+
+		// Preserve old diffuse alpha mode or assert correct default blend mode as appropriate for the alpha channel content of the diffuse texture
+		//
+		new_material->setDiffuseAlphaMode(current_material.isNull() ? (isAlpha() ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE) : current_material->getDiffuseAlphaMode());
+		return new_material;
+	}
+
+	LLRender::eTexIndex getTextureChannelToEdit();
+
+protected:
+    void			navigateToTitleMedia(const std::string url);
+    bool			selectedMediaEditable();
+    void			clearMediaSettings();
+    void			updateMediaSettings();
+    void			updateMediaTitle();
+
+	void			getState();
+
+	void			sendTexture();			// applies and sends texture
+	void			sendTextureInfo();		// applies and sends texture scale, offset, etc.
+	void			sendColor();			// applies and sends color
+	void			sendAlpha();			// applies and sends transparency
+	void			sendBump(U32 bumpiness);				// applies and sends bump map
+	void			sendTexGen();				// applies and sends bump map
+	void			sendShiny(U32 shininess);			// applies and sends shininess
+	void			sendFullbright();		// applies and sends full bright
+	void			sendGlow();
+    void            alignTestureLayer();
+
+    void            updateCopyTexButton();
+
+	// this function is to return TRUE if the drag should succeed.
+	static BOOL onDragTexture(LLUICtrl* ctrl, LLInventoryItem* item);
+
+	void 	onCommitTexture(const LLSD& data);
+	void 	onCancelTexture(const LLSD& data);
+	void 	onSelectTexture(const LLSD& data);
+	void 	onCommitSpecularTexture(const LLSD& data);
+	void 	onCancelSpecularTexture(const LLSD& data);
+	void 	onSelectSpecularTexture(const LLSD& data);
+	void 	onCommitNormalTexture(const LLSD& data);
+	void 	onCancelNormalTexture(const LLSD& data);
+	void 	onSelectNormalTexture(const LLSD& data);
+	void 	onCommitColor(const LLSD& data);
+	void 	onCommitShinyColor(const LLSD& data);
+	void 	onCommitAlpha(const LLSD& data);
+	void 	onCancelColor(const LLSD& data);
+	void 	onCancelShinyColor(const LLSD& data);
+	void 	onSelectColor(const LLSD& data);
+	void 	onSelectShinyColor(const LLSD& data);
+
+	void 	onCloseTexturePicker(const LLSD& data);
+
+    static bool deleteMediaConfirm(const LLSD& notification, const LLSD& response);
+    static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
+
+	// Make UI reflect state of currently selected material (refresh)
+	// and UI mode (e.g. editing normal map v diffuse map)
+	//
+	// @param force_set_values forces spinners to set value even if they are focused
+	void updateUI(bool force_set_values = false);
+
+	// Convenience func to determine if all faces in selection have
+	// identical planar texgen settings during edits
+	// 
+	bool isIdenticalPlanarTexgen();
+
+	// Callback funcs for individual controls
+	//
+	static void		onCommitTextureInfo(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureScaleX(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureScaleY(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureRot(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureOffsetX(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureOffsetY(LLUICtrl* ctrl, void* userdata);
+
+	static void		onCommitMaterialBumpyScaleX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyScaleY(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyRot(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyOffsetX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyOffsetY(	LLUICtrl* ctrl, void* userdata);
+
+	static void		syncRepeatX(LLPanelFace* self, F32 scaleU);
+	static void		syncRepeatY(LLPanelFace* self, F32 scaleV);
+	static void		syncOffsetX(LLPanelFace* self, F32 offsetU);
+	static void		syncOffsetY(LLPanelFace* self, F32 offsetV);
+	static void 	syncMaterialRot(LLPanelFace* self, F32 rot, int te = -1);
+
+	static void		onCommitMaterialShinyScaleX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyScaleY(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyRot(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyOffsetX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyOffsetY(	LLUICtrl* ctrl, void* userdata);
+
+	static void		onCommitMaterialGloss(			LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialEnv(				LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialMaskCutoff(	LLUICtrl* ctrl, void* userdata);
+
+	static void		onCommitMaterialsMedia(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialType(	LLUICtrl* ctrl, void* userdata);
+	static void 	onClickBtnEditMedia(LLUICtrl* ctrl, void* userdata);
+	static void 	onClickBtnDeleteMedia(LLUICtrl* ctrl, void* userdata);
+	static void 	onClickBtnAddMedia(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitBump(				LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTexGen(			LLUICtrl* ctrl, void* userdata);
+	static void		onCommitShiny(				LLUICtrl* ctrl, void* userdata);
+	static void		onCommitAlphaMode(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitFullbright(		LLUICtrl* ctrl, void* userdata);
+	static void    onCommitGlow(				LLUICtrl* ctrl, void *userdata);
+	static void		onCommitPlanarAlign(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitRepeatsPerMeter(	LLUICtrl* ctrl, void* userinfo);
+	static void		onClickAutoFix(void*);
+    static void		onAlignTexture(void*);
+
+public: // needs to be accessible to selection manager
+    void            onCopyColor(); // records all selected faces
+    void            onPasteColor(); // to specific face
+    void            onPasteColor(LLViewerObject* objectp, S32 te); // to specific face
+    void            onCopyTexture();
+    void            onPasteTexture();
+    void            onPasteTexture(LLViewerObject* objectp, S32 te);
+
+protected:
+    void            menuDoToSelected(const LLSD& userdata);
+    bool            menuEnableItem(const LLSD& userdata);
+
+	static F32     valueGlow(LLViewerObject* object, S32 face);
+
+	
+
+private:
+	bool		isAlpha() { return mIsAlpha; }
+
+	// Convenience funcs to keep the visual flack to a minimum
+	//
+	LLUUID	getCurrentNormalMap();
+	LLUUID	getCurrentSpecularMap();
+	U32		getCurrentShininess();
+	U32		getCurrentBumpiness();
+	U8		getCurrentDiffuseAlphaMode();
+	U8		getCurrentAlphaMaskCutoff();
+	U8		getCurrentEnvIntensity();
+	U8		getCurrentGlossiness();
+	F32		getCurrentBumpyRot();
+	F32		getCurrentBumpyScaleU();
+	F32		getCurrentBumpyScaleV();
+	F32		getCurrentBumpyOffsetU();
+	F32		getCurrentBumpyOffsetV();
+	F32		getCurrentShinyRot();
+	F32		getCurrentShinyScaleU();
+	F32		getCurrentShinyScaleV();
+	F32		getCurrentShinyOffsetU();
+	F32		getCurrentShinyOffsetV();
+
+    LLComboBox *mComboMatMedia;
+    LLMediaCtrl *mTitleMedia;
+    LLTextBox *mTitleMediaText;
+
+	// Update visibility of controls to match current UI mode
+	// (e.g. materials vs media editing)
+	//
+	// Do NOT call updateUI from within this function.
+	//
+	void updateVisibility();
+
+	// Hey look everyone, a type-safe alternative to copy and paste! :)
+	//
+
+	// Update material parameters by applying 'edit_func' to selected TEs
+	//
+	template<
+		typename DataType,
+		typename SetValueType,
+		void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
+	static void edit(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())
+	{
+		LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc > edit(data);
+		struct LLSelectedTEEditMaterial : public LLSelectedTEMaterialFunctor
+		{
+			LLSelectedTEEditMaterial(LLPanelFace* panel, LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* editp, const LLUUID &only_for_object_id) : _panel(panel), _edit(editp), _only_for_object_id(only_for_object_id) {}
+			virtual ~LLSelectedTEEditMaterial() {};
+			virtual LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material)
+			{
+				if (_edit && (_only_for_object_id.isNull() || _only_for_object_id == object->getID()))
+				{
+					LLMaterialPtr new_material = _panel->createDefaultMaterial(current_material);
+					llassert_always(new_material);
+
+					// Determine correct alpha mode for current diffuse texture
+					// (i.e. does it have an alpha channel that makes alpha mode useful)
+					//
+					// _panel->isAlpha() "lies" when one face has alpha and the rest do not (NORSPEC-329)
+					// need to get per-face answer to this question for sane alpha mode retention on updates.
+					//					
+					bool is_alpha_face = object->isImageAlphaBlended(face);
+
+					// need to keep this original answer for valid comparisons in logic below
+					//
+					U8 original_default_alpha_mode = is_alpha_face ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+					
+					U8 default_alpha_mode = original_default_alpha_mode;
+
+					if (!current_material.isNull())
+					{
+						default_alpha_mode = current_material->getDiffuseAlphaMode();
+					}
+
+					// Insure we don't inherit the default of blend by accident...
+					// this will be stomped by a legit request to change the alpha mode by the apply() below
+					//
+					new_material->setDiffuseAlphaMode(default_alpha_mode);
+
+					// Do "It"!
+					//
+					_edit->apply(new_material);
+
+					U32		new_alpha_mode			= new_material->getDiffuseAlphaMode();
+					LLUUID	new_normal_map_id		= new_material->getNormalID();
+					LLUUID	new_spec_map_id			= new_material->getSpecularID();
+
+					if ((new_alpha_mode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) && !is_alpha_face)
+					{
+						new_alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+						new_material->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE);
+					}
+
+					bool is_default_blend_mode		= (new_alpha_mode == original_default_alpha_mode);
+					bool is_need_material			= !is_default_blend_mode || !new_normal_map_id.isNull() || !new_spec_map_id.isNull();
+
+					if (!is_need_material)
+					{
+						LL_DEBUGS("Materials") << "Removing material from object " << object->getID() << " face " << face << LL_ENDL;
+						LLMaterialMgr::getInstance()->remove(object->getID(),face);
+						new_material = NULL;
+					}
+					else
+					{
+						LL_DEBUGS("Materials") << "Putting material on object " << object->getID() << " face " << face << ", material: " << new_material->asLLSD() << LL_ENDL;
+						LLMaterialMgr::getInstance()->put(object->getID(),face,*new_material);
+					}
+
+					object->setTEMaterialParams(face, new_material);
+					return new_material;
+				}
+				return NULL;
+			}
+			LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >*	_edit;
+			LLPanelFace *_panel;
+			const LLUUID & _only_for_object_id;
+		} editor(p, &edit, only_for_object_id);
+		LLSelectMgr::getInstance()->selectionSetMaterialParams(&editor, te);
+	}
+
+	template<
+		typename DataType,
+		typename ReturnType,
+		ReturnType (LLMaterial::* const MaterialGetFunc)() const  >
+	static void getTEMaterialValue(DataType& data_to_return, bool& identical,DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
+	{
+		DataType data_value;
+		struct GetTEMaterialVal : public LLSelectedTEGetFunctor<DataType>
+		{
+			GetTEMaterialVal(DataType default_value) : _default(default_value) {}
+			virtual ~GetTEMaterialVal() {}
+
+			DataType get(LLViewerObject* object, S32 face)
+			{
+				DataType ret = _default;
+				LLMaterialPtr material_ptr;
+				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
+				if (tep)
+				{
+					material_ptr = tep->getMaterialParams();
+					if (!material_ptr.isNull())
+					{
+						ret = (material_ptr->*(MaterialGetFunc))();
+					}
+				}
+				return ret;
+			}
+			DataType _default;
+		} GetFunc(default_value);
+		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetFunc, data_value, has_tolerance, tolerance);
+		data_to_return = data_value;
+	}
+
+	template<
+		typename DataType,
+		typename ReturnType, // some kids just have to different...
+		ReturnType (LLTextureEntry::* const TEGetFunc)() const >
+	static void getTEValue(DataType& data_to_return, bool& identical, DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
+	{
+		DataType data_value;
+		struct GetTEVal : public LLSelectedTEGetFunctor<DataType>
+		{
+			GetTEVal(DataType default_value) : _default(default_value) {}
+			virtual ~GetTEVal() {}
+
+			DataType get(LLViewerObject* object, S32 face) {
+				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
+				return tep ? ((tep->*(TEGetFunc))()) : _default;
+			}
+			DataType _default;
+		} GetTEValFunc(default_value);
+		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetTEValFunc, data_value, has_tolerance, tolerance );
+		data_to_return = data_value;
+	}
+
+	// Update vis and enabling of specific subsets of controls based on material params
+	// (e.g. hide the spec controls if no spec texture is applied)
+	//
+	void updateShinyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
+	void updateBumpyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
+	void updateAlphaControls();
+
+	/*
+	 * Checks whether the selected texture from the LLFloaterTexturePicker can be applied to the currently selected object.
+	 * If agent selects texture which is not allowed to be applied for the currently selected object,
+	 * all controls of the floater texture picker which allow to apply the texture will be disabled.
+	 */
+    void onTextureSelectionChanged(LLInventoryItem* itemp);
+
+    LLMenuButton*   mMenuClipboardColor;
+    LLMenuButton*   mMenuClipboardTexture;
+
+	bool mIsAlpha;
+	
+	/* These variables interlock processing of materials updates sent to
+	 * the sim.  mUpdateInFlight is set to flag that an update has been
+	 * sent to the sim and not acknowledged yet, and cleared when an
+	 * update is received from the sim.  mUpdatePending is set when
+	 * there's an update in flight and another UI change has been made
+	 * that needs to be sent as a materials update, and cleared when the
+	 * update is sent.  This prevents the sim from getting spammed with
+	 * update messages when, for example, the user holds down the
+	 * up-arrow on a spinner, and avoids running afoul of its throttle.
+	 */
+	bool mUpdateInFlight;
+    bool mUpdatePending;
+
+    LLSD            mClipboardParams;
+
+    LLSD mMediaSettings;
+    bool mNeedMediaTitle;
+
+public:
+	#if defined(DEF_GET_MAT_STATE)
+		#undef DEF_GET_MAT_STATE
+	#endif
+
+	#if defined(DEF_GET_TE_STATE)
+		#undef DEF_GET_TE_STATE
+	#endif
+
+	#if defined(DEF_EDIT_MAT_STATE)
+		DEF_EDIT_MAT_STATE
+	#endif
+
+    // Accessors for selected TE material state
+    //
+    #define DEF_GET_MAT_STATE(DataType,ReturnType,MaterialMemberFunc,DefaultValue,HasTolerance,Tolerance)                                           \
+        static void MaterialMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)          \
+        {                                                                                                                                           \
+            getTEMaterialValue< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
+        }
+
+    // Mutators for selected TE material
+    //
+    #define DEF_EDIT_MAT_STATE(DataType,ReturnType,MaterialMemberFunc)                                                              \
+        static void MaterialMemberFunc(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())     \
+        {                                                                                                                           \
+            edit< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(p, data, te, only_for_object_id);                         \
+        }
+
+    // Accessors for selected TE state proper (legacy settings etc)
+    //
+    #define DEF_GET_TE_STATE(DataType,ReturnType,TexEntryMemberFunc,DefaultValue,HasTolerance,Tolerance)                                        \
+        static void TexEntryMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)      \
+        {                                                                                                                                       \
+            getTEValue< DataType, ReturnType, &LLTextureEntry::TexEntryMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
+        }
+
+	class LLSelectedTEMaterial
+	{
+	public:
+		static void getCurrent(LLMaterialPtr& material_ptr, bool& identical_material);
+		static void getMaxSpecularRepeats(F32& repeats, bool& identical);
+		static void getMaxNormalRepeats(F32& repeats, bool& identical);
+		static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical, bool diffuse_texture_has_alpha);
+
+		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getNormalID,LLUUID::null, false, LLUUID::null)
+		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getSpecularID,LLUUID::null, false, LLUUID::null)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatX,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatY,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetX,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetY,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularRotation,0.0f, true, 0.001f)
+
+		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatX,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatY,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetX,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetY,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalRotation,0.0f, true, 0.001f)
+
+		DEF_EDIT_MAT_STATE(U8,U8,setDiffuseAlphaMode);
+		DEF_EDIT_MAT_STATE(U8,U8,setAlphaMaskCutoff);
+
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetX);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetY);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatX);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatY);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalRotation);
+
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetX);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetY);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatX);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatY);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRotation);
+
+		DEF_EDIT_MAT_STATE(U8,U8,setEnvironmentIntensity);
+		DEF_EDIT_MAT_STATE(U8,U8,setSpecularLightExponent);
+
+		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID);
+		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID);
+		DEF_EDIT_MAT_STATE(LLColor4U,	const LLColor4U&,setSpecularLightColor);
+	};
+
+	class LLSelectedTE
+	{
+	public:
+		static void getFace(class LLFace*& face_to_return, bool& identical_face);
+		static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face);
+		static void getTexId(LLUUID& id, bool& identical);
+		static void getObjectScaleS(F32& scale_s, bool& identical);
+		static void getObjectScaleT(F32& scale_t, bool& identical);
+		static void getMaxDiffuseRepeats(F32& repeats, bool& identical);
+
+		DEF_GET_TE_STATE(U8,U8,getBumpmap,0, false, 0)
+		DEF_GET_TE_STATE(U8,U8,getShiny,0, false, 0)
+		DEF_GET_TE_STATE(U8,U8,getFullbright,0, false, 0)
+		DEF_GET_TE_STATE(F32,F32,getRotation,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getOffsetS,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getOffsetT,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getScaleS,1.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getScaleT,1.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getGlow,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(LLTextureEntry::e_texgen,LLTextureEntry::e_texgen,getTexGen,LLTextureEntry::TEX_GEN_DEFAULT, false, LLTextureEntry::TEX_GEN_DEFAULT)
+		DEF_GET_TE_STATE(LLColor4,const LLColor4&,getColor,LLColor4::white, false, LLColor4::black);
+	};
+};
+
+#endif
+
-- 
cgit v1.2.3


From ba1872e57106c7a27a0f73453ace499f42c48345 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 02:32:23 +0200
Subject: =?UTF-8?q?SL-19271=20Remove=20=E2=80=98New=20folder=20window?=
 =?UTF-8?q?=E2=80=99,=20=E2=80=98Open=20in=20new=20window=E2=80=99=20and?=
 =?UTF-8?q?=20=E2=80=98Open=E2=80=99=20from=20Gear=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/llpanelmaininventory.cpp             | 34 +---------------------
 indra/newview/llviewermenu.cpp                     |  1 -
 .../default/xui/en/menu_inventory_gear_default.xml | 31 --------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 ------
 4 files changed, 1 insertion(+), 74 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 5da53cc928..9bfea7fe2b 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1373,27 +1373,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 		return;
 
 	const std::string command_name = userdata.asString();
-    if (command_name == "new_single_folder_window")
-    {
-        newFolderWindow();
-    }
-    if ((command_name == "open_in_current_window") || (command_name == "open_in_new_window"))
-    {
-        LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
-        if (!current_item)
-        {
-            return;
-        }
-        const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
-        if((command_name == "open_in_current_window"))
-        {
-            mSingleFolderPanelInventory->changeFolderRoot(folder_id);
-        }
-        if((command_name == "open_in_new_window"))
-        {
-            newFolderWindow(folder_id);
-        }
-    }
+
 	if (command_name == "new_window")
 	{
 		newWindow();
@@ -1660,19 +1640,7 @@ bool LLPanelMainInventory::isActionVisible(const LLSD& userdata)
     {
         return !mSingleFolderMode;
     }
-    if (param_str == "open_folder" || param_str == "open_new_folder")
-    {
-        if (!mSingleFolderMode && (param_str == "open_folder")) return false;
-
-        LLFolderView* root = getActivePanel()->getRootFolder();
-        std::set<LLFolderViewItem*> selection_set = root->getSelectionList();
-        if (selection_set.size() != 1) return false;
 
-        LLFolderViewItem* current_item = *selection_set.begin();
-        if (!current_item) return false;
-        const LLUUID& folder_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
-        return (gInventory.getCategory(folder_id) != NULL);
-    }
     return true;
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 19930e0e03..015a887e9f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9703,7 +9703,6 @@ void initialize_menus()
 	commit.add("PayObject", boost::bind(&handle_give_money_dialog));
 
 	commit.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow));
-    commit.add("Inventory.NewFolderWindow", boost::bind(&LLPanelMainInventory::newFolderWindow, LLUUID(), LLUUID()));
 
 	enable.add("EnablePayObject", boost::bind(&enable_pay_object));
 	enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar));
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index f778742ed9..d2bd33a44c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -6,37 +6,6 @@
  mouse_opaque="false"
  name="menu_gear_default"
  visible="false">
-    <menu_item_call
-     label="Open"
-     layout="topleft"
-     name="open_in_current_window">
-       <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="open_in_current_window" />
-        <on_visible
-         function="Inventory.GearDefault.Visible"
-         parameter="open_folder" />
-    </menu_item_call>
-    <menu_item_call
-     label="Open in new window"
-     layout="topleft"
-     name="open_in_new_window">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="open_in_new_window" />
-        <on_visible
-         function="Inventory.GearDefault.Visible"
-         parameter="open_new_folder" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Folder Window"
-     layout="topleft"
-     shortcut="control|shift|J"
-     name="new_single_folder">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="new_single_folder_window" />
-    </menu_item_call>
     <menu_item_call
      label="New Inventory Window"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index de11a2c0e9..58584345a9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -36,15 +36,6 @@
          function="Inventory.NewWindow"
          parameter="" />
       </menu_item_call>
-      <menu_item_call
-       label="New Folder Window"
-       name="new_single_folder"
-       shortcut="control|shift|J"
-       visible="false">
-        <menu_item_call.on_click
-         function="Inventory.NewFolderWindow"
-         parameter="" />
-      </menu_item_call>
       <menu_item_call
        label="Places..."
        name="Places"
-- 
cgit v1.2.3


From 46531cea8475741f9144f787fec8be371de082e6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 14:35:44 +0200
Subject: SL-19285 Add 'Close all windows' to Gear menu

---
 indra/newview/llpanelmaininventory.cpp                     | 14 ++++++++++++++
 .../skins/default/xui/en/menu_inventory_gear_default.xml   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 9bfea7fe2b..6b7e447e69 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1489,6 +1489,20 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 		LLFloaterReg::showInstance("linkreplace", params);
 	}
 
+    if (command_name == "close_inv_windows")
+    {
+        LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+        for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end();)
+        {
+            LLFloaterSidePanelContainer* iv = dynamic_cast<LLFloaterSidePanelContainer*>(*iter++);
+            if (iv)
+            {
+                iv->closeFloater();
+            }
+        }
+        LLFloaterReg::hideInstance("inventory_settings");
+    }
+
     if (command_name == "toggle_search_outfits")
     {
         mActivePanel->getFilter().toggleSearchVisibilityOutfits();
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index d2bd33a44c..50e24824fe 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -16,7 +16,7 @@
          parameter="new_window" />
     </menu_item_call>
     <menu_item_call
-     label="Close All Folders"
+     label="Collapse All Folders"
      layout="topleft"
      name="close_folders">
         <on_click
-- 
cgit v1.2.3


From 82dcda526a962953b9e7fb6405d22b263b562a08 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 16:12:45 +0200
Subject: SL-19285 Gear and Sort menus should be opened downward

---
 indra/newview/llpanelmaininventory.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 6b7e447e69..fd245a2b4d 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1239,9 +1239,9 @@ void LLPanelMainInventory::initListCommandsHandlers()
 	mEnableCallbackRegistrar.add("Inventory.GearDefault.Enable", boost::bind(&LLPanelMainInventory::isActionEnabled, this, _2));
     mEnableCallbackRegistrar.add("Inventory.GearDefault.Visible", boost::bind(&LLPanelMainInventory::isActionVisible, this, _2));
 	mMenuGearDefault = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_inventory_gear_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-	mGearMenuButton->setMenu(mMenuGearDefault, LLMenuButton::MP_TOP_LEFT, true);
+	mGearMenuButton->setMenu(mMenuGearDefault, LLMenuButton::MP_BOTTOM_LEFT, true);
     mMenuViewDefault = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_inventory_view_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-    mViewMenuButton->setMenu(mMenuViewDefault);
+    mViewMenuButton->setMenu(mMenuViewDefault, LLMenuButton::MP_BOTTOM_LEFT, true);
 	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory_add.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	mMenuAddHandle = menu->getHandle();
 
-- 
cgit v1.2.3


From 7589b674f512609cb33c53587038c4e29572c1cd Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 19:14:15 +0200
Subject: SL-19288 Change link color to white

---
 indra/newview/llinventorypanel.cpp                          | 8 ++++----
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 82f791a171..6cf1edd26b 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -939,8 +939,8 @@ LLFolderViewFolder * LLInventoryPanel::createFolderViewFolder(LLInvFVBridge * br
 	params.tool_tip = params.name;
     params.allow_drop = allow_drop;
 
-	params.font_color = (bridge->isLibraryItem() ? sLibraryColor : (bridge->isLink() ? sLinkColor : sDefaultColor));
-	params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : (bridge->isLink() ? sLinkColor : sDefaultHighlightColor));
+	params.font_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultColor);
+	params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultHighlightColor);
 	
 	return LLUICtrlFactory::create<LLFolderViewFolder>(params);
 }
@@ -956,8 +956,8 @@ LLFolderViewItem * LLInventoryPanel::createFolderViewItem(LLInvFVBridge * bridge
 	params.rect = LLRect (0, 0, 0, 0);
 	params.tool_tip = params.name;
 
-	params.font_color = (bridge->isLibraryItem() ? sLibraryColor : (bridge->isLink() ? sLinkColor : sDefaultColor));
-	params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : (bridge->isLink() ? sLinkColor : sDefaultHighlightColor));
+	params.font_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultColor);
+	params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultHighlightColor);
 	
 	return LLUICtrlFactory::create<LLFolderViewItem>(params);
 }
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 5f6859622d..2eda9d385b 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -286,6 +286,7 @@
        height="372"
        width="312"
        layout="topleft"
+       show_item_link_overlays="true"
        bg_opaque_color="DkGray2"
        bg_alpha_color="DkGray2"
        background_visible="true"
-- 
cgit v1.2.3


From 3daccc5d2344404af1b3501c35b7cff96468602f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Feb 2023 22:43:53 +0200
Subject: SL-19209 WIP Switch MS Bing to MS Azure

---
 indra/newview/lltranslate.cpp | 117 +++++++++++++++++++++++++++++++-----------
 1 file changed, 88 insertions(+), 29 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index a2c696c762..3e6bf4fe82 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -41,7 +41,7 @@
 #include "llurlregistry.h"
 
 
-static const std::string BING_NOTRANSLATE_OPENING_TAG("<div class=\"notranslate\">");
+static const std::string BING_NOTRANSLATE_OPENING_TAG("<div translate=\"no\">");
 static const std::string BING_NOTRANSLATE_CLOSING_TAG("</div>");
 
 /**
@@ -113,6 +113,14 @@ public:
 
     void verifyKeyCoro(LLTranslate::EService service, std::string key, LLTranslate::KeyVerificationResult_fn fnc);
     void translateMessageCoro(LanguagePair_t fromTo, std::string msg, LLTranslate::TranslationSuccess_fn success, LLTranslate::TranslationFailure_fn failure);
+
+    virtual void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const = 0;
+    virtual LLSD sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+                                       LLCore::HttpRequest::ptr_t request,
+                                       LLCore::HttpOptions::ptr_t options,
+                                       LLCore::HttpHeaders::ptr_t headers,
+                                       const std::string & url,
+                                       const std::string & msg) const = 0;
 };
 
 void LLTranslationAPIHandler::translateMessage(LanguagePair_t fromTo, std::string msg, LLTranslate::TranslationSuccess_fn success, LLTranslate::TranslationFailure_fn failure)
@@ -184,8 +192,7 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
         LLVersionInfo::instance().getPatch(),
         LLVersionInfo::instance().getBuild());
 
-    httpHeaders->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_TEXT_PLAIN);
-    httpHeaders->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+    initHttpHeader(httpHeaders, user_agent);
     httpOpts->setSSLVerifyPeer(false);
 
     std::string url = this->getTranslateURL(fromTo.first, fromTo.second, msg);
@@ -194,8 +201,10 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
         LL_INFOS("Translate") << "No translation URL" << LL_ENDL;
         return;
     }
+    LL_INFOS() << "Message: " << msg << LL_ENDL;
+    LL_INFOS() << "Requesting: " << url << LL_ENDL;
 
-    LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts, httpHeaders);
+    LLSD result = sendMessageAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url, msg);
 
     if (LLApp::isQuitting())
     {
@@ -280,6 +289,14 @@ public:
 
     /*virtual*/ void verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc);
 
+    void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const override;
+    LLSD sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+        LLCore::HttpRequest::ptr_t request,
+        LLCore::HttpOptions::ptr_t options,
+        LLCore::HttpHeaders::ptr_t headers,
+        const std::string & url,
+        const std::string & msg) const override;
+
 private:
     static void parseErrorResponse(
         const Json::Value& root,
@@ -417,31 +434,55 @@ void LLGoogleTranslationHandler::verifyKey(const std::string &key, LLTranslate::
         this, LLTranslate::SERVICE_GOOGLE, key, fnc));
 }
 
+/*virtual*/
+void LLGoogleTranslationHandler::initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const
+{
+    headers->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_TEXT_PLAIN);
+    headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+}
+
+LLSD LLGoogleTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+    LLCore::HttpRequest::ptr_t request,
+    LLCore::HttpOptions::ptr_t options,
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string & url,
+    const std::string & msg) const
+{
+    return adapter->getRawAndSuspend(request, url, options, headers);
+}
 
 //=========================================================================
 /// Microsoft Translator v2 API handler.
-class LLBingTranslationHandler : public LLTranslationAPIHandler
+class LLAzureTranslationHandler : public LLTranslationAPIHandler
 {
-    LOG_CLASS(LLBingTranslationHandler);
+    LOG_CLASS(LLAzureTranslationHandler);
 
 public:
-    /*virtual*/ std::string getTranslateURL(
+    std::string getTranslateURL(
         const std::string &from_lang,
         const std::string &to_lang,
-        const std::string &text) const;
-    /*virtual*/ std::string getKeyVerificationURL(
-        const std::string &key) const;
-    /*virtual*/ bool parseResponse(
+        const std::string &text) const override;
+    std::string getKeyVerificationURL(
+        const std::string &key) const override;
+    bool parseResponse(
         int& status,
         const std::string& body,
         std::string& translation,
         std::string& detected_lang,
-        std::string& err_msg) const;
-    /*virtual*/ bool isConfigured() const;
+        std::string& err_msg) const override;
+    bool isConfigured() const override;
 
-    /*virtual*/ LLTranslate::EService getCurrentService() { return LLTranslate::EService::SERVICE_BING; }
+    LLTranslate::EService getCurrentService() override { return LLTranslate::EService::SERVICE_BING; }
 
-    /*virtual*/ void verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc);
+    void verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc) override;
+
+    void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const override;
+    LLSD sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+        LLCore::HttpRequest::ptr_t request,
+        LLCore::HttpOptions::ptr_t options,
+        LLCore::HttpHeaders::ptr_t headers,
+        const std::string & url,
+        const std::string & msg) const override;
 private:
     static std::string getAPIKey();
     static std::string getAPILanguageCode(const std::string& lang);
@@ -450,23 +491,20 @@ private:
 
 //-------------------------------------------------------------------------
 // virtual
-std::string LLBingTranslationHandler::getTranslateURL(
+std::string LLAzureTranslationHandler::getTranslateURL(
 	const std::string &from_lang,
 	const std::string &to_lang,
 	const std::string &text) const
 {
-	std::string url = std::string("http://api.microsofttranslator.com/v2/Http.svc/Translate?appId=")
-		+ getAPIKey() + "&text=" + LLURI::escape(text) + "&to=" + getAPILanguageCode(to_lang);
-	if (!from_lang.empty())
-	{
-		url += "&from=" + getAPILanguageCode(from_lang);
-	}
+    // Global service. Alternatively regional services exist.
+	std::string url = std::string("https://api.cognitive.microsofttranslator.com/translate?api-version=3.0&to=")
+		+ getAPILanguageCode(to_lang) + "&Subscription-Key=" + getAPIKey();
     return url;
 }
 
 
 // virtual
-std::string LLBingTranslationHandler::getKeyVerificationURL(
+std::string LLAzureTranslationHandler::getKeyVerificationURL(
 	const std::string& key) const
 {
 	std::string url = std::string("http://api.microsofttranslator.com/v2/Http.svc/GetLanguagesForTranslate?appId=")
@@ -475,7 +513,7 @@ std::string LLBingTranslationHandler::getKeyVerificationURL(
 }
 
 // virtual
-bool LLBingTranslationHandler::parseResponse(
+bool LLAzureTranslationHandler::parseResponse(
 	int& status,
 	const std::string& body,
 	std::string& translation,
@@ -521,30 +559,51 @@ bool LLBingTranslationHandler::parseResponse(
 }
 
 // virtual
-bool LLBingTranslationHandler::isConfigured() const
+bool LLAzureTranslationHandler::isConfigured() const
 {
 	return !getAPIKey().empty();
 }
 
 // static
-std::string LLBingTranslationHandler::getAPIKey()
+std::string LLAzureTranslationHandler::getAPIKey()
 {
 	return gSavedSettings.getString("BingTranslateAPIKey");
 }
 
 // static
-std::string LLBingTranslationHandler::getAPILanguageCode(const std::string& lang)
+std::string LLAzureTranslationHandler::getAPILanguageCode(const std::string& lang)
 {
 	return lang == "zh" ? "zh-CHT" : lang; // treat Chinese as Traditional Chinese
 }
 
 /*virtual*/
-void LLBingTranslationHandler::verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc)
+void LLAzureTranslationHandler::verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc)
 {
     LLCoros::instance().launch("Bing /Verify Key", boost::bind(&LLTranslationAPIHandler::verifyKeyCoro, 
         this, LLTranslate::SERVICE_BING, key, fnc));
 }
 
+/*virtual*/
+void LLAzureTranslationHandler::initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const
+{
+    headers->append(HTTP_OUT_HEADER_CONTENT_TYPE, HTTP_CONTENT_JSON);
+    // Token based autorization exists
+    //headers->append("Ocp-Apim-Subscription-Key", getAPIKey());
+    headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+}
+
+LLSD LLAzureTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+    LLCore::HttpRequest::ptr_t request,
+    LLCore::HttpOptions::ptr_t options,
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string & url,
+    const std::string & msg) const
+{
+    LLSD body;
+    body["text"] = "Hello, what is your name?";
+    return adapter->postJsonAndSuspend(request, url, body, headers);
+}
+
 //=========================================================================
 /*static*/
 void LLTranslate::translateMessage(const std::string &from_lang, const std::string &to_lang,
@@ -652,7 +711,7 @@ LLTranslationAPIHandler& LLTranslate::getPreferredHandler()
 LLTranslationAPIHandler& LLTranslate::getHandler(EService service)
 {
 	static LLGoogleTranslationHandler google;
-	static LLBingTranslationHandler bing;
+	static LLAzureTranslationHandler bing;
 
 	if (service == SERVICE_GOOGLE)
 	{
-- 
cgit v1.2.3


From 3fc3627f2d27b181269416f346f29d6451f7009a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Feb 2023 11:59:48 +0200
Subject: SL-19209 WIP Switch MS Bing to MS Azure #2

---
 indra/newview/app_settings/settings.xml            |  17 +-
 indra/newview/llfloatertranslationsettings.cpp     | 120 +++++---
 indra/newview/llfloatertranslationsettings.h       |  18 +-
 indra/newview/lltranslate.cpp                      | 317 +++++++++++++++------
 indra/newview/lltranslate.h                        |  14 +-
 .../xui/en/floater_translation_settings.xml        |  95 ++++--
 6 files changed, 420 insertions(+), 161 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 411f77e6a7..ddd4f57f3f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12929,13 +12929,13 @@
     <key>TranslationService</key>
     <map>
       <key>Comment</key>
-      <string>Translation API to use. (google|bing)</string>
+      <string>Translation API to use. (google|azure)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>bing</string>
+      <string>azure</string>
     </map>
     <key>GoogleTranslateAPIKey</key>
     <map>
@@ -12951,7 +12951,7 @@
     <key>BingTranslateAPIKey</key>
     <map>
       <key>Comment</key>
-      <string>Bing AppID to use with the Microsoft Translator API</string>
+      <string>(Deprecated) Bing AppID to use with the Microsoft Translator API</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -12959,6 +12959,17 @@
       <key>Value</key>
       <string></string>
     </map>
+    <key>AzureTranslateAPIKey</key>
+    <map>
+      <key>Comment</key>
+      <string>Azure Translation service data to use with the MS Azure Translator API</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>LLSD</string>
+      <key>Value</key>
+      <string></string>
+    </map>
     <key>TutorialURL</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp
index 082bb888b1..45f46aacf5 100644
--- a/indra/newview/llfloatertranslationsettings.cpp
+++ b/indra/newview/llfloatertranslationsettings.cpp
@@ -45,14 +45,7 @@
 LLFloaterTranslationSettings::LLFloaterTranslationSettings(const LLSD& key)
 :	LLFloater(key)
 ,	mMachineTranslationCB(NULL)
-,	mLanguageCombo(NULL)
-,	mTranslationServiceRadioGroup(NULL)
-,	mBingAPIKeyEditor(NULL)
-,	mGoogleAPIKeyEditor(NULL)
-,	mBingVerifyBtn(NULL)
-,	mGoogleVerifyBtn(NULL)
-,	mOKBtn(NULL)
-,	mBingKeyVerified(false)
+,	mAzureKeyVerified(false)
 ,	mGoogleKeyVerified(false)
 {
 }
@@ -63,9 +56,11 @@ BOOL LLFloaterTranslationSettings::postBuild()
 	mMachineTranslationCB = getChild<LLCheckBoxCtrl>("translate_chat_checkbox");
 	mLanguageCombo = getChild<LLComboBox>("translate_language_combo");
 	mTranslationServiceRadioGroup = getChild<LLRadioGroup>("translation_service_rg");
-	mBingAPIKeyEditor = getChild<LLLineEditor>("bing_api_key");
+    mAzureAPIEndpointEditor = getChild<LLComboBox>("azure_api_endpoint_combo");
+	mAzureAPIKeyEditor = getChild<LLLineEditor>("azure_api_key");
+    mAzureAPIRegionEditor = getChild<LLLineEditor>("azure_api_region");
 	mGoogleAPIKeyEditor = getChild<LLLineEditor>("google_api_key");
-	mBingVerifyBtn = getChild<LLButton>("verify_bing_api_key_btn");
+	mAzureVerifyBtn = getChild<LLButton>("verify_azure_api_key_btn");
 	mGoogleVerifyBtn = getChild<LLButton>("verify_google_api_key_btn");
 	mOKBtn = getChild<LLButton>("ok_btn");
 
@@ -73,11 +68,17 @@ BOOL LLFloaterTranslationSettings::postBuild()
 	mTranslationServiceRadioGroup->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::updateControlsEnabledState, this));
 	mOKBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnOK, this));
 	getChild<LLButton>("cancel_btn")->setClickedCallback(boost::bind(&LLFloater::closeFloater, this, false));
-	mBingVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnBingVerify, this));
+	mAzureVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnAzureVerify, this));
 	mGoogleVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnGoogleVerify, this));
 
-	mBingAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
-	mBingAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onBingKeyEdited, this), NULL);
+	mAzureAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
+	mAzureAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL);
+    mAzureAPIRegionEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
+    mAzureAPIRegionEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL);
+
+    mAzureAPIEndpointEditor->setFocusLostCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this));
+    mAzureAPIEndpointEditor->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this));
+
 	mGoogleAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
 	mGoogleAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onGoogleKeyEdited, this), NULL);
 
@@ -92,17 +93,27 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
 	mLanguageCombo->setSelectedByValue(gSavedSettings.getString("TranslateLanguage"), TRUE);
 	mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), TRUE);
 
-	std::string bing_key = gSavedSettings.getString("BingTranslateAPIKey");
-	if (!bing_key.empty())
+	LLSD azure_key = gSavedSettings.getLLSD("AzureTranslateAPIKey");
+	if (azure_key.isMap())
 	{
-		mBingAPIKeyEditor->setText(bing_key);
-		mBingAPIKeyEditor->setTentative(FALSE);
-		verifyKey(LLTranslate::SERVICE_BING, bing_key, false);
+		mAzureAPIKeyEditor->setText(azure_key["id"].asString());
+		mAzureAPIKeyEditor->setTentative(false);
+        if (azure_key.has("region"))
+        {
+            mAzureAPIRegionEditor->setText(azure_key["region"].asString());
+            mAzureAPIRegionEditor->setTentative(false);
+        }
+        else
+        {
+            mAzureAPIRegionEditor->setTentative(true);
+        }
+        mAzureAPIEndpointEditor->setValue(azure_key["endpoint"]);
+		verifyKey(LLTranslate::SERVICE_AZURE, azure_key, false);
 	}
 	else
 	{
-		mBingAPIKeyEditor->setTentative(TRUE);
-		mBingKeyVerified = FALSE;
+		mAzureAPIKeyEditor->setTentative(TRUE);
+		mAzureKeyVerified = FALSE;
 	}
 
 	std::string google_key = gSavedSettings.getString("GoogleTranslateAPIKey");
@@ -121,14 +132,14 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
 	updateControlsEnabledState();
 }
 
-void LLFloaterTranslationSettings::setBingVerified(bool ok, bool alert)
+void LLFloaterTranslationSettings::setAzureVerified(bool ok, bool alert)
 {
 	if (alert)
 	{
-		showAlert(ok ? "bing_api_key_verified" : "bing_api_key_not_verified");
+		showAlert(ok ? "azure_api_key_verified" : "azure_api_key_not_verified");
 	}
 
-	mBingKeyVerified = ok;
+	mAzureKeyVerified = ok;
 	updateControlsEnabledState();
 }
 
@@ -148,9 +159,19 @@ std::string LLFloaterTranslationSettings::getSelectedService() const
 	return mTranslationServiceRadioGroup->getSelectedValue().asString();
 }
 
-std::string LLFloaterTranslationSettings::getEnteredBingKey() const
+LLSD LLFloaterTranslationSettings::getEnteredAzureKey() const
 {
-	return mBingAPIKeyEditor->getTentative() ? LLStringUtil::null : mBingAPIKeyEditor->getText();
+    LLSD key;
+    if (!mAzureAPIKeyEditor->getTentative())
+    {
+        key["endpoint"] = mAzureAPIEndpointEditor->getValue();
+        key["id"] = mAzureAPIKeyEditor->getText();
+        if (!mAzureAPIRegionEditor->getTentative())
+        {
+            key["region"] = mAzureAPIRegionEditor->getText();
+        }
+    }
+	return key;
 }
 
 std::string LLFloaterTranslationSettings::getEnteredGoogleKey() const
@@ -170,27 +191,31 @@ void LLFloaterTranslationSettings::updateControlsEnabledState()
 	// Enable/disable controls based on the checkbox value.
 	bool on = mMachineTranslationCB->getValue().asBoolean();
 	std::string service = getSelectedService();
-	bool bing_selected = service == "bing";
+	bool azure_selected = service == "azure";
 	bool google_selected = service == "google";
 
 	mTranslationServiceRadioGroup->setEnabled(on);
 	mLanguageCombo->setEnabled(on);
 
-	getChild<LLTextBox>("bing_api_key_label")->setEnabled(on);
-	mBingAPIKeyEditor->setEnabled(on);
+	getChild<LLTextBox>("azure_api_endoint_label")->setEnabled(on);
+	mAzureAPIEndpointEditor->setEnabled(on);
+    getChild<LLTextBox>("azure_api_key_label")->setEnabled(on);
+    mAzureAPIKeyEditor->setEnabled(on);
+    getChild<LLTextBox>("azure_api_region_label")->setEnabled(on);
+    mAzureAPIRegionEditor->setEnabled(on);
 
 	getChild<LLTextBox>("google_api_key_label")->setEnabled(on);
 	mGoogleAPIKeyEditor->setEnabled(on);
 
-	mBingAPIKeyEditor->setEnabled(on && bing_selected);
+	mAzureAPIKeyEditor->setEnabled(on && azure_selected);
 	mGoogleAPIKeyEditor->setEnabled(on && google_selected);
 
-	mBingVerifyBtn->setEnabled(on && bing_selected &&
-		!mBingKeyVerified && !getEnteredBingKey().empty());
+	mAzureVerifyBtn->setEnabled(on && azure_selected &&
+		!mAzureKeyVerified && getEnteredAzureKey().isMap());
 	mGoogleVerifyBtn->setEnabled(on && google_selected &&
 		!mGoogleKeyVerified && !getEnteredGoogleKey().empty());
 
-	bool service_verified = (bing_selected && mBingKeyVerified) || (google_selected && mGoogleKeyVerified);
+	bool service_verified = (azure_selected && mAzureKeyVerified) || (google_selected && mGoogleKeyVerified);
 	gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified);
 
 	mOKBtn->setEnabled(!on || service_verified);
@@ -210,8 +235,8 @@ void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, b
 
     switch (service)
     {
-    case LLTranslate::SERVICE_BING:
-        floater->setBingVerified(ok, alert);
+    case LLTranslate::SERVICE_AZURE:
+        floater->setAzureVerified(ok, alert);
         break;
     case LLTranslate::SERVICE_GOOGLE:
         floater->setGoogleVerified(ok, alert);
@@ -220,7 +245,7 @@ void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, b
 }
 
 
-void LLFloaterTranslationSettings::verifyKey(int service, const std::string& key, bool alert)
+void LLFloaterTranslationSettings::verifyKey(int service, const LLSD& key, bool alert)
 {
     LLTranslate::verifyKey(static_cast<LLTranslate::EService>(service), key,
         boost::bind(&LLFloaterTranslationSettings::setVerificationStatus, _1, _2, alert));
@@ -239,11 +264,14 @@ void LLFloaterTranslationSettings::onEditorFocused(LLFocusableElement* control)
 	}
 }
 
-void LLFloaterTranslationSettings::onBingKeyEdited()
+void LLFloaterTranslationSettings::onAzureKeyEdited()
 {
-	if (mBingAPIKeyEditor->isDirty())
+	if (mAzureAPIKeyEditor->isDirty()
+        || mAzureAPIRegionEditor->isDirty()
+        || mAzureAPIEndpointEditor->getValue().isString())
 	{
-		setBingVerified(false, false);
+        // todo: verify mAzureAPIEndpointEditor url
+		setAzureVerified(false, false);
 	}
 }
 
@@ -255,12 +283,12 @@ void LLFloaterTranslationSettings::onGoogleKeyEdited()
 	}
 }
 
-void LLFloaterTranslationSettings::onBtnBingVerify()
+void LLFloaterTranslationSettings::onBtnAzureVerify()
 {
-	std::string key = getEnteredBingKey();
-	if (!key.empty())
+	LLSD key = getEnteredAzureKey();
+	if (key.isMap())
 	{
-		verifyKey(LLTranslate::SERVICE_BING, key);
+		verifyKey(LLTranslate::SERVICE_AZURE, key);
 	}
 }
 
@@ -269,16 +297,16 @@ void LLFloaterTranslationSettings::onBtnGoogleVerify()
 	std::string key = getEnteredGoogleKey();
 	if (!key.empty())
 	{
-		verifyKey(LLTranslate::SERVICE_GOOGLE, key);
+		verifyKey(LLTranslate::SERVICE_GOOGLE, LLSD(key));
 	}
 }
 void LLFloaterTranslationSettings::onClose(bool app_quitting)
 {
 	std::string service = gSavedSettings.getString("TranslationService");
-	bool bing_selected = service == "bing";
+	bool azure_selected = service == "azure";
 	bool google_selected = service == "google";
 
-	bool service_verified = (bing_selected && mBingKeyVerified) || (google_selected && mGoogleKeyVerified);
+	bool service_verified = (azure_selected && mAzureKeyVerified) || (google_selected && mGoogleKeyVerified);
 	gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified);
 
 }
@@ -287,7 +315,7 @@ void LLFloaterTranslationSettings::onBtnOK()
 	gSavedSettings.setBOOL("TranslateChat", mMachineTranslationCB->getValue().asBoolean());
 	gSavedSettings.setString("TranslateLanguage", mLanguageCombo->getSelectedValue().asString());
 	gSavedSettings.setString("TranslationService", getSelectedService());
-	gSavedSettings.setString("BingTranslateAPIKey", getEnteredBingKey());
+	gSavedSettings.setLLSD("AzureTranslateAPIKey", getEnteredAzureKey());
 	gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey());
 
 	closeFloater(false);
diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h
index 2a15eacded..52523f4d4a 100644
--- a/indra/newview/llfloatertranslationsettings.h
+++ b/indra/newview/llfloatertranslationsettings.h
@@ -42,22 +42,22 @@ public:
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void onOpen(const LLSD& key);
 
-	void setBingVerified(bool ok, bool alert);
+	void setAzureVerified(bool ok, bool alert);
 	void setGoogleVerified(bool ok, bool alert);
 	void onClose(bool app_quitting);
 
 private:
 	std::string getSelectedService() const;
-	std::string getEnteredBingKey() const;
+	LLSD getEnteredAzureKey() const;
 	std::string getEnteredGoogleKey() const;
 	void showAlert(const std::string& msg_name) const;
 	void updateControlsEnabledState();
-	void verifyKey(int service, const std::string& key, bool alert = true);
+    void verifyKey(int service, const LLSD& key, bool alert = true);
 
 	void onEditorFocused(LLFocusableElement* control);
-	void onBingKeyEdited();
+	void onAzureKeyEdited();
 	void onGoogleKeyEdited();
-	void onBtnBingVerify();
+	void onBtnAzureVerify();
 	void onBtnGoogleVerify();
 	void onBtnOK();
 
@@ -65,14 +65,16 @@ private:
 
 	LLCheckBoxCtrl* mMachineTranslationCB;
 	LLComboBox* mLanguageCombo;
-	LLLineEditor* mBingAPIKeyEditor;
+    LLComboBox* mAzureAPIEndpointEditor;;
+	LLLineEditor* mAzureAPIKeyEditor;
+    LLLineEditor* mAzureAPIRegionEditor;
 	LLLineEditor* mGoogleAPIKeyEditor;
 	LLRadioGroup* mTranslationServiceRadioGroup;
-	LLButton* mBingVerifyBtn;
+	LLButton* mAzureVerifyBtn;
 	LLButton* mGoogleVerifyBtn;
 	LLButton* mOKBtn;
 
-	bool mBingKeyVerified;
+	bool mAzureKeyVerified;
 	bool mGoogleKeyVerified;
 };
 
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 3e6bf4fe82..706b4cc6ee 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -80,7 +80,18 @@ public:
     * @param[in]  key  Key to verify.
     */
     virtual std::string getKeyVerificationURL(
-        const std::string &key) const = 0;
+        const LLSD &key) const = 0;
+
+    /**
+    * Check API verification response.
+    *
+    * @param[out] bool  true if valid.
+    * @param[in]  response
+    * @param[in]  status
+    */
+    virtual bool checkVerificationResponse(
+        const LLSD &response,
+        int status) const = 0;
 
     /**
     * Parse translation response.
@@ -105,22 +116,28 @@ public:
 
     virtual LLTranslate::EService getCurrentService() = 0;
 
-    virtual void verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc) = 0;
+    virtual void verifyKey(const LLSD &key, LLTranslate::KeyVerificationResult_fn fnc) = 0;
     virtual void translateMessage(LanguagePair_t fromTo, std::string msg, LLTranslate::TranslationSuccess_fn success, LLTranslate::TranslationFailure_fn failure);
 
 
     virtual ~LLTranslationAPIHandler() {}
 
-    void verifyKeyCoro(LLTranslate::EService service, std::string key, LLTranslate::KeyVerificationResult_fn fnc);
+    void verifyKeyCoro(LLTranslate::EService service, LLSD key, LLTranslate::KeyVerificationResult_fn fnc);
     void translateMessageCoro(LanguagePair_t fromTo, std::string msg, LLTranslate::TranslationSuccess_fn success, LLTranslate::TranslationFailure_fn failure);
 
     virtual void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const = 0;
+    virtual void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent, const LLSD &key) const = 0;
     virtual LLSD sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
                                        LLCore::HttpRequest::ptr_t request,
                                        LLCore::HttpOptions::ptr_t options,
                                        LLCore::HttpHeaders::ptr_t headers,
                                        const std::string & url,
                                        const std::string & msg) const = 0;
+    virtual LLSD verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+        LLCore::HttpRequest::ptr_t request,
+        LLCore::HttpOptions::ptr_t options,
+        LLCore::HttpHeaders::ptr_t headers,
+        const std::string & url) const = 0;
 };
 
 void LLTranslationAPIHandler::translateMessage(LanguagePair_t fromTo, std::string msg, LLTranslate::TranslationSuccess_fn success, LLTranslate::TranslationFailure_fn failure)
@@ -130,8 +147,7 @@ void LLTranslationAPIHandler::translateMessage(LanguagePair_t fromTo, std::strin
 
 }
 
-
-void LLTranslationAPIHandler::verifyKeyCoro(LLTranslate::EService service, std::string key, LLTranslate::KeyVerificationResult_fn fnc)
+void LLTranslationAPIHandler::verifyKeyCoro(LLTranslate::EService service, LLSD key, LLTranslate::KeyVerificationResult_fn fnc)
 {
     LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
     LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
@@ -148,8 +164,7 @@ void LLTranslationAPIHandler::verifyKeyCoro(LLTranslate::EService service, std::
         LLVersionInfo::instance().getPatch(),
         LLVersionInfo::instance().getBuild());
 
-    httpHeaders->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_TEXT_PLAIN);
-    httpHeaders->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+    initHttpHeader(httpHeaders, user_agent, key);
 
     httpOpts->setFollowRedirects(true);
     httpOpts->setSSLVerifyPeer(false);
@@ -161,17 +176,22 @@ void LLTranslationAPIHandler::verifyKeyCoro(LLTranslate::EService service, std::
         return;
     }
 
-    LLSD result = httpAdapter->getAndSuspend(httpRequest, url, httpOpts, httpHeaders);
+    LLSD result = verifyAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url);
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
 
     bool bOk = true;
-    if (!status)
+    int parseResult = status.getType();
+    if (!checkVerificationResponse(httpResults, parseResult))
+    {
         bOk = false;
+    }
 
     if (!fnc.empty())
+    {
         fnc(service, bOk);
+    }
 }
 
 void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::string msg,
@@ -192,7 +212,7 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
         LLVersionInfo::instance().getPatch(),
         LLVersionInfo::instance().getBuild());
 
-    initHttpHeader(httpHeaders, user_agent);
+    initHttpHeader(httpHeaders, user_agent);
     httpOpts->setSSLVerifyPeer(false);
 
     std::string url = this->getTranslateURL(fromTo.first, fromTo.second, msg);
@@ -251,6 +271,11 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
     }
     else
     {
+        if (err_msg.empty() && httpResults.has("error_body"))
+        {
+            err_msg = httpResults["error_body"].asString();
+        }
+
         if (err_msg.empty())
         {
             err_msg = LLTrans::getString("TranslationResponseParseError");
@@ -271,25 +296,29 @@ class LLGoogleTranslationHandler : public LLTranslationAPIHandler
     LOG_CLASS(LLGoogleTranslationHandler);
 
 public:
-    /*virtual*/ std::string getTranslateURL(
+    std::string getTranslateURL(
         const std::string &from_lang,
         const std::string &to_lang,
-        const std::string &text) const;
-    /*virtual*/ std::string getKeyVerificationURL(
-        const std::string &key) const;
-    /*virtual*/ bool parseResponse(
+        const std::string &text) const override;
+    std::string getKeyVerificationURL(
+        const LLSD &key) const override;
+    bool checkVerificationResponse(
+        const LLSD &response,
+        int status) const override;
+    bool parseResponse(
         int& status,
         const std::string& body,
         std::string& translation,
         std::string& detected_lang,
-        std::string& err_msg) const;
-    /*virtual*/ bool isConfigured() const;
+        std::string& err_msg) const override;
+    bool isConfigured() const override;
 
-    /*virtual*/ LLTranslate::EService getCurrentService() { return LLTranslate::EService::SERVICE_GOOGLE; }
+    LLTranslate::EService getCurrentService() override { return LLTranslate::EService::SERVICE_GOOGLE; }
 
-    /*virtual*/ void verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc);
+    void verifyKey(const LLSD &key, LLTranslate::KeyVerificationResult_fn fnc) override;
 
     void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const override;
+    void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent, const LLSD &key) const override;
     LLSD sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
         LLCore::HttpRequest::ptr_t request,
         LLCore::HttpOptions::ptr_t options,
@@ -297,6 +326,12 @@ public:
         const std::string & url,
         const std::string & msg) const override;
 
+    LLSD verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+        LLCore::HttpRequest::ptr_t request,
+        LLCore::HttpOptions::ptr_t options,
+        LLCore::HttpHeaders::ptr_t headers,
+        const std::string & url) const override;
+
 private:
     static void parseErrorResponse(
         const Json::Value& root,
@@ -328,13 +363,21 @@ std::string LLGoogleTranslationHandler::getTranslateURL(
 
 // virtual
 std::string LLGoogleTranslationHandler::getKeyVerificationURL(
-	const std::string& key) const
+	const LLSD& key) const
 {
-	std::string url = std::string("https://www.googleapis.com/language/translate/v2/languages?key=")
-		+ key + "&target=en";
+    std::string url = std::string("https://www.googleapis.com/language/translate/v2/languages?key=")
+        + key.asString() +"&target=en";
     return url;
 }
 
+//virtual
+bool LLGoogleTranslationHandler::checkVerificationResponse(
+    const LLSD &response,
+    int status) const
+{
+    return status == HTTP_OK;
+}
+
 // virtual
 bool LLGoogleTranslationHandler::parseResponse(
 	int& status,
@@ -424,11 +467,12 @@ bool LLGoogleTranslationHandler::parseTranslation(
 // static
 std::string LLGoogleTranslationHandler::getAPIKey()
 {
-	return gSavedSettings.getString("GoogleTranslateAPIKey");
+    static LLCachedControl<std::string> google_key(gSavedSettings, "GoogleTranslateAPIKey");
+	return google_key;
 }
 
 /*virtual*/ 
-void LLGoogleTranslationHandler::verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc)
+void LLGoogleTranslationHandler::verifyKey(const LLSD &key, LLTranslate::KeyVerificationResult_fn fnc)
 {
     LLCoros::instance().launch("Google /Verify Key", boost::bind(&LLTranslationAPIHandler::verifyKeyCoro,
         this, LLTranslate::SERVICE_GOOGLE, key, fnc));
@@ -441,6 +485,16 @@ void LLGoogleTranslationHandler::initHttpHeader(LLCore::HttpHeaders::ptr_t heade
     headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
 }
 
+/*virtual*/
+void LLGoogleTranslationHandler::initHttpHeader(
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string& user_agent,
+    const LLSD &key) const
+{
+    headers->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_TEXT_PLAIN);
+    headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+}
+
 LLSD LLGoogleTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
     LLCore::HttpRequest::ptr_t request,
     LLCore::HttpOptions::ptr_t options,
@@ -451,6 +505,15 @@ LLSD LLGoogleTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCorou
     return adapter->getRawAndSuspend(request, url, options, headers);
 }
 
+LLSD LLGoogleTranslationHandler::verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+    LLCore::HttpRequest::ptr_t request,
+    LLCore::HttpOptions::ptr_t options,
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string & url) const
+{
+    return adapter->getAndSuspend(request, url, options, headers);
+}
+
 //=========================================================================
 /// Microsoft Translator v2 API handler.
 class LLAzureTranslationHandler : public LLTranslationAPIHandler
@@ -463,7 +526,10 @@ public:
         const std::string &to_lang,
         const std::string &text) const override;
     std::string getKeyVerificationURL(
-        const std::string &key) const override;
+        const LLSD &key) const override;
+    bool checkVerificationResponse(
+        const LLSD &response,
+        int status) const override;
     bool parseResponse(
         int& status,
         const std::string& body,
@@ -472,19 +538,26 @@ public:
         std::string& err_msg) const override;
     bool isConfigured() const override;
 
-    LLTranslate::EService getCurrentService() override { return LLTranslate::EService::SERVICE_BING; }
+    LLTranslate::EService getCurrentService() override { return LLTranslate::EService::SERVICE_AZURE; }
 
-    void verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc) override;
+    void verifyKey(const LLSD &key, LLTranslate::KeyVerificationResult_fn fnc) override;
 
     void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const override;
+    void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent, const LLSD &key) const override;
     LLSD sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
         LLCore::HttpRequest::ptr_t request,
         LLCore::HttpOptions::ptr_t options,
         LLCore::HttpHeaders::ptr_t headers,
         const std::string & url,
         const std::string & msg) const override;
+
+    LLSD verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+        LLCore::HttpRequest::ptr_t request,
+        LLCore::HttpOptions::ptr_t options,
+        LLCore::HttpHeaders::ptr_t headers,
+        const std::string & url) const override;
 private:
-    static std::string getAPIKey();
+    static LLSD getAPIKey();
     static std::string getAPILanguageCode(const std::string& lang);
 
 };
@@ -496,22 +569,49 @@ std::string LLAzureTranslationHandler::getTranslateURL(
 	const std::string &to_lang,
 	const std::string &text) const
 {
-    // Global service. Alternatively regional services exist.
-	std::string url = std::string("https://api.cognitive.microsofttranslator.com/translate?api-version=3.0&to=")
-		+ getAPILanguageCode(to_lang) + "&Subscription-Key=" + getAPIKey();
+    std::string url;
+    LLSD key = getAPIKey();
+    if (key.isMap())
+    {
+        std::string endpoint = key["endpoint"].asString();
+        // todo: validate url
+        if (*endpoint.rbegin() != '/')
+        {
+            endpoint += "/";
+        }
+        url = endpoint + std::string("translate?api-version=3.0&to=")
+            + getAPILanguageCode(to_lang);
+    }
     return url;
 }
 
 
 // virtual
 std::string LLAzureTranslationHandler::getKeyVerificationURL(
-	const std::string& key) const
+	const LLSD& key) const
 {
-	std::string url = std::string("http://api.microsofttranslator.com/v2/Http.svc/GetLanguagesForTranslate?appId=")
-		+ key;
+    std::string url;
+    if (key.isMap())
+    {
+        std::string endpoint = key["endpoint"].asString();
+        // todo: validate url
+        if (*endpoint.rbegin() != '/')
+        {
+            endpoint += "/";
+        }
+        url = endpoint + std::string("translate?api-version=3.0&to=en");
+    }
     return url;
 }
 
+//virtual
+bool LLAzureTranslationHandler::checkVerificationResponse(
+    const LLSD &response,
+    int status) const
+{
+    return status == HTTP_BAD_REQUEST; // would have been 401 if id was wrong
+}
+
 // virtual
 bool LLAzureTranslationHandler::parseResponse(
 	int& status,
@@ -522,52 +622,71 @@ bool LLAzureTranslationHandler::parseResponse(
 {
 	if (status != HTTP_OK)
 	{
-		static const std::string MSG_BEGIN_MARKER = "Message: ";
-		size_t begin = body.find(MSG_BEGIN_MARKER);
-		if (begin != std::string::npos)
-		{
-			begin += MSG_BEGIN_MARKER.size();
-		}
-		else
-		{
-			begin = 0;
-			err_msg.clear();
-		}
-		size_t end = body.find("</p>", begin);
-		err_msg = body.substr(begin, end-begin);
-		LLStringUtil::replaceString(err_msg, "&#xD;", ""); // strip CR
 		return false;
 	}
 
-	// Sample response: <string xmlns="http://schemas.microsoft.com/2003/10/Serialization/">Hola</string>
-	size_t begin = body.find(">");
-	if (begin == std::string::npos || begin >= (body.size() - 1))
-	{
-		begin = 0;
-	}
-	else
-	{
-		++begin;
-	}
+    //Example:
+    // "[{\"detectedLanguage\":{\"language\":\"en\",\"score\":1.0},\"translations\":[{\"text\":\"Hello, what is your name?\",\"to\":\"en\"}]}]"
 
-	size_t end = body.find("</string>", begin);
+    Json::Value root;
+    Json::Reader reader;
 
-	detected_lang = ""; // unsupported by this API
-	translation = body.substr(begin, end-begin);
-	LLStringUtil::replaceString(translation, "&#xD;", ""); // strip CR
-	return true;
+    if (!reader.parse(body, root))
+    {
+        err_msg = reader.getFormatedErrorMessages();
+        return false;
+    }
+
+    if (!root.isArray()) // empty response? should not happen
+    {
+        return false;
+    }
+
+    // Request succeeded, extract translation from the response.
+
+    const Json::Value& data = root[0U];
+    if (!data.isObject()
+        || !data.isMember("detectedLanguage")
+        || !data.isMember("translations"))
+    {
+        return false;
+    }
+
+    const Json::Value& detectedLanguage = data["detectedLanguage"];
+    if (!detectedLanguage.isObject() || !detectedLanguage.isMember("language"))
+    {
+        return false;
+    }
+    detected_lang = detectedLanguage["language"].asString();
+
+    const Json::Value& translations = data["translations"];
+    if (!translations.isArray() || translations.size() == 0)
+    {
+        return false;
+    }
+
+    const Json::Value& first = translations[0U];
+    if (!first.isObject() || !first.isMember("text"))
+    {
+        return false;
+    }
+
+    translation = first["text"].asString();
+
+    return true;
 }
 
 // virtual
 bool LLAzureTranslationHandler::isConfigured() const
 {
-	return !getAPIKey().empty();
+	return !getAPIKey().isMap();
 }
 
 // static
-std::string LLAzureTranslationHandler::getAPIKey()
+LLSD LLAzureTranslationHandler::getAPIKey()
 {
-	return gSavedSettings.getString("BingTranslateAPIKey");
+    static LLCachedControl<LLSD> azure_key(gSavedSettings, "AzureTranslateAPIKey");
+	return azure_key;
 }
 
 // static
@@ -577,19 +696,38 @@ std::string LLAzureTranslationHandler::getAPILanguageCode(const std::string& lan
 }
 
 /*virtual*/
-void LLAzureTranslationHandler::verifyKey(const std::string &key, LLTranslate::KeyVerificationResult_fn fnc)
+void LLAzureTranslationHandler::verifyKey(const LLSD &key, LLTranslate::KeyVerificationResult_fn fnc)
 {
-    LLCoros::instance().launch("Bing /Verify Key", boost::bind(&LLTranslationAPIHandler::verifyKeyCoro, 
-        this, LLTranslate::SERVICE_BING, key, fnc));
+    LLCoros::instance().launch("Azure /Verify Key", boost::bind(&LLTranslationAPIHandler::verifyKeyCoro, 
+        this, LLTranslate::SERVICE_AZURE, key, fnc));
+}
+/*virtual*/
+void LLAzureTranslationHandler::initHttpHeader(
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string& user_agent) const
+{
+    initHttpHeader(headers, user_agent, getAPIKey());
 }
 
 /*virtual*/
-void LLAzureTranslationHandler::initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const
+void LLAzureTranslationHandler::initHttpHeader(
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string& user_agent,
+    const LLSD &key) const
 {
     headers->append(HTTP_OUT_HEADER_CONTENT_TYPE, HTTP_CONTENT_JSON);
-    // Token based autorization exists
-    //headers->append("Ocp-Apim-Subscription-Key", getAPIKey());
     headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+
+    if (key.has("id"))
+    {
+        // Token based autorization
+        headers->append("Ocp-Apim-Subscription-Key", key["id"].asString());
+    }
+    if (key.has("region"))
+    {
+        // ex: "westeurope"
+        headers->append("Ocp-Apim-Subscription-Region", key["region"].asString());
+    }
 }
 
 LLSD LLAzureTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
@@ -599,9 +737,26 @@ LLSD LLAzureTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCorout
     const std::string & url,
     const std::string & msg) const
 {
-    LLSD body;
-    body["text"] = "Hello, what is your name?";
-    return adapter->postJsonAndSuspend(request, url, body, headers);
+    LLCore::BufferArray::ptr_t rawbody(new LLCore::BufferArray);
+    LLCore::BufferArrayStream outs(rawbody.get());
+    outs << "[{\"text\":\"";
+    outs << msg;
+    outs << "\"}]";
+
+    return adapter->postRawAndSuspend(request, url, rawbody, options, headers);
+}
+
+LLSD LLAzureTranslationHandler::verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+    LLCore::HttpRequest::ptr_t request,
+    LLCore::HttpOptions::ptr_t options,
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string & url) const
+{
+    LLCore::BufferArray::ptr_t rawbody(new LLCore::BufferArray);
+    LLCore::BufferArrayStream outs(rawbody.get());
+    outs << "[{\"intentionally_invalid_400\"}]";
+
+    return adapter->postRawAndSuspend(request, url, rawbody, options, headers);
 }
 
 //=========================================================================
@@ -616,7 +771,7 @@ void LLTranslate::translateMessage(const std::string &from_lang, const std::stri
 
 std::string LLTranslate::addNoTranslateTags(std::string mesg)
 {
-    if (getPreferredHandler().getCurrentService() != SERVICE_BING)
+    if (getPreferredHandler().getCurrentService() != SERVICE_AZURE)
     {
         return mesg;
     }
@@ -637,7 +792,7 @@ std::string LLTranslate::addNoTranslateTags(std::string mesg)
 
 std::string LLTranslate::removeNoTranslateTags(std::string mesg)
 {
-    if (getPreferredHandler().getCurrentService() != SERVICE_BING)
+    if (getPreferredHandler().getCurrentService() != SERVICE_AZURE)
     {
         return mesg;
     }
@@ -667,7 +822,7 @@ std::string LLTranslate::removeNoTranslateTags(std::string mesg)
 }
 
 /*static*/
-void LLTranslate::verifyKey(EService service, const std::string &key, KeyVerificationResult_fn fnc)
+void LLTranslate::verifyKey(EService service, const LLSD &key, KeyVerificationResult_fn fnc)
 {
     LLTranslationAPIHandler& handler = getHandler(service);
 
@@ -696,7 +851,7 @@ bool LLTranslate::isTranslationConfigured()
 // static
 LLTranslationAPIHandler& LLTranslate::getPreferredHandler()
 {
-	EService service = SERVICE_BING;
+	EService service = SERVICE_AZURE;
 
 	std::string service_str = gSavedSettings.getString("TranslationService");
 	if (service_str == "google")
@@ -711,12 +866,12 @@ LLTranslationAPIHandler& LLTranslate::getPreferredHandler()
 LLTranslationAPIHandler& LLTranslate::getHandler(EService service)
 {
 	static LLGoogleTranslationHandler google;
-	static LLAzureTranslationHandler bing;
+	static LLAzureTranslationHandler azure;
 
 	if (service == SERVICE_GOOGLE)
 	{
 		return google;
 	}
 
-	return bing;
+	return azure;
 }
diff --git a/indra/newview/lltranslate.h b/indra/newview/lltranslate.h
index e0722fbd83..870fd54441 100644
--- a/indra/newview/lltranslate.h
+++ b/indra/newview/lltranslate.h
@@ -55,7 +55,7 @@ class LLTranslate
 public :
 
 	typedef enum e_service {
-		SERVICE_BING,
+		SERVICE_AZURE,
 		SERVICE_GOOGLE,
 	} EService;
 
@@ -74,12 +74,12 @@ public :
     static void translateMessage(const std::string &from_lang, const std::string &to_lang, const std::string &mesg, TranslationSuccess_fn success, TranslationFailure_fn failure);
 
     /**
-	 * Verify given API key of a translation service.
-	 *
-	 * @param receiver  Object to pass verification result to.
-	 * @param key       Key to verify.
-	 */
-    static void verifyKey(EService service, const std::string &key, KeyVerificationResult_fn fnc);
+     * Verify given API key of a translation service.
+     *
+     * @param receiver  Object to pass verification result to.
+     * @param key       Key to verify.
+     */
+    static void verifyKey(EService service, const LLSD &key, KeyVerificationResult_fn fnc);
 
 	/**
 	 * @return translation target language
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index a212ce7889..b0e47798e9 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="310"
+ height="370"
  layout="topleft"
  name="floater_translation_settings"
  help_topic="translation_settings"
@@ -9,10 +9,10 @@
  title="CHAT TRANSLATION SETTINGS"
  width="485">
 
- <string name="bing_api_key_not_verified">Bing appID not verified. Please try again.</string>
+ <string name="azure_api_key_not_verified">Azure service identifier not verified. Please try again.</string>
  <string name="google_api_key_not_verified">Google API key not verified. Please try again.</string>
 
- <string name="bing_api_key_verified">Bing appID verified.</string>
+ <string name="azure_api_key_verified">Azure service identifier verified.</string>
  <string name="google_api_key_verified">Google API key verified.</string>
 
  <check_box
@@ -128,25 +128,67 @@
 
  <radio_group
   follows="top|left"
-  height="80"
+  height="140"
   layout="topleft"
   left_delta="10"
   name="translation_service_rg"
   top_pad="20"
   width="320">
   <radio_item
-   initial_value="bing"
-   label="Bing Translator"
+   initial_value="azure"
+   label="Azure Translator"
    layout="topleft"
-   name="bing" />
+   name="azure" />
   <radio_item
    initial_value="google"
    label="Google Translate"
    layout="topleft"
    name="google"
-   top_pad="55" />
+   top_pad="115" />
  </radio_group>
 
+  <text
+   type="string"
+   length="1"
+   follows="top|right"
+   height="20"
+   layout="topleft"
+   left="70"
+   name="azure_api_endoint_label"
+   top_pad="-115"
+   width="85">
+    Endpoint:
+  </text>
+  
+ <combo_box
+   allow_text_entry="true"
+   follows="left|top"
+   name="azure_api_endpoint_combo"
+   height="23"
+   left_pad="10"
+   right="-10"
+   top_delta="-4"
+   max_chars="512"
+   value="https://api.cognitive.microsofttranslator.com"
+   combo_button.scale_image="true">
+   <combo_box.item
+     label="https://api.cognitive.microsofttranslator.com"
+     name="global"
+     value="https://api.cognitive.microsofttranslator.com" />
+   <combo_box.item
+     label="https://api-apc.cognitive.microsofttranslator.com"
+     name="api-apc"
+     value="https://api-apc.cognitive.microsofttranslator.com" />
+   <combo_box.item
+     label="https://api-eur.cognitive.microsofttranslator.com"
+     name="api-eur"
+     value="https://api-eur.cognitive.microsofttranslator.com" />
+   <combo_box.item
+     label="https://api-nam.cognitive.microsofttranslator.com"
+     name="api-nam"
+     value="https://api-nam.cognitive.microsofttranslator.com" />
+  </combo_box>
+
  <text
   type="string"
   length="1"
@@ -154,20 +196,20 @@
   height="20"
   layout="topleft"
   left="70"
-  name="bing_api_key_label"
-  top_pad="-55"
+  name="azure_api_key_label"
+  top_pad="10"
   width="85">
-  Bing [http://www.bing.com/developers/createapp.aspx AppID]:
+  Azure Key:
   </text>
  <line_editor
-  default_text="Enter Bing AppID and click &quot;Verify&quot;"
+  default_text="Enter Translator Key and click &quot;Verify&quot;"
   follows="top|left"
   height="20"
   layout="topleft"
   left_pad="10"
   max_length_chars="50"
   top_delta="-4"
-  name="bing_api_key"
+  name="azure_api_key"
   width="210" />
  <button
   follows="left|top"
@@ -175,9 +217,30 @@
   label="Verify"
   layout="topleft"
   left_pad="10"
-  name="verify_bing_api_key_btn"
+  name="verify_azure_api_key_btn"
   top_delta="-2"
-  width="90" />	
+  width="90" />
+  <text
+   type="string"
+   length="1"
+   follows="top|right"
+   height="20"
+   layout="topleft"
+   left="70"
+   name="azure_api_region_label"
+   top_pad="10"
+   width="85">
+    Region:
+  </text>
+  <line_editor
+   follows="top|left"
+   height="20"
+   layout="topleft"
+   left_pad="10"
+   max_length_chars="50"
+   top_delta="-4"
+   name="azure_api_region"
+   width="210" />
 
  <text
   follows="top|right"
@@ -186,7 +249,7 @@
   left="70"
   length="1"
   name="google_api_key_label"
-  top_pad="50"
+  top_pad="55"
   type="string"
   width="85">
   Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]:
-- 
cgit v1.2.3


From f7210db06ee677231b93b750c205cd0317a9901f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 00:13:31 +0200
Subject: SL-19209 Switch MS Bing to MS Azure #3

---
 indra/newview/llfloatertranslationsettings.cpp     |  29 ++--
 indra/newview/llfloatertranslationsettings.h       |   8 +-
 indra/newview/lltranslate.cpp                      | 168 ++++++++++++++++-----
 indra/newview/lltranslate.h                        |   2 +-
 .../xui/en/floater_translation_settings.xml        |  19 ++-
 5 files changed, 168 insertions(+), 58 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp
index 45f46aacf5..c99de47da0 100644
--- a/indra/newview/llfloatertranslationsettings.cpp
+++ b/indra/newview/llfloatertranslationsettings.cpp
@@ -132,22 +132,22 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
 	updateControlsEnabledState();
 }
 
-void LLFloaterTranslationSettings::setAzureVerified(bool ok, bool alert)
+void LLFloaterTranslationSettings::setAzureVerified(bool ok, bool alert, S32 status)
 {
 	if (alert)
 	{
-		showAlert(ok ? "azure_api_key_verified" : "azure_api_key_not_verified");
+		showAlert(ok ? "azure_api_key_verified" : "azure_api_key_not_verified", status);
 	}
 
 	mAzureKeyVerified = ok;
 	updateControlsEnabledState();
 }
 
-void LLFloaterTranslationSettings::setGoogleVerified(bool ok, bool alert)
+void LLFloaterTranslationSettings::setGoogleVerified(bool ok, bool alert, S32 status)
 {
 	if (alert)
 	{
-		showAlert(ok ? "google_api_key_verified" : "google_api_key_not_verified");
+		showAlert(ok ? "google_api_key_verified" : "google_api_key_not_verified", status);
 	}
 
 	mGoogleKeyVerified = ok;
@@ -179,10 +179,15 @@ std::string LLFloaterTranslationSettings::getEnteredGoogleKey() const
 	return mGoogleAPIKeyEditor->getTentative() ? LLStringUtil::null : mGoogleAPIKeyEditor->getText();
 }
 
-void LLFloaterTranslationSettings::showAlert(const std::string& msg_name) const
+void LLFloaterTranslationSettings::showAlert(const std::string& msg_name, S32 status) const
 {
+    LLStringUtil::format_map_t string_args;
+    // For now just show an http error code, whole 'reason' string might be added later
+    string_args["[STATUS]"] = llformat("%d", status);
+    std::string message = getString(msg_name, string_args);
+
 	LLSD args;
-	args["MESSAGE"] = getString(msg_name);
+	args["MESSAGE"] = message;
 	LLNotificationsUtil::add("GenericAlert", args);
 }
 
@@ -222,7 +227,7 @@ void LLFloaterTranslationSettings::updateControlsEnabledState()
 }
 
 /*static*/
-void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, bool alert)
+void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, bool alert, S32 status)
 {
     LLFloaterTranslationSettings* floater =
         LLFloaterReg::getTypedInstance<LLFloaterTranslationSettings>("prefs_translation");
@@ -236,10 +241,10 @@ void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, b
     switch (service)
     {
     case LLTranslate::SERVICE_AZURE:
-        floater->setAzureVerified(ok, alert);
+        floater->setAzureVerified(ok, alert, status);
         break;
     case LLTranslate::SERVICE_GOOGLE:
-        floater->setGoogleVerified(ok, alert);
+        floater->setGoogleVerified(ok, alert, status);
         break;
     }
 }
@@ -248,7 +253,7 @@ void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, b
 void LLFloaterTranslationSettings::verifyKey(int service, const LLSD& key, bool alert)
 {
     LLTranslate::verifyKey(static_cast<LLTranslate::EService>(service), key,
-        boost::bind(&LLFloaterTranslationSettings::setVerificationStatus, _1, _2, alert));
+        boost::bind(&LLFloaterTranslationSettings::setVerificationStatus, _1, _2, alert, _3));
 }
 
 void LLFloaterTranslationSettings::onEditorFocused(LLFocusableElement* control)
@@ -271,7 +276,7 @@ void LLFloaterTranslationSettings::onAzureKeyEdited()
         || mAzureAPIEndpointEditor->getValue().isString())
 	{
         // todo: verify mAzureAPIEndpointEditor url
-		setAzureVerified(false, false);
+		setAzureVerified(false, false, 0);
 	}
 }
 
@@ -279,7 +284,7 @@ void LLFloaterTranslationSettings::onGoogleKeyEdited()
 {
 	if (mGoogleAPIKeyEditor->isDirty())
 	{
-		setGoogleVerified(false, false);
+		setGoogleVerified(false, false, 0);
 	}
 }
 
diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h
index 52523f4d4a..f039d90e27 100644
--- a/indra/newview/llfloatertranslationsettings.h
+++ b/indra/newview/llfloatertranslationsettings.h
@@ -42,15 +42,15 @@ public:
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void onOpen(const LLSD& key);
 
-	void setAzureVerified(bool ok, bool alert);
-	void setGoogleVerified(bool ok, bool alert);
+	void setAzureVerified(bool ok, bool alert, S32 status);
+	void setGoogleVerified(bool ok, bool alert, S32 status);
 	void onClose(bool app_quitting);
 
 private:
 	std::string getSelectedService() const;
 	LLSD getEnteredAzureKey() const;
 	std::string getEnteredGoogleKey() const;
-	void showAlert(const std::string& msg_name) const;
+	void showAlert(const std::string& msg_name, S32 status) const;
 	void updateControlsEnabledState();
     void verifyKey(int service, const LLSD& key, bool alert = true);
 
@@ -61,7 +61,7 @@ private:
 	void onBtnGoogleVerify();
 	void onBtnOK();
 
-    static void setVerificationStatus(int service, bool alert, bool ok);
+    static void setVerificationStatus(int service, bool alert, bool ok, S32 status);
 
 	LLCheckBoxCtrl* mMachineTranslationCB;
 	LLComboBox* mLanguageCombo;
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 706b4cc6ee..b0c4418ae9 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -41,8 +41,8 @@
 #include "llurlregistry.h"
 
 
-static const std::string BING_NOTRANSLATE_OPENING_TAG("<div translate=\"no\">");
-static const std::string BING_NOTRANSLATE_CLOSING_TAG("</div>");
+static const std::string AZURE_NOTRANSLATE_OPENING_TAG("<div translate=\"no\">");
+static const std::string AZURE_NOTRANSLATE_CLOSING_TAG("</div>");
 
 /**
 * Handler of an HTTP machine translation service.
@@ -103,6 +103,7 @@ public:
     * @param[out]    err_msg       Error message (in case of error).
     */
     virtual bool parseResponse(
+        const LLSD& http_response,
         int& status,
         const std::string& body,
         std::string& translation,
@@ -176,6 +177,13 @@ void LLTranslationAPIHandler::verifyKeyCoro(LLTranslate::EService service, LLSD
         return;
     }
 
+    std::string::size_type delim_pos = url.find("://");
+    if (delim_pos == std::string::npos)
+    {
+        LL_INFOS("Translate") << "URL is missing a scheme" << LL_ENDL;
+        return;
+    }
+
     LLSD result = verifyAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url);
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
@@ -190,7 +198,7 @@ void LLTranslationAPIHandler::verifyKeyCoro(LLTranslate::EService service, LLSD
 
     if (!fnc.empty())
     {
-        fnc(service, bOk);
+        fnc(service, bOk, parseResult);
     }
 }
 
@@ -221,8 +229,8 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
         LL_INFOS("Translate") << "No translation URL" << LL_ENDL;
         return;
     }
-    LL_INFOS() << "Message: " << msg << LL_ENDL;
-    LL_INFOS() << "Requesting: " << url << LL_ENDL;
+    LL_DEBUGS("Translate") << "Message: " << msg << LL_ENDL;
+    LL_DEBUGS("Translate") << "Requesting: " << url << LL_ENDL;
 
     LLSD result = sendMessageAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url, msg);
 
@@ -245,7 +253,7 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
 
     try
     {
-        res = this->parseResponse(parseResult, body, translation, detected_lang, err_msg);
+        res = this->parseResponse(httpResults, parseResult, body, translation, detected_lang, err_msg);
     }
     catch (std::out_of_range&)
     {
@@ -306,6 +314,7 @@ public:
         const LLSD &response,
         int status) const override;
     bool parseResponse(
+        const LLSD& http_response,
         int& status,
         const std::string& body,
         std::string& translation,
@@ -380,6 +389,7 @@ bool LLGoogleTranslationHandler::checkVerificationResponse(
 
 // virtual
 bool LLGoogleTranslationHandler::parseResponse(
+    const LLSD& http_response,
 	int& status,
 	const std::string& body,
 	std::string& translation,
@@ -531,6 +541,7 @@ public:
         const LLSD &response,
         int status) const override;
     bool parseResponse(
+        const LLSD& http_response,
         int& status,
         const std::string& body,
         std::string& translation,
@@ -557,6 +568,8 @@ public:
         LLCore::HttpHeaders::ptr_t headers,
         const std::string & url) const override;
 private:
+    static std::string parseErrorResponse(
+        const std::string& body);
     static LLSD getAPIKey();
     static std::string getAPILanguageCode(const std::string& lang);
 
@@ -574,7 +587,7 @@ std::string LLAzureTranslationHandler::getTranslateURL(
     if (key.isMap())
     {
         std::string endpoint = key["endpoint"].asString();
-        // todo: validate url
+
         if (*endpoint.rbegin() != '/')
         {
             endpoint += "/";
@@ -594,7 +607,6 @@ std::string LLAzureTranslationHandler::getKeyVerificationURL(
     if (key.isMap())
     {
         std::string endpoint = key["endpoint"].asString();
-        // todo: validate url
         if (*endpoint.rbegin() != '/')
         {
             endpoint += "/";
@@ -609,11 +621,48 @@ bool LLAzureTranslationHandler::checkVerificationResponse(
     const LLSD &response,
     int status) const
 {
-    return status == HTTP_BAD_REQUEST; // would have been 401 if id was wrong
+    if (status == HTTP_UNAUTHORIZED)
+    {
+        LL_DEBUGS("Translate") << "Key unathorised" << LL_ENDL;
+        return false;
+    }
+
+    if (status == HTTP_NOT_FOUND)
+    {
+        LL_DEBUGS("Translate") << "Either endpoint doesn't have requested resource" << LL_ENDL;
+        return false;
+    }
+
+    if (status != HTTP_BAD_REQUEST)
+    {
+        LL_DEBUGS("Translate") << "Unexpected error code" << LL_ENDL;
+        return false;
+    }
+
+    if (!response.has("error_body"))
+    {
+        LL_DEBUGS("Translate") << "Unexpected response, no error returned" << LL_ENDL;
+        return false;
+    }
+
+    // Expected: "{\"error\":{\"code\":400000,\"message\":\"One of the request inputs is not valid.\"}}"
+    // But for now just verify response is a valid json with an error
+
+    Json::Value root;
+    Json::Reader reader;
+
+    if (!reader.parse(response["error_body"].asString(), root))
+    {
+        LL_DEBUGS("Translate") << "Failed to parse error_body:" << reader.getFormatedErrorMessages() << LL_ENDL;
+        return false;
+    }
+
+    return true;
 }
 
 // virtual
 bool LLAzureTranslationHandler::parseResponse(
+    const LLSD& http_response,
 	int& status,
 	const std::string& body,
 	std::string& translation,
@@ -622,6 +671,8 @@ bool LLAzureTranslationHandler::parseResponse(
 {
 	if (status != HTTP_OK)
 	{
+        if (http_response.has("error_body"))
+        err_msg = parseErrorResponse(http_response["error_body"].asString());
 		return false;
 	}
 
@@ -682,6 +733,36 @@ bool LLAzureTranslationHandler::isConfigured() const
 	return !getAPIKey().isMap();
 }
 
+//static
+std::string LLAzureTranslationHandler::parseErrorResponse(
+    const std::string& body)
+{
+    // Expected: "{\"error\":{\"code\":400000,\"message\":\"One of the request inputs is not valid.\"}}"
+    // But for now just verify response is a valid json with an error
+
+    Json::Value root;
+    Json::Reader reader;
+
+    if (!reader.parse(body, root))
+    {
+        return std::string();
+    }
+
+    if (!root.isObject() || !root.isMember("error"))
+    {
+        return std::string();
+    }
+
+    const Json::Value& error_map = root["error"];
+
+    if (!error_map.isObject() || !error_map.isMember("message"))
+    {
+        return std::string();
+    }
+
+    return error_map["message"].asString();
+}
+
 // static
 LLSD LLAzureTranslationHandler::getAPIKey()
 {
@@ -771,54 +852,65 @@ void LLTranslate::translateMessage(const std::string &from_lang, const std::stri
 
 std::string LLTranslate::addNoTranslateTags(std::string mesg)
 {
-    if (getPreferredHandler().getCurrentService() != SERVICE_AZURE)
+    if (getPreferredHandler().getCurrentService() == SERVICE_GOOGLE)
     {
         return mesg;
     }
 
-    std::string upd_msg(mesg);
-    LLUrlMatch match;
-    S32 dif = 0;
-    //surround all links (including SLURLs) with 'no-translate' tags to prevent unnecessary translation
-    while (LLUrlRegistry::instance().findUrl(mesg, match))
+    if (getPreferredHandler().getCurrentService() == SERVICE_AZURE)
     {
-        upd_msg.insert(dif + match.getStart(), BING_NOTRANSLATE_OPENING_TAG);
-        upd_msg.insert(dif + BING_NOTRANSLATE_OPENING_TAG.size() + match.getEnd() + 1, BING_NOTRANSLATE_CLOSING_TAG);
-        mesg.erase(match.getStart(), match.getEnd() - match.getStart());
-        dif += match.getEnd() - match.getStart() + BING_NOTRANSLATE_OPENING_TAG.size() + BING_NOTRANSLATE_CLOSING_TAG.size();
+        // https://learn.microsoft.com/en-us/azure/cognitive-services/translator/prevent-translation
+        std::string upd_msg(mesg);
+        LLUrlMatch match;
+        S32 dif = 0;
+        //surround all links (including SLURLs) with 'no-translate' tags to prevent unnecessary translation
+        while (LLUrlRegistry::instance().findUrl(mesg, match))
+        {
+            upd_msg.insert(dif + match.getStart(), AZURE_NOTRANSLATE_OPENING_TAG);
+            upd_msg.insert(dif + AZURE_NOTRANSLATE_OPENING_TAG.size() + match.getEnd() + 1, AZURE_NOTRANSLATE_CLOSING_TAG);
+            mesg.erase(match.getStart(), match.getEnd() - match.getStart());
+            dif += match.getEnd() - match.getStart() + AZURE_NOTRANSLATE_OPENING_TAG.size() + AZURE_NOTRANSLATE_CLOSING_TAG.size();
+        }
+        return upd_msg;
     }
-    return upd_msg;
+    return mesg;
 }
 
 std::string LLTranslate::removeNoTranslateTags(std::string mesg)
 {
-    if (getPreferredHandler().getCurrentService() != SERVICE_AZURE)
+    if (getPreferredHandler().getCurrentService() == SERVICE_GOOGLE)
     {
         return mesg;
     }
-    std::string upd_msg(mesg);
-    LLUrlMatch match;
-    S32 opening_tag_size = BING_NOTRANSLATE_OPENING_TAG.size();
-    S32 closing_tag_size = BING_NOTRANSLATE_CLOSING_TAG.size();
-    S32 dif = 0;
-    //remove 'no-translate' tags we added to the links before
-    while (LLUrlRegistry::instance().findUrl(mesg, match))
+
+    if (getPreferredHandler().getCurrentService() == SERVICE_AZURE)
     {
-        if (upd_msg.substr(dif + match.getStart() - opening_tag_size, opening_tag_size) == BING_NOTRANSLATE_OPENING_TAG)
+        std::string upd_msg(mesg);
+        LLUrlMatch match;
+        S32 opening_tag_size = AZURE_NOTRANSLATE_OPENING_TAG.size();
+        S32 closing_tag_size = AZURE_NOTRANSLATE_CLOSING_TAG.size();
+        S32 dif = 0;
+        //remove 'no-translate' tags we added to the links before
+        while (LLUrlRegistry::instance().findUrl(mesg, match))
         {
-            upd_msg.erase(dif + match.getStart() - opening_tag_size, opening_tag_size);
-            dif -= opening_tag_size;
-
-            if (upd_msg.substr(dif + match.getEnd() + 1, closing_tag_size) == BING_NOTRANSLATE_CLOSING_TAG)
+            if (upd_msg.substr(dif + match.getStart() - opening_tag_size, opening_tag_size) == AZURE_NOTRANSLATE_OPENING_TAG)
             {
-                upd_msg.replace(dif + match.getEnd() + 1, closing_tag_size, " ");
-                dif -= closing_tag_size - 1;
+                upd_msg.erase(dif + match.getStart() - opening_tag_size, opening_tag_size);
+                dif -= opening_tag_size;
+
+                if (upd_msg.substr(dif + match.getEnd() + 1, closing_tag_size) == AZURE_NOTRANSLATE_CLOSING_TAG)
+                {
+                    upd_msg.replace(dif + match.getEnd() + 1, closing_tag_size, " ");
+                    dif -= closing_tag_size - 1;
+                }
             }
+            mesg.erase(match.getStart(), match.getUrl().size());
+            dif += match.getUrl().size();
         }
-        mesg.erase(match.getStart(), match.getUrl().size());
-        dif += match.getUrl().size();
+        return upd_msg;
     }
-    return upd_msg;
+
+    return mesg;
 }
 
 /*static*/
diff --git a/indra/newview/lltranslate.h b/indra/newview/lltranslate.h
index 870fd54441..1de5c02f74 100644
--- a/indra/newview/lltranslate.h
+++ b/indra/newview/lltranslate.h
@@ -59,7 +59,7 @@ public :
 		SERVICE_GOOGLE,
 	} EService;
 
-    typedef boost::function<void(EService, bool)> KeyVerificationResult_fn;
+    typedef boost::function<void(EService, bool, S32)> KeyVerificationResult_fn;
     typedef boost::function<void(std::string , std::string )> TranslationSuccess_fn;
     typedef boost::function<void(int, std::string)> TranslationFailure_fn;
 
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index b0e47798e9..d095451685 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -9,8 +9,8 @@
  title="CHAT TRANSLATION SETTINGS"
  width="485">
 
- <string name="azure_api_key_not_verified">Azure service identifier not verified. Please try again.</string>
- <string name="google_api_key_not_verified">Google API key not verified. Please try again.</string>
+ <string name="azure_api_key_not_verified">Azure service identifier not verified. Status: [STATUS]. Please check your settings and try again.</string>
+ <string name="google_api_key_not_verified">Google API key not verified. Status: [STATUS]. Please check your key and try again.</string>
 
  <string name="azure_api_key_verified">Azure service identifier verified.</string>
  <string name="google_api_key_verified">Google API key verified.</string>
@@ -147,6 +147,19 @@
    top_pad="115" />
  </radio_group>
 
+  <text
+   follows="top|right"
+   height="20"
+   layout="topleft"
+   left="185"
+   length="1"
+   name="google_links_text"
+   top_pad="-142"
+   type="string"
+   width="100">
+    [https://learn.microsoft.com/en-us/azure/cognitive-services/translator/create-translator-resource Setup]
+  </text>
+
   <text
    type="string"
    length="1"
@@ -155,7 +168,7 @@
    layout="topleft"
    left="70"
    name="azure_api_endoint_label"
-   top_pad="-115"
+   top_pad="8"
    width="85">
     Endpoint:
   </text>
-- 
cgit v1.2.3


From b2a06908859caa3d816ab1791fe2062142e2ccce Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 00:51:25 +0200
Subject: SL-19209 Add default text for region field

---
 indra/newview/llfloatertranslationsettings.cpp                      | 5 +++--
 indra/newview/lltranslate.cpp                                       | 4 +---
 indra/newview/skins/default/xui/en/floater_translation_settings.xml | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp
index c99de47da0..e14227f490 100644
--- a/indra/newview/llfloatertranslationsettings.cpp
+++ b/indra/newview/llfloatertranslationsettings.cpp
@@ -94,11 +94,11 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
 	mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), TRUE);
 
 	LLSD azure_key = gSavedSettings.getLLSD("AzureTranslateAPIKey");
-	if (azure_key.isMap())
+	if (azure_key.isMap() && !azure_key["id"].asString().empty())
 	{
 		mAzureAPIKeyEditor->setText(azure_key["id"].asString());
 		mAzureAPIKeyEditor->setTentative(false);
-        if (azure_key.has("region"))
+        if (azure_key.has("region") && !azure_key["region"].asString().empty())
         {
             mAzureAPIRegionEditor->setText(azure_key["region"].asString());
             mAzureAPIRegionEditor->setTentative(false);
@@ -113,6 +113,7 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
 	else
 	{
 		mAzureAPIKeyEditor->setTentative(TRUE);
+        mAzureAPIRegionEditor->setTentative(true);
 		mAzureKeyVerified = FALSE;
 	}
 
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index b0c4418ae9..f84c660c0d 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -229,8 +229,6 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
         LL_INFOS("Translate") << "No translation URL" << LL_ENDL;
         return;
     }
-    LL_DEBUGS("Translate") << "Message: " << msg << LL_ENDL;
-    LL_DEBUGS("Translate") << "Requesting: " << url << LL_ENDL;
 
     LLSD result = sendMessageAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url, msg);
 
@@ -646,7 +644,7 @@ bool LLAzureTranslationHandler::checkVerificationResponse(
     }
 
     // Expected: "{\"error\":{\"code\":400000,\"message\":\"One of the request inputs is not valid.\"}}"
-    // But for now just verify response is a valid json with an error
+    // But for now just verify response is a valid json
 
     Json::Value root;
     Json::Reader reader;
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index d095451685..a5154d99ec 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -246,6 +246,7 @@
     Region:
   </text>
   <line_editor
+   default_text="Can be left empty for global services"
    follows="top|left"
    height="20"
    layout="topleft"
-- 
cgit v1.2.3


From 89afd1cd4838022267f117efb65939c04c35f3da Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Feb 2023 17:43:44 +0200
Subject: D580 Fix coding policy failures

---
 indra/newview/llpanelface.h | 1126 +++++++++++++++++++++----------------------
 1 file changed, 563 insertions(+), 563 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 787eb0c51b..aaf8eddaf7 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -1,563 +1,563 @@
-/** 
- * @file llpanelface.h
- * @brief Panel in the tools floater for editing face textures, colors, etc.
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLPANELFACE_H
-#define LL_LLPANELFACE_H
-
-#include "v4color.h"
-#include "llpanel.h"
-#include "llmaterial.h"
-#include "llmaterialmgr.h"
-#include "lltextureentry.h"
-#include "llselectmgr.h"
-
-class LLButton;
-class LLCheckBoxCtrl;
-class LLColorSwatchCtrl;
-class LLComboBox;
-class LLInventoryItem;
-class LLLineEditor;
-class LLSpinCtrl;
-class LLTextBox;
-class LLTextureCtrl;
-class LLUICtrl;
-class LLViewerObject;
-class LLFloater;
-class LLMaterialID;
-class LLMediaCtrl;
-class LLMenuButton;
-
-// Represents an edit for use in replicating the op across one or more materials in the selection set.
-//
-// The apply function optionally performs the edit which it implements
-// as a functor taking Data that calls member func MaterialFunc taking SetValueType
-// on an instance of the LLMaterial class.
-//
-// boost who?
-//
-template<
-	typename DataType,
-	typename SetValueType,
-	void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
-class LLMaterialEditFunctor
-{
-public:
-	LLMaterialEditFunctor(const DataType& data) : _data(data) {}
-	virtual ~LLMaterialEditFunctor() {}
-	virtual void apply(LLMaterialPtr& material) { (material->*(MaterialEditFunc))(_data); }
-	DataType _data;
-};
-
-template<
-	typename DataType,
-	DataType (LLMaterial::*MaterialGetFunc)() >
-class LLMaterialGetFunctor
-{
-public:
-	LLMaterialGetFunctor() {}
-	virtual DataType get(LLMaterialPtr& material) { return (material->*(MaterialGetFunc)); }
-};
-
-template<
-	typename DataType,
-	DataType (LLTextureEntry::*TEGetFunc)() >
-class LLTEGetFunctor
-{
-public:
-	LLTEGetFunctor() {}
-	virtual DataType get(LLTextureEntry* entry) { return (entry*(TEGetFunc)); }
-};
-
-class LLPanelFace : public LLPanel
-{
-public:
-	virtual BOOL	postBuild();
-	LLPanelFace();
-	virtual ~LLPanelFace();
-
-	void			refresh();
-    void			refreshMedia();
-    void			unloadMedia();
-
-    /*virtual*/ void draw();
-
-	LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material)
-	{
-		LLMaterialPtr new_material(!current_material.isNull() ? new LLMaterial(current_material->asLLSD()) : new LLMaterial());
-		llassert_always(new_material);
-
-		// Preserve old diffuse alpha mode or assert correct default blend mode as appropriate for the alpha channel content of the diffuse texture
-		//
-		new_material->setDiffuseAlphaMode(current_material.isNull() ? (isAlpha() ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE) : current_material->getDiffuseAlphaMode());
-		return new_material;
-	}
-
-	LLRender::eTexIndex getTextureChannelToEdit();
-
-protected:
-    void			navigateToTitleMedia(const std::string url);
-    bool			selectedMediaEditable();
-    void			clearMediaSettings();
-    void			updateMediaSettings();
-    void			updateMediaTitle();
-
-	void			getState();
-
-	void			sendTexture();			// applies and sends texture
-	void			sendTextureInfo();		// applies and sends texture scale, offset, etc.
-	void			sendColor();			// applies and sends color
-	void			sendAlpha();			// applies and sends transparency
-	void			sendBump(U32 bumpiness);				// applies and sends bump map
-	void			sendTexGen();				// applies and sends bump map
-	void			sendShiny(U32 shininess);			// applies and sends shininess
-	void			sendFullbright();		// applies and sends full bright
-	void			sendGlow();
-    void            alignTestureLayer();
-
-    void            updateCopyTexButton();
-
-	// this function is to return TRUE if the drag should succeed.
-	static BOOL onDragTexture(LLUICtrl* ctrl, LLInventoryItem* item);
-
-	void 	onCommitTexture(const LLSD& data);
-	void 	onCancelTexture(const LLSD& data);
-	void 	onSelectTexture(const LLSD& data);
-	void 	onCommitSpecularTexture(const LLSD& data);
-	void 	onCancelSpecularTexture(const LLSD& data);
-	void 	onSelectSpecularTexture(const LLSD& data);
-	void 	onCommitNormalTexture(const LLSD& data);
-	void 	onCancelNormalTexture(const LLSD& data);
-	void 	onSelectNormalTexture(const LLSD& data);
-	void 	onCommitColor(const LLSD& data);
-	void 	onCommitShinyColor(const LLSD& data);
-	void 	onCommitAlpha(const LLSD& data);
-	void 	onCancelColor(const LLSD& data);
-	void 	onCancelShinyColor(const LLSD& data);
-	void 	onSelectColor(const LLSD& data);
-	void 	onSelectShinyColor(const LLSD& data);
-
-	void 	onCloseTexturePicker(const LLSD& data);
-
-    static bool deleteMediaConfirm(const LLSD& notification, const LLSD& response);
-    static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
-
-	// Make UI reflect state of currently selected material (refresh)
-	// and UI mode (e.g. editing normal map v diffuse map)
-	//
-	// @param force_set_values forces spinners to set value even if they are focused
-	void updateUI(bool force_set_values = false);
-
-	// Convenience func to determine if all faces in selection have
-	// identical planar texgen settings during edits
-	// 
-	bool isIdenticalPlanarTexgen();
-
-	// Callback funcs for individual controls
-	//
-	static void		onCommitTextureInfo(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureScaleX(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureScaleY(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureRot(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureOffsetX(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTextureOffsetY(LLUICtrl* ctrl, void* userdata);
-
-	static void		onCommitMaterialBumpyScaleX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyScaleY(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyRot(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyOffsetX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialBumpyOffsetY(	LLUICtrl* ctrl, void* userdata);
-
-	static void		syncRepeatX(LLPanelFace* self, F32 scaleU);
-	static void		syncRepeatY(LLPanelFace* self, F32 scaleV);
-	static void		syncOffsetX(LLPanelFace* self, F32 offsetU);
-	static void		syncOffsetY(LLPanelFace* self, F32 offsetV);
-	static void 	syncMaterialRot(LLPanelFace* self, F32 rot, int te = -1);
-
-	static void		onCommitMaterialShinyScaleX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyScaleY(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyRot(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyOffsetX(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialShinyOffsetY(	LLUICtrl* ctrl, void* userdata);
-
-	static void		onCommitMaterialGloss(			LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialEnv(				LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialMaskCutoff(	LLUICtrl* ctrl, void* userdata);
-
-	static void		onCommitMaterialsMedia(	LLUICtrl* ctrl, void* userdata);
-	static void		onCommitMaterialType(	LLUICtrl* ctrl, void* userdata);
-	static void 	onClickBtnEditMedia(LLUICtrl* ctrl, void* userdata);
-	static void 	onClickBtnDeleteMedia(LLUICtrl* ctrl, void* userdata);
-	static void 	onClickBtnAddMedia(LLUICtrl* ctrl, void* userdata);
-	static void		onCommitBump(				LLUICtrl* ctrl, void* userdata);
-	static void		onCommitTexGen(			LLUICtrl* ctrl, void* userdata);
-	static void		onCommitShiny(				LLUICtrl* ctrl, void* userdata);
-	static void		onCommitAlphaMode(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitFullbright(		LLUICtrl* ctrl, void* userdata);
-	static void    onCommitGlow(				LLUICtrl* ctrl, void *userdata);
-	static void		onCommitPlanarAlign(		LLUICtrl* ctrl, void* userdata);
-	static void		onCommitRepeatsPerMeter(	LLUICtrl* ctrl, void* userinfo);
-	static void		onClickAutoFix(void*);
-    static void		onAlignTexture(void*);
-
-public: // needs to be accessible to selection manager
-    void            onCopyColor(); // records all selected faces
-    void            onPasteColor(); // to specific face
-    void            onPasteColor(LLViewerObject* objectp, S32 te); // to specific face
-    void            onCopyTexture();
-    void            onPasteTexture();
-    void            onPasteTexture(LLViewerObject* objectp, S32 te);
-
-protected:
-    void            menuDoToSelected(const LLSD& userdata);
-    bool            menuEnableItem(const LLSD& userdata);
-
-	static F32     valueGlow(LLViewerObject* object, S32 face);
-
-	
-
-private:
-	bool		isAlpha() { return mIsAlpha; }
-
-	// Convenience funcs to keep the visual flack to a minimum
-	//
-	LLUUID	getCurrentNormalMap();
-	LLUUID	getCurrentSpecularMap();
-	U32		getCurrentShininess();
-	U32		getCurrentBumpiness();
-	U8		getCurrentDiffuseAlphaMode();
-	U8		getCurrentAlphaMaskCutoff();
-	U8		getCurrentEnvIntensity();
-	U8		getCurrentGlossiness();
-	F32		getCurrentBumpyRot();
-	F32		getCurrentBumpyScaleU();
-	F32		getCurrentBumpyScaleV();
-	F32		getCurrentBumpyOffsetU();
-	F32		getCurrentBumpyOffsetV();
-	F32		getCurrentShinyRot();
-	F32		getCurrentShinyScaleU();
-	F32		getCurrentShinyScaleV();
-	F32		getCurrentShinyOffsetU();
-	F32		getCurrentShinyOffsetV();
-
-    LLComboBox *mComboMatMedia;
-    LLMediaCtrl *mTitleMedia;
-    LLTextBox *mTitleMediaText;
-
-	// Update visibility of controls to match current UI mode
-	// (e.g. materials vs media editing)
-	//
-	// Do NOT call updateUI from within this function.
-	//
-	void updateVisibility();
-
-	// Hey look everyone, a type-safe alternative to copy and paste! :)
-	//
-
-	// Update material parameters by applying 'edit_func' to selected TEs
-	//
-	template<
-		typename DataType,
-		typename SetValueType,
-		void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
-	static void edit(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())
-	{
-		LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc > edit(data);
-		struct LLSelectedTEEditMaterial : public LLSelectedTEMaterialFunctor
-		{
-			LLSelectedTEEditMaterial(LLPanelFace* panel, LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* editp, const LLUUID &only_for_object_id) : _panel(panel), _edit(editp), _only_for_object_id(only_for_object_id) {}
-			virtual ~LLSelectedTEEditMaterial() {};
-			virtual LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material)
-			{
-				if (_edit && (_only_for_object_id.isNull() || _only_for_object_id == object->getID()))
-				{
-					LLMaterialPtr new_material = _panel->createDefaultMaterial(current_material);
-					llassert_always(new_material);
-
-					// Determine correct alpha mode for current diffuse texture
-					// (i.e. does it have an alpha channel that makes alpha mode useful)
-					//
-					// _panel->isAlpha() "lies" when one face has alpha and the rest do not (NORSPEC-329)
-					// need to get per-face answer to this question for sane alpha mode retention on updates.
-					//					
-					bool is_alpha_face = object->isImageAlphaBlended(face);
-
-					// need to keep this original answer for valid comparisons in logic below
-					//
-					U8 original_default_alpha_mode = is_alpha_face ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-					
-					U8 default_alpha_mode = original_default_alpha_mode;
-
-					if (!current_material.isNull())
-					{
-						default_alpha_mode = current_material->getDiffuseAlphaMode();
-					}
-
-					// Insure we don't inherit the default of blend by accident...
-					// this will be stomped by a legit request to change the alpha mode by the apply() below
-					//
-					new_material->setDiffuseAlphaMode(default_alpha_mode);
-
-					// Do "It"!
-					//
-					_edit->apply(new_material);
-
-					U32		new_alpha_mode			= new_material->getDiffuseAlphaMode();
-					LLUUID	new_normal_map_id		= new_material->getNormalID();
-					LLUUID	new_spec_map_id			= new_material->getSpecularID();
-
-					if ((new_alpha_mode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) && !is_alpha_face)
-					{
-						new_alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-						new_material->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE);
-					}
-
-					bool is_default_blend_mode		= (new_alpha_mode == original_default_alpha_mode);
-					bool is_need_material			= !is_default_blend_mode || !new_normal_map_id.isNull() || !new_spec_map_id.isNull();
-
-					if (!is_need_material)
-					{
-						LL_DEBUGS("Materials") << "Removing material from object " << object->getID() << " face " << face << LL_ENDL;
-						LLMaterialMgr::getInstance()->remove(object->getID(),face);
-						new_material = NULL;
-					}
-					else
-					{
-						LL_DEBUGS("Materials") << "Putting material on object " << object->getID() << " face " << face << ", material: " << new_material->asLLSD() << LL_ENDL;
-						LLMaterialMgr::getInstance()->put(object->getID(),face,*new_material);
-					}
-
-					object->setTEMaterialParams(face, new_material);
-					return new_material;
-				}
-				return NULL;
-			}
-			LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >*	_edit;
-			LLPanelFace *_panel;
-			const LLUUID & _only_for_object_id;
-		} editor(p, &edit, only_for_object_id);
-		LLSelectMgr::getInstance()->selectionSetMaterialParams(&editor, te);
-	}
-
-	template<
-		typename DataType,
-		typename ReturnType,
-		ReturnType (LLMaterial::* const MaterialGetFunc)() const  >
-	static void getTEMaterialValue(DataType& data_to_return, bool& identical,DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
-	{
-		DataType data_value;
-		struct GetTEMaterialVal : public LLSelectedTEGetFunctor<DataType>
-		{
-			GetTEMaterialVal(DataType default_value) : _default(default_value) {}
-			virtual ~GetTEMaterialVal() {}
-
-			DataType get(LLViewerObject* object, S32 face)
-			{
-				DataType ret = _default;
-				LLMaterialPtr material_ptr;
-				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
-				if (tep)
-				{
-					material_ptr = tep->getMaterialParams();
-					if (!material_ptr.isNull())
-					{
-						ret = (material_ptr->*(MaterialGetFunc))();
-					}
-				}
-				return ret;
-			}
-			DataType _default;
-		} GetFunc(default_value);
-		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetFunc, data_value, has_tolerance, tolerance);
-		data_to_return = data_value;
-	}
-
-	template<
-		typename DataType,
-		typename ReturnType, // some kids just have to different...
-		ReturnType (LLTextureEntry::* const TEGetFunc)() const >
-	static void getTEValue(DataType& data_to_return, bool& identical, DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
-	{
-		DataType data_value;
-		struct GetTEVal : public LLSelectedTEGetFunctor<DataType>
-		{
-			GetTEVal(DataType default_value) : _default(default_value) {}
-			virtual ~GetTEVal() {}
-
-			DataType get(LLViewerObject* object, S32 face) {
-				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
-				return tep ? ((tep->*(TEGetFunc))()) : _default;
-			}
-			DataType _default;
-		} GetTEValFunc(default_value);
-		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetTEValFunc, data_value, has_tolerance, tolerance );
-		data_to_return = data_value;
-	}
-
-	// Update vis and enabling of specific subsets of controls based on material params
-	// (e.g. hide the spec controls if no spec texture is applied)
-	//
-	void updateShinyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
-	void updateBumpyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
-	void updateAlphaControls();
-
-	/*
-	 * Checks whether the selected texture from the LLFloaterTexturePicker can be applied to the currently selected object.
-	 * If agent selects texture which is not allowed to be applied for the currently selected object,
-	 * all controls of the floater texture picker which allow to apply the texture will be disabled.
-	 */
-    void onTextureSelectionChanged(LLInventoryItem* itemp);
-
-    LLMenuButton*   mMenuClipboardColor;
-    LLMenuButton*   mMenuClipboardTexture;
-
-	bool mIsAlpha;
-	
-	/* These variables interlock processing of materials updates sent to
-	 * the sim.  mUpdateInFlight is set to flag that an update has been
-	 * sent to the sim and not acknowledged yet, and cleared when an
-	 * update is received from the sim.  mUpdatePending is set when
-	 * there's an update in flight and another UI change has been made
-	 * that needs to be sent as a materials update, and cleared when the
-	 * update is sent.  This prevents the sim from getting spammed with
-	 * update messages when, for example, the user holds down the
-	 * up-arrow on a spinner, and avoids running afoul of its throttle.
-	 */
-	bool mUpdateInFlight;
-    bool mUpdatePending;
-
-    LLSD            mClipboardParams;
-
-    LLSD mMediaSettings;
-    bool mNeedMediaTitle;
-
-public:
-	#if defined(DEF_GET_MAT_STATE)
-		#undef DEF_GET_MAT_STATE
-	#endif
-
-	#if defined(DEF_GET_TE_STATE)
-		#undef DEF_GET_TE_STATE
-	#endif
-
-	#if defined(DEF_EDIT_MAT_STATE)
-		DEF_EDIT_MAT_STATE
-	#endif
-
-    // Accessors for selected TE material state
-    //
-    #define DEF_GET_MAT_STATE(DataType,ReturnType,MaterialMemberFunc,DefaultValue,HasTolerance,Tolerance)                                           \
-        static void MaterialMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)          \
-        {                                                                                                                                           \
-            getTEMaterialValue< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
-        }
-
-    // Mutators for selected TE material
-    //
-    #define DEF_EDIT_MAT_STATE(DataType,ReturnType,MaterialMemberFunc)                                                              \
-        static void MaterialMemberFunc(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())     \
-        {                                                                                                                           \
-            edit< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(p, data, te, only_for_object_id);                         \
-        }
-
-    // Accessors for selected TE state proper (legacy settings etc)
-    //
-    #define DEF_GET_TE_STATE(DataType,ReturnType,TexEntryMemberFunc,DefaultValue,HasTolerance,Tolerance)                                        \
-        static void TexEntryMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)      \
-        {                                                                                                                                       \
-            getTEValue< DataType, ReturnType, &LLTextureEntry::TexEntryMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
-        }
-
-	class LLSelectedTEMaterial
-	{
-	public:
-		static void getCurrent(LLMaterialPtr& material_ptr, bool& identical_material);
-		static void getMaxSpecularRepeats(F32& repeats, bool& identical);
-		static void getMaxNormalRepeats(F32& repeats, bool& identical);
-		static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical, bool diffuse_texture_has_alpha);
-
-		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getNormalID,LLUUID::null, false, LLUUID::null)
-		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getSpecularID,LLUUID::null, false, LLUUID::null)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatX,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatY,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetX,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetY,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getSpecularRotation,0.0f, true, 0.001f)
-
-		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatX,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatY,1.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetX,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetY,0.0f, true, 0.001f)
-		DEF_GET_MAT_STATE(F32,F32,getNormalRotation,0.0f, true, 0.001f)
-
-		DEF_EDIT_MAT_STATE(U8,U8,setDiffuseAlphaMode);
-		DEF_EDIT_MAT_STATE(U8,U8,setAlphaMaskCutoff);
-
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetX);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetY);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatX);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatY);
-		DEF_EDIT_MAT_STATE(F32,F32,setNormalRotation);
-
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetX);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetY);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatX);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatY);
-		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRotation);
-
-		DEF_EDIT_MAT_STATE(U8,U8,setEnvironmentIntensity);
-		DEF_EDIT_MAT_STATE(U8,U8,setSpecularLightExponent);
-
-		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID);
-		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID);
-		DEF_EDIT_MAT_STATE(LLColor4U,	const LLColor4U&,setSpecularLightColor);
-	};
-
-	class LLSelectedTE
-	{
-	public:
-		static void getFace(class LLFace*& face_to_return, bool& identical_face);
-		static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face);
-		static void getTexId(LLUUID& id, bool& identical);
-		static void getObjectScaleS(F32& scale_s, bool& identical);
-		static void getObjectScaleT(F32& scale_t, bool& identical);
-		static void getMaxDiffuseRepeats(F32& repeats, bool& identical);
-
-		DEF_GET_TE_STATE(U8,U8,getBumpmap,0, false, 0)
-		DEF_GET_TE_STATE(U8,U8,getShiny,0, false, 0)
-		DEF_GET_TE_STATE(U8,U8,getFullbright,0, false, 0)
-		DEF_GET_TE_STATE(F32,F32,getRotation,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getOffsetS,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getOffsetT,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getScaleS,1.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getScaleT,1.0f, true, 0.001f)
-		DEF_GET_TE_STATE(F32,F32,getGlow,0.0f, true, 0.001f)
-		DEF_GET_TE_STATE(LLTextureEntry::e_texgen,LLTextureEntry::e_texgen,getTexGen,LLTextureEntry::TEX_GEN_DEFAULT, false, LLTextureEntry::TEX_GEN_DEFAULT)
-		DEF_GET_TE_STATE(LLColor4,const LLColor4&,getColor,LLColor4::white, false, LLColor4::black);
-	};
-};
-
-#endif
-
+/** 
+ * @file llpanelface.h
+ * @brief Panel in the tools floater for editing face textures, colors, etc.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPANELFACE_H
+#define LL_LLPANELFACE_H
+
+#include "v4color.h"
+#include "llpanel.h"
+#include "llmaterial.h"
+#include "llmaterialmgr.h"
+#include "lltextureentry.h"
+#include "llselectmgr.h"
+
+class LLButton;
+class LLCheckBoxCtrl;
+class LLColorSwatchCtrl;
+class LLComboBox;
+class LLInventoryItem;
+class LLLineEditor;
+class LLSpinCtrl;
+class LLTextBox;
+class LLTextureCtrl;
+class LLUICtrl;
+class LLViewerObject;
+class LLFloater;
+class LLMaterialID;
+class LLMediaCtrl;
+class LLMenuButton;
+
+// Represents an edit for use in replicating the op across one or more materials in the selection set.
+//
+// The apply function optionally performs the edit which it implements
+// as a functor taking Data that calls member func MaterialFunc taking SetValueType
+// on an instance of the LLMaterial class.
+//
+// boost who?
+//
+template<
+	typename DataType,
+	typename SetValueType,
+	void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
+class LLMaterialEditFunctor
+{
+public:
+	LLMaterialEditFunctor(const DataType& data) : _data(data) {}
+	virtual ~LLMaterialEditFunctor() {}
+	virtual void apply(LLMaterialPtr& material) { (material->*(MaterialEditFunc))(_data); }
+	DataType _data;
+};
+
+template<
+	typename DataType,
+	DataType (LLMaterial::*MaterialGetFunc)() >
+class LLMaterialGetFunctor
+{
+public:
+	LLMaterialGetFunctor() {}
+	virtual DataType get(LLMaterialPtr& material) { return (material->*(MaterialGetFunc)); }
+};
+
+template<
+	typename DataType,
+	DataType (LLTextureEntry::*TEGetFunc)() >
+class LLTEGetFunctor
+{
+public:
+	LLTEGetFunctor() {}
+	virtual DataType get(LLTextureEntry* entry) { return (entry*(TEGetFunc)); }
+};
+
+class LLPanelFace : public LLPanel
+{
+public:
+	virtual BOOL	postBuild();
+	LLPanelFace();
+	virtual ~LLPanelFace();
+
+	void			refresh();
+    void			refreshMedia();
+    void			unloadMedia();
+
+    /*virtual*/ void draw();
+
+	LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material)
+	{
+		LLMaterialPtr new_material(!current_material.isNull() ? new LLMaterial(current_material->asLLSD()) : new LLMaterial());
+		llassert_always(new_material);
+
+		// Preserve old diffuse alpha mode or assert correct default blend mode as appropriate for the alpha channel content of the diffuse texture
+		//
+		new_material->setDiffuseAlphaMode(current_material.isNull() ? (isAlpha() ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE) : current_material->getDiffuseAlphaMode());
+		return new_material;
+	}
+
+	LLRender::eTexIndex getTextureChannelToEdit();
+
+protected:
+    void			navigateToTitleMedia(const std::string url);
+    bool			selectedMediaEditable();
+    void			clearMediaSettings();
+    void			updateMediaSettings();
+    void			updateMediaTitle();
+
+	void			getState();
+
+	void			sendTexture();			// applies and sends texture
+	void			sendTextureInfo();		// applies and sends texture scale, offset, etc.
+	void			sendColor();			// applies and sends color
+	void			sendAlpha();			// applies and sends transparency
+	void			sendBump(U32 bumpiness);				// applies and sends bump map
+	void			sendTexGen();				// applies and sends bump map
+	void			sendShiny(U32 shininess);			// applies and sends shininess
+	void			sendFullbright();		// applies and sends full bright
+	void			sendGlow();
+    void            alignTestureLayer();
+
+    void            updateCopyTexButton();
+
+	// this function is to return TRUE if the drag should succeed.
+	static BOOL onDragTexture(LLUICtrl* ctrl, LLInventoryItem* item);
+
+	void 	onCommitTexture(const LLSD& data);
+	void 	onCancelTexture(const LLSD& data);
+	void 	onSelectTexture(const LLSD& data);
+	void 	onCommitSpecularTexture(const LLSD& data);
+	void 	onCancelSpecularTexture(const LLSD& data);
+	void 	onSelectSpecularTexture(const LLSD& data);
+	void 	onCommitNormalTexture(const LLSD& data);
+	void 	onCancelNormalTexture(const LLSD& data);
+	void 	onSelectNormalTexture(const LLSD& data);
+	void 	onCommitColor(const LLSD& data);
+	void 	onCommitShinyColor(const LLSD& data);
+	void 	onCommitAlpha(const LLSD& data);
+	void 	onCancelColor(const LLSD& data);
+	void 	onCancelShinyColor(const LLSD& data);
+	void 	onSelectColor(const LLSD& data);
+	void 	onSelectShinyColor(const LLSD& data);
+
+	void 	onCloseTexturePicker(const LLSD& data);
+
+    static bool deleteMediaConfirm(const LLSD& notification, const LLSD& response);
+    static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
+
+	// Make UI reflect state of currently selected material (refresh)
+	// and UI mode (e.g. editing normal map v diffuse map)
+	//
+	// @param force_set_values forces spinners to set value even if they are focused
+	void updateUI(bool force_set_values = false);
+
+	// Convenience func to determine if all faces in selection have
+	// identical planar texgen settings during edits
+	// 
+	bool isIdenticalPlanarTexgen();
+
+	// Callback funcs for individual controls
+	//
+	static void		onCommitTextureInfo(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureScaleX(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureScaleY(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureRot(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureOffsetX(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTextureOffsetY(LLUICtrl* ctrl, void* userdata);
+
+	static void		onCommitMaterialBumpyScaleX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyScaleY(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyRot(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyOffsetX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialBumpyOffsetY(	LLUICtrl* ctrl, void* userdata);
+
+	static void		syncRepeatX(LLPanelFace* self, F32 scaleU);
+	static void		syncRepeatY(LLPanelFace* self, F32 scaleV);
+	static void		syncOffsetX(LLPanelFace* self, F32 offsetU);
+	static void		syncOffsetY(LLPanelFace* self, F32 offsetV);
+	static void 	syncMaterialRot(LLPanelFace* self, F32 rot, int te = -1);
+
+	static void		onCommitMaterialShinyScaleX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyScaleY(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyRot(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyOffsetX(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialShinyOffsetY(	LLUICtrl* ctrl, void* userdata);
+
+	static void		onCommitMaterialGloss(			LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialEnv(				LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialMaskCutoff(	LLUICtrl* ctrl, void* userdata);
+
+	static void		onCommitMaterialsMedia(	LLUICtrl* ctrl, void* userdata);
+	static void		onCommitMaterialType(	LLUICtrl* ctrl, void* userdata);
+	static void 	onClickBtnEditMedia(LLUICtrl* ctrl, void* userdata);
+	static void 	onClickBtnDeleteMedia(LLUICtrl* ctrl, void* userdata);
+	static void 	onClickBtnAddMedia(LLUICtrl* ctrl, void* userdata);
+	static void		onCommitBump(				LLUICtrl* ctrl, void* userdata);
+	static void		onCommitTexGen(			LLUICtrl* ctrl, void* userdata);
+	static void		onCommitShiny(				LLUICtrl* ctrl, void* userdata);
+	static void		onCommitAlphaMode(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitFullbright(		LLUICtrl* ctrl, void* userdata);
+	static void    onCommitGlow(				LLUICtrl* ctrl, void *userdata);
+	static void		onCommitPlanarAlign(		LLUICtrl* ctrl, void* userdata);
+	static void		onCommitRepeatsPerMeter(	LLUICtrl* ctrl, void* userinfo);
+	static void		onClickAutoFix(void*);
+    static void		onAlignTexture(void*);
+
+public: // needs to be accessible to selection manager
+    void            onCopyColor(); // records all selected faces
+    void            onPasteColor(); // to specific face
+    void            onPasteColor(LLViewerObject* objectp, S32 te); // to specific face
+    void            onCopyTexture();
+    void            onPasteTexture();
+    void            onPasteTexture(LLViewerObject* objectp, S32 te);
+
+protected:
+    void            menuDoToSelected(const LLSD& userdata);
+    bool            menuEnableItem(const LLSD& userdata);
+
+	static F32     valueGlow(LLViewerObject* object, S32 face);
+
+	
+
+private:
+	bool		isAlpha() { return mIsAlpha; }
+
+	// Convenience funcs to keep the visual flack to a minimum
+	//
+	LLUUID	getCurrentNormalMap();
+	LLUUID	getCurrentSpecularMap();
+	U32		getCurrentShininess();
+	U32		getCurrentBumpiness();
+	U8		getCurrentDiffuseAlphaMode();
+	U8		getCurrentAlphaMaskCutoff();
+	U8		getCurrentEnvIntensity();
+	U8		getCurrentGlossiness();
+	F32		getCurrentBumpyRot();
+	F32		getCurrentBumpyScaleU();
+	F32		getCurrentBumpyScaleV();
+	F32		getCurrentBumpyOffsetU();
+	F32		getCurrentBumpyOffsetV();
+	F32		getCurrentShinyRot();
+	F32		getCurrentShinyScaleU();
+	F32		getCurrentShinyScaleV();
+	F32		getCurrentShinyOffsetU();
+	F32		getCurrentShinyOffsetV();
+
+    LLComboBox *mComboMatMedia;
+    LLMediaCtrl *mTitleMedia;
+    LLTextBox *mTitleMediaText;
+
+	// Update visibility of controls to match current UI mode
+	// (e.g. materials vs media editing)
+	//
+	// Do NOT call updateUI from within this function.
+	//
+	void updateVisibility();
+
+	// Hey look everyone, a type-safe alternative to copy and paste! :)
+	//
+
+	// Update material parameters by applying 'edit_func' to selected TEs
+	//
+	template<
+		typename DataType,
+		typename SetValueType,
+		void (LLMaterial::*MaterialEditFunc)(SetValueType data) >
+	static void edit(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())
+	{
+		LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc > edit(data);
+		struct LLSelectedTEEditMaterial : public LLSelectedTEMaterialFunctor
+		{
+			LLSelectedTEEditMaterial(LLPanelFace* panel, LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* editp, const LLUUID &only_for_object_id) : _panel(panel), _edit(editp), _only_for_object_id(only_for_object_id) {}
+			virtual ~LLSelectedTEEditMaterial() {};
+			virtual LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material)
+			{
+				if (_edit && (_only_for_object_id.isNull() || _only_for_object_id == object->getID()))
+				{
+					LLMaterialPtr new_material = _panel->createDefaultMaterial(current_material);
+					llassert_always(new_material);
+
+					// Determine correct alpha mode for current diffuse texture
+					// (i.e. does it have an alpha channel that makes alpha mode useful)
+					//
+					// _panel->isAlpha() "lies" when one face has alpha and the rest do not (NORSPEC-329)
+					// need to get per-face answer to this question for sane alpha mode retention on updates.
+					//					
+					bool is_alpha_face = object->isImageAlphaBlended(face);
+
+					// need to keep this original answer for valid comparisons in logic below
+					//
+					U8 original_default_alpha_mode = is_alpha_face ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+					
+					U8 default_alpha_mode = original_default_alpha_mode;
+
+					if (!current_material.isNull())
+					{
+						default_alpha_mode = current_material->getDiffuseAlphaMode();
+					}
+
+					// Insure we don't inherit the default of blend by accident...
+					// this will be stomped by a legit request to change the alpha mode by the apply() below
+					//
+					new_material->setDiffuseAlphaMode(default_alpha_mode);
+
+					// Do "It"!
+					//
+					_edit->apply(new_material);
+
+					U32		new_alpha_mode			= new_material->getDiffuseAlphaMode();
+					LLUUID	new_normal_map_id		= new_material->getNormalID();
+					LLUUID	new_spec_map_id			= new_material->getSpecularID();
+
+					if ((new_alpha_mode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) && !is_alpha_face)
+					{
+						new_alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+						new_material->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE);
+					}
+
+					bool is_default_blend_mode		= (new_alpha_mode == original_default_alpha_mode);
+					bool is_need_material			= !is_default_blend_mode || !new_normal_map_id.isNull() || !new_spec_map_id.isNull();
+
+					if (!is_need_material)
+					{
+						LL_DEBUGS("Materials") << "Removing material from object " << object->getID() << " face " << face << LL_ENDL;
+						LLMaterialMgr::getInstance()->remove(object->getID(),face);
+						new_material = NULL;
+					}
+					else
+					{
+						LL_DEBUGS("Materials") << "Putting material on object " << object->getID() << " face " << face << ", material: " << new_material->asLLSD() << LL_ENDL;
+						LLMaterialMgr::getInstance()->put(object->getID(),face,*new_material);
+					}
+
+					object->setTEMaterialParams(face, new_material);
+					return new_material;
+				}
+				return NULL;
+			}
+			LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >*	_edit;
+			LLPanelFace *_panel;
+			const LLUUID & _only_for_object_id;
+		} editor(p, &edit, only_for_object_id);
+		LLSelectMgr::getInstance()->selectionSetMaterialParams(&editor, te);
+	}
+
+	template<
+		typename DataType,
+		typename ReturnType,
+		ReturnType (LLMaterial::* const MaterialGetFunc)() const  >
+	static void getTEMaterialValue(DataType& data_to_return, bool& identical,DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
+	{
+		DataType data_value;
+		struct GetTEMaterialVal : public LLSelectedTEGetFunctor<DataType>
+		{
+			GetTEMaterialVal(DataType default_value) : _default(default_value) {}
+			virtual ~GetTEMaterialVal() {}
+
+			DataType get(LLViewerObject* object, S32 face)
+			{
+				DataType ret = _default;
+				LLMaterialPtr material_ptr;
+				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
+				if (tep)
+				{
+					material_ptr = tep->getMaterialParams();
+					if (!material_ptr.isNull())
+					{
+						ret = (material_ptr->*(MaterialGetFunc))();
+					}
+				}
+				return ret;
+			}
+			DataType _default;
+		} GetFunc(default_value);
+		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetFunc, data_value, has_tolerance, tolerance);
+		data_to_return = data_value;
+	}
+
+	template<
+		typename DataType,
+		typename ReturnType, // some kids just have to different...
+		ReturnType (LLTextureEntry::* const TEGetFunc)() const >
+	static void getTEValue(DataType& data_to_return, bool& identical, DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
+	{
+		DataType data_value;
+		struct GetTEVal : public LLSelectedTEGetFunctor<DataType>
+		{
+			GetTEVal(DataType default_value) : _default(default_value) {}
+			virtual ~GetTEVal() {}
+
+			DataType get(LLViewerObject* object, S32 face) {
+				LLTextureEntry* tep = object ? object->getTE(face) : NULL;
+				return tep ? ((tep->*(TEGetFunc))()) : _default;
+			}
+			DataType _default;
+		} GetTEValFunc(default_value);
+		identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &GetTEValFunc, data_value, has_tolerance, tolerance );
+		data_to_return = data_value;
+	}
+
+	// Update vis and enabling of specific subsets of controls based on material params
+	// (e.g. hide the spec controls if no spec texture is applied)
+	//
+	void updateShinyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
+	void updateBumpyControls(bool is_setting_texture = false, bool mess_with_combobox = false);
+	void updateAlphaControls();
+
+	/*
+	 * Checks whether the selected texture from the LLFloaterTexturePicker can be applied to the currently selected object.
+	 * If agent selects texture which is not allowed to be applied for the currently selected object,
+	 * all controls of the floater texture picker which allow to apply the texture will be disabled.
+	 */
+    void onTextureSelectionChanged(LLInventoryItem* itemp);
+
+    LLMenuButton*   mMenuClipboardColor;
+    LLMenuButton*   mMenuClipboardTexture;
+
+	bool mIsAlpha;
+	
+	/* These variables interlock processing of materials updates sent to
+	 * the sim.  mUpdateInFlight is set to flag that an update has been
+	 * sent to the sim and not acknowledged yet, and cleared when an
+	 * update is received from the sim.  mUpdatePending is set when
+	 * there's an update in flight and another UI change has been made
+	 * that needs to be sent as a materials update, and cleared when the
+	 * update is sent.  This prevents the sim from getting spammed with
+	 * update messages when, for example, the user holds down the
+	 * up-arrow on a spinner, and avoids running afoul of its throttle.
+	 */
+	bool mUpdateInFlight;
+    bool mUpdatePending;
+
+    LLSD            mClipboardParams;
+
+    LLSD mMediaSettings;
+    bool mNeedMediaTitle;
+
+public:
+	#if defined(DEF_GET_MAT_STATE)
+		#undef DEF_GET_MAT_STATE
+	#endif
+
+	#if defined(DEF_GET_TE_STATE)
+		#undef DEF_GET_TE_STATE
+	#endif
+
+	#if defined(DEF_EDIT_MAT_STATE)
+		DEF_EDIT_MAT_STATE
+	#endif
+
+    // Accessors for selected TE material state
+    //
+    #define DEF_GET_MAT_STATE(DataType,ReturnType,MaterialMemberFunc,DefaultValue,HasTolerance,Tolerance)                                           \
+        static void MaterialMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)          \
+        {                                                                                                                                           \
+            getTEMaterialValue< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
+        }
+
+    // Mutators for selected TE material
+    //
+    #define DEF_EDIT_MAT_STATE(DataType,ReturnType,MaterialMemberFunc)                                                              \
+        static void MaterialMemberFunc(LLPanelFace* p, DataType data, int te = -1, const LLUUID &only_for_object_id = LLUUID())     \
+        {                                                                                                                           \
+            edit< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(p, data, te, only_for_object_id);                         \
+        }
+
+    // Accessors for selected TE state proper (legacy settings etc)
+    //
+    #define DEF_GET_TE_STATE(DataType,ReturnType,TexEntryMemberFunc,DefaultValue,HasTolerance,Tolerance)                                        \
+        static void TexEntryMemberFunc(DataType& data, bool& identical, bool has_tolerance = HasTolerance, DataType tolerance = Tolerance)      \
+        {                                                                                                                                       \
+            getTEValue< DataType, ReturnType, &LLTextureEntry::TexEntryMemberFunc >(data, identical, DefaultValue, has_tolerance, tolerance);   \
+        }
+
+	class LLSelectedTEMaterial
+	{
+	public:
+		static void getCurrent(LLMaterialPtr& material_ptr, bool& identical_material);
+		static void getMaxSpecularRepeats(F32& repeats, bool& identical);
+		static void getMaxNormalRepeats(F32& repeats, bool& identical);
+		static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical, bool diffuse_texture_has_alpha);
+
+		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getNormalID,LLUUID::null, false, LLUUID::null)
+		DEF_GET_MAT_STATE(LLUUID,const LLUUID&,getSpecularID,LLUUID::null, false, LLUUID::null)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatX,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularRepeatY,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetX,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularOffsetY,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getSpecularRotation,0.0f, true, 0.001f)
+
+		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatX,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalRepeatY,1.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetX,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalOffsetY,0.0f, true, 0.001f)
+		DEF_GET_MAT_STATE(F32,F32,getNormalRotation,0.0f, true, 0.001f)
+
+		DEF_EDIT_MAT_STATE(U8,U8,setDiffuseAlphaMode);
+		DEF_EDIT_MAT_STATE(U8,U8,setAlphaMaskCutoff);
+
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetX);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalOffsetY);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatX);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalRepeatY);
+		DEF_EDIT_MAT_STATE(F32,F32,setNormalRotation);
+
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetX);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularOffsetY);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatX);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRepeatY);
+		DEF_EDIT_MAT_STATE(F32,F32,setSpecularRotation);
+
+		DEF_EDIT_MAT_STATE(U8,U8,setEnvironmentIntensity);
+		DEF_EDIT_MAT_STATE(U8,U8,setSpecularLightExponent);
+
+		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID);
+		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID);
+		DEF_EDIT_MAT_STATE(LLColor4U,	const LLColor4U&,setSpecularLightColor);
+	};
+
+	class LLSelectedTE
+	{
+	public:
+		static void getFace(class LLFace*& face_to_return, bool& identical_face);
+		static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face);
+		static void getTexId(LLUUID& id, bool& identical);
+		static void getObjectScaleS(F32& scale_s, bool& identical);
+		static void getObjectScaleT(F32& scale_t, bool& identical);
+		static void getMaxDiffuseRepeats(F32& repeats, bool& identical);
+
+		DEF_GET_TE_STATE(U8,U8,getBumpmap,0, false, 0)
+		DEF_GET_TE_STATE(U8,U8,getShiny,0, false, 0)
+		DEF_GET_TE_STATE(U8,U8,getFullbright,0, false, 0)
+		DEF_GET_TE_STATE(F32,F32,getRotation,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getOffsetS,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getOffsetT,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getScaleS,1.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getScaleT,1.0f, true, 0.001f)
+		DEF_GET_TE_STATE(F32,F32,getGlow,0.0f, true, 0.001f)
+		DEF_GET_TE_STATE(LLTextureEntry::e_texgen,LLTextureEntry::e_texgen,getTexGen,LLTextureEntry::TEX_GEN_DEFAULT, false, LLTextureEntry::TEX_GEN_DEFAULT)
+		DEF_GET_TE_STATE(LLColor4,const LLColor4&,getColor,LLColor4::white, false, LLColor4::black);
+	};
+};
+
+#endif
+
-- 
cgit v1.2.3


From e4fa03a24635133c980c07b5b2483abbad52f66d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 1 Mar 2023 19:30:44 +0200
Subject: SL-19301 Reduce Inventory minimum height and reduce items indentation
 in SFV

---
 indra/newview/skins/default/xui/en/floater_my_inventory.xml       | 2 +-
 .../newview/skins/default/xui/en/menu_inventory_gear_default.xml  | 8 ++++++++
 indra/newview/skins/default/xui/en/panel_main_inventory.xml       | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index 1b4f323d04..a9900f05b7 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -6,7 +6,7 @@
  height="570"
  help_topic="sidebar_inventory"
  min_width="363"
- min_height="590"
+ min_height="270"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 50e24824fe..5032505487 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -26,6 +26,14 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_call>
+    <menu_item_call
+     label="Close All Windows"
+     layout="topleft"
+     name="close_windows">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="close_inv_windows" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 2eda9d385b..9086f38893 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -293,10 +293,10 @@
        border="false"
        bevel_style="none"
        scroll.reserve_scroll_corner="false">
-        <item folder_indentation="0"/>
+        <item folder_indentation="-8"/>
         <folder
          single_folder_mode="true"
-         folder_indentation="0"/>
+         folder_indentation="-8"/>
       </single_folder_inventory_panel>
     </panel>
 </panel>
-- 
cgit v1.2.3


From ba47aa4afff0cdcf08617b48660ef8505b9d43c0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 1 Mar 2023 14:11:27 -0500
Subject: SL-18330: Use C++ standard types for llmd5, not local typedefs.

Not only do the local typedefs make the code less readable, they also rely on
assumptions about the implementation. The standard types are guaranteed by the
C++ library implementation.
---
 indra/llcommon/llmd5.cpp | 32 ++++++++++++++++----------------
 indra/llcommon/llmd5.h   | 23 ++++++++++-------------
 2 files changed, 26 insertions(+), 29 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llmd5.cpp b/indra/llcommon/llmd5.cpp
index 9b2a2bab60..0abe817f1d 100644
--- a/indra/llcommon/llmd5.cpp
+++ b/indra/llcommon/llmd5.cpp
@@ -96,7 +96,7 @@ LLMD5::LLMD5()
 // operation, processing another message block, and updating the
 // context.
 
-void LLMD5::update (const uint1 *input, const size_t input_length) {
+void LLMD5::update (const uint8_t *input, const size_t input_length) {
 
   size_t input_index, buffer_index;
   size_t buffer_space;                // how much space is left in buffer
@@ -189,7 +189,7 @@ void LLMD5::finalize (){
 
   unsigned char bits[8];		/* Flawfinder: ignore */
   size_t index, padLen;
-  static uint1 PADDING[64]={
+  static uint8_t PADDING[64]={
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -201,8 +201,8 @@ void LLMD5::finalize (){
   }
 
   // Save number of bits.
-  // Treat count, a uint64_t, as uint4[2].
-  encode (bits, reinterpret_cast<uint4*>(&count), 8);
+  // Treat count, a uint64_t, as uint32_t[2].
+  encode (bits, reinterpret_cast<uint32_t*>(&count), 8);
 
   // Pad out to 56 mod 64.
   index = size_t((count >> 3) & 0x3f);
@@ -412,7 +412,7 @@ Rotation is separate from addition to prevent recomputation.
 // LLMD5 basic transformation. Transforms state based on block.
 void LLMD5::transform (const U8 block[64]){
 
-  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+  uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
 
   decode (x, block, 64);
 
@@ -496,38 +496,38 @@ void LLMD5::transform (const U8 block[64]){
   state[3] += d;
 
   // Zeroize sensitive information.
-  memset ( (uint1 *) x, 0, sizeof(x));
+  memset ( (uint8_t *) x, 0, sizeof(x));
 
 }
 
 
 
-// Encodes input (UINT4) into output (unsigned char). Assumes len is
+// Encodes input (uint32_t) into output (unsigned char). Assumes len is
 // a multiple of 4.
-void LLMD5::encode (uint1 *output, const uint4 *input, const size_t len) {
+void LLMD5::encode (uint8_t *output, const uint32_t *input, const size_t len) {
 
   size_t i, j;
 
   for (i = 0, j = 0; j < len; i++, j += 4) {
-    output[j]   = (uint1)  (input[i] & 0xff);
-    output[j+1] = (uint1) ((input[i] >> 8) & 0xff);
-    output[j+2] = (uint1) ((input[i] >> 16) & 0xff);
-    output[j+3] = (uint1) ((input[i] >> 24) & 0xff);
+    output[j]   = (uint8_t)  (input[i] & 0xff);
+    output[j+1] = (uint8_t) ((input[i] >> 8) & 0xff);
+    output[j+2] = (uint8_t) ((input[i] >> 16) & 0xff);
+    output[j+3] = (uint8_t) ((input[i] >> 24) & 0xff);
   }
 }
 
 
 
 
-// Decodes input (unsigned char) into output (UINT4). Assumes len is
+// Decodes input (unsigned char) into output (uint32_t). Assumes len is
 // a multiple of 4.
-void LLMD5::decode (uint4 *output, const uint1 *input, const size_t len){
+void LLMD5::decode (uint32_t *output, const uint8_t *input, const size_t len){
 
   size_t i, j;
 
   for (i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
-      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
+    output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) |
+      (((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24);
 }
 
 
diff --git a/indra/llcommon/llmd5.h b/indra/llcommon/llmd5.h
index 8530dc0389..7d6373c20c 100644
--- a/indra/llcommon/llmd5.h
+++ b/indra/llcommon/llmd5.h
@@ -67,6 +67,8 @@ documentation and/or software.
 
 */
 
+#include <cstdint>                  // uint32_t et al.
+
 // use for the raw digest output
 const int MD5RAW_BYTES = 16;
 
@@ -75,18 +77,13 @@ const int MD5HEX_STR_SIZE = 33;  // char hex[MD5HEX_STR_SIZE]; with null
 const int MD5HEX_STR_BYTES = 32; // message system fixed size
 
 class LL_COMMON_API LLMD5 {
-// first, some types:
-  typedef unsigned       int uint4; // assumes integer is 4 words long
-  typedef unsigned short int uint2; // assumes short integer is 2 words long
-  typedef unsigned      char uint1; // assumes char is 1 word long
-
 // how many bytes to grab at a time when checking files
   static const int BLOCK_LEN;
 
 public:
 // methods for controlled operation:
   LLMD5              ();  // simple initializer
-  void  update     (const uint1 *input, const size_t input_length);
+  void  update     (const uint8_t *input, const size_t input_length);
   void  update     (std::istream& stream);
   void  update     (FILE *file);
   void  update     (const std::string& str);
@@ -109,19 +106,19 @@ private:
 
 
 // next, the private data:
-  uint4 state[4];
+  uint32_t state[4];
   uint64_t count;     // number of *bits*, mod 2^64
-  uint1 buffer[64];   // input buffer
-  uint1 digest[16];
-  uint1 finalized;
+  uint8_t buffer[64];   // input buffer
+  uint8_t digest[16];
+  uint8_t finalized;
 
 // last, the private methods, mostly static:
   void init             ();               // called by all constructors
-  void transform        (const uint1 *buffer);  // does the real update work.  Note 
+  void transform        (const uint8_t *buffer);  // does the real update work.  Note 
                                           // that length is implied to be 64.
 
-  static void encode    (uint1 *dest, const uint4 *src, const size_t length);
-  static void decode    (uint4 *dest, const uint1 *src, const size_t length);
+  static void encode    (uint8_t *dest, const uint32_t *src, const size_t length);
+  static void decode    (uint32_t *dest, const uint8_t *src, const size_t length);
 
 };
 
-- 
cgit v1.2.3


From 1bba8fd31e2dabf27fe2b4b9177bf156799d7299 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 1 Mar 2023 14:20:33 -0500
Subject: SL-18330: Use size_t max for LLTrace::PeriodicRecording methods.

The num_periods arguments have all been changed to size_t, but the default
argument values were still coded as S32_MAX. Change to
std::numeric_limits<size_t>::max().
---
 indra/llcommon/lltracerecording.cpp | 26 ++++++------
 indra/llcommon/lltracerecording.h   | 81 +++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 53 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index a8dcc5226a..5f16334c84 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -789,7 +789,7 @@ void PeriodicRecording::handleSplitTo(PeriodicRecording& other)
 	getCurRecording().splitTo(other.getCurRecording());
 }
 
-F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -811,7 +811,7 @@ F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, siz
 			: NaN;
 }
 
-F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -834,7 +834,7 @@ F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, siz
 }
 
 // calculates means using aggregates per period
-F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -857,7 +857,7 @@ F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, si
 			: NaN;
 }
 
-F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -882,7 +882,7 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulat
 			: NaN;
 }
 
-F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -904,7 +904,7 @@ F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, si
 			: NaN;
 }
 
-F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/)
+F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -927,7 +927,7 @@ F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, siz
 }
 
 
-F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -950,7 +950,7 @@ F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, s
 			: NaN;
 }
 
-F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -976,7 +976,7 @@ F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat,
 	return F64((buf.size() % 2 == 0) ? (buf[buf.size() / 2 - 1] + buf[buf.size() / 2]) / 2 : buf[buf.size() / 2]);
 }
 
-F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1002,7 +1002,7 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumula
 }
 
 
-F64Kilobytes PeriodicRecording::getPeriodMin( const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64Kilobytes PeriodicRecording::getPeriodMin( const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1022,7 +1022,7 @@ F64Kilobytes PeriodicRecording::getPeriodMin(const MemStatHandle& stat, size_t n
 	return getPeriodMin(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
 }
 
-F64Kilobytes PeriodicRecording::getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/)
+F64Kilobytes PeriodicRecording::getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1042,7 +1042,7 @@ F64Kilobytes PeriodicRecording::getPeriodMax(const MemStatHandle& stat, size_t n
 	return getPeriodMax(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
 }
 
-F64Kilobytes PeriodicRecording::getPeriodMean( const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64Kilobytes PeriodicRecording::getPeriodMean( const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1063,7 +1063,7 @@ F64Kilobytes PeriodicRecording::getPeriodMean(const MemStatHandle& stat, size_t
 	return getPeriodMean(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
 }
 
-F64Kilobytes PeriodicRecording::getPeriodStandardDeviation( const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
+F64Kilobytes PeriodicRecording::getPeriodStandardDeviation( const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 8b56721f42..66cee59764 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -33,6 +33,7 @@
 #include "lltimer.h"
 #include "lltraceaccumulators.h"
 #include "llpointer.h"
+#include <limits>
 
 class LLStopWatchControlsMixinCommon
 {
@@ -353,7 +354,7 @@ namespace LLTrace
 		Recording snapshotCurRecording() const;
 
 		template <typename T>
-		auto getSampleCount(const StatType<T>& stat, size_t num_periods = S32_MAX)
+		auto getSampleCount(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
 			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -373,7 +374,7 @@ namespace LLTrace
 
 		// catch all for stats that have a defined sum
 		template <typename T>
-		typename T::value_t getPeriodMin(const StatType<T>& stat, size_t num_periods = S32_MAX)
+		typename T::value_t getPeriodMin(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -396,33 +397,33 @@ namespace LLTrace
 		}
 
 		template<typename T>
-		T getPeriodMin(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		T getPeriodMin(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMin(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
-		F64 getPeriodMin(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodMin(const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		template<typename T>
-		T getPeriodMin(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		T getPeriodMin(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMin(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
-		F64 getPeriodMin(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodMin(const StatType<EventAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		template<typename T>
-		T getPeriodMin(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		T getPeriodMin(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMin(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodMin(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
-		F64Kilobytes getPeriodMin(const MemStatHandle& stat, size_t num_periods = S32_MAX);
+		F64Kilobytes getPeriodMin(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
+		F64Kilobytes getPeriodMin(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 
 		template <typename T>
-		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMinPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMinPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -437,7 +438,7 @@ namespace LLTrace
 		}
 
 		template<typename T>
-		typename RelatedTypes<T>::fractional_t getPeriodMinPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodMinPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMinPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
@@ -449,7 +450,7 @@ namespace LLTrace
 
 		// catch all for stats that have a defined sum
 		template <typename T>
-		typename T::value_t getPeriodMax(const StatType<T>& stat, size_t num_periods = S32_MAX)
+		typename T::value_t getPeriodMax(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -472,33 +473,33 @@ namespace LLTrace
 		}
 
 		template<typename T>
-		T getPeriodMax(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		T getPeriodMax(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMax(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
-		F64 getPeriodMax(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodMax(const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		template<typename T>
-		T getPeriodMax(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		T getPeriodMax(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMax(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
-		F64 getPeriodMax(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodMax(const StatType<EventAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		template<typename T>
-		T getPeriodMax(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		T getPeriodMax(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMax(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
-		F64Kilobytes getPeriodMax(const MemStatHandle& stat, size_t num_periods = S32_MAX);
+		F64Kilobytes getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
+		F64Kilobytes getPeriodMax(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 
 		template <typename T>
-		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMaxPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMaxPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -513,7 +514,7 @@ namespace LLTrace
 		}
 
 		template<typename T>
-		typename RelatedTypes<T>::fractional_t getPeriodMaxPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodMaxPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMaxPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
@@ -525,7 +526,7 @@ namespace LLTrace
 
 		// catch all for stats that have a defined sum
 		template <typename T>
-		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMean(const StatType<T >& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMean(const StatType<T >& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -546,32 +547,32 @@ namespace LLTrace
 		}
 
 		template<typename T>
-		typename RelatedTypes<T>::fractional_t getPeriodMean(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodMean(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
-		F64 getPeriodMean(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodMean(const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		template<typename T> 
-		typename RelatedTypes<T>::fractional_t getPeriodMean(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodMean(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
-		F64 getPeriodMean(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodMean(const StatType<EventAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		template<typename T>
-		typename RelatedTypes<T>::fractional_t getPeriodMean(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodMean(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodMean(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
-		F64Kilobytes getPeriodMean(const MemStatHandle& stat, size_t num_periods = S32_MAX);
+		F64Kilobytes getPeriodMean(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
+		F64Kilobytes getPeriodMean(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		
 		template <typename T>
-		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMeanPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMeanPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -593,16 +594,16 @@ namespace LLTrace
 		}
 
 		template<typename T>
-		typename RelatedTypes<T>::fractional_t getPeriodMeanPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodMeanPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMeanPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
-        F64 getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
+        F64 getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 
         template <typename T>
-        typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMedianPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
+        typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMedianPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
         {
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
             num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -622,7 +623,7 @@ namespace LLTrace
         }
 
         template<typename T>
-        typename RelatedTypes<T>::fractional_t getPeriodMedianPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
+        typename RelatedTypes<T>::fractional_t getPeriodMedianPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
         {
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
             return typename RelatedTypes<T>::fractional_t(getPeriodMedianPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
@@ -632,25 +633,25 @@ namespace LLTrace
 		// PERIODIC STANDARD DEVIATION
 		//
 
-		F64 getPeriodStandardDeviation(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodStandardDeviation(const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 
 		template<typename T> 
-		typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodStandardDeviation(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
-		F64 getPeriodStandardDeviation(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
+		F64 getPeriodStandardDeviation(const StatType<EventAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 		template<typename T>
-		typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
+		typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
             LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodStandardDeviation(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodStandardDeviation(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
-		F64Kilobytes getPeriodStandardDeviation(const MemStatHandle& stat, size_t num_periods = S32_MAX);
+		F64Kilobytes getPeriodStandardDeviation(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
+		F64Kilobytes getPeriodStandardDeviation(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 
 	private:
 		// implementation for LLStopWatchControlsMixin
-- 
cgit v1.2.3


From b14221966717afc1c4102f8091ec469ee20febcb Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 1 Mar 2023 21:30:42 +0200
Subject: SL-19288 Change item label suffix color to grey

---
 indra/llui/llfolderviewitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 6ddbf26639..6d2c346f76 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -164,7 +164,7 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 		sMouseOverColor = LLUIColorTable::instance().getColor("InventoryMouseOverColor", DEFAULT_WHITE);
 		sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
 		sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
-		sSuffixColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
+		sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemLinkColor", DEFAULT_WHITE);
 		sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 		sColorSetInitialized = true;
 	}
-- 
cgit v1.2.3


From 18ac7ab027217e05876a066c86ab3fbaa2a7328f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 1 Mar 2023 14:33:35 -0500
Subject: SL-18330: Use recursive variadic llmax(), llmin()

instead of having specific binary, ternary and quaternary overloads.
---
 indra/llcommon/lldefs.h | 48 +++++++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/lldefs.h b/indra/llcommon/lldefs.h
index 5c46f6a796..4e25001fff 100644
--- a/indra/llcommon/lldefs.h
+++ b/indra/llcommon/lldefs.h
@@ -167,48 +167,34 @@ const U32	MAXADDRSTR		= 17;		// 123.567.901.345 = 15 chars + \0 + 1 for good luc
 //
 // defined for U16, U32, U64, S16, S32, S64, :
 //   llclampb(a)     // clamps a to [0 .. 255]
-//   				   
-
-template <typename T1, typename T2> 
-inline auto llmax(T1 d1, T2 d2)
-{
-	return (d1 > d2) ? d1 : d2;
-}
-
-template <typename T1, typename T2, typename T3> 
-inline auto llmax(T1 d1, T2 d2, T3 d3)
-{
-	auto r = llmax(d1,d2);
-	return llmax(r, d3);
-}
+//
 
-template <typename T1, typename T2, typename T3, typename T4> 
-inline auto llmax(T1 d1, T2 d2, T3 d3, T4 d4)
+// recursion tail
+template <typename T>
+inline auto llmax(T data)
 {
-	auto r1 = llmax(d1,d2);
-	auto r2 = llmax(d3,d4);
-	return llmax(r1, r2);
+    return data;
 }
 
-template <typename T1, typename T2> 
-inline auto llmin(T1 d1, T2 d2)
+template <typename T0, typename T1, typename... Ts> 
+inline auto llmax(T0 d0, T1 d1, Ts... rest)
 {
-	return (d1 < d2) ? d1 : d2;
+    auto maxrest = llmax(d1, rest...);
+    return (d0 > maxrest)? d0 : maxrest;
 }
 
-template <typename T1, typename T2, typename T3> 
-inline auto llmin(T1 d1, T2 d2, T3 d3)
+// recursion tail
+template <typename T>
+inline auto llmin(T data)
 {
-	auto r = llmin(d1,d2);
-	return (r < d3 ? r : d3);
+    return data;
 }
 
-template <typename T1, typename T2, typename T3, typename T4> 
-inline auto llmin(T1 d1, T2 d2, T3 d3, T4 d4)
+template <typename T0, typename T1, typename... Ts> 
+inline auto llmin(T0 d0, T1 d1, Ts... rest)
 {
-	auto r1 = llmin(d1,d2);
-	auto r2 = llmin(d3,d4);
-	return llmin(r1, r2);
+    auto minrest = llmin(d1, rest...);
+    return (d0 < minrest) ? d0 : minrest;
 }
 
 template <typename A, typename MIN, typename MAX> 
-- 
cgit v1.2.3


From c18f0a61abfe8b9527f9a91b0e52e909cf7debfc Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 1 Mar 2023 14:35:04 -0500
Subject: SL-18330: Fix a narrowing conversion in LLSDSerialize::deserialize().

---
 indra/llcommon/llsdserialize.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index a14a6b5b1b..99d0c39694 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -143,7 +143,7 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, llssize max_bytes)
 		// byte. We could store one if needed, since even the incremented
 		// inbuf won't exceed sizeof(hdr_buf)-1, but there's no need.
 	}
-	std::string header{ hdr_buf, inbuf };
+	std::string header{ hdr_buf, narrow(inbuf) };
 	if (str.fail())
 	{
 		str.clear();
-- 
cgit v1.2.3


From 6cb6385bc71417c1017dc5ccabe53a678e371684 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 1 Mar 2023 16:37:55 -0500
Subject: SL-18330: Tweaks for Visual Studio builds

---
 indra/llcommon/llsdserialize.cpp            | 2 +-
 indra/llcommon/tests/llsdserialize_test.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 99d0c39694..046523dbb1 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -143,7 +143,7 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, llssize max_bytes)
 		// byte. We could store one if needed, since even the incremented
 		// inbuf won't exceed sizeof(hdr_buf)-1, but there's no need.
 	}
-	std::string header{ hdr_buf, narrow(inbuf) };
+	std::string header{ hdr_buf, static_cast<std::string::size_type>(inbuf) };
 	if (str.fail())
 	{
 		str.clear();
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 29e3007aff..618f33cc13 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -276,7 +276,7 @@ namespace tut
 			// why does LLSDSerialize::deserialize() reverse the parse() params??
 			mParser = [parser](std::istream& istr, LLSD& data, llssize max_bytes)
 			{
-				return (parser(data, istr, max_bytes) > 0);
+				return parser(data, istr, max_bytes);
 			};
 		}
 
-- 
cgit v1.2.3


From 4d2bdbb05ac24b4121f05107399fa7be33539f74 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 1 Mar 2023 23:37:05 +0200
Subject: SL-19282 Removed LLInspectTexture floater

LLInspectTexture floater appears to be incomplete and doesn't have a function
---
 indra/newview/llinspecttexture.cpp                 | 101 ---------------------
 indra/newview/llinspecttexture.h                   |   3 -
 indra/newview/llviewerfloaterreg.cpp               |   2 -
 .../skins/default/xui/en/inspect_texture.xml       |  63 -------------
 4 files changed, 169 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/inspect_texture.xml

(limited to 'indra')

diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index 2e8273d6cf..4ec0767c4e 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -25,7 +25,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "llfloaterreg.h"
 #include "llinspect.h"
 #include "llinspecttexture.h"
 #include "llinventoryfunctions.h"
@@ -34,101 +33,6 @@
 #include "lltrans.h"
 #include "llviewertexturelist.h"
 
-// ============================================================================
-// LLInspectTexture class
-//
-
-class LLInspectTexture : public LLInspect
-{
-	friend class LLFloaterReg;
-public:
-	LLInspectTexture(const LLSD& sdKey);
-	~LLInspectTexture();
-
-public:
-	void onOpen(const LLSD& sdData) override;
-	BOOL postBuild() override;
-
-public:
-	const LLUUID& getAssetId() const { return mAssetId; }
-	const LLUUID& getItemId() const  { return mItemId; }
-
-protected:
-	LLUUID         mAssetId;
-	LLUUID         mItemId;		// Item UUID relative to gInventoryModel (or null if not displaying an inventory texture)
-	LLUUID         mNotecardId;
-	LLTextureCtrl* mTextureCtrl = nullptr;
-	LLTextBox*     mTextureName = nullptr;
-};
-
-LLInspectTexture::LLInspectTexture(const LLSD& sdKey)
-	: LLInspect(LLSD())
-{
-}
-
-LLInspectTexture::~LLInspectTexture()
-{
-}
-
-void LLInspectTexture::onOpen(const LLSD& sdData)
-{
-	// Start fade animation
-	LLInspect::onOpen(sdData);
-
-	bool fIsAsset = sdData.has("thumbnail_id");
-	bool fIsInventory = sdData.has("item_id");
-
-	// Skip if we're being asked to display the same thing
-	const LLUUID idAsset = (fIsAsset) ? sdData["thumbnail_id"].asUUID() : LLUUID::null;
-	const LLUUID idItem = (fIsInventory) ? sdData["item_id"].asUUID() : LLUUID::null;
-	if ( (getVisible()) && ( ((fIsAsset) && (idAsset == mAssetId)) || ((fIsInventory) && (idItem == mItemId)) ) )
-	{
-		return;
-	}
-
-	// Position the inspector relative to the mouse cursor
-	// Similar to how tooltips are positioned [see LLToolTipMgr::createToolTip()]
-	if (sdData.has("pos"))
-		LLUI::instance().positionViewNearMouse(this, sdData["pos"]["x"].asInteger(), sdData["pos"]["y"].asInteger());
-	else
-		LLUI::instance().positionViewNearMouse(this);
-
-	std::string strName = sdData["name"].asString();
-	if (fIsAsset)
-	{
-		mAssetId = idAsset;
-		mItemId = idItem;		// Will be non-null in the case of a notecard
-		mNotecardId = sdData["notecard_id"].asUUID();
-	}
-	else if (fIsInventory)
-	{
-		const LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
-		if ( (pItem) && (LLAssetType::AT_TEXTURE == pItem->getType()) )
-		{
-			if (strName.empty())
-				strName = pItem->getName();
-			mAssetId = pItem->getAssetUUID();
-			mItemId = idItem;
-		}
-		else
-		{
-			mAssetId.setNull();
-			mItemId.setNull();
-		}
-		mNotecardId = LLUUID::null;
-	}
-
-	mTextureCtrl->setImageAssetID(mAssetId);
-	mTextureName->setText(strName);
-}
-
-BOOL LLInspectTexture::postBuild()
-{
-	mTextureCtrl = getChild<LLTextureCtrl>("texture_ctrl");
-	mTextureName = getChild<LLTextBox>("texture_name");
-
-	return TRUE;
-}
 
 // ============================================================================
 // Helper functions
@@ -202,11 +106,6 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
 	}
 }
 
-void LLInspectTextureUtil::registerFloater()
-{
-	LLFloaterReg::add("inspect_texture", "inspect_texture.xml", &LLFloaterReg::build<LLInspectTexture>);
-}
-
 // ============================================================================
 // LLTexturePreviewView helper class
 //
diff --git a/indra/newview/llinspecttexture.h b/indra/newview/llinspecttexture.h
index 192aafc3b4..ff0d80b825 100644
--- a/indra/newview/llinspecttexture.h
+++ b/indra/newview/llinspecttexture.h
@@ -32,9 +32,6 @@ class LLTexturePreviewView;
 namespace LLInspectTextureUtil
 {
 	LLToolTip* createInventoryToolTip(LLToolTip::Params p);
-
-	// Register with LLFloaterReg
-	void registerFloater();
 }
 
 class LLTextureToolTip : public LLToolTip
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 581c6779ab..36cfefdbb2 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -154,7 +154,6 @@
 #include "llinspectgroup.h"
 #include "llinspectobject.h"
 #include "llinspectremoteobject.h"
-#include "llinspecttexture.h"
 #include "llinspecttoast.h"
 #include "llmoveview.h"
 #include "llfloaterimnearbychat.h"
@@ -378,7 +377,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLInspectAvatarUtil::registerFloater();
 	LLInspectGroupUtil::registerFloater();
 	LLInspectObjectUtil::registerFloater();
-	LLInspectTextureUtil::registerFloater();
 	LLInspectRemoteObjectUtil::registerFloater();
 	LLFloaterVoiceVolumeUtil::registerFloater();
 	LLNotificationsUI::registerFloater();
diff --git a/indra/newview/skins/default/xui/en/inspect_texture.xml b/indra/newview/skins/default/xui/en/inspect_texture.xml
deleted file mode 100644
index 30be90cfa0..0000000000
--- a/indra/newview/skins/default/xui/en/inspect_texture.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater
- legacy_header_height="25"
- bevel_style="in"
- bg_opaque_image="Inspector_Background" 
- can_close="false"
- can_minimize="false"
- height="295"
- layout="topleft"
- name="inspect_texture"
- single_instance="true"
- sound_flags="0"
- visible="true"
- width="250">
-  <texture_picker
-   enabled="false"
-   fallback_image="default_land_picture.j2c"
-   follows="all"
-   height="262"
-   layout="topleft"
-   left="5"
-   name="texture_ctrl"
-   top_pad="5"
-   width="240" />
-  <text
-   follows="top|left"
-   font="SansSerifSmall"
-   height="16"
-   left="7"
-   name="texture_name"
-   parse_urls="false"
-   right="-7"
-   top_delta="244"
-   text_color="White"
-   translate="false"
-   use_ellipses="true"
-   word_wrap="true"
-   value="Name of the texture goes here" />
-  <button
-   bottom="-5"
-   follows="bottom|left"
-   height="23"
-   label="Open"
-   left="7"
-   name="open_btn"
-   width="115"
-   commit_callback.function="InspectTexture.Open"
-   enable_callback.function="InspectTexture.CanOpen" />
-  <button
-   bottom="-5"
-   follows="bottom|left"
-   height="23"
-   label="Copy to Inventory"
-   left_pad="5"
-   name="copy_btn"
-   width="115"
-   commit_callback.function="InspectTexture.CopyToInv"
-   enable_callback.function="InspectTexture.CanCopyToInv" />
-</floater>
-- 
cgit v1.2.3


From cf901b5abbe5c24da92c6c0320e3831a3798a539 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 2 Mar 2023 01:46:38 +0200
Subject: SL-19282 Thumbnail adjustments

Follow links, fix outfts missing 'image' option, adjust inspector, recolor 'worn' in gallery
---
 indra/llinventory/llinventory.cpp   |  9 ---------
 indra/llinventory/llinventory.h     |  1 -
 indra/newview/llinspecttexture.cpp  | 29 +++++++++++++++++++++++++++--
 indra/newview/llinventorybridge.cpp |  1 +
 indra/newview/lloutfitgallery.cpp   |  5 ++++-
 indra/newview/llviewerinventory.cpp | 17 +++++++++++++++++
 indra/newview/llviewerinventory.h   |  1 +
 7 files changed, 50 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index e00f652622..abe1b4dbd3 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -504,15 +504,6 @@ void LLInventoryItem::setSaleInfo(const LLSaleInfo& sale_info)
 	mSaleInfo = sale_info;
 }
 
-const LLUUID& LLInventoryItem::getThumbnailUUID() const
-{
-    if (mThumbnailUUID.isNull() && mType == LLAssetType::AT_TEXTURE)
-    {
-        return mAssetUUID;
-    }
-    return mThumbnailUUID;
-}
-
 LLInventoryType::EType LLInventoryItem::getInventoryType() const
 {
 	return mInventoryType;
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 7af542c49a..dfe8b7659b 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -162,7 +162,6 @@ public:
 	virtual const std::string& getDescription() const;
 	virtual const std::string& getActualDescription() const; // Does not follow links
 	virtual const LLSaleInfo& getSaleInfo() const;
-    virtual const LLUUID& getThumbnailUUID() const;
 	virtual LLInventoryType::EType getInventoryType() const;
 	virtual U32 getFlags() const;
 	virtual time_t getCreationDate() const;
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index 4ec0767c4e..843b4da757 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -59,6 +59,7 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
     if (sdTooltip.has("thumbnail_id") && sdTooltip["thumbnail_id"].asUUID().notNull())
     {
         // go straight for thumbnail regardless of type
+        // TODO: make a tooltip factory?
         return LLUICtrlFactory::create<LLTextureToolTip>(p);
     }
 
@@ -147,12 +148,12 @@ LLTexturePreviewView::~LLTexturePreviewView()
 
 void LLTexturePreviewView::draw()
 {
+    LLView::draw();
+
 	if (m_Image)
 	{
 		LLRect rctClient = getLocalRect();
 
-		gl_rect_2d(rctClient, LLColor4::black);
-		rctClient.stretch(-2);
 		if (4 == m_Image->getComponents())
 			gl_rect_2d_checkerboard(rctClient);
 		gl_draw_scaled_image(rctClient.mLeft, rctClient.mBottom, rctClient.getWidth(), rctClient.getHeight(), m_Image);
@@ -199,6 +200,11 @@ LLTextureToolTip::LLTextureToolTip(const LLToolTip::Params& p)
 	, mPreviewSize(256)
 {
 	mMaxWidth = llmax(mMaxWidth, mPreviewSize);
+
+    // Currently has to share params with LLToolTip, override values
+    setBackgroundColor(LLColor4::black);
+    setTransparentColor(LLColor4::black);
+    setBorderVisible(true);
 }
 
 LLTextureToolTip::~LLTextureToolTip()
@@ -229,6 +235,25 @@ void LLTextureToolTip::initFromParams(const LLToolTip::Params& p)
         mPreviewView->setImageFromItemId(sdTextureParams["item_id"].asUUID());
     }
 
+    // Currently has to share params with LLToolTip, override values manually
+    // Todo: provide from own params instead, may be like object inspector does it
+    LLViewBorder::Params border_params;
+    border_params.border_thickness(LLPANEL_BORDER_WIDTH);
+    border_params.highlight_light_color(LLColor4::white);
+    border_params.highlight_dark_color(LLColor4::white);
+    border_params.shadow_light_color(LLColor4::white);
+    border_params.shadow_dark_color(LLColor4::white);
+    addBorder(border_params);
+    setBorderVisible(true);
+
+    setBackgroundColor(LLColor4::black);
+    setBackgroundVisible(true);
+    setBackgroundOpaque(true);
+    setBackgroundImage(nullptr);
+    setTransparentImage(nullptr);
+
+    mTextBox->setColor(LLColor4::white);
+
 	snapToChildren();
 }
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5f1db0895c..0c7f237415 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4240,6 +4240,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 			if (cat && (cat->getPreferredType() == LLFolderType::FT_OUTFIT))
 			{
 				items.push_back(std::string("Rename"));
+                items.push_back(std::string("thumbnail"));
 
 				addDeleteContextMenuOptions(items, disabled_items);
 				// EXT-4030: disallow deletion of currently worn outfit
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 6ef8080d8c..a275af1565 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -741,10 +741,13 @@ void LLOutfitGalleryItem::setOutfitWorn(bool value)
     mWorn = value;
     LLStringUtil::format_map_t worn_string_args;
     std::string worn_string = getString("worn_string", worn_string_args);
-    LLUIColor text_color = LLUIColorTable::instance().getColor(mSelected ? "White" : (mWorn ? "OutfitGalleryItemWorn" : "White"), LLColor4::white);
+    LLUIColor text_color = LLUIColorTable::instance().getColor("White", LLColor4::white);
     mOutfitWornText->setReadOnlyColor(text_color.get());
     mOutfitNameText->setReadOnlyColor(text_color.get());
+    mOutfitWornText->setFont(value ? LLFontGL::getFontSansSerifBold() : LLFontGL::getFontSansSerifSmall());
+    mOutfitNameText->setFont(value ? LLFontGL::getFontSansSerifBold() : LLFontGL::getFontSansSerifSmall());
     mOutfitWornText->setValue(value ? worn_string : "");
+    mOutfitNameText->setText(mOutfitName); // refresh LLTextViewModel to pick up font changes
 }
 
 void LLOutfitGalleryItem::setSelected(bool value)
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 50252556de..27f57bda81 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1893,6 +1893,23 @@ const LLSaleInfo& LLViewerInventoryItem::getSaleInfo() const
 	return LLInventoryItem::getSaleInfo();
 }
 
+const LLUUID& LLViewerInventoryItem::getThumbnailUUID() const
+{
+    if (mThumbnailUUID.isNull() && mType == LLAssetType::AT_TEXTURE)
+    {
+        return mAssetUUID;
+    }
+    if (mThumbnailUUID.isNull() && mType == LLAssetType::AT_LINK)
+    {
+        return gInventory.getItem(getLinkedUUID())->getThumbnailUUID();
+    }
+    if (mThumbnailUUID.isNull() && mType == LLAssetType::AT_LINK_FOLDER)
+    {
+        return gInventory.getCategory(getLinkedUUID())->getThumbnailUUID();
+    }
+    return mThumbnailUUID;
+}
+
 LLInventoryType::EType LLViewerInventoryItem::getInventoryType() const
 {
 	if (const LLViewerInventoryItem *linked_item = getLinkedItem())
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 24b632632b..3914dae343 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -72,6 +72,7 @@ public:
 	virtual const LLUUID& getCreatorUUID() const;
 	virtual const std::string& getDescription() const;
 	virtual const LLSaleInfo& getSaleInfo() const;
+    virtual const LLUUID& getThumbnailUUID() const;
 	virtual LLInventoryType::EType getInventoryType() const;
 	virtual bool isWearableType() const;
 	virtual LLWearableType::EType getWearableType() const;
-- 
cgit v1.2.3


From c74658b19b1ac28d5bf240e940a7ad97ff034e3c Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 2 Mar 2023 20:54:33 +0200
Subject: SL-19310 Update navigation buttons in single-folder view

---
 indra/llui/llfolderview.cpp                          |  5 +++++
 indra/llui/llfolderviewitem.h                        |  2 ++
 indra/newview/llinventorypanel.cpp                   | 20 ++++++++++++++++++--
 indra/newview/llinventorypanel.h                     |  3 +++
 indra/newview/llpanelmaininventory.cpp               | 16 ++++++++++++++++
 indra/newview/llpanelmaininventory.h                 |  1 +
 .../skins/default/xui/en/panel_main_inventory.xml    |  4 +++-
 7 files changed, 48 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 5170816671..46a7057240 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1273,6 +1273,11 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
 		if(mSelectedItems.size())
 		{
 			LLFolderViewItem* last_selected = getCurSelectedItem();
+            if(last_selected && last_selected->isSingleFolderMode())
+            {
+                handled = FALSE;
+                break;
+            }
 			LLFolderViewItem* parent_folder = last_selected->getParentFolder();
 			if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder())
 			{
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index fe751be6b9..aa9ed0a1e8 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -279,6 +279,8 @@ public:
     // Does not need filter update
 	virtual void refreshSuffix();
 
+    bool isSingleFolderMode() { return mSingleFolderMode; }
+
 	// LLView functionality
 	virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
 	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 6cf1edd26b..076f002f47 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2107,7 +2107,7 @@ void LLInventorySingleFolderPanel::changeFolderRoot(const LLUUID& new_id)
 
 void LLInventorySingleFolderPanel::onForwardFolder()
 {
-    if(!mForwardFolders.empty() && (mFolderID != mForwardFolders.back()))
+    if(isForwardAvailable())
     {
         mBackwardFolders.push_back(mFolderID);
         mFolderID = mForwardFolders.back();
@@ -2118,7 +2118,7 @@ void LLInventorySingleFolderPanel::onForwardFolder()
 
 void LLInventorySingleFolderPanel::onBackwardFolder()
 {
-    if(!mBackwardFolders.empty() && (mFolderID != mBackwardFolders.back()))
+    if(isBackwardAvailable())
     {
         mForwardFolders.push_back(mFolderID);
         mFolderID = mBackwardFolders.back();
@@ -2133,6 +2133,16 @@ void LLInventorySingleFolderPanel::clearNavigationHistory()
     mBackwardFolders.clear();
 }
 
+bool LLInventorySingleFolderPanel::isBackwardAvailable()
+{
+    return (!mBackwardFolders.empty() && (mFolderID != mBackwardFolders.back()));
+}
+
+bool LLInventorySingleFolderPanel::isForwardAvailable()
+{
+    return (!mForwardFolders.empty() && (mFolderID != mForwardFolders.back()));
+}
+
 boost::signals2::connection LLInventorySingleFolderPanel::setRootChangedCallback(root_changed_callback_t cb)
 {
     return mRootChangedSignal.connect(cb);
@@ -2186,6 +2196,12 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
         mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
 
         buildNewViews(mFolderID);
+        
+        LLFloater* root_floater = gFloaterView->getParentFloater(this);
+        if(root_floater)
+        {
+            root_floater->setFocus(true);
+        }
     }
 }
 
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index e9eaaa232d..31dd7aec23 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -403,6 +403,9 @@ public:
     void clearNavigationHistory();
     LLUUID getSingleFolderRoot() { return mFolderID; }
 
+    bool isBackwardAvailable();
+    bool isForwardAvailable();
+
     void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
 
     typedef boost::function<void()> root_changed_callback_t;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index fd245a2b4d..1eb2d5bbdc 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -374,6 +374,10 @@ BOOL LLPanelMainInventory::handleKeyHere(KEY key, MASK mask)
 		{
 			startSearch();
 		}
+        if(mSingleFolderMode && key == KEY_LEFT)
+        {
+            onBackFolderClicked();
+        }
 	}
 
 	return LLPanel::handleKeyHere(key, mask);
@@ -1327,6 +1331,7 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
     if(clear_nav_history)
     {
         mSingleFolderPanelInventory->clearNavigationHistory();
+        updateNavButtons();
     }
 }
 
@@ -1756,6 +1761,17 @@ void LLPanelMainInventory::updateTitle()
             inventory_floater->setTitle(getString("inventory_title"));
         }
     }
+    updateNavButtons();
+}
+
+void LLPanelMainInventory::updateNavButtons()
+{
+    getChild<LLButton>("back_btn")->setEnabled(mSingleFolderPanelInventory->isBackwardAvailable());
+    getChild<LLButton>("forward_btn")->setEnabled(mSingleFolderPanelInventory->isForwardAvailable());
+    
+    const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+    bool up_enabled = (cat && cat->getParentUUID().notNull());
+    getChild<LLButton>("up_btn")->setEnabled(up_enabled);
 }
 
 LLSidepanelInventory* LLPanelMainInventory::getParentSidepanelInventory()
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 6382f44bc9..7edaf7db96 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -179,6 +179,7 @@ protected:
     bool isActionVisible(const LLSD& userdata);
     static bool hasSettingsInventory();
     void updateTitle();
+    void updateNavButtons();
 	/**
 	 * Set upload cost in "Upload" sub menu.
 	 */
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 9086f38893..d400835198 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -293,7 +293,9 @@
        border="false"
        bevel_style="none"
        scroll.reserve_scroll_corner="false">
-        <item folder_indentation="-8"/>
+        <item
+         single_folder_mode="true"
+         folder_indentation="-8"/>
         <folder
          single_folder_mode="true"
          folder_indentation="-8"/>
-- 
cgit v1.2.3


From 42b1fd21814e679a1557e0d5a55943c5b0e63723 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 2 Mar 2023 15:00:50 -0500
Subject: SL-18330: Review and tweak LLTrace::PeriodicRecording indexing

per Leviathan code review.
---
 indra/llcommon/lltracerecording.cpp | 98 ++++++++++++++++---------------------
 indra/llcommon/lltracerecording.h   | 97 +++++++++++++++++++++++-------------
 2 files changed, 105 insertions(+), 90 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index 5f16334c84..bb3d667a42 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -577,10 +577,12 @@ S32 Recording::getSampleCount( const StatType<EventAccumulator>& stat )
 // PeriodicRecording
 ///////////////////////////////////////////////////////////////////////
 
-PeriodicRecording::PeriodicRecording( S32 num_periods, EPlayState state) 
+PeriodicRecording::PeriodicRecording( size_t num_periods, EPlayState state) 
 :	mAutoResize(num_periods == 0),
 	mCurPeriod(0),
 	mNumRecordedPeriods(0),
+	// This guarantee that mRecordingPeriods cannot be empty is essential for
+	// code in several methods.
 	mRecordingPeriods(num_periods ? num_periods : 1)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
@@ -596,18 +598,19 @@ PeriodicRecording::~PeriodicRecording()
 
 void PeriodicRecording::nextPeriod()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	if (mAutoResize)
 	{
 		mRecordingPeriods.push_back(Recording());
 	}
 
 	Recording& old_recording = getCurRecording();
-	mCurPeriod = (mCurPeriod + 1) % mRecordingPeriods.size();
+	inci(mCurPeriod);
 	old_recording.splitTo(getCurRecording());
 
-	mNumRecordedPeriods = mRecordingPeriods.empty()? 0 :
-		llmin(mRecordingPeriods.size() - 1, mNumRecordedPeriods + 1);
+	// Since mRecordingPeriods always has at least one entry, we can always
+	// safely subtract 1 from its size().
+	mNumRecordedPeriods = llmin(mRecordingPeriods.size() - 1, mNumRecordedPeriods + 1);
 }
 
 void PeriodicRecording::appendRecording(Recording& recording)
@@ -620,31 +623,29 @@ void PeriodicRecording::appendRecording(Recording& recording)
 
 void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	if (other.mRecordingPeriods.empty()) return;
 
 	getCurRecording().update();
 	other.getCurRecording().update();
-	
-	const auto other_recording_slots = other.mRecordingPeriods.size();
+
 	const auto other_num_recordings = other.getNumRecordedPeriods();
 	const auto other_current_recording_index = other.mCurPeriod;
-	const auto other_oldest_recording_index = (other_current_recording_index + other_recording_slots - other_num_recordings) % other_recording_slots;
+	const auto other_oldest_recording_index = other.previ(other_current_recording_index, other_num_recordings);
 
 	// append first recording into our current slot
 	getCurRecording().appendRecording(other.mRecordingPeriods[other_oldest_recording_index]);
 
 	// from now on, add new recordings for everything after the first
-	auto other_index = (other_oldest_recording_index + 1) % other_recording_slots;
+	auto other_index = other.nexti(other_oldest_recording_index);
 
 	if (mAutoResize)
 	{
 		// push back recordings for everything in the middle
-		auto other_index = (other_oldest_recording_index + 1) % other_recording_slots;
 		while (other_index != other_current_recording_index)
 		{
 			mRecordingPeriods.push_back(other.mRecordingPeriods[other_index]);
-			other_index = (other_index + 1) % other_recording_slots;
+			other.inci(other_index);
 		}
 
 		// add final recording, if it wasn't already added as the first
@@ -653,36 +654,25 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
 			mRecordingPeriods.push_back(other.mRecordingPeriods[other_current_recording_index]);
 		}
 
-		mCurPeriod = mRecordingPeriods.empty()? 0 : mRecordingPeriods.size() - 1;
+		// mRecordingPeriods is never empty()
+		mCurPeriod = mRecordingPeriods.size() - 1;
 		mNumRecordedPeriods = mCurPeriod;
 	}
 	else
 	{
-		S32 num_to_copy = llmin((S32)mRecordingPeriods.size(), (S32)other_num_recordings);
-
-		std::vector<Recording>::iterator src_it = other.mRecordingPeriods.begin() + other_index ;
-		std::vector<Recording>::iterator dest_it = mRecordingPeriods.begin() + mCurPeriod;
-
+		auto num_to_copy = llmin(mRecordingPeriods.size(), other_num_recordings);
 		// already consumed the first recording from other, so start counting at 1
-		for(S32 i = 1; i < num_to_copy; i++)
+		for (size_t n = 1, srci = other_index, dsti = mCurPeriod;
+			 n < num_to_copy;
+			 ++n, other.inci(srci), inci(dsti))
 		{
-			*dest_it = *src_it;
-
-			if (++src_it == other.mRecordingPeriods.end())
-			{
-				src_it = other.mRecordingPeriods.begin();
-			}
-
-			if (++dest_it == mRecordingPeriods.end())
-			{
-				dest_it = mRecordingPeriods.begin();
-			}
+			mRecordingPeriods[dsti] = other.mRecordingPeriods[srci];
 		}
-		
+
 		// want argument to % to be positive, otherwise result could be negative and thus out of bounds
 		llassert(num_to_copy >= 1);
 		// advance to last recording period copied, and make that our current period
-		mCurPeriod = (mCurPeriod + num_to_copy - 1) % mRecordingPeriods.size();
+		inci(mCurPeriod, num_to_copy - 1);
 		mNumRecordedPeriods = llmin(mRecordingPeriods.size() - 1, mNumRecordedPeriods + num_to_copy - 1);
 	}
 
@@ -694,13 +684,11 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
 
 F64Seconds PeriodicRecording::getDuration() const
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	F64Seconds duration;
-	auto num_periods = mRecordingPeriods.size();
-	for (size_t i = 1; i <= num_periods; i++)
+	for (size_t n = 0; n < mRecordingPeriods.size(); ++n)
 	{
-		auto index = (mCurPeriod + num_periods - i) % num_periods;
-		duration += mRecordingPeriods[index].getDuration();
+		duration += mRecordingPeriods[nexti(mCurPeriod, n)].getDuration();
 	}
 	return duration;
 }
@@ -737,16 +725,14 @@ const Recording& PeriodicRecording::getCurRecording() const
 
 Recording& PeriodicRecording::getPrevRecording( size_t offset )
 {
-	auto num_periods = mRecordingPeriods.size();
-	offset = llclamp(offset, 0, num_periods - 1);
-	return mRecordingPeriods[(mCurPeriod + num_periods - offset) % num_periods];
+	// reuse const implementation, but return non-const reference
+	return const_cast<Recording&>(
+		const_cast<const PeriodicRecording*>(this)->getPrevRecording(offset));
 }
 
 const Recording& PeriodicRecording::getPrevRecording( size_t offset ) const
 {
-	auto num_periods = mRecordingPeriods.size();
-	offset = llclamp(offset, 0, num_periods - 1);
-	return mRecordingPeriods[(mCurPeriod + num_periods - offset) % num_periods];
+	return mRecordingPeriods[previ(mCurPeriod, offset)];
 }
 
 void PeriodicRecording::handleStart()
@@ -796,7 +782,7 @@ F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, siz
 
 	bool has_value = false;
 	F64 min_val = std::numeric_limits<F64>::max();
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -818,7 +804,7 @@ F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, siz
 
 	bool has_value = false;
 	F64 max_val = std::numeric_limits<F64>::min();
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -842,7 +828,7 @@ F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, si
 	F64 mean = 0;
 	S32 valid_period_count = 0;
 
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -866,7 +852,7 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulat
 	F64 sum_of_squares = 0;
 	S32 valid_period_count = 0;
 
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -889,7 +875,7 @@ F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, si
 
 	bool has_value = false;
 	F64 min_val = std::numeric_limits<F64>::max();
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -911,7 +897,7 @@ F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, siz
 
 	bool has_value = false;
 	F64 max_val = std::numeric_limits<F64>::min();
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -935,7 +921,7 @@ F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, s
 	S32 valid_period_count = 0;
 	F64 mean = 0;
 
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -956,7 +942,7 @@ F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat,
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	std::vector<F64> buf;
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.getDuration() > (F32Seconds)0.f)
@@ -985,7 +971,7 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumula
 	S32 valid_period_count = 0;
 	F64 sum_of_squares = 0;
 
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
@@ -1008,7 +994,7 @@ F64Kilobytes PeriodicRecording::getPeriodMin( const StatType<MemAccumulator>& st
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	F64Kilobytes min_val(std::numeric_limits<F64>::max());
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		min_val = llmin(min_val, recording.getMin(stat));
@@ -1028,7 +1014,7 @@ F64Kilobytes PeriodicRecording::getPeriodMax(const StatType<MemAccumulator>& sta
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	F64Kilobytes max_val(0.0);
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		max_val = llmax(max_val, recording.getMax(stat));
@@ -1049,7 +1035,7 @@ F64Kilobytes PeriodicRecording::getPeriodMean( const StatType<MemAccumulator>& s
 
 	F64Kilobytes mean(0);
 
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		mean += recording.getMean(stat);
@@ -1072,7 +1058,7 @@ F64Kilobytes PeriodicRecording::getPeriodStandardDeviation( const StatType<MemAc
 	S32 valid_period_count = 0;
 	F64 sum_of_squares = 0;
 
-	for (S32 i = 1; i <= num_periods; i++)
+	for (size_t i = 1; i <= num_periods; i++)
 	{
 		Recording& recording = getPrevRecording(i);
 		if (recording.hasValue(stat))
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 66cee59764..a6b1a67d02 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -331,7 +331,7 @@ namespace LLTrace
 	:	public LLStopWatchControlsMixin<PeriodicRecording>
 	{
 	public:
-		PeriodicRecording(S32 num_periods, EPlayState state = STOPPED);
+		PeriodicRecording(size_t num_periods, EPlayState state = STOPPED);
 		~PeriodicRecording();
 
 		void nextPeriod();
@@ -381,7 +381,7 @@ namespace LLTrace
 
 			bool has_value = false;
 			typename T::value_t min_val(std::numeric_limits<typename T::value_t>::max());
-			for (S32 i = 1; i <= num_periods; i++)
+			for (size_t i = 1; i <= num_periods; i++)
 			{
 				Recording& recording = getPrevRecording(i);
 				if (recording.hasValue(stat))
@@ -429,7 +429,7 @@ namespace LLTrace
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			typename RelatedTypes<typename T::value_t>::fractional_t min_val(std::numeric_limits<F64>::max());
-			for (S32 i = 1; i <= num_periods; i++)
+			for (size_t i = 1; i <= num_periods; i++)
 			{
 				Recording& recording = getPrevRecording(i);
 				min_val = llmin(min_val, recording.getPerSec(stat));
@@ -457,7 +457,7 @@ namespace LLTrace
 
 			bool has_value = false;
 			typename T::value_t max_val(std::numeric_limits<typename T::value_t>::min());
-			for (S32 i = 1; i <= num_periods; i++)
+			for (size_t i = 1; i <= num_periods; i++)
 			{
 				Recording& recording = getPrevRecording(i);
 				if (recording.hasValue(stat))
@@ -505,7 +505,7 @@ namespace LLTrace
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			F64 max_val = std::numeric_limits<F64>::min();
-			for (S32 i = 1; i <= num_periods; i++)
+			for (size_t i = 1; i <= num_periods; i++)
 			{
 				Recording& recording = getPrevRecording(i);
 				max_val = llmax(max_val, recording.getPerSec(stat));
@@ -533,7 +533,7 @@ namespace LLTrace
 
 			typename RelatedTypes<typename T::value_t>::fractional_t mean(0);
 
-			for (S32 i = 1; i <= num_periods; i++)
+			for (size_t i = 1; i <= num_periods; i++)
 			{
 				Recording& recording = getPrevRecording(i);
 				if (recording.getDuration() > (F32Seconds)0.f)
@@ -579,7 +579,7 @@ namespace LLTrace
 
 			typename RelatedTypes<typename T::value_t>::fractional_t mean = 0;
 
-			for (S32 i = 1; i <= num_periods; i++)
+			for (size_t i = 1; i <= num_periods; i++)
 			{
 				Recording& recording = getPrevRecording(i);
 				if (recording.getDuration() > (F32Seconds)0.f)
@@ -600,34 +600,34 @@ namespace LLTrace
 			return typename RelatedTypes<T>::fractional_t(getPeriodMeanPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
-        F64 getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
+		F64 getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 
-        template <typename T>
-        typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMedianPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
-        {
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-            num_periods = llmin(num_periods, getNumRecordedPeriods());
-
-            std::vector <typename RelatedTypes<typename T::value_t>::fractional_t> buf;
-            for (S32 i = 1; i <= num_periods; i++)
-            {
-                Recording& recording = getPrevRecording(i);
-                if (recording.getDuration() > (F32Seconds)0.f)
-                {
-                    buf.push_back(recording.getPerSec(stat));
-                }
-            }
-            std::sort(buf.begin(), buf.end());
-
-            return typename RelatedTypes<T>::fractional_t((buf.size() % 2 == 0) ? (buf[buf.size() / 2 - 1] + buf[buf.size() / 2]) / 2 : buf[buf.size() / 2]);
-        }
-
-        template<typename T>
-        typename RelatedTypes<T>::fractional_t getPeriodMedianPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
-        {
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-            return typename RelatedTypes<T>::fractional_t(getPeriodMedianPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
-        }
+		template <typename T>
+		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMedianPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
+		{
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			num_periods = llmin(num_periods, getNumRecordedPeriods());
+
+			std::vector <typename RelatedTypes<typename T::value_t>::fractional_t> buf;
+			for (size_t i = 1; i <= num_periods; i++)
+			{
+				Recording& recording = getPrevRecording(i);
+				if (recording.getDuration() > (F32Seconds)0.f)
+				{
+					buf.push_back(recording.getPerSec(stat));
+				}
+			}
+			std::sort(buf.begin(), buf.end());
+
+			return typename RelatedTypes<T>::fractional_t((buf.size() % 2 == 0) ? (buf[buf.size() / 2 - 1] + buf[buf.size() / 2]) / 2 : buf[buf.size() / 2]);
+		}
+
+		template<typename T>
+		typename RelatedTypes<T>::fractional_t getPeriodMedianPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
+		{
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			return typename RelatedTypes<T>::fractional_t(getPeriodMedianPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
+		}
 
 		//
 		// PERIODIC STANDARD DEVIATION
@@ -660,6 +660,35 @@ namespace LLTrace
 		/*virtual*/ void handleReset();
 		/*virtual*/ void handleSplitTo(PeriodicRecording& other);
 
+		// helper methods for wraparound ring-buffer arithmetic
+		inline
+		size_t wrapi(size_t i) const
+		{
+			return i % mRecordingPeriods.size();
+		}
+
+		inline
+		size_t nexti(size_t i, size_t offset=1) const
+		{
+			return wrapi(i + offset);
+		}
+
+		inline
+		size_t previ(size_t i, size_t offset=1) const
+		{
+			auto num_periods = mRecordingPeriods.size();
+			// constrain offset
+			offset = llclamp(offset, 0, num_periods - 1);
+			// add size() so expression can't go (unsigned) "negative"
+			return wrapi(i + num_periods - offset);
+		}
+
+		inline
+		void inci(size_t& i, size_t offset=1) const
+		{
+			i = nexti(i, offset);
+		}
+
 	private:
 		std::vector<Recording>	mRecordingPeriods;
 		const bool				mAutoResize;
-- 
cgit v1.2.3


From bb964fb49512abcce7018c339d752cc35240816d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 3 Mar 2023 18:39:29 +0200
Subject: SL-19334 Show item count info only for items in current folder in
 single-folder view

---
 indra/newview/llpanelmaininventory.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 1eb2d5bbdc..6b9e04840d 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -825,6 +825,17 @@ void LLPanelMainInventory::updateItemcountText()
 	{
 		text = getString("ItemcountUnknown", string_args);
 	}
+
+    if (mSingleFolderMode)
+    {
+        LLInventoryModel::cat_array_t *cats;
+        LLInventoryModel::item_array_t *items;
+        gInventory.getDirectDescendentsOf(mSingleFolderPanelInventory->getSingleFolderRoot(), cats, items);
+    
+        string_args["[ITEM_COUNT]"] = llformat("%d", items->size());
+        string_args["[CATEGORY_COUNT]"] = llformat("%d", cats->size());
+        text = getString("ItemcountCompleted", string_args);
+    }
 	
     mCounterCtrl->setValue(text);
     mCounterCtrl->setToolTip(text);
-- 
cgit v1.2.3


From cdb3c018af9fc75064dc63537e61c5df567c331a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 1 Mar 2023 10:26:34 -0500
Subject: SL-19336 Unload avatar and group icons from memory when not visible
 to reduce memory pressure on extremely large friends lists

---
 indra/llui/lliconctrl.cpp | 26 ++++++++++++++++++++++++++
 indra/llui/lliconctrl.h   |  3 +++
 indra/llui/lltextbase.cpp |  4 ++--
 indra/llui/llview.h       |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
index e01aba402e..2791377a5e 100644
--- a/indra/llui/lliconctrl.cpp
+++ b/indra/llui/lliconctrl.cpp
@@ -37,6 +37,8 @@
 #include "lluiimage.h"
 #include "llwindow.h"
 
+#include "llgltexture.h"
+
 static LLDefaultChildRegistry::Register<LLIconCtrl> r("icon");
 
 LLIconCtrl::Params::Params()
@@ -94,6 +96,22 @@ BOOL LLIconCtrl::handleHover(S32 x, S32 y, MASK mask)
     return LLUICtrl::handleHover(x, y, mask);
 }
 
+void LLIconCtrl::onVisibilityChange(BOOL new_visibility)
+{
+	LLUICtrl::onVisibilityChange(new_visibility);
+	if (mPriority == LLGLTexture::BOOST_ICON)
+	{
+		if (new_visibility)
+		{
+			loadImage(getValue(), mPriority);
+		}
+		else
+		{
+			mImagep = nullptr;
+		}
+	}
+}
+
 // virtual
 // value might be a string or a UUID
 void LLIconCtrl::setValue(const LLSD& value)
@@ -110,6 +128,14 @@ void LLIconCtrl::setValue(const LLSD& value, S32 priority)
 		tvalue = LLSD(LLUUID(value.asString()));
 	}
 	LLUICtrl::setValue(tvalue);
+
+	loadImage(tvalue, priority);
+}
+
+void LLIconCtrl::loadImage(const LLSD& tvalue, S32 priority)
+{
+	if(mPriority == LLGLTexture::BOOST_ICON && !getVisible()) return;
+
 	if (tvalue.isUUID())
 	{
         mImagep = LLUI::getUIImageByID(tvalue.asUUID(), priority);
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index 9c3b517bca..5d6c544571 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -72,6 +72,7 @@ public:
     virtual BOOL handleHover(S32 x, S32 y, MASK mask);
 
 	// lluictrl overrides
+	void onVisibilityChange(BOOL new_visibility);
 	virtual void	setValue(const LLSD& value );
 
 	std::string	getImageName() const;
@@ -95,6 +96,8 @@ protected:
     bool mInteractable;
 
 private:
+	void loadImage(const LLSD& value, S32 priority);
+
 	LLUIColor mColor;
 	LLPointer<LLUIImage> mImagep;
 };
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 82a3c01c6d..3d8cf74855 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1356,9 +1356,9 @@ void LLTextBase::draw()
 		drawCursor();
 	}
  
-	mDocumentView->setVisible(FALSE);
+	mDocumentView->setVisibleDirect(FALSE);
 	LLUICtrl::draw();
-	mDocumentView->setVisible(TRUE);
+	mDocumentView->setVisibleDirect(TRUE);
 }
 
 
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index bec45df78a..8aa97aac39 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -287,6 +287,7 @@ public:
 	void 	setAllChildrenEnabled(BOOL b);
 
 	virtual void	setVisible(BOOL visible);
+	void			setVisibleDirect(BOOL visible) { mVisible = visible; }
 	const BOOL&		getVisible() const			{ return mVisible; }
 	virtual void	setEnabled(BOOL enabled);
 	BOOL			getEnabled() const			{ return mEnabled; }
-- 
cgit v1.2.3


From 011ca928ca55b8358962353a8d5aa998212c4214 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Mar 2023 21:30:34 +0200
Subject: SL-19282 Send update to server side

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 66 ++++++++++++++++----------
 indra/newview/llfloaterchangeitemthumbnail.h   |  2 +
 2 files changed, 43 insertions(+), 25 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 626265fd4b..722adcc254 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -327,8 +327,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
                         if (validateAsset(thumbnail_id))
                         {
                             // per SL-19188, set this image as a thumbnail
-                            cat->setThumbnailUUID(thumbnail_id);
-                            // todo: needs to trigger send/update once server support is done
+                            setThumbnailId(thumbnail_id);
                         }
                     }
                 }
@@ -430,19 +429,14 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
     LLClipboard::instance().pasteFromClipboard(objects);
     if (objects.size() > 0)
     {
-        LLInventoryObject* obj = self->getInventoryObject();
-        if (obj)
+        LLUUID asset_id = objects[0];
+        if (validateAsset(asset_id))
         {
-            LLUUID asset_id = objects[0];
-            if (validateAsset(asset_id))
-            {
-                obj->setThumbnailUUID(asset_id);
-                // todo: need to trigger send/update once server support is done
-            }
-            else
-            {
-                LLNotificationsUtil::add("ThumbnailDimantionsLimit");
-            }
+            self->setThumbnailId(asset_id);
+        }
+        else
+        {
+            LLNotificationsUtil::add("ThumbnailDimantionsLimit");
         }
     }
 }
@@ -464,13 +458,7 @@ void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notificatio
     if (option == 0 && !handle.isDead() && !handle.get()->isDead())
     {
         LLFloaterChangeItemThumbnail* self = (LLFloaterChangeItemThumbnail*)handle.get();
-
-        LLInventoryObject* obj = self->getInventoryObject();
-        if (obj)
-        {
-            obj->setThumbnailUUID(LLUUID::null);
-            // todo: need to trigger send/update once server support is done
-        }
+        self->setThumbnailId(LLUUID::null);
     }
 }
 
@@ -561,15 +549,13 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
 void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
 {
     LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mPickerHandle.get();
-    LLInventoryObject* obj = getInventoryObject();
 
-    if (obj && floaterp)
+    if (floaterp)
     {
         LLUUID asset_id = floaterp->getAssetID();
         if (validateAsset(asset_id))
         {
-            obj->setThumbnailUUID(asset_id);
-            // todo: need to trigger send/update once server support is done
+            setThumbnailId(asset_id);
         }
         else
         {
@@ -578,6 +564,36 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
     }
 }
 
+
+void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID &new_thumbnail_id)
+{
+    LLInventoryObject* obj = getInventoryObject();
+    if (!obj)
+    {
+        return;
+    }
+
+    if (mTaskId.notNull())
+    {
+        LL_ERRS() << "Not implemented yet" << LL_ENDL;
+    }
+    else if (obj->getThumbnailUUID() != new_thumbnail_id)
+    {
+        LLSD updates;
+        updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id);
+        LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj);
+        if (view_folder)
+        {
+            update_inventory_category(mItemId, updates, NULL);
+        }
+        LLViewerInventoryItem* view_item = dynamic_cast<LLViewerInventoryItem*>(obj);
+        if (view_item)
+        {
+            update_inventory_item(mItemId, updates, NULL);
+        }
+    }
+}
+
 void LLFloaterChangeItemThumbnail::onButtonMouseEnter(LLUICtrl* button, const LLSD& param, EToolTipState state)
 {
     mTooltipState = state;
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index bc85e4be0b..50c0c951d4 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -72,6 +72,8 @@ private:
     void showTexturePicker(const LLUUID &thumbnail_id);
     void onTexturePickerCommit(LLUUID id);
 
+    void setThumbnailId(const LLUUID &new_thumbnail_id);
+
     enum EToolTipState
     {
         TOOLTIP_NONE,
-- 
cgit v1.2.3


From 8b8d4795a76246915b15d19154723cdb1f20ba99 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 5 Mar 2023 22:35:29 +0200
Subject: SL-18629 Generic message for BulkUpdateInventory

---
 indra/newview/llinventorymodel.cpp | 230 +++++++++++++++++++++++++++++++++++--
 1 file changed, 222 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 7e500a56c3..fb19994054 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -37,6 +37,7 @@
 #include "llappearancemgr.h"
 #include "llavatarnamecache.h"
 #include "llclipboard.h"
+#include "lldispatcher.h"
 #include "llinventorypanel.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
@@ -49,6 +50,7 @@
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
 #include "llpreview.h" 
+#include "llviewergenericmessage.h"
 #include "llviewermessage.h"
 #include "llviewerfoldertype.h"
 #include "llviewerwindow.h"
@@ -132,6 +134,221 @@ bool LLCanCache::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 	return rv;
 }
 
+struct InventoryCallbackInfo
+{
+    InventoryCallbackInfo(U32 callback, const LLUUID& inv_id) :
+        mCallback(callback), mInvID(inv_id) {}
+    U32 mCallback;
+    LLUUID mInvID;
+};
+
+///----------------------------------------------------------------------------
+/// Class LLDispatchClassifiedClickThrough
+///----------------------------------------------------------------------------
+
+class LLDispatchBulkUpdateInventory : public LLDispatchHandler
+{
+public:
+    virtual bool operator()(
+        const LLDispatcher* dispatcher,
+        const std::string& key,
+        const LLUUID& invoice,
+        const sparam_t& strings)
+    {
+        LLSD message;
+
+        // Expect single string parameter in the form of a notation serialized LLSD.
+        sparam_t::const_iterator it = strings.begin();
+        if (it != strings.end()) {
+            const std::string& llsdRaw = *it++;
+            std::istringstream llsdData(llsdRaw);
+            if (!LLSDSerialize::deserialize(message, llsdData, llsdRaw.length()))
+            {
+                LL_WARNS() << "LLDispatchBulkUpdateInventory: Attempted to read parameter data into LLSD but failed:" << llsdRaw << LL_ENDL;
+            }
+        }
+
+        LLInventoryModel::update_map_t update;
+        LLInventoryModel::cat_array_t folders;
+        LLInventoryModel::item_array_t items;
+        std::list<InventoryCallbackInfo> cblist;
+        uuid_vec_t wearable_ids;
+
+        LLSD item_data = message["item_data"];
+        if (item_data.isArray())
+        {
+            for (LLSD::array_iterator itd = item_data.beginArray(); itd != item_data.endArray(); ++itd)
+            {
+                const LLSD &item(*itd);
+
+                // Agent id probably should be in the root of the message
+                LLUUID agent_id = item["agent_id"].asUUID();
+                if (agent_id != gAgent.getID())
+                {
+                    LL_WARNS() << "Got a BulkUpdateInventory for the wrong agent." << LL_ENDL;
+                    return false;
+                }
+
+                LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
+                titem->unpackMessage(item);
+                LL_DEBUGS("Inventory") << "unpacked item '" << titem->getName() << "' in "
+                    << titem->getParentUUID() << LL_ENDL;
+                U32 callback_id = item["callback_id"].asInteger();
+
+                if (titem->getUUID().notNull())
+                {
+                    items.push_back(titem);
+                    cblist.push_back(InventoryCallbackInfo(callback_id, titem->getUUID()));
+                    if (titem->getInventoryType() == LLInventoryType::IT_WEARABLE)
+                    {
+                        wearable_ids.push_back(titem->getUUID());
+                    }
+
+                    // examine update for changes.
+                    LLViewerInventoryItem* itemp = gInventory.getItem(titem->getUUID());
+                    if (itemp)
+                    {
+                        if (titem->getParentUUID() == itemp->getParentUUID())
+                        {
+                            update[titem->getParentUUID()];
+                        }
+                        else
+                        {
+                            ++update[titem->getParentUUID()];
+                            --update[itemp->getParentUUID()];
+                        }
+                    }
+                    else
+                    {
+                        LLViewerInventoryCategory* folderp = gInventory.getCategory(titem->getParentUUID());
+                        if (folderp)
+                        {
+                            ++update[titem->getParentUUID()];
+                        }
+                    }
+                }
+                else
+                {
+                    cblist.push_back(InventoryCallbackInfo(callback_id, LLUUID::null));
+                }
+            }
+        }
+
+        LLSD folder_data = message["folder_data"];
+        if (folder_data.isArray())
+        {
+            for (LLSD::array_iterator itd = folder_data.beginArray(); itd != folder_data.endArray(); ++itd)
+            {
+                const LLSD &folder(*itd);
+
+                LLPointer<LLViewerInventoryCategory> tfolder = new LLViewerInventoryCategory(gAgent.getID());
+                tfolder->unpackMessage(folder);
+
+                LL_DEBUGS("Inventory") << "unpacked folder '" << tfolder->getName() << "' ("
+                        << tfolder->getUUID() << ") in " << tfolder->getParentUUID()
+                        << LL_ENDL;
+
+                // If the folder is a listing or a version folder, all we need to do is update the SLM data
+                int depth_folder = depth_nesting_in_marketplace(tfolder->getUUID());
+                if ((depth_folder == 1) || (depth_folder == 2))
+                {
+                    // Trigger an SLM listing update
+                    LLUUID listing_uuid = (depth_folder == 1 ? tfolder->getUUID() : tfolder->getParentUUID());
+                    S32 listing_id = LLMarketplaceData::instance().getListingID(listing_uuid);
+                    LLMarketplaceData::instance().getListing(listing_id);
+                    // In that case, there is no item to update so no callback -> we skip the rest of the update
+                }
+                else if (tfolder->getUUID().notNull())
+                {
+                    folders.push_back(tfolder);
+                    LLViewerInventoryCategory* folderp = gInventory.getCategory(tfolder->getUUID());
+                    if (folderp)
+                    {
+                        if (tfolder->getParentUUID() == folderp->getParentUUID())
+                        {
+                            update[tfolder->getParentUUID()];
+                        }
+                        else
+                        {
+                            ++update[tfolder->getParentUUID()];
+                            --update[folderp->getParentUUID()];
+                        }
+                    }
+                    else
+                    {
+                        // we could not find the folder, so it is probably
+                        // new. However, we only want to attempt accounting
+                        // for the parent if we can find the parent.
+                        folderp = gInventory.getCategory(tfolder->getParentUUID());
+                        if (folderp)
+                        {
+                            ++update[tfolder->getParentUUID()];
+                        }
+                    }
+                }
+            }
+        }
+
+        gInventory.accountForUpdate(update);
+
+        for (LLInventoryModel::cat_array_t::iterator cit = folders.begin(); cit != folders.end(); ++cit)
+        {
+            gInventory.updateCategory(*cit);
+        }
+        for (LLInventoryModel::item_array_t::iterator iit = items.begin(); iit != items.end(); ++iit)
+        {
+            gInventory.updateItem(*iit);
+        }
+        gInventory.notifyObservers();
+
+        /*
+        Transaction id not included?
+
+        // The incoming inventory could span more than one BulkInventoryUpdate packet,
+        // so record the transaction ID for this purchase, then wear all clothing
+        // that comes in as part of that transaction ID.  JC
+        if (LLInventoryState::sWearNewClothing)
+        {
+            LLInventoryState::sWearNewClothingTransactionID = tid;
+            LLInventoryState::sWearNewClothing = FALSE;
+        }
+
+        if (tid.notNull() && tid == LLInventoryState::sWearNewClothingTransactionID)
+        {
+            count = wearable_ids.size();
+            for (i = 0; i < count; ++i)
+            {
+                LLViewerInventoryItem* wearable_item;
+                wearable_item = gInventory.getItem(wearable_ids[i]);
+                LLAppearanceMgr::instance().wearItemOnAvatar(wearable_item->getUUID(), true, true);
+            }
+        }
+        */
+
+        if (LLInventoryState::sWearNewClothing && wearable_ids.size() > 0)
+        {
+            LLInventoryState::sWearNewClothing = FALSE;
+
+            size_t count = wearable_ids.size();
+            for (S32 i = 0; i < count; ++i)
+            {
+                LLViewerInventoryItem* wearable_item;
+                wearable_item = gInventory.getItem(wearable_ids[i]);
+                LLAppearanceMgr::instance().wearItemOnAvatar(wearable_item->getUUID(), true, true);
+            }
+        }
+
+        std::list<InventoryCallbackInfo>::iterator inv_it;
+        for (inv_it = cblist.begin(); inv_it != cblist.end(); ++inv_it)
+        {
+            InventoryCallbackInfo cbinfo = (*inv_it);
+            gInventoryCallbacks.fire(cbinfo.mCallback, cbinfo.mInvID);
+        }
+        return true;
+    }
+};
+static LLDispatchBulkUpdateInventory sBulkUpdateInventory;
+
 ///----------------------------------------------------------------------------
 /// Class LLInventoryValidationInfo
 ///----------------------------------------------------------------------------
@@ -2827,6 +3044,11 @@ void LLInventoryModel::initHttpRequest()
 		mHttpHeaders->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_LLSD_XML);
 		mHttpPolicyClass = app_core_http.getPolicy(LLAppCoreHttp::AP_INVENTORY);
 	}
+
+    if (!gGenericDispatcher.isHandlerPresent("BulkUpdateInventory"))
+    {
+        gGenericDispatcher.addHandler("BulkUpdateInventory", &sBulkUpdateInventory);
+    }
 }
 
 void LLInventoryModel::handleResponses(bool foreground)
@@ -3417,14 +3639,6 @@ void LLInventoryModel::processSaveAssetIntoInventory(LLMessageSystem* msg,
 	}
 }
 
-struct InventoryCallbackInfo
-{
-	InventoryCallbackInfo(U32 callback, const LLUUID& inv_id) :
-		mCallback(callback), mInvID(inv_id) {}
-	U32 mCallback;
-	LLUUID mInvID;
-};
-
 // static
 void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 {
-- 
cgit v1.2.3


From 4885ea4fba4c998960d0817e94e69cddd7cd189a Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 7 Mar 2023 01:44:39 +0200
Subject: INTL-483 Fixed PT translation

---
 indra/newview/skins/default/xui/pt/panel_edit_hair.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
index 13f1f892f9..e9750a1c2e 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
@@ -7,7 +7,7 @@
 		<accordion name="wearable_accordion">
 			<accordion_tab name="hair_color_tab" title="Cor"/>
 			<accordion_tab name="hair_style_tab" title="Estilo"/>
-			<accordion_tab name="hair_eyebrows_tab" title="Sombrancelhas"/>
+			<accordion_tab name="hair_eyebrows_tab" title="Sobrancelhas"/>
 			<accordion_tab name="hair_facial_tab" title="Faciais"/>
 		</accordion>
 	</panel>
-- 
cgit v1.2.3


From ea94cda5f5bb9a426782ee7c7aebb1095ba444c1 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 7 Mar 2023 19:30:30 +0200
Subject: =?UTF-8?q?SL-19356=20bring=20SFV=20to=20the=20top=20instead=20of?=
 =?UTF-8?q?=20opening=20a=20new=20window=20if=20there=E2=80=99s=20already?=
 =?UTF-8?q?=20one=20open=20for=20that=20folder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/llpanelmaininventory.cpp | 30 ++++++++++++++++++++++++++++++
 indra/newview/llpanelmaininventory.h   |  1 +
 2 files changed, 31 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 6b9e04840d..a3ac64aee8 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -415,8 +415,33 @@ void LLPanelMainInventory::newWindow()
 	}
 }
 
+//static
 void LLPanelMainInventory::newFolderWindow(LLUUID folder_id, LLUUID item_to_select)
 {
+    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end();)
+    {
+        LLFloaterSidePanelContainer* inventory_container = dynamic_cast<LLFloaterSidePanelContainer*>(*iter++);
+        if (inventory_container)
+        {
+            LLSidepanelInventory* sidepanel_inventory = dynamic_cast<LLSidepanelInventory*>(inventory_container->findChild<LLPanel>("main_panel", true));
+            if (sidepanel_inventory)
+            {
+                LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
+                if (main_inventory && main_inventory->isSingleFolderMode()
+                    && (main_inventory->getSingleFolderViewRoot() == folder_id))
+                {
+                    main_inventory->setFocus(true);
+                    if(item_to_select.notNull())
+                    {
+                        sidepanel_inventory->getActivePanel()->setSelection(item_to_select, TAKE_FOCUS_YES);
+                    }
+                    return;
+                }
+            }
+        }
+    }
+    
     S32 instance_num = get_instance_num();
 
     LLFloaterSidePanelContainer* inventory_container = LLFloaterReg::showTypedInstance<LLFloaterSidePanelContainer>("inventory", LLSD(instance_num));
@@ -1346,6 +1371,11 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
     }
 }
 
+LLUUID LLPanelMainInventory::getSingleFolderViewRoot()
+{
+    return mSingleFolderPanelInventory->getSingleFolderRoot();
+}
+
 void LLPanelMainInventory::showActionMenu(LLMenuGL* menu, std::string spawning_view_name)
 {
 	if (menu)
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 7edaf7db96..b0f520ac5e 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -104,6 +104,7 @@ public:
     void onBackFolderClicked();
     void onForwardFolderClicked();
     void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true);
+    LLUUID getSingleFolderViewRoot();
     bool isSingleFolderMode() { return mSingleFolderMode; }
 
 protected:
-- 
cgit v1.2.3


From 783a802abc63efd3b55d5b38c76c03d87d47bf75 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 8 Mar 2023 02:41:11 +0200
Subject: SL-19359 Show Received Items panel in all new Inventory floaters

---
 indra/llui/lluictrl.cpp                            |  9 ++++++
 indra/llui/lluictrl.h                              |  1 +
 indra/newview/app_settings/settings.xml            | 11 -------
 indra/newview/llsidepanelinventory.cpp             | 35 ++++++++++++++--------
 .../skins/default/xui/en/sidepanel_inventory.xml   |  2 +-
 5 files changed, 34 insertions(+), 24 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 2196ba201b..21afcae7c3 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -531,6 +531,15 @@ void LLUICtrl::setControlVariable(LLControlVariable* control)
 	}
 }
 
+void LLUICtrl::removeControlVariable()
+{
+    if (mControlVariable)
+    {
+        mControlConnection.disconnect();
+        mControlVariable = NULL;
+    }
+}
+
 //virtual
 void LLUICtrl::setControlName(const std::string& control_name, LLView *context)
 {
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 67dd24341c..be1c7dd0b6 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -175,6 +175,7 @@ public:
 	bool setControlValue(const LLSD& value);
 	void setControlVariable(LLControlVariable* control);
 	virtual void setControlName(const std::string& control, LLView *context = NULL);
+    void removeControlVariable();
 	
 	LLControlVariable* getControlVariable() { return mControlVariable; } 
 	
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 23521351ca..87b0ad8faf 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5001,17 +5001,6 @@
         <string>Boolean</string>
         <key>Value</key>
         <integer>0</integer>
-    </map>
-    <key>InventoryInboxToggleState</key>
-    <map>
-        <key>Comment</key>
-        <string>Stores the open/closed state of inventory Received items panel</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>0</integer>
     </map>
 	<key>InventoryLinking</key>
 	<map>
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 3a0302e531..cfceefed26 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -73,6 +73,8 @@ static const char * const INBOX_LAYOUT_PANEL_NAME = "inbox_layout_panel";
 static const char * const INVENTORY_LAYOUT_STACK_NAME = "inventory_layout_stack";
 static const char * const MARKETPLACE_INBOX_PANEL = "marketplace_inbox";
 
+static bool sLoginCompleted = false;
+
 //
 // Helpers
 //
@@ -182,22 +184,30 @@ BOOL LLSidepanelInventory::postBuild()
 
 		inbox_button->setCommitCallback(boost::bind(&LLSidepanelInventory::onToggleInboxBtn, this));
 
-		// Get the previous inbox state from "InventoryInboxToggleState" setting.
-		bool is_inbox_collapsed = !inbox_button->getToggleState();
+		// For main Inventory floater: Get the previous inbox state from "InventoryInboxToggleState" setting. 
+        // For additional Inventory floaters: Collapsed state is default.
+		bool is_inbox_collapsed = !inbox_button->getToggleState() || sLoginCompleted;
 
 		// Restore the collapsed inbox panel state
         mInboxLayoutPanel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
-		inv_stack->collapsePanel(mInboxLayoutPanel, is_inbox_collapsed);
-		if (!is_inbox_collapsed)
-		{
+        inv_stack->collapsePanel(mInboxLayoutPanel, is_inbox_collapsed);
+        if (!is_inbox_collapsed)
+        {
             mInboxLayoutPanel->setTargetDim(gSavedPerAccountSettings.getS32("InventoryInboxHeight"));
-		}
-
-		// Set the inbox visible based on debug settings (final setting comes from http request below)
-		enableInbox(gSavedSettings.getBOOL("InventoryDisplayInbox"));
-
-		// Trigger callback for after login so we can setup to track inbox changes after initial inventory load
-		LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLSidepanelInventory::updateInbox, this));
+        }
+
+        if (sLoginCompleted)
+        {
+            //save the state of Inbox panel only for main Inventory floater
+            inbox_button->removeControlVariable();
+            inbox_button->setToggleState(false);
+            updateInbox();
+        }
+        else
+        {
+            // Trigger callback for after login so we can setup to track inbox changes after initial inventory load
+            LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLSidepanelInventory::updateInbox, this));
+        }
 	}
 
 	gSavedSettings.getControl("InventoryDisplayInbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayInboxChanged));
@@ -207,6 +217,7 @@ BOOL LLSidepanelInventory::postBuild()
 
 void LLSidepanelInventory::updateInbox()
 {
+    sLoginCompleted = true;
 	//
 	// Track inbox folder changes
 	//
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a4b7f48c5e..dfd3e3bf9d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -57,7 +57,7 @@
                  user_resize="true"
                  follows="left|right|top"
                  name="inbox_layout_panel"
-                 visible="false"
+                 visible="true"
                  min_dim="35"
                  expanded_min_dim="90"
                  height="235">
-- 
cgit v1.2.3


From fa50ce4b1054a453a97a81d64eb8099cae6f4cb5 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 9 Mar 2023 16:22:50 +0200
Subject: =?UTF-8?q?SL-19373=20Show=20folder=20name=20in=20filter=20floater?=
 =?UTF-8?q?=E2=80=99s=20title=20bar=20in=20single-folder=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/llpanelmaininventory.cpp | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a3ac64aee8..ac188abb05 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -718,7 +718,7 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
 void LLPanelMainInventory::onFilterSelected()
 {
 	// Find my index
-	mActivePanel = (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
+    mActivePanel = mSingleFolderMode ? getChild<LLInventoryPanel>("single_folder_inv") : (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
 
 	if (!mActivePanel)
 	{
@@ -736,6 +736,14 @@ void LLPanelMainInventory::onFilterSelected()
 	if (finder)
 	{
 		finder->changeFilter(&filter);
+        if (mSingleFolderMode)
+        {
+            const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+            if (cat)
+            {
+                finder->setTitle(cat->getName());
+            }
+        }
 	}
 	if (filter.isActive())
 	{
@@ -897,6 +905,15 @@ void LLPanelMainInventory::toggleFindOptions()
 			parent_floater->addDependentFloater(mFinderHandle);
 		// start background fetch of folders
 		LLInventoryModelBackgroundFetch::instance().start();
+
+        if (mSingleFolderMode)
+        {
+            const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+            if (cat)
+            {
+                finder->setTitle(cat->getName());
+            }
+        }
 	}
 	else
 	{
@@ -1323,6 +1340,7 @@ void LLPanelMainInventory::onViewModeClick()
 
     mActivePanel = mSingleFolderMode ? getChild<LLInventoryPanel>("single_folder_inv") : (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
     updateTitle();
+    onFilterSelected();
 
     LLSidepanelInventory* sidepanel_inventory = getParentSidepanelInventory();
     if (sidepanel_inventory)
@@ -1795,6 +1813,11 @@ void LLPanelMainInventory::updateTitle()
             if (cat)
             {
                 inventory_floater->setTitle(cat->getName());
+                LLFloaterInventoryFinder *finder = getFinder();
+                if (finder)
+                {
+                    finder->setTitle(cat->getName());
+                }
             }
         }
         else
-- 
cgit v1.2.3


From 5cbbfba46f11be76d1d5eb088f5448992d5e3bed Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 9 Mar 2023 18:11:48 +0200
Subject: SL-19367 FIXED Failing to detach temporary mesh attachment

---
 indra/newview/llpanelwearing.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index 3347c40687..bc9f0cef83 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -566,7 +566,7 @@ void LLPanelWearing::onRemoveAttachment()
 	{
 		LLSelectMgr::getInstance()->deselectAll();
 		LLSelectMgr::getInstance()->selectObjectAndFamily(mAttachmentsMap[item->getUUID()]);
-		LLSelectMgr::getInstance()->sendDropAttachment();
+		LLSelectMgr::getInstance()->sendDetach();
 	}
 }
 
-- 
cgit v1.2.3


From e364b90d61b7711c088d9bca7307e3760f28c59d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 10 Mar 2023 17:39:24 +0200
Subject: SL-19335 Switching view (using the switch button) should select
 appropriate folder

---
 indra/newview/llinventoryfunctions.cpp |  2 +-
 indra/newview/llinventorypanel.cpp     |  2 +-
 indra/newview/llpanelmaininventory.cpp | 58 ++++++++++++++++++++++++++++++++--
 indra/newview/llpanelmaininventory.h   |  1 +
 4 files changed, 59 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 15916ffaba..eaea1ef972 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -810,7 +810,7 @@ void show_item_original(const LLUUID& item_uuid)
         {
             if(main_inventory->isSingleFolderMode())
             {
-                main_inventory->onViewModeClick();
+                main_inventory->toggleViewMode();
             }
             main_inventory->resetFilters();
         }
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 076f002f47..037dda70f0 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1843,7 +1843,7 @@ void LLInventoryPanel::setSFViewAndOpenFolder(const LLInventoryPanel* panel, con
         LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
         if (main_inventory && panel->hasAncestor(main_inventory) && !main_inventory->isSingleFolderMode())
         {
-            main_inventory->onViewModeClick();
+            main_inventory->toggleViewMode();
             main_inventory->setSingleFolderViewRoot(folder_id, false);
         }
     }
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index ac188abb05..f8c1fcb5f5 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -453,7 +453,7 @@ void LLPanelMainInventory::newFolderWindow(LLUUID folder_id, LLUUID item_to_sele
             LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
             if (main_inventory)
             {
-                main_inventory->onViewModeClick();
+                main_inventory->toggleViewMode();
                 if(folder_id.notNull())
                 {
                     main_inventory->setSingleFolderViewRoot(folder_id);
@@ -1329,7 +1329,7 @@ void LLPanelMainInventory::onAddButtonClick()
 	}
 }
 
-void LLPanelMainInventory::onViewModeClick()
+void LLPanelMainInventory::toggleViewMode()
 {
     mSingleFolderMode = !mSingleFolderMode;
 
@@ -1354,7 +1354,61 @@ void LLPanelMainInventory::onViewModeClick()
             sidepanel_inventory->toggleInbox();
         }
     }
+}
 
+void LLPanelMainInventory::onViewModeClick()
+{
+    LLUUID selected_folder;
+    LLUUID new_root_folder;
+    if(mSingleFolderMode)
+    {
+        selected_folder = mSingleFolderPanelInventory->getSingleFolderRoot();
+    }
+    else
+    {
+        LLFolderView* root = getActivePanel()->getRootFolder();
+        std::set<LLFolderViewItem*> selection_set = root->getSelectionList();
+        if (selection_set.size() == 1)
+        {
+            LLFolderViewItem* current_item = *selection_set.begin();
+            if (current_item)
+            {
+                const LLUUID& id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+                if(gInventory.getCategory(id) != NULL)
+                {
+                    new_root_folder = id;
+                }
+                else
+                {
+                    const LLViewerInventoryItem* selected_item = gInventory.getItem(id);
+                    if (selected_item && selected_item->getParentUUID().notNull())
+                    {
+                        new_root_folder = selected_item->getParentUUID();
+                        selected_folder = id;
+                    }
+                }
+            }
+        }
+    }
+
+    toggleViewMode();
+
+    if (mSingleFolderMode && new_root_folder.notNull())
+    {
+        setSingleFolderViewRoot(new_root_folder, true);
+        if(selected_folder.notNull())
+        {
+            getActivePanel()->setSelection(selected_folder, TAKE_FOCUS_YES);
+        }
+    }
+    else
+    {
+        if(selected_folder.notNull())
+        {
+            selectAllItemsPanel();
+            getActivePanel()->setSelection(selected_folder, TAKE_FOCUS_YES);
+        }
+    }
 }
 
 void LLPanelMainInventory::onUpFolderClicked()
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index b0f520ac5e..5f488539dd 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -100,6 +100,7 @@ public:
 
     void resetFilters();
     void onViewModeClick();
+    void toggleViewMode();
     void onUpFolderClicked();
     void onBackFolderClicked();
     void onForwardFolderClicked();
-- 
cgit v1.2.3


From a777a0b27ed6adfa99d708e289e704915f2b62b7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Mar 2023 21:51:14 +0200
Subject: SL-18629 WIP Replacing UDP creation messages with callback based AIS

---
 indra/newview/llappearancemgr.cpp              | 56 +++++++++++--------
 indra/newview/llfloatermarketplacelistings.cpp | 35 ++++++++----
 indra/newview/llfloateropenobject.cpp          | 34 ++----------
 indra/newview/llfriendcard.cpp                 | 41 +++++++++-----
 indra/newview/llinventoryfunctions.cpp         | 60 +++++++++------------
 indra/newview/llviewerinventory.cpp            | 18 +++++--
 indra/newview/llviewermessage.cpp              | 75 ++++++++++++++------------
 7 files changed, 173 insertions(+), 146 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index d8e239822e..5595a92b43 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1703,12 +1703,17 @@ void LLAppearanceMgr::shallowCopyCategory(const LLUUID& src_id, const LLUUID& ds
 	}
 	// USES UDP PATH
 	// D567 needs to carry over thumbnail info
-	LLUUID subfolder_id = gInventory.createNewCategory( parent_id,
-														LLFolderType::FT_NONE,
-														src_cat->getName());
-	shallowCopyCategoryContents(src_id, subfolder_id, cb);
+	gInventory.createNewCategory(
+        parent_id,
+        LLFolderType::FT_NONE,
+        src_cat->getName(),
+        [src_id, cb](const LLUUID &new_id)
+    {
+        LLAppearanceMgr::getInstance()->shallowCopyCategoryContents(src_id, new_id, cb);
 
-	gInventory.notifyObservers();
+        gInventory.notifyObservers();
+    }
+    );
 }
 
 void LLAppearanceMgr::slamCategoryLinks(const LLUUID& src_id, const LLUUID& dst_id,
@@ -2730,21 +2735,27 @@ void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool ap
 
 		// UDP PATH
 		// D567 needs to carry over thumbnail info if present
-		LLUUID new_cat_id = gInventory.createNewCategory(
+		gInventory.createNewCategory(
 			pid,
 			LLFolderType::FT_NONE,
-			name);
-
-		// Create a CopyMgr that will copy items, manage its own destruction
-		new LLCallAfterInventoryCopyMgr(
-			*items, new_cat_id, std::string("wear_inventory_category_callback"),
-			boost::bind(&LLAppearanceMgr::wearInventoryCategoryOnAvatar,
-						LLAppearanceMgr::getInstance(),
-						gInventory.getCategory(new_cat_id),
-						append));
-
-		// BAP fixes a lag in display of created dir.
-		gInventory.notifyObservers();
+            name,
+            [cat_id, append](const LLUUID& new_cat_id)
+        {
+            LLInventoryModel::cat_array_t* cats;
+            LLInventoryModel::item_array_t* items;
+            gInventory.getDirectDescendentsOf(cat_id, cats, items);
+            // Create a CopyMgr that will copy items, manage its own destruction
+            new LLCallAfterInventoryCopyMgr(
+                *items, new_cat_id, std::string("wear_inventory_category_callback"),
+                boost::bind(&LLAppearanceMgr::wearInventoryCategoryOnAvatar,
+                    LLAppearanceMgr::getInstance(),
+                    gInventory.getCategory(new_cat_id),
+                    append));
+
+            // BAP fixes a lag in display of created dir.
+            gInventory.notifyObservers();
+        }
+        );
 	}
 	else
 	{
@@ -4004,11 +4015,14 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 	{
 		// UDP PATH, should remove
 		// D567 copy thumbnail info from source folder
-		LLUUID folder_id = gInventory.createNewCategory(
+		gInventory.createNewCategory(
 			parent_id,
 			LLFolderType::FT_OUTFIT,
-			new_folder_name);
-		onOutfitFolderCreated(folder_id, show_panel);
+			new_folder_name,
+            [show_panel](const LLUUID &new_cat_id)
+        {
+            LLAppearanceMgr::getInstance()->onOutfitFolderCreated(new_cat_id, show_panel);
+        });
 	}
 }
 
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 58bd4bc82b..88fff58fc8 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -230,18 +230,31 @@ void LLPanelMarketplaceListings::onTabChange()
 
 void LLPanelMarketplaceListings::onAddButtonClicked()
 {
-	// Find active panel
-	LLInventoryPanel* panel = (LLInventoryPanel*)getChild<LLTabContainer>("marketplace_filter_tabs")->getCurrentPanel();
-	if (panel)
-	{
-        LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
-        llassert(marketplacelistings_id.notNull());
-        LLFolderType::EType preferred_type = LLFolderType::lookup("category");
-        LLUUID category = gInventory.createNewCategory(marketplacelistings_id, preferred_type, LLStringUtil::null);
-        gInventory.notifyObservers();
-        panel->setSelectionByID(category, TRUE);
-        panel->getRootFolder()->setNeedsAutoRename(TRUE);
+    LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    llassert(marketplacelistings_id.notNull());
+    LLFolderType::EType preferred_type = LLFolderType::lookup("category");
+    LLHandle<LLPanel> handle = getHandle();
+    gInventory.createNewCategory(
+        marketplacelistings_id,
+        preferred_type,
+        LLStringUtil::null,
+        [handle](const LLUUID &new_cat_id)
+    {
+        // Find active panel
+        LLPanel *marketplace_panel = handle.get();
+        if (!marketplace_panel)
+        {
+            return;
+        }
+        LLInventoryPanel* panel = (LLInventoryPanel*)marketplace_panel->getChild<LLTabContainer>("marketplace_filter_tabs")->getCurrentPanel();
+        if (panel)
+        {
+            gInventory.notifyObservers();
+            panel->setSelectionByID(new_cat_id, TRUE);
+            panel->getRootFolder()->setNeedsAutoRename(TRUE);
+        }
     }
+    );
 }
 
 void LLPanelMarketplaceListings::onAuditButtonClicked()
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 12ad6dcd33..73eaced562 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -165,35 +165,11 @@ void LLFloaterOpenObject::moveToInventory(bool wear, bool replace)
 
 	inventory_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear,replace);
 	// D567 copy thumbnail info
-	LLUUID category_id = gInventory.createNewCategory(parent_category_id, 
-													  LLFolderType::FT_NONE, 
-													  name,
-													  func);
-
-	//If we get a null category ID, we are using a capability in createNewCategory and we will
-	//handle the following in the callbackCreateInventoryCategory routine.
-	// D567 review
-	if ( category_id.notNull() )
-	{
-		LLCatAndWear* data = new LLCatAndWear;
-		data->mCatID = category_id;
-		data->mWear = wear;
-		data->mFolderResponded = false;
-		data->mReplace = replace;
-
-		// Copy and/or move the items into the newly created folder.
-		// Ignore any "you're going to break this item" messages.
-		BOOL success = move_inv_category_world_to_agent(object_id, category_id, TRUE,
-														callbackMoveInventory, 
-														(void*)data);
-		if (!success)
-		{
-			delete data;
-			data = NULL;
-
-			LLNotificationsUtil::add("OpenObjectCannotCopy");
-		}
-	}
+	gInventory.createNewCategory(
+        parent_category_id,
+        LLFolderType::FT_NONE,
+        name,
+        func);
 }
 
 // static
diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp
index e395da7f1e..ce28915d93 100644
--- a/indra/newview/llfriendcard.cpp
+++ b/indra/newview/llfriendcard.cpp
@@ -478,14 +478,24 @@ void LLFriendCardsManager::ensureFriendsFolderExists()
 			LL_WARNS() << "Failed to find \"" << cat_name << "\" category descendents in Category Tree." << LL_ENDL;
 		}
 
-		friends_folder_ID = gInventory.createNewCategory(calling_cards_folder_ID,
-			LLFolderType::FT_CALLINGCARD, get_friend_folder_name());
-
-		gInventory.createNewCategory(friends_folder_ID,
-			LLFolderType::FT_CALLINGCARD, get_friend_all_subfolder_name());
-
-		// Now when we have all needed folders we can sync their contents with buddies list.
-		syncFriendsFolder();
+		gInventory.createNewCategory(
+            calling_cards_folder_ID,
+			LLFolderType::FT_CALLINGCARD,
+            get_friend_folder_name(),
+            [](const LLUUID &new_category_id)
+        {
+            gInventory.createNewCategory(
+                new_category_id,
+                LLFolderType::FT_CALLINGCARD,
+                get_friend_all_subfolder_name(),
+                [](const LLUUID &new_category_id)
+            {
+                // Now when we have all needed folders we can sync their contents with buddies list.
+                LLFriendCardsManager::getInstance()->syncFriendsFolder();
+            }
+            );
+        }
+        );
 	}
 }
 
@@ -510,11 +520,16 @@ void LLFriendCardsManager::ensureFriendsAllFolderExists()
 			LL_WARNS() << "Failed to find \"" << cat_name << "\" category descendents in Category Tree." << LL_ENDL;
 		}
 
-		friends_all_folder_ID = gInventory.createNewCategory(friends_folder_ID,
-			LLFolderType::FT_CALLINGCARD, get_friend_all_subfolder_name());
-
-		// Now when we have all needed folders we can sync their contents with buddies list.
-		syncFriendsFolder();
+        gInventory.createNewCategory(
+            friends_folder_ID,
+			LLFolderType::FT_CALLINGCARD,
+            get_friend_all_subfolder_name(),
+            [](const LLUUID &new_cat_id)
+        {
+            // Now when we have all needed folders we can sync their contents with buddies list.
+            LLFriendCardsManager::getInstance()->syncFriendsFolder();
+        }
+        );
 	}
 }
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index eaea1ef972..79d222d904 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -861,22 +861,6 @@ void open_marketplace_listings()
 	LLFloaterReg::showInstance("marketplace_listings");
 }
 
-// Create a new folder in destFolderId with the same name as the item name and return the uuid of the new folder
-// Note: this is used locally in various situation where we need to wrap an item into a special folder
-LLUUID create_folder_for_item(LLInventoryItem* item, const LLUUID& destFolderId)
-{
-	llassert(item);
-	llassert(destFolderId.notNull());
-
-	LLUUID created_folder_id = gInventory.createNewCategory(destFolderId, LLFolderType::FT_NONE, item->getName());
-	gInventory.notifyObservers();
-    
-    // *TODO : Create different notifications for the various cases
-	LLNotificationsUtil::add("OutboxFolderCreated");
-
-	return created_folder_id;
-}
-
 ///----------------------------------------------------------------------------
 // Marketplace functions
 //
@@ -1753,28 +1737,36 @@ bool validate_marketplacelistings(
                         }
                         cb(message,depth,LLError::LEVEL_WARN);
                     }
-                    LLUUID folder_uuid = gInventory.createNewCategory(parent_uuid, new_folder_type, folder_name);
-                    
-                    // Move each item to the new folder
-                    while (!items_vector_it->second.empty())
+                    std::vector<LLUUID> &uuid_vector = items_vector_it->second;
+                    gInventory.createNewCategory(
+                        parent_uuid,
+                        new_folder_type,
+                        folder_name,
+                        [uuid_vector, cb, indent, depth, parent_uuid, notify_observers](const LLUUID &new_category_id)
                     {
-                        LLViewerInventoryItem* viewer_inv_item = gInventory.getItem(items_vector_it->second.back());
-                        if (cb)
+                        // Move each item to the new folder
+                        std::vector<LLUUID>::reverse_iterator iter = uuid_vector.rbegin();
+                        while (iter != uuid_vector.rend())
                         {
-                            std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Warning Move");
-                            cb(message,depth,LLError::LEVEL_WARN);
+                            LLViewerInventoryItem* viewer_inv_item = gInventory.getItem(*iter);
+                            if (cb)
+                            {
+                                std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Warning Move");
+                                cb(message, depth, LLError::LEVEL_WARN);
+                            }
+                            gInventory.changeItemParent(viewer_inv_item, new_category_id, true);
+                            iter++;
+                        }
+
+                        // Next type
+                        update_marketplace_category(parent_uuid);
+                        update_marketplace_category(new_category_id);
+                        if (notify_observers)
+                        {
+                            gInventory.notifyObservers();
                         }
-                        gInventory.changeItemParent(viewer_inv_item, folder_uuid, true);
-                        items_vector_it->second.pop_back();
-                    }
-                    
-                    // Next type
-                    update_marketplace_category(parent_uuid);
-                    update_marketplace_category(folder_uuid);
-                    if (notify_observers)
-                    {
-                        gInventory.notifyObservers();
                     }
+                    );
                     items_vector_it++;
                 }
             }
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 27f57bda81..d0832e16d7 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1696,9 +1696,21 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge,
 			parent_id = gInventory.getRootFolderID();
 		}
 
-		LLUUID category = gInventory.createNewCategory(parent_id, preferred_type, LLStringUtil::null);
-		gInventory.notifyObservers();
-		panel->setSelectionByID(category, TRUE);
+        LLHandle<LLPanel> handle = panel->getHandle();
+		gInventory.createNewCategory(
+            parent_id,
+            preferred_type,
+            LLStringUtil::null,
+            [handle](const LLUUID &new_category_id)
+        {
+            gInventory.notifyObservers();
+            LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(handle.get());
+            if (panel)
+            {
+                panel->setSelectionByID(new_category_id, TRUE);
+            }
+        }
+        );
 	}
 	else if ("lsl" == type_name)
 	{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5266db5b38..767e092318 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5898,42 +5898,47 @@ void container_inventory_arrived(LLViewerObject* object,
 	{
 		// create a new inventory category to put this in
 		LLUUID cat_id;
-		cat_id = gInventory.createNewCategory(gInventory.getRootFolderID(),
-											  LLFolderType::FT_NONE,
-											  LLTrans::getString("AcquiredItems"));
+		gInventory.createNewCategory(
+            gInventory.getRootFolderID(),
+            LLFolderType::FT_NONE,
+            LLTrans::getString("AcquiredItems"),
+            [inventory](const LLUUID &new_cat_id)
+        {
+            LLInventoryObject::object_list_t::const_iterator it = inventory->begin();
+            LLInventoryObject::object_list_t::const_iterator end = inventory->end();
+            for (; it != end; ++it)
+            {
+                if ((*it)->getType() != LLAssetType::AT_CATEGORY)
+                {
+                    LLInventoryObject* obj = (LLInventoryObject*)(*it);
+                    LLInventoryItem* item = (LLInventoryItem*)(obj);
+                    LLUUID item_id;
+                    item_id.generate();
+                    time_t creation_date_utc = time_corrected();
+                    LLPointer<LLViewerInventoryItem> new_item
+                        = new LLViewerInventoryItem(item_id,
+                            new_cat_id,
+                            item->getPermissions(),
+                            item->getAssetUUID(),
+                            item->getType(),
+                            item->getInventoryType(),
+                            item->getName(),
+                            item->getDescription(),
+                            LLSaleInfo::DEFAULT,
+                            item->getFlags(),
+                            creation_date_utc);
+                    new_item->updateServer(TRUE);
+                    gInventory.updateItem(new_item);
+                }
+            }
+            gInventory.notifyObservers();
 
-		LLInventoryObject::object_list_t::const_iterator it = inventory->begin();
-		LLInventoryObject::object_list_t::const_iterator end = inventory->end();
-		for ( ; it != end; ++it)
-		{
-			if ((*it)->getType() != LLAssetType::AT_CATEGORY)
-			{
-				LLInventoryObject* obj = (LLInventoryObject*)(*it);
-				LLInventoryItem* item = (LLInventoryItem*)(obj);
-				LLUUID item_id;
-				item_id.generate();
-				time_t creation_date_utc = time_corrected();
-				LLPointer<LLViewerInventoryItem> new_item
-					= new LLViewerInventoryItem(item_id,
-												cat_id,
-												item->getPermissions(),
-												item->getAssetUUID(),
-												item->getType(),
-												item->getInventoryType(),
-												item->getName(),
-												item->getDescription(),
-												LLSaleInfo::DEFAULT,
-												item->getFlags(),
-												creation_date_utc);
-				new_item->updateServer(TRUE);
-				gInventory.updateItem(new_item);
-			}
-		}
-		gInventory.notifyObservers();
-		if(active_panel)
-		{
-			active_panel->setSelection(cat_id, TAKE_FOCUS_NO);
-		}
+            LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel();
+            if (active_panel)
+            {
+                active_panel->setSelection(new_cat_id, TAKE_FOCUS_NO);
+            }
+        });
 	}
 	else if (inventory->size() == 2)
 	{
-- 
cgit v1.2.3


From 811da7dbb1bdbf04a2dceb02ad4d296db4274076 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Mar 2023 22:39:36 +0200
Subject: SL-18629 WIP Replacing UDP creation messages with callback based AIS
 #2

findCategory and move_item_to_marketplacelistings
---
 indra/newview/llappearancemgr.cpp              |   2 +-
 indra/newview/llfloatereditenvironmentbase.cpp |   2 +-
 indra/newview/llfloatergesture.cpp             |   2 +-
 indra/newview/llfloaterlinkreplace.cpp         |   4 +-
 indra/newview/llfloatermarketplacelistings.cpp |  49 ++++++++---
 indra/newview/llfloatermarketplacelistings.h   |   1 +
 indra/newview/llinventorybridge.cpp            |  66 +++++++--------
 indra/newview/llinventoryfunctions.cpp         | 102 ++++++++++++-----------
 indra/newview/llinventorymodel.cpp             | 107 ++++++++++++++++++-------
 indra/newview/llinventorymodel.h               |  15 ++--
 indra/newview/llinventorypanel.cpp             |   2 +-
 indra/newview/llmarketplacefunctions.cpp       |   4 +-
 indra/newview/llpaneloutfitsinventory.cpp      |   2 +-
 indra/newview/llsidepanelinventory.cpp         |   2 +-
 indra/newview/llstartup.cpp                    |   2 +-
 indra/newview/lltooldraganddrop.cpp            |   6 +-
 indra/newview/llviewermenu.cpp                 |   4 +-
 17 files changed, 233 insertions(+), 139 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 5595a92b43..1c55113082 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3213,7 +3213,7 @@ void LLAppearanceMgr::copyLibraryGestures()
 
 	// Copy gestures
 	LLUUID lib_gesture_cat_id =
-		gInventory.findLibraryCategoryUUIDForType(LLFolderType::FT_GESTURE,false);
+		gInventory.findLibraryCategoryUUIDForType(LLFolderType::FT_GESTURE);
 	if (lib_gesture_cat_id.isNull())
 	{
 		LL_WARNS() << "Unable to copy gestures, source category not found" << LL_ENDL;
diff --git a/indra/newview/llfloatereditenvironmentbase.cpp b/indra/newview/llfloatereditenvironmentbase.cpp
index 2850951668..cd24d79b7f 100644
--- a/indra/newview/llfloatereditenvironmentbase.cpp
+++ b/indra/newview/llfloatereditenvironmentbase.cpp
@@ -260,7 +260,7 @@ void LLFloaterEditEnvironmentBase::onSaveAsCommit(const LLSD& notification, cons
         }
         else if (mInventoryItem)
         {
-            const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+            const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
             LLUUID parent_id = mInventoryItem->getParentUUID();
             if (marketplacelistings_id == parent_id || gInventory.isObjectDescendentOf(mInventoryItem->getUUID(), gInventory.getLibraryRootFolderID()))
             {
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index d17889bed1..f29046c513 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -211,7 +211,7 @@ BOOL LLFloaterGesture::postBuild()
 	getChildView("play_btn")->setVisible( true);
 	getChildView("stop_btn")->setVisible( false);
 	setDefaultBtn("play_btn");
-	mGestureFolderID = gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE, false);
+	mGestureFolderID = gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE);
 
 	uuid_vec_t folders;
 	folders.push_back(mGestureFolderID);
diff --git a/indra/newview/llfloaterlinkreplace.cpp b/indra/newview/llfloaterlinkreplace.cpp
index 8ee7a72055..b42c49c607 100644
--- a/indra/newview/llfloaterlinkreplace.cpp
+++ b/indra/newview/llfloaterlinkreplace.cpp
@@ -335,8 +335,8 @@ BOOL LLFloaterLinkReplace::tick()
 void LLFloaterLinkReplace::processBatch(LLInventoryModel::item_array_t items)
 {
 	const LLViewerInventoryItem* target_item = gInventory.getItem(mTargetUUID);
-	const LLUUID cof_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, false);
-	const LLUUID outfit_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+	const LLUUID cof_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+	const LLUUID outfit_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
 	for (LLInventoryModel::item_array_t::iterator it = items.begin(); it != items.end(); ++it)
 	{
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 88fff58fc8..9110d9e902 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -230,7 +230,7 @@ void LLPanelMarketplaceListings::onTabChange()
 
 void LLPanelMarketplaceListings::onAddButtonClicked()
 {
-    LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     llassert(marketplacelistings_id.notNull());
     LLFolderType::EType preferred_type = LLFolderType::lookup("category");
     LLHandle<LLPanel> handle = getHandle();
@@ -375,6 +375,7 @@ LLFloaterMarketplaceListings::LLFloaterMarketplaceListings(const LLSD& key)
 , mInventoryTitle(NULL)
 , mPanelListings(NULL)
 , mPanelListingsSet(false)
+, mRootFolderCreating(false)
 {
 }
 
@@ -460,15 +461,39 @@ void LLFloaterMarketplaceListings::setRootFolder()
 		// If we are *not* a merchant or we have no market place connection established yet, do nothing
 		return;
 	}
+    if (!gInventory.isInventoryUsable())
+    {
+        return;
+    }
     
+    LLFolderType::EType preferred_type = LLFolderType::FT_MARKETPLACE_LISTINGS;
 	// We are a merchant. Get the Marketplace listings folder, create it if needs be.
-	LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true);
-	if (marketplacelistings_id.isNull())
-	{
-		// We should never get there unless the inventory fails badly
-		LL_ERRS("SLM") << "Inventory problem: failure to create the marketplace listings folder for a merchant!" << LL_ENDL;
-		return;
-	}
+	LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(preferred_type);
+
+    if (marketplacelistings_id.isNull())
+    {
+        if (!mRootFolderCreating)
+        {
+            mRootFolderCreating = true;
+            gInventory.createNewCategory(
+                gInventory.getRootFolderID(),
+                preferred_type,
+                LLStringUtil::null,
+                [preferred_type](const LLUUID &new_cat_id)
+            {
+                LLFloaterMarketplaceListings *marketplace = LLFloaterReg::findTypedInstance<LLFloaterMarketplaceListings>("marketplace_listings");
+                if (marketplace)
+                {
+                    // will call setRootFolder again
+                    marketplace->updateView();
+                }
+            }
+            );
+        }
+        return;
+    }
+
+    mRootFolderCreating = false;
     
 	// No longer need to observe new category creation
 	if (mCategoryAddedObserver && gInventory.containsObserver(mCategoryAddedObserver))
@@ -486,6 +511,7 @@ void LLFloaterMarketplaceListings::setRootFolder()
     }
     
     mRootFolderId = marketplacelistings_id;
+    mRootFolderCreating = true;
 }
 
 void LLFloaterMarketplaceListings::setPanels()
@@ -556,6 +582,11 @@ void LLFloaterMarketplaceListings::updateView()
     {
         setRootFolder();
     }
+    if (mRootFolderCreating)
+    {
+        // waiting for callback
+        return;
+    }
 
     // Update the bottom initializing status and progress dial if we are initializing or if we're a merchant and still loading
     if ((mkt_status <= MarketplaceStatusCodes::MARKET_PLACE_INITIALIZING) || (is_merchant && (data_fetched <= MarketplaceFetchCodes::MARKET_FETCH_LOADING)) )
@@ -859,7 +890,7 @@ void LLFloaterMarketplaceValidation::onOpen(const LLSD& key)
     LLUUID cat_id(key.asUUID());
     if (cat_id.isNull())
     {
-        cat_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        cat_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     }
 
     // Validates the folder
diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h
index 77e855fd2a..085e517a9d 100644
--- a/indra/newview/llfloatermarketplacelistings.h
+++ b/indra/newview/llfloatermarketplacelistings.h
@@ -140,6 +140,7 @@ private:
 	LLTextBox *		mInventoryTitle;
 
 	LLUUID			mRootFolderId;
+    bool            mRootFolderCreating;
 	LLPanelMarketplaceListings * mPanelListings;
     bool            mPanelListingsSet;
 };
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 0c7f237415..fb92437c3d 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -333,7 +333,7 @@ BOOL LLInvFVBridge::cutToClipboard()
 	const LLInventoryObject* obj = gInventory.getObject(mUUID);
 	if (obj && isItemMovable() && isItemRemovable())
 	{
-        const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         const BOOL cut_from_marketplacelistings = gInventory.isObjectDescendentOf(mUUID, marketplacelistings_id);
             
         if (cut_from_marketplacelistings && (LLMarketplaceData::instance().isInActiveFolder(mUUID) ||
@@ -1286,7 +1286,7 @@ bool LLInvFVBridge::isItemInOutfits() const
     const LLInventoryModel* model = getInventoryModel();
     if(!model) return false;
 
-    const LLUUID my_outfits_cat = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+    const LLUUID my_outfits_cat = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
     return isCOFFolder() || (my_outfits_cat == mUUID) || model->isObjectDescendentOf(mUUID, my_outfits_cat);
 }
@@ -1321,7 +1321,7 @@ BOOL LLInvFVBridge::isCOFFolder() const
 // *TODO : Suppress isInboxFolder() once Merchant Outbox is fully deprecated
 BOOL LLInvFVBridge::isInboxFolder() const
 {
-	const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, false);
+	const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX);
 	
 	if (inbox_id.isNull())
 	{
@@ -1333,7 +1333,7 @@ BOOL LLInvFVBridge::isInboxFolder() const
 
 BOOL LLInvFVBridge::isMarketplaceListingsFolder() const
 {
-	const LLUUID folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+	const LLUUID folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
 	
 	if (folder_id.isNull())
 	{
@@ -1633,7 +1633,7 @@ bool LLInvFVBridge::canListOnMarketplaceNow() const
 		{
             std::string error_msg;
             LLInventoryModel* model = getInventoryModel();
-            const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+            const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
             if (marketplacelistings_id.notNull())
             {
                 LLViewerInventoryCategory * master_folder = model->getCategory(marketplacelistings_id);
@@ -1792,7 +1792,7 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action)
 	{
 		LLInventoryItem* itemp = model->getItem(mUUID);
 		if (!itemp) return;
-        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         // Note: For a single item, if it's not a copy, then it's a move
         move_item_to_marketplacelistings(itemp, marketplacelistings_id, ("copy_to_marketplace_listings" == action));
     }
@@ -2566,8 +2566,8 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 	if (!filter) return false;
 
 	const LLUUID &cat_id = inv_cat->getUUID();
-	const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, false);
-	const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+	const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+	const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     const LLUUID from_folder_uuid = inv_cat->getParentUUID();
 	
 	const BOOL move_is_into_current_outfit = (mUUID == current_outfit_id);
@@ -2585,10 +2585,10 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 
 	if (is_agent_inventory)
 	{
-		const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH, false);
-		const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK, false);
-		const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
-		const LLUUID &lost_and_found_id = model->findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND, false);
+		const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
+		const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
+		const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+		const LLUUID &lost_and_found_id = model->findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND);
 
 		const BOOL move_is_into_trash = (mUUID == trash_id) || model->isObjectDescendentOf(mUUID, trash_id);
 		const BOOL move_is_into_my_outfits = (mUUID == my_outifts_id) || model->isObjectDescendentOf(mUUID, my_outifts_id);
@@ -2871,7 +2871,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 			}
 			else
 			{
-				if (model->isObjectDescendentOf(cat_id, model->findCategoryUUIDForType(LLFolderType::FT_INBOX, false)))
+				if (model->isObjectDescendentOf(cat_id, model->findCategoryUUIDForType(LLFolderType::FT_INBOX)))
 				{
 					set_dad_inbox_object(cat_id);
 				}
@@ -3490,7 +3490,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 	{
 		LLInventoryCategory * cat = gInventory.getCategory(mUUID);
 		if (!cat) return;
-        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         move_folder_to_marketplacelistings(cat, marketplacelistings_id, ("move_to_marketplace_listings" != action), (("copy_or_move_to_marketplace_listings" == action)));
     }
 }
@@ -3740,7 +3740,7 @@ void LLFolderBridge::pasteFromClipboard()
 	LLInventoryModel* model = getInventoryModel();
 	if (model && isClipboardPasteable())
 	{
-        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         const BOOL paste_into_marketplacelistings = model->isObjectDescendentOf(mUUID, marketplacelistings_id);
         
         BOOL cut_from_marketplacelistings = FALSE;
@@ -3801,11 +3801,11 @@ void LLFolderBridge::perform_pasteFromClipboard()
 	LLInventoryModel* model = getInventoryModel();
 	if (model && isClipboardPasteable())
 	{
-        const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, false);
-        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
-		const LLUUID &favorites_id = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE, false);
-		const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
-		const LLUUID &lost_and_found_id = model->findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND, false);
+        const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+		const LLUUID &favorites_id = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+		const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+		const LLUUID &lost_and_found_id = model->findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND);
 
 		const BOOL move_is_into_current_outfit = (mUUID == current_outfit_id);
 		const BOOL move_is_into_my_outfits = (mUUID == my_outifts_id) || model->isObjectDescendentOf(mUUID, my_outifts_id);
@@ -4053,9 +4053,9 @@ void LLFolderBridge::pasteLinkFromClipboard()
 	LLInventoryModel* model = getInventoryModel();
 	if(model)
 	{
-		const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, false);
-        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
-		const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+		const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+        const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+		const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
 		const BOOL move_is_into_current_outfit = (mUUID == current_outfit_id);
 		const BOOL move_is_into_my_outfits = (mUUID == my_outifts_id) || model->isObjectDescendentOf(mUUID, my_outifts_id);
@@ -4125,8 +4125,8 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 	const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
 	const LLUUID &lost_and_found_id = model->findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND);
 	const LLUUID &favorites = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
-	const LLUUID &marketplace_listings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
-	const LLUUID &outfits_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+	const LLUUID &marketplace_listings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+	const LLUUID &outfits_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
 	if (outfits_id == mUUID)
 	{
@@ -4977,7 +4977,7 @@ void LLFolderBridge::dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_c
 {
 	if((inv_item->getInventoryType() == LLInventoryType::IT_TEXTURE) || (inv_item->getInventoryType() == LLInventoryType::IT_SNAPSHOT))
 	{
-		const LLUUID &my_outifts_id = getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+		const LLUUID &my_outifts_id = getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 		if(mUUID != my_outifts_id)
 		{
 			LLFloaterOutfitPhotoPreview* photo_preview  = LLFloaterReg::showTypedInstance<LLFloaterOutfitPhotoPreview>("outfit_photo_preview", inv_item->getUUID());
@@ -5093,11 +5093,11 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 	LLInventoryFilter* filter = getInventoryFilter();
 	if (!filter) return false;
 
-	const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, false);
-	const LLUUID &favorites_id = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE, false);
-	const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK, false);
-	const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
-	const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+	const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+	const LLUUID &favorites_id = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+	const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
+	const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+	const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
     const LLUUID from_folder_uuid = inv_item->getParentUUID();
 
 	const BOOL move_is_into_current_outfit = (mUUID == current_outfit_id);
@@ -5117,7 +5117,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 	LLViewerObject* object = NULL;
 	if(LLToolDragAndDrop::SOURCE_AGENT == source)
 	{
-		const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH, false);
+		const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
 
 		const BOOL move_is_into_trash = (mUUID == trash_id) || model->isObjectDescendentOf(mUUID, trash_id);
 		const BOOL move_is_outof_current_outfit = LLAppearanceMgr::instance().getIsInCOF(inv_item->getUUID());
@@ -5278,7 +5278,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 			else
 			{
 				// set up observer to select item once drag and drop from inbox is complete 
-				if (gInventory.isObjectDescendentOf(inv_item->getUUID(), gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, false)))
+				if (gInventory.isObjectDescendentOf(inv_item->getUUID(), gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX)))
 				{
 					set_dad_inbox_object(inv_item->getUUID());
 				}
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 79d222d904..6b406c4c9c 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -372,7 +372,7 @@ void update_all_marketplace_count(const LLUUID& cat_id)
 void update_all_marketplace_count()
 {
     // Get the marketplace root and launch the recursive exploration
-    const LLUUID marketplace_listings_uuid = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    const LLUUID marketplace_listings_uuid = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     if (!marketplace_listings_uuid.isNull())
     {
         update_all_marketplace_count(marketplace_listings_uuid);
@@ -875,7 +875,7 @@ S32 depth_nesting_in_marketplace(LLUUID cur_uuid)
     // Todo: findCategoryUUIDForType is somewhat expensive with large
     // flat root folders yet we use depth_nesting_in_marketplace at
     // every turn, find a way to correctly cache this id.
-    const LLUUID marketplace_listings_uuid = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    const LLUUID marketplace_listings_uuid = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     if (marketplace_listings_uuid.isNull())
     {
         return -1;
@@ -1347,6 +1347,7 @@ bool can_move_folder_to_marketplace(const LLInventoryCategory* root_folder, LLIn
     return accept;
 }
 
+// Can happen asynhroneously!!!
 bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_folder, bool copy)
 {
     // Get the marketplace listings depth of the destination folder, exit with error if not under marketplace
@@ -1386,53 +1387,64 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
         if (can_move_to_marketplace(inv_item, error_msg, true))
         {
             // When moving an isolated item, we might need to create the folder structure to support it
+
+            LLUUID item_id = inv_item->getUUID();
+            std::function<void(const LLUUID&)> callback_create_stock = [copy, item_id](const LLUUID& new_cat_id)
+            {
+                // Verify we can have this item in that destination category
+                LLViewerInventoryCategory* dest_cat = gInventory.getCategory(new_cat_id);
+                LLViewerInventoryItem * viewer_inv_item = gInventory.getItem(item_id);
+                if (!dest_cat->acceptItem(viewer_inv_item))
+                {
+                    LLSD subs;
+                    subs["[ERROR_CODE]"] = LLTrans::getString("Marketplace Error Prefix") + LLTrans::getString("Marketplace Error Not Accepted");
+                    LLNotificationsUtil::add("MerchantPasteFailed", subs);
+                }
+
+                if (copy)
+                {
+                    // Copy the item
+                    LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(update_folder_cb, new_cat_id));
+                    copy_inventory_item(
+                        gAgent.getID(),
+                        viewer_inv_item->getPermissions().getOwner(),
+                        viewer_inv_item->getUUID(),
+                        new_cat_id,
+                        std::string(),
+                        cb);
+                }
+                else
+                {
+                    // Reparent the item
+                    gInventory.changeItemParent(viewer_inv_item, new_cat_id, true);
+                }
+            };
+
+            std::function<void(const LLUUID&)> callback_dest_create = [copy, item_id, callback_create_stock](const LLUUID& new_cat_id)
+            {
+                LLViewerInventoryCategory* dest_cat = gInventory.getCategory(new_cat_id);
+                LLViewerInventoryItem * viewer_inv_item = gInventory.getItem(item_id);
+                if (!viewer_inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID()) &&
+                    (dest_cat->getPreferredType() != LLFolderType::FT_MARKETPLACE_STOCK))
+                {
+                    // We need to create a stock folder to move a no copy item
+                    gInventory.createNewCategory(new_cat_id, LLFolderType::FT_MARKETPLACE_STOCK, viewer_inv_item->getName(), callback_create_stock);
+                }
+                else
+                {
+                    callback_create_stock(new_cat_id);
+                }
+            };
+
             if (depth == 0)
             {
                 // We need a listing folder
-                dest_folder = gInventory.createNewCategory(dest_folder, LLFolderType::FT_NONE, viewer_inv_item->getName());
-                depth++;
+               gInventory.createNewCategory(dest_folder, LLFolderType::FT_NONE, viewer_inv_item->getName(), callback_dest_create);
             }
             if (depth == 1)
             {
                 // We need a version folder
-                dest_folder = gInventory.createNewCategory(dest_folder, LLFolderType::FT_NONE, viewer_inv_item->getName());
-                depth++;
-            }
-			LLViewerInventoryCategory* dest_cat = gInventory.getCategory(dest_folder);
-            if (!viewer_inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID()) &&
-                (dest_cat->getPreferredType() != LLFolderType::FT_MARKETPLACE_STOCK))
-            {
-                // We need to create a stock folder to move a no copy item
-                dest_folder = gInventory.createNewCategory(dest_folder, LLFolderType::FT_MARKETPLACE_STOCK, viewer_inv_item->getName());
-                dest_cat = gInventory.getCategory(dest_folder);
-                depth++;
-            }
-            
-            // Verify we can have this item in that destination category
-            if (!dest_cat->acceptItem(viewer_inv_item))
-            {
-                LLSD subs;
-                subs["[ERROR_CODE]"] = LLTrans::getString("Marketplace Error Prefix") + LLTrans::getString("Marketplace Error Not Accepted");
-                LLNotificationsUtil::add("MerchantPasteFailed", subs);
-                return false;
-            }
-
-            if (copy)
-            {
-                // Copy the item
-                LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(update_folder_cb, dest_folder));
-                copy_inventory_item(
-                                    gAgent.getID(),
-                                    viewer_inv_item->getPermissions().getOwner(),
-                                    viewer_inv_item->getUUID(),
-                                    dest_folder,
-                                    std::string(),
-                                    cb);
-            }
-            else
-            {
-                // Reparent the item
-                gInventory.changeItemParent(viewer_inv_item, dest_folder, true);
+                gInventory.createNewCategory(dest_folder, LLFolderType::FT_NONE, viewer_inv_item->getName(), callback_dest_create);
             }
         }
         else
@@ -2496,7 +2508,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	if ("delete" == action)
 	{
 		static bool sDisplayedAtSession = false;
-		const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+		const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
 		bool marketplacelistings_item = false;
 		LLAllDescendentsPassedFilter f;
 		for (std::set<LLFolderViewItem*>::iterator it = selected_items.begin(); (it != selected_items.end()) && (f.allDescendentsPassedFilter()); ++it)
@@ -2620,7 +2632,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
     if (action == "wear" || action == "wear_add")
     {
         const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-        const LLUUID mp_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID mp_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         std::copy_if(selected_uuid_set.begin(),
             selected_uuid_set.end(),
             std::back_inserter(ids),
@@ -2873,7 +2885,7 @@ void LLInventoryAction::buildMarketplaceFolders(LLFolderView* root)
     // target listing *and* the original listing. So we need to keep track of both.
     // Note: do not however put the marketplace listings root itself in this list or the whole marketplace data will be rebuilt.
     sMarketplaceFolders.clear();
-    const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     if (marketplacelistings_id.isNull())
     {
     	return;
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index fb19994054..b2cfc8584e 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -804,10 +804,63 @@ void LLInventoryModel::consolidateForType(const LLUUID& main_id, LLFolderType::E
 	}
 }
 
+void LLInventoryModel::ensureCategoryForTypeExists(LLFolderType::EType preferred_type)
+{
+    LLUUID rv = LLUUID::null;
+    LLUUID root_id = gInventory.getRootFolderID();
+    if (LLFolderType::FT_ROOT_INVENTORY == preferred_type)
+    {
+        rv = root_id;
+    }
+    else if (root_id.notNull())
+    {
+        cat_array_t* cats = NULL;
+        cats = get_ptr_in_map(mParentChildCategoryTree, root_id);
+        if (cats)
+        {
+            S32 count = cats->size();
+            for (S32 i = 0; i < count; ++i)
+            {
+                LLViewerInventoryCategory* p_cat = cats->at(i);
+                if (p_cat && p_cat->getPreferredType() == preferred_type)
+                {
+                    const LLUUID& folder_id = cats->at(i)->getUUID();
+                    if (rv.isNull() || folder_id < rv)
+                    {
+                        rv = folder_id;
+                    }
+                }
+            }
+        }
+    }
+
+    if (rv.isNull() && root_id.notNull())
+    {
+
+        if (isInventoryUsable())
+        {
+            createNewCategory(
+                root_id,
+                preferred_type,
+                LLStringUtil::null,
+                [preferred_type](const LLUUID &new_cat_id)
+            {
+                LL_DEBUGS("Inventory") << "Created category: " << new_cat_id
+                    << " for type: " << preferred_type << LL_ENDL;
+            }
+            );
+        }
+        else
+        {
+            LL_WARNS("Inventory") << "Can't create requested folder, type " << preferred_type
+                << " because inventory is not usable" << LL_ENDL;
+        }
+    }
+}
+
 const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
 	LLFolderType::EType preferred_type,
-	bool create_folder,
-	const LLUUID& root_id)
+	const LLUUID& root_id) const
 {
 	LLUUID rv = LLUUID::null;
 	if(LLFolderType::FT_ROOT_INVENTORY == preferred_type)
@@ -836,18 +889,14 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
 		}
 	}
 	
-	if(rv.isNull() && create_folder && root_id.notNull())
+	if(rv.isNull() && root_id.notNull() && preferred_type != LLFolderType::FT_MARKETPLACE_LISTINGS)
 	{
-
-		if (isInventoryUsable())
-		{
-			return createNewCategory(root_id, preferred_type, LLStringUtil::null);
-		}
-		else
-		{
-			LL_WARNS("Inventory") << "Can't create requested folder, type " << preferred_type
-								  << " because inventory is not usable" << LL_ENDL;
-		}
+        // if it does not exists, it should either be added
+        // to createCommonSystemCategories or server should
+        // have set it
+        llassert(false);
+        LL_WARNS("Inventory") << "Tried to find folder, type " << preferred_type
+								  << " but category does not exist" << LL_ENDL;
 	}
 	return rv;
 }
@@ -856,12 +905,12 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
 // specifies 'type' as what it defaults to containing. The category is
 // not necessarily only for that type. *NOTE: This will create a new
 // inventory category on the fly if one does not exist.
-const LLUUID LLInventoryModel::findCategoryUUIDForType(LLFolderType::EType preferred_type, bool create_folder)
+const LLUUID LLInventoryModel::findCategoryUUIDForType(LLFolderType::EType preferred_type) const
 {
-	return findCategoryUUIDForTypeInRoot(preferred_type, create_folder, gInventory.getRootFolderID());
+	return findCategoryUUIDForTypeInRoot(preferred_type, gInventory.getRootFolderID());
 }
 
-const LLUUID LLInventoryModel::findUserDefinedCategoryUUIDForType(LLFolderType::EType preferred_type)
+const LLUUID LLInventoryModel::findUserDefinedCategoryUUIDForType(LLFolderType::EType preferred_type) const
 {
     LLUUID cat_id;
     switch (preferred_type)
@@ -892,14 +941,14 @@ const LLUUID LLInventoryModel::findUserDefinedCategoryUUIDForType(LLFolderType::
     
     if (cat_id.isNull() || !getCategory(cat_id))
     {
-        cat_id = findCategoryUUIDForTypeInRoot(preferred_type, true, getRootFolderID());
+        cat_id = findCategoryUUIDForTypeInRoot(preferred_type, getRootFolderID());
     }
     return cat_id;
 }
 
-const LLUUID LLInventoryModel::findLibraryCategoryUUIDForType(LLFolderType::EType preferred_type, bool create_folder)
+const LLUUID LLInventoryModel::findLibraryCategoryUUIDForType(LLFolderType::EType preferred_type) const
 {
-	return findCategoryUUIDForTypeInRoot(preferred_type, create_folder, gInventory.getLibraryRootFolderID());
+	return findCategoryUUIDForTypeInRoot(preferred_type, gInventory.getLibraryRootFolderID());
 }
 
 // Convenience function to create a new category. You could call
@@ -1556,7 +1605,7 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat, U32
 			mask |= LLInventoryObserver::LABEL;
 		}
         // Under marketplace, category labels are quite complex and need extra upate
-        const LLUUID marketplace_id = findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID marketplace_id = findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         if (marketplace_id.notNull() && isObjectDescendentOf(cat->getUUID(), marketplace_id))
         {
 			mask |= LLInventoryObserver::LABEL;
@@ -2881,7 +2930,7 @@ void LLInventoryModel::buildParentChildMap()
 		}
 	}
 
-	const BOOL COF_exists = (findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, FALSE) != LLUUID::null);
+	const BOOL COF_exists = (findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT) != LLUUID::null);
 	sFirstTimeInViewer2 = !COF_exists || gAgent.isFirstLogin();
 
 
@@ -3101,14 +3150,14 @@ LLCore::HttpHandle LLInventoryModel::requestPost(bool foreground,
 
 void LLInventoryModel::createCommonSystemCategories()
 {
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH,true);
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE,true);
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD,true);
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS,true);
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, true);
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK, true); // folder should exist before user tries to 'landmark this'
-    gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS, true);
-    gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, true);
+	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_TRASH);
+	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_FAVORITE);
+	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_CALLINGCARD);
+	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_MY_OUTFITS);
+	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_CURRENT_OUTFIT);
+	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_LANDMARK); // folder should exist before user tries to 'landmark this'
+    gInventory.ensureCategoryForTypeExists(LLFolderType::FT_SETTINGS);
+    gInventory.ensureCategoryForTypeExists(LLFolderType::FT_INBOX);
 }
 
 struct LLUUIDAndName
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index b03181d646..1fde5a3b2f 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -303,24 +303,25 @@ public:
 	// Find
 	//--------------------------------------------------------------------
 public:
+
+    // Checks if category exists (My Inventory only), if it does not, creates it
+    void LLInventoryModel::ensureCategoryForTypeExists(LLFolderType::EType preferred_type);
+
 	const LLUUID findCategoryUUIDForTypeInRoot(
 		LLFolderType::EType preferred_type,
-		bool create_folder,
-		const LLUUID& root_id);
+		const LLUUID& root_id) const;
 
 	// Returns the uuid of the category that specifies 'type' as what it 
 	// defaults to containing. The category is not necessarily only for that type. 
 	//    NOTE: If create_folder is true, this will create a new inventory category 
 	//    on the fly if one does not exist. *NOTE: if find_in_library is true it 
 	//    will search in the user's library folder instead of "My Inventory"
-	const LLUUID findCategoryUUIDForType(LLFolderType::EType preferred_type, 
-										 bool create_folder = true);
+	const LLUUID findCategoryUUIDForType(LLFolderType::EType preferred_type) const;
 	//    will search in the user's library folder instead of "My Inventory"
-	const LLUUID findLibraryCategoryUUIDForType(LLFolderType::EType preferred_type, 
-												bool create_folder = true);
+	const LLUUID findLibraryCategoryUUIDForType(LLFolderType::EType preferred_type) const;
 	// Returns user specified category for uploads, returns default id if there are no
 	// user specified one or it does not exist, creates default category if it is missing.
-	const LLUUID findUserDefinedCategoryUUIDForType(LLFolderType::EType preferred_type);
+	const LLUUID findUserDefinedCategoryUUIDForType(LLFolderType::EType preferred_type) const;
 	
 	// Get whatever special folder this object is a child of, if any.
 	const LLViewerInventoryCategory *getFirstNondefaultParent(const LLUUID& obj_id) const;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 037dda70f0..7d4abab98f 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -745,7 +745,7 @@ LLUUID LLInventoryPanel::getRootFolderID()
                 LLStringExplicit label(mParams.start_folder.name());
                 setLabel(label);
                 
-				root_id = gInventory.findCategoryUUIDForType(preferred_type, false);
+				root_id = gInventory.findCategoryUUIDForType(preferred_type);
 				if (root_id.isNull())
 				{
 					LL_WARNS() << "Could not find folder of type " << preferred_type << LL_ENDL;
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 2d726409c6..5b86f2cc4b 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -897,7 +897,7 @@ void LLMarketplaceData::setDataFetchedSignal(const status_updated_signal_t::slot
 // Get/Post/Put requests to the SLM Server using the SLM API
 void LLMarketplaceData::getSLMListings()
 {
-    const LLUUID marketplaceFolderId = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    const LLUUID marketplaceFolderId = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     setUpdating(marketplaceFolderId, true);
 
     LLCoros::instance().launch("getSLMListings",
@@ -1804,7 +1804,7 @@ bool LLMarketplaceData::isUpdating(const LLUUID& folder_id, S32 depth)
     }
     else
     {
-        const LLUUID marketplace_listings_uuid = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID marketplace_listings_uuid = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         std::set<LLUUID>::iterator it = mPendingUpdateSet.find(marketplace_listings_uuid);
         if (it != mPendingUpdateSet.end())
         {
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 531073526b..2274937ea5 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -87,7 +87,7 @@ BOOL LLPanelOutfitsInventory::postBuild()
 	// ( This is only necessary if we want to show a warning if a user deletes an item that has a
 	// a link in an outfit, see "ConfirmItemDeleteHasLinks". )
 
-	const LLUUID &outfits_cat = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
+	const LLUUID &outfits_cat = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 	if (outfits_cat.notNull())
 	{
 		LLInventoryModelBackgroundFetch::instance().start(outfits_cat);
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index cfceefed26..de0330588b 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -221,7 +221,7 @@ void LLSidepanelInventory::updateInbox()
 	//
 	// Track inbox folder changes
 	//
-	const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, true);
+	const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX);
 	
 	// Set up observer to listen for creation of inbox if it doesn't exist
 	if (inbox_id.isNull())
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6883ead5ee..776b9f8279 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2768,7 +2768,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
 	// Not going through the processAgentInitialWearables path, so need to set this here.
 	LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true);
 	// Initiate creation of COF, since we're also bypassing that.
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_CURRENT_OUTFIT);
 	
 	ESex gender;
 	if (gender_name == "male")
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index b16b26b96e..d10b999220 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -764,7 +764,7 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
 	if (!handled)
 	{
 		// Disallow drag and drop to 3D from the marketplace
-        const LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+        const LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
 		if (marketplacelistings_id.notNull())
 		{
 			for (S32 item_index = 0; item_index < (S32)mCargoIDs.size(); item_index++)
@@ -1732,7 +1732,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
 		return ACCEPT_NO;
 	}
 
-	const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false);
+	const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX);
 	if(gInventory.isObjectDescendentOf(item->getUUID(), outbox_id))
 	{
 		// Legacy
@@ -2159,7 +2159,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory(
 			return ACCEPT_NO;
 		}
 
-		const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false);
+		const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX);
 		if(gInventory.isObjectDescendentOf(category->getUUID(), outbox_id))
 		{
 			// Legacy
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 015a887e9f..4c51b58474 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -403,14 +403,14 @@ void set_merchant_SLM_menu()
     LLCommand* command = LLCommandManager::instance().getCommand("marketplacelistings");
     gToolBarView->enableCommand(command->id(), true);
 
-    const LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    const LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     if (marketplacelistings_id.isNull())
     {
         U32 mkt_status = LLMarketplaceData::instance().getSLMStatus();
         bool is_merchant = (mkt_status == MarketplaceStatusCodes::MARKET_PLACE_MERCHANT) || (mkt_status == MarketplaceStatusCodes::MARKET_PLACE_MIGRATED_MERCHANT);
         if (is_merchant)
         {
-            gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true);
+            gInventory.ensureCategoryForTypeExists(LLFolderType::FT_MARKETPLACE_LISTINGS);
             LL_WARNS("SLM") << "Creating the marketplace listings folder for a merchant" << LL_ENDL;
         }
     }
-- 
cgit v1.2.3


From ff6ff01c6a3822c8160279fecd3c3f2e636c4349 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Mar 2023 00:12:16 +0200
Subject: SL-18629 Replacing UDP creation messages with callback based AIS

---
 indra/newview/llaisapi.cpp                     |  17 +-
 indra/newview/llfloatermarketplacelistings.cpp |   7 +-
 indra/newview/llinventorybridge.cpp            | 131 +++++++++-----
 indra/newview/llinventoryfunctions.cpp         | 229 ++++++++++++++++++-------
 indra/newview/llinventoryfunctions.h           |  47 ++++-
 indra/newview/llinventorymodel.cpp             | 110 ++++++------
 indra/newview/llinventorymodel.h               |   2 +-
 indra/newview/llmarketplacefunctions.cpp       |   6 +-
 8 files changed, 369 insertions(+), 180 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index d2c59cfaba..3826da0341 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -93,6 +93,7 @@ void AISAPI::CreateInventory(const LLUUID& parentId, const LLSD& newInventory, c
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        callback(LLUUID::null);
         return;
     }
 
@@ -485,13 +486,17 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     {   
         LLUUID id(LLUUID::null);
 
-        if (result.has("category_id") && (type == COPYLIBRARYCATEGORY))
+        if (type == COPYLIBRARYCATEGORY)
 	    {
-		    id = result["category_id"];
+            if (result.has("category_id"))
+            {
+                id = result["category_id"];
+            } //else signal failure
 			callback(id);
 	    }
 		if (type == CREATEINVENTORY)
 		{
+            bool informed_caller = false;
 			if (result.has("_created_categories"))
 			{
 				LLSD& cats = result["_created_categories"];
@@ -500,6 +505,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 				{
 					LLUUID cat_id = *cat_iter;
 					callback(cat_id);
+                    informed_caller = true;
 				}
 			}
 			if (result.has("_created_items"))
@@ -510,8 +516,15 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 				{
 					LLUUID item_id = *item_iter;
 					callback(item_id);
+                    informed_caller = true;
 				}
 			}
+
+            if (!informed_caller)
+            {
+                // signal failure with null id
+                callback(id);
+            }
 		}
 
     }
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 9110d9e902..b547150b56 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -896,8 +896,11 @@ void LLFloaterMarketplaceValidation::onOpen(const LLSD& key)
     // Validates the folder
     if (cat_id.notNull())
     {
-        LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
-        validate_marketplacelistings(cat, boost::bind(&LLFloaterMarketplaceValidation::appendMessage, this, _1, _2, _3), false);
+        LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+            cat_id,
+            NULL,
+            boost::bind(&LLFloaterMarketplaceValidation::appendMessage, this, _1, _2, _3),
+            false);
     }
     
     // Handle the listing folder being processed
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index fb92437c3d..b4d7762613 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2901,11 +2901,16 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                     LLUUID version_folder_id = LLMarketplaceData::instance().getActiveFolder(from_folder_uuid);
                     if (version_folder_id.notNull())
                     {
-                        LLViewerInventoryCategory* cat = gInventory.getCategory(version_folder_id);
-                        if (!validate_marketplacelistings(cat,NULL))
+                        LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                            version_folder_id,
+                            [version_folder_id](bool result)
                         {
-                            LLMarketplaceData::instance().activateListing(version_folder_id,false);
+                            if (!result)
+                            {
+                                LLMarketplaceData::instance().activateListing(version_folder_id, false);
+                            }
                         }
+                        );
                     }
                     // In all cases, update the listing we moved from so suffix are updated
                     update_marketplace_category(from_folder_uuid);
@@ -3371,18 +3376,26 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
         if (depth_nesting_in_marketplace(mUUID) == 1)
         {
             LLUUID version_folder_id = LLMarketplaceData::instance().getVersionFolder(mUUID);
-            LLViewerInventoryCategory* cat = gInventory.getCategory(version_folder_id);
             mMessage = "";
-            if (!validate_marketplacelistings(cat,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3)))
-            {
-                LLSD subs;
-                subs["[ERROR_CODE]"] = mMessage;
-                LLNotificationsUtil::add("MerchantListingFailed", subs);
-            }
-            else
+
+            LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                version_folder_id,
+                [this, version_folder_id](bool result)
             {
-                LLMarketplaceData::instance().activateListing(mUUID,true);
-            }
+                // todo: might need to ensure bridge/mUUID exists or this will cause crashes
+                if (!result)
+                {
+                    LLSD subs;
+                    subs["[ERROR_CODE]"] = mMessage;
+                    LLNotificationsUtil::add("MerchantListingFailed", subs);
+                }
+                else
+                {
+                    LLMarketplaceData::instance().activateListing(mUUID, true);
+                }
+            },
+                boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3)
+            );
         }
 		return;
 	}
@@ -3390,18 +3403,27 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 	{
         if (depth_nesting_in_marketplace(mUUID) == 2)
         {
-			LLInventoryCategory* category = gInventory.getCategory(mUUID);
             mMessage = "";
-            if (!validate_marketplacelistings(category,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),false,2))
-            {
-                LLSD subs;
-                subs["[ERROR_CODE]"] = mMessage;
-                LLNotificationsUtil::add("MerchantFolderActivationFailed", subs);
-            }
-            else
+
+            LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                mUUID,
+                [this](bool result)
             {
-                LLMarketplaceData::instance().setVersionFolder(category->getParentUUID(), mUUID);
-            }
+                if (!result)
+                {
+                    LLSD subs;
+                    subs["[ERROR_CODE]"] = mMessage;
+                    LLNotificationsUtil::add("MerchantFolderActivationFailed", subs);
+                }
+                else
+                {
+                    LLInventoryCategory* category = gInventory.getCategory(mUUID);
+                    LLMarketplaceData::instance().setVersionFolder(category->getParentUUID(), mUUID);
+                }
+            },
+                boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),
+                false,
+                2);
         }
 		return;
 	}
@@ -3424,29 +3446,44 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 	}
 	else if ("marketplace_create_listing" == action)
 	{
-        LLViewerInventoryCategory* cat = gInventory.getCategory(mUUID);
         mMessage = "";
-        bool validates = validate_marketplacelistings(cat,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),false);
-        if (!validates)
+
+        // first run vithout fix_hierarchy, second run with fix_hierarchy
+        LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+            mUUID,
+            [this](bool result)
         {
-            mMessage = "";
-            validates = validate_marketplacelistings(cat,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),true);
-            if (validates)
+            if (!result)
+            {
+                mMessage = "";
+
+                LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                    mUUID,
+                    [this](bool result)
+                {
+                    if (result)
+                    {
+                        LLNotificationsUtil::add("MerchantForceValidateListing");
+                        LLMarketplaceData::instance().createListing(mUUID);
+                    }
+                    else
+                    {
+                        LLSD subs;
+                        subs["[ERROR_CODE]"] = mMessage;
+                        LLNotificationsUtil::add("MerchantListingFailed", subs);
+                    }
+                },
+                    boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),
+                    true);
+            }
+            else
             {
-                LLNotificationsUtil::add("MerchantForceValidateListing");
+                LLMarketplaceData::instance().createListing(mUUID);
             }
-        }
+        },
+            boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),
+            false);
         
-        if (!validates)
-        {
-            LLSD subs;
-            subs["[ERROR_CODE]"] = mMessage;
-            LLNotificationsUtil::add("MerchantListingFailed", subs);
-        }
-        else
-        {
-            LLMarketplaceData::instance().createListing(mUUID);
-        }
 		return;
 	}
     else if ("marketplace_disassociate_listing" == action)
@@ -5296,11 +5333,15 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
                 LLUUID version_folder_id = LLMarketplaceData::instance().getActiveFolder(from_folder_uuid);
                 if (version_folder_id.notNull())
                 {
-                    LLViewerInventoryCategory* cat = gInventory.getCategory(version_folder_id);
-                    if (!validate_marketplacelistings(cat,NULL))
+                    LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                        version_folder_id,
+                        [version_folder_id](bool result)
                     {
-                        LLMarketplaceData::instance().activateListing(version_folder_id,false);
-                    }
+                        if (!result)
+                        {
+                            LLMarketplaceData::instance().activateListing(version_folder_id, false);
+                        }
+                    });
                 }
             }
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 6b406c4c9c..5975cb982b 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1492,7 +1492,7 @@ bool move_folder_to_marketplacelistings(LLInventoryCategory* inv_cat, const LLUU
             // Reparent the folder
             gInventory.changeCategoryParent(viewer_inv_cat, dest_folder, false);
             // Check the destination folder recursively for no copy items and promote the including folders if any
-            validate_marketplacelistings(dest_cat);
+            LLMarketplaceValidator::getInstance()->validateMarketplaceListings(dest_folder);
         }
 
         // Update the modified folders
@@ -1517,32 +1517,23 @@ bool sort_alpha(const LLViewerInventoryCategory* cat1, const LLViewerInventoryCa
 	return cat1->getName().compare(cat2->getName()) < 0;
 }
 
-void dump_trace(std::string& message, S32 depth, LLError::ELevel log_level)
-{
-    LL_INFOS() << "validate_marketplacelistings : error = "<< log_level << ", depth = " << depth << ", message = " << message <<  LL_ENDL;
-}
-
 // Make all relevant business logic checks on the marketplace listings starting with the folder as argument.
 // This function does no deletion of listings but a mere audit and raises issues to the user (through the
-// optional callback cb). It also returns a boolean, true if things validate, false if issues are raised.
+// optional callback cb).
 // The only inventory changes that are done is to move and sort folders containing no-copy items to stock folders.
-bool validate_marketplacelistings(
+// @pending_callbacks - how many callbacks we are waiting for, must be inited before use
+// @result - true if things validate, false if issues are raised, must be inited before use
+typedef boost::function<void(S32 pending_callbacks, bool result)> validation_result_callback_t;
+void validate_marketplacelistings(
     LLInventoryCategory* cat,
-    validation_callback_t cb,
+    validation_result_callback_t cb_result,
+    LLMarketplaceValidator::validation_msg_callback_t cb_msg,
     bool fix_hierarchy,
     S32 depth,
-    bool notify_observers)
+    bool notify_observers,
+    S32 &pending_callbacks,
+    bool &result)
 {
-#if 0
-    // Used only for debug
-    if (!cb)
-    {
-        cb =  boost::bind(&dump_trace, _1, _2, _3);
-    }
-#endif
-    // Folder is valid unless issue is raised
-    bool result = true;
-    
     // Get the type and the depth of the folder
     LLViewerInventoryCategory * viewer_cat = (LLViewerInventoryCategory *) (cat);
 	const LLFolderType::EType folder_type = cat->getPreferredType();
@@ -1574,10 +1565,10 @@ bool validate_marketplacelistings(
         if (!can_move_folder_to_marketplace(cat, cat, cat, message, 0, fix_hierarchy))
         {
             result = false;
-            if (cb)
+            if (cb_msg)
             {
                 message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error") + " " + message;
-                cb(message,depth,LLError::LEVEL_ERROR);
+                cb_msg(message,depth,LLError::LEVEL_ERROR);
             }
         }
     }
@@ -1587,26 +1578,42 @@ bool validate_marketplacelistings(
     {
         if (fix_hierarchy)
         {
-            if (cb)
+            if (cb_msg)
             {
                 std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning") + " " + LLTrans::getString("Marketplace Validation Warning Stock");
-                cb(message,depth,LLError::LEVEL_WARN);
+                cb_msg(message,depth,LLError::LEVEL_WARN);
             }
+
             // Nest the stock folder one level deeper in a normal folder and restart from there
+            pending_callbacks++;
             LLUUID parent_uuid = cat->getParentUUID();
-            LLUUID folder_uuid = gInventory.createNewCategory(parent_uuid, LLFolderType::FT_NONE, cat->getName());
-            LLInventoryCategory* new_cat = gInventory.getCategory(folder_uuid);
-            gInventory.changeCategoryParent(viewer_cat, folder_uuid, false);
-            result &= validate_marketplacelistings(new_cat, cb, fix_hierarchy, depth + 1, notify_observers);
-            return result;
+            LLUUID cat_uuid = cat->getUUID();
+            gInventory.createNewCategory(parent_uuid,
+                LLFolderType::FT_NONE,
+                cat->getName(),
+                [cat_uuid, cb_result, cb_msg, fix_hierarchy, depth, notify_observers](const LLUUID &new_cat_id)
+            {
+                LLInventoryCategory * move_cat = gInventory.getCategory(cat_uuid);
+                LLViewerInventoryCategory * viewer_cat = (LLViewerInventoryCategory *)(move_cat);
+                LLInventoryCategory * new_cat = gInventory.getCategory(new_cat_id);
+                gInventory.changeCategoryParent(viewer_cat, new_cat_id, false);
+                S32 pending = 0;
+                bool result = true;
+                // notify_observers probably should be true in such case?
+                validate_marketplacelistings(new_cat, cb_result, cb_msg, fix_hierarchy, depth + 1, notify_observers, pending, result);
+                cb_result(pending, result);
+            }
+            );
+            result = false;
+            return;
         }
         else
         {
             result = false;
-            if (cb)
+            if (cb_msg)
             {
                 std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error") + " " + LLTrans::getString("Marketplace Validation Warning Stock");
-                cb(message,depth,LLError::LEVEL_ERROR);
+                cb_msg(message,depth,LLError::LEVEL_ERROR);
             }
         }
     }
@@ -1637,10 +1644,10 @@ bool validate_marketplacelistings(
         if (!can_move_to_marketplace(item, error_msg, false))
         {
             has_bad_items = true;
-            if (cb && fix_hierarchy)
+            if (cb_msg && fix_hierarchy)
             {
                 std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error") + " " + error_msg;
-                cb(message,depth,LLError::LEVEL_ERROR);
+                cb_msg(message,depth,LLError::LEVEL_ERROR);
             }
             continue;
         }
@@ -1671,35 +1678,35 @@ bool validate_marketplacelistings(
             if (depth == 2)
             {
                 // If this is an empty version folder, warn only (listing won't be delivered by AIS, but only AIS should unlist)
-                if (cb)
+                if (cb_msg)
                 {
                     std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Empty Version");
-                    cb(message,depth,LLError::LEVEL_WARN);
+                    cb_msg(message,depth,LLError::LEVEL_WARN);
                 }
             }
             else if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && (depth > 2))
             {
                 // If this is a legit but empty stock folder, warn only (listing must stay searchable when out of stock)
-                if (cb)
+                if (cb_msg)
                 {
                     std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Empty Stock");
-                    cb(message,depth,LLError::LEVEL_WARN);
+                    cb_msg(message,depth,LLError::LEVEL_WARN);
                 }
             }
-            else if (cb)
+            else if (cb_msg)
             {
                 // We warn if there's nothing in a regular folder (may be it's an under construction listing)
                 std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning Empty");
-                cb(message,depth,LLError::LEVEL_WARN);
+                cb_msg(message,depth,LLError::LEVEL_WARN);
             }
         }
         else
         {
             // Done with that folder : Print out the folder name unless we already found an error here
-            if (cb && result && (depth >= 1))
+            if (cb_msg && result && (depth >= 1))
             {
                 std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Log");
-                cb(message,depth,LLError::LEVEL_INFO);
+                cb_msg(message,depth,LLError::LEVEL_INFO);
             }
         }
     }
@@ -1707,10 +1714,10 @@ bool validate_marketplacelistings(
     else if ((count == 1) && !has_bad_items && (((unique_key == default_key) && (depth > 1)) || ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && (depth > 2) && (cat_array->size() == 0))))
     {
         // Done with that folder : Print out the folder name unless we already found an error here
-        if (cb && result && (depth >= 1))
+        if (cb_msg && result && (depth >= 1))
         {
             std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Log");
-            cb(message,depth,LLError::LEVEL_INFO);
+            cb_msg(message,depth,LLError::LEVEL_INFO);
         }
     }
     else
@@ -1732,11 +1739,11 @@ bool validate_marketplacelistings(
                 while (items_vector_it != items_vector.end())
                 {
                     // Create a new folder
-                    LLUUID parent_uuid = (depth > 2 ? viewer_cat->getParentUUID() : viewer_cat->getUUID());
+                    const LLUUID parent_uuid = (depth > 2 ? viewer_cat->getParentUUID() : viewer_cat->getUUID());
                     LLViewerInventoryItem* viewer_inv_item = gInventory.getItem(items_vector_it->second.back());
                     std::string folder_name = (depth >= 1 ? viewer_cat->getName() : viewer_inv_item->getName());
                     LLFolderType::EType new_folder_type = (items_vector_it->first == default_key ? LLFolderType::FT_NONE : LLFolderType::FT_MARKETPLACE_STOCK);
-                    if (cb)
+                    if (cb_msg)
                     {
                         std::string message = "";
                         if (new_folder_type == LLFolderType::FT_MARKETPLACE_STOCK)
@@ -1747,24 +1754,31 @@ bool validate_marketplacelistings(
                         {
                             message = indent + folder_name + LLTrans::getString("Marketplace Validation Warning Create Version");
                         }
-                        cb(message,depth,LLError::LEVEL_WARN);
+                        cb_msg(message,depth,LLError::LEVEL_WARN);
                     }
-                    std::vector<LLUUID> &uuid_vector = items_vector_it->second;
+
+                    pending_callbacks++;
+                    std::vector<LLUUID> uuid_vector = items_vector_it->second; // needs to be a copy for lambda
                     gInventory.createNewCategory(
                         parent_uuid,
                         new_folder_type,
                         folder_name,
-                        [uuid_vector, cb, indent, depth, parent_uuid, notify_observers](const LLUUID &new_category_id)
+                        [uuid_vector, cb_result, cb_msg, depth, parent_uuid, notify_observers](const LLUUID &new_category_id)
                     {
                         // Move each item to the new folder
-                        std::vector<LLUUID>::reverse_iterator iter = uuid_vector.rbegin();
+                        std::vector<LLUUID>::const_reverse_iterator iter = uuid_vector.rbegin();
                         while (iter != uuid_vector.rend())
                         {
                             LLViewerInventoryItem* viewer_inv_item = gInventory.getItem(*iter);
-                            if (cb)
+                            if (cb_msg)
                             {
+                                std::string indent;
+                                for (int i = 1; i < depth; i++)
+                                {
+                                    indent += "    ";
+                                }
                                 std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Warning Move");
-                                cb(message, depth, LLError::LEVEL_WARN);
+                                cb_msg(message, depth, LLError::LEVEL_WARN);
                             }
                             gInventory.changeItemParent(viewer_inv_item, new_category_id, true);
                             iter++;
@@ -1777,6 +1791,7 @@ bool validate_marketplacelistings(
                         {
                             gInventory.notifyObservers();
                         }
+                        cb_result(0, true);
                     }
                     );
                     items_vector_it++;
@@ -1792,11 +1807,11 @@ bool validate_marketplacelistings(
                 {
                     LLViewerInventoryCategory * viewer_cat = (LLViewerInventoryCategory *) (*iter);
                     gInventory.changeCategoryParent(viewer_cat, parent_uuid, false);
-                    result &= validate_marketplacelistings(viewer_cat, cb, fix_hierarchy, depth, false);
+                    validate_marketplacelistings(viewer_cat, cb_result, cb_msg, fix_hierarchy, depth, false, pending_callbacks, result);
                 }
             }
         }
-        else if (cb)
+        else if (cb_msg)
         {
             // We are not fixing the hierarchy but reporting problems, report everything we can find
             // Print the folder name
@@ -1807,20 +1822,20 @@ bool validate_marketplacelistings(
                     // Report if a stock folder contains a mix of items
                     result = false;
                     std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Mixed Stock");
-                    cb(message,depth,LLError::LEVEL_ERROR);
+                    cb_msg(message,depth,LLError::LEVEL_ERROR);
                 }
                 else if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && (cat_array->size() != 0))
                 {
                     // Report if a stock folder contains subfolders
                     result = false;
                     std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Subfolder In Stock");
-                    cb(message,depth,LLError::LEVEL_ERROR);
+                    cb_msg(message,depth,LLError::LEVEL_ERROR);
                 }
                 else
                 {
                     // Simply print the folder name
                     std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Log");
-                    cb(message,depth,LLError::LEVEL_INFO);
+                    cb_msg(message,depth,LLError::LEVEL_INFO);
                 }
             }
             // Scan each item and report if there's a problem
@@ -1835,21 +1850,21 @@ bool validate_marketplacelistings(
                     // Report items that shouldn't be there to start with
                     result = false;
                     std::string message = indent + "    " + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error") + " " + error_msg;
-                    cb(message,depth,LLError::LEVEL_ERROR);
+                    cb_msg(message,depth,LLError::LEVEL_ERROR);
                 }
                 else if ((!viewer_inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID())) && (folder_type != LLFolderType::FT_MARKETPLACE_STOCK))
                 {
                     // Report stock items that are misplaced
                     result = false;
                     std::string message = indent + "    " + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error Stock Item");
-                    cb(message,depth,LLError::LEVEL_ERROR);
+                    cb_msg(message,depth,LLError::LEVEL_ERROR);
                 }
                 else if (depth == 1)
                 {
                     // Report items not wrapped in version folder
                     result = false;
                     std::string message = indent + "    " + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Warning Unwrapped Item");
-                    cb(message,depth,LLError::LEVEL_ERROR);
+                    cb_msg(message,depth,LLError::LEVEL_ERROR);
                 }
             }
         }
@@ -1858,17 +1873,18 @@ bool validate_marketplacelistings(
         if (viewer_cat->getDescendentCount() == 0)
         {
             // Remove the current folder if it ends up empty
-            if (cb)
+            if (cb_msg)
             {
                 std::string message = indent + viewer_cat->getName() + LLTrans::getString("Marketplace Validation Warning Delete");
-                cb(message,depth,LLError::LEVEL_WARN);
+                cb_msg(message,depth,LLError::LEVEL_WARN);
             }
             gInventory.removeCategory(cat->getUUID());
             if (notify_observers)
             {
                 gInventory.notifyObservers();
             }
-            return result && !has_bad_items;
+            result &=!has_bad_items;
+            return;
         }
     }
 
@@ -1881,15 +1897,15 @@ bool validate_marketplacelistings(
 	for (LLInventoryModel::cat_array_t::iterator iter = cat_array_copy.begin(); iter != cat_array_copy.end(); iter++)
 	{
 		LLInventoryCategory* category = *iter;
-		result &= validate_marketplacelistings(category, cb, fix_hierarchy, depth + 1, false);
+		validate_marketplacelistings(category, cb_result, cb_msg, fix_hierarchy, depth + 1, false, pending_callbacks, result);
 	}
-    
+
     update_marketplace_category(cat->getUUID(), true, true);
     if (notify_observers)
     {
         gInventory.notifyObservers();
     }
-    return result && !has_bad_items;
+    result &= !has_bad_items;
 }
 
 void change_item_parent(const LLUUID& item_id, const LLUUID& new_parent_id)
@@ -1989,8 +2005,91 @@ void move_items_to_new_subfolder(const uuid_vec_t& selected_uuids, const std::st
 
     inventory_func_type func = boost::bind(&move_items_to_folder, _1, selected_uuids);
     gInventory.createNewCategory(first_item->getParentUUID(), LLFolderType::FT_NONE, folder_name, func);
+}
+
+///----------------------------------------------------------------------------
+/// LLMarketplaceValidator implementations
+///----------------------------------------------------------------------------
+
 
+LLMarketplaceValidator::LLMarketplaceValidator()
+{
 }
+LLMarketplaceValidator::~LLMarketplaceValidator()
+{
+}
+
+void LLMarketplaceValidator::validateMarketplaceListings(
+    const LLUUID &category_id,
+    LLMarketplaceValidator::validation_done_callback_t cb_done,
+    LLMarketplaceValidator::validation_msg_callback_t cb_msg,
+    bool fix_hierarchy,
+    S32 depth)
+{
+
+    mValidationQueue.emplace(category_id, cb_done, cb_msg, fix_hierarchy, depth);
+    if (!mValidationInProgress)
+    {
+        start();
+    }
+}
+
+void LLMarketplaceValidator::start()
+{
+    if (mValidationQueue.empty())
+    {
+        mValidationInProgress = false;
+        return;
+    }
+    mValidationInProgress = true;
+    mPendingCallbacks = 1; // do '1' in case something decides ro callback immediately
+    const ValidationRequest &first = mValidationQueue.front();
+    LLViewerInventoryCategory* cat = gInventory.getCategory(first.mCategoryId);
+
+    validation_result_callback_t result_callback = [](S32 pending, bool result)
+    {
+        LLMarketplaceValidator* validator = LLMarketplaceValidator::getInstance();
+        validator->mPendingCallbacks--; // we just got a callback
+        validator->mPendingCallbacks += pending;
+        validator->mPendingResult &= result;
+        if (validator->mPendingCallbacks <= 0)
+        {
+            llassert(validator->mPendingCallbacks == 0); // shouldn't be below 0
+            const ValidationRequest &first = validator->mValidationQueue.front();
+            if (first.mCbDone)
+            {
+                first.mCbDone(validator->mPendingResult);
+            }
+            validator->mValidationQueue.pop(); // done;
+            validator->start();
+        }
+    };
+
+    validate_marketplacelistings(
+        cat,
+        result_callback,
+        first.mCbMsg,
+        first.mFixHierarchy,
+        first.mDepth,
+        true,
+        mPendingCallbacks,
+        mPendingResult);
+
+    result_callback(mPendingCallbacks, mPendingResult);
+}
+
+LLMarketplaceValidator::ValidationRequest::ValidationRequest(
+    LLUUID category_id,
+    validation_done_callback_t cb_done,
+    validation_msg_callback_t cb_msg,
+    bool fix_hierarchy,
+    S32 depth)
+: mCategoryId(category_id)
+, mCbDone(cb_done)
+, mCbMsg(cb_msg)
+, mFixHierarchy(fix_hierarchy)
+, mDepth(depth)
+{}
 
 ///----------------------------------------------------------------------------
 /// LLInventoryCollectFunctor implementations
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 56ad6f6496..ec5e53f9a6 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -81,13 +81,12 @@ void copy_inventory_category_content(const LLUUID& new_cat_uuid, LLInventoryMode
 // Generates a string containing the path to the item specified by item_id.
 void append_path(const LLUUID& id, std::string& path);
 
-typedef boost::function<void(std::string& validation_message, S32 depth, LLError::ELevel log_level)> validation_callback_t;
 
 bool can_move_item_to_marketplace(const LLInventoryCategory* root_folder, LLInventoryCategory* dest_folder, LLInventoryItem* inv_item, std::string& tooltip_msg, S32 bundle_size = 1, bool from_paste = false);
 bool can_move_folder_to_marketplace(const LLInventoryCategory* root_folder, LLInventoryCategory* dest_folder, LLInventoryCategory* inv_cat, std::string& tooltip_msg, S32 bundle_size = 1, bool check_items = true, bool from_paste = false);
 bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_folder, bool copy = false);
 bool move_folder_to_marketplacelistings(LLInventoryCategory* inv_cat, const LLUUID& dest_folder, bool copy = false, bool move_no_copy_items = false);
-bool validate_marketplacelistings(LLInventoryCategory* inv_cat, validation_callback_t cb = NULL, bool fix_hierarchy = true, S32 depth = -1, bool notify_observers = true);
+
 S32  depth_nesting_in_marketplace(LLUUID cur_uuid);
 LLUUID nested_parent_id(LLUUID cur_uuid, S32 depth);
 S32 compute_stock_count(LLUUID cat_uuid, bool force_count = false);
@@ -102,6 +101,50 @@ bool is_only_items_selected(const uuid_vec_t& selected_uuids);
  **                                                                            **
  *******************************************************************************/
 
+class LLMarketplaceValidator: public LLSingleton<LLMarketplaceValidator>
+{
+    LLSINGLETON(LLMarketplaceValidator);
+    ~LLMarketplaceValidator();
+    LOG_CLASS(LLMarketplaceValidator);
+public:
+
+    typedef boost::function<void(std::string& validation_message, S32 depth, LLError::ELevel log_level)> validation_msg_callback_t;
+    typedef boost::function<void(bool result)> validation_done_callback_t;
+
+    void validateMarketplaceListings(
+        const LLUUID &category_id,
+        validation_done_callback_t cb_done = NULL,
+        validation_msg_callback_t cb_msg = NULL,
+        bool fix_hierarchy = true,
+        S32 depth = -1);
+
+private:
+    void start();
+
+    class ValidationRequest
+    {
+    public:
+        ValidationRequest(
+            LLUUID category_id,
+            validation_done_callback_t cb_done,
+            validation_msg_callback_t cb_msg,
+            bool fix_hierarchy,
+            S32 depth);
+        LLUUID mCategoryId;
+        validation_done_callback_t mCbDone;
+        validation_msg_callback_t  mCbMsg;
+        bool mFixHierarchy;
+        S32 mDepth;
+    };
+
+    bool mValidationInProgress;
+    S32 mPendingCallbacks;
+    bool mPendingResult;
+    // todo: might be a good idea to memorize requests by id and
+    // filter out ones that got multiple validation requests
+    std::queue<ValidationRequest> mValidationQueue;
+};
+
 /********************************************************************************
  **                                                                            **
  **                    INVENTORY COLLECTOR FUNCTIONS
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b2cfc8584e..774ed051c0 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -954,27 +954,23 @@ const LLUUID LLInventoryModel::findLibraryCategoryUUIDForType(LLFolderType::ETyp
 // Convenience function to create a new category. You could call
 // updateCategory() with a newly generated UUID category, but this
 // version will take care of details like what the name should be
-// based on preferred type. Returns the UUID of the new category.
-//
-// On failure, returns a null UUID.
-// FIXME: callers do not check for or handle a null results currently.
-LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
+// based on preferred type.
+void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 										   LLFolderType::EType preferred_type,
 										   const std::string& pname,
 										   inventory_func_type callback)
 {
-	LLUUID id; // Initially null.
 	if (!isInventoryUsable())
 	{
 		LL_WARNS(LOG_INV) << "Inventory is not usable; can't create requested category of type "
 						  << preferred_type << LL_ENDL;
-		return id;
+		return;
 	}
 
 	if(LLFolderType::lookup(preferred_type) == LLFolderType::badLookup())
 	{
 		LL_DEBUGS(LOG_INV) << "Attempt to create undefined category." << LL_ENDL;
-		return id;
+		return;
 	}
 
 	if (preferred_type != LLFolderType::FT_NONE)
@@ -990,24 +986,53 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	{
 		name.assign(LLViewerFolderType::lookupNewCategoryName(preferred_type));
 	}
-	
+
 #ifdef USE_AIS_FOR_NC
-	// D567 currently this doesn't really work due to limitations in
-	// AIS3, also violates the common caller assumption that we can
-	// assign the id and return immediately.
-	if (callback)
+    // D567 currently this doesn't really work due to limitations in
+    // AIS3, also violates the common caller assumption that we can
+    // assign the id and return immediately.
+	if (callback && AISAPI::isAvailable())
 	{
-		// D567 note that we no longer assign the UUID in the viewer, so various workflows need to change.
 		LLSD new_inventory = LLSD::emptyMap();
 		new_inventory["categories"] = LLSD::emptyArray();
 		LLViewerInventoryCategory cat(LLUUID::null, parent_id, preferred_type, name, gAgent.getID());
 		LLSD cat_sd = cat.asLLSD();
 		new_inventory["categories"].append(cat_sd);
-		AISAPI::CreateInventory(parent_id, new_inventory, callback);
+		AISAPI::CreateInventory(
+            parent_id,
+            new_inventory,
+            [this, callback, parent_id, preferred_type, name] (const LLUUID& new_category)
+        {
+            if (new_category.isNull())
+            {
+                callback(new_category);
+                return;
+            }
+
+            LLViewerInventoryCategory* folderp = gInventory.getCategory(new_category);
+            if (!folderp)
+            {
+                // Add the category to the internal representation
+                LLPointer<LLViewerInventoryCategory> cat = new LLViewerInventoryCategory(
+                    new_category,
+                    parent_id,
+                    preferred_type,
+                    name,
+                    gAgent.getID());
+
+                LLInventoryModel::LLCategoryUpdate update(cat->getParentUUID(), 1);
+                accountForUpdate(update);
+
+                cat->setVersion(LLViewerInventoryCategory::VERSION_INITIAL - 1); // accountForUpdate() will icrease version by 1
+                cat->setDescendentCount(0);
+                updateCategory(cat);
+            }
 
-		return LLUUID::null;
+            callback(new_category);
+        });
+        return;
 	}
-#else
+#endif
 	LLViewerRegion* viewer_region = gAgent.getRegion();
 	std::string url;
 	if ( viewer_region )
@@ -1016,7 +1041,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	if (!url.empty() && callback)
 	{
 		//Let's use the new capability.
-		
+        LLUUID id;
 		id.generate();
 		LLSD request, body;
 		body["folder_id"] = id;
@@ -1030,48 +1055,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		LL_DEBUGS(LOG_INV) << "Creating category via request: " << ll_pretty_print_sd(request) << LL_ENDL;
         LLCoros::instance().launch("LLInventoryModel::createNewCategoryCoro",
             boost::bind(&LLInventoryModel::createNewCategoryCoro, this, url, body, callback));
-
-		return LLUUID::null;
 	}
-#endif
-
-
-	if (!gMessageSystem)
-	{
-		return LLUUID::null;
-	}
-
-	// D567 FIXME this UDP code path needs to be removed. Requires
-	// reworking many of the callers to use callbacks rather than
-	// assuming instant success.
-
-	// Add the category to the internal representation
-	LL_WARNS() << "D567 need to remove this usage" << LL_ENDL;
-	
-	id.generate();
-	LLPointer<LLViewerInventoryCategory> cat =
-		new LLViewerInventoryCategory(id, parent_id, preferred_type, name, gAgent.getID());
-	cat->setVersion(LLViewerInventoryCategory::VERSION_INITIAL - 1); // accountForUpdate() will icrease version by 1
-	cat->setDescendentCount(0);
-	LLCategoryUpdate update(cat->getParentUUID(), 1);
-	accountForUpdate(update);
-	updateCategory(cat);
-
-	LL_DEBUGS(LOG_INV) << "Creating category via UDP message CreateInventoryFolder, type " << preferred_type << LL_ENDL;
-
-	// Create the category on the server. We do this to prevent people
-	// from munging their protected folders.
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessage("CreateInventoryFolder");
-	msg->nextBlock("AgentData");
-	msg->addUUID("AgentID", gAgent.getID());
-	msg->addUUID(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->nextBlock("FolderData");
-	cat->packMessage(msg);
-	gAgent.sendReliableMessage();
-
-	// return the folder id of the newly created folder
-	return id;
 }
 
 void LLInventoryModel::createNewCategoryCoro(std::string url, LLSD postData, inventory_func_type callback)
@@ -1095,12 +1079,20 @@ void LLInventoryModel::createNewCategoryCoro(std::string url, LLSD postData, inv
     if (!status)
     {
         LL_WARNS() << "HTTP failure attempting to create category." << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
     if (!result.has("folder_id"))
     {
         LL_WARNS() << "Malformed response contents" << ll_pretty_print_sd(result) << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 1fde5a3b2f..5f8db30390 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -477,7 +477,7 @@ public:
 public:
 	// Returns the UUID of the new category. If you want to use the default 
 	// name based on type, pass in a NULL to the 'name' parameter.
-	LLUUID createNewCategory(const LLUUID& parent_id,
+	void createNewCategory(const LLUUID& parent_id,
 							 LLFolderType::EType preferred_type,
 							 const std::string& name,
 							 inventory_func_type callback = NULL);
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 5b86f2cc4b..4038afc74c 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -700,10 +700,9 @@ void LLMarketplaceInventoryObserver::onIdleProcessQueue(void *userdata)
                 // If it's a folder known to the marketplace, let's check it's in proper shape
                 if (LLMarketplaceData::instance().isListed(*id_it) || LLMarketplaceData::instance().isVersionFolder(*id_it))
                 {
-                    LLInventoryCategory* cat = (LLInventoryCategory*)(obj);
                     // can trigger notifyObservers
                     // can cause more structural changes
-                    validate_marketplacelistings(cat);
+                    LLMarketplaceValidator::getInstance()->validateMarketplaceListings(obj->getUUID());
                 }
             }
             else
@@ -1848,8 +1847,7 @@ void LLMarketplaceData::decrementValidationWaiting(const LLUUID& folder_id, S32
         if (found->second <= 0)
         {
             mValidationWaitingList.erase(found);
-            LLInventoryCategory *cat = gInventory.getCategory(folder_id);
-            validate_marketplacelistings(cat);
+            LLMarketplaceValidator::getInstance()->validateMarketplaceListings(folder_id);
             update_marketplace_category(folder_id);
             gInventory.notifyObservers();
         }
-- 
cgit v1.2.3


From 80b33a015735daf08b8904b3581b3edcce9368d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Mar 2023 20:15:41 +0200
Subject: SL-18629 Unpack thumbnail asset id

---
 indra/llinventory/llinventory.cpp  | 56 ++++++++++++++++++++++++++++++++++++--
 indra/newview/llinventorymodel.cpp |  1 +
 2 files changed, 55 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index abe1b4dbd3..db18bd4c0e 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -44,6 +44,7 @@
 static const std::string INV_ITEM_ID_LABEL("item_id");
 static const std::string INV_FOLDER_ID_LABEL("cat_id");
 static const std::string INV_PARENT_ID_LABEL("parent_id");
+static const std::string INV_THUMBNAIL_LABEL("thumbnail");
 static const std::string INV_THUMBNAIL_ID_LABEL("thumbnail_id");
 static const std::string INV_ASSET_TYPE_LABEL("type");
 static const std::string INV_PREFERRED_TYPE_LABEL("preferred_type");
@@ -863,6 +864,34 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
 	{
 		mParentUUID = sd[w];
 	}
+    w = INV_THUMBNAIL_LABEL;
+    if (sd.has(w))
+    {
+        LLSD thumbnail_map = sd[w];
+        w = INV_ASSET_ID_LABEL;
+        if (thumbnail_map.has(w))
+        {
+            mThumbnailUUID = thumbnail_map[w];
+        }
+        /*
+            <key> asset_id </key>
+            <uuid> acc0ec86 - 17f2 - 4b92 - ab41 - 6718b1f755f7 </uuid>
+            <key> perms </key>
+            <integer> 8 </integer>
+            <key>service</key>
+            <integer> 3 </integer>
+            <key>version</key>
+            <integer> 1 </key>
+        */
+    }
+    else
+    {
+        w = INV_THUMBNAIL_ID_LABEL;
+        if (sd.has(w))
+        {
+            mThumbnailUUID = sd[w];
+        }
+    }
 	w = INV_PERMISSIONS_LABEL;
 	if (sd.has(w))
 	{
@@ -1071,10 +1100,33 @@ bool LLInventoryCategory::fromLLSD(const LLSD& sd)
     {
         mParentUUID = sd[w];
     }
-    w = INV_THUMBNAIL_ID_LABEL;
+    w = INV_THUMBNAIL_LABEL;
     if (sd.has(w))
     {
-        mThumbnailUUID = sd[w];
+        LLSD thumbnail_map = sd[w];
+        w = INV_ASSET_ID_LABEL;
+        if (thumbnail_map.has(w))
+        {
+            mThumbnailUUID = thumbnail_map[w];
+        }
+        /*
+            <key> asset_id </key>
+            <uuid> acc0ec86 - 17f2 - 4b92 - ab41 - 6718b1f755f7 </uuid>
+            <key> perms </key>
+            <integer> 8 </integer>
+            <key>service</key>
+            <integer> 3 </integer>
+            <key>version</key>
+            <integer> 1 </key>
+        */
+    }
+    else
+    {
+        w = INV_THUMBNAIL_ID_LABEL;
+        if (sd.has(w))
+        {
+            mThumbnailUUID = sd[w];
+        }
     }
     w = INV_ASSET_TYPE_LABEL;
     if (sd.has(w))
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 774ed051c0..bfff876c96 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -193,6 +193,7 @@ public:
                 titem->unpackMessage(item);
                 LL_DEBUGS("Inventory") << "unpacked item '" << titem->getName() << "' in "
                     << titem->getParentUUID() << LL_ENDL;
+                // callback id might be no longer supported
                 U32 callback_id = item["callback_id"].asInteger();
 
                 if (titem->getUUID().notNull())
-- 
cgit v1.2.3


From 91c046b41e5e673ff0bd08d7d8ffcfcb33186b7a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Mar 2023 20:27:05 +0200
Subject: SL-18629 MacOS build fix

---
 indra/newview/llinventorymodel.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 5f8db30390..3fbf8924b5 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -304,8 +304,8 @@ public:
 	//--------------------------------------------------------------------
 public:
 
-    // Checks if category exists (My Inventory only), if it does not, creates it
-    void LLInventoryModel::ensureCategoryForTypeExists(LLFolderType::EType preferred_type);
+    // Checks if category exists ("My Inventory" only), if it does not, creates it
+    void ensureCategoryForTypeExists(LLFolderType::EType preferred_type);
 
 	const LLUUID findCategoryUUIDForTypeInRoot(
 		LLFolderType::EType preferred_type,
-- 
cgit v1.2.3


From e4de43fe5e640a1d30e78c68b90eefdf87b908e2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Mar 2023 21:30:28 +0200
Subject: SL-18629 Pack thumbnail asset id

---
 indra/llinventory/llinventory.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index db18bd4c0e..8904d9fb8a 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -812,6 +812,7 @@ void LLInventoryItem::asLLSD( LLSD& sd ) const
 	sd[INV_ITEM_ID_LABEL] = mUUID;
 	sd[INV_PARENT_ID_LABEL] = mParentUUID;
 	sd[INV_PERMISSIONS_LABEL] = ll_create_sd_from_permissions(mPermissions);
+    sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
 
 	U32 mask = mPermissions.getMaskBase();
 	if(((mask & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
@@ -867,13 +868,13 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
     w = INV_THUMBNAIL_LABEL;
     if (sd.has(w))
     {
-        LLSD thumbnail_map = sd[w];
+        const LLSD &thumbnail_map = sd[w];
         w = INV_ASSET_ID_LABEL;
         if (thumbnail_map.has(w))
         {
             mThumbnailUUID = thumbnail_map[w];
         }
-        /*
+        /* Example:
             <key> asset_id </key>
             <uuid> acc0ec86 - 17f2 - 4b92 - ab41 - 6718b1f755f7 </uuid>
             <key> perms </key>
@@ -1067,7 +1068,7 @@ LLSD LLInventoryCategory::asLLSD() const
     LLSD sd = LLSD();
     sd["item_id"] = mUUID;
     sd["parent_id"] = mParentUUID;
-    sd["thumbnail_id"] = mThumbnailUUID;
+    sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
     S8 type = static_cast<S8>(mPreferredType);
     sd["type"]      = type;
     sd["name"] = mName;
@@ -1103,22 +1104,12 @@ bool LLInventoryCategory::fromLLSD(const LLSD& sd)
     w = INV_THUMBNAIL_LABEL;
     if (sd.has(w))
     {
-        LLSD thumbnail_map = sd[w];
+        const LLSD &thumbnail_map = sd[w];
         w = INV_ASSET_ID_LABEL;
         if (thumbnail_map.has(w))
         {
             mThumbnailUUID = thumbnail_map[w];
         }
-        /*
-            <key> asset_id </key>
-            <uuid> acc0ec86 - 17f2 - 4b92 - ab41 - 6718b1f755f7 </uuid>
-            <key> perms </key>
-            <integer> 8 </integer>
-            <key>service</key>
-            <integer> 3 </integer>
-            <key>version</key>
-            <integer> 1 </key>
-        */
     }
     else
     {
@@ -1250,6 +1241,7 @@ LLSD LLInventoryCategory::exportLLSD() const
 	cat_data[INV_PARENT_ID_LABEL] = mParentUUID;
 	cat_data[INV_ASSET_TYPE_LABEL] = LLAssetType::lookup(mType);
 	cat_data[INV_PREFERRED_TYPE_LABEL] = LLFolderType::lookup(mPreferredType);
+    cat_data[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
 	cat_data[INV_NAME_LABEL] = mName;
 
 	return cat_data;
@@ -1273,6 +1265,14 @@ bool LLInventoryCategory::importLLSD(const LLSD& cat_data)
 	{
 		setPreferredType(LLFolderType::lookup(cat_data[INV_PREFERRED_TYPE_LABEL].asString()));
 	}
+    if (cat_data.has(INV_THUMBNAIL_LABEL))
+    {
+        const LLSD &thumbnail_data = cat_data[INV_THUMBNAIL_LABEL];
+        if (thumbnail_data.has(INV_ASSET_ID_LABEL))
+        {
+            setThumbnailUUID(thumbnail_data[INV_ASSET_ID_LABEL].asUUID());
+        }
+    }
 	if (cat_data.has(INV_NAME_LABEL))
 	{
 		mName = cat_data[INV_NAME_LABEL].asString();
-- 
cgit v1.2.3


From 9d90fbc73df9c07deef8737e56cc3f466d2c4d05 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Mar 2023 22:43:40 +0200
Subject: SL-18629 LLTask thumbnail packing and unpacking

---
 indra/llinventory/llinventory.cpp | 79 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 8904d9fb8a..c6049f3ec4 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -671,6 +671,26 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 		{
 			mType = LLAssetType::lookup(valuestr);
 		}
+        else if (0 == strcmp("metadata", keyword))
+        {
+            LLSD metadata(valuestr);
+            if (metadata.has("thumbnail"))
+            {
+                const LLSD& thumbnail = metadata["thumbnail"];
+                if (thumbnail.has("asset_id"))
+                {
+                    setThumbnailUUID(thumbnail["asset_id"].asUUID());
+                }
+                else
+                {
+                    setThumbnailUUID(LLUUID::null);
+                }
+            }
+            else
+            {
+                setThumbnailUUID(LLUUID::null);
+            }
+        }
 		else if(0 == strcmp("inv_type", keyword))
 		{
 			mInventoryType = LLInventoryType::lookup(std::string(valuestr));
@@ -760,6 +780,13 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
 	output_stream << "\t\tparent_id\t" << uuid_str << "\n";
 	mPermissions.exportLegacyStream(output_stream);
 
+    if (mThumbnailUUID.notNull())
+    {
+        LLSD metadata;
+        metadata["thumbnail"] = LLSD().with("asset_id", mThumbnailUUID);
+        output_stream << "\t\tmetadata\t" << metadata << "|\n";
+    }
+
 	// Check for permissions to see the asset id, and if so write it
 	// out as an asset id. Otherwise, apply our cheesy encryption.
 	if(include_asset_key)
@@ -812,7 +839,11 @@ void LLInventoryItem::asLLSD( LLSD& sd ) const
 	sd[INV_ITEM_ID_LABEL] = mUUID;
 	sd[INV_PARENT_ID_LABEL] = mParentUUID;
 	sd[INV_PERMISSIONS_LABEL] = ll_create_sd_from_permissions(mPermissions);
-    sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
 
 	U32 mask = mPermissions.getMaskBase();
 	if(((mask & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
@@ -865,6 +896,7 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
 	{
 		mParentUUID = sd[w];
 	}
+    mThumbnailUUID.setNull();
     w = INV_THUMBNAIL_LABEL;
     if (sd.has(w))
     {
@@ -890,7 +922,7 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
         w = INV_THUMBNAIL_ID_LABEL;
         if (sd.has(w))
         {
-            mThumbnailUUID = sd[w];
+            mThumbnailUUID = sd[w].asUUID();
         }
     }
 	w = INV_PERMISSIONS_LABEL;
@@ -1068,11 +1100,15 @@ LLSD LLInventoryCategory::asLLSD() const
     LLSD sd = LLSD();
     sd["item_id"] = mUUID;
     sd["parent_id"] = mParentUUID;
-    sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
     S8 type = static_cast<S8>(mPreferredType);
     sd["type"]      = type;
     sd["name"] = mName;
 
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+
     return sd;
 }
 
@@ -1101,6 +1137,7 @@ bool LLInventoryCategory::fromLLSD(const LLSD& sd)
     {
         mParentUUID = sd[w];
     }
+    mThumbnailUUID.setNull();
     w = INV_THUMBNAIL_LABEL;
     if (sd.has(w))
     {
@@ -1210,6 +1247,26 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 			LLStringUtil::replaceNonstandardASCII(mName, ' ');
 			LLStringUtil::replaceChar(mName, '|', ' ');
 		}
+        else if (0 == strcmp("metadata", keyword))
+        {
+            LLSD metadata(valuestr);
+            if (metadata.has("thumbnail"))
+            {
+                const LLSD& thumbnail = metadata["thumbnail"];
+                if (thumbnail.has("asset_id"))
+                {
+                    setThumbnailUUID(thumbnail["asset_id"].asUUID());
+                }
+                else
+                {
+                    setThumbnailUUID(LLUUID::null);
+                }
+            }
+            else
+            {
+                setThumbnailUUID(LLUUID::null);
+            }
+        }
 		else
 		{
 			LL_WARNS() << "unknown keyword '" << keyword
@@ -1230,6 +1287,12 @@ BOOL LLInventoryCategory::exportLegacyStream(std::ostream& output_stream, BOOL)
 	output_stream << "\t\ttype\t" << LLAssetType::lookup(mType) << "\n";
 	output_stream << "\t\tpref_type\t" << LLFolderType::lookup(mPreferredType) << "\n";
 	output_stream << "\t\tname\t" << mName.c_str() << "|\n";
+    if (mThumbnailUUID.notNull())
+    {
+        LLSD metadata;
+        metadata["thumbnail"] = LLSD().with("asset_id", mThumbnailUUID);
+        output_stream << "\t\tmetadata\t" << metadata << "|\n";
+    }
 	output_stream << "\t}\n";
 	return TRUE;
 }
@@ -1241,9 +1304,13 @@ LLSD LLInventoryCategory::exportLLSD() const
 	cat_data[INV_PARENT_ID_LABEL] = mParentUUID;
 	cat_data[INV_ASSET_TYPE_LABEL] = LLAssetType::lookup(mType);
 	cat_data[INV_PREFERRED_TYPE_LABEL] = LLFolderType::lookup(mPreferredType);
-    cat_data[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
 	cat_data[INV_NAME_LABEL] = mName;
 
+    if (mThumbnailUUID.notNull())
+    {
+        cat_data[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+
 	return cat_data;
 }
 
@@ -1265,14 +1332,16 @@ bool LLInventoryCategory::importLLSD(const LLSD& cat_data)
 	{
 		setPreferredType(LLFolderType::lookup(cat_data[INV_PREFERRED_TYPE_LABEL].asString()));
 	}
+    LLUUID thumbnail_uuid;
     if (cat_data.has(INV_THUMBNAIL_LABEL))
     {
         const LLSD &thumbnail_data = cat_data[INV_THUMBNAIL_LABEL];
         if (thumbnail_data.has(INV_ASSET_ID_LABEL))
         {
-            setThumbnailUUID(thumbnail_data[INV_ASSET_ID_LABEL].asUUID());
+            thumbnail_uuid = thumbnail_data[INV_ASSET_ID_LABEL].asUUID();
         }
     }
+    setThumbnailUUID(thumbnail_uuid);
 	if (cat_data.has(INV_NAME_LABEL))
 	{
 		mName = cat_data[INV_NAME_LABEL].asString();
-- 
cgit v1.2.3


From da27311473c2c2cc35440f88aa25c9378fc8f4d4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Mar 2023 23:55:05 +0200
Subject: SL-18629 Creare items via AIS placeholder

---
 indra/newview/llappearancemgr.cpp   | 31 ++++--------------
 indra/newview/llviewerinventory.cpp | 64 ++++++++++++++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 32 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 1c55113082..4e36a4c351 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3996,34 +3996,17 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 
 	// First, make a folder in the My Outfits directory.
 	const LLUUID parent_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
-	// D567 replace with coros
-    if (AISAPI::isAvailable())
-	{
-		// cap-based category creation was buggy until recently. use
-		// existence of AIS as an indicator the fix is present. Does
-		// not actually use AIS to create the category.
-		inventory_func_type func = boost::bind(&LLAppearanceMgr::onOutfitFolderCreated,this,_1,show_panel);
 
-		// D567 copy thumbnail info from source folder
-		gInventory.createNewCategory(
-			parent_id,
-			LLFolderType::FT_OUTFIT,
-			new_folder_name,
-			func);
-	}
-	else
-	{
-		// UDP PATH, should remove
-		// D567 copy thumbnail info from source folder
-		gInventory.createNewCategory(
-			parent_id,
-			LLFolderType::FT_OUTFIT,
-			new_folder_name,
-            [show_panel](const LLUUID &new_cat_id)
+    // UDP PATH, should remove
+    // D567 copy thumbnail info from source folder
+    gInventory.createNewCategory(
+        parent_id,
+        LLFolderType::FT_OUTFIT,
+        new_folder_name,
+        [show_panel](const LLUUID &new_cat_id)
         {
             LLAppearanceMgr::getInstance()->onOutfitFolderCreated(new_cat_id, show_panel);
         });
-	}
 }
 
 void LLAppearanceMgr::wearBaseOutfit()
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index d0832e16d7..6f7c5d96f5 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1000,13 +1000,18 @@ void create_notecard_cb(const LLUUID& inv_item)
 
 LLInventoryCallbackManager gInventoryCallbacks;
 
-void create_inventory_item(const LLUUID& agent_id, const LLUUID& session_id,
-						   const LLUUID& parent, const LLTransactionID& transaction_id,
-						   const std::string& name,
-						   const std::string& desc, LLAssetType::EType asset_type,
-						   LLInventoryType::EType inv_type, U8 subtype,
-						   U32 next_owner_perm,
-						   LLPointer<LLInventoryCallback> cb)
+void create_inventory_item(
+    const LLUUID& agent_id,
+    const LLUUID& session_id,
+    const LLUUID& parent_id,
+    const LLTransactionID& transaction_id,
+    const std::string& name,
+    const std::string& desc,
+    LLAssetType::EType asset_type,
+    LLInventoryType::EType inv_type,
+    U8 subtype,
+    U32 next_owner_perm,
+    LLPointer<LLInventoryCallback> cb)
 {
 	//check if name is equal to one of special inventory items names
 	//EXT-5839
@@ -1027,6 +1032,49 @@ void create_inventory_item(const LLUUID& agent_id, const LLUUID& session_id,
 		}
 	}
 
+#ifdef USE_AIS_FOR_NC
+    // D567 currently this doesn't work due to missing AIS3 support
+    if (AISAPI::isAvailable())
+    {
+        LLSD new_inventory = LLSD::emptyMap();
+        new_inventory["items"] = LLSD::emptyArray();
+
+        LLPermissions perms;
+        perms.init(
+            gAgentID,
+            gAgentID,
+            LLUUID::null,
+            LLUUID::null);
+        perms.initMasks(
+            PERM_ALL,
+            PERM_ALL,
+            PERM_NONE,
+            PERM_NONE,
+            next_owner_perm);
+
+        LLUUID null_id;
+        LLPointer<LLViewerInventoryItem> item = new LLViewerInventoryItem(
+            null_id, /*don't know yet*/
+            parent_id,
+            perms,
+            null_id, /*don't know yet*/
+            asset_type,
+            inv_type,
+            server_name,
+            desc,
+            LLSaleInfo(),
+            0,
+            0 /*don't know yet, whenever server creates it*/);
+        LLSD item_sd = item->asLLSD();
+        new_inventory["items"].append(item_sd);
+        AISAPI::CreateInventory(
+            parent_id,
+            new_inventory,
+            nullptr);
+        return;
+    }
+#endif
+
 	LLMessageSystem* msg = gMessageSystem;
 	msg->newMessageFast(_PREHASH_CreateInventoryItem);
 	msg->nextBlock(_PREHASH_AgentData);
@@ -1034,7 +1082,7 @@ void create_inventory_item(const LLUUID& agent_id, const LLUUID& session_id,
 	msg->addUUIDFast(_PREHASH_SessionID, session_id);
 	msg->nextBlock(_PREHASH_InventoryBlock);
 	msg->addU32Fast(_PREHASH_CallbackID, gInventoryCallbacks.registerCB(cb));
-	msg->addUUIDFast(_PREHASH_FolderID, parent);
+	msg->addUUIDFast(_PREHASH_FolderID, parent_id);
 	msg->addUUIDFast(_PREHASH_TransactionID, transaction_id);
 	msg->addU32Fast(_PREHASH_NextOwnerMask, next_owner_perm);
 	msg->addS8Fast(_PREHASH_Type, (S8)asset_type);
-- 
cgit v1.2.3


From 0d1f7cafcd9db3ffff8e22f898005dc34bca5fcb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 11 Mar 2023 13:49:28 +0200
Subject: SL-19109 Fix item updates not getting a callback

---
 indra/newview/llaisapi.cpp | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 3826da0341..8e20132ede 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -483,20 +483,17 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     gInventory.onAISUpdateReceived("AISCommand", result);
 
     if (callback && !callback.empty())
-    {   
+    {
+        bool needs_callback = true;
         LLUUID id(LLUUID::null);
 
-        if (type == COPYLIBRARYCATEGORY)
-	    {
-            if (result.has("category_id"))
-            {
-                id = result["category_id"];
-            } //else signal failure
-			callback(id);
+        if (type == COPYLIBRARYCATEGORY && result.has("category_id"))
+        {
+            id = result["category_id"];
 	    }
 		if (type == CREATEINVENTORY)
 		{
-            bool informed_caller = false;
+            // CREATEINVENTORY can have multiple callbacks
 			if (result.has("_created_categories"))
 			{
 				LLSD& cats = result["_created_categories"];
@@ -505,7 +502,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 				{
 					LLUUID cat_id = *cat_iter;
 					callback(cat_id);
-                    informed_caller = true;
+                    needs_callback = false;
 				}
 			}
 			if (result.has("_created_items"))
@@ -516,17 +513,17 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 				{
 					LLUUID item_id = *item_iter;
 					callback(item_id);
-                    informed_caller = true;
+                    needs_callback = false;
 				}
 			}
-
-            if (!informed_caller)
-            {
-                // signal failure with null id
-                callback(id);
-            }
 		}
 
+        if (needs_callback)
+        {
+            // Call callback at least once regardless of failure.
+            // UPDATEITEM doesn't expect an id
+            callback(id);
+        }
     }
 
 }
-- 
cgit v1.2.3


From 1699bdbea75c47cf763d8a11078897c37c2599a3 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Sat, 11 Mar 2023 14:05:00 +0200
Subject: mac build fix

---
 indra/newview/llfloatermarketplacelistings.cpp | 2 +-
 indra/newview/llinventorybridge.cpp            | 2 +-
 indra/newview/llinventoryfunctions.cpp         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index b547150b56..70c0d2aafd 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -479,7 +479,7 @@ void LLFloaterMarketplaceListings::setRootFolder()
                 gInventory.getRootFolderID(),
                 preferred_type,
                 LLStringUtil::null,
-                [preferred_type](const LLUUID &new_cat_id)
+                [](const LLUUID &new_cat_id)
             {
                 LLFloaterMarketplaceListings *marketplace = LLFloaterReg::findTypedInstance<LLFloaterMarketplaceListings>("marketplace_listings");
                 if (marketplace)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index b4d7762613..421c1c9754 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3380,7 +3380,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 
             LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
                 version_folder_id,
-                [this, version_folder_id](bool result)
+                [this](bool result)
             {
                 // todo: might need to ensure bridge/mUUID exists or this will cause crashes
                 if (!result)
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 5975cb982b..c2e9137910 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1420,7 +1420,7 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
                 }
             };
 
-            std::function<void(const LLUUID&)> callback_dest_create = [copy, item_id, callback_create_stock](const LLUUID& new_cat_id)
+            std::function<void(const LLUUID&)> callback_dest_create = [item_id, callback_create_stock](const LLUUID& new_cat_id)
             {
                 LLViewerInventoryCategory* dest_cat = gInventory.getCategory(new_cat_id);
                 LLViewerInventoryItem * viewer_inv_item = gInventory.getItem(item_id);
-- 
cgit v1.2.3


From 3c54d6a0371377f65c8eaa7eafffee0decdf4cbf Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 13 Mar 2023 12:40:52 +0200
Subject: SL-19386 Double click to open Single folder view should affect only
 Inventory

---
 indra/llui/llfolderviewitem.cpp                    | 25 +++++++++++++---------
 indra/llui/llfolderviewitem.h                      |  4 +++-
 .../skins/default/xui/en/panel_main_inventory.xml  |  9 ++++++--
 3 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 6d2c346f76..227f1d79e4 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -114,6 +114,7 @@ LLFolderViewItem::Params::Params()
     text_pad("text_pad", 0),
     text_pad_right("text_pad_right", 0),
     single_folder_mode("single_folder_mode", false),
+    double_click_override("double_click_override", false),
     arrow_size("arrow_size", 0),
     max_folder_item_overlap("max_folder_item_overlap", 0)
 { }
@@ -153,7 +154,8 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
     mTextPadRight(p.text_pad_right),
     mArrowSize(p.arrow_size),
     mSingleFolderMode(p.single_folder_mode),
-    mMaxFolderItemOverlap(p.max_folder_item_overlap)
+    mMaxFolderItemOverlap(p.max_folder_item_overlap),
+    mDoubleClickOverride(p.double_click_override)
 {
 	if (!sColorSetInitialized)
 	{
@@ -2077,16 +2079,19 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
 	}
 	if( !handled )
 	{
-        static LLUICachedControl<U32> double_click_action("MultiModeDoubleClickFolder", false);
-        if (double_click_action == 1)
+        if(mDoubleClickOverride)
         {
-            getViewModelItem()->navigateToFolder(true);
-            return TRUE;
-        }
-        if (double_click_action == 2)
-        {
-            getViewModelItem()->navigateToFolder(false, true);
-            return TRUE;
+            static LLUICachedControl<U32> double_click_action("MultiModeDoubleClickFolder", false);
+            if (double_click_action == 1)
+            {
+                getViewModelItem()->navigateToFolder(true);
+                return TRUE;
+            }
+            if (double_click_action == 2)
+            {
+                getViewModelItem()->navigateToFolder(false, true);
+                return TRUE;
+            }
         }
 		if(mIndentation < x && x < mIndentation + (isCollapsed() ? 0 : mArrowSize) + mTextPad)
 		{
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index aa9ed0a1e8..b6437ab61d 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -72,7 +72,8 @@ public:
                                                     text_pad_right,
                                                     arrow_size,
                                                     max_folder_item_overlap;
-        Optional<bool>                              single_folder_mode;
+        Optional<bool>                              single_folder_mode,
+                                                    double_click_override;
 		Params();
 	};
 
@@ -123,6 +124,7 @@ protected:
 								mAllowWear,
                                 mAllowDrop,
                                 mSingleFolderMode,
+                                mDoubleClickOverride,
 								mSelectPending,
 								mIsItemCut;
 
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d400835198..af4511a92d 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -235,7 +235,9 @@
          sort_order_setting="InventorySortOrder"
          show_item_link_overlays="true"
          top="16"
-         width="288" />
+         width="288">
+            <folder double_click_override="true"/>
+        </inventory_panel>
         <recent_inventory_panel
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
@@ -250,7 +252,9 @@
          left_delta="0"
          name="Recent Items"
          show_item_link_overlays="true"
-         width="290" />
+         width="290">
+            <folder double_click_override="true"/>
+        </recent_inventory_panel>
         <inventory_panel
          name="Worn Items"
          label="WORN"
@@ -264,6 +268,7 @@
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
+            <folder double_click_override="true"/>
         </inventory_panel>
       </tab_container>
     </panel>
-- 
cgit v1.2.3


From cd61492723866ae9a268820d643976693f42b02a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 13 Mar 2023 15:36:50 +0200
Subject: SL-19109 Fix item updates not getting a callback #2

---
 indra/newview/llinventorymodel.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index bfff876c96..ee0dd2422a 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -965,12 +965,20 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	{
 		LL_WARNS(LOG_INV) << "Inventory is not usable; can't create requested category of type "
 						  << preferred_type << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
 		return;
 	}
 
 	if(LLFolderType::lookup(preferred_type) == LLFolderType::badLookup())
 	{
 		LL_DEBUGS(LOG_INV) << "Attempt to create undefined category." << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
 		return;
 	}
 
@@ -992,7 +1000,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
     // D567 currently this doesn't really work due to limitations in
     // AIS3, also violates the common caller assumption that we can
     // assign the id and return immediately.
-	if (callback && AISAPI::isAvailable())
+	if (AISAPI::isAvailable())
 	{
 		LLSD new_inventory = LLSD::emptyMap();
 		new_inventory["categories"] = LLSD::emptyArray();
@@ -1006,7 +1014,10 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
         {
             if (new_category.isNull())
             {
-                callback(new_category);
+                if (callback)
+                {
+                    callback(new_category);
+                }
                 return;
             }
 
@@ -1029,7 +1040,10 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                 updateCategory(cat);
             }
 
-            callback(new_category);
+            if (callback)
+            {
+                callback(new_category);
+            }
         });
         return;
 	}
@@ -1039,7 +1053,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	if ( viewer_region )
 		url = viewer_region->getCapability("CreateInventoryCategory");
 	
-	if (!url.empty() && callback)
+	if (!url.empty())
 	{
 		//Let's use the new capability.
         LLUUID id;
@@ -1056,7 +1070,13 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		LL_DEBUGS(LOG_INV) << "Creating category via request: " << ll_pretty_print_sd(request) << LL_ENDL;
         LLCoros::instance().launch("LLInventoryModel::createNewCategoryCoro",
             boost::bind(&LLInventoryModel::createNewCategoryCoro, this, url, body, callback));
+        return;
 	}
+
+    if (callback)
+    {
+        callback(LLUUID::null); // Notify about failure
+    }
 }
 
 void LLInventoryModel::createNewCategoryCoro(std::string url, LLSD postData, inventory_func_type callback)
-- 
cgit v1.2.3


From 1a8c03cfda1863889b21b25a1f127bc541464f5b Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 15 Mar 2023 17:23:05 +0100
Subject: SL-19085 Save Wiki-style URL as link when creating the Pick with an
 existing link in About Land

---
 indra/newview/llpanelprofilepicks.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index 45d0252e4f..db3a3c6de5 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -529,6 +529,7 @@ void LLPanelProfilePick::setAvatarId(const LLUUID& avatar_id)
             pick_name = parcel->getName();
             pick_desc = parcel->getDesc();
             snapshot_id = parcel->getSnapshotID();
+            mPickDescription->setParseHTML(false);
         }
 
         LLViewerRegion* region = gAgent.getRegion();
-- 
cgit v1.2.3


From f14629e690c31b4fb9381430e288f191ef22d23a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 3 Mar 2023 12:15:09 +0200
Subject: SL-18629 AISv3 draft calls

---
 indra/newview/llaisapi.cpp | 181 ++++++++++++++++++++++++++++++++++++++++++++-
 indra/newview/llaisapi.h   |  15 +++-
 2 files changed, 194 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 8e20132ede..afc307278c 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -368,6 +368,153 @@ void AISAPI::UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t
     EnqueueAISCommand("UpdateItem", proc);
 }
 
+/*static*/
+void AISAPI::FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callback)
+{
+
+	std::string cap;
+
+	cap = (type == INVENTORY) ? getInvCap() : getLibCap();
+	if (cap.empty())
+	{
+		LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+		return;
+	}
+	std::string url = cap + std::string("/item/") + itemId.asString();
+
+	invokationFn_t patchFn = boost::bind(
+		// Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+		static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+		//----
+		// _1 -> httpAdapter
+		// _2 -> httpRequest
+		// _3 -> url
+		// _4 -> body 
+		// _5 -> httpOptions
+		// _6 -> httpHeaders
+		(&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+	LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+		_1, patchFn, url, itemId, LLSD(), callback, FETCHITEM));
+
+	EnqueueAISCommand("FetchItem", proc);
+}
+
+/*static*/
+void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool recursive, completion_t callback, S32 depth)
+{
+    std::string cap;
+
+    cap = (type == INVENTORY) ? getInvCap() : getLibCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        return;
+    }
+    std::string url = cap + std::string("/category/") + catId.asString() + "/children";
+
+    if (recursive)
+    {
+        url += "?depth=*";
+    }
+    else
+    {
+        url += "?depth=" + std::to_string(depth);
+    }
+
+    invokationFn_t patchFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+        _1, patchFn, url, catId, LLSD(), callback, FETCHCATEGORYCHILDREN));
+
+    EnqueueAISCommand("FetchCategoryChildren", proc);
+}
+
+/*static*/
+void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool recursive, completion_t callback, S32 depth)
+{
+    std::string cap;
+
+    cap = (type == INVENTORY) ? getInvCap() : getLibCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        return;
+    }
+    std::string url = cap + std::string("/category/") + catId.asString() + "/categories";
+
+    if (recursive)
+    {
+        url += "?depth=*";
+    }
+    else
+    {
+        url += "?depth=" + std::to_string(depth);
+    }
+
+    invokationFn_t patchFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+        _1, patchFn, url, catId, LLSD(), callback, FETCHCATEGORYCATEGORIES));
+
+    EnqueueAISCommand("FetchCategoryCategories", proc);
+}
+
+/*static*/
+void AISAPI::FetchCOF(completion_t callback)
+{
+    std::string cap;
+    cap = getInvCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        return;
+    }
+    LLUUID cof_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+
+    std::string url = cap + std::string("/category/") + cof_id.asString() +  "/links";
+    
+    //LLUUID root_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_ROOT_INVENTORY);
+    //std::string url = cap + std::string("/category/") + root_id.asString() +  "/children?depth=*";
+
+    invokationFn_t patchFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+        _1, patchFn, url, cof_id, LLSD(), callback, FETCHCOF));
+
+    EnqueueAISCommand("FetchCOF", proc);
+}
+
 /*static*/
 void AISAPI::EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc)
 {
@@ -427,7 +574,12 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest());
     LLCore::HttpHeaders::ptr_t httpHeaders;
 
-    httpOptions->setTimeout(LLCoreHttpUtil::HTTP_REQUEST_EXPIRY_SECS);
+    /*if (type == FETCHCATEGORYCHILDREN && (url.find("?depth=*") != std::string::npos))
+    {
+        LL_WARNS() << "testy test start"<< LL_ENDL;
+    }*/
+
+    httpOptions->setTimeout(180);
 
     LL_DEBUGS("Inventory") << "url: " << url << LL_ENDL;
 
@@ -475,9 +627,36 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
                 }
             }
         }
+        /*else if (status.getType() == 403)
+        {
+            if (type == FETCHCATEGORYCHILDREN)
+            {
+                if (url.find("?depth=*") != std::string::npos)
+                {
+                    LL_WARNS() << "too much" << LL_ENDL;
+                    AISAPI::FetchCategoryChildren(gInventory.getRootFolderID(), AISAPI::ITEM_TYPE::INVENTORY, false, boost::bind(&LLInventoryModel::fetchDescendentsDepthOne, &gInventory, targetId));
+
+                    if (result["oversize_inventory"].asBoolean() == true)
+                    {
+                        LL_WARNS("Inventory") << "Can't fetch the oversized inventory folder" << LL_ENDL;
+                    }
+                }
+                else
+                {
+                    if (result["oversize_inventory"].asBoolean() == true)
+                    {
+                        LL_WARNS("Inventory") << "Can't fetch the oversized inventory folder" << LL_ENDL;
+                    }
+                }
+            }
+        }*/
         LL_WARNS("Inventory") << "Inventory error: " << status.toString() << LL_ENDL;
         LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;
     }
+    else if (type == FETCHCOF)
+    {
+        //LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;      
+    }
 
 	LL_DEBUGS("Inventory") << result << LL_ENDL;
     gInventory.onAISUpdateReceived("AISCommand", result);
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 6e9cc19baa..b21edb9f33 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -38,6 +38,11 @@
 class AISAPI
 {
 public:
+    typedef enum {
+        INVENTORY,
+        LIBRARY
+    } ITEM_TYPE;
+
     typedef boost::function<void(const LLUUID &invItem)>    completion_t;
 
     static bool isAvailable();
@@ -50,6 +55,10 @@ public:
     static void PurgeDescendents(const LLUUID &categoryId, completion_t callback = completion_t());
     static void UpdateCategory(const LLUUID &categoryId, const LLSD &updates, completion_t callback = completion_t());
     static void UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t callback = completion_t());
+    static void FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callback = completion_t());
+    static void FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchCOF(completion_t callback = completion_t());
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
 private:
@@ -62,7 +71,11 @@ private:
         UPDATECATEGORY,
         UPDATEITEM,
         COPYLIBRARYCATEGORY,
-        CREATEINVENTORY
+        CREATEINVENTORY,
+        FETCHITEM,
+        FETCHCATEGORYCHILDREN,
+        FETCHCATEGORYCATEGORIES,
+        FETCHCOF,
     } COMMAND_TYPE;
 
     static const std::string INVENTORY_CAP_NAME;
-- 
cgit v1.2.3


From ac145cb21f382b8eab9f770cecfa23ea9d58aac6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 14 Mar 2023 23:21:26 +0200
Subject: SL-18629 WIP Fetch Inventory using AIS caps

---
 indra/newview/llaisapi.cpp                        |  42 ++++-
 indra/newview/llaisapi.h                          |   4 +-
 indra/newview/llinventoryfilter.cpp               |   2 +-
 indra/newview/llinventorymodel.cpp                |  13 --
 indra/newview/llinventorymodel.h                  |   3 -
 indra/newview/llinventorymodelbackgroundfetch.cpp | 214 ++++++++++++++++++----
 indra/newview/llinventorymodelbackgroundfetch.h   |  47 ++---
 indra/newview/llstartup.cpp                       |   1 +
 indra/newview/llviewerinventory.cpp               |   2 +-
 9 files changed, 242 insertions(+), 86 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index afc307278c..87811e9c0b 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -33,6 +33,8 @@
 #include "llinventorymodel.h"
 #include "llsdutil.h"
 #include "llviewerregion.h"
+#include "llvoavatar.h"
+#include "llvoavatarself.h"
 #include "llinventoryobserver.h"
 #include "llviewercontrol.h"
 
@@ -409,6 +411,7 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        callback(LLUUID::null);
         return;
     }
     std::string url = cap + std::string("/category/") + catId.asString() + "/children";
@@ -565,6 +568,24 @@ void AISAPI::onIdle(void *userdata)
     }
 }
 
+/*static*/
+void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type)
+{
+    LLTimer timer;
+    if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
+    {
+        dump_sequential_xml(gAgentAvatarp->getFullname() + "_ais_update", update);
+    }
+    bool is_fetch = (type == FETCHITEM)
+        || (type == FETCHCATEGORYCHILDREN)
+        || (type == FETCHCATEGORYCATEGORIES)
+        || (type == FETCHCOF);
+    // parse update llsd into stuff to do or parse received items.
+    AISUpdate ais_update(update, is_fetch);
+    ais_update.doUpdate(); // execute the updates in the appropriate order.
+    LL_INFOS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
+}
+
 /*static*/
 void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter, 
         invokationFn_t invoke, std::string url, 
@@ -659,7 +680,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     }
 
 	LL_DEBUGS("Inventory") << result << LL_ENDL;
-    gInventory.onAISUpdateReceived("AISCommand", result);
+    onUpdateReceived("AISCommand", result, type);
 
     if (callback && !callback.empty())
     {
@@ -708,7 +729,8 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 }
 
 //-------------------------------------------------------------------------
-AISUpdate::AISUpdate(const LLSD& update)
+AISUpdate::AISUpdate(const LLSD& update, bool fetch)
+: mFetch(fetch)
 {
 	parseUpdate(update);
 }
@@ -849,7 +871,7 @@ void AISUpdate::parseItem(const LLSD& item_map)
 	BOOL rv = new_item->unpackMessage(item_map);
 	if (rv)
 	{
-		if (curr_item)
+		if (!mFetch && curr_item)
 		{
 			mItemsUpdated[item_id] = new_item;
 			// This statement is here to cause a new entry with 0
@@ -884,7 +906,7 @@ void AISUpdate::parseLink(const LLSD& link_map)
 	if (rv)
 	{
 		const LLUUID& parent_id = new_link->getParentUUID();
-		if (curr_link)
+		if (!mFetch && curr_link)
 		{
 			mItemsUpdated[item_id] = new_link;
 			// This statement is here to cause a new entry with 0
@@ -951,7 +973,7 @@ void AISUpdate::parseCategory(const LLSD& category_map)
 	//}
 	if (rv)
 	{
-		if (curr_cat)
+		if (curr_cat && !mFetch)
 		{
 			mCategoriesUpdated[category_id] = new_cat;
 			// This statement is here to cause a new entry with 0
@@ -1054,7 +1076,7 @@ void AISUpdate::parseEmbeddedLinks(const LLSD& links)
 	{
 		const LLUUID link_id((*linkit).first);
 		const LLSD& link_map = (*linkit).second;
-		if (mItemIds.end() == mItemIds.find(link_id))
+		if (!mFetch && mItemIds.end() == mItemIds.find(link_id))
 		{
 			LL_DEBUGS("Inventory") << "Ignoring link not in items list " << link_id << LL_ENDL;
 		}
@@ -1070,7 +1092,7 @@ void AISUpdate::parseEmbeddedItem(const LLSD& item)
 	// a single item (_embedded in a link)
 	if (item.has("item_id"))
 	{
-		if (mItemIds.end() != mItemIds.find(item["item_id"].asUUID()))
+		if (mFetch || mItemIds.end() != mItemIds.find(item["item_id"].asUUID()))
 		{
 			parseItem(item);
 		}
@@ -1086,7 +1108,7 @@ void AISUpdate::parseEmbeddedItems(const LLSD& items)
 	{
 		const LLUUID item_id((*itemit).first);
 		const LLSD& item_map = (*itemit).second;
-		if (mItemIds.end() == mItemIds.find(item_id))
+		if (!mFetch && mItemIds.end() == mItemIds.find(item_id))
 		{
 			LL_DEBUGS("Inventory") << "Ignoring item not in items list " << item_id << LL_ENDL;
 		}
@@ -1102,7 +1124,7 @@ void AISUpdate::parseEmbeddedCategory(const LLSD& category)
 	// a single category (_embedded in a link)
 	if (category.has("category_id"))
 	{
-		if (mCategoryIds.end() != mCategoryIds.find(category["category_id"].asUUID()))
+		if (mFetch || mCategoryIds.end() != mCategoryIds.find(category["category_id"].asUUID()))
 		{
 			parseCategory(category);
 		}
@@ -1118,7 +1140,7 @@ void AISUpdate::parseEmbeddedCategories(const LLSD& categories)
 	{
 		const LLUUID category_id((*categoryit).first);
 		const LLSD& category_map = (*categoryit).second;
-		if (mCategoryIds.end() == mCategoryIds.find(category_id))
+		if (!mFetch && mCategoryIds.end() == mCategoryIds.find(category_id))
 		{
 			LL_DEBUGS("Inventory") << "Ignoring category not in categories list " << category_id << LL_ENDL;
 		}
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index b21edb9f33..3de3366a0e 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -86,6 +86,7 @@ private:
 
     static void EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc);
     static void onIdle(void *userdata); // launches postponed AIS commands
+    static void onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type);
 
     static std::string getInvCap();
     static std::string getLibCap();
@@ -101,7 +102,7 @@ private:
 class AISUpdate
 {
 public:
-	AISUpdate(const LLSD& update);
+	AISUpdate(const LLSD& update, bool fetch);
 	void parseUpdate(const LLSD& update);
 	void parseMeta(const LLSD& update);
 	void parseContent(const LLSD& update);
@@ -137,6 +138,7 @@ private:
 	uuid_list_t mObjectsDeletedIds;
 	uuid_list_t mItemIds;
 	uuid_list_t mCategoryIds;
+    bool mFetch;
 };
 
 #endif
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index d6110b3cd5..6e09161473 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -202,7 +202,7 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
         {
             // At the moment background fetch only cares about VERSION_UNKNOWN,
             // so do not check isCategoryComplete that compares descendant count
-            LLInventoryModelBackgroundFetch::instance().start(folder_id);
+            LLInventoryModelBackgroundFetch::instance().start(folder_id, false);
         }
 	}
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index ee0dd2422a..65690228e7 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1754,19 +1754,6 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat,
 	notifyObservers();
 }
 
-void LLInventoryModel::onAISUpdateReceived(const std::string& context, const LLSD& update)
-{
-	LLTimer timer;
-	if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
-	{
-		dump_sequential_xml(gAgentAvatarp->getFullname() + "_ais_update", update);
-	}
-
-	AISUpdate ais_update(update); // parse update llsd into stuff to do.
-	ais_update.doUpdate(); // execute the updates in the appropriate order.
-	LL_INFOS(LOG_INV) << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
-}
-
 // Does not appear to be used currently.
 void LLInventoryModel::onItemUpdated(const LLUUID& item_id, const LLSD& updates, bool update_parent_version)
 {
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 3fbf8924b5..5e4319bb12 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -411,9 +411,6 @@ public:
 	// Delete
 	//--------------------------------------------------------------------
 public:
-
-	// Update model after an AISv3 update received for any operation.
-	void onAISUpdateReceived(const std::string& context, const LLSD& update);
 		
 	// Update model after an item is confirmed as removed from
 	// server. Works for categories or items.
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 406c8b89d0..1905a9c9a4 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -27,6 +27,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llinventorymodelbackgroundfetch.h"
 
+#include "llaisapi.h"
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llcallbacklist.h"
@@ -184,12 +185,12 @@ const char * const LOG_INV("Inventory");
 ///----------------------------------------------------------------------------
 
 LLInventoryModelBackgroundFetch::LLInventoryModelBackgroundFetch():
-	mBackgroundFetchActive(FALSE),
+	mBackgroundFetchActive(false),
 	mFolderFetchActive(false),
 	mFetchCount(0),
-	mAllFoldersFetched(FALSE),
-	mRecursiveInventoryFetchStarted(FALSE),
-	mRecursiveLibraryFetchStarted(FALSE),
+	mAllFoldersFetched(false),
+	mRecursiveInventoryFetchStarted(false),
+	mRecursiveLibraryFetchStarted(false),
 	mMinTimeBetweenFetches(0.3f)
 {}
 
@@ -241,17 +242,17 @@ BOOL LLInventoryModelBackgroundFetch::folderFetchActive() const
 	return mFolderFetchActive;
 }
 
-void LLInventoryModelBackgroundFetch::addRequestAtFront(const LLUUID & id, BOOL recursive, bool is_category)
+void LLInventoryModelBackgroundFetch::addRequestAtFront(const LLUUID & id, bool recursive, bool is_category)
 {
 	mFetchQueue.push_front(FetchQueueInfo(id, recursive, is_category));
 }
 
-void LLInventoryModelBackgroundFetch::addRequestAtBack(const LLUUID & id, BOOL recursive, bool is_category)
+void LLInventoryModelBackgroundFetch::addRequestAtBack(const LLUUID & id, bool recursive, bool is_category)
 {
 	mFetchQueue.push_back(FetchQueueInfo(id, recursive, is_category));
 }
 
-void LLInventoryModelBackgroundFetch::start(const LLUUID& id, BOOL recursive)
+void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 {
 	LLViewerInventoryCategory * cat(gInventory.getCategory(id));
 
@@ -260,31 +261,57 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, BOOL recursive)
 		// it's a folder, do a bulk fetch
 		LL_DEBUGS(LOG_INV) << "Start fetching category: " << id << ", recursive: " << recursive << LL_ENDL;
 
-		mBackgroundFetchActive = TRUE;
+		mBackgroundFetchActive = true;
 		mFolderFetchActive = true;
 		if (id.isNull())
 		{
 			if (! mRecursiveInventoryFetchStarted)
 			{
 				mRecursiveInventoryFetchStarted |= recursive;
-				mFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursive));
+                if (recursive && AISAPI::isAvailable())
+                {
+                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursive));
+                }
+                else
+                {
+                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursive));
+                }
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
 			if (! mRecursiveLibraryFetchStarted)
 			{
 				mRecursiveLibraryFetchStarted |= recursive;
-				mFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursive));
+                if (recursive && AISAPI::isAvailable())
+                {
+                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursive));
+                }
+                else
+                {
+                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursive));
+                }
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
 		}
 		else
 		{
-			// Specific folder requests go to front of queue.
-			if (mFetchQueue.empty() || mFetchQueue.front().mUUID != id)
-			{
-				mFetchQueue.push_front(FetchQueueInfo(id, recursive));
-				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
-			}
+            if (recursive && AISAPI::isAvailable())
+            {
+                // AIS does depth requests, recursive requests will need to be prioritizes
+                if (mRecursiveFetchQueue.empty() || mRecursiveFetchQueue.back().mUUID != id)
+                {
+                    mRecursiveFetchQueue.push_back(FetchQueueInfo(id, recursive));
+                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+                }
+            }
+            else
+            {
+                // Specific folder requests go to front of queue.
+                if (mFetchQueue.empty() || mFetchQueue.front().mUUID != id)
+                {
+                    mFetchQueue.push_front(FetchQueueInfo(id, recursive));
+                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+                }
+            }
 			if (id == gInventory.getLibraryRootFolderID())
 			{
 				mRecursiveLibraryFetchStarted |= recursive;
@@ -299,7 +326,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, BOOL recursive)
 	{
 		if (! itemp->mIsComplete && (mFetchQueue.empty() || mFetchQueue.front().mUUID != id))
 		{
-			mBackgroundFetchActive = TRUE;
+			mBackgroundFetchActive = true;
 
 			mFetchQueue.push_front(FetchQueueInfo(id, false, false));
 			gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
@@ -309,9 +336,9 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, BOOL recursive)
 
 void LLInventoryModelBackgroundFetch::findLostItems()
 {
-	mBackgroundFetchActive = TRUE;
+	mBackgroundFetchActive = true;
 	mFolderFetchActive = true;
-    mFetchQueue.push_back(FetchQueueInfo(LLUUID::null, TRUE));
+    mFetchQueue.push_back(FetchQueueInfo(LLUUID::null, true));
     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 }
 
@@ -320,7 +347,7 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 	if (mRecursiveInventoryFetchStarted &&
 		mRecursiveLibraryFetchStarted)
 	{
-		mAllFoldersFetched = TRUE;
+		mAllFoldersFetched = true;
 		//LL_INFOS(LOG_INV) << "All folders fetched, validating" << LL_ENDL;
 		//gInventory.validate();
 	}
@@ -338,8 +365,15 @@ void LLInventoryModelBackgroundFetch::backgroundFetch()
 {
 	if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
 	{
-		// If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
-		bulkFetch();
+        if (AISAPI::isAvailable())
+        {
+            bulkFetchViaAis();
+        }
+        else
+        {
+            // If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
+            bulkFetch();
+        }
 	}
 }
 
@@ -352,9 +386,118 @@ void LLInventoryModelBackgroundFetch::incrFetchCount(S32 fetching)
 		mFetchCount = 0; 
 	}
 }
+void ais_callback(const LLUUID& inv_id)
+{
+    LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
+}
 
 static LLTrace::BlockTimerStatHandle FTM_BULK_FETCH("Bulk Fetch");
 
+void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
+{
+    LL_RECORD_BLOCK_TIME(FTM_BULK_FETCH);
+    //Background fetch is called from gIdleCallbacks in a loop until background fetch is stopped.
+    if (gDisconnected)
+    {
+        return;
+    }
+
+    static const S32 max_concurrent_fetches(12);
+
+    if (mFetchCount >= max_concurrent_fetches)
+    {
+        return;
+    }
+
+    // Start with recursive queue since it can get multiple categories
+    // in a single request and might contain what other requests want
+    while (!mRecursiveFetchQueue.empty() && mFetchCount < max_concurrent_fetches)
+    {
+        const FetchQueueInfo & fetch_info(mRecursiveFetchQueue.front());
+        bulkFetchViaAis(fetch_info);
+        mRecursiveFetchQueue.pop_front();
+    }
+
+    while (!mFetchQueue.empty() && mFetchCount < max_concurrent_fetches)
+    {
+        const FetchQueueInfo & fetch_info(mFetchQueue.front());
+        bulkFetchViaAis(fetch_info);
+        mFetchQueue.pop_front();
+    }
+    
+    if (isBulkFetchProcessingComplete())
+    {
+        setAllFoldersFetched();
+    }
+}
+
+void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetch_info)
+{
+    if (fetch_info.mIsCategory)
+    {
+        const LLUUID & cat_id(fetch_info.mUUID);
+        if (cat_id.isNull()) // Lost and found
+        {
+            AISAPI::FetchCategoryChildren(LLUUID::null, AISAPI::INVENTORY, false, ais_callback);
+            mFetchCount++;
+        }
+        else
+        {
+            const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
+
+            if (cat)
+            {
+                if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
+                {
+                    if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
+                    {
+                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mRecursive, ais_callback);
+                    }
+                    else
+                    {
+                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::INVENTORY, fetch_info.mRecursive, ais_callback);
+                    }
+                    mFetchCount++;
+                }
+                else
+                {
+                    // Already fetched, check if anything inside needs fetching
+                    if (fetch_info.mRecursive)
+                    {
+                        LLInventoryModel::cat_array_t * categories(NULL);
+                        LLInventoryModel::item_array_t * items(NULL);
+                        gInventory.getDirectDescendentsOf(cat->getUUID(), categories, items);
+                        for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
+                            it != categories->end();
+                            ++it)
+                        {
+                            mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                        }
+                    }
+                }
+            }
+            // else???
+        }
+    }
+    else
+    {
+        LLViewerInventoryItem * itemp(gInventory.getItem(fetch_info.mUUID));
+
+        if (itemp)
+        {
+            if (itemp->getPermissions().getOwner() == gAgent.getID())
+            {
+                AISAPI::FetchItem(itemp->getUUID(), AISAPI::INVENTORY, ais_callback);
+            }
+            else
+            {
+                AISAPI::FetchItem(itemp->getUUID(), AISAPI::LIBRARY, ais_callback);
+            }
+            mFetchCount++;
+        }
+    }
+}
+
 // Bundle up a bunch of requests to send all at once.
 void LLInventoryModelBackgroundFetch::bulkFetch()
 {
@@ -374,13 +517,6 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 	// inventory more quickly.
 	static const U32 max_batch_size(10);
 	static const S32 max_concurrent_fetches(12);		// Outstanding requests, not connections
-	static const F32 new_min_time(0.05f);		// *HACK:  Clean this up when old code goes away entirely.
-	
-	mMinTimeBetweenFetches = new_min_time;
-	if (mMinTimeBetweenFetches < new_min_time) 
-	{
-		mMinTimeBetweenFetches = new_min_time;  // *HACK:  See above.
-	}
 
 	if (mFetchCount)
 	{
@@ -394,8 +530,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 		gInventory.notifyObservers();
 	}
 	
-	if ((mFetchCount > max_concurrent_fetches) ||
-		(mFetchTimer.getElapsedTimeF32() < mMinTimeBetweenFetches))
+	if (mFetchCount > max_concurrent_fetches)
 	{
 		return;
 	}
@@ -414,6 +549,13 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 	LLSD item_request_body;
 	LLSD item_request_body_lib;
 
+    if (!mRecursiveFetchQueue.empty())
+    {
+        LL_DEBUGS(LOG_INV) << "Request was sheduled for AIS, using legacy" << LL_ENDL;
+        mFetchQueue.insert(mFetchQueue.begin(), mRecursiveFetchQueue.begin(), mRecursiveFetchQueue.end());
+        mRecursiveFetchQueue.clear();
+    }
+
 	while (! mFetchQueue.empty() 
 			&& (item_count + folder_count) < max_batch_size)
 	{
@@ -421,14 +563,14 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 		if (fetch_info.mIsCategory)
 		{
 			const LLUUID & cat_id(fetch_info.mUUID);
-			if (cat_id.isNull()) //DEV-17797
+			if (cat_id.isNull()) //DEV-17797 Lost and found
 			{
 				LLSD folder_sd;
 				folder_sd["folder_id"]		= LLUUID::null.asString();
 				folder_sd["owner_id"]		= gAgent.getID();
 				folder_sd["sort_order"]		= LLSD::Integer(sort_order);
-				folder_sd["fetch_folders"]	= LLSD::Boolean(FALSE);
-				folder_sd["fetch_items"]	= LLSD::Boolean(TRUE);
+				folder_sd["fetch_folders"]	= LLSD::Boolean(false);
+				folder_sd["fetch_items"]	= LLSD::Boolean(true);
 				folder_request_body["folders"].append(folder_sd);
 				folder_count++;
 			}
@@ -444,8 +586,8 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 						folder_sd["folder_id"]		= cat->getUUID();
 						folder_sd["owner_id"]		= cat->getOwnerID();
 						folder_sd["sort_order"]		= LLSD::Integer(sort_order);
-						folder_sd["fetch_folders"]	= LLSD::Boolean(TRUE); //(LLSD::Boolean)sFullFetchStarted;
-						folder_sd["fetch_items"]	= LLSD::Boolean(TRUE);
+						folder_sd["fetch_folders"]	= LLSD::Boolean(true); //(LLSD::Boolean)sFullFetchStarted;
+						folder_sd["fetch_items"]	= LLSD::Boolean(true);
 				    
 						if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
 						{
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 00d2908c1b..ac1c42e0d7 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -49,7 +49,7 @@ public:
 
 	// Start and stop background breadth-first fetching of inventory contents.
 	// This gets triggered when performing a filter-search.
-	void start(const LLUUID& cat_id = LLUUID::null, BOOL recursive = TRUE);
+	void start(const LLUUID& cat_id = LLUUID::null, bool recursive = true);
 
 	BOOL folderFetchActive() const;
 	bool isEverythingFetched() const; // completing the fetch once per session should be sufficient
@@ -68,10 +68,27 @@ public:
 	bool isBulkFetchProcessingComplete() const;
 	void setAllFoldersFetched();
 
-	void addRequestAtFront(const LLUUID & id, BOOL recursive, bool is_category);
-	void addRequestAtBack(const LLUUID & id, BOOL recursive, bool is_category);
+	void addRequestAtFront(const LLUUID & id, bool recursive, bool is_category);
+	void addRequestAtBack(const LLUUID & id, bool recursive, bool is_category);
 
 protected:
+
+    struct FetchQueueInfo
+    {
+        FetchQueueInfo(const LLUUID& id, bool recursive, bool is_category = true)
+            : mUUID(id),
+            mIsCategory(is_category),
+            mRecursive(recursive)
+        {}
+
+        LLUUID mUUID;
+        bool mIsCategory;
+        bool mRecursive;
+    };
+    typedef std::deque<FetchQueueInfo> fetch_queue_t;
+
+    void bulkFetchViaAis();
+    void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
 	void bulkFetch();
 
 	void backgroundFetch();
@@ -80,31 +97,19 @@ protected:
 	bool fetchQueueContainsNoDescendentsOf(const LLUUID& cat_id) const;
 
 private:
- 	BOOL mRecursiveInventoryFetchStarted;
-	BOOL mRecursiveLibraryFetchStarted;
-	BOOL mAllFoldersFetched;
+ 	bool mRecursiveInventoryFetchStarted;
+	bool mRecursiveLibraryFetchStarted;
+	bool mAllFoldersFetched;
 
-	BOOL mBackgroundFetchActive;
+    bool mBackgroundFetchActive;
 	bool mFolderFetchActive;
 	S32 mFetchCount;
 
 	LLFrameTimer mFetchTimer;
 	F32 mMinTimeBetweenFetches;
-
-	struct FetchQueueInfo
-	{
-		FetchQueueInfo(const LLUUID& id, BOOL recursive, bool is_category = true)
-			: mUUID(id),
-			  mIsCategory(is_category),
-			  mRecursive(recursive)
-		{}
-		
-		LLUUID mUUID;
-		bool mIsCategory;
-		BOOL mRecursive;
-	};
-	typedef std::deque<FetchQueueInfo> fetch_queue_t;
 	fetch_queue_t mFetchQueue;
+    fetch_queue_t mRecursiveFetchQueue;
+
 };
 
 #endif // LL_LLINVENTORYMODELBACKGROUNDFETCH_H
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 776b9f8279..842192a62b 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1897,6 +1897,7 @@ bool idle_startup()
 			LLNotificationsUtil::add("InventoryUnusable");
 		}
 		
+        LLInventoryModelBackgroundFetch::instance().start();
 		gInventory.createCommonSystemCategories();
 
 		// It's debatable whether this flag is a good idea - sets all
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6f7c5d96f5..61123e65d7 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -667,7 +667,7 @@ bool LLViewerInventoryCategory::fetch()
 		{
 			LL_WARNS(LOG_INV) << "agent region is null" << LL_ENDL;
 		}
-		if (!url.empty()) //Capability found.  Build up LLSD and use it.
+		if (!url.empty() || AISAPI::isAvailable())
 		{
 			LLInventoryModelBackgroundFetch::instance().start(mUUID, false);			
 		}
-- 
cgit v1.2.3


From 83811ff846d9c046e694708c209a6d4dc0bb45a3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Mar 2023 03:29:03 +0200
Subject: SL-18629 WIP Fetch Inventory using AIS caps #2

---
 indra/newview/llaisapi.cpp                        | 113 +++++++--------
 indra/newview/llaisapi.h                          |   1 -
 indra/newview/llinventorymodelbackgroundfetch.cpp | 164 ++++++++++++++--------
 indra/newview/llinventorymodelbackgroundfetch.h   |  10 +-
 4 files changed, 164 insertions(+), 124 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 87811e9c0b..23bb123dee 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -483,41 +483,6 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
     EnqueueAISCommand("FetchCategoryCategories", proc);
 }
 
-/*static*/
-void AISAPI::FetchCOF(completion_t callback)
-{
-    std::string cap;
-    cap = getInvCap();
-    if (cap.empty())
-    {
-        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
-        return;
-    }
-    LLUUID cof_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
-
-    std::string url = cap + std::string("/category/") + cof_id.asString() +  "/links";
-    
-    //LLUUID root_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_ROOT_INVENTORY);
-    //std::string url = cap + std::string("/category/") + root_id.asString() +  "/children?depth=*";
-
-    invokationFn_t patchFn = boost::bind(
-        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
-        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
-        //----
-        // _1 -> httpAdapter
-        // _2 -> httpRequest
-        // _3 -> url
-        // _4 -> body 
-        // _5 -> httpOptions
-        // _6 -> httpHeaders
-        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
-
-    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
-        _1, patchFn, url, cof_id, LLSD(), callback, FETCHCOF));
-
-    EnqueueAISCommand("FetchCOF", proc);
-}
-
 /*static*/
 void AISAPI::EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc)
 {
@@ -578,8 +543,7 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
     }
     bool is_fetch = (type == FETCHITEM)
         || (type == FETCHCATEGORYCHILDREN)
-        || (type == FETCHCATEGORYCATEGORIES)
-        || (type == FETCHCOF);
+        || (type == FETCHCATEGORYCATEGORIES);
     // parse update llsd into stuff to do or parse received items.
     AISUpdate ais_update(update, is_fetch);
     ais_update.doUpdate(); // execute the updates in the appropriate order.
@@ -648,36 +612,16 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
                 }
             }
         }
-        /*else if (status.getType() == 403)
+        else if (status.getType() == 403)
         {
             if (type == FETCHCATEGORYCHILDREN)
             {
-                if (url.find("?depth=*") != std::string::npos)
-                {
-                    LL_WARNS() << "too much" << LL_ENDL;
-                    AISAPI::FetchCategoryChildren(gInventory.getRootFolderID(), AISAPI::ITEM_TYPE::INVENTORY, false, boost::bind(&LLInventoryModel::fetchDescendentsDepthOne, &gInventory, targetId));
-
-                    if (result["oversize_inventory"].asBoolean() == true)
-                    {
-                        LL_WARNS("Inventory") << "Can't fetch the oversized inventory folder" << LL_ENDL;
-                    }
-                }
-                else
-                {
-                    if (result["oversize_inventory"].asBoolean() == true)
-                    {
-                        LL_WARNS("Inventory") << "Can't fetch the oversized inventory folder" << LL_ENDL;
-                    }
-                }
+                LL_DEBUGS("Inventory") << "Fetch failed, content is over imit" << LL_ENDL;
             }
-        }*/
+        }
         LL_WARNS("Inventory") << "Inventory error: " << status.toString() << LL_ENDL;
         LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;
     }
-    else if (type == FETCHCOF)
-    {
-        //LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;      
-    }
 
 	LL_DEBUGS("Inventory") << result << LL_ENDL;
     onUpdateReceived("AISCommand", result, type);
@@ -687,7 +631,10 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         bool needs_callback = true;
         LLUUID id(LLUUID::null);
 
-        if (type == COPYLIBRARYCATEGORY && result.has("category_id"))
+        if ( ( (type == COPYLIBRARYCATEGORY)
+               || (type == FETCHCATEGORYCATEGORIES)
+               || (type == FETCHCATEGORYCHILDREN))
+             && result.has("category_id"))
         {
             id = result["category_id"];
 	    }
@@ -871,7 +818,12 @@ void AISUpdate::parseItem(const LLSD& item_map)
 	BOOL rv = new_item->unpackMessage(item_map);
 	if (rv)
 	{
-		if (!mFetch && curr_item)
+        if (mFetch)
+        {
+            mItemsCreated[item_id] = new_item;
+            mCatDescendentDeltas[new_item->getParentUUID()];
+        }
+        else if (curr_item)
 		{
 			mItemsUpdated[item_id] = new_item;
 			// This statement is here to cause a new entry with 0
@@ -906,7 +858,19 @@ void AISUpdate::parseLink(const LLSD& link_map)
 	if (rv)
 	{
 		const LLUUID& parent_id = new_link->getParentUUID();
-		if (!mFetch && curr_link)
+        if (mFetch)
+        {
+            LLPermissions default_perms;
+            default_perms.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+            default_perms.initMasks(PERM_NONE, PERM_NONE, PERM_NONE, PERM_NONE, PERM_NONE);
+            new_link->setPermissions(default_perms);
+            LLSaleInfo default_sale_info;
+            new_link->setSaleInfo(default_sale_info);
+            //LL_DEBUGS("Inventory") << "creating link from llsd: " << ll_pretty_print_sd(link_map) << LL_ENDL;
+            mItemsCreated[item_id] = new_link;
+            mCatDescendentDeltas[parent_id];
+        }
+		else if (curr_link)
 		{
 			mItemsUpdated[item_id] = new_link;
 			// This statement is here to cause a new entry with 0
@@ -973,7 +937,28 @@ void AISUpdate::parseCategory(const LLSD& category_map)
 	//}
 	if (rv)
 	{
-		if (curr_cat && !mFetch)
+        if (mFetch)
+        {
+            // Set version/descendents for newly created categories.
+            if (category_map.has("version"))
+            {
+                S32 version = category_map["version"].asInteger();
+                LL_DEBUGS("Inventory") << "Setting version to " << version
+                    << " for new category " << category_id << LL_ENDL;
+                new_cat->setVersion(version);
+            }
+            uuid_int_map_t::const_iterator lookup_it = mCatDescendentsKnown.find(category_id);
+            if (mCatDescendentsKnown.end() != lookup_it)
+            {
+                S32 descendent_count = lookup_it->second;
+                LL_DEBUGS("Inventory") << "Setting descendents count to " << descendent_count
+                    << " for new category " << category_id << LL_ENDL;
+                new_cat->setDescendentCount(descendent_count);
+            }
+            mCategoriesCreated[category_id] = new_cat;
+            mCatDescendentDeltas[new_cat->getParentUUID()];
+        }
+		else if (curr_cat)
 		{
 			mCategoriesUpdated[category_id] = new_cat;
 			// This statement is here to cause a new entry with 0
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 3de3366a0e..58f6a17650 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -75,7 +75,6 @@ private:
         FETCHITEM,
         FETCHCATEGORYCHILDREN,
         FETCHCATEGORYCATEGORIES,
-        FETCHCOF,
     } COMMAND_TYPE;
 
     static const std::string INVENTORY_CAP_NAME;
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 1905a9c9a4..5ea8fe4cba 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -244,12 +244,14 @@ BOOL LLInventoryModelBackgroundFetch::folderFetchActive() const
 
 void LLInventoryModelBackgroundFetch::addRequestAtFront(const LLUUID & id, bool recursive, bool is_category)
 {
-	mFetchQueue.push_front(FetchQueueInfo(id, recursive, is_category));
+    ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
+	mFetchQueue.push_front(FetchQueueInfo(id, recursion_type, is_category));
 }
 
 void LLInventoryModelBackgroundFetch::addRequestAtBack(const LLUUID & id, bool recursive, bool is_category)
 {
-	mFetchQueue.push_back(FetchQueueInfo(id, recursive, is_category));
+    ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
+	mFetchQueue.push_back(FetchQueueInfo(id, recursion_type, is_category));
 }
 
 void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
@@ -263,6 +265,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 
 		mBackgroundFetchActive = true;
 		mFolderFetchActive = true;
+        ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
 		if (id.isNull())
 		{
 			if (! mRecursiveInventoryFetchStarted)
@@ -270,11 +273,14 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 				mRecursiveInventoryFetchStarted |= recursive;
                 if (recursive && AISAPI::isAvailable())
                 {
-                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursive));
+                    // Not only root folder can be massive, but
+                    // most system folders will be requested independently
+                    // so request root folder and content separately
+                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), RT_CONTENT));
                 }
                 else
                 {
-                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursive));
+                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursion_type));
                 }
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
@@ -283,11 +289,11 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 				mRecursiveLibraryFetchStarted |= recursive;
                 if (recursive && AISAPI::isAvailable())
                 {
-                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursive));
+                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursion_type));
                 }
                 else
                 {
-                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursive));
+                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursion_type));
                 }
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
@@ -299,7 +305,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
                 // AIS does depth requests, recursive requests will need to be prioritizes
                 if (mRecursiveFetchQueue.empty() || mRecursiveFetchQueue.back().mUUID != id)
                 {
-                    mRecursiveFetchQueue.push_back(FetchQueueInfo(id, recursive));
+                    mRecursiveFetchQueue.push_back(FetchQueueInfo(id, recursion_type));
                     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
                 }
             }
@@ -308,7 +314,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
                 // Specific folder requests go to front of queue.
                 if (mFetchQueue.empty() || mFetchQueue.front().mUUID != id)
                 {
-                    mFetchQueue.push_front(FetchQueueInfo(id, recursive));
+                    mFetchQueue.push_front(FetchQueueInfo(id, recursion_type));
                     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
                 }
             }
@@ -328,7 +334,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 		{
 			mBackgroundFetchActive = true;
 
-			mFetchQueue.push_front(FetchQueueInfo(id, false, false));
+			mFetchQueue.push_front(FetchQueueInfo(id, RT_NONE, false));
 			gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 		}
 	}
@@ -338,7 +344,7 @@ void LLInventoryModelBackgroundFetch::findLostItems()
 {
 	mBackgroundFetchActive = true;
 	mFolderFetchActive = true;
-    mFetchQueue.push_back(FetchQueueInfo(LLUUID::null, true));
+    mFetchQueue.push_back(FetchQueueInfo(LLUUID::null, RT_RECURSIVE));
     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 }
 
@@ -386,11 +392,45 @@ void LLInventoryModelBackgroundFetch::incrFetchCount(S32 fetching)
 		mFetchCount = 0; 
 	}
 }
-void ais_callback(const LLUUID& inv_id)
+
+void ais_simple_callback(const LLUUID& inv_id)
 {
     LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
 }
 
+void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion)
+{
+    incrFetchCount(-1);
+    if (response_id.isNull()) // Failure
+    {
+        if (recursion == RT_RECURSIVE)
+        {
+            // A full recursive request failed.
+            // Try requesting folder and nested content separately
+            mBackgroundFetchActive = true;
+            mFolderFetchActive = true;
+            mRecursiveFetchQueue.push_back(FetchQueueInfo(request_id, RT_CONTENT));
+            gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+        }
+    }
+    else
+    {
+        if (recursion == RT_CONTENT)
+        {
+            // Got the folder, now recursively request content
+            LLInventoryModel::cat_array_t * categories(NULL);
+            LLInventoryModel::item_array_t * items(NULL);
+            gInventory.getDirectDescendentsOf(request_id, categories, items);
+            for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
+                it != categories->end();
+                ++it)
+            {
+                mRecursiveFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
+            }
+        }
+    }
+}
+
 static LLTrace::BlockTimerStatHandle FTM_BULK_FETCH("Bulk Fetch");
 
 void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
@@ -438,45 +478,54 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         const LLUUID & cat_id(fetch_info.mUUID);
         if (cat_id.isNull()) // Lost and found
         {
-            AISAPI::FetchCategoryChildren(LLUUID::null, AISAPI::INVENTORY, false, ais_callback);
+            AISAPI::FetchCategoryChildren(LLUUID::null, AISAPI::INVENTORY, false, ais_simple_callback);
             mFetchCount++;
         }
         else
         {
-            const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
 
-            if (cat)
+            if (!gInventory.isCategoryComplete(cat_id))
             {
-                if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
+                const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
+                if (cat)
                 {
                     if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
                     {
-                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mRecursive, ais_callback);
+                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mRecursive == RT_RECURSIVE, ais_simple_callback);
                     }
                     else
                     {
-                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::INVENTORY, fetch_info.mRecursive, ais_callback);
+                        LLUUID cat_id = cat->getUUID();
+                        ERecursionType type = fetch_info.mRecursive;
+                        AISAPI::FetchCategoryChildren(
+                            cat_id,
+                            AISAPI::INVENTORY,
+                            type == RT_RECURSIVE,
+                            [cat_id, type](const LLUUID &response_id)
+                        {
+                            LLInventoryModelBackgroundFetch::instance().onAISCalback(cat_id, response_id, type);
+                        });
                     }
                     mFetchCount++;
                 }
-                else
+                // else?
+            }
+            else
+            {
+                // Already fetched, check if anything inside needs fetching
+                if (fetch_info.mRecursive)
                 {
-                    // Already fetched, check if anything inside needs fetching
-                    if (fetch_info.mRecursive)
+                    LLInventoryModel::cat_array_t * categories(NULL);
+                    LLInventoryModel::item_array_t * items(NULL);
+                    gInventory.getDirectDescendentsOf(cat_id, categories, items);
+                    for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
+                        it != categories->end();
+                        ++it)
                     {
-                        LLInventoryModel::cat_array_t * categories(NULL);
-                        LLInventoryModel::item_array_t * items(NULL);
-                        gInventory.getDirectDescendentsOf(cat->getUUID(), categories, items);
-                        for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
-                            it != categories->end();
-                            ++it)
-                        {
-                            mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
-                        }
+                        mRecursiveFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
                     }
                 }
             }
-            // else???
         }
     }
     else
@@ -487,11 +536,11 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         {
             if (itemp->getPermissions().getOwner() == gAgent.getID())
             {
-                AISAPI::FetchItem(itemp->getUUID(), AISAPI::INVENTORY, ais_callback);
+                AISAPI::FetchItem(itemp->getUUID(), AISAPI::INVENTORY, ais_simple_callback);
             }
             else
             {
-                AISAPI::FetchItem(itemp->getUUID(), AISAPI::LIBRARY, ais_callback);
+                AISAPI::FetchItem(itemp->getUUID(), AISAPI::LIBRARY, ais_simple_callback);
             }
             mFetchCount++;
         }
@@ -576,36 +625,37 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 			}
 			else
 			{
-				const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
-		
-				if (cat)
-				{
-					if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
-					{
-						LLSD folder_sd;
-						folder_sd["folder_id"]		= cat->getUUID();
-						folder_sd["owner_id"]		= cat->getOwnerID();
-						folder_sd["sort_order"]		= LLSD::Integer(sort_order);
-						folder_sd["fetch_folders"]	= LLSD::Boolean(true); //(LLSD::Boolean)sFullFetchStarted;
-						folder_sd["fetch_items"]	= LLSD::Boolean(true);
-				    
-						if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
-						{
-							folder_request_body_lib["folders"].append(folder_sd);
-						}
-						else
-						{
-							folder_request_body["folders"].append(folder_sd);
-						}
-						folder_count++;
-					}
-
+                if (!gInventory.isCategoryComplete(cat_id))
+                {
+                    const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
+                    if (cat)
+                    {
+                        LLSD folder_sd;
+                        folder_sd["folder_id"] = cat->getUUID();
+                        folder_sd["owner_id"] = cat->getOwnerID();
+                        folder_sd["sort_order"] = LLSD::Integer(sort_order);
+                        folder_sd["fetch_folders"] = LLSD::Boolean(true); //(LLSD::Boolean)sFullFetchStarted;
+                        folder_sd["fetch_items"] = LLSD::Boolean(true);
+
+                        if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
+                        {
+                            folder_request_body_lib["folders"].append(folder_sd);
+                        }
+                        else
+                        {
+                            folder_request_body["folders"].append(folder_sd);
+                        }
+                        folder_count++;
+                    }
+                }
+                else
+                {
 					// May already have this folder, but append child folders to list.
 					if (fetch_info.mRecursive)
 					{	
 						LLInventoryModel::cat_array_t * categories(NULL);
 						LLInventoryModel::item_array_t * items(NULL);
-						gInventory.getDirectDescendentsOf(cat->getUUID(), categories, items);
+						gInventory.getDirectDescendentsOf(cat_id, categories, items);
 						for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
 							 it != categories->end();
 							 ++it)
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index ac1c42e0d7..4c4de6ac7c 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -73,9 +73,14 @@ public:
 
 protected:
 
+    typedef enum {
+        RT_NONE = 0,
+        RT_CONTENT, // request content recursively
+        RT_RECURSIVE, // request everything recursively
+    } ERecursionType;
     struct FetchQueueInfo
     {
-        FetchQueueInfo(const LLUUID& id, bool recursive, bool is_category = true)
+        FetchQueueInfo(const LLUUID& id, ERecursionType recursive, bool is_category = true)
             : mUUID(id),
             mIsCategory(is_category),
             mRecursive(recursive)
@@ -83,10 +88,11 @@ protected:
 
         LLUUID mUUID;
         bool mIsCategory;
-        bool mRecursive;
+        ERecursionType mRecursive;
     };
     typedef std::deque<FetchQueueInfo> fetch_queue_t;
 
+    void onAISCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion);
     void bulkFetchViaAis();
     void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
 	void bulkFetch();
-- 
cgit v1.2.3


From 7a70d93c437a7065b0c0be7fa63d36f511a9cef2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Mar 2023 20:03:53 +0200
Subject: SL-18629 Fetch Inventory using AIS caps #3

---
 indra/newview/llaisapi.cpp                        | 28 ++++++++++---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 50 ++++++++---------------
 indra/newview/llinventorymodelbackgroundfetch.h   |  1 -
 3 files changed, 39 insertions(+), 40 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 23bb123dee..bb963d77c9 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -901,7 +901,25 @@ void AISUpdate::parseLink(const LLSD& link_map)
 
 void AISUpdate::parseCategory(const LLSD& category_map)
 {
-	LLUUID category_id = category_map["category_id"].asUUID();
+    LLUUID category_id = category_map["category_id"].asUUID();
+    S32 version = LLViewerInventoryCategory::VERSION_UNKNOWN;
+
+    if (category_map.has("version"))
+    {
+        version = category_map["version"].asInteger();
+    }
+
+    LLViewerInventoryCategory *curr_cat = gInventory.getCategory(category_id);
+
+    if (curr_cat
+        && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN
+        && version > LLViewerInventoryCategory::VERSION_UNKNOWN
+        && version < curr_cat->getVersion())
+    {
+        LL_WARNS() << "Got stale folder, known: " << curr_cat->getVersion()
+            << ", received: " << version << LL_ENDL;
+        return;
+    }
 
 	// Check descendent count first, as it may be needed
 	// to populate newly created categories
@@ -911,7 +929,6 @@ void AISUpdate::parseCategory(const LLSD& category_map)
 	}
 
 	LLPointer<LLViewerInventoryCategory> new_cat;
-	LLViewerInventoryCategory *curr_cat = gInventory.getCategory(category_id);
 	if (curr_cat)
 	{
 		// Default to current values where not provided.
@@ -940,11 +957,10 @@ void AISUpdate::parseCategory(const LLSD& category_map)
         if (mFetch)
         {
             // Set version/descendents for newly created categories.
-            if (category_map.has("version"))
+            if (version > LLViewerInventoryCategory::VERSION_UNKNOWN)
             {
-                S32 version = category_map["version"].asInteger();
                 LL_DEBUGS("Inventory") << "Setting version to " << version
-                    << " for new category " << category_id << LL_ENDL;
+                    << " for category " << category_id << LL_ENDL;
                 new_cat->setVersion(version);
             }
             uuid_int_map_t::const_iterator lookup_it = mCatDescendentsKnown.find(category_id);
@@ -952,7 +968,7 @@ void AISUpdate::parseCategory(const LLSD& category_map)
             {
                 S32 descendent_count = lookup_it->second;
                 LL_DEBUGS("Inventory") << "Setting descendents count to " << descendent_count
-                    << " for new category " << category_id << LL_ENDL;
+                    << " for category " << category_id << LL_ENDL;
                 new_cat->setDescendentCount(descendent_count);
             }
             mCategoriesCreated[category_id] = new_cat;
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 5ea8fe4cba..098ced4ec9 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -276,7 +276,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
                     // Not only root folder can be massive, but
                     // most system folders will be requested independently
                     // so request root folder and content separately
-                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), RT_CONTENT));
+                    mFetchQueue.push_front(FetchQueueInfo(gInventory.getRootFolderID(), RT_CONTENT));
                 }
                 else
                 {
@@ -287,25 +287,18 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 			if (! mRecursiveLibraryFetchStarted)
 			{
 				mRecursiveLibraryFetchStarted |= recursive;
-                if (recursive && AISAPI::isAvailable())
-                {
-                    mRecursiveFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursion_type));
-                }
-                else
-                {
-                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursion_type));
-                }
+                mFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursion_type));
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
 		}
 		else
 		{
-            if (recursive && AISAPI::isAvailable())
+            if (AISAPI::isAvailable() && !recursive)
             {
-                // AIS does depth requests, recursive requests will need to be prioritizes
-                if (mRecursiveFetchQueue.empty() || mRecursiveFetchQueue.back().mUUID != id)
+                // Specific folder requests go to front of queue.
+                if (mFetchQueue.empty() || mFetchQueue.back().mUUID != id)
                 {
-                    mRecursiveFetchQueue.push_back(FetchQueueInfo(id, recursion_type));
+                    mFetchQueue.push_back(FetchQueueInfo(id, recursion_type));
                     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
                 }
             }
@@ -318,6 +311,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
                     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
                 }
             }
+
 			if (id == gInventory.getLibraryRootFolderID())
 			{
 				mRecursiveLibraryFetchStarted |= recursive;
@@ -409,7 +403,7 @@ void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, con
             // Try requesting folder and nested content separately
             mBackgroundFetchActive = true;
             mFolderFetchActive = true;
-            mRecursiveFetchQueue.push_back(FetchQueueInfo(request_id, RT_CONTENT));
+            mFetchQueue.push_front(FetchQueueInfo(request_id, RT_CONTENT));
             gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
         }
     }
@@ -425,7 +419,13 @@ void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, con
                 it != categories->end();
                 ++it)
             {
-                mRecursiveFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
+                mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
+            }
+            if (!mFetchQueue.empty())
+            {
+                mBackgroundFetchActive = true;
+                mFolderFetchActive = true;
+                gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
             }
         }
     }
@@ -442,22 +442,13 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         return;
     }
 
-    static const S32 max_concurrent_fetches(12);
+    static const S32 max_concurrent_fetches(50);
 
     if (mFetchCount >= max_concurrent_fetches)
     {
         return;
     }
 
-    // Start with recursive queue since it can get multiple categories
-    // in a single request and might contain what other requests want
-    while (!mRecursiveFetchQueue.empty() && mFetchCount < max_concurrent_fetches)
-    {
-        const FetchQueueInfo & fetch_info(mRecursiveFetchQueue.front());
-        bulkFetchViaAis(fetch_info);
-        mRecursiveFetchQueue.pop_front();
-    }
-
     while (!mFetchQueue.empty() && mFetchCount < max_concurrent_fetches)
     {
         const FetchQueueInfo & fetch_info(mFetchQueue.front());
@@ -522,7 +513,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                         it != categories->end();
                         ++it)
                     {
-                        mRecursiveFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                        mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
                     }
                 }
             }
@@ -598,13 +589,6 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 	LLSD item_request_body;
 	LLSD item_request_body_lib;
 
-    if (!mRecursiveFetchQueue.empty())
-    {
-        LL_DEBUGS(LOG_INV) << "Request was sheduled for AIS, using legacy" << LL_ENDL;
-        mFetchQueue.insert(mFetchQueue.begin(), mRecursiveFetchQueue.begin(), mRecursiveFetchQueue.end());
-        mRecursiveFetchQueue.clear();
-    }
-
 	while (! mFetchQueue.empty() 
 			&& (item_count + folder_count) < max_batch_size)
 	{
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 4c4de6ac7c..14557ea92d 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -114,7 +114,6 @@ private:
 	LLFrameTimer mFetchTimer;
 	F32 mMinTimeBetweenFetches;
 	fetch_queue_t mFetchQueue;
-    fetch_queue_t mRecursiveFetchQueue;
 
 };
 
-- 
cgit v1.2.3


From 02a3df31cee5d047dd5ff535b7c6612e37989337 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 16 Mar 2023 00:03:22 +0200
Subject: SL-19108 Update thumbnail cap names

---
 indra/newview/llfloatersimplesnapshot.cpp | 36 ++++++++++++++++++++++---------
 indra/newview/llviewerregion.cpp          |  3 +--
 2 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
index 83f4f1ace9..cf596fd82f 100644
--- a/indra/newview/llfloatersimplesnapshot.cpp
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -31,6 +31,7 @@
 #include "llfloaterreg.h"
 #include "llimagefiltersmanager.h"
 #include "llinventorymodel.h"
+#include "llinventoryobserver.h"
 #include "llstatusbar.h" // can_afford_transaction()
 #include "llnotificationsutil.h"
 #include "llagent.h"
@@ -47,8 +48,7 @@ const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN = 64;
 
 // Thumbnail posting coro
 
-static const std::string THUMBNAIL_ITEM_UPLOAD_CAP = "InventoryItemThumbnailUpload";
-static const std::string THUMBNAIL_CATEGORY_UPLOAD_CAP = "InventoryCategoryThumbnailUpload";
+static const std::string THUMBNAIL_UPLOAD_CAP = "InventoryThumbnailUpload";
 
 void post_thumbnail_image_coro(std::string cap_url, std::string path_to_image, LLSD first_data)
 {
@@ -132,8 +132,27 @@ void post_thumbnail_image_coro(std::string cap_url, std::string path_to_image, L
         return;
     }
 
-    // todo: issue an inventory udpate?
-    //return result["new_asset"].asUUID();
+    if (first_data.has("category_id"))
+    {
+        LLUUID cat_id = first_data["category_id"].asUUID();
+        LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
+        if (cat)
+        {
+            cat->setThumbnailUUID(result["new_asset"].asUUID());
+        }
+        gInventory.addChangedMask(LLInventoryObserver::INTERNAL, cat_id);
+    }
+    if (first_data.has("item_id"))
+    {
+        LLUUID item_id = first_data["item_id"].asUUID();
+        LLViewerInventoryItem* item = gInventory.getItem(item_id);
+        if (item)
+        {
+            item->setThumbnailUUID(result["new_asset"].asUUID());
+        }
+        // Are we supposed to get BulkUpdateInventory?
+        gInventory.addChangedMask(LLInventoryObserver::INTERNAL, item_id);
+    }
 }
 
 ///----------------------------------------------------------------------------
@@ -346,6 +365,7 @@ void LLFloaterSimpleSnapshot::onSend()
     if (previewp->createUploadFile(temp_file, THUMBNAIL_SNAPSHOT_DIM_MAX, THUMBNAIL_SNAPSHOT_DIM_MIN))
     {
         uploadImageUploadFile(temp_file, mInventoryId, mTaskId);
+        closeFloater();
     }
     else
     {
@@ -380,31 +400,27 @@ void LLFloaterSimpleSnapshot::uploadThumbnail(const std::string &file_path, cons
 // static
 void LLFloaterSimpleSnapshot::uploadImageUploadFile(const std::string &temp_file, const LLUUID &inventory_id, const LLUUID &task_id)
 {
-    std::string cap_name;
     LLSD data;
 
     if (task_id.notNull())
     {
-        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
         data["item_id"] = inventory_id;
         data["task_id"] = task_id;
     }
     else if (gInventory.getCategory(inventory_id))
     {
-        cap_name = THUMBNAIL_CATEGORY_UPLOAD_CAP;
         data["category_id"] = inventory_id;
     }
     else
     {
-        cap_name = THUMBNAIL_ITEM_UPLOAD_CAP;
         data["item_id"] = inventory_id;
     }
 
-    std::string cap_url = gAgent.getRegionCapability(cap_name);
+    std::string cap_url = gAgent.getRegionCapability(THUMBNAIL_UPLOAD_CAP);
     if (cap_url.empty())
     {
         LLSD args;
-        args["CAPABILITY"] = cap_url;
+        args["CAPABILITY"] = THUMBNAIL_UPLOAD_CAP;
         LLNotificationsUtil::add("RegionCapabilityRequestError", args);
         LL_WARNS("Thumbnail") << "Failed to upload profile image for item " << inventory_id << " " << task_id << ", no cap found" << LL_ENDL;
         return;
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index e5d703a6ee..4e85d31549 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3024,8 +3024,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 
 	capabilityNames.append("InterestList");
 
-    capabilityNames.append("InventoryCategoryThumbnailUpload");
-    capabilityNames.append("InventoryItemThumbnailUpload");
+    capabilityNames.append("InventoryThumbnailUpload");
 	capabilityNames.append("GetDisplayNames");
 	capabilityNames.append("GetExperiences");
 	capabilityNames.append("AgentExperiences");
-- 
cgit v1.2.3


From d2a8a3bd53f011b7137717ece39f01b5242bb45a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 16 Mar 2023 00:04:11 +0200
Subject: SL-18964 Smoke texture can fail to load

Debt from SL-18221.
Keep init together, after we got the cap; texture should finish loading before it's needed.
---
 indra/newview/lldrawpoolalpha.cpp     | 7 +------
 indra/newview/llviewertexture.cpp     | 7 -------
 indra/newview/llviewertexturelist.cpp | 2 ++
 3 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index d4797321bb..f91069185a 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -281,12 +281,7 @@ void LLDrawPoolAlpha::renderDebugAlpha()
         gHighlightProgram.bind();
         gGL.diffuseColor4f(1, 0, 0, 1);
 
-        // SL-18964 : The creating of this texture was moved here from LLViewerTextureManager::init() to make the texture transparent before adding to cache
-        if (!LLViewerFetchedTexture::sSmokeImagep)
-        {
-            LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI);
-            LLViewerFetchedTexture::sSmokeImagep->setNoDelete();
-        }
+
         LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f * 1024.f);
         gGL.getTexUnit(0)->bindFast(LLViewerFetchedTexture::sSmokeImagep);
 
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 0d82aced23..df65fe8fb8 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -402,13 +402,6 @@ void LLViewerTextureManager::init()
 	LLViewerFetchedTexture::sDefaultImagep->dontDiscard();
 	LLViewerFetchedTexture::sDefaultImagep->setCategory(LLGLTexture::OTHER);
 
-#if 0
-	// When called first time after clearing cache this call creates (and adds to cache) an opaque texture instead of transparent
-	// SL-18964 : The creating of this texture was moved to LLDrawPoolAlpha::renderDebugAlpha()
- 	LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI);
-	LLViewerFetchedTexture::sSmokeImagep->setNoDelete();
-#endif
-
 	image_raw = new LLImageRaw(32,32,3);
 	data = image_raw->getData();
 
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 93ae1670c8..52e6a9a2df 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -228,6 +228,8 @@ void LLViewerTextureList::doPrefetchImages()
 
     LLViewerTextureManager::getFetchedTexture(IMG_SHOT);
     LLViewerTextureManager::getFetchedTexture(IMG_SMOKE_POOF);
+    LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI);
+    LLViewerFetchedTexture::sSmokeImagep->setNoDelete();
 
     LLStandardBumpmap::addstandard();
 
-- 
cgit v1.2.3


From cb66156a72ad02ce937763a4439de32d05fc10d5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 16 Mar 2023 21:45:41 +0200
Subject: SL-19105 Fix menu's opening position

---
 indra/newview/llpanelmaininventory.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index f8c1fcb5f5..9fab6e4d2e 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1457,8 +1457,7 @@ void LLPanelMainInventory::showActionMenu(LLMenuGL* menu, std::string spawning_v
 		LLView* spawning_view = getChild<LLView> (spawning_view_name);
 		S32 menu_x, menu_y;
 		//show menu in co-ordinates of panel
-		spawning_view->localPointToOtherView(0, spawning_view->getRect().getHeight(), &menu_x, &menu_y, this);
-		menu_y += menu->getRect().getHeight();
+		spawning_view->localPointToOtherView(0, 0, &menu_x, &menu_y, this);
 		LLMenuGL::showPopup(this, menu, menu_x, menu_y);
 	}
 }
-- 
cgit v1.2.3


From 86c46a12296a8f00dd6db33a69fffe55e6520326 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Mar 2023 00:38:39 +0200
Subject: SL-18674 Remove UDP fallbacks for AIS caps not present

---
 indra/newview/llviewerinventory.cpp | 49 ++++++-------------------------------
 1 file changed, 8 insertions(+), 41 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 61123e65d7..07338b7b6b 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1400,25 +1400,10 @@ void remove_inventory_item(
 				gInventory.onObjectDeletedFromServer(item_id);
 			}
 		}
-		else // no cap
-		{
-			LLMessageSystem* msg = gMessageSystem;
-			msg->newMessageFast(_PREHASH_RemoveInventoryItem);
-			msg->nextBlockFast(_PREHASH_AgentData);
-			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); 
-			msg->nextBlockFast(_PREHASH_InventoryData);
-			msg->addUUIDFast(_PREHASH_ItemID, item_id);
-			gAgent.sendReliableMessage();
-
-			// Update inventory and call callback immediately since
-			// message-based system has no callback mechanism (!)
-			gInventory.onObjectDeletedFromServer(item_id);
-			if (cb)
-			{
-				cb->fire(item_id);
-			}
-		}
+        else
+        {
+            LL_WARNS(LOG_INV) << "Tried to use inventory without AIS API" << LL_ENDL;
+        }
 	}
 	else
 	{
@@ -1547,28 +1532,10 @@ void purge_descendents_of(const LLUUID& id, LLPointer<LLInventoryCallback> cb)
 			AISAPI::completion_t cr = (cb) ? boost::bind(&doInventoryCb, cb, _1) : AISAPI::completion_t();
 			AISAPI::PurgeDescendents(id, cr);
 		}
-		else // no cap
-		{
-			// Fast purge
-			LL_DEBUGS(LOG_INV) << "purge_descendents_of fast case " << cat->getName() << LL_ENDL;
-
-			// send it upstream
-			LLMessageSystem* msg = gMessageSystem;
-			msg->newMessage("PurgeInventoryDescendents");
-			msg->nextBlock("AgentData");
-			msg->addUUID("AgentID", gAgent.getID());
-			msg->addUUID("SessionID", gAgent.getSessionID());
-			msg->nextBlock("InventoryData");
-			msg->addUUID("FolderID", id);
-			gAgent.sendReliableMessage();
-
-			// Update model immediately because there is no callback mechanism.
-			gInventory.onDescendentsPurgedFromServer(id);
-			if (cb)
-			{
-				cb->fire(id);
-			}
-		}
+        else
+        {
+            LL_WARNS(LOG_INV) << "Tried to use inventory without AIS API" << LL_ENDL;
+        }
 	}
 }
 
-- 
cgit v1.2.3


From 3a5c41a20e6044c8cfa71dfd1583fea0809d6a68 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Mar 2023 03:23:15 +0200
Subject: SL-18629 Fetch Inventory using AIS caps #4

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 28 +++++++++++++----------
 indra/newview/llstartup.cpp                       |  5 ++++
 2 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 098ced4ec9..282d234cf3 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -293,23 +293,20 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 		}
 		else
 		{
-            if (AISAPI::isAvailable() && !recursive)
+            if (mFetchQueue.empty() || mFetchQueue.front().mUUID != id)
             {
-                // Specific folder requests go to front of queue.
-                if (mFetchQueue.empty() || mFetchQueue.back().mUUID != id)
+                if (AISAPI::isAvailable())
                 {
+                    // On AIS make sure root goes to the top and follow up recursive
+                    // fetches, not individual requests
                     mFetchQueue.push_back(FetchQueueInfo(id, recursion_type));
-                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
                 }
-            }
-            else
-            {
-                // Specific folder requests go to front of queue.
-                if (mFetchQueue.empty() || mFetchQueue.front().mUUID != id)
+                else
                 {
+                    // Specific folder requests go to front of queue.
                     mFetchQueue.push_front(FetchQueueInfo(id, recursion_type));
-                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
                 }
+                gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
             }
 
 			if (id == gInventory.getLibraryRootFolderID())
@@ -419,7 +416,7 @@ void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, con
                 it != categories->end();
                 ++it)
             {
-                mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
+                mFetchQueue.push_front(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
             }
             if (!mFetchQueue.empty())
             {
@@ -449,11 +446,17 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         return;
     }
 
-    while (!mFetchQueue.empty() && mFetchCount < max_concurrent_fetches)
+    // Don't loop for too long (in case of large, fully loaded inventory)
+    F64 curent_time = LLTimer::getTotalSeconds();
+    const F64 max_time = 0.006f; // 6 ms
+    const F64 end_time = curent_time + max_time;
+
+    while (!mFetchQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
     {
         const FetchQueueInfo & fetch_info(mFetchQueue.front());
         bulkFetchViaAis(fetch_info);
         mFetchQueue.pop_front();
+        curent_time = LLTimer::getTotalSeconds();
     }
     
     if (isBulkFetchProcessingComplete())
@@ -513,6 +516,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                         it != categories->end();
                         ++it)
                     {
+                        // not push_front to not cause an infinite loop
                         mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
                     }
                 }
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 842192a62b..a1f2753ada 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2930,6 +2930,11 @@ void reset_login()
 	LLFloaterReg::hideVisibleInstances();
     LLStartUp::setStartupState( STATE_BROWSER_INIT );
 
+    if (LLVoiceClient::instanceExists())
+    {
+        LLVoiceClient::getInstance()->terminate();
+    }
+
     // Clear any verified certs and verify them again on next login
     // to ensure cert matches server instead of just getting reused
     LLPointer<LLCertificateStore> store = gSecAPIHandler->getCertificateStore("");
-- 
cgit v1.2.3


From 9ef9efaa0e843054a18a3957d64499a2ef8b4700 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Mar 2023 14:51:06 +0200
Subject: SL-19108 Fix folders not showing thumbnails

---
 indra/newview/llinventorybridge.cpp | 10 ++++++++++
 indra/newview/llinventorybridge.h   |  1 +
 2 files changed, 11 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 421c1c9754..cc8e20485b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2339,6 +2339,16 @@ LLFontGL::StyleFlags LLFolderBridge::getLabelStyle() const
     return LLFontGL::NORMAL;
 }
 
+const LLUUID& LLFolderBridge::getThumbnailUUID() const
+{
+    LLViewerInventoryCategory* cat = getCategory();
+    if (cat)
+    {
+        return cat->getThumbnailUUID();
+    }
+    return LLUUID::null;
+}
+
 void LLFolderBridge::update()
 {
 	// we know we have children but  haven't  fetched them (doesn't obey filter)
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 958d284854..eaa7166631 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -299,6 +299,7 @@ public:
 	static LLUIImagePtr getIcon(LLFolderType::EType preferred_type);
 	virtual std::string getLabelSuffix() const;
 	virtual LLFontGL::StyleFlags getLabelStyle() const;
+    virtual const LLUUID& getThumbnailUUID() const;
 
 	void setShowDescendantsCount(bool show_count) {mShowDescendantsCount = show_count;}
 
-- 
cgit v1.2.3


From 4f9f149939cfd79ba6d18ed90202b29225c2969c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Mar 2023 22:42:14 +0200
Subject: SL-18629 Try fetching inventory on BulkUpdateInventory to get missing
 data

---
 indra/newview/llinventorymodel.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 65690228e7..43bfaf454c 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3811,10 +3811,20 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 	for (cat_array_t::iterator cit = folders.begin(); cit != folders.end(); ++cit)
 	{
 		gInventory.updateCategory(*cit);
+
+        // Temporary workaround: just fetch the item using AIS to get missing fields.
+        // If this works fine we might want to extract ids only from the message
+        // then use AIS as a primary fetcher
+        AISAPI::FetchCategoryChildren((*cit)->getUUID(), AISAPI::INVENTORY, false);
 	}
 	for (item_array_t::iterator iit = items.begin(); iit != items.end(); ++iit)
 	{
 		gInventory.updateItem(*iit);
+
+        // Temporary workaround: just fetch the item using AIS to get missing fields.
+        // If this works fine we might want to extract ids only from the message
+        // then use AIS as a primary fetcher
+        AISAPI::FetchItem((*iit)->getUUID(), AISAPI::INVENTORY, false);
 	}
 	gInventory.notifyObservers();
 
-- 
cgit v1.2.3


From 70d99cde5826893be4964d4673ff875320b7220f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Mar 2023 23:44:28 +0200
Subject: SL-18629 Track request depth to be able to distinguish incomplete
 folder reliably

---
 indra/newview/llaisapi.cpp                        | 87 ++++++++++++++---------
 indra/newview/llaisapi.h                          | 13 ++--
 indra/newview/llinventorymodelbackgroundfetch.cpp | 73 ++++++++++---------
 indra/newview/llviewerinventory.cpp               |  6 +-
 4 files changed, 102 insertions(+), 77 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index bb963d77c9..5e243476d8 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -384,7 +384,7 @@ void AISAPI::FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callba
 	}
 	std::string url = cap + std::string("/item/") + itemId.asString();
 
-	invokationFn_t patchFn = boost::bind(
+	invokationFn_t getFn = boost::bind(
 		// Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
 		static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
 		//----
@@ -397,7 +397,7 @@ void AISAPI::FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callba
 		(&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
 
 	LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
-		_1, patchFn, url, itemId, LLSD(), callback, FETCHITEM));
+		_1, getFn, url, itemId, LLSD(), callback, FETCHITEM));
 
 	EnqueueAISCommand("FetchItem", proc);
 }
@@ -425,7 +425,7 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
         url += "?depth=" + std::to_string(depth);
     }
 
-    invokationFn_t patchFn = boost::bind(
+    invokationFn_t getFn = boost::bind(
         // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
         static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
         //----
@@ -437,8 +437,11 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
         // _6 -> httpHeaders
         (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
 
+    // get doesn't use body, can pass additional data
+    LLSD body;
+    body["depth"] = recursive ? S32_MAX : depth;
     LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
-        _1, patchFn, url, catId, LLSD(), callback, FETCHCATEGORYCHILDREN));
+        _1, getFn, url, catId, body, callback, FETCHCATEGORYCHILDREN));
 
     EnqueueAISCommand("FetchCategoryChildren", proc);
 }
@@ -465,7 +468,7 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
         url += "?depth=" + std::to_string(depth);
     }
 
-    invokationFn_t patchFn = boost::bind(
+    invokationFn_t getFn = boost::bind(
         // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
         static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
         //----
@@ -477,8 +480,11 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
         // _6 -> httpHeaders
         (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
 
+    // get doesn't use body, can pass additional data
+    LLSD body;
+    body["depth"] = depth;
     LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
-        _1, patchFn, url, catId, LLSD(), callback, FETCHCATEGORYCATEGORIES));
+        _1, getFn, url, catId, body, callback, FETCHCATEGORYCATEGORIES));
 
     EnqueueAISCommand("FetchCategoryCategories", proc);
 }
@@ -534,7 +540,7 @@ void AISAPI::onIdle(void *userdata)
 }
 
 /*static*/
-void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type)
+void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type, const LLSD& request_body)
 {
     LLTimer timer;
     if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
@@ -545,7 +551,12 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
         || (type == FETCHCATEGORYCHILDREN)
         || (type == FETCHCATEGORYCATEGORIES);
     // parse update llsd into stuff to do or parse received items.
-    AISUpdate ais_update(update, is_fetch);
+    S32 depth = 0;
+    if (is_fetch && request_body.has("depth"))
+    {
+        depth = request_body["depth"].asInteger();
+    }
+    AISUpdate ais_update(update, is_fetch, depth);
     ais_update.doUpdate(); // execute the updates in the appropriate order.
     LL_INFOS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
 }
@@ -559,11 +570,6 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest());
     LLCore::HttpHeaders::ptr_t httpHeaders;
 
-    /*if (type == FETCHCATEGORYCHILDREN && (url.find("?depth=*") != std::string::npos))
-    {
-        LL_WARNS() << "testy test start"<< LL_ENDL;
-    }*/
-
     httpOptions->setTimeout(180);
 
     LL_DEBUGS("Inventory") << "url: " << url << LL_ENDL;
@@ -624,7 +630,12 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     }
 
 	LL_DEBUGS("Inventory") << result << LL_ENDL;
-    onUpdateReceived("AISCommand", result, type);
+    onUpdateReceived("AISCommand", result, type, body);
+
+    if (type == FETCHITEM)
+    {
+        LL_WARNS() << "test" << LL_ENDL;
+    }
 
     if (callback && !callback.empty())
     {
@@ -638,6 +649,17 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         {
             id = result["category_id"];
 	    }
+        if (type == FETCHITEM)
+        {
+            if (result.has("item_id"))
+            {
+                id = result["item_id"];
+            }
+            if (result.has("linked_id"))
+            {
+                id = result["linked_id"];
+            }
+        }
 		if (type == CREATEINVENTORY)
 		{
             // CREATEINVENTORY can have multiple callbacks
@@ -676,8 +698,9 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 }
 
 //-------------------------------------------------------------------------
-AISUpdate::AISUpdate(const LLSD& update, bool fetch)
+AISUpdate::AISUpdate(const LLSD& update, bool fetch, S32 depth)
 : mFetch(fetch)
+, mFetchDepth(depth)
 {
 	parseUpdate(update);
 }
@@ -794,13 +817,13 @@ void AISUpdate::parseContent(const LLSD& update)
 
 	if (update.has("category_id"))
 	{
-		parseCategory(update);
+		parseCategory(update, mFetchDepth);
 	}
 	else
 	{
 		if (update.has("_embedded"))
 		{
-			parseEmbedded(update["_embedded"]);
+			parseEmbedded(update["_embedded"], mFetchDepth);
 		}
 	}
 }
@@ -899,7 +922,7 @@ void AISUpdate::parseLink(const LLSD& link_map)
 }
 
 
-void AISUpdate::parseCategory(const LLSD& category_map)
+void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
 {
     LLUUID category_id = category_map["category_id"].asUUID();
     S32 version = LLViewerInventoryCategory::VERSION_UNKNOWN;
@@ -948,17 +971,17 @@ void AISUpdate::parseCategory(const LLSD& category_map)
     }
 	BOOL rv = new_cat->unpackMessage(category_map);
 	// *NOTE: unpackMessage does not unpack version or descendent count.
-	//if (category_map.has("version"))
-	//{
-	//	mCatVersionsUpdated[category_id] = category_map["version"].asInteger();
-	//}
 	if (rv)
 	{
         if (mFetch)
         {
-            // Set version/descendents for newly created categories.
-            if (version > LLViewerInventoryCategory::VERSION_UNKNOWN)
+            // set version only if previous one was already known 
+            // or if we are sure this update has full data and embeded items (depth 0+)
+            // since bulk fetch uses this to decide what still needs fetching
+            if (version > LLViewerInventoryCategory::VERSION_UNKNOWN
+                && (depth >= 0 || (curr_cat && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN)))
             {
+                // Set version/descendents for newly fetched categories.
                 LL_DEBUGS("Inventory") << "Setting version to " << version
                     << " for category " << category_id << LL_ENDL;
                 new_cat->setVersion(version);
@@ -1015,7 +1038,7 @@ void AISUpdate::parseCategory(const LLSD& category_map)
 	// Check for more embedded content.
 	if (category_map.has("_embedded"))
 	{
-		parseEmbedded(category_map["_embedded"]);
+		parseEmbedded(category_map["_embedded"], depth - 1);
 	}
 }
 
@@ -1032,7 +1055,7 @@ void AISUpdate::parseDescendentCount(const LLUUID& category_id, const LLSD& embe
 	}
 }
 
-void AISUpdate::parseEmbedded(const LLSD& embedded)
+void AISUpdate::parseEmbedded(const LLSD& embedded, S32 depth)
 {
 	if (embedded.has("links")) // _embedded in a category
 	{
@@ -1048,11 +1071,11 @@ void AISUpdate::parseEmbedded(const LLSD& embedded)
 	}
 	if (embedded.has("categories")) // _embedded in a category
 	{
-		parseEmbeddedCategories(embedded["categories"]);
+		parseEmbeddedCategories(embedded["categories"], depth);
 	}
 	if (embedded.has("category")) // _embedded in a link
 	{
-		parseEmbeddedCategory(embedded["category"]);
+		parseEmbeddedCategory(embedded["category"], depth);
 	}
 }
 
@@ -1120,19 +1143,19 @@ void AISUpdate::parseEmbeddedItems(const LLSD& items)
 	}
 }
 
-void AISUpdate::parseEmbeddedCategory(const LLSD& category)
+void AISUpdate::parseEmbeddedCategory(const LLSD& category, S32 depth)
 {
 	// a single category (_embedded in a link)
 	if (category.has("category_id"))
 	{
 		if (mFetch || mCategoryIds.end() != mCategoryIds.find(category["category_id"].asUUID()))
 		{
-			parseCategory(category);
+			parseCategory(category, depth);
 		}
 	}
 }
 
-void AISUpdate::parseEmbeddedCategories(const LLSD& categories)
+void AISUpdate::parseEmbeddedCategories(const LLSD& categories, S32 depth)
 {
 	// a map of categories (_embedded in a category)
 	for(LLSD::map_const_iterator categoryit = categories.beginMap(),
@@ -1147,7 +1170,7 @@ void AISUpdate::parseEmbeddedCategories(const LLSD& categories)
 		}
 		else
 		{
-			parseCategory(category_map);
+			parseCategory(category_map, depth);
 		}
 	}
 }
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 58f6a17650..93bbbedb3b 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -85,7 +85,7 @@ private:
 
     static void EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc);
     static void onIdle(void *userdata); // launches postponed AIS commands
-    static void onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type);
+    static void onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type, const LLSD& request_body);
 
     static std::string getInvCap();
     static std::string getLibCap();
@@ -101,21 +101,21 @@ private:
 class AISUpdate
 {
 public:
-	AISUpdate(const LLSD& update, bool fetch);
+	AISUpdate(const LLSD& update, bool fetch, S32 depth);
 	void parseUpdate(const LLSD& update);
 	void parseMeta(const LLSD& update);
 	void parseContent(const LLSD& update);
 	void parseUUIDArray(const LLSD& content, const std::string& name, uuid_list_t& ids);
 	void parseLink(const LLSD& link_map);
 	void parseItem(const LLSD& link_map);
-	void parseCategory(const LLSD& link_map);
+	void parseCategory(const LLSD& link_map, S32 depth);
 	void parseDescendentCount(const LLUUID& category_id, const LLSD& embedded);
-	void parseEmbedded(const LLSD& embedded);
+	void parseEmbedded(const LLSD& embedded, S32 depth);
 	void parseEmbeddedLinks(const LLSD& links);
 	void parseEmbeddedItems(const LLSD& items);
-	void parseEmbeddedCategories(const LLSD& categories);
+	void parseEmbeddedCategories(const LLSD& categories, S32 depth);
 	void parseEmbeddedItem(const LLSD& item);
-	void parseEmbeddedCategory(const LLSD& category);
+	void parseEmbeddedCategory(const LLSD& category, S32 depth);
 	void doUpdate();
 private:
 	void clearParseResults();
@@ -138,6 +138,7 @@ private:
 	uuid_list_t mItemIds;
 	uuid_list_t mCategoryIds;
     bool mFetch;
+    S32 mFetchDepth;
 };
 
 #endif
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 282d234cf3..6cae035fcf 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -478,10 +478,10 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         else
         {
 
-            if (!gInventory.isCategoryComplete(cat_id))
+            const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
+            if (cat)
             {
-                const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
-                if (cat)
+                if (!gInventory.isCategoryComplete(cat_id))
                 {
                     if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
                     {
@@ -502,25 +502,24 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                     }
                     mFetchCount++;
                 }
-                // else?
-            }
-            else
-            {
-                // Already fetched, check if anything inside needs fetching
-                if (fetch_info.mRecursive)
+                else
                 {
-                    LLInventoryModel::cat_array_t * categories(NULL);
-                    LLInventoryModel::item_array_t * items(NULL);
-                    gInventory.getDirectDescendentsOf(cat_id, categories, items);
-                    for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
-                        it != categories->end();
-                        ++it)
+                    // Already fetched, check if anything inside needs fetching
+                    if (fetch_info.mRecursive)
                     {
-                        // not push_front to not cause an infinite loop
-                        mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                        LLInventoryModel::cat_array_t * categories(NULL);
+                        LLInventoryModel::item_array_t * items(NULL);
+                        gInventory.getDirectDescendentsOf(cat_id, categories, items);
+                        for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
+                            it != categories->end();
+                            ++it)
+                        {
+                            // not push_front to not cause an infinite loop
+                            mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                        }
                     }
                 }
-            }
+            } // else?
         }
     }
     else
@@ -613,10 +612,10 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 			}
 			else
 			{
-                if (!gInventory.isCategoryComplete(cat_id))
+                const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
+                if (cat)
                 {
-                    const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
-                    if (cat)
+                    if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
                     {
                         LLSD folder_sd;
                         folder_sd["folder_id"] = cat->getUUID();
@@ -635,23 +634,23 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
                         }
                         folder_count++;
                     }
+                    else
+                    {
+                        // May already have this folder, but append child folders to list.
+                        if (fetch_info.mRecursive)
+                        {
+                            LLInventoryModel::cat_array_t * categories(NULL);
+                            LLInventoryModel::item_array_t * items(NULL);
+                            gInventory.getDirectDescendentsOf(cat_id, categories, items);
+                            for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
+                                it != categories->end();
+                                ++it)
+                            {
+                                mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                            }
+                        }
+                    }
                 }
-                else
-                {
-					// May already have this folder, but append child folders to list.
-					if (fetch_info.mRecursive)
-					{	
-						LLInventoryModel::cat_array_t * categories(NULL);
-						LLInventoryModel::item_array_t * items(NULL);
-						gInventory.getDirectDescendentsOf(cat_id, categories, items);
-						for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
-							 it != categories->end();
-							 ++it)
-						{
-							mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
-						}
-					}
-				}
 			}
 			if (fetch_info.mRecursive)
 			{
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 07338b7b6b..2f2bc3f91f 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1928,11 +1928,13 @@ const LLUUID& LLViewerInventoryItem::getThumbnailUUID() const
     }
     if (mThumbnailUUID.isNull() && mType == LLAssetType::AT_LINK)
     {
-        return gInventory.getItem(getLinkedUUID())->getThumbnailUUID();
+        LLViewerInventoryItem *linked_item = gInventory.getItem(mAssetUUID);
+        return linked_item ? linked_item->getThumbnailUUID() : LLUUID::null;
     }
     if (mThumbnailUUID.isNull() && mType == LLAssetType::AT_LINK_FOLDER)
     {
-        return gInventory.getCategory(getLinkedUUID())->getThumbnailUUID();
+        LLViewerInventoryCategory *linked_cat = gInventory.getCategory(mAssetUUID);
+        return linked_cat ? linked_cat->getThumbnailUUID() : LLUUID::null;
     }
     return mThumbnailUUID;
 }
-- 
cgit v1.2.3


From f98c1403fb47990181c504acfbf5d35a393225b7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 18 Mar 2023 01:15:27 +0200
Subject: SL-18674 Reenable folder creation via AIS v3

Add item fetching via AIS v3
---
 indra/newview/llaisapi.cpp          |  5 ---
 indra/newview/llaisapi.h            |  1 -
 indra/newview/llinventorymodel.cpp  |  3 +-
 indra/newview/llviewerinventory.cpp | 89 ++++++++++++++++++++-----------------
 4 files changed, 49 insertions(+), 49 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 5e243476d8..ece03d6988 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -632,11 +632,6 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 	LL_DEBUGS("Inventory") << result << LL_ENDL;
     onUpdateReceived("AISCommand", result, type, body);
 
-    if (type == FETCHITEM)
-    {
-        LL_WARNS() << "test" << LL_ENDL;
-    }
-
     if (callback && !callback.empty())
     {
         bool needs_callback = true;
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 93bbbedb3b..dd02951cd4 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -58,7 +58,6 @@ public:
     static void FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callback = completion_t());
     static void FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
-    static void FetchCOF(completion_t callback = completion_t());
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
 private:
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 43bfaf454c..52121d644f 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -996,7 +996,6 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		name.assign(LLViewerFolderType::lookupNewCategoryName(preferred_type));
 	}
 
-#ifdef USE_AIS_FOR_NC
     // D567 currently this doesn't really work due to limitations in
     // AIS3, also violates the common caller assumption that we can
     // assign the id and return immediately.
@@ -1047,7 +1046,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
         });
         return;
 	}
-#endif
+
 	LLViewerRegion* viewer_region = gAgent.getRegion();
 	std::string url;
 	if ( viewer_region )
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 2f2bc3f91f..6f18d72be0 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -430,48 +430,50 @@ void LLViewerInventoryItem::fetchFromServer(void) const
 {
 	if(!mIsComplete)
 	{
-		std::string url; 
+        if (AISAPI::isAvailable()) // AIS v 3
+        {
+            if (gAgent.getID() != mPermissions.getOwner())
+            {
+                AISAPI::FetchItem(mUUID, AISAPI::LIBRARY);
+            }
+            else
+            {
+                AISAPI::FetchItem(mUUID, AISAPI::INVENTORY);
+            }
+        }
+        else
+        {
+            std::string url;
 
-		LLViewerRegion* region = gAgent.getRegion();
-		// we have to check region. It can be null after region was destroyed. See EXT-245
-		if (region)
-		{
-		  if (gAgent.getID() != mPermissions.getOwner())
-		  {
-		      url = region->getCapability("FetchLib2");
-		  }
-		  else
-		  {	
-		      url = region->getCapability("FetchInventory2");
-		  }
-		}
-		else
-		{
-			LL_WARNS(LOG_INV) << "Agent Region is absent" << LL_ENDL;
-		}
+            LLViewerRegion* region = gAgent.getRegion();
+            // we have to check region. It can be null after region was destroyed. See EXT-245
+            if (region)
+            {
+                if (gAgent.getID() != mPermissions.getOwner())
+                {
+                    url = region->getCapability("FetchLib2");
+                }
+                else
+                {
+                    url = region->getCapability("FetchInventory2");
+                }
+            }
+            else
+            {
+                LL_WARNS(LOG_INV) << "Agent Region is absent" << LL_ENDL;
+            }
 
-		if (!url.empty())
-		{
-			LLSD body;
-			body["agent_id"]	= gAgent.getID();
-			body["items"][0]["owner_id"]	= mPermissions.getOwner();
-			body["items"][0]["item_id"]		= mUUID;
+            if (!url.empty())
+            {
+                LLSD body;
+                body["agent_id"] = gAgent.getID();
+                body["items"][0]["owner_id"] = mPermissions.getOwner();
+                body["items"][0]["item_id"] = mUUID;
 
-            LLCore::HttpHandler::ptr_t handler(new LLInventoryModel::FetchItemHttpHandler(body));
-			gInventory.requestPost(true, url, body, handler, "Inventory Item");
-		}
-		else
-		{
-			LLMessageSystem* msg = gMessageSystem;
-			msg->newMessage("FetchInventory");
-			msg->nextBlock("AgentData");
-			msg->addUUID("AgentID", gAgent.getID());
-			msg->addUUID("SessionID", gAgent.getSessionID());
-			msg->nextBlock("InventoryData");
-			msg->addUUID("OwnerID", mPermissions.getOwner());
-			msg->addUUID("ItemID", mUUID);
-			gAgent.sendReliableMessage();
-		}
+                LLCore::HttpHandler::ptr_t handler(new LLInventoryModel::FetchItemHttpHandler(body));
+                gInventory.requestPost(true, url, body, handler, "Inventory Item");
+            }
+        }
 	}
 }
 
@@ -1033,7 +1035,7 @@ void create_inventory_item(
 	}
 
 #ifdef USE_AIS_FOR_NC
-    // D567 currently this doesn't work due to missing AIS3 support
+    // D567 18.03.2023 not yet implemented within AIS3
     if (AISAPI::isAvailable())
     {
         LLSD new_inventory = LLSD::emptyMap();
@@ -1067,12 +1069,17 @@ void create_inventory_item(
             0 /*don't know yet, whenever server creates it*/);
         LLSD item_sd = item->asLLSD();
         new_inventory["items"].append(item_sd);
+        AISAPI::completion_t cr = boost::bind(&doInventoryCb, cb, _1);
         AISAPI::CreateInventory(
             parent_id,
             new_inventory,
-            nullptr);
+            cr);
         return;
     }
+    else
+    {
+        LL_WARNS() << "AIS v3 not available" << LL_ENDL;
+    }
 #endif
 
 	LLMessageSystem* msg = gMessageSystem;
-- 
cgit v1.2.3


From 0a2a1b35649ff405bdccf9e499609af435528300 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 18 Mar 2023 01:15:27 +0200
Subject: SL-18674 Cleanup

---
 indra/newview/llinventorymodel.cpp | 66 --------------------------------------
 indra/newview/llinventorymodel.h   |  1 -
 2 files changed, 67 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 52121d644f..a6f56c3a9c 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -996,9 +996,6 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		name.assign(LLViewerFolderType::lookupNewCategoryName(preferred_type));
 	}
 
-    // D567 currently this doesn't really work due to limitations in
-    // AIS3, also violates the common caller assumption that we can
-    // assign the id and return immediately.
 	if (AISAPI::isAvailable())
 	{
 		LLSD new_inventory = LLSD::emptyMap();
@@ -3380,9 +3377,6 @@ void LLInventoryModel::registerCallbacks(LLMessageSystem* msg)
 	msg->setHandlerFuncFast(_PREHASH_RemoveInventoryItem,
 						processRemoveInventoryItem,
 						NULL);
-	msg->setHandlerFuncFast(_PREHASH_UpdateInventoryFolder,
-						processUpdateInventoryFolder,
-						NULL);
 	msg->setHandlerFuncFast(_PREHASH_RemoveInventoryFolder,
 						processRemoveInventoryFolder,
 						NULL);
@@ -3525,66 +3519,6 @@ void LLInventoryModel::processRemoveInventoryItem(LLMessageSystem* msg, void**)
 	gInventory.notifyObservers();
 }
 
-// 	static
-void LLInventoryModel::processUpdateInventoryFolder(LLMessageSystem* msg,
-													void**)
-{
-	LL_DEBUGS(LOG_INV) << "LLInventoryModel::processUpdateInventoryFolder()" << LL_ENDL;
-	LLUUID agent_id, folder_id, parent_id;
-	//char name[DB_INV_ITEM_NAME_BUF_SIZE];
-	msg->getUUIDFast(_PREHASH_FolderData, _PREHASH_AgentID, agent_id);
-	if(agent_id != gAgent.getID())
-	{
-		LL_WARNS(LOG_INV) << "Got an UpdateInventoryFolder for the wrong agent."
-						  << LL_ENDL;
-		return;
-	}
-	LLPointer<LLViewerInventoryCategory> lastfolder; // hack
-	cat_array_t folders;
-	update_map_t update;
-	S32 count = msg->getNumberOfBlocksFast(_PREHASH_FolderData);
-	for(S32 i = 0; i < count; ++i)
-	{
-		LLPointer<LLViewerInventoryCategory> tfolder = new LLViewerInventoryCategory(gAgent.getID());
-		lastfolder = tfolder;
-		tfolder->unpackMessage(msg, _PREHASH_FolderData, i);
-		// make sure it's not a protected folder
-		tfolder->setPreferredType(LLFolderType::FT_NONE);
-		folders.push_back(tfolder);
-		// examine update for changes.
-		LLViewerInventoryCategory* folderp = gInventory.getCategory(tfolder->getUUID());
-		if(folderp)
-		{
-			if(tfolder->getParentUUID() == folderp->getParentUUID())
-			{
-				update[tfolder->getParentUUID()];
-			}
-			else
-			{
-				++update[tfolder->getParentUUID()];
-				--update[folderp->getParentUUID()];
-			}
-		}
-		else
-		{
-			++update[tfolder->getParentUUID()];
-		}
-	}
-	gInventory.accountForUpdate(update);
-	for (cat_array_t::iterator it = folders.begin(); it != folders.end(); ++it)
-	{
-		gInventory.updateCategory(*it);
-	}
-	gInventory.notifyObservers();
-
-	// *HACK: Do the 'show' logic for a new item in the inventory.
-	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel();
-	if (active_panel)
-	{
-		active_panel->setSelection(lastfolder->getUUID(), TAKE_FOCUS_NO);
-	}
-}
-
 // 	static
 void LLInventoryModel::removeInventoryFolder(LLUUID agent_id,
 											 LLMessageSystem* msg)
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 5e4319bb12..d1ee7b6144 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -662,7 +662,6 @@ public:
 	static void processUpdateCreateInventoryItem(LLMessageSystem* msg, void**);
 	static void removeInventoryItem(LLUUID agent_id, LLMessageSystem* msg, const char* msg_label);
 	static void processRemoveInventoryItem(LLMessageSystem* msg, void**);
-	static void processUpdateInventoryFolder(LLMessageSystem* msg, void**);
 	static void removeInventoryFolder(LLUUID agent_id, LLMessageSystem* msg);
 	static void processRemoveInventoryFolder(LLMessageSystem* msg, void**);
 	static void processRemoveInventoryObjects(LLMessageSystem* msg, void**);
-- 
cgit v1.2.3


From 7dad882c2f43b53c1618a4b140bd0b35be6fa106 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 18 Mar 2023 03:05:08 +0200
Subject: SL-18629 MAC build fix

---
 indra/newview/llinventorymodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index a6f56c3a9c..c54a59d12f 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3748,7 +3748,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-        AISAPI::FetchCategoryChildren((*cit)->getUUID(), AISAPI::INVENTORY, false);
+        AISAPI::FetchCategoryChildren((*cit)->getUUID(), AISAPI::INVENTORY);
 	}
 	for (item_array_t::iterator iit = items.begin(); iit != items.end(); ++iit)
 	{
@@ -3757,7 +3757,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-        AISAPI::FetchItem((*iit)->getUUID(), AISAPI::INVENTORY, false);
+        AISAPI::FetchItem((*iit)->getUUID(), AISAPI::INVENTORY);
 	}
 	gInventory.notifyObservers();
 
-- 
cgit v1.2.3


From f5adfae1ade864d80f630855bc65bf65f5ae7ece Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sun, 19 Mar 2023 05:07:44 +0100
Subject: SL-19099 The long name of the item is out of bounds on the Editing
 Tools/Content tab

---
 indra/llui/llfolderviewitem.cpp          | 2 +-
 indra/llui/llpanel.h                     | 1 +
 indra/newview/llpanelobjectinventory.cpp | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index eba93beed9..e2b5279aab 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -395,7 +395,7 @@ S32 LLFolderViewItem::arrange( S32* width, S32* height )
             // it is purely visual, so it is fine to do at our laisure
             refreshSuffix();
         }
-		mLabelWidth = getLabelXPos() + getLabelFontForStyle(mLabelStyle)->getWidth(mLabel) + getLabelFontForStyle(mLabelStyle)->getWidth(mLabelSuffix) + mLabelPaddingRight; 
+		mLabelWidth = getLabelXPos() + getLabelFontForStyle(mLabelStyle)->getWidth(mLabel) + getLabelFontForStyle(mLabelStyle)->getWidth(mLabelSuffix) + mLabelPaddingRight;
 		mLabelWidthDirty = false;
 	}
 
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index b8f47ef6ba..8018365d3e 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -127,6 +127,7 @@ public:
 	virtual 	void	clearCtrls(); // overridden in LLPanelObject and LLPanelVolume
 
 	// Border controls
+	const LLViewBorder* getBorder() const { return mBorder; }
 	void addBorder( LLViewBorder::Params p);
 	void addBorder();
 	void			removeBorder();
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index bd40c9dd2b..6a82a3b35d 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1368,7 +1368,8 @@ void LLPanelObjectInventory::reset()
 		LLEditMenuHandler::gEditMenuHandler = mFolders;
 	}
 
-	LLRect scroller_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
+	int offset = hasBorder() ? getBorder()->getBorderWidth() << 1 : 0;
+	LLRect scroller_rect(0, getRect().getHeight() - offset, getRect().getWidth() - offset, 0);
 	LLScrollContainer::Params scroll_p;
 	scroll_p.name("task inventory scroller");
 	scroll_p.rect(scroller_rect);
-- 
cgit v1.2.3


From 72131418aa943b93f61508993d7006b02ebd9c35 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 19 Mar 2023 16:11:21 +0200
Subject: SL-18629 Rebuild brocken link on fetch compeltion.

---
 indra/newview/llinventorymodel.cpp                | 47 +++++++++++++++++++++--
 indra/newview/llinventorymodel.h                  |  6 +++
 indra/newview/llinventorymodelbackgroundfetch.cpp | 10 ++++-
 indra/newview/llinventorymodelbackgroundfetch.h   |  5 +++
 4 files changed, 64 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index c54a59d12f..b82f0c3ede 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -41,6 +41,7 @@
 #include "llinventorypanel.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
+#include "llinventorymodelbackgroundfetch.h"
 #include "llinventoryobserver.h"
 #include "llinventorypanel.h"
 #include "llfloaterpreviewtrash.h"
@@ -439,6 +440,7 @@ LLInventoryModel::LLInventoryModel()
 	mIsNotifyObservers(FALSE),
 	mModifyMask(LLInventoryObserver::ALL),
 	mChangedItemIDs(),
+    mBulckFecthCallbackSlot(),
 	mObservers(),
 	mHttpRequestFG(NULL),
 	mHttpRequestBG(NULL),
@@ -470,6 +472,11 @@ void LLInventoryModel::cleanupInventory()
 		mObservers.erase(iter);
 		delete observer;
 	}
+
+    if (mBulckFecthCallbackSlot.connected())
+    {
+        mBulckFecthCallbackSlot.disconnect();
+    }
 	mObservers.clear();
 
 	// Run down HTTP transport
@@ -1750,6 +1757,15 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat,
 	notifyObservers();
 }
 
+void LLInventoryModel::rebuildBrockenLinks()
+{
+    for (LLUUID link_id : mPossiblyBrockenLinks)
+    {
+        addChangedMask(LLInventoryObserver::REBUILD, link_id);
+    }
+    mPossiblyBrockenLinks.clear();
+}
+
 // Does not appear to be used currently.
 void LLInventoryModel::onItemUpdated(const LLUUID& item_id, const LLSD& updates, bool update_parent_version)
 {
@@ -2368,9 +2384,34 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
 		// The item will show up as a broken link.
 		if (item->getIsBrokenLink())
 		{
-			LL_INFOS(LOG_INV) << "Adding broken link [ name: " << item->getName()
-							  << " itemID: " << item->getUUID()
-							  << " assetID: " << item->getAssetUUID() << " )  parent: " << item->getParentUUID() << LL_ENDL;
+            if (!LLInventoryModelBackgroundFetch::getInstance()->isEverythingFetched())
+            {
+                // isEverythingFetched is actually 'initial' fetch only.
+                // Schedule this link for a recheck once inventory gets loaded
+                mPossiblyBrockenLinks.insert(item->getUUID());
+                if (!mBulckFecthCallbackSlot.connected())
+                {
+                    // Links might take a while to update this way, and there
+                    // might be a lot of them. A better option might be to check
+                    // links periodically with final check on fetch completion.
+                    mBulckFecthCallbackSlot =
+                        LLInventoryModelBackgroundFetch::getInstance()->setAllFoldersFetchedCallback(
+                            []()
+                    {
+                        gInventory.rebuildBrockenLinks();
+                    });
+                }
+                LL_DEBUGS(LOG_INV) << "Scheduling a link to be rebuilt later [ name: " << item->getName()
+                    << " itemID: " << item->getUUID()
+                    << " assetID: " << item->getAssetUUID() << " )  parent: " << item->getParentUUID() << LL_ENDL;
+
+            }
+            else
+            {
+                LL_INFOS(LOG_INV) << "Adding broken link [ name: " << item->getName()
+                    << " itemID: " << item->getUUID()
+                    << " assetID: " << item->getAssetUUID() << " )  parent: " << item->getParentUUID() << LL_ENDL;
+            }
 		}
 		if (item->getIsLinkType())
 		{
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index d1ee7b6144..02278ed957 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -407,6 +407,10 @@ public:
 							  const LLUUID& new_parent_id,
 							  BOOL restamp);
 
+    // Marks links from a "possibly" broken list for a rebuild
+    // clears the list
+    void rebuildBrockenLinks();
+
 	//--------------------------------------------------------------------
 	// Delete
 	//--------------------------------------------------------------------
@@ -574,6 +578,8 @@ private:
     U32 mModifyMaskBacklog;
     changed_items_t mChangedItemIDsBacklog;
     changed_items_t mAddedItemIDsBacklog;
+    changed_items_t mPossiblyBrockenLinks;
+    boost::signals2::connection mBulckFecthCallbackSlot;
 	
 	
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 6cae035fcf..ea721b3a40 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -347,12 +347,20 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 		mAllFoldersFetched = true;
 		//LL_INFOS(LOG_INV) << "All folders fetched, validating" << LL_ENDL;
 		//gInventory.validate();
+
+        // For now only informs about initial fetch being done
+        mAllFoldersFetchedSignal();
 	}
 	mFolderFetchActive = false;
 	mBackgroundFetchActive = false;
 	LL_INFOS(LOG_INV) << "Inventory background fetch completed" << LL_ENDL;
 }
 
+boost::signals2::connection LLInventoryModelBackgroundFetch::setAllFoldersFetchedCallback(folders_fetched_callback_t cb)
+{
+    return mAllFoldersFetchedSignal.connect(cb);
+}
+
 void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
 {
 	LLInventoryModelBackgroundFetch::instance().backgroundFetch();
@@ -481,7 +489,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
             const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
             if (cat)
             {
-                if (!gInventory.isCategoryComplete(cat_id))
+                if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
                 {
                     if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
                     {
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 14557ea92d..038b634180 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -68,6 +68,9 @@ public:
 	bool isBulkFetchProcessingComplete() const;
 	void setAllFoldersFetched();
 
+    typedef boost::function<void()> folders_fetched_callback_t;
+    boost::signals2::connection setAllFoldersFetchedCallback(folders_fetched_callback_t cb);
+
 	void addRequestAtFront(const LLUUID & id, bool recursive, bool is_category);
 	void addRequestAtBack(const LLUUID & id, bool recursive, bool is_category);
 
@@ -106,6 +109,8 @@ private:
  	bool mRecursiveInventoryFetchStarted;
 	bool mRecursiveLibraryFetchStarted;
 	bool mAllFoldersFetched;
+    typedef boost::signals2::signal<void()> folders_fetched_signal_t;
+    folders_fetched_signal_t mAllFoldersFetchedSignal;
 
     bool mBackgroundFetchActive;
 	bool mFolderFetchActive;
-- 
cgit v1.2.3


From c23353cfc3f0a8c580c99332e47c288758a023c8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sun, 19 Mar 2023 17:50:13 +0100
Subject: SL-19417 Improve colors.xml behavior

---
 indra/llui/lluicolortable.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index 244f0c6f00..b84bb13edb 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -200,7 +200,6 @@ LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& defa
 void LLUIColorTable::setColor(const std::string& name, const LLColor4& color)
 {
 	setColor(name, color, mUserSetColors);
-	setColor(name, color, mLoadedColors);
 }
 
 bool LLUIColorTable::loadFromSettings()
@@ -229,6 +228,11 @@ void LLUIColorTable::saveUserSettings() const
 		it != mUserSetColors.end();
 		++it)
 	{
+		// Compare user color value with the default value, skip if equal
+		string_color_map_t::const_iterator itd = mLoadedColors.find(it->first);
+		if(itd != mUserSetColors.end() && itd->second == it->second)
+			continue;
+
 		ColorEntryParams color_entry;
 		color_entry.name = it->first;
 		color_entry.color.value = it->second;
-- 
cgit v1.2.3


From cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 20 Mar 2023 10:20:06 +0100
Subject: SL-18721: Faster viewer shutdown time since performance improvements
 can lead to perceived inventory loss due to cache corruption

---
 indra/llcommon/threadpool.cpp    | 5 +++++
 indra/llcommon/threadpool.h      | 4 ++++
 indra/llwindow/llwindowwin32.cpp | 3 +++
 3 files changed, 12 insertions(+)

(limited to 'indra')

diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index d5adf11264..4a7ead2110 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -39,6 +39,11 @@ void LL::ThreadPool::start()
                 run(tname);
             });
     }
+
+    // Special workflow for LLWindowWin32Thread - it's close() should be called explicitly
+    if (mExplicitShutdown)
+        return;
+
     // Listen on "LLApp", and when the app is shutting down, close the queue
     // and join the workers.
     LLEventPumps::instance().obtain("LLApp").listen(
diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index f8eec3b457..0a5f14529b 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -59,6 +59,10 @@ namespace LL
          */
         virtual void run();
 
+    protected:
+        // LLWindowWin32Thread should set this flag to true
+        bool mExplicitShutdown { false };
+
     private:
         void run(const std::string& name);
 
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 41f3042ace..afe26ec5a4 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -4581,6 +4581,9 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList()
 inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
     : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE)
 {
+    // Set this flag to true to avoid of implicit call of close() from start()
+    mExplicitShutdown = true;
+
     ThreadPool::start();
 }
 
-- 
cgit v1.2.3


From b68a67491026a055f0de9df349508b9e60a200ed Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 20 Mar 2023 22:06:20 +0200
Subject: SL-18629 Load cof only once links are ready

---
 indra/newview/llaisapi.cpp             | 68 ++++++++++++++++++----------------
 indra/newview/llappearancemgr.cpp      | 46 +++++++++++++++++++++++
 indra/newview/llappearancemgr.h        |  1 +
 indra/newview/llinventoryfunctions.cpp | 13 +++++++
 indra/newview/llinventoryfunctions.h   | 14 +++++++
 indra/newview/llinventorymodel.cpp     | 16 ++++----
 indra/newview/llinventorymodel.h       |  3 +-
 7 files changed, 121 insertions(+), 40 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index ece03d6988..d2bf7a0e9a 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -637,15 +637,17 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         bool needs_callback = true;
         LLUUID id(LLUUID::null);
 
-        if ( ( (type == COPYLIBRARYCATEGORY)
-               || (type == FETCHCATEGORYCATEGORIES)
-               || (type == FETCHCATEGORYCHILDREN))
-             && result.has("category_id"))
-        {
-            id = result["category_id"];
-	    }
-        if (type == FETCHITEM)
+        switch (type)
         {
+        case COPYLIBRARYCATEGORY:
+        case FETCHCATEGORYCATEGORIES:
+        case FETCHCATEGORYCHILDREN:
+            if (result.has("category_id"))
+            {
+                id = result["category_id"];
+            }
+            break;
+        case FETCHITEM:
             if (result.has("item_id"))
             {
                 id = result["item_id"];
@@ -654,33 +656,35 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
             {
                 id = result["linked_id"];
             }
-        }
-		if (type == CREATEINVENTORY)
-		{
+            break;
+        case CREATEINVENTORY:
             // CREATEINVENTORY can have multiple callbacks
-			if (result.has("_created_categories"))
-			{
-				LLSD& cats = result["_created_categories"];
-				LLSD::array_const_iterator cat_iter;
-				for (cat_iter = cats.beginArray(); cat_iter != cats.endArray(); ++cat_iter)
-				{
-					LLUUID cat_id = *cat_iter;
-					callback(cat_id);
+            if (result.has("_created_categories"))
+            {
+                LLSD& cats = result["_created_categories"];
+                LLSD::array_const_iterator cat_iter;
+                for (cat_iter = cats.beginArray(); cat_iter != cats.endArray(); ++cat_iter)
+                {
+                    LLUUID cat_id = *cat_iter;
+                    callback(cat_id);
                     needs_callback = false;
-				}
-			}
-			if (result.has("_created_items"))
-			{
-				LLSD& items = result["_created_items"];
-				LLSD::array_const_iterator item_iter;
-				for (item_iter = items.beginArray(); item_iter != items.endArray(); ++item_iter)
-				{
-					LLUUID item_id = *item_iter;
-					callback(item_id);
+                }
+            }
+            if (result.has("_created_items"))
+            {
+                LLSD& items = result["_created_items"];
+                LLSD::array_const_iterator item_iter;
+                for (item_iter = items.beginArray(); item_iter != items.endArray(); ++item_iter)
+                {
+                    LLUUID item_id = *item_iter;
+                    callback(item_id);
                     needs_callback = false;
-				}
-			}
-		}
+                }
+            }
+            break;
+        default:
+            break;
+        }
 
         if (needs_callback)
         {
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4e36a4c351..1de3cef3ba 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -40,6 +40,7 @@
 #include "llgesturemgr.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
+#include "llinventorymodelbackgroundfetch.h"
 #include "llinventoryobserver.h"
 #include "llnotificationsutil.h"
 #include "lloutfitobserver.h"
@@ -2416,6 +2417,46 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
 
 	LL_DEBUGS("Avatar") << self_av_string() << "starting" << LL_ENDL;
 
+    if (gInventory.hasPosiblyBrockenLinks())
+    {
+        // Inventory has either broken links or links that
+        // haven't loaded yet and fetch is still in progress.
+        // Check if LLAppearanceMgr needs to wait.
+        LLUUID current_outfit_id = getCOF();
+        LLInventoryModel::item_array_t cof_items;
+        LLInventoryModel::cat_array_t cof_cats;
+        LLFindBrokenLinks is_brocken_link;
+        gInventory.collectDescendentsIf(current_outfit_id,
+            cof_cats,
+            cof_items,
+            LLInventoryModel::EXCLUDE_TRASH,
+            is_brocken_link);
+
+        if (cof_items.size() > 0)
+        {
+            // Some links haven't loaded yet, but fetch isn't complete so
+            // links are likely fine and we will have to wait for them to
+            // load (if inventory takes too long to load, might be a good
+            // idea to make this check periodical)
+            if (!mBulkFecthCallbackSlot.connected())
+            {
+                nullary_func_t cb = post_update_func;
+                mBulkFecthCallbackSlot =
+                    LLInventoryModelBackgroundFetch::getInstance()->setAllFoldersFetchedCallback(
+                        [this, enforce_ordering, post_update_func, cb]()
+                {
+                    // inventory model should be already tracking this
+                    // callback, but make sure rebuildBrockenLinks gets
+                    // called before a cof update
+                    gInventory.rebuildBrockenLinks();
+                    updateAppearanceFromCOF(enforce_ordering, post_update_func, post_update_func);
+                    mBulkFecthCallbackSlot.disconnect();
+                });
+            }
+            return;
+        }
+    }
+
 	if (enforce_item_restrictions)
 	{
 		// The point here is just to call
@@ -4213,6 +4254,11 @@ LLAppearanceMgr::LLAppearanceMgr():
 LLAppearanceMgr::~LLAppearanceMgr()
 {
 	mActive = false;
+
+    if (!mBulkFecthCallbackSlot.connected())
+    {
+        mBulkFecthCallbackSlot.disconnect();
+    }
 }
 
 void LLAppearanceMgr::setAttachmentInvLinkEnable(bool val)
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 8a55a848db..53b8098a44 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -263,6 +263,7 @@ private:
 	bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls.
     bool mOutstandingAppearanceBakeRequest; // A bake request is outstanding.  Do not overlap.
     bool mRerequestAppearanceBake;
+    boost::signals2::connection mBulkFecthCallbackSlot;
 
 	/**
 	 * Lock for blocking operations on outfit until server reply or timeout exceed
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index c2e9137910..dd116ce2d2 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2274,6 +2274,19 @@ bool LLFindCOFValidItems::operator()(LLInventoryCategory* cat,
 	}
 }
 
+bool LLFindBrokenLinks::operator()(LLInventoryCategory* cat,
+    LLInventoryItem* item)
+{
+    // only for broken links getType will be a link
+    // otherwise it's supposed to have the type of an item
+    // it is linked too
+    if (item && LLAssetType::lookupIsLinkType(item->getType()))
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
 bool LLFindWearables::operator()(LLInventoryCategory* cat,
 								 LLInventoryItem* item)
 {
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index ec5e53f9a6..1cc778f8a5 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -360,6 +360,20 @@ public:
 	
 };
 
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLFindBrokenLinks
+//
+// Collects broken links
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class LLFindBrokenLinks : public LLInventoryCollectFunctor
+{
+public:
+    LLFindBrokenLinks() {}
+    virtual ~LLFindBrokenLinks() {}
+    virtual bool operator()(LLInventoryCategory* cat,
+        LLInventoryItem* item);
+};
+
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLFindByMask
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b82f0c3ede..b833571ee9 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -440,7 +440,7 @@ LLInventoryModel::LLInventoryModel()
 	mIsNotifyObservers(FALSE),
 	mModifyMask(LLInventoryObserver::ALL),
 	mChangedItemIDs(),
-    mBulckFecthCallbackSlot(),
+    mBulkFecthCallbackSlot(),
 	mObservers(),
 	mHttpRequestFG(NULL),
 	mHttpRequestBG(NULL),
@@ -473,9 +473,9 @@ void LLInventoryModel::cleanupInventory()
 		delete observer;
 	}
 
-    if (mBulckFecthCallbackSlot.connected())
+    if (mBulkFecthCallbackSlot.connected())
     {
-        mBulckFecthCallbackSlot.disconnect();
+        mBulkFecthCallbackSlot.disconnect();
     }
 	mObservers.clear();
 
@@ -1764,6 +1764,7 @@ void LLInventoryModel::rebuildBrockenLinks()
         addChangedMask(LLInventoryObserver::REBUILD, link_id);
     }
     mPossiblyBrockenLinks.clear();
+    notifyObservers();
 }
 
 // Does not appear to be used currently.
@@ -2389,16 +2390,17 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
                 // isEverythingFetched is actually 'initial' fetch only.
                 // Schedule this link for a recheck once inventory gets loaded
                 mPossiblyBrockenLinks.insert(item->getUUID());
-                if (!mBulckFecthCallbackSlot.connected())
+                if (!mBulkFecthCallbackSlot.connected())
                 {
                     // Links might take a while to update this way, and there
                     // might be a lot of them. A better option might be to check
                     // links periodically with final check on fetch completion.
-                    mBulckFecthCallbackSlot =
+                    mBulkFecthCallbackSlot =
                         LLInventoryModelBackgroundFetch::getInstance()->setAllFoldersFetchedCallback(
-                            []()
+                            [this]()
                     {
-                        gInventory.rebuildBrockenLinks();
+                        rebuildBrockenLinks();
+                        mBulkFecthCallbackSlot.disconnect();
                     });
                 }
                 LL_DEBUGS(LOG_INV) << "Scheduling a link to be rebuilt later [ name: " << item->getName()
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 02278ed957..ac6eda02d8 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -410,6 +410,7 @@ public:
     // Marks links from a "possibly" broken list for a rebuild
     // clears the list
     void rebuildBrockenLinks();
+    bool hasPosiblyBrockenLinks() const { return mPossiblyBrockenLinks.size() > 0; }
 
 	//--------------------------------------------------------------------
 	// Delete
@@ -579,7 +580,7 @@ private:
     changed_items_t mChangedItemIDsBacklog;
     changed_items_t mAddedItemIDsBacklog;
     changed_items_t mPossiblyBrockenLinks;
-    boost::signals2::connection mBulckFecthCallbackSlot;
+    boost::signals2::connection mBulkFecthCallbackSlot;
 	
 	
 	//--------------------------------------------------------------------
-- 
cgit v1.2.3


From e5b965c892154e5933b9cfe80ce750ff6f542620 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 20 Mar 2023 23:44:54 +0200
Subject: SL-19435 Bounce user back to login if caps are not present

---
 indra/newview/llstartup.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6883ead5ee..dd3b33982a 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1392,8 +1392,16 @@ bool idle_startup()
 		}
         else if (regionp->capabilitiesError())
         {
-            // Try to connect despite capabilities' error state
-            LLStartUp::setStartupState(STATE_SEED_CAP_GRANTED);
+            LL_WARNS("AppInit") << "Failed to get capabilities. Backing up to login screen!" << LL_ENDL;
+            if (gRememberPassword)
+            {
+                LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status);
+            }
+            else
+            {
+                LLNotificationsUtil::add("LoginPacketNeverReceivedNoTP", LLSD(), LLSD(), login_alert_status);
+            }
+            reset_login();
         }
 		else
 		{
-- 
cgit v1.2.3


From b1fc17a50e9787163d8d984868050926ef7fa4dc Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 21 Mar 2023 01:17:43 +0100
Subject: SL-19348 Remove 'get mesh_rez_enabled' code in viewer

---
 indra/newview/llfloaterregioninfo.cpp | 14 --------------
 indra/newview/llfloaterregioninfo.h   |  1 -
 2 files changed, 15 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 07d4dcae38..9fb4040f5f 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -317,7 +317,6 @@ void LLFloaterRegionInfo::onOpen(const LLSD& key)
 	}
 	refreshFromRegion(gAgent.getRegion());
 	requestRegionInfo();
-	requestMeshRezInfo();
 
 	if (!mGodLevelChangeSlot.connected())
 	{
@@ -1008,19 +1007,6 @@ bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const L
 	return false;
 }
 
-void LLFloaterRegionInfo::requestMeshRezInfo()
-{
-	std::string sim_console_url = gAgent.getRegionCapability("SimConsoleAsync");
-
-	if (!sim_console_url.empty())
-	{
-		std::string request_str = "get mesh_rez_enabled";
-		
-        LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(sim_console_url, LLSD(request_str),
-            "Requested mesh_rez_enabled", "Error requesting mesh_rez_enabled");
-	}
-}
-
 // setregioninfo
 // strings[0] = 'Y' - block terraform, 'N' - not
 // strings[1] = 'Y' - block fly, 'N' - not
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index c34dbb62e8..3eb39b250f 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -102,7 +102,6 @@ public:
 	
 	void onRegionChanged();
 	void requestRegionInfo();
-	void requestMeshRezInfo();
 	void enableTopButtons();
 	void disableTopButtons();
 
-- 
cgit v1.2.3


From 1eab3247111e66a3b81153173d1624a5c1c9fb72 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 21 Mar 2023 17:47:26 +0200
Subject: SL-19379 WIP Gallery view Inventory: first pass

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llinspecttexture.cpp                 |  14 -
 indra/newview/llinventoryfunctions.cpp             |   5 +
 indra/newview/llinventoryfunctions.h               |   9 +
 indra/newview/llinventorygallery.cpp               | 924 +++++++++++++++++++++
 indra/newview/llinventorygallery.h                 | 233 ++++++
 indra/newview/llinventorypanel.cpp                 |  11 +-
 indra/newview/llinventorypanel.h                   |   5 +
 indra/newview/llpanelmaininventory.cpp             | 157 +++-
 indra/newview/llpanelmaininventory.h               |  18 +-
 .../default/xui/en/menu_inventory_view_default.xml |   1 +
 .../default/xui/en/panel_inventory_gallery.xml     |  37 +
 .../xui/en/panel_inventory_gallery_item.xml        |  63 ++
 .../skins/default/xui/en/panel_main_inventory.xml  |  23 +
 14 files changed, 1459 insertions(+), 43 deletions(-)
 create mode 100644 indra/newview/llinventorygallery.cpp
 create mode 100644 indra/newview/llinventorygallery.h
 create mode 100644 indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7c30d8eba8..d587f8bfc4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -380,6 +380,7 @@ set(viewer_SOURCE_FILES
     llinventorybridge.cpp
     llinventoryfilter.cpp
     llinventoryfunctions.cpp
+    llinventorygallery.cpp
     llinventoryicon.cpp
     llinventoryitemslist.cpp
     llinventorylistitem.cpp
@@ -1023,6 +1024,7 @@ set(viewer_HEADER_FILES
     llinventorybridge.h
     llinventoryfilter.h
     llinventoryfunctions.h
+    llinventorygallery.h
     llinventoryicon.h
     llinventoryitemslist.h
     llinventorylistitem.h
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index 843b4da757..82676bced8 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -38,20 +38,6 @@
 // Helper functions
 //
 
-class LLIsTextureType : public LLInventoryCollectFunctor
-{
-public:
-    LLIsTextureType() {}
-    virtual ~LLIsTextureType() {}
-    virtual bool operator()(LLInventoryCategory* cat,
-        LLInventoryItem* item);
-};
-
-bool LLIsTextureType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
-{
-    return item && (item->getType() == LLAssetType::AT_TEXTURE);
-}
-
 LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
 {
     const LLSD& sdTooltip = p.create_params;
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index dd116ce2d2..68722e91b3 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2352,6 +2352,11 @@ void LLFindWearablesOfType::setType(LLWearableType::EType type)
 	mWearableType = type;
 }
 
+bool LLIsTextureType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+{
+    return item && (item->getType() == LLAssetType::AT_TEXTURE);
+}
+
 bool LLFindNonRemovableObjects::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 {
 	if (item)
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 1cc778f8a5..918e919e61 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -472,6 +472,15 @@ private:
 	LLWearableType::EType mWearableType;
 };
 
+class LLIsTextureType : public LLInventoryCollectFunctor
+{
+public:
+    LLIsTextureType() {}
+    virtual ~LLIsTextureType() {}
+    virtual bool operator()(LLInventoryCategory* cat,
+        LLInventoryItem* item);
+};
+
 /** Filter out wearables-links */
 class LLFindActualWearablesOfType : public LLFindWearablesOfType
 {
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
new file mode 100644
index 0000000000..b5fd3aaece
--- /dev/null
+++ b/indra/newview/llinventorygallery.cpp
@@ -0,0 +1,924 @@
+/**
+ * @file llinventorygallery.cpp
+ * @brief LLInventoryGallery class implementation
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llinventorygallery.h"
+
+#include "llaccordionctrltab.h"
+#include "llcommonutils.h"
+#include "lliconctrl.h"
+#include "llinventorybridge.h"
+#include "llinventoryfunctions.h"
+#include "llinventorymodel.h"
+#include "llthumbnailctrl.h"
+#include "lltextbox.h"
+#include "llviewerfoldertype.h"
+
+#include "llinventoryicon.h"
+
+static LLPanelInjector<LLInventoryGallery> t_inventory_gallery("inventory_gallery");
+
+const S32 GALLERY_ITEMS_PER_ROW_MIN = 2;
+
+LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
+    : LLPanel(),
+      mScrollPanel(NULL),
+      mGalleryPanel(NULL),
+      mLastRowPanel(NULL),
+      mGalleryCreated(false),
+      mRowCount(0),
+      mItemsAddedCount(0),
+      mRowPanelHeight(p.row_panel_height),
+      mVerticalGap(p.vertical_gap),
+      mHorizontalGap(p.horizontal_gap),
+      mItemWidth(p.item_width),
+      mItemHeight(p.item_height),
+      mItemHorizontalGap(p.item_horizontal_gap),
+      mItemsInRow(p.items_in_row),
+      mRowPanWidthFactor(p.row_panel_width_factor),
+      mGalleryWidthFactor(p.gallery_width_factor),
+      mIsInitialized(false)
+{
+    updateGalleryWidth();
+}
+
+LLInventoryGallery::Params::Params()
+    : row_panel_height("row_panel_height", 180),
+      vertical_gap("vertical_gap", 10),
+      horizontal_gap("horizontal_gap", 10),
+      item_width("item_width", 150),
+      item_height("item_height", 175),
+      item_horizontal_gap("item_horizontal_gap", 16),
+      items_in_row("items_in_row", GALLERY_ITEMS_PER_ROW_MIN),
+      row_panel_width_factor("row_panel_width_factor", 166),
+      gallery_width_factor("gallery_width_factor", 163)
+{
+    addSynonym(row_panel_height, "row_height");
+}
+
+const LLInventoryGallery::Params& LLInventoryGallery::getDefaultParams()
+{
+    return LLUICtrlFactory::getDefaultParams<LLInventoryGallery>();
+}
+
+BOOL LLInventoryGallery::postBuild()
+{
+    mScrollPanel = getChild<LLScrollContainer>("gallery_scroll_panel");
+    LLPanel::Params params = LLPanel::getDefaultParams();
+    mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
+    mMessageTextBox = getChild<LLTextBox>("empty_txt");
+
+    return TRUE;
+}
+
+LLInventoryGallery::~LLInventoryGallery()
+{
+    while (!mUnusedRowPanels.empty())
+    {
+        LLPanel* panelp = mUnusedRowPanels.back();
+        mUnusedRowPanels.pop_back();
+        panelp->die();
+    }
+    while (!mUnusedItemPanels.empty())
+    {
+        LLPanel* panelp = mUnusedItemPanels.back();
+        mUnusedItemPanels.pop_back();
+        panelp->die();
+    }
+
+    if (gInventory.containsObserver(mCategoriesObserver))
+    {
+        gInventory.removeObserver(mCategoriesObserver);
+    }
+    delete mCategoriesObserver;
+}
+
+void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
+{
+    LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
+    if(!category || (mFolderID == cat_id))
+    {
+        return;
+    }
+    if(mFolderID.notNull())
+    {
+        mBackwardFolders.push_back(mFolderID);
+    }
+    mFolderID = cat_id;
+    updateRootFolder();
+}
+
+void LLInventoryGallery::updateRootFolder()
+{
+    if (mIsInitialized)
+    {
+        S32 count = mItemsAddedCount;
+        for (S32 i = count - 1; i >= 0; i--)
+        {
+            updateRemovedItem(mItems[i]->getUUID());
+        }
+        
+        if (gInventory.containsObserver(mCategoriesObserver))
+        {
+            gInventory.removeObserver(mCategoriesObserver);
+        }
+        delete mCategoriesObserver;
+    }
+    {
+        mRootChangedSignal();
+
+        mCategoriesObserver = new LLInventoryCategoriesObserver();
+        gInventory.addObserver(mCategoriesObserver);
+        
+        // Start observing changes in selected category.
+        mCategoriesObserver->addCategory(mFolderID,
+            boost::bind(&LLInventoryGallery::refreshList, this, mFolderID));
+
+        LLViewerInventoryCategory* category = gInventory.getCategory(mFolderID);
+        //If not all items are fetched now
+        // the observer will refresh the list as soon as the new items
+        // arrive.
+        category->fetch();
+        
+        //refreshList(cat_id);
+        LLInventoryModel::cat_array_t* cat_array;
+        LLInventoryModel::item_array_t* item_array;
+
+        gInventory.getDirectDescendentsOf(mFolderID, cat_array, item_array);
+
+        // Creating a vector of newly collected sub-categories UUIDs.
+        for (LLInventoryModel::cat_array_t::const_iterator iter = cat_array->begin();
+            iter != cat_array->end();
+            iter++)
+        {
+            updateAddedItem((*iter)->getUUID());
+        }
+        
+        for (LLInventoryModel::item_array_t::const_iterator iter = item_array->begin();
+            iter != item_array->end();
+            iter++)
+        {
+            updateAddedItem((*iter)->getUUID());
+        }
+        reArrangeRows();
+        mIsInitialized = true;
+
+        if (mScrollPanel)
+        {
+            mScrollPanel->goToTop();
+        }
+    }
+
+    if (!mGalleryCreated)
+    {
+        initGallery();
+    }
+}
+
+void LLInventoryGallery::initGallery()
+{
+    if (!mGalleryCreated)
+    {
+        uuid_vec_t cats;
+        getCurrentCategories(cats);
+        int n = cats.size();
+        buildGalleryPanel(n);
+        mScrollPanel->addChild(mGalleryPanel);
+        for (int i = 0; i < n; i++)
+        {
+            addToGallery(mItemMap[cats[i]]);
+        }
+        reArrangeRows();
+        mGalleryCreated = true;
+    }
+}
+
+void LLInventoryGallery::draw()
+{
+    LLPanel::draw();
+    if (mGalleryCreated)
+    {
+        updateRowsIfNeeded();
+    }
+}
+
+void LLInventoryGallery::updateRowsIfNeeded()
+{
+    if(((getRect().getWidth() - mRowPanelWidth) > mItemWidth) && mRowCount > 1)
+    {
+        reArrangeRows(1);
+    }
+    else if((mRowPanelWidth > (getRect().getWidth() + mItemHorizontalGap)) && mItemsInRow > GALLERY_ITEMS_PER_ROW_MIN)
+    {
+        reArrangeRows(-1);
+    }
+}
+
+bool compareGalleryItem(LLInventoryGalleryItem* item1, LLInventoryGalleryItem* item2)
+{
+    if (item1->getSortGroup() != item2->getSortGroup())
+    {
+        return (item1->getSortGroup() < item2->getSortGroup());
+    }
+    if(((item1->isDefaultImage() && item2->isDefaultImage()) || (!item1->isDefaultImage() && !item2->isDefaultImage())))
+    {
+        std::string name1 = item1->getItemName();
+        std::string name2 = item2->getItemName();
+
+        return (LLStringUtil::compareDict(name1, name2) < 0);
+    }
+    else
+    {
+        return item2->isDefaultImage();
+    }
+}
+
+void LLInventoryGallery::reArrangeRows(S32 row_diff)
+{
+    std::vector<LLInventoryGalleryItem*> buf_items = mItems;
+    for (std::vector<LLInventoryGalleryItem*>::const_reverse_iterator it = buf_items.rbegin(); it != buf_items.rend(); ++it)
+    {
+        removeFromGalleryLast(*it);
+    }
+    for (std::vector<LLInventoryGalleryItem*>::const_reverse_iterator it = mHiddenItems.rbegin(); it != mHiddenItems.rend(); ++it)
+    {
+        buf_items.push_back(*it);
+    }
+    mHiddenItems.clear();
+    
+    mItemsInRow+= row_diff;
+    updateGalleryWidth();
+    std::sort(buf_items.begin(), buf_items.end(), compareGalleryItem);
+    
+    for (std::vector<LLInventoryGalleryItem*>::const_iterator it = buf_items.begin(); it != buf_items.end(); ++it)
+    {
+        (*it)->setHidden(false);
+        applyFilter(*it, mFilterSubString);
+        addToGallery(*it);
+    }
+    updateMessageVisibility();
+}
+
+void LLInventoryGallery::updateGalleryWidth()
+{
+    mRowPanelWidth = mRowPanWidthFactor * mItemsInRow - mItemHorizontalGap;
+    mGalleryWidth = mGalleryWidthFactor * mItemsInRow - mItemHorizontalGap;
+}
+
+LLPanel* LLInventoryGallery::addLastRow()
+{
+    mRowCount++;
+    int row = 0;
+    int vgap = mVerticalGap * row;
+    LLPanel* result = buildRowPanel(0, row * mRowPanelHeight + vgap);
+    mGalleryPanel->addChild(result);
+    return result;
+}
+
+void LLInventoryGallery::moveRowUp(int row)
+{
+    moveRow(row, mRowCount - 1 - row + 1);
+}
+
+void LLInventoryGallery::moveRowDown(int row)
+{
+    moveRow(row, mRowCount - 1 - row - 1);
+}
+
+void LLInventoryGallery::moveRow(int row, int pos)
+{
+    int vgap = mVerticalGap * pos;
+    moveRowPanel(mRowPanels[row], 0, pos * mRowPanelHeight + vgap);
+}
+
+void LLInventoryGallery::removeLastRow()
+{
+    mRowCount--;
+    mGalleryPanel->removeChild(mLastRowPanel);
+    mUnusedRowPanels.push_back(mLastRowPanel);
+    mRowPanels.pop_back();
+    if (mRowPanels.size() > 0)
+    {
+        // Just removed last row
+        mLastRowPanel = mRowPanels.back();
+    }
+    else
+    {
+        mLastRowPanel = NULL;
+    }
+}
+
+LLPanel* LLInventoryGallery::addToRow(LLPanel* row_stack, LLInventoryGalleryItem* item, int pos, int hgap)
+{
+    LLPanel* lpanel = buildItemPanel(pos * mItemWidth + hgap);
+    lpanel->addChild(item);
+    row_stack->addChild(lpanel);
+    mItemPanels.push_back(lpanel);
+    return lpanel;
+}
+
+void LLInventoryGallery::addToGallery(LLInventoryGalleryItem* item)
+{
+    if(item->isHidden())
+    {
+        mHiddenItems.push_back(item);
+        return;
+    }
+    mItemsAddedCount++;
+    mItemIndexMap[item] = mItemsAddedCount - 1;
+    int n = mItemsAddedCount;
+    int row_count = (n % mItemsInRow) == 0 ? n / mItemsInRow : n / mItemsInRow + 1;
+    int n_prev = n - 1;
+    int row_count_prev = (n_prev % mItemsInRow) == 0 ? n_prev / mItemsInRow : n_prev / mItemsInRow + 1;
+
+    bool add_row = row_count != row_count_prev;
+    int pos = 0;
+    if (add_row)
+    {
+        for (int i = 0; i < row_count_prev; i++)
+        {
+            moveRowUp(i);
+        }
+        mLastRowPanel = addLastRow();
+        mRowPanels.push_back(mLastRowPanel);
+    }
+    pos = (n - 1) % mItemsInRow;
+    mItems.push_back(item);
+    addToRow(mLastRowPanel, item, pos, mHorizontalGap * pos);
+    reshapeGalleryPanel(row_count);
+}
+
+
+void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item)
+{
+    if(item->isHidden())
+    {
+        mHiddenItems.pop_back();
+        return;
+    }
+    int n_prev = mItemsAddedCount;
+    int n = mItemsAddedCount - 1;
+    int row_count = (n % mItemsInRow) == 0 ? n / mItemsInRow : n / mItemsInRow + 1;
+    int row_count_prev = (n_prev % mItemsInRow) == 0 ? n_prev / mItemsInRow : n_prev / mItemsInRow + 1;
+    mItemsAddedCount--;
+
+    bool remove_row = row_count != row_count_prev;
+    removeFromLastRow(mItems[mItemsAddedCount]);
+    mItems.pop_back();
+    if (remove_row)
+    {
+        for (int i = 0; i < row_count_prev - 1; i++)
+        {
+            moveRowDown(i);
+        }
+        removeLastRow();
+    }
+    reshapeGalleryPanel(row_count);
+}
+
+
+void LLInventoryGallery::removeFromGalleryMiddle(LLInventoryGalleryItem* item)
+{
+    if(item->isHidden())
+    {
+        mHiddenItems.erase(std::remove(mHiddenItems.begin(), mHiddenItems.end(), item), mHiddenItems.end());
+        return;
+    }
+    int n = mItemIndexMap[item];
+    mItemIndexMap.erase(item);
+    std::vector<LLInventoryGalleryItem*> saved;
+    for (int i = mItemsAddedCount - 1; i > n; i--)
+    {
+        saved.push_back(mItems[i]);
+        removeFromGalleryLast(mItems[i]);
+    }
+    removeFromGalleryLast(mItems[n]);
+    int saved_count = saved.size();
+    for (int i = 0; i < saved_count; i++)
+    {
+        addToGallery(saved.back());
+        saved.pop_back();
+    }
+}
+
+void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
+{
+    mItemPanels.back()->removeChild(item);
+    mLastRowPanel->removeChild(mItemPanels.back());
+    mUnusedItemPanels.push_back(mItemPanels.back());
+    mItemPanels.pop_back();
+}
+
+LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id)
+{
+    LLInventoryGalleryItem::Params giparams;
+    LLInventoryGalleryItem* gitem = LLUICtrlFactory::create<LLInventoryGalleryItem>(giparams);
+    gitem->reshape(mItemWidth, mItemHeight);
+    gitem->setVisible(true);
+    gitem->setFollowsLeft();
+    gitem->setFollowsTop();
+    gitem->setName(name);
+    gitem->setUUID(item_id);
+    gitem->setGallery(this);
+    gitem->setType(type);
+    gitem->setThumbnail(thumbnail_id);
+    return gitem;
+}
+
+void LLInventoryGallery::buildGalleryPanel(int row_count)
+{
+    LLPanel::Params params;
+    mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
+    reshapeGalleryPanel(row_count);
+}
+
+void LLInventoryGallery::reshapeGalleryPanel(int row_count)
+{
+    int bottom = 0;
+    int left = 0;
+    int height = row_count * (mRowPanelHeight + mVerticalGap);
+    LLRect rect = LLRect(left, bottom + height, left + mGalleryWidth, bottom);
+    mGalleryPanel->setRect(rect);
+    mGalleryPanel->reshape(mGalleryWidth, height);
+    mGalleryPanel->setVisible(true);
+    mGalleryPanel->setFollowsLeft();
+    mGalleryPanel->setFollowsTop();
+}
+
+LLPanel* LLInventoryGallery::buildItemPanel(int left)
+{
+    LLPanel::Params lpparams;
+    int top = 0;
+    LLPanel* lpanel = NULL;
+    if(mUnusedItemPanels.empty())
+    {
+        lpanel = LLUICtrlFactory::create<LLPanel>(lpparams);
+    }
+    else
+    {
+        lpanel = mUnusedItemPanels.back();
+        mUnusedItemPanels.pop_back();
+    }
+    LLRect rect = LLRect(left, top + mItemHeight, left + mItemWidth + mItemHorizontalGap, top);
+    lpanel->setRect(rect);
+    lpanel->reshape(mItemWidth + mItemHorizontalGap, mItemHeight);
+    lpanel->setVisible(true);
+    lpanel->setFollowsLeft();
+    lpanel->setFollowsTop();
+    return lpanel;
+}
+
+LLPanel* LLInventoryGallery::buildRowPanel(int left, int bottom)
+{
+    LLPanel::Params sparams;
+    LLPanel* stack = NULL;
+    if(mUnusedRowPanels.empty())
+    {
+        stack = LLUICtrlFactory::create<LLPanel>(sparams);
+    }
+    else
+    {
+        stack = mUnusedRowPanels.back();
+        mUnusedRowPanels.pop_back();
+    }
+    moveRowPanel(stack, left, bottom);
+    return stack;
+}
+
+void LLInventoryGallery::moveRowPanel(LLPanel* stack, int left, int bottom)
+{
+    LLRect rect = LLRect(left, bottom + mRowPanelHeight, left + mRowPanelWidth, bottom);
+    stack->setRect(rect);
+    stack->reshape(mRowPanelWidth, mRowPanelHeight);
+    stack->setVisible(true);
+    stack->setFollowsLeft();
+    stack->setFollowsTop();
+}
+
+void LLInventoryGallery::setFilterSubString(const std::string& string)
+{
+    mFilterSubString = string;
+    reArrangeRows();
+}
+
+void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring)
+{
+    if (!item) return;
+
+    std::string item_name = item->getItemName();
+    LLStringUtil::toUpper(item_name);
+
+    std::string cur_filter = filter_substring;
+    LLStringUtil::toUpper(cur_filter);
+
+    bool hidden = (std::string::npos == item_name.find(cur_filter));
+    item->setHidden(hidden);
+}
+
+void LLInventoryGallery::getCurrentCategories(uuid_vec_t& vcur)
+{
+    for (gallery_item_map_t::const_iterator iter = mItemMap.begin();
+        iter != mItemMap.end();
+        iter++)
+    {
+        if ((*iter).second != NULL)
+        {
+            vcur.push_back((*iter).first);
+        }
+    }
+}
+
+void LLInventoryGallery::updateAddedItem(LLUUID item_id)
+{
+    LLInventoryObject* obj = gInventory.getObject(item_id);
+    if (!obj)
+    {
+        LL_WARNS("InventoryGallery") << "Failed to find item: " << item_id << LL_ENDL;
+        return;
+    }
+
+    LLUUID thumbnail_id = obj->getThumbnailUUID();;
+
+    if ((LLAssetType::AT_CATEGORY == obj->getType()) && thumbnail_id.isNull())
+    {
+        thumbnail_id = getOutfitImageID(item_id);
+    }
+
+    LLInventoryGalleryItem* item = buildGalleryItem(obj->getName(), item_id, obj->getType(), thumbnail_id);
+    mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
+
+    item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::onChangeItemSelection, this, item_id));
+    if (mGalleryCreated)
+    {
+        addToGallery(item);
+    }
+}
+
+void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
+{
+    gallery_item_map_t::iterator item_iter = mItemMap.find(item_id);
+    if (item_iter != mItemMap.end())
+    {
+        LLInventoryGalleryItem* item = item_iter->second;
+
+        deselectItem(item_id);
+        mItemMap.erase(item_iter);
+        removeFromGalleryMiddle(item);
+
+        // kill removed item
+        if (item != NULL)
+        {
+            item->die();
+        }
+    }
+
+}
+
+void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
+{
+    gallery_item_map_t::iterator iter = mItemMap.find(item_id);
+    if (iter != mItemMap.end())
+    {
+        LLInventoryGalleryItem* item = iter->second;
+        if (item)
+        {
+            item->setName(name);
+        }
+    }
+}
+
+void LLInventoryGallery::onChangeItemSelection(const LLUUID& category_id)
+{
+    if (mSelectedItemID == category_id)
+        return;
+
+    if (mItemMap[mSelectedItemID])
+    {
+        mItemMap[mSelectedItemID]->setSelected(FALSE);
+    }
+    if (mItemMap[category_id])
+    {
+        mItemMap[category_id]->setSelected(TRUE);
+    }
+    mSelectedItemID = category_id;
+    signalSelectionItemID(category_id);
+}
+
+void LLInventoryGallery::updateMessageVisibility()
+{
+    mMessageTextBox->setVisible(mItems.empty());
+    mScrollPanel->setVisible(!mItems.empty());
+}
+
+void LLInventoryGallery::refreshList(const LLUUID& category_id)
+{
+    LLInventoryModel::cat_array_t* cat_array;
+    LLInventoryModel::item_array_t* item_array;
+
+    gInventory.getDirectDescendentsOf(category_id, cat_array, item_array);
+    uuid_vec_t vadded;
+    uuid_vec_t vremoved;
+
+    // Create added and removed items vectors.
+    computeDifference(*cat_array, *item_array, vadded, vremoved);
+
+    // Handle added tabs.
+    for (uuid_vec_t::const_iterator iter = vadded.begin();
+        iter != vadded.end();
+        ++iter)
+    {
+        const LLUUID cat_id = (*iter);
+        updateAddedItem(cat_id);
+    }
+
+    // Handle removed tabs.
+    for (uuid_vec_t::const_iterator iter = vremoved.begin(); iter != vremoved.end(); ++iter)
+    {
+        const LLUUID cat_id = (*iter);
+        updateRemovedItem(cat_id);
+    }
+
+    const LLInventoryModel::changed_items_t& changed_items = gInventory.getChangedIDs();
+    for (LLInventoryModel::changed_items_t::const_iterator items_iter = changed_items.begin();
+        items_iter != changed_items.end();
+        ++items_iter)
+    {
+        LLInventoryObject* obj = gInventory.getObject(*items_iter);
+        if(!obj)
+        {
+            return;
+        }
+
+        updateChangedItemName(*items_iter, obj->getName());
+    }
+
+}
+
+void LLInventoryGallery::computeDifference(
+    const LLInventoryModel::cat_array_t vcats,
+    const LLInventoryModel::item_array_t vitems,
+    uuid_vec_t& vadded,
+    uuid_vec_t& vremoved)
+{
+    uuid_vec_t vnew;
+    // Creating a vector of newly collected UUIDs.
+    for (LLInventoryModel::cat_array_t::const_iterator iter = vcats.begin();
+        iter != vcats.end();
+        iter++)
+    {
+        vnew.push_back((*iter)->getUUID());
+    }
+    for (LLInventoryModel::item_array_t::const_iterator iter = vitems.begin();
+        iter != vitems.end();
+        iter++)
+    {
+        vnew.push_back((*iter)->getUUID());
+    }
+
+    uuid_vec_t vcur;
+    getCurrentCategories(vcur);
+
+    LLCommonUtils::computeDifference(vnew, vcur, vadded, vremoved);
+}
+
+void LLInventoryGallery::deselectItem(const LLUUID& category_id)
+{
+    // Reset selection if the item is selected.
+    if (category_id == mSelectedItemID)
+    {
+        mSelectedItemID = LLUUID::null;
+        signalSelectionItemID(mSelectedItemID);
+    }
+}
+
+void LLInventoryGallery::signalSelectionItemID(const LLUUID& category_id)
+{
+    mSelectionChangeSignal(category_id);
+}
+
+boost::signals2::connection LLInventoryGallery::setSelectionChangeCallback(selection_change_callback_t cb)
+{
+    return mSelectionChangeSignal.connect(cb);
+}
+
+LLUUID LLInventoryGallery::getOutfitImageID(LLUUID outfit_id)
+{
+    LLUUID thumbnail_id;
+    LLViewerInventoryCategory* cat = gInventory.getCategory(outfit_id);
+    if (cat && cat->getPreferredType() == LLFolderType::FT_OUTFIT)
+    {
+        LLInventoryModel::cat_array_t cats;
+        LLInventoryModel::item_array_t items;
+        // Not LLIsOfAssetType, because we allow links
+        LLIsTextureType f;
+        gInventory.getDirectDescendentsOf(outfit_id, cats, items, f);
+
+        // Exactly one texture found => show the texture as thumbnail
+        if (1 == items.size())
+        {
+            LLViewerInventoryItem* item = items.front();
+            if (item && item->getIsLinkType())
+            {
+                item = item->getLinkedItem();
+            }
+            if (item)
+            {
+                thumbnail_id = item->getAssetUUID();
+            }
+        }
+    }
+    return thumbnail_id;
+}
+
+boost::signals2::connection LLInventoryGallery::setRootChangedCallback(root_changed_callback_t cb)
+{
+    return mRootChangedSignal.connect(cb);
+}
+
+void LLInventoryGallery::onForwardFolder()
+{
+    if(isForwardAvailable())
+    {
+        mBackwardFolders.push_back(mFolderID);
+        mFolderID = mForwardFolders.back();
+        mForwardFolders.pop_back();
+        updateRootFolder();
+    }
+}
+
+void LLInventoryGallery::onBackwardFolder()
+{
+    if(isBackwardAvailable())
+    {
+        mForwardFolders.push_back(mFolderID);
+        mFolderID = mBackwardFolders.back();
+        mBackwardFolders.pop_back();
+        updateRootFolder();
+    }
+}
+
+void LLInventoryGallery::clearNavigationHistory()
+{
+    mForwardFolders.clear();
+    mBackwardFolders.clear();
+}
+
+bool LLInventoryGallery::isBackwardAvailable()
+{
+    return (!mBackwardFolders.empty() && (mFolderID != mBackwardFolders.back()));
+}
+
+bool LLInventoryGallery::isForwardAvailable()
+{
+    return (!mForwardFolders.empty() && (mFolderID != mForwardFolders.back()));
+}
+//-----------------------------
+// LLInventoryGalleryItem
+//-----------------------------
+
+static LLDefaultChildRegistry::Register<LLInventoryGalleryItem> r("inventory_gallery_item");
+
+LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
+    : LLPanel(p),
+    mSelected(false),
+    mDefaultImage(true),
+    mName(""),
+    mUUID(LLUUID()),
+    mIsFolder(true),
+    mGallery(NULL),
+    mType(LLAssetType::AT_NONE),
+    mSortGroup(SG_ITEM)
+{
+    buildFromFile("panel_inventory_gallery_item.xml");
+}
+
+LLInventoryGalleryItem::~LLInventoryGalleryItem()
+{
+}
+
+BOOL LLInventoryGalleryItem::postBuild()
+{
+    mNameText = getChild<LLTextBox>("item_name");
+
+    mTextBgPanel = getChild<LLPanel>("text_bg_panel");
+    mHidden = false;
+    return TRUE;
+}
+
+void LLInventoryGalleryItem::setType(LLAssetType::EType type)
+{
+    mType = type;
+    mIsFolder = (mType == LLAssetType::AT_CATEGORY);
+
+    std::string icon_name = LLInventoryIcon::getIconName(mType);
+    if(mIsFolder)
+    {
+        mSortGroup = SG_NORMAL_FOLDER;
+        LLViewerInventoryCategory * cat = gInventory.getCategory(mUUID);
+        if (cat)
+        {
+            LLFolderType::EType preferred_type = cat->getPreferredType();
+            icon_name = LLViewerFolderType::lookupIconName(preferred_type);
+
+            if (preferred_type == LLFolderType::FT_TRASH)
+            {
+                mSortGroup = SG_TRASH_FOLDER;
+            }
+            else if(LLFolderType::lookupIsProtectedType(cat->getPreferredType()))
+            {
+                mSortGroup = SG_SYSTEM_FOLDER;
+            }
+        }
+    }
+
+    getChild<LLIconCtrl>("item_type")->setValue(icon_name);
+}
+
+void LLInventoryGalleryItem::setThumbnail(LLUUID id)
+{
+    mDefaultImage = id.isNull();
+    if(mDefaultImage)
+    {
+        getChild<LLThumbnailCtrl>("preview_thumbnail")->setValue("Thumbnail_Fallback");
+    }
+    else
+    {
+        getChild<LLThumbnailCtrl>("preview_thumbnail")->setValue(id);
+    }
+}
+
+void LLInventoryGalleryItem::draw()
+{
+    LLPanel::draw();
+
+    // Draw border
+    LLUIColor border_color = LLUIColorTable::instance().getColor(mSelected ? "MenuItemHighlightBgColor" : "TextFgTentativeColor", LLColor4::white);
+    LLRect border = getChildView("preview_thumbnail")->getRect();
+    border.mRight = border.mRight + 1;
+    gl_rect_2d(border, border_color.get(), FALSE);
+}
+
+void LLInventoryGalleryItem::setName(std::string name)
+{
+    mNameText->setText(name);
+    mNameText->setToolTip(name);
+    mName = name;
+}
+
+void LLInventoryGalleryItem::setSelected(bool value)
+{
+    mSelected = value;
+    mTextBgPanel->setBackgroundVisible(value);
+}
+
+BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+    setFocus(TRUE);
+    return LLUICtrl::handleMouseDown(x, y, mask);
+}
+
+BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+    setFocus(TRUE);
+    return LLUICtrl::handleRightMouseDown(x, y, mask);
+}
+
+BOOL LLInventoryGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    if (mIsFolder && mGallery)
+    {
+        mGallery->setRootFolder(mUUID);
+    }
+    else
+    {
+        LLInvFVBridgeAction::doAction(mUUID,&gInventory);
+        //todo: some item types require different handling
+    }
+
+    return TRUE;
+}
+
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
new file mode 100644
index 0000000000..ab9d27e260
--- /dev/null
+++ b/indra/newview/llinventorygallery.h
@@ -0,0 +1,233 @@
+/**
+ * @file llinventorygallery.h
+ * @brief LLInventoryGallery class definition
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLINVENTORYGALLERY_H
+#define LL_LLINVENTORYGALLERY_H
+
+#include "llpanel.h"
+#include "llinventorymodel.h"
+
+class LLInventoryCategoriesObserver;
+class LLInventoryGalleryItem;
+class LLScrollContainer;
+class LLTextBox;
+
+class LLInventoryGallery : public LLPanel
+{
+public:
+
+    typedef boost::signals2::signal<void(const LLUUID&)> selection_change_signal_t;
+    typedef boost::function<void(const LLUUID&)> selection_change_callback_t;
+
+    struct Params
+        : public LLInitParam::Block<Params, LLPanel::Params>
+    {
+        Optional<S32>   row_panel_height;
+        Optional<S32>   row_panel_width_factor;
+        Optional<S32>   gallery_width_factor;
+        Optional<S32>   vertical_gap;
+        Optional<S32>   horizontal_gap;
+        Optional<S32>   item_width;
+        Optional<S32>   item_height;
+        Optional<S32>   item_horizontal_gap;
+        Optional<S32>   items_in_row;
+
+        Params();
+    };
+
+    static const LLInventoryGallery::Params& getDefaultParams();
+
+    LLInventoryGallery(const LLInventoryGallery::Params& params = getDefaultParams());
+    ~LLInventoryGallery();
+
+    BOOL postBuild();
+    void initGallery();
+    void draw();
+
+    void setFilterSubString(const std::string& string);
+    std::string getFilterSubString() { return mFilterSubString; }
+
+    void getCurrentCategories(uuid_vec_t& vcur);
+    void updateAddedItem(LLUUID item_id);
+    void updateRemovedItem(LLUUID item_id);
+    void updateChangedItemName(LLUUID item_id, std::string name);
+
+    void updateMessageVisibility();
+
+    void setRootFolder(const LLUUID cat_id);
+    void updateRootFolder();
+    LLUUID getRootFolder() { return mFolderID; }
+    typedef boost::function<void()> root_changed_callback_t;
+    boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
+    void onForwardFolder();
+    void onBackwardFolder();
+    void clearNavigationHistory();
+    bool isBackwardAvailable();
+    bool isForwardAvailable();
+
+    void setNavBackwardList(std::list<LLUUID> backward_list) { mBackwardFolders = backward_list; }
+    void setNavForwardList(std::list<LLUUID> forward_list) { mForwardFolders = forward_list; }
+    std::list<LLUUID> getNavBackwardList() { return mBackwardFolders; }
+    std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
+
+    LLUUID getOutfitImageID(LLUUID outfit_id);
+
+    void refreshList(const LLUUID& category_id);
+    void computeDifference(const LLInventoryModel::cat_array_t vcats, const LLInventoryModel::item_array_t vitems, uuid_vec_t& vadded, uuid_vec_t& vremoved);
+
+    void deselectItem(const LLUUID& category_id);
+    void signalSelectionItemID(const LLUUID& category_id);
+    boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
+
+protected:
+
+    void onChangeItemSelection(const LLUUID& category_id);
+
+    void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
+
+    LLInventoryCategoriesObserver*     mCategoriesObserver;
+    LLUUID                             mSelectedItemID;
+    bool                               mIsInitialized;
+
+    selection_change_signal_t        mSelectionChangeSignal;
+    boost::signals2::signal<void()>  mRootChangedSignal;
+    LLUUID mFolderID;
+    std::list<LLUUID> mBackwardFolders;
+    std::list<LLUUID> mForwardFolders;
+
+private:
+    void addToGallery(LLInventoryGalleryItem* item);
+    void removeFromGalleryLast(LLInventoryGalleryItem* item);
+    void removeFromGalleryMiddle(LLInventoryGalleryItem* item);
+    LLPanel* addLastRow();
+    void removeLastRow();
+    void moveRowUp(int row);
+    void moveRowDown(int row);
+    void moveRow(int row, int pos);
+    LLPanel* addToRow(LLPanel* row_stack, LLInventoryGalleryItem* item, int pos, int hgap);
+    void removeFromLastRow(LLInventoryGalleryItem* item);
+    void reArrangeRows(S32 row_diff = 0);
+    void updateRowsIfNeeded();
+    void updateGalleryWidth();
+
+    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id);
+
+    void buildGalleryPanel(int row_count);
+    void reshapeGalleryPanel(int row_count);
+    LLPanel* buildItemPanel(int left);
+    LLPanel* buildRowPanel(int left, int bottom);
+    void moveRowPanel(LLPanel* stack, int left, int bottom);
+
+    std::vector<LLPanel*> mRowPanels;
+    std::vector<LLPanel*> mItemPanels;
+    std::vector<LLPanel*> mUnusedRowPanels;
+    std::vector<LLPanel*> mUnusedItemPanels;
+    std::vector<LLInventoryGalleryItem*> mItems;
+    std::vector<LLInventoryGalleryItem*> mHiddenItems;
+    LLScrollContainer* mScrollPanel;
+    LLPanel* mGalleryPanel;
+    LLPanel* mLastRowPanel;
+    LLTextBox* mMessageTextBox;
+    int mRowCount;
+    int mItemsAddedCount;
+    bool mGalleryCreated;
+
+    /* Params */
+    int mRowPanelHeight;
+    int mVerticalGap;
+    int mHorizontalGap;
+    int mItemWidth;
+    int mItemHeight;
+    int mItemHorizontalGap;
+    int mItemsInRow;
+    int mRowPanelWidth;
+    int mGalleryWidth;
+    int mRowPanWidthFactor;
+    int mGalleryWidthFactor;
+
+    std::string mFilterSubString;
+
+    typedef std::map<LLUUID, LLInventoryGalleryItem*> gallery_item_map_t;
+    gallery_item_map_t mItemMap;
+    std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
+};
+
+class LLInventoryGalleryItem : public LLPanel
+{
+public:
+    struct Params : public LLInitParam::Block<Params, LLPanel::Params>
+    {};
+
+    enum EInventorySortGroup
+    {
+        SG_SYSTEM_FOLDER,
+        SG_TRASH_FOLDER,
+        SG_NORMAL_FOLDER,
+        SG_ITEM
+    };
+
+    LLInventoryGalleryItem(const Params& p);
+    virtual ~LLInventoryGalleryItem();
+
+    BOOL postBuild();
+    void draw();
+    BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+    BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+    BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+
+    void setName(std::string name);
+    void setSelected(bool value);
+    void setUUID(LLUUID id) {mUUID = id;}
+    LLUUID getUUID() { return mUUID;}
+    
+    std::string getItemName() {return mName;}
+    bool isDefaultImage() {return mDefaultImage;}
+    
+    bool isHidden() {return mHidden;}
+    void setHidden(bool hidden) {mHidden = hidden;}
+
+    void setType(LLAssetType::EType type);
+    void setThumbnail(LLUUID id);
+    void setGallery(LLInventoryGallery* gallery) { mGallery = gallery; }
+    bool isFolder() { return mIsFolder; }
+    EInventorySortGroup getSortGroup() { return mSortGroup; }
+    
+private:
+    LLUUID mUUID;
+    LLTextBox* mNameText;
+    LLPanel* mTextBgPanel;
+    bool     mSelected;
+    bool     mDefaultImage;
+    bool     mHidden;
+    bool     mIsFolder;
+    
+    EInventorySortGroup mSortGroup;
+    LLAssetType::EType mType;
+    std::string mName;
+    LLInventoryGallery* mGallery;
+};
+
+#endif
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 7d4abab98f..caaff79c06 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2097,12 +2097,15 @@ void LLInventorySingleFolderPanel::openInCurrentWindow(const LLSD& userdata)
 
 void LLInventorySingleFolderPanel::changeFolderRoot(const LLUUID& new_id)
 {
-    if(mFolderID.notNull())
+    if (mFolderID != new_id)
     {
-        mBackwardFolders.push_back(mFolderID);
+        if(mFolderID.notNull())
+        {
+            mBackwardFolders.push_back(mFolderID);
+        }
+        mFolderID = new_id;
+        updateSingleFolderRoot();
     }
-    mFolderID = new_id;
-    updateSingleFolderRoot();
 }
 
 void LLInventorySingleFolderPanel::onForwardFolder()
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 31dd7aec23..b2c27daeec 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -406,6 +406,11 @@ public:
     bool isBackwardAvailable();
     bool isForwardAvailable();
 
+    void setNavBackwardList(std::list<LLUUID> backward_list) { mBackwardFolders = backward_list; }
+    void setNavForwardList(std::list<LLUUID> forward_list) { mForwardFolders = forward_list; }
+    std::list<LLUUID> getNavBackwardList() { return mBackwardFolders; }
+    std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
+
     void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
 
     typedef boost::function<void()> root_changed_callback_t;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 9fab6e4d2e..a867077ab0 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -37,6 +37,7 @@
 #include "llfilepicker.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
+#include "llinventorygallery.h"
 #include "llinventorymodelbackgroundfetch.h"
 #include "llfiltereditor.h"
 #include "llfloatersidepanelcontainer.h"
@@ -115,7 +116,9 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	  mNeedUploadCost(true),
       mMenuViewDefault(NULL),
       mSingleFolderMode(false),
-      mFolderRootChangedConnection()
+      mViewMode(VIEW_LIST),
+      mListViewRootUpdatedConnection(),
+      mGalleryRootUpdatedConnection()
 {
 	// Menu Callbacks (non contex menus)
 	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2));
@@ -242,9 +245,12 @@ BOOL LLPanelMainInventory::postBuild()
     mViewMenuButton = getChild<LLMenuButton>("view_btn");
 
     mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
-    mFolderRootChangedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
+    mListViewRootUpdatedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
     mSingleFolderPanelInventory->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mSingleFolderPanelInventory, _1, _2));
 
+    mInventoryGalleryPanel = getChild<LLInventoryGallery>("gallery_view_inv");
+    mGalleryRootUpdatedConnection = mInventoryGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
+
 	initListCommandsHandlers();
 
 	const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
@@ -322,9 +328,13 @@ LLPanelMainInventory::~LLPanelMainInventory( void )
         mMenuAddHandle.markDead();
     }
 
-    if (mFolderRootChangedConnection.connected())
+    if (mListViewRootUpdatedConnection.connected())
+    {
+        mListViewRootUpdatedConnection.disconnect();
+    }
+    if (mGalleryRootUpdatedConnection.connected())
     {
-        mFolderRootChangedConnection.disconnect();
+        mGalleryRootUpdatedConnection.disconnect();
     }
 }
 
@@ -635,10 +645,18 @@ void LLPanelMainInventory::onClearSearch()
 
 void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
 {
+    if(mSingleFolderMode && isGalleryViewMode())
+    {
+        mFilterSubString = search_string;
+        mInventoryGalleryPanel->setFilterSubString(mFilterSubString);
+        return;
+    }
+
 	if (search_string == "")
 	{
 		onClearSearch();
 	}
+
 	if (!mActivePanel)
 	{
 		return;
@@ -863,8 +881,9 @@ void LLPanelMainInventory::updateItemcountText()
     {
         LLInventoryModel::cat_array_t *cats;
         LLInventoryModel::item_array_t *items;
-        gInventory.getDirectDescendentsOf(mSingleFolderPanelInventory->getSingleFolderRoot(), cats, items);
-    
+
+        gInventory.getDirectDescendentsOf(getCurrentSFVRoot(), cats, items);
+
         string_args["[ITEM_COUNT]"] = llformat("%d", items->size());
         string_args["[CATEGORY_COUNT]"] = llformat("%d", cats->size());
         text = getString("ItemcountCompleted", string_args);
@@ -1334,7 +1353,8 @@ void LLPanelMainInventory::toggleViewMode()
     mSingleFolderMode = !mSingleFolderMode;
 
     getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
-    getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode);
+    getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
+    getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
     getChild<LLLayoutPanel>("nav_buttons")->setVisible(mSingleFolderMode);
     getChild<LLButton>("view_mode_btn")->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
 
@@ -1362,7 +1382,10 @@ void LLPanelMainInventory::onViewModeClick()
     LLUUID new_root_folder;
     if(mSingleFolderMode)
     {
-        selected_folder = mSingleFolderPanelInventory->getSingleFolderRoot();
+        if(isListViewMode())
+        {
+            selected_folder = mSingleFolderPanelInventory->getSingleFolderRoot();
+        }
     }
     else
     {
@@ -1413,33 +1436,57 @@ void LLPanelMainInventory::onViewModeClick()
 
 void LLPanelMainInventory::onUpFolderClicked()
 {
-    const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+    const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
     if (cat)
     {
         if (cat->getParentUUID().notNull())
         {
-            mSingleFolderPanelInventory->changeFolderRoot(cat->getParentUUID());
+            if(isListViewMode())
+            {
+                mSingleFolderPanelInventory->changeFolderRoot(cat->getParentUUID());
+            }
+            if(isGalleryViewMode())
+            {
+                mInventoryGalleryPanel->setRootFolder(cat->getParentUUID());
+            }
         }
     }
 }
 
 void LLPanelMainInventory::onBackFolderClicked()
 {
-    mSingleFolderPanelInventory->onBackwardFolder();
+    if(isListViewMode())
+    {
+        mSingleFolderPanelInventory->onBackwardFolder();
+    }
+    if(isGalleryViewMode())
+    {
+        mInventoryGalleryPanel->onBackwardFolder();
+    }
 }
 
 void LLPanelMainInventory::onForwardFolderClicked()
 {
-    mSingleFolderPanelInventory->onForwardFolder();
+    if(isListViewMode())
+    {
+        mSingleFolderPanelInventory->onForwardFolder();
+    }
+    if(isGalleryViewMode())
+    {
+        mInventoryGalleryPanel->onForwardFolder();
+    }
 }
 
 void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history)
 {
-    mSingleFolderPanelInventory->changeFolderRoot(folder_id);
-    if(clear_nav_history)
+    if(isListViewMode())
     {
-        mSingleFolderPanelInventory->clearNavigationHistory();
-        updateNavButtons();
+        mSingleFolderPanelInventory->changeFolderRoot(folder_id);
+        if(clear_nav_history)
+        {
+            mSingleFolderPanelInventory->clearNavigationHistory();
+            updateNavButtons();
+        }
     }
 }
 
@@ -1638,7 +1685,16 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 	if (command_name == "include_links")
 	{
 		mActivePanel->getFilter().toggleSearchVisibilityLinks();
-	}		
+	}
+
+    if (command_name == "list_view")
+    {
+        setViewMode(VIEW_LIST);
+    }
+    if (command_name == "gallery_view")
+    {
+        setViewMode(VIEW_GALLERY);
+    }
 }
 
 void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
@@ -1821,11 +1877,11 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 
     if (command_name == "list_view")
     {
-        return true;
+        return isListViewMode();
     }
     if (command_name == "gallery_view")
     {
-        return false;
+        return isGalleryViewMode();
     }
     if (command_name == "combination_view")
     {
@@ -1862,7 +1918,7 @@ void LLPanelMainInventory::updateTitle()
     {
         if(mSingleFolderMode)
         {
-            const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+            const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
             if (cat)
             {
                 inventory_floater->setTitle(cat->getName());
@@ -1883,10 +1939,18 @@ void LLPanelMainInventory::updateTitle()
 
 void LLPanelMainInventory::updateNavButtons()
 {
-    getChild<LLButton>("back_btn")->setEnabled(mSingleFolderPanelInventory->isBackwardAvailable());
-    getChild<LLButton>("forward_btn")->setEnabled(mSingleFolderPanelInventory->isForwardAvailable());
-    
-    const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+    if(isListViewMode())
+    {
+        getChild<LLButton>("back_btn")->setEnabled(mSingleFolderPanelInventory->isBackwardAvailable());
+        getChild<LLButton>("forward_btn")->setEnabled(mSingleFolderPanelInventory->isForwardAvailable());
+    }
+    if(isGalleryViewMode())
+    {
+        getChild<LLButton>("back_btn")->setEnabled(mInventoryGalleryPanel->isBackwardAvailable());
+        getChild<LLButton>("forward_btn")->setEnabled(mInventoryGalleryPanel->isForwardAvailable());
+    }
+
+    const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
     bool up_enabled = (cat && cat->getParentUUID().notNull());
     getChild<LLButton>("up_btn")->setEnabled(up_enabled);
 }
@@ -1900,5 +1964,50 @@ LLSidepanelInventory* LLPanelMainInventory::getParentSidepanelInventory()
     }
     return NULL;
 }
+
+void LLPanelMainInventory::setViewMode(EViewModeType mode)
+{
+    if(mode != mViewMode)
+    {
+        LLUUID cur_root = getCurrentSFVRoot();
+        mViewMode = mode;
+
+        getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
+        getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
+
+        if(isListViewMode())
+        {
+            mSingleFolderPanelInventory->changeFolderRoot(cur_root);
+            mSingleFolderPanelInventory->setNavForwardList(mInventoryGalleryPanel->getNavForwardList());
+            mSingleFolderPanelInventory->setNavBackwardList(mInventoryGalleryPanel->getNavBackwardList());
+        }
+        if(isGalleryViewMode())
+        {
+            mInventoryGalleryPanel->setRootFolder(cur_root);
+            mInventoryGalleryPanel->setNavForwardList(mSingleFolderPanelInventory->getNavForwardList());
+            mInventoryGalleryPanel->setNavBackwardList(mSingleFolderPanelInventory->getNavBackwardList());
+        }
+        updateNavButtons();
+
+        if((isListViewMode() && (mActivePanel->getFilterSubString() != mFilterSubString)) ||
+           (isGalleryViewMode() && (mInventoryGalleryPanel->getFilterSubString() != mFilterSubString)))
+        {
+            onFilterEdit(mFilterSubString);
+        }
+    }
+}
+
+LLUUID LLPanelMainInventory::getCurrentSFVRoot()
+{
+    if(isListViewMode())
+    {
+        return mSingleFolderPanelInventory->getSingleFolderRoot();
+    }
+    if(isGalleryViewMode())
+    {
+        return mInventoryGalleryPanel->getRootFolder();
+    }
+    return LLUUID::null;
+}
 // List Commands                                                              //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 5f488539dd..51c4ace874 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -38,6 +38,7 @@
 class LLComboBox;
 class LLFolderViewItem;
 class LLInventoryPanel;
+class LLInventoryGallery;
 class LLSaveFolderState;
 class LLFilterEditor;
 class LLTabContainer;
@@ -65,6 +66,13 @@ public:
 
 	BOOL postBuild();
 
+    enum EViewModeType
+    {
+        VIEW_LIST,
+        VIEW_GALLERY,
+        VIEW_COMBINATION
+    };
+
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
 
 	// Inherited functionality
@@ -108,6 +116,11 @@ public:
     LLUUID getSingleFolderViewRoot();
     bool isSingleFolderMode() { return mSingleFolderMode; }
 
+    void setViewMode(EViewModeType mode);
+    bool isListViewMode() { return (mViewMode == VIEW_LIST); }
+    bool isGalleryViewMode() { return (mViewMode == VIEW_GALLERY); }
+    LLUUID getCurrentSFVRoot();
+
 protected:
 	//
 	// Misc functions
@@ -163,9 +176,12 @@ private:
 	LLComboBox*					mSearchTypeCombo;
 
     bool mSingleFolderMode;
+    EViewModeType mViewMode;
     LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
+    LLInventoryGallery* mInventoryGalleryPanel;
 
-    boost::signals2::connection mFolderRootChangedConnection;
+    boost::signals2::connection mListViewRootUpdatedConnection;
+    boost::signals2::connection mGalleryRootUpdatedConnection;
 
 	//////////////////////////////////////////////////////////////////////////////////
 	// List Commands                                                                //
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index c7f9822e41..28ec8f2bf1 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -89,6 +89,7 @@
     <menu_item_check
      label="Combination view"
      layout="topleft"
+     enabled="false"
      name="combination_view">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
new file mode 100644
index 0000000000..68f78a77c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="true"
+   bg_alpha_color="DkGray"
+   border="false"
+   follows="all"
+   height="390"
+   name="Inventory Gallery"
+   layout="topleft"
+   left="0"
+   top="0"
+   width="404">
+  <text
+    type="string"
+    clip_partial="false"
+    follows="left|top"
+    layout="topleft"
+    left="13"
+    name="empty_txt"
+    top="0"
+    height="32"
+    valign="center"
+    parse_urls="true"
+    wrap="true">
+    Folder is empty.
+  </text> 
+  <scroll_container
+   follows="all"
+   height="400"
+   layout="topleft"
+   left="4"
+   top="0"
+   name="gallery_scroll_panel"
+   opaque="false"
+   top_pad="0">
+  </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
new file mode 100644
index 0000000000..80beb2ec8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="false"
+   background_opaque="false"
+   bg_alpha_color="FrogGreen"
+   bg_opaque_color="FrogGreen"   
+   border="false"
+   bevel_style="none"
+   follows="left|top"
+   height="149"
+   width="130"
+   name="gallery_item_panel"
+   layout="topleft"
+   left="0"
+   top="0">
+  <thumbnail
+   name="preview_thumbnail"
+   image_name="Thumbnail_Fallback"
+   layout="topleft"
+   follows="left|top"
+   interactable="false"
+   height="128"
+   width="128"
+   top="0"
+   left="1"/>
+  <icon
+   left="5"
+   top_pad="-25"
+   layout="topleft"
+   name="item_type"
+   height="20"
+   width="20"
+   follows="left|top"
+   visible="true"
+   image_name="Inv_Eye"/>
+  <panel
+   background_visible="false"
+   background_opaque="true"
+   bg_opaque_color="MenuItemHighlightBgColor"
+   border="false"
+   bevel_style="none"
+   follows="left|top"
+   left="0"
+   top="129"
+   height="25"
+   width="148"
+   name="text_bg_panel">
+    <text
+      read_only="true"
+      length="1"
+      follows="left|top"
+      left="1"
+      height="10"
+      layout="topleft"
+      name="item_name"
+      parse_urls="false"
+      top="2"
+      width="150"
+      use_ellipses="true">
+      Item name, folder name.
+    </text>
+  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index af4511a92d..3cdb3c5003 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -306,4 +306,27 @@
          folder_indentation="-8"/>
       </single_folder_inventory_panel>
     </panel>
+    <panel
+     follows="all"
+     halign="center"
+     height="372"
+     layout="topleft"
+     left="7"
+     name="gallery_view_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+      <panel
+       class="inventory_gallery"
+       filename="panel_inventory_gallery.xml"
+       left="0"
+       top="0"
+       height="372"
+       width="312"
+       name="gallery_view_inv"
+       background_visible="true"
+       follows="all"
+       layout="topleft" />
+      </panel>
+    </panel>
 </panel>
-- 
cgit v1.2.3


From 275ad3fdabf8417376e01a4a994d4a78dba6f15f Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 21 Mar 2023 01:37:51 +0100
Subject: SL-19266 Potential Use-After-Free in LLImageGL::setImage

---
 indra/llrender/llimagegl.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 9dc140b5b9..465f30a343 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -859,9 +859,16 @@ BOOL LLImageGL::setImage(const U8* data_in, BOOL data_hasmips /* = FALSE */, S32
 							stop_glerror();
 
 							if (prev_mip_data)
-								delete[] prev_mip_data;
+							{
+								if (prev_mip_data != cur_mip_data)
+									delete[] prev_mip_data;
+								prev_mip_data = nullptr;
+							}
 							if (cur_mip_data)
+							{
 								delete[] cur_mip_data;
+								cur_mip_data = nullptr;
+							}
 							
 							mGLTextureCreated = false;
 							return FALSE;
-- 
cgit v1.2.3


From 19e9b5d488e5478d6c5ecbb85000e6da3e6124bb Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 21 Mar 2023 19:19:58 +0200
Subject: SL-19379 build fix

---
 indra/newview/llpanelmaininventory.cpp |  6 +++---
 indra/newview/llpanelmaininventory.h   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a867077ab0..2816a2dc89 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -116,7 +116,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	  mNeedUploadCost(true),
       mMenuViewDefault(NULL),
       mSingleFolderMode(false),
-      mViewMode(VIEW_LIST),
+      mViewMode(MODE_LIST),
       mListViewRootUpdatedConnection(),
       mGalleryRootUpdatedConnection()
 {
@@ -1689,11 +1689,11 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 
     if (command_name == "list_view")
     {
-        setViewMode(VIEW_LIST);
+        setViewMode(MODE_LIST);
     }
     if (command_name == "gallery_view")
     {
-        setViewMode(VIEW_GALLERY);
+        setViewMode(MODE_GALLERY);
     }
 }
 
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 51c4ace874..c30f894118 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -68,9 +68,9 @@ public:
 
     enum EViewModeType
     {
-        VIEW_LIST,
-        VIEW_GALLERY,
-        VIEW_COMBINATION
+        MODE_LIST,
+        MODE_GALLERY,
+        MODE_COMBINATION
     };
 
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
@@ -117,8 +117,8 @@ public:
     bool isSingleFolderMode() { return mSingleFolderMode; }
 
     void setViewMode(EViewModeType mode);
-    bool isListViewMode() { return (mViewMode == VIEW_LIST); }
-    bool isGalleryViewMode() { return (mViewMode == VIEW_GALLERY); }
+    bool isListViewMode() { return (mViewMode == MODE_LIST); }
+    bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); }
     LLUUID getCurrentSFVRoot();
 
 protected:
-- 
cgit v1.2.3


From 24f8f47d46b9f04d2c14571fd83e1f683296ff2f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Mar 2023 23:59:03 +0200
Subject: SL-19188 Fix thumbnail changes being ignored by outfit gallery

---
 indra/newview/llinventoryobserver.cpp | 19 +++++++++++++++----
 indra/newview/llinventoryobserver.h   |  5 +++--
 indra/newview/lloutfitgallery.cpp     |  4 ----
 indra/newview/lloutfitgallery.h       | 14 +-------------
 4 files changed, 19 insertions(+), 23 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 26d7a7a28a..b884721895 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -649,6 +649,13 @@ void LLInventoryCategoriesObserver::changed(U32 mask)
 			}
 		}
 
+        const LLUUID thumbnail_id = category->getThumbnailUUID();
+        if (cat_data.mThumbnailId != thumbnail_id)
+        {
+            cat_data.mThumbnailId = thumbnail_id;
+            cat_changed = true;
+        }
+
 		// If anything has changed above, fire the callback.
 		if (cat_changed)
 			cat_data.mCallback();
@@ -666,6 +673,7 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
 	S32 version = LLViewerInventoryCategory::VERSION_UNKNOWN;
 	S32 current_num_known_descendents = LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN;
 	bool can_be_added = true;
+    LLUUID thumbnail_id;
 
 	LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
 	// If category could not be retrieved it might mean that
@@ -677,6 +685,7 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
 		// Inventory category version is used to find out if some changes
 		// to a category have been made.
 		version = category->getVersion();
+        thumbnail_id = category->getThumbnailUUID();
 
 		LLInventoryModel::cat_array_t* cats;
 		LLInventoryModel::item_array_t* items;
@@ -702,11 +711,11 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
 		if(init_name_hash)
 		{
 			LLMD5 item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
-			mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, cb, version, current_num_known_descendents,item_name_hash)));
+			mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents,item_name_hash)));
 		}
 		else
 		{
-			mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, cb, version, current_num_known_descendents)));
+			mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents)));
 		}
 	}
 
@@ -719,24 +728,26 @@ void LLInventoryCategoriesObserver::removeCategory(const LLUUID& cat_id)
 }
 
 LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
-	const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents)
+	const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents)
 	
 	: mCatID(cat_id)
 	, mCallback(cb)
 	, mVersion(version)
 	, mDescendentsCount(num_descendents)
+    , mThumbnailId(thumbnail_id)
 	, mIsNameHashInitialized(false)
 {
 	mItemNameHash.finalize();
 }
 
 LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
-	const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, LLMD5 name_hash)
+	const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents, LLMD5 name_hash)
 
 	: mCatID(cat_id)
 	, mCallback(cb)
 	, mVersion(version)
 	, mDescendentsCount(num_descendents)
+    , mThumbnailId(thumbnail_id)
 	, mIsNameHashInitialized(true)
 	, mItemNameHash(name_hash)
 {
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index 36d8ee3f59..02f73a5892 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -273,14 +273,15 @@ public:
 protected:
 	struct LLCategoryData
 	{
-		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents);
-		LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, LLMD5 name_hash);
+		LLCategoryData(const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents);
+		LLCategoryData(const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents, LLMD5 name_hash);
 		callback_t	mCallback;
 		S32			mVersion;
 		S32			mDescendentsCount;
 		LLMD5		mItemNameHash;
 		bool		mIsNameHashInitialized;
 		LLUUID		mCatID;
+        LLUUID		mThumbnailId;
 	};
 
 	typedef	std::map<LLUUID, LLCategoryData>	category_map_t;
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index a275af1565..6ea1bfc54a 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -1021,10 +1021,6 @@ void LLOutfitGallery::refreshOutfit(const LLUUID& category_id)
     }
 }
 
-void LLUpdateGalleryOnPhotoLinked::fire(const LLUUID& inv_item_id)
-{
-}
-
 LLUUID LLOutfitGallery::getPhotoAssetId(const LLUUID& outfit_id)
 {
     outfit_map_t::iterator outfit_it = mOutfitMap.find(outfit_id);
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 210e436b96..5c417cf7ee 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -43,15 +43,6 @@ class LLOutfitListGearMenuBase;
 class LLOutfitGalleryGearMenu;
 class LLOutfitGalleryContextMenu;
 
-class LLUpdateGalleryOnPhotoLinked : public LLInventoryCallback
-{
-public:
-    LLUpdateGalleryOnPhotoLinked(){}
-    virtual ~LLUpdateGalleryOnPhotoLinked(){}
-    /* virtual */ void fire(const LLUUID& inv_item_id);
-private:
-};
-
 class LLOutfitGallery : public LLOutfitListBase
 {
 public:
@@ -82,10 +73,7 @@ public:
 
     /*virtual*/ BOOL postBuild();
     /*virtual*/ void onOpen(const LLSD& info);
-    /*virtual*/ void draw();	
-    
-    void onSelectPhoto(LLUUID selected_outfit_id);
-    void onTakeSnapshot(LLUUID selected_outfit_id);
+    /*virtual*/ void draw();
 
     void wearSelectedOutfit();
 
-- 
cgit v1.2.3


From d6a11416ec524420b6a6ac298b7b093cb24e9ec9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 22 Mar 2023 01:20:22 +0200
Subject: SL-19379 WIP handle updated thumbnails in Gallery mode

---
 indra/newview/llinventorygallery.cpp               | 30 ++++++++++++++++++++++
 indra/newview/llinventorygallery.h                 |  1 +
 .../xui/en/panel_inventory_gallery_item.xml        |  6 ++---
 .../skins/default/xui/en/panel_main_inventory.xml  |  1 -
 4 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index b5fd3aaece..132f294729 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -576,6 +576,14 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     {
         addToGallery(item);
     }
+
+    if (mCategoriesObserver == NULL)
+    {
+        mCategoriesObserver = new LLInventoryCategoriesObserver();
+        gInventory.addObserver(mCategoriesObserver);
+    }
+    mCategoriesObserver->addCategory(item_id,
+        boost::bind(&LLInventoryGallery::updateItemThumbnail, this, item_id), true);
 }
 
 void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
@@ -583,6 +591,8 @@ void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
     gallery_item_map_t::iterator item_iter = mItemMap.find(item_id);
     if (item_iter != mItemMap.end())
     {
+        mCategoriesObserver->removeCategory(item_id);
+
         LLInventoryGalleryItem* item = item_iter->second;
 
         deselectItem(item_id);
@@ -611,6 +621,26 @@ void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
     }
 }
 
+void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
+{
+    LLInventoryObject* obj = gInventory.getObject(item_id);
+    if (!obj)
+    {
+        return;
+    }
+    LLUUID thumbnail_id = obj->getThumbnailUUID();
+
+    if ((LLAssetType::AT_CATEGORY == obj->getType()) && thumbnail_id.isNull())
+    {
+        thumbnail_id = getOutfitImageID(item_id);
+    }
+
+    if (mItemMap[item_id])
+    {
+        mItemMap[item_id]->setThumbnail(thumbnail_id);
+    }
+}
+
 void LLInventoryGallery::onChangeItemSelection(const LLUUID& category_id)
 {
     if (mSelectedItemID == category_id)
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index ab9d27e260..35186c53fb 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -74,6 +74,7 @@ public:
     void updateAddedItem(LLUUID item_id);
     void updateRemovedItem(LLUUID item_id);
     void updateChangedItemName(LLUUID item_id, std::string name);
+    void updateItemThumbnail(LLUUID item_id);
 
     void updateMessageVisibility();
 
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 80beb2ec8a..c180024aa7 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -25,11 +25,11 @@
    left="1"/>
   <icon
    left="5"
-   top_pad="-25"
+   top_pad="-21"
    layout="topleft"
    name="item_type"
-   height="20"
-   width="20"
+   height="16"
+   width="16"
    follows="left|top"
    visible="true"
    image_name="Inv_Eye"/>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 3cdb3c5003..d670161e00 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -327,6 +327,5 @@
        background_visible="true"
        follows="all"
        layout="topleft" />
-      </panel>
     </panel>
 </panel>
-- 
cgit v1.2.3


From 24b41ee746ccc6b5dd637b8704dc7ec819434605 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 22 Mar 2023 22:15:46 +0200
Subject: SL-19379 WIP basic drag and drop handling

---
 indra/newview/llinventorybridge.cpp    |  94 ----
 indra/newview/llinventoryfunctions.cpp |  90 ++++
 indra/newview/llinventoryfunctions.h   |   3 +
 indra/newview/llinventorygallery.cpp   | 911 ++++++++++++++++++++++++++++++++-
 indra/newview/llinventorygallery.h     |   7 +
 5 files changed, 1008 insertions(+), 97 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index cc8e20485b..0cd1e9bf44 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -110,9 +110,6 @@ using namespace LLOldEvents;
 bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr<LLMoveInv>);
 bool confirm_attachment_rez(const LLSD& notification, const LLSD& response);
 void teleport_via_landmark(const LLUUID& asset_id);
-static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit);
-static bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit);
-static BOOL can_move_to_landmarks(LLInventoryItem* inv_item);
 static bool check_category(LLInventoryModel* model,
 						   const LLUUID& cat_id,
 						   LLInventoryPanel* active_panel,
@@ -4907,97 +4904,6 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
 	return false;
 }
 
-// Returns true if the item can be moved to Current Outfit or any outfit folder.
-static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit)
-{
-	LLInventoryType::EType inv_type = inv_item->getInventoryType();
-	if ((inv_type != LLInventoryType::IT_WEARABLE) &&
-		(inv_type != LLInventoryType::IT_GESTURE) &&
-		(inv_type != LLInventoryType::IT_ATTACHMENT) &&
-		(inv_type != LLInventoryType::IT_OBJECT) &&
-		(inv_type != LLInventoryType::IT_SNAPSHOT) &&
-		(inv_type != LLInventoryType::IT_TEXTURE))
-	{
-		return FALSE;
-	}
-
-	U32 flags = inv_item->getFlags();
-	if(flags & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS)
-	{
-		return FALSE;
-	}
-
-	if((inv_type == LLInventoryType::IT_TEXTURE) || (inv_type == LLInventoryType::IT_SNAPSHOT))
-	{
-		return !move_is_into_current_outfit;
-	}
-
-	if (move_is_into_current_outfit && get_is_item_worn(inv_item->getUUID()))
-	{
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-// Returns true if folder's content can be moved to Current Outfit or any outfit folder.
-static bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit)
-{
-    LLInventoryModel::cat_array_t *cats;
-    LLInventoryModel::item_array_t *items;
-    model->getDirectDescendentsOf(inv_cat->getUUID(), cats, items);
-
-    if (items->size() > wear_limit)
-    {
-        return false;
-    }
-
-    if (items->size() == 0)
-    {
-        // Nothing to move(create)
-        return false;
-    }
-
-    if (cats->size() > 0)
-    {
-        // We do not allow subfolders in outfits of "My Outfits" yet
-        return false;
-    }
-
-    LLInventoryModel::item_array_t::iterator iter = items->begin();
-    LLInventoryModel::item_array_t::iterator end = items->end();
-
-    while (iter != end)
-    {
-        LLViewerInventoryItem *item = *iter;
-        if (!can_move_to_outfit(item, false))
-        {
-            return false;
-        }
-        iter++;
-    }
-
-    return true;
-}
-
-// Returns TRUE if item is a landmark or a link to a landmark
-// and can be moved to Favorites or Landmarks folder.
-static BOOL can_move_to_landmarks(LLInventoryItem* inv_item)
-{
-	// Need to get the linked item to know its type because LLInventoryItem::getType()
-	// returns actual type AT_LINK for links, not the asset type of a linked item.
-	if (LLAssetType::AT_LINK == inv_item->getType())
-	{
-		LLInventoryItem* linked_item = gInventory.getItem(inv_item->getLinkedUUID());
-		if (linked_item)
-		{
-			return LLAssetType::AT_LANDMARK == linked_item->getType();
-		}
-	}
-
-	return LLAssetType::AT_LANDMARK == inv_item->getType();
-}
-
 void LLFolderBridge::dropToFavorites(LLInventoryItem* inv_item)
 {
 	// use callback to rearrange favorite landmarks after adding
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 68722e91b3..29ee879076 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2007,6 +2007,96 @@ void move_items_to_new_subfolder(const uuid_vec_t& selected_uuids, const std::st
     gInventory.createNewCategory(first_item->getParentUUID(), LLFolderType::FT_NONE, folder_name, func);
 }
 
+// Returns true if the item can be moved to Current Outfit or any outfit folder.
+bool can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit)
+{
+    LLInventoryType::EType inv_type = inv_item->getInventoryType();
+    if ((inv_type != LLInventoryType::IT_WEARABLE) &&
+        (inv_type != LLInventoryType::IT_GESTURE) &&
+        (inv_type != LLInventoryType::IT_ATTACHMENT) &&
+        (inv_type != LLInventoryType::IT_OBJECT) &&
+        (inv_type != LLInventoryType::IT_SNAPSHOT) &&
+        (inv_type != LLInventoryType::IT_TEXTURE))
+    {
+        return false;
+    }
+
+    U32 flags = inv_item->getFlags();
+    if(flags & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS)
+    {
+        return false;
+    }
+
+    if((inv_type == LLInventoryType::IT_TEXTURE) || (inv_type == LLInventoryType::IT_SNAPSHOT))
+    {
+        return !move_is_into_current_outfit;
+    }
+
+    if (move_is_into_current_outfit && get_is_item_worn(inv_item->getUUID()))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+// Returns TRUE if item is a landmark or a link to a landmark
+// and can be moved to Favorites or Landmarks folder.
+bool can_move_to_landmarks(LLInventoryItem* inv_item)
+{
+    // Need to get the linked item to know its type because LLInventoryItem::getType()
+    // returns actual type AT_LINK for links, not the asset type of a linked item.
+    if (LLAssetType::AT_LINK == inv_item->getType())
+    {
+        LLInventoryItem* linked_item = gInventory.getItem(inv_item->getLinkedUUID());
+        if (linked_item)
+        {
+            return LLAssetType::AT_LANDMARK == linked_item->getType();
+        }
+    }
+
+    return LLAssetType::AT_LANDMARK == inv_item->getType();
+}
+
+// Returns true if folder's content can be moved to Current Outfit or any outfit folder.
+bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit)
+{
+    LLInventoryModel::cat_array_t *cats;
+    LLInventoryModel::item_array_t *items;
+    model->getDirectDescendentsOf(inv_cat->getUUID(), cats, items);
+
+    if (items->size() > wear_limit)
+    {
+        return false;
+    }
+
+    if (items->size() == 0)
+    {
+        // Nothing to move(create)
+        return false;
+    }
+
+    if (cats->size() > 0)
+    {
+        // We do not allow subfolders in outfits of "My Outfits" yet
+        return false;
+    }
+
+    LLInventoryModel::item_array_t::iterator iter = items->begin();
+    LLInventoryModel::item_array_t::iterator end = items->end();
+
+    while (iter != end)
+    {
+        LLViewerInventoryItem *item = *iter;
+        if (!can_move_to_outfit(item, false))
+        {
+            return false;
+        }
+        iter++;
+    }
+
+    return true;
+}
 ///----------------------------------------------------------------------------
 /// LLMarketplaceValidator implementations
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 918e919e61..2dfe605ada 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -97,6 +97,9 @@ void move_items_to_folder(const LLUUID& new_cat_uuid, const uuid_vec_t& selected
 bool is_only_cats_selected(const uuid_vec_t& selected_uuids);
 bool is_only_items_selected(const uuid_vec_t& selected_uuids);
 
+bool can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit);
+bool can_move_to_landmarks(LLInventoryItem* inv_item);
+bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit);
 /**                    Miscellaneous global functions
  **                                                                            **
  *******************************************************************************/
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 132f294729..a3a1fbcc16 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -33,17 +33,38 @@
 #include "lliconctrl.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
+#include "llinventoryicon.h"
 #include "llinventorymodel.h"
 #include "llthumbnailctrl.h"
 #include "lltextbox.h"
 #include "llviewerfoldertype.h"
 
-#include "llinventoryicon.h"
+#include "llagent.h"
+#include "llappearancemgr.h"
+#include "llenvironment.h"
+#include "llfriendcard.h"
+#include "llgesturemgr.h"
+#include "llmarketplacefunctions.h"
+#include "lltrans.h"
+#include "llviewermessage.h"
+#include "llviewerobjectlist.h"
+#include "llvoavatarself.h"
 
 static LLPanelInjector<LLInventoryGallery> t_inventory_gallery("inventory_gallery");
 
 const S32 GALLERY_ITEMS_PER_ROW_MIN = 2;
 
+// Helper dnd functions
+BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop, EDragAndDropType cargo_type,
+                           void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
+BOOL dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat, BOOL drop, std::string& tooltip_msg, BOOL is_link);
+BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg, BOOL user_confirm);
+void dropToMyOutfits(LLInventoryCategory* inv_cat);
+
+//-----------------------------
+// LLInventoryGallery
+//-----------------------------
+
 LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
     : LLPanel(),
       mScrollPanel(NULL),
@@ -64,6 +85,8 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mIsInitialized(false)
 {
     updateGalleryWidth();
+
+    mCategoriesObserver = new LLInventoryCategoriesObserver();
 }
 
 LLInventoryGallery::Params::Params()
@@ -147,11 +170,12 @@ void LLInventoryGallery::updateRootFolder()
             gInventory.removeObserver(mCategoriesObserver);
         }
         delete mCategoriesObserver;
+
+        mCategoriesObserver = new LLInventoryCategoriesObserver();
     }
     {
         mRootChangedSignal();
 
-        mCategoriesObserver = new LLInventoryCategoriesObserver();
         gInventory.addObserver(mCategoriesObserver);
         
         // Start observing changes in selected category.
@@ -705,7 +729,7 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id)
 
         updateChangedItemName(*items_iter, obj->getName());
     }
-
+    updateMessageVisibility();
 }
 
 void LLInventoryGallery::computeDifference(
@@ -826,6 +850,24 @@ bool LLInventoryGallery::isForwardAvailable()
 {
     return (!mForwardFolders.empty() && (mFolderID != mForwardFolders.back()));
 }
+
+BOOL LLInventoryGallery::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+                                           EDragAndDropType cargo_type, void* cargo_data,
+                                           EAcceptance* accept, std::string& tooltip_msg)
+{
+    // have children handle it first
+    BOOL handled = LLView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
+                                            accept, tooltip_msg);
+
+    // when drop is not handled by child, it should be handled by the root folder .
+    if (!handled || (*accept == ACCEPT_NO))
+    {
+        handled = baseHandleDragAndDrop(mFolderID, drop, cargo_type, cargo_data, accept, tooltip_msg);
+    }
+
+    return handled;
+}
+
 //-----------------------------
 // LLInventoryGalleryItem
 //-----------------------------
@@ -952,3 +994,866 @@ BOOL LLInventoryGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
     return TRUE;
 }
 
+BOOL LLInventoryGalleryItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+                       EDragAndDropType cargo_type,
+                       void* cargo_data,
+                       EAcceptance* accept,
+                       std::string& tooltip_msg)
+{
+    if (!mIsFolder)
+    {
+        return FALSE;
+    }
+    return baseHandleDragAndDrop(mUUID, drop, cargo_type, cargo_data, accept, tooltip_msg);
+}
+
+//-----------------------------
+// Helper drag&drop functions
+//-----------------------------
+
+BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
+                       EDragAndDropType cargo_type,
+                       void* cargo_data,
+                       EAcceptance* accept,
+                       std::string& tooltip_msg)
+{
+    LLInventoryItem* inv_item = (LLInventoryItem*)cargo_data;
+
+    BOOL accepted = FALSE;
+    switch(cargo_type)
+    {
+        case DAD_TEXTURE:
+        case DAD_SOUND:
+        case DAD_CALLINGCARD:
+        case DAD_LANDMARK:
+        case DAD_SCRIPT:
+        case DAD_CLOTHING:
+        case DAD_OBJECT:
+        case DAD_NOTECARD:
+        case DAD_BODYPART:
+        case DAD_ANIMATION:
+        case DAD_GESTURE:
+        case DAD_MESH:
+        case DAD_SETTINGS:
+            accepted = dragItemIntoFolder(dest_id, inv_item, drop, tooltip_msg, true);
+            break;
+        case DAD_LINK:
+            // DAD_LINK type might mean one of two asset types: AT_LINK or AT_LINK_FOLDER.
+            // If we have an item of AT_LINK_FOLDER type we should process the linked
+            // category being dragged or dropped into folder.
+            if (inv_item && LLAssetType::AT_LINK_FOLDER == inv_item->getActualType())
+            {
+                LLInventoryCategory* linked_category = gInventory.getCategory(inv_item->getLinkedUUID());
+                if (linked_category)
+                {
+                    accepted = dragCategoryIntoFolder(dest_id, (LLInventoryCategory*)linked_category, drop, tooltip_msg, TRUE);
+                }
+            }
+            else
+            {
+                accepted = dragItemIntoFolder(dest_id, inv_item, drop, tooltip_msg, TRUE);
+            }
+            break;
+        case DAD_CATEGORY:
+            if (LLFriendCardsManager::instance().isAnyFriendCategory(dest_id))
+            {
+                accepted = FALSE;
+            }
+            else
+            {
+                accepted = dragCategoryIntoFolder(dest_id, (LLInventoryCategory*)cargo_data, drop, tooltip_msg, FALSE);
+            }
+            break;
+        case DAD_ROOT_CATEGORY:
+        case DAD_NONE:
+            break;
+        default:
+            LL_WARNS() << "Unhandled cargo type for drag&drop " << cargo_type << LL_ENDL;
+            break;
+    }
+    if (accepted)
+    {
+        *accept = ACCEPT_YES_MULTI;
+    }
+    else
+    {
+        *accept = ACCEPT_NO;
+    }
+    return accepted;
+}
+
+// copy of LLFolderBridge::dragItemIntoFolder
+BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg, BOOL user_confirm)
+{
+    LLViewerInventoryCategory * cat = gInventory.getCategory(folder_id);
+    if (!cat)
+    {
+        return FALSE;
+    }
+    LLInventoryModel* model = &gInventory;
+
+    if (!model || !inv_item) return FALSE;
+
+    // cannot drag into library
+    if((gInventory.getRootFolderID() != folder_id) && !model->isObjectDescendentOf(folder_id, gInventory.getRootFolderID()))
+    {
+        return FALSE;
+    }
+    if (!isAgentAvatarValid()) return FALSE;
+
+    const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+    const LLUUID &favorites_id = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+    const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
+    const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+    const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+
+    const BOOL move_is_into_current_outfit = (folder_id == current_outfit_id);
+    const BOOL move_is_into_favorites = (folder_id == favorites_id);
+    const BOOL move_is_into_my_outfits = (folder_id == my_outifts_id) || model->isObjectDescendentOf(folder_id, my_outifts_id);
+    const BOOL move_is_into_outfit = move_is_into_my_outfits || (cat && cat->getPreferredType()==LLFolderType::FT_OUTFIT);
+    const BOOL move_is_into_landmarks = (folder_id == landmarks_id) || model->isObjectDescendentOf(folder_id, landmarks_id);
+    const BOOL move_is_into_marketplacelistings = model->isObjectDescendentOf(folder_id, marketplacelistings_id);
+    const BOOL move_is_from_marketplacelistings = model->isObjectDescendentOf(inv_item->getUUID(), marketplacelistings_id);
+
+    LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource();
+    BOOL accept = FALSE;
+    LLViewerObject* object = NULL;
+    if(LLToolDragAndDrop::SOURCE_AGENT == source)
+    {
+        const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
+
+        const BOOL move_is_into_trash = (folder_id == trash_id) || model->isObjectDescendentOf(folder_id, trash_id);
+        const BOOL move_is_outof_current_outfit = LLAppearanceMgr::instance().getIsInCOF(inv_item->getUUID());
+
+        //--------------------------------------------------------------------------------
+        // Determine if item can be moved.
+        //
+
+        BOOL is_movable = TRUE;
+
+        switch (inv_item->getActualType())
+        {
+            case LLAssetType::AT_CATEGORY:
+                is_movable = !LLFolderType::lookupIsProtectedType(((LLInventoryCategory*)inv_item)->getPreferredType());
+                break;
+            default:
+                break;
+        }
+        // Can't explicitly drag things out of the COF.
+        if (move_is_outof_current_outfit)
+        {
+            is_movable = FALSE;
+        }
+        if (move_is_into_trash)
+        {
+            is_movable &= inv_item->getIsLinkType() || !get_is_item_worn(inv_item->getUUID());
+        }
+        if (is_movable)
+        {
+            // Don't allow creating duplicates in the Calling Card/Friends
+            // subfolders, see bug EXT-1599. Check is item direct descendent
+            // of target folder and forbid item's movement if it so.
+            // Note: isItemDirectDescendentOfCategory checks if
+            // passed category is in the Calling Card/Friends folder
+            is_movable &= !LLFriendCardsManager::instance().isObjDirectDescendentOfCategory(inv_item, cat);
+        }
+
+        //
+        //--------------------------------------------------------------------------------
+        
+        //--------------------------------------------------------------------------------
+        // Determine if item can be moved & dropped
+        // Note: if user_confirm is false, we already went through those accept logic test and can skip them
+
+        accept = TRUE;
+
+        if (user_confirm && !is_movable)
+        {
+            accept = FALSE;
+        }
+        else if (user_confirm && (folder_id == inv_item->getParentUUID()) && !move_is_into_favorites)
+        {
+            accept = FALSE;
+        }
+        else if (user_confirm && (move_is_into_current_outfit || move_is_into_outfit))
+        {
+            accept = can_move_to_outfit(inv_item, move_is_into_current_outfit);
+        }
+        else if (user_confirm && (move_is_into_favorites || move_is_into_landmarks))
+        {
+            accept = can_move_to_landmarks(inv_item);
+        }
+        else if (user_confirm && move_is_into_marketplacelistings)
+        {
+            //disable dropping in or out of marketplace for now
+            return FALSE;
+            
+            /*const LLViewerInventoryCategory * master_folder = model->getFirstDescendantOf(marketplacelistings_id, folder_id);
+            LLViewerInventoryCategory * dest_folder = cat;
+            accept = can_move_item_to_marketplace(master_folder, dest_folder, inv_item, tooltip_msg, LLToolDragAndDrop::instance().getCargoCount() - LLToolDragAndDrop::instance().getCargoIndex());*/
+        }
+
+        // Check that the folder can accept this item based on folder/item type compatibility (e.g. stock folder compatibility)
+        if (user_confirm && accept)
+        {
+            LLViewerInventoryCategory * dest_folder = cat;
+            accept = dest_folder->acceptItem(inv_item);
+        }
+        
+        LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
+
+        if (accept && drop)
+        {
+            if (inv_item->getType() == LLAssetType::AT_GESTURE
+                && LLGestureMgr::instance().isGestureActive(inv_item->getUUID()) && move_is_into_trash)
+            {
+                LLGestureMgr::instance().deactivateGesture(inv_item->getUUID());
+            }
+            // If an item is being dragged between windows, unselect everything in the active window
+            // so that we don't follow the selection to its new location (which is very annoying).
+                        // RN: a better solution would be to deselect automatically when an   item is moved
+            // and then select any item that is dropped only in the panel that it   is dropped in
+            if (active_panel)
+            {
+                active_panel->unSelectAll();
+            }
+            // Dropping in or out of marketplace needs (sometimes) confirmation
+            if (user_confirm && (move_is_from_marketplacelistings || move_is_into_marketplacelistings))
+            {
+                //disable dropping in or out of marketplace for now
+                return FALSE;
+            }
+
+            //--------------------------------------------------------------------------------
+            // Destination folder logic
+            //
+
+            // FAVORITES folder
+            // (copy the item)
+            else if (move_is_into_favorites)
+            {
+                copy_inventory_item(
+                    gAgent.getID(),
+                    inv_item->getPermissions().getOwner(),
+                    inv_item->getUUID(),
+                    folder_id,
+                    std::string(),
+                    LLPointer<LLInventoryCallback>(NULL));
+            }
+            // CURRENT OUTFIT or OUTFIT folder
+            // (link the item)
+            else if (move_is_into_current_outfit || move_is_into_outfit)
+            {
+                if (move_is_into_current_outfit)
+                {
+                    LLAppearanceMgr::instance().wearItemOnAvatar(inv_item->getUUID(), true, true);
+                }
+                else
+                {
+                    LLPointer<LLInventoryCallback> cb = NULL;
+                    link_inventory_object(folder_id, LLConstPointer<LLInventoryObject>(inv_item), cb);
+                }
+            }
+            // MARKETPLACE LISTINGS folder
+            // Move the item
+            else if (move_is_into_marketplacelistings)
+            {
+                //move_item_to_marketplacelistings(inv_item, mUUID);
+                return FALSE;
+            }
+            // NORMAL or TRASH folder
+            // (move the item, restamp if into trash)
+            else
+            {
+                // set up observer to select item once drag and drop from inbox is complete
+                if (gInventory.isObjectDescendentOf(inv_item->getUUID(), gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX)))
+                {
+                    set_dad_inbox_object(inv_item->getUUID());
+                }
+
+                gInventory.changeItemParent((LLViewerInventoryItem*)inv_item, folder_id, move_is_into_trash);
+            }
+            
+            if (move_is_from_marketplacelistings)
+            {
+                // If we move from an active (listed) listing, checks that it's still valid, if not, unlist
+                /*LLUUID version_folder_id = LLMarketplaceData::instance().getActiveFolder(from_folder_uuid);
+                if (version_folder_id.notNull())
+                {
+                    LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                        version_folder_id,
+                        [version_folder_id](bool result)
+                    {
+                        if (!result)
+                        {
+                            LLMarketplaceData::instance().activateListing(version_folder_id, false);
+                        }
+                    });
+                }*/
+                return FALSE;
+            }
+
+            //
+            //--------------------------------------------------------------------------------
+        }
+    }
+    else if (LLToolDragAndDrop::SOURCE_WORLD == source)
+    {
+        // Make sure the object exists. If we allowed dragging from
+        // anonymous objects, it would be possible to bypass
+        // permissions.
+        object = gObjectList.findObject(inv_item->getParentUUID());
+        if (!object)
+        {
+            LL_INFOS() << "Object not found for drop." << LL_ENDL;
+            return FALSE;
+        }
+
+        // coming from a task. Need to figure out if the person can
+        // move/copy this item.
+        LLPermissions perm(inv_item->getPermissions());
+        if ((perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID())
+            && perm.allowTransferTo(gAgent.getID())))
+            // || gAgent.isGodlike())
+        {
+            accept = TRUE;
+        }
+        else if(object->permYouOwner())
+        {
+            // If the object cannot be copied, but the object the
+            // inventory is owned by the agent, then the item can be
+            // moved from the task to agent inventory.
+            accept = TRUE;
+        }
+
+        // Don't allow placing an original item into Current Outfit or an outfit folder
+        // because they must contain only links to wearable items.
+        if (move_is_into_current_outfit || move_is_into_outfit)
+        {
+            accept = FALSE;
+        }
+        // Don't allow to move a single item to Favorites or Landmarks
+        // if it is not a landmark or a link to a landmark.
+        else if ((move_is_into_favorites || move_is_into_landmarks)
+                 && !can_move_to_landmarks(inv_item))
+        {
+            accept = FALSE;
+        }
+        else if (move_is_into_marketplacelistings)
+        {
+            tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
+            accept = FALSE;
+        }
+
+        if (accept && drop)
+        {
+            //todo: dnd from SOURCE_WORLD
+
+            /*boost::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
+            move_inv->mObjectID = inv_item->getParentUUID();
+            std::pair<LLUUID, LLUUID> item_pair(folder_id, inv_item->getUUID());
+            move_inv->mMoveList.push_back(item_pair);
+            move_inv->mCallback = NULL;
+            move_inv->mUserData = NULL;
+            if(is_move)
+            {
+                warn_move_inventory(object, move_inv);
+            }
+            else
+            {
+                // store dad inventory item to select added one later. See EXT-4347
+                set_dad_inventory_item(inv_item, folder_id);
+
+                LLNotification::Params params("MoveInventoryFromObject");
+                params.functor.function(boost::bind(move_task_inventory_callback, _1, _2, move_inv));
+                LLNotifications::instance().forceResponse(params, 0);
+            }*/
+        }
+    }
+    else if(LLToolDragAndDrop::SOURCE_NOTECARD == source)
+    {
+        if (move_is_into_marketplacelistings)
+        {
+            tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
+            accept = FALSE;
+        }
+        else if ((inv_item->getActualType() == LLAssetType::AT_SETTINGS) && !LLEnvironment::instance().isInventoryEnabled())
+        {
+            tooltip_msg = LLTrans::getString("NoEnvironmentSettings");
+            accept = FALSE;
+        }
+        else
+        {
+            // Don't allow placing an original item from a notecard to Current Outfit or an outfit folder
+            // because they must contain only links to wearable items.
+            accept = !(move_is_into_current_outfit || move_is_into_outfit);
+        }
+
+        if (accept && drop)
+        {
+            copy_inventory_from_notecard(folder_id,  // Drop to the chosen destination folder
+                                         LLToolDragAndDrop::getInstance()->getObjectID(),
+                                         LLToolDragAndDrop::getInstance()->getSourceID(),
+                                         inv_item);
+        }
+    }
+    else if(LLToolDragAndDrop::SOURCE_LIBRARY == source)
+    {
+        LLViewerInventoryItem* item = (LLViewerInventoryItem*)inv_item;
+        if(item && item->isFinished())
+        {
+            accept = TRUE;
+
+            if (move_is_into_marketplacelistings)
+            {
+                tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
+                accept = FALSE;
+            }
+            else if (move_is_into_current_outfit || move_is_into_outfit)
+            {
+                accept = can_move_to_outfit(inv_item, move_is_into_current_outfit);
+            }
+            // Don't allow to move a single item to Favorites or Landmarks
+            // if it is not a landmark or a link to a landmark.
+            else if (move_is_into_favorites || move_is_into_landmarks)
+            {
+                accept = can_move_to_landmarks(inv_item);
+            }
+
+            if (accept && drop)
+            {
+                // FAVORITES folder
+                // (copy the item)
+                if (move_is_into_favorites)
+                {
+                    copy_inventory_item(
+                        gAgent.getID(),
+                        inv_item->getPermissions().getOwner(),
+                        inv_item->getUUID(),
+                        folder_id,
+                        std::string(),
+                        LLPointer<LLInventoryCallback>(NULL));
+                }
+                // CURRENT OUTFIT or OUTFIT folder
+                // (link the item)
+                else if (move_is_into_current_outfit || move_is_into_outfit)
+                {
+                    if (move_is_into_current_outfit)
+                    {
+                        LLAppearanceMgr::instance().wearItemOnAvatar(inv_item->getUUID(), true, true);
+                    }
+                    else
+                    {
+                        LLPointer<LLInventoryCallback> cb = NULL;
+                        link_inventory_object(folder_id, LLConstPointer<LLInventoryObject>(inv_item), cb);
+                    }
+                }
+                else
+                {
+                    copy_inventory_item(
+                        gAgent.getID(),
+                        inv_item->getPermissions().getOwner(),
+                        inv_item->getUUID(),
+                        folder_id,
+                        std::string(),
+                        LLPointer<LLInventoryCallback>(NULL));
+                }
+            }
+        }
+    }
+    else
+    {
+        LL_WARNS() << "unhandled drag source" << LL_ENDL;
+    }
+    return accept;
+}
+
+// copy of LLFolderBridge::dragCategoryIntoFolder
+BOOL dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
+                            BOOL drop, std::string& tooltip_msg, BOOL is_link)
+{
+    BOOL user_confirm = TRUE;
+    LLInventoryModel* model = &gInventory;
+    LLViewerInventoryCategory * dest_cat = gInventory.getCategory(dest_id);
+    if (!dest_cat)
+    {
+        return FALSE;
+    }
+
+    if (!inv_cat) return FALSE; // shouldn't happen, but in case item is incorrectly parented in which case inv_cat will be NULL
+
+    if (!isAgentAvatarValid()) return FALSE;
+    // cannot drag into library
+    if((gInventory.getRootFolderID() != dest_id) && !model->isObjectDescendentOf(dest_id, gInventory.getRootFolderID()))
+    {
+        return FALSE;
+    }
+
+    const LLUUID &cat_id = inv_cat->getUUID();
+    const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+    const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+    //const LLUUID from_folder_uuid = inv_cat->getParentUUID();
+    
+    const BOOL move_is_into_current_outfit = (dest_id == current_outfit_id);
+    const BOOL move_is_into_marketplacelistings = model->isObjectDescendentOf(dest_id, marketplacelistings_id);
+    const BOOL move_is_from_marketplacelistings = model->isObjectDescendentOf(cat_id, marketplacelistings_id);
+
+    // check to make sure source is agent inventory, and is represented there.
+    LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource();
+    const BOOL is_agent_inventory = (model->getCategory(cat_id) != NULL)
+        && (LLToolDragAndDrop::SOURCE_AGENT == source);
+
+    BOOL accept = FALSE;
+
+    if (is_agent_inventory)
+    {
+        const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
+        const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
+        const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+        const LLUUID &lost_and_found_id = model->findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND);
+
+        const BOOL move_is_into_trash = (dest_id == trash_id) || model->isObjectDescendentOf(dest_id, trash_id);
+        const BOOL move_is_into_my_outfits = (dest_id == my_outifts_id) || model->isObjectDescendentOf(dest_id, my_outifts_id);
+        const BOOL move_is_into_outfit = move_is_into_my_outfits || (dest_cat && dest_cat->getPreferredType()==LLFolderType::FT_OUTFIT);
+        const BOOL move_is_into_current_outfit = (dest_cat && dest_cat->getPreferredType()==LLFolderType::FT_CURRENT_OUTFIT);
+        const BOOL move_is_into_landmarks = (dest_id == landmarks_id) || model->isObjectDescendentOf(dest_id, landmarks_id);
+        const BOOL move_is_into_lost_and_found = model->isObjectDescendentOf(dest_id, lost_and_found_id);
+
+        //--------------------------------------------------------------------------------
+        // Determine if folder can be moved.
+        //
+
+        BOOL is_movable = TRUE;
+
+        if (is_movable && (marketplacelistings_id == cat_id))
+        {
+            is_movable = FALSE;
+            tooltip_msg = LLTrans::getString("TooltipOutboxCannotMoveRoot");
+        }
+        if (is_movable && move_is_from_marketplacelistings)
+            //&& LLMarketplaceData::instance().getActivationState(cat_id))
+        {
+            // If the incoming folder is listed and active (and is therefore either the listing or the version folder),
+            // then moving is *not* allowed
+            is_movable = FALSE;
+            tooltip_msg = LLTrans::getString("TooltipOutboxDragActive");
+        }
+        if (is_movable && (dest_id == cat_id))
+        {
+            is_movable = FALSE;
+            tooltip_msg = LLTrans::getString("TooltipDragOntoSelf");
+        }
+        if (is_movable && (model->isObjectDescendentOf(dest_id, cat_id)))
+        {
+            is_movable = FALSE;
+            tooltip_msg = LLTrans::getString("TooltipDragOntoOwnChild");
+        }
+        if (is_movable && LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
+        {
+            is_movable = FALSE;
+            // tooltip?
+        }
+
+        U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
+        if (is_movable && move_is_into_outfit)
+        {
+            if (dest_id == my_outifts_id)
+            {
+                if (source != LLToolDragAndDrop::SOURCE_AGENT || move_is_from_marketplacelistings)
+                {
+                    tooltip_msg = LLTrans::getString("TooltipOutfitNotInInventory");
+                    is_movable = false;
+                }
+                else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+                {
+                    is_movable = true;
+                }
+                else
+                {
+                    tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                    is_movable = false;
+                }
+            }
+            else if(dest_cat && dest_cat->getPreferredType() == LLFolderType::FT_NONE)
+            {
+                is_movable = ((inv_cat->getPreferredType() == LLFolderType::FT_NONE) || (inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT));
+            }
+            else
+            {
+                is_movable = false;
+            }
+        }
+        if(is_movable && move_is_into_current_outfit && is_link)
+        {
+            is_movable = FALSE;
+        }
+        if (is_movable && move_is_into_lost_and_found)
+        {
+            is_movable = FALSE;
+        }
+        if (is_movable && (dest_id == model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE)))
+        {
+            is_movable = FALSE;
+            // tooltip?
+        }
+        if (is_movable && (dest_cat->getPreferredType() == LLFolderType::FT_MARKETPLACE_STOCK))
+        {
+            // One cannot move a folder into a stock folder
+            is_movable = FALSE;
+            // tooltip?
+        }
+        
+        LLInventoryModel::cat_array_t descendent_categories;
+        LLInventoryModel::item_array_t descendent_items;
+        if (is_movable)
+        {
+            model->collectDescendents(cat_id, descendent_categories, descendent_items, FALSE);
+            for (S32 i=0; i < descendent_categories.size(); ++i)
+            {
+                LLInventoryCategory* category = descendent_categories[i];
+                if(LLFolderType::lookupIsProtectedType(category->getPreferredType()))
+                {
+                    // Can't move "special folders" (e.g. Textures Folder).
+                    is_movable = FALSE;
+                    break;
+                }
+            }
+        }
+        if (is_movable
+            && move_is_into_current_outfit
+            && descendent_items.size() > max_items_to_wear)
+        {
+            LLInventoryModel::cat_array_t cats;
+            LLInventoryModel::item_array_t items;
+            LLFindWearablesEx not_worn(/*is_worn=*/ false, /*include_body_parts=*/ false);
+            gInventory.collectDescendentsIf(cat_id,
+                cats,
+                items,
+                LLInventoryModel::EXCLUDE_TRASH,
+                not_worn);
+
+            if (items.size() > max_items_to_wear)
+            {
+                // Can't move 'large' folders into current outfit: MAINT-4086
+                is_movable = FALSE;
+                LLStringUtil::format_map_t args;
+                args["AMOUNT"] = llformat("%d", max_items_to_wear);
+                tooltip_msg = LLTrans::getString("TooltipTooManyWearables",args);
+            }
+        }
+        if (is_movable && move_is_into_trash)
+        {
+            for (S32 i=0; i < descendent_items.size(); ++i)
+            {
+                LLInventoryItem* item = descendent_items[i];
+                if (get_is_item_worn(item->getUUID()))
+                {
+                    is_movable = FALSE;
+                    break; // It's generally movable, but not into the trash.
+                }
+            }
+        }
+        if (is_movable && move_is_into_landmarks)
+        {
+            for (S32 i=0; i < descendent_items.size(); ++i)
+            {
+                LLViewerInventoryItem* item = descendent_items[i];
+
+                // Don't move anything except landmarks and categories into Landmarks folder.
+                // We use getType() instead of getActua;Type() to allow links to landmarks and folders.
+                if (LLAssetType::AT_LANDMARK != item->getType() && LLAssetType::AT_CATEGORY != item->getType())
+                {
+                    is_movable = FALSE;
+                    break; // It's generally movable, but not into Landmarks.
+                }
+            }
+        }
+        
+        if (is_movable && move_is_into_marketplacelistings)
+        {
+            const LLViewerInventoryCategory * master_folder = model->getFirstDescendantOf(marketplacelistings_id, dest_id);
+            LLViewerInventoryCategory * dest_folder = dest_cat;
+            S32 bundle_size = (drop ? 1 : LLToolDragAndDrop::instance().getCargoCount());
+            is_movable = can_move_folder_to_marketplace(master_folder, dest_folder, inv_cat, tooltip_msg, bundle_size);
+        }
+
+        //
+        //--------------------------------------------------------------------------------
+
+        accept = is_movable;
+
+        if (accept && drop)
+        {
+            // Dropping in or out of marketplace needs (sometimes) confirmation
+            if (user_confirm && (move_is_from_marketplacelistings || move_is_into_marketplacelistings))
+            {
+                //disable dropping in or out of marketplace for now
+                return FALSE;
+            }
+            // Look for any gestures and deactivate them
+            if (move_is_into_trash)
+            {
+                for (S32 i=0; i < descendent_items.size(); i++)
+                {
+                    LLInventoryItem* item = descendent_items[i];
+                    if (item->getType() == LLAssetType::AT_GESTURE
+                        && LLGestureMgr::instance().isGestureActive(item->getUUID()))
+                    {
+                        LLGestureMgr::instance().deactivateGesture(item->getUUID());
+                    }
+                }
+            }
+
+            if (dest_id == my_outifts_id)
+            {
+                // Category can contains objects,
+                // create a new folder and populate it with links to original objects
+                dropToMyOutfits(inv_cat);
+            }
+            // if target is current outfit folder we use link
+            else if (move_is_into_current_outfit &&
+                (inv_cat->getPreferredType() == LLFolderType::FT_NONE ||
+                inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT))
+            {
+                // traverse category and add all contents to currently worn.
+                BOOL append = true;
+                LLAppearanceMgr::instance().wearInventoryCategory(inv_cat, false, append);
+            }
+            else if (move_is_into_marketplacelistings)
+            {
+                //move_folder_to_marketplacelistings(inv_cat, dest_id);
+            }
+            else
+            {
+                if (model->isObjectDescendentOf(cat_id, model->findCategoryUUIDForType(LLFolderType::FT_INBOX)))
+                {
+                    set_dad_inbox_object(cat_id);
+                }
+
+                // Reparent the folder and restamp children if it's moving
+                // into trash.
+                gInventory.changeCategoryParent(
+                    (LLViewerInventoryCategory*)inv_cat,
+                    dest_id,
+                    move_is_into_trash);
+            }
+            if (move_is_from_marketplacelistings)
+            {
+                //disable dropping in or out of marketplace for now
+                return FALSE;
+                
+                // If we are moving a folder at the listing folder level (i.e. its parent is the marketplace listings folder)
+                /*if (from_folder_uuid == marketplacelistings_id)
+                {
+                    // Clear the folder from the marketplace in case it is a listing folder
+                    if (LLMarketplaceData::instance().isListed(cat_id))
+                    {
+                        LLMarketplaceData::instance().clearListing(cat_id);
+                    }
+                }
+                else
+                {
+                    // If we move from within an active (listed) listing, checks that it's still valid, if not, unlist
+                    LLUUID version_folder_id = LLMarketplaceData::instance().getActiveFolder(from_folder_uuid);
+                    if (version_folder_id.notNull())
+                    {
+                        LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                            version_folder_id,
+                            [version_folder_id](bool result)
+                        {
+                            if (!result)
+                            {
+                                LLMarketplaceData::instance().activateListing(version_folder_id, false);
+                            }
+                        }
+                        );
+                    }
+                    // In all cases, update the listing we moved from so suffix are updated
+                    update_marketplace_category(from_folder_uuid);
+                }*/
+            }
+        }
+    }
+    else if (LLToolDragAndDrop::SOURCE_WORLD == source)
+    {
+        if (move_is_into_marketplacelistings)
+        {
+            tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
+            accept = FALSE;
+        }
+        else
+        {
+            //todo: dnd from SOURCE_WORLD
+            accept = FALSE;
+            //accept = move_inv_category_world_to_agent(cat_id, mUUID, drop, NULL, NULL, filter);
+        }
+    }
+    else if (LLToolDragAndDrop::SOURCE_LIBRARY == source)
+    {
+        if (move_is_into_marketplacelistings)
+        {
+            tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
+            accept = FALSE;
+        }
+        else
+        {
+            // Accept folders that contain complete outfits.
+            accept = move_is_into_current_outfit && LLAppearanceMgr::instance().getCanMakeFolderIntoOutfit(cat_id);
+        }
+
+        if (accept && drop)
+        {
+            LLAppearanceMgr::instance().wearInventoryCategory(inv_cat, true, false);
+        }
+    }
+
+    return accept;
+}
+
+void outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id)
+{
+    LLInventoryModel::cat_array_t* categories;
+    LLInventoryModel::item_array_t* items;
+    gInventory.getDirectDescendentsOf(cat_source_id, categories, items);
+
+    LLInventoryObject::const_object_list_t link_array;
+
+
+    LLInventoryModel::item_array_t::iterator iter = items->begin();
+    LLInventoryModel::item_array_t::iterator end = items->end();
+    while (iter!=end)
+    {
+        const LLViewerInventoryItem* item = (*iter);
+        // By this point everything is supposed to be filtered,
+        // but there was a delay to create folder so something could have changed
+        LLInventoryType::EType inv_type = item->getInventoryType();
+        if ((inv_type == LLInventoryType::IT_WEARABLE) ||
+            (inv_type == LLInventoryType::IT_GESTURE) ||
+            (inv_type == LLInventoryType::IT_ATTACHMENT) ||
+            (inv_type == LLInventoryType::IT_OBJECT) ||
+            (inv_type == LLInventoryType::IT_SNAPSHOT) ||
+            (inv_type == LLInventoryType::IT_TEXTURE))
+        {
+            link_array.push_back(LLConstPointer<LLInventoryObject>(item));
+        }
+        iter++;
+    }
+
+    if (!link_array.empty())
+    {
+        LLPointer<LLInventoryCallback> cb = NULL;
+        link_inventory_array(cat_dest_id, link_array, cb);
+    }
+}
+
+void dropToMyOutfits(LLInventoryCategory* inv_cat)
+{
+    // make a folder in the My Outfits directory.
+    const LLUUID dest_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+
+    // Note: creation will take time, so passing folder id to callback is slightly unreliable,
+    // but so is collecting and passing descendants' ids
+    inventory_func_type func = boost::bind(&outfitFolderCreatedCallback, inv_cat->getUUID(), _1);
+    gInventory.createNewCategory(dest_id, LLFolderType::FT_OUTFIT, inv_cat->getName(), func);
+}
+
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 35186c53fb..7dd8187af3 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -66,6 +66,8 @@ public:
     BOOL postBuild();
     void initGallery();
     void draw();
+    BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type,
+                           void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
 
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
@@ -198,6 +200,11 @@ public:
     BOOL handleMouseDown(S32 x, S32 y, MASK mask);
     BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
     BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+    BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+                                   EDragAndDropType cargo_type,
+                                   void* cargo_data,
+                                   EAcceptance* accept,
+                                   std::string& tooltip_msg);
 
     void setName(std::string name);
     void setSelected(bool value);
-- 
cgit v1.2.3


From dfbf9e6d96293b7f97553154d103883dede477b8 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 23 Mar 2023 11:58:17 +0200
Subject: SL-19379 WIP update Add menu for Gallery view

---
 indra/newview/llpanelmaininventory.cpp |  15 +++-
 indra/newview/llviewerinventory.cpp    | 160 ++++++++++++++++++---------------
 indra/newview/llviewerinventory.h      |   2 +
 3 files changed, 99 insertions(+), 78 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2816a2dc89..e60ee20210 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -482,11 +482,18 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
 	reset_inventory_filter();
     if(mSingleFolderMode)
     {
-        LLFolderViewItem* current_folder = getActivePanel()->getRootFolder();
-        if (current_folder)
+        if(isListViewMode())
+        {
+            LLFolderViewItem* current_folder = getActivePanel()->getRootFolder();
+            if (current_folder)
+            {
+                LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
+                menu_create_inventory_item(getPanel(), bridge, userdata);
+            }
+        }
+        else if(isGalleryViewMode())
         {
-            LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
-            menu_create_inventory_item(getPanel(), bridge, userdata);
+            menu_create_inventory_item(NULL, mInventoryGalleryPanel->getRootFolder(), userdata);
         }
     }
     else
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6f18d72be0..95174c75e9 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1698,69 +1698,78 @@ const std::string NEW_GESTURE_NAME = "New Gesture"; // *TODO:Translate? (probabl
 // ! REFACTOR ! Really need to refactor this so that it's not a bunch of if-then statements...
 void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge, const LLSD& userdata, const LLUUID& default_parent_uuid)
 {
-	std::string type_name = userdata.asString();
-	
-	if (("inbox" == type_name) || ("category" == type_name) || ("current" == type_name) || ("outfit" == type_name) || ("my_otfts" == type_name))
-	{
-		LLFolderType::EType preferred_type = LLFolderType::lookup(type_name);
+    menu_create_inventory_item(panel, bridge ? bridge->getUUID() : LLUUID::null, userdata, default_parent_uuid);
+}
 
-		LLUUID parent_id;
-		if (bridge)
-		{
-			parent_id = bridge->getUUID();
-		}
-		else if (default_parent_uuid.notNull())
-		{
-			parent_id = default_parent_uuid;
-		}
-		else
-		{
-			parent_id = gInventory.getRootFolderID();
-		}
+void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid)
+{
+    std::string type_name = userdata.asString();
+    
+    if (("inbox" == type_name) || ("category" == type_name) || ("current" == type_name) || ("outfit" == type_name) || ("my_otfts" == type_name))
+    {
+        LLFolderType::EType preferred_type = LLFolderType::lookup(type_name);
 
-        LLHandle<LLPanel> handle = panel->getHandle();
-		gInventory.createNewCategory(
-            parent_id,
-            preferred_type,
-            LLStringUtil::null,
-            [handle](const LLUUID &new_category_id)
+        LLUUID parent_id;
+        if (dest_id.notNull())
         {
-            gInventory.notifyObservers();
-            LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(handle.get());
-            if (panel)
+            parent_id = dest_id;
+        }
+        else if (default_parent_uuid.notNull())
+        {
+            parent_id = default_parent_uuid;
+        }
+        else
+        {
+            parent_id = gInventory.getRootFolderID();
+        }
+
+        std::function<void(const LLUUID&)> callback_cat_created = NULL;
+        if(panel)
+        {
+            LLHandle<LLPanel> handle = panel->getHandle();
+            std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID &new_category_id)
             {
-                panel->setSelectionByID(new_category_id, TRUE);
-            }
+                gInventory.notifyObservers();
+                LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(handle.get());
+                if (panel)
+                {
+                    panel->setSelectionByID(new_category_id, TRUE);
+                }
+            };
         }
-        );
-	}
-	else if ("lsl" == type_name)
-	{
-		const LLUUID parent_id = bridge ? bridge->getUUID() : gInventory.findCategoryUUIDForType(LLFolderType::FT_LSL_TEXT);
-		create_new_item(NEW_LSL_NAME,
-					  parent_id,
-					  LLAssetType::AT_LSL_TEXT,
-					  LLInventoryType::IT_LSL,
-					  PERM_MOVE | PERM_TRANSFER);	// overridden in create_new_item
-	}
-	else if ("notecard" == type_name)
-	{
-		const LLUUID parent_id = bridge ? bridge->getUUID() : gInventory.findCategoryUUIDForType(LLFolderType::FT_NOTECARD);
-		create_new_item(NEW_NOTECARD_NAME,
-					  parent_id,
-					  LLAssetType::AT_NOTECARD,
-					  LLInventoryType::IT_NOTECARD,
-					  PERM_ALL);	// overridden in create_new_item
-	}
-	else if ("gesture" == type_name)
-	{
-		const LLUUID parent_id = bridge ? bridge->getUUID() : gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE);
-		create_new_item(NEW_GESTURE_NAME,
-					  parent_id,
-					  LLAssetType::AT_GESTURE,
-					  LLInventoryType::IT_GESTURE,
-					  PERM_ALL);	// overridden in create_new_item
-	}
+        gInventory.createNewCategory(
+            parent_id,
+            preferred_type,
+            LLStringUtil::null,
+            callback_cat_created);
+    }
+    else if ("lsl" == type_name)
+    {
+        const LLUUID parent_id = dest_id.notNull() ? dest_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_LSL_TEXT);
+        create_new_item(NEW_LSL_NAME,
+                      parent_id,
+                      LLAssetType::AT_LSL_TEXT,
+                      LLInventoryType::IT_LSL,
+                      PERM_MOVE | PERM_TRANSFER);    // overridden in create_new_item
+    }
+    else if ("notecard" == type_name)
+    {
+        const LLUUID parent_id = dest_id.notNull() ? dest_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_NOTECARD);
+        create_new_item(NEW_NOTECARD_NAME,
+                      parent_id,
+                      LLAssetType::AT_NOTECARD,
+                      LLInventoryType::IT_NOTECARD,
+                      PERM_ALL);    // overridden in create_new_item
+    }
+    else if ("gesture" == type_name)
+    {
+        const LLUUID parent_id = dest_id.notNull() ? dest_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE);
+        create_new_item(NEW_GESTURE_NAME,
+                      parent_id,
+                      LLAssetType::AT_GESTURE,
+                      LLInventoryType::IT_GESTURE,
+                      PERM_ALL);    // overridden in create_new_item
+    }
     else if (("sky" == type_name) || ("water" == type_name) || ("daycycle" == type_name))
     {
         LLSettingsType::type_e stype(LLSettingsType::ST_NONE);
@@ -1783,25 +1792,28 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge,
             return;
         }
 
-        LLUUID parent_id = bridge ? bridge->getUUID() : gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS);
+        LLUUID parent_id = dest_id.notNull() ? dest_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS);
 
         LLSettingsVOBase::createNewInventoryItem(stype, parent_id);
     }
-	else
-	{
-		// Use for all clothing and body parts.  Adding new wearable types requires updating LLWearableDictionary.
-		LLWearableType::EType wearable_type = LLWearableType::getInstance()->typeNameToType(type_name);
-		if (wearable_type >= LLWearableType::WT_SHAPE && wearable_type < LLWearableType::WT_COUNT)
-		{
-			const LLUUID parent_id = bridge ? bridge->getUUID() : LLUUID::null;
-			LLAgentWearables::createWearable(wearable_type, false, parent_id);
-		}
-		else
-		{
-			LL_WARNS(LOG_INV) << "Can't create unrecognized type " << type_name << LL_ENDL;
-		}
-	}
-	panel->getRootFolder()->setNeedsAutoRename(TRUE);	
+    else
+    {
+        // Use for all clothing and body parts.  Adding new wearable types requires updating LLWearableDictionary.
+        LLWearableType::EType wearable_type = LLWearableType::getInstance()->typeNameToType(type_name);
+        if (wearable_type >= LLWearableType::WT_SHAPE && wearable_type < LLWearableType::WT_COUNT)
+        {
+            const LLUUID parent_id = dest_id;
+            LLAgentWearables::createWearable(wearable_type, false, parent_id);
+        }
+        else
+        {
+            LL_WARNS(LOG_INV) << "Can't create unrecognized type " << type_name << LL_ENDL;
+        }
+    }
+    if(panel)
+    {
+        panel->getRootFolder()->setNeedsAutoRename(TRUE);
+    }
 }
 
 LLAssetType::EType LLViewerInventoryItem::getType() const
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 3914dae343..63f163b168 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -446,6 +446,8 @@ void menu_create_inventory_item(LLInventoryPanel* root,
 								const LLSD& userdata,
 								const LLUUID& default_parent_uuid = LLUUID::null);
 
+void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid = LLUUID::null);
+
 void slam_inventory_folder(const LLUUID& folder_id,
 						   const LLSD& contents,
 						   LLPointer<LLInventoryCallback> cb);
-- 
cgit v1.2.3


From 6172945775790757af827dfb88251875b0dd446f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 23 Mar 2023 13:56:42 +0200
Subject: SL-19391 FIXED SFV floater title displays unlocalised name for system
 folders

---
 indra/newview/llpanelmaininventory.cpp             | 55 +++++++++++++++-------
 indra/newview/llpanelmaininventory.h               |  1 +
 .../skins/default/xui/de/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/es/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/fr/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/it/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/ja/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/pl/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/pt/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/ru/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/tr/panel_main_inventory.xml  |  1 +
 .../skins/default/xui/zh/panel_main_inventory.xml  |  1 +
 12 files changed, 48 insertions(+), 18 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index e60ee20210..23a32df2cc 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -53,6 +53,7 @@
 #include "llspinctrl.h"
 #include "lltoggleablemenu.h"
 #include "lltooldraganddrop.h"
+#include "lltrans.h"
 #include "llviewermenu.h"
 #include "llviewertexturelist.h"
 #include "llsidepanelinventory.h"
@@ -763,11 +764,7 @@ void LLPanelMainInventory::onFilterSelected()
 		finder->changeFilter(&filter);
         if (mSingleFolderMode)
         {
-            const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
-            if (cat)
-            {
-                finder->setTitle(cat->getName());
-            }
+            finder->setTitle(getLocalizedRootName());
         }
 	}
 	if (filter.isActive())
@@ -934,11 +931,7 @@ void LLPanelMainInventory::toggleFindOptions()
 
         if (mSingleFolderMode)
         {
-            const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
-            if (cat)
-            {
-                finder->setTitle(cat->getName());
-            }
+            finder->setTitle(getLocalizedRootName());
         }
 	}
 	else
@@ -1925,15 +1918,11 @@ void LLPanelMainInventory::updateTitle()
     {
         if(mSingleFolderMode)
         {
-            const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
-            if (cat)
+            inventory_floater->setTitle(getLocalizedRootName());
+            LLFloaterInventoryFinder *finder = getFinder();
+            if (finder)
             {
-                inventory_floater->setTitle(cat->getName());
-                LLFloaterInventoryFinder *finder = getFinder();
-                if (finder)
-                {
-                    finder->setTitle(cat->getName());
-                }
+                finder->setTitle(getLocalizedRootName());
             }
         }
         else
@@ -2004,6 +1993,36 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
     }
 }
 
+std::string LLPanelMainInventory::getLocalizedRootName()
+{
+    std::string localized_root_name;
+    if(mSingleFolderMode)
+    {
+        const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
+        if (cat)
+        {
+            LLFolderType::EType preferred_type = cat->getPreferredType();
+
+            // Translation of Accessories folder in Library inventory folder
+            bool accessories = false;
+            if(getName() == "Accessories")
+            {
+                const LLUUID& parent_folder_id = cat->getParentUUID();
+                accessories = (parent_folder_id == gInventory.getLibraryRootFolderID());
+            }
+
+            //"Accessories" inventory category has folder type FT_NONE. So, this folder
+            //can not be detected as protected with LLFolderType::lookupIsProtectedType
+            localized_root_name.assign(cat->getName());
+            if (accessories || LLFolderType::lookupIsProtectedType(preferred_type))
+            {
+                LLTrans::findString(localized_root_name, std::string("InvFolder ") + cat->getName(), LLSD());
+            }
+        }
+    }
+    return localized_root_name;
+}
+
 LLUUID LLPanelMainInventory::getCurrentSFVRoot()
 {
     if(isListViewMode())
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index c30f894118..ac97cc4052 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -120,6 +120,7 @@ public:
     bool isListViewMode() { return (mViewMode == MODE_LIST); }
     bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); }
     LLUUID getCurrentSFVRoot();
+    std::string getLocalizedRootName();
 
 protected:
 	//
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
index a3adea9fa2..175f6e1003 100644
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Geholte [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordner [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTAR</panel.string>
 	<text name="ItemcountText">
 		Objekte:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
index 1252c7ce0d..bf1205046b 100644
--- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas Obtenidos [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTARIO</panel.string>
 	<text name="ItemcountText">
 		Ítems:
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
index 5bcee89752..5bf4d6c15d 100644
--- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Recherche effectuée [ITEM_COUNT] d&apos;articles et [CATEGORY_COUNT] de dossiers [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTAIRE</panel.string>
 	<text name="ItemcountText">
 		Articles :
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
index 5d11967cee..d6890229e7 100644
--- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Recuperati [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTARIO</panel.string>
 	<text name="ItemcountText">
 		Oggetti:
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 5751154163..e1f0c4ecc1 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得しました [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">インベントリ</panel.string>
 	<text name="ItemcountText">
 		アイテム：
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
index dc254e246f..1011c38378 100644
--- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
@@ -6,6 +6,7 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] obiekty [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">MOJA SZAFA</panel.string>
 	<text name="ItemcountText">
 		Obiekty:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index 009b5b3193..e0cf528468 100644
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Itens [ITEM_COUNT] e Pastas [CATEGORY_COUNT] Reunidos [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTÁRIO</panel.string>
 	<text name="ItemcountText">
 		Itens:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
index f2502bf6d3..b473fb8f98 100644
--- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">ИНВЕНТАРЬ</panel.string>
 	<text name="ItemcountText">
 		Вещи:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
index a11fd98b9a..7e98078635 100644
--- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alındı [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">ENVANTER</panel.string>
 	<text name="ItemcountText">
 		Ögeler:
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 1a28f4c3b5..9ffa9323cc 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		擷取了[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">收納區</panel.string>
 	<text name="ItemcountText">
 		物品：
 	</text>
-- 
cgit v1.2.3


From 04501955c7d0cd19d13ac1374f6f06e944f6ea61 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Mar 2023 21:13:30 +0200
Subject: SL-19108 Disable "Image" button for task inventories

Thumbnails are not supported for task inventories yet
---
 indra/newview/llaisapi.cpp            | 5 +++--
 indra/newview/llinventorymodel.cpp    | 4 ++++
 indra/newview/llsidepaneliteminfo.cpp | 8 ++++++--
 indra/newview/llsidepaneliteminfo.h   | 5 +++--
 4 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index d2bf7a0e9a..d0c8d38e28 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -543,7 +543,8 @@ void AISAPI::onIdle(void *userdata)
 void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type, const LLSD& request_body)
 {
     LLTimer timer;
-    if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
+    if ( (type == UPDATECATEGORY || type == UPDATEITEM)
+        && gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
     {
         dump_sequential_xml(gAgentAvatarp->getFullname() + "_ais_update", update);
     }
@@ -558,7 +559,7 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
     }
     AISUpdate ais_update(update, is_fetch, depth);
     ais_update.doUpdate(); // execute the updates in the appropriate order.
-    LL_INFOS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
+    LL_DEBUGS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
 }
 
 /*static*/
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b833571ee9..6d9142cc5c 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3448,6 +3448,10 @@ void LLInventoryModel::processUpdateCreateInventoryItem(LLMessageSystem* msg, vo
 		msg->getU32Fast(_PREHASH_InventoryData, _PREHASH_CallbackID, callback_id);
 
 		gInventoryCallbacks.fire(callback_id, item_id);
+
+        // todo: instead of unpacking message fully,
+        // grab only an item_id, then fetch via AIS
+        AISAPI::FetchItem(item_id, AISAPI::INVENTORY);
 	}
 
 }
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 312dee8c93..9660fa5916 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -154,15 +154,16 @@ LLSidepanelItemInfo::~LLSidepanelItemInfo()
 // virtual
 BOOL LLSidepanelItemInfo::postBuild()
 {
+    mChangeThumbnailBtn = getChild<LLUICtrl>("change_thumbnail_btn");
+    mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
     mLabelOwnerName = getChild<LLTextBox>("LabelOwnerName");
     mLabelCreatorName = getChild<LLTextBox>("LabelCreatorName");
-    mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
     
 	getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
 	getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
 	getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
     // Thumnail edition
-    getChild<LLUICtrl>("change_thumbnail_btn")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onEditThumbnail, this));
+    mChangeThumbnailBtn->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onEditThumbnail, this));
 	// acquired date
 	// owner permissions
 	// Permissions debug text
@@ -443,6 +444,9 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
         mLabelOwnerName->setEnabled(FALSE);
         mLabelOwnerName->setValue(getString("public"));
 	}
+
+    // Not yet supported for task inventories
+    mChangeThumbnailBtn->setEnabled(mObjectID.isNull());
 	
 	////////////
 	// ORIGIN //
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index ba1d5c263a..b916f44520 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -100,10 +100,11 @@ private:
 	S32 mUpdatePendingId;
     bool mIsDirty;         // item properties need to be updated
     LLFloater* mParentFloater;
-    
+
+    LLUICtrl* mChangeThumbnailBtn;
+    LLIconCtrl* mItemTypeIcon;
     LLTextBox* mLabelOwnerName;
     LLTextBox* mLabelCreatorName;
-    LLIconCtrl* mItemTypeIcon;
 
 	//
 	// UI Elements
-- 
cgit v1.2.3


From cc98d967796e552432a59c2ad81742ad55bff983 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 00:06:15 +0200
Subject: SL-19379 WIP add drag and drop out of Gallery

---
 indra/newview/llinventorygallery.cpp | 43 +++++++++++++++++++++++++++++++++++-
 indra/newview/llinventorygallery.h   |  2 ++
 2 files changed, 44 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index a3a1fbcc16..86f60b5644 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -46,6 +46,7 @@
 #include "llgesturemgr.h"
 #include "llmarketplacefunctions.h"
 #include "lltrans.h"
+#include "llviewerassettype.h"
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
 #include "llvoavatarself.h"
@@ -970,7 +971,13 @@ void LLInventoryGalleryItem::setSelected(bool value)
 BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
 {
     setFocus(TRUE);
-    return LLUICtrl::handleMouseDown(x, y, mask);
+
+    gFocusMgr.setMouseCapture(this);
+    S32 screen_x;
+    S32 screen_y;
+    localPointToScreen(x, y, &screen_x, &screen_y );
+    LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y);
+    return TRUE;
 }
 
 BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
@@ -979,6 +986,40 @@ BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
     return LLUICtrl::handleRightMouseDown(x, y, mask);
 }
 
+BOOL LLInventoryGalleryItem::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    if(hasMouseCapture())
+    {
+        gFocusMgr.setMouseCapture(NULL);
+        return TRUE;
+    }
+    return LLPanel::handleMouseUp(x, y, mask);
+}
+
+BOOL LLInventoryGalleryItem::handleHover(S32 x, S32 y, MASK mask)
+{
+    if(hasMouseCapture())
+    {
+        S32 screen_x;
+        S32 screen_y;
+        const LLInventoryItem *item = gInventory.getItem(mUUID);;
+
+        localPointToScreen(x, y, &screen_x, &screen_y );
+        if(item && LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
+        {
+            EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(item->getType());
+            LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_LIBRARY;
+            if(item->getPermissions().getOwner() == gAgent.getID())
+            {
+                src = LLToolDragAndDrop::SOURCE_AGENT;
+            }
+            LLToolDragAndDrop::getInstance()->beginDrag(type, item->getUUID(), src);
+            return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask );
+        }
+    }
+    return LLUICtrl::handleHover(x,y,mask);
+}
+
 BOOL LLInventoryGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
     if (mIsFolder && mGallery)
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 7dd8187af3..0a779037db 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -200,6 +200,8 @@ public:
     BOOL handleMouseDown(S32 x, S32 y, MASK mask);
     BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
     BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+    BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+    BOOL handleHover(S32 x, S32 y, MASK mask);
     BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                    EDragAndDropType cargo_type,
                                    void* cargo_data,
-- 
cgit v1.2.3


From 6826ed7167e15f05e721e6aa9ade3c655991ccee Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 00:08:46 +0200
Subject: SL-19445 Increment inventory cache version for Inventory thumbnails

Inventory thumbnails appear as lost when moving between non thumbnail and thumbnail viewers.
Release viewer doesn't know to cache thumbnails, thumbnail viewer loads release's cache and finds no thumbnails, but version control appears to be valid so viewer thinks there is nothing to download.
---
 indra/newview/llinventorymodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 6d9142cc5c..56f0a68f70 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -76,7 +76,7 @@
 
 // Increment this if the inventory contents change in a non-backwards-compatible way.
 // For viewer 2, the addition of link items makes a pre-viewer-2 cache incorrect.
-const S32 LLInventoryModel::sCurrentInvCacheVersion = 2;
+const S32 LLInventoryModel::sCurrentInvCacheVersion = 3;
 BOOL LLInventoryModel::sFirstTimeInViewer2 = TRUE;
 
 ///----------------------------------------------------------------------------
-- 
cgit v1.2.3


From 1800e969c5fa443f18ea4b01e59840e4bbf2afeb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 00:34:48 +0200
Subject: SL-18003 Use AISv3 cap in LLInventoryFetchItemsObserver

---
 indra/newview/llinventoryobserver.cpp | 37 +++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index b884721895..809fbe4100 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -37,6 +37,7 @@
 
 #include "llagent.h"
 #include "llagentwearables.h"
+#include "llaisapi.h"
 #include "llfloater.h"
 #include "llfocusmgr.h"
 #include "llinventorybridge.h"
@@ -251,6 +252,8 @@ void fetch_items_from_llsd(const LLSD& items_llsd)
 
 void LLInventoryFetchItemsObserver::startFetch()
 {
+    bool aisv3 = AISAPI::isAvailable();
+
 	LLUUID owner_id;
 	LLSD items_llsd;
 	for (uuid_vec_t::const_iterator it = mIDs.begin(); it < mIDs.end(); ++it)
@@ -294,17 +297,39 @@ void LLInventoryFetchItemsObserver::startFetch()
 		// pack this on the message.
 		mIncomplete.push_back(*it);
 
-		// Prepare the data to fetch
-		LLSD item_entry;
-		item_entry["owner_id"] = owner_id;
-		item_entry["item_id"] = (*it);
-		items_llsd.append(item_entry);
+        if (aisv3)
+        {
+            // doesn't support bulk fetching, request one by one
+            if (owner_id == ALEXANDRIA_LINDEN_ID)
+            {
+                AISAPI::FetchItem(*it, AISAPI::LIBRARY);
+            }
+            else
+            {
+                AISAPI::FetchItem(*it, AISAPI::INVENTORY);
+            }
+            // Todo: remove item from mIncomplete on callback
+            // but keep in mind that observer can expire before
+            // callback
+        }
+        else
+        {
+            // Prepare the data to fetch
+            LLSD item_entry;
+            item_entry["owner_id"] = owner_id;
+            item_entry["item_id"] = (*it);
+            items_llsd.append(item_entry);
+        }
 	}
 
 	mFetchingPeriod.reset();
 	mFetchingPeriod.setTimerExpirySec(FETCH_TIMER_EXPIRY);
 
-	fetch_items_from_llsd(items_llsd);
+    if (!aisv3)
+    {
+        fetch_items_from_llsd(items_llsd);
+    }
+
 }
 
 LLInventoryFetchDescendentsObserver::LLInventoryFetchDescendentsObserver(const LLUUID& cat_id) :
-- 
cgit v1.2.3


From d733ee60ea1d7cd7a9259c188b7b942a41d24460 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 12:56:57 +0200
Subject: SL-19379 WIP add double-click attach action for objects; add icon
 link overlays

---
 indra/newview/llinventorybridge.cpp                | 27 ++++++++++++++++++++--
 indra/newview/llinventorygallery.cpp               | 14 +++++------
 indra/newview/llinventorygallery.h                 |  4 ++--
 .../xui/en/panel_inventory_gallery_item.xml        | 10 ++++++++
 4 files changed, 44 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 0cd1e9bf44..1fac4dd1ad 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -7575,13 +7575,26 @@ class LLObjectBridgeAction: public LLInvFVBridgeAction
 public:
 	virtual void doIt()
 	{
-		LLInvFVBridgeAction::doIt();
+        attachOrDetach();
 	}
 	virtual ~LLObjectBridgeAction(){}
 protected:
 	LLObjectBridgeAction(const LLUUID& id,LLInventoryModel* model) : LLInvFVBridgeAction(id,model) {}
+    void attachOrDetach();
 };
 
+void LLObjectBridgeAction::attachOrDetach()
+{
+    if (get_is_item_worn(mUUID))
+    {
+        LLAppearanceMgr::instance().removeItemFromAvatar(mUUID);
+    }
+    else
+    {
+        LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, false); // Don't replace if adding.
+    }
+}
+
 class LLLSLTextBridgeAction: public LLInvFVBridgeAction
 {
 	friend class LLInvFVBridgeAction;
@@ -7640,7 +7653,17 @@ void LLWearableBridgeAction::wearOnAvatar()
 	LLViewerInventoryItem* item = getItem();
 	if(item)
 	{
-		LLAppearanceMgr::instance().wearItemOnAvatar(item->getUUID(), true, true);
+        if (get_is_item_worn(mUUID))
+        {
+            if(item->getType() != LLAssetType::AT_BODYPART)
+            {
+                LLAppearanceMgr::instance().removeItemFromAvatar(item->getUUID());
+            }
+        }
+        else
+        {
+            LLAppearanceMgr::instance().wearItemOnAvatar(item->getUUID(), true, true);
+        }
 	}
 }
 
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 86f60b5644..c2594c1b87 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -458,7 +458,7 @@ void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
     mItemPanels.pop_back();
 }
 
-LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id)
+LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, bool is_link)
 {
     LLInventoryGalleryItem::Params giparams;
     LLInventoryGalleryItem* gitem = LLUICtrlFactory::create<LLInventoryGalleryItem>(giparams);
@@ -469,7 +469,7 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     gitem->setName(name);
     gitem->setUUID(item_id);
     gitem->setGallery(this);
-    gitem->setType(type);
+    gitem->setType(type, is_link);
     gitem->setThumbnail(thumbnail_id);
     return gitem;
 }
@@ -593,7 +593,7 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
         thumbnail_id = getOutfitImageID(item_id);
     }
 
-    LLInventoryGalleryItem* item = buildGalleryItem(obj->getName(), item_id, obj->getType(), thumbnail_id);
+    LLInventoryGalleryItem* item = buildGalleryItem(obj->getName(), item_id, obj->getType(), thumbnail_id, obj->getIsLinkType());
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
 
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::onChangeItemSelection, this, item_id));
@@ -902,7 +902,7 @@ BOOL LLInventoryGalleryItem::postBuild()
     return TRUE;
 }
 
-void LLInventoryGalleryItem::setType(LLAssetType::EType type)
+void LLInventoryGalleryItem::setType(LLAssetType::EType type, bool is_link)
 {
     mType = type;
     mIsFolder = (mType == LLAssetType::AT_CATEGORY);
@@ -929,6 +929,7 @@ void LLInventoryGalleryItem::setType(LLAssetType::EType type)
     }
 
     getChild<LLIconCtrl>("item_type")->setValue(icon_name);
+    getChild<LLIconCtrl>("link_overlay")->setVisible(is_link);
 }
 
 void LLInventoryGalleryItem::setThumbnail(LLUUID id)
@@ -1002,7 +1003,7 @@ BOOL LLInventoryGalleryItem::handleHover(S32 x, S32 y, MASK mask)
     {
         S32 screen_x;
         S32 screen_y;
-        const LLInventoryItem *item = gInventory.getItem(mUUID);;
+        const LLInventoryItem *item = gInventory.getItem(mUUID);
 
         localPointToScreen(x, y, &screen_x, &screen_y );
         if(item && LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
@@ -1028,8 +1029,7 @@ BOOL LLInventoryGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
     }
     else
     {
-        LLInvFVBridgeAction::doAction(mUUID,&gInventory);
-        //todo: some item types require different handling
+        LLInvFVBridgeAction::doAction(mUUID, &gInventory);
     }
 
     return TRUE;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 0a779037db..1c45a8345f 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -136,7 +136,7 @@ private:
     void updateRowsIfNeeded();
     void updateGalleryWidth();
 
-    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id);
+    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, bool is_link);
 
     void buildGalleryPanel(int row_count);
     void reshapeGalleryPanel(int row_count);
@@ -219,7 +219,7 @@ public:
     bool isHidden() {return mHidden;}
     void setHidden(bool hidden) {mHidden = hidden;}
 
-    void setType(LLAssetType::EType type);
+    void setType(LLAssetType::EType type, bool is_link);
     void setThumbnail(LLUUID id);
     void setGallery(LLInventoryGallery* gallery) { mGallery = gallery; }
     bool isFolder() { return mIsFolder; }
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index c180024aa7..73889af71a 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -33,6 +33,16 @@
    follows="left|top"
    visible="true"
    image_name="Inv_Eye"/>
+  <icon
+    left="5"
+    top_pad="-8"
+    layout="topleft"
+    name="link_overlay"
+    height="8"
+    width="6"
+    follows="left|top"
+    visible="false"
+    image_name="Inv_Link"/>
   <panel
    background_visible="false"
    background_opaque="true"
-- 
cgit v1.2.3


From 3605d3164d83b966c5c4a330713092d05e8e5698 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 13:58:29 +0200
Subject: SL-19379 WIP show localized folder names in Gallery

---
 indra/newview/llinventoryfunctions.cpp | 28 ++++++++++++++++++++++++++++
 indra/newview/llinventoryfunctions.h   |  2 ++
 indra/newview/llinventorygallery.cpp   | 13 +++++++++----
 indra/newview/llpanelmaininventory.cpp | 27 +--------------------------
 4 files changed, 40 insertions(+), 30 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 29ee879076..5b46dc4753 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2097,6 +2097,34 @@ bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_ca
 
     return true;
 }
+
+std::string get_localized_folder_name(LLUUID cat_uuid)
+{
+    std::string localized_root_name;
+    const LLViewerInventoryCategory* cat = gInventory.getCategory(cat_uuid);
+    if (cat)
+    {
+        LLFolderType::EType preferred_type = cat->getPreferredType();
+
+        // Translation of Accessories folder in Library inventory folder
+        bool accessories = false;
+        if(cat->getName() == "Accessories")
+        {
+            const LLUUID& parent_folder_id = cat->getParentUUID();
+            accessories = (parent_folder_id == gInventory.getLibraryRootFolderID());
+        }
+
+        //"Accessories" inventory category has folder type FT_NONE. So, this folder
+        //can not be detected as protected with LLFolderType::lookupIsProtectedType
+        localized_root_name.assign(cat->getName());
+        if (accessories || LLFolderType::lookupIsProtectedType(preferred_type))
+        {
+            LLTrans::findString(localized_root_name, std::string("InvFolder ") + cat->getName(), LLSD());
+        }
+    }
+    
+    return localized_root_name;
+}
 ///----------------------------------------------------------------------------
 /// LLMarketplaceValidator implementations
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 2dfe605ada..f7755be1dd 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -100,6 +100,8 @@ bool is_only_items_selected(const uuid_vec_t& selected_uuids);
 bool can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit);
 bool can_move_to_landmarks(LLInventoryItem* inv_item);
 bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit);
+std::string get_localized_folder_name(LLUUID cat_uuid);
+
 /**                    Miscellaneous global functions
  **                                                                            **
  *******************************************************************************/
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c2594c1b87..2624640bb4 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -586,14 +586,19 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
         return;
     }
 
+    std::string name = obj->getName();
     LLUUID thumbnail_id = obj->getThumbnailUUID();;
 
-    if ((LLAssetType::AT_CATEGORY == obj->getType()) && thumbnail_id.isNull())
+    if (LLAssetType::AT_CATEGORY == obj->getType())
     {
-        thumbnail_id = getOutfitImageID(item_id);
+        name = get_localized_folder_name(item_id);
+        if(thumbnail_id.isNull())
+        {
+            thumbnail_id = getOutfitImageID(item_id);
+        }
     }
-
-    LLInventoryGalleryItem* item = buildGalleryItem(obj->getName(), item_id, obj->getType(), thumbnail_id, obj->getIsLinkType());
+    
+    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, obj->getIsLinkType());
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
 
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::onChangeItemSelection, this, item_id));
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 23a32df2cc..f430e44ec2 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1995,32 +1995,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
 
 std::string LLPanelMainInventory::getLocalizedRootName()
 {
-    std::string localized_root_name;
-    if(mSingleFolderMode)
-    {
-        const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
-        if (cat)
-        {
-            LLFolderType::EType preferred_type = cat->getPreferredType();
-
-            // Translation of Accessories folder in Library inventory folder
-            bool accessories = false;
-            if(getName() == "Accessories")
-            {
-                const LLUUID& parent_folder_id = cat->getParentUUID();
-                accessories = (parent_folder_id == gInventory.getLibraryRootFolderID());
-            }
-
-            //"Accessories" inventory category has folder type FT_NONE. So, this folder
-            //can not be detected as protected with LLFolderType::lookupIsProtectedType
-            localized_root_name.assign(cat->getName());
-            if (accessories || LLFolderType::lookupIsProtectedType(preferred_type))
-            {
-                LLTrans::findString(localized_root_name, std::string("InvFolder ") + cat->getName(), LLSD());
-            }
-        }
-    }
-    return localized_root_name;
+    return mSingleFolderMode ? get_localized_folder_name(getCurrentSFVRoot()) : "";
 }
 
 LLUUID LLPanelMainInventory::getCurrentSFVRoot()
-- 
cgit v1.2.3


From 9697ac1bece30bda6410a8dc33450b85a3358745 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 16:22:57 +0200
Subject: SL-19335 update for switching in/out of Gallery view

---
 indra/newview/llpanelmaininventory.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index f430e44ec2..3679a22e5e 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1382,10 +1382,7 @@ void LLPanelMainInventory::onViewModeClick()
     LLUUID new_root_folder;
     if(mSingleFolderMode)
     {
-        if(isListViewMode())
-        {
-            selected_folder = mSingleFolderPanelInventory->getSingleFolderRoot();
-        }
+        selected_folder = getCurrentSFVRoot();
     }
     else
     {
@@ -1419,7 +1416,7 @@ void LLPanelMainInventory::onViewModeClick()
     if (mSingleFolderMode && new_root_folder.notNull())
     {
         setSingleFolderViewRoot(new_root_folder, true);
-        if(selected_folder.notNull())
+        if(selected_folder.notNull() && isListViewMode())
         {
             getActivePanel()->setSelection(selected_folder, TAKE_FOCUS_YES);
         }
@@ -1485,9 +1482,17 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
         if(clear_nav_history)
         {
             mSingleFolderPanelInventory->clearNavigationHistory();
-            updateNavButtons();
         }
     }
+    else if(isGalleryViewMode())
+    {
+        mInventoryGalleryPanel->setRootFolder(folder_id);
+        if(clear_nav_history)
+        {
+            mInventoryGalleryPanel->clearNavigationHistory();
+        }
+    }
+    updateNavButtons();
 }
 
 LLUUID LLPanelMainInventory::getSingleFolderViewRoot()
-- 
cgit v1.2.3


From 9fa64f1e2087a8e45adad7298d2dd3661bd80e25 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 18:03:09 +0200
Subject: SL-18003 Fix items not being marked as complete when fetched via ais

---
 indra/newview/llaisapi.cpp            | 1 +
 indra/newview/llinventoryfilter.cpp   | 3 ++-
 indra/newview/llinventorymodel.cpp    | 6 +++---
 indra/newview/llinventoryobserver.cpp | 2 +-
 indra/newview/llsidepaneliteminfo.cpp | 2 +-
 indra/newview/llviewerinventory.cpp   | 8 ++++----
 indra/newview/llviewerinventory.h     | 6 +++---
 7 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index d0c8d38e28..d204a752ec 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -845,6 +845,7 @@ void AISUpdate::parseItem(const LLSD& item_map)
         {
             mItemsCreated[item_id] = new_item;
             mCatDescendentDeltas[new_item->getParentUUID()];
+            new_item->setComplete(true);
         }
         else if (curr_item)
 		{
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 6e09161473..0af383f232 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -195,7 +195,8 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
 	// when applying a filter, matching folders get their contents downloaded first
 	// but make sure we are not interfering with pre-download
 	if (isNotDefault()
-		&& LLStartUp::getStartupState() > STATE_WEARABLES_WAIT)
+		&& LLStartUp::getStartupState() > STATE_WEARABLES_WAIT
+        && !LLInventoryModelBackgroundFetch::instance().inventoryFetchInProgress())
     {
         LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id);
         if (!cat || (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN))
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 56f0a68f70..4c2383d211 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3451,7 +3451,7 @@ void LLInventoryModel::processUpdateCreateInventoryItem(LLMessageSystem* msg, vo
 
         // todo: instead of unpacking message fully,
         // grab only an item_id, then fetch via AIS
-        AISAPI::FetchItem(item_id, AISAPI::INVENTORY);
+        LLInventoryModelBackgroundFetch::instance().start(item_id, false);
 	}
 
 }
@@ -3795,7 +3795,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-        AISAPI::FetchCategoryChildren((*cit)->getUUID(), AISAPI::INVENTORY);
+        LLInventoryModelBackgroundFetch::instance().start((*cit)->getUUID(), false);
 	}
 	for (item_array_t::iterator iit = items.begin(); iit != items.end(); ++iit)
 	{
@@ -3804,7 +3804,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-        AISAPI::FetchItem((*iit)->getUUID(), AISAPI::INVENTORY);
+        LLInventoryModelBackgroundFetch::instance().start((*iit)->getUUID(), false);
 	}
 	gInventory.notifyObservers();
 
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 809fbe4100..25f1854765 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -310,7 +310,7 @@ void LLInventoryFetchItemsObserver::startFetch()
             }
             // Todo: remove item from mIncomplete on callback
             // but keep in mind that observer can expire before
-            // callback
+            // callback or use LLInventoryModelBackgroundFetch
         }
         else
         {
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 9660fa5916..48e610a135 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -280,7 +280,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
     }
 
 	// do not enable the UI for incomplete items.
-	BOOL is_complete = item->isFinished();
+	bool is_complete = item->isFinished();
 	const BOOL cannot_restrict_permissions = LLInventoryType::cannotRestrictPermissions(item->getInventoryType());
 	const BOOL is_calling_card = (item->getInventoryType() == LLInventoryType::IT_CALLINGCARD);
 	const BOOL is_settings = (item->getInventoryType() == LLInventoryType::IT_SETTINGS);
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 95174c75e9..d8de269c3c 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -312,7 +312,7 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLUUID& uuid,
 											 time_t creation_date_utc) :
 	LLInventoryItem(uuid, parent_uuid, perm, asset_uuid, type, inv_type,
 					name, desc, sale_info, flags, creation_date_utc),
-	mIsComplete(TRUE)
+	mIsComplete(true)
 {
 }
 
@@ -321,7 +321,7 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLUUID& item_id,
 											 const std::string& name,
 											 LLInventoryType::EType inv_type) :
 	LLInventoryItem(),
-	mIsComplete(FALSE)
+	mIsComplete(false)
 {
 	mUUID = item_id;
 	mParentUUID = parent_id;
@@ -331,7 +331,7 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLUUID& item_id,
 
 LLViewerInventoryItem::LLViewerInventoryItem() :
 	LLInventoryItem(),
-	mIsComplete(FALSE)
+	mIsComplete(false)
 {
 }
 
@@ -348,7 +348,7 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLViewerInventoryItem* other)
 
 LLViewerInventoryItem::LLViewerInventoryItem(const LLInventoryItem *other) :
 	LLInventoryItem(other),
-	mIsComplete(TRUE)
+	mIsComplete(true)
 {
 }
 
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 63f163b168..1554c84137 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -135,8 +135,8 @@ public:
 	virtual BOOL importLegacyStream(std::istream& input_stream);
 
 	// new methods
-	BOOL isFinished() const { return mIsComplete; }
-	void setComplete(BOOL complete) { mIsComplete = complete; }
+	bool isFinished() const { return mIsComplete; }
+	void setComplete(bool complete) { mIsComplete = complete; }
 	//void updateAssetOnServer() const;
 
 	virtual void setTransactionID(const LLTransactionID& transaction_id);
@@ -164,7 +164,7 @@ public:
 	BOOL regenerateLink();
 
 public:
-	BOOL mIsComplete;
+	bool mIsComplete;
 	LLTransactionID mTransactionID;
 };
 
-- 
cgit v1.2.3


From c9d9f1c54e104dd0ac670fbac2f4e9e053eea25c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 18:52:15 +0200
Subject: SL-18003 Make ais fetch faster

---
 indra/newview/app_settings/settings.xml           |  2 +-
 indra/newview/llinventorymodelbackgroundfetch.cpp | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 87b0ad8faf..a2a1b3f117 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15290,7 +15290,7 @@
         <key>Type</key>
             <string>U32</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>20</integer>
         </map>
     <key>PoolSizeUpload</key>
         <map>
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index ea721b3a40..023cc05ee7 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -33,6 +33,7 @@
 #include "llcallbacklist.h"
 #include "llinventorypanel.h"
 #include "llinventorymodel.h"
+#include "llstartup.h"
 #include "llviewercontrol.h"
 #include "llviewerinventory.h"
 #include "llviewermessage.h"
@@ -447,7 +448,8 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         return;
     }
 
-    static const S32 max_concurrent_fetches(50);
+    static LLCachedControl<U32> ais_pool(gSavedSettings, "", 20);
+    const U32 max_concurrent_fetches = llmax(1, ais_pool - 1);
 
     if (mFetchCount >= max_concurrent_fetches)
     {
@@ -456,7 +458,9 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
 
     // Don't loop for too long (in case of large, fully loaded inventory)
     F64 curent_time = LLTimer::getTotalSeconds();
-    const F64 max_time = 0.006f; // 6 ms
+    const F64 max_time = LLStartUp::getStartupState() > STATE_WEARABLES_WAIT
+        ? 0.006f // 6 ms
+        : 1.f; 
     const F64 end_time = curent_time + max_time;
 
     while (!mFetchQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
@@ -480,8 +484,10 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         const LLUUID & cat_id(fetch_info.mUUID);
         if (cat_id.isNull()) // Lost and found
         {
-            AISAPI::FetchCategoryChildren(LLUUID::null, AISAPI::INVENTORY, false, ais_simple_callback);
-            mFetchCount++;
+            LL_WARNS() << "Lost and found not implemented yet" << LL_ENDL;
+            // todo: needs to be requested from ais in special manner?
+            /*AISAPI::FetchCategoryChildren(LLUUID::null, AISAPI::INVENTORY, false, ais_simple_callback);
+            mFetchCount++;*/
         }
         else
         {
-- 
cgit v1.2.3


From d1b414e48b4faa8f0b6b68fc6cb16701137478fd Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 24 Mar 2023 21:10:12 +0100
Subject: SL-17045 LSL editor cursor position desynchronization

---
 indra/llrender/llfontgl.cpp      | 24 +++++++++++++++---------
 indra/llrender/llfontgl.h        |  2 +-
 indra/llui/lltextbase.cpp        |  6 +++---
 indra/llui/lltextbase.h          |  2 +-
 indra/newview/llscripteditor.cpp |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'indra')

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 1bf061bc8d..6f4f2ec62c 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -494,7 +494,7 @@ F32 LLFontGL::getWidthF32(const std::string& utf8text, S32 begin_offset, S32 max
 	return getWidthF32(wtext.c_str(), begin_offset, max_chars);
 }
 
-F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars) const
+F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars, bool no_padding) const
 {
 	const S32 LAST_CHARACTER = LLFontFreetype::LAST_CHAR_FULL;
 
@@ -517,12 +517,15 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars
 
 		F32 advance = mFontFreetype->getXAdvance(fgi);
 
-		// for the last character we want to measure the greater of its width and xadvance values
-		// so keep track of the difference between these values for the each character we measure
-		// so we can fix things up at the end
-		width_padding = llmax(	0.f,											// always use positive padding amount
-								width_padding - advance,						// previous padding left over after advance of current character
-								(F32)(fgi->mWidth + fgi->mXBearing) - advance);	// difference between width of this character and advance to next character
+		if (!no_padding)
+		{
+			// for the last character we want to measure the greater of its width and xadvance values
+			// so keep track of the difference between these values for the each character we measure
+			// so we can fix things up at the end
+			width_padding = llmax(0.f,											// always use positive padding amount
+				width_padding - advance,						// previous padding left over after advance of current character
+				(F32)(fgi->mWidth + fgi->mXBearing) - advance);	// difference between width of this character and advance to next character
+		}
 
 		cur_x += advance;
 		llwchar next_char = wchars[i+1];
@@ -539,8 +542,11 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars
 		cur_x = (F32)ll_round(cur_x);
 	}
 
-	// add in extra pixels for last character's width past its xadvance
-	cur_x += width_padding;
+	if (!no_padding)
+	{
+		// add in extra pixels for last character's width past its xadvance
+		cur_x += width_padding;
+	}
 
 	return cur_x / sScaleX;
 }
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 3b58a37d33..93c6b78ce8 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -138,7 +138,7 @@ public:
 	F32 getWidthF32(const std::string& utf8text) const;
 	F32 getWidthF32(const llwchar* wchars) const;
 	F32 getWidthF32(const std::string& text, S32 offset, S32 max_chars ) const;
-	F32 getWidthF32(const llwchar* wchars, S32 offset, S32 max_chars) const;
+	F32 getWidthF32(const llwchar* wchars, S32 offset, S32 max_chars, bool no_padding = false) const;
 
 	// The following are called often, frequently with large buffers, so do not use a string interface
 	
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3d8cf74855..8732a7ce45 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -361,7 +361,7 @@ void LLTextBase::onValueChange(S32 start, S32 end)
 {
 }
 
-std::vector<LLRect> LLTextBase::getSelctionRects()
+std::vector<LLRect> LLTextBase::getSelectionRects()
 {
     // Nor supposed to be called without selection
     llassert(hasSelection());
@@ -458,7 +458,7 @@ void LLTextBase::drawSelectionBackground()
     // Draw selection even if we don't have keyboard focus for search/replace
     if (hasSelection() && !mLineInfoList.empty())
     {
-        std::vector<LLRect> selection_rects = getSelctionRects();
+        std::vector<LLRect> selection_rects = getSelectionRects();
 		
 		// Draw the selection box (we're using a box instead of reversing the colors on the selected text).
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
@@ -3464,7 +3464,7 @@ bool LLNormalTextSegment::getDimensionsF32(S32 first_char, S32 num_chars, F32& w
 		height = mFontHeight;
 		const LLWString &text = getWText();
 		// if last character is a newline, then return true, forcing line break
-		width = mStyle->getFont()->getWidthF32(text.c_str(), mStart + first_char, num_chars);
+		width = mStyle->getFont()->getWidthF32(text.c_str(), mStart + first_char, num_chars, true);
 	}
 	return false;
 }
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index e3cf56a5ee..3611ab0499 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -638,7 +638,7 @@ protected:
 		return mLabel.getString() + getToolTip();
 	}
 
-    std::vector<LLRect> getSelctionRects();
+    std::vector<LLRect> getSelectionRects();
 
 protected:
 	// text segmentation and flow
diff --git a/indra/newview/llscripteditor.cpp b/indra/newview/llscripteditor.cpp
index 140cbbedbe..3278bd3aa9 100644
--- a/indra/newview/llscripteditor.cpp
+++ b/indra/newview/llscripteditor.cpp
@@ -187,7 +187,7 @@ void LLScriptEditor::drawSelectionBackground()
 	// Draw selection even if we don't have keyboard focus for search/replace
 	if( hasSelection() && !mLineInfoList.empty())
 	{
-        std::vector<LLRect> selection_rects = getSelctionRects();
+        std::vector<LLRect> selection_rects = getSelectionRects();
 
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		const LLColor4& color = mReadOnly ? mReadOnlyFgColor : mFgColor;
-- 
cgit v1.2.3


From 6fd7427c576ec922b6c670b4ff9381c7cb738b5b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 26 Mar 2023 13:44:50 +0300
Subject: SL-18003 Bulk fetch some items by fetching whole folder

---
 indra/newview/llaisapi.cpp                        |  4 +-
 indra/newview/llappearancemgr.cpp                 | 64 +++++++++++++++++++++++
 indra/newview/llinventorymodelbackgroundfetch.cpp |  6 ++-
 indra/newview/llinventoryobserver.cpp             |  1 +
 indra/newview/llinventoryobserver.h               |  2 +-
 indra/newview/llviewerinventory.cpp               |  2 +-
 6 files changed, 75 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index d204a752ec..6a43c901e7 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -373,7 +373,6 @@ void AISAPI::UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t
 /*static*/
 void AISAPI::FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callback)
 {
-
 	std::string cap;
 
 	cap = (type == INVENTORY) ? getInvCap() : getLibCap();
@@ -859,6 +858,7 @@ void AISUpdate::parseItem(const LLSD& item_map)
 		{
 			mItemsCreated[item_id] = new_item;
 			mCatDescendentDeltas[new_item->getParentUUID()]++;
+            new_item->setComplete(true);
 		}
 	}
 	else
@@ -893,6 +893,7 @@ void AISUpdate::parseLink(const LLSD& link_map)
             //LL_DEBUGS("Inventory") << "creating link from llsd: " << ll_pretty_print_sd(link_map) << LL_ENDL;
             mItemsCreated[item_id] = new_link;
             mCatDescendentDeltas[parent_id];
+            new_link->setComplete(true);
         }
 		else if (curr_link)
 		{
@@ -913,6 +914,7 @@ void AISUpdate::parseLink(const LLSD& link_map)
 			//LL_DEBUGS("Inventory") << "creating link from llsd: " << ll_pretty_print_sd(link_map) << LL_ENDL;
 			mItemsCreated[item_id] = new_link;
 			mCatDescendentDeltas[parent_id]++;
+            new_link->setComplete(true);
 		}
 	}
 	else
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 1de3cef3ba..b36ea1c457 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4385,6 +4385,70 @@ public:
 	~CallAfterCategoryFetchStage1()
 	{
 	}
+    /*virtual*/ void startFetch()
+    {
+        bool ais3 = AISAPI::isAvailable();
+        for (uuid_vec_t::const_iterator it = mIDs.begin(); it != mIDs.end(); ++it)
+        {
+            LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
+            if (!cat) continue;
+            if (!isCategoryComplete(cat))
+            {
+                // CHECK IT: isCategoryComplete() checks both version and descendant count but
+                // fetch() only works for Unknown version and doesn't care about descentants,
+                // as result fetch won't start and folder will potentially get stuck as
+                // incomplete in observer.
+                // Likely either both should use only version or both should check descendants.
+                cat->fetch();		//blindly fetch it without seeing if anything else is fetching it.
+                mIncomplete.push_back(*it);	//Add to list of things being downloaded for this observer.
+            }
+            else if (ais3)
+            {
+                LLInventoryModel::cat_array_t* cats;
+                LLInventoryModel::item_array_t* items;
+                gInventory.getDirectDescendentsOf(cat->getUUID(), cats, items);
+
+                if (items)
+                {
+                    S32 complete_count = 0;
+                    S32 incomplete_count = 0;
+                    for (LLInventoryModel::item_array_t::const_iterator it = items->begin(); it < items->end(); ++it)
+                    {
+                        if (!(*it)->isFinished())
+                        {
+                            incomplete_count++;
+                        }
+                        else
+                        {
+                            complete_count++;
+                        }
+                    }
+                    // AIS can fetch couple items, but if there
+                    // is more than a dozen it will be very slow
+                    // it's faster to get whole folder in such case
+                    const S32 MAX_INDIVIDUAL_FETCH = 10;
+                    if (incomplete_count > MAX_INDIVIDUAL_FETCH
+                        || (incomplete_count > 1 && complete_count == 0))
+                    {
+                        // To prevent premature removal from mIncomplete and
+                        // since we are doing a full refetch anyway, mark unknown
+                        cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
+                        LLInventoryModelBackgroundFetch::instance().start(*it, false);
+                        mIncomplete.push_back(*it);
+                    }
+                    else
+                    {
+                        // let stage2 handle incomplete ones
+                        mComplete.push_back(*it);
+                    }
+                }
+            }
+            else
+            {
+                mComplete.push_back(*it);
+            }
+        }
+    }
 	virtual void done()
 	{
         if (mComplete.size() <= 0)
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 023cc05ee7..0d366e43f4 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -31,8 +31,9 @@
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llcallbacklist.h"
-#include "llinventorypanel.h"
 #include "llinventorymodel.h"
+#include "llinventoryobserver.h"
+#include "llinventorypanel.h"
 #include "llstartup.h"
 #include "llviewercontrol.h"
 #include "llviewerinventory.h"
@@ -349,6 +350,9 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 		//LL_INFOS(LOG_INV) << "All folders fetched, validating" << LL_ENDL;
 		//gInventory.validate();
 
+        gInventory.addChangedMask(LLInventoryObserver::INTERNAL, gInventory.getRootFolderID());
+        gInventory.addChangedMask(LLInventoryObserver::INTERNAL, gInventory.getLibraryRootFolderID());
+
         // For now only informs about initial fetch being done
         mAllFoldersFetchedSignal();
 	}
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 25f1854765..79917fb11b 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -40,6 +40,7 @@
 #include "llaisapi.h"
 #include "llfloater.h"
 #include "llfocusmgr.h"
+#include "llinventorymodelbackgroundfetch.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index 02f73a5892..f0ed2f7003 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -126,7 +126,7 @@ public:
 	LLInventoryFetchDescendentsObserver(const LLUUID& cat_id = LLUUID::null);
 	LLInventoryFetchDescendentsObserver(const uuid_vec_t& cat_ids);
 
-	/*virtual*/ void startFetch();
+	virtual void startFetch();
 	/*virtual*/ void changed(U32 mask);
 protected:
 	BOOL isCategoryComplete(const LLViewerInventoryCategory* cat) const;
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index d8de269c3c..6c7e815b04 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -671,7 +671,7 @@ bool LLViewerInventoryCategory::fetch()
 		}
 		if (!url.empty() || AISAPI::isAvailable())
 		{
-			LLInventoryModelBackgroundFetch::instance().start(mUUID, false);			
+			LLInventoryModelBackgroundFetch::instance().start(mUUID, false);
 		}
 		return true;
 	}
-- 
cgit v1.2.3


From f34576f42db17d59976ab1ebcd5b4c31f51f407e Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Fri, 24 Mar 2023 15:30:22 -0700
Subject: Attempt to fix build breakage for DRTVWR-559

---
 indra/llcorehttp/tests/test_llcorehttp_peer.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 778de90962..185e8e25c6 100755
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -38,7 +38,6 @@ from io import StringIO
 from http.server import HTTPServer, BaseHTTPRequestHandler
 
 
-from llbase.fastest_elementtree import parse as xml_parse
 from llbase import llsd
 
 # we're in llcorehttp/tests ; testrunner.py is found in llmessage/tests
-- 
cgit v1.2.3


From b00e2da9e23f4dad9c754ce479253ac07eeec154 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 27 Mar 2023 21:04:51 +0300
Subject: SL-18003 Faster cof fetching

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 151 ++++++++++++++--------
 indra/newview/llinventorymodelbackgroundfetch.h   |   3 +-
 indra/newview/llinventoryobserver.cpp             |  13 +-
 3 files changed, 101 insertions(+), 66 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 0d366e43f4..4947c6bfe5 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -201,7 +201,7 @@ LLInventoryModelBackgroundFetch::~LLInventoryModelBackgroundFetch()
 
 bool LLInventoryModelBackgroundFetch::isBulkFetchProcessingComplete() const
 {
-	return mFetchQueue.empty() && mFetchCount <= 0;
+	return mFetchFolderQueue.empty() && mFetchItemQueue.empty() && mFetchCount <= 0;
 }
 
 bool LLInventoryModelBackgroundFetch::libraryFetchStarted() const
@@ -247,13 +247,27 @@ BOOL LLInventoryModelBackgroundFetch::folderFetchActive() const
 void LLInventoryModelBackgroundFetch::addRequestAtFront(const LLUUID & id, bool recursive, bool is_category)
 {
     ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
-	mFetchQueue.push_front(FetchQueueInfo(id, recursion_type, is_category));
+    if (is_category)
+    {
+        mFetchFolderQueue.push_front(FetchQueueInfo(id, recursion_type, is_category));
+    }
+    else
+    {
+        mFetchItemQueue.push_front(FetchQueueInfo(id, recursion_type, is_category));
+    }
 }
 
 void LLInventoryModelBackgroundFetch::addRequestAtBack(const LLUUID & id, bool recursive, bool is_category)
 {
     ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
-	mFetchQueue.push_back(FetchQueueInfo(id, recursion_type, is_category));
+    if (is_category)
+    {
+        mFetchFolderQueue.push_back(FetchQueueInfo(id, recursion_type, is_category));
+    }
+    else
+    {
+        mFetchItemQueue.push_back(FetchQueueInfo(id, recursion_type, is_category));
+    }
 }
 
 void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
@@ -278,37 +292,38 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
                     // Not only root folder can be massive, but
                     // most system folders will be requested independently
                     // so request root folder and content separately
-                    mFetchQueue.push_front(FetchQueueInfo(gInventory.getRootFolderID(), RT_CONTENT));
+                    mFetchFolderQueue.push_front(FetchQueueInfo(gInventory.getRootFolderID(), RT_CONTENT));
                 }
                 else
                 {
-                    mFetchQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursion_type));
+                    mFetchFolderQueue.push_back(FetchQueueInfo(gInventory.getRootFolderID(), recursion_type));
                 }
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
 			if (! mRecursiveLibraryFetchStarted)
 			{
 				mRecursiveLibraryFetchStarted |= recursive;
-                mFetchQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursion_type));
+                mFetchFolderQueue.push_back(FetchQueueInfo(gInventory.getLibraryRootFolderID(), recursion_type));
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
 		}
 		else
 		{
-            if (mFetchQueue.empty() || mFetchQueue.front().mUUID != id)
+            if (AISAPI::isAvailable())
             {
-                if (AISAPI::isAvailable())
+                if (mFetchFolderQueue.empty() || mFetchFolderQueue.back().mUUID != id)
                 {
                     // On AIS make sure root goes to the top and follow up recursive
                     // fetches, not individual requests
-                    mFetchQueue.push_back(FetchQueueInfo(id, recursion_type));
+                    mFetchFolderQueue.push_back(FetchQueueInfo(id, recursion_type));
+                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
                 }
-                else
-                {
+            }
+            else if (mFetchFolderQueue.empty() || mFetchFolderQueue.front().mUUID != id)
+            {
                     // Specific folder requests go to front of queue.
-                    mFetchQueue.push_front(FetchQueueInfo(id, recursion_type));
-                }
-                gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+                    mFetchFolderQueue.push_front(FetchQueueInfo(id, recursion_type));
+                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
             }
 
 			if (id == gInventory.getLibraryRootFolderID())
@@ -323,11 +338,11 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 	}
 	else if (LLViewerInventoryItem * itemp = gInventory.getItem(id))
 	{
-		if (! itemp->mIsComplete && (mFetchQueue.empty() || mFetchQueue.front().mUUID != id))
+		if (! itemp->mIsComplete && (mFetchItemQueue.empty() || mFetchItemQueue.front().mUUID != id))
 		{
 			mBackgroundFetchActive = true;
 
-			mFetchQueue.push_front(FetchQueueInfo(id, RT_NONE, false));
+			mFetchItemQueue.push_front(FetchQueueInfo(id, RT_NONE, false));
 			gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 		}
 	}
@@ -335,10 +350,17 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 
 void LLInventoryModelBackgroundFetch::findLostItems()
 {
-	mBackgroundFetchActive = true;
-	mFolderFetchActive = true;
-    mFetchQueue.push_back(FetchQueueInfo(LLUUID::null, RT_RECURSIVE));
-    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+    if (AISAPI::isAvailable())
+    {
+        LL_WARNS() << "Not implemented yet" << LL_ENDL;
+    }
+    else
+    {
+        mBackgroundFetchActive = true;
+        mFolderFetchActive = true;
+        mFetchFolderQueue.push_back(FetchQueueInfo(LLUUID::null, RT_RECURSIVE));
+        gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+    }
 }
 
 void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
@@ -413,7 +435,7 @@ void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, con
             // Try requesting folder and nested content separately
             mBackgroundFetchActive = true;
             mFolderFetchActive = true;
-            mFetchQueue.push_front(FetchQueueInfo(request_id, RT_CONTENT));
+            mFetchFolderQueue.push_front(FetchQueueInfo(request_id, RT_CONTENT));
             gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
         }
     }
@@ -429,9 +451,9 @@ void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, con
                 it != categories->end();
                 ++it)
             {
-                mFetchQueue.push_front(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
+                mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
             }
-            if (!mFetchQueue.empty())
+            if (!mFetchFolderQueue.empty())
             {
                 mBackgroundFetchActive = true;
                 mFolderFetchActive = true;
@@ -467,11 +489,19 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         : 1.f; 
     const F64 end_time = curent_time + max_time;
 
-    while (!mFetchQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
+    while (!mFetchFolderQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
     {
-        const FetchQueueInfo & fetch_info(mFetchQueue.front());
+        const FetchQueueInfo & fetch_info(mFetchFolderQueue.front());
         bulkFetchViaAis(fetch_info);
-        mFetchQueue.pop_front();
+        mFetchFolderQueue.pop_front();
+        curent_time = LLTimer::getTotalSeconds();
+    }
+
+    while (!mFetchFolderQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
+    {
+        const FetchQueueInfo & fetch_info(mFetchFolderQueue.front());
+        bulkFetchViaAis(fetch_info);
+        mFetchFolderQueue.pop_front();
         curent_time = LLTimer::getTotalSeconds();
     }
     
@@ -533,7 +563,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                             ++it)
                         {
                             // not push_front to not cause an infinite loop
-                            mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                            mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
                         }
                     }
                 }
@@ -610,10 +640,10 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 	LLSD item_request_body;
 	LLSD item_request_body_lib;
 
-	while (! mFetchQueue.empty() 
+	while (! mFetchFolderQueue.empty() 
 			&& (item_count + folder_count) < max_batch_size)
 	{
-		const FetchQueueInfo & fetch_info(mFetchQueue.front());
+		const FetchQueueInfo & fetch_info(mFetchFolderQueue.front());
 		if (fetch_info.mIsCategory)
 		{
 			const LLUUID & cat_id(fetch_info.mUUID);
@@ -664,7 +694,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
                                 it != categories->end();
                                 ++it)
                             {
-                                mFetchQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                                mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
                             }
                         }
                     }
@@ -675,29 +705,36 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 				recursive_cats.push_back(cat_id);
 			}
 		}
-		else
-		{
-			LLViewerInventoryItem * itemp(gInventory.getItem(fetch_info.mUUID));
 
-			if (itemp)
-			{
-				LLSD item_sd;
-				item_sd["owner_id"] = itemp->getPermissions().getOwner();
-				item_sd["item_id"] = itemp->getUUID();
-				if (itemp->getPermissions().getOwner() == gAgent.getID())
-				{
-					item_request_body.append(item_sd);
-				}
-				else
-				{
-					item_request_body_lib.append(item_sd);
-				}
-				//itemp->fetchFromServer();
-				item_count++;
-			}
-		}
+        mFetchFolderQueue.pop_front();
+    }
+
+
+    while (!mFetchItemQueue.empty()
+        && (item_count + folder_count) < max_batch_size)
+    {
+        const FetchQueueInfo & fetch_info(mFetchItemQueue.front());
+
+        LLViewerInventoryItem * itemp(gInventory.getItem(fetch_info.mUUID));
 
-		mFetchQueue.pop_front();
+        if (itemp)
+        {
+            LLSD item_sd;
+            item_sd["owner_id"] = itemp->getPermissions().getOwner();
+            item_sd["item_id"] = itemp->getUUID();
+            if (itemp->getPermissions().getOwner() == gAgent.getID())
+            {
+                item_request_body.append(item_sd);
+            }
+            else
+            {
+                item_request_body_lib.append(item_sd);
+            }
+            //itemp->fetchFromServer();
+            item_count++;
+        }
+
+        mFetchItemQueue.pop_front();
 	}
 
 	// Issue HTTP POST requests to fetch folders and items
@@ -768,14 +805,22 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 
 bool LLInventoryModelBackgroundFetch::fetchQueueContainsNoDescendentsOf(const LLUUID & cat_id) const
 {
-	for (fetch_queue_t::const_iterator it = mFetchQueue.begin();
-		 it != mFetchQueue.end();
+	for (fetch_queue_t::const_iterator it = mFetchFolderQueue.begin();
+		 it != mFetchFolderQueue.end();
 		 ++it)
 	{
 		const LLUUID & fetch_id = (*it).mUUID;
 		if (gInventory.isObjectDescendentOf(fetch_id, cat_id))
 			return false;
 	}
+    for (fetch_queue_t::const_iterator it = mFetchItemQueue.begin();
+        it != mFetchItemQueue.end();
+        ++it)
+    {
+        const LLUUID & fetch_id = (*it).mUUID;
+        if (gInventory.isObjectDescendentOf(fetch_id, cat_id))
+            return false;
+    }
 	return true;
 }
 
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 038b634180..8d82f093d2 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -118,7 +118,8 @@ private:
 
 	LLFrameTimer mFetchTimer;
 	F32 mMinTimeBetweenFetches;
-	fetch_queue_t mFetchQueue;
+	fetch_queue_t mFetchFolderQueue;
+    fetch_queue_t mFetchItemQueue;
 
 };
 
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 79917fb11b..fe33be4abe 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -300,18 +300,7 @@ void LLInventoryFetchItemsObserver::startFetch()
 
         if (aisv3)
         {
-            // doesn't support bulk fetching, request one by one
-            if (owner_id == ALEXANDRIA_LINDEN_ID)
-            {
-                AISAPI::FetchItem(*it, AISAPI::LIBRARY);
-            }
-            else
-            {
-                AISAPI::FetchItem(*it, AISAPI::INVENTORY);
-            }
-            // Todo: remove item from mIncomplete on callback
-            // but keep in mind that observer can expire before
-            // callback or use LLInventoryModelBackgroundFetch
+            LLInventoryModelBackgroundFetch::getInstance()->start(*it);
         }
         else
         {
-- 
cgit v1.2.3


From 0eff9756494a268f6aa68b66ce4d09cb5aa5460a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 27 Mar 2023 21:24:21 +0300
Subject: SL-18003 Basic dupplicate prevention

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 35 ++++++++++++++++-------
 indra/newview/llinventorymodelbackgroundfetch.h   |  2 +-
 indra/newview/llviewerinventory.cpp               | 19 +++++++++++-
 indra/newview/llviewerinventory.h                 |  2 ++
 4 files changed, 46 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 4947c6bfe5..21f7e3e059 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -419,12 +419,19 @@ void LLInventoryModelBackgroundFetch::incrFetchCount(S32 fetching)
 	}
 }
 
-void ais_simple_callback(const LLUUID& inv_id)
+void ais_simple_folder_callback(const LLUUID& inv_id)
 {
     LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
+    LLViewerInventoryCategory * cat(gInventory.getCategory(inv_id));
+    if (cat) cat->setFetching(false);
 }
 
-void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion)
+void ais_simple_item_callback(const LLUUID& inv_id)
+{
+    LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
+}
+
+void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion)
 {
     incrFetchCount(-1);
     if (response_id.isNull()) // Failure
@@ -460,6 +467,13 @@ void LLInventoryModelBackgroundFetch::onAISCalback(const LLUUID &request_id, con
                 gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
             }
         }
+
+        // done
+        LLViewerInventoryCategory * cat(gInventory.getCategory(request_id));
+        if (cat)
+        {
+            cat->setFetching(false);
+        }
     }
 }
 
@@ -497,11 +511,11 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         curent_time = LLTimer::getTotalSeconds();
     }
 
-    while (!mFetchFolderQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
+    while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
     {
-        const FetchQueueInfo & fetch_info(mFetchFolderQueue.front());
+        const FetchQueueInfo & fetch_info(mFetchItemQueue.front());
         bulkFetchViaAis(fetch_info);
-        mFetchFolderQueue.pop_front();
+        mFetchItemQueue.pop_front();
         curent_time = LLTimer::getTotalSeconds();
     }
     
@@ -526,14 +540,14 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         else
         {
 
-            const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
+            LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
             if (cat)
             {
                 if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
                 {
                     if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
                     {
-                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mRecursive == RT_RECURSIVE, ais_simple_callback);
+                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mRecursive == RT_RECURSIVE, ais_simple_folder_callback);
                     }
                     else
                     {
@@ -545,10 +559,11 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                             type == RT_RECURSIVE,
                             [cat_id, type](const LLUUID &response_id)
                         {
-                            LLInventoryModelBackgroundFetch::instance().onAISCalback(cat_id, response_id, type);
+                            LLInventoryModelBackgroundFetch::instance().onAISFodlerCalback(cat_id, response_id, type);
                         });
                     }
                     mFetchCount++;
+                    cat->setFetching(true);
                 }
                 else
                 {
@@ -578,11 +593,11 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         {
             if (itemp->getPermissions().getOwner() == gAgent.getID())
             {
-                AISAPI::FetchItem(itemp->getUUID(), AISAPI::INVENTORY, ais_simple_callback);
+                AISAPI::FetchItem(itemp->getUUID(), AISAPI::INVENTORY, ais_simple_item_callback);
             }
             else
             {
-                AISAPI::FetchItem(itemp->getUUID(), AISAPI::LIBRARY, ais_simple_callback);
+                AISAPI::FetchItem(itemp->getUUID(), AISAPI::LIBRARY, ais_simple_item_callback);
             }
             mFetchCount++;
         }
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 8d82f093d2..0a5608c0c6 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -95,7 +95,7 @@ protected:
     };
     typedef std::deque<FetchQueueInfo> fetch_queue_t;
 
-    void onAISCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion);
+    void onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion);
     void bulkFetchViaAis();
     void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
 	void bulkFetch();
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6c7e815b04..6bd86f7902 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -659,7 +659,6 @@ bool LLViewerInventoryCategory::fetch()
 		mDescendentsRequested.reset();
 		mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
 
-
 		std::string url;
 		if (gAgent.getRegion())
 		{
@@ -678,6 +677,24 @@ bool LLViewerInventoryCategory::fetch()
 	return false;
 }
 
+void LLViewerInventoryCategory::setFetching(bool fetching)
+{
+    if (fetching)
+    {
+        if ((VERSION_UNKNOWN == getVersion())
+            && mDescendentsRequested.hasExpired())
+        {
+            const F32 FETCH_TIMER_EXPIRY = 10.0f;
+            mDescendentsRequested.reset();
+            mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
+        }
+    }
+    else
+    {
+        mDescendentsRequested.stop();
+    }
+}
+
 S32 LLViewerInventoryCategory::getViewerDescendentCount() const
 {
 	LLInventoryModel::cat_array_t* cats;
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 1554c84137..2ae2cebe5c 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -211,6 +211,8 @@ public:
 
 	// Returns true if a fetch was issued.
 	bool fetch();
+    // Returns true if a fetch was issued.
+    void setFetching(bool);
 
 	// used to help make caching more robust - for example, if
 	// someone is getting 4 packets but logs out after 3. the viewer
-- 
cgit v1.2.3


From 110ed8f4d3152c91ddd7577234ad37b666be86c9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Mar 2023 00:53:35 +0300
Subject: SL-18003 Don't cause excessive full rebuild

---
 indra/newview/llinventorymodel.cpp                | 3 +++
 indra/newview/llinventorymodelbackgroundfetch.cpp | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 4c2383d211..47fd17ef86 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1759,6 +1759,9 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat,
 
 void LLInventoryModel::rebuildBrockenLinks()
 {
+    // make sure we aren't adding expensive Rebuild to anything else.
+    notifyObservers();
+
     for (LLUUID link_id : mPossiblyBrockenLinks)
     {
         addChangedMask(LLInventoryObserver::REBUILD, link_id);
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 21f7e3e059..25e35915c3 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -372,9 +372,6 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 		//LL_INFOS(LOG_INV) << "All folders fetched, validating" << LL_ENDL;
 		//gInventory.validate();
 
-        gInventory.addChangedMask(LLInventoryObserver::INTERNAL, gInventory.getRootFolderID());
-        gInventory.addChangedMask(LLInventoryObserver::INTERNAL, gInventory.getLibraryRootFolderID());
-
         // For now only informs about initial fetch being done
         mAllFoldersFetchedSignal();
 	}
-- 
cgit v1.2.3


From 89a8c96f36983738645a2116d9d432e3bd88f1df Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Mar 2023 02:27:34 +0300
Subject: SL-18003 Bulk download items when possible

And signal fodler fetch completion when folder of recursive fetch is done, do not hold it for individual items
---
 indra/newview/llappearancemgr.cpp                 |  42 ++++++---
 indra/newview/llinventorymodel.cpp                |  13 ++-
 indra/newview/llinventorymodelbackgroundfetch.cpp |  89 +++++++++++++-----
 indra/newview/llinventorymodelbackgroundfetch.h   |  10 +-
 indra/newview/llinventoryobserver.cpp             | 106 +++++++++++++++++-----
 indra/newview/llsidepanelinventory.cpp            |   2 +-
 indra/newview/llviewerinventory.cpp               |   9 +-
 7 files changed, 191 insertions(+), 80 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index b36ea1c457..8e44411d52 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2420,7 +2420,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
     if (gInventory.hasPosiblyBrockenLinks())
     {
         // Inventory has either broken links or links that
-        // haven't loaded yet and fetch is still in progress.
+        // haven't loaded yet.
         // Check if LLAppearanceMgr needs to wait.
         LLUUID current_outfit_id = getCOF();
         LLInventoryModel::item_array_t cof_items;
@@ -2438,22 +2438,34 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
             // links are likely fine and we will have to wait for them to
             // load (if inventory takes too long to load, might be a good
             // idea to make this check periodical)
-            if (!mBulkFecthCallbackSlot.connected())
+            if (LLInventoryModelBackgroundFetch::getInstance()->folderFetchActive())
             {
-                nullary_func_t cb = post_update_func;
-                mBulkFecthCallbackSlot =
-                    LLInventoryModelBackgroundFetch::getInstance()->setAllFoldersFetchedCallback(
-                        [this, enforce_ordering, post_update_func, cb]()
+                if (!mBulkFecthCallbackSlot.connected())
                 {
-                    // inventory model should be already tracking this
-                    // callback, but make sure rebuildBrockenLinks gets
-                    // called before a cof update
-                    gInventory.rebuildBrockenLinks();
-                    updateAppearanceFromCOF(enforce_ordering, post_update_func, post_update_func);
-                    mBulkFecthCallbackSlot.disconnect();
-                });
+                    nullary_func_t cb = post_update_func;
+                    mBulkFecthCallbackSlot =
+                        LLInventoryModelBackgroundFetch::getInstance()->setFetchCompletionCallback(
+                            [this, enforce_ordering, post_update_func, cb]()
+                    {
+                        // inventory model should be already tracking this
+                        // callback, but make sure rebuildBrockenLinks gets
+                        // called before a cof update
+                        gInventory.rebuildBrockenLinks();
+                        updateAppearanceFromCOF(enforce_ordering, post_update_func, post_update_func);
+                        mBulkFecthCallbackSlot.disconnect();
+                    });
+                }
+                return;
+            }
+            else
+            {
+                // this should have happened on completion callback,
+                // check why it didn't then fix it
+                llassert(false); 
+
+                // try to recover now
+                gInventory.rebuildBrockenLinks();
             }
-            return;
         }
     }
 
@@ -4433,7 +4445,7 @@ public:
                         // To prevent premature removal from mIncomplete and
                         // since we are doing a full refetch anyway, mark unknown
                         cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
-                        LLInventoryModelBackgroundFetch::instance().start(*it, false);
+                        cat->fetch();
                         mIncomplete.push_back(*it);
                     }
                     else
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 47fd17ef86..bfc7840708 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1762,7 +1762,7 @@ void LLInventoryModel::rebuildBrockenLinks()
     // make sure we aren't adding expensive Rebuild to anything else.
     notifyObservers();
 
-    for (LLUUID link_id : mPossiblyBrockenLinks)
+    for (const LLUUID &link_id : mPossiblyBrockenLinks)
     {
         addChangedMask(LLInventoryObserver::REBUILD, link_id);
     }
@@ -2388,7 +2388,7 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
 		// The item will show up as a broken link.
 		if (item->getIsBrokenLink())
 		{
-            if (!LLInventoryModelBackgroundFetch::getInstance()->isEverythingFetched())
+            if (LLInventoryModelBackgroundFetch::getInstance()->folderFetchActive())
             {
                 // isEverythingFetched is actually 'initial' fetch only.
                 // Schedule this link for a recheck once inventory gets loaded
@@ -2399,7 +2399,7 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
                     // might be a lot of them. A better option might be to check
                     // links periodically with final check on fetch completion.
                     mBulkFecthCallbackSlot =
-                        LLInventoryModelBackgroundFetch::getInstance()->setAllFoldersFetchedCallback(
+                        LLInventoryModelBackgroundFetch::getInstance()->setFetchCompletionCallback(
                             [this]()
                     {
                         rebuildBrockenLinks();
@@ -3798,7 +3798,10 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-        LLInventoryModelBackgroundFetch::instance().start((*cit)->getUUID(), false);
+
+        // Use AIS derectly to not reset folder's version
+        // Todo: May be LLInventoryModelBackgroundFetch needs a 'forced' option
+        AISAPI::FetchCategoryChildren((*cit)->getUUID(), AISAPI::INVENTORY);
 	}
 	for (item_array_t::iterator iit = items.begin(); iit != items.end(); ++iit)
 	{
@@ -3807,7 +3810,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-        LLInventoryModelBackgroundFetch::instance().start((*iit)->getUUID(), false);
+        LLInventoryModelBackgroundFetch::instance().scheduleItemFetch((*iit)->getUUID());
 	}
 	gInventory.notifyObservers();
 
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 25e35915c3..d58dd22ca1 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -190,6 +190,7 @@ LLInventoryModelBackgroundFetch::LLInventoryModelBackgroundFetch():
 	mBackgroundFetchActive(false),
 	mFolderFetchActive(false),
 	mFetchCount(0),
+    mFetchFolderCount(0),
 	mAllFoldersFetched(false),
 	mRecursiveInventoryFetchStarted(false),
 	mRecursiveLibraryFetchStarted(false),
@@ -204,6 +205,11 @@ bool LLInventoryModelBackgroundFetch::isBulkFetchProcessingComplete() const
 	return mFetchFolderQueue.empty() && mFetchItemQueue.empty() && mFetchCount <= 0;
 }
 
+bool LLInventoryModelBackgroundFetch::isFolderFetchProcessingComplete() const
+{
+    return mFetchFolderQueue.empty() && mFetchFolderCount <= 0;
+}
+
 bool LLInventoryModelBackgroundFetch::libraryFetchStarted() const
 {
 	return mRecursiveLibraryFetchStarted;
@@ -338,16 +344,24 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 	}
 	else if (LLViewerInventoryItem * itemp = gInventory.getItem(id))
 	{
-		if (! itemp->mIsComplete && (mFetchItemQueue.empty() || mFetchItemQueue.front().mUUID != id))
+		if (! itemp->mIsComplete)
 		{
-			mBackgroundFetchActive = true;
-
-			mFetchItemQueue.push_front(FetchQueueInfo(id, RT_NONE, false));
-			gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+            scheduleItemFetch(id);
 		}
 	}
 }
 
+void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id)
+{
+    if (mFetchItemQueue.empty() || mFetchItemQueue.front().mUUID != item_id)
+    {
+        mBackgroundFetchActive = true;
+
+        mFetchItemQueue.push_front(FetchQueueInfo(item_id, RT_NONE, false));
+        gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+    }
+}
+
 void LLInventoryModelBackgroundFetch::findLostItems()
 {
     if (AISAPI::isAvailable())
@@ -371,18 +385,23 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 		mAllFoldersFetched = true;
 		//LL_INFOS(LOG_INV) << "All folders fetched, validating" << LL_ENDL;
 		//gInventory.validate();
-
-        // For now only informs about initial fetch being done
-        mAllFoldersFetchedSignal();
 	}
+
 	mFolderFetchActive = false;
-	mBackgroundFetchActive = false;
+    if (isBulkFetchProcessingComplete())
+    {
+        mBackgroundFetchActive = false;
+    }
+
+    // For now only informs about initial fetch being done
+    mFoldersFetchedSignal();
+
 	LL_INFOS(LOG_INV) << "Inventory background fetch completed" << LL_ENDL;
 }
 
-boost::signals2::connection LLInventoryModelBackgroundFetch::setAllFoldersFetchedCallback(folders_fetched_callback_t cb)
+boost::signals2::connection LLInventoryModelBackgroundFetch::setFetchCompletionCallback(folders_fetched_callback_t cb)
 {
-    return mAllFoldersFetchedSignal.connect(cb);
+    return mFoldersFetchedSignal.connect(cb);
 }
 
 void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
@@ -415,10 +434,20 @@ void LLInventoryModelBackgroundFetch::incrFetchCount(S32 fetching)
 		mFetchCount = 0; 
 	}
 }
+void LLInventoryModelBackgroundFetch::incrFetchFolderCount(S32 fetching)
+{
+    incrFetchCount(fetching);
+    mFetchFolderCount += fetching;
+    if (mFetchCount < 0)
+    {
+        LL_WARNS_ONCE(LOG_INV) << "Inventory fetch count fell below zero (0)." << LL_ENDL;
+        mFetchFolderCount = 0;
+    }
+}
 
 void ais_simple_folder_callback(const LLUUID& inv_id)
 {
-    LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
+    LLInventoryModelBackgroundFetch::instance().incrFetchFolderCount(-1);
     LLViewerInventoryCategory * cat(gInventory.getCategory(inv_id));
     if (cat) cat->setFetching(false);
 }
@@ -430,7 +459,7 @@ void ais_simple_item_callback(const LLUUID& inv_id)
 
 void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion)
 {
-    incrFetchCount(-1);
+    incrFetchFolderCount(-1);
     if (response_id.isNull()) // Failure
     {
         if (recursion == RT_RECURSIVE)
@@ -464,13 +493,13 @@ void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_i
                 gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
             }
         }
+    }
 
-        // done
-        LLViewerInventoryCategory * cat(gInventory.getCategory(request_id));
-        if (cat)
-        {
-            cat->setFetching(false);
-        }
+    // done
+    LLViewerInventoryCategory * cat(gInventory.getCategory(request_id));
+    if (cat)
+    {
+        cat->setFetching(false);
     }
 }
 
@@ -516,10 +545,15 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         curent_time = LLTimer::getTotalSeconds();
     }
     
-    if (isBulkFetchProcessingComplete())
+    if (isFolderFetchProcessingComplete() && mFolderFetchActive)
     {
         setAllFoldersFetched();
     }
+
+    if (isBulkFetchProcessingComplete())
+    {
+        mBackgroundFetchActive = false;
+    }
 }
 
 void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetch_info)
@@ -532,7 +566,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
             LL_WARNS() << "Lost and found not implemented yet" << LL_ENDL;
             // todo: needs to be requested from ais in special manner?
             /*AISAPI::FetchCategoryChildren(LLUUID::null, AISAPI::INVENTORY, false, ais_simple_callback);
-            mFetchCount++;*/
+            incrFetchFolderCount(1);*/
         }
         else
         {
@@ -559,7 +593,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                             LLInventoryModelBackgroundFetch::instance().onAISFodlerCalback(cat_id, response_id, type);
                         });
                     }
-                    mFetchCount++;
+                    incrFetchFolderCount(1);
                     cat->setFetching(true);
                 }
                 else
@@ -590,14 +624,19 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         {
             if (itemp->getPermissions().getOwner() == gAgent.getID())
             {
-                AISAPI::FetchItem(itemp->getUUID(), AISAPI::INVENTORY, ais_simple_item_callback);
+                AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
             }
             else
             {
-                AISAPI::FetchItem(itemp->getUUID(), AISAPI::LIBRARY, ais_simple_item_callback);
+                AISAPI::FetchItem(fetch_info.mUUID, AISAPI::LIBRARY, ais_simple_item_callback);
             }
-            mFetchCount++;
         }
+        else
+        {
+            // Assume agent's inventory, library wouldn't have gotten here
+            AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
+        }
+        mFetchCount++;
     }
 }
 
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 0a5608c0c6..6a8b616a82 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -47,9 +47,10 @@ class LLInventoryModelBackgroundFetch : public LLSingleton<LLInventoryModelBackg
 	~LLInventoryModelBackgroundFetch();
 public:
 
-	// Start and stop background breadth-first fetching of inventory contents.
+    // Start  background breadth-first fetching of inventory contents.
 	// This gets triggered when performing a filter-search.
 	void start(const LLUUID& cat_id = LLUUID::null, bool recursive = true);
+    void scheduleItemFetch(const LLUUID& item_id);
 
 	BOOL folderFetchActive() const;
 	bool isEverythingFetched() const; // completing the fetch once per session should be sufficient
@@ -64,12 +65,14 @@ public:
 
     void findLostItems();	
 	void incrFetchCount(S32 fetching);
+    void incrFetchFolderCount(S32 fetching);
 
 	bool isBulkFetchProcessingComplete() const;
+    bool isFolderFetchProcessingComplete() const;
 	void setAllFoldersFetched();
 
     typedef boost::function<void()> folders_fetched_callback_t;
-    boost::signals2::connection setAllFoldersFetchedCallback(folders_fetched_callback_t cb);
+    boost::signals2::connection setFetchCompletionCallback(folders_fetched_callback_t cb);
 
 	void addRequestAtFront(const LLUUID & id, bool recursive, bool is_category);
 	void addRequestAtBack(const LLUUID & id, bool recursive, bool is_category);
@@ -110,11 +113,12 @@ private:
 	bool mRecursiveLibraryFetchStarted;
 	bool mAllFoldersFetched;
     typedef boost::signals2::signal<void()> folders_fetched_signal_t;
-    folders_fetched_signal_t mAllFoldersFetchedSignal;
+    folders_fetched_signal_t mFoldersFetchedSignal;
 
     bool mBackgroundFetchActive;
 	bool mFolderFetchActive;
 	S32 mFetchCount;
+    S32 mFetchFolderCount;
 
 	LLFrameTimer mFetchTimer;
 	F32 mMinTimeBetweenFetches;
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index fe33be4abe..4db913ed0d 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -255,29 +255,19 @@ void LLInventoryFetchItemsObserver::startFetch()
 {
     bool aisv3 = AISAPI::isAvailable();
 
-	LLUUID owner_id;
 	LLSD items_llsd;
+
+    typedef std::map<LLUUID, uuid_vec_t> requests_by_fodlers_t;
+    requests_by_fodlers_t requests;
 	for (uuid_vec_t::const_iterator it = mIDs.begin(); it < mIDs.end(); ++it)
 	{
-		LLViewerInventoryItem* item = gInventory.getItem(*it);
-		if (item)
-		{
-			if (item->isFinished())
-			{
-				// It's complete, so put it on the complete container.
-				mComplete.push_back(*it);
-				continue;
-			}
-			else
-			{
-				owner_id = item->getPermissions().getOwner();
-			}
-		}
-		else
-		{
-			// assume it's agent inventory.
-			owner_id = gAgent.getID();
-		}
+        LLViewerInventoryItem* item = gInventory.getItem(*it);
+        if (item && item->isFinished())
+        {
+            // It's complete, so put it on the complete container.
+            mComplete.push_back(*it);
+            continue;
+        }
 
 		// Ignore categories since they're not items.  We
 		// could also just add this to mComplete but not sure what the
@@ -300,13 +290,31 @@ void LLInventoryFetchItemsObserver::startFetch()
 
         if (aisv3)
         {
-            LLInventoryModelBackgroundFetch::getInstance()->start(*it);
+            if (item)
+            {
+                LLUUID parent_id = item->getParentUUID();
+                requests[parent_id].push_back(*it);
+            }
+            else
+            {
+                // Can happen for gestures and calling cards if server notified us before they fetched
+                // Request by id without checking for an item.
+                LLInventoryModelBackgroundFetch::getInstance()->scheduleItemFetch(*it);
+            }
         }
         else
         {
             // Prepare the data to fetch
             LLSD item_entry;
-            item_entry["owner_id"] = owner_id;
+            if (item)
+            {
+                item_entry["owner_id"] = item->getPermissions().getOwner();
+            }
+            else
+            {
+                // assume it's agent inventory.
+                item_entry["owner_id"] = gAgent.getID();
+            }
             item_entry["item_id"] = (*it);
             items_llsd.append(item_entry);
         }
@@ -315,7 +323,59 @@ void LLInventoryFetchItemsObserver::startFetch()
 	mFetchingPeriod.reset();
 	mFetchingPeriod.setTimerExpirySec(FETCH_TIMER_EXPIRY);
 
-    if (!aisv3)
+    if (aisv3)
+    {
+        const S32 MAX_INDIVIDUAL_REQUESTS = 10;
+        for (requests_by_fodlers_t::value_type &folder : requests)
+        {
+            if (folder.second.size() > MAX_INDIVIDUAL_REQUESTS)
+            {
+                // requesting one by one will take a while
+                // do whole folder
+                LLInventoryModelBackgroundFetch::getInstance()->start(folder.first);
+            }
+            else
+            {
+                LLViewerInventoryCategory* cat = gInventory.getCategory(folder.first);
+                if (cat)
+                {
+                    if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+                    {
+                        // start fetching whole folder since it's not ready either way
+                        cat->fetch();
+                    }
+                    else if (cat->getViewerDescendentCount() <= folder.second.size())
+                    {
+                        // start fetching whole folder since we need all items
+                        cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
+                        cat->fetch();
+
+                    }
+                    else
+                    {
+                        // get items one by one
+                        for (LLUUID &item_id : folder.second)
+                        {
+                            LLInventoryModelBackgroundFetch::getInstance()->scheduleItemFetch(item_id);
+                        }
+                    }
+                }
+                else
+                {
+                    // Isn't supposed to happen? We should have all folders
+                    // and if item exists, folder is supposed to exist as well.
+                    llassert(false);
+
+                    // get items one by one
+                    for (LLUUID &item_id : folder.second)
+                    {
+                        LLInventoryModelBackgroundFetch::getInstance()->scheduleItemFetch(item_id);
+                    }
+                }
+            }
+        }
+    }
+    else
     {
         fetch_items_from_llsd(items_llsd);
     }
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index de0330588b..bd6f846268 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -545,7 +545,7 @@ void LLSidepanelInventory::clearSelections(bool clearMain, bool clearInbox)
 		}
 	}
 	
-	if (clearInbox && mInboxEnabled && mInventoryPanelInbox.get())
+	if (clearInbox && mInboxEnabled && !mInventoryPanelInbox.isDead())
 	{
 		mInventoryPanelInbox.get()->getRootFolder()->clearSelection();
 	}
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6bd86f7902..6f62ba5409 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -432,14 +432,7 @@ void LLViewerInventoryItem::fetchFromServer(void) const
 	{
         if (AISAPI::isAvailable()) // AIS v 3
         {
-            if (gAgent.getID() != mPermissions.getOwner())
-            {
-                AISAPI::FetchItem(mUUID, AISAPI::LIBRARY);
-            }
-            else
-            {
-                AISAPI::FetchItem(mUUID, AISAPI::INVENTORY);
-            }
+            LLInventoryModelBackgroundFetch::getInstance()->scheduleItemFetch(mUUID);
         }
         else
         {
-- 
cgit v1.2.3


From d21a1aace63967fe62b12b71b7f683f662dfcf4a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Mar 2023 03:41:51 +0300
Subject: SL-18003 Missed pool name

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index d58dd22ca1..4cb4b9ee9c 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -514,7 +514,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         return;
     }
 
-    static LLCachedControl<U32> ais_pool(gSavedSettings, "", 20);
+    static LLCachedControl<U32> ais_pool(gSavedSettings, "PoolSizeAIS", 20);
     const U32 max_concurrent_fetches = llmax(1, ais_pool - 1);
 
     if (mFetchCount >= max_concurrent_fetches)
-- 
cgit v1.2.3


From 3bf9c78f564f0b6c4fd79163bd63c0a6c1fab7cb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Mar 2023 19:38:26 +0300
Subject: SL-18003 Improve dupplicate prevention

Try getting lost and found
---
 indra/newview/llaisapi.cpp                        |  46 +++++++
 indra/newview/llaisapi.h                          |   1 +
 indra/newview/llinventorymodel.cpp                |  11 +-
 indra/newview/llinventorymodelbackgroundfetch.cpp | 147 +++++++++++++---------
 indra/newview/llinventorymodelbackgroundfetch.h   |  22 ++--
 indra/newview/llviewerinventory.cpp               |  28 +++--
 indra/newview/llviewerinventory.h                 |  14 ++-
 7 files changed, 183 insertions(+), 86 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 6a43c901e7..f869f1652b 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -445,6 +445,52 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
     EnqueueAISCommand("FetchCategoryChildren", proc);
 }
 
+// some folders can be requested by name, like
+// animatn | bodypart | clothing | current | favorite | gesture | inbox | landmark | lsltext
+// lstndfnd | my_otfts | notecard | object | outbox | root | snapshot | sound | texture | trash
+void AISAPI::FetchCategoryChildren(const std::string &identifier, bool recursive, completion_t callback, S32 depth)
+{
+    std::string cap;
+
+    cap = getInvCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        callback(LLUUID::null);
+        return;
+    }
+    std::string url = cap + std::string("/category/") + identifier + "/children";
+
+    if (recursive)
+    {
+        url += "?depth=*";
+    }
+    else
+    {
+        url += "?depth=" + std::to_string(depth);
+    }
+
+    invokationFn_t getFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    // get doesn't use body, can pass additional data
+    LLSD body;
+    body["depth"] = recursive ? S32_MAX : depth;
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+        _1, getFn, url, LLUUID::null, body, callback, FETCHCATEGORYCHILDREN));
+
+    EnqueueAISCommand("FetchCategoryChildren", proc);
+}
+
 /*static*/
 void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool recursive, completion_t callback, S32 depth)
 {
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index dd02951cd4..d083004195 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -57,6 +57,7 @@ public:
     static void UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t callback = completion_t());
     static void FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callback = completion_t());
     static void FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchCategoryChildren(const std::string &identifier, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index bfc7840708..9a874350bf 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3453,8 +3453,8 @@ void LLInventoryModel::processUpdateCreateInventoryItem(LLMessageSystem* msg, vo
 		gInventoryCallbacks.fire(callback_id, item_id);
 
         // todo: instead of unpacking message fully,
-        // grab only an item_id, then fetch via AIS
-        LLInventoryModelBackgroundFetch::instance().start(item_id, false);
+        // grab only an item_id, then fetch
+        LLInventoryModelBackgroundFetch::instance().scheduleItemFetch(item_id, true);
 	}
 
 }
@@ -3798,10 +3798,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-
-        // Use AIS derectly to not reset folder's version
-        // Todo: May be LLInventoryModelBackgroundFetch needs a 'forced' option
-        AISAPI::FetchCategoryChildren((*cit)->getUUID(), AISAPI::INVENTORY);
+        LLInventoryModelBackgroundFetch::instance().scheduleFolderFetch((*cit)->getUUID(), true /*force, since it has changes*/);
 	}
 	for (item_array_t::iterator iit = items.begin(); iit != items.end(); ++iit)
 	{
@@ -3810,7 +3807,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
         // Temporary workaround: just fetch the item using AIS to get missing fields.
         // If this works fine we might want to extract ids only from the message
         // then use AIS as a primary fetcher
-        LLInventoryModelBackgroundFetch::instance().scheduleItemFetch((*iit)->getUUID());
+        LLInventoryModelBackgroundFetch::instance().scheduleItemFetch((*iit)->getUUID(), true);
 	}
 	gInventory.notifyObservers();
 
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 4cb4b9ee9c..a9357bfdb3 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -252,7 +252,7 @@ BOOL LLInventoryModelBackgroundFetch::folderFetchActive() const
 
 void LLInventoryModelBackgroundFetch::addRequestAtFront(const LLUUID & id, bool recursive, bool is_category)
 {
-    ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
+    EFetchType recursion_type = recursive ? FT_RECURSIVE : FT_DEFAULT;
     if (is_category)
     {
         mFetchFolderQueue.push_front(FetchQueueInfo(id, recursion_type, is_category));
@@ -265,7 +265,7 @@ void LLInventoryModelBackgroundFetch::addRequestAtFront(const LLUUID & id, bool
 
 void LLInventoryModelBackgroundFetch::addRequestAtBack(const LLUUID & id, bool recursive, bool is_category)
 {
-    ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
+    EFetchType recursion_type = recursive ? FT_RECURSIVE : FT_DEFAULT;
     if (is_category)
     {
         mFetchFolderQueue.push_back(FetchQueueInfo(id, recursion_type, is_category));
@@ -287,7 +287,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 
 		mBackgroundFetchActive = true;
 		mFolderFetchActive = true;
-        ERecursionType recursion_type = recursive ? RT_RECURSIVE : RT_NONE;
+        EFetchType recursion_type = recursive ? FT_RECURSIVE : FT_DEFAULT;
 		if (id.isNull())
 		{
 			if (! mRecursiveInventoryFetchStarted)
@@ -298,7 +298,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
                     // Not only root folder can be massive, but
                     // most system folders will be requested independently
                     // so request root folder and content separately
-                    mFetchFolderQueue.push_front(FetchQueueInfo(gInventory.getRootFolderID(), RT_CONTENT));
+                    mFetchFolderQueue.push_front(FetchQueueInfo(gInventory.getRootFolderID(), FT_CONTENT_RECURSIVE));
                 }
                 else
                 {
@@ -351,32 +351,45 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 	}
 }
 
-void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id)
+void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id, bool forced)
 {
-    if (mFetchItemQueue.empty() || mFetchItemQueue.front().mUUID != item_id)
+    if (AISAPI::isAvailable())
     {
-        mBackgroundFetchActive = true;
-
-        mFetchItemQueue.push_front(FetchQueueInfo(item_id, RT_NONE, false));
+        if (mFetchFolderQueue.empty() || mFetchFolderQueue.back().mUUID != cat_id)
+        {
+            // On AIS make sure root goes to the top and follow up recursive
+            // fetches, not individual requests
+            mFetchFolderQueue.push_back(FetchQueueInfo(cat_id, forced ? FT_FORCED : FT_DEFAULT));
+            gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+        }
+    }
+    else if (mFetchFolderQueue.empty() || mFetchFolderQueue.front().mUUID != cat_id)
+    {
+        // Specific folder requests go to front of queue.
+        mFetchFolderQueue.push_front(FetchQueueInfo(cat_id, forced ? FT_FORCED : FT_DEFAULT));
         gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
     }
 }
 
-void LLInventoryModelBackgroundFetch::findLostItems()
+void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id, bool forced)
 {
-    if (AISAPI::isAvailable())
-    {
-        LL_WARNS() << "Not implemented yet" << LL_ENDL;
-    }
-    else
+    if (mFetchItemQueue.empty() || mFetchItemQueue.front().mUUID != item_id)
     {
         mBackgroundFetchActive = true;
-        mFolderFetchActive = true;
-        mFetchFolderQueue.push_back(FetchQueueInfo(LLUUID::null, RT_RECURSIVE));
+
+        mFetchItemQueue.push_front(FetchQueueInfo(item_id, forced ? FT_FORCED : FT_DEFAULT, false));
         gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
     }
 }
 
+void LLInventoryModelBackgroundFetch::findLostItems()
+{
+    mBackgroundFetchActive = true;
+    mFolderFetchActive = true;
+    mFetchFolderQueue.push_back(FetchQueueInfo(LLUUID::null, FT_RECURSIVE));
+    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+}
+
 void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 {
 	if (mRecursiveInventoryFetchStarted &&
@@ -449,7 +462,10 @@ void ais_simple_folder_callback(const LLUUID& inv_id)
 {
     LLInventoryModelBackgroundFetch::instance().incrFetchFolderCount(-1);
     LLViewerInventoryCategory * cat(gInventory.getCategory(inv_id));
-    if (cat) cat->setFetching(false);
+    if (cat)
+    {
+        cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+    }
 }
 
 void ais_simple_item_callback(const LLUUID& inv_id)
@@ -457,24 +473,24 @@ void ais_simple_item_callback(const LLUUID& inv_id)
     LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
 }
 
-void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion)
+void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion)
 {
     incrFetchFolderCount(-1);
     if (response_id.isNull()) // Failure
     {
-        if (recursion == RT_RECURSIVE)
+        if (recursion == FT_RECURSIVE)
         {
             // A full recursive request failed.
             // Try requesting folder and nested content separately
             mBackgroundFetchActive = true;
             mFolderFetchActive = true;
-            mFetchFolderQueue.push_front(FetchQueueInfo(request_id, RT_CONTENT));
+            mFetchFolderQueue.push_front(FetchQueueInfo(request_id, FT_CONTENT_RECURSIVE));
             gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
         }
     }
     else
     {
-        if (recursion == RT_CONTENT)
+        if (recursion == FT_CONTENT_RECURSIVE)
         {
             // Got the folder, now recursively request content
             LLInventoryModel::cat_array_t * categories(NULL);
@@ -484,7 +500,7 @@ void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_i
                 it != categories->end();
                 ++it)
             {
-                mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), RT_RECURSIVE));
+                mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
             }
             if (!mFetchFolderQueue.empty())
             {
@@ -499,7 +515,7 @@ void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_i
     LLViewerInventoryCategory * cat(gInventory.getCategory(request_id));
     if (cat)
     {
-        cat->setFetching(false);
+        cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
     }
 }
 
@@ -561,12 +577,11 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
     if (fetch_info.mIsCategory)
     {
         const LLUUID & cat_id(fetch_info.mUUID);
-        if (cat_id.isNull()) // Lost and found
+        if (cat_id.isNull())
         {
-            LL_WARNS() << "Lost and found not implemented yet" << LL_ENDL;
-            // todo: needs to be requested from ais in special manner?
-            /*AISAPI::FetchCategoryChildren(LLUUID::null, AISAPI::INVENTORY, false, ais_simple_callback);
-            incrFetchFolderCount(1);*/
+            // Lost and found
+            AISAPI::FetchCategoryChildren("lstndfnd", true, ais_simple_folder_callback);
+            incrFetchFolderCount(1);
         }
         else
         {
@@ -574,32 +589,42 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
             LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
             if (cat)
             {
-                if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
+                if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion() || fetch_info.mFetchType == FT_FORCED)
                 {
-                    if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
-                    {
-                        AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mRecursive == RT_RECURSIVE, ais_simple_folder_callback);
-                    }
-                    else
+                    LLViewerInventoryCategory::EFetchType target_state =
+                        fetch_info.mFetchType >= FT_CONTENT_RECURSIVE
+                        ? LLViewerInventoryCategory::FETCH_RECURSIVE
+                        : LLViewerInventoryCategory::FETCH_NORMAL;
+                    // start again if we did a non-recursive fetch before
+                    if (cat->getFetching() < target_state)
                     {
-                        LLUUID cat_id = cat->getUUID();
-                        ERecursionType type = fetch_info.mRecursive;
-                        AISAPI::FetchCategoryChildren(
-                            cat_id,
-                            AISAPI::INVENTORY,
-                            type == RT_RECURSIVE,
-                            [cat_id, type](const LLUUID &response_id)
+
+                        if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
                         {
-                            LLInventoryModelBackgroundFetch::instance().onAISFodlerCalback(cat_id, response_id, type);
-                        });
+                            AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mFetchType == FT_RECURSIVE, ais_simple_folder_callback);
+                        }
+                        else
+                        {
+                            LLUUID cat_id = cat->getUUID();
+                            EFetchType type = fetch_info.mFetchType;
+                            AISAPI::FetchCategoryChildren(
+                                cat_id,
+                                AISAPI::INVENTORY,
+                                type == FT_RECURSIVE,
+                                [cat_id, type](const LLUUID &response_id)
+                            {
+                                LLInventoryModelBackgroundFetch::instance().onAISFodlerCalback(cat_id, response_id, type);
+                            });
+                        }
+                        incrFetchFolderCount(1);
+
+                        cat->setFetching(target_state);
                     }
-                    incrFetchFolderCount(1);
-                    cat->setFetching(true);
                 }
                 else
                 {
                     // Already fetched, check if anything inside needs fetching
-                    if (fetch_info.mRecursive)
+                    if (fetch_info.mFetchType >= FT_CONTENT_RECURSIVE)
                     {
                         LLInventoryModel::cat_array_t * categories(NULL);
                         LLInventoryModel::item_array_t * items(NULL);
@@ -609,7 +634,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                             ++it)
                         {
                             // not push_front to not cause an infinite loop
-                            mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                            mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mFetchType));
                         }
                     }
                 }
@@ -622,21 +647,25 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
 
         if (itemp)
         {
-            if (itemp->getPermissions().getOwner() == gAgent.getID())
-            {
-                AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
-            }
-            else
+            if (!itemp->isFinished() || fetch_info.mFetchType == FT_FORCED)
             {
-                AISAPI::FetchItem(fetch_info.mUUID, AISAPI::LIBRARY, ais_simple_item_callback);
+                if (itemp->getPermissions().getOwner() == gAgent.getID())
+                {
+                    AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
+                }
+                else
+                {
+                    AISAPI::FetchItem(fetch_info.mUUID, AISAPI::LIBRARY, ais_simple_item_callback);
+                }
+                mFetchCount++;
             }
         }
-        else
+        else // We don't know it, assume incomplete
         {
             // Assume agent's inventory, library wouldn't have gotten here
             AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
+            mFetchCount++;
         }
-        mFetchCount++;
     }
 }
 
@@ -736,7 +765,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
                     else
                     {
                         // May already have this folder, but append child folders to list.
-                        if (fetch_info.mRecursive)
+                        if (fetch_info.mFetchType >= FT_CONTENT_RECURSIVE)
                         {
                             LLInventoryModel::cat_array_t * categories(NULL);
                             LLInventoryModel::item_array_t * items(NULL);
@@ -745,13 +774,13 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
                                 it != categories->end();
                                 ++it)
                             {
-                                mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mRecursive));
+                                mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mFetchType));
                             }
                         }
                     }
                 }
 			}
-			if (fetch_info.mRecursive)
+			if (fetch_info.mFetchType >= FT_CONTENT_RECURSIVE)
 			{
 				recursive_cats.push_back(cat_id);
 			}
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 6a8b616a82..eae2ba6af8 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -47,10 +47,11 @@ class LLInventoryModelBackgroundFetch : public LLSingleton<LLInventoryModelBackg
 	~LLInventoryModelBackgroundFetch();
 public:
 
-    // Start  background breadth-first fetching of inventory contents.
+    // Start background breadth-first fetching of inventory contents.
 	// This gets triggered when performing a filter-search.
 	void start(const LLUUID& cat_id = LLUUID::null, bool recursive = true);
-    void scheduleItemFetch(const LLUUID& item_id);
+    void scheduleFolderFetch(const LLUUID& cat_id, bool forced = false);
+    void scheduleItemFetch(const LLUUID& item_id, bool forced = false);
 
 	BOOL folderFetchActive() const;
 	bool isEverythingFetched() const; // completing the fetch once per session should be sufficient
@@ -80,25 +81,26 @@ public:
 protected:
 
     typedef enum {
-        RT_NONE = 0,
-        RT_CONTENT, // request content recursively
-        RT_RECURSIVE, // request everything recursively
-    } ERecursionType;
+        FT_DEFAULT = 0,
+        FT_FORCED, // request even if already loaded
+        FT_CONTENT_RECURSIVE, // request content recursively
+        FT_RECURSIVE, // request everything recursively
+    } EFetchType;
     struct FetchQueueInfo
     {
-        FetchQueueInfo(const LLUUID& id, ERecursionType recursive, bool is_category = true)
+        FetchQueueInfo(const LLUUID& id, EFetchType recursive, bool is_category = true)
             : mUUID(id),
             mIsCategory(is_category),
-            mRecursive(recursive)
+            mFetchType(recursive)
         {}
 
         LLUUID mUUID;
         bool mIsCategory;
-        ERecursionType mRecursive;
+        EFetchType mFetchType;
     };
     typedef std::deque<FetchQueueInfo> fetch_queue_t;
 
-    void onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, ERecursionType recursion);
+    void onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion);
     void bulkFetchViaAis();
     void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
 	void bulkFetch();
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6f62ba5409..8ec7719ade 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -561,7 +561,8 @@ LLViewerInventoryCategory::LLViewerInventoryCategory(const LLUUID& uuid,
 	LLInventoryCategory(uuid, parent_uuid, pref, name),
 	mOwnerID(owner_id),
 	mVersion(LLViewerInventoryCategory::VERSION_UNKNOWN),
-	mDescendentCount(LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN)
+	mDescendentCount(LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN),
+    mFetching(FETCH_NONE)
 {
 	mDescendentsRequested.reset();
 }
@@ -569,7 +570,8 @@ LLViewerInventoryCategory::LLViewerInventoryCategory(const LLUUID& uuid,
 LLViewerInventoryCategory::LLViewerInventoryCategory(const LLUUID& owner_id) :
 	mOwnerID(owner_id),
 	mVersion(LLViewerInventoryCategory::VERSION_UNKNOWN),
-	mDescendentCount(LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN)
+	mDescendentCount(LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN),
+    mFetching(FETCH_NONE)
 {
 	mDescendentsRequested.reset();
 }
@@ -670,21 +672,33 @@ bool LLViewerInventoryCategory::fetch()
 	return false;
 }
 
-void LLViewerInventoryCategory::setFetching(bool fetching)
+LLViewerInventoryCategory::EFetchType LLViewerInventoryCategory::getFetching()
 {
-    if (fetching)
+    // if timer hasn't expired, request was scheduled, but not in progress
+    // if mFetching request was actually started
+    if (mDescendentsRequested.hasExpired())
     {
-        if ((VERSION_UNKNOWN == getVersion())
-            && mDescendentsRequested.hasExpired())
+        mFetching = FETCH_NONE;
+    }
+    return mFetching;
+}
+
+void LLViewerInventoryCategory::setFetching(LLViewerInventoryCategory::EFetchType fetching)
+{
+    if (fetching > mFetching) // allow a switch from normal to recursive
+    {
+        if (mDescendentsRequested.hasExpired() || (mFetching == FETCH_NONE))
         {
             const F32 FETCH_TIMER_EXPIRY = 10.0f;
             mDescendentsRequested.reset();
             mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
         }
+        mFetching = fetching;
     }
-    else
+    else if (fetching = FETCH_NONE)
     {
         mDescendentsRequested.stop();
+        mFetching = fetching;
     }
 }
 
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 2ae2cebe5c..95a4c84999 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -209,10 +209,17 @@ public:
 	S32 getVersion() const;
 	void setVersion(S32 version);
 
-	// Returns true if a fetch was issued.
+	// Returns true if a fetch was issued (not nessesary in progress).
 	bool fetch();
-    // Returns true if a fetch was issued.
-    void setFetching(bool);
+
+    typedef enum {
+        FETCH_NONE = 0,
+        FETCH_NORMAL,
+        FETCH_RECURSIVE,
+    } EFetchType;
+    EFetchType getFetching();
+    // marks as fetch being in progress or as done
+    void setFetching(EFetchType);
 
 	// used to help make caching more robust - for example, if
 	// someone is getting 4 packets but logs out after 3. the viewer
@@ -242,6 +249,7 @@ protected:
 	LLUUID mOwnerID;
 	S32 mVersion;
 	S32 mDescendentCount;
+    EFetchType mFetching;
 	LLFrameTimer mDescendentsRequested;
 };
 
-- 
cgit v1.2.3


From ffc4f262b259c6085773c60177c17f8339237221 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Mar 2023 23:00:33 +0300
Subject: SL-18003 Improve dupplicate prevention #2

---
 indra/newview/llviewerinventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 8ec7719ade..c7819c9a54 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -695,7 +695,7 @@ void LLViewerInventoryCategory::setFetching(LLViewerInventoryCategory::EFetchTyp
         }
         mFetching = fetching;
     }
-    else if (fetching = FETCH_NONE)
+    else if (fetching == FETCH_NONE)
     {
         mDescendentsRequested.stop();
         mFetching = fetching;
-- 
cgit v1.2.3


From 11b2f138cecc123c3e6876b56ea63c5fbd734d56 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 04:28:07 +0300
Subject: SL-19502 Copying folders should copy thumbnails

---
 indra/newview/llappearancemgr.cpp      | 7 ++-----
 indra/newview/llinventorybridge.cpp    | 3 ++-
 indra/newview/llinventoryfunctions.cpp | 2 +-
 indra/newview/llinventorygallery.cpp   | 2 +-
 indra/newview/llinventorymodel.cpp     | 4 +++-
 indra/newview/llinventorymodel.h       | 3 ++-
 6 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 8e44411d52..a4dc0c341e 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2786,8 +2786,6 @@ void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool ap
 			pid = gInventory.getRootFolderID();
 		}
 
-		// UDP PATH
-		// D567 needs to carry over thumbnail info if present
 		gInventory.createNewCategory(
 			pid,
 			LLFolderType::FT_NONE,
@@ -2807,7 +2805,8 @@ void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool ap
 
             // BAP fixes a lag in display of created dir.
             gInventory.notifyObservers();
-        }
+        },
+            cat->getThumbnailUUID()
         );
 	}
 	else
@@ -4050,8 +4049,6 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
 	// First, make a folder in the My Outfits directory.
 	const LLUUID parent_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
-    // UDP PATH, should remove
-    // D567 copy thumbnail info from source folder
     gInventory.createNewCategory(
         parent_id,
         LLFolderType::FT_OUTFIT,
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1fac4dd1ad..86a3fb8ec0 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4965,7 +4965,8 @@ void LLFolderBridge::dropToMyOutfits(LLInventoryCategory* inv_cat)
     gInventory.createNewCategory(dest_id,
                                  LLFolderType::FT_OUTFIT,
                                  inv_cat->getName(),
-                                 func);
+                                 func,
+                                 inv_cat->getThumbnailUUID());
 }
 
 void LLFolderBridge::outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id)
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 5b46dc4753..fbcce5f078 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -406,7 +406,7 @@ void copy_inventory_category(LLInventoryModel* model,
 	// Create the initial folder
 	// D567 needs to handle new fields
 	inventory_func_type func = boost::bind(&copy_inventory_category_content, _1, model, cat, root_copy_id, move_no_copy_items);
-	gInventory.createNewCategory(parent_id, LLFolderType::FT_NONE, cat->getName(), func);
+	gInventory.createNewCategory(parent_id, LLFolderType::FT_NONE, cat->getName(), func, cat->getThumbnailUUID());
 }
 
 void copy_inventory_category_content(const LLUUID& new_cat_uuid, LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& root_copy_id, bool move_no_copy_items)
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 2624640bb4..08836555d4 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1900,6 +1900,6 @@ void dropToMyOutfits(LLInventoryCategory* inv_cat)
     // Note: creation will take time, so passing folder id to callback is slightly unreliable,
     // but so is collecting and passing descendants' ids
     inventory_func_type func = boost::bind(&outfitFolderCreatedCallback, inv_cat->getUUID(), _1);
-    gInventory.createNewCategory(dest_id, LLFolderType::FT_OUTFIT, inv_cat->getName(), func);
+    gInventory.createNewCategory(dest_id, LLFolderType::FT_OUTFIT, inv_cat->getName(), func, inv_cat->getThumbnailUUID());
 }
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 9a874350bf..70ff07c0c2 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -966,7 +966,8 @@ const LLUUID LLInventoryModel::findLibraryCategoryUUIDForType(LLFolderType::ETyp
 void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 										   LLFolderType::EType preferred_type,
 										   const std::string& pname,
-										   inventory_func_type callback)
+										   inventory_func_type callback,
+										   const LLUUID& thumbnail_id)
 {
 	if (!isInventoryUsable())
 	{
@@ -1008,6 +1009,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		LLSD new_inventory = LLSD::emptyMap();
 		new_inventory["categories"] = LLSD::emptyArray();
 		LLViewerInventoryCategory cat(LLUUID::null, parent_id, preferred_type, name, gAgent.getID());
+        cat.setThumbnailUUID(thumbnail_id);
 		LLSD cat_sd = cat.asLLSD();
 		new_inventory["categories"].append(cat_sd);
 		AISAPI::CreateInventory(
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index ac6eda02d8..dcd1e87fa7 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -482,7 +482,8 @@ public:
 	void createNewCategory(const LLUUID& parent_id,
 							 LLFolderType::EType preferred_type,
 							 const std::string& name,
-							 inventory_func_type callback = NULL);
+							 inventory_func_type callback = NULL,
+							 const LLUUID& thumbnail_id = LLUUID::null);
 protected:
 	// Internal methods that add inventory and make sure that all of
 	// the internal data structures are consistent. These methods
-- 
cgit v1.2.3


From e5b8b799cc75f3b9cd259403c323cd47b59453d8 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 13:51:40 +0300
Subject: SL-19379 WIP add basic context menu

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llavataractions.cpp                  | 160 ++++--
 indra/newview/llavataractions.h                    |   1 +
 indra/newview/llinventoryfunctions.cpp             |  70 ++-
 indra/newview/llinventoryfunctions.h               |   2 +
 indra/newview/llinventorygallery.cpp               |  18 +-
 indra/newview/llinventorygallery.h                 |   5 +
 indra/newview/llinventorygallerymenu.cpp           | 616 +++++++++++++++++++++
 indra/newview/llinventorygallerymenu.h             |  55 ++
 .../default/xui/en/menu_gallery_inventory.xml      | 531 ++++++++++++++++++
 .../newview/skins/default/xui/en/notifications.xml |  23 +
 .../default/xui/en/panel_inventory_gallery.xml     |   2 +-
 .../xui/en/panel_inventory_gallery_item.xml        |   4 +-
 13 files changed, 1393 insertions(+), 96 deletions(-)
 create mode 100644 indra/newview/llinventorygallerymenu.cpp
 create mode 100644 indra/newview/llinventorygallerymenu.h
 create mode 100644 indra/newview/skins/default/xui/en/menu_gallery_inventory.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d587f8bfc4..1d7c238629 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -381,6 +381,7 @@ set(viewer_SOURCE_FILES
     llinventoryfilter.cpp
     llinventoryfunctions.cpp
     llinventorygallery.cpp
+    llinventorygallerymenu.cpp
     llinventoryicon.cpp
     llinventoryitemslist.cpp
     llinventorylistitem.cpp
@@ -1025,6 +1026,7 @@ set(viewer_HEADER_FILES
     llinventoryfilter.h
     llinventoryfunctions.h
     llinventorygallery.h
+    llinventorygallerymenu.h
     llinventoryicon.h
     llinventoryitemslist.h
     llinventorylistitem.h
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 3e450e6dec..6bd2b8bbee 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -730,6 +730,37 @@ namespace action_give_inventory
 	/**
 	 * Checks My Inventory visibility.
 	 */
+    static bool is_give_inventory_acceptable_ids(const std::set<LLUUID> inventory_selected_uuids)
+    {
+        if (inventory_selected_uuids.empty()) return false; // nothing selected
+
+        bool acceptable = false;
+        std::set<LLUUID>::const_iterator it = inventory_selected_uuids.begin();
+        const std::set<LLUUID>::const_iterator it_end = inventory_selected_uuids.end();
+        for (; it != it_end; ++it)
+        {
+            LLViewerInventoryCategory* inv_cat = gInventory.getCategory(*it);
+            // any category can be offered.
+            if (inv_cat)
+            {
+                acceptable = true;
+                continue;
+            }
+
+            LLViewerInventoryItem* inv_item = gInventory.getItem(*it);
+            // check if inventory item can be given
+            if (LLGiveInventory::isInventoryGiveAcceptable(inv_item))
+            {
+                acceptable = true;
+                continue;
+            }
+
+            // there are neither item nor category in inventory
+            acceptable = false;
+            break;
+        }
+    return acceptable;
+    }
 
 	static bool is_give_inventory_acceptable(LLInventoryPanel* panel = NULL)
 	{
@@ -737,32 +768,7 @@ namespace action_give_inventory
 		const std::set<LLUUID> inventory_selected_uuids = LLAvatarActions::getInventorySelectedUUIDs(panel);
 		if (inventory_selected_uuids.empty()) return false; // nothing selected
 
-		bool acceptable = false;
-		std::set<LLUUID>::const_iterator it = inventory_selected_uuids.begin();
-		const std::set<LLUUID>::const_iterator it_end = inventory_selected_uuids.end();
-		for (; it != it_end; ++it)
-		{
-			LLViewerInventoryCategory* inv_cat = gInventory.getCategory(*it);
-			// any category can be offered.
-			if (inv_cat)
-			{
-				acceptable = true;
-				continue;
-			}
-
-			LLViewerInventoryItem* inv_item = gInventory.getItem(*it);
-			// check if inventory item can be given
-			if (LLGiveInventory::isInventoryGiveAcceptable(inv_item))
-			{
-				acceptable = true;
-				continue;
-			}
-
-			// there are neither item nor category in inventory
-			acceptable = false;
-			break;
-		}
-		return acceptable;
+        return is_give_inventory_acceptable_ids(inventory_selected_uuids);
 	}
 
 	static void build_items_string(const std::set<LLUUID>& inventory_selected_uuids , std::string& items_string)
@@ -890,46 +896,58 @@ namespace action_give_inventory
 	 * @param avatar_names - avatar names request to be sent.
 	 * @param avatar_uuids - avatar names request to be sent.
 	 */
-	static void give_inventory(const uuid_vec_t& avatar_uuids, const std::vector<LLAvatarName> avatar_names, LLInventoryPanel* panel = NULL)
-	{
-		llassert(avatar_names.size() == avatar_uuids.size());
 
-		const std::set<LLUUID> inventory_selected_uuids = LLAvatarActions::getInventorySelectedUUIDs(panel);
-		if (inventory_selected_uuids.empty())
-		{
-			return;
-		}
+    static void give_inventory_ids(const uuid_vec_t& avatar_uuids, const std::vector<LLAvatarName> avatar_names, const uuid_set_t inventory_selected_uuids)
+    {
+        llassert(avatar_names.size() == avatar_uuids.size());
 
-		std::string residents;
-		LLAvatarActions::buildResidentsString(avatar_names, residents, true);
+        if (inventory_selected_uuids.empty())
+        {
+            return;
+        }
 
-		std::string items;
-		build_items_string(inventory_selected_uuids, items);
+        std::string residents;
+        LLAvatarActions::buildResidentsString(avatar_names, residents, true);
 
-		int folders_count = 0;
-		std::set<LLUUID>::const_iterator it = inventory_selected_uuids.begin();
+        std::string items;
+        build_items_string(inventory_selected_uuids, items);
 
-		//traverse through selected inventory items and count folders among them
-		for ( ; it != inventory_selected_uuids.end() && folders_count <=1 ; ++it)
-		{
-			LLViewerInventoryCategory* inv_cat = gInventory.getCategory(*it);
-			if (NULL != inv_cat)
-			{
-				folders_count++;
-			}
-		}
+        int folders_count = 0;
+        std::set<LLUUID>::const_iterator it = inventory_selected_uuids.begin();
 
-		// EXP-1599
-		// In case of sharing multiple folders, make the confirmation
-		// dialog contain a warning that only one folder can be shared at a time.
-		std::string notification = (folders_count > 1) ? "ShareFolderConfirmation" : "ShareItemsConfirmation";
-		LLSD substitutions;
-		substitutions["RESIDENTS"] = residents;
-		substitutions["ITEMS"] = items;
-		LLShareInfo::instance().mAvatarNames = avatar_names;
-		LLShareInfo::instance().mAvatarUuids = avatar_uuids;
-		LLNotificationsUtil::add(notification, substitutions, LLSD(), boost::bind(&give_inventory_cb, _1, _2, inventory_selected_uuids));
-	}
+        //traverse through selected inventory items and count folders among them
+        for ( ; it != inventory_selected_uuids.end() && folders_count <=1 ; ++it)
+        {
+            LLViewerInventoryCategory* inv_cat = gInventory.getCategory(*it);
+            if (NULL != inv_cat)
+            {
+                folders_count++;
+            }
+        }
+
+        // EXP-1599
+        // In case of sharing multiple folders, make the confirmation
+        // dialog contain a warning that only one folder can be shared at a time.
+        std::string notification = (folders_count > 1) ? "ShareFolderConfirmation" : "ShareItemsConfirmation";
+        LLSD substitutions;
+        substitutions["RESIDENTS"] = residents;
+        substitutions["ITEMS"] = items;
+        LLShareInfo::instance().mAvatarNames = avatar_names;
+        LLShareInfo::instance().mAvatarUuids = avatar_uuids;
+        LLNotificationsUtil::add(notification, substitutions, LLSD(), boost::bind(&give_inventory_cb, _1, _2, inventory_selected_uuids));
+    }
+
+    static void give_inventory(const uuid_vec_t& avatar_uuids, const std::vector<LLAvatarName> avatar_names, LLInventoryPanel* panel = NULL)
+    {
+        llassert(avatar_names.size() == avatar_uuids.size());
+
+        const std::set<LLUUID> inventory_selected_uuids = LLAvatarActions::getInventorySelectedUUIDs(panel);
+        if (inventory_selected_uuids.empty())
+        {
+            return;
+        }
+        give_inventory_ids(avatar_uuids, avatar_names, inventory_selected_uuids);
+    }
 }
 
 // static
@@ -1037,6 +1055,28 @@ void LLAvatarActions::shareWithAvatars(LLView * panel)
 	LLNotificationsUtil::add("ShareNotification");
 }
 
+//static
+void LLAvatarActions::shareWithAvatars(const uuid_set_t inventory_selected_uuids, LLFloater* root_floater)
+{
+    using namespace action_give_inventory;
+
+    LLFloaterAvatarPicker* picker =
+        LLFloaterAvatarPicker::show(boost::bind(give_inventory_ids, _1, _2, inventory_selected_uuids), TRUE, FALSE, FALSE, root_floater->getName());
+    if (!picker)
+    {
+        return;
+    }
+
+    picker->setOkBtnEnableCb(boost::bind(is_give_inventory_acceptable_ids, inventory_selected_uuids));
+    picker->openFriendsTab();
+    
+    if (root_floater)
+    {
+        root_floater->addDependentFloater(picker);
+    }
+    LLNotificationsUtil::add("ShareNotification");
+}
+
 // static
 bool LLAvatarActions::canShareSelectedItems(LLInventoryPanel* inv_panel /* = NULL*/)
 {
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index 86183cc119..8a0f40dd52 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -133,6 +133,7 @@ public:
 	 * Share items with the picked avatars.
 	 */
 	static void shareWithAvatars(LLView * panel);
+    static void shareWithAvatars(const uuid_set_t inventory_selected_uuids, LLFloater* root_floater);
 
 	/**
 	 * Block/unblock the avatar by id.
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index fbcce5f078..d38208da71 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2125,6 +2125,45 @@ std::string get_localized_folder_name(LLUUID cat_uuid)
     
     return localized_root_name;
 }
+
+void new_folder_window(const LLUUID& folder_id)
+{
+    LLPanelMainInventory::newFolderWindow(folder_id);
+}
+
+void ungroup_folder_items(const LLUUID& folder_id)
+{
+    LLInventoryCategory* inv_cat = gInventory.getCategory(folder_id);
+    if (!inv_cat || LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
+    {
+        return;
+    }
+    const LLUUID &new_cat_uuid = inv_cat->getParentUUID();
+    LLInventoryModel::cat_array_t* cat_array;
+    LLInventoryModel::item_array_t* item_array;
+    gInventory.getDirectDescendentsOf(inv_cat->getUUID(), cat_array, item_array);
+    LLInventoryModel::cat_array_t cats = *cat_array;
+    LLInventoryModel::item_array_t items = *item_array;
+
+    for (LLInventoryModel::cat_array_t::const_iterator cat_iter = cats.begin(); cat_iter != cats.end(); ++cat_iter)
+    {
+        LLViewerInventoryCategory* cat = *cat_iter;
+        if (cat)
+        {
+            gInventory.changeCategoryParent(cat, new_cat_uuid, false);
+        }
+    }
+    for (LLInventoryModel::item_array_t::const_iterator item_iter = items.begin(); item_iter != items.end(); ++item_iter)
+    {
+        LLViewerInventoryItem* item = *item_iter;
+        if(item)
+        {
+            gInventory.changeItemParent(item, new_cat_uuid, false);
+        }
+    }
+    gInventory.removeCategory(inv_cat->getUUID());
+    gInventory.notifyObservers();
+}
 ///----------------------------------------------------------------------------
 /// LLMarketplaceValidator implementations
 ///----------------------------------------------------------------------------
@@ -2977,36 +3016,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
     {
         if (selected_uuid_set.size() == 1)
         {
-            LLInventoryCategory* inv_cat = gInventory.getCategory(*ids.begin());
-            if (!inv_cat || LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
-            {
-                return;
-            }
-            const LLUUID &new_cat_uuid = inv_cat->getParentUUID();
-            LLInventoryModel::cat_array_t* cat_array;
-            LLInventoryModel::item_array_t* item_array;
-            gInventory.getDirectDescendentsOf(inv_cat->getUUID(), cat_array, item_array);
-            LLInventoryModel::cat_array_t cats = *cat_array;
-            LLInventoryModel::item_array_t items = *item_array;
-
-            for (LLInventoryModel::cat_array_t::const_iterator cat_iter = cats.begin(); cat_iter != cats.end(); ++cat_iter)
-            {
-                LLViewerInventoryCategory* cat = *cat_iter;
-                if (cat)
-                {
-                    gInventory.changeCategoryParent(cat, new_cat_uuid, false);
-                }
-            }
-            for (LLInventoryModel::item_array_t::const_iterator item_iter = items.begin(); item_iter != items.end(); ++item_iter)
-            {
-                LLViewerInventoryItem* item = *item_iter;
-                if(item)
-                {
-                    gInventory.changeItemParent(item, new_cat_uuid, false);
-                }
-            }
-            gInventory.removeCategory(inv_cat->getUUID());
-            gInventory.notifyObservers();
+            ungroup_folder_items(*ids.begin());
         }
     }
     else
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index f7755be1dd..5f1c5067d5 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -101,6 +101,8 @@ bool can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_out
 bool can_move_to_landmarks(LLInventoryItem* inv_item);
 bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit);
 std::string get_localized_folder_name(LLUUID cat_uuid);
+void new_folder_window(const LLUUID& folder_id);
+void ungroup_folder_items(const LLUUID& folder_id);
 
 /**                    Miscellaneous global functions
  **                                                                            **
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 08836555d4..bfca22ba8a 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -27,8 +27,8 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llinventorygallery.h"
+#include "llinventorygallerymenu.h"
 
-#include "llaccordionctrltab.h"
 #include "llcommonutils.h"
 #include "lliconctrl.h"
 #include "llinventorybridge.h"
@@ -115,12 +115,14 @@ BOOL LLInventoryGallery::postBuild()
     LLPanel::Params params = LLPanel::getDefaultParams();
     mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
     mMessageTextBox = getChild<LLTextBox>("empty_txt");
-
+    mInventoryGalleryMenu = new LLInventoryGalleryContextMenu(this);
     return TRUE;
 }
 
 LLInventoryGallery::~LLInventoryGallery()
 {
+    delete mInventoryGalleryMenu;
+
     while (!mUnusedRowPanels.empty())
     {
         LLPanel* panelp = mUnusedRowPanels.back();
@@ -600,7 +602,7 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     
     LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, obj->getIsLinkType());
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
-
+    item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::onChangeItemSelection, this, item_id));
     if (mGalleryCreated)
     {
@@ -671,6 +673,16 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
     }
 }
 
+void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
+{
+    if (mInventoryGalleryMenu && item_id.notNull())
+    {
+        uuid_vec_t selected_uuids;
+        selected_uuids.push_back(item_id);
+        mInventoryGalleryMenu->show(ctrl, selected_uuids, x, y);
+    }
+}
+
 void LLInventoryGallery::onChangeItemSelection(const LLUUID& category_id)
 {
     if (mSelectedItemID == category_id)
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 1c45a8345f..5c529e7589 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -27,6 +27,7 @@
 #ifndef LL_LLINVENTORYGALLERY_H
 #define LL_LLINVENTORYGALLERY_H
 
+#include "lllistcontextmenu.h"
 #include "llpanel.h"
 #include "llinventorymodel.h"
 
@@ -35,6 +36,8 @@ class LLInventoryGalleryItem;
 class LLScrollContainer;
 class LLTextBox;
 
+class LLInventoryGalleryContextMenu;
+
 class LLInventoryGallery : public LLPanel
 {
 public:
@@ -108,6 +111,7 @@ public:
 protected:
 
     void onChangeItemSelection(const LLUUID& category_id);
+    void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
 
     void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
 
@@ -171,6 +175,7 @@ private:
     int mRowPanWidthFactor;
     int mGalleryWidthFactor;
 
+    LLInventoryGalleryContextMenu* mInventoryGalleryMenu;
     std::string mFilterSubString;
 
     typedef std::map<LLUUID, LLInventoryGalleryItem*> gallery_item_map_t;
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
new file mode 100644
index 0000000000..11dd5e6690
--- /dev/null
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -0,0 +1,616 @@
+/**
+ * @file llinventorygallerymenu.cpp
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llinventorygallery.h"
+#include "llinventorygallerymenu.h"
+
+#include "llagent.h"
+#include "llappearancemgr.h"
+#include "llavataractions.h"
+#include "llclipboard.h"
+#include "llfloaterreg.h"
+#include "llgiveinventory.h"
+#include "llinventorybridge.h"
+#include "llinventoryfunctions.h"
+#include "llinventorymodel.h"
+#include "llmarketplacefunctions.h"
+#include "llmenugl.h"
+#include "llnotificationsutil.h"
+#include "llviewerfoldertype.h"
+#include "llviewerwindow.h"
+
+LLContextMenu* LLInventoryGalleryContextMenu::createMenu()
+{
+    LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
+    //LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
+    LLUUID selected_id = mUUIDs.front();
+
+    registrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryGalleryContextMenu::doToSelected, this, _2, selected_id));
+    registrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryGalleryContextMenu::fileUploadLocation, this, _2, selected_id));
+    registrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH));
+    registrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND));
+
+    std::set<LLUUID> uuids{selected_id};
+    registrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars, uuids, gFloaterView->getParentFloater(mGallery)));
+    
+    LLContextMenu* menu = createFromFile("menu_gallery_inventory.xml");
+
+    updateMenuItemsVisibility(menu);
+
+    return menu;
+}
+
+void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLUUID& selected_id)
+{
+    std::string action = userdata.asString();
+    LLInventoryObject* obj = gInventory.getObject(selected_id);
+    if(!obj) return;
+
+    bool is_folder = (obj->getType() == LLAssetType::AT_CATEGORY);
+
+    if ("open_selected_folder" == action)
+    {
+        mGallery->setRootFolder(selected_id);
+    }
+    else if ("open_in_new_window" == action)
+    {
+        new_folder_window(selected_id);
+    }
+    else if ("properties" == action)
+    {
+        show_item_profile(selected_id);
+    }
+    else if ("restore" == action)
+    {
+        LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);
+        if(cat)
+        {
+            const LLUUID new_parent = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(cat->getType()));
+            // do not restamp children on restore
+            gInventory.changeCategoryParent(cat, new_parent, false);
+        }
+        else
+        {
+            LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+            if(item)
+            {
+                bool is_snapshot = (item->getInventoryType() == LLInventoryType::IT_SNAPSHOT);
+
+                const LLUUID new_parent = gInventory.findCategoryUUIDForType(is_snapshot? LLFolderType::FT_SNAPSHOT_CATEGORY : LLFolderType::assetTypeToFolderType(item->getType()));
+                // do not restamp children on restore
+                gInventory.changeItemParent(item, new_parent, false);
+            }
+        }
+    }
+    else if ("copy_uuid" == action)
+    {
+        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+        if(item)
+        {
+            LLUUID asset_id = item->getProtectedAssetUUID();
+            std::string buffer;
+            asset_id.toString(buffer);
+
+            gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(buffer));
+        }
+    }
+    else if ("purge" == action)
+    {
+        remove_inventory_object(selected_id, NULL);
+    }
+    else if ("goto" == action)
+    {
+        show_item_original(selected_id);
+    }
+    else if ("thumbnail" == action)
+    {
+        LLSD data(selected_id);
+        LLFloaterReg::showInstance("change_item_thumbnail", data);
+    }
+    else if ("cut" == action)
+    {
+            bool allow = false;
+            if(is_folder)
+            {
+                allow = get_is_category_removable(&gInventory, selected_id);
+            }
+            else
+            {
+                allow = get_is_item_removable(&gInventory, selected_id);
+            }
+            if(allow)
+            {
+                LLClipboard::instance().setCutMode(true);
+                LLClipboard::instance().addToClipboard(selected_id);
+            }
+    }
+    else if ("paste" == action)
+    {
+        {
+            const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+            if(gInventory.isObjectDescendentOf(selected_id, marketplacelistings_id))
+            {
+                return;
+            }
+
+            bool is_cut_mode = (LLClipboard::instance().isCutMode());
+            {
+                std::vector<LLUUID> objects;
+                LLClipboard::instance().pasteFromClipboard(objects);
+                for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
+                {
+                    const LLUUID& item_id = (*iter);
+                    if(gInventory.isObjectDescendentOf(item_id, marketplacelistings_id) && (LLMarketplaceData::instance().isInActiveFolder(item_id) ||
+                        LLMarketplaceData::instance().isListedAndActive(item_id)))
+                    {
+                        return;
+                    }
+                    LLViewerInventoryCategory* cat = gInventory.getCategory(item_id);
+                    if (cat)
+                    {
+                        if(is_cut_mode)
+                        {
+                            gInventory.changeCategoryParent(cat, selected_id, false);
+                        }
+                        else
+                        {
+                            copy_inventory_category(&gInventory, cat, selected_id);
+                        }
+                    }
+                    else
+                    {
+                        LLViewerInventoryItem* item = gInventory.getItem(item_id);
+                        if (item)
+                        {
+                            if(is_cut_mode)
+                            {
+                                gInventory.changeItemParent(item, selected_id, false);
+                            }
+                            else
+                            {
+                                if (item->getIsLinkType())
+                                {
+                                    link_inventory_object(selected_id, item_id,
+                                        LLPointer<LLInventoryCallback>(NULL));
+                                }
+                                else
+                                {
+                                    copy_inventory_item(
+                                                        gAgent.getID(),
+                                                        item->getPermissions().getOwner(),
+                                                        item->getUUID(),
+                                                        selected_id,
+                                                        std::string(),
+                                                        LLPointer<LLInventoryCallback>(NULL));
+                                }
+                            }
+                        }
+                    }
+                }
+                LLClipboard::instance().setCutMode(false);
+            }
+            
+        }
+    }
+    else if ("delete" == action)
+    {
+        if (is_folder)
+        {
+            if(get_is_category_removable(&gInventory, selected_id))
+            {
+                gInventory.removeCategory(selected_id);
+            }
+        }
+        else
+        {
+            if(get_is_item_removable(&gInventory, selected_id))
+            {
+                gInventory.removeItem(selected_id);
+            }
+        }
+    }
+    else if ("copy" == action)
+    {
+        if(is_folder)
+        {
+            LLClipboard::instance().reset();
+            LLClipboard::instance().addToClipboard(selected_id);
+        }
+        else
+        {
+            LLViewerInventoryItem* inv_item = gInventory.getItem(selected_id);
+            if (inv_item && inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()) && !get_is_item_worn(selected_id))
+            {
+                LLClipboard::instance().reset();
+                LLClipboard::instance().addToClipboard(selected_id);
+            }
+        }
+    }
+    else if ("paste_as_link" == action)
+    {
+        link_inventory_object(selected_id, obj, LLPointer<LLInventoryCallback>(NULL));
+    }
+    else if ("rename" == action)
+    {
+        LLSD args;
+        args["NAME"] = obj->getName();
+
+        LLSD payload;
+        payload["id"] = selected_id;
+
+        LLNotificationsUtil::add("RenameItem", args, payload, boost::bind(onRename, _1, _2));
+    }
+    else if ("open" == action || "open_original" == action)
+    {
+        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+        if (item)
+        {
+            LLInvFVBridgeAction::doAction(item->getType(), selected_id , &gInventory);
+        }
+    }
+    else if ("ungroup_folder_items" == action)
+    {
+        ungroup_folder_items(selected_id);
+    }
+}
+
+void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (option != 0) return; // canceled
+
+    std::string new_name = response["new_name"].asString();
+    LLStringUtil::trim(new_name);
+    if (!new_name.empty())
+    {
+        LLUUID id = notification["payload"]["id"].asUUID();
+        
+        LLViewerInventoryCategory* cat = gInventory.getCategory(id);
+        if(cat && (cat->getName() != new_name))
+        {
+            LLSD updates;
+            updates["name"] = new_name;
+            update_inventory_category(cat->getUUID(),updates, NULL);
+            return;
+        }
+        
+        LLViewerInventoryItem* item = gInventory.getItem(id);
+        if(item && (item->getName() != new_name))
+        {
+            LLSD updates;
+            updates["name"] = new_name;
+            update_inventory_item(item->getUUID(),updates, NULL);
+        }
+    }
+}
+
+void LLInventoryGalleryContextMenu::fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id)
+{
+    const std::string param = userdata.asString();
+    if (param == "model")
+    {
+        gSavedPerAccountSettings.setString("ModelUploadFolder", selected_id.asString());
+    }
+    else if (param == "texture")
+    {
+        gSavedPerAccountSettings.setString("TextureUploadFolder", selected_id.asString());
+    }
+    else if (param == "sound")
+    {
+        gSavedPerAccountSettings.setString("SoundUploadFolder", selected_id.asString());
+    }
+    else if (param == "animation")
+    {
+        gSavedPerAccountSettings.setString("AnimationUploadFolder", selected_id.asString());
+    }
+}
+
+bool can_share_item(LLUUID item_id)
+{
+    bool can_share = false;
+
+    if (gInventory.isObjectDescendentOf(item_id, gInventory.getRootFolderID()))
+    {
+            const LLViewerInventoryItem *item = gInventory.getItem(item_id);
+            if (item)
+            {
+                if (LLInventoryCollectFunctor::itemTransferCommonlyAllowed(item))
+                {
+                    can_share = LLGiveInventory::isInventoryGiveAcceptable(item);
+                }
+            }
+            else
+            {
+                can_share = (gInventory.getCategory(item_id) != NULL);
+            }
+
+            const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+            if ((item_id == trash_id) || gInventory.isObjectDescendentOf(item_id, trash_id))
+            {
+                can_share = false;
+            }
+    }
+
+    return can_share;
+}
+
+bool is_inbox_folder(LLUUID item_id)
+{
+    const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX);
+    
+    if (inbox_id.isNull())
+    {
+        return false;
+    }
+    
+    return gInventory.isObjectDescendentOf(item_id, inbox_id);
+}
+
+void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* menu)
+{
+    LLUUID selected_id = mUUIDs.front();
+    LLInventoryObject* obj = gInventory.getObject(selected_id);
+    if (!obj)
+    {
+        return;
+    }
+
+    std::vector<std::string> items;
+    std::vector<std::string> disabled_items;
+
+    bool is_agent_inventory = gInventory.isObjectDescendentOf(selected_id, gInventory.getRootFolderID());
+    bool is_link = obj->getIsLinkType();
+    bool is_folder = (obj->getType() == LLAssetType::AT_CATEGORY);
+    bool is_cof = LLAppearanceMgr::instance().getIsInCOF(selected_id);
+    bool is_inbox = is_inbox_folder(selected_id);
+    bool is_trash = (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH));
+    bool is_in_trash = gInventory.isObjectDescendentOf(selected_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH));
+    bool is_lost_and_found = (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND));
+    bool is_outfits= (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS));
+    //bool is_favorites= (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE));
+
+    bool is_system_folder = false;
+    LLFolderType::EType folder_type(LLFolderType::FT_NONE);
+    bool has_children = false;
+    bool is_full_perm_item = false;
+    bool is_copyable = false;
+    LLViewerInventoryItem* selected_item = gInventory.getItem(selected_id);
+
+    if(is_folder)
+    {
+        LLInventoryCategory* category = gInventory.getCategory(selected_id);
+        if (category)
+        {
+            folder_type = category->getPreferredType();
+            is_system_folder = LLFolderType::lookupIsProtectedType(folder_type);
+            has_children = (gInventory.categoryHasChildren(selected_id) != LLInventoryModel::CHILDREN_NO);
+        }
+    }
+    else
+    {
+        if (selected_item)
+        {
+            is_full_perm_item = selected_item->getIsFullPerm();
+            is_copyable = selected_item->getPermissions().allowCopyBy(gAgent.getID());
+        }
+    }
+
+    if(!is_link)
+    {
+        items.push_back(std::string("thumbnail"));
+        LLViewerInventoryItem* inv_item = gInventory.getItem(selected_id);
+        if (inv_item && !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+        {
+            disabled_items.push_back(std::string("thumbnail"));
+        }
+    }
+
+    if (is_folder)
+    {
+        items.push_back(std::string("Copy Separator"));
+
+        items.push_back(std::string("open_in_current_window"));
+        items.push_back(std::string("open_in_new_window"));
+        items.push_back(std::string("Open Folder Separator"));
+    }
+
+    if(is_trash)
+    {
+        items.push_back(std::string("Empty Trash"));
+
+        LLInventoryModel::cat_array_t* cat_array;
+        LLInventoryModel::item_array_t* item_array;
+        gInventory.getDirectDescendentsOf(selected_id, cat_array, item_array);
+        if (0 == cat_array->size() && 0 == item_array->size())
+        {
+            disabled_items.push_back(std::string("Empty Trash"));
+        }
+    }
+    else if(is_in_trash)
+    {
+        if (is_link)
+        {
+            items.push_back(std::string("Find Original"));
+            if (LLAssetType::lookupIsLinkType(obj->getType()))
+            {
+                disabled_items.push_back(std::string("Find Original"));
+            }
+        }
+        items.push_back(std::string("Purge Item"));
+        if (!get_is_category_removable(&gInventory, selected_id))
+        {
+            disabled_items.push_back(std::string("Purge Item"));
+        }
+        items.push_back(std::string("Restore Item"));
+    }
+    else
+    {
+        if(can_share_item(selected_id))
+        {
+            items.push_back(std::string("Share"));
+        }
+        if (is_folder && is_agent_inventory)
+        {
+            if (!is_cof && (folder_type != LLFolderType::FT_OUTFIT) && !is_outfits && !is_inbox_folder(selected_id))
+            {
+                if (!gInventory.isObjectDescendentOf(selected_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD)))
+                {
+                    items.push_back(std::string("New Folder"));
+                }
+                items.push_back(std::string("upload_def"));
+            }
+
+            if(is_outfits)
+            {
+                items.push_back(std::string("New Outfit"));
+            }
+
+            items.push_back(std::string("Subfolder Separator"));
+            if (!is_system_folder)
+            {
+                if(has_children && (folder_type != LLFolderType::FT_OUTFIT))
+                {
+                    items.push_back(std::string("Ungroup folder items"));
+                }
+                items.push_back(std::string("Cut"));
+                items.push_back(std::string("Delete"));
+                if(!get_is_category_removable(&gInventory, selected_id))
+                {
+                    disabled_items.push_back(std::string("Delete"));
+                    disabled_items.push_back(std::string("Cut"));
+                }
+                if(!is_inbox)
+                {
+                    items.push_back(std::string("Rename"));
+                }
+            }
+            if (LLClipboard::instance().hasContents() && is_agent_inventory && !is_cof && !is_inbox_folder(selected_id))
+            {
+                items.push_back(std::string("Paste"));
+
+                static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryLinking", true);
+                if (inventory_linking)
+                {
+                    items.push_back(std::string("Paste As Link"));
+                }
+            }
+            if(!is_system_folder)
+            {
+                items.push_back(std::string("Copy"));
+            }
+        }
+        else if(!is_folder)
+        {
+            items.push_back(std::string("Properties"));
+            items.push_back(std::string("Copy Asset UUID"));
+            items.push_back(std::string("Copy Separator"));
+
+            bool is_asset_knowable = is_asset_knowable = LLAssetType::lookupIsAssetIDKnowable(obj->getType());
+            if ( !is_asset_knowable // disable menu item for Inventory items with unknown asset. EXT-5308
+                 || (! ( is_full_perm_item || gAgent.isGodlike())))
+            {
+                disabled_items.push_back(std::string("Copy Asset UUID"));
+            }
+            if(is_agent_inventory)
+            {
+                items.push_back(std::string("Cut"));
+                if (!is_link || !is_cof || !get_is_item_worn(selected_id))
+                {
+                    items.push_back(std::string("Delete"));
+                }
+                if(!get_is_item_removable(&gInventory, selected_id))
+                {
+                    disabled_items.push_back(std::string("Delete"));
+                    disabled_items.push_back(std::string("Cut"));
+                }
+
+                if (selected_item && (selected_item->getInventoryType() != LLInventoryType::IT_CALLINGCARD) && !is_inbox && selected_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+                {
+                    items.push_back(std::string("Rename"));
+                }
+            }
+            items.push_back(std::string("Copy"));
+            if (!is_copyable)
+            {
+                disabled_items.push_back(std::string("Copy"));
+            }
+        }
+        if((obj->getType() == LLAssetType::AT_SETTINGS)
+           || ((obj->getType() <= LLAssetType::AT_GESTURE)
+               && obj->getType() != LLAssetType::AT_OBJECT
+               && obj->getType() != LLAssetType::AT_CLOTHING
+               && obj->getType() != LLAssetType::AT_CATEGORY
+               && obj->getType() != LLAssetType::AT_BODYPART))
+        {
+            bool can_open = !LLAssetType::lookupIsLinkType(obj->getType());
+
+            if (can_open)
+            {
+                if (is_link)
+                    items.push_back(std::string("Open Original"));
+                else
+                    items.push_back(std::string("Open"));
+            }
+            else
+            {
+                disabled_items.push_back(std::string("Open"));
+                disabled_items.push_back(std::string("Open Original"));
+            }
+        }
+        else if(LLAssetType::AT_LANDMARK == obj->getType())
+        {
+            items.push_back(std::string("Landmark Open"));
+        }
+        if (is_link)
+        {
+            items.push_back(std::string("Find Original"));
+            if (LLAssetType::lookupIsLinkType(obj->getType()))
+            {
+                disabled_items.push_back(std::string("Find Original"));
+            }
+        }
+        if (is_lost_and_found)
+        {
+            items.push_back(std::string("Empty Lost And Found"));
+
+            LLInventoryModel::cat_array_t* cat_array;
+            LLInventoryModel::item_array_t* item_array;
+            gInventory.getDirectDescendentsOf(selected_id, cat_array, item_array);
+            // Enable Empty menu item only when there is something to act upon.
+            if (0 == cat_array->size() && 0 == item_array->size())
+            {
+                disabled_items.push_back(std::string("Empty Lost And Found"));
+            }
+
+            disabled_items.push_back(std::string("New Folder"));
+            disabled_items.push_back(std::string("upload_def"));
+        }
+    }
+
+    hide_context_entries(*menu, items, disabled_items);
+}
+
diff --git a/indra/newview/llinventorygallerymenu.h b/indra/newview/llinventorygallerymenu.h
new file mode 100644
index 0000000000..1768c07e6e
--- /dev/null
+++ b/indra/newview/llinventorygallerymenu.h
@@ -0,0 +1,55 @@
+/**
+ * @file llinventorygallerymenu.h
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLINVENTORYGALLERYMENU_H
+#define LL_LLINVENTORYGALLERYMENU_H
+
+#include "lllistcontextmenu.h"
+
+class LLInventoryGalleryContextMenu : public LLListContextMenu
+{
+public:
+    LLInventoryGalleryContextMenu(LLInventoryGallery* gallery)
+    : LLListContextMenu(),
+    mGallery(gallery){}
+    /*virtual*/ LLContextMenu* createMenu();
+
+protected:
+    //virtual void buildContextMenu(class LLMenuGL& menu, U32 flags);
+    void updateMenuItemsVisibility(LLContextMenu* menu);
+
+    void doToSelected(const LLSD& userdata, const LLUUID& selected_id);
+    void fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id);
+
+    static void onRename(const LLSD& notification, const LLSD& response);
+
+private:
+    bool enableContextMenuItem(const LLSD& userdata);
+    bool checkContextMenuItem(const LLSD& userdata);
+
+    LLInventoryGallery* mGallery;
+};
+
+#endif
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
new file mode 100644
index 0000000000..15466e8f32
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -0,0 +1,531 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+    layout="topleft"
+    name="Gallery">
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <menu_item_call.on_click
+         function="Inventory.Share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Empty Trash"
+     layout="topleft"
+     name="Empty Trash">
+        <menu_item_call.on_click
+         function="Inventory.EmptyTrash"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Empty Lost And Found"
+     layout="topleft"
+     name="Empty Lost And Found">
+        <menu_item_call.on_click
+         function="Inventory.EmptyLostAndFound"/>
+    </menu_item_call>
+    <menu_item_call
+     label="New Folder"
+     layout="topleft"
+     name="New Folder">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_call
+     label="New Outfit"
+     layout="topleft"
+     name="New Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="outfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport"
+     layout="topleft"
+     name="Landmark Open">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Folder Wearables Separator" />
+    <menu_item_call
+     label="Replace Current Outfit"
+     layout="topleft"
+     name="Replace Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="replaceoutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add To Current Outfit"
+     layout="topleft"
+     name="Add To Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="addtooutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove From Current Outfit"
+     layout="topleft"
+     name="Remove From Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="removefromoutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy outfit list to clipboard"
+     layout="topleft"
+     name="Copy outfit list to clipboard">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copyoutfittoclipboard" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Outfit Separator" />
+    <menu_item_call
+     label="Find Original"
+     layout="topleft"
+     name="Find Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="goto" />
+    </menu_item_call>
+    <menu_item_call
+     label="Purge Item"
+     layout="topleft"
+     name="Purge Item">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="purge"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Restore Item"
+     layout="topleft"
+     name="Restore Item">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="restore" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="Open">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open Original"
+     layout="topleft"
+     name="Open Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_original" />
+    </menu_item_call>
+    <menu_item_call
+     label="Properties"
+     layout="topleft"
+     name="Properties">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="properties" />
+    </menu_item_call>
+    <menu_item_call
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy Asset UUID"
+     layout="topleft"
+     name="Copy Asset UUID">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy_uuid" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Copy Separator" />
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_selected_folder" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_in_new_window" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Open Folder Separator" />
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="Rename">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+     label="Cut"
+     layout="topleft"
+     name="Cut">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="cut" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="Copy">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="Paste">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste As Link"
+     layout="topleft"
+     name="Paste As Link">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="paste_link" />
+    </menu_item_call>
+    <menu_item_call
+     label="Replace Links"
+     layout="topleft"
+     name="Replace Links">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="replace_links" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Paste Separator" />
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="Delete">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete System Folder"
+     layout="topleft"
+     name="Delete System Folder">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="delete_system_folder" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Play"
+     layout="topleft"
+     name="Sound Play">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="sound_play" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Landmark Separator" />
+    <menu_item_call
+    label="Copy SLurl"
+    layout="topleft"
+    name="url_copy">
+       <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_slurl" />
+   </menu_item_call> 
+   <menu_item_call
+     label="About Landmark"
+     layout="topleft"
+     name="About Landmark">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="about" />
+    </menu_item_call>
+   <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="show_on_map" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Animation Separator" />
+    <menu_item_call
+     label="Play Inworld"
+     layout="topleft"
+     name="Animation Play">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="playworld" />
+    </menu_item_call>
+    <menu_item_call
+     label="Play Locally"
+     layout="topleft"
+     name="Animation Audition">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="playlocal" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Send Instant Message Separator" />
+    <menu_item_call
+     label="Send Instant Message"
+     layout="topleft"
+     name="Send Instant Message">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="begin_im" />
+    </menu_item_call>
+    <menu_item_call
+     label="Offer Teleport..."
+     layout="topleft"
+     name="Offer Teleport...">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="lure" />
+    </menu_item_call>
+    <menu_item_call
+     label="Request Teleport..."
+     layout="topleft"
+     name="Request Teleport...">
+        <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="request_lure" />
+    </menu_item_call>
+    <menu_item_call
+     label="Start Conference Chat"
+     layout="topleft"
+     name="Conference Chat">
+        <menu_item_call.on_click
+         function="Inventory.BeginIMSession"
+         parameter="selected" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Gesture Separator" />
+    <menu_item_call
+     label="Activate"
+     layout="topleft"
+     name="Activate">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="activate" />
+    </menu_item_call>
+    <menu_item_call
+     label="Deactivate"
+     layout="topleft"
+     name="Deactivate">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="deactivate" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Texture Separator" />
+    <menu_item_call
+     label="Save As"
+     layout="topleft"
+     name="Save As">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="save_as" />
+    </menu_item_call>
+  <menu_item_call
+ label="Save Selected As"
+ layout="topleft"
+ name="Save Selected As">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="save_selected_as" />
+  </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Wearable And Object Separator"/>
+    <menu_item_call
+     label="Wear"
+     layout="topleft"
+     name="Wearable And Object Wear">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="wear" />
+    </menu_item_call>
+    <menu
+     label="Attach To"
+     layout="topleft"
+     name="Attach To" />
+    <menu
+     label="Attach To HUD"
+     layout="topleft"
+     name="Attach To HUD" />
+    <menu_item_call
+     label="Touch"
+     layout="topleft"
+     name="Attachment Touch">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="touch" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="Wearable Edit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="edit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add"
+     layout="topleft"
+     name="Wearable Add">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="wear_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Detach From Yourself"
+     layout="topleft"
+     name="Detach From Yourself">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="detach" />
+    </menu_item_call>
+    <menu_item_call
+     label="Take Off"
+     layout="topleft"
+     name="Take Off">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="take_off" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Settings Separator" />
+    <menu_item_call
+            name="Settings Apply Local"
+            layout="topleft"
+            label="Apply Only To Myself">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_local" />
+    </menu_item_call>
+    <menu_item_call
+            name="Settings Apply Parcel"
+            layout="topleft"
+            label="Apply To Parcel">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_parcel" />
+    </menu_item_call>
+  <menu_item_separator
+   layout="topleft"
+   name="Subfolder Separator" />
+  <menu_item_call
+   label="Create folder from selected"
+   layout="topleft"
+   name="New folder from selected">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="new_folder_from_selected" />
+  </menu_item_call>
+  <menu_item_call
+   label="Ungroup folder items"
+   layout="topleft"
+   name="Ungroup folder items">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="ungroup_folder_items" />
+  </menu_item_call>
+  <menu
+   label="Use as default for"
+   layout="topleft"
+   name="upload_def">
+    <menu_item_call
+     label="Image uploads"
+     layout="topleft"
+     name="Image uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+        parameter="texture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound uploads"
+     layout="topleft"
+     name="Sound uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="sound" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation uploads"
+     layout="topleft"
+     name="Animation uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="animation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model uploads"
+     layout="topleft"
+     name="Model uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="model" />
+    </menu_item_call>
+  </menu>
+	<menu_item_separator
+	 layout="topleft"
+	 name="Marketplace Separator" />
+	<menu_item_call
+        label="Copy to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Copy">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
+        label="Move to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Move">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="move_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
+     label="--no options--"
+     layout="topleft"
+     name="--no options--" />
+    <menu_item_separator
+     layout="topleft" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d2d3cb4523..70edd567a1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3247,6 +3247,29 @@ See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   label="Rename Selected Item"
+   name="RenameItem"
+   type="alertmodal">
+    Choose a new name for [NAME]
+   <tag>confirm</tag>
+    <form name="form">
+    <input name="new_name" type="text" width="300">
+      [NAME]
+    </input>
+    <button
+     default="true"
+     index="0"
+     name="OK"
+     text="OK"/>
+    <button
+     index="1"
+     name="Cancel"
+     text="Cancel"/>
+   </form>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="RemoveFromFriends"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index 68f78a77c8..b32d592bf6 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -26,7 +26,7 @@
   </text> 
   <scroll_container
    follows="all"
-   height="400"
+   height="390"
    layout="topleft"
    left="4"
    top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 73889af71a..1d216df094 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -53,7 +53,7 @@
    left="0"
    top="129"
    height="25"
-   width="148"
+   width="130"
    name="text_bg_panel">
     <text
       read_only="true"
@@ -65,7 +65,7 @@
       name="item_name"
       parse_urls="false"
       top="2"
-      width="150"
+      width="130"
       use_ellipses="true">
       Item name, folder name.
     </text>
-- 
cgit v1.2.3


From c10eed08189161bab67cfc296b1891a989d5748d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 18:02:04 +0300
Subject: SL-19379 WIP allow change search type for Gallery

---
 indra/newview/llinventorybridge.cpp    | 43 ++---------------------------
 indra/newview/llinventoryfunctions.cpp | 50 ++++++++++++++++++++++++++++++++++
 indra/newview/llinventoryfunctions.h   |  3 ++
 indra/newview/llinventorygallery.cpp   | 39 +++++++++++++++++++++++---
 indra/newview/llinventorygallery.h     | 21 ++++++++++++--
 indra/newview/llpanelmaininventory.cpp | 32 ++++++++++++++++++----
 indra/newview/llpanelmaininventory.h   |  1 +
 7 files changed, 138 insertions(+), 51 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 86a3fb8ec0..41aa11628f 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -215,54 +215,17 @@ const std::string& LLInvFVBridge::getDisplayName() const
 
 std::string LLInvFVBridge::getSearchableDescription() const
 {
-	const LLInventoryModel* model = getInventoryModel();
-	if (model)
-	{
-		const LLInventoryItem *item = model->getItem(mUUID);
-		if(item)
-		{
-			std::string desc = item->getDescription();
-			LLStringUtil::toUpper(desc);
-			return desc;
-		}
-	}
-	return LLStringUtil::null;
+    return get_searchable_description(getInventoryModel(), mUUID);
 }
 
 std::string LLInvFVBridge::getSearchableCreatorName() const
 {
-	const LLInventoryModel* model = getInventoryModel();
-	if (model)
-	{
-		const LLInventoryItem *item = model->getItem(mUUID);
-		if(item)
-		{
-			LLAvatarName av_name;
-			if (LLAvatarNameCache::get(item->getCreatorUUID(), &av_name))
-			{
-				std::string username = av_name.getUserName();
-				LLStringUtil::toUpper(username);
-				return username;
-			}
-		}
-	}
-	return LLStringUtil::null;
+    return get_searchable_creator_name(getInventoryModel(), mUUID);
 }
 
 std::string LLInvFVBridge::getSearchableUUIDString() const
 {
-	const LLInventoryModel* model = getInventoryModel();
-	if (model)
-	{
-		const LLViewerInventoryItem *item = model->getItem(mUUID);
-		if(item && (item->getIsFullPerm() || gAgent.isGodlikeWithoutAdminMenuFakery()))
-		{
-			std::string uuid = item->getAssetUUID().asString();
-			LLStringUtil::toUpper(uuid);
-			return uuid;
-		}
-	}
-	return LLStringUtil::null;
+    return get_searchable_UUID(getInventoryModel(), mUUID);
 }
 
 // Folders have full perms
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index d38208da71..548d3243e5 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -46,6 +46,7 @@
 #include "llappearancemgr.h"
 #include "llappviewer.h"
 #include "llavataractions.h"
+#include "llavatarnamecache.h"
 #include "llclipboard.h"
 #include "lldirpicker.h"
 #include "lldonotdisturbnotificationstorage.h"
@@ -2164,6 +2165,55 @@ void ungroup_folder_items(const LLUUID& folder_id)
     gInventory.removeCategory(inv_cat->getUUID());
     gInventory.notifyObservers();
 }
+
+std::string get_searchable_description(LLInventoryModel* model, const LLUUID& item_id)
+{
+    if (model)
+    {
+        const LLInventoryItem *item = model->getItem(item_id);
+        if(item)
+        {
+            std::string desc = item->getDescription();
+            LLStringUtil::toUpper(desc);
+            return desc;
+        }
+    }
+    return LLStringUtil::null;
+}
+
+std::string get_searchable_creator_name(LLInventoryModel* model, const LLUUID& item_id)
+{
+    if (model)
+    {
+        const LLInventoryItem *item = model->getItem(item_id);
+        if(item)
+        {
+            LLAvatarName av_name;
+            if (LLAvatarNameCache::get(item->getCreatorUUID(), &av_name))
+            {
+                std::string username = av_name.getUserName();
+                LLStringUtil::toUpper(username);
+                return username;
+            }
+        }
+    }
+    return LLStringUtil::null;
+}
+
+std::string get_searchable_UUID(LLInventoryModel* model, const LLUUID& item_id)
+{
+    if (model)
+    {
+        const LLViewerInventoryItem *item = model->getItem(item_id);
+        if(item && (item->getIsFullPerm() || gAgent.isGodlikeWithoutAdminMenuFakery()))
+        {
+            std::string uuid = item->getAssetUUID().asString();
+            LLStringUtil::toUpper(uuid);
+            return uuid;
+        }
+    }
+    return LLStringUtil::null;
+}
 ///----------------------------------------------------------------------------
 /// LLMarketplaceValidator implementations
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 5f1c5067d5..5c4a325eca 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -103,6 +103,9 @@ bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_ca
 std::string get_localized_folder_name(LLUUID cat_uuid);
 void new_folder_window(const LLUUID& folder_id);
 void ungroup_folder_items(const LLUUID& folder_id);
+std::string get_searchable_description(LLInventoryModel* model, const LLUUID& item_id);
+std::string get_searchable_creator_name(LLInventoryModel* model, const LLUUID& item_id);
+std::string get_searchable_UUID(LLInventoryModel* model, const LLUUID& item_id);
 
 /**                    Miscellaneous global functions
  **                                                                            **
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index bfca22ba8a..8516ff37c2 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -83,7 +83,8 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mItemsInRow(p.items_in_row),
       mRowPanWidthFactor(p.row_panel_width_factor),
       mGalleryWidthFactor(p.gallery_width_factor),
-      mIsInitialized(false)
+      mIsInitialized(false),
+      mSearchType(LLInventoryFilter::SEARCHTYPE_NAME)
 {
     updateGalleryWidth();
 
@@ -473,6 +474,9 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     gitem->setGallery(this);
     gitem->setType(type, is_link);
     gitem->setThumbnail(thumbnail_id);
+    gitem->setCreatorName(get_searchable_creator_name(&gInventory, item_id));
+    gitem->setDescription(get_searchable_description(&gInventory, item_id));
+    gitem->setAssetIDStr(get_searchable_UUID(&gInventory, item_id));
     return gitem;
 }
 
@@ -556,16 +560,43 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
 {
     if (!item) return;
 
-    std::string item_name = item->getItemName();
-    LLStringUtil::toUpper(item_name);
+    std::string desc;
+
+    switch(mSearchType)
+    {
+        case LLInventoryFilter::SEARCHTYPE_CREATOR:
+            desc = item->getCreatorName();
+            break;
+        case LLInventoryFilter::SEARCHTYPE_DESCRIPTION:
+            desc = item->getDescription();
+            break;
+        case LLInventoryFilter::SEARCHTYPE_UUID:
+            desc = item->getAssetIDStr();
+            break;
+        case LLInventoryFilter::SEARCHTYPE_NAME:
+        default:
+            desc = item->getItemName();
+            break;
+    }
+    
+    LLStringUtil::toUpper(desc);
 
     std::string cur_filter = filter_substring;
     LLStringUtil::toUpper(cur_filter);
 
-    bool hidden = (std::string::npos == item_name.find(cur_filter));
+    bool hidden = (std::string::npos == desc.find(cur_filter));
     item->setHidden(hidden);
 }
 
+void LLInventoryGallery::setSearchType(LLInventoryFilter::ESearchType type)
+{
+    if(mSearchType != type)
+    {
+        mSearchType = type;
+        reArrangeRows();
+    }
+}
+
 void LLInventoryGallery::getCurrentCategories(uuid_vec_t& vcur)
 {
     for (gallery_item_map_t::const_iterator iter = mItemMap.begin();
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 5c529e7589..09eafc8396 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -29,6 +29,7 @@
 
 #include "lllistcontextmenu.h"
 #include "llpanel.h"
+#include "llinventoryfilter.h"
 #include "llinventorymodel.h"
 
 class LLInventoryCategoriesObserver;
@@ -108,6 +109,9 @@ public:
     void signalSelectionItemID(const LLUUID& category_id);
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
 
+    void setSearchType(LLInventoryFilter::ESearchType type);
+    LLInventoryFilter::ESearchType getSearchType() { return mSearchType; }
+
 protected:
 
     void onChangeItemSelection(const LLUUID& category_id);
@@ -181,6 +185,8 @@ private:
     typedef std::map<LLUUID, LLInventoryGalleryItem*> gallery_item_map_t;
     gallery_item_map_t mItemMap;
     std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
+
+    LLInventoryFilter::ESearchType mSearchType;
 };
 
 class LLInventoryGalleryItem : public LLPanel
@@ -217,7 +223,14 @@ public:
     void setSelected(bool value);
     void setUUID(LLUUID id) {mUUID = id;}
     LLUUID getUUID() { return mUUID;}
-    
+
+    void setAssetIDStr(std::string asset_id) {mAssetIDStr = asset_id;}
+    std::string getAssetIDStr() { return mAssetIDStr;}
+    void setDescription(std::string desc) {mDesc = desc;}
+    std::string getDescription() { return mDesc;}
+    void setCreatorName(std::string name) {mCreatorName = name;}
+    std::string getCreatorName() { return mCreatorName;}
+
     std::string getItemName() {return mName;}
     bool isDefaultImage() {return mDefaultImage;}
     
@@ -238,7 +251,11 @@ private:
     bool     mDefaultImage;
     bool     mHidden;
     bool     mIsFolder;
-    
+
+    std::string mAssetIDStr;
+    std::string mDesc;
+    std::string mCreatorName;
+
     EInventorySortGroup mSortGroup;
     LLAssetType::EType mType;
     std::string mName;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 3679a22e5e..ffa92a3c11 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -566,25 +566,47 @@ void LLPanelMainInventory::onSelectSearchType()
 	std::string new_type = mSearchTypeCombo->getValue();
 	if (new_type == "search_by_name")
 	{
-		getActivePanel()->setSearchType(LLInventoryFilter::SEARCHTYPE_NAME);
+		setSearchType(LLInventoryFilter::SEARCHTYPE_NAME);
 	}
 	if (new_type == "search_by_creator")
 	{
-		getActivePanel()->setSearchType(LLInventoryFilter::SEARCHTYPE_CREATOR);
+		setSearchType(LLInventoryFilter::SEARCHTYPE_CREATOR);
 	}
 	if (new_type == "search_by_description")
 	{
-		getActivePanel()->setSearchType(LLInventoryFilter::SEARCHTYPE_DESCRIPTION);
+		setSearchType(LLInventoryFilter::SEARCHTYPE_DESCRIPTION);
 	}
 	if (new_type == "search_by_UUID")
 	{
-		getActivePanel()->setSearchType(LLInventoryFilter::SEARCHTYPE_UUID);
+		setSearchType(LLInventoryFilter::SEARCHTYPE_UUID);
 	}
 }
 
+void LLPanelMainInventory::setSearchType(LLInventoryFilter::ESearchType type)
+{
+    if(mSingleFolderMode && isGalleryViewMode())
+    {
+        mInventoryGalleryPanel->setSearchType(type);
+    }
+    else
+    {
+        getActivePanel()->setSearchType(type);
+    }
+}
+
 void LLPanelMainInventory::updateSearchTypeCombo()
 {
-	LLInventoryFilter::ESearchType search_type = getActivePanel()->getSearchType();
+    LLInventoryFilter::ESearchType search_type(LLInventoryFilter::SEARCHTYPE_NAME);
+
+    if(mSingleFolderMode && isGalleryViewMode())
+    {
+        search_type = mInventoryGalleryPanel->getSearchType();
+    }
+    else
+    {
+        search_type = getActivePanel()->getSearchType();
+    }
+
 	switch(search_type)
 	{
 		case LLInventoryFilter::SEARCHTYPE_CREATOR:
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index ac97cc4052..974b4ebd26 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -154,6 +154,7 @@ protected:
 	void onFocusReceived();
 	void onSelectSearchType();
 	void updateSearchTypeCombo();
+    void setSearchType(LLInventoryFilter::ESearchType type);
 
     LLSidepanelInventory* getParentSidepanelInventory();
 
-- 
cgit v1.2.3


From 05a4485082b07208a3b5b8d5c2070243cb237e42 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 19:43:19 +0300
Subject: SL-19504 Allow using inventory items as thumbnails from clipboard

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 39 ++++++++++++++++++----
 .../newview/skins/default/xui/en/notifications.xml |  2 +-
 2 files changed, 34 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 722adcc254..a10de8ba23 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -429,15 +429,42 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
     LLClipboard::instance().pasteFromClipboard(objects);
     if (objects.size() > 0)
     {
-        LLUUID asset_id = objects[0];
-        if (validateAsset(asset_id))
+        LLUUID potential_uuid = objects[0];
+        LLUUID asset_id;
+
+        if (potential_uuid.notNull())
         {
-            self->setThumbnailId(asset_id);
+            LLViewerInventoryItem* item = gInventory.getItem(potential_uuid);
+            if (item)
+            {
+                // no point checking snapshot?
+                if (item->getType() == LLAssetType::AT_TEXTURE)
+                {
+                    asset_id = item->getAssetUUID();
+                }
+            }
+            else
+            {
+                LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::getFetchedTexture(potential_uuid);
+                if (texturep)
+                {
+                    asset_id = potential_uuid;
+                }
+            }
         }
-        else
+        if (asset_id.notNull())
         {
-            LLNotificationsUtil::add("ThumbnailDimantionsLimit");
+            // todo: if texture isn't loaded subscribe, or preload it in some way.
+            if (validateAsset(asset_id))
+            {
+                self->setThumbnailId(asset_id);
+            }
+            else
+            {
+                LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+            }
         }
+        // else show 'buffer has no texture' warning?
     }
 }
 
@@ -559,7 +586,7 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
         }
         else
         {
-            LLNotificationsUtil::add("ThumbnailDimantionsLimit");
+            LLNotificationsUtil::add("ThumbnailDimentionsLimit");
         }
     }
 }
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 70edd567a1..0ea13e7d63 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6134,7 +6134,7 @@ Are you sure you want to delete them?
 
   <notification
    icon="alertmodal.tga"
-   name="ThumbnailDimantionsLimit"
+   name="ThumbnailDimentionsLimit"
    type="alertmodal">
     <unique/>
     Only square images from 64 to 256 pixels per side are allowed.
-- 
cgit v1.2.3


From 205d6ef5d6d05f5a429f987a78f45bbb2359404d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 20:51:58 +0300
Subject: SL-19379 WIP show wearable type icons

---
 indra/newview/llinventorygallery.cpp | 22 ++++++++++++++++------
 indra/newview/llinventorygallery.h   |  4 ++--
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 8516ff37c2..e31b6b1527 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -461,7 +461,7 @@ void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
     mItemPanels.pop_back();
 }
 
-LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, bool is_link)
+LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link)
 {
     LLInventoryGalleryItem::Params giparams;
     LLInventoryGalleryItem* gitem = LLUICtrlFactory::create<LLInventoryGalleryItem>(giparams);
@@ -472,7 +472,7 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     gitem->setName(name);
     gitem->setUUID(item_id);
     gitem->setGallery(this);
-    gitem->setType(type, is_link);
+    gitem->setType(type, inventory_type, flags, is_link);
     gitem->setThumbnail(thumbnail_id);
     gitem->setCreatorName(get_searchable_creator_name(&gInventory, item_id));
     gitem->setDescription(get_searchable_description(&gInventory, item_id));
@@ -621,7 +621,8 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
 
     std::string name = obj->getName();
     LLUUID thumbnail_id = obj->getThumbnailUUID();;
-
+    LLInventoryType::EType inventory_type(LLInventoryType::IT_CATEGORY);
+    U32 misc_flags = 0;
     if (LLAssetType::AT_CATEGORY == obj->getType())
     {
         name = get_localized_folder_name(item_id);
@@ -630,8 +631,17 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
             thumbnail_id = getOutfitImageID(item_id);
         }
     }
+    else
+    {
+        LLInventoryItem* inv_item = gInventory.getItem(item_id);
+        if (inv_item)
+        {
+            inventory_type = inv_item->getInventoryType();
+            misc_flags = inv_item->getFlags();
+        }
+    }
     
-    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, obj->getIsLinkType());
+    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType());
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::onChangeItemSelection, this, item_id));
@@ -950,12 +960,12 @@ BOOL LLInventoryGalleryItem::postBuild()
     return TRUE;
 }
 
-void LLInventoryGalleryItem::setType(LLAssetType::EType type, bool is_link)
+void LLInventoryGalleryItem::setType(LLAssetType::EType type, LLInventoryType::EType inventory_type, U32 flags, bool is_link)
 {
     mType = type;
     mIsFolder = (mType == LLAssetType::AT_CATEGORY);
 
-    std::string icon_name = LLInventoryIcon::getIconName(mType);
+    std::string icon_name = LLInventoryIcon::getIconName(mType, inventory_type, flags);
     if(mIsFolder)
     {
         mSortGroup = SG_NORMAL_FOLDER;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 09eafc8396..9d1a277c65 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -144,7 +144,7 @@ private:
     void updateRowsIfNeeded();
     void updateGalleryWidth();
 
-    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, bool is_link);
+    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link);
 
     void buildGalleryPanel(int row_count);
     void reshapeGalleryPanel(int row_count);
@@ -237,7 +237,7 @@ public:
     bool isHidden() {return mHidden;}
     void setHidden(bool hidden) {mHidden = hidden;}
 
-    void setType(LLAssetType::EType type, bool is_link);
+    void setType(LLAssetType::EType type, LLInventoryType::EType inventory_type, U32 flags, bool is_link);
     void setThumbnail(LLUUID id);
     void setGallery(LLInventoryGallery* gallery) { mGallery = gallery; }
     bool isFolder() { return mIsFolder; }
-- 
cgit v1.2.3


From a6b71d3b8234261f4ed3674017736d04649ea992 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 21:20:39 +0300
Subject: SL-19379 WIP allow dnd folders

---
 indra/newview/llinventorygallery.cpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index e31b6b1527..ad4124ff5b 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1061,19 +1061,30 @@ BOOL LLInventoryGalleryItem::handleHover(S32 x, S32 y, MASK mask)
     {
         S32 screen_x;
         S32 screen_y;
-        const LLInventoryItem *item = gInventory.getItem(mUUID);
-
         localPointToScreen(x, y, &screen_x, &screen_y );
-        if(item && LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
+
+        if(LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
         {
-            EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(item->getType());
-            LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_LIBRARY;
-            if(item->getPermissions().getOwner() == gAgent.getID())
+            const LLInventoryItem *item = gInventory.getItem(mUUID);
+            if(item)
+            {
+                EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(item->getType());
+                LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_LIBRARY;
+                if(item->getPermissions().getOwner() == gAgent.getID())
+                {
+                    src = LLToolDragAndDrop::SOURCE_AGENT;
+                }
+                LLToolDragAndDrop::getInstance()->beginDrag(type, item->getUUID(), src);
+                return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask );
+            }
+
+            const LLInventoryCategory *cat = gInventory.getCategory(mUUID);
+            if(cat && gInventory.isObjectDescendentOf(mUUID, gInventory.getRootFolderID())
+                   && !LLFolderType::lookupIsProtectedType((cat)->getPreferredType()))
             {
-                src = LLToolDragAndDrop::SOURCE_AGENT;
+                LLToolDragAndDrop::getInstance()->beginDrag(LLViewerAssetType::lookupDragAndDropType(cat->getType()), cat->getUUID(), LLToolDragAndDrop::SOURCE_AGENT);
+                return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask );
             }
-            LLToolDragAndDrop::getInstance()->beginDrag(type, item->getUUID(), src);
-            return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask );
         }
     }
     return LLUICtrl::handleHover(x,y,mask);
-- 
cgit v1.2.3


From 8ed39a469b1b7337855c113f785fb64e66cf3b8f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 21:30:46 +0300
Subject: SL-19504 Allow drag and drop of textures into thumbnail floater

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 151 ++++++++++++++++++---
 indra/newview/llfloaterchangeitemthumbnail.h       |  21 +++
 .../newview/skins/default/xui/en/notifications.xml |  11 ++
 3 files changed, 166 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index a10de8ba23..8f6d984aa9 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -45,6 +45,7 @@
 #include "llviewerfoldertype.h"
 #include "llviewermenufile.h"
 #include "llviewerobjectlist.h"
+#include "llviewertexturelist.h"
 #include "llwindow.h"
 
 
@@ -169,6 +170,53 @@ void LLFloaterChangeItemThumbnail::onOpen(const LLSD& key)
     refreshFromInventory();
 }
 
+void LLFloaterChangeItemThumbnail::onFocusReceived()
+{
+    mPasteFromClipboardBtn->setEnabled(LLClipboard::instance().hasContents());
+}
+
+void LLFloaterChangeItemThumbnail::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+    mPasteFromClipboardBtn->setEnabled(LLClipboard::instance().hasContents());
+}
+
+BOOL LLFloaterChangeItemThumbnail::handleDragAndDrop(
+    S32 x,
+    S32 y,
+    MASK mask,
+    BOOL drop,
+    EDragAndDropType cargo_type,
+    void *cargo_data,
+    EAcceptance *accept,
+    std::string& tooltip_msg)
+{
+    if (cargo_type == DAD_TEXTURE)
+    {
+        LLInventoryItem *item = (LLInventoryItem *)cargo_data;
+        if (item->getAssetUUID().notNull())
+        {
+            if (drop)
+            {
+                assignAndValidateAsset(item->getAssetUUID());
+            }
+
+            *accept = ACCEPT_YES_SINGLE;
+        }
+        else
+        {
+            *accept = ACCEPT_NO;
+        }
+    }
+    else
+    {
+        *accept = ACCEPT_NO;
+    }
+
+    LL_DEBUGS("UserInput") << "dragAndDrop handled by LLFloaterChangeItemThumbnail " << getKey() << LL_ENDL;
+
+    return TRUE;
+}
+
 void LLFloaterChangeItemThumbnail::changed(U32 mask)
 {
     //LLInventoryObserver
@@ -342,9 +390,11 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
     mThumbnailCtrl->setValue(thumbnail_id);
 
     mCopyToClipboardBtn->setEnabled(thumbnail_id.notNull());
+    mPasteFromClipboardBtn->setEnabled(LLClipboard::instance().hasContents());
 
     // todo: some elements might not support setting thumbnails
     // since they already have them
+    // It is unclear how system folders should function
 }
 
 void LLFloaterChangeItemThumbnail::onUploadLocal(void *userdata)
@@ -418,7 +468,8 @@ void LLFloaterChangeItemThumbnail::onCopyToClipboard(void *userdata)
     LLInventoryObject* obj = self->getInventoryObject();
     if (obj)
     {
-        LLClipboard::instance().addToClipboard(obj->getThumbnailUUID());
+        LLClipboard::instance().addToClipboard(obj->getThumbnailUUID(), LLAssetType::AT_NONE);
+        self->mPasteFromClipboardBtn->setEnabled(true);
     }
 }
 
@@ -440,29 +491,29 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
                 // no point checking snapshot?
                 if (item->getType() == LLAssetType::AT_TEXTURE)
                 {
-                    asset_id = item->getAssetUUID();
+                    bool copy = item->getPermissions().allowCopyBy(gAgent.getID());
+                    bool xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID());
+
+                    if (copy && xfer)
+                    {
+                        asset_id = item->getAssetUUID();
+                    }
+                    else
+                    {
+                        LLNotificationsUtil::add("ThumbnailInsufficientPermissions");
+                        return;
+                    }
                 }
             }
             else
             {
-                LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::getFetchedTexture(potential_uuid);
-                if (texturep)
-                {
-                    asset_id = potential_uuid;
-                }
+                // assume that this is a texture
+                asset_id = potential_uuid;
             }
         }
         if (asset_id.notNull())
         {
-            // todo: if texture isn't loaded subscribe, or preload it in some way.
-            if (validateAsset(asset_id))
-            {
-                self->setThumbnailId(asset_id);
-            }
-            else
-            {
-                LLNotificationsUtil::add("ThumbnailDimentionsLimit");
-            }
+            self->assignAndValidateAsset(asset_id);
         }
         // else show 'buffer has no texture' warning?
     }
@@ -489,15 +540,45 @@ void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notificatio
     }
 }
 
-bool LLFloaterChangeItemThumbnail::validateAsset(const LLUUID &asset_id)
+void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id)
 {
     LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::getFetchedTexture(asset_id);
+    if (texturep->getFullWidth() == 0 && !texturep->isFullyLoaded() && !texturep->isMissingAsset())
+    {
+        texturep->setLoadedCallback(onImageLoaded,
+            MAX_DISCARD_LEVEL, // don't actually need max one, 3 or 4 should be enough
+            FALSE,
+            FALSE,
+            new LLHandle<LLFloater>(getHandle()),
+            NULL,
+            FALSE);
+    }
+    else
+    {
+        if (validateAsset(asset_id))
+        {
+            setThumbnailId(asset_id);
+        }
+        else
+        {
+            LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+        }
+    }
+}
+bool LLFloaterChangeItemThumbnail::validateAsset(const LLUUID &asset_id)
+{
+    LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::findFetchedTexture(asset_id, TEX_LIST_STANDARD);
 
     if (!texturep)
     {
         return false;
     }
 
+    if (texturep->isMissingAsset())
+    {
+        return false;
+    }
+
     if (texturep->getFullWidth() != texturep->getFullHeight())
     {
         return false;
@@ -517,6 +598,42 @@ bool LLFloaterChangeItemThumbnail::validateAsset(const LLUUID &asset_id)
     return true;
 }
 
+//static
+void LLFloaterChangeItemThumbnail::onImageLoaded(
+    BOOL success,
+    LLViewerFetchedTexture *src_vi,
+    LLImageRaw* src,
+    LLImageRaw* aux_src,
+    S32 discard_level,
+    BOOL final,
+    void* userdata)
+{
+    if (!userdata) return;
+
+    if (!final && success) return; //not done yet
+
+    LLHandle<LLFloater>* handle = (LLHandle<LLFloater>*)userdata;
+
+    if (success && !handle->isDead())
+    {
+        LLFloaterChangeItemThumbnail* self = static_cast<LLFloaterChangeItemThumbnail*>(handle->get());
+        if (self)
+        {
+            LLUUID asset_id = src_vi->getID();
+            if (validateAsset(asset_id))
+            {
+                self->setThumbnailId(asset_id);
+            }
+            else
+            {
+                LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+            }
+        }
+    }
+
+    delete handle;
+}
+
 void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
 {
     // show hourglass cursor when loading inventory window
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 50c0c951d4..18cf2f7a85 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -37,6 +37,7 @@ class LLTextBox;
 class LLThumbnailCtrl;
 class LLUICtrl;
 class LLViewerInventoryItem;
+class LLViewerFetchedTexture;
 
 class LLFloaterChangeItemThumbnail : public LLFloater, public LLInventoryObserver, public LLVOInventoryListener
 {
@@ -46,6 +47,18 @@ public:
 
     BOOL postBuild() override;
     void onOpen(const LLSD& key) override;
+    void onFocusReceived() override;
+    void onMouseEnter(S32 x, S32 y, MASK mask) override;
+
+    BOOL handleDragAndDrop(
+        S32 x,
+        S32 y,
+        MASK mask,
+        BOOL drop,
+        EDragAndDropType cargo_type,
+        void *cargo_data,
+        EAcceptance *accept,
+        std::string& tooltip_msg) override;
 
     void changed(U32 mask) override;
     void inventoryChanged(LLViewerObject* object,
@@ -67,7 +80,15 @@ private:
     static void onRemove(void*);
     static void onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle);
 
+    void assignAndValidateAsset(const LLUUID &asset_id);
     static bool validateAsset(const LLUUID &asset_id);
+    static void onImageLoaded(BOOL success,
+        LLViewerFetchedTexture *src_vi,
+        LLImageRaw* src,
+        LLImageRaw* aux_src,
+        S32 discard_level,
+        BOOL final,
+        void* userdata);
 
     void showTexturePicker(const LLUUID &thumbnail_id);
     void onTexturePickerCommit(LLUUID id);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0ea13e7d63..73ce5a6096 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6143,6 +6143,17 @@ Are you sure you want to delete them?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailInsufficientPermissions"
+   type="alertmodal">
+    <unique/>
+    Only copy and transfer free images can be assigned as thumbnails.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From 0d068b0f3080a3378b54d508029bbc11e262aa2f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Mar 2023 22:56:48 +0300
Subject: SL-19479 Remove outfit photo preview and replace with a pop up

---
 indra/newview/CMakeLists.txt                       |   2 -
 indra/newview/llfloateroutfitphotopreview.cpp      | 288 ---------------------
 indra/newview/llfloateroutfitphotopreview.h        |  77 ------
 indra/newview/llinventorybridge.cpp                |   8 +-
 indra/newview/llviewerfloaterreg.cpp               |   2 -
 .../xui/en/floater_outfit_photo_preview.xml        |  65 -----
 .../newview/skins/default/xui/en/notifications.xml |  11 +
 7 files changed, 13 insertions(+), 440 deletions(-)
 delete mode 100644 indra/newview/llfloateroutfitphotopreview.cpp
 delete mode 100644 indra/newview/llfloateroutfitphotopreview.h
 delete mode 100644 indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1d7c238629..70024ce8a5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -288,7 +288,6 @@ set(viewer_SOURCE_FILES
     llfloaternamedesc.cpp
     llfloaternotificationsconsole.cpp
     llfloaternotificationstabbed.cpp
-    llfloateroutfitphotopreview.cpp 
     llfloaterobjectweights.cpp
     llfloateropenobject.cpp
     llfloatersimplesnapshot.cpp
@@ -935,7 +934,6 @@ set(viewer_HEADER_FILES
     llfloaternamedesc.h
     llfloaternotificationsconsole.h
     llfloaternotificationstabbed.h
-    llfloateroutfitphotopreview.h
     llfloaterobjectweights.h
     llfloateropenobject.h
     llfloatersimplesnapshot.h
diff --git a/indra/newview/llfloateroutfitphotopreview.cpp b/indra/newview/llfloateroutfitphotopreview.cpp
deleted file mode 100644
index ade258aef7..0000000000
--- a/indra/newview/llfloateroutfitphotopreview.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/** 
- * @file llfloateroutfitphotopreview.cpp
- * @brief LLFloaterOutfitPhotoPreview class implementation
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llwindow.h"
-
-#include "llfloateroutfitphotopreview.h"
-
-#include "llagent.h"
-#include "llappearancemgr.h"
-#include "llbutton.h"
-#include "llcombobox.h"
-#include "llfilepicker.h"
-#include "llfloaterreg.h"
-#include "llimagetga.h"
-#include "llimagepng.h"
-#include "llinventory.h"
-#include "llinventorymodel.h"
-#include "llnotificationsutil.h"
-#include "llresmgr.h"
-#include "lltrans.h"
-#include "lltextbox.h"
-#include "lltextureview.h"
-#include "llui.h"
-#include "llviewerinventory.h"
-#include "llviewertexture.h"
-#include "llviewertexturelist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
-#include "lllineeditor.h"
-
-const S32 MAX_OUTFIT_PHOTO_WIDTH = 256;
-const S32 MAX_OUTFIT_PHOTO_HEIGHT = 256;
-
-const S32 CLIENT_RECT_VPAD = 4;
-
-LLFloaterOutfitPhotoPreview::LLFloaterOutfitPhotoPreview(const LLSD& key)
-	: LLPreview(key),
-	  mUpdateDimensions(TRUE),
-	  mImage(NULL),
-	  mOutfitID(LLUUID()),
-	  mImageOldBoostLevel(LLGLTexture::BOOST_NONE),
-	  mExceedLimits(FALSE)
-{
-	updateImageID();
-}
-
-LLFloaterOutfitPhotoPreview::~LLFloaterOutfitPhotoPreview()
-{
-	LLLoadedCallbackEntry::cleanUpCallbackList(&mCallbackTextureList) ;
-
-	if (mImage.notNull())
-	{
-		mImage->setBoostLevel(mImageOldBoostLevel);
-		mImage = NULL;
-	}
-}
-
-// virtual
-BOOL LLFloaterOutfitPhotoPreview::postBuild()
-{
-	getChild<LLButton>("ok_btn")->setClickedCallback(boost::bind(&LLFloaterOutfitPhotoPreview::onOkBtn, this));
-	getChild<LLButton>("cancel_btn")->setClickedCallback(boost::bind(&LLFloaterOutfitPhotoPreview::onCancelBtn, this));
-
-	return LLPreview::postBuild();
-}
-
-void LLFloaterOutfitPhotoPreview::draw()
-{
-	updateDimensions();
-	
-	LLPreview::draw();
-
-	if (!isMinimized())
-	{
-		LLGLSUIDefault gls_ui;
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		
-		const LLRect& border = mClientRect;
-		LLRect interior = mClientRect;
-		interior.stretch( -PREVIEW_BORDER_WIDTH );
-
-		// ...border
-		gl_rect_2d( border, LLColor4(0.f, 0.f, 0.f, 1.f));
-		gl_rect_2d_checkerboard( interior );
-
-		if ( mImage.notNull() )
-		{
-			// Draw the texture
-			gGL.diffuseColor3f( 1.f, 1.f, 1.f );
-			gl_draw_scaled_image(interior.mLeft,
-								interior.mBottom,
-								interior.getWidth(),
-								interior.getHeight(),
-								mImage);
-
-			// Pump the texture priority
-			F32 pixel_area = (F32)(interior.getWidth() * interior.getHeight() );
-			mImage->addTextureStats( pixel_area );
-
-			S32 int_width = interior.getWidth();
-			S32 int_height = interior.getHeight();
-			mImage->setKnownDrawSize(int_width, int_height);
-		}
-	} 
-
-}
-
-// virtual
-void LLFloaterOutfitPhotoPreview::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
-	LLPreview::reshape(width, height, called_from_parent);
-
-	LLRect dim_rect(getChildView("dimensions")->getRect());
-
-	S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
-
-	S32 info_height = dim_rect.mTop + CLIENT_RECT_VPAD;
-
-	LLRect client_rect(horiz_pad, getRect().getHeight(), getRect().getWidth() - horiz_pad, 0);
-	client_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
-	client_rect.mBottom += PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height ;
-
-	S32 client_width = client_rect.getWidth();
-	S32 client_height = client_width;
-
-	if(client_height > client_rect.getHeight())
-	{
-		client_height = client_rect.getHeight();
-		client_width = client_height;
-	}
-	mClientRect.setLeftTopAndSize(client_rect.getCenterX() - (client_width / 2), client_rect.getCenterY() +  (client_height / 2), client_width, client_height);
-
-}
-
-
-void LLFloaterOutfitPhotoPreview::updateDimensions()
-{
-	if (!mImage)
-	{
-		return;
-	}
-	if ((mImage->getFullWidth() * mImage->getFullHeight()) == 0)
-	{
-		return;
-	}
-
-	if (mAssetStatus != PREVIEW_ASSET_LOADED)
-	{
-		mAssetStatus = PREVIEW_ASSET_LOADED;
-		mUpdateDimensions = TRUE;
-	}
-	
-	getChild<LLUICtrl>("dimensions")->setTextArg("[WIDTH]",  llformat("%d", mImage->getFullWidth()));
-	getChild<LLUICtrl>("dimensions")->setTextArg("[HEIGHT]", llformat("%d", mImage->getFullHeight()));
-
-	if ((mImage->getFullWidth() <= MAX_OUTFIT_PHOTO_WIDTH) && (mImage->getFullHeight() <= MAX_OUTFIT_PHOTO_HEIGHT))
-	{
-		getChild<LLButton>("ok_btn")->setEnabled(TRUE);
-		mExceedLimits = FALSE;
-	}
-	else
-	{
-		mExceedLimits = TRUE;
-		LLStringUtil::format_map_t args;
-		args["MAX_WIDTH"] = llformat("%d", MAX_OUTFIT_PHOTO_WIDTH);
-		args["MAX_HEIGHT"] = llformat("%d", MAX_OUTFIT_PHOTO_HEIGHT);
-		std::string label = getString("exceed_limits", args);
-		getChild<LLUICtrl>("notification")->setValue(label);
-		getChild<LLUICtrl>("notification")->setColor(LLColor4::yellow);
-		getChild<LLButton>("ok_btn")->setEnabled(FALSE);
-	}
-
-	if (mUpdateDimensions)
-	{
-		mUpdateDimensions = FALSE;
-
-		reshape(getRect().getWidth(), getRect().getHeight());
-		gFloaterView->adjustToFitScreen(this, FALSE);
-	}
-}
-
-void LLFloaterOutfitPhotoPreview::loadAsset()
-{
-	if (mImage.notNull())
-	{
-		mImage->setBoostLevel(mImageOldBoostLevel);
-	}
-	mImage = LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, MIPMAP_TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-	mImageOldBoostLevel = mImage->getBoostLevel();
-	mImage->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
-	mImage->forceToSaveRawImage(0) ;
-	mAssetStatus = PREVIEW_ASSET_LOADING;
-	mUpdateDimensions = TRUE;
-	updateDimensions();
-}
-
-LLPreview::EAssetStatus LLFloaterOutfitPhotoPreview::getAssetStatus()
-{
-	if (mImage.notNull() && (mImage->getFullWidth() * mImage->getFullHeight() > 0))
-	{
-		mAssetStatus = PREVIEW_ASSET_LOADED;
-	}
-	return mAssetStatus;
-}
-
-void LLFloaterOutfitPhotoPreview::updateImageID()
-{
-	const LLViewerInventoryItem *item = static_cast<const LLViewerInventoryItem*>(getItem());
-	if(item)
-	{
-		mImageID = item->getAssetUUID();
-	}
-	else
-	{
-		mImageID = mItemUUID;
-	}
-
-}
-
-/* virtual */
-void LLFloaterOutfitPhotoPreview::setObjectID(const LLUUID& object_id)
-{
-	mObjectUUID = object_id;
-
-	const LLUUID old_image_id = mImageID;
-
-	updateImageID();
-	if (mImageID != old_image_id)
-	{
-		mAssetStatus = PREVIEW_ASSET_UNLOADED;
-		loadAsset();
-	}
-	refreshFromItem();
-}
-
-void LLFloaterOutfitPhotoPreview::setOutfitID(const LLUUID& outfit_id)
-{
-	mOutfitID = outfit_id;
-	LLViewerInventoryCategory* outfit_folder = gInventory.getCategory(mOutfitID);
-	if(outfit_folder && !mExceedLimits)
-	{
-		getChild<LLUICtrl>("notification")->setValue( getString("photo_confirmation"));
-		getChild<LLUICtrl>("notification")->setTextArg("[OUTFIT]", outfit_folder->getName());
-		getChild<LLUICtrl>("notification")->setColor(LLColor4::white);
-	}
-
-}
-
-void LLFloaterOutfitPhotoPreview::onOkBtn()
-{
-	if(mOutfitID.notNull() && getItem())
-	{
-		LLAppearanceMgr::instance().removeOutfitPhoto(mOutfitID);
-		LLPointer<LLInventoryCallback> cb = NULL;
-		link_inventory_object(mOutfitID, LLConstPointer<LLInventoryObject>(getItem()), cb);
-	}
-	closeFloater();
-}
-
-void LLFloaterOutfitPhotoPreview::onCancelBtn()
-{
-	closeFloater();
-}
diff --git a/indra/newview/llfloateroutfitphotopreview.h b/indra/newview/llfloateroutfitphotopreview.h
deleted file mode 100644
index a1e7b58abe..0000000000
--- a/indra/newview/llfloateroutfitphotopreview.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/** 
- * @file llfloateroutfitphotopreview.h
- * @brief LLFloaterOutfitPhotoPreview class definition
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATEROUTFITPHOTOPREVIEW_H
-#define LL_LLFLOATEROUTFITPHOTOPREVIEW_H
-
-#include "llpreview.h"
-#include "llbutton.h"
-#include "llframetimer.h"
-#include "llviewertexture.h"
-
-class LLComboBox;
-class LLImageRaw;
-
-class LLFloaterOutfitPhotoPreview : public LLPreview
-{
-public:
-	LLFloaterOutfitPhotoPreview(const LLSD& key);
-	~LLFloaterOutfitPhotoPreview();
-
-	virtual void		draw();
-
-	virtual void		loadAsset();
-	virtual EAssetStatus	getAssetStatus();
-	
-	virtual void		reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-
-	/*virtual*/ void setObjectID(const LLUUID& object_id);
-
-	void setOutfitID(const LLUUID& outfit_id);
-	void onOkBtn();
-	void onCancelBtn();
-
-protected:
-	void				init();
-	/* virtual */ BOOL	postBuild();
-	
-private:
-	void				updateImageID(); // set what image is being uploaded.
-	void				updateDimensions();
-	LLUUID				mImageID;
-	LLUUID				mOutfitID;
-	LLPointer<LLViewerFetchedTexture>		mImage;
-	S32                 mImageOldBoostLevel;
-
-	// This is stored off in a member variable, because the save-as
-	// button and drag and drop functionality need to know.
-	BOOL mUpdateDimensions;
-
-	BOOL mExceedLimits;
-
-	LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ;
-};
-#endif  // LL_LLFLOATEROUTFITPHOTOPREVIEW_H
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 41aa11628f..24cbc28359 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -41,7 +41,6 @@
 #include "llfloateropenobject.h"
 #include "llfloaterreg.h"
 #include "llfloatermarketplacelistings.h"
-#include "llfloateroutfitphotopreview.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llsidepanelinventory.h"
 #include "llfloaterworldmap.h"
@@ -4896,11 +4895,8 @@ void LLFolderBridge::dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_c
 		const LLUUID &my_outifts_id = getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 		if(mUUID != my_outifts_id)
 		{
-			LLFloaterOutfitPhotoPreview* photo_preview  = LLFloaterReg::showTypedInstance<LLFloaterOutfitPhotoPreview>("outfit_photo_preview", inv_item->getUUID());
-			if(photo_preview)
-			{
-				photo_preview->setOutfitID(mUUID);
-			}
+            // Legacy: prior to thumbnails images in outfits were used for outfit gallery.
+            LLNotificationsUtil::add("ThumbnailOutfitPhoto");
 		}
 		return;
 	}
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 36cfefdbb2..837742bf5a 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -104,7 +104,6 @@
 #include "llfloaternotificationstabbed.h"
 #include "llfloaterobjectweights.h"
 #include "llfloateropenobject.h"
-#include "llfloateroutfitphotopreview.h"
 #include "llfloatersimplesnapshot.h"
 #include "llfloaterpathfindingcharacters.h"
 #include "llfloaterpathfindingconsole.h"
@@ -409,7 +408,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("object_weights", "floater_object_weights.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterObjectWeights>);
 	LLFloaterReg::add("openobject", "floater_openobject.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterOpenObject>);
 	LLFloaterReg::add("outgoing_call", "floater_outgoing_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLOutgoingCallDialog>);
-	LLFloaterReg::add("outfit_photo_preview", "floater_outfit_photo_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterOutfitPhotoPreview>);
 	LLFloaterPayUtil::registerFloater();
 
 	LLFloaterReg::add("pathfinding_characters", "floater_pathfinding_characters.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingCharacters>);
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
deleted file mode 100644
index bfc1c39e9d..0000000000
--- a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="false"
- height="325"
- layout="topleft"
- name="outfit_photo_preview"
- help_topic="preview_texture"
- width="410">
-   <floater.string
-     name="Title">
-        Texture: [NAME]
-    </floater.string>
-    <floater.string
-     name="exceed_limits">
-        Max outfit photo size is [MAX_WIDTH]*[MAX_HEIGHT]. Please select another texture.
-    </floater.string>
-    <floater.string
-     name="photo_confirmation">
-         Set this as Outfit Photo for [OUTFIT]?
-    </floater.string>
-    <text
-     type="string"
-     halign="right"
-     length="1"
-     follows="right|bottom"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="dimensions"
-     top="255"
-     width="200">
-        [WIDTH]px x [HEIGHT]px
-    </text>
-    <text
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     name="notification"
-     left="25"
-     halign="center"
-     top_pad="5"
-     width="360">
-    </text>
-    <button
-     follows="right|bottom"
-     height="22"
-     label="OK"
-     layout="topleft"
-     name="ok_btn"
-     top_pad="5"
-     right="-115"
-     top_delta="0"
-     width="90" />
-    <button
-     follows="right|bottom"
-     height="22"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     right="-20"
-     top_delta="0"
-     width="90" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 73ce5a6096..e6f670aa39 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6154,6 +6154,17 @@ Are you sure you want to delete them?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailOutfitPhoto"
+   type="alertmodal">
+    <unique/>
+    To add an image to an outfit, use the Outfit Gallery window, or right-click on the outfit folder and select "Image..."
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
-- 
cgit v1.2.3


From e161b128c7eac6df63b6d9210f3bca6c3cbc77ea Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 30 Mar 2023 02:36:14 +0300
Subject: SL-19379 WIP one more batch of context menu items

---
 indra/newview/llinventorygallerymenu.cpp | 54 ++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 11dd5e6690..a501f02e00 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -42,6 +42,7 @@
 #include "llnotificationsutil.h"
 #include "llviewerfoldertype.h"
 #include "llviewerwindow.h"
+#include "llvoavatarself.h"
 
 LLContextMenu* LLInventoryGalleryContextMenu::createMenu()
 {
@@ -276,6 +277,18 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     {
         ungroup_folder_items(selected_id);
     }
+    else if ("take_off" == action || "detach" == action)
+    {
+        LLAppearanceMgr::instance().removeItemFromAvatar(selected_id);
+    }
+    else if ("wear_add" == action)
+    {
+        LLAppearanceMgr::instance().wearItemOnAvatar(selected_id, true, false); // Don't replace if adding.
+    }
+    else if ("wear" == action)
+    {
+        LLAppearanceMgr::instance().wearItemOnAvatar(selected_id, true, true);
+    }
 }
 
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
@@ -564,6 +577,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                && obj->getType() != LLAssetType::AT_OBJECT
                && obj->getType() != LLAssetType::AT_CLOTHING
                && obj->getType() != LLAssetType::AT_CATEGORY
+               && obj->getType() != LLAssetType::AT_LANDMARK
                && obj->getType() != LLAssetType::AT_BODYPART))
         {
             bool can_open = !LLAssetType::lookupIsLinkType(obj->getType());
@@ -585,6 +599,46 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
         {
             items.push_back(std::string("Landmark Open"));
         }
+        else if (obj->getType() == LLAssetType::AT_OBJECT || obj->getType() == LLAssetType::AT_CLOTHING || obj->getType() == LLAssetType::AT_BODYPART)
+        {
+            items.push_back(std::string("Wearable And Object Separator"));
+            if(obj->getType() == LLAssetType::AT_CLOTHING)
+            {
+                items.push_back(std::string("Take Off"));
+            }
+            if(get_is_item_worn(selected_id))
+            {
+                if(obj->getType() == LLAssetType::AT_OBJECT)
+                {
+                    items.push_back(std::string("Detach From Yourself"));
+                }
+                disabled_items.push_back(std::string("Wearable And Object Wear"));
+                disabled_items.push_back(std::string("Wearable Add"));
+            }
+            else
+            {
+                if(obj->getType() == LLAssetType::AT_OBJECT)
+                {
+                    items.push_back(std::string("Wearable Add"));
+                }
+                items.push_back(std::string("Wearable And Object Wear"));
+                disabled_items.push_back(std::string("Take Off"));
+            }
+
+            if (!gAgentAvatarp->canAttachMoreObjects() && (obj->getType() == LLAssetType::AT_OBJECT))
+            {
+                disabled_items.push_back(std::string("Wearable And Object Wear"));
+                disabled_items.push_back(std::string("Wearable Add"));
+            }
+            if (selected_item && (obj->getType() != LLAssetType::AT_OBJECT) && LLWearableType::getInstance()->getAllowMultiwear(selected_item->getWearableType()))
+            {
+                items.push_back(std::string("Wearable Add"));
+                if (!gAgentWearables.canAddWearable(selected_item->getWearableType()))
+                {
+                    disabled_items.push_back(std::string("Wearable Add"));
+                }
+            }
+        }
         if (is_link)
         {
             items.push_back(std::string("Find Original"));
-- 
cgit v1.2.3


From c15ee792a7248cf141abb3ae6a26b33a5aca1ed7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 30 Mar 2023 15:04:49 +0300
Subject: SL-19379 WIP allow hide link items in search result

---
 indra/newview/llinventorygallery.cpp               | 22 +++++++++++++++++++++-
 indra/newview/llinventorygallery.h                 |  5 +++++
 indra/newview/llpanelmaininventory.cpp             | 18 ++++++++++++++++--
 .../newview/skins/default/xui/en/notifications.xml |  3 ++-
 .../xui/en/panel_inventory_gallery_item.xml        |  2 +-
 5 files changed, 45 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index ad4124ff5b..0fc7816f59 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -84,7 +84,8 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mRowPanWidthFactor(p.row_panel_width_factor),
       mGalleryWidthFactor(p.gallery_width_factor),
       mIsInitialized(false),
-      mSearchType(LLInventoryFilter::SEARCHTYPE_NAME)
+      mSearchType(LLInventoryFilter::SEARCHTYPE_NAME),
+      mSearchLinks(true)
 {
     updateGalleryWidth();
 
@@ -561,6 +562,11 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
     if (!item) return;
 
     std::string desc;
+    if(!mSearchLinks && item->isLink())
+    {
+        item->setHidden(true);
+        return;
+    }
 
     switch(mSearchType)
     {
@@ -593,6 +599,18 @@ void LLInventoryGallery::setSearchType(LLInventoryFilter::ESearchType type)
     if(mSearchType != type)
     {
         mSearchType = type;
+        if(!mFilterSubString.empty())
+        {
+            reArrangeRows();
+        }
+    }
+}
+
+void LLInventoryGallery::toggleSearchLinks()
+{
+    mSearchLinks = !mSearchLinks;
+    if(!mFilterSubString.empty())
+    {
         reArrangeRows();
     }
 }
@@ -940,6 +958,7 @@ LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
     mName(""),
     mUUID(LLUUID()),
     mIsFolder(true),
+    mIsLink(false),
     mGallery(NULL),
     mType(LLAssetType::AT_NONE),
     mSortGroup(SG_ITEM)
@@ -964,6 +983,7 @@ void LLInventoryGalleryItem::setType(LLAssetType::EType type, LLInventoryType::E
 {
     mType = type;
     mIsFolder = (mType == LLAssetType::AT_CATEGORY);
+    mIsLink = is_link;
 
     std::string icon_name = LLInventoryIcon::getIconName(mType, inventory_type, flags);
     if(mIsFolder)
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 9d1a277c65..02e706eecd 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -111,6 +111,8 @@ public:
 
     void setSearchType(LLInventoryFilter::ESearchType type);
     LLInventoryFilter::ESearchType getSearchType() { return mSearchType; }
+    void toggleSearchLinks();
+    bool getSearchLinks(){ return mSearchLinks; }
 
 protected:
 
@@ -187,6 +189,7 @@ private:
     std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
 
     LLInventoryFilter::ESearchType mSearchType;
+    bool mSearchLinks;
 };
 
 class LLInventoryGalleryItem : public LLPanel
@@ -241,6 +244,7 @@ public:
     void setThumbnail(LLUUID id);
     void setGallery(LLInventoryGallery* gallery) { mGallery = gallery; }
     bool isFolder() { return mIsFolder; }
+    bool isLink() { return mIsLink; }
     EInventorySortGroup getSortGroup() { return mSortGroup; }
     
 private:
@@ -251,6 +255,7 @@ private:
     bool     mDefaultImage;
     bool     mHidden;
     bool     mIsFolder;
+    bool     mIsLink;
 
     std::string mAssetIDStr;
     std::string mDesc;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index c40c5930c4..cc2c17d17d 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1723,7 +1723,14 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 
 	if (command_name == "include_links")
 	{
-		mActivePanel->getFilter().toggleSearchVisibilityLinks();
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            mInventoryGalleryPanel->toggleSearchLinks();
+        }
+        else
+        {
+            mActivePanel->getFilter().toggleSearchVisibilityLinks();
+        }
 	}
 
     if (command_name == "list_view")
@@ -1911,7 +1918,14 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 
 	if (command_name == "include_links")
 	{
-		return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) != 0;	
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            return mInventoryGalleryPanel->getSearchLinks();
+        }
+        else
+        {
+            return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) != 0;
+        }
 	}	
 
     if (command_name == "list_view")
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e6f670aa39..e8a19d3f1f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3252,7 +3252,8 @@ See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
    label="Rename Selected Item"
    name="RenameItem"
    type="alertmodal">
-    Choose a new name for [NAME]
+    Choose a new name for:
+[NAME]
    <tag>confirm</tag>
     <form name="form">
     <input name="new_name" type="text" width="300">
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 1d216df094..281604503f 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -65,7 +65,7 @@
       name="item_name"
       parse_urls="false"
       top="2"
-      width="130"
+      width="127"
       use_ellipses="true">
       Item name, folder name.
     </text>
-- 
cgit v1.2.3


From ae3e3662159ca26db5b2efe36d91a9ccdfcec256 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 30 Mar 2023 21:39:43 +0300
Subject: SL-19379 WIP update gear menu with Gallery items

---
 indra/newview/llinventoryfunctions.cpp             |  30 ++++
 indra/newview/llinventoryfunctions.h               |   1 +
 indra/newview/llinventorygallery.h                 |   1 +
 indra/newview/llinventorygallerymenu.cpp           |  30 ----
 indra/newview/llpanelmaininventory.cpp             | 163 ++++++++++++++++-----
 indra/newview/llpanelmaininventory.h               |   5 +-
 .../default/xui/en/menu_inventory_gear_default.xml |   3 +-
 7 files changed, 168 insertions(+), 65 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index f24c2de714..7979ef209a 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -55,6 +55,7 @@
 #include "llfocusmgr.h"
 #include "llfolderview.h"
 #include "llgesturemgr.h"
+#include "llgiveinventory.h"
 #include "lliconctrl.h"
 #include "llimview.h"
 #include "llinventorybridge.h"
@@ -2219,6 +2220,35 @@ std::string get_searchable_UUID(LLInventoryModel* model, const LLUUID& item_id)
     }
     return LLStringUtil::null;
 }
+
+bool can_share_item(const LLUUID& item_id)
+{
+    bool can_share = false;
+
+    if (gInventory.isObjectDescendentOf(item_id, gInventory.getRootFolderID()))
+    {
+            const LLViewerInventoryItem *item = gInventory.getItem(item_id);
+            if (item)
+            {
+                if (LLInventoryCollectFunctor::itemTransferCommonlyAllowed(item))
+                {
+                    can_share = LLGiveInventory::isInventoryGiveAcceptable(item);
+                }
+            }
+            else
+            {
+                can_share = (gInventory.getCategory(item_id) != NULL);
+            }
+
+            const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+            if ((item_id == trash_id) || gInventory.isObjectDescendentOf(item_id, trash_id))
+            {
+                can_share = false;
+            }
+    }
+
+    return can_share;
+}
 ///----------------------------------------------------------------------------
 /// LLMarketplaceValidator implementations
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 5c4a325eca..1b0f598bf5 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -106,6 +106,7 @@ void ungroup_folder_items(const LLUUID& folder_id);
 std::string get_searchable_description(LLInventoryModel* model, const LLUUID& item_id);
 std::string get_searchable_creator_name(LLInventoryModel* model, const LLUUID& item_id);
 std::string get_searchable_UUID(LLInventoryModel* model, const LLUUID& item_id);
+bool can_share_item(const LLUUID& item_id);
 
 /**                    Miscellaneous global functions
  **                                                                            **
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 02e706eecd..c53640d0ff 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -108,6 +108,7 @@ public:
     void deselectItem(const LLUUID& category_id);
     void signalSelectionItemID(const LLUUID& category_id);
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
+    LLUUID getSelectedItemID() { return mSelectedItemID; }
 
     void setSearchType(LLInventoryFilter::ESearchType type);
     LLInventoryFilter::ESearchType getSearchType() { return mSearchType; }
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index a501f02e00..21f7b06534 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -33,7 +33,6 @@
 #include "llavataractions.h"
 #include "llclipboard.h"
 #include "llfloaterreg.h"
-#include "llgiveinventory.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
@@ -342,35 +341,6 @@ void LLInventoryGalleryContextMenu::fileUploadLocation(const LLSD& userdata, con
     }
 }
 
-bool can_share_item(LLUUID item_id)
-{
-    bool can_share = false;
-
-    if (gInventory.isObjectDescendentOf(item_id, gInventory.getRootFolderID()))
-    {
-            const LLViewerInventoryItem *item = gInventory.getItem(item_id);
-            if (item)
-            {
-                if (LLInventoryCollectFunctor::itemTransferCommonlyAllowed(item))
-                {
-                    can_share = LLGiveInventory::isInventoryGiveAcceptable(item);
-                }
-            }
-            else
-            {
-                can_share = (gInventory.getCategory(item_id) != NULL);
-            }
-
-            const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-            if ((item_id == trash_id) || gInventory.isObjectDescendentOf(item_id, trash_id))
-            {
-                can_share = false;
-            }
-    }
-
-    return can_share;
-}
-
 bool is_inbox_folder(LLUUID item_id)
 {
     const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index cc2c17d17d..e55d1f19f4 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -130,7 +130,6 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	mCommitCallbackRegistrar.add("Inventory.ShowFilters", boost::bind(&LLPanelMainInventory::toggleFindOptions, this));
 	mCommitCallbackRegistrar.add("Inventory.ResetFilters", boost::bind(&LLPanelMainInventory::resetFilters, this));
 	mCommitCallbackRegistrar.add("Inventory.SetSortBy", boost::bind(&LLPanelMainInventory::setSortBy, this, _2));
-	mCommitCallbackRegistrar.add("Inventory.Share",  boost::bind(&LLAvatarActions::shareWithAvatars, this));
 
     mEnableCallbackRegistrar.add("Inventory.EnvironmentEnabled", [](LLUICtrl *, const LLSD &) { return LLPanelMainInventory::hasSettingsInventory(); });
 
@@ -416,14 +415,15 @@ S32 get_instance_num()
     return instance_num;
 }
 
-void LLPanelMainInventory::newWindow()
+LLFloaterSidePanelContainer* LLPanelMainInventory::newWindow()
 {
     S32 instance_num = get_instance_num();
 
 	if (!gAgentCamera.cameraMouselook())
 	{
-		LLFloaterReg::showTypedInstance<LLFloaterSidePanelContainer>("inventory", LLSD(instance_num));
+		return LLFloaterReg::showTypedInstance<LLFloaterSidePanelContainer>("inventory", LLSD(instance_num));
 	}
+    return NULL;
 }
 
 //static
@@ -527,6 +527,17 @@ void LLPanelMainInventory::resetAllItemsFilters()
     setFilterTextFromFilter();
 }
 
+void LLPanelMainInventory::findLinks(const LLUUID& item_id, const std::string& item_name)
+{
+    mFilterSubString = item_name;
+
+    LLInventoryFilter &filter = mActivePanel->getFilter();
+    filter.setFindAllLinksMode(item_name, item_id);
+
+    mFilterEditor->setText(item_name);
+    mFilterEditor->setFocus(TRUE);
+}
+
 void LLPanelMainInventory::setSortBy(const LLSD& userdata)
 {
 	U32 sort_order_mask = getActivePanel()->getSortOrder();
@@ -1556,13 +1567,22 @@ void LLPanelMainInventory::onClipboardAction(const LLSD& userdata)
 
 void LLPanelMainInventory::saveTexture(const LLSD& userdata)
 {
-	LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
-	if (!current_item)
-	{
-		return;
-	}
-	
-	const LLUUID& item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+    LLUUID item_id;
+    if(mSingleFolderMode && isGalleryViewMode())
+    {
+        item_id = mInventoryGalleryPanel->getSelectedItemID();
+        if (item_id.isNull()) return;
+    }
+    else
+    {
+        LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
+        if (!current_item)
+        {
+            return;
+        }
+        item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+    }
+
 	LLPreviewTexture* preview_texture = LLFloaterReg::showTypedInstance<LLPreviewTexture>("preview_texture", LLSD(item_id), TAKE_FOCUS_YES);
 	if (preview_texture)
 	{
@@ -1646,35 +1666,69 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 	}
 	if (command_name == "find_original")
 	{
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            LLInventoryObject *obj = gInventory.getObject(mInventoryGalleryPanel->getSelectedItemID());
+            if (obj && obj->getIsLinkType())
+            {
+                show_item_original(obj->getUUID());
+            }
+        }
+        else
+        {
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
 		if (!current_item)
 		{
 			return;
 		}
 		static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->performAction(getActivePanel()->getModel(), "goto");
+        }
 	}
 
 	if (command_name == "find_links")
 	{
-		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
-		if (!current_item)
-		{
-			return;
-		}
-		const LLUUID& item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
-		const std::string &item_name = current_item->getViewModelItem()->getName();
-		mFilterSubString = item_name;
-
-		LLInventoryFilter &filter = mActivePanel->getFilter();
-		filter.setFindAllLinksMode(item_name, item_id);
-
-		mFilterEditor->setText(item_name);
-		mFilterEditor->setFocus(TRUE);
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            LLFloaterSidePanelContainer* inventory_container = newWindow();
+            if (inventory_container)
+            {
+                LLSidepanelInventory* sidepanel_inventory = dynamic_cast<LLSidepanelInventory*>(inventory_container->findChild<LLPanel>("main_panel", true));
+                if (sidepanel_inventory)
+                {
+                    LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
+                    if (main_inventory)
+                    {
+                        LLInventoryObject *obj = gInventory.getObject(mInventoryGalleryPanel->getSelectedItemID());
+                        if (obj)
+                        {
+                            main_inventory->findLinks(obj->getUUID(), obj->getName());
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+            LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
+            if (!current_item)
+            {
+                return;
+            }
+            const LLUUID& item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+            const std::string &item_name = current_item->getViewModelItem()->getName();
+            findLinks(item_id, item_name);
+        }
 	}
 
 	if (command_name == "replace_links")
 	{
-		LLSD params;
+        LLSD params;
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            params = LLSD(mInventoryGalleryPanel->getSelectedItemID());
+        }
+        else
+        {
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
 		if (current_item)
 		{
@@ -1689,6 +1743,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 				}
 			}
 		}
+        }
 		LLFloaterReg::showInstance("linkreplace", params);
 	}
 
@@ -1733,6 +1788,19 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
         }
 	}
 
+    if (command_name == "share")
+    {
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            std::set<LLUUID> uuids{mInventoryGalleryPanel->getSelectedItemID()};
+            LLAvatarActions::shareWithAvatars(uuids, gFloaterView->getParentFloater(this));
+        }
+        else
+        {
+            LLAvatarActions::shareWithAvatars(this);
+        }
+    }
+
     if (command_name == "list_view")
     {
         setViewMode(MODE_LIST);
@@ -1758,17 +1826,26 @@ void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
 
 bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
 {
-	LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
-	if (current_item) 
-	{
-		LLViewerInventoryItem *inv_item = dynamic_cast<LLViewerInventoryItem*>(static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getInventoryObject());
+    LLViewerInventoryItem *inv_item = NULL;
+    if(mSingleFolderMode && isGalleryViewMode())
+    {
+        inv_item = gInventory.getItem(mInventoryGalleryPanel->getSelectedItemID());
+    }
+    else
+    {
+        LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
+        if (current_item)
+        {
+            inv_item = dynamic_cast<LLViewerInventoryItem*>(static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getInventoryObject());
+        }
+    }
 		if(inv_item)
 		{
 			bool can_save = inv_item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED);
-			LLInventoryType::EType curr_type = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getInventoryType();
+            LLInventoryType::EType curr_type = inv_item->getInventoryType();
 			return can_save && (curr_type == LLInventoryType::IT_TEXTURE || curr_type == LLInventoryType::IT_SNAPSHOT);
 		}
-	}
+
 	return false;
 }
 
@@ -1799,9 +1876,16 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 	}
 	if (command_name == "find_original")
 	{
+        LLUUID item_id;
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            item_id = mInventoryGalleryPanel->getSelectedItemID();
+        }
+        else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
 		if (!current_item) return FALSE;
-		const LLUUID& item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+        item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+        }
 		const LLViewerInventoryItem *item = gInventory.getItem(item_id);
 		if (item && item->getIsLinkType() && !item->getIsBrokenLink())
 		{
@@ -1812,12 +1896,19 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 
 	if (command_name == "find_links")
 	{
+        LLUUID item_id;
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            item_id = mInventoryGalleryPanel->getSelectedItemID();
+        }
+        else{
 		LLFolderView* root = getActivePanel()->getRootFolder();
 		std::set<LLFolderViewItem*> selection_set = root->getSelectionList();
 		if (selection_set.size() != 1) return FALSE;
 		LLFolderViewItem* current_item = root->getCurSelectedItem();
 		if (!current_item) return FALSE;
-		const LLUUID& item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+		item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
+        }
 		const LLInventoryObject *obj = gInventory.getObject(item_id);
 		if (obj && !obj->getIsLinkType() && LLAssetType::lookupCanLink(obj->getType()))
 		{
@@ -1841,10 +1932,16 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 
 	if (command_name == "share")
 	{
+        if(mSingleFolderMode && isGalleryViewMode())
+        {
+            return can_share_item(mInventoryGalleryPanel->getSelectedItemID());
+        }
+        else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
 		if (!current_item) return FALSE;
 		LLSidepanelInventory* parent = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
 		return parent ? parent->canShare() : FALSE;
+        }
 	}
 	if (command_name == "empty_trash")
 	{
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index d41b0a094a..bd51830ebb 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -48,6 +48,7 @@ class LLMenuGL;
 class LLSidepanelInventory;
 class LLToggleableMenu;
 class LLFloater;
+class LLFloaterSidePanelContainer;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLPanelMainInventory
@@ -101,7 +102,7 @@ public:
 
 	void setFocusFilterEditor();
 
-	static void newWindow();
+	static LLFloaterSidePanelContainer* newWindow();
     static void newFolderWindow(LLUUID folder_id = LLUUID(), LLUUID item_to_select = LLUUID());
 
 	void toggleFindOptions();
@@ -109,6 +110,8 @@ public:
     void resetFilters();
     void resetAllItemsFilters();
 
+    void findLinks(const LLUUID& item_id, const std::string& item_name);
+
     void onViewModeClick();
     void toggleViewMode();
     void onUpFolderClicked();
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 5032505487..2c630880c2 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -69,7 +69,8 @@
      name="Share"
      visible="true">
      <on_click
-         function="Inventory.Share" />
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="share" />
      <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="share" />
-- 
cgit v1.2.3


From 16712d2437f58159153d951639a9ac9bc1e8509a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 30 Mar 2023 23:35:54 +0300
Subject: SL-19493 Fix inventory log spam

---
 indra/llmessage/llcoproceduremanager.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index be014e7b1e..e6ef2cd08c 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -361,7 +361,26 @@ LLUUID LLCoprocedurePool::enqueueCoprocedure(const std::string &name, LLCoproced
 {
     LLUUID id(LLUUID::generateNewID());
 
-    LL_INFOS("CoProcMgr") << "Coprocedure(" << name << ") enqueuing with id=" << id.asString() << " in pool \"" << mPoolName << "\" at " << mPending << LL_ENDL;
+    if (mPoolName == "AIS")
+    {
+        // Fetch is going to be spammy.
+        LL_DEBUGS("CoProcMgr", "Inventory") << "Coprocedure(" << name << ") enqueuing with id=" << id.asString() << " in pool \"" << mPoolName
+                                   << "\" at "
+                              << mPending << LL_ENDL;
+
+        if (mPending >= (LLCoprocedureManager::DEFAULT_QUEUE_SIZE - 1))
+        {
+            // If it's all used up (not supposed to happen,
+            // fetched should cap it), we are going to crash
+            LL_WARNS("CoProcMgr", "Inventory") << "About to run out of queue space for Coprocedure(" << name
+                                               << ") enqueuing with id=" << id.asString() << " Already pending:" << mPending << LL_ENDL;
+        }
+    }
+    else
+    {
+        LL_INFOS("CoProcMgr") << "Coprocedure(" << name << ") enqueuing with id=" << id.asString() << " in pool \"" << mPoolName << "\" at "
+                              << mPending << LL_ENDL;
+    }
     auto pushed = mPendingCoprocs->try_push(boost::make_shared<QueuedCoproc>(name, id, proc));
     if (pushed == boost::fibers::channel_op_status::success)
     {
-- 
cgit v1.2.3


From a2ef7c807659046d7201487029a969d396eea89d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 01:19:58 +0300
Subject: SL-18672 Update handling of login skeleton to handle new fields

---
 indra/newview/llinventorymodel.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 360cc44d48..80f16a854b 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -2600,6 +2600,12 @@ bool LLInventoryModel::loadSkeleton(
 			cat->setUUID(folder_id.asUUID());
 			cat->setParent(parent_id.asUUID());
 
+            LLSD thumbnail = (*it)["thumbnail"];
+            if (thumbnail.isMap())
+            {
+                cat->setThumbnailUUID(thumbnail["asset_id"].asUUID());
+            }
+
 			LLFolderType::EType preferred_type = LLFolderType::FT_NONE;
 			LLSD type_default = (*it)["type_default"];
 			if(type_default.isDefined())
-- 
cgit v1.2.3


From a77cdfdbba1eb557f204721c2cf8f875e1c34bc1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 01:20:39 +0300
Subject: SL-19495 Marketplace listings do not load in marketplace floater

---
 indra/newview/llfloatermarketplacelistings.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 70c0d2aafd..df5347718c 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -511,7 +511,6 @@ void LLFloaterMarketplaceListings::setRootFolder()
     }
     
     mRootFolderId = marketplacelistings_id;
-    mRootFolderCreating = true;
 }
 
 void LLFloaterMarketplaceListings::setPanels()
-- 
cgit v1.2.3


From 81d69cf84decb84bb7d65057063a19cb6c9fa6f5 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 13:40:59 +0300
Subject: SL-19379 WIP add worn suffix, use bold font style for worn items and
 italic for links

---
 indra/llrender/llfontgl.cpp                        | 14 ++++
 indra/llrender/llfontgl.h                          |  2 +
 indra/newview/llinventorygallery.cpp               | 87 +++++++++++++++++++++-
 indra/newview/llinventorygallery.h                 | 10 ++-
 indra/newview/lloutfitgallery.cpp                  |  7 --
 indra/newview/lloutfitgallery.h                    |  1 -
 .../xui/en/panel_inventory_gallery_item.xml        | 15 ++++
 7 files changed, 123 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 1bf061bc8d..022c307de7 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -1017,6 +1017,20 @@ LLFontGL* LLFontGL::getFontSansSerifSmall()
 	return fontp;
 }
 
+//static
+LLFontGL* LLFontGL::getFontSansSerifSmallBold()
+{
+    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Small",BOLD));
+    return fontp;
+}
+
+//static
+LLFontGL* LLFontGL::getFontSansSerifSmallItalic()
+{
+    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Small",ITALIC));
+    return fontp;
+}
+
 //static
 LLFontGL* LLFontGL::getFontSansSerif()
 {
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 3b58a37d33..9608b7ea91 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -189,6 +189,8 @@ public:
 		
 	static LLFontGL* getFontMonospace();
 	static LLFontGL* getFontSansSerifSmall();
+    static LLFontGL* getFontSansSerifSmallBold();
+    static LLFontGL* getFontSansSerifSmallItalic();
 	static LLFontGL* getFontSansSerif();
 	static LLFontGL* getFontSansSerifBig();
 	static LLFontGL* getFontSansSerifHuge();
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 0fc7816f59..8c49cd5a4b 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -243,6 +243,9 @@ void LLInventoryGallery::initGallery()
         }
         reArrangeRows();
         mGalleryCreated = true;
+
+        const LLUUID cof = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+        mCategoriesObserver->addCategory(cof, boost::bind(&LLInventoryGallery::onCOFChanged, this));
     }
 }
 
@@ -462,7 +465,7 @@ void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
     mItemPanels.pop_back();
 }
 
-LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link)
+LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link, bool is_worn)
 {
     LLInventoryGalleryItem::Params giparams;
     LLInventoryGalleryItem* gitem = LLUICtrlFactory::create<LLInventoryGalleryItem>(giparams);
@@ -475,6 +478,7 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     gitem->setGallery(this);
     gitem->setType(type, inventory_type, flags, is_link);
     gitem->setThumbnail(thumbnail_id);
+    gitem->setWorn(is_worn);
     gitem->setCreatorName(get_searchable_creator_name(&gInventory, item_id));
     gitem->setDescription(get_searchable_description(&gInventory, item_id));
     gitem->setAssetIDStr(get_searchable_UUID(&gInventory, item_id));
@@ -641,6 +645,7 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     LLUUID thumbnail_id = obj->getThumbnailUUID();;
     LLInventoryType::EType inventory_type(LLInventoryType::IT_CATEGORY);
     U32 misc_flags = 0;
+    bool is_worn = false;
     if (LLAssetType::AT_CATEGORY == obj->getType())
     {
         name = get_localized_folder_name(item_id);
@@ -656,10 +661,11 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
         {
             inventory_type = inv_item->getInventoryType();
             misc_flags = inv_item->getFlags();
+            is_worn = LLAppearanceMgr::instance().isLinkedInCOF(item_id);
         }
     }
-    
-    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType());
+
+    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::onChangeItemSelection, this, item_id));
@@ -712,6 +718,19 @@ void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
     }
 }
 
+void LLInventoryGallery::updateWornItem(LLUUID item_id, bool is_worn)
+{
+    gallery_item_map_t::iterator iter = mItemMap.find(item_id);
+    if (iter != mItemMap.end())
+    {
+        LLInventoryGalleryItem* item = iter->second;
+        if (item)
+        {
+            item->setWorn(is_worn);
+        }
+    }
+}
+
 void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
 {
     LLInventoryObject* obj = gInventory.getObject(item_id);
@@ -836,6 +855,46 @@ void LLInventoryGallery::computeDifference(
     LLCommonUtils::computeDifference(vnew, vcur, vadded, vremoved);
 }
 
+void LLInventoryGallery::onCOFChanged()
+{
+    LLInventoryModel::cat_array_t cat_array;
+    LLInventoryModel::item_array_t item_array;
+
+    gInventory.collectDescendents(
+        LLAppearanceMgr::instance().getCOF(),
+        cat_array,
+        item_array,
+        LLInventoryModel::EXCLUDE_TRASH);
+
+    uuid_vec_t vnew;
+    uuid_vec_t vadded;
+    uuid_vec_t vremoved;
+
+    for (LLInventoryModel::item_array_t::const_iterator iter = item_array.begin();
+        iter != item_array.end();
+        ++iter)
+    {
+        vnew.push_back((*iter)->getLinkedUUID());
+    }
+
+    // We need to update only items that were added or removed from COF.
+    LLCommonUtils::computeDifference(vnew, mCOFLinkedItems, vadded, vremoved);
+
+    mCOFLinkedItems = vnew;
+    
+    for (uuid_vec_t::const_iterator iter = vadded.begin();
+        iter != vadded.end();
+        ++iter)
+    {
+        updateWornItem(*iter, true);
+    }
+
+    for (uuid_vec_t::const_iterator iter = vremoved.begin(); iter != vremoved.end(); ++iter)
+    {
+        updateWornItem(*iter, false);
+    }
+}
+
 void LLInventoryGallery::deselectItem(const LLUUID& category_id)
 {
     // Reset selection if the item is selected.
@@ -973,6 +1032,7 @@ LLInventoryGalleryItem::~LLInventoryGalleryItem()
 BOOL LLInventoryGalleryItem::postBuild()
 {
     mNameText = getChild<LLTextBox>("item_name");
+    mSuffixText = getChild<LLTextBox>("suffix_text");
 
     mTextBgPanel = getChild<LLPanel>("text_bg_panel");
     mHidden = false;
@@ -1036,9 +1096,10 @@ void LLInventoryGalleryItem::draw()
 
 void LLInventoryGalleryItem::setName(std::string name)
 {
+    mName = name;
+    mNameText->setFont(getTextFont());
     mNameText->setText(name);
     mNameText->setToolTip(name);
-    mName = name;
 }
 
 void LLInventoryGalleryItem::setSelected(bool value)
@@ -1137,6 +1198,24 @@ BOOL LLInventoryGalleryItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL dro
     return baseHandleDragAndDrop(mUUID, drop, cargo_type, cargo_data, accept, tooltip_msg);
 }
 
+void LLInventoryGalleryItem::setWorn(bool value)
+{
+    mWorn = value;
+    mSuffixText->setValue(mWorn ? getString("worn_string") : "");
+
+    mNameText->setFont(getTextFont());
+    mNameText->setText(mName); // refresh to pick up font changes
+}
+
+LLFontGL* LLInventoryGalleryItem::getTextFont()
+{
+    if(mWorn)
+    {
+        return LLFontGL::getFontSansSerifSmallBold();
+    }
+    return mIsLink ? LLFontGL::getFontSansSerifSmallItalic() : LLFontGL::getFontSansSerifSmall();
+}
+
 //-----------------------------
 // Helper drag&drop functions
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index c53640d0ff..036817de93 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -81,6 +81,7 @@ public:
     void updateRemovedItem(LLUUID item_id);
     void updateChangedItemName(LLUUID item_id, std::string name);
     void updateItemThumbnail(LLUUID item_id);
+    void updateWornItem(LLUUID item_id, bool is_worn);
 
     void updateMessageVisibility();
 
@@ -103,6 +104,7 @@ public:
     LLUUID getOutfitImageID(LLUUID outfit_id);
 
     void refreshList(const LLUUID& category_id);
+    void onCOFChanged();
     void computeDifference(const LLInventoryModel::cat_array_t vcats, const LLInventoryModel::item_array_t vitems, uuid_vec_t& vadded, uuid_vec_t& vremoved);
 
     void deselectItem(const LLUUID& category_id);
@@ -147,7 +149,7 @@ private:
     void updateRowsIfNeeded();
     void updateGalleryWidth();
 
-    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link);
+    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link, bool is_worn);
 
     void buildGalleryPanel(int row_count);
     void reshapeGalleryPanel(int row_count);
@@ -187,6 +189,7 @@ private:
 
     typedef std::map<LLUUID, LLInventoryGalleryItem*> gallery_item_map_t;
     gallery_item_map_t mItemMap;
+    uuid_vec_t mCOFLinkedItems;
     std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
 
     LLInventoryFilter::ESearchType mSearchType;
@@ -223,8 +226,11 @@ public:
                                    EAcceptance* accept,
                                    std::string& tooltip_msg);
 
+    LLFontGL* getTextFont();
+
     void setName(std::string name);
     void setSelected(bool value);
+    void setWorn(bool value);
     void setUUID(LLUUID id) {mUUID = id;}
     LLUUID getUUID() { return mUUID;}
 
@@ -251,8 +257,10 @@ public:
 private:
     LLUUID mUUID;
     LLTextBox* mNameText;
+    LLTextBox* mSuffixText;
     LLPanel* mTextBgPanel;
     bool     mSelected;
+    bool     mWorn;
     bool     mDefaultImage;
     bool     mHidden;
     bool     mIsFolder;
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 6ea1bfc54a..415d0a96d7 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -64,7 +64,6 @@ const S32 GALLERY_ITEMS_PER_ROW_MIN = 2;
 
 LLOutfitGallery::LLOutfitGallery(const LLOutfitGallery::Params& p)
     : LLOutfitListBase(),
-      mTexturesObserver(NULL),
       mOutfitsObserver(NULL),
       mScrollPanel(NULL),
       mGalleryPanel(NULL),
@@ -438,12 +437,6 @@ void LLOutfitGallery::moveRowPanel(LLPanel* stack, int left, int bottom)
 LLOutfitGallery::~LLOutfitGallery()
 {
     delete mOutfitGalleryMenu;
-    
-    if (gInventory.containsObserver(mTexturesObserver))
-    {
-        gInventory.removeObserver(mTexturesObserver);
-    }
-    delete mTexturesObserver;
 
     if (gInventory.containsObserver(mOutfitsObserver))
     {
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 5c417cf7ee..16116d4b71 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -175,7 +175,6 @@ private:
     item_num_map_t                                      mItemIndexMap;
 
 
-    LLInventoryCategoriesObserver* 	mTexturesObserver;
     LLInventoryCategoriesObserver* 	mOutfitsObserver;
 };
 class LLOutfitGalleryContextMenu : public LLOutfitContextMenu
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 281604503f..05a02158c0 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -13,6 +13,7 @@
    layout="topleft"
    left="0"
    top="0">
+  <string name="worn_string">(worn)</string>
   <thumbnail
    name="preview_thumbnail"
    image_name="Thumbnail_Fallback"
@@ -64,10 +65,24 @@
       layout="topleft"
       name="item_name"
       parse_urls="false"
+      text_readonly_color="White"
       top="2"
       width="127"
       use_ellipses="true">
       Item name, folder name.
     </text>
+    <text
+      read_only="true"
+      length="1"
+      follows="left|top"
+      left="1"
+      height="10"
+      layout="topleft"
+      name="suffix_text"
+      text_readonly_color="InventoryItemLinkColor"
+      top="13"
+      width="127">
+      (worn)
+    </text>
   </panel>
 </panel>
-- 
cgit v1.2.3


From 126bfa4877303b47abbc99f09c09a931c20cbd3b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 15:23:11 +0300
Subject: SL-19379 WIP fix for displaying folder link items, added correct
 action for 'paste as link'

---
 indra/newview/llinventorygallery.cpp     | 36 +++++++++++++++++++-------------
 indra/newview/llinventorygallerymenu.cpp | 30 ++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 8c49cd5a4b..499d51c431 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -222,6 +222,9 @@ void LLInventoryGallery::updateRootFolder()
         }
     }
 
+    const LLUUID cof = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+    mCategoriesObserver->addCategory(cof, boost::bind(&LLInventoryGallery::onCOFChanged, this));
+
     if (!mGalleryCreated)
     {
         initGallery();
@@ -243,9 +246,6 @@ void LLInventoryGallery::initGallery()
         }
         reArrangeRows();
         mGalleryCreated = true;
-
-        const LLUUID cof = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
-        mCategoriesObserver->addCategory(cof, boost::bind(&LLInventoryGallery::onCOFChanged, this));
     }
 }
 
@@ -646,7 +646,14 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     LLInventoryType::EType inventory_type(LLInventoryType::IT_CATEGORY);
     U32 misc_flags = 0;
     bool is_worn = false;
-    if (LLAssetType::AT_CATEGORY == obj->getType())
+    LLInventoryItem* inv_item = gInventory.getItem(item_id);
+    if (inv_item)
+    {
+        inventory_type = inv_item->getInventoryType();
+        misc_flags = inv_item->getFlags();
+        is_worn = LLAppearanceMgr::instance().isLinkedInCOF(item_id);
+    }
+    else if (LLAssetType::AT_CATEGORY == obj->getType())
     {
         name = get_localized_folder_name(item_id);
         if(thumbnail_id.isNull())
@@ -654,16 +661,6 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
             thumbnail_id = getOutfitImageID(item_id);
         }
     }
-    else
-    {
-        LLInventoryItem* inv_item = gInventory.getItem(item_id);
-        if (inv_item)
-        {
-            inventory_type = inv_item->getInventoryType();
-            misc_flags = inv_item->getFlags();
-            is_worn = LLAppearanceMgr::instance().isLinkedInCOF(item_id);
-        }
-    }
 
     LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
@@ -1049,7 +1046,16 @@ void LLInventoryGalleryItem::setType(LLAssetType::EType type, LLInventoryType::E
     if(mIsFolder)
     {
         mSortGroup = SG_NORMAL_FOLDER;
-        LLViewerInventoryCategory * cat = gInventory.getCategory(mUUID);
+        LLUUID folder_id = mUUID;
+        if(mIsLink)
+        {
+            LLInventoryObject* obj = gInventory.getObject(mUUID);
+            if (obj)
+            {
+                folder_id = obj->getLinkedUUID();
+            }
+        }
+        LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id);
         if (cat)
         {
             LLFolderType::EType preferred_type = cat->getPreferredType();
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 21f7b06534..e91ec78730 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -250,9 +250,35 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
             }
         }
     }
-    else if ("paste_as_link" == action)
+    else if ("paste_link" == action)
     {
-        link_inventory_object(selected_id, obj, LLPointer<LLInventoryCallback>(NULL));
+        const LLUUID &current_outfit_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+        const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+        const LLUUID &my_outifts_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+
+        const BOOL move_is_into_current_outfit = (selected_id == current_outfit_id);
+        const BOOL move_is_into_my_outfits = (selected_id == my_outifts_id) || gInventory.isObjectDescendentOf(selected_id, my_outifts_id);
+        const BOOL move_is_into_marketplacelistings = gInventory.isObjectDescendentOf(selected_id, marketplacelistings_id);
+
+        if (move_is_into_marketplacelistings || move_is_into_current_outfit || move_is_into_my_outfits)
+        {
+            return;
+        }
+
+        std::vector<LLUUID> objects;
+        LLClipboard::instance().pasteFromClipboard(objects);
+        for (std::vector<LLUUID>::const_iterator iter = objects.begin();
+             iter != objects.end();
+             ++iter)
+        {
+            const LLUUID &object_id = (*iter);
+            if (LLConstPointer<LLInventoryObject> link_obj = gInventory.getObject(object_id))
+            {
+                link_inventory_object(selected_id, link_obj, LLPointer<LLInventoryCallback>(NULL));
+            }
+        }
+
+        LLClipboard::instance().setCutMode(false);
     }
     else if ("rename" == action)
     {
-- 
cgit v1.2.3


From 29c5bf19f706655605bd3588e0249dbd5fd52179 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 21:18:50 +0300
Subject: SL-19379 WIP show fallback image with original size

---
 indra/newview/llinventorygallery.cpp                               | 2 +-
 indra/newview/llthumbnailctrl.cpp                                  | 7 +++++++
 indra/newview/llthumbnailctrl.h                                    | 1 +
 .../newview/skins/default/xui/en/panel_inventory_gallery_item.xml  | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 499d51c431..290688f179 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1081,7 +1081,7 @@ void LLInventoryGalleryItem::setThumbnail(LLUUID id)
     mDefaultImage = id.isNull();
     if(mDefaultImage)
     {
-        getChild<LLThumbnailCtrl>("preview_thumbnail")->setValue("Thumbnail_Fallback");
+        getChild<LLThumbnailCtrl>("preview_thumbnail")->clearTexture();
     }
     else
     {
diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
index 1b054b4c27..340dba3717 100644
--- a/indra/newview/llthumbnailctrl.cpp
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -170,6 +170,13 @@ void LLThumbnailCtrl::draw()
     LLUICtrl::draw();
 }
 
+void LLThumbnailCtrl::clearTexture()
+{
+    mImageAssetID = LLUUID::null;
+    mTexturep = nullptr;
+    mImagep = nullptr;
+}
+
 // virtual
 // value might be a string or a UUID
 void LLThumbnailCtrl::setValue(const LLSD& value)
diff --git a/indra/newview/llthumbnailctrl.h b/indra/newview/llthumbnailctrl.h
index dc21046841..686603b373 100644
--- a/indra/newview/llthumbnailctrl.h
+++ b/indra/newview/llthumbnailctrl.h
@@ -66,6 +66,7 @@ public:
 	virtual void draw() override;
 
 	virtual void setValue(const LLSD& value ) override;
+    void clearTexture();
     
     virtual BOOL handleHover(S32 x, S32 y, MASK mask) override;
 	
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 05a02158c0..b343aafca5 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -16,7 +16,7 @@
   <string name="worn_string">(worn)</string>
   <thumbnail
    name="preview_thumbnail"
-   image_name="Thumbnail_Fallback"
+   fallback_image="Thumbnail_Fallback"
    layout="topleft"
    follows="left|top"
    interactable="false"
-- 
cgit v1.2.3


From 6306b1fa6e1d663a2a3adc43eb97e9044ca80e88 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 31 Mar 2023 21:23:25 +0300
Subject: SL-19496 Thumbnail should be modifiable regardless of permissions

---
 indra/newview/llinventorybridge.cpp | 6 +++---
 indra/newview/llviewerinventory.cpp | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 24cbc28359..dadc7bc057 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -845,13 +845,13 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 				}
 			}
 
-            LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID);
             items.push_back(std::string("thumbnail"));
-            if (inv_item && !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+            if (isLibraryItem())
             {
                 disabled_items.push_back(std::string("thumbnail"));
             }
-			
+
+            LLViewerInventoryItem *inv_item = gInventory.getItem(mUUID);
 			if (show_asset_id)
 			{
 				items.push_back(std::string("Copy Asset UUID"));
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index c7819c9a54..c4edc3952b 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1369,7 +1369,8 @@ void update_inventory_category(
 	LL_DEBUGS(LOG_INV) << "cat_id: [" << cat_id << "] name " << (obj ? obj->getName() : "(NOT FOUND)") << LL_ENDL;
 	if(obj)
 	{
-		if (LLFolderType::lookupIsProtectedType(obj->getPreferredType()))
+        if (LLFolderType::lookupIsProtectedType(obj->getPreferredType())
+            && (updates.size() != 1 || !updates.has("thumbnail")))
 		{
 			LLNotificationsUtil::add("CannotModifyProtectedCategories");
 			return;
-- 
cgit v1.2.3


From 230c96b20d8658236e83742169a7744b18a04ed2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 3 Apr 2023 13:53:18 -0400
Subject: SL-18330: Remove some set-but-unused vars flagged by Xcode 14.3.

---
 indra/llcharacter/llbvhloader.cpp | 2 --
 indra/llcommon/llerrorthread.cpp  | 2 --
 indra/llmath/llvolume.cpp         | 4 ++--
 indra/llmessage/llcircuit.cpp     | 2 --
 indra/llrender/llgl.cpp           | 4 +---
 indra/llxml/llcontrol.cpp         | 3 ---
 6 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index c38614b0b4..07f9828bb4 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -1365,7 +1365,6 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
 		dp.packS32(joint->mNumRotKeys, "num_rot_keys");
 
 		LLQuaternion::Order order = bvhStringToOrder( joint->mOrder );
-		S32 outcount = 0;
 		S32 frame = 0;
 		for (	ki = joint->mKeys.begin();
 				ki != joint->mKeys.end();
@@ -1433,7 +1432,6 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
 			dp.packU16(x, "rot_angle_x");
 			dp.packU16(y, "rot_angle_y");
 			dp.packU16(z, "rot_angle_z");
-			outcount++;
 			frame++;
 		}
 		
diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp
index f6bc68b5c1..4f8f0a88ad 100644
--- a/indra/llcommon/llerrorthread.cpp
+++ b/indra/llcommon/llerrorthread.cpp
@@ -108,11 +108,9 @@ void LLErrorThread::run()
 	// application state as APP_STATUS_ERROR.
 	LL_INFOS() << "thread_error - Waiting for an error" << LL_ENDL;
 
-	S32 counter = 0;
 	while (! (LLApp::isError() || LLApp::isStopped()))
 	{
 		ms_sleep(10);
-		counter++;
 	}
 	if (LLApp::isError())
 	{
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 281f1bd87a..8c19379e0e 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5482,14 +5482,14 @@ bool LLVolumeFace::cacheOptimize()
 	new_indices.push_back(tri->mVertex[2]->mIdx);
 	tri->complete();
 
-	U32 breaks = 0;
+	//U32 breaks = 0;
 	for (U32 i = 1; i < mNumIndices/3; ++i)
 	{
 		cache.updateScores();
 		tri = cache.mBestTriangle;
 		if (!tri)
 		{
-			breaks++;
+			//breaks++;
 			for (U32 j = 0; j < triangle_data.size(); ++j)
 			{
 				if (triangle_data[j].mActive)
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp
index 8baa2e328b..a9a292958f 100644
--- a/indra/llmessage/llcircuit.cpp
+++ b/indra/llmessage/llcircuit.cpp
@@ -271,7 +271,6 @@ void LLCircuitData::ackReliablePacket(TPACKETID packet_num)
 
 S32 LLCircuitData::resendUnackedPackets(const F64Seconds now)
 {
-	S32 resent_packets = 0;
 	LLReliablePacket *packetp;
 
 
@@ -375,7 +374,6 @@ S32 LLCircuitData::resendUnackedPackets(const F64Seconds now)
 				// Don't remove it yet, it still gets to try to resend at least once.
 				++iter;
 			}
-			resent_packets++;
 		}
 		else
 		{
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 193cfa64b8..cfc9ce735d 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -2329,9 +2329,7 @@ void LLGLSyncFence::wait()
 	if (mSync)
 	{
 		while (glClientWaitSync(mSync, 0, FENCE_WAIT_TIME_NANOSECONDS) == GL_TIMEOUT_EXPIRED)
-		{ //track the number of times we've waited here
-			static S32 waits = 0;
-			waits++;
+		{
 		}
 	}
 #endif
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index ead8634df4..2960ecf829 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -774,7 +774,6 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
 		return 0;
 	}
 
-	U32		item = 0;
 	U32		validitems = 0;
 	S32 version;
 	
@@ -808,8 +807,6 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
 		}
 
 		// Got an item.  Load it up.
-		item++;
-
 		// If not declared, assume it's a string
 		if (!declared)
 		{
-- 
cgit v1.2.3


From bc285ed41e86e685df07f4039c64c0402833b047 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 3 Apr 2023 21:34:37 +0300
Subject: SL-19521 Inventory filters floater should affect Inventory Gallery

---
 indra/newview/llinventorygallery.cpp   | 154 +++++++++++++++++++++++++++++----
 indra/newview/llinventorygallery.h     |  11 ++-
 indra/newview/llpanelmaininventory.cpp |  96 ++++++++++++--------
 indra/newview/llpanelmaininventory.h   |   2 +
 4 files changed, 203 insertions(+), 60 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 290688f179..da58aa70f9 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -84,12 +84,14 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mRowPanWidthFactor(p.row_panel_width_factor),
       mGalleryWidthFactor(p.gallery_width_factor),
       mIsInitialized(false),
-      mSearchType(LLInventoryFilter::SEARCHTYPE_NAME),
-      mSearchLinks(true)
+      mSearchType(LLInventoryFilter::SEARCHTYPE_NAME)
 {
     updateGalleryWidth();
-
+    mFilter = new LLInventoryFilter();
     mCategoriesObserver = new LLInventoryCategoriesObserver();
+
+    mUsername = gAgentUsername;
+    LLStringUtil::toUpper(mUsername);
 }
 
 LLInventoryGallery::Params::Params()
@@ -124,6 +126,7 @@ BOOL LLInventoryGallery::postBuild()
 LLInventoryGallery::~LLInventoryGallery()
 {
     delete mInventoryGalleryMenu;
+    delete mFilter;
 
     while (!mUnusedRowPanels.empty())
     {
@@ -254,20 +257,26 @@ void LLInventoryGallery::draw()
     LLPanel::draw();
     if (mGalleryCreated)
     {
-        updateRowsIfNeeded();
+        if(!updateRowsIfNeeded() && mFilter->isModified())
+        {
+            reArrangeRows();
+        }
     }
 }
 
-void LLInventoryGallery::updateRowsIfNeeded()
+bool LLInventoryGallery::updateRowsIfNeeded()
 {
     if(((getRect().getWidth() - mRowPanelWidth) > mItemWidth) && mRowCount > 1)
     {
         reArrangeRows(1);
+        return true;
     }
     else if((mRowPanelWidth > (getRect().getWidth() + mItemHorizontalGap)) && mItemsInRow > GALLERY_ITEMS_PER_ROW_MIN)
     {
         reArrangeRows(-1);
+        return true;
     }
+    return false;
 }
 
 bool compareGalleryItem(LLInventoryGalleryItem* item1, LLInventoryGalleryItem* item2)
@@ -312,6 +321,7 @@ void LLInventoryGallery::reArrangeRows(S32 row_diff)
         applyFilter(*it, mFilterSubString);
         addToGallery(*it);
     }
+    mFilter->clearModified();
     updateMessageVisibility();
 }
 
@@ -558,20 +568,50 @@ void LLInventoryGallery::moveRowPanel(LLPanel* stack, int left, int bottom)
 void LLInventoryGallery::setFilterSubString(const std::string& string)
 {
     mFilterSubString = string;
-    reArrangeRows();
+    mFilter->setFilterSubString(string);
+    
+    //reArrangeRows();
 }
 
 void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring)
 {
     if (!item) return;
 
-    std::string desc;
-    if(!mSearchLinks && item->isLink())
+    if (item->isFolder() && (mFilter->getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS))
+    {
+        item->setHidden(false);
+        return;
+    }
+
+    if(item->isLink() && ((mFilter->getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) == 0) && !filter_substring.empty())
+    {
+        item->setHidden(true);
+        return;
+    }
+    
+    bool hidden = false;
+
+    if(mFilter->getFilterCreatorType() == LLInventoryFilter::FILTERCREATOR_SELF)
+    {
+        hidden = (item->getCreatorName() == mUsername) || item->isFolder();
+    }
+    else if(mFilter->getFilterCreatorType() == LLInventoryFilter::FILTERCREATOR_OTHERS)
+    {
+        hidden = (item->getCreatorName() != mUsername) || item->isFolder();
+    }
+    if(hidden)
+    {
+        item->setHidden(true);
+        return;
+    }
+
+    if(!checkAgainstFilterType(item->getUUID()))
     {
         item->setHidden(true);
         return;
     }
 
+    std::string desc;
     switch(mSearchType)
     {
         case LLInventoryFilter::SEARCHTYPE_CREATOR:
@@ -594,7 +634,7 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
     std::string cur_filter = filter_substring;
     LLStringUtil::toUpper(cur_filter);
 
-    bool hidden = (std::string::npos == desc.find(cur_filter));
+    hidden = (std::string::npos == desc.find(cur_filter));
     item->setHidden(hidden);
 }
 
@@ -610,15 +650,6 @@ void LLInventoryGallery::setSearchType(LLInventoryFilter::ESearchType type)
     }
 }
 
-void LLInventoryGallery::toggleSearchLinks()
-{
-    mSearchLinks = !mSearchLinks;
-    if(!mFilterSubString.empty())
-    {
-        reArrangeRows();
-    }
-}
-
 void LLInventoryGallery::getCurrentCategories(uuid_vec_t& vcur)
 {
     for (gallery_item_map_t::const_iterator iter = mItemMap.begin();
@@ -777,7 +808,13 @@ void LLInventoryGallery::onChangeItemSelection(const LLUUID& category_id)
 
 void LLInventoryGallery::updateMessageVisibility()
 {
+
     mMessageTextBox->setVisible(mItems.empty());
+    if(mItems.empty())
+    {
+        mMessageTextBox->setText(hasDescendents(mFolderID) ? LLTrans::getString("InventorySingleFolderEmpty") : LLTrans::getString("InventorySingleFolderNoMatches"));
+    }
+
     mScrollPanel->setVisible(!mItems.empty());
 }
 
@@ -1001,6 +1038,87 @@ BOOL LLInventoryGallery::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
     return handled;
 }
 
+bool LLInventoryGallery::hasDescendents(const LLUUID& cat_id)
+{
+    LLInventoryModel::cat_array_t* cats;
+    LLInventoryModel::item_array_t* items;
+    gInventory.getDirectDescendentsOf(cat_id, cats, items);
+
+    return (cats->empty() && items->empty());
+}
+
+bool LLInventoryGallery::checkAgainstFilterType(const LLUUID& object_id)
+{
+    const LLInventoryObject *object = gInventory.getObject(object_id);
+    if(!object) return false;
+
+    LLInventoryType::EType object_type = LLInventoryType::IT_CATEGORY;
+    LLInventoryItem* inv_item = gInventory.getItem(object_id);
+    if (inv_item)
+    {
+        object_type = inv_item->getInventoryType();
+    }
+    const U32 filterTypes = mFilter->getFilterTypes();
+
+    if ((filterTypes & LLInventoryFilter::FILTERTYPE_OBJECT) && inv_item)
+    {
+        switch (object_type)
+        {
+        case LLInventoryType::IT_NONE:
+            // If it has no type, pass it, unless it's a link.
+            if (object && object->getIsLinkType())
+            {
+                return false;
+            }
+            break;
+        case LLInventoryType::IT_UNKNOWN:
+            {
+                // Unknows are only shown when we show every type.
+                // Unknows are 255 and won't fit in 64 bits.
+                if (mFilter->getFilterObjectTypes() != 0xffffffffffffffffULL)
+                {
+                    return false;
+                }
+                break;
+            }
+        default:
+            if ((1LL << object_type & mFilter->getFilterObjectTypes()) == U64(0))
+            {
+                return false;
+            }
+            break;
+        }
+    }
+    
+    if (filterTypes & LLInventoryFilter::FILTERTYPE_DATE)
+    {
+        const U16 HOURS_TO_SECONDS = 3600;
+        time_t earliest = time_corrected() - mFilter->getHoursAgo() * HOURS_TO_SECONDS;
+
+        if (mFilter->getMinDate() > time_min() && mFilter->getMinDate() < earliest)
+        {
+            earliest = mFilter->getMinDate();
+        }
+        else if (!mFilter->getHoursAgo())
+        {
+            earliest = 0;
+        }
+
+        if (LLInventoryFilter::FILTERDATEDIRECTION_NEWER == mFilter->getDateSearchDirection() || mFilter->isSinceLogoff())
+        {
+            if (object->getCreationDate() < earliest ||
+                object->getCreationDate() > mFilter->getMaxDate())
+                return false;
+        }
+        else
+        {
+            if (object->getCreationDate() > earliest ||
+                object->getCreationDate() > mFilter->getMaxDate())
+                return false;
+        }
+    }
+    return true;
+}
 //-----------------------------
 // LLInventoryGalleryItem
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 036817de93..cef7574093 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -75,6 +75,8 @@ public:
 
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
+    LLInventoryFilter& getFilter() const { return *mFilter; }
+    bool checkAgainstFilterType(const LLUUID& object_id);
 
     void getCurrentCategories(uuid_vec_t& vcur);
     void updateAddedItem(LLUUID item_id);
@@ -114,8 +116,8 @@ public:
 
     void setSearchType(LLInventoryFilter::ESearchType type);
     LLInventoryFilter::ESearchType getSearchType() { return mSearchType; }
-    void toggleSearchLinks();
-    bool getSearchLinks(){ return mSearchLinks; }
+
+    bool hasDescendents(const LLUUID& cat_id);
 
 protected:
 
@@ -146,7 +148,7 @@ private:
     LLPanel* addToRow(LLPanel* row_stack, LLInventoryGalleryItem* item, int pos, int hgap);
     void removeFromLastRow(LLInventoryGalleryItem* item);
     void reArrangeRows(S32 row_diff = 0);
-    void updateRowsIfNeeded();
+    bool updateRowsIfNeeded();
     void updateGalleryWidth();
 
     LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link, bool is_worn);
@@ -186,6 +188,7 @@ private:
 
     LLInventoryGalleryContextMenu* mInventoryGalleryMenu;
     std::string mFilterSubString;
+    LLInventoryFilter* mFilter;
 
     typedef std::map<LLUUID, LLInventoryGalleryItem*> gallery_item_map_t;
     gallery_item_map_t mItemMap;
@@ -193,7 +196,7 @@ private:
     std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
 
     LLInventoryFilter::ESearchType mSearchType;
-    bool mSearchLinks;
+    std::string mUsername;
 };
 
 class LLInventoryGalleryItem : public LLPanel
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index e55d1f19f4..383250e3ac 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -506,7 +506,7 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
 void LLPanelMainInventory::resetFilters()
 {
 	LLFloaterInventoryFinder *finder = getFinder();
-	getActivePanel()->getFilter().resetDefault();
+	getCurrentFilter().resetDefault();
 	if (finder)
 	{
 		finder->updateElementsFromFilter();
@@ -802,7 +802,7 @@ void LLPanelMainInventory::onFilterSelected()
 	}
 	updateSearchTypeCombo();
 	setFilterSubString(mFilterSubString);
-	LLInventoryFilter& filter = mActivePanel->getFilter();
+	LLInventoryFilter& filter = getCurrentFilter();
 	LLFloaterInventoryFinder *finder = getFinder();
 	if (finder)
 	{
@@ -956,7 +956,7 @@ void LLPanelMainInventory::onFocusReceived()
 
 void LLPanelMainInventory::setFilterTextFromFilter() 
 { 
-	mFilterText = mActivePanel->getFilter().getFilterText(); 
+	mFilterText = getCurrentFilter().getFilterText();
 }
 
 void LLPanelMainInventory::toggleFindOptions()
@@ -1210,10 +1210,21 @@ void LLFloaterInventoryFinder::draw()
 		filter &= ~(0x1 << LLInventoryType::IT_CATEGORY);
 	}
 
-	// update the panel, panel will update the filter
-	mPanelMainInventory->getPanel()->setShowFolderState(getCheckShowEmpty() ?
-		LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
-	mPanelMainInventory->getPanel()->setFilterTypes(filter);
+
+    bool is_gallery = mPanelMainInventory->isSingleFolderMode() && mPanelMainInventory->isGalleryViewMode();
+    if(is_gallery)
+    {
+        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setShowFolderState(getCheckShowEmpty() ?
+            LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setFilterObjectTypes(filter);
+    }
+    else
+    {
+        // update the panel, panel will update the filter
+        mPanelMainInventory->getPanel()->setShowFolderState(getCheckShowEmpty() ?
+            LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+        mPanelMainInventory->getPanel()->setFilterTypes(filter);
+    }
 
 	if (getCheckSinceLogoff())
 	{
@@ -1235,10 +1246,20 @@ void LLFloaterInventoryFinder::draw()
 	}
 	hours += days * 24;
 
-	mPanelMainInventory->getPanel()->setHoursAgo(hours);
-	mPanelMainInventory->getPanel()->setSinceLogoff(getCheckSinceLogoff());
+
 	mPanelMainInventory->setFilterTextFromFilter();
-	mPanelMainInventory->getPanel()->setDateSearchDirection(getDateSearchDirection());
+    if(is_gallery)
+    {
+        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setHoursAgo(hours);
+        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setDateRangeLastLogoff(getCheckSinceLogoff());
+        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setDateSearchDirection(getDateSearchDirection());
+    }
+    else
+    {
+        mPanelMainInventory->getPanel()->setHoursAgo(hours);
+        mPanelMainInventory->getPanel()->setSinceLogoff(getCheckSinceLogoff());
+        mPanelMainInventory->getPanel()->setDateSearchDirection(getDateSearchDirection());
+    }
 
 	LLPanel::draw();
 }
@@ -1250,15 +1271,15 @@ void LLFloaterInventoryFinder::onCreatorSelfFilterCommit()
 
 	if(show_creator_self && show_creator_other)
 	{
-		mFilter->setFilterCreator(LLInventoryFilter::FILTERCREATOR_ALL);
+        mPanelMainInventory->getCurrentFilter().setFilterCreator(LLInventoryFilter::FILTERCREATOR_ALL);
 	}
 	else if(show_creator_self)
 	{
-		mFilter->setFilterCreator(LLInventoryFilter::FILTERCREATOR_SELF);
+        mPanelMainInventory->getCurrentFilter().setFilterCreator(LLInventoryFilter::FILTERCREATOR_SELF);
 	}
 	else if(!show_creator_self || !show_creator_other)
 	{
-		mFilter->setFilterCreator(LLInventoryFilter::FILTERCREATOR_OTHERS);
+        mPanelMainInventory->getCurrentFilter().setFilterCreator(LLInventoryFilter::FILTERCREATOR_OTHERS);
 		mCreatorOthers->set(TRUE);
 	}
 }
@@ -1270,15 +1291,15 @@ void LLFloaterInventoryFinder::onCreatorOtherFilterCommit()
 
 	if(show_creator_self && show_creator_other)
 	{
-		mFilter->setFilterCreator(LLInventoryFilter::FILTERCREATOR_ALL);
+        mPanelMainInventory->getCurrentFilter().setFilterCreator(LLInventoryFilter::FILTERCREATOR_ALL);
 	}
 	else if(show_creator_other)
 	{
-		mFilter->setFilterCreator(LLInventoryFilter::FILTERCREATOR_OTHERS);
+        mPanelMainInventory->getCurrentFilter().setFilterCreator(LLInventoryFilter::FILTERCREATOR_OTHERS);
 	}
 	else if(!show_creator_other || !show_creator_self)
 	{
-		mFilter->setFilterCreator(LLInventoryFilter::FILTERCREATOR_SELF);
+        mPanelMainInventory->getCurrentFilter().setFilterCreator(LLInventoryFilter::FILTERCREATOR_SELF);
 		mCreatorSelf->set(TRUE);
 	}
 }
@@ -1763,29 +1784,22 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 
     if (command_name == "toggle_search_outfits")
     {
-        mActivePanel->getFilter().toggleSearchVisibilityOutfits();
+        getCurrentFilter().toggleSearchVisibilityOutfits();
     }
 
 	if (command_name == "toggle_search_trash")
 	{
-		mActivePanel->getFilter().toggleSearchVisibilityTrash();
+        getCurrentFilter().toggleSearchVisibilityTrash();
 	}
 
 	if (command_name == "toggle_search_library")
 	{
-		mActivePanel->getFilter().toggleSearchVisibilityLibrary();
+        getCurrentFilter().toggleSearchVisibilityLibrary();
 	}
 
 	if (command_name == "include_links")
 	{
-        if(mSingleFolderMode && isGalleryViewMode())
-        {
-            mInventoryGalleryPanel->toggleSearchLinks();
-        }
-        else
-        {
-            mActivePanel->getFilter().toggleSearchVisibilityLinks();
-        }
+        getCurrentFilter().toggleSearchVisibilityLinks();
 	}
 
     if (command_name == "share")
@@ -2000,29 +2014,22 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 
     if (command_name == "toggle_search_outfits")
     {
-        return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_OUTFITS) != 0;
+        return (getCurrentFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_OUTFITS) != 0;
     }
 
 	if (command_name == "toggle_search_trash")
 	{
-		return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_TRASH) != 0;
+		return (getCurrentFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_TRASH) != 0;
 	}
 
 	if (command_name == "toggle_search_library")
 	{
-		return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LIBRARY) != 0;
+		return (getCurrentFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LIBRARY) != 0;
 	}
 
 	if (command_name == "include_links")
 	{
-        if(mSingleFolderMode && isGalleryViewMode())
-        {
-            return mInventoryGalleryPanel->getSearchLinks();
-        }
-        else
-        {
-            return (mActivePanel->getFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) != 0;
-        }
+        return (getCurrentFilter().getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) != 0;
 	}	
 
     if (command_name == "list_view")
@@ -2135,6 +2142,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
         }
         updateNavButtons();
 
+        onFilterSelected();
         if((isListViewMode() && (mActivePanel->getFilterSubString() != mFilterSubString)) ||
            (isGalleryViewMode() && (mInventoryGalleryPanel->getFilterSubString() != mFilterSubString)))
         {
@@ -2160,5 +2168,17 @@ LLUUID LLPanelMainInventory::getCurrentSFVRoot()
     }
     return LLUUID::null;
 }
+
+LLInventoryFilter& LLPanelMainInventory::getCurrentFilter()
+{
+    if(mSingleFolderMode && isGalleryViewMode())
+    {
+        return mInventoryGalleryPanel->getFilter();
+    }
+    else
+    {
+        return mActivePanel->getFilter();
+    }
+}
 // List Commands                                                              //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index bd51830ebb..1f0dfc82d2 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -127,6 +127,8 @@ public:
     LLUUID getCurrentSFVRoot();
     std::string getLocalizedRootName();
 
+    LLInventoryFilter& getCurrentFilter();
+
 protected:
 	//
 	// Misc functions
-- 
cgit v1.2.3


From 77753a31aba6123696761aeeb2c535768fd1ea12 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 4 Apr 2023 02:08:23 +0300
Subject: SL-19188 Improve legacy gallery thumbnail support

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 32 +++++++++++++++++++-------
 indra/newview/llfloaterchangeitemthumbnail.h   |  6 +++--
 2 files changed, 28 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 8f6d984aa9..099ceea821 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -335,7 +335,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
     LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(obj);
     if (item)
     {
-        // This floater probably shouldn't be be possible to open
+        // This floater probably shouldn't be possible to open
         // for imcomplete items
         llassert(item->isFinished());
 
@@ -369,13 +369,14 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
                     }
                     if (item)
                     {
-                        LL_INFOS() << "Setting image from outfit as a thumbnail" << LL_ENDL;
                         thumbnail_id = item->getAssetUUID();
-
-                        if (validateAsset(thumbnail_id))
+                        if (thumbnail_id.notNull())
                         {
                             // per SL-19188, set this image as a thumbnail
-                            setThumbnailId(thumbnail_id);
+                            LL_INFOS() << "Setting image " << thumbnail_id
+                                       << " from outfit as a thumbnail for inventory object " << obj->getUUID()
+                                       << LL_ENDL;
+                            assignAndValidateAsset(thumbnail_id, true);
                         }
                     }
                 }
@@ -540,11 +541,20 @@ void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notificatio
     }
 }
 
-void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id)
+void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id, bool silent)
 {
     LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::getFetchedTexture(asset_id);
     if (texturep->getFullWidth() == 0 && !texturep->isFullyLoaded() && !texturep->isMissingAsset())
     {
+        if (silent)
+        {
+            mExpectingAssetId = LLUUID::null;
+        }
+        else
+        {
+            // don't warn user multiple times if some textures took their time
+            mExpectingAssetId = asset_id;
+        }
         texturep->setLoadedCallback(onImageLoaded,
             MAX_DISCARD_LEVEL, // don't actually need max one, 3 or 4 should be enough
             FALSE,
@@ -559,7 +569,7 @@ void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id
         {
             setThumbnailId(asset_id);
         }
-        else
+        else if (!silent)
         {
             LLNotificationsUtil::add("ThumbnailDimentionsLimit");
         }
@@ -567,6 +577,11 @@ void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id
 }
 bool LLFloaterChangeItemThumbnail::validateAsset(const LLUUID &asset_id)
 {
+    if (asset_id.isNull())
+    {
+        return false;
+    }
+
     LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::findFetchedTexture(asset_id, TEX_LIST_STANDARD);
 
     if (!texturep)
@@ -624,9 +639,10 @@ void LLFloaterChangeItemThumbnail::onImageLoaded(
             {
                 self->setThumbnailId(asset_id);
             }
-            else
+            else if (self->mExpectingAssetId == asset_id)
             {
                 LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+                self->mExpectingAssetId = LLUUID::null;
             }
         }
     }
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 18cf2f7a85..33bf2ecab5 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -66,6 +66,8 @@ public:
         S32 serial_num,
         void* user_data) override;
 
+    static bool validateAsset(const LLUUID &asset_id);
+
 private:
 
     LLInventoryObject* getInventoryObject();
@@ -80,8 +82,7 @@ private:
     static void onRemove(void*);
     static void onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle);
 
-    void assignAndValidateAsset(const LLUUID &asset_id);
-    static bool validateAsset(const LLUUID &asset_id);
+    void assignAndValidateAsset(const LLUUID &asset_id, bool silent = false);
     static void onImageLoaded(BOOL success,
         LLViewerFetchedTexture *src_vi,
         LLImageRaw* src,
@@ -113,6 +114,7 @@ private:
     EToolTipState mTooltipState;
     LLUUID mItemId;
     LLUUID mTaskId;
+    LLUUID mExpectingAssetId;
 
     LLIconCtrl *mItemTypeIcon;
     LLUICtrl *mItemNameText;
-- 
cgit v1.2.3


From 7ccfbd7c285cc2ab0bbf569912f8e9e2d5c1df72 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 4 Apr 2023 15:14:02 +0300
Subject: SL-19379 Don't switch focus to other Inventory floater when creating
 an item in Gallery

---
 indra/newview/llfloatersidepanelcontainer.cpp | 23 +++++++++++++++++++++++
 indra/newview/llfloatersidepanelcontainer.h   |  2 ++
 indra/newview/llinventorygallery.cpp          | 14 +++++++-------
 indra/newview/llinventorygallery.h            |  2 +-
 indra/newview/llinventorypanel.cpp            | 14 ++++++++++++++
 indra/newview/llpanelmaininventory.cpp        |  8 ++++++++
 indra/newview/llpanelmaininventory.h          |  1 +
 7 files changed, 56 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index dd7ce40e97..a875d33679 100644
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -90,6 +90,29 @@ void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
 	}
 }
 
+LLFloater* LLFloaterSidePanelContainer::getTopmostInventoryFloater()
+{
+    LLFloater* topmost_floater = NULL;
+    S32 z_min = S32_MAX;
+    
+    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
+    {
+        LLFloater* inventory_floater = (*iter);
+
+        if (inventory_floater && inventory_floater->getVisible())
+        {
+            S32 z_order = gFloaterView->getZOrder(inventory_floater);
+            if (z_order < z_min)
+            {
+                z_min = z_order;
+                topmost_floater = inventory_floater;
+            }
+        }
+    }
+    return topmost_floater;
+}
+
 LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)
 {
 	LLView* view = findChildView(panel_name, true);
diff --git a/indra/newview/llfloatersidepanelcontainer.h b/indra/newview/llfloatersidepanelcontainer.h
index 20baf28184..5e7e755d1f 100644
--- a/indra/newview/llfloatersidepanelcontainer.h
+++ b/indra/newview/llfloatersidepanelcontainer.h
@@ -57,6 +57,8 @@ public:
 
 	LLPanel* openChildPanel(const std::string& panel_name, const LLSD& params);
 
+    static LLFloater* getTopmostInventoryFloater();
+
 	static void showPanel(const std::string& floater_name, const LLSD& key);
 
 	static void showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key);
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index da58aa70f9..c4da11a570 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -696,7 +696,7 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
-    item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::onChangeItemSelection, this, item_id));
+    item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id));
     if (mGalleryCreated)
     {
         addToGallery(item);
@@ -789,21 +789,21 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
     }
 }
 
-void LLInventoryGallery::onChangeItemSelection(const LLUUID& category_id)
+void LLInventoryGallery::changeItemSelection(const LLUUID& item_id)
 {
-    if (mSelectedItemID == category_id)
+    if ((mItemMap.count(item_id) > 0) && (mSelectedItemID == item_id))
         return;
 
     if (mItemMap[mSelectedItemID])
     {
         mItemMap[mSelectedItemID]->setSelected(FALSE);
     }
-    if (mItemMap[category_id])
+    if (mItemMap[item_id])
     {
-        mItemMap[category_id]->setSelected(TRUE);
+        mItemMap[item_id]->setSelected(TRUE);
     }
-    mSelectedItemID = category_id;
-    signalSelectionItemID(category_id);
+    mSelectedItemID = item_id;
+    signalSelectionItemID(item_id);
 }
 
 void LLInventoryGallery::updateMessageVisibility()
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index cef7574093..7284c92c96 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -110,6 +110,7 @@ public:
     void computeDifference(const LLInventoryModel::cat_array_t vcats, const LLInventoryModel::item_array_t vitems, uuid_vec_t& vadded, uuid_vec_t& vremoved);
 
     void deselectItem(const LLUUID& category_id);
+    void changeItemSelection(const LLUUID& item_id);
     void signalSelectionItemID(const LLUUID& category_id);
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
     LLUUID getSelectedItemID() { return mSelectedItemID; }
@@ -121,7 +122,6 @@ public:
 
 protected:
 
-    void onChangeItemSelection(const LLUUID& category_id);
     void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
 
     void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 392624a7e8..f97f07f52c 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1793,6 +1793,20 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
 	{
 		sidepanel_inventory->selectAllItemsPanel();
 	}
+
+    LLFloater* inventory_floater = LLFloaterSidePanelContainer::getTopmostInventoryFloater();
+    if(!auto_open && inventory_floater && inventory_floater->getVisible())
+    {
+        LLSidepanelInventory *inventory_panel = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
+        LLPanelMainInventory* main_panel = inventory_panel->getMainInventoryPanel();
+        if(main_panel->isSingleFolderMode() && main_panel->isGalleryViewMode())
+        {
+            main_panel->setGallerySelection(obj_id);
+            return;
+        }
+    }
+
+
 	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
 
 	if (active_panel)
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 383250e3ac..79b41f8e5f 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2180,5 +2180,13 @@ LLInventoryFilter& LLPanelMainInventory::getCurrentFilter()
         return mActivePanel->getFilter();
     }
 }
+
+void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id)
+{
+    if(mSingleFolderMode && isGalleryViewMode())
+    {
+        mInventoryGalleryPanel->changeItemSelection(item_id);
+    }
+}
 // List Commands                                                              //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 1f0dfc82d2..1e171d5066 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -118,6 +118,7 @@ public:
     void onBackFolderClicked();
     void onForwardFolderClicked();
     void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true);
+    void setGallerySelection(const LLUUID& item_id);
     LLUUID getSingleFolderViewRoot();
     bool isSingleFolderMode() { return mSingleFolderMode; }
 
-- 
cgit v1.2.3


From 58092382269eb8dc48fb30734ee3738f7385f8da Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 4 Apr 2023 16:38:53 +0300
Subject: SL-19273 Show empty folder message for empty folders regardless of
 filter state

---
 indra/llui/llfolderview.cpp         | 2 +-
 indra/llui/llfolderviewmodel.cpp    | 4 ++--
 indra/llui/llfolderviewmodel.h      | 6 +++---
 indra/newview/llconversationmodel.h | 2 +-
 indra/newview/llinventoryfilter.cpp | 4 ++--
 indra/newview/llinventoryfilter.h   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 46a7057240..734a7599aa 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -665,7 +665,7 @@ void LLFolderView::draw()
 	}
 	else if (mShowEmptyMessage)
 	{
-		mStatusTextBox->setValue(getFolderViewModel()->getStatusText());
+		mStatusTextBox->setValue(getFolderViewModel()->getStatusText(mItems.empty() && mFolders.empty()));
 		mStatusTextBox->setVisible( TRUE );
 		
 		// firstly reshape message textbox with current size. This is necessary to
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp
index 93122503d1..f217b743a0 100644
--- a/indra/llui/llfolderviewmodel.cpp
+++ b/indra/llui/llfolderviewmodel.cpp
@@ -34,7 +34,7 @@ bool LLFolderViewModelCommon::needsSort(LLFolderViewModelItem* item)
 	return item->getSortVersion() < mTargetSortVersion;
 }
 
-std::string LLFolderViewModelCommon::getStatusText()
+std::string LLFolderViewModelCommon::getStatusText(bool is_empty_folder)
 {
 	if (!contentsReady() || mFolderView->getViewModelItem()->getLastFilterGeneration() < getFilter().getCurrentGeneration())
 	{
@@ -42,7 +42,7 @@ std::string LLFolderViewModelCommon::getStatusText()
 	}
 	else
 	{
-		return getFilter().getEmptyLookupMessage();
+		return getFilter().getEmptyLookupMessage(is_empty_folder);
 	}
 }
 
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index b5a765fab3..551a60e097 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -69,7 +69,7 @@ public:
 	virtual bool				checkFolder(const LLFolderViewModelItem* folder) const = 0;
 
 	virtual void 				setEmptyLookupMessage(const std::string& message) = 0;
-	virtual std::string			getEmptyLookupMessage() const = 0;
+    virtual std::string			getEmptyLookupMessage(bool is_empty_folder = false) const = 0;
 
 	virtual bool				showAllResults() const = 0;
 
@@ -125,7 +125,7 @@ public:
 	virtual void setFolderView(LLFolderView* folder_view) = 0;
 	virtual LLFolderViewFilter& getFilter() = 0;
 	virtual const LLFolderViewFilter& getFilter() const = 0;
-	virtual std::string getStatusText() = 0;
+	virtual std::string getStatusText(bool is_empty_folder = false) = 0;
 
 	virtual bool startDrag(std::vector<LLFolderViewModelItem*>& items) = 0;
 };
@@ -394,7 +394,7 @@ public:
 		// sort everything
 		mTargetSortVersion++;
 	}
-	virtual std::string getStatusText();
+	virtual std::string getStatusText(bool is_empty_folder = false);
 	virtual void filter();
 
 	void setFolderView(LLFolderView* folder_view) { mFolderView = folder_view;}
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 22d2d60905..3f607d434e 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -250,7 +250,7 @@ public:
 	bool 				check(const LLFolderViewModelItem* item) { return true; }
 	bool				checkFolder(const LLFolderViewModelItem* folder) const { return true; }
 	void 				setEmptyLookupMessage(const std::string& message) { }
-	std::string			getEmptyLookupMessage() const { return mEmpty; }
+	std::string			getEmptyLookupMessage(bool is_empty_folder = false) const { return mEmpty; }
 	bool				showAllResults() const { return true; }
 	std::string::size_type getStringMatchOffset(LLFolderViewModelItem* item) const { return std::string::npos; }
 	std::string::size_type getFilterStringSize() const { return 0; }
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 0af383f232..5a300bad32 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -1603,9 +1603,9 @@ void LLInventoryFilter::setDefaultEmptyLookupMessage(const std::string& message)
 	mDefaultEmptyLookupMessage = message;
 }
 
-std::string LLInventoryFilter::getEmptyLookupMessage() const
+std::string LLInventoryFilter::getEmptyLookupMessage(bool is_empty_folder) const
 {
-	if (isDefault() && !mDefaultEmptyLookupMessage.empty())
+	if ((isDefault() || is_empty_folder) && !mDefaultEmptyLookupMessage.empty())
 	{
 		return LLTrans::getString(mDefaultEmptyLookupMessage);
 	}
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index e127ef03ab..267decfeb4 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -281,7 +281,7 @@ public:
 
 	void 				setEmptyLookupMessage(const std::string& message);
 	void				setDefaultEmptyLookupMessage(const std::string& message);
-	std::string			getEmptyLookupMessage() const;
+	std::string			getEmptyLookupMessage(bool is_empty_folder = false) const;
 
 	// +-------------------------------------------------------------------+
 	// + Status
-- 
cgit v1.2.3


From f5809ad862c0a9b1004a2c9a779df99ff4555a1f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 4 Apr 2023 20:18:08 +0300
Subject: SL-19379 Observe thumbnail changes and update it in Gallery

---
 indra/newview/llinventorygallery.cpp | 76 +++++++++++++++++++++++++++++++-----
 indra/newview/llinventorygallery.h   | 37 +++++++++++++++++-
 2 files changed, 102 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c4da11a570..8c2f4c2214 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -89,6 +89,8 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
     updateGalleryWidth();
     mFilter = new LLInventoryFilter();
     mCategoriesObserver = new LLInventoryCategoriesObserver();
+    mThumbnailsObserver = new LLThumbnailsObserver();
+    gInventory.addObserver(mThumbnailsObserver);
 
     mUsername = gAgentUsername;
     LLStringUtil::toUpper(mUsername);
@@ -146,6 +148,12 @@ LLInventoryGallery::~LLInventoryGallery()
         gInventory.removeObserver(mCategoriesObserver);
     }
     delete mCategoriesObserver;
+
+    if (gInventory.containsObserver(mThumbnailsObserver))
+    {
+        gInventory.removeObserver(mThumbnailsObserver);
+    }
+    delete mThumbnailsObserver;
 }
 
 void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
@@ -702,13 +710,8 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
         addToGallery(item);
     }
 
-    if (mCategoriesObserver == NULL)
-    {
-        mCategoriesObserver = new LLInventoryCategoriesObserver();
-        gInventory.addObserver(mCategoriesObserver);
-    }
-    mCategoriesObserver->addCategory(item_id,
-        boost::bind(&LLInventoryGallery::updateItemThumbnail, this, item_id), true);
+    mThumbnailsObserver->addItem(item_id,
+        boost::bind(&LLInventoryGallery::updateItemThumbnail, this, item_id));
 }
 
 void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
@@ -716,7 +719,7 @@ void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
     gallery_item_map_t::iterator item_iter = mItemMap.find(item_id);
     if (item_iter != mItemMap.end())
     {
-        mCategoriesObserver->removeCategory(item_id);
+        mThumbnailsObserver->removeItem(item_id);
 
         LLInventoryGalleryItem* item = item_iter->second;
 
@@ -978,7 +981,7 @@ LLUUID LLInventoryGallery::getOutfitImageID(LLUUID outfit_id)
     return thumbnail_id;
 }
 
-boost::signals2::connection LLInventoryGallery::setRootChangedCallback(root_changed_callback_t cb)
+boost::signals2::connection LLInventoryGallery::setRootChangedCallback(callback_t cb)
 {
     return mRootChangedSignal.connect(cb);
 }
@@ -1340,6 +1343,61 @@ LLFontGL* LLInventoryGalleryItem::getTextFont()
     return mIsLink ? LLFontGL::getFontSansSerifSmallItalic() : LLFontGL::getFontSansSerifSmall();
 }
 
+//-----------------------------
+// LLThumbnailsObserver
+//-----------------------------
+
+void LLThumbnailsObserver::changed(U32 mask)
+{
+    if (!mItemMap.size())
+        return;
+    std::vector<LLUUID> deleted_ids;
+
+    for (item_map_t::iterator iter = mItemMap.begin();
+         iter != mItemMap.end();
+         ++iter)
+    {
+        const LLUUID& obj_id = (*iter).first;
+        LLItemData& data = (*iter).second;
+        
+        LLInventoryObject* obj = gInventory.getObject(obj_id);
+        if (!obj)
+        {
+            deleted_ids.push_back(obj_id);
+            continue;
+        }
+
+        const LLUUID thumbnail_id = obj->getThumbnailUUID();
+        if (data.mThumbnailID != thumbnail_id)
+        {
+            data.mThumbnailID = thumbnail_id;
+            data.mCallback();
+        }
+    }
+
+    // Remove deleted items from the list
+    for (std::vector<LLUUID>::iterator deleted_id = deleted_ids.begin(); deleted_id != deleted_ids.end(); ++deleted_id)
+    {
+        removeItem(*deleted_id);
+    }
+}
+
+bool LLThumbnailsObserver::addItem(const LLUUID& obj_id, callback_t cb)
+{
+    LLInventoryObject* obj = gInventory.getObject(obj_id);
+    if (obj)
+    {
+        mItemMap.insert(item_map_value_t(obj_id, LLItemData(obj_id, obj->getThumbnailUUID(), cb)));
+        return true;
+    }
+    return false;
+}
+
+void LLThumbnailsObserver::removeItem(const LLUUID& obj_id)
+{
+    mItemMap.erase(obj_id);
+}
+
 //-----------------------------
 // Helper drag&drop functions
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 7284c92c96..98ed91df19 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -30,15 +30,19 @@
 #include "lllistcontextmenu.h"
 #include "llpanel.h"
 #include "llinventoryfilter.h"
+#include "llinventoryobserver.h"
 #include "llinventorymodel.h"
 
 class LLInventoryCategoriesObserver;
 class LLInventoryGalleryItem;
 class LLScrollContainer;
 class LLTextBox;
+class LLThumbnailsObserver;
 
 class LLInventoryGalleryContextMenu;
 
+typedef boost::function<void()> callback_t;
+
 class LLInventoryGallery : public LLPanel
 {
 public:
@@ -90,8 +94,7 @@ public:
     void setRootFolder(const LLUUID cat_id);
     void updateRootFolder();
     LLUUID getRootFolder() { return mFolderID; }
-    typedef boost::function<void()> root_changed_callback_t;
-    boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
+    boost::signals2::connection setRootChangedCallback(callback_t cb);
     void onForwardFolder();
     void onBackwardFolder();
     void clearNavigationHistory();
@@ -127,6 +130,7 @@ protected:
     void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
 
     LLInventoryCategoriesObserver*     mCategoriesObserver;
+    LLThumbnailsObserver*              mThumbnailsObserver;
     LLUUID                             mSelectedItemID;
     bool                               mIsInitialized;
 
@@ -279,4 +283,33 @@ private:
     LLInventoryGallery* mGallery;
 };
 
+class LLThumbnailsObserver : public LLInventoryObserver
+{
+public:
+    LLThumbnailsObserver(){};
+
+    virtual void changed(U32 mask);
+    bool addItem(const LLUUID& obj_id, callback_t cb);
+    void removeItem(const LLUUID& obj_id);
+
+protected:
+
+    struct LLItemData
+    {
+        LLItemData(const LLUUID& obj_id, const LLUUID& thumbnail_id, callback_t cb)
+            : mItemID(obj_id)
+            , mCallback(cb)
+            , mThumbnailID(thumbnail_id)
+        {}
+
+        callback_t mCallback;
+        LLUUID mItemID;
+        LLUUID mThumbnailID;
+    };
+
+    typedef std::map<LLUUID, LLItemData> item_map_t;
+    typedef item_map_t::value_type item_map_value_t;
+    item_map_t mItemMap;
+};
+
 #endif
-- 
cgit v1.2.3


From ba8bcf6520eb4cbcdf93393ecdeda4e6c0bc5846 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 3 Apr 2023 22:19:33 +0200
Subject: SL-19042: Replace FMOD with VLC for parcel audio

---
 indra/llaudio/llaudioengine.cpp            | 103 ++++++++++++++---------------
 indra/llaudio/llaudioengine.h              |  13 ++--
 indra/llaudio/llaudioengine_fmodstudio.cpp |  11 +--
 indra/llaudio/llaudioengine_fmodstudio.h   |   1 +
 indra/newview/app_settings/cmd_line.xml    |   6 ++
 indra/newview/app_settings/settings.xml    |  11 +++
 indra/newview/llstartup.cpp                |  27 ++++----
 indra/newview/llvieweraudio.cpp            |  38 +++++------
 8 files changed, 113 insertions(+), 97 deletions(-)

(limited to 'indra')

diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index 008e1827c5..29e96ec4d4 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -206,7 +206,8 @@ std::string LLAudioEngine::getInternetStreamURL()
 {
 	if (mStreamingAudioImpl)
 		return mStreamingAudioImpl->getURL();
-	else return std::string();
+
+	return std::string();
 }
 
 
@@ -347,42 +348,43 @@ void LLAudioEngine::idle()
 			}
 			continue;
 		}
-		else
+
+		// Check to see if the current sound is done playing.
+		if (!channelp->isPlaying())
 		{
-			// Check to see if the current sound is done playing, or looped.
-			if (!channelp->isPlaying())
+			sourcep->mCurrentDatap = sourcep->mQueuedDatap;
+			sourcep->mQueuedDatap = NULL;
+
+			// Reset the timer so the source doesn't die.
+			sourcep->mAgeTimer.reset();
+
+			// Make sure we have the buffer set up if we just decoded the data
+			if (sourcep->mCurrentDatap)
 			{
-				sourcep->mCurrentDatap = sourcep->mQueuedDatap;
-				sourcep->mQueuedDatap = NULL;
+				updateBufferForData(sourcep->mCurrentDatap);
+			}
 
-				// Reset the timer so the source doesn't die.
-				sourcep->mAgeTimer.reset();
+			// Actually play the associated data.
+			sourcep->setupChannel();
+			channelp->updateBuffer();
+			sourcep->getChannel()->play();
+			continue;
+		}
 
-				// Make sure we have the buffer set up if we just decoded the data
-				if (sourcep->mCurrentDatap)
-				{
-					updateBufferForData(sourcep->mCurrentDatap);
-				}
+		// Check to see if the current sound is looped.
+		if (sourcep->isLoop())
+		{
+			// It's a loop, we need to check and see if we're done with it.
+			if (channelp->mLoopedThisFrame)
+			{
+				sourcep->mCurrentDatap = sourcep->mQueuedDatap;
+				sourcep->mQueuedDatap = NULL;
 
-				// Actually play the associated data.
+				// Actually, should do a time sync so if we're a loop master/slave
+				// we don't drift away.
 				sourcep->setupChannel();
-				channelp->updateBuffer();
 				sourcep->getChannel()->play();
 			}
-			else if (sourcep->isLoop())
-			{
-				// It's a loop, we need to check and see if we're done with it.
-				if (channelp->mLoopedThisFrame)
-				{
-					sourcep->mCurrentDatap = sourcep->mQueuedDatap;
-					sourcep->mQueuedDatap = NULL;
-
-					// Actually, should do a time sync so if we're a loop master/slave
-					// we don't drift away.
-					sourcep->setupChannel();
-					sourcep->getChannel()->play();
-				}
-			}
 		}
 	}
 
@@ -398,18 +400,11 @@ void LLAudioEngine::idle()
 	for (iter = mAllSources.begin(); iter != mAllSources.end(); ++iter)
 	{
 		LLAudioSource *sourcep = iter->second;
-		if (sourcep->isMuted())
-		{
-			continue;
-		}
-		if (sourcep->isSyncMaster())
+		if (!sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
 		{
-			if (sourcep->getPriority() > max_sm_priority)
-			{
-				sync_masterp = sourcep;
-				master_channelp = sync_masterp->getChannel();
-				max_sm_priority = sourcep->getPriority();
-			}
+			sync_masterp = sourcep;
+			master_channelp = sync_masterp->getChannel();
+			max_sm_priority = sourcep->getPriority();
 		}
 	}
 
@@ -739,7 +734,7 @@ F64 LLAudioEngine::mapWindVecToGain(LLVector3 wind_vec)
 	}
 
 	return (gain);
-} 
+}
 
 
 F64 LLAudioEngine::mapWindVecToPitch(LLVector3 wind_vec)
@@ -966,12 +961,11 @@ void LLAudioEngine::cleanupAudioSource(LLAudioSource *asp)
 	else
 	{
 		LL_DEBUGS("AudioEngine") << "Cleaning up audio sources for "<< asp->getID() <<LL_ENDL;
-	delete asp;
-	mAllSources.erase(iter);
-}
+		delete asp;
+		mAllSources.erase(iter);
+	}
 }
 
-
 bool LLAudioEngine::hasDecodedFile(const LLUUID &uuid)
 {
 	std::string uuid_str;
@@ -1690,20 +1684,19 @@ void LLAudioChannel::setSource(LLAudioSource *sourcep)
 	{
 		LL_DEBUGS("AudioEngine") << "( id: " << sourcep->getID() << ")" << LL_ENDL;
 
-	if (sourcep == mCurrentSourcep)
-	{
-		// Don't reallocate the channel, this will make FMOD goofy.
-		//LL_INFOS() << "Calling setSource with same source!" << LL_ENDL;
-	}
+		if (sourcep == mCurrentSourcep)
+		{
+			// Don't reallocate the channel, this will make FMOD goofy.
+			//LL_INFOS() << "Calling setSource with same source!" << LL_ENDL;
+		}
 
-	mCurrentSourcep = sourcep;
+		mCurrentSourcep = sourcep;
 
-	updateBuffer();
-	update3DPosition();
-}
+		updateBuffer();
+		update3DPosition();
+	}
 }
 
-
 bool LLAudioChannel::updateBuffer()
 {
 	if (!gAudiop)
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index 0fe8b3d756..a133898969 100755
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -90,6 +90,7 @@ public:
 	// initialization/startup/shutdown
 	virtual bool init(void *userdata, const std::string &app_title);
 	virtual std::string getDriverName(bool verbose) = 0;
+	virtual LLStreamingAudioInterface *createDefaultStreamingAudioImpl() const = 0;
 	virtual void shutdown();
 
 	// Used by the mechanics of the engine
@@ -468,13 +469,13 @@ struct SoundData
 		const LLUUID& owner_id, 
 		const F32 gain, 					  
 		const S32 type = LLAudioEngine::AUDIO_TYPE_NONE,
-		const LLVector3d &pos_global = LLVector3d::zero)
+		const LLVector3d &pos_global = LLVector3d::zero) :
+		audio_uuid(audio_uuid),
+		owner_id(owner_id),
+		gain(gain),
+		type(type),
+		pos_global(pos_global)
 	{
-		this->audio_uuid = audio_uuid;
-		this->owner_id = owner_id;
-		this->gain = gain;
-		this->type = type;
-		this->pos_global = pos_global;
 	}
 };
 
diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp
index ba743020b5..c6313ea289 100644
--- a/indra/llaudio/llaudioengine_fmodstudio.cpp
+++ b/indra/llaudio/llaudioengine_fmodstudio.cpp
@@ -208,10 +208,6 @@ bool LLAudioEngine_FMODSTUDIO::init(void* userdata, const std::string &app_title
     }
 #endif
 
-    // set up our favourite FMOD-native streaming audio implementation if none has already been added
-    if (!getStreamingAudioImpl()) // no existing implementation added
-        setStreamingAudioImpl(new LLStreamingAudio_FMODSTUDIO(mSystem));
-
     LL_INFOS("AppInit") << "LLAudioEngine_FMODSTUDIO::init() FMOD Studio initialized correctly" << LL_ENDL;
 
     int r_numbuffers, r_samplerate, r_channels;
@@ -253,6 +249,13 @@ std::string LLAudioEngine_FMODSTUDIO::getDriverName(bool verbose)
 }
 
 
+// create our favourite FMOD-native streaming audio implementation
+LLStreamingAudioInterface *LLAudioEngine_FMODSTUDIO::createDefaultStreamingAudioImpl() const
+{
+    return new LLStreamingAudio_FMODSTUDIO(mSystem);
+}
+
+
 void LLAudioEngine_FMODSTUDIO::allocateListener(void)
 {
     mListenerp = (LLListener *) new LLListener_FMODSTUDIO(mSystem);
diff --git a/indra/llaudio/llaudioengine_fmodstudio.h b/indra/llaudio/llaudioengine_fmodstudio.h
index d3d6d69685..29e7bc6bf0 100644
--- a/indra/llaudio/llaudioengine_fmodstudio.h
+++ b/indra/llaudio/llaudioengine_fmodstudio.h
@@ -53,6 +53,7 @@ public:
 	// initialization/startup/shutdown
 	virtual bool init(void *user_data, const std::string &app_title);
 	virtual std::string getDriverName(bool verbose);
+	virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const;
 	virtual void allocateListener();
 
 	virtual void shutdown();
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index e16a5c7e76..340334aee8 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -209,6 +209,12 @@
       <string>NoAudio</string>
     </map>
 
+    <key>nofmod</key>
+    <map>
+      <key>map-to</key>
+      <string>UseMediaPluginsForStreamingAudio</string>
+    </map>
+
     <key>noninteractive</key>
     <map>
       <key>desc</key>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 411f77e6a7..c6dca39c99 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7077,6 +7077,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>UseMediaPluginsForStreamingAudio</key>
+    <map>
+      <key>Comment</key>
+      <string>Use media plugins (VLC) for streaming audio.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>NoHardwareProbe</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6883ead5ee..9cebce2609 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -660,9 +660,22 @@ bool idle_startup()
 #else
 				void* window_handle = NULL;
 #endif
-				bool init = gAudiop->init(window_handle, LLAppViewer::instance()->getSecondLifeTitle());
-				if(init)
+				if (gAudiop->init(window_handle, LLAppViewer::instance()->getSecondLifeTitle()))
 				{
+					if (FALSE == gSavedSettings.getBOOL("UseMediaPluginsForStreamingAudio"))
+					{
+						LL_INFOS("AppInit") << "Using default impl to render streaming audio" << LL_ENDL;
+						gAudiop->setStreamingAudioImpl(gAudiop->createDefaultStreamingAudioImpl());
+					}
+
+					// if the audio engine hasn't set up its own preferred handler for streaming audio
+					// then set up the generic streaming audio implementation which uses media plugins
+					if (NULL == gAudiop->getStreamingAudioImpl())
+					{
+						LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;
+						gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());
+					}
+
 					gAudiop->setMuted(TRUE);
 				}
 				else
@@ -671,16 +684,6 @@ bool idle_startup()
 					delete gAudiop;
 					gAudiop = NULL;
 				}
-
-				if (gAudiop)
-				{
-					// if the audio engine hasn't set up its own preferred handler for streaming audio then set up the generic streaming audio implementation which uses media plugins
-					if (NULL == gAudiop->getStreamingAudioImpl())
-					{
-						LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;
-						gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());
-					}
-				}
 			}
 		}
 		
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index cc73f7ca80..6a0edbecb1 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -91,17 +91,18 @@ void LLViewerAudio::startInternetStreamWithAutoFade(const std::string &streamURI
 		return;
 	}
 
-	// Record the URI we are going to be switching to	
+	if (!gAudiop)
+	{
+		LL_WARNS("AudioEngine") << "LLAudioEngine instance doesn't exist!" << LL_ENDL;
+		return;
+	}
+
+	// Record the URI we are going to be switching to
 	mNextStreamURI = streamURI;
 
 	switch (mFadeState)
 	{
 	case FADE_IDLE:
-		if (!gAudiop)
-		{
-			LL_WARNS("AudioEngine") << "LLAudioEngine instance doesn't exist!" << LL_ENDL;
-			break;
-		}
 		// If a stream is playing fade it out first
 		if (!gAudiop->getInternetStreamURL().empty())
 		{
@@ -114,28 +115,28 @@ void LLViewerAudio::startInternetStreamWithAutoFade(const std::string &streamURI
 			mFadeState = FADE_IN;
 
 			LLStreamingAudioInterface *stream = gAudiop->getStreamingAudioImpl();
-			if(stream && stream->supportsAdjustableBufferSizes())
-				stream->setBufferSizes(gSavedSettings.getU32("FMODExStreamBufferSize"),gSavedSettings.getU32("FMODExDecodeBufferSize"));
+			if (stream && stream->supportsAdjustableBufferSizes())
+				stream->setBufferSizes(gSavedSettings.getU32("FMODExStreamBufferSize"), gSavedSettings.getU32("FMODExDecodeBufferSize"));
 
 			gAudiop->startInternetStream(mNextStreamURI);
-			startFading();
-			registerIdleListener();
-			break;
 		}
 
+		startFading();
+		break;
+
 	case FADE_OUT:
 		startFading();
-		registerIdleListener();
 		break;
 
 	case FADE_IN:
-		registerIdleListener();
 		break;
 
 	default:
 		LL_WARNS() << "Unknown fading state: " << mFadeState << LL_ENDL;
-		break;
+		return;
 	}
+
+	registerIdleListener();
 }
 
 // A return of false from onIdleUpdate means it will be called again next idle update.
@@ -236,15 +237,12 @@ void LLViewerAudio::startFading()
 	// This minimum fade time prevents divide by zero and negative times
 	const F32 AUDIO_MUSIC_MINIMUM_FADE_TIME = 0.01f;
 
-	if(mDone)
+	if (mDone)
 	{
 		// The fade state here should only be one of FADE_IN or FADE_OUT, but, in case it is not,
 		// rather than check for both states assume a fade in and check for the fade out case.
-		mFadeTime = AUDIO_MUSIC_FADE_IN_TIME;
-		if (LLViewerAudio::getInstance()->getFadeState() == LLViewerAudio::FADE_OUT)
-		{
-			mFadeTime = AUDIO_MUSIC_FADE_OUT_TIME;
-		}
+		mFadeTime = LLViewerAudio::getInstance()->getFadeState() == LLViewerAudio::FADE_OUT ?
+			AUDIO_MUSIC_FADE_OUT_TIME : AUDIO_MUSIC_FADE_IN_TIME;
 
 		// Prevent invalid fade time
 		mFadeTime = llmax(mFadeTime, AUDIO_MUSIC_MINIMUM_FADE_TIME);
-- 
cgit v1.2.3


From 7a402e352d1982e6361c966590eb07556418154b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 5 Apr 2023 00:10:08 +0300
Subject: SL-19379 selection fix

---
 indra/newview/llinventorygallery.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 8c2f4c2214..b964ecff05 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -794,7 +794,7 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
 
 void LLInventoryGallery::changeItemSelection(const LLUUID& item_id)
 {
-    if ((mItemMap.count(item_id) > 0) && (mSelectedItemID == item_id))
+    if ((mItemMap.count(item_id) == 0) || (mSelectedItemID == item_id))
         return;
 
     if (mItemMap[mSelectedItemID])
@@ -1136,6 +1136,7 @@ LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
     mUUID(LLUUID()),
     mIsFolder(true),
     mIsLink(false),
+    mHidden(false),
     mGallery(NULL),
     mType(LLAssetType::AT_NONE),
     mSortGroup(SG_ITEM)
@@ -1151,9 +1152,8 @@ BOOL LLInventoryGalleryItem::postBuild()
 {
     mNameText = getChild<LLTextBox>("item_name");
     mSuffixText = getChild<LLTextBox>("suffix_text");
-
     mTextBgPanel = getChild<LLPanel>("text_bg_panel");
-    mHidden = false;
+
     return TRUE;
 }
 
-- 
cgit v1.2.3


From 01fd1cdddedc11cb6d9803a6606f54d069994a45 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 5 Apr 2023 22:32:12 +0300
Subject: SL-19522 Some .anim files fail to upload

---
 indra/llcharacter/llkeyframemotion.cpp | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 403d5bcf49..6cc4295fc8 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -1399,6 +1399,8 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	// get number of joint motions
 	//-------------------------------------------------------------------------
 	U32 num_motions = 0;
+    S32 rotation_dupplicates = 0;
+    S32 position_dupplicates = 0;
 	if (!dp.unpackU32(num_motions, "num_joints"))
 	{
 		LL_WARNS() << "can't read number of joints"
@@ -1629,6 +1631,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			rCurve->mKeys[time] = rot_key;
 		}
 
+        if (joint_motion->mRotationCurve.mNumKeys > joint_motion->mRotationCurve.mKeys.size())
+        {
+            rotation_dupplicates++;
+            LL_INFOS() << "Motion: " << asset_id << " had dupplicate rotation keys that were removed" << LL_ENDL;
+        }
+
 		//---------------------------------------------------------------------
 		// scan position curve header
 		//---------------------------------------------------------------------
@@ -1731,9 +1739,24 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			}
 		}
 
+        if (joint_motion->mPositionCurve.mNumKeys > joint_motion->mPositionCurve.mKeys.size())
+        {
+            position_dupplicates++;
+        }
+
 		joint_motion->mUsage = joint_state->getUsage();
 	}
 
+    if (rotation_dupplicates > 0)
+    {
+        LL_INFOS() << "Motion: " << asset_id << " had " << rotation_dupplicates << " dupplicate rotation keys that were removed" << LL_ENDL;
+    }
+
+    if (position_dupplicates > 0)
+    {
+        LL_INFOS() << "Motion: " << asset_id << " had " << position_dupplicates << " dupplicate position keys that were removed" << LL_ENDL;
+    }
+
 	//-------------------------------------------------------------------------
 	// get number of constraints
 	//-------------------------------------------------------------------------
@@ -2013,9 +2036,12 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
 		JointMotion* joint_motionp = mJointMotionList->getJointMotion(i);
 		success &= dp.packString(joint_motionp->mJointName, "joint_name");
 		success &= dp.packS32(joint_motionp->mPriority, "joint_priority");
-		success &= dp.packS32(joint_motionp->mRotationCurve.mNumKeys, "num_rot_keys");
+        success &= dp.packS32(joint_motionp->mRotationCurve.mKeys.size(), "num_rot_keys");
 
-		LL_DEBUGS("BVH") << "Joint " << joint_motionp->mJointName << LL_ENDL;
+		LL_DEBUGS("BVH") << "Joint " << i
+            << " name: " << joint_motionp->mJointName
+            << " Rotation keys: " << joint_motionp->mRotationCurve.mKeys.size()
+            << " Position keys: " << joint_motionp->mPositionCurve.mKeys.size() << LL_ENDL;
 		for (RotationCurve::key_map_t::iterator iter = joint_motionp->mRotationCurve.mKeys.begin();
 			 iter != joint_motionp->mRotationCurve.mKeys.end(); ++iter)
 		{
@@ -2037,7 +2063,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
 			LL_DEBUGS("BVH") << "  rot: t " << rot_key.mTime << " angles " << rot_angles.mV[VX] <<","<< rot_angles.mV[VY] <<","<< rot_angles.mV[VZ] << LL_ENDL;
 		}
 
-		success &= dp.packS32(joint_motionp->mPositionCurve.mNumKeys, "num_pos_keys");
+		success &= dp.packS32(joint_motionp->mPositionCurve.mKeys.size(), "num_pos_keys");
 		for (PositionCurve::key_map_t::iterator iter = joint_motionp->mPositionCurve.mKeys.begin();
 			 iter != joint_motionp->mPositionCurve.mKeys.end(); ++iter)
 		{
-- 
cgit v1.2.3


From 99a8c612d008531f64b2ff94713866adf2e91243 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 01:20:51 +0300
Subject: SL-19536 Inventory isn't fetched automatically

Just a 'hotfix' that won't conflict with further changes, should be properly resolved in DRTVWR-567
---
 indra/newview/llstartup.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index dd3b33982a..c52fdf4bc1 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1905,6 +1905,7 @@ bool idle_startup()
 			LLNotificationsUtil::add("InventoryUnusable");
 		}
 		
+        LLInventoryModelBackgroundFetch::instance().start();
 		gInventory.createCommonSystemCategories();
 
 		// It's debatable whether this flag is a good idea - sets all
-- 
cgit v1.2.3


From fe695f3db250bdab10ebb1edffc38ade559c5cf2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 01:53:24 +0300
Subject: SL-19529 Marketplace version folders not created

---
 indra/newview/llinventoryfunctions.cpp | 53 +++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 7979ef209a..205ccf4885 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1398,9 +1398,29 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
             LLUUID item_id = inv_item->getUUID();
             std::function<void(const LLUUID&)> callback_create_stock = [copy, item_id](const LLUUID& new_cat_id)
             {
+                if (new_cat_id.isNull())
+                {
+                    LL_WARNS() << "Failed to create category" << LL_ENDL;
+                    LLSD subs;
+                    subs["[ERROR_CODE]"] =
+                        LLTrans::getString("Marketplace Error Prefix") + LLTrans::getString("Marketplace Error Not Accepted");
+                    LLNotificationsUtil::add("MerchantPasteFailed", subs);
+                    return;
+                }
+
                 // Verify we can have this item in that destination category
                 LLViewerInventoryCategory* dest_cat = gInventory.getCategory(new_cat_id);
                 LLViewerInventoryItem * viewer_inv_item = gInventory.getItem(item_id);
+                if (!dest_cat || !viewer_inv_item)
+                {
+                    LL_WARNS() << "Move to marketplace: item or folder do not exist" << LL_ENDL;
+
+                    LLSD subs;
+                    subs["[ERROR_CODE]"] =
+                        LLTrans::getString("Marketplace Error Prefix") + LLTrans::getString("Marketplace Error Not Accepted");
+                    LLNotificationsUtil::add("MerchantPasteFailed", subs);
+                    return;
+                }
                 if (!dest_cat->acceptItem(viewer_inv_item))
                 {
                     LLSD subs;
@@ -1429,6 +1449,16 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
 
             std::function<void(const LLUUID&)> callback_dest_create = [item_id, callback_create_stock](const LLUUID& new_cat_id)
             {
+                if (new_cat_id.isNull())
+                {
+                    LL_WARNS() << "Failed to create category" << LL_ENDL;
+                    LLSD subs;
+                    subs["[ERROR_CODE]"] =
+                        LLTrans::getString("Marketplace Error Prefix") + LLTrans::getString("Marketplace Error Not Accepted");
+                    LLNotificationsUtil::add("MerchantPasteFailed", subs);
+                    return;
+                }
+
                 LLViewerInventoryCategory* dest_cat = gInventory.getCategory(new_cat_id);
                 LLViewerInventoryItem * viewer_inv_item = gInventory.getItem(item_id);
                 if (!viewer_inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID()) &&
@@ -1446,7 +1476,28 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
             if (depth == 0)
             {
                 // We need a listing folder
-               gInventory.createNewCategory(dest_folder, LLFolderType::FT_NONE, viewer_inv_item->getName(), callback_dest_create);
+               gInventory.createNewCategory(dest_folder,
+                                            LLFolderType::FT_NONE,
+                                            viewer_inv_item->getName(),
+                                            [item_id, callback_dest_create](const LLUUID &new_cat_id)
+                                            {
+                                                if (new_cat_id.isNull())
+                                                {
+                                                    LL_WARNS() << "Failed to create listing folder for marketpace" << LL_ENDL;
+                                                    return;
+                                                }
+                                                LLViewerInventoryCategory *dest_cat = gInventory.getCategory(new_cat_id);
+                                                if (!dest_cat)
+                                                {
+                                                    LL_WARNS() << "Failed to find freshly created listing folder" << LL_ENDL;
+                                                    return;
+                                                }
+                                                // version folder
+                                                gInventory.createNewCategory(new_cat_id,
+                                                                             LLFolderType::FT_NONE,
+                                                                             dest_cat->getName(),
+                                                                             callback_dest_create);
+                                            });
             }
             if (depth == 1)
             {
-- 
cgit v1.2.3


From 0d12b5f637fb2bbf335a28c93dd6eaf416e71c95 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 02:36:16 +0300
Subject: SL-19529 MacOS build fix

---
 indra/newview/llinventoryfunctions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 205ccf4885..00ff0e83c0 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1479,7 +1479,7 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
                gInventory.createNewCategory(dest_folder,
                                             LLFolderType::FT_NONE,
                                             viewer_inv_item->getName(),
-                                            [item_id, callback_dest_create](const LLUUID &new_cat_id)
+                                            [callback_dest_create](const LLUUID &new_cat_id)
                                             {
                                                 if (new_cat_id.isNull())
                                                 {
-- 
cgit v1.2.3


From cc39c1e852b1b8ad0e6dc2bb7907b8116c716c1d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 19:51:08 +0300
Subject: SL-19544 preparation for Combination view

---
 indra/newview/llinventoryfilter.cpp                | 34 ++++++++++++++++++++++
 indra/newview/llinventoryfilter.h                  | 14 +++++++++
 indra/newview/llinventorygallery.cpp               |  6 ++++
 indra/newview/llpanelmaininventory.cpp             | 13 ++++++++-
 indra/newview/llpanelmaininventory.h               |  1 +
 .../default/xui/en/menu_inventory_view_default.xml |  1 -
 .../skins/default/xui/en/panel_main_inventory.xml  | 11 +++++++
 7 files changed, 78 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 5a300bad32..5c02b61522 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -63,6 +63,7 @@ LLInventoryFilter::FilterOps::FilterOps(const Params& p)
 	mFilterTypes(p.types),
 	mFilterUUID(p.uuid),
 	mFilterLinks(p.links),
+    mFilterThumbnails(p.thumbnails),
 	mSearchVisibility(p.search_visibility)
 {
 }
@@ -158,6 +159,8 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item)
 	passed = passed && checkAgainstCreator(listener);
 	passed = passed && checkAgainstSearchVisibility(listener);
 
+    passed = passed && checkAgainstFilterThumbnails(listener->getUUID());
+
 	return passed;
 }
 
@@ -567,6 +570,19 @@ bool LLInventoryFilter::checkAgainstFilterLinks(const LLFolderViewModelItemInven
 	return TRUE;
 }
 
+bool LLInventoryFilter::checkAgainstFilterThumbnails(const LLUUID& object_id) const
+{
+    const LLInventoryObject *object = gInventory.getObject(object_id);
+    if (!object) return true;
+
+    const bool is_thumbnail = object->getThumbnailUUID().notNull();
+    if (is_thumbnail && (mFilterOps.mFilterThumbnails == FILTER_EXCLUDE_THUMBNAILS))
+        return false;
+    if (!is_thumbnail && (mFilterOps.mFilterThumbnails == FILTER_ONLY_THUMBNAILS))
+        return false;
+    return true;
+}
+
 bool LLInventoryFilter::checkAgainstCreator(const LLFolderViewModelItemInventory* listener) const
 {
 	if (!listener) return TRUE;
@@ -738,6 +754,19 @@ void LLInventoryFilter::setFilterSettingsTypes(U64 types)
     mFilterOps.mFilterTypes |= FILTERTYPE_SETTINGS;
 }
 
+void LLInventoryFilter::setFilterThumbnails(U64 filter_thumbnails)
+{
+    if (mFilterOps.mFilterThumbnails != filter_thumbnails)
+    {
+        if (mFilterOps.mFilterThumbnails == FILTER_EXCLUDE_THUMBNAILS ||
+            mFilterOps.mFilterThumbnails == FILTER_ONLY_THUMBNAILS)
+            setModified(FILTER_MORE_RESTRICTIVE);
+        else
+            setModified(FILTER_LESS_RESTRICTIVE);
+    }
+    mFilterOps.mFilterThumbnails = filter_thumbnails;
+}
+
 void LLInventoryFilter::setFilterEmptySystemFolders()
 {
 	mFilterOps.mFilterTypes |= FILTERTYPE_EMPTYFOLDERS;
@@ -1526,6 +1555,11 @@ U64 LLInventoryFilter::getSearchVisibilityTypes() const
 	return mFilterOps.mSearchVisibility;
 }
 
+U64 LLInventoryFilter::getFilterThumbnails() const
+{
+    return mFilterOps.mFilterThumbnails;
+}
+
 bool LLInventoryFilter::hasFilterString() const
 {
 	return mFilterSubString.size() > 0;
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 267decfeb4..ada1d0f4b4 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -75,6 +75,13 @@ public:
 		FILTERLINK_ONLY_LINKS		// only show links
 	};
 
+    enum EFilterThumbnail
+    {
+        FILTER_INCLUDE_THUMBNAILS,
+        FILTER_EXCLUDE_THUMBNAILS,
+        FILTER_ONLY_THUMBNAILS
+    };
+
 	enum ESortOrderType
 	{
 		SO_NAME = 0,						// Sort inventory by name
@@ -140,12 +147,14 @@ public:
 			Optional<EFolderShow>		show_folder_state;
 			Optional<PermissionMask>	permissions;
 			Optional<EFilterCreatorType> creator_type;
+            Optional<EFilterThumbnail> thumbnails;
 
 			Params()
 			:	types("filter_types", FILTERTYPE_OBJECT),
 				object_types("object_types", 0xffffFFFFffffFFFFULL),
 				wearable_types("wearable_types", 0xffffFFFFffffFFFFULL),
                 settings_types("settings_types", 0xffffFFFFffffFFFFULL),
+                thumbnails("thumbnails", FILTER_INCLUDE_THUMBNAILS),
 				category_types("category_types", 0xffffFFFFffffFFFFULL),
 				links("links", FILTERLINK_INCLUDE_LINKS),
 				search_visibility("search_visibility", 0xFFFFFFFF),
@@ -166,6 +175,7 @@ public:
 		U64				mFilterObjectTypes,   // For _OBJECT
 						mFilterWearableTypes,
                         mFilterSettingsTypes, // for _SETTINGS
+                        mFilterThumbnails,
 						mFilterLinks,
 						mFilterCategoryTypes; // For _CATEGORY
 		LLUUID      	mFilterUUID; 		  // for UUID
@@ -208,6 +218,7 @@ public:
 	U64					getFilterWearableTypes() const;
 	U64					getFilterSettingsTypes() const;
 	U64					getSearchVisibilityTypes() const;
+    U64                 getFilterThumbnails() const;
 
 	bool 				isFilterObjectTypesWith(LLInventoryType::EType t) const;
 	void 				setFilterObjectTypes(U64 types);
@@ -222,6 +233,7 @@ public:
 	void				setFilterMarketplaceUnassociatedFolders();
     void                setFilterMarketplaceListingFolders(bool select_only_listing_folders);
     void                setFilterNoMarketplaceFolder();
+    void                setFilterThumbnails(U64 filter_thumbnails);
 	void				updateFilterTypes(U64 types, U64& current_types);
 	void 				setSearchType(ESearchType type);
 	ESearchType			getSearchType() { return mSearchType; }
@@ -325,6 +337,8 @@ public:
 
 	LLInventoryFilter& operator =(const LLInventoryFilter& other);
 
+    bool checkAgainstFilterThumbnails(const LLUUID& object_id) const;
+
 private:
 	bool				areDateLimitsSet();
 	bool 				checkAgainstFilterType(const class LLFolderViewModelItemInventory* listener) const;
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index b964ecff05..c3e06fafc5 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -613,6 +613,12 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
         return;
     }
 
+    if(!mFilter->checkAgainstFilterThumbnails(item->getUUID()))
+    {
+        item->setHidden(true);
+        return;
+    }
+
     if(!checkAgainstFilterType(item->getUUID()))
     {
         item->setHidden(true);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 79b41f8e5f..7d7a92de81 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1421,6 +1421,7 @@ void LLPanelMainInventory::toggleViewMode()
     getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
     getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
     getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
+    getChild<LLPanel>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
     getChild<LLLayoutPanel>("nav_buttons")->setVisible(mSingleFolderMode);
     getChild<LLButton>("view_mode_btn")->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
 
@@ -1823,6 +1824,10 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
     {
         setViewMode(MODE_GALLERY);
     }
+    if (command_name == "combination_view")
+    {
+        setViewMode(MODE_COMBINATION);
+    }
 }
 
 void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
@@ -2042,7 +2047,7 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
     }
     if (command_name == "combination_view")
     {
-        return false;
+        return isCombinationViewMode();
     }
 
 	return FALSE;
@@ -2127,6 +2132,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
 
         getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
         getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
+        getChild<LLPanel>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
 
         if(isListViewMode())
         {
@@ -2166,6 +2172,11 @@ LLUUID LLPanelMainInventory::getCurrentSFVRoot()
     {
         return mInventoryGalleryPanel->getRootFolder();
     }
+    if(isCombinationViewMode())
+    {
+        //todo: should get actual Combination view root
+        return mSingleFolderPanelInventory->getSingleFolderRoot();
+    }
     return LLUUID::null;
 }
 
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 1e171d5066..4a27bbca4e 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -125,6 +125,7 @@ public:
     void setViewMode(EViewModeType mode);
     bool isListViewMode() { return (mViewMode == MODE_LIST); }
     bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); }
+    bool isCombinationViewMode() { return (mViewMode == MODE_COMBINATION); }
     LLUUID getCurrentSFVRoot();
     std::string getLocalizedRootName();
 
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 28ec8f2bf1..c7f9822e41 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -89,7 +89,6 @@
     <menu_item_check
      label="Combination view"
      layout="topleft"
-     enabled="false"
      name="combination_view">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d670161e00..dc8720b9d1 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -328,4 +328,15 @@
        follows="all"
        layout="topleft" />
     </panel>
+    <panel
+     follows="all"
+     halign="center"
+     height="372"
+     layout="topleft"
+     left="7"
+     name="combination_view_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+    </panel>
 </panel>
-- 
cgit v1.2.3


From d7690a3f211949e9e3958902531424fc22e56542 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 19:57:33 +0300
Subject: SL-19545 Shift Azure's 'Verify' button

---
 .../xui/en/floater_translation_settings.xml        | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index a5154d99ec..dc3e072adf 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -224,15 +224,6 @@
   top_delta="-4"
   name="azure_api_key"
   width="210" />
- <button
-  follows="left|top"
-  height="23"
-  label="Verify"
-  layout="topleft"
-  left_pad="10"
-  name="verify_azure_api_key_btn"
-  top_delta="-2"
-  width="90" />
   <text
    type="string"
    length="1"
@@ -241,7 +232,7 @@
    layout="topleft"
    left="70"
    name="azure_api_region_label"
-   top_pad="10"
+   top_pad="11"
    width="85">
     Region:
   </text>
@@ -255,6 +246,15 @@
    top_delta="-4"
    name="azure_api_region"
    width="210" />
+  <button
+   follows="left|top"
+   height="23"
+   label="Verify"
+   layout="topleft"
+   left_pad="10"
+   name="verify_azure_api_key_btn"
+   top_delta="-2"
+   width="90" />
 
  <text
   follows="top|right"
@@ -263,7 +263,7 @@
   left="70"
   length="1"
   name="google_api_key_label"
-  top_pad="55"
+  top_pad="53"
   type="string"
   width="85">
   Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]:
-- 
cgit v1.2.3


From b3beabec8660602a891c94f4afb8c63a2b31e62f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 20:12:56 +0300
Subject: SL-19550 Add a shop menu item to the Inventory menu

---
 indra/newview/llpanelmaininventory.cpp                    |  6 +++++-
 indra/newview/skins/default/xui/en/menu_inventory_add.xml | 11 ++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 7d7a92de81..5535d64d27 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -60,6 +60,7 @@
 #include "llfolderview.h"
 #include "llradiogroup.h"
 #include "llenvironment.h"
+#include "llweb.h"
 
 const std::string FILTERS_FILENAME("filters.xml");
 
@@ -1815,7 +1816,10 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
             LLAvatarActions::shareWithAvatars(this);
         }
     }
-
+    if (command_name == "shop")
+    {
+        LLWeb::loadURL(gSavedSettings.getString("MarketplaceURL"));
+    }
     if (command_name == "list_view")
     {
         setViewMode(MODE_LIST);
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 3385a29a6c..12ba121d3c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -290,4 +290,13 @@
                     function="Inventory.EnvironmentEnabled" />
         </menu_item_call>
     </menu>
-</menu>
\ No newline at end of file
+    <menu_item_separator/>
+    <menu_item_call
+     label="Shop..."
+     layout="topleft"
+     name="Shop">
+        <menu_item_call.on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="shop" />
+    </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From ae2c53f52b79ac9a8fe484bc2509a6deff47dc62 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 21:19:44 +0300
Subject: SL-19534 Fixed 'working' cursor flicker

---
 indra/llwindow/llwindow.h          | 3 ++-
 indra/newview/llinventorypanel.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 0edf39f6ef..802a3b5213 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -118,7 +118,8 @@ public:
 
 	// Sets cursor, may set to arrow+hourglass
 	virtual void setCursor(ECursorType cursor) { mNextCursor = cursor; };
-	virtual ECursorType getCursor() const;
+    virtual ECursorType getCursor() const;
+    virtual ECursorType getNextCursor() const { return mNextCursor; };
 	virtual void updateCursor() = 0;
 
 	virtual void captureMouse() = 0;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index f97f07f52c..0589b5b3f3 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1270,8 +1270,10 @@ BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
 {
 	BOOL handled = LLView::handleHover(x, y, mask);
 	if(handled)
-	{
-		ECursorType cursor = getWindow()->getCursor();
+    {
+        // getCursor gets current cursor, setCursor sets next cursor
+        // check that children didn't set own 'next' cursor
+		ECursorType cursor = getWindow()->getNextCursor();
 		if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() && cursor == UI_CURSOR_ARROW)
 		{
 			// replace arrow cursor with arrow and hourglass cursor
-- 
cgit v1.2.3


From 3c23be758ef8804047bf96d0619bd95e7760e904 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 21:22:30 +0300
Subject: SL-19534 Fixed fetch timeout during initial fetch

---
 indra/newview/llinventoryobserver.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 4db913ed0d..0b02528246 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -151,7 +151,7 @@ LLInventoryFetchItemsObserver::LLInventoryFetchItemsObserver(const uuid_vec_t& i
 
 void LLInventoryFetchItemsObserver::changed(U32 mask)
 {
-	LL_DEBUGS() << this << " remaining incomplete " << mIncomplete.size()
+    LL_DEBUGS("InventoryFetch") << this << " remaining incomplete " << mIncomplete.size()
 			 << " complete " << mComplete.size()
 			 << " wait period " << mFetchingPeriod.getRemainingTimeF32()
 			 << LL_ENDL;
@@ -160,6 +160,15 @@ void LLInventoryFetchItemsObserver::changed(U32 mask)
 	// appropriate.
 	if (!mIncomplete.empty())
 	{
+        if (!LLInventoryModelBackgroundFetch::getInstance()->isEverythingFetched())
+        {
+            // Folders have a priority over items and they download items as well
+            // Wait untill initial folder fetch is done
+            LL_DEBUGS("InventoryFetch") << "Folder fetch in progress, resetting fetch timer" << LL_ENDL;
+
+            mFetchingPeriod.reset();
+            mFetchingPeriod.setTimerExpirySec(FETCH_TIMER_EXPIRY);
+        }
 
 		// Have we exceeded max wait time?
 		bool timeout_expired = mFetchingPeriod.hasExpired();
@@ -178,7 +187,7 @@ void LLInventoryFetchItemsObserver::changed(U32 mask)
 				if (timeout_expired)
 				{
 					// Just concede that this item hasn't arrived in reasonable time and continue on.
-					LL_WARNS() << "Fetcher timed out when fetching inventory item UUID: " << item_id << LL_ENDL;
+                    LL_WARNS("InventoryFetch") << "Fetcher timed out when fetching inventory item UUID: " << item_id << LL_ENDL;
 					it = mIncomplete.erase(it);
 				}
 				else
@@ -193,7 +202,7 @@ void LLInventoryFetchItemsObserver::changed(U32 mask)
 
 	if (mIncomplete.empty())
 	{
-		LL_DEBUGS() << this << " done at remaining incomplete "
+        LL_DEBUGS("InventoryFetch") << this << " done at remaining incomplete "
 				 << mIncomplete.size() << " complete " << mComplete.size() << LL_ENDL;
 		done();
 	}
-- 
cgit v1.2.3


From ff0edab69a1dc4884b7636c2546327901ce8fdde Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 7 Apr 2023 01:07:59 +0300
Subject: post-merge buildfix

---
 indra/llcommon/llsdserialize.h    |  2 +-
 indra/newview/llfilepicker.cpp    |  4 ++--
 indra/newview/llfilepicker_mac.h  |  2 +-
 indra/newview/llfilepicker_mac.mm | 28 ++++++++++++++--------------
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index cf6c1ab73a..2f12c6d1ff 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -870,7 +870,7 @@ public:
 LL_COMMON_API std::string zip_llsd(LLSD& data);
 
 
-LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size);
+LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size);
 
 // returns a pointer to the array or past the array if the deprecated header exists
 LL_COMMON_API char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size = nullptr);
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 51b2f25f8d..b61afcbbc9 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -716,9 +716,9 @@ bool    LLFilePicker::doNavChooseDialogModeless(ELoadFilter filter,
         return false;
     }
     
-    std::vector<std::string> *allowed_types=navOpenFilterProc(filter);
+    std::unique_ptr<std::vector<std::string>> allowed_types=navOpenFilterProc(filter);
     
-    doLoadDialogModeless(allowed_types,
+    doLoadDialogModeless(allowed_types.get(),
                                                     mPickOptions,
                                                     callback,
                                                     userdata);
diff --git a/indra/newview/llfilepicker_mac.h b/indra/newview/llfilepicker_mac.h
index c18643f355..367c792969 100644
--- a/indra/newview/llfilepicker_mac.h
+++ b/indra/newview/llfilepicker_mac.h
@@ -47,7 +47,7 @@ void doLoadDialogModeless(const std::vector<std::string>* allowed_types,
                 void (*callback)(bool, std::vector<std::string>&, void*),
                 void *userdata);
 
-std::string* doSaveDialog(const std::string* file, 
+std::unique_ptr<std::string> doSaveDialog(const std::string* file, 
                   const std::string* type,
                   const std::string* creator,
                   const std::string* extension,
diff --git a/indra/newview/llfilepicker_mac.mm b/indra/newview/llfilepicker_mac.mm
index 7fd9f37e18..bca5b10c8a 100644
--- a/indra/newview/llfilepicker_mac.mm
+++ b/indra/newview/llfilepicker_mac.mm
@@ -75,27 +75,27 @@ std::unique_ptr<std::vector<std::string>> doLoadDialog(const std::vector<std::st
                  unsigned int flags)
 {
     int result;
-    
+
     NSOpenPanel *panel = init_panel(allowed_types,flags);
     
     result = [panel runModal];
     
-    std::vector<std::string>* outfiles = NULL;
-    
+    std::unique_ptr<std::vector<std::string>> outfiles = nullptr;
+
     if (result == NSOKButton) 
     {
         NSArray *filesToOpen = [panel URLs];
-        int i, count = [filesToOpen count];
-        
+        int count = [filesToOpen count];
+
         if (count > 0)
         {
-            outfiles = new std::vector<std::string>;
+            outfiles = std::make_unique<std::vector<std::string>>();
         }
-        
-        for (i=0; i<count; i++) {
-            NSString *aFile = [[filesToOpen objectAtIndex:i] path];
-            std::string *afilestr = new std::string([aFile UTF8String]);
-            outfiles->push_back(*afilestr);
+
+        for (int i=0; i<count; i++) {
+            NSString *aFile = [filesToOpen objectAtIndex:i];
+            std::string afilestr = [[aFile stringByStandardizingPath] UTF8String];
+            outfiles->push_back(std::move(afilestr));
         }
     }
     return outfiles;
@@ -140,7 +140,7 @@ void doLoadDialogModeless(const std::vector<std::string>* allowed_types,
         }];
 }
 
-std::string* doSaveDialog(const std::string* file, 
+std::unique_ptr<std::string> doSaveDialog(const std::string* file, 
                   const std::string* type,
                   const std::string* creator,
                   const std::string* extension,
@@ -157,7 +157,7 @@ std::string* doSaveDialog(const std::string* file,
     [panel setAllowedFileTypes:fileType];
     NSString *fileName = [NSString stringWithCString:file->c_str() encoding:[NSString defaultCStringEncoding]];
     
-    std::string *outfile = NULL;
+    std::unique_ptr<std::string> outfile = nullptr;
     NSURL* url = [NSURL fileURLWithPath:fileName];
     [panel setNameFieldStringValue: fileName];
     [panel setDirectoryURL: url];
@@ -166,7 +166,7 @@ std::string* doSaveDialog(const std::string* file,
     {
         NSURL* url = [panel URL];
         NSString* p = [url path];
-        outfile = new std::string( [p UTF8String] );
+        outfile = std::make_unique<std::string>( [p UTF8String] );
         // write the file 
     } 
     return outfile;
-- 
cgit v1.2.3


From d5a949d97a67c8b9e551fc4b22d4c901eaf1d91a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 7 Apr 2023 15:13:47 +0300
Subject: SL-19544 WIP Combination view first pass

---
 indra/newview/llinventorygallery.cpp               |  5 ++
 indra/newview/llinventorygallery.h                 |  1 +
 indra/newview/llpanelmaininventory.cpp             | 90 ++++++++++++++++++++--
 indra/newview/llpanelmaininventory.h               |  6 ++
 .../default/xui/en/panel_inventory_gallery.xml     |  2 +-
 .../skins/default/xui/en/panel_main_inventory.xml  | 74 +++++++++++++++++-
 6 files changed, 169 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c3e06fafc5..e38f2ef849 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1128,6 +1128,11 @@ bool LLInventoryGallery::checkAgainstFilterType(const LLUUID& object_id)
     }
     return true;
 }
+
+bool LLInventoryGallery::hasVisibleItems()
+{
+    return mItemsAddedCount > 0;
+}
 //-----------------------------
 // LLInventoryGalleryItem
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 98ed91df19..5634c63072 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -122,6 +122,7 @@ public:
     LLInventoryFilter::ESearchType getSearchType() { return mSearchType; }
 
     bool hasDescendents(const LLUUID& cat_id);
+    bool hasVisibleItems();
 
 protected:
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 5535d64d27..e5c0e4cf9c 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -252,6 +252,19 @@ BOOL LLPanelMainInventory::postBuild()
     mInventoryGalleryPanel = getChild<LLInventoryGallery>("gallery_view_inv");
     mGalleryRootUpdatedConnection = mInventoryGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
 
+    mCombinationPanelInventory = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
+    LLInventoryFilter& comb_inv_filter = mCombinationPanelInventory->getFilter();
+    comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_EXCLUDE_THUMBNAILS);
+    comb_inv_filter.markDefault();
+    mCombinationPanelInventory->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mCombinationPanelInventory, _1, _2));
+    mCombinationPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
+
+    mCombinationGalleryPanel = getChild<LLInventoryGallery>("comb_gallery_view_inv");
+    LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
+    comb_gallery_filter.setFilterThumbnails(LLInventoryFilter::FILTER_ONLY_THUMBNAILS);
+    comb_gallery_filter.markDefault();
+    mCombinationGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, true));
+
 	initListCommandsHandlers();
 
 	const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
@@ -887,6 +900,7 @@ void LLPanelMainInventory::draw()
 	}
 	LLPanel::draw();
 	updateItemcountText();
+    updateCombinationVisibility();
 }
 
 void LLPanelMainInventory::updateItemcountText()
@@ -1514,6 +1528,10 @@ void LLPanelMainInventory::onUpFolderClicked()
             {
                 mInventoryGalleryPanel->setRootFolder(cat->getParentUUID());
             }
+            if(isCombinationViewMode())
+            {
+                mCombinationPanelInventory->changeFolderRoot(cat->getParentUUID());
+            }
         }
     }
 }
@@ -1528,6 +1546,10 @@ void LLPanelMainInventory::onBackFolderClicked()
     {
         mInventoryGalleryPanel->onBackwardFolder();
     }
+    if(isCombinationViewMode())
+    {
+        mCombinationPanelInventory->onBackwardFolder();
+    }
 }
 
 void LLPanelMainInventory::onForwardFolderClicked()
@@ -1540,6 +1562,10 @@ void LLPanelMainInventory::onForwardFolderClicked()
     {
         mInventoryGalleryPanel->onForwardFolder();
     }
+    if(isCombinationViewMode())
+    {
+        mCombinationPanelInventory->onForwardFolder();
+    }
 }
 
 void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history)
@@ -2099,6 +2125,26 @@ void LLPanelMainInventory::updateTitle()
     updateNavButtons();
 }
 
+void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
+{
+    if(gallery_clicked)
+    {
+        mCombinationPanelInventory->changeFolderRoot(mCombinationGalleryPanel->getRootFolder());
+    }
+    else
+    {
+        mCombinationGalleryPanel->setRootFolder(mCombinationPanelInventory->getSingleFolderRoot());
+    }
+
+    updateTitle();
+}
+
+void LLPanelMainInventory::updateCombinationVisibility()
+{
+    getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(mCombinationGalleryPanel->hasVisibleItems());
+    getChild<LLView>("border")->setVisible(mCombinationGalleryPanel->hasVisibleItems());
+}
+
 void LLPanelMainInventory::updateNavButtons()
 {
     if(isListViewMode())
@@ -2111,6 +2157,11 @@ void LLPanelMainInventory::updateNavButtons()
         getChild<LLButton>("back_btn")->setEnabled(mInventoryGalleryPanel->isBackwardAvailable());
         getChild<LLButton>("forward_btn")->setEnabled(mInventoryGalleryPanel->isForwardAvailable());
     }
+    if(isCombinationViewMode())
+    {
+        getChild<LLButton>("back_btn")->setEnabled(mCombinationPanelInventory->isBackwardAvailable());
+        getChild<LLButton>("forward_btn")->setEnabled(mCombinationPanelInventory->isForwardAvailable());
+    }
 
     const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
     bool up_enabled = (cat && cat->getParentUUID().notNull());
@@ -2131,6 +2182,24 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
 {
     if(mode != mViewMode)
     {
+        std::list<LLUUID> forward_history;
+        std::list<LLUUID> backward_history;
+        switch(mViewMode)
+        {
+            case MODE_LIST:
+                forward_history = mSingleFolderPanelInventory->getNavForwardList();
+                backward_history = mSingleFolderPanelInventory->getNavBackwardList();
+                break;
+            case MODE_GALLERY:
+                forward_history = mInventoryGalleryPanel->getNavForwardList();
+                backward_history = mInventoryGalleryPanel->getNavBackwardList();
+                break;
+            case MODE_COMBINATION:
+                forward_history = mCombinationPanelInventory->getNavForwardList();
+                backward_history = mCombinationPanelInventory->getNavBackwardList();
+                break;
+        }
+            
         LLUUID cur_root = getCurrentSFVRoot();
         mViewMode = mode;
 
@@ -2141,15 +2210,25 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
         if(isListViewMode())
         {
             mSingleFolderPanelInventory->changeFolderRoot(cur_root);
-            mSingleFolderPanelInventory->setNavForwardList(mInventoryGalleryPanel->getNavForwardList());
-            mSingleFolderPanelInventory->setNavBackwardList(mInventoryGalleryPanel->getNavBackwardList());
+            mSingleFolderPanelInventory->setNavForwardList(forward_history);
+            mSingleFolderPanelInventory->setNavBackwardList(backward_history);
         }
         if(isGalleryViewMode())
         {
             mInventoryGalleryPanel->setRootFolder(cur_root);
-            mInventoryGalleryPanel->setNavForwardList(mSingleFolderPanelInventory->getNavForwardList());
-            mInventoryGalleryPanel->setNavBackwardList(mSingleFolderPanelInventory->getNavBackwardList());
+            mInventoryGalleryPanel->setNavForwardList(forward_history);
+            mInventoryGalleryPanel->setNavBackwardList(backward_history);
         }
+        if(isCombinationViewMode())
+        {
+            mCombinationPanelInventory->changeFolderRoot(cur_root);
+            mCombinationGalleryPanel->setRootFolder(cur_root);
+            mCombinationPanelInventory->setNavForwardList(forward_history);
+            mCombinationPanelInventory->setNavBackwardList(backward_history);
+            mCombinationGalleryPanel->setNavForwardList(forward_history);
+            mCombinationGalleryPanel->setNavBackwardList(backward_history);
+        }
+
         updateNavButtons();
 
         onFilterSelected();
@@ -2178,8 +2257,7 @@ LLUUID LLPanelMainInventory::getCurrentSFVRoot()
     }
     if(isCombinationViewMode())
     {
-        //todo: should get actual Combination view root
-        return mSingleFolderPanelInventory->getSingleFolderRoot();
+        return mCombinationPanelInventory->getSingleFolderRoot();
     }
     return LLUUID::null;
 }
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 4a27bbca4e..bc7ed51465 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -160,6 +160,8 @@ protected:
 	bool isSaveTextureEnabled(const LLSD& userdata);
 	void updateItemcountText();
 
+    void updateCombinationVisibility();
+
 	void onFocusReceived();
 	void onSelectSearchType();
 	void updateSearchTypeCombo();
@@ -190,6 +192,8 @@ private:
     EViewModeType mViewMode;
     LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
     LLInventoryGallery* mInventoryGalleryPanel;
+    LLInventorySingleFolderPanel* mCombinationPanelInventory;
+    LLInventoryGallery* mCombinationGalleryPanel;
 
     boost::signals2::connection mListViewRootUpdatedConnection;
     boost::signals2::connection mGalleryRootUpdatedConnection;
@@ -209,6 +213,8 @@ protected:
     static bool hasSettingsInventory();
     void updateTitle();
     void updateNavButtons();
+    
+    void onCombinationRootChanged(bool gallery_clicked);
 	/**
 	 * Set upload cost in "Upload" sub menu.
 	 */
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index b32d592bf6..2b80e30696 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
    background_visible="true"
-   bg_alpha_color="DkGray"
+   bg_alpha_color="InventoryBackgroundColor"
    border="false"
    follows="all"
    height="390"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index dc8720b9d1..6eb1cf0498 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -286,8 +286,7 @@
        name="single_folder_inv"
        follows="all"
        left="0"
-       top="0"
-       top_pad="5"
+       top_pad="1"
        height="372"
        width="312"
        layout="topleft"
@@ -338,5 +337,76 @@
      top_delta="0"
      visible="false"
      width="312">
+     <layout_stack
+      follows="all"
+      height="372"
+      width="312"
+      animate="false"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="186"
+        width="312"
+        min_width="150"
+        name="comb_gallery_layout">
+        <panel
+         class="inventory_gallery"
+         filename="panel_inventory_gallery.xml"
+         left="0"
+         top_pad="0"
+         height="178"
+         width="312"
+         name="comb_gallery_view_inv"
+         background_visible="true"
+         follows="all"
+         layout="topleft">
+        </panel>
+        <view_border
+         bevel_style="none"
+         height="0"
+         follows="left|bottom|right"
+         layout="topleft"
+         left="6"
+         name="border"
+         top_pad="8"
+         width="300"/>
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="186"
+        width="312"
+        name="comb_inventory_layout">
+        <single_folder_inventory_panel
+         name="comb_single_folder_inv"
+         follows="all"
+         left="0"
+         top="1"
+         height="181"
+         width="312"
+         layout="topleft"
+         show_item_link_overlays="true"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+        </single_folder_inventory_panel>
+       </layout_panel>
+     </layout_stack>
     </panel>
 </panel>
-- 
cgit v1.2.3


From 7df076b62682b7e9749bb402958a3ea6735be283 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 7 Apr 2023 18:02:22 +0300
Subject: SL-19544 WIP apply filter when adding an item to the Gallery

---
 indra/newview/llinventorygallery.cpp   |  1 +
 indra/newview/llinventorypanel.cpp     |  2 +-
 indra/newview/llpanelmaininventory.cpp | 24 ++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index e38f2ef849..4e4a476584 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -713,6 +713,7 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id));
     if (mGalleryCreated)
     {
+        applyFilter(item, mFilterSubString);
         addToGallery(item);
     }
 
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 0589b5b3f3..cc81b53841 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1801,7 +1801,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
     {
         LLSidepanelInventory *inventory_panel = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
         LLPanelMainInventory* main_panel = inventory_panel->getMainInventoryPanel();
-        if(main_panel->isSingleFolderMode() && main_panel->isGalleryViewMode())
+        if(main_panel->isSingleFolderMode() && (main_panel->isGalleryViewMode() || main_panel->isCombinationViewMode()))
         {
             main_panel->setGallerySelection(obj_id);
             return;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index e5c0e4cf9c..4c80adbd46 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -506,9 +506,9 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                 menu_create_inventory_item(getPanel(), bridge, userdata);
             }
         }
-        else if(isGalleryViewMode())
+        else
         {
-            menu_create_inventory_item(NULL, mInventoryGalleryPanel->getRootFolder(), userdata);
+            menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata);
         }
     }
     else
@@ -625,6 +625,11 @@ void LLPanelMainInventory::setSearchType(LLInventoryFilter::ESearchType type)
     {
         mInventoryGalleryPanel->setSearchType(type);
     }
+    if(mSingleFolderMode && isCombinationViewMode())
+    {
+        mCombinationPanelInventory->setSearchType(type);
+        mCombinationGalleryPanel->setSearchType(type);
+    }
     else
     {
         getActivePanel()->setSearchType(type);
@@ -639,6 +644,10 @@ void LLPanelMainInventory::updateSearchTypeCombo()
     {
         search_type = mInventoryGalleryPanel->getSearchType();
     }
+    else if(mSingleFolderMode && isCombinationViewMode())
+    {
+        search_type = mCombinationGalleryPanel->getSearchType();
+    }
     else
     {
         search_type = getActivePanel()->getSearchType();
@@ -2280,6 +2289,17 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id)
     {
         mInventoryGalleryPanel->changeItemSelection(item_id);
     }
+    else if(mSingleFolderMode && isCombinationViewMode())
+    {
+        if(mCombinationGalleryPanel->getFilter().checkAgainstFilterThumbnails(item_id))
+        {
+            mCombinationGalleryPanel->changeItemSelection(item_id);
+        }
+        else
+        {
+            mCombinationPanelInventory->setSelection(item_id, false);
+        }
+    }
 }
 // List Commands                                                              //
 ////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 43ff8108f2d056b84ab2a7586951ad363c350f05 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 7 Apr 2023 20:12:09 +0300
Subject: SL-19534 Better fetch failure handling

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index c8bf8f67ce..e988f949e2 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -487,6 +487,26 @@ void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_i
             mFetchFolderQueue.push_front(FetchQueueInfo(request_id, FT_CONTENT_RECURSIVE));
             gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
         }
+        else if (recursion == FT_CONTENT_RECURSIVE)
+        {
+            LL_WARNS() << "Failed to download folder: " << request_id << " Requesting known content separately" << LL_ENDL;
+            LLInventoryModel::cat_array_t  *categories(NULL);
+            LLInventoryModel::item_array_t *items(NULL);
+            gInventory.getDirectDescendentsOf(request_id, categories, items);
+            if (categories)
+            {
+                for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin(); it != categories->end(); ++it)
+                {
+                    mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
+                }
+                if (!mFetchFolderQueue.empty())
+                {
+                    mBackgroundFetchActive = true;
+                    mFolderFetchActive     = true;
+                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+                }
+            }
+        }
     }
     else
     {
-- 
cgit v1.2.3


From bb4967817e5e0251ebcbae861fcd998f22ce0c0c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 7 Apr 2023 21:01:00 +0300
Subject: SL-18918 Fix folder type when creating folders

Might be better to replace "type" with "type_default" everywere, not just for AIS
---
 indra/llinventory/llinventory.cpp  | 25 +++++++++++++++++++++----
 indra/llinventory/llinventory.h    |  1 +
 indra/newview/llinventorymodel.cpp |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index c6049f3ec4..ef86d2d89b 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1098,11 +1098,28 @@ void LLInventoryCategory::setPreferredType(LLFolderType::EType type)
 LLSD LLInventoryCategory::asLLSD() const
 {
     LLSD sd = LLSD();
-    sd["item_id"] = mUUID;
-    sd["parent_id"] = mParentUUID;
+    sd[INV_ITEM_ID_LABEL]   = mUUID;
+    sd[INV_PARENT_ID_LABEL] = mParentUUID;
     S8 type = static_cast<S8>(mPreferredType);
-    sd["type"]      = type;
-    sd["name"] = mName;
+    sd[INV_ASSET_TYPE_LABEL] = type;
+    sd[INV_NAME_LABEL] = mName;
+
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+
+    return sd;
+}
+
+LLSD LLInventoryCategory::asAISLLSD() const
+{
+    LLSD sd                 = LLSD();
+    sd[INV_FOLDER_ID_LABEL_WS]  = mUUID;
+    sd[INV_PARENT_ID_LABEL] = mParentUUID;
+    S8 type                 = static_cast<S8>(mPreferredType);
+    sd[INV_ASSET_TYPE_LABEL_WS] = type;
+    sd[INV_NAME_LABEL] = mName;
 
     if (mThumbnailUUID.notNull())
     {
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index dfe8b7659b..516cfc6a24 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -253,6 +253,7 @@ public:
 	LLFolderType::EType getPreferredType() const;
 	void setPreferredType(LLFolderType::EType type);
 	LLSD asLLSD() const;
+    LLSD asAISLLSD() const;
 	bool fromLLSD(const LLSD& sd);
 
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 80f16a854b..4bca2ce650 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1010,7 +1010,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		new_inventory["categories"] = LLSD::emptyArray();
 		LLViewerInventoryCategory cat(LLUUID::null, parent_id, preferred_type, name, gAgent.getID());
         cat.setThumbnailUUID(thumbnail_id);
-		LLSD cat_sd = cat.asLLSD();
+		LLSD cat_sd = cat.asAISLLSD();
 		new_inventory["categories"].append(cat_sd);
 		AISAPI::CreateInventory(
             parent_id,
-- 
cgit v1.2.3


From d33328584f331287cce626804e10c962e7c3ce48 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 8 Apr 2023 02:42:39 +0300
Subject: SL-19529 Fix uninitialized variable and calback counter

---
 indra/newview/llappearancemgr.cpp      |  5 ++---
 indra/newview/llinventoryfunctions.cpp | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index a4dc0c341e..59bf418a00 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1702,8 +1702,6 @@ void LLAppearanceMgr::shallowCopyCategory(const LLUUID& src_id, const LLUUID& ds
 	{
 		parent_id = gInventory.getRootFolderID();
 	}
-	// USES UDP PATH
-	// D567 needs to carry over thumbnail info
 	gInventory.createNewCategory(
         parent_id,
         LLFolderType::FT_NONE,
@@ -1713,7 +1711,8 @@ void LLAppearanceMgr::shallowCopyCategory(const LLUUID& src_id, const LLUUID& ds
         LLAppearanceMgr::getInstance()->shallowCopyCategoryContents(src_id, new_id, cb);
 
         gInventory.notifyObservers();
-    }
+    },
+        src_cat->getThumbnailUUID()
     );
 }
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 00ff0e83c0..dd3750c152 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1649,16 +1649,20 @@ void validate_marketplacelistings(
             gInventory.createNewCategory(parent_uuid,
                 LLFolderType::FT_NONE,
                 cat->getName(),
-                [cat_uuid, cb_result, cb_msg, fix_hierarchy, depth, notify_observers](const LLUUID &new_cat_id)
+                [cat_uuid, cb_result, cb_msg, fix_hierarchy, depth](const LLUUID &new_cat_id)
             {
+                if (new_cat_id.isNull())
+                {
+                    cb_result(0, false);
+                    return;
+                }
                 LLInventoryCategory * move_cat = gInventory.getCategory(cat_uuid);
                 LLViewerInventoryCategory * viewer_cat = (LLViewerInventoryCategory *)(move_cat);
                 LLInventoryCategory * new_cat = gInventory.getCategory(new_cat_id);
                 gInventory.changeCategoryParent(viewer_cat, new_cat_id, false);
                 S32 pending = 0;
                 bool result = true;
-                // notify_observers probably should be true in such case?
-                validate_marketplacelistings(new_cat, cb_result, cb_msg, fix_hierarchy, depth + 1, notify_observers, pending, result);
+                validate_marketplacelistings(new_cat, cb_result, cb_msg, fix_hierarchy, depth + 1, true, pending, result);
                 cb_result(pending, result);
             }
             );
@@ -2306,8 +2310,11 @@ bool can_share_item(const LLUUID& item_id)
 
 
 LLMarketplaceValidator::LLMarketplaceValidator()
+    : mPendingCallbacks(0)
+    , mValidationInProgress(false)
 {
 }
+
 LLMarketplaceValidator::~LLMarketplaceValidator()
 {
 }
@@ -2335,7 +2342,7 @@ void LLMarketplaceValidator::start()
         return;
     }
     mValidationInProgress = true;
-    mPendingCallbacks = 1; // do '1' in case something decides ro callback immediately
+    mPendingCallbacks = 1; // do '1' in case something decides to callback immediately
     const ValidationRequest &first = mValidationQueue.front();
     LLViewerInventoryCategory* cat = gInventory.getCategory(first.mCategoryId);
 
@@ -2358,6 +2365,7 @@ void LLMarketplaceValidator::start()
         }
     };
 
+    S32 pending_calbacks = 0;
     validate_marketplacelistings(
         cat,
         result_callback,
@@ -2365,10 +2373,10 @@ void LLMarketplaceValidator::start()
         first.mFixHierarchy,
         first.mDepth,
         true,
-        mPendingCallbacks,
+        pending_calbacks,
         mPendingResult);
 
-    result_callback(mPendingCallbacks, mPendingResult);
+    result_callback(pending_calbacks, mPendingResult);
 }
 
 LLMarketplaceValidator::ValidationRequest::ValidationRequest(
-- 
cgit v1.2.3


From 4ce1e68ccb3be42b33cf2dcb58ffb6e78e382016 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 8 Apr 2023 15:13:13 +0300
Subject: SL-19529 Marketplace validation improvements

---
 indra/newview/llinventoryfunctions.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index dd3750c152..b934ccd22b 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2342,9 +2342,20 @@ void LLMarketplaceValidator::start()
         return;
     }
     mValidationInProgress = true;
-    mPendingCallbacks = 1; // do '1' in case something decides to callback immediately
+
     const ValidationRequest &first = mValidationQueue.front();
     LLViewerInventoryCategory* cat = gInventory.getCategory(first.mCategoryId);
+    if (!cat)
+    {
+        LL_WARNS() << "Tried to validate a folder that doesn't exist" << LL_ENDL;
+        if (first.mCbDone)
+        {
+            first.mCbDone(false);
+        }
+        mValidationQueue.pop();
+        start();
+        return;
+    }
 
     validation_result_callback_t result_callback = [](S32 pending, bool result)
     {
@@ -2365,7 +2376,11 @@ void LLMarketplaceValidator::start()
         }
     };
 
+    mPendingResult = true;
+    mPendingCallbacks = 1; // do '1' in case something decides to callback immediately
+
     S32 pending_calbacks = 0;
+    bool result = true;
     validate_marketplacelistings(
         cat,
         result_callback,
@@ -2374,9 +2389,9 @@ void LLMarketplaceValidator::start()
         first.mDepth,
         true,
         pending_calbacks,
-        mPendingResult);
+        result);
 
-    result_callback(pending_calbacks, mPendingResult);
+    result_callback(pending_calbacks, result);
 }
 
 LLMarketplaceValidator::ValidationRequest::ValidationRequest(
-- 
cgit v1.2.3


From 6bef1ed8c336468519c9f5459445aeec26890f35 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 8 Apr 2023 15:17:19 +0300
Subject: SL-19204 Fix voice's coroutine crash

Need to find a way to kill coroutines or to fobid using non static functions/members inside coroutines
---
 indra/newview/llvoicevivox.cpp | 48 +++++++++++++++++++++++-------------------
 indra/newview/llvoicevivox.h   |  7 +++---
 2 files changed, 30 insertions(+), 25 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index c73f96da2d..3725510b6a 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -276,13 +276,13 @@ static void killGateway()
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 bool LLVivoxVoiceClient::sShuttingDown = false;
+bool LLVivoxVoiceClient::sConnected = false;
+LLPumpIO *LLVivoxVoiceClient::sPump = nullptr;
 
 LLVivoxVoiceClient::LLVivoxVoiceClient() :
 	mSessionTerminateRequested(false),
 	mRelogRequested(false),
-	mConnected(false),
 	mTerminateDaemon(false),
-	mPump(NULL),
 	mSpatialJoiningNum(0),
 
 	mTuningMode(false),
@@ -350,7 +350,11 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
 	mIsProcessingChannels(false),
 	mIsCoroutineActive(false),
 	mVivoxPump("vivoxClientPump")
-{	
+{
+    sShuttingDown = false;
+    sConnected = false;
+    sPump = nullptr;
+
 	mSpeakerVolume = scale_speaker_volume(0);
 
 	mVoiceVersion.serverVersion = "";
@@ -392,7 +396,7 @@ LLVivoxVoiceClient::~LLVivoxVoiceClient()
 void LLVivoxVoiceClient::init(LLPumpIO *pump)
 {
 	// constructor will set up LLVoiceClient::getInstance()
-	mPump = pump;
+	sPump = pump;
 
 //     LLCoros::instance().launch("LLVivoxVoiceClient::voiceControlCoro",
 //         boost::bind(&LLVivoxVoiceClient::voiceControlCoro, LLVivoxVoiceClient::getInstance()));
@@ -413,10 +417,10 @@ void LLVivoxVoiceClient::terminate()
         logoutOfVivox(false);
     }
     
-	if(mConnected)
+	if(sConnected)
 	{
         breakVoiceConnection(false);
-		mConnected = false;
+        sConnected = false;
 	}
 	else
 	{
@@ -425,7 +429,7 @@ void LLVivoxVoiceClient::terminate()
 	}
 
     sShuttingDown = true;
-    mPump = NULL;
+    sPump = NULL;
 }
 
 //---------------------------------------------------
@@ -471,7 +475,7 @@ bool LLVivoxVoiceClient::writeString(const std::string &str)
 	bool result = false;
     LL_DEBUGS("LowVoice") << "sending:\n" << str << LL_ENDL;
 
-	if(mConnected)
+	if(sConnected)
 	{
 		apr_status_t err;
 		apr_size_t size = (apr_size_t)str.size();
@@ -1051,7 +1055,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
 
     int retryCount(0);
     LLVoiceVivoxStats::getInstance()->reset();
-    while (!mConnected && !sShuttingDown && retryCount++ <= DAEMON_CONNECT_RETRY_MAX)
+    while (!sConnected && !sShuttingDown && retryCount++ <= DAEMON_CONNECT_RETRY_MAX)
     {
         LLVoiceVivoxStats::getInstance()->connectionAttemptStart();
         LL_DEBUGS("Voice") << "Attempting to connect to vivox daemon: " << mDaemonHost << LL_ENDL;
@@ -1061,23 +1065,23 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
             mSocket = LLSocket::create(gAPRPoolp, LLSocket::STREAM_TCP);
         }
 
-        mConnected = mSocket->blockingConnect(mDaemonHost);
-        LLVoiceVivoxStats::getInstance()->connectionAttemptEnd(mConnected);
-        if (!mConnected)
+        sConnected = mSocket->blockingConnect(mDaemonHost);
+        LLVoiceVivoxStats::getInstance()->connectionAttemptEnd(sConnected);
+        if (!sConnected)
         {
             llcoro::suspendUntilTimeout(DAEMON_CONNECT_THROTTLE_SECONDS);
         }
     }
     
     //---------------------------------------------------------------------
-    if (sShuttingDown && !mConnected)
+    if (sShuttingDown && !sConnected)
     {
         return false;
     }
 
     llcoro::suspendUntilTimeout(UPDATE_THROTTLE_SECONDS);
 
-    while (!mPump && !sShuttingDown)
+    while (!sPump && !sShuttingDown)
     {   // Can't use the pump until we have it available.
         llcoro::suspend();
     }
@@ -1099,7 +1103,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
     readChain.push_back(LLIOPipe::ptr_t(new LLVivoxProtocolParser()));
 
 
-    mPump->addChain(readChain, NEVER_CHAIN_EXPIRY_SECS);
+    sPump->addChain(readChain, NEVER_CHAIN_EXPIRY_SECS);
 
 
     //---------------------------------------------------------------------
@@ -1321,9 +1325,9 @@ bool LLVivoxVoiceClient::breakVoiceConnection(bool corowait)
             // the message, yet we need to receive "connector shutdown response".
             // Either wait a bit and emulate it or check gMessageSystem for specific message
             _sleep(1000);
-            if (mConnected)
+            if (sConnected)
             {
-                mConnected = false;
+                sConnected = false;
                 LLSD vivoxevent(LLSDMap("connector", LLSD::Boolean(false)));
                 mVivoxPump.post(vivoxevent);
             }
@@ -1335,7 +1339,7 @@ bool LLVivoxVoiceClient::breakVoiceConnection(bool corowait)
     LL_DEBUGS("Voice") << "closing SLVoice socket" << LL_ENDL;
     closeSocket();		// Need to do this now -- bad things happen if the destructor does it later.
     cleanUp();
-    mConnected = false;
+    sConnected = false;
 
     return retval;
 }
@@ -2516,7 +2520,7 @@ bool LLVivoxVoiceClient::performMicTuning()
 void LLVivoxVoiceClient::closeSocket(void)
 {
 	mSocket.reset();
-	mConnected = false;
+    sConnected = false;
 	mConnectorEstablished = false;
 	mAccountLoggedIn = false;
 }
@@ -3017,7 +3021,7 @@ bool LLVivoxVoiceClient::deviceSettingsAvailable()
 {
 	bool result = true;
 	
-	if(!mConnected)
+	if(!sConnected)
 		result = false;
 	
 	if(mRenderDevices.empty())
@@ -3816,7 +3820,7 @@ void LLVivoxVoiceClient::connectorShutdownResponse(int statusCode, std::string &
 		// Should this ever fail?  do we care if it does?
 	}
 	
-	mConnected = false;
+	sConnected = false;
 	mShutdownComplete = true;
 	
     LLSD vivoxevent(LLSDMap("connector", LLSD::Boolean(false)));
@@ -7389,7 +7393,7 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl(
 	
 	LL_DEBUGS("VivoxProtocolParser") << "at end, mInput is: " << mInput << LL_ENDL;
 	
-	if(!LLVivoxVoiceClient::getInstance()->mConnected)
+	if(!LLVivoxVoiceClient::sConnected)
 	{
 		// If voice has been disabled, we just want to close the socket.  This does so.
 		LL_INFOS("Voice") << "returning STATUS_STOP" << LL_ENDL;
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 0a785401c1..e3ab99c675 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -666,12 +666,10 @@ private:
 	
 	LLHost mDaemonHost;
 	LLSocket::ptr_t mSocket;
-	bool mConnected;
 	
 	// We should kill the voice daemon in case of connection alert 
 	bool mTerminateDaemon;
 	
-	LLPumpIO *mPump;
 	friend class LLVivoxProtocolParser;
 	
 	std::string mAccountName;
@@ -916,7 +914,10 @@ private:
     bool    mIsProcessingChannels;
     bool    mIsCoroutineActive;
 
-    static bool sShuttingDown; // corutines can last longer than vivox so we need a static variable as a shutdown flag
+    // This variables can last longer than vivox in coroutines so we need them as static
+    static bool sShuttingDown;
+    static bool sConnected;
+    static LLPumpIO* sPump;
 
     LLEventMailDrop mVivoxPump;
 };
-- 
cgit v1.2.3


From 69e3b5fb4014ef900b129ebde49325f1b074e773 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Apr 2023 01:33:24 +0300
Subject: SL-19533 Orphans plus additional logging

---
 indra/newview/llaisapi.cpp                        | 88 +++++++++++++++++++++--
 indra/newview/llaisapi.h                          |  3 +
 indra/newview/llinventorymodelbackgroundfetch.cpp | 17 +++--
 3 files changed, 100 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index f869f1652b..1efba0db7a 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -534,6 +534,35 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
     EnqueueAISCommand("FetchCategoryCategories", proc);
 }
 
+/*static*/
+void AISAPI::FetchOrphans(completion_t callback)
+{
+    std::string cap = getInvCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        return;
+    }
+    std::string url = cap + std::string("/orphans");
+
+    invokationFn_t getFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t , const std::string& , LLCore::HttpOptions::ptr_t , LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend) , _1 , _2 , _3 , _5 , _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro ,
+                                                         _1 , getFn , url , LLUUID::null , LLSD() , callback , FETCHORPHANS));
+
+    EnqueueAISCommand("FetchOrphans" , proc);
+}
+
 /*static*/
 void AISAPI::EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc)
 {
@@ -595,7 +624,8 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
     }
     bool is_fetch = (type == FETCHITEM)
         || (type == FETCHCATEGORYCHILDREN)
-        || (type == FETCHCATEGORYCATEGORIES);
+        || (type == FETCHCATEGORYCATEGORIES)
+        || (type == FETCHORPHANS);
     // parse update llsd into stuff to do or parse received items.
     S32 depth = 0;
     if (is_fetch && request_body.has("depth"))
@@ -620,9 +650,30 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 
     LL_DEBUGS("Inventory") << "url: " << url << LL_ENDL;
 
-    LLSD result = invoke(httpAdapter, httpRequest, url, body, httpOptions, httpHeaders);
-    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
-    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+    LLSD result;
+    LLSD httpResults;
+    LLCore::HttpStatus status;
+
+    if (debugLoggingEnabled("AIS3"))
+    {
+        LLTimer ais_timer;
+        ais_timer.start();
+        result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
+        httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+        status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+        F32MillisecondsImplicit elapsed_time = ais_timer.getElapsedTimeF32();
+        LL_DEBUGS("AIS3") << "Request type: " << (S32)type
+            << " \nRequest url: " << url
+            << " \nRequest target: " << targetId
+            << " \nElapsed time: " << elapsed_time
+            << " \nstatus: " << status.toULong() << LL_ENDL;
+    }
+    else
+    {
+        result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
+        httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+        status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+    }
 
     if (!status || !result.isMap())
     {
@@ -756,6 +807,7 @@ void AISUpdate::clearParseResults()
 	mCatDescendentsKnown.clear();
 	mCatVersionsUpdated.clear();
 	mItemsCreated.clear();
+    mItemsLost.clear();
 	mItemsUpdated.clear();
 	mCategoriesCreated.clear();
 	mCategoriesUpdated.clear();
@@ -891,6 +943,11 @@ void AISUpdate::parseItem(const LLSD& item_map)
             mItemsCreated[item_id] = new_item;
             mCatDescendentDeltas[new_item->getParentUUID()];
             new_item->setComplete(true);
+
+            if (new_item->getParentUUID().isNull())
+            {
+                mItemsLost[item_id] = new_item;
+            }
         }
         else if (curr_item)
 		{
@@ -940,6 +997,11 @@ void AISUpdate::parseLink(const LLSD& link_map)
             mItemsCreated[item_id] = new_link;
             mCatDescendentDeltas[parent_id];
             new_link->setComplete(true);
+
+            if (new_link->getParentUUID().isNull())
+            {
+                mItemsLost[item_id] = new_link;
+            }
         }
 		else if (curr_link)
 		{
@@ -1299,6 +1361,24 @@ void AISUpdate::doUpdate()
 		}
 	}
 
+    // LOST ITEMS
+    if (!mItemsLost.empty())
+    {
+        LL_INFOS("Inventory") << "Received " << (S32)mItemsLost.size() << " items without a parent" << LL_ENDL;
+        const LLUUID lost_uuid(gInventory.findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND));
+        if (lost_uuid.notNull())
+        {
+            for (deferred_item_map_t::const_iterator lost_it = mItemsLost.begin();
+                 lost_it != mItemsLost.end(); ++lost_it)
+            {
+                LLPointer<LLViewerInventoryItem> new_item = lost_it->second;
+
+                new_item->setParent(lost_uuid);
+                new_item->updateParentOnServer(FALSE);
+            }
+        }
+    }
+
 	// CREATE ITEMS
 	for (deferred_item_map_t::const_iterator create_it = mItemsCreated.begin();
 		 create_it != mItemsCreated.end(); ++create_it)
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index d083004195..4e1c6e5a7d 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -59,6 +59,7 @@ public:
     static void FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryChildren(const std::string &identifier, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchOrphans(completion_t callback = completion_t() );
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
 private:
@@ -75,6 +76,7 @@ private:
         FETCHITEM,
         FETCHCATEGORYCHILDREN,
         FETCHCATEGORYCATEGORIES,
+        FETCHORPHANS,
     } COMMAND_TYPE;
 
     static const std::string INVENTORY_CAP_NAME;
@@ -127,6 +129,7 @@ private:
 
 	typedef std::map<LLUUID,LLPointer<LLViewerInventoryItem> > deferred_item_map_t;
 	deferred_item_map_t mItemsCreated;
+    deferred_item_map_t mItemsLost;
 	deferred_item_map_t mItemsUpdated;
 	typedef std::map<LLUUID,LLPointer<LLViewerInventoryCategory> > deferred_category_map_t;
 	deferred_category_map_t mCategoriesCreated;
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index e988f949e2..35b9442966 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -461,10 +461,13 @@ void LLInventoryModelBackgroundFetch::incrFetchFolderCount(S32 fetching)
 void ais_simple_folder_callback(const LLUUID& inv_id)
 {
     LLInventoryModelBackgroundFetch::instance().incrFetchFolderCount(-1);
-    LLViewerInventoryCategory * cat(gInventory.getCategory(inv_id));
-    if (cat)
+    if (inv_id.notNull()) // null normally means a failure, but is an expected response for orphans
     {
-        cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+        LLViewerInventoryCategory* cat(gInventory.getCategory(inv_id));
+        if (cat)
+        {
+            cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+        }
     }
 }
 
@@ -580,6 +583,11 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         mFetchItemQueue.pop_front();
         curent_time = LLTimer::getTotalSeconds();
     }
+
+    LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << mFetchCount
+        << ", scheduled fodler fetches: " << (S32)mFetchFolderQueue.size()
+        << ", scheduled item fetches: " << (S32)mFetchItemQueue.size()
+        << LL_ENDL;
     
     if (isFolderFetchProcessingComplete() && mFolderFetchActive)
     {
@@ -600,7 +608,8 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         if (cat_id.isNull())
         {
             // Lost and found
-            AISAPI::FetchCategoryChildren("lstndfnd", true, ais_simple_folder_callback);
+            // Should it actually be recursive?
+            AISAPI::FetchOrphans(ais_simple_folder_callback);
             incrFetchFolderCount(1);
         }
         else
-- 
cgit v1.2.3


From fec89252b1018294cd440e3ec0018c82ed5ec5eb Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Tue, 13 Dec 2022 13:48:14 -0800
Subject: SL-18679: Find newer NSIS installation path

---
 .../installers/windows/installer_template.nsi      |  1 -
 indra/newview/viewer_manifest.py                   | 30 +++++++---------------
 2 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 60e26274cb..5fb42ce2fd 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -26,7 +26,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Compiler flags
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Unicode true
 SetOverwrite on				# Overwrite files
 SetCompress auto			# Compress if saves space
 SetCompressor /solid lzma	# Compress whole installer as one block
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 89481add29..c312c1d248 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -790,27 +790,15 @@ class WindowsManifest(ViewerManifest):
             
         # Check two paths, one for Program Files, and one for Program Files (x86).
         # Yay 64bit windows.
-        for ProgramFiles in 'ProgramFiles', 'ProgramFiles(x86)':
-            NSIS_path = os.path.expandvars(r'${%s}\NSIS\makensis.exe' % ProgramFiles)
-            if os.path.exists(NSIS_path):
-                break
-        installer_created=False
-        nsis_attempts=3
-        nsis_retry_wait=15
-        for attempt in range(nsis_attempts):
-            try:
-                self.run_command([NSIS_path, '/V2', self.dst_path_of(tempfile)])
-            except ManifestError as err:
-                if attempt+1 < nsis_attempts:
-                    print("nsis failed, waiting %d seconds before retrying" % nsis_retry_wait, file=sys.stderr)
-                    time.sleep(nsis_retry_wait)
-                    nsis_retry_wait*=2
-            else:
-                # NSIS worked! Done!
-                break
-        else:
-            print("Maximum nsis attempts exceeded; giving up", file=sys.stderr)
-            raise
+        nsis_path = "makensis.exe"
+        for program_files in '${programfiles}', '${programfiles(x86)}':
+            for nesis_path in 'NSIS', 'NSIS\\Unicode':
+                possible_path = os.path.expandvars(f"{program_files}\\{nesis_path}\\makensis.exe")
+                if os.path.exists(possible_path):
+                    nsis_path = possible_path
+                    break
+
+        self.run_command([possible_path, '/V2', self.dst_path_of(tempfile)])
 
         self.sign(installer_file)
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From a0cdaa75a920861875b45207366d164cc8732842 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Fri, 31 Mar 2023 13:09:57 -0700
Subject: SL-18839: Add basic Github build

---
 indra/cmake/00-Common.cmake                             | 2 +-
 indra/cmake/Python.cmake                                | 8 ++++++--
 indra/newview/installers/windows/installer_template.nsi | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index c848d00710..a44fe5a8d5 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -61,7 +61,7 @@ if (WINDOWS)
   # CP changed to only append the flag for 32bit builds - on 64bit builds,
   # locally at least, the build output is spammed with 1000s of 'D9002'
   # warnings about this switch being ignored.
-  if( ADDRESS_SIZE EQUAL 32 )
+  if(ADDRESS_SIZE EQUAL 32 AND DEFINED ENV{"TEAMCITY_PROJECT_NAME"})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")  
   endif()
   # zlib has assembly-language object files incompatible with SAFESEH
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index dbf5033ce5..f9259f6c2b 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -2,7 +2,11 @@
 
 set(PYTHONINTERP_FOUND)
 
-if (WINDOWS)
+if (DEFINED ENV{PYTHON})
+  # Allow python executable to be explicitly set
+  set(python "$ENV{PYTHON}")
+  set(PYTHONINTERP_FOUND ON)
+elseif (WINDOWS)
   # On Windows, explicitly avoid Cygwin Python.
 
   # if the user has their own version of Python installed, prefer that
@@ -43,7 +47,7 @@ else()
   if (python)
     set(PYTHONINTERP_FOUND ON)
   endif (python)
-endif (WINDOWS)
+endif (DEFINED ENV{PYTHON})
 
 if (NOT python)
   message(FATAL_ERROR "No Python interpreter found")
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 5fb42ce2fd..778d32e66c 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -26,6 +26,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Compiler flags
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Unicode true
 SetOverwrite on				# Overwrite files
 SetCompress auto			# Compress if saves space
 SetCompressor /solid lzma	# Compress whole installer as one block
@@ -523,6 +524,7 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Make sure the user can uninstall
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+/* Unused
 Function un.CheckIfAdministrator
     DetailPrint $(CheckAdministratorUnInstDP)
     UserInfo::GetAccountType
@@ -534,6 +536,7 @@ lbl_is_admin:
     Return
 
 FunctionEnd
+*/
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Function CheckWillUninstallV2               
-- 
cgit v1.2.3


From 8171224a6510ac8b984dace5f10a6f92cb1e2942 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Apr 2023 19:26:21 +0300
Subject: SL-19533 Don't fetch items if recursive fetch isn't done

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 21 +++++++++++++--------
 indra/newview/llinventorymodelbackgroundfetch.h   |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 35b9442966..0099e81b8f 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -191,7 +191,7 @@ LLInventoryModelBackgroundFetch::LLInventoryModelBackgroundFetch():
 	mFolderFetchActive(false),
 	mFetchCount(0),
     mFetchFolderCount(0),
-	mAllFoldersFetched(false),
+    mAllRecursiveFoldersFetched(false),
 	mRecursiveInventoryFetchStarted(false),
 	mRecursiveLibraryFetchStarted(false),
 	mMinTimeBetweenFetches(0.3f)
@@ -242,7 +242,7 @@ bool LLInventoryModelBackgroundFetch::inventoryFetchInProgress() const
 
 bool LLInventoryModelBackgroundFetch::isEverythingFetched() const
 {
-	return mAllFoldersFetched;
+	return mAllRecursiveFoldersFetched;
 }
 
 BOOL LLInventoryModelBackgroundFetch::folderFetchActive() const
@@ -395,7 +395,7 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 	if (mRecursiveInventoryFetchStarted &&
 		mRecursiveLibraryFetchStarted)
 	{
-		mAllFoldersFetched = true;
+        mAllRecursiveFoldersFetched = true;
 		//LL_INFOS(LOG_INV) << "All folders fetched, validating" << LL_ENDL;
 		//gInventory.validate();
 	}
@@ -576,12 +576,17 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         curent_time = LLTimer::getTotalSeconds();
     }
 
-    while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
+    if (mRecursiveInventoryFetchStarted && mAllRecursiveFoldersFetched)
     {
-        const FetchQueueInfo & fetch_info(mFetchItemQueue.front());
-        bulkFetchViaAis(fetch_info);
-        mFetchItemQueue.pop_front();
-        curent_time = LLTimer::getTotalSeconds();
+        // Don't fetch items if recursive fetch isn't done,
+        // it gets both items and folders and should get the items in question faster
+        while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
+        {
+            const FetchQueueInfo& fetch_info(mFetchItemQueue.front());
+            bulkFetchViaAis(fetch_info);
+            mFetchItemQueue.pop_front();
+            curent_time = LLTimer::getTotalSeconds();
+        }
     }
 
     LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << mFetchCount
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index eae2ba6af8..bd54c17c8d 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -113,7 +113,7 @@ protected:
 private:
  	bool mRecursiveInventoryFetchStarted;
 	bool mRecursiveLibraryFetchStarted;
-	bool mAllFoldersFetched;
+	bool mAllRecursiveFoldersFetched;
     typedef boost::signals2::signal<void()> folders_fetched_signal_t;
     folders_fetched_signal_t mFoldersFetchedSignal;
 
-- 
cgit v1.2.3


From af30c8c95b81e99c76bd5e08dcaab4c31dfdcac1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Apr 2023 21:20:30 +0300
Subject: SL-19533 Don't try to restart fetchexcessively

No real point restarting, but due to significant changes decided to keep this around and raise asserts instead of removing.
---
 indra/newview/llfloatermarketplacelistings.cpp |  2 +-
 indra/newview/llpanelmaininventory.cpp         | 18 +++++++++++++-----
 indra/newview/llpaneloutfitedit.cpp            | 16 ++++++++++++----
 indra/newview/llpaneloutfitsinventory.cpp      |  6 +++++-
 indra/newview/lltexturectrl.cpp                |  7 +++++--
 5 files changed, 36 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index df5347718c..c09e9f523d 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -448,7 +448,7 @@ void LLFloaterMarketplaceListings::fetchContents()
 	{
         LLMarketplaceData::instance().setDataFetchedSignal(boost::bind(&LLFloaterMarketplaceListings::updateView, this));
         LLMarketplaceData::instance().setSLMDataFetched(MarketplaceFetchCodes::MARKET_FETCH_LOADING);
-		LLInventoryModelBackgroundFetch::instance().start(mRootFolderId);
+		LLInventoryModelBackgroundFetch::instance().start(mRootFolderId, true);
         LLMarketplaceData::instance().getSLMListings();
 	}
 }
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 4c80adbd46..3ffe1b3901 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -738,7 +738,11 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
 		return;
 	}
 
-	LLInventoryModelBackgroundFetch::instance().start();
+    if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
+    {
+        llassert(false); // this should have been done on startup
+        LLInventoryModelBackgroundFetch::instance().start();
+    }
 
 	mFilterSubString = search_string;
 	if (mActivePanel->getFilterSubString().empty() && mFilterSubString.empty())
@@ -835,9 +839,9 @@ void LLPanelMainInventory::onFilterSelected()
             finder->setTitle(getLocalizedRootName());
         }
 	}
-	if (filter.isActive())
+	if (filter.isActive() && !LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
 	{
-		// If our filter is active we may be the first thing requiring a fetch so we better start it here.
+        llassert(false); // this should have been done on startup
 		LLInventoryModelBackgroundFetch::instance().start();
 	}
 	setFilterTextFromFilter();
@@ -995,8 +999,12 @@ void LLPanelMainInventory::toggleFindOptions()
 		LLFloater* parent_floater = gFloaterView->getParentFloater(this);
 		if (parent_floater)
 			parent_floater->addDependentFloater(mFinderHandle);
-		// start background fetch of folders
-		LLInventoryModelBackgroundFetch::instance().start();
+
+        if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
+        {
+            llassert(false); // this should have been done on startup
+            LLInventoryModelBackgroundFetch::instance().start();
+        }
 
         if (mSingleFolderMode)
         {
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 35582d2967..4a755a6e93 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -699,8 +699,12 @@ void LLPanelOutfitEdit::onFolderViewFilterCommitted(LLUICtrl* ctrl)
 	LLOpenFoldersWithSelection opener;
 	mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(opener);
 	mInventoryItemsPanel->getRootFolder()->scrollToShowSelection();
-	
-	LLInventoryModelBackgroundFetch::instance().start();
+
+    if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
+    {
+        llassert(false); // this should have been done on startup
+        LLInventoryModelBackgroundFetch::instance().start();
+    }
 }
 
 void LLPanelOutfitEdit::onListViewFilterCommitted(LLUICtrl* ctrl)
@@ -737,8 +741,12 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 		mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(opener);
 		mInventoryItemsPanel->getRootFolder()->scrollToShowSelection();
 	}
-	
-	LLInventoryModelBackgroundFetch::instance().start();
+
+    if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
+    {
+        llassert(false); // this should have been done on startup
+        LLInventoryModelBackgroundFetch::instance().start();
+    }
 	
 	if (mInventoryItemsPanel->getFilterSubString().empty() && mSearchString.empty())
 	{
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 2274937ea5..d8c34d5c40 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -166,7 +166,11 @@ void LLPanelOutfitsInventory::onSearchEdit(const std::string& string)
 		mActivePanel->setFilterSubString(LLStringUtil::null);
 	}
 
-	LLInventoryModelBackgroundFetch::instance().start();
+    if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
+    {
+        llassert(false); // this should have been done on startup
+        LLInventoryModelBackgroundFetch::instance().start();
+    }
 
 	if (mActivePanel->getFilterSubString().empty() && string.empty())
 	{
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 0ce82a1297..6f29d45f6b 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1478,8 +1478,11 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 			showPicker(FALSE);
 			//grab textures first...
 			LLInventoryModelBackgroundFetch::instance().start(gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE));
-			//...then start full inventory fetch.
-			LLInventoryModelBackgroundFetch::instance().start();
+			//...then start full inventory fetch (should have been done on startup, but just in case.
+            if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
+            {
+                LLInventoryModelBackgroundFetch::instance().start();
+            }
 			handled = TRUE;
 		}
 		else
-- 
cgit v1.2.3


From 6e5b94071b62113f2bd52dd6985498990926a9f6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 11 Apr 2023 21:39:23 +0300
Subject: SL-19544 WIP combination view filtering; hidden items should be
 correctly removed when root is changed

---
 indra/newview/llinventorygallery.cpp   |  6 ++++-
 indra/newview/llpanelmaininventory.cpp | 42 ++++++++++++++++++++++++++++++----
 indra/newview/llpanelmaininventory.h   |  1 +
 3 files changed, 43 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 4e4a476584..f0a1fc5751 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -180,6 +180,11 @@ void LLInventoryGallery::updateRootFolder()
         {
             updateRemovedItem(mItems[i]->getUUID());
         }
+        S32 hidden_count = mHiddenItems.size();
+        for (S32 i = hidden_count - 1; i >= 0; i--)
+        {
+            updateRemovedItem(mHiddenItems[i]->getUUID());
+        }
         
         if (gInventory.containsObserver(mCategoriesObserver))
         {
@@ -740,7 +745,6 @@ void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
             item->die();
         }
     }
-
 }
 
 void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 3ffe1b3901..48b23c3957 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -727,6 +727,10 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
         mInventoryGalleryPanel->setFilterSubString(mFilterSubString);
         return;
     }
+    if(mSingleFolderMode && isCombinationViewMode())
+    {
+        mCombinationGalleryPanel->setFilterSubString(search_string);
+    }
 
 	if (search_string == "")
 	{
@@ -816,7 +820,7 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
 void LLPanelMainInventory::onFilterSelected()
 {
 	// Find my index
-    mActivePanel = mSingleFolderMode ? getChild<LLInventoryPanel>("single_folder_inv") : (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
+    setActivePanel();
 
 	if (!mActivePanel)
 	{
@@ -1243,8 +1247,8 @@ void LLFloaterInventoryFinder::draw()
 	}
 
 
-    bool is_gallery = mPanelMainInventory->isSingleFolderMode() && mPanelMainInventory->isGalleryViewMode();
-    if(is_gallery)
+    bool is_sf_mode = mPanelMainInventory->isSingleFolderMode();
+    if(is_sf_mode && mPanelMainInventory->isGalleryViewMode())
     {
         mPanelMainInventory->mInventoryGalleryPanel->getFilter().setShowFolderState(getCheckShowEmpty() ?
             LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
@@ -1252,6 +1256,12 @@ void LLFloaterInventoryFinder::draw()
     }
     else
     {
+        if(is_sf_mode && mPanelMainInventory->isCombinationViewMode())
+        {
+            mPanelMainInventory->mCombinationGalleryPanel->getFilter().setShowFolderState(getCheckShowEmpty() ?
+                LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+            mPanelMainInventory->mCombinationGalleryPanel->getFilter().setFilterObjectTypes(filter);
+        }
         // update the panel, panel will update the filter
         mPanelMainInventory->getPanel()->setShowFolderState(getCheckShowEmpty() ?
             LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
@@ -1280,7 +1290,7 @@ void LLFloaterInventoryFinder::draw()
 
 
 	mPanelMainInventory->setFilterTextFromFilter();
-    if(is_gallery)
+    if(is_sf_mode && mPanelMainInventory->isGalleryViewMode())
     {
         mPanelMainInventory->mInventoryGalleryPanel->getFilter().setHoursAgo(hours);
         mPanelMainInventory->mInventoryGalleryPanel->getFilter().setDateRangeLastLogoff(getCheckSinceLogoff());
@@ -1288,6 +1298,12 @@ void LLFloaterInventoryFinder::draw()
     }
     else
     {
+        if(is_sf_mode && mPanelMainInventory->isCombinationViewMode())
+        {
+            mPanelMainInventory->mCombinationGalleryPanel->getFilter().setHoursAgo(hours);
+            mPanelMainInventory->mCombinationGalleryPanel->getFilter().setDateRangeLastLogoff(getCheckSinceLogoff());
+            mPanelMainInventory->mCombinationGalleryPanel->getFilter().setDateSearchDirection(getDateSearchDirection());
+        }
         mPanelMainInventory->getPanel()->setHoursAgo(hours);
         mPanelMainInventory->getPanel()->setSinceLogoff(getCheckSinceLogoff());
         mPanelMainInventory->getPanel()->setDateSearchDirection(getDateSearchDirection());
@@ -1446,6 +1462,22 @@ void LLPanelMainInventory::onAddButtonClick()
 	}
 }
 
+void LLPanelMainInventory::setActivePanel()
+{
+    if(mSingleFolderMode && isListViewMode())
+    {
+        mActivePanel = getChild<LLInventoryPanel>("single_folder_inv");
+    }
+    else if(mSingleFolderMode && isCombinationViewMode())
+    {
+        mActivePanel = getChild<LLInventoryPanel>("comb_single_folder_inv");
+    }
+    else
+    {
+        mActivePanel = (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
+    }
+}
+
 void LLPanelMainInventory::toggleViewMode()
 {
     mSingleFolderMode = !mSingleFolderMode;
@@ -1457,7 +1489,7 @@ void LLPanelMainInventory::toggleViewMode()
     getChild<LLLayoutPanel>("nav_buttons")->setVisible(mSingleFolderMode);
     getChild<LLButton>("view_mode_btn")->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
 
-    mActivePanel = mSingleFolderMode ? getChild<LLInventoryPanel>("single_folder_inv") : (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
+    setActivePanel();
     updateTitle();
     onFilterSelected();
 
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index bc7ed51465..1067892959 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -91,6 +91,7 @@ public:
 	LLInventoryPanel* getAllItemsPanel();
 	void selectAllItemsPanel();
 	const LLInventoryPanel* getActivePanel() const { return mActivePanel; }
+    void setActivePanel();
 
 	bool isRecentItemsPanelSelected();
 
-- 
cgit v1.2.3


From 5e59ab0ab77d91f9d855bd5a3fc0e5c691220f01 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Apr 2023 23:12:32 +0300
Subject: SL-19533 Further logging improvements

---
 indra/newview/llaisapi.cpp                        | 65 +++++++++++++++++++++--
 indra/newview/llinventorymodelbackgroundfetch.cpp | 26 ++++++---
 indra/newview/llinventorymodelbackgroundfetch.h   |  1 +
 indra/newview/llviewerinventory.cpp               |  2 +-
 4 files changed, 82 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 1efba0db7a..92589540f1 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -29,6 +29,7 @@
 #include "llaisapi.h"
 
 #include "llagent.h"
+#include "llappviewer.h"
 #include "llcallbacklist.h"
 #include "llinventorymodel.h"
 #include "llsdutil.h"
@@ -95,7 +96,10 @@ void AISAPI::CreateInventory(const LLUUID& parentId, const LLSD& newInventory, c
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
-        callback(LLUUID::null);
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
@@ -138,6 +142,10 @@ void AISAPI::SlamFolder(const LLUUID& folderId, const LLSD& newInventory, comple
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
@@ -173,6 +181,10 @@ void AISAPI::RemoveCategory(const LLUUID &categoryId, completion_t callback)
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
@@ -206,6 +218,10 @@ void AISAPI::RemoveItem(const LLUUID &itemId, completion_t callback)
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
@@ -238,6 +254,10 @@ void AISAPI::CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, b
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Library cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
@@ -282,6 +302,10 @@ void AISAPI::PurgeDescendents(const LLUUID &categoryId, completion_t callback)
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
 
@@ -316,6 +340,10 @@ void AISAPI::UpdateCategory(const LLUUID &categoryId, const LLSD &updates, compl
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
     std::string url = cap + std::string("/category/") + categoryId.asString();
@@ -348,6 +376,10 @@ void AISAPI::UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
     std::string url = cap + std::string("/item/") + itemId.asString();
@@ -379,6 +411,10 @@ void AISAPI::FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callba
 	if (cap.empty())
 	{
 		LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
 		return;
 	}
 	std::string url = cap + std::string("/item/") + itemId.asString();
@@ -410,7 +446,10 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
-        callback(LLUUID::null);
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
     std::string url = cap + std::string("/category/") + catId.asString() + "/children";
@@ -456,7 +495,10 @@ void AISAPI::FetchCategoryChildren(const std::string &identifier, bool recursive
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
-        callback(LLUUID::null);
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
     std::string url = cap + std::string("/category/") + identifier + "/children";
@@ -500,6 +542,10 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
     std::string url = cap + std::string("/category/") + catId.asString() + "/categories";
@@ -541,6 +587,10 @@ void AISAPI::FetchOrphans(completion_t callback)
     if (cap.empty())
     {
         LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
         return;
     }
     std::string url = cap + std::string("/orphans");
@@ -642,6 +692,15 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         invokationFn_t invoke, std::string url, 
         LLUUID targetId, LLSD body, completion_t callback, COMMAND_TYPE type)
 {
+    if (gDisconnected)
+    {
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
+        return;
+    }
+
     LLCore::HttpOptions::ptr_t httpOptions(new LLCore::HttpOptions);
     LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest());
     LLCore::HttpHeaders::ptr_t httpHeaders;
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 0099e81b8f..955f152195 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -190,6 +190,7 @@ LLInventoryModelBackgroundFetch::LLInventoryModelBackgroundFetch():
 	mBackgroundFetchActive(false),
 	mFolderFetchActive(false),
 	mFetchCount(0),
+    mLastFetchCount(0),
     mFetchFolderCount(0),
     mAllRecursiveFoldersFetched(false),
 	mRecursiveInventoryFetchStarted(false),
@@ -424,13 +425,13 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
 
 void LLInventoryModelBackgroundFetch::backgroundFetch()
 {
-	if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
+	if (mBackgroundFetchActive)
 	{
         if (AISAPI::isAvailable())
         {
             bulkFetchViaAis();
         }
-        else
+        else if (gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
         {
             // If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
             bulkFetch();
@@ -460,6 +461,7 @@ void LLInventoryModelBackgroundFetch::incrFetchFolderCount(S32 fetching)
 
 void ais_simple_folder_callback(const LLUUID& inv_id)
 {
+    LL_DEBUGS("AIS3") << "Response for folder " << inv_id << LL_ENDL;
     LLInventoryModelBackgroundFetch::instance().incrFetchFolderCount(-1);
     if (inv_id.notNull()) // null normally means a failure, but is an expected response for orphans
     {
@@ -473,6 +475,7 @@ void ais_simple_folder_callback(const LLUUID& inv_id)
 
 void ais_simple_item_callback(const LLUUID& inv_id)
 {
+    LL_DEBUGS("AIS3") << "Response for " << inv_id << LL_ENDL;
     LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
 }
 
@@ -481,6 +484,7 @@ void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_i
     incrFetchFolderCount(-1);
     if (response_id.isNull()) // Failure
     {
+        LL_DEBUGS("AIS3") << "Failure response for folder " << request_id << LL_ENDL;
         if (recursion == FT_RECURSIVE)
         {
             // A full recursive request failed.
@@ -513,6 +517,7 @@ void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_i
     }
     else
     {
+        LL_DEBUGS("AIS3") << "Got folder " << request_id << LL_ENDL;
         if (recursion == FT_CONTENT_RECURSIVE)
         {
             // Got the folder, now recursively request content
@@ -567,6 +572,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         ? 0.006f // 6 ms
         : 1.f; 
     const F64 end_time = curent_time + max_time;
+    S32 last_fetch_count = mFetchCount;
 
     while (!mFetchFolderQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
     {
@@ -589,10 +595,15 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         }
     }
 
-    LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << mFetchCount
-        << ", scheduled fodler fetches: " << (S32)mFetchFolderQueue.size()
-        << ", scheduled item fetches: " << (S32)mFetchItemQueue.size()
-        << LL_ENDL;
+    if (last_fetch_count != mFetchCount // if anything was added
+        || mLastFetchCount != mFetchCount) // if anything was substracted
+    {
+        mLastFetchCount = mFetchCount;
+        LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << last_fetch_count << "->" << mFetchCount
+            << ", scheduled fodler fetches: " << (S32)mFetchFolderQueue.size()
+            << ", scheduled item fetches: " << (S32)mFetchItemQueue.size()
+            << LL_ENDL;
+    }
     
     if (isFolderFetchProcessingComplete() && mFolderFetchActive)
     {
@@ -619,7 +630,6 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         }
         else
         {
-
             LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
             if (cat)
             {
@@ -630,9 +640,9 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                         ? LLViewerInventoryCategory::FETCH_RECURSIVE
                         : LLViewerInventoryCategory::FETCH_NORMAL;
                     // start again if we did a non-recursive fetch before
+                    // to get all children in a single request
                     if (cat->getFetching() < target_state)
                     {
-
                         if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
                         {
                             AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mFetchType == FT_RECURSIVE, ais_simple_folder_callback);
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index bd54c17c8d..6c2c3e96fa 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -120,6 +120,7 @@ private:
     bool mBackgroundFetchActive;
 	bool mFolderFetchActive;
 	S32 mFetchCount;
+    S32 mLastFetchCount; // for debug
     S32 mFetchFolderCount;
 
 	LLFrameTimer mFetchTimer;
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index c4edc3952b..cd51a00c52 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -689,7 +689,7 @@ void LLViewerInventoryCategory::setFetching(LLViewerInventoryCategory::EFetchTyp
     {
         if (mDescendentsRequested.hasExpired() || (mFetching == FETCH_NONE))
         {
-            const F32 FETCH_TIMER_EXPIRY = 10.0f;
+            const F32 FETCH_TIMER_EXPIRY = 30.0f;
             mDescendentsRequested.reset();
             mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
         }
-- 
cgit v1.2.3


From 627c4e45baec177dd8e0a07b0c3137492819c0ca Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 00:25:34 +0300
Subject: SL-19533 Track folder fetch requests in bulk fetch

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 108 ++++++++++++++--------
 indra/newview/llinventorymodelbackgroundfetch.h   |   4 +-
 2 files changed, 73 insertions(+), 39 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 955f152195..cab3010cf1 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -459,29 +459,33 @@ void LLInventoryModelBackgroundFetch::incrFetchFolderCount(S32 fetching)
     }
 }
 
-void ais_simple_folder_callback(const LLUUID& inv_id)
-{
-    LL_DEBUGS("AIS3") << "Response for folder " << inv_id << LL_ENDL;
-    LLInventoryModelBackgroundFetch::instance().incrFetchFolderCount(-1);
-    if (inv_id.notNull()) // null normally means a failure, but is an expected response for orphans
-    {
-        LLViewerInventoryCategory* cat(gInventory.getCategory(inv_id));
-        if (cat)
-        {
-            cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
-        }
-    }
-}
-
 void ais_simple_item_callback(const LLUUID& inv_id)
 {
     LL_DEBUGS("AIS3") << "Response for " << inv_id << LL_ENDL;
     LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
 }
 
-void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion)
+void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion)
 {
     incrFetchFolderCount(-1);
+    std::list<LLUUID>::const_iterator found = std::find(mExpectedFolderIds.begin() , mExpectedFolderIds.end(), request_id);
+    if (found != mExpectedFolderIds.end())
+    {
+        mExpectedFolderIds.erase(found);
+    }
+    else
+    {
+        // ais shouldn't respond twice
+        llassert(false);
+        LL_WARNS() << "Unexpected folder response for " << request_id << LL_ENDL;
+    }
+
+    if (request_id.isNull())
+    {
+        // orhans, no other actions needed
+        return;
+    }
+
     if (response_id.isNull()) // Failure
     {
         LL_DEBUGS("AIS3") << "Failure response for folder " << request_id << LL_ENDL;
@@ -598,11 +602,36 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     if (last_fetch_count != mFetchCount // if anything was added
         || mLastFetchCount != mFetchCount) // if anything was substracted
     {
-        mLastFetchCount = mFetchCount;
-        LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << last_fetch_count << "->" << mFetchCount
+        LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << mLastFetchCount << "->" << last_fetch_count << "->" << mFetchCount
             << ", scheduled fodler fetches: " << (S32)mFetchFolderQueue.size()
             << ", scheduled item fetches: " << (S32)mFetchItemQueue.size()
             << LL_ENDL;
+        mLastFetchCount = mFetchCount;
+
+        if (!mExpectedFolderIds.empty())
+        {
+            // A folder seem to be stack fetching on QA account, print oldest folder out
+            LL_DEBUGS("AIS3") << "Oldest expected folder: ";
+            std::list<LLUUID>::const_iterator iter = mExpectedFolderIds.begin();
+            LL_CONT << *iter;
+            if ((*iter).notNull())
+            {
+                LLViewerInventoryCategory* cat(gInventory.getCategory(*iter));
+                if (cat)
+                {
+                    LL_CONT << " Folder name: " << cat->getName() << " Parent: " << cat->getParentUUID();
+                }
+                else
+                {
+                    LL_CONT << " This folder doesn't exist";
+                }
+            }
+            else
+            {
+                LL_CONT << " Orphans request";
+            }
+            LL_CONT << LL_ENDL;
+        }
     }
     
     if (isFolderFetchProcessingComplete() && mFolderFetchActive)
@@ -623,10 +652,16 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         const LLUUID & cat_id(fetch_info.mUUID);
         if (cat_id.isNull())
         {
+            incrFetchFolderCount(1);
+            mExpectedFolderIds.push_back(cat_id);
             // Lost and found
             // Should it actually be recursive?
-            AISAPI::FetchOrphans(ais_simple_folder_callback);
-            incrFetchFolderCount(1);
+            AISAPI::FetchOrphans([](const LLUUID& response_id)
+                                 {
+                                     LLInventoryModelBackgroundFetch::instance().onAISFolderCalback(LLUUID::null,
+                                         response_id,
+                                         FT_DEFAULT);
+                                 });
         }
         else
         {
@@ -643,26 +678,25 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                     // to get all children in a single request
                     if (cat->getFetching() < target_state)
                     {
-                        if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
+                        // increment before call in case of immediate callback
+                        incrFetchFolderCount(1);
+                        cat->setFetching(target_state);
+                        mExpectedFolderIds.push_back(cat_id);
+
+                        EFetchType type = fetch_info.mFetchType;
+                        LLUUID cat_id = cat->getUUID();
+                        AISAPI::completion_t cb = [cat_id , type](const LLUUID& response_id)
                         {
-                            AISAPI::FetchCategoryChildren(cat->getUUID(), AISAPI::LIBRARY, fetch_info.mFetchType == FT_RECURSIVE, ais_simple_folder_callback);
-                        }
-                        else
+                            LLInventoryModelBackgroundFetch::instance().onAISFolderCalback(cat_id , response_id , type);
+                        };
+
+                        AISAPI::ITEM_TYPE item_type = AISAPI::INVENTORY;
+                        if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
                         {
-                            LLUUID cat_id = cat->getUUID();
-                            EFetchType type = fetch_info.mFetchType;
-                            AISAPI::FetchCategoryChildren(
-                                cat_id,
-                                AISAPI::INVENTORY,
-                                type == FT_RECURSIVE,
-                                [cat_id, type](const LLUUID &response_id)
-                            {
-                                LLInventoryModelBackgroundFetch::instance().onAISFodlerCalback(cat_id, response_id, type);
-                            });
+                            item_type = AISAPI::LIBRARY;
                         }
-                        incrFetchFolderCount(1);
 
-                        cat->setFetching(target_state);
+                        AISAPI::FetchCategoryChildren(cat_id , item_type , type == FT_RECURSIVE , cb);
                     }
                 }
                 else
@@ -693,6 +727,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
         {
             if (!itemp->isFinished() || fetch_info.mFetchType == FT_FORCED)
             {
+                mFetchCount++;
                 if (itemp->getPermissions().getOwner() == gAgent.getID())
                 {
                     AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
@@ -701,14 +736,13 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                 {
                     AISAPI::FetchItem(fetch_info.mUUID, AISAPI::LIBRARY, ais_simple_item_callback);
                 }
-                mFetchCount++;
             }
         }
         else // We don't know it, assume incomplete
         {
             // Assume agent's inventory, library wouldn't have gotten here
-            AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
             mFetchCount++;
+            AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
         }
     }
 }
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 6c2c3e96fa..1881322e7a 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -100,7 +100,7 @@ protected:
     };
     typedef std::deque<FetchQueueInfo> fetch_queue_t;
 
-    void onAISFodlerCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion);
+    void onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion);
     void bulkFetchViaAis();
     void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
 	void bulkFetch();
@@ -127,7 +127,7 @@ private:
 	F32 mMinTimeBetweenFetches;
 	fetch_queue_t mFetchFolderQueue;
     fetch_queue_t mFetchItemQueue;
-
+    std::list<LLUUID> mExpectedFolderIds; // for debug, should this track time?
 };
 
 #endif // LL_LLINVENTORYMODELBACKGROUNDFETCH_H
-- 
cgit v1.2.3


From 1f2cbfdbe227bda2f3bd2b17b5ac1b125cb28b2d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 00:53:48 +0300
Subject: SL-19533 Content should be recursive only

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index cab3010cf1..69f688d51e 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -712,7 +712,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                             ++it)
                         {
                             // not push_front to not cause an infinite loop
-                            mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), fetch_info.mFetchType));
+                            mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
                         }
                     }
                 }
-- 
cgit v1.2.3


From 842bc87941d4574fe1ce34186872e43ecef881c3 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 12:56:56 +0300
Subject: SL-19544 WIP update combination gallery visibility after changing
 filter

---
 indra/newview/llinventorygallery.cpp   | 13 +++++++--
 indra/newview/llinventorygallery.h     |  1 +
 indra/newview/llinventorypanel.h       |  1 -
 indra/newview/llpanelmaininventory.cpp | 50 ++++++++++++++++++++--------------
 indra/newview/llpanelmaininventory.h   |  3 +-
 5 files changed, 43 insertions(+), 25 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index f0a1fc5751..9766a39e3c 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -270,9 +270,9 @@ void LLInventoryGallery::draw()
     LLPanel::draw();
     if (mGalleryCreated)
     {
-        if(!updateRowsIfNeeded() && mFilter->isModified())
+        if(!updateRowsIfNeeded())
         {
-            reArrangeRows();
+            handleModifiedFilter();
         }
     }
 }
@@ -1138,6 +1138,15 @@ bool LLInventoryGallery::hasVisibleItems()
 {
     return mItemsAddedCount > 0;
 }
+
+void LLInventoryGallery::handleModifiedFilter()
+{
+    if(mFilter->isModified())
+    {
+        reArrangeRows();
+    }
+}
+
 //-----------------------------
 // LLInventoryGalleryItem
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 5634c63072..6bca8a0dc5 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -123,6 +123,7 @@ public:
 
     bool hasDescendents(const LLUUID& cat_id);
     bool hasVisibleItems();
+    void handleModifiedFilter();
 
 protected:
 
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 136d9f75f6..2b152edada 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -394,7 +394,6 @@ public:
 
     void initFromParams(const Params& p);
     bool isSelectionRemovable() { return false; }
-    //void setSelectCallback(const boost::function<void(const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
 
     void openInCurrentWindow(const LLSD& userdata);
     void changeFolderRoot(const LLUUID& new_id);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 48b23c3957..18f80d5d55 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -252,12 +252,12 @@ BOOL LLPanelMainInventory::postBuild()
     mInventoryGalleryPanel = getChild<LLInventoryGallery>("gallery_view_inv");
     mGalleryRootUpdatedConnection = mInventoryGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
 
-    mCombinationPanelInventory = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
-    LLInventoryFilter& comb_inv_filter = mCombinationPanelInventory->getFilter();
+    mCombinationInventoryPanel = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
+    LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
     comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_EXCLUDE_THUMBNAILS);
     comb_inv_filter.markDefault();
-    mCombinationPanelInventory->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mCombinationPanelInventory, _1, _2));
-    mCombinationPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
+    mCombinationInventoryPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mCombinationInventoryPanel, _1, _2));
+    mCombinationInventoryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
 
     mCombinationGalleryPanel = getChild<LLInventoryGallery>("comb_gallery_view_inv");
     LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
@@ -627,7 +627,7 @@ void LLPanelMainInventory::setSearchType(LLInventoryFilter::ESearchType type)
     }
     if(mSingleFolderMode && isCombinationViewMode())
     {
-        mCombinationPanelInventory->setSearchType(type);
+        mCombinationInventoryPanel->setSearchType(type);
         mCombinationGalleryPanel->setSearchType(type);
     }
     else
@@ -1579,7 +1579,7 @@ void LLPanelMainInventory::onUpFolderClicked()
             }
             if(isCombinationViewMode())
             {
-                mCombinationPanelInventory->changeFolderRoot(cat->getParentUUID());
+                mCombinationInventoryPanel->changeFolderRoot(cat->getParentUUID());
             }
         }
     }
@@ -1597,7 +1597,7 @@ void LLPanelMainInventory::onBackFolderClicked()
     }
     if(isCombinationViewMode())
     {
-        mCombinationPanelInventory->onBackwardFolder();
+        mCombinationInventoryPanel->onBackwardFolder();
     }
 }
 
@@ -1613,7 +1613,7 @@ void LLPanelMainInventory::onForwardFolderClicked()
     }
     if(isCombinationViewMode())
     {
-        mCombinationPanelInventory->onForwardFolder();
+        mCombinationInventoryPanel->onForwardFolder();
     }
 }
 
@@ -2178,11 +2178,11 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
 {
     if(gallery_clicked)
     {
-        mCombinationPanelInventory->changeFolderRoot(mCombinationGalleryPanel->getRootFolder());
+        mCombinationInventoryPanel->changeFolderRoot(mCombinationGalleryPanel->getRootFolder());
     }
     else
     {
-        mCombinationGalleryPanel->setRootFolder(mCombinationPanelInventory->getSingleFolderRoot());
+        mCombinationGalleryPanel->setRootFolder(mCombinationInventoryPanel->getSingleFolderRoot());
     }
 
     updateTitle();
@@ -2190,8 +2190,16 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
 
 void LLPanelMainInventory::updateCombinationVisibility()
 {
-    getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(mCombinationGalleryPanel->hasVisibleItems());
-    getChild<LLView>("border")->setVisible(mCombinationGalleryPanel->hasVisibleItems());
+    if(mSingleFolderMode && isCombinationViewMode())
+    {
+        bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
+        getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
+        getChild<LLView>("border")->setVisible(!is_gallery_empty);
+        if(is_gallery_empty)
+        {
+            mCombinationGalleryPanel->handleModifiedFilter();
+        }
+    }
 }
 
 void LLPanelMainInventory::updateNavButtons()
@@ -2208,8 +2216,8 @@ void LLPanelMainInventory::updateNavButtons()
     }
     if(isCombinationViewMode())
     {
-        getChild<LLButton>("back_btn")->setEnabled(mCombinationPanelInventory->isBackwardAvailable());
-        getChild<LLButton>("forward_btn")->setEnabled(mCombinationPanelInventory->isForwardAvailable());
+        getChild<LLButton>("back_btn")->setEnabled(mCombinationInventoryPanel->isBackwardAvailable());
+        getChild<LLButton>("forward_btn")->setEnabled(mCombinationInventoryPanel->isForwardAvailable());
     }
 
     const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
@@ -2244,8 +2252,8 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
                 backward_history = mInventoryGalleryPanel->getNavBackwardList();
                 break;
             case MODE_COMBINATION:
-                forward_history = mCombinationPanelInventory->getNavForwardList();
-                backward_history = mCombinationPanelInventory->getNavBackwardList();
+                forward_history = mCombinationInventoryPanel->getNavForwardList();
+                backward_history = mCombinationInventoryPanel->getNavBackwardList();
                 break;
         }
             
@@ -2270,10 +2278,10 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
         }
         if(isCombinationViewMode())
         {
-            mCombinationPanelInventory->changeFolderRoot(cur_root);
+            mCombinationInventoryPanel->changeFolderRoot(cur_root);
             mCombinationGalleryPanel->setRootFolder(cur_root);
-            mCombinationPanelInventory->setNavForwardList(forward_history);
-            mCombinationPanelInventory->setNavBackwardList(backward_history);
+            mCombinationInventoryPanel->setNavForwardList(forward_history);
+            mCombinationInventoryPanel->setNavBackwardList(backward_history);
             mCombinationGalleryPanel->setNavForwardList(forward_history);
             mCombinationGalleryPanel->setNavBackwardList(backward_history);
         }
@@ -2306,7 +2314,7 @@ LLUUID LLPanelMainInventory::getCurrentSFVRoot()
     }
     if(isCombinationViewMode())
     {
-        return mCombinationPanelInventory->getSingleFolderRoot();
+        return mCombinationInventoryPanel->getSingleFolderRoot();
     }
     return LLUUID::null;
 }
@@ -2337,7 +2345,7 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id)
         }
         else
         {
-            mCombinationPanelInventory->setSelection(item_id, false);
+            mCombinationInventoryPanel->setSelection(item_id, false);
         }
     }
 }
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 1067892959..8bc8f4e2e6 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -193,7 +193,8 @@ private:
     EViewModeType mViewMode;
     LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
     LLInventoryGallery* mInventoryGalleryPanel;
-    LLInventorySingleFolderPanel* mCombinationPanelInventory;
+
+    LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
 
     boost::signals2::connection mListViewRootUpdatedConnection;
-- 
cgit v1.2.3


From bdd4cb5963df9550eb8e9c0bca0eff0010b44b1e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 19:11:59 +0300
Subject: SL-19544 WIP show drag handler control

---
 indra/llui/lllayoutstack.cpp                           |  8 +++++---
 indra/llui/lllayoutstack.h                             |  3 +++
 indra/newview/llpanelmaininventory.cpp                 |  1 -
 .../skins/default/xui/en/panel_main_inventory.xml      | 18 ++++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 77938edf27..8a011b4890 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -214,7 +214,8 @@ LLLayoutStack::Params::Params()
 	drag_handle_first_indent("drag_handle_first_indent", 0),
 	drag_handle_second_indent("drag_handle_second_indent", 0),
 	drag_handle_thickness("drag_handle_thickness", 5),
-	drag_handle_shift("drag_handle_shift", 2)
+	drag_handle_shift("drag_handle_shift", 2),
+    drag_handle_color("drag_handle_color", LLUIColorTable::instance().getColor("ResizebarBody"))
 {
 	addSynonym(border_size, "drag_handle_gap");
 }
@@ -234,7 +235,8 @@ LLLayoutStack::LLLayoutStack(const LLLayoutStack::Params& p)
 	mDragHandleFirstIndent(p.drag_handle_first_indent),
 	mDragHandleSecondIndent(p.drag_handle_second_indent),
 	mDragHandleThickness(p.drag_handle_thickness),
-	mDragHandleShift(p.drag_handle_shift)
+	mDragHandleShift(p.drag_handle_shift),
+    mDragHandleColor(p.drag_handle_color())
 {
 }
 
@@ -561,7 +563,7 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp)
 				resize_bar_bg_panel_p.follows.flags = FOLLOWS_ALL;
 				resize_bar_bg_panel_p.tab_stop = false;
 				resize_bar_bg_panel_p.background_visible = true;
-				resize_bar_bg_panel_p.bg_alpha_color = LLUIColorTable::instance().getColor("ResizebarBody");
+				resize_bar_bg_panel_p.bg_alpha_color = mDragHandleColor;
 				resize_bar_bg_panel_p.has_border = true;
 				resize_bar_bg_panel_p.border.border_thickness = 1;
 				resize_bar_bg_panel_p.border.highlight_light_color = LLUIColorTable::instance().getColor("ResizebarBorderLight");
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index f772dbc6b4..9a53a7f787 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -59,6 +59,8 @@ public:
 		Optional<S32>			drag_handle_thickness;
 		Optional<S32>			drag_handle_shift;
 
+        Optional<LLUIColor>     drag_handle_color;
+
 		Params();
 	};
 
@@ -127,6 +129,7 @@ private:
 	S32  mDragHandleSecondIndent;
 	S32  mDragHandleThickness;
 	S32  mDragHandleShift;
+    LLUIColor mDragHandleColor;
 }; // end class LLLayoutStack
 
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 18f80d5d55..dfcfc94cea 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2194,7 +2194,6 @@ void LLPanelMainInventory::updateCombinationVisibility()
     {
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
         getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
-        getChild<LLView>("border")->setVisible(!is_gallery_empty);
         if(is_gallery_empty)
         {
             mCombinationGalleryPanel->handleModifiedFilter();
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 6eb1cf0498..551e9835df 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -342,6 +342,13 @@
       height="372"
       width="312"
       animate="false"
+      drag_handle_gap="13"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_color="AddPaymentPanel"
+      drag_handle_shift="5"
+      show_drag_handle="true"
       top="0"
       left="0"
       orientation="vertical">
@@ -359,22 +366,13 @@
          filename="panel_inventory_gallery.xml"
          left="0"
          top_pad="0"
-         height="178"
+         height="186"
          width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
          layout="topleft">
         </panel>
-        <view_border
-         bevel_style="none"
-         height="0"
-         follows="left|bottom|right"
-         layout="topleft"
-         left="6"
-         name="border"
-         top_pad="8"
-         width="300"/>
        </layout_panel>
        <layout_panel
         border="false"
-- 
cgit v1.2.3


From 8b1a7085be07704a58e169d1133fc356a1745c74 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 19:13:32 +0300
Subject: SL-19533 Logging tag change

---
 indra/newview/llaisapi.cpp                        | 13 ++++++-------
 indra/newview/llinventorymodelbackgroundfetch.cpp |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 92589540f1..ef3305a69d 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -684,7 +684,7 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
     }
     AISUpdate ais_update(update, is_fetch, depth);
     ais_update.doUpdate(); // execute the updates in the appropriate order.
-    LL_DEBUGS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
+    LL_DEBUGS("Inventory", "AIS3") << "Elapsed processing: " << timer.getElapsedTimeF32() << LL_ENDL;
 }
 
 /*static*/
@@ -707,13 +707,11 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 
     httpOptions->setTimeout(180);
 
-    LL_DEBUGS("Inventory") << "url: " << url << LL_ENDL;
-
     LLSD result;
     LLSD httpResults;
     LLCore::HttpStatus status;
 
-    if (debugLoggingEnabled("AIS3"))
+    if (debugLoggingEnabled("Inventory"))
     {
         LLTimer ais_timer;
         ais_timer.start();
@@ -721,10 +719,11 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
         status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
         F32MillisecondsImplicit elapsed_time = ais_timer.getElapsedTimeF32();
-        LL_DEBUGS("AIS3") << "Request type: " << (S32)type
+
+        LL_DEBUGS("Inventory") << "Request type: " << (S32)type
             << " \nRequest url: " << url
             << " \nRequest target: " << targetId
-            << " \nElapsed time: " << elapsed_time
+            << " \nElapsed time ince request: " << elapsed_time
             << " \nstatus: " << status.toULong() << LL_ENDL;
     }
     else
@@ -785,7 +784,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;
     }
 
-	LL_DEBUGS("Inventory") << result << LL_ENDL;
+	LL_DEBUGS("Inventory", "AIS3") << "Result: " << result << LL_ENDL;
     onUpdateReceived("AISCommand", result, type, body);
 
     if (callback && !callback.empty())
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 69f688d51e..f650cc383f 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -461,7 +461,7 @@ void LLInventoryModelBackgroundFetch::incrFetchFolderCount(S32 fetching)
 
 void ais_simple_item_callback(const LLUUID& inv_id)
 {
-    LL_DEBUGS("AIS3") << "Response for " << inv_id << LL_ENDL;
+    LL_DEBUGS(LOG_INV , "AIS3") << "Response for " << inv_id << LL_ENDL;
     LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
 }
 
@@ -488,7 +488,7 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
 
     if (response_id.isNull()) // Failure
     {
-        LL_DEBUGS("AIS3") << "Failure response for folder " << request_id << LL_ENDL;
+        LL_DEBUGS(LOG_INV , "AIS3") << "Failure response for folder " << request_id << LL_ENDL;
         if (recursion == FT_RECURSIVE)
         {
             // A full recursive request failed.
@@ -521,7 +521,7 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
     }
     else
     {
-        LL_DEBUGS("AIS3") << "Got folder " << request_id << LL_ENDL;
+        LL_DEBUGS(LOG_INV , "AIS3") << "Got folder " << request_id << LL_ENDL;
         if (recursion == FT_CONTENT_RECURSIVE)
         {
             // Got the folder, now recursively request content
@@ -611,7 +611,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         if (!mExpectedFolderIds.empty())
         {
             // A folder seem to be stack fetching on QA account, print oldest folder out
-            LL_DEBUGS("AIS3") << "Oldest expected folder: ";
+            LL_DEBUGS(LOG_INV , "AIS3") << "Oldest expected folder: ";
             std::list<LLUUID>::const_iterator iter = mExpectedFolderIds.begin();
             LL_CONT << *iter;
             if ((*iter).notNull())
-- 
cgit v1.2.3


From c6d2bf93c02c6099f4c86a3379c3e82e21f9f37e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 20:06:23 +0300
Subject: SL-19496 Recent server change requires thumbnail ids to be passed as
 strings

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 099ceea821..4249ae9305 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -740,7 +740,8 @@ void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID &new_thumbnail_id
     else if (obj->getThumbnailUUID() != new_thumbnail_id)
     {
         LLSD updates;
-        updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id);
+        // At the moment server expects id as a string
+        updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id.asString());
         LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj);
         if (view_folder)
         {
-- 
cgit v1.2.3


From 37530c9d736d90ec29b97e3567346a02e2826f97 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 12 Apr 2023 21:11:36 +0300
Subject: SL-19544 WIP hide inventory pane in Combination view, if there is no
 visible items

---
 indra/llui/llfolderview.cpp                                 |  5 +++--
 indra/llui/llfolderview.h                                   |  4 ++++
 indra/newview/llinventorypanel.cpp                          |  4 ++++
 indra/newview/llinventorypanel.h                            |  2 ++
 indra/newview/llpanelmaininventory.cpp                      | 12 ++++++++++++
 indra/newview/skins/default/xui/en/panel_main_inventory.xml |  8 ++++----
 6 files changed, 29 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 734a7599aa..14985c6bad 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -189,7 +189,8 @@ LLFolderView::LLFolderView(const Params& p)
 	mStatusTextBox(NULL),
 	mShowItemLinkOverlays(p.show_item_link_overlays),
 	mViewModel(p.view_model),
-    mGroupedItemModel(p.grouped_item_model)
+    mGroupedItemModel(p.grouped_item_model),
+    mForceArrange(false)
 {
     LLPanel* panel = p.parent_panel;
     mParentPanel = panel->getHandle();
@@ -1736,7 +1737,7 @@ void LLFolderView::update()
 		mNeedsAutoSelect = FALSE;
 	}
 
-  BOOL is_visible = isInVisibleChain();
+  BOOL is_visible = isInVisibleChain() || mForceArrange;
 
   //Puts folders/items in proper positions
   // arrange() takes the model filter flag into account and call sort() if necessary (CHUI-849)
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index fbd8522b19..f19df1d0dc 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -241,6 +241,8 @@ public:
 	void setCallbackRegistrar(LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* registrar) { mCallbackRegistrar = registrar; }
 	void setEnableRegistrar(LLUICtrl::EnableCallbackRegistry::ScopedRegistrar* registrar) { mEnableRegistrar = registrar; }
 
+    void setForceArrange(bool force) { mForceArrange = force; }
+
 	LLPanel* getParentPanel() { return mParentPanel.get(); }
 	// DEBUG only
 	void dumpSelectionInformation();
@@ -337,6 +339,8 @@ protected:
 
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* mCallbackRegistrar;
 	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar* mEnableRegistrar;
+
+    bool mForceArrange;
 	
 public:
 	static F32 sAutoOpenTime;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index cc81b53841..2193743a38 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2221,6 +2221,10 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
     }
 }
 
+bool LLInventorySingleFolderPanel::hasVisibleItems()
+{
+    return mFolderRoot.get()->hasVisibleChildren();
+}
 /************************************************************************/
 /* Asset Pre-Filtered Inventory Panel related class                     */
 /************************************************************************/
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 2b152edada..abd5b4f20b 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -405,6 +405,8 @@ public:
     bool isBackwardAvailable();
     bool isForwardAvailable();
 
+    bool hasVisibleItems();
+
     void setNavBackwardList(std::list<LLUUID> backward_list) { mBackwardFolders = backward_list; }
     void setNavForwardList(std::list<LLUUID> forward_list) { mForwardFolders = forward_list; }
     std::list<LLUUID> getNavBackwardList() { return mBackwardFolders; }
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index dfcfc94cea..62b7a38857 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1480,6 +1480,11 @@ void LLPanelMainInventory::setActivePanel()
 
 void LLPanelMainInventory::toggleViewMode()
 {
+    if(mSingleFolderMode && isCombinationViewMode())
+    {
+        mCombinationInventoryPanel->getRootFolder()->setForceArrange(false);
+    }
+
     mSingleFolderMode = !mSingleFolderMode;
 
     getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
@@ -2193,11 +2198,17 @@ void LLPanelMainInventory::updateCombinationVisibility()
     if(mSingleFolderMode && isCombinationViewMode())
     {
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
+        bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty;
         getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
+        getChild<LLLayoutPanel>("comb_inventory_layout")->setVisible(show_inv_pane);
+        mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
+
         if(is_gallery_empty)
         {
             mCombinationGalleryPanel->handleModifiedFilter();
         }
+        
+        getActivePanel()->getRootFolder();
     }
 }
 
@@ -2253,6 +2264,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
             case MODE_COMBINATION:
                 forward_history = mCombinationInventoryPanel->getNavForwardList();
                 backward_history = mCombinationInventoryPanel->getNavBackwardList();
+                mCombinationInventoryPanel->getRootFolder()->setForceArrange(false);
                 break;
         }
             
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 551e9835df..5bc0113367 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -357,7 +357,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="186"
+        height="246"
         width="312"
         min_width="150"
         name="comb_gallery_layout">
@@ -366,7 +366,7 @@
          filename="panel_inventory_gallery.xml"
          left="0"
          top_pad="0"
-         height="186"
+         height="246"
          width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
@@ -379,7 +379,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="186"
+        height="126"
         width="312"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
@@ -387,7 +387,7 @@
          follows="all"
          left="0"
          top="1"
-         height="181"
+         height="126"
          width="312"
          layout="topleft"
          show_item_link_overlays="true"
-- 
cgit v1.2.3


From ebbc09551adbf9f03681740987a488a61593acc6 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 3 Apr 2023 23:21:25 +0200
Subject: SL-19036: Extra folder is created after dragging the inventory folder

---
 indra/newview/llinventoryfunctions.cpp | 36 ++++++++++++++++++++++++++++++++--
 indra/newview/llinventoryfunctions.h   | 12 +++++++++++-
 indra/newview/llinventorymodel.cpp     | 18 ++++++++++++-----
 3 files changed, 58 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 67240ac7e7..145814ab41 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -213,8 +213,7 @@ bool contains_nocopy_items(const LLUUID& id)
     return false;
 }
 
-// Generates a string containing the path to the item specified by
-// item_id.
+// Generates a string containing the path to the item specified by id.
 void append_path(const LLUUID& id, std::string& path)
 {
 	std::string temp;
@@ -234,6 +233,36 @@ void append_path(const LLUUID& id, std::string& path)
 	path.append(temp);
 }
 
+// Generates a string containing the path name of the object.
+std::string make_path(const LLInventoryObject* object)
+{
+    std::string path;
+    append_path(object->getUUID(), path);
+    return path + "/" + object->getName();
+}
+
+// Generates a string containing the path name of the object specified by id.
+std::string make_inventory_path(const LLUUID& id)
+{
+    if (LLInventoryObject* object = gInventory.getObject(id))
+        return make_path(object);
+    return "";
+}
+
+// Generates a string containing the path name and id of the object.
+std::string make_info(const LLInventoryObject* object)
+{
+    return "'" + make_path(object) + "' (" + object->getUUID().asString() + ")";
+}
+
+// Generates a string containing the path name and id of the object specified by id.
+std::string make_inventory_info(const LLUUID& id)
+{
+    if (LLInventoryObject* object = gInventory.getObject(id))
+        return make_info(object);
+    return "<Inventory object not found!> (" + id.asString() + ")";
+}
+
 void update_marketplace_folder_hierarchy(const LLUUID cat_id)
 {
     // When changing the marketplace status of a folder, the only thing that needs to happen is
@@ -1415,6 +1444,7 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
             if (copy)
             {
                 // Copy the item
+                LL_INFOS("SLM") << "Copy item '" << make_info(viewer_inv_item) << "' to '" << make_inventory_path(dest_folder) << "'" << LL_ENDL;
                 LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(update_folder_cb, dest_folder));
                 copy_inventory_item(
                                     gAgent.getID(),
@@ -1426,6 +1456,7 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
             }
             else
             {
+                LL_INFOS("SLM") << "Move item '" << make_info(viewer_inv_item) << "' to '" << make_inventory_path(dest_folder) << "'" << LL_ENDL;
                 // Reparent the item
                 gInventory.changeItemParent(viewer_inv_item, dest_folder, true);
             }
@@ -1472,6 +1503,7 @@ bool move_folder_to_marketplacelistings(LLInventoryCategory* inv_cat, const LLUU
         }
         else
         {
+            LL_INFOS("SLM") << "Move category " << make_info(viewer_inv_cat) << " to '" << make_inventory_path(dest_folder) << "'" << LL_ENDL;
             // Reparent the folder
             gInventory.changeCategoryParent(viewer_inv_cat, dest_folder, false);
             // Check the destination folder recursively for no copy items and promote the including folders if any
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 56ad6f6496..8c8bd789c2 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -78,9 +78,19 @@ void copy_inventory_category(LLInventoryModel* model, LLViewerInventoryCategory*
 
 void copy_inventory_category_content(const LLUUID& new_cat_uuid, LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& root_copy_id, bool move_no_copy_items);
 
-// Generates a string containing the path to the item specified by item_id.
+// Generates a string containing the path to the object specified by id (not including the object name).
 void append_path(const LLUUID& id, std::string& path);
 
+// Generates a string containing the path name of the object.
+std::string make_path(const LLInventoryObject* object);
+// Generates a string containing the path name of the object specified by id.
+std::string make_inventory_path(const LLUUID& id);
+
+// Generates a string containing the path name and id of the object.
+std::string make_info(const LLInventoryObject* object);
+// Generates a string containing the path name and id of the object specified by id.
+std::string make_inventory_info(const LLUUID& id);
+
 typedef boost::function<void(std::string& validation_message, S32 depth, LLError::ELevel log_level)> validation_callback_t;
 
 bool can_move_item_to_marketplace(const LLInventoryCategory* root_folder, LLInventoryCategory* dest_folder, LLInventoryItem* inv_item, std::string& tooltip_msg, S32 bundle_size = 1, bool from_paste = false);
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 46e76bc3f8..06050dc4a4 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -668,6 +668,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 										   const std::string& pname,
 										   inventory_func_type callback)
 {
+	LL_DEBUGS(LOG_INV) << "Create '" << pname << "' in '" << make_inventory_path(parent_id) << "'" << LL_ENDL;
 	LLUUID id;
 	if (!isInventoryUsable())
 	{
@@ -759,6 +760,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	cat->packMessage(msg);
 	gAgent.sendReliableMessage();
 
+	LL_INFOS(LOG_INV) << "Created new category '" << make_inventory_path(id) << "'" << LL_ENDL;
 	// return the folder id of the newly created folder
 	return id;
 }
@@ -1347,6 +1349,7 @@ void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id)
 	LLPointer<LLViewerInventoryCategory> cat = getCategory(object_id);
 	if(cat && (cat->getParentUUID() != cat_id))
 	{
+		LL_DEBUGS(LOG_INV) << "Move category '" << make_path(cat) << "' to '" << make_inventory_path(cat_id) << "'" << LL_ENDL;
 		cat_array_t* cat_array;
 		cat_array = getUnlockedCatArray(cat->getParentUUID());
 		if(cat_array) vector_replace_with_last(*cat_array, cat);
@@ -1359,6 +1362,7 @@ void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id)
 	LLPointer<LLViewerInventoryItem> item = getItem(object_id);
 	if(item && (item->getParentUUID() != cat_id))
 	{
+		LL_DEBUGS(LOG_INV) << "Move item '" << make_path(item) << "' to '" << make_inventory_path(cat_id) << "'" << LL_ENDL;
 		item_array_t* item_array;
 		item_array = getUnlockedItemArray(item->getParentUUID());
 		if(item_array) vector_replace_with_last(*item_array, item);
@@ -1377,14 +1381,14 @@ void LLInventoryModel::changeItemParent(LLViewerInventoryItem* item,
 {
 	if (item->getParentUUID() == new_parent_id)
 	{
-		LL_DEBUGS(LOG_INV) << "'" << item->getName() << "' (" << item->getUUID()
-						   << ") is already in folder " << new_parent_id << LL_ENDL;
+		LL_DEBUGS(LOG_INV) << make_info(item) << " is already in folder " << make_inventory_info(new_parent_id) << LL_ENDL;
 	}
 	else
 	{
-		LL_INFOS(LOG_INV) << "Moving '" << item->getName() << "' (" << item->getUUID()
-						  << ") from " << item->getParentUUID() << " to folder "
-						  << new_parent_id << LL_ENDL;
+		LL_INFOS(LOG_INV) << "Move item " << make_info(item)
+			<< " from " << make_inventory_info(item->getParentUUID())
+			<< " to " << make_inventory_info(new_parent_id) << LL_ENDL;
+
 		LLInventoryModel::update_list_t update;
 		LLInventoryModel::LLCategoryUpdate old_folder(item->getParentUUID(),-1);
 		update.push_back(old_folder);
@@ -1416,6 +1420,10 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat,
 		return;
 	}
 
+	LL_INFOS(LOG_INV) << "Move category " << make_info(cat)
+		<< " from " << make_inventory_info(cat->getParentUUID())
+		<< " to " << make_inventory_info(new_parent_id) << LL_ENDL;
+
 	LLInventoryModel::update_list_t update;
 	LLInventoryModel::LLCategoryUpdate old_folder(cat->getParentUUID(), -1);
 	update.push_back(old_folder);
-- 
cgit v1.2.3


From 53f2e1710aab77361085fe2c2a41fea87ede0fb8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 13 Apr 2023 02:20:33 +0300
Subject: SL-19533 Faster declouding

---
 indra/newview/llaisapi.cpp                        |  3 +-
 indra/newview/llappearancemgr.cpp                 | 98 ++++++++++++++++-------
 indra/newview/llappearancemgr.h                   |  1 -
 indra/newview/llinventorymodel.cpp                | 50 ++++++++++--
 indra/newview/llinventorymodel.h                  |  4 +-
 indra/newview/llinventorymodelbackgroundfetch.cpp | 20 +++--
 indra/newview/llviewerinventory.cpp               |  1 +
 7 files changed, 126 insertions(+), 51 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index ef3305a69d..7a87fc6c3d 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -707,6 +707,8 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 
     httpOptions->setTimeout(180);
 
+    LL_DEBUGS("Inventory") << "Request url: " << url << LL_ENDL;
+
     LLSD result;
     LLSD httpResults;
     LLCore::HttpStatus status;
@@ -721,7 +723,6 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         F32MillisecondsImplicit elapsed_time = ais_timer.getElapsedTimeF32();
 
         LL_DEBUGS("Inventory") << "Request type: " << (S32)type
-            << " \nRequest url: " << url
             << " \nRequest target: " << targetId
             << " \nElapsed time ince request: " << elapsed_time
             << " \nstatus: " << status.toULong() << LL_ENDL;
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 59bf418a00..e160b5813f 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -586,6 +586,66 @@ LLUpdateAppearanceAndEditWearableOnDestroy::~LLUpdateAppearanceAndEditWearableOn
 	}
 }
 
+class LLBrokenLinkObserver : public LLInventoryObserver
+{
+public:
+    LLUUID mUUID;
+    bool mEnforceItemRestrictions;
+    bool mEnforceOrdering;
+    nullary_func_t mPostUpdateFunc;
+
+    LLBrokenLinkObserver(const LLUUID& uuid,
+                          bool enforce_item_restrictions ,
+                          bool enforce_ordering ,
+                          nullary_func_t post_update_func) :
+        mUUID(uuid),
+        mEnforceItemRestrictions(enforce_item_restrictions),
+        mEnforceOrdering(enforce_ordering),
+        mPostUpdateFunc(post_update_func)
+    {
+    }
+    /* virtual */ void changed(U32 mask);
+    void postProcess();
+};
+
+void LLBrokenLinkObserver::changed(U32 mask)
+{
+    if (mask & LLInventoryObserver::REBUILD)
+    {
+        // This observer should be executed after LLInventoryPanel::itemChanged(),
+        // but if it isn't, consider calling updateAppearanceFromCOF with a delay
+        const uuid_set_t& changed_item_ids = gInventory.getChangedIDs();
+        for (uuid_set_t::const_iterator it = changed_item_ids.begin(); it != changed_item_ids.end(); ++it)
+        {
+            const LLUUID& id = *it;
+            if (id == mUUID)
+            {
+                // Might not be processed yet and it is not a
+                // good idea to update appearane here, postpone.
+                doOnIdleOneTime([this]()
+                                {
+                                    postProcess();
+                                });
+
+                gInventory.removeObserver(this);
+                return;
+            }
+        }
+    }
+}
+
+void LLBrokenLinkObserver::postProcess()
+{
+    LLViewerInventoryItem* item = gInventory.getItem(mUUID);
+    llassert(item && !item->getIsBrokenLink()); // the whole point was to get a correct link
+
+    LLAppearanceMgr::instance().updateAppearanceFromCOF(
+        mEnforceItemRestrictions ,
+        mEnforceOrdering ,
+        mPostUpdateFunc);
+    delete this;
+}
+
 
 struct LLFoundData
 {
@@ -2435,35 +2495,16 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
         {
             // Some links haven't loaded yet, but fetch isn't complete so
             // links are likely fine and we will have to wait for them to
-            // load (if inventory takes too long to load, might be a good
-            // idea to make this check periodical)
+            // load
             if (LLInventoryModelBackgroundFetch::getInstance()->folderFetchActive())
             {
-                if (!mBulkFecthCallbackSlot.connected())
-                {
-                    nullary_func_t cb = post_update_func;
-                    mBulkFecthCallbackSlot =
-                        LLInventoryModelBackgroundFetch::getInstance()->setFetchCompletionCallback(
-                            [this, enforce_ordering, post_update_func, cb]()
-                    {
-                        // inventory model should be already tracking this
-                        // callback, but make sure rebuildBrockenLinks gets
-                        // called before a cof update
-                        gInventory.rebuildBrockenLinks();
-                        updateAppearanceFromCOF(enforce_ordering, post_update_func, post_update_func);
-                        mBulkFecthCallbackSlot.disconnect();
-                    });
-                }
-                return;
-            }
-            else
-            {
-                // this should have happened on completion callback,
-                // check why it didn't then fix it
-                llassert(false); 
 
-                // try to recover now
-                gInventory.rebuildBrockenLinks();
+                LLBrokenLinkObserver* observer = new LLBrokenLinkObserver(cof_items.front()->getUUID(),
+                                                                            enforce_item_restrictions,
+                                                                            enforce_ordering,
+                                                                            post_update_func);
+                gInventory.addObserver(observer);
+                return;
             }
         }
     }
@@ -4262,11 +4303,6 @@ LLAppearanceMgr::LLAppearanceMgr():
 LLAppearanceMgr::~LLAppearanceMgr()
 {
 	mActive = false;
-
-    if (!mBulkFecthCallbackSlot.connected())
-    {
-        mBulkFecthCallbackSlot.disconnect();
-    }
 }
 
 void LLAppearanceMgr::setAttachmentInvLinkEnable(bool val)
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index edb4be83bb..cf953d21ac 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -264,7 +264,6 @@ private:
 	bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls.
     bool mOutstandingAppearanceBakeRequest; // A bake request is outstanding.  Do not overlap.
     bool mRerequestAppearanceBake;
-    boost::signals2::connection mBulkFecthCallbackSlot;
 
 	/**
 	 * Lock for blocking operations on outfit until server reply or timeout exceed
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 4bca2ce650..32acd0eb03 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1764,11 +1764,19 @@ void LLInventoryModel::rebuildBrockenLinks()
     // make sure we aren't adding expensive Rebuild to anything else.
     notifyObservers();
 
-    for (const LLUUID &link_id : mPossiblyBrockenLinks)
+    for (const broken_links_t::value_type &link_list : mPossiblyBrockenLinks)
     {
-        addChangedMask(LLInventoryObserver::REBUILD, link_id);
+        for (const LLUUID& link_id : link_list.second)
+        {
+            addChangedMask(LLInventoryObserver::REBUILD , link_id);
+        }
+    }
+    for (const LLUUID& link_id : mLinksRebuildList)
+    {
+        addChangedMask(LLInventoryObserver::REBUILD , link_id);
     }
     mPossiblyBrockenLinks.clear();
+    mLinksRebuildList.clear();
     notifyObservers();
 }
 
@@ -2075,6 +2083,20 @@ void LLInventoryModel::idleNotifyObservers()
 {
 	// *FIX:  Think I want this conditional or moved elsewhere...
 	handleResponses(true);
+
+    if (mLinksRebuildList.size() > 0)
+    {
+        if (mModifyMask != LLInventoryObserver::NONE || (mChangedItemIDs.size() != 0))
+        {
+            notifyObservers();
+        }
+        for (const LLUUID& link_id : mLinksRebuildList)
+        {
+            addChangedMask(LLInventoryObserver::REBUILD , link_id);
+        }
+        mLinksRebuildList.clear();
+        notifyObservers();
+    }
 	
 	if (mModifyMask == LLInventoryObserver::NONE && (mChangedItemIDs.size() == 0))
 	{
@@ -2394,11 +2416,14 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
 		// The item will show up as a broken link.
 		if (item->getIsBrokenLink())
 		{
-            if (LLInventoryModelBackgroundFetch::getInstance()->folderFetchActive())
+            if (item->getAssetUUID().notNull()
+                && LLInventoryModelBackgroundFetch::getInstance()->folderFetchActive())
             {
-                // isEverythingFetched is actually 'initial' fetch only.
-                // Schedule this link for a recheck once inventory gets loaded
-                mPossiblyBrockenLinks.insert(item->getUUID());
+                // Schedule this link for a recheck as inventory gets loaded
+                // Todo: expand to cover not just an initial fetch
+                mPossiblyBrockenLinks[item->getAssetUUID()].insert(item->getUUID());
+
+                // Do a blank rebuild of links once fetch is done
                 if (!mBulkFecthCallbackSlot.connected())
                 {
                     // Links might take a while to update this way, and there
@@ -2408,6 +2433,9 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
                         LLInventoryModelBackgroundFetch::getInstance()->setFetchCompletionCallback(
                             [this]()
                     {
+                        // rebuild is just in case, primary purpose is to wipe
+                        // the list since we won't be getting anything 'new'
+                        // see mLinksRebuildList
                         rebuildBrockenLinks();
                         mBulkFecthCallbackSlot.disconnect();
                     });
@@ -2424,6 +2452,16 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
                     << " assetID: " << item->getAssetUUID() << " )  parent: " << item->getParentUUID() << LL_ENDL;
             }
 		}
+        if (!mPossiblyBrockenLinks.empty())
+        {
+            // check if we are waiting for this item
+            broken_links_t::iterator iter = mPossiblyBrockenLinks.find(item->getUUID());
+            if (iter != mPossiblyBrockenLinks.end())
+            {
+                mLinksRebuildList.insert(iter->second.begin() , iter->second.end());
+                mPossiblyBrockenLinks.erase(iter);
+            }
+        }
 		if (item->getIsLinkType())
 		{
 			// Add back-link from linked-to UUID.
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index b506eaac62..db159d480a 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -580,7 +580,9 @@ private:
     U32 mModifyMaskBacklog;
     changed_items_t mChangedItemIDsBacklog;
     changed_items_t mAddedItemIDsBacklog;
-    changed_items_t mPossiblyBrockenLinks;
+    typedef std::map<LLUUID , changed_items_t> broken_links_t;
+    broken_links_t mPossiblyBrockenLinks; // there can be multiple links per item
+    changed_items_t mLinksRebuildList;
     boost::signals2::connection mBulkFecthCallbackSlot;
 	
 	
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index f650cc383f..56646830a2 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -586,17 +586,15 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         curent_time = LLTimer::getTotalSeconds();
     }
 
-    if (mRecursiveInventoryFetchStarted && mAllRecursiveFoldersFetched)
+    // Ideally we shouldn't fetch items if recursive fetch isn't done,
+    // but there is a chance some request will start timeouting and recursive
+    // fetch will get stuck on a signle folder, don't block item fetch in such case
+    while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
     {
-        // Don't fetch items if recursive fetch isn't done,
-        // it gets both items and folders and should get the items in question faster
-        while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
-        {
-            const FetchQueueInfo& fetch_info(mFetchItemQueue.front());
-            bulkFetchViaAis(fetch_info);
-            mFetchItemQueue.pop_front();
-            curent_time = LLTimer::getTotalSeconds();
-        }
+        const FetchQueueInfo& fetch_info(mFetchItemQueue.front());
+        bulkFetchViaAis(fetch_info);
+        mFetchItemQueue.pop_front();
+        curent_time = LLTimer::getTotalSeconds();
     }
 
     if (last_fetch_count != mFetchCount // if anything was added
@@ -696,7 +694,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                             item_type = AISAPI::LIBRARY;
                         }
 
-                        AISAPI::FetchCategoryChildren(cat_id , item_type , type == FT_RECURSIVE , cb);
+                        AISAPI::FetchCategoryChildren(cat_id , item_type , type == FT_RECURSIVE , cb, 0);
                     }
                 }
                 else
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index cd51a00c52..01ad4f0f09 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -579,6 +579,7 @@ LLViewerInventoryCategory::LLViewerInventoryCategory(const LLUUID& owner_id) :
 LLViewerInventoryCategory::LLViewerInventoryCategory(const LLViewerInventoryCategory* other)
 {
 	copyViewerCategory(other);
+    mFetching = FETCH_NONE;
 }
 
 LLViewerInventoryCategory::~LLViewerInventoryCategory()
-- 
cgit v1.2.3


From c3d22fba600a6c40268dfbec15ec1fe145cbbb1d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 13 Apr 2023 13:27:30 +0300
Subject: SL-19533 MacOS build fix

---
 indra/newview/llappearancemgr.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index e160b5813f..9115d7e5c2 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -638,6 +638,11 @@ void LLBrokenLinkObserver::postProcess()
 {
     LLViewerInventoryItem* item = gInventory.getItem(mUUID);
     llassert(item && !item->getIsBrokenLink()); // the whole point was to get a correct link
+    if (item && item->getIsBrokenLink())
+    {
+        LL_INFOS_ONCE("Avatar") << "Outfit link broken despite being regenerated" << LL_ENDL;
+        LL_DEBUGS("Avatar", "Inventory") << "Outfit link " << mUUID << " \"" << item->getName() << "\" is broken despite being regenerated" << LL_ENDL;
+    }
 
     LLAppearanceMgr::instance().updateAppearanceFromCOF(
         mEnforceItemRestrictions ,
-- 
cgit v1.2.3


From 107a7eb919bb0afadf6ad3f92482cf7e6d67c56e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 13 Apr 2023 17:49:26 +0300
Subject: SL-19544 WIP add active suffix for gestures and add appropriate
 context menu handling

---
 indra/newview/llinventorygallery.cpp               | 54 +++++++++++++++++++++-
 indra/newview/llinventorygallery.h                 | 17 +++++++
 indra/newview/llinventorygallerymenu.cpp           | 33 +++++++++++++
 .../xui/en/panel_inventory_gallery_item.xml        |  1 +
 4 files changed, 103 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 9766a39e3c..9344668f52 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -92,6 +92,9 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
     mThumbnailsObserver = new LLThumbnailsObserver();
     gInventory.addObserver(mThumbnailsObserver);
 
+    mGestureObserver = new LLGalleryGestureObserver(this);
+    LLGestureMgr::instance().addObserver(mGestureObserver);
+
     mUsername = gAgentUsername;
     LLStringUtil::toUpper(mUsername);
 }
@@ -154,6 +157,9 @@ LLInventoryGallery::~LLInventoryGallery()
         gInventory.removeObserver(mThumbnailsObserver);
     }
     delete mThumbnailsObserver;
+    
+    LLGestureMgr::instance().removeObserver(mGestureObserver);
+    delete mGestureObserver;
 }
 
 void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
@@ -701,7 +707,14 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     {
         inventory_type = inv_item->getInventoryType();
         misc_flags = inv_item->getFlags();
-        is_worn = LLAppearanceMgr::instance().isLinkedInCOF(item_id);
+        if (LLAssetType::AT_GESTURE == obj->getType())
+        {
+            is_worn = LLGestureMgr::instance().isGestureActive(item_id);
+        }
+        else
+        {
+            is_worn = LLAppearanceMgr::instance().isLinkedInCOF(item_id);
+        }
     }
     else if (LLAssetType::AT_CATEGORY == obj->getType())
     {
@@ -943,6 +956,37 @@ void LLInventoryGallery::onCOFChanged()
     }
 }
 
+void LLInventoryGallery::onGesturesChanged()
+{
+    uuid_vec_t vnew;
+    uuid_vec_t vadded;
+    uuid_vec_t vremoved;
+
+    const LLGestureMgr::item_map_t& active_gestures = LLGestureMgr::instance().getActiveGestures();
+    for (LLGestureMgr::item_map_t::const_iterator iter = active_gestures.begin();
+        iter != active_gestures.end();
+        ++iter)
+    {
+        vnew.push_back(iter->first);
+    }
+
+    LLCommonUtils::computeDifference(vnew, mActiveGestures, vadded, vremoved);
+
+    mActiveGestures = vnew;
+    
+    for (uuid_vec_t::const_iterator iter = vadded.begin();
+        iter != vadded.end();
+        ++iter)
+    {
+        updateWornItem(*iter, true);
+    }
+
+    for (uuid_vec_t::const_iterator iter = vremoved.begin(); iter != vremoved.end(); ++iter)
+    {
+        updateWornItem(*iter, false);
+    }
+}
+
 void LLInventoryGallery::deselectItem(const LLUUID& category_id)
 {
     // Reset selection if the item is selected.
@@ -1353,7 +1397,13 @@ BOOL LLInventoryGalleryItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL dro
 void LLInventoryGalleryItem::setWorn(bool value)
 {
     mWorn = value;
-    mSuffixText->setValue(mWorn ? getString("worn_string") : "");
+    std::string suffix("");
+
+    if(mWorn)
+    {
+        suffix = (mType == LLAssetType::AT_GESTURE) ? getString("active_string") : getString("worn_string");
+    }
+    mSuffixText->setValue(suffix);
 
     mNameText->setFont(getTextFont());
     mNameText->setText(mName); // refresh to pick up font changes
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 6bca8a0dc5..f0f4c45e04 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -27,6 +27,7 @@
 #ifndef LL_LLINVENTORYGALLERY_H
 #define LL_LLINVENTORYGALLERY_H
 
+#include "llgesturemgr.h"
 #include "lllistcontextmenu.h"
 #include "llpanel.h"
 #include "llinventoryfilter.h"
@@ -38,6 +39,7 @@ class LLInventoryGalleryItem;
 class LLScrollContainer;
 class LLTextBox;
 class LLThumbnailsObserver;
+class LLGalleryGestureObserver;
 
 class LLInventoryGalleryContextMenu;
 
@@ -110,6 +112,7 @@ public:
 
     void refreshList(const LLUUID& category_id);
     void onCOFChanged();
+    void onGesturesChanged();
     void computeDifference(const LLInventoryModel::cat_array_t vcats, const LLInventoryModel::item_array_t vitems, uuid_vec_t& vadded, uuid_vec_t& vremoved);
 
     void deselectItem(const LLUUID& category_id);
@@ -133,6 +136,7 @@ protected:
 
     LLInventoryCategoriesObserver*     mCategoriesObserver;
     LLThumbnailsObserver*              mThumbnailsObserver;
+    LLGalleryGestureObserver*          mGestureObserver;
     LLUUID                             mSelectedItemID;
     bool                               mIsInitialized;
 
@@ -199,6 +203,7 @@ private:
     typedef std::map<LLUUID, LLInventoryGalleryItem*> gallery_item_map_t;
     gallery_item_map_t mItemMap;
     uuid_vec_t mCOFLinkedItems;
+    uuid_vec_t mActiveGestures;
     std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
 
     LLInventoryFilter::ESearchType mSearchType;
@@ -257,6 +262,7 @@ public:
     void setHidden(bool hidden) {mHidden = hidden;}
 
     void setType(LLAssetType::EType type, LLInventoryType::EType inventory_type, U32 flags, bool is_link);
+    LLAssetType::EType getAssetType() { return mType; }
     void setThumbnail(LLUUID id);
     void setGallery(LLInventoryGallery* gallery) { mGallery = gallery; }
     bool isFolder() { return mIsFolder; }
@@ -314,4 +320,15 @@ protected:
     item_map_t mItemMap;
 };
 
+class LLGalleryGestureObserver : public LLGestureManagerObserver
+{
+public:
+    LLGalleryGestureObserver(LLInventoryGallery* gallery) : mGallery(gallery) {}
+    virtual ~LLGalleryGestureObserver() {}
+    virtual void changed() { mGallery->onGesturesChanged(); }
+
+private:
+    LLInventoryGallery* mGallery;
+};
+
 #endif
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index e91ec78730..84b18c1517 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -314,6 +314,26 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     {
         LLAppearanceMgr::instance().wearItemOnAvatar(selected_id, true, true);
     }
+    else if ("activate" == action)
+    {
+        LLGestureMgr::instance().activateGesture(selected_id);
+
+        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+        if (!item) return;
+
+        gInventory.updateItem(item);
+        gInventory.notifyObservers();
+    }
+    else if ("deactivate" == action)
+    {
+        LLGestureMgr::instance().deactivateGesture(selected_id);
+
+        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+        if (!item) return;
+
+        gInventory.updateItem(item);
+        gInventory.notifyObservers();
+    }
 }
 
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
@@ -590,6 +610,19 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                 disabled_items.push_back(std::string("Open"));
                 disabled_items.push_back(std::string("Open Original"));
             }
+            
+            if(LLAssetType::AT_GESTURE == obj->getType())
+            {
+                items.push_back(std::string("Gesture Separator"));
+                if(!LLGestureMgr::instance().isGestureActive(selected_id))
+                {
+                    items.push_back(std::string("Activate"));
+                }
+                else
+                {
+                    items.push_back(std::string("Deactivate"));
+                }
+            }
         }
         else if(LLAssetType::AT_LANDMARK == obj->getType())
         {
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index b343aafca5..e7589f889f 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -14,6 +14,7 @@
    left="0"
    top="0">
   <string name="worn_string">(worn)</string>
+  <string name="active_string">(active)</string>
   <thumbnail
    name="preview_thumbnail"
    fallback_image="Thumbnail_Fallback"
-- 
cgit v1.2.3


From 94dd7b2c0c020bad25dab9472d612f673f136422 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 13 Apr 2023 19:33:20 +0300
Subject: SL-19544 WIP search by name should include suffix

---
 indra/newview/llinventorygallery.cpp | 12 ++++++++----
 indra/newview/llinventorygallery.h   |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 9344668f52..94996cb941 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -650,7 +650,7 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
             break;
         case LLInventoryFilter::SEARCHTYPE_NAME:
         default:
-            desc = item->getItemName();
+            desc = item->getItemName() + item->getItemNameSuffix();
             break;
     }
     
@@ -1202,6 +1202,7 @@ LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
     mSelected(false),
     mDefaultImage(true),
     mName(""),
+    mSuffix(""),
     mUUID(LLUUID()),
     mIsFolder(true),
     mIsLink(false),
@@ -1397,13 +1398,16 @@ BOOL LLInventoryGalleryItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL dro
 void LLInventoryGalleryItem::setWorn(bool value)
 {
     mWorn = value;
-    std::string suffix("");
 
     if(mWorn)
     {
-        suffix = (mType == LLAssetType::AT_GESTURE) ? getString("active_string") : getString("worn_string");
+        mSuffix = (mType == LLAssetType::AT_GESTURE) ? getString("active_string") : getString("worn_string");
     }
-    mSuffixText->setValue(suffix);
+    else
+    {
+        mSuffix = "";
+    }
+    mSuffixText->setValue(mSuffix);
 
     mNameText->setFont(getTextFont());
     mNameText->setText(mName); // refresh to pick up font changes
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index f0f4c45e04..fd6bd0d502 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -256,6 +256,7 @@ public:
     std::string getCreatorName() { return mCreatorName;}
 
     std::string getItemName() {return mName;}
+    std::string getItemNameSuffix() {return mSuffix;}
     bool isDefaultImage() {return mDefaultImage;}
     
     bool isHidden() {return mHidden;}
@@ -288,6 +289,7 @@ private:
     EInventorySortGroup mSortGroup;
     LLAssetType::EType mType;
     std::string mName;
+    std::string mSuffix;
     LLInventoryGallery* mGallery;
 };
 
-- 
cgit v1.2.3


From 5554686b9117901cddb3d36f237622442c1d7a8d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 17 Apr 2023 13:22:27 +0300
Subject: SL-19544 WIP show item permissions after item name

---
 indra/newview/llinventorybridge.cpp                |  2 +-
 indra/newview/llinventorygallery.cpp               | 50 +++++++++++++++++-----
 indra/newview/llinventorygallery.h                 |  8 ++--
 indra/newview/llpanelmaininventory.cpp             |  4 ++
 .../xui/en/panel_inventory_gallery_item.xml        | 18 +-------
 indra/newview/skins/default/xui/en/strings.xml     |  1 +
 6 files changed, 53 insertions(+), 30 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index dadc7bc057..1c8342cdda 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -918,7 +918,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
 	addDeleteContextMenuOptions(items, disabled_items);
 
-	if (!isPanelActive("All Items") && !isPanelActive("single_folder_inv"))
+	if (!isPanelActive("All Items") && !isPanelActive("single_folder_inv") && !isPanelActive("comb_single_folder_inv"))
 	{
 		items.push_back(std::string("Show in Main Panel"));
 	}
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 94996cb941..f6a1f49306 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1202,7 +1202,8 @@ LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
     mSelected(false),
     mDefaultImage(true),
     mName(""),
-    mSuffix(""),
+    mWornSuffix(""),
+    mPermSuffix(""),
     mUUID(LLUUID()),
     mIsFolder(true),
     mIsLink(false),
@@ -1221,7 +1222,6 @@ LLInventoryGalleryItem::~LLInventoryGalleryItem()
 BOOL LLInventoryGalleryItem::postBuild()
 {
     mNameText = getChild<LLTextBox>("item_name");
-    mSuffixText = getChild<LLTextBox>("suffix_text");
     mTextBgPanel = getChild<LLPanel>("text_bg_panel");
 
     return TRUE;
@@ -1262,6 +1262,32 @@ void LLInventoryGalleryItem::setType(LLAssetType::EType type, LLInventoryType::E
             }
         }
     }
+    else
+    {
+        const LLInventoryItem *item = gInventory.getItem(mUUID);
+        if(item && (LLAssetType::AT_CALLINGCARD != item->getType()) && !mIsLink)
+        {
+            std::string delim(" --");
+            bool copy = item->getPermissions().allowCopyBy(gAgent.getID());
+            if (!copy)
+            {
+                mPermSuffix += delim;
+                mPermSuffix += LLTrans::getString("no_copy_lbl");
+            }
+            bool mod = item->getPermissions().allowModifyBy(gAgent.getID());
+            if (!mod)
+            {
+                mPermSuffix += mPermSuffix.empty() ? delim : ",";
+                mPermSuffix += LLTrans::getString("no_modify_lbl");
+            }
+            bool xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID());
+            if (!xfer)
+            {
+                mPermSuffix += mPermSuffix.empty() ? delim : ",";
+                mPermSuffix += LLTrans::getString("no_transfer_lbl");
+            }
+        }
+    }
 
     getChild<LLIconCtrl>("item_type")->setValue(icon_name);
     getChild<LLIconCtrl>("link_overlay")->setVisible(is_link);
@@ -1294,9 +1320,7 @@ void LLInventoryGalleryItem::draw()
 void LLInventoryGalleryItem::setName(std::string name)
 {
     mName = name;
-    mNameText->setFont(getTextFont());
-    mNameText->setText(name);
-    mNameText->setToolTip(name);
+    updateNameText();
 }
 
 void LLInventoryGalleryItem::setSelected(bool value)
@@ -1401,16 +1425,14 @@ void LLInventoryGalleryItem::setWorn(bool value)
 
     if(mWorn)
     {
-        mSuffix = (mType == LLAssetType::AT_GESTURE) ? getString("active_string") : getString("worn_string");
+        mWornSuffix = (mType == LLAssetType::AT_GESTURE) ? LLTrans::getString("active") : LLTrans::getString("worn");
     }
     else
     {
-        mSuffix = "";
+        mWornSuffix = "";
     }
-    mSuffixText->setValue(mSuffix);
 
-    mNameText->setFont(getTextFont());
-    mNameText->setText(mName); // refresh to pick up font changes
+    updateNameText();
 }
 
 LLFontGL* LLInventoryGalleryItem::getTextFont()
@@ -1422,6 +1444,14 @@ LLFontGL* LLInventoryGalleryItem::getTextFont()
     return mIsLink ? LLFontGL::getFontSansSerifSmallItalic() : LLFontGL::getFontSansSerifSmall();
 }
 
+void LLInventoryGalleryItem::updateNameText()
+{
+    mNameText->setFont(getTextFont());
+    mNameText->setText(mName + mPermSuffix + mWornSuffix);
+    mNameText->setToolTip(mName + mPermSuffix + mWornSuffix);
+    getChild<LLThumbnailCtrl>("preview_thumbnail")->setToolTip(mName + mPermSuffix + mWornSuffix);
+}
+
 //-----------------------------
 // LLThumbnailsObserver
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index fd6bd0d502..fdab616720 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -256,7 +256,7 @@ public:
     std::string getCreatorName() { return mCreatorName;}
 
     std::string getItemName() {return mName;}
-    std::string getItemNameSuffix() {return mSuffix;}
+    std::string getItemNameSuffix() {return mPermSuffix + mWornSuffix;}
     bool isDefaultImage() {return mDefaultImage;}
     
     bool isHidden() {return mHidden;}
@@ -269,11 +269,12 @@ public:
     bool isFolder() { return mIsFolder; }
     bool isLink() { return mIsLink; }
     EInventorySortGroup getSortGroup() { return mSortGroup; }
+
+    void updateNameText();
     
 private:
     LLUUID mUUID;
     LLTextBox* mNameText;
-    LLTextBox* mSuffixText;
     LLPanel* mTextBgPanel;
     bool     mSelected;
     bool     mWorn;
@@ -289,7 +290,8 @@ private:
     EInventorySortGroup mSortGroup;
     LLAssetType::EType mType;
     std::string mName;
-    std::string mSuffix;
+    std::string mWornSuffix;
+    std::string mPermSuffix;
     LLInventoryGallery* mGallery;
 };
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 62b7a38857..f67b09d121 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1640,6 +1640,10 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
             mInventoryGalleryPanel->clearNavigationHistory();
         }
     }
+    else if(isCombinationViewMode())
+    {
+        mCombinationInventoryPanel->changeFolderRoot(folder_id);
+    }
     updateNavButtons();
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index e7589f889f..574872a870 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -13,8 +13,6 @@
    layout="topleft"
    left="0"
    top="0">
-  <string name="worn_string">(worn)</string>
-  <string name="active_string">(active)</string>
   <thumbnail
    name="preview_thumbnail"
    fallback_image="Thumbnail_Fallback"
@@ -62,28 +60,16 @@
       length="1"
       follows="left|top"
       left="1"
-      height="10"
+      height="23"
       layout="topleft"
       name="item_name"
       parse_urls="false"
       text_readonly_color="White"
+      word_wrap="true"
       top="2"
       width="127"
       use_ellipses="true">
       Item name, folder name.
     </text>
-    <text
-      read_only="true"
-      length="1"
-      follows="left|top"
-      left="1"
-      height="10"
-      layout="topleft"
-      name="suffix_text"
-      text_readonly_color="InventoryItemLinkColor"
-      top="13"
-      width="127">
-      (worn)
-    </text>
   </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 48715d5b32..2fbdaf7bd0 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2393,6 +2393,7 @@ If you continue to receive this message, please contact Second Life support for
   <string name="Unconstrained">Unconstrained</string>
 
 	<!-- use value="" because they have preceding spaces -->
+    <string name="active" value=" (active)"/>
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
 	<string name="no_copy"     value=" (no copy)" />
-- 
cgit v1.2.3


From eaccee37f2875c4d2378cf0ce562f382b88487d7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 15 Apr 2023 02:23:38 +0300
Subject: SL-19549 Add option to show ban lines on collision

---
 indra/newview/app_settings/settings.xml            |  4 +--
 indra/newview/llglsandbox.cpp                      |  6 ++++
 indra/newview/llviewermenu.cpp                     | 21 ++++++++++++++
 indra/newview/llviewermessage.cpp                  |  6 ++++
 indra/newview/llviewerparcelmgr.cpp                | 24 ++++++++++++----
 indra/newview/llviewerparcelmgr.h                  |  3 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 32 ++++++++++++++++++----
 7 files changed, 82 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index deeca494c3..5b465864cc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11316,11 +11316,11 @@
     <key>ShowBanLines</key>
     <map>
       <key>Comment</key>
-      <string>Show in-world ban/access borders</string>
+      <string>Show in-world ban/access borders, 0 - do not show, 1 - show on collision, 2 - show on proximity</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
+      <string>S32</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 175f1849cf..25e9ade7df 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -741,6 +741,12 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV
 	gGL.end();
 }
 
+void LLViewerParcelMgr::resetCollisionTimer()
+{
+    mCollisionTimer.reset();
+    mRenderCollision = TRUE;
+}
+
 void draw_line_cube(F32 width, const LLVector3& center)
 {
 	width = 0.5f * width;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a0223a5dbb..111e70bfe9 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9060,6 +9060,25 @@ class LLWorldPostProcess : public view_listener_t
 	}
 };
 
+class LLWorldCheckBanLines : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        S32 callback_data = userdata.asInteger();
+        return gSavedSettings.getS32("ShowBanLines") == callback_data;
+    }
+};
+
+class LLWorldShowBanLines : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        S32 callback_data = userdata.asInteger();
+        gSavedSettings.setS32("ShowBanLines", callback_data);
+        return true;
+    }
+};
+
 void handle_flush_name_caches()
 {
 	if (gCacheName) gCacheName->clear();
@@ -9349,6 +9368,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLWorldEnvPreset(), "World.EnvPreset");
 	view_listener_t::addMenu(new LLWorldEnableEnvPreset(), "World.EnableEnvPreset");
 	view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
+    view_listener_t::addMenu(new LLWorldCheckBanLines() , "World.CheckBanLines");
+    view_listener_t::addMenu(new LLWorldShowBanLines() , "World.ShowBanLines");
 
 	// Tools menu
 	view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c1a9b6be80..a535433b5b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5151,6 +5151,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 				LandBuyAccessBlocked_AdultsOnlyContent
 			 
 			-----------------------------------------------------------------------*/ 
+            LLViewerParcelMgr::getInstance()->resetCollisionTimer();
 			if (handle_special_notification(notificationID, llsdBlock))
 			{
 				return true;
@@ -5319,6 +5320,11 @@ void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
 	{
 		BOOL modal = FALSE;
 		process_alert_core(message, modal);
+
+        if (message.find("Cannot enter parcel") != std::string::npos)
+        {
+            LLViewerParcelMgr::getInstance()->resetCollisionTimer();
+        }
 	}
 }
 
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 97dc916bfe..bb68278555 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -72,7 +72,11 @@
 
 #include "llenvironment.h"
 
-const F32 PARCEL_COLLISION_DRAW_SECS = 1.f;
+const F32 PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION = 10.f;
+const F32 PARCEL_COLLISION_DRAW_SECS_ON_PROXIMITY = 1.f;
+const S32 PARCEL_BAN_LINES_HIDE = 0;
+const S32 PARCEL_BAN_LINES_ON_COLLISION = 1;
+const S32 PARCEL_BAN_LINES_ON_PROXIMITY = 2;
 
 
 // Globals
@@ -892,13 +896,18 @@ void LLViewerParcelMgr::render()
 
 void LLViewerParcelMgr::renderParcelCollision()
 {
+    static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION);
+
 	// check for expiration
-	if (mCollisionTimer.getElapsedTimeF32() > PARCEL_COLLISION_DRAW_SECS)
+    F32 expiration = (ban_lines_mode == PARCEL_BAN_LINES_ON_PROXIMITY)
+        ? PARCEL_COLLISION_DRAW_SECS_ON_PROXIMITY
+        : PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION;
+	if (mCollisionTimer.getElapsedTimeF32() > expiration)
 	{
-		mRenderCollision = FALSE;
+		mRenderCollision = false;
 	}
 
-	if (mRenderCollision && gSavedSettings.getBOOL("ShowBanLines"))
+	if (mRenderCollision && ban_lines_mode != PARCEL_BAN_LINES_HIDE)
 	{
 		LLViewerRegion* regionp = gAgent.getRegion();
 		if (regionp)
@@ -1842,8 +1851,11 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 			 sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
 	{
 		// We're about to collide with this parcel
-		parcel_mgr.mRenderCollision = TRUE;
-		parcel_mgr.mCollisionTimer.reset();
+        static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION);
+        if (ban_lines_mode == PARCEL_BAN_LINES_ON_PROXIMITY)
+        {
+            parcel_mgr.resetCollisionTimer();
+        }
 
 		// Differentiate this parcel if we are banned from it.
 		if (sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 6ce389ab88..d45ff674af 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -204,6 +204,7 @@ public:
 	void	renderOneSegment(F32 x1, F32 y1, F32 x2, F32 y2, F32 height, U8 direction, LLViewerRegion* regionp);
 	void	renderHighlightSegments(const U8* segments, LLViewerRegion* regionp);
 	void	renderCollisionSegments(U8* segments, BOOL use_pass, LLViewerRegion* regionp);
+    void	resetCollisionTimer();
 
 	void	sendParcelGodForceOwner(const LLUUID& owner_id);
 
@@ -361,7 +362,7 @@ private:
 	// If it's coming, draw the parcel's boundaries.
 	LLParcel*					mCollisionParcel;
 	U8*							mCollisionSegments;
-	BOOL						mRenderCollision; 
+	bool						mRenderCollision; 
 	BOOL						mRenderSelection;
 	S32							mCollisionBanned;     
 	LLFrameTimer				mCollisionTimer;
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 58584345a9..64167a9a5d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -794,14 +794,36 @@
            name="LandShow"
            tear_off="true">
           <menu_item_check
-             label="Ban Lines"
-             name="Ban Lines">
+             label="Hide Ban Lines"
+             name="Hide Ban Lines">
             <menu_item_check.on_check
-               control="ShowBanLines" />
+             function="World.CheckBanLines"
+             parameter="0" />
             <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="ShowBanLines" />
+             function="World.ShowBanLines"
+             parameter="0" />
+          </menu_item_check>
+          <menu_item_check
+             label="Show Ban Lines On Collision"
+             name="Show Ban Lines On Collision">
+            <menu_item_check.on_check
+             function="World.CheckBanLines"
+             parameter="1" />
+            <menu_item_check.on_click
+             function="World.ShowBanLines"
+             parameter="1" />
+          </menu_item_check>
+          <menu_item_check
+             label="Show Ban Lines On Proximity"
+             name="Show Ban Lines On Proximity">
+            <menu_item_check.on_check
+             function="World.CheckBanLines"
+             parameter="2" />
+            <menu_item_check.on_click
+             function="World.ShowBanLines"
+             parameter="2" />
           </menu_item_check>
+          <menu_item_separator />
            <menu_item_check
                  label="Beacons"
                  name="beacons"
-- 
cgit v1.2.3


From 1f94ac9b89ddc86160e92a361bda42347b975f67 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 17 Apr 2023 15:31:22 +0300
Subject: SL-19549 Add option to show ban lines on collision #2

---
 indra/newview/llviewermessage.cpp   | 10 ++++++++--
 indra/newview/llviewerparcelmgr.cpp | 10 +++++-----
 indra/newview/llviewerparcelmgr.h   |  6 +++++-
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a535433b5b..a60f11d97b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5151,7 +5151,11 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 				LandBuyAccessBlocked_AdultsOnlyContent
 			 
 			-----------------------------------------------------------------------*/ 
-            LLViewerParcelMgr::getInstance()->resetCollisionTimer();
+            static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , LLViewerParcelMgr::PARCEL_BAN_LINES_ON_COLLISION);
+            if (ban_lines_mode == LLViewerParcelMgr::PARCEL_BAN_LINES_ON_COLLISION)
+            {
+                LLViewerParcelMgr::getInstance()->resetCollisionTimer();
+            }
 			if (handle_special_notification(notificationID, llsdBlock))
 			{
 				return true;
@@ -5321,7 +5325,9 @@ void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
 		BOOL modal = FALSE;
 		process_alert_core(message, modal);
 
-        if (message.find("Cannot enter parcel") != std::string::npos)
+        static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , LLViewerParcelMgr::PARCEL_BAN_LINES_ON_COLLISION);
+        if (ban_lines_mode == LLViewerParcelMgr::PARCEL_BAN_LINES_ON_COLLISION
+            && message.find("Cannot enter parcel") != std::string::npos)
         {
             LLViewerParcelMgr::getInstance()->resetCollisionTimer();
         }
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index bb68278555..15accd0547 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -74,14 +74,14 @@
 
 const F32 PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION = 10.f;
 const F32 PARCEL_COLLISION_DRAW_SECS_ON_PROXIMITY = 1.f;
-const S32 PARCEL_BAN_LINES_HIDE = 0;
-const S32 PARCEL_BAN_LINES_ON_COLLISION = 1;
-const S32 PARCEL_BAN_LINES_ON_PROXIMITY = 2;
 
 
 // Globals
 
 U8* LLViewerParcelMgr::sPackedOverlay = NULL;
+S32 LLViewerParcelMgr::PARCEL_BAN_LINES_HIDE = 0;
+S32 LLViewerParcelMgr::PARCEL_BAN_LINES_ON_COLLISION = 1;
+S32 LLViewerParcelMgr::PARCEL_BAN_LINES_ON_PROXIMITY = 2;
 
 LLUUID gCurrentMovieID = LLUUID::null;
 
@@ -896,7 +896,7 @@ void LLViewerParcelMgr::render()
 
 void LLViewerParcelMgr::renderParcelCollision()
 {
-    static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION);
+    static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_ON_COLLISION);
 
 	// check for expiration
     F32 expiration = (ban_lines_mode == PARCEL_BAN_LINES_ON_PROXIMITY)
@@ -1851,7 +1851,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 			 sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
 	{
 		// We're about to collide with this parcel
-        static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION);
+        static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_ON_COLLISION);
         if (ban_lines_mode == PARCEL_BAN_LINES_ON_PROXIMITY)
         {
             parcel_mgr.resetCollisionTimer();
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index d45ff674af..56dacd3efd 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -204,7 +204,11 @@ public:
 	void	renderOneSegment(F32 x1, F32 y1, F32 x2, F32 y2, F32 height, U8 direction, LLViewerRegion* regionp);
 	void	renderHighlightSegments(const U8* segments, LLViewerRegion* regionp);
 	void	renderCollisionSegments(U8* segments, BOOL use_pass, LLViewerRegion* regionp);
-    void	resetCollisionTimer();
+
+    static S32 PARCEL_BAN_LINES_HIDE;
+    static S32 PARCEL_BAN_LINES_ON_COLLISION;
+    static S32 PARCEL_BAN_LINES_ON_PROXIMITY;
+    void	resetCollisionTimer(); // Ban lines visibility timer
 
 	void	sendParcelGodForceOwner(const LLUUID& owner_id);
 
-- 
cgit v1.2.3


From 1742976f4efeed1a7f07cb503ffab782dbf5d97c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 18 Apr 2023 20:54:24 +0300
Subject: SL-19612 Maximum Altitude decimal places discrepancy

One digit displayed vs 0.01 increment
---
 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 5647fd27db..fa2d4dfe73 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -319,7 +319,7 @@
                         Maximum Altitude:
                     </text>
                     <slider
-                            decimal_digits="1"
+                            decimal_digits="2"
                             follows="left|top"
                             height="16"
                             increment="0.01"
-- 
cgit v1.2.3


From ce2aaab15912693d51383274dc1dfebb20c0b6a2 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 18 Apr 2023 21:27:25 +0300
Subject: SL-19604 FIXED Creating new folders and items in gallery or
 combination views does not highlight created item

---
 indra/newview/llinventorygallery.cpp   | 64 ++++++++++++++++++++++++++++------
 indra/newview/llinventorygallery.h     |  4 ++-
 indra/newview/llinventorypanel.cpp     |  2 +-
 indra/newview/llpanelmaininventory.cpp | 13 ++++---
 indra/newview/llviewerinventory.cpp    |  6 +++-
 indra/newview/llviewerinventory.h      |  2 +-
 6 files changed, 73 insertions(+), 18 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index f6a1f49306..b4a23f7c55 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -728,7 +728,7 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
     LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
-    item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id));
+    item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id, false));
     if (mGalleryCreated)
     {
         applyFilter(item, mFilterSubString);
@@ -816,21 +816,60 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
     }
 }
 
-void LLInventoryGallery::changeItemSelection(const LLUUID& item_id)
+void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_to_selection)
 {
-    if ((mItemMap.count(item_id) == 0) || (mSelectedItemID == item_id))
+    if ((mItemMap.count(item_id) == 0))
+    {
+        mItemToSelect = item_id;
         return;
-
-    if (mItemMap[mSelectedItemID])
+    }
+    if (mSelectedItemID != item_id)
     {
-        mItemMap[mSelectedItemID]->setSelected(FALSE);
+        
+        if (mItemMap[mSelectedItemID])
+        {
+            mItemMap[mSelectedItemID]->setSelected(FALSE);
+        }
+        if (mItemMap[item_id])
+        {
+            mItemMap[item_id]->setSelected(TRUE);
+        }
+        mSelectedItemID = item_id;
+        signalSelectionItemID(item_id);
+
+        mItemToSelect = LLUUID::null;
+        if(scroll_to_selection)
+        {
+            scrollToShowItem(mSelectedItemID);
+        }
     }
-    if (mItemMap[item_id])
+}
+
+void LLInventoryGallery::scrollToShowItem(const LLUUID& item_id)
+{
+    LLInventoryGalleryItem* item = mItemMap[item_id];
+    if(item)
     {
-        mItemMap[item_id]->setSelected(TRUE);
+        const LLRect visible_content_rect = mScrollPanel->getVisibleContentRect();
+
+        LLRect item_rect;
+        item->localRectToOtherView(item->getLocalRect(), &item_rect, this);
+        LLRect overlap_rect(item_rect);
+        overlap_rect.intersectWith(visible_content_rect);
+
+        //Scroll when the selected item is outside the visible area
+        if (overlap_rect.getHeight() + 5 < item->getRect().getHeight())
+        {
+            LLRect content_rect = mScrollPanel->getContentWindowRect();
+            LLRect constraint_rect;
+            constraint_rect.setOriginAndSize(0, 0, content_rect.getWidth(), content_rect.getHeight());
+
+            LLRect item_doc_rect;
+            item->localRectToOtherView(item->getLocalRect(), &item_doc_rect, this);
+
+            mScrollPanel->scrollToShowRect( item_doc_rect, constraint_rect );
+        }
     }
-    mSelectedItemID = item_id;
-    signalSelectionItemID(item_id);
 }
 
 void LLInventoryGallery::updateMessageVisibility()
@@ -886,6 +925,11 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id)
 
         updateChangedItemName(*items_iter, obj->getName());
     }
+
+    if(mItemToSelect.notNull())
+    {
+        changeItemSelection(mItemToSelect, true);
+    }
     updateMessageVisibility();
 }
 
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index fdab616720..07613b20aa 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -116,7 +116,8 @@ public:
     void computeDifference(const LLInventoryModel::cat_array_t vcats, const LLInventoryModel::item_array_t vitems, uuid_vec_t& vadded, uuid_vec_t& vremoved);
 
     void deselectItem(const LLUUID& category_id);
-    void changeItemSelection(const LLUUID& item_id);
+    void changeItemSelection(const LLUUID& item_id, bool scroll_to_selection = false);
+    void scrollToShowItem(const LLUUID& item_id);
     void signalSelectionItemID(const LLUUID& category_id);
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
     LLUUID getSelectedItemID() { return mSelectedItemID; }
@@ -138,6 +139,7 @@ protected:
     LLThumbnailsObserver*              mThumbnailsObserver;
     LLGalleryGestureObserver*          mGestureObserver;
     LLUUID                             mSelectedItemID;
+    LLUUID                             mItemToSelect;
     bool                               mIsInitialized;
 
     selection_change_signal_t        mSelectionChangeSignal;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 2193743a38..4b525b09d1 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1801,7 +1801,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
     {
         LLSidepanelInventory *inventory_panel = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
         LLPanelMainInventory* main_panel = inventory_panel->getMainInventoryPanel();
-        if(main_panel->isSingleFolderMode() && (main_panel->isGalleryViewMode() || main_panel->isCombinationViewMode()))
+        if(main_panel->isSingleFolderMode() && main_panel->isGalleryViewMode())
         {
             main_panel->setGallerySelection(obj_id);
             return;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index f67b09d121..9d1e861344 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -497,7 +497,7 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
 	reset_inventory_filter();
     if(mSingleFolderMode)
     {
-        if(isListViewMode())
+        if(isListViewMode() || isCombinationViewMode())
         {
             LLFolderViewItem* current_folder = getActivePanel()->getRootFolder();
             if (current_folder)
@@ -508,7 +508,12 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
         }
         else
         {
-            menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata);
+            std::function<void(const LLUUID&)> callback_cat_created = [this](const LLUUID &new_category_id)
+            {
+                gInventory.notifyObservers();
+                setGallerySelection(new_category_id);
+            };
+            menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
         }
     }
     else
@@ -2350,13 +2355,13 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id)
 {
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        mInventoryGalleryPanel->changeItemSelection(item_id);
+        mInventoryGalleryPanel->changeItemSelection(item_id, true);
     }
     else if(mSingleFolderMode && isCombinationViewMode())
     {
         if(mCombinationGalleryPanel->getFilter().checkAgainstFilterThumbnails(item_id))
         {
-            mCombinationGalleryPanel->changeItemSelection(item_id);
+            mCombinationGalleryPanel->changeItemSelection(item_id, true);
         }
         else
         {
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 01ad4f0f09..8b0d14b3e9 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1727,7 +1727,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge,
     menu_create_inventory_item(panel, bridge ? bridge->getUUID() : LLUUID::null, userdata, default_parent_uuid);
 }
 
-void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid)
+void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid, std::function<void(const LLUUID&)> folder_created_cb)
 {
     std::string type_name = userdata.asString();
     
@@ -1763,6 +1763,10 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
                 }
             };
         }
+        else if(folder_created_cb != NULL)
+        {
+            callback_cat_created = folder_created_cb;
+        }
         gInventory.createNewCategory(
             parent_id,
             preferred_type,
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 95a4c84999..d788f23d0c 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -456,7 +456,7 @@ void menu_create_inventory_item(LLInventoryPanel* root,
 								const LLSD& userdata,
 								const LLUUID& default_parent_uuid = LLUUID::null);
 
-void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid = LLUUID::null);
+void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid = LLUUID::null, std::function<void(const LLUUID&)> folder_created_cb = NULL);
 
 void slam_inventory_folder(const LLUUID& folder_id,
 						   const LLSD& contents,
-- 
cgit v1.2.3


From 97b0f637dfbd4ab2b3fe79442e9f847cf7a6efca Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 19 Apr 2023 00:20:09 +0300
Subject: SL-19533 Check descendants even for a recursive fetch

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 48 ++++++++++++-----------
 1 file changed, 25 insertions(+), 23 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 56646830a2..bfb5ad9d12 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -486,6 +486,7 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
         return;
     }
 
+    bool request_descendants = false;
     if (response_id.isNull()) // Failure
     {
         LL_DEBUGS(LOG_INV , "AIS3") << "Failure response for folder " << request_id << LL_ENDL;
@@ -501,36 +502,37 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
         else if (recursion == FT_CONTENT_RECURSIVE)
         {
             LL_WARNS() << "Failed to download folder: " << request_id << " Requesting known content separately" << LL_ENDL;
-            LLInventoryModel::cat_array_t  *categories(NULL);
-            LLInventoryModel::item_array_t *items(NULL);
-            gInventory.getDirectDescendentsOf(request_id, categories, items);
-            if (categories)
-            {
-                for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin(); it != categories->end(); ++it)
-                {
-                    mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
-                }
-                if (!mFetchFolderQueue.empty())
-                {
-                    mBackgroundFetchActive = true;
-                    mFolderFetchActive     = true;
-                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
-                }
-            }
+            request_descendants = true;
         }
     }
     else
     {
-        LL_DEBUGS(LOG_INV , "AIS3") << "Got folder " << request_id << LL_ENDL;
-        if (recursion == FT_CONTENT_RECURSIVE)
+        if (recursion == FT_CONTENT_RECURSIVE || recursion == FT_RECURSIVE)
         {
             // Got the folder, now recursively request content
-            LLInventoryModel::cat_array_t * categories(NULL);
-            LLInventoryModel::item_array_t * items(NULL);
-            gInventory.getDirectDescendentsOf(request_id, categories, items);
+            // Request content even for FT_RECURSIVE in case of changes, failures
+            // or if depth limit gets imlemented.
+            // This shouldn't redownload folders if they already have version
+            request_descendants = true;
+            LL_DEBUGS(LOG_INV, "AIS3") << "Got folder " << request_id << ". Requesting content" << LL_ENDL;
+        }
+        else
+        {
+            LL_DEBUGS(LOG_INV, "AIS3") << "Got folder " << request_id << "." << LL_ENDL;
+        }
+
+    }
+
+    if (request_descendants)
+    {
+        LLInventoryModel::cat_array_t* categories(NULL);
+        LLInventoryModel::item_array_t* items(NULL);
+        gInventory.getDirectDescendentsOf(request_id, categories, items);
+        if (categories)
+        {
             for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
-                it != categories->end();
-                ++it)
+                 it != categories->end();
+                 ++it)
             {
                 mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
             }
-- 
cgit v1.2.3


From 1e4ebffa0c801b41990ab38c85ef95eb6f948cd5 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 19 Apr 2023 17:09:39 +0300
Subject: SL-19604 show layout panel before creating new item in combination
 mode, if there are no items in inventory panel

---
 indra/newview/llpanelmaininventory.cpp | 17 ++++++++++++++---
 indra/newview/llpanelmaininventory.h   |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 9d1e861344..d8845a7d94 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -118,6 +118,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	  mNeedUploadCost(true),
       mMenuViewDefault(NULL),
       mSingleFolderMode(false),
+      mForceShowInvLayout(false),
       mViewMode(MODE_LIST),
       mListViewRootUpdatedConnection(),
       mGalleryRootUpdatedConnection()
@@ -502,6 +503,13 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
             LLFolderViewItem* current_folder = getActivePanel()->getRootFolder();
             if (current_folder)
             {
+                if(isCombinationViewMode())
+                {
+                    //show layout and inventory panel before adding the item
+                    //to avoid wrong position of the 'renamer'
+                    mForceShowInvLayout = true;
+                }
+
                 LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
                 menu_create_inventory_item(getPanel(), bridge, userdata);
             }
@@ -2198,7 +2206,7 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
     {
         mCombinationGalleryPanel->setRootFolder(mCombinationInventoryPanel->getSingleFolderRoot());
     }
-
+    mForceShowInvLayout = false;
     updateTitle();
 }
 
@@ -2207,11 +2215,14 @@ void LLPanelMainInventory::updateCombinationVisibility()
     if(mSingleFolderMode && isCombinationViewMode())
     {
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
-        bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty;
+        bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
         getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
         getChild<LLLayoutPanel>("comb_inventory_layout")->setVisible(show_inv_pane);
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
-
+        if(mCombinationInventoryPanel->hasVisibleItems())
+        {
+            mForceShowInvLayout = false;
+        }
         if(is_gallery_empty)
         {
             mCombinationGalleryPanel->handleModifiedFilter();
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 8bc8f4e2e6..e5b9ba929d 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -231,6 +231,8 @@ private:
 	LLHandle<LLView>			mMenuAddHandle;
 
 	bool						mNeedUploadCost;
+
+    bool                        mForceShowInvLayout;
 	// List Commands                                                              //
 	////////////////////////////////////////////////////////////////////////////////
 };
-- 
cgit v1.2.3


From daca555592f8029df6a3d66d80a6a29fd268143f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 18 Apr 2023 23:33:19 +0300
Subject: SL-19609 Urls aren't dispatched according to the indicated grid

---
 indra/newview/llagentlistener.cpp             |  3 +-
 indra/newview/llappearancemgr.cpp             | 11 +++--
 indra/newview/llbuycurrencyhtml.cpp           |  2 +-
 indra/newview/llchathistory.cpp               |  2 +-
 indra/newview/llchatitemscontainerctrl.cpp    |  2 +-
 indra/newview/llcommanddispatcherlistener.cpp |  2 +-
 indra/newview/llcommandhandler.cpp            |  7 ++-
 indra/newview/llcommandhandler.h              |  4 +-
 indra/newview/lleventnotifier.cpp             |  6 ++-
 indra/newview/llfloaterexperienceprofile.cpp  |  6 ++-
 indra/newview/llfloaterhandler.cpp            |  2 +-
 indra/newview/llfloaterhandler.h              |  2 +-
 indra/newview/llfloaterimnearbychat.cpp       |  6 ++-
 indra/newview/llfloatersearch.cpp             |  2 +-
 indra/newview/llfloaterworldmap.cpp           | 11 +++--
 indra/newview/llgroupactions.cpp              |  6 ++-
 indra/newview/llloginhandler.cpp              |  1 +
 indra/newview/llloginhandler.h                |  2 +-
 indra/newview/llpaneleditwearable.cpp         |  2 +-
 indra/newview/llpanellogin.cpp                |  2 +-
 indra/newview/llpanelplaces.cpp               |  6 ++-
 indra/newview/llpanelprofile.cpp              | 12 +++--
 indra/newview/llpanelprofileclassifieds.cpp   |  2 +-
 indra/newview/llpanelprofilepicks.cpp         |  6 ++-
 indra/newview/llshareavatarhandler.cpp        |  2 +-
 indra/newview/llstatusbar.cpp                 |  2 +-
 indra/newview/llurldispatcher.cpp             | 69 +++++++++++++++++----------
 indra/newview/llviewerfloaterreg.cpp          |  1 +
 indra/newview/llviewerhelp.cpp                |  2 +-
 indra/newview/llviewerinventory.cpp           |  6 ++-
 indra/newview/llviewerregion.cpp              |  8 +++-
 indra/newview/llvoicecallhandler.cpp          |  2 +-
 indra/newview/llvoiceclient.cpp               |  2 +-
 indra/newview/llworldmapview.cpp              |  3 +-
 34 files changed, 131 insertions(+), 73 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
index 7887184a11..5a720af038 100644
--- a/indra/newview/llagentlistener.cpp
+++ b/indra/newview/llagentlistener.cpp
@@ -35,6 +35,7 @@
 #include "llcommandhandler.h"
 #include "llslurl.h"
 #include "llurldispatcher.h"
+#include "llviewernetwork.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"
@@ -148,7 +149,7 @@ void LLAgentListener::requestTeleport(LLSD const & event_data) const
         params.append(event_data["x"]);
         params.append(event_data["y"]);
         params.append(event_data["z"]);
-        LLCommandDispatcher::dispatch("teleport", params, LLSD(), NULL, "clicked", true);
+        LLCommandDispatcher::dispatch("teleport", params, LLSD(), LLGridManager::getInstance()->getGrid(), NULL, "clicked", true);
         // *TODO - lookup other LLCommandHandlers for "agent", "classified", "event", "group", "floater", "parcel", "login", login_refresh", "balance", "chat"
         // should we just compose LLCommandHandler and LLDispatchListener?
     }
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 07d6efd2fa..d0fad07f1c 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -147,7 +147,10 @@ public:
 	// requests will be throttled from a non-trusted browser
 	LLAppearanceHandler() : LLCommandHandler("appearance", UNTRUSTED_THROTTLE) {}
 
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		// support secondlife:///app/appearance/show, but for now we just
 		// make all secondlife:///app/appearance SLapps behave this way
@@ -4472,8 +4475,10 @@ public:
 	// not allowed from outside the app
 	LLWearFolderHandler() : LLCommandHandler("wear_folder", UNTRUSTED_BLOCK) { }
 
-	bool handle(const LLSD& tokens, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& tokens,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		LLSD::UUID folder_uuid;
 
diff --git a/indra/newview/llbuycurrencyhtml.cpp b/indra/newview/llbuycurrencyhtml.cpp
index 7ad06f8eaa..37de89a48b 100644
--- a/indra/newview/llbuycurrencyhtml.cpp
+++ b/indra/newview/llbuycurrencyhtml.cpp
@@ -43,7 +43,7 @@ public:
 	// requests will be throttled from a non-trusted browser
 	LLBuyCurrencyHTMLHandler() : LLCommandHandler( "buycurrencyhtml", UNTRUSTED_THROTTLE) {}
 
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		std::string action( "" );
 		if ( params.size() >= 1 )
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 9a608fba8e..43dc10ef5f 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -82,7 +82,7 @@ public:
 	// requests will be throttled from a non-trusted browser
 	LLObjectIMHandler() : LLCommandHandler("objectim", UNTRUSTED_THROTTLE) {}
 
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		if (params.size() < 1)
 		{
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 1c22e055bb..dc2cc57f0f 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -57,7 +57,7 @@ class LLObjectHandler : public LLCommandHandler
 public:
 	LLObjectHandler() : LLCommandHandler("object", UNTRUSTED_BLOCK) { }
 
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		if (params.size() < 2) return false;
 
diff --git a/indra/newview/llcommanddispatcherlistener.cpp b/indra/newview/llcommanddispatcherlistener.cpp
index 586f45fd8f..1b85c09071 100644
--- a/indra/newview/llcommanddispatcherlistener.cpp
+++ b/indra/newview/llcommanddispatcherlistener.cpp
@@ -64,7 +64,7 @@ void LLCommandDispatcherListener::dispatch(const LLSD& params) const
         // But for testing, allow a caller to specify untrusted.
         trusted_browser = params["trusted"].asBoolean();
     }
-    LLCommandDispatcher::dispatch(params["cmd"], params["params"], params["query"], NULL,
+    LLCommandDispatcher::dispatch(params["cmd"], params["params"], params["query"], "", NULL,
                                   "clicked", trusted_browser);
 }
 
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp
index 74f37961c7..e774a9390a 100644
--- a/indra/newview/llcommandhandler.cpp
+++ b/indra/newview/llcommandhandler.cpp
@@ -60,6 +60,7 @@ public:
 	bool dispatch(const std::string& cmd,
 				  const LLSD& params,
 				  const LLSD& query_map,
+                  const std::string& grid,
 				  LLMediaCtrl* web,
 				  const std::string& nav_type,
 				  bool trusted_browser);
@@ -96,6 +97,7 @@ void LLCommandHandlerRegistry::add(const char* cmd,
 bool LLCommandHandlerRegistry::dispatch(const std::string& cmd,
 										const LLSD& params,
 										const LLSD& query_map,
+										const std::string& grid,
 										LLMediaCtrl* web,
 										const std::string& nav_type,
 										bool trusted_browser)
@@ -163,7 +165,7 @@ bool LLCommandHandlerRegistry::dispatch(const std::string& cmd,
 		}
 	}
 	if (!info.mHandler) return false;
-	return info.mHandler->handle(params, query_map, web);
+	return info.mHandler->handle(params, query_map, grid, web);
 }
 
 void LLCommandHandlerRegistry::notifySlurlBlocked()
@@ -218,12 +220,13 @@ LLCommandHandler::~LLCommandHandler()
 bool LLCommandDispatcher::dispatch(const std::string& cmd,
 								   const LLSD& params,
 								   const LLSD& query_map,
+								   const std::string& grid,
 								   LLMediaCtrl* web,
 								   const std::string& nav_type,
 								   bool trusted_browser)
 {
 	return LLCommandHandlerRegistry::instance().dispatch(
-		cmd, params, query_map, web, nav_type, trusted_browser);
+		cmd, params, query_map, grid, web, nav_type, trusted_browser);
 }
 
 static std::string lookup(LLCommandHandler::EUntrustedAccess value);
diff --git a/indra/newview/llcommandhandler.h b/indra/newview/llcommandhandler.h
index 763e3ee51f..c7a7a18c7d 100644
--- a/indra/newview/llcommandhandler.h
+++ b/indra/newview/llcommandhandler.h
@@ -42,7 +42,7 @@ public:
 	LLFooHandler() : LLCommandHandler("foo", UNTRUSTED_BLOCK) { }
 
     // Your code here
-	bool handle(const LLSD& tokens, const LLSD& query_map,
+	bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid,
 				LLMediaCtrl* web)
 	{
 		if (tokens.size() < 1) return false;
@@ -88,6 +88,7 @@ public:
 
 	virtual bool handle(const LLSD& params,
 						const LLSD& query_map,
+						const std::string& grid,
 						LLMediaCtrl* web) = 0;
 		// For URL secondlife:///app/foo/bar/baz?cat=1&dog=2
 		// @params - array of "bar", "baz", possibly empty
@@ -104,6 +105,7 @@ public:
 	static bool dispatch(const std::string& cmd,
 						 const LLSD& params,
 						 const LLSD& query_map,
+						 const std::string& grid,
 						 LLMediaCtrl* web,
 						 const std::string& nav_type,
 						 bool trusted_browser);
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
index f1a44a68c9..788b61b381 100644
--- a/indra/newview/lleventnotifier.cpp
+++ b/indra/newview/lleventnotifier.cpp
@@ -43,8 +43,10 @@ class LLEventHandler : public LLCommandHandler
 public:
 	// requires trusted browser to trigger
 	LLEventHandler() : LLCommandHandler("event", UNTRUSTED_THROTTLE) { }
-	bool handle(const LLSD& params, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		if (params.size() < 2)
 		{
diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index a99a096ea7..f6afdd29fb 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -92,8 +92,10 @@ class LLExperienceHandler : public LLCommandHandler
 public:
     LLExperienceHandler() : LLCommandHandler("experience", UNTRUSTED_THROTTLE) { }
 
-    bool handle(const LLSD& params, const LLSD& query_map,
-        LLMediaCtrl* web)
+    bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
     {
         if(params.size() != 2 || params[1].asString() != "profile")
             return false;
diff --git a/indra/newview/llfloaterhandler.cpp b/indra/newview/llfloaterhandler.cpp
index 8ebb14149c..b66049de7f 100644
--- a/indra/newview/llfloaterhandler.cpp
+++ b/indra/newview/llfloaterhandler.cpp
@@ -49,7 +49,7 @@ LLFloater* get_parent_floater(LLView* view)
 }
 
 
-bool LLFloaterHandler::handle(const LLSD &params, const LLSD &query_map, LLMediaCtrl *web)
+bool LLFloaterHandler::handle(const LLSD &params, const LLSD &query_map, const std::string& grid, LLMediaCtrl *web)
 {
 	if (params.size() < 1) return false;
 	LLFloater* floater = NULL;
diff --git a/indra/newview/llfloaterhandler.h b/indra/newview/llfloaterhandler.h
index 5915642d66..959c972275 100644
--- a/indra/newview/llfloaterhandler.h
+++ b/indra/newview/llfloaterhandler.h
@@ -33,7 +33,7 @@ class LLFloaterHandler
 {
 public:
 	LLFloaterHandler() : LLCommandHandler("floater", UNTRUSTED_BLOCK) { }
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web);
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web);
 };
 
 #endif
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index f1807f1c5b..f63268660c 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -901,8 +901,10 @@ public:
 	LLChatCommandHandler() : LLCommandHandler("chat", UNTRUSTED_BLOCK) { }
 
     // Your code here
-	bool handle(const LLSD& tokens, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& tokens,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		bool retval = false;
 		// Need at least 2 tokens to have a valid message.
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 7e6af45515..37ae80fa8f 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -46,7 +46,7 @@ class LLSearchHandler : public LLCommandHandler
 public:
 	// requires trusted browser to trigger
 	LLSearchHandler() : LLCommandHandler("search", UNTRUSTED_CLICK_ONLY) { }
-	bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableSearch"))
 		{
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 704abd269f..8f3ec8af05 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -124,8 +124,10 @@ public:
 	// requires trusted browser to trigger
 	LLWorldMapHandler() : LLCommandHandler("worldmap", UNTRUSTED_CLICK_ONLY ) { }
 	
-	bool handle(const LLSD& params, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap"))
 		{
@@ -163,7 +165,10 @@ public:
 	{ 
 	}
 	
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap"))
 		{
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index be52e280e1..85b8ff0570 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -78,8 +78,10 @@ public:
         return true;
     }
 
-	bool handle(const LLSD& tokens, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& tokens,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		if (LLStartUp::getStartupState() < STATE_STARTED)
 		{
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
index 22cedf450e..92e341ce93 100644
--- a/indra/newview/llloginhandler.cpp
+++ b/indra/newview/llloginhandler.cpp
@@ -87,6 +87,7 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 
 bool LLLoginHandler::handle(const LLSD& tokens,
 							const LLSD& query_map,
+							const std::string& grid,
 							LLMediaCtrl* web)
 {
 	// do nothing if we are already logged in
diff --git a/indra/newview/llloginhandler.h b/indra/newview/llloginhandler.h
index 1f2eacd094..2579341dbf 100644
--- a/indra/newview/llloginhandler.h
+++ b/indra/newview/llloginhandler.h
@@ -35,7 +35,7 @@ class LLLoginHandler : public LLCommandHandler
  public:
 	// allow from external browsers
 	LLLoginHandler() : LLCommandHandler("login", UNTRUSTED_ALLOW) { }
-	/*virtual*/ bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web);
+	/*virtual*/ bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web);
 
 	// Fill in our internal fields from a SLURL like
 	// secondlife:///app/login?first=Bob&last=Dobbs
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 0103bf628a..1b4684d073 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -1665,7 +1665,7 @@ class LLMetricSystemHandler : public LLCommandHandler
 public:
         LLMetricSystemHandler() : LLCommandHandler("metricsystem", UNTRUSTED_CLICK_ONLY) { }
 
-        bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+        bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
         {
                 // change height units TRUE for meters and FALSE for feet
                 BOOL new_value = (gSavedSettings.getBOOL("HeightUnits") == FALSE) ? TRUE : FALSE;
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index b14fdbf38e..8f1e57e44c 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -97,7 +97,7 @@ class LLLoginLocationAutoHandler : public LLCommandHandler
 public:
 	// don't allow from external browsers
 	LLLoginLocationAutoHandler() : LLCommandHandler("location_login", UNTRUSTED_BLOCK) { }
-	bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{	
 		if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)
 		{
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 0f00231643..1d5ed93c4d 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -91,8 +91,10 @@ class LLParcelHandler : public LLCommandHandler
 public:
 	// requires trusted browser to trigger
 	LLParcelHandler() : LLCommandHandler("parcel", UNTRUSTED_THROTTLE) { }
-	bool handle(const LLSD& params, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{		
 		if (params.size() < 2)
 		{
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 708ff26ced..79b7ed8216 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -460,8 +460,10 @@ public:
 	// requires trusted browser to trigger
 	LLProfileHandler() : LLCommandHandler("profile", UNTRUSTED_THROTTLE) { }
 
-	bool handle(const LLSD& params, const LLSD& query_map,
-		LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		if (params.size() < 1) return false;
 		std::string agent_name = params[0];
@@ -508,8 +510,10 @@ public:
         return false;
     }
 
-	bool handle(const LLSD& params, const LLSD& query_map,
-		LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		if (params.size() < 2) return false;
 		LLUUID avatar_id;
diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index 1ff12b4f37..dec6cfd83b 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -106,7 +106,7 @@ public:
         return true;
     }
     
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
     {
         if (LLStartUp::getStartupState() < STATE_STARTED)
         {
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index 45d0252e4f..274d42f7eb 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -87,8 +87,10 @@ public:
         return true;
     }
 
-    bool handle(const LLSD& params, const LLSD& query_map,
-        LLMediaCtrl* web)
+    bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
     {
         if (LLStartUp::getStartupState() < STATE_STARTED)
         {
diff --git a/indra/newview/llshareavatarhandler.cpp b/indra/newview/llshareavatarhandler.cpp
index 142e00c3f7..8c5ebb75ef 100644
--- a/indra/newview/llshareavatarhandler.cpp
+++ b/indra/newview/llshareavatarhandler.cpp
@@ -38,7 +38,7 @@ public:
 	{ 
 	}
 	
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableAvatarShare"))
 		{
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 0a87b14e17..1ef5d1c50b 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -729,7 +729,7 @@ class LLBalanceHandler : public LLCommandHandler
 public:
 	// Requires "trusted" browser/URL source
 	LLBalanceHandler() : LLCommandHandler("balance", UNTRUSTED_BLOCK) { }
-	bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		if (tokens.size() == 1
 			&& tokens[0].asString() == "request")
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 7c92e7ef98..6fc870f890 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -97,6 +97,8 @@ private:
 		// Called by LLWorldMap when a region name has been resolved to a
 		// location in-world, used by places-panel display.
 
+    static bool handleGrid(const LLSLURL& slurl);
+
 	friend class LLTeleportHandler;
 };
 
@@ -155,7 +157,7 @@ bool LLURLDispatcherImpl::dispatchApp(const LLSLURL& slurl,
 	LL_INFOS() << "cmd: " << slurl.getAppCmd() << " path: " << slurl.getAppPath() << " query: " << slurl.getAppQuery() << LL_ENDL;
 	const LLSD& query_map = LLURI::queryMap(slurl.getAppQuery());
 	bool handled = LLCommandDispatcher::dispatch(
-			slurl.getAppCmd(), slurl.getAppPath(), query_map, web, nav_type, trusted_browser);
+			slurl.getAppCmd(), slurl.getAppPath(), query_map, slurl.getGrid(), web, nav_type, trusted_browser);
 
 	// alert if we didn't handle this secondlife:///app/ SLURL
 	// (but still return true because it is a valid app SLURL)
@@ -184,6 +186,11 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, const std::string
 		return true;
 	}
 
+    if (!handleGrid(slurl))
+    {
+        return true;
+    }
+
 	// Request a region handle by name
 	LLWorldMapMessage::getInstance()->sendNamedRegionRequest(slurl.getRegion(),
 									  LLURLDispatcherImpl::regionNameCallback,
@@ -202,31 +209,39 @@ void LLURLDispatcherImpl::regionNameCallback(U64 region_handle, const LLSLURL& s
     }
 }
 
+bool LLURLDispatcherImpl::handleGrid(const LLSLURL& slurl)
+{
+    if (LLGridManager::getInstance()->getGrid(slurl.getGrid())
+        != LLGridManager::getInstance()->getGrid())
+    {
+        LLSD args;
+        args["SLURL"] = slurl.getLocationString();
+        args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
+        std::string grid_label =
+            LLGridManager::getInstance()->getGridLabel(slurl.getGrid());
+
+        if (!grid_label.empty())
+        {
+            args["GRID"] = grid_label;
+        }
+        else
+        {
+            args["GRID"] = slurl.getGrid();
+        }
+        LLNotificationsUtil::add("CantTeleportToGrid", args);
+        return false;
+    }
+    return true;
+}
+
 /* static */
 void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL& slurl, const LLUUID& snapshot_id, bool teleport)
 {
-
-  // we can't teleport cross grid at this point
-	if(   LLGridManager::getInstance()->getGrid(slurl.getGrid())
-	   != LLGridManager::getInstance()->getGrid())
-	{
-		LLSD args;
-		args["SLURL"] = slurl.getLocationString();
-		args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
-		std::string grid_label = 
-			LLGridManager::getInstance()->getGridLabel(slurl.getGrid());
-		
-		if(!grid_label.empty())
-		{
-			args["GRID"] = grid_label;
-		}
-		else 
-		{
-			args["GRID"] = slurl.getGrid();
-		}
-		LLNotificationsUtil::add("CantTeleportToGrid", args);
-		return;
-	}
+    if (!handleGrid(slurl))
+    {
+        // we can't teleport cross grid at this point
+        return;
+    }
 	
 	LLVector3d global_pos = from_region_handle(region_handle);
 	global_pos += LLVector3d(slurl.getPosition());
@@ -274,8 +289,10 @@ public:
 						&LLTeleportHandler::from_event);
 	}
 
-	bool handle(const LLSD& tokens, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& tokens,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		// construct a "normal" SLURL, resolve the region to
 		// a global position, and teleport to it
@@ -297,7 +314,7 @@ public:
 
 		LLSD payload;
 		payload["region_name"] = region_name;
-		payload["callback_url"] = LLSLURL(region_name, coords).getSLURLString();
+		payload["callback_url"] = LLSLURL(grid, region_name, coords).getSLURLString();
 
 		LLNotificationsUtil::add("TeleportViaSLAPP", args, payload);
 		return true;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index c0398372b4..23b7999399 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -270,6 +270,7 @@ public:
 	bool handle(
         const LLSD& params,
         const LLSD& query_map,
+        const std::string& grid,
         LLMediaCtrl* web) override
 	{
 		if (params.size() != 1)
diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp
index 04c2e27c9d..b03942db9f 100644
--- a/indra/newview/llviewerhelp.cpp
+++ b/indra/newview/llviewerhelp.cpp
@@ -45,7 +45,7 @@ public:
 	// requests will be throttled from a non-trusted browser
 	LLHelpHandler() : LLCommandHandler("help", UNTRUSTED_THROTTLE) {}
 
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		LLViewerHelp* vhelp = LLViewerHelp::getInstance();
 		if (! vhelp)
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 50252556de..793eb56734 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -234,8 +234,10 @@ public:
 	// requires trusted browser to trigger
 	LLInventoryHandler() : LLCommandHandler("inventory", UNTRUSTED_CLICK_ONLY) { }
 	
-	bool handle(const LLSD& params, const LLSD& query_map,
-				LLMediaCtrl* web)
+	bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
 	{
 		if (params.size() < 1)
 		{
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index ad7321ca4b..e122baadce 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -131,8 +131,8 @@ class LLRegionHandler : public LLCommandHandler
 public:
     // requests will be throttled from a non-trusted browser
     LLRegionHandler() : LLCommandHandler("region", UNTRUSTED_THROTTLE) {}
-       
-    bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+
+    bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
     {
         // make sure that we at least have a region name
         int num_params = params.size();
@@ -143,6 +143,10 @@ public:
            
         // build a secondlife://{PLACE} SLurl from this SLapp
         std::string url = "secondlife://";
+        if (!grid.empty())
+        {
+            url += grid + "/secondlife/";
+        }
 		boost::regex name_rx("[A-Za-z0-9()_%]+");
 		boost::regex coord_rx("[0-9]+");
         for (int i = 0; i < num_params; i++)
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp
index 1e993d1384..95e11abd82 100644
--- a/indra/newview/llvoicecallhandler.cpp
+++ b/indra/newview/llvoicecallhandler.cpp
@@ -38,7 +38,7 @@ public:
 	{ 
 	}
 	
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableVoiceCall"))
 		{
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 6bb987ede4..bf96f0bbb4 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -53,7 +53,7 @@ public:
 	// requests will be throttled from a non-trusted browser
 	LLVoiceHandler() : LLCommandHandler("voice", UNTRUSTED_THROTTLE) {}
 
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+	bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
 	{
 		if (params[0].asString() == "effects")
 		{
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 6e994b4e68..b59bbaaa88 100755
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -50,6 +50,7 @@
 #include "lltextureview.h"
 #include "lltracker.h"
 #include "llviewercamera.h"
+#include "llviewernetwork.h"
 #include "llviewertexture.h"
 #include "llviewertexturelist.h"
 #include "llviewerregion.h"
@@ -1829,7 +1830,7 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
 				// Invoke the event details floater if someone is clicking on an event.
 				LLSD params(LLSD::emptyArray());
 				params.append(event_id);
-				LLCommandDispatcher::dispatch("event", params, LLSD(), NULL, "clicked", true);
+				LLCommandDispatcher::dispatch("event", params, LLSD(), LLGridManager::getInstance()->getGrid(), NULL, "clicked", true);
 				break;
 			}
 		case MAP_ITEM_LAND_FOR_SALE:
-- 
cgit v1.2.3


From 873fcd3a0ba50bb06f8fc74dc516da6426280856 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 19 Apr 2023 22:06:00 +0300
Subject: SL-19621 Right click>New folder in List View should change root
 folder before creating new folder

---
 indra/newview/llinventorypanel.cpp | 13 +++++++++++++
 indra/newview/llinventorypanel.h   |  2 ++
 2 files changed, 15 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 4b525b09d1..2c7c6d2056 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2080,6 +2080,7 @@ LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     getFilter().setDefaultEmptyLookupMessage("InventorySingleFolderEmpty");
 
     mCommitCallbackRegistrar.add("Inventory.OpenSelectedFolder", boost::bind(&LLInventorySingleFolderPanel::openInCurrentWindow, this, _2));
+    mCommitCallbackRegistrar.replace("Inventory.DoCreate", boost::bind(&LLInventorySingleFolderPanel::doCreate, this, _2));
 }
 
 LLInventorySingleFolderPanel::~LLInventorySingleFolderPanel()
@@ -2225,6 +2226,18 @@ bool LLInventorySingleFolderPanel::hasVisibleItems()
 {
     return mFolderRoot.get()->hasVisibleChildren();
 }
+
+void LLInventorySingleFolderPanel::doCreate(const LLSD& userdata)
+{
+    std::string type_name = userdata.asString();
+    LLUUID dest_id = LLFolderBridge::sSelf.get()->getUUID();
+    if (("category" == type_name) || ("outfit" == type_name))
+    {
+        changeFolderRoot(dest_id);
+    }
+    reset_inventory_filter();
+    menu_create_inventory_item(this, dest_id, userdata);
+}
 /************************************************************************/
 /* Asset Pre-Filtered Inventory Panel related class                     */
 /************************************************************************/
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index abd5b4f20b..fb2419ada7 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -402,6 +402,8 @@ public:
     void clearNavigationHistory();
     LLUUID getSingleFolderRoot() { return mFolderID; }
 
+    void doCreate(const LLSD& userdata);
+
     bool isBackwardAvailable();
     bool isForwardAvailable();
 
-- 
cgit v1.2.3


From a03f3cd00db95fb8dc6fd500e95054c654088bf7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 20 Apr 2023 14:42:25 +0300
Subject: SL-19630 FIXED Adding a thumbnail to item in combination view does
 not update gallery view

---
 indra/newview/llinventorygallery.cpp | 34 ++++++++++++++++++++++------------
 indra/newview/llinventorygallery.h   |  1 +
 2 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index b4a23f7c55..a078d6c81d 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -594,18 +594,24 @@ void LLInventoryGallery::setFilterSubString(const std::string& string)
 
 void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring)
 {
-    if (!item) return;
+    if(item)
+    {
+        item->setHidden(!checkAgainstFilters(item, filter_substring));
+    }
+}
+
+bool LLInventoryGallery::checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring)
+{
+    if (!item) return false;
 
     if (item->isFolder() && (mFilter->getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS))
     {
-        item->setHidden(false);
-        return;
+        return true;
     }
 
     if(item->isLink() && ((mFilter->getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) == 0) && !filter_substring.empty())
     {
-        item->setHidden(true);
-        return;
+        return false;
     }
     
     bool hidden = false;
@@ -620,20 +626,17 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
     }
     if(hidden)
     {
-        item->setHidden(true);
-        return;
+        return false;
     }
 
     if(!mFilter->checkAgainstFilterThumbnails(item->getUUID()))
     {
-        item->setHidden(true);
-        return;
+        return false;
     }
 
     if(!checkAgainstFilterType(item->getUUID()))
     {
-        item->setHidden(true);
-        return;
+        return false;
     }
 
     std::string desc;
@@ -660,7 +663,7 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
     LLStringUtil::toUpper(cur_filter);
 
     hidden = (std::string::npos == desc.find(cur_filter));
-    item->setHidden(hidden);
+    return !hidden;
 }
 
 void LLInventoryGallery::setSearchType(LLInventoryFilter::ESearchType type)
@@ -803,6 +806,13 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
     if (mItemMap[item_id])
     {
         mItemMap[item_id]->setThumbnail(thumbnail_id);
+
+        bool passes_filter = checkAgainstFilters(mItemMap[item_id], mFilterSubString);
+        if((mItemMap[item_id]->isHidden() && passes_filter)
+           || (!mItemMap[item_id]->isHidden() && !passes_filter))
+        {
+            reArrangeRows();
+        }
     }
 }
 
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 07613b20aa..1760535524 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -134,6 +134,7 @@ protected:
     void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
 
     void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
+    bool checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring);
 
     LLInventoryCategoriesObserver*     mCategoriesObserver;
     LLThumbnailsObserver*              mThumbnailsObserver;
-- 
cgit v1.2.3


From 5527c65064d12d3916d15d8694fd1abb85e37f62 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 20 Apr 2023 14:56:57 +0300
Subject: SL-19105 set Combination view as default

---
 indra/newview/llpanelmaininventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index d8845a7d94..ee1801b9f3 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -119,7 +119,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
       mMenuViewDefault(NULL),
       mSingleFolderMode(false),
       mForceShowInvLayout(false),
-      mViewMode(MODE_LIST),
+      mViewMode(MODE_COMBINATION),
       mListViewRootUpdatedConnection(),
       mGalleryRootUpdatedConnection()
 {
-- 
cgit v1.2.3


From 6d0c07840c6eae4f854152da051c46b9320ea0dd Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 20 Apr 2023 20:04:11 +0300
Subject: SL-19533 Cap folder request depth

---
 indra/newview/llaisapi.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 7a87fc6c3d..d39bb57304 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -456,13 +456,17 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
 
     if (recursive)
     {
-        url += "?depth=*";
+        // can specify depth=*, but server side is going to cap requests
+        // and reject everything 'over the top',.
+        depth = 50;
     }
     else
     {
-        url += "?depth=" + std::to_string(depth);
+        depth = llmax(depth, 50);
     }
 
+    url += "?depth=" + std::to_string(depth);
+
     invokationFn_t getFn = boost::bind(
         // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
         static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
@@ -477,7 +481,7 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
 
     // get doesn't use body, can pass additional data
     LLSD body;
-    body["depth"] = recursive ? S32_MAX : depth;
+    body["depth"] = depth;
     LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
         _1, getFn, url, catId, body, callback, FETCHCATEGORYCHILDREN));
 
@@ -505,13 +509,17 @@ void AISAPI::FetchCategoryChildren(const std::string &identifier, bool recursive
 
     if (recursive)
     {
-        url += "?depth=*";
+        // can specify depth=*, but server side is going to cap requests
+        // and reject everything 'over the top',.
+        depth = 50;
     }
     else
     {
-        url += "?depth=" + std::to_string(depth);
+        depth = llmax(depth, 50);
     }
 
+    url += "?depth=" + std::to_string(depth);
+
     invokationFn_t getFn = boost::bind(
         // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
         static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
@@ -526,7 +534,7 @@ void AISAPI::FetchCategoryChildren(const std::string &identifier, bool recursive
 
     // get doesn't use body, can pass additional data
     LLSD body;
-    body["depth"] = recursive ? S32_MAX : depth;
+    body["depth"] = depth;
     LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
         _1, getFn, url, LLUUID::null, body, callback, FETCHCATEGORYCHILDREN));
 
@@ -552,13 +560,17 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
 
     if (recursive)
     {
-        url += "?depth=*";
+        // can specify depth=*, but server side is going to cap requests
+        // and reject everything 'over the top',.
+        depth = 50;
     }
     else
     {
-        url += "?depth=" + std::to_string(depth);
+        depth = llmax(depth, 50);
     }
 
+    url += "?depth=" + std::to_string(depth);
+
     invokationFn_t getFn = boost::bind(
         // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
         static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
-- 
cgit v1.2.3


From a1d86ca8ab961eb35bfd62a7b7f1ba17d807efd4 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 21 Apr 2023 18:31:56 +0300
Subject: SL-19379 update for gallery context menu

---
 indra/newview/llinventorygallerymenu.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 84b18c1517..43ddf4da63 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -334,6 +334,10 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
         gInventory.updateItem(item);
         gInventory.notifyObservers();
     }
+    else if ("replace_links" == action)
+    {
+        LLFloaterReg::showInstance("linkreplace", LLSD(selected_id));
+    }
 }
 
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
@@ -451,8 +455,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
     if(!is_link)
     {
         items.push_back(std::string("thumbnail"));
-        LLViewerInventoryItem* inv_item = gInventory.getItem(selected_id);
-        if (inv_item && !inv_item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+        if (!is_agent_inventory)
         {
             disabled_items.push_back(std::string("thumbnail"));
         }
@@ -466,6 +469,13 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
         items.push_back(std::string("open_in_new_window"));
         items.push_back(std::string("Open Folder Separator"));
     }
+    else
+    {
+        if (is_agent_inventory && (obj->getType() != LLAssetType::AT_LINK_FOLDER))
+        {
+            items.push_back(std::string("Replace Links"));
+        }
+    }
 
     if(is_trash)
     {
@@ -490,7 +500,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
             }
         }
         items.push_back(std::string("Purge Item"));
-        if (!get_is_category_removable(&gInventory, selected_id))
+        if (is_folder && !get_is_category_removable(&gInventory, selected_id))
         {
             disabled_items.push_back(std::string("Purge Item"));
         }
-- 
cgit v1.2.3


From 0304357384850466ab75ba586ba665c566fa2793 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 21 Apr 2023 18:48:54 +0300
Subject: SL-19356 bring  existing sfv floater to the top regardless of
 selected view mode

---
 indra/newview/llpanelmaininventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index ee1801b9f3..98099dd407 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -455,7 +455,7 @@ void LLPanelMainInventory::newFolderWindow(LLUUID folder_id, LLUUID item_to_sele
             {
                 LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
                 if (main_inventory && main_inventory->isSingleFolderMode()
-                    && (main_inventory->getSingleFolderViewRoot() == folder_id))
+                    && (main_inventory->getCurrentSFVRoot() == folder_id))
                 {
                     main_inventory->setFocus(true);
                     if(item_to_select.notNull())
-- 
cgit v1.2.3


From 107b1d00ed5d272cd87a6ca333cd719151208eaa Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 22 Apr 2023 00:31:42 +0300
Subject: SL-19636 Profile badges

---
 indra/newview/llavatarpropertiesprocessor.h        |   1 +
 indra/newview/llpanelprofile.cpp                   |  60 ++++++++++++++++++++-
 .../default/textures/icons/profile_badge_beta.png  | Bin 0 -> 3223 bytes
 .../textures/icons/profile_badge_beta_lifetime.png | Bin 0 -> 3221 bytes
 .../textures/icons/profile_badge_lifetime.png      | Bin 0 -> 3302 bytes
 .../textures/icons/profile_badge_linden.png        | Bin 0 -> 3521 bytes
 .../icons/profile_badge_pplus_lifetime.png         | Bin 0 -> 3311 bytes
 .../icons/profile_badge_premium_lifetime.png       | Bin 0 -> 3301 bytes
 indra/newview/skins/default/textures/textures.xml  |   8 ++-
 .../default/xui/en/panel_profile_secondlife.xml    |  56 +++++++++++++++++--
 10 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/profile_badge_beta.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_badge_beta_lifetime.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_badge_lifetime.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_badge_linden.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_badge_pplus_lifetime.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_badge_premium_lifetime.png

(limited to 'indra')

diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
index f778634d25..10cde35f9c 100644
--- a/indra/newview/llavatarpropertiesprocessor.h
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -85,6 +85,7 @@ struct LLAvatarData
 	std::string	profile_url;
 	U8			caption_index;
 	std::string	caption_text;
+    std::string	customer_type;
 	U32			flags;
 	BOOL		allow_publish;
 };
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 708ff26ced..34e1fd09d8 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -159,6 +159,7 @@ void request_avatar_properties_coro(std::string cap_url, LLUUID agent_id)
     avatar_data->fl_about_text = result["fl_about_text"].asString();
     avatar_data->born_on = result["member_since"].asDate();
     avatar_data->profile_url = getProfileURL(agent_id.asString());
+    avatar_data->customer_type = result["customer_type"].asString();
 
     avatar_data->flags = 0;
 
@@ -1051,6 +1052,8 @@ void LLPanelProfileSecondLife::resetData()
     mCantEditObjectsIcon->setEnabled(false);
 
     childSetVisible("partner_layout", FALSE);
+    childSetVisible("badge_layout", FALSE);
+    childSetVisible("partner_spacer_layout", TRUE);
 }
 
 void LLPanelProfileSecondLife::processProfileProperties(const LLAvatarData* avatar_data)
@@ -1258,6 +1261,59 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
 
     std::string caption_text = getString("CaptionTextAcctInfo", args);
     getChild<LLUICtrl>("account_info")->setValue(caption_text);
+
+    const S32 LINDEN_EMPLOYEE_INDEX = 3;
+    LLDate sl_release;
+    sl_release.fromYMDHMS(2003, 6, 23, 0, 0, 0);
+    std::string customer_lower = avatar_data->customer_type;
+    LLStringUtil::toLower(customer_lower);
+    if (avatar_data->caption_index == LINDEN_EMPLOYEE_INDEX)
+    {
+        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Linden");
+        getChild<LLUICtrl>("badge_text")->setValue(getString("BadgeLinden"));
+        childSetVisible("badge_layout", TRUE);
+        childSetVisible("partner_spacer_layout", FALSE);
+    }
+    else if (avatar_data->born_on < sl_release)
+    {
+        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Beta");
+        getChild<LLUICtrl>("badge_text")->setValue(getString("BadgeBeta"));
+        childSetVisible("badge_layout", TRUE);
+        childSetVisible("partner_spacer_layout", FALSE);
+    }
+    else if (customer_lower == "beta_lifetime")
+    {
+        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Beta_Lifetime");
+        getChild<LLUICtrl>("badge_text")->setValue(getString("BadgeBetaLifetime"));
+        childSetVisible("badge_layout", TRUE);
+        childSetVisible("partner_spacer_layout", FALSE);
+    }
+    else if (customer_lower == "lifetime")
+    {
+        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Lifetime");
+        getChild<LLUICtrl>("badge_text")->setValue(getString("BadgeLifetime"));
+        childSetVisible("badge_layout", TRUE);
+        childSetVisible("partner_spacer_layout", FALSE);
+    }
+    else if (customer_lower == "premium_lifetime")
+    {
+        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Premium_Lifetime");
+        getChild<LLUICtrl>("badge_text")->setValue(getString("BadgePremiumLifetime"));
+        childSetVisible("badge_layout", TRUE);
+        childSetVisible("partner_spacer_layout", FALSE);
+    }
+    else if (customer_lower == "pplus_lifetime" || customer_lower == "premium_plus_lifetime")
+    {
+        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Pplus_Lifetime");
+        getChild<LLUICtrl>("badge_text")->setValue(getString("BadgePremiumPlusLifetime"));
+        childSetVisible("badge_layout", TRUE);
+        childSetVisible("partner_spacer_layout", FALSE);
+    }
+    else
+    {
+        childSetVisible("badge_layout", FALSE);
+        childSetVisible("partner_spacer_layout", TRUE);
+    }
 }
 
 void LLPanelProfileSecondLife::fillRightsData()
@@ -1412,7 +1468,7 @@ void LLPanelProfileSecondLife::updateOnlineStatus()
     }
     else
     {
-        childSetVisible("frind_layout", false);
+        childSetVisible("friend_layout", false);
         childSetVisible("online_layout", false);
         childSetVisible("offline_layout", false);
     }
@@ -1420,7 +1476,7 @@ void LLPanelProfileSecondLife::updateOnlineStatus()
 
 void LLPanelProfileSecondLife::processOnlineStatus(bool is_friend, bool show_online, bool online)
 {
-    childSetVisible("frind_layout", is_friend);
+    childSetVisible("friend_layout", is_friend);
     childSetVisible("online_layout", online && show_online);
     childSetVisible("offline_layout", !online && show_online);
 }
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_beta.png b/indra/newview/skins/default/textures/icons/profile_badge_beta.png
new file mode 100644
index 0000000000..7c8a723c47
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_badge_beta.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_beta_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_beta_lifetime.png
new file mode 100644
index 0000000000..7c38e9e2ae
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_badge_beta_lifetime.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_lifetime.png
new file mode 100644
index 0000000000..475edd080e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_badge_lifetime.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_linden.png b/indra/newview/skins/default/textures/icons/profile_badge_linden.png
new file mode 100644
index 0000000000..1b6ac03e86
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_badge_linden.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_pplus_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_pplus_lifetime.png
new file mode 100644
index 0000000000..4286995202
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_badge_pplus_lifetime.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_premium_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_premium_lifetime.png
new file mode 100644
index 0000000000..47e93c4fac
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_badge_premium_lifetime.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1f2c0867c4..03fc00b8f9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -510,7 +510,13 @@ with the same filename but different name
   <texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" />
   <texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
   <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
-  
+
+  <texture name="Profile_Badge_Beta" file_name="icons/profile_badge_beta.png" preload="true"/>
+  <texture name="Profile_Badge_Beta_Lifetime" file_name="icons/profile_badge_beta_lifetime.png" preload="true"/>
+  <texture name="Profile_Badge_Lifetime" file_name="icons/profile_badge_lifetime.png" preload="true"/>
+  <texture name="Profile_Badge_Linden" file_name="icons/profile_badge_linden.png" preload="true"/>
+  <texture name="Profile_Badge_Pplus_Lifetime" file_name="icons/profile_badge_pplus_lifetime.png" preload="true"/>
+  <texture name="Profile_Badge_Premium_Lifetime" file_name="icons/profile_badge_premium_lifetime.png" preload="true"/>
   <texture name="Profile_Group_Visibility_Off" file_name="icons/profile_group_visibility_eye_off.png" preload="true"/>
   <texture name="Profile_Group_Visibility_Off_Pressed" file_name="icons/profile_group_visibility_eye_off_pressed.png" preload="true"/>
   <texture name="Profile_Group_Visibility_On" file_name="icons/profile_group_visibility_eye_on.png" preload="true"/>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 777b37d666..07cdd6d71e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -27,6 +27,26 @@
 Account: [ACCTTYPE]
 [PAYMENTINFO]
     </string>
+    
+    <!--Badges-->
+    <string
+     name="BadgeBeta"
+     value="Original Beta Tester" />
+    <string
+     name="BadgeBetaLifetime"
+     value="Beta Lifetime member" />
+    <string
+     name="BadgeLifetime"
+     value="Lifetime member" />
+    <string
+     name="BadgeLinden"
+     value="Linden Lab employee" />
+    <string
+     name="BadgePremiumLifetime"
+     value="Premium lifetime" />
+    <string
+     name="BadgePremiumPlusLifetime"
+     value="Premium Plus lifetime" />
 
   <layout_stack
    name="image_stack"
@@ -156,9 +176,39 @@ Account: [ACCTTYPE]
      user_resize="false"
      visible="true">
     </layout_panel>
-    
+
+    <layout_panel
+     name="badge_layout"
+     follows="all"
+     layout="topleft"
+     height="40"
+     auto_resize="false"
+     user_resize="false"
+     visible="false">
+      <icon
+       name="badge_icon"
+       image_name="Beta_Tester"
+       layout="topleft"
+       follows="left|top"
+       top="10"
+       left="5"
+       height="18"
+       width="18"/>
+      <text
+       name="badge_text"
+       value="Badge Tester"
+       top="13"
+       left_pad="3"
+       right="-1"
+       height="16"
+       follows="left|top|right"
+       layout="topleft"
+       translate="false"
+       visible="true"/>
+    </layout_panel>
+
     <layout_panel
-     name="frind_layout"
+     name="friend_layout"
      follows="all"
      layout="topleft"
      height="16"
@@ -166,7 +216,7 @@ Account: [ACCTTYPE]
      user_resize="false"
      visible="false">
       <text
-       name="frind_text"
+       name="friend_text"
        value="You are friends"
        text_color="ConversationFriendColor"
        top="0"
-- 
cgit v1.2.3


From c9a025e3d0aee9a894f341c1eeb6b216bbe74a4c Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 24 Apr 2023 16:55:15 +0300
Subject: SL-19642 FIXED Outfit folders with thumbnails are displayed both in
 gallery and inventory panels in Combination view

---
 indra/newview/llinventoryfilter.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 5c02b61522..d8e7b8ca67 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -195,6 +195,11 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
 		return true;
 	}
 
+    if(!checkAgainstFilterThumbnails(folder_id))
+    {
+        return false;
+    }
+
 	// when applying a filter, matching folders get their contents downloaded first
 	// but make sure we are not interfering with pre-download
 	if (isNotDefault()
-- 
cgit v1.2.3


From f9cb6a13b23df14c2dcc7709fafdb28c578a934e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 24 Apr 2023 19:48:55 +0300
Subject: SL-19362 Add teleport button to Top Scripts and Top Colliders
 floaters (#190)

---
 indra/newview/llfloatertopobjects.cpp              | 49 ++++++++++++++++++++--
 indra/newview/llfloatertopobjects.h                |  4 ++
 .../skins/default/xui/en/floater_top_objects.xml   | 13 ++++++
 3 files changed, 62 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index bd49405f34..9f277021c8 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -49,6 +49,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "lluictrlfactory.h"
+#include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
 #include "llfloaterregioninfo.h"
 
@@ -83,6 +84,8 @@ LLFloaterTopObjects::LLFloaterTopObjects(const LLSD& key)
 	mCommitCallbackRegistrar.add("TopObjects.GetByOwnerName",	boost::bind(&LLFloaterTopObjects::onGetByOwnerName, this));
 	mCommitCallbackRegistrar.add("TopObjects.GetByParcelName",	boost::bind(&LLFloaterTopObjects::onGetByParcelName, this));
 	mCommitCallbackRegistrar.add("TopObjects.CommitObjectsList",boost::bind(&LLFloaterTopObjects::onCommitObjectsList, this));
+
+    mCommitCallbackRegistrar.add("TopObjects.TeleportToSelected",        boost::bind(&LLFloaterTopObjects::teleportToSelectedObject, this));
 }
 
 LLFloaterTopObjects::~LLFloaterTopObjects()
@@ -92,10 +95,11 @@ LLFloaterTopObjects::~LLFloaterTopObjects()
 // virtual
 BOOL LLFloaterTopObjects::postBuild()
 {
-	LLScrollListCtrl *objects_list = getChild<LLScrollListCtrl>("objects_list");
-	getChild<LLUICtrl>("objects_list")->setFocus(TRUE);
-	objects_list->setDoubleClickCallback(onDoubleClickObjectsList, this);
-	objects_list->setCommitOnSelectionChange(TRUE);
+    mObjectsScrollList = getChild<LLScrollListCtrl>("objects_list");
+    mObjectsScrollList->setFocus(TRUE);
+    mObjectsScrollList->setDoubleClickCallback(onDoubleClickObjectsList, this);
+    mObjectsScrollList->setCommitOnSelectionChange(TRUE);
+    mObjectsScrollList->setCommitCallback(boost::bind(&LLFloaterTopObjects::onSelectionChanged, this));
 
 	setDefaultBtn("show_beacon_btn");
 
@@ -421,6 +425,8 @@ void LLFloaterTopObjects::clearList()
 	mObjectListData.clear();
 	mObjectListIDs.clear();
 	mtotalScore = 0.f;
+
+    onSelectionChanged();
 }
 
 
@@ -507,3 +513,38 @@ void LLFloaterTopObjects::showBeacon()
 	std::string tooltip("");
 	LLTracker::trackLocation(pos_global, name, tooltip, LLTracker::LOCATION_ITEM);
 }
+
+void LLFloaterTopObjects::teleportToSelectedObject()
+{
+    std::vector<LLScrollListItem*> selected_items = mObjectsScrollList->getAllSelected();
+    if (selected_items.size() == 1)
+    {
+        LLScrollListItem* first_selected = selected_items.front();
+
+        LLVector3d teleport_location;
+        LLViewerObject *viewer_object = gObjectList.findObject(first_selected->getUUID());
+        if (viewer_object == NULL)
+        {
+            // If we cannot find the object in the viewer list, teleport to the last reported position
+            std::string pos_string =  first_selected->getColumn(3)->getValue().asString();
+
+            F32 x, y, z;
+            S32 matched = sscanf(pos_string.c_str(), "<%g,%g,%g>", &x, &y, &z);
+            if (matched != 3) return;
+
+            LLVector3 pos_agent(x, y, z);
+            teleport_location = gAgent.getPosGlobalFromAgent(pos_agent);
+        }
+        else
+        {
+            // If we can find the object in the viewer list, teleport to the known current position
+            teleport_location = viewer_object->getPositionGlobal();
+        }
+        gAgent.teleportViaLocationLookAt(teleport_location);
+    }
+}
+
+void LLFloaterTopObjects::onSelectionChanged()
+{
+    getChildView("teleport_btn")->setEnabled(mObjectsScrollList->getNumSelected() == 1);
+}
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index 3138249c7a..b73401e50d 100644
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -30,6 +30,7 @@
 #include "llfloater.h"
 
 class LLUICtrl;
+class LLScrollListCtrl;
 
 // Bits for simulator performance query flags
 enum LAND_STAT_FLAGS
@@ -75,6 +76,7 @@ private:
 	void initColumns(LLCtrlListInterface *list);
 
 	void onCommitObjectsList();
+    void onSelectionChanged();
 	static void onDoubleClickObjectsList(void* data);
 	void onClickShowBeacon();
 
@@ -90,6 +92,7 @@ private:
 	void onGetByParcelName();
 
 	void showBeacon();
+    void teleportToSelectedObject();
 
 private:
 	std::string mMethod;
@@ -106,6 +109,7 @@ private:
 	F32 mtotalScore;
 
 	static LLFloaterTopObjects* sInstance;
+    LLScrollListCtrl* mObjectsScrollList;
 };
 
 #endif
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index b82fe43e74..a8b4b84ab7 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -273,4 +273,17 @@
       <button.commit_callback
           function="TopObjects.ReturnAll" />
     </button>
+    <button
+     follows="bottom|left"
+     height="23"
+     label="Teleport to selected"
+     layout="topleft"
+     left_pad="10"
+     name="teleport_btn"
+     enabled="false"
+     top_delta="0"
+     width="160">
+      <button.commit_callback
+          function="TopObjects.TeleportToSelected" />
+</button>
 </floater>
-- 
cgit v1.2.3


From e7a1ac5db84c6ec77053e5115c997236ae6bf0df Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 24 Apr 2023 21:37:24 +0300
Subject: SL-19503 Deleting a thumbnail for folder does not remove thumbnail in
 viewer

---
 indra/llinventory/llinventory.cpp   | 6 +-----
 indra/newview/llviewerinventory.cpp | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index ef86d2d89b..81ace2a5a8 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1120,11 +1120,7 @@ LLSD LLInventoryCategory::asAISLLSD() const
     S8 type                 = static_cast<S8>(mPreferredType);
     sd[INV_ASSET_TYPE_LABEL_WS] = type;
     sd[INV_NAME_LABEL] = mName;
-
-    if (mThumbnailUUID.notNull())
-    {
-        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
-    }
+    sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
 
     return sd;
 }
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 8b0d14b3e9..96f0b500a0 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1377,11 +1377,8 @@ void update_inventory_category(
 			return;
 		}
 
-		LLPointer<LLViewerInventoryCategory> new_cat = new LLViewerInventoryCategory(obj);
-		new_cat->fromLLSD(updates);
-        LLSD new_llsd = new_cat->asLLSD();
         AISAPI::completion_t cr = boost::bind(&doInventoryCb, cb, _1);
-        AISAPI::UpdateCategory(cat_id, new_llsd, cr);
+        AISAPI::UpdateCategory(cat_id, updates, cr);
 	}
 }
 
-- 
cgit v1.2.3


From 4c3a7b106429f3ede827fd28acd25cc00fcb8649 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 00:03:42 +0300
Subject: SL-19503 Fix thumbnails not being restored from cache

---
 indra/llinventory/llinventory.cpp  |  4 ++--
 indra/newview/llinventorymodel.cpp | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 81ace2a5a8..ecd070236f 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1345,16 +1345,16 @@ bool LLInventoryCategory::importLLSD(const LLSD& cat_data)
 	{
 		setPreferredType(LLFolderType::lookup(cat_data[INV_PREFERRED_TYPE_LABEL].asString()));
 	}
-    LLUUID thumbnail_uuid;
     if (cat_data.has(INV_THUMBNAIL_LABEL))
     {
+        LLUUID thumbnail_uuid;
         const LLSD &thumbnail_data = cat_data[INV_THUMBNAIL_LABEL];
         if (thumbnail_data.has(INV_ASSET_ID_LABEL))
         {
             thumbnail_uuid = thumbnail_data[INV_ASSET_ID_LABEL].asUUID();
         }
+        setThumbnailUUID(thumbnail_uuid);
     }
-    setThumbnailUUID(thumbnail_uuid);
 	if (cat_data.has(INV_NAME_LABEL))
 	{
 		mName = cat_data[INV_NAME_LABEL].asString();
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 32acd0eb03..873d3e1ccf 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -2638,12 +2638,6 @@ bool LLInventoryModel::loadSkeleton(
 			cat->setUUID(folder_id.asUUID());
 			cat->setParent(parent_id.asUUID());
 
-            LLSD thumbnail = (*it)["thumbnail"];
-            if (thumbnail.isMap())
-            {
-                cat->setThumbnailUUID(thumbnail["asset_id"].asUUID());
-            }
-
 			LLFolderType::EType preferred_type = LLFolderType::FT_NONE;
 			LLSD type_default = (*it)["type_default"];
 			if(type_default.isDefined())
@@ -2735,6 +2729,10 @@ bool LLInventoryModel::loadSkeleton(
 				else
 				{
 					cached_ids.insert(tcat->getUUID());
+
+                    // At the moment download does not provide a thumbnail
+                    // uuid, use the one from cache
+                    tcat->setThumbnailUUID(cat->getThumbnailUUID());
 				}
 			}
 
-- 
cgit v1.2.3


From 9c2b0c709b3d1cf1a9243853a8df7089e2494057 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 01:34:35 +0300
Subject: SL-19533 Special COF handling

---
 indra/newview/llaisapi.cpp                        | 40 +++++++++++++++++++++++
 indra/newview/llaisapi.h                          |  2 ++
 indra/newview/llinventorymodelbackgroundfetch.cpp |  6 ++++
 indra/newview/llinventorymodelbackgroundfetch.h   |  1 +
 indra/newview/llstartup.cpp                       |  1 +
 5 files changed, 50 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index d39bb57304..117a596cd2 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -592,6 +592,40 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
     EnqueueAISCommand("FetchCategoryCategories", proc);
 }
 
+/*static*/
+// Will get COF folder, links in it and items those links point to
+void AISAPI::FetchCOF(completion_t callback)
+{
+    std::string cap = getInvCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
+        return;
+    }
+    std::string url = cap + std::string("/category/current/links");
+
+    invokationFn_t getFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string&, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+                                                         _1, getFn, url, LLUUID::null, LLSD(), callback, FETCHCOF));
+
+    EnqueueAISCommand("FetchCOF", proc);
+}
+
 /*static*/
 void AISAPI::FetchOrphans(completion_t callback)
 {
@@ -687,6 +721,7 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
     bool is_fetch = (type == FETCHITEM)
         || (type == FETCHCATEGORYCHILDREN)
         || (type == FETCHCATEGORYCATEGORIES)
+        || (type == FETCHCOF)
         || (type == FETCHORPHANS);
     // parse update llsd into stuff to do or parse received items.
     S32 depth = 0;
@@ -1095,6 +1130,11 @@ void AISUpdate::parseLink(const LLSD& link_map)
 			mCatDescendentDeltas[parent_id]++;
             new_link->setComplete(true);
 		}
+
+        if (link_map.has("_embedded"))
+        {
+            parseEmbedded(link_map["_embedded"], S32_MAX);
+        }
 	}
 	else
 	{
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 4e1c6e5a7d..0ca0144d7b 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -59,6 +59,7 @@ public:
     static void FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryChildren(const std::string &identifier, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchCOF(completion_t callback = completion_t());
     static void FetchOrphans(completion_t callback = completion_t() );
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
@@ -76,6 +77,7 @@ private:
         FETCHITEM,
         FETCHCATEGORYCHILDREN,
         FETCHCATEGORYCATEGORIES,
+        FETCHCOF,
         FETCHORPHANS,
     } COMMAND_TYPE;
 
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index bfb5ad9d12..f56532ff8c 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -391,6 +391,12 @@ void LLInventoryModelBackgroundFetch::findLostItems()
     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 }
 
+void LLInventoryModelBackgroundFetch::fetchCOF()
+{
+    // Will get COF folder, links in it and items those links point to
+    AISAPI::FetchCOF();
+}
+
 void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 {
 	if (mRecursiveInventoryFetchStarted &&
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 1881322e7a..db2d6db323 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -65,6 +65,7 @@ public:
 	bool inventoryFetchInProgress() const;
 
     void findLostItems();	
+    void fetchCOF();
 	void incrFetchCount(S32 fetching);
     void incrFetchFolderCount(S32 fetching);
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index a1f2753ada..161beaff19 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1898,6 +1898,7 @@ bool idle_startup()
 		}
 		
         LLInventoryModelBackgroundFetch::instance().start();
+        LLInventoryModelBackgroundFetch::instance().fetchCOF();
 		gInventory.createCommonSystemCategories();
 
 		// It's debatable whether this flag is a good idea - sets all
-- 
cgit v1.2.3


From 154ab03bf8a5dacc3128718d1f15160f0cbe2b33 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 03:38:26 +0300
Subject: SL-19533 Special COF handling #2

---
 indra/newview/llappearancemgr.cpp                 | 33 ++++++++++++++++-------
 indra/newview/llappearancemgr.h                   |  1 +
 indra/newview/llinventorymodelbackgroundfetch.cpp | 18 +------------
 indra/newview/llinventorymodelbackgroundfetch.h   |  5 ++--
 indra/newview/llstartup.cpp                       |  3 +--
 5 files changed, 28 insertions(+), 32 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 9115d7e5c2..297403fc6c 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4561,18 +4561,31 @@ protected:
 	nullary_func_t mCallable;
 };
 
+void callAfterCOFFetch(nullary_func_t cb)
+{
+    if (AISAPI::isAvailable())
+    {
+        AISAPI::FetchCOF([cb](const LLUUID& id) { cb(); });
+    }
+    else
+    {
+        LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
+        callAfterCategoryFetch(cat_id, cb);
+    }
+}
+
 void callAfterCategoryFetch(const LLUUID& cat_id, nullary_func_t cb)
 {
-	CallAfterCategoryFetchStage1 *stage1 = new CallAfterCategoryFetchStage1(cat_id, cb);
-	stage1->startFetch();
-	if (stage1->isFinished())
-	{
-		stage1->done();
-	}
-	else
-	{
-		gInventory.addObserver(stage1);
-	}
+    CallAfterCategoryFetchStage1* stage1 = new CallAfterCategoryFetchStage1(cat_id, cb);
+    stage1->startFetch();
+    if (stage1->isFinished())
+    {
+        stage1->done();
+    }
+    else
+    {
+        gInventory.addObserver(stage1);
+    }
 }
 
 void add_wearable_type_counts(const uuid_vec_t& ids,
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index cf953d21ac..f6aa30d865 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -338,6 +338,7 @@ public:
 LLUUID findDescendentCategoryIDByName(const LLUUID& parent_id,const std::string& name);
 
 // Invoke a given callable after category contents are fully fetched.
+void callAfterCOFFetch(nullary_func_t cb);
 void callAfterCategoryFetch(const LLUUID& cat_id, nullary_func_t cb);
 
 // Wear all items in a uuid vector.
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index f56532ff8c..277ddb16ba 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -354,17 +354,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 
 void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id, bool forced)
 {
-    if (AISAPI::isAvailable())
-    {
-        if (mFetchFolderQueue.empty() || mFetchFolderQueue.back().mUUID != cat_id)
-        {
-            // On AIS make sure root goes to the top and follow up recursive
-            // fetches, not individual requests
-            mFetchFolderQueue.push_back(FetchQueueInfo(cat_id, forced ? FT_FORCED : FT_DEFAULT));
-            gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
-        }
-    }
-    else if (mFetchFolderQueue.empty() || mFetchFolderQueue.front().mUUID != cat_id)
+    if (mFetchFolderQueue.empty() || mFetchFolderQueue.front().mUUID != cat_id)
     {
         // Specific folder requests go to front of queue.
         mFetchFolderQueue.push_front(FetchQueueInfo(cat_id, forced ? FT_FORCED : FT_DEFAULT));
@@ -391,12 +381,6 @@ void LLInventoryModelBackgroundFetch::findLostItems()
     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 }
 
-void LLInventoryModelBackgroundFetch::fetchCOF()
-{
-    // Will get COF folder, links in it and items those links point to
-    AISAPI::FetchCOF();
-}
-
 void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
 {
 	if (mRecursiveInventoryFetchStarted &&
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index db2d6db323..363d04486d 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -64,9 +64,8 @@ public:
 	bool inventoryFetchCompleted() const;
 	bool inventoryFetchInProgress() const;
 
-    void findLostItems();	
-    void fetchCOF();
-	void incrFetchCount(S32 fetching);
+    void findLostItems();
+    void incrFetchCount(S32 fetching);
     void incrFetchFolderCount(S32 fetching);
 
 	bool isBulkFetchProcessingComplete() const;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 161beaff19..3a96a7bced 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1898,7 +1898,6 @@ bool idle_startup()
 		}
 		
         LLInventoryModelBackgroundFetch::instance().start();
-        LLInventoryModelBackgroundFetch::instance().fetchCOF();
 		gInventory.createCommonSystemCategories();
 
 		// It's debatable whether this flag is a good idea - sets all
@@ -2161,7 +2160,7 @@ bool idle_startup()
 			gAgentWearables.notifyLoadingStarted();
 			gAgent.setOutfitChosen(TRUE);
 			gAgentWearables.sendDummyAgentWearablesUpdate();
-			callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(), set_flags_and_update_appearance);
+            callAfterCOFFetch(set_flags_and_update_appearance);
 		}
 
 		display_startup();
-- 
cgit v1.2.3


From c008d3e030ca4019e24de9a4831dc36727555fd2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 12:25:15 +0300
Subject: SL-19533 Reduce inventory fetch stalls

---
 indra/newview/llaisapi.cpp                        | 11 ++++++++++-
 indra/newview/llaisapi.h                          |  6 ++++++
 indra/newview/llinventoryfilter.cpp               | 12 ++++++------
 indra/newview/llinventorymodel.cpp                |  3 ++-
 indra/newview/llinventorymodelbackgroundfetch.cpp |  9 +++++++--
 5 files changed, 31 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 117a596cd2..7c293fcf63 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -771,7 +771,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 
         LL_DEBUGS("Inventory") << "Request type: " << (S32)type
             << " \nRequest target: " << targetId
-            << " \nElapsed time ince request: " << elapsed_time
+            << " \nElapsed time since request: " << elapsed_time
             << " \nstatus: " << status.toULong() << LL_ENDL;
     }
     else
@@ -904,6 +904,8 @@ AISUpdate::AISUpdate(const LLSD& update, bool fetch, S32 depth)
 : mFetch(fetch)
 , mFetchDepth(depth)
 {
+    mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
+    mTimer.start();
 	parseUpdate(update);
 }
 
@@ -1279,6 +1281,13 @@ void AISUpdate::parseDescendentCount(const LLUUID& category_id, const LLSD& embe
 
 void AISUpdate::parseEmbedded(const LLSD& embedded, S32 depth)
 {
+    if (mTimer.hasExpired())
+    {
+        llcoro::suspend();
+        LLCoros::checkStop();
+        mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
+    }
+
 	if (embedded.has("links")) // _embedded in a category
 	{
 		parseEmbeddedLinks(embedded["links"]);
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 0ca0144d7b..1969448627 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -124,6 +124,11 @@ public:
 private:
 	void clearParseResults();
 
+    // Debug is very log-heavy, give it more time or it will take forever to process
+    // Todo: find a way to make throttle static isntead of per-request
+    const F32 EXPIRY_SECONDS_DEBUG = 1.f;
+    const F32 EXPIRY_SECONDS_LIVE = 0.01f;
+
 	typedef std::map<LLUUID,S32> uuid_int_map_t;
 	uuid_int_map_t mCatDescendentDeltas;
 	uuid_int_map_t mCatDescendentsKnown;
@@ -144,6 +149,7 @@ private:
 	uuid_list_t mCategoryIds;
     bool mFetch;
     S32 mFetchDepth;
+    LLTimer mTimer;
 };
 
 #endif
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index d8e7b8ca67..5d6c3be168 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -195,11 +195,6 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
 		return true;
 	}
 
-    if(!checkAgainstFilterThumbnails(folder_id))
-    {
-        return false;
-    }
-
 	// when applying a filter, matching folders get their contents downloaded first
 	// but make sure we are not interfering with pre-download
 	if (isNotDefault()
@@ -207,7 +202,7 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
         && !LLInventoryModelBackgroundFetch::instance().inventoryFetchInProgress())
     {
         LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id);
-        if (!cat || (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN))
+        if ((!cat && folder_id.notNull()) || (cat && cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN))
         {
             // At the moment background fetch only cares about VERSION_UNKNOWN,
             // so do not check isCategoryComplete that compares descendant count
@@ -215,6 +210,11 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
         }
 	}
 
+    if (!checkAgainstFilterThumbnails(folder_id))
+    {
+        return false;
+    }
+
 	// Marketplace folder filtering
     const U32 filterTypes = mFilterOps.mFilterTypes;
     const U32 marketplace_filter = FILTERTYPE_MARKETPLACE_ACTIVE | FILTERTYPE_MARKETPLACE_INACTIVE |
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 873d3e1ccf..48539f4748 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -4681,7 +4681,6 @@ LLPointer<LLInventoryValidationInfo> LLInventoryModel::validate() const
 			}
 			else if (count_under_root > 1)
 			{
-				LL_WARNS("Inventory") << "Fatal inventory corruption: system folder type has excess copies under root, type " << ft << " count " << count_under_root << LL_ENDL;
 				validation_info->mDuplicateRequiredSystemFolders.insert(folder_type);
                 if (!is_automatic && folder_type != LLFolderType::FT_SETTINGS)
                 {
@@ -4689,6 +4688,7 @@ LLPointer<LLInventoryValidationInfo> LLInventoryModel::validate() const
                     // outfits, trash and other non-automatic folders.
 					validation_info->mFatalSystemDuplicate++;
                     fatal_errs++;
+                    LL_WARNS("Inventory") << "Fatal inventory corruption: system folder type has excess copies under root, type " << ft << " count " << count_under_root << LL_ENDL;
                 }
                 else
                 {
@@ -4697,6 +4697,7 @@ LLPointer<LLInventoryValidationInfo> LLInventoryModel::validate() const
                     // Exception: FT_SETTINGS is not automatic, but only deserves a warning.
 					validation_info->mWarnings["non_fatal_system_duplicate_under_root"]++;
                     warning_count++;
+                    LL_WARNS("Inventory") << "System folder type has excess copies under root, type " << ft << " count " << count_under_root << LL_ENDL;
                 }
 			}
 			if (count_elsewhere > 0)
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 277ddb16ba..c5fb40409f 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -555,6 +555,8 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     }
 
     static LLCachedControl<U32> ais_pool(gSavedSettings, "PoolSizeAIS", 20);
+    // Don't have too many requests at once
+    // Reserve one request for actions outside of fetch (like renames)
     const U32 max_concurrent_fetches = llmax(1, ais_pool - 1);
 
     if (mFetchCount >= max_concurrent_fetches)
@@ -562,6 +564,9 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         return;
     }
 
+    // Don't fire all requests at once
+    const U32 max_requests_this_run = llmin(mFetchCount + 5, max_concurrent_fetches);
+
     // Don't loop for too long (in case of large, fully loaded inventory)
     F64 curent_time = LLTimer::getTotalSeconds();
     const F64 max_time = LLStartUp::getStartupState() > STATE_WEARABLES_WAIT
@@ -570,7 +575,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     const F64 end_time = curent_time + max_time;
     S32 last_fetch_count = mFetchCount;
 
-    while (!mFetchFolderQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
+    while (!mFetchFolderQueue.empty() && mFetchCount < max_requests_this_run && curent_time < end_time)
     {
         const FetchQueueInfo & fetch_info(mFetchFolderQueue.front());
         bulkFetchViaAis(fetch_info);
@@ -581,7 +586,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     // Ideally we shouldn't fetch items if recursive fetch isn't done,
     // but there is a chance some request will start timeouting and recursive
     // fetch will get stuck on a signle folder, don't block item fetch in such case
-    while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
+    while (!mFetchItemQueue.empty() && mFetchCount < max_requests_this_run && curent_time < end_time)
     {
         const FetchQueueInfo& fetch_info(mFetchItemQueue.front());
         bulkFetchViaAis(fetch_info);
-- 
cgit v1.2.3


From 8166a8d8d480d63c645ead7cd81b1b0afda225b4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 13:10:51 +0300
Subject: SL-19533 Fix a fetch blunder

---
 indra/newview/llaisapi.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 7c293fcf63..e16029f063 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -462,7 +462,7 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
     }
     else
     {
-        depth = llmax(depth, 50);
+        depth = llmin(depth, 50);
     }
 
     url += "?depth=" + std::to_string(depth);
@@ -515,7 +515,7 @@ void AISAPI::FetchCategoryChildren(const std::string &identifier, bool recursive
     }
     else
     {
-        depth = llmax(depth, 50);
+        depth = llmin(depth, 50);
     }
 
     url += "?depth=" + std::to_string(depth);
@@ -566,7 +566,7 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
     }
     else
     {
-        depth = llmax(depth, 50);
+        depth = llmin(depth, 50);
     }
 
     url += "?depth=" + std::to_string(depth);
-- 
cgit v1.2.3


From c1a3c7b239dcde347403c818d4ad1eeedf45d280 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 13:51:23 +0300
Subject: SL-19533 Special COF handling #3

---
 indra/newview/llappearancemgr.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 297403fc6c..d79525ec62 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4563,13 +4563,16 @@ protected:
 
 void callAfterCOFFetch(nullary_func_t cb)
 {
-    if (AISAPI::isAvailable())
+    LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
+    LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
+    if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN && AISAPI::isAvailable())
     {
+        // Assume that we have no relevant cache. Fetch cof, and items cof's links point to.
         AISAPI::FetchCOF([cb](const LLUUID& id) { cb(); });
     }
     else
     {
-        LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
+        // Assume that cache is present. Process like a normal folder.
         callAfterCategoryFetch(cat_id, cb);
     }
 }
-- 
cgit v1.2.3


From 7c3452fe44eb6a1a0b7a8b927d0b9620142e88d1 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 17:29:46 +0300
Subject: SL-19409 FIXED Received items panel in multiple inventory windows
 does not sync New tag status between windows

---
 indra/newview/llpanelmarketplaceinboxinventory.cpp | 34 +++++++++++++++++++++-
 indra/newview/llpanelmarketplaceinboxinventory.h   | 11 ++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index 7a6631448b..e13bd0412d 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -62,10 +62,13 @@ LLInboxInventoryPanel::LLInboxInventoryPanel(const LLInboxInventoryPanel::Params
 :	LLInventoryPanel(p)
 {
 	LLInboxNewItemsStorage::getInstance()->load();
+    LLInboxNewItemsStorage::getInstance()->addInboxPanel(this);
 }
 
 LLInboxInventoryPanel::~LLInboxInventoryPanel()
-{}
+{
+    LLInboxNewItemsStorage::getInstance()->removeInboxPanel(this);
+}
 
 void LLInboxInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
 {
@@ -108,6 +111,21 @@ LLFolderViewItem * LLInboxInventoryPanel::createFolderViewItem(LLInvFVBridge * b
 	return LLUICtrlFactory::create<LLInboxFolderViewItem>(params);
 }
 
+void LLInboxInventoryPanel::onRemoveItemFreshness(const LLUUID& item_id)
+{
+    LLInboxFolderViewFolder* inbox_folder_view = dynamic_cast<LLInboxFolderViewFolder*>(getFolderByID(item_id));
+    if(inbox_folder_view)
+    {
+        inbox_folder_view->setFresh(false);
+    }
+
+    LLInboxFolderViewItem* inbox_item_view = dynamic_cast<LLInboxFolderViewItem*>(getItemByID(item_id));
+    if(inbox_item_view)
+    {
+        inbox_item_view->setFresh(false);
+    }
+}
+
 //
 // LLInboxFolderViewFolder Implementation
 //
@@ -340,4 +358,18 @@ void LLInboxNewItemsStorage::load()
 		}
 	}
 }
+
+void LLInboxNewItemsStorage::removeItem(const LLUUID& id)
+{
+    mNewItemsIDs.erase(id);
+
+    //notify inbox panels
+    for (auto inbox : mInboxPanels)
+    {
+        if(inbox)
+        {
+            inbox->onRemoveItemFreshness(id);
+        }
+    }
+}
 // eof
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h
index 3e508e801b..9eef5f209c 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.h
+++ b/indra/newview/llpanelmarketplaceinboxinventory.h
@@ -49,6 +49,8 @@ public:
 	void initFromParams(const LLInventoryPanel::Params&);
 	LLFolderViewFolder*	createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop);
 	LLFolderViewItem * createFolderViewItem(LLInvFVBridge * bridge);
+
+    void onRemoveItemFreshness(const LLUUID& item_id);
 };
 
 
@@ -77,6 +79,7 @@ public:
 	void deFreshify();
 
 	bool isFresh() const { return mFresh; }
+    void setFresh(bool is_fresh)  { mFresh = is_fresh; }
 	
 protected:
 	bool mFresh;
@@ -108,6 +111,7 @@ public:
 	void deFreshify();
 
 	bool isFresh() const { return mFresh; }
+    void setFresh(bool is_fresh)  { mFresh = is_fresh; }
 
 protected:
 	bool mFresh;
@@ -125,11 +129,16 @@ public:
 	void load();
 	
 	void addFreshItem(const LLUUID& id) { mNewItemsIDs.insert(id); }
-	void removeItem(const LLUUID& id) { mNewItemsIDs.erase(id); }
+    void removeItem(const LLUUID& id);
 	bool isItemFresh(const LLUUID& id) { return (mNewItemsIDs.find(id) != mNewItemsIDs.end()); }
 
+    void addInboxPanel(LLInboxInventoryPanel* inbox) { mInboxPanels.insert(inbox); }
+    void removeInboxPanel(LLInboxInventoryPanel* inbox) { mInboxPanels.erase(inbox); }
+
 private:
 	std::set<LLUUID> mNewItemsIDs;
+
+    std::set<LLInboxInventoryPanel*> mInboxPanels;
 };
 
 #endif //LL_INBOXINVENTORYPANEL_H
-- 
cgit v1.2.3


From 1491eea28c9355ba3d69ce566ae5263e69db3daf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 22:47:31 +0300
Subject: SL-19652 Folder fetch dupplicate protection and over limit handling

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 44 ++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 4a9b471a47..0bb56c7d0c 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -408,6 +408,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 	// *TODO:  Think I'd like to get a shared pointer to this and share it
 	// among all the folder requests.
 	uuid_vec_t recursive_cats;
+    uuid_vec_t all_cats; // dupplicate avoidance
 
 	LLSD folder_request_body;
 	LLSD folder_request_body_lib;
@@ -436,7 +437,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 			{
 				const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
 		
-				if (cat)
+				if (cat && std::find(all_cats.begin(), all_cats.end(), cat_id) == all_cats.end())
 				{
 					if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
 					{
@@ -477,6 +478,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 			{
 				recursive_cats.push_back(cat_id);
 			}
+            all_cats.push_back(cat_id);
 		}
 		else
 		{
@@ -796,6 +798,46 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
 					  << LLCoreHttpUtil::responseToString(response) << "]" << LL_ENDL;
 
 	// Could use a 404 test here to try to detect revoked caps...
+
+    if(status == LLCore::HttpStatus(HTTP_FORBIDDEN))
+    {
+        // too large, split into two, assume that this isn't the library
+        const std::string url(gAgent.getRegionCapability("FetchInventoryDescendents2"));
+        S32 size = mRequestSD["folders"].size();
+
+        if (!gDisconnected && !LLApp::isExiting() && !url.empty() && size > 1)
+        {
+            LLSD folders;
+            uuid_vec_t recursive_cats;
+            LLSD::array_iterator iter = mRequestSD["folders"].beginArray();
+            LLSD::array_iterator end = mRequestSD["folders"].endArray();
+            while (iter != end)
+            {
+                folders.append(*iter);
+                LLUUID fodler_id = iter->get("folder_id").asUUID();
+                if (std::find(mRecursiveCatUUIDs.begin(), mRecursiveCatUUIDs.end(), fodler_id) != mRecursiveCatUUIDs.end())
+                {
+                    recursive_cats.push_back(fodler_id);
+                }
+                if (folders.size() == (S32)(size / 2))
+                {
+                    LLSD request_body;
+                    request_body["folders"] = folders;
+                    LLCore::HttpHandler::ptr_t  handler(new BGFolderHttpHandler(request_body, recursive_cats));
+                    gInventory.requestPost(false, url, request_body, handler, "Inventory Folder");
+                    recursive_cats.clear();
+                    folders.clear();
+                }
+                iter++;
+            }
+
+            LLSD request_body;
+            request_body["folders"] = folders;
+            LLCore::HttpHandler::ptr_t  handler(new BGFolderHttpHandler(request_body, recursive_cats));
+            gInventory.requestPost(false, url, request_body, handler, "Inventory Folder");
+            return;
+        }
+    }
 	
 	// This was originally the request retry logic for the inventory
 	// request which tested on HTTP_INTERNAL_ERROR status.  This
-- 
cgit v1.2.3


From 895ce616ea71b2001ec4e826b80310da80db9a0e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 Apr 2023 21:19:44 +0300
Subject: SL-19652 Fixed 'working' cursor flicker

---
 indra/llwindow/llwindow.h          | 3 ++-
 indra/newview/llinventorypanel.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 0edf39f6ef..802a3b5213 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -118,7 +118,8 @@ public:
 
 	// Sets cursor, may set to arrow+hourglass
 	virtual void setCursor(ECursorType cursor) { mNextCursor = cursor; };
-	virtual ECursorType getCursor() const;
+    virtual ECursorType getCursor() const;
+    virtual ECursorType getNextCursor() const { return mNextCursor; };
 	virtual void updateCursor() = 0;
 
 	virtual void captureMouse() = 0;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 8029486d6f..2799cb4cdf 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1268,8 +1268,10 @@ BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
 {
 	BOOL handled = LLView::handleHover(x, y, mask);
 	if(handled)
-	{
-		ECursorType cursor = getWindow()->getCursor();
+    {
+        // getCursor gets current cursor, setCursor sets next cursor
+        // check that children didn't set own 'next' cursor
+		ECursorType cursor = getWindow()->getNextCursor();
 		if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() && cursor == UI_CURSOR_ARROW)
 		{
 			// replace arrow cursor with arrow and hourglass cursor
-- 
cgit v1.2.3


From 0091fa0cbaba034da09d42d49f68c63f2cc7df14 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 26 Apr 2023 03:53:05 +0300
Subject: SL-19583 Uniform risizing for combination inventory view

---
 indra/newview/llaisapi.cpp                         |  21 ++--
 indra/newview/llaisapi.h                           |   1 +
 indra/newview/llinventorygallery.h                 |   1 +
 indra/newview/llpanelmaininventory.cpp             |  47 +++++++--
 indra/newview/llpanelmaininventory.h               |   3 +-
 .../skins/default/xui/en/panel_main_inventory.xml  | 114 ++++++++-------------
 6 files changed, 98 insertions(+), 89 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index e16029f063..6d13a06c54 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -924,6 +924,16 @@ void AISUpdate::clearParseResults()
 	mCategoryIds.clear();
 }
 
+void AISUpdate::checkTimeout()
+{
+    if (mTimer.hasExpired())
+    {
+        llcoro::suspend();
+        LLCoros::checkStop();
+        mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
+    }
+}
+
 void AISUpdate::parseUpdate(const LLSD& update)
 {
 	clearParseResults();
@@ -1281,12 +1291,7 @@ void AISUpdate::parseDescendentCount(const LLUUID& category_id, const LLSD& embe
 
 void AISUpdate::parseEmbedded(const LLSD& embedded, S32 depth)
 {
-    if (mTimer.hasExpired())
-    {
-        llcoro::suspend();
-        LLCoros::checkStop();
-        mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
-    }
+    checkTimeout();
 
 	if (embedded.has("links")) // _embedded in a category
 	{
@@ -1408,6 +1413,8 @@ void AISUpdate::parseEmbeddedCategories(const LLSD& categories, S32 depth)
 
 void AISUpdate::doUpdate()
 {
+    checkTimeout();
+
 	// Do version/descendant accounting.
 	for (std::map<LLUUID,S32>::const_iterator catit = mCatDescendentDeltas.begin();
 		 catit != mCatDescendentDeltas.end(); ++catit)
@@ -1571,6 +1578,8 @@ void AISUpdate::doUpdate()
 		}
 	}
 
+    checkTimeout();
+
 	gInventory.notifyObservers();
 }
 
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 1969448627..6afbbbd16e 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -123,6 +123,7 @@ public:
 	void doUpdate();
 private:
 	void clearParseResults();
+    void checkTimeout();
 
     // Debug is very log-heavy, give it more time or it will take forever to process
     // Todo: find a way to make throttle static isntead of per-request
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 1760535524..2cf038b7d8 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -128,6 +128,7 @@ public:
     bool hasDescendents(const LLUUID& cat_id);
     bool hasVisibleItems();
     void handleModifiedFilter();
+    LLScrollContainer* getScrollableContainer() { return mScrollPanel; }
 
 protected:
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 98099dd407..7cd6d7cb82 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -266,6 +266,8 @@ BOOL LLPanelMainInventory::postBuild()
     comb_gallery_filter.markDefault();
     mCombinationGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, true));
 
+    mCombinationScroller = getChild<LLView>("combination_scroller");
+
 	initListCommandsHandlers();
 
 	const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
@@ -928,6 +930,7 @@ void LLPanelMainInventory::draw()
 		mActivePanel->setSortOrder(order);
 		mResortActivePanel = false;
 	}
+
 	LLPanel::draw();
 	updateItemcountText();
     updateCombinationVisibility();
@@ -1503,7 +1506,7 @@ void LLPanelMainInventory::toggleViewMode()
     getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
     getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
     getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
-    getChild<LLPanel>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
+    getChild<LLUICtrl>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
     getChild<LLLayoutPanel>("nav_buttons")->setVisible(mSingleFolderMode);
     getChild<LLButton>("view_mode_btn")->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
 
@@ -2214,19 +2217,41 @@ void LLPanelMainInventory::updateCombinationVisibility()
 {
     if(mSingleFolderMode && isCombinationViewMode())
     {
-        bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
-        bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
-        getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
-        getChild<LLLayoutPanel>("comb_inventory_layout")->setVisible(show_inv_pane);
-        mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
-        if(mCombinationInventoryPanel->hasVisibleItems())
+        LLRect inner_rect = mCombinationInventoryPanel->getScrollableContainer()->getScrolledViewRect();
+        LLRect inv_rect = mCombinationInventoryPanel->getRect();
+        inv_rect.mBottom = 0;
+        inv_rect.mRight = inv_rect.mLeft + inner_rect.getWidth();
+        if (!mCombinationGalleryPanel->hasVisibleItems() || mCombinationInventoryPanel->hasVisibleItems())
+        {
+            inv_rect.mTop = inv_rect.mBottom + inner_rect.getHeight();
+        }
+        else
         {
-            mForceShowInvLayout = false;
+            inv_rect.mTop = inv_rect.mBottom;
         }
-        if(is_gallery_empty)
+
+        inner_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
+        LLRect galery_rect = mCombinationGalleryPanel->getRect();
+        galery_rect.mBottom = inv_rect.mTop;
+        if (mCombinationGalleryPanel->hasVisibleItems())
         {
-            mCombinationGalleryPanel->handleModifiedFilter();
+            mCombinationGalleryPanel->setVisible(true);
+            galery_rect.mTop = galery_rect.mBottom + inner_rect.getHeight();
         }
+        else
+        {
+            mCombinationGalleryPanel->setVisible(false);
+            galery_rect.mTop = galery_rect.mBottom;
+        }
+
+        LLRect scroller_rect = mCombinationScroller->getRect();
+        scroller_rect.mBottom = 0;
+        scroller_rect.mTop = scroller_rect.mBottom + inv_rect.getHeight() + galery_rect.getHeight();
+        scroller_rect.mRight = scroller_rect.mLeft + llmax(inv_rect.getWidth(), galery_rect.getWidth());
+
+        mCombinationScroller->setRect(scroller_rect);
+        mCombinationGalleryPanel->handleReshape(galery_rect, false);
+        mCombinationInventoryPanel->handleReshape(inv_rect, false);
         
         getActivePanel()->getRootFolder();
     }
@@ -2293,7 +2318,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
 
         getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
         getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
-        getChild<LLPanel>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
+        getChild<LLUICtrl>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
 
         if(isListViewMode())
         {
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index e5b9ba929d..8e7ad776b0 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -143,8 +143,6 @@ protected:
 
 	static BOOL filtersVisible(void* user_data);
 	void onClearSearch();
-	static void onFoldersByName(void *user_data);
-	static BOOL checkFoldersByName(void *user_data);
 	
 	static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
 	void onFilterSelected();
@@ -196,6 +194,7 @@ private:
 
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
+    LLView* mCombinationScroller;
 
     boost::signals2::connection mListViewRootUpdatedConnection;
     boost::signals2::connection mGalleryRootUpdatedConnection;
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 5bc0113367..f772c1fde2 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -327,7 +327,7 @@
        follows="all"
        layout="topleft" />
     </panel>
-    <panel
+    <scroll_container
      follows="all"
      halign="center"
      height="372"
@@ -337,74 +337,48 @@
      top_delta="0"
      visible="false"
      width="312">
-     <layout_stack
-      follows="all"
-      height="372"
-      width="312"
-      animate="false"
-      drag_handle_gap="13"
-      drag_handle_thickness="6"
-      drag_handle_first_indent="18"
-      drag_handle_second_indent="18"
-      drag_handle_color="AddPaymentPanel"
-      drag_handle_shift="5"
-      show_drag_handle="true"
-      top="0"
-      left="0"
-      orientation="vertical">
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="246"
-        width="312"
-        min_width="150"
-        name="comb_gallery_layout">
-        <panel
-         class="inventory_gallery"
-         filename="panel_inventory_gallery.xml"
-         left="0"
-         top_pad="0"
-         height="246"
-         width="312"
-         name="comb_gallery_view_inv"
-         background_visible="true"
-         follows="all"
-         layout="topleft">
+           <panel
+            name="combination_scroller"
+            follows="all"
+            layout="topleft"
+            left="0"
+            top="0"
+            height="20"
+            width="291">
+            <panel
+             class="inventory_gallery"
+             filename="panel_inventory_gallery.xml"
+             follows="left|right"
+             layout="topleft"
+             left="0"
+             top="0"
+             height="10"
+             width="290"
+             name="comb_gallery_view_inv"
+             background_visible="true">
+            </panel>
+            <single_folder_inventory_panel
+             name="comb_single_folder_inv"
+             follows="left|right"
+             layout="topleft"
+             left="0"
+             top="200"
+             height="10"
+             width="290"
+             show_item_link_overlays="true"
+             bg_opaque_color="DkGray2"
+             bg_alpha_color="DkGray2"
+             background_visible="true"
+             border="false"
+             bevel_style="none"
+             scroll.reserve_scroll_corner="false">
+                <item
+                 single_folder_mode="true"
+                 folder_indentation="-8"/>
+                <folder
+                 single_folder_mode="true"
+                 folder_indentation="-8"/>
+            </single_folder_inventory_panel>
         </panel>
-       </layout_panel>
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="126"
-        width="312"
-        name="comb_inventory_layout">
-        <single_folder_inventory_panel
-         name="comb_single_folder_inv"
-         follows="all"
-         left="0"
-         top="1"
-         height="126"
-         width="312"
-         layout="topleft"
-         show_item_link_overlays="true"
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         border="false"
-         bevel_style="none"
-         scroll.reserve_scroll_corner="false">
-         <item
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-         <folder
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-        </single_folder_inventory_panel>
-       </layout_panel>
-     </layout_stack>
-    </panel>
+    </scroll_container>
 </panel>
-- 
cgit v1.2.3


From 697d3be3c9906a6d578a961710fc43816b6adeae Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Apr 2023 01:30:57 +0300
Subject: SL-19533 Implement subset variant of children request

---
 indra/newview/llaisapi.cpp                        | 158 ++++++++++++++----
 indra/newview/llaisapi.h                          |  13 +-
 indra/newview/llappearancemgr.cpp                 |  13 +-
 indra/newview/llinventorymodelbackgroundfetch.cpp | 195 +++++++++++++++++++---
 indra/newview/llinventorymodelbackgroundfetch.h   |   6 +-
 5 files changed, 320 insertions(+), 65 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 6d13a06c54..c17b246ef1 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -51,6 +51,10 @@ std::list<AISAPI::ais_query_item_t> AISAPI::sPostponedQuery;
 
 const S32 MAX_SIMULTANEOUS_COROUTINES = 2048;
 
+// AIS3 allows '*' requests, but in reality those will be cut at some point
+// Specify own depth to be able to anticipate it and mark folders as incomplete
+const S32 MAX_FOLDER_DEPTH_REQUEST = 50;
+
 //-------------------------------------------------------------------------
 /*static*/
 bool AISAPI::isAvailable()
@@ -458,11 +462,11 @@ void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool rec
     {
         // can specify depth=*, but server side is going to cap requests
         // and reject everything 'over the top',.
-        depth = 50;
+        depth = MAX_FOLDER_DEPTH_REQUEST;
     }
     else
     {
-        depth = llmin(depth, 50);
+        depth = llmin(depth, MAX_FOLDER_DEPTH_REQUEST);
     }
 
     url += "?depth=" + std::to_string(depth);
@@ -511,11 +515,11 @@ void AISAPI::FetchCategoryChildren(const std::string &identifier, bool recursive
     {
         // can specify depth=*, but server side is going to cap requests
         // and reject everything 'over the top',.
-        depth = 50;
+        depth = MAX_FOLDER_DEPTH_REQUEST;
     }
     else
     {
-        depth = llmin(depth, 50);
+        depth = llmin(depth, MAX_FOLDER_DEPTH_REQUEST);
     }
 
     url += "?depth=" + std::to_string(depth);
@@ -562,11 +566,11 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
     {
         // can specify depth=*, but server side is going to cap requests
         // and reject everything 'over the top',.
-        depth = 50;
+        depth = MAX_FOLDER_DEPTH_REQUEST;
     }
     else
     {
-        depth = llmin(depth, 50);
+        depth = llmin(depth, MAX_FOLDER_DEPTH_REQUEST);
     }
 
     url += "?depth=" + std::to_string(depth);
@@ -592,6 +596,83 @@ void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool r
     EnqueueAISCommand("FetchCategoryCategories", proc);
 }
 
+void AISAPI::FetchCategorySubset(const LLUUID& catId,
+                                   const uuid_vec_t specificChildren,
+                                   ITEM_TYPE type,
+                                   bool recursive,
+                                   completion_t callback,
+                                   S32 depth)
+{
+    std::string cap = (type == INVENTORY) ? getInvCap() : getLibCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
+        return;
+    }
+    if (specificChildren.empty())
+    {
+        LL_WARNS("Inventory") << "Empty request!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
+        return;
+    }
+    // category/any_folder_id/children?depth=*&children=child_id1,child_id2,child_id3
+    std::string url = cap + std::string("/category/") + catId.asString() + "/children";
+
+    if (recursive)
+    {
+        depth = MAX_FOLDER_DEPTH_REQUEST;
+    }
+    else
+    {
+        depth = llmin(depth, MAX_FOLDER_DEPTH_REQUEST);
+    }
+
+    uuid_vec_t::const_iterator iter = specificChildren.begin();
+    uuid_vec_t::const_iterator end = specificChildren.end();
+
+    url += "?depth=" + std::to_string(depth) + "&children=" + iter->asString();
+    iter++;
+
+    while (iter != end)
+    {
+        url += "," + iter->asString();
+        iter++;
+    }
+
+    const S32 MAX_URL_LENGH = 2000; // RFC documentation specifies a maximum length of 2048
+    if (url.length() > MAX_URL_LENGH)
+    {
+        LL_WARNS("Inventory") << "Request url is too long, url: " << url << LL_ENDL;
+    }
+
+    invokationFn_t getFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string&, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    // get doesn't use body, can pass additional data
+    LLSD body;
+    body["depth"] = depth;
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+                                                         _1, getFn, url, catId, body, callback, FETCHCATEGORYSUBSET));
+
+    EnqueueAISCommand("FetchCategorySubset", proc);
+}
+
 /*static*/
 // Will get COF folder, links in it and items those links point to
 void AISAPI::FetchCOF(completion_t callback)
@@ -710,7 +791,7 @@ void AISAPI::onIdle(void *userdata)
 }
 
 /*static*/
-void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type, const LLSD& request_body)
+void AISAPI::onUpdateReceived(const LLSD& update, COMMAND_TYPE type, const LLSD& request_body)
 {
     LLTimer timer;
     if ( (type == UPDATECATEGORY || type == UPDATEITEM)
@@ -718,18 +799,8 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
     {
         dump_sequential_xml(gAgentAvatarp->getFullname() + "_ais_update", update);
     }
-    bool is_fetch = (type == FETCHITEM)
-        || (type == FETCHCATEGORYCHILDREN)
-        || (type == FETCHCATEGORYCATEGORIES)
-        || (type == FETCHCOF)
-        || (type == FETCHORPHANS);
-    // parse update llsd into stuff to do or parse received items.
-    S32 depth = 0;
-    if (is_fetch && request_body.has("depth"))
-    {
-        depth = request_body["depth"].asInteger();
-    }
-    AISUpdate ais_update(update, is_fetch, depth);
+
+    AISUpdate ais_update(update, type, request_body);
     ais_update.doUpdate(); // execute the updates in the appropriate order.
     LL_DEBUGS("Inventory", "AIS3") << "Elapsed processing: " << timer.getElapsedTimeF32() << LL_ENDL;
 }
@@ -833,7 +904,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     }
 
 	LL_DEBUGS("Inventory", "AIS3") << "Result: " << result << LL_ENDL;
-    onUpdateReceived("AISCommand", result, type, body);
+    onUpdateReceived(result, type, body);
 
     if (callback && !callback.empty())
     {
@@ -900,10 +971,22 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
 }
 
 //-------------------------------------------------------------------------
-AISUpdate::AISUpdate(const LLSD& update, bool fetch, S32 depth)
-: mFetch(fetch)
-, mFetchDepth(depth)
+AISUpdate::AISUpdate(const LLSD& update, AISAPI::COMMAND_TYPE type, const LLSD& request_body)
+: mType(type)
 {
+    mFetch = (type == AISAPI::FETCHITEM)
+        || (type == AISAPI::FETCHCATEGORYCHILDREN)
+        || (type == AISAPI::FETCHCATEGORYCATEGORIES)
+        || (type == AISAPI::FETCHCATEGORYSUBSET)
+        || (type == AISAPI::FETCHCOF)
+        || (type == AISAPI::FETCHORPHANS);
+    // parse update llsd into stuff to do or parse received items.
+    mFetchDepth = MAX_FOLDER_DEPTH_REQUEST;
+    if (mFetch && request_body.has("depth"))
+    {
+        mFetchDepth = request_body["depth"].asInteger();
+    }
+
     mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
     mTimer.start();
 	parseUpdate(update);
@@ -1023,17 +1106,26 @@ void AISUpdate::parseContent(const LLSD& update)
 {
 	if (update.has("linked_id"))
 	{
-		parseLink(update);
+		parseLink(update, mFetchDepth);
 	}
 	else if (update.has("item_id"))
 	{
 		parseItem(update);
 	}
 
-	if (update.has("category_id"))
-	{
-		parseCategory(update, mFetchDepth);
-	}
+    if (mType == AISAPI::FETCHCATEGORYSUBSET)
+    {
+        // initial category is incomplete, don't process it,
+        // go for content instead
+        if (update.has("_embedded"))
+        {
+            parseEmbedded(update["_embedded"], mFetchDepth - 1);
+        }
+    }
+    else if (update.has("category_id"))
+    {
+        parseCategory(update, mFetchDepth);
+    }
 	else
 	{
 		if (update.has("_embedded"))
@@ -1089,7 +1181,7 @@ void AISUpdate::parseItem(const LLSD& item_map)
 	}
 }
 
-void AISUpdate::parseLink(const LLSD& link_map)
+void AISUpdate::parseLink(const LLSD& link_map, S32 depth)
 {
 	LLUUID item_id = link_map["item_id"].asUUID();
 	LLPointer<LLViewerInventoryItem> new_link(new LLViewerInventoryItem);
@@ -1145,7 +1237,7 @@ void AISUpdate::parseLink(const LLSD& link_map)
 
         if (link_map.has("_embedded"))
         {
-            parseEmbedded(link_map["_embedded"], S32_MAX);
+            parseEmbedded(link_map["_embedded"], depth);
         }
 	}
 	else
@@ -1295,7 +1387,7 @@ void AISUpdate::parseEmbedded(const LLSD& embedded, S32 depth)
 
 	if (embedded.has("links")) // _embedded in a category
 	{
-		parseEmbeddedLinks(embedded["links"]);
+		parseEmbeddedLinks(embedded["links"], depth);
 	}
 	if (embedded.has("items")) // _embedded in a category
 	{
@@ -1328,7 +1420,7 @@ void AISUpdate::parseUUIDArray(const LLSD& content, const std::string& name, uui
 	}
 }
 
-void AISUpdate::parseEmbeddedLinks(const LLSD& links)
+void AISUpdate::parseEmbeddedLinks(const LLSD& links, S32 depth)
 {
 	for(LLSD::map_const_iterator linkit = links.beginMap(),
 			linkend = links.endMap();
@@ -1342,7 +1434,7 @@ void AISUpdate::parseEmbeddedLinks(const LLSD& links)
 		}
 		else
 		{
-			parseLink(link_map);
+			parseLink(link_map, depth);
 		}
 	}
 }
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 6afbbbd16e..691c5db592 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -59,11 +59,11 @@ public:
     static void FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryChildren(const std::string &identifier, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchCategorySubset(const LLUUID& catId, const uuid_vec_t specificChildren, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCOF(completion_t callback = completion_t());
     static void FetchOrphans(completion_t callback = completion_t() );
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
-private:
     typedef enum {
         COPYINVENTORY,
         SLAMFOLDER,
@@ -77,10 +77,12 @@ private:
         FETCHITEM,
         FETCHCATEGORYCHILDREN,
         FETCHCATEGORYCATEGORIES,
+        FETCHCATEGORYSUBSET,
         FETCHCOF,
         FETCHORPHANS,
     } COMMAND_TYPE;
 
+private:
     static const std::string INVENTORY_CAP_NAME;
     static const std::string LIBRARY_CAP_NAME;
 
@@ -89,7 +91,7 @@ private:
 
     static void EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc);
     static void onIdle(void *userdata); // launches postponed AIS commands
-    static void onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type, const LLSD& request_body);
+    static void onUpdateReceived(const LLSD& update, COMMAND_TYPE type, const LLSD& request_body);
 
     static std::string getInvCap();
     static std::string getLibCap();
@@ -105,17 +107,17 @@ private:
 class AISUpdate
 {
 public:
-	AISUpdate(const LLSD& update, bool fetch, S32 depth);
+	AISUpdate(const LLSD& update, AISAPI::COMMAND_TYPE type, const LLSD& request_body);
 	void parseUpdate(const LLSD& update);
 	void parseMeta(const LLSD& update);
 	void parseContent(const LLSD& update);
 	void parseUUIDArray(const LLSD& content, const std::string& name, uuid_list_t& ids);
-	void parseLink(const LLSD& link_map);
+	void parseLink(const LLSD& link_map, S32 depth);
 	void parseItem(const LLSD& link_map);
 	void parseCategory(const LLSD& link_map, S32 depth);
 	void parseDescendentCount(const LLUUID& category_id, const LLSD& embedded);
 	void parseEmbedded(const LLSD& embedded, S32 depth);
-	void parseEmbeddedLinks(const LLSD& links);
+	void parseEmbeddedLinks(const LLSD& links, S32 depth);
 	void parseEmbeddedItems(const LLSD& items);
 	void parseEmbeddedCategories(const LLSD& categories, S32 depth);
 	void parseEmbeddedItem(const LLSD& item);
@@ -151,6 +153,7 @@ private:
     bool mFetch;
     S32 mFetchDepth;
     LLTimer mTimer;
+    AISAPI::COMMAND_TYPE mType;
 };
 
 #endif
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index d79525ec62..4133470973 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4568,7 +4568,18 @@ void callAfterCOFFetch(nullary_func_t cb)
     if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN && AISAPI::isAvailable())
     {
         // Assume that we have no relevant cache. Fetch cof, and items cof's links point to.
-        AISAPI::FetchCOF([cb](const LLUUID& id) { cb(); });
+        AISAPI::FetchCOF([cb](const LLUUID& id)
+                         {
+                             cb();
+                             LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
+                             LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
+                             if (cat)
+                             {
+                                 cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+                             }
+                         });
+        // Mark it so that background fetch won't request it if it didn't already
+        cat->setFetching(LLViewerInventoryCategory::FETCH_RECURSIVE);
     }
     else
     {
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index c5fb40409f..b8fdfab98a 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -299,7 +299,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
                     // Not only root folder can be massive, but
                     // most system folders will be requested independently
                     // so request root folder and content separately
-                    mFetchFolderQueue.push_front(FetchQueueInfo(gInventory.getRootFolderID(), FT_CONTENT_RECURSIVE));
+                    mFetchFolderQueue.push_front(FetchQueueInfo(gInventory.getRootFolderID(), FT_FOLDER_AND_CONTENT));
                 }
                 else
                 {
@@ -455,10 +455,67 @@ void ais_simple_item_callback(const LLUUID& inv_id)
     LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
 }
 
-void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion)
+void LLInventoryModelBackgroundFetch::onAISContentCalback(
+    const LLUUID& request_id,
+    const uuid_vec_t& content_ids,
+    const LLUUID& response_id,
+    EFetchType fetch_type)
 {
+    // Don't push_front on failure - there is a chance it was fired from inside bulkFetchViaAis
     incrFetchFolderCount(-1);
-    std::list<LLUUID>::const_iterator found = std::find(mExpectedFolderIds.begin() , mExpectedFolderIds.end(), request_id);
+
+    uuid_vec_t::const_iterator folder_iter = content_ids.begin();
+    uuid_vec_t::const_iterator folder_end = content_ids.end();
+    while (folder_iter != folder_end)
+    {
+        std::list<LLUUID>::const_iterator found = std::find(mExpectedFolderIds.begin(), mExpectedFolderIds.end(), *folder_iter);
+        if (found != mExpectedFolderIds.end())
+        {
+            mExpectedFolderIds.erase(found);
+        }
+
+        LLViewerInventoryCategory* cat(gInventory.getCategory(*folder_iter));
+        if (cat)
+        {
+            cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+        }
+        if (response_id.isNull())
+        {
+            // Failed to fetch, get it individually
+            mFetchFolderQueue.push_back(FetchQueueInfo(*folder_iter, FT_RECURSIVE));
+        }
+        else
+        {
+            // push descendant back to verify they are fetched fully (ex: didn't encounter depth limit)
+            LLInventoryModel::cat_array_t* categories(NULL);
+            LLInventoryModel::item_array_t* items(NULL);
+            gInventory.getDirectDescendentsOf(*folder_iter, categories, items);
+            if (categories)
+            {
+                for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin();
+                     it != categories->end();
+                     ++it)
+                {
+                    mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
+                }
+            }
+        }
+
+        folder_iter++;
+    }
+
+    if (!mFetchFolderQueue.empty())
+    {
+        mBackgroundFetchActive = true;
+        mFolderFetchActive = true;
+        gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+    }
+}
+void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType fetch_type)
+{
+    // Don't push_front on failure - there is a chance it was fired from inside bulkFetchViaAis
+    incrFetchFolderCount(-1);
+    std::list<LLUUID>::const_iterator found = std::find(mExpectedFolderIds.begin(), mExpectedFolderIds.end(), request_id);
     if (found != mExpectedFolderIds.end())
     {
         mExpectedFolderIds.erase(found);
@@ -480,32 +537,34 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
     if (response_id.isNull()) // Failure
     {
         LL_DEBUGS(LOG_INV , "AIS3") << "Failure response for folder " << request_id << LL_ENDL;
-        if (recursion == FT_RECURSIVE)
+        if (fetch_type == FT_RECURSIVE)
         {
             // A full recursive request failed.
             // Try requesting folder and nested content separately
-            mBackgroundFetchActive = true;
-            mFolderFetchActive = true;
-            mFetchFolderQueue.push_front(FetchQueueInfo(request_id, FT_CONTENT_RECURSIVE));
-            gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+            mFetchFolderQueue.push_back(FetchQueueInfo(request_id, FT_FOLDER_AND_CONTENT));
         }
-        else if (recursion == FT_CONTENT_RECURSIVE)
+        else if (fetch_type == FT_FOLDER_AND_CONTENT)
         {
             LL_WARNS() << "Failed to download folder: " << request_id << " Requesting known content separately" << LL_ENDL;
-            request_descendants = true;
+            mFetchFolderQueue.push_back(FetchQueueInfo(request_id, FT_CONTENT_RECURSIVE));
         }
     }
     else
     {
-        if (recursion == FT_CONTENT_RECURSIVE || recursion == FT_RECURSIVE)
+        if (fetch_type == FT_RECURSIVE)
         {
-            // Got the folder, now recursively request content
+            // Got the folder and content, now verify content
             // Request content even for FT_RECURSIVE in case of changes, failures
             // or if depth limit gets imlemented.
             // This shouldn't redownload folders if they already have version
             request_descendants = true;
             LL_DEBUGS(LOG_INV, "AIS3") << "Got folder " << request_id << ". Requesting content" << LL_ENDL;
         }
+        else if (fetch_type == FT_FOLDER_AND_CONTENT)
+        {
+            // readd folder for content request
+            mFetchFolderQueue.push_front(FetchQueueInfo(request_id, FT_CONTENT_RECURSIVE));
+        }
         else
         {
             LL_DEBUGS(LOG_INV, "AIS3") << "Got folder " << request_id << "." << LL_ENDL;
@@ -524,17 +583,18 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
                  it != categories->end();
                  ++it)
             {
-                mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
-            }
-            if (!mFetchFolderQueue.empty())
-            {
-                mBackgroundFetchActive = true;
-                mFolderFetchActive = true;
-                gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+                mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
             }
         }
     }
 
+    if (!mFetchFolderQueue.empty())
+    {
+        mBackgroundFetchActive = true;
+        mFolderFetchActive = true;
+        gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+    }
+
     // done
     LLViewerInventoryCategory * cat(gInventory.getCategory(request_id));
     if (cat)
@@ -555,9 +615,9 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     }
 
     static LLCachedControl<U32> ais_pool(gSavedSettings, "PoolSizeAIS", 20);
-    // Don't have too many requests at once
+    // Don't have too many requests at once, AIS throttles
     // Reserve one request for actions outside of fetch (like renames)
-    const U32 max_concurrent_fetches = llmax(1, ais_pool - 1);
+    const U32 max_concurrent_fetches = llclamp(ais_pool - 1, 1, 50);
 
     if (mFetchCount >= max_concurrent_fetches)
     {
@@ -663,10 +723,97 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
             LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
             if (cat)
             {
-                if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion() || fetch_info.mFetchType == FT_FORCED)
+                if (fetch_info.mFetchType == FT_CONTENT_RECURSIVE)
+                {
+                    // fetch content only, ignore cat itself
+                    uuid_vec_t children;
+                    LLInventoryModel::cat_array_t* categories(NULL);
+                    LLInventoryModel::item_array_t* items(NULL);
+                    gInventory.getDirectDescendentsOf(cat_id, categories, items);
+
+                    LLViewerInventoryCategory::EFetchType target_state =
+                        fetch_info.mFetchType > FT_CONTENT_RECURSIVE
+                        ? LLViewerInventoryCategory::FETCH_RECURSIVE
+                        : LLViewerInventoryCategory::FETCH_NORMAL;
+                    // technically limit is 'as many as you can put into url', but for now stop at 10
+                    const S32 batch_limit = 10;
+                    bool content_done = true;
+
+                    for (LLInventoryModel::cat_array_t::iterator it = categories->begin();
+                         it != categories->end();
+                         ++it)
+                    {
+                        LLViewerInventoryCategory* child_cat = (*it);
+                        if (LLViewerInventoryCategory::VERSION_UNKNOWN != child_cat->getVersion()
+                            || child_cat->getFetching() >= target_state)
+                        {
+                            // push it back to verify everything inside is fetched
+                            mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
+                            continue;
+                        }
+
+                        if (child_cat->getPreferredType() == LLFolderType::FT_MARKETPLACE_LISTINGS)
+                        {
+                            // special case
+                            content_done = false;
+                            if (children.empty())
+                            {
+                                // fetch marketplace alone
+                                children.push_back(child_cat->getUUID());
+                                mExpectedFolderIds.push_back(child_cat->getUUID());
+                                child_cat->setFetching(target_state);
+                                break;
+                            }
+                            else
+                            {
+                                // fetch marketplace alone next run
+                                continue;
+                            }
+                        }
+
+                        children.push_back(child_cat->getUUID());
+                        mExpectedFolderIds.push_back(child_cat->getUUID());
+                        child_cat->setFetching(target_state);
+
+                        if (children.size() >= batch_limit)
+                        {
+                            content_done = false;
+                            break;
+                        }
+                    }
+
+                    if (!children.empty())
+                    {
+                        // increment before call in case of immediate callback
+                        incrFetchFolderCount(1);
+
+                        EFetchType type = fetch_info.mFetchType;
+                        LLUUID cat_id = cat->getUUID(); // need a copy for lambda
+                        AISAPI::completion_t cb = [cat_id, children, type](const LLUUID& response_id)
+                        {
+                            LLInventoryModelBackgroundFetch::instance().onAISContentCalback(cat_id, children, response_id, type);
+                        };
+
+                        AISAPI::ITEM_TYPE item_type = AISAPI::INVENTORY;
+                        if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
+                        {
+                            item_type = AISAPI::LIBRARY;
+                        }
+
+                        AISAPI::FetchCategorySubset(cat_id, children, item_type, true, cb, 0);
+                    }
+
+                    if (!content_done)
+                    {
+                        // send it back to get the rest
+                        mFetchFolderQueue.push_back(FetchQueueInfo(cat_id, FT_CONTENT_RECURSIVE));
+                    }
+                }
+                else if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion()
+                         || fetch_info.mFetchType == FT_FORCED)
                 {
                     LLViewerInventoryCategory::EFetchType target_state =
-                        fetch_info.mFetchType >= FT_CONTENT_RECURSIVE
+                        fetch_info.mFetchType > FT_CONTENT_RECURSIVE
                         ? LLViewerInventoryCategory::FETCH_RECURSIVE
                         : LLViewerInventoryCategory::FETCH_NORMAL;
                     // start again if we did a non-recursive fetch before
@@ -711,7 +858,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                         }
                     }
                 }
-            } // else?
+            } // else try to fetch folder either way?
         }
     }
     else
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 363d04486d..1fd7426312 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -82,8 +82,9 @@ protected:
 
     typedef enum {
         FT_DEFAULT = 0,
-        FT_FORCED, // request even if already loaded
+        FT_FORCED, // request non-recursively even if already loaded
         FT_CONTENT_RECURSIVE, // request content recursively
+        FT_FOLDER_AND_CONTENT, // request content recursively
         FT_RECURSIVE, // request everything recursively
     } EFetchType;
     struct FetchQueueInfo
@@ -100,7 +101,8 @@ protected:
     };
     typedef std::deque<FetchQueueInfo> fetch_queue_t;
 
-    void onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType recursion);
+    void onAISContentCalback(const LLUUID& request_id, const uuid_vec_t &content_ids, const LLUUID& response_id, EFetchType fetch_type);
+    void onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType fetch_type);
     void bulkFetchViaAis();
     void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
 	void bulkFetch();
-- 
cgit v1.2.3


From 30b87c11e92f1917aec95662f95a8e5a136c937e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 27 Apr 2023 18:23:56 +0300
Subject: SL-19583 WIP fixed the issue with item selection and restored filter
 handling for gallery panel

---
 indra/newview/llpanelmaininventory.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 7cd6d7cb82..b9099bbebf 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2217,26 +2217,31 @@ void LLPanelMainInventory::updateCombinationVisibility()
 {
     if(mSingleFolderMode && isCombinationViewMode())
     {
-        LLRect inner_rect = mCombinationInventoryPanel->getScrollableContainer()->getScrolledViewRect();
+        if (!mCombinationGalleryPanel->hasVisibleItems())
+        {
+            mCombinationGalleryPanel->handleModifiedFilter();
+        }
         LLRect inv_rect = mCombinationInventoryPanel->getRect();
+        LLRect inv_inner_rect = mCombinationInventoryPanel->getScrollableContainer()->getScrolledViewRect();
+        LLRect galery_rect = mCombinationGalleryPanel->getRect();
+        LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
+
         inv_rect.mBottom = 0;
-        inv_rect.mRight = inv_rect.mLeft + inner_rect.getWidth();
+        inv_rect.mRight = inv_rect.mLeft + inv_inner_rect.getWidth();
         if (!mCombinationGalleryPanel->hasVisibleItems() || mCombinationInventoryPanel->hasVisibleItems())
         {
-            inv_rect.mTop = inv_rect.mBottom + inner_rect.getHeight();
+            inv_rect.mTop = inv_rect.mBottom + inv_inner_rect.getHeight();
         }
         else
         {
             inv_rect.mTop = inv_rect.mBottom;
         }
 
-        inner_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
-        LLRect galery_rect = mCombinationGalleryPanel->getRect();
         galery_rect.mBottom = inv_rect.mTop;
         if (mCombinationGalleryPanel->hasVisibleItems())
         {
             mCombinationGalleryPanel->setVisible(true);
-            galery_rect.mTop = galery_rect.mBottom + inner_rect.getHeight();
+            galery_rect.mTop = galery_rect.mBottom + inner_galery_rect.getHeight();
         }
         else
         {
@@ -2244,16 +2249,9 @@ void LLPanelMainInventory::updateCombinationVisibility()
             galery_rect.mTop = galery_rect.mBottom;
         }
 
-        LLRect scroller_rect = mCombinationScroller->getRect();
-        scroller_rect.mBottom = 0;
-        scroller_rect.mTop = scroller_rect.mBottom + inv_rect.getHeight() + galery_rect.getHeight();
-        scroller_rect.mRight = scroller_rect.mLeft + llmax(inv_rect.getWidth(), galery_rect.getWidth());
-
-        mCombinationScroller->setRect(scroller_rect);
+        mCombinationScroller->reshape(llmax(inv_rect.getWidth(), galery_rect.getWidth()), inv_rect.getHeight() + galery_rect.getHeight(), true);
         mCombinationGalleryPanel->handleReshape(galery_rect, false);
         mCombinationInventoryPanel->handleReshape(inv_rect, false);
-        
-        getActivePanel()->getRootFolder();
     }
 }
 
-- 
cgit v1.2.3


From 7bb564496997e26a4c9770cb509955d0a22d1617 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Apr 2023 20:23:13 +0300
Subject: SL-19533 Subset fetch fixes

---
 indra/newview/llaisapi.cpp                        |  2 ++
 indra/newview/llinventorymodelbackgroundfetch.cpp | 28 ++++++++++++++++-------
 indra/newview/llinventorymodelbackgroundfetch.h   |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index c17b246ef1..e63d77cea3 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -916,6 +916,8 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         case COPYLIBRARYCATEGORY:
         case FETCHCATEGORYCATEGORIES:
         case FETCHCATEGORYCHILDREN:
+        case FETCHCATEGORYSUBSET:
+        case FETCHCOF:
             if (result.has("category_id"))
             {
                 id = result["category_id"];
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index b8fdfab98a..3a2120750b 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -731,10 +731,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                     LLInventoryModel::item_array_t* items(NULL);
                     gInventory.getDirectDescendentsOf(cat_id, categories, items);
 
-                    LLViewerInventoryCategory::EFetchType target_state =
-                        fetch_info.mFetchType > FT_CONTENT_RECURSIVE
-                        ? LLViewerInventoryCategory::FETCH_RECURSIVE
-                        : LLViewerInventoryCategory::FETCH_NORMAL;
+                    LLViewerInventoryCategory::EFetchType target_state = LLViewerInventoryCategory::FETCH_RECURSIVE;
                     // technically limit is 'as many as you can put into url', but for now stop at 10
                     const S32 batch_limit = 10;
                     bool content_done = true;
@@ -747,8 +744,6 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                         if (LLViewerInventoryCategory::VERSION_UNKNOWN != child_cat->getVersion()
                             || child_cat->getFetching() >= target_state)
                         {
-                            // push it back to verify everything inside is fetched
-                            mFetchFolderQueue.push_back(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
                             continue;
                         }
 
@@ -759,6 +754,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                             if (children.empty())
                             {
                                 // fetch marketplace alone
+                                // Should it actually be fetched as FT_FOLDER_AND_CONTENT?
                                 children.push_back(child_cat->getUUID());
                                 mExpectedFolderIds.push_back(child_cat->getUUID());
                                 child_cat->setFetching(target_state);
@@ -803,7 +799,23 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                         AISAPI::FetchCategorySubset(cat_id, children, item_type, true, cb, 0);
                     }
 
-                    if (!content_done)
+                    if (content_done)
+                    {
+                        // This will have a bit of overlap with onAISContentCalback,
+                        // but something else might have dowloaded folders, so verify
+                        // every child that is complete has it's children done as well
+                        for (LLInventoryModel::cat_array_t::iterator it = categories->begin();
+                             it != categories->end();
+                             ++it)
+                        {
+                            LLViewerInventoryCategory* child_cat = (*it);
+                            if (LLViewerInventoryCategory::VERSION_UNKNOWN != child_cat->getVersion())
+                            {
+                                mFetchFolderQueue.push_back(FetchQueueInfo(child_cat->getUUID(), FT_RECURSIVE));
+                            }
+                        }
+                    }
+                    else
                     {
                         // send it back to get the rest
                         mFetchFolderQueue.push_back(FetchQueueInfo(cat_id, FT_CONTENT_RECURSIVE));
@@ -844,7 +856,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                 else
                 {
                     // Already fetched, check if anything inside needs fetching
-                    if (fetch_info.mFetchType >= FT_CONTENT_RECURSIVE)
+                    if (fetch_info.mFetchType == FT_RECURSIVE)
                     {
                         LLInventoryModel::cat_array_t * categories(NULL);
                         LLInventoryModel::item_array_t * items(NULL);
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 1fd7426312..e7be265a3d 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -84,7 +84,7 @@ protected:
         FT_DEFAULT = 0,
         FT_FORCED, // request non-recursively even if already loaded
         FT_CONTENT_RECURSIVE, // request content recursively
-        FT_FOLDER_AND_CONTENT, // request content recursively
+        FT_FOLDER_AND_CONTENT, // request folder, then content recursively
         FT_RECURSIVE, // request everything recursively
     } EFetchType;
     struct FetchQueueInfo
-- 
cgit v1.2.3


From 377f177a8667702eee12414fb5534fd6732da1d2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Apr 2023 21:32:17 +0300
Subject: SL-19533 Removed per-run limit

Doesn't seem to work like expected and I never get more than 7-9 requests running total
---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 3a2120750b..5b8ee6e244 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -624,9 +624,6 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         return;
     }
 
-    // Don't fire all requests at once
-    const U32 max_requests_this_run = llmin(mFetchCount + 5, max_concurrent_fetches);
-
     // Don't loop for too long (in case of large, fully loaded inventory)
     F64 curent_time = LLTimer::getTotalSeconds();
     const F64 max_time = LLStartUp::getStartupState() > STATE_WEARABLES_WAIT
@@ -635,7 +632,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     const F64 end_time = curent_time + max_time;
     S32 last_fetch_count = mFetchCount;
 
-    while (!mFetchFolderQueue.empty() && mFetchCount < max_requests_this_run && curent_time < end_time)
+    while (!mFetchFolderQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
     {
         const FetchQueueInfo & fetch_info(mFetchFolderQueue.front());
         bulkFetchViaAis(fetch_info);
@@ -646,7 +643,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     // Ideally we shouldn't fetch items if recursive fetch isn't done,
     // but there is a chance some request will start timeouting and recursive
     // fetch will get stuck on a signle folder, don't block item fetch in such case
-    while (!mFetchItemQueue.empty() && mFetchCount < max_requests_this_run && curent_time < end_time)
+    while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
     {
         const FetchQueueInfo& fetch_info(mFetchItemQueue.front());
         bulkFetchViaAis(fetch_info);
-- 
cgit v1.2.3


From 9349a9b5d4ccb21f195e5c156d897836399fd11b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 28 Apr 2023 00:18:46 +0300
Subject: SL-19533 More children per subset fetch request

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 5b8ee6e244..5f7950df08 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -730,7 +730,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
 
                     LLViewerInventoryCategory::EFetchType target_state = LLViewerInventoryCategory::FETCH_RECURSIVE;
                     // technically limit is 'as many as you can put into url', but for now stop at 10
-                    const S32 batch_limit = 10;
+                    const S32 batch_limit = 20;
                     bool content_done = true;
 
                     for (LLInventoryModel::cat_array_t::iterator it = categories->begin();
-- 
cgit v1.2.3


From 4bfcf182d7a961d8ebfe17b453e54cfac26347ce Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 28 Apr 2023 19:34:26 +0300
Subject: SL-19533 Fetch stall prevention #2

---
 indra/newview/llaisapi.cpp | 15 +++++++++++++++
 indra/newview/llaisapi.h   |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index e63d77cea3..951860e39d 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -1550,6 +1550,7 @@ void AISUpdate::doUpdate()
 	}
 
 	// CREATE CATEGORIES
+    const S32 MAX_UPDATE_BACKLOG = 50; // stall prevention
 	for (deferred_category_map_t::const_iterator create_it = mCategoriesCreated.begin();
 		 create_it != mCategoriesCreated.end(); ++create_it)
 	{
@@ -1558,6 +1559,13 @@ void AISUpdate::doUpdate()
 
 		gInventory.updateCategory(new_category, LLInventoryObserver::CREATE);
 		LL_DEBUGS("Inventory") << "created category " << category_id << LL_ENDL;
+
+        // fetching can receive massive amount of items and fodlers
+        if (gInventory.getChangedIDs().size() > MAX_UPDATE_BACKLOG)
+        {
+            gInventory.notifyObservers();
+            checkTimeout();
+        }
 	}
 
 	// UPDATE CATEGORIES
@@ -1612,6 +1620,13 @@ void AISUpdate::doUpdate()
 		// case this is create.
 		LL_DEBUGS("Inventory") << "created item " << item_id << LL_ENDL;
 		gInventory.updateItem(new_item, LLInventoryObserver::CREATE);
+
+        // fetching can receive massive amount of items and fodlers
+        if (gInventory.getChangedIDs().size() > MAX_UPDATE_BACKLOG)
+        {
+            gInventory.notifyObservers();
+            checkTimeout();
+        }
 	}
 	
 	// UPDATE ITEMS
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 691c5db592..6270a34081 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -130,7 +130,7 @@ private:
     // Debug is very log-heavy, give it more time or it will take forever to process
     // Todo: find a way to make throttle static isntead of per-request
     const F32 EXPIRY_SECONDS_DEBUG = 1.f;
-    const F32 EXPIRY_SECONDS_LIVE = 0.01f;
+    const F32 EXPIRY_SECONDS_LIVE = 0.008f;
 
 	typedef std::map<LLUUID,S32> uuid_int_map_t;
 	uuid_int_map_t mCatDescendentDeltas;
-- 
cgit v1.2.3


From 80bfc56ff070614fee5b353056076ebed90f9039 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 28 Apr 2023 19:51:00 +0300
Subject: SL-19583 force reshape inventory panel when changing root in
 combination view

---
 indra/newview/llpanelmaininventory.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index b9099bbebf..4d6ff63f94 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2211,6 +2211,9 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
     }
     mForceShowInvLayout = false;
     updateTitle();
+
+    //force update scroll container
+    mCombinationInventoryPanel->reshape(getChild<LLUICtrl>("combination_view_inventory")->getRect().getWidth(), 1, true);
 }
 
 void LLPanelMainInventory::updateCombinationVisibility()
@@ -2250,8 +2253,8 @@ void LLPanelMainInventory::updateCombinationVisibility()
         }
 
         mCombinationScroller->reshape(llmax(inv_rect.getWidth(), galery_rect.getWidth()), inv_rect.getHeight() + galery_rect.getHeight(), true);
-        mCombinationGalleryPanel->handleReshape(galery_rect, false);
-        mCombinationInventoryPanel->handleReshape(inv_rect, false);
+        mCombinationGalleryPanel->setShape(galery_rect, false);
+        mCombinationInventoryPanel->setShape(inv_rect, false);
     }
 }
 
-- 
cgit v1.2.3


From 03c263a1cdd88ec5967e751cba8640edf9896e51 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 28 Apr 2023 23:37:34 +0300
Subject: SL-19533 Fix 'fetching' state timeout

---
 indra/newview/app_settings/settings.xml           | 11 +++++++++++
 indra/newview/llaisapi.cpp                        |  3 ++-
 indra/newview/llaisapi.h                          |  1 +
 indra/newview/llinventorymodelbackgroundfetch.cpp |  6 ++++--
 indra/newview/llviewerinventory.cpp               | 11 +++++++++--
 5 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a2a1b3f117..43d3f63a34 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15283,6 +15283,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>BatchSizeAIS3</key>
+    <map>
+        <key>Comment</key>
+        <string>Amount of folder ais packs into category subset request</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>S32</string>
+        <key>Value</key>
+        <integer>20</integer>
+    </map>
     <key>PoolSizeAIS</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 951860e39d..b09b8ec517 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -46,6 +46,7 @@
 //=========================================================================
 const std::string AISAPI::INVENTORY_CAP_NAME("InventoryAPIv3");
 const std::string AISAPI::LIBRARY_CAP_NAME("LibraryAPIv3");
+const S32 AISAPI::HTTP_TIMEOUT = 180;
 
 std::list<AISAPI::ais_query_item_t> AISAPI::sPostponedQuery;
 
@@ -823,7 +824,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest());
     LLCore::HttpHeaders::ptr_t httpHeaders;
 
-    httpOptions->setTimeout(180);
+    httpOptions->setTimeout(HTTP_TIMEOUT);
 
     LL_DEBUGS("Inventory") << "Request url: " << url << LL_ENDL;
 
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 6270a34081..973c82a847 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -38,6 +38,7 @@
 class AISAPI
 {
 public:
+    static const S32 HTTP_TIMEOUT;
     typedef enum {
         INVENTORY,
         LIBRARY
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 5f7950df08..8f1012868f 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -729,10 +729,12 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                     gInventory.getDirectDescendentsOf(cat_id, categories, items);
 
                     LLViewerInventoryCategory::EFetchType target_state = LLViewerInventoryCategory::FETCH_RECURSIVE;
-                    // technically limit is 'as many as you can put into url', but for now stop at 10
-                    const S32 batch_limit = 20;
                     bool content_done = true;
 
+                    // Top limit is 'as many as you can put into url'
+                    static LLCachedControl<S32> ais_batch(gSavedSettings, "BatchSizeAIS3", 20);
+                    S32 batch_limit = llclamp(ais_batch(), 1, 40);
+
                     for (LLInventoryModel::cat_array_t::iterator it = categories->begin();
                          it != categories->end();
                          ++it)
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 96f0b500a0..80e4f5f6d5 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -690,9 +690,16 @@ void LLViewerInventoryCategory::setFetching(LLViewerInventoryCategory::EFetchTyp
     {
         if (mDescendentsRequested.hasExpired() || (mFetching == FETCH_NONE))
         {
-            const F32 FETCH_TIMER_EXPIRY = 30.0f;
             mDescendentsRequested.reset();
-            mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
+            if (AISAPI::isAvailable())
+            {
+                mDescendentsRequested.setTimerExpirySec(AISAPI::HTTP_TIMEOUT);
+            }
+            else
+            {
+                const F32 FETCH_TIMER_EXPIRY = 30.0f;
+                mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
+            }
         }
         mFetching = fetching;
     }
-- 
cgit v1.2.3


From 002ff88a130b16f03e26e159f7ea5f38782b16b6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 2 May 2023 15:22:21 +0300
Subject: SL-19650 don't rebuild views right after initialising panel

---
 indra/newview/llinventorypanel.cpp | 14 +++++++++-----
 indra/newview/llinventorypanel.h   |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 2c7c6d2056..c8c9d6c351 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -907,7 +907,10 @@ void LLInventoryPanel::initializeViews(F64 max_time)
 
 	gIdleCallbacks.addFunction(idle, this);
 	
-	openStartFolderOrMyInventory();
+    if(mParams.open_first_folder)
+    {
+        openStartFolderOrMyInventory();
+    }
 	
 	// Special case for new user login
 	if (gAgent.isFirstLogin())
@@ -2098,10 +2101,11 @@ void LLInventorySingleFolderPanel::setSelectCallback(const boost::function<void(
 
 void LLInventorySingleFolderPanel::initFromParams(const Params& p)
 {
-    Params fav_params(p);
-    fav_params.start_folder.id = gInventory.getRootFolderID();
-    LLInventoryPanel::initFromParams(p);
-    changeFolderRoot(gInventory.getRootFolderID());
+    mFolderID = gInventory.getRootFolderID();
+    Params pane_params(p);
+    pane_params.open_first_folder = false;
+    pane_params.start_folder.id = mFolderID;
+    LLInventoryPanel::initFromParams(pane_params);
 }
 
 void LLInventorySingleFolderPanel::openInCurrentWindow(const LLSD& userdata)
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index fb2419ada7..d334d55611 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -107,6 +107,7 @@ public:
 		Optional<LLFolderView::Params>		folder_view;
 		Optional<LLFolderViewFolder::Params> folder;
 		Optional<LLFolderViewItem::Params>	 item;
+        Optional<bool>                       open_first_folder;
 
         // All item and folder views will be initialized on init if true (default)
         // Will initialize on visibility change otherwise.
@@ -126,6 +127,7 @@ public:
             show_root_folder("show_root_folder", false),
             allow_drop_on_root("allow_drop_on_root", true),
             use_marketplace_folders("use_marketplace_folders", false),
+            open_first_folder("open_first_folder", true),
 			scroll("scroll"),
 			accepts_drag_and_drop("accepts_drag_and_drop"),
 			folder_view("folder_view"),
-- 
cgit v1.2.3


From d1e3959fef60d70c5f928422b9895b11e36ef343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pantera=20P=C3=B3=C5=82nocy?= <panterapolnocy@gmail.com>
Date: Tue, 2 May 2023 19:19:03 +0200
Subject: Update floater_scene_load_stats.xml

Reducing the packet loss...
---
 .../skins/default/xui/en/floater_scene_load_stats.xml        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index 37efbe654e..b757f4eab8 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -414,7 +414,7 @@
         name="frame_stats"
         label="Frame breakdown"
         show_label="true">
-          <stat_bar name="packet_loss"
+          <stat_bar name="scenery_frame_pct"
             label="Scenery"
             orientation="horizontal"
             unit_label=" %"
@@ -422,7 +422,7 @@
             bar_max="100"
             tick_spacing="0.5"
             show_bar="false"/>
-          <stat_bar name="packet_loss"
+          <stat_bar name="avatar_frame_pct"
             label="Avatar"
             orientation="horizontal"
             unit_label=" %"
@@ -430,7 +430,7 @@
             bar_max="100"
             tick_spacing="0.5"
             show_bar="false"/>
-          <stat_bar name="packet_loss"
+          <stat_bar name="ui_frame_pct"
             label="UI"
             orientation="horizontal"
             unit_label=" %"
@@ -438,7 +438,7 @@
             bar_max="100"
             tick_spacing="0.5"
             show_bar="false"/>
-          <stat_bar name="packet_loss"
+          <stat_bar name="huds_frame_pct"
             label="HUDs"
             orientation="horizontal"
             unit_label=" %"
@@ -446,7 +446,7 @@
             bar_max="100"
             tick_spacing="0.5"
             show_bar="false"/>
-        <stat_bar name="packet_loss"
+        <stat_bar name="swap_frame_pct"
             label="Swap"
             orientation="horizontal"
             unit_label=" %"
@@ -454,7 +454,7 @@
             bar_max="100"
             tick_spacing="0.5"
             show_bar="false"/>
-        <stat_bar name="packet_loss"
+        <stat_bar name="idle_frame_pct"
             label="Tasks"
             orientation="horizontal"
             unit_label=" %"
-- 
cgit v1.2.3


From 534d3abd2a93ed2df429b8cdbba84a10f26b0add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pantera=20P=C3=B3=C5=82nocy?= <panterapolnocy@gmail.com>
Date: Tue, 2 May 2023 19:35:14 +0200
Subject: Fixing a small typo in llviewerstats.cpp

---
 indra/newview/llviewerstats.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 519166af63..1607296194 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -124,7 +124,7 @@ SimMeasurement<>			SIM_TIME_DILATION("simtimedilation", "Simulator time scale",
 							SIM_MAIN_AGENTS("simmainagents", "Number of avatars in current region", LL_SIM_STAT_NUMAGENTMAIN),
 							SIM_CHILD_AGENTS("simchildagents", "Number of avatars in neighboring regions", LL_SIM_STAT_NUMAGENTCHILD),
 							SIM_OBJECTS("simobjects", "", LL_SIM_STAT_NUMTASKS),
-							SIM_ACTIVE_OBJECTS("simactiveobjects", "Number of scripted and/or mocing objects", LL_SIM_STAT_NUMTASKSACTIVE),
+							SIM_ACTIVE_OBJECTS("simactiveobjects", "Number of scripted and/or moving objects", LL_SIM_STAT_NUMTASKSACTIVE),
 							SIM_ACTIVE_SCRIPTS("simactivescripts", "Number of scripted objects", LL_SIM_STAT_NUMSCRIPTSACTIVE),
 							SIM_IN_PACKETS_PER_SEC("siminpps", "", LL_SIM_STAT_INPPS),
 							SIM_OUT_PACKETS_PER_SEC("simoutpps", "", LL_SIM_STAT_OUTPPS),
-- 
cgit v1.2.3


From 171b8dbeb32e49d43f40189ae55df05693804fbf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 2 May 2023 23:07:46 +0300
Subject: SL-19583 Fix rename's width and update frequency

This way of calculating scroll turns out to be one large hack.
Probably needs a proper combination view instead of combining two
different views that have own scrolls or those views need to support
not having personal scroll.
---
 indra/newview/llagentwearables.cpp     |  5 ++--
 indra/newview/llpanelmaininventory.cpp | 45 +++++++++++++++++++++++++++-------
 indra/newview/llpanelmaininventory.h   |  5 +++-
 indra/newview/lltoolbarview.cpp        |  2 +-
 4 files changed, 44 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 2e769dc737..24c6d82b0d 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1307,8 +1307,9 @@ void LLAgentWearables::findAttachmentsAddRemoveInfo(LLInventoryModel::item_array
 	}
 
 	// Build up list of objects to be removed and items currently attached.
-	for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); 
-		 iter != gAgentAvatarp->mAttachmentPoints.end();)
+    LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin();
+    LLVOAvatar::attachment_map_t::iterator end = gAgentAvatarp->mAttachmentPoints.end();
+	while (iter != end)
 	{
 		LLVOAvatar::attachment_map_t::iterator curiter = iter++;
 		LLViewerJointAttachment* attachment = curiter->second;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 4d6ff63f94..fc4cc124b8 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -120,6 +120,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
       mSingleFolderMode(false),
       mForceShowInvLayout(false),
       mViewMode(MODE_COMBINATION),
+      mCombinationShapeDirty(true),
       mListViewRootUpdatedConnection(),
       mGalleryRootUpdatedConnection()
 {
@@ -253,6 +254,8 @@ BOOL LLPanelMainInventory::postBuild()
     mInventoryGalleryPanel = getChild<LLInventoryGallery>("gallery_view_inv");
     mGalleryRootUpdatedConnection = mInventoryGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
 
+    mCombinationScrollPanel = getChild<LLUICtrl>("combination_view_inventory");
+
     mCombinationInventoryPanel = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
     LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
     comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_EXCLUDE_THUMBNAILS);
@@ -899,9 +902,18 @@ BOOL LLPanelMainInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 }
 
 // virtual
-void LLPanelMainInventory::changed(U32)
+void LLPanelMainInventory::changed(U32 mask)
 {
 	updateItemcountText();
+    if ((mask & LLInventoryObserver::REBUILD)
+        || (mask & LLInventoryObserver::STRUCTURE)
+        || (mask & LLInventoryObserver::REMOVE)
+        || (mask & LLInventoryObserver::ADD)
+        || (mask & LLInventoryObserver::LABEL))
+    {
+        // todo: can be limited to just observed folder
+        mCombinationShapeDirty = true;
+    }
 }
 
 void LLPanelMainInventory::setFocusFilterEditor()
@@ -912,6 +924,13 @@ void LLPanelMainInventory::setFocusFilterEditor()
 	}
 }
 
+
+void LLPanelMainInventory::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+    mCombinationShapeDirty = true;
+    LLPanel::reshape(width, height, called_from_parent);
+}
+
 // virtual
 void LLPanelMainInventory::draw()
 {
@@ -1506,9 +1525,9 @@ void LLPanelMainInventory::toggleViewMode()
     getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
     getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
     getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
-    getChild<LLUICtrl>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
     getChild<LLLayoutPanel>("nav_buttons")->setVisible(mSingleFolderMode);
     getChild<LLButton>("view_mode_btn")->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
+    mCombinationScrollPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
 
     setActivePanel();
     updateTitle();
@@ -2213,13 +2232,15 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
     updateTitle();
 
     //force update scroll container
-    mCombinationInventoryPanel->reshape(getChild<LLUICtrl>("combination_view_inventory")->getRect().getWidth(), 1, true);
+    mCombinationShapeDirty = true;
 }
 
 void LLPanelMainInventory::updateCombinationVisibility()
 {
-    if(mSingleFolderMode && isCombinationViewMode())
+    if(mSingleFolderMode && isCombinationViewMode() && mCombinationShapeDirty)
     {
+        mCombinationShapeDirty = false;
+        mCombinationInventoryPanel->reshape(1,1); // force reduce visible area
         if (!mCombinationGalleryPanel->hasVisibleItems())
         {
             mCombinationGalleryPanel->handleModifiedFilter();
@@ -2228,12 +2249,17 @@ void LLPanelMainInventory::updateCombinationVisibility()
         LLRect inv_inner_rect = mCombinationInventoryPanel->getScrollableContainer()->getScrolledViewRect();
         LLRect galery_rect = mCombinationGalleryPanel->getRect();
         LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
+        LLScrollContainer* scroll = static_cast<LLScrollContainer*>(mCombinationScrollPanel);
+        LLRect scroller_window_rect = scroll->getContentWindowRect();
+
+        const S32 BORDER_PAD = 1;
+        S32 desired_width = llmax(inv_inner_rect.getWidth(), scroller_window_rect.getWidth()) + BORDER_PAD;
 
         inv_rect.mBottom = 0;
-        inv_rect.mRight = inv_rect.mLeft + inv_inner_rect.getWidth();
+        inv_rect.mRight = inv_rect.mLeft + desired_width;
         if (!mCombinationGalleryPanel->hasVisibleItems() || mCombinationInventoryPanel->hasVisibleItems())
         {
-            inv_rect.mTop = inv_rect.mBottom + inv_inner_rect.getHeight();
+            inv_rect.mTop = inv_rect.mBottom + inv_inner_rect.getHeight() + BORDER_PAD;
         }
         else
         {
@@ -2241,10 +2267,11 @@ void LLPanelMainInventory::updateCombinationVisibility()
         }
 
         galery_rect.mBottom = inv_rect.mTop;
+        galery_rect.mRight = galery_rect.mLeft + scroller_window_rect.getWidth();
         if (mCombinationGalleryPanel->hasVisibleItems())
         {
             mCombinationGalleryPanel->setVisible(true);
-            galery_rect.mTop = galery_rect.mBottom + inner_galery_rect.getHeight();
+            galery_rect.mTop = galery_rect.mBottom + inner_galery_rect.getHeight() + BORDER_PAD;
         }
         else
         {
@@ -2252,7 +2279,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
             galery_rect.mTop = galery_rect.mBottom;
         }
 
-        mCombinationScroller->reshape(llmax(inv_rect.getWidth(), galery_rect.getWidth()), inv_rect.getHeight() + galery_rect.getHeight(), true);
+        mCombinationScroller->reshape(desired_width, inv_rect.getHeight() + galery_rect.getHeight() + BORDER_PAD, true);
         mCombinationGalleryPanel->setShape(galery_rect, false);
         mCombinationInventoryPanel->setShape(inv_rect, false);
     }
@@ -2319,7 +2346,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
 
         getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
         getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
-        getChild<LLUICtrl>("combination_view_inventory")->setVisible(mSingleFolderMode && isCombinationViewMode());
+        mCombinationScrollPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
 
         if(isListViewMode())
         {
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 8e7ad776b0..4f792878a5 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -83,8 +83,9 @@ public:
 									   EAcceptance* accept,
 									   std::string& tooltip_msg);
 	/*virtual*/ void changed(U32);
+    /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	/*virtual*/ void draw();
-	/*virtual*/ void 	onVisibilityChange ( BOOL new_visibility );
+	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );
 
 	LLInventoryPanel* getPanel() { return mActivePanel; }
 	LLInventoryPanel* getActivePanel() { return mActivePanel; }
@@ -192,6 +193,7 @@ private:
     LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
     LLInventoryGallery* mInventoryGalleryPanel;
 
+    LLUICtrl* mCombinationScrollPanel;
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
     LLView* mCombinationScroller;
@@ -232,6 +234,7 @@ private:
 	bool						mNeedUploadCost;
 
     bool                        mForceShowInvLayout;
+    bool                        mCombinationShapeDirty;
 	// List Commands                                                              //
 	////////////////////////////////////////////////////////////////////////////////
 };
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 4f47c465c4..f6628293ee 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -322,9 +322,9 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	}
 
     // SL-18581: Don't show the starter avatar toolbar button for NUX users
-    LLViewerInventoryCategory* my_outfits_cat = gInventory.getCategory(gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS));
     if (gAgent.isFirstLogin())
     {
+        LLViewerInventoryCategory* my_outfits_cat = gInventory.getCategory(gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS));
         LL_WARNS() << "First login: checking for NUX user." << LL_ENDL;
         if (my_outfits_cat != NULL && my_outfits_cat->getDescendentCount() > 0)
         {
-- 
cgit v1.2.3


From 1866368673f06084860c30cbd78446f55f600a1e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 3 May 2023 02:06:09 +0300
Subject: SL-19583 Fix height not accounting for borders properly

---
 indra/newview/llpanelmaininventory.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index fc4cc124b8..0a6ac5f92e 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -287,6 +287,7 @@ BOOL LLPanelMainInventory::postBuild()
 
 	// Trigger callback for focus received so we can deselect items in inbox/outbox
 	LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLPanelMainInventory::onFocusReceived, this));
+    mCombinationShapeDirty = true;
 
 	return TRUE;
 }
@@ -1964,6 +1965,7 @@ void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
 		}
 		getActivePanel()->getRootFolder()->finishRenamingItem();
 	}
+    mCombinationShapeDirty = true;
 }
 
 bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
@@ -2240,7 +2242,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
     if(mSingleFolderMode && isCombinationViewMode() && mCombinationShapeDirty)
     {
         mCombinationShapeDirty = false;
-        mCombinationInventoryPanel->reshape(1,1); // force reduce visible area
+        mCombinationInventoryPanel->reshape(1,1); // HACK: force reduce visible area
         if (!mCombinationGalleryPanel->hasVisibleItems())
         {
             mCombinationGalleryPanel->handleModifiedFilter();
@@ -2251,9 +2253,8 @@ void LLPanelMainInventory::updateCombinationVisibility()
         LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
         LLScrollContainer* scroll = static_cast<LLScrollContainer*>(mCombinationScrollPanel);
         LLRect scroller_window_rect = scroll->getContentWindowRect();
-
-        const S32 BORDER_PAD = 1;
-        S32 desired_width = llmax(inv_inner_rect.getWidth(), scroller_window_rect.getWidth()) + BORDER_PAD;
+        S32 desired_width = llmax(inv_inner_rect.getWidth(), scroller_window_rect.getWidth());
+        const S32 BORDER_PAD = 2; // two sides
 
         inv_rect.mBottom = 0;
         inv_rect.mRight = inv_rect.mLeft + desired_width;
@@ -2279,7 +2280,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
             galery_rect.mTop = galery_rect.mBottom;
         }
 
-        mCombinationScroller->reshape(desired_width, inv_rect.getHeight() + galery_rect.getHeight() + BORDER_PAD, true);
+        mCombinationScroller->reshape(desired_width, inv_rect.getHeight() + galery_rect.getHeight(), true);
         mCombinationGalleryPanel->setShape(galery_rect, false);
         mCombinationInventoryPanel->setShape(inv_rect, false);
     }
-- 
cgit v1.2.3


From b3e02c4264a8a3b9d189b347d0faddf3ac21e87b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 3 May 2023 18:46:18 +0300
Subject: SL-19583 Scroll fixes

---
 indra/newview/llinventorypanel.cpp     |  7 +++++++
 indra/newview/llinventorypanel.h       |  3 ++-
 indra/newview/llpanelmaininventory.cpp | 20 ++++++++++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index c8c9d6c351..6d739c909c 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2246,6 +2246,13 @@ void LLInventorySingleFolderPanel::doCreate(const LLSD& userdata)
 /* Asset Pre-Filtered Inventory Panel related class                     */
 /************************************************************************/
 
+LLAssetFilteredInventoryPanel::LLAssetFilteredInventoryPanel(const Params& p)
+    : LLInventoryPanel(p)
+    , mAssetType(LLAssetType::AT_NONE)
+{
+}
+
+
 void LLAssetFilteredInventoryPanel::initFromParams(const Params& p)
 {
     mAssetType = LLAssetType::lookup(p.filter_asset_type.getValue());
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index d334d55611..f2eab4a642 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -214,6 +214,7 @@ public:
 	LLUUID getRootFolderID();
 	LLScrollContainer* getScrollableContainer() { return mScroller; }
     bool getAllowDropOnRoot() { return mParams.allow_drop_on_root; }
+    bool areViewsInitialized() { return mViewsInitialized == VIEWS_INITIALIZED && !mFolderRoot.get()->needsArrange(); }
 	
 	void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
 	
@@ -455,7 +456,7 @@ public:
 
     void initFromParams(const Params& p);
 protected:
-    LLAssetFilteredInventoryPanel(const Params& p) : LLInventoryPanel(p) {}
+    LLAssetFilteredInventoryPanel(const Params& p);
     friend class LLUICtrlFactory;
 public:
     ~LLAssetFilteredInventoryPanel() {}
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 0a6ac5f92e..3110adff15 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -736,6 +736,8 @@ void LLPanelMainInventory::onClearSearch()
 			inbox_panel->onClearSearch();
 		}
 	}
+
+    mCombinationShapeDirty = true;
 }
 
 void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
@@ -793,6 +795,8 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
 			inbox_panel->onFilterEdit(search_string);
 		}
 	}
+
+    mCombinationShapeDirty = true;
 }
 
 
@@ -1681,6 +1685,8 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
         mCombinationInventoryPanel->changeFolderRoot(folder_id);
     }
     updateNavButtons();
+
+    mCombinationShapeDirty = true;
 }
 
 LLUUID LLPanelMainInventory::getSingleFolderViewRoot()
@@ -2235,14 +2241,20 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
 
     //force update scroll container
     mCombinationShapeDirty = true;
+    mCombinationInventoryPanel->reshape(1, 1);
 }
 
 void LLPanelMainInventory::updateCombinationVisibility()
 {
-    if(mSingleFolderMode && isCombinationViewMode() && mCombinationShapeDirty)
+    if(mSingleFolderMode
+       && isCombinationViewMode()
+       && mCombinationShapeDirty)
     {
-        mCombinationShapeDirty = false;
-        mCombinationInventoryPanel->reshape(1,1); // HACK: force reduce visible area
+        if (mCombinationInventoryPanel->areViewsInitialized())
+        {
+            mCombinationShapeDirty = false;
+            mCombinationInventoryPanel->reshape(1,1); // HACK: force reduce visible area
+        }
         if (!mCombinationGalleryPanel->hasVisibleItems())
         {
             mCombinationGalleryPanel->handleModifiedFilter();
@@ -2253,8 +2265,8 @@ void LLPanelMainInventory::updateCombinationVisibility()
         LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
         LLScrollContainer* scroll = static_cast<LLScrollContainer*>(mCombinationScrollPanel);
         LLRect scroller_window_rect = scroll->getContentWindowRect();
-        S32 desired_width = llmax(inv_inner_rect.getWidth(), scroller_window_rect.getWidth());
         const S32 BORDER_PAD = 2; // two sides
+        S32 desired_width = llmax(inv_inner_rect.getWidth(), scroller_window_rect.getWidth() - BORDER_PAD);
 
         inv_rect.mBottom = 0;
         inv_rect.mRight = inv_rect.mLeft + desired_width;
-- 
cgit v1.2.3


From 22a07b1121bb429e6bfe10b5a5e859bcea1262b6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 3 May 2023 12:48:22 -0400
Subject: SL-18330: fix strip_deprecated_header(cur_size) param to llssize.

---
 indra/llcommon/llsdserialize.cpp   | 2 +-
 indra/llcommon/llsdserialize.h     | 2 +-
 indra/newview/llmeshrepository.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index a510b73096..32d0847141 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2388,7 +2388,7 @@ U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize, std::istream& is, S32
 	return result;
 }
 
-char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size)
+char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size)
 {
 	const char* deprecated_header = "<? LLSD/Binary ?>";
 	constexpr size_t deprecated_header_size = 17;
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index d33d2b6f34..4f596856de 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -873,5 +873,5 @@ LL_COMMON_API std::string zip_llsd(LLSD& data);
 LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size);
 
 // returns a pointer to the array or past the array if the deprecated header exists
-LL_COMMON_API char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size = nullptr);
+LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size = nullptr);
 #endif // LL_LLSDSERIALIZE_H
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f937754368..18420a2356 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1865,7 +1865,7 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
 	U32 header_size = 0;
 	if (data_size > 0)
 	{
-		U32 dsize = data_size;
+		llssize dsize = data_size;
 		char* result_ptr = strip_deprecated_header((char*)data, dsize, &header_size);
 
 		data_size = dsize;
-- 
cgit v1.2.3


From 971e851157da688b480d6ada188daec532e4b682 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 4 May 2023 16:44:23 +0300
Subject: SL-19647 OSX buildfix

---
 indra/llcommon/tests/llsdserialize_test.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 85791e2979..acb2953b5b 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1922,8 +1922,6 @@ namespace tut
     static void toPythonUsing(const std::string& desc,
                               const FormatterFunction& serialize)
     {
-        set_test_name("verify sequence to Python");
-
         LLSD cdata(llsd::array(17, 3.14,
                                "This string\n"
                                "has several\n"
-- 
cgit v1.2.3


From e8c1a18105bddc29951d4c4b1700dc0af37c83c2 Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Thu, 4 May 2023 16:52:35 +0100
Subject: First work on sl-19676 - Stats on updates

---
 indra/newview/app_settings/settings.xml            |  33 +++
 indra/newview/llappviewer.cpp                      |   7 +-
 indra/newview/llfloater360capture.cpp              |  18 +-
 indra/newview/lltexturefetch.cpp                   |   5 -
 indra/newview/llviewermenu.cpp                     | 143 ++++++-----
 indra/newview/llviewerobjectlist.cpp               |  42 ++--
 indra/newview/llviewerregion.cpp                   |  17 +-
 indra/newview/llviewerregion.h                     |  12 +-
 indra/newview/llviewerstatsrecorder.cpp            | 267 +++++++++++++--------
 indra/newview/llviewerstatsrecorder.h              | 117 +++++----
 indra/newview/skins/default/xui/en/menu_viewer.xml |  24 +-
 11 files changed, 409 insertions(+), 276 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9fffab70f4..3d1a384793 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17085,5 +17085,38 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>StatsReportMaxDuration</key>
+  <map>
+    <key>Comment</key>
+    <string>Maximum seconds for viewer stats file data, prevents huge file</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>300</real>
+  </map>
+	<key>StatsReportFileInterval</key>
+	<map>
+		<key>Comment</key>
+		<string>Interval to save viewer stats file data</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>F32</string>
+		<key>Value</key>
+		<real>0.2</real>
+	</map>
+  <key>StatsReportSkipZeroDataSaves</key>
+  <map>
+    <key>Comment</key>
+    <string>In viewer stats data file, skip saving entry if there is no data</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
 </map>
 </llsd>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 8d77a39c74..9c194562f9 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1536,7 +1536,12 @@ bool LLAppViewer::doFrame()
                     LLFloaterSimpleOutfitSnapshot::update();
                     gGLActive = FALSE;
                 }
-		}
+
+                if (LLViewerStatsRecorder::instanceExists())
+                {
+                    LLViewerStatsRecorder::instance().idle();
+                }
+            }
 		}
 
 		{
diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp
index 23f86e2361..9c25cdbc7d 100644
--- a/indra/newview/llfloater360capture.cpp
+++ b/indra/newview/llfloater360capture.cpp
@@ -197,21 +197,18 @@ void LLFloater360Capture::changeInterestListMode(bool send_everything)
 
     if (gAgent.requestPostCapability("InterestList", body, [](const LLSD & response)
     {
-        LL_INFOS("360Capture") <<
-                               "InterestList capability responded: \n" <<
+        LL_DEBUGS("360Capture") << "InterestList capability responded: \n" <<
                                ll_pretty_print_sd(response) <<
                                LL_ENDL;
     }))
     {
-        LL_INFOS("360Capture") <<
-                               "Successfully posted an InterestList capability request with payload: \n" <<
+        LL_DEBUGS("360Capture") << "Successfully posted an InterestList capability request with payload: \n" <<
                                ll_pretty_print_sd(body) <<
                                LL_ENDL;
     }
     else
     {
-        LL_INFOS("360Capture") <<
-                               "Unable to post an InterestList capability request with payload: \n" <<
+        LL_WARNS("360Capture") << "Unable to post an InterestList capability request with payload: \n" <<
                                ll_pretty_print_sd(body) <<
                                LL_ENDL;
     }
@@ -632,11 +629,8 @@ void LLFloater360Capture::capture360Images()
     // display time to encode all 6 images.  It tends to be a fairly linear
     // time for each so we don't need to worry about displaying the time
     // for each - this gives us plenty to use for optimizing
-    LL_INFOS("360Capture") <<
-                           "Time to encode and save 6 images was " <<
-                           encode_time_total <<
-                           " seconds" <<
-                           LL_ENDL;
+    LL_INFOS("360Capture") << "Time to encode and save 6 images was " <<
+                           encode_time_total << " seconds" << LL_ENDL;
 
     // Write the JavaScript file footer (the bottom of the file after the
     // declarations of the actual data URLs array). The footer comprises of
@@ -668,7 +662,7 @@ void LLFloater360Capture::capture360Images()
     // as a change - only the subsequent 5 are
     if (camera_changed_times < 5)
     {
-        LL_INFOS("360Capture") << "Warning: we only captured " << camera_changed_times << " images." << LL_ENDL;
+        LL_WARNS("360Capture") << "360 image capture expected 5 or more images, only captured " << camera_changed_times << " images." << LL_ENDL;
     }
 
     // now we have the 6 shots saved in a well specified location,
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index a7dcb1a9bb..b0d6a5d466 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2258,11 +2258,6 @@ S32 LLTextureFetchWorker::callbackHttpGet(LLCore::HttpResponse * response,
 	mLoaded = TRUE;
 	setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
 
-	if (LLViewerStatsRecorder::instanceExists())
-	{
-		// Do not create this instance inside thread
-		LLViewerStatsRecorder::instance().log(0.2f);
-	}
 	return data_size ;
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 998f5c020e..77cb5f86af 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -119,6 +119,7 @@
 #include "llviewerobjectlist.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerstats.h"
+#include "llviewerstatsrecorder.h"
 #include "llvoavatarself.h"
 #include "llvoicevivox.h"
 #include "llworldmap.h"
@@ -1295,49 +1296,99 @@ class LLAdvancedDumpRegionObjectCache : public view_listener_t
 	}
 };
 
-class LLAdvancedInterestListFullUpdate : public view_listener_t
+class LLAdvancedToggleInterestList360Mode : public view_listener_t
 {
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLSD request;
-		LLSD body;
-		static bool using_360 = false;
-
-		if (using_360)
-		{
-			body["mode"] = LLSD::String("default");
-		}
-		else
-		{
-			body["mode"] = LLSD::String("360");
-		}
-		using_360 = !using_360;
+public:
+    bool handleEvent(const LLSD &userdata)
+    {
+        LLSD request;
+        LLSD body;
+
+        // First do a GET to report on current mode and update stats
+        if (gAgent.requestGetCapability("InterestList",
+                                        [](const LLSD &response) {
+                                            LL_DEBUGS("360Capture") << "InterestList capability GET responded: \n"
+                                                                   << ll_pretty_print_sd(response) << LL_ENDL;
+                                        }))
+        {
+            LL_DEBUGS("360Capture") << "Successful GET InterestList capability request with return body: \n"
+                                   << ll_pretty_print_sd(body) << LL_ENDL;
+        }
+        else
+        {
+            LL_WARNS("360Capture") << "Unable to GET InterestList capability request with return body: \n"
+                                   << ll_pretty_print_sd(body) << LL_ENDL;
+        }
 
-        if (gAgent.requestPostCapability("InterestList", body, [](const LLSD& response)
+        // Now do a POST to change the mode
+        if (sUsing360)
         {
-            LL_INFOS("360Capture") <<
-                "InterestList capability responded: \n" <<
-                ll_pretty_print_sd(response) <<
-                LL_ENDL;
-        }))
+            body["mode"] = LLSD::String("default");
+        }
+        else
         {
-            LL_INFOS("360Capture") <<
-                "Successfully posted an InterestList capability request with payload: \n" <<
-                ll_pretty_print_sd(body) <<
-                LL_ENDL;
+            body["mode"] = LLSD::String("360");
+        }
+        sUsing360 = !sUsing360;
+        LL_INFOS("360Capture") << "Setting InterestList capability mode to " << body["mode"].asString() << LL_ENDL;
+
+        if (gAgent.requestPostCapability("InterestList", body,
+                                         [](const LLSD &response) {
+                                             LL_DEBUGS("360Capture") << "InterestList capability responded: \n"
+                                                                    << ll_pretty_print_sd(response) << LL_ENDL;
+                                         }))
+        {
+            LL_DEBUGS("360Capture") << "Successfully posted an InterestList capability request with payload: \n"
+                                   << ll_pretty_print_sd(body) << LL_ENDL;
             return true;
         }
         else
         {
-            LL_INFOS("360Capture") <<
-                "Unable to post an InterestList capability request with payload: \n" <<
-                ll_pretty_print_sd(body) <<
-                LL_ENDL;
+            LL_DEBUGS("360Capture") << "Unable to post an InterestList capability request with payload: \n"
+                                   << ll_pretty_print_sd(body) << LL_ENDL;
             return false;
         }
+    };
+
+	static bool sUsing360;
+};
+
+bool LLAdvancedToggleInterestList360Mode::sUsing360 = false;
+
+class LLAdvancedCheckInterestList360Mode : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		return LLAdvancedToggleInterestList360Mode::sUsing360;
 	}
 };
 
+class LLAdvancedToggleStatsRecorder : public view_listener_t
+{
+    bool handleEvent(const LLSD &userdata)
+    {
+        if (LLViewerStatsRecorder::instance().isEnabled())
+		{	// Turn off both recording and logging
+			LLViewerStatsRecorder::instance().enableObjectStatsRecording(false);
+		}
+		else
+		{	// Turn on both recording and logging
+			LLViewerStatsRecorder::instance().enableObjectStatsRecording(true, true);
+		}
+        return true;
+    }
+};
+
+class LLAdvancedCheckStatsRecorder : public view_listener_t
+{
+    bool handleEvent(const LLSD &userdata)
+    {	// Use the logging state as the indicator of whether the stats recorder is on
+        return LLViewerStatsRecorder::instance().isLogging();
+    }
+};
+
+
+
 class LLAdvancedBuyCurrencyTest : public view_listener_t
 	{
 	bool handleEvent(const LLSD& userdata)
@@ -4492,33 +4543,6 @@ void handle_duplicate_in_place(void*)
 	LLSelectMgr::getInstance()->selectDuplicate(offset, TRUE);
 }
 
-/* dead code 30-apr-2008
-void handle_deed_object_to_group(void*)
-{
-	LLUUID group_id;
-	
-	LLSelectMgr::getInstance()->selectGetGroup(group_id);
-	LLSelectMgr::getInstance()->sendOwner(LLUUID::null, group_id, FALSE);
-	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_RELEASE_COUNT);
-}
-
-BOOL enable_deed_object_to_group(void*)
-{
-	if(LLSelectMgr::getInstance()->getSelection()->isEmpty()) return FALSE;
-	LLPermissions perm;
-	LLUUID group_id;
-
-	if (LLSelectMgr::getInstance()->selectGetGroup(group_id) &&
-		gAgent.hasPowerInGroup(group_id, GP_OBJECT_DEED) &&
-		LLSelectMgr::getInstance()->selectGetPermissions(perm) &&
-		perm.deedToGroup(gAgent.getID(), group_id))
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-*/
 
 
 /*
@@ -9448,7 +9472,10 @@ void initialize_menus()
 	// Advanced > World
 	view_listener_t::addMenu(new LLAdvancedDumpScriptedCamera(), "Advanced.DumpScriptedCamera");
 	view_listener_t::addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache");
-	view_listener_t::addMenu(new LLAdvancedInterestListFullUpdate(), "Advanced.InterestListFullUpdate");
+    view_listener_t::addMenu(new LLAdvancedToggleInterestList360Mode(), "Advanced.ToggleInterestList360Mode");
+    view_listener_t::addMenu(new LLAdvancedCheckInterestList360Mode(), "Advanced.CheckInterestList360Mode");
+    view_listener_t::addMenu(new LLAdvancedToggleStatsRecorder(), "Advanced.ToggleStatsRecorder");
+    view_listener_t::addMenu(new LLAdvancedCheckStatsRecorder(), "Advanced.CheckStatsRecorder");
 
 	// Advanced > UI
 	commit.add("Advanced.WebBrowserTest", boost::bind(&handle_web_browser_test,	_2));	// sigh! this one opens the MEDIA browser
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index efc4ded79e..0c9e929cf3 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -369,7 +369,7 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry*
 		if (!objectp)
 		{
 			LL_INFOS() << "createObject failure for object: " << fullid << LL_ENDL;
-			recorder.objectUpdateFailure(entry->getLocalID(), OUT_FULL_CACHED, 0);
+			recorder.objectUpdateFailure(0);
 			return NULL;
 		}
 		justCreated = true;
@@ -393,7 +393,6 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry*
 		objectp->setLastUpdateType(OUT_FULL_COMPRESSED); //newly cached
 		objectp->setLastUpdateCached(TRUE);
 	}
-	recorder.log(0.2f);
 	LLVOAvatar::cullAvatarsByPixelArea();
 
 	return objectp;
@@ -472,18 +471,15 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 
 	for (i = 0; i < num_objects; i++)
 	{
-		// timer is unused?
-		LLTimer update_timer;
 		BOOL justCreated = FALSE;
 		S32	msg_size = 0;
 		bool update_cache = false; //update object cache if it is a full-update or terse update
 
 		if (compressed)
 		{
-			S32							uncompressed_length = 2048;
 			compressed_dp.reset();
 
-			uncompressed_length = mesgsys->getSizeFast(_PREHASH_ObjectData, i, _PREHASH_Data);
+			S32 uncompressed_length = mesgsys->getSizeFast(_PREHASH_ObjectData, i, _PREHASH_Data);
 			LL_DEBUGS("ObjectUpdate") << "got binary data from message to compressed_dpbuffer" << LL_ENDL;
 			mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, compressed_dpbuffer, 0, i, 2048);
 			compressed_dp.assignBuffer(compressed_dpbuffer, uncompressed_length);
@@ -505,7 +501,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 						<< " Flags: " << flags
 						<< " Region: " << regionp->getName()
 						<< " Region id: " << regionp->getRegionID() << LL_ENDL;
-					recorder.objectUpdateFailure(local_id, update_type, msg_size);
+					recorder.objectUpdateFailure(msg_size);
 					continue;
 				}
 				else if ((flags & FLAGS_TEMPORARY_ON_REZ) == 0)
@@ -616,7 +612,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 				if (update_type == OUT_TERSE_IMPROVED)
 				{
 					// LL_INFOS() << "terse update for an unknown object (compressed):" << fullid << LL_ENDL;
-					recorder.objectUpdateFailure(local_id, update_type, msg_size);
+					recorder.objectUpdateFailure(msg_size);
 					continue;
 				}
 			}
@@ -625,7 +621,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 				if (update_type != OUT_FULL)
 				{
 					//LL_INFOS() << "terse update for an unknown object:" << fullid << LL_ENDL;
-					recorder.objectUpdateFailure(local_id, update_type, msg_size);
+					recorder.objectUpdateFailure(msg_size);
 					continue;
 				}
 
@@ -638,7 +634,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			{
 				mNumDeadObjectUpdates++;
 				//LL_INFOS() << "update for a dead object:" << fullid << LL_ENDL;
-				recorder.objectUpdateFailure(local_id, update_type, msg_size);
+				recorder.objectUpdateFailure(msg_size);
 				continue;
 			}
 #endif
@@ -651,7 +647,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			if (!objectp)
 			{
 				LL_INFOS() << "createObject failure for object: " << fullid << LL_ENDL;
-				recorder.objectUpdateFailure(local_id, update_type, msg_size);
+				recorder.objectUpdateFailure(msg_size);
 				continue;
 			}
 
@@ -681,11 +677,11 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			
 				if(!(flags & FLAGS_TEMPORARY_ON_REZ))
 				{
-				bCached = true;
+					bCached = true;
 					LLViewerRegion::eCacheUpdateResult result = objectp->mRegionp->cacheFullUpdate(objectp, compressed_dp, flags);
-				recorder.cacheFullUpdate(local_id, update_type, result, objectp, msg_size);
+					recorder.cacheFullUpdate(result);
+				}
 			}
-		}
 #endif
 		}
 		else
@@ -696,12 +692,10 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			}
 			processUpdateCore(objectp, user_data, i, update_type, NULL, justCreated);
 		}
-		recorder.objectUpdateEvent(local_id, update_type, objectp, msg_size);
+		recorder.objectUpdateEvent(update_type);
 		objectp->setLastUpdateType(update_type);
 	}
 
-	recorder.log(0.2f);
-
 	LLVOAvatar::cullAvatarsByPixelArea();
 }
 
@@ -748,14 +742,14 @@ void LLViewerObjectList::processCachedObjectUpdate(LLMessageSystem *mesgsys,
 
 		// Lookup data packer and add this id to cache miss lists if necessary.
 		U8 cache_miss_type = LLViewerRegion::CACHE_MISS_TYPE_NONE;
-		if(!regionp->probeCache(id, crc, flags, cache_miss_type))
-		{
-			// Cache Miss.
+        if (regionp->probeCache(id, crc, flags, cache_miss_type))
+		{	// Cache Hit
+            recorder.cacheHitEvent();
+		}
+        else
+		{	// Cache Miss
             LL_DEBUGS("ObjectUpdate") << "cache miss for id " << id << " crc " << crc << " miss type " << (S32) cache_miss_type << LL_ENDL;
-
-			recorder.cacheMissEvent(id, update_type, cache_miss_type, msg_size);
-
-			continue; // no data packer, skip this object
+            recorder.cacheMissEvent(cache_miss_type);
 		}
 	}
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index ad7321ca4b..3d1a81694a 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2618,14 +2618,10 @@ LLVOCacheEntry* LLViewerRegion::getCacheEntry(U32 local_id, bool valid)
 	return NULL;
 	}
 
-void LLViewerRegion::addCacheMiss(U32 id, LLViewerRegion::eCacheMissType miss_type)
+void LLViewerRegion::addCacheMiss(U32 id, LLViewerRegion::eCacheMissType cache_miss_type)
 {
 	mRegionCacheMissCount++;
-#if 0
-	mCacheMissList.insert(CacheMissItem(id, miss_type));
-#else
-	mCacheMissList.push_back(CacheMissItem(id, miss_type));
-#endif
+    mCacheMissList.push_back(CacheMissItem(id, cache_miss_type));
 }
 
 //check if a non-cacheable object is already created.
@@ -2701,10 +2697,10 @@ bool LLViewerRegion::probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss
 		}
 	}
 	else
-	{
+	{	// Total miss, don't have the object in cache
 		// LL_INFOS() << "Cache miss for " << local_id << LL_ENDL;
-		addCacheMiss(local_id, CACHE_MISS_TYPE_FULL);
-        cache_miss_type = CACHE_MISS_TYPE_FULL;
+        addCacheMiss(local_id, CACHE_MISS_TYPE_TOTAL);
+        cache_miss_type = CACHE_MISS_TYPE_TOTAL;
 	}
 
 	return false;
@@ -2712,7 +2708,7 @@ bool LLViewerRegion::probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss
 
 void LLViewerRegion::addCacheMissFull(const U32 local_id)
 {
-	addCacheMiss(local_id, CACHE_MISS_TYPE_FULL);
+	addCacheMiss(local_id, CACHE_MISS_TYPE_TOTAL);
 }
 
 void LLViewerRegion::requestCacheMisses()
@@ -2763,7 +2759,6 @@ void LLViewerRegion::requestCacheMisses()
 	mCacheDirty = TRUE ;
 	// LL_INFOS() << "KILLDEBUG Sent cache miss full " << full_count << " crc " << crc_count << LL_ENDL;
 	LLViewerStatsRecorder::instance().requestCacheMissesEvent(mCacheMissList.size());
-	LLViewerStatsRecorder::instance().log(0.2f);
 
 	mCacheMissList.clear();
 }
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 6548e8d372..81371b7f30 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -332,9 +332,9 @@ public:
 
 	typedef enum
 	{
-		CACHE_MISS_TYPE_FULL = 0,
-		CACHE_MISS_TYPE_CRC,
-		CACHE_MISS_TYPE_NONE
+		CACHE_MISS_TYPE_TOTAL = 0,	// total cache miss - object not in cache
+		CACHE_MISS_TYPE_CRC,		// object in cache, but CRC doesn't match
+		CACHE_MISS_TYPE_NONE		// not a miss:  cache hit
 	} eCacheMissType;
 
 	typedef enum
@@ -551,10 +551,10 @@ private:
 	class CacheMissItem
 	{
 	public:
-		CacheMissItem(U32 id, LLViewerRegion::eCacheMissType miss_type) : mID(id), mType(miss_type){}
+        CacheMissItem(U32 id, LLViewerRegion::eCacheMissType miss_type) : mID(id), mType(miss_type) {}
 
-		U32                            mID;     //local object id
-		LLViewerRegion::eCacheMissType mType;   //cache miss type
+		U32                         mID;     //local object id
+        LLViewerRegion::eCacheMissType	mType;  // cache miss type
 
 		typedef std::list<CacheMissItem> cache_miss_list_t;
 	};
diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp
index b5ccf4ffa0..64167135ac 100644
--- a/indra/newview/llviewerstatsrecorder.cpp
+++ b/indra/newview/llviewerstatsrecorder.cpp
@@ -28,24 +28,25 @@
 #include "llviewerstatsrecorder.h"
 
 
+#include "llcontrol.h"
 #include "llfile.h"
 #include "llviewerregion.h"
 #include "llviewerobject.h"
+#include "llworld.h"
 
-
-// To do - something using region name or global position
-#if LL_WINDOWS
-	static const std::string STATS_FILE_NAME("C:\\ViewerObjectCacheStats.csv");
-#else
-	static const std::string STATS_FILE_NAME("/tmp/viewerstats.csv");
-#endif
+extern LLControlGroup  gSavedSettings;
 
 LLViewerStatsRecorder* LLViewerStatsRecorder::sInstance = NULL;
 LLViewerStatsRecorder::LLViewerStatsRecorder() :
-	mObjectCacheFile(NULL),
+	mStatsFile(NULL),
 	mTimer(),
-	mStartTime(0.0),
-	mLastSnapshotTime(0.0)
+	mFileOpenTime(0.0),
+	mLastSnapshotTime(0.0),
+    mEnableStatsRecording(false),
+    mEnableStatsLogging(false),
+    mInterval(0.2),
+    mMaxDuration(300.f),
+    mSkipSaveIfZeros(false)
 {
 	if (NULL != sInstance)
 	{
@@ -57,30 +58,22 @@ LLViewerStatsRecorder::LLViewerStatsRecorder() :
 
 LLViewerStatsRecorder::~LLViewerStatsRecorder()
 {
-	if (mObjectCacheFile != NULL)
+	if (mStatsFile)
 	{
-		// last chance snapshot
-		writeToLog(0.f);
-		LLFile::close(mObjectCacheFile);
-		mObjectCacheFile = NULL;
+        writeToLog(0.f);  // Save last data
+        closeStatsFile();
 	}
 }
 
 void LLViewerStatsRecorder::clearStats()
 {
 	mObjectCacheHitCount = 0;
-	mObjectCacheHitSize = 0;
 	mObjectCacheMissFullCount = 0;
-	mObjectCacheMissFullSize = 0;
 	mObjectCacheMissCrcCount = 0;
-	mObjectCacheMissCrcSize = 0;
 	mObjectFullUpdates = 0;
-	mObjectFullUpdatesSize = 0;
 	mObjectTerseUpdates = 0;
-	mObjectTerseUpdatesSize = 0;
 	mObjectCacheMissRequests = 0;
 	mObjectCacheMissResponses = 0;
-	mObjectCacheMissResponsesSize = 0;
 	mObjectCacheUpdateDupes = 0;
 	mObjectCacheUpdateChanges = 0;
 	mObjectCacheUpdateAdds = 0;
@@ -91,45 +84,57 @@ void LLViewerStatsRecorder::clearStats()
 }
 
 
-void LLViewerStatsRecorder::recordObjectUpdateFailure(U32 local_id, const EObjectUpdateType update_type, S32 msg_size)
+void LLViewerStatsRecorder::enableObjectStatsRecording(bool enable, bool logging /* false */)
+{
+    mEnableStatsRecording = enable;
+
+	// if logging is stopping, close the file
+    if (mStatsFile && !logging)
+	{
+        writeToLog(0.f);  // Save last data
+        closeStatsFile();
+	}
+    mEnableStatsLogging = logging;
+}
+
+
+
+void LLViewerStatsRecorder::recordObjectUpdateFailure(S32 msg_size)
 {
 	mObjectUpdateFailures++;
 	mObjectUpdateFailuresSize += msg_size;
 }
 
-void LLViewerStatsRecorder::recordCacheMissEvent(U32 local_id, const EObjectUpdateType update_type, U8 cache_miss_type, S32 msg_size)
+void LLViewerStatsRecorder::recordCacheMissEvent(U8 cache_miss_type)
 {
-	if (LLViewerRegion::CACHE_MISS_TYPE_FULL == cache_miss_type)
+	if (LLViewerRegion::CACHE_MISS_TYPE_TOTAL == cache_miss_type)
 	{
 		mObjectCacheMissFullCount++;
-		mObjectCacheMissFullSize += msg_size;
 	}
 	else
 	{
 		mObjectCacheMissCrcCount++;
-		mObjectCacheMissCrcSize += msg_size;
 	}
 }
 
-void LLViewerStatsRecorder::recordObjectUpdateEvent(U32 local_id, const EObjectUpdateType update_type, LLViewerObject * objectp, S32 msg_size)
+
+void LLViewerStatsRecorder::recordCacheHitEvent()
+{
+    mObjectCacheHitCount++;
+}
+
+void LLViewerStatsRecorder::recordObjectUpdateEvent(const EObjectUpdateType update_type)
 {
-	switch (update_type)
+    switch (update_type)
 	{
 	case OUT_FULL:
 		mObjectFullUpdates++;
-		mObjectFullUpdatesSize += msg_size;
 		break;
 	case OUT_TERSE_IMPROVED:
 		mObjectTerseUpdates++;
-		mObjectTerseUpdatesSize += msg_size;
 		break;
 	case OUT_FULL_COMPRESSED:
 		mObjectCacheMissResponses++;
-		mObjectCacheMissResponsesSize += msg_size;
-		break;
-	case OUT_FULL_CACHED:
-		mObjectCacheHitCount++;
-		mObjectCacheHitSize += msg_size;
 		break;
 	default:
 		LL_WARNS() << "Unknown update_type" << LL_ENDL;
@@ -137,9 +142,9 @@ void LLViewerStatsRecorder::recordObjectUpdateEvent(U32 local_id, const EObjectU
 	};
 }
 
-void LLViewerStatsRecorder::recordCacheFullUpdate(U32 local_id, const EObjectUpdateType update_type, LLViewerRegion::eCacheUpdateResult update_result, LLViewerObject* objectp, S32 msg_size)
+void LLViewerStatsRecorder::recordCacheFullUpdate(LLViewerRegion::eCacheUpdateResult update_result)
 {
-	switch (update_result)
+    switch (update_result)
 	{
 		case LLViewerRegion::CACHE_UPDATE_DUPE:
 			mObjectCacheUpdateDupes++;
@@ -154,7 +159,7 @@ void LLViewerStatsRecorder::recordCacheFullUpdate(U32 local_id, const EObjectUpd
 			mObjectCacheUpdateReplacements++;
 			break;
 		default:
-			LL_WARNS() << "Unknown update_result type" << LL_ENDL;
+            LL_WARNS() << "Unknown update_result type " << (S32) update_result << LL_ENDL;
 			break;
 	};
 }
@@ -166,14 +171,30 @@ void LLViewerStatsRecorder::recordRequestCacheMissesEvent(S32 count)
 
 void LLViewerStatsRecorder::writeToLog( F32 interval )
 {
+    if (!mEnableStatsLogging || !mEnableStatsRecording)
+	{
+		return;
+	}
+
 	size_t data_size = 0;
-	F64 delta_time = LLTimer::getTotalSeconds() - mLastSnapshotTime;
-	S32 total_objects = mObjectCacheHitCount + mObjectCacheMissCrcCount + mObjectCacheMissFullCount + mObjectFullUpdates + mObjectTerseUpdates + mObjectCacheMissRequests + mObjectCacheMissResponses + mObjectCacheUpdateDupes + mObjectCacheUpdateChanges + mObjectCacheUpdateAdds + mObjectCacheUpdateReplacements + mObjectUpdateFailures;
+	F64 delta_time = LLFrameTimer::getTotalSeconds() - mLastSnapshotTime;
+    if (delta_time < interval)
+        return;
 
-	if ( delta_time < interval || total_objects == 0) return;
+	if (mSkipSaveIfZeros)
+	{
+        S32 total_events = mObjectCacheHitCount + mObjectCacheMissCrcCount + mObjectCacheMissFullCount + mObjectFullUpdates +
+                            mObjectTerseUpdates + mObjectCacheMissRequests + mObjectCacheMissResponses + mObjectCacheUpdateDupes +
+                            mObjectCacheUpdateChanges + mObjectCacheUpdateAdds + mObjectCacheUpdateReplacements + mObjectUpdateFailures;
+		if (total_events == 0)
+		{
+            LL_DEBUGS("ILXZeroData") << "ILX: not saving zero data" << LL_ENDL;
+            return;
+        }
+	}
 
-	mLastSnapshotTime = LLTimer::getTotalSeconds();
-	LL_DEBUGS() << "ILX: " 
+	mLastSnapshotTime = LLFrameTimer::getTotalSeconds();
+    LL_DEBUGS("ILX") << "ILX: "
 		<< mObjectCacheHitCount << " hits, " 
 		<< mObjectCacheMissFullCount << " full misses, "
 		<< mObjectCacheMissCrcCount << " crc misses, "
@@ -188,84 +209,124 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 		<< mObjectUpdateFailures << " update failures"
 		<< LL_ENDL;
 
-	if (mObjectCacheFile == NULL)
+	if (mStatsFile == NULL)
 	{
-		mStartTime = LLTimer::getTotalSeconds();
-		mObjectCacheFile = LLFile::fopen(STATS_FILE_NAME, "wb");
-		if (mObjectCacheFile)
-		{	// Write column headers
-			std::ostringstream data_msg;
-			data_msg << "EventTime(ms)\t"
-				<< "Cache Hits\t"
-				<< "Cache Full Misses\t"
-				<< "Cache Crc Misses\t"
-				<< "Full Updates\t"
-				<< "Terse Updates\t"
-				<< "Cache Miss Requests\t"
-				<< "Cache Miss Responses\t"
-				<< "Cache Update Dupes\t"
-				<< "Cache Update Changes\t"
-				<< "Cache Update Adds\t"
-				<< "Cache Update Replacements\t"
-				<< "Update Failures\t"
-				<< "Cache Hits bps\t"
-				<< "Cache Full Misses bps\t"
-				<< "Cache Crc Misses bps\t"
-				<< "Full Updates bps\t"
-				<< "Terse Updates bps\t"
-				<< "Cache Miss Responses bps\t"
-				<< "Texture Fetch bps\t"
-				<< "\n";
-
-			data_size = data_msg.str().size();
-			if (fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile ) != data_size)
+		// Refresh settings
+        mInterval        = gSavedSettings.getF32("StatsReportFileInterval");
+        mSkipSaveIfZeros = gSavedSettings.getBOOL("StatsReportSkipZeroDataSaves");
+        mMaxDuration	 = gSavedSettings.getF32("StatsReportMaxDuration");
+
+		// Open the data file
+        makeStatsFileName();
+        mStatsFile = LLFile::fopen(mStatsFileName, "wb");
+
+		if (mStatsFile)
+		{
+            LL_INFOS("ILX") << "ILX: Writing update information to " << mStatsFileName << LL_ENDL;
+
+            mFileOpenTime = LLFrameTimer::getTotalSeconds();
+
+            // Write column headers
+			std::ostringstream col_headers;
+			col_headers << "Time (sec),"
+					<< "Regions,"
+					<< "Active Cached Objects,"
+					<< "Cache Hits,"
+					<< "Cache Full Misses,"
+					<< "Cache Crc Misses,"
+					<< "Full Updates,"
+					<< "Terse Updates,"
+					<< "Cache Miss Requests,"
+					<< "Cache Miss Responses,"
+					<< "Cache Update Dupes,"
+					<< "Cache Update Changes,"
+					<< "Cache Update Adds,"
+					<< "Cache Update Replacements,"
+					<< "Update Failures,"
+					<< "Texture Fetch bps,"
+					<< "\n";
+
+			data_size = col_headers.str().size();
+			if (fwrite(col_headers.str().c_str(), 1, data_size, mStatsFile ) != data_size)
 			{
-				LL_WARNS() << "failed to write full headers to " << STATS_FILE_NAME << LL_ENDL;
+				LL_WARNS() << "failed to write full headers to " << mStatsFileName << LL_ENDL;
 			}
 		}
 		else
-		{
-			//LL_WARNS() << "Couldn't open " << STATS_FILE_NAME << " for logging." << LL_ENDL;
+		{	// Failed to open file
+			LL_WARNS() << "Couldn't open " << mStatsFileName << " for logging, turning off stats recording." << LL_ENDL;
+            mEnableStatsLogging = false;
 			return;
 		}
 	}
 
-	std::ostringstream data_msg;
-
-	data_msg << getTimeSinceStart()
-		<< "\t " << mObjectCacheHitCount
-		<< "\t" << mObjectCacheMissFullCount
-		<< "\t" << mObjectCacheMissCrcCount
-		<< "\t" << mObjectFullUpdates
-		<< "\t" << mObjectTerseUpdates
-		<< "\t" << mObjectCacheMissRequests
-		<< "\t" << mObjectCacheMissResponses
-		<< "\t" << mObjectCacheUpdateDupes
-		<< "\t" << mObjectCacheUpdateChanges
-		<< "\t" << mObjectCacheUpdateAdds
-		<< "\t" << mObjectCacheUpdateReplacements
-		<< "\t" << mObjectUpdateFailures
-		<< "\t" << (mObjectCacheHitSize * 8 / delta_time)
-		<< "\t" << (mObjectCacheMissFullSize * 8 / delta_time)
-		<< "\t" << (mObjectCacheMissCrcSize * 8 / delta_time)
-		<< "\t" << (mObjectFullUpdatesSize * 8 / delta_time)
-		<< "\t" << (mObjectTerseUpdatesSize * 8 / delta_time)
-		<< "\t" << (mObjectCacheMissResponsesSize * 8 / delta_time)
-		<< "\t" << (mTextureFetchSize * 8 / delta_time)
+	std::ostringstream stats_data;
+
+	stats_data << getTimeSinceStart()
+		<< "," << LLWorld::getInstance()->getRegionList().size()
+		<< "," << LLWorld::getInstance()->getNumOfActiveCachedObjects()
+		<< "," << mObjectCacheHitCount
+		<< "," << mObjectCacheMissFullCount
+		<< "," << mObjectCacheMissCrcCount
+		<< "," << mObjectFullUpdates
+		<< "," << mObjectTerseUpdates
+		<< "," << mObjectCacheMissRequests
+		<< "," << mObjectCacheMissResponses
+		<< "," << mObjectCacheUpdateDupes
+		<< "," << mObjectCacheUpdateChanges
+		<< "," << mObjectCacheUpdateAdds
+		<< "," << mObjectCacheUpdateReplacements
+		<< "," << mObjectUpdateFailures
+		<< "," << (mTextureFetchSize * 8 / delta_time)
 		<< "\n";
 
-	data_size = data_msg.str().size();
-	if ( data_size != fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile ))
+	data_size = stats_data.str().size();
+	if ( data_size != fwrite(stats_data.str().c_str(), 1, data_size, mStatsFile ))
 	{
-				LL_WARNS() << "Unable to write complete column data to " << STATS_FILE_NAME << LL_ENDL;
-	}
+		LL_WARNS() << "Unable to write complete column data to " << mStatsFileName << LL_ENDL;
+        closeStatsFile();
+    }
 
 	clearStats();
+
+	if (getTimeSinceStart() >= mMaxDuration)
+    {  // If file recording has been running for too long, stop it.
+        closeStatsFile();
+    }
+}
+
+void LLViewerStatsRecorder::closeStatsFile()
+{
+	if (mStatsFile)
+	{
+        LL_INFOS("ILX") << "ILX: Stopped writing update information to " << mStatsFileName << " after " << getTimeSinceStart()
+                        << " seconds." << LL_ENDL;
+        LLFile::close(mStatsFile);
+		mStatsFile = NULL;
+    }
+    mEnableStatsLogging = false;
+}
+
+void LLViewerStatsRecorder::makeStatsFileName()
+{
+    // Create filename - tbd: use pid?
+#if LL_WINDOWS
+    std::string stats_file_name("SLViewerStats-");
+#else
+    std::string stats_file_name("slviewerstats-");
+#endif
+
+    F64         now      = LLFrameTimer::getTotalSeconds();
+    std::string date_str = LLDate(now).asString();
+    std::replace(date_str.begin(), date_str.end(), ':', '-');  // Make it valid for a filename
+    stats_file_name.append(date_str);
+    stats_file_name.append(".csv");
+    mStatsFileName = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, stats_file_name);
 }
 
 F32 LLViewerStatsRecorder::getTimeSinceStart()
 {
-	return (F32) (LLTimer::getTotalSeconds() - mStartTime);
+	return (F32) (LLFrameTimer::getTotalSeconds() - mFileOpenTime);
 }
 
 void LLViewerStatsRecorder::recordTextureFetch( S32 msg_size )
diff --git a/indra/newview/llviewerstatsrecorder.h b/indra/newview/llviewerstatsrecorder.h
index c974bea49d..90f8ca8742 100644
--- a/indra/newview/llviewerstatsrecorder.h
+++ b/indra/newview/llviewerstatsrecorder.h
@@ -31,10 +31,6 @@
 // This is a diagnostic class used to record information from the viewer
 // for analysis.
 
-// This is normally 0.  Set to 1 to enable viewer stats recording
-#define LL_RECORD_VIEWER_STATS	0
-
-
 #include "llframetimer.h"
 #include "llviewerobject.h"
 #include "llviewerregion.h"
@@ -49,86 +45,111 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
 	~LLViewerStatsRecorder();
 
  public:
-	void objectUpdateFailure(U32 local_id, const EObjectUpdateType update_type, S32 msg_size)
-	{
-#if LL_RECORD_VIEWER_STATS
-		recordObjectUpdateFailure(local_id, update_type, msg_size);
-#endif
+	// Enable/disable stats recording.  This is broken down into two
+	// flags so we can record stats without writing them to the log
+	// file.  This is useful to analyzing updates for scene loading.
+   void enableObjectStatsRecording(bool enable, bool logging = false);
+
+	bool isEnabled() const { return mEnableStatsRecording; }
+	bool isLogging() const { return mEnableStatsLogging; }
+
+	void objectUpdateFailure(S32 msg_size)
+    {
+        if (mEnableStatsRecording)
+        {
+            recordObjectUpdateFailure(msg_size);
+        }
 	}
 
-	void cacheMissEvent(U32 local_id, const EObjectUpdateType update_type, U8 cache_miss_type, S32 msg_size)
+	void cacheMissEvent(U8 cache_miss_type)
 	{
-#if LL_RECORD_VIEWER_STATS
-		recordCacheMissEvent(local_id, update_type, cache_miss_type, msg_size);
-#endif
+        if (mEnableStatsRecording)
+        {
+            recordCacheMissEvent(cache_miss_type);
+        }
+    }
+
+	void cacheHitEvent()
+    {
+        if (mEnableStatsRecording)
+        {
+            recordCacheHitEvent();
+        }
+    }
+
+    void objectUpdateEvent(const EObjectUpdateType update_type)
+    {
+		if (mEnableStatsRecording)
+		{
+			recordObjectUpdateEvent(update_type);
+		}
 	}
 
-	void objectUpdateEvent(U32 local_id, const EObjectUpdateType update_type, LLViewerObject * objectp, S32 msg_size)
-	{
-#if LL_RECORD_VIEWER_STATS
-		recordObjectUpdateEvent(local_id, update_type, objectp, msg_size);
-#endif
-	}
-
-	void cacheFullUpdate(U32 local_id, const EObjectUpdateType update_type, LLViewerRegion::eCacheUpdateResult update_result, LLViewerObject* objectp, S32 msg_size)
-	{
-#if LL_RECORD_VIEWER_STATS
-		recordCacheFullUpdate(local_id, update_type, update_result, objectp, msg_size);
-#endif
+	void cacheFullUpdate(LLViewerRegion::eCacheUpdateResult update_result)
+    {
+		if (mEnableStatsRecording)
+		{
+			recordCacheFullUpdate(update_result);
+		}
 	}
 
 	void requestCacheMissesEvent(S32 count)
 	{
-#if LL_RECORD_VIEWER_STATS
-		recordRequestCacheMissesEvent(count);
-#endif
+        if (mEnableStatsRecording)
+        {
+            recordRequestCacheMissesEvent(count);
+        }
 	}
 
 	void textureFetch(S32 msg_size)
 	{
-#if LL_RECORD_VIEWER_STATS
-		recordTextureFetch(msg_size);
-#endif
+        if (mEnableStatsRecording)
+        {
+            recordTextureFetch(msg_size);
+        }
 	}
 
-	void log(F32 interval)
+	void idle()
 	{
-#if LL_RECORD_VIEWER_STATS
-		writeToLog(interval);
-#endif
+        writeToLog(mInterval);
 	}
 
 	F32 getTimeSinceStart();
 
 private:
-	void recordObjectUpdateFailure(U32 local_id, const EObjectUpdateType update_type, S32 msg_size);
-	void recordCacheMissEvent(U32 local_id, const EObjectUpdateType update_type, U8 cache_miss_type, S32 msg_size);
-	void recordObjectUpdateEvent(U32 local_id, const EObjectUpdateType update_type, LLViewerObject * objectp, S32 msg_size);
-	void recordCacheFullUpdate(U32 local_id, const EObjectUpdateType update_type, LLViewerRegion::eCacheUpdateResult update_result, LLViewerObject* objectp, S32 msg_size);
+	void recordObjectUpdateFailure(S32 msg_size);
+	void recordCacheMissEvent(U8 cache_miss_type);
+	void recordCacheHitEvent();
+	void recordObjectUpdateEvent(const EObjectUpdateType update_type);
+	void recordCacheFullUpdate(LLViewerRegion::eCacheUpdateResult update_result);
 	void recordRequestCacheMissesEvent(S32 count);
 	void recordTextureFetch(S32 msg_size);
 	void writeToLog(F32 interval);
+    void closeStatsFile();
+	void makeStatsFileName();
 
 	static LLViewerStatsRecorder* sInstance;
 
-	LLFILE *	mObjectCacheFile;		// File to write data into
+	LLFILE *	mStatsFile;			// File to write data into
+    std::string mStatsFileName;
+
 	LLFrameTimer	mTimer;
-	F64			mStartTime;
+	F64			mFileOpenTime;
 	F64			mLastSnapshotTime;
+    F32         mInterval;					// Interval between data log writes
+    F32         mMaxDuration;				// Time limit on file
+
+	bool        mEnableStatsRecording;		// Set to true to enable recording stats data
+    bool		mEnableStatsLogging;		// Set true to write stats to log file
+	bool		mSkipSaveIfZeros;			// Set true to skip saving stats if all values are zero	
 
 	S32			mObjectCacheHitCount;
-	S32			mObjectCacheHitSize;
 	S32			mObjectCacheMissFullCount;
-	S32			mObjectCacheMissFullSize;
 	S32			mObjectCacheMissCrcCount;
-	S32			mObjectCacheMissCrcSize;
 	S32			mObjectFullUpdates;
-	S32			mObjectFullUpdatesSize;
 	S32			mObjectTerseUpdates;
-	S32			mObjectTerseUpdatesSize;
 	S32			mObjectCacheMissRequests;
 	S32			mObjectCacheMissResponses;
-	S32			mObjectCacheMissResponsesSize;
 	S32			mObjectCacheUpdateDupes;
 	S32			mObjectCacheUpdateChanges;
 	S32			mObjectCacheUpdateAdds;
@@ -137,9 +158,7 @@ private:
 	S32			mObjectUpdateFailuresSize;
 	S32			mTextureFetchSize;
 
-
 	void	clearStats();
 };
 
 #endif // LLVIEWERSTATSRECORDER_H
-
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f72d1f0bf9..d78ebf17e3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3463,14 +3463,24 @@ function="World.EnvPreset"
                 <menu_item_call.on_click
                  function="Advanced.DumpRegionObjectCache" />
             </menu_item_call>
-        
-<menu_item_call
-             label="Interest List: Full Update"
-             name="Interest List: Full Update"
+
+			<menu_item_check
+			  label="Interest List 360 Mode"
+             name="Interest List: 360 Mode"
              shortcut="alt|shift|I">
-                <menu_item_call.on_click
-                 function="Advanced.InterestListFullUpdate" />
-            </menu_item_call>
+			   <menu_item_check.on_check
+				function="Advanced.CheckInterestList360Mode" />
+			   <menu_item_check.on_click
+				  function="Advanced.ToggleInterestList360Mode" />
+            </menu_item_check>
+			<menu_item_check
+             label="Record Stats to File"
+             name="Stats Recorder File">
+				<menu_item_check.on_check
+                 function="Advanced.CheckStatsRecorder" />
+				<menu_item_check.on_click
+                 function="Advanced.ToggleStatsRecorder" />
+			</menu_item_check>
         </menu>
         <menu
          create_jump_keys="true"
-- 
cgit v1.2.3


From 25277a773db9311ecddb80febe623240769c0636 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 4 May 2023 19:19:32 +0300
Subject: SL-19683 Add menu items should be disabled for some folders in
 single-folder view

---
 indra/newview/llpanelmaininventory.cpp | 50 ++++++++++++++++++++++++++++++++++
 indra/newview/llpanelmaininventory.h   |  1 +
 2 files changed, 51 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 3110adff15..b0422b7bd9 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1494,6 +1494,7 @@ void LLPanelMainInventory::onAddButtonClick()
 	LLMenuGL* menu = (LLMenuGL*)mMenuAddHandle.get();
 	if (menu)
 	{
+        disableAddIfNeeded();
 		menu->getChild<LLMenuItemGL>("New Folder")->setEnabled(!isRecentItemsPanelSelected());
 
 		setUploadCostIfNeeded();
@@ -2199,6 +2200,55 @@ void LLPanelMainInventory::setUploadCostIfNeeded()
 	}
 }
 
+bool is_add_allowed(LLUUID folder_id)
+{
+    if(!gInventory.isObjectDescendentOf(folder_id, gInventory.getRootFolderID()))
+    {
+        return false;
+    }
+
+    std::vector<LLFolderType::EType> not_allowed_types;
+    not_allowed_types.push_back(LLFolderType::FT_LOST_AND_FOUND);
+    not_allowed_types.push_back(LLFolderType::FT_FAVORITE);
+    not_allowed_types.push_back(LLFolderType::FT_MARKETPLACE_LISTINGS);
+    not_allowed_types.push_back(LLFolderType::FT_TRASH);
+    not_allowed_types.push_back(LLFolderType::FT_CURRENT_OUTFIT);
+    not_allowed_types.push_back(LLFolderType::FT_INBOX);
+
+    for (std::vector<LLFolderType::EType>::const_iterator it = not_allowed_types.begin();
+         it != not_allowed_types.end(); ++it)
+    {
+        if(gInventory.isObjectDescendentOf(folder_id, gInventory.findCategoryUUIDForType(*it)))
+        {
+            return false;
+        }
+    }
+
+    LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id);
+    if (cat && (cat->getPreferredType() == LLFolderType::FT_OUTFIT))
+    {
+        return false;
+    }
+    return true;
+}
+
+void LLPanelMainInventory::disableAddIfNeeded()
+{
+    LLMenuGL* menu = (LLMenuGL*)mMenuAddHandle.get();
+    if (menu)
+    {
+        bool enable = !mSingleFolderMode || is_add_allowed(getCurrentSFVRoot());
+
+        menu->getChild<LLMenuItemGL>("New Folder")->setEnabled(enable);
+        menu->getChild<LLMenuItemGL>("New Script")->setEnabled(enable);
+        menu->getChild<LLMenuItemGL>("New Note")->setEnabled(enable);
+        menu->getChild<LLMenuItemGL>("New Gesture")->setEnabled(enable);
+        menu->setItemEnabled("New Clothes", enable);
+        menu->setItemEnabled("New Body Parts", enable);
+        menu->setItemEnabled("New Settings", enable);
+    }
+}
+
 bool LLPanelMainInventory::hasSettingsInventory()
 {
     return LLEnvironment::instance().isInventoryEnabled();
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 4f792878a5..21e08bbac8 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -222,6 +222,7 @@ protected:
 	 * Set upload cost in "Upload" sub menu.
 	 */
 	void setUploadCostIfNeeded();
+    void disableAddIfNeeded();
 private:
 	LLToggleableMenu*			mMenuGearDefault;
     LLToggleableMenu*           mMenuViewDefault;
-- 
cgit v1.2.3


From 98681ef73ff33e0c0ff321e839a8e79b2cb334de Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 May 2023 15:56:21 +0300
Subject: SL-19533 Prevent COF dupplicate request

---
 indra/newview/llappearancemgr.cpp  | 20 +++++++++++++++-----
 indra/newview/llinventorymodel.cpp | 13 +++++++++++--
 indra/newview/llstartup.cpp        | 14 +++++++++++++-
 3 files changed, 39 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4133470973..454ac5d88c 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4565,10 +4565,14 @@ void callAfterCOFFetch(nullary_func_t cb)
 {
     LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
     LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
-    if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN && AISAPI::isAvailable())
+    if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
     {
-        // Assume that we have no relevant cache. Fetch cof, and items cof's links point to.
-        AISAPI::FetchCOF([cb](const LLUUID& id)
+        if (AISAPI::isAvailable())
+        {
+            // Mark cof (update timer) so that background fetch won't request it
+            cat->setFetching(LLViewerInventoryCategory::FETCH_RECURSIVE);
+            // Assume that we have no relevant cache. Fetch cof, and items cof's links point to.
+            AISAPI::FetchCOF([cb](const LLUUID& id)
                          {
                              cb();
                              LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
@@ -4578,8 +4582,14 @@ void callAfterCOFFetch(nullary_func_t cb)
                                  cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
                              }
                          });
-        // Mark it so that background fetch won't request it if it didn't already
-        cat->setFetching(LLViewerInventoryCategory::FETCH_RECURSIVE);
+        }
+        else
+        {
+            LL_WARNS() << "AIS API v3 not available, can't use AISAPI::FetchCOF" << LL_ENDL;
+            // startup should have marked folder as fetching, remove that
+            cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+            callAfterCategoryFetch(cat_id, cb);
+        }
     }
     else
     {
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 48539f4748..c65901a754 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -853,8 +853,17 @@ void LLInventoryModel::ensureCategoryForTypeExists(LLFolderType::EType preferred
                 LLStringUtil::null,
                 [preferred_type](const LLUUID &new_cat_id)
             {
-                LL_DEBUGS("Inventory") << "Created category: " << new_cat_id
-                    << " for type: " << preferred_type << LL_ENDL;
+                    if (new_cat_id.isNull())
+                    {
+                        LL_WARNS("Inventory")
+                            << "Failed to create folder of type " << preferred_type
+                            << LL_ENDL;
+                    }
+                    else
+                    {
+                        LL_DEBUGS("Inventory") << "Created category: " << new_cat_id
+                            << " for type: " << preferred_type << LL_ENDL;
+                    }
             }
             );
         }
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 5d1df21c9b..10ddd59f34 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1900,9 +1900,21 @@ bool idle_startup()
 			LLNotificationsUtil::add("InventoryUnusable");
 		}
 		
-        LLInventoryModelBackgroundFetch::instance().start();
 		gInventory.createCommonSystemCategories();
 
+        LLInventoryModelBackgroundFetch::instance().start();
+        LLUUID cof_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+        LLViewerInventoryCategory* cof = gInventory.getCategory(cof_id);
+        if (cof
+            && cof->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+        {
+            // Special case, dupplicate request prevention.
+            // Cof folder will be requested via FetchCOF
+            // in appearance manager, prevent recursive fetch
+            cof->setFetching(LLViewerInventoryCategory::FETCH_RECURSIVE);
+        }
+
+
 		// It's debatable whether this flag is a good idea - sets all
 		// bits, and in general it isn't true that inventory
 		// initialization generates all types of changes. Maybe add an
-- 
cgit v1.2.3


From 61818417d619c8d17cf861f0d72b314a14269e2f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 5 May 2023 18:17:00 +0300
Subject: SL-19641 FIXED Gallery item is not selected after using 'Find
 original'

---
 indra/newview/llinventorygallery.cpp   |  5 +++
 indra/newview/llinventorygallery.h     |  1 +
 indra/newview/llpanelmaininventory.cpp | 70 +++++++++++++++++++++++++++++++---
 indra/newview/llpanelmaininventory.h   |  7 +++-
 4 files changed, 76 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index a078d6c81d..37801c8dd5 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -882,6 +882,11 @@ void LLInventoryGallery::scrollToShowItem(const LLUUID& item_id)
     }
 }
 
+LLInventoryGalleryItem* LLInventoryGallery::getSelectedItem()
+{
+    return mItemMap[mSelectedItemID];
+}
+
 void LLInventoryGallery::updateMessageVisibility()
 {
 
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 2cf038b7d8..dfb7be6a86 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -129,6 +129,7 @@ public:
     bool hasVisibleItems();
     void handleModifiedFilter();
     LLScrollContainer* getScrollableContainer() { return mScrollPanel; }
+    LLInventoryGalleryItem* getSelectedItem();
 
 protected:
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index b0422b7bd9..2f6276ff77 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -122,7 +122,9 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
       mViewMode(MODE_COMBINATION),
       mCombinationShapeDirty(true),
       mListViewRootUpdatedConnection(),
-      mGalleryRootUpdatedConnection()
+      mGalleryRootUpdatedConnection(),
+      mDelayedCombGalleryScroll(false),
+      mDelayedCombInvPanelScroll(false)
 {
 	// Menu Callbacks (non contex menus)
 	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2));
@@ -466,7 +468,7 @@ void LLPanelMainInventory::newFolderWindow(LLUUID folder_id, LLUUID item_to_sele
                     main_inventory->setFocus(true);
                     if(item_to_select.notNull())
                     {
-                        sidepanel_inventory->getActivePanel()->setSelection(item_to_select, TAKE_FOCUS_YES);
+                        main_inventory->setGallerySelection(item_to_select);
                     }
                     return;
                 }
@@ -491,7 +493,7 @@ void LLPanelMainInventory::newFolderWindow(LLUUID folder_id, LLUUID item_to_sele
                     main_inventory->setSingleFolderViewRoot(folder_id);
                     if(item_to_select.notNull())
                     {
-                        sidepanel_inventory->getActivePanel()->setSelection(item_to_select, TAKE_FOCUS_YES);
+                        main_inventory->setGallerySelection(item_to_select, true);
                     }
                 }
             }
@@ -2345,6 +2347,15 @@ void LLPanelMainInventory::updateCombinationVisibility()
         mCombinationScroller->reshape(desired_width, inv_rect.getHeight() + galery_rect.getHeight(), true);
         mCombinationGalleryPanel->setShape(galery_rect, false);
         mCombinationInventoryPanel->setShape(inv_rect, false);
+
+        if(mDelayedCombGalleryScroll)
+        {
+            scrollToGallerySelection();
+        }
+        else if(mDelayedCombInvPanelScroll)
+        {
+            scrollToInvPanelSelection();
+        }
     }
 }
 
@@ -2478,7 +2489,7 @@ LLInventoryFilter& LLPanelMainInventory::getCurrentFilter()
     }
 }
 
-void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id)
+void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_window)
 {
     if(mSingleFolderMode && isGalleryViewMode())
     {
@@ -2488,13 +2499,60 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id)
     {
         if(mCombinationGalleryPanel->getFilter().checkAgainstFilterThumbnails(item_id))
         {
-            mCombinationGalleryPanel->changeItemSelection(item_id, true);
+            mCombinationGalleryPanel->changeItemSelection(item_id, false);
+            if(new_window)
+            {
+                mDelayedCombGalleryScroll = new_window;
+            }
+            else
+            {
+                scrollToGallerySelection();
+            }
         }
         else
         {
-            mCombinationInventoryPanel->setSelection(item_id, false);
+            mCombinationInventoryPanel->setSelection(item_id, true);
+            if(new_window)
+            {
+                mDelayedCombInvPanelScroll = new_window;
+            }
+            else
+            {
+                scrollToInvPanelSelection();
+            }
         }
     }
+    else if (mSingleFolderMode && isListViewMode())
+    {
+        mSingleFolderPanelInventory->setSelection(item_id, true);
+    }
+}
+
+void LLPanelMainInventory::scrollToGallerySelection()
+{
+    LLInventoryGalleryItem* item = mCombinationGalleryPanel->getSelectedItem();
+    LLScrollContainer* scroll_panel = getChild<LLScrollContainer>("combination_view_inventory");
+
+    if(item)
+    {
+        LLRect item_rect;
+        item->localRectToOtherView(item->getLocalRect(), &item_rect, mCombinationScroller);
+        scroll_panel->scrollToShowRect(item_rect);
+    }
 }
+
+void LLPanelMainInventory::scrollToInvPanelSelection()
+{
+    LLFolderViewItem* item = mCombinationInventoryPanel->getRootFolder()->getCurSelectedItem();
+    LLScrollContainer* scroll_panel = getChild<LLScrollContainer>("combination_view_inventory");
+
+    if(item)
+    {
+        LLRect item_rect;
+        item->localRectToOtherView(item->getLocalRect(), &item_rect, mCombinationScroller);
+        scroll_panel->scrollToShowRect(item_rect);
+    }
+}
+
 // List Commands                                                              //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 21e08bbac8..44beba6b4f 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -120,10 +120,13 @@ public:
     void onBackFolderClicked();
     void onForwardFolderClicked();
     void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true);
-    void setGallerySelection(const LLUUID& item_id);
+    void setGallerySelection(const LLUUID& item_id, bool new_window = false);
     LLUUID getSingleFolderViewRoot();
     bool isSingleFolderMode() { return mSingleFolderMode; }
 
+    void scrollToGallerySelection();
+    void scrollToInvPanelSelection();
+
     void setViewMode(EViewModeType mode);
     bool isListViewMode() { return (mViewMode == MODE_LIST); }
     bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); }
@@ -236,6 +239,8 @@ private:
 
     bool                        mForceShowInvLayout;
     bool                        mCombinationShapeDirty;
+    bool                        mDelayedCombGalleryScroll;
+    bool                        mDelayedCombInvPanelScroll;
 	// List Commands                                                              //
 	////////////////////////////////////////////////////////////////////////////////
 };
-- 
cgit v1.2.3


From 03ed823e5993acf874289e6439e6df31732e4743 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 6 May 2023 02:33:39 +0300
Subject: SL-19688 Fix combined view not updating on thumbnail change

---
 indra/newview/llpanelmaininventory.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2f6276ff77..c57ff26b91 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -916,6 +916,7 @@ void LLPanelMainInventory::changed(U32 mask)
         || (mask & LLInventoryObserver::STRUCTURE)
         || (mask & LLInventoryObserver::REMOVE)
         || (mask & LLInventoryObserver::ADD)
+        || (mask & LLInventoryObserver::INTERNAL) // Thumbnail
         || (mask & LLInventoryObserver::LABEL))
     {
         // todo: can be limited to just observed folder
-- 
cgit v1.2.3


From eaf95d084a585c8a0a9ac086679487fa40e1db71 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 6 May 2023 03:17:45 +0300
Subject: SL-19689 In combination view 'raname' field doesn't update position
 properly

---
 indra/llui/llfolderview.h              | 2 +-
 indra/newview/llpanelmaininventory.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index f19df1d0dc..22b8c475ec 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -255,13 +255,13 @@ public:
 	virtual void updateMenu();
 
 	void finishRenamingItem( void );
+    void updateRenamerPosition();
 
     // Note: We may eventually have to move that method up the hierarchy to LLFolderViewItem.
 	LLHandle<LLFolderView>	getHandle() const { return getDerivedHandle<LLFolderView>(); }
     
 private:
 	void updateMenuOptions(LLMenuGL* menu);
-	void updateRenamerPosition();
 
 protected:
 	LLScrollContainer* mScrollContainer;  // NULL if this is not a child of a scroll container.
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index c57ff26b91..06b71d0f7a 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2357,6 +2357,12 @@ void LLPanelMainInventory::updateCombinationVisibility()
         {
             scrollToInvPanelSelection();
         }
+
+        LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder();
+        if (root_folder)
+        {
+            root_folder->updateRenamerPosition();
+        }
     }
 }
 
-- 
cgit v1.2.3


From 90631fccef6ab1596655b18fb7dbdc87a4cb80ac Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Tue, 9 May 2023 17:16:26 +0100
Subject: SL-19676 - more update and scene loading stats.  Added texture and
 mesh count

---
 indra/newview/llmeshrepository.cpp      |  3 +++
 indra/newview/lltexturefetch.cpp        |  8 +++++++-
 indra/newview/llviewerstatsrecorder.cpp | 19 +++++++++++++------
 indra/newview/llviewerstatsrecorder.h   | 18 ++++++++++++++----
 4 files changed, 37 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f937754368..e2fb218b1b 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -56,6 +56,7 @@
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"
+#include "llviewerstatsrecorder.h"
 #include "llviewertexturelist.h"
 #include "llvolume.h"
 #include "llvolumemgr.h"
@@ -4089,6 +4090,8 @@ void LLMeshRepository::notifyMeshLoaded(const LLVolumeParams& mesh_params, LLVol
 		}
 		
 		mLoadingMeshes[detail].erase(obj_iter);
+
+		LLViewerStatsRecorder::instance().meshLoaded();
 	}
 }
 
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index b0d6a5d466..eea56af0ae 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2183,7 +2183,6 @@ S32 LLTextureFetchWorker::callbackHttpGet(LLCore::HttpResponse * response,
 		LL_DEBUGS(LOG_TXT) << "HTTP RECEIVED: " << mID.asString() << " Bytes: " << data_size << LL_ENDL;
 		if (data_size > 0)
 		{
-			LLViewerStatsRecorder::instance().textureFetch(data_size);
 			// *TODO: set the formatted image data here directly to avoid the copy
 
 			// Hold on to body for later copy
@@ -2249,6 +2248,13 @@ S32 LLTextureFetchWorker::callbackHttpGet(LLCore::HttpResponse * response,
 			mHaveAllData = TRUE;
 		}
 		mRequestedSize = data_size;
+
+		if (mHaveAllData)
+        {
+            LLViewerStatsRecorder::instance().textureFetch();
+        }
+
+        // *TODO: set the formatted image data here directly to avoid the copy
 	}
 	else
 	{
diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp
index 64167135ac..f95a960186 100644
--- a/indra/newview/llviewerstatsrecorder.cpp
+++ b/indra/newview/llviewerstatsrecorder.cpp
@@ -80,7 +80,8 @@ void LLViewerStatsRecorder::clearStats()
 	mObjectCacheUpdateReplacements = 0;
 	mObjectUpdateFailures = 0;
 	mObjectUpdateFailuresSize = 0;
-	mTextureFetchSize = 0;
+	mTextureFetchCount = 0;
+    mMeshLoadedCount = 0;
 }
 
 
@@ -243,8 +244,9 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 					<< "Cache Update Adds,"
 					<< "Cache Update Replacements,"
 					<< "Update Failures,"
-					<< "Texture Fetch bps,"
-					<< "\n";
+					<< "Texture Count,"
+                    << "Mesh Load Count,"
+                    << "\n";
 
 			data_size = col_headers.str().size();
 			if (fwrite(col_headers.str().c_str(), 1, data_size, mStatsFile ) != data_size)
@@ -277,7 +279,8 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 		<< "," << mObjectCacheUpdateAdds
 		<< "," << mObjectCacheUpdateReplacements
 		<< "," << mObjectUpdateFailures
-		<< "," << (mTextureFetchSize * 8 / delta_time)
+		<< "," << mTextureFetchCount
+		<< "," << mMeshLoadedCount
 		<< "\n";
 
 	data_size = stats_data.str().size();
@@ -329,10 +332,14 @@ F32 LLViewerStatsRecorder::getTimeSinceStart()
 	return (F32) (LLFrameTimer::getTotalSeconds() - mFileOpenTime);
 }
 
-void LLViewerStatsRecorder::recordTextureFetch( S32 msg_size )
+void LLViewerStatsRecorder::recordTextureFetch()
 {
-	mTextureFetchSize += msg_size;
+    mTextureFetchCount += 1;
 }
 
+void LLViewerStatsRecorder::recordMeshLoaded()
+{
+	mMeshLoadedCount += 1;
+}
 
 
diff --git a/indra/newview/llviewerstatsrecorder.h b/indra/newview/llviewerstatsrecorder.h
index 90f8ca8742..37c08a51cf 100644
--- a/indra/newview/llviewerstatsrecorder.h
+++ b/indra/newview/llviewerstatsrecorder.h
@@ -101,14 +101,22 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
         }
 	}
 
-	void textureFetch(S32 msg_size)
+	void textureFetch()
 	{
         if (mEnableStatsRecording)
         {
-            recordTextureFetch(msg_size);
+            recordTextureFetch();
         }
 	}
 
+	void meshLoaded()
+	{
+		if (mEnableStatsRecording)
+		{
+			recordMeshLoaded();
+		}
+	}
+
 	void idle()
 	{
         writeToLog(mInterval);
@@ -123,7 +131,8 @@ private:
 	void recordObjectUpdateEvent(const EObjectUpdateType update_type);
 	void recordCacheFullUpdate(LLViewerRegion::eCacheUpdateResult update_result);
 	void recordRequestCacheMissesEvent(S32 count);
-	void recordTextureFetch(S32 msg_size);
+	void recordTextureFetch();
+	void recordMeshLoaded();
 	void writeToLog(F32 interval);
     void closeStatsFile();
 	void makeStatsFileName();
@@ -156,7 +165,8 @@ private:
 	S32			mObjectCacheUpdateReplacements;
 	S32			mObjectUpdateFailures;
 	S32			mObjectUpdateFailuresSize;
-	S32			mTextureFetchSize;
+	S32			mTextureFetchCount;
+    S32         mMeshLoadedCount;
 
 	void	clearStats();
 };
-- 
cgit v1.2.3


From 06f63d9b871458f71340ba7d0126bf964d17048f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 10 May 2023 12:02:09 +0300
Subject: SL-19683 'New folder' menu item should be disable for the listed
 folders in sfv

---
 indra/newview/llpanelmaininventory.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 06b71d0f7a..4577c1defa 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1498,7 +1498,6 @@ void LLPanelMainInventory::onAddButtonClick()
 	if (menu)
 	{
         disableAddIfNeeded();
-		menu->getChild<LLMenuItemGL>("New Folder")->setEnabled(!isRecentItemsPanelSelected());
 
 		setUploadCostIfNeeded();
 
@@ -2242,7 +2241,7 @@ void LLPanelMainInventory::disableAddIfNeeded()
     {
         bool enable = !mSingleFolderMode || is_add_allowed(getCurrentSFVRoot());
 
-        menu->getChild<LLMenuItemGL>("New Folder")->setEnabled(enable);
+        menu->getChild<LLMenuItemGL>("New Folder")->setEnabled(enable && !isRecentItemsPanelSelected());
         menu->getChild<LLMenuItemGL>("New Script")->setEnabled(enable);
         menu->getChild<LLMenuItemGL>("New Note")->setEnabled(enable);
         menu->getChild<LLMenuItemGL>("New Gesture")->setEnabled(enable);
-- 
cgit v1.2.3


From 8a1cb8c00cf75ff1e09c72c2fb487728ec77c66b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 10 May 2023 12:51:08 +0300
Subject: SL-19697 FIXED Clicking on inventory item in list view does not
 unselect item in gallery view

---
 indra/newview/llinventorygallery.cpp   |  8 ++++++++
 indra/newview/llinventorygallery.h     |  1 +
 indra/newview/llpanelmaininventory.cpp | 21 ++++++++++++++++++++-
 indra/newview/llpanelmaininventory.h   |  2 ++
 4 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 37801c8dd5..9c7e96e97e 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1056,6 +1056,14 @@ void LLInventoryGallery::deselectItem(const LLUUID& category_id)
     }
 }
 
+void LLInventoryGallery::clearSelection()
+{
+    if(mSelectedItemID != LLUUID::null)
+    {
+        changeItemSelection(LLUUID::null);
+    }
+}
+
 void LLInventoryGallery::signalSelectionItemID(const LLUUID& category_id)
 {
     mSelectionChangeSignal(category_id);
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index dfb7be6a86..f7065afdae 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -116,6 +116,7 @@ public:
     void computeDifference(const LLInventoryModel::cat_array_t vcats, const LLInventoryModel::item_array_t vitems, uuid_vec_t& vadded, uuid_vec_t& vremoved);
 
     void deselectItem(const LLUUID& category_id);
+    void clearSelection();
     void changeItemSelection(const LLUUID& item_id, bool scroll_to_selection = false);
     void scrollToShowItem(const LLUUID& item_id);
     void signalSelectionItemID(const LLUUID& category_id);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 4577c1defa..a8c8ce994d 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -262,7 +262,7 @@ BOOL LLPanelMainInventory::postBuild()
     LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
     comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_EXCLUDE_THUMBNAILS);
     comb_inv_filter.markDefault();
-    mCombinationInventoryPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mCombinationInventoryPanel, _1, _2));
+    mCombinationInventoryPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onCombinationInventorySelectionChanged, this, _1, _2));
     mCombinationInventoryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
 
     mCombinationGalleryPanel = getChild<LLInventoryGallery>("comb_gallery_view_inv");
@@ -270,6 +270,7 @@ BOOL LLPanelMainInventory::postBuild()
     comb_gallery_filter.setFilterThumbnails(LLInventoryFilter::FILTER_ONLY_THUMBNAILS);
     comb_gallery_filter.markDefault();
     mCombinationGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, true));
+    mCombinationGalleryPanel->setSelectionChangeCallback(boost::bind(&LLPanelMainInventory::onCombinationGallerySelectionChanged, this, _1));
 
     mCombinationScroller = getChild<LLView>("combination_scroller");
 
@@ -2296,6 +2297,24 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
     mCombinationInventoryPanel->reshape(1, 1);
 }
 
+void LLPanelMainInventory::onCombinationGallerySelectionChanged(const LLUUID& category_id)
+{
+    if(category_id != LLUUID::null)
+    {
+        mCombinationInventoryPanel->unSelectAll();
+    }
+}
+
+void LLPanelMainInventory::onCombinationInventorySelectionChanged(const std::deque<LLFolderViewItem*>& items, BOOL user_action)
+{
+    onSelectionChange(mCombinationInventoryPanel, items, user_action);
+
+    if(!items.empty())
+    {
+        mCombinationGalleryPanel->clearSelection();
+    }
+}
+
 void LLPanelMainInventory::updateCombinationVisibility()
 {
     if(mSingleFolderMode
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 44beba6b4f..bc010ff37f 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -221,6 +221,8 @@ protected:
     void updateNavButtons();
     
     void onCombinationRootChanged(bool gallery_clicked);
+    void onCombinationGallerySelectionChanged(const LLUUID& category_id);
+    void onCombinationInventorySelectionChanged(const std::deque<LLFolderViewItem*>& items, BOOL user_action);
 	/**
 	 * Set upload cost in "Upload" sub menu.
 	 */
-- 
cgit v1.2.3


From 4a09f190d55483857ad70b7d2ddb75a98f0f57d7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 10 May 2023 16:02:14 +0300
Subject: SL-19650 don't build anything except direct children views for
 single-folder panel

---
 indra/newview/llinventorypanel.cpp | 28 ++++++++++++++++++++--------
 indra/newview/llinventorypanel.h   |  5 ++++-
 2 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 6d739c909c..d6eee523f4 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -161,7 +161,8 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	mInvFVBridgeBuilder(NULL),
 	mInventoryViewModel(p.name),
 	mGroupedItemBridge(new LLFolderViewGroupedItemBridge),
-	mFocusSelection(false)
+	mFocusSelection(false),
+    mBuildChildrenViews(true)
 {
 	mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER;
 
@@ -1016,8 +1017,11 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                                                   LLInventoryObject const* objectp,
                                                   LLFolderViewItem *folder_view_item,
                                                   LLFolderViewFolder *parent_folder,
-                                                  const EBuildModes &mode)
+                                                  const EBuildModes &mode,
+                                                  S32 depth)
 {
+    depth++;
+
     // Force the creation of an extra root level folder item if required by the inventory panel (default is "false")
     bool allow_drop = true;
     bool create_root = false;
@@ -1117,7 +1121,8 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
         }
 	}
 
-    bool create_children = folder_view_item && objectp->getType() == LLAssetType::AT_CATEGORY;
+    bool create_children = folder_view_item && objectp->getType() == LLAssetType::AT_CATEGORY
+                            && (mBuildChildrenViews || depth == 0);
 
     if (create_children)
     {
@@ -1137,7 +1142,10 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                 {
                     create_children = false;
                     // run it again for the sake of creating children
-                    mBuildViewsQueue.push_back(id);
+                    if (mBuildChildrenViews || depth == 0)
+                    {
+                        mBuildViewsQueue.push_back(id);
+                    }
                 }
                 else
                 {
@@ -1150,7 +1158,10 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
             {
                 create_children = false;
                 // run it to create children, current caller is only interested in current view
-                mBuildViewsQueue.push_back(id);
+                if (mBuildChildrenViews || depth == 0)
+                {
+                    mBuildViewsQueue.push_back(id);
+                }
                 break;
             }
             case BUILD_ONE_FOLDER:
@@ -1198,11 +1209,11 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                         // each time, especially since content is growing, we can just
                         // iter over copy of mItemMap in some way
                         LLFolderViewItem* view_itemp = getItemByID(cat->getUUID());
-                        buildViewsTree(cat->getUUID(), id, cat, view_itemp, parentp, (mode == BUILD_ONE_FOLDER ? BUILD_NO_CHILDREN : mode));
+                        buildViewsTree(cat->getUUID(), id, cat, view_itemp, parentp, (mode == BUILD_ONE_FOLDER ? BUILD_NO_CHILDREN : mode), depth);
                     }
                     else
                     {
-                        buildViewsTree(cat->getUUID(), id, cat, NULL, parentp, (mode == BUILD_ONE_FOLDER ? BUILD_NO_CHILDREN : mode));
+                        buildViewsTree(cat->getUUID(), id, cat, NULL, parentp, (mode == BUILD_ONE_FOLDER ? BUILD_NO_CHILDREN : mode), depth);
                     }
                 }
 			}
@@ -1222,7 +1233,7 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                     // each time, especially since content is growing, we can just
                     // iter over copy of mItemMap in some way
                     LLFolderViewItem* view_itemp = getItemByID(item->getUUID());
-                    buildViewsTree(item->getUUID(), id, item, view_itemp, parentp, mode);
+                    buildViewsTree(item->getUUID(), id, item, view_itemp, parentp, mode, depth);
                 }
 			}
 		}
@@ -2078,6 +2089,7 @@ static LLDefaultChildRegistry::Register<LLInventorySingleFolderPanel> t_single_f
 LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     : LLInventoryPanel(params)
 {
+    mBuildChildrenViews = false;
     getFilter().setSingleFolderMode(true);
     getFilter().setEmptyLookupMessage("InventorySingleFolderNoMatches");
     getFilter().setDefaultEmptyLookupMessage("InventorySingleFolderEmpty");
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index f2eab4a642..1476194195 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -305,6 +305,8 @@ protected:
 	 */
 	const LLInventoryFolderViewModelBuilder* mInvFVBridgeBuilder;
 
+    bool mBuildChildrenViews;
+
 
 	//--------------------------------------------------------------------
 	// Sorting
@@ -372,7 +374,8 @@ private:
                                               LLInventoryObject const* objectp,
                                               LLFolderViewItem *target_view,
                                               LLFolderViewFolder *parent_folder_view,
-                                              const EBuildModes &mode);
+                                              const EBuildModes &mode,
+                                              S32 depth = -1);
 
     typedef enum e_views_initialization_state
     {
-- 
cgit v1.2.3


From 42f16180a985fc0e4704a4e25489ada9d662631a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 May 2023 18:41:55 +0300
Subject: SL-19536 SL-19652 Fix inventory fetching

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 0bb56c7d0c..6b88d0aaf7 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -437,9 +437,10 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 			{
 				const LLViewerInventoryCategory * cat(gInventory.getCategory(cat_id));
 		
-				if (cat && std::find(all_cats.begin(), all_cats.end(), cat_id) == all_cats.end())
+				if (cat)
 				{
-					if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
+					if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion()
+                        && std::find(all_cats.begin(), all_cats.end(), cat_id) == all_cats.end())
 					{
 						LLSD folder_sd;
 						folder_sd["folder_id"]		= cat->getUUID();
-- 
cgit v1.2.3


From 4173cae02165e36d96638761f29bd6d00ac24ddc Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Thu, 11 May 2023 01:16:42 +0100
Subject: sl-19676 - more loading stats and 360 Interest List mode work

---
 indra/newview/app_settings/settings.xml | 11 -----
 indra/newview/llagent.cpp               | 76 +++++++++++++++++++-----------
 indra/newview/llagent.h                 |  5 ++
 indra/newview/llfloater360capture.cpp   | 66 +++++---------------------
 indra/newview/llfloater360capture.h     |  4 +-
 indra/newview/llviewermenu.cpp          | 59 +++---------------------
 indra/newview/llviewermessage.cpp       | 36 ++++++++-------
 indra/newview/llviewerobjectlist.cpp    | 12 ++---
 indra/newview/llviewerregion.cpp        | 82 ++++++++++++++++++++++++++++++++-
 indra/newview/llviewerregion.h          | 18 ++++++++
 indra/newview/llviewerstatsrecorder.cpp | 56 +++++++---------------
 indra/newview/llviewerstatsrecorder.h   | 28 +++++------
 12 files changed, 231 insertions(+), 222 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9f2d6f746d..775ddb0571 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16964,17 +16964,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-  <key>360CaptureUseInterestListCap</key>
-  <map>
-    <key>Comment</key>
-    <string>Flag if set, uses the new InterestList cap to ask the simulator for full content</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>360CaptureJPEGEncodeQuality</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8cc9be7244..89d4df7caa 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -401,6 +401,7 @@ LLAgent::LLAgent() :
 	mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID),
 	mTeleportState(TELEPORT_NONE),
 	mRegionp(NULL),
+    mUse360Mode(false),
 
 	mAgentOriginGlobal(),
 	mPositionGlobal(),
@@ -894,11 +895,20 @@ boost::signals2::connection LLAgent::addParcelChangedCallback(parcel_changed_cal
 
 // static
 void LLAgent::capabilityReceivedCallback(const LLUUID &region_id, LLViewerRegion *regionp)
-{
-    if (regionp && regionp->getRegionID() == region_id)
+{	// Changed regions and now have the region capabilities
+    if (regionp)
     {
-        regionp->requestSimulatorFeatures();
-        LLAppViewer::instance()->updateNameLookupUrl(regionp);
+        if (regionp->getRegionID() == region_id)
+        {
+            regionp->requestSimulatorFeatures();
+            LLAppViewer::instance()->updateNameLookupUrl(regionp);
+        }
+
+        if (gAgent.getInterestList360Mode())
+        {
+            const bool use_360_mode = true;
+            gAgent.changeInterestListMode(use_360_mode);
+        }
     }
 }
 
@@ -2910,39 +2920,53 @@ void LLAgent::processMaturityPreferenceFromServer(const LLSD &result, U8 perferr
     handlePreferredMaturityResult(maturity);
 }
 
-
-bool LLAgent::requestPostCapability(const std::string &capName, LLSD &postData, httpCallback_t cbSuccess, httpCallback_t cbFailure)
-{
-    if (!getRegion())
+// Using a new capability, tell the simulator that we want it to send everything
+// it knows about and not just what is in front of the camera, in its view
+// frustum. We need this feature so that the contents of the region that appears
+// in the 6 snapshots which we cannot see and is normally not "considered", is
+// also rendered. Typically, this is turned on when the 360 capture floater is
+// opened and turned off when it is closed.
+// Note: for this version, we do not have a way to determine when "everything"
+// has arrived and has been rendered so for now, the proposal is that users
+// will need to experiment with the low resolution version and wait for some
+// (hopefully) small period of time while the full contents resolves.
+// Pass in a flag to ask the simulator/interest list to "send everything" or
+// not (the default mode)
+void LLAgent::changeInterestListMode(bool use_360_mode)
+{
+    mUse360Mode = use_360_mode;
+
+	// Change interest list mode for all regions.  If they are already set for the current mode,
+	// the setting will have no effect.
+    for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+         iter != LLWorld::getInstance()->getRegionList().end();
+         ++iter)
     {
-        return false;
+        LLViewerRegion *regionp = *iter;
+        if (regionp && regionp->isAlive() && regionp->capabilitiesReceived())
+        {
+            regionp->setInterestList360Mode(mUse360Mode);
+        }
     }
-    std::string url = getRegion()->getCapability(capName);
+}
 
-    if (url.empty())
+
+bool LLAgent::requestPostCapability(const std::string &capName, LLSD &postData, httpCallback_t cbSuccess, httpCallback_t cbFailure)
+{
+    if (getRegion())
     {
-        LL_WARNS("Agent") << "Could not retrieve region capability \"" << capName << "\"" << LL_ENDL;
-        return false;
+        return getRegion()->requestPostCapability(capName, postData, cbSuccess, cbFailure);
     }
-
-    LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(url, mHttpPolicy, postData, cbSuccess, cbFailure);
-    return true;
+	return false;
 }
 
 bool LLAgent::requestGetCapability(const std::string &capName, httpCallback_t cbSuccess, httpCallback_t cbFailure)
 {
-    std::string url;
-
-    url = getRegionCapability(capName);
-
-    if (url.empty())
+    if (getRegion())
     {
-        LL_WARNS("Agent") << "Could not retrieve region capability \"" << capName << "\"" << LL_ENDL;
-        return false;
+        return getRegion()->requestGetCapability(capName, cbSuccess, cbFailure);
     }
-
-    LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpGet(url, mHttpPolicy, cbSuccess, cbFailure);
-    return true;
+    return false;
 }
 
 BOOL LLAgent::getAdminOverride() const	
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 498bea3c07..ef8df13fc6 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -294,9 +294,14 @@ public:
 	boost::signals2::connection     addRegionChangedCallback(const region_changed_signal_t::slot_type& cb);
 	void                            removeRegionChangedCallback(boost::signals2::connection callback);
 
+
+	void changeInterestListMode(bool use_360_mode);
+	bool getInterestList360Mode() const { return mUse360Mode; }
+
 private:
 	LLViewerRegion	*mRegionp;
 	region_changed_signal_t		            mRegionChangedSignal;
+	bool                                    mUse360Mode;
 
 	//--------------------------------------------------------------------
 	// History
diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp
index 9c25cdbc7d..a0889abe2d 100644
--- a/indra/newview/llfloater360capture.cpp
+++ b/indra/newview/llfloater360capture.cpp
@@ -64,12 +64,11 @@ LLFloater360Capture::LLFloater360Capture(const LLSD& key)
     // such time as we ask it not to (the dtor). If we crash or
     // otherwise, exit before this is turned off, the Simulator
     // will take care of cleaning up for us.
-    if (gSavedSettings.getBOOL("360CaptureUseInterestListCap"))
-    {
-        // send everything to us for as long as this floater is open
-        const bool send_everything = true;
-        changeInterestListMode(send_everything);
-    }
+    mWasIn360Mode = gAgent.getInterestList360Mode();
+
+    // send everything to us for as long as this floater is open
+    const bool use_360_mode = true;
+    gAgent.changeInterestListMode(use_360_mode);
 }
 
 LLFloater360Capture::~LLFloater360Capture()
@@ -81,13 +80,15 @@ LLFloater360Capture::~LLFloater360Capture()
         mWebBrowser->unloadMediaSource();
     }
 
-    // Tell the Simulator not to send us everything anymore
-    // and revert to the regular "keyhole" frustum of interest
+    // Restore interest list mode to the state when started
+    // Normally LLFloater360Capture tells the Simulator send everything
+    // and now reverts to the regular "keyhole" frustum of interest
     // list updates.
-    if (!LLApp::isExiting() && gSavedSettings.getBOOL("360CaptureUseInterestListCap"))
+    if (!LLApp::isExiting() && 
+        gSavedSettings.getBOOL("360CaptureUseInterestListCap") &&
+        mWasIn360Mode != gAgent.getInterestList360Mode())
     {
-        const bool send_everything = false;
-        changeInterestListMode(send_everything);
+        gAgent.changeInterestListMode(mWasIn360Mode);
     }
 }
 
@@ -170,49 +171,6 @@ void LLFloater360Capture::onChooseQualityRadioGroup()
     setSourceImageSize();
 }
 
-// Using a new capability, tell the simulator that we want it to send everything
-// it knows about and not just what is in front of the camera, in its view
-// frustum. We need this feature so that the contents of the region that appears
-// in the 6 snapshots which we cannot see and is normally not "considered", is
-// also rendered. Typically, this is turned on when the 360 capture floater is
-// opened and turned off when it is closed.
-// Note: for this version, we do not have a way to determine when "everything"
-// has arrived and has been rendered so for now, the proposal is that users
-// will need to experiment with the low resolution version and wait for some
-// (hopefully) small period of time while the full contents resolves.
-// Pass in a flag to ask the simulator/interest list to "send everything" or
-// not (the default mode)
-void LLFloater360Capture::changeInterestListMode(bool send_everything)
-{
-    LLSD body;
-
-    if (send_everything)
-    {
-        body["mode"] = LLSD::String("360");
-    }
-    else
-    {
-        body["mode"] = LLSD::String("default");
-    }
-
-    if (gAgent.requestPostCapability("InterestList", body, [](const LLSD & response)
-    {
-        LL_DEBUGS("360Capture") << "InterestList capability responded: \n" <<
-                               ll_pretty_print_sd(response) <<
-                               LL_ENDL;
-    }))
-    {
-        LL_DEBUGS("360Capture") << "Successfully posted an InterestList capability request with payload: \n" <<
-                               ll_pretty_print_sd(body) <<
-                               LL_ENDL;
-    }
-    else
-    {
-        LL_WARNS("360Capture") << "Unable to post an InterestList capability request with payload: \n" <<
-                               ll_pretty_print_sd(body) <<
-                               LL_ENDL;
-    }
-}
 
 // There is is a setting (360CaptureSourceImageSize) that holds the size
 // (width == height since it's a square) of each of the 6 source snapshots.
diff --git a/indra/newview/llfloater360capture.h b/indra/newview/llfloater360capture.h
index 8f765c0b1b..61316c65f3 100644
--- a/indra/newview/llfloater360capture.h
+++ b/indra/newview/llfloater360capture.h
@@ -50,8 +50,6 @@ class LLFloater360Capture:
         void onOpen(const LLSD& key) override;
         void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
 
-        void changeInterestListMode(bool send_everything);
-
         const std::string getHTMLBaseFolder();
         void capture360Images();
 
@@ -93,6 +91,8 @@ class LLFloater360Capture:
         std::string mImageSaveDir;
 
         LLPointer<LLImageRaw> mRawImages[6];
+
+        bool mWasIn360Mode;
 };
 
 #endif  // LL_FLOATER_360CAPTURE_H
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index d1b240d2c4..23abd0fe16 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1301,65 +1301,18 @@ class LLAdvancedToggleInterestList360Mode : public view_listener_t
 public:
     bool handleEvent(const LLSD &userdata)
     {
-        LLSD request;
-        LLSD body;
-
-        // First do a GET to report on current mode and update stats
-        if (gAgent.requestGetCapability("InterestList",
-                                        [](const LLSD &response) {
-                                            LL_DEBUGS("360Capture") << "InterestList capability GET responded: \n"
-                                                                   << ll_pretty_print_sd(response) << LL_ENDL;
-                                        }))
-        {
-            LL_DEBUGS("360Capture") << "Successful GET InterestList capability request with return body: \n"
-                                   << ll_pretty_print_sd(body) << LL_ENDL;
-        }
-        else
-        {
-            LL_WARNS("360Capture") << "Unable to GET InterestList capability request with return body: \n"
-                                   << ll_pretty_print_sd(body) << LL_ENDL;
-        }
-
-        // Now do a POST to change the mode
-        if (sUsing360)
-        {
-            body["mode"] = LLSD::String("default");
-        }
-        else
-        {
-            body["mode"] = LLSD::String("360");
-        }
-        sUsing360 = !sUsing360;
-        LL_INFOS("360Capture") << "Setting InterestList capability mode to " << body["mode"].asString() << LL_ENDL;
-
-        if (gAgent.requestPostCapability("InterestList", body,
-                                         [](const LLSD &response) {
-                                             LL_DEBUGS("360Capture") << "InterestList capability responded: \n"
-                                                                    << ll_pretty_print_sd(response) << LL_ENDL;
-                                         }))
-        {
-            LL_DEBUGS("360Capture") << "Successfully posted an InterestList capability request with payload: \n"
-                                   << ll_pretty_print_sd(body) << LL_ENDL;
-            return true;
-        }
-        else
-        {
-            LL_DEBUGS("360Capture") << "Unable to post an InterestList capability request with payload: \n"
-                                   << ll_pretty_print_sd(body) << LL_ENDL;
-            return false;
-        }
-    };
-
-	static bool sUsing360;
+        // Toggle the mode - regions will get updated
+        bool new_mode = !gAgent.getInterestList360Mode();
+        gAgent.changeInterestListMode(new_mode);
+        return true;
+    }
 };
 
-bool LLAdvancedToggleInterestList360Mode::sUsing360 = false;
-
 class LLAdvancedCheckInterestList360Mode : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		return LLAdvancedToggleInterestList360Mode::sUsing360;
+		return gAgent.getInterestList360Mode();
 	}
 };
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a60f11d97b..ef83fa161b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -99,6 +99,7 @@
 #include "llviewerobjectlist.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerstats.h"
+#include "llviewerstatsrecorder.h"
 #include "llviewertexteditor.h"
 #include "llviewerthrottle.h"
 #include "llviewerwindow.h"
@@ -3759,31 +3760,34 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
 			continue;
 		}
 
-			LLViewerObject *objectp = gObjectList.findObject(id);
-			if (objectp)
+		LLViewerObject *objectp = gObjectList.findObject(id);
+		if (objectp)
+		{
+			// Display green bubble on kill
+			if ( gShowObjectUpdates )
 			{
-				// Display green bubble on kill
-				if ( gShowObjectUpdates )
-				{
-					LLColor4 color(0.f,1.f,0.f,1.f);
-					gPipeline.addDebugBlip(objectp->getPositionAgent(), color);
-					LL_DEBUGS("MessageBlip") << "Kill blip for local " << local_id << " at " << objectp->getPositionAgent() << LL_ENDL;
-				}
-
-				// Do the kill
-				gObjectList.killObject(objectp);
+				LLColor4 color(0.f,1.f,0.f,1.f);
+				gPipeline.addDebugBlip(objectp->getPositionAgent(), color);
+				LL_DEBUGS("MessageBlip") << "Kill blip for local " << local_id << " at " << objectp->getPositionAgent() << LL_ENDL;
 			}
 
-			if(delete_object)
-			{
-				regionp->killCacheEntry(local_id);
+			// Do the kill
+			gObjectList.killObject(objectp);
+		}
+
+		if(delete_object)
+		{
+			regionp->killCacheEntry(local_id);
 		}
 
 		// We should remove the object from selection after it is marked dead by gObjectList to make LLToolGrab,
         // which is using the object, release the mouse capture correctly when the object dies.
         // See LLToolGrab::handleHoverActive() and LLToolGrab::handleHoverNonPhysical().
 		LLSelectMgr::getInstance()->removeObjectFromSelections(id);
-	}
+
+	}	// end for loop
+
+    LLViewerStatsRecorder::instance().recordObjectKills(num_objects);
 }
 
 void process_time_synch(LLMessageSystem *mesgsys, void **user_data)
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 0c9e929cf3..5f0e331baa 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -369,7 +369,7 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry*
 		if (!objectp)
 		{
 			LL_INFOS() << "createObject failure for object: " << fullid << LL_ENDL;
-			recorder.objectUpdateFailure(0);
+			recorder.objectUpdateFailure();
 			return NULL;
 		}
 		justCreated = true;
@@ -501,7 +501,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 						<< " Flags: " << flags
 						<< " Region: " << regionp->getName()
 						<< " Region id: " << regionp->getRegionID() << LL_ENDL;
-					recorder.objectUpdateFailure(msg_size);
+					recorder.objectUpdateFailure();
 					continue;
 				}
 				else if ((flags & FLAGS_TEMPORARY_ON_REZ) == 0)
@@ -612,7 +612,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 				if (update_type == OUT_TERSE_IMPROVED)
 				{
 					// LL_INFOS() << "terse update for an unknown object (compressed):" << fullid << LL_ENDL;
-					recorder.objectUpdateFailure(msg_size);
+					recorder.objectUpdateFailure();
 					continue;
 				}
 			}
@@ -621,7 +621,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 				if (update_type != OUT_FULL)
 				{
 					//LL_INFOS() << "terse update for an unknown object:" << fullid << LL_ENDL;
-					recorder.objectUpdateFailure(msg_size);
+					recorder.objectUpdateFailure();
 					continue;
 				}
 
@@ -634,7 +634,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			{
 				mNumDeadObjectUpdates++;
 				//LL_INFOS() << "update for a dead object:" << fullid << LL_ENDL;
-				recorder.objectUpdateFailure(msg_size);
+				recorder.objectUpdateFailure();
 				continue;
 			}
 #endif
@@ -647,7 +647,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			if (!objectp)
 			{
 				LL_INFOS() << "createObject failure for object: " << fullid << LL_ENDL;
-				recorder.objectUpdateFailure(msg_size);
+				recorder.objectUpdateFailure();
 				continue;
 			}
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 54d787366f..7abd77505d 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -646,7 +646,8 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	mInvisibilityCheckHistory(-1),
 	mPaused(FALSE),
 	mRegionCacheHitCount(0),
-	mRegionCacheMissCount(0)
+	mRegionCacheMissCount(0),
+    mUse360Mode(false)
 {
 	mWidth = region_width_meters;
 	mImpl->mOriginGlobal = from_region_handle(handle); 
@@ -3283,6 +3284,9 @@ void LLViewerRegion::setCapabilitiesReceived(bool received)
 
 		// This is a single-shot signal. Forget callbacks to save resources.
 		mCapabilitiesReceivedSignal.disconnect_all_slots();
+
+		// Set the region to the desired interest list mode
+        setInterestList360Mode(gAgent.getInterestList360Mode());
 	}
 }
 
@@ -3301,6 +3305,82 @@ void LLViewerRegion::logActiveCapabilities() const
 	log_capabilities(mImpl->mCapabilities);
 }
 
+
+bool LLViewerRegion::requestPostCapability(const std::string &capName, LLSD &postData, httpCallback_t cbSuccess, httpCallback_t cbFailure)
+{
+    std::string url = getCapability(capName);
+
+    if (url.empty())
+    {
+        LL_WARNS("Region") << "Could not retrieve region " << getRegionID()
+			<< " POST capability \"" << capName << "\"" << LL_ENDL;
+        return false;
+    }
+
+    LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(url, gAgent.getAgentPolicy(), postData, cbSuccess, cbFailure);
+    return true;
+}
+
+bool LLViewerRegion::requestGetCapability(const std::string &capName, httpCallback_t cbSuccess, httpCallback_t cbFailure)
+{
+    std::string url;
+
+    url = getCapability(capName);
+
+    if (url.empty())
+    {
+        LL_WARNS("Region") << "Could not retrieve region " << getRegionID()
+                           << " GET capability \"" << capName << "\"" << LL_ENDL;
+        return false;
+    }
+
+    LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpGet(url, gAgent.getAgentPolicy(), cbSuccess, cbFailure);
+    return true;
+}
+
+
+void LLViewerRegion::setInterestList360Mode(bool use_360_mode)
+{
+    if (use_360_mode != mUse360Mode)
+    {
+        LLSD body;
+        mUse360Mode = use_360_mode;
+
+        if (mUse360Mode)
+        {
+            body["mode"] = LLSD::String("360");
+        }
+        else
+        {
+            body["mode"] = LLSD::String("default");
+        }
+
+        if (requestPostCapability("InterestList", body,
+                                  [](const LLSD &response) {
+                                      LL_DEBUGS("360Capture") << "InterestList capability responded: \n"
+                                          << ll_pretty_print_sd(response) << LL_ENDL;
+                                  }))
+        {
+            LL_DEBUGS("360Capture") << "Region " << getRegionID()
+                                    << " Successfully posted an InterestList capability request with payload: \n"
+                                    << ll_pretty_print_sd(body) << LL_ENDL;
+        }
+        else
+        {
+            LL_WARNS("360Capture") << "Region " << getRegionID() 
+								   << " Unable to post an InterestList capability request with payload: \n"
+                                   << ll_pretty_print_sd(body) << LL_ENDL;
+        }
+    }
+    else
+    {
+        LL_DEBUGS("360Capture") << "Region " << getRegionID() << "No change, skipping Interest List mode POST to "
+                                << (use_360_mode ? "360" : "default") << " mode" << LL_ENDL;
+    }
+}
+
+
+
 LLSpatialPartition* LLViewerRegion::getSpatialPartition(U32 type)
 {
 	if (type < mImpl->mObjectPartition.size() && type < PARTITION_VO_CACHE)
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 81371b7f30..3da0c376d3 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -32,6 +32,7 @@
 #include <string>
 #include <boost/signals2.hpp>
 
+#include "llcorehttputil.h"
 #include "llwind.h"
 #include "v3dmath.h"
 #include "llstring.h"
@@ -278,6 +279,15 @@ public:
 	static bool isSpecialCapabilityName(const std::string &name);
 	void logActiveCapabilities() const;
 
+	// Utilities to post and get via
+    // HTTP using the agent's policy settings and headers.
+    typedef LLCoreHttpUtil::HttpCoroutineAdapter::completionCallback_t httpCallback_t;
+    bool requestPostCapability(const std::string &capName,
+                               LLSD              &postData,
+                               httpCallback_t     cbSuccess = NULL,
+                               httpCallback_t     cbFailure = NULL);
+    bool requestGetCapability(const std::string &capName, httpCallback_t cbSuccess = NULL, httpCallback_t cbFailure = NULL);
+
     /// implements LLCapabilityProvider
 	/*virtual*/ const LLHost& getHost() const;
 	const U64 		&getHandle() const 			{ return mHandle; }
@@ -477,6 +487,11 @@ public:
 	};
 	typedef std::set<LLViewerRegion*, CompareRegionByLastUpdate> region_priority_list_t;
 
+	void setInterestList360Mode(bool use_360_mode);
+	bool getInterestList360Mode() const { return mUse360Mode; }
+
+
+
 private:
 	static S32  sNewObjectCreationThrottle;
 	LLViewerRegionImpl * mImpl;
@@ -574,6 +589,9 @@ private:
 	LLFrameTimer mMaterialsCapThrottleTimer;
 	LLFrameTimer mRenderInfoRequestTimer;
 	LLFrameTimer mRenderInfoReportTimer;
+
+	// how the server interest list works
+    bool mUse360Mode;
 };
 
 inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const
diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp
index f95a960186..6372679a07 100644
--- a/indra/newview/llviewerstatsrecorder.cpp
+++ b/indra/newview/llviewerstatsrecorder.cpp
@@ -73,15 +73,14 @@ void LLViewerStatsRecorder::clearStats()
 	mObjectFullUpdates = 0;
 	mObjectTerseUpdates = 0;
 	mObjectCacheMissRequests = 0;
-	mObjectCacheMissResponses = 0;
 	mObjectCacheUpdateDupes = 0;
 	mObjectCacheUpdateChanges = 0;
 	mObjectCacheUpdateAdds = 0;
 	mObjectCacheUpdateReplacements = 0;
 	mObjectUpdateFailures = 0;
-	mObjectUpdateFailuresSize = 0;
 	mTextureFetchCount = 0;
     mMeshLoadedCount = 0;
+    mObjectKills = 0;
 }
 
 
@@ -100,12 +99,6 @@ void LLViewerStatsRecorder::enableObjectStatsRecording(bool enable, bool logging
 
 
 
-void LLViewerStatsRecorder::recordObjectUpdateFailure(S32 msg_size)
-{
-	mObjectUpdateFailures++;
-	mObjectUpdateFailuresSize += msg_size;
-}
-
 void LLViewerStatsRecorder::recordCacheMissEvent(U8 cache_miss_type)
 {
 	if (LLViewerRegion::CACHE_MISS_TYPE_TOTAL == cache_miss_type)
@@ -119,24 +112,17 @@ void LLViewerStatsRecorder::recordCacheMissEvent(U8 cache_miss_type)
 }
 
 
-void LLViewerStatsRecorder::recordCacheHitEvent()
-{
-    mObjectCacheHitCount++;
-}
-
 void LLViewerStatsRecorder::recordObjectUpdateEvent(const EObjectUpdateType update_type)
 {
     switch (update_type)
 	{
 	case OUT_FULL:
-		mObjectFullUpdates++;
+	case OUT_FULL_COMPRESSED:
+            mObjectFullUpdates++;
 		break;
 	case OUT_TERSE_IMPROVED:
 		mObjectTerseUpdates++;
 		break;
-	case OUT_FULL_COMPRESSED:
-		mObjectCacheMissResponses++;
-		break;
 	default:
 		LL_WARNS() << "Unknown update_type" << LL_ENDL;
 		break;
@@ -165,11 +151,6 @@ void LLViewerStatsRecorder::recordCacheFullUpdate(LLViewerRegion::eCacheUpdateRe
 	};
 }
 
-void LLViewerStatsRecorder::recordRequestCacheMissesEvent(S32 count)
-{
-	mObjectCacheMissRequests += count;
-}
-
 void LLViewerStatsRecorder::writeToLog( F32 interval )
 {
     if (!mEnableStatsLogging || !mEnableStatsRecording)
@@ -185,7 +166,7 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 	if (mSkipSaveIfZeros)
 	{
         S32 total_events = mObjectCacheHitCount + mObjectCacheMissCrcCount + mObjectCacheMissFullCount + mObjectFullUpdates +
-                            mObjectTerseUpdates + mObjectCacheMissRequests + mObjectCacheMissResponses + mObjectCacheUpdateDupes +
+                            mObjectTerseUpdates + mObjectCacheMissRequests + mObjectCacheUpdateDupes +
                             mObjectCacheUpdateChanges + mObjectCacheUpdateAdds + mObjectCacheUpdateReplacements + mObjectUpdateFailures;
 		if (total_events == 0)
 		{
@@ -202,14 +183,16 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 		<< mObjectFullUpdates << " full updates, "
 		<< mObjectTerseUpdates << " terse updates, "
 		<< mObjectCacheMissRequests << " cache miss requests, "
-		<< mObjectCacheMissResponses << " cache miss responses, "
 		<< mObjectCacheUpdateDupes << " cache update dupes, "
 		<< mObjectCacheUpdateChanges << " cache update changes, "
 		<< mObjectCacheUpdateAdds << " cache update adds, "
-		<< mObjectCacheUpdateReplacements << " cache update replacements, "
-		<< mObjectUpdateFailures << " update failures"
+		<< mObjectCacheUpdateReplacements << " cache update replacements,"
+		<< mObjectUpdateFailures << " update failures,"
+		<< mTextureFetchCount << " texture fetches, "
+		<< mMeshLoadedCount << " mesh loads, "
+        << mObjectKills << " object kills"
 		<< LL_ENDL;
-
+ 
 	if (mStatsFile == NULL)
 	{
 		// Refresh settings
@@ -237,8 +220,7 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 					<< "Cache Crc Misses,"
 					<< "Full Updates,"
 					<< "Terse Updates,"
-					<< "Cache Miss Requests,"
-					<< "Cache Miss Responses,"
+					<< "Cache Miss Requests,"	// Normally results in a Full Update from simulator
 					<< "Cache Update Dupes,"
 					<< "Cache Update Changes,"
 					<< "Cache Update Adds,"
@@ -246,12 +228,16 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 					<< "Update Failures,"
 					<< "Texture Count,"
                     << "Mesh Load Count,"
+                    << "Object Kills"
                     << "\n";
 
 			data_size = col_headers.str().size();
 			if (fwrite(col_headers.str().c_str(), 1, data_size, mStatsFile ) != data_size)
 			{
 				LL_WARNS() << "failed to write full headers to " << mStatsFileName << LL_ENDL;
+				// Close the file and turn off stats logging
+                closeStatsFile();
+				return;
 			}
 		}
 		else
@@ -273,7 +259,6 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 		<< "," << mObjectFullUpdates
 		<< "," << mObjectTerseUpdates
 		<< "," << mObjectCacheMissRequests
-		<< "," << mObjectCacheMissResponses
 		<< "," << mObjectCacheUpdateDupes
 		<< "," << mObjectCacheUpdateChanges
 		<< "," << mObjectCacheUpdateAdds
@@ -281,6 +266,7 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
 		<< "," << mObjectUpdateFailures
 		<< "," << mTextureFetchCount
 		<< "," << mMeshLoadedCount
+		<< "," << mObjectKills
 		<< "\n";
 
 	data_size = stats_data.str().size();
@@ -332,14 +318,4 @@ F32 LLViewerStatsRecorder::getTimeSinceStart()
 	return (F32) (LLFrameTimer::getTotalSeconds() - mFileOpenTime);
 }
 
-void LLViewerStatsRecorder::recordTextureFetch()
-{
-    mTextureFetchCount += 1;
-}
-
-void LLViewerStatsRecorder::recordMeshLoaded()
-{
-	mMeshLoadedCount += 1;
-}
-
 
diff --git a/indra/newview/llviewerstatsrecorder.h b/indra/newview/llviewerstatsrecorder.h
index 37c08a51cf..b9fe02e54d 100644
--- a/indra/newview/llviewerstatsrecorder.h
+++ b/indra/newview/llviewerstatsrecorder.h
@@ -53,11 +53,11 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
 	bool isEnabled() const { return mEnableStatsRecording; }
 	bool isLogging() const { return mEnableStatsLogging; }
 
-	void objectUpdateFailure(S32 msg_size)
+	void objectUpdateFailure()
     {
         if (mEnableStatsRecording)
         {
-            recordObjectUpdateFailure(msg_size);
+            mObjectUpdateFailures++;
         }
 	}
 
@@ -73,7 +73,7 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
     {
         if (mEnableStatsRecording)
         {
-            recordCacheHitEvent();
+            mObjectCacheHitCount++;
         }
     }
 
@@ -97,7 +97,7 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
 	{
         if (mEnableStatsRecording)
         {
-            recordRequestCacheMissesEvent(count);
+            mObjectCacheMissRequests += count;
         }
 	}
 
@@ -105,7 +105,7 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
 	{
         if (mEnableStatsRecording)
         {
-            recordTextureFetch();
+            mTextureFetchCount += 1;
         }
 	}
 
@@ -113,10 +113,18 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
 	{
 		if (mEnableStatsRecording)
 		{
-			recordMeshLoaded();
+            mMeshLoadedCount += 1;
 		}
 	}
 
+	void recordObjectKills(S32 num_objects)
+	{ 
+		if (mEnableStatsRecording)
+        {
+            mObjectKills += num_objects;
+        }
+	}
+
 	void idle()
 	{
         writeToLog(mInterval);
@@ -125,14 +133,9 @@ class LLViewerStatsRecorder : public LLSingleton<LLViewerStatsRecorder>
 	F32 getTimeSinceStart();
 
 private:
-	void recordObjectUpdateFailure(S32 msg_size);
 	void recordCacheMissEvent(U8 cache_miss_type);
-	void recordCacheHitEvent();
 	void recordObjectUpdateEvent(const EObjectUpdateType update_type);
 	void recordCacheFullUpdate(LLViewerRegion::eCacheUpdateResult update_result);
-	void recordRequestCacheMissesEvent(S32 count);
-	void recordTextureFetch();
-	void recordMeshLoaded();
 	void writeToLog(F32 interval);
     void closeStatsFile();
 	void makeStatsFileName();
@@ -158,15 +161,14 @@ private:
 	S32			mObjectFullUpdates;
 	S32			mObjectTerseUpdates;
 	S32			mObjectCacheMissRequests;
-	S32			mObjectCacheMissResponses;
 	S32			mObjectCacheUpdateDupes;
 	S32			mObjectCacheUpdateChanges;
 	S32			mObjectCacheUpdateAdds;
 	S32			mObjectCacheUpdateReplacements;
 	S32			mObjectUpdateFailures;
-	S32			mObjectUpdateFailuresSize;
 	S32			mTextureFetchCount;
     S32         mMeshLoadedCount;
+	S32			mObjectKills;
 
 	void	clearStats();
 };
-- 
cgit v1.2.3


From f7872f7ed1aaf42a6dc4a7999a554f428f6dfe60 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 11 May 2023 17:54:35 +0300
Subject: SL-19701 Clicking on 'Show' in inventory offering does not open
 inventory in Single folder

---
 indra/newview/llinventorypanel.cpp | 11 ++++++++---
 indra/newview/llinventorypanel.h   |  2 +-
 indra/newview/llviewermessage.cpp  | 20 +++++++++++++++++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index d6eee523f4..ca5abfd661 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1798,14 +1798,14 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open)
 }
 
 //static
-void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const LLUUID& obj_id, BOOL main_panel, BOOL take_keyboard_focus, BOOL reset_filter)
+void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const LLUUID& obj_id, BOOL use_main_panel, BOOL take_keyboard_focus, BOOL reset_filter)
 {
 	LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
 	sidepanel_inventory->showInventoryPanel();
 
 	bool in_inbox = (gInventory.isObjectDescendentOf(obj_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX)));
 
-	if (!in_inbox && (main_panel || !sidepanel_inventory->getMainInventoryPanel()->isRecentItemsPanelSelected()))
+	if (!in_inbox && (use_main_panel || !sidepanel_inventory->getMainInventoryPanel()->isRecentItemsPanelSelected()))
 	{
 		sidepanel_inventory->selectAllItemsPanel();
 	}
@@ -1822,7 +1822,12 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
         }
     }
 
-
+    LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
+    if (main_inventory && main_inventory->isSingleFolderMode()
+        && use_main_panel)
+    {
+        main_inventory->toggleViewMode();
+    }
 	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
 
 	if (active_panel)
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 1476194195..f323a6c6d7 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -246,7 +246,7 @@ public:
 
 	static void openInventoryPanelAndSetSelection(BOOL auto_open,
 													const LLUUID& obj_id,
-													BOOL main_panel = FALSE,
+													BOOL use_main_panel = FALSE,
 													BOOL take_keyboard_focus = TAKE_FOCUS_YES,
 													BOOL reset_filter = FALSE);
     static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id);
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 065e3ab3ad..78241a7c71 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -76,6 +76,7 @@
 #include "llnotifications.h"
 #include "llnotificationsutil.h"
 #include "llpanelgrouplandmoney.h"
+#include "llpanelmaininventory.h"
 #include "llrecentpeople.h"
 #include "llscriptfloater.h"
 #include "llscriptruntimeperms.h"
@@ -1536,11 +1537,28 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
 		}
 
 		////////////////////////////////////////////////////////////////////////////////
+        static LLUICachedControl<bool> find_original_new_floater("FindOriginalOpenWindow", false);
+        //show in a new single-folder window
+        if(find_original_new_floater)
+        {
+            const LLInventoryObject *obj = gInventory.getObject(obj_id);
+            if (obj && obj->getParentUUID().notNull())
+            {
+                LLPanelMainInventory::newFolderWindow(obj->getParentUUID(), obj_id);
+            }
+        }
+        else
+        {
 		// Highlight item
 		const BOOL auto_open = 
 			gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false
 			!from_name.empty(); // don't open if it's not from anyone.
-		LLInventoryPanel::openInventoryPanelAndSetSelection(auto_open, obj_id);
+            if(auto_open)
+            {
+                LLFloaterReg::showInstance("inventory");
+            }
+		LLInventoryPanel::openInventoryPanelAndSetSelection(auto_open, obj_id, true);
+        }
 	}
 }
 
-- 
cgit v1.2.3


From 077841420cb1264b3a096f473f5005d83de94519 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 12 May 2023 16:35:27 +0300
Subject: SL-19649 reduce logging out time for larger inventories

---
 indra/llui/llview.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 10e4755cd3..a2f18daa12 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -576,8 +576,10 @@ void LLView::deleteAllChildren()
 
 	while (!mChildList.empty())
 	{
-		LLView* viewp = mChildList.front();
-		delete viewp; // will remove the child from mChildList
+        LLView* viewp = mChildList.front();
+        viewp->mParentView = NULL;
+        delete viewp;
+        mChildList.pop_front();
 	}
 }
 
-- 
cgit v1.2.3


From 17e18aa9bfa095e8b41c1c0e45c5757101a3f710 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 12 May 2023 16:55:12 +0300
Subject: SL-19649 add missing update

---
 indra/llui/llview.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index a2f18daa12..7720c4ad14 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -581,6 +581,7 @@ void LLView::deleteAllChildren()
         delete viewp;
         mChildList.pop_front();
 	}
+    updateBoundingRect();
 }
 
 void LLView::setAllChildrenEnabled(BOOL b)
-- 
cgit v1.2.3


From 6e2e9d5904b3cc89deb755f3552d915104065aa0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 May 2023 18:26:02 +0300
Subject: SL-19649 Adjust other classes for new deleteAllChildren mechanics

---
 indra/llui/lllayoutstack.cpp        | 19 ++++++++++++++++---
 indra/llui/lllayoutstack.h          |  1 +
 indra/llui/llmenugl.cpp             |  7 +++++++
 indra/llui/llmenugl.h               |  1 +
 indra/newview/llinspecttoast.cpp    |  7 +++++++
 indra/newview/llinventorymodel.cpp  |  5 ++++-
 indra/newview/lltooldraganddrop.cpp |  4 ++--
 7 files changed, 38 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 8a011b4890..08ce31ffc5 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -284,6 +284,17 @@ void LLLayoutStack::draw()
 	}
 }
 
+void LLLayoutStack::deleteAllChildren()
+{
+    mPanels.clear();
+    LLView::deleteAllChildren();
+
+    // Not really needed since nothing is left to
+    // display, but for the sake of consistency
+    updateFractionalSizes();
+    mNeedsLayout = true;
+}
+
 void LLLayoutStack::removeChild(LLView* view)
 {
 	LLLayoutPanel* embedded_panelp = findEmbeddedPanel(dynamic_cast<LLPanel*>(view));
@@ -291,12 +302,14 @@ void LLLayoutStack::removeChild(LLView* view)
 	if (embedded_panelp)
 	{
 		mPanels.erase(std::find(mPanels.begin(), mPanels.end(), embedded_panelp));
-		delete embedded_panelp;
+        LLView::removeChild(view);
 		updateFractionalSizes();
 		mNeedsLayout = true;
 	}
-
-	LLView::removeChild(view);
+    else
+    {
+        LLView::removeChild(view);
+    }
 }
 
 BOOL LLLayoutStack::postBuild()
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 9a53a7f787..02685281ef 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -69,6 +69,7 @@ public:
 	virtual ~LLLayoutStack();
 
 	/*virtual*/ void draw();
+    /*virtual*/ void deleteAllChildren();
 	/*virtual*/ void removeChild(LLView*);
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ bool addChild(LLView* child, S32 tab_group = 0);
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 35f2930800..1666ff8c98 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1891,6 +1891,13 @@ bool LLMenuGL::addContextChild(LLView* view, S32 tab_group)
 	return false;
 }
 
+
+void LLMenuGL::deleteAllChildren()
+{
+    mItems.clear();
+    LLUICtrl::deleteAllChildren();
+}
+
 void LLMenuGL::removeChild( LLView* ctrl)
 {
 	// previously a dynamic_cast with if statement to check validity
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 47a46510b3..87e3f18ebc 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -449,6 +449,7 @@ public:
 	/*virtual*/ void drawBackground(LLMenuItemGL* itemp, F32 alpha);
 	/*virtual*/ void setVisible(BOOL visible);
 	/*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
+    /*virtual*/ void deleteAllChildren();
 	/*virtual*/ void removeChild( LLView* ctrl);
 	/*virtual*/ BOOL postBuild();
 	
diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp
index 68801b0895..6f93a78ca6 100644
--- a/indra/newview/llinspecttoast.cpp
+++ b/indra/newview/llinspecttoast.cpp
@@ -47,6 +47,7 @@ public:
 
 	/*virtual*/ void onOpen(const LLSD& notification_id);
 	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+    /*virtual*/ void deleteAllChildren();
 	/*virtual*/ void removeChild(LLView* child);
 private:
 	void onToastDestroy(LLToast * toast);
@@ -122,6 +123,12 @@ BOOL LLInspectToast::handleToolTip(S32 x, S32 y, MASK mask)
 	return LLFloater::handleToolTip(x, y, mask);
 }
 
+void LLInspectToast::deleteAllChildren()
+{
+    mPanel = NULL;
+    LLInspect::deleteAllChildren();
+}
+
 // virtual
 void LLInspectToast::removeChild(LLView* child)
 {
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index c65901a754..bc0d523bd2 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -906,7 +906,10 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
 		}
 	}
 	
-	if(rv.isNull() && root_id.notNull() && preferred_type != LLFolderType::FT_MARKETPLACE_LISTINGS)
+	if(rv.isNull() 
+       && root_id.notNull()
+       && preferred_type != LLFolderType::FT_MARKETPLACE_LISTINGS
+       && preferred_type != LLFolderType::FT_OUTBOX)
 	{
         // if it does not exists, it should either be added
         // to createCommonSystemCategories or server should
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index d10b999220..78e068f808 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1733,7 +1733,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
 	}
 
 	const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX);
-	if(gInventory.isObjectDescendentOf(item->getUUID(), outbox_id))
+	if(outbox_id.notNull() && gInventory.isObjectDescendentOf(item->getUUID(), outbox_id))
 	{
 		// Legacy
 		return ACCEPT_NO;
@@ -2160,7 +2160,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory(
 		}
 
 		const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX);
-		if(gInventory.isObjectDescendentOf(category->getUUID(), outbox_id))
+		if(outbox_id.notNull() && gInventory.isObjectDescendentOf(category->getUUID(), outbox_id))
 		{
 			// Legacy
 			return ACCEPT_NO;
-- 
cgit v1.2.3


From b4d0aeee37973525589223842e149caa28dea2af Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 May 2023 19:17:31 +0300
Subject: SL-19712 Folders and items shouldn't be both called items

---
 indra/newview/llfloaterchangeitemthumbnail.cpp                    | 2 ++
 .../skins/default/xui/en/floater_change_item_thumbnail.xml        | 8 ++++++++
 2 files changed, 10 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 4249ae9305..3070c437bd 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -335,6 +335,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
     LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(obj);
     if (item)
     {
+        setTitle(getString("title_item_thumbnail"));
         // This floater probably shouldn't be possible to open
         // for imcomplete items
         llassert(item->isFinished());
@@ -348,6 +349,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
 
         if (cat)
         {
+            setTitle(getString("title_folder_thumbnail"));
             icon_img = LLUI::getUIImage(LLViewerFolderType::lookupIconName(cat->getPreferredType(), true));
 
             if (thumbnail_id.isNull() && (cat->getPreferredType() == LLFolderType::FT_OUTFIT))
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index f3f8ee0daa..ec2961b0f3 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -8,6 +8,14 @@
  title="CHANGE ITEM IMAGE"
  width="319">
 
+  <floater.string
+    name="title_item_thumbnail">
+    CHANGE ITEM IMAGE
+  </floater.string>
+  <floater.string
+    name="title_folder_thumbnail">
+    CHANGE FOLDER IMAGE
+  </floater.string>
   <floater.string
     name="tooltip_upload_local">
     Upload from computer
-- 
cgit v1.2.3


From a6d867bccea37467d51cd037d6a58aca02a27e97 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 May 2023 21:14:14 +0300
Subject: SL-19583 Fix scrollbars flashing when resizing floater

---
 indra/newview/llpanelmaininventory.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a8c8ce994d..5a8565b5aa 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -938,6 +938,7 @@ void LLPanelMainInventory::reshape(S32 width, S32 height, BOOL called_from_paren
 {
     mCombinationShapeDirty = true;
     LLPanel::reshape(width, height, called_from_parent);
+    updateCombinationVisibility();
 }
 
 // virtual
@@ -959,9 +960,9 @@ void LLPanelMainInventory::draw()
 		mResortActivePanel = false;
 	}
 
+    updateCombinationVisibility();
 	LLPanel::draw();
 	updateItemcountText();
-    updateCombinationVisibility();
 }
 
 void LLPanelMainInventory::updateItemcountText()
-- 
cgit v1.2.3


From 4d3a8f4a6cd2bef58bc95854af0325ca0190351f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 May 2023 22:15:56 +0300
Subject: SL-19649 Don't update bounding rect excesively

---
 indra/llui/llview.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 7720c4ad14..da7868d804 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -311,7 +311,13 @@ bool LLView::addChild(LLView* child, S32 tab_group)
 	}
 
 	child->mParentView = this;
-	updateBoundingRect();
+    if (getVisible() && child->getVisible())
+    {
+        // if child isn't visible it won't affect bounding rect
+        // if current view is not visible it will be recalculated
+        // on visibility change
+        updateBoundingRect();
+    }
 	mLastTabGroup = tab_group;
 	return true;
 }
-- 
cgit v1.2.3


From 81f1be67109885f98f649974022aa6d444dd633d Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Sat, 13 May 2023 04:10:28 +0100
Subject: sl-19676 - 360 Intereset list mode.   Changed mode to be a string for
 future expansion instead of a bool toggle

---
 indra/newview/llagent.cpp             | 36 ++++++++++++++++++++---------------
 indra/newview/llagent.h               |  7 ++++---
 indra/newview/llfloater360capture.cpp |  9 ++++-----
 indra/newview/llfloater360capture.h   |  2 +-
 indra/newview/llviewermenu.cpp        | 12 +++++++++---
 indra/newview/llviewerregion.cpp      | 34 +++++++++++++++++----------------
 indra/newview/llviewerregion.h        | 11 ++++++-----
 7 files changed, 63 insertions(+), 48 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 89d4df7caa..307f73fab4 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -401,7 +401,7 @@ LLAgent::LLAgent() :
 	mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID),
 	mTeleportState(TELEPORT_NONE),
 	mRegionp(NULL),
-    mUse360Mode(false),
+    mInterestListMode(LLViewerRegion::IL_MODE_DEFAULT),
 
 	mAgentOriginGlobal(),
 	mPositionGlobal(),
@@ -904,10 +904,9 @@ void LLAgent::capabilityReceivedCallback(const LLUUID &region_id, LLViewerRegion
             LLAppViewer::instance()->updateNameLookupUrl(regionp);
         }
 
-        if (gAgent.getInterestList360Mode())
+        if (gAgent.getInterestListMode() == LLViewerRegion::IL_MODE_360)
         {
-            const bool use_360_mode = true;
-            gAgent.changeInterestListMode(use_360_mode);
+            gAgent.changeInterestListMode(LLViewerRegion::IL_MODE_360);
         }
     }
 }
@@ -2932,22 +2931,29 @@ void LLAgent::processMaturityPreferenceFromServer(const LLSD &result, U8 perferr
 // (hopefully) small period of time while the full contents resolves.
 // Pass in a flag to ask the simulator/interest list to "send everything" or
 // not (the default mode)
-void LLAgent::changeInterestListMode(bool use_360_mode)
+void LLAgent::changeInterestListMode(const std::string &new_mode)
 {
-    mUse360Mode = use_360_mode;
-
-	// Change interest list mode for all regions.  If they are already set for the current mode,
-	// the setting will have no effect.
-    for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
-         iter != LLWorld::getInstance()->getRegionList().end();
-         ++iter)
+    if (new_mode != mInterestListMode)
     {
-        LLViewerRegion *regionp = *iter;
-        if (regionp && regionp->isAlive() && regionp->capabilitiesReceived())
+        mInterestListMode = new_mode;
+
+        // Change interest list mode for all regions.  If they are already set for the current mode,
+        // the setting will have no effect.
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+             iter != LLWorld::getInstance()->getRegionList().end();
+             ++iter)
         {
-            regionp->setInterestList360Mode(mUse360Mode);
+            LLViewerRegion *regionp = *iter;
+            if (regionp && regionp->isAlive() && regionp->capabilitiesReceived())
+            {
+                regionp->setInterestListMode(mInterestListMode);
+            }
         }
     }
+	else
+	{
+		LL_DEBUGS("360Capture") << "Agent interest list mode is already set to " << mInterestListMode << LL_ENDL;
+	}
 }
 
 
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index ef8df13fc6..b8ac47827a 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -295,13 +295,14 @@ public:
 	void                            removeRegionChangedCallback(boost::signals2::connection callback);
 
 
-	void changeInterestListMode(bool use_360_mode);
-	bool getInterestList360Mode() const { return mUse360Mode; }
+	void changeInterestListMode(const std::string & new_mode);
+    const std::string & getInterestListMode() const { return mInterestListMode; }
 
 private:
 	LLViewerRegion	*mRegionp;
 	region_changed_signal_t		            mRegionChangedSignal;
-	bool                                    mUse360Mode;
+
+    std::string								mInterestListMode;	// How agent wants regions to send updates
 
 	//--------------------------------------------------------------------
 	// History
diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp
index a0889abe2d..2c638fa959 100644
--- a/indra/newview/llfloater360capture.cpp
+++ b/indra/newview/llfloater360capture.cpp
@@ -64,11 +64,10 @@ LLFloater360Capture::LLFloater360Capture(const LLSD& key)
     // such time as we ask it not to (the dtor). If we crash or
     // otherwise, exit before this is turned off, the Simulator
     // will take care of cleaning up for us.
-    mWasIn360Mode = gAgent.getInterestList360Mode();
+    mStartILMode = gAgent.getInterestListMode();
 
     // send everything to us for as long as this floater is open
-    const bool use_360_mode = true;
-    gAgent.changeInterestListMode(use_360_mode);
+    gAgent.changeInterestListMode(LLViewerRegion::IL_MODE_360);
 }
 
 LLFloater360Capture::~LLFloater360Capture()
@@ -86,9 +85,9 @@ LLFloater360Capture::~LLFloater360Capture()
     // list updates.
     if (!LLApp::isExiting() && 
         gSavedSettings.getBOOL("360CaptureUseInterestListCap") &&
-        mWasIn360Mode != gAgent.getInterestList360Mode())
+        mStartILMode != gAgent.getInterestListMode())
     {
-        gAgent.changeInterestListMode(mWasIn360Mode);
+        gAgent.changeInterestListMode(mStartILMode);
     }
 }
 
diff --git a/indra/newview/llfloater360capture.h b/indra/newview/llfloater360capture.h
index 61316c65f3..3fb2c7f3c7 100644
--- a/indra/newview/llfloater360capture.h
+++ b/indra/newview/llfloater360capture.h
@@ -92,7 +92,7 @@ class LLFloater360Capture:
 
         LLPointer<LLImageRaw> mRawImages[6];
 
-        bool mWasIn360Mode;
+        std::string mStartILMode;
 };
 
 #endif  // LL_FLOATER_360CAPTURE_H
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 23abd0fe16..fe6676759d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1302,8 +1302,14 @@ public:
     bool handleEvent(const LLSD &userdata)
     {
         // Toggle the mode - regions will get updated
-        bool new_mode = !gAgent.getInterestList360Mode();
-        gAgent.changeInterestListMode(new_mode);
+        if (gAgent.getInterestListMode() == LLViewerRegion::IL_MODE_360)
+        {
+			gAgent.changeInterestListMode(LLViewerRegion::IL_MODE_DEFAULT);
+		}
+		else
+		{
+			gAgent.changeInterestListMode(LLViewerRegion::IL_MODE_360);
+		}
         return true;
     }
 };
@@ -1312,7 +1318,7 @@ class LLAdvancedCheckInterestList360Mode : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		return gAgent.getInterestList360Mode();
+		return (gAgent.getInterestListMode() == LLViewerRegion::IL_MODE_360);
 	}
 };
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 7abd77505d..9c2dc3c761 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -104,6 +104,9 @@ S32  LLViewerRegion::sLastCameraUpdated = 0;
 S32  LLViewerRegion::sNewObjectCreationThrottle = -1;
 LLViewerRegion::vocache_entry_map_t LLViewerRegion::sRegionCacheCleanup;
 
+const std::string LLViewerRegion::IL_MODE_DEFAULT = "default";
+const std::string LLViewerRegion::IL_MODE_360     = "360";
+
 typedef std::map<std::string, std::string> CapabilityMap;
 
 static void log_capabilities(const CapabilityMap &capmap);
@@ -647,7 +650,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	mPaused(FALSE),
 	mRegionCacheHitCount(0),
 	mRegionCacheMissCount(0),
-    mUse360Mode(false)
+    mInterestListMode(IL_MODE_DEFAULT)
 {
 	mWidth = region_width_meters;
 	mImpl->mOriginGlobal = from_region_handle(handle); 
@@ -3286,7 +3289,7 @@ void LLViewerRegion::setCapabilitiesReceived(bool received)
 		mCapabilitiesReceivedSignal.disconnect_all_slots();
 
 		// Set the region to the desired interest list mode
-        setInterestList360Mode(gAgent.getInterestList360Mode());
+        setInterestListMode(gAgent.getInterestListMode());
 	}
 }
 
@@ -3339,22 +3342,21 @@ bool LLViewerRegion::requestGetCapability(const std::string &capName, httpCallba
 }
 
 
-void LLViewerRegion::setInterestList360Mode(bool use_360_mode)
+void LLViewerRegion::setInterestListMode(const std::string &new_mode)
 {
-    if (use_360_mode != mUse360Mode)
+    if (new_mode != mInterestListMode)
     {
-        LLSD body;
-        mUse360Mode = use_360_mode;
+        mInterestListMode = new_mode;
 
-        if (mUse360Mode)
-        {
-            body["mode"] = LLSD::String("360");
-        }
-        else
-        {
-            body["mode"] = LLSD::String("default");
-        }
+		if (mInterestListMode != std::string(IL_MODE_DEFAULT) && mInterestListMode != std::string(IL_MODE_360))
+		{
+			LL_WARNS("360Capture") << "Region " << getRegionID() << " setInterestListMode() invalid interest list mode: " 
+				<< mInterestListMode << ", setting to default" << LL_ENDL;
+            mInterestListMode = IL_MODE_DEFAULT;
+		}
 
+		LLSD body;
+        body["mode"] = mInterestListMode;
         if (requestPostCapability("InterestList", body,
                                   [](const LLSD &response) {
                                       LL_DEBUGS("360Capture") << "InterestList capability responded: \n"
@@ -3375,13 +3377,13 @@ void LLViewerRegion::setInterestList360Mode(bool use_360_mode)
     else
     {
         LL_DEBUGS("360Capture") << "Region " << getRegionID() << "No change, skipping Interest List mode POST to "
-                                << (use_360_mode ? "360" : "default") << " mode" << LL_ENDL;
+								<< new_mode << " mode" << LL_ENDL;
     }
 }
 
 
 
-LLSpatialPartition* LLViewerRegion::getSpatialPartition(U32 type)
+LLSpatialPartition *LLViewerRegion::getSpatialPartition(U32 type)
 {
 	if (type < mImpl->mObjectPartition.size() && type < PARTITION_VO_CACHE)
 	{
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 3da0c376d3..6308058f63 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -487,12 +487,13 @@ public:
 	};
 	typedef std::set<LLViewerRegion*, CompareRegionByLastUpdate> region_priority_list_t;
 
-	void setInterestList360Mode(bool use_360_mode);
-	bool getInterestList360Mode() const { return mUse360Mode; }
+	void setInterestListMode(const std::string & new_mode);
+    const std::string & getInterestListMode() const { return mInterestListMode; }
 
+	static const std::string IL_MODE_DEFAULT;
+    static const std::string IL_MODE_360;
 
-
-private:
+  private:
 	static S32  sNewObjectCreationThrottle;
 	LLViewerRegionImpl * mImpl;
 	LLFrameTimer         mRegionTimer;
@@ -591,7 +592,7 @@ private:
 	LLFrameTimer mRenderInfoReportTimer;
 
 	// how the server interest list works
-    bool mUse360Mode;
+    std::string mInterestListMode;
 };
 
 inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const
-- 
cgit v1.2.3


From 74687f270545ededb77f29a7409f64303dcb2e2d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 15 May 2023 23:05:39 +0300
Subject: SL-19643 Shutdown and startup should not warn about attachments.

Initial attachments usually are not 'expected', shutdown is expected to detach everything
---
 indra/newview/llattachmentsmgr.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index d43048a8b6..1feefc3ef8 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -31,6 +31,7 @@
 #include "llagent.h"
 #include "llappearancemgr.h"
 #include "llinventorymodel.h"
+#include "llstartup.h"
 #include "lltooldraganddrop.h" // pack_permissions_slam
 #include "llviewerinventory.h"
 #include "llviewerregion.h"
@@ -372,7 +373,7 @@ void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
 {
     LLTimer timer;
     bool expected = mAttachmentRequests.getTime(inv_item_id, timer);
-    if (!expected)
+    if (!expected && LLStartUp::getStartupState() > STATE_WEARABLES_WAIT)
     {
         LLInventoryItem *item = gInventory.getItem(inv_item_id);
         LL_WARNS() << "ATT Attachment was unexpected or arrived after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds: "
@@ -411,11 +412,15 @@ void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
             LL_DEBUGS("Avatar") << "ATT all detach requests have completed" << LL_ENDL;
         }
     }
-    else
+    else if (!LLApp::isExiting())
     {
         LL_WARNS() << "ATT unexpected detach for "
                    << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
     }
+    else
+    {
+        LL_DEBUGS("Avatar") << "ATT detach on shutdown for " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+    }
 
     LL_DEBUGS("Avatar") << "ATT detached item flagging as questionable for COF link checking "
                         << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
-- 
cgit v1.2.3


From 2dca661b6a7b40c1dcf94a08f5304df277542597 Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Mon, 15 May 2023 23:24:00 +0100
Subject: SL-19676 - more IL control, added Reset Interest List Debug menu
 command

---
 indra/llmessage/llcorehttputil.cpp                 | 42 ++++++++++++++++++++++
 indra/llmessage/llcorehttputil.h                   |  4 +++
 indra/newview/llviewermenu.cpp                     | 31 ++++++++++++++--
 indra/newview/llviewerregion.cpp                   | 29 +++++++++++++++
 indra/newview/llviewerregion.h                     |  3 ++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 27 ++++++++------
 6 files changed, 123 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp
index c8c9280029..6b9ce54c92 100644
--- a/indra/llmessage/llcorehttputil.cpp
+++ b/indra/llmessage/llcorehttputil.cpp
@@ -1336,6 +1336,48 @@ void HttpCoroutineAdapter::trivialPostCoro(std::string url, LLCore::HttpRequest:
 }
 
 
+/*static*/
+void HttpCoroutineAdapter::callbackHttpDel(const std::string &url, LLCore::HttpRequest::policy_t policyId, completionCallback_t success,
+                                           completionCallback_t failure)
+{
+    LLCoros::instance().launch("HttpCoroutineAdapter::genericDelCoro",
+                               boost::bind(&HttpCoroutineAdapter::trivialDelCoro, url, policyId, success, failure));
+}
+
+/*static*/
+void HttpCoroutineAdapter::trivialDelCoro(std::string url, LLCore::HttpRequest::policy_t policyId, completionCallback_t success,
+                                          completionCallback_t failure)
+{
+    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("genericDelCoro", policyId));
+    LLCore::HttpRequest::ptr_t                  httpRequest(new LLCore::HttpRequest);
+    LLCore::HttpOptions::ptr_t                  httpOpts(new LLCore::HttpOptions);
+
+    httpOpts->setWantHeaders(true);
+
+    LL_INFOS("HttpCoroutineAdapter", "genericDelCoro") << "Generic DEL for " << url << LL_ENDL;
+
+    LLSD result = httpAdapter->deleteAndSuspend(httpRequest, url, httpOpts);
+
+    LLSD               httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    LLCore::HttpStatus status      = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    if (!status)
+    {
+        if (failure)
+        {
+            failure(httpResults);
+        }
+    }
+    else
+    {
+        if (success)
+        {
+            success(result);
+        }
+    }
+}
+
+
 
 } // end namespace LLCoreHttpUtil
 
diff --git a/indra/llmessage/llcorehttputil.h b/indra/llmessage/llcorehttputil.h
index 6f0b865f83..8df1425f2a 100644
--- a/indra/llmessage/llcorehttputil.h
+++ b/indra/llmessage/llcorehttputil.h
@@ -608,6 +608,9 @@ public:
         callbackHttpPost(url, LLCore::HttpRequest::DEFAULT_POLICY_ID, postData, success, failure);
     }
 
+    static void callbackHttpDel(const std::string &url, LLCore::HttpRequest::policy_t policyId, completionCallback_t success = NULL,
+                            completionCallback_t failure = NULL);
+
     /// Generic Get and post routines for HTTP via coroutines.
     /// These static methods do all required setup for the GET or POST operation.
     /// When the operation completes successfully they will put the success message in the log at INFO level, 
@@ -669,6 +672,7 @@ private:
 
     static void trivialGetCoro(std::string url, LLCore::HttpRequest::policy_t policyId, completionCallback_t success, completionCallback_t failure);
     static void trivialPostCoro(std::string url, LLCore::HttpRequest::policy_t policyId, LLSD postData, completionCallback_t success, completionCallback_t failure);
+    static void trivialDelCoro(std::string url, LLCore::HttpRequest::policy_t policyId, completionCallback_t success, completionCallback_t failure);
 
     void checkDefaultHeaders(LLCore::HttpHeaders::ptr_t &headers);
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index fe6676759d..c762e796aa 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -122,6 +122,7 @@
 #include "llviewerstatsrecorder.h"
 #include "llvoavatarself.h"
 #include "llvoicevivox.h"
+#include "llworld.h"
 #include "llworldmap.h"
 #include "pipeline.h"
 #include "llviewerjoystick.h"
@@ -333,6 +334,7 @@ void handle_debug_avatar_textures(void*);
 void handle_grab_baked_texture(void*);
 BOOL enable_grab_baked_texture(void*);
 void handle_dump_region_object_cache(void*);
+void handle_reset_interest_lists(void *);
 
 BOOL enable_save_into_task_inventory(void*);
 
@@ -1346,6 +1348,14 @@ class LLAdvancedCheckStatsRecorder : public view_listener_t
     }
 };
 
+class LLAdvancedResetInterestLists : public view_listener_t
+{
+    bool handleEvent(const LLSD &userdata)
+    {	// Reset all region interest lists
+        handle_reset_interest_lists(NULL);
+        return true;
+    }
+};
 
 
 class LLAdvancedBuyCurrencyTest : public view_listener_t
@@ -3892,6 +3902,22 @@ void handle_dump_region_object_cache(void*)
 	}
 }
 
+void handle_reset_interest_lists(void *)
+{
+    // Check all regions and reset their interest list
+    for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+         iter != LLWorld::getInstance()->getRegionList().end();
+         ++iter)
+    {
+        LLViewerRegion *regionp = *iter;
+        if (regionp && regionp->isAlive() && regionp->capabilitiesReceived())
+        {
+            regionp->resetInterestList();
+        }
+    }
+}
+
+
 void handle_dump_focus()
 {
 	LLUICtrl *ctrl = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
@@ -9452,10 +9478,11 @@ void initialize_menus()
 	// Advanced > World
 	view_listener_t::addMenu(new LLAdvancedDumpScriptedCamera(), "Advanced.DumpScriptedCamera");
 	view_listener_t::addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache");
-    view_listener_t::addMenu(new LLAdvancedToggleInterestList360Mode(), "Advanced.ToggleInterestList360Mode");
-    view_listener_t::addMenu(new LLAdvancedCheckInterestList360Mode(), "Advanced.CheckInterestList360Mode");
     view_listener_t::addMenu(new LLAdvancedToggleStatsRecorder(), "Advanced.ToggleStatsRecorder");
     view_listener_t::addMenu(new LLAdvancedCheckStatsRecorder(), "Advanced.CheckStatsRecorder");
+    view_listener_t::addMenu(new LLAdvancedToggleInterestList360Mode(), "Advanced.ToggleInterestList360Mode");
+    view_listener_t::addMenu(new LLAdvancedCheckInterestList360Mode(), "Advanced.CheckInterestList360Mode");
+    view_listener_t::addMenu(new LLAdvancedResetInterestLists(), "Advanced.ResetInterestLists");
 
 	// Advanced > UI
 	commit.add("Advanced.WebBrowserTest", boost::bind(&handle_web_browser_test,	_2));	// sigh! this one opens the MEDIA browser
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 9c2dc3c761..5254d766a8 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3341,6 +3341,21 @@ bool LLViewerRegion::requestGetCapability(const std::string &capName, httpCallba
     return true;
 }
 
+bool LLViewerRegion::requestDelCapability(const std::string &capName, httpCallback_t cbSuccess, httpCallback_t cbFailure)
+{
+    std::string url;
+
+    url = getCapability(capName);
+
+    if (url.empty())
+    {
+        LL_WARNS("Region") << "Could not retrieve region " << getRegionID() << " DEL capability \"" << capName << "\"" << LL_ENDL;
+        return false;
+    }
+
+    LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpDel(url, gAgent.getAgentPolicy(), cbSuccess, cbFailure);
+    return true;
+}
 
 void LLViewerRegion::setInterestListMode(const std::string &new_mode)
 {
@@ -3382,6 +3397,20 @@ void LLViewerRegion::setInterestListMode(const std::string &new_mode)
 }
 
 
+void LLViewerRegion::resetInterestList()
+{
+	if (requestDelCapability("InterestList", [](const LLSD &response) {
+							LL_DEBUGS("360Capture") << "InterestList capability DEL responded: \n" << ll_pretty_print_sd(response) << LL_ENDL;
+						}))
+	{
+		LL_DEBUGS("360Capture") << "Region " << getRegionID() << " Successfully reset InterestList capability" << LL_ENDL;
+	}
+	else
+	{
+		LL_WARNS("360Capture") << "Region " << getRegionID() << " Unable to DEL InterestList capability request" << LL_ENDL;
+	}
+}
+
 
 LLSpatialPartition *LLViewerRegion::getSpatialPartition(U32 type)
 {
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 6308058f63..6956e9eb08 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -287,6 +287,7 @@ public:
                                httpCallback_t     cbSuccess = NULL,
                                httpCallback_t     cbFailure = NULL);
     bool requestGetCapability(const std::string &capName, httpCallback_t cbSuccess = NULL, httpCallback_t cbFailure = NULL);
+    bool requestDelCapability(const std::string &capName, httpCallback_t cbSuccess = NULL, httpCallback_t cbFailure = NULL);
 
     /// implements LLCapabilityProvider
 	/*virtual*/ const LLHost& getHost() const;
@@ -490,6 +491,8 @@ public:
 	void setInterestListMode(const std::string & new_mode);
     const std::string & getInterestListMode() const { return mInterestListMode; }
 
+	void resetInterestList();
+
 	static const std::string IL_MODE_DEFAULT;
     static const std::string IL_MODE_360;
 
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 07471ed5bb..51ac3d17ab 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3485,16 +3485,6 @@ function="World.EnvPreset"
                 <menu_item_call.on_click
                  function="Advanced.DumpRegionObjectCache" />
             </menu_item_call>
-
-			<menu_item_check
-			  label="Interest List 360 Mode"
-             name="Interest List: 360 Mode"
-             shortcut="alt|shift|I">
-			   <menu_item_check.on_check
-				function="Advanced.CheckInterestList360Mode" />
-			   <menu_item_check.on_click
-				  function="Advanced.ToggleInterestList360Mode" />
-            </menu_item_check>
 			<menu_item_check
              label="Record Stats to File"
              name="Stats Recorder File">
@@ -3503,7 +3493,22 @@ function="World.EnvPreset"
 				<menu_item_check.on_click
                  function="Advanced.ToggleStatsRecorder" />
 			</menu_item_check>
-        </menu>
+			<menu_item_check
+		     label="Interest Lists 360 Mode"
+             name="Interest List: 360 Mode"
+             shortcut="alt|shift|I">
+			   <menu_item_check.on_check
+				function="Advanced.CheckInterestList360Mode" />
+			   <menu_item_check.on_click
+				  function="Advanced.ToggleInterestList360Mode" />
+            </menu_item_check>
+			<menu_item_call
+             label="Reset Interest Lists"
+             name="Reset Interest Lists">
+				<menu_item_call.on_click
+                 function="Advanced.ResetInterestLists" />
+			</menu_item_call>
+		</menu>
         <menu
          create_jump_keys="true"
          label="UI"
-- 
cgit v1.2.3


From 60d8647a32db1dd54ffde742e157b54b183592a7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 16 May 2023 02:00:51 +0300
Subject: SL-19602 Alt-Zoom overcompensates for z pelvis fixup

Alt zoom was pointing near ground instead of agent's actual position
---
 indra/newview/llagentcamera.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 77131efd75..2cf86cb001 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -401,10 +401,15 @@ LLVector3 LLAgentCamera::calcFocusOffset(LLViewerObject *object, LLVector3 origi
 
 	// if is avatar - don't do any funk heuristics to position the focal point
 	// see DEV-30589
-	if (object->isAvatar() || (object->isAnimatedObject() && object->getControlAvatar()))
+	if ((object->isAvatar() && !object->isRoot()) || (object->isAnimatedObject() && object->getControlAvatar()))
 	{
 		return original_focus_point - obj_pos;
 	}
+    if (object->isAvatar())
+    {
+        LLVOAvatar* av = object->asAvatar();
+        return original_focus_point - av->getCharacterPosition();
+    }
 	
 	LLQuaternion inv_obj_rot = ~obj_rot; // get inverse of rotation
 	LLVector3 object_extents = object->getScale();	
-- 
cgit v1.2.3


From 474012abd603f7e7963344fcd9d14cdc7db7bb9a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 16 May 2023 18:03:57 +0300
Subject: SL-19686 reduce delay when switching between folders

---
 indra/llui/llfolderviewitem.cpp    | 5 +++++
 indra/llui/llfolderviewitem.h      | 1 +
 indra/newview/llinventorypanel.cpp | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 227f1d79e4..bc7a2cc3f0 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1769,6 +1769,11 @@ BOOL LLFolderViewFolder::isRemovable()
 	return TRUE;
 }
 
+void LLFolderViewFolder::destroyRoot()
+{
+    delete this;
+}
+
 // this is an internal method used for adding items to folders. 
 void LLFolderViewFolder::addItem(LLFolderViewItem* item)
 {
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index b6437ab61d..232780ccae 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -394,6 +394,7 @@ public:
 
 	// destroys this folder, and all children
 	virtual void destroyView();
+    void destroyRoot();
 
     // whether known children are fully loaded (arrange sets to true)
     virtual bool isFolderComplete() { return mIsFolderComplete; }
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index ca5abfd661..edcd45db79 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2195,8 +2195,8 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
         LLUUID root_id = mFolderID;
         if (mFolderRoot.get())
         {
-            removeItemID(getRootFolderID());
-            mFolderRoot.get()->destroyView();
+            mItemMap.clear();
+            mFolderRoot.get()->destroyRoot();
         }
 
         mCommitCallbackRegistrar.pushScope();
-- 
cgit v1.2.3


From 55fb718598b474680ab66cdc667a9e779fb7807a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 16 May 2023 18:34:32 +0300
Subject: SL-19701 open shared folder instead of just selecting it

---
 indra/newview/llviewermessage.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 78241a7c71..b359ef6df4 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1544,7 +1544,14 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
             const LLInventoryObject *obj = gInventory.getObject(obj_id);
             if (obj && obj->getParentUUID().notNull())
             {
-                LLPanelMainInventory::newFolderWindow(obj->getParentUUID(), obj_id);
+                if (obj->getActualType() == LLAssetType::AT_CATEGORY)
+                {
+                    LLPanelMainInventory::newFolderWindow(obj_id);
+                }
+                else
+                {
+                    LLPanelMainInventory::newFolderWindow(obj->getParentUUID(), obj_id);
+                }
             }
         }
         else
-- 
cgit v1.2.3


From 86fc10f710ced7d2e7b1ddf01eef945aafd60e8b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 16 May 2023 22:36:26 +0300
Subject: SL-19717 don't open new floater when taking an object from in-world
 or copying content

---
 indra/newview/llviewermessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b359ef6df4..3adb5db3bc 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1539,7 +1539,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
 		////////////////////////////////////////////////////////////////////////////////
         static LLUICachedControl<bool> find_original_new_floater("FindOriginalOpenWindow", false);
         //show in a new single-folder window
-        if(find_original_new_floater)
+        if(find_original_new_floater && !from_name.empty())
         {
             const LLInventoryObject *obj = gInventory.getObject(obj_id);
             if (obj && obj->getParentUUID().notNull())
-- 
cgit v1.2.3


From 07dc391ab76a8860d04bfb001cdc686cd576663d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 17 May 2023 00:00:44 +0300
Subject: SL-19720 Fix missing buttons for replacing body parts

---
 indra/newview/llwearableitemslist.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 89b74ae962..8681f7c14e 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -104,8 +104,6 @@ BOOL LLPanelWearableOutfitItem::postBuild()
 {
     LLPanelWearableListItem::postBuild();
     
-    LLViewerInventoryItem* inv_item = getItem();
-    mShowWidgets &= (inv_item->getType() != LLAssetType::AT_BODYPART);
     if(mShowWidgets)
     {
         addWidgetToRightSide("add_wearable");
@@ -208,7 +206,12 @@ void LLPanelWearableOutfitItem::updateItem(const std::string& name,
     if(mShowWidgets)
     {
         setShowWidget("add_wearable", !is_worn);
-        setShowWidget("remove_wearable", is_worn);
+
+        // Body parts can't be removed, only replaced
+        LLViewerInventoryItem* inv_item = getItem();
+        bool show_remove = is_worn && inv_item && (inv_item->getType() != LLAssetType::AT_BODYPART);
+        setShowWidget("remove_wearable", show_remove);
+
         if(mHovered)
         {
             setWidgetsVisible(true);
-- 
cgit v1.2.3


From 784436a5b89062df69251c9ac28904f06a018011 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 17 May 2023 18:38:23 +0300
Subject: SL-19721 use LLOutfitObserver to handle cof changes

---
 indra/newview/llinventorygallery.cpp |  4 ++--
 indra/newview/lloutfitslist.cpp      |  3 +--
 indra/newview/llpanelwearing.cpp     | 13 ++-----------
 indra/newview/llpanelwearing.h       |  1 -
 4 files changed, 5 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 9c7e96e97e..f97cb9dbf4 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -45,6 +45,7 @@
 #include "llfriendcard.h"
 #include "llgesturemgr.h"
 #include "llmarketplacefunctions.h"
+#include "lloutfitobserver.h"
 #include "lltrans.h"
 #include "llviewerassettype.h"
 #include "llviewermessage.h"
@@ -244,8 +245,7 @@ void LLInventoryGallery::updateRootFolder()
         }
     }
 
-    const LLUUID cof = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
-    mCategoriesObserver->addCategory(cof, boost::bind(&LLInventoryGallery::onCOFChanged, this));
+    LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&LLInventoryGallery::onCOFChanged, this));
 
     if (!mGalleryCreated)
     {
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index fe15d21e36..5c7792b0df 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -122,9 +122,8 @@ void LLOutfitsList::onOpen(const LLSD& info)
 {
     if (!mIsInitialized)
     {
-        const LLUUID cof = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
         // Start observing changes in Current Outfit category.
-        mCategoriesObserver->addCategory(cof, boost::bind(&LLOutfitsList::onCOFChanged, this));
+        LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&LLOutfitsList::onCOFChanged, this));
     }
 
     LLOutfitListBase::onOpen(info);
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index 3347c40687..062150dc56 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -40,6 +40,7 @@
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
 #include "llmenubutton.h"
+#include "lloutfitobserver.h"
 #include "llscrolllistctrl.h"
 #include "llviewermenu.h"
 #include "llviewerregion.h"
@@ -218,8 +219,6 @@ LLPanelWearing::LLPanelWearing()
 	,	mIsInitialized(false)
 	,	mAttachmentsChangedConnection()
 {
-	mCategoriesObserver = new LLInventoryCategoriesObserver();
-
 	mGearMenu = new LLWearingGearMenu(this);
 	mContextMenu = new LLWearingContextMenu();
 	mAttachmentsMenu = new LLTempAttachmentsContextMenu(this);
@@ -231,12 +230,6 @@ LLPanelWearing::~LLPanelWearing()
 	delete mContextMenu;
 	delete mAttachmentsMenu;
 
-	if (gInventory.containsObserver(mCategoriesObserver))
-	{
-		gInventory.removeObserver(mCategoriesObserver);
-	}
-	delete mCategoriesObserver;
-
 	if (mAttachmentsChangedConnection.connected())
 	{
 		mAttachmentsChangedConnection.disconnect();
@@ -281,10 +274,8 @@ void LLPanelWearing::onOpen(const LLSD& /*info*/)
 		if (!category)
 			return;
 
-		gInventory.addObserver(mCategoriesObserver);
-
 		// Start observing changes in Current Outfit category.
-		mCategoriesObserver->addCategory(cof, boost::bind(&LLWearableItemsList::updateList, mCOFItemsList, cof));
+        LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&LLWearableItemsList::updateList, mCOFItemsList, cof));
 
 		// Fetch Current Outfit contents and refresh the list to display
 		// initially fetched items. If not all items are fetched now
diff --git a/indra/newview/llpanelwearing.h b/indra/newview/llpanelwearing.h
index 715404a457..18e543eec6 100644
--- a/indra/newview/llpanelwearing.h
+++ b/indra/newview/llpanelwearing.h
@@ -90,7 +90,6 @@ private:
 
 	void getAttachmentLimitsCoro(std::string url);
 
-	LLInventoryCategoriesObserver* 	mCategoriesObserver;
 	LLWearableItemsList* 			mCOFItemsList;
 	LLScrollListCtrl*				mTempItemsList;
 	LLWearingGearMenu*				mGearMenu;
-- 
cgit v1.2.3


From c40ee46eb19c67d139e535ae262acc59c05ee315 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 17 May 2023 21:20:41 +0300
Subject: SL-19719 Fix packaging related warnings

---
 .../installers/windows/installer_template.nsi       |  17 +----------------
 indra/newview/installers/windows/lang_zh.nsi        | Bin 10144 -> 10154 bytes
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 60e26274cb..ed37f541c8 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -507,7 +507,7 @@ Call un.UserSettingsFiles
 SectionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Make sure the user can install
+;; Make sure the user can install/uninstall
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function CheckIfAdministrator
     DetailPrint $(CheckAdministratorInstDP)
@@ -521,21 +521,6 @@ lbl_is_admin:
 
 FunctionEnd
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Make sure the user can uninstall
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.CheckIfAdministrator
-    DetailPrint $(CheckAdministratorUnInstDP)
-    UserInfo::GetAccountType
-    Pop $R0
-    StrCmp $R0 "Admin" lbl_is_admin
-        MessageBox MB_OK $(CheckAdministratorUnInstMB)
-        Quit
-lbl_is_admin:
-    Return
-
-FunctionEnd
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Function CheckWillUninstallV2               
 ;;
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index 7922d9df52..0985663041 100755
Binary files a/indra/newview/installers/windows/lang_zh.nsi and b/indra/newview/installers/windows/lang_zh.nsi differ
-- 
cgit v1.2.3


From 706d8f17273f4718a2adf5a43c1de5a1dc08abad Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 18 May 2023 22:22:07 +0300
Subject: SL-19732 Fix folder's thumbnail from sticking over folder's content

---
 indra/llui/llfolderview.cpp        |  2 +-
 indra/llui/llfolderview.h          |  2 +-
 indra/llui/llfolderviewitem.cpp    |  2 +-
 indra/llui/llfolderviewitem.h      |  8 ++++----
 indra/newview/llinventorypanel.cpp | 12 ++++++++++--
 5 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 9fa8a84fa4..bf6f2436b1 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -2064,7 +2064,7 @@ LLFolderViewItem* LLFolderView::getNextUnselectedItem()
 	return new_selection;
 }
 
-S32 LLFolderView::getItemHeight()
+S32 LLFolderView::getItemHeight() const
 {
 	if(!hasVisibleChildren())
 {
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 22b8c475ec..73028f31b1 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -136,7 +136,7 @@ public:
 	// Find width and height of this object and its children. Also
 	// makes sure that this view and its children are the right size.
 	virtual S32 arrange( S32* width, S32* height );
-	virtual S32 getItemHeight();
+	virtual S32 getItemHeight() const;
 
 	void arrangeAll() { mArrangeGeneration++; }
 	S32 getArrangeGeneration() { return mArrangeGeneration; }
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index bc7a2cc3f0..4fbfa7ed79 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -416,7 +416,7 @@ S32 LLFolderViewItem::arrange( S32* width, S32* height )
 	return *height;
 }
 
-S32 LLFolderViewItem::getItemHeight()
+S32 LLFolderViewItem::getItemHeight() const
 {
 	return mItemHeight;
 }
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index c8d44de474..5c2a1ecff0 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -178,7 +178,7 @@ public:
 	// Finds width and height of this object and it's children.  Also
 	// makes sure that this view and it's children are the right size.
 	virtual S32 arrange( S32* width, S32* height );
-	virtual S32 getItemHeight();
+	virtual S32 getItemHeight() const;
     virtual S32 getLabelXPos();
     S32 getIconPad();
     S32 getTextPad();
@@ -217,9 +217,9 @@ public:
 
 	void setIsCurSelection(BOOL select) { mIsCurSelection = select; }
 
-	BOOL getIsCurSelection() { return mIsCurSelection; }
+	BOOL getIsCurSelection() const { return mIsCurSelection; }
 
-	BOOL hasVisibleChildren() { return mHasVisibleChildren; }
+	BOOL hasVisibleChildren() const { return mHasVisibleChildren; }
 
 	// true if object can't have children
 	virtual bool isFolderComplete() { return true; }
@@ -268,7 +268,7 @@ public:
 	virtual LLFolderView*	getRoot();
 	virtual const LLFolderView*	getRoot() const;
 	BOOL			isDescendantOf( const LLFolderViewFolder* potential_ancestor );
-	S32				getIndentation() { return mIndentation; }
+	S32				getIndentation() const { return mIndentation; }
 
 	virtual BOOL	passedFilter(S32 filter_generation = -1);
 	virtual BOOL	isPotentiallyVisible(S32 filter_generation = -1);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index edcd45db79..c5d3fa3f7a 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1311,10 +1311,18 @@ BOOL LLInventoryPanel::handleToolTip(S32 x, S32 y, MASK mask)
             params["inv_type"] = vm_item_p->getInventoryType();
             params["thumbnail_id"] = vm_item_p->getThumbnailUUID();
             params["item_id"] = vm_item_p->getUUID();
-            
+
+            // tooltip should only show over folder, but screen
+            // rect includes items under folder as well
+            LLRect actionable_rect = hover_item_p->calcScreenRect();
+            if (hover_item_p->isOpen() && hover_item_p->hasVisibleChildren())
+            {
+                actionable_rect.mBottom = actionable_rect.mTop - hover_item_p->getItemHeight();
+            }
+
 			LLToolTipMgr::instance().show(LLToolTip::Params()
 					.message(hover_item_p->getToolTip())
-					.sticky_rect(hover_item_p->calcScreenRect())
+					.sticky_rect(actionable_rect)
 					.delay_time(LLView::getTooltipTimeout())
 					.create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
 					.create_params(params));
-- 
cgit v1.2.3


From 100ace48f1cd64a364179c06900465209aac4945 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 18 May 2023 23:22:58 +0300
Subject: SL-19686 don't build gallery items without thumbnails in combination
 view

---
 indra/newview/llinventorygallery.cpp | 65 ++++++++++++++++++++++++++++++++++--
 indra/newview/llinventorygallery.h   |  4 +++
 2 files changed, 66 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index f97cb9dbf4..18a7068b66 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -200,6 +200,14 @@ void LLInventoryGallery::updateRootFolder()
         delete mCategoriesObserver;
 
         mCategoriesObserver = new LLInventoryCategoriesObserver();
+
+        if (gInventory.containsObserver(mThumbnailsObserver))
+        {
+            gInventory.removeObserver(mThumbnailsObserver);
+        }
+        delete mThumbnailsObserver;
+        mThumbnailsObserver = new LLThumbnailsObserver();
+        gInventory.addObserver(mThumbnailsObserver);
     }
     {
         mRootChangedSignal();
@@ -699,7 +707,11 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
         LL_WARNS("InventoryGallery") << "Failed to find item: " << item_id << LL_ENDL;
         return;
     }
-
+    if(!mFilter->checkAgainstFilterThumbnails(item_id))
+    {
+        mThumbnailsObserver->addSkippedItem(item_id, boost::bind(&LLInventoryGallery::onThumbnailAdded, this, item_id));
+        return;
+    }
     std::string name = obj->getName();
     LLUUID thumbnail_id = obj->getThumbnailUUID();;
     LLInventoryType::EType inventory_type(LLInventoryType::IT_CATEGORY);
@@ -816,6 +828,15 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
     }
 }
 
+void LLInventoryGallery::onThumbnailAdded(LLUUID item_id)
+{
+    if((mItemMap.count(item_id) == 0) && mFilter->checkAgainstFilterThumbnails(item_id))
+    {
+        updateAddedItem(item_id);
+        reArrangeRows();
+    }
+}
+
 void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
 {
     if (mInventoryGalleryMenu && item_id.notNull())
@@ -1525,9 +1546,33 @@ void LLInventoryGalleryItem::updateNameText()
 
 void LLThumbnailsObserver::changed(U32 mask)
 {
-    if (!mItemMap.size())
-        return;
     std::vector<LLUUID> deleted_ids;
+    for (item_map_t::iterator iter = mSkippedItems.begin();
+         iter != mSkippedItems.end();
+         ++iter)
+    {
+        const LLUUID& obj_id = (*iter).first;
+        LLItemData& data = (*iter).second;
+        
+        LLInventoryObject* obj = gInventory.getObject(obj_id);
+        if (!obj)
+        {
+            deleted_ids.push_back(obj_id);
+            continue;
+        }
+
+        const LLUUID thumbnail_id = obj->getThumbnailUUID();
+        if (data.mThumbnailID != thumbnail_id)
+        {
+            data.mThumbnailID = thumbnail_id;
+            data.mCallback();
+        }
+    }
+    for (std::vector<LLUUID>::iterator deleted_id = deleted_ids.begin(); deleted_id != deleted_ids.end(); ++deleted_id)
+    {
+        removeSkippedItem(*deleted_id);
+    }
+    deleted_ids.clear();
 
     for (item_map_t::iterator iter = mItemMap.begin();
          iter != mItemMap.end();
@@ -1569,11 +1614,25 @@ bool LLThumbnailsObserver::addItem(const LLUUID& obj_id, callback_t cb)
     return false;
 }
 
+void LLThumbnailsObserver::addSkippedItem(const LLUUID& obj_id, callback_t cb)
+{
+    LLInventoryObject* obj = gInventory.getObject(obj_id);
+    if (obj)
+    {
+        mSkippedItems.insert(item_map_value_t(obj_id, LLItemData(obj_id, obj->getThumbnailUUID(), cb)));
+    }
+}
+
 void LLThumbnailsObserver::removeItem(const LLUUID& obj_id)
 {
     mItemMap.erase(obj_id);
 }
 
+void LLThumbnailsObserver::removeSkippedItem(const LLUUID& obj_id)
+{
+    mSkippedItems.erase(obj_id);
+}
+
 //-----------------------------
 // Helper drag&drop functions
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index f7065afdae..473d1a1db4 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -89,6 +89,7 @@ public:
     void updateRemovedItem(LLUUID item_id);
     void updateChangedItemName(LLUUID item_id, std::string name);
     void updateItemThumbnail(LLUUID item_id);
+    void onThumbnailAdded(LLUUID item_id);
     void updateWornItem(LLUUID item_id, bool is_worn);
 
     void updateMessageVisibility();
@@ -308,7 +309,9 @@ public:
 
     virtual void changed(U32 mask);
     bool addItem(const LLUUID& obj_id, callback_t cb);
+    void addSkippedItem(const LLUUID& obj_id, callback_t cb);
     void removeItem(const LLUUID& obj_id);
+    void removeSkippedItem(const LLUUID& obj_id);
 
 protected:
 
@@ -328,6 +331,7 @@ protected:
     typedef std::map<LLUUID, LLItemData> item_map_t;
     typedef item_map_t::value_type item_map_value_t;
     item_map_t mItemMap;
+    item_map_t mSkippedItems;
 };
 
 class LLGalleryGestureObserver : public LLGestureManagerObserver
-- 
cgit v1.2.3


From d28e2c03a76151b7e6ba47fc892fb7c2c164c1e2 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 12 May 2023 16:35:27 +0300
Subject: SL-19649 reduce logging out time for larger inventories

---
 indra/llui/llview.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 9ba71913d0..3344300635 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -576,8 +576,10 @@ void LLView::deleteAllChildren()
 
 	while (!mChildList.empty())
 	{
-		LLView* viewp = mChildList.front();
-		delete viewp; // will remove the child from mChildList
+        LLView* viewp = mChildList.front();
+        viewp->mParentView = NULL;
+        delete viewp;
+        mChildList.pop_front();
 	}
 }
 
-- 
cgit v1.2.3


From cc8af5f37df1e200bc0b55740887a99157066e35 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 May 2023 18:26:02 +0300
Subject: SL-19649 Adjust other classes for new deleteAllChildren mechanics

---
 indra/llui/lllayoutstack.cpp       | 19 ++++++++++++++++---
 indra/llui/lllayoutstack.h         |  1 +
 indra/llui/llmenugl.cpp            |  7 +++++++
 indra/llui/llmenugl.h              |  1 +
 indra/newview/llinspecttoast.cpp   |  7 +++++++
 indra/newview/llinventorymodel.cpp |  6 +++++-
 6 files changed, 37 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 77938edf27..ae9dba5945 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -282,6 +282,17 @@ void LLLayoutStack::draw()
 	}
 }
 
+void LLLayoutStack::deleteAllChildren()
+{
+    mPanels.clear();
+    LLView::deleteAllChildren();
+
+    // Not really needed since nothing is left to
+    // display, but for the sake of consistency
+    updateFractionalSizes();
+    mNeedsLayout = true;
+}
+
 void LLLayoutStack::removeChild(LLView* view)
 {
 	LLLayoutPanel* embedded_panelp = findEmbeddedPanel(dynamic_cast<LLPanel*>(view));
@@ -289,12 +300,14 @@ void LLLayoutStack::removeChild(LLView* view)
 	if (embedded_panelp)
 	{
 		mPanels.erase(std::find(mPanels.begin(), mPanels.end(), embedded_panelp));
-		delete embedded_panelp;
+        LLView::removeChild(view);
 		updateFractionalSizes();
 		mNeedsLayout = true;
 	}
-
-	LLView::removeChild(view);
+    else
+    {
+        LLView::removeChild(view);
+    }
 }
 
 BOOL LLLayoutStack::postBuild()
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index f772dbc6b4..22f11eb20f 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -67,6 +67,7 @@ public:
 	virtual ~LLLayoutStack();
 
 	/*virtual*/ void draw();
+    /*virtual*/ void deleteAllChildren();
 	/*virtual*/ void removeChild(LLView*);
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ bool addChild(LLView* child, S32 tab_group = 0);
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 5cb840fd61..33c4b6ec73 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1882,6 +1882,13 @@ bool LLMenuGL::addContextChild(LLView* view, S32 tab_group)
 	return false;
 }
 
+
+void LLMenuGL::deleteAllChildren()
+{
+    mItems.clear();
+    LLUICtrl::deleteAllChildren();
+}
+
 void LLMenuGL::removeChild( LLView* ctrl)
 {
 	// previously a dynamic_cast with if statement to check validity
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index f84c4d41eb..9d3be8d94f 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -442,6 +442,7 @@ public:
 	/*virtual*/ void drawBackground(LLMenuItemGL* itemp, F32 alpha);
 	/*virtual*/ void setVisible(BOOL visible);
 	/*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
+    /*virtual*/ void deleteAllChildren();
 	/*virtual*/ void removeChild( LLView* ctrl);
 	/*virtual*/ BOOL postBuild();
 	
diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp
index 68801b0895..6f93a78ca6 100644
--- a/indra/newview/llinspecttoast.cpp
+++ b/indra/newview/llinspecttoast.cpp
@@ -47,6 +47,7 @@ public:
 
 	/*virtual*/ void onOpen(const LLSD& notification_id);
 	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+    /*virtual*/ void deleteAllChildren();
 	/*virtual*/ void removeChild(LLView* child);
 private:
 	void onToastDestroy(LLToast * toast);
@@ -122,6 +123,12 @@ BOOL LLInspectToast::handleToolTip(S32 x, S32 y, MASK mask)
 	return LLFloater::handleToolTip(x, y, mask);
 }
 
+void LLInspectToast::deleteAllChildren()
+{
+    mPanel = NULL;
+    LLInspect::deleteAllChildren();
+}
+
 // virtual
 void LLInspectToast::removeChild(LLView* child)
 {
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 0bbf201dc6..b4727de77f 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -594,7 +594,11 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
 		}
 	}
 	
-	if(rv.isNull() && create_folder && root_id.notNull())
+	if(rv.isNull() 
+       && root_id.notNull()
+       && create_folder
+       && preferred_type != LLFolderType::FT_MARKETPLACE_LISTINGS
+       && preferred_type != LLFolderType::FT_OUTBOX)
 	{
 
 		if (isInventoryUsable())
-- 
cgit v1.2.3


From a10c876ae4db901ab60f58f0df82663b855b3d45 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 19 May 2023 02:20:48 +0300
Subject: DRTVWR-580 Post-merge fix

---
 indra/llcharacter/llkeyframemotion.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 9cb30882dd..3cef382bbf 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -2054,7 +2054,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
 			LL_DEBUGS("BVH") << "  rot: t " << rot_key.mTime << " angles " << rot_angles.mV[VX] <<","<< rot_angles.mV[VY] <<","<< rot_angles.mV[VZ] << LL_ENDL;
 		}
 
-		success &= dp.packS32(joint_motionp->mPositionCurve.mNumKeys, "num_pos_keys");
+		success &= dp.packS32(joint_motionp->mPositionCurve.mKeys.size(), "num_pos_keys");
 		for (PositionCurve::key_map_t::value_type& pos_pair : joint_motionp->mPositionCurve.mKeys)
 		{
 			PositionKey& pos_key = pos_pair.second;
-- 
cgit v1.2.3


From 7140640b6963dacfa012dfec679798fc4dd13a17 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 19 May 2023 02:31:28 +0300
Subject: DRTVWR-580 Post-merge fix - unused code

---
 indra/newview/llfilepicker.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index ab5f88e210..f1f156c2e0 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -745,14 +745,6 @@ void set_nav_save_data(LLFilePicker::ESaveFilter filter, std::string &extension,
             creator = "\?\?\?\?";
             extension = "xaf";
             break;
-
-#ifdef _CORY_TESTING
-        case LLFilePicker::FFSAVE_GEOMETRY:
-            type = "\?\?\?\?";
-            creator = "\?\?\?\?";
-            extension = "slg";
-            break;
-#endif
             
         case LLFilePicker::FFSAVE_XML:
             type = "\?\?\?\?";
-- 
cgit v1.2.3


From d53c8a7d65cabaab303c21db7bb6d2ce4370c331 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 19 May 2023 18:09:35 +0300
Subject: SL-19738 don't switch the view when creating an item

---
 indra/newview/llinventorypanel.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index c5d3fa3f7a..604bffb96e 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1834,7 +1834,13 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
     if (main_inventory && main_inventory->isSingleFolderMode()
         && use_main_panel)
     {
-        main_inventory->toggleViewMode();
+        const LLInventoryObject *obj = gInventory.getObject(obj_id);
+        if (obj)
+        {
+            main_inventory->setSingleFolderViewRoot(obj->getParentUUID(), false);
+            main_inventory->setGallerySelection(obj_id);
+            return;
+        }
     }
 	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
 
-- 
cgit v1.2.3


From b61ea595b5f2cac0f108b05526f0a371f512bfd4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 19 May 2023 17:33:27 -0400
Subject: SL-18837: Clean up more set-but-unused variables for Xcode 14.3

---
 indra/llui/llbutton.cpp              |  3 ---
 indra/llui/llmenugl.cpp              |  3 ---
 indra/newview/llagent.cpp            |  2 --
 indra/newview/llmodelpreview.cpp     |  5 -----
 indra/newview/llpanelnearbymedia.cpp |  6 +-----
 indra/newview/llsceneview.cpp        |  5 +----
 indra/newview/llselectmgr.cpp        | 12 ++++++------
 indra/newview/llsprite.cpp           |  5 -----
 indra/newview/llstartup.cpp          |  2 +-
 indra/newview/lltextureview.cpp      |  4 ++--
 indra/newview/llviewerobjectlist.cpp |  3 ---
 indra/newview/llvosurfacepatch.cpp   |  7 -------
 indra/newview/llvovolume.cpp         | 13 +------------
 13 files changed, 12 insertions(+), 58 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 8028f397f3..3354cb2db3 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -942,11 +942,8 @@ void LLButton::draw()
 			break;
 		}
 
-		S32 y_offset = 2 + (getRect().getHeight() - 20)/2;
-	
 		if (pressed && mDisplayPressedState)
 		{
-			y_offset--;
 			x++;
 		}
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 5cb840fd61..d29781cf33 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -487,9 +487,6 @@ void LLMenuItemGL::draw( void )
 	// let disabled items be highlighted, just don't draw them as such
 	if( getEnabled() && getHighlight() && !mBriefItem)
 	{
-		int debug_count = 0;
-		if (dynamic_cast<LLMenuItemCallGL*>(this))
-			debug_count++;
 		gGL.color4fv( mHighlightBackground.get().mV );
 
 		gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0 );
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 9018a5f168..f158d312ff 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3707,7 +3707,6 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **)
 			// take controls
 			msg->getU32("Data", "Controls", controls, block_index );
 			msg->getBOOL("Data", "PassToAgent", passon, block_index );
-			U32 total_count = 0;
 			for (i = 0; i < TOTAL_CONTROLS; i++)
 			{
 				if (controls & ( 1 << i))
@@ -3720,7 +3719,6 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **)
 					{
 						gAgent.mControlsTakenCount[i]++;
 					}
-					total_count++;
 				}
 			}
 		}
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index e1a5b22490..495153981b 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -2685,9 +2685,6 @@ void LLModelPreview::clearBuffers()
 
 void LLModelPreview::genBuffers(S32 lod, bool include_skin_weights)
 {
-    U32 mesh_count = 0;
-
-
     LLModelLoader::model_list* model = NULL;
 
     if (lod < 0 || lod > 4)
@@ -2818,8 +2815,6 @@ void LLModelPreview::genBuffers(S32 lod, bool include_skin_weights)
             vb->flush();
 
             mVertexBuffer[lod][mdl].push_back(vb);
-
-            ++mesh_count;
         }
     }
 }
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 02911313ed..3c3cd5d522 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -619,7 +619,6 @@ void LLPanelNearByMedia::refreshList()
 	LLViewerMedia::impl_list impls = media_inst->getPriorityList();
 	LLViewerMedia::impl_list::iterator priority_iter;
 	
-	U32 enabled_count = 0;
 	U32 disabled_count = 0;
 	
 	// iterate over the impl list, creating rows as necessary.
@@ -662,13 +661,10 @@ void LLPanelNearByMedia::refreshList()
 			{
 				disabled_count++;
 			}
-			else {
-				enabled_count++;
 		}
 	}
-	}	
 	mDisableAllCtrl->setEnabled((gSavedSettings.getBOOL("AudioStreamingMusic") || 
-		                         gSavedSettings.getBOOL("AudioStreamingMedia")) &&
+								 gSavedSettings.getBOOL("AudioStreamingMedia")) &&
 								(media_inst->isAnyMediaShowing() || 
 								 media_inst->isParcelMediaPlaying() ||
 								 media_inst->isParcelAudioPlaying()));
diff --git a/indra/newview/llsceneview.cpp b/indra/newview/llsceneview.cpp
index 5e339a52bf..9b1d2d48c6 100644
--- a/indra/newview/llsceneview.cpp
+++ b/indra/newview/llsceneview.cpp
@@ -100,8 +100,6 @@ void LLSceneView::draw()
 	F32 total_physics[] = { 0.f, 0.f };
 	
 
-	U32 object_count = 0;
-
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region)
 	{
@@ -116,8 +114,7 @@ void LLSceneView::draw()
 				U32 idx = object->isAttachment() ? 1 : 0;
 
 				LLVolume* volume = object->getVolume();
-				object_count++;
-				
+
 				F32 radius = object->getScale().magVec();
 				size[idx].push_back(radius);
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 86f7d2bf25..195b172102 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5274,8 +5274,8 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
 	LLViewerRegion*	last_region;
 	LLViewerRegion*	current_region;
 
-	S32 objects_sent = 0;
-	S32 packets_sent = 0;
+//	S32 objects_sent = 0;
+//	S32 packets_sent = 0;
 	S32 objects_in_this_packet = 0;
 
 	bool link_operation = message_name == "ObjectLink";
@@ -5407,7 +5407,7 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
 			(*pack_body)(node, user_data);
             // do any related logging
             (*log_func)(node, user_data);
-			++objects_sent;
+//			++objects_sent;
 			++objects_in_this_packet;
 
 			// and on to the next object
@@ -5425,7 +5425,7 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
 		{
 			// otherwise send current message and start new one
 			gMessageSystem->sendReliable( last_region->getHost());
-			packets_sent++;
+//			packets_sent++;
 			objects_in_this_packet = 0;
 
 			gMessageSystem->newMessage(message_name.c_str());
@@ -5442,7 +5442,7 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
 				{
 					// add root instance into new message
 					(*pack_body)(linkset_root, user_data);
-					++objects_sent;
+//					++objects_sent;
 					++objects_in_this_packet;
 				}
 			}
@@ -5456,7 +5456,7 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
 	if (gMessageSystem->getCurrentSendTotal() > 0)
 	{
 		gMessageSystem->sendReliable( current_region->getHost());
-		packets_sent++;
+//		packets_sent++;
 	}
 	else
 	{
diff --git a/indra/newview/llsprite.cpp b/indra/newview/llsprite.cpp
index c3eb70f850..fd41cdf0d7 100644
--- a/indra/newview/llsprite.cpp
+++ b/indra/newview/llsprite.cpp
@@ -79,7 +79,6 @@ void LLSprite::updateFace(LLFace &face)
 
 	// First, figure out how many vertices/indices we need.
 	U32 num_vertices, num_indices;
-	U32 vertex_count = 0;
 	
 	// Get the total number of vertices and indices
 	if (mFollow)
@@ -203,25 +202,21 @@ void LLSprite::updateFace(LLFace &face)
 	*verticesp = mC;
 	tex_coordsp++;
 	verticesp++;
-	vertex_count++;
 
 	*tex_coordsp = LLVector2(0.f, 1.f);
 	*verticesp = mB;
 	tex_coordsp++;
 	verticesp++;
-	vertex_count++;
 
 	*tex_coordsp = LLVector2(1.f, 1.f);
 	*verticesp = mA;
 	tex_coordsp++;
 	verticesp++;
-	vertex_count++;
 
 	*tex_coordsp = LLVector2(1.f, 0.0f);
 	*verticesp = mD;
 	tex_coordsp++;
 	verticesp++;
-	vertex_count++;
 
 	// Generate indices, since they're easy.
 	// Just a series of quads.
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6883ead5ee..70ca41c821 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3244,7 +3244,7 @@ LLSD transform_cert_args(LLPointer<LLCertificate> cert)
 		// are actually arrays, and we want to format them as comma separated          
 		// strings, so special case those.                                             
 		LLSDSerialize::toXML(cert_info[iter->first], std::cout);
-		if((iter->first== std::string(CERT_KEY_USAGE)) |
+		if((iter->first == std::string(CERT_KEY_USAGE)) ||
 		   (iter->first == std::string(CERT_EXTENDED_KEY_USAGE)))
 		{
 			value = "";
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index cf9211767e..84b61fc612 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -845,8 +845,8 @@ void LLTextureView::draw()
 
 			if (imagep->getID() == LLAppViewer::getTextureFetch()->mDebugID)
 			{
-				static S32 debug_count = 0;
-				++debug_count; // for breakpoints
+//				static S32 debug_count = 0;
+//				++debug_count; // for breakpoints
 			}
 			
 			F32 pri;
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index efc4ded79e..9666533db8 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -773,7 +773,6 @@ void LLViewerObjectList::dirtyAllObjectInventory()
 void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
 {
 	S32 i;
-	S32 num_objects = 0;
 	LLViewerObject *objectp;
 
 	S32 num_updates, max_value;
@@ -830,8 +829,6 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
 		objectp = mObjects[i];
 		if (!objectp->isDead())
 		{
-			num_objects++;
-
 			//  Update distance & gpw 
 			objectp->setPixelAreaAndAngle(agent); // Also sets the approx. pixel area
 			objectp->updateTextures();	// Update the image levels of textures for this object.
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
index b0af565867..5cb7e7478b 100644
--- a/indra/newview/llvosurfacepatch.cpp
+++ b/indra/newview/llvosurfacepatch.cpp
@@ -408,7 +408,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 										LLStrider<U16> &indicesp,
 										U32 &index_offset)
 {
-	S32 vertex_count = 0;
 	S32 i, x, y;
 
 	S32 num_vertices;
@@ -443,7 +442,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			normalsp++;
 			texCoords0p++;
 			texCoords1p++;
-			vertex_count++;
 		}
 
 		// North patch
@@ -456,7 +454,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			normalsp++;
 			texCoords0p++;
 			texCoords1p++;
-			vertex_count++;
 		}
 
 
@@ -493,7 +490,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			normalsp++;
 			texCoords0p++;
 			texCoords1p++;
-			vertex_count++;
 		}
 
 		// Iterate through the north patch's points
@@ -507,7 +503,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			normalsp++;
 			texCoords0p++;
 			texCoords1p++;
-			vertex_count++;
 		}
 
 
@@ -551,7 +546,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			normalsp++;
 			texCoords0p++;
 			texCoords1p++;
-			vertex_count++;
 		}
 
 		// Iterate through the north patch's points
@@ -565,7 +559,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			normalsp++;
 			texCoords0p++;
 			texCoords1p++;
-			vertex_count++;
 		}
 
 		for (i = 0; i < length; i++)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 2e7ccc8334..97b129db18 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -6287,7 +6287,6 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
 	LLSpatialGroup::buffer_map_t buffer_map;
 
 	LLViewerTexture* last_tex = NULL;
-	S32 buffer_index = 0;
 
 	S32 texture_index_channels = 1;
 	
@@ -6300,11 +6299,6 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
 	{
 		texture_index_channels = gDeferredAlphaProgram.mFeatures.mIndexedTextureChannels;
 	}
-    
-    if (distance_sort)
-    {
-        buffer_index = -1;
-    }
 
 	static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16);
 	texture_index_channels = llmin(texture_index_channels, (S32) max_texture_index);
@@ -6328,14 +6322,9 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
 			tex = NULL;
 		}
 
-		if (last_tex == tex)
-		{
-			buffer_index++;
-		}
-		else
+		if (last_tex != tex)
 		{
 			last_tex = tex;
-			buffer_index = 0;
 		}
 
 		bool bake_sunlight = LLPipeline::sBakeSunlight && facep->getDrawable()->isStatic(); 
-- 
cgit v1.2.3


From f366853f22ec6914471d7b265adf53736f080527 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 22 May 2023 14:42:31 +0300
Subject: SL-19735 Remove FB Connect Test; remove unused variable

---
 indra/newview/llviewerobjectlist.cpp               | 7 -------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 -------
 2 files changed, 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 5f0e331baa..61f0e05825 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -472,7 +472,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 	for (i = 0; i < num_objects; i++)
 	{
 		BOOL justCreated = FALSE;
-		S32	msg_size = 0;
 		bool update_cache = false; //update object cache if it is a full-update or terse update
 
 		if (compressed)
@@ -529,7 +528,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 		else if (update_type != OUT_FULL) // !compressed, !OUT_FULL ==> OUT_FULL_CACHED only?
 		{
 			mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_ID, local_id, i);
-			msg_size += sizeof(U32);
 
 			getUUIDFromLocal(fullid,
 							local_id,
@@ -550,8 +548,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			update_cache = true;
 			mesgsys->getUUIDFast(_PREHASH_ObjectData, _PREHASH_FullID, fullid, i);
 			mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_ID, local_id, i);
-			msg_size += sizeof(LLUUID);
-			msg_size += sizeof(U32);
 			LL_DEBUGS("ObjectUpdate") << "Full Update, obj " << local_id << ", global ID " << fullid << " from " << mesgsys->getSender() << LL_ENDL;
 		}
 		objectp = findObject(fullid);
@@ -626,7 +622,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 				}
 
 				mesgsys->getU8Fast(_PREHASH_ObjectData, _PREHASH_PCode, pcode, i);
-				msg_size += sizeof(U8);
 
 			}
 #ifdef IGNORE_DEAD
@@ -728,14 +723,12 @@ void LLViewerObjectList::processCachedObjectUpdate(LLMessageSystem *mesgsys,
 
 	for (S32 i = 0; i < num_objects; i++)
 	{
-		S32	msg_size = 0;
 		U32 id;
 		U32 crc;
 		U32 flags;
 		mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_ID, id, i);
 		mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_CRC, crc, i);
 		mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, i);
-		msg_size += sizeof(U32) * 2;
 
         LL_DEBUGS("ObjectUpdate") << "got probe for id " << id << " crc " << crc << LL_ENDL;
         dumpStack("ObjectUpdateStack");
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 51ac3d17ab..810d3fddd5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3522,13 +3522,6 @@ function="World.EnvPreset"
              function="Advanced.WebContentTest"
              parameter="http://duckduckgo.com"/>
           </menu_item_call>
-          <menu_item_call
-           label="FB Connect Test"
-           name="FB Connect Test">
-            <menu_item_call.on_click
-             function="Advanced.WebContentTest"
-             parameter="https://cryptic-ridge-1632.herokuapp.com/"/>
-          </menu_item_call>
           <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
-- 
cgit v1.2.3


From 1d1a63abe4a3d3a6191172c1693ffbdb0ffb2d71 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 19 May 2023 19:56:57 +0300
Subject: SL-19635 Implement DeepL tranlation support

---
 indra/newview/app_settings/settings.xml            |  11 +
 indra/newview/llfloatertranslationsettings.cpp     | 132 +++++++--
 indra/newview/llfloatertranslationsettings.h       |  10 +-
 indra/newview/lltranslate.cpp                      | 311 ++++++++++++++++++++-
 indra/newview/lltranslate.h                        |   1 +
 .../xui/en/floater_translation_settings.xml        |  97 ++++++-
 6 files changed, 527 insertions(+), 35 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fa241dc30c..ca1b1e2f20 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13014,6 +13014,17 @@
       <key>Value</key>
       <string></string>
     </map>
+    <key>DeepLTranslateAPIKey</key>
+    <map>
+        <key>Comment</key>
+        <string>DeepL Translation service data to use with the DeepL Translator API</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>LLSD</string>
+        <key>Value</key>
+        <string></string>
+    </map>
     <key>TutorialURL</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp
index e14227f490..d29ecbbf95 100644
--- a/indra/newview/llfloatertranslationsettings.cpp
+++ b/indra/newview/llfloatertranslationsettings.cpp
@@ -47,6 +47,7 @@ LLFloaterTranslationSettings::LLFloaterTranslationSettings(const LLSD& key)
 ,	mMachineTranslationCB(NULL)
 ,	mAzureKeyVerified(false)
 ,	mGoogleKeyVerified(false)
+,	mDeepLKeyVerified(false)
 {
 }
 
@@ -60,8 +61,11 @@ BOOL LLFloaterTranslationSettings::postBuild()
 	mAzureAPIKeyEditor = getChild<LLLineEditor>("azure_api_key");
     mAzureAPIRegionEditor = getChild<LLLineEditor>("azure_api_region");
 	mGoogleAPIKeyEditor = getChild<LLLineEditor>("google_api_key");
+    mDeepLAPIDomainCombo = getChild<LLComboBox>("deepl_api_domain_combo");
+    mDeepLAPIKeyEditor = getChild<LLLineEditor>("deepl_api_key");
 	mAzureVerifyBtn = getChild<LLButton>("verify_azure_api_key_btn");
 	mGoogleVerifyBtn = getChild<LLButton>("verify_google_api_key_btn");
+    mDeepLVerifyBtn = getChild<LLButton>("verify_deepl_api_key_btn");
 	mOKBtn = getChild<LLButton>("ok_btn");
 
 	mMachineTranslationCB->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::updateControlsEnabledState, this));
@@ -70,18 +74,37 @@ BOOL LLFloaterTranslationSettings::postBuild()
 	getChild<LLButton>("cancel_btn")->setClickedCallback(boost::bind(&LLFloater::closeFloater, this, false));
 	mAzureVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnAzureVerify, this));
 	mGoogleVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnGoogleVerify, this));
+    mDeepLVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnDeepLVerify, this));
 
 	mAzureAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
 	mAzureAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL);
     mAzureAPIRegionEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
     mAzureAPIRegionEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL);
 
-    mAzureAPIEndpointEditor->setFocusLostCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this));
-    mAzureAPIEndpointEditor->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this));
+    mAzureAPIEndpointEditor->setFocusLostCallback([this](LLFocusableElement*)
+                                                  {
+                                                      setAzureVerified(false, false, 0);
+                                                  });
+    mAzureAPIEndpointEditor->setCommitCallback([this](LLUICtrl* ctrl, const LLSD& param)
+                                               {
+                                                   setAzureVerified(false, false, 0);
+                                               });
 
 	mGoogleAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
 	mGoogleAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onGoogleKeyEdited, this), NULL);
 
+    mDeepLAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1));
+    mDeepLAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onDeepLKeyEdited, this), NULL);
+
+    mDeepLAPIDomainCombo->setFocusLostCallback([this](LLFocusableElement*)
+                                                  {
+                                                      setDeepLVerified(false, false, 0);
+                                                  });
+    mDeepLAPIDomainCombo->setCommitCallback([this](LLUICtrl* ctrl, const LLSD& param)
+                                               {
+                                                setDeepLVerified(false, false, 0);
+                                               });
+
 	center();
 	return TRUE;
 }
@@ -130,6 +153,20 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
 		mGoogleKeyVerified = FALSE;
 	}
 
+    LLSD deepl_key = gSavedSettings.getLLSD("DeepLTranslateAPIKey");
+    if (deepl_key.isMap() && !deepl_key["id"].asString().empty())
+    {
+        mDeepLAPIKeyEditor->setText(deepl_key["id"].asString());
+        mDeepLAPIKeyEditor->setTentative(false);
+        mDeepLAPIDomainCombo->setValue(deepl_key["domain"]);
+        verifyKey(LLTranslate::SERVICE_DEEPL, deepl_key, false);
+    }
+    else
+    {
+        mDeepLAPIKeyEditor->setTentative(TRUE);
+        mDeepLKeyVerified = FALSE;
+    }
+
 	updateControlsEnabledState();
 }
 
@@ -155,6 +192,17 @@ void LLFloaterTranslationSettings::setGoogleVerified(bool ok, bool alert, S32 st
 	updateControlsEnabledState();
 }
 
+void LLFloaterTranslationSettings::setDeepLVerified(bool ok, bool alert, S32 status)
+{
+    if (alert)
+    {
+        showAlert(ok ? "deepl_api_key_verified" : "deepl_api_key_not_verified", status);
+    }
+
+    mDeepLKeyVerified = ok;
+    updateControlsEnabledState();
+}
+
 std::string LLFloaterTranslationSettings::getSelectedService() const
 {
 	return mTranslationServiceRadioGroup->getSelectedValue().asString();
@@ -180,6 +228,17 @@ std::string LLFloaterTranslationSettings::getEnteredGoogleKey() const
 	return mGoogleAPIKeyEditor->getTentative() ? LLStringUtil::null : mGoogleAPIKeyEditor->getText();
 }
 
+LLSD LLFloaterTranslationSettings::getEnteredDeepLKey() const
+{
+    LLSD key;
+    if (!mDeepLAPIKeyEditor->getTentative())
+    {
+        key["domain"] = mDeepLAPIDomainCombo->getValue();
+        key["id"] = mDeepLAPIKeyEditor->getText();
+    }
+    return key;
+}
+
 void LLFloaterTranslationSettings::showAlert(const std::string& msg_name, S32 status) const
 {
     LLStringUtil::format_map_t string_args;
@@ -199,29 +258,42 @@ void LLFloaterTranslationSettings::updateControlsEnabledState()
 	std::string service = getSelectedService();
 	bool azure_selected = service == "azure";
 	bool google_selected = service == "google";
+    bool deepl_selected = service == "deepl";
 
 	mTranslationServiceRadioGroup->setEnabled(on);
 	mLanguageCombo->setEnabled(on);
 
-	getChild<LLTextBox>("azure_api_endoint_label")->setEnabled(on);
-	mAzureAPIEndpointEditor->setEnabled(on);
+    // MS Azure
+    getChild<LLTextBox>("azure_api_endoint_label")->setEnabled(on);
+    mAzureAPIEndpointEditor->setEnabled(on && azure_selected);
     getChild<LLTextBox>("azure_api_key_label")->setEnabled(on);
-    mAzureAPIKeyEditor->setEnabled(on);
+    mAzureAPIKeyEditor->setEnabled(on && azure_selected);
     getChild<LLTextBox>("azure_api_region_label")->setEnabled(on);
-    mAzureAPIRegionEditor->setEnabled(on);
+    mAzureAPIRegionEditor->setEnabled(on && azure_selected);
 
-	getChild<LLTextBox>("google_api_key_label")->setEnabled(on);
-	mGoogleAPIKeyEditor->setEnabled(on);
+    mAzureVerifyBtn->setEnabled(on && azure_selected &&
+                                !mAzureKeyVerified && getEnteredAzureKey().isMap());
 
-	mAzureAPIKeyEditor->setEnabled(on && azure_selected);
-	mGoogleAPIKeyEditor->setEnabled(on && google_selected);
+    // Google
+    getChild<LLTextBox>("google_api_key_label")->setEnabled(on);
+    mGoogleAPIKeyEditor->setEnabled(on && google_selected);
 
-	mAzureVerifyBtn->setEnabled(on && azure_selected &&
-		!mAzureKeyVerified && getEnteredAzureKey().isMap());
 	mGoogleVerifyBtn->setEnabled(on && google_selected &&
 		!mGoogleKeyVerified && !getEnteredGoogleKey().empty());
 
-	bool service_verified = (azure_selected && mAzureKeyVerified) || (google_selected && mGoogleKeyVerified);
+    // DeepL
+    getChild<LLTextBox>("deepl_api_domain_label")->setEnabled(on);
+    mDeepLAPIDomainCombo->setEnabled(on && deepl_selected);
+    getChild<LLTextBox>("deepl_api_key_label")->setEnabled(on);
+    mDeepLAPIKeyEditor->setEnabled(on && deepl_selected);
+
+    mDeepLVerifyBtn->setEnabled(on && deepl_selected &&
+                                 !mDeepLKeyVerified && getEnteredDeepLKey().isMap());
+
+    bool service_verified =
+        (azure_selected && mAzureKeyVerified) 
+        || (google_selected && mGoogleKeyVerified)
+        || (deepl_selected && mDeepLKeyVerified);
 	gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified);
 
 	mOKBtn->setEnabled(!on || service_verified);
@@ -247,6 +319,9 @@ void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, b
     case LLTranslate::SERVICE_GOOGLE:
         floater->setGoogleVerified(ok, alert, status);
         break;
+    case LLTranslate::SERVICE_DEEPL:
+        floater->setDeepLVerified(ok, alert, status);
+        break;
     }
 }
 
@@ -273,8 +348,7 @@ void LLFloaterTranslationSettings::onEditorFocused(LLFocusableElement* control)
 void LLFloaterTranslationSettings::onAzureKeyEdited()
 {
 	if (mAzureAPIKeyEditor->isDirty()
-        || mAzureAPIRegionEditor->isDirty()
-        || mAzureAPIEndpointEditor->getValue().isString())
+        || mAzureAPIRegionEditor->isDirty())
 	{
         // todo: verify mAzureAPIEndpointEditor url
 		setAzureVerified(false, false, 0);
@@ -289,6 +363,14 @@ void LLFloaterTranslationSettings::onGoogleKeyEdited()
 	}
 }
 
+void LLFloaterTranslationSettings::onDeepLKeyEdited()
+{
+    if (mDeepLAPIKeyEditor->isDirty())
+    {
+        setDeepLVerified(false, false, 0);
+    }
+}
+
 void LLFloaterTranslationSettings::onBtnAzureVerify()
 {
 	LLSD key = getEnteredAzureKey();
@@ -306,15 +388,28 @@ void LLFloaterTranslationSettings::onBtnGoogleVerify()
 		verifyKey(LLTranslate::SERVICE_GOOGLE, LLSD(key));
 	}
 }
+
+void LLFloaterTranslationSettings::onBtnDeepLVerify()
+{
+    LLSD key = getEnteredDeepLKey();
+    if (key.isMap())
+    {
+        verifyKey(LLTranslate::SERVICE_DEEPL, key);
+    }
+}
+
 void LLFloaterTranslationSettings::onClose(bool app_quitting)
 {
 	std::string service = gSavedSettings.getString("TranslationService");
 	bool azure_selected = service == "azure";
 	bool google_selected = service == "google";
+    bool deepl_selected = service == "deepl";
 
-	bool service_verified = (azure_selected && mAzureKeyVerified) || (google_selected && mGoogleKeyVerified);
-	gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified);
-
+    bool service_verified =
+        (azure_selected && mAzureKeyVerified)
+        || (google_selected && mGoogleKeyVerified)
+        || (deepl_selected && mDeepLKeyVerified);
+    gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified);
 }
 void LLFloaterTranslationSettings::onBtnOK()
 {
@@ -323,6 +418,7 @@ void LLFloaterTranslationSettings::onBtnOK()
 	gSavedSettings.setString("TranslationService", getSelectedService());
 	gSavedSettings.setLLSD("AzureTranslateAPIKey", getEnteredAzureKey());
 	gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey());
+    gSavedSettings.setLLSD("DeepLTranslateAPIKey", getEnteredDeepLKey());
 
 	closeFloater(false);
 }
diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h
index f039d90e27..eff0803fdd 100644
--- a/indra/newview/llfloatertranslationsettings.h
+++ b/indra/newview/llfloatertranslationsettings.h
@@ -44,12 +44,14 @@ public:
 
 	void setAzureVerified(bool ok, bool alert, S32 status);
 	void setGoogleVerified(bool ok, bool alert, S32 status);
+    void setDeepLVerified(bool ok, bool alert, S32 status);
 	void onClose(bool app_quitting);
 
 private:
 	std::string getSelectedService() const;
 	LLSD getEnteredAzureKey() const;
 	std::string getEnteredGoogleKey() const;
+    LLSD getEnteredDeepLKey() const;
 	void showAlert(const std::string& msg_name, S32 status) const;
 	void updateControlsEnabledState();
     void verifyKey(int service, const LLSD& key, bool alert = true);
@@ -57,25 +59,31 @@ private:
 	void onEditorFocused(LLFocusableElement* control);
 	void onAzureKeyEdited();
 	void onGoogleKeyEdited();
+    void onDeepLKeyEdited();
 	void onBtnAzureVerify();
 	void onBtnGoogleVerify();
+    void onBtnDeepLVerify();
 	void onBtnOK();
 
     static void setVerificationStatus(int service, bool alert, bool ok, S32 status);
 
 	LLCheckBoxCtrl* mMachineTranslationCB;
 	LLComboBox* mLanguageCombo;
-    LLComboBox* mAzureAPIEndpointEditor;;
+    LLComboBox* mAzureAPIEndpointEditor;
 	LLLineEditor* mAzureAPIKeyEditor;
     LLLineEditor* mAzureAPIRegionEditor;
 	LLLineEditor* mGoogleAPIKeyEditor;
+    LLComboBox* mDeepLAPIDomainCombo;
+    LLLineEditor* mDeepLAPIKeyEditor;
 	LLRadioGroup* mTranslationServiceRadioGroup;
 	LLButton* mAzureVerifyBtn;
 	LLButton* mGoogleVerifyBtn;
+    LLButton* mDeepLVerifyBtn;
 	LLButton* mOKBtn;
 
 	bool mAzureKeyVerified;
 	bool mGoogleKeyVerified;
+    bool mDeepLKeyVerified;
 };
 
 #endif // LL_LLFLOATERTRANSLATIONSETTINGS_H
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 6589ce06c4..70a40921ef 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -133,7 +133,9 @@ public:
                                        LLCore::HttpOptions::ptr_t options,
                                        LLCore::HttpHeaders::ptr_t headers,
                                        const std::string & url,
-                                       const std::string & msg) const = 0;
+                                       const std::string & msg,
+                                       const std::string& from_lang,
+                                       const std::string& to_lang) const = 0;
     virtual LLSD verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
         LLCore::HttpRequest::ptr_t request,
         LLCore::HttpOptions::ptr_t options,
@@ -230,7 +232,7 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
         return;
     }
 
-    LLSD result = sendMessageAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url, msg);
+    LLSD result = sendMessageAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url, msg, fromTo.first, fromTo.second);
 
     if (LLApp::isQuitting())
     {
@@ -331,7 +333,9 @@ public:
         LLCore::HttpOptions::ptr_t options,
         LLCore::HttpHeaders::ptr_t headers,
         const std::string & url,
-        const std::string & msg) const override;
+        const std::string & msg,
+        const std::string& from_lang,
+        const std::string& to_lang) const override;
 
     LLSD verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
         LLCore::HttpRequest::ptr_t request,
@@ -508,7 +512,9 @@ LLSD LLGoogleTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCorou
     LLCore::HttpOptions::ptr_t options,
     LLCore::HttpHeaders::ptr_t headers,
     const std::string & url,
-    const std::string & msg) const
+    const std::string & msg,
+    const std::string& from_lang,
+    const std::string& to_lang) const
 {
     return adapter->getRawAndSuspend(request, url, options, headers);
 }
@@ -558,7 +564,9 @@ public:
         LLCore::HttpOptions::ptr_t options,
         LLCore::HttpHeaders::ptr_t headers,
         const std::string & url,
-        const std::string & msg) const override;
+        const std::string & msg,
+        const std::string& from_lang,
+        const std::string& to_lang) const override;
 
     LLSD verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
         LLCore::HttpRequest::ptr_t request,
@@ -728,7 +736,7 @@ bool LLAzureTranslationHandler::parseResponse(
 // virtual
 bool LLAzureTranslationHandler::isConfigured() const
 {
-	return !getAPIKey().isMap();
+	return getAPIKey().isMap();
 }
 
 //static
@@ -814,7 +822,9 @@ LLSD LLAzureTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCorout
     LLCore::HttpOptions::ptr_t options,
     LLCore::HttpHeaders::ptr_t headers,
     const std::string & url,
-    const std::string & msg) const
+    const std::string & msg,
+    const std::string& from_lang,
+    const std::string& to_lang) const
 {
     LLCore::BufferArray::ptr_t rawbody(new LLCore::BufferArray);
     LLCore::BufferArrayStream outs(rawbody.get());
@@ -838,6 +848,259 @@ LLSD LLAzureTranslationHandler::verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAd
     return adapter->postRawAndSuspend(request, url, rawbody, options, headers);
 }
 
+//=========================================================================
+/// DeepL Translator API handler.
+class LLDeepLTranslationHandler: public LLTranslationAPIHandler
+{
+    LOG_CLASS(LLDeepLTranslationHandler);
+
+public:
+    std::string getTranslateURL(
+        const std::string& from_lang,
+        const std::string& to_lang,
+        const std::string& text) const override;
+    std::string getKeyVerificationURL(
+        const LLSD& key) const override;
+    bool checkVerificationResponse(
+        const LLSD& response,
+        int status) const override;
+    bool parseResponse(
+        const LLSD& http_response,
+        int& status,
+        const std::string& body,
+        std::string& translation,
+        std::string& detected_lang,
+        std::string& err_msg) const override;
+    bool isConfigured() const override;
+
+    LLTranslate::EService getCurrentService() override
+    {
+        return LLTranslate::EService::SERVICE_DEEPL;
+    }
+
+    void verifyKey(const LLSD& key, LLTranslate::KeyVerificationResult_fn fnc) override;
+
+    void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const override;
+    void initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent, const LLSD& key) const override;
+    LLSD sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+                               LLCore::HttpRequest::ptr_t request,
+                               LLCore::HttpOptions::ptr_t options,
+                               LLCore::HttpHeaders::ptr_t headers,
+                               const std::string& url,
+                               const std::string& msg,
+                               const std::string& from_lang,
+                               const std::string& to_lang) const override;
+
+    LLSD verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+                          LLCore::HttpRequest::ptr_t request,
+                          LLCore::HttpOptions::ptr_t options,
+                          LLCore::HttpHeaders::ptr_t headers,
+                          const std::string& url) const override;
+private:
+    static std::string parseErrorResponse(
+        const std::string& body);
+    static LLSD getAPIKey();
+    static std::string getAPILanguageCode(const std::string& lang);
+};
+
+//-------------------------------------------------------------------------
+// virtual
+std::string LLDeepLTranslationHandler::getTranslateURL(
+    const std::string& from_lang,
+    const std::string& to_lang,
+    const std::string& text) const
+{
+    std::string url;
+    LLSD key = getAPIKey();
+    if (key.isMap())
+    {
+        url = key["domain"].asString();
+
+        if (*url.rbegin() != '/')
+        {
+            url += "/";
+        }
+        url += std::string("v2/translate");
+    }
+    return url;
+}
+
+
+// virtual
+std::string LLDeepLTranslationHandler::getKeyVerificationURL(
+    const LLSD& key) const
+{
+    std::string url;
+    if (key.isMap())
+    {
+        url = key["domain"].asString();
+
+        if (*url.rbegin() != '/')
+        {
+            url += "/";
+        }
+        url += std::string("v2/translate");
+    }
+    return url;
+}
+
+//virtual
+bool LLDeepLTranslationHandler::checkVerificationResponse(
+    const LLSD& response,
+    int status) const
+{
+    return status == HTTP_OK;
+}
+
+// virtual
+bool LLDeepLTranslationHandler::parseResponse(
+    const LLSD& http_response,
+    int& status,
+    const std::string& body,
+    std::string& translation,
+    std::string& detected_lang,
+    std::string& err_msg) const
+{
+    if (status != HTTP_OK)
+    {
+        if (http_response.has("error_body"))
+            err_msg = parseErrorResponse(http_response["error_body"].asString());
+        return false;
+    }
+
+    //Example:
+    // "{\"translations\":[{\"detected_source_language\":\"EN\",\"text\":\"test\"}]}"
+
+    Json::Value root;
+    Json::Reader reader;
+
+    if (!reader.parse(body, root))
+    {
+        err_msg = reader.getFormatedErrorMessages();
+        return false;
+    }
+
+    if (!root.isObject()
+        || !root.isMember("translations")) // empty response? should not happen
+    {
+        return false;
+    }
+
+    // Request succeeded, extract translation from the response.
+    const Json::Value& translations = root["translations"];
+    if (!translations.isArray() || translations.size() == 0)
+    {
+        return false;
+    }
+
+    const Json::Value& data= translations[0U];
+    if (!data.isObject()
+        || !data.isMember("detected_source_language")
+        || !data.isMember("text"))
+    {
+        return false;
+    }
+    
+
+    detected_lang = data["detected_source_language"].asString();
+    LLStringUtil::toLower(detected_lang);
+    translation = data["text"].asString();
+
+    return true;
+}
+
+// virtual
+bool LLDeepLTranslationHandler::isConfigured() const
+{
+    return getAPIKey().isMap();
+}
+
+//static
+std::string LLDeepLTranslationHandler::parseErrorResponse(
+    const std::string& body)
+{
+    // DeepL doesn't seem to have any error handling beyoun http codes
+    return std::string();
+}
+
+// static
+LLSD LLDeepLTranslationHandler::getAPIKey()
+{
+    static LLCachedControl<LLSD> deepl_key(gSavedSettings, "DeepLTranslateAPIKey");
+    return deepl_key;
+}
+
+// static
+std::string LLDeepLTranslationHandler::getAPILanguageCode(const std::string& lang)
+{
+    return lang == "zh" ? "zh-CHT" : lang; // treat Chinese as Traditional Chinese
+}
+
+/*virtual*/
+void LLDeepLTranslationHandler::verifyKey(const LLSD& key, LLTranslate::KeyVerificationResult_fn fnc)
+{
+    LLCoros::instance().launch("DeepL /Verify Key", boost::bind(&LLTranslationAPIHandler::verifyKeyCoro,
+                                                                this, LLTranslate::SERVICE_DEEPL, key, fnc));
+}
+/*virtual*/
+void LLDeepLTranslationHandler::initHttpHeader(
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string& user_agent) const
+{
+    initHttpHeader(headers, user_agent, getAPIKey());
+}
+
+/*virtual*/
+void LLDeepLTranslationHandler::initHttpHeader(
+    LLCore::HttpHeaders::ptr_t headers,
+    const std::string& user_agent,
+    const LLSD& key) const
+{
+    headers->append(HTTP_OUT_HEADER_CONTENT_TYPE, "application/x-www-form-urlencoded");
+    headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+
+    if (key.has("id"))
+    {
+        std::string authkey = "DeepL-Auth-Key " + key["id"].asString();
+        headers->append(HTTP_OUT_HEADER_AUTHORIZATION, authkey);
+    }
+}
+
+LLSD LLDeepLTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+                                                      LLCore::HttpRequest::ptr_t request,
+                                                      LLCore::HttpOptions::ptr_t options,
+                                                      LLCore::HttpHeaders::ptr_t headers,
+                                                      const std::string& url,
+                                                      const std::string& msg,
+                                                      const std::string& from_lang,
+                                                      const std::string& to_lang) const
+{
+    LLCore::BufferArray::ptr_t rawbody(new LLCore::BufferArray);
+    LLCore::BufferArrayStream outs(rawbody.get());
+    outs << "text=";
+    std::string escaped_string = LLURI::escape(msg);
+    outs << escaped_string;
+    outs << "&target_lang=";
+    std::string lang = to_lang;
+    LLStringUtil::toUpper(lang);
+    outs << lang;
+
+    return adapter->postRawAndSuspend(request, url, rawbody, options, headers);
+}
+
+LLSD LLDeepLTranslationHandler::verifyAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
+                                                 LLCore::HttpRequest::ptr_t request,
+                                                 LLCore::HttpOptions::ptr_t options,
+                                                 LLCore::HttpHeaders::ptr_t headers,
+                                                 const std::string& url) const
+{
+    LLCore::BufferArray::ptr_t rawbody(new LLCore::BufferArray);
+    LLCore::BufferArrayStream outs(rawbody.get());
+    outs << "text=&target_lang=EN";
+
+    return adapter->postRawAndSuspend(request, url, rawbody, options, headers);
+}
+
 //=========================================================================
 LLTranslate::LLTranslate():
 	mCharsSeen(0),
@@ -867,6 +1130,11 @@ std::string LLTranslate::addNoTranslateTags(std::string mesg)
         return mesg;
     }
 
+    if (getPreferredHandler().getCurrentService() == SERVICE_DEEPL)
+    {
+        return mesg;
+    }
+
     if (getPreferredHandler().getCurrentService() == SERVICE_AZURE)
     {
         // https://learn.microsoft.com/en-us/azure/cognitive-services/translator/prevent-translation
@@ -892,6 +1160,10 @@ std::string LLTranslate::removeNoTranslateTags(std::string mesg)
     {
         return mesg;
     }
+    if (getPreferredHandler().getCurrentService() == SERVICE_DEEPL)
+    {
+        return mesg;
+    }
 
     if (getPreferredHandler().getCurrentService() == SERVICE_AZURE)
     {
@@ -997,6 +1269,14 @@ LLTranslationAPIHandler& LLTranslate::getPreferredHandler()
 	{
 		service = SERVICE_GOOGLE;
 	}
+    if (service_str == "azure")
+    {
+        service = SERVICE_AZURE;
+    }
+    if (service_str == "deepl")
+    {
+        service = SERVICE_DEEPL;
+    }
 
 	return getHandler(service);
 }
@@ -1006,11 +1286,18 @@ LLTranslationAPIHandler& LLTranslate::getHandler(EService service)
 {
 	static LLGoogleTranslationHandler google;
 	static LLAzureTranslationHandler azure;
+    static LLDeepLTranslationHandler deepl;
 
-	if (service == SERVICE_GOOGLE)
-	{
-		return google;
-	}
+    switch (service)
+    {
+        case SERVICE_AZURE:
+            return azure;
+        case SERVICE_GOOGLE:
+            return google;
+        case SERVICE_DEEPL:
+            return deepl;
+    }
+
+    return azure;
 
-	return azure;
 }
diff --git a/indra/newview/lltranslate.h b/indra/newview/lltranslate.h
index ffbbb05e62..4a5d80737c 100644
--- a/indra/newview/lltranslate.h
+++ b/indra/newview/lltranslate.h
@@ -61,6 +61,7 @@ public :
 	typedef enum e_service {
 		SERVICE_AZURE,
 		SERVICE_GOOGLE,
+		SERVICE_DEEPL,
 	} EService;
 
     typedef boost::function<void(EService, bool, S32)> KeyVerificationResult_fn;
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index dc3e072adf..8a97d5e5d9 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="370"
+ height="470"
  layout="topleft"
  name="floater_translation_settings"
  help_topic="translation_settings"
@@ -11,9 +11,11 @@
 
  <string name="azure_api_key_not_verified">Azure service identifier not verified. Status: [STATUS]. Please check your settings and try again.</string>
  <string name="google_api_key_not_verified">Google API key not verified. Status: [STATUS]. Please check your key and try again.</string>
+ <string name="deepl_api_key_not_verified">DeepL Auth Key key not verified. Status: [STATUS]. Please check your key and try again.</string>
 
  <string name="azure_api_key_verified">Azure service identifier verified.</string>
  <string name="google_api_key_verified">Google API key verified.</string>
+ <string name="deepl_api_key_verified">DeepL API key verified.</string>
 
  <check_box
   height="16"     
@@ -128,7 +130,7 @@
 
  <radio_group
   follows="top|left"
-  height="140"
+  height="260"
   layout="topleft"
   left_delta="10"
   name="translation_service_rg"
@@ -145,6 +147,12 @@
    layout="topleft"
    name="google"
    top_pad="115" />
+  <radio_item
+   initial_value="deepl"
+   label="DeepL Translator"
+   layout="topleft"
+   name="deepl"
+   top_pad="61" />
  </radio_group>
 
   <text
@@ -154,7 +162,7 @@
    left="185"
    length="1"
    name="google_links_text"
-   top_pad="-142"
+   top_pad="-262"
    type="string"
    width="100">
     [https://learn.microsoft.com/en-us/azure/cognitive-services/translator/create-translator-resource Setup]
@@ -286,7 +294,7 @@
   left_pad="10"
   name="verify_google_api_key_btn"
   top_delta="-2"
-  width="90" />	
+  width="90" />
 
  <text
   follows="top|right"
@@ -301,6 +309,87 @@
   [http://code.google.com/apis/language/translate/v2/pricing.html Pricing] | [https://code.google.com/apis/console Stats] 
  </text>
 
+    <text
+     type="string"
+     length="1"
+     follows="top|right"
+     height="20"
+     layout="topleft"
+     left="70"
+     name="deepl_api_domain_label"
+     top_pad="80"
+     width="85">
+        Domain:
+    </text>
+
+    <combo_box
+      allow_text_entry="false"
+      follows="left|top"
+      name="deepl_api_domain_combo"
+      height="23"
+      left_pad="10"
+      width="140"
+      top_delta="-4"
+      max_chars="512"
+      value="https://api-free.deepl.com"
+      combo_button.scale_image="true">
+        <combo_box.item
+          label="DeepL Free"
+          name="global"
+          value="https://api-free.deepl.com" />
+        <combo_box.item
+          label="DeepL Pro"
+          name="api-apc"
+          value="https://api.deepl.com" />
+    </combo_box>
+    
+    <text
+     follows="top|right"
+     height="20"
+     layout="topleft"
+     left="70"
+     length="1"
+     name="deepl_api_key_label"
+     top_pad="11"
+     type="string"
+     width="85">
+      DeepL API key:
+    </text>
+
+    <line_editor
+     default_text="Enter DeepL API key and click &quot;Verify&quot;"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     max_length_chars="50"
+     top_delta="-4"
+     name="deepl_api_key"
+     width="210" />
+    
+    <button
+     follows="left|top"
+     height="23"
+     label="Verify"
+     layout="topleft"
+     left_pad="10"
+     name="verify_deepl_api_key_btn"
+     top_delta="-2"
+     width="90" />
+
+    <text
+     follows="top|right"
+     height="20"
+     layout="topleft"
+     left="185"
+     length="1"
+     name="deepl_links_text"
+     top_delta="-53"
+     type="string"
+     width="100">
+        [https://www.deepl.com/pro/select-country?cta=header-prices Pricing]
+    </text>
+
  <button
   follows="left|top"
   height="23"
-- 
cgit v1.2.3


From f83ed218327213ae809535f4739d9f9eff6374a3 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 22 May 2023 20:47:17 +0300
Subject: SL-19752 don't try to scroll after opening the new folder in
 single-folder view to avoid crash

---
 indra/llui/llfolderview.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index bf6f2436b1..7831aa92fb 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -833,9 +833,12 @@ void LLFolderView::autoOpenItem( LLFolderViewFolder* item )
 	mAutoOpenItems.push(item);
 	
 	item->setOpen(TRUE);
+    if(!item->isSingleFolderMode())
+    {
 	LLRect content_rect = (mScrollContainer ? mScrollContainer->getContentWindowRect() : LLRect());
 	LLRect constraint_rect(0,content_rect.getHeight(), content_rect.getWidth(), 0);
 	scrollToShowItem(item, constraint_rect);
+    }
 }
 
 void LLFolderView::closeAutoOpenedFolders()
-- 
cgit v1.2.3


From 626bbe5032cab1fd2641ad02443e421567e7cce5 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 22 May 2023 19:14:48 -0400
Subject: SL-18837: Fix call to strip_deprecated_header().

Pass llssize instead of S32.
---
 indra/llcommon/llsdserialize.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index ad3f61ce71..c8dbcb2404 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2193,9 +2193,9 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is,
 LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, const U8* in, S32 size)
 {
 	U8* result = NULL;
-	U32 cur_size = 0;
+	llssize cur_size = 0;
 	z_stream strm;
-		
+
 	constexpr U32 CHUNK = 1024 * 512;
 
 	static thread_local std::unique_ptr<U8[]> out;
-- 
cgit v1.2.3


From 27ee831e38b66bb3415c3df02fd2c518463ba404 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 19 May 2023 15:35:09 -0400
Subject: SL-19744: Remove LLErrorThread and LLAppViewer::handleViewerCrash()

---
 indra/llcommon/llapp.cpp            |  38 +--------
 indra/llcommon/llapp.h              |  16 +---
 indra/llcommon/llerror.h            |   1 -
 indra/llcommon/llerrorthread.cpp    | 133 ------------------------------
 indra/llcommon/llerrorthread.h      |  46 -----------
 indra/newview/llappviewer.cpp       | 159 ------------------------------------
 indra/newview/llappviewer.h         |   1 -
 indra/newview/llappviewerlinux.cpp  |   2 -
 indra/newview/llappviewermacosx.cpp |   2 -
 indra/newview/llappviewerwin32.cpp  |   2 -
 10 files changed, 5 insertions(+), 395 deletions(-)
 delete mode 100644 indra/llcommon/llerrorthread.cpp
 delete mode 100644 indra/llcommon/llerrorthread.h

(limited to 'indra')

diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index d839b19c99..89917b6324 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -39,7 +39,6 @@
 #include "llcommon.h"
 #include "llapr.h"
 #include "llerrorcontrol.h"
-#include "llerrorthread.h"
 #include "llframetimer.h"
 #include "lllivefile.h"
 #include "llmemory.h"
@@ -108,12 +107,7 @@ LLAppErrorHandler LLApp::sErrorHandler = NULL;
 BOOL LLApp::sErrorThreadRunning = FALSE;
 
 
-LLApp::LLApp() : mThreadErrorp(NULL)
-{
-	commonCtor();
-}
-
-void LLApp::commonCtor()
+LLApp::LLApp()
 {
 	// Set our status to running
 	setStatus(APP_STATUS_RUNNING);
@@ -143,12 +137,6 @@ void LLApp::commonCtor()
 	mCrashReportPipeStr = L"\\\\.\\pipe\\LLCrashReporterPipe";
 }
 
-LLApp::LLApp(LLErrorThread *error_thread) :
-	mThreadErrorp(error_thread)
-{
-	commonCtor();
-}
-
 
 LLApp::~LLApp()
 {
@@ -158,13 +146,6 @@ LLApp::~LLApp()
 	mLiveFiles.clear();
 
 	setStopped();
-	// HACK: wait for the error thread to clean itself
-	ms_sleep(20);
-	if (mThreadErrorp)
-	{
-		delete mThreadErrorp;
-		mThreadErrorp = NULL;
-	}
 
 	SUBSYSTEM_CLEANUP_DBG(LLCommon);
 }
@@ -401,21 +382,6 @@ void LLApp::setupErrorHandling(bool second_instance)
 #endif
 }
 
-void LLApp::startErrorThread()
-{
-	//
-	// Start the error handling thread, which is responsible for taking action
-	// when the app goes into the APP_STATUS_ERROR state
-	//
-	if(!mThreadErrorp)
-	{
-		LL_INFOS() << "Starting error thread" << LL_ENDL;
-		mThreadErrorp = new LLErrorThread();
-		mThreadErrorp->setUserData((void *) this);
-		mThreadErrorp->start();
-	}
-}
-
 void LLApp::setErrorHandler(LLAppErrorHandler handler)
 {
 	LLApp::sErrorHandler = handler;
@@ -476,7 +442,7 @@ void LLApp::setStatus(EAppStatus status)
 // static
 void LLApp::setError()
 {
-	// set app status to ERROR so that the LLErrorThread notices
+	// set app status to ERROR
 	setStatus(APP_STATUS_ERROR);
 }
 
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index c65fe21c9c..436bc5437e 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -34,7 +34,6 @@
 #include <atomic>
 #include <chrono>
 // Forward declarations
-class LLErrorThread;
 class LLLiveFile;
 #if LL_LINUX
 #include <signal.h>
@@ -53,7 +52,6 @@ void clear_signals();
 
 class LL_COMMON_API LLApp
 {
-	friend class LLErrorThread;
 public:
 	typedef enum e_app_status
 	{
@@ -67,11 +65,6 @@ public:
 	LLApp();
 	virtual ~LLApp();
 
-protected:
-	LLApp(LLErrorThread* error_thread);
-	void commonCtor();
-public:
-	
 	/** 
 	 * @brief Return the static app instance if one was created.
 	 */
@@ -257,14 +250,14 @@ public:
 	void setupErrorHandling(bool mSecondInstance=false);
 
 	void setErrorHandler(LLAppErrorHandler handler);
-	static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred.
+	static void runErrorHandler(); // run shortly after we detect an error
 	//@}
-	
+
 	// the maximum length of the minidump filename returned by getMiniDumpFilename()
 	static const U32 MAX_MINDUMP_PATH_LENGTH = 256;
 
 	// change the directory where Breakpad minidump files are written to
-    void setDebugFileNames(const std::string &path);
+	void setDebugFileNames(const std::string &path);
 
 	// Return the Google Breakpad minidump filename after a crash.
 	char *getMiniDumpFilename() { return mMinidumpPath; }
@@ -324,9 +317,6 @@ private:
 	typedef int(*signal_handler_func)(int signum);
 	static LLAppErrorHandler sErrorHandler;
 
-	// Default application threads
-	LLErrorThread* mThreadErrorp;		// Waits for app to go to status ERROR, then runs the error callback
-
 	// This is the application level runnable scheduler.
 	LLRunner mRunner;
 
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index d06c0e2132..020f05e8f5 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -274,7 +274,6 @@ namespace LLError
 		// used to indicate no class info known for logging
 
     //LLCallStacks keeps track of call stacks and output the call stacks to log file
-    //when LLAppViewer::handleViewerCrash() is triggered.
     //
     //Note: to be simple, efficient and necessary to keep track of correct call stacks, 
     //LLCallStacks is designed not to be thread-safe.
diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp
deleted file mode 100644
index f6bc68b5c1..0000000000
--- a/indra/llcommon/llerrorthread.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/** 
- * @file llerrorthread.cpp
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-#include "llerrorthread.h"
-
-#include "llapp.h"
-#include "lltimer.h"	// ms_sleep()
-
-LLErrorThread::LLErrorThread()
-	: LLThread("Error"),
-	  mUserDatap(NULL)
-{
-}
-
-LLErrorThread::~LLErrorThread()
-{
-}
-
-void LLErrorThread::setUserData(void* user_data)
-{
-	mUserDatap = user_data;
-}
-
-
-void* LLErrorThread::getUserData() const
-{
-	return mUserDatap;
-}
-
-#if !LL_WINDOWS
-//
-// Various signal/error handling functions that can't be put into the class
-//
-void get_child_status(const int waitpid_status, int &process_status, bool &exited, bool do_logging)
-{
-	exited = false;
-	process_status = -1;
-	// The child process exited.  Call its callback, and then clean it up
-	if (WIFEXITED(waitpid_status))
-	{
-		process_status = WEXITSTATUS(waitpid_status);
-		exited = true;
-		if (do_logging)
-		{
-			LL_INFOS() << "get_child_status - Child exited cleanly with return of " << process_status << LL_ENDL;
-		}
-		return;
-	}
-	else if (WIFSIGNALED(waitpid_status))
-	{
-		process_status = WTERMSIG(waitpid_status);
-		exited = true;
-		if (do_logging)
-		{
-			LL_INFOS() << "get_child_status - Child died because of uncaught signal " << process_status << LL_ENDL;
-#ifdef WCOREDUMP
-			if (WCOREDUMP(waitpid_status))
-			{
-				LL_INFOS() << "get_child_status - Child dumped core" << LL_ENDL;
-			}
-			else
-			{
-				LL_INFOS() << "get_child_status - Child didn't dump core" << LL_ENDL;
-			}
-#endif
-		}
-		return;
-	}
-	else if (do_logging)
-	{
-		// This is weird.  I just dump the waitpid status into the status code,
-		// not that there's any way of telling what it is...
-		LL_INFOS() << "get_child_status - Got SIGCHILD but child didn't exit" << LL_ENDL;
-		process_status = waitpid_status;
-	}
-
-}
-#endif
-
-void LLErrorThread::run()
-{
-	LLApp::sErrorThreadRunning = TRUE;
-	// This thread sits and waits for the sole purpose
-	// of waiting for the signal/exception handlers to flag the
-	// application state as APP_STATUS_ERROR.
-	LL_INFOS() << "thread_error - Waiting for an error" << LL_ENDL;
-
-	S32 counter = 0;
-	while (! (LLApp::isError() || LLApp::isStopped()))
-	{
-		ms_sleep(10);
-		counter++;
-	}
-	if (LLApp::isError())
-	{
-		// The app is in an error state, run the application's error handler.
-		//LL_INFOS() << "thread_error - An error has occurred, running error callback!" << LL_ENDL;
-		// Run the error handling callback
-		LLApp::runErrorHandler();
-	}
-	else
-	{
-		// Everything is okay, a clean exit.
-		//LL_INFOS() << "thread_error - Application exited cleanly" << LL_ENDL;
-	}
-	
-	//LL_INFOS() << "thread_error - Exiting" << LL_ENDL;
-	LLApp::sErrorThreadRunning = FALSE;
-}
-
diff --git a/indra/llcommon/llerrorthread.h b/indra/llcommon/llerrorthread.h
deleted file mode 100644
index 474cef3a50..0000000000
--- a/indra/llcommon/llerrorthread.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/** 
- * @file llerrorthread.h
- * @brief Specialized thread to handle runtime errors.
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLERRORTHREAD_H
-#define LL_LLERRORTHREAD_H
-
-#include "llthread.h"
-
-class LL_COMMON_API LLErrorThread : public LLThread
-{
-public:
-	LLErrorThread();
-	~LLErrorThread();
-
-	/*virtual*/ void run(void);
-	void setUserData(void *user_data);
-	void *getUserData() const;
-
-protected:
-	void* mUserDatap; // User data associated with this thread
-};
-
-#endif // LL_LLERRORTHREAD_H
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 8235e4466c..e70fcb6e86 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3582,8 +3582,6 @@ void LLAppViewer::writeSystemInfo()
 	// "CrashNotHandled" is set here, while things are running well,
 	// in case of a freeze. If there is a freeze, the crash logger will be launched
 	// and can read this value from the debug_info.log.
-	// If the crash is handled by LLAppViewer::handleViewerCrash, ie not a freeze,
-	// then the value of "CrashNotHandled" will be set to true.
 	gDebugInfo["CrashNotHandled"] = LLSD::Boolean(true);
 #else // LL_BUGSPLAT
 	// "CrashNotHandled" is obsolete; it used (not very successsfully)
@@ -3675,163 +3673,6 @@ void getFileList()
 }
 #endif
 
-void LLAppViewer::handleViewerCrash()
-{
-	LL_INFOS("CRASHREPORT") << "Handle viewer crash entry." << LL_ENDL;
-
-	LL_INFOS("CRASHREPORT") << "Last render pool type: " << LLPipeline::sCurRenderPoolType << LL_ENDL ;
-
-	LLMemory::logMemoryInfo(true) ;
-
-	//print out recorded call stacks if there are any.
-	LLError::LLCallStacks::print();
-
-	LLAppViewer* pApp = LLAppViewer::instance();
-	if (pApp->beingDebugged())
-	{
-		// This will drop us into the debugger.
-		abort();
-	}
-
-	if (LLApp::isCrashloggerDisabled())
-	{
-		abort();
-	}
-
-	// Returns whether a dialog was shown.
-	// Only do the logic in here once
-	if (pApp->mReportedCrash)
-	{
-		return;
-	}
-	pApp->mReportedCrash = TRUE;
-
-	// Insert crash host url (url to post crash log to) if configured.
-	std::string crashHostUrl = gSavedSettings.get<std::string>("CrashHostUrl");
-	if(crashHostUrl != "")
-	{
-		gDebugInfo["Dynamic"]["CrashHostUrl"] = crashHostUrl;
-	}
-
-	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-	if ( parcel && parcel->getMusicURL()[0])
-	{
-		gDebugInfo["Dynamic"]["ParcelMusicURL"] = parcel->getMusicURL();
-	}
-	if ( parcel && parcel->getMediaURL()[0])
-	{
-		gDebugInfo["Dynamic"]["ParcelMediaURL"] = parcel->getMediaURL();
-	}
-
-	gDebugInfo["Dynamic"]["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
-	gDebugInfo["Dynamic"]["RAMInfo"]["Allocated"] = LLSD::Integer(LLMemory::getCurrentRSS() / 1024);
-
-	if(gLogoutInProgress)
-	{
-		gDebugInfo["Dynamic"]["LastExecEvent"] = LAST_EXEC_LOGOUT_CRASH;
-	}
-	else
-	{
-		gDebugInfo["Dynamic"]["LastExecEvent"] = gLLErrorActivated ? LAST_EXEC_LLERROR_CRASH : LAST_EXEC_OTHER_CRASH;
-	}
-
-	if(gAgent.getRegion())
-	{
-		gDebugInfo["Dynamic"]["CurrentSimHost"] = gAgent.getRegion()->getSimHostName();
-		gDebugInfo["Dynamic"]["CurrentRegion"] = gAgent.getRegion()->getName();
-
-		const LLVector3& loc = gAgent.getPositionAgent();
-		gDebugInfo["Dynamic"]["CurrentLocationX"] = loc.mV[0];
-		gDebugInfo["Dynamic"]["CurrentLocationY"] = loc.mV[1];
-		gDebugInfo["Dynamic"]["CurrentLocationZ"] = loc.mV[2];
-	}
-
-	if(LLAppViewer::instance()->mMainloopTimeout)
-	{
-		gDebugInfo["Dynamic"]["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
-	}
-
-	// The crash is being handled here so set this value to false.
-	// Otherwise the crash logger will think this crash was a freeze.
-	gDebugInfo["Dynamic"]["CrashNotHandled"] = LLSD::Boolean(false);
-
-	//Write out the crash status file
-	//Use marker file style setup, as that's the simplest, especially since
-	//we're already in a crash situation
-	if (gDirUtilp)
-	{
-		std::string crash_marker_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-																			gLLErrorActivated
-																			? LLERROR_MARKER_FILE_NAME
-																			: ERROR_MARKER_FILE_NAME);
-		LLAPRFile crash_marker_file ;
-		crash_marker_file.open(crash_marker_file_name, LL_APR_WB);
-		if (crash_marker_file.getFileHandle())
-		{
-			LL_INFOS("MarkerFile") << "Created crash marker file " << crash_marker_file_name << LL_ENDL;
-			recordMarkerVersion(crash_marker_file);
-		}
-		else
-		{
-			LL_WARNS("MarkerFile") << "Cannot create error marker file " << crash_marker_file_name << LL_ENDL;
-		}
-	}
-	else
-	{
-		LL_WARNS("MarkerFile") << "No gDirUtilp with which to create error marker file name" << LL_ENDL;
-	}
-
-#ifdef LL_WINDOWS
-	Sleep(200);
-#endif
-
-	char *minidump_file = pApp->getMiniDumpFilename();
-    LL_DEBUGS("CRASHREPORT") << "minidump file name " << minidump_file << LL_ENDL;
-	if(minidump_file && minidump_file[0] != 0)
-	{
-		gDebugInfo["Dynamic"]["MinidumpPath"] = minidump_file;
-	}
-	else
-	{
-#ifdef LL_WINDOWS
-		getFileList();
-#else
-        LL_WARNS("CRASHREPORT") << "no minidump file?" << LL_ENDL;
-#endif
-	}
-    gDebugInfo["Dynamic"]["CrashType"]="crash";
-
-	if (gMessageSystem && gDirUtilp)
-	{
-		std::string filename;
-		filename = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "stats.log");
-        LL_DEBUGS("CRASHREPORT") << "recording stats " << filename << LL_ENDL;
-		llofstream file(filename.c_str(), std::ios_base::binary);
-		if(file.good())
-		{
-			gMessageSystem->summarizeLogs(file);
-			file.close();
-		}
-        else
-        {
-            LL_WARNS("CRASHREPORT") << "problem recording stats" << LL_ENDL;
-        }
-	}
-
-	if (gMessageSystem)
-	{
-		gMessageSystem->getCircuitInfo(gDebugInfo["CircuitInfo"]);
-		gMessageSystem->stopLogging();
-	}
-
-	if (LLWorld::instanceExists()) LLWorld::getInstance()->getInfo(gDebugInfo["Dynamic"]);
-
-	gDebugInfo["FatalMessage"] = LLError::getFatalMessage();
-
-	// Close the debug file
-	pApp->writeDebugInfo(false);  //false answers the isStatic question with the least overhead.
-}
-
 // static
 void LLAppViewer::recordMarkerVersion(LLAPRFile& marker_file)
 {
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index f28a90c703..bc4dec6bec 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -119,7 +119,6 @@ public:
 
 	virtual bool restoreErrorTrap() = 0; // Require platform specific override to reset error handling mechanism.
 	                                     // return false if the error trap needed restoration.
-	static void handleViewerCrash(); // Hey! The viewer crashed. Do this, soon.
 	void checkForCrash();
     
 	// Thread accessors
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index dc487967fc..9f58f90326 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -80,8 +80,6 @@ int main( int argc, char **argv )
 
 	// install unexpected exception handler
 	gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
-	// install crash handlers
-	viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
 
 	bool ok = viewer_app_ptr->init();
 	if(!ok)
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index cb5cac6f2d..8b313a321b 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -83,8 +83,6 @@ void constructViewer()
 	}
 
 	gViewerAppPtr = new LLAppViewerMacOSX();
-
-	gViewerAppPtr->setErrorHandler(LLAppViewer::handleViewerCrash);
 }
 
 bool initViewer()
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index d22fb7a4e6..298d841934 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -428,8 +428,6 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 
 	gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
 
-	viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
-
 	// Set a debug info flag to indicate if multiple instances are running.
 	bool found_other_instance = !create_app_mutex();
 	gDebugInfo["FoundOtherInstanceAtStartup"] = LLSD::Boolean(found_other_instance);
-- 
cgit v1.2.3


From 863e7f22a75e9d9c9d5c1f826eac6cd0000edac0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 19 May 2023 16:19:42 -0400
Subject: SL-19744: Remove LLApp::startErrorThread() and references.

---
 indra/llcommon/CMakeLists.txt | 2 --
 indra/llcommon/llapp.cpp      | 6 ------
 indra/llcommon/llapp.h        | 6 ++----
 3 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 54020a4231..ef4899978e 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -39,7 +39,6 @@ set(llcommon_SOURCE_FILES
     lldependencies.cpp
     lldictionary.cpp
     llerror.cpp
-    llerrorthread.cpp
     llevent.cpp
     lleventapi.cpp
     lleventcoro.cpp
@@ -151,7 +150,6 @@ set(llcommon_HEADER_FILES
     llendianswizzle.h
     llerror.h
     llerrorcontrol.h
-    llerrorthread.h
     llevent.h
     lleventapi.h
     lleventcoro.h
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 89917b6324..b99166991f 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -374,12 +374,6 @@ void LLApp::setupErrorHandling(bool second_instance)
 #endif // ! LL_BUGSPLAT
 
 #endif // ! LL_WINDOWS
-
-#ifdef LL_BUGSPLAT
-    // do not start our own error thread
-#else // ! LL_BUGSPLAT
-	startErrorThread();
-#endif
 }
 
 void LLApp::setErrorHandler(LLAppErrorHandler handler)
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index 436bc5437e..c832c8b142 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -303,13 +303,11 @@ protected:
 	void stepFrame();
 
 private:
-	void startErrorThread();
-	
 	// Contains the filename of the minidump file after a crash.
 	char mMinidumpPath[MAX_MINDUMP_PATH_LENGTH];
     
-    std::string mStaticDebugFileName;
-    std::string mDynamicDebugFileName;
+	std::string mStaticDebugFileName;
+	std::string mDynamicDebugFileName;
 
 	// *NOTE: On Windows, we need a routine to reset the structured
 	// exception handler when some evil driver has taken it over for
-- 
cgit v1.2.3


From 8c0ad5425f4f7497fcb3973623d8620d7088e28a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 22 May 2023 22:14:58 +0300
Subject: SL-19748 Fix thumbnail not applying if floater was closed too fast

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 64 ++++++++++++++++++--------
 indra/newview/llfloaterchangeitemthumbnail.h   |  2 +
 2 files changed, 48 insertions(+), 18 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 3070c437bd..1ac6ee72bf 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -336,9 +336,6 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj)
     if (item)
     {
         setTitle(getString("title_item_thumbnail"));
-        // This floater probably shouldn't be possible to open
-        // for imcomplete items
-        llassert(item->isFinished());
 
         icon_img = LLInventoryIcon::getIcon(item->getType(), item->getInventoryType(), item->getFlags(), FALSE);
         mRemoveImageBtn->setEnabled(thumbnail_id.notNull() && ((item->getActualType() != LLAssetType::AT_TEXTURE) || (item->getAssetUUID() != thumbnail_id)));
@@ -543,6 +540,13 @@ void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notificatio
     }
 }
 
+struct ImageLoadedData
+{
+    LLUUID mThumbnailId;
+    LLUUID mObjectId;
+    LLHandle<LLFloater> mFloaterHandle;
+};
+
 void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id, bool silent)
 {
     LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::getFetchedTexture(asset_id);
@@ -557,11 +561,16 @@ void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id
             // don't warn user multiple times if some textures took their time
             mExpectingAssetId = asset_id;
         }
+        ImageLoadedData *data = new ImageLoadedData();
+        data->mObjectId = mItemId;
+        data->mThumbnailId = asset_id;
+        data->mFloaterHandle = getHandle();
+
         texturep->setLoadedCallback(onImageLoaded,
             MAX_DISCARD_LEVEL, // don't actually need max one, 3 or 4 should be enough
             FALSE,
             FALSE,
-            new LLHandle<LLFloater>(getHandle()),
+            (void*)data,
             NULL,
             FALSE);
     }
@@ -629,19 +638,21 @@ void LLFloaterChangeItemThumbnail::onImageLoaded(
 
     if (!final && success) return; //not done yet
 
-    LLHandle<LLFloater>* handle = (LLHandle<LLFloater>*)userdata;
+    ImageLoadedData* data = (ImageLoadedData*)userdata;
 
-    if (success && !handle->isDead())
+    if (success)
     {
-        LLFloaterChangeItemThumbnail* self = static_cast<LLFloaterChangeItemThumbnail*>(handle->get());
-        if (self)
+        // Update the item, set it even if floater is dead
+        if (validateAsset(data->mThumbnailId))
         {
-            LLUUID asset_id = src_vi->getID();
-            if (validateAsset(asset_id))
-            {
-                self->setThumbnailId(asset_id);
-            }
-            else if (self->mExpectingAssetId == asset_id)
+            setThumbnailId(data->mThumbnailId, data->mObjectId);
+        }
+
+        // Update floater
+        if (!data->mFloaterHandle.isDead())
+        {
+            LLFloaterChangeItemThumbnail* self = static_cast<LLFloaterChangeItemThumbnail*>(data->mFloaterHandle.get());
+            if (self && self->mExpectingAssetId == data->mThumbnailId)
             {
                 LLNotificationsUtil::add("ThumbnailDimentionsLimit");
                 self->mExpectingAssetId = LLUUID::null;
@@ -649,7 +660,7 @@ void LLFloaterChangeItemThumbnail::onImageLoaded(
         }
     }
 
-    delete handle;
+    delete data;
 }
 
 void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
@@ -738,8 +749,25 @@ void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID &new_thumbnail_id
     if (mTaskId.notNull())
     {
         LL_ERRS() << "Not implemented yet" << LL_ENDL;
+        return;
     }
-    else if (obj->getThumbnailUUID() != new_thumbnail_id)
+
+    setThumbnailId(new_thumbnail_id, mItemId, obj);
+}
+
+void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id)
+{
+    LLInventoryObject* obj = gInventory.getObject(object_id);
+    if (!obj)
+    {
+        return;
+    }
+
+    setThumbnailId(new_thumbnail_id, object_id, obj);
+}
+void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id, LLInventoryObject* obj)
+{
+    if (obj->getThumbnailUUID() != new_thumbnail_id)
     {
         LLSD updates;
         // At the moment server expects id as a string
@@ -747,12 +775,12 @@ void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID &new_thumbnail_id
         LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj);
         if (view_folder)
         {
-            update_inventory_category(mItemId, updates, NULL);
+            update_inventory_category(object_id, updates, NULL);
         }
         LLViewerInventoryItem* view_item = dynamic_cast<LLViewerInventoryItem*>(obj);
         if (view_item)
         {
-            update_inventory_item(mItemId, updates, NULL);
+            update_inventory_item(object_id, updates, NULL);
         }
     }
 }
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 33bf2ecab5..de2a20bf2a 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -95,6 +95,8 @@ private:
     void onTexturePickerCommit(LLUUID id);
 
     void setThumbnailId(const LLUUID &new_thumbnail_id);
+    static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id);
+    static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id, LLInventoryObject* obj);
 
     enum EToolTipState
     {
-- 
cgit v1.2.3


From 505c15cf47c04e45f4a68790b5c63237a7bfcc9b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 23 May 2023 16:13:10 +0300
Subject: SL-19759 FIXED Adding New Folders in Single Folder view can cause all
 folders to open and shift out of view

---
 indra/llui/llfolderviewitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 4fbfa7ed79..7090156b4e 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1344,7 +1344,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem
 			child_selected = TRUE;
 		}
 	}
-	if(openitem && child_selected)
+	if(openitem && child_selected && !mSingleFolderMode)
 	{
 		setOpenArrangeRecursively(TRUE);
 	}
-- 
cgit v1.2.3


From 6f7cba0f9111c85d32d9ec4e9f52be5e7fbaaf9e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 May 2023 23:06:41 +0300
Subject: SL-19635 Better error handling

---
 indra/newview/lltranslate.cpp                       | 21 ++++++++++++++++++---
 .../default/xui/en/floater_translation_settings.xml |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 70a40921ef..c37c955e8d 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -949,6 +949,8 @@ bool LLDeepLTranslationHandler::checkVerificationResponse(
     const LLSD& response,
     int status) const
 {
+    // Might need to parse body to make sure we got
+    // a valid response and not a message
     return status == HTTP_OK;
 }
 
@@ -1000,7 +1002,6 @@ bool LLDeepLTranslationHandler::parseResponse(
     {
         return false;
     }
-    
 
     detected_lang = data["detected_source_language"].asString();
     LLStringUtil::toLower(detected_lang);
@@ -1019,8 +1020,22 @@ bool LLDeepLTranslationHandler::isConfigured() const
 std::string LLDeepLTranslationHandler::parseErrorResponse(
     const std::string& body)
 {
-    // DeepL doesn't seem to have any error handling beyoun http codes
-    return std::string();
+    // Example: "{\"message\":\"One of the request inputs is not valid.\"}"
+
+    Json::Value root;
+    Json::Reader reader;
+
+    if (!reader.parse(body, root))
+    {
+        return std::string();
+    }
+
+    if (!root.isObject() || !root.isMember("message"))
+    {
+        return std::string();
+    }
+
+    return root["message"].asString();
 }
 
 // static
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index 8a97d5e5d9..3f3331b468 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -319,7 +319,7 @@
      name="deepl_api_domain_label"
      top_pad="80"
      width="85">
-        Domain:
+        Endpoint:
     </text>
 
     <combo_box
-- 
cgit v1.2.3


From 55460b49585ceea5d6388204c7f3bd74ed4f4827 Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Fri, 12 May 2023 17:29:41 +0100
Subject: SL-19711 - viewer can't parse environments.  Fixed max parsing bug

(cherry picked from commit eb0516b9940f200b32349d611f38f1ccee48005d)
---
 indra/llcommon/llsdserialize.cpp | 20 +++++++++++++-------
 indra/newview/llsettingsvo.cpp   |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index e7482b601d..56cc141f0d 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -125,14 +125,20 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, llssize max_bytes)
 	char hdr_buf[MAX_HDR_LEN + 1] = ""; /* Flawfinder: ignore */
 	bool fail_if_not_legacy = false;
 
-	/*
-	 * Get the first line before anything. Don't read more than max_bytes:
-	 * this get() overload reads no more than (count-1) bytes into the
-	 * specified buffer. In the usual case when max_bytes exceeds
-	 * sizeof(hdr_buf), get() will read no more than sizeof(hdr_buf)-2.
-	 */
-	str.get(hdr_buf, llmin(max_bytes+1, sizeof(hdr_buf)-1), '\n');
+    /*
+     * Get the first line before anything. Don't read more than max_bytes:
+     * this get() overload reads no more than (count-1) bytes into the
+     * specified buffer. In the usual case when max_bytes exceeds
+     * sizeof(hdr_buf), get() will read no more than sizeof(hdr_buf)-2.
+     */
+    llssize max_hdr_read = MAX_HDR_LEN;
+	if (max_bytes != LLSDSerialize::SIZE_UNLIMITED)
+	{
+        max_hdr_read = llmin(max_bytes + 1, max_hdr_read);
+	}
+    str.get(hdr_buf, max_hdr_read, '\n');
 	auto inbuf = str.gcount();
+
 	// https://en.cppreference.com/w/cpp/io/basic_istream/get
 	// When the get() above sees the specified delimiter '\n', it stops there
 	// without pulling it from the stream. If it turns out that the stream
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index b1eed81476..f5212a3026 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -312,7 +312,7 @@ void LLSettingsVOBase::onAssetDownloadComplete(const LLUUID &asset_id, S32 statu
         std::stringstream llsdstream(buffer);
         LLSD llsdsettings;
 
-        if (LLSDSerialize::deserialize(llsdsettings, llsdstream, -1))
+        if (LLSDSerialize::deserialize(llsdsettings, llsdstream, LLSDSerialize::SIZE_UNLIMITED))
         {
             settings = createFromLLSD(llsdsettings);
         }
@@ -379,7 +379,7 @@ LLSettingsBase::ptr_t LLSettingsVOBase::importFile(const std::string &filename)
             return LLSettingsBase::ptr_t();
         }
 
-        if (!LLSDSerialize::deserialize(settings, file, -1))
+        if (!LLSDSerialize::deserialize(settings, file, LLSDSerialize::SIZE_UNLIMITED))
         {
             LL_WARNS("SETTINGS") << "Unable to deserialize settings from '" << filename << "'" << LL_ENDL;
             return LLSettingsBase::ptr_t();
-- 
cgit v1.2.3


From 572e8269bcd5320daa66f4074e927c79869bf7de Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 24 May 2023 22:51:02 +0300
Subject: SL-19604 Creating new folders in combination views does not highlight
 created item

---
 indra/llui/llfolderview.cpp            | 15 +++++++++++----
 indra/newview/llinventorypanel.cpp     | 14 +++++++++++++-
 indra/newview/llinventorypanel.h       |  2 ++
 indra/newview/llpanelmaininventory.cpp | 22 ++++++++++------------
 indra/newview/llpanelmaininventory.h   | 13 +++++++------
 5 files changed, 43 insertions(+), 23 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 7831aa92fb..798c00d0ca 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -694,11 +694,18 @@ void LLFolderView::draw()
 		}
 	}
 
-	if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().overlaps(mRenamer->getRect()))
+	if (mRenameItem
+        && mRenamer
+        && mRenamer->getVisible())
 	{
-		// renamer is not connected to the item we are renaming in any form so manage it manually
-		// TODO: consider stopping on any scroll action instead of when out of visible area
-		finishRenamingItem();
+        LLRect renamer_rect;
+        localRectToOtherView(mRenamer->getRect(), &renamer_rect, mScrollContainer);
+        if (!mScrollContainer->getRect().overlaps(renamer_rect))
+        {
+            // renamer is not connected to the item we are renaming in any form so manage it manually
+            // TODO: consider stopping on any scroll action instead of when out of visible area
+            finishRenamingItem();
+        }
 	}
 
 	// skip over LLFolderViewFolder::draw since we don't want the folder icon, label, 
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 604bffb96e..2226384ba2 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2107,6 +2107,7 @@ static LLDefaultChildRegistry::Register<LLInventorySingleFolderPanel> t_single_f
 
 LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     : LLInventoryPanel(params)
+    , mExternalScroller(NULL)
 {
     mBuildChildrenViews = false;
     getFilter().setSingleFolderMode(true);
@@ -2235,7 +2236,18 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
             mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
             addChild(mScroller);
             mScroller->addChild(mFolderRoot.get());
-            mFolderRoot.get()->setScrollContainer(mScroller);
+            if (!mExternalScroller)
+            {
+                mFolderRoot.get()->setScrollContainer(mScroller);
+            }
+            else
+            {
+                // Hack to use exteranl scroll in combination view
+                // Todo: find a way to avoid this
+                // ideally combination view should be own inventory panel
+                // instead of piggy backing on two different ones
+                mFolderRoot.get()->setScrollContainer(mExternalScroller);
+            }
             mFolderRoot.get()->setFollowsAll();
             mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
 
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index f323a6c6d7..7b54a5bbf2 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -421,6 +421,7 @@ public:
     std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
 
     void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
+    void setScroller(LLScrollContainer* scroller) { mExternalScroller = scroller; }
 
     typedef boost::function<void()> root_changed_callback_t;
     boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
@@ -436,6 +437,7 @@ protected:
     LLUUID mFolderID;
     std::list<LLUUID> mBackwardFolders;
     std::list<LLUUID> mForwardFolders;
+    LLScrollContainer* mExternalScroller;
 
     boost::signals2::signal<void()> mRootChangedSignal;
 };
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 5a8565b5aa..998a211795 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -256,7 +256,7 @@ BOOL LLPanelMainInventory::postBuild()
     mInventoryGalleryPanel = getChild<LLInventoryGallery>("gallery_view_inv");
     mGalleryRootUpdatedConnection = mInventoryGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
 
-    mCombinationScrollPanel = getChild<LLUICtrl>("combination_view_inventory");
+    mCombinationScrollPanel = getChild<LLScrollContainer>("combination_view_inventory");
 
     mCombinationInventoryPanel = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
     LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
@@ -264,6 +264,7 @@ BOOL LLPanelMainInventory::postBuild()
     comb_inv_filter.markDefault();
     mCombinationInventoryPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onCombinationInventorySelectionChanged, this, _1, _2));
     mCombinationInventoryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
+    mCombinationInventoryPanel->setScroller(mCombinationScrollPanel);
 
     mCombinationGalleryPanel = getChild<LLInventoryGallery>("comb_gallery_view_inv");
     LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
@@ -2326,6 +2327,11 @@ void LLPanelMainInventory::updateCombinationVisibility()
         {
             mCombinationShapeDirty = false;
             mCombinationInventoryPanel->reshape(1,1); // HACK: force reduce visible area
+            LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder();
+            if (root_folder)
+            {
+                root_folder->arrangeAll();
+            }
         }
         if (!mCombinationGalleryPanel->hasVisibleItems())
         {
@@ -2335,13 +2341,11 @@ void LLPanelMainInventory::updateCombinationVisibility()
         LLRect inv_inner_rect = mCombinationInventoryPanel->getScrollableContainer()->getScrolledViewRect();
         LLRect galery_rect = mCombinationGalleryPanel->getRect();
         LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
-        LLScrollContainer* scroll = static_cast<LLScrollContainer*>(mCombinationScrollPanel);
-        LLRect scroller_window_rect = scroll->getContentWindowRect();
+        LLRect scroller_window_rect = mCombinationScrollPanel->getContentWindowRect();
         const S32 BORDER_PAD = 2; // two sides
-        S32 desired_width = llmax(inv_inner_rect.getWidth(), scroller_window_rect.getWidth() - BORDER_PAD);
 
         inv_rect.mBottom = 0;
-        inv_rect.mRight = inv_rect.mLeft + desired_width;
+        inv_rect.mRight = inv_rect.mLeft + inv_inner_rect.getWidth();
         if (!mCombinationGalleryPanel->hasVisibleItems() || mCombinationInventoryPanel->hasVisibleItems())
         {
             inv_rect.mTop = inv_rect.mBottom + inv_inner_rect.getHeight() + BORDER_PAD;
@@ -2364,7 +2368,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
             galery_rect.mTop = galery_rect.mBottom;
         }
 
-        mCombinationScroller->reshape(desired_width, inv_rect.getHeight() + galery_rect.getHeight(), true);
+        mCombinationScroller->reshape(scroller_window_rect.getWidth(), inv_rect.getHeight() + galery_rect.getHeight(), true);
         mCombinationGalleryPanel->setShape(galery_rect, false);
         mCombinationInventoryPanel->setShape(inv_rect, false);
 
@@ -2376,12 +2380,6 @@ void LLPanelMainInventory::updateCombinationVisibility()
         {
             scrollToInvPanelSelection();
         }
-
-        LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder();
-        if (root_folder)
-        {
-            root_folder->updateRenamerPosition();
-        }
     }
 }
 
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index bc010ff37f..2c3379996f 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -36,19 +36,20 @@
 #include "llfolderview.h"
 
 class LLComboBox;
-class LLFolderViewItem;
 class LLInventoryPanel;
 class LLInventoryGallery;
-class LLSaveFolderState;
 class LLFilterEditor;
-class LLTabContainer;
+class LLFloater;
 class LLFloaterInventoryFinder;
+class LLFloaterSidePanelContainer;
+class LLFolderViewItem;
 class LLMenuButton;
 class LLMenuGL;
+class LLSaveFolderState;
+class LLScrollContainer;
 class LLSidepanelInventory;
+class LLTabContainer;
 class LLToggleableMenu;
-class LLFloater;
-class LLFloaterSidePanelContainer;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLPanelMainInventory
@@ -196,7 +197,7 @@ private:
     LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
     LLInventoryGallery* mInventoryGalleryPanel;
 
-    LLUICtrl* mCombinationScrollPanel;
+    LLScrollContainer* mCombinationScrollPanel;
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
     LLView* mCombinationScroller;
-- 
cgit v1.2.3


From 74b8ca575ff7f0cfcfd443e03885542bc5b10c46 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 25 May 2023 13:02:52 +0300
Subject: SL-19770 allow changing current preset from My Camera Presets list

---
 indra/newview/llfloatercamerapresets.cpp | 18 +++++++++++++++++-
 indra/newview/llfloatercamerapresets.h   |  3 +++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatercamerapresets.cpp b/indra/newview/llfloatercamerapresets.cpp
index 300c945a85..a1cbffd094 100644
--- a/indra/newview/llfloatercamerapresets.cpp
+++ b/indra/newview/llfloatercamerapresets.cpp
@@ -24,6 +24,7 @@
 */
 #include "llviewerprecompiledheaders.h"
 
+#include "llfloatercamera.h"
 #include "llfloatercamerapresets.h"
 #include "llfloaterreg.h"
 #include "llnotificationsutil.h"
@@ -40,7 +41,8 @@ LLFloaterCameraPresets::~LLFloaterCameraPresets()
 BOOL LLFloaterCameraPresets::postBuild()
 {
     mPresetList = getChild<LLFlatListView>("preset_list");
-
+    mPresetList->setCommitCallback(boost::bind(&LLFloaterCameraPresets::onSelectionChange, this));
+    mPresetList->setCommitOnSelectionChange(true);
     LLPresetsManager::getInstance()->setPresetListChangeCameraCallback(boost::bind(&LLFloaterCameraPresets::populateList, this));
 
     return TRUE;
@@ -58,6 +60,7 @@ void LLFloaterCameraPresets::populateList()
     std::list<std::string> preset_names;
 
 	presetsMgr->loadPresetNamesFromDir(PRESETS_CAMERA, preset_names, DEFAULT_BOTTOM);
+    std::string active_preset = gSavedSettings.getString("PresetCameraActive");
 
     for (std::list<std::string>::const_iterator it = preset_names.begin(); it != preset_names.end(); ++it)
     {
@@ -66,6 +69,19 @@ void LLFloaterCameraPresets::populateList()
         LLCameraPresetFlatItem* item = new LLCameraPresetFlatItem(name, is_default);
         item->postBuild();
         mPresetList->addItem(item);
+        if(name == active_preset)
+        {
+            mPresetList->selectItem(item);
+        }
+    }
+}
+
+void LLFloaterCameraPresets::onSelectionChange()
+{
+    LLCameraPresetFlatItem* selected_preset = dynamic_cast<LLCameraPresetFlatItem*>(mPresetList->getSelectedItem());
+    if(selected_preset)
+    {
+        LLFloaterCamera::switchToPreset(selected_preset->getPresetName());
     }
 }
 
diff --git a/indra/newview/llfloatercamerapresets.h b/indra/newview/llfloatercamerapresets.h
index 66430fa399..4430a4209e 100644
--- a/indra/newview/llfloatercamerapresets.h
+++ b/indra/newview/llfloatercamerapresets.h
@@ -38,6 +38,7 @@ class LLFloaterCameraPresets : public LLFloater
     virtual void onOpen(const LLSD& key);
 
     void populateList();
+    void onSelectionChange();
 
 private:
     LLFloaterCameraPresets(const LLSD& key);
@@ -58,6 +59,8 @@ public:
     virtual void onMouseEnter(S32 x, S32 y, MASK mask);
     virtual void onMouseLeave(S32 x, S32 y, MASK mask);
 
+    std::string getPresetName() { return mPresetName; }
+
 private:
     void onDeleteBtnClick();
     void onResetBtnClick();
-- 
cgit v1.2.3


From 67e17bd822f146f333b91d353df6f55174ce4db6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 26 May 2023 19:45:46 +0300
Subject: SL-19774 add context menu for root folder (without any selection);
 show paste menu when right clicking any item

---
 indra/newview/llinventorygallery.cpp     | 24 ++++++++++++++
 indra/newview/llinventorygallery.h       |  2 ++
 indra/newview/llinventorygallerymenu.cpp | 54 ++++++++++++++++++--------------
 indra/newview/llinventorygallerymenu.h   |  7 ++++-
 4 files changed, 63 insertions(+), 24 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 18a7068b66..c6fee42297 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -126,12 +126,15 @@ BOOL LLInventoryGallery::postBuild()
     mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
     mMessageTextBox = getChild<LLTextBox>("empty_txt");
     mInventoryGalleryMenu = new LLInventoryGalleryContextMenu(this);
+    mRootGalleryMenu = new LLInventoryGalleryContextMenu(this);
+    mRootGalleryMenu->setRootFolder(true);
     return TRUE;
 }
 
 LLInventoryGallery::~LLInventoryGallery()
 {
     delete mInventoryGalleryMenu;
+    delete mRootGalleryMenu;
     delete mFilter;
 
     while (!mUnusedRowPanels.empty())
@@ -837,6 +840,27 @@ void LLInventoryGallery::onThumbnailAdded(LLUUID item_id)
     }
 }
 
+BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+    if(mItemMap[mSelectedItemID])
+    {
+        mItemMap[mSelectedItemID]->setFocus(false);
+    }
+    clearSelection();
+    BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
+    if (mSelectedItemID.isNull())
+    {
+        if (mInventoryGalleryMenu && mFolderID.notNull())
+        {
+            uuid_vec_t selected_uuids;
+            selected_uuids.push_back(mFolderID);
+            mRootGalleryMenu->show(this, selected_uuids, x, y);
+            return TRUE;
+        }
+    }
+    return res;
+}
+
 void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
 {
     if (mInventoryGalleryMenu && item_id.notNull())
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 473d1a1db4..7e4ed9725b 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -78,6 +78,7 @@ public:
     void draw();
     BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type,
                            void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
+    BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
@@ -204,6 +205,7 @@ private:
     int mGalleryWidthFactor;
 
     LLInventoryGalleryContextMenu* mInventoryGalleryMenu;
+    LLInventoryGalleryContextMenu* mRootGalleryMenu;
     std::string mFilterSubString;
     LLInventoryFilter* mFilter;
 
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 43ddf4da63..8a99b79e2b 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -159,6 +159,8 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
 
             bool is_cut_mode = (LLClipboard::instance().isCutMode());
             {
+                LLUUID dest = is_folder ?  selected_id : obj->getParentUUID();
+                
                 std::vector<LLUUID> objects;
                 LLClipboard::instance().pasteFromClipboard(objects);
                 for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
@@ -174,11 +176,11 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
                     {
                         if(is_cut_mode)
                         {
-                            gInventory.changeCategoryParent(cat, selected_id, false);
+                            gInventory.changeCategoryParent(cat, dest, false);
                         }
                         else
                         {
-                            copy_inventory_category(&gInventory, cat, selected_id);
+                            copy_inventory_category(&gInventory, cat, dest);
                         }
                     }
                     else
@@ -188,13 +190,13 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
                         {
                             if(is_cut_mode)
                             {
-                                gInventory.changeItemParent(item, selected_id, false);
+                                gInventory.changeItemParent(item, dest, false);
                             }
                             else
                             {
                                 if (item->getIsLinkType())
                                 {
-                                    link_inventory_object(selected_id, item_id,
+                                    link_inventory_object(dest, item_id,
                                         LLPointer<LLInventoryCallback>(NULL));
                                 }
                                 else
@@ -203,7 +205,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
                                                         gAgent.getID(),
                                                         item->getPermissions().getOwner(),
                                                         item->getUUID(),
-                                                        selected_id,
+                                                        dest,
                                                         std::string(),
                                                         LLPointer<LLInventoryCallback>(NULL));
                                 }
@@ -264,7 +266,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
         {
             return;
         }
-
+        LLUUID dest = is_folder ?  selected_id : obj->getParentUUID();
         std::vector<LLUUID> objects;
         LLClipboard::instance().pasteFromClipboard(objects);
         for (std::vector<LLUUID>::const_iterator iter = objects.begin();
@@ -274,7 +276,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
             const LLUUID &object_id = (*iter);
             if (LLConstPointer<LLInventoryObject> link_obj = gInventory.getObject(object_id))
             {
-                link_inventory_object(selected_id, link_obj, LLPointer<LLInventoryCallback>(NULL));
+                link_inventory_object(dest, link_obj, LLPointer<LLInventoryCallback>(NULL));
             }
         }
 
@@ -463,11 +465,14 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
 
     if (is_folder)
     {
-        items.push_back(std::string("Copy Separator"));
+        if(!isRootFolder())
+        {
+            items.push_back(std::string("Copy Separator"));
 
-        items.push_back(std::string("open_in_current_window"));
-        items.push_back(std::string("open_in_new_window"));
-        items.push_back(std::string("Open Folder Separator"));
+            items.push_back(std::string("open_in_current_window"));
+            items.push_back(std::string("open_in_new_window"));
+            items.push_back(std::string("Open Folder Separator"));
+        }
     }
     else
     {
@@ -512,18 +517,28 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
         {
             items.push_back(std::string("Share"));
         }
+        if (LLClipboard::instance().hasContents() && is_agent_inventory && !is_cof && !is_inbox_folder(selected_id))
+        {
+            items.push_back(std::string("Paste"));
+
+            static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryLinking", true);
+            if (inventory_linking)
+            {
+                items.push_back(std::string("Paste As Link"));
+            }
+        }
         if (is_folder && is_agent_inventory)
         {
             if (!is_cof && (folder_type != LLFolderType::FT_OUTFIT) && !is_outfits && !is_inbox_folder(selected_id))
             {
-                if (!gInventory.isObjectDescendentOf(selected_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD)))
+                if (!gInventory.isObjectDescendentOf(selected_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD)) && !isRootFolder())
                 {
                     items.push_back(std::string("New Folder"));
                 }
                 items.push_back(std::string("upload_def"));
             }
 
-            if(is_outfits)
+            if(is_outfits && !isRootFolder())
             {
                 items.push_back(std::string("New Outfit"));
             }
@@ -531,6 +546,8 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
             items.push_back(std::string("Subfolder Separator"));
             if (!is_system_folder)
             {
+                if(!isRootFolder())
+                {
                 if(has_children && (folder_type != LLFolderType::FT_OUTFIT))
                 {
                     items.push_back(std::string("Ungroup folder items"));
@@ -542,21 +559,12 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                     disabled_items.push_back(std::string("Delete"));
                     disabled_items.push_back(std::string("Cut"));
                 }
+                }
                 if(!is_inbox)
                 {
                     items.push_back(std::string("Rename"));
                 }
             }
-            if (LLClipboard::instance().hasContents() && is_agent_inventory && !is_cof && !is_inbox_folder(selected_id))
-            {
-                items.push_back(std::string("Paste"));
-
-                static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryLinking", true);
-                if (inventory_linking)
-                {
-                    items.push_back(std::string("Paste As Link"));
-                }
-            }
             if(!is_system_folder)
             {
                 items.push_back(std::string("Copy"));
diff --git a/indra/newview/llinventorygallerymenu.h b/indra/newview/llinventorygallerymenu.h
index 1768c07e6e..fd542e7d79 100644
--- a/indra/newview/llinventorygallerymenu.h
+++ b/indra/newview/llinventorygallerymenu.h
@@ -33,9 +33,13 @@ class LLInventoryGalleryContextMenu : public LLListContextMenu
 public:
     LLInventoryGalleryContextMenu(LLInventoryGallery* gallery)
     : LLListContextMenu(),
-    mGallery(gallery){}
+    mGallery(gallery),
+    mRootFolder(false){}
     /*virtual*/ LLContextMenu* createMenu();
 
+    bool isRootFolder() { return mRootFolder; }
+    void setRootFolder(bool is_root) { mRootFolder = is_root; }
+
 protected:
     //virtual void buildContextMenu(class LLMenuGL& menu, U32 flags);
     void updateMenuItemsVisibility(LLContextMenu* menu);
@@ -50,6 +54,7 @@ private:
     bool checkContextMenuItem(const LLSD& userdata);
 
     LLInventoryGallery* mGallery;
+    bool mRootFolder;
 };
 
 #endif
-- 
cgit v1.2.3


From 3b13c0ca15e2bc413731b0be07db6446bb32df1b Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 26 May 2023 19:06:07 +0300
Subject: DRTVWR-582 xcode-14.3 merge follow up

---
 indra/llcommon/llsdserialize.cpp   | 2 +-
 indra/llcommon/llsdserialize.h     | 2 +-
 indra/newview/llmeshrepository.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index a904ce700e..3db456ddb3 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2443,7 +2443,7 @@ U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size
 	return result;
 }
 
-char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size)
+char* strip_deprecated_header(char* in, llssize& cur_size, llssize* header_size)
 {
 	const char* deprecated_header = "<? LLSD/Binary ?>";
 	constexpr size_t deprecated_header_size = 17;
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index 5ddf0ff552..676b7bfd6a 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -873,5 +873,5 @@ LL_COMMON_API std::string zip_llsd(LLSD& data);
 LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size);
 
 // returns a pointer to the array or past the array if the deprecated header exists
-LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size = nullptr);
+LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, llssize* header_size = nullptr);
 #endif // LL_LLSDSERIALIZE_H
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index ff888a5af2..d6eba6b4bf 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1863,7 +1863,7 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
 	const LLUUID mesh_id = mesh_params.getSculptID();
 	LLSD header;
 	
-	U32 header_size = 0;
+	llssize header_size = 0;
 	if (data_size > 0)
 	{
 		llssize dsize = data_size;
-- 
cgit v1.2.3


From 8c9edebde752d69cfc120a1ddaf5dd7d6f6c27c4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 26 May 2023 23:02:54 +0300
Subject: SL-19604 Properly account for borders

---
 indra/newview/llpanelmaininventory.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 998a211795..39add4ee1c 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2342,17 +2342,16 @@ void LLPanelMainInventory::updateCombinationVisibility()
         LLRect galery_rect = mCombinationGalleryPanel->getRect();
         LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
         LLRect scroller_window_rect = mCombinationScrollPanel->getContentWindowRect();
-        const S32 BORDER_PAD = 2; // two sides
 
         inv_rect.mBottom = 0;
-        inv_rect.mRight = inv_rect.mLeft + inv_inner_rect.getWidth();
+        inv_rect.mRight = inv_rect.mLeft + inv_inner_rect.getWidth() + mCombinationInventoryPanel->getScrollableContainer()->getBorderWidth();
         if (!mCombinationGalleryPanel->hasVisibleItems() || mCombinationInventoryPanel->hasVisibleItems())
         {
-            inv_rect.mTop = inv_rect.mBottom + inv_inner_rect.getHeight() + BORDER_PAD;
+            inv_rect.mTop = inv_rect.mBottom + inv_inner_rect.getHeight() + mCombinationInventoryPanel->getScrollableContainer()->getBorderWidth();
         }
         else
         {
-            inv_rect.mTop = inv_rect.mBottom;
+            inv_rect.mTop = inv_rect.mBottom + mCombinationInventoryPanel->getScrollableContainer()->getBorderWidth();
         }
 
         galery_rect.mBottom = inv_rect.mTop;
@@ -2360,12 +2359,12 @@ void LLPanelMainInventory::updateCombinationVisibility()
         if (mCombinationGalleryPanel->hasVisibleItems())
         {
             mCombinationGalleryPanel->setVisible(true);
-            galery_rect.mTop = galery_rect.mBottom + inner_galery_rect.getHeight() + BORDER_PAD;
+            galery_rect.mTop = galery_rect.mBottom + inner_galery_rect.getHeight() + mCombinationGalleryPanel->getScrollableContainer()->getBorderWidth();
         }
         else
         {
             mCombinationGalleryPanel->setVisible(false);
-            galery_rect.mTop = galery_rect.mBottom;
+            galery_rect.mTop = galery_rect.mBottom + mCombinationGalleryPanel->getScrollableContainer()->getBorderWidth();
         }
 
         mCombinationScroller->reshape(scroller_window_rect.getWidth(), inv_rect.getHeight() + galery_rect.getHeight(), true);
-- 
cgit v1.2.3


From 3790c9ed879b015bcc91f3a9c393fbda643aa62f Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sun, 28 May 2023 06:16:04 +0300
Subject: INTL-490 Japanese Translation Update

provided by Logue Takacs
---
 .../skins/default/html/ja/help-offline/index.html  |   42 +
 .../skins/default/html/ja/loading-error/index.html |  124 +-
 .../skins/default/html/ja/loading/loading.html     |   32 +-
 .../xui/ja/control_table_contents_camera.xml       |   72 +
 .../ja/control_table_contents_columns_basic.xml    |    7 +
 .../xui/ja/control_table_contents_editing.xml      |   24 +
 .../xui/ja/control_table_contents_media.xml        |   27 +
 .../xui/ja/control_table_contents_movement.xml     |   62 +
 .../skins/default/xui/ja/floater_360capture.xml    |   18 +
 indra/newview/skins/default/xui/ja/floater_aaa.xml |   51 +
 .../newview/skins/default/xui/ja/floater_about.xml |   38 +-
 .../skins/default/xui/ja/floater_about_land.xml    |  723 +-
 .../skins/default/xui/ja/floater_activeim.xml      |    2 +-
 .../default/xui/ja/floater_add_payment_method.xml  |   12 +
 .../default/xui/ja/floater_adjust_environment.xml  |   85 +-
 .../xui/ja/floater_animation_anim_preview.xml      |   14 +-
 .../xui/ja/floater_animation_bvh_preview.xml       |  282 +-
 .../default/xui/ja/floater_associate_listing.xml   |   12 +-
 .../skins/default/xui/ja/floater_auction.xml       |   16 +-
 .../skins/default/xui/ja/floater_autoreplace.xml   |   54 +-
 .../skins/default/xui/ja/floater_avatar.xml        |    2 +-
 .../skins/default/xui/ja/floater_avatar_picker.xml |   98 +-
 .../xui/ja/floater_avatar_render_settings.xml      |   20 +-
 .../default/xui/ja/floater_avatar_textures.xml     |  118 +-
 .../skins/default/xui/ja/floater_ban_duration.xml  |   28 +-
 .../skins/default/xui/ja/floater_beacons.xml       |   39 +-
 .../skins/default/xui/ja/floater_big_preview.xml   |    2 +-
 .../skins/default/xui/ja/floater_build_options.xml |   50 +-
 .../skins/default/xui/ja/floater_bulk_perms.xml    |   92 +-
 .../newview/skins/default/xui/ja/floater_bumps.xml |   30 +-
 .../skins/default/xui/ja/floater_buy_contents.xml  |   32 +-
 .../skins/default/xui/ja/floater_buy_currency.xml  |  111 +-
 .../default/xui/ja/floater_buy_currency_html.xml   |    2 +-
 .../skins/default/xui/ja/floater_buy_land.xml      |  323 +-
 .../skins/default/xui/ja/floater_buy_object.xml    |   38 +-
 .../skins/default/xui/ja/floater_camera.xml        |   78 +-
 .../default/xui/ja/floater_camera_presets.xml      |    6 +-
 .../skins/default/xui/ja/floater_choose_group.xml  |   10 +-
 .../skins/default/xui/ja/floater_classified.xml    |    4 +
 .../skins/default/xui/ja/floater_color_picker.xml  |   62 +-
 .../default/xui/ja/floater_conversation_log.xml    |   12 +-
 .../xui/ja/floater_conversation_preview.xml        |   10 +-
 .../default/xui/ja/floater_create_landmark.xml     |   14 +
 .../skins/default/xui/ja/floater_critical.xml      |   22 +-
 .../default/xui/ja/floater_delete_pref_preset.xml  |   25 +-
 .../skins/default/xui/ja/floater_destinations.xml  |    2 +-
 .../skins/default/xui/ja/floater_display_name.xml  |   24 +-
 .../default/xui/ja/floater_edit_ext_day_cycle.xml  |  214 +-
 .../default/xui/ja/floater_edit_hover_height.xml   |    4 +-
 .../newview/skins/default/xui/ja/floater_event.xml |   16 +-
 .../default/xui/ja/floater_experience_search.xml   |    2 +-
 .../default/xui/ja/floater_experienceprofile.xml   |  146 +-
 .../skins/default/xui/ja/floater_experiences.xml   |    4 +-
 .../skins/default/xui/ja/floater_fast_timers.xml   |   34 +-
 .../skins/default/xui/ja/floater_fbc_web.xml       |    2 +
 .../default/xui/ja/floater_fixedenvironment.xml    |   50 +-
 .../skins/default/xui/ja/floater_font_test.xml     |   43 +-
 .../skins/default/xui/ja/floater_forget_user.xml   |   11 +-
 .../skins/default/xui/ja/floater_gesture.xml       |   44 +-
 .../skins/default/xui/ja/floater_god_tools.xml     |  162 +-
 .../skins/default/xui/ja/floater_goto_line.xml     |    8 +-
 .../skins/default/xui/ja/floater_help_browser.xml  |   12 +-
 .../skins/default/xui/ja/floater_how_to.xml        |    4 +-
 indra/newview/skins/default/xui/ja/floater_hud.xml |    2 +-
 .../skins/default/xui/ja/floater_im_container.xml  |   52 +-
 .../skins/default/xui/ja/floater_im_session.xml    |  106 +-
 .../skins/default/xui/ja/floater_image_preview.xml |   51 +-
 .../default/xui/ja/floater_import_collada.xml      |   30 +-
 .../skins/default/xui/ja/floater_incoming_call.xml |   44 +-
 .../skins/default/xui/ja/floater_inspect.xml       |   25 +-
 .../xui/ja/floater_inventory_item_properties.xml   |   68 +-
 .../xui/ja/floater_inventory_view_finder.xml       |   66 +-
 .../default/xui/ja/floater_item_properties.xml     |    2 +-
 .../skins/default/xui/ja/floater_joystick.xml      |  200 +-
 .../skins/default/xui/ja/floater_lagmeter.xml      |  202 +-
 .../skins/default/xui/ja/floater_land_holdings.xml |   60 +-
 .../skins/default/xui/ja/floater_linkreplace.xml   |   18 +-
 .../default/xui/ja/floater_live_lsleditor.xml      |   46 +-
 .../default/xui/ja/floater_load_pref_preset.xml    |   22 +-
 .../skins/default/xui/ja/floater_lsl_guide.xml     |   10 +-
 indra/newview/skins/default/xui/ja/floater_map.xml |   46 +-
 .../xui/ja/floater_marketplace_listings.xml        |   22 +-
 .../xui/ja/floater_marketplace_validation.xml      |    6 +-
 .../skins/default/xui/ja/floater_media_browser.xml |   52 +-
 .../default/xui/ja/floater_media_settings.xml      |    8 +-
 .../skins/default/xui/ja/floater_mem_leaking.xml   |   26 +-
 indra/newview/skins/default/xui/ja/floater_mfa.xml |    7 +
 .../skins/default/xui/ja/floater_model_preview.xml |  502 +-
 .../skins/default/xui/ja/floater_moveview.xml      |  110 +-
 .../skins/default/xui/ja/floater_mute_object.xml   |   20 +-
 .../skins/default/xui/ja/floater_my_appearance.xml |    4 +-
 .../default/xui/ja/floater_my_environments.xml     |   53 +-
 .../skins/default/xui/ja/floater_my_inventory.xml  |    2 +-
 .../skins/default/xui/ja/floater_my_scripts.xml    |    2 +-
 .../skins/default/xui/ja/floater_notification.xml  |    8 +-
 .../xui/ja/floater_notifications_console.xml       |    6 +-
 .../xui/ja/floater_notifications_tabbed.xml        |   64 +-
 .../default/xui/ja/floater_object_weights.xml      |   52 +-
 .../skins/default/xui/ja/floater_openobject.xml    |   18 +-
 .../xui/ja/floater_outfit_photo_preview.xml        |   10 +
 .../default/xui/ja/floater_outfit_save_as.xml      |   17 +-
 .../skins/default/xui/ja/floater_outgoing_call.xml |   52 +-
 .../xui/ja/floater_pathfinding_characters.xml      |   90 +-
 .../default/xui/ja/floater_pathfinding_console.xml |  199 +-
 .../xui/ja/floater_pathfinding_linksets.xml        |  270 +-
 indra/newview/skins/default/xui/ja/floater_pay.xml |   48 +-
 .../skins/default/xui/ja/floater_pay_object.xml    |   40 +-
 .../skins/default/xui/ja/floater_people.xml        |   13 +-
 .../skins/default/xui/ja/floater_perms_default.xml |   64 +-
 .../skins/default/xui/ja/floater_pick_track.xml    |   38 +-
 .../skins/default/xui/ja/floater_places.xml        |    4 +-
 .../skins/default/xui/ja/floater_post_process.xml  |   85 +-
 .../skins/default/xui/ja/floater_preferences.xml   |   47 +-
 .../ja/floater_preferences_graphics_advanced.xml   |  230 +-
 .../default/xui/ja/floater_preferences_proxy.xml   |   64 +-
 .../xui/ja/floater_preferences_view_advanced.xml   |   16 +-
 .../default/xui/ja/floater_preview_animation.xml   |   14 +-
 .../default/xui/ja/floater_preview_gesture.xml     |  110 +-
 .../default/xui/ja/floater_preview_notecard.xml    |   28 +-
 .../skins/default/xui/ja/floater_preview_sound.xml |   14 +-
 .../default/xui/ja/floater_preview_texture.xml     |   42 +-
 .../skins/default/xui/ja/floater_preview_trash.xml |   15 +-
 .../default/xui/ja/floater_price_for_listing.xml   |   21 +-
 .../skins/default/xui/ja/floater_profile.xml       |   26 +-
 .../default/xui/ja/floater_profile_permissions.xml |   10 +
 .../default/xui/ja/floater_profile_texture.xml     |   17 +
 .../default/xui/ja/floater_publish_classified.xml  |   22 +-
 .../xui/ja/floater_region_debug_console.xml        |    2 +-
 .../skins/default/xui/ja/floater_region_info.xml   |    2 +-
 .../default/xui/ja/floater_region_restarting.xml   |   30 +-
 .../skins/default/xui/ja/floater_report_abuse.xml  |  166 +-
 .../default/xui/ja/floater_save_camera_preset.xml  |   21 +-
 .../default/xui/ja/floater_save_pref_preset.xml    |   22 +-
 .../default/xui/ja/floater_scene_load_stats.xml    |  124 +-
 .../skins/default/xui/ja/floater_script_debug.xml  |   10 +-
 .../default/xui/ja/floater_script_debug_panel.xml  |    2 +-
 .../default/xui/ja/floater_script_ed_prefs.xml     |   64 +-
 .../skins/default/xui/ja/floater_script_limits.xml |    2 +-
 .../default/xui/ja/floater_script_preview.xml      |   12 +-
 .../skins/default/xui/ja/floater_script_queue.xml  |   32 +-
 .../skins/default/xui/ja/floater_script_search.xml |   18 +-
 .../skins/default/xui/ja/floater_search.xml        |   22 +-
 .../skins/default/xui/ja/floater_select_key.xml    |   18 +-
 .../skins/default/xui/ja/floater_sell_land.xml     |   96 +-
 .../default/xui/ja/floater_settings_debug.xml      |   32 +-
 .../default/xui/ja/floater_settings_picker.xml     |   44 +-
 .../xui/ja/floater_simple_outfit_snapshot.xml      |    7 +
 .../skins/default/xui/ja/floater_snapshot.xml      |  127 +-
 .../skins/default/xui/ja/floater_sound_devices.xml |    8 +-
 .../skins/default/xui/ja/floater_sound_preview.xml |   30 +-
 .../skins/default/xui/ja/floater_spellcheck.xml    |   24 +-
 .../default/xui/ja/floater_spellcheck_import.xml   |   20 +-
 .../newview/skins/default/xui/ja/floater_stats.xml |  215 +-
 .../skins/default/xui/ja/floater_sys_well.xml      |   10 +-
 .../skins/default/xui/ja/floater_telehub.xml       |   35 +-
 .../skins/default/xui/ja/floater_test_button.xml   |   16 +
 .../skins/default/xui/ja/floater_test_checkbox.xml |   10 +
 .../skins/default/xui/ja/floater_test_combobox.xml |   30 +
 .../default/xui/ja/floater_test_inspectors.xml     |   21 +
 .../default/xui/ja/floater_test_layout_stacks.xml  |    2 +-
 .../default/xui/ja/floater_test_line_editor.xml    |   14 +
 .../default/xui/ja/floater_test_radiogroup.xml     |   16 +
 .../skins/default/xui/ja/floater_test_slider.xml   |   12 +
 .../skins/default/xui/ja/floater_test_spinner.xml  |   12 +
 .../default/xui/ja/floater_test_text_editor.xml    |    6 +
 .../xui/ja/floater_test_text_vertical_aligment.xml |    2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |   86 +-
 .../xui/ja/floater_texture_fetch_debugger.xml      |  112 +-
 .../newview/skins/default/xui/ja/floater_tools.xml |  728 +-
 .../skins/default/xui/ja/floater_top_objects.xml   |   96 +-
 indra/newview/skins/default/xui/ja/floater_tos.xml |   29 +-
 .../skins/default/xui/ja/floater_toybox.xml        |   14 +-
 .../xui/ja/floater_translation_settings.xml        |   94 +-
 .../skins/default/xui/ja/floater_ui_preview.xml    |   48 +
 .../skins/default/xui/ja/floater_url_entry.xml     |   20 +-
 .../default/xui/ja/floater_voice_chat_volume.xml   |    4 +-
 .../skins/default/xui/ja/floater_voice_effect.xml  |  214 +-
 .../skins/default/xui/ja/floater_voice_volume.xml  |    4 +-
 .../skins/default/xui/ja/floater_web_content.xml   |   32 +-
 .../default/xui/ja/floater_whitelist_entry.xml     |   12 +-
 .../skins/default/xui/ja/floater_window_size.xml   |   40 +-
 .../skins/default/xui/ja/floater_world_map.xml     |  179 +-
 indra/newview/skins/default/xui/ja/fonts.xml       |  125 +
 .../skins/default/xui/ja/inspect_avatar.xml        |   31 +-
 .../newview/skins/default/xui/ja/inspect_group.xml |   42 +-
 .../skins/default/xui/ja/inspect_object.xml        |   69 +-
 .../skins/default/xui/ja/inspect_remote_object.xml |   32 +-
 .../skins/default/xui/ja/language_settings.xml     |   83 +-
 .../default/xui/ja/menu_add_wearable_gear.xml      |    8 +-
 .../skins/default/xui/ja/menu_attachment_other.xml |   48 +-
 .../skins/default/xui/ja/menu_attachment_self.xml  |   38 +-
 .../skins/default/xui/ja/menu_avatar_icon.xml      |   24 +-
 .../skins/default/xui/ja/menu_avatar_other.xml     |   46 +-
 .../xui/ja/menu_avatar_rendering_settings.xml      |    8 +-
 .../xui/ja/menu_avatar_rendering_settings_add.xml  |    6 +-
 .../skins/default/xui/ja/menu_avatar_self.xml      |   70 +-
 .../skins/default/xui/ja/menu_cof_attachment.xml   |    8 +-
 .../skins/default/xui/ja/menu_cof_body_part.xml    |    6 +-
 .../skins/default/xui/ja/menu_cof_clothing.xml     |    8 +-
 .../newview/skins/default/xui/ja/menu_cof_gear.xml |    6 +-
 .../skins/default/xui/ja/menu_conversation.xml     |   63 +-
 .../default/xui/ja/menu_conversation_log_gear.xml  |   26 +-
 .../default/xui/ja/menu_conversation_log_view.xml  |   10 +-
 .../skins/default/xui/ja/menu_copy_paste_color.xml |    5 +
 .../default/xui/ja/menu_copy_paste_features.xml    |    5 +
 .../skins/default/xui/ja/menu_copy_paste_light.xml |    5 +
 .../default/xui/ja/menu_copy_paste_object.xml      |    5 +
 .../skins/default/xui/ja/menu_copy_paste_pos.xml   |    7 +
 .../skins/default/xui/ja/menu_copy_paste_rot.xml   |    7 +
 .../skins/default/xui/ja/menu_copy_paste_size.xml  |    7 +
 .../default/xui/ja/menu_copy_paste_texture.xml     |    5 +
 indra/newview/skins/default/xui/ja/menu_edit.xml   |   20 +-
 .../skins/default/xui/ja/menu_favorites.xml        |   20 +-
 .../default/xui/ja/menu_gallery_outfit_tab.xml     |   56 +-
 .../skins/default/xui/ja/menu_gesture_gear.xml     |   17 +-
 .../skins/default/xui/ja/menu_group_plus.xml       |    6 +-
 .../skins/default/xui/ja/menu_hide_navbar.xml      |    7 +-
 .../skins/default/xui/ja/menu_im_conversation.xml  |   27 +-
 .../default/xui/ja/menu_im_session_showmodes.xml   |   10 +-
 .../skins/default/xui/ja/menu_imchiclet_adhoc.xml  |    4 +-
 .../skins/default/xui/ja/menu_imchiclet_group.xml  |    8 +-
 .../skins/default/xui/ja/menu_imchiclet_p2p.xml    |   10 +-
 .../default/xui/ja/menu_inspect_object_gear.xml    |   34 +-
 .../default/xui/ja/menu_inv_offer_chiclet.xml      |    4 +-
 .../skins/default/xui/ja/menu_inventory.xml        |  246 +-
 .../skins/default/xui/ja/menu_inventory_add.xml    |   76 +-
 .../default/xui/ja/menu_inventory_gear_default.xml |   35 +-
 .../xui/ja/menu_inventory_search_visibility.xml    |    7 +
 indra/newview/skins/default/xui/ja/menu_land.xml   |   19 +-
 .../newview/skins/default/xui/ja/menu_landmark.xml |   10 +-
 indra/newview/skins/default/xui/ja/menu_login.xml  |   74 +-
 .../skins/default/xui/ja/menu_marketplace_view.xml |   10 +-
 .../skins/default/xui/ja/menu_media_ctrl.xml       |   11 +-
 .../newview/skins/default/xui/ja/menu_mini_map.xml |   18 +-
 .../xui/ja/menu_model_import_gear_default.xml      |   12 +-
 .../skins/default/xui/ja/menu_mute_particle.xml    |    4 +-
 indra/newview/skins/default/xui/ja/menu_navbar.xml |   18 +-
 .../skins/default/xui/ja/menu_nearby_chat.xml      |   17 +-
 .../xui/ja/menu_notification_well_button.xml       |    4 +-
 indra/newview/skins/default/xui/ja/menu_object.xml |   67 +-
 .../skins/default/xui/ja/menu_object_icon.xml      |   13 +-
 .../skins/default/xui/ja/menu_outfit_gear.xml      |   74 +-
 .../skins/default/xui/ja/menu_outfit_tab.xml       |   14 +-
 .../skins/default/xui/ja/menu_participant_list.xml |   42 +-
 .../skins/default/xui/ja/menu_participant_view.xml |   25 +-
 .../default/xui/ja/menu_people_blocked_gear.xml    |   15 +-
 .../default/xui/ja/menu_people_blocked_plus.xml    |    6 +-
 .../default/xui/ja/menu_people_blocked_view.xml    |    6 +-
 .../default/xui/ja/menu_people_friends_view.xml    |   14 +-
 .../skins/default/xui/ja/menu_people_groups.xml    |   12 +-
 .../default/xui/ja/menu_people_groups_view.xml     |    4 +-
 .../skins/default/xui/ja/menu_people_nearby.xml    |   32 +-
 .../xui/ja/menu_people_nearby_multiselect.xml      |   16 +-
 .../default/xui/ja/menu_people_nearby_view.xml     |   16 +-
 .../default/xui/ja/menu_people_recent_view.xml     |    8 +-
 indra/newview/skins/default/xui/ja/menu_picks.xml  |   14 +-
 .../skins/default/xui/ja/menu_picks_plus.xml       |    6 +-
 indra/newview/skins/default/xui/ja/menu_place.xml  |    8 +-
 .../skins/default/xui/ja/menu_place_add_button.xml |    6 +-
 .../default/xui/ja/menu_places_gear_folder.xml     |   29 +-
 .../default/xui/ja/menu_places_gear_landmark.xml   |   39 +-
 .../default/xui/ja/menu_places_gear_sorting.xml    |    7 +
 .../skins/default/xui/ja/menu_profile_other.xml    |   23 +
 .../skins/default/xui/ja/menu_profile_overflow.xml |   20 +-
 .../skins/default/xui/ja/menu_profile_self.xml     |   12 +
 .../skins/default/xui/ja/menu_save_outfit.xml      |    6 +-
 .../skins/default/xui/ja/menu_save_settings.xml    |   14 +-
 .../skins/default/xui/ja/menu_script_chiclet.xml   |    4 +-
 .../skins/default/xui/ja/menu_settings_add.xml     |    8 +-
 .../skins/default/xui/ja/menu_settings_gear.xml    |   16 +-
 indra/newview/skins/default/xui/ja/menu_slurl.xml  |    8 +-
 .../default/xui/ja/menu_teleport_history_gear.xml  |    9 +-
 .../default/xui/ja/menu_teleport_history_item.xml  |    8 +-
 .../default/xui/ja/menu_teleport_history_tab.xml   |    6 +-
 .../skins/default/xui/ja/menu_text_editor.xml      |   26 +-
 .../newview/skins/default/xui/ja/menu_toolbars.xml |   10 +-
 .../skins/default/xui/ja/menu_topinfobar.xml       |   14 +-
 .../skins/default/xui/ja/menu_url_agent.xml        |   15 +-
 .../skins/default/xui/ja/menu_url_email.xml        |    6 +-
 .../skins/default/xui/ja/menu_url_experience.xml   |    4 +-
 .../skins/default/xui/ja/menu_url_group.xml        |    9 +-
 .../newview/skins/default/xui/ja/menu_url_http.xml |   10 +-
 .../skins/default/xui/ja/menu_url_inventory.xml    |   11 +-
 .../newview/skins/default/xui/ja/menu_url_map.xml  |   10 +-
 .../skins/default/xui/ja/menu_url_objectim.xml     |   18 +-
 .../skins/default/xui/ja/menu_url_parcel.xml       |   10 +-
 .../skins/default/xui/ja/menu_url_slapp.xml        |    7 +-
 .../skins/default/xui/ja/menu_url_slurl.xml        |   12 +-
 .../skins/default/xui/ja/menu_url_teleport.xml     |   10 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml | 1162 +--
 .../default/xui/ja/menu_wearable_list_item.xml     |   26 +-
 .../skins/default/xui/ja/menu_wearing_gear.xml     |   12 +-
 .../skins/default/xui/ja/menu_wearing_tab.xml      |   14 +-
 indra/newview/skins/default/xui/ja/mime_types.xml  |  379 +-
 .../skins/default/xui/ja/mime_types_linux.xml      |  352 +-
 .../skins/default/xui/ja/mime_types_mac.xml        |  355 +-
 .../newview/skins/default/xui/ja/notifications.xml | 8177 ++++++++++++--------
 .../skins/default/xui/ja/outfit_accordion_tab.xml  |    2 +-
 .../default/xui/ja/panel_active_object_row.xml     |   12 +-
 .../default/xui/ja/panel_avatar_list_item.xml      |   58 +-
 .../skins/default/xui/ja/panel_avatar_tag.xml      |   16 +-
 .../default/xui/ja/panel_block_list_sidetray.xml   |   22 +-
 .../default/xui/ja/panel_body_parts_list_item.xml  |   18 +-
 .../xui/ja/panel_bodyparts_list_button_bar.xml     |    6 +-
 .../skins/default/xui/ja/panel_bottomtray_lite.xml |   17 +-
 .../default/xui/ja/panel_camera_preset_item.xml    |    8 +
 .../skins/default/xui/ja/panel_chat_header.xml     |    6 +-
 .../skins/default/xui/ja/panel_chiclet_bar.xml     |   26 +-
 .../skins/default/xui/ja/panel_classified_info.xml |  116 +-
 .../xui/ja/panel_clothing_list_button_bar.xml      |    6 +-
 .../default/xui/ja/panel_clothing_list_item.xml    |   22 +-
 .../skins/default/xui/ja/panel_cof_wearables.xml   |   13 +-
 .../xui/ja/panel_conversation_list_item.xml        |   17 +-
 .../xui/ja/panel_conversation_log_list_item.xml    |   12 +-
 .../xui/ja/panel_deletable_wearable_list_item.xml  |   10 +-
 .../xui/ja/panel_dummy_clothing_list_item.xml      |   16 +-
 .../skins/default/xui/ja/panel_edit_alpha.xml      |   25 +-
 .../skins/default/xui/ja/panel_edit_eyes.xml       |   18 +-
 .../skins/default/xui/ja/panel_edit_gloves.xml     |   20 +-
 .../skins/default/xui/ja/panel_edit_hair.xml       |   24 +-
 .../skins/default/xui/ja/panel_edit_jacket.xml     |   25 +-
 .../skins/default/xui/ja/panel_edit_pants.xml      |   22 +-
 .../skins/default/xui/ja/panel_edit_physics.xml    |   38 +-
 .../skins/default/xui/ja/panel_edit_shape.xml      |   60 +-
 .../skins/default/xui/ja/panel_edit_shirt.xml      |   22 +-
 .../skins/default/xui/ja/panel_edit_shoes.xml      |   22 +-
 .../skins/default/xui/ja/panel_edit_skin.xml       |   28 +-
 .../skins/default/xui/ja/panel_edit_skirt.xml      |   20 +-
 .../skins/default/xui/ja/panel_edit_socks.xml      |   20 +-
 .../skins/default/xui/ja/panel_edit_tattoo.xml     |   18 +-
 .../skins/default/xui/ja/panel_edit_underpants.xml |   20 +-
 .../skins/default/xui/ja/panel_edit_undershirt.xml |   20 +-
 .../skins/default/xui/ja/panel_edit_universal.xml  |   34 +-
 .../skins/default/xui/ja/panel_edit_wearable.xml   |  180 +-
 .../skins/default/xui/ja/panel_experience_info.xml |  101 +-
 .../xui/ja/panel_experience_list_editor.xml        |   38 +-
 .../default/xui/ja/panel_experience_list_item.xml  |    8 +-
 .../skins/default/xui/ja/panel_experience_log.xml  |   51 +-
 .../default/xui/ja/panel_experience_search.xml     |   73 +-
 .../skins/default/xui/ja/panel_experiences.xml     |   18 +-
 .../skins/default/xui/ja/panel_group_bulk_ban.xml  |   58 +-
 .../xui/ja/panel_group_creation_sidetray.xml       |   81 +-
 .../skins/default/xui/ja/panel_group_general.xml   |   90 +-
 .../default/xui/ja/panel_group_info_sidetray.xml   |   72 +-
 .../skins/default/xui/ja/panel_group_invite.xml    |   43 +-
 .../default/xui/ja/panel_group_land_money.xml      |  129 +-
 .../skins/default/xui/ja/panel_group_list_item.xml |   13 +-
 .../default/xui/ja/panel_group_list_item_short.xml |   14 +-
 .../skins/default/xui/ja/panel_group_notices.xml   |   94 +-
 .../skins/default/xui/ja/panel_group_notify.xml    |   24 +-
 .../skins/default/xui/ja/panel_group_roles.xml     |  206 +-
 .../skins/default/xui/ja/panel_hide_beacon.xml     |    4 +
 .../skins/default/xui/ja/panel_instant_message.xml |   19 +-
 .../skins/default/xui/ja/panel_inventory_item.xml  |    7 +-
 .../skins/default/xui/ja/panel_landmark_info.xml   |   88 +-
 indra/newview/skins/default/xui/ja/panel_login.xml |   50 +-
 .../skins/default/xui/ja/panel_login_first.xml     |   89 +-
 .../skins/default/xui/ja/panel_main_inventory.xml  |   66 +-
 .../default/xui/ja/panel_marketplace_listings.xml  |   21 +-
 .../ja/panel_marketplace_listings_inventory.xml    |    2 +-
 .../xui/ja/panel_marketplace_listings_listed.xml   |    2 +-
 .../ja/panel_marketplace_listings_unassociated.xml |    2 +-
 .../xui/ja/panel_marketplace_listings_unlisted.xml |    2 +-
 .../xui/ja/panel_media_settings_general.xml        |   56 +-
 .../xui/ja/panel_media_settings_permissions.xml    |   42 +-
 .../xui/ja/panel_media_settings_security.xml       |   16 +-
 .../skins/default/xui/ja/panel_navigation_bar.xml  |   38 +-
 .../skins/default/xui/ja/panel_nearby_chat.xml     |   12 +-
 .../skins/default/xui/ja/panel_nearby_chat_bar.xml |    6 +-
 .../skins/default/xui/ja/panel_nearby_media.xml    |  124 +-
 .../skins/default/xui/ja/panel_notification.xml    |   15 +
 .../xui/ja/panel_notification_list_item.xml        |  127 +-
 .../default/xui/ja/panel_notifications_channel.xml |   34 +-
 .../skins/default/xui/ja/panel_notify_textbox.xml  |   20 +-
 .../default/xui/ja/panel_online_status_toast.xml   |    2 +-
 .../skins/default/xui/ja/panel_outfit_edit.xml     |  146 +-
 .../skins/default/xui/ja/panel_outfit_gallery.xml  |   55 +-
 .../default/xui/ja/panel_outfit_gallery_item.xml   |   12 +-
 .../xui/ja/panel_outfit_snapshot_inventory.xml     |   10 +
 .../default/xui/ja/panel_outfits_inventory.xml     |   46 +-
 .../ja/panel_outfits_inventory_gear_default.xml    |   13 +-
 .../skins/default/xui/ja/panel_outfits_list.xml    |   19 +-
 .../skins/default/xui/ja/panel_outfits_wearing.xml |   26 +-
 .../newview/skins/default/xui/ja/panel_people.xml  |  132 +-
 .../skins/default/xui/ja/panel_place_profile.xml   |  214 +-
 .../newview/skins/default/xui/ja/panel_places.xml  |  115 +-
 .../default/xui/ja/panel_postcard_message.xml      |   28 +-
 .../default/xui/ja/panel_postcard_settings.xml     |   22 +-
 .../default/xui/ja/panel_preferences_advanced.xml  |   54 +-
 .../default/xui/ja/panel_preferences_alerts.xml    |   20 +-
 .../default/xui/ja/panel_preferences_chat.xml      |  196 +-
 .../default/xui/ja/panel_preferences_colors.xml    |   60 +-
 .../default/xui/ja/panel_preferences_controls.xml  |   11 +
 .../default/xui/ja/panel_preferences_general.xml   |  124 +-
 .../default/xui/ja/panel_preferences_graphics1.xml |   73 +-
 .../default/xui/ja/panel_preferences_grids.xml     |   17 +
 .../default/xui/ja/panel_preferences_move.xml      |   66 +-
 .../default/xui/ja/panel_preferences_privacy.xml   |   46 +-
 .../default/xui/ja/panel_preferences_setup.xml     |   62 +-
 .../default/xui/ja/panel_preferences_sound.xml     |   70 +-
 .../default/xui/ja/panel_preferences_uploads.xml   |   29 +-
 .../xui/ja/panel_presets_camera_pulldown.xml       |    7 +
 .../default/xui/ja/panel_presets_pulldown.xml      |    8 +-
 .../default/xui/ja/panel_prim_media_controls.xml   |  132 +-
 .../default/xui/ja/panel_profile_classified.xml    |  184 +-
 .../default/xui/ja/panel_profile_classifieds.xml   |   12 +-
 .../default/xui/ja/panel_profile_firstlife.xml     |    2 +-
 .../skins/default/xui/ja/panel_profile_notes.xml   |   12 +-
 .../skins/default/xui/ja/panel_profile_pick.xml    |   18 +-
 .../skins/default/xui/ja/panel_profile_picks.xml   |   16 +-
 .../default/xui/ja/panel_profile_secondlife.xml    |  163 +-
 .../skins/default/xui/ja/panel_profile_web.xml     |   18 +-
 .../skins/default/xui/ja/panel_progress.xml        |   16 +-
 .../skins/default/xui/ja/panel_region_access.xml   |  108 +-
 .../skins/default/xui/ja/panel_region_covenant.xml |  106 +-
 .../skins/default/xui/ja/panel_region_debug.xml    |   54 +-
 .../default/xui/ja/panel_region_environment.xml    |  147 +-
 .../skins/default/xui/ja/panel_region_estate.xml   |   78 +-
 .../default/xui/ja/panel_region_experiences.xml    |   41 +-
 .../skins/default/xui/ja/panel_region_general.xml  |   73 +-
 .../skins/default/xui/ja/panel_region_terrain.xml  |   88 +-
 .../skins/default/xui/ja/panel_script_ed.xml       |   84 +-
 .../default/xui/ja/panel_script_experience.xml     |   20 +-
 .../xui/ja/panel_script_limits_my_avatar.xml       |   26 +-
 .../xui/ja/panel_script_limits_region_memory.xml   |   36 +-
 .../default/xui/ja/panel_script_question_toast.xml |    4 +-
 .../skins/default/xui/ja/panel_scrolling_param.xml |   18 +-
 .../default/xui/ja/panel_scrolling_param_base.xml  |    4 +-
 .../default/xui/ja/panel_settings_sky_atmos.xml    |   40 +-
 .../default/xui/ja/panel_settings_sky_clouds.xml   |   41 +-
 .../default/xui/ja/panel_settings_sky_density.xml  |   50 +-
 .../default/xui/ja/panel_settings_sky_sunmoon.xml  |   63 +-
 .../skins/default/xui/ja/panel_settings_water.xml  |   66 +-
 .../default/xui/ja/panel_side_tray_tab_caption.xml |   10 +-
 .../default/xui/ja/panel_sidetray_home_tab.xml     |   60 +-
 .../default/xui/ja/panel_snapshot_inventory.xml    |   36 +-
 .../skins/default/xui/ja/panel_snapshot_local.xml  |   56 +-
 .../default/xui/ja/panel_snapshot_options.xml      |   14 +-
 .../default/xui/ja/panel_snapshot_postcard.xml     |   30 +-
 .../default/xui/ja/panel_snapshot_profile.xml      |   34 +-
 .../skins/default/xui/ja/panel_sound_devices.xml   |   32 +-
 .../default/xui/ja/panel_stand_stop_flying.xml     |    9 +-
 .../skins/default/xui/ja/panel_status_bar.xml      |   51 +-
 .../skins/default/xui/ja/panel_sys_well_item.xml   |    6 +-
 .../default/xui/ja/panel_teleport_history.xml      |   34 +-
 .../default/xui/ja/panel_teleport_history_item.xml |    8 +-
 .../skins/default/xui/ja/panel_tools_texture.xml   |  196 +-
 .../skins/default/xui/ja/panel_voice_effect.xml    |   20 +-
 .../skins/default/xui/ja/panel_volume_pulldown.xml |   24 +-
 .../skins/default/xui/ja/panel_world_map.xml       |   82 +-
 .../newview/skins/default/xui/ja/role_actions.xml  |  154 +-
 .../skins/default/xui/ja/sidepanel_appearance.xml  |   30 +-
 .../skins/default/xui/ja/sidepanel_inventory.xml   |   72 +-
 .../skins/default/xui/ja/sidepanel_item_info.xml   |  134 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   |  206 +-
 indra/newview/skins/default/xui/ja/strings.xml     | 6093 ++++++++++-----
 .../skins/default/xui/ja/teleport_strings.xml      |   78 +-
 .../default/xui/ja/widgets/bodyparts_list_item.xml |    9 +
 .../default/xui/ja/widgets/clothing_list_item.xml  |   11 +
 .../ja/widgets/deletable_wearable_list_item.xml    |    6 +
 .../skins/default/xui/ja/widgets/density_ctrl.xml  |   23 +-
 .../xui/ja/widgets/dummy_clothing_list_item.xml    |    7 +
 .../default/xui/ja/widgets/flat_list_view.xml      |    4 +
 .../xui/ja/widgets/inbox_folder_view_folder.xml    |    4 +
 .../xui/ja/widgets/inbox_folder_view_item.xml      |    4 +
 .../default/xui/ja/widgets/menu_item_separator.xml |    2 +
 .../default/xui/ja/widgets/menu_item_tear_off.xml  |    3 +
 .../skins/default/xui/ja/widgets/name_editor.xml   |    2 +
 .../default/xui/ja/widgets/panel_camera_item.xml   |    8 +
 .../skins/default/xui/ja/widgets/person_view.xml   |   12 +
 .../default/xui/ja/widgets/sun_moon_trackball.xml  |   19 +
 .../xui/ja/widgets/wearable_outfit_list_item.xml   |   12 +
 .../skins/default/xui/ja/widgets/xy_vector.xml     |   11 +
 indra/newview/skins/default/xui/ja/xui_version.xml |    6 +-
 474 files changed, 20030 insertions(+), 17175 deletions(-)
 create mode 100644 indra/newview/skins/default/html/ja/help-offline/index.html
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_media.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_360capture.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_aaa.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_classified.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_create_landmark.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_fbc_web.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_mfa.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_profile_texture.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_button.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_combobox.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_slider.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_spinner.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_ui_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ja/fonts.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_profile_other.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_profile_self.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_notification.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/name_editor.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/person_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/xy_vector.xml

(limited to 'indra')

diff --git a/indra/newview/skins/default/html/ja/help-offline/index.html b/indra/newview/skins/default/html/ja/help-offline/index.html
new file mode 100644
index 0000000000..aeaafe8216
--- /dev/null
+++ b/indra/newview/skins/default/html/ja/help-offline/index.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="ja" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta encoding="utf-8" />
+    <title>オフラインヘルプ</title>
+    <style>
+      body {
+        background-color: #000000;
+        font-family: '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
+          sans-serif;
+        font-size: 62.5%;
+        color: #e9f1f8;
+        width: 100%;
+        padding: 0px;
+        margin: 0px;
+      }
+      #infobox {
+        position: absolute;
+        top: 40%;
+        left: 50%;
+        z-index: 1;
+        padding: 0;
+        width: 592px;
+        margin-left: -296px;
+        margin-top: -150px;
+        text-align: center;
+        font-size: 1.2em;
+        color: #ccc;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="infobox">
+      <p>Second Lifeオフラインヘルプ</p>
+      <p>
+        オンラインではなく、リモートでヘルプを取得しないように構成されています。
+        <br />
+        これは、さらに作業が完了するまで利用できるすべてのヘルプです。うん。
+      </p>
+    </div>
+  </body>
+</html>
diff --git a/indra/newview/skins/default/html/ja/loading-error/index.html b/indra/newview/skins/default/html/ja/loading-error/index.html
index d969c03098..27d4425016 100644
--- a/indra/newview/skins/default/html/ja/loading-error/index.html
+++ b/indra/newview/skins/default/html/ja/loading-error/index.html
@@ -1,25 +1,99 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>接続できません</title>
-<style> 
-body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
-a {color:#93a9d5;} 
-a:active {color:#50607C;text-decoration:underline;} 
-a:hover {color:#ff7900;text-decoration:underline;} 
-#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
-#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
-#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
-#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
-#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
-#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
-</style>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
-		<p> Second Lifeによるログインサーバーへの接続が確立できません。
-		</p>
-		<p> インターネット接続を確認してください。 お使いのコンピュータやネットワークがファイヤウォールまたはプロキシにより保護されている場合は、Second  Lifeによるネットワークへのアクセスが許可されていることを確認してください。
-		</p> <div id="submitbtn">
-			<input class="input_over" type="submit" value="もう一度試す" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
-</div>
-</body>
+<!DOCTYPE html>
+<html lang="ja" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta encoding="utf-8" />
+    <title>接続できません</title>
+    <style>
+      body {
+        background-color: #000000;
+        font-family: '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
+          sans-serif;
+        font-size: 62.5%;
+        color: #e9f1f8;
+        width: 100%;
+        padding: 0px;
+        margin: 0px;
+      }
+      a {
+        color: #93a9d5;
+      }
+      a:active {
+        color: #50607c;
+        text-decoration: underline;
+      }
+      a:hover {
+        color: #ff7900;
+        text-decoration: underline;
+      }
+      #infobox {
+        position: absolute;
+        top: 40%;
+        left: 50%;
+        z-index: 1;
+        padding: 0;
+        width: 592px;
+        margin-left: -296px;
+        margin-top: -150px;
+        text-align: center;
+        font-size: 1.2em;
+        color: #ccc;
+      }
+      #infobox #submitbtn {
+        padding: 15px 3px 5px 15px;
+        height: 28px;
+        width: 127px;
+        margin-left: 244px;
+      }
+      #infobox #submitbtn input {
+        text-transform: capitalize;
+        color: #fff;
+        font-size: 1em;
+        height: 28px;
+        width: 127px;
+        border: none;
+        font-weight: normal;
+        background: url(../../btn_purplepill_bg.png) bottom left no-repeat;
+        vertical-align: text-bottom;
+      }
+      #infobox #submitbtn input:hover.input_over,
+      #login_box #submitbtn input:hover.input_off {
+        color: #fff;
+        border: none;
+        background: url(../../btn_purplepill_bg.png) bottom right no-repeat;
+      }
+      #infobox #submitbtn input:active.input_over {
+        color: #fff;
+        border: none;
+        background: url(../../btn_purplepill_bg.png) top left no-repeat;
+      }
+      #infobox #submitbtn input.pressed {
+        color: #888;
+        border: none;
+        background: url(../../btn_purplepill_bg.png) top right no-repeat;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="infobox">
+      <img src="../../unabletoconnect.png" alt="unabletoconnect" />
+      <br />
+      <p>Second Lifeによるログインサーバーへの接続が確立できません。</p>
+      <p>
+        インターネット接続を確認してください。
+        お使いのコンピュータやネットワークがファイヤウォールまたはプロキシにより保護されている場合は、
+        Second
+        Lifeによるネットワークへのアクセスが許可されていることを確認してください。
+      </p>
+      <div id="submitbtn">
+        <input
+          class="input_over"
+          type="submit"
+          value="もう一度試す"
+          onclick="document.location='secondlife:\/\/\/app/login_refresh'; this.className='pressed';"
+          onmouseover="this.className='input_over';"
+          onmouseout="this.className='input_off';"
+        />
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html
index 35cf74a35f..ea576ed082 100644
--- a/indra/newview/skins/default/html/ja/loading/loading.html
+++ b/indra/newview/skins/default/html/ja/loading/loading.html
@@ -1,10 +1,22 @@
-<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
-	<tr>
-		<td align="center" valign="middle" style="font-size:0.8em;">
-			<img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;ロード中...
-		</td>
-	</tr>
-</table>
-</body>
+<!DOCTYPE html>
+<html lang="ja" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="utf-8" />
+    <title>読み込んでいます…</title>
+    <style>
+      body {
+        background-color: #000000;
+        font-family: '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
+          sans-serif;
+        font-size: 62.5%;
+        color: #e9f1f8;
+        text-align: center;
+      }
+    </style>
+  </head>
+  <body>
+    <img src="../../en-us/loading/sl_logo_rotate_black.gif" alt="loading" />
+    <br />
+    <p>&nbsp;&nbsp;&nbsp;読み込んでいます…</p>
+  </body>
+</html>
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml b/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
new file mode 100644
index 0000000000..ce4c89a49f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows enabled="false" name="camera_actions" value="">
+    <columns type="icontext" label="Camera" name="lst_action" value="Cam_FreeCam_Off" />
+  </rows>
+  <rows name="look_up" value="look_up">
+    <columns name="lst_action" value="上に向ける" />
+  </rows>
+  <rows name="look_down" value="look_down">
+    <columns name="lst_action" value="下に向ける" />
+  </rows>
+  <rows name="move_forward" value="move_forward">
+    <columns name="lst_action" value="カメラを近づける" />
+  </rows>
+  <rows name="move_backward" value="move_backward">
+    <columns name="lst_action" value="カメラを遠ざける" />
+  </rows>
+  <rows name="move_forward_fast" value="move_forward_fast">
+    <columns name="lst_action" value="カメラを高速に近づける" />
+  </rows>
+  <rows name="move_backward_fast" value="move_backward_fast">
+    <columns name="lst_action" value="カメラを高速に遠ざける" />
+  </rows>
+  <rows name="spin_over" value="spin_over">
+    <columns name="lst_action" value="カメラの仰角を上げる" />
+  </rows>
+  <rows name="spin_under" value="spin_under">
+    <columns name="lst_action" value="カメラの仰角を下げる" />
+  </rows>
+  <rows name="pan_up" value="pan_up">
+    <columns name="lst_action" value="カメラの中心を上に移動" />
+  </rows>
+  <rows name="pan_down" value="pan_down">
+    <columns name="lst_action" value="カメラの中心を下に移動" />
+  </rows>
+  <rows name="pan_left" value="pan_left">
+    <columns name="lst_action" value="カメラの中心を左に移動" />
+  </rows>
+  <rows name="pan_right" value="pan_right">
+    <columns name="lst_action" value="カメラの中心を右に移動" />
+  </rows>
+  <rows name="pan_in" value="pan_in">
+    <columns name="lst_action" value="カメラの中心を拡大" />
+  </rows>
+  <rows name="pan_out" value="pan_out">
+    <columns name="lst_action" value="カメラの中心を縮小" />
+  </rows>
+  <rows name="spin_around_ccw" value="spin_around_ccw">
+    <columns name="lst_action" tool_tip="対象に対して、カメラを反時計回りに回します。" value="反時計回り" />
+  </rows>
+  <rows name="spin_around_cw" value="spin_around_cw">
+    <columns name="lst_action" tool_tip="対象に対して、カメラをカメラを時計回りに回します。" value="時計回り" />
+  </rows>
+  <rows name="move_forward_sitting" value="move_forward_sitting">
+    <columns name="lst_action" value="座ってカメラを近づける" />
+  </rows>
+  <rows name="move_backward_sitting" value="move_backward_sitting">
+    <columns name="lst_action" value="座ってカメラを遠ざける" />
+  </rows>
+  <rows name="spin_over_sitting" value="spin_over_sitting">
+    <columns name="lst_action" value="座ってカメラの仰角を上げる" />
+  </rows>
+  <rows name="spin_under_sitting" value="spin_under_sitting">
+    <columns name="lst_action" value="座ってカメラの仰角を下げる" />
+  </rows>
+  <rows name="spin_around_ccw_sitting" value="spin_around_ccw_sitting">
+    <columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを反時計回りに回します。" value="座って反時計回り" />
+  </rows>
+  <rows name="spin_around_cw_sitting" value="spin_around_cw_sitting">
+    <columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを時計回りに回します。" value="座って時計回り" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
new file mode 100644
index 0000000000..e556a41e57
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <columns label="アクション" name="lst_action" />
+  <columns label="優先コントロール" name="lst_ctrl1" />
+  <columns label="代わり１" name="lst_ctrl2" />
+  <columns label="代わり２" name="lst_ctrl3" />
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml b/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
new file mode 100644
index 0000000000..9a2286b873
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows enabled="false" name="editing_actions" value="">
+    <columns label="編集中" name="lst_action" value="Tool_Dozer" />
+  </rows>
+  <rows name="edit_avatar_spin_ccw" value="edit_avatar_spin_ccw">
+    <columns name="lst_action" tool_tip="アバターを中心にカメラを反時計回りに回します。" value="反時計回り" />
+  </rows>
+  <rows name="edit_avatar_spin_cw" value="edit_avatar_spin_cw">
+    <columns name="lst_action" tool_tip="アバターを中心にカメラを時計回りに回します。" value="時計回り" />
+  </rows>
+  <rows name="edit_avatar_spin_over" value="edit_avatar_spin_over">
+    <columns name="lst_action" tool_tip="アバターに対するカメラの仰角を上げます。" value="カメラの仰角を上げる" />
+  </rows>
+  <rows name="edit_avatar_spin_under" value="edit_avatar_spin_under">
+    <columns name="lst_action" tool_tip="アバターに対するカメラの仰角を下げます。" value="カメラの仰角を下げる" />
+  </rows>
+  <rows name="edit_avatar_move_forward" value="edit_avatar_move_forward">
+    <columns name="lst_action" value="カメラを近づける" />
+  </rows>
+  <rows name="edit_avatar_move_backward" value="edit_avatar_move_backward">
+    <columns name="lst_action" value="カメラを遠ざける" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_media.xml b/indra/newview/skins/default/xui/ja/control_table_contents_media.xml
new file mode 100644
index 0000000000..0d69c10a0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_media.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows enabled="false" name="media_actions" value="">
+    <columns type="icontext" label="サウンドとメディア" name="lst_action" value="Audio_Press" />
+  </rows>
+  <rows name="toggle_pause_media" value="toggle_pause_media">
+    <columns name="lst_action" value="メディアの再生／停止" />
+  </rows>
+  <rows name="toggle_enable_media" value="toggle_enable_media">
+    <columns name="lst_action" value="全てのメディアを再生／停止" />
+  </rows>
+  <rows name="voice_follow_key" value="voice_follow_key">
+    <columns name="lst_action" value="ボイスチャット" />
+  </rows>
+  <rows name="toggle_voice" value="toggle_voice">
+    <columns name="lst_action" value="ボイスチャット切り替え" />
+  </rows>
+  <rows name="start_chat" value="start_chat">
+    <columns name="lst_action" value="チャットを開始" />
+  </rows>
+  <rows name="start_gesture" value="start_gesture">
+    <columns name="lst_action" value="ジェスチャーを開始" />
+  </rows>
+  <rows name="script_trigger_lbutton" value="script_trigger_lbutton">
+    <columns name="lst_action" value="インタラクト（左クリックスクリプト）" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml b/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
new file mode 100644
index 0000000000..f129a7edad
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows enabled="false" name="move_actions" value="">
+    <columns type="icontext" label="移動アクション" name="lst_action" value="Move_Walk_Off" />
+  </rows>
+  <rows name="walk_to" value="walk_to">
+    <columns name="lst_action" tool_tip="マウスカーソルが指している場所に向かって歩きます。" value="移動先" />
+  </rows>
+  <rows name="teleport_to" value="teleport_to">
+    <columns name="lst_action"
+      tool_tip="マウスカーソルが指す場所にテレポートしますが、すべての場所において、必ずしも直接テレポートできるとは限らないため、代わりに目的地の近くにテレポートする場合があります。"
+      value="テレポートする" />
+  </rows>
+  <rows name="push_forward" value="push_forward">
+    <columns name="lst_action" value="前に移動" />
+  </rows>
+  <rows name="push_backward" value="push_backward">
+    <columns name="lst_action" value="後ろに移動" />
+  </rows>
+  <rows name="turn_left" value="turn_left">
+    <columns name="lst_action" value="左を向いて移動" />
+  </rows>
+  <rows name="turn_right" value="turn_right">
+    <columns name="lst_action" value="右を向いて移動" />
+  </rows>
+  <rows name="slide_left" value="slide_left">
+    <columns name="lst_action" value="左へ平行移動" />
+  </rows>
+  <rows name="slide_right" value="slide_right">
+    <columns name="lst_action" value="右へ平行移動" />
+  </rows>
+  <rows name="jump" value="jump">
+    <columns name="lst_action" value="ジャンプ／飛行" />
+  </rows>
+  <rows name="push_down" value="push_down">
+    <columns name="lst_action" value="下降" />
+  </rows>
+  <rows name="run_forward" value="run_forward">
+    <columns name="lst_action" value="前に走る" />
+  </rows>
+  <rows name="run_backward" value="run_backward">
+    <columns name="lst_action" value="後ろに走る" />
+  </rows>
+  <rows name="run_left" value="run_left">
+    <columns name="lst_action" value="左に走る" />
+  </rows>
+  <rows name="run_right" value="run_right">
+    <columns name="lst_action" value="右に走る" />
+  </rows>
+  <rows name="toggle_run" value="toggle_run">
+    <columns name="lst_action" value="常時走行切り替え" />
+  </rows>
+  <rows name="toggle_fly" value="toggle_fly">
+    <columns name="lst_action" value="飛行／停止切り替え" />
+  </rows>
+  <rows name="toggle_sit" value="toggle_sit">
+    <columns name="lst_action" value="座る／立つ" />
+  </rows>
+  <rows name="stop_moving" value="stop_moving">
+    <columns name="lst_action" value="立ち止まる" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_360capture.xml b/indra/newview/skins/default/xui/ja/floater_360capture.xml
new file mode 100644
index 0000000000..f89291fb2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_360capture.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater name="360capture" title="360度スナップショット">
+  <panel name="ui_panel_left">
+    <text name="quality_level_label">品質</text>
+    <radio_group control_name="360QualitySelection" name="360_quality_selection">
+      <radio_item label="プレビュー（高速）" name="preview_quality" tool_tip="プレビュー程度の品質" />
+      <radio_item label="通常" name="medium_quality" value="512" tool_tip="通常品質" />
+      <radio_item label="高" name="high_quality" value="1024" tool_tip="高品質" />
+      <radio_item label="最高品位" name="maximum_quality" value="2048" tool_tip="最高品質" />
+    </radio_group>
+    <check_box label="アバターをすべて隠す" name="360_hide_avatar" />
+    <button label="360度イメージを作成" name="capture_button" />
+    <button label="名前をつけて保存…" name="save_local_button" />
+  </panel>
+  <panel name="ui_panel_right">
+    <text name="statusbar">クリックとドラッグで視点変更</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_aaa.xml b/indra/newview/skins/default/xui/ja/floater_aaa.xml
new file mode 100644
index 0000000000..f120ad6e94
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_aaa.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_minimize="false" can_tear_off="false" can_resize="true" can_drag_on_left="false" can_close="true" can_dock="true" bevel_style="in" height="300" layout="topleft" name="Test Floater" save_rect="true" title="フローターのテスト" save_dock_state="true" save_visibility="true" single_instance="true" width="650">
+  <text left="0" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
+ここに
+記載される
+なんらかの
+テキストは
+上部に
+寄せられて
+います</text>
+  <text left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
+ここに
+記載される
+なんらかの
+テキストは
+中央に
+寄せられて
+います</text>
+  <text left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
+ここに
+記載される
+なんらかの
+テキストは
+下部に
+寄せられて
+います</text>
+  <text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
+ここに
+記載される
+なんらかの
+テキストは
+上部に
+寄せられて
+います</text_editor>
+  <text_editor left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
+ここに
+記載される
+なんらかの
+テキストは
+中央に
+寄せられて
+います</text_editor>
+  <text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
+ここに
+記載される
+なんらかの
+テキストは
+下部に
+寄せられて
+います</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 22a65003d3..35467a008d 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="[CAPITALIZED_APP_NAME] について">
-	<tab_container name="about_tab">
-		<panel label="情報" name="support_panel">
-			<button label="クリップボードにコピー" name="copy_btn"/>
-			<button label="アップデートを確認" name="update_btn"/>
-		</panel>
-		<panel label="クレジット" name="credits_panel">
-			<text name="linden_intro">Second Life の提供元： Lindens の、 
-オープンソースの提供：</text>
-			<text_editor name="contrib_names">Dummy Name は実行時間に置き換え</text_editor>
-		</panel>
-		<panel label="ライセンス" name="licenses_panel">
-			<text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+<floater name="floater_about" title="[CAPITALIZED_APP_NAME]について">
+  <tab_container name="about_tab">
+    <panel label="情報" name="support_panel">
+      <button label="クリップボードへコピー" name="copy_btn" />
+      <button label="更新の確認" name="update_btn" />
+    </panel>
+    <panel label="クレジット" name="credits_panel">
+      <text name="linden_intro">Second Life は Lindens によって開発され、以下のオープンソースの貢献があります：</text>
+      <text_editor name="contrib_names">Dummy Nameは実行時間に置き換えられます。</text_editor>
+    </panel>
+    <panel label="ライセンス" name="licenses_panel">
+      <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
 APR Copyright (C) 2011 The Apache Software Foundation
 Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
 cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -23,6 +22,7 @@ google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
 ogg/vorbis Copyright (C) 2002, Xiphophorus
 OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
 PCRE Copyright (c) 1997-2012 University of Cambridge
@@ -32,13 +32,15 @@ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 xxHash Copyright (C) 2012-2020 Yann Collet.
 zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
-Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
+Second Life ビューアーでは Havok (TM) Physics が使用されています。
+(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).
+無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
 
-このソフトウェアには、NVIDIA Corporation によるソースコードが含まれます。
+このソフトウェアには、NVIDIA Corporationによるソースコードが含まれます。
 
 無断複写・複製・転載を禁じます。詳細については licenses.txt をご参照ください。
 
 ボイスチャットのオーディオコーディング：Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)</text_editor>
-		</panel>
-	</tab_container>
-</floater>
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 4703dfaa34..af69b5ae19 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -1,483 +1,244 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="土地情報">
-	<floater.string name="maturity_icon_general">
-		&quot;Parcel_PG_Dark&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_moderate">
-		&quot;Parcel_M_Dark&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_adult">
-		&quot;Parcel_R_Dark&quot;
-	</floater.string>
-	<floater.string name="Hours">
-		[HOURS] 時間
-	</floater.string>
-	<floater.string name="Hour">
-		時間
-	</floater.string>
-	<floater.string name="Minutes">
-		[MINUTES] 分
-	</floater.string>
-	<floater.string name="Minute">
-		分
-	</floater.string>
-	<floater.string name="Seconds">
-		[SECONDS] 秒
-	</floater.string>
-	<floater.string name="Remaining">
-		残り
-	</floater.string>
-	<floater.string name="Always">
-		常時
-	</floater.string>
-	<tab_container name="landtab">
-		<panel label="一般" name="land_general_panel">
-			<panel.string name="new users only">
-				新規住人専用
-			</panel.string>
-			<panel.string name="anyone">
-				誰でも
-			</panel.string>
-			<panel.string name="area_text">
-				面積：
-			</panel.string>
-			<panel.string name="area_size_text">
-				[AREA] 平方メートル
-			</panel.string>
-			<panel.string name="auction_id_text">
-				オークション ID： [ID]
-			</panel.string>
-			<panel.string name="need_tier_to_modify">
-				この土地を修正変更するには、購入を承認する必要があります。
-			</panel.string>
-			<panel.string name="group_owned_text">
-				（グループ所有）
-			</panel.string>
-			<panel.string name="profile_text">
-				プロフィール
-			</panel.string>
-			<panel.string name="info_text">
-				情報
-			</panel.string>
-			<panel.string name="public_text">
-				（公共）
-			</panel.string>
-			<panel.string name="none_text">
-				（なし）
-			</panel.string>
-			<panel.string name="sale_pending_text">
-				（購入審査中）
-			</panel.string>
-			<panel.string name="no_selection_text">
-				区画が選択されていません。
-			</panel.string>
-			<panel.string name="time_stamp_template">
-				[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-			</panel.string>
-			<text name="Name:">
-				名前：
-			</text>
-			<line_editor name="Name"/>
-			<text name="Description:">
-				説明：
-			</text>
-			<text name="LandType">
-				種類：
-			</text>
-			<text name="LandTypeText">
-				メインランド/ホームステッド
-			</text>
-			<text name="ContentRating">
-				区分：
-			</text>
-			<text name="ContentRatingText">
-				Adult
-			</text>
-			<text name="Owner:">
-				所有者：
-			</text>
-			<text name="Group:">
-				グループ：
-			</text>
-			<button label="設定" label_selected="設定..." name="Set..."/>
-			<check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。グループの土地割り当てによってサポートされます。"/>
-			<button label="譲渡" label_selected="譲渡..." name="Deed..." tool_tip="選択したグループのオフィサーのみ、土地を譲渡できます。"/>
-			<check_box label="所有者が譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。"/>
-			<text name="For Sale:">
-				販売の有無：
-			</text>
-			<text name="Not for sale.">
-				販売対象外
-			</text>
-			<text name="For Sale: Price L$[PRICE].">
-				価格： L$ [PRICE] （L$ [PRICE_PER_SQM] / 平方メートル）
-			</text>
-			<button label="土地を売る" label_selected="土地を販売..." name="Sell Land..."/>
-			<text name="For sale to">
-				販売先：[BUYER]
-			</text>
-			<text name="Sell with landowners objects in parcel.">
-				オブジェクトを一緒に販売
-			</text>
-			<text name="Selling with no objects in parcel.">
-				オブジェクトは販売しない
-			</text>
-			<button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"/>
-			<text name="Claimed:">
-				取得日時：
-			</text>
-			<text name="DateClaimText">
-				2006年8月15日火曜日13:47:25
-			</text>
-			<text name="PriceLabel">
-				面積：
-			</text>
-			<text name="PriceText">
-				4048 m²
-			</text>
-			<text name="Traffic:">
-				交通量:
-			</text>
-			<text name="DwellText">
-				ローディング...
-			</text>
-			<button label="土地の購入" label_selected="土地を購入..." left="130" name="Buy Land..." width="100"/>
-			<button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
-			<button label="スクリプト情報" name="Scripts..." width="100"/>
-			<button label="グループに購入" label_selected="グループ用に購入..." name="Buy For Group..."/>
-			<button label="入場許可を購入" label_selected="入場許可を購入..." left="130" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="100"/>
-			<button label="土地の放棄" label_selected="土地を放棄..." name="Abandon Land..."/>
-			<button label="土地を取り戻す" label_selected="土地の返還を要求..." name="Reclaim Land..."/>
-		</panel>
-		<panel label="約款" name="land_covenant_panel">
-			<panel.string name="can_resell">
-				このリージョン（地域）で購入した土地は、再販できます。
-			</panel.string>
-			<panel.string name="can_not_resell">
-				このリージョン（地域）で購入した土地は、再販できないことがあります。
-			</panel.string>
-			<panel.string name="can_change">
-				このリージョン（地域）で購入した土地は、統合または再分割できます。
-			</panel.string>
-			<panel.string name="can_not_change">
-				このリージョン（地域）で購入した土地は、統合・再分割できないことがあります。
-あります。
-			</panel.string>
-			<text font="SansSerifLarge" name="estate_section_lbl">
-				不動産：
-			</text>
-			<text name="estate_name_text">
-				メインランド
-			</text>
-			<text name="estate_owner_lbl">
-				所有者：
-			</text>
-			<text name="estate_owner_text">
-				（なし）
-			</text>
-			<text_editor name="covenant_editor">
-				この不動産には約款がありません。
-			</text_editor>
-			<text name="covenant_timestamp_text">
-				最後の更新1969年12月31日水曜日16：00：00
-			</text>
-			<text font="SansSerifLarge" name="region_section_lbl">
-				地域：
-			</text>
-			<text name="region_name_text">
-				EricaVille
-			</text>
-			<text name="region_landtype_lbl">
-				種類：
-			</text>
-			<text name="region_landtype_text">
-				メインランド/ホームステッド
-			</text>
-			<text name="region_maturity_lbl">
-				区分：
-			</text>
-			<text name="region_maturity_text">
-				Adult
-			</text>
-			<text name="resellable_lbl">
-				再販：
-			</text>
-			<text name="resellable_clause">
-				このリージョン（地域）にある土地は再販できません。
-			</text>
-			<text name="changeable_lbl">
-				再分割：
-			</text>
-			<text name="changeable_clause">
-				このリージョン（地域）にある土地は統合または分割ができないことがあります。
-			</text>
-		</panel>
-		<panel label="オブジェクト" name="land_objects_panel">
-			<panel.string name="objects_available_text">
-				[MAX] の内 [COUNT]（[AVAILABLE] 利用可能）
-			</panel.string>
-			<panel.string name="objects_deleted_text">
-				[MAX] の内 [COUNT]（[DELETED] を削除）
-			</panel.string>
-			<text name="parcel_object_bonus">
-				オブジェクトボーナス: [BONUS]
-			</text>
-			<text name="Simulator primitive usage:">
-				リージョン（地域）の許容数：
-			</text>
-			<text name="objects_available">
-				[MAX] の内 [COUNT] （[AVAILABLE] 利用可能）
-			</text>
-			<text name="Primitives parcel supports:">
-				区画の許容数：
-			</text>
-			<text name="object_contrib_text">
-				[COUNT]
-			</text>
-			<text name="Primitives on parcel:">
-				区画の負荷：
-			</text>
-			<text name="total_objects_text">
-				[COUNT]
-			</text>
-			<text name="Owned by parcel owner:">
-				区画所有者の所有物：
-			</text>
-			<text name="owner_objects_text">
-				[COUNT]
-			</text>
-			<button label="表示" label_selected="表示" name="ShowOwner"/>
-			<button label="返却" label_selected="返却..." name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します"/>
-			<text name="Set to group:">
-				グループに設定：
-			</text>
-			<text name="group_objects_text">
-				[COUNT]
-			</text>
-			<button label="表示" label_selected="表示" name="ShowGroup"/>
-			<button label="返却" label_selected="返却..." name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します"/>
-			<text name="Owned by others:">
-				他人の所有物：
-			</text>
-			<text name="other_objects_text">
-				[COUNT]
-			</text>
-			<button label="表示" label_selected="表示" name="ShowOther"/>
-			<button label="返却" label_selected="返却..." name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します"/>
-			<text name="Selected / sat upon:">
-				選択済み・決定済み：
-			</text>
-			<text name="selected_objects_text">
-				[COUNT]
-			</text>
-			<text name="Autoreturn">
-				他人のオブジェクトを自動返却（分単位、0 で自動返却なし）：
-			</text>
-			<line_editor left_delta="5" name="clean other time"/>
-			<text name="Object Owners:">
-				オブジェクトの所有者：
-			</text>
-			<button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/>
-			<button label="オブジェクトを返却する" label_selected="オブジェクトの返却..." name="Return objects..."/>
-			<name_list label="カウント" name="owner list">
-				<name_list.columns label="タイプ" name="type"/>
-				<name_list.columns name="online_status"/>
-				<name_list.columns label="名前" name="name"/>
-				<name_list.columns label="数" name="count"/>
-				<name_list.columns label="最新" name="mostrecent"/>
-			</name_list>
-		</panel>
-		<panel label="オプション" name="land_options_panel">
-			<panel.string name="search_enabled_tooltip">
-				この区画を検索結果に表示する
-			</panel.string>
-			<panel.string name="search_disabled_small_tooltip">
-				区画面積が 128 平方メートルかそれ以下のため、このオプションは無効です。
-大きな区画のみ検索に表示させることが可能です。
-			</panel.string>
-			<panel.string name="search_disabled_permissions_tooltip">
-				あなたはこの区画の設定編集ができないため、このオプションは無効です。
-			</panel.string>
-			<panel.string name="mature_check_mature">
-				「Moderate」コンテンツ
-			</panel.string>
-			<panel.string name="mature_check_adult">
-				「Adult」コンテンツ
-			</panel.string>
-			<panel.string name="mature_check_mature_tooltip">
-				あなたの区画情報及びコンテンツは「Moderate」とされています。
-			</panel.string>
-			<panel.string name="mature_check_adult_tooltip">
-				あなたの区画情報及びコンテンツは「Adult」とされています。
-			</panel.string>
-			<panel.string name="landing_point_none">
-				（なし）
-			</panel.string>
-			<panel.string name="push_restrict_text">
-				プッシュ禁止
-			</panel.string>
-			<panel.string name="push_restrict_region_text">
-				プッシュ禁止 （地域設定優先）
-			</panel.string>
-			<text name="allow_label">
-				他の住人への許可：
-			</text>
-			<text name="allow_label0">
-				飛行：
-			</text>
-			<check_box label="全員" name="check fly" tool_tip="チェックを入れるとこの土地での飛行が可能となります。チェックを外すと土地に入る際と通り過ぎるときのみ飛行可能となります。"/>
-			<text name="allow_label2">
-				制作：
-			</text>
-			<check_box label="全員" name="edit objects check" tool_tip="このオプションを選択すると、住人はあなたの土地でオブジェクトの制作や rez ができます。"/>
-			<check_box label="グループ" name="edit group objects check" tool_tip="このオプションを選択すると、区画のグループメンバーは、あなたの土地でオブジェクトの制作や rez ができます。"/>
-			<text name="allow_label3">
-				オブジェクトの進入：
-			</text>
-			<check_box label="全員" name="all object entry check" tool_tip="このオプションを選択すると、住人は他の区画にあるオブジェクトをこの区画に移動することが可能です。"/>
-			<check_box label="グループ" name="group object entry check" tool_tip="このオプションを選択すると、区画のグループメンバーは他の区画にあるオブジェクトをこの区画に移動することが可能です。"/>
-			<text name="allow_label4">
-				スクリプトの実行：
-			</text>
-			<check_box label="全員" name="check other scripts" tool_tip="このオプションを選択すると、住人はアタッチメントなどのスクリプトをあなたの区画で実行できます。"/>
-			<check_box label="グループ" name="check group scripts" tool_tip="このオプションを選択すると、区画のグループメンバーは、アタッチメントなどのスクリプトをあなたの区画で実行できます。"/>
-			<check_box label="安全（ダメージなし）" name="check safe" tool_tip="チェックを入れるとこの土地でのダメージコンバットが無効になり、「安全」に設定されます。 チェックを外すとダメージコンバットが有効になります。"/>
-			<check_box label="プッシュ禁止" name="PushRestrictCheck" tool_tip="スクリプトによるプッシュを禁止します。 このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。"/>
-			<check_box label="検索に区画を表示（週 L$ 30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します"/>
-			<combo_box name="land category">
-				<combo_box.item label="全カテゴリ" name="item0"/>
-				<combo_box.item label="Linden 所在地" name="item1"/>
-				<combo_box.item label="アート&amp;カルチャー" name="item3"/>
-				<combo_box.item label="ビジネス" name="item4"/>
-				<combo_box.item label="教育的" name="item5"/>
-				<combo_box.item label="ゲーム" name="item6"/>
-				<combo_box.item label="たまり場" name="item7"/>
-				<combo_box.item label="新住人に好意的" name="item8"/>
-				<combo_box.item label="公園と自然" name="item9"/>
-				<combo_box.item label="住宅用" name="item10"/>
-				<combo_box.item label="ショッピング" name="item11"/>
-				<combo_box.item label="レンタル" name="item13"/>
-				<combo_box.item label="その他" name="item12"/>
-			</combo_box>
-			<check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip=""/>
-			<text name="Snapshot:">
-				スナップショット：
-			</text>
-			<texture_picker label="" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
-			<text name="allow_see_label">
-				他の区画にいるアバターがこの区画にいるアバターに会ってチャットできます
-			</text>
-			<check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="他の区画のアバターが、この区画にいるアバターに会ってチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。"/>
-			<text name="landing_point">
-				着地点: [LANDING]
-			</text>
-			<button label="設定" label_selected="設定" name="Set" tool_tip="訪問者の着地点の設定を行います。この区画内に立って行ってください。"/>
-			<button label="クリア" label_selected="クリア" name="Clear" tool_tip="着地点をクリア"/>
-			<text name="Teleport Routing: ">
-				テレポート経路：
-			</text>
-			<combo_box name="landing type" tool_tip="テレポート経路 -- あなたの土地へのテレポート経路を選択">
-				<combo_box.item label="不可" name="Blocked"/>
-				<combo_box.item label="着地点" name="LandingPoint"/>
-				<combo_box.item label="どこでも" name="Anywhere"/>
-			</combo_box>
-		</panel>
-		<panel label="メディア" name="land_media_panel">
-			<text name="with media:">
-				種類：
-			</text>
-			<combo_box name="media type" tool_tip="URL が動画、Web ページ、その他のメディアかを指定します"/>
-			<text name="at URL:">
-				ホームページ：
-			</text>
-			<button label="設定" name="set_media_url"/>
-			<text name="Description:">
-				説明：
-			</text>
-			<line_editor name="url_description" tool_tip="「再生」「ロード」ボタンの隣に表示されるテキストです"/>
-			<text name="Media texture:">
-				テクスチャ置き換え：
-			</text>
-			<texture_picker label="" left="120" name="media texture" tool_tip="写真をクリックして選択"/>
-			<text name="replace_texture_help" width="290">
-				このテクスチャを使用するオブジェクトの「再生」をクリックすると、動画や Web ページを表示します。  テクスチャを変更するにはサムネイルを選択してください。
-			</text>
-			<check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。 動作速度と画質が少し低下することがありますが、他のテクスチャのスケーリングや整列が必要になることはありません。"/>
-			<text name="media_size" tool_tip="レンダリングする Web メディアのサイズです。デフォルトの 0 のままにします。">
-				サイズ：
-			</text>
-			<spinner name="media_size_width" tool_tip="レンダリングする Web メディアのサイズです。デフォルトの 0 のままにします。"/>
-			<spinner name="media_size_height" tool_tip="レンダリングする Web メディアのサイズです。デフォルトの 0 のままにします。"/>
-			<text name="pixels">
-				ピクセル
-			</text>
-			<text name="Options:">
-				オプション：
-			</text>
-			<check_box label="ループ" name="media_loop" tool_tip="メディアをループ再生します。  メディアの再生が終わったら、最初から再生し直します。"/>
-		</panel>
-		<panel label="サウンド" name="land_audio_panel">
-			<text name="MusicURL:">
-				音楽 URL：
-			</text>
-			<text name="Sound:">
-				サウンド：
-			</text>
-			<check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local"/>
-			<text name="Avatar Sounds:">
-				アバターのサウンド：
-			</text>
-			<check_box label="全員" name="all av sound check"/>
-			<check_box label="グループ" name="group av sound check"/>
-			<text name="Voice settings:">
-				ボイス：
-			</text>
-			<check_box label="ボイスを有効にする" name="parcel_enable_voice_channel"/>
-			<check_box label="ボイスを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled"/>
-			<check_box label="ボイスをこの区画に限定する" name="parcel_enable_voice_channel_local"/>
-		</panel>
-		<panel label="アクセス" name="land_access_panel">
-			<panel.string name="access_estate_defined">
-				（エステートに限定）
-			</panel.string>
-			<panel.string name="estate_override">
-				1 つ以上のオプションが、不動産レベルで設定されています。
-			</panel.string>
-			<check_box label="誰でも訪問可（このオプションをオフにすると立入禁止ラインが作成されます）" name="public_access"/>
-			<check_box label="18 歳以上である必要があります [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-			<check_box label="支払情報が登録されている必要があります [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="支払情報が登録されていないと、この区画にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-			<check_box label="制約なしにグループ [GROUP] を許可する" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。"/>
-			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。"/>
-			<combo_box name="pass_combo">
-				<combo_box.item label="誰でも" name="Anyone"/>
-				<combo_box.item label="グループ" name="Group"/>
-			</combo_box>
-			<spinner label="価格（L$）：" name="PriceSpin"/>
-			<spinner label="アクセス時間：" name="HoursSpin"/>
-			<text name="OwnerLimited">
-				（不動産所有者がこのオプションに制約を与えている場合があります）
-			</text>
-			<panel name="Allowed_layout_panel">
-				<text label="常に許可" name="AllowedText">
-					常に許可する （[COUNT] 人、最大 [MAX] 人）
-				</text>
-				<name_list name="AccessList" tool_tip="(合計[LISTED] 人、最大 [MAX] 人）"/>
-				<button label="追加" name="add_allowed"/>
-				<button label="削除" label_selected="削除" name="remove_allowed"/>
-			</panel>
-			<panel name="Banned_layout_panel">
-				<text label="禁止" name="BanCheck">
-					禁止する （[COUNT] 人、最大 [MAX] 人）
-				</text>
-				<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人）">
-					<columns label="名前" name="name"/>
-					<columns label="期間" name="duration"/>
-				</name_list>
-				<button label="追加" name="add_banned"/>
-				<button label="削除" label_selected="削除" name="remove_banned"/>
-			</panel>
-		</panel>
-		<panel label="体験" name="land_experiences_panel"/>
-		<panel label="環境" name="land_environment_panel"/>
-	</tab_container>
-</floater>
+  <floater.string name="maturity_icon_general">"Parcel_PG_Dark"</floater.string>
+  <floater.string name="maturity_icon_moderate">"Parcel_M_Dark"</floater.string>
+  <floater.string name="maturity_icon_adult">"Parcel_R_Dark"</floater.string>
+  <floater.string name="Hours">[HOURS]時間</floater.string>
+  <floater.string name="Hour">時間</floater.string>
+  <floater.string name="Minutes">[MINUTES]分</floater.string>
+  <floater.string name="Minute">分</floater.string>
+  <floater.string name="Seconds">[SECONDS]秒</floater.string>
+  <floater.string name="Remaining">残り</floater.string>
+  <floater.string name="Always">常時</floater.string>
+  <tab_container name="landtab">
+    <panel label="一般" name="land_general_panel">
+      <panel.string name="new users only">新規住人専用</panel.string>
+      <panel.string name="anyone">誰でも</panel.string>
+      <panel.string name="area_text">面積：</panel.string>
+      <panel.string name="area_size_text">[AREA]㎡</panel.string>
+      <panel.string name="auction_id_text">オークションＩＤ：[ID]</panel.string>
+      <panel.string name="need_tier_to_modify">この土地を修正変更するには、購入を承認する必要があります。</panel.string>
+      <panel.string name="group_owned_text">（グループ所有）</panel.string>
+      <panel.string name="profile_text">プロフィール</panel.string>
+      <panel.string name="info_text">情報</panel.string>
+      <panel.string name="public_text">（公共）</panel.string>
+      <panel.string name="none_text">（なし）</panel.string>
+      <panel.string name="sale_pending_text">（購入審査中）</panel.string>
+      <panel.string name="no_selection_text">区画が選択されていません。</panel.string>
+      <panel.string name="time_stamp_template">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</panel.string>
+      <text name="Name:">名前：</text>
+      <line_editor name="Name" />
+      <text name="Description:">説明：</text>
+      <text name="LandType">種類：</text>
+      <text name="LandTypeText">メインランド／入植地</text>
+      <text name="ContentRating">区分：</text>
+      <text name="ContentRatingText">Adult</text>
+      <text name="Owner:">所有者：</text>
+      <text name="Group:">グループ：</text>
+      <button label="設定" label_selected="設定…" name="Set..." />
+      <check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。グループの土地割り当てによってサポートされます。" />
+      <button label="譲渡" label_selected="譲渡…" name="Deed..." tool_tip="選択したグループのオフィサーのみ、土地を譲渡できます。" />
+      <check_box label="所有者が譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。" />
+      <text name="For Sale:">販売の有無：</text>
+      <text name="Not for sale.">販売対象外</text>
+      <text name="For Sale: Price L$[PRICE].">価格：L$ [PRICE]（L$ [PRICE_PER_SQM]／㎡）</text>
+      <button label="土地を売る" label_selected="土地を販売…" name="Sell Land..." />
+      <text name="For sale to">販売先：[BUYER]</text>
+      <text name="Sell with landowners objects in parcel.">オブジェクトを一緒に販売</text>
+      <text name="Selling with no objects in parcel.">オブジェクトは販売しない</text>
+      <button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale" />
+      <text name="Claimed:">取得日時：</text>
+      <text name="DateClaimText">2006年8月15日火曜日13:47:25</text>
+      <text name="PriceLabel">面積：</text>
+      <text name="PriceText">4048m²</text>
+      <text name="Traffic:">トラフィック：</text>
+      <text name="DwellText">読み込んでいます…</text>
+      <button label="土地の購入" label_selected="土地を購入…" name="Buy Land..." />
+      <button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。" />
+      <button label="スクリプト情報…" name="Scripts..." />
+      <button label="グループに購入" label_selected="グループ用に購入…" name="Buy For Group..." />
+      <button label="入場許可を購入" label_selected="入場許可を購入…" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" />
+      <button label="土地の放棄" label_selected="土地を放棄…" name="Abandon Land..." />
+      <button label="土地を取り戻す" label_selected="土地の返還を要求…" name="Reclaim Land..." />
+    </panel>
+    <panel label="約款" name="land_covenant_panel">
+      <panel.string name="can_resell">このリージョン（地域）で購入した土地は、再販することができます。</panel.string>
+      <panel.string name="can_not_resell">このリージョン（地域）で購入した土地は、再販することができないことがあります。</panel.string>
+      <panel.string name="can_change">このリージョン（地域）で購入した土地は、結合や再分割することができます。</panel.string>
+      <panel.string name="can_not_change">このリージョン（地域）で購入した土地は、結合や再分割することができないことがあります。</panel.string>
+      <text font="SansSerifLarge" name="estate_section_lbl">不動産：</text>
+      <text name="estate_name_text">メインランド</text>
+      <text name="estate_owner_lbl">所有者：</text>
+      <text name="estate_owner_text">（なし）</text>
+      <text_editor name="covenant_editor">この不動産には約款がありません。</text_editor>
+      <text name="covenant_timestamp_text">最後更新：1969年12月31日水曜日　16：00：00</text>
+      <text font="SansSerifLarge" name="region_section_lbl">地域：</text>
+      <text name="region_name_text">EricaVille</text>
+      <text name="region_landtype_lbl">種類：</text>
+      <text name="region_landtype_text">メインランド／入植地</text>
+      <text name="region_maturity_lbl">区分：</text>
+      <text name="region_maturity_text">Adult</text>
+      <text name="resellable_lbl">再販：</text>
+      <text name="resellable_clause">このリージョン（地域）にある土地は再販できません。</text>
+      <text name="changeable_lbl">再分割：</text>
+      <text name="changeable_clause">このリージョン（地域）にある土地は統合または分割ができないことがあります。</text>
+    </panel>
+    <panel label="オブジェクト" name="land_objects_panel">
+      <panel.string name="objects_available_text">[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）</panel.string>
+      <panel.string name="objects_deleted_text">[MAX]個中[COUNT]個（[DELETED]個を削除しました）</panel.string>
+      <text name="parcel_object_bonus">オブジェクトボーナス：[BONUS]個</text>
+      <text name="Simulator primitive usage:">リージョン全体の最大プリム数：</text>
+      <text name="objects_available">[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）</text>
+      <text name="Primitives parcel supports:">区画で利用可能な最大プリム数：</text>
+      <text name="object_contrib_text">[COUNT]個</text>
+      <text name="Primitives on parcel:">区画で使用中のプリム数：</text>
+      <text name="total_objects_text">[COUNT]個</text>
+      <text name="Owned by parcel owner:">うち区画所有者のプリム数：</text>
+      <text name="owner_objects_text">[COUNT]個</text>
+      <button label="表示" label_selected="表示" name="ShowOwner" />
+      <button label="返却" label_selected="返却…" name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します" />
+      <text name="Set to group:">グループに設定：</text>
+      <text name="group_objects_text">[COUNT]</text>
+      <button label="表示" label_selected="表示" name="ShowGroup" />
+      <button label="返却" label_selected="返却…" name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します" />
+      <text name="Owned by others:">他人の所有物：</text>
+      <text name="other_objects_text">[COUNT]個</text>
+      <button label="表示" label_selected="表示" name="ShowOther" />
+      <button label="返却" label_selected="返却…" name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します" />
+      <text name="Selected / sat upon:">選択済み／決定済み：</text>
+      <text name="selected_objects_text">[COUNT]個</text>
+      <text name="Autoreturn">他者のオブジェクトの自動返却（分単位、０で自動返却なし）：</text>
+      <line_editor name="clean other time" />
+      <text name="Object Owners:">オブジェクトの所有者：</text>
+      <button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します" />
+      <button label="オブジェクトを返却する" label_selected="オブジェクトの返却…" name="Return objects..." />
+      <name_list label="カウント" name="owner list">
+        <name_list.columns label="タイプ" name="type" />
+        <name_list.columns name="online_status" />
+        <name_list.columns label="名前" name="name" />
+        <name_list.columns label="数" name="count" />
+        <name_list.columns label="最新" name="mostrecent" />
+      </name_list>
+    </panel>
+    <panel label="オプション" name="land_options_panel">
+      <panel.string name="search_enabled_tooltip">この区画を検索結果に表示する</panel.string>
+      <panel.string name="search_disabled_small_tooltip">区画面積が１２８㎡かそれ以下のため、このオプションは無効です。
+大きな区画のみ検索に表示させることが可能です。</panel.string>
+      <panel.string name="search_disabled_permissions_tooltip">あなたはこの区画の設定編集ができないため、このオプションは無効です。</panel.string>
+      <panel.string name="mature_check_mature">「Moderate」コンテンツ</panel.string>
+      <panel.string name="mature_check_adult">「Adult」コンテンツ</panel.string>
+      <panel.string name="mature_check_mature_tooltip">あなたの区画情報及びコンテンツは「Moderate」とされています。</panel.string>
+      <panel.string name="mature_check_adult_tooltip">あなたの区画情報及びコンテンツは「Adult」とされています。</panel.string>
+      <panel.string name="landing_point_none">（なし）</panel.string>
+      <panel.string name="push_restrict_text">プッシュ禁止</panel.string>
+      <panel.string name="push_restrict_region_text">プッシュ禁止 （リージョン設定優先）</panel.string>
+      <text name="allow_label">他の住人への許可：</text>
+      <text name="allow_label0">飛行：</text>
+      <check_box label="全員" name="check fly" tool_tip="チェックを入れると、この土地での飛行が可能となります。このチェックを外すと、土地に入る時や通過する時のみ飛行可能となります。" />
+      <text name="allow_label2">制作：</text>
+      <check_box label="全員" name="edit objects check" tool_tip="このオプションを選択すると、住人があなたの土地でオブジェクトの制作や、rezすることができるようになります。" />
+      <check_box label="グループ" name="edit group objects check" tool_tip="このオプションを選択すると、区画のグループメンバーが、あなたの土地でオブジェクトの制作やrezができるようになります。" />
+      <text name="allow_label3">オブジェクトの進入：</text>
+      <check_box label="全員" name="all object entry check" tool_tip="このオプションを選択すると、住人が他の区画にあるオブジェクトをこの区画へ移動することができるようになります。" />
+      <check_box label="グループ" name="group object entry check" tool_tip="このオプションを選択すると、区画のグループメンバーが、他の区画にあるオブジェクトからこの区画へ移動することができるようになります。" />
+      <text name="allow_label4">スクリプトの実行：</text>
+      <check_box label="全員" name="check other scripts" tool_tip="このオプションを選択すると、住人が装着物などのスクリプトの実行をあなたの区画でえるようになります。" />
+      <check_box label="グループ" name="check group scripts" tool_tip="このオプションを選択すると、区画のグループメンバーは、装着物などのスクリプトの実行をあなたの区画で行えるようになります。" />
+      <check_box label="安全（ダメージなし）" name="check safe" tool_tip="このチェックを入れると、この土地での戦闘行為が無効になり、「安全」に設定されます。チェックを外すと戦闘行為が有効になります。" />
+      <check_box label="プッシュ禁止" name="PushRestrictCheck" tool_tip="スクリプトによるプッシュを禁止します。このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。" />
+      <check_box label="検索に区画を表示（週L$ 30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します。" />
+      <combo_box name="land category">
+        <combo_box.item label="全カテゴリ" name="item0" />
+        <combo_box.item label="Linden所在地" name="item1" />
+        <combo_box.item label="芸術と文化" name="item3" />
+        <combo_box.item label="ビジネス" name="item4" />
+        <combo_box.item label="教育的" name="item5" />
+        <combo_box.item label="ゲーム" name="item6" />
+        <combo_box.item label="たまり場" name="item7" />
+        <combo_box.item label="新住民歓迎" name="item8" />
+        <combo_box.item label="公園と自然" name="item9" />
+        <combo_box.item label="住宅用" name="item10" />
+        <combo_box.item label="ショッピング" name="item11" />
+        <combo_box.item label="レンタル" name="item13" />
+        <combo_box.item label="その他" name="item12" />
+      </combo_box>
+      <check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip="" />
+      <text name="Snapshot:">スナップショット：</text>
+      <texture_picker label="" name="snapshot_ctrl" tool_tip="画像をクリックして選択" />
+      <text name="allow_see_label">別の区画にいるアバターが、この区画にいるアバターとチャットできるようになります。</text>
+      <check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="別の区画のアバターが、この区画にいるアバターとチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。" />
+      <text name="landing_point">ランディング地点：[LANDING]</text>
+      <button label="設定" label_selected="設定" name="Set" tool_tip="訪問者が最初に訪れる場所の設定を行います。この区画内に立って行ってください。" />
+      <button label="クリア" label_selected="クリア" name="Clear" tool_tip="ランディング地点をクリアする。" />
+      <text name="Teleport Routing: ">テレポート経路：</text>
+      <combo_box name="landing type" tool_tip="テレポート経路－あなたの土地へのテレポート経路を選択してください。">
+        <combo_box.item label="不可" name="Blocked" />
+        <combo_box.item label="ランディング地点のみ" name="LandingPoint" />
+        <combo_box.item label="どこでも可能" name="Anywhere" />
+      </combo_box>
+    </panel>
+    <panel label="メディア" name="land_media_panel">
+      <text name="with media:">種類：</text>
+      <combo_box name="media type" tool_tip="動画や、Webページ、その他のメディアのＵＲＬを指定します。" />
+      <text name="at URL:">ホームページ：</text>
+      <button label="設定" name="set_media_url" />
+      <text name="Description:">説明：</text>
+      <line_editor name="url_description" tool_tip="「再生」「読み込み」ボタンの隣に表示されるテキストです。" />
+      <text name="Media texture:">テクスチャの差し替え：</text>
+      <texture_picker label="" name="media texture" tool_tip="画像をクリックして選択" />
+      <text name="replace_texture_help">このテクスチャを使用するオブジェクトの「再生」をクリックすると、動画やWebページを表示します。テクスチャを変更するにはサムネイルを選択してください。</text>
+      <check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。動作速度と画質が少し低下することがありますが、他のテクスチャのスケーリングや整列が必要になることはありません。" />
+      <text name="media_size" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。">サイズ：</text>
+      <spinner name="media_size_width" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。" />
+      <spinner name="media_size_height" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。" />
+      <text name="pixels">ピクセル</text>
+      <text name="Options:">オプション：</text>
+      <check_box label="ループ" name="media_loop" tool_tip="メディアをループ再生します。メディアの再生が終わったら、最初から再生し直します。" />
+    </panel>
+    <panel label="サウンド" name="land_audio_panel">
+      <text name="MusicURL:">音楽ＵＲＬ：</text>
+      <text name="Sound:">サウンド：</text>
+      <check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local" />
+      <text name="Avatar Sounds:">アバターのサウンド：</text>
+      <check_box label="全員" name="all av sound check" />
+      <check_box label="グループ" name="group av sound check" />
+      <text name="Voice settings:">ボイス：</text>
+      <check_box label="ボイスチャットを有効にする" name="parcel_enable_voice_channel" />
+      <check_box label="ボイスチャットを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled" />
+      <check_box label="ボイスチャットをこの区画内に限定する" name="parcel_enable_voice_channel_local" />
+    </panel>
+    <panel label="アクセス" name="land_access_panel">
+      <panel.string name="access_estate_defined">（不動産に限定）</panel.string>
+      <panel.string name="estate_override">１つ以上のオプションが、不動産レベルで設定されています。</panel.string>
+      <check_box label="誰でも訪問可（このオプションをオフにすると立入禁止ラインが作成されます）" name="public_access" />
+      <check_box label="１８歳以上である必要があります。[ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、１８歳以上でなければなりません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。" />
+      <check_box label="支払情報が登録されている必要があります。[ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="アカウントに支払情報が登録されていない場合、この区画にアクセスすることはできません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。" />
+      <check_box label="制約なしにグループ[GROUP]を許可する。" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。" />
+      <check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。" />
+      <combo_box name="pass_combo">
+        <combo_box.item label="誰でも" name="Anyone" />
+        <combo_box.item label="グループ" name="Group" />
+      </combo_box>
+      <spinner label="価格（L$）：" name="PriceSpin" />
+      <spinner label="アクセス時間：" name="HoursSpin" />
+      <text name="OwnerLimited">（不動産所有者が、このオプションに制約を与えている場合があります）</text>
+      <panel name="Allowed_layout_panel">
+        <text label="常に許可" name="AllowedText">常に許可する人（[COUNT]人、最大[MAX]人）</text>
+        <name_list name="AccessList" tool_tip="（合計[LISTED]人、最大[MAX]人）" />
+        <button label="追加" name="add_allowed" />
+        <button label="削除" label_selected="削除" name="remove_allowed" />
+      </panel>
+      <panel name="Banned_layout_panel">
+        <text label="バン" name="BanCheck">バンした人（[COUNT]人、最大[MAX]人）</text>
+        <name_list name="BannedList" tool_tip="（合計[LISTED]人、最大[MAX]人）">
+          <columns label="名前" name="name" />
+          <columns label="期間" name="duration" />
+        </name_list>
+        <button label="追加" name="add_banned" />
+        <button label="削除" label_selected="削除" name="remove_banned" />
+      </panel>
+    </panel>
+    <panel label="体験" name="land_experiences_panel" />
+    <panel label="環境" name="land_environment_panel" />
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
index 1c743e1fd2..ea959d9de3 100644
--- a/indra/newview/skins/default/xui/ja/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_activeim" title="アクティブな IM"/>
+<floater name="floater_activeim" title="有効なＩＭ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
new file mode 100644
index 0000000000..fee738726d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_add_payment_method">
+  <floater.string name="continue_url">https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1</floater.string>
+  <panel label="wrapper_panel" name="wrapper_panel">
+    <text name="title_txt">支払い方法を追加してリンデンドルを購入し、Second Lifeをもっと楽しみましょう。</text>
+    <button label="始めましょう" name="continue_btn" />
+    <button label="後で" name="close_btn"/>
+    <text name="image_left_desc">お気に入りのアバターを作成します。店舗やSecond Life Marketplaceにある何百万ものアイテムから選択できます。あなたのスタイルがここにあります。</text>
+    <text name="image_center_desc">お気に入りのパフォーマーやホストに寄付してください。あなたのサポートは、彼らが素晴らしい体験を生み出すのに役立ちます。</text>
+    <text name="image_right_desc">あなたの夢の家を作ります。何百万ものアイテムを購入できるので、あなただけの住まいを作ることができます。</text>
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
index 6736dad336..90113d3257 100644
--- a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
@@ -1,24 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="env_adjust_snapshot" title="個人的な照明">
-	<layout_stack name="outer_stack">
-		<layout_panel name="env_controls">
-			<layout_stack name="settings_stack">
-				<layout_panel>
-					<button label="リセット" name="btn_reset" tool_tip="閉じて共有された環境にリセットする"/>
-					<text name="cloud_map_label">
-						雲の画像：
-					</text>
-				</layout_panel>
-				<layout_panel>
-					<text name="label">
-						太陽：
-					</text>
-					<check_box label="ビーコンを表示" name="sunbeacon"/>
-				</layout_panel>
-				<layout_panel>
-					<check_box label="ビーコンを表示" name="moonbeacon"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <layout_stack name="outer_stack">
+    <!-- If I put in a timeline it would go here -->
+    <layout_panel name="env_controls">
+      <layout_stack name="settings_stack">
+        <layout_panel>
+          <text>周辺：</text>
+          <color_swatch name="ambient_light" />
+          <text >青のホライズン：</text>
+          <color_swatch name="blue_horizon" />
+          <text >青の濃度：</text>
+          <color_swatch name="blue_density" />
+          <button label="リセット" tool_tip="閉じて共有された環境にリセットします。" name="btn_reset" />
+          <text >太陽の色：</text>
+          <color_swatch name="sun_color" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="80">雲の色：:</text>
+          <color_swatch name="cloud_color" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="10" name="cloud_map_label" width="80">雲の画像：:</text>
+          <texture_picker height="63" layout="topleft" left_delta="0" name="cloud_map" top_pad="5" width="60" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="-13" name="cloud_map_label" width="80">水の画像：</text>
+          <texture_picker height="63" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="60" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" visible="true" width="200" height="150">
+          <text follows="left|top" height="10" layout="topleft" left_delta="5" top_pad="5" width="80">靄のホライズン：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="80">靄の濃度：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">雲の量：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1" name="cloud_coverage" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">雲のスケール：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.01" max_val="3" name="cloud_scale" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="15" width="80">シーンのガンマ値：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_pad="5" width="185" can_edit_text="true" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="310" min_height="0" visible="true">
+          <text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">太陽：</text>
+          <sun_moon_trackball name="sun_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="sun" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">方位角：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="sun_azimuth" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">標高：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="sun_elevation" top_pad="5" width="130" can_edit_text="true" />
+          <check_box control_name="sunbeacon" width="60" height="16" label="ビーコンを表示" layout="topleft" name="sunbeacon" left_delta="-5" top_pad="8" follows="left|top" />
+          <text follows="left|top" height="10" layout="topleft" left_pad="95" top="25" width="80">スケール：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.25" max_val="20" name="sun_scale" top_delta="15" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="100">フォーカスの発光量：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-2" max_val="2" name="glow_focus" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">グローサイズ：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1.99" name="glow_size" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="10" width="200">星の輝度：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="500" name="star_brightness" top_pad="5" width="130" can_edit_text="true" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="160" min_height="0" visible="true">
+          <text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">月：</text>
+          <sun_moon_trackball name="moon_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="moon" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">方位角：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="moon_azimuth" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">標高：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="moon_elevation" top_pad="5" width="130" can_edit_text="true" />
+          <check_box control_name="moonbeacon" label="ビーコンを表示" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
index 2bada303ae..78bac0a555 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Anim Preview" title="ANIMATION.ANIM">
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<button label="アップロード（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-</floater>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <button label="アップロード（L$ [AMOUNT]）" name="ok_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
index 20c7298462..207d016bf6 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
@@ -1,186 +1,100 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		動きを初期化できませんでした
-	</floater.string>
-	<floater.string name="anim_too_long">
-		アニメーションファイルの長さは [LENGTH] 秒です。
-
-アニメーションの最大長は [MAX_LENGTH] 秒です。
-	</floater.string>
-	<floater.string name="failed_file_read">
-		アニメーションファイルを読み取れません。
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		ファイルの終端が不完全です。
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		制約定義を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		HIERARCHY ヘッダーが無効です。
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		ROOT または JOINT が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		JOINT 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		OFFSET が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		CHANNELS が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		回転順序を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		回転軸を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		MOTION が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		フレーム数を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		フレーム時間を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		位置の値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		回転値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		変換ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		変換ヘッダーを読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		変換名を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		変換無視値を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		変換相対値を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		変換 outname 値を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		変換行列を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Mergechild 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Mergeparent 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		priority 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		loop 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		easeln 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		easeOut 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Hand morph 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		emote 名を読みとれません。
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		ルートジョイント名が不正です。「hip」を使用してください。
-	</floater.string>
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<spinner label="優先度" name="priority" tool_tip="このアニメーションでどのアニメーションを上書きできるかを決めます"/>
-	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生にします"/>
-	<spinner label="イン（％）" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します"/>
-	<spinner label="アウト（％）" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します"/>
-	<text name="hand_label">
-		手のポーズ
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
-		<combo_box.item label="広げる" name="Spread"/>
-		<combo_box.item label="リラックス" name="Relaxed"/>
-		<combo_box.item label="指を指す・両手" name="PointBoth"/>
-		<combo_box.item label="拳" name="Fist"/>
-		<combo_box.item label="リラックス・左" name="RelaxedLeft"/>
-		<combo_box.item label="指を指す・左" name="PointLeft"/>
-		<combo_box.item label="拳を上げる・左" name="FistLeft"/>
-		<combo_box.item label="リラックス・右" name="RelaxedRight"/>
-		<combo_box.item label="指を指す・右" name="PointRight"/>
-		<combo_box.item label="拳を上げる・右" name="FistRight"/>
-		<combo_box.item label="敬礼・右" name="SaluteRight"/>
-		<combo_box.item label="タイピング" name="Typing"/>
-		<combo_box.item label="ピース・右" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		表情
-	</text>
-	<combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
-		<item label="（なし）" name="[None]"/>
-		<item label="アーーーーー" name="Aaaaah"/>
-		<item label="恐れる" name="Afraid"/>
-		<item label="怒る" name="Angry"/>
-		<item label="満面の笑み" name="BigSmile"/>
-		<item label="退屈" name="Bored"/>
-		<item label="泣く" name="Cry"/>
-		<item label="軽蔑" name="Disdain"/>
-		<item label="恥ずかしがる" name="Embarrassed"/>
-		<item label="しかめっ面" name="Frown"/>
-		<item label="キス" name="Kiss"/>
-		<item label="笑う" name="Laugh"/>
-		<item label="むかつく" name="Plllppt"/>
-		<item label="嫌悪感" name="Repulsed"/>
-		<item label="悲しい" name="Sad"/>
-		<item label="肩をすくめる" name="Shrug"/>
-		<item label="微笑む" name="Smile"/>
-		<item label="驚く" name="Surprise"/>
-		<item label="ウィンク" name="Wink"/>
-		<item label="心配する" name="Worry"/>
-	</combo_box>
-	<text name="preview_label">
-		プレビュー中の動作
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。">
-		<item label="立つ" name="Standing"/>
-		<item label="歩く" name="Walking"/>
-		<item label="座る" name="Sitting"/>
-		<item label="飛ぶ" name="Flying"/>
-	</combo_box>
-	<spinner label="イーズイン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
-	<spinner label="イーズアウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
-	<button name="play_btn" tool_tip="アニメーションを再生する"/>
-	<button name="pause_btn" tool_tip="アニメーションを一時停止する"/>
-	<button name="stop_btn" tool_tip="アニメーションの再生を停止する"/>
-	<text name="bad_animation_text">
-		アニメーションファイルを読み取れません。
-
-Poser 4 からエクスポートした BVH ファイルをお勧めします。
-	</text>
-	<button label="アップロード（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <floater.string name="failed_to_initialize"> 動きを初期化できませんでした </floater.string>
+  <floater.string name="anim_too_long">このアニメーションファイルの長さは[LENGTH]秒です。
+アニメーションの最大長は[MAX_LENGTH]秒です。</floater.string>
+  <floater.string name="failed_file_read">アニメーションファイルを読み取れません。
+[STATUS]</floater.string>
+  <floater.string name="E_ST_OK">Ok </floater.string>
+  <floater.string name="E_ST_EOF">ファイルの終端が不完全です。</floater.string>
+  <floater.string name="E_ST_NO_CONSTRAINT">制約定義を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_FILE">BVHファイルを開けません。</floater.string>
+  <floater.string name="E_ST_NO_HIER">HIERARCHYヘッダーが無効です。</floater.string>
+  <floater.string name="E_ST_NO_JOINT">ROOTまたはJOINTが見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_NAME">JOINT名を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_OFFSET">OFFSETが見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_CHANNELS">CHANNELSが見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_ROTATION">回転順序を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_AXIS">回転軸を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_MOTION">MOTION が見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_FRAMES">フレーム数を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_FRAME_TIME">フレーム時間を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_POS">位置の値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_ROT">回転値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_FILE">変換ファイルを開けません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_HEADER">変換ヘッダーを読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_NAME">変換名を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_IGNORE">変換無視値を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_RELATIVE">変換相対値を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_OUTNAME">変換outname値を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_MATRIX">変換行列を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_MERGECHILD">Mergechild名を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_MERGEPARENT">Mergeparent名を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_PRIORITY">priority値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_LOOP">loop値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_EASEIN">easeln値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_EASEOUT">easeOut値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_HAND">Hand morph値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_EMOTE">emote名を読みとれません。</floater.string>
+  <floater.string name="E_ST_BAD_ROOT">ルートジョイント名が不正です。「hip」を使用してください。</floater.string>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <spinner label="優先度" name="priority" tool_tip="このアニメーションでどのアニメーションを上書きできるかを決めます" />
+  <check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生にします" />
+  <spinner label="イン（％）" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" />
+  <spinner label="アウト（％）" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" />
+  <text name="hand_label">手のポーズ</text>
+  <combo_box name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
+    <combo_box.item label="広げる" name="Spread" />
+    <combo_box.item label="リラックス" name="Relaxed" />
+    <combo_box.item label="指を指す・両手" name="PointBoth" />
+    <combo_box.item label="拳" name="Fist" />
+    <combo_box.item label="リラックス・左" name="RelaxedLeft" />
+    <combo_box.item label="指を指す・左" name="PointLeft" />
+    <combo_box.item label="拳を上げる・左" name="FistLeft" />
+    <combo_box.item label="リラックス・右" name="RelaxedRight" />
+    <combo_box.item label="指を指す・右" name="PointRight" />
+    <combo_box.item label="拳を上げる・右" name="FistRight" />
+    <combo_box.item label="敬礼・右" name="SaluteRight" />
+    <combo_box.item label="タイピング" name="Typing" />
+    <combo_box.item label="ピース・右" name="PeaceRight" />
+  </combo_box>
+  <text name="emote_label">表情</text>
+  <combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
+    <item label="（なし）" name="[None]" />
+    <item label="アーーーーー" name="Aaaaah" />
+    <item label="恐れる" name="Afraid" />
+    <item label="怒る" name="Angry" />
+    <item label="満面の笑み" name="BigSmile" />
+    <item label="退屈" name="Bored" />
+    <item label="泣く" name="Cry" />
+    <item label="軽蔑" name="Disdain" />
+    <item label="恥ずかしがる" name="Embarrassed" />
+    <item label="しかめっ面" name="Frown" />
+    <item label="キス" name="Kiss" />
+    <item label="笑う" name="Laugh" />
+    <item label="むかつく" name="Plllppt" />
+    <item label="嫌悪感" name="Repulsed" />
+    <item label="悲しい" name="Sad" />
+    <item label="肩をすくめる" name="Shrug" />
+    <item label="微笑む" name="Smile" />
+    <item label="驚く" name="Surprise" />
+    <item label="ウィンク" name="Wink" />
+    <item label="心配する" name="Worry" />
+  </combo_box>
+  <text name="preview_label">プレビュー中の動作</text>
+  <combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。">
+    <item label="立つ" name="Standing" />
+    <item label="歩く" name="Walking" />
+    <item label="座る" name="Sitting" />
+    <item label="飛ぶ" name="Flying" />
+  </combo_box>
+  <spinner label="イーズ・イン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）" />
+  <spinner label="イーズ・アウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）" />
+  <button name="play_btn" tool_tip="アニメーションを再生する。" />
+  <button name="pause_btn" tool_tip="アニメーションを一時停止する。" />
+  <button name="stop_btn" tool_tip="アニメーションの再生を停止する。" />
+  <text name="bad_animation_text"> アニメーションファイルを読み取れません。Poser 4からエクスポートしたBVHファイルをお勧めします。</text>
+  <button label="アップロード（L$ [AMOUNT]）" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_associate_listing.xml b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
index b106750a6f..3f5c0237e3 100644
--- a/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="associate listing" title="リストを関連付ける">
-	<text name="message">リスト ID:</text>
-	<line_editor name="listing_id">ここに ID を入力</line_editor>
-	<button label="OK" name="OK"/>
-	<button label="取り消し" name="Cancel"/>
-</floater>
+<floater name="associate listing" title="一覧の関連付け">
+  <text name="message">一覧ＩＤ：</text>
+  <line_editor name="listing_id">ここにＩＤを入力</line_editor>
+  <button label="ＯＫ" name="OK" />
+  <button label="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
index 21c8d90b01..418e43e2cb 100644
--- a/indra/newview/skins/default/xui/ja/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ja/floater_auction.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_auction" title="リンデンランドの販売開始">
-	<floater.string name="already for sale">
-		販売中の区画をオークションに出品することはできません。
-	</floater.string>
-	<check_box initial_value="true" label="黄色のセレクションフェンスを含める" name="fence_check"/>
-	<button label="スナップショット" label_selected="スナップショット" name="snapshot_btn"/>
-	<button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn"/>
-	<button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn"/>
-	<button label="オークション開始" label_selected="オークション開始" name="start_auction_btn"/>
-</floater>
+  <floater.string name="already for sale">販売中の区画をオークションに出品することはできません。</floater.string>
+  <check_box initial_value="true" label="黄色のセレクションフェンスを含める" name="fence_check" />
+  <button label="スナップショット" label_selected="スナップショット" name="snapshot_btn" />
+  <button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn" />
+  <button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn" />
+  <button label="オークション開始" label_selected="オークション開始" name="start_auction_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
index cf75fa3372..46e2e3e631 100644
--- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -1,38 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="autoreplace_floater" title="自動置換設定">
-	<check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます"/>
-	<button label="リストをインポート..." name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。"/>
-	<button label="リストをエクスポート..." name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。"/>
-	<button label="新規リスト..." name="autoreplace_new_list" tool_tip="新規リストを作成します。"/>
-	<button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。"/>
-	<button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。"/>
-	<button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。"/>
-	<scroll_list name="autoreplace_list_replacements">
-		<scroll_list.columns label="キーワード" name="keyword"/>
-		<scroll_list.columns label="置換" name="replacement"/>
-	</scroll_list>
-	<button label="追加..." name="autoreplace_add_entry"/>
-	<button label="削除" name="autoreplace_delete_entry"/>
-	<text name="autoreplace_keyword_txt">
-		キーワード：
-	</text>
-	<text name="autoreplace_replacement_txt">
-		置換：
-	</text>
-	<button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。"/>
-	<button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。"/>
-	<button label="取り消し" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。"/>
+  <check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます" />
+  <button label="リストをインポート…" name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。" />
+  <button label="リストをエクスポート…" name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。" />
+  <button label="新規リスト…" name="autoreplace_new_list" tool_tip="新規リストを作成します。" />
+  <button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。" />
+  <button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。" />
+  <button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。" />
+  <scroll_list name="autoreplace_list_replacements">
+    <scroll_list.columns label="キーワード" name="keyword" />
+    <scroll_list.columns label="置換" name="replacement" />
+  </scroll_list>
+  <button label="追加…" name="autoreplace_add_entry" />
+  <button label="削除" name="autoreplace_delete_entry" />
+  <text name="autoreplace_keyword_txt">キーワード：</text>
+  <text name="autoreplace_replacement_txt">置換：</text>
+  <button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。" />
+  <button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。" />
+  <button label="キャンセル" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。" />
 </floater>
 <!--
-  <text 
-   top_pad="10"
-   left="10"
-   height="16"
-   width="260"
-   follows="left|top"
-   halign="center"
-   mouse_opaque="true"
-   name="autoreplace_text2">
-    Entries
-  </text>
--->
+  <text top_ name="autoreplace_text2">エントリ</text>
+-->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml
index d289580506..167a9b1fb4 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Avatar" title="アバターを選択"/>
+<floater name="Avatar" title="アバター選択" />
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index da2c9d1e58..ada91aa554 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
@@ -1,57 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="275" name="avatarpicker" title="住人を選択" width="275">
-	<floater.string name="not_found">
-		「[TEXT]」は見つかりませんでした
-	</floater.string>
-	<floater.string name="not_found_text">
-		住人が見つかりませんでした。
-	</floater.string>
-	<floater.string name="no_one_near">
-		近くに誰もいません
-	</floater.string>
-	<floater.string name="no_results">
-		検索結果：ゼロ
-	</floater.string>
-	<floater.string name="searching">
-		検索中...
-	</floater.string>
-	<string label="OK" label_selected="OK" name="Select">
-		選択
-	</string>
-	<string name="Close">
-		閉じる
-	</string>
-	<tab_container name="ResidentChooserTabs" width="265">
-		<panel label="検索" name="SearchPanel" width="145">
-			<text name="InstructSearchResidentName">
-				名前の一部を入力：
-			</text>
-			<button label="検索" label_selected="検索" name="Find"/>
-			<scroll_list name="SearchResults">
-				<columns label="名前" name="name"/>
-				<columns label="ユーザー名" name="username"/>
-			</scroll_list>
-		</panel>
-		<panel label="フレンド" name="FriendsPanel">
-			<text name="InstructSelectFriend">
-				アバターを選択：
-			</text>
-		</panel>
-		<panel label="自分の近く" name="NearMePanel" width="145">
-			<text name="InstructSelectResident">
-				近くの人を選択：
-			</text>
-			<slider label="範囲" name="near_me_range"/>
-			<text name="meters" width="50">
-				メートル
-			</text>
-			<button label="リスト更新" label_selected="リスト更新" name="Refresh"/>
-			<scroll_list name="NearMe">
-				<columns label="名前" name="name"/>
-				<columns label="ユーザー名" name="username"/>
-			</scroll_list>
-		</panel>
-	</tab_container>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
-</floater>
+<floater name="avatarpicker" title="住人を選択">
+  <floater.string name="not_found">「[TEXT]」は見つかりませんでした</floater.string>
+  <floater.string name="not_found_text">住人が見つかりませんでした。</floater.string>
+  <floater.string name="no_one_near">近くに誰もいません</floater.string>
+  <floater.string name="no_results">検索結果：なし</floater.string>
+  <floater.string name="searching">検索しています…</floater.string>
+  <!-- For multiple person selection, use "Select" and "Close" 
+    instead of "OK" and "Cancel" because "Cancel" still keeps the ones 
+    you have already selected.  The code will show the appropriate
+    set of buttons. -->
+  <string label="ＯＫ" label_selected="ＯＫ" name="Select">選択</string>
+  <string name="Close">閉じる</string>
+  <tab_container name="ResidentChooserTabs">
+    <panel label="検索" name="SearchPanel">
+      <text name="InstructSearchResidentName">名前の一部を入力：</text>
+      <line_editor name="Edit" />
+      <button label="実行" label_selected="実行" name="Find" />
+      <scroll_list name="SearchResults">
+        <columns label="名前" name="name" />
+        <columns label="ユーザ名" name="username" />
+      </scroll_list>
+    </panel>
+    <panel label="フレンド" name="FriendsPanel">
+      <text name="InstructSelectFriend">人物を選択</text>
+      <button name="RefreshFriends" />
+      <scroll_list name="Friends" />
+    </panel>
+
+    <panel label="近くにいる人" name="NearMePanel">
+      <text name="InstructSelectResident">近くにいる人を選択：</text>
+      <slider label="範囲" name="near_me_range" />
+      <text name="meters">メートル</text>
+      <button name="Refresh" />
+      <scroll_list name="NearMe">
+        <columns label="名前" name="name" />
+        <columns label="ユーザ名" name="username" />
+      </scroll_list>
+    </panel>
+  </tab_container>
+  <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
index 0d16510c92..e51bd0e935 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_avatar_render_settings" title="アバターの描画設定">
-	<string name="av_never_render" value="使用しない"/>
-	<string name="av_always_render" value="常に使用する"/>
-	<filter_editor label="人をフィルター" name="people_filter_input"/>
-	<menu_button name="plus_btn" tool_tip="選択した人に対するアクション:"/>
-	<name_list name="render_settings_list">
-		<name_list.columns label="名前" name="name"/>
-		<name_list.columns label="描画設定" name="setting"/>
-		<name_list.columns label="日付を追加" name="timestamp"/>
-	</name_list>
-</floater>
+  <string name="av_never_render" value="使用しない" />
+  <string name="av_always_render" value="常に使用する" />
+  <filter_editor label="人物をフィルタ" name="people_filter_input" />
+  <menu_button name="plus_btn" tool_tip="選択した人に対するアクション：" />
+  <name_list name="render_settings_list">
+    <name_list.columns label="名前" name="name" />
+    <name_list.columns label="描画設定" name="setting" />
+    <name_list.columns label="日付を追加" name="timestamp" />
+  </name_list>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index 19b3be60b1..8d1399f3b3 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -1,60 +1,64 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="アバターのテクスチャ">
-	<floater.string name="InvalidAvatar">無効なアバター</floater.string>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<text name="label">ベークド
+  <floater.string name="InvalidAvatar">無効なアバター</floater.string>
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <text name="label">ベークド
 テクスチャ</text>
-			<text name="composite_label">合成
-テクスチャ</text>
-			<button label="ID をコンソールにダンプ" label_selected="ダンプ" name="Dump"/>
-			<panel name="scroll_content_panel">
-				<texture_picker label="髪" name="hair-baked"/>
-				<texture_picker label="髪" name="hair_grain"/>
-				<texture_picker label="髪のアルファ" name="hair_alpha"/>
-				<texture_picker label="頭" name="head-baked"/>
-				<texture_picker label="メイクアップ" name="head_bodypaint"/>
-				<texture_picker label="頭部のアルファ" name="head_alpha"/>
-				<texture_picker label="頭部のタトゥー" name="head_tattoo"/>
-				<texture_picker label="目" name="eyes-baked"/>
-				<texture_picker label="目" name="eyes_iris"/>
-				<texture_picker label="目のアルファ" name="eyes_alpha"/>
-				<texture_picker label="上半身" name="upper-baked"/>
-				<texture_picker label="ボディペイント（上）" name="upper_bodypaint"/>
-				<texture_picker label="下着シャツ" name="upper_undershirt"/>
-				<texture_picker label="手袋" name="upper_gloves"/>
-				<texture_picker label="シャツ" name="upper_shirt"/>
-				<texture_picker label="上着" name="upper_jacket"/>
-				<texture_picker label="アルファ（上）" name="upper_alpha"/>
-				<texture_picker label="上部のタトゥー" name="upper_tattoo"/>
-				<texture_picker label="下半身" name="lower-baked"/>
-				<texture_picker label="ボディペイント（下）" name="lower_bodypaint"/>
-				<texture_picker label="下着パンツ" name="lower_underpants"/>
-				<texture_picker label="靴下" name="lower_socks"/>
-				<texture_picker label="靴" name="lower_shoes"/>
-				<texture_picker label="パンツ" name="lower_pants"/>
-				<texture_picker label="ジャケット" name="lower_jacket"/>
-				<texture_picker label="アルファ（下）" name="lower_alpha"/>
-				<texture_picker label="下部のタトゥー" name="lower_tattoo"/>
-				<texture_picker label="スカート" name="skirt-baked"/>
-				<texture_picker label="スカート" name="skirt"/>
-			</panel>
-		</panel>
-		<texture_picker name="upper_universal_tattoo" label="上腕 タトゥー"/>
-		<texture_picker name="aux1_tattoo" label="予備 1 タトゥー"/>
-		<texture_picker name="leftarm-baked" label="左腕"/>
-		<texture_picker name="aux1-baked" label="予備 1"/>
-		<texture_picker name="skirt_tattoo" label="スカートタトゥー"/>
-		<texture_picker name="aux2_tattoo" label="予備 2 タトゥー"/>
-		<texture_picker name="eyes_tattoo" label="アイタトゥー"/>
-		<texture_picker name="head_universal_tattoo" label="頭 Unv タトゥー"/>
-		<texture_picker name="leftleg_tattoo" label="左脚タトゥー"/>
-		<texture_picker name="aux3-baked" label="予備 3"/>
-		<texture_picker name="hair_tattoo" label="ヘアータトゥー"/>
-		<texture_picker name="leftleg-baked" label="左脚"/>
-		<texture_picker name="aux2-baked" label="予備 2"/>
-		<texture_picker name="aux3_tattoo" label="予備 3 タトゥー"/>
-		<texture_picker name="leftarm_tattoo" label="左腕タトゥー"/>
-		<texture_picker name="lower_universal_tattoo" label="下腕タトゥー"/>
-	</scroll_container>
+      <text name="composite_label">合成テクスチャ</text>
+      <button label="ＩＤをコンソールにダンプ" label_selected="ダンプ" name="Dump" />
+      <panel name="scroll_content_panel">
+        <texture_picker label="髪" name="hair-baked" />
+        <texture_picker label="髪" name="hair_grain" />
+        <texture_picker label="髪のアルファ" name="hair_alpha" />
+        <texture_picker label="髪のタトゥ" name="hair_tattoo" />
+
+        <texture_picker label="頭" name="head-baked" />
+        <texture_picker label="メイクアップ" name="head_bodypaint" />
+        <texture_picker label="頭部のアルファ" name="head_alpha" />
+        <texture_picker label="頭部のタトゥ" name="head_tattoo" />
+        <texture_picker label="頭部全般のタトゥ" name="head_universal_tattoo" />
+
+        <texture_picker label="目" name="eyes-baked" />
+        <texture_picker label="目" name="eyes_iris" />
+        <texture_picker label="目のアルファ" name="eyes_alpha" />
+        <texture_picker label="目のタトゥ" name="eyes_tattoo" />
+
+        <texture_picker label="上半身" name="upper-baked" />
+        <texture_picker label="上半身のボディペイント" name="upper_bodypaint" />
+        <texture_picker label="上半身の下着" name="upper_undershirt" />
+        <texture_picker label="手袋" name="upper_gloves" />
+        <texture_picker label="シャツ" name="upper_shirt" />
+        <texture_picker label="上着" name="upper_jacket" />
+        <texture_picker label="上半身のアルファ" name="upper_alpha" />
+        <texture_picker label="上半身のタトゥ" name="upper_tattoo" />
+        <texture_picker label="上半身全般のタトゥ" name="upper_universal_tattoo" />
+
+        <texture_picker label="下半身" name="lower-baked" />
+        <texture_picker label="下半身のボディペイント" name="lower_bodypaint" />
+        <texture_picker label="下半身の下着" name="lower_underpants" />
+        <texture_picker label="靴下" name="lower_socks" />
+        <texture_picker label="靴" name="lower_shoes" />
+        <texture_picker label="ズボン" name="lower_pants" />
+        <texture_picker label="ジャケット" name="lower_jacket" />
+        <texture_picker label="下半身のアルファ" name="lower_alpha" />
+        <texture_picker label="下半身のタトゥ" name="lower_tattoo" />
+        <texture_picker label="スカート" name="skirt-baked" />
+        <texture_picker label="スカート" name="skirt" />
+        <texture_picker label="スカートのタトゥ" name="skirt_tattoo" />
+        <texture_picker label="下半身全般のタトゥ" name="lower_universal_tattoo" />
+
+        <texture_picker label="左腕" name="leftarm-baked" />
+        <texture_picker label="左腕のタトゥ" name="leftarm_tattoo" />
+        <texture_picker label="左足" name="leftleg-baked" />
+        <texture_picker label="左足のタトゥ" name="leftleg_tattoo" />
+        <texture_picker label="予備１" name="aux1-baked" />
+        <texture_picker label="予備１タトゥ" name="aux1_tattoo" />
+        <texture_picker label="予備２" name="aux2-baked" />
+        <texture_picker label="予備２タトゥ" name="aux2_tattoo" />
+        <texture_picker label="予備３" name="aux3-baked" />
+        <texture_picker label="予備３タトゥ" name="aux3_tattoo" />
+      </panel>
+    </panel>
+  </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_ban_duration.xml b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
index a9d00b0116..53a9c58a98 100644
--- a/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ban_duration" title="禁止期間">
-	<text name="duration_textbox">
-		禁止期間：
-	</text>
-	<radio_group name="ban_duration_radio">
-		<radio_item label="常時" name="always_radio">
-			常時
-		</radio_item>
-		<radio_item label="一時的" name="temporary_radio">
-			一時的
-		</radio_item>
-	</radio_group>
-	<text name="hours_textbox">
-		時間
-	</text>
-	<button label="Ok" name="ok_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+<floater name="ban_duration" title="バン期間">
+  <text name="duration_textbox">バンする期間：</text>
+  <radio_group name="ban_duration_radio">
+    <radio_item label="常時" name="always_radio">常時</radio_item>
+    <radio_item label="一時的" name="temporary_radio">一時的</radio_item>
+  </radio_group>
+  <text name="hours_textbox">時間</text>
+  <button label="Ok" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index cb3dae0644..2f7f5c5ca2 100644
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="beacons" title="ビーコン（標識）">
-	<panel name="beacons_panel">
-		<text name="label_show">
-			表示：
-		</text>
-		<check_box label="ビーコン（標識）" name="beacons"/>
-		<check_box label="ハイライト" name="highlights"/>
-		<text name="beacon_width_label" tool_tip="ビーコン（標識）の幅">
-			幅：
-		</text>
-		<text name="label_objects">
-			対象オブジェクト：
-		</text>
-		<check_box label="物理的" name="physical"/>
-		<check_box label="スクリプト" name="scripted"/>
-		<check_box label="触れる" name="touch_only"/>
-		<check_box label="音源" name="sounds"/>
-		<check_box label="パーティクル源" name="particles"/>
-		<check_box label="メディア源" name="moapbeacon"/>
-		<check_box label="太陽" name="sun"/>
-		<check_box label="月" name="moon"/>
-	</panel>
-</floater>
+  <panel name="beacons_panel">
+    <text name="label_show">表示：</text>
+    <check_box label="ビーコン（標識）" name="beacons" />
+    <check_box label="ハイライト" name="highlights" />
+    <text name="beacon_width_label" tool_tip="ビーコン（標識）の幅">幅：</text>
+    <text name="label_objects">対象オブジェクト：</text>
+    <check_box label="物理的" name="physical" />
+    <check_box label="スクリプト" name="scripted" />
+    <check_box label="触れる" name="touch_only" />
+    <check_box label="音源" name="sounds" />
+    <check_box label="パーティクル源" name="particles" />
+    <check_box label="メディア源" name="moapbeacon" />
+    <text name="label_objects">以下の向きを示す：</text>
+    <check_box label="太陽" name="sun" />
+    <check_box label="月" name="moon" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_big_preview.xml b/indra/newview/skins/default/xui/ja/floater_big_preview.xml
index bb55db7a13..69cf50947f 100644
--- a/indra/newview/skins/default/xui/ja/floater_big_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_big_preview.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="プレビュー"/>
+<floater name="floater_big_preview" title="プレビュー" />
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 6865409e7a..458b4fbfe4 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -1,34 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="グリッドオプション">
-	<floater.string name="grid_screen_text">
-		画面
-	</floater.string>
-	<floater.string name="grid_local_text">
-		ローカル
-	</floater.string>
-	<floater.string name="grid_world_text">
-		世界
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		リファレンス
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		アタッチメント
-	</floater.string>
-	<text name="grid_mode_label" tool_tip="グリッドの不透明度">
-		モード
-	</text>
-	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択">
-		<combo_box.item label="インワールドグリッド" name="World"/>
-		<combo_box.item label="ローカルグリッド" name="Local"/>
-		<combo_box.item label="リファレンスグリッド" name="Reference"/>
-	</combo_box>
-	<spinner label="単位（メートル）" name="GridResolution"/>
-	<spinner label="範囲（メートル）" name="GridDrawSize"/>
-	<check_box label="より細かい単位でスナップフィット" name="GridSubUnit"/>
-	<check_box label="横断面を表示" name="GridCrossSection"/>
-	<text name="grid_opacity_label" tool_tip="グリッドの不透明度">
-		不透明度：
-	</text>
-	<slider label="グリッドの不透明度" name="GridOpacity"/>
-</floater>
+  <floater.string name="grid_screen_text">画面</floater.string>
+  <floater.string name="grid_local_text">ローカル</floater.string>
+  <floater.string name="grid_world_text">世界</floater.string>
+  <floater.string name="grid_reference_text">リファレンス</floater.string>
+  <floater.string name="grid_attachment_text">装着物</floater.string>
+  <text name="grid_mode_label" tool_tip="グリッドの不透明度">モード</text>
+  <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択">
+    <combo_box.item label="インワールドグリッド" name="World" />
+    <combo_box.item label="ローカルグリッド" name="Local" />
+    <combo_box.item label="リファレンスグリッド" name="Reference" />
+  </combo_box>
+  <spinner label="単位（メートル）" name="GridResolution" />
+  <spinner label="範囲（メートル）" name="GridDrawSize" />
+  <check_box label="より細かい単位でスナップフィット" name="GridSubUnit" />
+  <check_box label="横断面を表示" name="GridCrossSection" />
+  <text name="grid_opacity_label" tool_tip="グリッドの不透明度">不透明度：</text>
+  <slider label="グリッドの不透明度" name="GridOpacity" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index fc9b35a34d..b0a8298b06 100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,56 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterbulkperms" title="コンテンツ権限を調整">
-	<floater.string name="nothing_to_modify_text">
-		選択した中に編集できないものが含まれています
-	</floater.string>
-	<floater.string name="status_text">
-		[NAME]に権限を設定中です。
-	</floater.string>
-	<floater.string name="start_text">
-		権限変更リクエストをしています
-	</floater.string>
-	<floater.string name="done_text">
-		権限変更リクエストが完了しました
-	</floater.string>
-	<check_box label="アニメーション" name="check_animation"/>
-	<icon name="icon_animation" tool_tip="アニメーション"/>
-	<check_box label="身体部位" name="check_bodypart"/>
-	<icon name="icon_bodypart" tool_tip="身体部位"/>
-	<check_box label="服" name="check_clothing"/>
-	<icon name="icon_clothing" tool_tip="衣類"/>
-	<check_box label="ジェスチャー" name="check_gesture"/>
-	<icon name="icon_gesture" tool_tip="ジェスチャー"/>
-	<check_box label="ノートカード" name="check_notecard"/>
-	<icon name="icon_notecard" tool_tip="ノートカード"/>
-	<check_box label="オブジェクト" name="check_object"/>
-	<icon name="icon_object" tool_tip="オブジェクト"/>
-	<check_box label="スクリプト" name="check_script"/>
-	<icon name="icon_script" tool_tip="スクリプト"/>
-	<check_box label="サウンド" name="check_sound"/>
-	<icon name="icon_sound" tool_tip="サウンド"/>
-	<check_box label="テクスチャ" name="check_texture"/>
-	<icon name="icon_texture" tool_tip="テクスチャ"/>
-	<icon name="icon_setting" tool_tip="自然環境の設定"/>
-	<button label="すべてに √" label_selected="全て" name="check_all"/>
-	<button label="クリア" label_selected="なし" name="check_none"/>
-	<text name="newperms">
-		コンテンツ権限を以下に調整
-	</text>
-	<text name="GroupLabel">
-		グループ：
-	</text>
-	<check_box label="共有" name="share_with_group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。"/>
-	<text name="AnyoneLabel">
-		全員：
-	</text>
-	<check_box label="コピー" name="everyone_copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります"/>
-	<text name="NextOwnerLabel">
-		次の所有者：
-	</text>
-	<check_box label="修正" name="next_owner_modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-	<check_box label="コピー" name="next_owner_copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-	<check_box initial_value="true" label="再販・プレゼント" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
-	<button label="OK" name="ok"/>
-	<button label="適用" name="apply"/>
-	<button label="キャンセル" name="close"/>
-</floater>
+  <floater.string name="nothing_to_modify_text">選択した中に編集できないものが含まれています。</floater.string>
+  <floater.string name="status_text">[NAME]に権限を設定中です。</floater.string>
+  <floater.string name="start_text">権限変更リクエストをしています。</floater.string>
+  <floater.string name="done_text">権限変更リクエストが完了しました。</floater.string>
+  <check_box label="アニメーション" name="check_animation" />
+  <icon name="icon_animation" tool_tip="アニメーション" />
+  <check_box label="身体部位" name="check_bodypart" />
+  <icon name="icon_bodypart" tool_tip="身体部位" />
+  <check_box label="服装" name="check_clothing" />
+  <icon name="icon_clothing" tool_tip="服装" />
+  <check_box label="ジェスチャー" name="check_gesture" />
+  <icon name="icon_gesture" tool_tip="ジェスチャー" />
+  <check_box label="ノートカード" name="check_notecard" />
+  <icon name="icon_notecard" tool_tip="ノートカード" />
+  <check_box label="オブジェクト" name="check_object" />
+  <icon name="icon_object" tool_tip="オブジェクト" />
+  <check_box label="スクリプト" name="check_script" />
+  <icon name="icon_script" tool_tip="スクリプト" />
+  <check_box label="サウンド" name="check_sound" />
+  <icon name="icon_sound" tool_tip="サウンド" />
+  <check_box label="テクスチャ" name="check_texture" />
+  <icon name="icon_texture" tool_tip="テクスチャ" />
+  <icon name="icon_setting" tool_tip="自然環境の設定" />
+  <button label="すべてに √" label_selected="全て" name="check_all" />
+  <button label="クリア" label_selected="なし" name="check_none" />
+  <text name="newperms">コンテンツ権限を以下に調整</text>
+  <text name="GroupLabel">グループ：</text>
+  <check_box label="共有" name="share_with_group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
+  <text name="AnyoneLabel">全員：</text>
+  <check_box label="コピー" name="everyone_copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります" />
+  <text name="NextOwnerLabel">次の所有者：</text>
+  <check_box label="修正" name="next_owner_modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+  <check_box label="コピー" name="next_owner_copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
+  <check_box initial_value="true" label="再販・譲渡" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。" />
+  <button label="ＯＫ" name="ok" />
+  <button label="適用" name="apply" />
+  <button label="キャンセル" name="close" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index 62f8a0669e..15905ad51a 100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -1,24 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_bumps" title="衝突・プッシュ・打撃">
-	<floater.string name="none_detected">
-		検出なし
-	</floater.string>
-	<floater.string name="bump">
-		[TIME]  [NAME] があなたに衝突しました
-	</floater.string>
-	<floater.string name="llpushobject">
-		[TIME]  [NAME] がスクリプトであなたを押しました
-	</floater.string>
-	<floater.string name="selected_object_collide">
-		[TIME]  [NAME] がオブジェクトであなたをたたきました
-	</floater.string>
-	<floater.string name="scripted_object_collide">
-		[TIME]  [NAME] がスクリプトのオブジェクトであなたをたたきました
-	</floater.string>
-	<floater.string name="physical_object_collide">
-		[TIME]  [NAME] が物理的オブジェクトであなたをたたきました
-	</floater.string>
-	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
-	</floater.string>
-</floater>
+  <floater.string name="none_detected">検出なし</floater.string>
+  <floater.string name="bump">[TIME]　[NAME]があなたに衝突しました。</floater.string>
+  <floater.string name="llpushobject">[TIME]　[NAME]がスクリプトであなたを押しました。</floater.string>
+  <floater.string name="selected_object_collide">[TIME]　[NAME]が、オブジェクトであなたを叩きました。</floater.string>
+  <floater.string name="scripted_object_collide">[TIME]　[NAME]が、スクリプトのオブジェクトであなたを叩きました。</floater.string>
+  <floater.string name="physical_object_collide">[TIME]　[NAME]が、物理オブジェクトであなたを叩きました。</floater.string>
+  <floater.string name="timeStr">[[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]]</floater.string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 7e4932c78f..24520be6ad 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="340" name="floater_buy_contents" title="中身の購入" width="340">
-	<text name="contains_text" width="320">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; に含まれるもの：
-	</text>
-	<scroll_list name="item_list" width="310"/>
-	<text name="buy_text" width="320">
-		中身を [NAME] から L$[AMOUNT] で購入しますか？
-	</text>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn" width="73"/>
-	<button label="購入" label_selected="購入" left_delta="-77" name="buy_btn" width="73"/>
-	<check_box label="今すぐ着る" left_delta="-125" name="wear_check"/>
-	<text name="no_copy_text">
-		（コピー不可）
-	</text>
-	<text name="no_modify_text">
-		（修正不可）
-	</text>
-	<text name="no_transfer_text">
-		（再販・プレゼント不可）
-	</text>
-</floater>
+<floater name="floater_buy_contents" title="中身の購入">
+  <text name="contains_text">&lt;nolink&gt;[NAME]&lt;/nolink&gt;に含まれるもの：</text>
+  <scroll_list name="item_list" />
+  <text name="buy_text">[NAME]から、L$ [AMOUNT]で購入しますか？</text>
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <button label="購入" label_selected="購入" name="buy_btn" />
+  <check_box label="今すぐ着る" name="wear_check" />
+  <text name="no_copy_text">（コピー不可）</text>
+  <text name="no_modify_text">（修正不可）</text>
+  <text name="no_transfer_text">（再販・譲渡不可）</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index ac2db917cc..218fcb589d 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -1,65 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy currency" title="L$ の購入">
-	<floater.string name="buy_currency">
-		約 [LOCALAMOUNT] で L$ [LINDENS] を購入
-	</floater.string>
-	<text name="info_need_more">
-		L$ が足りません
-	</text>
-	<text name="contacting">
-		LindeXとコンタクト中…
-	</text>
-	<text name="info_buying">
-		L$ の購入
-	</text>
-	<text name="balance_label">
-		残高
-	</text>
-	<text name="balance_amount">
-		L$ [AMT]
-	</text>
-	<text name="currency_action">
-		購入希望額
-	</text>
-	<text name="currency_label">
-		L$
-	</text>
-	<line_editor label="L$" name="currency_amt">
-		1234
-	</line_editor>
-	<text name="buying_label">
-		価格
-	</text>
-	<text name="currency_est">
-		約 [LOCALAMOUNT]
-	</text>
-	<text left_delta="3" name="getting_data">
-		見積もり中...
-	</text>
-	<text name="buy_action">
-		[ACTION]
-	</text>
-	<text name="total_label">
-		購入後の残高
-	</text>
-	<text name="total_amount">
-		L$ [AMT]
-	</text>
-	<text name="currency_links">
-		[http://www.secondlife.com/my/account/payment_method_management.php 支払方法] | [http://www.secondlife.com/my/account/currency.php 通貨]
-	</text>
-	<text name="exchange_rate_note">
-		金額を再入力して最新換算レートを確認します。
-	</text>
-	<text name="purchase_warning_repurchase">
-		この取引を決定すると、L$ を購入します。オブジェクトは購入しません。
-	</text>
-	<text name="purchase_warning_notenough">
-		購入しようとしている L$ が不足しています。 金額を上げてください。
-	</text>
-	<button label="購入する" name="buy_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<floater.string name="info_cannot_buy">
-		購入できません
-	</floater.string>
-</floater>
+<floater title="L$の購入" name="buy currency">
+  <floater.string name="buy_currency">約[LOCALAMOUNT]でL$ [LINDENS]を購入</floater.string>
+  <floater.string name="info_cannot_buy">購入できません。</floater.string>
+  <floater.string name="estimated_zero">US$ 0.00</floater.string>
+  <icon name="normal_background" />
+  <layout_stack name="outer_stack">
+    <layout_panel name="layout_panel_title">
+      <text name="info_need_more">L$が足りません。</text>
+      <text name="info_buying">L$を購入</text>
+      <view_border name="text_border" />
+    </layout_panel>
+    <layout_panel name="layout_panel_price">
+      <text name="target_price_label">必要金額</text>
+      <text name="target_price">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_balance">
+      <text name="balance_label">所持金</text>
+      <text name="balance_amount">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_required">
+      <text name="required_label">必要最低金額</text>
+      <text name="required_amount">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_action">
+      <view_border name="text_border_2" />
+      <text name="currency_action">購入金額を選択</text>
+      <text name="currency_label">L$</text>
+      <line_editor label="L$" name="currency_amt">1234</line_editor>
+      <text name="currency_est">平均[LOCALAMOUNT]</text>
+      <text name="getting_data">見積もり中…</text>
+      <text name="total_label">購入後の残高</text>
+      <text name="total_amount">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_msg">
+      <view_border name="text_border_3" />
+      <text name="currency_links">[https://accounts.secondlife.com/billing_information/ 支払い方法]｜[https://www.secondlife.com/my/lindex/buy.php L$の購入]</text>
+      <text name="exchange_rate_note">金額を再入力して、最新の為替レートを確認してください。</text>
+      <text name="purchase_warning_repurchase">L$ を受け取ったら、
+もう一度購入してください。</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_buttons">
+      <text name="contacting">LindeXに接続中…</text>
+      <button label="今すぐL$を購入" name="buy_btn" />
+      <button label="キャンセル" name="cancel_btn" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
index 37fd6826e5..26c001da36 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_currency_html" title="通貨の購入"/>
+<floater name="floater_buy_currency_html" title="通貨の購入" />
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 34f9d38de1..7eda56c6a3 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -1,234 +1,93 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="土地の購入">
-	<floater.string name="can_resell">
-		再販可能
-	</floater.string>
-	<floater.string name="can_not_resell">
-		再販不可能
-	</floater.string>
-	<floater.string name="can_change">
-		統合・再分割可能
-	</floater.string>
-	<floater.string name="can_not_change">
-		統合・再分割不可能
-	</floater.string>
-	<floater.string name="cant_buy_for_group">
-		あなたはアクティブなグループ用の土地購入を許可されていません
-	</floater.string>
-	<floater.string name="no_land_selected">
-		土地が選択されていません
-	</floater.string>
-	<floater.string name="multiple_parcels_selected">
-		複数の異なった区画を選択しました。 
-これより小さな範囲を選択してください。
-	</floater.string>
-	<floater.string name="no_permission">
-		あなたはアクティブなグループ用の土地購入を許可されていません
-	</floater.string>
-	<floater.string name="parcel_not_for_sale">
-		選択された区画は販売対象外です
-	</floater.string>
-	<floater.string name="group_already_owns">
-		グループはすでにこの区画を所有しています
-	</floater.string>
-	<floater.string name="you_already_own">
-		あなたはすでにこの区画を所有しています
-	</floater.string>
-	<floater.string name="set_to_sell_to_other">
-		選択された区画は、他の人への販売が決まっています
-	</floater.string>
-	<floater.string name="no_public_land">
-		選択された地域に、公共の土地はありません
-	</floater.string>
-	<floater.string name="not_owned_by_you">
-		他の住人が所有する土地を選択しています。 
-もっと狭い範囲を選択してみてください。
-	</floater.string>
-	<floater.string name="processing">
-		購入処理中...
- 
-（数分かかることがあります）
-	</floater.string>
-	<floater.string name="fetching_error">
-		土地購入の情報入手中にエラーが起きました
-	</floater.string>
-	<floater.string name="buying_will">
-		この土地を買うと：
-	</floater.string>
-	<floater.string name="buying_for_group">
-		グループ用の土地を購入すると：
-	</floater.string>
-	<floater.string name="cannot_buy_now">
-		現在購入不可：
-	</floater.string>
-	<floater.string name="not_for_sale">
-		販売対象外：
-	</floater.string>
-	<floater.string name="none_needed">
-		一切必要なし
-	</floater.string>
-	<floater.string name="must_upgrade">
-		アカウントをアップグレードしないと、土地を所有できません
-	</floater.string>
-	<floater.string name="cant_own_land">
-		あなたのアカウントで土地を所有できます
-	</floater.string>
-	<floater.string name="land_holdings">
-		あなたは、[BUYER] 平方メートルの土地を所有しています。
-	</floater.string>
-	<floater.string name="pay_to_for_land">
-		この土地の代金として、[SELLER]にL$[AMOUNT]を支払う
-	</floater.string>
-	<floater.string name="buy_for_US">
-		L$ [AMOUNT] を、約 [LOCAL_AMOUNT] で購入します。
-	</floater.string>
-	<floater.string name="parcel_meters">
-		この区画は [AMOUNT] 平方メートルです。
-	</floater.string>
-	<floater.string name="premium_land">
-		この土地は割り増し付です。 [AMOUNT] 平方メートルの料金がかかります。
-	</floater.string>
-	<floater.string name="discounted_land">
-		この土地はディスカウントされています。 [AMOUNT] 平方メートルの料金がかかります。
-	</floater.string>
-	<floater.string name="meters_supports_object">
-		[AMOUNT] 平方メートル
-オブジェクト [AMOUNT2] 個サポート
-	</floater.string>
-	<floater.string name="sold_with_objects">
-		オブジェクト込みで販売
-	</floater.string>
-	<floater.string name="sold_without_objects">
-		オブジェクトは含まれていません
-	</floater.string>
-	<floater.string name="info_price_string">
-		L$ [PRICE]
-（L$[PRICE_PER_SQM]/平方メートル）
-[SOLD_WITH_OBJECTS]
-	</floater.string>
-	<floater.string name="insufficient_land_credits">
-		この [GROUP] が区画の購入手続きを完了するには、 価格に見合うだけの寄付された土地の利用実績が必要です
-	</floater.string>
-	<floater.string name="have_enough_lindens">
-		あなたの所持する L$ [AMOUNT]で、この土地を購入できます
-	</floater.string>
-	<floater.string name="not_enough_lindens">
-		あなたの所持金は L$ [AMOUNT]だけで、あとL$ [AMOUNT2] 必要です
-	</floater.string>
-	<floater.string name="balance_left">
-		購入後、あなたの残額はL$[AMOUNT]になります
-	</floater.string>
-	<floater.string name="balance_needed">
-		この土地を買うには、少なくとも L$ [AMOUNT] を購入する必要があります
-	</floater.string>
-	<floater.string name="no_parcel_selected">
-		(区画が選定されていません)
-	</floater.string>
-	<text name="region_name_label">
-		地域：
-	</text>
-	<text name="region_name_text">
-		（不明）
-	</text>
-	<text name="region_type_label">
-		種類：
-	</text>
-	<text name="region_type_text">
-		（不明）
-	</text>
-	<text name="estate_name_label">
-		不動産：
-	</text>
-	<text name="estate_name_text">
-		（不明）
-	</text>
-	<text name="estate_owner_label">
-		不動産オーナー：
-	</text>
-	<text name="estate_owner_text">
-		（不明）
-	</text>
-	<text name="resellable_changeable_label">
-		この地域で購入した土地：
-	</text>
-	<text left="460" name="resellable_clause">
-		再販できる場合とできない場合があります。
-	</text>
-	<text left="460" name="changeable_clause">
-		統合または再分割できる場合とできない場合があります。
-	</text>
-	<text name="covenant_text">
-		不動産約款に同意してください：
-	</text>
-	<text left="470" name="covenant_timestamp_text"/>
-	<text_editor name="covenant_editor">
-		ロード中．．．
-	</text_editor>
-	<check_box label="上記の約款に同意します" name="agree_covenant"/>
-	<text name="info_parcel_label">
-		区画：
-	</text>
-	<text name="info_parcel">
-		Scotopteryx138,204
-	</text>
-	<text name="info_size_label">
-		サイズ：
-	</text>
-	<text bottom_delta="-37" height="48" name="info_size">
-		1024 平方メートル
-	</text>
-	<text name="info_price_label">
-		価格：
-	</text>
-	<text name="info_price">
-		L$ 1500
-(L$ 1.1/平方メートル)
-オブジェクトも土地販売価格に含まれます
-	</text>
-	<text name="info_action">
-		この土地を買うと：
-	</text>
-	<text name="error_message">
-		何か変です
-	</text>
-	<button label="Webサイトに移動" name="error_web"/>
-	<text name="account_action">
-		プレミアム会員にアップグレード
-	</text>
-	<text name="account_reason">
-		土地を保有できるのはプレミアム会員だけです
-	</text>
-	<combo_box name="account_level">
-		<combo_box.item label="月額 9.95米ドル、 月払い" name="US$9.95/month,billedmonthly"/>
-		<combo_box.item label="月額 7.50米ドル、 年4回3ヶ月毎" name="US$7.50/month,billedquarterly"/>
-		<combo_box.item label="月額 6.00米ドル、 年間一括払い" name="US$6.00/month,billedannually"/>
-	</combo_box>
-	<text name="land_use_action">
-		毎月の土地使用料をUS$40に引き上げます
-	</text>
-	<text name="land_use_reason">
-		あなたは 1309 平方メートルの土地を所有しています。
-この区画の大きさは、512 平方メートルです。
-	</text>
-	<text name="purchase_action">
-		Joe ResidentにL$4000支払って土地を購入
-	</text>
-	<text name="currency_reason">
-		所持金は L$2,100です。
-	</text>
-	<text name="currency_action">
-		追加でL$の購入
-	</text>
-	<line_editor name="currency_amt">
-		1000
-	</line_editor>
-	<text name="currency_est">
-		約 [LOCAL_AMOUNT]
-	</text>
-	<text name="currency_balance">
-		所持金は L$2,100です。
-	</text>
-	<check_box label="グループから [AMOUNT] 平方メートルの貢献を取り除きます。" name="remove_contribution"/>
-	<button label="購入" name="buy_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <floater.string name="can_resell">再販可能</floater.string>
+  <floater.string name="can_not_resell">再販不可能</floater.string>
+  <floater.string name="can_change">統合・再分割可能</floater.string>
+  <floater.string name="can_not_change">統合・再分割不可能</floater.string>
+  <floater.string name="cant_buy_for_group">あなたはアクティブなグループ用の土地購入を許可されていません。</floater.string>
+  <floater.string name="no_land_selected">土地が選択されていません。</floater.string>
+  <floater.string name="multiple_parcels_selected">複数の異なった区画を選択しました。
+これより小さな範囲を選択してください。</floater.string>
+  <floater.string name="no_permission">あなたはアクティブなグループ用の土地購入を許可されていません。</floater.string>
+  <floater.string name="parcel_not_for_sale">選択された区画は販売対象外です。</floater.string>
+  <floater.string name="group_already_owns">グループはすでにこの区画を所有しています。</floater.string>
+  <floater.string name="you_already_own">あなたはすでにこの区画を所有しています</floater.string>
+  <floater.string name="set_to_sell_to_other">選択された区画は、他の人への販売が決まっています。</floater.string>
+  <floater.string name="no_public_land">選択された地域に、公共の土地はありません。</floater.string>
+  <floater.string name="not_owned_by_you">他の住人が所有する土地を選択しています。
+もっと狭い範囲を選択してみてください。</floater.string>
+  <floater.string name="processing">購入処理中…
+（数分かかることがあります）</floater.string>
+  <floater.string name="fetching_error">土地購入の情報入手中にエラーが起きました</floater.string>
+  <floater.string name="buying_will">この土地を買うと：</floater.string>
+  <floater.string name="buying_for_group">グループ用の土地の購入：</floater.string>
+  <floater.string name="cannot_buy_now">現在購入不可：</floater.string>
+  <floater.string name="not_for_sale">販売対象外：</floater.string>
+  <floater.string name="none_needed">一切必要なし</floater.string>
+  <floater.string name="must_upgrade">アカウントをアップグレードしないと、土地を所有できません</floater.string>
+  <floater.string name="cant_own_land">あなたのアカウントで土地を所有できます。</floater.string>
+  <floater.string name="land_holdings">あなたは、[BUYER]㎡の土地を所有しています。</floater.string>
+  <floater.string name="pay_to_for_land">この土地の代金として、[SELLER]にL$[AMOUNT]を支払う。</floater.string>
+  <floater.string name="buy_for_US">L$[AMOUNT]を、約[LOCAL_AMOUNT]で購入します。</floater.string>
+  <floater.string name="parcel_meters">この区画は[AMOUNT]㎡です。</floater.string>
+  <floater.string name="premium_land">この土地は割り増し付です。[AMOUNT]㎡の料金がかかります。</floater.string>
+  <floater.string name="discounted_land">この土地はディスカウントされています。[AMOUNT]㎡の料金がかかります。</floater.string>
+  <floater.string name="meters_supports_object">[AMOUNT]㎡
+オブジェクト[AMOUNT2]個サポート</floater.string>
+  <floater.string name="sold_with_objects">オブジェクト込みで販売</floater.string>
+  <floater.string name="sold_without_objects">オブジェクトは含まれていません。</floater.string>
+  <floater.string name="info_price_string">L$ [PRICE]
+（L$ [PRICE_PER_SQM]/㎡）
+[SOLD_WITH_OBJECTS]</floater.string>
+  <floater.string name="insufficient_land_credits">
+この[GROUP]が区画の購入手続きを完了するには、価格に見合うだけの寄付された土地の利用実績が必要です。</floater.string>
+  <floater.string name="have_enough_lindens">あなたの現在の所持金L$ [AMOUNT]で、この土地を購入できます。</floater.string>
+  <floater.string name="not_enough_lindens">あなたの現在の所持金は、L$ [AMOUNT]で、L$ [AMOUNT2]不足しています。</floater.string>
+  <floater.string name="balance_left">購入後、残額はL$ [AMOUNT]になります。</floater.string>
+  <floater.string name="balance_needed">この土地を買うには、少なくともL$ [AMOUNT]購入する必要があります。</floater.string>
+  <floater.string name="no_parcel_selected">（区画が選定されていません）</floater.string>
+  <text name="region_name_label">地域：</text>
+  <text name="region_name_text">（不明）</text>
+  <text name="region_type_label">種類：</text>
+  <text name="region_type_text">（不明）</text>
+  <text name="estate_name_label">不動産：</text>
+  <text name="estate_name_text">（不明）</text>
+  <text name="estate_owner_label">不動産オーナー：</text>
+  <text name="estate_owner_text">（不明）</text>
+  <text name="resellable_changeable_label">このリージョン（地域）で購入した土地：</text>
+  <text name="resellable_clause">再販できる場合とできない場合があります。</text>
+  <text name="changeable_clause">統合または再分割できる場合とできない場合があります。</text>
+  <text name="covenant_text">不動産約款に同意してください：</text>
+  <text name="covenant_timestamp_text" />
+  <text_editor name="covenant_editor">読み込んでいます…。</text_editor>
+  <check_box label="上記の約款に同意します" name="agree_covenant" />
+  <text name="info_parcel_label">区画：</text>
+  <text name="info_parcel">Scotopteryx138,204</text>
+  <text name="info_size_label">サイズ：</text>
+  <text bottom_delta="-37" height="48" name="info_size">1024㎡</text>
+  <text name="info_price_label">価格：</text>
+  <text name="info_price">L$ 1500
+（L$ 1.1／㎡）
+オブジェクトも土地販売価格に含まれます</text>
+  <text name="info_action">この土地を買うと：</text>
+  <text name="error_message">何か変です</text>
+  <button label="Webサイトに移動" name="error_web" />
+  <text name="account_action">プレミアム会員にアップグレードする</text>
+  <text name="account_reason">土地を保有できるのはプレミアム会員だけです。</text>
+  <combo_box name="account_level">
+    <combo_box.item label="月額9.95米ドル、月払い" name="US$9.95/month,billedmonthly" />
+    <combo_box.item label="月額7.50米ドル、四半期払い" name="US$7.50/month,billedquarterly" />
+    <combo_box.item label="月額6.00米ドル、年間一括払い" name="US$6.00/month,billedannually" />
+  </combo_box>
+  <text name="land_use_action">毎月の土地使用料をUS $40に引き上げます</text>
+  <text name="land_use_reason">あなたは、1309㎡の土地を所有しています。この区画の大きさは、512㎡です。</text>
+  <text name="purchase_action">Joe ResidentにL$ 4000支払って土地を購入</text>
+  <text name="currency_reason">所持金は、L$ 2,100です。</text>
+  <text name="currency_action">追加でL$の購入</text>
+  <line_editor name="currency_amt">1000</line_editor>
+  <text name="currency_est">約[LOCAL_AMOUNT]</text>
+  <text name="currency_balance">所持金はL$ 2,100です。</text>
+  <check_box label="グループから[AMOUNT]㎡の貢献を取り除きます。" name="remove_contribution" />
+  <button label="購入" name="buy_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index ce269df6da..8e249359f2 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
@@ -1,29 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="オブジェクトのコピーを購入">
-	<floater.string name="title_buy_text">
-		購入
-	</floater.string>
-	<floater.string name="title_buy_copy_text">
-		次のものを購入
-	</floater.string>
-	<floater.string name="no_copy_text">
-		（コピー不可）
-	</floater.string>
-	<floater.string name="no_modify_text">
-		（修正不可）
-	</floater.string>
-	<floater.string name="no_transfer_text">
-		（再販・プレゼント不可）
-	</floater.string>
-	<text name="contents_text">
-		中身：
-	</text>
-	<text name="buy_text">
-		次の売り手から L$[AMOUNT] で購入：
-	</text>
-	<text name="buy_name_text">
-		[NAME]?
-	</text>
-	<button label="購入" label_selected="購入" name="buy_btn"/>
-	<button label="取消" label_selected="取消" name="cancel_btn"/>
-</floater>
+  <floater.string name="title_buy_text">購入</floater.string>
+  <floater.string name="title_buy_copy_text">以下を購入：</floater.string>
+  <floater.string name="no_copy_text">（コピー不可）</floater.string>
+  <floater.string name="no_modify_text">（修正不可）</floater.string>
+  <floater.string name="no_transfer_text">（再販・譲渡不可）</floater.string>
+  <text name="contents_text">中身：</text>
+  <text name="buy_text">次の売り手から L$ [AMOUNT]で購入：</text>
+  <text name="buy_name_text">[NAME]？</text>
+  <button label="購入" label_selected="購入" name="buy_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index a690fbd844..86db0cfe99 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -1,45 +1,33 @@
-<?xml version="1.0" ?>
-<floater name="camera_floater" title="カメラのコントロール">
-	<floater.string name="rotate_tooltip">フォーカスを中心にカメラを回転</floater.string>
-	<floater.string name="zoom_tooltip">フォーカスに向けてカメラをズーム</floater.string>
-	<floater.string name="move_tooltip">カメラを上下左右に移動</floater.string>
-	<floater.string name="free_mode_title">オブジェクトを見る</floater.string>
-	<panel name="controls">
-		<panel name="preset_views_list">
-			<panel_camera_item name="front_view" tool_tip="前側">
-				<panel_camera_item.text name="front_view_text">前方視界</panel_camera_item.text>
-			</panel_camera_item>
-			<panel_camera_item name="group_view" tool_tip="側面">
-				<panel_camera_item.text name="side_view_text">グループ視界</panel_camera_item.text>
-			</panel_camera_item>
-			<panel_camera_item name="rear_view" tool_tip="後側">
-				<panel_camera_item.text name="rear_view_text">後方視界</panel_camera_item.text>
-			</panel_camera_item>
-		</panel>
-		<panel name="camera_modes_list">
-			<panel_camera_item name="object_view" tool_tip="オブジェクトビュー">
-				<panel_camera_item.text name="object_view_text">オブジェクト視点</panel_camera_item.text>
-			</panel_camera_item>
-			<panel_camera_item name="mouselook_view" tool_tip="マウスルックビュー">
-				<panel_camera_item.text name="mouselook_view_text">一人称視点</panel_camera_item.text>
-			</panel_camera_item>
-		</panel>
-		<panel name="zoom" tool_tip="向いている方法にカメラをズーム">
-			<joystick_rotate name="cam_rotate_stick" tool_tip="自分を軸にカメラを回す"/>
-			<slider_bar name="zoom_slider" tool_tip="向いている方向にカメラをズーム"/>
-			<joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に動かします"/>
-		</panel>
-		<text name="precise_ctrs_label">精密制御を使用する</text>
-	</panel>
-	<panel name="buttons">
-		<button label="" name="presets_btn" tool_tip="事前設定の視野"/>
-		<button label="" name="pan_btn" tool_tip="旋回 - ズーム - 水平・垂直移動"/>
-		<button label="" name="avatarview_btn" tool_tip="カメラモード"/>
-	</panel>
-	<panel name="buttons_panel">
-		<button name="gear_btn" tool_tip="カメラプリセット"/>
-		<button name="save_preset_btn" label="プリセットとして保存する..."/>
-		<combo_box.item name="Use preset" label="プリセットを使用する"/>
-	</panel>
-	<combo_box name="preset_combo"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="camera_floater" help_topic="camera_floater" title="カメラ操作">
+  <floater.string name="rotate_tooltip">対象を中心にカメラを回す</floater.string>
+  <floater.string name="zoom_tooltip">対象にカメラをズーム</floater.string>
+  <floater.string name="move_tooltip">カメラを上下左右に移動</floater.string>
+  <floater.string name="free_mode_title">オブジェクト視点</floater.string>
+  <string name="inactive_combo_text">プリセットを使用</string>
+  <panel name="controls">
+    <!--TODO:
+    replace + - images -->
+    <panel name="zoom">
+      <joystick_rotate name="cam_rotate_stick" tool_tip="対象にカメラを追尾" />
+      <button name="zoom_plus_btn" />
+      <slider_bar tool_tip="対象にカメラをズーム" />
+      <button name="zoom_minus_btn" />
+      <joystick_track tool_tip="カメラを上下左右に動かします。" />
+      <text name="precise_ctrs_label">数値で角度方位を指定</text>
+    </panel>
+  </panel>
+  <panel name="buttons_panel">
+    <panel_camera_item name="front_view" tool_tip="前方視界" />
+    <panel_camera_item name="group_view" tool_tip="斜方視界" />
+    <panel_camera_item name="rear_view" tool_tip="後方視界" />
+    <panel_camera_item name="object_view" tool_tip="オブジェクト視点" />
+    <panel_camera_item name="mouselook_view" tool_tip="マウスルックビュー" />
+    <combo_box name="preset_combo">
+      <combo_list mouse_wheel_opaque="true" />
+      <combo_box.item label="プリセットを使用" name="Use preset" value="default" />
+    </combo_box>
+    <button name="gear_btn" tool_tip="カメラのプリセット" />
+    <button label="プリセットを保存…" name="save_preset_btn" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_camera_presets.xml b/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
index d394c0547c..37ce29a2e7 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
@@ -1,2 +1,4 @@
-<?xml version="1.0" ?>
-<floater name="floater_camera_presets" title="カメラプリセット"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="カメラのプリセット" name="floater_camera_presets">
+  <flat_list_view name="preset_list" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 7d91cb69ed..8fe572fc82 100644
--- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="グループ">
-	<text name="groupdesc">
-		グループを選択：
-	</text>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-</floater>
+  <text name="groupdesc">グループを選択：</text>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_classified.xml b/indra/newview/skins/default/xui/ja/floater_classified.xml
new file mode 100644
index 0000000000..2a5037d6e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_classified.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_classified" title="クラシファイド広告">
+  <panel name="main_panel" filename="panel_classified_info.xml" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index dc87d27a15..aeadcdced3 100644
--- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="ColorPicker" title="カラーピッカー">
-	<text name="r_val_text">
-		赤：
-	</text>
-	<text name="g_val_text">
-		緑：
-	</text>
-	<text name="b_val_text">
-		青：
-	</text>
-	<text name="h_val_text">
-		色相：
-	</text>
-	<text name="s_val_text">
-		色調：
-	</text>
-	<text name="l_val_text">
-		輝度：
-	</text>
-	<check_box label="すぐ適用" name="apply_immediate"/>
-	<button label="" label_selected="" name="color_pipette"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-	<button label="OK" label_selected="OK" name="select_btn"/>
-	<text name="Current color:">
-		現在の色：
-	</text>
-	<text name="(Drag below to save.)">
-		（下にドラッグして保存）
-	</text>
-</floater>
+  <tab_container name="color_type_container">
+    <panel name="RGB" label="RGB">
+      <text name="r_val_text">赤：</text>
+      <spinner name="rspin" />
+      <text name="g_val_text">緑：</text>
+      <spinner name="gspin" />
+      <text name="b_val_text">青：</text>
+      <spinner name="bspin" />
+    </panel>
+    <panel name="LSL" label="LSL">
+      <text name="r_val_text_float">赤：</text>
+      <spinner decimal_digits="3" name="rspin_float" />
+      <text name="g_val_text_float">緑：</text>
+      <spinner decimal_digits="3" name="gspin_float" />
+      <text name="b_val_text_float">青：</text>
+      <spinner decimal_digits="3" name="bspin_float" />
+    </panel>
+  </tab_container>
+  <text name="h_val_text">色相：</text>
+  <spinner name="hspin" />
+  <text name="s_val_text">彩度：</text>
+  <spinner name="sspin" />
+  <text name="l_val_text">輝度：</text>
+  <spinner name="lspin" />
+  <text name="hex_text">Hex #</text>
+  <line_editor name="hex_value" />
+  <check_box label="すぐ適用" name="apply_immediate" />
+  <button name="color_pipette" />
+  <button label="ＯＫ" name="select_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <text tool_tip="パレットの下にドラッグして保存" name="Current color:">現在の色：</text>
+  <menu_button menu_filename="menu_copy_color_picker.xml" name="clipboard_color" tool_tip="色のコピー時のオプション" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
index 98b1a59a0d..8e50a74897 100644
--- a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_conversation_log" title="会話ログ">
-	<panel name="buttons_panel">
-		<filter_editor label="人をフィルター" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
-	</panel>
-</floater>
+  <panel name="buttons_panel">
+    <filter_editor label="人物をフィルタ" name="people_filter_input" />
+    <menu_button name="conversation_view_btn" tool_tip="表示／並べ替えのオプション" />
+    <menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
index ea0b23de48..d05a2bcfba 100644
--- a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="会話:">
-	<floater.string name="Title">
-		会話:[NAME]
-	</floater.string>
-	<text name="page_label" value="ページ"/>
-</floater>
+<floater name="preview_conversation" title="会話：">
+  <floater.string name="Title">会話：[NAME]</floater.string>
+  <text name="page_label" value="ページ" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_create_landmark.xml b/indra/newview/skins/default/xui/ja/floater_create_landmark.xml
new file mode 100644
index 0000000000..eb0772b8b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_create_landmark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="create_landmark" title="ランドマーク作成">
+  <string name="favorites_bar">お気に入りバー</string>
+  <text name="title_label" value="ランドマークの追加" />
+  <text name="name_label" value="名前" />
+  <line_editor name="title_editor" />
+  <text name="folder_label" value="ランドマークの保存先：" />
+  <combo_box name="folder_combo" />
+  <text name="new_folder_textbox">[secondlife:/// フォルダを作成]</text>
+  <text name="notes_label" value="私のノート" />
+  <text_editor name="notes_editor" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
index f69c24622a..8bae565e65 100644
--- a/indra/newview/skins/default/xui/ja/floater_critical.xml
+++ b/indra/newview/skins/default/xui/ja/floater_critical.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
-	<button label="続行" label_selected="続行" name="Continue" />
-	<button label="取り消し" label_selected="取り消し" name="Cancel" />
-	<text name="tos_title">
-		クリティカルメッセージ
-	</text>
-	<text name="tos_heading">
-		次のメッセージを注意してよくお読みください。
-	</text>
-	<text_editor name="tos_text">
-		TOS_TEXT
-	</text_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container">
+  <button label="続行" label_selected="続行" name="Continue" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <text name="tos_title">重要なメッセージ</text>
+  <text name="tos_heading">次のメッセージを注意してよくお読みください。</text>
+  <text_editor name="tos_text">TOS_TEXT</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
index 50e508ad40..03b52ed218 100644
--- a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Pref Preset" title="優先プリセットを削除">
-	<string name="title_graphic">
-		グラフィックプリセットを削除
-	</string>
-	<string name="title_camera">
-		カメラプリセットを削除
-	</string>
-	<text name="Preset">
-		プリセットを選択
-	</text>
-	<button label="削除" name="delete"/>
-	<button label="取り消し" name="cancel"/>
-</floater>
+<?xml version="1.0" encoding="UTF-8"?>
+<floater name="delete_pref_preset" title="プリセットの削除">
+
+  <string name="title_graphic">グラフィックのプリセットを削除</string>
+  <string name="title_camera">カメラのプリセットを削除</string>
+
+  <text name="Preset">プリセットを選択</text>
+  <combo_box name="preset_combo" />
+  <button label="削除" name="delete" />
+  <button label="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml
index b7f6ad4d4e..b7c3ede317 100644
--- a/indra/newview/skins/default/xui/ja/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ja/floater_destinations.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Destinations" title="行き先"/>
+<floater name="Destinations" title="行き先" />
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
index cc71b1cd9f..0c21cbd0da 100644
--- a/indra/newview/skins/default/xui/ja/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Display Name" title="表示名を変更">
-	<text name="info_text">
-		アバターにつけた名前があなたの表示名となります。表示名は週一回の頻度で変更することが可能です。
-	</text>
-	<text name="lockout_text">
-		表示名は次の日付まで変更できません：[TIME]。
-	</text>
-	<text name="set_name_label">
-		新しい表示名：
-	</text>
-	<text name="name_confirm_label">
-		新しい表示名を再入力して確認：
-	</text>
-	<button label="保存" name="save_btn" tool_tip="新しい表示名を保存"/>
-	<button label="リセット" name="reset_btn" tool_tip="表示名とユーザー名を統一"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <text name="info_text">アバターにつけた名前があなたの表示名になります。表示名は週に一回まで変更することができます。</text>
+  <text name="lockout_text">表示名は次の日付まで変更できません：[TIME]</text>
+  <text name="set_name_label">新しい表示名：</text>
+  <text name="name_confirm_label">新しい表示名を再入力して確認：</text>
+  <button label="保存" name="save_btn" tool_tip="この表示名を保存します。" />
+  <button label="リセット" name="reset_btn" tool_tip="表示名をユーザー名に戻します。" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
index 79c97472df..7e5b3a9dc1 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
@@ -1,107 +1,111 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="env_edit_extdaycycle" title="デイサイクルを編集">
-	<string name="title_new">
-		新しいデイサイクルを作成
-	</string>
-	<string name="title_edit">
-		デイサイクルを編集
-	</string>
-	<string name="hint_new">
-		新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。
-	</string>
-	<string name="hint_edit">
-		自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。
-	</string>
-	<string name="time_label">
-		([HH]:[MM])
-	</string>
-	<string name="sky_track_label">
-		空 [ALT]
-	</string>
-	<string name="sky_label">
-		空
-	</string>
-	<string name="water_label">
-		水
-	</string>
-	<string name="commit_parcel">
-		区画に適用
-	</string>
-	<string name="commit_region">
-		リージョンに適用
-	</string>
-	<layout_stack name="outer_stack">
-		<layout_panel name="name_and_import">
-			<text name="label">
-				デイサイクル名：
-			</text>
-			<button label="インポート" name="btn_import" tool_tip="ディスクから過去の設定をインポートする。"/>
-		</layout_panel>
-		<layout_panel name="content">
-			<layout_stack name="content_stack">
-				<layout_panel name="timeline_track_selection">
-					<panel name="timeline_layers">
-						<button label="空 4" name="sky4_track"/>
-						<button label="空 3" name="sky3_track"/>
-						<button label="空 2" name="sky2_track"/>
-						<button label="地表レベル" name="sky1_track"/>
-						<button label="水" name="water_track"/>
-					</panel>
-					<panel name="timeline">
-						<text name="p0" value="0%[DSC]"/>
-						<text name="p1" value="25%[DSC]"/>
-						<text name="p2" value="50%[DSC]"/>
-						<text name="p3" value="75%[DSC]"/>
-						<text name="p4" value="100%[DSC]"/>
-						<multi_slider initial_value="0" name="WLTimeSlider"/>
-						<multi_slider initial_value="0" name="WLDayCycleFrames"/>
-						<text name="current_time" value="[PRCNT]%[DSC]"/>
-						<layout_stack>
-							<layout_panel>
-								<button label="トラックを以下からクローン" name="copy_track"/>
-								<button label="トラックを以下からロード" name="load_track"/>
-								<button label="トラックをクリア" name="clear_track"/>
-							</layout_panel>
-							<layout_panel>
-								<layout_stack name="progress_control">
-									<layout_panel name="skip_back">
-										<button name="skip_back_btn" tool_tip="後ろに移動"/>
-									</layout_panel>
-									<layout_panel name="skip_forward">
-										<button name="skip_forward_btn" tool_tip="前に移動"/>
-									</layout_panel>
-								</layout_stack>
-							</layout_panel>
-							<layout_panel>
-								<button label="[FRAME] を追加" name="add_frame"/>
-								<button label="[FRAME] をロード" name="btn_load_frame"/>
-								<button label="[FRAME] を削除" name="delete_frame"/>
-							</layout_panel>
-						</layout_stack>
-					</panel>
-				</layout_panel>
-				<layout_panel name="frame_edit_controls">
-					<text name="icn_lock_edit">
-						上部のタイムラインからキーフレームを選択し、設定を編集します。
-					</text>
-				</layout_panel>
-				<layout_panel name="frame_settings_water">
-					<tab_container name="water_tabs">
-						<panel label="水" name="water_panel"/>
-					</tab_container>
-				</layout_panel>
-				<layout_panel name="frame_settings_sky">
-					<tab_container name="sky_tabs">
-						<panel label="大気＆光" name="atmosphere_panel"/>
-						<panel label="雲" name="clouds_panel"/>
-						<panel label="太陽＆月" name="moon_panel"/>
-					</tab_container>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="buttons">
-			<button label="保存" name="save_btn"/>
-			<button label="キャンセル" name="cancel_btn"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+
+  <!-- obsolete?, add as hint for 'save' button? -->
+  <string name="title_new">新しいデイサイクルを作成</string>
+  <string name="title_edit">デイサイクルを編集</string>
+  <string name="hint_new">新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。</string>
+  <string name="hint_edit">自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。</string>
+
+  <!-- Substitutions -->
+  <string name="time_label">（[HH]：[MM]）</string>
+  <string name="sky_track_label">空[ALT]</string>
+  <string name="sky_label">空</string>
+  <string name="water_label">水</string>
+
+  <string name="commit_parcel">区画に適用</string>
+  <string name="commit_region">リージョン（地域）に適用</string>
+
+  <!-- Layout -->
+  <layout_stack name="outer_stack">
+    <layout_panel name="name_and_import">
+      <!-- This layout_panel is for loading legacy presets -->
+      <text name="label">デイサイクル名：</text>
+      <line_editor name="day_cycle_name" />
+      <button label="インポート" fname="btn_import" tool_tip="ディスクから過去の設定をインポートする。" />
+    </layout_panel>
+    <layout_panel name="content">
+      <layout_stack name="content_stack">
+        <layout_panel name="timeline_track_selection">
+          <panel name="timeline_layers">
+            <button label="空４" name="sky4_track" />
+            <button label="空３" name="sky3_track" />
+            <button label="空２" name="sky2_track" />
+            <button label="地表レベル" name="sky1_track" />
+            <button label="水面" name="water_track" />
+          </panel>
+          <panel name="timeline">
+            <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated,
+            consider using layout_stack to get dynamic width adjustment-->
+            <text value="0％[DSC]" />
+            <text name="p1" value="25％ [DSC]" />
+            <text name="p2" value="50％ [DSC]" />
+            <text name="p3" value="75％ [DSC]" />
+            <text name="p4" value="100％ [DSC]" />
+            <multi_slider name="WLTimeSlider" />
+
+            <multi_slider name="WLDayCycleFrames" />
+
+            <text name="current_time" value="[PRCNT]％ [DSC]" />
+
+            <layout_stack name="track_options_ls">
+              <layout_panel name="track_options_lp">
+                <button label="トラックを以下からクローン" name="copy_track" />
+                <button label="ラックを以下からロード" name="load_track" />
+                <button label="トラックをクリア" name="clear_track" />
+
+              </layout_panel>
+              <layout_panel name="track_progress_lp">
+                <layout_stack name="progress_control">
+
+                  <layout_panel name="skip_back">
+                    <button name="skip_back_btn" tool_tip="後ろに移動" />
+                  </layout_panel>
+
+                  <layout_panel name="play_layout" />
+
+                  <layout_panel name="pause_layout" />
+
+                  <layout_panel name="skip_forward" />
+                </layout_stack>
+              </layout_panel>
+              <layout_panel name="frames_lp">
+                <button label="[FRAME]を追加" name="add_frame" />
+                <button label="[FRAME]を読み込む" name="btn_load_frame" />
+                <button label="[FRAME]を削除" name="delete_frame" />
+              </layout_panel>
+            </layout_stack>
+          </panel>
+        </layout_panel>
+        <layout_panel name="frame_edit_controls">
+          <!--bg_alpha_color="blue" background_visible="true" -->
+          <text name="icn_lock_edit">上部のタイムラインからキーフレームを選択し、設定を編集します。</text>
+        </layout_panel>
+        <layout_panel name="frame_settings_water">
+          <tab_container name="water_tabs">
+            <panel filename="panel_settings_water.xml" label="水" name="water_panel" />
+          </tab_container>
+        </layout_panel>
+        <layout_panel name="frame_settings_sky">
+          <tab_container name="sky_tabs">
+            <panel filename="panel_settings_sky_atmos.xml" label="大気＆雷" name="atmosphere_panel" />
+            <panel filename="panel_settings_sky_clouds.xml" label="雲" name="clouds_panel" />
+            <panel filename="panel_settings_sky_sunmoon.xml" label="太陽＆月" name="moon_panel" />
+            <!-- added programatically so it doesn't show up whether we want it or not
+            <panel name="density_panel" label="密度" />
+            -->
+          </tab_container>
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="buttons">
+      <button label="保存" name="save_btn" />
+
+      <button label="" name="btn_flyout" />
+
+      <button label="キャンセル" name="cancel_btn" />
+
+    </layout_panel>
+  </layout_stack>
+
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
index ac5b2839d1..32c3f4d9cf 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="HoverHeight" title="ホバー高さの設定">
-	<slider label="高さ" name="HoverHeightSlider"/>
-</floater>
+  <slider label="高さ" name="HoverHeightSlider" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index ca50ba8ef8..b4b3e2c09d 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater can_resize="true" follows="all" height="400" help_topic="event_details" label="Event" layout="topleft" name="Event" save_rect="true" save_visibility="false" title="EVENT DETAILS" width="600">
-	<floater.string name="loading_text">
-		ローディング...
-	</floater.string>
-	<floater.string name="done_text">
-		完了
-	</floater.string>
-	<web_browser follows="left|right|top|bottom" height="365" layout="topleft" left="10" name="browser" top="0" trusted_content="true" width="580"/>
-	<text follows="bottom|left" height="16" layout="topleft" left_delta="0" name="status_text" top_pad="10" width="150"/>
-</floater>
+<floater label="イベント" name="Event" title="イベントの情報">
+  <floater.string name="loading_text">読み込んでいます…</floater.string>
+  <floater.string name="done_text">完了</floater.string>
+  <web_browser name="browser" />
+  <text name="status_text" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_experience_search.xml b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
index 37f3da7d73..1d9243fb85 100644
--- a/indra/newview/skins/default/xui/ja/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="experiencepicker" title="体験を選択"/>
+<floater name="experiencepicker" title="体験を選択" />
diff --git a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
index be9cfd8c01..f496e99032 100644
--- a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
@@ -1,85 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater title="EXPERIENCE PROFILE">
-	<floater.string name="empty_slurl">
-		(なし)
-	</floater.string>
-	<floater.string name="maturity_icon_general">
-		&quot;Parcel_PG_Light&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_moderate">
-		&quot;Parcel_M_Light&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_adult">
-		&quot;Parcel_R_Light&quot;
-	</floater.string>
-	<text name="edit_title" value="体験プロフィール"/>
-	<tab_container name="tab_container">
-		<panel name="panel_experience_info">
-			<scroll_container name="xp_scroll">
-				<panel name="scrolling_panel">
-					<layout_stack>
-						<layout_panel name="top panel">
-							<button label="編集" name="edit_btn"/>
-						</layout_panel>
-						<layout_panel name="maturity panel">
-							<text name="ContentRating">
-								評価：
-							</text>
-						</layout_panel>
-						<layout_panel name="location panel">
-							<text name="Location">
-								場所：
-							</text>
-						</layout_panel>
-						<layout_panel>
-							<text name="Owner">
-								所有者：
-							</text>
-						</layout_panel>
-						<layout_panel name="group_panel">
-							<text name="Group">
-								グループ：
-							</text>
-						</layout_panel>
-						<layout_panel name="perm panel">
-							<button label="許可" name="allow_btn"/>
-							<button label="無視" name="forget_btn"/>
-							<button label="ブロック" name="block_btn"/>
-							<text name="privileged">
-								この体験はすべての住人に対して有効です。
-							</text>
-							<button label="嫌がらせの報告" name="report_btn"/>
-						</layout_panel>
-					</layout_stack>
-				</panel>
-			</scroll_container>
-		</panel>
-		<panel name="edit_panel_experience_info">
-			<scroll_container name="edit_xp_scroll">
-				<panel name="edit_scrolling_panel">
-					<text name="edit_experience_title_label" value="名前："/>
-					<text name="edit_experience_desc_label" value="説明："/>
-					<button label="グループ" name="Group_btn"/>
-					<text name="edit_ContentRating">
-						評価：
-					</text>
-					<icons_combo_box label="Moderate" name="edit_ContentRatingText" tool_tip="体験のレーティング区分を上げると、体験を許可したすべての住人の権限がリセットされます。">
-						<icons_combo_box.item label="Adult" name="Adult" value="42"/>
-						<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-						<icons_combo_box.item label="全般" name="PG" value="13"/>
-					</icons_combo_box>
-					<text name="edit_Location">
-						場所：
-					</text>
-					<button label="現在に設定" name="location_btn"/>
-					<button label="場所をクリア" name="clear_btn"/>
-					<check_box label="体験を有効にする" name="edit_enable_btn" tool_tip=""/>
-					<check_box label="検索で表示しない" name="edit_private_btn"/>
-					<text name="changes" value="体験がすべてのリージョンに表示されるには数分かかる場合があります。"/>
-					<button label="戻る" name="cancel_btn"/>
-					<button label="保存" name="save_btn"/>
-				</panel>
-			</scroll_container>
-		</panel>
-	</tab_container>
-</floater>
+<floater name="experience_profile" title="体験プロフィール">
+  <floater.string name="empty_slurl">（なし）</floater.string>
+  <floater.string name="maturity_icon_general">"Parcel_PG_Light"</floater.string>
+  <floater.string name="maturity_icon_moderate">"Parcel_M_Light"</floater.string>
+  <floater.string name="maturity_icon_adult">"Parcel_R_Light"</floater.string>
+  <text name="edit_title" value="体験プロフィール" />
+  <tab_container name="tab_container">
+    <panel name="panel_experience_info">
+      <scroll_container name="xp_scroll">
+        <panel name="scrolling_panel">
+          <layout_stack>
+            <layout_panel name="top panel">
+              <button label="編集" name="edit_btn" />
+            </layout_panel>
+            <layout_panel name="maturity panel">
+              <text name="ContentRating">評価：</text>
+            </layout_panel>
+            <layout_panel name="location panel">
+              <text name="Location">場所：</text>
+            </layout_panel>
+            <layout_panel>
+              <text name="Owner">所有者：</text>
+            </layout_panel>
+            <layout_panel name="group_panel">
+              <text name="Group">グループ：</text>
+            </layout_panel>
+            <layout_panel name="perm panel">
+              <button label="許可" name="allow_btn" />
+              <button label="無視" name="forget_btn" />
+              <button label="ブロック" name="block_btn" />
+              <text name="privileged">この体験はすべての住人に対して有効です。</text>
+              <button label="嫌がらせの報告" name="report_btn" />
+            </layout_panel>
+          </layout_stack>
+        </panel>
+      </scroll_container>
+    </panel>
+    <panel name="edit_panel_experience_info">
+      <scroll_container name="edit_xp_scroll">
+        <panel name="edit_scrolling_panel">
+          <text name="edit_experience_title_label" value="名前：" />
+          <text name="edit_experience_desc_label" value="説明：" />
+          <button label="グループ" name="Group_btn" />
+          <text name="edit_ContentRating">評価：</text>
+          <icons_combo_box label="Moderate" name="edit_ContentRatingText" tool_tip="体験のレーティング区分を上げると、体験を許可したすべての住人の権限がリセットされます。">
+            <icons_combo_box.item label="Adult" name="Adult" value="42" />
+            <icons_combo_box.item label="Moderate" name="Mature" value="21" />
+            <icons_combo_box.item label="全般" name="PG" value="13" />
+          </icons_combo_box>
+          <text name="edit_Location">場所：</text>
+          <button label="現在に設定" name="location_btn" />
+          <button label="場所をクリア" name="clear_btn" />
+          <check_box label="体験を有効にする" name="edit_enable_btn" tool_tip="" />
+          <check_box label="検索で表示しない" name="edit_private_btn" />
+          <text name="changes" value="体験がすべてのリージョンに表示されるには数分かかる場合があります。" />
+          <button label="戻る" name="cancel_btn" />
+          <button label="保存" name="save_btn" />
+        </panel>
+      </scroll_container>
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_experiences.xml b/indra/newview/skins/default/xui/ja/floater_experiences.xml
index 5186f8ee38..c17d570c27 100644
--- a/indra/newview/skins/default/xui/ja/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experiences.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_experiences" title="体験"/>
+<floater name="floater_experiences" title="体験">
+  <tab_container name="xp_tabs" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
index b226dfbfe1..0020bac32a 100644
--- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="fast_timers">
-	<string name="pause">
-		一時停止
-	</string>
-	<string name="run">
-		走る
-	</string>
-	<combo_box name="time_scale_combo">
-		<item label="2x 平均" name="2x Average"/>
-		<item label="最大" name="Max"/>
-		<item label="最近の最大" name="Recent Max"/>
-		<item label="100ms" name="100ms"/>
-	</combo_box>
-	<combo_box name="metric_combo">
-		<item label="時間" name="Time"/>
-		<item label="通話数" name="Number of Calls"/>
-		<item label="Hz" name="Hz"/>
-	</combo_box>
-	<button label="一時停止" name="pause_btn"/>
-</floater>
+  <string name="pause">一時停止</string>
+  <string name="run">走る</string>
+  <combo_box name="time_scale_combo">
+    <item label="2x 平均" name="2x Average" />
+    <item label="最大" name="Max" />
+    <item label="最近の最大" name="Recent Max" />
+    <item label="100ms" name="100ms" />
+  </combo_box>
+  <combo_box name="metric_combo">
+    <item label="時間" name="Time" />
+    <item label="通話数" name="Number of Calls" />
+    <item label="Hz" name="Hz" />
+  </combo_box>
+  <button label="一時停止" name="pause_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_fbc_web.xml b/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
new file mode 100644
index 0000000000..ab29b442cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_fbc_web" filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
index a00b87b990..888981b576 100644
--- a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Fixed Environment" title="固定された環境">
-	<string name="edit_sky">
-		空を編集：
-	</string>
-	<string name="edit_water">
-		水を編集：
-	</string>
-	<layout_stack name="floater_stack">
-		<layout_panel name="info_panel">
-			<button label="ロード" name="btn_load" tool_tip="持ち物から設定をロードする"/>
-			<button label="インポート" name="btn_import" tool_tip="ディスクから過去の設定をインポートする。"/>
-		</layout_panel>
-		<layout_panel name="button_panel">
-			<layout_stack name="button_bar_ls">
-				<layout_panel name="save_btn_lp">
-					<button label="保存" name="btn_commit"/>
-				</layout_panel>
-				<layout_panel name="revert_btn_lp">
-					<button label="キャンセル" name="btn_cancel" tool_tip="最後に保存された状態に戻す"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <string name="edit_sky">空を編集：</string>
+  <string name="edit_water">水を編集</string>
+  <layout_stack name="floater_stack">
+    <layout_panel name="info_panel">
+      <text name="info_panel_label">名前：</text>
+      <line_editor name="settings_name" />
+      <button label="読み込む" tool_tip="インベントリから設定を読み込みます。" />
+      <button label="インポート" tool_tip="ディスクから過去の設定をインポートします。" />
+    </layout_panel>
+    <layout_panel name="tab_area">
+      <tab_container name="tab_settings">
+        <!-- Tabs inserted here in code -->
+      </tab_container>
+    </layout_panel>
+    <layout_panel name="button_panel">
+      <layout_stack name="button_bar_ls">
+        <layout_panel name="save_btn_lp">
+          <button label="保存" name="btn_commit" />
+          <button name="btn_flyout" />
+        </layout_panel>
+        <layout_panel name="revert_btn_lp">
+          <button label="キャンセル" name="btn_cancel" tool_tip="最後に保存された状態に戻す。" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
index b853f395dd..203a8810c7 100644
--- a/indra/newview/skins/default/xui/ja/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml
@@ -1,6 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="フォントのテスト">
-	<text name="linea">
-		オーバーライドテスト - Times Romanでここに表示されます。 （default/xui/en-us フォルダー内）
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="フォントテスト">
+  <text type="string" length="1" bottom_delta="40" follows="left|top|right" height="16" layout="topleft" left="16">小さいサンセリフ</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifMedium" height="16" layout="topleft" left="16">普通の大きさのサンセリフ</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">サンセリフ。スタイル設定無し（普通の大きさと同じ） </text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" height="16" layout="topleft" left="16">大きいサンセリフ</text>
+  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" height="32" layout="topleft" left="16">サンセリフ size=huge</text>
+  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" font.style.="BOLD" height="32" layout="topleft" left="16">巨大なサンセリフ style=BOLD</text>
+  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifBold" font.size="Huge" height="32" layout="topleft" left="16">ボールドのサンセリフ size=huge</text>
+  <text type="string" length="1" bottom_delta="40" follows="left|top|right" font="Monospace" height="16" layout="topleft" left="16">等幅</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Monospace" font.size="Large" height="16" layout="topleft" left="16">等幅 size=large</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" font.style="BOLD" height="16" layout="topleft" left="16">大きなサンセリフ style=BOLD</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifBold" height="16" layout="topleft" left="16">ボールドのサンセリフ</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD" height="16" layout="topleft" left="16">サンセリフ style=BOLD（ボールドのサンセリフと一緒）</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="ITALIC" height="16" layout="topleft" left="16">サンセリフ style=ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">サンセリフ style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">サンセリフ style=BOLD|ITALIC shadow=soft</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="UNDERLINE" height="16" layout="topleft" left="16">サンセリフ style=UNDERLINE</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font_shadow="none" height="16" layout="topleft" left="16">サンセリフ style=hard</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">サンセリフ shadow=soft</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" height="16" layout="topleft" left="16">DejaVu</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD" height="16" layout="topleft" left="16">DejaVu style=BOLD</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="ITALIC" height="16" layout="topleft" left="16">DejaVu style=ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">DejaVu style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">DejaVu size=Large style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" height="16" layout="topleft" left="16">Helvetica</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD" height="16" layout="topleft" left="16">Helvetica style=BOLD</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="ITALIC" height="16" layout="topleft" left="16">Helvetica style=ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">Helvetica style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">Helvetica size=Large style=BOLD|ITALIC</text>
+  <!--
+    <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="OverrideTest" height="16" layout="topleft" left="16" name="linea">
+        OverrideTest, should be times, from default/xui/en
+    </text>
+    <text type="string" length="1" bottom_delta="20" follows="left|top|right" height="16" layout="topleft" left="16">
+        BogusFontName
+    </text>
+-->
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_forget_user.xml b/indra/newview/skins/default/xui/ja/floater_forget_user.xml
index 63d6d05a5e..9099bd8784 100644
--- a/indra/newview/skins/default/xui/ja/floater_forget_user.xml
+++ b/indra/newview/skins/default/xui/ja/floater_forget_user.xml
@@ -1,2 +1,9 @@
-<?xml version="1.0" ?>
-<floater name="groups" title="記憶されたユーザー名"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="groups" title="記録済みのユーザ名">
+  <scroll_list name="user_list">
+    <scroll_list.columns name="user" />
+  </scroll_list>
+  <!-- 原文はForgotだが「忘れる」という翻訳はおかしいので削除に変更 -->
+  <button label="削除" label_selected="削除" name="forget" />
+  <check_box height="20" label="このユーザー名のローカルデータも削除する" name="delete_data" tool_tip="削除対象：チャット履歴、最後のセッションのスクリーンショット、ブラウザのCookie、テレポート履歴、ツールバー設定など。一部のローカルファイルは、グリッド間で共有されます。" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index b5b1efe386..96d3c87835 100644
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="場所" name="gestures" title="ジェスチャー">
-	<floater.string name="loading">
-		ローディング...
-	</floater.string>
-	<floater.string name="playing">
-		（再生中）
-	</floater.string>
-	<floater.string name="copy_name">
-		[COPY_NAME] のコピー
-	</floater.string>
-	<scroll_list name="gesture_list">
-		<scroll_list.columns label="名前" name="name"/>
-		<scroll_list.columns label="チャット" name="trigger"/>
-		<scroll_list.columns label="" name="key"/>
-		<scroll_list.columns label="キー" name="shortcut"/>
-	</scroll_list>
-	<panel label="bottom_panel" name="bottom_panel">
-		<menu_button name="gear_btn" tool_tip="詳細オプション"/>
-		<button name="new_gesture_btn" tool_tip="新規ジェスチャーを作成"/>
-		<button name="activate_btn" tool_tip="選択したジェスチャーのアクティベートの有無"/>
-		<button name="del_btn" tool_tip="このジェスチャーを削除"/>
-	</panel>
-	<button label="編集" name="edit_btn" tool_tip="選択済みのジェスチャーを編集するためにウィンドウを開ける。"/>
-	<button label="再生" name="play_btn" tool_tip="インワールドで選択済みのジェスチャーを実行する。"/>
-	<button label="停止" name="stop_btn"/>
-</floater>
+  <floater.string name="loading">読み込んでいます…。</floater.string>
+  <floater.string name="playing">（再生中）</floater.string>
+  <floater.string name="copy_name">[COPY_NAME]のコピー</floater.string>
+  <scroll_list name="gesture_list">
+    <scroll_list.columns label="名前" name="name" />
+    <scroll_list.columns label="チャット" name="trigger" />
+    <scroll_list.columns label="" name="key" />
+    <scroll_list.columns label="キー" name="shortcut" />
+  </scroll_list>
+  <panel label="bottom_panel" name="bottom_panel">
+    <menu_button name="gear_btn" tool_tip="詳細オプション" />
+    <button name="new_gesture_btn" tool_tip="新しいジェスチャーを作成" />
+    <button name="activate_btn" tool_tip="選択したジェスチャーの有効化／無効化" />
+    <button name="del_btn" tool_tip="このジェスチャーを削除" />
+  </panel>
+  <button label="編集" name="edit_btn" tool_tip="選択したジェスチャーの編集ウィンドウを開く。" />
+  <button label="再生" name="play_btn" tool_tip="インワールドで選択したジェスチャーを実行する。" />
+  <button label="停止" name="stop_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 9e5d473db7..dc77ff4bad 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -1,98 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="godtools floater" title="ゴッド・ツール">
-	<tab_container name="GodTools Tabs">
-		<panel label="グリッド" name="grid">
-			<button label="この地域の地図の表示キャッシュを消去" label_selected="この地域の地図の表示キャッシュを消去" name="Flush This Region&apos;s Map Visibility Caches"/>
-		</panel>
-		<panel label="地域" name="region">
-			<text name="Region Name:">
-				リージョン名：
-			</text>
-			<check_box label="準備" name="check prelude" tool_tip="この設定により、この地域の準備をします。"/>
-			<check_box label="太陽固定" name="check fixed sun" tool_tip="太陽位置を固定（[地域／不動産]＞[地形]の場合と同様）"/>
-			<check_box label="テレポートのホームをリセット" name="check reset home" tool_tip="住人がテレポートで外に出たら、ホームを目的地にリセットします。"/>
-			<check_box label="可視" name="check visible" tool_tip="この設定により、この地域をゴッド・モード以外でも可視にします。"/>
-			<check_box label="ダメージ" name="check damage" tool_tip="この設定により、この地域内でダメージを有効化します。"/>
-			<check_box label="トラフィック・トラッキングをブロック" name="block dwell" tool_tip="この設定により、この地域内のトラフィック計算をオフにします。"/>
-			<check_box label="地形編集をブロック" name="block terraform" tool_tip="この設定により、この地域内での土地整備を禁止"/>
-			<check_box label="サンドボックス" name="is sandbox" tool_tip="これがサンドボックス地域でも切り替え"/>
-			<button label="地形を構築する" label_selected="地形を構築する" name="Bake Terrain" tool_tip="現在の地形をデフォルトとして保存します。"/>
-			<button label="地形を元に戻す" label_selected="地形を元に戻す" name="Revert Terrain" tool_tip="現在の地形をデフォルトに置換します。"/>
-			<button label="地形を交換" label_selected="地形を交換" name="Swap Terrain" tool_tip="現在の地形をデフォルトと入れ替えます。"/>
-			<text name="estate id">
-				不動産ID：
-			</text>
-			<text name="parent id">
-				親ID：
-			</text>
-			<line_editor name="parentestate" tool_tip="これは、この地域の親不動産です。"/>
-			<text name="Grid Pos: ">
-				グリッド位置：
-			</text>
-			<line_editor name="gridposx" tool_tip="これは、この地域のグリッドxの位置です。"/>
-			<line_editor name="gridposy" tool_tip="これは、この地域のグリッドyの位置です。"/>
-			<text name="Redirect to Grid: ">
-				グリッドにリダ
-イレクト：
-			</text>
-			<text name="billable factor text">
-				請求率：
-			</text>
-			<text name="land cost text">
-				平方メートル当
-たりL$：
-			</text>
-			<button label="更新" label_selected="更新" name="Refresh" tool_tip="上記の情報を更新するには、ここをクリックします。"/>
-			<button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。"/>
-			<button label="地域を選択" label_selected="地域を選択" name="Select Region" tool_tip="土地ツールで地域全体を選択してください。"/>
-			<button label="ただちに自動保存する" label_selected="ただちに自動保存する" name="Autosave now" tool_tip="Gzip状態を自動保存ディレクトリに保存します。"/>
-		</panel>
-		<panel label="オブジェクト" name="objects">
-			<panel.string name="no_target">
-				（ターゲットなし）
-			</panel.string>
-			<text name="Region Name:">
-				リージョン名：
-			</text>
-			<text name="region name">
-				ウェルシュ
-			</text>
-			<check_box label="スクリプトを無効化" name="disable scripts" tool_tip="この設定により、この地域内のスクリプトをすべて無効化"/>
-			<check_box label="衝突を無効化" name="disable collisions" tool_tip="この設定により、この地域内の非エージェント衝突を無効化"/>
-			<check_box label="物理作用を無効化" name="disable physics" tool_tip="この設定により、この地域内の物理的作用をすべて無効化"/>
-			<button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。"/>
-			<button label="対象の設定" label_selected="対象の設定" name="Set Target" tool_tip="オブジェクト削除の対象となるアバターを設定してください。"/>
-			<text name="target_avatar_name">
-				（対象なし）
-			</text>
-			<button label="他の土地における対象のスクリプト・オブジェクトを削除" label_selected="他の土地における対象のスクリプト・オブジェクトを削除" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="この地域において対象が所有していないスクリプト・オブジェクトをすべて削除します。 （コピー禁止）オブジェクトは返却されます。"/>
-			<button label="「すべての」土地における対象のスクリプト・オブジェクトを削除" label_selected="「すべての」土地における対象のスクリプト・オブジェクトを削除" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="この地域において対象が所有しているスクリプト・オブジェクトをすべて削除します。 （コピー禁止）オブジェクトは返却されます。"/>
-			<button label="対象のオブジェクトを「すべて」削除" label_selected="対象のオブジェクトを「すべて」削除" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="この地域において対象が所有しているオブジェクトをすべて削除します。 （コピー禁止）オブジェクトは返却されます。"/>
-			<button label="トップ・コライダーを取得" label_selected="トップ・コライダーを取得" name="Get Top Colliders" tool_tip="最も段階の狭いコールバックが発生したオブジェクトのリストを取得します。"/>
-			<button label="トップ・スクリプトを取得" label_selected="トップ・スクリプトを取得" name="Get Top Scripts" tool_tip="スクリプトの起動に最も時間を費やしているオブジェクトのリストを取得します。"/>
-			<button label="スクリプト・ダイジェスト" label_selected="スクリプト・ダイジェスト" name="Scripts digest" tool_tip="すべてのスクリプトとそれらの使用回数のリストを取得します。"/>
-		</panel>
-		<panel label="要求" name="request">
-			<text name="Destination:">
-				目的地：
-			</text>
-			<combo_box name="destination">
-				<combo_box.item label="選択" name="item1"/>
-				<combo_box.item label="エージェント地域" name="item2"/>
-			</combo_box>
-			<text name="Request:">
-				要求：
-			</text>
-			<combo_box name="request">
-				<combo_box.item label="コライダー＜ステップ＞" name="item1"/>
-				<combo_box.item label="スクリプト＜回数＞、＜オプション・パターン＞" name="item2"/>
-				<combo_box.item label="オブジェクト＜パターン＞" name="item3"/>
-				<combo_box.item label="rez ＜asset_id＞" name="item4"/>
-			</combo_box>
-			<text name="Parameter:">
-				パラメーター：
-			</text>
-			<button label="リクエストする" label_selected="リクエストする" name="Make Request"/>
-		</panel>
-	</tab_container>
-</floater>
+  <tab_container name="GodTools Tabs">
+    <panel label="グリッド" name="grid">
+      <button label="このリージョン（地域）のマップの表示キャッシュを消去" label_selected="このリージョン（地域）のマップの表示キャッシュを消去" name="Flush This Region's Map Visibility Caches" />
+    </panel>
+    <panel label="地域" name="region">
+      <text name="Region Name:">リージョン（地域）名：</text>
+      <check_box label="準備" name="check prelude" tool_tip="この設定により、この地域の準備をします。" />
+      <check_box label="太陽固定" name="check fixed sun" tool_tip="太陽位置を固定（「地域／不動産」＞「地形」の場合と同様）" />
+      <check_box label="テレポートのホームをリセット" name="check reset home" tool_tip="住人がテレポートで外に出たら、ホームを目的地にリセットします。" />
+      <check_box label="可視" name="check visible" tool_tip="この設定により、この地域をゴッド・モード以外でも可視にします。" />
+      <check_box label="ダメージ" name="check damage" tool_tip="この設定により、この地域内でダメージを有効化します。" />
+      <check_box label="トラフィックのトラッキングをブロック" name="block dwell" tool_tip="この設定により、この地域内のトラフィック計算をオフにします。" />
+      <check_box label="地形編集をブロック" name="block terraform" tool_tip="この設定により、この地域内での土地整備を禁止" />
+      <check_box label="サンドボックス" name="is sandbox" tool_tip="これがサンドボックス地域でも切り替え" />
+      <button label="地形を構築する" label_selected="地形を構築する" name="Bake Terrain" tool_tip="現在の地形をデフォルトとして保存します。" />
+      <button label="地形を元に戻す" label_selected="地形を元に戻す" name="Revert Terrain" tool_tip="現在の地形をデフォルトに置換します。" />
+      <button label="地形を交換" label_selected="地形を交換" name="Swap Terrain" tool_tip="現在の地形をデフォルトと入れ替えます。" />
+      <text name="estate id">不動産ＩＤ：</text>
+      <text name="parent id">親ＩＤ：</text>
+      <line_editor name="parentestate" tool_tip="これは、このリージョン（地域）の親不動産です。" />
+      <text name="Grid Pos: ">グリッド位置：</text>
+      <line_editor name="gridposx" tool_tip="これは、このリージョン（地域）のグリッドＸ座標です。" />
+      <line_editor name="gridposy" tool_tip="これは、このリージョン（地域）のグリッドＹ座標です。" />
+      <text name="Redirect to Grid: ">グリッドにリダイレクト：</text>
+      <text name="billable factor text">請求率：</text>
+      <text name="land cost text">㎡当たりのL$：</text>
+      <button label="更新" label_selected="更新" name="Refresh" tool_tip="上記の情報を更新するには、ここをクリックします。" />
+      <button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。" />
+      <button label="リージョン（地域）を選択" label_selected="地域を選択" name="Select Region" tool_tip="土地ツールで地域全体を選択してください。" />
+      <button label="ただちに自動保存する" label_selected="ただちに自動保存する" name="Autosave now" tool_tip="Gzip状態を自動保存ディレクトリに保存します。" />
+    </panel>
+    <panel label="オブジェクト" name="objects">
+      <panel.string name="no_target">（ターゲットなし）</panel.string>
+      <text name="Region Name:">リージョン（地域）名：</text>
+      <text name="region name">ウェルシュ</text>
+      <check_box label="スクリプトを無効化" name="disable scripts" tool_tip="この設定により、この地域内のスクリプトをすべて無効化" />
+      <check_box label="衝突を無効化" name="disable collisions" tool_tip="この設定により、この地域内の非エージェント衝突を無効化" />
+      <check_box label="物理作用を無効化" name="disable physics" tool_tip="この設定により、この地域内の物理的作用をすべて無効化" />
+      <button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。" />
+      <button label="対象の設定" label_selected="対象の設定" name="Set Target" tool_tip="オブジェクト削除の対象となるアバターを設定してください。" />
+      <text name="target_avatar_name">（対象なし）</text>
+      <button label="他の土地における対象のスクリプト・オブジェクトを削除" label_selected="他の土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On Others Land" tool_tip="この地域において対象が所有していないスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
+      <button label="「すべての」土地における対象のスクリプト・オブジェクトを削除" label_selected="「すべての」土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="この地域において対象が所有しているスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
+      <button label="対象のオブジェクトを「すべて」削除" label_selected="対象のオブジェクトを「すべて」削除" name="Delete *ALL* Of Target's Objects" tool_tip="この地域において対象が所有しているオブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
+      <button label="トップ・コライダーを取得" label_selected="トップ・コライダーを取得" name="Get Top Colliders" tool_tip="最も段階の狭いコールバックが発生したオブジェクトのリストを取得します。" />
+      <button label="トップ・スクリプトを取得" label_selected="トップ・スクリプトを取得" name="Get Top Scripts" tool_tip="スクリプトの起動に最も時間を費やしているオブジェクトのリストを取得します。" />
+      <button label="スクリプト・ダイジェスト" label_selected="スクリプト・ダイジェスト" name="Scripts digest" tool_tip="すべてのスクリプトとそれらの使用回数のリストを取得します。" />
+    </panel>
+    <panel label="要求" name="request">
+      <text name="Destination:">目的地：</text>
+      <combo_box name="destination">
+        <combo_box.item label="選択" name="item1" />
+        <combo_box.item label="エージェント地域" name="item2" />
+      </combo_box>
+      <text name="Request:">要求：</text>
+      <combo_box name="request">
+        <combo_box.item label="コライダー＜ステップ＞" name="item1" />
+        <combo_box.item label="スクリプト＜回数＞、＜オプション・パターン＞" name="item2" />
+        <combo_box.item label="オブジェクト＜パターン＞" name="item3" />
+        <combo_box.item label="rez ＜asset_id＞" name="item4" />
+      </combo_box>
+      <text name="Parameter:">パラメーター：</text>
+      <button label="リクエストする" label_selected="リクエストする" name="Make Request" />
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_goto_line.xml b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
index 5f2717ace5..c403d24942 100644
--- a/indra/newview/skins/default/xui/ja/floater_goto_line.xml
+++ b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script goto" title="行に移動">
-	<button label="OK" label_selected="OK" name="goto_btn"/>
-	<text name="txt">
-		行に移動
-	</text>
-</floater>
+  <button label="ＯＫ" label_selected="ＯＫ" name="goto_btn" />
+  <text name="txt">行に移動</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
index 15200d7ef7..dfc5eb1250 100644
--- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_help_browser" title="ヘルプブラウザ">
-	<floater.string name="loading_text">
-		ローディング...
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="external_controls"/>
-	</layout_stack>
-</floater>
+  <floater.string name="loading_text">読み込んでいます…。</floater.string>
+  <layout_stack name="stack1">
+    <layout_panel name="external_controls" />
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml
index 4cebe27226..3a02e5f889 100644
--- a/indra/newview/skins/default/xui/ja/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/ja/floater_how_to.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_how_to" title="ハウツー"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_how_to" title="ウェルカムアイランドガイドブック" filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
index e3841c2cd9..862991f87e 100644
--- a/indra/newview/skins/default/xui/ja/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hud.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_hud" title="チュートリアル"/>
+<floater name="floater_hud" title="チュートリアル" />
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index a155efdc1e..81c89fe9bc 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="floater_im_box" title="会話">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
-					<button name="add_btn" tool_tip="新しい会話を開始"/>
-					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
-					<text name="stub_textbox">
-						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+  <string name="collapse_icon" value="Conv_toolbar_collapse" />
+  <string name="expand_icon" value="Conv_toolbar_expand" />
+  <layout_stack name="conversations_stack">
+    <layout_panel name="conversations_layout_panel">
+      <layout_stack name="conversations_pane_buttons_stack">
+        <layout_panel name="conversations_pane_buttons_expanded">
+          <menu_button name="sort_btn" tool_tip="オプションの表示／並べ替え" />
+          <button name="add_btn" tool_tip="新しい会話を開始" />
+          <button name="speak_btn" tool_tip="マイクを使って人と話す" />
+        </layout_panel>
+        <layout_panel name="conversations_pane_buttons_collapsed">
+          <button name="expand_collapse_btn" tool_tip="このリストを閉じる／開く" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="messages_layout_panel">
+      <panel_container name="im_box_tab_container">
+        <panel name="stub_panel">
+          <button name="stub_collapse_btn" tool_tip="このペインを閉じる" />
+          <text name="stub_textbox">この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]</text>
+        </panel>
+      </panel_container>
+    </layout_panel>
+  </layout_stack>
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index 7ed46f7f01..aa73f53677 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,57 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
-	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
-	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
-	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
-				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
-				<button name="close_btn" tool_tip="この会話を終了する"/>
-				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<layout_stack name="translate_and_chat_stack">
-							<layout_panel name="translate_chat_checkbox_lp">
-								<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-							</layout_panel>
-						</layout_stack>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="宛先" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
-</floater>
+  <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
+  <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
+  <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line" />
+  <floater.string name="expandline_icon" value="Conv_expand_one_line" />
+  <floater.string name="collapse_icon" value="Conv_toolbar_collapse" />
+  <floater.string name="expand_icon" value="Conv_toolbar_expand" />
+  <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne" />
+  <floater.string name="return_icon" value="Conv_toolbar_arrow_sw" />
+  <floater.string name="participant_added" value="[NAME]に会話を招待されました。" />
+  <floater.string name="multiple_participants_added" value="[NAME]は会話に招待されました。" />
+  <floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する" />
+  <floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す" />
+  <floater.string name="start_call_button_tooltip" value="会話の接続を開く" />
+  <floater.string name="end_call_button_tooltip" value="会話の接続を閉じる" />
+  <floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる" />
+  <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる" />
+  <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く" />
+  <view name="contents_view">
+    <layout_stack name="main_stack">
+      <layout_panel name="toolbar_panel">
+        <menu_button name="view_options_btn" tool_tip="表示／並べ替えのオプション" />
+        <menu_button name="gear_btn" tool_tip="選択した人に対するアクション" />
+        <button name="add_btn" tool_tip="この会話に他の人を追加する" />
+        <button name="voice_call_btn" tool_tip="会話の接続を開く" />
+        <button name="close_btn" tool_tip="この会話を終了する" />
+        <button name="expand_collapse_btn" tool_tip="このペインを閉じる／開く" />
+      </layout_panel>
+      <layout_panel name="body_panel">
+        <layout_stack name="im_panels">
+          <layout_panel name="right_part_holder">
+            <layout_stack name="translate_and_chat_stack">
+              <layout_panel name="translate_chat_checkbox_lp">
+                <check_box label="チャットを翻訳" name="translate_chat_checkbox" />
+              </layout_panel>
+            </layout_stack>
+          </layout_panel>
+        </layout_stack>
+      </layout_panel>
+      <layout_panel name="chat_layout_panel">
+        <layout_stack name="input_panels">
+          <layout_panel name="input_editor_layout_panel">
+            <chat_editor label="送信先" name="chat_editor" />
+          </layout_panel>
+          <layout_panel name="input_button_layout_panel">
+            <button name="minz_btn" tool_tip="メッセージパネルの表示／非表示" />
+          </layout_panel>
+        </layout_stack>
+      </layout_panel>
+    </layout_stack>
+  </view>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index 1ffc27fd70..5391591f36 100644
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<text name="preview_label">
-		プレビュー：
-	</text>
-	<combo_box label="服の種類" name="clothing_type_combo">
-		<item label="画像" name="Image" value="画像"/>
-		<item label="髪" name="Hair" value="髪"/>
-		<item label="女性の頭" name="FemaleHead" value="女性の頭"/>
-		<item label="女性の上半身" name="FemaleUpperBody" value="女性の上半身"/>
-		<item label="女性の下半身" name="FemaleLowerBody" value="女性の下半身"/>
-		<item label="男性の頭" name="MaleHead" value="男性の頭"/>
-		<item label="男性の上半身" name="MaleUpperBody" value="男性の上半身"/>
-		<item label="男性の下半身" name="MaleLowerBody" value="男性の下半身"/>
-		<item label="スカート" name="Skirt" value="スカート"/>
-		<item label="スカルプトプリム" name="SculptedPrim" value="スカルプトプリム"/>
-	</combo_box>
-	<text name="bad_image_text">
-		イメージを読み取れません。
-
-24bitTarga(.tga)でイメージを保存してください。
-	</text>
-	<check_box label="可逆圧縮" name="lossless_check"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="アップロードﾞL$[AMOUNT]" name="ok_btn"/>
-</floater>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <text name="preview_label">プレビュー：</text>
+  <combo_box label="服装の種類" name="clothing_type_combo">
+    <item label="画像" name="Image" value="画像" />
+    <item label="髪型" name="Hair" value="髪型" />
+    <item label="女性の頭" name="FemaleHead" value="女性の頭" />
+    <item label="女性の上半身" name="FemaleUpperBody" value="女性の上半身" />
+    <item label="女性の下半身" name="FemaleLowerBody" value="女性の下半身" />
+    <item label="男性の頭" name="MaleHead" value="男性の頭" />
+    <item label="男性の上半身" name="MaleUpperBody" value="男性の上半身" />
+    <item label="男性の下半身" name="MaleLowerBody" value="男性の下半身" />
+    <item label="スカート" name="Skirt" value="スカート" />
+    <item label="スカルプトプリム" name="SculptedPrim" value="スカルプトプリム" />
+  </combo_box>
+  <text name="bad_image_text">画像を読み込めませんでした。
+24bitのTarga（.tga）形式で画像を保存してください。</text>
+  <check_box label="可逆圧縮" name="lossless_check" />
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="アップロードﾞL$[AMOUNT]" name="ok_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
index 65edafb169..8a67b8c4f3 100644
--- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
@@ -1,23 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Import Collada" title="風景のインポート">
-	<text name="mesh count">
-		メッシュ： [COUNT]
-	</text>
-	<text name="texture count">
-		テクスチャ： [COUNT]
-	</text>
-	<text name="status">
-		ステータス： [STATUS]
-	</text>
-	<button label="取り消し" name="cancel"/>
-	<button label="OK" name="ok"/>
-	<string name="status_idle">
-		待機状態
-	</string>
-	<string name="status_uploading">
-		[NAME]をアップロード中
-	</string>
-	<string name="status_creating">
-		オブジェクト[NAME]を作成中
-	</string>
-</floater>
+  <text name="mesh count">メッシュ：[COUNT]</text>
+  <text name="texture count">テクスチャ：[COUNT]</text>
+  <text name="status">ステータス：[STATUS]</text>
+  <button label="キャンセル" name="cancel" />
+  <button label="ＯＫ" name="ok" />
+  <string name="status_idle">待機状態</string>
+  <string name="status_uploading">[NAME]をアップロード中</string>
+  <string name="status_creating">オブジェクト[NAME]を作成中</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index 308f6f9a3d..df028a008d 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -1,33 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="incoming call" title="着信">
-	<floater.string name="lifetime">
-		5
-	</floater.string>
-	<floater.string name="localchat">
-		近くのボイスチャット
-	</floater.string>
-	<floater.string name="anonymous">
-		匿名ユーザー
-	</floater.string>
-	<floater.string name="VoiceInviteP2P">
-		からコールを受けています。
-	</floater.string>
-	<floater.string name="VoiceInviteAdHoc">
-		がコンファレンスチャットで、ボイスチャットに参加しました。
-	</floater.string>
-	<floater.string name="VoiceInviteGroup">
-		&apos;[GROUP]&apos;のボイスチャネルに参加なさいました。
-	</floater.string>
-	<floater.string name="VoiceInviteQuestionGroup">
-		[CURRENT_CHAT]を退席して、&apos;[GROUP]&apos;とのチャットに参加しますか？
-	</floater.string>
-	<floater.string name="VoiceInviteQuestionDefault">
-		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
-	</floater.string>
-	<text name="question">
-		コールに応答すると、現在のボイスチャットから切断されます。
-	</text>
-	<button label="取る" label_selected="取る" name="Accept"/>
-	<button label="無視" label_selected="無視" name="Reject"/>
-	<button label="代わりに IM を開く" name="Start IM"/>
-</floater>
+  <floater.string name="lifetime">5</floater.string>
+  <floater.string name="localchat">近隣のボイスチャット</floater.string>
+  <floater.string name="anonymous">匿名ユーザー</floater.string>
+  <floater.string name="VoiceInviteP2P">からコールを受けています。</floater.string>
+  <floater.string name="VoiceInviteAdHoc">が会話チャットで、ボイスチャットに参加しました。</floater.string>
+  <floater.string name="VoiceInviteGroup">'[GROUP]'のボイスチャネルに参加なさいました。</floater.string>
+  <floater.string name="VoiceInviteQuestionGroup">[CURRENT_CHAT]を退席して、'[GROUP]'とのチャットに参加しますか？</floater.string>
+  <floater.string name="VoiceInviteQuestionDefault">[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？</floater.string>
+  <text name="question">コールに応答すると、現在のボイスチャットから切断されます。</text>
+  <button label="取る" label_selected="取る" name="Accept" />
+  <button label="無視" label_selected="無視" name="Reject" />
+  <button label="代わりにIMを開く" name="Start IM" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index b3825c0b7f..dfbf698c7e 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="450" name="inspect" title="オブジェクトのチェック">
-	<floater.string name="timeStamp">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</floater.string>
-	<scroll_list name="object_list" tool_tip="リストからオブジェクトを選択し、インワールドで強調表示します。">
-		<scroll_list.columns label="名前" name="object_name"/>
-		<scroll_list.columns label="所有者名" name="owner_name"/>
-		<scroll_list.columns label="制作者名" name="creator_name"/>
-		<scroll_list.columns label="作成日" name="creation_date"/>
-	</scroll_list>
-	<button label="所有者のプロフィールを表示..." name="button owner" tool_tip="選択したオブジェクトの所有者のプロフィールを表示します" width="180"/>
-	<button label="制作者のプロフィールを表示..." name="button creator" tool_tip="選択したオブジェクトの制作者のプロフィールを表示します" width="180"/>
-</floater>
+<floater name="inspect" title="オブジェクトの調査">
+  <floater.string name="timeStamp">[year,datetime,slt]年[mth,datetime,slt]月[day,datetime,slt]日（[wkday,datetime,slt]）　[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]</floater.string>
+  <scroll_list name="object_list" tool_tip="このリストからオブジェクトを選択して、インワールドでハイライトします。">
+    <scroll_list.columns label="オブジェクト名" name="object_name" />
+    <scroll_list.columns label="所有者" name="owner_name" />
+    <scroll_list.columns label="制作者" name="creator_name" />
+    <scroll_list.columns label="制作日" name="creation_date" />
+    <scroll_list.commit_callback function="Inspect.SelectObject" />
+  </scroll_list>
+  <button label="所有者のプロフィール…" name="button owner" tool_tip="ハイライトされたオブジェクトの所有者のプロフィールを見る" />
+  <button label="制作者のプロフィール…" name="button creator" tool_tip="ハイライトされたオブジェクトの元の作成者のプロフィールを見る" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index 8d3a655a06..da67de74af 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="item properties" title="インベントリアイテムのプロパティ">
-	<floater.string name="unknown">(不明）</floater.string>
-	<floater.string name="public">(公共)</floater.string>
-	<floater.string name="you_can">できること：</floater.string>
-	<floater.string name="owner_can">オーナーは次のことができます：</floater.string>
-	<floater.string name="acquiredDate">[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">名前：</text>
-	<text name="LabelItemDescTitle">説明：</text>
-	<text name="LabelCreatorTitle">クリエーター</text>
-	<button label="プロフィール..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">オーナー：</text>
-	<button label="プロフィール..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">入手日時：</text>
-	<text name="LabelAcquiredDate">2006年5月24日水曜日12:50:46</text>
-	<text name="OwnerLabel">あなた：</text>
-	<check_box label="編集" name="CheckOwnerModify"/>
-	<check_box label="コピー" name="CheckOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">全員：</text>
-	<check_box label="コピー" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">グループ：</text>
-	<check_box label="共有" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="158">次の所有者：</text>
-	<check_box label="編集" name="CheckNextOwnerModify"/>
-	<check_box label="コピー" name="CheckNextOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckNextOwnerTransfer"/>
-	<check_box label="売り出し中" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="コピー" name="Copy"/>
-		<combo_box.item label="コンテンツ" name="Contents"/>
-		<combo_box.item label="オリジナル" name="Original"/>
-	</combo_box>
-	<spinner label="価格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
+  <floater.string name="unknown">（不明）</floater.string>
+  <floater.string name="public">（公共）</floater.string>
+  <floater.string name="you_can">できること：</floater.string>
+  <floater.string name="owner_can">オーナーは次のことができます：</floater.string>
+  <floater.string name="acquiredDate">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</floater.string>
+  <text name="LabelItemNameTitle">名前：</text>
+  <text name="LabelItemDescTitle">説明：</text>
+  <text name="LabelCreatorTitle">制作者：</text>
+  <button label="プロフィール…" label_selected="" name="BtnCreator" />
+  <text name="LabelOwnerTitle">所有者：</text>
+  <button label="プロフィール…" label_selected="" name="BtnOwner" />
+  <text name="LabelAcquiredTitle">入手日時：</text>
+  <text name="LabelAcquiredDate">2006年5月24日水曜日　12：50：46</text>
+  <text name="OwnerLabel">あなた：</text>
+  <check_box label="編集" name="CheckOwnerModify" />
+  <check_box label="コピー" name="CheckOwnerCopy" />
+  <check_box label="再販・譲渡" name="CheckOwnerTransfer" />
+  <text name="AnyoneLabel">全員：</text>
+  <check_box label="コピー" name="CheckEveryoneCopy" />
+  <text name="GroupLabel">グループ：</text>
+  <check_box label="共有" name="CheckShareWithGroup" />
+  <text name="NextOwnerLabel">次の所有者：</text>
+  <check_box label="編集" name="CheckNextOwnerModify" />
+  <check_box label="コピー" name="CheckNextOwnerCopy" />
+  <check_box label="再販・譲渡" name="CheckNextOwnerTransfer" />
+  <check_box label="売り出し中" name="CheckPurchase" />
+  <combo_box name="ComboBoxSaleType">
+    <combo_box.item label="コピー" name="Copy" />
+    <combo_box.item label="コンテンツ" name="Contents" />
+    <combo_box.item label="オリジナル" name="Original" />
+  </combo_box>
+  <spinner label="価格：" name="Edit Cost" />
+  <text name="CurrencySymbol">L$</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 425cb7ad81..56438767d6 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="インベントリ最近取得したアイテム">
-	<check_box label="アニメーション" name="check_animation"/>
-	<check_box label="コーリング・カード" name="check_calling_card"/>
-	<check_box label="服" name="check_clothing"/>
-	<check_box label="ジェスチャー" name="check_gesture"/>
-	<check_box label="ランドマーク" name="check_landmark"/>
-	<check_box label="ノートカード" name="check_notecard"/>
-	<check_box label="メッシュ" name="check_mesh"/>
-	<check_box label="オブジェクト" name="check_object"/>
-	<check_box label="スクリプト" name="check_script"/>
-	<check_box label="サウンド" name="check_sound"/>
-	<check_box label="テクスチャ" name="check_texture"/>
-	<check_box label="スナップショット" name="check_snapshot"/>
-	<check_box label="設定" name="check_settings"/>
-	<button label="すべて" label_selected="すべて" name="All"/>
-	<button label="なし" label_selected="なし" name="None"/>
-	<check_box label="常にフォルダを表示" name="check_show_empty"/>
-	<check_box label="自作" name="check_created_by_me"/>
-	<check_box label="他のユーザー作成" name="check_created_by_others"/>
-	<check_box label="ログオフ以降" name="check_since_logoff"/>
-	<text name="- OR -">
-		－または－
-	</text>
-	<radio_group name="date_search_direction">
-		<radio_item label="より新しい" name="newer"/>
-		<radio_item label="より古い" name="older"/>
-	</radio_group>
-	<spinner label="経過時間" name="spin_hours_ago"/>
-	<text name="label_hours">
-		時間
-	</text>
-	<spinner label="経過日数" name="spin_days_ago"/>
-	<text name="label_days">
-		日間
-	</text>
-	<button label="閉じる" label_selected="閉じる" name="Close"/>
-</floater>
+  <check_box label="アニメーション" name="check_animation" />
+  <check_box label="コーリング・カード" name="check_calling_card" />
+  <check_box label="服装" name="check_clothing" />
+  <check_box label="ジェスチャー" name="check_gesture" />
+  <check_box label="ランドマーク" name="check_landmark" />
+  <check_box label="ノートカード" name="check_notecard" />
+  <check_box label="メッシュ" name="check_mesh" />
+  <check_box label="オブジェクト" name="check_object" />
+  <check_box label="スクリプト" name="check_script" />
+  <check_box label="サウンド" name="check_sound" />
+  <check_box label="テクスチャ" name="check_texture" />
+  <check_box label="スナップショット" name="check_snapshot" />
+  <check_box label="設定" name="check_settings" />
+  <button label="すべて" label_selected="すべて" name="All" />
+  <button label="なし" label_selected="なし" name="None" />
+  <check_box label="常にフォルダを表示" name="check_show_empty" />
+  <check_box label="自作" name="check_created_by_me" />
+  <check_box label="他のユーザー作成" name="check_created_by_others" />
+  <check_box label="ログオフ以降" name="check_since_logoff" />
+  <text name="- OR -">－または－</text>
+  <radio_group name="date_search_direction">
+    <radio_item label="より新しい" name="newer" />
+    <radio_item label="より古い" name="older" />
+  </radio_group>
+  <spinner label="経過時間" name="spin_hours_ago" />
+  <text name="label_hours">時間</text>
+  <spinner label="経過日数" name="spin_days_ago" />
+  <text name="label_days">日間</text>
+  <button label="閉じる" label_selected="閉じる" name="Close" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
index c8648503d7..54f6a87b5e 100644
--- a/indra/newview/skins/default/xui/ja/floater_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Item Properties" title="アイテムのプロパティ"/>
+<floater name="Item Properties" title="アイテムのプロパティ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index daa480ef5a..e389f34778 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,119 +1,85 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="ジョイスティックの設定">
-	<check_box label="ジョイスティックを使う：" name="enable_joystick" width="120"/>
-	<text left="180" name="joystick_type" width="320"/>
-	<spinner label="X軸マッピング" name="JoystickAxis1"/>
-	<spinner label="Y軸マッピング" name="JoystickAxis2"/>
-	<spinner label="Z軸マッピング" name="JoystickAxis0"/>
-	<spinner label="ピッチ・マッピング" label_width="110" left="10" name="JoystickAxis4" width="150"/>
-	<spinner label="ヨー・マッピング" name="JoystickAxis5"/>
-	<spinner label="ロール・マッピング" label_width="110" left="350" name="JoystickAxis3" width="150"/>
-	<spinner label="ズーム・マッピング" label_width="110" left="10" name="JoystickAxis6" width="150"/>
-	<check_box label="直接ズーム" name="ZoomDirect"/>
-	<check_box label="3Dカーソル" name="Cursor3D"/>
-	<check_box label="自動レベル" name="AutoLeveling"/>
-	<text name="Control Modes:">
-		制御モード：
-	</text>
-	<check_box label="アバター" left="131" name="JoystickAvatarEnabled"/>
-	<check_box label="造る" left="201" name="JoystickBuildEnabled"/>
-	<check_box label="フライ・カメラ" left="271" name="JoystickFlycamEnabled"/>
-	<text left="5" name="XScale" width="120">
-		Xスケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale1" width="50"/>
-	<spinner left="205" name="BuildAxisScale1" width="50"/>
-	<spinner left="275" name="FlycamAxisScale1" width="50"/>
-	<text left="5" name="YScale" width="120">
-		Yスケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale2" width="50"/>
-	<spinner left="205" name="BuildAxisScale2" width="50"/>
-	<spinner left="275" name="FlycamAxisScale2" width="50"/>
-	<text left="5" name="ZScale" width="120">
-		Zスケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale0" width="50"/>
-	<spinner left="205" name="BuildAxisScale0" width="50"/>
-	<spinner left="275" name="FlycamAxisScale0" width="50"/>
-	<text left="5" name="PitchScale" width="120">
-		ピッチ・スケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale4" width="50"/>
-	<spinner left="205" name="BuildAxisScale4" width="50"/>
-	<spinner left="275" name="FlycamAxisScale4" width="50"/>
-	<text left="5" name="YawScale" width="120">
-		ヨー・スケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale5" width="50"/>
-	<spinner left="205" name="BuildAxisScale5" width="50"/>
-	<spinner left="275" name="FlycamAxisScale5" width="50"/>
-	<text left="5" name="RollScale" width="120">
-		ロール・スケール
-	</text>
-	<spinner left="205" name="BuildAxisScale3" width="50"/>
-	<spinner left="275" name="FlycamAxisScale3" width="50"/>
-	<text left="5" name="XDeadZone" width="120">
-		Xデッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone1" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone1" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone1" width="50"/>
-	<text left="5" name="YDeadZone" width="120">
-		Yデッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone2" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone2" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone2" width="50"/>
-	<text left="5" name="ZDeadZone" width="120">
-		Zデッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone0" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone0" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone0" width="50"/>
-	<text left="0" name="PitchDeadZone" width="125">
-		ピッチ・デッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone4" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone4" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone4" width="50"/>
-	<text left="5" name="YawDeadZone" width="120">
-		ヨー・デッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone5" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone5" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone5" width="50"/>
-	<text left="0" name="RollDeadZone" width="125">
-		ロール・デッド・ゾーン
-	</text>
-	<spinner left="205" name="BuildAxisDeadZone3" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone3" width="50"/>
-	<text name="Feathering">
-		感度調整
-	</text>
-	<slider label="" left="126" name="AvatarFeathering" width="67"/>
-	<slider label="" left="196" name="BuildFeathering" width="67"/>
-	<slider label="" left="266" name="FlycamFeathering" width="67"/>
-	<text left="0" name="ZoomScale2" width="140">
-		ズーム・スケール
-	</text>
-	<spinner label="" left="275" name="FlycamAxisScale6" width="50"/>
-	<text left="0" name="ZoomDeadZone" width="140">
-		ズーム・デッド・ゾーン
-	</text>
-	<spinner label="" left="275" name="FlycamAxisDeadZone6" width="50"/>
-	<button label="SpaceNavigatorのデフォルト設定" left="330" name="SpaceNavigatorDefaults" width="210"/>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-	<stat_view label="ジョイスティック・モニター" name="axis_view">
-		<stat_bar label="軸 0" name="axis0"/>
-		<stat_bar label="軸 1" name="axis1"/>
-		<stat_bar label="軸 2" name="axis2"/>
-		<stat_bar label="軸 3" name="axis3"/>
-		<stat_bar label="軸 4" name="axis4"/>
-		<stat_bar label="軸 5" name="axis5"/>
-	</stat_view>
-	<string name="NoDevice">
-		デバイスは検出されませんでした
-	</string>
-</floater>
+  <floater.string name="JoystickDisabled">なし</floater.string>
+  <text name="joystick_lbl">ジョイスティック：</text>
+  <spinner label="Ｘ軸マッピング" name="JoystickAxis1" />
+  <spinner label="Ｙ軸マッピング" name="JoystickAxis2" />
+  <spinner label="Ｚ軸マッピング" name="JoystickAxis0" />
+  <spinner label="ピッチ・マッピング" name="JoystickAxis4" />
+  <spinner label="ヨー・マッピング" name="JoystickAxis5" />
+  <spinner label="ロール・マッピング" name="JoystickAxis3" />
+  <spinner label="ズーム・マッピング" name="JoystickAxis6" />
+  <check_box label="直接ズーム" name="ZoomDirect" />
+  <check_box label="3Dカーソル" name="Cursor3D" />
+  <check_box label="自動レベル" name="AutoLeveling" />
+  <text name="Control Modes:">制御モード：</text>
+  <check_box label="アバター" name="JoystickAvatarEnabled" />
+  <check_box label="造る" name="JoystickBuildEnabled" />
+  <check_box label="フライ・カメラ" name="JoystickFlycamEnabled" />
+  <text name="XScale">Ｘスケール</text>
+  <spinner name="AvatarAxisScale1" />
+  <spinner name="BuildAxisScale1" />
+  <spinner name="FlycamAxisScale1" />
+  <text name="YScale">Ｙスケール</text>
+  <spinner name="AvatarAxisScale2" />
+  <spinner name="BuildAxisScale2" />
+  <spinner name="FlycamAxisScale2" />
+  <text name="ZScale">Ｚスケール</text>
+  <spinner name="AvatarAxisScale0" />
+  <spinner name="BuildAxisScale0" />
+  <spinner name="FlycamAxisScale0" />
+  <text name="PitchScale">ピッチ・スケール</text>
+  <spinner name="AvatarAxisScale4" />
+  <spinner name="BuildAxisScale4" />
+  <spinner name="FlycamAxisScale4" />
+  <text name="YawScale">ヨー・スケール</text>
+  <spinner name="AvatarAxisScale5" />
+  <spinner name="BuildAxisScale5" />
+  <spinner name="FlycamAxisScale5" />
+  <text name="RollScale">ロール・スケール</text>
+  <spinner name="BuildAxisScale3" />
+  <spinner name="FlycamAxisScale3" />
+  <text name="XDeadZone">Ｘデッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone1" />
+  <spinner name="BuildAxisDeadZone1" />
+  <spinner name="FlycamAxisDeadZone1" />
+  <text name="YDeadZone">Ｙデッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone2" />
+  <spinner name="BuildAxisDeadZone2" />
+  <spinner name="FlycamAxisDeadZone2" />
+  <text name="ZDeadZone">Ｚデッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone0" />
+  <spinner name="BuildAxisDeadZone0" />
+  <spinner name="FlycamAxisDeadZone0" />
+  <text name="PitchDeadZone">ピッチ・デッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone4" />
+  <spinner name="BuildAxisDeadZone4" />
+  <spinner name="FlycamAxisDeadZone4" />
+  <text name="YawDeadZone">ヨー・デッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone5" />
+  <spinner name="BuildAxisDeadZone5" />
+  <spinner name="FlycamAxisDeadZone5" />
+  <text name="RollDeadZone">ロール・デッド・ゾーン</text>
+  <spinner name="BuildAxisDeadZone3" />
+  <spinner name="FlycamAxisDeadZone3" />
+  <text name="Feathering">感度調整</text>
+  <slider label="" name="AvatarFeathering" />
+  <slider label="" name="BuildFeathering" />
+  <slider label="" name="FlycamFeathering" />
+  <text name="ZoomScale2">ズーム・スケール</text>
+  <spinner label="" name="FlycamAxisScale6" />
+  <text name="ZoomDeadZone">ズーム・デッド・ゾーン</text>
+  <spinner label="" name="FlycamAxisDeadZone6" />
+  <button label="SpaceNavigatorのデフォルト設定" name="SpaceNavigatorDefaults" />
+  <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <stat_view label="ジョイスティック・モニター" name="axis_view">
+    <stat_bar label="軸０" name="axis0" />
+    <stat_bar label="軸１" name="axis1" />
+    <stat_bar label="軸２" name="axis2" />
+    <stat_bar label="軸３" name="axis3" />
+    <stat_bar label="軸４" name="axis4" />
+    <stat_bar label="軸５" name="axis5" />
+  </stat_view>
+  <string name="NoDevice">デバイスは検出されませんでした。</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index dd51d64ed2..7c0e421002 100644
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
@@ -1,151 +1,55 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="ラグメーター">
-	<floater.string name="max_title_msg">
-		ラグ計測器
-	</floater.string>
-	<floater.string name="max_width_px">
-		360
-	</floater.string>
-	<floater.string name="min_title_msg">
-		ラグ
-	</floater.string>
-	<floater.string name="min_width_px">
-		90
-	</floater.string>
-	<floater.string name="client_text_msg">
-		クライアント
-	</floater.string>
-	<floater.string name="client_frame_rate_critical_fps">
-		10
-	</floater.string>
-	<floater.string name="client_frame_rate_warning_fps">
-		15
-	</floater.string>
-	<floater.string name="client_frame_time_window_bg_msg">
-		標準、ウィンドウは背景に
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		クライアントのフレームレートが [CLIENT_FRAME_RATE_CRITICAL] 以下
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		クライアントのフレーム レートが [CLIENT_FRAME_RATE_CRITICAL] と [CLIENT_FRAME_RATE_WARNING] の間
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		標準
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		考えられる原因：描画距離の設定が高すぎる
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		考えられる原因：画像のロード中
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		考えられる原因：メモリ内に画像が多すぎる
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		考えられる原因：シーンに複雑なオブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="network_text_msg">
-		ネットワーク
-	</floater.string>
-	<floater.string name="network_packet_loss_critical_pct">
-		10
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_pct">
-		5
-	</floater.string>
-	<floater.string name="network_packet_loss_critical_msg">
-		接続で [NETWORK_PACKET_LOSS_CRITICAL]% を超えるパケットが脱落しています
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		接続で [NETWORK_PACKET_LOSS_WARNING]%～[NETWORK_PACKET_LOSS_CRITICAL]% のパケットが脱落しています
-	</floater.string>
-	<floater.string name="network_performance_normal_msg">
-		標準
-	</floater.string>
-	<floater.string name="network_ping_critical_ms">
-		600
-	</floater.string>
-	<floater.string name="network_ping_warning_ms">
-		300
-	</floater.string>
-	<floater.string name="network_ping_critical_msg">
-		接続の ping 時間が [NETWORK_PING_CRITICAL] ms 以上です
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		接続の ping 時間が [NETWORK_PING_WARNING]～[NETWORK_PING_CRITICAL] ms です
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		接続不良または &apos;帯域幅&apos; の設定が高すぎる可能性があります
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		接続不良またはファイル共有アプリの可能性があります。
-	</floater.string>
-	<floater.string name="server_text_msg">
-		サーバー
-	</floater.string>
-	<floater.string name="server_frame_rate_critical_fps">
-		20
-	</floater.string>
-	<floater.string name="server_frame_rate_warning_fps">
-		30
-	</floater.string>
-	<floater.string name="server_single_process_max_time_ms">
-		20
-	</floater.string>
-	<floater.string name="server_frame_time_critical_msg">
-		シミュレータのフレームレートが [SERVER_FRAME_RATE_CRITICAL] 以下
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		シミュレータのフレームレートが [SERVER_FRAME_RATE_CRITICAL] ～ [SERVER_FRAME_RATE_WARNING] の間
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		標準
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		考えられる原因：物理オブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		考えられる原因：スクリプトオブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		考えられる原因：ネットワークトラフィックが多すぎる
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		考えられる原因：リージョン内の人の移動が多すぎる
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		考えられる原因：画像計算が多すぎる
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		考えられる原因：シミュレータのロードが重すぎる
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="クライアント ラグ ステータス"/>
-	<text name="client">
-		クライアント
-	</text>
-	<text name="client_text">
-		標準
-	</text>
-	<button name="network_lagmeter" tool_tip="ネットワーク ラグ ステータス"/>
-	<text name="network">
-		ネットワーク
-	</text>
-	<text name="network_text">
-		標準
-	</text>
-	<button name="server_lagmeter" tool_tip="サーバー ラグ ステータス"/>
-	<text name="server">
-		サーバー
-	</text>
-	<text name="server_text">
-		標準
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="フローターのサイズをトグル"/>
-</floater>
+  <floater.string name="max_title_msg">遅延計測器</floater.string>
+  <floater.string name="max_width_px">360</floater.string>
+  <floater.string name="min_title_msg">遅延</floater.string>
+  <floater.string name="min_width_px">90</floater.string>
+  <floater.string name="client_text_msg">クライアント</floater.string>
+  <floater.string name="client_frame_rate_critical_fps">10</floater.string>
+  <floater.string name="client_frame_rate_warning_fps">15</floater.string>
+  <floater.string name="client_frame_time_window_bg_msg">標準、ウィンドウは背景に</floater.string>
+  <floater.string name="client_frame_time_critical_msg">クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]以下</floater.string>
+  <floater.string name="client_frame_time_warning_msg">クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]と[CLIENT_FRAME_RATE_WARNING]の間</floater.string>
+  <floater.string name="client_frame_time_normal_msg">標準</floater.string>
+  <floater.string name="client_draw_distance_cause_msg">考えられる原因：描画距離の設定が高すぎる</floater.string>
+  <floater.string name="client_texture_loading_cause_msg">考えられる原因：画像のロード中</floater.string>
+  <floater.string name="client_texture_memory_cause_msg">考えられる原因：メモリ内に画像が多すぎる</floater.string>
+  <floater.string name="client_complex_objects_cause_msg">考えられる原因：シーンに複雑なオブジェクトが多すぎる</floater.string>
+  <floater.string name="network_text_msg">ネットワーク</floater.string>
+  <floater.string name="network_packet_loss_critical_pct">10</floater.string>
+  <floater.string name="network_packet_loss_warning_pct">5</floater.string>
+  <floater.string name="network_packet_loss_critical_msg">接続で[NETWORK_PACKET_LOSS_CRITICAL]％を超えるパケットが脱落しています。</floater.string>
+  <floater.string name="network_packet_loss_warning_msg">接続で[NETWORK_PACKET_LOSS_WARNING]％～[NETWORK_PACKET_LOSS_CRITICAL]％のパケットが脱落しています。</floater.string>
+  <floater.string name="network_performance_normal_msg">標準</floater.string>
+  <floater.string name="network_ping_critical_ms">600</floater.string>
+  <floater.string name="network_ping_warning_ms">300</floater.string>
+  <floater.string name="network_ping_critical_msg">接続のping時間が、[NETWORK_PING_CRITICAL]ms以上です</floater.string>
+  <floater.string name="network_ping_warning_msg">接続のping時間が、[NETWORK_PING_WARNING]～[NETWORK_PING_CRITICAL]msです。</floater.string>
+  <floater.string name="network_packet_loss_cause_msg">接続不良または、'帯域幅'の設定が高すぎる可能性があります。</floater.string>
+  <floater.string name="network_ping_cause_msg">接続不良または、ファイル共有アプリの可能性があります。</floater.string>
+  <floater.string name="server_text_msg">サーバー</floater.string>
+  <floater.string name="server_frame_rate_critical_fps">20</floater.string>
+  <floater.string name="server_frame_rate_warning_fps">30</floater.string>
+  <floater.string name="server_single_process_max_time_ms">20</floater.string>
+  <floater.string name="server_frame_time_critical_msg">シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]以下</floater.string>
+  <floater.string name="server_frame_time_warning_msg">シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]～[SERVER_FRAME_RATE_WARNING]の間</floater.string>
+  <floater.string name="server_frame_time_normal_msg">標準</floater.string>
+  <floater.string name="server_physics_cause_msg">考えられる原因：物理オブジェクトが多すぎる</floater.string>
+  <floater.string name="server_scripts_cause_msg">考えられる原因：スクリプトオブジェクトが多すぎる</floater.string>
+  <floater.string name="server_net_cause_msg">考えられる原因：ネットワークトラフィックが多すぎる</floater.string>
+  <floater.string name="server_agent_cause_msg">考えられる原因：リージョン内の人の移動が多すぎる</floater.string>
+  <floater.string name="server_images_cause_msg">考えられる原因：画像計算が多すぎる</floater.string>
+  <floater.string name="server_generic_cause_msg">考えられる原因：シミュレータのロードが重すぎる</floater.string>
+  <floater.string name="smaller_label">》</floater.string>
+  <floater.string name="bigger_label">《</floater.string>
+  <button name="client_lagmeter" tool_tip="クライアントの遅延ステータス" />
+  <text name="client">クライアント</text>
+  <text name="client_text">標準</text>
+  <button name="network_lagmeter" tool_tip="ネットワークの遅延ステータス" />
+  <text name="network">ネットワーク</text>
+  <text name="network_text">標準</text>
+  <button name="server_lagmeter" tool_tip="サーバーの遅延ステータス" />
+  <text name="server">サーバー</text>
+  <text name="server_text">標準</text>
+  <button label="》" name="minimize" tool_tip="フローターのサイズをトグル" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index aca916f22f..2d23e3e55b 100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -1,40 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="自分の土地">
-	<scroll_list name="parcel list">
-		<column label="区画" name="name"/>
-		<column label="地域（リージョン）" name="location"/>
-		<column label="種類" name="type"/>
-		<column label="面積" name="area"/>
-		<column label="" name="hidden"/>
-	</scroll_list>
-	<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポートします"/>
-	<button label="地図" label_selected="地図" name="Show on Map" tool_tip="この土地を世界地図に表示します"/>
-	<text name="contrib_label">
-		所属グループへの貢献：
-	</text>
-	<scroll_list name="grant list">
-		<column label="グループ名" name="group"/>
-		<column label="面積" name="area"/>
-	</scroll_list>
-	<text name="allowed_label">
-		現在の支払いプランで許可された保有地：
-	</text>
-	<text name="allowed_text">
-		[AREA] 平方メートル
-	</text>
-	<text name="current_label">
-		現在の保有地：
-	</text>
-	<text name="current_text">
-		[AREA] 平方メートル
-	</text>
-	<text name="available_label">
-		購入可能な土地：
-	</text>
-	<text name="available_text">
-		[AREA] 平方メートル
-	</text>
-	<string name="area_string">
-		[AREA] 平方メートル
-	</string>
-</floater>
+  <scroll_list name="parcel list">
+    <column label="区画" name="name" />
+    <column label="リージョン（地域）" name="location" />
+    <column label="種類" name="type" />
+    <column label="面積" name="area" />
+    <column label="" name="hidden" />
+  </scroll_list>
+  <button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポートします" />
+  <button label="マップ" label_selected="マップ" name="Show on Map" tool_tip="この土地をワールドマップに表示します" />
+  <text name="contrib_label">所属グループへの貢献：</text>
+  <scroll_list name="grant list">
+    <column label="グループ名" name="group" />
+    <column label="面積" name="area" />
+  </scroll_list>
+  <text name="allowed_label">現在の支払いプランで許可された保有地：</text>
+  <text name="allowed_text">[AREA]㎡</text>
+  <text name="current_label">現在の保有地：</text>
+  <text name="current_text">[AREA]㎡</text>
+  <text name="available_label">購入可能な土地：</text>
+  <text name="available_text">[AREA]㎡</text>
+  <string name="area_string">[AREA]㎡</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_linkreplace.xml b/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
index 806543dcc5..22a56abd08 100644
--- a/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
@@ -1,2 +1,16 @@
-<?xml version="1.0" ?>
-<floater name="linkreplace" title="インベントリ リンク交換"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="linkreplace" title="インベントリのリンク置換え">
+  <string name="Ready">準備中…</string>
+  <string name="TargetNotFound">置換先のアイテムは見つかりませんでした。</string>
+  <string name="ItemsIdentical">置換元と置換先が同一です。</string>
+  <string name="ItemsFound">[NUM]件のリンクが見つかりました。</string>
+  <string name="ItemsRemaining">残りリンク数：[NUM]</string>
+  <string name="ReplaceFinished">インベントリのリンクの置換えが完了しました。</string>
+  <text name="source_label">置換元：</text>
+  <inventory_link_replace_drop_target name="source_uuid_editor" tool_tip="置換えたいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。" />
+  <text type="string" name="target_label">置換先：</text>
+  <inventory_link_replace_drop_target name="target_uuid_editor" tool_tip="新しいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。" />
+  <text type="string" name="status_text">準備中…</text>
+  <button name="btn_refresh" label="リフレッシュ" />
+  <button name="btn_start" label="開始" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index f48cc642ee..81f039d35f 100644
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -1,32 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="スクリプト： 新しいスクリプト">
-	<floater.string name="not_allowed">
-		このスクリプトは「コピー不可」のため、表示・編集することができません。 オブジェクト内のスクリプトの表示・編集には、全権限が必要です。
-	</floater.string>
-	<floater.string name="script_running">
-		実行中
-	</floater.string>
-	<floater.string name="Title">
-		スクリプト： [NAME]
-	</floater.string>
-	<floater.string name="experience_enabled">
-		オフにして、現在の体験を削除する
-	</floater.string>
-	<floater.string name="no_experiences">
-		どの体験にも権限がありません
-	</floater.string>
-	<floater.string name="add_experiences">
-		選択して、体験を追加する
-	</floater.string>
-	<floater.string name="show_experience_profile">
-		クリックして、体験プロフィールを表示する
-	</floater.string>
-	<floater.string name="loading">
-		ロード中...
-	</floater.string>
-	<button label="リセット" label_selected="リセット" name="Reset"/>
-	<check_box initial_value="true" label="実行中" name="running"/>
-	<check_box initial_value="true" label="Mono" name="mono"/>
-	<check_box label="体験を使用：" name="enable_xp"/>
-	<button label="&gt;" name="view_profile"/>
-</floater>
+<floater name="script ed float" title="スクリプト：新しいスクリプト">
+  <floater.string name="not_allowed">このスクリプトは「コピー不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。</floater.string>
+  <floater.string name="script_running">実行中</floater.string>
+  <floater.string name="Title">スクリプト：[NAME]</floater.string>
+  <floater.string name="experience_enabled">オフにして、現在の体験を削除する</floater.string>
+  <floater.string name="no_experiences">どの体験にも権限がありません</floater.string>
+  <floater.string name="add_experiences">選択して、体験を追加する</floater.string>
+  <floater.string name="show_experience_profile">クリックして、体験プロフィールを表示する</floater.string>
+  <floater.string name="loading">読み込んでいます…</floater.string>
+  <button label="リセット" label_selected="リセット" name="Reset" />
+  <check_box initial_value="true" label="実行中" name="running" />
+  <check_box initial_value="true" label="Mono" name="mono" />
+  <check_box label="体験を使用：" name="enable_xp" />
+  <button label="&gt;" name="view_profile" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
index 351d8507cc..6d3497659e 100644
--- a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Load Pref Preset" title="優先プリセットをロード">
-	<string name="title_graphic">
-		グラフィックプリセットをロード
-	</string>
-	<string name="title_camera">
-		カメラプリセットをロード
-	</string>
-	<text name="Preset">
-		プリセットを選択
-	</text>
-	<button label="OK" name="ok"/>
-	<button label="取り消し" name="cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="load_pref_preset" title="プリセット設定を読み込み">
+  <string name="title_graphic">グラフィックのプリセットを読み込む</string>
+  <string name="title_camera">カメラのプリセットを読み込む</string>
+  <text name="Preset">プリセットを選択</text>
+  <button label="ＯＫ" name="ok" />
+  <button label="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 5773752788..55d729eb0e 100644
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="LSL レファレンス">
-	<check_box label="カーソルを追う" name="lock_check"/>
-	<combo_box label="ロック" name="history_combo"/>
-	<button label="戻る" name="back_btn"/>
-	<button label="進む" name="fwd_btn"/>
-</floater>
+  <check_box label="カーソルを追う" name="lock_check" />
+  <combo_box label="ロック" name="history_combo" />
+  <button label="戻る" name="back_btn" />
+  <button label="進む" name="fwd_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index 1122203446..a7708b875a 100644
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
@@ -1,36 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Map" title="ミニマップ">
-	<floater.string name="ToolTipMsg">
-		[REGION]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）
-	</floater.string>
-	<floater.string name="AltToolTipMsg">
-		[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）
-	</floater.string>
-	<floater.string name="mini_map_caption">
-		ミニマップ
-	</floater.string>
-	<text label="北" name="floater_map_north" text="北">
-		北
-	</text>
-	<text label="東" name="floater_map_east" text="東">
-		東
-	</text>
-	<text label="西" name="floater_map_west" text="西">
-		西
-	</text>
-	<text label="南" name="floater_map_south" text="南">
-		南
-	</text>
-	<text label="南東" name="floater_map_southeast" text="南東">
-		南東
-	</text>
-	<text label="北東" name="floater_map_northeast" text="北東">
-		北東
-	</text>
-	<text label="南西" name="floater_map_southwest" text="南西">
-		南西
-	</text>
-	<text label="北西" name="floater_map_northwest" text="北西">
-		北西
-	</text>
-</floater>
+  <floater.string name="ToolTipMsg">[REGION]（ダブルクリックでマップを開く。Shift‐ドラッグで水平・垂直移動）</floater.string>
+  <floater.string name="AltToolTipMsg">[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）</floater.string>
+  <floater.string name="mini_map_caption">ミニマップ</floater.string>
+  <text label="北" name="floater_map_north" text="北">北</text>
+  <text label="東" name="floater_map_east" text="東">東</text>
+  <text label="西" name="floater_map_west" text="西">西</text>
+  <text label="南" name="floater_map_south" text="南">南</text>
+  <text label="南東" name="floater_map_southeast" text="南東">南東</text>
+  <text label="北東" name="floater_map_northeast" text="北東">北東</text>
+  <text label="南西" name="floater_map_southwest" text="南西">南西</text>
+  <text label="北西" name="floater_map_northwest" text="北西">北西</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
index f6b8e2928e..06c2d0bafc 100644
--- a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
@@ -1,10 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_marketplace_listings" title="マーケットプレイスのリスト">
-	<panel name="marketplace_listings_panel">
-		<panel>
-			<panel name="marketplace_listings_inventory_placeholder_panel">
-				<text name="marketplace_listings_inventory_placeholder_title">ロード中...</text>
-			</panel>
-		</panel>
-	</panel>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater title="マーケットプレイス一覧" name="floater_marketplace_listings">
+  <panel name="marketplace_listings_panel">
+    <panel>
+      <panel name="marketplace_listings_inventory_placeholder_panel">
+        <text name="marketplace_listings_inventory_placeholder_title">読み込んでいます…</text>
+        <text name="marketplace_listings_inventory_placeholder_text" />
+      </panel>
+      <panel name="panel_marketplace_listing" filename="panel_marketplace_listings.xml" class="llpanelmarketplacelistings" top="0" follows="all"/>
+    </panel>
+    <panel name="marketplace_panel_status" />
+    <layout_stack name="initialization_progress_indicator" />
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
index 164864ed4e..b5638cdb34 100644
--- a/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_marketplace_validation" title="マーケットプレイスのリストの監査">
-	<button label="OK" label_selected="OK" name="OK"/>
-	<text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
-</floater>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index c4731b73a3..a38c4870e7 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="メディアブラウザ">
-	<floater.string name="home_page_url">
-		http://jp.secondlife.com
-	</floater.string>
-	<floater.string name="support_page_url">
-		http://jp.secondlife.com/support
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="nav_controls">
-			<button label="戻る" name="back"/>
-			<button label="進む" name="forward"/>
-			<button label="更新" name="reload"/>
-			<button label="閲覧" name="go"/>
-		</layout_panel>
-		<layout_panel name="time_controls">
-			<button label="巻き戻し" name="rewind"/>
-			<button label="停止" name="stop"/>
-			<button label="早送り" name="seek"/>
-		</layout_panel>
-		<layout_panel name="parcel_owner_controls">
-			<button label="現在のページを区画に送る" name="assign"/>
-		</layout_panel>
-		<layout_panel name="external_controls">
-			<button label="外部Webブラウザで開く" name="open_browser"/>
-			<check_box label="常に外部のWebブラウザで開く" name="open_always"/>
-			<button label="閉じる" name="close"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="home_page_url">http://jp.secondlife.com</floater.string>
+  <floater.string name="support_page_url">http://jp.secondlife.com/support</floater.string>
+  <layout_stack name="stack1">
+    <layout_panel name="nav_controls">
+      <button label="戻る" name="back" />
+      <button label="進む" name="forward" />
+      <button label="リロード" name="reload" />
+      <button label="閲覧" name="go" />
+    </layout_panel>
+    <layout_panel name="time_controls">
+      <button label="巻き戻し" name="rewind" />
+      <button label="停止" name="stop" />
+      <button label="早送り" name="seek" />
+    </layout_panel>
+    <layout_panel name="parcel_owner_controls">
+      <button label="現在のページを区画に送る" name="assign" />
+    </layout_panel>
+    <layout_panel name="external_controls">
+      <button label="外部Webブラウザで開く" name="open_browser" />
+      <check_box label="常に外部のWebブラウザで開く" name="open_always" />
+      <button label="閉じる" name="close" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
index 46ac1a8dfd..75f7cba89a 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="media_settings" title="メディアの設定">
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-	<button label="適用" label_selected="適用" name="Apply"/>
-</floater>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <button label="適用" label_selected="適用" name="Apply" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
index f48bb94e32..a429a3a47e 100644
--- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="MemLeak" title="メモリリークのシミュレート">
-	<spinner label="リーク速度(1フレームごとのバイト数)：" label_width="244" name="leak_speed"/>
-	<spinner label="最大メモリリーク(MB)：" label_width="244" name="max_leak"/>
-	<text name="total_leaked_label">
-		現在のメモリリーク： [SIZE] KB
-	</text>
-	<text name="note_label_1">
-		[NOTE1]
-	</text>
-	<text name="note_label_2">
-		[NOTE2]
-	</text>
-	<button label="開始" name="start_btn"/>
-	<button label="停止" name="stop_btn"/>
-	<button label="解放" name="release_btn"/>
-	<button label="閉じる" name="close_btn"/>
-</floater>
+  <spinner label="リーク速度（１フレームごとのバイト数）：" name="leak_speed" />
+  <spinner label="最大メモリリーク（㎆）：" name="max_leak" />
+  <text name="total_leaked_label">現在のメモリリーク：[SIZE]㎅</text>
+  <text name="note_label_1">[NOTE1]	</text>
+  <text name="note_label_2">[NOTE2]</text>
+  <button label="開始" name="start_btn" />
+  <button label="停止" name="stop_btn" />
+  <button label="解放" name="release_btn" />
+  <button label="閉じる" name="close_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_mfa.xml b/indra/newview/skins/default/xui/ja/floater_mfa.xml
new file mode 100644
index 0000000000..9eefb3c7be
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_mfa.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="二段階認証トークンが必要です" name="mfa_challenge">
+  <text name="token_prompt_text">トークンのプロンプト</text>
+  <line_editor name="token_edit" />
+  <button label="続ける" name="continue_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 9292433cd2..22dfdc23dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -1,319 +1,187 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="モデルウィザード">
-	<string name="status_idle"/>
-	<string name="status_parse_error">
-		エラー：Dae に問題が見つかりました - 詳細についてはログをご参照ください。
-	</string>
-	<string name="status_bind_shape_orientation">
-		警告： バインドシェイプマトリックスは、標準の X 軸正方向にはありません。
-	</string>
-	<string name="status_material_mismatch">
-		エラー：モデルの材料は参考モデルのサブセットではありません。
-	</string>
-	<string name="status_reading_file">
-		ローディング...
-	</string>
-	<string name="status_generating_meshes">
-		メッシュを作成中
-	</string>
-	<string name="status_vertex_number_overflow">
-		エラー：頂点の数が65534を超過したので中止されました。
-	</string>
-	<string name="bad_element">
-		エラー：要素が無効です
-	</string>
-	<string name="high">
-		高
-	</string>
-	<string name="medium">
-		中
-	</string>
-	<string name="low">
-		低
-	</string>
-	<string name="lowest">
-		最低
-	</string>
-	<string name="mesh_status_good">
-		発送
-	</string>
-	<string name="mesh_status_na">
-		該当なし
-	</string>
-	<string name="mesh_status_none">
-		なし
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		テクスチャ編集可能な面の数は描画詳細度に応じて異なります。
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		メッシュインスタンスの数は描画詳細度に応じて異なります。
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		描画詳細度に対して頂点の数が多すぎます。
-	</string>
-	<string name="mesh_status_missing_lod">
-		必要な描画詳細度が見つかりません。
-	</string>
-	<string name="mesh_status_invalid_material_list">
-		LOD 付きの材料は参考モデルのサブセットではありません。
-	</string>
-	<string name="phys_status_vertex_limit_exceeded">
-		一部の物理的な外殻構造が頂点の制限を超えます。
-	</string>
-	<string name="layer_all">
-		全て
-	</string>
-	<string name="decomposing">
-		分析中
-	</string>
-	<string name="simplifying">
-		単純化
-	</string>
-	<string name="tbd">
-		未定
-	</string>
-	<panel name="left_panel">
-		<panel name="model_name_representation_panel">
-			<text name="name_label">
-				モデル名：
-			</text>
-			<text name="model_category_label">
-				このモデルは...
-			</text>
-			<combo_box name="model_category_combo">
-				<combo_item label="1つを選択..." name="Choose one"/>
-				<combo_item label="アバターの形" name="Avatar shape"/>
-				<combo_item label="アバターのアタッチメント" name="Avatar attachment"/>
-				<combo_item label="動くオブジェクト（車、動物）" name="Moving object (vehicle, animal)"/>
-				<combo_item label="制作用コンポーネント" name="Building Component"/>
-				<combo_item label="大型、不動、等" name="Large, non moving etc"/>
-				<combo_item label="やや小型、不動、等" name="Smaller, non-moving etc"/>
-				<combo_item label="いずれにも該当しない" name="Not really any of these"/>
-			</combo_box>
-		</panel>
-		<tab_container name="import_tab">
-			<panel label="描画詳細度" name="lod_panel" title="描画詳細度">
-				<text initial_value="データ源" name="source" value="データ源"/>
-				<text initial_value="三角形" name="triangles" value="三角形"/>
-				<text initial_value="頂点" name="vertices" value="頂点"/>
-				<text initial_value="高" name="high_label" value="高"/>
-				<combo_box name="lod_source_high">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_high"/>
-				<combo_box name="lod_mode_high">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="high_triangles" value="0"/>
-				<text initial_value="0" name="high_vertices" value="0"/>
-				<text initial_value="中" name="medium_label" value="中"/>
-				<combo_box name="lod_source_medium">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_medium"/>
-				<combo_box name="lod_mode_medium">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="medium_triangles" value="0"/>
-				<text initial_value="0" name="medium_vertices" value="0"/>
-				<text initial_value="低" name="low_label" value="低"/>
-				<combo_box name="lod_source_low">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_low"/>
-				<combo_box name="lod_mode_low">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="low_triangles" value="0"/>
-				<text initial_value="0" name="low_vertices" value="0"/>
-				<text initial_value="最低" name="lowest_label" value="最低"/>
-				<combo_box name="lod_source_lowest">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_lowest"/>
-				<combo_box name="lod_mode_lowest">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="lowest_triangles" value="0"/>
-				<text initial_value="0" name="lowest_vertices" value="0"/>
-				<check_box label="ノーマルの作成" name="gen_normals"/>
-				<text initial_value="折れ角度：" name="crease_label" value="折れ角度："/>
-				<spinner name="crease_angle" value="75"/>
-			</panel>
-			<panel label="物理効果" name="physics_panel">
-				<panel name="physics geometry">
-					<text name="first_step_name">
-						手順1：描画詳細度
-					</text>
-					<combo_box name="physics_lod_combo" tool_tip="実像に適用するLOD">
-						<combo_item name="choose_one">
-							1つを選択...
-						</combo_item>
-						<combo_item name="physics_high">
-							高
-						</combo_item>
-						<combo_item name="physics_medium">
-							中
-						</combo_item>
-						<combo_item name="physics_low">
-							低
-						</combo_item>
-						<combo_item name="physics_lowest">
-							最低
-						</combo_item>
-						<combo_item name="load_from_file">
-							ファイルから
-						</combo_item>
-					</combo_box>
-					<button label="参照" name="physics_browse"/>
-				</panel>
-				<panel name="physics analysis">
-					<text name="method_label">
-						手順2：分析
-					</text>
-					<text name="analysis_method_label">
-						方法：
-					</text>
-					<text name="quality_label">
-						品質：
-					</text>
-					<text name="smooth_method_label">
-						滑らかさ：
-					</text>
-					<check_box label="穴を閉じる" name="Close Holes (Slow)"/>
-					<button label="分析" name="Decompose"/>
-					<button label="取り消し" name="decompose_cancel"/>
-				</panel>
-				<panel name="physics simplification">
-					<text name="second_step_label">
-						手順3：単純化
-					</text>
-					<text name="simp_method_header">
-						方法：
-					</text>
-					<text name="pass_method_header">
-						パス：
-					</text>
-					<text name="Detail Scale label">
-						詳細度：
-					</text>
-					<text name="Retain%_label">
-						維持率：
-					</text>
-					<combo_box name="Combine Quality" value="1"/>
-					<button label="単純化" name="Simplify"/>
-					<button label="取り消し" name="simplify_cancel"/>
-				</panel>
-				<panel name="physics info">
-					<text name="results_text">
-						結果：
-					</text>
-					<text name="physics_triangles">
-						三角形：[TRIANGLES],
-					</text>
-					<text name="physics_points">
-						頂点：[POINTS],
-					</text>
-					<text name="physics_hulls">
-						外殻構造：[HULLS]
-					</text>
-				</panel>
-			</panel>
-			<panel label="アップロードのオプション" name="modifiers_panel">
-				<text name="scale_label">
-					スケール（1=増減なし）：
-				</text>
-				<spinner name="import_scale" value="1.0"/>
-				<text name="dimensions_label">
-					サイズ：
-				</text>
-				<text name="import_dimensions">
-					[X] X [Y] X [Z]
-				</text>
-				<check_box label="テクスチャを含む" name="upload_textures"/>
-				<text name="include_label">
-					アバターモデル専用：
-				</text>
-				<check_box label="スキンの重さを含む" name="upload_skin"/>
-				<check_box label="ジョイントポジションを含む" name="upload_joints"/>
-				<check_box label="ジョイント位置が定義されている場合、スケールをロック" name="lock_scale_if_joint_position"/>
-				<text name="pelvis_offset_label">
-					Z オフセット（アバターを上下調整）：
-				</text>
-				<spinner name="pelvis_offset" value="0.0"/>
-			</panel>
-		</tab_container>
-		<panel name="weights_and_warning_panel">
-			<button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算"/>
-			<button label="取り消し" name="cancel_btn"/>
-			<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
-			<button label="設定をクリアしてフォームをリセット" name="reset_btn"/>
-			<text name="upload_fee">
-				アップロード料金：L$ [FEE]
-			</text>
-			<text name="prim_weight">
-				土地の負荷：[EQ]
-			</text>
-			<text name="download_weight">
-				ダウンロード：[ST]
-			</text>
-			<text name="physics_weight">
-				物理演算：[PH]
-			</text>
-			<text name="server_weight">
-				サーバー負荷：[SIM]
-			</text>
-			<text name="warning_title">
-				ご注意：
-			</text>
-			<text name="warning_message">
-				メッシュモデルをアップロードする権利がありません。権利の取得方法については [[VURL]] こちらを参照してください。
-			</text>
-			<text name="status">
-				[STATUS]
-			</text>
-		</panel>
-	</panel>
-	<text name="lod_label">
-		プレビュー：
-	</text>
-	<panel name="right_panel">
-		<combo_box name="preview_lod_combo" tool_tip="プレビュー表示の LOD 設定">
-			<combo_item name="high">
-				高
-			</combo_item>
-			<combo_item name="medium">
-				中
-			</combo_item>
-			<combo_item name="low">
-				低
-			</combo_item>
-			<combo_item name="lowest">
-				最低
-			</combo_item>
-		</combo_box>
-		<text name="label_display">
-			ディスプレイ...
-		</text>
-		<check_box label="稜" name="show_edges"/>
-		<check_box label="物理効果" name="show_physics"/>
-		<check_box label="テクスチャ" name="show_textures"/>
-		<check_box label="スキンの重さ" name="show_skin_weight"/>
-		<check_box label="ジョイント" name="show_joint_positions"/>
-		<text name="physics_explode_label">
-			プレビュースプレッド：
-		</text>
-	</panel>
-</floater>
+  <string name="status_idle" />
+  <string name="status_parse_error">エラー：Dae に問題が見つかりました - 詳細についてはログをご参照ください。</string>
+  <string name="status_bind_shape_orientation">警告：バインドシェイプマトリックスは、標準の X 軸正方向にはありません。</string>
+  <string name="status_material_mismatch">エラー：モデルの材料は参考モデルのサブセットではありません。</string>
+  <string name="status_reading_file">読み込んでいます…</string>
+  <string name="status_generating_meshes">メッシュを作成中</string>
+  <string name="status_vertex_number_overflow">エラー：頂点の数が65534を超過したので中止されました。</string>
+  <string name="bad_element">エラー：要素が無効です</string>
+  <string name="high">高</string>
+  <string name="medium">中</string>
+  <string name="low">低</string>
+  <string name="lowest">最低</string>
+  <string name="mesh_status_good">発送</string>
+  <string name="mesh_status_na">該当なし</string>
+  <string name="mesh_status_none">なし</string>
+  <string name="mesh_status_submesh_mismatch">テクスチャ編集可能な面の数は、描画詳細度に応じて異なります。</string>
+  <string name="mesh_status_mesh_mismatch">メッシュインスタンスの数は、描画詳細度に応じて異なります。</string>
+  <string name="mesh_status_too_many_vertices">描画詳細度に対して頂点の数が多すぎます。</string>
+  <string name="mesh_status_missing_lod">必要な描画詳細度が見つかりません。</string>
+  <string name="mesh_status_invalid_material_list">LOD付きの材料は、参考モデルのサブセットではありません。</string>
+  <string name="phys_status_vertex_limit_exceeded">一部の物理的な外殻構造が、頂点の制限を超えます。</string>
+  <string name="layer_all">全て</string>
+  <string name="decomposing">分析中</string>
+  <string name="simplifying">簡素化</string>
+  <string name="tbd">未定</string>
+  <panel name="left_panel">
+    <panel name="model_name_representation_panel">
+      <text name="name_label">モデル名：</text>
+      <text name="model_category_label">このモデルは…</text>
+      <combo_box name="model_category_combo">
+        <combo_item label="1つを選択…" name="Choose one" />
+        <combo_item label="アバターの形" name="Avatar shape" />
+        <combo_item label="アバターの装着物" name="Avatar attachment" />
+        <combo_item label="動くオブジェクト（車、動物）" name="Moving object (vehicle, animal)" />
+        <combo_item label="制作用コンポーネント" name="Building Component" />
+        <combo_item label="大型、不動、等" name="Large, non moving etc" />
+        <combo_item label="やや小型、不動、等" name="Smaller, non-moving etc" />
+        <combo_item label="いずれにも該当しない" name="Not really any of these" />
+      </combo_box>
+    </panel>
+    <tab_container name="import_tab">
+      <panel label="描画詳細度" name="lod_panel" title="描画詳細度">
+        <text initial_value="データ源" name="source" value="データ源" />
+        <text initial_value="三角形" name="triangles" value="三角形" />
+        <text initial_value="頂点" name="vertices" value="頂点" />
+        <text initial_value="高" name="high_label" value="高" />
+        <combo_box name="lod_source_high">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+        </combo_box>
+        <button label="参照" name="lod_browse_high" />
+        <combo_box name="lod_mode_high">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="high_triangles" value="0" />
+        <text initial_value="0" name="high_vertices" value="0" />
+        <text initial_value="中" name="medium_label" value="中" />
+        <combo_box name="lod_source_medium">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
+        </combo_box>
+        <button label="参照" name="lod_browse_medium" />
+        <combo_box name="lod_mode_medium">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="medium_triangles" value="0" />
+        <text initial_value="0" name="medium_vertices" value="0" />
+        <text initial_value="低" name="low_label" value="低" />
+        <combo_box name="lod_source_low">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
+        </combo_box>
+        <button label="参照" name="lod_browse_low" />
+        <combo_box name="lod_mode_low">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="low_triangles" value="0" />
+        <text initial_value="0" name="low_vertices" value="0" />
+        <text initial_value="最低" name="lowest_label" value="最低" />
+        <combo_box name="lod_source_lowest">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
+        </combo_box>
+        <button label="参照" name="lod_browse_lowest" />
+        <combo_box name="lod_mode_lowest">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="lowest_triangles" value="0" />
+        <text initial_value="0" name="lowest_vertices" value="0" />
+        <check_box label="ノーマルの作成" name="gen_normals" />
+        <text initial_value="折れ角度：" name="crease_label" value="折れ角度：" />
+        <spinner name="crease_angle" value="75" />
+      </panel>
+      <panel label="物理効果" name="physics_panel">
+        <panel name="physics geometry">
+          <text name="first_step_name">手順１：描画詳細度</text>
+          <combo_box name="physics_lod_combo" tool_tip="実像に適用するLOD">
+            <combo_item name="choose_one">１つを選択…</combo_item>
+            <combo_item name="physics_high">高</combo_item>
+            <combo_item name="physics_medium">中</combo_item>
+            <combo_item name="physics_low">低</combo_item>
+            <combo_item name="physics_lowest">最低</combo_item>
+            <combo_item name="load_from_file">ファイルから</combo_item>
+          </combo_box>
+          <button label="参照" name="physics_browse" />
+        </panel>
+        <panel name="physics analysis">
+          <text name="method_label">手順２：分析</text>
+          <text name="analysis_method_label">方法：</text>
+          <text name="quality_label">品質：</text>
+          <text name="smooth_method_label">滑らかさ：</text>
+          <check_box label="穴を閉じる" name="Close Holes (Slow)" />
+          <button label="分析" name="Decompose" />
+          <button label="キャンセル" name="decompose_cancel" />
+        </panel>
+        <panel name="physics simplification">
+          <text name="second_step_label">手順３：簡素化</text>
+          <text name="simp_method_header">方法：</text>
+          <text name="pass_method_header">パス：</text>
+          <text name="Detail Scale label">詳細度：</text>
+          <text name="Retain%_label">維持率：</text>
+          <combo_box name="Combine Quality" value="1" />
+          <button label="簡素化" name="Simplify" />
+          <button label="キャンセル" name="simplify_cancel" />
+        </panel>
+        <panel name="physics info">
+          <text name="results_text">結果：</text>
+          <text name="physics_triangles">三角形：[TRIANGLES],</text>
+          <text name="physics_points">頂点：[POINTS],</text>
+          <text name="physics_hulls">外殻構造：[HULLS]</text>
+        </panel>
+      </panel>
+      <panel label="アップロードのオプション" name="modifiers_panel">
+        <text name="scale_label"> スケール（１＝増減なし）：</text>
+        <spinner name="import_scale" value="1.0" />
+        <text name="dimensions_label">サイズ：</text>
+        <text name="import_dimensions">[X]✕[Y]✕[Z]</text>
+        <check_box label="テクスチャを含む" name="upload_textures" />
+        <text name="include_label">アバターモデル専用：</text>
+        <check_box label="スキンの重さを含む" name="upload_skin" />
+        <check_box label="ジョイント位置を含む" name="upload_joints" />
+        <check_box label="ジョイント位置が定義されている場合、スケールをロック" name="lock_scale_if_joint_position" />
+        <text name="pelvis_offset_label">Ｚオフセット（アバターを上下調整）：</text>
+        <spinner name="pelvis_offset" value="0.0" />
+      </panel>
+    </tab_container>
+    <panel name="weights_and_warning_panel">
+      <button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算" />
+      <button label="キャンセル" name="cancel_btn" />
+      <button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード" />
+      <button label="設定をクリアしてフォームをリセット" name="reset_btn" />
+      <text name="upload_fee">アップロード料金：L$ [FEE]</text>
+      <text name="prim_weight">土地の負荷：[EQ]</text>
+      <text name="download_weight">ダウンロード：[ST]</text>
+      <text name="physics_weight">物理演算：[PH]</text>
+      <text name="server_weight">サーバー負荷：[SIM]</text>
+      <text name="warning_title">ご注意：</text>
+      <text name="warning_message">メッシュモデルをアップロードする権利がありません。権利の取得方法については[[VURL]]こちらを参照してください。</text>
+      <text name="status">[STATUS]</text>
+    </panel>
+  </panel>
+  <text name="lod_label">プレビュー：</text>
+  <panel name="right_panel">
+    <combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
+      <combo_item name="high">高</combo_item>
+      <combo_item name="medium">中</combo_item>
+      <combo_item name="low">低</combo_item>
+      <combo_item name="lowest">最低</combo_item>
+    </combo_box>
+    <text name="label_display">外観…</text>
+    <check_box label="輪部" name="show_edges" />
+    <check_box label="物理効果" name="show_physics" />
+    <check_box label="テクスチャ" name="show_textures" />
+    <check_box label="スキンの重さ" name="show_skin_weight" />
+    <check_box label="ジョイント位置" name="show_joint_positions" />
+    <text name="physics_explode_label">プレビュースプレッド：</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
index aed3b78a14..4a87b46b6b 100644
--- a/indra/newview/skins/default/xui/ja/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml
@@ -1,75 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move_floater" title="歩行 / 走行 / 飛行">
-	<string name="walk_forward_tooltip">
-		前に進む（上矢印か W を押す）
-	</string>
-	<string name="walk_back_tooltip">
-		後ろに歩く（下矢印か S を押す）
-	</string>
-	<string name="walk_left_tooltip">
-		左に水平移動（Shift + 左矢印か A を押す）
-	</string>
-	<string name="walk_right_tooltip">
-		右に水平移動（Shift + 右矢印か D を押す）
-	</string>
-	<string name="run_forward_tooltip">
-		前に走る（上矢印か W を押す）
-	</string>
-	<string name="run_back_tooltip">
-		後ろに走る（下矢印か S を押す）
-	</string>
-	<string name="run_left_tooltip">
-		左に水平移動（Shift + 左矢印か A を押す）
-	</string>
-	<string name="run_right_tooltip">
-		右に水平移動（Shift + 右矢印か D を押す）
-	</string>
-	<string name="fly_forward_tooltip">
-		前に飛ぶ（上矢印か W を押す）
-	</string>
-	<string name="fly_back_tooltip">
-		後ろに飛ぶ（下矢印か S を押す）
-	</string>
-	<string name="fly_left_tooltip">
-		左に水平移動（Shift + 左矢印か A を押す）
-	</string>
-	<string name="fly_right_tooltip">
-		右に水平移動（Shift + 右矢印か D を押す）
-	</string>
-	<string name="fly_up_tooltip">
-		上に移動（E を押す）
-	</string>
-	<string name="fly_down_tooltip">
-		下に移動（C を押す）
-	</string>
-	<string name="jump_tooltip">
-		ジャンプ（E を押す）
-	</string>
-	<string name="crouch_tooltip">
-		かがむ（C を押す）
-	</string>
-	<string name="walk_title">
-		歩く
-	</string>
-	<string name="run_title">
-		走る
-	</string>
-	<string name="fly_title">
-		飛ぶ
-	</string>
-	<panel name="panel_actions">
-		<button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）"/>
-		<joystick_slide name="move left btn" tool_tip="左に歩く（Shift + 左矢印か A を押す）"/>
-		<button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）"/>
-		<joystick_slide name="move right btn" tool_tip="右に歩く（Shift + 右矢印か D を押す）"/>
-		<joystick_turn name="forward btn" tool_tip="前に進む（上矢印か W を押す）"/>
-		<joystick_turn name="backward btn" tool_tip="後ろに歩く（下矢印か S を押す）"/>
-		<button label="" label_selected="" name="move up btn" tool_tip="上に移動（E を押す）"/>
-		<button label="" label_selected="" name="move down btn" tool_tip="下に移動（C を押す）"/>
-	</panel>
-	<panel name="panel_modes">
-		<button label="" name="mode_walk_btn" tool_tip="歩行モード"/>
-		<button label="" name="mode_run_btn" tool_tip="走行モード"/>
-		<button label="" name="mode_fly_btn" tool_tip="飛行モード"/>
-	</panel>
-</floater>
+<floater name="move_floater" title="歩行／走行／飛行">
+  <string name="walk_forward_tooltip">前に進む（上矢印か W を押す）</string>
+  <string name="walk_back_tooltip">後ろに歩く（下矢印か S を押す）</string>
+  <string name="walk_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
+  <string name="walk_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
+  <string name="run_forward_tooltip">前に走る（上矢印か W を押す）</string>
+  <string name="run_back_tooltip">後ろに走る（下矢印か S を押す）</string>
+  <string name="run_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
+  <string name="run_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
+  <string name="fly_forward_tooltip">前に飛ぶ（上矢印か W を押す）</string>
+  <string name="fly_back_tooltip">後ろに飛ぶ（下矢印か S を押す）</string>
+  <string name="fly_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
+  <string name="fly_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
+  <string name="fly_up_tooltip">上に移動（E を押す）</string>
+  <string name="fly_down_tooltip">下に移動（C を押す）</string>
+  <string name="jump_tooltip">ジャンプ（E を押す）</string>
+  <string name="crouch_tooltip">かがむ（C を押す）</string>
+  <string name="walk_title">歩く</string>
+  <string name="run_title">走る</string>
+  <string name="fly_title">飛ぶ</string>
+  <panel name="panel_actions">
+    <button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）" />
+    <joystick_slide name="move left btn" tool_tip="左に歩く（Shift + 左矢印か A を押す）" />
+    <button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）" />
+    <joystick_slide name="move right btn" tool_tip="右に歩く（Shift + 右矢印か D を押す）" />
+    <joystick_turn name="forward btn" tool_tip="前に進む（上矢印か W を押す）" />
+    <joystick_turn name="backward btn" tool_tip="後ろに歩く（下矢印か S を押す）" />
+    <button label="" label_selected="" name="move up btn" tool_tip="上に移動（E を押す）" />
+    <button label="" label_selected="" name="move down btn" tool_tip="下に移動（C を押す）" />
+  </panel>
+  <panel name="panel_modes">
+    <button label="" name="mode_walk_btn" tool_tip="歩行モード" />
+    <button label="" name="mode_run_btn" tool_tip="走行モード" />
+    <button label="" name="mode_fly_btn" tool_tip="飛行モード" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index 04ffd5254d..b1d14e9bcd 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="名前でオブジェクトをブロック">
-	<text name="message">
-		オブジェクトをブロックします：
-	</text>
-	<line_editor name="object_name">
-		オブジェクト名
-	</line_editor>
-	<text name="note">
-		* ブロックされるのはオブジェクトの文字だけで、音はブロックされません。
-	</text>
-	<button label="OK" name="OK"/>
-	<button label="ｷｬﾝｾﾙ" name="Cancel"/>
-</floater>
+<floater name="block by name" title="名前でオブジェクトをブロック">
+  <text name="message">オブジェクトをブロックします：</text>
+  <line_editor name="object_name">オブジェクト名</line_editor>
+  <text name="note">* ブロックされるのはオブジェクトの文字だけで、音はブロックされません。</text>
+  <button label="ＯＫ" name="OK" top_pad="10" />
+  <button label="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
index c9a0ecefd7..44ba494b91 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_my_appearance" title="容姿">
-	<panel label="容姿の編集" name="main_panel"/>
-</floater>
+  <panel label="容姿の編集" name="main_panel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
index d697a9f321..ea78425211 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="my_environments" title="私の環境">
-	<layout_stack>
-		<layout_panel label="フィルター" name="filter_panel">
-			<check_box label="日間" name="chk_days"/>
-			<check_box label="空" name="chk_skies"/>
-			<check_box label="水" name="chk_water"/>
-			<filter_editor label="環境の絞り込み" name="flt_search"/>
-		</layout_panel>
-		<layout_panel label="環境" name="list_panel">
-			<panel label="pnl_inv_wrap" name="pnl_inv_wrap"/>
-		</layout_panel>
-		<layout_panel>
-			<check_box initial_value="false" label="すべてのフォルダを表示" name="chk_showfolders"/>
-		</layout_panel>
-		<layout_panel name="pnl_control">
-			<panel label="bottom_panel" name="pnl_bottom">
-				<menu_button name="btn_gear" tool_tip="その他のオプションを表示"/>
-				<menu_button name="btn_newsettings" tool_tip="新規設定を作成"/>
-				<button name="btn_del" tool_tip="選択したアイテムを削除"/>
-			</panel>
-		</layout_panel>
-	</layout_stack>
-</floater>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="my_environments" title="私の環境">
+  <layout_stack name="main_layout">
+    <layout_panel name="filter_panel" label="フィルタ">
+      <icon name="icon_settingsdays" />
+      <check_box label="日間" name="chk_days" />
+      <icon name="icon_settingsskies" />
+      <check_box label="空" name="chk_skies" />
+      <icon name="icon_settingswater" />
+      <check_box label="水" name="chk_water" />
+      <filter_editor label="環境の絞り込み" name="flt_search" />
+    </layout_panel>
+    <layout_panel name="list_panel" label="環境">
+      <panel name="pnl_inv_wrap" label="pnl_inv_wrap">
+        <asset_filtered_inv_panel name="pnl_settings" />
+      </panel>
+    </layout_panel>
+    <layout_panel name="lp_showfolders">
+      <check_box label="全てのフォルダを開く" name="chk_showfolders" />
+    </layout_panel>
+    <layout_panel name="pnl_control">
+      <panel label="ボトムパネル" name="pnl_bottom">
+        <menu_button name="btn_gear" tool_tip="その他のオプションを表示" />
+        <menu_button name="btn_newsettings" tool_tip="新しい設定を作成" />
+        <button name="btn_del" tool_tip="選択した項目を削除" />
+      </panel>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
index d708fc3dec..614b79fb35 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_my_inventory" title="インベントリ"/>
+<floater name="floater_my_inventory" title="インベントリ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_my_scripts.xml b/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
index c691e37613..3d79996a24 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="myscripts" title="スクリプト"/>
+<floater name="myscripts" title="スクリプト" />
diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml
index 0f37b30f52..76b62f3d9f 100644
--- a/indra/newview/skins/default/xui/ja/floater_notification.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notification.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notification" title="通知コンソール">
-	<text_editor name="payload">
-		ローディング...
-	</text_editor>
-	<combo_box label="応答" name="response"/>
-</floater>
+  <text_editor name="payload">読み込んでいます…。</text_editor>
+  <combo_box label="レスポンス" name="response" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
index c9d9ea7acb..3bb61af89f 100644
--- a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notifications_console" title="通知コンソール">
-	<combo_box label="種類を選択" name="notification_types"/>
-	<button label="追加" name="add_notification"/>
-</floater>
+  <combo_box label="種類を選択" name="notification_types" />
+  <button label="追加" name="add_notification" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
index feac052d6c..5d2085973e 100644
--- a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
@@ -1,39 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_notifications_tabbed" title="通知">
-	<floater.string name="system_tab_title">
-		システム ([COUNT])
-	</floater.string>
-	<floater.string name="transactions_tab_title">
-		取引 ([COUNT])
-	</floater.string>
-	<floater.string name="group_invitations_tab_title">
-		招待 ([COUNT])
-	</floater.string>
-	<floater.string name="group_notices_tab_title">
-		グループ ([COUNT])
-	</floater.string>
-	<string name="title_notification_tabbed_window">
-		通知
-	</string>
-	<layout_stack name="TabButtonsStack">
-		<layout_panel name="TabButtonsLayoutPanel">
-			<tab_container name="notifications_tab_container">
-				<panel label="システム (0)" name="system_notification_list_tab"/>
-				<panel label="取引 (0)" name="transaction_notifications_tab"/>
-				<panel label="招待 (0)" name="group_invite_notifications_tab"/>
-				<panel label="グループ (0)" name="group_notice_notifications_tab"/>
-			</tab_container>
-			<layout_stack name="ButtonsStack">
-				<layout_panel name="CondenseAllButtonPanel">
-					<button label="全て折り畳む" name="collapse_all_button"/>
-				</layout_panel>
-				<layout_panel name="GapLayoutPanel">
-					<panel label="ギャップパネル" name="GapPanel"/>
-				</layout_panel>
-				<layout_panel name="DeleteAllButtonPanel">
-					<button label="全て削除" name="delete_all_button"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="system_tab_title">システム ([COUNT])</floater.string>
+  <floater.string name="transactions_tab_title">取引 ([COUNT])</floater.string>
+  <floater.string name="group_invitations_tab_title">招待 ([COUNT])</floater.string>
+  <floater.string name="group_notices_tab_title">グループ ([COUNT])</floater.string>
+  <string name="title_notification_tabbed_window">通知</string>
+  <layout_stack name="TabButtonsStack">
+    <layout_panel name="TabButtonsLayoutPanel">
+      <tab_container name="notifications_tab_container">
+        <panel label="システム (0)" name="system_notification_list_tab" />
+        <panel label="取引 (0)" name="transaction_notifications_tab" />
+        <panel label="招待 (0)" name="group_invite_notifications_tab" />
+        <panel label="グループ (0)" name="group_notice_notifications_tab" />
+      </tab_container>
+      <layout_stack name="ButtonsStack">
+        <layout_panel name="CondenseAllButtonPanel">
+          <button label="全て折り畳む" name="collapse_all_button" />
+        </layout_panel>
+        <layout_panel name="GapLayoutPanel">
+          <panel label="ギャップパネル" name="GapPanel" />
+        </layout_panel>
+        <layout_panel name="DeleteAllButtonPanel">
+          <button label="全て削除" name="delete_all_button" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
index d727a268fb..77212c42db 100644
--- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="object_weights" title="詳しい設定">
-	<floater.string name="nothing_selected" value="--"/>
-	<text name="selected_text" value="選択済"/>
-	<text name="objects" value="--"/>
-	<text name="objects_label" value="オブジェクト"/>
-	<text name="prims" value="--"/>
-	<text name="prims_label" value="プリム"/>
-	<text name="weights_of_selected_text" value="選択済みアイテムのウエイト"/>
-	<text name="download" value="--"/>
-	<text name="download_label" value="ダウンロード"/>
-	<text name="physics" value="--"/>
-	<text name="physics_label" value="物理効果"/>
-	<text name="server" value="--"/>
-	<text name="server_label" value="サーバー"/>
-	<text name="display" value="--"/>
-	<text name="display_label" value="ディスプレイ"/>
-	<text name="land_impacts_text" value="土地の負荷"/>
-	<text name="selected" value="--"/>
-	<text name="selected_label" value="選択済"/>
-	<text name="rezzed_on_land" value="--"/>
-	<text name="rezzed_on_land_label" value="土地に Rez 済み"/>
-	<text name="remaining_capacity" value="--"/>
-	<text name="remaining_capacity_label" value="残りの許容数"/>
-	<text name="total_capacity" value="--"/>
-	<text name="total_capacity_label" value="許容合計"/>
-	<text name="help_SLURL" value="[secondlife:///app/help/object_weights オブジェクトのウェイトとは？]"/>
-</floater>
+  <floater.string name="nothing_selected" value="─" />
+  <text name="selected_text" value="選択済" />
+  <text name="objects" value="─" />
+  <text name="objects_label" value="オブジェクト" />
+  <text name="prims" value="─" />
+  <text name="prims_label" value="プリム" />
+  <text name="weights_of_selected_text" value="選択済みアイテムのウエイト" />
+  <text name="download" value="─" />
+  <text name="download_label" value="ダウンロード" />
+  <text name="physics" value="─" />
+  <text name="physics_label" value="物理効果" />
+  <text name="server" value="─" />
+  <text name="server_label" value="サーバー" />
+  <text name="display" value="─" />
+  <text name="display_label" value="ディスプレイ" />
+  <text name="land_impacts_text" value="土地の負荷" />
+  <text name="selected" value="─" />
+  <text name="selected_label" value="選択済" />
+  <text name="rezzed_on_land" value="─" />
+  <text name="rezzed_on_land_label" value="土地に Rez 済み" />
+  <text name="remaining_capacity" value="─" />
+  <text name="remaining_capacity_label" value="残りの許容数" />
+  <text name="total_capacity" value="─" />
+  <text name="total_capacity_label" value="許容合計" />
+  <text name="help_SLURL" value="[secondlife:///app/help/object_weights オブジェクトのウェイトとは？]" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
index 3f2f71511b..15d59f4adf 100644
--- a/indra/newview/skins/default/xui/ja/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="objectcontents" title="オブジェクトの中身">
-	<text name="object_name">
-		[DESC]:
-	</text>
-	<text name="border_note">
-		インベントリおよびウェアにコピー
-	</text>
-	<button label="アウトフィットに追加" label_selected="アウトフィットに追加" name="copy_and_wear_button"/>
-	<button label="アウトフィットを交換" label_selected="アウトフィットを交換" name="copy_and_replace_button"/>
-	<button label="インベントリにコピーするだけ" label_selected="インベントリにコピーするだけ" name="copy_to_inventory_button"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_button"/>
-</floater>
+<floater name="objectcontents" title="オブジェクトのコンテンツ">
+  <text name="object_name">[DESC]：</text>
+  <panel_inventory_object name="object_contents" />
+  <button label="インベントリにコピーのみ" label_selected="インベントリにコピー" name="copy_to_inventory_button" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_button" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
new file mode 100644
index 0000000000..906e68a961
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="outfit_photo_preview">
+  <floater.string name="Title">テスクチャ：[NAME]</floater.string>
+  <floater.string name="exceed_limits">アウトフィット画像の最大サイズは[MAX_WIDTH]✕[MAX_HEIGHT]です。他のテスクチャを選択してください。</floater.string>
+  <floater.string name="photo_confirmation">この画像を[OUTFIT]のアウトフィット画像にしますか？</floater.string>
+  <text name="dimensions">[WIDTH]px✕[HEIGHT]px</text>
+  <text name="notification" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
index 70555e6ded..7e949e5c26 100644
--- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="アウトフィットを保存する">
-	<button label="保存" label_selected="保存" name="Save"/>
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-	<text name="Save item as:">
-		着用しているものを
-新しいアウトフィットに保存：
-	</text>
-	<line_editor name="name ed">
-		[DESC] （新）
-	</line_editor>
-</floater>
+  <button label="保存" label_selected="保存" name="Save" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <!-- 字数制限のため「着用中のアウトフィットを名前をつけて保存：」ではない-->
+  <text name="Save item as:">名前をつけて保存：</text>
+  <!-- 名前には、非ASCII文字が使えないため翻訳しない -->
+  <line_editor name="name ed">[DESC] (NEW)</line_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
index f1a05e0eec..d9699c2661 100644
--- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
@@ -1,40 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="outgoing call" title="コール中">
-	<floater.string name="lifetime">
-		5
-	</floater.string>
-	<floater.string name="localchat">
-		近くのボイスチャット
-	</floater.string>
-	<floater.string name="anonymous">
-		匿名ユーザー
-	</floater.string>
-	<floater.string name="VoiceInviteP2P">
-		がコールしています。
-	</floater.string>
-	<floater.string name="VoiceInviteAdHoc">
-		がコンファレンスチャットで、ボイスチャットに参加しました。
-	</floater.string>
-	<text name="connecting">
-		[CALLEE_NAME] に接続中
-	</text>
-	<text name="calling">
-		[CALLEE_NAME] にコール中
-	</text>
-	<text name="noanswer">
-		繋がりませんでした。  あとでもう一度お試しください。
-	</text>
-	<text name="nearby">
-		[VOICE_CHANNEL_NAME] への接続が切れました。  [RECONNECT_NEARBY]
-	</text>
-	<text name="nearby_P2P_by_other">
-		コールを切りました。  [RECONNECT_NEARBY]
-	</text>
-	<text name="nearby_P2P_by_agent">
-		コールを終了しました。  [RECONNECT_NEARBY]
-	</text>
-	<text name="leaving">
-		[CURRENT_CHAT] を終了します。
-	</text>
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-</floater>
+  <floater.string name="lifetime">5</floater.string>
+  <floater.string name="localchat">近隣のボイスチャット</floater.string>
+  <floater.string name="anonymous">匿名ユーザー</floater.string>
+  <floater.string name="VoiceInviteP2P">がコールしています。</floater.string>
+  <floater.string name="VoiceInviteAdHoc">が会話チャットで、ボイスチャットに参加しました。</floater.string>
+  <text name="connecting">[CALLEE_NAME]に接続中</text>
+  <text name="calling">[CALLEE_NAME]をコール中</text>
+  <text name="noanswer">繋がりませんでした。あとでもう一度お試しください。</text>
+  <text name="nearby">[VOICE_CHANNEL_NAME]への接続が切れました。[RECONNECT_NEARBY]</text>
+  <text name="nearby_P2P_by_other">コールを切りました。[RECONNECT_NEARBY]</text>
+  <text name="nearby_P2P_by_agent">コールを終了しました。[RECONNECT_NEARBY]</text>
+  <text name="leaving">[CURRENT_CHAT]を終了します。</text>
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
index 0e72b40dc6..7228a3b1d7 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -1,57 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_pathfinding_characters" title="パスファインディングキャラクター">
-	<floater.string name="messaging_get_inprogress">
-		パスファインディングキャラクターを照会中...
-	</floater.string>
-	<floater.string name="messaging_get_error">
-		パスファインディングキャラクターの照会中にエラーが発生しました。
-	</floater.string>
-	<floater.string name="messaging_complete_none_found">
-		パスファインディングキャラクターがありません。
-	</floater.string>
-	<floater.string name="messaging_complete_available">
-		[NUM_TOTAL] キャラクター中 [NUM_SELECTED] キャラクターが選択されました。
-	</floater.string>
-	<floater.string name="messaging_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="character_cpu_time">
-		[CPU_TIME] µs
-	</floater.string>
-	<floater.string name="character_owner_loading">
-		[Loading]
-	</floater.string>
-	<floater.string name="character_owner_unknown">
-		[Unknown]
-	</floater.string>
-	<floater.string name="character_owner_group">
-		[group]
-	</floater.string>
-	<panel name="pathfinding_chars_main">
-		<scroll_list name="objects_scroll_list">
-			<scroll_list.columns label="名前" name="name"/>
-			<scroll_list.columns label="説明" name="description"/>
-			<scroll_list.columns label="所有者" name="owner"/>
-			<scroll_list.columns label="CPU" name="cpu_time"/>
-			<scroll_list.columns label="高度" name="altitude"/>
-		</scroll_list>
-		<text name="messaging_status">
-			キャラクター：
-		</text>
-		<button label="リスト更新" name="refresh_objects_list"/>
-		<button label="すべて選択" name="select_all_objects"/>
-		<button label="何も選択しない" name="select_none_objects"/>
-	</panel>
-	<panel name="pathfinding_chars_actions">
-		<text name="actions_label">
-			選択したキャラクターに対するアクション：
-		</text>
-		<check_box label="ビーコンを表示" name="show_beacon"/>
-		<check_box label="物理効果カプセルを表示" name="show_physics_capsule"/>
-		<button label="取る" name="take_objects"/>
-		<button label="コピーを取る" name="take_copy_objects"/>
-		<button label="私をそこにテレポートする" name="teleport_me_to_object" tool_tip="1 つのキャラクターが選択された場合にのみ有効です。"/>
-		<button label="返却" name="return_objects"/>
-		<button label="削除" name="delete_objects"/>
-	</panel>
-</floater>
+<floater name="floater_pathfinding_characters" title="経路探索キャラクター">
+  <floater.string name="messaging_get_inprogress">経路探索キャラクターを照会中…</floater.string>
+  <floater.string name="messaging_get_error">経路探索キャラクターの照会中にエラーが発生しました。</floater.string>
+  <floater.string name="messaging_complete_none_found">経路探索キャラクターがありません。</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_TOTAL]キャラクター中[NUM_SELECTED]キャラクターが選択されました。</floater.string>
+  <floater.string name="messaging_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="character_cpu_time">[CPU_TIME]㎲</floater.string>
+  <floater.string name="character_owner_loading">[Loading]</floater.string>
+  <floater.string name="character_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="character_owner_group">[group]</floater.string>
+  <panel name="pathfinding_chars_main">
+    <scroll_list name="objects_scroll_list">
+      <scroll_list.columns label="名前" name="name" />
+      <scroll_list.columns label="説明" name="description" />
+      <scroll_list.columns label="所有者" name="owner" />
+      <scroll_list.columns label="CPU" name="cpu_time" />
+      <scroll_list.columns label="高度" name="altitude" />
+    </scroll_list>
+    <text name="messaging_status">キャラクター：</text>
+    <button label="リスト更新" name="refresh_objects_list" />
+    <button label="すべて選択" name="select_all_objects" />
+    <button label="何も選択しない" name="select_none_objects" />
+  </panel>
+  <panel name="pathfinding_chars_actions">
+    <text name="actions_label">選択したキャラクターに対するアクション：</text>
+    <check_box label="ビーコンを表示" name="show_beacon" />
+    <check_box label="物理効果カプセルを表示" name="show_physics_capsule" />
+    <button label="取る" name="take_objects" />
+    <button label="コピーを取る" name="take_copy_objects" />
+    <button label="その場所にテレポート" name="teleport_me_to_object" tool_tip="1 つのキャラクターが選択された場合にのみ有効です。" />
+    <button label="返却" name="return_objects" />
+    <button label="削除" name="delete_objects" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index d531d588f7..58b85faa67 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -1,131 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_pathfinding_console" title="パスファインディングの表示/テスト">
-	<floater.string name="navmesh_viewer_status_library_not_implemented">
-		パスファインディングライブラリの実装が見つかりません。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_region_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_region_loading">
-		地域（リージョン）の読み込みを待機しています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_checking_version">
-		ナビメッシュのステータスを確認しています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_downloading">
-		ナビメッシュをダウンロードしています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_updating">
-		サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_has_navmesh">
-		最新のナビメッシュがダウンロードされました。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_error">
-		ナビメッシュを正しくダウンロードできません。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_pending">
-		ナビメッシュに保留中の変更があります。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_building">
-		ナビメッシュを作成しています。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_some_pending">
-		ナビメッシュの一部の地域（リージョン）に保留中の変更があります。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_some_building">
-		一部のナビメッシュ地域（リージョン）を構築しています。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_pending_and_building">
-		ナビメッシュの一部の地域（リージョン）に保留中の変更があり、その他の地域（リージョン）は構築中です。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_complete">
-		ナビメッシュは最新です。
-	</floater.string>
-	<floater.string name="pathing_library_not_implemented">
-		パスファインディングライブラリの実装が見つかりません。
-	</floater.string>
-	<floater.string name="pathing_region_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="pathing_choose_start_and_end_points">
-		開始点と終了点を選択してください。
-	</floater.string>
-	<floater.string name="pathing_choose_start_point">
-		開始点を選択してください。
-	</floater.string>
-	<floater.string name="pathing_choose_end_point">
-		終了点を選択してください。
-	</floater.string>
-	<floater.string name="pathing_path_valid">
-		パスはオレンジ色で表示されています。
-	</floater.string>
-	<floater.string name="pathing_path_invalid">
-		選択した 2 点間のパスが見つかりません。
-	</floater.string>
-	<floater.string name="pathing_error">
-		パスの生成中にエラーが発生しました。
-	</floater.string>
-	<panel name="pathfinding_console_main">
-		<text name="viewer_status_label">
-			ビューワステータス
-		</text>
-	</panel>
-	<panel name="pathfinding_console_simulator">
-		<text name="simulator_status_label">
-			シミュレータステータス
-		</text>
-	</panel>
-	<tab_container name="view_test_tab_container">
-		<panel label="表示" name="view_panel">
-			<text name="show_label">
-				表示：
-			</text>
-			<check_box label="世界" name="show_world"/>
-			<check_box label="可動物のみ" name="show_world_movables_only"/>
-			<check_box label="ナビメッシュ" name="show_navmesh"/>
-			<text name="show_walkability_label">
-				歩行可能マップを表示:
-			</text>
-			<combo_box name="show_heatmap_mode">
-				<combo_box.item label="表示しない" name="show_heatmap_mode_none"/>
-				<combo_box.item label="キャラクター タイプ A" name="show_heatmap_mode_a"/>
-				<combo_box.item label="キャラクター タイプ B" name="show_heatmap_mode_b"/>
-				<combo_box.item label="キャラクター タイプ C" name="show_heatmap_mode_c"/>
-				<combo_box.item label="キャラクター タイプ D" name="show_heatmap_mode_d"/>
-			</combo_box>
-			<check_box label="歩行可能" name="show_walkables"/>
-			<check_box label="素材ボリューム" name="show_material_volumes"/>
-			<check_box label="静的障害物" name="show_static_obstacles"/>
-			<check_box label="除外ボリューム" name="show_exclusion_volumes"/>
-			<check_box label="水上飛行機" name="show_water_plane"/>
-			<check_box label="X 線表示による" name="show_xray"/>
-		</panel>
-		<panel label="パスをテスト" name="test_panel">
-			<text name="ctrl_click_label">
-				Ctrl キーを押しながらクリックして、開始点を選択します。
-			</text>
-			<text name="shift_click_label">
-				Shift キーを押しながらクリックして、終了点を選択します。
-			</text>
-			<text name="character_width_label">
-				キャラクターの幅
-			</text>
-			<slider name="character_width" value="1"/>
-			<text name="character_width_unit_label">
-				m
-			</text>
-			<text name="character_type_label">
-				キャラクタータイプ
-			</text>
-			<combo_box name="path_character_type">
-				<combo_box.item label="なし" name="path_character_type_none"/>
-				<combo_box.item label="A" name="path_character_type_a"/>
-				<combo_box.item label="B" name="path_character_type_b"/>
-				<combo_box.item label="C" name="path_character_type_c"/>
-				<combo_box.item label="D" name="path_character_type_d"/>
-			</combo_box>
-			<button label="パスをクリア" name="clear_path"/>
-		</panel>
-	</tab_container>
-</floater>
+<floater name="floater_pathfinding_console" title="経路探索の表示／テスト">
+  <floater.string name="navmesh_viewer_status_library_not_implemented">経路探索ライブラリの実装が見つかりません。</floater.string>
+  <floater.string name="navmesh_viewer_status_region_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="navmesh_viewer_status_region_loading">リージョン（地域）の読み込みを待機しています。</floater.string>
+  <floater.string name="navmesh_viewer_status_checking_version">ナビメッシュのステータスを確認しています。</floater.string>
+  <floater.string name="navmesh_viewer_status_downloading">ナビメッシュをダウンロードしています。</floater.string>
+  <floater.string name="navmesh_viewer_status_updating">サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。</floater.string>
+  <floater.string name="navmesh_viewer_status_has_navmesh">最新のナビメッシュがダウンロードされました。
+  </floater.string>
+  <floater.string name="navmesh_viewer_status_error">ナビメッシュを正しくダウンロードできません。</floater.string>
+  <floater.string name="navmesh_simulator_status_pending">ナビメッシュに保留中の変更があります。</floater.string>
+  <floater.string name="navmesh_simulator_status_building">ナビメッシュを作成しています。</floater.string>
+  <floater.string name="navmesh_simulator_status_some_pending">ナビメッシュの一部のリージョン（地域）に保留中の変更があります。</floater.string>
+  <floater.string name="navmesh_simulator_status_some_building">一部のナビメッシュのリージョン（地域）を構築しています。</floater.string>
+  <floater.string name="navmesh_simulator_status_pending_and_building">ナビメッシュの一部のリージョン（地域）に保留中の変更があり、その他のリージョン（地域）は構築中です。</floater.string>
+  <floater.string name="navmesh_simulator_status_complete">ナビメッシュは最新です。</floater.string>
+  <floater.string name="pathing_library_not_implemented">経路探索ライブラリの実装が見つかりません。</floater.string>
+  <floater.string name="pathing_region_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="pathing_choose_start_and_end_points">開始点と終了点を選択してください。</floater.string>
+  <floater.string name="pathing_choose_start_point">開始点を選択してください。</floater.string>
+  <floater.string name="pathing_choose_end_point">終了点を選択してください。</floater.string>
+  <floater.string name="pathing_path_valid">パスはオレンジ色で表示されています。</floater.string>
+  <floater.string name="pathing_path_invalid">選択した２点間のパスが見つかりません。</floater.string>
+  <floater.string name="pathing_error">パスの生成中にエラーが発生しました。</floater.string>
+  <panel name="pathfinding_console_main">
+    <text name="viewer_status_label">ビューアーのステータス</text>
+  </panel>
+  <panel name="pathfinding_console_simulator">
+    <text name="simulator_status_label">シミュレータのステータス</text>
+  </panel>
+  <tab_container name="view_test_tab_container">
+    <panel label="表示" name="view_panel">
+      <text name="show_label">表示：</text>
+      <check_box label="世界" name="show_world" />
+      <check_box label="可動物のみ" name="show_world_movables_only" />
+      <check_box label="ナビメッシュ" name="show_navmesh" />
+      <text name="show_walkability_label">歩行可能マップを表示:</text>
+      <combo_box name="show_heatmap_mode">
+        <combo_box.item label="表示しない" name="show_heatmap_mode_none" />
+        <combo_box.item label="キャラクター タイプ A" name="show_heatmap_mode_a" />
+        <combo_box.item label="キャラクター タイプ B" name="show_heatmap_mode_b" />
+        <combo_box.item label="キャラクター タイプ C" name="show_heatmap_mode_c" />
+        <combo_box.item label="キャラクター タイプ D" name="show_heatmap_mode_d" />
+      </combo_box>
+      <check_box label="歩行可能" name="show_walkables" />
+      <check_box label="素材ボリューム" name="show_material_volumes" />
+      <check_box label="静的障害物" name="show_static_obstacles" />
+      <check_box label="除外ボリューム" name="show_exclusion_volumes" />
+      <check_box label="水上飛行機" name="show_water_plane" />
+      <check_box label="X 線表示による" name="show_xray" />
+    </panel>
+    <panel label="パスをテスト" name="test_panel">
+      <text name="ctrl_click_label">Ctrl キーを押しながらクリックして、開始点を選択します。</text>
+      <text name="shift_click_label">Shift キーを押しながらクリックして、終了点を選択します。</text>
+      <text name="character_width_label">キャラクターの幅</text>
+      <slider name="character_width" value="1" />
+      <text name="character_width_unit_label">m</text>
+      <text name="character_type_label">キャラクタータイプ</text>
+      <combo_box name="path_character_type">
+        <combo_box.item label="なし" name="path_character_type_none" />
+        <combo_box.item label="A" name="path_character_type_a" />
+        <combo_box.item label="B" name="path_character_type_b" />
+        <combo_box.item label="C" name="path_character_type_c" />
+        <combo_box.item label="D" name="path_character_type_d" />
+      </combo_box>
+      <button label="経路をクリア" name="clear_path" />
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
index 16d6acfeef..b28071be68 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -1,182 +1,92 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_linksets" title="リージョンオブジェクト">
-	<floater.string name="messaging_get_inprogress">
-		パスファインディングリンクセットを照会中...
-	</floater.string>
-	<floater.string name="messaging_get_error">
-		パスファインディングリンクセットの照会中にエラーが発生しました。
-	</floater.string>
-	<floater.string name="messaging_set_inprogress">
-		選択したパスファインディングリンクセットを修正中...
-	</floater.string>
-	<floater.string name="messaging_set_error">
-		選択したパスファインディングリンクセットの修正中にエラーが発生しました。
-	</floater.string>
-	<floater.string name="messaging_complete_none_found">
-		パスファインディングリンクセットがありません。
-	</floater.string>
-	<floater.string name="messaging_complete_available">
-		[NUM_TOTAL] 中 [NUM_SELECTED] が選択されました。
-	</floater.string>
-	<floater.string name="messaging_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="linkset_terrain_name">
-		[Terrain]
-	</floater.string>
-	<floater.string name="linkset_terrain_description">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_owner">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_scripted">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_land_impact">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_dist_from_you">
-		--
-	</floater.string>
-	<floater.string name="linkset_owner_loading">
-		[Loading]
-	</floater.string>
-	<floater.string name="linkset_owner_unknown">
-		[Unknown]
-	</floater.string>
-	<floater.string name="linkset_owner_group">
-		[group]
-	</floater.string>
-	<floater.string name="linkset_is_scripted">
-		はい
-	</floater.string>
-	<floater.string name="linkset_is_not_scripted">
-		いいえ
-	</floater.string>
-	<floater.string name="linkset_is_unknown_scripted">
-		不明
-	</floater.string>
-	<floater.string name="linkset_use_walkable">
-		歩行可能
-	</floater.string>
-	<floater.string name="linkset_use_static_obstacle">
-		静的障害物
-	</floater.string>
-	<floater.string name="linkset_use_dynamic_obstacle">
-		可動障害物
-	</floater.string>
-	<floater.string name="linkset_use_material_volume">
-		素材ボリューム
-	</floater.string>
-	<floater.string name="linkset_use_exclusion_volume">
-		除外ボリューム
-	</floater.string>
-	<floater.string name="linkset_use_dynamic_phantom">
-		可動ボリューム
-	</floater.string>
-	<floater.string name="linkset_is_terrain">
-		[unmodifiable]
-	</floater.string>
-	<floater.string name="linkset_is_restricted_state">
-		[restricted]
-	</floater.string>
-	<floater.string name="linkset_is_non_volume_state">
-		[concave]
-	</floater.string>
-	<floater.string name="linkset_is_restricted_non_volume_state">
-		[restricted,concave]
-	</floater.string>
-	<floater.string name="linkset_choose_use">
-		リンクセットの用途を選択...
-	</floater.string>
-	<panel name="pathfinding_linksets_main">
-		<text name="linksets_filter_label">
-			フィルター：
-		</text>
-		<text name="linksets_name_label">
-			名前
-		</text>
-		<text name="linksets_desc_label">
-			説明
-		</text>
-		<combo_box name="filter_by_linkset_use">
-			<combo_box.item label="リンクセットの用途でフィルター..." name="filter_by_linkset_use_none"/>
-			<combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable"/>
-			<combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle"/>
-			<combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle"/>
-			<combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume"/>
-			<combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume"/>
-			<combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom"/>
-		</combo_box>
-		<button label="適用" name="apply_filters"/>
-		<button label="クリア" name="clear_filters"/>
-		<scroll_list name="objects_scroll_list">
-			<scroll_list.columns label="名前 (ルートプリム)" name="name"/>
-			<scroll_list.columns label="説明 (ルートプリム)" name="description"/>
-			<scroll_list.columns label="所有者" name="owner"/>
-			<scroll_list.columns label="スクリプト" name="scripted"/>
-			<scroll_list.columns label="負荷" name="land_impact"/>
-			<scroll_list.columns label="距離" name="dist_from_you"/>
-			<scroll_list.columns label="パスファインディング使用" name="linkset_use"/>
-			<scroll_list.columns label="A %" name="a_percent"/>
-			<scroll_list.columns label="B %" name="b_percent"/>
-			<scroll_list.columns label="C %" name="c_percent"/>
-			<scroll_list.columns label="D %" name="d_percent"/>
-		</scroll_list>
-		<text name="messaging_status">
-			リンクセット：
-		</text>
-		<button label="リスト更新" name="refresh_objects_list"/>
-		<button label="すべて選択" name="select_all_objects"/>
-		<button label="何も選択しない" name="select_none_objects"/>
-	</panel>
-	<panel name="pathfinding_linksets_actions">
-		<text name="linksets_actions_label">
-			選択されたアクション
-		</text>
-		<check_box label="ビーコンを表示" name="show_beacon"/>
-		<button label="取る" name="take_objects"/>
-		<button label="コピーを取る" name="take_copy_objects"/>
-		<button label="私をそこにテレポートする" name="teleport_me_to_object"/>
-		<button label="返却" name="return_objects"/>
-		<button label="削除" name="delete_objects"/>
-	</panel>
-	<panel name="pathfinding_linksets_attributes">
-		<text name="linksets_attributes_label">
-			パスファインディング属性を編集する
-		</text>
-		<text name="walkability_coefficients_label">
-			歩行可能性：
-		</text>
-		<text name="edit_a_label">
-			A
-		</text>
-		<line_editor name="edit_a_value" tool_tip="タイプ A のキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。"/>
-		<text name="edit_b_label">
-			B
-		</text>
-		<line_editor name="edit_b_value" tool_tip="タイプ B のキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。"/>
-		<text name="edit_c_label">
-			C
-		</text>
-		<line_editor name="edit_c_value" tool_tip="タイプ C のキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。"/>
-		<text name="edit_d_label">
-			D
-		</text>
-		<line_editor name="edit_d_value" tool_tip="タイプ D のキャラクターの歩行可能性。キャラクタータイプの例はその他です。"/>
-		<button label="変更を適用" name="apply_edit_values"/>
-		<text name="suggested_use_a_label">
-			(ヒューマノイド)
-		</text>
-		<text name="suggested_use_b_label">
-			(クリーチャー)
-		</text>
-		<text name="suggested_use_c_label">
-			(メカニカル)
-		</text>
-		<text name="suggested_use_d_label">
-			(その他)
-		</text>
-	</panel>
-</floater>
+  <floater.string name="messaging_get_inprogress">経路探索リンクセットを照会中…</floater.string>
+  <floater.string name="messaging_get_error">経路探索リンクセットの照会中にエラーが発生しました。</floater.string>
+  <floater.string name="messaging_set_inprogress">選択した経路探索リンクセットを修正中…</floater.string>
+  <floater.string name="messaging_set_error">選択した経路探索リンクセットの修正中にエラーが発生しました。</floater.string>
+  <floater.string name="messaging_complete_none_found">経路探索リンクセットがありません。</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_TOTAL]個中[NUM_SELECTED]個が選択されました。</floater.string>
+  <floater.string name="messaging_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
+  <floater.string name="linkset_terrain_description">－</floater.string>
+  <floater.string name="linkset_terrain_owner">－</floater.string>
+  <floater.string name="linkset_terrain_scripted">－</floater.string>
+  <floater.string name="linkset_terrain_land_impact">－</floater.string>
+  <floater.string name="linkset_terrain_dist_from_you">－</floater.string>
+  <floater.string name="linkset_owner_loading">[Loading]</floater.string>
+  <floater.string name="linkset_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="linkset_owner_group">[group]</floater.string>
+  <floater.string name="linkset_is_scripted">はい</floater.string>
+  <floater.string name="linkset_is_not_scripted">いいえ</floater.string>
+  <floater.string name="linkset_is_unknown_scripted">不明</floater.string>
+  <floater.string name="linkset_use_walkable">歩行可能</floater.string>
+  <floater.string name="linkset_use_static_obstacle">静的障害物</floater.string>
+  <floater.string name="linkset_use_dynamic_obstacle">可動障害物</floater.string>
+  <floater.string name="linkset_use_material_volume">素材ボリューム</floater.string>
+  <floater.string name="linkset_use_exclusion_volume">除外ボリューム</floater.string>
+  <floater.string name="linkset_use_dynamic_phantom">可動ボリューム</floater.string>
+  <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string>
+  <floater.string name="linkset_is_restricted_state">[restricted]</floater.string>
+  <floater.string name="linkset_is_non_volume_state">[concave]</floater.string>
+  <floater.string name="linkset_is_restricted_non_volume_state">[restricted,concave]</floater.string>
+  <floater.string name="linkset_choose_use">リンクセットの用途を選択…</floater.string>
+  <panel name="pathfinding_linksets_main">
+    <text name="linksets_filter_label">フィルタ：</text>
+    <text name="linksets_name_label">名前</text>
+    <text name="linksets_desc_label">説明</text>
+    <combo_box name="filter_by_linkset_use">
+      <combo_box.item label="リンクセットの用途でフィルタ…" name="filter_by_linkset_use_none" />
+      <combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable" />
+      <combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle" />
+      <combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle" />
+      <combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume" />
+      <combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume" />
+      <combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom" />
+    </combo_box>
+    <button label="適用" name="apply_filters" />
+    <button label="クリア" name="clear_filters" />
+    <scroll_list name="objects_scroll_list">
+      <scroll_list.columns label="名前（ルートプリム）" name="name" />
+      <scroll_list.columns label="説明（ルートプリム）" name="description" />
+      <scroll_list.columns label="所有者" name="owner" />
+      <scroll_list.columns label="スクリプト" name="scripted" />
+      <scroll_list.columns label="ランドインパクト" name="land_impact" />
+      <scroll_list.columns label="距離" name="dist_from_you" />
+      <scroll_list.columns label="経路探索で使用" name="linkset_use" />
+      <scroll_list.columns label="Ａ％" name="a_percent" />
+      <scroll_list.columns label="Ｂ％" name="b_percent" />
+      <scroll_list.columns label="Ｃ％" name="c_percent" />
+      <scroll_list.columns label="Ｄ％" name="d_percent" />
+    </scroll_list>
+    <text name="messaging_status">リンクセット：</text>
+    <button label="リスト更新" name="refresh_objects_list" />
+    <button label="すべて選択" name="select_all_objects" />
+    <button label="何も選択しない" name="select_none_objects" />
+  </panel>
+  <panel name="pathfinding_linksets_actions">
+    <text name="linksets_actions_label">選択されたアクション</text>
+    <check_box label="ビーコンを表示" name="show_beacon" />
+    <button label="取る" name="take_objects" />
+    <button label="コピーを取る" name="take_copy_objects" />
+    <button label="その場所にテレポート" name="teleport_me_to_object" />
+    <button label="返却" name="return_objects" />
+    <button label="削除" name="delete_objects" />
+  </panel>
+  <panel name="pathfinding_linksets_attributes">
+    <text name="linksets_attributes_label">経路探索属性を編集する</text>
+    <text name="walkability_coefficients_label">歩行可能性：</text>
+    <text name="edit_a_label">Ａ</text>
+    <line_editor name="edit_a_value" tool_tip="タイプＡのキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。" />
+    <text name="edit_b_label">Ｂ</text>
+    <line_editor name="edit_b_value" tool_tip="タイプＢのキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。" />
+    <text name="edit_c_label">Ｃ</text>
+    <line_editor name="edit_c_value" tool_tip="タイプＣのキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。" />
+    <text name="edit_d_label">Ｄ</text>
+    <line_editor name="edit_d_value" tool_tip="タイプＤのキャラクターの歩行可能性。キャラクタータイプの例はその他です。" />
+    <button label="変更を適用" name="apply_edit_values" />
+    <text name="suggested_use_a_label">（ヒューマノイド）</text>
+    <text name="suggested_use_b_label">（クリーチャー）</text>
+    <text name="suggested_use_c_label">（メカニカル）</text>
+    <text name="suggested_use_d_label">（その他）</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index 7807fdf7b4..b4773dcd2f 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,31 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<string name="payee_group">
-		グループに支払う
-	</string>
-	<string name="payee_resident">
-		住人に支払う
-	</string>
-	<text name="paying_text">
-		支払中:
-	</text>
-	<text name="payee_name">
-		非常に長い名前が途中で切れていないかをテストして確認
-	</text>
-	<text name="payment_message_label">
-		説明（任意項目）：
-	</text>
-	<panel label="検索" name="PatternsPanel">
-		<button label="L$ 1 支払う" label_selected="L$ 1 支払う" name="fastpay 1"/>
-		<button label="L$ 5 支払う" label_selected="L$ 5 支払う" name="fastpay 5"/>
-		<button label="L$ 10 支払う" label_selected="L$ 10 支払う" name="fastpay 10"/>
-		<button label="L$ 20 支払う" label_selected="L$ 20 支払う" name="fastpay 20"/>
-	</panel>
-	<panel label="検索" name="InputPanel">
-		<text name="amount text">
-			その他の金額:
-		</text>
-		<button label="支払い" label_selected="支払い" name="pay btn"/>
-		<button label="取り消し" label_selected="取り消し" name="cancel btn"/>
-	</panel>
-</floater>
+<floater name="Give Money" title="お支払い">
+  <string name="payee_group">グループに支払う</string>
+  <string name="payee_resident">住人に支払う</string>
+  <text name="paying_text">支払い先：</text>
+  <text name="payee_name">非常に長い名前が途中で切れていないかをテストして確認</text>
+  <text name="payment_message_label">説明（任意項目）：</text>
+  <panel label="検索" name="PatternsPanel">
+    <button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1" />
+    <button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5" />
+    <button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10" />
+    <button label="L$ 20 払う" label_selected="L$ 20支払う" name="fastpay 20" />
+  </panel>
+  <panel label="検索" name="InputPanel">
+    <text name="amount text">その他の金額：</text>
+    <button label="支払い" label_selected="支払い" name="pay btn" />
+    <button label="キャンセル" label_selected="支払いの取り消し" name="cancel btn" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 3331cee0e0..5206011675 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<string name="payee_group">グループに支払う</string>
-	<string name="payee_resident">住人に支払う</string>
-	<text name="paying_text">支払中:</text>
-	<text name="payee_name">Ericacita Moostopolison</text>
-	<text name="object_name_label">オブジェクトを介して：</text>
-	<icon name="icon_object" tool_tip="オブジェクト"/>
-	<text name="object_name_text">...</text>
-	<panel label="検索" name="PatternsPanel">
-		<button label="L$ 1 支払う" label_selected="L$ 1 支払う" name="fastpay 1"/>
-		<button label="L$ 5 支払う" label_selected="L$ 5 支払う" name="fastpay 5"/>
-		<button label="L$ 10 支払う" label_selected="L$ 10 支払う" name="fastpay 10"/>
-		<button label="L$ 20 支払う" label_selected="L$ 20 支払う" name="fastpay 20"/>
-	</panel>
-	<panel label="検索" name="InputPanel">
-		<text name="amount text">その他の金額:</text>
-		<button label="支払い" label_selected="支払い" name="pay btn"/>
-		<button label="取り消し" label_selected="取り消し" name="cancel btn"/>
-	</panel>
-</floater>
+<floater name="Give Money" title="オブジェクトにお支払い">
+  <string name="payee_group">グループに支払う</string>
+  <string name="payee_resident">住人に支払う</string>
+  <text name="paying_text">支払い先：</text>
+  <text name="payee_name">エリカシタ・モストポリゾン</text>
+  <text name="object_name_label">以下のオブジェクトを介して支払う：</text>
+  <icon name="icon_object" tool_tip="オブジェクト" />
+  <text name="object_name_text">…</text>
+  <panel label="検索" name="PatternsPanel">
+    <button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1" />
+    <button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5" />
+    <button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10" />
+    <button label="L$ 20支払う" label_selected="L$ 20支払う" name="fastpay 20" />
+  </panel>
+  <panel label="検索" name="InputPanel">
+    <text name="amount text">その他の金額:</text>
+    <button label="支払い" label_selected="オブジェクトに支払います。" name="pay btn" />
+    <button label="キャンセル" label_selected="オブジェクトへの支払いを取り消します。" name="cancel btn" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml
index 0f7c298289..e996f0adbf 100644
--- a/indra/newview/skins/default/xui/ja/floater_people.xml
+++ b/indra/newview/skins/default/xui/ja/floater_people.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" ?>
-<floater name="floater_people" title="人">
-	<panel_container name="main_panel">
-		<panel label="グループプロフィール" name="panel_group_info_sidetray"/>
-		<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		<panel name="panel_group_creation_sidetray" label="グループ作成"/>
-	</panel_container>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_people" title="人物">
+  <panel_container name="main_panel">
+    <panel label="グループのプロフィール" name="panel_group_info_sidetray" />
+    <panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray" />
+  </panel_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_perms_default.xml b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
index 33551a5706..8fa98e8665 100644
--- a/indra/newview/skins/default/xui/ja/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
@@ -1,47 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="デフォルトの作成権限">
-	<panel label="デフォルト権限" name="default permissions">
-		<text name="label_1">
-			次の所有者：
-		</text>
-		<text name="label_2">
-			コピー
-		</text>
-		<text name="label_3">
-			修正
-		</text>
-		<text name="label_4">
-			再販・プレゼント
-		</text>
-		<text name="label_5">
-			グループで共同管理
-		</text>
-		<text name="label_6">
-			誰に対してもコピーを許可
-		</text>
-		<text name="label_7" tool_tip="オブジェクトを作成するときにデフォルトの権限を設定する">
-			オブジェクト
-		</text>
-		<text name="label_8" tool_tip="アップロードしたアイテムにデフォルトの権限を設定する">
-			アップロード
-		</text>
-		<text name="label_9" tool_tip="スクリプトを作成するときにデフォルトの権限を設定する">
-			スクリプト
-		</text>
-		<text name="label_10" tool_tip="ノートカードを作成するときにデフォルトの権限を設定する">
-			ノートカード
-		</text>
-		<text name="label_11" tool_tip="ジェスチャーを作成するときにデフォルトの権限を設定する">
-			ジェスチャー
-		</text>
-		<text name="label_12" tool_tip="衣服またはボディパーツを作成するときにデフォルトの権限を設定する">
-			着用物
-		</text>
-		<text name="label_13" tool_tip="自然環境の設定を作成するときにデフォルトの権限を設定する">
-			設定
-		</text>
-		<check_box name="env_settings_c" value="true"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel"/>
-</floater>
+  <panel label="デフォルト権限" name="default permissions">
+    <text name="label_1">次の所有者：</text>
+    <text name="label_2">コピー</text>
+    <text name="label_3">修正</text>
+    <text name="label_4">再販・譲渡</text>
+    <text name="label_5">グループで共同管理</text>
+    <text name="label_6">誰に対してもコピーを許可</text>
+    <text name="label_7" tool_tip="オブジェクトを作成するときに、デフォルトの権限を設定する。">オブジェクト</text>
+    <text name="label_8" tool_tip="アップロードしたアイテムに、デフォルトの権限を設定する。">アップロード</text>
+    <text name="label_9" tool_tip="スクリプトを作成するときに、デフォルトの権限を設定する。">スクリプト</text>
+    <text name="label_10" tool_tip="ノートカードを作成するときに、デフォルトの権限を設定する。">ノートカード</text>
+    <text name="label_11" tool_tip="ジェスチャーを作成するときに、デフォルトの権限を設定する。">ジェスチャー</text>
+    <text name="label_12" tool_tip="衣服装またはボディパーツを作成するときに、デフォルトの権限を設定する。">装着するもの</text>
+    <text name="label_13" tool_tip="自然環境の設定を作成するときに、デフォルトの権限を設定する。">設定</text>
+    <check_box name="env_settings_c" value="true" />
+  </panel>
+  <button label="ＯＫ" label_selected="ＯＫ" name="ok" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pick_track.xml b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
index e5773e1ec8..24213982dd 100644
--- a/indra/newview/skins/default/xui/ja/floater_pick_track.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="track picker" title="選択：トラック">
-	<layout_stack name="adjuster">
-		<layout_panel name="pnl_desc">
-			<text name="select_description">
-				空のソースを選択：
-			</text>
-		</layout_panel>
-		<layout_panel name="pnl_traks">
-			<radio_group name="track_selection">
-				<radio_item label="空 4 [ALT]" name="radio_sky4" value="4"/>
-				<radio_item label="空 3 [ALT]" name="radio_sky3" value="3"/>
-				<radio_item label="空 2 [ALT]" name="radio_sky2" value="2"/>
-				<radio_item label="地面" name="radio_sky1" value="1"/>
-			</radio_group>
-		</layout_panel>
-		<layout_panel name="pnl_ok_cancel">
-			<button label="OK" label_selected="OK" name="btn_select"/>
-			<button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <layout_stack name="adjuster">
+    <layout_panel name="pnl_desc">
+      <text name="select_description">空のソースを選択：</text>
+    </layout_panel>
+    <layout_panel name="pnl_traks">
+      <radio_group name="track_selection">
+        <radio_item label="空４[ALT]" name="radio_sky4" value="4" />
+        <radio_item label="空３[ALT]" name="radio_sky3" value="3" />
+        <radio_item label="空２[ALT]" name="radio_sky2" value="2" />
+        <radio_item label="地面" name="radio_sky1" value="1" />
+      </radio_group>
+    </layout_panel>
+    <layout_panel name="pnl_ok_cancel">
+      <button label="ＯＫ" label_selected="ＯＫ" name="btn_select" />
+      <button label="キャンセル" label_selected="キャンセル" name="btn_cancel" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml
index 0d167444db..9eefc4b054 100644
--- a/indra/newview/skins/default/xui/ja/floater_places.xml
+++ b/indra/newview/skins/default/xui/ja/floater_places.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_places" title="場所">
-	<panel label="場所" name="main_panel"/>
-</floater>
+  <panel label="場所" name="main_panel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
index 7c4d9c78ee..94ed8ec288 100644
--- a/indra/newview/skins/default/xui/ja/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml
@@ -1,54 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Post-Process Floater" title="ポストプロセス設定">
-	<tab_container name="Post-Process Tabs">
-		<panel label="カラー・フィルター" name="wmiColorFilterPanel">
-			<check_box label="有効" name="wmiColorFilterToggle" />
-			<text name="wmiColorFilterBrightnessText">
-				明るさ
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				彩度
-			</text>
-			<text name="wmiColorFilterContrastText">
-				コントラスト
-			</text>
-			<text name="wmiColorFilterBaseText">
-				コントラストの基本色
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR" />
-			<slider label="G" name="wmiColorFilterBaseG" />
-			<slider label="B" name="wmiColorFilterBaseB" />
-			<slider label="I" name="wmiColorFilterBaseI" />
-		</panel>
-		<panel label="ナイトビジョン" name="wmiNightVisionPanel">
-			<check_box label="有効" name="wmiNightVisionToggle" />
-			<text name="wmiNightVisionBrightMultText">
-				光の増幅（マルチ）
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				ノイズ・サイズ
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				ノイズ強度
-			</text>
-		</panel>
-		<panel label="ブルーム" name="wmiBloomPanel">
-			<check_box label="有効" name="wmiBloomToggle" />
-			<text name="wmiBloomExtractText">
-				明度の抽出
-			</text>
-			<text name="wmiBloomSizeText">
-				ブルーム・サイズ
-			</text>
-			<text name="wmiBloomStrengthText">
-				ブルーム強度
-			</text>
-		</panel>
-		<panel label="その他" name="Extras">
-			<button label="効果読み込み" label_selected="効果読み込み"
-			     name="PPLoadEffect" />
-			<button label="効果保存" label_selected="効果保存" name="PPSaveEffect" />
-			<line_editor label="効果名" name="PPEffectNameEditor" />
-		</panel>
-	</tab_container>
-</floater>
+  <tab_container name="Post-Process Tabs">
+    <panel label="カラー・フィルタ" name="wmiColorFilterPanel">
+      <check_box label="有効" name="wmiColorFilterToggle" />
+      <text name="wmiColorFilterBrightnessText">明度</text>
+      <text name="wmiColorFilterSaturationText">彩度</text>
+      <text name="wmiColorFilterContrastText">輝度</text>
+      <text name="wmiColorFilterBaseText">輝度の基準色</text>
+      <slider label="赤" name="wmiColorFilterBaseR" />
+      <slider label="緑" name="wmiColorFilterBaseG" />
+      <slider label="青" name="wmiColorFilterBaseB" />
+      <slider label="I" name="wmiColorFilterBaseI" />
+    </panel>
+    <panel label="暗視" name="wmiNightVisionPanel">
+      <check_box label="有効" name="wmiNightVisionToggle" />
+      <text name="wmiNightVisionBrightMultText">光の増幅（マルチ）</text>
+      <text name="wmiNightVisionNoiseSizeText">ノイズ・サイズ</text>
+      <text name="wmiNightVisionNoiseStrengthText">ノイズ強度</text>
+    </panel>
+    <panel label="ブルーム" name="wmiBloomPanel">
+      <check_box label="有効" name="wmiBloomToggle" />
+      <text name="wmiBloomExtractText">明度の抽出</text>
+      <text name="wmiBloomSizeText">ブルーム・サイズ</text>
+      <text name="wmiBloomStrengthText">ブルーム強度</text>
+    </panel>
+    <panel label="その他" name="Extras">
+      <button label="効果読み込み" label_selected="効果読み込み" name="PPLoadEffect" />
+      <button label="効果保存" label_selected="効果保存" name="PPSaveEffect" />
+      <line_editor label="効果名" name="PPEffectNameEditor" />
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 4a316ef606..56601963dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="環境設定">
-	<floater.string name="email_unverified_tooltip">
-		IM を有効にするには、https://accounts.secondlife.com/change_email/ からあなたのメールアドレスを確認してください
-	</floater.string>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<panel name="search_panel">
-		<search_editor label="設定の検索" name="search_prefs_edit" tool_tip="検索したい内容をここに入力してください。設定の名前またはコメントに部分的に一致する結果が表示されます。"/>
-	</panel>
-	<tab_container name="pref core">
-		<panel label="一般" name="general"/>
-		<panel label="グラフィック" name="display"/>
-		<panel label="サウンドとメディア" name="audio"/>
-		<panel label="チャット" name="chat"/>
-		<panel label="移動 &amp; 表示" name="move"/>
-		<panel label="メッセージ" name="msgs"/>
-		<panel label="色" name="colors"/>
-		<panel label="プライバシー" name="im"/>
-		<panel label="セットアップ" name="input"/>
-		<panel label="詳細" name="advanced1"/>
-		<panel label="アップロード" name="uploads"/>
-	</tab_container>
-</floater>
+<floater name="Preferences" title="初期設定">
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+
+  <panel name="search_panel">
+    <search_editor label="設定を検索" name="search_prefs_edit" tool_tip="検索したい内容をここに入力してください。設定の名前またはコメントに部分的に一致する結果が表示されます。" />
+  </panel>
+
+  <tab_container name="pref core">
+    <panel label="一般" name="general" />
+    <panel label="グラフィック" name="display" />
+    <panel label="サウンドとメディア" name="audio" />
+    <panel label="チャット" name="chat" />
+    <panel label="移動と表示" name="move" />
+    <panel label="通知" name="msgs" />
+    <panel label="色" name="colors" />
+    <panel label="プライバシー" name="im" />
+    <panel label="セットアップ" name="input" />
+    <panel label="拡張" name="advanced1" />
+    <panel label="アップロード" name="uploads" />
+    <panel label="操作" name="controls" />
+  </tab_container>
+
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index 8ba537faa2..038605c3ed 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -1,122 +1,110 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="prefs_graphics_advanced" title="詳細グラフィックス設定">
-	<text name="GeneralText">
-		全般
-	</text>
-	<slider label="描画距離：" name="DrawDistance"/>
-	<text name="DrawDistanceMeterText2">
-		m
-	</text>
-	<slider label="最大パーティクル数：" name="MaxParticleCount"/>
-	<slider label="ポストプロセス品質：" name="RenderPostProcess"/>
-	<text name="PostProcessText">
-		低
-	</text>
-	<text name="AvatarText">
-		アバター
-	</text>
-	<slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します"/>
-	<text name="IndirectMaxComplexityText">
-		0
-	</text>
-	<slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors"/>
-	<text name="IndirectMaxNonImpostorsText">
-		0
-	</text>
-	<slider label="詳細：" name="AvatarMeshDetail"/>
-	<text name="AvatarMeshDetailText">
-		低
-	</text>
-	<slider label="物理演算：" name="AvatarPhysicsDetail"/>
-	<text name="AvatarPhysicsDetailText">
-		低
-	</text>
-	<text name="HardwareText">
-		ハードウェア
-	</text>
-	<slider label="テクスチャメモリ (MB)：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。ビデオカードのメモリに既定。数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
-	<slider label="フォグの距離比率：" name="fog"/>
-	<slider label="ガンマ：" name="gamma"/>
-	<text name="(brightness, lower is brighter)">
-		(0 でデフォルト、低いほど明るい)
-	</text>
-	<check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani"/>
-	<check_box initial_value="true" label="OpenGL Vertex Buffer Objects を有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。"/>
-	<check_box initial_value="true" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。"/>
-	<check_box initial_value="true" label="HiDPI 表示のためにサポートを有効にする（再起動が必要）" name="use HiDPI" tool_tip="高画質の描画のために OpenGL を有効にする"/>
-	<text name="antialiasing label">
-		アンチエイリアシング：
-	</text>
-	<combo_box label="アンチエイリアシング" name="fsaa">
-		<combo_box.item label="無効" name="FSAADisabled"/>
-		<combo_box.item label="2x" name="2x"/>
-		<combo_box.item label="4x" name="4x"/>
-		<combo_box.item label="8x" name="8x"/>
-		<combo_box.item label="16x" name="16x"/>
-	</combo_box>
-	<text name="antialiasing restart">
-		(再起動後に反映)
-	</text>
-	<text name="MeshText">
-		メッシュ
-	</text>
-	<slider label="地形のメッシュの詳細：" name="TerrainMeshDetail"/>
-	<text name="TerrainMeshDetailText">
-		低
-	</text>
-	<slider label="木：" name="TreeMeshDetail"/>
-	<text name="TreeMeshDetailText">
-		低
-	</text>
-	<slider label="オブジェクト：" name="ObjectMeshDetail"/>
-	<text name="ObjectMeshDetailText">
-		低
-	</text>
-	<slider label="フレキシプリム：" name="FlexibleMeshDetail"/>
-	<text name="FlexibleMeshDetailText">
-		低
-	</text>
-	<text name="ShadersText">
-		シェーダー
-	</text>
-	<check_box initial_value="true" label="透明な水" name="TransparentWater"/>
-	<check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/>
-	<check_box initial_value="true" label="近くの光" name="LocalLights"/>
-	<slider label="地形詳細：" name="TerrainDetail"/>
-	<text name="TerrainDetailText">
-		低
-	</text>
-	<check_box initial_value="true" label="アバターハードウェアスキﾆﾝｸﾞ" name="AvatarVertexProgram"/>
-	<check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
-	<text name="ReflectionsText">
-		水の反射：
-	</text>
-	<combo_box name="Reflections">
-		<combo_box.item label="最小" name="0"/>
-		<combo_box.item label="地形と樹木" name="1"/>
-		<combo_box.item label="すべての静止オブジェクト" name="2"/>
-		<combo_box.item label="すべてのアバターとオブジェクト" name="3"/>
-		<combo_box.item label="すべて" name="4"/>
-	</combo_box>
-	<check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
-	<slider label="空：" name="SkyMeshDetail"/>
-	<text name="SkyMeshDetailText">
-		低
-	</text>
-	<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
-	<check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
-	<check_box initial_value="true" label="フィールドの遠近感" name="UseDoF"/>
-	<text name="RenderShadowDetailText">
-		影：
-	</text>
-	<combo_box name="ShadowDetail">
-		<combo_box.item label="なし" name="0"/>
-		<combo_box.item label="太陽/月" name="1"/>
-		<combo_box.item label="太陽/月・プロジェクタ" name="2"/>
-	</combo_box>
-	<button label="推奨設定にリセット" name="Defaults"/>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxComplexity"/>
-	<check_box label="RenderAvatarMaxNonImpostors" name="RenderAvatarMaxNonImpostors"/>
-</floater>
+<floater name="prefs_graphics_advanced" title="拡張グラフィック設定">
+  <!-- This block shows Advanced Settings -->
+  <text name="GeneralText">全般</text>
+
+  <slider label="描画距離：" name="DrawDistance" />
+  <text name="DrawDistanceMeterText2">m</text>
+  <slider label="最大パーティクル数：" name="MaxParticleCount" />
+
+  <slider label="ポストプロセス品質：" name="RenderPostProcess" />
+  <text name="PostProcessText">低</text>
+
+  <check_box label="垂直同期を有効化" name="vsync" tool_tip="フレーム レートをモニターのリフレッシュレートに同期させ、スムーズなパフォーマンスを実現します。" />
+
+  <text name="AvatarText">アバター</text>
+
+  <slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します" />
+  <text name="IndirectMaxComplexityText">0</text>
+
+  <slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors" />
+  <text name="IndirectMaxNonImpostorsText">0</text>
+
+  <slider label="詳細：" name="AvatarMeshDetail" />
+  <text name="AvatarMeshDetailText">低</text>
+
+  <slider label="物理演算：" name="AvatarPhysicsDetail" />
+  <text name="AvatarPhysicsDetailText">低</text>
+
+  <text name="HardwareText">ハードウェア</text>
+
+  <slider label="テクスチャメモリ（㎆）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。ビデオカードのメモリに既定。数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。" />
+
+  <slider label="フォグの距離比率：" name="fog" />
+
+  <slider label="ガンマ：" name="gamma" />
+  <text name="(brightness, lower is brighter)">（0がデフォルト、低いほど明るい）</text>
+
+  <check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani" />
+
+  <check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。" />
+
+  <check_box label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。" />
+
+  <check_box label="HiDPI 表示のためにサポートを有効にする（再起動が必要）" name="use HiDPI" tool_tip="高画質の描画のために OpenGL を有効にする" />
+
+  <text name="antialiasing label">アンチエイリアシング：</text>
+  <combo_box label="アンチエイリアシング" name="fsaa">
+    <combo_box.item label="無効" name="FSAADisabled" value="0" />
+    <combo_box.item label="2x" name="2x" value="2" />
+    <combo_box.item label="4x" name="4x" value="4" />
+    <combo_box.item label="8x" name="8x" value="8" />
+    <combo_box.item label="16x" name="16x" value="16" />
+  </combo_box>
+  <text name="antialiasing restart">（起動後に反映）</text>
+  <view_border name="vert_border" />
+  <text name="MeshText">メッシュ</text>
+
+  <slider label="地形のメッシュの詳細：" name="TerrainMeshDetail" />
+  <text name="TerrainMeshDetailText">低</text>
+
+  <slider label="木：" name="TreeMeshDetail" />
+  <text name="TreeMeshDetailText">低</text>
+
+  <slider label="オブジェクト：" name="ObjectMeshDetail" />
+  <text name="ObjectMeshDetailText">低</text>
+
+  <slider label="フレキシプリム：" name="FlexibleMeshDetail" />
+  <text name="FlexibleMeshDetailText">低</text>
+  <text name="ShadersText">シェーダー</text>
+
+  <check_box label="透明な水" name="TransparentWater" />
+  <check_box label="バンプマッピングと光沢" name="BumpShiny" />
+  <check_box label="近くの光" name="LocalLights" />
+
+  <slider label="地形詳細：" name="TerrainDetail" />
+  <text name="TerrainDetailText">低</text>
+  <check_box label="アバターのハードウェアスキニング" name="AvatarVertexProgram" />
+  <check_box label="アバターの布" name="AvatarCloth" />
+
+  <text name="ReflectionsText">水の反射：</text>
+  <combo_box name="Reflections">
+    <combo_box.item label="無し：不透明" name="0" value="-2"/>
+    <combo_box.item label="無し・透過" name="0" value="-1"/>
+    <combo_box.item label="最小" name="0" value="0"/>
+    <combo_box.item label="地形と樹木" name="1" value="1"/>
+    <combo_box.item label="すべての静止オブジェクト" name="2" value="2"/>
+    <combo_box.item label="すべてのアバターとオブジェクト" name="3" value="3"/>
+    <combo_box.item label="すべて" name="4" value="4"/>
+  </combo_box>
+
+  <check_box label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders" />
+  <slider label="空：" name="SkyMeshDetail" />
+
+  <text name="SkyMeshDetailText">低</text>
+  <check_box label="高度なライティングモデル" name="UseLightShaders" />
+  <check_box label="アンビエントオクルージョン" name="UseSSAO" />
+  <check_box label="フィールドの遠近感" name="UseDoF" />
+  <text name="RenderShadowDetailText">影：</text>
+
+  <combo_box name="ShadowDetail">
+    <combo_box.item label="なし" name="0" />
+    <combo_box.item label="太陽/月" name="1" />
+    <combo_box.item label="太陽/月・プロジェクタ" name="2" />
+  </combo_box>
+  <button label="推奨設定にリセット" name="Defaults" />
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxComplexity" />
+  <check_box label="RenderAvatarMaxNonImpostors" name="RenderAvatarMaxNonImpostors" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
index 4638fd002e..7afda68409 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
@@ -1,40 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Proxy Settings Floater" title="プロキシ設定">
-	<check_box initial_value="false" label="ウェブページに HTTP プロキシを使う" name="web_proxy_enabled"/>
-	<text name="http_proxy_label">
-		HTTP プロキシ：
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="使用する HTTP プロキシの DNS 名または IP アドレス。"/>
-	<spinner label="ポート番号：" name="web_proxy_port" tool_tip="使用する HTTP プロキシポート。"/>
-	<check_box label="UDP トラフィックに SOCKS 5 プロキシを使う" name="socks_proxy_enabled"/>
-	<text name="socks5_proxy_label">
-		SOCKS 5 プロキシ：
-	</text>
-	<line_editor name="socks_proxy_editor" tool_tip="使用する SOCKS 5 プロキシの DNS 名または IP アドレス。"/>
-	<spinner label="ポート番号：" name="socks_proxy_port" tool_tip="使用する SOCKS 5 プロキシポート。"/>
-	<text name="socks_auth_label">
-		SOCKS 認証：
-	</text>
-	<radio_group name="socks5_auth_type">
-		<radio_item label="認証なし" name="Socks5NoAuth" tool_tip="Socks 5 プロキシは認証の必要がありません。" value="なし"/>
-		<radio_item label="ユーザー名/パスワード" name="Socks5UserPass" tool_tip="Socks5 プロキシはユーザー名/パスワードの認証が必要です。" value="UserPass"/>
-	</radio_group>
-	<text name="socks5_username_label">
-		ユーザー名：
-	</text>
-	<text name="socks5_password_label">
-		パスワード：
-	</text>
-	<line_editor name="socks5_username" tool_tip="SOCKS 5 サーバーの認証に使用されたユーザー名"/>
-	<line_editor name="socks5_password" tool_tip="SOCKS 5 サーバーの認証に使用されたパスワード"/>
-	<text name="other_proxy_label">
-		他の HTTP トラフィックプロキシ：
-	</text>
-	<radio_group name="other_http_proxy_type">
-		<radio_item label="プロキシしない" name="OtherNoProxy" tool_tip="ウェブ以外の HTTP トラフィックはいずれのプロキシにもルーティングされません。" value="なし"/>
-		<radio_item label="HTTP プロキシを使う" name="OtherHTTPProxy" tool_tip="ウェブ以外の HTTP は設定済みウェブプロキシを通してルーティングされます。" value="Web"/>
-		<radio_item label="SOCKS 5 プロキシを使う" name="OtherSocksProxy" tool_tip="ウェブ以外の HTTP トラフィックは設定済みの Socks 5 プロキシを通してルーティングされます。" value="Socks"/>
-	</radio_group>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-</floater>
+  <check_box initial_value="false" label="ウェブページに HTTP プロキシを使う" name="web_proxy_enabled" />
+  <text name="http_proxy_label">HTTP プロキシ：</text>
+  <line_editor name="web_proxy_editor" tool_tip="使用する HTTP プロキシの DNS 名または IP アドレス。" />
+  <spinner label="ポート番号：" name="web_proxy_port" tool_tip="使用する HTTP プロキシポート。" />
+  <check_box label="UDP トラフィックに SOCKS 5 プロキシを使う" name="socks_proxy_enabled" />
+  <text name="socks5_proxy_label">SOCKS 5 プロキシ：</text>
+  <line_editor name="socks_proxy_editor" tool_tip="使用する SOCKS 5 プロキシの DNS 名または IP アドレス。" />
+  <spinner label="ポート番号：" name="socks_proxy_port" tool_tip="使用する SOCKS 5 プロキシポート。" />
+  <text name="socks_auth_label">SOCKS 認証：</text>
+  <radio_group name="socks5_auth_type">
+    <radio_item label="認証なし" name="Socks5NoAuth" tool_tip="Socks 5 プロキシは認証の必要がありません。" value="なし" />
+    <radio_item label="ユーザー名/パスワード" name="Socks5UserPass" tool_tip="Socks5 プロキシはユーザー名/パスワードの認証が必要です。" value="UserPass" />
+  </radio_group>
+  <text name="socks5_username_label">ユーザー名：</text>
+  <text name="socks5_password_label">パスワード：</text>
+  <line_editor name="socks5_username" tool_tip="SOCKS 5 サーバーの認証に使用されたユーザー名" />
+  <line_editor name="socks5_password" tool_tip="SOCKS 5 サーバーの認証に使用されたパスワード" />
+  <text name="other_proxy_label">他の HTTP トラフィックプロキシ：</text>
+  <radio_group name="other_http_proxy_type">
+    <radio_item label="プロキシを使用しない" name="OtherNoProxy" tool_tip="ウェブ以外の HTTP トラフィックはいずれのプロキシにもルーティングされません。" value="なし" />
+    <radio_item label="HTTP プロキシを使う" name="OtherHTTPProxy" tool_tip="ウェブ以外の HTTP は設定済みウェブプロキシを通してルーティングされます。" value="Web" />
+    <radio_item label="SOCKS 5 プロキシを使う" name="OtherSocksProxy" tool_tip="ウェブ以外の HTTP トラフィックは設定済みの Socks 5 プロキシを通してルーティングされます。" value="Socks" />
+  </radio_group>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
index 09eaf7b294..1be31dd31a 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
@@ -1,2 +1,14 @@
-<?xml version="1.0" ?>
-<floater name="floaterpreferencesviewadvanced" title="カメラ位置"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterpreferencesviewadvanced" title="カメラの位置">
+  <text name="camera_offset_lbl">カメラのオフセット：</text>
+  <spinner name="camera_x" />
+  <spinner label="Y" name="camera_y" />
+  <spinner label="Z" name="camera_z" />
+  <text name="focus_offset_lbl">焦点のオフセット：</text>
+  <spinner name="focus_x" />
+  <spinner label="Y" name="focus_y" />
+  <spinner label="Z" name="focus_z" />
+  <text name="offset_scale_lbl">カメラのオフセット倍率：</text>
+  <slider name="offset_scale_sld" />
+  <spinner name="offset_scale_ctrl" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index a3042f66ea..c7295e3532 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim">
-	<floater.string name="Title">
-		アニメーション： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人に見えるように再生"/>
-	<button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生"/>
-</floater>
+  <floater.string name="Title">アニメーション：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+  <button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人から見えるように再生します。" />
+  <button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生します。" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 59ce36b022..fb6a65f812 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -1,73 +1,41 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
-	<floater.string name="step_anim">
-		プレイするアニメーション：
-	</floater.string>
-	<floater.string name="step_sound">
-		プレイするサウンド：
-	</floater.string>
-	<floater.string name="step_chat">
-		発言するチャット：
-	</floater.string>
-	<floater.string name="step_wait">
-		待機：
-	</floater.string>
-	<floater.string name="stop_txt">
-		止まる
-	</floater.string>
-	<floater.string name="preview_txt">
-		プレビュー
-	</floater.string>
-	<floater.string name="none_text">
-		-- なし --
-	</floater.string>
-	<floater.string name="Title">
-		ジェスチャー： [NAME]
-	</floater.string>
-	<text name="desc_label">
-		説明：
-	</text>
-	<text name="trigger_label">
-		トリガー:
-	</text>
-	<text name="replace_text" tool_tip="トリガーワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。">
-		置換：
-	</text>
-	<line_editor name="replace_editor" tool_tip="トリガーワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"/>
-	<text name="key_label">
-		ショートカット：
-	</text>
-	<combo_box label="なし" left="160" name="modifier_combo"/>
-	<combo_box label="なし" name="key_combo"/>
-	<text name="library_label">
-		ライブラリ：
-	</text>
-	<scroll_list name="library_list">
-		<scroll_list.rows name="action_animation" value="アニメーション"/>
-		<scroll_list.rows name="action_sound" value="サウンド"/>
-		<scroll_list.rows name="action_chat" value="チャット"/>
-		<scroll_list.rows name="action_wait" value="待機"/>
-	</scroll_list>
-	<button label="追加＞＞" name="add_btn"/>
-	<text name="steps_label">
-		手順：
-	</text>
-	<button label="上" name="up_btn"/>
-	<button label="下" name="down_btn"/>
-	<button label="削除" name="delete_btn"/>
-	<text name="options_text">
-		（オプション）
-	</text>
-	<radio_group name="animation_trigger_type">
-		<radio_item label="開始" name="start"/>
-		<radio_item label="停止" name="stop"/>
-	</radio_group>
-	<check_box label="アニメーションが完了するまで" name="wait_anim_check"/>
-	<check_box label="時間（秒）：" name="wait_time_check"/>
-	<text name="help_label">
-		待機ステップを入れない限りは、すべてのステップが同時に起こります。
-	</text>
-	<check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーフレーズを使うか、ホットキーを押すと切り替わります。  1つのショートカットキーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。"/>
-	<button label="プレビュー" name="preview_btn"/>
-	<button label="保存" name="save_btn"/>
-</floater>
+  <floater.string name="step_anim">再生するアニメーション：</floater.string>
+  <floater.string name="step_sound">再生するサウンド：</floater.string>
+  <floater.string name="step_chat">発言するチャット：</floater.string>
+  <floater.string name="step_wait">待機：</floater.string>
+  <floater.string name="stop_txt">停止</floater.string>
+  <floater.string name="preview_txt">プレビュー</floater.string>
+  <floater.string name="none_text">－なし－</floater.string>
+  <floater.string name="Title">ジェスチャー：[NAME]</floater.string>
+  <text name="desc_label">説明：</text>
+  <text name="trigger_label">トリガー：</text>
+  <text name="replace_text" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。">置換：</text>
+  <line_editor name="replace_editor" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。" />
+  <text name="key_label">ショートカット：</text>
+  <combo_box label="なし" name="modifier_combo" />
+  <combo_box label="なし" name="key_combo" />
+  <text name="library_label">ライブラリ：</text>
+  <scroll_list name="library_list">
+    <scroll_list.rows name="action_animation" value="アニメーション" />
+    <scroll_list.rows name="action_sound" value="サウンド" />
+    <scroll_list.rows name="action_chat" value="チャット" />
+    <scroll_list.rows name="action_wait" value="待機" />
+  </scroll_list>
+  <button label="追加＞＞" name="add_btn" />
+  <text name="steps_label">手順：</text>
+  <button label="上" name="up_btn" />
+  <button label="下" name="down_btn" />
+  <button label="削除" name="delete_btn" />
+  <text name="options_text">（オプション）</text>
+  <radio_group name="animation_trigger_type">
+    <radio_item label="開始" name="start" />
+    <radio_item label="停止" name="stop" />
+  </radio_group>
+  <check_box label="アニメーションが完了するまで" name="wait_anim_check" />
+  <check_box label="時間（秒）：" name="wait_time_check" />
+  <text name="help_label">待機ステップを入れない限りは、すべてのステップが同時に起こります。</text>
+  <check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーフレーズを使うか、ホットキーを押すと切り替わります。 1つのショートカットキーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。" />
+  <button label="プレビュー" name="preview_btn" />
+  <button label="保存" name="save_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
index ef7e90a6bc..eb97279249 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="ノートカード：">
-	<floater.string name="no_object">
-		このノートカードが含まれたオブジェクトが見つかりません。
-	</floater.string>
-	<floater.string name="not_allowed">
-		このノートを見る権限がありません。
-	</floater.string>
-	<floater.string name="Title">
-		ノートカード： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<text_editor name="Notecard Editor">
-		ローディング．．．
-	</text_editor>
-	<button label="編集..." label_selected="編集" name="Edit"/>
-	<button label="保存" label_selected="保存" name="Save"/>
-	<button label="削除" label_selected="削除" name="Delete"/>
-</floater>
+  <floater.string name="no_object">このノートカードが含まれたオブジェクトが見つかりません。</floater.string>
+  <floater.string name="not_allowed">このノートを見る権限がありません。</floater.string>
+  <floater.string name="Title">ノートカード：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+  <text_editor name="Notecard Editor">読み込んでいます…</text_editor>
+  <button label="編集…" label_selected="編集" name="Edit" />
+  <button label="保存" label_selected="保存" name="Save" />
+  <button label="削除" label_selected="削除" name="Delete" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index 5c0f05cec6..9eef0cc5e3 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_sound">
-	<floater.string name="Title">
-		サウンド： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<button label="インワールドで再生" label_selected="インワールドで再生" name="Sound play btn" tool_tip="他人にも聞こえるように再生します"/>
-	<button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分だけが聞こえるように再生します"/>
-</floater>
+  <floater.string name="Title">サウンド：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+  <button label="インワールドで再生" label_selected="インワールドで再生" name="Sound play btn" tool_tip="他人からも聞こえるように再生します。" />
+  <button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分のみ聞こえるように再生します。" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index 66ef13948a..c9713e3d43 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
@@ -1,28 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_texture">
-	<floater.string name="Title">
-		テクスチャ： [NAME]
-	</floater.string>
-	<floater.string name="Copy">
-		インベントリにコピー
-	</floater.string>
-	<layout_stack name="preview_stack">
-		<layout_panel name="texture_panel">
-			<text name="desc txt">
-				説明：
-			</text>
-			<text name="dimensions">
-				[WIDTH]px x [HEIGHT]px
-			</text>
-			<text name="aspect_ratio">
-				縦横比のプレビュー
-			</text>
-			<combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー"/>
-		</layout_panel>
-		<layout_panel name="buttons_panel">
-			<button label="OK" name="Keep"/>
-			<button label="処分する" name="Discard"/>
-			<button label="別名で保存" name="save_tex_btn"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="Title">テクスチャ：[NAME]</floater.string>
+  <floater.string name="Copy">インベントリにコピー</floater.string>
+  <layout_stack name="preview_stack">
+    <layout_panel name="texture_panel">
+      <text name="desc txt">説明：</text>
+      <text name="dimensions">[WIDTH]px✕[HEIGHT]px</text>
+      <text name="aspect_ratio">縦横比のプレビュー</text>
+      <combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー" />
+    </layout_panel>
+    <layout_panel name="buttons_panel">
+      <button label="ＯＫ" name="Keep" />
+      <button label="破棄" name="Discard" />
+      <button label="名前をつけて保存" name="save_tex_btn" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
index 54cf632727..728256b324 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
@@ -1,7 +1,12 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_preview_trash" title="ゴミ箱">
-	<layout_panel name="empty_btn_lp"/>
-	<layout_stack name="button_panel_ls">
-		<button name="empty_btn" label="ゴミ箱を空にする"/>
-	</layout_stack>
+  <inventory_panel name="inventory_trash" />
+  <layout_stack name="button_panel_ls">
+    <layout_panel name="empty_btn_lp">
+      <button label="ゴミ箱を空に" name="empty_btn"/>
+    </layout_panel>
+    <layout_panel name="share_btn_lp">
+      <button label="キャンセル" name="cancel_btn" />
+    </layout_panel>
+  </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
index 10a46247a7..57f7946ecb 100644
--- a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="price_for_listing" title="クラシファイド広告の掲載">
-	<text name="explanation_text">
-		あなたのクラシファイド広告は、公開された日から1週間有効です。
-
+  <text name="explanation_text">あなたのクラシファイド広告は、公開された日から１週間有効です。
 クラシファイドリストのあなたの広告の位置は、広告費をいくら支払うかで決まります。
 
-最高金額を支払った広告がリストのトップに載り、検索で上位に表示されます。
-	</text>
-	<text name="price_text">
-		広告費：
-	</text>
-	<text name="price_symbol">
-		L$
-	</text>
-	<button label="OK" name="set_price_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+最高金額を支払った広告がリストのトップに載り、検索で上位に表示されます。</text>
+  <text name="price_text">広告掲載費：</text>
+  <text name="price_symbol">L$ </text>
+  <button label="ＯＫ" name="set_price_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_profile.xml b/indra/newview/skins/default/xui/ja/floater_profile.xml
index 4192dc38f1..303a95baac 100644
--- a/indra/newview/skins/default/xui/ja/floater_profile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_profile.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarinfo" title="プロフィール">
-	<panel name="panel_profile_view">
-		<tab_container name="panel_profile_tabs">
-			<panel label="Second Life" name="panel_profile_secondlife"/>
-			<panel label="フィード" name="panel_profile_web"/>
-			<panel label="趣味" name="panel_profile_interests"/>
-			<panel label="ピック" name="panel_profile_picks"/>
-			<panel label="クラシファイド広告" name="panel_profile_classifieds"/>
-			<panel label="リアルライフ（現実世界）" name="panel_profile_firstlife"/>
-			<panel label="メモ" name="panel_profile_notes"/>
-		</tab_container>
-		<button label="OK" name="ok_btn" tool_tip="プロフィールの変更を保存して閉じる"/>
-		<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
-	</panel>
+  <panel name="panel_profile_view">
+    <tab_container name="panel_profile_tabs">
+      <panel label="Second Life" name="panel_profile_secondlife" />
+      <panel label="Web" name="panel_profile_web" />
+      <panel label="趣味" name="panel_profile_interests" />
+      <panel label="ピック" name="panel_profile_picks" />
+      <panel label="クラシファイド広告" name="panel_profile_classifieds" />
+      <panel label="リアルライフ（現実世界）" name="panel_profile_firstlife" />
+      <panel label="メモ" name="panel_profile_notes" />
+    </tab_container>
+    <button label="ＯＫ" name="ok_btn" tool_tip="プロフィールの変更を保存して閉じる" />
+    <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml b/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
new file mode 100644
index 0000000000..18e19cf11c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="profile_permissions">
+  <string name="description_string" value="エージェントの[AGENT_NAME]に許可：" />
+  <text name="perm_description" value="許可するエージェント：" />
+  <check_box name="online_check" label="自分のオンライン状況" />
+  <check_box name="map_check" label="ワールドマップ上の自分の位置" />
+  <check_box name="objects_check" label="自分の土地からの自分のオブジェクトの編集、削除、または取得" />
+  <button name="perms_btn_ok" label="ＯＫ" />
+  <button name="perms_btn_cancel" label="キャンセル" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_texture.xml b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml
new file mode 100644
index 0000000000..384a4ab028
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="profile_texture">
+  <layout_stack name="preview_stack">
+    <layout_panel name="texture_panel">
+      <icon name="profile_pic" />
+    </layout_panel>
+    <layout_panel name="buttons_panel">
+      <layout_stack name="buttons_stack">
+        <layout_panel name="resizer_left" />
+        <layout_panel name="close_panel">
+          <button label="閉じる" name="close_btn" />
+        </layout_panel>
+        <layout_panel name="resizer_right" />
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
index f33406da51..a719124db5 100644
--- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="publish_classified" title="クラシファイド広告掲載">
-	<text name="explanation_text">
-		あなたのクラシファイド広告は、掲載された日から1週間有効です。
-        
-クラシファイド広告は返金できませんのでご了承ください。
-	</text>
-	<spinner label="価格：L$" name="price_for_listing" tool_tip="掲載価格" value="50"/>
-	<text name="l$_text" value="L$"/>
-	<text name="more_info_text">
-		詳しい情報（クラシファイドヘルプへのリンク）
-	</text>
-	<button label="掲載" name="publish_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+  <text name="explanation_text">あなたのクラシファイド広告は、掲載された日から１週間有効です。
+
+クラシファイド広告は返金できませんのでご了承ください。</text>
+  <spinner label="掲載費：L$" name="price_for_listing" tool_tip="掲載価格" value="50" />
+  <text name="l$_text" value="L$" />
+  <text name="more_info_text">詳しい情報（クラシファイドヘルプへのリンク）</text>
+  <button label="掲載する" name="publish_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
index 4edb4972e4..ba673208bb 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="region_debug_console" title="地域デバッグ"/>
+<floater name="region_debug_console" title="リージョン（地域）のデバッグ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
index d08c51c61e..85ae83ae66 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="地域 / 不動産"/>
+<floater name="regioninfo" title="リージョン（地域）／不動産" />
diff --git a/indra/newview/skins/default/xui/ja/floater_region_restarting.xml b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
index e9ba9d230d..810f32ea24 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="region_restarting" title="リージョンの再起動">
-	<string name="RegionName">
-		今 ([NAME]) がいるリージョンを再起動しようとしています。
+  <string name="RegionName">現在あなたがいるリージョン「[NAME]」は、再起動しようとしています。
 
-このままここにいるとログアウトされます。
-	</string>
-	<string name="RestartSeconds">
-		再起動までの秒数
-[SECONDS]
-	</string>
-	<panel name="layout_panel_1">
-		<text name="region_name">
-			今 (-最長リージョン名-) がいるリージョンを再起動しようとしています。
+このまま、この場所にいるとログアウトされます。</string>
+  <string name="RestartSeconds">再起動まであと
+[SECONDS]秒</string>
+  <panel name="layout_panel_1">
+    <text name="region_name">現在あなたがいるリージョン「-最長リージョン名-」は、再起動しようとしています。
 
-このままここにいるとログアウトされます。
-		</text>
-		<text name="restart_seconds">
-			再起動までの秒数
-     32767
-		</text>
-	</panel>
-</floater>
+このまま、この場所にいるとログアウトされます。</text>
+    <text name="restart_seconds">再起動まであと
+32767秒</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 4ddd0d2605..f232dee5ab 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -1,103 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="嫌がらせの報告">
-	<floater.string name="Screenshot">
-		スクリーンショット
-	</floater.string>
-	<check_box label="このスクリーンショットを使用" name="screen_check"/>
-	<text name="reporter_title">
-		報告者：
-	</text>
-	<text name="reporter_field">
-		Loremipsum Dolorsitamut Longnamez
-	</text>
-	<text name="sim_title">
-		地域：
-	</text>
-	<text name="sim_field">
-		地域名
-	</text>
-	<text name="pos_title">
-		位置：
-	</text>
-	<text name="pos_field">
-		{128.1, 128.1, 15.4}
-	</text>
-	<text name="select_object_label">
-		ボタンをクリックしてから、悪意のあるオブジェクトをクリック：
-	</text>
-	<button label="" label_selected="" name="pick_btn" tool_tip="オブジェクトピッカー - 報告対象のオブジェクトを選択してください"/>
-	<text name="object_name_label">
-		オブジェクト：
-	</text>
-	<text name="object_name">
-		Consetetur Sadipscing
-	</text>
-	<text name="owner_name_label">
-		所有者：
-	</text>
-	<text name="owner_name">
-		Hendrerit Vulputate Kamawashi Longname
-	</text>
-	<combo_box name="category_combo" tool_tip="カテゴリ -- この報告に最も適したカテゴリを選択してください">
-		<combo_box.item label="カテゴリを選択してください" name="Select_category"/>
-		<combo_box.item label="年齢＞年齢偽証" name="Age__Age_play"/>
-		<combo_box.item label="年齢 &gt; 成人の住人が Teen Second Life にいる" name="Age__Adult_resident_on_Teen_Second_Life"/>
-		<combo_box.item label="年齢 &gt; 未成年の住人がTeen Second Life の外にいる" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
-		<combo_box.item label="攻撃＞コンバット・サンドボックス/危険なエリア" name="Assault__Combat_sandbox___unsafe_area"/>
-		<combo_box.item label="攻撃 &gt; 安全エリアで他の住人を銃撃、プッシュ、または突き飛ばす" name="Assault__Safe_area"/>
-		<combo_box.item label="攻撃＞武器テスト用サンドボックス" name="Assault__Weapons_testing_sandbox"/>
-		<combo_box.item label="商取引＞製品またはサービスの提供が行われない" name="Commerce__Failure_to_deliver_product_or_service"/>
-		<combo_box.item label="開示＞リアルワールドの情報" name="Disclosure__Real_world_information"/>
-		<combo_box.item label="開示＞離れたところからチャットをモニターしている" name="Disclosure__Remotely_monitoring chat"/>
-		<combo_box.item label="開示＞Second Life の情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs"/>
-		<combo_box.item label="平穏を乱す行為＞地域リソースの使用が不公平" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
-		<combo_box.item label="平穏を乱す行為＞スクリプト・オブジェクトの乱用" name="Disturbing_the_peace__Excessive_scripted_objects"/>
-		<combo_box.item label="平穏を乱す行為＞オブジェクトの捨て置き" name="Disturbing_the_peace__Object_littering"/>
-		<combo_box.item label="平穏を乱す行為＞繰り返しスパム" name="Disturbing_the_peace__Repetitive_spam"/>
-		<combo_box.item label="平穏を乱す行為＞不要な広告スパム" name="Disturbing_the_peace__Unwanted_advert_spam"/>
-		<combo_box.item label="詐欺＞ L$" name="Fraud__L$"/>
-		<combo_box.item label="詐欺＞土地" name="Fraud__Land"/>
-		<combo_box.item label="詐欺＞マルチ商法またはチェーンメール" name="Fraud__Pyramid_scheme_or_chain_letter"/>
-		<combo_box.item label="詐欺 &gt; リンデンドルまたは米ドル" name="Fraud__US$"/>
-		<combo_box.item label="嫌がらせ＞広告委託/視覚的なスパム" name="Harassment__Advert_farms___visual_spam"/>
-		<combo_box.item label="嫌がらせ＞個人またはグループの中傷" name="Harassment__Defaming_individuals_or_groups"/>
-		<combo_box.item label="嫌がらせ＞移動の妨害" name="Harassment__Impeding_movement"/>
-		<combo_box.item label="嫌がらせ＞性的な嫌がらせ" name="Harassment__Sexual_harassment"/>
-		<combo_box.item label="ハラスメント &gt; 対象者を定めて嫌がらせを目的とした行為" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
-		<combo_box.item label="嫌がらせ＞暴言" name="Harassment__Verbal_abuse"/>
-		<combo_box.item label="わいせつ＞著しく不快であると見なされるコンテンツまたは行為" name="Indecency__Broadly_offensive_content_or_conduct"/>
-		<combo_box.item label="わいせつ＞不適切なアバター名" name="Indecency__Inappropriate_avatar_name"/>
-		<combo_box.item label="わいせつ &gt; 地域（リージョン）のレーティング区分に対して不適切なコンテンツまたは行為" name="Indecency__Mature_content_in_PG_region"/>
-		<combo_box.item label="わいせつ &gt; 「Moderate」指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region"/>
-		<combo_box.item label="知的財産の侵害＞コンテンツの撤去" name="Intellectual_property_infringement_Content_Removal"/>
-		<combo_box.item label="知的財産の侵害＞コピーBot及び権限の悪用" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
-		<combo_box.item label="不寛容" name="Intolerance"/>
-		<combo_box.item label="土地＞サンドボックスのリソースの乱用" name="Land__Abuse_of_sandbox_resources"/>
-		<combo_box.item label="土地 &gt; 不法侵入 &gt; オブジェクトまたはテクスチャ" name="Land__Encroachment__Objects_textures"/>
-		<combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles"/>
-		<combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="スキルゲーミング ポリシー違反" name="Wagering_gambling"/>
-		<combo_box.item label="その他" name="Other"/>
-	</combo_box>
-	<text name="abuser_name_title">
-		迷惑ユーザーの名前：
-	</text>
-	<button label="選択" label_selected="" name="select_abuser" tool_tip="嫌がらせをした人の名前をリストから選択してください。"/>
-	<text name="abuser_name_title2">
-		嫌がらせの起きた場所：
-	</text>
-	<text name="sum_title">
-		概要：
-	</text>
-	<text name="dscr_title">
-		詳細：
-	</text>
-	<text name="bug_aviso">
-		できるだけ具体的に詳しく記入してください。
-	</text>
-	<text name="incomplete_title">
-		* 不完全な報告は調査対象になりません。
-	</text>
-	<button label="嫌がらせの報告" label_selected="嫌がらせの報告" name="send_btn"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-</floater>
+  <floater.string name="Screenshot">スクリーンショット</floater.string>
+  <check_box label="このスクリーンショットを使用" name="screen_check" />
+  <text name="reporter_title">報告者：</text>
+  <text name="reporter_field">Loremipsum Dolorsitamut Longnamez</text>
+  <text name="sim_title">リージョン（地域）：</text>
+  <text name="sim_field">リージョン（地域）名</text>
+  <text name="pos_title">位置：</text>
+  <text name="pos_field">{128.1, 128.1, 15.4}</text>
+  <text name="select_object_label">ボタンをクリックしてから、悪意のあるオブジェクトをクリック：</text>
+  <button label="" label_selected="" name="pick_btn" tool_tip="オブジェクトピッカー - 報告対象のオブジェクトを選択してください" />
+  <text name="object_name_label">オブジェクト：</text>
+  <text name="object_name">Consetetur Sadipscing</text>
+  <text name="owner_name_label">所有者：</text>
+  <text name="owner_name">Hendrerit Vulputate Kamawashi Longname</text>
+  <combo_box name="category_combo" tool_tip="カテゴリ－この報告に最も適したカテゴリを選択してください">
+    <combo_box.item label="カテゴリを選択してください" name="Select_category" />
+    <combo_box.item label="年齢＞年齢偽証" name="Age__Age_play" />
+    <combo_box.item label="年齢＞成人の住人が Teen Second Life にいる" name="Age__Adult_resident_on_Teen_Second_Life" />
+    <combo_box.item label="年齢＞未成年の住人がTeen Second Life の外にいる" name="Age__Underage_resident_outside_of_Teen_Second_Life" />
+    <combo_box.item label="攻撃＞コンバット・サンドボックス/危険なエリア" name="Assault__Combat_sandbox___unsafe_area" />
+    <combo_box.item label="攻撃＞安全エリアで他の住人を銃撃、プッシュ、または突き飛ばす" name="Assault__Safe_area" />
+    <combo_box.item label="攻撃＞武器テスト用サンドボックス" name="Assault__Weapons_testing_sandbox" />
+    <combo_box.item label="商取引＞製品またはサービスの提供が行われない" name="Commerce__Failure_to_deliver_product_or_service" />
+    <combo_box.item label="開示＞リアルワールドの情報" name="Disclosure__Real_world_information" />
+    <combo_box.item label="開示＞離れたところからチャットをモニターしている" name="Disclosure__Remotely_monitoring chat" />
+    <combo_box.item label="開示＞Second Life の情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs" />
+    <combo_box.item label="平穏を乱す行為＞地域リソースの使用が不公平" name="Disturbing_the_peace__Unfair_use_of_region_resources" />
+    <combo_box.item label="平穏を乱す行為＞スクリプト・オブジェクトの乱用" name="Disturbing_the_peace__Excessive_scripted_objects" />
+    <combo_box.item label="平穏を乱す行為＞オブジェクトの捨て置き" name="Disturbing_the_peace__Object_littering" />
+    <combo_box.item label="平穏を乱す行為＞繰り返しスパム" name="Disturbing_the_peace__Repetitive_spam" />
+    <combo_box.item label="平穏を乱す行為＞不要な広告スパム" name="Disturbing_the_peace__Unwanted_advert_spam" />
+    <combo_box.item label="詐欺＞ L$" name="Fraud__L$" />
+    <combo_box.item label="詐欺＞土地" name="Fraud__Land" />
+    <combo_box.item label="詐欺＞マルチ商法またはチェーンメール" name="Fraud__Pyramid_scheme_or_chain_letter" />
+    <combo_box.item label="詐欺＞リンデンドルまたは米ドル" name="Fraud__US$" />
+    <combo_box.item label="嫌がらせ＞広告委託/視覚的なスパム" name="Harassment__Advert_farms___visual_spam" />
+    <combo_box.item label="嫌がらせ＞個人またはグループの中傷" name="Harassment__Defaming_individuals_or_groups" />
+    <combo_box.item label="嫌がらせ＞移動の妨害" name="Harassment__Impeding_movement" />
+    <combo_box.item label="嫌がらせ＞性的な嫌がらせ" name="Harassment__Sexual_harassment" />
+    <combo_box.item label="ハラスメント＞対象者を定めて嫌がらせを目的とした行為" name="Harassment__Solicting_inciting_others_to_violate_ToS" />
+    <combo_box.item label="嫌がらせ＞暴言" name="Harassment__Verbal_abuse" />
+    <combo_box.item label="猥褻＞著しく不快であると見なされるコンテンツまたは行為" name="Indecency__Broadly_offensive_content_or_conduct" />
+    <combo_box.item label="猥褻＞不適切なアバター名" name="Indecency__Inappropriate_avatar_name" />
+    <combo_box.item label="猥褻＞リージョン（地域）のレーティング区分に対して不適切なコンテンツまたは行為" name="Indecency__Mature_content_in_PG_region" />
+    <combo_box.item label="猥褻＞「Moderate」指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region" />
+    <combo_box.item label="知的財産の侵害＞コンテンツの撤去" name="Intellectual_property_infringement_Content_Removal" />
+    <combo_box.item label="知的財産の侵害＞コピーBot及び権限の悪用" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" />
+    <combo_box.item label="不寛容" name="Intolerance" />
+    <combo_box.item label="土地＞サンドボックスのリソースの乱用" name="Land__Abuse_of_sandbox_resources" />
+    <combo_box.item label="土地＞不法侵入＞オブジェクトまたはテクスチャ" name="Land__Encroachment__Objects_textures" />
+    <combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles" />
+    <combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants" />
+    <combo_box.item label="スキルゲーミング ポリシー違反" name="Wagering_gambling" />
+    <combo_box.item label="その他" name="Other" />
+  </combo_box>
+  <text name="abuser_name_title">迷惑ユーザーの名前：</text>
+  <button label="選択" label_selected="" name="select_abuser" tool_tip="嫌がらせをした人の名前をリストから選択してください。" />
+  <text name="abuser_name_title2">嫌がらせを受けた場所：</text>
+  <text name="sum_title">概要：</text>
+  <text name="dscr_title">詳細：</text>
+  <text name="bug_aviso">できるだけ具体的に詳しく記入してください。</text>
+  <text name="incomplete_title">* 不完全な報告は調査対象になりません。</text>
+  <button label="嫌がらせを報告する" label_selected="嫌がらせを報告する" name="send_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
index c3d7db85c7..aa2422e2c3 100644
--- a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
@@ -1,7 +1,14 @@
-<?xml version="1.0" ?>
-<floater name="save_camera_preset" title="カメラプリセットを保存">
-	<radio_group name="radio_save_preset">
-		<radio_item name="replace_preset" label="プリセットを交換する"/>
-		<radio_item name="new_preset" label="新しいプリセットとして保存する"/>
-	</radio_group>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="save_camera_preset" title="カメラプリセットの保存">
+  <string name="btn_label_save">保存</string>
+  <string name="btn_label_replace">置き換え</string>
+  <radio_group name="radio_save_preset">
+    <radio_item label="新しいプリセットとして保存" name="new_preset" />
+    <radio_item label="プリセットを置き換え" name="replace_preset" />
+  </radio_group>
+  <line_editor name="preset_txt_editor" />
+  <button label="保存" name="save" />
+  <button label="キャンセル" name="cancel" />
+  <!-- *HACK to correctly draw drop-down list over the buttons-->
+  <combo_box name="preset_combo" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
index cdc67b3148..4641ef9bf3 100644
--- a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Save Pref Preset" title="優先プリセットを保存">
-	<string name="title_graphic">
-		グラフィックプリセットを保存
-	</string>
-	<string name="title_camera">
-		カメラプリセットを保存
-	</string>
-	<text name="Preset">
-		プリセットの名前を入力するか、既存のプリセットを選択します。
-	</text>
-	<button label="保存" name="save"/>
-	<button label="取り消し" name="cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="save_pref_preset" title="グラフィックプリセットの保存">
+  <string name="title_graphic">グラフィックのプリセットを保存</string>
+  <string name="title_camera">カメラのプリセットを保存</string>
+  <text name="Preset">プリセットの名前を入力するか、既存のプリセットを選択します。</text>
+  <button label="保存" name="save" />
+  <button label="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
index f348ce3c4d..eab5ace25a 100644
--- a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Scene Load Statistics" title="シーン ロード統計情報">
-	<button label="一時停止" name="playpause"/>
-	<scroll_container name="statistics_scroll">
-		<container_view name="statistics_view">
-			<stat_view label="ベーシック" name="basic">
-				<stat_bar label="フレーム ピクセル差" name="frame difference"/>
-				<stat_bar label="UDP データを受け取りました" name="bandwidth"/>
-				<stat_bar label="パケットロス" name="packet_loss"/>
-			</stat_view>
-			<stat_view label="アドバンス" name="advanced">
-				<stat_view label="描画" name="render">
-					<stat_bar label="オブジェクト合計" name="objs"/>
-					<stat_bar label="新規オブジェクト" name="newobjs"/>
-					<stat_bar label="オブジェクト キャッシュ ヒット率" name="object_cache_hits"/>
-				</stat_view>
-				<stat_view label="テクスチャ" name="texture">
-					<stat_bar label="キャッシュ ヒット率" name="texture_cache_hits"/>
-					<stat_bar label="キャッシュ読み込み遅延" name="texture_cache_read_latency"/>
-					<stat_bar label="カウント" name="numimagesstat"/>
-					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
-				</stat_view>
-				<stat_view label="ネットワーク" name="network">
-					<stat_bar label="パケットイン" name="packetsinstat"/>
-					<stat_bar label="パケットアウト" name="packetsoutstat"/>
-					<stat_bar label="オブジェクト" name="objectdatareceived"/>
-					<stat_bar label="テクスチャ" name="texturedatareceived"/>
-					<stat_bar label="資産" name="assetudpdatareceived"/>
-					<stat_bar label="レイヤー" name="layersdatareceived"/>
-					<stat_bar label="実際の受信" name="messagedatain"/>
-					<stat_bar label="実際の送信" name="messagedataout"/>
-				</stat_view>
-			</stat_view>
-			<stat_view label="シミュレーター" name="sim">
-				<stat_bar label="オブジェクト" name="simobjects"/>
-				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
-				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
-				<stat_bar label="パケットイン" name="siminpps"/>
-				<stat_bar label="パケットアウト" name="simoutpps"/>
-				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
-				<stat_bar label="保留中のアップロード" name="simpendinguploads"/>
-				<stat_bar label="未送信バイト合計" name="simtotalunackedbytes"/>
-				<stat_view label="時間（ms）" name="simperf">
-					<stat_bar label="フレーム時間合計" name="simframemsec"/>
-					<stat_bar label="総時間数" name="simnetmsec"/>
-					<stat_bar label="物理的作用時間" name="simsimphysicsmsec"/>
-					<stat_bar label="シミュレーション時間" name="simsimothermsec"/>
-					<stat_bar label="エージェント時間" name="simagentmsec"/>
-					<stat_bar label="イメージ時間" name="simimagesmsec"/>
-					<stat_bar label="スクリプト時間" name="simscriptmsec"/>
-					<stat_bar label="余暇" name="simsparemsec"/>
-					<stat_view label="時間の詳細（ms）" name="timedetails">
-						<stat_bar label="物理効果の単位" name="simsimphysicsstepmsec"/>
-						<stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec"/>
-						<stat_bar label="他の物理効果" name="simsimphysicsothermsec"/>
-						<stat_bar label="スリープ時間" name="simsleepmsec"/>
-						<stat_bar label="ポンプ I/O" name="simpumpiomsec"/>
-					</stat_view>
-				</stat_view>
-			</stat_view>
-		</container_view>
-	</scroll_container>
-</floater>
+<floater name="Scene Load Statistics" title="シーンの読み込みの統計情報">
+  <button label="一時停止" name="playpause" />
+  <scroll_container name="statistics_scroll">
+    <container_view name="statistics_view">
+      <stat_view label="基本" name="basic">
+        <stat_bar label="フレームごとのピクセル差" name="frame difference" />
+        <stat_bar label="UDP データの受信量" name="bandwidth" />
+        <stat_bar label="パケットロス" name="packet_loss" />
+      </stat_view>
+      <stat_view label="拡張" name="advanced">
+        <stat_view label="描画" name="render">
+          <stat_bar label="オブジェクト合計" name="objs" />
+          <stat_bar label="新規オブジェクト" name="newobjs" />
+          <stat_bar label="オブジェクトのキャッシュのヒット率" name="object_cache_hits" />
+        </stat_view>
+        <stat_view label="テクスチャ" name="texture">
+          <stat_bar label="キャッシュのヒット率" name="texture_cache_hits" />
+          <stat_bar label="キャッシュの読み込みの遅延量" name="texture_cache_read_latency" />
+          <stat_bar label="カウント" name="numimagesstat" />
+          <stat_bar label="Raw カウント" name="numrawimagesstat" />
+        </stat_view>
+        <stat_view label="ネットワーク" name="network">
+          <stat_bar label="受信パケット量" name="packetsinstat" />
+          <stat_bar label="送信パケット量" name="packetsoutstat" />
+          <stat_bar label="オブジェクト" name="objectdatareceived" />
+          <stat_bar label="テクスチャ" name="texturedatareceived" />
+          <stat_bar label="資産" name="assetudpdatareceived" />
+          <stat_bar label="レイヤー" name="layersdatareceived" />
+          <stat_bar label="実際の受信" name="messagedatain" />
+          <stat_bar label="実際の送信" name="messagedataout" />
+        </stat_view>
+      </stat_view>
+      <stat_view label="シミュレーター" name="sim">
+        <stat_bar label="オブジェクト" name="simobjects" />
+        <stat_bar label="アクティブなオブジェクト" name="simactiveobjects" />
+        <stat_bar label="アクティブなスクリプト" name="simactivescripts" />
+        <stat_bar label="受信パケット" name="siminpps" />
+        <stat_bar label="送信パケット" name="simoutpps" />
+        <stat_bar label="保留中のダウンロード" name="simpendingdownloads" />
+        <stat_bar label="保留中のアップロード" name="simpendinguploads" />
+        <stat_bar label="未送信バイト合計" name="simtotalunackedbytes" />
+        <stat_view label="時間（ms）" name="simperf">
+          <stat_bar label="フレーム時間合計" name="simframemsec" />
+          <stat_bar label="総時間数" name="simnetmsec" />
+          <stat_bar label="物理的作用時間" name="simsimphysicsmsec" />
+          <stat_bar label="シミュレーション時間" name="simsimothermsec" />
+          <stat_bar label="エージェント時間" name="simagentmsec" />
+          <stat_bar label="イメージ時間" name="simimagesmsec" />
+          <stat_bar label="スクリプト時間" name="simscriptmsec" />
+          <stat_bar label="余暇" name="simsparemsec" />
+          <stat_view label="時間の詳細（ms）" name="timedetails">
+            <stat_bar label="物理効果の単位" name="simsimphysicsstepmsec" />
+            <stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec" />
+            <stat_bar label="他の物理効果" name="simsimphysicsothermsec" />
+            <stat_bar label="スリープ時間" name="simsleepmsec" />
+            <stat_bar label="ポンプ I/O" name="simpumpiomsec" />
+          </stat_view>
+        </stat_view>
+      </stat_view>
+    </container_view>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
index 0ac7a988e0..a7a7e97bd3 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="script debug floater" title="スクリプト警告／エラー">
-	<tab_container name="Preview Tabs">
-		<floater label="スクリプト" name="all_scripts" title="[ALL SCRIPTS]" />
-	</tab_container>
-</multi_floater>
+  <tab_container name="Preview Tabs">
+    <floater label="スクリプト" name="all_scripts" title="[ALL SCRIPTS]" />
+  </tab_container>
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
index e70a30fa24..cf859bb629 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
+<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]" />
diff --git a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
index 3a90e673ae..69953bf07f 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
@@ -1,48 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_script_colors" title="スクリプトの色">
-	<text name="color_pickers_label">
-		希望の色を選択:
-	</text>
-	<text name="text_label">
-		テキスト
-	</text>
-	<text name="cursor_label">
-		カーソル
-	</text>
-	<text name="background_label">
-		背景
-	</text>
-	<text name="datatype_label">
-		データ型
-	</text>
-	<text name="event_label">
-		イベント
-	</text>
-	<text name="string_literal_label">
-		文字列リテラル
-	</text>
-	<text name="constant_label">
-		定数
-	</text>
-	<text name="flow_control_label">
-		フロー制御
-	</text>
-	<text name="function_label">
-		関数
-	</text>
-	<text name="comment_label">
-		コメント
-	</text>
-	<script_editor name="Script Preview">
-		/* サンプル スクリプト */
+  <text name="color_pickers_label">希望の色を選択：</text>
+  <text name="text_label">テキスト</text>
+  <text name="cursor_label">カーソル</text>
+  <text name="background_label">背景</text>
+  <text name="datatype_label">データ型</text>
+  <text name="event_label">イベント</text>
+  <text name="string_literal_label">文字列リテラル</text>
+  <text name="constant_label">定数</text>
+  <text name="flow_control_label">フロー制御</text>
+  <text name="function_label">関数</text>
+  <text name="comment_label">コメント</text>
+  <script_editor name="Script Preview">/* サンプル スクリプト */
 default
 {
-state_entry()
-    {
-// コメント
-string greeting = &quot;こんにちは&quot;;
-llSay(PUBLIC_CHANNEL, greeting);
-    }
-}
-	</script_editor>
-</floater>
+  state_entry()
+  {
+    // コメント
+    string greeting = "こんにちは";
+    llSay(PUBLIC_CHANNEL, greeting);
+  }
+}</script_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
index 7ccd858af7..a5e161be2d 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="scriptlimits" title="スクリプト情報"/>
+<floater name="scriptlimits" title="スクリプト情報" />
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
index 656357aa17..805244c751 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="スクリプト： 回転スクリプト">
-	<floater.string name="Title">
-		スクリプト： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-</floater>
+<floater name="preview lsl text" title="スクリプト：回転スクリプト">
+  <floater.string name="Title">スクリプト：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index de0c4469c1..ede9ad0b8c 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="queue" title="進行のリセット">
-	<floater.string name="Starting">
-		[COUNT] アイテムの [START] を開始します。
-	</floater.string>
-	<floater.string name="Done">
-		完了。
-	</floater.string>
-	<floater.string name="Resetting">
-		リセット中
-	</floater.string>
-	<floater.string name="Running">
-		実行中
-	</floater.string>
-	<floater.string name="NotRunning">
-		実行されていません
-	</floater.string>
-	<floater.string name="Timeout">
-		タイムアウト： [OBJECT_NAME]
-	</floater.string>
-	<floater.string name="LoadingObjInv">
-		次のインベントリをロード中： [OBJECT_NAME]
-	</floater.string>
-	<button label="閉じる" label_selected="閉じる" name="close"/>
-</floater>
+  <floater.string name="Starting">[COUNT]アイテムの[START]を開始します。</floater.string>
+  <floater.string name="Done">完了。</floater.string>
+  <floater.string name="Resetting">リセット中</floater.string>
+  <floater.string name="Running">実行中</floater.string>
+  <floater.string name="NotRunning">実行されていません</floater.string>
+  <floater.string name="Timeout">タイムアウト：[OBJECT_NAME]</floater.string>
+  <floater.string name="LoadingObjInv">次のインベントリをロード中：[OBJECT_NAME]</floater.string>
+  <button label="閉じる" label_selected="閉じる" name="close" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
index bc4f48c995..e0414706e9 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script search" title="スクリプトの検索">
-	<check_box label="大文字と小文字を区別しない" name="case_text"/>
-	<button label="検索" label_selected="検索" name="search_btn"/>
-	<button label="置換" label_selected="置換" name="replace_btn"/>
-	<button label="すべて置換" label_selected="すべて置換" name="replace_all_btn"/>
-	<text name="txt">
-		検索
-	</text>
-	<text name="txt2">
-		置換
-	</text>
-</floater>
+  <check_box label="大文字と小文字を区別しない" name="case_text" />
+  <button label="検索" label_selected="検索" name="search_btn" />
+  <button label="置換" label_selected="置換" name="replace_btn" />
+  <button label="すべて置換" label_selected="すべて置換" name="replace_all_btn" />
+  <text name="txt">検索</text>
+  <text name="txt2">置換</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
index 0723be0068..772d3a9719 100644
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		ローディング...
-	</floater.string>
-	<floater.string name="done_text">
-		完了
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				現在のゴッドレベルに反映させるため検索をやり直してください
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="loading_text">読み込んでいます…。</floater.string>
+  <floater.string name="done_text">完了</floater.string>
+  <layout_stack name="stack1">
+    <layout_panel name="browser_layout">
+      <text name="refresh_search">現在のゴッドレベルに反映させるため、検索をやり直してください。</text>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
index d41be86873..b13c2dbccb 100644
--- a/indra/newview/skins/default/xui/ja/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container">
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-	<text name="Save item as:">
-		キーを押してスピーカーボタンのトリガーを設定します。
-	</text>
-</floater>
+  <floater.string name="keyboard">キーボード</floater.string>
+  <floater.string name="mouse">マウスのボタン</floater.string>
+  <floater.string name="basic_description">キーを押してトリガーを設定します。
+許可される入力：[INPUT]</floater.string>
+  <floater.string name="reserved_by_menu">その組み合わせ（[KEYSTR]）は、メニューで予約されています。</floater.string>
+  <text name="description">キーを押してトリガーを設定します。
+許可される入力：[INPUT]</text>
+  <check_box label="全てに適用" name="apply_all" tool_tip="ビューアは、世界で何をしているかに応じてさまざまなコントロールの組み合わせを使用します。これを設定すると、変更がすべての組み合わせに適用されます。" />
+
+  <button label="空欄にする" name="SetEmpty" />
+  <button label="デフォルト" name="Default" />
+  <button label="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index aa368eef11..4a5fd8d396 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -1,65 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sell land" title="土地の販売">
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<text name="info_parcel_label">
-				区画：
-			</text>
-			<text name="info_parcel">
-				PARCEL NAME
-			</text>
-			<text name="info_size_label">
-				サイズ：
-			</text>
-			<text name="info_size">
-				[AREA] 平方メートル
-			</text>
-			<text name="info_action">
-				この区画を販売：
-			</text>
-			<text name="price_label">
-				1. 価格の設定：
-			</text>
-			<text name="price_text">
-				適正価格を設定してください。
-			</text>
-			<text name="price_ld">
-				L$
-			</text>
-			<line_editor name="price">
-				0
-			</line_editor>
-			<text name="price_per_m">
-				（1平方メートルあたり L$[PER_METER]）
-			</text>
-			<text name="sell_to_label">
-				2. 特定の人に販売：
-			</text>
-			<text name="sell_to_text">
-				販売先の指定なしか、特定の人に販売するかを選択してください。
-			</text>
-			<combo_box name="sell_to">
-				<combo_box.item label="- 1つ選択 -" name="--selectone--"/>
-				<combo_box.item label="指定なし・誰にでも販売" name="Anyone"/>
-				<combo_box.item label="特定の人：" name="Specificuser:"/>
-			</combo_box>
-			<button label="選択" name="sell_to_select_agent"/>
-			<text name="sell_objects_label">
-				3. オブジェクトも土地と一緒に販売しますか？
-			</text>
-			<text name="sell_objects_text">
-				区画上にある、土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。
-			</text>
-			<radio_group name="sell_objects">
-				<radio_item label="いいえ、オブジェクトの所有権を保持します" name="no"/>
-				<radio_item label="はい、オブジェクトと土地を一緒に販売します" name="yes"/>
-			</radio_group>
-			<button label="オブジェクトを表示" name="show_objects"/>
-			<text name="nag_message_label">
-				注意： 返品・交換はできません。
-			</text>
-			<button label="土地を販売" name="sell_btn"/>
-			<button label="キャンセル" name="cancel_btn"/>
-		</panel>
-	</scroll_container>
-</floater>
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <text name="info_parcel_label">区画：</text>
+      <text name="info_parcel">区画名</text>
+      <text name="info_size_label">サイズ：</text>
+      <text name="info_size">[AREA]㎡</text>
+      <text name="info_action">この区画を販売：</text>
+      <text name="price_label">１．価格の設定：</text>
+      <text name="price_text">適正と思われる価格を入力してください。</text>
+      <text name="price_ld">L$ </text>
+      <line_editor name="price">0</line_editor>
+      <text name="price_per_m">（1㎡あたりL$ [PER_METER]）</text>
+      <text name="sell_to_label">２．特定の人物に販売：</text>
+      <text name="sell_to_text">販売先を特定の人物に限定するか、しないかを選択してください。</text>
+      <combo_box name="sell_to">
+        <combo_box.item label="─１つ選択─" name="--selectone--" />
+        <combo_box.item label="指定なし・誰にでも販売" name="Anyone" />
+        <combo_box.item label="特定の人物：" name="Specificuser:" />
+      </combo_box>
+      <button label="選択" name="sell_to_select_agent" />
+      <text name="sell_objects_label">３．オブジェクトと土地を一緒に販売しますか？</text>
+      <text name="sell_objects_text">区画上の土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。</text>
+      <radio_group name="sell_objects">
+        <radio_item label="いいえ、オブジェクトの所有権は保持します。" name="no" />
+        <radio_item label="はい、オブジェクトと土地を一緒に販売します。" name="yes" />
+      </radio_group>
+      <button label="オブジェクトを表示" name="show_objects" />
+      <text name="nag_message_label">注意：返品・交換はできません。</text>
+      <button label="土地を販売する" name="sell_btn" />
+      <button label="キャンセル" name="cancel_btn" />
+    </panel>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index cb7950bf53..974f1bd0f1 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="デバッグ設定">
-	<combo_box name="boolean_combo">
-		<combo_box.item label="TRUE" name="TRUE"/>
-		<combo_box.item label="FALSE" name="FALSE"/>
-	</combo_box>
-	<color_swatch label="色" name="val_color_swatch"/>
-	<spinner label="x" name="val_spinner_1"/>
-	<spinner label="x" name="val_spinner_2"/>
-	<spinner label="x" name="val_spinner_3"/>
-	<spinner label="x" name="val_spinner_4"/>
-	<button label="デフォルトにリセット" name="default_btn"/>
-</floater>
+  <filter_editor name="filter_input" />
+  <scroll_list name="setting_list">
+    <scroll_list.columns name="changed_setting" />
+    <scroll_list.columns label="設定" name="setting" />
+  </scroll_list>
+  <text name="setting_name_txt">デバッグ設定名</text>
+  <text_editor name="comment_text" />
+  <radio_group name="boolean_combo">
+    <radio_item label="有効" name="TRUE" value="true" />
+    <radio_item label="無効" name="FALSE" value="" />
+    <commit_callback function="CommitSettings" />
+  </radio_group>
+  <line_editor name="val_text" />
+  <color_swatch label="色" name="val_color_swatch" />
+  <spinner label="Ｘ" name="val_spinner_1" />
+  <spinner label="Ｘ" name="val_spinner_2" />
+  <spinner label="Ｘ" name="val_spinner_3" />
+  <spinner label="Ｘ" name="val_spinner_4" />
+  <button label="デフォルトにリセット" name="default_btn" />
+  <check_box label="変更された設定のみ表示" name="hide_default" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
index b8b1699f03..91c05a1c3a 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings picker" title="選択：設定">
-	<floater.string name="pick title">
-		選択：
-	</floater.string>
-	<floater.string name="pick_track">
-		トラックを選択
-	</floater.string>
-	<floater.string name="pick_settings">
-		設定を選択
-	</floater.string>
-	<floater.string name="track_water">
-		水
-	</floater.string>
-	<floater.string name="track_ground">
-		地面
-	</floater.string>
-	<floater.string name="track_sky">
-		空 [NUM]
-	</floater.string>
-	<layout_stack name="test_stack">
-		<layout_panel name="inv_list">
-			<filter_editor label="テクスチャをフィルター" name="flt_inventory_search"/>
-		</layout_panel>
-		<layout_panel name="temp">
-			<button label="OK" label_selected="OK" name="btn_select"/>
-			<button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="pick title">選択：</floater.string>
+  <floater.string name="pick_track">トラックを選択</floater.string>
+  <floater.string name="pick_settings">設定を選択</floater.string>
+  <floater.string name="track_water">水</floater.string>
+  <floater.string name="track_ground">地面</floater.string>
+  <floater.string name="track_sky">空[NUM]</floater.string>
+  <layout_stack name="test_stack">
+    <layout_panel name="inv_list">
+      <filter_editor label="テクスチャをフィルタ" name="flt_inventory_search" />
+    </layout_panel>
+    <layout_panel name="temp">
+      <button label="ＯＫ" label_selected="ＯＫ" name="btn_select" />
+      <button label="キャンセル" label_selected="キャンセル" name="btn_cancel" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
new file mode 100644
index 0000000000..56ebcc9b2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="simple_outfit_snapshot" title="アウトフィットのスナップショット">
+  <ui_ctrl name="thumbnail_placeholder" />
+  <button label="画像を撮影" name="new_snapshot_btn" />
+  <button label="保存（L$ [UPLOAD_COST]）" name="save_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 64f292c75c..fc441143b8 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -1,77 +1,54 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Snapshot" title="スナップショット">
-	<floater.string name="unknown">
-		不明
-	</floater.string>
-	<string name="postcard_progress_str">
-		メールの送信
-	</string>
-	<string name="facebook_progress_str">
-		Facebook へ投稿中
-	</string>
-	<string name="profile_progress_str">
-		投稿
-	</string>
-	<string name="inventory_progress_str">
-		インベントリに保存
-	</string>
-	<string name="local_progress_str">
-		コンピュータに保存
-	</string>
-	<string name="facebook_succeeded_str">
-		画像がアップロードされました
-	</string>
-	<string name="profile_succeeded_str">
-		画像がアップロードされました
-	</string>
-	<string name="postcard_succeeded_str">
-		メールが送信されました
-	</string>
-	<string name="inventory_succeeded_str">
-		インベントリに保存されました
-	</string>
-	<string name="local_succeeded_str">
-		コンピュータに保存されました
-	</string>
-	<string name="facebook_failed_str">
-		Facebook のタイムラインに画像をアップロードできませんでした。
-	</string>
-	<string name="profile_failed_str">
-		プロフィールフィードに画像をアップロードできませんでした。
-	</string>
-	<string name="postcard_failed_str">
-		メールを送信できませんでした。
-	</string>
-	<string name="inventory_failed_str">
-		インベントリに保存できませんでした。
-	</string>
-	<string name="local_failed_str">
-		コンピュータに保存できませんでした。
-	</string>
-	<button label="更新" name="new_snapshot_btn"/>
-	<panel name="advanced_options_panel">
-		<text name="layer_type_label">
-			キャプチャ：
-		</text>
-		<combo_box label="画像レイヤー" name="layer_types">
-			<combo_box.item label="色" name="Colors"/>
-			<combo_box.item label="深度" name="Depth"/>
-		</combo_box>
-		<check_box label="インターフェース" name="ui_check"/>
-		<check_box label="HUD" name="hud_check"/>
-		<check_box label="画面全体を静止" name="freeze_frame_check"/>
-		<check_box label="自動更新" name="auto_snapshot_check"/>
-		<text name="filter_list_label">
-			フィルター:
-		</text>
-		<combo_box name="filters_combobox" tool_tip="画像フィルター">
-			<combo_box.item label="フィルターなし" name="NoFilter"/>
-		</combo_box>
-	</panel>
-	<text name="image_res_text">
-		[WIDTH]px (横幅) x [HEIGHT]px (高さ)
-	</text>
-	<text name="file_size_label">
-		[SIZE] キロバイト
-	</text>
-</floater>
+  <floater.string name="unknown">不明</floater.string>
+  <string name="postcard_progress_str">メール送信</string>
+  <string name="profile_progress_str">プロフィールに投稿</string>
+  <string name="inventory_progress_str">インベントリに保存</string>
+  <string name="local_progress_str">コンピュータに保存</string>
+  <string name="profile_succeeded_str">画像がアップロードされました。</string>
+  <string name="postcard_succeeded_str">メールが送信されました！</string>
+  <string name="inventory_succeeded_str">インベントリに保存されました！</string>
+  <string name="local_succeeded_str">コンピュータに保存されました！</string>
+  <string name="profile_failed_str">プロフィールフィードに画像をアップロードできませんでした。</string>
+  <string name="postcard_failed_str">メール送信に失敗しました。</string>
+  <string name="inventory_failed_str">インベントリに保存できませんでした。</string>
+  <string name="local_failed_str">コンピュータへの保存に失敗しました。</string>
+  <button label="リフレッシュ" name="new_snapshot_btn" />
+  <panel name="advanced_options_panel">
+    <text name="layer_type_label">キャプチャーオプション：</text>
+    <combo_box label="画像レイヤー" name="layer_types">
+      <combo_box.item label="カラー" name="Colors" value="colors" />
+      <combo_box.item label="色深度" name="Depth" value="depth" />
+    </combo_box>
+    <check_box label="インターフェース" name="ui_check" />
+    <check_box label="ＨＵＤ" name="hud_check" />
+    <check_box label="フレームをフリーズ（全画面）" name="freeze_frame_check" />
+    <check_box label="自動リフレッシュ" name="auto_snapshot_check" />
+    <text name="filter_list_label">フィルタ：</text>
+    <combo_box name="filters_combobox" tool_tip="画像フィルタ">
+      <combo_box.item label="フィルタなし" name="NoFilter" value="NoFilter" />
+    </combo_box>
+  </panel>
+  <panel_container name="panel_container">
+    <panel name="panel_snapshot_options" filename="panel_snapshot_options.xml" />
+    <panel name="panel_snapshot_profile" filename="panel_snapshot_profile.xml" />
+    <panel name="panel_snapshot_postcard" filename="panel_snapshot_postcard.xml" />
+    <panel name="panel_snapshot_inventory" filename="panel_snapshot_inventory.xml" />
+    <panel name="panel_snapshot_local" filename="panel_snapshot_local.xml" />
+  </panel_container>
+  <view_border name="status_hr" />
+  <panel name="succeeded_panel">
+    <text name="succeeded_lbl">成功</text>
+  </panel>
+  <panel name="failed_panel">
+    <text name="failed_lbl">失敗</text>
+  </panel>
+  <loading_indicator name="working_indicator" />
+  <text name="working_lbl">処理中</text>
+  <text name="refresh_lbl">リフレッシュして保存</text>
+  <ui_ctrl name="thumbnail_placeholder" />
+  <view_border name="img_info_border" />
+  <text name="image_res_text">[WIDTH]px（幅）✕[HEIGHT]px（高さ）</text>
+  <text name="file_size_label">[SIZE]㎅</text>
+  <text name="360_label">３６０度Ｓショットを撮影</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
index 28d2388bed..8732e59ed6 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_sound_devices" title="サウンドデバイス">
-	<text name="voice_label">
-		ボイスチャット
-	</text>
-	<check_box label="有効" name="enable_voice"/>
-</floater>
+  <text name="voice_label">ボイスチャット</text>
+  <check_box label="有効" name="enable_voice" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index 7d83309c46..ec6cb56d40 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Sound Preview" title="SOUND.WAV">
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-	<button label="アップロード　（L$[AMOUNT]）" label_selected="アップロード　（L$[AMOUNT]）" name="ok_btn"/>
-	<text name="text">
-		ビットレート(kbps)：
-	</text>
-	<radio_group name="bitrate">
-		<radio_item label="32" name="32"/>
-		<radio_item label="64" name="64"/>
-		<radio_item label="96" name="96"/>
-		<radio_item label="128" name="128"/>
-	</radio_group>
-</floater>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <button label="アップロード（L$[AMOUNT]）" label_selected="アップロード（L$ [AMOUNT]）" name="ok_btn" />
+  <text name="text">ビットレート（kbps）：</text>
+  <radio_group name="bitrate">
+    <radio_item label="32" name="32" />
+    <radio_item label="64" name="64" />
+    <radio_item label="96" name="96" />
+    <radio_item label="128" name="128" />
+  </radio_group>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
index 31fbef9bcf..0e9397d428 100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_floater" title="スペルチェッカーの設定">
-	<check_box label="スペルチェッカーを有効にする" name="spellcheck_enable"/>
-	<text name="spellcheck_main">
-		メイン辞書:
-	</text>
-	<text label="ログ：" name="spellcheck_additional">
-		その他の辞書：
-	</text>
-	<text name="spellcheck_available">
-		入手可
-	</text>
-	<text name="spellcheck_active">
-		有効
-	</text>
-	<button label="削除" name="spellcheck_remove_btn"/>
-	<button label="インポート..." name="spellcheck_import_btn"/>
-</floater>
+  <check_box label="スペルチェッカーを有効にする" name="spellcheck_enable" />
+  <text name="spellcheck_main">メイン辞書:</text>
+  <text label="ログ：" name="spellcheck_additional">その他の辞書：</text>
+  <text name="spellcheck_available">入手可</text>
+  <text name="spellcheck_active">有効</text>
+  <button label="削除" name="spellcheck_remove_btn" />
+  <button label="インポート…" name="spellcheck_import_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
index 81bfbe15f5..3a82e0dd4e 100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="辞書をインポート">
-	<text name="import_dict">
-		辞書：
-	</text>
-	<button label="参照" label_selected="参照" name="dictionary_path_browse"/>
-	<text name="import_name">
-		名前：
-	</text>
-	<text name="import_lang">
-		言語：
-	</text>
-	<button label="インポート" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <text name="import_dict">辞書：</text>
+  <button label="参照" label_selected="参照" name="dictionary_path_browse" />
+  <text name="import_name">名前：</text>
+  <text name="import_lang">言語：</text>
+  <button label="インポート" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 1da0e5ebc9..98d46301f8 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -1,108 +1,111 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Statistics" title="統計">
-	<scroll_container name="statistics_scroll">
-		<container_view name="statistics_view">
-			<stat_view label="ベーシック" name="basic">
-				<stat_bar label="FPS" name="fps"/>
-				<stat_bar label="UDP データを受け取りました" name="bandwidth"/>
-				<stat_bar label="パケットロス" name="packet_loss"/>
-				<stat_bar label="Pingシム" name="ping"/>
-			</stat_view>
-			<stat_view label="アドバンス" name="advanced">
-				<stat_view label="描画" name="render">
-					<stat_bar label="KTris (フレームごと)" name="ktrisframe"/>
-					<stat_bar label="KTris (秒ごと)" name="ktrissec"/>
-					<stat_bar label="オブジェクト合計" name="totalobjs"/>
-					<stat_bar label="キャッシュされたオブジェクト" name="cachedobjs"/>
-					<stat_bar label="新規オブジェクト" name="newobjs"/>
-					<stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits"/>
-					<stat_bar label="閉鎖クエリ実行" name="occlusion_queries"/>
-					<stat_bar label="閉鎖オブジェクト" name="occluded"/>
-					<stat_bar label="非閉鎖オブジェクト" name="unoccluded"/>
-				</stat_view>
-				<stat_view label="テクスチャ" name="texture">
-					<stat_bar label="キャッシュヒット率" name="texture_cache_hits"/>
-					<stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency"/>
-					<stat_bar label="カウント" name="numimagesstat"/>
-					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
-					<stat_bar label="GL メモリ" name="gltexmemstat"/>
-					<stat_bar label="フォーマット済メモリ" name="formattedmemstat"/>
-					<stat_bar label="Raw メモリ" name="rawmemstat"/>
-					<stat_bar label="統合メモリ" name="glboundmemstat"/>
-				</stat_view>
-				<stat_view label="メモリ使用量" name="memory">
-					<stat_bar label="LLTrace" name="LLTrace"/>
-					<stat_bar label="UI" name="LLView"/>
-					<stat_bar label="フォント" name="LLFontFreetype"/>
-					<stat_bar label="インベントリ" name="LLInventoryObject"/>
-					<stat_bar label="ビューワ オブジェクト" name="LLViewerObject"/>
-					<stat_bar label="Octree グループ データ" name="LLViewerOctreeGroup"/>
-					<stat_bar label="Octree データ" name="LLViewerOctreeEntry"/>
-					<stat_bar label="ビューワ オブジェクト キャッシュ" name="LLVOCacheEntry"/>
-					<stat_bar label="描画可能オブジェクト" name="LLDrawable"/>
-					<stat_bar label="顔データ" name="LLFace"/>
-					<stat_bar label="描画情報" name="LLDrawInfo"/>
-					<stat_bar label="テクスチャ データ" name="LLTexture"/>
-					<stat_bar label="画像データ" name="LLImage"/>
-					<stat_bar label="GL 画像データ" name="LLImageGL"/>
-					<stat_bar label="頂点バッファ" name="LLVertexBuffer"/>
-				</stat_view>
-				<stat_view label="ネットワーク" name="network">
-					<stat_bar label="パケットイン" name="packetsinstat"/>
-					<stat_bar label="パケットアウト" name="packetsoutstat"/>
-					<stat_bar label="オブジェクト" name="objectdatareceived"/>
-					<stat_bar label="テクスチャ" name="texturedatareceived"/>
-					<stat_bar label="資産" name="assetudpdatareceived"/>
-					<stat_bar label="レイヤー" name="layersdatareceived"/>
-					<stat_bar label="実際の受信" name="messagedatain"/>
-					<stat_bar label="実際の送信" name="messagedataout"/>
-				</stat_view>
-			</stat_view>
-			<stat_view label="シミュレーター" name="sim">
-				<stat_bar label="時間の遅れ" name="simtimedilation"/>
-				<stat_bar label="シム FPS" name="simfps"/>
-				<stat_bar label="物理作用 FPS" name="simphysicsfps"/>
-				<stat_view label="物理作用の詳細" name="physicsdetail">
-					<stat_bar label="ピン留めオブジェクト" name="physicspinnedtasks"/>
-					<stat_bar label="低 LOD オブジェクト" name="physicslodtasks"/>
-					<stat_bar label="メモリ配分" name="physicsmemoryallocated"/>
-				</stat_view>
-				<stat_bar label="エージェントの更新/秒" name="simagentups"/>
-				<stat_bar label="メインエージェント" name="simmainagents"/>
-				<stat_bar label="チャイルドエージェント" name="simchildagents"/>
-				<stat_bar label="オブジェクト" name="simobjects"/>
-				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
-				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
-				<stat_bar label="スクリプト実行" name="simpctscriptsrun"/>
-				<stat_bar label="スクリプトイベント" name="simscripteps"/>
-				<stat_view label="パスファインディング" name="simpathfinding">
-					<stat_bar label="AIステップ時間" name="simsimaistepmsec"/>
-					<stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps"/>
-					<stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters"/>
-				</stat_view>
-				<stat_bar label="パケットイン" name="siminpps"/>
-				<stat_bar label="パケットアウト" name="simoutpps"/>
-				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
-				<stat_bar label="保留中のアップロード" name="simpendinguploads"/>
-				<stat_bar label="合計未承認データ" name="simtotalunackedbytes"/>
-				<stat_view label="時間" name="simperf">
-					<stat_bar label="フレーム時間合計" name="simframemsec"/>
-					<stat_bar label="総時間数" name="simnetmsec"/>
-					<stat_bar label="物理的作用時間" name="simsimphysicsmsec"/>
-					<stat_bar label="シミュレーション時間" name="simsimothermsec"/>
-					<stat_bar label="エージェント時間" name="simagentmsec"/>
-					<stat_bar label="イメージ時間" name="simimagesmsec"/>
-					<stat_bar label="スクリプト時間" name="simscriptmsec"/>
-					<stat_bar label="余暇" name="simsparemsec"/>
-					<stat_view label="時間の詳細" name="timedetails">
-						<stat_bar label="物理効果の単位" name="simsimphysicsstepmsec"/>
-						<stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec"/>
-						<stat_bar label="他の物理効果" name="simsimphysicsothermsec"/>
-						<stat_bar label="スリープ時間" name="simsleepmsec"/>
-						<stat_bar label="ポンプ I/O" name="simpumpiomsec"/>
-					</stat_view>
-				</stat_view>
-			</stat_view>
-		</container_view>
-	</scroll_container>
-</floater>
+  <scroll_container name="statistics_scroll">
+    <container_view name="statistics_view">
+      <stat_view label="基本" name="basic">
+        <stat_bar label="ＦＰＳ" name="fps" unit_label="／秒" />
+        <stat_bar name="frame_mean" label="フレーム（平均）" unit_label="㎳" />
+        <stat_bar name="frame_median" label="フレーム（中央値）" unit_label="㎳" />
+        <stat_bar name="framet_jitter" label="ジッタ" />
+        <stat_bar label="受信したＵＤＰデータ" name="bandwidth" />
+        <stat_bar label="パケットロス" name="packet_loss" />
+        <stat_bar label="シムのPing" name="ping" />
+      </stat_view>
+      <stat_view label="拡張" name="advanced">
+        <stat_view label="描画" name="render">
+          <stat_bar label="フレームあたりのKTris" name="ktrisframe" unit_label="ktris／フレーム" />
+          <stat_bar label="秒あたりのKTris" name="ktrissec" />
+          <stat_bar label="オブジェクト合計" name="totalobjs" />
+          <stat_bar label="キャッシュされたオブジェクト" name="cachedobjs" />
+          <stat_bar label="新規オブジェクト" name="newobjs" />
+          <stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits" />
+          <stat_bar label="閉鎖クエリ実行" name="occlusion_queries" />
+          <stat_bar label="閉鎖オブジェクト" name="occluded" />
+          <stat_bar label="非閉鎖オブジェクト" name="unoccluded" />
+        </stat_view>
+        <stat_view label="テクスチャ" name="texture">
+          <stat_bar label="キャッシュヒット率" name="texture_cache_hits" />
+          <stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency" />
+          <stat_bar label="カウント" name="numimagesstat" />
+          <stat_bar label="ＲＡＷカウント" name="numrawimagesstat" />
+          <stat_bar label="ＧＬメモリ" name="gltexmemstat" />
+          <stat_bar label="フォーマット済メモリ" name="formattedmemstat" />
+          <stat_bar label="ＲＡＷメモリ" name="rawmemstat" />
+          <stat_bar label="統合メモリ" name="glboundmemstat" />
+        </stat_view>
+        <stat_view label="メモリ使用量" name="memory">
+          <stat_bar label="ＬＬトレース" name="LLTrace" />
+          <stat_bar label="ＵＩ" name="LLView" />
+          <stat_bar label="フォント" name="LLFontFreetype" />
+          <stat_bar label="インベントリ" name="LLInventoryObject" />
+          <stat_bar label="ビューアーオブジェクト" name="LLViewerObject" />
+          <stat_bar label="八分木グループデータ" name="LLViewerOctreeGroup" />
+          <stat_bar label="八分木データ" name="LLViewerOctreeEntry" />
+          <stat_bar label="ビューアーのオブジェクトキャッシュ" name="LLVOCacheEntry" />
+          <stat_bar label="描画可能オブジェクト" name="LLDrawable" />
+          <stat_bar label="顔データ" name="LLFace" />
+          <stat_bar label="描画情報" name="LLDrawInfo" />
+          <stat_bar label="テクスチャデータ" name="LLTexture" />
+          <stat_bar label="画像データ" name="LLImage" />
+          <stat_bar label="ＧＬ画像データ" name="LLImageGL" />
+          <stat_bar label="頂点バッファ" name="LLVertexBuffer" />
+        </stat_view>
+        <stat_view label="ネットワーク" name="network">
+          <stat_bar label="パケットイン" name="packetsinstat" />
+          <stat_bar label="パケットアウト" name="packetsoutstat" />
+          <stat_bar label="オブジェクト" name="objectdatareceived" />
+          <stat_bar label="テクスチャ" name="texturedatareceived" />
+          <stat_bar label="アセット" name="assetudpdatareceived" />
+          <stat_bar label="レイヤー" name="layersdatareceived" />
+          <stat_bar label="実際の受信" name="messagedatain" />
+          <stat_bar label="実際の送信" name="messagedataout" />
+        </stat_view>
+      </stat_view>
+      <stat_view label="シミュレーター" name="sim">
+        <stat_bar label="遅延時間" name="simtimedilation" />
+        <stat_bar label="シムのＦＰＳ" name="simfps" />
+        <stat_bar label="物理作用のＦＰＳ" name="simphysicsfps" />
+        <stat_view label="物理作用の詳細" name="physicsdetail">
+          <stat_bar label="ピン留めオブジェクト" name="physicspinnedtasks" />
+          <stat_bar label="低ＬＯＤオブジェクト" name="physicslodtasks" />
+          <stat_bar label="メモリ配分" name="physicsmemoryallocated" />
+        </stat_view>
+        <stat_bar label="エージェントの更新／秒" name="simagentups" />
+        <stat_bar label="メインエージェント" name="simmainagents" />
+        <stat_bar label="チャイルドエージェント" name="simchildagents" />
+        <stat_bar label="オブジェクト" name="simobjects" />
+        <stat_bar label="アクティブなオブジェクト" name="simactiveobjects" />
+        <stat_bar label="アクティブなスクリプト" name="simactivescripts" />
+        <stat_bar label="スクリプト実行" name="simpctscriptsrun" />
+        <stat_bar label="スクリプトイベント" name="simscripteps" unit_label="eps" />
+        <stat_view label="経路探索" name="simpathfinding">
+          <stat_bar label="ＡＩステップ時間" name="simsimaistepmsec" />
+          <stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps" unit_label="／秒" />
+          <stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters" unit_label="％" />
+        </stat_view>
+        <stat_bar label="入力パケット" name="siminpps" unit_label="パケット／秒" />
+        <stat_bar label="出力パケット" name="simoutpps" unit_label="パケット／秒" />
+        <stat_bar label="保留中のダウンロード" name="simpendingdownloads" />
+        <stat_bar label="保留中のアップロード" name="simpendinguploads" />
+        <stat_bar label="未承認の合計データ" name="simtotalunackedbytes" />
+        <stat_view label="時間" name="simperf">
+          <stat_bar label="フレーム時間合計" name="simframemsec" />
+          <stat_bar label="総時間数" name="simnetmsec" />
+          <stat_bar label="物理的作用時間" name="simsimphysicsmsec" />
+          <stat_bar label="シミュレーション時間" name="simsimothermsec" />
+          <stat_bar label="エージェント時間" name="simagentmsec" />
+          <stat_bar label="イメージ時間" name="simimagesmsec" />
+          <stat_bar label="スクリプト時間" name="simscriptmsec" />
+          <stat_bar label="スペア時間" name="simsparemsec" />
+          <stat_view label="時間の詳細" name="timedetails">
+            <stat_bar label="物理効果の単位" name="simsimphysicsstepmsec" />
+            <stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec" />
+            <stat_bar label="他の物理効果" name="simsimphysicsothermsec" />
+            <stat_bar label="スリープ時間" name="simsleepmsec" />
+            <stat_bar label="ポンプ入出力" name="simpumpiomsec" />
+          </stat_view>
+        </stat_view>
+      </stat_view>
+    </container_view>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
index 45e97bdf5d..b57857a09c 100644
--- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sys_well_window" title="通知">
-	<string name="title_im_well_window">
-		会話
-	</string>
-	<string name="title_notification_well_window">
-		通知
-	</string>
-</floater>
+  <string name="title_im_well_window">会話</string>
+  <string name="title_notification_well_window">通知</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index 7318083771..1e68e1caf3 100644
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="telehub" title="テレハブ">
-	<text name="status_text_connected">
-		物体[OBJECT]に接続されたテレハブ
-	</text>
-	<text name="status_text_not_connected">
-		テレハブ未接続
-	</text>
-	<text name="help_text_connected">
-		「切断」をクリックして削除します。
-	</text>
-	<text name="help_text_not_connected">
-		物体を選択して「テレハブの接続」をクリックしてください。
-	</text>
-	<button label="テレハブの接続" name="connect_btn"/>
-	<button label="切断" name="disconnect_btn"/>
-	<text name="spawn_points_text">
-		出現地点（物体ではなく位置）
-	</text>
-	<button label="出現位置を追加" name="add_spawn_point_btn"/>
-	<button label="出現地点を削除" name="remove_spawn_point_btn"/>
-	<text name="spawn_point_help">
-		オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。そうするとそのオブジェクトを移動させたり削除できます。位置はテレハブセンターに関連します。リストのアイテムを選択してインワールドでハイライトさせます。
-	</text>
-</floater>
+  <text name="status_text_connected">物体[OBJECT]に接続されたテレハブ</text>
+  <text name="status_text_not_connected">テレハブ未接続</text>
+  <text name="help_text_connected">「切断」をクリックして削除します。</text>
+  <text name="help_text_not_connected">物体を選択して「テレハブの接続」をクリックしてください。</text>
+  <button label="テレハブの接続" name="connect_btn" />
+  <button label="切断" name="disconnect_btn" />
+  <text name="spawn_points_text">出現地点（物体ではなく位置）</text>
+  <button label="出現位置を追加" name="add_spawn_point_btn" />
+  <button label="出現地点を削除" name="remove_spawn_point_btn" />
+  <text name="spawn_point_help">オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。そうするとそのオブジェクトを移動させたり削除できます。
+位置はテレハブセンターに関連します。リストのアイテムを選択してインワールドでハイライトさせます。</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_button.xml b/indra/newview/skins/default/xui/ja/floater_test_button.xml
new file mode 100644
index 0000000000..7d53764d85
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_button.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_button">
+  <button label="汎用ボタン" name="generic_button" />
+  <button name="bottom_delta_button" />
+  <button name="sans_serif_small_button" />
+  <button label="自動リサイズ" name="auto_resize_button" />
+  <button label="クリックでラベル変更" label_selected="新しいラベル" name="label_selected_button" />
+  <button label="ラベルに影をつけない" name="label_shadow_button" />
+  <button label="強調色のラベル" name="label_color_button" />
+  <button label="トグル" label_selected="トグル入" name="label_color_selected_button" />
+  <button label="無効" label_selected="選択済み" name="label_color_disabled_button" />
+  <button label="ハイライト" name="highlight_color_button" />
+  <button label="ホーバーでグローさせない" name="hover_glow_amount_button" />
+  <button name="image_button" />
+  <button name="image_color_button" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml b/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
new file mode 100644
index 0000000000..6e3540d135
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_checkbox">
+  <check_box label="おおっ！これはチェックボックスのようだ！" name="show_location_checkbox" />
+  <check_box label="最小のチェックボックス" name="minimal_checkbox" />
+  <check_box label="無効状態のチェックボックス" name="disabled_checkbox" />
+  <check_box label="有効時の文字色" name="text_enabled_color_checkbox" />
+  <check_box label="無効時の文字色" name="text_disabled_color_checkbox" />
+  <check_box label="チェックボックスの初期値" name="initial_value_checkbox" />
+  <check_box label="等幅フォント" name="font_checkbox" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_combobox.xml b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml
new file mode 100644
index 0000000000..fe6ff97098
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_combobox">
+  <text type="string" length="1" height="16" layout="topleft" left="10" top="24" width="200">現実の使い道（ログイン場所）：</text>
+  <combo_box name="start_location_combo">
+    <combo_box.item label="最後に訪れた場所" name="MyLastLocation" value="last" />
+    <combo_box.item label="自分の家" name="MyHome" value="home" />
+    <combo_box.item label="＜リージョン（地域）名を入力＞" name="Typeregionname" value="" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">最小のコンボボックス：</text>
+  <combo_box name="minimal_combo">
+    <combo_box.item label="最初" name="item1" value="first" />
+    <combo_box.item label="２つ目" name="item2" value="second" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">テキスト入力を許可：</text>
+  <combo_box name="text_entry_combo">
+    <combo_box.item label="最初の項目" name="item1" value="first" />
+    <combo_box.item label="２つ目の項目" name="item2" value="second" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">テキスト入力を許可。デフォルトは２つ目の項目：</text>
+  <combo_box name="text_entry_combo2">
+    <combo_box.item label="最初の項目" name="item1" value="first" />
+    <combo_box.item label="２つ目の項目" name="item2" value="second" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">２文字まで入力可能：</text>
+  <combo_box name="state_combo">
+    <combo_box.item label="CA" name="item1" value="ca" />
+    <combo_box.item label="NY" name="item2" value="ny" />
+    <combo_box.item label="TX" name="item3" value="tx" />
+  </combo_box>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml b/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
new file mode 100644
index 0000000000..c3c1de2a2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_inspectors" title="インスペクタのテスト">
+  <text name="test_inspectors">クリックしてインスペクターを生成します：</text>
+  <button name="avatar_2d_btn1" label="2Dアバター" />
+  <!-- InspectorA Tester -->
+  <button name="avatar_2d_btn5" label="2Dアバター" />
+  <!-- InspectorB Tester -->
+  <button name="avatar_2d_btn2" label="2Dアバター" />
+  <!-- InspectorC Tester -->
+  <button name="avatar_2d_btn3" label=" 2Dアバター" />
+  <!-- jarvtest Bombastic 2009-10-3 -->
+  <button name="avatar_2d_btn4" label="2Dアバター" />
+  <button name="avatar_3d_btn" label="3Dアバター" />
+  <button name="object_2d_btn" label="2Dオブジェクト" />
+  <button name="object_3d_btn" label="3Dオブジェクト" />
+  <button name="group_btn" label="グループ" />
+  <button name="place_btn" label="場所" />
+  <button name="event_btn" label="イベント" />
+  <text name="slurl">secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect</text>
+  <text name="slurl_group">secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
index 31b5bbd3bf..26c78fe384 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Test Floater" title="レイアウトスタックテスト"/>
+<floater name="Test Floater" title="レイアウトスタックテスト" />
diff --git a/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml b/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
new file mode 100644
index 0000000000..32204b6e88
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_test_line_editor">
+  <line_editor name="enabled_line_editor" tool_tip="有効なラインエディタ">ラインエディタを有効化</line_editor>
+  <line_editor name="ascii_line_editor" prevalidate_callback="ascii" tool_tip="asciiラインエディタ">ASCIIのみのラインエディタ</line_editor>
+  <line_editor name="disabled_line_editor" tool_tip="無効なラインエディタ">ラインエディタを無効化</line_editor>
+  <line_editor name="enabled_colored_line_editor" tool_tip="有効な色付けされたラインエディタ">赤文字ラインエディタを有効化</line_editor>
+  <line_editor name="disabled_colored_line_editor" tool_tip="無効な色付けされたラインエディタ">赤文字ラインエディタを無効化</line_editor>
+  <line_editor name="left_pad_editor">左に25pxの余白</line_editor>
+  <line_editor name="left_pad_editor">右に75pxの余白</line_editor>
+  <line_editor name="left_pad_editor">左に25px、右に75pxの余白</line_editor>
+  <!-- "search_editor" is a specialized line_editor that shows read-only
+help text until the user clicks in the widget. -->
+  <search_editor label="検索語句を入力" name="search editor" tool_tip="エディタを検索" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
new file mode 100644
index 0000000000..f9c3275e7f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_radiogroup">
+  <radio_group name="parcel_voice_channel">
+    <radio_item label="不動産空間チャネルを使用" name="Estate" />
+    <radio_item label="プライベート空間チャネルを使用" name="Private" />
+    <radio_item label="この区画の空間でのボイスチャットを無効化" name="Disabled" />
+  </radio_group>
+  <radio_group name="simple_radio_group">
+    <radio_item label="label属性のラベル" name="label_radio_item" />
+    <radio_item label="テキストコンテンツのラベル" name="contents_radio_item" />
+  </radio_group>
+  <radio_group name="no_border_radio_group">
+    <radio_item label="Fooにはボーダーがありません" name="foo_radio_item" />
+    <radio_item label="ボーダーのバー無し" name="bar_item" />
+  </radio_group>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_slider.xml b/indra/newview/skins/default/xui/ja/floater_test_slider.xml
new file mode 100644
index 0000000000..5b02d51b14
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_slider.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_slider">
+  <slider label="Generic Slider" name="generic_slider" />
+  <slider label="コールバックスライダー" name="callback_slider" />
+  <slider label="値スライダー" max_val="5" min_val="1" name="value_slider" />
+  <slider label="ミニスライダー１" name="mini_slider_1" />
+  <slider label="ミニスライダー２" name="mini_slider_2" />
+  <slider_ name="slider_bar_vertical" />
+  <slider_bar label="スライダーバー" name="slider_bar" />
+  <slider label="赤スライダー" name="red_slider" />
+  <slider label="赤い垂直スライダー" name="red_slider_vertical" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_spinner.xml b/indra/newview/skins/default/xui/ja/floater_test_spinner.xml
new file mode 100644
index 0000000000..2b3ce66c7a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_spinner.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_spinner">
+  <spinner label="汎用スピナー" name="generic_spinner" />
+  <spinner label="コールバックスピナー" name="callback_spinner" />
+  <spinner label="カラフルなスピナー" name="colorful_spinner" />
+  <spinner label="値スピナー" name="value_spinner" />
+  <spinner label="ミニスピナー１" name="mini_spinner_1" />
+  <spinner label="ミニスピナー２" name="mini_spinner_2" />
+  <spinner label="操作スピナー" name="control_spinner" />
+  <spinner label="左に続く" name="follows_left" />
+  <spinner label="右に続く" name="follows_right" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml b/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
new file mode 100644
index 0000000000..36c59bfc2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_test_text_editor">
+  <text_editor name="test_text_editor" tool_tip="テキストエディタ">テキストエディタ</text_editor>
+  <text_editor name="test_text_editor" tool_tip="テキストエディタ">これには長いテキストが含まれており、右に水平にスクロールする必要があります。</text_editor>
+  <text_editor name="numeric_text_editor" tool_tip="数値のみ入力可能なテキストエディタ">これは数字ではないテキストなので、表示されるべきではありません。</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
index 40fd8e9f93..15feab05e8 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Test Floater" title="テスト用ウィンドウ"/>
+<floater name="Test Floater" title="テスト用ウィンドウ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 1221702e9b..8f69c43a85 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -1,48 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="テクスチャの選択">
-	<floater.string name="choose_picture">
-		クリックして写真を選択
-	</floater.string>
-	<floater.string name="pick title">
-		ピック:
-	</floater.string>
-	<text name="Multiple">
-		複数のテクスチャ
-	</text>
-	<combo_box name="mode_selection">
-		<combo_box.item label="インベントリ" name="inventory" value="0"/>
-		<combo_box.item label="ローカル" name="local" value="1"/>
-	</combo_box>
-	<button label="デフォルト" label_selected="デフォルト" name="Default"/>
-	<button label="ブランク" label_selected="ブランク" name="Blank"/>
-	<button label="なし" label_selected="なし" name="None"/>
-	<button label="" label_selected="" name="Pipette"/>
-	<text name="preview_disabled" value="プレビュー無効"/>
-	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
-	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
-	<button label="追加" label_selected="追加" name="l_add_btn"/>
-	<button label="削除" label_selected="削除" name="l_rem_btn"/>
-	<button label="アップロード" label_selected="アップロード" name="l_upl_btn"/>
-	<scroll_list name="l_name_list">
-		<column label="名前" name="unit_name"/>
-		<column label="ID" name="unit_id_HIDDEN"/>
-	</scroll_list>
-	<combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/>
-		<combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/>
-		<combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/>
-		<combo_box.item label="BAKED_EYES" name="BAKED_EYES"/>
-		<combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/>
-		<combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/>
-		<combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/>
-		<combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/>
-		<combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/>
-		<combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/>
-		<combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/>
-	</combo_box>
-	<check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
-</floater>
+  <floater.string name="choose_picture">クリックして画像を選択</floater.string>
+  <floater.string name="pick title">ピック：</floater.string>
+  <text name="Multiple">複数のテクスチャ</text>
+  <combo_box name="mode_selection">
+    <combo_box.item label="インベントリ" name="inventory" value="0" />
+    <combo_box.item label="ローカル" name="local" value="1" />
+  </combo_box>
+  <button label="デフォルト" label_selected="デフォルト" name="Default" />
+  <button label="ブランク" label_selected="ブランク" name="Blank" />
+  <button label="なし" label_selected="なし" name="None" />
+  <button label="" label_selected="" name="Pipette" />
+  <text name="preview_disabled" value="プレビュー無効" />
+  <filter_editor label="テクスチャをフィルタ" name="inventory search editor" />
+  <check_box initial_value="false" label="フォルダを表示" name="show_folders_check" />
+  <button label="追加" label_selected="追加" name="l_add_btn" />
+  <button label="削除" label_selected="削除" name="l_rem_btn" />
+  <button label="アップロード" label_selected="アップロード" name="l_upl_btn" />
+  <scroll_list name="l_name_list">
+    <column label="名前" name="unit_name" />
+    <column label="ＩＤ" name="unit_id_HIDDEN" />
+  </scroll_list>
+  <combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD" />
+    <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER" />
+    <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER" />
+    <combo_box.item label="BAKED_EYES" name="BAKED_EYES" />
+    <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT" />
+    <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR" />
+    <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM" />
+    <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG" />
+    <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1" />
+    <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2" />
+    <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3" />
+  </combo_box>
+  <check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region" />
+  <button label="ＯＫ" label_selected="ＯＫ" name="Select" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
index adc35137b5..8cc433f08c 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
@@ -1,77 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="TexFetchDebugger" title="テクスチャ取得デバッガ">
-	<text name="total_num_fetched_label">
-		1, 取得したテクスチャの合計数：[NUM]
-	</text>
-	<text name="total_num_fetching_requests_label">
-		2, 取得リクエストの合計数：[NUM]
-	</text>
-	<text name="total_num_cache_hits_label">
-		3, キャッシュヒットの合計数：[NUM]
-	</text>
-	<text name="total_num_visible_tex_label">
-		4, 表示テクスチャの合計数：[NUM]
-	</text>
-	<text name="total_num_visible_tex_fetch_req_label">
-		5, 表示テクスチャ取得リクエストの合計数：[NUM]
-	</text>
-	<text name="total_fetched_data_label">
-		6, 取得したデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_fetched_vis_data_label">
-		7, 表示データの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB
-	</text>
-	<text name="total_fetched_rendered_data_label">
-		8, レンダリングされたデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_cache_read_label">
-		9, キャッシュ読み取りの合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_cache_write_label">
-		10, キャッシュ書き込みの合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_decode_label">
-		11, デコードの合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_gl_label">
-		12, glテクスチャ作成の合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_http_label">
-		13, HTTP 取得の合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_fetch_label">
-		14, 取得全体の合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_refetch_vis_cache_label">
-		15, キャッシュから表示テクスチャを再取得、時間：[TIME] 秒、取得：[SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_refetch_all_cache_label">
-		16、キャッシュからすべてのテクスチャを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_refetch_vis_http_label">
-		17、HTTP から可視ファイルを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_refetch_all_http_label">
-		18、HTTP からすべてのテクスチャを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<spinner label="19、テセル/ピクセル比:" name="texel_pixel_ratio"/>
-	<text name="texture_source_label">
-		20、テクスチャ ソース:
-	</text>
-	<radio_group name="texture_source">
-		<radio_item label="キャッシュ + HTTP" name="0"/>
-		<radio_item label="HTTP のみ" name="1"/>
-	</radio_group>
-	<button label="開始" name="start_btn"/>
-	<button label="リセット" name="clear_btn"/>
-	<button label="閉じる" name="close_btn"/>
-	<button label="キャッシュ読み取り" name="cacheread_btn"/>
-	<button label="キャッシュ書き込み" name="cachewrite_btn"/>
-	<button label="HTTP" name="http_btn"/>
-	<button label="デコード" name="decode_btn"/>
-	<button label="GL テクスチャ" name="gl_btn"/>
-	<button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/>
-	<button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn"/>
-	<button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/>
-	<button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn"/>
-</floater>
+  <text name="total_num_fetched_label">１，取得したテクスチャの合計数：[NUM]</text>
+  <text name="total_num_fetching_requests_label">２，取得リクエストの合計数：[NUM]</text>
+  <text name="total_num_cache_hits_label">３，キャッシュヒットの合計数：[NUM]</text>
+  <text name="total_num_visible_tex_label">４，表示テクスチャの合計数：[NUM]</text>
+  <text name="total_num_visible_tex_fetch_req_label">５，表示テクスチャ取得リクエストの合計数：[NUM]</text>
+  <text name="total_fetched_data_label">６，取得したデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_fetched_vis_data_label">７，表示データの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅</text>
+  <text name="total_fetched_rendered_data_label">８，レンダリングされたデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_cache_read_label">９，キャッシュ読み取りの合計時間：[TIME]秒</text>
+  <text name="total_time_cache_write_label">１０，キャッシュ書き込みの合計時間：[TIME]秒</text>
+  <text name="total_time_decode_label">１１，デコードの合計時間：[TIME]秒</text>
+  <text name="total_time_gl_label">１２，glテクスチャ作成の合計時間：[TIME]秒</text>
+  <text name="total_time_http_label">１３，HTTP取得の合計時間：[TIME]秒</text>
+  <text name="total_time_fetch_label">１４，取得全体の合計時間：[TIME]秒</text>
+  <text name="total_time_refetch_vis_cache_label">１５，キャッシュから表示テクスチャを再取得、時間：[TIME]秒、取得：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_refetch_all_cache_label">１６，キャッシュからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_refetch_vis_http_label">１７，HTTPから可視ファイルを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_refetch_all_http_label">１８，HTTPからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <spinner label="19、テセル／ピクセル比：" name="texel_pixel_ratio" />
+  <text name="texture_source_label">20、テクスチャ ソース：</text>
+  <radio_group name="texture_source">
+    <radio_item label="キャッシュ + HTTP" name="0" />
+    <radio_item label="HTTP のみ" name="1" />
+  </radio_group>
+  <button label="開始" name="start_btn" />
+  <button label="リセット" name="clear_btn" />
+  <button label="閉じる" name="close_btn" />
+  <button label="キャッシュ読み取り" name="cacheread_btn" />
+  <button label="キャッシュ書き込み" name="cachewrite_btn" />
+  <button label="HTTP" name="http_btn" />
+  <button label="デコード" name="decode_btn" />
+  <button label="GLテクスチャ" name="gl_btn" />
+  <button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn" />
+  <button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn" />
+  <button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn" />
+  <button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 13f766698e..a6b2f53599 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -1,447 +1,283 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" short_title="制作ツール" title="">
-	<floater.string name="grid_screen_text">
-		画面
-	</floater.string>
-	<floater.string name="grid_local_text">
-		ローカル
-	</floater.string>
-	<floater.string name="grid_world_text">
-		世界
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		リファレンス
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		アタッチメント
-	</floater.string>
-	<floater.string name="status_rotate">
-		色の付いたバンドをドラッグしてオブジェクトを回転
-	</floater.string>
-	<floater.string name="status_scale">
-		選択した側をクリックし、ドラッグで引き伸ばす
-	</floater.string>
-	<floater.string name="status_move">
-		移動：ドラッグ、コピー：Shift + ドラッグ
-	</floater.string>
-	<floater.string name="status_modifyland">
-		土地をクリックし、ボタンを押したまま入力して修正変更
-	</floater.string>
-	<floater.string name="status_camera">
-		クリック + ドラッグで視界移動
-	</floater.string>
-	<floater.string name="status_grab">
-		ドラッグで移動、Ctrlで持ち上げ、Ctrl + Shiftで回転
-	</floater.string>
-	<floater.string name="status_place">
-		インワールドでクリックして作成
-	</floater.string>
-	<floater.string name="status_selectland">
-		土地をクリックし、ドラッグして選択
-	</floater.string>
-	<floater.string name="status_selectcount">
-		選択されているオブジェクトは [OBJ_COUNT] 個、土地の負荷は [LAND_IMPACT] [secondlife:///app/openfloater/object_weights 詳細]
-	</floater.string>
-	<floater.string name="status_remaining_capacity">
-		残りの許容数 [LAND_CAPACITY]。
-	</floater.string>
-	<button label="" label_selected="" name="button focus" tool_tip="フォーカス"/>
-	<button label="" label_selected="" name="button move" tool_tip="動かす"/>
-	<button label="" label_selected="" name="button edit" tool_tip="編集"/>
-	<button label="" label_selected="" name="button create" tool_tip="作成"/>
-	<button label="" label_selected="" name="button land" tool_tip="土地"/>
-	<text name="text status">
-		移動するにはドラッグ、コピーするにはShiftキーを押しながらドラッグ
-	</text>
-	<radio_group name="focus_radio_group">
-		<radio_item label="ズーム" name="radio zoom"/>
-		<radio_item label="旋回（Ctrl）" name="radio orbit"/>
-		<radio_item label="水平・垂直移動 (Ctrl + Shift)" name="radio pan"/>
-	</radio_group>
-	<radio_group name="move_radio_group">
-		<radio_item label="移動" name="radio move"/>
-		<radio_item label="持ち上げる（Ctrl）" name="radio lift"/>
-		<radio_item label="回転 (Ctrl + Shift)" name="radio spin"/>
-	</radio_group>
-	<radio_group name="edit_radio_group">
-		<radio_item label="移動" name="radio position"/>
-		<radio_item label="回転（Ctrl）" name="radio rotate"/>
-		<radio_item label="引き延ばす (Ctrl+Shift)" name="radio stretch"/>
-		<radio_item label="面を選択" name="radio select face"/>
-	</radio_group>
-	<check_box label="リンク部分を編集" name="checkbox edit linked parts"/>
-	<button label="リンク" name="link_btn"/>
-	<button label="リンクを外す" name="unlink_btn"/>
-	<check_box label="両側を引き伸ばす" name="checkbox uniform"/>
-	<check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="スナップ" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
-		<combo_box.item label="世界" name="World"/>
-		<combo_box.item label="ローカル" name="Local"/>
-		<combo_box.item label="リファレンス" name="Reference"/>
-	</combo_box>
-	<button label="" label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/>
-	<button label="" label_selected="" name="ToolCube" tool_tip="キューブ"/>
-	<button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/>
-	<button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/>
-	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="4面体"/>
-	<button label="" label_selected="" name="ToolCylinder" tool_tip="シリンダー"/>
-	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="半円柱"/>
-	<button label="" label_selected="" name="ToolCone" tool_tip="円錐"/>
-	<button label="" label_selected="" name="ToolHemiCone" tool_tip="半円錐"/>
-	<button label="" label_selected="" name="ToolSphere" tool_tip="球体"/>
-	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="半球"/>
-	<button label="" label_selected="" name="ToolTorus" tool_tip="トーラス"/>
-	<button label="" label_selected="" name="ToolTube" tool_tip="チューブ"/>
-	<button label="" label_selected="" name="ToolRing" tool_tip="リング"/>
-	<button label="" label_selected="" name="ToolTree" tool_tip="樹木"/>
-	<button label="" label_selected="" name="ToolGrass" tool_tip="草地"/>
-	<check_box label="選択したツールを維持" name="checkbox sticky"/>
-	<check_box label="選択したものをコピー" name="checkbox copy selection"/>
-	<check_box initial_value="true" label="中央に位置" name="checkbox copy centers"/>
-	<check_box label="回転" name="checkbox copy rotates"/>
-	<radio_group name="land_radio_group">
-		<radio_item label="土地を選択" name="radio select land"/>
-		<radio_item label="ならす" name="radio flatten"/>
-		<radio_item label="隆起" name="radio raise"/>
-		<radio_item label="低くする" name="radio lower"/>
-		<radio_item label="滑らかにする" name="radio smooth"/>
-		<radio_item label="凸凹にする" name="radio noise"/>
-		<radio_item label="元に戻す" name="radio revert"/>
-	</radio_group>
-	<text name="Bulldozer:">
-		ブルドーザー：
-	</text>
-	<text name="Dozer Size:">
-		サイズ
-	</text>
-	<text name="Strength:">
-		強度
-	</text>
-	<button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します"/>
-	<text name="selection_empty">
-		何も選択されていません。
-	</text>
-	<text name="remaining_capacity">
-		[CAPACITY_STRING] [secondlife:///app/openfloater/object_weights 詳細]
-	</text>
-	<tab_container name="Object Info Tabs">
-		<panel label="一般" name="General">
-			<panel.string name="text deed continued">
-				譲渡
-			</panel.string>
-			<panel.string name="text deed">
-				譲渡
-			</panel.string>
-			<panel.string name="text modify info 1">
-				このオブジェクトを修正できます
-			</panel.string>
-			<panel.string name="text modify info 2">
-				これらのオブジェクトを修正できます
-			</panel.string>
-			<panel.string name="text modify info 3">
-				このオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify info 4">
-				これらのオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify info 5">
-				地域（リージョン）の境界を越えてこのオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify info 6">
-				地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify warning">
-				オブジェクト全体を選択して権限の設定を行ってください。
-			</panel.string>
-			<panel.string name="Cost Default">
-				価格： L$
-			</panel.string>
-			<panel.string name="Cost Total">
-				合計： L$
-			</panel.string>
-			<panel.string name="Cost Per Unit">
-				単価： L$
-			</panel.string>
-			<panel.string name="Cost Mixed">
-				混合価格
-			</panel.string>
-			<panel.string name="Sale Mixed">
-				混合販売
-			</panel.string>
-			<text name="Name:">
-				名前：
-			</text>
-			<line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大 63 文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
-			<text name="Description:">
-				説明：
-			</text>
-			<line_editor name="Object Description" tool_tip="ビューワの設定で [すべてのオブジェクト上でヒントを表示] が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
-			<text name="Creator:">
-				制作者：
-			</text>
-			<text name="Creator Name">
-				Mrs. Esbee Linden (esbee.linden)
-			</text>
-			<text name="Owner:">
-				所有者：
-			</text>
-			<text name="Owner Name">
-				Mrs. Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
-			<text name="Group:">
-				グループ：
-			</text>
-			<name_box initial_value="ローディング..." name="Group Name Proxy"/>
-			<button label="設定..." label_selected="設定..." name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します"/>
-			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません"/>
-			<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます"/>
-			<text name="label click action">
-				クリックで：
-			</text>
-			<combo_box name="clickaction" tool_tip="マウスを 1 回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。たとえば、[タッチ] や [支払い] にはスクリプトが必要になるなどです">
-				<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
-				<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
-				<combo_box.item label="オブジェクトを購入する" name="Buyobject"/>
-				<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
-				<combo_box.item label="開く" name="Open"/>
-				<combo_box.item label="ズームする" name="Zoom"/>
-				<combo_box.item label="なし" name="None"/>
-			</combo_box>
-			<check_box label="販売対象：" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
-			<spinner label="L$" name="Edit Cost" tool_tip="オブジェクトの価格。"/>
-			<combo_box name="sale type" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
-				<combo_box.item label="コピー" name="Copy"/>
-				<combo_box.item label="中身" name="Contents"/>
-				<combo_box.item label="オリジナル" name="Original"/>
-			</combo_box>
-			<check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します"/>
-			<panel name="perms_build">
-				<text name="perm_modify">
-					あなたはこのオブジェクトを修正できます
-				</text>
-				<text name="Anyone can:">
-					全員：
-				</text>
-				<check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。"/>
-				<check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
-				<text name="Next owner can:">
-					次の所有者：
-				</text>
-				<check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-				<check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-				<check_box label="再販・プレゼント" name="checkbox next owner can transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
-				<text name="B:">
-					B:
-				</text>
-				<text name="O:">
-					O:
-				</text>
-				<text name="G:">
-					G:
-				</text>
-				<text name="E:">
-					E:
-				</text>
-				<text name="N:">
-					N：
-				</text>
-				<text name="F:">
-					F：
-				</text>
-			</panel>
-			<panel name="pathfinding_attrs_panel">
-				<text name="pathfinding_attributes_label">
-					パスファインディング属性:
-				</text>
-			</panel>
-		</panel>
-		<panel label="形状" name="Object">
-			<check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。 この機能を使うと、制作中の意図せぬ編集を防ぐことができます"/>
-			<check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にします"/>
-			<check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後 1 分でオブジェクトは削除されます"/>
-			<check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突またはオブジェクトとアバターの衝突を回避します"/>
-			<text name="label position">
-				位置（メートル）
-			</text>
-			<spinner label="X" name="Pos X"/>
-			<spinner label="Y" name="Pos Y"/>
-			<spinner label="Z" name="Pos Z"/>
-			<text name="label size">
-				サイズ（メートル）
-			</text>
-			<spinner label="X" name="Scale X"/>
-			<spinner label="Y" name="Scale Y"/>
-			<spinner label="Z" name="Scale Z"/>
-			<text name="label rotation">
-				回転（度）
-			</text>
-			<spinner label="X" name="Rot X"/>
-			<spinner label="Y" name="Rot Y"/>
-			<spinner label="Z" name="Rot Z"/>
-			<combo_box name="comboBaseType">
-				<combo_box.item label="ボックス" name="Box"/>
-				<combo_box.item label="シリンダー" name="Cylinder"/>
-				<combo_box.item label="プリズム" name="Prism"/>
-				<combo_box.item label="球体" name="Sphere"/>
-				<combo_box.item label="トーラス" name="Torus"/>
-				<combo_box.item label="チューブ" name="Tube"/>
-				<combo_box.item label="リング" name="Ring"/>
-				<combo_box.item label="スカルプト" name="Sculpted"/>
-			</combo_box>
-			<text name="text cut">
-				パスカット（始点と終点）
-			</text>
-			<spinner label="B" name="cut begin"/>
-			<spinner label="E" name="cut end"/>
-			<text name="text hollow">
-				中空（空洞）
-			</text>
-			<text name="text skew">
-				傾斜
-			</text>
-			<text name="Hollow Shape">
-				中空（空洞）の形
-			</text>
-			<combo_box name="hole">
-				<combo_box.item label="デフォルト" name="Default"/>
-				<combo_box.item label="サークル" name="Circle"/>
-				<combo_box.item label="正方形" name="Square"/>
-				<combo_box.item label="三角形" name="Triangle"/>
-			</combo_box>
-			<text name="text twist">
-				ひねり（始点と終点）
-			</text>
-			<spinner label="B" name="Twist Begin"/>
-			<spinner label="E" name="Twist End"/>
-			<text name="scale_taper">
-				テーパー
-			</text>
-			<text name="scale_hole">
-				穴寸法
-			</text>
-			<spinner label="X" name="Taper Scale X"/>
-			<spinner label="Y" name="Taper Scale Y"/>
-			<text name="text topshear">
-				上部層
-			</text>
-			<spinner label="X" name="Shear X"/>
-			<spinner label="Y" name="Shear Y"/>
-			<text name="advanced_cut">
-				プロフィールカット（始点と終点）
-			</text>
-			<text name="advanced_dimple">
-				くぼみ（始点と終点）
-			</text>
-			<text name="advanced_slice">
-				切り取り（始点と終点）
-			</text>
-			<spinner label="B" name="Path Limit Begin"/>
-			<spinner label="E" name="Path Limit End"/>
-			<text name="text taper2">
-				テーパー
-			</text>
-			<spinner label="X" name="Taper X"/>
-			<spinner label="Y" name="Taper Y"/>
-			<text name="text radius delta">
-				半径
-			</text>
-			<text name="text revolutions">
-				回転体
-			</text>
-			<texture_picker label="スカルプトテクスチャ" name="sculpt texture control" tool_tip="クリックして写真を選択してください"/>
-			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムを X 軸上で反転させます"/>
-			<check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返します"/>
-			<text name="label sculpt type">
-				縫い目のタイプ
-			</text>
-			<combo_box name="sculpt type control">
-				<combo_box.item label="球体" name="Sphere"/>
-				<combo_box.item label="トーラス" name="Torus"/>
-				<combo_box.item label="平面" name="Plane"/>
-				<combo_box.item label="シリンダー" name="Cylinder"/>
-			</combo_box>
-		</panel>
-		<panel label="特徴" name="Features">
-			<panel.string name="None">
-				なし
-			</panel.string>
-			<panel.string name="Prim">
-				プリム
-			</panel.string>
-			<panel.string name="Convex Hull">
-				凸状の外殻構造
-			</panel.string>
-			<text name="select_single">
-				プリムを 1 つだけ選択して編集してください
-			</text>
-			<text name="edit_object">
-				オブジェクトの特徴を編集：
-			</text>
-			<check_box label="アニメーションメッシュ" name="Animated Mesh Checkbox Ctrl" tool_tip="リグ入りメッシュオブジェクトをそれぞれアニメーションさせることができるようになります"/>
-			<check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にします（クライアント側のみ）"/>
-			<spinner label="柔軟性" name="FlexNumSections"/>
-			<spinner label="重力" name="FlexGravity"/>
-			<spinner label="ドラッグ" name="FlexFriction"/>
-			<spinner label="風" name="FlexWind"/>
-			<spinner label="緊張" name="FlexTension"/>
-			<spinner label="X 軸方向の力" name="FlexForceX"/>
-			<spinner label="Y 軸方向の力" name="FlexForceY"/>
-			<spinner label="Z 軸方向の力" name="FlexForceZ"/>
-			<check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します"/>
-			<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）"/>
-			<spinner label="輝度" name="Light Intensity"/>
-			<spinner label="FOV" name="Light FOV"/>
-			<spinner label="半径" name="Light Radius"/>
-			<spinner label="焦点" name="Light Focus"/>
-			<spinner label="弱まる" name="Light Falloff"/>
-			<spinner label="環境" name="Light Ambiance"/>
-			<text name="label physicsshapetype">
-				実像の種類：
-			</text>
-			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="実像の種類を選択"/>
-			<combo_box name="material">
-				<combo_box.item label="石" name="Stone"/>
-				<combo_box.item label="金属" name="Metal"/>
-				<combo_box.item label="ガラス" name="Glass"/>
-				<combo_box.item label="木" name="Wood"/>
-				<combo_box.item label="肌" name="Flesh"/>
-				<combo_box.item label="プラスチック" name="Plastic"/>
-				<combo_box.item label="ゴム" name="Rubber"/>
-			</combo_box>
-			<spinner label="重力" name="Physics Gravity"/>
-			<spinner label="摩擦" name="Physics Friction"/>
-			<spinner label="密度（100 kg/m^3）" name="Physics Density"/>
-			<spinner label="復元" name="Physics Restitution"/>
-		</panel>
-		<panel label="材質" name="Texture"/>
-		<panel label="中身" name="Contents">
-			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script"/>
-			<button label="権限" name="button permissions"/>
-		</panel>
-	</tab_container>
-	<panel name="land info panel">
-		<text name="label_parcel_info">
-			区画情報
-		</text>
-		<text name="label_area_price">
-			価格： [AREA] 平方メートル L$ [PRICE]
-		</text>
-		<text name="label_area">
-			面積： [AREA] 平方メートル
-		</text>
-		<button label="土地情報" label_selected="土地情報" name="button about land"/>
-		<check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけます：   緑 = あなたの土地  アクア = あなたのグループ所有地  赤 = 他人が所有する土地  黄色 = 売り出し中  紫 = オークション  グレー = パブリック"/>
-		<text name="label_parcel_modify">
-			区画の編集
-		</text>
-		<button label="再分割" label_selected="再分割" name="button subdivide land"/>
-		<button label="統合" label_selected="統合" name="button join land"/>
-		<text name="label_parcel_trans">
-			土地取引
-		</text>
-		<button label="土地の購入" label_selected="土地の購入" name="button buy land"/>
-		<button label="土地の放棄" label_selected="土地の放棄" name="button abandon land"/>
-	</panel>
-</floater>
+<floater name="toolbox floater" short_title="制作" title="制作ツール">
+  <floater.string name="grid_screen_text">画面</floater.string>
+  <floater.string name="grid_local_text">ローカル</floater.string>
+  <floater.string name="grid_world_text">世界</floater.string>
+  <floater.string name="grid_reference_text">リファレンス</floater.string>
+  <floater.string name="grid_attachment_text">装着物</floater.string>
+  <floater.string name="status_rotate">色の付いたバンドをドラッグしてオブジェクトを回転</floater.string>
+  <floater.string name="status_scale">選択した側をクリックし、ドラッグで引き伸ばす</floater.string>
+  <floater.string name="status_move">移動：ドラッグ、コピー：Shift＋ドラッグ</floater.string>
+  <floater.string name="status_modifyland">土地をクリックし、ボタンを押したまま入力して修正変更</floater.string>
+  <floater.string name="status_camera">クリック＋ドラッグで視界移動</floater.string>
+  <floater.string name="status_grab">ドラッグで移動、Ctrlで持ち上げ、Ctrl＋Shiftで回転</floater.string>
+  <floater.string name="status_place">インワールドでクリックして作成</floater.string>
+  <floater.string name="status_selectland">土地をクリックし、ドラッグして選択</floater.string>
+  <floater.string name="status_selectcount">選択されているオブジェクトは[OBJ_COUNT]個、土地の負荷は[LAND_IMPACT]　[secondlife:///app/openfloater/object_weights 詳細]</floater.string>
+  <floater.string name="status_remaining_capacity">残りの許容数[LAND_CAPACITY]</floater.string>
+  <button label="" label_selected="" name="button focus" tool_tip="フォーカス" />
+  <button label="" label_selected="" name="button move" tool_tip="動かす" />
+  <button label="" label_selected="" name="button edit" tool_tip="編集" />
+  <button label="" label_selected="" name="button create" tool_tip="作成" />
+  <button label="" label_selected="" name="button land" tool_tip="土地" />
+  <text name="text status">移動するにはドラッグ、コピーするにはShiftキーを押しながらドラッグ</text>
+  <radio_group name="focus_radio_group">
+    <radio_item label="ズーム" name="radio zoom" />
+    <radio_item label="旋回（Ctrl）" name="radio orbit" />
+    <radio_item label="水平・垂直移動 (Ctrl＋Shift)" name="radio pan" />
+  </radio_group>
+  <radio_group name="move_radio_group">
+    <radio_item label="移動" name="radio move" />
+    <radio_item label="持ち上げる（Ctrl）" name="radio lift" />
+    <radio_item label="回転 (Ctrl＋Shift)" name="radio spin" />
+  </radio_group>
+  <radio_group name="edit_radio_group">
+    <radio_item label="移動" name="radio position" />
+    <radio_item label="回転（Ctrl）" name="radio rotate" />
+    <radio_item label="引き延ばす (Ctrl＋Shift)" name="radio stretch" />
+    <radio_item label="面を選択" name="radio select face" />
+  </radio_group>
+  <check_box label="リンク部分を編集" name="checkbox edit linked parts" />
+  <button label="リンク" name="link_btn" />
+  <button label="リンクを外す" name="unlink_btn" />
+  <check_box label="両側を引き伸ばす" name="checkbox uniform" />
+  <check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures" />
+  <check_box initial_value="true" label="グリッドにスナップ" name="checkbox snap to grid" />
+  <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
+    <combo_box.item label="世界" name="World" />
+    <combo_box.item label="ローカル" name="Local" />
+    <combo_box.item label="リファレンス" name="Reference" />
+  </combo_box>
+  <button label="" label_selected="オプション…" name="Options..." tool_tip="グリッドオプションを表示します" />
+  <button label="" label_selected="" name="ToolCube" tool_tip="キューブ" />
+  <button label="" label_selected="" name="ToolPrism" tool_tip="プリズム" />
+  <button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド" />
+  <button label="" label_selected="" name="ToolTetrahedron" tool_tip="4面体" />
+  <button label="" label_selected="" name="ToolCylinder" tool_tip="シリンダー" />
+  <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="半円柱" />
+  <button label="" label_selected="" name="ToolCone" tool_tip="円錐" />
+  <button label="" label_selected="" name="ToolHemiCone" tool_tip="半円錐" />
+  <button label="" label_selected="" name="ToolSphere" tool_tip="球体" />
+  <button label="" label_selected="" name="ToolHemiSphere" tool_tip="半球" />
+  <button label="" label_selected="" name="ToolTorus" tool_tip="トーラス" />
+  <button label="" label_selected="" name="ToolTube" tool_tip="チューブ" />
+  <button label="" label_selected="" name="ToolRing" tool_tip="リング" />
+  <button label="" label_selected="" name="ToolTree" tool_tip="樹木" />
+  <button label="" label_selected="" name="ToolGrass" tool_tip="草地" />
+  <check_box label="選択したツールを維持" name="checkbox sticky" />
+  <check_box label="選択したものをコピー" name="checkbox copy selection" />
+  <check_box label="中央に位置" name="checkbox copy centers" />
+  <check_box label="回転" name="checkbox copy rotates" />
+  <radio_group name="land_radio_group">
+    <radio_item label="土地を選択" name="radio select land" />
+    <radio_item label="ならす" name="radio flatten" />
+    <radio_item label="隆起" name="radio raise" />
+    <radio_item label="低くする" name="radio lower" />
+    <radio_item label="滑らかにする" name="radio smooth" />
+    <radio_item label="凸凹にする" name="radio noise" />
+    <radio_item label="元に戻す" name="radio revert" />
+  </radio_group>
+  <text name="Bulldozer:">ブルドーザー：</text>
+  <text name="Dozer Size:">サイズ：</text>
+  <text name="Strength:">強度：</text>
+  <button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します" />
+  <text name="selection_empty">何も選択されていません。</text>
+  <text name="remaining_capacity">[CAPACITY_STRING]　[secondlife:///app/openfloater/object_weights 詳細]</text>
+  <tab_container name="Object Info Tabs">
+    <panel label="一般" name="General">
+      <panel.string name="text deed continued">譲渡</panel.string>
+      <panel.string name="text deed">譲渡</panel.string>
+      <panel.string name="text modify info 1">このオブジェクトは、修正することができます。</panel.string>
+      <panel.string name="text modify info 2">これらのオブジェクトは、修正することができます。</panel.string>
+      <panel.string name="text modify info 3">このオブジェクトは、修正することができません。</panel.string>
+      <panel.string name="text modify info 4">これらのオブジェクトは、修正することができません。</panel.string>
+      <panel.string name="text modify info 5">リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。</panel.string>
+      <panel.string name="text modify info 6">リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。</panel.string>
+      <panel.string name="text modify warning">オブジェクト全体を選択して、権限の設定を行ってください。</panel.string>
+      <panel.string name="Cost Default">価格：L$</panel.string>
+      <panel.string name="Cost Total">合計：L$</panel.string>
+      <panel.string name="Cost Per Unit">単価：L$</panel.string>
+      <panel.string name="Cost Mixed">総額</panel.string>
+      <panel.string name="Sale Mixed">販売価格</panel.string>
+      <text name="Name:">名前：</text>
+      <line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大６３文字までです。長いプリム名は短縮されます。名前に使用できる文字は、ASCII-7（非拡張）に含まれる印字可能な文字のみです（パイプ文字「|」は例外）。" />
+      <text name="Description:">説明：</text>
+      <line_editor name="Object Description" tool_tip="ビューアーの設定で「すべてのオブジェクト上でヒントを表示」が選択されている場合、オブジェクトにマウスのポインタをかざすと、そのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
+      <text name="Creator:">制作者：</text>
+      <text name="Creator Name">Mrs. Esbee Linden (esbee.linden)</text>
+      <text name="Owner:">所有者：</text>
+      <text name="Owner Name">Mrs. Erica "Moose" Linden (erica.linden)</text>
+      <text name="Group:">グループ：</text>
+      <name_box initial_value="読み込んでいます…" name="Group Name Proxy" />
+      <button label="設定…" label_selected="設定…" name="button set group" tool_tip="このオブジェクト権限を共有したいグループを選択します。" />
+      <check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員に、このオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません" />
+      <button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます" />
+      <text name="label click action">クリックで：</text>
+      <combo_box name="clickaction" tool_tip="マウスを１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリック・アクションによっては、動作要件が必要なものもあります。たとえば、「触る」や「お支払い」には、スクリプトが必要になるなどです">
+        <combo_box.item label="触る（デフォルト）" name="Touch/grab(default)" />
+        <combo_box.item label="オブジェクトに座る" name="Sitonobject" />
+        <combo_box.item label="オブジェクトを購入する" name="Buyobject" />
+        <combo_box.item label="オブジェクトに支払う" name="Payobject" />
+        <combo_box.item label="開く" name="Open" />
+        <combo_box.item label="ズームする" name="Zoom" />
+        <combo_box.item label="なし" name="None" />
+      </combo_box>
+      <check_box label="販売対象：" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
+      <spinner label="L$" name="Edit Cost" tool_tip="オブジェクトの価格" />
+      <combo_box name="sale type" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
+        <combo_box.item label="コピー" name="Copy" />
+        <combo_box.item label="中身" name="Contents" />
+        <combo_box.item label="オブジェクトそのもの" name="Original" />
+      </combo_box>
+      <check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します。" />
+      <panel name="perms_build">
+        <text name="perm_modify">あなたは、このオブジェクトを修正することができます。</text>
+        <text name="Anyone can:">全員：</text>
+        <check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。" />
+        <check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
+        <text name="Next owner can:">譲渡先の所有者：</text>
+        <check_box label="修正" name="checkbox next owner can modify" tool_tip="譲渡先の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+        <check_box label="コピー" name="checkbox next owner can copy" tool_tip="譲渡先の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制約があります。" />
+        <check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="譲渡先の所有者は、このオブジェクトを他人に譲渡したり再販することができます。" />
+        <text name="B:">Ｂ：</text>
+        <text name="O:">Ｃ：</text>
+        <text name="G:">Ｇ：</text>
+        <text name="E:">Ｅ：</text>
+        <text name="N:">Ｎ：</text>
+        <text name="F:">Ｆ：</text>
+      </panel>
+      <panel name="pathfinding_attrs_panel">
+        <text name="pathfinding_attributes_label">経路探索属性：</text>
+      </panel>
+    </panel>
+    <panel label="形状" name="Object">
+      <check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。この機能を使うと、制作中の意図せぬ編集を防ぐことができます。" />
+      <check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にします。" />
+      <check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後１分でオブジェクトは削除されます。" />
+      <check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突、またはオブジェクトとアバターの衝突を回避します。" />
+      <text name="label position">位置（メートル）</text>
+      <spinner label="Ｘ" name="Pos X" />
+      <spinner label="Ｙ" name="Pos Y" />
+      <spinner label="Ｚ" name="Pos Z" />
+      <text name="label size">サイズ（メートル）</text>
+      <spinner label="Ｘ" name="Scale X" />
+      <spinner label="Ｙ" name="Scale Y" />
+      <spinner label="Ｚ" name="Scale Z" />
+      <text name="label rotation">回転（度）</text>
+      <spinner label="Ｘ" name="Rot X" />
+      <spinner label="Ｙ" name="Rot Y" />
+      <spinner label="Ｚ" name="Rot Z" />
+      <combo_box name="comboBaseType">
+        <combo_box.item label="ボックス" name="Box" />
+        <combo_box.item label="シリンダー" name="Cylinder" />
+        <combo_box.item label="プリズム" name="Prism" />
+        <combo_box.item label="球体" name="Sphere" />
+        <combo_box.item label="トーラス" name="Torus" />
+        <combo_box.item label="チューブ" name="Tube" />
+        <combo_box.item label="リング" name="Ring" />
+        <combo_box.item label="スカルプト" name="Sculpted" />
+      </combo_box>
+      <text name="text cut">パスカット（始点と終点）</text>
+      <spinner label="始" name="cut begin" />
+      <spinner label="終" name="cut end" />
+      <text name="text hollow">中空（空洞）</text>
+      <text name="text skew">傾斜</text>
+      <text name="Hollow Shape">中空（空洞）の形</text>
+      <combo_box name="hole">
+        <combo_box.item label="デフォルト" name="Default" />
+        <combo_box.item label="サークル" name="Circle" />
+        <combo_box.item label="正方形" name="Square" />
+        <combo_box.item label="三角形" name="Triangle" />
+      </combo_box>
+      <text name="text twist">ひねり（始点と終点）</text>
+      <spinner label="始" name="Twist Begin" />
+      <spinner label="終" name="Twist End" />
+      <text name="scale_taper">テーパー</text>
+      <text name="scale_hole">穴寸法</text>
+      <spinner label="Ｘ" name="Taper Scale X" />
+      <spinner label="Ｙ" name="Taper Scale Y" />
+      <text name="text topshear">上部層</text>
+      <spinner label="Ｘ" name="Shear X" />
+      <spinner label="Ｙ" name="Shear Y" />
+      <text name="advanced_cut">プロフィールカット（始点と終点）</text>
+      <text name="advanced_dimple">くぼみ（始点と終点）</text>
+      <text name="advanced_slice">切り取り（始点と終点）</text>
+      <spinner label="始" name="Path Limit Begin" />
+      <spinner label="終" name="Path Limit End" />
+      <text name="text taper2">テーパー</text>
+      <spinner label="Ｘ" name="Taper X" />
+      <spinner label="Ｙ" name="Taper Y" />
+      <text name="text radius delta">半径</text>
+      <text name="text revolutions">回転体</text>
+      <texture_picker label="スカルプトテクスチャ" name="sculpt texture control" tool_tip="クリックして画像を選択してください。" />
+      <check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムをＸ軸上で反転させます" />
+      <check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返します" />
+      <text name="label sculpt type">縫い目のタイプ</text>
+      <combo_box name="sculpt type control">
+        <combo_box.item label="球体" name="Sphere" />
+        <combo_box.item label="トーラス" name="Torus" />
+        <combo_box.item label="平面" name="Plane" />
+        <combo_box.item label="シリンダー" name="Cylinder" />
+      </combo_box>
+    </panel>
+    <panel label="特徴" name="Features">
+      <panel.string name="None">なし</panel.string>
+      <panel.string name="Prim">プリム</panel.string>
+      <panel.string name="Convex Hull">凸状の外殻構造</panel.string>
+      <text name="select_single">プリムを１つだけ選択して編集してください。</text>
+      <text name="edit_object">オブジェクトの特徴を編集：</text>
+      <check_box label="アニメーションメッシュ" name="Animated Mesh Checkbox Ctrl" tool_tip="リグ入りメッシュオブジェクトを、それぞれアニメーションさせることができるようになります。" />
+      <check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Ｚ軸を中心に、オブジェクトの屈曲を有効にします。（クライアント側のみ）" />
+      <spinner label="柔軟性" name="FlexNumSections" />
+      <spinner label="重力" name="FlexGravity" />
+      <spinner label="ドラッグ" name="FlexFriction" />
+      <spinner label="風" name="FlexWind" />
+      <spinner label="緊張" name="FlexTension" />
+      <spinner label="Ｘ軸方向の力" name="FlexForceX" />
+      <spinner label="Ｙ軸方向の力" name="FlexForceY" />
+      <spinner label="Ｚ軸方向の力" name="FlexForceZ" />
+      <check_box label="発光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します" />
+      <color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
+      <texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）" />
+      <spinner label="輝度" name="Light Intensity" />
+      <spinner label="ＦＯＶ" name="Light FOV" />
+      <spinner label="半径" name="Light Radius" />
+      <spinner label="焦点" name="Light Focus" />
+      <spinner label="弱まる" name="Light Falloff" />
+      <spinner label="環境" name="Light Ambiance" />
+      <text name="label physicsshapetype">実像の種類：</text>
+      <combo_box name="Physics Shape Type Combo Ctrl" tool_tip="実像の種類を選択" />
+      <combo_box name="material">
+        <combo_box.item label="石" name="Stone" />
+        <combo_box.item label="金属" name="Metal" />
+        <combo_box.item label="ガラス" name="Glass" />
+        <combo_box.item label="木" name="Wood" />
+        <combo_box.item label="肌" name="Flesh" />
+        <combo_box.item label="プラスチック" name="Plastic" />
+        <combo_box.item label="ゴム" name="Rubber" />
+      </combo_box>
+      <spinner label="重力" name="Physics Gravity" />
+      <spinner label="摩擦" name="Physics Friction" />
+      <spinner label="密度（１００㎏/㎥）" name="Physics Density" />
+      <spinner label="復元" name="Physics Restitution" />
+    </panel>
+    <panel label="材質" name="Texture" />
+    <panel label="中身" name="Contents">
+      <button label="新規スクリプト" label_selected="新規スクリプト" name="button new script" />
+      <button label="権限" name="button permissions" />
+    </panel>
+  </tab_container>
+  <panel name="land info panel">
+    <text name="label_parcel_info">区画情報</text>
+    <text name="label_area_price">価格：[AREA]㎡　L$ [PRICE]</text>
+    <text name="label_area">面積：[AREA]㎡</text>
+    <button label="土地情報" label_selected="土地情報" name="button about land" />
+    <check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけます：緑色＝あなたの土地　水色＝あなたのグループ所有地　赤色＝他人が所有する土地　黄色 = 売り出し中　紫色＝オークション　灰色＝公共領域" />
+    <text name="label_parcel_modify">区画の編集</text>
+    <button label="再分割" label_selected="再分割" name="button subdivide land" />
+    <button label="統合" label_selected="統合" name="button join land" />
+    <text name="label_parcel_trans">土地取引</text>
+    <button label="土地の購入" label_selected="土地の購入" name="button buy land" />
+    <button label="土地の放棄" label_selected="土地の放棄" name="button abandon land" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index c57f91f619..8bb738ddbf 100644
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -1,64 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="トップオブジェクト">
-	<floater.string name="top_scripts_title">
-		トップ・スクリプト
-	</floater.string>
-	<floater.string name="top_scripts_text">
-		[COUNT] スクリプトには合計で [TIME] 分かかり、[MEMORY] KB 使用しています。
-	</floater.string>
-	<floater.string name="scripts_score_label">
-		時間
-	</floater.string>
-	<floater.string name="top_colliders_title">
-		上部コライダー
-	</floater.string>
-	<floater.string name="top_colliders_text">
-		上位[COUNT]個の物体は多くの衝突可能性があります。
-	</floater.string>
-	<floater.string name="colliders_score_label">
-		数
-	</floater.string>
-	<floater.string name="none_descriptor">
-		何も見つかりませんでした。
-	</floater.string>
-	<floater.string name="URLs">
-		URL
-	</floater.string>
-	<floater.string name="memory">
-		メモリ（KB）
-	</floater.string>
-	<text name="title_text">
-		ロード中．．．
-	</text>
-	<scroll_list name="objects_list">
-		<scroll_list.columns label="数" name="score"/>
-		<scroll_list.columns label="名前" name="name"/>
-		<scroll_list.columns label="所有者" name="owner"/>
-		<scroll_list.columns label="ロケーション" name="location"/>
-		<scroll_list.columns label="区画" name="parcel"/>
-		<scroll_list.columns label="日付" name="time"/>
-		<scroll_list.columns label="URL" name="URLs"/>
-		<scroll_list.columns label="メモリ（KB）" name="memory"/>
-	</scroll_list>
-	<text name="id_text">
-		物体ID：
-	</text>
-	<button label="標識を表示" name="show_beacon_btn"/>
-	<text name="obj_name_text">
-		オブジェクト名：
-	</text>
-	<button label="フィルタ" name="filter_object_btn"/>
-	<text name="owner_name_text">
-		所有者：
-	</text>
-	<button label="フィルタ" name="filter_owner_btn"/>
-	<text name="parcel_name_text">
-		区画：
-	</text>
-	<button label="フィルター" name="filter_parcel_btn"/>
-	<button label="更新" name="refresh_btn"/>
-	<button label="選択内容を返却" name="return_selected_btn"/>
-	<button label="すべて返却" name="return_all_btn"/>
-	<button label="選択内容を無効化" name="disable_selected_btn"/>
-	<button label="すべて無効化" name="disable_all_btn"/>
-</floater>
+  <floater.string name="top_scripts_title">トップ・スクリプト</floater.string>
+  <floater.string name="top_scripts_text">[COUNT]個のスクリプトの実行に[TIME]分かかり、[MEMORY]㎅使用しています。</floater.string>
+  <floater.string name="scripts_score_label">時間</floater.string>
+  <floater.string name="top_colliders_title">上部コライダー</floater.string>
+  <floater.string name="top_colliders_text">上位[COUNT]個の物体は多くの衝突可能性があります。</floater.string>
+  <floater.string name="colliders_score_label">数</floater.string>
+  <floater.string name="none_descriptor">何も見つかりませんでした。</floater.string>
+  <floater.string name="URLs">URL</floater.string>
+  <floater.string name="memory">メモリ（㎅）</floater.string>
+  <text name="title_text">読み込んでいます…</text>
+  <scroll_list name="objects_list">
+    <scroll_list.columns label="数" name="score" />
+    <scroll_list.columns label="名前" name="name" />
+    <scroll_list.columns label="所有者" name="owner" />
+    <scroll_list.columns label="ロケーション" name="location" />
+    <scroll_list.columns label="区画" name="parcel" />
+    <scroll_list.columns label="日付" name="time" />
+    <scroll_list.columns label="URL" name="URLs" />
+    <scroll_list.columns label="メモリ（㎅）" name="memory" />
+  </scroll_list>
+  <text name="id_text">物体ＩＤ：</text>
+  <button label="標識を表示" name="show_beacon_btn" />
+  <text name="obj_name_text">オブジェクト名：</text>
+  <button label="フィルタ" name="filter_object_btn" />
+  <text name="owner_name_text">所有者：</text>
+  <button label="フィルタ" name="filter_owner_btn" />
+  <text name="parcel_name_text">区画：</text>
+  <button label="フィルタ" name="filter_parcel_btn" />
+  <button label="更新" name="refresh_btn" />
+  <button label="選択内容を返却" name="return_selected_btn" />
+  <button label="すべて返却" name="return_all_btn" />
+  <button label="選択内容を無効化" name="disable_selected_btn" />
+  <button label="すべて無効化" name="disable_all_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
index 8a6a6ff58a..8d55ac3112 100644
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title=" ">
-	<floater.string name="real_url">
-		http://secondlife.com/app/tos/
-	</floater.string>
-	<floater.string name="loading_url">
-		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
-	</floater.string>
-	<text name="tos_heading">
-		次の Second Life の利用規約、プライバシーポリシー、およびサービス規約（仲裁の利用および紛争解決のためのいかなるクラスまたはグループの請求の放棄に関する必要条件を含む）をお読みください。[SECOND_LIFE] へのログインを続けるには、これらの規約に同意する必要があります。
-	</text>
-	<text name="external_tos_required">
-		操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。
-	</text>
-	<check_box label="" name="agree_chk"/>
-	<text name="agree_list">
-		私は、Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）を読み、同意しました。
-	</text>
-	<button label="続行" label_selected="続行" name="Continue"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-</floater>
+  <floater.string name="real_url">http://secondlife.com/app/tos/</floater.string>
+  <floater.string name="loading_url">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</floater.string>
+  <text name="tos_heading">次の Second Lifeの利用規約、プライバシーポリシー、およびサービス規約（仲裁の利用および紛争解決のためのいかなるクラスまたはグループの請求の放棄に関する必要条件を含む）をお読みください。
+[SECOND_LIFE]へのログインを続けるには、これらの規約に同意する必要があります。</text>
+  <text name="external_tos_required">操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。</text>
+  <check_box label="" name="agree_chk" />
+  <text name="agree_list">私は、Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）を読み、同意しました。	</text>
+  <button label="続ける" label_selected="続ける" name="Continue" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml
index 682352ec82..0a3b29b22f 100644
--- a/indra/newview/skins/default/xui/ja/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_toybox.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Toybox" title="ツールバーのボタン">
-	<text name="toybox label 1">
-		ボタンをツールバーに追加または削除するにはボタンをドラッグします。
-	</text>
-	<text name="toybox label 2">
-		各ツールバーの設定に応じて、ボタンは以下のように表示されたり、アイコンのみで表示されます。
-	</text>
-	<button label="ツールバーを全てクリア" label_selected="ツールバーを全てクリア" name="btn_clear_all"/>
-	<button label="デフォルト設定を復元" label_selected="デフォルト設定を復元" name="btn_restore_defaults"/>
-</floater>
+  <text name="toybox label 1">ボタンをツールバーに追加または削除するにはボタンをドラッグします。</text>
+  <text name="toybox label 2">各ツールバーの設定に応じて、ボタンは以下のように表示されたり、アイコンのみで表示されます。</text>
+  <button label="ツールバーを全てクリア" label_selected="ツールバーを全てクリア" name="btn_clear_all" />
+  <button label="デフォルト設定を復元" label_selected="デフォルト設定を復元" name="btn_restore_defaults" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
index 27143086ac..c2a448913f 100644
--- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
@@ -1,58 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_translation_settings" title="チャットの翻訳設定">
-	<string name="bing_api_key_not_verified">
-		Bing appID を認証できませんでした。もう一度お試しください。
-	</string>
-	<string name="google_api_key_not_verified">
-		Google API キーを認証できませんでした。もう一度お試しください。
-	</string>
-	<string name="bing_api_key_verified">
-		Bing appID が認証されました。
-	</string>
-	<string name="google_api_key_verified">
-		Google API キーが認証されました。
-	</string>
-	<check_box label="チャット中の機械翻訳機能を有効にする" name="translate_chat_checkbox"/>
-	<text name="translate_language_label">
-		翻訳する言語：
-	</text>
-	<combo_box name="translate_language_combo">
-		<combo_box.item label="システム標準" name="System Default Language"/>
-		<combo_box.item label="英語" name="English"/>
-		<combo_box.item label="Dansk（デンマーク語）" name="Danish"/>
-		<combo_box.item label="Deutsch（ドイツ語）" name="German"/>
-		<combo_box.item label="Español（スペイン語）" name="Spanish"/>
-		<combo_box.item label="Français（フランス語）" name="French"/>
-		<combo_box.item label="Italiano（イタリア語）" name="Italian"/>
-		<combo_box.item label="Magyar（ハンガリー語）" name="Hungarian"/>
-		<combo_box.item label="Nederlands（オランダ語）" name="Dutch"/>
-		<combo_box.item label="Polski（ポーランド語）" name="Polish"/>
-		<combo_box.item label="Português（ポルトガル語）" name="Portugese"/>
-		<combo_box.item label="Русский（ロシア語）" name="Russian"/>
-		<combo_box.item label="Türkçe（トルコ語）" name="Turkish"/>
-		<combo_box.item label="Українська （ウクライナ語）" name="Ukrainian"/>
-		<combo_box.item label="中文 (正體) （中国語）" name="Chinese"/>
-		<combo_box.item label="日本語（日本語）" name="Japanese"/>
-		<combo_box.item label="한국어（韓国語）" name="Korean"/>
-	</combo_box>
-	<text name="tip">
-		翻訳サービスを選択してください：
-	</text>
-	<radio_group name="translation_service_rg">
-		<radio_item initial_value="bing" label="Bing Translator" name="bing"/>
-		<radio_item initial_value="google" label="Google Translate" name="google"/>
-	</radio_group>
-	<text name="bing_api_key_label">
-		Bing AppID [http://www.bing.com/developers/createapp.aspx AppID]:
-	</text>
-	<button label="認証" name="verify_bing_api_key_btn"/>
-	<text name="google_api_key_label">
-		Google API key [http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]:
-	</text>
-	<button label="認証" name="verify_google_api_key_btn"/>
-	<text name="google_links_text">
-		[http://code.google.com/apis/language/translate/v2/pricing.html 価格] | [https://code.google.com/apis/console 統計]
-	</text>
-	<button label="OK" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <string name="bing_api_key_not_verified">Bing appIDを認証できませんでした。もう一度お試しください。</string>
+  <string name="google_api_key_not_verified">Google APIキーを認証できませんでした。もう一度お試しください。</string>
+  <string name="bing_api_key_verified">Bing appIDが認証されました。</string>
+  <string name="google_api_key_verified">Google APIキーが認証されました。</string>
+  <check_box label="チャット中の機械翻訳機能を有効にする" name="translate_chat_checkbox" />
+  <text name="translate_language_label">翻訳する言語：</text>
+  <combo_box name="translate_language_combo">
+    <combo_box.item label="システム標準" name="System Default Language" />
+    <combo_box.item label="英語" name="English" />
+    <combo_box.item label="Dansk（デンマーク語）" name="Danish" />
+    <combo_box.item label="Deutsch（ドイツ語）" name="German" />
+    <combo_box.item label="Español（スペイン語）" name="Spanish" />
+    <combo_box.item label="Français（フランス語）" name="French" />
+    <combo_box.item label="Italiano（イタリア語）" name="Italian" />
+    <combo_box.item label="Magyar（ハンガリー語）" name="Hungarian" />
+    <combo_box.item label="Nederlands（オランダ語）" name="Dutch" />
+    <combo_box.item label="Polski（ポーランド語）" name="Polish" />
+    <combo_box.item label="Português（ポルトガル語）" name="Portugese" />
+    <combo_box.item label="Русский（ロシア語）" name="Russian" />
+    <combo_box.item label="Türkçe（トルコ語）" name="Turkish" />
+    <combo_box.item label="Українська （ウクライナ語）" name="Ukrainian" />
+    <combo_box.item label="中文 (正體) （中国語）" name="Chinese" />
+    <combo_box.item label="日本語（日本語）" name="Japanese" />
+    <combo_box.item label="한국어（韓国語）" name="Korean" />
+  </combo_box>
+  <text name="tip">翻訳サービスを選択してください：</text>
+  <radio_group name="translation_service_rg">
+    <radio_item initial_value="bing" label="Bing Translator" name="bing" />
+    <radio_item initial_value="google" label="Google Translate" name="google" />
+  </radio_group>
+  <text name="bing_api_key_label">Bing AppID[http://www.bing.com/developers/createapp.aspx AppID]：</text>
+  <button label="認証" name="verify_bing_api_key_btn" />
+  <text name="google_api_key_label">Google API key[http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]：</text>
+  <button label="認証" name="verify_google_api_key_btn" />
+  <text name="google_links_text">[http://code.google.com/apis/language/translate/v2/pricing.html 価格]|[https://code.google.com/apis/console 統計]</text>
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
new file mode 100644
index 0000000000..ea135a149d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gui_preview_tool" title="ＸＵＩプレビューツール">
+  <string name="ExternalEditorNotSet">環境変数LL_XUI_EDITORまたはExternalEditor設定を設定するか、[EDITOR PATH]フィールドにそのパスを指定して、エディターを選択します。</string>
+  <panel name="main_panel">
+    <text name="select_language_label">優先言語：</text>
+    <combo_box name="language_select_combo">
+      <combo_box.item label="ja" name="item1" value="ja" />
+    </combo_box>
+    <button label="表示" label_selected="表示" name="display_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。" />
+    <button label="非表示" label_selected="非表示" name="close_displayed_floater" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。" />
+    <button label="編集…" label_selected="編集…" name="edit_floater" tool_tip="選択したＸＭＬファイルによって定義されたＸＵＩフローターを編集します。（外部エディターを開きます）ローカライズされたバージョンが存在しない場合は、enバージョンを開きます。" />
+    <button label="保存" label_selected="保存" name="save_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを保存します。" />
+    <button label="全て保存" label_selected="全て保存" name="save_all_floaters" tool_tip="選択した言語で定義されたすべてのＸＵＩフロータを保存します。" />
+    <button label="≫" label_selected="≪" name="toggle_overlap_panel" tool_tip="重なっている要素の強調表示と表示パネルを切り替えます。要素を右クリックして、この機能用に選択します。選択した要素は、赤い四角形でマークされます。" />
+    <text name="select_language_label_2">二次言語：</text>
+    <combo_box name="language_select_combo_2">
+      <combo_box.item label="en" name="item1" value="en" />
+    </combo_box>
+    <button label="表示" name="display_floater_2" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。" />
+    <button enabled="false" label="非表示" name="close_displayed_floater_2" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。" />
+    <button label="スキーマをエクスポート" name="export_schema" />
+    <check_box label="四角形を表示" name="show_rectangles" />
+    <scroll_list name="name_list">
+      <scroll_list.columns label="タイトル" name="title_column" />
+      <scroll_list.columns label="ファイル名" name="file_column" />
+      <scroll_list.columns label="トップレベルのノード" name="top_level_node_column" />
+    </scroll_list>
+    <panel name="editor_panel">
+      <text name="editor_path_label">エディタのパス：</text>
+      <line_editor name="executable_path_field" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）へのフルパス。（引用符は必要ありません）" />
+      <button follows="left|bottom" label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_executable" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）を参照します。" />
+      <text name="executable_args_label">エディタの引数：</text>
+      <line_editor name="executable_args_field" tool_tip="エディターへのコマンドライン引数。'%FILE%'を使用してターゲット ファイルを参照します。このフィールドが空の場合、「YourProgram.exe FileName.xml」が実行されます" />
+    </panel>
+    <panel name="vlt_panel">
+      <text name="diff_file_label">差分ファイル：</text>
+      <line_editor name="vlt_diff_path_field" tool_tip="Viewer Localization Toolkitによって生成されたＸＭＬのD0、D1言語差分ファイルへのフルパス" />
+      <button label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_vlt_diffs" tool_tip="VLTで生成されたD0、D1差分ファイルを参照して、変更されたファイルと要素を強調表示します。" />
+      <button label="差分をハイライト" label_selected="ハイライトを解除" name="toggle_vlt_diff_highlight" tool_tip="変更された言語データを含むファイルと要素の強調表示を切り替えます。" />
+    </panel>
+  </panel>
+  <scroll_container follows="top|right|bottom" height="600" layout="topleft" name="overlap_scroll">
+    <panel name="overlap_dummy_panel">
+      <overlap_panel label="オーバーラップパネル" ame="overlap_panel" tool_tip="このパネルには、現在選択されている要素と、それに重なっているすべての要素が水平線で区切られて表示されます。" />
+      <text name="overlap_panel_label">重なる要素：</text>
+    </panel>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 8e09e4748a..ff08c4ab1a 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry">
-	<text name="media_label">
-		メディア URL：
-	</text>
-	<combo_box name="media_entry"/>
-	<button label="OK" name="ok_btn" width="38"/>
-	<button label="キャンセル" name="cancel_btn" width="80"/>
-	<button label="クリア" name="clear_btn" left_pad="76"/>
-	<text name="loading_label" left="140">
-		ロード中．．．
-	</text>
-</floater>
+  <text name="media_label">メディアURL：</text>
+  <combo_box name="media_entry" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="クリア" name="clear_btn" />
+  <text name="loading_label">読み込んでいます…	</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
index 44e96c35ad..f0ecf182e8 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_voice_volume" title="ボイスチャットの音量">
-	<slider label="ボイスチャット" name="chat_voice_volume"/>
-</floater>
+  <slider label="ボイスチャット" name="chat_voice_volume" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index b38ea9331a..c57db0713b 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,159 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
-	<string name="no_voice_effect">
-		（ボイスモーフィングなし）
-	</string>
-	<string name="active_voice_effect">
-		（アクティブ）
-	</string>
-	<string name="unsubscribed_voice_effect">
-		（取消し済み）
-	</string>
-	<string name="new_voice_effect">
-		（新登場！）
-	</string>
-	<string name="effect_Arena">
-		アリーナ
-	</string>
-	<string name="effect_Beast">
-		野獣
-	</string>
-	<string name="effect_Buff">
-		がっしり
-	</string>
-	<string name="effect_Buzz">
-		ブザー
-	</string>
-	<string name="effect_Camille">
-		カミール
-	</string>
-	<string name="effect_Creepy">
-		気味の悪い
-	</string>
-	<string name="effect_CreepyBot">
-		気味わるボット
-	</string>
-	<string name="effect_Cyber">
-		サイバー
-	</string>
-	<string name="effect_DeepBot">
-		ディープボット
-	</string>
-	<string name="effect_Demon">
-		デーモン
-	</string>
-	<string name="effect_Female Elf">
-		女性のエルフ
-	</string>
-	<string name="effect_Flirty">
-		気のありそうな
-	</string>
-	<string name="effect_Foxy">
-		魅惑的
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		ハロウィン_2010_ボーナス
-	</string>
-	<string name="effect_Helium">
-		ヘリウム
-	</string>
-	<string name="effect_Husky">
-		ハスキー
-	</string>
-	<string name="effect_Husky Whisper">
-		スモーキーウィスパー
-	</string>
-	<string name="effect_Intercom">
-		インターホン
-	</string>
-	<string name="effect_Julia">
-		ジュリア
-	</string>
-	<string name="effect_Lo Lilt">
-		軽快
-	</string>
-	<string name="effect_Macho">
-		マッチョ
-	</string>
-	<string name="effect_Micro">
-		ミクロ
-	</string>
-	<string name="effect_Mini">
-		ミニ
-	</string>
-	<string name="effect_Model">
-		モデル
-	</string>
-	<string name="effect_Nano">
-		ナノ
-	</string>
-	<string name="effect_Nightmare">
-		悪夢
-	</string>
-	<string name="effect_PopBot">
-		ポップボット
-	</string>
-	<string name="effect_Rachel">
-		レイチェル
-	</string>
-	<string name="effect_Radio">
-		ラジオ
-	</string>
-	<string name="effect_Robot">
-		ロボット
-	</string>
-	<string name="effect_Roxanne">
-		ロクサン
-	</string>
-	<string name="effect_Rumble">
-		ランブル
-	</string>
-	<string name="effect_Sabrina">
-		サブリナ
-	</string>
-	<string name="effect_Samantha">
-		サマンサ
-	</string>
-	<string name="effect_Sexy">
-		セクシー
-	</string>
-	<string name="effect_Shorty">
-		チビ
-	</string>
-	<string name="effect_Smaller">
-		小さめ
-	</string>
-	<string name="effect_Sneaky">
-		コソコソ
-	</string>
-	<string name="effect_Stallion">
-		雄馬
-	</string>
-	<string name="effect_Sultry">
-		艶かしい
-	</string>
-	<string name="effect_Thunder">
-		サンダー
-	</string>
-	<string name="effect_Vixen">
-		性悪な
-	</string>
-	<string name="effect_WhinyBot">
-		不機嫌ボット
-	</string>
-	<text name="preview_text">
-		プレビュー
-	</text>
-	<text name="status_text">
-		声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。
-	</text>
-	<button label="録音" name="record_btn" tool_tip="あなたの声を録音します。"/>
-	<button label="停止" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] 今すぐ申し込む]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。">
-		<scroll_list.columns label="ボイス名" name="name"/>
-		<scroll_list.columns label="有効期限" name="expires"/>
-	</scroll_list>
-</floater>
+  <string name="no_voice_effect">（ボイスモーフィングなし）</string>
+  <string name="active_voice_effect">（アクティブ）</string>
+  <string name="unsubscribed_voice_effect">（取消し済み）</string>
+  <string name="new_voice_effect">（新登場！）</string>
+  <string name="effect_Arena">アリーナ</string>
+  <string name="effect_Beast">野獣</string>
+  <string name="effect_Buff">がっしり</string>
+  <string name="effect_Buzz">ブザー</string>
+  <string name="effect_Camille">カミール</string>
+  <string name="effect_Creepy">気味の悪い</string>
+  <string name="effect_CreepyBot">気味わるボット</string>
+  <string name="effect_Cyber">サイバー</string>
+  <string name="effect_DeepBot">ディープボット</string>
+  <string name="effect_Demon">デーモン</string>
+  <string name="effect_Female Elf">女性のエルフ</string>
+  <string name="effect_Flirty">気のありそうな</string>
+  <string name="effect_Foxy">魅惑的</string>
+  <string name="effect_Halloween 2010 Bonus">ハロウィン_2010_ボーナス</string>
+  <string name="effect_Helium">ヘリウム</string>
+  <string name="effect_Husky">ハスキー</string>
+  <string name="effect_Husky Whisper">スモーキーウィスパー</string>
+  <string name="effect_Intercom">インターホン</string>
+  <string name="effect_Julia">ジュリア</string>
+  <string name="effect_Lo Lilt">軽快</string>
+  <string name="effect_Macho">マッチョ</string>
+  <string name="effect_Micro">ミクロ</string>
+  <string name="effect_Mini">ミニ</string>
+  <string name="effect_Model">モデル</string>
+  <string name="effect_Nano">ナノ</string>
+  <string name="effect_Nightmare">悪夢</string>
+  <string name="effect_PopBot">ポップボット</string>
+  <string name="effect_Rachel">レイチェル</string>
+  <string name="effect_Radio">ラジオ</string>
+  <string name="effect_Robot">ロボット</string>
+  <string name="effect_Roxanne">ロクサン</string>
+  <string name="effect_Rumble">ランブル</string>
+  <string name="effect_Sabrina">サブリナ</string>
+  <string name="effect_Samantha">サマンサ</string>
+  <string name="effect_Sexy">セクシー</string>
+  <string name="effect_Shorty">チビ</string>
+  <string name="effect_Smaller">小さめ</string>
+  <string name="effect_Sneaky">コソコソ</string>
+  <string name="effect_Stallion">雄馬</string>
+  <string name="effect_Sultry">艶かしい</string>
+  <string name="effect_Thunder">サンダー</string>
+  <string name="effect_Vixen">性悪な</string>
+  <string name="effect_WhinyBot">不機嫌ボット</string>
+  <text name="preview_text">プレビュー</text>
+  <text name="status_text">声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。</text>
+  <button label="録音" name="record_btn" tool_tip="あなたの声を録音します。" />
+  <button label="停止" name="record_stop_btn" />
+  <text name="voice_morphing_link">[[URL] 今すぐ申し込む]</text>
+  <scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。">
+    <scroll_list.columns label="ボイス名" name="name" />
+    <scroll_list.columns label="有効期限" name="expires" />
+  </scroll_list>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
index a380615d5a..084a1ffde9 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
@@ -4,5 +4,5 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="floater_voice_volume" title="ボイス音量">
-	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
-</floater>
+  <slider name="volume_slider" tool_tip="ボイス音量" value="0.5" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
index d57cd4e297..b7b3650ed9 100644
--- a/indra/newview/skins/default/xui/ja/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_web_content" title="">
-	<layout_stack name="stack1">
-		<layout_panel name="nav_controls">
-			<button name="back" tool_tip="前へ"/>
-			<button name="forward" tool_tip="次へ"/>
-			<button name="stop" tool_tip="ナビゲーションを停止"/>
-			<button name="reload" tool_tip="ページを更新"/>
-			<combo_box name="address" tool_tip="ここに URL を入力"/>
-			<icon name="media_secure_lock_flag" tool_tip="安全な閲覧"/>
-			<button name="popexternal" tool_tip="この URL をブラウザで開く"/>
-		</layout_panel>
-		<layout_panel name="debug_controls">
-			<button name="web_test_home_page" tool_tip="Web テストのホームページ"/>
-			<button name="VLC Plugin Test" tool_tip="MPEG4 ビデオテスト"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <layout_stack name="stack1">
+    <layout_panel name="nav_controls">
+      <button name="back" tool_tip="前へ" />
+      <button name="forward" tool_tip="次へ" />
+      <button name="stop" tool_tip="ナビゲーションを停止" />
+      <button name="reload" tool_tip="ページを更新" />
+      <combo_box name="address" tool_tip="ここに URL を入力" />
+      <icon name="media_secure_lock_flag" tool_tip="安全な閲覧" />
+      <button name="popexternal" tool_tip="この URL をブラウザで開く" />
+    </layout_panel>
+    <layout_panel name="debug_controls">
+      <button name="web_test_home_page" tool_tip="Web テストのホームページ" />
+      <button name="VLC Plugin Test" tool_tip="MPEG4 ビデオテスト" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
index 34aba9d485..fe63e1f96c 100644
--- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="whitelist_entry" title="ホワイトリストの入力">
-	<text name="media_label">
-		URL か URL パターンを入力して、許可するドメインをリストに追加します。
-	</text>
-	<line_editor name="whitelist_entry" tool_tip="URL か URL パターンをホワイトリストに入力します"/>
-	<button label="OK" name="ok_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+  <text name="media_label">ＵＲＬかＵＲＬパターンを入力して、許可するドメインをリストに追加します。</text>
+  <line_editor name="whitelist_entry" tool_tip="ＵＲＬかＵＲＬパターンをホワイトリストに入力します。" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index 416813d6cc..ab7811f9aa 100644
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="window_size" title="ウィンドウサイズ">
-	<string name="resolution_format">
-		[RES_X] x [RES_Y]
-	</string>
-	<text name="windowsize_text">
-		ウィンドウのサイズを設定：
-	</text>
-	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
-		<combo_box.item label="1000 x 700 （デフォルト）" name="item1"/>
-		<combo_box.item label="1024 x 768 （4:3 XGA）" name="item2"/>
-		<combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3"/>
-		<combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4"/>
-		<combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5"/>
-		<combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7"/>
-		<combo_box.item label="1600 x 900 （16:9 HD+）" name="item8"/>
-		<combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9"/>
-		<combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10"/>
-		<combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11"/>
-		<combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12"/>
-	</combo_box>
-	<button label="設定" name="set_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+  <string name="resolution_format">[RES_X]x[RES_Y]</string>
+  <text name="windowsize_text">ウィンドウのサイズを設定：</text>
+  <combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
+    <combo_box.item label="1000 x 700 （デフォルト）" name="item1" />
+    <combo_box.item label="1024 x 768 （4:3 XGA）" name="item2" />
+    <combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3" />
+    <combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4" />
+    <combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5" />
+    <combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7" />
+    <combo_box.item label="1600 x 900 （16:9 HD+）" name="item8" />
+    <combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9" />
+    <combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10" />
+    <combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11" />
+    <combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12" />
+  </combo_box>
+  <button label="設定" name="set_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index cc07596adc..02e8ae352a 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -1,85 +1,96 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="worldmap" title="世界地図">
-	<panel name="layout_panel_1">
-		<text name="events_label">
-			表記・記号
-		</text>
-	</panel>
-	<panel name="layout_panel_2">
-		<button label="現在地を表示" label_selected="現在地を表示" name="Show My Location" tool_tip="アバターの位置を地図の中心に表示します"/>
-		<text name="me_label">
-			自分
-		</text>
-		<check_box label="住人" name="people_chk"/>
-		<text name="person_label">
-			住人
-		</text>
-		<check_box label="インフォハブ" name="infohub_chk"/>
-		<text name="infohub_label">
-			インフォハブ
-		</text>
-		<check_box label="売り地" name="land_for_sale_chk"/>
-		<text name="land_sale_label">
-			土地販売
-		</text>
-		<text name="auction_label">
-			土地オークション
-		</text>
-		<text name="by_owner_label">
-			所有者の販売
-		</text>
-		<button label="ホームへ" label_selected="ホームへ" name="Go Home" tool_tip="「ホーム」にテレポートします"/>
-		<text name="Home_label">
-			ホーム
-		</text>
-		<text name="events_label">
-			イベント：
-		</text>
-		<check_box label="PG" name="event_chk"/>
-		<text name="pg_label">
-			General
-		</text>
-		<check_box initial_value="true" label="Mature" name="events_mature_chk"/>
-		<text name="events_mature_label">
-			Moderate
-		</text>
-		<check_box label="Adult" name="events_adult_chk"/>
-		<text name="events_adult_label">
-			Adult
-		</text>
-	</panel>
-	<panel name="layout_panel_3">
-		<text name="find_on_map_label">
-			地図上で見つける
-		</text>
-	</panel>
-	<panel name="layout_panel_4">
-		<combo_box label="オンラインのフレンド" name="friend combo" tool_tip="フレンドを地図に表示">
-			<combo_box.item label="オンラインのフレンド" name="item1"/>
-		</combo_box>
-		<combo_box label="マイ ランドマーク" name="landmark combo" tool_tip="地図上に表示するランドマーク">
-			<combo_box.item label="マイ ランドマーク" name="item1"/>
-		</combo_box>
-		<search_editor label="リージョン名" name="location" tool_tip="リージョン名を入力します"/>
-		<button label="検索" name="DoSearch" tool_tip="リージョン検索"/>
-		<button name="Clear" tool_tip="追跡ラインをクリアして地図をリセットします"/>
-		<scroll_list name="search_results">
-			<scroll_list.columns label="" name="icon"/>
-			<scroll_list.columns label="" name="sim_name"/>
-		</scroll_list>
-		<text name="events_label">
-			場所：
-		</text>
-		<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="選択した場所にテレポートします"/>
-		<button label="SLurl をコピー" name="copy_slurl" tool_tip="現在地の SLurl をコピーして Web で使用します"/>
-		<button label="選択を表示する" label_selected="目的地を表示" name="Show Destination" tool_tip="選択した場所を地図の中心に表示します"/>
-	</panel>
-	<panel name="layout_panel_5">
-		<text name="zoom_label">
-			ズーム
-		</text>
-	</panel>
-	<panel name="layout_panel_6">
-		<slider label="ズーム" name="zoom slider"/>
-	</panel>
-</floater>
+<floater name="worldmap" title="ワールドマップ">
+  <string name="collapse_icon" value="map_ui_collapse_icon.png" />
+  <string name="expand_icon" value="map_ui_expand_icon.png" />
+  <string name="collapse_tooltip" value="マップ操作パネルを隠す" />
+  <string name="expand_tooltip" value="マップ操作を表示" />
+  <layout_stack name="floater_map_stack">
+    <layout_panel name="map_lp">
+      <panel filename="panel_world_map.xml" name="objects_mapview" />
+      <panel name="expand_btn_panel" tool_tip="マップ操作パネルを隠す">
+        <icon name="expand_collapse_icon" tool_tip="マップ操作パネルを隠す" />
+      </panel>
+    </layout_panel>
+    <layout_panel name="controls_lp">
+      <panel name="layout_panel_1">
+        <text name="events_label">凡例</text>
+      </panel>
+      <panel name="layout_panel_2">
+        <button name="Show My Location" tool_tip="現在、自分のアバターがいる場所をマップの中心にする。" />
+        <text name="me_label">自分</text>
+        <check_box control_name="MapShowPeople" name="people_chk" />
+        <icon name="person" />
+        <text name="person_label">人物</text>
+        <check_box name="infohub_chk" />
+        <icon name="infohub" />
+        <text name="infohub_label">情報ハブ</text>
+        <check_box name="land_for_sale_chk" />
+        <icon name="landforsale" />
+        <text name="land_sale_label">販売中の土地</text>
+        <icon name="square2" />
+        <text name="auction_label">オークション中の土地</text>
+        <icon name="square2" />
+        <text name="by_owner_label">所有者で</text>
+
+        <button name="Go Home" tool_tip="自分のホームの場所にテレポート" />
+
+        <text name="Home_label">ホーム</text>
+        <text name="events_label">イベント：</text>
+
+        <check_box name="event_chk" />
+        <icon name="event" />
+        <text name="pg_label">General</text>
+
+        <check_box name="events_mature_chk" />
+        <icon name="events_mature_icon" />
+        <text name="events_mature_label">Moderate</text>
+
+        <check_box name="events_adult_chk" />
+        <icon name="events_adult_icon" />
+        <text name="events_adult_label">Adult</text>
+      </panel>
+
+
+      <panel name="layout_panel_3">
+        <text name="find_on_map_label">マップから探す</text>
+      </panel>
+
+      <panel name="layout_panel_4">
+        <icon name="friends_icon" />
+        <combo_box label="オンラインのフレンド" name="friend combo" tool_tip="マップにフレンドを表示する。">
+          <combo_box.item label="オンラインのフレンド" name="item1" value="None" />
+          <combo_box.commit_callback function="WMap.AvatarCombo" />
+        </combo_box>
+        <icon name="landmark_icon" />
+        <combo_box label="ランドマーク" name="landmark combo" tool_tip="マップにランドマークを表示する。">
+          <combo_box.item label="ランドマーク" name="item1" value="None" />
+          <combo_box.commit_callback function="WMap.Landmark" />
+        </combo_box>
+        <icon name="location_icon" />
+        <search_editor label="リージョン（地域）名で" tool_tip="リージョン（地域）名を入力してください" />
+        <button label="探す" name="DoSearch" tool_tip="リージョン（地域）を検索する。" />
+        <button name="Clear" tool_tip="追跡ラインをクリアしてマップをリセットする。" />
+        <scroll_list name="search_results">
+          <scroll_list.columns label="" name="icon" />
+          <scroll_list.columns label="" name="sim_name" />
+          <scroll_list.commit_callback function="WMap.SearchResult" />
+        </scroll_list>
+        <text name="events_label">場所：</text>
+        <spinner name="teleport_coordinate_x" />
+        <spinner name="teleport_coordinate_y" />
+        <spinner name="teleport_coordinate_z" />
+        <button label="テレポート" name="Teleport" tool_tip="選択した場所にテレポートする。" />
+        <button label="SLurlをコピー" layout="topleft" name="copy_slurl" tool_tip="現在の場所をWebで使えるSLurlにしてコピーする。" />
+        <button label="選択を表示" name="Show Destination" tool_tip="選択した場所をマップの中心にする。" />
+      </panel>
+      <panel name="layout_panel_5">
+        <text name="zoom_label">縮尺</text>
+      </panel>
+      <panel name="layout_panel_6">
+        <icon name="zoom_icon" />
+        <!-- NOTE: min_val for zoom slider is hardcoded for performance reasons -->
+        <slider name="zoom slider" />
+      </panel>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml
new file mode 100644
index 0000000000..02c81a8902
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/fonts.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<fonts>
+  <font name="default" comment="default font files (global fallbacks)">
+    <file>NotoSansCJKjp-Medium.otf</file>
+    <file>DejaVuSans.ttf</file>
+    <os name="Windows">
+      <file load_collection="true">YuGothM.ttc</file>
+      <file>meiryo.TTC</file>
+      <file>MSGOTHIC.TTC</file>
+      <file>gulim.ttc</file>
+      <file>simhei.ttf</file>
+      <file>ArialUni.ttf</file>
+      <file>msyh.ttc</file>
+      <file load_collection="true">Cambria.ttc</file>
+      <file>malgun.ttf</file>
+      <file>micross.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>YuGothic-Medium.otf</file>
+      <file>ヒラギノ角ゴシック W3.ttc</file>
+      <file>ヒラギノ角ゴ Pro W3.otf</file>
+      <file>ヒラギノ角ゴ ProN W3.otf</file>
+      <file>AppleGothic.dfont</file>
+      <file>AppleGothic.ttf</file>
+      <file>AppleSDGothicNeo-Regular.otf</file>
+      <file>AppleSDGothicNeo.ttc</file>
+      <file>华文细黑.ttf</file>
+      <file>PingFang.ttc</file>
+      <file>STIXGeneral.otf</file>
+      <file>Thonburi.ttc</file>
+    </os>
+  </font>
+  <font name="SansSerifBold" comment="Name of bold sans-serif font">
+    <file>NotoSansCJKjp-Bold.otf</file>
+    <file>DejaVuSans-Bold.ttf</file>
+    <os name="Windows">
+      <file load_collection="true">YuGothB.ttc</file>
+      <file>arialbd.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>YuGothic-Bold.otf</file>
+      <file>Helvetica.dfont</file>
+    </os>
+  </font>
+  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
+    <file>NotoSansCJKjp-Bold.otf</file>
+    <file>DejaVuSans.ttf</file>
+    <os name="Windows">
+      <file>arial.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>Helvetica.dfont</file>
+    </os>
+  </font>
+  <font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
+    <file>DejaVuSans-Bold.ttf</file>
+  </font>
+  <font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
+    <file>DejaVuSans-Oblique.ttf</file>
+  </font>
+  <font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
+    <file>DejaVuSans-BoldOblique.ttf</file>
+  </font>
+  <font name="Monospace" comment="Name of monospace font">
+    <file>NotoSansMonoCJKjp-Regular.otf</file>
+    <file>DejaVuSansMono.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font">
+    <file>DejaVuSans.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD">
+    <file>DejaVuSans-Bold.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC">
+    <file>DejaVuSans-Oblique.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC">
+    <file>DejaVuSans-BoldOblique.ttf</file>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font">
+    <file>DejaVuSans.ttf</file>
+    <os name="Windows">
+      <file>arial.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>arial.ttf</file>
+    </os>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
+    <file>DejaVuSans-Bold.ttf</file>
+    <os name="Windows">
+      <file>arialbd.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>arialbd.ttf</file>
+    </os>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
+    <file>DejaVuSans-Oblique.ttf</file>
+    <os name="Windows">
+      <file>ariali.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>ariali.ttf</file>
+    </os>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
+    <file>DejaVuSans-BoldOblique.ttf</file>
+    <os name="Windows">
+      <file>arialbi.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>arialbi.ttf</file>
+    </os>
+  </font>
+  <font name="OverrideTest" comment="Name of font to test overriding">
+    <file>times.ttf</file>
+    <file>DejaVuSans.ttf</file>
+  </font>
+  <font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0" />
+  <font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0" />
+  <font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="10.6" />
+  <font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="8.6" />
+  <font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="7.6" />
+</fonts>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index 42b67cd333..81844aec52 100644
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
@@ -4,24 +4,13 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_avatar">
-	<string name="Subtitle">
-		[AGE]
-	</string>
-	<string name="Details">
-		[SL_PROFILE]
-	</string>
-	<text name="user_name_small" value="Grumpity ProductEngine with a long name"/>
-	<text name="user_slid" value="james.linden"/>
-	<text name="user_subtitle" value="11 Months, 3 days old"/>
-	<text name="user_details">
-		This is my second life description and I really think it is great.But for some reason my description is super extra long because I like to talk a whole lot
-	</text>
-	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
-	<button label="フレンド登録" name="add_friend_btn"/>
-	<button label="IM" name="im_btn"/>
-	<button label="プロフィール" name="view_profile_btn"/>
-	<panel name="moderator_panel">
-		<button label="ボイスを無効" name="disable_voice"/>
-		<button label="ボイスを有効" name="enable_voice"/>
-	</panel>
-</floater>
+  <string name="Subtitle">[AGE]</string>
+  <string name="Details">[SL_PROFILE]</string>
+  <text name="user_name_small" value="長い名前のGrumpity ProductEngine" />
+  <text name="user_slid" value="james.linden" />
+  <text name="user_subtitle" value="１１ヶ月３日" />
+  <text name="user_details">これは私のSecondLifeの説明であり、本当に素晴らしいと思います。しかし、どういうわけか、私の説明は非常に長くなっています。なぜなら、私はたくさん話すのが好きだからです。</text>
+  <slider name="volume_slider" tool_tip="ボイス音量" value="0.5" />
+  <text name="avatar_profile_link" value="[[LINK] プロフィールを閲覧]" />
+  <avatar_icon name="avatar_icon" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
index be628befdf..84a2e49824 100644
--- a/indra/newview/skins/default/xui/ja/inspect_group.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_group.xml
@@ -1,32 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
+Not can_close / no title to avoid window chrome
+Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_group">
-	<string name="PrivateGroup">
-		プライベートグループ
-	</string>
-	<string name="FreeToJoin">
-		参加費無料
-	</string>
-	<string name="CostToJoin">
-		参加費 L$[AMOUNT]
-	</string>
-	<string name="YouAreMember">
-		あなたはメンバーです
-	</string>
-	<text name="group_subtitle">
-		123 メートル
-	</text>
-	<text name="group_details">
-		A group of folks charged with creating a room with a moose.
-Fear the moose!  Fear it!  And the mongoose too!
-	</text>
-	<text name="group_cost">
-		L$123 to join
-	</text>
-	<button label="参加" name="join_btn"/>
-	<button label="脱退" name="leave_btn"/>
-	<button label="プロフィールの表示" name="view_profile_btn"/>
-</floater>
+  <string name="PrivateGroup">プライベートグループ</string>
+  <string name="FreeToJoin">参加費無料</string>
+  <string name="CostToJoin">参加費L$ [AMOUNT]</string>
+  <string name="YouAreMember">あなたはメンバーです。</string>
+  <text name="group_subtitle">123メートル</text>
+  <text name="group_details">ヘラジカがいる部屋を作る任務を負った人々のグループ。
+ヘラジカを恐れてください！恐れよ！そしてマングースも！</text>
+  <text name="group_cost">L$123 to join</text>
+  <button label="参加" name="join_btn" />
+  <button label="脱退" name="leave_btn" />
+  <button label="プロフィールの表示" name="view_profile_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
index e6999ac9b1..7ac3ea0991 100644
--- a/indra/newview/skins/default/xui/ja/inspect_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_object.xml
@@ -1,48 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
+Not can_close / no title to avoid window chrome
+Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_object">
-	<string name="Creator">
-		制作者： [CREATOR]
-	</string>
-	<string name="CreatorAndOwner">
-		[CREATOR]によるチェック
-[OWNER]によるチェック
-	</string>
-	<string name="Price">
-		L$[AMOUNT]
-	</string>
-	<string name="PriceFree">
-		無料です！
-	</string>
-	<string name="Touch">
-		触る
-	</string>
-	<string name="Sit">
-		座る
-	</string>
-	<text name="object_name" value="二行にわたる長いオブジェクト名をテスト"/>
-	<text name="object_creator">
-		by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-	</text>
-	<text name="price_text">
-		L$30,000
-	</text>
-	<text name="object_description">
-		This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really?
-	</text>
-	<text name="object_media_url">
-		http://www.superdupertest.com
-	</text>
-	<button label="買う" name="buy_btn"/>
-	<button label="支払う" name="pay_btn"/>
-	<button label="コピーを取る" name="take_free_copy_btn"/>
-	<button label="触る" name="touch_btn"/>
-	<button label="座る" name="sit_btn"/>
-	<button label="開く" name="open_btn"/>
-	<icon name="secure_browsing" tool_tip="安全な閲覧"/>
-	<button label="詳細" name="more_info_btn"/>
-</floater>
+  <string name="Creator">制作者：[CREATOR]</string>
+  <string name="CreatorAndOwner">[CREATOR]によるチェック
+[OWNER]によるチェック</string>
+  <string name="Price">L$[AMOUNT]</string>
+  <string name="PriceFree">無料です！</string>
+  <string name="Touch">触る</string>
+  <string name="Sit">座る</string>
+  <text name="object_name" value="二行にわたる長いオブジェクト名をテスト" />
+  <text name="object_creator">by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about</text>
+  <text name="price_text">L$30,000</text>
+  <text name="object_description">これは、オブジェクトがどのようなものであるかについての非常に長い説明であり、少なくとも８０文字は含まれます。
+長さなどですが、この時点ではおそらく１２０くらいです。本当のところは、誰にも分かりません。</text>
+  <text name="object_media_url">http://www.superdupertest.com</text>
+  <button label="買う" name="buy_btn" />
+  <button label="支払う" name="pay_btn" />
+  <button label="コピーを取る" name="take_free_copy_btn" />
+  <button label="触る" name="touch_btn" />
+  <button label="座る" name="sit_btn" />
+  <button label="開く" name="open_btn" />
+  <icon name="secure_browsing" tool_tip="セキュアブラウジング" />
+  <button label="詳細" name="more_info_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
index 483d3fec52..615ca720e9 100644
--- a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
@@ -1,25 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
+Not can_close / no title to avoid window chrome
+Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_remote_object">
-	<text name="object_name">
-		Test Object Name That Is Really Long
-	</text>
-	<text name="object_owner_label">
-		所有者：
-	</text>
-	<text name="object_owner">
-		Longavatarname Johnsonlongstonnammer
-	</text>
-	<text name="object_slurl_label">
-		位置：
-	</text>
-	<text name="object_slurl">
-		http://slurl.com/Ahern/50/50/50
-	</text>
-	<button label="地図" name="map_btn"/>
-	<button label="ブロック" name="block_btn"/>
-	<button label="閉じる" name="close_btn"/>
-</floater>
+  <text name="object_name">非常に長いテスト オブジェクト名</text>
+  <text name="object_owner_label">所有者：</text>
+  <text name="object_owner">Longavatarname Johnsonlongstonnammer</text>
+  <text name="object_slurl_label">位置：</text>
+  <text name="object_slurl">http://slurl.com/Ahern/50/50/50</text>
+  <button label="マップ" name="map_btn" />
+  <button label="ブロック" name="block_btn" />
+  <button label="閉じる" name="close_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
index 91e8f4be7c..76fdca24eb 100644
--- a/indra/newview/skins/default/xui/ja/language_settings.xml
+++ b/indra/newview/skins/default/xui/ja/language_settings.xml
@@ -1,57 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.-->
 <strings>
-
-	<!-- Locale Information -->
-	<string name="MicrosoftLocale">japanese</string>
-	<string name="MacLocale">ja_JP.UTF-8</string>
-	<string name="DarwinLocale">ja_JP.UTF-8</string>
-	<string name="LinuxLocale">ja_JP.UTF-8</string>
-	
-	<!-- 
+  <!-- Locale Information -->
+  <string name="MicrosoftLocale">japanese</string>
+  <string name="MacLocale">ja_JP.UTF-8</string>
+  <string name="DarwinLocale">ja_JP.UTF-8</string>
+  <string name="LinuxLocale">ja_JP.UTF-8</string>
+  <!-- 
 	datetimeToCodes["wkday"]	= "%a";		// Thu
 	datetimeToCodes["weekday"]	= "%A";		// Thursday
 	datetimeToCodes["year4"]	= "%Y";		// 2009
-	datetimeToCodes["year"]		= "%Y";		// 2009
+	datetimeToCodes["year"]= "%Y";		// 2009
 	datetimeToCodes["year2"]	= "%y";		// 09
-	datetimeToCodes["mth"]		= "%b";		// Aug
+	datetimeToCodes["mth"]= "%b";		// Aug
 	datetimeToCodes["month"]	= "%B";		// August
 	datetimeToCodes["mthnum"]	= "%m";		// 08
-	datetimeToCodes["day"]		= "%d";		// 31
-	datetimeToCodes["sday"]		= "%-d";	// 9
+	datetimeToCodes["day"]= "%d";		// 31
+	datetimeToCodes["sday"]= "%-d";	// 9
 	datetimeToCodes["hour24"]	= "%H";		// 14
-	datetimeToCodes["hour"]		= "%H";		// 14
+	datetimeToCodes["hour"]= "%H";		// 14
 	datetimeToCodes["hour12"]	= "%I";		// 02
-	datetimeToCodes["min"]		= "%M";		// 59
-	datetimeToCodes["ampm"]		= "%p";		// AM
+	datetimeToCodes["min"]= "%M";		// 59
+	datetimeToCodes["ampm"]= "%p";		// AM
 	datetimeToCodes["second"]	= "%S";		// 59
 	datetimeToCodes["timezone"]	= "%Z";		// PST	
 	-->
-
-	<string name="TimeHour">hour,datetime,slt</string>
-	<string name="TimeMin">min,datetime,slt</string>	
-	<string name="TimeYear">year,datetime,slt</string>	
-	<string name="TimeDay">day,datetime,slt</string>	
-	<string name="TimeMonth">mthnum,datetime,slt</string>	
-	<string name="TimeWeek">wkday,datetime,slt</string>
-	<string name="TimeAMPM">ampm,datetime,slt</string>
-	<string name="TimeHour12">hour12,datetime,slt</string>	
-
-	<string name="LTimeMthNum">mthnum,datetime,local</string>
-	<string name="LTimeWeek">wkday,datetime,local</string>
-	<string name="LTimeMonth">mth,datetime,local</string>	
-	<string name="LTimeDay">day,datetime,local</string>	
-	<string name="LTimeSec">second,datetime,local</string>
-	<string name="LTimeHour">hour,datetime,local</string>
-	<string name="LTimeMin">min,datetime,local</string>	
-	<string name="LTimeYear">year,datetime,local</string>	
-	
-	<string name="UTCTimeWeek">weekday,datetime,utc</string>
-	<string name="UTCTimeDay">day,datetime,utc</string>
-	<string name="UTCTimeMth">mth,datetime,utc</string>
-	<string name="UTCTimeYr">year,datetime,utc</string>
-	<string name="UTCTimeHr">hour,datetime,utc</string>
-	<string name="UTCTimeMin">min,datetime,utc</string>
-	<string name="UTCTimeSec">second,datetime,utc</string>
-	<string name="UTCTimeTimezone">timezone,datetime,utc</string>							
-</strings>
+  <string name="TimeHour">hour,datetime,slt</string>
+  <string name="TimeMin">min,datetime,slt</string>
+  <string name="TimeYear">year,datetime,slt</string>
+  <string name="TimeDay">day,datetime,slt</string>
+  <string name="TimeMonth">mthnum,datetime,slt</string>
+  <string name="TimeWeek">wkday,datetime,slt</string>
+  <string name="TimeAMPM">ampm,datetime,slt</string>
+  <string name="TimeHour12">hour12,datetime,slt</string>
+  <string name="LTimeMthNum">mthnum,datetime,local</string>
+  <string name="LTimeWeek">wkday,datetime,local</string>
+  <string name="LTimeMonth">mth,datetime,local</string>
+  <string name="LTimeDay">day,datetime,local</string>
+  <string name="LTimeSec">second,datetime,local</string>
+  <string name="LTimeHour">hour,datetime,local</string>
+  <string name="LTimeMin">min,datetime,local</string>
+  <string name="LTimeYear">year,datetime,local</string>
+  <string name="UTCTimeWeek">weekday,datetime,utc</string>
+  <string name="UTCTimeDay">day,datetime,utc</string>
+  <string name="UTCTimeMth">mth,datetime,utc</string>
+  <string name="UTCTimeYr">year,datetime,utc</string>
+  <string name="UTCTimeHr">hour,datetime,utc</string>
+  <string name="UTCTimeMin">min,datetime,utc</string>
+  <string name="UTCTimeSec">second,datetime,utc</string>
+  <string name="UTCTimeTimezone">timezone,datetime,utc</string>
+</strings>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
index 982a03c6a8..c3b216ee79 100644
--- a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Add Wearable Gear Menu">
-	<menu_item_check label="新しい順に並べ替え" name="sort_by_most_recent"/>
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
-</menu>
+  <menu_item_check label="新しい順で並べ替え" name="sort_by_most_recent" />
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="種別で並べ替え" name="sort_by_type" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index b9e10c071c..da3d71e31b 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_avatar_other.xml -->
 <context_menu name="Avatar Pie">
-	<menu_item_call label="プロフィールの表示" name="Profile..."/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="IM" name="Send IM..."/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="グループに招待" name="Invite..."/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="ブロック" name="Avatar Mute"/>
-	<menu_item_call label="報告" name="abuse"/>
-	<menu_item_call label="フリーズ" name="Freeze..."/>
-	<menu_item_call label="追放" name="Eject..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="ズームイン" name="Zoom In"/>
-	<menu_item_call label="支払う" name="Pay..."/>
-	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
-	<context_menu label="アバターを描画" name="Render Avatar">
-		<menu_item_check label="デフォルト" name="RenderNormally"/>
-		<menu_item_check label="常に使用する" name="AlwaysRenderFully"/>
-		<menu_item_check label="使用しない" name="DoNotRender"/>
-		<menu_item_call label="例外…" name="RenderExceptions"/>
-	</context_menu>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="IMのやり取り…" name="Send IM..." />
+  <menu_item_call label="呼び出し" name="Call" />
+  <menu_item_call label="グループに招待…" name="Invite..." />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="ブロック" name="Avatar Mute" />
+  <menu_item_call label="報告" name="abuse" />
+  <menu_item_call label="フリーズ…" name="Freeze..." />
+  <menu_item_call label="追放" name="Eject..." />
+  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="ズームイン" name="Zoom In" />
+  <menu_item_call label="支払う…" name="Pay..." />
+  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
+  <context_menu label="アバターを描画" name="Render Avatar">
+    <menu_item_check label="デフォルト" name="RenderNormally" />
+    <menu_item_check label="常に使用する" name="AlwaysRenderFully" />
+    <menu_item_check label="使用しない" name="DoNotRender" />
+    <menu_item_call label="例外…" name="RenderExceptions" />
+  </context_menu>
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index fa1137c7c5..aae708e257 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Attachment Pie">
-	<menu_item_call label="触る" name="Attachment Object Touch"/>
-	<menu_item_call label="編集" name="Edit..."/>
-	<menu_item_call label="取り外す" name="Detach"/>
-	<menu_item_call label="座る" name="Sit Down Here"/>
-	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<menu_item_call label="容姿" name="Change Outfit"/>
-	<menu_item_call label="アウトフィットの編集" name="Edit Outfit"/>
-	<menu_item_call label="シェイプの編集" name="Edit My Shape"/>
-	<menu_item_call label="ホバー高さ" name="Hover Height"/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="フレンド" name="Friends..."/>
-	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="プロフィール" name="Profile..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="下に落とす" name="Drop"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="触る" name="Attachment Object Touch" />
+  <menu_item_call label="編集…" name="Edit..." />
+  <menu_item_call label="取り外す" name="Detach" />
+  <menu_item_call label="座る" name="Sit Down Here" />
+  <menu_item_call label="立ち上がる" name="Stand Up" />
+  <menu_item_call label="アウトフィットを変更" name="Change Outfit" />
+  <menu_item_call label="アウトフィットを編集" name="Edit Outfit" />
+  <menu_item_call label="シェイプの編集" name="Edit My Shape" />
+  <menu_item_call label="ホバー高さ" name="Hover Height" />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="フレンド…" name="Friends..." />
+  <menu_item_call label="グループ…" name="Groups..." />
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="下に置く" name="Drop" />
+  <menu_item_call label="パーティクルの所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
index 01699d1593..8c697317a5 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Avatar Icon Menu">
-	<menu_item_call label="プロフィールの表示" name="Show Profile"/>
-	<menu_item_call label="IMを送信..." name="Send IM"/>
-	<menu_item_call label="テレポートをリクエスト" name="Request Teleport"/>
-	<menu_item_call label="フレンドを追加..." name="Add Friend"/>
-	<menu_item_call label="フレンドを削除..." name="Remove Friend"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-	</context_menu>
-	<menu_item_call label="メンバーを立入禁止" name="BanMember"/>
-</toggleable_menu>
+  <menu_item_call label="プロフィールの表示" name="Show Profile" />
+  <menu_item_call label="IMを送信…" name="Send IM" />
+  <menu_item_call label="テレポートをリクエスト" name="Request Teleport" />
+  <menu_item_call label="フレンドを追加…" name="Add Friend" />
+  <menu_item_call label="フレンドを削除…" name="Remove Friend" />
+  <context_menu label="モデレーターのオプション" name="Moderator Options">
+    <menu_item_check label="文字チャットを許可" name="AllowTextChat" />
+    <menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected" />
+    <menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected" />
+  </context_menu>
+  <menu_item_call label="メンバーを立入禁止" name="BanMember" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index 3e706cd403..8a691467a8 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Avatar Pie">
-	<menu_item_call label="プロフィールの表示" name="Profile..."/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="IM" name="Send IM..."/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="グループに招待" name="Invite..."/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="ブロック" name="Avatar Mute"/>
-	<menu_item_call label="報告" name="abuse"/>
-	<menu_item_call label="フリーズ" name="Freeze..."/>
-	<menu_item_call label="追放" name="Eject..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="ズームイン" name="Zoom In"/>
-	<menu_item_call label="支払う" name="Pay..."/>
-	<context_menu label="アバターを描画" name="Render Avatar">
-		<menu_item_check label="デフォルト" name="RenderNormally"/>
-		<menu_item_check label="常に使用する" name="AlwaysRenderFully"/>
-		<menu_item_check label="使用しない" name="DoNotRender"/>
-		<menu_item_call label="例外…" name="RenderExceptions"/>
-	</context_menu>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="IMのやり取り…" name="Send IM..." />
+  <menu_item_call label="コール" name="Call" />
+  <menu_item_call label="グループへ招待…" name="Invite..." />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="ブロック" name="Avatar Mute" />
+  <menu_item_call label="報告" name="abuse" />
+  <menu_item_call label="フリーズ…" name="Freeze..." />
+  <menu_item_call label="追放…" name="Eject..." />
+  <menu_item_call label="テクスチャのデバッグ" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="ズームイン" name="Zoom In" />
+  <menu_item_call label="支払う…" name="Pay..." />
+  <context_menu label="アバターを描画" name="Render Avatar">
+    <menu_item_check label="デフォルト" name="RenderNormally" />
+    <menu_item_check label="常に使用する" name="AlwaysRenderFully" />
+    <menu_item_check label="使用しない" name="DoNotRender" />
+    <menu_item_call label="例外…" name="RenderExceptions" />
+  </context_menu>
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
index 59c80bdb0e..0b60751bb3 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Settings">
-	<menu_item_check label="デフォルト" name="default"/>
-	<menu_item_check label="常に描画" name="always_render"/>
-	<menu_item_check label="描画しない" name="never_render"/>
-</context_menu>
+  <menu_item_check label="デフォルト" name="default" />
+  <menu_item_check label="常に描画" name="always_render" />
+  <menu_item_check label="描画しない" name="never_render" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
index e4f78cad31..eb696ec534 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_add.xml">
-	<menu_item_call label="常に住人を描画する..." name="add_avatar_always_render"/>
-	<menu_item_call label="住人を描画しない..." name="add_avatar_never_render"/>
-</toggleable_menu>
+  <menu_item_call label="常に住人を描画する…" name="add_avatar_always_render" />
+  <menu_item_call label="住人を描画しない…" name="add_avatar_never_render" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index b0a619bcb0..80ed3b19c8 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
-	<menu_item_call label="座る" name="Sit Down Here"/>
-	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<context_menu label="取り外す" name="Take Off &gt;">
-		<context_menu label="衣類" name="Clothes &gt;">
-			<menu_item_call label="シャツ" name="Shirt"/>
-			<menu_item_call label="パンツ" name="Pants"/>
-			<menu_item_call label="スカート" name="Skirt"/>
-			<menu_item_call label="靴" name="Shoes"/>
-			<menu_item_call label="靴下" name="Socks"/>
-			<menu_item_call label="ジャケット" name="Jacket"/>
-			<menu_item_call label="手袋" name="Gloves"/>
-			<menu_item_call label="下着シャツ" name="Self Undershirt"/>
-			<menu_item_call label="下着パンツ" name="Self Underpants"/>
-			<menu_item_call label="タトゥ" name="Self Tattoo"/>
-			<menu_item_call label="物理作用" name="Self Physics"/>
-			<menu_item_call label="アルファ" name="Self Alpha"/>
-			<menu_item_call label="すべての衣類" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="取り外す" name="Object Detach"/>
-		<menu_item_call label="すべて取り外す" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="容姿" name="Chenge Outfit"/>
-	<menu_item_call label="アウトフィットを編集" name="Edit Outfit"/>
-	<menu_item_call label="シェイプを編集" name="Edit My Shape"/>
-	<menu_item_call label="ホバー高さ" name="Hover Height"/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="フレンド" name="Friends..."/>
-	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="プロフィール" name="Profile..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="座る" name="Sit Down Here" />
+  <menu_item_call label="立ち上がる" name="Stand Up" />
+  <context_menu label="脱ぐ" name="Take Off &gt;">
+    <context_menu label="服装" name="Clothes &gt;">
+      <menu_item_call label="シャツ" name="Shirt" />
+      <menu_item_call label="ズボン" name="Pants" />
+      <menu_item_call label="スカート" name="Skirt" />
+      <menu_item_call label="靴" name="Shoes" />
+      <menu_item_call label="靴下" name="Socks" />
+      <menu_item_call label="ジャケット" name="Jacket" />
+      <menu_item_call label="手袋" name="Gloves" />
+      <menu_item_call label="下着（上半身）" name="Self Undershirt" />
+      <menu_item_call label="下着（下半身）" name="Self Underpants" />
+      <menu_item_call label="タトゥ" name="Self Tattoo" />
+      <menu_item_call label="物理作用" name="Self Physics" />
+      <menu_item_call label="アルファ" name="Self Alpha" />
+      <menu_item_call label="すべての服装" name="All Clothes" />
+    </context_menu>
+    <context_menu label="HUD" name="Object Detach HUD" />
+    <context_menu label="取り外す" name="Object Detach" />
+    <menu_item_call label="すべて取り外す" name="Detach All" />
+  </context_menu>
+  <menu_item_call label="アウトフィットを変更" name="Chenge Outfit" />
+  <menu_item_call label="アウトフィットの編集" name="Edit Outfit" />
+  <menu_item_call label="シェイプを編集" name="Edit My Shape" />
+  <menu_item_call label="ホバー高さ" name="Hover Height" />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="フレンド…" name="Friends..." />
+  <menu_item_call label="グループ…" name="Groups..." />
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
index aa07b9476e..3e4ab1f856 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Attachment">
-	<menu_item_call label="触る" name="touch_attach" />
-	<menu_item_call label="編集" name="edit_item" />
-	<menu_item_call label="取り外す" name="detach"/>
-</context_menu>
+  <menu_item_call label="触る" name="touch_attach" />
+  <menu_item_call label="編集" name="edit_item" />
+  <menu_item_call label="取り外す" name="detach" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
index eb5faa2545..8af5189f87 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Body">
-	<menu_item_call label="交換" name="replace"/>
-	<menu_item_call label="編集" name="edit"/>
-</context_menu>
+  <menu_item_call label="交換" name="replace" />
+  <menu_item_call label="編集" name="edit" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
index d984342896..47d4f76e48 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Clothing">
-	<menu_item_call label="取り外す" name="take_off"/>
-	<menu_item_call label="編集" name="edit"/>
-	<menu_item_call label="交換" name="replace"/>
-</context_menu>
+  <menu_item_call label="脱ぐ" name="take_off" />
+  <menu_item_call label="編集" name="edit" />
+  <menu_item_call label="着替える" name="replace" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index 07bcefd9b3..f6ce0e6c6c 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
-	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+  <menu label="新しい服装" name="COF.Gear.New_Clothes" />
+  <menu label="新しい身体部位" name="COF.Gear.New_Body_Parts" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
index 0de6a5f22f..ff6884f24d 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="会話を終える" name="close_conversation"/>
-	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
-	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
-	<menu_item_call label="選択した項目を閉じる" name="close_selected_conversations"/>
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="フレンドを追加" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-	<menu_item_call label="グループ情報" name="group_profile"/>
-	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
-	<menu_item_call label="グループから脱退する" name="leave_group"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
-		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
-	</context_menu>
-	<menu_item_call label="メンバーを立入禁止" name="BanMember"/>
-</toggleable_menu>
+  <menu_item_call label="会話を終える" name="close_conversation" />
+  <menu_item_call label="ボイスチャットを始める" name="open_voice_conversation" />
+  <menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice" />
+  <menu_item_call label="選択した項目を閉じる" name="close_selected_conversations" />
+  <menu_item_call label="プロフィールを表示" name="view_profile" />
+  <menu_item_call label="ＩＭ" name="im" />
+  <menu_item_call label="テレポートのオファー" name="offer_teleport" />
+  <menu_item_call label="ボイスコール" name="voice_call" />
+  <menu_item_call label="チャットの履歴…" name="chat_history" />
+  <menu_item_call label="フレンド追加" name="add_friend" />
+  <menu_item_call label="フレンド削除" name="remove_friend" />
+  <menu_item_call label="フレンド削除" name="remove_friends" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_call label="嫌がらせの報告" name="report_abuse" />
+  <menu_item_check label="ボイスをブロック" name="block_unblock" />
+  <menu_item_check label="テキストをブロックする" name="MuteText" />
+  <menu_item_call label="グループのプロフィール" name="group_profile" />
+  <menu_item_call label="このグループをアクティブ化" name="activate_group" />
+  <menu_item_call label="このグループから脱退する" name="leave_group" />
+  <context_menu label="モデレーターのオプション" name="Moderator Options">
+    <menu_item_check label="テキストチャットを許可" name="AllowTextChat" />
+    <menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected" />
+    <menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected" />
+    <menu_item_call label="全員のボイスをミュートする" name="ModerateVoiceMute" />
+    <menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute" />
+  </context_menu>
+  <menu_item_call label="メンバーをバンする" name="BanMember" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
index c9d4f947a4..7e43b8b61f 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="ボイスコール..." name="Call"/>
-	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="Invite"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-</toggleable_menu>
+  <menu_item_call label="ＩＭ…" name="IM" />
+  <menu_item_call label="ボイスコール…" name="Call" />
+  <menu_item_call label="チャットの履歴を開く…" name="Chat history" />
+  <menu_item_call label="プロフィールを表示" name="View Profile" />
+  <menu_item_call label="テレポートのオファー" name="teleport" />
+  <menu_item_call label="フレンド登録" name="add_friend" />
+  <menu_item_call label="フレンドを削除" name="remove_friend" />
+  <menu_item_call label="グループに招待…." name="Invite" />
+  <menu_item_call label="マップ" name="Map" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="支払い" name="Pay" />
+  <menu_item_check label="ブロック・ブロック解除" name="Block/Unblock" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
index bd4812603f..c239eb9543 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
-	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
-</toggleable_menu>
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="日付で並べ替え" name="sort_by_date" />
+  <menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends" />
+  <menu_item_call label="近隣チャットの履歴を表示…" name="view_nearby_chat_history" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
new file mode 100644
index 0000000000..819b05f854
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Color Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
new file mode 100644
index 0000000000..ac211997bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu layout="topleft" name="Copy Paste Features Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
new file mode 100644
index 0000000000..80d7eeff31
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Light Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
new file mode 100644
index 0000000000..ed1491298f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Object Menu">
+  <menu_item_call label="コピー" name="params_copy"/>
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
new file mode 100644
index 0000000000..92e0ec74ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Position Menu">
+  <menu_item_call label="すべてをコピー" name="psr_copy" />
+  <menu_item_call label="位置をコピー" name="pos_copy" />
+  <menu_item_call label="すべてペースト" name="psr_paste" />
+  <menu_item_call label="位置をペースト" name="pos_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
new file mode 100644
index 0000000000..9504f39ef1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Rotation Menu">
+  <menu_item_call label="すべてをコピー" name="psr_copy" />
+  <menu_item_call label="回転をコピー" name="rot_copy" />
+  <menu_item_call label="すべてをペースト" name="psr_paste" />
+  <menu_item_call label="回転をペースト" name="rot_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
new file mode 100644
index 0000000000..1ee1d6a914
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Size Menu">
+  <menu_item_call label="すべてをコピー" name="psr_copy" />
+  <menu_item_call label="サイズをコピー" name="size_copy" />
+  <menu_item_call label="すべてをペースト" name="psr_paste" />
+  <menu_item_call label="サイズをペースト" name="size_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
new file mode 100644
index 0000000000..a596fbe103
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Texture Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml
index c2ef0179b2..0152675de7 100644
--- a/indra/newview/skins/default/xui/ja/menu_edit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_edit.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu label="編集" name="Edit">
-	<menu_item_call label="元に戻す" name="Undo"/>
-	<menu_item_call label="やり直し" name="Redo"/>
-	<menu_item_call label="切り取り" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="複製" name="Duplicate"/>
-	<menu_item_call label="すべて選択" name="Select All"/>
-	<menu_item_call label="選択解除" name="Deselect"/>
-</menu>
+  <menu_item_call label="元に戻す" name="Undo" />
+  <menu_item_call label="やり直し" name="Redo" />
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="複製" name="Duplicate" />
+  <menu_item_call label="すべて選択" name="Select All" />
+  <menu_item_call label="選択解除" name="Deselect" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml
index 4708b1446c..94361555fe 100644
--- a/indra/newview/skins/default/xui/ja/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="テレポート" name="Teleport To Landmark"/>
-	<menu_item_call label="ランドマークを表示・編集" name="Landmark Open"/>
-	<menu_item_call label="SLurl をコピー" name="Copy slurl"/>
-	<menu_item_call label="地図に表示" name="Show On Map"/>
-	<menu_item_call label="コピー" name="Landmark Copy"/>
-	<menu_item_call label="貼り付け" name="Landmark Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-</menu>
+  <menu_item_call label="テレポート" name="Teleport To Landmark" />
+  <menu_item_call label="ランドマークの表示／編集" name="Landmark Open" />
+  <menu_item_call label="ランドマークに移動" name="Move to Landmarks" />
+  <menu_item_call label="マップに表示" name="Show On Map" />
+  <menu_item_call label="SLurlをコピー" name="Copy slurl" />
+  <menu_item_call label="ピックを作成" name="create_pick" />
+  <menu_item_separator />
+  <menu_item_call label="コピー" name="Landmark Copy" />
+  <menu_item_call label="ペースト" name="Landmark Paste" />
+  <menu_item_call label="名前変更" name="rename" />
+  <menu_item_call label="削除" name="Delete" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
index 88c3aee042..2527e373f4 100644
--- a/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
@@ -1,23 +1,35 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit">
-	<menu name="New Clothes" label="新しい洋服">
-		<menu_item_call name="New Skirt" label="新しいスカート"/>
-		<menu_item_call name="New Underpants" label="新しい下着"/>
-		<menu_item_call name="New Undershirt" label="新しい肌着"/>
-		<menu_item_call name="New Shirt" label="新しいシャツ"/>
-		<menu_item_call name="New Pants" label="新しいパンツ"/>
-		<menu_item_call name="New Tattoo" label="新しいタトゥー"/>
-		<menu_item_call name="New Physics" label="新しい体"/>
-		<menu_item_call name="New Jacket" label="新しいジャケット"/>
-		<menu_item_call name="New Shoes" label="新しい靴"/>
-		<menu_item_call name="New Gloves" label="新しいグローブ"/>
-		<menu_item_call name="New Alpha" label="新しいアルファ"/>
-		<menu_item_call name="New Socks" label="新しい靴下"/>
-	</menu>
-	<menu name="New Body Parts" label="新しいボディーパーツ">
-		<menu_item_call name="New Hair" label="新しい髪"/>
-		<menu_item_call name="New Eyes" label="新しい目"/>
-		<menu_item_call name="New Shape" label="新しいシェイプ"/>
-		<menu_item_call name="New Skin" label="新しい皮膚"/>
-	</menu>
-</context_menu>
+  <menu_item_call label="着る－このアウトフィットに着替える" name="wear_replace" />
+  <menu_item_call label="着る－このアウトフィットに追加する" name="wear_add" />
+  <menu_item_call label="脱ぐ－このアウトフィットから取り外す" name="take_off" />
+  <menu_item_call label="画像をアップロード（L$ [UPLOAD_COST]）" name="upload_photo" />
+  <menu_item_call label="画像を選択" name="select_photo" />
+  <menu_item_call label="スナップショットを撮影" name="take_snapshot" />
+  <menu_item_call label="画像を削除" name="remove_photo" />
+  <menu_item_separator name="sepatator1" />
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しいジャケット" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
+    <menu_item_call label="新しいアルファ" name="New Alpha" />
+    <menu_item_call label="新しい物理作用" name="New Physics" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ" name="New Shape" />
+    <menu_item_call label="新しい肌" name="New Skin" />
+    <menu_item_call label="新しい髪型" name="New Hair" />
+    <menu_item_call label="新しい目" name="New Eyes" />
+  </menu>
+  <menu_item_separator name="sepatator2" />
+  <menu_item_call label="アウトフィットを編集" name="edit" />
+  <menu_item_call label="アウトフィットの名前変更" name="rename" />
+  <menu_item_call label="アウトフィットを削除" name="delete" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
index 3eacfb3507..333db46380 100644
--- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_gesture_gear">
-	<menu_item_call label="選択したジェスチャーのアクティベートの有無" name="activate"/>
-	<menu_item_call label="コピー" name="copy_gesture"/>
-	<menu_item_call label="貼り付け" name="paste"/>
-	<menu_item_call label="UUID をコピー" name="copy_uuid"/>
-	<menu_item_call label="現在のアウトフィットに保存" name="save_to_outfit"/>
-	<menu_item_call label="編集" name="edit_gesture"/>
-	<menu_item_call label="調べる" name="inspect"/>
-</menu>
+  <menu_item_call label="選択したジェスチャーの有効化／無効化" name="activate" />
+  <menu_item_call label="名前変更" name="rename" />
+  <menu_item_call label="コピー" name="copy_gesture" />
+  <menu_item_call label="ペースト" name="paste" />
+  <menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid" />
+  <menu_item_call label="現在のアウトフィットに保存" name="save_to_outfit" />
+  <menu_item_call label="編集" name="edit_gesture" />
+  <menu_item_call label="調べる" name="inspect" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
index 3787f7d645..52cc5e69e1 100644
--- a/indra/newview/skins/default/xui/ja/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-	<menu_item_call label="グループに参加..." name="item_join"/>
-	<menu_item_call label="新しいグループ..." name="item_new"/>
-</menu>
+  <menu_item_call label="グループに参加…" name="item_join" />
+  <menu_item_call label="新しいグループ…" name="item_new" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
index 2e633ae1b2..3a9fb3570a 100644
--- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_navbar_menu">
-	<menu_item_check label="ナビゲーションバーとお気に入りバーを表示" name="ShowNavbarNavigationPanel"/>
-	<menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
-	<menu_item_check label="「場所」のミニフィールドを表示" name="ShowMiniLocationPanel"/>
-</menu>
+  <menu_item_check label="ナビゲーションバーとお気に入りバーを表示" name="ShowNavbarNavigationPanel" />
+  <menu_item_check label="「場所」のミニフィールドを表示" name="ShowMiniLocationPanel" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
index 55cd6610f7..8899b69f1a 100644
--- a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-</toggleable_menu>
+  <menu_item_call label="プロフィールを表示" name="View Profile" />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="フレンドを削除" name="remove_friend" />
+  <menu_item_call label="テレポートをオファー" name="offer_teleport" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_call label="チャットの履歴…" name="chat_history" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="支払い" name="Pay" />
+  <menu_item_call label="迷惑行為の報告" name="Report Abuse" />
+  <menu_item_check label="ボイスのブロック／解除" name="Block/Unblock" />
+  <menu_item_check label="テキストをブロックする" name="MuteText" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
index 222a741718..5ef2a4152a 100644
--- a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_modes">
-	<menu_item_check label="簡略表示" name="compact_view"/>
-	<menu_item_check label="詳細表示" name="expanded_view"/>
-	<menu_item_check label="時間を表示" name="IMShowTime"/>
-	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
+  <menu_item_check label="簡易表示" name="compact_view" />
+  <menu_item_check label="詳細表示" name="expanded_view" />
+  <menu_item_check label="時間を表示" name="IMShowTime" />
+  <menu_item_check label="１対１の会話で名前を表示" name="IMShowNamesForP2PConv" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
index 8cd6fa4a27..26b581b793 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet AdHoc Menu">
-	<menu_item_call label="セッション終了" name="End Session"/>
-</menu>
+  <menu_item_call label="セッション終了" name="End Session" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
index 5bcb96f083..7ae8765df4 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet Group Menu">
-	<menu_item_call label="グループ情報" name="Show Profile"/>
-	<menu_item_call label="セッションを表示" name="Chat"/>
-	<menu_item_call label="セッション終了" name="End Session"/>
-</menu>
+  <menu_item_call label="プロフィールを表示" name="Show Profile" />
+  <menu_item_call label="セッションを表示" name="Chat" />
+  <menu_item_call label="セッション終了" name="End Session" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
index 5453f998fa..61a9bae73c 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet P2P Menu">
-	<menu_item_call label="プロフィールの表示" name="Show Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="セッションを表示" name="Send IM"/>
-	<menu_item_call label="セッション終了" name="End Session"/>
-</menu>
+  <menu_item_call label="プロフィールの表示" name="Show Profile" />
+  <menu_item_call label="フレンドに追加" name="Add Friend" />
+  <menu_item_call label="セッションを表示" name="Send IM" />
+  <menu_item_call label="セッション終了" name="End Session" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
index 5a0519ba19..ec5abea6b2 100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <toggleable_menu name="Gear Menu">
-	<menu_item_call label="触る" name="touch"/>
-	<menu_item_call label="座る" name="sit"/>
-	<menu_item_call label="支払う" name="pay"/>
-	<menu_item_call label="買う" name="buy"/>
-	<menu_item_call label="取る" name="take"/>
-	<menu_item_call label="コピーを取る" name="take_copy"/>
-	<menu_item_call label="開く" name="open"/>
-	<menu_item_call label="編集" name="edit"/>
-	<menu_item_call label="装着" name="wear"/>
-	<menu_item_call label="追加" name="add"/>
-	<menu_item_call label="報告" name="report"/>
-	<menu_item_call label="ブロック" name="block"/>
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="削除" name="remove"/>
-	<menu_item_call label="詳細" name="more_info"/>
-</toggleable_menu>
+  <menu_item_call label="触る" name="touch" />
+  <menu_item_call label="座る" name="sit" />
+  <menu_item_call label="支払う" name="pay" />
+  <menu_item_call label="買う" name="buy" />
+  <menu_item_call label="取る" name="take" />
+  <menu_item_call label="コピーを取る" name="take_copy" />
+  <menu_item_call label="開く" name="open" />
+  <menu_item_call label="編集" name="edit" />
+  <menu_item_call label="装着" name="wear" />
+  <menu_item_call label="追加" name="add" />
+  <menu_item_call label="報告" name="report" />
+  <menu_item_call label="ブロック" name="block" />
+  <menu_item_call label="ブロック解除" name="unblock" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="削除" name="remove" />
+  <menu_item_call label="詳細" name="more_info" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
index 9a4a8138f5..d9642e3c0c 100644
--- a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="InvOfferChiclet Menu">
-	<menu_item_call label="閉じる" name="Close"/>
-</menu>
+  <menu_item_call label="閉じる" name="Close" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 7f68c18e0b..f25c32c084 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -1,117 +1,133 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="リストを作成" name="Marketplace Create Listing"/>
-	<menu_item_call label="リストを関連付け" name="Marketplace Associate Listing"/>
-	<menu_item_call label="リストを取得 (更新)" name="Marketplace Get Listing"/>
-	<menu_item_call label="エラーを確認" name="Marketplace Check Listing"/>
-	<menu_item_call label="リストを編集" name="Marketplace Edit Listing"/>
-	<menu_item_call label="リスト" name="Marketplace List"/>
-	<menu_item_call label="リストから取り除く" name="Marketplace Unlist"/>
-	<menu_item_call label="有効にする" name="Marketplace Activate"/>
-	<menu_item_call label="無効にする" name="Marketplace Deactivate"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="開く" name="Task Open"/>
-	<menu_item_call label="再生" name="Task Play"/>
-	<menu_item_call label="プロパティ" name="Task Properties"/>
-	<menu_item_call label="名前の変更" name="Task Rename"/>
-	<menu_item_call label="削除" name="Task Remove"/>
-	<menu_item_call label="ごみ箱を空にする" name="Empty Trash"/>
-	<menu_item_call label="紛失物フォルダを空にする" name="Empty Lost And Found"/>
-	<menu_item_call label="新しいフォルダ" name="New Folder"/>
-	<menu_item_call label="新しいスクリプト" name="New Script"/>
-	<menu_item_call label="新しいノートカード" name="New Note"/>
-	<menu_item_call label="新しいジェスチャー" name="New Gesture"/>
-	<menu label="新しい衣類" name="New Clothes">
-		<menu_item_call label="新しいシャツ" name="New Shirt"/>
-		<menu_item_call label="新しいズボン" name="New Pants"/>
-		<menu_item_call label="新しい靴" name="New Shoes"/>
-		<menu_item_call label="新しい靴下" name="New Socks"/>
-		<menu_item_call label="新しいジャケット" name="New Jacket"/>
-		<menu_item_call label="新しいスカート" name="New Skirt"/>
-		<menu_item_call label="新しい手袋" name="New Gloves"/>
-		<menu_item_call label="新しい下着" name="New Undershirt"/>
-		<menu_item_call label="新しいパンツ" name="New Underpants"/>
-		<menu_item_call label="新しいアルファマスク" name="New Alpha Mask"/>
-		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
-		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
-		<menu_item_call label="新規の物理作用" name="New Physics"/>
-	</menu>
-	<menu label="新しい身体部位" name="New Body Parts">
-		<menu_item_call label="新しいシェイプ(体型)" name="New Shape"/>
-		<menu_item_call label="新しいスキン" name="New Skin"/>
-		<menu_item_call label="新しい髪" name="New Hair"/>
-		<menu_item_call label="新しい眼" name="New Eyes"/>
-	</menu>
-	<menu label="新しい設定" name="New Settings">
-		<menu_item_call label="新しい空" name="New Sky"/>
-		<menu_item_call label="新しい水" name="New Water"/>
-		<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
-	</menu>
-	<menu label="次のデフォルトとして使用" name="upload_def">
-		<menu_item_call label="画像のアップロード" name="Image uploads"/>
-		<menu_item_call label="サウンドのアップロード" name="Sound uploads"/>
-		<menu_item_call label="アニメーションのアップロード" name="Animation uploads"/>
-		<menu_item_call label="モデルのアップロード" name="Model uploads"/>
-	</menu>
-	<menu label="種類を変更" name="Change Type">
-		<menu_item_call label="デフォルト" name="Default"/>
-		<menu_item_call label="手袋" name="Gloves"/>
-		<menu_item_call label="ジャケット" name="Jacket"/>
-		<menu_item_call label="パンツ" name="Pants"/>
-		<menu_item_call label="シェイプ" name="Shape"/>
-		<menu_item_call label="靴" name="Shoes"/>
-		<menu_item_call label="シャツ" name="Shirt"/>
-		<menu_item_call label="スカート" name="Skirt"/>
-		<menu_item_call label="下着パンツ" name="Underpants"/>
-		<menu_item_call label="下着シャツ" name="Undershirt"/>
-	</menu>
-	<menu_item_call label="テレポート" name="Landmark Open"/>
-	<menu_item_call label="開く" name="Animation Open"/>
-	<menu_item_call label="開く" name="Sound Open"/>
-	<menu_item_call label="着用中のアウトフィットを入れ替える" name="Replace Outfit"/>
-	<menu_item_call label="着用中のアウトフィットに追加する" name="Add To Outfit"/>
-	<menu_item_call label="着用中のアウトフィットから取り除く" name="Remove From Outfit"/>
-	<menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="Copy outfit list to clipboard"/>
-	<menu_item_call label="オリジナルを探す" name="Find Original"/>
-	<menu_item_call label="アイテムを除外する" name="Purge Item"/>
-	<menu_item_call label="アイテムを復元する" name="Restore Item"/>
-	<menu_item_call label="開く" name="Open"/>
-	<menu_item_call label="オリジナルを開きます" name="Open Original"/>
-	<menu_item_call label="プロパティ" name="Properties"/>
-	<menu_item_call label="名前を変更する" name="Rename"/>
-	<menu_item_call label="UUID をコピーする" name="Copy Asset UUID"/>
-	<menu_item_call label="メイン画面で表示する" name="Show in Main Panel"/>
-	<menu_item_call label="カット" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="リンクを貼り付ける" name="Paste As Link"/>
-	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="システムフォルダを削除する" name="Delete System Folder"/>
-	<menu_item_call label="コンファレンスチャットを開始する" name="Conference Chat Folder"/>
-	<menu_item_call label="再生する" name="Sound Play"/>
-	<menu_item_call label="SLurl をコピー" name="url_copy"/>
-	<menu_item_call label="ランドマークの情報" name="About Landmark"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="インワールドで再生する" name="Animation Play"/>
-	<menu_item_call label="ローカルで再生する" name="Animation Audition"/>
-	<menu_item_call label="インスタントメッセージを送信する" name="Send Instant Message"/>
-	<menu_item_call label="テレポートを送る..." name="Offer Teleport..."/>
-	<menu_item_call label="コンファレンスチャットを開始する" name="Conference Chat"/>
-	<menu_item_call label="アクティブ" name="Activate"/>
-	<menu_item_call label="非アクティブ" name="Deactivate"/>
-	<menu_item_call label="別名で保存する" name="Save As"/>
-	<menu_item_call label="自分から取り外す" name="Detach From Yourself"/>
-	<menu_item_call label="装着" name="Wearable And Object Wear"/>
-	<menu label="装着先" name="Attach To"/>
-	<menu label="HUD 装着先" name="Attach To HUD"/>
-	<menu_item_call label="触る" name="Attachment Touch" />
-	<menu_item_call label="編集" name="Wearable Edit"/>
-	<menu_item_call label="追加" name="Wearable Add"/>
-	<menu_item_call label="取り外す" name="Take Off"/>
-	<menu_item_call label="自分にのみ適用" name="Settings Apply Local"/>
-	<menu_item_call label="区画に適用" name="Settings Apply Parcel"/>
-	<menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy"/>
-	<menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move"/>
-	<menu_item_call label="－－オプションなし－－" name="--no options--"/>
-</menu>
+  <menu_item_call label="リストを作成" name="Marketplace Create Listing" />
+  <menu_item_call label="リストを関連付け" name="Marketplace Associate Listing" />
+  <menu_item_call label="リストを取得 (更新)" name="Marketplace Get Listing" />
+  <menu_item_call label="エラーを確認" name="Marketplace Check Listing" />
+  <menu_item_call label="リストを編集" name="Marketplace Edit Listing" />
+  <menu_item_call label="リスト" name="Marketplace List" />
+  <menu_item_call label="リストから取り除く" name="Marketplace Unlist" />
+  <menu_item_call label="有効に" name="Marketplace Activate" />
+  <menu_item_call label="無効に" name="Marketplace Deactivate" />
+  <menu_item_separator name="Marketplace Listings Separator" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="開く" name="Task Open" />
+  <menu_item_call label="再生" name="Task Play" />
+  <menu_item_call label="プロパティ" name="Task Properties" />
+  <menu_item_call label="名前の変更" name="Task Rename" />
+  <menu_item_call label="削除" name="Task Remove" />
+  <menu_item_call label="ごみ箱を空に" name="Empty Trash" />
+  <menu_item_call label="遺失物フォルダを空に" name="Empty Lost And Found" />
+  <menu_item_call label="新しいフォルダ" name="New Folder" />
+  <menu_item_call label="新しいアウトフィット" name="New Outfit" />
+  <menu_item_call label="新しいスクリプト" name="New Script" />
+  <menu_item_call label="新しいノートカード" name="New Note" />
+  <menu_item_call label="新しいジェスチャー" name="New Gesture" />
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しいジャケット" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下）" name="New Underpants" />
+    <menu_item_call label="新しいアルファマスク" name="New Alpha Mask" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+    <menu_item_call label="新しいユニバーサル" name="New Universal" />
+    <menu_item_call label="新規の物理作用" name="New Physics" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ(体型)" name="New Shape" />
+    <menu_item_call label="新しいスキン" name="New Skin" />
+    <menu_item_call label="新しい髪" name="New Hair" />
+    <menu_item_call label="新しい眼" name="New Eyes" />
+  </menu>
+  <menu label="新しい設定" name="New Settings">
+    <menu_item_call label="新しい空" name="New Sky" />
+    <menu_item_call label="新しい水" name="New Water" />
+    <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
+  </menu>
+  <menu label="次のデフォルトとして使用" name="upload_def">
+    <menu_item_call label="画像のアップロード" name="Image uploads" />
+    <menu_item_call label="サウンドのアップロード" name="Sound uploads" />
+    <menu_item_call label="アニメーションのアップロード" name="Animation uploads" />
+    <menu_item_call label="モデルのアップロード" name="Model uploads" />
+  </menu>
+  <menu label="種類を変更" name="Change Type">
+    <menu_item_call label="デフォルト" name="Default" />
+    <menu_item_call label="手袋" name="Gloves" />
+    <menu_item_call label="上着" name="Jacket" />
+    <menu_item_call label="ズボン" name="Pants" />
+    <menu_item_call label="シェイプ" name="Shape" />
+    <menu_item_call label="靴" name="Shoes" />
+    <menu_item_call label="シャツ" name="Shirt" />
+    <menu_item_call label="スカート" name="Skirt" />
+    <menu_item_call label="下着（上半身）" name="Underpants" />
+    <menu_item_call label="下着（下半身）" name="Undershirt" />
+  </menu>
+  <menu_item_call label="テレポート" name="Landmark Open" />
+  <menu_item_call label="開く" name="Animation Open" />
+  <menu_item_call label="開く" name="Sound Open" />
+  <menu_item_call label="着用中のアウトフィットと入れ替え" name="Replace Outfit" />
+  <menu_item_call label="着用中のアウトフィットに追加" name="Add To Outfit" />
+  <menu_item_call label="着用中のアウトフィットから取り外す" name="Remove From Outfit" />
+  <menu_item_call label="アウトフィット一覧をクリップボードにコピー" name="Copy outfit list to clipboard" />
+  <menu_item_separator name="Outfit Separator" />
+  <menu_item_call label="オリジナルを探す" name="Find Original" />
+  <menu_item_call label="アイテムを除外" name="Purge Item" />
+  <menu_item_call label="アイテムを復元" name="Restore Item" />
+  <menu_item_call label="開く" name="Open" />
+  <menu_item_call label="オリジナルを開く" name="Open Original" />
+  <menu_item_call label="プロパティ" name="Properties" />
+  <menu_item_call label="名前を変更" name="Rename" />
+  <menu_item_call label="アセットのＵＵＩＤをコピー" name="Copy Asset UUID" />
+  <menu_item_call label="メインパネルで表示" name="Show in Main Panel" />
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="リンクとしてペースト" name="Paste As Link" />
+  <menu_item_call label="リンクを置き換える" name="Replace Links" />
+  <menu_item_separator name="Paste Separator" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="システムフォルダを削除" name="Delete System Folder" />
+  <menu_item_separator />
+  <menu_item_separator />
+  <menu_item_call label="会話チャットを開始" name="Conference Chat Folder" />
+  <menu_item_call label="再生" name="Sound Play" />
+  <menu_item_call label="SLurlをコピー" name="url_copy" />
+  <menu_item_call label="ランドマークの情報" name="About Landmark" />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator name="Animation Separator" />
+  <menu_item_call label="インワールドで再生" name="Animation Play" />
+  <menu_item_call label="ローカルで再生" name="Animation Audition" />
+  <menu_item_call label="インスタントメッセージを送信" name="Send Instant Message" />
+  <menu_item_call label="テレポートをオファー…" name="Offer Teleport..." />
+  <menu_item_call label="テレポートをリクエスト…" name="Request Teleport..." />
+  <menu_item_call label="会話チャットを開始" name="Conference Chat" />
+  <menu_item_call label="有効化" name="Activate" />
+  <menu_item_call label="無効化" name="Deactivate" />
+  <menu_item_call label="名前をつけて保存" name="Save As" />
+  <menu_item_call label="選択を名前をつけて保存" layout="topleft" name="Save Selected As" />
+  <menu_item_separator name="Wearable And Object Separator" />
+  <!-- COMMENTED OUT for DEV-32347 -->
+  <!--
+  <menu_item_call label="最後の場所へリストア" name="Restore to Last Position" />
+  -->
+  <menu_item_call label="装着" name="Wearable And Object Wear" />
+  <menu label="装着先" name="Attach To" />
+  <menu label="HUD 装着先" name="Attach To HUD" />
+  <menu_item_call label="触る" name="Attachment Touch" />
+  <menu_item_call label="編集" name="Wearable Edit" />
+  <menu_item_call label="追加" name="Wearable Add" />
+  <menu_item_call label="取り外す" name="Detach From Yourself" />
+  <menu_item_call label="脱ぐ" name="Take Off" />
+  <menu_item_separator name="Settings Separator" />
+  <menu_item_call label="自分にのみ適用" name="Settings Apply Local" />
+  <menu_item_call label="区画に適用" name="Settings Apply Parcel" />
+  <menu_item_separator layout="topleft" />
+  <menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy" />
+  <menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move" />
+  <menu_item_call label="－オプションなし－" name="--no options--" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index eecf166a70..3f43469c6f 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_inventory_add">
-	<menu label="アップロード" name="upload">
-		<menu_item_call label="画像 （L$ [COST] ）..." name="Upload Image"/>
-		<menu_item_call label="サウンド （L$[COST] ）..." name="Upload Sound"/>
-		<menu_item_call label="アニメーション （L$ [COST] ）..." name="Upload Animation"/>
-		<menu_item_call label="モデル" name="Upload Model"/>
-		<menu_item_call label="一括 （ファイルにつき L$[COST] ）..." name="Bulk Upload"/>
-	</menu>
-	<menu_item_call label="新規フォルダ" name="New Folder"/>
-	<menu_item_call label="新規スクリプト" name="New Script"/>
-	<menu_item_call label="新しいノートカード" name="New Note"/>
-	<menu_item_call label="新規ジェスチャー" name="New Gesture"/>
-	<menu label="新しい衣類" name="New Clothes">
-		<menu_item_call label="新しいシャツ" name="New Shirt"/>
-		<menu_item_call label="新しいパンツ" name="New Pants"/>
-		<menu_item_call label="新しい靴" name="New Shoes"/>
-		<menu_item_call label="新しい靴下" name="New Socks"/>
-		<menu_item_call label="新しいジャケット" name="New Jacket"/>
-		<menu_item_call label="新しいスカート" name="New Skirt"/>
-		<menu_item_call label="新しい手袋" name="New Gloves"/>
-		<menu_item_call label="新しい下着（上）" name="New Undershirt"/>
-		<menu_item_call label="新しい下着（下）" name="New Underpants"/>
-		<menu_item_call label="新しいアルファ" name="New Alpha"/>
-		<menu_item_call label="新しいタトゥー" name="New Tattoo"/>
-		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
-		<menu_item_call label="新規の物理作用" name="New Physics"/>
-	</menu>
-	<menu label="新しい身体部位" name="New Body Parts">
-		<menu_item_call label="新しいシェイプ（体型）" name="New Shape"/>
-		<menu_item_call label="新しいスキン" name="New Skin"/>
-		<menu_item_call label="新しい髪" name="New Hair"/>
-		<menu_item_call label="新しい目" name="New Eyes"/>
-	</menu>
-	<menu label="新しい設定" name="New Settings">
-		<menu_item_call label="新しい空" name="New Sky"/>
-		<menu_item_call label="新しい水" name="New Water"/>
-		<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
-	</menu>
-</menu>
+  <menu label="アップロード" name="upload">
+    <menu_item_call label="画像 （L$ [COST]）…" name="Upload Image" />
+    <menu_item_call label="サウンド （L$ [COST]）…" name="Upload Sound" />
+    <menu_item_call label="アニメーション （L$ [COST]）…" name="Upload Animation" />
+    <menu_item_call label="モデル" name="Upload Model" />
+    <menu_item_call label="一括 （ファイルにつき L$ [COST]）…" name="Bulk Upload" />
+  </menu>
+  <menu_item_call label="新規フォルダ" name="New Folder" />
+  <menu_item_call label="新規スクリプト" name="New Script" />
+  <menu_item_call label="新しいノートカード" name="New Note" />
+  <menu_item_call label="新規ジェスチャー" name="New Gesture" />
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しいジャケット" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
+    <menu_item_call label="新しいアルファ" name="New Alpha" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+    <menu_item_call label="新しいユニバーサル" name="New Universal" />
+    <menu_item_call label="新しい物理作用" name="New Physics" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ（体型）" name="New Shape" />
+    <menu_item_call label="新しいスキン" name="New Skin" />
+    <menu_item_call label="新しい髪" name="New Hair" />
+    <menu_item_call label="新しい目" name="New Eyes" />
+  </menu>
+  <menu label="新しい環境設定" name="New Settings">
+    <menu_item_call label="新しい空" name="New Sky" />
+    <menu_item_call label="新しい水" name="New Water" />
+    <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
+  </menu>
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
index ad60b0d01f..7a8adcb9fb 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gear_default">
-	<menu_item_call label="新しいインベントリウィンドウ" name="new_window"/>
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
-	<menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/>
-	<menu_item_check label="システムフォルダを上にソートする" name="sort_system_folders_to_top"/>
-	<menu_item_call label="フィルターを表示..." name="show_filters"/>
-	<menu_item_call label="フィルターをリセット" name="reset_filters"/>
-	<menu_item_call label="すべてのフォルダを閉じる" name="close_folders"/>
-	<menu_item_call label="紛失物を空にする" name="empty_lostnfound"/>
-	<menu_item_call label="別名でテクスチャを保存" name="Save Texture As"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="オリジナルを表示" name="Find Original"/>
-	<menu_item_call label="すべてのリンクを表示" name="Find All Links"/>
-	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
-	<menu_item_call label="ごみ箱を空にする" name="empty_trash"/>
-</toggleable_menu>
+  <menu_item_call label="新しいインベントリウィンドウ" name="new_window" />
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="新しい順に並べ替え" name="sort_by_recent" />
+  <menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name" />
+  <menu_item_check label="システムフォルダを上にソートする" name="sort_system_folders_to_top" />
+  <menu_item_separator />
+  <menu_item_call label="フィルタを表示…" name="show_filters" />
+  <menu_item_call label="フィルタをリセット" name="reset_filters" />
+  <menu_item_call label="すべてのフォルダを閉じる" name="close_folders" />
+  <menu_item_separator />
+  <menu_item_call label="遺失物を空にする" name="empty_lostnfound" />
+  <menu_item_call label="別名でテクスチャを保存" name="Save Texture As" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="オリジナルを表示" name="Find Original" />
+  <menu_item_call label="すべてのリンクを表示" name="Find All Links" />
+  <menu_item_call label="リンクを置き換える" name="Replace Links" />
+  <menu_item_separator />
+  <menu_item_call label="ごみ箱を空にする" name="empty_trash" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
new file mode 100644
index 0000000000..f76be9631a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_search_visibility">
+  <menu_item_check label="ゴミ箱を検索" name="search_trash"/>
+  <menu_item_check label="ライブラリを検索" name="search_library"/>
+  <menu_item_separator />
+  <menu_item_check label="リンクを含む" name="include_links"/>
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
index 3754bd7fa4..a65504b14c 100644
--- a/indra/newview/skins/default/xui/ja/menu_land.xml
+++ b/indra/newview/skins/default/xui/ja/menu_land.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Land Pie">
-	<menu_item_call label="土地情報" name="Place Information..."/>
-	<menu_item_call label="ここに座る" name="Sit Here"/>
-	<menu_item_call label="この土地を購入" name="Land Buy"/>
-	<menu_item_call label="入場許可を購入" name="Land Buy Pass"/>
-	<menu_item_call label="制作" name="Create"/>
-	<menu_item_call label="地形を編集" name="Edit Terrain"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="土地情報…" name="Place Information..." />
+  <!--
+  <menu_item_call label="ホームへ" name="Go Here" />
+  -->
+  <menu_item_call label="ここに座る" name="Sit Here" />
+  <menu_item_call label="この土地を購入" name="Land Buy" />
+  <menu_item_call label="入場許可を購入" name="Land Buy Pass" />
+  <menu_item_call label="作成" name="Create" />
+  <menu_item_call label="地形を編集" name="Edit Terrain" />
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
index c134422955..06345c5074 100644
--- a/indra/newview/skins/default/xui/ja/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="landmark_overflow_menu">
-	<menu_item_call label="SLurl をコピー" name="copy"/>
-	<menu_item_call label="削除" name="delete"/>
-	<menu_item_call label="ピックを作成" name="pick"/>
-	<menu_item_call label="お気に入りバーに追加" name="add_to_favbar"/>
-</toggleable_menu>
+  <menu_item_call label="SLurl をコピー" name="copy" />
+  <menu_item_call label="削除" name="delete" />
+  <menu_item_call label="ピックを作成" name="pick" />
+  <menu_item_call label="お気に入りバーに追加" name="add_to_favbar" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index 61b473858b..5ba2092648 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-	<menu label="ミー" name="File">
-		<menu_item_call label="環境設定..." name="Preferences..."/>
-		<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
-		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
-		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
-	</menu>
-	<menu label="ヘルプ" name="Help">
-		<menu_item_call label="ハウツー..." name="How To"/>
-		<menu_item_call label="クイックスタート" name="Quickstart"/>
-		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="コミュニティ フォーラム" name="Community Forums"/>
-		<menu_item_call label="日本語サポートページ" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
-		<menu_item_call label="バグを報告する" name="Report Bug"/>
-		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
-	</menu>
-	<menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu"/>
-	<menu label="デバッグ" name="Debug">
-		<menu_item_call label="デバッグ設定を表示" name="Debug Settings"/>
-		<menu_item_call label="XUI プレビューツール" name="UI Preview Tool"/>
-		<menu label="UI テスト" name="UI Tests"/>
-		<menu_item_call label="ウィンドウのサイズを設定..." name="Set Window Size..."/>
-		<menu_item_call label="利用規約を表示" name="TOS"/>
-		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
-		<menu_item_call label="メディアブラウザ" name="Media Browser"/>
-		<menu label="ログレベルを設定" name="Set Logging Level">
-			<menu_item_check label="デバッグ" name="Debug"/>
-			<menu_item_check label="情報" name="Info"/>
-			<menu_item_check label="警告" name="Warning"/>
-			<menu_item_check label="エラー" name="Error"/>
-			<menu_item_check label="なし" name="None"/>
-		</menu>
-		<menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/>
-	</menu>
-</menu_bar>
+  <menu label="私" name="File">
+    <menu_item_call label="初期設定…" name="Preferences..." />
+    <menu_item_call label="ウィンドウを閉じる" name="Close Window" />
+    <menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker" />
+    <menu_item_call label="[APP_NAME]を終了" name="Quit" />
+  </menu>
+  <menu label="ヘルプ" name="Help">
+    <menu_item_call label="ハウツー…" name="How To" />
+    <menu_item_call label="クイックスタート" name="Quickstart" />
+    <menu_item_call label="ナレッジベース" name="Knowledge Base" />
+    <menu_item_call label="Wiki" name="Wiki" />
+    <menu_item_call label="コミュニティ フォーラム" name="Community Forums" />
+    <menu_item_call label="日本語サポートページ" name="Support portal" />
+    <menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News" />
+    <menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs" />
+    <menu_item_call label="バグを報告する" name="Report Bug" />
+    <menu_item_call label="[APP_NAME]について" name="About Second Life" />
+  </menu>
+  <menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu" />
+  <menu label="デバッグ" name="Debug">
+    <menu_item_call label="デバッグ設定を表示" name="Debug Settings" />
+    <menu_item_call label="XUIプレビューツール" name="UI Preview Tool" />
+    <menu label="UI テスト" name="UI Tests" />
+    <menu_item_call label="ウィンドウのサイズを設定…" name="Set Window Size..." />
+    <menu_item_call label="利用規約を表示" name="TOS" />
+    <menu_item_call label="クリティカルメッセージを表示" name="Critical" />
+    <menu_item_call label="メディアブラウザ" name="Media Browser" />
+    <menu label="ログレベルを設定" name="Set Logging Level">
+      <menu_item_check label="デバッグ" name="Debug" />
+      <menu_item_check label="情報" name="Info" />
+      <menu_item_check label="警告" name="Warning" />
+      <menu_item_check label="エラー" name="Error" />
+      <menu_item_check label="なし" name="None" />
+    </menu>
+    <menu_item_call label="通知コンソールを表示する" name="Show Notifications Console" />
+  </menu>
+</menu_bar>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
index bf38075556..6c6913db5d 100644
--- a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
-	<menu_item_check label="名前による並べ替え" name="sort_by_name"/>
-	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
-	<menu_item_check label="在庫高順に並べ替え (低から高へ)" name="sort_by_stock_amount"/>
-	<menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders"/>
-</toggleable_menu>
+  <menu_item_check label="名前による並べ替え" name="sort_by_name" />
+  <menu_item_check label="新しい順に並べ替え" name="sort_by_recent" />
+  <menu_item_check label="在庫数順に並べ替え (低から高へ)" name="sort_by_stock_amount" />
+  <menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
index faae4ef717..6f4f4938f4 100644
--- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="media ctrl context menu">
-	<menu_item_call label="カット" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="ウェブインスペクターを開く" name="open_webinspector"/>
-</context_menu>
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_separator name="debug_separator" />
+  <menu_item_call label="Webインスペクターを開く" name="open_webinspector" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index 2e733ee24b..77a2e60cda 100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="ズーム（近）" name="Zoom Close"/>
-	<menu_item_call label="ズーム（中）" name="Zoom Medium"/>
-	<menu_item_call label="ズーム（遠）" name="Zoom Far"/>
-	<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
-	<menu_item_check label="地図を回転" name="Rotate Map"/>
-	<menu_item_check label="中央へ自動移動" name="Auto Center"/>
-	<menu_item_call label="追跡をやめる" name="Stop Tracking"/>
-	<menu_item_call label="世界地図" name="World Map"/>
-</menu>
+  <menu_item_call label="ズーム（近）" name="Zoom Close" />
+  <menu_item_call label="ズーム（中）" name="Zoom Medium" />
+  <menu_item_call label="ズーム（遠）" name="Zoom Far" />
+  <menu_item_call label="ズーム（デフォルト）" name="Zoom Default" />
+  <menu_item_check label="マップを回転" name="Rotate Map" />
+  <menu_item_check label="中央へ自動移動" name="Auto Center" />
+  <menu_item_call label="追跡をやめる" name="Stop Tracking" />
+  <menu_item_call label="ワールドマップ" name="World Map" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
index 43f86e84bf..f35e74afc5 100644
--- a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="model_menu_gear_default">
-	<menu_item_check label="稜を表示" name="show_edges"/>
-	<menu_item_check label="物理効果を表示" name="show_physics"/>
-	<menu_item_check label="テクスチャを表示" name="show_textures"/>
-	<menu_item_check label="スキンの重さを表示" name="show_skin_weight"/>
-	<menu_item_check label="ジョイントポジションを表示" name="show_joint_positions"/>
-</toggleable_menu>
+  <menu_item_check label="縁を表示" name="show_edges" />
+  <menu_item_check label="物理効果を表示" name="show_physics" />
+  <menu_item_check label="テクスチャを表示" name="show_textures" />
+  <menu_item_check label="スキンのウエイトを表示" name="show_skin_weight" />
+  <menu_item_check label="ジョイントポジションを表示" name="show_joint_positions" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
index 8dab025309..38b736ae9b 100644
--- a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Mute Particle Pie">
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
index 9ae2e58198..f3e274313e 100644
--- a/indra/newview/skins/default/xui/ja/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Navbar Menu">
-	<menu_item_check label="座標を表示" name="Show Coordinates"/>
-	<menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/>
-	<menu_item_call label="ランドマーク" name="Landmark"/>
-	<menu_item_call label="切り取り" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="すべて選択" name="Select All"/>
-</menu>
+  <menu_item_check label="座標を表示" name="Show Coordinates" />
+  <menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties" />
+  <menu_item_call label="ランドマーク" name="Landmark" />
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="すべて選択" name="Select All" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
index c2e4a27686..42a6c66168 100644
--- a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="NearBy Chat Menu">
-	<menu_item_call label="近くの人を表示する..." name="nearby_people"/>
-	<menu_item_check label="ブロックされた文字を表示" name="muted_text"/>
-	<menu_item_check label="バディアイコンを表示" name="show_buddy_icons"/>
-	<menu_item_check label="名前を表示" name="show_names"/>
-	<menu_item_check label="アイコンと名前を表示" name="show_icons_and_names"/>
-	<menu_item_call label="文字の大きさ" name="font_size"/>
-</menu>
+  <menu_item_call label="近隣の人物を表示する…" name="nearby_people" />
+  <menu_item_separator />
+  <menu_item_check label="ブロックされた文字を表示" name="muted_text" />
+  <menu_item_separator />
+  <menu_item_check label="バディアイコンを表示" name="show_buddy_icons" />
+  <menu_item_check label="名前を表示" name="show_names" />
+  <menu_item_check label="アイコンと名前を表示" name="show_icons_and_names" />
+  <menu_item_separator />
+  <menu_item_call label="文字の大きさ" name="font_size" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
index 913bae8958..3852efcdd4 100644
--- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="すべて閉じる" name="Close All"/>
-</context_menu>
+  <menu_item_call label="すべて閉じる" name="Close All" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 8da1d5d000..2a1dd7f648 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Object Pie">
-	<menu_item_call label="触る" name="Object Touch">
-		<menu_item_call.on_enable name="EnableTouch" parameter="触る"/>
-	</menu_item_call>
-	<menu_item_call label="編集" name="Edit..."/>
-	<menu_item_call label="制作" name="Build"/>
-	<menu_item_call label="開く" name="Open"/>
-	<menu_item_call label="ここに座る" name="Object Sit"/>
-	<menu_item_call label="立ち上がる" name="Object Stand Up"/>
-	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
-	<menu_item_call label="ズームイン" name="Zoom In"/>
-	<menu_item_call label="リンクセットで表示" name="show_in_linksets"/>
-	<menu_item_call label="キャラクターで表示" name="show_in_characters"/>
-	<context_menu label="装着" name="Put On">
-		<menu_item_call label="装着" name="Wear"/>
-		<menu_item_call label="追加" name="Add"/>
-		<context_menu label="取り付ける" name="Object Attach"/>
-		<context_menu label="HUD を取り付ける" name="Object Attach HUD"/>
-	</context_menu>
-	<context_menu label="管理" name="Remove">
-		<menu_item_call label="嫌がらせの報告" name="Report Abuse..."/>
-		<menu_item_call label="ブロック" name="Object Mute"/>
-		<menu_item_call label="ブロック解除" name="Object Unmute"/>
-		<menu_item_call label="返却" name="Return..."/>
-	</context_menu>
-	<menu_item_call label="取る" name="Pie Object Take"/>
-	<menu_item_call label="コピーを取る" name="Take Copy"/>
-	<menu_item_call label="支払う" name="Pay..."/>
-	<menu_item_call label="買う" name="Buy..."/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-</context_menu>
+  <menu_item_call label="触る" name="Object Touch" />
+  <menu_item_call label="編集…" name="Edit..." />
+  <menu_item_call label="制作" name="Build" />
+  <menu_item_call label="開く" name="Open" />
+  <menu_item_call label="ここに座る" name="Object Sit" />
+  <menu_item_call label="立ち上がる" name="Object Stand Up" />
+  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
+  <menu_item_call label="ズームイン" name="Zoom In" />
+  <menu_item_call label="リンクセットで表示" name="show_in_linksets" />
+  <menu_item_call label="キャラクターで表示" name="show_in_characters" />
+  <menu_item_separator />
+  <context_menu label="取り付ける" name="Put On">
+    <menu_item_call label="着用" name="Wear" />
+    <menu_item_call label="追加" name="Add" />
+    <context_menu label="装着" name="Object Attach" />
+    <context_menu label="HUDに装着" name="Object Attach HUD" />
+  </context_menu>
+  <context_menu label="管理" name="Remove">
+    <menu_item_call label="嫌がらせの報告…" name="Report Abuse..." />
+    <menu_item_call label="ブロック" name="Object Mute" />
+    <menu_item_call label="ブロック解除" name="Object Unmute" />
+    <menu_item_call label="返却…" name="Return..." />
+  </context_menu>
+  <menu_item_separator />
+  <menu_item_call label="取る" name="Pie Object Take" />
+  <menu_item_call label="コピーを取る" name="Take Copy" />
+  <menu_item_call label="支払い…" name="Pay..." />
+  <menu_item_call label="購入…" name="Buy..." />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_separator />
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 7b55a64eef..163c8d1779 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Object Icon Menu">
-	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
-	<menu_item_call label="ブロック..." name="Block"/>
-	<menu_item_call label="ブロック解除" name="Unblock"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
-</menu>
+  <menu_item_call label="オブジェクトのプロフィール…" name="Object Profile" />
+  <menu_item_call label="ブロック…" name="Block" />
+  <menu_item_call label="ブロック解除" name="Unblock" />
+  <menu_item_separator  />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 4946d58fd8..962d25bb07 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -1,36 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Outfit">
-	<menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear"/>
-	<menu_item_call label="着る - 着用中のアウトフィットに追加する" name="wear_add"/>
-	<menu_item_call label="取り外す - 着用中のアウトフィットから取り除く" name="take_off"/>
-	<menu_item_call label="写真をアップロード（L$10）" name="upload_photo"/>
-	<menu_item_call label="写真を選択" name="select_photo"/>
-	<menu_item_call label="スナップショットを撮る" name="take_snapshot"/>
-	<menu_item_call label="写真を削除" name="remove_photo"/>
-	<menu label="衣類" name="New Clothes">
-		<menu_item_call label="シャツ" name="New Shirt"/>
-		<menu_item_call label="パンツ" name="New Pants"/>
-		<menu_item_call label="靴" name="New Shoes"/>
-		<menu_item_call label="靴下" name="New Socks"/>
-		<menu_item_call label="ジャケット" name="New Jacket"/>
-		<menu_item_call label="スカート" name="New Skirt"/>
-		<menu_item_call label="手袋" name="New Gloves"/>
-		<menu_item_call label="下着（上）" name="New Undershirt"/>
-		<menu_item_call label="下着（下）" name="New Underpants"/>
-		<menu_item_call label="アルファ" name="New Alpha"/>
-		<menu_item_call label="新規の物理作用" name="New Physics"/>
-		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
-		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
-	</menu>
-	<menu label="新しい身体部位" name="New Body Parts">
-		<menu_item_call label="新しいシェイプ" name="New Shape"/>
-		<menu_item_call label="スキン" name="New Skin"/>
-		<menu_item_call label="髪" name="New Hair"/>
-		<menu_item_call label="目" name="New Eyes"/>
-	</menu>
-	<menu_item_call label="フォルダをすべて開く" name="expand"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
-	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
-	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
-	<menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/>
-</toggleable_menu>
+  <menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear" />
+  <menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add" />
+  <menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off" />
+  <menu_item_call label="画像をアップロード（L$ 10）" name="upload_photo" />
+  <menu_item_call label="画像を選択" name="select_photo" />
+  <menu_item_call label="スナップショットを撮る" name="take_snapshot" />
+  <menu_item_call label="画像を削除" name="remove_photo" />
+  <menu_item_separator name="sepatator1" />
+  <!-- copied (with minor modifications) from menu_inventory_add.xml -->
+  <!--  *TODO: generate dynamically? -->
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しい上着" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
+    <menu_item_call label="新しいアルファ" name="New Alpha" />
+    <menu_item_call label="新しい物理作用" name="New Physics" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+    <menu_item_call label="新しいユニバーサル" name="New Universal" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ" name="New Shape" />
+    <menu_item_call label="新しいスキン" name="New Skin" />
+    <menu_item_call label="新しい髪型" name="New Hair" />
+    <menu_item_call label="新しい目" name="New Eyes" />
+  </menu>
+  <!-- copied from menu_inventory_add.xml -->
+  <menu_item_separator name="sepatator2" />
+  <menu_item_call label="全てのフォルダを開く" name="expand" />
+  <menu_item_call label="全てのフォルダを閉じる" name="collapse" />
+  <menu_item_call label="アウトフィットの名前を変更" name="rename" />
+  <menu_item_call label="アウトフィットを削除" name="delete_outfit" />
+  <menu_item_separator name="sepatator3" />
+  <menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
index 9491c22f31..66ebb79bb9 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit">
-	<menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear_replace"/>
-	<menu_item_call label="着る - 着用中のアウトフィットに追加する" name="wear_add"/>
-	<menu_item_call label="取り外す - 着用中のアウトフィットから取り除く" name="take_off"/>
-	<menu_item_call label="アウトフィットの編集" name="edit"/>
-	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
-	<menu_item_call label="アウトフィットを削除する" name="delete"/>
-</context_menu>
+  <menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear_replace" />
+  <menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add" />
+  <menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off" />
+  <menu_item_call label="アウトフィットの編集" name="edit" />
+  <menu_item_call label="アウトフィットの名前を変更" name="rename" />
+  <menu_item_call label="アウトフィットを削除" name="delete" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index 64d8ded722..2f40a033da 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Participant List Context Menu">
-	<menu_item_check label="名前で並べ替え" name="SortByName"/>
-	<menu_item_check label="最近の発言者で並べ替え" name="SortByRecentSpeakers"/>
-	<menu_item_call label="プロフィールの表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_check label="人のアイコン表示" name="View Icons"/>
-	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
-	<menu_item_check label="文字をブロック" name="MuteText"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="全員をミュート" name="ModerateVoiceMute"/>
-		<menu_item_call label="全員のミュート解除" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</context_menu>
+  <menu_item_check label="名前で並べ替え" name="SortByName" />
+  <menu_item_check label="最近の発言者で並べ替え" name="SortByRecentSpeakers" />
+  <menu_item_call label="プロフィールの表示" name="View Profile" />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="IM" name="IM" />
+  <menu_item_call label="呼び出し" name="Call" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="支払う" name="Pay" />
+  <menu_item_separator name="View Icons Separator" />
+  <menu_item_check label="人物のアイコン表示" name="View Icons" />
+  <menu_item_separator />
+  <menu_item_check label="ボイスをブロック／解除" name="Block/Unblock" />
+  <menu_item_check label="文字をブロック" name="MuteText" />
+  <menu_item_separator name="Moderator Options Separator" />
+  <context_menu label="モデレーターのオプション" name="Moderator Options">
+    <menu_item_separator name="moderate_voice_separator" />
+    <menu_item_check label="文字チャットを許可" name="AllowTextChat" />
+    <menu_item_call label="この参加者をミュート" name="ModerateVoiceMuteSelected" />
+    <menu_item_call label="この参加者のミュートを解除" name="ModerateVoiceUnMuteSelected" />
+    <menu_item_call label="全員をミュート" name="ModerateVoiceMute" />
+    <menu_item_call label="全員のミュート解除" name="ModerateVoiceUnmute" />
+  </context_menu>
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
index 5816351d9d..ef61874763 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="participant_manu_view">
-	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
-	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
-	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
-	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
-	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
-	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
-	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
-	<menu_item_check label="会話ログ..." name="Conversation"/>
-	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
-	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
-</toggleable_menu>
+  <menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type" />
+  <menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name" />
+  <menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent" />
+  <menu_item_separator />
+  <menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name" />
+  <menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent" />
+  <menu_item_separator />
+  <menu_item_call label="チャットの初期設定…" name="chat_preferences" />
+  <menu_item_call label="プライバシーの初期設定…" name="privacy_preferences" />
+  <menu_item_check label="会話ログ…" name="Conversation" />
+  <menu_item_separator />
+  <menu_item_check label="近隣のチャットを翻訳" name="Translate_chat" />
+  <menu_item_check label="翻訳の設定…" name="Translation_settings" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
index f74399f2ba..8d80ddebad 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_check label="ボイスをブロック" name="BlockVoice"/>
-	<menu_item_check label="文字をブロック" name="MuteText"/>
-	<menu_item_check label="パーティクルをブロック" name="MuteParticles"/>
-	<menu_item_check label="オブジェクトのサウンドをブロック" name="BlockObjectSounds"/>
-	<menu_item_call label="プロフィール..." name="profile"/>
-</toggleable_menu>
+  <menu_item_call label="ブロック解除" name="unblock" />
+  <menu_item_check label="ボイスをブロック" name="BlockVoice" />
+  <menu_item_check label="文字をブロック" name="MuteText" />
+  <menu_item_check label="パーティクルをブロック" name="MuteParticles" />
+  <menu_item_check label="オブジェクトのサウンドをブロック" name="BlockObjectSounds" />
+  <menu_item_separator />
+  <menu_item_call label="プロフィール…" name="profile" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
index 3e74b2ddff..1d89e15f64 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
-	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
-</toggleable_menu>
+  <menu_item_call label="名前で住人をブロック…" name="block_resident_by_name" />
+  <menu_item_call label="名前でオブジェクトをブロック…" name="block_object_by_name" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
index 4b86a353f4..db586365b2 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
-</toggleable_menu>
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="種類で並べ替え" name="sort_by_type" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
index f290bec652..fee506c511 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
-	<menu_item_check label="ユーザー名を非表示" name="view_usernames"/>
-	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
-</toggleable_menu>
+  <menu_item_check label="名前で並べ替え" name="sort_name" />
+  <menu_item_check label="オンライン状況で並べ替え" name="sort_status" />
+  <menu_item_check label="人物のアイコン表示" name="view_icons" />
+  <menu_item_check label="与えられた権限を表示" name="view_permissions" />
+  <menu_item_check label="ユーザー名を非表示" name="view_usernames" />
+  <menu_item_check label="会話ログを表示…" name="view_conversation" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 2c0c85ba28..91044bd283 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-	<menu_item_call label="情報を表示" name="View Info"/>
-	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="ボイスコール" name="Call"/>
-	<menu_item_call label="アクティブ" name="Activate"/>
-	<menu_item_call label="脱退" name="Leave"/>
-</menu>
+  <menu_item_call label="情報を表示" name="View Info" />
+  <menu_item_call label="チャット" name="Chat" />
+  <menu_item_call label="ボイスコール" name="Call" />
+  <menu_item_call label="アクティブ" name="Activate" />
+  <menu_item_call label="脱退" name="Leave" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
index 4a9e402fa4..07144be420 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
-</toggleable_menu>
+  <menu_item_check label="グループアイコンを表示" name="Display Group Icons" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 87f1d26ca4..641eba496a 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
-	<menu_item_call label="フリーズ" name="freeze"/>
-	<menu_item_call label="追放" name="eject"/>
-</context_menu>
+  <menu_item_call label="プロフィールを表示" name="view_profile" />
+  <menu_item_call label="IM" name="im" />
+  <menu_item_call label="テレポートを送る" name="offer_teleport" />
+  <menu_item_call label="ボイスコール" name="voice_call" />
+  <menu_item_call label="チャットの履歴を表示…" name="chat_history" />
+  <menu_item_call label="フレンド登録" name="add_friend" />
+  <menu_item_call label="フレンドを削除" name="remove_friend" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_check label="ブロック／解除" name="block_unblock" />
+  <menu_item_call label="フリーズ" name="freeze" />
+  <menu_item_call label="追放" name="eject" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index fe85e278cf..34935305d1 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="add_friends"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="コール" name="call"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-</context_menu>
+  <menu_item_call label="フレンド登録" name="add_friends" />
+  <menu_item_call label="フレンドを削除" name="remove_friends" />
+  <menu_item_call label="IM" name="im" />
+  <menu_item_call label="コール" name="call" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_call label="テレポートをオファー" name="offer_teleport" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
index 2217288987..7b56f1daf8 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
-	<menu_item_check label="到着した順に並べ替え" name="sort_arrival"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="地図を表示" name="view_map"/>
-	<menu_item_check label="ユーザー名を非表示" name="view_usernames"/>
-</toggleable_menu>
+  <menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers" />
+  <menu_item_check label="名前で並べ替え" name="sort_name" />
+  <menu_item_check label="距離で並べ替え" name="sort_distance" />
+  <menu_item_check label="到着した順に並べ替え" name="sort_arrival" />
+  <menu_item_check label="人物のアイコン表示" name="view_icons" />
+  <menu_item_check label="マップを表示" name="view_map" />
+  <menu_item_check label="ユーザー名を非表示" name="view_usernames" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
index feaeba4398..da27372963 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-</toggleable_menu>
+  <menu_item_check label="新しい順に並べ替え" name="sort_most" />
+  <menu_item_check label="名前で並べ替え" name="sort_name" />
+  <menu_item_check label="人物のアイコン表示" name="view_icons" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml
index 011d3d2526..4a5a42ad05 100644
--- a/indra/newview/skins/default/xui/ja/menu_picks.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Picks">
-	<menu_item_call label="情報" name="pick_info"/>
-	<menu_item_call label="編集" name="pick_edit"/>
-	<menu_item_call label="テレポート" name="pick_teleport"/>
-	<menu_item_call label="地図" name="pick_map"/>
-	<menu_item_call label="削除" name="pick_delete"/>
-</context_menu>
+  <menu_item_call label="テレポート" name="pick_teleport"/>
+  <menu_item_call label="ピックの情報" name="pick_info" />
+  <menu_item_call label="ピックを編集" name="pick_edit" />
+  <menu_item_call label="テレポート" name="pick_teleport" />
+  <menu_item_call label="マップに表示" name="pick_map" />
+  <menu_item_separator name="pick_separator" />
+  <menu_item_call label="削除" name="pick_delete" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
index 84bf90fea0..62eb8327bc 100644
--- a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="picks_plus_menu">
-	<menu_item_call label="新しいピック" name="create_pick"/>
-	<menu_item_call label="新しいクラシファイド広告" name="create_classified"/>
-</toggleable_menu>
+  <menu_item_call label="新しいピック" name="create_pick" />
+  <menu_item_call label="新しいクラシファイド広告" name="create_classified" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml
index a9f05e126d..f45f9211ed 100644
--- a/indra/newview/skins/default/xui/ja/menu_place.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="place_overflow_menu">
-	<menu_item_call label="ランドマークを作成" name="landmark"/>
-	<menu_item_call label="ピックを作成" name="pick"/>
-	<menu_item_call label="入場許可を購入" name="pass"/>
-	<menu_item_call label="編集" name="edit"/>
-</toggleable_menu>
+  <menu_item_call label="ランドマークを作成" name="landmark" />
+  <menu_item_call label="ピックを作成" name="pick" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
index d19bc44451..d6a13b92ba 100644
--- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_create">
-	<menu_item_call label="フォルダを追加" name="add_folder"/>
-	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-</toggleable_menu>
+  <menu_item_call label="現在の場所にランドマーク作成" name="add_landmark" />
+  <menu_item_call label="フォルダ作成" name="add_folder" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
index c455204722..c9fa92b6a2 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_folder_gear">
-	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-	<menu_item_call label="フォルダを追加" name="add_folder"/>
-	<menu_item_call label="アイテムを復元" name="restore_item"/>
-	<menu_item_call label="切り取り" name="cut"/>
-	<menu_item_call label="コピー" name="copy_folder"/>
-	<menu_item_call label="貼り付け" name="paste"/>
-	<menu_item_call label="名前の変更" name="rename"/>
-	<menu_item_call label="削除" name="delete"/>
-	<menu_item_call label="拡大" name="expand"/>
-	<menu_item_call label="戻す" name="collapse"/>
-	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-</toggleable_menu>
+  <menu_item_call label="ランドマークを追加" name="add_landmark" />
+  <menu_item_call label="フォルダを追加" name="add_folder" />
+  <menu_item_call label="アイテムを復元" name="restore_item" />
+  <menu_item_separator />
+  <menu_item_call label="カット" name="cut" />
+  <menu_item_call label="コピー" name="copy_folder" />
+  <menu_item_call label="ペースト" name="paste" />
+  <menu_item_call label="名前の変更" name="rename" />
+  <menu_item_call label="削除" name="delete" />
+  <menu_item_separator />
+  <menu_item_call label="広げる" name="expand" />
+  <menu_item_call label="閉じる" name="collapse" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
index 579f2c2cbd..16508dde4a 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
-	<menu_item_call label="テレポート" name="teleport"/>
-	<menu_item_call label="もっと詳しく" name="more_info"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-	<menu_item_call label="フォルダを追加" name="add_folder"/>
-	<menu_item_call label="アイテムを復元" name="restore_item"/>
-	<menu_item_call label="切り取り" name="cut"/>
-	<menu_item_call label="ランドマークをコピー" name="copy_landmark"/>
-	<menu_item_call label="SLurl をコピー" name="copy_slurl"/>
-	<menu_item_call label="貼り付け" name="paste"/>
-	<menu_item_call label="名前の変更" name="rename"/>
-	<menu_item_call label="削除" name="delete"/>
-	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-	<menu_item_call label="ピックを作成" name="create_pick"/>
-</toggleable_menu>
+  <menu_item_call label="テレポート" name="teleport" />
+  <menu_item_call label="共有" name="share"/>
+  <menu_item_call label="ランドマークの表示／編集" name="more_info"/>
+  <menu_item_call label="ランドマークをコピー" name="copy_landmark" />
+  <menu_item_call label="ランドマークに移動" name="Move to Landmarks"/>
+  <menu_item_call label="お気に入りに移動" name="Move to Favorites" />
+  <menu_item_call label="フォルダをすべて開く" name="expand_all" />
+  <menu_item_call label="フォルダをすべて閉じる" name="collapse_all" />
+  <menu_item_check label="日付で並べ替え" name="sort_by_date" />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="SLurlをコピー" name="copy_slurl" />
+  <menu_item_call label="ピックを作成" name="create_pick" />
+  <menu_item_call label="アイテムを復元" name="restore_item" />
+  <menu_item_separator  />
+  <menu_item_call label="カット" name="cut"/>
+  <menu_item_call label="コピー" name="copy_landmark"/>
+  <menu_item_call label="ペースト" name="paste"/>
+  <menu_item_call label="名前の変更" name="rename"/>
+  <menu_item_call label="削除" name="delete"/>
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
new file mode 100644
index 0000000000..197b61af30
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_sorter_gear">
+  <menu_item_call label="全てのフォルダを開く" name="expand_all" />
+  <menu_item_call label="全てのフォルダを閉じる" name="collapse_all" />
+  <menu_item_separator />
+  <menu_item_check label="日付でソート" name="sort_by_date" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_other.xml b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
new file mode 100644
index 0000000000..760186506f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Avatar Profile Menu">
+  <menu_item_call label="IM" name="im" />
+  <menu_item_call label="テレポートのオファー" name="offer_teleport" />
+  <menu_item_call label="テレポートのリクエスト" name="request_teleport" />
+  <menu_item_call label="ボイスコール" name="voice_call" />
+  <menu_item_separator />
+  <menu_item_call label="チャット履歴を表示…" name="chat_history" />
+  <menu_item_separator name="separator_chat_history" />
+  <menu_item_call label="フレンド追加" name="add_friend" />
+  <menu_item_call label="フレンド削除" name="remove_friend" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_separator name="separator_invite_to_group" />
+  <menu_item_call label="権限" name="agent_permissions" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_check label="ブロック／解除" name="block_unblock" />
+  <menu_item_separator name="separator_copy_options" />
+  <menu_item_call label="表示名をコピー" name="copy_display_name" />
+  <menu_item_call label="エージェント名をコピー" name="copy_name" />
+  <menu_item_call label="エージェントＩＤをコピー" name="copy_id" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
index 9d3a5dda1c..1dd29a9c2a 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="profile_overflow_menu">
-	<menu_item_call label="地図" name="show_on_map"/>
-	<menu_item_call label="支払う" name="pay"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="ブロック" name="block"/>
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="追放" name="kick"/>
-	<menu_item_call label="フリーズ" name="freeze"/>
-	<menu_item_call label="フリーズ解除" name="unfreeze"/>
-	<menu_item_call label="CSR" name="csr"/>
-</toggleable_menu>
+  <menu_item_call label="マップ" name="show_on_map" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="ブロック" name="block" />
+  <menu_item_call label="ブロック解除" name="unblock" />
+  <menu_item_call label="追放" name="kick" />
+  <menu_item_call label="フリーズ" name="freeze" />
+  <menu_item_call label="フリーズ解除" name="unfreeze" />
+  <menu_item_call label="CSR" name="csr" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_self.xml b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
new file mode 100644
index 0000000000..ec10d92629
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Avatar Profile Menu Self">
+  <menu_item_call label="表示名を編集" name="edit_display_name" />
+  <menu_item_call label="パートナーを編集" name="edit_partner" />
+  <menu_item_call label="画像をアップロード" name="upload_photo" />
+  <menu_item_call label="画像を変更" name="change_photo" />
+  <menu_item_call label="画像を削除" name="remove_photo" />
+  <menu_item_separator name="separator_copy_options" />
+  <menu_item_call label="表示名をコピー" name="copy_display_name" />
+  <menu_item_call label="エージェント名をコピー" name="copy_name" />
+  <menu_item_call label="エージェントＩＤをコピー" name="copy_id" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
index 6513d9264a..6d8f2381d9 100644
--- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_outfit_menu">
-	<menu_item_call label="保存" name="save_outfit"/>
-	<menu_item_call label="別名で保存" name="save_as_new_outfit"/>
-</toggleable_menu>
+  <menu_item_call label="保存" name="save_outfit" />
+  <menu_item_call label="名前をつけて保存" name="save_as_new_outfit" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_save_settings.xml b/indra/newview/skins/default/xui/ja/menu_save_settings.xml
index 44fb1fb30b..f24700d449 100644
--- a/indra/newview/skins/default/xui/ja/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_settings_menu">
-	<menu_item_check label="保存" name="save_settings"/>
-	<menu_item_check label="別名で保存" name="save_as_new_settings"/>
-	<menu_item_check label="約束する" name="commit_changes"/>
-	<menu_item_check label="自分にのみ適用" name="apply_local"/>
-	<menu_item_check label="区画に適用" name="apply_parcel"/>
-	<menu_item_check label="リージョンに適用" name="apply_region"/>
-</toggleable_menu>
+  <menu_item_check label="保存" name="save_settings" />
+  <menu_item_check label="名前をつけて保存" name="save_as_new_settings" />
+  <menu_item_check label="変更をコミット" name="commit_changes" />
+  <menu_item_check label="自分にのみ適用" name="apply_local" />
+  <menu_item_check label="区画に適用" name="apply_parcel" />
+  <menu_item_check label="リージョンに適用" name="apply_region" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
index a89dd0bcbe..c4bc424927 100644
--- a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="ScriptChiclet Menu">
-	<menu_item_call label="閉じる" name="Close"/>
-</menu>
+  <menu_item_call label="閉じる" name="Close" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_settings_add.xml
index 814ad9c1a6..9e64476446 100644
--- a/indra/newview/skins/default/xui/ja/menu_settings_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_settings_add.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_add">
-	<menu_item_call label="新しい空" name="New Sky"/>
-	<menu_item_call label="新しい水" name="New Water"/>
-	<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
-</toggleable_menu>
+  <menu_item_call label="新しい空" name="New Sky" />
+  <menu_item_call label="新しい水" name="New Water" />
+  <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
index 064eae95bf..a44786b414 100644
--- a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_gear">
-	<menu_item_call label="編集" name="edit_settings"/>
-	<menu_item_call label="自分にのみ適用" name="Settings Apply Local"/>
-	<menu_item_call label="区画に適用" name="Settings Apply Parcel"/>
-	<menu_item_call label="リージョンに適用" name="Settings Apply Region"/>
-	<menu_item_call label="コピー" name="copy_settings"/>
-	<menu_item_call label="貼り付け" name="paste_settings"/>
-	<menu_item_call label="UUID をコピー" name="copy_uuid"/>
-</toggleable_menu>
+  <menu_item_call label="編集" name="edit_settings" />
+  <menu_item_call label="自分にのみ適用" name="Settings Apply Local" />
+  <menu_item_call label="区画に適用" name="Settings Apply Parcel" />
+  <menu_item_call label="リージョン（地域）に適用" name="Settings Apply Region" />
+  <menu_item_call label="コピー" name="copy_settings" />
+  <menu_item_call label="ペースト" name="paste_settings" />
+  <menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 61ba3085d9..9e58ec31b7 100644
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="URL について" name="about_url"/>
-	<menu_item_call label="URL にテレポートする" name="teleport_to_url"/>
-	<menu_item_call label="地図" name="show_on_map"/>
-</menu>
+  <menu_item_call label="URLについて" name="about_url" />
+  <menu_item_call label="URLにテレポートする" name="teleport_to_url" />
+  <menu_item_call label="マップ" name="show_on_map" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
index 901eab9166..fd4dffeefa 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Teleport History Gear Context Menu">
-	<menu_item_call label="フォルダをすべて開く" name="Expand all folders"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="Collapse all folders"/>
-	<menu_item_call label="テレポートの履歴をクリア" name="Clear Teleport History"/>
-</menu>
+  <menu_item_separator name="Landmark Separator" />
+  <menu_item_call label="フォルダをすべて展開" name="Expand all folders" />
+  <menu_item_call label="フォルダをすべて縮小" name="Collapse all folders" />
+  <menu_item_call label="テレポートの履歴をクリア" name="Clear Teleport History" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
index 1cc230e5b6..dc34bc6463 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Teleport History Item Menu">
-	<menu_item_call label="テレポート" name="Teleport"/>
-	<menu_item_call label="もっと詳しく" name="More Information"/>
-	<menu_item_call label="SLurl をコピー" name="CopyToClipboard"/>
-</toggleable_menu>
+  <menu_item_call label="テレポート" name="Teleport" />
+  <menu_item_call label="より詳細な情報" name="More Information" />
+  <menu_item_call label="SLurlをコピー" name="CopyToClipboard" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
index 4dd44d2ec8..391be973f8 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Teleport History Item Context Menu">
-	<menu_item_call label="開く" name="TabOpen"/>
-	<menu_item_call label="閉じる" name="TabClose"/>
-</context_menu>
+  <menu_item_call label="開く" name="TabOpen" />
+  <menu_item_call label="閉じる" name="TabClose" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
index eda973c888..48fd8ad243 100644
--- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
-	<menu_item_call label="（不明）" name="Suggestion 1"/>
-	<menu_item_call label="（不明）" name="Suggestion 2"/>
-	<menu_item_call label="（不明）" name="Suggestion 3"/>
-	<menu_item_call label="（不明）" name="Suggestion 4"/>
-	<menu_item_call label="（不明）" name="Suggestion 5"/>
-	<menu_item_call label="辞書に追加" name="Add to Dictionary"/>
-	<menu_item_call label="無視に追加" name="Add to Ignore"/>
-	<menu_item_call label="切り取り" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="すべて選択" name="Select All"/>
-</context_menu>
+  <menu_item_call label="（不明）" name="Suggestion 1" />
+  <menu_item_call label="（不明）" name="Suggestion 2" />
+  <menu_item_call label="（不明）" name="Suggestion 3" />
+  <menu_item_call label="（不明）" name="Suggestion 4" />
+  <menu_item_call label="（不明）" name="Suggestion 5" />
+  <menu_item_call label="辞書に追加" name="Add to Dictionary" />
+  <menu_item_call label="無視に追加" name="Add to Ignore" />
+  <menu_item_call label="切り取り" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="すべて選択" name="Select All" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
index d5363a5131..9bb4eaf496 100644
--- a/indra/newview/skins/default/xui/ja/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Toolbars Popup">
-	<menu_item_call label="このボタンを削除" name="Remove button"/>
-	<menu_item_call label="ツールバーのボタン..." name="Choose Buttons"/>
-	<menu_item_check label="アイコンとラベル" name="icons_with_text"/>
-	<menu_item_check label="アイコンのみ" name="icons_only"/>
-</context_menu>
+  <menu_item_call label="このボタンを削除" name="Remove button" />
+  <menu_item_call label="ツールバーのボタン…" name="Choose Buttons" />
+  <menu_item_check label="アイコンとラベル" name="icons_with_text" />
+  <menu_item_check label="アイコンのみ" name="icons_only" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
index 1a67a2a8f7..ea1e12ab2b 100644
--- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_topinfobar">
-	<menu_item_check label="座標を表示" name="Show Coordinates"/>
-	<menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/>
-	<menu_item_call label="ランドマーク" name="Landmark"/>
-	<menu_item_call label="コピー" name="Copy"/>
-</menu>
+  <menu_item_check label="座標を表示" name="Show Coordinates" />
+  <menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties" />
+  <menu_item_separator name="Separator" />
+  <!-- Label of 'Landmark' item is changing in runtime, 
+    see  AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml -->
+  <menu_item_call label="ランドマーク" name="Landmark" />
+  <menu_item_separator name="Separator" />
+  <menu_item_call label="コピー" name="Copy" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 639602ce3c..d6488af27b 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="プロフィールを表示" name="show_agent"/>
-	<menu_item_call label="IM を送信..." name="send_im"/>
-	<menu_item_call label="フレンドを追加..." name="add_friend"/>
-	<menu_item_call label="フレンドを削除..." name="remove_friend"/>
-	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="プロフィールを表示" name="show_agent" />
+  <menu_item_call label="IM を送信…" name="send_im" />
+  <menu_item_call label="フレンドを追加…" name="add_friend" />
+  <menu_item_call label="フレンドを削除…" name="remove_friend" />
+  <menu_item_call label="嫌がらせの報告" name="report_abuse" />
+  <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurl をクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_email.xml b/indra/newview/skins/default/xui/ja/menu_url_email.xml
index 6c41d759fe..1ba8d6a64e 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_email.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_email.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Email Popup">
-	<menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external"/>
-	<menu_item_call label="電子メールをクリップボードにコピー" name="email_copy"/>
-</context_menu>
+  <menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external" />
+  <menu_item_call label="電子メールをクリップボードにコピー" name="email_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_experience.xml b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
index 582784c2f0..83d7029527 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_experience.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
index 1dd3d79438..9214d67dea 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="グループ情報を表示" name="show_group"/>
-	<menu_item_call label="グループをクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="グループ情報を表示" name="show_group" />
+  <menu_item_separator />
+  <menu_item_call label="グループをクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
index c3da8a8686..0bec7cd2be 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Web ページを開く" name="url_open"/>
-	<menu_item_call label="内蔵ブラウザで開く" name="url_open_internal"/>
-	<menu_item_call label="外部ブラウザで開く" name="url_open_external"/>
-	<menu_item_call label="URLをクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="Web ページを開く" name="url_open" />
+  <menu_item_call label="内蔵ブラウザで開く" name="url_open_internal" />
+  <menu_item_call label="外部ブラウザで開く" name="url_open_external" />
+  <menu_item_call label="URLをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
index 147ab44a1b..7a13030b64 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="インベントリアイテムを表示" name="show_item"/>
-	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="インベントリのアイテムを表示" name="show_item" />
+  <menu_item_separator />
+  <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
index 8d41e1a571..75813f9017 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator />
+  <menu_item_call label="現地にテレポート" name="teleport_to_location" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index 96f8b3f7b1..ef76e5484f 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
-	<menu_item_call label="ブロック..." name="block_object"/>
-	<menu_item_call label="ブロック解除" name="unblock_object"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
-	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="オブジェクトのプロフィール…" name="show_object" />
+  <menu_item_call label="ブロック…" name="block_object" />
+  <menu_item_call label="ブロック解除" name="unblock_object" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object" />
+  <menu_item_separator />
+  <menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
index 8d264059d3..0c1eab8dad 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="区画情報を表示" name="show_parcel"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="区画情報を表示" name="show_parcel" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
index a516c5a075..78f3997bf8 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="このコマンドを実行" name="run_slapp"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="このコマンドを実行" name="run_slapp" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
index 2c857ec915..e0d4427008 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="場所の情報を表示" name="show_place"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="場所の情報を表示" name="show_place" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="現地にテレポート" name="teleport_to_location" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
index c3507a9a33..e6941fb8bd 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="この場所にテレポート" name="teleport"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="この場所にテレポート" name="teleport" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index d5ac67b9e6..2428ab51cd 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,495 +1,669 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <menu_bar name="Main Menu">
-	<menu label="ミー" name="Me">
-		<menu_item_call label="プロフィール..." name="Profile"/>
-		<menu_item_call label="容姿..." name="ChangeOutfit"/>
-		<menu_item_call label="アバターを選択..." name="Avatar Picker"/>
-		<menu_item_check label="インベントリ..." name="Inventory"/>
-		<menu_item_call label="新しいインベントリウィンドウ" name="NewInventoryWindow"/>
-		<menu_item_call label="場所..." name="Places"/>
-		<menu_item_call label="ピック..." name="Picks"/>
-		<menu_item_call label="体験..." name="Experiences"/>
-		<menu_item_call label="スクリプト…" name="MyScripts"/>
-		<menu_item_call label="カメラコントロール..." name="Camera Controls"/>
-		<menu label="ムーブメント" name="Movement">
-			<menu_item_call label="座る" name="Sit Down Here"/>
-			<menu_item_call label="立ち上がる" name="Stand up"/>
-			<menu_item_check label="飛ぶ" name="Fly"/>
-			<menu_item_check label="常に走る" name="Always Run"/>
-			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
-			<menu_item_call label="歩行／走行／飛行..." name="WalkRunFly"/>
-		</menu>
-		<menu label="ログイン" name="Status">
-			<menu_item_check label="一時退席中" name="Away"/>
-			<menu_item_check label="着信拒否" name="Do Not Disturb"/>
-		</menu>
-		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
-		<menu_item_call label="マーケティングプレイスのリスト..." name="MarketplaceListings"/>
-		<menu_item_call label="マイアカウント..." name="Manage My Account">
-			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
-		</menu_item_call>
-		<menu_item_call label="環境設定..." name="Preferences"/>
-		<menu_item_call label="ツールバーのボタン..." name="Toolbars"/>
-		<menu_item_call label="全てのコントロールを非表示にする" name="Hide UI"/>
-		<menu_item_check label="HUD を表示" name="Show HUD Attachments"/>
-		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
-	</menu>
-	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="会話..." name="Conversations"/>
-		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
-		<menu_item_check label="話す" name="Speak"/>
-		<menu_item_check label="会話ログ..." name="Conversation Log..."/>
-		<menu_item_call label="Facebook..." name="Facebook"/>
-		<menu_item_call label="Twitter..." name="Twitter"/>
-		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="ボイスモーフィング" name="VoiceMorphing">
-			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
-			<menu_item_check label="プレビュー..." name="Preview"/>
-			<menu_item_call label="申し込む..." name="Subscribe"/>
-			<menu_item_call label="プレミアム会員特典..." name="PremiumPerk"/>
-		</menu>
-		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_check label="フレンド" name="My Friends"/>
-		<menu_item_check label="グループ" name="My Groups"/>
-		<menu_item_check label="近くにいる人" name="Active Speakers"/>
-		<menu_item_check label="リストをブロック" name="Block List"/>
-		<menu_item_check label="着信拒否" name="Do Not Disturb"/>
-	</menu>
-	<menu label="世界" name="World">
-		<menu_item_call label="現在地をランドマーク" name="Create Landmark Here"/>
-		<menu_item_call label="行き先..." name="Destinations"/>
-		<menu_item_check label="世界地図" name="World Map"/>
-		<menu_item_check label="ミニマップ" name="Mini-Map"/>
-		<menu_item_call label="イベント" name="Events"/>
-		<menu_item_check label="検索..." name="Search"/>
-		<menu_item_call label="ホームにテレポート" name="Teleport Home"/>
-		<menu_item_call label="現在地をホームに設定" name="Set Home to Here"/>
-		<menu_item_call label="スナップショット" name="Take Snapshot"/>
-		<menu_item_call label="場所のプロフィール" name="Place Profile"/>
-		<menu_item_call label="土地情報" name="About Land"/>
-		<menu_item_call label="地域 / 不動産" name="RegionEstate"/>
-		<menu_item_call label="保有地..." name="My Land"/>
-		<menu_item_call label="この土地を購入" name="Buy Land"/>
-		<menu label="表示" name="LandShow">
-			<menu_item_check label="立入禁止ライン" name="Ban Lines"/>
-			<menu_item_check label="ビーコン（標識）" name="beacons"/>
-			<menu_item_check label="プロパティ境界線" name="Property Lines"/>
-			<menu_item_check label="土地所有者" name="Land Owners"/>
-			<menu_item_check label="座標" name="Coordinates"/>
-			<menu_item_check label="区画プロパティ" name="Parcel Properties"/>
-			<menu_item_check label="アドバンスメニュー" name="Show Advanced Menu"/>
-		</menu>
-		<menu label="環境" name="Environment">
-			<menu_item_check label="日の出" name="Sunrise"/>
-			<menu_item_check label="正午" name="Noon"/>
-			<menu_item_check label="日没" name="Sunset"/>
-			<menu_item_check label="深夜" name="Midnight"/>
-			<menu_item_check label="共有された環境を使用" name="Use Shared Environment"/>
-			<menu_item_call label="私の環境…" name="my_environs"/>
-			<menu_item_call label="個人的な照明…" name="adjustment_tool"/>
-			<menu_item_check label="雲を一時停止" name="pause_clouds"/>
-		</menu>
-	</menu>
-	<menu label="制作" name="BuildTools">
-		<menu_item_check label="制作" name="Show Build Tools"/>
-		<menu label="制作ツールを選択する" name="Select Tool">
-			<menu_item_call label="フォーカスツール" name="Focus"/>
-			<menu_item_call label="移動ツール" name="Move"/>
-			<menu_item_call label="編集ツール" name="Edit"/>
-			<menu_item_call label="作成ツール" name="Create"/>
-			<menu_item_call label="土地ツール" name="Land"/>
-		</menu>
-		<menu_item_call label="リンク" name="Link"/>
-		<menu_item_call label="リンクを外す" name="Unlink"/>
-		<menu_item_check label="リンクした部分を編集" name="Edit Linked Parts"/>
-		<menu label="要素を選択" name="Select Elements">
-			<menu_item_call label="次のパーツまたは面を選択" name="Select Next Part or Face"/>
-			<menu_item_call label="前のパーツまたは面を選択" name="Select Previous Part or Face"/>
-			<menu_item_call label="次のパーツまたは面を含める" name="Include Next Part or Face"/>
-			<menu_item_call label="前のパーツまたは面を含める" name="Include Previous Part or Face"/>
-		</menu>
-		<menu_item_call label="リージョンオブジェクト" name="pathfinding_linkset_menu_item"/>
-		<menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/>
-		<menu_item_call label="選択したものをズームする" name="Zoom to Selection"/>
-		<menu label="オブジェクト" name="Object">
-			<menu_item_call label="買う" name="Menu Object Buy"/>
-			<menu_item_call label="取る" name="Menu Object Take"/>
-			<menu_item_call label="コピーを取る" name="Take Copy"/>
-			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
-			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
-			<menu_item_call label="複製" name="DuplicateObject"/>
-		</menu>
-		<menu label="スクリプト" name="Scripts">
-			<menu_item_check label="スクリプトの警告/エラー..." name="Script debug"/>
-			<menu_item_call label="スクリプトのリコンパイル（Mono）" name="Mono"/>
-			<menu_item_call label="スクリプトのリコンパイル（LSL）" name="LSL"/>
-			<menu_item_call label="スクリプトのリセット" name="Reset Scripts"/>
-			<menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running"/>
-			<menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running"/>
-		</menu>
-		<menu label="パスファインディング" name="Pathfinding">
-			<menu_item_call label="リージョンオブジェクト" name="pathfinding_linksets_menu_item"/>
-			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
-			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
-		</menu>
-		<menu label="オプション" name="Options">
-			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
-			<menu_item_check label="私のオブジェクトだけを選択する" name="Select Only My Objects"/>
-			<menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects"/>
-			<menu_item_check label="範囲内を選択する" name="Select By Surrounding"/>
-			<menu_item_check label="選択外形を表示" name="Show Selection Outlines"/>
-			<menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection"/>
-			<menu_item_check label="選択した光の半径範囲を表示する" name="Show Light Radius for Selection"/>
-			<menu_item_check label="選択ビームを表示する" name="Show Selection Beam"/>
-			<menu_item_check label="グリッドポイントにスナップする" name="Snap to Grid"/>
-			<menu_item_call label="オブジェクトの XY 軸をグリッドにスナップする" name="Snap Object XY to Grid"/>
-			<menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid"/>
-			<menu_item_call label="グリッドオプション..." name="Grid Options"/>
-			<menu_item_call label="デフォルト権限の設定..." name="Set default permissions"/>
-		</menu>
-		<menu label="アップロード" name="Upload">
-			<menu_item_call label="画像（L$[COST]）..." name="Upload Image"/>
-			<menu_item_call label="サウンド（L$[COST]）..." name="Upload Sound"/>
-			<menu_item_call label="アニメーション（L$[COST]）..." name="Upload Animation"/>
-			<menu_item_call label="モデル" name="Upload Model"/>
-			<menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/>
-		</menu>
-		<menu_item_call label="元に戻す" name="Undo"/>
-		<menu_item_call label="やり直し" name="Redo"/>
-	</menu>
-	<menu label="ヘルプ" name="Help">
-		<menu_item_call label="ハウツー..." name="How To"/>
-		<menu_item_call label="クイックスタート" name="Quickstart"/>
-		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
-		<menu_item_call label="日本語サポートページ" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
-		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
-		<menu_item_call label="バグを報告する" name="Report Bug"/>
-		<menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp;amp; Hits"/>
-		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
-	</menu>
-	<menu label="アドバンス" name="Advanced">
-		<menu_item_call label="テクスチャのリベークをする" name="Rebake Texture"/>
-		<menu_item_call label="UI のサイズをデフォルトに設定する" name="Set UI Size to Default"/>
-		<menu_item_call label="ウィンドウのサイズを設定する" name="Set Window Size..."/>
-		<menu_item_check label="遠くのオブジェクトを選択しない" name="Limit Select Distance"/>
-		<menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance"/>
-		<menu_item_check label="高解像度スナップショット" name="HighResSnapshot"/>
-		<menu_item_check label="シャッター音とアニメーションなしでスナップショットをディスクに保存する" name="QuietSnapshotsToDisk"/>
-		<menu label="パフォーマンスツール" name="Performance Tools">
-			<menu_item_call label="ラグ計測器" name="Lag Meter"/>
-			<menu_item_check label="統計バー" name="Statistics Bar"/>
-			<menu_item_call label="シーン ロード統計情報" name="Scene Load Statistics"/>
-			<menu_item_check label="アバターの複雑さ情報を表示" name="Avatar Draw Info"/>
-		</menu>
-		<menu label="ハイライトと目に見えるもの" name="Highlighting and Visibility">
-			<menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
-			<menu_item_check label="パーティクルを非表示にする" name="Hide Particles"/>
-			<menu_item_check label="選択したものを非表示にする" name="Hide Selected"/>
-			<menu_item_check label="透明部分をハイライトする" name="Highlight Transparent"/>
-			<menu_item_check label="一人称視点のときに十字線を表示する" name="ShowCrosshairs"/>
-		</menu>
-		<menu label="レンダリング（種類）" name="Rendering Types">
-			<menu_item_check label="シンプル" name="Rendering Type Simple"/>
-			<menu_item_check label="アルファ" name="Rendering Type Alpha"/>
-			<menu_item_check label="木" name="Rendering Type Tree"/>
-			<menu_item_check label="アバター" name="Rendering Type Character"/>
-			<menu_item_check label="サーフェスパッチ" name="Rendering Type Surface Patch"/>
-			<menu_item_check label="空" name="Rendering Type Sky"/>
-			<menu_item_check label="水" name="Rendering Type Water"/>
-			<menu_item_check label="地面" name="Rendering Type Ground"/>
-			<menu_item_check label="取引高" name="Rendering Type Volume"/>
-			<menu_item_check label="草" name="Rendering Type Grass"/>
-			<menu_item_check label="雲" name="Rendering Type Clouds"/>
-			<menu_item_check label="パーティクル" name="Rendering Type Particles"/>
-			<menu_item_check label="衝突" name="Rendering Type Bump"/>
-		</menu>
-		<menu label="レンダリング（機能）" name="Rendering Features">
-			<menu_item_check label="UI" name="ToggleUI"/>
-			<menu_item_check label="選択済" name="Selected"/>
-			<menu_item_check label="ハイライト" name="Highlighted"/>
-			<menu_item_check label="ダイナミックテクスチャ" name="Dynamic Textures"/>
-			<menu_item_check label="足の影" name="Foot Shadows"/>
-			<menu_item_check label="くもり" name="Fog"/>
-			<menu_item_check label="FRInfo のテスト" name="Test FRInfo"/>
-			<menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects"/>
-		</menu>
-		<menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"/>
-		<menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache"/>
-		<menu_item_check label="マウスの平滑化" name="Mouse Smoothing"/>
-		<menu_item_call label="リリースキー" name="Release Keys"/>
-		<menu label="ショートカット" name="Shortcuts">
-			<menu_item_check label="アドバンスメニューを表示 - レガシーのショートカット" name="Show Advanced Menu - legacy shortcut"/>
-			<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
-			<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
-			<menu_item_call label="スナップショットをディスクに保存する" name="Snapshot to Disk"/>
-			<menu_item_call label="一人称視点" name="Mouselook"/>
-			<menu_item_check label="ジョイスティックフライカム" name="Joystick Flycam"/>
-			<menu_item_call label="表示をリセットする" name="Reset View"/>
-			<menu_item_call label="最後の発言者を見る" name="Look at Last Chatter"/>
-			<menu_item_call label="ズームイン" name="Zoom In"/>
-			<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
-			<menu_item_call label="ズームアウト" name="Zoom Out"/>
-		</menu>
-		<menu_item_call label="デバッグ設定を表示する" name="Debug Settings"/>
-		<menu_item_check label="開発メニューを表示する" name="Debug Mode"/>
-	</menu>
-	<menu label="開発" name="Develop">
-		<menu label="コンソール" name="Consoles">
-			<menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
-			<menu_item_check label="デバッグコンソール" name="Debug Console"/>
-			<menu_item_call label="通知コンソール" name="Notifications"/>
-			<menu_item_check label="地域デバッグコンソール" name="Region Debug Console"/>
-			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
-			<menu_item_check label="メモリ" name="Memory"/>
-			<menu_item_check label="風景の統計" name="Scene Statistics"/>
-			<menu_item_check label="シーン ローディング モニター" name="Scene Loading Monitor"/>
-			<menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console"/>
-			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
-			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
-			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
-			<menu_item_check label="カメラ" name="Camera"/>
-			<menu_item_check label="風" name="Wind"/>
-			<menu_item_check label="FOV" name="FOV"/>
-			<menu_item_check label="バッジ" name="Badge"/>
-		</menu>
-		<menu label="情報を表示" name="Display Info">
-			<menu_item_check label="時間を表示する" name="Show Time"/>
-			<menu_item_check label="アップロード代金を表示" name="Show Upload Cost"/>
-			<menu_item_check label="描画情報を表示する" name="Show Render Info"/>
-			<menu_item_check label="テクスチャ情報を表示" name="Show Texture Info"/>
-			<menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
-			<menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor"/>
-			<menu_item_check label="メモリを表示：" name="Show Memory"/>
-			<menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates"/>
-		</menu>
-		<menu label="エラー実行" name="Force Errors">
-			<menu_item_call label="ブレークポイント" name="Force Breakpoint"/>
-			<menu_item_call label="LLError とクラッシュを実行する" name="Force LLError And Crash"/>
-			<menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access"/>
-			<menu_item_call label="無限ループ" name="Force Infinite Loop"/>
-			<menu_item_call label="ドライバのクラッシュを実行する" name="Force Driver Carsh"/>
-			<menu_item_call label="ソフトウェア例外エラーの実行する" name="Force Software Exception"/>
-			<menu_item_call label="ビューワの接続遮断を実行する" name="Force Disconnect Viewer"/>
-			<menu_item_call label="メモリリークをシミュレートする" name="Memory Leaking Simulation"/>
-		</menu>
-		<menu label="レンダーテスト" name="Render Tests">
-			<menu_item_check label="カメラオフセット" name="Camera Offset"/>
-			<menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
-			<menu_item_check label="定期的に遅いフレームを挿入する" name="Periodic Slow Frame"/>
-			<menu_item_check label="フレームテスト" name="Frame Test"/>
-			<menu_item_call label="フレームプロフィール" name="Frame Profile"/>
-			<menu_item_call label="ベンチマーク" name="Benchmark"/>
-		</menu>
-		<menu label="メタデータのレンダー" name="Render Metadata">
-			<menu_item_check label="バウンディングボックス" name="Bounding Boxes"/>
-			<menu_item_check label="普通" name="Normals"/>
-			<menu_item_check label="オクトリー" name="Octree"/>
-			<menu_item_check label="シャドウ円錐" name="Shadow Frusta"/>
-			<menu_item_check label="実像" name="Physics Shapes"/>
-			<menu_item_check label="オクルージョン" name="Occlusion"/>
-			<menu_item_check label="バッチの描画" name="Render Batches"/>
-			<menu_item_check label="タイプを更新" name="Update Type"/>
-			<menu_item_check label="アニメーション部分をテクスチャで表示" name="Texture Anim"/>
-			<menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
-			<menu_item_check label="テクスチャの範囲" name="Texture Area"/>
-			<menu_item_check label="側面" name="Face Area"/>
-			<menu_item_check label="LOD 情報" name="LOD Info"/>
-			<menu_item_check label="三角形の数" name="Triangle Count"/>
-			<menu_item_check label="制作キュー" name="Build Queue"/>
-			<menu_item_check label="光" name="Lights"/>
-			<menu_item_check label="パーティクル" name="Particles"/>
-			<menu_item_check label="骨組みの衝突判定" name="Collision Skeleton"/>
-			<menu_item_check label="ジョイント" name="Joints"/>
-			<menu_item_check label="レイキャスト" name="Raycast"/>
-			<menu_item_check label="風のベクトル" name="Wind Vectors"/>
-			<menu_item_check label="スカルプト" name="Sculpt"/>
-			<menu label="テクスチャの密度" name="Texture Density">
-				<menu_item_check label="なし" name="None"/>
-				<menu_item_check label="現在" name="Current"/>
-				<menu_item_check label="望ましい" name="Desired"/>
-				<menu_item_check label="フル" name="Full"/>
-			</menu>
-		</menu>
-		<menu label="レンダリング" name="Rendering">
-			<menu_item_check label="軸" name="Axes"/>
-			<menu_item_check label="接線基底" name="Tangent Basis"/>
-			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
-			<menu_item_call label="選択したマテリアル情報" name="Selected Material Info"/>
-			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
-			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
-			<menu_item_check label="高度なライティングモデル" name="Advanced Lighting Model"/>
-			<menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
-			<menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/>
-			<menu_item_check label="GL デバッグ" name="Debug GL"/>
-			<menu_item_check label="経路をデバッグ" name="Debug Pipeline"/>
-			<menu_item_check label="自動アルファマスク（遅延）" name="Automatic Alpha Masks (deferred)"/>
-			<menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)"/>
-			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
-			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
-			<menu_item_check label="アンビエントを無効にする" name="Disable Ambient"/>
-			<menu_item_check label="日の出を無効にする" name="Disable Sunlight"/>
-			<menu_item_check label="近くの光を無効にする" name="Disable Local Lights"/>
-			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
-			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
-			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>
-			<menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects"/>
-			<menu_item_call label="キャッシュをすぐにクリア" name="Cache Clear"/>
-		</menu>
-		<menu label="ネットワーク" name="Network">
-			<menu_item_check label="エージェントを一時停止する" name="AgentPause"/>
-			<menu_item_call label="メッセージログを有効にする" name="Enable Message Log"/>
-			<menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log"/>
-			<menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects"/>
-			<menu_item_check label="挿入されたオブジェクトの位置の Ping" name="Ping Interpolate Object Positions"/>
-			<menu_item_call label="パケットドロップ" name="Drop a Packet"/>
-		</menu>
-		<menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
-		<menu label="レコーダー" name="Recorder">
-			<menu_item_call label="再生開始" name="Start Playback"/>
-			<menu_item_call label="再生停止" name="Stop Playback"/>
-			<menu_item_check label="再生をループ" name="Loop Playback"/>
-			<menu_item_call label="記録開始" name="Start Record"/>
-			<menu_item_call label="記録停止" name="Stop Record"/>
-		</menu>
-		<menu label="世界" name="DevelopWorld">
-			<menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override"/>
-			<menu_item_check label="固定された天気" name="Fixed Weather"/>
-			<menu_item_call label="リージョンオブジェクトのキャッシュをダンプ" name="Dump Region Object Cache"/>
-		</menu>
-		<menu label="UI" name="UI">
-			<menu_item_call label="メディアブラウザ" name="Media Browser"/>
-			<menu_item_call label="SelectMgr をダンプ" name="Dump SelectMgr"/>
-			<menu_item_call label="インベントリの出力" name="Dump Inventory"/>
-			<menu_item_call label="タイマーをダンプ" name="Dump Timers"/>
-			<menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
-			<menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
-			<menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
-			<menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
-			<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
-			<menu_item_check label="デバッグ表示" name="Debug Views"/>
-			<menu_item_check label="デバッグ名ツールチップ" name="Debug Name Tooltips"/>
-			<menu_item_check label="マウス操作で発生するもののデバッグ" name="Debug Mouse Events"/>
-			<menu_item_check label="デバッグキー" name="Debug Keys"/>
-			<menu_item_check label="WindowProc のデバッグ" name="Debug WindowProc"/>
-		</menu>
-		<menu label="XUI" name="XUI">
-			<menu_item_call label="色の設定を更新する" name="Reload Color Settings"/>
-			<menu_item_call label="フォントテストを表示する" name="Show Font Test"/>
-			<menu_item_check label="XUI ネームを表示する" name="Show XUI Names"/>
-			<menu_item_call label="テスト用 IM を送信する" name="Send Test IMs"/>
-			<menu_item_call label="名前のキャッシュをフラッシュ" name="Flush Names Caches"/>
-		</menu>
-		<menu label="アバター" name="Character">
-			<menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
-				<menu_item_call label="瞳" name="Grab Iris"/>
-				<menu_item_call label="頭" name="Grab Head"/>
-				<menu_item_call label="上半身" name="Grab Upper Body"/>
-				<menu_item_call label="下半身" name="Grab Lower Body"/>
-				<menu_item_call label="スカート" name="Grab Skirt"/>
-			</menu>
-			<menu label="キャラクターテスト" name="Character Tests">
-				<menu_item_call label="容姿を XML に保存する" name="Appearance To XML"/>
-				<menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
-				<menu_item_call label="男性アバターのテスト" name="Test Male"/>
-				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
-				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
-			</menu>
-			<menu label="アニメーションのスピード" name="Animation Speed">
-				<menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/>
-				<menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/>
-				<menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/>
-				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
-			</menu>
-			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
-			<menu_item_check label="アニメーション情報" name="Animation Info"/>
-			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
-			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
-			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
-			<menu_item_check label="LOD を無効にする" name="Disable LOD"/>
-			<menu_item_check label="キャラクター Vis のデバッグ" name="Debug Character Vis"/>
-			<menu_item_check label="骨組みの衝突判定を表示する" name="Show Collision Skeleton"/>
-			<menu_item_check label="骨を表示" name="Show Bones"/>
-			<menu_item_check label="エージェントのターゲットを表示する" name="Display Agent Target"/>
-			<menu_item_check label="インポスターの範囲を表示" name="Show Impostor Extents"/>
-			<menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
-			<menu_item_call label="アバターテクスチャをデバッグ" name="Debug Avatar Textures"/>
-			<menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/>
-		</menu>
-		<menu_item_check label="HTTP Texture" name="HTTP Textures"/>
-		<menu_item_call label="圧縮画像" name="Compress Images"/>
-		<menu_item_call label="Visual Leak Detector を有効にする" name="Enable Visual Leak Detector"/>
-		<menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
-		<menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/>
-		<menu label="ログレベルを設定" name="Set Logging Level">
-			<menu_item_check label="デバッグ" name="Debug"/>
-			<menu_item_check label="情報" name="Info"/>
-			<menu_item_check label="警告" name="Warning"/>
-			<menu_item_check label="エラー" name="Error"/>
-			<menu_item_check label="なし" name="None"/>
-		</menu>
-		<menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options"/>
-		<menu_item_call label="管理者ステータス解除" name="Leave Admin Options"/>
-		<menu_item_check label="管理者メニューを表示する" name="View Admin Options"/>
-		<menu_item_check name="Show Avatar Render Info" label="アバター描画情報を表示"/>
-		<menu_item_call name="Playback event recording" label="イベントの記録を再生する"/>
-		<menu_item_call name="FB Connect Test" label="FB コンテンツテスト"/>
-		<menu_item_call name="Stop event recording" label="イベントの記録を停止する"/>
-		<menu_item_call name="Start event recording" label="イベントの記録を開始する"/>
-	</menu>
-	<menu label="管理者" name="Admin">
-		<menu label="オブジェクト" name="AdminObject">
-			<menu_item_call label="コピーを取る" name="Admin Take Copy"/>
-			<menu_item_call label="私を所有者にする" name="Force Owner To Me"/>
-			<menu_item_call label="所有者権限の実行" name="Force Owner Permissive"/>
-			<menu_item_call label="削除" name="Delete"/>
-			<menu_item_call label="ロック" name="Lock"/>
-			<menu_item_call label="アセット ID を取得" name="Get Assets IDs"/>
-		</menu>
-		<menu label="区画" name="Parcel">
-			<menu_item_call label="私を所有者にする" name="Owner To Me"/>
-			<menu_item_call label="リンデンコンテンツに設定する" name="Set to Linden Content"/>
-			<menu_item_call label="パブリックの土地を取得する" name="Claim Public Land"/>
-		</menu>
-		<menu label="リージョン/地域" name="Region">
-			<menu_item_call label="一時アセットデータをダンプ" name="Dump Temp Asset Data"/>
-			<menu_item_call label="リージョンの状態を保存する" name="Save Region State"/>
-		</menu>
-		<menu_item_call label="グリッドツール" name="God Tools"/>
-	</menu>
-	<menu label="管理者" name="Deprecated">
-		<menu label="オブジェクトを取り付ける" name="Attach Object"/>
-		<menu label="オブジェクトを取り外す" name="Detach Object"/>
-		<menu label="衣類を脱ぐ" name="Take Off Clothing">
-			<menu_item_call label="シャツ" name="Shirt"/>
-			<menu_item_call label="パンツ" name="Pants"/>
-			<menu_item_call label="靴" name="Shoes"/>
-			<menu_item_call label="靴下" name="Socks"/>
-			<menu_item_call label="ジャケット" name="Jacket"/>
-			<menu_item_call label="手袋" name="Gloves"/>
-			<menu_item_call label="下着シャツ" name="Menu Undershirt"/>
-			<menu_item_call label="下着パンツ" name="Menu Underpants"/>
-			<menu_item_call label="スカート" name="Skirt"/>
-			<menu_item_call label="アルファ" name="Alpha"/>
-			<menu_item_call label="タトゥ" name="Tattoo"/>
-			<menu_item_call label="ユニバーサル" name="Universal"/>
-			<menu_item_call label="物理作用" name="Physics"/>
-			<menu_item_call label="すべての衣類" name="All Clothes"/>
-		</menu>
-		<menu label="ヘルプ" name="DeprecatedHelp">
-			<menu_item_call label="リンデン公式ブログ" name="Official Linden Blog"/>
-			<menu_item_call label="スクリプトポータル" name="Scripting Portal"/>
-			<menu label="バグの報告" name="Bug Reporting">
-				<menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker"/>
-				<menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help"/>
-				<menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101"/>
-				<menu_item_call label="セキュリティ問題" name="Security Issues"/>
-				<menu_item_call label="QA Wiki" name="QA Wiki"/>
-			</menu>
-		</menu>
-	</menu>
-</menu_bar>
+  <menu label="私" name="Me">
+    <menu_item_call label="プロフィール…" name="Profile" />
+    <menu_item_check label="インベントリ…" name="Inventory" />
+    <menu_item_call label="新しいインベントリウィンドウ" name="NewInventoryWindow" />
+    <menu_item_call label="場所…" name="Places" />
+    <menu_item_call label="ピック…" name="Picks" />
+    <menu_item_call label="体験…" name="Experiences" />
+    <menu_item_call label="カメラコントロール…" name="Camera Controls" />
+
+    <menu_item_separator />
+    <menu_item_check label="一時退席中" name="Away" />
+    <menu_item_check label="着信拒否" name="Do Not Disturb" />
+
+    <menu_item_separator />
+    <!-- L$は空白になってしまうため翻訳を変更 -->
+    <menu_item_call label="リンデンドルの購入…" name="Buy and Sell L$" />
+    <menu_item_call label="マーケットプレイスのリスト…" name="MarketplaceListings" />
+    <menu_item_call label="アカウントのダッシュボード…" name="Manage My Account" />
+    <menu_item_call label="[Membership]" name="Membership" />
+
+    <menu_item_separator />
+
+    <menu_item_call label="初期設定…" name="Preferences" />
+    <menu_item_call label="ツールバーのボタン…" name="Toolbars" />
+    <menu_item_call label="全てのコントロールを隠す" name="Hide UI" shortcut="control|shift|U" />
+    <menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H" />
+
+    <menu_item_separator />
+    <menu_item_call label="[APP_NAME]の終了" name="Quit" />
+  </menu>
+
+  <menu label="アバター" name="Avatar">
+    <menu_item_call label="着用中…" name="NowWearing" />
+    <menu_item_call label="アウトフィット…" name="ChangeOutfit" />
+    <menu_item_call label="ホバーする高さ…" name="Hover Height" />
+    <menu_item_call label="シェイプの編集…" name="Edit My Shape" />
+    <menu_item_call label="アウトフィットパーツの編集…" name="Edit Outfit" />
+    <menu label="脱ぐ　▶" name="Take Off &gt;">
+      <menu label="服装　▶" name="Clothes &gt;">
+        <menu_item_call label="シャツ" name="Shirt" />
+        <menu_item_call label="ズボン" name="Pants" />
+        <menu_item_call label="スカート" name="Skirt" />
+        <menu_item_call label="靴" name="Shoes" />
+        <menu_item_call label="靴下" name="Socks" />
+        <menu_item_call label="上着" name="Jacket" />
+        <menu_item_call label="手袋" name="Gloves" />
+        <menu_item_call label="下着（上半身）" name="Self Undershirt" />
+        <menu_item_call label="下着（下半身）" name="Self Underpants" />
+        <menu_item_call label="タトゥ" name="Self Tattoo" />
+        <menu_item_call label="物理作用" name="Self Physics" />
+        <menu_item_call label="アルファ" name="Self Alpha" />
+        <menu_item_separator />
+        <menu_item_call label="すべての服装" name="All Clothes" />
+      </menu>
+      <menu label="HUD" name="Avatar Detach HUD" />
+      <menu label="取り外し" name="Avatar Detach" />
+      <menu_item_call label="全てを取り外す" name="Detach All" />
+    </menu>
+    <menu_item_separator />
+    <menu_item_call label="アバターを選択…" name="Avatar Picker" />
+    <menu_item_separator />
+
+    <menu_item_call label="座る／立つ" shortcut="alt|shift|S" name="Sit stand" />
+    <menu_item_call label="飛行／歩行" name="Fly land" shortcut="HOME" />
+    <menu_item_call label="アニメーション停止" name="Stop Animating My Avatar" />
+    <menu_item_check label="歩行／走行／飛行…" name="WalkRunFly" />
+    <menu_item_check label="常時走行" name="Always Run" shortcut="control|R" />
+    <menu_item_separator />
+    <menu_item_check label="ジェスチャー…" name="Gestures" shortcut="control|G" />
+    <menu_item_separator />
+    <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+    <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+    <menu_item_call label="スクリプトを装着…" name="MyScripts" />
+    <menu_item_separator />
+    <menu_item_call label="アバターに関するヘルプ…" name="Help with avatars" />
+  </menu>
+  <menu label="コミュニケーション" name="Communicate">
+    <menu_item_check label="会話…" name="Conversations" />
+    <menu_item_check label="近くのチャット…" name="Nearby Chat" />
+    <menu_item_check label="ボイスチャット" name="Speak" />
+    <menu_item_check label="会話ログ…" name="Conversation Log..." />
+    <menu label="ボイスモーフィング" name="VoiceMorphing">
+      <menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing" />
+      <menu_item_check label="プレビュー…" name="Preview" />
+      <menu_item_call label="申し込む…" name="Subscribe" />
+      <menu_item_call label="プレミアム会員特典…" name="PremiumPerk" />
+    </menu>
+    <menu_item_check label="ジェスチャー…" name="Gestures" />
+    <menu_item_check label="フレンド" name="My Friends" />
+    <menu_item_check label="グループ" name="My Groups" />
+    <menu_item_check label="近くにいる人物" name="Active Speakers" />
+    <menu_item_check label="リストをブロック" name="Block List" />
+    <menu_item_check label="着信拒否" name="Do Not Disturb" />
+  </menu>
+  <menu label="世界" name="World">
+    <menu_item_call label="現在地をランドマーク" name="Create Landmark Here" />
+    <menu_item_call label="行き先…" name="Destinations" />
+    <menu_item_check label="ワールドマップ" name="World Map" />
+    <menu_item_check label="ミニマップ" name="Mini-Map" />
+    <menu_item_call label="イベント" name="Events" />
+    <menu_item_check label="検索…" name="Search" />
+    <menu_item_separator />
+    <menu_item_call label="ホームにテレポート" name="Teleport Home" />
+    <menu_item_call label="現在地をホームに設定" name="Set Home to Here" />
+    <menu_item_separator />
+    <menu_item_call label="スナップショット" name="Take Snapshot" />
+
+    <menu_item_call label="360度スナップショット" name="Capture 360" />
+    <menu_item_call label="場所のプロフィール" name="Place Profile" />
+    <menu_item_separator />
+    <menu_item_call label="土地情報" name="About Land" />
+    <menu_item_call label="リージョン（地域）／不動産" name="RegionEstate" />
+    <menu_item_call label="自分のLindenホーム…" name="Linden Home" />
+    <menu_item_call label="自分の所有地…" name="My Land" />
+    <menu_item_call label="この土地を購入" name="Buy Land" />
+
+    <menu_item_separator />
+
+    <menu label="表示" name="LandShow">
+      <menu_item_check label="立入禁止ライン" name="Ban Lines" />
+      <menu_item_check label="ビーコン（標識）" name="beacons" />
+      <menu_item_check label="敷地の境界線" name="Property Lines" />
+      <menu_item_check label="土地所有者" name="Land Owners" />
+      <menu_item_check label="座標" name="Coordinates" />
+      <menu_item_check label="区画のプロパティ" name="Parcel Properties" />
+      <menu_item_separator />
+      <menu_item_check label="拡張メニュー" name="Show Advanced Menu" />
+    </menu>
+
+    <!--
+    <menu_item_separator/>
+    <menu_item_check label="ナビゲーションバーを表示" name="ShowNavbarNavigationPanel"/>
+    <menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
+    <menu_item_separator/>
+    -->
+
+    <menu label="環境" name="Environment">
+      <menu_item_check label="夜明け" name="Sunrise" />
+      <menu_item_check label="正午" name="Noon" />
+      <menu_item_check label="夕方" name="Sunset" />
+      <menu_item_check label="深夜" name="Midnight" />
+      <menu_item_check label="共有された環境を使用" name="Use Shared Environment" />
+      <menu_item_call label="自分の環境…" name="my_environs" />
+      <menu_item_call label="個人的な照明…" name="adjustment_tool" />
+      <menu_item_check label="雲を一時停止" name="pause_clouds" />
+    </menu>
+  </menu>
+
+  <!--
+  <menu create_jump_keys="true" label="環境編集" name="Environment Editor" tear_off="true">
+    <menu_item_call label="初期設定…" name="Environment Settings"/>
+    <menu_item_separator/>
+    <menu name="Water Presets" label="水のプリセット"/>
+    <menu name="Sky Presets" label="空のプリセット">
+      <menu_item_call label="新規プリセット…" name="new_sky_preset"/>
+      <menu_item_call label="プリセット編集…" name="edit_sky_preset"/>
+    </menu>
+    <menu name="Day Presets" label="日のプリセット">
+      <menu_item_call label="新規プリセット…" name="new_day_preset"/>
+      <menu_item_call label="プリセット編集…" name="edit_day_preset"/>
+    </menu>
+  </menu>
+  -->
+
+  <menu label="制作" name="BuildTools">
+    <menu_item_check label="制作" name="Show Build Tools" />
+    <menu label="制作ツールを選択する" name="Select Tool">
+      <menu_item_call label="フォーカスツール" name="Focus" />
+      <menu_item_call label="移動ツール" name="Move" />
+      <menu_item_call label="編集ツール" name="Edit" />
+      <menu_item_call label="作成ツール" name="Create" />
+      <menu_item_call label="土地ツール" name="Land" />
+    </menu>
+    <menu_item_call label="リンク" name="Link" />
+    <menu_item_call label="リンク解除" name="Unlink" />
+    <menu_item_check label="リンク部分を編集" name="Edit Linked Parts" />
+    <menu label="要素を選択" name="Select Elements">
+      <menu_item_call label="次のパーツまたは面を選択" name="Select Next Part or Face" />
+      <menu_item_call label="前のパーツまたは面を選択" name="Select Previous Part or Face" />
+      <menu_item_call label="次のパーツまたは面を含める" name="Include Next Part or Face" />
+      <menu_item_call label="前のパーツまたは面を含める" name="Include Previous Part or Face" />
+    </menu>
+    <menu_item_call label="リージョン（地域）オブジェクト" name="pathfinding_linkset_menu_item" />
+    <menu_item_separator />
+    <menu_item_call label="選択をフォーカス" name="Focus on Selection" />
+    <menu_item_call label="選択をズーム" name="Zoom to Selection" />
+    <menu_item_separator />
+    <menu label="オブジェクト" name="Object">
+      <menu_item_call label="購入" name="Menu Object Buy" />
+      <menu_item_call label="取得" name="Menu Object Take" />
+      <menu_item_call label="コピーを取得" name="Take Copy" />
+      <menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents" />
+      <menu_item_call label="オブジェクトを返却" name="Return Object back to Owner" />
+      <menu_item_call label="複製" name="DuplicateObject" />
+    </menu>
+    <menu label="スクリプト" name="Scripts">
+      <menu_item_check label="スクリプトの警告／エラー…" name="Script debug" />
+      <menu_item_call label="スクリプトのリコンパイル（Mono）" name="Mono" />
+      <menu_item_call label="スクリプトのリコンパイル（LSL）" name="LSL" />
+      <menu_item_call label="スクリプトのリセット" name="Reset Scripts" />
+      <menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running" />
+      <menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running" />
+    </menu>
+
+    <menu label="経路探索" name="Pathfinding">
+      <menu_item_call label="リージョン（地域）のオブジェクト" name="pathfinding_linksets_menu_item" />
+      <menu_item_call label="キャラクター…" name="pathfinding_characters_menu_item" />
+      <menu_item_call label="表示／テスト…" name="pathfinding_console_menu_item" />
+      <menu_item_call label="リージョン（地域）の再構築" name="pathfinding_rebake_navmesh_item" />
+    </menu>
+
+
+    <menu_item_separator />
+
+    <menu label="オプション" name="Options">
+      <menu_item_check label="権限の詳細を表示する" name="DebugPermissions" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="自分のオブジェクトだけを選択する" name="Select Only My Objects" />
+      <menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects" />
+      <menu_item_check label="範囲内を選択する" name="Select By Surrounding" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="選択外形を表示" name="Show Selection Outlines" />
+      <menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection" />
+      <menu_item_check label="選択した光の効果範囲を表示する" name="Show Light Radius for Selection" />
+      <menu_item_check label="選択ビームを表示する" name="Show Selection Beam" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="グリッド吸着" name="Snap to Grid" />
+      <menu_item_call label="オブジェクトのＸＹ軸をグリッドに吸着" name="Snap Object XY to Grid" />
+      <menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid" />
+      <menu_item_call label="グリッドオプション…" name="Grid Options" />
+      <menu_item_call label="デフォルトの権限設定…" name="Set default permissions" />
+    </menu>
+    <menu label="アップロード" name="Upload">
+      <menu_item_call label="画像（L$ [COST]）…" name="Upload Image" />
+      <menu_item_call label="サウンド（L$ [COST]）…" name="Upload Sound" />
+      <menu_item_call label="アニメーション（L$ [COST]）…" name="Upload Animation" />
+      <menu_item_call label="モデル" name="Upload Model" />
+      <menu_item_call label="一括 （ファイルにつきL$ [COST]）…" name="Bulk Upload" />
+    </menu>
+    <menu_item_separator />
+    <menu_item_call label="取り消し" name="Undo" />
+    <menu_item_call label="やり直し" name="Redo" />
+  </menu>
+  <menu label="ヘルプ" name="Help">
+    <menu_item_call label="ハウツー…" name="How To" />
+    <!-- <menu_item_call label="チュートリアル" name="Tutorial" /> -->
+    <menu_item_call label="ナレッジベース" name="Knowledge Base" />
+    <menu_item_call label="Wiki" name="Wiki" />
+    <menu_item_call label="コミュニティフォーラム" name="Community Forums" />
+    <menu_item_call label="日本語サポートページ" name="Support portal" />
+    <menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News" />
+    <menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs" />
+    <menu_item_separator />
+
+    <menu_item_call label="嫌がらせを報告する" name="Report Abuse" />
+    <menu_item_call label="バグを報告する" name="Report Bug" />
+    <menu_item_separator />
+
+    <menu_item_call label="衝突・プッシュ＆打撃" name="Bumps, Pushes &amp;amp; Hits" />
+    <menu_item_call label="[APP_NAME]について" name="About Second Life" />
+  </menu>
+  <menu label="拡張" name="Advanced">
+    <menu_item_call label="テクスチャをリベークする" name="Rebake Texture" />
+    <menu_item_call label="UIサイズをデフォルトにする" name="Set UI Size to Default" />
+    <menu_item_call label="ウィンドウサイズ設定…" name="Set Window Size..." />
+
+    <menu_item_separator />
+
+    <menu_item_check label="遠くのオブジェクトを選択しない" name="Limit Select Distance" />
+    <menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance" />
+
+    <menu_item_separator />
+
+    <menu label="パフォーマンスツール" name="Performance Tools">
+      <menu_item_call label="遅延メーター" name="Lag Meter" />
+      <menu_item_check label="統計バー" name="Statistics Bar" />
+      <menu_item_call label="シーン負荷の統計情報" name="Scene Load Statistics" />
+      <menu_item_check label="アバターの複雑さ情報を表示" name="Avatar Draw Info" />
+    </menu>
+    <menu label="ハイライトと表示" name="Highlighting and Visibility">
+      <menu_item_check label="ビーコンを簡素化" name="Cheesy Beacon" />
+      <menu_item_check label="パーティクルを非表示" name="Hide Particles" />
+      <menu_item_check label="選択を非表示" name="Hide Selected" />
+      <menu_item_check label="透明部分をハイライト" name="Highlight Transparent" />
+      <menu_item_check label="一人称視点のときに十字線を表示" name="ShowCrosshairs" />
+      <!--
+      <menu create_jump_keys="true" label="ホバーでTips表示" name="Hover Tips" tear_off="true">
+        <menu_item_check label="Tips表示" name="Show Tips" shortcut="control|shift|T"/>
+
+        <menu_item_separator/>
+
+        <menu_item_check label="土地のツールチップを表示" name="Land Tips"/>
+        <menu_item_check label="すべてのオブジェクトのツールチップを表示" name="Tips On All Objects"/>
+      </menu>
+      -->
+    </menu>
+    <menu label="レンダリング種別" name="Rendering Types">
+      <menu_item_check label="シンプル" name="Rendering Type Simple" />
+      <menu_item_check label="アルファ" name="Rendering Type Alpha" />
+      <menu_item_check label="木" name="Rendering Type Tree" />
+      <menu_item_check label="アバター" name="Rendering Type Character" />
+      <menu_item_check label="アニメッシュ" name="Rendering Type Control Avatar" />
+      <menu_item_check label="サーフェスパッチ" name="Rendering Type Surface Patch" />
+      <menu_item_check label="空" name="Rendering Type Sky" />
+      <menu_item_check label="水" name="Rendering Type Water" />
+      <menu_item_check label="地面" name="Rendering Type Ground" />
+      <menu_item_check label="ボリューム" name="Rendering Type Volume" />
+      <menu_item_check label="草" name="Rendering Type Grass" />
+      <menu_item_check label="雲" name="Rendering Type Clouds" />
+      <menu_item_check label="パーティクル" name="Rendering Type Particles" />
+      <menu_item_check label="衝突" name="Rendering Type Bump" />
+    </menu>
+    <menu label="レンダリング機能" name="Rendering Features">
+      <menu_item_check label="UI" name="ToggleUI" />
+      <menu_item_check label="選択済" name="Selected" />
+      <menu_item_check label="ハイライト" name="Highlighted" />
+      <menu_item_check label="動的テクスチャ" name="Dynamic Textures" />
+      <menu_item_check label="足の影" name="Foot Shadows" />
+      <menu_item_check label="フォグ" name="Fog" />
+      <menu_item_check label="FRInfoのテスト" name="Test FRInfo" />
+      <menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects" />
+    </menu>
+    <menu_item_check label="プラグイン読み取りスレッドを使用" name="Use Plugin Read Thread" />
+    <menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache" />
+    <menu_item_check label="マウスの平滑化" name="Mouse Smoothing" />
+    <menu_item_call label="リリースキー" name="Release Keys" />
+
+    <menu_item_separator />
+
+    <menu label="ショートカット" name="Shortcuts">
+
+      <menu_item_call label="ウィンドウを閉じる" name="Close Window" />
+      <menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="スナップショットをディスクに保存する" name="Snapshot to Disk" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="マウスルック" name="Mouselook" />
+      <menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam" />
+      <menu_item_call label="表示をリセットする" name="Reset View" />
+      <menu_item_call label="最後の発言者を見る" name="Look at Last Chatter" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="ズーム・イン" name="Zoom In" />
+      <menu_item_call label="ズーム（デフォルト）" name="Zoom Default" />
+      <menu_item_call label="ズーム・アウト" name="Zoom Out" />
+    </menu>
+    <!--Shortcuts-->
+    <menu_item_call label="デバッグ設定を表示する" name="Debug Settings" />
+    <menu_item_check label="開発メニューを表示する" name="Debug Mode" />
+  </menu>
+
+
+  <menu label="開発" name="Develop">
+    <menu label="コンソール" name="Consoles">
+      <menu_item_check label="テクスチャのコンソール" name="Texture Console" />
+      <menu_item_check label="デバッグコンソール" name="Debug Console" />
+      <menu_item_call label="通知コンソール" name="Notifications" />
+      <menu_item_check label="リージョン（地域）デバッグコンソール" name="Region Debug Console" />
+      <menu_item_check label="ファーストタイマー" name="Fast Timers" />
+      <menu_item_check label="メモリ" name="Memory" />
+      <menu_item_check label="シーンの統計" name="Scene Statistics" />
+      <menu_item_check label="シーンの読み込みモニター" name="Scene Loading Monitor" />
+      <menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console" />
+      <menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console" />
+      <menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="カメラ" name="Camera" />
+      <menu_item_check label="風" name="Wind" />
+      <menu_item_check label="FOV" name="FOV" />
+      <menu_item_check label="バッジ" name="Badge" />
+    </menu>
+    <menu label="情報を表示" name="Display Info">
+      <menu_item_check label="時間を表示する" name="Show Time" />
+      <menu_item_check label="アップロードコストを表示" name="Show Upload Cost" />
+      <menu_item_check label="描画情報を表示する" name="Show Render Info" />
+      <menu_item_check label="アバターの描画情報を表示" name="Show Avatar Render Info" />
+      <menu_item_check label="テクスチャ情報を表示" name="Show Texture Info" />
+      <menu_item_check label="マトリックスを表示する" name="Show Matrices" />
+      <menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor" />
+      <menu_item_check label="メモリを表示" name="Show Memory" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates" />
+    </menu>
+    <menu label="エラー実行" name="Force Errors">
+      <menu_item_call label="ブレークポイント" name="Force Breakpoint" />
+      <menu_item_call label="LLErrorとクラッシュを実行する" name="Force LLError And Crash" />
+      <menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access" />
+      <menu_item_call label="無限ループ" name="Force Infinite Loop" />
+      <menu_item_call label="ドライバのクラッシュを実行する" name="Force Driver Carsh" />
+      <menu_item_call label="ソフトウェア例外エラーの実行する" name="Force Software Exception" />
+      <menu_item_call label="ビューアーの接続遮断を実行する" name="Force Disconnect Viewer" />
+      <menu_item_call label="メモリリークをシミュレートする" name="Memory Leaking Simulation" />
+    </menu>
+    <menu label="描画テスト" name="Render Tests">
+      <menu_item_check label="カメラのオフセット" name="Camera Offset" />
+      <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate" />
+      <menu_item_check label="周期的な遅いフレーム" name="Periodic Slow Frame" />
+      <menu_item_check label="フレームテスト" name="Frame Test" />
+      <menu_item_call label="フレームプロフィール" name="Frame Profile" />
+      <menu_item_call label="ベンチマーク" name="Benchmark" />
+    </menu>
+    <menu label="メタデータの描画" name="Render Metadata">
+      <menu_item_check label="バウンディングボックス" name="Bounding Boxes" />
+      <menu_item_check label="普通" name="Normals" />
+      <menu_item_check label="八分木" name="Octree" />
+      <menu_item_check label="シャドウ円錐" name="Shadow Frusta" />
+      <menu_item_check label="実像" name="Physics Shapes" />
+      <menu_item_check label="オクルージョン" name="Occlusion" />
+      <menu_item_check label="バッチの描画" name="Render Batches" />
+      <menu_item_check label="タイプを更新" name="Update Type" />
+      <menu_item_check label="テクスチャのアニメ" name="Texture Anim" />
+      <menu_item_check label="テクスチャ優先度" name="Texture Priority" />
+      <menu_item_check label="テクスチャの範囲" name="Texture Area" />
+      <menu_item_check label="側面" name="Face Area" />
+      <menu_item_check label="LOD情報" name="LOD Info" />
+      <menu_item_check label="三角形の数" name="Triangle Count" />
+      <menu_item_check label="制作・キュー" name="Build Queue" />
+      <menu_item_check label="光" name="Lights" />
+      <menu_item_check label="パーティクル" name="Particles" />
+      <menu_item_check label="骨組みの衝突判定" name="Collision Skeleton" />
+      <menu_item_check label="ジョイント" name="Joints" />
+      <menu_item_check label="レイキャスト" name="Raycast" />
+      <menu_item_check label="風のベクトル" name="Wind Vectors" />
+      <menu_item_check label="彫刻" name="Sculpt" />
+      <menu label="テクスチャの密度" name="Texture Density">
+        <menu_item_check label="なし" name="None" />
+        <menu_item_check label="現在" name="Current" />
+        <menu_item_check label="望ましい" name="Desired" />
+        <menu_item_check label="フル" name="Full" />
+      </menu>
+    </menu>
+    <menu label="レンダリング" name="Rendering">
+      <menu_item_check label="軸" name="Axes" />
+      <menu_item_check label="接線基準" name="Tangent Basis" />
+      <menu_item_call label="選択されたテクスチャ情報基準" name="Selected Texture Info Basis" />
+      <menu_item_call label="選択したマテリアルの情報" name="Selected Material Info" />
+      <menu_item_check label="ワイヤーフレーム" name="Wireframe" />
+      <menu_item_check label="オブジェクト間のオクルージョン" name="Object-Object Occlusion" />
+      <menu_item_separator />
+
+      <menu_item_check label="高度なライティングモデル" name="Advanced Lighting Model" />
+      <menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors" />
+      <menu_item_check label="SSAOと影の平滑化" name="SSAO and Shadow Smoothing" />
+      <menu_item_separator />
+
+      <menu_item_check label="次回起動時にGLをデバッグ" name="Debug GL" />
+      <menu_item_check label="パイプラインをデバッグ" name="Debug Pipeline" />
+      <menu_item_check label="自動アルファマスク（遅延）" name="Automatic Alpha Masks (deferred)" />
+      <menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)" />
+      <menu_item_check label="アニメーションテクスチャ" name="Animation Textures" />
+      <menu_item_check label="テクスチャを無効にする" name="Disable Textures" />
+      <menu_item_check label="アンビエントを無効にする" name="Disable Ambient" />
+      <menu_item_check label="日の光を無効にする" name="Disable Sunlight" />
+      <menu_item_check label="近くの光を無効にする" name="Disable Local Lights" />
+      <menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures" />
+      <menu_item_check label="装着された光源を描画する" name="Render Attached Lights" />
+      <menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles" />
+      <menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects" />
+      <menu_item_separator />
+
+      <menu_item_call label="キャッシュをすぐにクリア" name="Cache Clear" />
+    </menu>
+
+    <menu label="ネットワーク" name="Network">
+      <menu_item_check label="エージェントを一時停止する" name="AgentPause" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="メッセージログを有効にする" name="Enable Message Log" />
+      <menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects" />
+      <menu_item_check label="挿入されたオブジェクトの位置のPing" name="Ping Interpolate Object Positions" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="パケットをドロップ" name="Drop a Packet" />
+    </menu>
+    <menu label="キャッシュ" name="Cache">
+      <menu_item_call label="ディスクキャッシュをパージ" name="Purge Disk Cache" />
+    </menu>
+    <menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera" />
+    <menu label="レコーダー" name="Recorder">
+      <menu_item_call label="イベントの記録開始" name="Start event recording" />
+      <menu_item_call label="イベントの記録停止" name="Stop event recording" />
+      <menu_item_call label="イベントの記録のプレイバック" name="Playback event recording" />
+
+      <menu_item_call label="再生開始" name="Start Playback" />
+      <menu_item_call label="再生停止" name="Stop Playback" />
+      <menu_item_check label="再生をループ" name="Loop Playback" />
+      <menu_item_call label="記録開始" name="Start Record" />
+      <menu_item_call label="記録停止" name="Stop Record" />
+    </menu>
+
+    <menu label="世界" name="DevelopWorld">
+      <menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override" />
+      <menu_item_check label="固定された天気" name="Fixed Weather" />
+      <menu_item_call label="リージョンオブジェクトのキャッシュをダンプ" name="Dump Region Object Cache" />
+
+      <menu_item_call label="関心リスト：フルアップデート" name="Interest List: Full Update" />
+    </menu>
+    <menu label="UI" name="UI">
+      <menu_item_call label="メディアブラウザ" name="Media Browser" />
+      <menu_item_call label="FB接続テスト" name="FB Connect Test" />
+      <menu_item_call label="SelectMgrをダンプ" name="Dump SelectMgr" />
+      <menu_item_call label="インベントリの出力" name="Dump Inventory" />
+      <menu_item_call label="タイマーをダンプ" name="Dump Timers" />
+      <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder" />
+      <menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info" />
+      <menu_item_call label="エージェント情報をプリント" name="Print Agent Info" />
+      <menu_item_separator />
+
+      <menu_item_check label="SelectMgrのデバッグ" name="Debug SelectMgr" />
+      <menu_item_check label="ダブルクリック" name="Debug Clicks" />
+      <menu_item_check label="デバッグ表示" name="Debug Views" />
+      <menu_item_check label="デバッグ名ツールチップ" name="Debug Name Tooltips" />
+      <menu_item_check label="マウスイベントのデバッグ" name="Debug Mouse Events" />
+      <menu_item_check label="デバッグキー" name="Debug Keys" />
+      <menu_item_check label="WindowProcのデバッグ" name="Debug WindowProc" />
+    </menu>
+    <menu label="XUI" name="XUI">
+      <menu_item_call label="色の設定をリロード" name="Reload Color Settings" />
+      <menu_item_call label="フォントテストを表示" name="Show Font Test" />
+      <menu_item_check label="XUI名を表示" name="Show XUI Names" />
+      <menu_item_call label="テストIMを送信する" name="Send Test IMs" />
+      <menu_item_call label="名前キャッシュをフラッシュ" name="Flush Names Caches" />
+    </menu>
+    <menu label="アバター" name="Character">
+      <menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
+        <menu_item_call label="瞳" name="Grab Iris" />
+        <menu_item_call label="頭" name="Grab Head" />
+        <menu_item_call label="上半身" name="Grab Upper Body" />
+        <menu_item_call label="下半身" name="Grab Lower Body" />
+        <menu_item_call label="スカート" name="Grab Skirt" />
+      </menu>
+      <menu label="キャラクターテスト" name="Character Tests">
+        <menu_item_call label="容姿をXMLに保存する" name="Appearance To XML" />
+        <menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry" />
+        <menu_item_call label="男性アバターのテスト" name="Test Male" />
+        <menu_item_call label="女性アバターのテスト" name="Test Female" />
+        <menu_item_check label="選択アバター許可" name="Allow Select Avatar" />
+      </menu>
+      <menu label="アニメーションの速度" name="Animation Speed">
+        <menu_item_call label="すべてのアニメーションを10%速く" name="All Animations 10 Faster" />
+        <menu_item_call label="すべてのアニメーションを10%遅く" name="All Animations 10 Slower" />
+        <menu_item_call label="すべてのアニメーションの速度をリセット" name="Reset All Animation Speed" />
+        <menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations" />
+      </menu>
+      <menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default" />
+      <menu_item_check label="アニメーション情報" name="Animation Info" />
+      <menu_item_check label="見ているものを表示する" name="Show Look At" />
+      <menu_item_check label="クリックした場所を表示する" name="Show Point At" />
+      <menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates" />
+      <menu_item_check label="LODを無効にする" name="Disable LOD" />
+      <menu_item_check label="キャラクターVisのデバッグ" name="Debug Character Vis" />
+      <menu_item_check label="スケルトンの衝突判定を表示する" name="Show Collision Skeleton" />
+      <menu_item_check label="ボーンを表示" name="Show Bones" />
+      <menu_item_check label="エージェントの目標を表示する" name="Display Agent Target" />
+      <menu_item_check label="インポスターの範囲を表示" name="Show Impostor Extents" />
+      <!-- Appears not to exist anymore
+      <menu_item_check label="回転をデバッグ" name="Debug Rotation" />
+      -->
+      <menu_item_call label="装着物のダンプ" name="Dump Attachments" />
+      <menu_item_call label="アバターのテクスチャをデバッグ" name="Debug Avatar Textures" />
+      <menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures" />
+    </menu>
+
+    <menu_item_separator />
+
+    <menu_item_check label="HTTPテスクチャ" name="HTTP Textures" />
+    <menu_item_call label="圧縮画像" name="Compress Images" />
+    <menu_item_call label="圧縮ファイルテスト" name="Compress File Test" />
+
+    <menu_item_call label="Visual Leak Detectorを有効にする" name="Enable Visual Leak Detector" />
+
+    <menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump" />
+    <menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window" />
+    <menu label="ログレベルを設定" name="Set Logging Level">
+      <menu_item_check label="デバッグ" name="Debug" />
+      <menu_item_check label="情報" name="Info" />
+      <menu_item_check label="警告" name="Warning" />
+      <menu_item_check label="エラー" name="Error" />
+      <menu_item_check label="なし" name="None" />
+    </menu>
+
+    <menu_item_separator />
+
+    <menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options" />
+    <menu_item_call label="管理者ステータス解除" name="Leave Admin Options" />
+    <menu_item_check label="管理者メニューを表示する" name="View Admin Options" />
+  </menu>
+  <menu label="管理" name="Admin">
+    <menu label="オブジェクト" name="AdminObject">
+      <menu_item_call label="コピーを取る" name="Admin Take Copy" />
+      <menu_item_call label="自分を所有者にする" name="Force Owner To Me" />
+      <menu_item_call label="所有者権限の実行" name="Force Owner Permissive" />
+      <menu_item_call label="削除" name="Delete" />
+      <menu_item_call label="ロック" name="Lock" />
+      <menu_item_call label="アセットのIDを取得" name="Get Assets IDs" />
+    </menu>
+    <menu label="区画" name="Parcel">
+      <menu_item_call label="自分を所有者にする" name="Owner To Me" />
+      <menu_item_call label="Lindenのコンテンツに設定する" name="Set to Linden Content" />
+      <menu_item_call label="パブリックの土地を取得する" name="Claim Public Land" />
+    </menu>
+    <menu label="リージョン（地域）" name="Region">
+      <menu_item_call label="一時アセットデータのダンプ" name="Dump Temp Asset Data" />
+      <menu_item_call label="リージョンの状態を保存する" name="Save Region State" />
+    </menu>
+    <menu_item_call label="神のツール" name="God Tools" />
+  </menu>
+  <menu label="管理者" name="Deprecated">
+    <menu label="オブジェクトを取り付ける" name="Attach Object" />
+    <menu label="オブジェクトを取り外す" name="Detach Object" />
+    <menu label="服装を脱ぐ" name="Take Off Clothing">
+      <menu_item_call label="シャツ" name="Shirt" />
+      <menu_item_call label="ズボン" name="Pants" />
+      <menu_item_call label="靴" name="Shoes" />
+      <menu_item_call label="靴下" name="Socks" />
+      <menu_item_call label="ジャケット" name="Jacket" />
+      <menu_item_call label="手袋" name="Gloves" />
+      <menu_item_call label="下着（上半身）" name="Menu Undershirt" />
+      <menu_item_call label="下着（下半身）" name="Menu Underpants" />
+      <menu_item_call label="スカート" name="Skirt" />
+      <menu_item_call label="アルファ" name="Alpha" />
+      <menu_item_call label="タトゥ" name="Tattoo" />
+      <menu_item_call label="ユニバーサル" name="Universal" />
+      <menu_item_call label="物理作用" name="Physics" />
+      <menu_item_call label="すべての服装" name="All Clothes" />
+    </menu>
+    <menu label="ヘルプ" name="DeprecatedHelp">
+      <menu_item_call label="リンデン公式ブログ" name="Official Linden Blog" />
+      <menu_item_call label="スクリプトポータル" name="Scripting Portal" />
+      <menu label="バグの報告" name="Bug Reporting">
+        <menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker" />
+        <menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help" />
+
+        <menu_item_separator />
+
+        <menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101" />
+        <menu_item_call label="セキュリティ問題" name="Security Issues" />
+        <menu_item_call label="QA Wiki" name="QA Wiki" />
+      </menu>
+    </menu>
+  </menu>
+</menu_bar>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
index 02029230ba..f6473c1e82 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit Wearable Context Menu">
-	<menu_item_call label="交換" name="wear_replace"/>
-	<menu_item_call label="装着" name="wear_wear"/>
-	<menu_item_call label="追加" name="wear_add"/>
-	<menu_item_call label="触る" name="touch" />
-	<menu_item_call label="取り外す" name="take_off_or_detach"/>
-	<menu_item_call label="取り外す" name="detach"/>
-	<context_menu label="装着：" name="wearable_attach_to"/>
-	<context_menu label="HUD に装着" name="wearable_attach_to_hud"/>
-	<menu_item_call label="取り外す" name="take_off"/>
-	<menu_item_call label="編集" name="edit"/>
-	<menu_item_call label="アイテムのプロフィール" name="object_profile"/>
-	<menu_item_call label="オリジナルを表示" name="show_original"/>
-</context_menu>
+  <menu_item_call label="着替える" name="wear_replace" />
+  <menu_item_call label="着る" name="wear_wear" />
+  <menu_item_call label="追加" name="wear_add" />
+  <menu_item_call label="触る" name="touch" />
+  <menu_item_call label="脱ぐ" name="take_off_or_detach" />
+  <menu_item_call label="取り外す" name="detach" />
+  <context_menu label="装着：" name="wearable_attach_to" />
+  <context_menu label="HUDに装着" name="wearable_attach_to_hud" />
+  <menu_item_call label="取り外す" name="take_off" />
+  <menu_item_call label="編集" name="edit" />
+  <menu_item_call label="アイテムのプロフィール" name="object_profile" />
+  <menu_item_call label="オリジナルを表示" name="show_original" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
index 48aac2ed05..75fa3f69b3 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Wearing">
-	<menu_item_call label="触る" name="touch"/>
-	<menu_item_call label="編集" name="edit_item"/>
-	<menu_item_call label="アウトフットの編集" name="edit_outfit"/>
-	<menu_item_call label="取り外す" name="takeoff"/>
-	<menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy"/>
-</toggleable_menu>
+  <menu_item_call label="触る" name="touch" />
+  <menu_item_call label="編集" name="edit_item" />
+  <menu_item_call label="アウトフィットの編集" name="edit_outfit" />
+  <menu_item_call label="脱ぐ" name="takeoff" />
+  <menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
index 8c331bc008..7845ff9aad 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Wearing">
-	<menu_item_call label="触る" name="touch_attach"/>
-	<menu_item_call label="取り外す" name="take_off"/>
-	<menu_item_call label="取り外す" name="detach"/>
-	<menu_item_call label="アウトフットの編集" name="edit_outfit"/>
-	<menu_item_call label="編集" name="edit_item"/>
-	<menu_item_call label="オリジナルを表示" name="show_original"/>
-</context_menu>
+  <menu_item_call label="触る" name="touch_attach" />
+  <menu_item_call label="脱ぐ" name="take_off" />
+  <menu_item_call label="取り外す" name="detach" />
+  <menu_item_call label="アウトフィットの編集" name="edit_outfit" />
+  <menu_item_call label="編集" name="edit_item" />
+  <menu_item_call label="オリジナルを表示" name="show_original" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index 3b29a622a4..23bab3b0b2 100644
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
@@ -1,240 +1,143 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-	<widgetset name="web">
-		<label name="web_label">
-			Webコンテンツ
-		</label>
-		<tooltip name="web_tooltip">
-			ここにWebコンテンツがあります。
-		</tooltip>
-		<playtip name="web_playtip">
-			Webコンテンツを表示
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			ムービー
-		</label>
-		<tooltip name="movie_tooltip">
-			ここにはムービーがあります
-		</tooltip>
-		<playtip name="movie_playtip">
-			ムービー再生
-		</playtip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			画像
-		</label>
-		<tooltip name="image_tooltip">
-			ここには画像があります
-		</tooltip>
-		<playtip name="image_playtip">
-			ここの画像を表示
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			オーディオ
-		</label>
-		<tooltip name="audio_tooltip">
-			ここではオーディオが聞けます
-		</tooltip>
-		<playtip name="audio_playtip">
-			ここのオーディオを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			コンテンツなし
-		</label>
-		<tooltip name="none_tooltip">
-			ここにメディアなし
-		</tooltip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			リアルタイム・ストリーミング
-		</label>
-	</scheme>
-	<scheme name="example">
-		<label name="example_label">
-			例　プラグイン スキーム トリガー
-		</label>
-	</scheme>
-	<scheme name="libvlc">
-		<label name="libvlc_label">
-			LibVLC 対応メディア
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			-- なし --
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			-- なし --
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			オーディオ
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			画像
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			ムービー (QuickTime)
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Oggオーディオ/ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			PDFドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Postscriptドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			リッチ・テキスト (RTF)
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			同期マルチメディア統合言語(SMIL)
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Webページ (XHTML)
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			Macromedia Director
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			オーディオ (MIDI)
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			オーディオ (MP3)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			オーディオ (AIFF)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			オーディオ (WAV)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/bmp">
-		<label name="image/bmp_label">
-			画像 (BMP)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/gif">
-		<label name="image/gif_label">
-			画像 (GIF)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/jpeg">
-		<label name="image/jpeg_label">
-			画像 (JPEG)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/png">
-		<label name="image/png_label">
-			画像 (PNG)
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			画像 (SVG)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/tiff">
-		<label name="image/tiff_label">
-			画像 (TIFF)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="text/html">
-		<label name="text/html_label">
-			Webページ
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="text/plain">
-		<label name="text/plain_label">
-			テキスト
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/mpeg">
-		<label name="video/mpeg_label">
-			ムービー (MPEG)
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			ムービー (MP4)
-		</label>
-	</mimetype>
-	<mimetype name="application/octet-stream">
-		<label name="video/octet-stream">
-			ムービー
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
-		<label name="video/quicktime_label">
-			ムービー (QuickTime)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			ムービー (Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			ムービー (Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			ムービー (AVI)
-		</label>
-	</mimetype>
-</mimetypes>
+  <defaultlabel>（不明）</defaultlabel>
+  <defaultwidget>なし</defaultwidget>
+  <widgetset name="web">
+    <label name="web_label">Webコンテンツ</label>
+    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
+    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
+  </widgetset>
+  <widgetset name="movie">
+    <label name="movie_label">ムービー</label>
+    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
+    <playtip name="movie_playtip">ムービーを再生する</playtip>
+  </widgetset>
+  <widgetset name="image">
+    <label name="image_label">画像</label>
+    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
+    <playtip name="image_playtip">この場所の画像を表示する</playtip>
+  </widgetset>
+  <widgetset name="audio">
+    <label name="audio_label">オーディオ</label>
+    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
+    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
+  </widgetset>
+  <widgetset name="none">
+    <label name="none_label">コンテンツなし</label>
+    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
+  </widgetset>
+  <scheme name="rtsp">
+    <label name="rtsp_label">リアルタイム・ストリーミング</label>
+  </scheme>
+  <scheme name="example">
+    <label name="example_label">例 プラグイン スキーム トリガー</label>
+  </scheme>
+  <scheme name="libvlc">
+    <label name="libvlc_label">LibVLC対応メディア</label>
+  </scheme>
+  <mimetype name="blank">
+    <label name="blank_label">─なし─</label>
+  </mimetype>
+  <mimetype name="none/none">
+    <label name="none/none_label">─なし─</label>
+  </mimetype>
+  <mimetype name="audio/*">
+    <label name="audio2_label">オーディオ</label>
+  </mimetype>
+  <mimetype name="video/*">
+    <label name="video2_label">ビデオ</label>
+  </mimetype>
+  <mimetype name="image/*">
+    <label name="image2_label">画像</label>
+  </mimetype>
+  <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="application/javascript">
+    <label name="application/javascript_label">JavaScript</label>
+  </mimetype>
+  <mimetype name="application/ogg">
+    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
+  </mimetype>
+  <mimetype name="application/pdf">
+    <label name="application/pdf_label">PDFドキュメント</label>
+  </mimetype>
+  <mimetype name="application/postscript">
+    <label name="application/postscript_label">PostScriptドキュメント</label>
+  </mimetype>
+  <mimetype name="application/rtf">
+    <label name="application/rtf_label">リッチ・テキスト（RTF）</label>
+  </mimetype>
+  <mimetype name="application/smil">
+    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
+  </mimetype>
+  <mimetype name="application/xhtml+xml">
+    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
+  </mimetype>
+  <mimetype name="application/x-director">
+    <label name="application/x-director_label">Macromedia Director</label>
+  </mimetype>
+  <mimetype name="application/octet-stream">
+    <label name="application/octet-stream_label">ストリーム</label>
+  </mimetype>
+  <mimetype name="audio/mid">
+    <label name="audio/mid_label">オーディオ（MIDI）</label>
+  </mimetype>
+  <mimetype name="audio/mpeg">
+    <label name="audio/mpeg_label">オーディオ（MP3）</label>
+  </mimetype>
+  <mimetype name="audio/x-aiff">
+    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
+  </mimetype>
+  <mimetype name="audio/x-wav">
+    <label name="audio/x-wav_label">オーディオ（WAV）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/bmp">
+    <label name="image/bmp_label">画像（BMP）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/gif">
+    <label name="image/gif_label">画像（GIF）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/jpeg">
+    <label name="image/jpeg_label">画像（JPEG）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/png">
+    <label name="image/png_label">画像（PNG）</label>
+  </mimetype>
+  <mimetype name="image/svg+xml">
+    <label name="image/svg+xml_label">画像（SVG）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/tiff">
+    <label name="image/tiff_label">画像（TIFF）</label>
+  </mimetype>
+  <mimetype menu="1" name="text/html">
+    <label name="text/html_label">Webページ</label>
+  </mimetype>
+  <mimetype menu="1" name="text/plain">
+    <label name="text/plain_label">テキスト</label>
+  </mimetype>
+  <mimetype name="text/xml">
+    <label name="text/xml_label">XML</label>
+  </mimetype>
+  <mimetype menu="1" name="video/mpeg">
+    <label name="video/mpeg_label">ムービー（MPEG）</label>
+  </mimetype>
+  <mimetype name="video/mp4">
+    <label name="video/mp4_label">ムービー（MP4）</label>
+  </mimetype>
+  <mimetype name="application/octet-stream">
+    <label name="video/octet-stream">ムービー</label>
+  </mimetype>
+  <mimetype menu="1" name="video/quicktime">
+    <label name="video/quicktime_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-asf">
+    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-wmv">
+    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
+  </mimetype>
+  <mimetype menu="1" name="video/x-msvideo">
+    <label name="video/x-msvideo_label">ムービー（AVI）</label>
+  </mimetype>
+</mimetypes>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
index cb1e48148f..61574b74f9 100644
--- a/indra/newview/skins/default/xui/ja/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
@@ -1,225 +1,131 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-	<widgetset name="web">
-		<label name="web_label">
-			Web コンテンツ
-		</label>
-		<tooltip name="web_tooltip">
-			このロケーションには Web コンテンツが含まれています
-		</tooltip>
-		<playtip name="web_playtip">
-			Web コンテンツを表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			ムービー
-		</label>
-		<tooltip name="movie_tooltip">
-			ここにはムービーがあります
-		</tooltip>
-		<playtip name="movie_playtip">
-			ムービーを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			画像
-		</label>
-		<tooltip name="image_tooltip">
-			このロケーションには画像があります
-		</tooltip>
-		<playtip name="image_playtip">
-			このロケーションの画像を表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			オーディオ
-		</label>
-		<tooltip name="audio_tooltip">
-			このロケーションにはオーディオがあります
-		</tooltip>
-		<playtip name="audio_playtip">
-			このロケーションのオーディオを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			コンテンツなし
-		</label>
-		<tooltip name="none_tooltip">
-			ここにメディアなし
-		</tooltip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			リアルタイム・ストリーミング
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			オーディオ
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			画像
-		</label>
-	</mimetype>
-	<mimetype name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Ogg オーディオ・ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			PDF ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Postscript ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			リッチテキスト（RTF）
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language （SMIL）
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Web ページ（XHTML）
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			マクロメディアディレクター
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			オーディオ（MIDI）
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			オーディオ（MP3）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			オーディオ（AIFF）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			オーディオ（WAV）
-		</label>
-	</mimetype>
-	<mimetype name="image/bmp">
-		<label name="image/bmp_label">
-			画像（BMP）
-		</label>
-	</mimetype>
-	<mimetype name="image/gif">
-		<label name="image/gif_label">
-			画像（GIF）
-		</label>
-	</mimetype>
-	<mimetype name="image/jpeg">
-		<label name="image/jpeg_label">
-			画像（JPEG）
-		</label>
-	</mimetype>
-	<mimetype name="image/png">
-		<label name="image/png_label">
-			画像（PNG）
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			画像（SVG）
-		</label>
-	</mimetype>
-	<mimetype name="image/tiff">
-		<label name="image/tiff_label">
-			画像（TIFF）
-		</label>
-	</mimetype>
-	<mimetype name="text/html">
-		<label name="text/html_label">
-			Web ページ
-		</label>
-	</mimetype>
-	<mimetype name="text/plain">
-		<label name="text/plain_label">
-			テキスト
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype name="video/mpeg">
-		<label name="video/mpeg_label">
-			ムービー（MPEG）
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			ムービー（MP4）
-		</label>
-	</mimetype>
-	<mimetype name="video/quicktime">
-		<label name="video/quicktime_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			ムービー（Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			ムービー（Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			ムービー（AVI）
-		</label>
-	</mimetype>
-</mimetypes>
+  <defaultlabel>（不明）</defaultlabel>
+  <defaultwidget>なし</defaultwidget>
+  <widgetset name="web">
+    <label name="web_label">Webコンテンツ</label>
+    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
+    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
+  </widgetset>
+  <widgetset name="movie">
+    <label name="movie_label">ムービー</label>
+    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
+    <playtip name="movie_playtip">ムービーを再生する</playtip>
+  </widgetset>
+  <widgetset name="image">
+    <label name="image_label">画像</label>
+    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
+    <playtip name="image_playtip">この場所の画像を表示する</playtip>
+  </widgetset>
+  <widgetset name="audio">
+    <label name="audio_label">オーディオ</label>
+    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
+    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
+  </widgetset>
+  <widgetset name="none">
+    <label name="none_label">コンテンツなし</label>
+    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
+  </widgetset>
+  <scheme name="rtsp">
+    <label name="rtsp_label">リアルタイム・ストリーミング</label>
+  </scheme>
+  <mimetype name="blank">
+    <label name="blank_label">─なし─</label>
+  </mimetype>
+  <mimetype name="none/none">
+    <label name="none/none_label">─なし─</label>
+  </mimetype>
+  <mimetype name="audio/*">
+    <label name="audio2_label">オーディオ</label>
+  </mimetype>
+  <mimetype name="video/*">
+    <label name="video2_label">ビデオ</label>
+  </mimetype>
+  <mimetype name="image/*">
+    <label name="image2_label">画像</label>
+  </mimetype>
+  <mimetype name="video/vnd.secondlife.qt.legacy">
+    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="application/javascript">
+    <label name="application/javascript_label">JavaScript</label>
+  </mimetype>
+  <mimetype name="application/ogg">
+    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
+  </mimetype>
+  <mimetype name="application/pdf">
+    <label name="application/pdf_label">PDFドキュメント</label>
+  </mimetype>
+  <mimetype name="application/postscript">
+    <label name="application/postscript_label">PostScriptドキュメント</label>
+  </mimetype>
+  <mimetype name="application/rtf">
+    <label name="application/rtf_label">リッチテキスト（RTF）</label>
+  </mimetype>
+  <mimetype name="application/smil">
+    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
+  </mimetype>
+  <mimetype name="application/xhtml+xml">
+    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
+  </mimetype>
+  <mimetype name="application/x-director">
+    <label name="application/x-director_label">Macromedia Director</label>
+  </mimetype>
+  <mimetype name="audio/mid">
+    <label name="audio/mid_label">オーディオ（MIDI）</label>
+  </mimetype>
+  <mimetype name="audio/mpeg">
+    <label name="audio/mpeg_label">オーディオ（MP3）</label>
+  </mimetype>
+  <mimetype name="audio/x-aiff">
+    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
+  </mimetype>
+  <mimetype name="audio/x-wav">
+    <label name="audio/x-wav_label">オーディオ（WAV）</label>
+  </mimetype>
+  <mimetype name="image/bmp">
+    <label name="image/bmp_label">画像（BMP）</label>
+  </mimetype>
+  <mimetype name="image/gif">
+    <label name="image/gif_label">画像（GIF）</label>
+  </mimetype>
+  <mimetype name="image/jpeg">
+    <label name="image/jpeg_label">画像（JPEG）</label>
+  </mimetype>
+  <mimetype name="image/png">
+    <label name="image/png_label">画像（PNG）</label>
+  </mimetype>
+  <mimetype name="image/svg+xml">
+    <label name="image/svg+xml_label">画像（SVG）</label>
+  </mimetype>
+  <mimetype name="image/tiff">
+    <label name="image/tiff_label">画像（TIFF）</label>
+  </mimetype>
+  <mimetype name="text/html">
+    <label name="text/html_label">Webページ</label>
+  </mimetype>
+  <mimetype name="text/plain">
+    <label name="text/plain_label">テキスト</label>
+  </mimetype>
+  <mimetype name="text/xml">
+    <label name="text/xml_label">XML</label>
+  </mimetype>
+  <mimetype name="video/mpeg">
+    <label name="video/mpeg_label">ムービー（MPEG）</label>
+  </mimetype>
+  <mimetype name="video/mp4">
+    <label name="video/mp4_label">ムービー（MP4）</label>
+  </mimetype>
+  <mimetype name="video/quicktime">
+    <label name="video/quicktime_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-asf">
+    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-wmv">
+    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
+  </mimetype>
+  <mimetype name="video/x-msvideo">
+    <label name="video/x-msvideo_label">ムービー（AVI）</label>
+  </mimetype>
+</mimetypes>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
index cb1e48148f..0bfc9aeb99 100644
--- a/indra/newview/skins/default/xui/ja/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
@@ -1,225 +1,134 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-	<widgetset name="web">
-		<label name="web_label">
-			Web コンテンツ
-		</label>
-		<tooltip name="web_tooltip">
-			このロケーションには Web コンテンツが含まれています
-		</tooltip>
-		<playtip name="web_playtip">
-			Web コンテンツを表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			ムービー
-		</label>
-		<tooltip name="movie_tooltip">
-			ここにはムービーがあります
-		</tooltip>
-		<playtip name="movie_playtip">
-			ムービーを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			画像
-		</label>
-		<tooltip name="image_tooltip">
-			このロケーションには画像があります
-		</tooltip>
-		<playtip name="image_playtip">
-			このロケーションの画像を表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			オーディオ
-		</label>
-		<tooltip name="audio_tooltip">
-			このロケーションにはオーディオがあります
-		</tooltip>
-		<playtip name="audio_playtip">
-			このロケーションのオーディオを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			コンテンツなし
-		</label>
-		<tooltip name="none_tooltip">
-			ここにメディアなし
-		</tooltip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			リアルタイム・ストリーミング
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			オーディオ
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			画像
-		</label>
-	</mimetype>
-	<mimetype name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Ogg オーディオ・ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			PDF ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Postscript ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			リッチテキスト（RTF）
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language （SMIL）
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Web ページ（XHTML）
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			マクロメディアディレクター
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			オーディオ（MIDI）
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			オーディオ（MP3）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			オーディオ（AIFF）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			オーディオ（WAV）
-		</label>
-	</mimetype>
-	<mimetype name="image/bmp">
-		<label name="image/bmp_label">
-			画像（BMP）
-		</label>
-	</mimetype>
-	<mimetype name="image/gif">
-		<label name="image/gif_label">
-			画像（GIF）
-		</label>
-	</mimetype>
-	<mimetype name="image/jpeg">
-		<label name="image/jpeg_label">
-			画像（JPEG）
-		</label>
-	</mimetype>
-	<mimetype name="image/png">
-		<label name="image/png_label">
-			画像（PNG）
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			画像（SVG）
-		</label>
-	</mimetype>
-	<mimetype name="image/tiff">
-		<label name="image/tiff_label">
-			画像（TIFF）
-		</label>
-	</mimetype>
-	<mimetype name="text/html">
-		<label name="text/html_label">
-			Web ページ
-		</label>
-	</mimetype>
-	<mimetype name="text/plain">
-		<label name="text/plain_label">
-			テキスト
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype name="video/mpeg">
-		<label name="video/mpeg_label">
-			ムービー（MPEG）
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			ムービー（MP4）
-		</label>
-	</mimetype>
-	<mimetype name="video/quicktime">
-		<label name="video/quicktime_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			ムービー（Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			ムービー（Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			ムービー（AVI）
-		</label>
-	</mimetype>
-</mimetypes>
+  <defaultlabel>（不明）</defaultlabel>
+  <defaultwidget>なし</defaultwidget>
+  <widgetset name="web">
+    <label name="web_label">Webコンテンツ</label>
+    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
+    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
+  </widgetset>
+  <widgetset name="movie">
+    <label name="movie_label">ムービー</label>
+    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
+    <playtip name="movie_playtip">ムービーを再生する</playtip>
+  </widgetset>
+  <widgetset name="image">
+    <label name="image_label">画像</label>
+    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
+    <playtip name="image_playtip">この場所の画像を表示する</playtip>
+  </widgetset>
+  <widgetset name="audio">
+    <label name="audio_label">オーディオ</label>
+    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
+    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
+  </widgetset>
+  <widgetset name="none">
+    <label name="none_label">コンテンツなし</label>
+    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
+  </widgetset>
+  <scheme name="rtsp">
+    <label name="rtsp_label">リアルタイム・ストリーミング</label>
+  </scheme>
+  <mimetype name="blank">
+    <label name="blank_label">─なし─</label>
+  </mimetype>
+  <mimetype name="none/none">
+    <label name="none/none_label">─なし─</label>
+  </mimetype>
+  <mimetype name="audio/*">
+    <label name="audio2_label">オーディオ</label>
+  </mimetype>
+  <mimetype name="video/*">
+    <label name="video2_label">ビデオ</label>
+  </mimetype>
+  <mimetype name="image/*">
+    <label name="image2_label">画像</label>
+  </mimetype>
+  <mimetype name="video/vnd.secondlife.qt.legacy">
+    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="application/javascript">
+    <label name="application/javascript_label">JavasScript</label>
+  </mimetype>
+  <mimetype name="application/ogg">
+    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
+  </mimetype>
+  <mimetype name="application/pdf">
+    <label name="application/pdf_label">PDFドキュメント</label>
+  </mimetype>
+  <mimetype name="application/postscript">
+    <label name="application/postscript_label">PostScriptドキュメント</label>
+  </mimetype>
+  <mimetype name="application/rtf">
+    <label name="application/rtf_label">リッチテキスト（RTF）</label>
+  </mimetype>
+  <mimetype name="application/smil">
+    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
+  </mimetype>
+  <mimetype name="application/xhtml+xml">
+    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
+  </mimetype>
+  <mimetype name="application/x-director">
+    <label name="application/x-director_label">Macromedia Director</label>
+  </mimetype>
+  <mimetype name="application/octet-stream">
+    <label name="application/octet-stream_label">ストリーム</label>
+  </mimetype>
+  <mimetype name="audio/mid">
+    <label name="audio/mid_label">オーディオ（MIDI）</label>
+  </mimetype>
+  <mimetype name="audio/mpeg">
+    <label name="audio/mpeg_label">オーディオ（MP3）</label>
+  </mimetype>
+  <mimetype name="audio/x-aiff">
+    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
+  </mimetype>
+  <mimetype name="audio/x-wav">
+    <label name="audio/x-wav_label">オーディオ（WAV）</label>
+  </mimetype>
+  <mimetype name="image/bmp">
+    <label name="image/bmp_label">画像（BMP）</label>
+  </mimetype>
+  <mimetype name="image/gif">
+    <label name="image/gif_label">画像（GIF）</label>
+  </mimetype>
+  <mimetype name="image/jpeg">
+    <label name="image/jpeg_label">画像（JPEG）</label>
+  </mimetype>
+  <mimetype name="image/png">
+    <label name="image/png_label">画像（PNG）</label>
+  </mimetype>
+  <mimetype name="image/svg+xml">
+    <label name="image/svg+xml_label">画像（SVG）</label>
+  </mimetype>
+  <mimetype name="image/tiff">
+    <label name="image/tiff_label">画像（TIFF）</label>
+  </mimetype>
+  <mimetype name="text/html">
+    <label name="text/html_label">Webページ</label>
+  </mimetype>
+  <mimetype name="text/plain">
+    <label name="text/plain_label">テキスト</label>
+  </mimetype>
+  <mimetype name="text/xml">
+    <label name="text/xml_label">XML</label>
+  </mimetype>
+  <mimetype name="video/mpeg">
+    <label name="video/mpeg_label">ムービー（MPEG）</label>
+  </mimetype>
+  <mimetype name="video/mp4">
+    <label name="video/mp4_label">ムービー（MP4）</label>
+  </mimetype>
+  <mimetype name="video/quicktime">
+    <label name="video/quicktime_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-asf">
+    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-wmv">
+    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
+  </mimetype>
+  <mimetype name="video/x-msvideo">
+    <label name="video/x-msvideo_label">ムービー（AVI）</label>
+  </mimetype>
+</mimetypes>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 72b4d21eb2..7521c2da01 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1,3184 +1,5317 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notifications>
-	<global name="skipnexttime">今後は表示しない</global>
-	<global name="skipnexttimesessiononly">以後、これを表示しない
+  <global name="skipnexttime">次回からこのメッセージを表示しない</global>
+
+  <global name="skipnexttimesessiononly">次回からこのメッセージを表示しない
 （現セッションで）</global>
-	<global name="alwayschoose">常にこのオプションを選択</global>
-	<global name="implicitclosebutton">閉じる</global>
-	<template name="okbutton">
-		<form>
-			<button name="OK_okbutton" text="$yestext"/>
-		</form>
-	</template>
-	<template name="okignore">
-		<form>
-			<button name="OK_okignore" text="$yestext"/>
-		</form>
-	</template>
-	<template name="okcancelbuttons">
-		<form>
-			<button name="OK_okcancelbuttons" text="$yestext"/>
-			<button name="Cancel_okcancelbuttons" text="$notext"/>
-		</form>
-	</template>
-	<template name="okcancelignore">
-		<form>
-			<button name="OK_okcancelignore" text="$yestext"/>
-			<button name="Cancel_okcancelignore" text="$notext"/>
-		</form>
-	</template>
-	<template name="okhelpbuttons">
-		<form>
-			<button name="OK_okhelpbuttons" text="$yestext"/>
-			<button name="Help" text="$helptext"/>
-		</form>
-	</template>
-	<template name="okhelpignore">
-		<form>
-			<button name="OK_okhelpignore" text="$yestext"/>
-			<button name="Help_okhelpignore" text="$helptext"/>
-		</form>
-	</template>
-	<template name="yesnocancelbuttons">
-		<form>
-			<button name="Yes" text="$yestext"/>
-			<button name="No" text="$notext"/>
-			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
-		</form>
-	</template>
-	<notification functor="GenericAcknowledge" label="不明の通知メッセージ" name="MissingAlert">
-		あなたの [APP_NAME] のバージョンでは今受け取った通知メッセージを表示することができません。  最新ビューワがインストールされているかご確認ください。
-
-エラー詳細： 「 [_NAME] 」という通知は notifications.xml にありませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FloaterNotFound">
-		フロータエラー：下記のコントロールが見つかりませんでした：
+
+  <global name="alwayschoose">常にこのオプションを選択</global>
+
+  <global name="implicitclosebutton">閉じる</global>
+
+  <template name="okbutton">
+    <form>
+      <button name="OK_okbutton" text="$yestext" />
+    </form>
+  </template>
+
+  <template name="okignore">
+    <form>
+      <button name="OK_okignore" text="$yestext" />
+    </form>
+  </template>
+
+  <template name="okcancelbuttons">
+    <form>
+      <button name="OK_okcancelbuttons" text="$yestext" />
+      <button name="Cancel_okcancelbuttons" text="$notext" />
+    </form>
+  </template>
+
+  <template name="okcancelignore">
+    <form>
+      <button name="OK_okcancelignore" text="$yestext" />
+      <button name="Cancel_okcancelignore" text="$notext" />
+    </form>
+  </template>
+
+  <template name="okhelpbuttons">
+    <form>
+      <button name="OK_okhelpbuttons" text="$yestext" />
+      <button name="Help" text="$helptext" />
+    </form>
+  </template>
+
+  <template name="okhelpignore">
+    <form>
+      <button name="OK_okhelpignore" text="$yestext" />
+      <button name="Help_okhelpignore" text="$helptext" />
+    </form>
+  </template>
+
+  <template name="yesnocancelbuttons">
+    <form>
+      <button name="Yes" text="$yestext" />
+      <button name="No" text="$notext" />
+      <button name="Cancel_yesnocancelbuttons" text="$canceltext" />
+    </form>
+  </template>
+
+  <notification functor="GenericAcknowledge" label="不明な通知メッセージ" name="MissingAlert">現在使用中の[APP_NAME]のバージョンでは、受け取った通知メッセージを表示することができません。
+最新のビューアーがインストールされている事をご確認ください。
+
+エラー詳細：「 [_NAME] 」という通知メッセージは、notifications.xmlに定義されていませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FloaterNotFound">フローターエラー：以下のコントロールが見つかりませんでした：
+
 [CONTROLS]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TutorialNotFound">
-		現在利用可能なチュートリアルはありません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GenericAlert">[MESSAGE]</notification>
-	<notification name="GenericAlertYesCancel">
-		[MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="はい"/>
-	</notification>
-	<notification name="GenericAlertOK">
-		[MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="BadInstallation">
-		[APP_NAME] をアップデート中にエラーが発生しました。  ビューワの [http://get.secondlife.com 最新バージョンをダウンロード] してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LoginFailedNoNetwork">
-		[SECOND_LIFE_GRID] に接続できませんでした。
-「[DIAGNOSTIC]」
-インターネット接続が正常かご確認ください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MessageTemplateNotFound">
-		メッセージテンプレート [PATH] がありませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="WearableSave">
-		現在の衣類、身体部位の変更を保存しますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
-	</notification>
-	<notification name="ConfirmNoCopyToOutbox">
-		これらのアイテムの 1 つまたは複数をマーチャントアウトボックスにコピーする許可がありません。移動するか、置き去りにすることはできます。
-		<usetemplate name="okcancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動"/>
-	</notification>
-	<notification name="OutboxFolderCreated">
-		マーチャントアウトボックスの最上位に転送した各アイテムにつき、それぞれ 1 つの新しいフォルダが作成されました。
-		<usetemplate ignoretext="新しいフォルダがマーチャントアウトボックス内に作成されました" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="OutboxImportComplete">
-		成功
-
-マーケットプレイスに正常に送信されたすべてのフォルダ
-		<usetemplate ignoretext="マーケットプレイスに送信されたすべてのフォルダ" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="OutboxImportHadErrors">
-		一部のフォルダは転送されませんでした
-
-一部のフォルダがマーケットプレイスに送信されたときにエラーが発生しました。これらのフォルダはまだマーチャントアウトボックス内にあります。
-
-詳細については、[[MARKETPLACE_IMPORTS_URL] エラーログ]をご覧ください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OutboxImportFailed">
-		'[ERROR_CODE]' エラーで転送できませんでした
-
-システムまたはネットワークのエラーのため、フォルダはマーケットプレイスに送信されませんでした。後でもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OutboxInitFailed">
-		'[ERROR_CODE]' エラーでマーケットプレイスを初期化できませんでした
-
-システムまたはネットワークのエラーのため、マーケットプレイスの初期化に失敗しました。後でもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="StockPasteFailed">
-		在庫フォルダへのコピーまたは移動がエラーにより失敗しました:        
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
 
-'[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantPasteFailed">
-		マーケットプレイスのリストへのコピーまたは移動がエラーにより失敗しました:        
+  <notification name="TutorialNotFound">現在利用可能なチュートリアルはありません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
 
-'[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantTransactionFailed">
-		マーケットプレイスによる取引が次のエラーにより失敗しました:
-        
-[ERROR_REASON][ERROR_DESCRIPTION]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantUnprocessableEntity">
-		この製品をリストに表示できないか、バージョンフォルダを有効にできません。通常、これはリスト説明フォームに情報が不足しているために起こりますが、フォルダ構造のエラーが原因の場合もあります。リストを編集するか、リストフォルダにエラーがないか確認してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantListingFailed">
-		マーケットプレイスへのリスト表示が次のエラーで失敗しました :
-        
-'[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantFolderActivationFailed">
-		このバージョンフォルダの有効化が次のエラーにより失敗しました :
+  <notification name="GenericAlert">[MESSAGE]</notification>
+
+  <notification name="GenericAlertYesCancel">[MESSAGE]
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
+  </notification>
 
+  <notification name="GenericAlertOK">[MESSAGE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BadInstallation">[APP_NAME]のアップデート中にエラーが発生しました。[http://get.secondlife.com 最新バージョンのビューアーをダウンロード]してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LoginFailedNoNetwork">[SECOND_LIFE_GRID]に接続できませんでした。
+[DIAGNOSTIC]
+
+インターネット接続が正常かご確認ください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LoginFailedToParse">ビューアがサーバーから不正な形式の応答を受け取りました。インターネット接続が正常に機能していることを確認してから、後でもう一度お試しください。
+
+これが誤りだと思われる場合は、サポートにお問い合わせください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="MessageTemplateNotFound">メッセージテンプレート[PATH]がありませんでした。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WearableSave">現在の服装／身体部位の変更を保存しますか？
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
+  </notification>
+
+  <notification name="ConfirmNoCopyToOutbox">これらのアイテムの１つ以上を販売用の送信トレイにコピーする権限がありません。移動したり残したままにすることはできます。
+    <usetemplate name="okcancelbuttons" notext="アイテムを販売ボックスに移動できなかった" yestext="アイテムを移動" />
+  </notification>
+
+  <notification name="OutboxFolderCreated">販売ボックスの最上位に転送した各アイテムにつき、それぞれ１つの新しいフォルダが作成されました。
+    <unique />
+    <usetemplate ignoretext="販売ボックス内に新しいフォルダを作成した" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutboxImportComplete">成功しました。
+
+すべてのフォルダが、マーケットプレイスに正常に送信されました。
+    <usetemplate ignoretext="マーケットプレイスへフォルダの送信に成功した" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutboxImportHadErrors">一部のフォルダは送信できていません。
+
+一部のフォルダが、マーケットプレイスに送信されるときにエラーが発生しました。これらのフォルダは、販売者の送信トレイにまだ残っています。
+
+詳細につきましては、[[MARKETPLACE_IMPORTS_URL] エラーログ]をご確認ください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="OutboxImportFailed">以下のエラーで転送できませんでした：[ERROR_CODE]
+
+システムまたはネットワークのエラーのため、フォルダはマーケットプレイスに送信されませんでした。お手数ですが、後でもう一度やり直してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutboxInitFailed">以下のエラーでマーケットプレイスを初期化できませんでした：[ERROR_CODE]
+
+システムまたはネットワークのエラーのため、マーケットプレイスの初期化に失敗しました。お手数ですが、後でもう一度やり直してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="StockPasteFailed">在庫フォルダへのコピーまたは移動がエラーにより失敗しました：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantPasteFailed">マーケットプレイスのリストへのコピーまたは移動が以下のエラーにより失敗しました：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantTransactionFailed">マーケットプレイスによる取引が以下のエラーにより失敗しました：[ERROR_REASON]
+[ERROR_DESCRIPTION]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantUnprocessableEntity">この商品をリストに表示できないか、バージョンフォルダを有効にできません。通常、これはリスト説明フォームに情報が不足しているために起こりますが、フォルダ構造のエラーが原因の場合もあります。
+リストを編集するか、リストフォルダにエラーがないか確認してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantListingFailed">マーケットプレイスへのリスト表示が次のエラーで失敗しました：
 '[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantForceValidateListing">
-		リストを作成するために、リストするコンテンツの階層を固定しました。
-		<usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmMerchantActiveChange">
-		この操作により、このリストの有効な内容が変更されます。続けますか？
-		<usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmMerchantMoveInventory">
-		マーケットプレイスのリストウィンドウにドラッグしたアイテムは元の場所からコピーされるのではなく、移動します。続けますか？
-		<usetemplate ignoretext="アイテムをインベントリからマーケットプレイスに移動する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmListingCutOrDelete">
-		リストフォルダを移動または削除すると、マーケットプレイスのリストが削除されます。マーケットプレイスのリストを維持する場合は、変更するバージョンフォルダの中身を移動または削除してください。続けますか？
-		<usetemplate ignoretext="マーケットプレイスからリストを移動または削除する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmCopyToMarketplace">
-		これらのアイテムの 1 つまたは複数をマーケットプレイスにコピーする権限がありません。移動するか、置き去りにすることはできます。
-		<usetemplate canceltext="取り消し" ignoretext="コピー付加アイテムを含む選択内容をマーケットプレイスへコピーする前に確認する" name="yesnocancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動"/>
-	</notification>
-	<notification name="ConfirmMerchantUnlist">
-		この操作により、このリストが削除されます。続けますか？
-		<usetemplate ignoretext="マーケットプレイスで有効なリストを削除する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmMerchantClearVersion">
-		この操作により、現在のリストのバージョンフォルダが無効になります。続けますか？
-		<usetemplate ignoretext="マーケットプレイスでリストのバージョンフォルダを無効にする前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantListingNotUpdated">
-		このリストをアップデートできませんでした。
-[[URL] ここをクリック] してマーケットプレイスで編集します。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantListingCannotWear">マーケットプレイスのリストフォルダにある衣服やボディパーツを着用できません。</notification>
-	<notification name="AlertMerchantListingInvalidID">リスト ID が無効です。</notification>
-	<notification name="AlertMerchantListingActivateRequired">
-		このリストには複数のバージョンフォルダがあるか、バージョンフォルダがありません。後で、単独でバージョンフォルダを選択して有効にする必要があります。
-		<usetemplate ignoretext="複数のバージョンフォルダのあるリストを作成するときに、バージョンフォルダの有効化に関する警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantStockFolderSplit">
-		各種の在庫品目を別々の在庫フォルダに分けたため、フォルダはリストに表示できるように配置されています。
-		<usetemplate ignoretext="リストに表示する前に在庫フォルダが分割されると、警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantStockFolderEmpty">
-		在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
-		<usetemplate ignoretext="在庫フォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantVersionFolderEmpty">
-		バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
-		<usetemplate ignoretext="バージョンフォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="WriteAnimationFail">アニメーションデータの書き込みに問題があります。後でもう一度お試しください。</notification>
-	<notification name="UploadAuctionSnapshotFail">次の理由で、オークションのスナップショットのアップロード時に問題が起こりました。
-[REASON]</notification>
-	<notification name="UnableToViewContentsMoreThanOne">一度に複数のアイテムの中身を表示できません。
-アイテムを 1 つだけ選択して、もう一度お試しください。</notification>
-	<notification name="SaveClothingBodyChanges">
-		衣服、身体部位に対する変更をすべて保存しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存"/>
-	</notification>
-	<notification name="FriendsAndGroupsOnly">
-		フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FavoritesOnLogin">
-		注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AllowMultipleViewers">
-		複数の Second Life ビューワを実行することはサポートされていません。テクスチャキャッシュのコリジョンや破損、およびビジュアルとパフォーマンスの低下につながる恐れがあります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GrantModifyRights">
-		他人に修正権限を与えると、権限を与えられた人はあなたが所有するインワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。
-[NAME] に修正権限を与えますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="GrantModifyRightsMultiple">
-		他人に修正権限を与えると、権限を与えられた人はあなたが所有するインワールドのオブジェクトを変更することができます。 この権限を与える際には十分に注意してください。
-選択した住人に修正権限を与えますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="RevokeModifyRights">
-		[NAME] の修正権限を解約しますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="RevokeModifyRightsMultiple">
-		選択した住人から変更権限を取り下げますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="GroupNameLengthWarning">
-		グループ名は [MIN_LEN] ～ [MAX_LEN] 文字である必要があります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="UnableToCreateGroup">
-		グループを作成できません。
-[MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PanelGroupApply">
-		[NEEDS_APPLY_MESSAGE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantFolderActivationFailed">このバージョンフォルダの有効化が次のエラーにより失敗しました：
+'[ERROR_CODE]'
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantForceValidateListing">リストを作成するために、リストするコンテンツの階層を固定しました。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmMerchantActiveChange">この操作により、このリストの有効な内容が変更されます。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmMerchantMoveInventory">マーケットプレイスのリストウィンドウにドラッグしたアイテムは、元の場所からコピーされるのではなく移動となります。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="アイテムをインベントリからマーケットプレイスに移動する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmListingCutOrDelete">リストフォルダを移動または削除すると、マーケットプレイスのリストが削除されます。マーケットプレイスのリストを維持する場合は、変更するバージョンフォルダの中身を移動または削除してください。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスからリストを移動または削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmCopyToMarketplace">これらのアイテムの１つまたは複数をマーケットプレイスにコピーする権限がありません。移動するか、残したままにすることはできます。
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" ignoretext="マーケットプレイスへコピーする際に、コピー不可のアイテムが選択内容に含まれている場合の確認" name="yesnocancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動" />
+  </notification>
+  <notification name="ConfirmMerchantUnlist">この操作により、このリストが削除されます。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスで有効なリストを削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmMerchantClearVersion">この操作により、現在のリストのバージョンフォルダが無効になります。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスでリストのバージョンフォルダを無効にする前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantListingNotUpdated">このリストをアップデートできませんでした。
+[[URL] ここをクリック]してマーケットプレイスで編集します。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantListingCannotWear">マーケットプレイスのリストフォルダにある衣服装やボディパーツを着用できません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AlertMerchantListingInvalidID">リストIDが無効です。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AlertMerchantListingActivateRequired">このリストには複数のバージョンフォルダがあるか、バージョンフォルダがありません。後で、単独でバージョンフォルダを選択して有効にする必要があります。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="複数のバージョンフォルダのあるリストを作成するときに、バージョンフォルダの有効化に関する警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantStockFolderSplit">各種の在庫品目を別々の在庫フォルダに分けたため、フォルダはリストに表示できるように配置されています。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="商品リストで在庫フォルダを分割する際に警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantStockFolderEmpty">在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="商品リストで在庫フォルダが空だったときに警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantVersionFolderEmpty">バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="商品リストでバージョンフォルダが空で表示されないときに警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="WriteAnimationFail">アニメーションデータの書き込みに問題があります。後でもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="UploadAuctionSnapshotFail">以下の理由で、オークションのスナップショットのアップロード時に問題が起こりました：[REASON]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnableToViewContentsMoreThanOne">一度に複数のアイテムの中身を表示できません。
+アイテムを１つだけ選択して、もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SaveClothingBodyChanges">服装、身体部位に対する変更をすべて保存しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存" />
+  </notification>
+  <notification name="FriendsAndGroupsOnly">フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="FavoritesOnLogin">注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="AllowMultipleViewers">Second Lifeビューアーの多重起動はサポートされていません。
+テクスチャキャッシュの競合による破損や、およびビジュアルとパフォーマンスの低下につながる恐れがあります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="GrantModifyRights">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。
+[NAME]に修正権限を与えますか？
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="GrantModifyRightsMultiple">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更することができます。
+この権限を与える際には十分に注意してください。選択した住人に修正権限を与えますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="RevokeModifyRights">[NAME]の修正権限を解除しますか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="RevokeModifyRightsMultiple">選択した住人から変更権限を取り下げますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="GroupNameLengthWarning">グループ名は[MIN_LEN]～[MAX_LEN]文字である必要があります。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="UnableToCreateGroup">グループを作成できません。
+[MESSAGE] 
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="PanelGroupApply">[NEEDS_APPLY_MESSAGE]
 [WANT_APPLY_MESSAGE]
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="変更を無視" yestext="変更を適用"/>
-	</notification>
-	<notification name="MustSpecifyGroupNoticeSubject">
-		グループ通知の送信には、件名の記入が必要です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AddGroupOwnerWarning">
-		あなたは [ROLE_NAME] の役割にメンバーを与えようとしています。
-任命されたメンバーが自ら退任しない限り、
-役柄から削除できません。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="変更を無視" yestext="変更を適用" />
+  </notification>
+  <notification name="MustSpecifyGroupNoticeSubject">グループ通知の送信には、件名の記入が必要です。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="AddGroupOwnerWarning">あなたは、[ROLE_NAME]の役割にメンバーを与えようとしています。任命されたメンバーが自ら退任しない限り、 役柄から削除できません。
 操作を続行しますか？
-		<usetemplate ignoretext="グループオーナーを新しく追加する前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AssignDangerousActionWarning">
-		あなたは [ROLE_NAME] に [ACTION_NAME] の能力を
-与えようとしています。
-
- *警告*
-この能力を持つ役割のメンバーは、
-自分と他のメンバーに現在より強力な権限を割り当て、
-自分をオーナーとほぼ同様の立場に任命することもできるようになります。
-この行為の意味をよく理解してから実行してください。
+    <usetemplate ignoretext="グループオーナーを新しく追加する前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="AssignDangerousActionWarning">あなたは[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
 
+*警告*
+この能力を持つ役割のメンバーは、 自分と他のメンバーに現在より強力な権限を割り当て、 自分をオーナーとほぼ同様の立場に任命することもできるようになります。
+この行為の意味をよく理解してから実行してください。
 この能力を [ROLE_NAME] に割り当てますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AssignDangerousAbilityWarning">
-		あなたは [ROLE_NAME] に [ACTION_NAME] の能力を
-与えようとしています。
-
- *警告*
-この能力をもつ役割のメンバーは、
-自分と他のメンバーにすべての能力を割り当て、
-自分をオーナーとほぼ同様の立場に任命できます。
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="AssignDangerousAbilityWarning">あなたは、[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
 
-この能力を [ROLE_NAME] に割り当てますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AssignBanAbilityWarning">
-		役割 '[ROLE_NAME]' に能力 '[ACTION_NAME]' を追加しようとしています。
+*警告*
+この能力をもつ役割のメンバーは、自分と他のメンバーにすべての能力を割り当て、自分をオーナーとほぼ同様の立場に任命できます。
+この能力を[ROLE_NAME] に割り当てますか？
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="AssignBanAbilityWarning">役割「[ROLE_NAME]」に能力「[ACTION_NAME]」を追加しようとしています。
 
 *警告*
-この能力を持つ役割のメンバーにも能力 '[ACTION_NAME_2]' と '[ACTION_NAME_3]' が許可されます
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RemoveBanAbilityWarning">
-		役割 '[ROLE_NAME]' から能力 '[ACTION_NAME]' を削除しようとしています。
+この能力を持つ役割のメンバーにも能力「[ACTION_NAME_2]」と「[ACTION_NAME_3]」が許可されます。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="RemoveBanAbilityWarning">役割「[ROLE_NAME]」から能力「[ACTION_NAME]」を削除しようとしています。
 
 *警告*
-この能力を削除しても能力 '[ACTION_NAME_2]' と '[ACTION_NAME_3]' は削除されません。
- 
+この能力を削除しても能力「[ACTION_NAME_2]」と「[ACTION_NAME_3]」は削除されません。
 これらの能力をこの役割に許可しない場合は、すぐに削除してください!
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="EjectGroupMemberWarning">
-		[AVATAR_NAME] をグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
-	</notification>
-	<notification name="EjectGroupMembersWarning">
-		[COUNT] 名のメンバーをグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
-	</notification>
-	<notification name="BanGroupMemberWarning">
-		[AVATAR_NAME] をグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
-	</notification>
-	<notification name="BanGroupMembersWarning">
-		[COUNT] 名のメンバーをグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
-	</notification>
-	<notification name="GroupBanUserOnBanlist">一部の住人がグループから追放されたため、招待状が送られませんでした。</notification>
-	<notification name="AttachmentDrop">
-		アタッチメントを下に置こうとしています。
-続けますか？
-		<usetemplate ignoretext="アタッチメントを下に落とす前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="JoinGroupCanAfford">
-		このグループに参加するには、L$ [COST] かかります。
-続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="参加"/>
-	</notification>
-	<notification name="JoinGroupNoCost">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; というグループに入ろうとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加"/>
-	</notification>
-	<notification name="JoinGroupCannotAfford">このグループに加入するには、L$ [COST] 必要です。
-L$ が不足しているのでこのグループに参加することができません。</notification>
-	<notification name="CreateGroupCost">
-		このグループ作成にかかる費用：L$[COST]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="EjectGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="EjectGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="BanGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止" />
+  </notification>
+  <notification name="BanGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止" />
+  </notification>
+  <notification name="GroupBanUserOnBanlist">一部の住人がグループから追放されたため、招待状が送られませんでした。</notification>
+  <notification name="AttachmentDrop">装着物を下に置こうとしています。
+このまま続けてもよろしいですか？
+    <usetemplate ignoretext="装着物を下に落とす前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="JoinGroupCanAfford">このグループに参加するには、L$ [COST]かかります。
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <tag>group</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加" />
+  </notification>
+  <notification name="JoinGroupNoCost">「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」というグループに入ろうとしています。
+このまま続けてもよろしいですか？
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加" />
+  </notification>
+  <notification name="JoinGroupCannotAfford">このグループに加入するには、L$ [COST]必要です。
+L$が不足しているので、このグループに参加することができません。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <tag>funds</tag>
+  </notification>
+  <notification name="CreateGroupCost">このグループ作成にかかる費用：L$[COST]
 一人ではグループにならないので、永久に削除されてしまいます。
-48 時間以内にメンバーを勧誘し、入会してもらってください。
-		<usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成"/>
-	</notification>
-	<notification name="JoinGroupInaccessible">
-		あなたはグループに参加することはできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupError">
-		グループ参加リクエスト中にエラーが発生しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupErrorReason">
-		グループに参加できません： [reason]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupTrialUser">
-		申し訳ありませんが、トライアルユーザーはグループに参加できません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupMaxGroups">
-		「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません:
-既に [group_count] グループのメンバーになっています。参加できるのは最大 [max_groups] グループまでです。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupClosedEnrollment">
-		「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません:
+４８時間以内にメンバーを勧誘し、入会してもらってください。
+    <tag>group</tag>
+    <tag>funds</tag>
+    <usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成" />
+  </notification>
+  <notification name="JoinGroupInaccessible">あなたはグループに参加することはできません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupError">グループ参加リクエスト中にエラーが発生しました。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupErrorReason">以下のグループに参加できませんでした：[reason]
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <tag>reason</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupTrialUser">申し訳ありませんが、トライアルユーザーはグループに参加できません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupMaxGroups">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
+既に[group_count]個のグループのメンバーになっています。参加できるのは最大[max_groups]グループまでです。
+    <tag>success</tag>
+    <tag>group_id</tag>
+    <tag>group_name</tag>
+    <tag>group_count</tag>
+    <tag>max_groups</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupClosedEnrollment">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
 このグループは現在、参加が制限されています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupSuccess">
-		このユーザーグループに追加されました
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupInsufficientFunds">
-		会員料金として必要な L$ [membership_fee] を送金することができません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandBuyPass">
-		L$ [COST] で [TIME] 時間 [PARCEL_NAME] に入ることができます。
-入場許可を購入しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SalePriceRestriction">不特定の人に売却する場合には、
-売却価格はL$ 0 以上に設定する必要があります。
-売却価格をL$ 0 に設定する場合は、
-売却する個人を選択してください。</notification>
-	<notification name="ConfirmLandSaleChange">
-		選択した [LAND_SIZE] 平方メートルの土地は、売り出し中に設定されています。
-売却価格 L$ [SALE_PRICE] で、[NAME] に売却を認可します。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmLandSaleToAnyoneChange">
-		注意： 「誰にでも販売」をクリックすることで、あなたの土地はこのリージョンにいる人に限らず [SECOND_LIFE] コミュニティ全体で利用可能となります。
-
-選択した [LAND_SIZE] 平方メートルの土地は、販売対象に設定されました。
-販売価格 L$ [SALE_PRICE] で、[NAME] が販売対象者となります。
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsDeededToGroup">
-		グループ「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」と共有するこのにある区画のすべてのオブジェクトを前のオーナーのインベントリに返却しますか？
-
-*注意*この操作をすると、グループに譲渡された譲渡禁止のオブジェクトを削除することになります。
-
-オブジェクト: [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsOwnedByUser">
-		この区画で、
-住人 [NAME] が所有する全てのオブジェクトを
-本人のインベントリに本当に返却してもよいですか？
-
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsOwnedBySelf">
-		この土地区画内にある、あなたが所有するすべてのオブジェクトを、
-あなたのインベントリに戻そうとしています。続けますか？
-
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedBySelf">
-		この土地区画内にある、あなた以外が所有するすべてのオブジェクトを、
-それぞれの所有者のインベントリに戻そうとしています。
-操作を続行しますか？
-グループに譲渡された「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されます。
-
-*警告* これにより、
-グループに譲渡された「再販・プレゼント不可」のオブジェクトは削除されます！
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedByUser">
-		この土地区画内にある、
-[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者のインベントリに返却しようとしています。
-操作を続行しますか？グループに譲渡された「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されます。
-
-*警告* これにより、
-グループに譲渡された「再販・プレゼント不可」のオブジェクトは削除されます！
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnAllTopObjects">
-		リストされた全てのオブジェクトを所有者の持ち物に戻しますか?これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります!
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DisableAllTopObjects">
-		このリージョン（地域）内のすべてのオブジェクトを無効にしようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedByGroup">
-		グループ &lt;nolink&gt;[NAME]&lt;/nolink&gt; と共有されていない、この区画にあるオブジェクトを前のオーナーに返却しますか？
-
-オブジェクト: [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="UnableToDisableOutsideScripts">スクリプトを無効にできません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupSuccess">このユーザーグループに入会しました。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupInsufficientFunds">会員料金として必要なL$ [membership_fee]を送金することができません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="LandBuyPass">この区画（[PARCEL_NAME]）は、L$ [COST]で[TIME]時間入ることができます。入場許可証を購入しますか？
+    <tag>fail</tag>
+    <tag>funds</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SalePriceRestriction">不特定の人に売却する場合には、売却価格はL$ 0以上に設定する必要があります。
+売却価格をL$ 0に設定する場合は、売却する個人を選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ConfirmLandSaleChange">選択した[LAND_SIZE]㎡の土地は、売り出し中に設定されています。
+売却価格L$ [SALE_PRICE]で、[NAME]に売却を認可します。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmLandSaleToAnyoneChange">注意：「誰にでも販売」をクリックすることで、あなたの土地はこのリージョンにいる人に限らず、[SECOND_LIFE]コミュニティ全体で利用可能となります。
+選択した[LAND_SIZE]㎡の土地は、販売対象に設定されました。
+販売価格L$ [SALE_PRICE]で、[NAME]が販売対象者となります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsDeededToGroup">グループ「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」と共有するこのにある区画のすべてのオブジェクトを前のオーナーのインベントリに返却しますか？
+*警告*
+この操作をすると、グループに譲渡された譲渡禁止のオブジェクトを削除することになります。
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <tag>group</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsOwnedByUser">この区画で、住人[NAME]が所有する全てのオブジェクトを本人のインベントリに本当に返却してもよいですか？
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsOwnedBySelf">この土地区画内にある、あなたが所有するすべてのオブジェクトを、あなたのインベントリに戻そうとしています。このまま続けてもよろしいですか？
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsNotOwnedBySelf">この土地区画内にある、あなた以外が所有するすべてのオブジェクトを、それぞれの所有者のインベントリに戻そうとしています。このまま操作を続行してもよろしいですか？
+グループに譲渡された「再販・譲渡可」のオブジェクトは、以前の所有者に返却されます。
+
+*警告*
+
+これにより、グループに譲渡された「再販・譲渡不可」のオブジェクトは削除されます！
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsNotOwnedByUser">この土地区画内にある、[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者のインベントリに返却しようとしています。このまま操作を続行してもよろしいですか？
+グループに譲渡された「再販・譲渡可」のオブジェクトは、以前の所有者に返却されます。
+
+*警告*
+
+これにより、グループに譲渡された「再販・譲渡不可」のオブジェクトは削除されます！ 
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnAllTopObjects">リストされた全てのオブジェクトを所有者の持ち物に戻しますか？
+これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります！
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="DisableAllTopObjects">このリージョン（地域）内のすべてのオブジェクトを無効にしようとしています。このまま操作を続行してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsNotOwnedByGroup">グループ &lt;nolink&gt;[NAME]&lt;/nolink&gt;と共有されていない、この区画にあるオブジェクトを前のオーナーに返却しますか？
+オブジェクト：[N] 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="UnableToDisableOutsideScripts">スクリプトを無効にできません。
 このリージョン（地域）全体が「ダメージ有効」に設定されています。
-武器を使用するにはスクリプトの実行を許可する必要があります。</notification>
-	<notification name="MultipleFacesSelected">
-		現在複数の面が選択されています。
+武器を使用するには、スクリプトの実行を許可する必要があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MultipleFacesSelected">現在複数の面が選択されています。
 このまま続けた場合、メディアの別々のインスタンスがオブジェクトの複数の面に設定されます。
-メディアを 1 つの面だけに取り付けるには、「面を選択」を選んでオブジェクトの希望する面をクリック、それから「追加」をクリックしてください。
-		<usetemplate ignoretext="メディアが選択した複数の面にセットされるとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="MustBeInParcel">着地点を設定するには、この区画の内側に
-立ってください。</notification>
-	<notification name="PromptRecipientEmail">受信者の有効なメールアドレスを入力してください。</notification>
-	<notification name="PromptSelfEmail">あなたのメールアドレスを入力してください。</notification>
-	<notification name="PromptMissingSubjMsg">
-		デフォルトの件名またはメッセージを付けて、スナップショットを送信しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ErrorProcessingSnapshot">スナップショットデータの処理エラー</notification>
-	<notification name="ErrorEncodingSnapshot">スナップショットのエンコード化でエラーが出ました！</notification>
-	<notification name="ErrorCannotAffordUpload">このアイテムをアップロードするには L$[COST] が必要です。</notification>
-	<notification name="ErrorPhotoCannotAfford">インベントリに写真を保存するには L$[COST] が必要です。L$ を購入するか、代わりに写真をっコンピュータに保存できます。</notification>
-	<notification name="ErrorTextureCannotAfford">インベントリにテクスチャを保存するには L$[COST] が必要です。L$ を購入するか、代わりに写真をコンピュータに保存できます。</notification>
-	<notification name="ErrorUploadingPostcard">次の理由で、スナップショットの送信時に問題が起こりました： [REASON]</notification>
-	<notification name="ErrorUploadingReportScreenshot">次の理由で、レポートのスクリーンショットのアップロード時に問題が起こりました。 [REASON]</notification>
-	<notification name="MustAgreeToLogIn">[SECOND_LIFE] へのログインを続けるには、Second Life の利用規約、プライバシーポリシー、およびサービス規約に同意する必要があります。</notification>
-	<notification name="CouldNotPutOnOutfit">アウトフィットを装着できません。
-アウトフィットフォルダに衣類、身体部位、アタッチメントがありません。</notification>
-	<notification name="CannotWearTrash">ごみ箱にある衣類や身体部位の着用はできません。</notification>
-	<notification name="MaxAttachmentsOnOutfit">オブジェクトを付けられませんでした。
-最大数の [MAX_ATTACHMENTS] 個を越えています。 どれか取り外してからお試しください。</notification>
-	<notification name="CannotWearInfoNotComplete">まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。</notification>
-	<notification name="MustEnterPasswordToLogIn">ログインするためにパスワードを入力してください</notification>
-	<notification name="MustHaveAccountToLogIn">
-		注意：記入漏れの箇所があります。
+メディアを１つの面だけに取り付けるには、「面を選択」を選んでオブジェクトの希望する面をクリック、それから「追加」をクリックしてください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="メディアが選択した複数の面にセットされるとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="MustBeInParcel">着地点を設定するには、この区画の内側に立ってください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptRecipientEmail">受信者の有効なメールアドレスを入力してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptSelfEmail">あなたのメールアドレスを入力してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptMissingSubjMsg">デフォルトの件名またはメッセージを付けて、スナップショットを送信しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ErrorProcessingSnapshot">スナップショットデータの処理エラー
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorEncodingSnapshot">スナップショットのエンコードエラー
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorCannotAffordUpload">このアイテムをアップロードするには、L$ [COST]が必要です。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorPhotoCannotAfford">インベントリに写真を保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorTextureCannotAfford">インベントリにテクスチャを保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorUploadingPostcard">以下の理由でスナップショットの送信時に問題が起こりました：[REASON]
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorUploadingReportScreenshot">以下の理由で、レポートのスクリーンショットのアップロード時に問題が起こりました：[REASON]
+    <tag>fail</tag>
+  </notification>
+  <notification name="MustAgreeToLogIn">[SECOND_LIFE]へのログインを続けるには、Second Lifeの利用規約、プライバシーポリシー、およびサービス規約に同意する必要があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CouldNotPutOnOutfit">アウトフィットを装着できません。
+アウトフィットフォルダに服装、身体部位、装着物がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotWearTrash">ごみ箱にある服装や身体部位は、着用できません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MaxAttachmentsOnOutfit">オブジェクトを装着できませんでした。
+最大装着数[MAX_ATTACHMENTS]個を越えています。どれか取り外してからお試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotWearInfoNotComplete">まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MustEnterPasswordToLogIn">ログインするためにパスワードを入力してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MustHaveAccountToLogIn">おっと、記入漏れがあります。
 アバターのユーザー名を入力してください。
 
-[SECOND_LIFE] に入るにはアカウントが必要です。今すぐアカウントを作成しますか？
-		<url name="url">[create_account_url]</url>
-		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
-	</notification>
-	<notification name="InvalidCredentialFormat">ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。</notification>
-	<notification name="InvalidGrid">'[GRID]' は有効なグリッド ID ではありません。</notification>
-	<notification name="InvalidLocationSLURL">ログイン位置で有効なグリッドが指定されませんでした。</notification>
-	<notification name="DeleteClassified">
-		クラシファイド広告 [NAME] を削除しますか？
+[SECOND_LIFE]に入るにはアカウントが必要です。今すぐアカウントを作成しますか？
+    <tag>confirm</tag>
+    <url name="url">[create_account_url]</url>
+    <usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成" />
+  </notification>
+  <notification name="InvalidCredentialFormat">ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="InvalidGrid">「[GRID]」は、有効なグリッドIDではありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="InvalidLocationSLURL">ログイン位置で有効なグリッドが指定されませんでした。
+    <tag>fail</tag>
+  </notification>
+  <notification name="DeleteClassified">クラシファイド広告『[NAME]』を削除してもよろしいですか？
 支払い済みの料金は返金されません。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeleteMedia">
-		この面にあるメディアを削除する選択をしました。
-続けますか？
-		<usetemplate ignoretext="オブジェクトからメディアを削除する前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="ClassifiedSave">
-		クラシファイド広告 [NAME] への変更を保存しますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
-	</notification>
-	<notification name="ClassifiedInsufficientFunds">
-		クラシファイド広告を出すには、資金が足りません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="DeleteAvatarPick">
-		&lt;nolink&gt;[PICK]&lt;/nolink&gt; を削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeleteOutfits">
-		選択したアウトフィットを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PromptGoToEventsPage">
-		[SECOND_LIFE] イベント Web ページに移動しますか？
-		<url name="url">http://secondlife.com/events/?lang=ja-JP</url>
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SelectProposalToView">表示する提案を選択してください。</notification>
-	<notification name="SelectHistoryItemToView">表示する履歴アイテムを選択してください。</notification>
-	<notification name="CacheWillClear">[APP_NAME] を再起動後にキャッシュがクリアされます。</notification>
-	<notification name="CacheWillBeMoved">[APP_NAME] を再起動後にキャッシュが移動されます。
-ご注意： キャッシュがクリアされます。</notification>
-	<notification name="ChangeConnectionPort">ポートの設定は [APP_NAME] を再起動後に反映されます。</notification>
-	<notification name="ChangeDeferredDebugSetting">デバッグ設定の変更は [APP_NAME] を再起動後に反映されます。</notification>
-	<notification name="ChangeSkin">新しいスキンは [APP_NAME] を再起動後に表示されます。</notification>
-	<notification name="ChangeLanguage">言語の変更は [APP_NAME] を再起動後に反映されます。</notification>
-	<notification name="GoToAuctionPage">
-		[SECOND_LIFE]の Web ページに移動し、入札あるいはオークションの詳細を確認しますか？
-		<url name="url">http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]</url>
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SaveChanges">
-		変更を保存しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
-	</notification>
-	<notification name="DeleteNotecard">
-		ノートカードを削除しますか?
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="LoadPreviousReportScreenshot">
-		以前のスクリーンショットをレポートに使用しますか?
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GestureSaveFailedTooManySteps">ジェスチャーの保存に失敗しました。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="DeleteMedia">この顔に紐づけられたメディアの削除を選択しました。
+続行してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトからメディアを削除する前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="ClassifiedSave">クラシファイド広告[NAME]への変更を保存しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
+  </notification>
+  <notification name="ClassifiedInsufficientFunds">クラシファイド広告を出すには、資金が足りません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ProfileDeleteClassified">クラシファイド広告&lt;nolink&gt;[CLASSIFIED]&lt;/nolink&gt;を削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ProfileDeletePick">ピック&lt;nolink&gt;[PICK]&lt;/nolink&gt;を削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ProfileUnpublishedClassified">未公開のクラシファイド広告があります。
+ウィンドウを閉じると変更が失われます。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ProfileUnsavedChanges">保存されていない変更があります。
+    <tag>confirm</tag>
+    <tag>save</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="破棄" yestext="保存" />
+  </notification>
+  <notification name="DeleteAvatarPick">「&lt;nolink&gt;[PICK]&lt;/nolink&gt;」を削除してもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="DeleteOutfits">このアウトフィットを削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="PromptGoToEventsPage">[SECOND_LIFE]イベントWebページに移動しますか？
+    <url name="url">https://secondlife.com/my/community/events/?lang=ja-JP</url>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SelectProposalToView">表示する提案を選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SelectHistoryItemToView">表示する履歴アイテムを選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <!--
+  <notification name="ResetShowNextTimeDialogs">Would you like to re-enable all these popups, which you previously indicated &apos;Don&apos;t show me again&apos;?
+    <usetemplate name="okcancelbuttons" notext="Cancel" yestext="ＯＫ"/>
+  </notification>
+  <notification name="SkipShowNextTimeDialogs">Would you like to disable all popups which can be skipped?
+    <usetemplate name="okcancelbuttons" notext="Cancel" yestext="ＯＫ"/>
+  </notification>
+  -->
+
+  <notification name="CacheWillClear">キャッシュは、[APP_NAME]再起動後にクリアされます。</notification>
+  <notification name="CacheWillBeMoved">キャッシュは、[APP_NAME]再起動後が移動されます。
+注意：キャッシュがクリアされます。</notification>
+  <notification name="ChangeConnectionPort">ポートの設定は、[APP_NAME]再起動後に反映されます。</notification>
+  <notification name="ChangeDeferredDebugSetting">デバッグ設定の変更は、[APP_NAME]再起動後に反映されます。</notification>
+  <notification name="ChangeSkin">新しいスキンは、[APP_NAME]再起動後に表示されます。</notification>
+  <notification name="ChangeLanguage">言語の変更は、[APP_NAME]再起動後に反映されます。</notification>
+  <notification name="GoToAuctionPage">[SECOND_LIFE]のWebページに移動し、入札あるいはオークションの詳細を確認しますか？
+    <tag>confirm</tag>
+    <url name="url">http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]</url>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SaveChanges">変更を保存しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
+  </notification>
+  <notification name="DeleteNotecard">このノートカードを削除してもよろしいですか？
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="LoadPreviousReportScreenshot">以前のスクリーンショットをレポートに使用しますか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="GestureSaveFailedTooManySteps">ジェスチャーの保存に失敗しました。
 ステップが多すぎます。
-ステップをいくつか削除してから再保存してください</notification>
-	<notification name="GestureSaveFailedTryAgain">ジェスチャーの保存に失敗しました。少し待ってからもう一度試してください。</notification>
-	<notification name="GestureSaveFailedObjectNotFound">ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
-オブジェクトが範囲内に存在しないか、または削除された可能性があります。</notification>
-	<notification name="GestureSaveFailedReason">次の理由で、ジェスチャーの保存時に問題が起こりました。 [REASON]。  後でもう一度試してください。</notification>
-	<notification name="SaveNotecardFailObjectNotFound">ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
-オブジェクトが範囲内に存在しないか、または削除された可能性があります。</notification>
-	<notification name="SaveNotecardFailReason">次の理由で、ノートカードの保存時に問題が起こりました。 [REASON]。  後でもう一度試してください。</notification>
-	<notification name="ScriptCannotUndo">
-		あなたのスクリプトのバージョンでは、変更を元に戻すことはできませんでした。
+ステップをいくつか削除してから再保存してください
+    <tag>fail</tag>
+  </notification>
+  <notification name="GestureSaveFailedTryAgain">ジェスチャーの保存に失敗しました。
+少し待ってからもう一度試してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="GestureSaveFailedObjectNotFound">ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
+オブジェクトが範囲内に存在しないか、削除された可能性があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="GestureSaveFailedReason">以下の理由で、ジェスチャーの保存時に問題が起こりました：[REASON]
+お手数ですが、後でもう一度試してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SaveNotecardFailObjectNotFound">ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
+オブジェクトが範囲内に存在しないか、削除された可能性があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SaveNotecardFailReason">以下の理由で、ノートカードの保存時に問題が起こりました：[REASON]
+お手数ですが、後でもう一度試してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ScriptCannotUndo">あなたのスクリプトのバージョンでは、変更を元に戻すことはできませんでした。
 サーバーの最新保存バージョンをロードしますか？
 （**警告**：この操作後元に戻すことはできません）
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="SaveScriptFailObjectNotFound">スクリプトの保存に失敗しました。スクリプトが入ったオブジェクトが見つかりません。
-オブジェクトは範囲外か、または削除されているかもしれません。</notification>
-	<notification name="StartRegionEmpty">
-		ログイン位置が指定されていません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SaveScriptFailObjectNotFound">スクリプトの保存に失敗しました。スクリプトが入ったオブジェクトが見つかりません。
+オブジェクトは範囲外か、または削除されているかもしれません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="StartRegionEmpty">ログイン位置が指定されていません。
 ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「自宅（ホーム）」を選択してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CouldNotStartStopScript">スクリプトの起動または停止に失敗しました。スクリプトが格納されているオブジェクトが見つかりません。
-オブジェクトが範囲内に存在しないか、または削除された可能性があります。</notification>
-	<notification name="CannotDownloadFile">ファイルをダウンロードできません。</notification>
-	<notification label="" name="MediaFileDownloadUnsupported">
-		[SECOND_LIFE] でサポートされていないファイルのダウンロードを要求しました。
-		<usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="CannotWriteFile">ファイル [[FILE]] を書き込めません。</notification>
-	<notification name="UnsupportedHardware">
-		お使いのコンピューターは [APP_NAME] の必要最低限の動作環境を満たしていません。 パフォーマンスの低下を感じるかもしれません。 恐れ入りますが [SUPPORT_SITE] ではサポート対象外のシステムに関する技術的サポートは行っておりません。
-
-[_URL] に移動して確認をしますか？
-		<url name="url" option="0">http://secondlife.com/support/sysreqs.php?lang=ja</url>
-		<usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="RunLauncher">ビューワ実行ファイルを直接実行しないでください。代わりに、既存のショートカットの内のどれかをアップデートし、SL_Launcher を実行してください。</notification>
-	<notification name="OldGPUDriver">
-		グラフィックスチップに最新のドライバがある可能性があります。グラフィックドライバを更新することにより、大幅にパフォーマンスが向上します。
-
-    ドライバの更新を確認するために [URL] にアクセスしますか?
-		<url name="url">[URL]</url>
-		<usetemplate ignoretext="使用中のグラフィックドライバが古くなっています" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="UnknownGPU">
-		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
-[APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
-（ミー ＞ 環境設定 ＞ グラフィック）
-		<form name="form">
-			<ignore name="ignore" text="使用中のグラフックカードが認識されないとき"/>
-		</form>
-	</notification>
-	<notification name="DisplaySettingsNoShaders">グラフィックドライバを初期化中に [APP_NAME] がクラッシュしました。
-ドライバの一般的なエラーを防ぐために、画質が低に設定されます。 そのため、一部のグラフィック特性に制限が出ます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="CouldNotStartStopScript">スクリプトの起動または停止に失敗しました。スクリプトが格納されているオブジェクトが見つかりません。
+オブジェクトが範囲内に存在しないか、または削除された可能性があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotDownloadFile">ファイルをダウンロードできません。
+    <tag>fail</tag>
+  </notification>
+  <notification label="" name="MediaFileDownloadUnsupported">ダウンロードをリクエストしたファイルは、[SECOND_LIFE]でサポートされていません。
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="CannotWriteFile">ファイル[[FILE]]に書き込むことができませんでした。
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnsupportedHardware">お使いのコンピュータは、[APP_NAME]の最小システム要件を満たしていません。
+このためパフォーマンスが低下する場合があります。恐れ入りますが[SUPPORT_SITE]は、サポートされていないシステム構成に対する技術的サポートを提供できません。
+
+詳細について、[_URL]を確認しますか？
+    <url name="url" option="0">http://secondlife.com/support/sysreqs.php?lang=ja</url>
+    <tag>fail</tag>
+    <usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="OldGPUDriver">グラフィックスチップに最新のドライバがある可能性があります。グラフィックドライバを更新することにより、大幅にパフォーマンスが向上します。
+ドライバの更新を確認するために[URL]にアクセスしますか？
+    <url name="url">[URL]</url>
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <usetemplate ignoretext="使用中のグラフィックドライバが古くなっています" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="UnknownGPU">お使いのシステムには、[APP_NAME]が認識できないグラフィックカードが搭載されています。[APP_NAME]でまだテストされていない最新ハードウェアのためだと考えられます。
+問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
+（「私」＞「初期設定」＞「グラフィック」）
+    <tag>fail</tag>
+    <form name="form">
+      <ignore name="ignore" text="使用中のグラフックカードが認識されないとき" />
+    </form>
+  </notification>
+  <notification name="DisplaySettingsNoShaders">グラフィックドライバを初期化中に[APP_NAME]がクラッシュしました。
+ドライバの一般的なエラーを防ぐために、画質が低に設定されます。このため、一部のグラフィック特性に制限が出ます。
 お使いのグラフィックカードのドライバをアップデートするようおすすめします。
-画質は、環境設定 ＞ グラフィック で設定できます。</notification>
-	<notification name="RegionNoTerraforming">[REGION] では、地形の変更ができません。</notification>
-	<notification name="ParcelNoTerraforming">あなたには [PARCEL] 区画を地形編集する許可がありません。</notification>
-	<notification name="CannotCopyWarning">
-		あなたには次アイテムをコピーする権限がありません： 
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt; 
-他の住人に譲ると、そのアイテムはあなたの持ち物から削除されます。本当にこれらのアイテムを譲りますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="CannotGiveItem">インベントリのアイテムを渡せません。</notification>
-	<notification name="TransactionCancelled">取引がキャンセルされました。</notification>
-	<notification name="TooManyItems">一度に 42 個以上のアイテムは渡せません。</notification>
-	<notification name="NoItems">選択したアイテムを渡す権限がありません。</notification>
-	<notification name="CannotCopyCountItems">
-		あなたは選択した [COUNT] 個のアイテムののコピーを許されていません。
+画質は、「初期設定」＞「グラフィック」で設定できます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AutoFPSConfirmDisable">この設定を変更すると、「自動調整」の設定が無効になります。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="続ける"/>
+  </notification>
+  <notification name="AdvancedLightingConfirm">高度な照明をオンにするには、品質をレベル4以上にする必要があります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+  </notification>
+  <notification name="ShadowsConfirm">影を有効にするには、品質をレベルを4以上にする必要があります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+  </notification>
+  <notification name="RegionNoTerraforming">[REGION]では、地形の変更ができません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ParcelNoTerraforming">[PARCEL]区画の地形を編集する権限がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotCopyWarning">以下のアイテムをコピーする権限がありません：
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+他の人に譲ると、そのアイテムはあなたの持ち物から削除されます。本当にこれらのアイテムを譲ってもよろしいですか？
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="CannotGiveItem">インベントリのアイテムを渡すことができません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="TransactionCancelled">取引がキャンセルされました。
+    <tag>fail</tag>
+  </notification>
+  <notification name="TooManyItems">一度に42個以上のアイテムを渡すことはできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="NoItems">選択したアイテムを渡す権限がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotCopyCountItems">あなたは選択した[COUNT]個のアイテムをコピーする権限がありません。
 これらのアイテムはあなたのインベントリから失われます。
-本当にアイテムを渡したいですか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="CannotGiveCategory">選択したフォルダを渡す権限がありません</notification>
-	<notification name="FreezeAvatar">
-		このアバターをフリーズしますか？
+本当にアイテムを渡してもよろしいですか？
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="CannotGiveCategory">選択したフォルダを渡す権限がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="FreezeAvatar">このアバターをフリーズしますか？
 アバターは一時的に動けなくなり、チャットを含めインワールドで何もできなくなります。
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/>
-	</notification>
-	<notification name="FreezeAvatarFullname">
-		[AVATAR_NAME]をフリーズしますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
+  </notification>
+  <notification name="FreezeAvatarFullname">[AVATAR_NAME]をフリーズしますか？
 フリーズされた人は一時的に動けなくなり、チャットなど、この世界に対する関わりを持つことができなくなります。
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/>
-	</notification>
-	<notification name="EjectAvatarFullname">
-		あなたの土地から [AVATAR_NAME] を追放しますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="追放と禁止" yestext="追放"/>
-	</notification>
-	<notification name="EjectAvatarNoBan">
-		このアバターをあなたの土地から追放しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
-	</notification>
-	<notification name="EjectAvatarFullnameNoBan">
-		[AVATAR_NAME] をあなたの土地から追放しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
-	</notification>
-	<notification name="EjectAvatarFromGroup">&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt; から [AVATAR_NAME] を追放しました</notification>
-	<notification name="AcquireErrorTooManyObjects">取得エラー：選択したオブジェクトの数が多すぎます。</notification>
-	<notification name="AcquireErrorObjectSpan">取得エラー：
-オブジェクトが複数のリージョン（地域）にまたがって存在しています。
-すべて同じリージョン内に移動させてから取得してください。</notification>
-	<notification name="PromptGoToCurrencyPage">
-		[EXTRA]
-
-[_URL] に移動してリンデンドル購入に関する情報を確認しますか？
-		<url name="url">http://secondlife.com/app/currency/?lang=ja-JP</url>
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="MuteLimitReached">[MUTE_LIMIT] エントリの制限に達したため、ブロックリストに新しいエントリを追加できません。</notification>
-	<notification name="UnableToLinkObjects">[COUNT] 個のオブジェクトをリンクできません。
-リンクできるのは最大 [MAX] 個です。</notification>
-	<notification name="CannotLinkIncompleteSet">セットで揃っているオブジェクトのみリンクできます。
-複数のオブジェクトを選択してください。</notification>
-	<notification name="CannotLinkModify">すべてのオブジェクトの修正許可がないためリンクできません。
-
-どのオブジェクトもロックされておらず、あなたのものであることを確認してください。</notification>
-	<notification name="CannotLinkPermanent">地域（リージョン）の境界を越えてオブジェクトをリンクできません。</notification>
-	<notification name="CannotLinkAcrossRegions">地域（リージョン）の境界を越えてオブジェクトをリンクできません。</notification>
-	<notification name="CannotLinkDifferentOwners">所有者が異なるため、オブジェクトをリンクできません。
-
-自分が所有しているオブジェクトだけを選択してください。</notification>
-	<notification name="NoFileExtension">「 [FILE] 」の拡張子が無効です。
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
+  </notification>
+  <notification name="EjectAvatarFullname">あなたの土地から[AVATAR_NAME]を追放しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="追放しバンする" yestext="追放する" />
+  </notification>
+  <notification name="EjectAvatarNoBan">このアバターをあなたの土地から追放しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="EjectAvatarFullnameNoBan">[AVATAR_NAME]をあなたの土地から追放しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="EjectAvatarFromGroup">&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;から[AVATAR_NAME]を追放しました。
+    <tag>group</tag>
+  </notification>
+  <notification name="AcquireErrorTooManyObjects">取得エラー：選択したオブジェクトの数が多すぎます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AcquireErrorObjectSpan">取得エラー：オブジェクトが複数のリージョン（地域）にまたがって存在しています。
+すべて同じリージョン内に移動させてから取得してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptGoToCurrencyPage">[EXTRA]
+  
+[_URL]に移動してリンデンドル購入に関する情報を確認しますか？ 
+    <url name="url">https://secondlife.com/my/lindex/?lang=ja-JP</url>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="MuteLimitReached">[MUTE_LIMIT]エントリの制限に達したため、ブロックリストに新しいエントリを追加できません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnableToLinkObjects">[COUNT]個のオブジェクトをリンクできませんでした。
+リンクできるオブジェクトは最大[MAX]個です。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkIncompleteSet">セットが揃っているオブジェクトのみリンクできます。複数のオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkModify">すべてのオブジェクトの修正許可がないためリンクできません。
+
+どのオブジェクトもロックされておらず、あなたのものであることを確認してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkPermanent">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkAcrossRegions">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkDifferentOwners">所有者が異なるため、オブジェクトをリンクできません。
+自分が所有しているオブジェクトだけを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="NoFileExtension">ファイル「[FILE]」は、無効な拡張子です。
 
 このファイルの拡張子が正しいかどうかを確認してください。</notification>
-	<notification name="InvalidFileExtension">
-		[EXTENSION] は無効です。
-正しい拡張子：[VALIDS]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotUploadSoundFile">読み込みのためにアップロードされたサウンドファイルを開けません：
-[FILE]</notification>
-	<notification name="SoundFileNotRIFF">RIFF WAVE ファイルとして認識されません：
-[FILE]</notification>
-	<notification name="SoundFileNotPCM">PCM WAVE オーディオファイルとして認識されません：
-[FILE]</notification>
-	<notification name="SoundFileInvalidChannelCount">ファイルのチャンネル数が無効です（モノラルまたはステレオを使用する必要があります）：
-[FILE]</notification>
-	<notification name="SoundFileInvalidSampleRate">ファイルのサンプルレートがサポートされていません（44.1k である必要があります）：
-[FILE]</notification>
-	<notification name="SoundFileInvalidWordSize">ファイルのワードサイズがサポートされていません（8 または 16 ビットである必要があります）：
-[FILE]</notification>
-	<notification name="SoundFileInvalidHeader">WAV ヘッダーにデータチャンクが見つかりません：
-[FILE]</notification>
-	<notification name="SoundFileInvalidChunkSize">WAV ファイルのチャンクサイズが間違っています：
-[FILE]</notification>
-	<notification name="SoundFileInvalidTooLong">オーディオファイルが長すぎます。（最大 10 秒）：
-[FILE]</notification>
-	<notification name="ProblemWithFile">「 [FILE] 」に問題があります。
-
-[ERROR]</notification>
-	<notification name="CannotOpenTemporarySoundFile">書き込み用の一時圧縮サウンドファイルを開くことができません：[FILE]</notification>
-	<notification name="UnknownVorbisEncodeFailure">不明の Vorbis のエンコードに失敗： [FILE]</notification>
-	<notification name="CannotEncodeFile">次のファイルのエンコードができません： [FILE]</notification>
-	<notification name="CorruptedProtectedDataStore">
-		ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CorruptResourceFile">破損したリソースファイル： [FILE]</notification>
-	<notification name="UnknownResourceFileVersion">不明のリンデンリソースファイルのバージョン： [FILE]</notification>
-	<notification name="UnableToCreateOutputFile">出力ファイルを作成できません： [FILE]</notification>
-	<notification name="DoNotSupportBulkAnimationUpload">現在 [APP_NAME] では、BVH 形式のアニメーションファイルの一括アップロードはサポートされていません。</notification>
-	<notification name="CannotUploadReason">次の理由で、「 [FILE] 」をアップロードできません： [REASON]
-あとでもう一度試してください。</notification>
-	<notification name="LandmarkCreated">「 [LANDMARK_NAME] 」を「 [FOLDER_NAME] 」フォルダに追加しました。</notification>
-	<notification name="LandmarkAlreadyExists">
-		現在地のランドマークを既に持っています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotCreateLandmarkNotOwner">土地の所有者が許可していないため、ランドマークを作成することはできません。</notification>
-	<notification name="CannotRecompileSelectObjectsNoScripts">「リコンパイル」できません。
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotRecompileSelectObjectsNoPermission">「リコンパイル」できません。
-
-修正修正権限のあるスクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotResetSelectObjectsNoScripts">「再設定」ができません。
-
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotResetSelectObjectsNoPermission">「再設定」ができません。
-
-修正権限のあるスクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotOpenScriptObjectNoMod">修正権限のないオブジェクトのスクリプトは開くことはできません。</notification>
-	<notification name="CannotSetRunningSelectObjectsNoScripts">スクリプトの「実行」ができません。
-
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotSetRunningNotSelectObjectsNoScripts">スクリプトを「実行しない」設定にできません。
-
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="NoFrontmostFloater">保存する frontmost フロータがありません。</notification>
-	<notification name="SeachFilteredOnShortWords">指定した検索クエリは変更され、短すぎる語句は取り除かれています。
-
-検索語句： [FINALQUERY]</notification>
-	<notification name="SeachFilteredOnShortWordsEmpty">指定した検索語句が短すぎたため、検索は行われませんでした。</notification>
-	<notification name="CouldNotTeleportReason">テレポートに失敗しました。
-[REASON]</notification>
-	<notification name="invalid_tport">テレポート処理中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</notification>
-	<notification name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</notification>
-	<notification name="blocked_tport">申し訳ございません。テレポートは現在、ブロックされています。しばらくしてから再度お試しください。
-それでもテレポートできない場合は、ログアウトし、ログインし直して問題を解決してください。</notification>
-	<notification name="nolandmark_tport">申し訳ございません。ランドマークの目的地が見つかりませんでした。</notification>
-	<notification name="timeout_tport">申し訳ございません。システムによるテレポート接続が完了できませんでした。
-しばらくしてから再度お試しください。</notification>
-	<notification name="noaccess_tport">残念ながら、目的地へアクセスが許可されていないため、テレポートできません。</notification>
-	<notification name="missing_attach_tport">添付物がまだ届いていません。テレポートをする前にあと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてください。</notification>
-	<notification name="too_many_uploads_tport">このリージョンのアセットキューが現在混み合っているため、テレポートのリクエストをすぐに処理することが難しい状況です。
-数分後にやり直すか、混雑していない他のリージョンでお試しください。</notification>
-	<notification name="expired_tport">申し訳ございません。システムはテレポートのリクエストを時間どおりに完了できませんでした。数分後にやり直してください。</notification>
-	<notification name="expired_region_handoff">申し訳ございません。システムはリージョン間の移動を時間どおりに完了できませんでした。
-数分後にやり直してください。</notification>
-	<notification name="no_host">テレポート目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。数分後にやり直してください。</notification>
-	<notification name="no_inventory_host">インベントリシステムは現在利用できません。</notification>
-	<notification name="CannotSetLandOwnerNothingSelected">土地所有者設定ができません：
-区画が選定されていません。</notification>
-	<notification name="CannotSetLandOwnerMultipleRegions">複数のリージョンが選択されたため、土地の所有権を取得できません。
-選択する面積を小さくして、もう一度お試しください。</notification>
-	<notification name="ForceOwnerAuctionWarning">
-		この区画はオークションに出されています。 所有権を変更するとオークションはキャンセルとなり、既にオークションに参加している住人がいればその人に迷惑をかけてしまいます。
+  <notification name="InvalidFileExtension">「[EXTENSION]」は、無効な拡張子です。
+有効な拡張子：[VALIDS] 
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="CannotUploadSoundFile">読み込みのためにアップロードされたサウンドファイルを開けません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileNotRIFF">RIFF WAVEファイルとして認識されません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileNotPCM">PCM WAVEオーディオファイルとして認識されません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidChannelCount">このファイルのチャンネル数は無効です（モノラルか、ステレオである必要があります）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidSampleRate">このファイルのサンプリングレートはサポートされていません（44.1kである必要があります）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidWordSize">このファイルのビットサイズはサポートされていません（8bitか、16bitである必要があります）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidHeader">WAVヘッダーにデータチャンクが見つかりません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidChunkSize">WAVファイルのチャンクサイズが間違っています：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidTooLong">オーディオファイルが長すぎます。（最大１０秒）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="ProblemWithFile">「[FILE]」に問題があります。
+
+[ERROR]
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotOpenTemporarySoundFile">書き込み用の一時圧縮サウンドファイルを開くことができません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnknownVorbisEncodeFailure">不明なVorbisのエンコードに失敗しました：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotEncodeFile">次のファイルのエンコードができません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="CorruptedProtectedDataStore">ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="CorruptResourceFile">破損したリソースファイル：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnknownResourceFileVersion">不明なLindenリソースファイルのバージョンです：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnableToCreateOutputFile">出力ファイルを作成できません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="DoNotSupportBulkAnimationUpload">現在[APP_NAME]では、BVH形式のアニメーションファイルの一括アップロードはサポートされていません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotUploadReason">以下の理由で「[FILE]」をアップロードできませんでした：
+[REASON]
+
+お手数ですがもう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="LandmarkCreated">「[LANDMARK_NAME]」を「[FOLDER_NAME]」フォルダに追加しました。</notification>
+  <notification name="LandmarkAlreadyExists">この場所のランドマークは、既に持っています。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification label="フォルダ作成" name="CreateLandmarkFolder">
+    <unique />
+フォルダ名を入力してください：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+      </input>
+      <button default="true" index="0" name="ＯＫ" text="ＯＫ"/>
+      <button index="1" name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+  <notification name="CannotRecompileSelectObjectsNoScripts">「再コンパイル」できませんでした。
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotRecompileSelectObjectsNoPermission">「再コンパイル」できませんでした。
+修正権限のある、スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotResetSelectObjectsNoScripts">「再設定」ができません。
+
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotResetSelectObjectsNoPermission">「再設定」ができません。
+修正権限のある、スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotOpenScriptObjectNoMod">修正権限のないオブジェクトのスクリプトは開くことはできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotSetRunningSelectObjectsNoScripts">スクリプトの「実行」ができません。
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotSetRunningNotSelectObjectsNoScripts">スクリプトを「実行しない」設定にできません。
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="NoFrontmostFloater">保存するfrontmostフロータがありません。</notification>
+  <notification name="SeachFilteredOnShortWords">指定した検索クエリは変更され、短すぎる語句は取り除かれています。
+
+検索語句：[FINALQUERY]</notification>
+  <notification name="SeachFilteredOnShortWordsEmpty">指定した検索語句が短すぎたため、検索は行われませんでした。
+    <tag>fail</tag>
+  </notification>
+  <!-- Generic Teleport failure modes - strings will be inserted from teleport_strings.xml if available. -->
+  <notification name="CouldNotTeleportReason">テレポートに失敗しました。
+[REASON]
+    <tag>fail</tag>
+  </notification>
+  <!-- Teleport failure modes not delivered via the generic mechanism
+    above (for example, delivered as an AlertMessage on
+    region-crossing :( ) - these paths should really be merged
+    in the future. -->
+  <notification name="invalid_tport">テレポートの試行は１分間に６回までと制限されています。１分待ってからもう一度テレポートしてみてください。問題が解決しない場合は、ログインし直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。ログインし直す必要があるかもしれません。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="blocked_tport">申し訳ございません。テレポートは現在ブロックされています。お手数ですが、しばらくしてから再度お試しください。
+それでもテレポートできない場合は、ログアウトし、ログインし直して問題を解決してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="nolandmark_tport">申し訳ございません。ランドマークの目的地が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+  <notification name="timeout_tport">申し訳ございません。システムによるテレポート接続が完了できませんでした。
+しばらくしてから再度お試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="noaccess_tport">残念ながら、目的地へアクセスが許可されていないため、テレポートできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="missing_attach_tport">添付物がまだ届いていません。テレポートをする前にあと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="too_many_uploads_tport">このリージョンのアセットキューが現在混み合っているため、テレポートのリクエストをすぐに処理することが難しい状況です。
+数分後にやり直すか、混雑していない他のリージョンでお試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="expired_tport">申し訳ございません。システムはテレポートのリクエストを時間どおりに完了できませんでした。
+数分後にやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="expired_region_handoff">申し訳ございません。システムはリージョン間の移動を時間どおりに完了できませんでした。
+数分後にやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="no_host">テレポート目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。
+  数分後にやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="no_inventory_host">インベントリシステムは現在利用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSetLandOwnerNothingSelected">土地所有者設定ができません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSetLandOwnerMultipleRegions">複数のリージョンが選択されたため、土地の所有権を取得できません。
+選択する面積を小さくして、もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ForceOwnerAuctionWarning">この区画はオークションに出されています。所有権を変更するとオークションはキャンセルとなり、既にオークションに参加している住人がいればその人に迷惑をかけてしまいます。
 所有権を変更しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="CannotContentifyNothingSelected">コンテンツ化は不可能です：
-区画が選定されていません。</notification>
-	<notification name="CannotContentifyNoRegion">コンテンツ化は不可能です：
-土地が選択されていません。</notification>
-	<notification name="CannotReleaseLandNothingSelected">土地を破棄できません：
-区画が選定されていません。</notification>
-	<notification name="CannotReleaseLandNoRegion">土地を破棄できません：
-リージョンが見つかりません。</notification>
-	<notification name="CannotBuyLandNothingSelected">土地を購入できません：
-区画が選定されていません。</notification>
-	<notification name="CannotBuyLandNoRegion">土地を購入できません：
-この土地があるリージョンを見つけることができません</notification>
-	<notification name="CannotCloseFloaterBuyLand">[APP_NAME] がこの取引価格を見積もるまでは、土地の購入ウィンドウを閉じることはできません。</notification>
-	<notification name="CannotDeedLandNothingSelected">土地を譲渡できません：
-区画が選定されていません。</notification>
-	<notification name="CannotDeedLandNoGroup">土地を譲渡できません：
-グループが選択されていません。</notification>
-	<notification name="CannotDeedLandNoRegion">土地を譲渡できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotDeedLandMultipleSelected">土地を譲渡できません：
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CannotContentifyNothingSelected">コンテンツ化は不可能です：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotContentifyNoRegion">コンテンツ化は不可能です：
+土地が選択されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandNothingSelected">土地を破棄できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandNoRegion">土地を破棄できません：
+リージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotBuyLandNothingSelected">土地を購入できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotBuyLandNoRegion">土地を購入できません：
+この土地があるリージョンを見つけることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotCloseFloaterBuyLand">[APP_NAME] がこの取引価格を見積もるまでは、土地の購入ウィンドウを閉じることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNothingSelected">土地を譲渡できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNoGroup">土地を譲渡できません：
+グループが選択されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNoRegion">土地を譲渡できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandMultipleSelected">土地を譲渡できません：
 複数の区画が選択されています。
 
-区画を 1 つ選択してください。</notification>
-	<notification name="CannotDeedLandWaitingForServer">土地を譲渡できません：
+区画を１つ選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandWaitingForServer">土地を譲渡できません：
 サーバーからの所有権情報を待っています。
 
-再度、試みてください。</notification>
-	<notification name="CannotDeedLandNoTransfer">土地を譲渡できません：
-[REGION] では土地の譲渡が許されていません。</notification>
-	<notification name="CannotReleaseLandWatingForServer">土地を破棄できません：
+お手数ですが、もう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNoTransfer">土地を譲渡できません：
+[REGION]では、土地の譲渡が許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandWatingForServer">土地を破棄できません：
 サーバーが区画情報を更新するのを待っています。
 
-もう少し後でやり直してください。</notification>
-	<notification name="CannotReleaseLandSelected">土地を破棄できません：
+お手数ですが、もう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandSelected">土地を破棄できません：
 あなたは、選択した区画のすべてを所有していません。
 
-区画を 1 つ選択してください。</notification>
-	<notification name="CannotReleaseLandDontOwn">土地を破棄できません：
+区画を１つ選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandDontOwn">土地を破棄できません：
 あなたはこの土地を手放すことを許可されていません。
-あなたの区画は緑色で表示されています。</notification>
-	<notification name="CannotReleaseLandRegionNotFound">土地を放棄できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotReleaseLandNoTransfer">土地を破棄できません：
-[REGION] では土地の譲渡が許されていません。</notification>
-	<notification name="CannotReleaseLandPartialSelection">土地を破棄できません：
+あなたの区画は緑色で表示されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandRegionNotFound">土地を放棄できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandNoTransfer">土地を破棄できません：
+[REGION]では土地の譲渡が許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandPartialSelection">土地を破棄できません：
 区画全体を選択して破棄する必要があります。
 
-区画全体を選択するか、または、まず最初に区画を分割してください。</notification>
-	<notification name="ReleaseLandWarning">
-		あなたは、[AREA] 平方メートルの土地を破棄しようとしています。
-この区画を破棄するとあなたの土地ではなくなりますが、
-L$ は返金されません。
+区画全体を選択するか、まず最初に区画を分割してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleaseLandWarning">あなたは、[AREA]㎡の土地を破棄しようとしています。
+この区画を破棄するとあなたの土地ではなくなりますが、L$ は返金されません。
+
+土地を破棄してもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CannotDivideLandNothingSelected">土地を分割できません：
 
-土地を破棄しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="CannotDivideLandNothingSelected">土地を分割できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
 
-区画が選定されていません。</notification>
-	<notification name="CannotDivideLandPartialSelection">土地を分割できません：
+  <notification name="CannotDivideLandPartialSelection">土地を分割できません：
 
 区画全体が選択されています。
-区画の一部を選択してください。</notification>
-	<notification name="LandDivideWarning">
-		この土地を分割すると、2 つの区画に別れます。
-区画ごとの設定が可能になります。 この操作を行うと、一部の設定がデフォルトにリセットされます。
-
-土地の分割操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="CannotDivideLandNoRegion">土地を分割できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotJoinLandNoRegion">土地を統合できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotJoinLandNothingSelected">土地を統合できませんでした：
-区画が選定されていません。</notification>
-	<notification name="CannotJoinLandEntireParcelSelected">土地を統合できません：
-区画が 1 つしか選択されていません。
-
-両方の区画をまたいで土地を選択してください。</notification>
-	<notification name="CannotJoinLandSelection">土地を統合できません：
-区画を 1 つ以上選択する必要があります。
-
-両方の区画をまたいで土地を選択してください。</notification>
-	<notification name="JoinLandWarning">
-		この土地を統合すると、選択された長方形に交差する全ての区画を基にして、大きな区画が 1 つ作成されます。
+区画の一部を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandDivideWarning">この土地を分割すると、２つの区画に分割され各々の設定が可能になります。
+この操作を行うと、一部の設定がデフォルトにリセットされます。
+
+土地を分割してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="CannotDivideLandNoRegion">土地を分割できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandNoRegion">土地を結合できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandNothingSelected">土地を結合できませんでした：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandEntireParcelSelected">土地を結合できません：
+区画が１つしか選択されていません。
+
+両方の区画をまたいで土地を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandSelection">土地を結合できません：
+区画を１つ以上選択する必要があります。
+
+両方の区画をまたいで土地を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="JoinLandWarning">この土地を結合すると、選択された長方形に交差する全ての区画を基にして、大きな区画が１つ作成されます。
 新しい区画の名前とオプションを再設定する必要があります。
 
-土地を統合しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmNotecardSave">
-		このアイテムをコピー、表示する前に、ノートカードの保存が必要です。 保存しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmItemCopy">
-		このアイテムをあなたのインベントリにコピーしますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="コピー"/>
-	</notification>
-	<notification name="ResolutionSwitchFail">解像度を [RESX]x[RESY] に切り替えることができませんでした。</notification>
-	<notification name="ErrorUndefinedGrasses">エラー：未定義の植物：[SPECIES]</notification>
-	<notification name="ErrorUndefinedTrees">エラー：未定義の樹木：[SPECIES]</notification>
-	<notification name="CannotSaveWearableOutOfSpace">「 [NAME] 」を衣類のファイルに保存できません。
-コンピューターのディスクスペースを少し増やしてから、もう一度保存してみてください。</notification>
-	<notification name="CannotSaveToAssetStore">「 [NAME] 」を保存できません。
-通常これは一時的なエラーです。 数分後にもう一度着用物をカスタマイズ・保存してください。</notification>
-	<notification name="YouHaveBeenLoggedOut">
-		しまった、[SECOND_LIFE] からログアウトされてしまいました。
+土地を結合してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmNotecardSave">このアイテムをコピー、表示する前に、ノートカードの保存が必要です。
+保存してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmItemCopy">このアイテムをあなたのインベントリにコピーしますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="コピー" />
+  </notification>
+
+  <notification name="ResolutionSwitchFail">解像度を[RESX]✕[RESY]に変更することができませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ErrorUndefinedGrasses">エラー：未定義の植物：[SPECIES]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ErrorUndefinedTrees">エラー：未定義の樹木：[SPECIES]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSaveWearableOutOfSpace">「[NAME]」を服装のファイルに保存できません。
+コンピューターのディスクスペースを少し増やしてから、もう一度保存してみてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSaveToAssetStore">「[NAME]」を保存できません。
+通常これは一時的なエラーです。数分後にもう一度着用物をカスタマイズ・保存してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="YouHaveBeenLoggedOut">しまった、[SECOND_LIFE]からログアウトされてしまいました。[MESSAGE]
+    <usetemplate name="okcancelbuttons" notext="終了" yestext="ＩＭでチャット" />
+  </notification>
+
+  <notification name="InventoryUnusable">インベントリの読み込み中に問題が発生しました。まず、ログアウトして再度ログインし直してみてください。
+このメッセージが再度表示される場合は、サポートに連絡して問題を解決してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OnlyOfficerCanBuyLand">グループ用の土地の購入ができません：
+あなたにはアクティブなグループのために土地を購入する権限がありません。
+    <tag>group</tag>
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="フレンド登録" name="AddFriendWithMessage">フレンド登録すると、お互いの現在いる場所のマップへの表示許可や、オンライン状態の表示設定ができます。
+
+[NAME]にフレンドの申請を行いますか？
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">フレンド登録してくれますか？</input>
+      <button name="Offer" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="自動置換リストを追加" name="AddAutoReplaceList">新しいリストの名前：
+    <tag>addlist</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="SetName" text="ＯＫ" />
+    </form>
+  </notification>
+
+  <notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">名前「[DUPNAME]」は既に使われています。
+一意の名前を入力してください：
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ReplaceList" text="着用中のリストを入れ替える" />
+      <button name="SetName" text="新しい名前を使用" />
+    </form>
+  </notification>
+
+  <notification name="InvalidAutoReplaceEntry">キーワードは一語でなければならず、置換は空にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidAutoReplaceList">その置換リストは無効です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpellingDictImportRequired">ファイル、名前および言語を指定する必要があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpellingDictIsSecondary">辞書 [DIC_NAME]に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
+この辞書は追加辞書として使用できますが、メイン辞書としては使用できません。詳細については下記をご覧ください。
+https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpellingDictImportFailed">[FROM_NAME]から[TO_NAME]へコピーすることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <!-- [DESC] (new)は日本語が使えないので翻訳しない。-->
+  <notification label="アウトフィットの保存" name="SaveOutfitAs">着用中のアウトフィットを新しいアウトフィットとして保存：
+    <unique />
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC] (new)</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="着用物の保存" name="SaveWearableAs">アイテムを別名でインベントリに保存：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC] (new)</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="アウトフィットの名前変更" name="RenameOutfit">新しいアウトフィット名：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="new_name">[NAME]</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="ジェスチャーの名前変更" name="RenameGesture">新しいジェスチャー名：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="new_name">[NAME]</input>
+      <button name="ＯＫ" text="ＯＫ"/>
+      <button name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification label="ランドマークの名前変更" name="RenameLandmark">[NAME]の新しい名前を入力してください。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="new_name">[NAME]</input>
+      <button name="ＯＫ" text="ＯＫ"/>
+      <button name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification name="RemoveFromFriends">フレンドリストから&lt;nolink&gt;[NAME]&lt;/nolink&gt;を削除しますか？
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RemoveMultipleFromFriends">フレンドリストから複数のフレンドを削除しますか？
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GodDeleteAllScriptedPublicObjectsByUser">**[AVATAR_NAME]**
+が所有するすべてのスクリプトオブジェクトを、このシム内の他のすべての土地から削除しようとしています。
+操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
 
-[MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="終了" yestext="IMとチャットを表示"/>
-	</notification>
-	<notification name="OnlyOfficerCanBuyLand">グループ用の土地の購入ができません：
-あなたにはアクティブなグループのために土地を購入する権限がありません。</notification>
-	<notification label="フレンド登録" name="AddFriendWithMessage">
-		フレンド登録すると、お互いの現在地の地図への表示許可、オンライン状態の表示設定ができます。
-
-[NAME] にフレンドシップを申し出ますか？
-		<form name="form">
-			<input name="message">フレンド登録してくれますか？</input>
-			<button name="Offer" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification label="自動置換リストを追加" name="AddAutoReplaceList">
-		新しいリストの名前:
-		<form name="form">
-			<button name="SetName" text="OK"/>
-		</form>
-	</notification>
-	<notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">
-		名前 '[DUPNAME]' は既に使われています
-一意の名前を入力してください:
-		<form name="form">
-			<button name="ReplaceList" text="着用中のリストを入れ替える"/>
-			<button name="SetName" text="新しい名前を使用"/>
-		</form>
-	</notification>
-	<notification name="InvalidAutoReplaceEntry">キーワードは一語でなければならず、置換は空にできません。</notification>
-	<notification name="InvalidAutoReplaceList">その置換リストは無効です。</notification>
-	<notification name="SpellingDictImportRequired">ファイル、名前および言語を指定する必要があります。</notification>
-	<notification name="SpellingDictIsSecondary">辞書 [DIC_NAME] に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
-この辞書は追加辞書として使用できますが、メイン辞書としては使用できません。
-
-https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してください。</notification>
-	<notification name="SpellingDictImportFailed">[FROM_NAME] から
-
-[TO_NAME] へコピーできません</notification>
-	<notification label="アウトフィットを保存する" name="SaveOutfitAs">
-		着用中のアウトフィットを新しいアウトフットとして保存：
-		<form name="form">
-			<input name="message">[DESC] （新）</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification label="着用物を保存" name="SaveWearableAs">
-		アイテムを別名でインベントリに保存：
-		<form name="form">
-			<input name="message">[DESC]（新規）</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="アウトフィットの名前を変更する" name="RenameOutfit">
-		新しいアウトフィットの名前：
-		<form name="form">
-			<input name="new_name">[NAME]</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="RemoveFromFriends">
-		フレンドリストから &lt;nolink&gt;[NAME]&lt;/nolink&gt; を削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="RemoveMultipleFromFriends">
-		フレンドリストから複数のフレンドを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
-		**[AVATAR_NAME]**
-所有のすべてのスクリプトオブジェクトをこのシム内の他のすべての土地から削除しようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllScriptedObjectsByUser">
-		**[AVATAR_NAME]**
-所有のすべてのスクリプトオブジェクトをこのシム内のすべての土地から削除しようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllObjectsByUser">
-		**[AVATAR_NAME]**
-所有のすべてのオブジェクト（スクリプトオブジェクトと非スクリプトオブジェクト）を
-このシム内のすべての土地から削除しようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BlankClassifiedName">クラシファイドの名前を指定してください。</notification>
-	<notification name="MinClassifiedPrice">広告料は最低 L$ [MIN_PRICE] 必要です。
-
-金額を増やしてください。</notification>
-	<notification name="ConfirmItemDeleteHasLinks">
-		1 つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。まず最初にリンクを削除することを強くお勧めします。
+  <notification name="GodDeleteAllScriptedObjectsByUser">**[AVATAR_NAME]**
+が所有するすべてのスクリプトオブジェクトを、このシム内の他のすべての土地から削除しようとしています。
+操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GodDeleteAllObjectsByUser">**[AVATAR_NAME]**
+が所有するすべてのオブジェクト（スクリプトオブジェクトと非スクリプトオブジェクト）を、このシム内のすべての土地から削除しようとしています。
+操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BlankClassifiedName">クラシファイド広告の名前を指定してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="MinClassifiedPrice">クラシファイド広告掲載料は最低L$ [MIN_PRICE]必要です。
+
+金額を増やしてください。
+    <tag>fail</tag>
+  </notification>
 
+  <notification name="ConfirmItemDeleteHasLinks">１つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。
+まず最初にリンクを削除することを強くお勧めします。
+  
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLock">
-		選択したアイテムのうち、少なくとも 1 つがロックされています。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmObjectDeleteLock">選択したアイテムのうち、少なくとも１つがロックされています。
 
 本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoCopy">
-		選択したアイテムのうち、少なくとも 1 つがコピーできません。
-
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmObjectDeleteNoCopy">選択したアイテムのうち、少なくとも１つがコピーできません。
+  
 本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoOwn">
-		選択したアイテムの 1 つ以上を所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
 
+  <notification name="ConfirmObjectDeleteNoOwn">選択したアイテムの１つ以上を所有していません。
+  
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoCopy">
-		少なくとも 1 つのオブジェクトがロックされています。
-少なくとも 1 つのオブジェクトがコピーできません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteLockNoCopy">少なくとも１つのオブジェクトがロックされています。
+少なくとも１つのオブジェクトがコピーできません。
 
 本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoOwn">
-		1 つ以上のオブジェクトがロックされました。
-1 つ以上のオブジェクトを所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteLockNoOwn">１つ以上のオブジェクトがロックされました。
+１つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		1 つ以上のオブジェクトがコピーできません。
-1 つ以上のオブジェクトを所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteNoCopyNoOwn">１つ以上のオブジェクトがコピーできません。
+１つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		1 つ以上のオブジェクトがロックされています。
-1 つ以上のオブジェクトがコピーできません。
-1 つ以上のオブジェクトを所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteLockNoCopyNoOwn">１つ以上のオブジェクトがロックされています。
+１つ以上のオブジェクトがコピーできません。
+１つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeLock">
-		少なくとも 1 つのオブジェクトがロックされています。
-
-本当にこのまま取得を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeNoOwn">
-		取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
-あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。
-そのため、将来、修正やコピーの能力が制限される可能性があります。
-
-本当にこのまま取得を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeLockNoOwn">
-		少なくとも 1 つのオブジェクトがロックされています。
-取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
-あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectTakeLock">少なくとも１つのオブジェクトがロックされています。
+  
+本当にこのまま取得を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectTakeNoOwn">取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
+あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。そのため、将来、修正やコピーの能力が制限される可能性があります。
+
+本当にこのまま取得を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectTakeLockNoOwn">少なくとも１つのオブジェクトがロックされています。
+取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。
 そのため、将来、編集やコピーの能力が制限される可能性があります。
-この選択内容のままで続行することは可能ですが、
 
-本当にこのまま取得を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="CantBuyLandAcrossMultipleRegions">複数のリージョンが選択されたため、土地を購入できません。
+この選択内容のままで続行することは可能ですが、本当にこのまま取得を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantBuyLandAcrossMultipleRegions">複数のリージョンが選択されたため、土地を購入できません。
+選択する面積を小さくしてもう一度試してください。
+    <tag>fail</tag>
+  </notification>
 
-選択する面積を小さくしてもう一度試してください。</notification>
-	<notification name="DeedLandToGroup">
-		この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
+  <notification name="DeedLandToGroup">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
 土地の購入価格は所有者に返金されません。譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 
-この [AREA] m² の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeedLandToGroupWithContribution">
-		この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
-譲渡には同時に [NAME] からグループへの土地の貢献が含まれます。土地の購入価格は所有者に返金されません。
+この[AREA]㎡の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DeedLandToGroupWithContribution">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
+譲渡には同時に [NAME]からグループへの土地の貢献が含まれます。土地の購入価格は所有者に返金されません。
 譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 
-この [AREA] m² の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DisplaySetToSafe">-safe オプションを指定したので、
-表示設定はセーフレベルに設定されています。</notification>
-	<notification name="DisplaySetToRecommendedGPUChange">グラフィックの変更により、画面設定は推奨レベルに設定されました。
-'[LAST_GPU]' から
-'[THIS_GPU]' まで</notification>
-	<notification name="DisplaySetToRecommendedFeatureChange">レンダリングサブシステムの変更により、画面設定は推奨レベルに設定されました。</notification>
-	<notification name="ErrorMessage">
-		[ERROR_MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AvatarMovedDesired">目的地は現在ご利用いただけません。
-近くのリージョンに移動しました。</notification>
-	<notification name="AvatarMovedLast">リクエストされた場所は現在ご利用いただけません。
-近くのリージョンに移動しました。</notification>
-	<notification name="AvatarMovedHome">ホームロケーションは現在ご利用いただけません。
+この[AREA]㎡の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DisplaySetToSafe">-safe オプションを指定したので、表示設定はセーフレベルに設定されています。</notification>
+
+  <notification name="DisplaySetToRecommendedGPUChange">グラフィックの変更により、画面設定は推奨レベルに設定されました。
+「[LAST_GPU]」から
+「[THIS_GPU]」まで</notification>
+
+  <notification name="DisplaySetToRecommendedFeatureChange">レンダリングサブシステムの変更により、画面設定は推奨レベルに設定されました。</notification>
+
+  <notification name="ErrorMessage">
+[ERROR_MESSAGE]
+    <unique>
+      <context>ERROR_MESSAGE</context>
+    </unique>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AvatarMovedDesired">目的地は現在ご利用いただけません。
+近くのリージョンに移動しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarMovedLast">リクエストされた場所は現在ご利用いただけません。
+近くのリージョンに移動しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarMovedHome">ホームロケーションは現在ご利用いただけません。
 近くのリージョンに移動しました。
-新たにホームを設定し直す必要があるかもしれません。</notification>
-	<notification name="ClothingLoading">
-		現在衣類をダウンロード中です。
-このまま [SECOND_LIFE] を通常通りご使用いただけます。他人からはあなたは正しく表示されます。
-		<form name="form">
-			<ignore name="ignore" text="衣類がダウンロードされるまで時間がかかっているとき"/>
-		</form>
-	</notification>
-	<notification name="AgentComplexityWithVisibility">
-		あなたの [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] は [AGENT_COMPLEXITY] です。
+新たにホームを設定し直す必要があるかもしれません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ClothingLoading">現在服装をダウンロード中です。
+このまま[SECOND_LIFE]を通常通りご使用いただけます。他人からはあなたは正しく表示されます。
+    <form name="form">
+      <ignore name="ignore" text="服装がダウンロードされるまで時間がかかっているとき" />
+    </form>
+  </notification>
+
+  <notification name="AgentComplexityWithVisibility">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
 [OVERLIMIT_MSG]
-		<usetemplate ignoretext="アバターの複雑度が高すぎる場合は警告する" name="notifyignore"/>
-	</notification>
-	<notification name="AgentComplexity">
-		あなたの [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] は [AGENT_COMPLEXITY] です。
-		<usetemplate ignoretext="アバターの複雑さの変更について警告する" name="notifyignore"/>
-	</notification>
-	<notification name="HUDComplexityWarning">
-		[HUD_REASON]、パフォーマンスに悪影響を与える恐れがあります。
-		<usetemplate ignoretext="HUD が複雑すぎる場合はお知らせください" name="notifyignore"/>
-	</notification>
-	<notification name="FirstRun">
-		[APP_NAME] のインストールが完了しました。
-
-[SECOND_LIFE] を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
-		<usetemplate name="okcancelbuttons" notext="続行" yestext="アカウントを作成..."/>
-	</notification>
-	<notification name="LoginPacketNeverReceived">
-		接続がなかなかできません。 お使いのインターネット接続か、[SECOND_LIFE_GRID] の問題と考えられます。
-
-インターネット接続を確認してから数分後に再接続するか、ヘルプをクリックして [SUPPORT_SITE] をご覧になるか、テレポートをクリックしてホームに移動してみてください。
-		<url name="url">http://jp.secondlife.com/support/</url>
-		<form name="form">
-			<button name="OK" text="OK"/>
-			<button name="Help" text="ヘルプ"/>
-			<button name="Teleport" text="テレポート"/>
-		</form>
-	</notification>
-	<notification name="WelcomeChooseSex">
-		まもなくあなたのアバターが表示されます。
-
-矢印キーを使用して歩きます。
-ヘルプが必要なときや [SECOND_LIFE] について知りたいときは、
-F1 キーを押してください。
-男性あるいは女性のアバターを選択してください。
-あなたの決定は後で変更できます。
-		<usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/>
-	</notification>
-	<notification name="CantTeleportToGrid">
-		現在のグリッド（[CURRENT_GRID]）とはグリッド（[GRID]）が異なるため、[SLURL] にテレポートできませんでした。   ビューワを閉じてからもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GeneralCertificateError">
-		サーバーに接続できませんでした。
+    <unique combine="cancel_old">
+      <context>AgentComplexityNotice</context>
+    </unique>
+    <usetemplate ignoretext="アバターの複雑度が高すぎる場合の警告" name="notifyignore" />
+  </notification>
+
+  <notification name="AgentComplexity">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
+    <unique combine="cancel_old">
+      <context>AgentComplexityNotice</context>
+    </unique>
+    <usetemplate ignoretext="アバターの複雑さの変更についての警告" name="notifyignore" />
+  </notification>
+
+  <notification name="HUDComplexityWarning">[HUD_REASON]
+このため、パフォーマンスに悪影響を与える恐れがあります。
+    <unique combine="cancel_old">
+      <context>HUDComplexityWarning</context>
+    </unique>
+    <usetemplate ignoretext="ＨＵＤが複雑すぎる場合の警告" name="notifyignore" />
+  </notification>
+
+  <notification name="FirstRun">[APP_NAME]のインストールが完了しました。
+[SECOND_LIFE]を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="続行" yestext="アカウントを作成…" />
+  </notification>
+
+  <notification name="LoginCantRemoveUsername">すでに記憶されているユーザーは「私」メニューの「初期設定」＞「拡張設定」＞「記憶されたユーザー名」から削除することができます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LoginCantRemoveCurUsername">ログインしているユーザーを忘れた場合は、ログアウトする必要があります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Confirm and log out"/>
+  </notification>
+
+  <notification name="LoginPacketNeverReceived">接続に時間がかかっております。お使いのインターネット接続か、[SECOND_LIFE_GRID]の問題と考えられます。
+
+インターネット接続を確認してから数分後に再接続するか、ヘルプをクリックして [SUPPORT_SITE]をご覧になるか、テレポートをクリックしてホームに移動してみてください。
+    <tag>fail</tag>
+    <url name="url">https://support.secondlife.com/</url>
+    <form name="form">
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Help" text="ヘルプ" />
+      <button name="Teleport" text="テレポート" />
+    </form>
+  </notification>
+
+  <notification name="WelcomeChooseSex">まもなく、あなたのアバターが表示されます。矢印キーを使用して歩きます。
+ヘルプが必要なときや、[SECOND_LIFE]について知りたいときは、Ｆ１キーを押してください。
+男性あるいは女性のアバターを選択してください。この設定は後で変更できます。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="女性" yestext="男性" />
+  </notification>
+  <notification name="CantTeleportToGrid">現在のグリッド（[CURRENT_GRID]）とはグリッド（[GRID]）が異なるため、[SLURL] にテレポートできませんでした。ビューアーを閉じてからもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GeneralCertificateErrorShort">サーバーに接続できませんでした。
 [REASON]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
 
-サブジェクト名： [SUBJECT_NAME_STRING]
-発行元： [ISSUER_NAME_STRING]
-有効日： [VALID_FROM]
-次の更新日： [VALID_TO]
-MD5 フィンガープリント： [SHA1_DIGEST]
-SHA1 フィンガープリント： [MD5_DIGEST]
-キー使用法： [KEYUSAGE]
-拡張キー使用法： [EXTENDEDKEYUSAGE]
-サブジェクトキー認識別子： [SUBJECTKEYIDENTIFIER]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TrustCertificateError">
-		このサーバーの認証機関は不明です。
+  <notification name="GeneralCertificateError">サーバーに接続できませんでした。
+[REASON]
 
+サブジェクト名：[SUBJECT_NAME_STRING]
+発行元：[ISSUER_NAME_STRING]
+有効日：[VALID_FROM]
+次の更新日：[VALID_TO]
+ＭＤ５フィンガープリント：[SHA1_DIGEST]
+ＳＨＡ１フィンガープリント：[MD5_DIGEST]
+キー使用法：[KEYUSAGE] 
+拡張キー使用法：[EXTENDEDKEYUSAGE]
+サブジェクトキー認識別子：[SUBJECTKEYIDENTIFIER]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TrustCertificateError">このサーバーの認証機関は不明です。
 認証情報：
-サブジェクト名： [SUBJECT_NAME_STRING]
-発行元： [ISSUER_NAME_STRING]
-有効日： [VALID_FROM]
-次の更新日： [VALID_TO]
-MD5 フィンガープリント： [SHA1_DIGEST]
-SHA1 フィンガープリント： [MD5_DIGEST]
-キー使用法： [KEYUSAGE]
-拡張キー使用法： [EXTENDEDKEYUSAGE]
-サブジェクトキー認識別子： [SUBJECTKEYIDENTIFIER]
+　サブジェクト名：[SUBJECT_NAME_STRING]
+　発行元：[ISSUER_NAME_STRING]
+　有効日：[VALID_FROM]
+　次の更新日：[VALID_TO]
+　ＭＤ５フィンガープリント：[SHA1_DIGEST] 
+　ＳＨＡ１フィンガープリント：[MD5_DIGEST]
+　キー使用法：[KEYUSAGE] 
+　拡張キー使用法：[EXTENDEDKEYUSAGE] 
+　サブジェクトキー認識別子：[SUBJECTKEYIDENTIFIER] 
 
 この認証局を信頼しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="信用する"/>
-	</notification>
-	<notification name="NotEnoughCurrency">[NAME] L$[PRICE] 残高不足のため実行不可です。</notification>
-	<notification name="GrantedModifyRights">[NAME] は、あなたにオブジェクトの編集権限を与えました。</notification>
-	<notification name="RevokedModifyRights">[NAME] のオブジェクトを編集する権限は取り消されました。</notification>
-	<notification name="FlushMapVisibilityCaches">
-		このリージョンの地図のキャッシュを消去します。
-デバッグ目的のみに便利な操作です。
-（作成中は 5 分間経つと、全員の地図が再度ログイン後に更新されます）
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyOneObjectOnly">一度に 1 つ以上のオブジェクトを買うことはできません。  オブジェクトを 1 つだけ選んでもう一度お試しください。</notification>
-	<notification name="OnlyCopyContentsOfSingleItem">
-		一度に複数のアイテムの中身をコピーできません。
-オブジェクトを 1 つだけ選択して、もう一度お試しください。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="KickUsersFromRegion">
-		このリージョンにいる全ての住人をホームにテレポートしますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ChangeObjectBonusFactor">
-		地域（リージョン）内でビルドが確立された後にオブジェクトボーナスを下げると、オブジェクトが返されたり、削除されたりします。本当にオブジェクトボーナスを変更しますか?
-		<usetemplate ignoretext="オブジェクトボーナス係数の変更を確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="EstateObjectReturn">
-		[USER_NAME] が所有しているオブジェクトを返却しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="InvalidTerrainBitDepth">地域テクスチャを設定できませんでした：
-地形テクスチャ[TEXTURE_NUM]は、無効のビット深度[TEXTURE_BIT_DEPTH]です。
-
-テクスチャ[TEXTURE_NUM]を24ビット512x512かそれ以下のイメージと交換し、「適用」を再度クリックしてください。</notification>
-	<notification name="InvalidTerrainSize">地域テクスチャを設定できませんでした：
-地形テクスチャ「 [TEXTURE_NUM] 」は、[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] では大きすぎます。
-
-「 [TEXTURE_NUM] 」を 24 ビット 512x512 かそれ以下のイメージと交換し、「適用」を再度クリックしてください。</notification>
-	<notification name="RawUploadStarted">アップロードを開始しました。 接続速度によっては、最大 2 分間かかります。</notification>
-	<notification name="ConfirmBakeTerrain">
-		現在の地形を構築しようとしています。
-この操作を行うと、現在の地形が上昇・下降の制限範囲の中心となり、「復元」ツールのデフォルトになります。
-操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmTextureHeights">
-		使用しようとしている隆起範囲の低い値は高い値よりも大きくなっています。それでも続けますか？
-		<usetemplate canceltext="聞かないでください" name="yesnocancelbuttons" notext="取り消し" yestext="Ok"/>
-	</notification>
-	<notification name="MaxAllowedAgentOnRegion">許可住人は [MAX_AGENTS] 人までです。</notification>
-	<notification name="MaxBannedAgentsOnRegion">禁止住人は [MAX_BANNED] 人までです。</notification>
-	<notification name="MaxAgentOnRegionBatch">[NUM_ADDED] 個のエージェントを追加しようとして失敗しました： [MAX_AGENTS] [LIST_TYPE] 制限を [NUM_EXCESS] 個超過しています。</notification>
-	<notification name="MaxAllowedGroupsOnRegion">
-		許可グループは [MAX_GROUPS] グループまでです。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="構築する"/>
-	</notification>
-	<notification name="MaxManagersOnRegion">不動産マネージャーは [MAX_MANAGER] 人までです。</notification>
-	<notification name="OwnerCanNotBeDenied">不動産オーナーを不動産の「禁止住人」リストに追加できません。</notification>
-	<notification name="ProblemAddingEstateManagerBanned">追放された住人を不動産管理者リストに追加できません。</notification>
-	<notification name="ProblemBanningEstateManager">禁止リストに不動産マネージャー [AGENT] を追加できません。</notification>
-	<notification name="GroupIsAlreadyInList">&lt;nolink&gt;[GROUP]&lt;/nolink&gt; はすでに許可されたグループのリストに追加されています。</notification>
-	<notification name="AgentIsAlreadyInList">[AGENT] はすでにあなたの [LIST_TYPE] リストに追加されています。</notification>
-	<notification name="AgentsAreAlreadyInList">[AGENT] はすでにあなたの [LIST_TYPE] リストに追加されています。</notification>
-	<notification name="AgentWasAddedToList">[AGENT] が [ESTATE] の [LIST_TYPE] リストに追加されました。</notification>
-	<notification name="AgentsWereAddedToList">[AGENT] が [ESTATE] の [LIST_TYPE] リストに追加されました。</notification>
-	<notification name="AgentWasRemovedFromList">[AGENT] が [ESTATE] の [LIST_TYPE] リストから削除されました。</notification>
-	<notification name="AgentsWereRemovedFromList">[AGENT] が [ESTATE] の [LIST_TYPE] リストから削除されました。</notification>
-	<notification name="CanNotChangeAppearanceUntilLoaded">衣類およびシェイプが読み込まれるまでは、容姿の変更はできません。</notification>
-	<notification name="ClassifiedMustBeAlphanumeric">クラシファイド広告の名前は、アルファベットか数字で始めます。句読点では始められません。</notification>
-	<notification name="CantSetBuyObject">オブジェクトが販売対象ではないため、オブジェクトの購入ができません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="信用する" />
+  </notification>
+
+  <notification name="NotEnoughCurrency">[NAME]は、L$ [PRICE]残高不足のため実行不可です。
+    <tag>fail</tag>
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="GrantedModifyRights">[NAME]は、あなたにオブジェクトの編集権限を与えました。</notification>
+
+  <notification name="RevokedModifyRights">[NAME]は、オブジェクトを編集する権限を取り消されました。</notification>
+
+  <notification name="FlushMapVisibilityCaches">このリージョンのマップのキャッシュを消去します。デバッグ目的のみに便利な操作です。
+（作成中は５分経過すると、全員のマップが再度ログイン後に更新されます）
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyOneObjectOnly">一度に１つ以上のオブジェクトを買うことはできません。オブジェクトを１つだけ選んでもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OnlyCopyContentsOfSingleItem">一度に複数のアイテムの中身をコピーできません。
+オブジェクトを１つだけ選択して、もう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="KickUsersFromRegion">このリージョンにいる全ての住人をホームにテレポートさせますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChangeObjectBonusFactor">リージョン（地域）のオブジェクトボーナスを下げると、制作されたオブジェクトが返却されたり、削除されます。本当にオブジェクトボーナスを変更してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトボーナス係数変更の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateObjectReturn">[USER_NAME]が、所有しているオブジェクトを返却しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="InvalidTerrainBitDepth">地域テクスチャを設定できませんでした：
+地形テクスチャ「[TEXTURE_NUM]」は、無効なビット深度（[TEXTURE_BIT_DEPTH]ビット）です。
+
+テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。</notification>
+
+  <notification name="InvalidTerrainSize">地域テクスチャを設定できませんでした：
+地形テクスチャ「[TEXTURE_NUM]」は、[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] では大きすぎます。
+
+テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。</notification>
+
+  <notification name="RawUploadStarted">アップロードを開始しました。接続速度によっては、最大２分程度かかります。</notification>
+
+  <notification name="ConfirmBakeTerrain">現在の地形を構築しようとしています。この操作を行うと現在の地形が、土地の隆起と沈降の制限範囲の基準となり、「復元」ツールのデフォルトになります。操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmTextureHeights">標高範囲に、最高値よりも大きい値を最低値にしようとしています。このまま続行してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="聞かないでください" name="yesnocancelbuttons" notext="キャンセル" yestext="Ok" />
+  </notification>
+
+  <notification name="MaxAllowedAgentOnRegion">許可できる住人は、[MAX_AGENTS]人までです。</notification>
+
+  <notification name="MaxBannedAgentsOnRegion">バンできる住人は、[MAX_BANNED]人までです。</notification>
+
+  <notification name="MaxAgentOnRegionBatch">[NUM_ADDED]人のエージェントを追加しようとして失敗しました：[MAX_AGENTS]
+[LIST_TYPE]人中[NUM_EXCESS]人超過しています。</notification>
+
+  <notification name="MaxAllowedGroupsOnRegion">許可グループは、[MAX_GROUPS]グループまでです。
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="構築する" />
+  </notification>
+
+  <notification name="MaxManagersOnRegion">不動産マネージャーは、[MAX_MANAGER]人までです。</notification>
+
+  <notification name="OwnerCanNotBeDenied">不動産所有者を不動産の「バンした住人」リストに追加することはできません。</notification>
+
+  <notification name="ProblemAddingEstateManagerBanned">「バンした住人」を不動産管理者リストに追加することはできません。</notification>
+
+  <notification name="ProblemBanningEstateManager">「バンした住民」リストに不動産マネージャー[AGENT]を追加することはできません。</notification>
+
+  <notification name="GroupIsAlreadyInList">「&lt;nolink&gt;[GROUP]&lt;/nolink&gt;」は、すでに許可されたグループのリストに追加されています。</notification>
+
+  <notification name="AgentIsAlreadyInList">[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。</notification>
+
+  <notification name="AgentsAreAlreadyInList">[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。</notification>
+
+  <notification name="AgentWasAddedToList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。</notification>
+
+  <notification name="AgentsWereAddedToList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。</notification>
+
+  <notification name="AgentWasRemovedFromList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。</notification>
+
+  <notification name="AgentsWereRemovedFromList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。</notification>
+
+  <notification name="CanNotChangeAppearanceUntilLoaded">服装およびシェイプが読み込まれるまでは、容姿の変更はできません。</notification>
+
+  <notification name="ClassifiedMustBeAlphanumeric">クラシファイド広告の名前は、アルファベットか数字で始めます。句読点から始めることはできません。</notification>
+
+  <notification name="CantSetBuyObject">オブジェクトが販売対象ではないため、オブジェクトの購入ができません。
 販売対象のオブジェクトを指定してもう一度試してください。</notification>
-	<notification name="FinishedRawDownload">未加工の地形ファイルをダウンロードしました：
-[DOWNLOAD_PATH]</notification>
-	<notification name="RequiredUpdate">
-		ログインするには、バージョン [VERSION] が必要です。
-https://secondlife.com/support/downloads/ からダウンロードしてください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PauseForUpdate">
-		ログインするには、バージョン [VERSION] が必要です。
-[OK] をクリックして、ダウンロードとインストールを開始します。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OptionalUpdateReady">
-		バージョン [VERSION] のダウンロードが完了し、インストールの準備ができました。
-[OK] をクリックして、インストールを開始します。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PromptOptionalUpdate">
-		バージョン [VERSION] のダウンロードが完了し、インストールの準備ができました。
-続けますか？
-		<usetemplate canceltext="あとで" name="yesnocancelbuttons" notext="スキップ" yestext="インストール"/>
-	</notification>
-	<notification name="LoginFailedUnknown">
-		申し訳ありませんが、不明な理由によってログインに失敗しました。このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
-		<usetemplate name="okbutton" yestext="終了"/>
-	</notification>
-	<notification name="DeedObjectToGroup">
-		このオブジェクトを譲渡するとグループは以下のことが可能です：
-* オブジェクトに支払われた L$ を受領します。
-		<usetemplate ignoretext="オブジェクトをグループに譲渡する前の確認" name="okcancelignore" notext="取り消し" yestext="譲渡"/>
-	</notification>
-	<notification name="WebLaunchExternalTarget">
-		Web ブラウザを開いてこのコンテンツを表示しますか？
-		<usetemplate ignoretext="ブラウザを起動して Web ページを見るとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchJoinNow">
-		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウントを管理しますか？
-		<usetemplate ignoretext="ブラウザを起動してアカウントを管理するとき" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchSecurityIssues">
-		[SECOND_LIFE] Wiki で、セキュリティ問題を報告する方法をご覧ください。
-		<usetemplate ignoretext="ブラウザを起動してセキュリティ問題の報告の仕方を確認するとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchQAWiki">
-		[SECOND_LIFE] 品質保証関連 Wiki をご覧ください。
-		<usetemplate ignoretext="ブラウザを起動して QA Wiki を見るとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchPublicIssue">
-		[SECOND_LIFE] のパブリック問題トラッカーで、
-バグやその他の問題を報告できます。
-		<usetemplate ignoretext="ブラウザを起動してパブリック問題トラッカーを使用するとき" name="okcancelignore" notext="キャンセル" yestext="ページへ行く"/>
-	</notification>
-	<notification name="WebLaunchSupportWiki">
-		Linden 公式ブログで、最新のニュースや情報を入手してください。
-		<usetemplate ignoretext="ブラウザを起動して公式ブログを見るとき" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchLSLGuide">
-		スクリプトガイドを開きますか？
-		<usetemplate ignoretext="ブラウザを起動してスクリプトガイドを見るとき" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchLSLWiki">
-		LSL ポータルでスクリプトに関する情報を確認しますか？
-		<usetemplate ignoretext="ブラウザを起動して LSL ポータルを見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
-	</notification>
-	<notification name="ReturnToOwner">
-		選択したオブジェクトを、所有者に返却しますか？
-「再販・プレゼント可」の譲渡されたオブジェクトは、以前の所有者に返却されます。
-
-*警告*　「再販・プレゼント不可」の譲渡されたオブジェクトは、削除されます！
-		<usetemplate ignoretext="オブジェクトを所有者に返却する前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GroupLeaveConfirmMember">
-		現在、あなたは &lt;nolink&gt;[GROUP]&lt;/nolink&gt; グループのメンバーです。
-グループから脱退しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">グループ「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」を抜けました。</notification>
-	<notification name="OwnerCannotLeaveGroup">
-		グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepartError">
-		グループを抜けることができません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmKick">
-		本当に住人全員をグリッドから追い出しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/>
-	</notification>
-	<notification name="MuteLinden">
-		リンデンをブロックすることはできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotStartAuctionAlreadyForSale">既に売り出し中の区画なのでオークションにかけることはできません。  オークションにかけたい場合は売り出し設定を解除してから行ってください。</notification>
-	<notification label="名前でのオブジェクトのブロックに失敗しました" name="MuteByNameFailed">
-		この名前は既にブロック済みです。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RemoveItemWarn">
-		コンテンツを削除すると、許可があってもオブジェクトに損傷を与えることがあります。
-削除を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="CantOfferCallingCard">
-		現在コーリングカードを送れません。数分後にもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CantOfferFriendship">
-		現在フレンドシップを送れません。数分後にもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="DoNotDisturbModeSet">
-		着信拒否がオンになっています。着信する通信が通知されません。
-
-- 他の住人は「着信拒否」応答を受け取ります (「環境設定」 &gt; 「一般」で設定)。
-- 音声通話は拒否されます。
-		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="JoinedTooManyGroupsMember">
-		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
-[NAME] があなたをグループのメンバーとして勧誘しています。
-		<usetemplate name="okcancelbuttons" notext="辞退" yestext="参加"/>
-	</notification>
-	<notification name="JoinedTooManyGroups">
-		加入できるグループの最大限に達しました。 新しくグループに参加、または作成する前に、どれかグループから抜けてください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupLimitInfo">
-		ベーシック会員の住民は、最大 [MAX_BASIC] グループまで参加することができます。
-プレミアム会員は、最大 [MAX_PREMIUM] まで可能です。[https://secondlife.com/my/account/membership.php? 詳細、またはアップグレード]
-		<usetemplate name="okbutton" yestext="閉じる"/>
-	</notification>
-	<notification name="GroupLimitInfoPlus">
-		ベーシック会員の住人は最大 [MAX_BASIC] までグループに参加できます。
-プレミアム会員は最大 [MAX_PREMIUM] です。プレミアムプラス会員
-は最大 [MAX_PREMIUM_PLUS] です。 [https://secondlife.com/my/account/membership.php? 詳細またはアップグレード]
-		<usetemplate name="okbutton" yestext="閉じる"/>
-	</notification>
-	<notification name="KickUser">
-		どのようなメッセージを添えてこの住人を追い出しますか？
-		<form name="form">
-			<input name="message">あなたは管理者によりログオフされました。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="KickAllUsers">
-		どのようなメッセージをつけてグリッドにいる全員を追い出しますか？
-		<form name="form">
-			<input name="message">あなたは管理者によりログオフされました。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="FreezeUser">
-		どのようなメッセージを添えてこの住人をフリーズしますか？
-		<form name="form">
-			<input name="message">あなたはフリーズされています。 動くこともチャットすることもできません。 管理者が IM であなたに連絡します。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="UnFreezeUser">
-		どのようなメッセージを添えてこの住人のフリーズを解除しますか？
-		<form name="form">
-			<input name="message">もうフリーズされていません。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="SetDisplayNameSuccess">[DISPLAY_NAME] さん、
-
-現実の世界と同じく、Second Life でも新しい名前が浸透するには時間がかかります。オブジェクト、スクリプト、検索などで名前が更新されるまでに（[http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update]）数日かかりますのでご了承ください。</notification>
-	<notification name="SetDisplayNameBlocked">申し訳ありませんが、現在表示名は変更できません。システムのエラーだと思われる場合は、サポートにお問い合わせください。</notification>
-	<notification name="SetDisplayNameFailedLength">申し訳ありませんが、その名前は長すぎます。表示名は最長 [LENGTH] 文字までです。
+
+  <notification name="FinishedRawDownload">未加工の地形ファイルをダウンロードしました：[DOWNLOAD_PATH]</notification>
+
+  <notification name="RequiredUpdate">ログインするには、バージョン[VERSION]が必要です。以下からダウンロードしてください。
+https://secondlife.com/support/downloads/
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="PauseForUpdate">ログインするには、バージョン[VERSION]が必要です。
+リリースノート：[URL]
+
+OKをクリックして、ダウンロードとインストールを開始します。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OptionalUpdateReady">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
+リリースノート：[URL]
+
+ＯＫをクリックして、ダウンロードとインストールを開始します。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PromptOptionalUpdate">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
+リリースノート：[URL]
+
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="あとで" name="yesnocancelbuttons" notext="スキップ" yestext="インストール" />
+  </notification>
+
+  <notification name="LoginFailedUnknown">申し訳ありませんが、不明な理由によってログインに失敗しました。
+このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="終了" />
+  </notification>
+
+  <notification name="DeedObjectToGroup">このオブジェクトを譲渡するとグループは以下のことが可能です：
+・オブジェクトに支払われたL$を受領します。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトをグループに譲渡する前の確認" name="okcancelignore" notext="キャンセル" yestext="譲渡する" />
+  </notification>
+
+  <notification name="WebLaunchExternalTarget">Webブラウザを開いてこのコンテンツを表示しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、Webページを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchJoinNow">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]ページに移動してアカウントを管理しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、アカウントを管理するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchSecurityIssues">[SECOND_LIFE] Wikiで、セキュリティ問題を報告する方法をご覧ください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、セキュリティ問題の報告方法を確認するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchQAWiki">[SECOND_LIFE] QA（品質保証）Wikiをご覧ください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、QA Wikiを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchPublicIssue">[SECOND_LIFE] Public Issue Trackerにアクセスして、バグやその他の問題を報告できます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、Public Issue Trackerにアクセスするとき" name="okcancelignore" notext="キャンセル" yestext="ページへ行く" />
+  </notification>
+
+  <notification name="WebLaunchSupportWiki">Linden公式ブログで、最新のニュースや情報を入手してください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、公式ブログを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchLSLGuide">スクリプトガイドを開きますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、スクリプトガイドを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchLSLWiki">LSLポータルでスクリプトに関する情報を確認しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して LSL ポータルを見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動" />
+  </notification>
+  <notification name="ReturnToOwner">選択したオブジェクトを、所有者に返却しますか？「再販・譲渡可」の譲渡されたオブジェクトは、以前の所有者に返却されます。
+
+*警告*「再販・譲渡不可」の譲渡されたオブジェクトは、削除されます！
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトを所有者に返却するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupLeaveConfirmMember">現在、あなたは &lt;nolink&gt;[GROUP]&lt;/nolink&gt;グループのメンバーです。グループから脱退しますか？
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupDepart">グループ「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」から抜けました。</notification>
+  <notification name="OwnerCannotLeaveGroup">グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupDepartError">グループを抜けることができません。
+    <tag>group</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmKick">本当に住人全員をグリッドから追い出してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す" />
+  </notification>
+
+  <notification name="MuteLinden">リンデンをブロックすることはできません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CannotStartAuctionAlreadyForSale">既に売り出し中の区画なので、オークションにかけることはできません。
+オークションにかけたい場合は、売り出し設定を解除してから行ってください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="名前でのオブジェクトのブロックに失敗しました" name="MuteByNameFailed">この名前は既にブロック済みです。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RemoveItemWarn">コンテンツを削除すると、許可があってもオブジェクトに損傷を与えることがあります。削除を続けてもよろしいですか？
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantOfferCallingCard">現在コーリングカードを送れません。数分後にもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantOfferFriendship">現在フレンド申請を送れません。数分後にもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DoNotDisturbModeSet">「着信拒否」がオンになっています。通信の受信は通知されません。
+  
+・他の居住者はあなたの「着信拒否」応答を受け取ります。（「初期設定」＞「全般」で設定）
+・音声通話は拒否されます。
+    <usetemplate ignoretext="ログイン状態を「着信拒否」モードに変更したとき" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="JoinedTooManyGroupsMember">グループの最大数に達しました。このグループに参加する前に別のグループから退会するか、オファーを断ってください。
+[NAME]さんが、あなたをグループのメンバーに参加するよう招待しました。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="辞退" yestext="参加" />
+  </notification>
+
+  <notification name="JoinedTooManyGroups">グループの最大数に達しました。新しいグループに参加、作成する前に、グループから退出してください。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupLimitInfo">ベーシック会員の住民は、最大[MAX_BASIC]個のグループまで参加することができます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード] 
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="閉じる" />
+  </notification>
+
+  <notification name="GroupLimitInfoPlus">ベーシック会員の住人は、最大[MAX_BASIC]個までグループに参加できます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。プレミアム・プラス会員は最大[MAX_PREMIUM_PLUS]個です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード]
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="閉じる" />
+  </notification>
+
+  <notification name="KickUser">どのようなメッセージを添えて、この住人を追い出しますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">あなたは管理者によりログオフされました。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="KickAllUsers">どのようなメッセージをつけて、グリッドにいる全員を追い出しますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">あなたは管理者によりログオフされました。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="FreezeUser">どのようなメッセージを添えて、この住人をフリーズしますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">あなたはフリーズされています。動くこともチャットすることもできません。管理者がＩＭであなたに連絡します。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="UnFreezeUser">どのようなメッセージを添えて、この住人のフリーズを解除しますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">もうフリーズされていません。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+  <notification name="SetDisplayNameSuccess">[DISPLAY_NAME]さん、
+
+現実の世界と同じく、Second Lifeでも新しい名前が浸透するには時間がかかります。
+[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC%E5%90%8D%E3%81%A8%E8%A1%A8%E7%A4%BA%E5%90%8D-r1333/ ユーザー名と表示名]が、オブジェクトやスクリプト、検索結果などに更新されるまで、数日かかりますのでご了承ください。</notification>
+
+  <notification name="SetDisplayNameBlocked">申し訳ありませんが、現在表示名は変更できません。システムエラーと思われる場合は、サポートにお問い合わせください。</notification>
+
+  <notification name="SetDisplayNameFailedLength">申し訳ありませんが、その名前は長すぎます。表示名で使用できる文字数は、[LENGTH]文字までです。
 
 もう少し短い名前をお試しください。</notification>
-	<notification name="SetDisplayNameFailedGeneric">申し訳ありませんが、表示名を設定できませんでした。あとでもう一度お試しください。</notification>
-	<notification name="SetDisplayNameMismatch">入力した表示名が一致しません。もう一度入力してください。</notification>
-	<notification name="AgentDisplayNameUpdateThresholdExceeded">しばらくは表示名を変更できません。
-
-http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してください。
-
-あとでもう一度お試しください。</notification>
-	<notification name="AgentDisplayNameSetBlocked">申し訳ありませんが、リクエストされた名前は禁句を含むために設定できませんでした。
- 
-別の名前をお試しください。</notification>
-	<notification name="AgentDisplayNameSetInvalidUnicode">設定しようとする表示名には使えない文字が含まれます。</notification>
-	<notification name="AgentDisplayNameSetOnlyPunctuation">表示名には句読点以外の文字を含む必要があります。</notification>
-	<notification name="DisplayNameUpdate">[OLD_NAME] ([SLID]) は [NEW_NAME] に変更されました。</notification>
-	<notification name="OfferTeleport">
-		次のメッセージを添えて現在地にテレポートを送りますか？
-		<form name="form">
-			<input name="message">[REGION] に来ませんか？</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TooManyTeleportOffers">
-		[OFFERS] 回にわたってテレポートを送ろうとしましたが、
-それは限度数 [LIMIT] を超えています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OfferTeleportFromGod">
-		現在地に住人をゴッドサモンしますか？
-		<form name="form">
-			<input name="message">[REGION] に来ませんか？</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TeleportFromLandmark">
-		このまま &lt;nolink&gt;[LOCATION]&lt;/nolink&gt; にテレポートしますか？
-		<usetemplate ignoretext="ランドマークにテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportViaSLAPP">
-		このまま &lt;nolink&gt;[LOCATION]&lt;/nolink&gt; にテレポートしますか？
-		<usetemplate ignoretext="SLAPP でテレポートすることを確認" name="okcancelignore" notext="取り消し" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportToPick">
-		[PICK] にテレポートしますか？
-		<usetemplate ignoretext="ピックの場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportToClassified">
-		[CLASSIFIED] にテレポートしますか？
-		<usetemplate ignoretext="クラシファイド広告の場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportToHistoryEntry">
-		[HISTORY_ENTRY] にテレポートしますか？
-		<usetemplate ignoretext="履歴の場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification label="あなたの不動産内の全員にメッセージを送信" name="MessageEstate">
-		今あなたの不動産にいる人全員に送る、短いメッセージを入力してください。
-		<form name="form">
-			<input name="message"/>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="Lindenの不動産を変更" name="ChangeLindenEstate">
-		リンデンが所有するエステート（メインランド、ティーングリッド、オリエンテーションなど）を変更しようとしています。
-
-住人の体験に根本的に影響を与えるため、非常に危険な行為です。  メインランドでは、何千というリージョンが変更による影響を受け、そのためスペースサーバーに負担をかけることになります。
-
-それでも続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess">
-		あなたはリンデン所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）へのアクセスリストを変更しようとしています。
+
+  <notification name="SetDisplayNameFailedGeneric">申し訳ありませんが、表示名を設定できませんでした。あとでもう一度お試しください。</notification>
+
+  <notification name="SetDisplayNameMismatch">入力した表示名が一致しません。もう一度入力してください。
+    <tag>fail</tag>
+  </notification>
+
+  <!-- *NOTE: This should never happen -->
+  <notification name="AgentDisplayNameUpdateThresholdExceeded">申し訳ありませんが、表示名を変更できるようになるまで、さらに長く待つ必要があります。
+
+https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC%E5%90%8D%E3%81%A8%E8%A1%A8%E7%A4%BA%E5%90%8D-r1333/ を参照してください。
+
+あとでもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AgentDisplayNameSetBlocked">申し訳ありませんが、要求された名前には禁止ワードが含まれているため、設定できませんでした。
+
+別の名前をお試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AgentDisplayNameSetInvalidUnicode">設定しようとしている表示名に、使用できない文字が含まれます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AgentDisplayNameSetOnlyPunctuation">設定しようとしている表示名には、句読点以外の文字を含む必要があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DisplayNameUpdate">[OLD_NAME] ([SLID]) は、[NEW_NAME]に変更されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OfferTeleport">次のメッセージを使用して、あなたのいる場所へのテレポートのオファーしますか？
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[REGION]に来てみませんか？</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TooManyTeleportOffers">[OFFERS]回にわたってテレポートを送ろうとしましたが、限度数[LIMIT]を超えてしましました。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OfferTeleportFromGod">現在地に住人をゴッド・サモンしますか？
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[REGION]に来てみませんか？</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TeleportFromLandmark">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ランドマークに指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportViaSLAPP">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="SLAPPからテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportToPick">[PICK]にテレポートしますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ピックに指定されてる場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportToClassified">[CLASSIFIED]にテレポートしますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="クラシファイド広告で指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportToHistoryEntry">[HISTORY_ENTRY]にテレポートしますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="履歴の場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification label="あなたの不動産にいる全員に送信するメッセージ" name="MessageEstate">今あなたの不動産にいる人全員に送る、短いメッセージを入力してください。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" />
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="Lindenの不動産を変更" name="ChangeLindenEstate">リンデンが所有する不動産（メインランド、ティーングリッド、オリエンテーションなど）を変更しようとしています。住人の体験に根本的に影響を与えるため、非常に危険な行為です。
+
+メインランドでは、何千というリージョンが変更による影響を受け、そのためスペースサーバーに負担をかけることになります。
+
+それでも続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess">あなたはリンデン所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）へのアクセスリストを変更しようとしています。
 
 この行為は「危険」であり、グリッドからオブジェクトやお金の転送をもたらすハッキングを引き起こす可能性があるため、完全にそれを意図した場合のみ行うべきものです。
+
 これにより多数のリージョン（地域）が変更され、スペースサーバーに悪影響が生じます。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedAgentAdd">
-		この不動産限定の許可リストに追加しますか？ それとも [ALL_ESTATES] の許可リストに追加しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedAgentRemove">
-		この不動産限定の許可リストから削除しますか？ それとも、[ALL_ESTATES] から削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedGroupAdd">
-		この不動産限定のグループ許可リストに追加しますか？ それとも [ALL_ESTATES] のグループ許可リストに追加しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedGroupRemove">
-		この不動産限定の許可リストから削除しますか？ それとも、[ALL_ESTATES] から削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBannedAgentAdd">
-		この不動産限定でアクセスを拒否しますか？ それとも [ALL_ESTATE] へのアクセスを拒否しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBannedAgentRemove">
-		この住人をこの不動産の立入禁止リストからのみ削除しますか？それとも [ALL_ESTATES] の立入禁止リストから削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateManagerAdd">
-		この不動産限定、または [ALL_ESTATES] の不動産マネージャーを追加しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateManagerRemove">
-		不動産マネージャーを、この不動産限定、または [ALL_ESTATES] から、削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedExperienceAdd">
-		この不動産の許可リストにのみ追加しますか、それとも [ALL_ESTATES] の許可リストに追加しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedExperienceRemove">
-		この不動産の許可リストからのみ削除しますか、それとも [ALL_ESTATES] の許可リストから削除しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBlockedExperienceAdd">
-		この不動産のブロックされたリストにのみ追加しますか、それとも [ALL_ESTATES] のブロックされたリストに追加しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBlockedExperienceRemove">
-		この不動産のブロックされたリストからのみ削除しますか、それとも [ALL_ESTATES] のブロックされたリストから削除しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateTrustedExperienceAdd">
-		この不動産のキー リストにのみ追加しますか、それとも [ALL_ESTATES] のキー リストに追加しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateTrustedExperienceRemove">
-		この不動産のキーリストからのみ削除しますか、それとも [ALL_ESTATES] のキーリストから削除しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="キックを確認" name="EstateKickUser">
-		この不動産から [EVIL_USER] を追い出しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="EstateChangeCovenant">
-		不動産約款を変更しようとしています。続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="EstateParcelAccessOverride">
-		このオプションをオフにすると、嫌がらせの防止やプライバシーの維持、18 才以下の住人を Adult コンテンツから守るために区画所有者が加えた制限が解除される可能性があります。必要に応じて区画所有者と相談してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="EstateParcelEnvironmentOverride">
-		このオプションをオフにすると、区画所有者がその区画に加えたカスタム環境が削除されます。必要に応じて区画所有者と相談してください。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="RegionEntryAccessBlocked">
-		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SLM_UPDATE_FOLDER">[MESSAGE]</notification>
-	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
-		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="RegionEntryAccessBlocked_Notify">訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツ除外するように設定されています。</notification>
-	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="RegionEntryAccessBlocked_Change">
-		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、取り消すことができます。環境設定を変更した後、もう一度、地域（リージョン）に入ることができます。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button default="true" name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
-		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked">
-		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
-		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="テレポート：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_Notify">訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。</notification>
-	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
-		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
-		<form name="form">
-			<button name="OK" text="変更して続ける"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_Change">
-		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、テレポートを取り消すことができます。環境設定を変更した後、もう一度テレポートを実行する必要があります。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
-		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RegionTPSpecialUsageBlocked">
-		リージョンに入ることができません。'[REGION_NAME]' はスキル ゲーミング リージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキル ゲーミングのよくある質問] を参照してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PreferredMaturityChanged">
-		今後、[RATING] コンテンツ付きの地域（リージョン）を訪問しようとしているという通知を受け取りません。後でメニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、コンテンツの環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MaturityChangeError">
-		現在、[PREFERRED_MATURITY] コンテンツを表示するように環境設定を変更できませんでした。あなたの環境設定は、[ACTUAL_MATURITY] コンテンツを表示するようにリセットされました。メニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、もう一度環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked">
-		取得しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
-		この土地を購入できるのは、成人だけです。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="この土地を購入できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked_Notify">取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。</notification>
-	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">取得しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="LandClaimAccessBlocked_Change">
-		取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の取得を試みることができます。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="取得しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="LandBuyAccessBlocked">
-		購入しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
-		この土地を取得できるのは、成人だけです。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="この土地を取得できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="LandBuyAccessBlocked_Notify">購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。</notification>
-	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">購入しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="LandBuyAccessBlocked_Change">
-		購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の購入を試みることができます。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="購入しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="TooManyPrimsSelected">
-		選択したプリムが多すぎます。  [MAX_PRIM_COUNT] 個選択するか、プリム数を減らしてもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TooManyScriptsSelected">
-		スクリプト内で選択されたオブジェクトが多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ProblemImportingEstateCovenant">
-		不動産約款のインポート時に問題が発生しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ProblemAddingEstateManager">新しい不動産マネージャーの追加に関する問題：
-いずれかの不動産のマネージャーリストが満杯になっています。</notification>
-	<notification name="ProblemAddingEstateBanManager">不動産所有者または管理者を禁止リストに追加できません。</notification>
-	<notification name="ProblemAddingEstateGeneric">不動産リストの追加に関する問題：
-いずれかの不動産のリストが満杯になっています。</notification>
-	<notification name="UnableToLoadNotecardAsset">
-		現在ノートカードのアセット ID を読み込むことができません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NotAllowedToViewNotecard">
-		要求したアセット ID に関するノートカードを閲覧するには、権限が不十分です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MissingNotecardAssetID">
-		ノートカード用のアセット ID がデータベースに登録されていません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PublishClassified">
-		注意：クラシファイド広告の料金は払い戻しされません。
-
-L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SetClassifiedMature">
-		この広告に「Moderate」コンテンツは含まれていますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="SetGroupMature">
-		このグループに「Moderate」コンテンツが含まれていますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification label="再起動を確認" name="ConfirmRestart">
-		このリージョンを 2 分後に再起動しようとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="このリージョンにメッセージを送信" name="MessageRegion">
-		このリージョンにいる人全員に送る短いメッセージを入力してください。
-		<form name="form">
-			<input name="message"/>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="地域のレーティング区分指定変更済み" name="RegionMaturityChange">
-		このリージョンのレーティング区分が変更されました。
-地図にこの変更が反映するには数分かかることがあります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">[APP_NAME] のこのバージョンは、このリージョンにおけるボイスチャットの互換性がありません。 ボイスチャットを正常に行うためには、[APP_NAME] のアップデートが必要です。</notification>
-	<notification label="オブジェクトを購入できません" name="BuyObjectOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
-単一のオブジェクトを選択し、もう一度試してください。</notification>
-	<notification label="コンテンツを購入できません" name="BuyContentsOneOnly">一度に複数のオブジェクトのコンテンツは購入できません。
-選択するオブジェクトを1つだけにして、もう一度試してください。</notification>
-	<notification label="コンテンツを購入できません" name="BuyContentsOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
-単一のオブジェクトを選択し、もう一度試してください。</notification>
-	<notification name="BuyOriginal">
-		オリジナルのオブジェクトを [OWNER] から L$ [PRICE] で購入しますか？
-購入すると、あなたがオブジェクトの所有者となります。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyOriginalNoOwner">
-		L$ [PRICE] でオリジナルのオブジェクトを購入しますか？
-購入すると、あなたがオブジェクトの所有者となります。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyCopy">
-		コピーを [OWNER] から L$ [PRICE] で購入しますか？
-購入したオブジェクトは、あなたのインベントリにコピーされます。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyCopyNoOwner">
-		L$ [PRICE] でコピーを購入しますか？
-購入したオブジェクトは、あなたのインベントリにコピーされます。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyContents">
-		中身を [OWNER] から L$ [PRICE] で購入しますか？
-購入した中身は、あなたのインベントリにコピーされます。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyContentsNoOwner">
-		L＄ [PRICE] で中身を購入しますか？
-購入した中身は、あなたのインベントリにコピーされます。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmPurchase">
-		この取引は以下のとおり行われます：
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedAgentAdd">この不動産限定の許可リストに追加しますか？それとも、[ALL_ESTATES]の許可リストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedAgentRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES]から削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedGroupAdd">この不動産限定のグループ許可リストに追加しますか？それとも、[ALL_ESTATES]のグループ許可リストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedGroupRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES] から削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBannedAgentAdd">この不動産限定でアクセスを拒否しますか？それとも、[ALL_ESTATE]へのアクセスを拒否しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBannedAgentRemove">この住人をこの不動産のバンリストからのみ削除しますか？それとも、[ALL_ESTATES]のバンリストから削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateManagerAdd">この不動産限定、または[ALL_ESTATES]の不動産マネージャーを追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateManagerRemove">不動産マネージャーをこの不動産限定、または[ALL_ESTATES]から削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedExperienceAdd">この不動産の許可リストにのみ追加しますか、それとも[ALL_ESTATES]の許可リストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedExperienceRemove">この不動産の許可リストからのみ削除しますか、それとも[ALL_ESTATES]の許可リストから削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBlockedExperienceAdd">この不動産のブロックされたリストにのみ追加しますか、それとも[ALL_ESTATES]のブロックされたリストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBlockedExperienceRemove">この不動産のブロックされたリストからのみ削除しますか、それとも[ALL_ESTATES]のブロックされたリストから削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateTrustedExperienceAdd">この不動産のキー リストにのみ追加しますか、それとも[ALL_ESTATES]のキーリストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateTrustedExperienceRemove">この不動産のキーリストからのみ削除しますか、それとも[ALL_ESTATES]のキーリストから削除しますか？
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="バンの確認" name="EstateKickUser">この不動産から[EVIL_USER]を追い出しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateChangeCovenant">不動産約款を変更しようとしています。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateParcelAccessOverride">このオプションのチェックを外すと、グリーティングの防止、プライバシーの維持、成人向けコンテンツから未成年の居住者を保護するために区画所有者が追加した制限が削除される場合があります。必要に応じて土地所有者と相談してください。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateParcelEnvironmentOverride">（不動産全体の変更：[ESTATENAME]）このオプションのチェックを外すと、区画所有者が区画に追加したカスタム環境がすべて削除されます。必要に応じて土地所有者と相談してください。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked">訪問しようとしているリージョン（地域）には、現在の初期設定を超えるレーティングのコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+
+レーティング制限に関する詳細情報は、[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/ こちら]をご覧になってください。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <tag>fail</tag>
+    <usetemplate ignoretext="リージョン（地域）の横断：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="SLM_UPDATE_FOLDER">[MESSAGE]</notification>
+
+  <notification name="RegionEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツ除外するように設定されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY] コンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_Change">訪問しようとしているリ－ジョン（地域）は、[REGIONMATURITY]コンテンツが含まれていますが、現在の設定では[REGIONMATURITY]コンテンツを除外するように設定されています。ご希望を変更することも、キャンセルすることもできます。この設定を変更すると、そのリージョンに入ることができるようになります。
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button default="true" name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしているリージョン（地域）には現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <usetemplate ignoretext="テレポート：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+初期設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="変更して続ける" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_Change">訪問しようとしているリージョン（地域）には、 [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+初期設定を変更するか、テレポートを取り消すことができます。初期設定を変更した後、もう一度テレポートを実行する必要があります。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RegionTPSpecialUsageBlocked">リージョン（地域）に入ることができません。「[REGION_NAME]」は、スキルゲーミングリージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。
+詳しくは、[https://wiki.secondlife.com/wiki/Linden_Lab_Official:Second_Life_Skill_Gaming_FAQ スキルゲーミングのよくある質問]を参照してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PreferredMaturityChanged">今後、[RATING]コンテンツ付きのリージョン（地域）を訪問しようとしているという通知を受け取りません。後でメニューバーの「私」＞「初期設定」＞「一般」を使用して、コンテンツの初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MaturityChangeError">現在、[PREFERRED_MATURITY]コンテンツを表示するように初期設定を変更できませんでした。あなたの初期設定は、[ACTUAL_MATURITY]コンテンツを表示するようにリセットされました。メニューバーの「私」＞「初期設定」＞「一般」を使用して、もう一度初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LandClaimAccessBlocked">取得しようとしている土地には現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_AdultsOnlyContent">この土地を購入できるのは、成人だけです。   
+    <tag>fail</tag>
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <usetemplate ignoretext="土地を購入：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_Notify">取得しようとしている土地には。[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_NotifyAdultsOnly">取得しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_Change">取得しようとしている土地には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の取得を試みることができます。
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="取得しようとしている土地には、現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="LandBuyAccessBlocked">購入しようとしている土地には、現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」から設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_AdultsOnlyContent">この土地を取得できるのは、成人だけです。
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <usetemplate ignoretext="土地の取得：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_Notify">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_NotifyAdultsOnly">購入しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_Change">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の購入を試みることができます。
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="購入しようとしている土地には現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="TooManyPrimsSelected">選択したプリムが多すぎます：[MAX_PRIM_COUNT]
+個選択するか、プリム数を減らしてもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TooManyScriptsSelected">
+スクリプト内で選択されたオブジェクトが多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ProblemImportingEstateCovenant">不動産約款のインポート時に問題が発生しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ProblemAddingEstateManager">新しい不動産マネージャーの追加に関する問題：
+いずれかの不動産のマネージャーリストが満杯になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ProblemAddingEstateBanManager">不動産所有者または管理者を禁止リストに追加できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ProblemAddingEstateGeneric">不動産リストの追加に関する問題：
+いずれかの不動産のリストが満杯になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToLoadNotecardAsset">現在ノートカードのアセットＩＤを読み込むことができません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NotAllowedToViewNotecard">要求したアセットＩＤに関するノートカードを閲覧するには、権限が不十分です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MissingNotecardAssetID">ノートカード用のアセットＩＤがデータベースに登録されていません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PublishClassified">注意：クラシファイド広告の掲載料金の払い戻しはできません。L$ [AMOUNT]で、このクラシファイド広告を今すぐ公開しますか？
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SetClassifiedMature">この広告に「Moderate」コンテンツは含まれていますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="SetGroupMature">このグループに「Moderate」コンテンツが含まれていますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification label="再起動を確認" name="ConfirmRestart">このリージョンを２分後に再起動しようとしています。このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="このリージョンにメッセージを送信" name="MessageRegion">このリージョン（地域）にいる人全員に送る、短いメッセージを入力してください。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" />
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="地域のレーティング区分指定変更しました" name="RegionMaturityChange">このリージョン（地域）のレーティング区分が変更されました。
+マップにこの変更が反映するには数分かかることがあります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">[APP_NAME]のこのバージョンは、このリージョン（地域）におけるボイスチャットの互換性がありません。ボイスチャットを正常に行うためには、[APP_NAME]のアップデートが必要です。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification label="オブジェクトを購入できません" name="BuyObjectOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
+単一のオブジェクトを選択し、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="コンテンツを購入できません" name="BuyContentsOneOnly">一度に複数のオブジェクトのコンテンツは購入できません。
+選択するオブジェクトを一つだけにして、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="コンテンツを購入できません" name="BuyContentsOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
+単一のオブジェクトを選択し、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyOriginal">オリジナルのオブジェクトを[OWNER]からL$ [PRICE]で購入しますか？
+購入すると、あなたがオブジェクトの所有者となり、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyOriginalNoOwner">L$ [PRICE]でオリジナルのオブジェクトを購入しますか？
+購入すると、あなたがオブジェクトの所有者となり、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyCopy">コピーを[OWNER]からL$ [PRICE]で購入しますか？
+購入したオブジェクトは、あなたのインベントリにコピーされ、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyCopyNoOwner">L$ [PRICE]でコピーを購入しますか？
+購入したオブジェクトは、あなたのインベントリにコピーされ、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyContents">中身を[OWNER]からL$ [PRICE]で購入しますか？購入した中身は、あなたのインベントリにコピーされます。
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyContentsNoOwner">L$ [PRICE]で中身を購入しますか？ 購入した中身は、あなたのインベントリにコピーされます。
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmPurchase">この取引は以下のとおり行われます：
 [ACTION]
 
-購入を続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmPurchasePassword">
-		この取引は以下のとおり行われます：
+このまま購入を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmPurchasePassword">この取引は以下のとおり行われます：
 [ACTION]
 
-購入を続けますか？
-パスワードを再入力し、「 OK 」をクリックしてください。
-		<form name="form">
-			<input name="message"/>
-			<button name="ConfirmPurchase" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="SetPickLocation">
-		メモ：
-本ピックの位置を更新しましたが、
-他の詳細は元の値のままになります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MoveInventoryFromObject">
-		「コピー不可」のインベントリアイテムを選択しました。
+このまま購入を続けてもよろしいですか？
+パスワードを再入力し、「ＯＫ」をクリックしてください。
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <form name="form">
+      <input name="message" />
+      <button name="ConfirmPurchase" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="SetPickLocation">メモ：
+本ピックの位置を更新しましたが、 他の詳細は元の値のままになります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MoveInventoryFromObject">「コピー不可」のインベントリアイテムを選択しました。
 これらのアイテムはコピーされないまま、あなたのインベントリに移動されます。
 
+このままインベントリにアイテムを移動しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="「コピー不可」のアイテムをオブジェクトから動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MoveInventoryFromScriptedObject">「コピー不可」のインベントリアイテムを選択しました。
+これらのアイテムはコピーされずに、あなたのインベントリに移動されます。このオブジェクトはスクリプト付きなので、インベントリに移動させると、スクリプトに誤動作が起きる可能性があります。
+
+このままインベントリにアイテムを移動しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="スクリプト入りのオブジェクトを壊す恐れのある「コピー不可」のアイテムを動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ClickActionNotPayable">警告：クリックで「オブジェクトに支払う」設定をしました。スクリプトにmoney()イベントが追加されると動作します。
+    <form name="form">
+      <ignore name="ignore" text="オブジェクトを作成中に、money() スクリプトを入れずに「オブジェクトに支払う」アクションを設定したとき" />
+    </form>
+  </notification>
+
+  <notification name="PayConfirmation">[TARGET]にL$ [AMOUNT]を支払うことを確認してください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="支払い前に確認 (合計金額がL$ 200を超える場合)" name="okcancelignore" notext="キャンセル" yestext="支払い" />
+  </notification>
+
+  <notification name="PayObjectFailed">支払いが失敗しました：オブジェクトが見つかりませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PaymentBlockedButtonMismatch">支払いが停止されました：
+支払われた価格が、このオブジェクトに設定された支払いボタンのどれとも一致しません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OpenObjectCannotCopy">このオブジェクトには、あなたがコピーできるアイテムはありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WebLaunchAccountHistory">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]
+ページに移動してアカウント履歴を確認しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動" />
+  </notification>
+
+  <notification name="ConfirmAddingChatParticipants">既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="会話へ参加者を追加する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmQuit">終了してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification name="ConfirmRestoreToybox">この操作を実行すると、デフォルト設定のボタンとツールバーが復元されます。
 
-アイテムを動かしますか？
-		<usetemplate ignoretext="「コピー不可」のアイテムをオブジェクトから動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="MoveInventoryFromScriptedObject">
-		「コピー不可」のインベントリアイテムを選択しました。
-これらのアイテムはコピーされずに、あなたのインベントリに移動されます。
-このオブジェクトはスクリプト付きなので、インベントリに移動させると
-スクリプトに誤動作が起きる可能性があります。
-
-インベントリアイテムを移動しますか？
-		<usetemplate ignoretext="スクリプト入りのオブジェクトを壊す恐れのある「コピー不可」のアイテムを動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ClickActionNotPayable">
-		警告： クリックで「オブジェクトに支払う」設定をしました。スクリプトに money()イベントが追加されると動作します。
-		<form name="form">
-			<ignore name="ignore" text="オブジェクトを作成中に、money() スクリプトを入れずに「オブジェクトに支払う」アクションを設定したとき"/>
-		</form>
-	</notification>
-	<notification name="PayConfirmation">
-		L$[AMOUNT] を [TARGET] に支払うことを確認してください。
-		<usetemplate ignoretext="支払い前に確認 (合計金額が L$200 以上の場合)" name="okcancelignore" notext="取り消し" yestext="支払い"/>
-	</notification>
-	<notification name="PayObjectFailed">
-		支払いが失敗しました： オブジェクトが見つかりませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PaymentBlockedButtonMismatch">
-		支払いが停止されました： 支払われた価格がこのオブジェクトに設定された支払いボタンのどれとも一致しません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OpenObjectCannotCopy">このオブジェクトには、あなたがコピーできるアイテムはありません。</notification>
-	<notification name="WebLaunchAccountHistory">
-		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
-		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
-	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
-		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
-	</notification>
-	<notification name="ConfirmQuit">
-		終了しようとしています。続けますか？
-		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification name="ConfirmRestoreToybox">
-		この操作を実行すると、デフォルト設定のボタンとツールバーが復元されます。
-
-この操作は元に戻せません。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmClearAllToybox">
-		この操作により、全てのボタンはツールボックスに戻り、ツールバーは空になります。
-    
 この操作は元に戻せません。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeleteItems">
-		[QUESTION]
-		<form name="form">
-			<ignore name="ignore" text="アイテムを削除する前の確認"/>
-			<button name="Yes" text="OK"/>
-			<button name="No" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification name="DeleteFilteredItems">
-		あなたのインベントリには現在フィルターがかけられているため、削除しようとしているアイテムによっては表示されないことがあります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
 
+  <notification name="ConfirmClearAllToybox">この操作により、全てのボタンはツールボックスに戻り、ツールバーは空になります。
+
+この操作は元に戻せません。
+    <unique />
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DeleteItems">[QUESTION]
+    <tag>confirm</tag>
+    <form name="form">
+      <ignore name="ignore" text="アイテムを削除する前の確認" />
+      <button name="Yes" text="ＯＫ" />
+      <button name="No" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="DeleteFilteredItems">あなたのインベントリには現在フィルタがかけられているため、削除しようとしているアイテムによっては表示されないことがあります。
+  
 これらのアイテムを削除しますか？
-		<usetemplate ignoretext="フィルリングされたアイテムを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmUnlink">
-		これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。そのような場合に備えて、リンクセットを自分の持ち物にコピーできます。
-		<usetemplate ignoretext="リンクセットのリンクを解除するときに確認する" name="okcancelignore" notext="取り消し" yestext="リンクを外す"/>
-	</notification>
-	<notification name="HelpReportAbuseConfirm">
-		この問題のご報告にお時間を割いていただきありがとうございます。 
-お知らせいただいた内容について違反がないか確認し、適切に
-対処いたします。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="HelpReportAbuseSelectCategory">嫌がらせ報告のカテゴリを選択してください。
-カテゴリを選択することにより、嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseAbuserNameEmpty">嫌がらせ行為をした人の名前を入力してください。
-正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseAbuserLocationEmpty">嫌がらせがあった場所を入力してください。
-正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseSummaryEmpty">嫌がらせの概要を入力してください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="フィルリングされたアイテムを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmUnlink">これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。
+そのような場合に備えて、リンクセットを自分のインベントリにコピーできます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットのリンクを解除する前の確認" name="okcancelignore" notext="キャンセル" yestext="リンクを外す" />
+  </notification>
+
+  <notification name="HelpReportAbuseConfirm">この問題のご報告にお時間を割いていただきありがとうございます。
+お知らせいただいた内容について違反がないか確認し、適切に 対処いたします。
+    <unique />
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="HelpReportAbuseSelectCategory">嫌がらせ報告のカテゴリを選択してください。
+カテゴリを選択することにより、嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseAbuserNameEmpty">嫌がらせ行為をした人の名前を入力してください。
+正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseAbuserLocationEmpty">嫌がらせがあった場所を入力してください。
+正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseSummaryEmpty">嫌がらせの概要を入力してください。
 正確な概要の入力により、
-嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseDetailsEmpty">嫌がらせの詳細な説明を入力してください。
+嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseDetailsEmpty">嫌がらせの詳細な説明を入力してください。
 名前や嫌がらせの詳細を、できるだけ具体的に入力してください。
 
 正確な説明の入力により、
-嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseContainsCopyright">こんにちは、
+嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="HelpReportAbuseContainsCopyright">親愛なる居住者様
 
-知的財産権の侵害を報告しようとしています。 正確に報告するために、以下をご確認ください：
+知的財産権の侵害を報告しているようです。正しく報告していることを確認してください。
 
-(1) 嫌がらせの報告の手順 住人が [SECOND_LIFE] の権限システムを悪用しているのを見つけたら、嫌がらせの報告をすることができます。例えば、CopyBot や似たようなコピーツールを使用して知的財産権を侵害している場合です。 担当チームは調査を行い、[SECOND_LIFE] [http://secondlife.com/corporate/tos.php 利用規約] や [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] に違反する行為に対する適切な処罰を下します。  ただし、担当チームは [SECOND_LIFE] の世界からコンテンツを削除して欲しいというリクエストには応じません。
+⑴嫌がらせの報告の手順。居住者が、[SECOND_LIFE]権限システムを悪用していると思われる場合（たとえば、CopyBotまたは同様のコピーツールを使用して、知的財産権を侵害していると思われる場合）は、不正使用報告を提出することができます。不正行為チームは、[SECOND_LIFE][http://secondlife.com/corporate/tos.php 利用規約]や、[http://jp.secondlife.com/corporate/cs.php コミュニティ・スタンダード]に違反する行為を調査し、に違反する行為に対する適切な処罰を下します。ただし、担当チームは[SECOND_LIFE]の世界からコンテンツを削除して欲しいというリクエストには応じません。
 
-(2) DMCA またはコンテンツの撤去の手順 コンテンツを [SECOND_LIFE] から削除して欲しいというリクエストをするには、弊社 [http://secondlife.com/corporate/dmca.php DMCA ポリシー] で提示されているとおり、有効な侵害の通知を提出しなければなりません。.
+⑵DMCA またはコンテンツ削除プロセス。[SECOND_LIFE]からコンテンツの削除をリクエストするには、[https://www.lindenlab.com/legal/intellectual-property-infringement-notification-policy ＤＣＭＡポリシー]に規定されている有効な権利侵害通知を提出する必要があります。
 
-このまま嫌がらせの報告を続けたい場合は、このウィンドウを閉じて報告を送ってください。  「コピー Bot 及び権限の悪用」のカテゴリを選んだ方が適切の場合があります。
+このまま嫌がらせの報告を続けたい場合は、このウィンドウを閉じて報告の送信を完了してください。特定のカテゴリ「コピー Bot 及び権限の悪用」を選択する必要がある場合があります。
 
 ご協力ありがとうございます。
 
 Linden Lab</notification>
-	<notification name="FailedRequirementsCheck">以下の必要なコンポーネントが、[FLOATER] から抜け落ちています
-[COMPONENTS]</notification>
-	<notification label="既存の付属品を置換" name="ReplaceAttachment">
-		体のこの部位には既にオブジェクトが装着されています。
+
+  <notification name="FailedRequirementsCheck">以下の必要なコンポーネントが、[FLOATER]から抜け落ちています
+[COMPONENTS]
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="既存の付属品を置換" name="ReplaceAttachment">体のこの部位には既にオブジェクトが装着されています。
 選択されたオブジェクトと置き換えますか？
-		<form name="form">
-			<ignore name="ignore" save_option="true" text="装着しているアイテムと選択したアイテムを入れ替えるとき"/>
-			<button ignore="自動的に交換" name="Yes" text="OK"/>
-			<button ignore="交換しない" name="No" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification name="TooManyWearables">[AMOUNT] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 &gt; 「デバッグ設定を表示」 &gt; 「WearFolderLimit」でこの制限を変更できます。</notification>
-	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
-		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
-
-このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
-		<form name="form">
-			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
-			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
-			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="ConfirmDeleteProtectedCategory">
-		「 [FOLDERNAME] 」 は、システムフォルダです。 システムフォルダを削除すると不安定になることがあります。  続けますか？
-		<usetemplate ignoretext="システムフォルダを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="PurgeSelectedItems">
-		[COUNT] アイテムが完全に削除されます。ごみ箱内の選択した項目をすべて削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmEmptyTrash">
-		[COUNT] 個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="TrashIsFull">
-		ゴミ箱があふれています。これはログイン時に問題を引き起こします。
-		<usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する"/>
-	</notification>
-	<notification name="ConfirmClearBrowserCache">
-		トラベル、Web、検索の履歴をすべて削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmClearCache">
-		ビューワのキャッシュをクリアしますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmClearCookies">
-		本当にクッキーをクリアしますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
-	</notification>
-	<notification name="ConfirmClearMediaUrlList">
-		保存された URL のリストを消去します。よろしいですか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
-	</notification>
-	<notification name="ConfirmEmptyLostAndFound">
-		紛失物の中身をすべて削除しますか？
-		<usetemplate ignoretext="紛失物フォルダを空にする前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="CopySLURL">
-		次の SLurl がクリップボードにコピーされました：
- [SLURL]
-
-Web ページにリンクすると、他人がこの場所に簡単にアクセスできます。Web ブラウザのアドレスバーに貼り付けて試してみてください。
-		<form name="form">
-			<ignore name="ignore" text="クリップボードに SLurl をコピーするとき"/>
-		</form>
-	</notification>
-	<notification name="WLSavePresetAlert">
-		保存された事前設定を上書きしますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="WLNoEditDefault">デフォルトの設定を編集したり削除したりすることはできません。</notification>
-	<notification name="WLMissingSky">このデイサイクルのファイルは次の存在しない「空」ファイルを参照しています： [SKY]。</notification>
-	<notification name="WLRegionApplyFail">申し訳ございませんが、設定をリージョンに適用できませんでした。理由： [FAIL_REASON]</notification>
-	<notification name="WLLocalTextureDayBlock">ローカルテクスチャは、フィールド [FIELD] 内のトラック [TRACK]、フレーム #[FRAMENO] ([FRAME]%) で使用されています。ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
-	<notification name="WLLocalTextureFixedBlock">ローカルテクスチャは、フィールド [FIELD] で使用されています。
+    <tag>confirm</tag>
+    <form name="form">
+      <ignore name="ignore" save_option="true" text="装着しているアイテムと選択したアイテムを入れ替える" />
+      <button ignore="自動的に交換" name="Yes" text="ＯＫ" />
+      <button ignore="交換しない" name="No" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TooManyWearables">[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="「着信拒否」モードの警告" name="DoNotDisturbModePay">「着信拒否」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
+このトランザクションを完了するために、「着信拒否」をオフにしてもよろしいですか。
+    <tag>confirm</tag>
+    <form name="form">
+      <ignore name="ignore" text="「着信拒否」モード時に、人や物を支払う予定です。" />
+      <button ignore="「着信拒否」モードを解除する" name="Yes" text="ＯＫ" />
+      <button ignore="「着信拒否」モードを維持する" name="No" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="ConfirmDeleteProtectedCategory">「[FOLDERNAME]」は、システムフォルダです。
+システムフォルダを削除すると不安定になることがあります。このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="システムフォルダを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PurgeSelectedItems">[COUNT]個のアイテムが完全に削除されます。ごみ箱内の選択した項目を削除してもよろしいですか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmEmptyTrash">[COUNT]個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TrashIsFull">ゴミ箱があふれています。これはログイン時に問題を引き起こします。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する" />
+  </notification>
+
+  <notification name="ConfirmClearBrowserCache">トラベル、Web、検索の履歴をすべて削除しますか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmClearCache">ビューアーのキャッシュをクリアしますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmClearCookies">本当にクッキーをクリアしますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
+  </notification>
+
+  <notification name="ConfirmClearMediaUrlList">保存されたＵＲＬのリストを消去します。よろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
+  </notification>
+
+  <notification name="ConfirmEmptyLostAndFound">紛失物の中身をすべて削除しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="紛失物フォルダを空にする前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="CopySLURL">次のSLurlがクリップボードにコピーされました：
+[SLURL]
+  
+Webページにリンクすると、他人がこの場所に簡単にアクセスできます。Webブラウザのアドレスバーに貼り付けて試してみてください。
+    <form name="form">
+      <ignore name="ignore" text="クリップボードにSLurlをコピーする" />
+    </form>
+  </notification>
+
+  <notification name="WLSavePresetAlert">保存されたプリセットを上書きしてもよろしいですか？
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="WLNoEditDefault">デフォルトの設定を編集したり削除したりすることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WLMissingSky">このデイサイクルのファイルは、以下の存在しない「空」ファイルを参照しています：[SKY]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WLRegionApplyFail">申し訳ございませんが、設定をリージョンに適用できませんでした。理由：[FAIL_REASON]</notification>
+
+  <notification name="WLLocalTextureDayBlock">ローカルテクスチャは、フィールド[FIELD]内のトラック[TRACK]、フレーム＃[FRAMENO] ([FRAME]％) で使用されています。
 ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
-	<notification name="EnvCannotDeleteLastDayCycleKey">
-		デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="DayCycleTooManyKeyframes">
-		このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE] の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="EnvUpdateRate">
-		リージョンの自然環境の設定は [WAIT] 秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PPSaveEffectAlert">
-		ポストプロセス効果が存在します。 上書きしますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="ChatterBoxSessionStartError">
-		[RECIPIENT] と新しいチャットを開始することができません。
+
+  <notification name="WLLocalTextureFixedBlock">ローカルテクスチャは、フィールド[FIELD]で使用されています。
+ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
+
+  <notification name="EnvCannotDeleteLastDayCycleKey">デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。
+最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DayCycleTooManyKeyframes">このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE]の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EnvUpdateRate">リージョンの自然環境の設定は、[WAIT]秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PPSaveEffectAlert">ポストプロセス効果が存在します。上書きしますか？
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="ChatterBoxSessionStartError">[RECIPIENT]と新しいチャットを開始することができません。
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChatterBoxSessionEventError">
-		[EVENT]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChatterBoxSessionEventError">[EVENT]
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ForceCloseChatterBoxSession">
-		[NAME] とのチャットセッションを閉じます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ForceCloseChatterBoxSession">[NAME]とのチャットセッションを閉じます。
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="Cannot_Purchase_an_Attachment">オブジェクトが取り付けられているままでは購入できません。</notification>
-	<notification label="引き出し許可のリクエストについて" name="DebitPermissionDetails">
-		このリクエストを許可すると、スクリプトであなたのアカウントからリンデンドルを引き出せるようになります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="Cannot_Purchase_an_Attachment">オブジェクトが取り付けられているままでは購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="引き出し許可のリクエストについて" name="DebitPermissionDetails">このリクエストを許可すると、スクリプトであなたのアカウントからリンデンドルを引き出せるようになります。
 この許可を取り消すには、オブジェクトの所有者がオブジェクトを削除するか、オブジェクトのスクリプトをリセットしなければなりません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AutoWearNewClothing">
-		作成する衣類を自動的に装着しますか？
-		<usetemplate ignoretext="「容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="NotAgeVerified">
-		訪問しようとしているロケーションは、18 才以上の住人に制限されています。
-		<usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="NotAgeVerified_Notify">ロケーションは 18 才以上に制限されています。</notification>
-	<notification name="Cannot enter parcel: no payment info on file">
-		支払情報が登録されていないとこのエリアを訪れることができません。  [SECOND_LIFE] サイトで登録を行いますか？
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AutoWearNewClothing">作成する服装を自動的に装着しますか？
+    <usetemplate ignoretext="「容姿」を編集中に、作成する服装を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
 
+  <notification name="NotAgeVerified">訪問しようとしている場所は、１８歳以上の住人に制限されています。
+    <usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NotAgeVerified_Notify">この場所への入場は、１８歳以上に制限されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: no payment info on file">支払情報が登録されていないため、このエリアを訪れることができません。[SECOND_LIFE]サイトで登録を行いますか？
+  
 [_URL]
-		<url name="url" option="0">https://secondlife.com/account/index.php?lang=ja</url>
-		<usetemplate ignoretext="支払情報が登録されていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="MissingString">文字列 [STRING_NAME] が strings.xml に含まれていません。</notification>
-	<notification name="SystemMessageTip">[MESSAGE]</notification>
-	<notification name="IMSystemMessageTip">[MESSAGE]</notification>
-	<notification name="Cancelled">取り消されました。</notification>
-	<notification name="CancelledAttach">添付が取り消されました。</notification>
-	<notification name="ReplacedMissingWearable">欠落している衣類や身体部位をデフォルトに置き換えます。</notification>
-	<notification name="GroupNotice">件名： [SUBJECT]、メッセージ： [MESSAGE]</notification>
-	<notification name="FriendOnlineOffline">&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です</notification>
-	<notification name="AddSelfFriend">残念ながら自分自身をフレンド登録することはできません。</notification>
-	<notification name="AddSelfRenderExceptions">あなた自身をレンダリングの例外リストに加えることはできません。</notification>
-	<notification name="UploadingAuctionSnapshot">インワールドと Web サイトのスナップショットをアップロード中です...
-（所要時間：約 5 分）</notification>
-	<notification name="UploadPayment">アップロードに L$ [AMOUNT] 支払いました。</notification>
-	<notification name="UploadWebSnapshotDone">Web サイトのスナップショットがアップロードされました。</notification>
-	<notification name="UploadSnapshotDone">インワールドでのスナップショットのアップロードが完了しました。</notification>
-	<notification name="TerrainDownloaded">raw 地形がダウンロードされました</notification>
-	<notification name="GestureMissing">ジェスチャーの [NAME] がデータベースに見つかりません。</notification>
-	<notification name="UnableToLoadGesture">[NAME] というジェスチャーを読み込むことができませんでした。</notification>
-	<notification name="LandmarkMissing">データベースにランドマークがありません。</notification>
-	<notification name="UnableToLoadLandmark">ランドマークを読み込めません。  もう一度お試しください。</notification>
-	<notification name="CapsKeyOn">CapsLock キーが有効になっています。
+    <tag>confirm</tag>
+    <url name="url" option="0">https://secondlife.com/account/index.php?lang=ja</url>
+    <usetemplate ignoretext="支払情報が登録されていません" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="MissingString">文字列[STRING_NAME]がstrings.xmlに含まれていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SystemMessageTip">[MESSAGE]</notification>
+
+  <notification name="IMSystemMessageTip">[MESSAGE]</notification>
+
+  <notification name="Cancelled">取り消されました。</notification>
+
+  <notification name="CancelledAttach">添付が取り消されました。</notification>
+
+  <notification name="ReplacedMissingWearable">欠落している服装や身体部位をデフォルトに置き換えます。</notification>
+
+  <notification name="GroupNotice">件名：[SUBJECT]　メッセージ：[MESSAGE]
+    <tag>group</tag>
+  </notification>
+
+  <notification name="FriendOnlineOffline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、[STATUS]です。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="AddSelfFriend">残念ながら自分自身をフレンド登録することはできません。</notification>
+
+  <notification name="AddSelfRenderExceptions">あなた自身をレンダリングの例外リストに加えることはできません。</notification>
+
+  <notification name="UploadingAuctionSnapshot">インワールドとWebサイトのスナップショットをアップロード中です…
+（所要時間：約５分）</notification>
+  <notification name="UploadPayment">アップロードにL$ [AMOUNT]支払いました。
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="UploadWebSnapshotDone">Webサイトのスナップショットにアップロードされました。</notification>
+
+  <notification name="UploadSnapshotDone">インワールドでのスナップショットのアップロードが完了しました。</notification>
+
+  <notification name="TerrainDownloaded">Terrain.rawがダウンロードされました。</notification>
+
+  <notification name="GestureMissing">ジェスチャー「[NAME]」がデータベースに見つかりません。</notification>
+
+  <notification name="UnableToLoadGesture">ジェスチャー「[NAME]」を読み込むことができませんでした。</notification>
+
+  <notification name="LandmarkMissing">データベースにランドマークがありません。</notification>
+
+  <notification name="UnableToLoadLandmark">ランドマークを読み込めませんでした。もう一度お試しください。</notification>
+
+  <notification name="CapsKeyOn">CapsLockキーが有効になっています。
 パスワードに影響するかもしれません。</notification>
-	<notification name="NotecardMissing">ノートカードがデータベースにありません。</notification>
-	<notification name="NotecardNoPermissions">このノートカードを見る権限がありません。</notification>
-	<notification name="RezItemNoPermissions">オブジェクトを Rez するには権限が不足しています。</notification>
-	<notification name="IMAcrossParentEstates">親エステート間では IM を送信できません。</notification>
-	<notification name="TransferInventoryAcrossParentEstates">親エステート間でインベントリを移動することはできません。</notification>
-	<notification name="UnableToLoadNotecard">ノートカードを読み込めません。あとで再度お試しください。</notification>
-	<notification name="ScriptMissing">データベースにスクリプトがありません。</notification>
-	<notification name="ScriptNoPermissions">スクリプトを閲覧するには権限が不十分です。</notification>
-	<notification name="UnableToLoadScript">スクリプトをロードできません。  もう一度試してください。</notification>
-	<notification name="IncompleteInventory">あなたの提供するコンテンツは、ローカルではまだ全部揃っていません。
-しばらくしてからもう一度お試しください。</notification>
-	<notification name="CannotModifyProtectedCategories">保護されたカテゴリは修正できません。</notification>
-	<notification name="CannotRemoveProtectedCategories">保護されたカテゴリは削除できません。</notification>
-	<notification name="UnableToBuyWhileDownloading">オブジェクトデータのダウンロード中は購入できません。
-もう一度お試しください。</notification>
-	<notification name="UnableToLinkWhileDownloading">オブジェクトデータのウンロード中はリンクできません。
-もう一度お試しください。</notification>
-	<notification name="CannotBuyObjectsFromDifferentOwners">オブジェクトは一度に一人の所有者から購入できます。
-オブジェクトを 1 つだけ選んでください。</notification>
-	<notification name="ObjectNotForSale">このオブジェクトは販売対象ではありません。</notification>
-	<notification name="EnteringGodMode">レベル [LEVEL] のゴッドモードに入ります</notification>
-	<notification name="LeavingGodMode">レベル [LEVEL] のゴッドモードを解除します</notification>
-	<notification name="CopyFailed">これをコピーする権限がありません。</notification>
-	<notification name="InventoryAccepted">[NAME] は、あなたが渡したアイテムを受け取りました。</notification>
-	<notification name="InventoryDeclined">[NAME] は、インベントリの提供を断りました。</notification>
-	<notification name="ObjectMessage">[NAME]： [MESSAGE]</notification>
-	<notification name="CallingCardAccepted">コーリングカードが受理されました。</notification>
-	<notification name="CallingCardDeclined">コーリングカードが拒否されました。</notification>
-	<notification name="TeleportToLandmark">[NAME] などの場所にテレポートするには、「場所」ボタンをクリックしてから、
-表示されたウィンドウで「ランドマーク」タブを選択します。ランドマークを
-いずれか 1 つ選択してから、ウィンドウ下部にある「テレポート」をクリックします。
-（この操作は、ランドマークをダブルクリックするか、右クリックして
-「テレポート」を選択して実行することもできます。）</notification>
-	<notification name="TeleportToPerson">誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「IM」を選択します。</notification>
-	<notification name="CantSelectLandFromMultipleRegions">サーバーの境界を越えて土地を選択することできません。
-もっと小さな土地を選択してください。</notification>
-	<notification name="SearchWordBanned">コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。</notification>
-	<notification name="NoContentToSearch">少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）</notification>
-	<notification name="SystemMessage">[MESSAGE]</notification>
-	<notification name="FacebookConnect">[MESSAGE]</notification>
-	<notification name="FlickrConnect">[MESSAGE]</notification>
-	<notification name="TwitterConnect">[MESSAGE]</notification>
-	<notification name="PaymentReceived">[MESSAGE]</notification>
-	<notification name="PaymentSent">[MESSAGE]</notification>
-	<notification name="PaymentFailure">[MESSAGE]</notification>
-	<notification name="EventNotification">
-		イベント通知：
+
+  <notification name="NotecardMissing">ノートカードがデータベースにありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NotecardNoPermissions">このノートカードを見る権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezItemNoPermissions">オブジェクトをRezするには権限が不足しています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="IMAcrossParentEstates">親不動産間では、ＩＭを送信できません。</notification>
+
+  <notification name="TransferInventoryAcrossParentEstates">親不動産間でインベントリを移動することはできません。</notification>
+
+  <notification name="UnableToLoadNotecard">ノートカードを読み込めません。
+あとで再度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ScriptMissing">データベースにスクリプトがありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ScriptNoPermissions">スクリプトを閲覧するには権限が不十分です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToLoadScript">スクリプトをロードできません。もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="IncompleteInventory">あなたの提供するコンテンツは、ローカルではまだ全部揃っていません。
+しばらくしてからもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotModifyProtectedCategories">保護されたカテゴリは修正できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotRemoveProtectedCategories">保護されたカテゴリは削除できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToBuyWhileDownloading">オブジェクトデータのダウンロード中は購入できません。
+もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToLinkWhileDownloading">オブジェクトデータのウンロード中はリンクできません。
+もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotBuyObjectsFromDifferentOwners">オブジェクトは一度に一人の所有者から購入できます。
+オブジェクトを１つだけ選んでください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ObjectNotForSale">このオブジェクトは販売対象ではありません。</notification>
+
+  <notification name="EnteringGodMode">レベル[LEVEL]のゴッドモードに入ります。</notification>
+
+  <notification name="LeavingGodMode">レベル[LEVEL]のゴッドモードを解除します。</notification>
+
+  <notification name="CopyFailed">これをコピーする権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InventoryAccepted">[NAME]は、あなたが渡したアイテムを受け取りました。</notification>
+
+  <notification name="InventoryDeclined">[NAME]は、インベントリの提供を断りました。</notification>
+
+  <notification name="ObjectMessage">[NAME]：[MESSAGE]</notification>
+
+  <notification name="CallingCardAccepted">コーリングカードが受理されました。</notification>
+
+  <notification name="CallingCardDeclined">コーリングカードが拒否されました。</notification>
+
+  <notification name="TeleportToLandmark">[NAME]などの場所にテレポートするには、「場所」ボタンをクリックしてから、
+表示されたウィンドウで「ランドマーク」タブを選択します。
+ランドマークをいずれか１つ選択してから、ウィンドウ下部にある「テレポート」をクリックします。
+（この操作は、ランドマークをダブルクリックするか、右クリックして「テレポート」を選択して実行することもできます。）</notification>
+
+  <notification name="TeleportToPerson">誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「ＩＭ」を選択します。</notification>
+
+  <notification name="CantSelectLandFromMultipleRegions">サーバーの境界を越えて土地を選択することできません。
+もっと小さな土地を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SearchWordBanned">コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoContentToSearch">少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SystemMessage">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="PaymentReceived">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="PaymentSent">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="PaymentFailure">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <!-- EventNotification couldn't be persist since server decide is it necessary to notify user about subscribed event via LLEventNotifier-->
+  <notification name="EventNotification">イベント通知：
 
 [NAME]
 [DATE]
-		<form name="form">
-			<button name="Details" text="詳細"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TransferObjectsHighlighted">
-		この区画の購入者に受け渡されるオブジェクトは、すべて区画上で強調表示されています。
-
-
-*受け渡される樹木や植物は、強調表示されていません。
-		<form name="form">
-			<button name="Done" text="完了"/>
-		</form>
-	</notification>
-	<notification name="DeactivatedGesturesTrigger">同じトリガーでアクティブにしないジェスチャー：
+    <form name="form">
+      <button name="Details" text="詳細" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TransferObjectsHighlighted">この区画の購入者に受け渡されるオブジェクトは、すべて区画上で強調表示されています。
+
+・受け渡される樹木や植物は、強調表示されていません。
+    <form name="form">
+      <button name="Done" text="完了" />
+    </form>
+  </notification>
+
+  <notification name="DeactivatedGesturesTrigger">同じトリガーでアクティブにしないジェスチャー：
 [NAMES]</notification>
-	<notification name="NoQuickTime">Apple の QuickTime ソフトウェアがお使いのシステムにインストールされていないようです。
-ストリーミングメディアをサポートする区画で見たい場合は、[http://www.apple.com/jp/quicktime QuickTime サイト] から QuickTime プレイヤーをインストールしてください。</notification>
-	<notification name="NoPlugin">「 [MIME_TYPE] 」の MIME タイプを扱うメディアプラグインが見つかりませんでした。  このタイプのメディアはご利用いただけません。</notification>
-	<notification name="MediaPluginFailed">
-		次のメディアプラグインが実行できませんでした：
-    [PLUGIN]
 
+  <notification name="NoQuickTime">Apple の QuickTime ソフトウェアがお使いのシステムにインストールされていないようです。
+ストリーミングメディアをサポートする区画で見たい場合は、[http://www.apple.com/jp/quicktime QuickTimeサイト] から QuickTimeプレイヤーをインストールしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPlugin">「[MIME_TYPE]」のmimeタイプを扱うメディアプラグインが見つかりませんでした。
+このタイプのメディアはご利用いただけません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="MediaPluginFailed">次のメディアプラグインが実行できませんでした：[PLUGIN]
 プラグインをインストールしなおすか、問題が解決しない場合はメーカーにお問い合わせください。
-		<form name="form">
-			<ignore name="ignore" text="メディアプラグインの実行に失敗したとき"/>
-		</form>
-	</notification>
-	<notification name="OwnedObjectsReturned">選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたのインベントリに返却されました。</notification>
-	<notification name="OtherObjectsReturned">[NAME] が所有する、選択した区画にあるオブジェクトは、所有者のインベントリに返却されました。</notification>
-	<notification name="OtherObjectsReturned2">「 [NAME] 」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。</notification>
-	<notification name="GroupObjectsReturned">グループ &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; と共有する、選択した区画にあるオブジェクトは、オブジェクトのオーナーのインベントリに返却されました。
+    <tag>fail</tag>
+    <form name="form">
+      <ignore name="ignore" text="メディアプラグインの実行に失敗したとき" />
+    </form>
+  </notification>
+
+  <notification name="OwnedObjectsReturned">選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたのインベントリに返却されました。</notification>
+
+  <notification name="OtherObjectsReturned">[NAME]が所有する、選択した区画にあるオブジェクトは、所有者のインベントリに返却されました。</notification>
+
+  <notification name="OtherObjectsReturned2">「[NAME]」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。</notification>
+
+  <notification name="GroupObjectsReturned">グループ&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;と共有する、選択した区画にあるオブジェクトは、オブジェクトのオーナーのインベントリに返却されました。
 譲渡済みの譲渡可能なオブジェクトが前のオーナーに返却されました。
-グループに譲渡された譲渡禁止のオブジェクトは削除されました。</notification>
-	<notification name="UnOwnedObjectsReturned">選択した土地の区画上の、あなたの所有物では「なかった」オブジェクトは、本来の所有者に返却されました。</notification>
-	<notification name="ServerObjectMessage">[NAME] からのメッセージ：
+グループに譲渡された譲渡禁止のオブジェクトは削除されました。
+    <tag>group</tag>
+  </notification>
+
+  <notification name="UnOwnedObjectsReturned">選択した土地の区画上の、あなたの所有物では「なかった」オブジェクトは、本来の所有者に返却されました。</notification>
+
+  <notification name="ServerObjectMessage">[NAME]からのメッセージ：
 &lt;nolink&gt;[MSG]&lt;/nolink&gt;</notification>
-	<notification name="NotSafe">この土地ではダメージが有効です。
-ケガをするかもしれません。 死んでしまった場合は「ホーム」にテレポートされます。</notification>
-	<notification name="NoFly">このエリアでは飛行が禁止されています。
+
+  <notification name="NotSafe">この土地ではダメージが有効になっています。ケガをするかもしれません。
+死んでしまった場合は「ホーム」にテレポートされます。</notification>
+
+  <notification name="NoFly">このエリアでの飛行は禁止されています。
 ここでは飛べません。</notification>
-	<notification name="PushRestricted">このエリアではプッシュが禁止されています。 土地所有者以外は他人をプッシュすることはできません。</notification>
-	<notification name="NoVoice">このエリアではボイスチャットが無効です。 誰かが話しているのを聞くことはできません。</notification>
-	<notification name="NoBuild">このエリアでは制作が禁止されています。 オブジェクトを制作したり Rez することはできません。</notification>
-	<notification name="PathfindingDirty">この値域（リージョン）には、保留中のパスファインディングの変更があります。制作権がある場合は、「地域の再構築」ボタンをクリックして、地域（リージョン）を再構築できます。</notification>
-	<notification name="PathfindingDirtyRebake">
-		この値域（リージョン）には、保留中のパスファインディングの変更があります。制作権がある場合は、「地域の再構築」ボタンをクリックして、地域（リージョン）を再構築できます。
-		<usetemplate name="okbutton" yestext="地域の再構築"/>
-	</notification>
-	<notification name="DynamicPathfindingDisabled">この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。</notification>
-	<notification name="PathfindingCannotRebakeNavmesh">
-		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SeeAvatars">この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル 0 での通常の文字チャットもブロックされます。</notification>
-	<notification name="ScriptsStopped">管理者がこのリージョンのスクリプトを一時停止しました。</notification>
-	<notification name="ScriptsNotRunning">このリージョンではスクリプトの使用が禁止されています。</notification>
-	<notification name="NoOutsideScripts">この土地では、外部のスクリプトが禁止されています。
-
-土地所有者のもの以外はスクリプトが実行されません。</notification>
-	<notification name="ClaimPublicLand">そのリージョンにいないと公共の土地を取得することはできません。</notification>
-	<notification name="RegionTPAccessBlocked">訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。</notification>
-	<notification name="URBannedFromRegion">あなたはリージョンへの立入が禁止されています。</notification>
-	<notification name="NoTeenGridAccess">あなたのアカウントではティーングリッドに接続できません。</notification>
-	<notification name="ImproperPaymentStatus">このリージョンに入るために適した支払いステータスがありません。</notification>
-	<notification name="MustGetAgeRegion">この地域（リージョン）に入るには 18 才以上である必要があります。</notification>
-	<notification name="MustGetAgeParcel">この区画に入るには 18 才以上である必要があります。</notification>
-	<notification name="NoDestRegion">目的地のリージョンが見つかりませんでした。</notification>
-	<notification name="NotAllowedInDest">目的地に入る許可がありません。</notification>
-	<notification name="RegionParcelBan">立入禁止された区画を横断することはできません。 別の方法をお試しください。</notification>
-	<notification name="TelehubRedirect">テレハブに転送されました。</notification>
-	<notification name="CouldntTPCloser">これ以上目的地に近い場所にテレポートができませんでした。</notification>
-	<notification name="TPCancelled">テレポートがキャンセルされました。</notification>
-	<notification name="FullRegionTryAgain">入ろうとしているリージョンは現在満員です。
-しばらくしてから再度お試しください。</notification>
-	<notification name="GeneralFailure">よくある失敗</notification>
-	<notification name="RoutedWrongRegion">異なるリージョンに迂回されました。 もう一度お試しください。</notification>
-	<notification name="NoValidAgentID">エージェント ID が無効です。</notification>
-	<notification name="NoValidSession">セッション ID が無効です。</notification>
-	<notification name="NoValidCircuit">回路コードが無効です。</notification>
-	<notification name="NoPendingConnection">接続を生成できません。</notification>
-	<notification name="InternalUsherError">内部エラーが発生しました。</notification>
-	<notification name="NoGoodTPDestination">このリージョンでは、適切なテレポート目的地が見つかりませんでした。</notification>
-	<notification name="InternalErrorRegionResolver">内部エラーが発生しました。</notification>
-	<notification name="NoValidLanding">有効な着地点が見つかりませんでした。</notification>
-	<notification name="NoValidParcel">有効な区画が見つかりませんでした。</notification>
-	<notification name="ObjectGiveItem">
-		[NAME_SLURL] が所有する &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました：
-&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
-		<form name="form">
-			<button name="Keep" text="受け取る"/>
-			<button name="Discard" text="破棄"/>
-			<button name="Mute" text="所有者をブロック"/>
-		</form>
-	</notification>
-	<notification name="OwnObjectGiveItem">
-		&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました：
-&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
-		<form name="form">
-			<button name="Keep" text="キープ"/>
-			<button name="Discard" text="処分する"/>
-		</form>
-	</notification>
-	<notification name="UserGiveItem">
-		[NAME_SLURL] があなたに [OBJECTTYPE] を渡しました：
-[ITEM_SLURL]
-		<form name="form">
-			<button name="Show" text="表示"/>
-			<button name="Discard" text="破棄"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="GodMessage">[NAME]
 
-[MESSAGE]</notification>
-	<notification name="JoinGroup">
-		[MESSAGE]
-		<form name="form">
-			<button name="Join" text="参加"/>
-			<button name="Decline" text="辞退"/>
-			<button name="Info" text="情報"/>
-		</form>
-	</notification>
-	<notification name="TeleportOffered">
-		[NAME_SLURL] はテレポートであなたを呼んでいます。
-
-“[MESSAGE]”
-&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-		<form name="form">
-			<button name="Teleport" text="テレポート"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] はテレポートであなたを呼んでいます。
-
-“[MESSAGE]”
-&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-
-この地域（リージョン）には [REGION_CONTENT_MATURITY] コンテンツが含まれていますが、現在の環境設定は [REGION_CONTENT_MATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
-		<form name="form">
-			<button name="Teleport" text="変更して続ける"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TeleportOffered_MaturityBlocked">[NAME_SLURL] はテレポートであなたを呼んでいます。
-
-“[MESSAGE]”
-&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-
-ただし、この地域（リージョン）には成人のみアクセスできるコンテンツが含まれています。</notification>
-	<notification name="TeleportOfferSent">[TO_NAME] にテレポートを送りました。</notification>
-	<notification name="GotoURL">
-		[MESSAGE]
-[URL]
-		<form name="form">
-			<button name="Later" text="あとで"/>
-			<button name="GoNow..." text="今すぐ行く"/>
-		</form>
-	</notification>
-	<notification name="OfferFriendship">
-		[NAME_SLURL] はフレンド登録を申し込んでいます。
+  <notification name="PushRestricted">このエリアでのプッシュは禁止されています。
+土地所有者以外は他人をプッシュすることはできません。</notification>
 
-[MESSAGE]
+  <notification name="NoVoice">このエリアでのボイスチャットは無効になっています。
+音声で誰かと話ことはできません。
+    <tag>voice</tag>
+  </notification>
 
-（デフォルト設定だとお互いのオンライン状態を見ることができます）
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="辞退"/>
-		</form>
-	</notification>
-	<notification name="FriendshipOffered">[TO_NAME] にフレンド登録を申し出ました。</notification>
-	<notification name="OfferFriendshipNoMessage">
-		[NAME_SLURL] はフレンド登録を申し込んでいます。
+  <notification name="NoBuild">このエリアでの制作は禁止されています。オブジェクトを制作したりRezすることはできません。</notification>
 
-（デフォルト設定だとお互いのオンライン状態を見ることができます）
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-		</form>
-	</notification>
-	<notification name="FriendshipAccepted">&lt;nolink&gt;[NAME]&lt;/nolink&gt; はあなたからの友人登録リクエストを受諾しました。</notification>
-	<notification name="FriendshipDeclined">&lt;nolink&gt;[NAME]&lt;/nolink&gt; はあなたからの友人登録リクエストを拒否しました。</notification>
-	<notification name="FriendshipAcceptedByMe">フレンドの登録依頼が承認されました。</notification>
-	<notification name="FriendshipDeclinedByMe">フレンドの登録依頼が拒否されました。</notification>
-	<notification name="OfferCallingCard">
-		[NAME] がコーリングカードを渡そうとしています。
-あなたのインベントリにブックマークが追加され、この住人に素早く IM を送ることができます。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="辞退"/>
-		</form>
-	</notification>
-	<notification name="RegionRestartMinutes">このリージョンは [SECONDS] 分後に再起動されます。
-このままここにいるとログアウトされます。</notification>
-	<notification name="RegionRestartSeconds">このリージョンは [SECONDS] 秒後に再起動されます。.
-このままここにいるとログアウトされます。</notification>
-	<notification name="LoadWebPage">
-		Web ページ [URL] をロードしますか？
+  <notification name="PathfindingDirty">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
+    <unique />
+  </notification>
 
-[MESSAGE]
+  <notification name="PathfindingDirtyRebake">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
+    <unique />
+    <usetemplate name="okbutton" yestext="リージョンの再構築" />
+  </notification>
 
-送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;、所有者:[NAME_SLURL]
-		<form name="form">
-			<button name="Gotopage" text="ページに移動"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="FailedToFindWearableUnnamed">データベースに [TYPE] が見つかりませんでした</notification>
-	<notification name="FailedToFindWearable">データベースに [DESC] という名前の [TYPE] が見つかりませんでした。</notification>
-	<notification name="InvalidWearable">着用しようとしているアイテムはあなたのビューワでは読み込むことができません。 [APP_NAME] のバージョンをアップグレードしてからこのアイテムを着用してください。</notification>
-	<notification name="ScriptQuestion">
-		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、次のことをしようとしています：
+  <notification name="DynamicPathfindingDisabled">このリージョン（地域）において、動的経路探索が有効になっていません。経路探索ＬＳＬ呼び出しを使用するスクリプトの入ったオブジェクトは、このリージョンで期待どおりに動作しない可能性があります。
+    <unique />
+  </notification>
 
-[QUESTIONS]
-よろしいですか？
-		<form name="form">
-			<button name="Yes" text="はい"/>
-			<button name="No" text="いいえ"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="ExperienceAcquireFailed">
-		新しい体験を取得できません：
-[ERROR_MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NotInGroupExperienceProfileMessage">所有者が選択されたグループのメンバーでないため、体験グループへの変更が無視されました。</notification>
-	<notification name="UneditableExperienceProfileMessage">体験プロフィールを更新するときに、編集不可の '[field]' フィールドが無視されました。</notification>
-	<notification name="RestrictedToOwnerExperienceProfileMessage">体験の所有者のみが設定できる '[field]'フィールドへの変更を無視しました。</notification>
-	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">所有者のレーティング区分より高いレーティング区分の体験を設定できません。</notification>
-	<notification name="RestrictedTermExperienceProfileMessage">次の条件により、体験プロフィール名および説明の更新ができませんでした： [extra_info]</notification>
-	<notification name="TeleportedHomeExperienceRemoved">
-		体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name] リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
-		<form name="form">
-			<ignore name="ignore" text="体験を削除するために、リージョンから追放されました"/>
-		</form>
-	</notification>
-	<notification name="TrustedExperienceEntry">
-		キー体験 secondlife:///app/experience/[public_id]/profile に参加することにより、[region_name] リージョンに入ることを許可されました。この体験を削除すると、このリージョンから追放される可能性があります。
-		<form name="form">
-			<ignore name="ignore" text="体験によりリージョンに入ることを許可されました"/>
-		</form>
-	</notification>
-	<notification name="TrustedExperiencesAvailable">この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます：
+  <notification name="PathfindingCannotRebakeNavmesh">エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作する権限がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
+    <unique />
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
 
-[EXPERIENCE_LIST]
+  <notification name="SeeAvatars">この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル０での通常の文字チャットもブロックされます。
+    <unique />
+  </notification>
 
-その他のキー体験を利用できます。</notification>
-	<notification name="ExperienceEvent">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション ([EventType]) を実行することが許可されました。
-所有者：secondlife:///app/agent/[OwnerID]/inspect
-オブジェクト名：[ObjectName]
-区画名：[ParcelName]</notification>
-	<notification name="ExperienceEventAttachment">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、添付ファイルでアクション ([EventType]) を実行することが許可されました。
-所有者：secondlife:///app/agent/[OwnerID]/inspect</notification>
-	<notification name="ScriptQuestionExperience">
-		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、[GRID_WIDE] 体験への参加を要求しています：
+  <notification name="ScriptsStopped">管理者が、このリージョンのスクリプトを一時停止しました。</notification>
 
-[EXPERIENCE]
+  <notification name="ScriptsNotRunning">このリージョンでは、スクリプトの使用が禁止されています。</notification>
 
-権限が許可されると、体験プロフィールから呼び出さない限り、この体験にこのメッセージが再び表示されることはありません。
+  <notification name="NoOutsideScripts">この土地では、外部スクリプトの実行が無効になっています。
 
-この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます：  
+ここでは、土地所有者に属するスクリプト以外のスクリプトは機能しません。
+    <tag>fail</tag>
+  </notification>
 
-[QUESTIONS] よろしいですか？
-		<form name="form">
-			<button name="BlockExperience" text="体験をブロック"/>
-			<button name="Mute" text="オブジェクトをブロックする"/>
-			<button name="Yes" text="はい"/>
-			<button name="No" text="いいえ"/>
-		</form>
-	</notification>
-	<notification name="ScriptQuestionCaution">
-		警告:オブジェクト '&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;' は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
-  
-そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
-		<form name="form">
-			<button name="Grant" text="トータルアクセスを許可"/>
-			<button name="Deny" text="拒否"/>
-		</form>
-	</notification>
-	<notification name="ScriptDialog">
-		[NAME] の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
-[MESSAGE]
-		<form name="form">
-			<button name="Client_Side_Mute" text="ブロック"/>
-			<button name="Client_Side_Ignore" text="無視"/>
-		</form>
-	</notification>
-	<notification name="ScriptDialogGroup">
-		&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; の 「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」 
-[MESSAGE]
-		<form name="form">
-			<button name="Client_Side_Mute" text="ブロック"/>
-			<button name="Client_Side_Ignore" text="無視"/>
-		</form>
-	</notification>
-	<notification name="BuyLindenDollarSuccess">お支払ありがとうございます。
-
-あなたの L$ 残高は、処理が完了するとアップデートされます。 処理に 20 分以上かかった場合、お取り引きがキャンセルされることがあります。 その場合は、購入金額はあなたの US$ 残高に追加されます。
-
-[http://secondlife.com/account/ マイアカウント] の取引履歴ページで、支払状況を確認できます。</notification>
-	<notification name="FirstOverrideKeys">あなたの移動キーをオブジェクトが操作しています。
-矢印か AWSD のキーで動作を確認してください。
-銃などのオブジェクトだと、一人称視点に変更する必要があります。
-M キーを押して変更します。</notification>
-	<notification name="FirstSandbox">ここはサンドボックスエリアです。住人が制作を学ぶことができます。
+  <notification name="ClaimPublicLand">あなたが所有できるのは、自分がいるリージョン（地域）の公有地のみです。
+    <tag>fail</tag>
+  </notification>
 
-ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、インベントリに入れてお持ち帰りするのをお忘れなく。</notification>
-	<notification name="MaxListSelectMessage">このリストから [MAX_SELECT] 個までのアイテムを選択できます。</notification>
-	<notification name="VoiceInviteP2P">
-		[NAME] があなたをボイスチャットコールに招待しています。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="AutoUnmuteByIM">[NAME] はインスタントメッセージを受け取り、自動的にブロックが解除されました。</notification>
-	<notification name="AutoUnmuteByMoney">[NAME] はお金を受け取り、自動的にブロックが解除されました。</notification>
-	<notification name="AutoUnmuteByInventory">[NAME] はインベントリを受け取り、自動的にブロックが解除されました。</notification>
-	<notification name="VoiceInviteGroup">
-		[NAME] は &lt;nolink&gt;[GROUP]&lt;/nolink&gt; のボイスチャットコールに参加しました。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="VoiceInviteAdHoc">
-		[NAME] は コンファレンスチャットののボイスチャットコールに参加しました。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="InviteAdHoc">
-		[NAME] があなたをコンファレンスチャットに招待しています。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="VoiceChannelFull">あなたが参加しようとしているボイスコール [VOICE_CHANNEL_NAME] は、参加者が最大限に達しました。後でもう一度お試しください。</notification>
-	<notification name="ProximalVoiceChannelFull">このエリアのボイスチャットは、混雑のため容量を超えてしまっています。申し訳ありませんが、他のエリアでボイスチャットをお試しください。</notification>
-	<notification name="VoiceChannelDisconnected">[VOICE_CHANNEL_NAME] への接続が切れました。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="VoiceChannelDisconnectedP2P">[VOICE_CHANNEL_NAME] がコールを終了しました。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="P2PCallDeclined">[VOICE_CHANNEL_NAME] があなたのコールを拒否しました。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="P2PCallNoAnswer">[VOICE_CHANNEL_NAME] はあなたのコールを受けることができません。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="VoiceChannelJoinFailed">[VOICE_CHANNEL_NAME] への接続に失敗しました。あとで再度お試しください。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="VoiceEffectsExpired">ボイスモーフィング効果の1つまたは複数の有効期限が終了しました。
-期限を延長・更新するには [[URL] Click here] をクリックしてください。
+  <notification name="RegionTPAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>fail</tag>
+  </notification>
 
-プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。</notification>
-	<notification name="VoiceEffectsExpiredInUse">ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
-期限を延長・更新するには [[URL] Click here] をクリックしてください。
+  <notification name="URBannedFromRegion">あなたは、このリージョン（地域）への立ち入りが禁止されています。
+    <tag>fail</tag>
+  </notification>
 
-プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。</notification>
-	<notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の1つまたは複数の有効期限が [INTERVAL] 日以内に終了します。
-期限を延長・更新するには [[URL] Click here] をクリックしてください。
+  <notification name="NoTeenGridAccess">お使いのアカウントは、ティーングリッドに接続できません。
+    <tag>fail</tag>
+  </notification>
 
-プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。</notification>
-	<notification name="VoiceEffectsNew">新しいボイスモーフィング効果が登場！</notification>
-	<notification name="Cannot enter parcel: not a group member">特定のグループメンバーのみこのエリアを訪問することができます。</notification>
-	<notification name="Cannot enter parcel: banned">立入禁止されているため、区画に入ることができません。</notification>
-	<notification name="Cannot enter parcel: not on access list">アクセスリストに含まれていないため、区画に入ることができません。</notification>
-	<notification name="VoiceNotAllowed">あなたには [VOICE_CHANNEL_NAME] のボイスチャットに接続する権限がありません。</notification>
-	<notification name="VoiceCallGenericError">[VOICE_CHANNEL_NAME] のボイスチャットに接続中に、エラーが発生しました。後でもう一度お試しください。</notification>
-	<notification name="UnsupportedCommandSLURL">クリックした SLurl はサポートされていません。</notification>
-	<notification name="BlockedSLURL">信用できないブラウザから SLurl が送られてきたので、セキュリティのためブロックされました。</notification>
-	<notification name="ThrottledSLURL">短期間のあいだに、信用できないブラウザから複数の SLurls が送られてきました。
-安全のために数秒間ブロックされます。</notification>
-	<notification name="IMToast">
-		[MESSAGE]
-		<form name="form">
-			<button name="respondbutton" text="返答"/>
-		</form>
-	</notification>
-	<notification name="ConfirmCloseAll">
-		すべての IM を閉じますか？
-		<usetemplate ignoretext="すべての IM を閉じる前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="AttachmentSaved">アタッチメントが保存されました。</notification>
-	<notification name="AppearanceToXMLSaved">外観が XML で [PATH] に保存されました</notification>
-	<notification name="AppearanceToXMLFailed">外観を XML に保存できませんでした。</notification>
-	<notification name="SnapshotToComputerFailed">スナップショットを [PATH] に保存できませんでした:ディスクの空き容量が不足しています。[NEED_MEMORY]KB が必要ですが、[FREE_MEMORY]KB しかありません。</notification>
-	<notification name="SnapshotToLocalDirNotExist">スナップショットを [PATH] に保存できませんでした:ディレクトリは存在しません。</notification>
-	<notification name="PresetNotSaved">プリセット [NAME] の保存エラー。</notification>
-	<notification name="DefaultPresetNotSaved">デフォルトの事前設定を上書きすることはできません。</notification>
-	<notification name="PresetNotDeleted">プリセット [NAME] の削除エラー。</notification>
-	<notification name="UnableToFindHelpTopic">ヘルプトピックが見つかりませんでした。</notification>
-	<notification name="ObjectMediaFailure">
-		サーバーエラー： メディアのアップデートまたは失敗。
-「[ERROR]」
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TextChatIsMutedByModerator">
-		モデレーターがあなたの文字チャットをミュートしました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="VoiceIsMutedByModerator">
-		モデレーターがあなたのボイスをミュートしました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FailedToGetBenefits">
-		残念ながら、このセッションで特典情報を得ることができませんでした。これは通常の本番環境で起こるものではありません。恐れ入りますがサポートまでご連絡ください。このセッションが通常通り作動することはありません。再起動することをお勧めします。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="BulkUploadCostConfirmation">
-		これは [COUNT] アイテムをアップロードします。総費用は L$[COST] です。アップロードを続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="アップロード"/>
-	</notification>
-	<notification name="BulkUploadNoCompatibleFiles">
-		選択されたファイルは一括アップロードできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="BulkUploadIncompatibleFiles">
-		選択されたファイルのいくつかは一括アップロードできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="UploadCostConfirmation">
-		このアップロードは L$[PRICE] のコストがかかります。アップロードを続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="アップロード"/>
-	</notification>
-	<notification name="ConfirmClearTeleportHistory">
-		テレポート履歴を削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="BottomTrayButtonCanNotBeShown">選択したボタンを現在表示することができません。
-じゅうぶんなスペースができればボタンは表示されます。</notification>
-	<notification name="ShareNotification">共有する住人を選択します。</notification>
-	<notification name="MeshUploadErrorDetails">[LABEL] をアップロードできませんでした： [MESSAGE] 
-[DETAILS]詳しくは、SecondLife.log をご覧ください。</notification>
-	<notification name="MeshUploadError">[LABEL] をアップロードできませんでした： [MESSAGE] 
-
-詳しくは、SecondLife.log をご覧ください</notification>
-	<notification name="MeshUploadPermError">メッシュのアップロード許可をリクエスト中にエラーが発生しました。</notification>
-	<notification name="RegionCapabilityRequestError">リージョンの '[CAPABILITY]' という機能を取得できませんでした。</notification>
-	<notification name="ShareItemsConfirmation">
-		次のアイテムを共有しますか？
+  <notification name="ImproperPaymentStatus">このリージョン（地域）に入るための適切な支払い状況がありません。
+    <tag>fail</tag>
+  </notification>
 
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+  <notification name="MustGetAgeRegion">このリージョン（地域）に入るには、１８歳以上である必要があります。
+    <tag>fail</tag>
+  </notification>
 
-次の住人と共有：
+  <notification name="MustGetAgeParcel">この区画に入るには、１８歳以上である必要があります。
+    <tag>fail</tag>
+  </notification>
 
-&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ShareFolderConfirmation">
-		フォルダは一度に 1 つしか共有できません。
+  <notification name="NoDestRegion">目的地のリージョン（地域）が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
 
-次のアイテムを共有しますか？
+  <notification name="NotAllowedInDest">目的地に入る許可がありません。
+    <tag>fail</tag>
+  </notification>
 
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+  <notification name="RegionParcelBan">立入禁止された区画を横断することはできません。別の方法をお試しください。
+    <tag>fail</tag>
+  </notification>
 
-次の住人と共有：
-
-&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
-	</notification>
-	<notification name="ItemsShared">アイテムが共有されました。</notification>
-	<notification name="DeedToGroupFail">グループへの譲渡に失敗しました。</notification>
-	<notification name="ReleaseLandThrottled">区画「[PARCEL_NAME]」は現在放棄できません。</notification>
-	<notification name="ReleasedLandWithReclaim">[AREA] m² の区画「[PARCEL_NAME]」が公開されました。
-
-同区画が他の住人に売り出される前の [RECLAIM_PERIOD] 時間内であれば無償で土地を取り戻すことができます。</notification>
-	<notification name="ReleasedLandNoReclaim">[AREA] m² の区画「[PARCEL_NAME]」が公開されました。
-
-一般に公開されたので、今なら誰でも購入可能です。</notification>
-	<notification name="AvatarRezNotification">（作成後[EXISTENCE]秒経過）
-'[NAME]'というアバターは[TIME]秒後に姿を現わしました。</notification>
-	<notification name="AvatarRezSelfBakedDoneNotification">（作成後[EXISTENCE]秒経過）
-アウトフィットのベークは[TIME]秒後に完了しました。</notification>
-	<notification name="AvatarRezSelfBakedUpdateNotification">（作成後[EXISTENCE]秒経過）
-容姿の更新は[TIME]秒後に送信されました。
-[STATUS]</notification>
-	<notification name="AvatarRezCloudNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」がクラウドになりました。</notification>
-	<notification name="AvatarRezArrivedNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が現れました。</notification>
-	<notification name="AvatarRezLeftCloudNotification">（ [EXISTENCE] 秒）
-アバター「 [NAME] 」が [TIME] 秒でクラウド状態から出現します。</notification>
-	<notification name="AvatarRezEnteredAppearanceNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が容姿編集モードに入りました。</notification>
-	<notification name="AvatarRezLeftAppearanceNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が容姿編集モードを解除しました。</notification>
-	<notification name="NoConnect">
-		[PROTOCOL] [HOSTID]を使って接続できません。
-お使いのネットワークやファイアウォールの設定を確認してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NoVoiceConnect">
-		ボイスサーバーに接続できません： 音声に許可される必要のある 
+  <notification name="TelehubRedirect">テレハブに転送されました。
+    <tag>fail</tag>
+  </notification>
 
-[HOSTID]
+  <notification name="CouldntTPCloser">これ以上目的地に近い場所にテレポートができませんでした。
+    <tag>fail</tag>
+  </notification>
 
-ポート: 
-:TCP:80, 443 
-:UDP:3478, 3479, 5060, 5062, 6250, 12000-32000
+  <notification name="TPCancelled">テレポートがキャンセルされました。</notification>
 
-お使いのネットワークやファイアウォールの設定を確認してください。
-お使いのルーターの SIP ALG 機能をすべて無効にしてください。
+  <notification name="FullRegionTryAgain">入ろうとしているリージョンは現在満員です。
+しばらくしてから再度お試しください。
+    <tag>fail</tag>
+  </notification>
 
-ボイスチャットによるコミュニケーションが利用できません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NoVoiceConnect-GIAB">
-		ボイスサーバーに接続できません。ボイスチャットによるコミュニケーションが利用できません。お使いのネットワークやファイアウォールの設定を確認してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AvatarRezLeftNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が完全に読み込まれました。</notification>
-	<notification name="AvatarRezSelfBakedTextureUploadNotification">( 作成後[EXISTENCE]秒経過）
-'[BODYREGION]'の[RESOLUTION]のベークドテクスチャは[TIME]秒後にアップロードされました。</notification>
-	<notification name="AvatarRezSelfBakedTextureUpdateNotification">( 作成後[EXISTENCE]秒経過）
-'[BODYREGION]'の[RESOLUTION]のベークドテクスチャは[TIME]秒後にローカルに更新されました。</notification>
-	<notification name="CannotUploadTexture">テクスチャをアップロードできません。
-[REASON]</notification>
-	<notification name="LivePreviewUnavailable">
-		コピー不可および/または転送不可のため、このテクスチャを表示できません。
-		<usetemplate ignoretext="コピー不可および/または転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmLeaveCall">
-		このコールから抜けますか？
-		<usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="ConfirmMuteAll">
-		グループコールの参加者全員をミュートしました。
-あとからこのコールに参加する住人も
-ミュートされます。あなたがコールを終了しても他の参加者のミュート状態が続きます。
+  <notification name="GeneralFailure">よくある失敗
+    <tag>fail</tag>
+  </notification>
 
-全員をミュートしますか？
-		<usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="チャット" name="HintChat">チャットに参加するには、画面下のチャットフィールドにテキストを入力します。</notification>
-	<notification label="立ち上がる" name="HintSit">座る姿勢から立ち上がるには、「立ち上がる」ボタンをクリックします。</notification>
-	<notification label="話す" name="HintSpeak">「スピーカー」ボタンをクリックすると、マイクのオン・オフが切り替わります。
+  <notification name="RoutedWrongRegion">異なるリージョンに迂回されました。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
 
-上矢印をクリックすると、ボイスコントロールパネルが表示されます。
+  <notification name="NoValidAgentID">無効なエージェントIDです。
+    <tag>fail</tag>
+  </notification>
 
-「スピーカー」ボタンを非表示にすると、ボイス機能も無効になります。</notification>
-	<notification label="世界を探検" name="HintDestinationGuide">行き先ガイドには数多くの探索場所が含まれます。どこか行き先を決めたら、テレポートして探索に出かけましょう。</notification>
-	<notification label="サイドパネル" name="HintSidePanel">サイドパネルでインベントリ、服、プロフィールなどにすばやくアクセスできます。</notification>
-	<notification label="移動" name="HintMove">歩行や走行は、「移動」パネルを開き、矢印コントロールによって操作します。この操作はキーボードの矢印キーで実行することも可能です。</notification>
-	<notification label="" name="HintMoveClick">1. クリックして歩行
-地面の一箇所をクリックすると、その場所まで歩きます。
-
-2. クリック・ドラッグで視界を回転
-世界の一箇所をクリックしてドラッグすると、視界の向きが変わります。</notification>
-	<notification label="表示名" name="HintDisplayName">表示名（カスタマイズ可能）を設定します。ユーザー名は固有で変更できませんが、ここで追加する表示名は変更可能です。他の住人の名前の表示方法は環境設定で変更してください。</notification>
-	<notification label="表示" name="HintView">カメラの視点を変更するには、水平・垂直コントロールを使います。Escape を押すか、または歩行すると、視点がリセットされます。</notification>
-	<notification label="インベントリ" name="HintInventory">インベントリにはあなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。</notification>
-	<notification label="あなたのリンデンドル" name="HintLindenDollar">これがあなたの L$ 残高です。リンデンドルを購入するには「L$ の購入」をクリックします。</notification>
-	<notification name="LowMemory">メモリプール残量が少なくなっています。クラッシュを避けるため SL の機能の一部は無効になりました。他のアプリケーションを終了し、状況が継続または再発する場合には SL を再起動してください。</notification>
-	<notification name="ForceQuitDueToLowMemory">メモリ不足のため 30 秒以内に SL は終了します。</notification>
-	<notification name="SOCKS_NOT_PERMITTED">
-		ルールセットによって許可されていないため、SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; が接続を拒絶しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_CONNECT_ERROR">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; が接続を拒絶したため、TCP チャンネルを開くことができませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_NOT_ACCEPTABLE">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; は選択された認証システムを拒絶しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_AUTH_FAIL">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; はあなたの資格が無効だと報告しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; は UDP アソシエートのリクエストを拒絶しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_HOST_CONNECT_FAILED">
-		SOCKS 5 プロキシサーバー &quot;[HOST]:[PORT]&quot; に接続できませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_UNKNOWN_STATUS">
-		不明のプロキシエラーがサーバー &quot;[HOST]:[PORT]&quot; で発生しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_INVALID_HOST">
-		SOCKS プロキシのアドレスまたはポート &quot;[HOST]:[PORT]&quot;が無効です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_BAD_CREDS">
-		SOCKS 5 のユーザー名またはパスワードが正しくありません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PROXY_INVALID_HTTP_HOST">
-		HTTP プロキシのアドレスまたはポート &quot;[HOST]:[PORT]&quot;が無効です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PROXY_INVALID_SOCKS_HOST">
-		SOCKS プロキシのアドレスまたはポート &quot;[HOST]:[PORT]&quot;が無効です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChangeProxySettings">
-		プロキシの設定は [APP_NAME] を再起動後に反映されます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AuthRequest">
-		「[REALM]」にある「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;」のサイトにはユーザー名とパスワードが必要です。
-		<form name="form">
-			<input name="username" text="ユーザー名"/>
-			<input name="password" text="パスワード"/>
-			<button name="ok" text="送信"/>
-			<button name="cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="" name="NoClassifieds">
-		クラシファイド広告の作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoGroupInfo">
-		グループの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoPlaceInfo">
-		場所のプロフィールの表示はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoPicks">
-		ピックの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoWorldMap">
-		世界地図の表示はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoVoiceCall">
-		ボイスコールはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoAvatarShare">
-		共有はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoAvatarPay">
-		他の住人への支払いはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoInventory">
-		インベントリの表示はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoAppearance">
-		容姿エディターはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoSearch">
-		検索はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="ConfirmHideUI">
-		この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには [SHORTCUT] をもう一度クリックしてください。
-		<usetemplate ignoretext="UI を非表示にする前に確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられます。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_MismatchOnRestricted">
-		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-続けますか？
-		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されているため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_MismatchOnVolume">
-		選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットは、形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限されているため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットは形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
-		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットの用途タイプは変わりません。
-
-続けますか？
-		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されており、また形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットの用途タイプは変わりません。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限され、また形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
-		選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
-		<usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<global name="UnsupportedGLRequirements">[APP_NAME] に必要なハードウェアがないようです。 [APP_NAME] にはマルチテクスチャをサポートする OpenGL グラフィックカードが必要です。 お使いのグラフィックカードの最新ドライバがインストールされているかどうか、オペレーティングシステムのサービスパックとパッチが入っているかをご確認ください。
-
-この問題が何度も起きる場合は、[SUPPORT_SITE] をご確認ください。</global>
-	<global name="UnsupportedCPUAmount">796</global>
-	<global name="UnsupportedRAMAmount">510</global>
-	<global name="UnsupportedGPU">- あなたのグラフィックカードは必須動作環境の条件を満たしていません。</global>
-	<global name="UnsupportedRAM">- あなたのシステムメモリは必須動作環境の条件を満たしていません。</global>
-	<global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">自分の土地をお持ちの場合、「ホーム」に設定できます。
-お持ちでない場合は、地図で「インフォハブ」をお探しください。</global>
-	<global name="You died and have been teleported to your home location">死んでしまったので、ホームにテレポートされました。</global>
-	<notification name="LocalBitmapsUpdateFileNotFound">[FNAME] は、見つからなかったため、更新できませんでした。
-このファイルに対する今後の更新を無効にします。</notification>
-	<notification name="LocalBitmapsUpdateFailedFinal">[FNAME] を開くまたはデコードする試行に失敗しました（試行回数 [NRETRIES] 回）。そのため、このファイルは壊れているものとして処理されました。
-このファイルに対する今後の更新を無効にします。</notification>
-	<notification name="LocalBitmapsVerifyFail">開くことができない、またはデコードできない無効または読み取り不能な画像ファイル [FNAME] を追加しようとしました。
-この試行はキャンセルされました。</notification>
-	<notification name="PathfindingReturnMultipleItems">
-		[NUM_ITEMS] 個のアイテムを返却中です。続けますか？
-		<usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="PathfindingDeleteMultipleItems">
-		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
-		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AvatarFrozen">[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。</notification>
-	<notification name="AvatarFrozenDuration">[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。</notification>
-	<notification name="YouFrozeAvatar">アバターがフリーズされています。</notification>
-	<notification name="AvatarHasUnFrozenYou">[AV_FREEZER] によってフリーズが解除されています。</notification>
-	<notification name="AvatarUnFrozen">アバターのフリーズが解除されました。</notification>
-	<notification name="AvatarFreezeFailure">その区画の管理権限を持っていないため、フリーズに失敗しました。</notification>
-	<notification name="AvatarFreezeThaw">フリーズ期間が切れました。仕事に戻ってください。</notification>
-	<notification name="AvatarCantFreeze">残念ながら、そのユーザーをフリーズできません。</notification>
-	<notification name="NowOwnObject">これで、オブジェクト [OBJECT_NAME] の所有者になりました</notification>
-	<notification name="CantRezOnLand">この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。</notification>
-	<notification name="RezFailTooManyRequests">リクエストが多すぎて、オブジェクトを Rez することができません。</notification>
-	<notification name="SitFailCantMove">今回移動できなかったため、座ることができません。</notification>
-	<notification name="SitFailNotAllowedOnLand">その土地に対して許可を受けていないため、座ることができません。</notification>
-	<notification name="SitFailNotSameRegion">移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。</notification>
-	<notification name="NoNewObjectRegionFull">新しいオブジェクトを作成できません。リージョンが埋まっています。</notification>
-	<notification name="FailedToPlaceObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。</notification>
-	<notification name="NoOwnNoGardening">所有していない土地に木や草を植えることはできません。</notification>
-	<notification name="NoCopyPermsNoObject">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をコピーする権限がないため、コピーに失敗しました。</notification>
-	<notification name="NoTransPermsNoObject">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; はあなたに譲渡できないため、コピーに失敗しました。</notification>
-	<notification name="AddToNavMeshNoCopy">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; は navmesh に関連があるため、コピーに失敗しました。</notification>
-	<notification name="DupeWithNoRootsSelected">ルートオブジェクトを選択せずに複製します。</notification>
-	<notification name="CantDupeCuzRegionIsFull">リージョンが埋まっているため、オブジェクトのコピーを作成することができません。</notification>
-	<notification name="CantDupeCuzParcelNotFound">オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。</notification>
-	<notification name="CantCreateCuzParcelFull">区画がいっぱいのため、
-オブジェクトを作成できません。</notification>
-	<notification name="RezAttemptFailed">オブジェクトへの Rez の試みに失敗しました。</notification>
-	<notification name="ToxicInvRezAttemptFailed">このリージョンで問題を引き起こすアイテムは作成できません。</notification>
-	<notification name="InvItemIsBlacklisted">その持ち物アイテムはブラックリストに登録されています。</notification>
-	<notification name="NoCanRezObjects">現在あなたにはオブジェクトを作成するための許可がありません。</notification>
-	<notification name="LandSearchBlocked">土地の検索がブロックされました。
-短期間に多くの土地を検索したためです。
-しばらくしてから再度お試しください。</notification>
-	<notification name="NotEnoughResourcesToAttach">オブジェクトの着用に使用できるスクリプトリソースが足りません。</notification>
-	<notification name="YouDiedAndGotTPHome">死んでしまったので、ホームにテレポートされました。</notification>
-	<notification name="EjectComingSoon">ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。</notification>
-	<notification name="SaveBackToInvDisabled">「「持ち物」に保存」が無効になっています。</notification>
-	<notification name="NoExistNoSaveToContents">「存在しません」から rez されたため、&lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をオブジェクトの中身に保存できませんでした。</notification>
-	<notification name="NoModNoSaveToContents">あなたにはオブジェクト &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt; を修正する権限がないため、&lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。</notification>
-	<notification name="NoSaveBackToInvDisabled">&lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をインベントリに保存できません。この操作は無効になりました。</notification>
-	<notification name="NoCopyNoSelCopy">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をコピーする権限がないため、選択内容をコピーできません。</notification>
-	<notification name="NoTransNoSelCopy">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を譲渡できないため、選択内容をコピーできません。</notification>
-	<notification name="NoTransNoCopy">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を譲渡できないため、選択内容をコピーできません。</notification>
-	<notification name="NoPermsNoRemoval">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をシミュレーターから削除することは、権限のシステムにより許可されていません。</notification>
-	<notification name="NoModNoSaveSelection">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を修正する権限がないため、選択内容を保存できません。</notification>
-	<notification name="NoCopyNoSaveSelection">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; はコピー不可なため、選択内容を保存できません。</notification>
-	<notification name="NoModNoTaking">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を修正する権限がないため、選択内容を選ぶことはできません。</notification>
-	<notification name="RezDestInternalError">内部エラー: 不明な宛先タイプ。</notification>
-	<notification name="DeleteFailObjNotFound">オブジェクトが見つからないため削除できませんでした。</notification>
-	<notification name="SorryCantEjectUser">残念ながら、そのユーザーを追放することはできません。</notification>
-	<notification name="RegionSezNotAHome">このリージョンでは、ここにホームの位置を設定できません。</notification>
-	<notification name="HomeLocationLimits">ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。</notification>
-	<notification name="HomePositionSet">家の配置の設定。</notification>
-	<notification name="AvatarEjected">アバターが追放されました。</notification>
-	<notification name="AvatarEjectFailed">その区画の管理権限がないため、追放できませんでした。</notification>
-	<notification name="CMOParcelFull">区画がいっぱいなので、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMOParcelPerms">ご使用のオブジェクトはこの区画で使用が許可されていないため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMOParcelResources">この区画にこのオブジェクトのリソースが不足しているため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="NoParcelPermsNoObject">その区画へのアクセス権がないため、コピーが失敗しました。</notification>
-	<notification name="CMORegionVersion">他の地域（リージョン）でこのオブジェクトの地域（リージョン）をまたがる受け取りに対応していない旧バージョンを実行しているため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMONavMesh">リージョンの境界にわたってナビメッシュを変更できないため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMOWTF">不明な理由により、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。 ([F])</notification>
-	<notification name="NoPermModifyObject">そのオブジェクトを変更する権限がありません</notification>
-	<notification name="TooMuchObjectInventorySelected">
-		大きなインベントリを持つオブジェクトの選択が多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。</notification>
-	<notification name="CantEnablePhysKeyframedObj">キーフレームオブジェクトのために物理を有効にできません。</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">土地のリソースが足りないため、オブジェクトの物理を有効にできません。</notification>
-	<notification name="CantEnablePhysCostTooGreat">[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。</notification>
-	<notification name="PhantomWithConcavePiece">このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。</notification>
-	<notification name="UnableAddItem">アイテムを追加できません!</notification>
-	<notification name="UnableEditItem">これは編集できません!</notification>
-	<notification name="NoPermToEdit">これを編集する許可がありません。</notification>
-	<notification name="NoPermToCopyInventory">そのインベントリをコピーすることは許可されません。</notification>
-	<notification name="CantSaveItemDoesntExist">オブジェクトのコンテンツに保存できません。アイテムが存在していません。</notification>
-	<notification name="CantSaveItemAlreadyExists">オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。</notification>
-	<notification name="CantSaveModifyAttachment">オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。</notification>
-	<notification name="AttachmentHasTooMuchInventory">ご使用のアタッチメントに含まれるインベントリが多すぎるため、インベントリを追加できません。</notification>
-	<notification name="IllegalAttachment">添付ファイルはアバターの存在しない点を要求しました。代わりに胸に添付されていました。</notification>
-	<notification name="TooManyScripts">スクリプトが多すぎます。</notification>
-	<notification name="UnableAddScript">テキストを追加できません!</notification>
-	<notification name="AssetServerTimeoutObjReturn">資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。</notification>
-	<notification name="RegionDisablePhysicsShapes">このリージョンでは、物理的シェイプが有効にされていません。</notification>
-	<notification name="NoModNavmeshAcrossRegions">リージョンの境界をまたぐナビメッシュは変更できません。</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">そのオブジェクトタイプの物理的プロパティを設定できません。</notification>
-	<notification name="NoSetRootPrimWithNoShape">ルートプリムを設定できないため、シェイプがありません。</notification>
-	<notification name="NoRegionSupportPhysMats">このリージョンでは、物理的素材が有効にされていません。</notification>
-	<notification name="OnlyRootPrimPhysMats">物理的素材を調整できるのは、ルートプリムだけです。</notification>
-	<notification name="NoSupportCharacterPhysMats">キャラクターへの物理的素材の設定はまだサポートされていません。</notification>
-	<notification name="InvalidPhysMatProperty">指定した物理的素材のプロパティが 1 つ以上無効です。</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">メッシュオブジェクトの縫い目のタイプを変更することはできません。</notification>
-	<notification name="NoPermsAlterShapeMeshObj">メッシュオブジェクトの形状を変更することはできません</notification>
-	<notification name="FullRegionCantEnter">リージョンが埋まっているため、\nこのリージョンに入場できません。</notification>
-	<notification name="LinkFailedOwnersDiffer">リンクエラー -- 所有者が違います</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。</notification>
-	<notification name="LinkFailedNoPermToEdit">リンクエラー -- 編集権限がありません。</notification>
-	<notification name="LinkFailedTooManyPrims">リンクエラー -- プリミティブが多すぎます。</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">リンクエラー -- コピーなしと転送なしをリンクできません。</notification>
-	<notification name="LinkFailedNothingLinkable">リンクエラー -- リンクできるものがありません。</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">リンクエラー -- パスファインディングの文字数が多すぎます</notification>
-	<notification name="LinkFailedInsufficientLand">リンクエラー -- 土地のリソースが足りません</notification>
-	<notification name="LinkFailedTooMuchPhysics">オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。</notification>
-	<notification name="EstateManagerFailedllTeleportHome">[SLURL] のオブジェクト '[OBJECT_NAME]' で不動産マネージャーのホームをテレポートできません。</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">区画 '[PARCEL_NAME]' のオブジェクト '[OBJECT_NAME]' によって、あなたはホームにテレポートされました。</notification>
-	<notification name="TeleportedHomeByObject">​オブジェクト ​'[OBJECT_NAME]' によって、あなたはホームへテレポートされています。</notification>
-	<notification name="TeleportedByAttachment">
-		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
-		<usetemplate ignoretext="テレポート：アタッチメントによりテレポートされました" name="notifyignore"/>
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		区画 '[PARCEL_NAME]' のオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。
-		<usetemplate ignoretext="テレポート：区画上のオブジェクトによりテレポートされました" name="notifyignore"/>
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">[OWNER_ID] が所有しているオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。</notification>
-	<notification name="TeleportedByObjectUnknownUser">不明なユーザーが所有しているオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。</notification>
-	<notification name="StandDeniedByObject">'[OBJECT_NAME]' はこの時点であなたが立つことを許可しません。</notification>
-	<notification name="ResitDeniedByObject">'[OBJECT_NAME]' はこの時点であなたが席を変更することを許可しません。</notification>
-	<notification name="CantCreateObjectRegionFull">リクエストされたオブジェクトを作成できません。リージョンが埋まっています。</notification>
-	<notification name="CantCreateAnimatedObjectTooLarge">リグ入三角形の限度数を超えるため、リクエストされたアニメーションオブジェクトを作成することができません。</notification>
-	<notification name="CantAttackMultipleObjOneSpot">1 つの場所に複数のオブジェクトを着用することはできません。</notification>
-	<notification name="CantCreateMultipleObjAtLoc">ここでは、複数のオブジェクトを作成することはできません。</notification>
-	<notification name="UnableToCreateObjTimeOut">リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。</notification>
-	<notification name="UnableToCreateObjUnknown">リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。</notification>
-	<notification name="UnableToCreateObjMissingFromDB">要求されたオブジェクトを作成できません。もう一度お試しください。</notification>
-	<notification name="RezFailureTookTooLong">リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。</notification>
-	<notification name="FailedToPlaceObjAtLoc">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。</notification>
-	<notification name="CantCreatePlantsOnLand">この土地に木を植えることはできません。</notification>
-	<notification name="CantRestoreObjectNoWorldPos">オブジェクトをリストアできません。ワールドの位置が見つかりません。</notification>
-	<notification name="CantRezObjectInvalidMeshData">メッシュデータが無効なため、オブジェクトを Rez することができません。</notification>
-	<notification name="CantRezObjectTooManyScripts">このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。</notification>
-	<notification name="CantCreateObjectNoAccess">現在のアクセス権限では、そこにオブジェクトを作成できません。</notification>
-	<notification name="CantCreateObject">現在あなたにはオブジェクト作成する許可がありません。</notification>
-	<notification name="InvalidObjectParams">無効なオブジェクトパラメーター</notification>
-	<notification name="CantDuplicateObjectNoAcess">現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。</notification>
-	<notification name="CantChangeShape">あなたにはこのシェイプを変更する許可がありません。</notification>
-	<notification name="NoPermsTooManyAttachedAnimatedObjects">この操作を行うと、装着されたアニメーションオブジェクトが限度数を超えます。</notification>
-	<notification name="NoPermsLinkAnimatedObjectTooLarge">結果として、アニメーションオブジェクトがリグ入り三角形の限度数を超えるため、これらのオブジェクトを結合できません。</notification>
-	<notification name="NoPermsSetFlagAnimatedObjectTooLarge">リグ入り三角形の限度数を超えるため、このオブジェクトをアニメーションオブジェクトにすることはできません。</notification>
-	<notification name="CantChangeAnimatedObjectStateInsufficientLand">このオブジェクトをアニメーションオブジェクトの状態に変えると、区画の限度数を超えるため変更できません。</notification>
-	<notification name="ErrorNoMeshData">サーバーエラー： メッシュデータが読み込まれていないため、この操作を完了できません。</notification>
-	<notification name="NoAccessToClaimObjects">現在のアクセス権限では、ここにオブジェクトを取得できません。</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。</notification>
-	<notification name="NoPrivsToBuyObject">現在のアクセス権限では、ここでオブジェクトを購入できません。</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">アバターがオブジェクトに存在するため、オブジェクトを着用できません。</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">木や草をアタッチメントとして着用できません。</notification>
-	<notification name="CantAttachGroupOwnedObjs">グループが所有しているオブジェクトは着用できません。</notification>
-	<notification name="CantAttachObjectsNotOwned">所有していないオブジェクトは着用できません。</notification>
-	<notification name="CantAttachNavmeshObjects">ナビメッシュに貢献しているオブジェクトは着用できません。</notification>
-	<notification name="CantAttachObjectNoMovePermissions">あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。</notification>
-	<notification name="CantAttachNotEnoughScriptResources">オブジェクトの着用に使用できるスクリプトリソースが足りません。</notification>
-	<notification name="CantDropItemTrialUser">オブジェクトをここにドロップできません。フリートライアル領域をお試しください。</notification>
-	<notification name="CantDropMeshAttachment">メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。</notification>
-	<notification name="CantDropAttachmentNoPermission">アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。</notification>
-	<notification name="CantDropAttachmentInsufficientResources">利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。</notification>
-	<notification name="CantDropObjectFullParcel">ここにオブジェクトをドロップできません。区画が埋まっています。</notification>
-	<notification name="CantTouchObjectBannedFromParcel">土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。</notification>
-	<notification name="PlzNarrowDeleteParams">削除パラメーターを絞ってください。</notification>
-	<notification name="UnableToUploadAsset">資産をアップロードできません。</notification>
-	<notification name="CantTeleportCouldNotFindUser">ホームをテレポートするユーザーが見つかりませんでした。</notification>
-	<notification name="GodlikeRequestFailed">過剰なリクエストが失敗しました</notification>
-	<notification name="GenericRequestFailed">一般的なリクエストに失敗しました</notification>
-	<notification name="CantUploadPostcard">ポストカードをアップロードできません。後でもう一度お試しください。</notification>
-	<notification name="CantFetchInventoryForGroupNotice">グループ通知のインベントリの詳細を取得できません。</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">グループ通知の送信が許可されないため、送信できません。</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。持ち物を作成することもできません。</notification>
-	<notification name="CantParceInventoryInNotice">通知内の持ち物を検出できません。</notification>
-	<notification name="TerrainUploadFailed">地形のアップロードに失敗しました。</notification>
-	<notification name="TerrainFileWritten">地形ファイルが書き込まれました。</notification>
-	<notification name="TerrainFileWrittenStartingDownload">地形ファイルを書き出し、ダウンロードを開始しています...</notification>
-	<notification name="TerrainBaked">地形がベークされました。</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。</notification>
-	<notification name="UpdateViewerBuyParcel">この区画を購入するには、ビューワをアップデートする必要があります。</notification>
-	<notification name="CantBuyParcelNotForSale">購入することができません。この区画は販売対象ではありません。</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">販売価格または土地の面積が変わったため、購入できません。</notification>
-	<notification name="CantBuyParcelNotAuthorized">あなたはこの区画の委任された買い手ではありません。</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">すでに購入の認証を待機しているため、この区画を購入できません。</notification>
-	<notification name="CantBuildOverflowParcel">区画をオーバーフローするため、ここでオブジェクトを構築することはできません。</notification>
-	<notification name="SelectedMultipleOwnedLand">所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。</notification>
-	<notification name="CantJoinTooFewLeasedParcels">選択範囲のリース区画の数が少ないため、参加できません。</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">土地を分割できません。
-複数の区画が選択されました。
-小さい区画を選択してください。</notification>
-	<notification name="CantDivideLandCantFindParcel">土地を分割できません。
-区画が見つかりません。
-「ヘルプ」 -&gt; 「バグの報告」で報告してください。</notification>
-	<notification name="CantDivideLandWholeParcelSelected">土地を分割できません。区画全体が選択されています。
-小さい区画を選択してください。</notification>
-	<notification name="LandHasBeenDivided">土地が分割されています。</notification>
-	<notification name="PassPurchased">入場許可を購入しました。</notification>
-	<notification name="RegionDisallowsClassifieds">リージョンでは、クラシファイド広告を許可しません。</notification>
-	<notification name="LandPassExpireSoon">この土地への入場許可はまもなく期限が切れます。</notification>
-	<notification name="CantSitNoSuitableSurface">配置に適した表面がありません。別の場所を試してみたください。</notification>
-	<notification name="CantSitNoRoom">ここには座る余地がありません。他の場所を試してください。</notification>
-	<notification name="ClaimObjectFailedNoPermission">権限がないため、オブジェクトを取得できませんでした。</notification>
-	<notification name="ClaimObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの取得に失敗しました。</notification>
-	<notification name="CantDeedGroupLand">グループ所有の土地は、譲渡できません。</notification>
-	<notification name="BuyObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの購入に失敗しました。</notification>
-	<notification name="BuyInventoryFailedNoMoney">リンデンドルが不足しているため、インベントリを購入できませんでした。</notification>
-	<notification name="BuyPassFailedNoMoney">リンデンドルが足りないため、この土地への入場許可を購入できません。</notification>
-	<notification name="CantBuyPassTryAgain">今すぐには入場許可を購入できません。後でもう一度お試しください。</notification>
-	<notification name="CantCreateObjectParcelFull">区画が埋まっているため、オブジェクトを\n作成することができません。</notification>
-	<notification name="FailedPlacingObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。</notification>
-	<notification name="CantCreateLandmarkForEvent">イベントのためのランドマークを作成することができません。</notification>
-	<notification name="GodBeatsFreeze">強力な力でフリーズを解除します。</notification>
-	<notification name="SpecialPowersRequestFailedLogged">特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。</notification>
-	<notification name="ExpireExplanation">システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。</notification>
-	<notification name="DieExplanation">システムは、あなたのリクエストを処理できません。</notification>
-	<notification name="AddPrimitiveFailure">プリミティブ広告を出すには、資金が足りません。</notification>
-	<notification name="RezObjectFailure">資金が足りないため、オブジェクトを作成できません。</notification>
-	<notification name="ResetHomePositionNotLegal">ホームが不正なため、ホームの位置をリセットします。</notification>
-	<notification name="CantInviteRegionFull">リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。</notification>
-	<notification name="CantSetHomeAtRegion">このリージョンでは、ここにホームの位置を設定できません。</notification>
-	<notification name="ListValidHomeLocations">ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。</notification>
-	<notification name="SetHomePosition">家の配置の設定。</notification>
-	<notification name="CantDerezInventoryError">インベントリエラーのため、オブジェクトの Rez 解除ができません。</notification>
-	<notification name="CantCreateRequestedInv">リクエストされたインベントリを作成できません。</notification>
-	<notification name="CantCreateRequestedInvFolder">リクエストされた持ち物フォルダーを作成できません。</notification>
-	<notification name="CantCreateInventory">そのインベントリを作成できません。</notification>
-	<notification name="CantCreateLandmark">ランドマークを作成できません。</notification>
-	<notification name="CantCreateOutfit">アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。</notification>
-	<notification name="InventoryNotForSale">インベントリは販売対象ではありません。</notification>
-	<notification name="CantFindInvItem">持ち物アイテムを見つけることができません。</notification>
-	<notification name="CantFindObject">オブジェクトが見つかりません。</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">オブジェクトへの送金は、このリージョンでは現在無効にされています。</notification>
-	<notification name="DroppedMoneyTransferRequest">システムロードにより、支払いを実行できません。</notification>
-	<notification name="CantPayNoAgent">支払いの相手を把握できませんでした。</notification>
-	<notification name="CantDonateToPublicObjects">パブリックオブジェクトにリンデンドルを与えることはできません。</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">インワールドオブジェクトでのインベントリ作成に失敗しました。</notification>
-	<notification name="UserBalanceOrLandUsageError">内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。</notification>
-	<notification name="LargePrimAgentIntersect">他の住民と交差する大きなプリムを作成することはできません。他の住民が移動した場合は再度お試しください。</notification>
-	<notification name="PreferenceChatClearLog">
-		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
-		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
-		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		ファイルを移動できません。以前のパスがリストアされました。
-		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="DefaultObjectPermissions">
-		デフォルトのオブジェクト権限を保存するときに問題が発生しました: [REASON]。後でデフォルトの権限を設定してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChatHistoryIsBusyAlert">
-		チャット履歴ファイルが前の操作でビジーです。2、3 分経ってからもう一度試すか、別の人とのチャットを選択してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OutfitPhotoLoadError">
-		[REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FailedToFindSettings">データベースから [NAME] の設定の読み込みができませんでした。</notification>
-	<notification name="FailedToLoadSettingsApply">環境にこれらの設定を適用することができません。</notification>
-	<notification name="FailedToBuildSettingsDay">環境にこれらの設定を適用することができません。</notification>
-	<notification name="NoEnvironmentSettings">このリージョンは環境設定をサポートしていません。</notification>
-	<notification label="アウトフィットを保存する" name="SaveSettingAs">
-		現在の環境設定を次の内容で保存する：
-		<form name="form">
-			<input name="message">[DESC] （新）</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification name="WLImportFail">[FILE] から過去のウインドライトの設定 [NAME] をインポートできません。 
-
-[REASONS]</notification>
-	<notification name="WLParcelApplyFail">この区画で環境を設定することはできません。
-変更する権限のある区画を入力または選択してください。</notification>
-	<notification name="SettingsUnsuported">このリージョンでは設定をサポートしていません。
-設定に対応しているリージョンに移動し、アクションを再試行してください。</notification>
-	<notification name="SettingsConfirmLoss">
-		&quot;[NAME]&quot;と名付けられたこの [TYPE] に加えられた変更が失われます。
-続けますか？
-		<usetemplate ignoretext="変更を失いますがよろしいですか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="SettingsConfirmReset">
-		適用されたすべての設定を削除しようとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="PersonalSettingsConfirmReset">
-		適用されたすべての個人的な照明の設定を削除しようとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="SettingsMakeNoTrans">
-		このデイサイクルに移行不可の設定をインポートしようとしています。このまま続けると、編集中の設定も移行不可になります。
+  <notification name="NoValidSession">無効なセッションIDです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoValidCircuit">無効な回路コードです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPendingConnection">接続を生成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InternalUsherError">エージェント案内に接続時に、内部エラーが発生しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoGoodTPDestination">このリージョン（地域）では、適切なテレポート目的地が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InternalErrorRegionResolver">リージョンリゾルバーを有効化しようとしたときに内部エラーが発生しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoValidLanding">有効な着地点が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoValidParcel">有効な区画が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ObjectGiveItem">[NAME_SLURL]が所有する&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;という名前のオブジェクトが、あなたに[OBJECTTYPE]を渡しました：
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+    <form name="form">
+      <button name="Keep" text="受け取る" />
+      <button name="Discard" text="破棄" />
+      <button name="Mute" text="所有者をブロック" />
+    </form>
+  </notification>
+
+  <notification name="OwnObjectGiveItem">オブジェクト「&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;」が、あなたに[OBJECTTYPE]を渡しました：
+
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+    <form name="form">
+      <button name="Keep" text="キープ" />
+      <button name="Discard" text="処分する" />
+    </form>
+  </notification>
+
+  <notification name="UserGiveItem">[NAME_SLURL] が、あなたに[OBJECTTYPE]を渡しました：
+[ITEM_SLURL]
+    <form name="form">
+      <button name="Show" text="表示" />
+      <button name="Discard" text="破棄" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="GodMessage">[NAME]
+
+[MESSAGE]</notification>
+
+  <notification name="JoinGroup">[MESSAGE]
+    <tag>group</tag>
+    <form name="form">
+      <button name="Join" text="参加" />
+      <button name="Decline" text="辞退" />
+      <button name="Info" text="情報" />
+    </form>
+  </notification>
+
+  <notification name="TeleportOffered">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Teleport" text="テレポート" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TeleportOffered_MaturityExceeded">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
+
+このリージョン（地域）には[REGION_CONTENT_MATURITY]コンテンツが含まれていますが、現在の初期設定は[REGION_CONTENT_MATURITY]コンテンツを除外するように設定されています。初期設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Teleport" text="変更して続ける" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+  <notification name="TeleportOffered_MaturityBlocked">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
+
+ただし、このリージョン（地域）には成人のみアクセスできるコンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportOfferSent">[TO_NAME]にテレポートを送りました。</notification>
+
+  <notification name="TeleportRequest">[NAME_SLURL]は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+テレポートのオファーを受けますか？
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Yes" text="はい"/>
+      <button name="No" text="いいえ"/>
+    </form>
+  </notification>
+
+  <notification name="GotoURL">
+[MESSAGE]
+[URL]
+    <form name="form">
+      <button name="Later" text="あとで" />
+      <button name="GoNow..." text="今すぐ行く…" />
+    </form>
+  </notification>
+
+  <notification name="OfferFriendship">[NAME_SLURL] は、あなたにフレンド登録を申し込んでいます。
+
+[MESSAGE]
+
+（デフォルト設定だとお互いのオンライン状態を見ることができます）
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="断る" />
+    </form>
+  </notification>
+
+  <notification name="FriendshipOffered">[TO_NAME]にフレンド登録依頼を送りました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="OfferFriendshipNoMessage">[NAME_SLURL] は、フレンド登録を申し込んでいます。（デフォルト設定だとお互いのオンライン状態を見ることができます）
+    <tag>friendship</tag>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="断る" />
+    </form>
+  </notification>
+
+  <notification name="FriendshipAccepted">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を受け入れました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="FriendshipDeclined">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を断りました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="FriendshipAcceptedByMe">フレンドの登録依頼を受け入れました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="FriendshipDeclinedByMe">フレンドの登録依頼を断りました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="OfferCallingCard">[NAME]が、コーリングカードを渡そうとしています。
+あなたのインベントリにブックマークが追加され、この住人に素早くＩＭを送ることができます。
+    <tag>friendship</tag>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="辞退" />
+    </form>
+  </notification>
+
+  <notification name="RegionRestartMinutes">このリージョン「[NAME]」は、[SECONDS]分後に再起動されます。
+このまま、このリージョンに留まっているとログアウトされます。</notification>
+
+  <notification name="RegionRestartSeconds">このリージョン「[NAME]」は、[SECONDS]秒後に再起動されます。
+このまま、このリージョンに留まっているとログアウトされます。</notification>
+
+  <notification name="LoadWebPage">のWebページ[URL] を開きますか？
+
+[MESSAGE]
+
+送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;　所有者：[NAME_SLURL]
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Gotopage" text="ページに移動" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="FailedToFindWearableUnnamed">データベースに[TYPE]は見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToFindWearable">データベースに[DESC]という名前の[TYPE]は見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidWearable">着用しようとしているアイテムはあなたのビューアーでは読み込むことができません。[APP_NAME]のバージョンをアップグレードしてからこのアイテムを着用してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ScriptQuestion">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、次のことをしようとしています：
+
+[QUESTIONS]
+よろしいですか？ 
+    <tag>fail</tag>
+    <form name="form">
+      <button name="Yes" text="はい" />
+      <button name="No" text="いいえ" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="ExperienceAcquireFailed">新しい体験を取得できません：
+[ERROR_MESSAGE]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NotInGroupExperienceProfileMessage">所有者が選択されたグループのメンバーでないため、体験グループへの変更が無視されました。</notification>
+
+  <notification name="UneditableExperienceProfileMessage">体験プロフィールを更新するときに、編集不可の「[field]」フィールドが無視されました。</notification>
+
+  <notification name="RestrictedToOwnerExperienceProfileMessage">体験の所有者のみが設定できる「[field]」フィールドへの変更を無視しました。</notification>
+
+  <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">所有者のレーティング区分より高いレーティング区分の体験を設定できません。</notification>
+
+  <notification name="RestrictedTermExperienceProfileMessage">次の条件により、体験プロフィール名および説明の更新ができませんでした：[extra_info]</notification>
+
+  <notification name="TeleportedHomeExperienceRemoved">体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name]リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
+    <form name="form">
+      <ignore name="ignore" text="体験を削除するために、リージョンから追放されました" />
+    </form>
+  </notification>
+
+  <notification name="TrustedExperienceEntry">キー体験 secondlife:///app/experience/[public_id]/profile に参加することにより、[region_name]リージョンに入ることを許可されました。
+この体験を削除すると、このリージョンから追放される可能性があります。
+    <form name="form">
+      <ignore name="ignore" text="体験によりリージョンに入ることを許可されました" />
+    </form>
+  </notification>
+
+  <notification name="TrustedExperiencesAvailable">この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます：
+[EXPERIENCE_LIST]
+
+その他のキー体験を利用できます。</notification>
+
+  <notification name="ExperienceEvent">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション（[EventType]）を実行することが許可されました。
+所有者：secondlife:///app/agent/[OwnerID]/inspect
+オブジェクト名：[ObjectName]
+区画名：[ParcelName]</notification>
+
+  <notification name="ExperienceEventAttachment">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、添付ファイルでアクション（[EventType]）を実行することが許可されました。
+所有者：secondlife:///app/agent/[OwnerID]/inspect</notification>
+
+  <notification name="ScriptQuestionExperience">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、[GRID_WIDE]体験への参加を要求しています：
+[EXPERIENCE]権限が許可されると、体験プロフィールから呼び出さない限り、この体験にこのメッセージが再び表示されることはありません。
+この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます：
+[QUESTIONS]
+よろしいですか？
+    <unique combine="combine_with_new">
+      <context>experience</context>
+    </unique>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="BlockExperience" text="体験をブロック" />
+      <button name="Mute" text="オブジェクトをブロックする" />
+      <button name="Yes" text="はい" />
+      <button name="No" text="いいえ" />
+    </form>
+  </notification>
+
+  <notification name="ScriptQuestionCaution">警告：オブジェクト「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」は、あなたのリンデンドルアカウントへの完全なアクセスを求めています。アクセスを許可すると、追加の警告なしで、いつでもアカウントから資金が削除されたり、アカウントが完全に空になったりする可能性があります。
+  
+アカウントへのアクセスが必要な理由が十分に理解できない場合は、アクセスを許可しないでください。
+
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Grant" text="トータルアクセスを許可" />
+      <button name="Deny" text="拒否" />
+    </form>
+    <footer>[FOOTERTEXT]</footer>
+  </notification>
+
+  <notification name="ScriptDialog">[NAME]の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
+[MESSAGE]
+    <form name="form">
+      <button name="Client_Side_Mute" text="ブロック" />
+      <button name="Client_Side_Ignore" text="無視" />
+    </form>
+  </notification>
+
+  <notification name="ScriptDialogGroup">&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
+[MESSAGE] 
+    <tag>group</tag>
+    <form name="form">
+      <button name="Client_Side_Mute" text="ブロック" />
+      <button name="Client_Side_Ignore" text="無視" />
+    </form>
+  </notification>
+
+  <!--
+  <notification name="FirstBalanceIncrease"">
+   <tag>win</tag>
+You just received L$[AMOUNT].
+Your L$ balance is shown in the upper-right.
+  </notification>
+
+  <notification name="FirstBalanceDecrease">
+You just paid L$[AMOUNT].
+Your L$ balance is shown in the upper-right.
+  </notification>
+-->
+
+  <notification name="BuyLindenDollarSuccess">お支払ありがとうございます。
+
+あなたのL$残高は、処理が完了するとアップデートされます。処理に２０分以上かかった場合、お取り引きがキャンセルされることがあります。その場合は、購入金額はあなたの US$残高に追加されます。
+
+[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]の取引履歴ページで、支払状況を確認できます。
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="FirstOverrideKeys">あなたの移動キーをオブジェクトが操作しています。
+矢印かAWSDのキーで動作を確認してください。
+銃などのオブジェクトだと、一人称視点に変更する必要があります。
+「M」キーを押して変更します。</notification>
+
+  <notification name="FirstSandbox">ここはサンドボックスエリアです。住人が制作を学ぶことができます。
+ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、インベントリに入れてお持ち帰りするのをお忘れなく。</notification>
+
+  <notification name="MaxListSelectMessage">このリストから[MAX_SELECT]個までのアイテムを選択できます。</notification>
+
+  <notification name="VoiceInviteP2P">[NAME]があなたをボイスチャットコールに招待しています。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>NAME</context>
+    </unique>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="AutoUnmuteByIM">[NAME]はインスタントメッセージを受け取り、自動的にブロックが解除されました。</notification>
+
+  <notification name="AutoUnmuteByMoney">[NAME]はお金を受け取り、自動的にブロックが解除されました。</notification>
+
+  <notification name="AutoUnmuteByInventory">[NAME]はインベントリを受け取り、自動的にブロックが解除されました。</notification>
+
+  <notification name="VoiceInviteGroup">[NAME]は &lt;nolink&gt;[GROUP]&lt;/nolink&gt;のボイスチャットコールに参加しました。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>NAME</context>
+      <context>GROUP</context>
+    </unique>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="VoiceInviteAdHoc">[NAME]は、会話チャットでボイスチャットコールに参加しました。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="InviteAdHoc">[NAME]があなたを会話チャットに招待しています。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>NAME</context>
+    </unique>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="VoiceChannelFull">あなたが参加しようとしているボイスコール[VOICE_CHANNEL_NAME]は、参加者が最大限に達しました。後でもう一度お試しください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="ProximalVoiceChannelFull">
+このエリアのボイスチャットは、混雑のため容量を超えてしまっています。申し訳ありませんが、他のエリアでボイスチャットをお試しください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceChannelDisconnected">[VOICE_CHANNEL_NAME]への接続が切れました。
+「近隣のボイスチャット」に再接続されます。
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceChannelDisconnectedP2P">[VOICE_CHANNEL_NAME]がコールを終了しました。
+「近隣のボイスチャット」に再接続されます。
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="P2PCallDeclined">[VOICE_CHANNEL_NAME]があなたのコールを拒否しました。
+「近隣のボイスチャット」に再接続されます。
+    <tag>voice</tag>
+    <tag>fail</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="P2PCallNoAnswer">[VOICE_CHANNEL_NAME]はあなたのコールを受けることができません。
+「近隣のボイスチャット」に再接続されます。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceChannelJoinFailed">[VOICE_CHANNEL_NAME]への接続に失敗しました。あとで再度お試しください。
+「近隣のボイスチャット」に再接続されます。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceEffectsExpired">ボイスモーフィング効果の１つ、または複数の有効期限が終了しました。
+期限を延長・更新するには [[URL] Click here] をクリックしてください。
+
+プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceEffectsExpiredInUse">ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
+期限を延長・更新するには[[URL] ここ]をクリックしてください。
+
+プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の１つ、または複数の有効期限が[INTERVAL]日以内に終了します。
+期限を延長・更新するには[[URL] ここ]をクリックしてください。
+
+プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceEffectsNew">新しいボイスモーフィング効果が登場！
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: not a group member">特定のグループメンバーのみこのエリアを訪問することができます。
+    <tag>fail</tag>
+    <tag>group</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: banned">立入禁止されているため、この区画に入ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: not on access list">アクセスリストに含まれていないため、この区画に入ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="VoiceNotAllowed">あなたには[VOICE_CHANNEL_NAME]のボイスチャットに接続する権限がありません。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceCallGenericError">[VOICE_CHANNEL_NAME]のボイスチャットに接続中に、エラーが発生しました。後でもう一度お試しください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="UnsupportedCommandSLURL">クリックしたSLurlはサポートされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BlockedSLURL">信用できないブラウザからSLurlが送られてきたので、セキュリティのためブロックされました。
+    <tag>security</tag>
+  </notification>
+
+  <notification name="ThrottledSLURL">短期間のあいだに、信用できないブラウザから複数のSLurlが送られてきました。
+安全のために数秒間ブロックされます。</notification>
+  <notification name="IMToast">[MESSAGE]
+    <tag>security</tag>
+    <form name="form">
+      <button name="respondbutton" text="返答" />
+    </form>
+  </notification>
+
+  <notification name="ConfirmCloseAll">すべてのＩＭを閉じますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="すべてのＩＭを閉じる前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AttachmentSaved">装着物が保存されました。</notification>
+
+  <notification name="AppearanceToXMLSaved">外観がXML[PATH]に保存されました</notification>
+
+  <notification name="AppearanceToXMLFailed">外観をXMLに保存できませんでした。</notification>
+
+  <notification name="SnapshotToComputerFailed">スナップショットを[PATH]に保存できませんでした：ディスクの空き容量が不足しています。
+[NEED_MEMORY]㎅が必要ですが、[FREE_MEMORY]㎅しかありません。</notification>
+
+  <notification name="SnapshotToLocalDirNotExist">スナップショットを[PATH]に保存できませんでした：ディレクトリは存在しません。</notification>
+
+  <notification name="PresetNotSaved">プリセット[NAME]の保存時にエラーが発生しました。</notification>
+
+  <notification name="DefaultPresetNotSaved">デフォルトのプリセットを上書きすることはできません。</notification>
+
+  <notification name="PresetAlreadyExists">「[NAME]」は使用中です。
+このプリセットを置き換えるか、別の名前を選択することができます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="PresetNotDeleted">プリセット[NAME]の削除時にエラーが発生しました。</notification>
+
+  <notification name="UnableToFindHelpTopic">ヘルプトピックが見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ObjectMediaFailure">サーバーエラー：メディアの更新に失敗しました。
+[ERROR]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TextChatIsMutedByModerator">モデレーターがあなたの文字チャットをミュートしました。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="VoiceIsMutedByModerator">モデレーターがあなたのボイスをミュートしました。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FailedToGetBenefits">残念ながら、このセッションで特典情報を得ることができませんでした。これは通常の本番環境で起こるものではありません。
+恐れ入りますがサポートまでご連絡ください。このセッションが通常通り作動することはありません。再起動することをお勧めします。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BulkUploadCostConfirmation">[COUNT]個アイテムを一括アップロードします。総費用はL$ [COST]です。アップロードを続けてもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード" />
+  </notification>
+
+  <notification name="BulkUploadNoCompatibleFiles">選択されたファイルは一括アップロードできません。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BulkUploadIncompatibleFiles">選択されたファイルのいくつかは一括アップロードできません。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="UploadCostConfirmation">このアップロードは L$ [PRICE]の費用がかかります。このままアップロードを続けてもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード" />
+  </notification>
+
+  <notification name="ConfirmClearTeleportHistory">テレポート履歴を削除しますか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BottomTrayButtonCanNotBeShown">選択したボタンを現在表示することができません。
+十分なスペースができればボタンは表示されます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ShareNotification">共有する住人を選択します。</notification>
+
+  <notification name="MeshUploadErrorDetails">[LABEL]をアップロードできませんでした：[MESSAGE]
+[DETAILS]
+詳しくは、SecondLife.logをご覧ください。</notification>
+
+  <notification name="MeshUploadError">[LABEL]をアップロードできませんでした：[MESSAGE]
+
+詳しくは、SecondLife.logをご覧ください</notification>
+
+  <notification name="MeshUploadPermError">メッシュのアップロード許可をリクエスト中にエラーが発生しました。</notification>
+
+  <notification name="RegionCapabilityRequestError">リージョンの「[CAPABILITY]」という機能を取得できませんでした。</notification>
+
+  <notification name="ShareItemsConfirmation">次のアイテムを共有しますか？
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+次の住人と共有：&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ShareFolderConfirmation">フォルダは一度に１つしか共有できません。
+  
+次のアイテムを共有しますか？
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+次の住人と共有：&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Ok" />
+  </notification>
+
+  <notification name="ItemsShared">アイテムが共有されました。</notification>
+  <notification name="DeedToGroupFail">グループへの譲渡に失敗しました。
+    <tag>group</tag>
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleaseLandThrottled">区画「[PARCEL_NAME]」は現在放棄できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleasedLandWithReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
+
+同区画が他の住人に売り出される前の[RECLAIM_PERIOD]時間内であれば、無償で土地を取り戻すことができます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleasedLandNoReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
+一般に公開されたので、今なら誰でも購入可能です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarRezNotification">（作成後[EXISTENCE]秒経過）
+「[NAME]」というアバターは、[TIME]秒後に姿を現わします。</notification>
+
+  <notification name="AvatarRezSelfBakedDoneNotification">（作成後[EXISTENCE]秒経過）
+アウトフィットのベークは、[TIME]秒後に完了します。</notification>
+
+  <notification name="AvatarRezSelfBakedUpdateNotification">（作成後[EXISTENCE]秒経過）
+容姿の更新は、[TIME]秒後に送信されます。
+[STATUS]</notification>
+  <notification name="AvatarRezCloudNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、クラウドになります。</notification>
+
+  <notification name="AvatarRezArrivedNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、現れます。</notification>
+
+  <notification name="AvatarRezLeftCloudNotification">（[EXISTENCE]秒）
+アバター「[NAME]」は、[TIME]秒でクラウド状態から出現します。</notification>
+
+  <notification name="AvatarRezEnteredAppearanceNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、容姿編集モードに入りました。</notification>
+
+  <notification name="AvatarRezLeftAppearanceNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、容姿編集モードを解除しました。</notification>
+
+  <notification name="NoConnect">[PROTOCOL] [HOSTID]を使って接続できません。
+お使いのネットワークやファイアウォールの設定を確認してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NoVoiceConnect">ボイスサーバーに接続できません：
+
+[ホストID]
+
+音声に対して許可する必要があるポートは次のとおりです。
+TCP： 80, 443
+UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
+
+ネットワークとファイアウォールの設定を確認してください。
+ルーターの SIP ALG 機能を無効にします。
+
+音声通話は利用できなくなります。
+    <tag>voice</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NoVoiceConnect-GIAB">ボイスサーバーに接続できません。
+  
+ボイスチャットによるコミュニケーションが利用できません。
+お使いのネットワークやファイアウォールの設定を確認してください。
+    <tag>voice</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AvatarRezLeftNotification">（[EXISTENCE]秒経過）
+アバター「[NAME]」は、完全に読み込まれています。</notification>
+
+  <notification name="AvatarRezSelfBakedTextureUploadNotification">（[EXISTENCE]秒経過）
+[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、アップロードされます。</notification>
+
+  <notification name="AvatarRezSelfBakedTextureUpdateNotification">（[EXISTENCE]秒経過）
+[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、ローカル反映されます。</notification>
+
+  <notification name="CannotUploadTexture">テクスチャをアップロードできません。
+[REASON]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LivePreviewUnavailable">コピー不可／転送不可のため、このテクスチャを表示できません。
+    <usetemplate ignoretext="コピー不可／転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FacePasteFailed">ペーストに失敗しました：[REASON]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="FacePasteTexturePermissions">アクセス許可が制限されたテクスチャを適用したため、オブジェクトはテクスチャの持つアクセス制限を継承します。
+    <usetemplate ignoretext="ペースト：権限が制限されているテクスチャを適用した。" name="notifyignore"/>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="ConfirmLeaveCall">このコールから抜けてもよろしいですか？
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="ConfirmMuteAll">グループコールの参加者全員をミュートしました。
+あとからこのコールに参加する住人もミュートされます。
+あなたがコールを終了しても他の参加者のミュート状態が続きます。
+
+全員をミュートしますか？
+    <unique />
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="チャット" name="HintChat">チャットに参加するには、画面下のチャットフィールドにテキストを入力します。
+    <unique />
+  </notification>
+
+  <notification label="立ち上がる" name="HintSit">座る姿勢から立ち上がるには、「立ち上がる」ボタンをクリックします。
+    <unique />
+  </notification>
+
+  <notification label="話す" name="HintSpeak">「スピーカー」ボタンをクリックすると、マイクのオン・オフが切り替わります。
+
+上矢印をクリックすると、ボイスコントロールパネルが表示されます。
+
+「スピーカー」ボタンを非表示にすると、ボイス機能も無効になります。
+    <unique />
+  </notification>
+
+  <notification label="世界を探検" name="HintDestinationGuide">行き先ガイドには数多くの探索場所が含まれます。どこか行きたい場所をみつけたら、テレポートして探索に出かけましょう。
+    <unique />
+  </notification>
+
+  <notification label="サイドパネル" name="HintSidePanel">サイドパネルから、インベントリや服装、プロフィールなどに素早くアクセスできます。
+    <unique />
+  </notification>
+
+  <notification label="移動" name="HintMove">歩行や走行は、「移動」パネルを開き、矢印コントロールによって操作します。この操作はキーボードの矢印キーで実行することも可能です。
+    <unique />
+  </notification>
+
+  <notification label="" name="HintMoveClick">⒈クリックで移動
+行地面の一箇所をクリックすると、その場所まで歩きます。
+
+⒉クリック・ドラッグで視界を回転
+任意の場所をクリックしてドラッグすると視界を回転させることができます。
+    <tag>custom_skin</tag>
+  </notification>
+
+  <notification label="表示名" name="HintDisplayName">表示名（カスタマイズ可能）を設定します。ユーザー名は固有で変更できませんが、ここで追加する表示名は変更可能です。他の住人の名前の表示方法は初期設定で変更してください。
+    <unique />
+  </notification>
+
+  <notification label="表示" name="HintView">カメラの視点を変更するには、水平・垂直コントロールを使います。Escキーを押すか、移動キーを押すると、視点がリセットされます。
+    <unique />
+    <tag>custom_skin</tag>
+  </notification>
+
+  <notification label="インベントリ" name="HintInventory">インベントリには、あなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。
+    <unique />
+  </notification>
+
+  <notification label="あなたのリンデンドル" name="HintLindenDollar">これがあなたのL$残高です。リンデンドルを購入するには「L$の購入」をクリックします。
+    <unique />
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="LowMemory">メモリプール残量が少なくなっています。クラッシュを避けるため[APP_NAME]の機能の一部は無効になりました。他のアプリケーションを終了し、状況が継続または再発する場合にはSecond Lifeを再起動してください。</notification>
+
+  <notification name="ForceQuitDueToLowMemory">メモリ不足のため３０秒以内に[APP_NAME]は終了します。</notification>
+
+  <notification name="SOCKS_NOT_PERMITTED">ルールセットによって許可されていないため、SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;が接続を拒絶しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_CONNECT_ERROR">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot; が接続を拒絶したため、TCPチャンネルを開くことができませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_NOT_ACCEPTABLE">OCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、選択された認証システムを拒絶しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_AUTH_FAIL">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、あなたの資格が無効だと報告しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_UDP_FWD_NOT_GRANTED">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、UDPアソシエートのリクエストを拒絶しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_HOST_CONNECT_FAILED">SOCKS 5プロキシサーバー&quot;[HOST]:[PORT]&quot;に接続できませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_UNKNOWN_STATUS">不明のプロキシエラーがサーバー&quot;[HOST]:[PORT]&quot;で発生しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_INVALID_HOST">SOCKS 5プロキシのアドレスまたはポート&quot;[HOST]:[PORT]&quot;が無効です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_BAD_CREDS">SOCKS 5 のユーザー名またはパスワードが正しくありません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PROXY_INVALID_HTTP_HOST">HTTP プロキシのアドレス、またはポート &quot;[HOST]:[PORT]&quot;が無効です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PROXY_INVALID_SOCKS_HOST">SOCKS プロキシのアドレス、またはポート&quot;[HOST]:[PORT]&quot;が無効です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChangeProxySettings">プロキシの設定は[APP_NAME]を再起動後に反映されます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AuthRequest">「[REALM]」にある「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;」のサイトには、ユーザー名とパスワードが必要です。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="username" text="ユーザー名" />
+      <input name="password" text="パスワード" />
+      <button name="ok" text="送信" />
+      <button name="cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="" name="NoClassifieds">クラシファイド広告の作成と編集は、拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoGroupInfo">グループの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoPlaceInfo">場所のプロフィールの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoPicks">ピックの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoWorldMap">ワールドマップの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoVoiceCall">ボイスコールは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoAvatarShare">共有は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoAvatarPay">他の住人への支払いは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoInventory">インベントリの表示は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoAppearance">容姿エディターは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoSearch">検索は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="ConfirmHideUI">この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには、[SHORTCUT]をもう一度クリックしてください。
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ＵＩを非表示前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom">選択された一部のリンクセットはファントムフラグが切り替えられます。
+  
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットのファントムフラグの切替えができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_MismatchOnRestricted">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」 に設定されます。
+  
+続けてもよろしいですか？
+    <tag>confirm</tag>？
+    <usetemplate ignoretext="リンクセットの権限制限のため変更ができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_MismatchOnVolume">選択された一部のリンクセットは、形状が凸状でないため「[REQUESTED_TYPE]」に設定できません。
+  
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの形状が凸状でないため変更できなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">選択された一部のリンクセットはファントムフラグが切り替えられます。
+  
+一部の選択されたリンクセットは、リンクセットへの権限が制限されているため「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部のファントムフラグの設定ができたが、権限設定できなかったものがあった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
+  
+選択された一部のリンクセットは、形状が凸状でないため「[REQUESTED_TYPE]」に設定できません。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部のファントムフラグは切り替えられたが、他のリンクセットは形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため「[REQUESTED_TYPE]」に設定できません。
+
+これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。選択された一部のリンクセットは、形状が凸状でないため、「[REQUESTED_TYPE]」に設定できません。
+
+これらのリンクセットの用途タイプは変わりません。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部の権限が制限されており、また形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
+
+一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。
+
+選択された一部のリンクセットは、形状が凸状でないため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットの用途タイプは変わりません。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部のファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限され、また形状が凸状でないため設定できません。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_ChangeToFlexiblePath">選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <global name="UnsupportedGLRequirements">[APP_NAME]の動作に必要なハードウェア要件を満たしていないようです。[APP_NAME]にはマルチテクスチャをサポートするOpenGLグラフィックカードが必要です。
+お使いのグラフィックカードの最新ドライバがインストールされているか、もしくは、オペレーティングシステムに最新のサービスパックやパッチが当たっているかをご確認ください。
+
+この問題が何度も起きる場合は、[SUPPORT_SITE]をご確認ください。</global>
+  <global name="UnsupportedCPUAmount">796</global>
+
+  <global name="UnsupportedRAMAmount">510</global>
+
+  <global name="UnsupportedGPU">－あなたのグラフィックカードは、必須動作環境の条件を満たしていません。</global>
+
+  <global name="UnsupportedRAM">－あなたのシステムメモリは、必須動作環境の条件を満たしていません。</global>
+
+  <global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">自分の土地を持っている場合、そこを「ホーム」に設定できます。持っていない場合は、マップから「情報ハブ」をお探しください。</global>
+
+  <global name="You died and have been teleported to your home location">死んでしまったので、ホームにテレポートされました。</global>
+
+  <notification name="LocalBitmapsUpdateFileNotFound">[FNAME]が見つからなかったため、更新できませんでした。
+このファイルに対する今後の更新を無効にします。</notification>
+
+  <notification name="LocalBitmapsUpdateFailedFinal">[FNAME]は、[NRETRIES]回の試行で開くこともデコードすることもできなかったため、壊れているとみなしました。
+このファイルに対する今後の更新を無効にします。</notification>
+
+  <notification name="LocalBitmapsVerifyFail">開いたりデコードすることができない、無効である、もしくは読み取り不能な画像ファイル「[FNAME]」を追加しようとしました。
+この試行はキャンセルされました。</notification>
+
+  <notification name="PathfindingReturnMultipleItems">[NUM_ITEMS]個のアイテムを返却中しようとしています。
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="PathfindingDeleteMultipleItems">[NUM_ITEMS]個のアイテムを削除しようとしています。
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+
+  <notification name="AvatarFrozen">[AV_FREEZER]によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarFrozenDuration">[AV_FREEZER]によって、あなたは[AV_FREEZE_TIME]秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="YouFrozeAvatar">アバターがフリーズされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarHasUnFrozenYou">[AV_FREEZER]によってフリーズが解除されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarUnFrozen">アバターのフリーズが解除されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarFreezeFailure">その区画の管理権限を持っていないため、フリーズに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarFreezeThaw">フリーズ期間が切れました。仕事に戻ってください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarCantFreeze">残念ながら、そのユーザーをフリーズできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NowOwnObject">これで、オブジェクト[OBJECT_NAME]の所有者になりました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRezOnLand">この土地の所有者が許可していないため、[OBJECT_POS]でオブジェクトをRezすることができません。土地ツールを使用して、土地の所有を確認してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezFailTooManyRequests">リクエストが多すぎて、オブジェクトをRezすることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SitFailCantMove">今回移動できなかったため、座ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SitFailNotAllowedOnLand">その土地に対して許可を受けていないため、座ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SitFailNotSameRegion">移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoNewObjectRegionFull">新しいオブジェクトを作成できません。リージョンが埋まっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToPlaceObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoOwnNoGardening">所有していない土地に木や草を植えることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCopyPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、コピーに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoTransPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を譲渡する権限がないため、コピーに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AddToNavMeshNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt; は、ナビメッシュに関連付けがあるため、コピーに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DupeWithNoRootsSelected">ルートオブジェクトを選択せずに複製します。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDupeCuzRegionIsFull">リージョン（地域）が埋まっているため、オブジェクトのコピーを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDupeCuzParcelNotFound">オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateCuzParcelFull">区画がいっぱいのため、オブジェクトを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezAttemptFailed">オブジェクトのRezに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ToxicInvRezAttemptFailed">このリージョン（地域）で問題を引き起こすアイテムは作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvItemIsBlacklisted">そのインベントリアイテムは、ブラックリストに登録されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCanRezObjects">現在あなたには、オブジェクトを作成する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandSearchBlocked">土地の検索がブロックされました。
+短期間に多くの土地を検索したためです。
+
+お手数ですが、しばらくしてからもう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NotEnoughResourcesToAttach">オブジェクトの着用に使用できるスクリプトのリソースが足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="YouDiedAndGotTPHome">死んでしまったので、ホームにテレポートされました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="EjectComingSoon">ここへの入場が許可されていないため、[EJECT_TIME]秒後に追放されます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoEnterRegionMaybeFull">このリージョン（地域）「[NAME]」へ入場することはできません。
+いっぱいになるか、すぐに再起動される可能性があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SaveBackToInvDisabled">「インベントリに保存」が無効になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoExistNoSaveToContents">「存在しません」からrezされたため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNoSaveToContents">あなたには、オブジェクト &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt;を修正する権限がないため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSaveBackToInvDisabled">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をインベントリに保存できません。この操作は無効になりました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCopyNoSelCopy">あなたには、オブジェクト &lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、選択内容をコピーできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoTransNoSelCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoTransNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsNoRemoval">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をシミュレーターから削除することは、権限のシステムにより許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNoSaveSelection">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を保存できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCopyNoSaveSelection">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;はコピー不可なため、選択内容を保存できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNoTaking">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を選ぶことはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezDestInternalError">内部エラー：不明な宛先タイプ。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DeleteFailObjNotFound">そのオブジェクトは、見つからないため削除できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SorryCantEjectUser">残念ながら、そのユーザーを追放することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionSezNotAHome">このリージョンでは、ここにホームの位置を設定できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HomeLocationLimits">ホームの場所を設定できるのは、自分の土地か、またはメインランドの情報ハブでのみです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HomePositionSet">家の配置の設定。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarEjected">アバターが追放されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarEjectFailed">その区画の管理権限がないため、追放できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOParcelFull">区画がいっぱいなので、オブジェクト「[O]」を
+リージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOParcelPerms">ご使用のオブジェクトは、この区画で使用が許可されていないため、
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOParcelResources">この区画にこのオブジェクトのリソースが不足しているため、
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoParcelPermsNoObject">その区画へのアクセス権がないため、コピーが失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMORegionVersion">オブジェクトの受け取りに対応していない、旧バージョンを実行しているため、
+他のリージョン（地域）でリージョンをまたがる
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMONavMesh">リージョンの境界にわたって、ナビメッシュを変更できないため、
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOWTF">不明な理由により、オブジェクト「[O]」を
+リージョン（地域）[R]の[P]に移動できません。（[F]）
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermModifyObject">そのオブジェクトを変更する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TooMuchObjectInventorySelected">大きなインベントリを持つオブジェクトの選択が多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantEnablePhysObjContributesToNav">ナビメッシュに貢献するオブジェクトに対して物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantEnablePhysKeyframedObj">キーフレームオブジェクトのために物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantEnablePhysNotEnoughLandResources">土地のリソースが足りないため、オブジェクトの物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantEnablePhysCostTooGreat">[MAX_OBJECTS]より大きい物理リソースコストを持つオブジェクトでは、物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PhantomWithConcavePiece">このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableAddItem">アイテムを追加できません！
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableEditItem">これは編集できません！
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermToEdit">これを編集する許可がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermToCopyInventory">そのインベントリをコピーすることは許可されません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSaveItemDoesntExist">オブジェクトのコンテンツに保存できません。アイテムが存在していません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSaveItemAlreadyExists">オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSaveModifyAttachment">オブジェクトのコンテンツに保存できません。このため、装着物の権限が変更されます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AttachmentHasTooMuchInventory">ご使用の装着物に含まれるインベントリが多すぎるため、インベントリを追加できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="IllegalAttachment">添付ファイルはアバターの存在しない点を要求しました。代わりに胸に添付されていました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TooManyScripts">スクリプトが多すぎます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableAddScript">テキストを追加できません！
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AssetServerTimeoutObjReturn">アセットサーバーが適時に応答しませんでした。オブジェクトが地域に返されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionDisablePhysicsShapes">このリージョンでは、物理的シェイプが有効にされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNavmeshAcrossRegions">リージョンの境界をまたぐナビメッシュは変更できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSetPhysicsPropertiesOnObjectType">そのオブジェクトタイプの物理的プロパティを設定できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSetRootPrimWithNoShape">ルートプリムを設定できないため、シェイプがありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoRegionSupportPhysMats">このリージョンでは、物理的素材が有効にされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OnlyRootPrimPhysMats">物理的素材を調整できるのは、ルートプリムだけです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSupportCharacterPhysMats">キャラクターへの物理的素材の設定はまだサポートされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidPhysMatProperty">指定した物理的素材のプロパティが１つ以上無効です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsAlterStitchingMeshObj">メッシュオブジェクトのメッシュ種別を変更することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsAlterShapeMeshObj">メッシュオブジェクトの形状を変更することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FullRegionCantEnter">リージョンが埋まっているため、このリージョンに入場できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedOwnersDiffer">リンクエラー－所有者が違います。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedNoModNavmeshAcrossRegions">リンクエラー－リージョンの境界をまたぐナビメッシュは変更できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedNoPermToEdit">リンクエラー－編集権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedTooManyPrims">リンクエラー－プリミティブが多すぎます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedCantLinkNoCopyNoTrans">リンクエラー－コピーなしと転送なしをリンクできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedNothingLinkable">リンクエラー－リンクできるものがありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedTooManyPathfindingChars">リンクエラー－経路探索の文字数が多すぎます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedInsufficientLand">リンクエラー－土地のリソースが足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedTooMuchPhysics">オブジェクトが使用する物理リソースが多すぎます－そのダイナミクスが無効になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="EstateManagerFailedllTeleportHome">[SLURL] のオブジェクト「[OBJECT_NAME]」で不動産マネージャーのホームをテレポートできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedHomeByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはホームにテレポートされました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedHomeByObject">​オブジェクト​「[OBJECT_NAME]」によって、あなたはホームへテレポートされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedByAttachment">[ITEM_ID]への装着物によって、あなたはテレポートされています。
+    <tag>fail</tag>
+    <usetemplate ignoretext="テレポート：装着物によりテレポートされました" name="notifyignore" />
+  </notification>
+
+  <notification name="TeleportedByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>fail</tag>
+    <usetemplate ignoretext="テレポート：区画上のオブジェクトによりテレポートされました" name="notifyignore" />
+  </notification>
+
+  <notification name="TeleportedByObjectOwnedBy">[OWNER_ID]が所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedByObjectUnknownUser">不明なユーザーが所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="StandDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが立つことを許可しません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ResitDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが席を変更することを許可しません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObjectRegionFull">リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateAnimatedObjectTooLarge">リグ入三角形の限度数を超えるため、リクエストされたアニメーションオブジェクトを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttackMultipleObjOneSpot">１つの箇所に複数のオブジェクトを着用することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateMultipleObjAtLoc">ここでは、複数のオブジェクトを作成することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToCreateObjTimeOut">リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToCreateObjUnknown">リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToCreateObjMissingFromDB">要求されたオブジェクトを作成できません。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezFailureTookTooLong">リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rezに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToPlaceObjAtLoc">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreatePlantsOnLand">この土地に木を植えることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRestoreObjectNoWorldPos">オブジェクトをリストアできません。ワールドの位置が見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRezObjectInvalidMeshData">メッシュデータが無効なため、オブジェクトをRezすることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRezObjectTooManyScripts">このリージョンに既に多くのスクリプトが存在するため、オブジェクトをRezすることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObjectNoAccess">現在のアクセス権限では、そこにオブジェクトを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObject">現在あなたにはオブジェクト作成する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidObjectParams">無効なオブジェクトパラメーター
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDuplicateObjectNoAcess">現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantChangeShape">あなたにはこのシェイプを変更する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsTooManyAttachedAnimatedObjects">この操作を行うと、装着されたアニメーションオブジェクトが限度数を超えます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsLinkAnimatedObjectTooLarge">結果として、アニメーションオブジェクトがリグ入り三角形の限度数を超えるため、これらのオブジェクトを結合できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsSetFlagAnimatedObjectTooLarge">リグ入り三角形の限度数を超えるため、このオブジェクトをアニメーションオブジェクトにすることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantChangeAnimatedObjectStateInsufficientLand">このオブジェクトをアニメーションオブジェクトの状態に変えると、区画の限度数を超えるため変更できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ErrorNoMeshData">サーバーエラー：メッシュデータが読み込まれていないため、この操作を完了できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoAccessToClaimObjects">現在のアクセス権限では、ここにオブジェクトを取得できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DeedFailedNoPermToDeedForGroup">あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPrivsToBuyObject">現在のアクセス権限では、ここでオブジェクトを購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachObjectAvatarSittingOnIt">アバターがオブジェクトに存在するため、オブジェクトを着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WhyAreYouTryingToWearShrubbery">木や草を装着物として着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachGroupOwnedObjs">グループが所有しているオブジェクトは着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachObjectsNotOwned">所有していないオブジェクトは着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachNavmeshObjects">ナビメッシュに貢献しているオブジェクトは着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachObjectNoMovePermissions">あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachNotEnoughScriptResources">オブジェクトの着用に使用できるスクリプトリソースが足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropItemTrialUser">オブジェクトを下に置く事はできません。フリートライアル領域をお試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropMeshAttachment">メッシュ装着物を下に置く事はできません。インベントリから切り離して、ワールドでRezしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropAttachmentNoPermission">装着物を下に置く事に失敗しました。そこへ置ける権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropAttachmentInsufficientLandResources">装着物のドロップに失敗しました。利用できる土地リソースの数が足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropAttachmentInsufficientResources">利用できるリソースが足りないため、装着物のドロップに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropObjectFullParcel">ここにオブジェクトをドロップできません。区画が埋まっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantTouchObjectBannedFromParcel">この土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PlzNarrowDeleteParams">削除パラメーターを絞ってください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToUploadAsset">アセットをアップロードできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantTeleportCouldNotFindUser">ホームをテレポートするユーザーが見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="GodlikeRequestFailed">過剰なリクエストで失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="GenericRequestFailed">一般的なリクエストに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantUploadPostcard">ポストカードをアップロードできません。後でもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantFetchInventoryForGroupNotice">グループ通知のインベントリの詳細を取得できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSendGroupNoticeNotPermitted">グループ通知の送信が許可されないため、送信できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。持ち物を作成することもできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantParceInventoryInNotice">通知内の持ち物を検出できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainUploadFailed">地形のアップロードに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainFileWritten">地形ファイルが書き込まれました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainFileWrittenStartingDownload">地形ファイルを書き出し、ダウンロードを開始しています…
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainBaked">地形がベークされました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TenObjectsDisabledPlzRefresh">選択された最初の１０個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UpdateViewerBuyParcel">この区画を購入するには、ビューアーを更新する必要があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyParcelNotForSale">購入することができません。この区画は販売対象ではありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuySalePriceOrLandAreaChanged">販売価格または土地の面積が変わったため、購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyParcelNotAuthorized">あなたは、この区画の委任された購入者ではありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyParcelAwaitingPurchaseAuth">すでに購入の認証を待機しているため、この区画を購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuildOverflowParcel">区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SelectedMultipleOwnedLand">所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantJoinTooFewLeasedParcels">選択範囲のリース区画の数が少ないため、参加できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDivideLandMultipleParcelsSelected">土地を分割できません。
+複数の区画が選択されました。
+小さい区画を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDivideLandCantFindParcel">土地を分割できません。
+区画が見つかりません。
+「ヘルプ」→「バグの報告」で報告してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDivideLandWholeParcelSelected">土地を分割できません。区画全体が選択されています。
+小さい区画を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandHasBeenDivided">土地が分割されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PassPurchased">入場許可を購入しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionDisallowsClassifieds">このリージョン（地域）では、クラシファイド広告の掲載が許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandPassExpireSoon">この土地への入場許可は、まもなく期限が切れます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSitNoSuitableSurface">配置に適した表面がありません。別の場所を試してみたください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSitNoRoom">ここには座れる場所がありません。他の場所を試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ClaimObjectFailedNoPermission">権限がないため、オブジェクトを取得できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ClaimObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの取得に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDeedGroupLand">グループ所有の土地は、譲渡できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの購入に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyInventoryFailedNoMoney">リンデンドルが不足しているため、インベントリを購入できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyPassFailedNoMoney">リンデンドルが足りないため、この土地への入場許可を購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyPassTryAgain">今すぐには入場許可を購入できません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObjectParcelFull">区画が埋まっているため、オブジェクトを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedPlacingObject">指定した場所にオブジェクトを配置できませんでした。お手数ですが、もう一度やりなおしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateLandmarkForEvent">イベントのためのランドマークを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="GodBeatsFreeze">強力な力でフリーズを解除します。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpecialPowersRequestFailedLogged">特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ExpireExplanation">システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DieExplanation">システムは、あなたのリクエストを処理できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AddPrimitiveFailure">プリミティブ広告を出すには、資金が足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezObjectFailure">資金が足りないため、オブジェクトを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ResetHomePositionNotLegal">ホームが不正なため、ホームの位置をリセットします。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantInviteRegionFull">リージョンが埋まっているため、現在の場所に誰かを招待することはできません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSetHomeAtRegion">このリージョンでは、この位置にホームを設定できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ListValidHomeLocations">ホームの場所を設定できるのは、自分の土地かメインランドの情報ハブのみです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SetHomePosition">家の配置の設定。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDerezInventoryError">インベントリエラーのため、オブジェクトのRezの解除ができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateRequestedInv">リクエストされたインベントリを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateRequestedInvFolder">リクエストされた持ち物フォルダーを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateInventory">そのインベントリを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateLandmark">ランドマークを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateOutfit">アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InventoryNotForSale">インベントリは販売対象ではありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantFindInvItem">持ち物アイテムを見つけることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantFindObject">オブジェクトが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantTransfterMoneyRegionDisabled">オブジェクトへの送金は、このリージョンでは現在無効にされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DroppedMoneyTransferRequest">システムロードにより、支払いを実行できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantPayNoAgent">支払いの相手を把握できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDonateToPublicObjects">パブリックオブジェクトにリンデンドルを与えることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InventoryCreationInWorldObjectFailed">インワールドオブジェクトでのインベントリ作成に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UserBalanceOrLandUsageError">内部エラーが発生したため、ビューアーを正しく更新できませんでした。ビューアーに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LargePrimAgentIntersect">他の住民と交差する大きなプリムを作成することはできません。他の住民が移動した場合は再度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PreferenceChatClearLog">これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PreferenceChatDeleteTranscripts">これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。
+.txtおよびtxt.backupの拡張子が付いたすべてのファイルが[FOLDER]フォルダから削除されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PreferenceChatPathChanged">ファイルを移動できません。以前のパスがリストアされました。
+    <usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DefaultObjectPermissions">デフォルトのオブジェクト権限を保存するときに問題が発生しました：[REASON]
+後でデフォルトの権限を設定してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChatHistoryIsBusyAlert">チャット履歴ファイルが前の操作でビジーです。２、３分経ってからもう一度試すか、別の人とのチャットを選択してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutfitPhotoLoadError">[REASON]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FailedToFindSettings">データベースから「[NAME]」の設定の読み込みができませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToLoadSettingsApply">環境にこれらの設定を適用することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToBuildSettingsDay">環境にこれらの設定を適用することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoEnvironmentSettings">このリージョン（地域）は初期設定をサポートしていません。
+    <tag>fail</tag>
+  </notification>
+
+  <!-- messageには日本語が使えないため翻訳しない -->
+  <notification label="アウトフィットを保存する" name="SaveSettingAs">現在の設定を次の内容で保存する：
+    <unique />
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC] (New)</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="WLImportFail">[FILE]から過去のウインドライトの設定「[NAME]」をインポートできません。
+
+[REASONS]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WLParcelApplyFail">この区画で環境を設定することはできません。
+変更する権限のある区画を入力または選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SettingsUnsuported">このリージョン（地域）では設定をサポートしていません。
+設定に対応しているリージョンに移動し、アクションを再試行してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SettingsConfirmLoss">「[NAME]」と名付けられたこの[TYPE]に加えられた変更が失われます。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="変更を失いますがよろしいですか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="SettingsConfirmReset">適用されたすべての設定を削除しようとしています。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="PersonalSettingsConfirmReset">適用されたすべての個人的な照明の設定を削除しようとしています。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="SettingsMakeNoTrans">このデイサイクルに移行不可の設定をインポートしようとしています。このまま続けると、編集中の設定も移行不可になります。
 
 この変更は元に戻すことができません。
 
-続けますか？
-		<usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。
-自分の持ち物からコピーしてやり直してください。</notification>
-	<notification name="EnvironmentApplyFailed">この設定で問題が発生しました。この設定は現在保存または適用ができません。</notification>
-	<notification name="TrackLoadFailed">トラックを [TRACK] にロードできません。</notification>
-	<notification name="TrackLoadMismatch">トラックを [TRACK1] から [TRACK2] にロードできません。</notification>
-</notifications>
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。自分の持ち物からコピーしてやり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="EnvironmentApplyFailed">この設定で問題が発生しました。この設定は現在保存または適用ができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TrackLoadFailed">トラックを[TRACK]にロードできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TrackLoadMismatch">トラックを[TRACK1]から[TRACK2]にロードできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CompressionTestResults">サイズ[SIZE]㎅のファイル[FILE]をgzipのレベル６で圧縮したテスト結果：
+圧縮：[PACK_TIME]秒　[PSIZE]㎅
+解凍：[UNPACK_TIME]秒　[USIZE]㎅
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="二段階認証トークンプロンプト" name="PromptMFAToken">[MESSAGE]
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="token" />
+      <button name="continue" text="確認"/>
+      <button name="cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification label="サブフォルダの作成" name="CreateSubfolder">新しいフォルダーに名前を付けます：
+    <unique />
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC]</input>
+      <button name="ＯＫ" text="ＯＫ"/>
+      <button name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification name="SameFolderRequired">選択したアイテムは、同じフォルダー内に存在する必要があります。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="RiggedMeshAttachedToHUD">ＨＵＤポイント「[POINT]」にアタッチされたオブジェクト「[NAME]」にはリグメッシュが含まれています。
+
+リグメッシュオブジェクトは、アバターに取り付けるように設計されています。あなたにはこのオブジェクトが表示されますが、他の人には表示されません。
+
+他の人にこのオブジェクトを見てもらいたい場合は、オブジェクトを削除して、アバターのアタッチメントポイントに再度アタッチします。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リグメッシュがＨＵＤポイントにアタッチされている場合に警告します。" name="okignore" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="EnableAutoFPSWarning" type="alertmodal">自動ＦＰＳを有効にしようとしています。保存されていないグラフィック設定はすべて失われます。
+
+まずそれらを保存しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+  </notification>
+</notifications>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
index bac885e5d8..4587679b70 100644
--- a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
 <!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume-->
-<accordion_tab name="Mockup Tab" title="Mockup Tab"/>
+<accordion_tab name="Mockup Tab" title="モックアップタブ" />
diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
index 90491e84c5..393ca8fb65 100644
--- a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_activeim_row">
-	<string name="unknown_obj">
-		不明のオブジェクト
-	</string>
-	<text name="object_name">
-		名前のないオブジェクト
-	</text>
-</panel>
+  <chiclet_script name="object_chiclet" />
+  <chiclet_offer name="inv_offer_chiclet" />
+  <text name="object_name">無名のオブジェクト</text>
+  <button name="hide_btn" label="" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 3ef8eba19f..84ceeb4be5 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_list_item">
-	<string name="FormatSeconds">
-		[COUNT] 秒
-	</string>
-	<string name="FormatMinutes">
-		[COUNT] 分
-	</string>
-	<string name="FormatHours">
-		[COUNT] 時間
-	</string>
-	<string name="FormatDays">
-		[COUNT] 日
-	</string>
-	<string name="FormatWeeks">
-		[COUNT] 週間
-	</string>
-	<string name="FormatMonths">
-		[COUNT] ヶ月
-	</string>
-	<string name="FormatYears">
-		[COUNT] 年
-	</string>
-	<text name="avatar_name" value="（ローディング）"/>
-	<text name="last_interaction" value="0 秒"/>
-	<icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することができます"/>
-	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
-	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
-	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
-	<button name="info_btn" tool_tip="詳細"/>
-	<button name="profile_btn" tool_tip="プロフィールの表示"/>
-</panel>
+  <!-- 
+    Strings used to localize last interaction time.
+    See last_interaction textbox below.
+    -->
+  <string name="FormatSeconds">[COUNT]秒</string>
+  <string name="FormatMinutes">[COUNT]分</string>
+  <string name="FormatHours">[COUNT]時間</string>
+  <string name="FormatDays">[COUNT]日</string>
+  <string name="FormatWeeks">[COUNT]週間</string>
+  <string name="FormatMonths">[COUNT]ヶ月</string>
+  <string name="FormatYears">[COUNT]年</string>
+  <!-- *NOTE: 
+    llavatarlistitem.cpp lays these controls out depending on which
+    ones are visible. Trying to change their order here will break it
+    ... which kinda sucks.
+  -->
+  <icon name="hovered_icon"/>
+  <icon name="selected_icon" />
+  <text name="avatar_name" value="（読み込んでいます）" />
+  <text name="last_interaction" value="０秒" />
+  <icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することができます。" />
+  <icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます。" />
+  <icon tool_tip="このフレンドはマップ上であなたの位置を表示できます。" name="permission_map_icon" />
+  <icon name="permission_online_icon" tool_tip="このフレンドは、あなたのオンライン状況を確認できます。" />
+  <button name="info_btn" tool_tip="詳細" />
+  <button name="profile_btn" tool_tip="プロフィールの閲覧" />
+  <output_monitor name="speaking_indicator" tool_tip="ボイスのボリューム" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
index fd91ea97d1..0c6c7bdd4c 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_tag_notification">
-	<panel name="msg_caption">
-		<text name="sender_tag_name">
-			Angela Tester
-		</text>
-		<text name="tag_time" value="23:30"/>
-	</panel>
-	<text_editor name="msg_text">
-		The quick brown fox jumps over the lazy dog.
-	</text_editor>
-</panel>
+  <panel name="msg_caption">
+    <text name="sender_tag_name">Angela Tester</text>
+    <text name="tag_time" value="23：30" />
+  </panel>
+  <text_editor name="msg_text">いろはにほへと　ちりぬるを　わかよたれそ　つねならむ　うゐのおくやま　けふこえて　あさきゆめみし　ゑひもせす</text_editor>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 2fb3206c7d..97c392e807 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="フィルター" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
-		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
-		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
-		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
-	</panel>
-	<text name="block_limit">
-		[COUNT] 件のエントリーがブロック リストにあり、制限は [LIMIT] です。
-	</text>
-	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
-</panel>
+  <panel label="bottom_panel" name="blocked_buttons_panel">
+    <filter_editor label="フィルタ" name="blocked_filter_input" />
+    <menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション" />
+    <menu_button name="view_btn" tool_tip="オプションを並べ替える" />
+    <menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択" />
+    <button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除" />
+  </panel>
+  <text name="block_limit">[COUNT]件のエントリーが、ブロックリストにあり、制限は[LIMIT]です。</text>
+  <block_list name="blocked" tool_tip="現在ブロックされている住人一覧" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
index 95a5a26d4e..37108794d9 100644
--- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
-	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="これを編集する権限がありません"/>
-	<panel name="btn_edit_panel">
-		<button name="btn_edit" tool_tip="このシェイプを編集"/>
-	</panel>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <panel name="btn_lock" tool_tip="これを編集する権限がありません。">
+    <icon name="btn_lock1" />
+  </panel>
+  <panel name="btn_edit_panel">
+    <button name="btn_edit" tool_tip="このシェイプを編集" />
+  </panel>
+  <icon name="wearable_type_separator_icon" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
index 42d8a21660..79c5d81af6 100644
--- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-	<button label="交換" name="switch_btn"/>
-	<button label="買い物 &gt;" name="bodyparts_shop_btn"/>
-</panel>
+  <button label="切り替え" name="switch_btn" />
+  <button name="bodyparts_shop_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
index 6eca8adfe5..153aebabc6 100644
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray_lite">
-	<layout_stack name="toolbar_stack_lite">
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="toolbar_stack_lite">
+    <layout_panel />
+    <layout_panel>
+      <panel name="nearby_chat" />
+    </layout_panel>
+    <layout_panel name="gesture_panel">
+      <gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示／非表示" />
+    </layout_panel>
+    <layout_panel name="after_gesture_panel" />
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml b/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
new file mode 100644
index 0000000000..d5c2ed01e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="camera_preset_item">
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <text name="preset_name" value="デフォルト" />
+  <button name="delete_btn" tool_tip="プリセットを削除"/>
+  <button name="reset_btn" tool_tip="デフォルトのプリセットにリセットします。" />
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
index 7916bf5155..d80caaf8e1 100644
--- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="im_header" name="im_header">
-	<text name="time_box" value="23:30"/>
-</panel>
+  <avatar_icon name="avatar_icon" />
+  <text name="user_name" value="テスト文字列　無視してください" />
+  <text name="time_box" value="23：30" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
index 6717ba9ba3..58387d54fc 100644
--- a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chiclet_bar">
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="会話"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="通知"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="toolbar_stack">
+    <layout_panel name="im_well_panel">
+      <chiclet_im_well name="im_well">
+        <button name="Unread IM messages" tool_tip="会話" />
+      </chiclet_im_well>
+    </layout_panel>
+    <layout_panel name="notification_well_panel">
+      <chiclet_notification name="notification_well">
+        <button name="Unread" tool_tip="通知" />
+      </chiclet_notification>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
index 57a255afde..7efed33586 100644
--- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
@@ -1,67 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
-	<panel.string name="type_mature">
-		Moderate
-	</panel.string>
-	<panel.string name="type_pg">
-		「General」コンテンツ
-	</panel.string>
-	<panel.string name="l$_price">
-		L$ [PRICE]
-	</panel.string>
-	<panel.string name="click_through_text_fmt">
-		[TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール
-	</panel.string>
-	<panel.string name="date_fmt">
-		[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
-	</panel.string>
-	<panel.string name="auto_renew_on">
-		有効
-	</panel.string>
-	<panel.string name="auto_renew_off">
-		無効
-	</panel.string>
-	<text name="title" value="クラシファイド広告情報"/>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<text_editor name="classified_name" value="[name]"/>
-			<text name="classified_location_label" value="場所："/>
-			<text_editor name="classified_location" value="[loading...]"/>
-			<text name="content_type_label" value="内容の種類："/>
-			<text_editor name="content_type" value="[content type]"/>
-			<text name="category_label" value="カテゴリ："/>
-			<text_editor name="category" value="[category]"/>
-			<text name="creation_date_label" value="制作日："/>
-			<text_editor name="creation_date" tool_tip="制作日" value="[date]"/>
-			<text name="price_for_listing_label" value="掲載価格："/>
-			<text_editor name="price_for_listing" tool_tip="掲載価格" value="[price]"/>
-			<layout_stack name="descr_stack">
-				<layout_panel name="clickthrough_layout_panel">
-					<text name="click_through_label" value="クリック数："/>
-					<text_editor name="click_through_text" tool_tip="Click through data" value="[clicks]"/>
-				</layout_panel>
-				<layout_panel name="price_layout_panel">
-					<text name="auto_renew_label" value="自動更新："/>
-					<text name="auto_renew" value="有効"/>
-				</layout_panel>
-				<layout_panel name="descr_layout_panel">
-					<text name="classified_desc_label" value="説明："/>
-					<text_editor name="classified_desc" value="[description]"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</scroll_container>
-	<panel name="buttons">
-		<layout_stack name="layout_stack1">
-			<layout_panel name="layout_panel1">
-				<button label="テレポート" name="teleport_btn"/>
-			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
-				<button label="地図" name="show_on_map_btn"/>
-			</layout_panel>
-			<layout_panel name="edit_btn_lp">
-				<button label="編集" name="edit_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+  <panel.string name="type_mature">Moderate</panel.string>
+  <panel.string name="type_pg">「General」コンテンツ</panel.string>
+  <panel.string name="l$_price">L$[PRICE]</panel.string>
+  <panel.string name="click_through_text_fmt">[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</panel.string>
+  <panel.string name="date_fmt">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</panel.string>
+  <panel.string name="auto_renew_on">有効</panel.string>
+  <panel.string name="auto_renew_off">無効</panel.string>
+  <text name="title" value="クラシファイド広告情報" />
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <text_editor name="classified_name" value="[name]" />
+      <text name="classified_location_label" value="場所：" />
+      <text_editor name="classified_location" value="[loading...]" />
+      <text name="content_type_label" value="内容の種類：" />
+      <text_editor name="content_type" value="[content type]" />
+      <text name="category_label" value="カテゴリ：" />
+      <text_editor name="category" value="[category]" />
+      <text name="creation_date_label" value="制作日：" />
+      <text_editor name="creation_date" tool_tip="制作日" value="[date]" />
+      <text name="price_for_listing_label" value="掲載価格：" />
+      <text_editor name="price_for_listing" tool_tip="掲載価格" value="[price]" />
+      <layout_stack name="descr_stack">
+        <layout_panel name="clickthrough_layout_panel">
+          <text name="click_through_label" value="クリック数：" />
+          <text_editor name="click_through_text" tool_tip="クリックされた回数" value="[clicks]" />
+        </layout_panel>
+        <layout_panel name="price_layout_panel">
+          <text name="auto_renew_label" value="自動更新：" />
+          <text name="auto_renew" value="有効" />
+        </layout_panel>
+        <layout_panel name="descr_layout_panel">
+          <text name="classified_desc_label" value="説明：" />
+          <text_editor name="classified_desc" value="[description]" />
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </scroll_container>
+  <panel name="buttons">
+    <layout_stack name="layout_stack1">
+      <layout_panel name="layout_panel1">
+        <button label="テレポート" name="teleport_btn" />
+      </layout_panel>
+      <layout_panel name="show_on_map_btn_lp">
+        <button label="マップ" name="show_on_map_btn" />
+      </layout_panel>
+      <layout_panel name="edit_btn_lp">
+        <button label="編集" name="edit_btn" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
index 2159f17fec..c1102ad318 100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-	<button label="追加 +" name="add_btn"/>
-	<button label="買い物 &gt;" name="clothing_shop_btn"/>
-</panel>
+  <button label="追加＋" name="add_btn" />
+  <button name="clothing_shop_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
index 158b2fa6ac..0fee393d95 100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
-	<button name="btn_delete" tool_tip="アウトフィットから取り除く"/>
-	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="これを編集する権限がありません"/>
-	<panel name="btn_edit_panel">
-		<button name="btn_edit" tool_tip="この着用物を編集"/>
-	</panel>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <button name="btn_delete" tool_tip="アウトフィットから削除" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <button name="btn_move_up" />
+  <button name="btn_move_down" />
+  <panel name="btn_lock" tool_tip="これを編集する権限がありません">
+    <icon name="btn_lock1" />
+  </panel>
+  <panel name="btn_edit_panel">
+    <button name="btn_edit" tool_tip="この着用物を編集" />
+  </panel>
+  <icon name="wearable_type_separator_icon" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
index b9bc10c220..d483d781e0 100644
--- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="cof_wearables">
-	<accordion name="cof_wearables_accordion">
-		<accordion_tab name="tab_attachments" title="アタッチメント"/>
-		<accordion_tab name="tab_clothing" title="衣類"/>
-		<accordion_tab name="tab_body_parts" title="身体部位"/>
-	</accordion>
-</panel>
+  <accordion name="cof_wearables_accordion">
+    <accordion_tab name="tab_clothing" title="服装" />
+    <!-- The Attachments title is overwritten by the definition of "Attachments remain" in strings.xml -->
+    <accordion_tab name="tab_attachments" title="装着物" />
+    <accordion_tab name="tab_body_parts" title="身体部位" />
+  </accordion>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
index 09ffb92d36..f4c46f1b0c 100644
--- a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="（ローディング）"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <icon name="nearby_chat_icon" />
+  <layout_stack name="conversation_item_stack">
+    <layout_panel name="call_icon_panel">
+      <icon name="selected_icon" />
+    </layout_panel>
+    <layout_panel name="conversation_title_panel">
+      <text name="conversation_title" value="（読み込み中）" />
+      <output_monitor name="speaking_indicator" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
index e05a67e31d..1432509bcc 100644
--- a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
-	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
-	<button name="delete_btn" tool_tip="このエントリーを削除"/>
-</panel>
+  <icon name="selected_icon" />
+  <icon name="hovered_icon" />
+  <icon name="voice_session_icon" tool_tip="ボイスチャット" />
+  <icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ" />
+  <text name="conversation_name" />
+  <text name="date_time"/>
+  <button name="delete_btn" tool_tip="このエントリーを削除" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
index a1e30283ee..9190d55cc6 100644
--- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="deletable_wearable_item">
-	<button name="btn_delete" tool_tip="アウトフィットから取り除く"/>
-	<text name="item_name" value="..."/>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <button name="btn_delete" tool_tip="アウトフィットから削除" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <icon name="wearable_type_separator_icon" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
index 0395d4edd8..7a80c51027 100644
--- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="dummy_clothing_item">
-	<text name="item_name" value="..."/>
-	<panel name="btn_add_panel">
-		<button name="btn_add" tool_tip="この種類のアイテムを追加する"/>
-	</panel>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <panel name="btn_add_panel">
+    <button name="btn_add" tool_tip="この種類のアイテムを追加する。" />
+  </panel>
+  <icon name="wearable_type_separator_icon" />
+  <text name="item_name" />
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
index 7250da69a4..97186070c3 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_alpha_panel">
-	<scroll_container name="avatar_alpha_color_panel_scroll">
-		<panel name="avatar_alpha_color_panel">
-			<texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="目のアルファ" name="Eye Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックして写真を選択します"/>
-		</panel>
-	</scroll_container>
-</panel>
+  <scroll_container name="avatar_alpha_color_panel_scroll">
+    <panel name="avatar_alpha_color_panel">
+      <check_box name="lower alpha texture invisible" />
+      <texture_picker label="アルファ（下半身）" name="Lower Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="upper alpha texture invisible" />
+      <texture_picker label="アルファ（上半身）" name="Upper Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="head alpha texture invisible" />
+      <texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="eye alpha texture invisible" />
+      <texture_picker label="瞳のアルファ" name="Eye Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="hair alpha texture invisible" />
+      <texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックで画像を選択できます。" />
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
index 94967999a1..a4a289d783 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_eyes_panel">
-	<panel name="avatar_eye_color_panel">
-		<texture_picker label="瞳" name="Iris" tool_tip="クリックして写真を選択します"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="eyes_main_tab" title="目"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_eye_color_panel">
+    <texture_picker label="瞳" name="Iris" tool_tip="クリックして画像を選択します" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="eyes_main_tab" title="目" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
index 72eb120c3d..6905c83daa 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
-	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="gloves_main_tab" title="手袋"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_gloves_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="gloves_main_tab" title="手袋" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
index f73f760192..53c03ba94b 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_hair_panel">
-	<panel name="avatar_hair_color_panel">
-		<texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして写真を選択"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="hair_color_tab" title="色"/>
-			<accordion_tab name="hair_style_tab" title="スタイル"/>
-			<accordion_tab name="hair_eyebrows_tab" title="眉毛"/>
-			<accordion_tab name="hair_facial_tab" title="フェイシャル"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_hair_color_panel">
+    <texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして画像を選択" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="hair_color_tab" title="色" />
+      <accordion_tab name="hair_style_tab" title="スタイル" />
+      <accordion_tab name="hair_eyebrows_tab" title="眉毛" />
+      <accordion_tab name="hair_facial_tab" title="フェイシャル" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
index ee39e9435c..6b8a43676f 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
-	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="上半身のテクスチャ" name="Upper Fabric" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="下半身のテクスチャ" name="Lower Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="jacket_main_tab" title="ジャケット"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_jacket_color_panel">
+    <!-- 字数制限のためUpperを上部と翻訳 -->
+    <texture_picker label="上部テクスチャ" name="Upper Fabric" tool_tip="クリックして画像を選択します。" />
+    <texture_picker label="下部テクスチャ" name="Lower Fabric" tool_tip="クリックして画像を選択します。" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます。" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="jacket_main_tab" title="ジャケット">
+        <scrolling_panel_list name="jacket_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
index 6a1789c9f4..be136e882e 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
-	<panel name="avatar_pants_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="pants_main_tab" title="パンツ"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_pants_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="pants_main_tab" title="ズボン">
+        <scrolling_panel_list name="pants_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
index 6ebf0062dc..c929b4001a 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_physics_panel">
-	<panel label="" name="accordion_panel">
-		<accordion name="physics_accordion">
-			<accordion_tab name="physics_breasts_updown_tab" title="胸の弾み"/>
-			<accordion_tab name="physics_breasts_inout_tab" title="胸の谷間"/>
-			<accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ"/>
-			<accordion_tab name="physics_belly_tab" title="お腹の弾み"/>
-			<accordion_tab name="physics_butt_tab" title="お尻の弾み"/>
-			<accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ"/>
-			<accordion_tab name="physics_advanced_tab" title="高度なパラメーター"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel label="" name="accordion_panel">
+    <accordion name="physics_accordion">
+      <accordion_tab name="physics_breasts_updown_tab" title="胸の弾み">
+        <scrolling_panel_list name="physics_breasts_updown_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_breasts_inout_tab" title="胸の谷間">
+        <scrolling_panel_list name="physics_breasts_inout_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ">
+        <scrolling_panel_list name="physics_breasts_leftright_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_belly_tab" title="お腹の弾み">
+        <scrolling_panel_list name="physics_belly_updown_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_butt_tab" title="お尻の弾み">
+        <scrolling_panel_list name="physics_butt_updown_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ">
+        <scrolling_panel_list name="physics_butt_leftright_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_advanced_tab" title="高度なパラメーター">
+        <scrolling_panel_list name="physics_advanced_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
index 5a3a949150..fe4d8c912b 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
@@ -1,26 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
-	<string name="meters">
-		メートル
-	</string>
-	<string name="feet">
-		フィート
-	</string>
-	<string name="height">
-		高さ：
-	</string>
-	<text name="avatar_height"/>
-	<panel label="シャツ" name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="shape_body_tab" title="身体"/>
-			<accordion_tab name="shape_head_tab" title="頭"/>
-			<accordion_tab name="shape_eyes_tab" title="目"/>
-			<accordion_tab name="shape_ears_tab" title="耳"/>
-			<accordion_tab name="shape_nose_tab" title="鼻"/>
-			<accordion_tab name="shape_mouth_tab" title="口"/>
-			<accordion_tab name="shape_chin_tab" title="あご"/>
-			<accordion_tab name="shape_torso_tab" title="上半身"/>
-			<accordion_tab name="shape_legs_tab" title="脚"/>
-		</accordion>
-	</panel>
-</panel>
+  <string name="meters">メートル</string>
+  <string name="feet">フィート</string>
+  <string name="height">高さ：</string>
+  <text name="avatar_height" />
+  <panel label="シャツ" name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="shape_body_tab" title="身体">
+        <scrolling_panel_list name="shape_body_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_head_tab" title="頭">
+        <scrolling_panel_list name="shape_head_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_eyes_tab" title="目">
+        <scrolling_panel_list name="shape_eyes_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_ears_tab" title="耳">
+        <scrolling_panel_list name="shape_ears_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_nose_tab" title="鼻">
+        <scrolling_panel_list name="shape_nose_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_mouth_tab" title="口">
+        <scrolling_panel_list name="shape_mouth_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_chin_tab" title="あご">
+        <scrolling_panel_list name="shape_chin_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_torso_tab" title="上半身">
+        <scrolling_panel_list name="shape_torso_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_legs_tab" title="脚">
+        <scrolling_panel_list name="shape_legs_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
index f33daa4eba..4d14f57947 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
-	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="shirt_main_tab" title="シャツ"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_shirt_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きで色を選択" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="shirt_main_tab" title="シャツ">
+        <scrolling_panel_list name="shirt_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
index c7626189af..1b214834db 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
-	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="shoes_main_tab" title="靴"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_shoes_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="shoes_main_tab" title="靴">
+        <scrolling_panel_list name="shoes_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
index 7573132576..61068850ab 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skin_panel">
-	<panel name="avatar_skin_color_panel">
-		<texture_picker label="頭" name="Head" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="上半身" name="Upper Body" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="下半身" name="Lower Body" tool_tip="クリックして写真を選択します"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="skin_color_tab" title="肌の色"/>
-			<accordion_tab name="skin_face_tab" title="顔の詳細"/>
-			<accordion_tab name="skin_makeup_tab" title="メイクアップ"/>
-			<accordion_tab name="skin_body_tab" title="身体の詳細"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_skin_color_panel">
+    <texture_picker label="頭" name="Head" tool_tip="クリックして画像を選択します" />
+    <texture_picker label="上半身" name="Upper Body" tool_tip="クリックして画像を選択します" />
+    <texture_picker label="下半身" name="Lower Body" tool_tip="クリックして画像を選択します" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="skin_color_tab" title="肌の色" />
+      <accordion_tab name="skin_face_tab" title="顔の詳細" />
+      <accordion_tab name="skin_makeup_tab" title="メイクアップ" />
+      <accordion_tab name="skin_body_tab" title="身体の詳細" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
index 6efc4ce99a..12de7aa4a1 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
-	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="skirt_main_tab" title="スカート"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_skirt_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="skirt_main_tab" title="スカート" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
index 71fc7c5682..80540e52bc 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
-	<panel name="avatar_socks_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="socks_main_tab" title="靴下"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_socks_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="socks_main_tab" title="靴下" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
index 5729cb7552..b5962e1843 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
-	<scroll_container name="avatar_tattoo_scroll">
-		<panel name="avatar_tattoo_color_panel">
-			<texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択する"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-		</panel>
-	</scroll_container>
-</panel>
+  <scroll_container name="avatar_tattoo_scroll">
+    <panel name="avatar_tattoo_color_panel">
+      <texture_picker label="頭部のタトゥ" name="Head Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="上半身のタトゥ" name="Upper Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="下半身のタトゥ" name="Lower Tattoo" tool_tip="クリックして画像を選択する" />
+      <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
index f345a81922..2d8aaf9fb4 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
-	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="underpants_main_tab" title="下着パンツ"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_underpants_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="underpants_main_tab" title="下着（下半身）" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
index 66b2ffa8ba..834f7f18e0 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
-	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="undershirt_main_tab" title="下着シャツ"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_undershirt_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="undershirt_main_tab" title="下着（上半身）" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
index 614fd1059f..530e4d1406 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_universal_panel">
-	<scroll_container name="avatar_universal_scroll">
-		<panel name="avatar_universal_color_panel">
-			<texture_picker label="頭部のタトゥー" name="Head Universal Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="上部のタトゥー" name="Upper Universal Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="下部のタトゥー" name="Lower Universal Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="スカートのタトゥー" name="Skirt Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="髪の毛のタトゥー" name="Hair Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="目のタトゥー" name="Eyes Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="左腕のタトゥー" name="Left Arm Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="左脚のタトゥー" name="Left Leg Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="Aux1 のタトゥー" name="Aux1 Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="Aux2 のタトゥー" name="Aux2 Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="Aux3 のタトゥー" name="Aux3 Tattoo" tool_tip="クリックして写真を選択する"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-		</panel>
-	</scroll_container>
-</panel>
+  <scroll_container name="avatar_universal_scroll">
+    <panel name="avatar_universal_color_panel">
+      <texture_picker label="頭部のタトゥ" name="Head Universal Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="上部のタトゥ" name="Upper Universal Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="下部のタトゥ" name="Lower Universal Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="スカートのタトゥ" name="Skirt Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="髪の毛のタトゥ" name="Hair Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="目のタトゥ" name="Eyes Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="左腕のタトゥ" name="Left Arm Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="左脚のタトゥ" name="Left Leg Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="予備１のタトゥ" name="Aux1 Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="予備２のタトゥ" name="Aux2 Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="予備３のタトゥ" name="Aux3 Tattoo" tool_tip="クリックして画像を選択する" />
+      <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
index 9101920f1b..0e29cc6987 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
@@ -1,126 +1,58 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="着用可能なもの" name="panel_edit_wearable">
-	<string name="edit_shape_title">
-		シェイプを編集中
-	</string>
-	<string name="edit_skin_title">
-		スキンを編集中
-	</string>
-	<string name="edit_hair_title">
-		髪を編集中
-	</string>
-	<string name="edit_eyes_title">
-		目を編集中
-	</string>
-	<string name="edit_shirt_title">
-		シャツを編集中
-	</string>
-	<string name="edit_pants_title">
-		パンツを編集中
-	</string>
-	<string name="edit_shoes_title">
-		靴を編集中
-	</string>
-	<string name="edit_socks_title">
-		靴下を編集中
-	</string>
-	<string name="edit_jacket_title">
-		ジャケットを編集中
-	</string>
-	<string name="edit_skirt_title">
-		スカートを編集中
-	</string>
-	<string name="edit_gloves_title">
-		手袋を編集中
-	</string>
-	<string name="edit_undershirt_title">
-		下着（上）を編集中
-	</string>
-	<string name="edit_underpants_title">
-		下着（下）を編集中
-	</string>
-	<string name="edit_alpha_title">
-		アルファマスクを編集中
-	</string>
-	<string name="edit_tattoo_title">
-		タトゥーを編集中
-	</string>
-	<string name="edit_universal_title">
-		ユニバーサルを編集中
-	</string>
-	<string name="edit_physics_title">
-		物理作用の編集中
-	</string>
-	<string name="shape_desc_text">
-		シェイプ：
-	</string>
-	<string name="skin_desc_text">
-		スキン：
-	</string>
-	<string name="hair_desc_text">
-		髪：
-	</string>
-	<string name="eyes_desc_text">
-		目：
-	</string>
-	<string name="shirt_desc_text">
-		シャツ：
-	</string>
-	<string name="pants_desc_text">
-		パンツ：
-	</string>
-	<string name="shoes_desc_text">
-		靴：
-	</string>
-	<string name="socks_desc_text">
-		靴下：
-	</string>
-	<string name="jacket_desc_text">
-		ジャケット：
-	</string>
-	<string name="skirt_desc_text">
-		スカート：
-	</string>
-	<string name="gloves_desc_text">
-		手袋：
-	</string>
-	<string name="undershirt_desc_text">
-		下着シャツ：
-	</string>
-	<string name="underpants_desc_text">
-		下着パンツ：
-	</string>
-	<string name="alpha_desc_text">
-		アルファマスク：
-	</string>
-	<string name="tattoo_desc_text">
-		タトゥ：
-	</string>
-	<string name="universal_desc_text">
-		ユニバーサル：
-	</string>
-	<string name="physics_desc_text">
-		物理作用：
-	</string>
-	<labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る"/>
-	<text name="edit_wearable_title" value="シェイプを編集中"/>
-	<panel label="シャツ" name="wearable_type_panel">
-		<text name="description_text" value="シェイプ："/>
-		<radio_group name="sex_radio">
-			<radio_item label="" name="sex_male" tool_tip="男性" value="1"/>
-			<radio_item label="" name="sex_female" tool_tip="女性" value="0"/>
-		</radio_group>
-		<icon name="male_icon" tool_tip="男性"/>
-		<icon name="female_icon" tool_tip="女性"/>
-	</panel>
-	<panel name="button_panel">
-		<layout_stack name="button_panel_ls">
-			<layout_panel name="save_as_btn_lp">
-				<button label="別名で保存" name="save_as_button"/>
-			</layout_panel>
-			<layout_panel name="revert_btn_lp">
-				<button label="変更を元に戻す" name="revert_button"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+  <string name="edit_shape_title">シェイプを編集中</string>
+  <string name="edit_skin_title">スキンを編集中</string>
+  <string name="edit_hair_title">髪を編集中</string>
+  <string name="edit_eyes_title">目を編集中</string>
+  <string name="edit_shirt_title">シャツを編集中</string>
+  <string name="edit_pants_title">パンツを編集中</string>
+  <string name="edit_shoes_title">靴を編集中</string>
+  <string name="edit_socks_title">靴下を編集中</string>
+  <string name="edit_jacket_title">ジャケットを編集中</string>
+  <string name="edit_skirt_title">スカートを編集中</string>
+  <string name="edit_gloves_title">手袋を編集中</string>
+  <string name="edit_undershirt_title">下着（上半身）を編集中</string>
+  <string name="edit_underpants_title">下着（下半身）を編集中</string>
+  <string name="edit_alpha_title">アルファマスクを編集中</string>
+  <string name="edit_tattoo_title">タトゥを編集中</string>
+  <string name="edit_universal_title">全般を編集中</string>
+  <string name="edit_physics_title">物理作用の編集中</string>
+  <string name="shape_desc_text">シェイプ：</string>
+  <string name="skin_desc_text">スキン：</string>
+  <string name="hair_desc_text">髪：</string>
+  <string name="eyes_desc_text">目：</string>
+  <string name="shirt_desc_text">シャツ：</string>
+  <string name="pants_desc_text">ズボン：</string>
+  <string name="shoes_desc_text">靴：</string>
+  <string name="socks_desc_text">靴下：</string>
+  <string name="jacket_desc_text">ジャケット：</string>
+  <string name="skirt_desc_text">スカート：</string>
+  <string name="gloves_desc_text">手袋：</string>
+  <string name="undershirt_desc_text">下着（上半身）：</string>
+  <string name="underpants_desc_text">下着（下半身）：</string>
+  <string name="alpha_desc_text">アルファマスク：</string>
+  <string name="tattoo_desc_text">タトゥ：</string>
+  <string name="universal_desc_text">全般：</string>
+  <string name="physics_desc_text">物理作用：</string>
+  <labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る" />
+  <text name="edit_wearable_title" value="シェイプを編集中" />
+  <panel label="シャツ" name="wearable_type_panel">
+    <text name="description_text" value="シェイプ：" />
+    <radio_group name="sex_radio">
+      <radio_item label="" name="sex_male" tool_tip="男性" value="1" />
+      <radio_item label="" name="sex_female" tool_tip="女性" value="0" />
+    </radio_group>
+    <icon name="male_icon" tool_tip="男性" />
+    <icon name="female_icon" tool_tip="女性" />
+  </panel>
+  <panel name="button_panel">
+    <layout_stack name="button_panel_ls">
+      <layout_panel name="save_as_btn_lp">
+        <button label="名前をつけて保存" name="save_as_button" />
+      </layout_panel>
+      <layout_panel name="revert_btn_lp">
+        <button label="変更を元に戻す" name="revert_button" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_info.xml b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
index b3a17fcb56..3e4ac72756 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
@@ -1,46 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experience_info">
-	<text name="title" value="体験プロフィール"/>
-	<scroll_container name="xp_scroll">
-		<panel name="scrolling_panel">
-			<layout_stack>
-				<layout_panel>
-					<text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
-				</layout_panel>
-				<layout_panel name="location panel">
-					<text name="Location">
-						場所：
-					</text>
-					<text name="LocationTextText">
-						どこか
-					</text>
-					<button label="テレポート" name="teleport_btn"/>
-					<button label="地図" name="map_btn"/>
-				</layout_panel>
-				<layout_panel name="marketplace panel">
-					<text name="Location">
-						マーケットプレイスストア：
-					</text>
-					<text name="LocationTextText">
-						どこか
-					</text>
-				</layout_panel>
-				<layout_panel>
-					<text name="ContentRating">
-						評価：
-					</text>
-					<text name="ContentRatingText">
-						Adult
-					</text>
-					<text name="Owner">
-						所有者：
-					</text>
-					<text name="OwnerText">
-						Kyle
-					</text>
-					<button label="編集" name="edit_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</scroll_container>
-</panel>
+  <text name="title" value="体験のプロフィール" />
+  <scroll_container name="xp_scroll">
+    <panel name="scrolling_panel">
+      <layout_stack name="ls1">
+        <layout_panel name="image_panel">
+          <texture_picker name="logo" />
+        </layout_panel>
+        <layout_panel name="title panel">
+          <text name="experience_title" value="カイルのスーパーヒーローRPG" />
+        </layout_panel>
+        <layout_panel name="description panel">
+          <expandable_text name="experience_description" />
+        </layout_panel>
+        <layout_panel name="location panel">
+          <text name="Location">場所：</text>
+          <text name="LocationTextText">どこか</text>
+          <button label="テレポート" name="teleport_btn" />
+          <button label="マップ" name="map_btn" />
+        </layout_panel>
+        <layout_panel name="marketplace panel">
+          <text name="Location">マーケットプレイスストア：</text>
+          <text name="LocationTextText">どこか</text>
+        </layout_panel>
+        <layout_panel name="details panel">
+          <text name="ContentRating">レーティング：</text>
+          <text name="ContentRatingText">Adult</text>
+          <text name="Owner">所有者：</text>
+          <text name="OwnerText">カイル</text>
+          <button label="編集" name="edit_btn" />
+
+
+          <!--
+          <expandable_text name="pick_name" value="これは体験です。" />
+
+          <text follows="left|top" height="16" layout="topleft" left="10" top_pad="10" value="Maturity
+          level:" width="130" />
+          <icon name="maturity_icon" />
+          <text name="maturity_value" value="不明" />
+          <panel name="location_panel">
+            <text follows="left|top|right" height="16" layout="topleft" left="00" top="0" value="場所：" width="280" />
+
+            <text follows="left|top|right" height="16" layout="topleft" left="0" top_pad="10" value="場所：" width="280" />
+          </panel>
+
+          <panel name="location_panel">
+            <text follows="left|top|right" height="16" layout="topleft" left="00" top="0" value="場所：" width="280" />
+
+            <text follows="left|top|right" height="16" layout="topleft" left="0" top_pad="10" value="場所：" width="280" />
+          </panel>
+          -->
+
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </scroll_container>
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
index 84e60aea56..abeefdf9a0 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
@@ -1,27 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="experince_list_editor">
-	<panel.string name="loading">
-		ローディング...
-	</panel.string>
-	<panel.string name="panel_allowed">
-		許可された体験：
-	</panel.string>
-	<panel.string name="panel_blocked">
-		ブロックされた体験：
-	</panel.string>
-	<panel.string name="panel_trusted">
-		キー体験：
-	</panel.string>
-	<panel.string name="no_results">
-		(空)
-	</panel.string>
-	<text name="text_name">
-		体験リスト
-	</text>
-	<scroll_list name="experience_list">
-		<columns label="名前" name="experience_name"/>
-	</scroll_list>
-	<button label="追加..." name="btn_add"/>
-	<button label="削除" name="btn_remove"/>
-	<button label="プロフィール..." name="btn_profile"/>
-</panel>
+  <panel.string name="loading">読み込んでいます…</panel.string>
+  <panel.string name="panel_allowed">許可された体験：</panel.string>
+  <panel.string name="panel_blocked">ブロックされた体験：</panel.string>
+  <panel.string name="panel_trusted">キー体験：</panel.string>
+  <panel.string name="no_results">（空）</panel.string>
+  <text name="text_name">体験リスト</text>
+  <scroll_list name="experience_list">
+    <columns label="名前" name="experience_name" />
+  </scroll_list>
+  <button label="追加…" name="btn_add" />
+  <button label="削除" name="btn_remove" />
+  <button label="プロフィール…" name="btn_profile" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
index d72d2bebf6..a3acb55cb4 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Experiences">
-	<text name="experience_name">
-		ダミー名
-	</text>
-</panel>
+<panel name="panel_experience_list_item" label="体験一覧">
+  <text name="experience_name">ダミー名</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
index 16976df035..932563d6d2 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="EVENTS">
-	<string name="no_events" value="イベントなし。"/>
-	<string name="loading" value="ローディング..."/>
-	<layout_stack>
-		<layout_panel>
-			<scroll_list name="experience_log_list">
-				<columns label="時間" name="time"/>
-				<columns label="イベント" name="event"/>
-				<columns label="体験" name="experience_name"/>
-				<columns label="オブジェクト" name="object_name"/>
-			</scroll_list>
-			<button label="知らせる" name="btn_notify"/>
-			<button label="プロフィール" name="btn_profile_xp"/>
-			<button label="報告" name="btn_report_xp"/>
-		</layout_panel>
-		<layout_panel name="button_panel">
-			<check_box label="すべてのイベント   日数を通知" name="notify_all"/>
-			<button label="クリア" name="btn_clear"/>
-			<button label="&lt;" name="btn_prev"/>
-			<button label="&gt;" name="btn_next"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<panel name="panel_experience_log" label="イベント">
+  <string name="no_events" value="イベントはありません。" />
+  <string name="loading" value="読み込んでいます…。" />
+  <layout_stack name="ls1">
+    <layout_panel name="list panel">
+      <scroll_list name="experience_log_list">
+        <columns name="time" label="時間" />
+        <columns name="event" label="イベント" />
+        <columns name="experience_name" label="体験" />
+        <columns name="object_name" label="オブジェクト" />
+      </scroll_list>
+
+      <button name="btn_notify" label="通知" />
+
+      <button name="btn_profile_xp" label="プロフィール" />
+
+      <button name="btn_report_xp" label="報告" />
+    </layout_panel>
+    <layout_panel name="button_panel">
+      <check_box label="すべてのイベント日数を通知" name="notify_all" />
+
+      <spinner name="logsizespinner" />
+      <button name="btn_clear" label="クリア" />
+      <button name="btn_prev" label="⇦" />
+      <button name="btn_next" label="⇨" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_search.xml b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
index 9ab84e7d18..5530168dc0 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
@@ -1,41 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="SEARCH">
-	<string name="not_found">
-		「[TEXT]」は見つかりませんでした
-	</string>
-	<string name="no_results">
-		検索結果：ゼロ
-	</string>
-	<string name="searching">
-		検索中...
-	</string>
-	<string name="loading">
-		ロード中...
-	</string>
-	<string name="maturity_icon_general">
-		&quot;Parcel_PG_Light&quot;
-	</string>
-	<string name="maturity_icon_moderate">
-		&quot;Parcel_M_Light&quot;
-	</string>
-	<string name="maturity_icon_adult">
-		&quot;Parcel_R_Light&quot;
-	</string>
-	<panel name="search_panel">
-		<button label="進む" name="find"/>
-		<icons_combo_box label="Moderate" name="maturity">
-			<icons_combo_box.item label="Adult" name="Adult" value="42"/>
-			<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-			<icons_combo_box.item label="全般" name="PG" value="13"/>
-		</icons_combo_box>
-		<scroll_list name="search_results">
-			<columns label="名前" name="experience_name"/>
-			<columns label="所有者" name="owner"/>
-		</scroll_list>
-		<button label="OK" label_selected="OK" name="ok_btn"/>
-		<button label="取り消し" name="cancel_btn"/>
-		<button label="プロフィールを表示" name="profile_btn"/>
-		<button label="&lt;" name="left_btn"/>
-		<button label="&gt;" name="right_btn"/>
-	</panel>
-</panel>
+<panel name="panel_experience_search" label="検索">
+  <string name="not_found">「[TEXT]」は見つかりませんでした。</string>
+  <string name="no_results">検索結果：なし</string>
+  <string name="searching">検索しています…。</string>
+  <string name="loading">読み込みんでいます…。</string>
+  <string name="maturity_icon_general">"Parcel_PG_Light"</string>
+  <string name="maturity_icon_moderate">"Parcel_M_Light"</string>
+  <string name="maturity_icon_adult">"Parcel_R_Light"</string>
+  <panel name="search_panel">
+    <text name="lbl name part">名前の一部を入力してください：</text>
+    <line_editor name="edit" />
+    <button label="進む" name="find" />
+    <text name="lbl max content rating">コンテンツの最大レーティング：</text>
+    <icons_combo_box label="Moderate" name="maturity">
+      <icons_combo_box.drop_down_button  />
+      <icons_combo_box.item label="Adult" name="Adult" value="42" />
+      <icons_combo_box.item label="Moderate" name="Mature" value="21"/>
+      <icons_combo_box.item label="General" name="PG" value="13"/>
+    </icons_combo_box>
+    <scroll_list name="search_results">
+      <columns name="maturity" label="" />
+      <columns name="experience_name" label="名前" />
+      <columns name="owner" label="所有者" />
+    </scroll_list>
+
+    <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
+    <button label="キャンセル" name="cancel_btn" />
+    <button label="プロフィール表示" name="profile_btn" />
+    <button label="⇦" name="left_btn" />
+    <button label="⇨" name="right_btn" />
+
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experiences.xml b/indra/newview/skins/default/xui/ja/panel_experiences.xml
index ab0d2a97a4..9bbe43f40d 100644
--- a/indra/newview/skins/default/xui/ja/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experiences.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Experiences">
-	<string name="loading_experiences" value="体験をロード中..."/>
-	<string name="no_experiences" value="体験がありません。"/>
-	<string name="acquire" value="体験を取得"/>
-</panel>
+<panel name="panel_experiences" label="体験">
+  <string name="loading_experiences" value="体験を読み込んでいます…" />
+  <string name="no_experiences" value="体験はありません。" />
+  <string name="acquire" value="体験する" />
+  <layout_stack>
+    <layout_panel>
+      <flat_list_view name="experiences_list" />
+    </layout_panel>
+    <layout_panel name="button_panel">
+      <button name="btn_action" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
index 343db03030..ea03979c92 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
@@ -1,41 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="住人を立入禁止" name="bulk_ban_panel">
-	<panel.string name="loading">
-		(ロード中...)
-	</panel.string>
-	<panel.string name="ban_selection_too_large">
-		グループへの立入禁止が送信されていません: 選択した住人が多すぎます。グループへの立入禁止の数は 1 リクエスト当たり 100 人に制限されています。
-	</panel.string>
-	<panel.string name="ban_not_permitted">
-		グループへの立入禁止が送信されていません: 「立入禁止リストの管理」の能力がありません。
-	</panel.string>
-	<panel.string name="ban_limit_fail">
-		グループへの立入禁止が送信されていません: グループへの立入禁止の登録許容数に達しました。
-	</panel.string>
-	<panel.string name="partial_ban">
-		グループへの立入禁止の一部が送信されませんでした: [REASONS]
-	</panel.string>
-	<panel.string name="ban_failed">
-		グループへの立入禁止が送信されませんでした: [REASONS]
-	</panel.string>
-	<panel.string name="residents_already_banned">
-		- 次の住民は既に立入禁止にされています: [RESIDENTS]。
-	</panel.string>
-	<panel.string name="ban_limit_reached">
-		- 立入禁止の許容値に達しました。次のエージェントは立入禁止にされません: [RESIDENTS]。
-	</panel.string>
-	<panel.string name="cant_ban_yourself">
-		- グループから自分自身を立入禁止にすることはできません。
-	</panel.string>
-	<text name="help_text">
-		グループから一度に複数の住人を立入禁止にすることができます。「リストから住人を選択」をクリックしてください。
-	</text>
-	<button label="リストから住人を選択" name="add_button"/>
-	<name_list name="banned_agent_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます"/>
-	<button label="選択した住人をリストから削除" name="remove_button" tool_tip="立入禁止リストから上で選択した住人を削除します"/>
-	<button label="住人を立入禁止" name="ban_button"/>
-	<button label="取り消し" name="cancel_button"/>
-	<string name="GroupBulkBan">
-		グループへの立入禁止
-	</string>
-</panel>
+<panel label="住人をバン" name="bulk_ban_panel">
+  <panel.string name="loading">（読み込んでいます…）</panel.string>
+  <panel.string name="ban_selection_too_large">グループのバンが送信されていません：選択した住人が多すぎます。グループへの立入禁止の数は１リクエスト当たり１００人に制限されています。</panel.string>
+  <panel.string name="ban_not_permitted">グループのバンが送信されていません：「立入禁止リストの管理」の能力がありません。</panel.string>
+  <panel.string name="ban_limit_fail">グループのバンが送信されていません：グループへの立入禁止の登録許容数に達しました。</panel.string>
+  <panel.string name="partial_ban">グループのバンが送信されていません：[REASONS]</panel.string>
+  <panel.string name="ban_failed">グループのバンが送信されていません：[REASONS]</panel.string>
+  <panel.string name="residents_already_banned">・次の住民は既にバンされています：[RESIDENTS]</panel.string>
+  <panel.string name="ban_limit_reached">・バンの上限人数に達しました。次のエージェントは立入禁止にされません：[RESIDENTS]</panel.string>
+  <panel.string name="cant_ban_yourself">・グループから自分自身をバンにすることはできません。</panel.string>
+  <text name="help_text">グループから複数の住人を一括でバンすることができます。「リストから住人を選択」をクリックしてください。</text>
+  <button label="リストから住人を選択" name="add_button" />
+  <name_list name="banned_agent_list" tool_tip="Ctrlキーを押しながらクリックすることで複数の住人を選択できます。" />
+  <button label="選択した住人をリストから削除" name="remove_button" tool_tip="バンリストから、選択した住人を削除します。" />
+  <button label="住人をバン" name="ban_button" />
+  <button label="キャンセル" name="cancel_button" />
+  <string name="GroupBulkBan">グループから一括バン</string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
index d771751293..51c016657d 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
@@ -1,30 +1,51 @@
-<?xml version="1.0" ?>
-<panel name="GroupCreation" label="グループ作成">
-	<panel name="group_info_top">
-		<line_editor name="group_name_editor" label="ここにグループ名を入力する"/>
-	</panel>
-	<layout_panel name="group_info"/>
-	<layout_stack name="layout">
-		<texture_picker name="insignia" tool_tip="クリックして写真を選択すする"/>
-		<text_editor name="charter">グループ チャーター</text_editor>
-		<button name="back" tool_tip="グループのリストに戻る"/>
-		<text name="info_deletion">ご注意：7 日後、メンバーのいないグループ（作成者以外）は削除されます。</text>
-		<check_box name="check_enrollment_fee" label="参加費用" tool_tip="グループへの参加費用の有無を設定する"/>
-		<combo_box.item name="pg" label="一般的なコンテンツ"/>
-		<scroll_list.rows name="basic" value="ベーシック（プレースホルダー）"/>
-		<button name="btn_create" label="L$ [COST] でグループを作成する" tool_tip="新しいグループを作成する"/>
-		<text name="fee_information">グループ作成費用は会員レベルにより異なります。[https://secondlife.com/my/account/membership.php 詳細]</text>
-		<scroll_list.rows name="premium" value="プレミアム（プレースホルダー）"/>
-		<check_box name="open_enrollement" label="どなたでも参加できます" tool_tip="招待されていない新メンバーがこのグループに参加できるように設定する。"/>
-		<combo_item name="select_mature">- 成熟度評価を選択する -</combo_item>
-		<spinner name="spin_enrollment_fee" label="L$" tool_tip="新メンバーは参加費用が確認された際、グループ参加費用を支払う必要があります。"/>
-		<combo_box.item name="mature" label="控えめなコンテンツ"/>
-	</layout_stack>
-	<layout_panel name="layout_crt"/>
-	<layout_stack name="button_row_ls"/>
-	<layout_panel name="create_actions"/>
-	<panel name="preferences_container"/>
-	<combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです"/>
-	<scroll_list name="membership_list"/>
-	<layout_panel name="create_info"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="グループ作成" name="GroupCreation">
+  <panel.string name="current_membership">（あなたのメンバーシップ）</panel.string>
+  <panel name="group_info_top">
+    <line_editor label="グループ名をここに入力してください。" name="group_name_editor" />
+  </panel>
+  <layout_stack name="layout">
+    <layout_panel name="group_info">
+      <panel name="group_info_top">
+        <texture_picker name="insignia" tool_tip="クリックして写真を選択" />
+        <text_editor name="charter">グループ憲章</text_editor>
+      </panel>
+      <panel name="preferences_container">
+        <check_box label="誰でも加入可能" name="open_enrollement" tool_tip="このグループが招待なしで、新しいメンバーに参加できるようにするかどうかを設定します。" />
+        <check_box label="入会費" name="check_enrollment_fee" tool_tip="グループへへの加入に入会費が必要かどうかを設定します。" />
+        <spinner name="spin_enrollment_fee" tool_tip="登録料がチェックされている場合、新しいメンバーはグループに参加するためにこの料金を支払う必要があります。" />
+        <combo_box name="group_mature_check" tool_tip="レーティングは、グループで許可されるコンテンツと行動のタイプを指定します。">
+          <combo_item name="select_mature" value="Select">－レーティングの選択－</combo_item>
+          <combo_box.item label="Moderateコンテンツ" name="mature" value="Mature" />
+          <combo_box.item label="Generalコンテンツ" name="pg" value="Not Mature" />
+        </combo_box>
+      </panel>
+    </layout_panel>
+    <layout_panel name="create_info">
+      <text name="fee_information">グループを作成するための料金は、メンバーシップレベルに基づいています。[https://secondlife.com/my/account/membership.php 詳細]</text>
+      <scroll_list name="membership_list">
+        <scroll_list.columns name="clmn_name" />
+        <scroll_list.columns name="clmn_price" />
+        <scroll_list.rows name="basic" value="基本（プレースホルダ）" />
+        <scroll_list.rows name="plc2" value="" />
+        <scroll_list.rows name="premium" value="プレミアム（プレースホルダ）" />
+      </scroll_list>
+    </layout_panel>
+    <layout_panel name="create_actions">
+
+      <layout_stack name="button_row_ls">
+        <layout_panel name="layout_crt">
+          <!-- placeholder to autoadjust buttons (since they are of different sizes)-->
+        </layout_panel>
+        <layout_panel name="layout_crt">
+          <button label="グループ作成：L$[COST]" name="btn_create" tool_tip="新しいグループを作成" />
+          <button name="back" label="キャンセル" tool_tip="グループ一覧に戻ります。" />
+        </layout_panel>
+        <layout_panel name="layout_crt">
+          <!-- placeholder to autoadjust buttons-->
+        </layout_panel>
+      </layout_stack>
+      <text name="info_deletion">注：４８時間メンバーが２人未満のグループは、自動的に解散されます。</text>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index aab536f653..f2a11becf3 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -1,58 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_tab">
-	<panel.string name="help_text">
-		「一般」タブには、メンバー一覧、設定、メンバーのオプションなど、このグループに関する一般的な情報が記されています。
+  <panel.string name="help_text">「一般」タブには、メンバー一覧、設定、メンバーのオプションなど、このグループに関する一般的な情報が記されています。
 
-オプションにマウスカーソルを当てると詳しい説明が表示されます。
-	</panel.string>
-	<panel.string name="group_info_unchanged">
-		一般的なグループ情報が変更されました。
-	</panel.string>
-	<panel.string name="incomplete_member_data_str">
-		メンバーのデータを検索
-	</panel.string>
-	<panel name="group_info_top">
-		<texture_picker label="" name="insignia" tool_tip="クリックして写真を選択します"/>
-		<text name="prepend_founded_by">
-			創設者：
-		</text>
-		<name_box initial_value="（取得中）" name="founder_name"/>
-		<text name="join_cost_text">
-			無料
-		</text>
-		<button label="参加します！" name="btn_join"/>
-	</panel>
-	<text_editor name="charter">
-		グループの理念、指針を記入してください
-	</text_editor>
-	<name_list name="visible_members">
-		<name_list.columns label="メンバー" name="name"/>
-		<name_list.columns label="タイトル" name="title"/>
-		<name_list.columns label="ログイン" name="status"/>
-	</name_list>
-	<text name="my_group_settngs_label">
-		個人の設定
-	</text>
-	<text name="active_title_label">
-		私のタイトル：
-	</text>
-	<combo_box name="active_title" tool_tip="このグループをアクティブにしたときに、アバター名の上に表示されるタイトルを設定します。"/>
-	<check_box label="グループ通知を受信" name="receive_notices" tool_tip="このグループからの通知を受信するかどうかの設定を行います。  グループからスパムが送られてくる場合はこのボックスのチェックを外してください。"/>
-	<check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="あなたのプロフィールにこのグループを表示するかどうかの設定を行います。"/>
-	<panel name="preferences_container">
-		<text name="group_settngs_label">
-			グループの設定
-		</text>
-		<check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。"/>
-		<check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。"/>
-		<spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。"/>
-		<combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです">
-			<combo_item name="select_mature">
-				- レーティング区分を指定 -
-			</combo_item>
-			<combo_box.item label="「Moderate」コンテンツ" name="mature"/>
-			<combo_box.item label="「General」コンテンツ" name="pg"/>
-		</combo_box>
-		<check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます"/>
-	</panel>
-</panel>
+オプションにマウスカーソルを当てると詳しい説明が表示されます。</panel.string>
+  <panel.string name="group_info_unchanged">一般的なグループ情報が変更されました。</panel.string>
+  <panel.string name="incomplete_member_data_str">メンバーのデータを検索</panel.string>
+  <panel name="group_info_top">
+    <texture_picker label="" name="insignia" tool_tip="クリックして画像を選択します" />
+    <text name="prepend_founded_by">創設者：</text>
+    <name_box initial_value="（取得中）" name="founder_name" />
+    <text name="join_cost_text">無料</text>
+    <button label="参加します！" name="btn_join" />
+  </panel>
+  <text_editor name="charter">グループの理念、指針を記入してください。</text_editor>
+  <name_list name="visible_members">
+    <name_list.columns label="メンバー" name="name" />
+    <name_list.columns label="タイトル" name="title" />
+    <name_list.columns label="ログイン" name="status" />
+  </name_list>
+  <text name="my_group_settngs_label">自分の設定</text>
+  <text name="active_title_label">タイトル：</text>
+  <combo_box name="active_title" tool_tip="このグループをアクティブにしたときに、アバター名の上に表示されるタイトルを設定します。" />
+  <check_box label="グループ通知を受信" name="receive_notices" tool_tip="このグループからの通知を受信するかどうかの設定を行います。グループからスパムが送られてくる場合は、このボックスのチェックを外してください。" />
+  <check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="あなたのプロフィールにこのグループを表示するかどうかの設定を行います。" />
+  <panel name="preferences_container">
+    <text name="group_settngs_label">グループの設定</text>
+    <check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。" />
+    <check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。" />
+    <spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。" />
+    <combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです。">
+      <combo_item name="select_mature">─レーティング区分を指定─</combo_item>
+      <combo_box.item label="「Moderate」コンテンツ" name="mature" />
+      <combo_box.item label="「General」コンテンツ" name="pg" />
+    </combo_box>
+    <check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます。" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
index bd1013d6ca..d405ba2ab5 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
@@ -1,42 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="グループインベントリ" name="GroupInfo">
-	<panel.string name="default_needs_apply_text">
-		保存していない変更があります
-	</panel.string>
-	<panel.string name="want_apply_text">
-		変更を保存しますか？
-	</panel.string>
-	<panel.string name="group_join_btn">
-		参加 （L$[AMOUNT]）
-	</panel.string>
-	<panel.string name="group_join_free">
-		無料
-	</panel.string>
-	<panel name="group_info_top">
-		<text_editor name="group_name" value="（ローディング...）"/>
-		<line_editor label="新しいグループの名前を入力してください" name="group_name_editor"/>
-	</panel>
-	<layout_stack name="layout">
-		<layout_panel name="group_accordions">
-			<accordion name="groups_accordion">
-				<accordion_tab name="group_general_tab" title="一般"/>
-				<accordion_tab name="group_roles_tab" title="役割 &amp; メンバー"/>
-				<accordion_tab name="group_notices_tab" title="通知"/>
-				<accordion_tab name="group_land_tab" title="土地・資産"/>
-				<accordion_tab name="group_experiences_tab" title="体験"/>
-			</accordion>
-		</layout_panel>
-	</layout_stack>
-	<layout_stack name="button_row_ls">
-		<layout_panel name="btn_chat_lp">
-			<button label="チャット" name="btn_chat"/>
-		</layout_panel>
-		<layout_panel name="call_btn_lp">
-			<button label="グループコール" name="btn_call" tool_tip="このグループにコールする"/>
-		</layout_panel>
-		<layout_panel name="btn_apply_lp">
-			<button label="保存" label_selected="保存" name="btn_apply"/>
-			<button label="グループを作成" name="btn_create" tool_tip="新しいグループを作成"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <panel.string name="default_needs_apply_text">保存していない変更があります。</panel.string>
+  <panel.string name="want_apply_text">変更を保存しますか？</panel.string>
+  <panel.string name="group_join_btn">入会費（L$ [AMOUNT]）</panel.string>
+  <panel.string name="group_join_free">無料</panel.string>
+  <panel name="group_info_top">
+    <text_editor name="group_name" value="（読み込んでいます…）" />
+    <line_editor label="新しいグループの名前を入力してください" name="group_name_editor" />
+  </panel>
+  <layout_stack name="layout">
+    <layout_panel name="group_accordions">
+      <accordion name="groups_accordion">
+        <accordion_tab name="group_general_tab" title="一般" />
+        <accordion_tab name="group_roles_tab" title="役割とメンバー" />
+        <accordion_tab name="group_notices_tab" title="通知" />
+        <accordion_tab name="group_land_tab" title="土地・資産" />
+        <accordion_tab name="group_experiences_tab" title="体験" />
+      </accordion>
+    </layout_panel>
+  </layout_stack>
+  <layout_stack name="button_row_ls">
+    <layout_panel name="btn_chat_lp">
+      <button label="チャット" name="btn_chat" />
+    </layout_panel>
+    <layout_panel name="call_btn_lp">
+      <button label="グループコール" name="btn_call" tool_tip="このグループにコールする" />
+    </layout_panel>
+    <layout_panel name="btn_apply_lp">
+      <button label="保存" label_selected="保存" name="btn_apply" />
+      <button label="グループを作成" name="btn_create" tool_tip="新しいグループを作成" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index 2639454a01..1cc01009e4 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -1,30 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーを招待" name="invite_panel">
-	<panel.string name="confirm_invite_owner_str">
-		本当に新しい所有者を招待しますか？この操作は取り消しできません。
-	</panel.string>
-	<panel.string name="loading">
-		(ローディング．．．)
-	</panel.string>
-	<panel.string name="already_in_group">
-		選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。
-	</panel.string>
-	<panel.string name="invite_selection_too_large">
-		グループへの招待が送信されていません: 選択された住人が多すぎます。グループへの招待は1回のリクエストあたり100人に制限されています。
-	</panel.string>
-	<text bottom_delta="-96" font="SansSerifSmall" height="72" name="help_text">
-		グループには一度に複数の住人を招待することができます。 「リストから住人を選択」をクリックしてください。
-	</text>
-	<button bottom_delta="-10" label="リストから住人を選択" name="add_button" tool_tip=""/>
-	<name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます"/>
-	<button label="リストから選択したものを削除" name="remove_button" tool_tip="招待リストから上で選択した住人を削除します"/>
-	<text name="role_text">
-		割り当て先の役割を選択：
-	</text>
-	<combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください"/>
-	<button label="招待状を送信" name="invite_button"/>
-	<button label="取り消し" name="cancel_button"/>
-	<string name="GroupInvitation">
-		グループへの招待
-	</string>
-</panel>
+  <panel.string name="confirm_invite_owner_str">本当に新しい所有者を招待しますか？この操作は取り消しできません。</panel.string>
+  <panel.string name="loading">（読み込んでいます…）</panel.string>
+  <panel.string name="already_in_group">選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。</panel.string>
+  <panel.string name="invite_selection_too_large">グループへの招待が送信されていません：選択された住人が多すぎます。
+グループへの招待は１回のリクエストあたり１００人に制限されています。</panel.string>
+  <text name="help_text">グループには一度に複数の住人を招待することができます。「リストから住人を選択」をクリックしてください。</text>
+  <button label="リストから住人を選択" name="add_button" tool_tip="" />
+  <name_list name="invitee_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます" />
+  <button label="リストから選択したものを削除" name="remove_button" tool_tip="招待リストから上で選択した住人を削除します" />
+  <text name="role_text">割り当て先の役割を選択：</text>
+  <combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください" />
+  <button label="招待状を送信" name="invite_button" />
+  <button label="キャンセル" name="cancel_button" />
+  <string name="GroupInvitation">グループへの招待</string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 82be58a0fb..f5ab70b68e 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -1,85 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="土地とL$" name="land_money_tab">
-	<panel.string name="help_text">
-		「土地利用の合計」が「寄付総額」以下、または同じになるまで警告が表示されます。
-	</panel.string>
-	<panel.string name="cant_view_group_land_text">
-		グループ所有地を確認する権限がありません。
-	</panel.string>
-	<panel.string name="epmty_view_group_land_text">
-		なし
-	</panel.string>
-	<panel.string name="cant_view_group_accounting_text">
-		グループの会計情報を確認する権限がありません。
-	</panel.string>
-	<panel.string name="loading_txt">
-		ロード中．．．
-	</panel.string>
-	<panel.string name="land_contrib_error">
-		土地の貢献を設定することができません
-	</panel.string>
-	<panel name="layout_panel_landmoney">
-		<scroll_list name="group_parcel_list">
-			<scroll_list.columns label="区画" name="name"/>
-			<scroll_list.columns label="地域" name="location"/>
-			<scroll_list.columns label="種類" name="type"/>
-			<scroll_list.columns label="面積" name="area"/>
-			<scroll_list.columns label="非表示" name="hidden"/>
-		</scroll_list>
-		<text name="total_contributed_land_label">
-			寄付合計：
-		</text>
-		<text name="total_contributed_land_value">
-			[AREA] 平方メートル
-		</text>
-		<button label="地図" label_selected="地図" name="map_button"/>
-		<text name="total_land_in_use_label">
-			土地利用の合計：
-		</text>
-		<text name="total_land_in_use_value">
-			[AREA] 平方メートル
-		</text>
-		<text name="land_available_label">
-			利用可能の土地：
-		</text>
-		<text name="land_available_value">
-			[AREA] 平方メートル
-		</text>
-		<text name="your_contribution_label">
-			あなたの貢献：
-		</text>
-		<text name="your_contribution_units">
-			平方メートル
-		</text>
-		<text name="your_contribution_max_value">
-			（最大 [AMOUNT]）
-		</text>
-		<text name="group_over_limit_text">
-			土地利用をサポートするための土地クレジットが足りません
-		</text>
-		<text name="group_money_heading">
-			グループの L$
-		</text>
-	</panel>
-	<tab_container name="group_money_tab_container">
-		<panel label="計画" name="group_money_planning_tab">
-			<text_editor name="group_money_planning_text">
-				ローディング...
-			</text_editor>
-		</panel>
-		<panel label="詳細" name="group_money_details_tab">
-			<text_editor name="group_money_details_text">
-				ローディング...
-			</text_editor>
-			<button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週"/>
-			<button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週"/>
-		</panel>
-		<panel label="販売取引" name="group_money_sales_tab">
-			<text_editor name="group_money_sales_text">
-				ローディング...
-			</text_editor>
-			<button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週"/>
-			<button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週"/>
-		</panel>
-	</tab_container>
-</panel>
+  <panel.string name="help_text">「土地の総利用量」が「総貢献額」以下、または同じになるまで警告が表示されます。</panel.string>
+  <panel.string name="cant_view_group_land_text">グループ所有地を確認する権限がありません。</panel.string>
+  <panel.string name="epmty_view_group_land_text">なし</panel.string>
+  <panel.string name="cant_view_group_accounting_text">グループの会計情報を確認する権限がありません。</panel.string>
+  <panel.string name="loading_txt">読み込んでいます…</panel.string>
+  <panel.string name="land_contrib_error">土地の貢献を設定することができません。</panel.string>
+  <!--
+  <text name="group_land_heading">グループ所有の土地</text>
+  -->
+  <panel name="layout_panel_landmoney">
+    <scroll_list name="group_parcel_list">
+      <scroll_list.columns label="区画" name="name" />
+      <scroll_list.columns label="リージョン（地域）" name="location" />
+      <scroll_list.columns label="種別" name="type" />
+      <scroll_list.columns label="エリア" name="area" />
+      <scroll_list.columns label="非表示" name="hidden" />
+    </scroll_list>
+    <text name="total_contributed_land_label">総貢献額：</text>
+    <text name="total_contributed_land_value">[AREA]㎡</text>
+    <button label="マップ" name="map_button" />
+    <text name="total_land_in_use_label">土地の総利用量：</text>
+    <text name="land_available_label">利用可能な土地：</text>
+    <text name="land_available_value">[AREA]㎡</text>
+    <text name="your_contribution_label">あなたの貢献：</text>
+    <line_editor name="your_contribution_line_editor" />
+    <text name="your_contribution_units">㎡</text>
+    <text name="your_contribution_max_value">（最大[AMOUNT]）</text>
+    <text name="group_over_limit_text">使用中の土地をサポートするには、より多くの土地クレジットが必要です。</text>
+    <text name="group_money_heading">グループのL$</text>
+  </panel>
+  <tab_container name="group_money_tab_container">
+    <panel label="計画中" name="group_money_planning_tab">
+      <text_editor name="group_money_planning_text">読み込んでいます…</text_editor>
+    </panel>
+    <panel label="詳細情報" name="group_money_details_tab">
+      <text_editor name="group_money_details_text">読み込んでいます…</text_editor>
+      <button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週" />
+      <button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週" />
+    </panel>
+    <panel label="販売中" name="group_money_sales_tab">
+      <text_editor name="group_money_sales_text">読み込んでいます…</text_editor>
+      <button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週" />
+      <button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週" />
+    </panel>
+  </tab_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 77d3d8f391..e5eee591bf 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
-	<text name="group_name" value="不明"/>
-	<button name="info_btn" tool_tip="詳細"/>
-	<button name="profile_btn" tool_tip="プロフィールの表示"/>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <group_icon name="group_icon" />
+  <text name="group_name" value="不明" />
+  <button name="info_btn" tool_tip="詳細詳細" />
+  <!--*TODO: Should only appear on rollover-->
+  <button name="profile_btn" tool_tip="プロフィールの表示" />
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
index 77d3d8f391..49f9c85545 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
-	<text name="group_name" value="不明"/>
-	<button name="info_btn" tool_tip="詳細"/>
-	<button name="profile_btn" tool_tip="プロフィールの表示"/>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <group_icon name="group_icon" />
+  <text name="group_name" value="不明" />
+  <button name="visibility_hide_btn" tool_tip="プロフィールでグループを非表示にする" />
+  <button name="visibility_show_btn" tool_tip="プロフィールでグループを表示する" />
+  <button name="info_btn" tool_tip="詳細情報" />
+  <!--*TODO: Should only appear on rollover-->
+  <button name="profile_btn" tool_tip="プロフィールの表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index ddad6c1f9b..0fbdc693f8 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
@@ -1,62 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="通知" name="notices_tab">
-	<panel.string name="help_text">
-		通知でメッセージを送ることができ、通知にアイテムを添付することができます。
+  <panel.string name="help_text">通知でメッセージを送ることができ、アイテムを添付することができます。
 通知を受け取ることができる「役割」にあるメンバーだけに送信されます。
-「一般」タブで通知の受信をオフにすることができます。
-	</panel.string>
-	<panel.string name="no_notices_text">
-		過去の通知はありません
-	</panel.string>
-	<text name="lbl2">
-		通知は 14 日間保存されます。
-1 日の制限数は 200 通です。
-	</text>
-	<scroll_list name="notice_list">
-		<scroll_list.columns label="" name="icon"/>
-		<scroll_list.columns label="件名" name="subject"/>
-		<scroll_list.columns label="送信者" name="from"/>
-		<scroll_list.columns label="日付" name="date"/>
-	</scroll_list>
-	<text name="notice_list_none_found">
-		見つかりませんでした
-	</text>
-	<button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します"/>
-	<button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します"/>
-	<panel label="新しい通知を作成" name="panel_create_new_notice">
-		<text name="lbl">
-			通知の作成
-		</text>
-		<text name="lbl3">
-			件名：
-		</text>
-		<text name="lbl4">
-			内容：
-		</text>
-		<text name="lbl5">
-			添付：
-		</text>
-		<text name="string">
-			ここにアイテムをドラッグ＆ドロップして添付してください：
-		</text>
-		<button label="インベントリ" name="open_inventory" tool_tip="インベントリを開きます"/>
-		<button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します"/>
-		<button label="送信" label_selected="送信" name="send_notice"/>
-		<group_drop_target name="drop_target" tool_tip="インベントリのアイテムをこのボックスにドラッグして、通知と一緒に送ります。 添付するには、そのアイテムのコピーと再販・プレゼントの権限があなたにある必要があります。"/>
-	</panel>
-	<panel label="過去の通知を表示" name="panel_view_past_notice">
-		<text name="lbl">
-			アーカイブ通知
-		</text>
-		<text name="lbl2">
-			新しい通知を送信するには、+ ボタンを押してください
-		</text>
-		<text name="lbl3">
-			件名：
-		</text>
-		<text name="lbl4">
-			内容：
-		</text>
-		<button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment"/>
-	</panel>
-</panel>
+「一般」タブで通知の受信をオフにすることができます。</panel.string>
+  <panel.string name="no_notices_text">過去の通知はありません</panel.string>
+  <text name="lbl2">通知は１４日間保存されます。
+１日の制限数は２００通です。</text>
+  <scroll_list name="notice_list">
+    <scroll_list.columns label="" name="icon" />
+    <scroll_list.columns label="件名" name="subject" />
+    <scroll_list.columns label="送信者" name="from" />
+    <scroll_list.columns label="日付" name="date" />
+  </scroll_list>
+  <text name="notice_list_none_found">見つかりませんでした</text>
+  <button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します" />
+  <button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します" />
+  <panel label="新しい通知を作成" name="panel_create_new_notice">
+    <text name="lbl">通知の作成</text>
+    <text name="lbl3">件名：</text>
+    <text name="lbl4">内容：</text>
+    <text name="lbl5">添付：</text>
+    <text name="string">ここにアイテムをドラッグ＆ドロップして添付してください：</text>
+    <button label="インベントリ" name="open_inventory" tool_tip="インベントリを開きます" />
+    <button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します" />
+    <button label="送信" label_selected="送信" name="send_notice" />
+    <group_drop_target name="drop_target" tool_tip="インベントリのアイテムをこのボックスにドラッグして、通知と一緒に送ります。添付するには、そのアイテムのコピーと再販・譲渡の権限があなたにある必要があります。" />
+  </panel>
+  <panel label="過去の通知を表示" name="panel_view_past_notice">
+    <text name="lbl">アーカイブ通知</text>
+    <text name="lbl2">新しい通知を送信するには、＋ボタンを押してください</text>
+    <text name="lbl3">件名：</text>
+    <text name="lbl4">内容：</text>
+    <button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
index 7135ae780d..a30a906bc7 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="instant_message" name="panel_group_notify">
-	<string name="message_max_lines_count" value="7"/>
-	<string name="subject_font" value="SANSSERIF_BIG"/>
-	<string name="date_font" value="SANSSERIF"/>
-	<panel label="header" name="header">
-		<text name="title" value="送信者の名前 / グループ名"/>
-	</panel>
-	<text_editor name="message" value="message"/>
-	<text name="attachment" value="添付アイテム"/>
-	<button label="OK" name="btn_ok"/>
-</panel>
+<panel label="インスタントメッセージ" name="panel_group_notify">
+  <string name="message_max_lines_count" value="7" />
+  <string name="subject_font" value="サンセリフ大" />
+  <string name="date_font" value="サンセリフ" />
+  <panel label="header" name="header">
+    <group_icon name="group_icon" />
+    <text name="title" value="送信者の名前／グループ名" />
+  </panel>
+  <text_editor name="message" value="メッセージ" />
+  <icon name="attachment_icon" />
+  <text name="attachment" value="添付アイテム" />
+  <button label="ＯＫ" name="btn_ok" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index ef8f55b60e..953fdb3b7f 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
@@ -1,98 +1,110 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーと役割" name="roles_tab">
-	<panel.string name="default_needs_apply_text">保存していない変更があります</panel.string>
-	<panel.string name="want_apply_text">変更を保存しますか？</panel.string>
-	<tab_container name="roles_tab_container">
-		<panel label="メンバー" name="members_sub_tab" tool_tip="メンバー">
-			<panel.string name="help_text">あなたはメンバーに割り当てられた役割を付加、削除できます。
-Ctrl キーを押しながらメンバー名をクリックすると
-複数の人を選択できます。</panel.string>
-			<panel.string name="donation_area">[AREA] 平方メートル</panel.string>
-			<filter_editor label="メンバーを選別" name="filter_input"/>
-			<name_list name="member_list">
-				<name_list.columns label="メンバー" name="name"/>
-				<name_list.columns label="寄付" name="donated"/>
-				<name_list.columns label="ステータス" name="online"/>
-				<name_list.columns label="職名" name="title"/>
-			</name_list>
-			<button label="招待" name="member_invite"/>
-			<button label="追放" name="member_eject"/>
-			<button label="メンバーの立入禁止" name="member_ban"/>
-		</panel>
-		<panel label="役割" name="roles_sub_tab">
-			<panel.string name="help_text">役割には、タイトルと許可された能力が
-割り当てられています。メンバーは
-1つ以上の役割を持つことができます。グループで使える役割は10つまでで、
-「全員（Everyone）」と「オーナー（Owner）」がそれに含まれています。</panel.string>
-			<panel.string name="cant_delete_role">「全員（Everyone）」と「オーナー（Owner）」の役割は削除することができません。</panel.string>
-			<panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
-			<panel.string name="power_all_have_icon">Checkbox_On</panel.string>
-			<panel.string name="power_partial_icon">Checkbox_Off</panel.string>
-			<filter_editor label="役割を選別" name="filter_input"/>
-			<scroll_list name="role_list">
-				<scroll_list.columns label="役割" name="name"/>
-				<scroll_list.columns label="肩書き" name="title"/>
-				<scroll_list.columns label="#" name="members"/>
-			</scroll_list>
-			<button label="新しい役割" name="role_create"/>
-			<button label="役割を削除" name="role_delete"/>
-		</panel>
-		<panel label="能力" name="actions_sub_tab" tool_tip="能力の説明文には、どの役割・メンバーがその能力を持つかが書かれています。">
-			<panel.string name="help_text">役割に含まれたメンバーに、このグループで特定の
-活動を行うことを許可する能力。さまざまな能力が提供されます。</panel.string>
-			<filter_editor label="能力を選別" name="filter_input"/>
-			<scroll_list name="action_list" tool_tip="詳細を見るには、能力を選んでください。">
-				<scroll_list.columns label="" name="action"/>
-			</scroll_list>
-		</panel>
-		<panel label="立入禁止にされた住人" name="banlist_sub_tab" tool_tip="このグループから立ち入り禁止にされた住人を表示します。">
-			<panel.string name="help_text">立入禁止リストに登録された住人はグループに参加できません。</panel.string>
-			<panel.string name="ban_count_template">立入禁止の人数: [COUNT]/[LIMIT]</panel.string>
-			<name_list name="ban_list">
-				<name_list.columns label="住人" name="name"/>
-				<name_list.columns label="立入禁止にされた日付" name="ban_date"/>
-			</name_list>
-			<button label="住人の立入禁止" name="ban_create" tool_tip="グループから住人を立入禁止にする"/>
-			<button label="立入禁止の解除" name="ban_delete" tool_tip="選択した住人のグループへの立ち入り禁止を解除"/>
-			<button name="ban_refresh" tool_tip="立入禁止リストの更新"/>
-		</panel>
-		<button name="role_copy" label="コピーロール"/>
-	</tab_container>
-	<panel name="members_footer">
-		<text name="static">割当られた役割</text>
-		<scroll_list name="member_assigned_roles">
-			<scroll_list.columns label="" name="checkbox"/>
-			<scroll_list.columns label="" name="role"/>
-		</scroll_list>
-		<text name="static2">許可された能力</text>
-		<scroll_list name="member_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
-			<scroll_list.columns label="" name="action"/>
-		</scroll_list>
-	</panel>
-	<panel name="members_header">
-		<text_editor name="member_action_description">これは「このグループからメンバーを追放」する能力です。「オーナー」のみが他の「オーナー」を追放できます。</text_editor>
-	</panel>
-	<panel name="roles_footer">
-		<text name="static">役割名</text>
-		<line_editor name="role_name"/>
-		<text name="static3">役割タイトル</text>
-		<line_editor name="role_title"/>
-		<text name="static2">説明</text>
-		<text_editor name="role_description"/>
-		<text name="static4">割当られたメンバー</text>
-		<check_box label="Reveal members" name="role_visible_in_list" tool_tip="グループ外の人が一般タブを見たときに、この役割のメンバーが表示されるかどうかを設定します。"/>
-		<text name="static5" tool_tip="現在選択されている役割で実行できる能力のリスト">許可された能力</text>
-		<scroll_list name="role_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
-			<scroll_list.columns label="" name="checkbox"/>
-			<scroll_list.columns label="" name="action"/>
-		</scroll_list>
-	</panel>
-	<panel name="roles_header">
-		<text_editor name="role_action_description">これは「このグループからメンバーを追放」する能力です。「オーナー」のみが他の「オーナー」を追放できます。</text_editor>
-	</panel>
-	<panel name="actions_footer">
-		<text_editor name="action_description">これは「グループからメンバーを追放する」能力です。 オーナーを追放できるのは、別のオーナーだけです。</text_editor>
-		<text name="static2">この能力を持つ役割</text>
-		<text name="static3">この能力を持つメンバー</text>
-	</panel>
-</panel>
+  <panel.string name="default_needs_apply_text">保存していない変更があります。</panel.string>
+  <panel.string name="want_apply_text">変更を保存しますか？</panel.string>
+  <tab_container name="roles_tab_container">
+    <panel label="メンバー" name="members_sub_tab" tool_tip="メンバー">
+      <panel.string name="help_text">ここからメンバーに役割を付与したり、削除することができます。
+        Ctrlキーを押しながら、メンバー名をクリックすることで複数の人を選択できます。</panel.string>
+      <panel.string name="donation_area">[AREA]㎡</panel.string>
+      <filter_editor label="メンバーをフィルタ" name="filter_input" />
+      <name_list name="member_list">
+        <name_list.columns label="メンバー" name="name" />
+        <name_list.columns label="寄付" name="donated" />
+        <name_list.columns label="ステータス" name="online" />
+        <name_list.columns label="タイトル" name="title" />
+      </name_list>
+      <button label="招待" name="member_invite" />
+      <button label="追放" name="member_eject" />
+      <button label="メンバーの立入禁止" name="member_ban" />
+    </panel>
+    <panel label="役割" name="roles_sub_tab">
+      <!-- <button label="すべてを表示" name="show_all_button" />-->
+      <panel.string name="help_text">役割には、タイトルと許可された能力が割り当てられています。
+メンバーは１つ以上の役割を持つことができます。
+グループで使える役割は１０個までで、「全員（Everyone）」と「所有者（Owner）」がそれに含まれています。</panel.string>
+      <panel.string name="cant_delete_role">「全員（Everyone）」と「所有者（Owner）」の役割は削除することができません。</panel.string>
+      <panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
+      <panel.string name="power_all_have_icon">Checkbox_On</panel.string>
+      <panel.string name="power_partial_icon">Checkbox_Off</panel.string>
+      <filter_editor label="役割をフィルタ" name="filter_input" />
+      <scroll_list name="role_list">
+        <scroll_list.columns label="役割" name="name" />
+        <scroll_list.columns label="タイトル" name="title" />
+        <scroll_list.columns label="＃" name="members" />
+      </scroll_list>
+      <button label="新しい役割" name="role_create" />
+      <button label="役割をコピー" name="role_copy" />
+      <button label="役割を削除" name="role_delete" />
+    </panel>
+    <panel label="能力" name="actions_sub_tab" tool_tip="能力の説明と、その能力を実行できるロールとメンバーを表示できます。">
+      <panel.string name="help_text">能力は、ロール内のメンバーはこのグループ内で特定のことを行うことができます。
+多種多様な能力が指定可能です。</panel.string>
+      <panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
+      <panel.string name="power_all_have_icon">Checkbox_On</panel.string>
+      <panel.string name="power_partial_icon">Checkbox_Off</panel.string>
+      <filter_editor label="能力でフィルタ" name="filter_input" />
+      <scroll_list name="action_list" tool_tip="詳細を見るには、能力を選んでください。">
+        <scroll_list.columns label="" name="icon" />
+        <scroll_list.columns label="" name="checkbox" />
+        <scroll_list.columns label="" name="action" />
+      </scroll_list>
+    </panel>
+    <panel label="バンされた住民" name="banlist_sub_tab" tool_tip="このグループからバンされた住人を表示します。">
+      <panel.string name="help_text">バンリストに登録された住人は、グループに参加できません。</panel.string>
+      <panel.string name="ban_count_template">バンされた人数：[LIMIT]人中[COUNT]人</panel.string>
+      <name_list name="ban_list">
+        <name_list.columns label="住人" name="name" />
+        <name_list.columns label="バンした日付" name="ban_date" />
+      </name_list>
+      <button label="住人をバンする" name="ban_create" tool_tip="グループから住人をバンします。" />
+      <button label="バンの解除" name="ban_delete" tool_tip="選択した住人のバンを解除します。" />
+      <button label="リフレッシュ" name="ban_refresh" tool_tip="バンリストをリフレッシュします。" />
+      <text name="ban_count" width="100" />
+    </panel>
+  </tab_container>
+  <panel name="members_footer">
+    <text name="static">割当られた役割</text>
+    <scroll_list name="member_assigned_roles">
+      <scroll_list.columns label="" name="checkbox" />
+      <scroll_list.columns label="" name="role" />
+    </scroll_list>
+    <text name="static2">許可されたアクション</text>
+    <scroll_list name="member_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
+      <scroll_list.columns label="" name="icon" />
+      <scroll_list.columns label="" name="checkbox" />
+      <scroll_list.columns label="" name="action" />
+    </scroll_list>
+  </panel>
+  <panel name="members_header">
+    <text_editor name="member_action_description">
+      これは「このグループからメンバーを追放」する能力です。「所有者」のみが他の「所有者」を追放できます。</text_editor>
+  </panel>
+  <panel name="roles_footer">
+    <text name="static">役割名</text>
+    <line_editor name="role_name" />
+    <text name="static3">役割タイトル</text>
+    <line_editor name="role_title" />
+    <text name="static2">説明</text>
+    <text_editor name="role_description" />
+    <text name="static4">割当られたメンバー</text>
+    <check_box label="Reveal members" name="role_visible_in_list" tool_tip="グループ外の人が一般タブを見たときに、この役割のメンバーが表示されるかどうかを設定します。" />
+    <text name="static5" tool_tip="現在選択されている役割で実行できる能力のリスト">許可された能力</text>
+    <scroll_list name="role_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
+      <scroll_list.columns label="" name="icon" />
+      <scroll_list.columns label="" name="checkbox" />
+      <scroll_list.columns label="" name="action" />
+    </scroll_list>
+  </panel>
+  <panel name="roles_header">
+    <text_editor name="role_action_description">これは「このグループからメンバーを追放」する能力です。
+「所有者」のみが他の「所有者」を追放できます。</text_editor>
+  </panel>
+  <panel name="actions_footer">
+    <text_editor name="action_description">これは「グループからメンバーを追放する」能力です。
+「所有者」を追放できるのは、別の「所有者」だけです。</text_editor>
+    <text name="static2">この能力を持つ役割</text>
+    <text name="static3">この能力を持つメンバー</text>
+    <name_list name="action_members" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml b/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
new file mode 100644
index 0000000000..e815842746
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_hide_beacon">
+  <button label="ビーコンを隠す" name="hide_beacon_btn" tool_tip="トラッキングを停止してビーコンを隠す。" />
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
index bf4cbcdc46..e99e71b975 100644
--- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="im_panel" name="im_panel">
-	<string name="message_max_lines_count">
-		6
-	</string>
-	<panel label="im_header" name="im_header">
-		<text name="time_box" value="23:30"/>
-	</panel>
-	<button label="返信" name="reply"/>
-</panel>
+  <string name="message_max_lines_count">6</string>
+  <panel label="IMのヘッダ" name="im_header">
+    <avatar_icon name="avatar_icon" />
+    <group_icon name="group_icon" />
+    <avatar_icon name="adhoc_icon" />
+    <text name="user_name" value="テスト文字列　無視してください" />
+    <!-- TIME STAMP -->
+    <text name="time_box" value="23：30" />
+  </panel>
+  <text name="message" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
index d18047fbcf..a22574c9fb 100644
--- a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="inventory_item">
-	<text name="item_name" value="..."/>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index 7fca66f90f..7681a423d8 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
@@ -1,41 +1,51 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="landmark_info">
-	<string name="title_create_landmark" value="ランドマークを作成"/>
-	<string name="title_edit_landmark" value="ランドマークを編集"/>
-	<string name="title_landmark" value="ランドマーク"/>
-	<string name="not_available" value="（該当なし）"/>
-	<string name="unknown" value="（不明）"/>
-	<string name="public" value="（公開）"/>
-	<string name="server_update_text">
-		場所の情報はサーバーがアップデートされるまでご利用いただけません。
-	</string>
-	<string name="server_error_text">
-		この位置の情報は現在ご利用いただけません。あとでもう一度お試しください。
-	</string>
-	<string name="server_forbidden_text">
-		この位置の情報は、アクセス制限のためご利用いただけません。  許可については区画所有者にお問い合わせください。
-	</string>
-	<string name="acquired_date">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</string>
-	<button name="back_btn" tool_tip="戻る"/>
-	<text name="title" value="場所のプロフィール"/>
-	<scroll_container name="place_scroll">
-		<panel name="scrolling_panel">
-			<text name="region_title" value="SampleRegion"/>
-			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
-			<expandable_text name="description" value="Du waltz die spritz"/>
-			<text name="maturity_value" value="不明"/>
-			<panel name="landmark_info_panel">
-				<text name="owner_label" value="所有者："/>
-				<text name="creator_label" value="制作者："/>
-				<text name="created_label" value="制作日："/>
-			</panel>
-			<panel name="landmark_edit_panel">
-				<text name="title_label" value="タイトル："/>
-				<text name="notes_label" value="メモ："/>
-				<text name="folder_label" value="ランドマークの位置："/>
-			</panel>
-		</panel>
-	</scroll_container>
-</panel>
+  <string name="title_create_landmark" value="ランドマークを作成" />
+  <string name="title_edit_landmark" value="ランドマークを編集" />
+  <string name="title_landmark" value="ランドマーク" />
+  <string name="not_available" value="（該当なし）" />
+  <string name="unknown" value="（不明）" />
+  <string name="public" value="（公開）" />
+  <string name="server_update_text">場所の情報はサーバーがアップデートされるまでご利用いただけません。</string>
+  <string name="server_error_text">この位置の情報は現在ご利用いただけません。あとでもう一度お試しください。</string>
+  <string name="server_forbidden_text">この位置の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。</string>
+  <string name="acquired_date">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日（[wkday,datetime,local]）　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</string>
+  <string name="icon_PG" value="Parcel_PG_Dark" />
+  <string name="icon_M" value="Parcel_M_Dark" />
+  <string name="icon_R" value="Parcel_R_Dark" />
+  <button name="back_btn" tool_tip="戻る" />
+  <text name="title" value="場所のプロフィール" />
+  <scroll_container name="place_scroll">
+    <panel name="scrolling_panel">
+      <texture_picker name="logo" />
+      <!-- texture picker has an empty label section, compensate for it with negative top_pad-->
+      <text name="parcel_title" value="SampleParcel, Name Long" />
+      <text name="region_title">リージョン（地域）：[REGIONAMEPOS]</text>
+      <text name="parcel_owner_label" value="所有者：" />
+      <text name="parcel_owner" value="一時的な所有者" />
+      <expandable_text name="description" value="Du waltz die spritz" />
+      <icon name="maturity_icon" />
+      <text name="maturity_value" value="不明" />
+      <panel name="landmark_info_panel">
+        <view_border name="lod_tab_border" />
+        <text name="this_landmark">ランドマーク：</text>
+        <text name="owner_label" value="所有者：" />
+        <text name="owner" />
+        <text name="creator_label" value="作成者：" />
+        <text name="creator" />
+        <text name="created_label" value="作成日：" />
+        <text name="created" />
+      </panel>
+      <panel name="landmark_edit_panel">
+        <text value="タイトル：" />
+        <line_editor name="title_value" />
+        <button name="edit_btn" tool_tip="ランドマーク情報を編集" />
+        <line_editor name="title_editor"/>
+        <text name="notes_label" value="ノート：" />
+        <text_editor name="notes_editor" />
+        <text name="folder_label" value="ランドマークの場所：" />
+        <combo_box name="folder_combo" />
+      </panel>
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index db4b0aea23..a1af2cbf85 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,22 +1,28 @@
-<?xml version="1.0" ?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=ja</panel.string>
-	<panel.string name="sign_up_url">https://join.secondlife.com/</panel.string>
-	<layout_stack name="ui_stack">
-		<layout_panel name="ui_container">
-			<combo_box label="ユーザー名" name="username_combo" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）"/>
-			<line_editor label="パスワード" name="password_edit"/>
-			<combo_box label="お気に入りの場所" name="start_location_combo">
-				<combo_box.item label="最後にログアウトした場所" name="MyLastLocation"/>
-				<combo_box.item label="ホーム" name="MyHome"/>
-			</combo_box>
-			<button label="ログイン" name="connect_btn"/>
-			<check_box label="記憶する" name="remember_check"/>
-			<text name="forgot_password_text">パスワードを忘れた場合</text>
-			<combo_box label="グリッドを選択" name="server_combo"/>
-			<text name="sign_up_text">登録</text>
-		</layout_panel>
-		<check_box name="remember_name" label="記憶する" tool_tip="記憶されたユーザーを削除することができます。私 &gt; プリファレンス&gt; アドバンス &gt; 記憶されたユーザー名"/>
-		<check_box name="remember_password" label="パスワードを記憶する"/>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login" focus_root="true">
+  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
+  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
+  <layout_stack name="ui_stack">
+    <layout_panel name="ui_elastic_pad_left" />
+    <layout_panel name="ui_container">
+      <icon name="sl_logo_small" />
+      <combo_box label="Username" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
+        <combo_box.combo_editor />
+      </combo_box>
+      <line_editor name="password_edit" label="パスワード" />
+      <combo_box label="お気に入りの場所" name="start_location_combo">
+        <combo_box.combo_editor />
+        <combo_box.item label="最後にいた場所" name="MyLastLocation" value="last" />
+        <combo_box.item label="ホーム" name="MyHome" value="home" />
+      </combo_box>
+      <button label="ログイン" name="connect_btn" />
+      <text name="sign_up_text">サインアップ</text>
+      <check_box label="名前を記録" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。" />
+      <check_box label="パスワードを記録" name="remember_password" />
+      <combo_box label="Select grid" name="server_combo" />
+      <text name="forgot_password_text">パスワードに関するヘルプ</text>
+    </layout_panel>
+    <layout_panel name="ui_elastic_pad_right" />
+  </layout_stack>
+  <web_browser name="login_html" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_login_first.xml b/indra/newview/skins/default/xui/ja/panel_login_first.xml
index 644cee25f2..e878b2524a 100644
--- a/indra/newview/skins/default/xui/ja/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login_first.xml
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php?lang=ja
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="ユーザー名" name="username_combo" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）"/>
-					<line_editor label="パスワード" name="password_edit"/>
-					<button label="ログイン" name="connect_btn"/>
-					<check_box label="記憶する" name="remember_check"/>
-					<text name="forgot_password_text">
-						パスワードを忘れた場合
-					</text>
-					<text name="sign_up_text">
-						登録
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						最初のステップは、アイランドについて学ぶことです。さあ、アイランド探検の入口を見つけてください!
-					</text>
-					<text name="image_caption_right">
-						ソーシャル アイランドを探検して、他の新しい住人を探してください!
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
+  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
+  <layout_stack name="logo_stack">
+    <layout_panel name="page_top" />
+    <!-- start of logo stack -->
+    <layout_panel name="parent_panel">
+      <layout_stack name="logo_stack">
+        <layout_panel name="logo_left" />
+        <layout_panel name="logo_container">
+          <icon name="sl_logo" />
+        </layout_panel>
+        <layout_panel auto_resize="true" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of logo stack -->
+    <!-- start of widget stack -->
+    <layout_panel name="parent_panel2">
+      <layout_stack name="widget_stack">
+        <layout_panel name="widget_left" />
+        <layout_panel name="widget_container">
+          <combo_box label="ユーザ名" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
+            <combo_box.combo_editor />
+            <combo_box.combo_button />
+            <combo_box.drop_down_button />
+          </combo_box>
+          <line_editor name="password_edit" label="パスワード" />
+          <button label="ログイン" name="connect_btn" />
+          <text name="sign_up_text" valign="center">サインアップ</text>
+          <check_box label="ユーザ名を記憶" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。" />
+          <check_box label="パスワード記憶" name="remember_password" />
+          <text name="forgot_password_text">
+            パスワードを忘れましたか？
+          </text>
+        </layout_panel>
+        <layout_panel name="widget_right" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of widget stack -->
+    <!-- start of images stack -->
+    <layout_panel name="parent_panel3">
+      <layout_stack name="images_stack">
+        <layout_panel name="images_left" />
+        <layout_panel name="images_container">
+          <icon name="image_left" />
+        </layout_panel>
+        <layout_panel name="images_right" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of images stack -->
+    <layout_panel name="page_bottom" />
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 5751154163..9a59e82f34 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="もの" name="main inventory panel">
-	<panel.string name="ItemcountFetching">
-		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得中です... [FILTER]
-	</panel.string>
-	<panel.string name="ItemcountCompleted">
-		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダー [FILTER]
-	</panel.string>
-	<panel.string name="ItemcountUnknown">
-		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得しました [FILTER]
-	</panel.string>
-	<text name="ItemcountText">
-		アイテム：
-	</text>
-	<filter_editor label="検索用語を入力する" name="inventory search editor"/>
-	<combo_box name="search_type">
-		<item label="名前" name="Name" value="search_by_name"/>
-		<item label="制作者" name="Creator" value="search_by_creator"/>
-		<item label="説明" name="Description" value="search_by_description"/>
-		<item label="UUID" name="UUID" value="search_by_UUID"/>
-	</combo_box>
-	<tab_container name="inventory filter tabs">
-		<inventory_panel label="インベントリ" name="All Items"/>
-		<recent_inventory_panel label="最新" name="Recent Items"/>
-		<inventory_panel label="着用中" name="Worn Items"/>
-	</tab_container>
-	<layout_stack name="bottom_panel">
-		<layout_panel name="options_gear_btn_panel">
-			<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
-		</layout_panel>
-		<layout_panel name="add_btn_panel">
-			<button name="add_btn" tool_tip="新しいアイテムを追加します"/>
-		</layout_panel>
-		<layout_panel name="trash_btn_panel">
-			<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <panel.string name="ItemcountFetching">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得中です…。[FILTER]</panel.string>
+  <panel.string name="ItemcountCompleted">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダー[FILTER]</panel.string>
+  <panel.string name="ItemcountUnknown">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得しました[FILTER]</panel.string>
+  <text name="ItemcountText">アイテム：</text>
+  <filter_editor label="検索用語を入力する" name="inventory search editor" />
+  <combo_box name="search_type">
+    <item label="名前" name="Name" value="search_by_name" />
+    <item label="制作者" name="Creator" value="search_by_creator" />
+    <item label="説明" name="Description" value="search_by_description" />
+    <item label="ＵＵＩＤ" name="UUID" value="search_by_UUID" />
+  </combo_box>
+  <menu_button tool_tip="検索表示オプションを表示" name="options_visibility_btn" />
+  <filter_editor label="検索語句を入力" name="inventory search editor" />
+  <tab_container name="inventory filter tabs">
+    <inventory_panel label="インベントリ" name="All Items" />
+    <recent_inventory_panel label="最新" name="Recent Items" />
+    <inventory_panel label="着用中" name="Worn Items" />
+  </tab_container>
+  <layout_stack name="bottom_panel">
+    <layout_panel name="options_gear_btn_panel">
+      <menu_button name="options_gear_btn" tool_tip="オプションを表示します。" />
+    </layout_panel>
+    <layout_panel name="add_btn_panel">
+      <button name="add_btn" tool_tip="新しいアイテムを追加します。" />
+    </layout_panel>
+    <layout_panel name="trash_btn_panel">
+      <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します。" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
index a9218bebff..4cfc74bf3b 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="マーケットプレイス" name="Marketplace Panel">
-	<panel name="tool_panel">
-		<menu_button name="sort_btn" tool_tip="表示/並べ替えオプション"/>
-		<button name="add_btn" tool_tip="新規リストフォルダの作成"/>
-		<button label="エラーを確認" name="audit_btn" tool_tip="マーケットプレイスのリストを確認"/>
-	</panel>
-	<panel name="tab_container_panel">
-		<filter_editor label="マーケットプレイスのリストをフィルタ" name="filter_editor"/>
-	</panel>
-</panel>
+  <panel name="tool_panel">
+    <menu_button name="sort_btn" tool_tip="表示／並べ替えオプション" />
+    <button name="add_btn" tool_tip="新規リストフォルダの作成" />
+    <button label="エラーを確認" name="audit_btn" tool_tip="マーケットプレイスのリストを確認" />
+  </panel>
+  <panel name="tab_container_panel">
+    <filter_editor label="マーケットプレイスのリストをフィルタ" name="filter_editor" />
+  </panel>
+  <panel name="marketplace_drop_zone">
+    <text>ここにフォルダをドロップして新しいリストを作成</text>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
index 43cb64d6ba..6d447509b6 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="すべて" name="All Items" tool_tip="ここにアイテムをドラッグ＆ドロップしてリストに表示します"/>
+<inventory_panel label="すべて" name="All Items" tool_tip="ここにアイテムをドラッグ＆ドロップしてリストに表示します。" />
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
index 7f27231cbd..41ca08fe4b 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="リストに掲載" name="Active Items"/>
+<inventory_panel label="リストに掲載" name="Active Items" />
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
index 215be9ae6d..410661a3e5 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="関連付けされていない" name="Unassociated Items"/>
+<inventory_panel label="関連付けされていない" name="Unassociated Items" />
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
index 04530477f6..e29bbc62e3 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="リストから削除済み" name="Inactive Items"/>
+<inventory_panel label="リストから削除済み" name="Inactive Items" />
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
index 6321dbb048..df05a5df00 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="Media Settings General">
-	<text name="home_label">
-		ホームページ：
-	</text>
-	<text name="home_fails_whitelist_label">
-		（このページは指定したホワイトリストをパスしません）
-	</text>
-	<line_editor name="home_url" tool_tip="このメディアソースのホームページ"/>
-	<text name="preview_label">
-		プレビュー
-	</text>
-	<text name="current_url_label">
-		現在のページ：
-	</text>
-	<text name="current_url" tool_tip="メディアソースの現在のページ" value=""/>
-	<button label="リセット" name="current_url_reset_btn"/>
-	<check_box initial_value="false" label="ループ再生" name="auto_loop"/>
-	<check_box initial_value="false" label="最初にクリックしたときの動作" name="first_click_interact"/>
-	<check_box initial_value="false" label="自動ズーム" name="auto_zoom"/>
-	<check_box initial_value="false" label="自動メディア再生" name="auto_play"/>
-	<text name="media_setting_note">
-		注意： 住人はこの設定を無視できます
-	</text>
-	<check_box initial_value="false" label="オブジェクトの表面サイズに合わせて自動調整" name="auto_scale"/>
-	<text name="size_label">
-		サイズ：
-	</text>
-	<text name="X_label">
-		X
-	</text>
-</panel>
+  <text name="home_label">ホームページ：</text>
+  <text name="home_fails_whitelist_label">（このページは指定したホワイトリストをパスしません）</text>
+  <line_editor name="home_url" tool_tip="このメディアソースのホームページ" />
+
+  <web_browser name="preview_media" />
+
+  <text name="preview_label">プレビュー</text>
+
+  <text name="current_url_label">現在のページ：</text>
+  <text name="current_url" tool_tip="メディアソースの現在のページ" value="" />
+  <button label="リセット" name="current_url_reset_btn" />
+  <check_box label="ループ再生" name="auto_loop" />
+  <check_box label="最初にクリックしたときの動作" name="first_click_interact" />
+
+  <check_box label="自動ズーム" name="auto_zoom" />
+
+  <check_box label="自動メディア再生" name="auto_play" />
+
+  <text name="media_setting_note">注意： 住人はこの設定を無視できます</text>
+
+  <check_box label="オブジェクトの表面サイズに合わせて自動調整" name="auto_scale" />
+
+  <text name="size_label">サイズ：</text>
+  <text name="X_label">X</text>
+  <spinner label="" name="height_pixels" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
index 11d9ed4c16..509885d11d 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
@@ -1,29 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="カスタマイズ" name="Media settings for controls">
-	<text name="controls_label">
-		コントロール：
-	</text>
-	<combo_box name="controls">
-		<combo_item name="Standard">
-			標準
-		</combo_item>
-		<combo_item name="Mini">
-			ミニ
-		</combo_item>
-	</combo_box>
-	<text name="owner_label">
-		所有者
-	</text>
-	<check_box initial_value="false" label="ナビゲーションと相互作用力を有効にする" name="perms_owner_interact"/>
-	<check_box initial_value="false" label="コントロールバーを表示する" name="perms_owner_control"/>
-	<text name="group_label">
-		グループ：
-	</text>
-	<check_box initial_value="false" label="ナビゲーションと相互作用力を有効にする" name="perms_group_interact"/>
-	<check_box initial_value="false" label="コントロールバーを表示する" name="perms_group_control"/>
-	<text name="anyone_label">
-		全員
-	</text>
-	<check_box initial_value="false" label="ナビゲーションと相互作用力を有効にする" name="perms_anyone_interact"/>
-	<check_box initial_value="false" label="コントロールバーを表示する" name="perms_anyone_control"/>
-</panel>
+  <text name="controls_label">コントロール：</text>
+  <combo_box name="controls">
+    <combo_item name="Standard">標準</combo_item>
+    <combo_item name="Mini">ミニ</combo_item>
+  </combo_box>
+  <text name="owner_label">所有者</text>
+  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_owner_interact" />
+  <check_box label="コントロールバーを表示する" name="perms_owner_control" />
+  <text name="group_label">グループ：</text>
+  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_group_interact" />
+  <check_box label="コントロールバーを表示する" name="perms_group_control" />
+  <text name="anyone_label">全員</text>
+  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_anyone_interact" />
+  <check_box label="コントロールバーを表示する" name="perms_anyone_control" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
index ea4fdb9ce5..12bb265af2 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セキュリティ" name="Media Settings Security">
-	<check_box initial_value="false" label="指定した URL パターンから始まる接続を許可する" name="whitelist_enable"/>
-	<text name="home_url_fails_some_items_in_whitelist">
-		ホームページに失敗したエントリーがありました：
-	</text>
-	<button label="追加" name="whitelist_add"/>
-	<button label="削除" name="whitelist_del"/>
-	<text name="home_url_fails_whitelist">
-		警告： 「一般」タブで指定されたホームページは、ホワイトリストに掲載されていません。 正しい機能が設定されるまで、この機能は一時停止します。
-	</text>
-</panel>
+  <check_box label="指定したURLパターンから始まる接続を許可する。" name="whitelist_enable" />
+  <text name="home_url_fails_some_items_in_whitelist">ホームページに失敗したエントリーがありました：</text>
+  <button label="追加" name="whitelist_add" />
+  <button label="削除" name="whitelist_del" />
+  <text name="home_url_fails_whitelist">警告：「一般」タブで指定されたホームページは、ホワイトリストに掲載されていません。正しい機能が設定されるまで、この機能は一時停止します。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
index 51402b2e00..6a2e272a38 100644
--- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
-	<layout_stack name="nvp_stack">
-		<layout_panel name="navigation_layout_panel">
-			<panel name="navigation_panel">
-				<pull_button name="back_btn" tool_tip="前の場所"/>
-				<pull_button name="forward_btn" tool_tip="次の場所"/>
-				<button name="home_btn" tool_tip="「ホーム」にテレポートします"/>
-				<location_input label="所在地" name="location_combo"/>
-			</panel>
-		</layout_panel>
-		<layout_panel name="favorites_layout_panel">
-			<favorites_bar name="favorite" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
-				<label name="favorites_bar_label" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
-					お気に入りバー
-				</label>
-				<more_button name="&gt;&gt;" tool_tip="お気に入りをもっと表示">
-					詳細 ▼
-				</more_button>
-			</favorites_bar>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="nvp_stack">
+    <layout_panel name="navigation_layout_panel">
+      <panel name="navigation_panel">
+        <pull_button name="back_btn" tool_tip="前の場所" />
+        <pull_button name="forward_btn" tool_tip="次の場所" />
+        <button name="home_btn" tool_tip="「ホーム」にテレポートします" />
+        <location_input label="所在地" name="location_combo" />
+      </panel>
+    </layout_panel>
+    <layout_panel name="favorites_layout_panel">
+      <favorites_bar name="favorite" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
+        <label name="favorites_bar_label" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">お気に入りバー</label>
+        <more_button name="&gt;&gt;" tool_tip="お気に入りをもっと表示">詳細 ▼</more_button>
+      </favorites_bar>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
index 4048b48d3a..a4bd7963fb 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_chat">
-	<layout_stack name="stack">
-		<layout_panel name="translate_chat_checkbox_lp">
-			<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="stack">
+    <layout_panel name="translate_chat_checkbox_lp">
+      <check_box label="チャットを翻訳" name="translate_chat_checkbox" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 201fb0a376..b47a924f8e 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_chat">
-	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して発言し、Ctrl + Enter キーで叫びます。"/>
-	<button name="show_nearby_chat" tool_tip="近くのチャットログを表示・非表示"/>
-</panel>
+  <line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enterキーで発言し、Ctrl＋Enterキーでシャウトします。" />
+  <button name="show_nearby_chat" tool_tip="近隣チャットログを表示／非表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index c29ec64304..8ab941fe3a 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -1,71 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		（メディアアイテム %ld ）
-	</string>
-	<string name="empty_item_text">
-		&lt;空&gt;
-	</string>
-	<string name="parcel_media_name">
-		区画ストリーミングメディア
-	</string>
-	<string name="parcel_audio_name">
-		区画ストリーミングオーディオ
-	</string>
-	<string name="playing_suffix">
-		（再生中）
-	</string>
-	<panel name="minimized_controls">
-		<button label="すべて停止" name="all_nearby_media_disable_btn" tool_tip="近くのメディアをすべてオフにします"/>
-		<button label="すべて開始" name="all_nearby_media_enable_btn" tool_tip="近くのメディアをすべてオンにします"/>
-		<button name="open_prefs_btn" tool_tip="メディアの設定を開きます"/>
-		<button label="詳細 &gt;&gt;" label_selected="&lt;&lt; 簡易" name="more_btn" tool_tip="アドバンスコントロール"/>
-		<button label="詳細 &gt;&gt;" label_selected="簡易 &lt;&lt;" name="less_btn" tool_tip="アドバンスコントロール"/>
-	</panel>
-	<panel name="nearby_media_panel">
-		<text name="nearby_media_title">
-			近くのメディア
-		</text>
-		<text name="show_text">
-			表示：
-		</text>
-		<combo_box name="show_combo">
-			<combo_box.item label="すべて" name="All"/>
-			<combo_box.item label="この区画内" name="WithinParcel"/>
-			<combo_box.item label="この区画外" name="OutsideParcel"/>
-			<combo_box.item label="他のアバター" name="OnOthers"/>
-		</combo_box>
-		<scroll_list name="media_list">
-			<scroll_list.columns label="近接" name="media_proximity"/>
-			<scroll_list.columns label="表示" name="media_visibility"/>
-			<scroll_list.columns label="クラス" name="media_class"/>
-			<scroll_list.columns label="名前" name="media_name"/>
-			<scroll_list.columns label="デバッグ" name="media_debug"/>
-		</scroll_list>
-		<panel name="media_controls_panel">
-			<layout_stack name="media_controls">
-				<layout_panel name="stop">
-					<button name="stop_btn" tool_tip="選択したメディアを停止"/>
-				</layout_panel>
-				<layout_panel name="play">
-					<button name="play_btn" tool_tip="選択したメディアを再生"/>
-				</layout_panel>
-				<layout_panel name="pause">
-					<button name="pause_btn" tool_tip="選択したメディアを一時停止"/>
-				</layout_panel>
-				<layout_panel name="volume_slider_ctrl">
-					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="選択したメディアの音量"/>
-				</layout_panel>
-				<layout_panel name="mute">
-					<button name="mute_btn" tool_tip="選択したメディアの音をミュート"/>
-				</layout_panel>
-				<layout_panel name="zoom">
-					<button name="zoom_btn" tool_tip="選択したメディアにズーム"/>
-				</layout_panel>
-				<layout_panel name="unzoom">
-					<button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</panel>
-</panel>
+  <string name="media_item_count_format">（メディアアイテム %ld ）</string>
+  <string name="empty_item_text">&lt;空&gt;</string>
+  <string name="parcel_media_name">区画ストリーミングメディア</string>
+  <string name="parcel_audio_name">区画ストリーミングオーディオ</string>
+  <string name="playing_suffix">（再生中）</string>
+  <panel name="minimized_controls">
+    <button label="すべて停止" name="all_nearby_media_disable_btn" tool_tip="近隣のメディアをすべてオフにします" />
+    <button label="すべて開始" name="all_nearby_media_enable_btn" tool_tip="近隣のメディアをすべてオンにします" />
+    <button name="open_prefs_btn" tool_tip="メディアの設定を開きます" />
+    <button label="詳細　≫" label_selected="≪　簡易" name="more_btn" tool_tip="拡張コントロール" />
+    <button label="詳細　≫" label_selected="≪　簡易" name="less_btn" tool_tip="拡張コントロール" />
+  </panel>
+  <panel name="nearby_media_panel">
+    <text name="nearby_media_title">近隣のメディア</text>
+    <text name="show_text">表示：</text>
+    <combo_box name="show_combo">
+      <combo_box.item label="すべて" name="All" />
+      <combo_box.item label="この区画内" name="WithinParcel" />
+      <combo_box.item label="この区画外" name="OutsideParcel" />
+      <combo_box.item label="他のアバター" name="OnOthers" />
+    </combo_box>
+    <scroll_list name="media_list">
+      <scroll_list.columns label="近接" name="media_proximity" />
+      <scroll_list.columns label="表示" name="media_visibility" />
+      <scroll_list.columns label="クラス" name="media_class" />
+      <scroll_list.columns label="名前" name="media_name" />
+      <scroll_list.columns label="デバッグ" name="media_debug" />
+    </scroll_list>
+    <panel name="media_controls_panel">
+      <layout_stack name="media_controls">
+        <layout_panel name="stop">
+          <button name="stop_btn" tool_tip="選択したメディアを停止" />
+        </layout_panel>
+        <layout_panel name="play">
+          <button name="play_btn" tool_tip="選択したメディアを再生" />
+        </layout_panel>
+        <layout_panel name="pause">
+          <button name="pause_btn" tool_tip="選択したメディアを一時停止" />
+        </layout_panel>
+        <layout_panel name="volume_slider_ctrl">
+          <slider_bar name="volume_slider" tool_tip="選択したメディアの音量" />
+        </layout_panel>
+        <layout_panel name="mute">
+          <button name="mute_btn" tool_tip="選択したメディアの音をミュート" />
+        </layout_panel>
+        <layout_panel name="zoom">
+          <button name="zoom_btn" tool_tip="選択したメディアにズーム" />
+        </layout_panel>
+        <layout_panel name="unzoom">
+          <button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる" />
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notification.xml b/indra/newview/skins/default/xui/ja/panel_notification.xml
new file mode 100644
index 0000000000..ec3bc6a2b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_notification.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="通知パネル" name="notification_panel">
+  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
+  <panel label="情報パネル" name="info_panel">
+    <text name="text_box" />
+    <text name="caution_text_box" />
+    <text_editor name="text_editor_box" />
+  </panel>
+  <panel label="コントロールパネル" name="control_panel">
+    <!-- 
+    Notes:
+    This panel holds buttons of notification. Change of its size can affect the layout of buttons. 
+    -->
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
index 698aefdb3d..2ae07c1034 100644
--- a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
@@ -1,39 +1,88 @@
-<?xml version="1.0" ?>
-<panel name="main_panel">
-	<panel name="sender_time_panel_exp"/>
-	<panel name="main_info_panel_expanded"/>
-	<layout_panel name="layout_panel_middle_exp"/>
-	<layout_stack name="horizontal_stack"/>
-	<panel name="panel_expanded_view"/>
-	<layout_panel name="layout_panel_expanded_view"/>
-	<layout_stack name="item_vertical_stack"/>
-	<panel name="panel_total_view">
-		<text name="notification_time_exp" value="2014/12/24 23:30"/>
-		<text name="sender_or_fee_box_exp">送信者：「住人 住人 住人」</text>
-		<text name="notification_title_exp">通知件名 通知件名 通知件名 通知件名</text>
-		<avatar_icon name="avatar_icon" tool_tip="アバター"/>
-		<button name="join_btn" label="参加"/>
-		<chat_editor name="notification_text_exp">通知件名がここに入る。あーだこーだ.</chat_editor>
-		<button name="decline_btn" label="拒否"/>
-		<group_icon name="group_icon_exp" tool_tip="グループ"/>
-		<text name="sender_or_fee_box">送信者：「住人 住人 住人」</text>
-		<icon name="attachment_icon_exp" tool_tip="アタッチメント"/>
-		<icon name="system_notification_icon_exp" tool_tip="アイコン"/>
-		<text name="notification_title">グループ名：通知件名 通知件名 通知件名 通知件名 通知件名</text>
-		<button name="info_btn" label="情報"/>
-		<text name="group_name_exp">グループ名 グループ名 グループ名</text>
-		<text name="attachment_text">アタッチメントがここに入る。あーだこーだ.</text>
-	</panel>
-	<panel name="notification_title_panel_exp"/>
-	<layout_panel name="layout_panel_right"/>
-	<panel name="panel_condensed_view"/>
-	<layout_panel name="layout_panel_condensed_view"/>
-	<panel name="button_panel"/>
-	<panel name="notification_text_panel_exp"/>
-	<layout_panel name="layout_panel_right_exp"/>
-	<panel name="sender_time_panel"/>
-	<panel name="main_info_panel"/>
-	<layout_panel name="layout_panel_middle"/>
-	<panel name="notification_title_panel"/>
-	<panel name="attachment_panel"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="main_panel" title="panel_notification_list_item">
+  <!-- background_opaque="false" -->
+  <!-- background_visible="true"> -->
+  <!-- bg_alpha_color="PanelNotificationListItem"> -->
+  <panel.string name="sender_resident_text">送信者："[SENDER_RESIDENT]"</panel.string>
+  <panel.string name="group_name_text">グループ："[GROUP_NAME]"</panel.string>
+  <panel.string name="group_fee_text">費用：[GROUP_FEE]</panel.string>
+  <panel.string name="item_condensed_height">50</panel.string>
+  <panel.string name="item_expanded_height">87</panel.string>
+  <panel.string name="expanded_height_resize_for_attachment">27</panel.string>
+
+  <panel name="panel_total_view">
+    <layout_stack name="item_vertical_stack">
+      <layout_panel name="layout_panel_condensed_view">
+        <panel name="panel_condensed_view">
+          <layout_stack name="horizontal_stack">
+            <layout_panel name="layout_panel_right">
+              <group_icon name="group_icon" tool_tip="グループ" />
+              <avatar_icon name="avatar_icon" tool_tip="アバター" />
+              <icon name="system_notification_icon" tool_tip="アイコン" />
+            </layout_panel>
+            <layout_panel name="layout_panel_middle">
+              <panel name="main_info_panel">
+                <panel name="notification_title_panel">
+                  <text name="notification_title">グループ名：通知件名 通知件名 通知件名 通知件名 通知件名</text>
+                  <icon name="attachment_icon" tool_tip="装着物" />
+                </panel>
+                <panel name="sender_time_panel">
+                  <text name="sender_or_fee_box">送信者：住民 じゅうみん</text>
+                  <text name="notification_time" value="2014年12月24日　23：30" />
+                </panel>
+              </panel>
+            </layout_panel>
+            <layout_panel name="layout_panel_right">
+              <panel name="close_expand_panel">
+                <button name="close_btn" />
+                <button name="expand_btn" />
+              </panel>
+            </layout_panel>
+          </layout_stack>
+        </panel>
+      </layout_panel>
+      <layout_panel name="layout_panel_expanded_view">
+        <panel name="panel_expanded_view">
+          <layout_stack name="horizontal_stack">
+            <layout_panel name="layout_panel_right_exp">
+              <group_icon name="group_icon_exp" tool_tip="グループ" />
+              <avatar_icon name="avatar_icon_exp" tool_tip="アバター" />
+              <icon name="system_notification_icon_exp" tool_tip="アイコン" />
+              <icon name="attachment_icon_exp" tool_tip="添付" />
+            </layout_panel>
+            <layout_panel name="layout_panel_middle_exp">
+              <panel name="main_info_panel_expanded">
+                <panel name="notification_title_panel_exp">
+                  <text name="notification_title_exp">通知件名 通知件名 通知件名 通知件名</text>
+                  <text name="group_name_exp">グループ名 グループ名 グループ名</text>
+                </panel>
+                <panel name="sender_time_panel_exp">
+                  <text name="sender_or_fee_box_exp">送信者：住民 じゅうみん</text>
+                  <text name="notification_time_exp" value="2014年12月24日　23：30" />
+                </panel>
+                <panel name="notification_text_panel_exp">
+                  <chat_editor name="notification_text_exp">通知件名がここに入る。あーだこーだ</chat_editor>
+                </panel>
+                <panel name="attachment_panel">
+                  <text name="attachment_text">装着物がここに入る。あーだこーだ</text>
+                </panel>
+                <panel name="button_panel">
+                  <button name="join_btn" label="参加" />
+                  <button name="decline_btn" label="却下" />
+                  <button name="info_btn" label="情報" />
+                </panel>
+              </panel>
+            </layout_panel>
+            <layout_panel name="layout_panel_left_exp">
+              <panel name="close_expand_panel_exp">
+                <button name="close_expanded_btn" />
+                <button name="condense_btn" />
+              </panel>
+            </layout_panel>
+          </layout_stack>
+        </panel>
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
index aff427ed49..3d08e0731f 100644
--- a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="notifications_panel">
-	<layout_stack name="stack1">
-		<layout_panel name="notifications_list_panel">
-			<scroll_list name="notifications_list">
-				<column label="名前" name="name"/>
-				<column label="コンテンツ" name="content"/>
-				<column label="日付" name="date"/>
-			</scroll_list>
-		</layout_panel>
-		<layout_panel name="rejects_list_panel">
-			<scroll_list name="notification_rejects_list">
-				<column label="名前" name="name"/>
-				<column label="コンテンツ" name="content"/>
-				<column label="日付" name="date"/>
-			</scroll_list>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="stack1">
+    <layout_panel name="notifications_list_panel">
+      <scroll_list name="notifications_list">
+        <column label="名前" name="name" />
+        <column label="コンテンツ" name="content" />
+        <column label="日付" name="date" />
+      </scroll_list>
+    </layout_panel>
+    <layout_panel name="rejects_list_panel">
+      <scroll_list name="notification_rejects_list">
+        <column label="名前" name="name" />
+        <column label="コンテンツ" name="content" />
+        <column label="日付" name="date" />
+      </scroll_list>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
index 5a8ff858df..dd0dc42614 100644
--- a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="instant_message" name="panel_notify_textbox">
-	<string name="message_max_lines_count" value="14"/>
-	<panel label="info_panel" name="info_panel"/>
-	<panel label="info_panel" name="textbox_panel">
-		<text_editor name="message" value="メッセージ"/>
-	</panel>
-	<panel label="control_panel" name="control_panel">
-		<button label="送信" name="btn_submit"/>
-		<button label="無視" name="ignore_btn"/>
-	</panel>
-</panel>
+  <string name="message_max_lines_count" value="14" />
+  <panel label="info_panel" name="info_panel" />
+  <panel label="info_panel" name="textbox_panel">
+    <text_editor name="message" value="メッセージ" />
+  </panel>
+  <panel label="control_panel" name="control_panel">
+    <button label="送信" name="btn_submit" />
+    <button label="無視" name="ignore_btn" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
index fdc489f375..7e4568e1ca 100644
--- a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="friend_online_status" name="friend_online_status"/>
+<panel label="フレンドのオンライン状況" name="friend_online_status" />
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
index e89ce0c479..95b315db40 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
@@ -1,57 +1,91 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray Outfit Edit panel -->
-<panel label="アウトフットの編集" name="outfit_edit">
-	<string name="No Outfit" value="アウトフィットなし"/>
-	<string name="unsaved_changes" value="保存されていない変更"/>
-	<string name="now_editing" value="編集しています..."/>
-	<panel.string name="not_available">
-		（該当なし）
-	</panel.string>
-	<panel.string name="unknown">
-		（不明）
-	</panel.string>
-	<string name="Filter.All" value="すべて"/>
-	<string name="Filter.Clothes/Body" value="衣類/身体"/>
-	<string name="Filter.Objects" value="オブジェクト"/>
-	<string name="Filter.Clothing" value="衣類"/>
-	<string name="Filter.Bodyparts" value="身体部位"/>
-	<string name="replace_body_part" value="クリックして既存のシェイプと置き換える"/>
-	<text name="title" value="アウトフットの編集"/>
-	<panel label="bottom_panel" name="header_panel">
-		<panel label="bottom_panel" name="outfit_name_and_status">
-			<text name="status" value="編集しています..."/>
-			<text name="curr_outfit_name" value="[Current Outfit]"/>
-		</panel>
-	</panel>
-	<layout_stack name="im_panels">
-		<layout_panel label="IM コントロールパネル" name="outfit_wearables_panel">
-			<layout_stack name="filter_panels">
-				<layout_panel name="add_button_and_combobox">
-					<button label="さらに追加..." name="show_add_wearables_btn" tool_tip="開く／閉じる"/>
-				</layout_panel>
-				<layout_panel name="filter_panel">
-					<filter_editor label="インベントリの着用物をフィルター" name="look_item_filter"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="add_wearables_panel">
-			<button label="アイテムを装着" name="plus_btn"/>
-		</layout_panel>
-	</layout_stack>
-	<panel name="no_add_wearables_button_bar">
-		<button name="shop_btn_1" tool_tip="「SL マーケットプレイス」ページをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
-	</panel>
-	<panel name="add_wearables_button_bar">
-		<button name="shop_btn_2" tool_tip="「SL マーケットプレイス」ページをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
-	</panel>
-	<panel name="save_revert_button_bar">
-		<layout_stack name="button_bar_ls">
-			<layout_panel name="save_btn_lp">
-				<button label="保存" name="save_btn"/>
-			</layout_panel>
-			<layout_panel name="revert_btn_lp">
-				<button label="変更を元に戻す" name="revert_btn" tool_tip="前回保存された状態に戻す"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+<panel name="outfit_edit">
+  <string name="No Outfit" value="アウトフィットなし" />
+  <string name="unsaved_changes" value="保存されていない変更" />
+  <string name="now_editing" value="編集中" />
+  <string name="folder_view_off" value="Hierarchy_View_Disabled" translate="false" />
+  <string name="folder_view_on" value="Hierarchy_View_On" translate="false" />
+  <string name="list_view_off" value="List_View_Disabled" translate="false" />
+  <string name="list_view_on" value="List_View_On" translate="false" />
+  <panel.string name="not_available">（無し）</panel.string>
+  <panel.string name="unknown">（不明）</panel.string>
+  <!-- Wearables filtering strings -->
+  <string name="Filter.All" value="全て" />
+  <string name="Filter.Clothes/Body" value="服装／身体" />
+  <string name="Filter.Objects" value="オブジェクト" />
+  <string name="Filter.Clothing" value="服装" />
+  <string name="Filter.Bodyparts" value="身体部位" />
+  <string name="replace_body_part" value="クリックして既存のシェイプと置き換える" />
+  <button name="back_btn" />
+  <text name="title" value="アウトフィットのパーツを編集" />
+  <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
+  <panel name="header_panel">
+    <icon name="outfit_icon" top="2" />
+    <panel name="outfit_name_and_status">
+      <text name="status" value="編集中…" />
+      <text name="curr_outfit_name" value="[現在のアウトフィット]" />
+      <loading_indicator name="edit_outfit_loading_indicator" />
+    </panel>
+  </panel>
+  <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
+  <!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height.
+Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px.
+It is calculated as border_size + 2*UIResizeBarOverlap
+-->
+  <layout_stack name="im_panels">
+    <layout_panel lname="outfit_wearables_panel">
+      <layout_stack name="filter_panels">
+        <layout_panel name="add_button_and_combobox">
+          <!-- List containing items from the COF and Base outfit -->
+          <panel name="cof_wearables_list" />
+          <button name="show_add_wearables_btn" label="更に追加…" tool_tip="開く／閉じる" />
+          <combo_box name="list_view_filter_combobox" />
+          <combo_box name="folder_view_filter_combobox" />
+          <button name="filter_button" />
+        </layout_panel>
+        <layout_panel name="filter_panel">
+          <filter_editor label="インベントリを着用可能物でフィルタ" name="look_item_filter" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="add_wearables_panel">
+      <!-- this icon represent dragbar between layout panels.
+      This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) -->
+      <icon follows="left|top|right" height="10" image_name="Dragbar" left="0" top_pad="-9" width="313" />
+      <inventory_panel name="folder_view" />
+      <panel name="filtered_wearables_panel">
+        <wearable_items_list name="list_view" />
+      </panel>
+      <button label="アイテムを着用" name="plus_btn" />
+    </layout_panel>
+  </layout_stack>
+  <!-- BUTTON BAR -->
+  <panel name="no_add_wearables_button_bar">
+    <menu_button name="gear_menu_btn" />
+    <icon name="dummy_right_icon" />
+    <button name="shop_btn_1" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。" />
+  </panel>
+  <!-- BUTTON BAR - WEARABLES ADDING MODE -->
+  <panel name="add_wearables_button_bar">
+    <menu_button name="wearables_gear_menu_btn" />
+    <button name="folder_view_btn" />
+    <button name="list_view_btn" />
+    <icon name="dummy_right_icon" />
+    <button name="shop_btn_2" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。" />
+  </panel>
+  <!-- SAVE AND REVERT BUTTONS -->
+  <panel name="save_revert_button_bar">
+    <layout_stack name="button_bar_ls">
+      <layout_panel name="save_btn_lp">
+        <button label="変更を保存" name="save_btn" />
+      </layout_panel>
+      <layout_panel name="save_as_btn_lp">
+        <button label="別名で保存…" name="save_as_btn" />
+      </layout_panel>
+      <layout_panel name="revert_btn_lp">
+        <button label="変更を元に戻す" name="revert_btn" tool_tip="最後に保存されたバージョンに復元します。" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
index 74c3bdac47..3dc17eca6a 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
@@ -1,7 +1,52 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Outfit Gallery">
-	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="追加オプションを表示する"/>
-		<button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/>
-	</panel>
+  <string name="outfit_photo_string">"[OUTFIT_NAME]"のアウトフィットの画像</string>
+  <string name="no_outfits_msg">あなたは、まだアウトフィットを持っていません。[secondlife:///app/search/all/ 検索]してみてください。</string>
+  <string name="no_matched_outfits_msg">お探しのものが見つかりませんでしたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]してみてください。</string>
+  <text name="no_outfits_txt">検索中…</text>
+  <scroll_container name="gallery_scroll_panel">
+    <!--outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/-->
+    <!--layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="0" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack>
+    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="190" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack>
+    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="380" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack-->
+    <!--</panel>-->
+  </scroll_container>
+  <panel name="bottom_panel">
+    <menu_button tool_tip="追加オプションを表示" name="options_gear_btn" />
+    <icon name="dummy_icon" />
+    <!-- 字数制限のため「[COUNT]個のアウトフィット」にしない。-->
+    <text name="OutfitcountText">[COUNT]個</text>
+    <text name="avatar_complexity_label">複雑度：[WEIGHT]</text>
+    <button name="trash_btn" tool_tip="選択されたアウトフィットを削除" />
+  </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml b/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
index 8069321dac..7d6e84bfc6 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="gallery_item_panel">
-	<panel name="text_bg_panel">
-		<text name="outfit_name">サマーヒップスター、ピアス ピアス ピアス ピアス ピアス</text>
-		<text name="outfit_worn_text">（装着）</text>
-	</panel>
+  <string name="worn_string">（着用中）</string>
+  <icon name="preview_outfit" />
+  <panel name="text_bg_panel">
+    <text name="outfit_name">夏のヒップスター、ピアス、ピアス、ピアス、ピアス</text>
+    <text name="outfit_worn_text">（着用中）</text>
+  </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
new file mode 100644
index 0000000000..29bf11cdd6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_outfit_snapshot_inventory">
+  <icon name="title_icon" />
+  <text name="title">インベントリ</text>
+  <view_border name="hr" />
+  <text name="hint_lbl">インベントリ画像をアップロードするには、L$[UPLOAD_COST]かかります。
+金額はサブスクリプションレベルによって異なります。高いレベルでは減額されます。</text>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="アップロード（L$ [UPLOAD_COST]）" name="save_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index 8633bfb2ad..5a47c4e4de 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="もの" name="Outfits">
-	<panel.string name="wear_outfit_tooltip">
-		選択したアウトフィットを着用する
-	</panel.string>
-	<panel.string name="wear_items_tooltip">
-		選択したアイテムを着用
-	</panel.string>
-	<tab_container name="appearance_tabs">
-		<panel label="アウトフィットギャラリー" name="outfit_gallery_tab"/>
-		<panel label="マイ アウトフィット" name="outfitslist_tab"/>
-		<panel label="着用中" name="cof_tab"/>
-	</tab_container>
-	<panel name="bottom_panel">
-		<layout_stack name="bottom_panel_ls">
-			<layout_panel name="save_btn_lp">
-				<button label="別名で保存" name="save_btn"/>
-			</layout_panel>
-			<layout_panel name="wear_btn_lp">
-				<button label="装着" name="wear_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+<panel name="Outfits" label="モノ">
+  <panel.string name="wear_outfit_tooltip">選択したアウトフィットに着替える</panel.string>
+  <panel.string name="wear_items_tooltip">選択したアイテムを着用</panel.string>
+  <tab_container name="appearance_tabs">
+    <panel name="outfit_gallery_tab" label="アウトフィットギャラリー" />
+    <panel name="outfitslist_tab" label="自分のアウトフィット" />
+    <panel name="cof_tab" label="着用中" />
+  </tab_container>
+
+  <panel name="bottom_panel">
+    <layout_stack name="bottom_panel_ls">
+      <layout_panel name="save_btn_lp">
+        <button label="変更を保存" name="save_btn" />
+      </layout_panel>
+      <layout_panel name="save_as_btn_lp">
+        <button label="名前をつけて保存…" name="save_as_btn" />
+      </layout_panel>
+      <layout_panel name="wear_btn_lp">
+        <button label="着用" name="wear_btn" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
index e8caab0696..21cf7898f1 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_gear_default">
-	<menu_item_call label="着用中のアウトフィットを入れ替える" name="wear"/>
-	<menu_item_call label="着用中のアウトフィットから取り除く" name="remove"/>
-	<menu_item_call label="名前の変更" name="rename"/>
-	<menu_item_call label="リンクを外す" name="remove_link"/>
-	<menu_item_call label="アウトフィットを削除する" name="delete"/>
-</menu>
+  <menu_item_call label="このアウトフィットに着替える" name="wear" />
+  <menu_item_call label="このアウトフィットから取り除く" name="remove" />
+  <menu_item_separator name="Outfits Gear Separator" />
+  <menu_item_call label="名前変更" name="rename" />
+  <menu_item_call label="リンクを外す" name="remove_link" />
+  <menu_item_call label="アウトフィットを削除する" name="delete" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
index df9ef40113..098128bb6d 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
-	<accordion name="outfits_accordion">
-		<no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索] をお試しください。"/>
-		<no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索] をお試しください。"/>
-	</accordion>
-	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
-		<button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/>
-	</panel>
-</panel>
+  <accordion name="outfits_accordion">
+    <no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。" />
+    <no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索]をお試しください。" />
+  </accordion>
+  <panel name="bottom_panel">
+    <menu_button tool_tip="追加オプションを表示" name="options_gear_btn" />
+    <icon name="dummy_icon" />
+    <button name="trash_btn" tool_tip="選択されたアウトフィットを削除する。" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
index a6fbaae58d..b5ac432826 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Wearing">
-	<panel.string name="no_attachments">
-		着用しているアタッチメントはありません。
-	</panel.string>
-	<accordion name="wearables_accordion">
-		<accordion_tab name="tab_wearables" title="着用物"/>
-		<accordion_tab name="tab_temp_attachments" title="一時的なアタッチメント"/>
-	</accordion>
-	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
-	</panel>
-</panel>
+  <panel.string name="no_attachments">着用している装着物はありません。</panel.string>
+  <accordion name="wearables_accordion">
+    <accordion_tab name="tab_wearables" title="着用物"/>
+    <accordion_tab name="cof_items_list" title="一時的な装着物">
+      <scroll_list name="temp_attachments_list">
+        <scroll_list.columns name="icon" />
+        <scroll_list.columns name="text" />
+      </scroll_list>
+    </accordion_tab>
+  </accordion>
+  <panel name="bottom_panel">
+    <menu_button name="options_gear_btn" tool_tip="オプションを表示します。" />
+    <icon name="dummy_icon" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index be00a3c122..90bac4b044 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,71 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
-<panel label="人" name="people_panel">
-	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
-	<string name="no_filtered_recent_people" value="お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。"/>
-	<string name="no_one_near" value="近くに誰もいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
-	<string name="no_one_filtered_near" value="お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。"/>
-	<string name="no_friends_online" value="オンラインのフレンドはいません"/>
-	<string name="no_friends" value="フレンドはいません"/>
-	<string name="no_friends_msg">
-		友達を見つけるには、[secondlife:///app/search/people 検索] をするか、住人を右クリックしてフレンド登録してください。
-一緒に何かする仲間をお探しですか？ [secondlife:///app/worldmap 世界地図] をお試しください。
-	</string>
-	<string name="no_filtered_friends_msg">
-		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
-	</string>
-	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
-	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
-	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
-	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
-	<string name="GroupCountWithInfo" value="あなたは現在、[COUNT] グループに属しています。あと [REMAINING] グループに参加することができます。[secondlife:/// 上限を増やす]"/>
-	<tab_container name="tabs">
-		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
-		</panel>
-		<panel label="フレンド" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="人をフィルター" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
-			<accordion name="friends_accordion">
-				<accordion_tab name="tab_online" title="オンライン"/>
-				<accordion_tab name="tab_all" title="全員"/>
-				<accordion_tab name="tab_suggested_friends" title="友だちになりたくない人"/>
-			</accordion>
-		</panel>
-		<panel label="グループ" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
-				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
-			</panel>
-			<text name="groupcount">
-				あなたは現在、[COUNT] グループに属しています。あと [REMAINING] グループに参加することができます。
-			</text>
-		</panel>
-		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="人をフィルター" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
-		</panel>
-		<panel label="停止" name="blocked_panel">
-			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		</panel>
-	</tab_container>
-</panel>
+<panel label="人物" name="people_panel">
+  <string name="no_recent_people" value="最近交流があった人物はいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。" />
+  <string name="no_filtered_recent_people" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。" />
+  <string name="no_one_near" value="近くに誰もいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。" />
+  <string name="no_one_filtered_near" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。" />
+  <string name="no_friends_online" value="オンラインのフレンドはいません" />
+  <string name="no_friends" value="フレンドはいません" />
+  <string name="no_friends_msg">フレンドを見つけるには、[secondlife:///app/search/people 検索]をするか、人物を右クリックしてフレンド登録してください。
+一緒に何かするフレンドをお探しですか？[secondlife:///app/worldmap ワールドマップ]をお試しください。</string>
+  <string name="no_filtered_friends_msg">お探しのフレンドは見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。</string>
+  <string name="no_filtered_groups_msg" value="お探しのフレンドは見つかりましたか？[secondlife:///app/search/groups/[SEARCH_TERM] 検索]をお試しください。" />
+  <string name="no_groups_msg" value="グループをお探しですか？[secondlife:///app/search/groups 検索]をお試しください。" />
+  <string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックでマップを開く。Shift‐ドラッグで水平・垂直移動）" />
+  <string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）" />
+  <string name="GroupCountWithInfo" value="あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。[secondlife:/// 上限を増やす]" />
+  <tab_container name="tabs">
+    <panel label="近隣" name="nearby_panel">
+      <panel label="bottom_panel" name="nearby_buttons_panel">
+        <filter_editor label="人物をフィルタ" name="nearby_filter_input" />
+        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
+        <menu_button name="nearby_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <button name="add_friend_btn" tool_tip="フレンド登録を申し込みます" />
+        <dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人物を削除" />
+      </panel>
+    </panel>
+    <panel label="フレンド" name="friends_panel">
+      <panel label="bottom_panel" name="friends_buttons_panel">
+        <filter_editor label="人物をフィルタ" name="friends_filter_input" />
+        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
+        <menu_button name="friends_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <button name="friends_add_btn" tool_tip="フレンド登録を申し込みます" />
+        <dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人物を削除" />
+      </panel>
+      <accordion name="friends_accordion">
+        <accordion_tab name="tab_online" title="オンライン" />
+        <accordion_tab name="tab_all" title="全員" />
+        <accordion_tab name="tab_suggested_friends" title="友だちになりたくない人物" />
+      </accordion>
+    </panel>
+    <panel label="グループ" name="groups_panel">
+      <panel label="bottom_panel" name="groups_buttons_panel">
+        <filter_editor label="グループをフィルタ" name="groups_filter_input" />
+        <menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション" />
+        <menu_button name="groups_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <menu_button name="plus_btn" tool_tip="グループに参加／新規グループを作成します" />
+        <dnd_button name="minus_btn" tool_tip="選択したグループから脱退" />
+      </panel>
+      <text name="groupcount">あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。</text>
+    </panel>
+    <panel label="最新" name="recent_panel">
+      <panel label="bottom_panel" name="recent_buttons_panel">
+        <filter_editor label="人物をフィルタ" name="recent_filter_input" />
+        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
+        <menu_button name="recent_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <button name="add_friend_btn" tool_tip="フレンド登録を申し込みます。" />
+        <dnd_button name="recent_del_btn" tool_tip="選択されているフレンドを削除" />
+      </panel>
+    </panel>
+    <panel label="ブロック" name="blocked_panel">
+      <panel label="ブロックされた人物とオブジェクト" name="panel_block_list_sidetray" />
+    </panel>
+  </tab_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 7235bc0f18..59136a27a0 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -1,118 +1,100 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="place_profile">
-	<string name="on" value="オン"/>
-	<string name="off" value="オフ"/>
-	<string name="anyone" value="全員"/>
-	<string name="available" value="利用可"/>
-	<string name="allocated" value="割り当て済"/>
-	<string name="title_place" value="場所のプロフィール"/>
-	<string name="title_teleport_history" value="テレポートの履歴"/>
-	<string name="not_available" value="（該当なし）"/>
-	<string name="unknown" value="（不明）"/>
-	<string name="public" value="（公開）"/>
-	<string name="none_text" value="（なし）"/>
-	<string name="sale_pending_text" value="（販売処理中）"/>
-	<string name="group_owned_text" value="（グループ所有）"/>
-	<string name="price_text" value="L$"/>
-	<string name="area_text" value="平方メートル"/>
-	<string name="all_residents_text" value="すべての住人"/>
-	<string name="group_text" value="グループ"/>
-	<string name="can_resell">
-		このリージョンで購入した土地は、再販することができます。
-	</string>
-	<string name="can_not_resell">
-		このリージョンで購入した土地は、再販できません。
-	</string>
-	<string name="can_change">
-		このリージョンで購入した土地は、統合・分割することができます。
-	</string>
-	<string name="can_not_change">
-		このリージョンで購入した土地は、統合・分割できません。
-	</string>
-	<string name="server_update_text">
-		場所の情報は、サーバーがアップデートされるまでご利用いただけません。
-	</string>
-	<string name="server_error_text">
-		この場所の情報は現在ご利用いただけません。あとでもう一度お試しください。
-	</string>
-	<string name="server_forbidden_text">
-		この場所の情報は、アクセス制限のためご利用いただけません。  許可については区画所有者にお問い合わせください。
-	</string>
-	<string name="acquired_date">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</string>
-	<button name="back_btn" tool_tip="戻る"/>
-	<text name="title" value="場所のプロフィール"/>
-	<scroll_container name="place_scroll">
-		<panel name="scrolling_panel">
-			<text name="region_title" value="SampleRegion"/>
-			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
-			<expandable_text name="description" value="Du waltz die spritz"/>
-			<text name="owner_label" value="所有者："/>
-			<text name="owner_value" value="Alex Superduperlongenamenton"/>
-			<text name="maturity_value" value="不明"/>
-			<accordion name="advanced_info_accordion">
-				<accordion_tab name="parcel_characteristics_tab" title="区画">
-					<panel name="parcel_characteristics_panel">
-						<text name="rating_label" value="レーティング："/>
-						<text name="rating_value" value="不明"/>
-						<text name="voice_label" value="ボイス："/>
-						<text name="voice_value" value="オン"/>
-						<text name="fly_label" value="飛行："/>
-						<text name="fly_value" value="オン"/>
-						<text name="push_label" value="プッシュ："/>
-						<text name="push_value" value="オフ"/>
-						<text name="build_label" value="制作："/>
-						<text name="build_value" value="オン"/>
-						<text name="scripts_label" value="スクリプト："/>
-						<text name="scripts_value" value="オン"/>
-						<text name="damage_label" value="ダメージ："/>
-						<text name="damage_value" value="オフ"/>
-						<text name="see_avatars_label" value="アバターを表示："/>
-						<text name="see_avatars_value" value="オフ"/>
-						<button label="土地情報" name="about_land_btn"/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="region_information_tab" title="リージョン（地域）     ">
-					<panel name="region_information_panel">
-						<text name="region_name_label" value="リージョン:"/>
-						<text name="region_name" value="Mooseland"/>
-						<text name="region_type_label" value="種類："/>
-						<text name="region_type" value="Moose"/>
-						<text name="region_rating_label" value="レーティング："/>
-						<text name="region_rating" value="Adult"/>
-						<text name="region_owner_label" value="所有者："/>
-						<text name="region_owner" value="moose Van Moose extra long name moose"/>
-						<text name="region_group_label" value="グループ："/>
-						<text name="region_group">
-							The Mighty Moose of mooseville soundvillemoose
-						</text>
-						<button label="地域 / 不動産" name="region_info_btn"/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="estate_information_tab" title="エステート（不動産）">
-					<panel name="estate_information_panel">
-						<text name="estate_name_label" value="エステート："/>
-						<text name="estate_rating_label" value="レーティング："/>
-						<text name="estate_owner_label" value="所有者："/>
-						<text name="estate_owner" value="長い所有者の名前をテスト"/>
-						<text name="covenant_label" value="約款："/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="sales_tab" title="販売中">
-					<panel name="sales_panel">
-						<text name="sales_price_label" value="価格："/>
-						<text name="area_label" value="面積："/>
-						<text name="traffic_label" value="トラフィック："/>
-						<text name="primitives_label" value="プリム："/>
-						<text name="parcel_scripts_label" value="スクリプト："/>
-						<text name="terraform_limits_label" value="地形編集制限："/>
-						<text name="subdivide_label" value="分割・統合許可："/>
-						<text name="resale_label" value="再版許可："/>
-						<text name="sale_to_label" value="販売先："/>
-					</panel>
-				</accordion_tab>
-			</accordion>
-		</panel>
-	</scroll_container>
-</panel>
+  <string name="on" value="オン" />
+  <string name="off" value="オフ" />
+  <string name="anyone" value="全員" />
+  <string name="available" value="利用可" />
+  <string name="allocated" value="割り当て済" />
+  <string name="title_place" value="場所のプロフィール" />
+  <string name="title_teleport_history" value="テレポートの履歴" />
+  <string name="not_available" value="（該当なし）" />
+  <string name="unknown" value="（不明）" />
+  <string name="public" value="（公開）" />
+  <string name="none_text" value="（なし）" />
+  <string name="sale_pending_text" value="（販売処理中）" />
+  <string name="group_owned_text" value="（グループ所有）" />
+  <string name="price_text" value="L$" />
+  <string name="area_text" value="㎡" />
+  <string name="all_residents_text" value="すべての住人" />
+  <string name="group_text" value="グループ" />
+  <string name="can_resell">このリージョンで購入した土地は、再販することができます。</string>
+  <string name="can_not_resell">このリージョンで購入した土地は、再販できません。</string>
+  <string name="can_change">このリージョンで購入した土地は、統合・分割することができます。</string>
+  <string name="can_not_change">このリージョンで購入した土地は、統合・分割できません。</string>
+  <string name="server_update_text">場所の情報は、サーバーがアップデートされるまでご利用いただけません。</string>
+  <string name="server_error_text">この場所の情報は現在ご利用いただけません。あとでもう一度お試しください。</string>
+  <string name="server_forbidden_text">この場所の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。</string>
+  <string name="acquired_date">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</string>
+  <button name="back_btn" tool_tip="戻る" />
+  <text name="title" value="場所のプロフィール" />
+  <scroll_container name="place_scroll">
+    <panel name="scrolling_panel">
+      <text name="region_title" value="SampleRegion" />
+      <text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)" />
+      <expandable_text name="description" value="Du waltz die spritz" />
+      <text name="owner_label" value="所有者：" />
+      <text name="owner_value" value="Alex Superduperlongenamenton" />
+      <text name="maturity_value" value="不明" />
+      <accordion name="advanced_info_accordion">
+        <accordion_tab name="parcel_characteristics_tab" title="区画">
+          <panel name="parcel_characteristics_panel">
+            <text name="rating_label" value="レーティング：" />
+            <text name="rating_value" value="不明" />
+            <text name="voice_label" value="ボイス：" />
+            <text name="voice_value" value="オン" />
+            <text name="fly_label" value="飛行：" />
+            <text name="fly_value" value="オン" />
+            <text name="push_label" value="プッシュ：" />
+            <text name="push_value" value="オフ" />
+            <text name="build_label" value="制作：" />
+            <text name="build_value" value="オン" />
+            <text name="scripts_label" value="スクリプト：" />
+            <text name="scripts_value" value="オン" />
+            <text name="damage_label" value="ダメージ：" />
+            <text name="damage_value" value="オフ" />
+            <text name="see_avatars_label" value="アバターを表示：" />
+            <text name="see_avatars_value" value="オフ" />
+            <button label="土地情報" name="about_land_btn" />
+          </panel>
+        </accordion_tab>
+        <accordion_tab name="region_information_tab" title="リージョン（地域）">
+          <panel name="region_information_panel">
+            <text name="region_name_label" value="リージョン:" />
+            <text name="region_name" value="Mooseland" />
+            <text name="region_type_label" value="種類：" />
+            <text name="region_type" value="Moose" />
+            <text name="region_rating_label" value="レーティング：" />
+            <text name="region_rating" value="Adult" />
+            <text name="region_owner_label" value="所有者：" />
+            <text name="region_owner" value="moose Van Moose extra long name moose" />
+            <text name="region_group_label" value="グループ：" />
+            <text name="region_group">The Mighty Moose of mooseville soundvillemoose</text>
+            <button label="リージョン（地域）／不動産" name="region_info_btn" />
+          </panel>
+        </accordion_tab>
+        <accordion_tab name="estate_information_tab" title="不動産（不動産）">
+          <panel name="estate_information_panel">
+            <text name="estate_name_label" value="不動産：" />
+            <text name="estate_rating_label" value="レーティング：" />
+            <text name="estate_owner_label" value="所有者：" />
+            <text name="estate_owner" value="長い所有者の名前をテスト" />
+            <text name="covenant_label" value="約款：" />
+          </panel>
+        </accordion_tab>
+        <accordion_tab name="sales_tab" title="販売中">
+          <panel name="sales_panel">
+            <text name="sales_price_label" value="価格：" />
+            <text name="area_label" value="面積：" />
+            <text name="traffic_label" value="トラフィック：" />
+            <text name="primitives_label" value="プリム：" />
+            <text name="parcel_scripts_label" value="スクリプト：" />
+            <text name="terraform_limits_label" value="地形編集制限：" />
+            <text name="subdivide_label" value="分割・統合許可：" />
+            <text name="resale_label" value="再版許可：" />
+            <text name="sale_to_label" value="販売先：" />
+          </panel>
+        </accordion_tab>
+      </accordion>
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index 9d3925afdc..0f3c6b44ff 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -1,48 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="場所" name="places panel">
-	<string name="landmarks_tab_title" value="マイ ランドマーク"/>
-	<string name="teleport_history_tab_title" value="テレポートの履歴"/>
-	<filter_editor label="場所をフィルター" name="Filter"/>
-	<panel name="button_panel">
-		<layout_stack name="bottom_bar_ls0">
-			<layout_panel name="lp1">
-				<layout_stack name="bottom_bar_ls1">
-					<layout_panel name="teleport_btn_lp">
-						<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/>
-					</layout_panel>
-					<layout_panel name="chat_btn_lp">
-						<button label="地図" name="map_btn" tool_tip="世界地図に該当するエリアを表示"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="lp2">
-				<layout_stack name="bottom_bar_ls3">
-					<layout_panel name="edit_btn_lp">
-						<button label="編集" name="edit_btn" tool_tip="ランドマークの情報を編集します"/>
-					</layout_panel>
-					<layout_panel name="overflow_btn_lp">
-						<menu_button label="▼" name="overflow_btn" tool_tip="オプションを表示します"/>
-					</layout_panel>
-				</layout_stack>
-				<layout_stack name="bottom_bar_profile_ls">
-					<layout_panel name="profile_btn_lp">
-						<button label="プロフィール" name="profile_btn" tool_tip="場所のプロフィールを表示"/>
-					</layout_panel>
-				</layout_stack>
-				<layout_stack name="bottom_bar_close_ls3">
-					<layout_panel name="close_btn_lp">
-						<button label="閉じる" name="close_btn"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls2">
-			<layout_panel name="save_btn_lp">
-				<button label="保存" name="save_btn"/>
-			</layout_panel>
-			<layout_panel name="cancel_btn_lp">
-				<button label="取り消し" name="cancel_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+  <string name="landmarks_tab_title" value="ランドマーク" />
+  <string name="teleport_history_tab_title" value="訪問した場所" />
+  <string name="favorites_tab_title" value="お気に入り" />
+  <string name="tooltip_trash_items" value="選択されたランドマークかフォルダを削除" />
+  <string name="tooltip_trash_history" value="訪問した場所一覧を削除" />
+  <layout_stack name="places_layout_panel">
+    <layout_panel name="main_panel">
+      <layout_stack name="top_menu_panel">
+        <layout_panel name="filter_panel">
+          <filter_editor label="場所をフィルタ" name="Filter" />
+        </layout_panel>
+        <layout_panel name="options_gear_btn_panel">
+          <menu_button tool_tip="オプションを表示" name="options_gear_btn" />
+        </layout_panel>
+        <layout_panel name="options_sort_btn_panel">
+          <menu_button tool_tip="ソートオプションを表示" name="sorting_menu_btn" />
+        </layout_panel>
+        <layout_panel name="add_btn_panel">
+          <menu_button name="add_menu_btn" tool_tip="新しいランドマークかフォルダを追加" />
+        </layout_panel>
+        <layout_panel name="trash_btn_panel">
+          <dnd_button name="trash_btn"/>
+        </layout_panel>
+      </layout_stack>
+      <tab_container name="Places Tabs" />
+      <panel name="panel_place_profile" />
+      <panel name="panel_landmark_info" />
+    </layout_panel>
+    <!--*********************** Button wrappers ***********************-->
+    <layout_panel auto_resize="false" layout="topleft" height="25" name="button_layout_panel">
+      <panel name="button_panel">
+        <layout_stack name="bottom_bar_ls0">
+          <layout_panel name="lp1">
+            <!--*********************** Teleport, Map buttons ***********************-->
+            <layout_stack name="bottom_bar_ls1">
+              <layout_panel name="teleport_btn_lp">
+                <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする" />
+              </layout_panel>
+              <layout_panel name="chat_btn_lp">
+                <button label="マップ" name="map_btn" tool_tip="ワールドマップに該当するエリアを表示" />
+              </layout_panel>
+            </layout_stack>
+          </layout_panel>
+          <!--*********************** Options button ***********************-->
+          <layout_panel name="lp_options">
+            <menu_button name="overflow_btn" tool_tip="追加オプションを表示" />
+          </layout_panel>
+          <layout_panel name="lp2">
+            <!--*********************** Close button ***********************-->
+            <layout_stack name="bottom_bar_close_ls3">
+              <layout_panel name="close_btn_lp">
+                <button label="閉じる" name="close_btn" />
+              </layout_panel>
+            </layout_stack>
+          </layout_panel>
+        </layout_stack>
+        <!--*********************** Save, Cancel buttons ***********************-->
+        <layout_stack name="bottom_bar_ls2">
+          <layout_panel name="save_btn_lp">
+            <button label="保存" name="save_btn" />
+          </layout_panel>
+          <layout_panel name="cancel_btn_lp">
+            <button label="キャンセル" name="cancel_btn" />
+          </layout_panel>
+        </layout_stack>
+      </panel>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
index b7c3f48557..0899e4ce25 100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_postcard_message">
-	<text name="to_label">
-		終：
-	</text>
-	<text name="name_label">
-		始：
-	</text>
-	<text name="subject_label">
-		件名：
-	</text>
-	<line_editor label="件名をここに入力してください。" name="subject_form"/>
-	<text name="msg_label">
-		メッセージ：
-	</text>
-	<text_editor name="msg_form">
-		メッセージをここに入力してください。
-	</text_editor>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="送信" name="send_btn"/>
-</panel>
+  <text name="to_label">宛先：</text>
+  <text name="name_label">名前：</text>
+  <text name="subject_label">件名：</text>
+  <line_editor label="件名をここに入力してください。" name="subject_form" />
+  <text name="msg_label">メッセージ：</text>
+  <text_editor name="msg_form">メッセージをここに入力してください。</text_editor>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="送信" name="send_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
index f34fdc6b67..2556cd4c3c 100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_postcard_settings">
-	<combo_box label="解像度" name="postcard_size_combo">
-		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="postcard_snapshot_width"/>
-	<check_box label="縦横比の固定" name="postcard_keep_aspect_check"/>
-	<slider label="品質：" name="image_quality_slider"/>
-</panel>
+  <combo_box label="解像度" name="postcard_size_combo">
+    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
+    <combo_box.item label="６４０✕４８０" name="640x480" />
+    <combo_box.item label="８００✕６００" name="800x600" />
+    <combo_box.item label="１０２４✕７６８" name="1024x768" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="postcard_snapshot_width" />
+  <check_box label="縦横比の固定" name="postcard_keep_aspect_check" />
+  <slider label="品質：" name="image_quality_slider" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 64bd382575..06dbd9436a 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -1,32 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<panel label="アドバンス" name="advanced">
-	<panel.string name="aspect_ratio_text">
-		[NUM]:[DEN]
-	</panel.string>
-	<text name="Cache:">
-		キャッシュ：
-	</text>
-	<spinner label="キャッシュサイズ (256 - 9984MB)" name="cachesizespinner"/>
-	<text name="text_box5">
-		MB
-	</text>
-	<button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache"/>
-	<text name="Cache location">
-		キャッシュの保存場所：
-	</text>
-	<button label="参照" label_selected="参照" name="set_cache"/>
-	<button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location"/>
-	<text name="UI Size:">
-		UI サイズ：
-	</text>
-	<check_box label="スクリプトのエラーを表示：" name="show_script_errors"/>
-	<radio_group name="show_location">
-		<radio_item label="近くのチャット" name="0"/>
-		<radio_item label="別々のウィンドウ" name="1"/>
-	</radio_group>
-	<check_box label="複数のビューワを許可" name="allow_multiple_viewer_check"/>
-	<check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check"/>
-	<check_box label="アドバンスメニューを表示" name="show_advanced_menu_check"/>
-	<check_box label="開発メニューを表示" name="show_develop_menu_check"/>
-	<button label="デフォルト作成許可" name="default_creation_permissions"/>
-</panel>
+<panel label="拡張" name="advanced">
+  <panel.string name="aspect_ratio_text">[NUM]：[DEN]</panel.string>
+  <text name="Cache:">キャッシュ：</text>
+  <spinner label="キャッシュ容量（256～9984㎆）" name="cachesizespinner" />
+  <text name="text_box5">㎆</text>
+  <button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache" />
+  <text name="Cache location">キャッシュ保存先：</text>
+  <button label="参照" label_selected="参照" name="set_cache" />
+  <button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location" />
+  <text name="UI Size:">ＵＩのサイズ：</text>
+  <text name="HUD Size:">ＨＵＤのスケール：</text>
+  <check_box label="スクリプトのエラーを表示：" name="show_script_errors" />
+  <radio_group name="show_location">
+    <radio_item label="近隣チャット" name="0" />
+    <radio_item label="別々のウィンドウ" name="1" />
+  </radio_group>
+  <check_box label="複数のビューアーを許可" name="allow_multiple_viewer_check" />
+  <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" />
+  <check_box label="拡張メニューを表示" name="show_advanced_menu_check" />
+  <check_box label="開発メニューを表示" name="show_develop_menu_check" />
+  <button label="記録済みのユーザ名" name="remembered_usernames" />
+  <button label="デフォルトの作成権限" name="default_creation_permissions" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 4c2906cc18..49a7aaee90 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ポップアップ" name="popups" title="ポップアップ">
-	<text name="tell_me_label">
-		知らせる：
-	</text>
-	<check_box label="L$ を使用する場合" name="notify_money_spend_checkbox"/>
-	<check_box label="フレンドがログイン・ログアウトするとき" name="friends_online_notify_checkbox"/>
-	<check_box label="L$ を手に入れる場合" name="notify_money_received_checkbox"/>
-	<text name="show_label" width="300">
-		常に表示するメッセージ：
-	</text>
-	<text name="dont_show_label">
-		表示しないメッセージ：
-	</text>
-</panel>
+  <text name="tell_me_label">知らせる：</text>
+  <check_box label="L$の使用時" name="notify_money_spend_checkbox" />
+  <check_box label="フレンドのログイン状態変化時" name="friends_online_notify_checkbox" />
+  <check_box label="L$の入手時" name="notify_money_received_checkbox" />
+  <text name="show_label">常に表示するメッセージ：</text>
+  <text name="dont_show_label">表示しないメッセージ：</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 5046c11194..f0d697052e 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,111 +1,89 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<check_box initial_value="true" label="近くのチャットでジェスチャーを自動コンプリートする" name="auto_complete_gestures"/>
-	<panel name="general_chat_settings">
-		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			文字の大きさ：
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="小規模" name="Small" value="0"/>
-			<item label="中" name="Medium" value="1"/>
-			<item label="大規模" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	</panel>
-	<panel name="im_notification_settings">
-		<text name="friend_ims">
-			フレンド IM:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_friend_im"/>
-		<text name="non_friend_ims">
-			フレンドのいない IM:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_non_friend_im"/>
-		<text name="conference_ims">
-			会議 IM:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_conference_im"/>
-		<text name="group_chat">
-			グループチャット:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_group_chat_im"/>
-		<text name="nearby_chat">
-			近くのチャット:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_nearby_chat_im"/>
-		<text name="object_ims">
-			オブジェクト IM：
-		</text>
-		<combo_box name="ObjectIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_object_im"/>
-		<text name="notifications_alert">
-			一時的にすべての通知を停止するには、「コミュニケーション」 &gt; 「着信拒否]を使用します。
-		</text>
-	</panel>
-	<panel name="play_sound_settings">
-		<text name="play_sound">
-			サウンドを再生:
-		</text>
-		<check_box label="新しい会話" name="new_conversation"/>
-		<check_box label="受信音声コール" name="incoming_voice_call"/>
-		<check_box label="テレポートを送る" name="teleport_offer"/>
-		<check_box label="インベントリを送る" name="inventory_offer"/>
-	</panel>
-	<panel name="log_settings">
-		<text name="logging_label">
-			保存：
-		</text>
-		<combo_box name="conversation_log_combo">
-			<item label="ログおよびテキストチャット" name="log_and_transcripts" value="2"/>
-			<item label="ログのみ" name="log_only" value="1"/>
-			<item label="ログまたはテキストチャットなし" name="no_log_or_transcript" value="0"/>
-		</combo_box>
-		<button label="ログを消去..." name="clear_log"/>
-		<button label="テキストチャットを削除..." name="delete_transcripts"/>
-		<text name="log_location_label">
-			場所：
-		</text>
-		<button label="参照..." label_selected="参照" name="log_path_button"/>
-	</panel>
-	<button label="他の言語..." name="ok_btn"/>
-	<button label="自動置換..." name="autoreplace_showgui"/>
-	<button label="スペルチェック中..." name="spellcheck_showgui"/>
-</panel>
+  <check_box initial_value="true" label="近隣チャットでジェスチャーを自動補完する" name="auto_complete_gestures" />
+  <panel name="general_chat_settings">
+    <check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation" />
+    <check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email" />
+    <check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check" />
+    <text name="font_size">文字の大きさ：</text>
+    <combo_box name="chat_font_size">
+      <item label="小" name="Small" value="0" />
+      <item label="中" name="Medium" value="1" />
+      <item label="大" name="Large" value="2" />
+    </combo_box>
+    <check_box label="吹き出しチャット" name="bubble_text_chat" />
+  </panel>
+  <panel name="im_notification_settings">
+    <text name="friend_ims">フレンドＩＭ：</text>
+    <combo_box name="FriendIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_friend_im" />
+    <text name="non_friend_ims">フレンドのいないＩＭ：</text>
+    <combo_box name="NonFriendIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_non_friend_im" />
+    <text name="conference_ims">会話ＩＭ：</text>
+    <combo_box name="ConferenceIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_conference_im" />
+    <text name="group_chat">グループチャット：</text>
+    <combo_box name="GroupChatOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_group_chat_im" />
+    <text name="nearby_chat">近隣チャット：</text>
+    <combo_box name="NearbyChatOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_nearby_chat_im" />
+    <text name="object_ims">オブジェクトによるＩＭ：</text>
+    <combo_box name="ObjectIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_object_im" />
+    <text name="notifications_alert">一時的にすべての通知を停止するには、「コミュニケーション」＞「着信拒否」を使用します。</text>
+  </panel>
+  <panel name="play_sound_settings">
+    <text name="play_sound">サウンドを再生：</text>
+    <check_box label="新しい会話" name="new_conversation" />
+    <check_box label="受信音声コール" name="incoming_voice_call" />
+    <check_box label="テレポートを送る" name="teleport_offer" />
+    <check_box label="インベントリを送る" name="inventory_offer" />
+  </panel>
+  <panel name="log_settings">
+    <text name="logging_label">保存：</text>
+    <combo_box name="conversation_log_combo">
+      <item label="ログおよびテキストチャット" name="log_and_transcripts" value="2" />
+      <item label="ログのみ" name="log_only" value="1" />
+      <item label="ログまたはテキストチャットなし" name="no_log_or_transcript" value="0" />
+    </combo_box>
+    <button label="ログを消去…" name="clear_log" />
+    <button label="テキストチャットを削除…" name="delete_transcripts" />
+    <text name="log_location_label">場所：</text>
+    <button label="参照…" label_selected="参照" name="log_path_button" />
+  </panel>
+  <button label="他の言語…" name="ok_btn" />
+  <button label="自動置換…" name="autoreplace_showgui" />
+  <button label="スペルチェック中…" name="spellcheck_showgui" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index 9f6abf8fcb..2ed930c9ca 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
@@ -1,44 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="色" name="colors_panel">
-	<text name="effects_color_textbox">
-		ビームの色（選択ビーム）：
-	</text>
-	<color_swatch name="effect_color_swatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="font_colors">
-		チャットの文字の色
-	</text>
-	<text name="text_box1">
-		自分
-	</text>
-	<text name="text_box2">
-		他の住人
-	</text>
-	<text name="text_box3">
-		オブジェクト
-	</text>
-	<text name="text_box4">
-		システム
-	</text>
-	<text name="text_box5">
-		エラー
-	</text>
-	<text name="text_box10">
-		ダイレクト
-	</text>
-	<text name="text_box7">
-		所有者
-	</text>
-	<text name="text_box9">
-		URL
-	</text>
-	<text name="bubble_chat">
-		名前の表示の背景色（吹き出しチャットにも適用）：
-	</text>
-	<color_swatch name="background" tool_tip="名前の表示色を選択"/>
-	<slider label="不透明度：" name="bubble_chat_opacity" tool_tip="名前の表示の不透明度を選択"/>
-	<text name="floater_opacity">
-		フローターの不透明度：
-	</text>
-	<slider label="有効：" name="active"/>
-	<slider label="無効：" name="inactive"/>
-</panel>
+  <text name="effects_color_textbox">自分のエフェクト（選択ビーム）：</text>
+  <color_swatch name="effect_color_swatch" tool_tip="クリックしてカラーピッカーを開きます" />
+  <text name="font_colors">チャットの文字の色</text>
+  <text name="text_box1">自分</text>
+  <text name="text_box2">他人</text>
+  <text name="text_box3">オブジェクト</text>
+  <text name="text_box4">システム</text>
+  <text name="text_box5">エラー</text>
+  <text name="text_box10">ダイレクト</text>
+  <text name="text_box7">所有者</text>
+  <text name="text_box9">ＵＲＬ</text>
+  <text name="bubble_chat">名前の表示の背景色（吹き出しチャットにも適用）：</text>
+  <color_swatch name="background" tool_tip="名前の表示色を選択" />
+  <slider label="不透明度：" name="bubble_chat_opacity" tool_tip="名前の表示の不透明度を選択" />
+  <text name="floater_opacity">フローターの透過度：</text>
+  <slider label="アクティブなフローター：" name="active" />
+  <slider label="非アクティブなフローター：" name="inactive" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml b/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
new file mode 100644
index 0000000000..9e4122af4b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="操作設定" name="controls">
+  <combo_box name="key_mode">
+    <combo_box.item label="三人称視点のとき" name="third_person" value="1" />
+    <combo_box.item label="一人称視点のとき（マウスルック）" name="first_person" value="0" />
+    <combo_box.item label="アバター編集時" name="edit_avatar" value="2" />
+    <combo_box.item label="着席時" name="sitting" value="3" />
+  </combo_box>
+  <button label="デフォルトに戻す" tool_tip="すべての操作設定をデフォルト値に戻します。" name="restore_defaults" />
+  <scroll_list name="controls_list" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 378cf8652e..9b8b4d352a 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -1,72 +1,56 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_panel">
-	<text name="language_textbox">
-		言語：
-	</text>
-	<combo_box name="language_combobox">
-		<combo_box.item label="English （英語）" name="English"/>
-		<combo_box.item label="Dansk (デンマーク語) - ベータ" name="Danish"/>
-		<combo_box.item label="Deutsch （ドイツ語） – ベータ" name="Deutsch(German)"/>
-		<combo_box.item label="Español （スペイン語） – ベータ" name="Spanish"/>
-		<combo_box.item label="Français （フランス語） – ベータ" name="French"/>
-		<combo_box.item label="Italiano （イタリア語） - ベータ" name="Italian"/>
-		<combo_box.item label="Polski (ポーランド語) - ベータ" name="Polish"/>
-		<combo_box.item label="Português（ポルトガル語） - ベータ" name="Portugese"/>
-		<combo_box.item label="Русский （ロシア語） - ベータ" name="Russian"/>
-		<combo_box.item label="Türkçe （トルコ語） - ベータ" name="Turkish"/>
-		<combo_box.item label="日本語 – ベータ" name="(Japanese)"/>
-		<combo_box.item label="正體中文（簡体字中国語）- ベータ版" name="Traditional Chinese"/>
-	</combo_box>
-	<text name="language_textbox2">
-		（再起動後に反映）
-	</text>
-	<text name="maturity_desired_prompt">
-		アクセスしたいコンテンツ：
-	</text>
-	<text name="maturity_desired_textbox"/>
-	<combo_box name="maturity_desired_combobox">
-		<combo_box.item label="General、Moderate、Adult" name="Desired_Adult"/>
-		<combo_box.item label="General と Moderate" name="Desired_Mature"/>
-		<combo_box.item label="General" name="Desired_PG"/>
-	</combo_box>
-	<check_box label="ログイン画面にお気に入りの場所を表示" name="favorites_on_login_check"/>
-	<text name="favorites_check_extra_text">
-		(このコンピュータを使用する他の人にも表示されます)
-	</text>
-	<text name="name_tags_textbox">
-		名前の表示：
-	</text>
-	<radio_group name="Name_Tag_Preference">
-		<radio_item label="オフ" name="radio" value="0"/>
-		<radio_item label="オン" name="radio2" value="1"/>
-		<radio_item label="一時的に表示" name="radio3" value="2"/>
-	</radio_group>
-	<check_box label="マイネーム" name="show_my_name_checkbox1"/>
-	<check_box label="ユーザー名" name="show_slids" tool_tip="bobsmith123 などユーザー名を表示"/>
-	<check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサーまたはメンバーなど、グループタイトルを表示"/>
-	<check_box label="フレンドをハイライト表示" name="show_friends" tool_tip="フレンドの名前をハイライト表示"/>
-	<check_box label="表示名を表示" name="display_names_check" tool_tip="これを選択すると、チャット、IM などで表示名が表示されます。"/>
-	<text name="inworld_typing_rg_label">
-		文字キーを押して次の操作：
-	</text>
-	<radio_group name="inworld_typing_preference">
-		<radio_item label="ローカル・チャットを始める" name="radio_start_chat" value="1"/>
-		<radio_item label="ムーブメントに影響（WASD など）" name="radio_move" value="0"/>
-	</radio_group>
-	<text name="title_afk_text">
-		一時退席までの時間：
-	</text>
-	<combo_box label="一時退席までの時間：" name="afk">
-		<combo_box.item label="2 分" name="item0"/>
-		<combo_box.item label="5 分" name="item1"/>
-		<combo_box.item label="10 分" name="item2"/>
-		<combo_box.item label="30 分" name="item3"/>
-		<combo_box.item label="一時退席設定なし" name="item4"/>
-	</combo_box>
-	<text name="text_box3">
-		「通知を受けない」応答:
-	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
-</panel>
+  <text name="language_textbox">言語：</text>
+  <combo_box name="language_combobox">
+    <combo_box.item label="English （英語）" name="English" />
+    <combo_box.item label="Dansk（デンマーク語）－ベータ" name="Danish" />
+    <combo_box.item label="Deutsch（ドイツ語）－ベータ" name="Deutsch(German)" />
+    <combo_box.item label="Español（スペイン語）－ベータ" name="Spanish" />
+    <combo_box.item label="Français（フランス語）－ベータ" name="French" />
+    <combo_box.item label="Italiano（イタリア語）－ベータ" name="Italian" />
+    <combo_box.item label="Polski（ポーランド語）－ベータ" name="Polish" />
+    <combo_box.item label="Português（ポルトガル語）－ベータ" name="Portugese" />
+    <combo_box.item label="Русский（ロシア語）－ベータ" name="Russian" />
+    <combo_box.item label="Türkçe（トルコ語）－ベータ" name="Turkish" />
+    <combo_box.item label="日本語－ベータ" name="(Japanese)" />
+    <combo_box.item label="正體中文（簡体字中国語）－ベータ版" name="Traditional Chinese" />
+  </combo_box>
+  <text name="language_textbox2">（再起動後に反映）</text>
+  <text name="maturity_desired_prompt">アクセスしたいコンテンツ：</text>
+  <text name="maturity_desired_textbox" />
+  <combo_box name="maturity_desired_combobox">
+    <combo_box.item label="General、Moderate、Adult" name="Desired_Adult" />
+    <combo_box.item label="GeneralとModerate" name="Desired_Mature" />
+    <combo_box.item label="General" name="Desired_PG" />
+  </combo_box>
+  <check_box label="ログイン画面にお気に入りの場所を表示" name="favorites_on_login_check" />
+  <text name="favorites_check_extra_text">（このコンピュータを使用する他の人にも表示されます）</text>
+  <text name="name_tags_textbox">名前の表示：</text>
+  <radio_group name="Name_Tag_Preference">
+    <radio_item label="オフ" name="radio" value="0" />
+    <radio_item label="オン" name="radio2" value="1" />
+    <radio_item label="一時的に表示" name="radio3" value="2" />
+  </radio_group>
+  <check_box label="マイネーム" name="show_my_name_checkbox1" />
+  <check_box label="ユーザー名" name="show_slids" tool_tip="bobsmith123 などユーザー名を表示" />
+  <check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサーまたはメンバーなど、グループタイトルを表示" />
+  <check_box label="フレンドをハイライト表示" name="show_friends" tool_tip="フレンドの名前をハイライト表示" />
+  <check_box label="表示名を表示" name="display_names_check" tool_tip="これを選択すると、チャット、ＩＭなどで表示名が表示されます。" />
+
+  <text name="inworld_typing_rg_label">特定キーを押したときの動作：</text>
+  <radio_group name="inworld_typing_preference">
+    <radio_item label="チャットを始める" name="radio_start_chat" value="1" />
+    <radio_item label="移動する（WSADなど）" name="radio_move" value="0" />
+  </radio_group>
+
+  <text name="title_afk_text">「離席」とするまでの時間：</text>
+  <combo_box label="「離席」とするまでの時間：" name="afk">
+    <combo_box.item label="２分" name="item0" />
+    <combo_box.item label="５分" name="item1" />
+    <combo_box.item label="１０分" name="item2" />
+    <combo_box.item label="３０分" name="item3" />
+    <combo_box.item label="離席設定なし" name="item4" />
+  </combo_box>
+  <text name="text_box3">「着信拒否」時の応答：</text>
+  <text_editor name="do_not_disturb_response">log_in_to_change</text_editor>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index fc966dc08a..859d6467d9 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,41 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="表示" name="Display panel">
-	<text name="preset_text">
-		(なし)
-	</text>
-	<text name="QualitySpeed">
-		クオリティとスピード：
-	</text>
-	<text name="ShadersPrefText">
-		低
-	</text>
-	<text name="ShadersPrefText2">
-		中
-	</text>
-	<text name="ShadersPrefText3">
-		高
-	</text>
-	<text name="ShadersPrefText4">
-		超高
-	</text>
-	<text name="FasterText">
-		速い
-	</text>
-	<text name="BetterText">
-		遅い
-	</text>
-	<check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
-	<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
-	<slider label="アバターの最大複雑度:" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します"/>
-	<text name="IndirectMaxComplexityText">
-		0
-	</text>
-	<check_box initial_value="true" label="常に友人を描画" name="AlwaysRenderFriends"/>
-	<button label="例外..." name="RenderExceptionsButton"/>
-	<button label="設定をプリセットとして保存..." name="PrefSaveButton"/>
-	<button label="プリセットをロード..." name="PrefLoadButton"/>
-	min_val=&quot;0.125&quot;
-	<button label="事前設定を削除..." name="PrefDeleteButton"/>
-	<button label="推奨設定にリセット" name="Defaults"/>
-	<button label="詳細設定..." name="AdvancedSettings"/>
-</panel>
+  <text name="preset_text">（なし）</text>
+  <text name="QualitySpeed">品質と速度：</text>
+  <text name="ShadersPrefText">低</text>
+  <text name="ShadersPrefText2">中</text>
+  <text name="ShadersPrefText3">高</text>
+  <text name="ShadersPrefText4">最高</text>
+  <text name="FasterText">速度優先</text>
+  <text name="BetterText">品質優先</text>
+
+  <!-- This block shows Basic Settings -->
+
+  <slider control_name="RenderFarClip" label="描画距離：" name="DrawDistance" />
+  <text name="DrawDistanceMeterText2">ｍ</text>
+
+  <check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders" />
+
+  <check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders" />
+
+  <slider label="アバターの最大複雑度：" name="IndirectMaxComplexity" tool_tip="どの程度の複雑度で他のアバターをJellyDollとして描画するを設定します。" />
+  <text name="IndirectMaxComplexityText">0</text>
+  <text name="IndirectMaxComplexityLink">[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 これはなんですか？]</text>
+
+
+  <check_box initial_value="true" label="フレンドは常に描画" name="AlwaysRenderFriends" />
+  <button label="例外…" name="RenderExceptionsButton" />
+
+  <!-- End of Basic Settings block -->
+
+  <button label="設定をプリセットとして保存…" name="PrefSaveButton" />
+  <button label="プリセットをロード…" name="PrefLoadButton" />
+  <button label="プリセットを削除…" name="PrefDeleteButton" />
+  <button label="推奨設定にリセット" name="Defaults" />
+  <button label="拡張設定…" name="AdvancedSettings" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml b/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
new file mode 100644
index 0000000000..8173e57205
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="グリッド" name="grids">
+  <text name="add_grid_text">新しいグリッドを追加：</text>
+  <line_editor name="add_grid" label="ログインURIを入力" />
+  <button label="追加" name="add_grid_commit" />
+  <text name="manage_grid_text">グリッド管理：</text>
+  <scroll_list name="grid_list">
+    <scroll_list.columns label="グリッド名" name="grid_label" />
+    <scroll_list.columns label="ログインURI" name="login_uri" />
+    <scroll_list.commit_callback function="Pref.SelectGrid" />
+  </scroll_list>
+  <button label="有効化" name="activate_grid" />
+  <button label="リフレッシュ" name="refresh_grid" />
+  <button label="削除" name="remove_grid" />
+  <button label="デバッグ" name="debug_grid" />
+  <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" tool_tip="ログイン画面にグリッド選択を表示して、他のワールドにログインします。" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
index 121bebfd52..bb1e62e505 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="移動" name="move_panel">
-	<slider label="視界角" name="camera_fov"/>
-	<slider label="距離" name="camera_offset_scale"/>
-	<text name="heading2">
-		自動ポジション：
-	</text>
-	<check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います"/>
-	<check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います"/>
-	<text name="keyboard_lbl">
-		キーボード：
-	</text>
-	<check_box label="常にキー操作で動くようにする" name="arrow_keys_move_avatar_check"/>
-	<check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run"/>
-	<text name="mouse_lbl">
-		マウス：
-	</text>
-	<check_box label="一人称視点で表示する" name="first_person_avatar_visible"/>
-	<text name=" Mouse Sensitivity">
-		一人称視点のマウスの感度：
-	</text>
-	<check_box label="切り替え" name="invert_mouse"/>
-	<text name="single_click_action_lbl">
-		土地をシングルクリック：
-	</text>
-	<combo_box name="single_click_action_combo">
-		<combo_box.item label="動作なし" name="0"/>
-		<combo_box.item label="クリックされた地点に移動" name="1"/>
-	</combo_box>
-	<text name="double_click_action_lbl">
-		土地をダブルクリック：
-	</text>
-	<combo_box name="double_click_action_combo">
-		<combo_box.item label="動作なし" name="0"/>
-		<combo_box.item label="クリックされた地点に移動" name="1"/>
-		<combo_box.item label="クリックされた地点にテレポート" name="2"/>
-	</combo_box>
-	<button label="その他のディバイス" name="joystick_setup_button"/>
-</panel>
+  <icon name="camera_icon"/>
+  <slider label="視界角" name="camera_fov" />
+  <slider label="距離" name="camera_offset_scale" />
+  <text name="heading2">自動ポジション：</text>
+  <check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います" />
+  <check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います" />
+  <icon name="avatar_icon" />
+  <text name="keyboard_lbl">キーボード：</text>
+  <check_box label="方向キー押下時は、常に移動するようにする" name="arrow_keys_move_avatar_check" />
+  <check_box label="移動キー２度押し＋長押しで走る" name="tap_tap_hold_to_run" />
+  <check_box label="ジャンプまたはしゃがみキーを押し続けると、飛行を開始または停止します。" name="automatic_fly" />
+  <text name="mouse_lbl">マウス：</text>
+  <check_box label="一人称視点で表示する" name="first_person_avatar_visible" />
+  <text name=" Mouse Sensitivity">一人称視点時のマウスの感度：</text>
+  <check_box label="切り替え" name="invert_mouse" />
+  <text name="single_click_action_lbl">土地をシングルクリック：</text>
+  <combo_box name="single_click_action_combo">
+    <combo_box.item label="動作なし" name="0" value="0" />
+    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
+  </combo_box>
+  <text name="double_click_action_lbl">土地をダブルクリック：</text>
+  <combo_box name="double_click_action_combo">
+    <combo_box.item label="動作なし" name="0" value="0" />
+    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
+    <combo_box.item label="クリックされた地点にテレポート" name="2" value="2" />
+  </combo_box>
+  <check_box control_name="EnableCollisionSounds" label="ぶつかったときにサウンドを鳴らす" name="sound_on_collisions" />
+  <button label="その他のデバイス" name="joystick_setup_button" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index 2db6a688f3..d5aeeb81b3 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット設定" name="im">
-	<panel.string name="log_in_to_change">
-		ログインして変更
-	</panel.string>
-	<button label="履歴を消去" name="clear_cache" tool_tip="ログイン画像、最後にいた場所、テレポート履歴、Web、テクスチャキャッシュを削除します"/>
-	<text name="cache_size_label_l">
-		（位置、画像、web、検索履歴）
-	</text>
-	<check_box label="プロフィールを検索結果に表示する" name="online_searchresults"/>
-	<check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility"/>
-	<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
-	<check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check"/>
-	<check_box label="ログイン時にお気に入りのランドマークを表示（「開始地点」ドロップダウンメニュー経由）" name="favorites_on_login_check"/>
-	<text name="Logs:">
-		チャットログ：
-	</text>
-	<check_box label="近くのチャットログをコンピューターに保存する" name="log_nearby_chat"/>
-	<check_box label="IM ログをコンピューターに保存する" name="log_instant_messages"/>
-	<check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im"/>
-	<check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp"/>
-	<text name="log_path_desc">
-		ログの保存場所：
-	</text>
-	<button label="参照" label_selected="参照" name="log_path_button"/>
-	<button label="ブロックリスト" name="block_list"/>
-	<text name="block_list_label">
-		（あなたがブロックした住人/オブジェクト）
-	</text>
-</panel>
+  <panel.string name="log_in_to_change">ログインして変更</panel.string>
+  <button label="履歴を消去" name="clear_cache" tool_tip="ログイン画像、最後にいた場所、テレポート履歴、Web、テクスチャキャッシュを削除します" />
+  <text name="cache_size_label_l">（位置、画像、Web、検索履歴）</text>
+  <check_box label="プロフィールを検索結果に表示する" name="online_searchresults" />
+  <check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility" />
+  <check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check" />
+  <check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check" />
+  <check_box label="ログイン時にお気に入りのランドマークを表示（「開始地点」ドロップダウンメニュー経由）" name="favorites_on_login_check" />
+  <text name="Logs:">チャットログ：</text>
+  <check_box label="近隣チャットログをコンピューターに保存する" name="log_nearby_chat" />
+  <check_box label="ＩＭログをコンピューターに保存する" name="log_instant_messages" />
+  <check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im" />
+  <check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp" />
+  <text name="log_path_desc">ログの保存場所：</text>
+  <button label="参照" label_selected="参照" name="log_path_button" />
+  <button label="ブロックリスト" name="block_list" />
+  <text name="block_list_label">（あなたがブロックした住人／オブジェクト）</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 2ceecf9df6..50bec4d2e5 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -1,39 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セットアップ" name="Input panel">
-	<text name="Network:">
-		ネットワーク：
-	</text>
-	<text name="Maximum bandwidth">
-		最大帯域幅
-	</text>
-	<text name="text_box2">
-		kbps
-	</text>
-	<check_box label="カスタムポート" name="connection_port_enabled"/>
-	<spinner label="ポート番号：" name="connection_port"/>
-	<text name="Web:">
-		Web：
-	</text>
-	<radio_group name="preferred_browser_behavior">
-		<radio_item label="すべてのリンクにデフォルトシステムのブラウザを使用します" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0"/>
-		<radio_item label="Second Life リンクにのみ内蔵ブラウザを使用します" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します内蔵ブラウザは LindenLab/Second Life リンクにのみ使用されます。" value="1"/>
-		<radio_item label="すべてのリンクに内蔵ブラウザを使用します" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME] 内に新しいウィンドウでこのブラウザが開きます。" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled"/>
-	<check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled"/>
-	<check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled"/>
-	<text name="Software updates:">
-		ソフトウェアアップデート：
-	</text>
-	<combo_box name="updater_service_combobox">
-		<combo_box.item label="各アップデートを自動的にインストールする" name="Install_automatically"/>
-		<combo_box.item label="オプションのアップデートのインストール準備ができたら通知する" name="Install_ask"/>
-		<combo_box.item label="必須アップデートのみインストールする" name="Install_manual"/>
-	</combo_box>
-	<check_box label="release candidate にアップグレードします" name="update_willing_to_test"/>
-	<check_box label="更新後にリリースノートを表示する" name="update_show_release_notes"/>
-	<text name="Proxy Settings:">
-		プロキシ設定：
-	</text>
-	<button label="プロキシ設定を調整" label_selected="参照" name="set_proxy"/>
-</panel>
+  <text name="Network:">ネットワーク：</text>
+  <text name="Maximum bandwidth">最大帯域幅</text>
+  <text name="text_box2">kbps</text>
+  <check_box label="カスタムポート" name="connection_port_enabled" />
+  <spinner label="ポート番号：" name="connection_port" />
+  <text name="Web:">Web：</text>
+  <radio_group name="preferred_browser_behavior">
+    <radio_item label="すべてのリンクにデフォルトシステムのブラウザを使用します" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0" />
+    <radio_item label="Second Life リンクにのみ内蔵ブラウザを使用します" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します内蔵ブラウザは LindenLab/Second Life リンクにのみ使用されます。" value="1" />
+    <radio_item label="すべてのリンクに内蔵ブラウザを使用します" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME]内に新しいウィンドウでこのブラウザが開きます。" value="2" />
+  </radio_group>
+  <check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled" />
+  <check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled" />
+  <check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled" />
+  <text name="Software updates:">ソフトウェアアップデート：</text>
+  <combo_box name="updater_service_combobox">
+    <combo_box.item label="各アップデートを自動的にインストールする" name="Install_automatically" />
+    <combo_box.item label="オプションのアップデートのインストール準備ができたら通知する" name="Install_ask" />
+    <combo_box.item label="必須アップデートのみインストールする" name="Install_manual" />
+  </combo_box>
+  <check_box label="release candidate にアップグレードします" name="update_willing_to_test" />
+  <check_box label="更新後にリリースノートを表示する" name="update_show_release_notes" />
+  <text name="Proxy Settings:">プロキシ設定：</text>
+  <button label="プロキシ設定を調整" label_selected="参照" name="set_proxy" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 899b7c1b84..9da5737708 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -1,37 +1,35 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="サウンド" name="Preference Media panel">
-	<panel.string name="middle_mouse">マウスの中央</panel.string>
-	<slider label="全体の音量" name="System Volume"/>
-	<check_box initial_value="true" label="Mute when minimized" name="mute_when_minimized"/>
-	<text name="mute_chb_label">最小化でミュート</text>
-	<slider label="ボタン" name="UI Volume"/>
-	<slider label="風" name="Wind Volume"/>
-	<slider label="効果音" name="SFX Volume"/>
-	<slider label="ストリーミング音楽" name="Music Volume"/>
-	<check_box label="有効" name="enable_music"/>
-	<slider label="メディア" name="Media Volume"/>
-	<check_box label="有効" name="enable_media"/>
-	<slider label="ボイスチャット" name="Voice Volume"/>
-	<check_box label="有効" name="enable_voice_check"/>
-	<check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します" value="true"/>
-	<check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" value="true"/>
-	<check_box label="ジェスチャーの音を再生" name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を聞くにはこれを選択" value="true"/>
-	<text name="voice_chat_settings">ボイスチャットの設定</text>
-	<text name="Listen from">方向：</text>
-	<radio_group name="ear_location">
-		<radio_item label="カメラの位置から聞く" name="0"/>
-		<radio_item label="アバターの位置から聞く" name="1"/>
-	</radio_group>
-	<check_box label="話すときにアバターの口を動かす" name="enable_lip_sync"/>
-	<check_box label="ボイスのオン・オフ切り替えに使用するトリガーキー：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを1度押して放すと、マイクのオン・オフ設定を切り替えます。トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。"/>
-	<line_editor label="プッシュ・トゥ・スピークのトリガー" name="modifier_combo"/>
-	<button label="キー設定" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="マウスの中央ボタンにリセット"/>
-	<button label="入力・出力機器" name="device_settings_btn"/>
-	<panel label="機器の設定" name="device_settings_panel"/>
-	<combo_box name="media_auto_play_combo">
-		<item name="autoplay_enabled" label="はい"/>
-		<item name="autoplay_ask" label="求める"/>
-		<item name="autoplay_disabled" label="いいえ"/>
-	</combo_box>
-</panel>
+  <panel.string name="middle_mouse">マウスの中央</panel.string>
+  <slider label="全体の音量" name="System Volume" />
+  <check_box label="最小化時にミュート" name="mute_when_minimized" />
+  <text name="mute_chb_label">最小化時にミュート</text>
+  <slider label="ボタン" name="UI Volume" />
+  <slider label="風" name="Wind Volume" />
+  <slider label="効果音" name="SFX Volume" />
+  <slider label="ストリーミング音楽" name="Music Volume" />
+  <check_box label="有効" name="enable_music" />
+  <slider label="メディア" name="Media Volume" />
+  <check_box label="有効" name="enable_media" />
+  <slider label="ボイスチャット" name="Voice Volume" />
+  <check_box label="有効" name="enable_voice_check" />
+  <!-- -->
+  <check_box label="ジェスチャーの音を再生" name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を聞くにはこれを選択" />
+  <check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" />
+  <!-- -->
+  <text name="Listen media from">メディアとサウンドを聞く場所：</text>
+  <radio_group name="media_ear_location">
+    <radio_item label="カメラの位置から聞く" name="0" />
+    <radio_item label="アバターの位置から聞く" name="1" />
+  </radio_group>
+  <text name="media_autoplay_label">メディアの自動再生</text>
+  <combo_box name="media_auto_play_combo">
+    <item name="autoplay_enabled" label="再生する"/>
+    <item name="autoplay_ask" label="確認する"/>
+    <item name="autoplay_disabled" label="再生しない"/>
+  </combo_box>
+  <check_box label="話すときにアバターの口を動かす" name="enable_lip_sync" />
+  <check_box label="ボイスのオン・オフ切り替えに使用するトリガーキー：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを1度押して放すと、マイクのオン・オフ設定を切り替えます。トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。" />
+  <button label="入力・出力機器" name="device_settings_btn" />
+  <panel label="機器の設定" name="device_settings_panel" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
index 50d0e311a0..acea0ea965 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アップロード" name="uploads">
-	<text name="title">
-		アップロード用の最新の宛先フォルダ
-	</text>
-	<text name="title_models">
-		画像
-	</text>
-	<text name="title_sounds">
-		サウンド
-	</text>
-	<text name="title_animation">
-		アニメーション
-	</text>
-	<text name="title_model">
-		モデル
-	</text>
-	<text name="upload_help">
-		宛先フォルダを変更するには、持ち物でそのフォルダを右クリックして、&quot;デフォルトとして使用&quot; を選択します
-	</text>
-</panel>
+  <text name="title">アップロード先のフォルダ</text>
+  <text name="title_models">画像</text>
+  <text name="title_sounds">サウンド</text>
+  <text name="title_animation">アニメーション</text>
+  <text name="title_model">モデル</text>
+  <text name="upload_help">宛先フォルダを変更するには、持ち物でそのフォルダを右クリックして、
+「デフォルトとして使用」を選択します。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
new file mode 100644
index 0000000000..f2d3494fd8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_camera_pulldown">
+  <text name="Camera Presets">カメラのプリセット</text>
+  <scroll_list name="preset_camera_list" />
+  <view_border name="horiz_separator" />
+  <button name="open_prefs_btn" label="カメラのフローターを表示" tool_tip="カメラのフローターを起動する" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
index 422ed01cbb..3ed66117ee 100644
--- a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="presets_pulldown">
-	<text name="Graphic Presets">
-		グラフィックプリセット
-	</text>
-	<button label="グラフィックス設定を開く" name="open_prefs_btn" tool_tip="グラフィックス設定を開きます"/>
-</panel>
+  <text name="Graphic Presets">グラフィックプリセット</text>
+  <button label="グラフィックス設定を開く" name="open_prefs_btn" tool_tip="グラフィックス設定を開きます" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 9eb384830b..e6c638bf6e 100644
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="MediaControls">
-	<string name="control_background_image_name">Inspector_Background</string>
-	<string name="skip_step">0.2</string>
-	<layout_stack name="progress_indicator_area">
-		<layout_panel name="media_progress_indicator">
-			<progress_bar name="media_progress_bar" tool_tip="ローディング"/>
-		</layout_panel>
-	</layout_stack>
-	<layout_stack name="media_controls">
-		<layout_panel name="back">
-			<button name="back_btn" tool_tip="前へ"/>
-		</layout_panel>
-		<layout_panel name="fwd">
-			<button name="fwd_btn" tool_tip="次へ"/>
-		</layout_panel>
-		<layout_panel name="home">
-			<button name="home_btn" tool_tip="ホームページ"/>
-		</layout_panel>
-		<layout_panel name="media_stop">
-			<button name="media_stop_btn" tool_tip="メディアを停止"/>
-		</layout_panel>
-		<layout_panel name="reload">
-			<button name="reload_btn" tool_tip="更新"/>
-		</layout_panel>
-		<layout_panel name="stop">
-			<button name="stop_btn" tool_tip="読み込み停止"/>
-		</layout_panel>
-		<layout_panel name="play">
-			<button name="play_btn" tool_tip="メディアを再生"/>
-		</layout_panel>
-		<layout_panel name="pause">
-			<button name="pause_btn" tool_tip="メディアを一時停止"/>
-		</layout_panel>
-		<layout_panel name="media_address">
-			<line_editor name="media_address_url" tool_tip="メディア URL"/>
-			<layout_stack name="media_address_url_icons">
-				<layout_panel name="media_address_url_icons_wl">
-					<icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="media_play_position">
-			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="ムービー再生進行"/>
-		</layout_panel>
-		<layout_panel name="skip_back">
-			<button name="skip_back_btn" tool_tip="前にステップ"/>
-		</layout_panel>
-		<layout_panel name="skip_forward">
-			<button name="skip_forward_btn" tool_tip="次にステップ"/>
-		</layout_panel>
-		<layout_panel name="media_volume">
-			<button name="media_mute_button" tool_tip="ミュート"/>
-			<slider name="volume_slider" tool_tip="メディアの音量"/>
-		</layout_panel>
-		<layout_panel name="zoom_frame">
-			<button name="zoom_frame_btn" tool_tip="メディアにズームイン"/>
-		</layout_panel>
-		<layout_panel name="close">
-			<button name="close_btn" tool_tip="ズームバック"/>
-		</layout_panel>
-		<layout_panel name="new_window">
-			<button name="new_window_btn" tool_tip="URL をブラウザで開く"/>
-		</layout_panel>
-		<icon name="media_secure_lock_flag" tool_tip="安全なブラウジング"/>
-	</layout_stack>
-</panel>
+  <string name="control_background_image_name">Inspector_Background</string>
+  <string name="skip_step">0.2</string>
+  <layout_stack name="progress_indicator_area">
+    <layout_panel name="media_progress_indicator">
+      <progress_bar name="media_progress_bar" tool_tip="読み込んでいます…" />
+    </layout_panel>
+  </layout_stack>
+  <layout_stack name="media_controls">
+    <layout_panel name="back">
+      <button name="back_btn" tool_tip="前へ" />
+    </layout_panel>
+    <layout_panel name="fwd">
+      <button name="fwd_btn" tool_tip="次へ" />
+    </layout_panel>
+    <layout_panel name="home">
+      <button name="home_btn" tool_tip="ホームページ" />
+    </layout_panel>
+    <layout_panel name="media_stop">
+      <button name="media_stop_btn" tool_tip="メディアを停止" />
+    </layout_panel>
+    <layout_panel name="reload">
+      <button name="reload_btn" tool_tip="更新" />
+    </layout_panel>
+    <layout_panel name="stop">
+      <button name="stop_btn" tool_tip="読み込み停止" />
+    </layout_panel>
+    <layout_panel name="play">
+      <button name="play_btn" tool_tip="メディアを再生" />
+    </layout_panel>
+    <layout_panel name="pause">
+      <button name="pause_btn" tool_tip="メディアを一時停止" />
+    </layout_panel>
+    <layout_panel name="media_address">
+      <line_editor name="media_address_url" tool_tip="メディア URL" />
+      <layout_stack name="media_address_url_icons">
+        <layout_panel name="media_address_url_icons_wl">
+          <icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="media_play_position">
+      <slider_bar name="media_play_slider" tool_tip="ムービー再生進行" />
+    </layout_panel>
+    <layout_panel name="skip_back">
+      <button name="skip_back_btn" tool_tip="前にステップ" />
+    </layout_panel>
+    <layout_panel name="skip_forward">
+      <button name="skip_forward_btn" tool_tip="次にステップ" />
+    </layout_panel>
+    <layout_panel name="media_volume">
+      <button name="media_mute_button" tool_tip="ミュート" />
+      <slider name="volume_slider" tool_tip="メディアの音量" />
+    </layout_panel>
+    <layout_panel name="zoom_frame">
+      <button name="zoom_frame_btn" tool_tip="メディアにズームイン" />
+    </layout_panel>
+    <layout_panel name="close">
+      <button name="close_btn" tool_tip="ズームバック" />
+    </layout_panel>
+    <layout_panel name="new_window">
+      <button name="new_window_btn" tool_tip="URL をブラウザで開く" />
+    </layout_panel>
+  </layout_stack>
+  <icon name="media_secure_lock_flag" tool_tip="安全なブラウジング" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classified.xml b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
index 2d1bc07e2c..9129349310 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
@@ -1,110 +1,78 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_profile_classified">
-	<panel.string name="type_mature">
-		Moderate
-	</panel.string>
-	<panel.string name="type_pg">
-		General コンテンツ
-	</panel.string>
-	<panel.string name="l$_price">
-		L$[PRICE]
-	</panel.string>
-	<panel.string name="click_through_text_fmt">
-		[TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール
-	</panel.string>
-	<panel.string name="date_fmt">
-		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
-	</panel.string>
-	<panel.string name="auto_renew_on">
-		有効
-	</panel.string>
-	<panel.string name="auto_renew_off">
-		無効
-	</panel.string>
-	<panel.string name="location_notice">
-		（掲載後更新）
-	</panel.string>
-	<string name="publish_label">
-		掲載
-	</string>
-	<string name="save_label">
-		保存
-	</string>
-	<scroll_container name="profile_scroll">
-		<panel name="info_scroll_content_panel">
-			<icon label="" name="edit_icon" tool_tip="クリックして画像を選択"/>
-			<layout_stack name="info_panel">
-				<layout_panel name="main_info_panel">
-					<text_editor name="classified_name">
-						[name]
-					</text_editor>
-					<text name="classified_location_label" value="場所："/>
-					<text_editor name="classified_location" value="[loading...]"/>
-					<text name="content_type_label" value="コンテンツの種類："/>
-					<text_editor name="content_type" value="[content type]"/>
-					<text name="category_label" value="カテゴリ："/>
-					<text_editor name="category" value="[category]"/>
-					<text name="creation_date_label" value="制作日："/>
-					<text_editor name="creation_date" tool_tip="制作日" value="[date]"/>
-					<text name="price_for_listing_label" value="掲載価格："/>
-					<text_editor name="price_for_listing" tool_tip="掲載価格。">
-						[PRICE]
-					</text_editor>
-				</layout_panel>
-				<layout_panel name="clickthrough_layout_panel">
-					<text name="click_through_label" value="クリック数："/>
-					<text_editor name="click_through_text" tool_tip="クリックスルーデータ" value="[clicks]"/>
-				</layout_panel>
-				<layout_panel name="auto_renew_layout_panel">
-					<text name="auto_renew_label" value="自動更新："/>
-					<text name="auto_renew" value="有効"/>
-				</layout_panel>
-				<layout_panel name="descr_layout_panel">
-					<text name="classified_desc_label" value="説明："/>
-					<text_editor name="classified_desc" value="[description]"/>
-				</layout_panel>
-			</layout_stack>
-			<panel name="edit_panel">
-				<text name="Name:">
-					タイトル：
-				</text>
-				<text name="description_label">
-					説明：
-				</text>
-				<text name="location_label">
-					場所：
-				</text>
-				<text name="classified_location_edit">
-					ロード中...
-				</text>
-				<button label="現在地に設定" name="set_to_curr_location_btn"/>
-				<text name="category_label" value="カテゴリ："/>
-				<text name="content_type_label" value="コンテンツの種類："/>
-				<icons_combo_box label="General コンテンツ" name="content_type_edit">
-					<icons_combo_box.item label="Moderate コンテンツ" name="mature_ci" value="Mature"/>
-					<icons_combo_box.item label="General コンテンツ" name="pg_ci" value="PG"/>
-				</icons_combo_box>
-				<check_box label="毎週自動更新" name="auto_renew_edit"/>
-				<text name="price_for_listing_edit_label" value="掲載価格："/>
-				<spinner label="L$" name="price_for_listing_edit" tool_tip="掲載価格。" value="50"/>
-			</panel>
-		</panel>
-	</scroll_container>
-	<layout_stack name="edit_btns_pnl">
-		<layout_panel name="teleport_btn_lp">
-			<button label="テレポート" name="teleport_btn"/>
-		</layout_panel>
-		<layout_panel name="map_btn_lp">
-			<button label="地図" name="show_on_map_btn"/>
-		</layout_panel>
-		<layout_panel name="edit_btn_lp">
-			<button label="編集" name="edit_btn"/>
-		</layout_panel>
-		<layout_panel name="save_btn_lp">
-			<button label="[LABEL]" name="save_changes_btn"/>
-		</layout_panel>
-		<layout_panel name="cancel_btn_lp">
-			<button label="キャンセル" name="cancel_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <panel.string name="type_mature">Moderate</panel.string>
+  <panel.string name="type_pg">General コンテンツ</panel.string>
+  <panel.string name="l$_price">L$[PRICE]</panel.string>
+  <panel.string name="click_through_text_fmt">[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</panel.string>
+  <panel.string name="date_fmt">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</panel.string>
+  <panel.string name="auto_renew_on">有効</panel.string>
+  <panel.string name="auto_renew_off">無効</panel.string>
+  <panel.string name="location_notice">（掲載後更新）</panel.string>
+  <string name="publish_label">掲載</string>
+  <string name="save_label">保存</string>
+  <scroll_container name="profile_scroll">
+    <panel name="info_scroll_content_panel">
+      <icon label="" name="edit_icon" tool_tip="クリックして画像を選択" />
+      <layout_stack name="info_panel">
+        <layout_panel name="main_info_panel">
+          <text_editor name="classified_name">[name]</text_editor>
+          <text name="classified_location_label" value="場所：" />
+          <text_editor name="classified_location" value="[loading...]" />
+          <text name="content_type_label" value="コンテンツの種類：" />
+          <text_editor name="content_type" value="[content type]" />
+          <text name="category_label" value="カテゴリ：" />
+          <text_editor name="category" value="[category]" />
+          <text name="creation_date_label" value="制作日：" />
+          <text_editor name="creation_date" tool_tip="制作日" value="[date]" />
+          <text name="price_for_listing_label" value="掲載価格：" />
+          <text_editor name="price_for_listing" tool_tip="掲載価格">[PRICE]</text_editor>
+        </layout_panel>
+        <layout_panel name="clickthrough_layout_panel">
+          <text name="click_through_label" value="クリック数：" />
+          <text_editor name="click_through_text" tool_tip="クリックスルーデータ" value="[clicks]" />
+        </layout_panel>
+        <layout_panel name="auto_renew_layout_panel">
+          <text name="auto_renew_label" value="自動更新：" />
+          <text name="auto_renew" value="有効" />
+        </layout_panel>
+        <layout_panel name="descr_layout_panel">
+          <text name="classified_desc_label" value="説明：" />
+          <text_editor name="classified_desc" value="[description]" />
+        </layout_panel>
+      </layout_stack>
+      <panel name="edit_panel">
+        <text name="Name:">タイトル：</text>
+        <text name="description_label">説明：</text>
+        <text name="location_label">場所：</text>
+        <text name="classified_location_edit">読み込んでいます…</text>
+        <button label="現在地に設定" name="set_to_curr_location_btn" />
+        <text name="category_label" value="カテゴリ：" />
+        <text name="content_type_label" value="コンテンツの種類：" />
+        <icons_combo_box label="General コンテンツ" name="content_type_edit">
+          <icons_combo_box.item label="Moderate コンテンツ" name="mature_ci" value="Mature" />
+          <icons_combo_box.item label="General コンテンツ" name="pg_ci" value="PG" />
+        </icons_combo_box>
+        <check_box label="毎週自動更新" name="auto_renew_edit" />
+        <text name="price_for_listing_edit_label" value="掲載価格：" />
+        <spinner label="L$" name="price_for_listing_edit" tool_tip="掲載価格。" value="50" />
+      </panel>
+    </panel>
+  </scroll_container>
+  <layout_stack name="edit_btns_pnl">
+    <layout_panel name="teleport_btn_lp">
+      <button label="テレポート" name="teleport_btn" />
+    </layout_panel>
+    <layout_panel name="map_btn_lp">
+      <button label="マップ" name="show_on_map_btn" />
+    </layout_panel>
+    <layout_panel name="edit_btn_lp">
+      <button label="編集" name="edit_btn" />
+    </layout_panel>
+    <layout_panel name="save_btn_lp">
+      <button label="[LABEL]" name="save_changes_btn" />
+    </layout_panel>
+    <layout_panel name="cancel_btn_lp">
+      <button label="キャンセル" name="cancel_btn" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
index 1980c0fa62..fdb327625f 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="クラシファイド広告" name="panel_profile_classifieds">
-	<string name="no_classifieds" value="クラシファイド広告なし"/>
-	<button label="新規…" name="new_btn"/>
-	<button label="削除…" name="delete_btn"/>
-	<text name="classifieds_panel_text">
-		ロード中...
-	</text>
-</panel>
+  <string name="no_classifieds" value="クラシファイド広告なし" />
+  <button label="新規…" name="new_btn" />
+  <button label="削除…" name="delete_btn" />
+  <text name="classifieds_panel_text">読み込んでいます…</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
index a4ee262cb3..22a0e619f6 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="プロフィール" name="panel_profile_firstlife"/>
+<panel label="プロフィール" name="panel_profile_firstlife" />
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_notes.xml b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
index 4b4e0d5e4e..3408aafabe 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メモとプライバシー" name="panel_notes">
-	<text name="status_message" value="このアバターのプライベートメモ："/>
-	<text name="status_message2" value="このアバターに次の許可を与える："/>
-	<check_box label="自分のオンラインステータスを表示する" name="status_check"/>
-	<check_box label="世界地図で自分を探せるようにする" name="map_check"/>
-	<check_box label="自分のオブジェクトを編集・削除・取得できるようにする" name="objects_check"/>
-</panel>
+  <text name="status_message" value="このアバターのプライベートメモ：" />
+  <text name="status_message2" value="このアバターに次の許可を与える：" />
+  <check_box label="自分のオンラインステータスを表示する" name="status_check" />
+  <check_box label="ワールドマップで自分を探せるようにする" name="map_check" />
+  <check_box label="自分のオブジェクトを編集・削除・取得できるようにする" name="objects_check" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
index 0a20c04ad6..6d9303e64d 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_pick_info">
-	<panel.string name="location_notice">
-		（掲載後更新）
-	</panel.string>
-	<line_editor name="pick_location">
-		ロード中...
-	</line_editor>
-	<button label="テレポート" name="teleport_btn"/>
-	<button label="地図に表示" name="show_on_map_btn"/>
-	<button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定"/>
-	<button label="ピックを保存" name="save_changes_btn"/>
-</panel>
+  <panel.string name="location_notice">（掲載後更新）</panel.string>
+  <line_editor name="pick_location">（読み込んでいます…）</line_editor>
+  <button label="テレポート" name="teleport_btn" />
+  <button label="マップに表示" name="show_on_map_btn" />
+  <button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定" />
+  <button label="ピックを保存" name="save_changes_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_picks.xml b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
index 4cbfadd09d..7f53a098fe 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ピック" name="panel_picks">
-	<string name="no_picks" value="ピックなし"/>
-	<text name="Tell everyone about your favorite places in Second Life.">
-		Second Life のお気に入りの場所を紹介しましょう。
-	</text>
-	<button label="新規…" name="new_btn"/>
-	<button label="削除…" name="delete_btn"/>
-	<text name="picks_panel_text">
-		ロード中...
-	</text>
-</panel>
+  <string name="no_picks" value="ピックなし" />
+  <text name="Tell everyone about your favorite places in Second Life.">Second Life のお気に入りの場所を紹介しましょう。</text>
+  <button label="新規…" name="new_btn" />
+  <button label="削除…" name="delete_btn" />
+  <text name="picks_panel_text">読み込んでいます…</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
index 5470dc6c82..1a3fbec783 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
@@ -1,77 +1,90 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="プロフィール" name="panel_profile">
-	<string name="status_online">
-		オンライン中
-	</string>
-	<string name="status_offline">
-		オフライン中
-	</string>
-	<string name="CaptionTextAcctInfo">
-		[ACCTTYPE]
-[PAYMENTINFO]
-	</string>
-	<string name="payment_update_link_url">
-		http://www.secondlife.com/account/billing.php?lang=en
-	</string>
-	<string name="partner_edit_link_url">
-		http://www.secondlife.com/account/partners.php?lang=en
-	</string>
-	<string name="my_account_link_url" value="http://secondlife.com/account"/>
-	<string name="no_partner_text" value="なし"/>
-	<string name="no_group_text" value="なし"/>
-	<string name="RegisterDateFormat">
-		[REG_DATE]
-	</string>
-	<string name="name_text_args">
-		[NAME]
-	</string>
-	<string name="display_name_text_args">
-		[DISPLAY_NAME]
-	</string>
-	<string name="FSDev" value="開発者"/>
-	<string name="FSSupp" value="サポート"/>
-	<string name="FSQualityAssurance" value="バグハンター"/>
-	<string name="FSGW" value="ゲートウェイ"/>
-	<text name="name_label" value="名前："/>
-	<button label="名前：" name="set_name" tool_tip="表示名を設定"/>
-	<panel name="name_holder">
-		<text_editor name="complete_name" value="(ロード中...)"/>
-	</panel>
-	<layout_stack name="imagepositioner">
-		<layout_panel name="label_stack">
-			<text name="status" value="ステータス不明"/>
-			<text name="label" value="Second Life 生年月日："/>
-			<text name="label2" value="アカウント："/>
-			<text name="partner_label" value="パートナー："/>
-		</layout_panel>
-	</layout_stack>
-	<text name="Groups:" value="グループ："/>
-	<button label="+" label_selected="+" name="group_invite" tool_tip="グループに招待"/>
-	<layout_stack name="aboutpositioner">
-		<layout_panel name="about_stack">
-			<text name="About:" value="詳細："/>
-		</layout_panel>
-		<layout_panel name="give_stack">
-			<text name="Give item:" value="アイテムを渡す："/>
-			<text name="Give inventory" tool_tip="インベントリのアイテムをここにドロップしてこの人に渡します。">
-				インベントリのアイテムをここにドロップしてください。
-			</text>
-		</layout_panel>
-	</layout_stack>
-	<layout_stack name="buttonstack">
-		<layout_panel name="left_buttonstack">
-			<button label="地図上で見つける" label_selected="地図上で見つける" name="show_on_map_btn" tool_tip="住人を地図上で探す"/>
-			<button label="お金を払う" label_selected="お金を払う" name="pay" tool_tip="住人にお金を支払う"/>
-		</layout_panel>
-		<layout_panel name="middle_buttonstack">
-			<button label="テレポートを送る" label_selected="テレポートを送る" name="teleport" tool_tip="住人にテレポートを送る"/>
-			<button label="インスタントメッセージ" label_selected="インスタントメッセージ" name="im" tool_tip="インスタントメッセージを開きます"/>
-		</layout_panel>
-		<layout_panel name="right_buttonstack">
-			<button label="フレンド登録" label_selected="フレンド登録" name="add_friend" tool_tip="フレンド登録を申し出ます"/>
-			<button label="ブロック" name="block" tool_tip="この住人をブロックする"/>
-			<button label="ブロック解除" name="unblock" tool_tip="この住人のブロックを解除する"/>
-		</layout_panel>
-	</layout_stack>
-	<check_box label="検索に表示" name="show_in_search_checkbox"/>
-</panel>
+  <!--
+  Date from server comes already converted to stl timezone,
+  so display it as an UTC+0
+  -->
+  <string name="date_format" value="ＳＬでの誕生日：[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日" />
+  <string name="age_format" value="[AGE]歳" />
+  <string name="partner_text" value="パートナー：[LINK]" />
+
+
+  <layout_stack name="image_stack">
+    <layout_panel name="image_panel">
+
+      <icon name="2nd_life_pic" />
+
+      <loading_indicator name="image_upload_indicator" />
+    </layout_panel>
+
+    <layout_panel name="basics_panel">
+      <line_editor name="user_name" value="（読み込んでいます…）" />
+
+      <line_editor name="sl_birth_date" value="（読み込んでいます…）" />
+
+      <line_editor name="user_age" value="（読み込んでいます…）" />
+    </layout_panel>
+    <layout_panel name="partner_layout">
+      <text name="partner_link" value="パートナー：（読み込んでいます…）" />
+    </layout_panel>
+
+    <layout_panel name="partner_spacer_layout" />
+
+    <layout_panel name="frind_layout">
+      <text name="frind_text" value="あなたはフレンドです。" />
+    </layout_panel>
+    <layout_panel name="online_layout">
+      <icon name="online_icon" />
+      <text name="online_text" value="オンライン" />
+    </layout_panel>
+    <layout_panel name="offline_layout">
+      <icon name="offline_icon" />
+      <text name="offline_text" value="オフライン" />
+    </layout_panel>
+    <layout_panel name="account_layout">
+      <text name="account_info" value="アカウント：（読み込んでいます…）" />
+    </layout_panel>
+    <layout_panel name="indicator_stack">
+      <loading_indicator name="progress_indicator" />
+    </layout_panel>
+    <layout_panel name="settings_panel">
+      <!-- only for self -->
+      <text name="search_label" value="自分のプロフィールを検索結果に反映：" />
+      <combo_box name="show_in_search" tool_tip="検索結果から、あなたを見つけてもらいましょう。">
+        <combo_box.item name="Hide" label="表示しない" value="0" />
+        <combo_box.item name="Show" label="表示する" value="1" />
+      </combo_box>
+    </layout_panel>
+
+    <layout_panel name="menu_panel">
+      <menu_button label="アクション" name="agent_actions_menu" />
+    </layout_panel>
+  </layout_stack>
+
+  <layout_stack name="main_stack">
+    <layout_panel name="display_name_panel">
+      <line_editor name="display_name" value="（読み込んでいます…）" />
+      <icon tool_tip="フレンドは、自分のオンライン状況を見ることができます。" name="can_see_online" />
+      <icon tool_tip="フレンドは、自分のオンライン状況を見ることができません。" name="cant_see_online" />
+      <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができます。" name="can_see_on_map" />
+      <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができません。" name="cant_see_on_map" />
+      <icon tool_tip="フレンドは、自分のオブジェクトを編集できます。" name="can_edit_objects" />
+      <icon tool_tip="フレンドは、自分のオブジェクトを編集できません。" name="cant_edit_objects" />
+    </layout_panel>
+
+    <layout_panel name="about_panel">
+      <text_editor name="sl_description_edit" />
+    </layout_panel>
+    <layout_panel name="about_buttons_panel">
+      <button name="save_description_changes" label="保存" />
+      <button name="discard_description_changes" label="破棄" />
+      <view_border name="cost_text_border" />
+    </layout_panel>
+
+    <layout_panel name="groups_panel">
+      <text name="group_label" value="グループのメンバーシップ" />
+      <group_list name="group_list" />
+
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_web.xml b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
index 4f56a7e98d..5798cb1a40 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Web" name="panel_profile_web">
-	<panel.string name="LoadTime" value="ロード時間：[TIME] 秒"/>
-	<line_editor name="url_edit">
-		(ロード中...)
-	</line_editor>
-	<flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。">
-		<flyout_button.item label="ビューワ内のブラウザを開く" name="open_item"/>
-		<flyout_button.item label="外部ブラウザを開く" name="home_item"/>
-	</flyout_button>
-	<button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト"/>
-</panel>
+  <panel.string name="LoadTime" value="ロード時間：[TIME]秒" />
+  <line_editor name="url_edit">（読み込んでいます…）</line_editor>
+  <flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。">
+    <flyout_button.item label="ビューアー内のブラウザを開く" name="open_item" />
+    <flyout_button.item label="外部ブラウザを開く" name="home_item" />
+  </flyout_button>
+  <button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_progress.xml b/indra/newview/skins/default/xui/ja/panel_progress.xml
index 4a47412521..400a4a6bf2 100644
--- a/indra/newview/skins/default/xui/ja/panel_progress.xml
+++ b/indra/newview/skins/default/xui/ja/panel_progress.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="login_progress_panel">
-	<layout_panel name="panel_icons"/>
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
-	<layout_stack name="horizontal_centering">
-		<text name="logos_lbl">セカンドライフ使用</text>
-	</layout_stack>
+  <layout_panel name="panel_icons"/>
+  <layout_stack name="vertical_centering"/>
+  <layout_panel name="panel4"/>
+  <layout_panel name="center"/>
+  <layout_stack name="horizontal_centering">
+    <text name="logos_lbl">セカンドライフ使用</text>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_access.xml b/indra/newview/skins/default/xui/ja/panel_region_access.xml
index 34809688d0..b827cc0553 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_access.xml
@@ -1,60 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アクセス" name="Access">
-	<tab_container name="tabs">
-		<panel label="不動産マネージャー" name="estate_managers_panel">
-			<text name="estate_manager_label">
-				不動産マネージャー:
-			</text>
-			<name_list name="estate_manager_name_list">
-				<columns label="名前" name="name"/>
-			</name_list>
-			<button label="追加..." name="add_estate_manager_btn"/>
-			<button label="削除…" name="remove_estate_manager_btn"/>
-		</panel>
-		<panel label="許可" name="allowed_panel">
-			<panel label="top_panel" name="allowed_search_panel">
-				<filter_editor label="許可されたエージェントを検索" name="allowed_search_input"/>
-				<button label="コピー" name="copy_allowed_list_btn"/>
-			</panel>
-			<text name="allow_resident_label">
-				常に許可：
-			</text>
-			<name_list name="allowed_avatar_name_list">
-				<columns label="名前" name="name"/>
-			</name_list>
-			<button label="追加..." name="add_allowed_avatar_btn"/>
-			<button label="削除…" name="remove_allowed_avatar_btn"/>
-		</panel>
-		<panel label="許可されたグループ" name="allowed_groups_panel">
-			<panel label="top_panel" name="allowed_group_search_panel">
-				<filter_editor label="許可されたグループを検索" name="allowed_group_search_input"/>
-				<button label="コピー" name="copy_allowed_group_list_btn"/>
-			</panel>
-			<text name="allow_group_label">
-				常に許可されたグループ：
-			</text>
-			<name_list name="allowed_group_name_list">
-				<columns label="名前" name="name"/>
-			</name_list>
-			<button label="追加..." name="add_allowed_group_btn"/>
-			<button label="削除…" name="remove_allowed_group_btn"/>
-		</panel>
-		<panel label="禁止" name="banned_panel">
-			<panel label="top_panel" name="banned_search_panel">
-				<filter_editor label="禁止されたエージェントを検索" name="banned_search_input"/>
-				<button label="コピー" name="copy_banned_list_btn"/>
-			</panel>
-			<text name="ban_resident_label">
-				常に禁止：
-			</text>
-			<name_list name="banned_avatar_name_list">
-				<columns label="名前" name="name"/>
-				<columns label="最後にログインした日" name="last_login_date"/>
-				<columns label="禁止された日付" name="ban_date"/>
-				<columns label="禁止した人：" name="bannedby"/>
-			</name_list>
-			<button label="追加..." name="add_banned_avatar_btn"/>
-			<button label="削除…" name="remove_banned_avatar_btn"/>
-		</panel>
-	</tab_container>
-</panel>
+  <tab_container name="tabs">
+    <panel label="不動産マネージャー" name="estate_managers_panel">
+      <text name="estate_manager_label">不動産マネージャー：</text>
+      <name_list name="estate_manager_name_list">
+        <columns label="名前" name="name" />
+      </name_list>
+      <button label="追加…" name="add_estate_manager_btn" />
+      <button label="削除…" name="remove_estate_manager_btn" />
+    </panel>
+    <panel label="許可" name="allowed_panel">
+      <panel label="top_panel" name="allowed_search_panel">
+        <filter_editor label="許可されたエージェントを検索" name="allowed_search_input" />
+        <button label="コピー" name="copy_allowed_list_btn" />
+      </panel>
+      <text name="allow_resident_label">常に許可：</text>
+      <name_list name="allowed_avatar_name_list">
+        <columns label="名前" name="name" />
+      </name_list>
+      <button label="追加…" name="add_allowed_avatar_btn" />
+      <button label="削除…" name="remove_allowed_avatar_btn" />
+    </panel>
+    <panel label="許可されたグループ" name="allowed_groups_panel">
+      <panel label="top_panel" name="allowed_group_search_panel">
+        <filter_editor label="許可されたグループを検索" name="allowed_group_search_input" />
+        <button label="コピー" name="copy_allowed_group_list_btn" />
+      </panel>
+      <text name="allow_group_label">常に許可されたグループ：</text>
+      <name_list name="allowed_group_name_list">
+        <columns label="名前" name="name" />
+      </name_list>
+      <button label="追加…" name="add_allowed_group_btn" />
+      <button label="削除…" name="remove_allowed_group_btn" />
+    </panel>
+    <panel label="禁止" name="banned_panel">
+      <panel label="top_panel" name="banned_search_panel">
+        <filter_editor label="禁止されたエージェントを検索" name="banned_search_input" />
+        <button label="コピー" name="copy_banned_list_btn" />
+      </panel>
+      <text name="ban_resident_label">常にバン：</text>
+      <name_list name="banned_avatar_name_list">
+        <columns label="名前" name="name" />
+        <columns label="最後にログインした日" name="last_login_date" />
+        <columns label="バンされた日付" name="ban_date" />
+        <columns label="バンした人：" name="bannedby" />
+      </name_list>
+      <button label="追加…" name="add_banned_avatar_btn" />
+      <button label="削除…" name="remove_banned_avatar_btn" />
+    </panel>
+  </tab_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 5214f79141..b213f11d43 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -1,80 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="約款" name="Covenant">
-	<text font="SansSerifLarge" name="estate_section_lbl" width="200">
-		不動産
-	</text>
-	<text name="estate_name_lbl">
-		名前：
-	</text>
-	<text name="estate_name_text">
-		メインランド
-	</text>
-	<text name="estate_owner_lbl">
-		オーナー：
-	</text>
-	<text name="estate_owner_text">
-		（無）
-	</text>
-	<text name="estate_cov_lbl">
-		約款：
-	</text>
-	<text name="covenant_timestamp_text">
-		最終更新日：1969年12月31日（水）16:00:00
-	</text>
-	<button label="?" name="covenant_help"/>
-	<text_editor bottom="-263" height="178" name="covenant_editor">
-		この不動産には約款がありません。
-	</text_editor>
-	<button label="リセット" name="reset_covenant"/>
-	<text name="covenant_help_text" left="100">
-		約款の変更は不動産全区画に適用となります。
-	</text>
-	<text name="covenant_instructions" width="390">
-		この不動産約款を変更する際は、ノートカードをドラッグ＆ドロップしてください。
-	</text>
-	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl" width="200">
-		地域
-	</text>
-	<text name="region_name_lbl">
-		名前：
-	</text>
-	<text name="region_name_text">
-		Erica
-	</text>
-	<text name="region_landtype_lbl">
-		種類：
-	</text>
-	<text name="region_landtype_text">
-		メインランド/ホームステッド
-	</text>
-	<text name="region_maturity_lbl">
-		区分：
-	</text>
-	<text name="region_maturity_text">
-		Adult
-	</text>
-	<text name="resellable_lbl">
-		再販：
-	</text>
-	<text name="resellable_clause">
-		この地域（リージョン）にある土地は再販できません。
-	</text>
-	<text name="changeable_lbl">
-		再分割：
-	</text>
-	<text name="changeable_clause">
-		この地域（リージョン）にある土地は統合または分割ができません。
-	</text>
-	<string name="can_resell">
-		この地域で購入した土地は、再販できます。
-	</string>
-	<string name="can_not_resell">
-		この地域の購入地は再販できないことがあります。
-	</string>
-	<string name="can_change">
-		この地域の購入地は統合または再分割できます。
-	</string>
-	<string name="can_not_change">
-		この地域の購入地は統合／再分割できないことがあります。
-	</string>
-</panel>
+  <text font="SansSerifLarge" name="estate_section_lbl">不動産</text>
+  <text name="estate_name_lbl">名前：</text>
+  <text name="estate_name_text">メインランド</text>
+  <text name="estate_owner_lbl">所有者：</text>
+  <text name="estate_owner_text">（無）</text>
+  <text name="estate_cov_lbl">約款：</text>
+  <text name="covenant_timestamp_text">最終更新日：1969年12月31日（水）16:00:00</text>
+  <button label="?" name="covenant_help" />
+  <text_editor bottom="-263" height="178" name="covenant_editor">この不動産には約款がありません。</text_editor>
+  <button label="リセット" name="reset_covenant" />
+  <text name="covenant_help_text">約款の変更は不動産全区画に適用となります。</text>
+  <text name="covenant_instructions">この不動産約款を変更する際は、ノートカードをドラッグ＆ドロップしてください。</text>
+  <text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl">リージョン</text>
+  <text name="region_name_lbl">名前：</text>
+  <text name="region_name_text">エリカ</text>
+  <text name="region_landtype_lbl">種類：</text>
+  <text name="region_landtype_text">メインランド／入植地</text>
+  <text name="region_maturity_lbl">区分：</text>
+  <text name="region_maturity_text">アダルト</text>
+  <text name="resellable_lbl">再販：</text>
+  <text name="resellable_clause">このリージョン（地域）にある土地は再販できません。</text>
+  <text name="changeable_lbl">再分割：</text>
+  <text name="changeable_clause">このリージョン（地域）にある土地は統合または分割ができません。</text>
+  <string name="can_resell">このリージョン（地域）で購入した土地は、再販できます。</string>
+  <string name="can_not_resell">このリージョン（地域）の購入地は再販できないことがあります。</string>
+  <string name="can_change">このリージョン（地域）の購入地は統合または再分割できます。</string>
+  <string name="can_not_change">このリージョン（地域）の購入地は統合／再分割できないことがあります。</string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 908af3d66a..907059550a 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -1,35 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="デバッグ" name="Debug">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="この地域のスクリプトをすべて無効にします"/>
-	<check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="この地域の非アバター衝突を無効にします"/>
-	<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="この地域の物理作用をすべて無効にします"/>
-	<button label="適用" name="apply_btn"/>
-	<text name="objret_text_lbl" width="120">
-		オブジェクトの返却
-	</text>
-	<text name="resident_text_lbl">
-		住人:
-	</text>
-	<line_editor name="target_avatar_name">
-		(なし)
-	</line_editor>
-	<button label="選択" name="choose_avatar_btn"/>
-	<text name="options_text_lbl">
-		オプション:
-	</text>
-	<check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します"/>
-	<check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却します"/>
-	<check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却します"/>
-	<button label="返却" name="return_btn"/>
-	<button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト"/>
-	<button label="地域再起動" name="restart_btn" tool_tip="2分間のカウントダウン後、地域を再起動します"/>
-	<button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト"/>
-	<button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="リージョンの再起動をキャンセル"/>
-	<button label="地域デバッグコンソール" name="region_debug_console_btn" tool_tip="地域デバッグコンソールを開く"/>
-</panel>
+  <text name="region_text_lbl">リージョン（地域）：</text>
+  <text name="region_text">未知</text>
+  <check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="このリージョン（地域）のスクリプトをすべて無効にします" />
+  <check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="このリージョン（地域）の非アバター衝突を無効にします" />
+  <check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="このリージョン（地域）の物理作用をすべて無効にします" />
+  <button label="適用" name="apply_btn" />
+  <text name="objret_text_lbl">オブジェクトの返却</text>
+  <text name="resident_text_lbl">住人：</text>
+  <line_editor name="target_avatar_name">（なし）</line_editor>
+  <button label="選択" name="choose_avatar_btn" />
+  <text name="options_text_lbl">オプション：</text>
+  <check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します" />
+  <check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却します" />
+  <check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべてのリージョン（地域）のオブジェクトを返却します" />
+  <button label="返却" name="return_btn" />
+  <button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト" />
+  <button label="リージョン（地域）再起動" name="restart_btn" tool_tip="２分間のカウントダウン後、リージョン（地域）を再起動します" />
+  <button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト" />
+  <button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="リージョンの再起動をキャンセル" />
+  <button label="リージョン（地域）デバッグコンソール" name="region_debug_console_btn" tool_tip="リージョン（地域）デバッグコンソールを開く" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index 02c08e4999..a11ebb1fb3 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
@@ -1,76 +1,73 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="環境" name="panel_env_info">
-	<string name="str_label_use_default">既定の設定を使用</string>
-	<string name="str_label_use_region">リージョンの設定を使用</string>
-	<string name="str_altitude_desription">空 [INDEX]([ALTITUDE]m)</string>
-	<string name="str_no_parcel">区画が選択されていません。環境設定が無効になっています。</string>
-	<string name="str_cross_region">リージョンの境界では環境設定ができません。</string>
-	<string name="str_legacy">このリージョンで環境設定はできません。</string>
-	<string name="str_disallowed">不動産マネージャーが、このリージョンで区画の環境を変更することを許可していません。</string>
-	<string name="str_too_small">環境をサポートするには、最低でも 128 平方メートルの区画が必要です。</string>
-	<string name="str_empty">(空)</string>
-	<string name="str_region_env">（リージョンの環境）</string>
-	<layout_stack>
-		<layout_panel name="pnl_environment_disabled">
-			<text name="txt_environment_disabled">...</text>
-		</layout_panel>
-		<layout_panel name="pnl_environment_config">
-			<layout_stack>
-				<layout_panel name="pnl_environment_config">
-					<layout_stack>
-						<layout_panel name="pnl_environment_current">
-							<button label="[USEDEFAULT]" name="btn_usedefault"/>
-							<button label="持ち物を使う" name="btn_select_inventory"/>
-							<button label="カスタマイズ" name="btn_edit"/>
-							<check_box label="区画所有者が環境を上書きすることがあります" name="chk_allow_override"/>
-						</layout_panel>
-						<layout_panel name="pnl_environment_length">
-							<text name="lbl_apparent_time">[HH]:[MM][AP] ([PRC]%)</text>
-						</layout_panel>
-						<layout_panel name="pnl_environment_buttons"/>
-					</layout_stack>
-				</layout_panel>
-				<layout_panel name="pnl_environment_altitudes">
-					<panel name="pnl_alt1">
-						<text name="txt_alt1">空 [INDEX]
-                            [ALTITUDE]m</text>
-						<line_editor name="edt_invname_alt1">不明</line_editor>
-						<settings_drop_target name="sdt_alt1" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/>
-					</panel>
-					<panel name="pnl_alt2">
-						<text name="txt_alt2">空 [INDEX]
-                            [ALTITUDE]m</text>
-						<line_editor name="edt_invname_alt2">不明</line_editor>
-						<settings_drop_target name="sdt_alt2" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/>
-					</panel>
-					<panel name="pnl_alt3">
-						<text name="txt_alt3">空 [INDEX]
-                            [ALTITUDE]m</text>
-						<line_editor name="edt_invname_alt3">不明</line_editor>
-						<settings_drop_target name="sdt_alt3" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/>
-					</panel>
-					<multi_slider initial_value="0" name="sld_altitudes">
-						<slider name="sld1" value="1000"/>
-						<slider name="sld2" value="2000"/>
-						<slider name="sld3" value="3000"/>
-					</multi_slider>
-					<panel name="pnl_ground">
-						<text name="txt_ground">地面</text>
-						<line_editor name="edt_invname_ground">不明</line_editor>
-						<settings_drop_target name="sdt_ground" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、地表レベルの空として選択します。"/>
-					</panel>
-					<panel name="pnl_water">
-						<text name="txt_water">水</text>
-						<line_editor name="edt_invname_water">不明</line_editor>
-						<settings_drop_target name="sdt_water" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の水として選択する"/>
-					</panel>
-					<button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-	<layout_panel name="pnl_environment_region_msg">
-		<text name="region_text_lbl">地域：</text>
-		<text name="region_text">不明</text>
-	</layout_panel>
-</panel>
+  <string name="str_label_use_default">既定の設定を使用</string>
+  <string name="str_label_use_region">リージョン（地域）の設定を使用</string>
+  <string name="str_altitude_desription">空 [INDEX]（[ALTITUDE]m）</string>
+  <string name="str_no_parcel">区画が選択されていません。環境設定が無効になっています。</string>
+  <string name="str_cross_region">リージョン（地域）の境界では環境設定ができません。</string>
+  <string name="str_legacy">このリージョン（地域）で環境設定はできません。</string>
+  <string name="str_disallowed">不動産マネージャーが、このリージョン（地域）で区画の環境を変更することを許可していません。</string>
+  <string name="str_too_small">環境をサポートするには、最低でも128㎡の区画が必要です。</string>
+  <string name="str_empty">（空）</string>
+  <string name="str_region_env">（リージョンの環境）</string>
+  <layout_stack>
+    <layout_panel name="pnl_environment_disabled">
+      <text name="txt_environment_disabled">…</text>
+    </layout_panel>
+    <layout_panel name="pnl_environment_config">
+      <layout_stack>
+        <layout_panel name="pnl_environment_config">
+          <layout_stack>
+            <layout_panel name="pnl_environment_current">
+              <button label="[USEDEFAULT]" name="btn_usedefault" />
+              <button label="持ち物を使う" name="btn_select_inventory" />
+              <button label="カスタマイズ" name="btn_edit" />
+              <check_box label="区画所有者が環境を上書きすることがあります" name="chk_allow_override" />
+            </layout_panel>
+            <layout_panel name="pnl_environment_length">
+              <text name="lbl_apparent_time">[AP]　[HH]：[MM]（[PRC]％）</text>
+            </layout_panel>
+            <layout_panel name="pnl_environment_buttons" />
+          </layout_stack>
+        </layout_panel>
+        <layout_panel name="pnl_environment_altitudes">
+          <panel name="pnl_alt1">
+            <text name="txt_alt1">空[INDEX]　[ALTITUDE]m</text>
+            <line_editor name="edt_invname_alt1">不明</line_editor>
+            <settings_drop_target name="sdt_alt1" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+          </panel>
+          <panel name="pnl_alt2">
+            <text name="txt_alt2">空[INDEX]　[ALTITUDE]m</text>
+            <line_editor name="edt_invname_alt2">不明</line_editor>
+            <settings_drop_target name="sdt_alt2" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+          </panel>
+          <panel name="pnl_alt3">
+            <text name="txt_alt3">空[INDEX]　[ALTITUDE]m</text>
+            <line_editor name="edt_invname_alt3">不明</line_editor>
+            <settings_drop_target name="sdt_alt3" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+          </panel>
+          <multi_slider initial_value="0" name="sld_altitudes">
+            <slider name="sld1" value="1000" />
+            <slider name="sld2" value="2000" />
+            <slider name="sld3" value="3000" />
+          </multi_slider>
+          <panel name="pnl_ground">
+            <text name="txt_ground">地面</text>
+            <line_editor name="edt_invname_ground">不明</line_editor>
+            <settings_drop_target name="sdt_ground" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、地表レベルの空として選択します。" />
+          </panel>
+          <panel name="pnl_water">
+            <text name="txt_water">水面</text>
+            <line_editor name="edt_invname_water">不明</line_editor>
+            <settings_drop_target name="sdt_water" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の水として選択する" />
+          </panel>
+          <button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+  <layout_panel name="pnl_environment_region_msg">
+    <text name="region_text_lbl">リージョン（地域）：</text>
+    <text name="region_text">不明</text>
+  </layout_panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 6464a65feb..017677bfe7 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,50 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="不動産" name="Estate">
-	<text name="estate_help_text">
-		このタブ内の設定変更は、不動産内のすべての地域に影響します。
-	</text>
-	<text name="estate_text">
-		不動産：
-	</text>
-	<text name="estate_name">
-		（不明）
-	</text>
-	<text name="owner_text">
-		所有者：
-	</text>
-	<text name="estate_owner">
-		（不明）
-	</text>
-	<radio_group name="externally_visible_radio">
-		<radio_item label="アクセスタブに記載された住人とグループのみ許可する" name="estate_restricted_access"/>
-		<radio_item label="誰でも訪問可" name="estate_public_access"/>
-	</radio_group>
-	<check_box label="18 歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産（エステート）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-	<check_box label="支払情報が登録されている必要があります" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-	<check_box label="区画所有者" name="parcel_access_override"/>
-	<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
-	<check_box label="直接テレポートを許可" name="allow_direct_teleport"/>
-	<button label="適用" name="apply_btn"/>
-	<text name="estate_manager_label">
-		不動産マネージャー：
-	</text>
-	<text name="allow_resident_label">
-		常に許可：
-	</text>
-	<button label="追加..." name="add_estate_manager_btn"/>
-	<button label="削除..." name="remove_estate_manager_btn"/>
-	<button label="追加..." name="add_allowed_avatar_btn"/>
-	<button label="削除..." name="remove_allowed_avatar_btn"/>
-	<text name="allow_group_label">
-		グループを常に許可：
-	</text>
-	<text name="ban_resident_label">
-		常に禁止：
-	</text>
-	<button label="追加..." name="add_allowed_group_btn"/>
-	<button label="削除..." name="remove_allowed_group_btn"/>
-	<button label="追加..." name="add_banned_avatar_btn"/>
-	<button label="削除..." name="remove_banned_avatar_btn"/>
-	<button label="メッセージを不動産に送信..." name="message_estate_btn"/>
-	<button label="不動産から住人を追い出す..." name="kick_user_from_estate_btn"/>
-</panel>
+  <text name="estate_help_text">このタブ内の設定変更は、不動産内のすべてのリージョン（地域）に影響します。</text>
+  <text name="estate_text">不動産：</text>
+  <text name="estate_name">（不明）</text>
+  <text name="owner_text">所有者：</text>
+  <text name="estate_owner">（不明）</text>
+  <radio_group name="externally_visible_radio">
+    <radio_item label="アクセスタブに記載された住人とグループのみ許可する" name="estate_restricted_access" />
+    <radio_item label="誰でも訪問可" name="estate_public_access" />
+  </radio_group>
+  <check_box label="１８歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産（不動産）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE]をご覧ください。" />
+  <check_box label="支払情報が登録されている必要があります" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE]をご覧ください。" />
+  <check_box label="区画所有者" name="parcel_access_override" />
+  <check_box label="ボイスチャットを許可" name="voice_chat_check" />
+  <check_box label="直接テレポートを許可" name="allow_direct_teleport" />
+  <button label="適用" name="apply_btn" />
+  <text name="estate_manager_label">不動産マネージャー：</text>
+  <text name="allow_resident_label">常に許可：</text>
+  <button label="追加…" name="add_estate_manager_btn" />
+  <button label="削除…" name="remove_estate_manager_btn" />
+  <button label="追加…" name="add_allowed_avatar_btn" />
+  <button label="削除…" name="remove_allowed_avatar_btn" />
+  <text name="allow_group_label">グループを常に許可：</text>
+  <text name="ban_resident_label">常に禁止：</text>
+  <button label="追加…" name="add_allowed_group_btn" />
+  <button label="削除…" name="remove_allowed_group_btn" />
+  <button label="追加…" name="add_banned_avatar_btn" />
+  <button label="削除…" name="remove_banned_avatar_btn" />
+  <button label="メッセージを不動産に送信…" name="message_estate_btn" />
+  <button label="不動産から住人を追い出す…" name="kick_user_from_estate_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
index 711b8e7291..f2551a7853 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
@@ -1,33 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="体験" name="Experiences">
-	<panel.string name="trusted_estate_text">
-		どんな体験でもキーになる可能性があります。
+	<panel.string name="trusted_estate_text">どんな体験でもキーになる可能性があります。
 
 キー体験には、この不動産で実行する権限があります。
 
-さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。
-	</panel.string>
-	<panel.string name="allowed_estate_text">
-		ランドスコープとなる体験のみ許可されます。
+さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。</panel.string>
+	<panel.string name="allowed_estate_text">ランドスコープとなる体験のみ許可されます。
 
-許可される体験には、この不動産で実行する権限があります。
-	</panel.string>
-	<panel.string name="blocked_estate_text">
-		グリッドスコープ体験のみブロックできます。
-      
-ブロックされた体験は、この不動産では実行できません。
-	</panel.string>
-	<panel.string name="estate_caption">
-		このタブの設定への変更は、不動産内のすべての地域に影響されます。
-	</panel.string>
-	<panel.string name="allowed_parcel_text">
-		ランドスコープとなる体験のみ許可されます。
-      
-許可された体験には、この不動産でブロックされていない場合、この区画で実行する権限があります。
-	</panel.string>
-	<panel.string name="blocked_parcel_text">
-		住人の体験をブロックできます。
-      
-ブロックされた体験は、この区画では実行できません。
+許可される体験には、この不動産で実行する権限があります。</panel.string>
+	<panel.string name="blocked_estate_text">グリッドスコープ体験のみブロックできます。
+
+ブロックされた体験は、この不動産では実行できません。</panel.string>
+	<panel.string name="estate_caption">このタブの設定への変更は、不動産内のすべての地域に影響されます。
 	</panel.string>
-</panel>
+	<panel.string name="allowed_parcel_text">ランドスコープとなる体験のみ許可されます。
+
+許可された体験には、この不動産でブロックされていない場合、この区画で実行する権限があります。</panel.string>
+	<panel.string name="blocked_parcel_text">住人の体験をブロックできます。
+
+ブロックされた体験は、この区画では実行できません。</panel.string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index d23007dc6b..1109715ca6 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -1,44 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="地域" name="General">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text left_delta="70" name="region_text">
-		未知
-	</text>
-	<text name="version_channel_text_lbl" width="100">
-		バージョン：
-	</text>
-	<text left_delta="70" name="version_channel_text">
-		不明
-	</text>
-	<text name="region_type_lbl">
-		種類：
-	</text>
-	<text left_delta="70" name="region_type">
-		不明
-	</text>
-	<check_box label="地形編集をブロック" name="block_terraform_check"/>
-	<check_box label="飛行をブロック" name="block_fly_check"/>
-	<check_box label="区画の飛行をブロック" name="block_fly_over_check" tool_tip="アクセス チェックを上方向に拡大し、区画を超える飛行を防ぎます"/>
-	<check_box label="ダメージを許可" name="allow_damage_check"/>
-	<check_box label="プッシュを制限" name="restrict_pushobject"/>
-	<check_box label="土地の再販を許可" name="allow_land_resell_check"/>
-	<check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check"/>
-	<check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です"/>
-	<spinner label="アバター数上限" name="agent_limit_spin"/>
-	<spinner label="物体ボーナス" name="object_bonus_spin"/>
-	<text label="成人指定" name="access_text">
-		区分：
-	</text>
-	<icons_combo_box label="Moderate" name="access_combo">
-		<icons_combo_box.item label="Adult" name="Adult" value="42"/>
-		<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-		<icons_combo_box.item label="General" name="PG" value="13"/>
-	</icons_combo_box>
-	<button label="適用" name="apply_btn"/>
-	<button label="住人 1 名をホームにテレポート..." name="kick_btn"/>
-	<button label="住人全員をホームにテレポート..." name="kick_all_btn"/>
-	<button label="メッセージを地域に送信..." name="im_btn"/>
-	<button label="テレハブの管理..." name="manage_telehub_btn"/>
-</panel>
+<panel label="リージョン（地域）" name="General">
+  <text name="region_text_lbl">リージョン（地域）：</text>
+  <text left_delta="70" name="region_text">未知</text>
+  <text name="version_channel_text_lbl">バージョン：</text>
+  <text left_delta="70" name="version_channel_text">不明</text>
+  <text name="region_type_lbl">種類：</text>
+  <text left_delta="70" name="region_type">不明
+  </text>
+  <check_box label="地形編集をブロック" name="block_terraform_check" />
+  <check_box label="飛行をブロック" name="block_fly_check" />
+  <check_box label="区画の飛行をブロック" name="block_fly_over_check" tool_tip="アクセス チェックを上方向に拡大し、区画を超える飛行を防ぎます" />
+  <check_box label="ダメージを許可" name="allow_damage_check" />
+  <check_box label="プッシュを制限" name="restrict_pushobject" />
+  <check_box label="土地の再販を許可" name="allow_land_resell_check" />
+  <check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check" />
+  <check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です" />
+  <spinner label="アバター数上限" name="agent_limit_spin" />
+  <spinner label="物体ボーナス" name="object_bonus_spin" />
+  <text label="成人指定" name="access_text">区分：</text>
+  <icons_combo_box label="Moderate" name="access_combo">
+    <icons_combo_box.item label="Adult" name="Adult" value="42" />
+    <icons_combo_box.item label="Moderate" name="Mature" value="21" />
+    <icons_combo_box.item label="General" name="PG" value="13" />
+  </icons_combo_box>
+  <button label="適用" name="apply_btn" />
+  <button label="住人 1 名をホームにテレポート…" name="kick_btn" />
+  <button label="住人全員をホームにテレポート…" name="kick_all_btn" />
+  <button label="メッセージを地域に送信…" name="im_btn" />
+  <button label="テレハブの管理…" name="manage_telehub_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index c1080a7d7b..ef1fe1d1e5 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -1,60 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="地形" name="Terrain">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<spinner label="水面の高さ" name="water_height_spin"/>
-	<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
-	<spinner label="地形の下降限度" name="terrain_lower_spin"/>
-	<text name="detail_texture_text">
-    地形テクスチャ（1024x1024 の 24 bit .tga ファイル）
-  </text>
-	<text name="height_text_lbl">
-		1（低）
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4（高）
-	</text>
-	<text name="height_text_lbl5">
-		地形の隆起範囲
-	</text>
-	<text name="height_text_lbl10">
-		数値は上のテクスチャのブレンド範囲を示します。
-	</text>
-	<text name="height_text_lbl11">
-		計測単位はメートルで、「低」の値は、1番のテクスチャの高さの「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。
-	</text>
-	<text name="height_text_lbl6">
-		北西
-	</text>
-	<text name="height_text_lbl7">
-		北東
-	</text>
-	<spinner label="低" name="height_start_spin_1"/>
-	<spinner label="低" name="height_start_spin_3"/>
-	<spinner label="高" name="height_range_spin_1"/>
-	<spinner label="高" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		南西
-	</text>
-	<text name="height_text_lbl9">
-		南東
-	</text>
-	<spinner label="低" name="height_start_spin_0"/>
-	<spinner label="低" name="height_start_spin_2"/>
-	<spinner label="高" name="height_range_spin_0"/>
-	<spinner label="高" name="height_range_spin_2"/>
-	<button label="RAW 地形ダウンロード..." name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
-	<button label="RAW 地形アップロード..." name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
-	<button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します"/>
-	<button label="適用" name="apply_btn"/>
-</panel>
+  <text name="region_text_lbl">地域：</text>
+  <text name="region_text">未知</text>
+  <spinner label="水面の高さ" name="water_height_spin" />
+  <spinner label="地形の上昇限度" name="terrain_raise_spin" />
+  <spinner label="地形の下降限度" name="terrain_lower_spin" />
+  <text name="detail_texture_text">地形テクスチャ（1024x1024 の 24 bit .tga ファイル）</text>
+  <text name="height_text_lbl">１（低）</text>
+  <text name="height_text_lbl2">２</text>
+  <text name="height_text_lbl3">３</text>
+  <text name="height_text_lbl4">４（高）</text>
+  <text name="height_text_lbl5">地形の隆起範囲</text>
+  <text name="height_text_lbl10">数値は上のテクスチャのブレンド範囲を示します。</text>
+  <text name="height_text_lbl11">計測単位はメートルで、「低」の値は、１番のテクスチャの高さの「最大値」です。「高」の値は、４番のテクスチャの高さの「最低値」です。</text>
+  <text name="height_text_lbl6">北西</text>
+  <text name="height_text_lbl7">北東</text>
+  <spinner label="低" name="height_start_spin_1" />
+  <spinner label="低" name="height_start_spin_3" />
+  <spinner label="高" name="height_range_spin_1" />
+  <spinner label="高" name="height_range_spin_3" />
+  <text name="height_text_lbl8">南西</text>
+  <text name="height_text_lbl9">南東</text>
+  <spinner label="低" name="height_start_spin_0" />
+  <spinner label="低" name="height_start_spin_2" />
+  <spinner label="高" name="height_range_spin_0" />
+  <spinner label="高" name="height_range_spin_2" />
+  <button label="RAW 地形ダウンロード…" name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
+  <button label="RAW 地形アップロード…" name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
+  <button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します" />
+  <button label="適用" name="apply_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index 3aa20d0a3c..c2fd022564 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
@@ -1,51 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="script panel">
-	<panel.string name="loading">
-		ローディング...
-	</panel.string>
-	<panel.string name="can_not_view">
-		このスクリプトは「コピー不可」のため、表示・編集することができません。 オブジェクト内のスクリプトの表示・編集には、全権限が必要です。
-	</panel.string>
-	<panel.string name="public_objects_can_not_run">
-		公共のオブジェクトではスクリプトを実行できません
-	</panel.string>
-	<panel.string name="script_running">
-		実行中
-	</panel.string>
-	<panel.string name="Title">
-		スクリプト： [NAME]
-	</panel.string>
-	<panel.string name="external_editor_not_set">
-		環境変数 LL_SCRIPT_EDITOR または ExternalEditor を設定してエディターを選択します。
-	</panel.string>
-	<menu_bar name="script_menu">
-		<menu label="ファイル" name="File">
-			<menu_item_call label="保存" name="Save"/>
-			<menu_item_call label="変更を元に戻す" name="Revert All Changes"/>
-			<menu_item_call label="ファイルからロード..." name="LoadFromFile"/>
-			<menu_item_call label="ファイルに保存..." name="SaveToFile"/>
-			<menu_item_call label="色..." name="Colors"/>
-		</menu>
-		<menu label="編集" name="Edit">
-			<menu_item_call label="元に戻す" name="Undo"/>
-			<menu_item_call label="やり直し" name="Redo"/>
-			<menu_item_call label="切り取り" name="Cut"/>
-			<menu_item_call label="コピー" name="Copy"/>
-			<menu_item_call label="貼り付け" name="Paste"/>
-			<menu_item_call label="すべて選択" name="Select All"/>
-			<menu_item_call label="選択解除" name="Deselect"/>
-			<menu_item_call label="検索 / 再配置..." name="Search / Replace..."/>
-			<menu_item_call label="行に移動..." name="Go to line..."/>
-		</menu>
-		<menu label="ヘルプ" name="Help">
-			<menu_item_call label="ヘルプ..." name="Help..."/>
-			<menu_item_call label="キーワードヘルプ..." name="Keyword Help..."/>
-		</menu>
-	</menu_bar>
-	<script_editor name="Script Editor">
-		ローディング...
-	</script_editor>
-	<combo_box label="挿入..." name="Insert..."/>
-	<button label="保存" label_selected="保存" name="Save_btn"/>
-	<button label="編集..." name="Edit_btn"/>
-</panel>
+  <panel.string name="loading">読み込んでいます…</panel.string>
+  <panel.string name="can_not_view">このスクリプトは「コピー不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。</panel.string>
+  <panel.string name="public_objects_can_not_run">公共オブジェクトで、スクリプトを実行することはできません。</panel.string>
+  <panel.string name="script_running">実行中</panel.string>
+  <panel.string name="Title">スクリプト：[NAME]</panel.string>
+  <panel.string name="external_editor_not_set">環境変数 LL_SCRIPT_EDITOR か、外部のエディタを指定して、編集に使うアプリケーションを選択します。</panel.string>
+  <menu_bar name="script_menu">
+    <menu label="ファイル" name="File">
+      <menu_item_call label="保存" name="Save" />
+      <menu_item_call label="復帰" name="Revert All Changes" />
+      <menu_item_call label="ファイルを開く…" name="LoadFromFile" />
+      <menu_item_call label="ファイルへ保存…" name="SaveToFile" />
+      <menu_item_call label="色…" name="Colors" />
+    </menu>
+    <menu label="編集" name="Edit">
+      <menu_item_call label="取り消し" name="Undo" />
+      <menu_item_call label="やり直し" name="Redo" />
+      <menu_item_call label="カット" name="Cut" />
+      <menu_item_call label="コピー" name="Copy" />
+      <menu_item_call label="ペースト" name="Paste" />
+      <menu_item_call label="すべて選択" name="Select All" />
+      <menu_item_call label="選択解除" name="Deselect" />
+      <menu_item_call label="検索／再配置…" name="Search / Replace..." />
+      <menu_item_call label="行に移動…" name="Go to line..." />
+    </menu>
+    <menu label="ヘルプ" name="Help">
+      <menu_item_call label="ヘルプ…" name="Help..." />
+      <menu_item_call label="キーワードヘルプ…" name="Keyword Help..." />
+    </menu>
+  </menu_bar>
+  <script_editor name="Script Editor">読み込んでいます…</script_editor>
+  <combo_box label="挿入…" name="Insert..." />
+  <button label="保存" label_selected="保存" name="Save_btn" />
+  <button label="編集…" name="Edit_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_experience.xml b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
index eb8a510b20..5b89d3280c 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="script_experience" title="体験">
-	<button label="体験" name="Expand Experience"/>
-	<check_box label="体験を使用" name="enable_xp"/>
-	<layout_stack name="xp_details">
-		<layout_panel>
-			<combo_box label="体験を選択..." name="Experiences..."/>
-		</layout_panel>
-	</layout_stack>
-	<text name="No Experiences">
-		体験の貢献者ではありません。
-	</text>
-</panel>
+  <button label="体験" name="Expand Experience" />
+  <check_box label="体験を使用" name="enable_xp" />
+  <layout_stack name="xp_details">
+    <layout_panel>
+      <combo_box label="体験を選択…" name="Experiences..." />
+    </layout_panel>
+  </layout_stack>
+  <text name="No Experiences">体験の貢献者ではありません。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
index 494884c187..41b5fbb92b 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="マイ アバター" name="script_limits_my_avatar_panel">
-	<text name="script_memory">
-		アバターのスクリプト使用
-	</text>
-	<text name="loading_text">
-		ローディング...
-	</text>
-	<scroll_list name="scripts_list">
-		<scroll_list.columns label="サイズ （kb）" name="size" width="90"/>
-		<scroll_list.columns label="URL" name="urls"/>
-		<scroll_list.columns label="オブジェクト名" name="name"/>
-		<scroll_list.columns label="場所" name="location"/>
-	</scroll_list>
-	<button label="リスト更新" name="refresh_list_btn"/>
-</panel>
+<panel label="自分のアバター" name="script_limits_my_avatar_panel">
+  <text name="script_memory">アバターのスクリプト使用</text>
+  <text name="loading_text">読み込んでいます…</text>
+  <scroll_list name="scripts_list">
+    <scroll_list.columns label="サイズ （㎅）" name="size" />
+    <scroll_list.columns label="URL" name="urls" />
+    <scroll_list.columns label="オブジェクト名" name="name" />
+    <scroll_list.columns label="場所" name="location" />
+  </scroll_list>
+  <button label="リスト更新" name="refresh_list_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
index d91eba9699..288a03d346 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="リージョンメモリ" name="script_limits_region_memory_panel">
-	<text name="script_memory">
-		区画スクリプトメモリ
-	</text>
-	<text name="parcels_listed"/>
-	<text name="memory_used"/>
-	<text name="loading_text">
-		ローディング...
-	</text>
-	<scroll_list name="scripts_list">
-		<scroll_list.columns label="サイズ （kb）" name="size" width="90"/>
-		<scroll_list.columns label="URL" name="urls"/>
-		<scroll_list.columns label="オブジェクト名" name="name"/>
-		<scroll_list.columns label="オブジェクトの所有者" name="owner" width="120"/>
-		<scroll_list.columns label="区画" name="parcel"/>
-		<scroll_list.columns label="場所" name="location"/>
-	</scroll_list>
-	<button label="リスト更新" name="refresh_list_btn"/>
-	<button label="ハイライト" name="highlight_btn"/>
-	<button label="返却" name="return_btn"/>
-</panel>
+  <text name="script_memory">区画スクリプトメモリ</text>
+  <text name="parcels_listed" />
+  <text name="memory_used" />
+  <text name="loading_text">読み込んでいます…</text>
+  <scroll_list name="scripts_list">
+    <scroll_list.columns label="サイズ （㎅）" name="size"/>
+    <scroll_list.columns label="ＵＲＬ" name="urls" />
+    <scroll_list.columns label="オブジェクト名" name="name" />
+    <scroll_list.columns label="オブジェクトの所有者" name="owner" />
+    <scroll_list.columns label="区画" name="parcel" />
+    <scroll_list.columns label="場所" name="location" />
+  </scroll_list>
+  <button label="リスト更新" name="refresh_list_btn" />
+  <button label="ハイライト" name="highlight_btn" />
+  <button label="返却" name="return_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
index a2d0237da0..2e0e28a607 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel label="script_question_panel" name="panel_script_question_toast">
-	<panel label="buttons_panel" name="buttons_panel"/>
-</panel>
+  <panel label="buttons_panel" name="buttons_panel" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
index b698fa762d..234e55616d 100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="LLScrollingPanelParam">
-	<text name="Loading...">
-		ロード中．．．
-	</text>
-	<text name="Loading...2">
-		ロード中．．．
-	</text>
-	<button label="" label_selected="" name="less" />
-	<button label="" label_selected="" name="more" />
-	<slider label="[DESC]" name="param slider" />
-</panel>
+  <text name="Loading...">読み込んでいます…</text>
+  <text name="Loading...2">読み込んでいます…</text>
+  <button label="" label_selected="" name="less" />
+  <button label="" label_selected="" name="more" />
+  <slider label="[DESC]" name="param slider" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
index fa659040ea..f4486fa412 100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="LLScrollingPanelParamBase">
-	<slider label="[DESC]" name="param slider"/>
-</panel>
+  <slider label="[DESC]" name="param slider" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
index 56fab14f7c..2ee9031359 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
@@ -1,2 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="大気＆光" name="panel_settings_sky_atmos"/>
+<panel label="大気と雷" name="panel_settings_sky_atmos">
+  <layout_stack follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
+    <layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="75">
+
+      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">アンビエントカラー：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="ambient_light" top_pad="5" width="60" />
+      <text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">青のホライズン：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_horizon" top_pad="5" width="60" />
+      <text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">青の濃度：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_density" top_pad="5" width="60" />
+    </layout_panel>
+    <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true">
+      <layout_stack name="atmosphere1" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="hoizontal">
+        <layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
+          <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">霞の地平線：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_delta="20" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">霞の密度:</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_delta="20" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">水分レベル：</text>
+          <slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="moisture_level" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">液滴半径：</text>
+          <slider decimal_digits="2" follows="left|top" height="14" increment="0.01" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="5.0" max_val="1000.0" name="droplet_radius" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">氷のレベル：</text>
+          <slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="ice_level" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">シーンのガンマ値：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_delta="20" width="207" can_edit_text="true" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
+          <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">密度乗数：</text>
+          <slider decimal_digits="4" follows="left|top" height="16" increment="0.0001" initial_value="0" layout="topleft" left_delta="5" min_val="0.0001" max_val="2" name="density_multip" top_delta="20" width="219" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">距離乗数：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.8" layout="topleft" left_delta="5" min_val="0.05" max_val="1000" name="distance_multip" top_delta="20" width="219" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">最大高度：</text>
+          <slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="10000" name="max_alt" top_delta="20" width="219" can_edit_text="true" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
index 232530c5f8..c1c54d2c9c 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
@@ -1,13 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="雲" name="panel_settings_sky_clouds">
-	<layout_stack>
-		<layout_panel>
-			<slider label="X" name="cloud_density_x"/>
-			<slider label="Y" name="cloud_density_y"/>
-			<slider label="D" name="cloud_density_d"/>
-			<slider label="X" name="cloud_detail_x"/>
-			<slider label="Y" name="cloud_detail_y"/>
-			<slider label="D" name="cloud_detail_d"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack >
+    <layout_panel>
+      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">雲の色：</text>
+      <color_swatch name="cloud_color" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="0" top_delta="47" width="200">雲の量：</text>
+      <slider name="cloud_coverage" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲のスケール：</text>
+      <slider name="cloud_scale" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲の分散：</text>
+      <slider name="cloud_variance" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲の移動：</text>
+      <xy_vector name="cloud_scroll_xy" />
+
+      <text follows="left|top" height="10" layout="topleft" left_delta="160" top_delta="-20" width="200">雲の画像：</text>
+      <texture_picker name="cloud_map" />
+    </layout_panel>
+    <layout_panel>
+      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">雲の密度：</text>
+      <slider label="Ｘ" name="cloud_density_x"/>
+      <slider label="Ｙ" name="cloud_density_y" />
+      <slider label="密度" name="cloud_density_d" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="35" width="200">雲の詳細：</text>
+      <slider label="Ｘ" name="cloud_detail_x" />
+      <slider label="Ｙ" name="cloud_detail_y" />
+      <slider label="密度" name="cloud_detail_d" />
+    </layout_panel>
+  </layout_stack>
+</panel>                
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
index cb746d8792..4ffae24e0b 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="密度" name="panel_settings_sky_density">
-	<layout_stack>
-		<layout_panel>
-			<slider label="レイリー指数項：" name="rayleigh_exponential"/>
-			<slider label="レイリー指数スケール：" name="rayleigh_exponential_scale"/>
-			<slider label="レイリー線形項：" name="rayleigh_linear"/>
-			<slider label="レイリー定数項：" name="rayleigh_constant"/>
-			<slider label="レイリー最大高度：" name="rayleigh_max_altitude"/>
-		</layout_panel>
-		<layout_panel>
-			<slider label="レイリー指数項：" name="mie_exponential"/>
-			<slider label="Mie 指数スケール：" name="mie_exponential_scale"/>
-			<slider label="Mie 線形項：" name="mie_linear"/>
-			<slider label="Mie 定数項：" name="mie_constant"/>
-			<slider label="Mie 不等要素：" name="mie_aniso_factor"/>
-			<slider label="Mie 最大高度：" name="mie_max_altitude"/>
-		</layout_panel>
-		<layout_panel>
-			<slider label="吸収指数項：" name="absorption_exponential"/>
-			<slider label="吸収指数スケール：" name="absorption_exponential_scale"/>
-			<slider label="吸収線形項：" name="absorption_linear"/>
-			<slider label="吸収定数項：" name="absorption_constant"/>
-			<slider label="吸収最大高度：" name="absorption_max_altitude"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack>
+    <layout_panel>
+      <slider name="rayleigh_exponential" label="レイリー指数項：" />
+      <slider name="rayleigh_exponential_scale" label="レイリー指数スケール：" />
+      <slider name="rayleigh_linear" label="レイリー線形項：" />
+      <slider name="rayleigh_constant" label="レイリー定数項：" />
+      <slider name="rayleigh_max_altitude" label="レイリー最大高度：" />
+    </layout_panel>
+    <layout_panel>
+      <slider name="mie_exponential" label="Mie指数項：" />
+      <slider name="mie_exponential_scale" label="Mie指数スケール：" />
+      <slider name="mie_linear" label="Mie線形期間：" />
+      <slider name="mie_constant" label="Mie定数項：" />
+      <slider name="mie_aniso_factor" label="Mieアニソ係数：" />
+      <slider name="mie_max_altitude" label="Mieの最高高度：" />
+    </layout_panel>
+    <layout_panel>
+      <slider name="absorption_exponential" label="吸収指数項：" />
+      <slider name="absorption_exponential_scale" label="吸収指数スケール：" />
+      <slider name="absorption_linear" label="吸収線形項：" />
+      <slider name="absorption_constant" label="吸収定数項：" />
+      <slider name="absorption_max_altitude" label="吸収最大高度：" />
+    </layout_panel>
+  </layout_stack>
+</panel> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
index e5026dc9fd..addcb378ae 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
@@ -1,15 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="太陽＆月" name="panel_settings_sky_hbodies">
-	<layout_stack>
-		<layout_panel name="sun_layout">
-			<check_box label="ビーコンを表示" name="sunbeacon"/>
-		</layout_panel>
-		<layout_panel>
-			<layout_stack>
-				<layout_panel name="moon_layout">
-					<check_box label="ビーコンを表示" name="moonbeacon"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<panel name="panel_settings_sky_hbodies">
+  <layout_stack name="main_ls">
+    <layout_panel name="sun_layout">
+      <text name="sun_stars_label">太陽＆星</text>
+      <text name="position_label">位置：</text>
+      <sun_moon_trackball name="sun_rotation" />
+      <text name="image_label">画像：</text>
+      <texture_picker name="sun_image" />
+      <text name="scale_label">スケール：</text>
+      <slider name="sun_scale" />
+      <text name="color_label">色：</text>
+      <color_swatch name="sun_moon_color" />
+      <text name="sun_azimuth_label">方位角：</text>
+      <slider name="sun_azimuth" />
+      <text name="sun_elevation_label">標高：</text>
+      <slider name="sun_elevation" />
+      <text name="glow_focus_label">グローフォーカス：</text>
+      <slider name="glow_focus" />
+      <text name="glow_size_label">グローサイズ：</text>
+      <slider name="glow_size" />
+      <text name="star_brightness_label">星の輝度：</text>
+      <slider name="star_brightness" />
+
+      <check_box label="ビーコンを表示" name="sunbeacon" />
+
+    </layout_panel>
+    <layout_panel name="moon_layout">
+      <layout_stack name="moon_stack">
+        <layout_panel name="moon_layout">
+          <text name="moon_label">月</text>
+          <text name="position_label">位置：</text>
+          <sun_moon_trackball name="moon_rotation" />
+          <text name="moon_image_label">画像：</text>
+          <texture_picker name="moon_image" />
+          <text name="scale_label">スケール：</text>
+          <slider name="moon_scale" />
+          <text name="moon_azimuth_label">方位角：</text>
+          <slider name="moon_azimuth" />
+          <text name="moon_elevation_label">標高：</text>
+          <slider name="moon_elevation" />
+          <text name="brightness_label">輝度：</text>
+          <slider name="moon_brightness" />
+          <check_box label="ビーコンを表示" name="moonbeacon" />
+
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</panel>                
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_water.xml b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
index 20341fcb8d..21b434d11a 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
@@ -1,19 +1,49 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="水" name="panel_settings_water">
-	<layout_stack name="water_stack1">
-		<layout_panel>
-			<text name="FresnelOffsetText">
-				フレネル・オフセット：
-			</text>
-		</layout_panel>
-		<layout_panel>
-			<layout_stack name="water_stack2">
-				<layout_panel>
-					<slider label="X：" name="water_normal_scale_x"/>
-					<slider label="Y：" name="water_normal_scale_y"/>
-					<slider label="Z：" name="water_normal_scale_z"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="water_stack1" follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
+    <layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="105">
+      <text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">水中のフォグ：</text>
+      <text follows="left|top" height="10" layout="left|top" left_delta="15" top_delta="0" width="60">色：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="water_fog_color" top_pad="5" width="60" />
+      <text follows="left|top" height="10" top_delta="-15" left_delta="80" width="150">密度指数：</text>
+      <slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="-10" max_val="10" name="water_fog_density" top_delta="5" width="150" can_edit_text="true"/>
+      <text follows="left|top" height="10" top_delta="25" left_delta="-15" width="150">水中の修飾子：</text>
+      <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="0.0" max_val="20.0" name="water_underwater_mod" top_delta="20" width="150" can_edit_text="true"/>
+
+      <text follows="left|top|right" height="10" layout="topleft" left_delta="165" top_delta="-53" width="150">フレネル係数：</text>
+      <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.7" layout="topleft" left_delta="5" name="water_fresnel_scale" top_delta="15" width="150" can_edit_text="true"/>
+      <text follows="left|top|right" layout="topleft" left_delta="-5" name="FresnelOffsetText" top_delta="25" width="150">フレネルオフセット：</text>
+      <slider decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" left_delta="5" name="water_fresnel_offset" top_pad="5" width="150" can_edit_text="true"/>
+
+    </layout_panel>
+    <layout_panel auto_resize="true" user_resize="false" visible="true">
+      <layout_stack name="water_stack2" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="horizontal">
+        <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="460" width="50">
+          <text follows="left|top|right" height="16" layout="topleft" left="15" top="5" width="215">ノーマルマップ</text>
+          <texture_picker height="84" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="61"/>
+
+          <text follows="left|top" height="16" width="120" layout="topleft" top_delta="-20" left_delta="175">大波の速度</text>
+          <xy_vector follows="top|left" name="water_wave1_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" increment_x="0.01f" min_val_y="-20" max_val_y="20" increment_y="0.01f" arrow_color="white"/>
+
+          <text follows="left|top" height="16" layout="topleft" top_delta="-20" left_delta="140">小波の速度</text>
+          <xy_vector follows="top|left" name="water_wave2_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" min_val_y="-20" max_val_y="20" increment_x="0.01f" increment_y="0.01f" arrow_color="white"/>
+
+          <text follows="left|top|right" height="16" layout="topleft" left="10" top="90" width="215">さざ波の反射係数</text>
+          <slider decimal_digits="1" follows="left|top" increment="0.01" height="16" initial_value="0.7" layout="topleft" label="Ｘ：" left_delta="10" max_val="10" name="water_normal_scale_x" top_pad="5" width="150" can_edit_text="true"/>
+          <slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_y" top_pad="6" label="Ｙ：" width="150" can_edit_text="true"/>
+          <slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_z" top_pad="6" label="Ｚ：" width="150" can_edit_text="true"/>
+
+        </layout_panel>
+        <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" width="50" visible="true">
+          <text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">反射とブラー：</text>
+          <text follows="left|top|right" height="16" layout="topleft" top_delta="25" left_delta="5" width="215">反射係数（上）</text>
+          <slider control_name="water_scale_above" decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.1" height="16" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_above" top_pad="5" width="200" can_edit_text="true" />
+          <text type="string" length="1" follows="left|top|right" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">反射係数（下）</text>
+          <slider control_name="water_scale_below" decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_below" top_pad="5" width="200" can_edit_text="true"/>
+          <text follows="left|top|right" font="SansSerif" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">ブラー乗数</text>
+          <slider control_name="water_blur_multip" follows="left|top" height="16" increment="0.001" initial_value="0" layout="topleft" left_delta="5" min_val="-0.5" max_val="0.5" name="water_blur_multip" top_pad="5" width="200" can_edit_text="true"/>
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</panel>     
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
index d06db8ccb1..4bc7411e35 100644
--- a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="sidetray_tab_panel">
-	<text name="sidetray_tab_title" value="サイドパネル"/>
-	<button name="undock" tool_tip="切り離す"/>
-	<button name="dock" tool_tip="ドッキング"/>
-	<button name="show_help" tool_tip="ヘルプを表示"/>
-</panel>
+  <text name="sidetray_tab_title" value="サイドパネル" />
+  <button name="undock" tool_tip="切り離す" />
+  <button name="dock" tool_tip="ドッキング" />
+  <button name="show_help" tool_tip="ヘルプを表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index ea17cd6526..e231a3565b 100644
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
@@ -1,38 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Part of side tray, see that XML file for panel config -->
 <panel label="home_tab" name="home_tab">
-	<scroll_container name="profile_scroll">
-		<panel name="profile_scroll_panel">
-			<panel name="sidebar_people">
-				<text name="tab_name" value="人"/>
-				<text name="tab_description">
-					あなたのフレンド、グループ、連絡先、近くの人を探します。
-				</text>
-			</panel>
-			<panel name="sidebar_places">
-				<text name="tab_name" value="場所"/>
-				<text name="tab_description">
-					行きたい場所、行ったことのある場所を探します。
-				</text>
-			</panel>
-			<panel name="sidebar_me">
-				<text name="tab_name" value="マイ プロフィール"/>
-				<text name="tab_description">
-					あなたの公開プロフィールを編集します。
-				</text>
-			</panel>
-			<panel name="sidebar_appearance">
-				<text name="tab_name" value="容姿"/>
-				<text name="tab_description">
-					あなたの容姿や現在の見た目を変更します。
-				</text>
-			</panel>
-			<panel name="sidebar_inventory">
-				<text name="tab_name" value="持ち物"/>
-				<text name="tab_description">
-					あなたの持ち物を眺めます。
-				</text>
-			</panel>
-		</panel>
-	</scroll_container>
-</panel>
+  <scroll_container name="profile_scroll">
+    <panel name="profile_scroll_panel">
+      <panel name="sidebar_people">
+        <text name="tab_name" value="人物" />
+        <text name="tab_description">あなたのフレンド、グループ、連絡先、近隣の人物を探します。</text>
+      </panel>
+      <panel name="sidebar_places">
+        <text name="tab_name" value="場所" />
+        <text name="tab_description">行きたい場所、行ったことのある場所を探します。</text>
+      </panel>
+      <panel name="sidebar_me">
+        <text name="tab_name" value="プロフィール" />
+        <text name="tab_description">公開プロフィールを編集します。</text>
+      </panel>
+      <panel name="sidebar_appearance">
+        <text name="tab_name" value="容姿" />
+        <text name="tab_description">現在の見た目を変更します。</text>
+      </panel>
+      <panel name="sidebar_inventory">
+        <text name="tab_name" value="持ち物" />
+        <text name="tab_description">現在の持ち物を確認します。</text>
+      </panel>
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index 32aeca0026..78410fb88c 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_inventory">
-	<text name="title">
-		インベントリ
-	</text>
-	<text name="hint_lbl">
-		画像をインベントリに保存するには L$[UPLOAD_COST] の費用がかかります。画像をテクスチャとして保存するには平方形式の 1 つを選択してください。
-	</text>
-	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item label="現在のウィンドウ (512x512)" name="CurrentWindow"/>
-		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
-		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
-		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="inventory_snapshot_width"/>
-	<spinner label="" name="inventory_snapshot_height"/>
-	<check_box label="縦横比の固定" name="inventory_keep_aspect_check"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="保存" name="save_btn"/>
-</panel>
+  <icon name="title_icon" />
+  <text name="title">インベントリに保存</text>
+  <view_border name="hr" />
+  <combo_box label="解像度" name="texture_size_combo">
+    <combo_box.item label="現在のウィンドウ (512✕512)" name="CurrentWindow" />
+    <combo_box.item label="小（128✕128）" name="Small(128x128)" />
+    <combo_box.item label="中（256✕256）" name="Medium(256x256)" />
+    <combo_box.item label="大（512✕512）" name="Large(512x512)" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="inventory_snapshot_width" />
+  <spinner label="" name="inventory_snapshot_height" />
+  <check_box label="縦横比の固定" name="inventory_keep_aspect_check" />
+  <text name="hint_lbl">画像をテクスチャとして保存する場合は、いずれかの正方形を選択してください。</text>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="保存" name="save_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
index d23056a3d5..f6d9025f10 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_local">
-	<text name="title">
-		ディスク
-	</text>
-	<combo_box label="解像度" name="local_size_combo">
-		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
-		<combo_box.item label="320x240" name="320x240"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="1280x1024" name="1280x1024"/>
-		<combo_box.item label="1600x1200" name="1600x1200"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="local_snapshot_width"/>
-	<check_box label="縦横比の固定" name="local_keep_aspect_check"/>
-	<text name="local_format_label">
-		フォーマット：
-	</text>
-	<combo_box label="書式" name="local_format_combo">
-		<combo_box.item label="PNG（可逆圧縮）" name="PNG"/>
-		<combo_box.item label="JPEG" name="JPEG"/>
-		<combo_box.item label="BMP（可逆圧縮）" name="BMP"/>
-	</combo_box>
-	<slider label="品質：" name="image_quality_slider"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<flyout_button label="保存" name="save_btn" tool_tip="画像をファイルに保存">
-		<flyout_button.item label="保存" name="save_item"/>
-		<flyout_button.item label="別名で保存..." name="saveas_item"/>
-	</flyout_button>
-</panel>
+  <text name="title">ディスクに保存</text>
+  <combo_box label="解像度" name="local_size_combo">
+    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
+    <combo_box.item label="320✕240" name="320x240" />
+    <combo_box.item label="640✕480" name="640x480" />
+    <combo_box.item label="800✕600" name="800x600" />
+    <combo_box.item label="1024✕768" name="1024x768" />
+    <combo_box.item label="1280✕1024" name="1280x1024" />
+    <combo_box.item label="1600✕1200" name="1600x1200" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="local_snapshot_width" />
+  <check_box label="縦横比の固定" name="local_keep_aspect_check" />
+  <text name="local_format_label">形式：</text>
+  <combo_box label="ファイル形式" name="local_format_combo">
+    <combo_box.item label="PNG（可逆圧縮）" name="PNG" />
+    <combo_box.item label="JPEG" name="JPEG" />
+    <combo_box.item label="BMP（可逆圧縮）" name="BMP" />
+  </combo_box>
+  <slider label="品質：" name="image_quality_slider" />
+  <button label="キャンセル" name="cancel_btn" />
+  <flyout_button label="保存" name="save_btn" tool_tip="画像をファイルとして保存">
+    <flyout_button.item label="保存" name="save_item" />
+    <flyout_button.item label="名前をつけて保存…" name="saveas_item" />
+  </flyout_button>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index f222a4d61a..df00d0610f 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
-	<button label="ディスクに保存" name="save_to_computer_btn"/>
-	<button label="持ち物に保存（L$[AMOUNT]）" name="save_to_inventory_btn"/>
-	<button label="プロフィールフィードで共有する" name="save_to_profile_btn"/>
-	<button label="Facebook でシェア" name="send_to_facebook_btn"/>
-	<button label="Twitter で共有する" name="send_to_twitter_btn"/>
-	<button label="Flickr で共有する" name="send_to_flickr_btn"/>
-	<button label="メールにより送信" name="save_to_email_btn"/>
-</panel>
+  <button label="ディスクに保存" name="save_to_computer_btn" />
+  <button label="インベントリに保存（L$ [AMOUNT]）" name="save_to_inventory_btn" />
+  <button label="プロフィールフィードで共有する" name="save_to_profile_btn" />
+  <button label="メールで送信" name="save_to_email_btn" />
+  <text name="fee_hint_lbl">料金はサブスクリプションレベルに基づきます。レベルが高くなるほど、料金は安くなります。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
index 569c07ad47..9db249a417 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		[SECOND_LIFE] からのポストカードです。
-	</string>
-	<string name="default_message">
-		ぜひご覧ください！
-	</string>
-	<string name="upload_message">
-		送信中...
-	</string>
-	<text name="title">
-		E メール
-	</text>
-	<tab_container name="postcard_tabs">
-		<panel label="メッセージ" name="panel_postcard_message"/>
-		<panel label="設定" name="panel_postcard_settings"/>
-	</tab_container>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="送信" name="send_btn"/>
-</panel>
+  <string name="default_subject">[SECOND_LIFE]からのポストカードです。</string>
+  <string name="default_message">ぜひご覧ください！</string>
+  <string name="upload_message">送信中…</string>
+  <text name="title">Eメール</text>
+  <tab_container name="postcard_tabs">
+    <panel label="メッセージ" name="panel_postcard_message" />
+    <panel label="設定" name="panel_postcard_settings" />
+  </tab_container>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="送信" name="send_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
index 80d400c846..a27564a81a 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_profile">
-	<text name="title">
-		プロフィール
-	</text>
-	<combo_box label="解像度" name="profile_size_combo">
-		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="profile_snapshot_width"/>
-	<check_box label="縦横比の固定" name="profile_keep_aspect_check"/>
-	<text name="caption_label">
-		キャプション：
-	</text>
-	<check_box initial_value="true" label="場所を含む" name="add_location_cb"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="投稿" name="post_btn"/>
-</panel>
+  <text name="title">プロフィール</text>
+  <combo_box label="解像度" name="profile_size_combo">
+    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
+    <combo_box.item label="640x480" name="640x480" />
+    <combo_box.item label="800x600" name="800x600" />
+    <combo_box.item label="1024x768" name="1024x768" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="profile_snapshot_width" />
+  <check_box label="縦横比の固定" name="profile_keep_aspect_check" />
+  <text name="caption_label">キャプション：</text>
+  <check_box label="場所を含む" name="add_location_cb" />
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="投稿" name="post_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index d57e6c796c..92d5215988 100644
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel label="機器の設定" name="device_settings_panel">
-	<panel.string name="default_text">
-		デフォルト
-	</panel.string>
-	<string name="name_no_device">
-		機器が設定されていません
-	</string>
-	<string name="name_default_system_device">
-		デフォルトのシステム機器
-	</string>
-	<text name="Input">
-		入力
-	</text>
-	<text name="Output">
-		出力
-	</text>
-	<text name="My volume label">
-		マイク音量:
-	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します"/>
-	<text name="wait_text">
-		しばらくお待ちください。
-	</text>
-</panel>
+  <panel.string name="default_text">デフォルト</panel.string>
+  <string name="name_no_device">機器が設定されていません。</string>
+  <string name="name_default_system_device">デフォルトのシステム機器</string>
+  <text name="Input">入力</text>
+  <text name="Output">出力</text>
+  <text name="My volume label">マイク音量：</text>
+  <slider_bar name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します。" />
+  <text name="wait_text">しばらくお待ちください。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
index 2308aff19b..68e559a0aa 100644
--- a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
+<!-- Width and height of this panel should be synchronized with "panel_modes" in the
+floater_moveview.xml-->
 <panel name="panel_stand_stop_flying">
-	<button label="立ち上がる" name="stand_btn" tool_tip="ここをクリックして立ち上がります。"/>
-	<button label="飛行停止" name="stop_fly_btn" tool_tip="飛行停止"/>
-</panel>
+  <button label="立ち上がる" name="stand_btn" tool_tip="ここをクリックして立ち上がります。" />
+  <button label="飛行停止" name="stop_fly_btn" tool_tip="飛行停止" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 139c4d7fdd..b4e129ab03 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="status">
-	<panel.string name="packet_loss_tooltip">
-		パケット損失
-	</panel.string>
-	<panel.string name="bandwidth_tooltip">
-		帯域幅
-	</panel.string>
-	<panel.string name="time">
-		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
-	</panel.string>
-	<panel.string name="timeTooltip">
-		[year, datetime, slt] [month, datetime, slt] [day, datetime, slt] （[weekday, datetime, slt]）
-	</panel.string>
-	<panel.string name="buycurrencylabel">
-		L$ [AMT]
-	</panel.string>
-	<panel name="menu_search_panel">
-		<search_editor label="メニューの検索" name="search_menu_edit" tool_tip="検索したい内容をここに入力してください。メニューに部分的に一致する結果が表示されます。"/>
-	</panel>
-	<panel left="-391" name="balance_bg" width="160">
-		<text name="balance" tool_tip="クリックして L$ 残高を更新" value="L$??"/>
-		<button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/>
-		<button label="店" name="goShop" tool_tip="Second Life マーケットプレイスを開く" width="40"/>
-	</panel>
-	<text name="TimeText" tool_tip="現在時刻（太平洋）">
-		24:00 AM PST
-	</text>
-	<button name="media_toggle_btn" tool_tip="すべてのメディアを開始・停止（音楽、ビデオ、Web ページ）"/>
-	<button name="volume_btn" tool_tip="グローバル音量設定"/>
-</panel>
+<panel name="status" title="ステータスバー">
+  <panel.string name="packet_loss_tooltip">パケット損失</panel.string>
+  <panel.string name="bandwidth_tooltip">帯域幅</panel.string>
+  <panel.string name="time">[ampm, datetime, slt]　[hour12, datetime, slt]：[min, datetime, slt]　[timezone,datetime, slt]</panel.string>
+  <panel.string name="timeTooltip">[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日（[weekday, datetime, slt]）</panel.string>
+  <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
+  <panel name="menu_search_panel">
+    <search_editor label="メニューの検索" name="search_menu_edit" tool_tip="検索したい内容をここに入力してください。メニューに部分的に一致する結果が表示されます。" />
+  </panel>
+  <panel name="balance_bg">
+    <text tool_tip="クリックしてL$残高を更新" value="L$ ??" />
+    <!-- 以下２行のWidthは消さないこと -->
+    <button label="L$を購入" name="buyL" tool_tip="クリックしてL$を購入します" width="60" />
+    <button label="ショップ" name="goShop" tool_tip="Second Lifeのマーケットプレイスを開きます。" width="70" />
+  </panel>
+  <text name="TimeText" tool_tip="現在時刻（太平洋）">午前　24：00 PST</text>
+  <icon image_name="Cam_FreeCam_Off" name="presets_icon_camera" tool_tip="カメラ" />
+  <icon image_name="Presets_Icon" name="presets_icon_graphic" tool_tip="グラフィックのプリセット" />
+  <button name="media_toggle_btn" tool_tip="すべてのメディアを開始・停止（音楽、ビデオ、Webページ）" />
+  <button name="volume_btn" tool_tip="ボリューム" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
index 81db7c8989..e920086c1e 100644
--- a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 <panel name="sys_well_item" title="sys_well_item">
-	<text name="title">
-		Beware the trout. BEWARE! THE! TROUT!
-	</text>
-</panel>
+  <text name="title">鱒にご用心！鱒！に！ご用心！</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
index 58e396877c..82c81bcef3 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Teleport History">
-	<accordion name="history_accordion">
-		<no_matched_tabs_text name="no_matched_teleports_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM]をお試しください。"/>
-		<no_visible_tabs_text name="no_teleports_msg" value="テレポートの履歴には何も情報がありません。[secondlife:///app/search/places/ Search]をお試しください。"/>
-		<accordion_tab name="today" title="今日"/>
-		<accordion_tab name="yesterday" title="昨日"/>
-		<accordion_tab name="2_days_ago" title="2日前"/>
-		<accordion_tab name="3_days_ago" title="3日前"/>
-		<accordion_tab name="4_days_ago" title="4日前"/>
-		<accordion_tab name="5_days_ago" title="5日前"/>
-		<accordion_tab name="6_days_and_older" title="6日以上前"/>
-		<accordion_tab name="1_month_and_older" title="1ヶ月以上前"/>
-		<accordion_tab name="6_months_and_older" title="半年以上前"/>
-	</accordion>
-	<panel label="bottom_panel" name="bottom_panel">
-		<button name="gear_btn" tool_tip="オプションを表示します"/>
-	</panel>
-</panel>
+  <accordion name="history_accordion">
+    <no_matched_tabs_text name="no_matched_teleports_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。" />
+    <no_visible_tabs_text name="no_teleports_msg" value="テレポートの履歴には何も情報がありません。[secondlife:///app/search/places/ 検索]をお試しください。" />
+    <accordion_tab name="today" title="今日" />
+    <accordion_tab name="yesterday" title="昨日" />
+    <accordion_tab name="2_days_ago" title="一昨日" />
+    <accordion_tab name="3_days_ago" title="３日前" />
+    <accordion_tab name="4_days_ago" title="４日前" />
+    <accordion_tab name="5_days_ago" title="５日前" />
+    <accordion_tab name="6_days_and_older" title="６日以上前" />
+    <accordion_tab name="1_month_and_older" title="１ヶ月以上前" />
+    <accordion_tab name="6_months_and_older" title="半年以上前" />
+  </accordion>
+  <panel label="bottom_panel" name="bottom_panel">
+    <button name="gear_btn" tool_tip="オプションを表示します" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
index 0340bfe754..9b6207c18e 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="teleport_history_item">
-	<text name="region" value="..."/>
-	<text name="timestamp" value="..."/>
-	<button name="profile_btn" tool_tip="アイテム情報を表示"/>
-</panel>
+  <text name="region" value="…" />
+  <text name="timestamp" value="…" />
+  <button name="profile_btn" tool_tip="アイテム情報を表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
index 75bc8eb86f..6f3fcb1552 100644
--- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -1,112 +1,88 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="テクスチャ" name="Texture">
-	<text name="color label">
-		色
-	</text>
-	<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="color trans">
-		透過度 %
-	</text>
-	<text name="glow label">
-		グロー
-	</text>
-	<check_box label="明るさ全開" name="checkbox fullbright"/>
-	<combo_box name="combobox matmedia">
-		<combo_box.item label="材質" name="Materials"/>
-		<combo_box.item label="メディア" name="Media"/>
-	</combo_box>
-	<radio_group name="radio_material_type">
-		<radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0"/>
-		<radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
-		<radio_item label="輝き (反射)" name="Shininess (specular)" value="2"/>
-	</radio_group>
-	<check_box initial_value="false" label="繰り返しをロックする" name="checkbox_sync_settings" tool_tip="すべてのマップの繰り返しを調整する"/>
-	<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして写真を選択します"/>
-	<text name="label alphamode">
-		アルファモード
-	</text>
-	<combo_box name="combobox alphamode">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="アルファブレンディング" name="Alpha blending"/>
-		<combo_box.item label="アルファマスキング" name="Alpha masking"/>
-		<combo_box.item label="放射状マスク" name="Emissive mask"/>
-	</combo_box>
-	<text name="label maskcutoff">
-		マスクカットオフ
-	</text>
-	<texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして写真を選択します"/>
-	<text name="label bumpiness">
-		凹凸
-	</text>
-	<combo_box name="combobox bumpiness">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="明るさ" name="Brightness"/>
-		<combo_box.item label="暗さ" name="Darkness"/>
-		<combo_box.item label="木目調" name="woodgrain"/>
-		<combo_box.item label="バーク" name="bark"/>
-		<combo_box.item label="レンガ" name="bricks"/>
-		<combo_box.item label="市松模様" name="checker"/>
-		<combo_box.item label="コンクリート" name="concrete"/>
-		<combo_box.item label="堅いタイル" name="crustytile"/>
-		<combo_box.item label="カットストーン" name="cutstone"/>
-		<combo_box.item label="円板" name="discs"/>
-		<combo_box.item label="小石" name="gravel"/>
-		<combo_box.item label="ペトリ皿" name="petridish"/>
-		<combo_box.item label="サイディング" name="siding"/>
-		<combo_box.item label="ストーンタイル" name="stonetile"/>
-		<combo_box.item label="化粧しっくい" name="stucco"/>
-		<combo_box.item label="サクション" name="suction"/>
-		<combo_box.item label="ウィーブ" name="weave"/>
-	</combo_box>
-	<texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして写真を選択します"/>
-	<text name="label shininess">
-		輝き
-	</text>
-	<combo_box name="combobox shininess">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="低" name="Low"/>
-		<combo_box.item label="中" name="Medium"/>
-		<combo_box.item label="高" name="High"/>
-	</combo_box>
-	<text name="label glossiness">
-		光沢度
-	</text>
-	<text name="label environment">
-		環境
-	</text>
-	<text name="label shinycolor">
-		色
-	</text>
-	<color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="media_info">
-		選択したメディアの URL がもしあれば、ここに入ります
-	</text>
-	<button label="選択..." name="add_media" tool_tip="メディアを追加します"/>
-	<button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します"/>
-	<button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）"/>
-	<text name="tex gen">
-		マッピング
-	</text>
-	<combo_box name="combobox texgen">
-		<combo_box.item label="デフォルト" name="Default"/>
-		<combo_box.item label="平面" name="Planar"/>
-	</combo_box>
-	<spinner label="水平スケール" name="TexScaleU"/>
-	<spinner label="垂直スケール" name="TexScaleV"/>
-	<spinner label="メーターごとに繰り返す" name="rptctrl"/>
-	<spinner label="回転度" name="TexRot"/>
-	<spinner label="水平オフセット" name="TexOffsetU"/>
-	<spinner label="垂直オフセット" name="TexOffsetV"/>
-	<spinner label="水平スケール" name="bumpyScaleU"/>
-	<spinner label="垂直スケール" name="bumpyScaleV"/>
-	<spinner label="回転度" name="bumpyRot"/>
-	<spinner label="水平オフセット" name="bumpyOffsetU"/>
-	<spinner label="垂直オフセット" name="bumpyOffsetV"/>
-	<spinner label="水平スケール" name="shinyScaleU"/>
-	<spinner label="垂直スケール" name="shinyScaleV"/>
-	<spinner label="回転度" name="shinyRot"/>
-	<spinner label="水平オフセット" name="shinyOffsetU"/>
-	<spinner label="垂直オフセット" name="shinyOffsetV"/>
-	<check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。"/>
-	<button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える"/>
-</panel>
+  <text name="color label">色</text>
+  <color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
+  <text name="color trans">透過度％</text>
+  <text name="glow label">グロー</text>
+  <check_box label="明るさ全開" name="checkbox fullbright" />
+  <combo_box name="combobox matmedia">
+    <combo_box.item label="材質" name="Materials" />
+    <combo_box.item label="メディア" name="Media" />
+  </combo_box>
+  <radio_group name="radio_material_type">
+    <radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0" />
+    <radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1" />
+    <radio_item label="輝き (反射)" name="Shininess (specular)" value="2" />
+  </radio_group>
+  <check_box initial_value="false" label="繰り返しをロックする" name="checkbox_sync_settings" tool_tip="すべてのマップの繰り返しを調整する" />
+  <texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして画像を選択します" />
+  <text name="label alphamode">アルファモード</text>
+  <combo_box name="combobox alphamode">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="アルファブレンディング" name="Alpha blending" />
+    <combo_box.item label="アルファマスキング" name="Alpha masking" />
+    <combo_box.item label="放射状マスク" name="Emissive mask" />
+  </combo_box>
+  <text name="label maskcutoff">マスクカットオフ</text>
+  <texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして画像を選択します" />
+  <text name="label bumpiness">凹凸</text>
+  <combo_box name="combobox bumpiness">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="明るさ" name="Brightness" />
+    <combo_box.item label="暗さ" name="Darkness" />
+    <combo_box.item label="木目調" name="woodgrain" />
+    <combo_box.item label="バーク" name="bark" />
+    <combo_box.item label="レンガ" name="bricks" />
+    <combo_box.item label="市松模様" name="checker" />
+    <combo_box.item label="コンクリート" name="concrete" />
+    <combo_box.item label="堅いタイル" name="crustytile" />
+    <combo_box.item label="カットストーン" name="cutstone" />
+    <combo_box.item label="円板" name="discs" />
+    <combo_box.item label="小石" name="gravel" />
+    <combo_box.item label="ペトリ皿" name="petridish" />
+    <combo_box.item label="サイディング" name="siding" />
+    <combo_box.item label="ストーンタイル" name="stonetile" />
+    <combo_box.item label="化粧しっくい" name="stucco" />
+    <combo_box.item label="サクション" name="suction" />
+    <combo_box.item label="ウィーブ" name="weave" />
+  </combo_box>
+  <texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして画像を選択します" />
+  <text name="label shininess">輝き</text>
+  <combo_box name="combobox shininess">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="低" name="Low" />
+    <combo_box.item label="中" name="Medium" />
+    <combo_box.item label="高" name="High" />
+  </combo_box>
+  <text name="label glossiness">光沢度</text>
+  <text name="label environment">環境</text>
+  <text name="label shinycolor">色</text>
+  <color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
+  <text name="media_info">選択したメディアの URL がもしあれば、ここに入ります。</text>
+  <button label="選択…" name="add_media" tool_tip="メディアを追加します" />
+  <button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します" />
+  <button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）" />
+  <text name="tex gen">マッピング</text>
+  <combo_box name="combobox texgen">
+    <combo_box.item label="デフォルト" name="Default" />
+    <combo_box.item label="平面" name="Planar" />
+  </combo_box>
+  <spinner label="水平スケール" name="TexScaleU" />
+  <spinner label="垂直スケール" name="TexScaleV" />
+  <spinner label="メーターごとに繰り返す" name="rptctrl" />
+  <spinner label="回転度" name="TexRot" />
+  <spinner label="水平オフセット" name="TexOffsetU" />
+  <spinner label="垂直オフセット" name="TexOffsetV" />
+  <spinner label="水平スケール" name="bumpyScaleU" />
+  <spinner label="垂直スケール" name="bumpyScaleV" />
+  <spinner label="回転度" name="bumpyRot" />
+  <spinner label="水平オフセット" name="bumpyOffsetU" />
+  <spinner label="垂直オフセット" name="bumpyOffsetV" />
+  <spinner label="水平スケール" name="shinyScaleU" />
+  <spinner label="垂直スケール" name="shinyScaleV" />
+  <spinner label="回転度" name="shinyRot" />
+  <spinner label="水平オフセット" name="shinyOffsetU" />
+  <spinner label="垂直オフセット" name="shinyOffsetV" />
+  <check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。" />
+  <button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
index 530f0fb59d..fe8ff45913 100644
--- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		ボイスモーフィングなし
-	</string>
-	<string name="preview_voice_effects">
-		ボイスモーフィングをプレビュー  ▶
-	</string>
-	<string name="get_voice_effects">
-		ボイスモーフィングを取得  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択して音声を変更">
-		<combo_box.item label="ボイスモーフィングなし" name="no_voice_effect"/>
-	</combo_box>
-</panel>
+  <string name="no_voice_effect">ボイスモーフィングなし</string>
+  <string name="preview_voice_effects">ボイスモーフィングをプレビュー ▶</string>
+  <string name="get_voice_effects">ボイスモーフィングを取得 ▶</string>
+  <combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択してボイスを変更">
+    <combo_box.item label="ボイスモーフィングなし" name="no_voice_effect" />
+  </combo_box>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
index 967dedf061..5165fa8639 100644
--- a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="volumepulldown_floater">
-	<slider label="マスター" name="System Volume"/>
-	<slider label="ボタン" name="UI Volume"/>
-	<slider label="環境音" name="Wind Volume"/>
-	<slider label="サウンド" name="SFX Volume"/>
-	<check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする"/>
-	<slider label="音楽" name="Music Volume"/>
-	<check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする"/>
-	<slider label="メディア" name="Media Volume"/>
-	<check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする"/>
-	<slider label="ボイス" name="Voice Volume"/>
-	<check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする"/>
-</panel>
+  <slider label="マスター" name="System Volume" />
+  <slider label="ボタン" name="UI Volume" />
+  <slider label="環境音" name="Wind Volume" />
+  <slider label="サウンド" name="SFX Volume" />
+  <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする。" />
+  <slider label="音楽" name="Music Volume" />
+  <check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする。" />
+  <slider label="メディア" name="Media Volume" />
+  <check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする。" />
+  <slider label="ボイス" name="Voice Volume" />
+  <check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする。" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml
index 8ff853193a..3811c1e624 100644
--- a/indra/newview/skins/default/xui/ja/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml
@@ -1,63 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="world_map">
-	<panel.string name="Loading">
-		ローディング...
-	</panel.string>
-	<panel.string name="InvalidLocation">
-		無効な位置
-	</panel.string>
-	<panel.string name="world_map_north">
-		北
-	</panel.string>
-	<panel.string name="world_map_east">
-		東
-	</panel.string>
-	<panel.string name="world_map_west">
-		西
-	</panel.string>
-	<panel.string name="world_map_south">
-		南
-	</panel.string>
-	<panel.string name="world_map_southeast">
-		南東
-	</panel.string>
-	<panel.string name="world_map_northeast">
-		北東
-	</panel.string>
-	<panel.string name="world_map_southwest">
-		南西
-	</panel.string>
-	<panel.string name="world_map_northwest">
-		北西
-	</panel.string>
-	<panel.string name="world_map_person">
-		1 人
-	</panel.string>
-	<panel.string name="world_map_people">
-		[NUMBER] 人
-	</panel.string>
-	<text label="北" name="floater_map_north" text="北">
-		北
-	</text>
-	<text label="東" name="floater_map_east" text="東">
-		東
-	</text>
-	<text label="西" name="floater_map_west" text="西">
-		西
-	</text>
-	<text label="南" name="floater_map_south" text="南">
-		南
-	</text>
-	<text label="南東" name="floater_map_southeast" text="南東">
-		南東
-	</text>
-	<text label="北東" name="floater_map_northeast" text="北東">
-		北東
-	</text>
-	<text label="南西" name="floater_map_southwest" text="南西">
-		南西
-	</text>
-	<text label="北西" name="floater_map_northwest" text="北西">
-		北西
-	</text>
-</panel>
+	<panel.string name="Loading">読み込んでいます…</panel.string>
+	<panel.string name="InvalidLocation">無効な位置</panel.string>
+	<panel.string name="world_map_north">北</panel.string>
+	<panel.string name="world_map_east">東</panel.string>
+	<panel.string name="world_map_west">西</panel.string>
+	<panel.string name="world_map_south">南</panel.string>
+	<panel.string name="world_map_southeast">南東</panel.string>
+	<panel.string name="world_map_northeast">北東</panel.string>
+	<panel.string name="world_map_southwest">南西</panel.string>
+	<panel.string name="world_map_northwest">北西</panel.string>
+	<panel.string name="world_map_person">1人</panel.string>
+	<panel.string name="world_map_people">[NUMBER]人</panel.string>
+	<text label="北" name="floater_map_north" text="北">北</text>
+	<text label="東" name="floater_map_east" text="東">東</text>
+	<text label="西" name="floater_map_west" text="西">西</text>
+	<text label="南" name="floater_map_south" text="南">南</text>
+	<text label="南東" name="floater_map_southeast" text="南東">南東</text>
+	<text label="北東" name="floater_map_northeast" text="北東">北東</text>
+	<text label="南西" name="floater_map_southwest" text="南西">南西</text>
+	<text label="北西" name="floater_map_northwest" text="北西">北西</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index 05eca2cca3..d940a80fb7 100644
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
-	<action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
-		<action description="このグループに人を招待" longdescription="「役割&amp;メンバー」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1"/>
-		<action description="このグループから「全員（Everyone）」の役割に属するメンバーを追放します" longdescription="「役割&amp;メンバー」セクションの「メンバー」タブ内にある「追放」ボタンを押して、このグループからメンバーを追放します。「オーナー」は、他の「オーナー」以外は誰でも追放できます。「オーナー」ではない人が「全員（Everyone）」にしか役割がない場合、メンバーはグループから追放されることがあります。「役割」からメンバーを削除するには、「役割からメンバーを削除」の能力が与えられている必要があります。" name="member eject" value="2"/>
-		<action description="立入禁止リストの管理" longdescription="グループのメンバーに、このグループから住人を立入禁止/立入禁止解除できるようにします。" name="allow ban" value="51"/>
-		<action description="「自由参加」と「入会費」の切り替え" longdescription="「自由参加」に切り替えると、招待されなくても新しいメンバーが入会できます。「入会費」は「一般」セクションで変更します。" name="member options" value="3"/>
-	</action_set>
-	<action_set description="これらの能力には、グループ内の役割を追加、削除、変更し、役割にメンバーを追加、削除し、さらに役割へ能力を割り当てる権限が含まれます。" name="Roles">
-		<action description="新しい役割を作成" longdescription="新しい「役割」は、「役割&amp;メンバー」セクション &gt; 「役割」タブで作成します。" name="role create" value="4"/>
-		<action description="役割を削除" longdescription="「役割」は、「役割&amp;メンバー」セクション &gt; 「役割」タブで削除します。" name="role delete" value="5"/>
-		<action description="「役割」の名前、タイトル、説明、メンバー公開の有無を変更" longdescription="「役割」の名前、肩書き、説明、メンバー公開の有無を変更します。「役割」を選択後に、「役割&amp;メンバー」セクション &gt; 「役割」タブ の下で設定できます。" name="role properties" value="6"/>
-		<action description="メンバーを割り当て人の役割に割り当てる" longdescription="「割り当てられた役割」（「役割&amp;メンバー」セクション &gt; 「メンバー」タブ）のリストで、メンバーを「役割」に割り当てます。この能力があるメンバーは、割り当てる人が既に所属する「役割」にのみメンバーを追加できます。" name="role assign member limited" value="7"/>
-		<action description="メンバーを任意の役割に割り当てる" longdescription="「割り当てられた役割」（「役割&amp;メンバー」セクション &gt; 「メンバー」タブ）のリストで、メンバーを「いずれかの役割」に割り当てます。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーを現在以上の権限のある「役割」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い力を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role assign member" value="8"/>
-		<action description="役割からメンバーを解除" longdescription="「割り当てられた役割」（「役割&amp;メンバー」セクション &gt; 「メンバー」タブ）のリストで、メンバーを「役割」から削除します。「オーナー」は削除できません。" name="role remove member" value="9"/>
-		<action description="役割の能力の割り当てと解除" longdescription="「許可された能力」（「役割&amp;メンバー」セクション &gt; 「役割」タブ）のリストで、各「役割」に対する「能力」を割り当てたり削除したりします。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーをすべての「能力」」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い権限を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role change actions" value="10"/>
-	</action_set>
-	<action_set description="これらの能力には、グループの公開性や理念、記章の変更といった、グループのアイデンティティを修正する権限が含まれます。" name="Group Identity">
-		<action description="理念、記章、「Web 上で公開」、およびグループ情報内で公開のメンバーを変更。" longdescription="理念、記章、「検索に表示」の変更をします。 「一般」セクションで行えます。" name="group change identity" value="11"/>
-	</action_set>
-	<action_set description="これらの「能力」には、このグループの所有地の譲渡、修正、販売をする権限があります。 「土地情報」ウィンドウを見るには、地面を右クリックして「土地情報」を選ぶか、ナビゲーションバーの「i」アイコンをクリックします。" name="Parcel Management">
-		<action description="グループ用の土地の譲渡と購入" longdescription="グループ用の土地の譲渡と購入を行います。 この操作には、土地情報画面 ＞ 一般タブを使います。" name="land deed" value="12"/>
-		<action description="リンデン総督に土地を明け渡す" longdescription="リンデン総督に土地を明け渡します。 *警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」でグループ所有の土地を放棄して、売り上げなしでリンデン総督に明け渡すことができます。 この能力の割り当ては、そのことを理解した上で行ってください。" name="land release" value="13"/>
-		<action description="売り地情報の設定" longdescription="売り地情報を設定します。 *警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」タブでグループ所有の土地を自分の思いどおりに販売することができます。 この能力の割り当ては、そのことを理解した上で行ってください。" name="land set sale info" value="14"/>
-		<action description="区画の再分割と統合" longdescription="区画を再分割、統合します。 地面を右クリックして「地形を編集」を選び、マウスを土地の上でドラッグして範囲を選択します。 再分割するには、分割対象を選んで「再分割」をクリックします。 統合するには、2つ以上の隣接する区画を選んで「統合」をクリックします。" name="land divide join" value="15"/>
-	</action_set>
-	<action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびに TP ルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
-		<action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」 &gt; 「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17"/>
-		<action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderate コンテンツ」設定を変更します。「土地情報」 &gt; 「オプション」タブで行います。" name="land change identity" value="18"/>
-		<action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。 この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19"/>
-	</action_set>
-	<action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
-		<action description="音楽とメディアの設定を変更" longdescription="ストリーミングミュージックと動画の設定を変更するには、「土地情報」 ＞ 「メディア」タブを使います。" name="land change media" value="20"/>
-		<action description="「地形を編集」に切り替え" longdescription="「地形を編集」に切り替えます。 *警告* 「土地情報」＞「オプション」＞「地形を編集」の順で進むと、誰でもあなたの土地の形の整備や、リンデン製の樹木の設置、移動ができます。  この能力を割り振る前に、このことをよく理解しておいてください。 「土地情報」＞「オプション」タブから「地形を編集」に切り替えられます。" name="land edit" value="21"/>
-		<action description="「土地情報」＞「オプション」タブ内のさまざまな設定を切り替え" longdescription="「安全（ダメージなし）」、「飛行」を切り替え、住人に以下を許可します： グループ所有地の「土地情報」 &gt; 「オプション」タブ内の、「地形を編集」、「制作」、「ランドマークの作成」、「スクリプトの実行」。" name="land options" value="22"/>
-		<action description="自然環境の設定とデイサイクルを修正する。" longdescription="「土地について」 &gt; 「環境」タブから自然環境の設定とデイサイクルを変更する。" name="land change environment" value="46"/>
-	</action_set>
-	<action_set description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。" name="Parcel Powers">
-		<action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23"/>
-		<action description="常に「飛行」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、飛行が可能です。" name="land allow fly" value="24"/>
-		<action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25"/>
-		<action description="着地点を無視する" longdescription="この能力を持つ役割のメンバーは、。[土地について &gt; オプション] タブで着地点が設定されている場合でもグループ所有の区画に直接テレポートできます。" name="land allow direct teleport" value="26"/>
-		<action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「世界」メニュー &gt; ランドマーク &gt; 現在地をホームに設定 を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28"/>
-		<action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41"/>
-	</action_set>
-	<action_set description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。" name="Parcel Access">
-		<action description="区画アクセスリストの管理" longdescription="区画アクセス・リストの管理は、「土地情報」＞「アクセス」タブで行います。" name="land manage allowed" value="29"/>
-		<action description="区画禁止リストの管理" longdescription="「土地情報」 &gt; 「アクセス」タブの、区画の禁止リストの管理ができます。" name="land manage banned" value="30"/>
-		<action description="「入場許可を販売」の設定を変更" longdescription="「土地情報」 &gt; 「アクセス」タブで、区画の「入場許可を販売」の設定を変更します。" name="land manage passes" value="31"/>
-		<action description="区画上の住人の追放とフリーズ" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有地にいて欲しくない住人を右クリックし、「追放」や「フリーズ」を選んで対応できます。" name="land admin" value="32"/>
-	</action_set>
-	<action_set description="これらの能力には、オブジェクトの返却、リンデンプラントの設置や移動を、メンバーに許可する権限が含まれます。 これはメンバーがゴミ処理や景観作成をする際に便利ですが、返却したオブジェクトは元に戻せないので、注意して行いましょう。" name="Parcel Content">
-		<action description="グループ所有オブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group owned" value="48"/>
-		<action description="グループに設定されているオブジェクトを返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group set" value="33"/>
-		<action description="非グループオブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return non group" value="34"/>
-		<action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。 これらの植物はあなたのインベントリ内の「ライブラリ」 &gt; 「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35"/>
-	</action_set>
-	<action_set description="これらの「能力」には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。 変更は「制作ツール」 &gt; 「一般」タブで行います。 オブジェクトを右クリックして「編集」を開くと設定内容を確認できます。" name="Object Management">
-		<action description="グループにオブジェクトを譲渡" longdescription="「制作ツール」 &gt; 「一般」タブで、オブジェクトをグループに譲渡します。" name="object deed" value="36"/>
-		<action description="グループ所有オブジェクトの操作（移動、コピー、修正）" longdescription="「制作ツール」 &gt; 「一般」タブで、グループ所有のオブジェクトを操作（移動、コピー、修正）します。" name="object manipulate" value="38"/>
-		<action description="グループ所有オブジェクトを販売可能に設定" longdescription="「制作ツール」 &gt; 「一般」タブで、グループ所有のオブジェクトを販売対象に設定します。" name="object set sale" value="39"/>
-	</action_set>
-	<action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting">
-		<action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。   つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40"/>
-	</action_set>
-	<action_set description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。" name="Notices">
-		<action description="通知を送信" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」 &gt; 「通知」セクションから通知を送信できます。" name="notices send" value="42"/>
-		<action description="通知の受信と過去の通知の閲覧" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」 &gt; 「通知」セクションで通知を受信したり過去の通知を見ることができます。" name="notices receive" value="43"/>
-	</action_set>
-	<action_set description=" これらの能力には、グループチャットセッションやグループボイスチャットへのアクセスの許可や制限の権限が含まれます。 " name="Chat">
-		<action description="グループチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。 " name="join group chat" value="16"/>
-		<action description="グループボイスチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。  注： ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。 " name="join voice chat" value="27"/>
-		<action description="グループチャットを管理する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。 " name="moderate group chat" value="37"/>
-	</action_set>
-	<action_set description="これらの機能には、このグループにより所有される体験を変更する機能が含まれます。" name="experience_tools_experience">
-		<action description="体験管理者" longdescription="この機能を持つ役割のメンバーは、体験のメタデータを編集できます。" name="experience admin" value="49"/>
-		<action description="体験貢献者" longdescription="この機能を持つ役割のメンバーは、体験のスクリプトを提供できます。" name="experience contributor" value="50"/>
-	</action_set>
-</role_actions>
+  <action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
+    <action description="このグループに人を招待" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1" />
+    <action description="このグループから「全員（Everyone）」の役割に属するメンバーを追放します" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「追放」ボタンを押して、このグループからメンバーを追放します。「オーナー」は、他の「オーナー」以外は誰でも追放できます。「オーナー」ではない人が「全員（Everyone）」にしか役割がない場合、メンバーはグループから追放されることがあります。「役割」からメンバーを削除するには、「役割からメンバーを削除」の能力が与えられている必要があります。" name="member eject" value="2" />
+    <action description="立入禁止リストの管理" longdescription="グループのメンバーに、このグループから住人を立入禁止/立入禁止解除できるようにします。" name="allow ban" value="51" />
+    <action description="「自由参加」と「入会費」の切り替え" longdescription="「自由参加」に切り替えると、招待されなくても新しいメンバーが入会できます。「入会費」は「一般」セクションで変更します。" name="member options" value="3" />
+  </action_set>
+  <action_set description="これらの能力には、グループ内の役割を追加、削除、変更し、役割にメンバーを追加、削除し、さらに役割へ能力を割り当てる権限が含まれます。" name="Roles">
+    <action description="新しい役割を作成" longdescription="新しい「役割」は、「役割とメンバー」セクション＞「役割」タブで作成します。" name="role create" value="4" />
+    <action description="役割を削除" longdescription="「役割」は、「役割とメンバー」セクション＞「役割」タブで削除します。" name="role delete" value="5" />
+    <action description="「役割」の名前、タイトル、説明、メンバー公開の有無を変更" longdescription="「役割」の名前、肩書き、説明、メンバー公開の有無を変更します。「役割」を選択後に、「役割とメンバー」セクション＞「役割」タブ の下で設定できます。" name="role properties" value="6" />
+    <action description="メンバーを割り当て人の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」に割り当てます。この能力があるメンバーは、割り当てる人が既に所属する「役割」にのみメンバーを追加できます。" name="role assign member limited" value="7" />
+    <action description="メンバーを任意の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「いずれかの役割」に割り当てます。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーを現在以上の権限のある「役割」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い力を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role assign member" value="8" />
+    <action description="役割からメンバーを解除" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」から削除します。「オーナー」は削除できません。" name="role remove member" value="9" />
+    <action description="役割の能力の割り当てと解除" longdescription="「許可された能力」（「役割とメンバー」セクション＞「役割」タブ）のリストで、各「役割」に対する「能力」を割り当てたり削除したりします。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーをすべての「能力」」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い権限を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role change actions" value="10" />
+  </action_set>
+  <action_set description="これらの能力には、グループの公開性や理念、記章の変更といった、グループのアイデンティティを修正する権限が含まれます。" name="Group Identity">
+    <action description="理念、記章、「Web 上で公開」、およびグループ情報内で公開のメンバーを変更。" longdescription="理念、記章、「検索に表示」の変更をします。「一般」セクションで行えます。" name="group change identity" value="11" />
+  </action_set>
+  <action_set description="これらの「能力」には、このグループの所有地の譲渡、修正、販売をする権限があります。「土地情報」ウィンドウを見るには、地面を右クリックして「土地情報」を選ぶか、ナビゲーションバーの「i」アイコンをクリックします。" name="Parcel Management">
+    <action description="グループ用の土地の譲渡と購入" longdescription="グループ用の土地の譲渡と購入を行います。この操作には、「土地情報」＞「一般」タブを使います。" name="land deed" value="12" />
+    <action description="リンデン総督に土地を明け渡す" longdescription="リンデン総督に土地を明け渡します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」でグループ所有の土地を放棄して、売り上げなしでリンデン総督に明け渡すことができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land release" value="13" />
+    <action description="売り地情報の設定" longdescription="売り地情報を設定します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」タブでグループ所有の土地を自分の思いどおりに販売することができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land set sale info" value="14" />
+    <action description="区画の再分割と統合" longdescription="区画を再分割、統合します。地面を右クリックして「地形を編集」を選び、マウスを土地の上でドラッグして範囲を選択します。再分割するには、分割対象を選んで「再分割」をクリックします。統合するには、2つ以上の隣接する区画を選んで「統合」をクリックします。" name="land divide join" value="15" />
+  </action_set>
+  <action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびにTPルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
+    <action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」＞「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17" />
+    <action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderateコンテンツ」設定を変更します。「土地情報」＞「オプション」タブで行います。" name="land change identity" value="18" />
+    <action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19" />
+  </action_set>
+  <action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
+    <action description="音楽とメディアの設定を変更" longdescription="ストリーミングミュージックと動画の設定を変更するには、「土地情報」＞「メディア」タブを使います。" name="land change media" value="20" />
+    <action description="「地形を編集」に切り替え" longdescription="「地形を編集」に切り替えます.*警告* 「土地情報」＞「オプション」＞「地形を編集」の順で進むと、誰でもあなたの土地の形の整備や、リンデン製の樹木の設置、移動ができます。この能力を割り振る前に、このことをよく理解しておいてください。「土地情報」＞「オプション」タブから「地形を編集」に切り替えられます。" name="land edit" value="21" />
+    <action description="「土地情報」＞「オプション」タブ内のさまざまな設定を切り替え" longdescription="「安全（ダメージなし）」、「飛行」を切り替え、住人に以下を許可します： グループ所有地の「土地情報」＞「オプション」タブ内の、「地形を編集」、「制作」、「ランドマークの作成」、「スクリプトの実行」。" name="land options" value="22" />
+    <action description="自然環境の設定とデイサイクルを修正する。" longdescription="「土地について」＞「環境」タブから自然環境の設定とデイサイクルを変更する。" name="land change environment" value="46" />
+  </action_set>
+  <action_set description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。" name="Parcel Powers">
+    <action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23" />
+    <action description="常に「飛行」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、飛行が可能です。" name="land allow fly" value="24" />
+    <action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25" />
+    <action description="着地点を無視する" longdescription="この能力を持つ役割のメンバーは、。「土地情報」＞「オプション」タブで着地点が設定されている場合でもグループ所有の区画に直接テレポートできます。" name="land allow direct teleport" value="26" />
+    <action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「世界」＞「ランドマーク」＞「現在地をホームに設定」を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28" />
+    <action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41" />
+  </action_set>
+  <action_set description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。" name="Parcel Access">
+    <action description="区画アクセスリストの管理" longdescription="区画アクセス・リストの管理は、「土地情報」＞「アクセス」タブで行います。" name="land manage allowed" value="29" />
+    <action description="区画禁止リストの管理" longdescription="「土地情報」＞「アクセス」タブの、区画の禁止リストの管理ができます。" name="land manage banned" value="30" />
+    <action description="「入場許可を販売」の設定を変更" longdescription="「土地情報」＞「アクセス」タブで、区画の「入場許可を販売」の設定を変更します。" name="land manage passes" value="31" />
+    <action description="区画上の住人の追放とフリーズ" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有地にいて欲しくない住人を右クリックし、「追放」や「フリーズ」を選んで対応できます。" name="land admin" value="32" />
+  </action_set>
+  <action_set description="これらの能力には、オブジェクトの返却、リンデンプラントの設置や移動を、メンバーに許可する権限が含まれます。これはメンバーがゴミ処理や景観作成をする際に便利ですが、返却したオブジェクトは元に戻せないので、注意して行いましょう。" name="Parcel Content">
+    <action description="グループ所有オブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group owned" value="48" />
+    <action description="グループに設定されているオブジェクトを返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group set" value="33" />
+    <action description="非グループオブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return non group" value="34" />
+    <action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。これらの植物はあなたのインベントリ内の「ライブラリ」＞「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35" />
+  </action_set>
+  <action_set description="これらの「能力」には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。変更は「制作ツール」＞「一般」タブで行います。オブジェクトを右クリックして「編集」を開くと設定内容を確認できます。" name="Object Management">
+    <action description="グループにオブジェクトを譲渡" longdescription="「制作ツール」＞「一般」タブで、オブジェクトをグループに譲渡します。" name="object deed" value="36" />
+    <action description="グループ所有オブジェクトの操作（移動、コピー、修正）" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを操作（移動、コピー、修正）します。" name="object manipulate" value="38" />
+    <action description="グループ所有オブジェクトを販売可能に設定" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを販売対象に設定します。" name="object set sale" value="39" />
+  </action_set>
+  <action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting">
+    <action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40" />
+  </action_set>
+  <action_set description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。" name="Notices">
+    <action description="通知を送信" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションから通知を送信できます。" name="notices send" value="42" />
+    <action description="通知の受信と過去の通知の閲覧" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションで通知を受信したり過去の通知を見ることができます。" name="notices receive" value="43" />
+  </action_set>
+  <action_set description="これらの能力には、グループチャットセッションやグループボイスチャットへのアクセスの許可や制限の権限が含まれます。" name="Chat">
+    <action description="グループチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。" name="join group chat" value="16" />
+    <action description="グループボイスチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。注：ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。" name="join voice chat" value="27" />
+    <action description="グループチャットを管理する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。" name="moderate group chat" value="37" />
+  </action_set>
+  <action_set description="これらの機能には、このグループにより所有される体験を変更する機能が含まれます。" name="experience_tools_experience">
+    <action description="体験管理者" longdescription="この機能を持つ役割のメンバーは、体験のメタデータを編集できます。" name="experience admin" value="49" />
+    <action description="体験貢献者" longdescription="この機能を持つ役割のメンバーは、体験のスクリプトを提供できます。" name="experience contributor" value="50" />
+  </action_set>
+</role_actions>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
index 30cef9ccc0..fa90ec7b8c 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アウトフィット" name="appearance panel">
-	<string name="No Outfit" value="アウトフィットなし"/>
-	<string name="Unsaved Changes" value="保存されていない変更"/>
-	<string name="Now Wearing" value="着用しています..."/>
-	<string name="Changing outfits" value="アウトフィットの変更"/>
-	<panel name="panel_currentlook">
-		<button label="E" name="editappearance_btn"/>
-		<button label="O" name="openoutfit_btn"/>
-		<text name="currentlook_status">
-			（状態）
-		</text>
-		<text name="currentlook_name">
-			MyOutfit With a really Long Name like MOOSE
-		</text>
-		<button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集"/>
-	</panel>
-	<filter_editor label="アウトフィットをフィルター" name="Filter"/>
-</panel>
+  <string name="No Outfit" value="アウトフィットなし" />
+  <string name="Unsaved Changes" value="保存されていない変更" />
+  <string name="Now Wearing" value="着用しています…" />
+  <string name="Changing outfits" value="アウトフィットの変更" />
+  <panel name="panel_currentlook">
+    <button label="E" name="editappearance_btn" />
+    <button label="O" name="openoutfit_btn" />
+    <text name="currentlook_status">（状態）</text>
+    <text name="currentlook_name">MOOSEみたいな長い名前の私のアウトフィット</text>
+    <button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集" />
+  </panel>
+  <filter_editor label="アウトフィットをフィルタ" name="Filter" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 5aa0e86a5b..559db635fc 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -1,42 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="もの" name="objects panel">
-	<panel label="" name="sidepanel_inventory_panel">
-		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						受け取ったアイテム（[NUM]）
-					</string>
-					<string name="InboxLabelNoArg">
-						受け取ったアイテム
-					</string>
-					<button label="受け取ったアイテム" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] 個の新アイテム
-					</text>
-					<panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
-						<text name="inbox_inventory_placeholder">
-							マーケットプレイスから購入した商品はここに配達されます。
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-		</layout_stack>
-		<panel name="button_panel">
-			<layout_stack name="button_panel_ls">
-				<layout_panel name="info_btn_lp">
-					<button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する"/>
-				</layout_panel>
-				<layout_panel name="share_btn_lp">
-					<button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/>
-				</layout_panel>
-				<layout_panel name="shop_btn_lp">
-					<button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く"/>
-					<button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する"/>
-					<button label="再生" name="play_btn"/>
-					<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</panel>
-</panel>
+  <panel label="" name="sidepanel_inventory_panel">
+    <layout_stack name="inventory_layout_stack">
+      <layout_panel name="inbox_layout_panel">
+        <panel label="" name="marketplace_inbox">
+          <string name="InboxLabelWithArg">受け取ったアイテム（[NUM]個）</string>
+          <string name="InboxLabelNoArg">受け取ったアイテム</string>
+          <button label="受け取ったアイテム" name="inbox_btn" />
+          <text name="inbox_fresh_new_count">[NUM]個の新アイテム</text>
+          <panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
+            <text name="inbox_inventory_placeholder">マーケットプレイスから購入した商品はここに配達されます。</text>
+          </panel>
+        </panel>
+      </layout_panel>
+    </layout_stack>
+    <panel name="button_panel">
+      <layout_stack name="button_panel_ls">
+        <layout_panel name="info_btn_lp">
+          <button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する" />
+        </layout_panel>
+        <layout_panel name="share_btn_lp">
+          <button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する" />
+        </layout_panel>
+        <layout_panel name="shop_btn_lp">
+          <button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く" />
+          <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する" />
+          <button label="再生" name="play_btn" />
+          <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする" />
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index 3bdf8405e7..fd215b6f52 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,88 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="item properties" title="アイテムのプロフィール">
-	<panel.string name="loading_experience">
-		(ローディング)
-	</panel.string>
-	<panel.string name="unknown">
-		（不明）
-	</panel.string>
-	<panel.string name="unknown_multiple">
-		(不明/複数)
-	</panel.string>
-	<panel.string name="public">
-		（公開）
-	</panel.string>
-	<panel.string name="you_can">
-		あなたができること：
-	</panel.string>
-	<panel.string name="owner_can">
-		所有者ができること：
-	</panel.string>
-	<panel.string name="acquiredDate">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</panel.string>
-	<panel.string name="origin_inventory">
-		（インベントリ）
-	</panel.string>
-	<panel.string name="origin_inworld">
-		（インワールド）
-	</panel.string>
-	<text name="title" value="アイテムのプロフィール"/>
-	<text name="origin" value="（インベントリ）"/>
-	<scroll_container name="item_profile_scroll">
-		<panel label="" name="item_profile">
-			<text name="LabelItemNameTitle">
-				名前：
-			</text>
-			<line_editor name="LabelItemName" tool_tip="使用できる名前の文字数は最大 63 文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
-			<text name="LabelItemDescTitle">
-				説明：
-			</text>
-			<line_editor name="LabelItemDesc" tool_tip="ビューワの設定で [すべてのオブジェクト上でヒントを表示] が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
-			<text name="LabelCreatorTitle">
-				制作者：
-			</text>
-			<text name="LabelOwnerTitle">
-				所有者：
-			</text>
-			<text name="LabelAcquiredTitle">
-				取得：
-			</text>
-			<text name="LabelItemExperienceTitle">
-				体験：
-			</text>
-			<panel name="perms_inv">
-				<text name="perm_modify">
-					あなたができること：
-				</text>
-				<check_box label="修正" name="CheckOwnerModify"/>
-				<check_box label="コピー" name="CheckOwnerCopy"/>
-				<check_box label="再販・プレゼント" name="CheckOwnerTransfer"/>
-				<text name="AnyoneLabel">
-					全員：
-				</text>
-				<check_box label="コピー" name="CheckEveryoneCopy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
-				<text name="GroupLabel">
-					グループ：
-				</text>
-				<check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/>
-				<text name="NextOwnerLabel">
-					次の所有者：
-				</text>
-				<check_box label="修正" name="CheckNextOwnerModify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-				<check_box label="コピー" name="CheckNextOwnerCopy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-				<check_box label="再販・プレゼント" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
-			</panel>
-			<check_box label="販売中" name="CheckPurchase" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
-			<combo_box name="ComboBoxSaleType" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
-				<combo_box.item label="コピー" name="Copy"/>
-				<combo_box.item label="コンテンツ" name="Contents"/>
-				<combo_box.item label="オリジナル" name="Original"/>
-			</combo_box>
-			<spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。"/>
-		</panel>
-	</scroll_container>
-	<panel name="button_panel">
-		<button label="キャンセル" name="cancel_btn"/>
-	</panel>
-</panel>
+  <panel.string name="loading_experience">（読み込んでいます…）</panel.string>
+  <panel.string name="unknown">（不明）</panel.string>
+  <panel.string name="unknown_multiple">（不明／複数）</panel.string>
+  <panel.string name="public">（公開）</panel.string>
+  <panel.string name="you_can">あなたができること：</panel.string>
+  <panel.string name="owner_can">所有者ができること：</panel.string>
+  <panel.string name="acquiredDate">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</panel.string>
+  <panel.string name="origin_inventory">（インベントリ）</panel.string>
+  <panel.string name="origin_inworld">（インワールド）</panel.string>
+  <text name="title" value="アイテムのプロフィール" />
+  <text name="origin" value="（インベントリ）" />
+  <scroll_container name="item_profile_scroll">
+    <panel label="" name="item_profile">
+      <text name="LabelItemNameTitle">名前：</text>
+      <line_editor name="LabelItemName" tool_tip="使用できる名前の文字数は最大63文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7（非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。" />
+      <text name="LabelItemDescTitle">説明：</text>
+      <line_editor name="LabelItemDesc" tool_tip="ビューアーの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
+      <text name="LabelCreatorTitle">制作者：</text>
+      <text name="LabelOwnerTitle">所有者：</text>
+      <text name="LabelAcquiredTitle">取得：</text>
+      <text name="LabelItemExperienceTitle">体験：</text>
+      <panel name="perms_inv">
+        <text name="perm_modify">あなたができること：</text>
+        <check_box label="修正" name="CheckOwnerModify" />
+        <check_box label="コピー" name="CheckOwnerCopy" />
+        <check_box label="再販・譲渡" name="CheckOwnerTransfer" />
+        <text name="AnyoneLabel">全員：</text>
+        <check_box label="コピー" name="CheckEveryoneCopy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
+        <text name="GroupLabel">グループ：</text>
+        <check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
+        <text name="NextOwnerLabel">次の所有者：</text>
+        <check_box label="修正" name="CheckNextOwnerModify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+        <check_box label="コピー" name="CheckNextOwnerCopy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
+        <check_box label="再販・譲渡" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。" />
+      </panel>
+      <check_box label="販売品" name="CheckPurchase" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
+      <combo_box name="ComboBoxSaleType" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
+        <combo_box.item label="コピー" name="Copy" />
+        <combo_box.item label="コンテンツ" name="Contents" />
+        <combo_box.item label="オリジナル" name="Original" />
+      </combo_box>
+      <spinner label="価格：L$" name="Edit Cost" tool_tip="オブジェクトの価格" />
+    </panel>
+  </scroll_container>
+  <panel name="button_panel">
+    <button label="キャンセル" name="cancel_btn" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index d8325d8dc0..da00c38e43 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -1,136 +1,74 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="オブジェクトのプロフィール">
-	<panel.string name="text deed continued">
-		譲渡
-	</panel.string>
-	<panel.string name="text deed">
-		譲渡
-	</panel.string>
-	<panel.string name="text modify info 1">
-		このオブジェクトを修正できます
-	</panel.string>
-	<panel.string name="text modify info 2">
-		これらのオブジェクトを修正できます
-	</panel.string>
-	<panel.string name="text modify info 3">
-		このオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify info 4">
-		これらのオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify info 5">
-		地域（リージョン）の境界を越えてこのオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify info 6">
-		地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify warning">
-		このオブジェクトには、パーツがリンクされています
-	</panel.string>
-	<panel.string name="Cost Default">
-		価格： L$
-	</panel.string>
-	<panel.string name="Cost Total">
-		合計価格: L$
-	</panel.string>
-	<panel.string name="Cost Per Unit">
-		Price Per: L$
-	</panel.string>
-	<panel.string name="Cost Mixed">
-		Mixed Price
-	</panel.string>
-	<panel.string name="Sale Mixed">
-		Mixed Sale
-	</panel.string>
-	<text name="title" value="オブジェクトのプロフィール"/>
-	<text name="where" value="（インワールド）"/>
-	<panel label="" name="properties_panel">
-		<text name="Name:">
-			名前：
-		</text>
-		<line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大 63 文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
-		<text name="Description:">
-			説明：
-		</text>
-		<line_editor name="Object Description" tool_tip="ビューワの設定で [すべてのオブジェクト上でヒントを表示] が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
-		<text name="CreatorNameLabel">
-			制作者：
-		</text>
-		<text name="Owner:">
-			所有者：
-		</text>
-		<text name="Group_label">
-			グループ：
-		</text>
-		<button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します"/>
-		<name_box initial_value="ローディング..." name="Group Name Proxy"/>
-		<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます。"/>
-		<text name="label click action">
-			クリックで：
-		</text>
-		<combo_box name="clickaction" tool_tip="マウスを 1 回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。たとえば、[タッチ] や [支払い] にはスクリプトが必要になるなどです">
-			<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
-			<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
-			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
-			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
-			<combo_box.item label="開く" name="Open"/>
-			<combo_box.item label="ズーム" name="Zoom"/>
-			<combo_box.item label="なし" name="None"/>
-		</combo_box>
-		<panel name="perms_inv">
-			<text name="perm_modify">
-				このオブジェクトを修正できます
-			</text>
-			<text name="Anyone can:">
-				全員：
-			</text>
-			<check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
-			<check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。"/>
-			<text name="GroupLabel">
-				グループ：
-			</text>
-			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/>
-			<text name="NextOwnerLabel">
-				次の所有者：
-			</text>
-			<check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-			<check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-			<check_box label="再販・プレゼント" name="checkbox next owner can transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます"/>
-		</panel>
-		<check_box label="販売中" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
-		<combo_box name="sale type" tool_tip="購入者がコピーを受け取るのか、コピーの中身を受け取るのか、またはアイテム自体を受け取るのかを選択してください。">
-			<combo_box.item label="コピー" name="Copy"/>
-			<combo_box.item label="中身" name="Contents"/>
-			<combo_box.item label="オリジナル" name="Original"/>
-		</combo_box>
-		<spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。"/>
-		<check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します"/>
-		<text name="pathfinding_attributes_label">
-			パスファインディング属性:
-		</text>
-		<text name="B:">
-			B.
-		</text>
-		<text name="O:">
-			O:
-		</text>
-		<text name="G:">
-			G:
-		</text>
-		<text name="E:">
-			E:
-		</text>
-		<text name="N:">
-			N:
-		</text>
-		<text name="F:">
-			F:
-		</text>
-	</panel>
-	<panel name="button_panel">
-		<button label="開く" name="open_btn" tool_tip="[オブジェクトの中身] を開いて確認します。"/>
-		<button label="支払う" name="pay_btn" tool_tip="[支払い] ウィンドウを開きます。オブジェクトでこの動作を実行するには、支払い用のスクリプトが必要です。"/>
-		<button label="買う" name="buy_btn" tool_tip="[購入] ウィンドウを開きます。オブジェクトは販売用に設定する必要があります。"/>
-		<button label="詳細" name="details_btn" tool_tip="[オブジェクトを調べる] ウィンドウを開きます。"/>
-	</panel>
-</panel>
+  <panel.string name="text deed continued">再譲渡</panel.string>
+  <panel.string name="text deed">譲渡</panel.string>
+  <panel.string name="text modify info 1">このオブジェクトは、修正することができます。</panel.string>
+  <panel.string name="text modify info 2">これらのオブジェクトは、修正することができます。</panel.string>
+  <panel.string name="text modify info 3">このオブジェクトは、修正することができません。</panel.string>
+  <panel.string name="text modify info 4">これらのオブジェクトは、修正することができません。</panel.string>
+  <panel.string name="text modify info 5">リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。</panel.string>
+  <panel.string name="text modify info 6">リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。</panel.string>
+  <panel.string name="text modify warning">このオブジェクトには、パーツがリンクされています。</panel.string>
+  <panel.string name="Cost Default">価格：L$</panel.string>
+  <panel.string name="Cost Total">合計価格：L$</panel.string>
+  <panel.string name="Cost Per Unit">単価：L$</panel.string>
+  <panel.string name="Cost Mixed">総額</panel.string>
+  <panel.string name="Sale Mixed">販売額</panel.string>
+  <text name="title" value="オブジェクトのプロフィール" />
+  <text name="where" value="（インワールド）" />
+  <panel label="" name="properties_panel">
+    <text name="Name:">名前：</text>
+    <line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大63文字までです。長いプリム名は短縮されます。名前に使用できる文字はASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。" />
+    <text name="Description:">説明：</text>
+    <line_editor name="Object Description" tool_tip="ビューアーの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
+    <text name="CreatorNameLabel">制作者：</text>
+    <text name="Owner:">所有者：</text>
+    <text name="Group_label">グループ：</text>
+    <button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します" />
+    <name_box initial_value="読み込んでいます…" name="Group Name Proxy" />
+    <button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます。" />
+    <text name="label click action">クリックで：</text>
+    <combo_box name="clickaction" tool_tip="マウスで１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。例えば、「触る」や「支払い」にはスクリプトが必要になります。">
+      <combo_box.item label="触る（デフォルト）" name="Touch/grab(default)" />
+      <combo_box.item label="オブジェクトに座る" name="Sitonobject" />
+      <combo_box.item label="オブジェクトを買う" name="Buyobject" />
+      <combo_box.item label="オブジェクトに支払う" name="Payobject" />
+      <combo_box.item label="開く" name="Open" />
+      <combo_box.item label="ズーム" name="Zoom" />
+      <combo_box.item label="なし" name="None" />
+    </combo_box>
+    <panel name="perms_inv">
+      <text name="perm_modify">このオブジェクトは以下の条件で修正することができます。</text>
+      <text name="Anyone can:">全員：</text>
+      <check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
+      <check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。" />
+      <text name="GroupLabel">グループ：</text>
+      <check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
+      <text name="NextOwnerLabel">次の所有者：</text>
+      <check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+      <check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
+      <check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます" />
+    </panel>
+    <check_box label="販売" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
+    <combo_box name="sale type" tool_tip="購入者がコピーを受け取るのか、コピーの中身を受け取るのか、またはアイテム自体を受け取るのかを選択してください。">
+      <combo_box.item label="コピー" name="Copy" />
+      <combo_box.item label="中身" name="Contents" />
+      <combo_box.item label="オリジナル" name="Original" />
+    </combo_box>
+    <spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。" />
+    <check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します" />
+    <text name="pathfinding_attributes_label">経路探索属性：</text>
+    <text name="B:">B：</text>
+    <text name="O:">O：</text>
+    <text name="G:">G：</text>
+    <text name="E:">E：</text>
+    <text name="N:">N：</text>
+    <text name="F:">F：</text>
+  </panel>
+  <panel name="button_panel">
+    <button label="開く" name="open_btn" tool_tip="「オブジェクトの中身」を開いて確認します。" />
+    <button label="支払う" name="pay_btn" tool_tip="「支払い」ウィンドウを開きます。オブジェクトでこの動作を実行するには、支払い用のスクリプトが必要です。" />
+    <button label="買う" name="buy_btn" tool_tip="「購入」ウィンドウを開きます。オブジェクトは販売用に設定する必要があります。" />
+    <button label="詳細" name="details_btn" tool_tip="「オブジェクトを調べる」ウィンドウを開きます。" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 367d43fb4c..a0812547fa 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1,2074 +1,4115 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- 
+This file contains strings that used to be hardcoded in the source.
+It is only for those strings which do not belong in a floater.
+For example, the strings used in avatar chat bubbles, and strings
+that are returned from one component and may appear in many places
+-->
 <strings>
-	<string name="SECOND_LIFE">Second Life</string>
-	<string name="APP_NAME">Second Life</string>
-	<string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
-	<string name="SECOND_LIFE_GRID">Second Life Grid</string>
-	<string name="SUPPORT_SITE">Second Life サポートポータル</string>
-	<string name="StartupDetectingHardware">ハードウェアの検出中です...</string>
-	<string name="StartupLoading">[APP_NAME] をインストール中です...</string>
-	<string name="StartupClearingCache">キャッシュをクリア中です...</string>
-	<string name="StartupInitializingTextureCache">テクスチャキャッシュを初期化中です...</string>
-	<string name="StartupRequireDriverUpdate">グラフィックを初期化できませんでした。グラフィックドライバを更新してください。</string>
-	<string name="AboutHeader">[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) 
+
+  <!-- Default Args - these arguments will be replaced in all strings -->
+  <string name="SECOND_LIFE">Second Life</string>
+  <string name="APP_NAME">Second Life</string>
+  <string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
+  <string name="SECOND_LIFE_GRID">Second Lifeグリッド</string>
+  <string name="SUPPORT_SITE">Second Lifeサポートポータル</string>
+  <!-- starting up -->
+  <string name="StartupDetectingHardware">ハードウェアの検出中です…</string>
+  <string name="StartupLoading">[APP_NAME]をインストール中です…</string>
+  <string name="StartupClearingCache">キャッシュをクリア中です…</string>
+  <string name="StartupInitializingTextureCache">テクスチャキャッシュを初期化中です…</string>
+  <string name="StartupRequireDriverUpdate">グラフィックを初期化できませんでした。グラフィックドライバを更新してください。</string>
+
+  <!-- about dialog/support string-->
+  <string name="AboutHeader">[CHANNEL]　[VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3]（[ADDRESS_SIZE]bit）
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
-	<string name="BuildConfig">ビルド構成 [BUILD_CONFIG]</string>
-	<string name="AboutPosition">あなたの現在地は、[POSITION_LOCAL_0,number,1]、[POSITION_LOCAL_1,number,1]、[POSITION_LOCAL_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。（[HOSTIP]）
-SLURL:&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(グローバル座標 [POSITION_0,number,1]、[POSITION_1,number,1]、[POSITION_2,number,1])
+  <string name="BuildConfig">ビルド構成：[BUILD_CONFIG]</string>
+
+  <string name="AboutPosition">あなたは、現在[REGION]の[POSITION_LOCAL_0,number,1]，[POSITION_LOCAL_1,number,1]，[POSITION_LOCAL_2,number,1]にいます。
+位置は、&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;です。（[HOSTIP]）
+SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+（グローバル座標は、[POSITION_0,number,1]，[POSITION_1,number,1]，[POSITION_2,number,1]です。）
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]</string>
-	<string name="AboutSystem">CPU：[CPU]
-メモリ：[MEMORY_MB] MB
-OS バージョン：[OS_VERSION]
+  <!-- *NOTE: Do not translate text like GPU, Graphics Card, etc -
+       Most PC users who know what these mean will be used to the English versions,
+       and this info sometimes gets sent to support. -->
+  <string name="AboutSystem">ＣＰＵ：[CPU]
+メモリ：[MEMORY_MB]㎆
+ＯＳのバージョン：[OS_VERSION]
 グラフィックカード製造元：[GRAPHICS_CARD_VENDOR]
 グラフィックカード:[GRAPHICS_CARD]</string>
-	<string name="AboutDriver">Windows グラフィックドライババージョン：[GRAPHICS_DRIVER_VERSION]</string>
-	<string name="AboutOGL">OpenGL バージョン：[OPENGL_VERSION]</string>
-	<string name="AboutSettings">ウィンドウサイズ: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
-フォントサイズ調整: [FONT_SIZE_ADJUSTMENT]pt
-UI スケーリング: [UI_SCALE]
-描画距離: [DRAW_DISTANCE]m
-帯域幅: [NET_BANDWITH]kbit/s
-LOD 係数: [LOD_FACTOR]
-描画の質: [RENDER_QUALITY]
-高度なライティングモデル: [GPU_SHADERS]
-テクスチャメモリ: [TEXTURE_MEMORY]MB</string>
-	<string name="AboutOSXHiDPI">HiDPI 表示モード: [HIDPI]</string>
-	<string name="AboutLibs">J2C デコーダバージョン： [J2C_VERSION] 
-オーディオドライババージョン： [AUDIO_DRIVER_VERSION] 
-[LIBCEF_VERSION] LibVLC バージョン： [LIBVLC_VERSION] 
-ボイスサーバーバージョン: [VOICE_VERSION]</string>
-	<string name="AboutTraffic">パケットロス：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%）</string>
-	<string name="AboutTime">[month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]</string>
-	<string name="ErrorFetchingServerReleaseNotesURL">サーバーのリリースノートの URL を取得中にエラーが発生しました。</string>
-	<string name="BuildConfiguration">ビルド構成</string>
-	<string name="ProgressRestoring">復元中です...</string>
-	<string name="ProgressChangingResolution">解像度を変更中です...</string>
-	<string name="Fullbright">明るさ全開（レガシー）</string>
-	<string name="LoginInProgress">ログイン中です。[APP_NAME]の表示がフリーズする場合があります。  しばらくお待ちください。</string>
-	<string name="LoginInProgressNoFrozen">ログイン中です...</string>
-	<string name="LoginAuthenticating">認証しています...</string>
-	<string name="LoginMaintenance">アカウントのメンテナンスを実行しています...</string>
-	<string name="LoginAttempt">前回のログインに失敗しました。 ログイン中です（[NUMBER] 回目）</string>
-	<string name="LoginPrecaching">ワールドを読み込んでいます...</string>
-	<string name="LoginInitializingBrowser">内蔵 Web ブラウザを初期化しています...</string>
-	<string name="LoginInitializingMultimedia">マルチメディアを初期化しています...</string>
-	<string name="LoginInitializingFonts">フォントをローディング中...</string>
-	<string name="LoginVerifyingCache">キャッシュファイルを検証しています（所要時間は 60 ～ 90 秒）...</string>
-	<string name="LoginProcessingResponse">対応を処理中です...</string>
-	<string name="LoginInitializingWorld">ワールドを初期化中です...</string>
-	<string name="LoginDecodingImages">画像をデコードしています...</string>
-	<string name="LoginInitializingQuicktime">QuickTime を初期化しています...</string>
-	<string name="LoginQuicktimeNotFound">QuickTime が見つかりません。初期化に失敗しました。</string>
-	<string name="LoginQuicktimeOK">QuickTime が正常に初期化されました。</string>
-	<string name="LoginRequestSeedCapGrant">リージョンの機能をリクエストしています...</string>
-	<string name="LoginRetrySeedCapGrant">リージョンの機能をリクエスト、試行 [NUMBER] 回....</string>
-	<string name="LoginWaitingForRegionHandshake">リージョンのハンドシェイクを待っています...</string>
-	<string name="LoginConnectingToRegion">リージョンに接続しています...</string>
-	<string name="LoginDownloadingClothing">衣類をダウンロードしています...</string>
-	<string name="InvalidCertificate">証明書が無効または壊れています。 グリッド管理者にご連絡ください。</string>
-	<string name="CertInvalidHostname">無効なホストネームがサーバーにアクセスしていました。SLURL かグリッドのホストネームをご確認ください。</string>
-	<string name="CertExpired">グリッドが返した証明書は有効期限が終了していると考えられます。お使いのシステムクロックを確認するか、グリッドの管理者にお問い合わせください。</string>
-	<string name="CertKeyUsage">SSL 証明書のエラーが発生しました。  グリッド管理者にご連絡ください。</string>
-	<string name="CertBasicConstraints">サーバーの証明書チェーンに証明書が多すぎます。  グリッド管理者にご連絡ください。</string>
-	<string name="CertInvalidSignature">グリッドサーバーが返した証明書の署名を認証できませんでした。グリッドの管理者にお問い合わせください。</string>
-	<string name="LoginFailedNoNetwork">ネットワークエラー：接続を確立できませんでした。お使いのネットワーク接続をご確認ください。</string>
-	<string name="LoginFailedHeader">ログインに失敗しました。</string>
-	<string name="Quit">終了</string>
-	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
-	<string name="AgniGridLabel">Second Life メイングリッド (Agni)</string>
-	<string name="AditiGridLabel">Second Life ベータテストグリッド (Aditi)</string>
-	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
-	<string name="LoginFailedViewerNotPermitted">お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
-http://secondlife.com/download
+  <string name="AboutDriver">Windowsグラフィックドライババージョン：[GRAPHICS_DRIVER_VERSION]</string>
+  <string name="AboutOGL">OpenGLバージョン：[OPENGL_VERSION]</string>
+  <string name="AboutSettings">ウィンドウサイズ:[WINDOW_WIDTH]x[WINDOW_HEIGHT]
+フォントサイズ調整：[FONT_SIZE_ADJUSTMENT]pt
+ＵＩスケーリング：[UI_SCALE]
+描画距離：[DRAW_DISTANCE]ｍ
+帯域幅：[NET_BANDWITH]kbit／秒
+ＬＯＤ係数：[LOD_FACTOR]
+描画の質：[RENDER_QUALITY]
+高度なライティングモデル：[GPU_SHADERS]
+テクスチャメモリ：[TEXTURE_MEMORY]㎆</string>
+  <string name="AboutOSXHiDPI">高ＤＰＩ表示モード：[HIDPI]</string>
+  <string name="AboutLibs">J2Cデコーダバージョン：[J2C_VERSION]
+オーディオドライババージョン：[AUDIO_DRIVER_VERSION]
+LibCEFバージョン：[LIBCEF_VERSION]
+LibVLCバージョン：[LIBVLC_VERSION]
+ボイスサーバーバージョン：[VOICE_VERSION]</string>
+  <string name="AboutTraffic">パケット損失：[PACKETS_LOST,number,0]／[PACKETS_IN,number,0]（[PACKETS_PCT,number,1]％）</string>
+  <string name="AboutTime">[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日　[hour, datetime, slt]：[min,datetime, slt]：[second,datetime,slt]</string>
+  <string name="ErrorFetchingServerReleaseNotesURL">サーバーのリリースノートのＵＲＬ取得時にエラーが発生しました。</string>
+  <string name="BuildConfiguration">ビルド構成</string>
+
+  <!--  progress -->
+  <string name="ProgressRestoring">修復しています…</string>
+  <string name="ProgressChangingResolution">解像度を変更しています…</string>
+
+  <!-- Legacy strings, almost never used -->
+  <string name="Fullbright">明るさ全開（レガシー）</string>  <!-- used in the Build > materials dropdown-->
+
+  <!-- Login -->
+  <string name="LoginInProgress">ログイン中です。[APP_NAME]の表示がフリーズする場合があります。しばらくお待ちください。</string>
+  <string name="LoginInProgressNoFrozen">ログイン中です…</string>
+  <string name="LoginAuthenticating">認証しています…</string>
+  <string name="LoginMaintenance">アカウントのメンテナンスを実行しています…</string>
+  <string name="LoginAttempt">前回のログインに失敗しました。ログイン中です（[NUMBER]回目）</string>
+  <string name="LoginPrecaching">ワールドを読み込んでいます…</string>
+  <string name="LoginInitializingBrowser">内蔵Webブラウザを初期化しています…</string>
+  <string name="LoginInitializingMultimedia">マルチメディアを初期化しています…</string>
+  <string name="LoginInitializingFonts">フォントを読み込んでいます…</string>
+  <string name="LoginVerifyingCache">キャッシュファイルを検証しています（所要時間は60～90秒）…</string>
+  <string name="LoginProcessingResponse">レスポンスを処理しています…</string>
+  <string name="LoginInitializingWorld">ワールドを初期化しています…</string>
+  <string name="LoginDecodingImages">画像をデコードしています…</string>
+  <string name="LoginInitializingQuicktime">QuickTimeを初期化しています…</string>
+  <string name="LoginQuicktimeNotFound">QuickTimeが見つかりません。初期化に失敗しました。</string>
+  <string name="LoginQuicktimeOK">QuickTimeが正常に初期化されました。</string>
+  <string name="LoginRequestSeedCapGrant">リージョン（地域）の機能をリクエストしています…</string>
+  <string name="LoginRetrySeedCapGrant">リージョン（地域）の機能をリクエストしています…（試行[NUMBER]回目）</string>
+  <string name="LoginWaitingForRegionHandshake">リージョン（地域）のハンドシェイクを待っています…</string>
+  <string name="LoginConnectingToRegion">リージョン（地域）に接続しています…</string>
+  <string name="LoginDownloadingClothing">服装をダウンロードしています…</string>
+  <string name="InvalidCertificate">証明書が無効であるか、壊れています。グリッド管理者にご連絡ください。</string>
+  <string name="CertInvalidHostname">無効なホストネームがサーバーにアクセスしようとしています。SLURLかグリッドのホストネームをご確認ください。</string>
+  <string name="CertExpired">グリッドが返した証明書は、有効期限が過ぎていると考えられます。お使いのシステムクロックを確認するか、グリッドの管理者にお問い合わせください。</string>
+  <string name="CertKeyUsage">SSL証明書のエラーが発生しました。グリッド管理者にご連絡ください。</string>
+  <string name="CertBasicConstraints">サーバーの証明書チェーンに証明書が多すぎます。グリッド管理者にご連絡ください。</string>
+  <string name="CertInvalid">証明書が読み込めませんでした。グリッド管理者に連絡してください。</string>
+  <string name="CertInvalidSignature">グリッドが返したサーバー証明書の署名を認証できませんでした。グリッドの管理者にお問い合わせください。</string>
+  <string name="CertAllocationFailure">証明書にOpenSSLメモリを割り当てることができませんでした。</string>
+
+  <string name="LoginFailedNoNetwork">ネットワークエラー：接続を確立できませんでした。お使いのネットワーク接続をご確認ください。</string>
+  <string name="LoginFailedHeader">ログインに失敗しました。</string>
+  <string name="Quit">終了</string>
+  <string name="create_account_url">https://join.secondlife.com/?lang=ja&amp;sourceid=[sourceid]</string>
+
+  <string name="AgniGridLabel">Second Lifeメイングリッド (Agni)</string>
+  <string name="AditiGridLabel">Second Lifeベータテストグリッド (Aditi)</string>
+
+  <string name="ViewerDownloadURL">https://secondlife.com/support/downloads/?lang=ja</string>
+  <string name="LoginFailedViewerNotPermitted">お使いの古いビューアーでは、Second Lifeにアクセスできません。以下のページから新しいビューアーをダウンロードしてください： https://secondlife.com/support/downloads/?lang=ja
 
 詳細については、FAQ を参照してください：
-http://secondlife.com/viewer-access-faq</string>
-	<string name="LoginIntermediateOptionalUpdateAvailable">ビューワアップデート（オプション）があります： [VERSION]</string>
-	<string name="LoginFailedRequiredUpdate">ビューワアップデート（必須）： [VERSION]</string>
-	<string name="LoginFailedAlreadyLoggedIn">このエージェントは既にログインされています。</string>
-	<string name="LoginFailedAuthenticationFailed">申し訳ありませんが、ログインできませんでした。
+https://secondlife.com/viewer-access-faq</string>
+  <string name="LoginIntermediateOptionalUpdateAvailable">ビューアーの更新（オプション）があります：[VERSION]</string>
+  <string name="LoginFailedRequiredUpdate">ビューアーの更新（必須）：[VERSION]</string>
+  <string name="LoginFailedAlreadyLoggedIn">このエージェントは既にログインしています。</string>
+  <string name="LoginFailedAuthenticationFailed">申し訳ありませんが、ログインできませんでした。
 以下の情報が正しく入力されたことを確認してください：
-* ユーザー名（bobsmith12 または steller.sunshine など）
-* パスワード
-また、Caps Lock キーが有効になっていないこともお確かめください。</string>
-	<string name="LoginFailedPasswordChanged">セキュリティ上の理由により、あなたのパスワードは変更されました。
-アカウントページ（http://secondlife.com/password）に移動し、
+・ユーザー名（bobsmith12 または steller.sunshine など）
+・パスワード
+・２段階認証（使用している場合）
+また、Caps Lockが入っていないこともご確認ください。</string>
+  <string name="LoginFailedPasswordChanged">セキュリティ上の理由により、あなたのパスワードは変更されました。 アカウントページ（https://secondlife.com/my/account/request.php?lang=ja-JP）へ移動し、
 秘密の質問に答えて、パスワードをリセットしてください。
 ご迷惑をおかけして申し訳ございません。</string>
-	<string name="LoginFailedPasswordReset">弊社はシステムを若干変更しました。お手数ですが、パスワードのリセットをお願いします。
-アカウントページ（http://secondlife.com/password）に移動し、
+  <string name="LoginFailedPasswordReset">弊社はシステムを若干変更しました。お手数ですが、パスワードのリセットをお願いします。アカウントページ（ https://secondlife.com/my/account/request.php?lang=ja-JP ）に移動し、
 秘密の質問に答えて、パスワードをリセットしてください。
 ご迷惑をおかけして申し訳ございません。</string>
-	<string name="LoginFailedEmployeesOnly">Second Life はメンテナンスのため、一時的にご利用いただけません。
+  <string name="LoginFailedEmployeesOnly">Second Lifeは、メンテナンス中につき一時的にご利用いただけません。
 従業員以外にはログインをご遠慮いただいています。
 最新の状況については www.secondlife.com/status でお確かめください。</string>
-	<string name="LoginFailedPremiumOnly">既にログインしているユーザーに最上のインワールド体験を提供するため、Second Life へのログインは一時的に制限されています。
+  <string name="LoginFailedPremiumOnly">既にログインしているユーザーに最上のインワールド体験を提供するため、Second Lifeへのログインは一時的に制限されています。
+申し訳ございませんが、有料アカウントのユーザーを優先するため、現在のところ無料アカウントのユーザーには Second Lifeへのアクセスをご遠慮いただいています。</string>
 
-申し訳ございませんが、有料アカウントのユーザーを優先するため、現在のところ無料アカウントのユーザーには Second Life へのアクセスをご遠慮いただいています。</string>
-	<string name="LoginFailedComputerProhibited">このパソコンからは Second Life にアクセスできません。
-システムのエラーだと思われる場合は、
-support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedAcountSuspended">あなたのアカウントは
-太平洋時間の [TIME] までご利用いただけません。</string>
-	<string name="LoginFailedAccountDisabled">現在リクエストを完了することができません。
-Second Life のサポート（http://support.secondlife.com）にお問い合わせください。</string>
-	<string name="LoginFailedTransformError">ログイン時にデータの不一致が見つかりました。
+  <string name="LoginFailedComputerProhibited">お使いのパソコンからは、Second Lifeにアクセスできません。
+システムエラーだと思われる場合は、 support@secondlife.com にお問い合わせください。</string>
+  <string name="LoginFailedAcountSuspended">あなたのアカウントは、太平洋時間の[TIME]までご利用いただけません。</string>
+  <string name="LoginFailedAccountDisabled">現在リクエストを完了することができません。
+Second Life のサポート（ https://support.secondlife.com/ ）にお問い合わせください。</string>
+  <string name="LoginFailedTransformError">ログイン時にデータの不一致が見つかりました。
 support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedAccountMaintenance">現在アカウントのメインテナンスが行われています。
-あなたのアカウントは
-太平洋時間の [TIME] までご利用いただけません。
+  <!--'Pacific time' placeholder for [TIME] in case time from server can't be decoded-->
+  <string name="PacificTime">太平洋時間</string>
+  <string name="LoginFailedAccountMaintenance">現在アカウントのメンテナンスが行われています。
+あなたのアカウントは、
+太平洋時間の[TIME]までご利用いただけません。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedPendingLogoutFault">ログアウトをリスクエストしたら、シミュレーターから「fault」が返されました。</string>
-	<string name="LoginFailedPendingLogout">システムによるログアウトが実行されました。
+  <string name="LoginFailedPendingLogoutFault">ログアウトのリスクエスト時に、シミュレーターから「fault」が返されました。</string>
+  <string name="LoginFailedPendingLogout">システムによるログアウトが実行されました。
 しばらくしてから再度お試しください。</string>
-	<string name="LoginFailedUnableToCreateSession">有効なセッションを生成できません。</string>
-	<string name="LoginFailedUnableToConnectToSimulator">シミュレーターに接続できませんでした。</string>
-	<string name="LoginFailedRestrictedHours">あなたの Second Life アカウントにアクセスできるのは、
-太平洋時間の [START] ～ [END] の間に限られます。
+  <string name="LoginFailedUnableToCreateSession">有効なセッションを生成できませんでした。</string>
+  <string name="LoginFailedUnableToConnectToSimulator">シミュレーターに接続できませんでした。</string>
+  <string name="LoginFailedRestrictedHours">あなたのSecond Lifeアカウントにアクセスできるのは、
+太平洋時間の[START]～[END]の間に限られます。
 有効な時間帯に再度お試しください。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedIncorrectParameters">パラメーターが正しくありません。
+  <string name="LoginFailedIncorrectParameters">パラメーターが正しくありません。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedFirstNameNotAlphanumeric">ファーストネームのパラメーターは英数字です。
+  <string name="LoginFailedFirstNameNotAlphanumeric">ファーストネームのパラメーターは英数字です。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedLastNameNotAlphanumeric">ラストネームのパラメーターは英数字です。
+  <string name="LoginFailedLastNameNotAlphanumeric">ラストネームのパラメーターは英数字です。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LogoutFailedRegionGoingOffline">リージョンはオフライン中です。
+  <string name="LogoutFailedRegionGoingOffline">リージョンは、オフライン中です。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedAgentNotInRegion">エージェントがリージョンに不在です。
+  <string name="LogoutFailedPendingLogin">このリージョンでは、別のセッションでログインされていました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedPendingLogin">このリージョンでは別のセッションがログインされていました。
+  <string name="LogoutFailedLoggingOut">このリージョンでは前のセッションがログアウトされました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedLoggingOut">このリージョンでは前のセッションがログアウトされました。
+  <string name="LogoutFailedStillLoggingOut">このリージョンでは現在も前のセッションのログアウトが処理されています。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedStillLoggingOut">このリージョンでは現在も前のセッションのログアウトが処理されています。
+  <string name="LogoutSucceeded">リージョンでは、前のセッションがログアウトされました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutSucceeded">リージョンでは前のセッションがログアウトされました。
+  <string name="LogoutFailedLogoutBegun">このリージョンで、ログアウトプロセスが開始されました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedLogoutBegun">リージョンではログアウトプロセスが開始されました。
+  <string name="LoginFailedLoggingOutSession">あなたの前のセッションはシステムによってログアウトされています。
 しばらくしてから再度お試しください。</string>
-	<string name="LoginFailedLoggingOutSession">あなたの前のセッションはシステムによってログアウトされています。
-しばらくしてから再度お試しください。</string>
-	<string name="AgentLostConnection">このリージョンに不都合が発生している可能性があります。  ご使用のインターネット接続をご確認ください。</string>
-	<string name="SavingSettings">設定を保存中です...</string>
-	<string name="LoggingOut">ログアウト中です...</string>
-	<string name="ShuttingDown">シャットダウン中です...</string>
-	<string name="YouHaveBeenDisconnected">あなたがいたリージョンへの接続が切れました。</string>
-	<string name="SentToInvalidRegion">無効なリージョンにテレポートされました。</string>
-	<string name="TestingDisconnect">ビューワの接続を切るテスト中</string>
-	<string name="SocialFacebookConnecting">Facebook に接続中...</string>
-	<string name="SocialFacebookPosting">投稿中...</string>
-	<string name="SocialFacebookDisconnecting">Facebook から切断中...</string>
-	<string name="SocialFacebookErrorConnecting">Facebook への接続時のエラー</string>
-	<string name="SocialFacebookErrorPosting">Facebook への投稿時のエラー</string>
-	<string name="SocialFacebookErrorDisconnecting">Facebook からの切断時のエラー</string>
-	<string name="SocialFlickrConnecting">Flickr に接続中...</string>
-	<string name="SocialFlickrPosting">投稿中...</string>
-	<string name="SocialFlickrDisconnecting">Flickr から切断中...</string>
-	<string name="SocialFlickrErrorConnecting">Flickr への接続時のエラー</string>
-	<string name="SocialFlickrErrorPosting">Flickr への投稿時のエラー</string>
-	<string name="SocialFlickrErrorDisconnecting">Flickr からの切断時のエラー</string>
-	<string name="SocialTwitterConnecting">Twitter に接続中...</string>
-	<string name="SocialTwitterPosting">投稿中...</string>
-	<string name="SocialTwitterDisconnecting">Twitter から切断中...</string>
-	<string name="SocialTwitterErrorConnecting">Twitter への接続時のエラー</string>
-	<string name="SocialTwitterErrorPosting">Twitter への投稿時のエラー</string>
-	<string name="SocialTwitterErrorDisconnecting">Twitter からの切断時のエラー</string>
-	<string name="BlackAndWhite">白黒</string>
-	<string name="Colors1970">1970 年代のカラー</string>
-	<string name="Intense">強調</string>
-	<string name="Newspaper">新聞紙</string>
-	<string name="Sepia">セピア</string>
-	<string name="Spotlight">スポットライト</string>
-	<string name="Video">ビデオ</string>
-	<string name="Autocontrast">オートコントラスト</string>
-	<string name="LensFlare">レンズフレア</string>
-	<string name="Miniature">ミニチュア</string>
-	<string name="Toycamera">おもちゃのカメラ</string>
-	<string name="TooltipPerson">人</string>
-	<string name="TooltipNoName">（名前なし）</string>
-	<string name="TooltipOwner">所有者:</string>
-	<string name="TooltipPublic">公共</string>
-	<string name="TooltipIsGroup">（グループ）</string>
-	<string name="TooltipForSaleL$">売り出し中:L$ [AMOUNT]</string>
-	<string name="TooltipFlagGroupBuild">グループ作成</string>
-	<string name="TooltipFlagNoBuild">作成禁止</string>
-	<string name="TooltipFlagNoEdit">グループ作成</string>
-	<string name="TooltipFlagNotSafe">危険</string>
-	<string name="TooltipFlagNoFly">飛行禁止</string>
-	<string name="TooltipFlagGroupScripts">グループスクリプト</string>
-	<string name="TooltipFlagNoScripts">スクリプトなし</string>
-	<string name="TooltipLand">土地:</string>
-	<string name="TooltipMustSingleDrop">アイテムは 1 つだけここにドラッグできます</string>
-	<string name="TooltipTooManyWearables">[AMOUNT] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 &gt; 「デバッグ設定を表示」 &gt; 「WearFolderLimit」でこの制限を変更できます。</string>
-	<string name="TooltipPrice" value="L$[AMOUNT]："/>
-	<string name="TooltipSLIcon">これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。</string>
-	<string name="TooltipOutboxDragToWorld">マーケットプレイスのリストフォルダからアイテムを Rez できません</string>
-	<string name="TooltipOutboxWorn">着ているアイテムをマーケットプレイスのリストフォルダに置くことはできません</string>
-	<string name="TooltipOutboxFolderLevels">ネスト入りフォルダの深さが [AMOUNT] 階層を超えています必要に応じてアイテムを箱に入れ、フォルダの階層を減らします。</string>
-	<string name="TooltipOutboxTooManyFolders">サブフォルダ数が [AMOUNT] 個を超えています。必要に応じてアイテムを箱に入れ、リストのフォルダ階層を減らします。</string>
-	<string name="TooltipOutboxTooManyObjects">アイテム数が [AMOUNT] 個を超えています。1 つのリスト内で [AMOUNT] 個を超えるアイテムを販売するためには、いくつかのアイテムを箱に入れる必要があります。</string>
-	<string name="TooltipOutboxTooManyStockItems">在庫アイテム数が [AMOUNT] 個を超えています。</string>
-	<string name="TooltipOutboxCannotDropOnRoot">アイテムまたはフォルダは「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。</string>
-	<string name="TooltipOutboxNoTransfer">これらのオブジェクトの 1 つまたは複数は売り渡したり譲渡したりできないものです</string>
-	<string name="TooltipOutboxNotInInventory">アイテムはインベントリからマーケットプレイスへの移動のみできます</string>
-	<string name="TooltipOutboxLinked">リンクされた相手またはフォルダをマーケットプレイスに置くことはできません</string>
-	<string name="TooltipOutboxCallingCard">コーリングカードをマーケットプレイスに置くことはできません</string>
-	<string name="TooltipOutboxDragActive">表示されているリストを移動できません</string>
-	<string name="TooltipOutboxCannotMoveRoot">ルートフォルダをリストに表示するマーケットプレイスを移動できません</string>
-	<string name="TooltipOutboxMixedStock">在庫フォルダ内のアイテムはすべて同じ種類と権限でなければなりません</string>
-	<string name="TooltipDragOntoOwnChild">フォルダをその子フォルダに移動することはできません</string>
-	<string name="TooltipDragOntoSelf">フォルダをそのフォルダ自身に移動することはできません</string>
-	<string name="TooltipHttpUrl">クリックしてこの Web ページを見ます</string>
-	<string name="TooltipSLURL">クリックしてこの場所の情報を見ます</string>
-	<string name="TooltipAgentUrl">クリックしてこの住人のプロフィールを見ます</string>
-	<string name="TooltipAgentInspect">この住人の詳細を参照</string>
-	<string name="TooltipAgentMute">クリックしてこの住人に対して無視設定をします</string>
-	<string name="TooltipAgentUnmute">クリックしてこの住人に対する無視設定を解除します</string>
-	<string name="TooltipAgentIM">クリックしてこの住人に IM を送ります</string>
-	<string name="TooltipAgentPay">クリックしてこの住人に支払います</string>
-	<string name="TooltipAgentOfferTeleport">クリックしてこの住人にテレポートのリクエストを送ります</string>
-	<string name="TooltipAgentRequestFriend">クリックしてこの住人にフレンド登録リクエストを送ります</string>
-	<string name="TooltipGroupUrl">クリックしてこのグループの説明文を見ます</string>
-	<string name="TooltipEventUrl">クリックしてこのグループの説明文を見ます</string>
-	<string name="TooltipClassifiedUrl">クリックしてこのクラシファイド広告を見ます</string>
-	<string name="TooltipParcelUrl">クリックしてこの区画の説明文を見ます</string>
-	<string name="TooltipTeleportUrl">クリックしてこの場所にテレポートします</string>
-	<string name="TooltipObjectIMUrl">クリックしてこのオブジェクトの説明文を見ます</string>
-	<string name="TooltipMapUrl">クリックしてこの場所を地図に表示します</string>
-	<string name="TooltipSLAPP">クリックして secondlife:// コマンドを出します</string>
-	<string name="CurrentURL" value=" 現在の URL： [CurrentURL]"/>
-	<string name="TooltipEmail">クリックして電子メールを作成</string>
-	<string name="SLurlLabelTeleport">テレポート</string>
-	<string name="SLurlLabelShowOnMap">地図に表示</string>
-	<string name="SLappAgentMute">無視</string>
-	<string name="SLappAgentUnmute">ミュート解除</string>
-	<string name="SLappAgentIM">IM</string>
-	<string name="SLappAgentPay">支払う</string>
-	<string name="SLappAgentOfferTeleport">次の場所にテレポートを送ります：</string>
-	<string name="SLappAgentRequestFriend">フレンド登録リクエスト</string>
-	<string name="SLappAgentRemoveFriend">フレンドの削除</string>
-	<string name="BUTTON_CLOSE_DARWIN">閉じる （⌘W）</string>
-	<string name="BUTTON_CLOSE_WIN">閉じる （Ctrl+W）</string>
-	<string name="BUTTON_CLOSE_CHROME">閉じる</string>
-	<string name="BUTTON_RESTORE">復元</string>
-	<string name="BUTTON_MINIMIZE">元に戻す（縮小）</string>
-	<string name="BUTTON_TEAR_OFF">別ウィンドウで開く</string>
-	<string name="BUTTON_DOCK">ドッキング</string>
-	<string name="BUTTON_HELP">ヘルプを表示</string>
-	<string name="TooltipNotecardNotAllowedTypeDrop">このタイプのアイテムは、このリージョンのノートカード
-に添付することができません。</string>
-	<string name="TooltipNotecardOwnerRestrictedDrop">制限のない「次の所有者」の
+
+  <!-- Disconnection -->
+  <string name="AgentLostConnection">このリージョンに不都合が発生している可能性があります。ご使用のインターネット接続をご確認ください。</string>
+  <string name="SavingSettings">設定を保存中です…</string>
+  <string name="LoggingOut">ログアウト中です…</string>
+  <string name="ShuttingDown">シャットダウン中です…</string>
+  <string name="YouHaveBeenDisconnected">あなたがいたリージョンへの接続が切れました。</string>
+  <string name="SentToInvalidRegion">無効なリージョンにテレポートされました。</string>
+  <string name="TestingDisconnect">ビューアーの接続を切るテスト中</string>
+
+  <!-- SLShare: User Friendly Filter Names Translation -->
+  <string name="BlackAndWhite">白黒</string>
+  <string name="Colors1970">１９７０年代のカラー</string>
+  <string name="Intense">強調</string>
+  <string name="Newspaper">新聞紙</string>
+  <string name="Sepia">セピア</string>
+  <string name="Spotlight">スポットライト</string>
+  <string name="Video">ビデオ</string>
+  <string name="Autocontrast">オートコントラスト</string>
+  <string name="LensFlare">レンズフレア</string>
+  <string name="Miniature">ミニチュア</string>
+  <string name="Toycamera">トイカメラ</string>
+
+  <!-- Tooltip -->
+  <string name="TooltipPerson">人</string>
+  <string name="TooltipNoName">（名前なし）</string>
+  <string name="TooltipOwner">所有者：</string>
+  <string name="TooltipPublic">公共</string>
+  <string name="TooltipIsGroup">（グループ）</string>
+  <string name="TooltipForSaleL$">売り出し中：L$[AMOUNT]</string>
+  <string name="TooltipFlagGroupBuild">グループ作成</string>
+  <string name="TooltipFlagNoBuild">作成禁止</string>
+  <string name="TooltipFlagNoEdit">グループ作成</string>
+  <string name="TooltipFlagNotSafe">危険</string>
+  <string name="TooltipFlagNoFly">飛行禁止</string>
+  <string name="TooltipFlagGroupScripts">グループスクリプト</string>
+  <string name="TooltipFlagNoScripts">スクリプトなし</string>
+  <string name="TooltipLand">土地：</string>
+  <string name="TooltipMustSingleDrop">アイテムは１つだけここにドラッグできます。</string>
+  <string name="TooltipTooManyWearables">[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。</string>
+  <string name="TooltipPrice" value="L$ [AMOUNT]：" />
+  <string name="TooltipSLIcon">これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。</string>
+
+  <string name="TooltipOutboxDragToWorld">マーケットプレイスのリストフォルダから、直接アイテムをRezすることはできません</string>
+  <string name="TooltipOutboxWorn">着用しているアイテムをマーケットプレイスのリストフォルダに置くことはできません。</string>
+  <string name="TooltipOutboxFolderLevels">フォルダの階層の深さが、[AMOUNT]階層を超えています。必要に応じてアイテムをボックスに入れるなどをして、フォルダの階層数を減らしてください。</string>
+  <string name="TooltipOutboxTooManyFolders">サブフォルダの数が、[AMOUNT]個を超えています。必要に応じてアイテムをボックスに入れ、リストのフォルダ階層を減らしてください。</string>
+  <string name="TooltipOutboxTooManyObjects">アイテムの数が、[AMOUNT]個を超えています。１つのリスト内で[AMOUNT]個を超えるアイテムを販売するためには、いくつかのアイテムをボックスに入れる必要があります。</string>
+  <string name="TooltipOutboxTooManyStockItems">在庫アイテム数が[AMOUNT]個を超えています。</string>
+  <string name="TooltipOutboxCannotDropOnRoot">アイテムまたはフォルダは、「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。</string>
+  <string name="TooltipOutboxNoTransfer">これらのオブジェクトは、再販したり譲渡することができません。</string>
+  <string name="TooltipOutboxNotInInventory">アイテムは、インベントリからマーケットプレイスへの移動のみできます。</string>
+  <string name="TooltipOutboxLinked">リンクされた相手またはフォルダは、マーケットプレイスに置くことはできません。</string>
+  <string name="TooltipOutboxCallingCard">コーリングカードは、マーケットプレイスに置くことはできません。</string>
+  <string name="TooltipOutboxDragActive">表示されているリストを移動できません。</string>
+  <string name="TooltipOutboxCannotMoveRoot">ルートフォルダをリストに表示するマーケットプレイスを移動できません。</string>
+  <string name="TooltipOutboxMixedStock">在庫フォルダ内のアイテムは、すべて同じ種類と権限でなければなりません。</string>
+
+  <string name="TooltipDragOntoOwnChild">フォルダをその子フォルダに移動することはできません。</string>
+  <string name="TooltipDragOntoSelf">フォルダをそのフォルダ自身に移動することはできません。</string>
+
+  <!-- tooltips for Urls -->
+  <string name="TooltipHttpUrl">クリックしてこのWebページを開きます。</string>
+  <string name="TooltipSLURL">クリックしてこの場所の情報を閲覧します。</string>
+  <string name="TooltipAgentUrl">クリックしてこの住人のプロフィールを閲覧します。</string>
+  <string name="TooltipAgentInspect">この住人の詳細を参照</string>
+  <string name="TooltipAgentMute">クリックしてこの住人に対して無視設定をします。</string>
+  <string name="TooltipAgentUnmute">クリックしてこの住人に対する無視設定を解除します。</string>
+  <string name="TooltipAgentIM">クリックしてこの住人に IM を送ります。</string>
+  <string name="TooltipAgentPay">クリックしてこの住人に支払います。</string>
+  <string name="TooltipAgentOfferTeleport">クリックしてこの住人にテレポートのオファーを送ります。</string>
+  <string name="TooltipAgentRequestFriend">クリックしてこの住人にフレンド登録リクエストを送ります。</string>
+  <string name="TooltipGroupUrl">クリックしてこのグループの説明文を閲覧します。</string>
+  <string name="TooltipEventUrl">クリックしてこのグループの説明文を閲覧します。</string>
+  <string name="TooltipClassifiedUrl">クリックしてこのクラシファイド広告を見ます。</string>
+  <string name="TooltipParcelUrl">クリックしてこの区画の説明文を見ます。</string>
+  <string name="TooltipTeleportUrl">クリックしてこの場所にテレポートします。</string>
+  <string name="TooltipObjectIMUrl">クリックしてこのオブジェクトの説明文を見ます。</string>
+  <string name="TooltipMapUrl">クリックしてこの場所をマップに表示します。</string>
+  <string name="TooltipSLAPP">クリックして secondlife:// コマンドを出します。</string>
+  <string name="CurrentURL" value="現在のＵＲＬ：[CurrentURL]" />
+  <string name="TooltipEmail">クリックして電子メールを作成します。</string>
+
+  <!-- text for SLURL labels -->
+  <string name="SLurlLabelTeleport">テレポート</string>
+  <string name="SLurlLabelShowOnMap">マップに表示</string>
+
+  <!-- label strings for secondlife:///app/agent SLapps -->
+  <string name="SLappAgentMute">無視</string>
+  <string name="SLappAgentUnmute">ミュート解除</string>
+  <string name="SLappAgentIM">ＩＭ</string>
+  <string name="SLappAgentPay">支払い</string>
+  <string name="SLappAgentOfferTeleport">次の場所へのテレポートのオファーを送ります：</string>
+  <string name="SLappAgentRequestFriend">フレンド登録リクエスト</string>
+  <string name="SLappAgentRemoveFriend">フレンドの削除</string>
+
+  <!-- ButtonToolTips, llfloater.cpp -->
+  <string name="BUTTON_CLOSE_DARWIN">閉じる（⌘W）</string>
+  <string name="BUTTON_CLOSE_WIN">閉じる（Ctrl＋W）</string>
+  <string name="BUTTON_CLOSE_CHROME">閉じる</string>
+  <string name="BUTTON_RESTORE">復帰</string>
+  <string name="BUTTON_MINIMIZE">元に戻す（縮小）</string>
+  <string name="BUTTON_TEAR_OFF">別ウィンドウで開く</string>
+  <string name="BUTTON_DOCK">ドッキング</string>
+  <string name="BUTTON_HELP">ヘルプを表示</string>
+
+  <!-- ToolTips for notecards -->
+  <string name="TooltipNotecardNotAllowedTypeDrop">このタイプのアイテムは、このリージョン（地域）のノートカードに添付することができません。</string>
+  <string name="TooltipNotecardOwnerRestrictedDrop">制限のない「次の所有者」の
 許可のみノートカードに
 添付できます。</string>
-	<string name="Searching">検索中...</string>
-	<string name="NoneFound">見つかりませんでした。</string>
-	<string name="RetrievingData">取得中...</string>
-	<string name="ReleaseNotes">リリースノート</string>
-	<string name="RELEASE_NOTES_BASE_URL">https://releasenotes.secondlife.com/viewer/</string>
-	<string name="LoadingData">ローディング...</string>
-	<string name="AvatarNameNobody">（なし）</string>
-	<string name="AvatarNameWaiting">（待機中）</string>
-	<string name="AvatarNameMultiple">（複数）</string>
-	<string name="GroupNameNone">（なし）</string>
-	<string name="AssetErrorNone">エラーなし</string>
-	<string name="AssetErrorRequestFailed">アセットリクエスト： 失敗</string>
-	<string name="AssetErrorNonexistentFile">アセットリクエスト： 存在しないファイル</string>
-	<string name="AssetErrorNotInDatabase">アセットリクエスト： データベースに見つかりませんでした</string>
-	<string name="AssetErrorEOF">終了</string>
-	<string name="AssetErrorCannotOpenFile">ファイルを開けません</string>
-	<string name="AssetErrorFileNotFound">ファイルが見つかりません</string>
-	<string name="AssetErrorTCPTimeout">ファイルの転送タイムアウト</string>
-	<string name="AssetErrorCircuitGone">サーキットエラー</string>
-	<string name="AssetErrorPriceMismatch">ビューワとサーバーの価格が一致していません</string>
-	<string name="AssetErrorUnknownStatus">不明のステータス</string>
-	<string name="AssetUploadServerUnreacheble">サービスがご利用いただけません。</string>
-	<string name="AssetUploadServerDifficulties">サーバーに予期せぬ問題が発生しました。</string>
-	<string name="AssetUploadServerUnavaliable">サービスがご利用いただけないか、アップロードがタイムアウトしました。</string>
-	<string name="AssetUploadRequestInvalid">アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート
-（http://secondlife.com/support）にお問い合わせください。</string>
-	<string name="SettingValidationError">インポートする設定 [NAME] の検証に失敗しました。</string>
-	<string name="SettingImportFileError">ファイル [FILE] を開くことができません</string>
-	<string name="SettingParseFileError">ファイル [FILE] を開くことができません</string>
-	<string name="SettingTranslateError">過去のウインドライト [NAME] を変換できません</string>
-	<string name="texture">テクスチャ</string>
-	<string name="sound">サウンド</string>
-	<string name="calling card">コーリングカード</string>
-	<string name="landmark">ランドマーク</string>
-	<string name="legacy script">レガシースクリプト</string>
-	<string name="clothing">衣類</string>
-	<string name="object">オブジェクト</string>
-	<string name="note card">ノートカード</string>
-	<string name="folder">フォルダ</string>
-	<string name="root">ルート</string>
-	<string name="lsl2 script">LSL2 スクリプト</string>
-	<string name="lsl bytecode">LSL バイトコード</string>
-	<string name="tga texture">tga テクスチャ</string>
-	<string name="body part">身体部位</string>
-	<string name="snapshot">スナップショット</string>
-	<string name="lost and found">紛失物</string>
-	<string name="targa image">targa 画像</string>
-	<string name="trash">ごみ箱</string>
-	<string name="jpeg image">jpeg 画像</string>
-	<string name="animation">アニメーション</string>
-	<string name="gesture">ジェスチャー</string>
-	<string name="simstate">統計</string>
-	<string name="favorite">お気に入り</string>
-	<string name="symbolic link">リンク</string>
-	<string name="symbolic folder link">フォルダのリンク</string>
-	<string name="settings blob">設定</string>
-	<string name="mesh">メッシュ</string>
-	<string name="AvatarEditingAppearance">（容姿の編集中）</string>
-	<string name="AvatarAway">一時退席中</string>
-	<string name="AvatarDoNotDisturb">通知を受けない</string>
-	<string name="AvatarMuted">ブロック中</string>
-	<string name="anim_express_afraid">怖れ</string>
-	<string name="anim_express_anger">怒り</string>
-	<string name="anim_away">退席中</string>
-	<string name="anim_backflip">後ろ宙返り</string>
-	<string name="anim_express_laugh">大笑い</string>
-	<string name="anim_express_toothsmile">満面の笑顔</string>
-	<string name="anim_blowkiss">投げキッス</string>
-	<string name="anim_express_bored">退屈</string>
-	<string name="anim_bow">おじぎ</string>
-	<string name="anim_clap">拍手</string>
-	<string name="anim_courtbow">深いおじぎ</string>
-	<string name="anim_express_cry">泣く</string>
-	<string name="anim_dance1">ダンス 1</string>
-	<string name="anim_dance2">ダンス 2</string>
-	<string name="anim_dance3">ダンス 3</string>
-	<string name="anim_dance4">ダンス 4</string>
-	<string name="anim_dance5">ダンス 5</string>
-	<string name="anim_dance6">ダンス 6</string>
-	<string name="anim_dance7">ダンス 7</string>
-	<string name="anim_dance8">ダンス 8</string>
-	<string name="anim_express_disdain">侮蔑</string>
-	<string name="anim_drink">酔っぱらう</string>
-	<string name="anim_express_embarrased">困惑</string>
-	<string name="anim_angry_fingerwag">指を振る</string>
-	<string name="anim_fist_pump">ガッツポーズ</string>
-	<string name="anim_yoga_float">ヨガ浮遊</string>
-	<string name="anim_express_frown">しかめっ面</string>
-	<string name="anim_impatient">いらいらする</string>
-	<string name="anim_jumpforjoy">飛び上がって喜ぶ</string>
-	<string name="anim_kissmybutt">挑発ポーズ</string>
-	<string name="anim_express_kiss">キス</string>
-	<string name="anim_laugh_short">笑う</string>
-	<string name="anim_musclebeach">力こぶを見せる</string>
-	<string name="anim_no_unhappy">不満げに否定する</string>
-	<string name="anim_no_head">否定する</string>
-	<string name="anim_nyanya">冷やかす</string>
-	<string name="anim_punch_onetwo">ワンツー・パンチ</string>
-	<string name="anim_express_open_mouth">口を開けて驚く</string>
-	<string name="anim_peace">ピース・サイン</string>
-	<string name="anim_point_you">他人を指差す</string>
-	<string name="anim_point_me">自分を指差す</string>
-	<string name="anim_punch_l">左パンチ</string>
-	<string name="anim_punch_r">右パンチ</string>
-	<string name="anim_rps_countdown">じゃんけんポーズ</string>
-	<string name="anim_rps_paper">パー</string>
-	<string name="anim_rps_rock">グー</string>
-	<string name="anim_rps_scissors">チョキ</string>
-	<string name="anim_express_repulsed">嫌悪感</string>
-	<string name="anim_kick_roundhouse_r">まわし蹴り</string>
-	<string name="anim_express_sad">悲しむ</string>
-	<string name="anim_salute">敬礼する</string>
-	<string name="anim_shout">叫ぶ</string>
-	<string name="anim_express_shrug">肩をすくめる</string>
-	<string name="anim_express_smile">微笑む</string>
-	<string name="anim_smoke_idle">たばこをくゆらす</string>
-	<string name="anim_smoke_inhale">たばこを吸う</string>
-	<string name="anim_smoke_throw_down">たばこを捨てる</string>
-	<string name="anim_express_surprise">驚く</string>
-	<string name="anim_sword_strike_r">剣で斬りつける</string>
-	<string name="anim_angry_tantrum">じだんだを踏む</string>
-	<string name="anim_express_tongue_out">舌を出す</string>
-	<string name="anim_hello">手を振る</string>
-	<string name="anim_whisper">小声で話す</string>
-	<string name="anim_whistle">口笛を吹く</string>
-	<string name="anim_express_wink">ウィンク</string>
-	<string name="anim_wink_hollywood">ウィンク(ハリウッド)</string>
-	<string name="anim_express_worry">心配する</string>
-	<string name="anim_yes_happy">笑顔で頷く</string>
-	<string name="anim_yes_head">頷く</string>
-	<string name="multiple_textures">複数</string>
-	<string name="use_texture">テクスチャを使用</string>
-	<string name="manip_hint1">マウスカーソルをルーラに合わせて</string>
-	<string name="manip_hint2">グリッドにスナップ</string>
-	<string name="texture_loading">ローディング...</string>
-	<string name="worldmap_offline">オフライン</string>
-	<string name="worldmap_item_tooltip_format">[AREA] 平方メートル L$[PRICE]</string>
-	<string name="worldmap_results_none_found">見つかりませんでした。</string>
-	<string name="Ok">OK</string>
-	<string name="Premature end of file">不完全なファイル</string>
-	<string name="ST_NO_JOINT">ROOT または JOINT が見つかりません</string>
-	<string name="NearbyChatTitle">近くのチャット</string>
-	<string name="NearbyChatLabel">(近くのチャット)</string>
-	<string name="whisper">のささやき:</string>
-	<string name="shout">の叫び:</string>
-	<string name="ringing">インワールドボイスチャットに接続中...</string>
-	<string name="connected">接続しました</string>
-	<string name="unavailable">現在地では、ボイスを利用できません。</string>
-	<string name="hang_up">インワールドボイスチャットの通話が切断されました</string>
-	<string name="reconnect_nearby">「近くのボイスチャット」に再接続されます</string>
-	<string name="ScriptQuestionCautionChatGranted">[REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を許可しました： [PERMISSIONS]</string>
-	<string name="ScriptQuestionCautionChatDenied">[REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を拒否しました： [PERMISSIONS]</string>
-	<string name="AdditionalPermissionsRequestHeader">あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：</string>
-	<string name="ScriptTakeMoney">リンデンドル（L$）を支払う</string>
-	<string name="ActOnControlInputs">制御入力に基づいて行動</string>
-	<string name="RemapControlInputs">制御入力のリマップ</string>
-	<string name="AnimateYourAvatar">アバターへのアニメーション動作</string>
-	<string name="AttachToYourAvatar">アバターに装着</string>
-	<string name="ReleaseOwnership">所有権を解放し公のものとする</string>
-	<string name="LinkAndDelink">他のオブジェクトのリンクとリンク解除</string>
-	<string name="AddAndRemoveJoints">他のオブジェクトとのジョイントの追加と削除</string>
-	<string name="ChangePermissions">権限の変更</string>
-	<string name="TrackYourCamera">カメラ追従</string>
-	<string name="ControlYourCamera">カメラのコントロール</string>
-	<string name="TeleportYourAgent">あなたをテレポート</string>
-	<string name="ForceSitAvatar">アバターを強制的に座らせる</string>
-	<string name="ChangeEnvSettings">自然環境の設定を変更する</string>
-	<string name="NotConnected">接続されていません</string>
-	<string name="AgentNameSubst">(あなた)</string>
-	<string name="JoinAnExperience"/>
-	<string name="SilentlyManageEstateAccess">土地のアクセスリストを管理するときにアラートを表示しない</string>
-	<string name="OverrideYourAnimations">デフォルトのアニメーションを置き換え</string>
-	<string name="ScriptReturnObjects">あなたの代わりにオブジェクトを返却</string>
-	<string name="UnknownScriptPermission">(不明)!</string>
-	<string name="SIM_ACCESS_PG">General</string>
-	<string name="SIM_ACCESS_MATURE">Moderate</string>
-	<string name="SIM_ACCESS_ADULT">Adult</string>
-	<string name="SIM_ACCESS_DOWN">オフライン</string>
-	<string name="SIM_ACCESS_MIN">不明</string>
-	<string name="land_type_unknown">（不明）</string>
-	<string name="Estate / Full Region">不動産 / フルリージョン</string>
-	<string name="Estate / Homestead">エステート/ホームステッド</string>
-	<string name="Mainland / Homestead">メインランド/ホームステッド</string>
-	<string name="Mainland / Full Region">メインランド / フルリージョン</string>
-	<string name="all_files">全てのファイル</string>
-	<string name="sound_files">サウンド</string>
-	<string name="animation_files">アニメーション</string>
-	<string name="image_files">画像</string>
-	<string name="save_file_verb">保存</string>
-	<string name="load_file_verb">ロード</string>
-	<string name="targa_image_files">Targa 画像</string>
-	<string name="bitmap_image_files">ビットマップ画像</string>
-	<string name="png_image_files">PNG 画像</string>
-	<string name="save_texture_image_files">Targa または PNG 画像</string>
-	<string name="avi_movie_file">AVI ムービーファイル</string>
-	<string name="xaf_animation_file">XAF アニメーションファイル</string>
-	<string name="xml_file">XML ファイル</string>
-	<string name="raw_file">RAW ファイル</string>
-	<string name="compressed_image_files">圧縮画像</string>
-	<string name="load_files">ファイルのロード</string>
-	<string name="choose_the_directory">参照</string>
-	<string name="script_files">スクリプト</string>
-	<string name="dictionary_files">辞書</string>
-	<string name="shape">シェイプ</string>
-	<string name="skin">スキン</string>
-	<string name="hair">髪</string>
-	<string name="eyes">目</string>
-	<string name="shirt">シャツ</string>
-	<string name="pants">パンツ</string>
-	<string name="shoes">靴</string>
-	<string name="socks">靴下</string>
-	<string name="jacket">ジャケット</string>
-	<string name="gloves">手袋</string>
-	<string name="undershirt">下着シャツ</string>
-	<string name="underpants">下着パンツ</string>
-	<string name="skirt">スカート</string>
-	<string name="alpha">アルファ</string>
-	<string name="tattoo">タトゥ</string>
-	<string name="universal">ユニバーサル</string>
-	<string name="physics">物理作用</string>
-	<string name="invalid">無効</string>
-	<string name="none">なし</string>
-	<string name="shirt_not_worn">シャツ未着用</string>
-	<string name="pants_not_worn">パンツ未着用</string>
-	<string name="shoes_not_worn">靴未着用</string>
-	<string name="socks_not_worn">靴下未着用</string>
-	<string name="jacket_not_worn">ジャケット未着用</string>
-	<string name="gloves_not_worn">手袋未着用</string>
-	<string name="undershirt_not_worn">下着（上）未着用</string>
-	<string name="underpants_not_worn">下着（下）未着用</string>
-	<string name="skirt_not_worn">スカート未着用</string>
-	<string name="alpha_not_worn">アルファ未着用</string>
-	<string name="tattoo_not_worn">タトゥー未着用</string>
-	<string name="universal_not_worn">ユニバーサルなし</string>
-	<string name="physics_not_worn">物理作用なし</string>
-	<string name="invalid_not_worn">無効</string>
-	<string name="create_new_shape">新しいシェイプを作成</string>
-	<string name="create_new_skin">新しいスキンを作成</string>
-	<string name="create_new_hair">新しい髪を作成</string>
-	<string name="create_new_eyes">新しい目を作成</string>
-	<string name="create_new_shirt">新しいシャツを作成</string>
-	<string name="create_new_pants">新しいパンツを作成</string>
-	<string name="create_new_shoes">新しい靴を作成</string>
-	<string name="create_new_socks">新しい靴下を作成</string>
-	<string name="create_new_jacket">新しい上着を作成</string>
-	<string name="create_new_gloves">新しい手袋を作成</string>
-	<string name="create_new_undershirt">新しい下着シャツを作成</string>
-	<string name="create_new_underpants">新しい下着パンツを作成</string>
-	<string name="create_new_skirt">新しいスカートを作成</string>
-	<string name="create_new_alpha">新しいアルファを作成</string>
-	<string name="create_new_tattoo">新しいタトゥを作成</string>
-	<string name="create_new_universal">新しいユニバーサルを作成</string>
-	<string name="create_new_physics">新しい物理作用を作成</string>
-	<string name="create_new_invalid">無効</string>
-	<string name="NewWearable">新しい [WEARABLE_ITEM]</string>
-	<string name="next">次へ</string>
-	<string name="ok">OK</string>
-	<string name="GroupNotifyGroupNotice">グループ通知</string>
-	<string name="GroupNotifyGroupNotices">グループ通知</string>
-	<string name="GroupNotifySentBy">送信者</string>
-	<string name="GroupNotifyAttached">添付：</string>
-	<string name="GroupNotifyViewPastNotices">ここで過去の通知を表示するか、メッセージを受け取らない設定をします。</string>
-	<string name="GroupNotifyOpenAttachment">添付アイテムを開く</string>
-	<string name="GroupNotifySaveAttachment">添付アイテムを保存</string>
-	<string name="TeleportOffer">テレポートを送る</string>
-	<string name="StartUpNotifications">不在中に新しい通知が届きました。</string>
-	<string name="OverflowInfoChannelString">あなたにはさらに %d 通の通知があります</string>
-	<string name="BodyPartsRightArm">右腕</string>
-	<string name="BodyPartsHead">頭</string>
-	<string name="BodyPartsLeftArm">左腕</string>
-	<string name="BodyPartsLeftLeg">左脚</string>
-	<string name="BodyPartsTorso">上半身</string>
-	<string name="BodyPartsRightLeg">右脚</string>
-	<string name="BodyPartsEnhancedSkeleton">拡張スケルトン</string>
-	<string name="GraphicsQualityLow">低</string>
-	<string name="GraphicsQualityMid">中</string>
-	<string name="GraphicsQualityHigh">高</string>
-	<string name="LeaveMouselook">ESC キーを押してワールドビューに戻ります</string>
-	<string name="InventoryNoMatchingItems">お探しのものは見つかりましたか？ [secondlife:///app/search/all/[SEARCH_TERM] 検索] をお試しください。</string>
-	<string name="InventoryNoMatchingRecentItems">お探しのものは見つかりましたか？[secondlife:///app/inventory/filters Show filters] をお試しください。</string>
-	<string name="PlacesNoMatchingItems">お探しのものは見つかりましたか？ [secondlife:///app/search/places/[SEARCH_TERM] 検索] をお試しください。</string>
-	<string name="FavoritesNoMatchingItems">ここにランドマークをドラッグしてお気に入りに追加します。</string>
-	<string name="MarketplaceNoMatchingItems">アイテムが見つかりませんでした。検索文字列のスペルを確認して、もう一度やり直してください。</string>
-	<string name="InventoryNoTexture">インベントリ内にこのテクスチャのコピーがありません</string>
-	<string name="InventoryInboxNoItems">マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。</string>
-	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3</string>
-	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
-	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
-	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
-	<string name="InventoryPlayAnimationTooltip">[再生] オプションでウィンドウを開ける。</string>
-	<string name="InventoryPlayGestureTooltip">インワールドで選択済みのジェスチャーを実行する。</string>
-	<string name="InventoryPlaySoundTooltip">[再生] オプションでウィンドウを開ける。</string>
-	<string name="InventoryOutboxNotMerchantTitle">マーケットプレイスでは誰でもアイテムを売ることができます。</string>
-	<string name="InventoryOutboxNotMerchantTooltip"/>
-	<string name="InventoryOutboxNotMerchant">マーチャントになりたい方は、[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストアを作成]する必要があります。</string>
-	<string name="InventoryOutboxNoItemsTitle">アウトボックスは空です。</string>
-	<string name="InventoryOutboxNoItemsTooltip"/>
-	<string name="InventoryOutboxNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグし、「マーケットプレイスに送信」をクリックします。</string>
-	<string name="InventoryOutboxInitializingTitle">マーケットプレイスの初期化。</string>
-	<string name="InventoryOutboxInitializing">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア] のアカウントにアクセスしています。</string>
-	<string name="InventoryOutboxErrorTitle">マーケットプレイス エラー。</string>
-	<string name="InventoryOutboxError">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア] がエラーを返しています。</string>
-	<string name="InventoryMarketplaceError">マーケットプレイスのリストを開くときにエラーが発生しました。引き続きこのメッセージを受信するには、Second Life のサポート (http://support.secondlife.com) にお問い合わせください</string>
-	<string name="InventoryMarketplaceListingsNoItemsTitle">マーケットプレイスのリストフォルダが空です。</string>
-	<string name="InventoryMarketplaceListingsNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。</string>
-	<string name="InventoryItemsCount">（[ITEMS_COUNT] 個のアイテム）</string>
-	<string name="Marketplace Validation Warning Stock">バージョンフォルダに在庫フォルダが含まれなければなりません</string>
-	<string name="Marketplace Validation Error Mixed Stock">: エラー：在庫フォルダ内のすべてのアイテムはコピー不可で同じ種類でなければなりません</string>
-	<string name="Marketplace Validation Error Subfolder In Stock">: エラー：在庫フォルダにサブフォルダを含めることはできません</string>
-	<string name="Marketplace Validation Warning Empty">: 警告：フォルダにアイテムが含まれていません</string>
-	<string name="Marketplace Validation Warning Create Stock">: 警告：在庫フォルダを作成しています</string>
-	<string name="Marketplace Validation Warning Create Version">: 警告：バージョンフォルダ作成中</string>
-	<string name="Marketplace Validation Warning Move">: 警告：アイテム移動中</string>
-	<string name="Marketplace Validation Warning Delete">: 警告：フォルダの中身が在庫フォルダに移されました。空のフォルダを削除します</string>
-	<string name="Marketplace Validation Error Stock Item">: エラー：在庫フォルダにコピー不可アイテムを含める必要があります</string>
-	<string name="Marketplace Validation Warning Unwrapped Item">: 警告：バージョンフォルダにアイテムが含まれていなければなりません</string>
-	<string name="Marketplace Validation Error">: エラー：</string>
-	<string name="Marketplace Validation Warning">: 警告：</string>
-	<string name="Marketplace Validation Error Empty Version">: 警告：バージョンフォルダには、最低 1 アイテムが含まれなければなりません</string>
-	<string name="Marketplace Validation Error Empty Stock">: 警告：在庫フォルダには、最低 1 アイテムが含まれていなければなりません</string>
-	<string name="Marketplace Validation No Error">報告するエラーまたは警告はありません</string>
-	<string name="Marketplace Error None">エラーなし</string>
-	<string name="Marketplace Error Prefix">エラー：</string>
-	<string name="Marketplace Error Not Merchant">マーケットプレイスに商品を送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。</string>
-	<string name="Marketplace Error Not Accepted">アイテムをそのフォルダに移動できません。</string>
-	<string name="Marketplace Error Unsellable Item">このアイテムをマーケットプレイスで販売することはできません。</string>
-	<string name="MarketplaceNoID">Mkt ID なし</string>
-	<string name="MarketplaceLive">リスト掲載済み</string>
-	<string name="MarketplaceActive">有効</string>
-	<string name="MarketplaceMax">最大</string>
-	<string name="MarketplaceStock">在庫</string>
-	<string name="MarketplaceNoStock">在庫なし</string>
-	<string name="MarketplaceUpdating">アップデート中...</string>
-	<string name="UploadFeeInfo">費用はサブスクリプションのレベルにより異なります。レベルが高いほど費用が下がります。[https://secondlife.com/my/account/membership.php? 詳細]</string>
-	<string name="Open landmarks">オープン ランドマーク</string>
-	<string name="Unconstrained">アンコンストレインド（制約なし）</string>
-	<string name="no_transfer" value=" （再販・プレゼント不可）"/>
-	<string name="no_modify" value=" （編集不可）"/>
-	<string name="no_copy" value=" （コピー不可）"/>
-	<string name="worn" value=" （着用中）"/>
-	<string name="link" value=" （リンク）"/>
-	<string name="broken_link" value=" （壊れたリンク）"/>
-	<string name="LoadingContents">コンテンツをロード中です...</string>
-	<string name="NoContents">コンテンツなし</string>
-	<string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT] に装着中）"/>
-	<string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
-	<string name="ActiveGesture" value="[GESLABEL] （アクティブ）"/>
-	<string name="PermYes">はい</string>
-	<string name="PermNo">いいえ</string>
-	<string name="Chat Message" value="チャット："/>
-	<string name="Sound" value=" サウンド："/>
-	<string name="Wait" value=" --- 待機：:"/>
-	<string name="AnimFlagStop" value=" アニメーションを停止："/>
-	<string name="AnimFlagStart" value=" アニメーションを開始："/>
-	<string name="Wave" value=" 手を振る"/>
-	<string name="GestureActionNone" value="なし"/>
-	<string name="HelloAvatar" value=" やあ、アバター！"/>
-	<string name="ViewAllGestures" value="  すべて表示 &gt;&gt;"/>
-	<string name="GetMoreGestures" value="ショッピング &gt;&gt;"/>
-	<string name="Animations" value="アニメーション、"/>
-	<string name="Calling Cards" value="コーリングカード、"/>
-	<string name="Clothing" value="衣類、"/>
-	<string name="Gestures" value="ジェスチャー、"/>
-	<string name="Landmarks" value="ランドマーク、"/>
-	<string name="Notecards" value="ノートカード、"/>
-	<string name="Objects" value="オブジェクト、"/>
-	<string name="Scripts" value="スクリプト、"/>
-	<string name="Sounds" value="サウンド、"/>
-	<string name="Textures" value="テクスチャ、"/>
-	<string name="Snapshots" value="スナップショット、"/>
-	<string name="No Filters" value="いいえ "/>
-	<string name="Since Logoff" value=" - ログオフ以来"/>
-	<string name="InvFolder My Inventory">インベントリ</string>
-	<string name="InvFolder Library">ライブラリ</string>
-	<string name="InvFolder Textures">テクスチャ</string>
-	<string name="InvFolder Sounds">サウンド</string>
-	<string name="InvFolder Calling Cards">コーリングカード</string>
-	<string name="InvFolder Landmarks">ランドマーク</string>
-	<string name="InvFolder Scripts">スクリプト</string>
-	<string name="InvFolder Clothing">衣類</string>
-	<string name="InvFolder Objects">オブジェクト</string>
-	<string name="InvFolder Notecards">ノートカード</string>
-	<string name="InvFolder New Folder">新規フォルダ</string>
-	<string name="InvFolder Inventory">インベントリ</string>
-	<string name="InvFolder Uncompressed Images">圧縮されていない画像</string>
-	<string name="InvFolder Body Parts">身体部位</string>
-	<string name="InvFolder Trash">ごみ箱</string>
-	<string name="InvFolder Photo Album">フォトアルバム</string>
-	<string name="InvFolder Lost And Found">紛失物</string>
-	<string name="InvFolder Uncompressed Sounds">圧縮されていないサウンド</string>
-	<string name="InvFolder Animations">アニメーション</string>
-	<string name="InvFolder Gestures">ジェスチャー</string>
-	<string name="InvFolder Favorite">お気に入り</string>
-	<string name="InvFolder favorite">お気に入り</string>
-	<string name="InvFolder Favorites">お気に入り</string>
-	<string name="InvFolder favorites">お気に入り</string>
-	<string name="InvFolder Current Outfit">着用中のアウトフィット</string>
-	<string name="InvFolder Initial Outfits">最初のアウトフィット</string>
-	<string name="InvFolder My Outfits">マイ アウトフィット</string>
-	<string name="InvFolder Accessories">アクセサリ</string>
-	<string name="InvFolder Meshes">メッシュ</string>
-	<string name="InvFolder Received Items">受け取った商品</string>
-	<string name="InvFolder Merchant Outbox">マーチャントのアウトボックス</string>
-	<string name="InvFolder Friends">フレンド</string>
-	<string name="InvFolder All">全員</string>
-	<string name="no_attachments">着用しているアタッチメントはありません</string>
-	<string name="Attachments remain">アタッチメント（残りのスロット数：[COUNT]）</string>
-	<string name="Buy">買う</string>
-	<string name="BuyforL$">L$ で購入</string>
-	<string name="Stone">石</string>
-	<string name="Metal">金属</string>
-	<string name="Glass">ガラス</string>
-	<string name="Wood">木</string>
-	<string name="Flesh">肌</string>
-	<string name="Plastic">プラスチック</string>
-	<string name="Rubber">ゴム</string>
-	<string name="Light">ライト</string>
-	<string name="KBShift">Shift</string>
-	<string name="KBCtrl">Ctrl</string>
-	<string name="Chest">胸部</string>
-	<string name="Skull">頭蓋</string>
-	<string name="Left Shoulder">左肩</string>
-	<string name="Right Shoulder">右肩</string>
-	<string name="Left Hand">左手</string>
-	<string name="Right Hand">右手</string>
-	<string name="Left Foot">左足</string>
-	<string name="Right Foot">右足</string>
-	<string name="Spine">背骨</string>
-	<string name="Pelvis">骨盤</string>
-	<string name="Mouth">口</string>
-	<string name="Chin">あご</string>
-	<string name="Left Ear">左耳</string>
-	<string name="Right Ear">右耳</string>
-	<string name="Left Eyeball">左目眼球</string>
-	<string name="Right Eyeball">右目眼球</string>
-	<string name="Nose">鼻</string>
-	<string name="R Upper Arm">右上腕</string>
-	<string name="R Forearm">右前腕</string>
-	<string name="L Upper Arm">左上腕</string>
-	<string name="L Forearm">左前腕</string>
-	<string name="Right Hip">右腰</string>
-	<string name="R Upper Leg">右上脚</string>
-	<string name="R Lower Leg">右下脚</string>
-	<string name="Left Hip">左腰</string>
-	<string name="L Upper Leg">左上脚</string>
-	<string name="L Lower Leg">左下脚</string>
-	<string name="Stomach">腹</string>
-	<string name="Left Pec">左胸筋</string>
-	<string name="Right Pec">右胸筋</string>
-	<string name="Neck">首</string>
-	<string name="Avatar Center">アバターの中央</string>
-	<string name="Left Ring Finger">左薬指</string>
-	<string name="Right Ring Finger">右薬指</string>
-	<string name="Tail Base">しっぽのベース</string>
-	<string name="Tail Tip">しっぽの先</string>
-	<string name="Left Wing">左の翼</string>
-	<string name="Right Wing">右の翼</string>
-	<string name="Jaw">顎</string>
-	<string name="Alt Left Ear">代わりの左耳</string>
-	<string name="Alt Right Ear">代わりの右耳</string>
-	<string name="Alt Left Eye">代わりの左目</string>
-	<string name="Alt Right Eye">代わりの右目</string>
-	<string name="Tongue">舌</string>
-	<string name="Groin">脚の付け根</string>
-	<string name="Left Hind Foot">左後足</string>
-	<string name="Right Hind Foot">右後足</string>
-	<string name="Invalid Attachment">装着先が正しくありません</string>
-	<string name="ATTACHMENT_MISSING_ITEM">エラー：アイテムが見つかりません</string>
-	<string name="ATTACHMENT_MISSING_BASE_ITEM">エラー：ベースアイテムが見つかりません</string>
-	<string name="ATTACHMENT_NOT_ATTACHED">エラー：オブジェクトは現在のアウトフィット内にありますが、添付されていません</string>
-	<string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS]</string>
-	<string name="YearsOld">[AGEYEARS]</string>
-	<string name="MonthsOld">[AGEMONTHS]</string>
-	<string name="WeeksOld">[AGEWEEKS]</string>
-	<string name="DaysOld">[AGEDAYS]</string>
-	<string name="TodayOld">今日参加</string>
-	<string name="av_render_everyone_now">全員にあなたが見えるようになりました。</string>
-	<string name="av_render_not_everyone">あなたのまわりの一部の人には、あなたが見えない可能性があります。</string>
-	<string name="av_render_over_half">あなたの周囲の半分以上の人に、あなたが表示されない可能性があります。</string>
-	<string name="av_render_most_of">あなたのまわりのほとんどの人に、あなたが見えない可能性があります。</string>
-	<string name="av_render_anyone">あなたのまわりの誰にもあなたが見えない可能性があります。</string>
-	<string name="hud_description_total">ご利用の HUD</string>
-	<string name="hud_name_with_joint">[OBJ_NAME]（[JNT_NAME] に装着中）</string>
-	<string name="hud_render_memory_warning">[HUD_DETAILS] はたくさんのテクスチャメモリを使用します</string>
-	<string name="hud_render_cost_warning">[HUD_DETAILS] には高価なオブジェクトやテクスチャがたくさん含まれています</string>
-	<string name="hud_render_heavy_textures_warning">[HUD_DETAILS] は大きなテクスチャがたくさん含まれています</string>
-	<string name="hud_render_cramped_warning">[HUD_DETAILS] に含まれるオブジェクトが多すぎます</string>
-	<string name="hud_render_textures_warning">[HUD_DETAILS] に含まれるテクスチャが多すぎます</string>
-	<string name="AgeYearsA">[COUNT] 年</string>
-	<string name="AgeYearsB">[COUNT] 年</string>
-	<string name="AgeYearsC">[COUNT] 年</string>
-	<string name="AgeMonthsA">[COUNT] ヶ月</string>
-	<string name="AgeMonthsB">[COUNT] ヶ月</string>
-	<string name="AgeMonthsC">[COUNT] ヶ月</string>
-	<string name="AgeWeeksA">[COUNT] 週間</string>
-	<string name="AgeWeeksB">[COUNT] 週間</string>
-	<string name="AgeWeeksC">[COUNT] 週間</string>
-	<string name="AgeDaysA">[COUNT] 日間</string>
-	<string name="AgeDaysB">[COUNT] 日間</string>
-	<string name="AgeDaysC">[COUNT] 日間</string>
-	<string name="GroupMembersA">[COUNT] 人</string>
-	<string name="GroupMembersB">[COUNT] 人</string>
-	<string name="GroupMembersC">[COUNT] 人</string>
-	<string name="AcctTypeResident">住人</string>
-	<string name="AcctTypeTrial">トライアル</string>
-	<string name="AcctTypeCharterMember">創立メンバー</string>
-	<string name="AcctTypeEmployee">Linden Lab 従業員</string>
-	<string name="PaymentInfoUsed">支払情報使用履歴あり</string>
-	<string name="PaymentInfoOnFile">支払情報登録済</string>
-	<string name="NoPaymentInfoOnFile">支払情報未登録</string>
-	<string name="AgeVerified">年齢確認済</string>
-	<string name="NotAgeVerified">年齢未確認</string>
-	<string name="Center 2">中心 2</string>
-	<string name="Top Right">右上</string>
-	<string name="Top">上部</string>
-	<string name="Top Left">左上</string>
-	<string name="Center">中心</string>
-	<string name="Bottom Left">左下</string>
-	<string name="Bottom">下部</string>
-	<string name="Bottom Right">右下</string>
-	<string name="CompileQueueDownloadedCompiling">ダウンロード完了、コンパイル中</string>
-	<string name="CompileQueueServiceUnavailable">スクリプト コンパイル サービスを利用できません</string>
-	<string name="CompileQueueScriptNotFound">サーバー上にスクリプトが見つかりません。</string>
-	<string name="CompileQueueProblemDownloading">ダウンロードに問題があります</string>
-	<string name="CompileQueueInsufficientPermDownload">権限不足のためスクリプトをダウンロードできません。</string>
-	<string name="CompileQueueInsufficientPermFor">権限不足：</string>
-	<string name="CompileQueueUnknownFailure">原因不明の失敗によりダウンロードができません</string>
-	<string name="CompileNoExperiencePerm">[EXPERIENCE] 体験による [SCRIPT] スクリプトのスキップ。</string>
-	<string name="CompileQueueTitle">リコンパイル進行</string>
-	<string name="CompileQueueStart">リコンパイル</string>
-	<string name="ResetQueueTitle">進行をリセット</string>
-	<string name="ResetQueueStart">リセット</string>
-	<string name="RunQueueTitle">実行を続けるよう設定</string>
-	<string name="RunQueueStart">実行中に設定</string>
-	<string name="NotRunQueueTitle">実行を停止するよう設定</string>
-	<string name="NotRunQueueStart">実行停止に設定</string>
-	<string name="CompileSuccessful">コンパイルが完了しました！</string>
-	<string name="CompileSuccessfulSaving">コンパイル完了、保存中です...</string>
-	<string name="SaveComplete">保存完了。</string>
-	<string name="UploadFailed">ファイルのアップロードが失敗しました:</string>
-	<string name="ObjectOutOfRange">スクリプト（オブジェクトが範囲外にあります）</string>
-	<string name="ScriptWasDeleted">スクリプト（インベントリから削除済み）</string>
-	<string name="GodToolsObjectOwnedBy">[OWNER] 所有のオブジェクト「[OBJECT]」</string>
-	<string name="GroupsNone">なし</string>
-	<string name="Group" value=" （グループ）"/>
-	<string name="Unknown">（不明）</string>
-	<string name="SummaryForTheWeek" value="今週のまとめ。開始日は"/>
-	<string name="NextStipendDay" value="です。次回のお小遣い支給日："/>
-	<string name="GroupPlanningDate">[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc]</string>
-	<string name="GroupIndividualShare" value="                      グループ       個人の割り当て"/>
-	<string name="GroupColumn" value="グループの設定"/>
-	<string name="Balance">残高</string>
-	<string name="Credits">収入</string>
-	<string name="Debits">支出</string>
-	<string name="Total">合計</string>
-	<string name="NoGroupDataFound">グループのデータが見つかりませんでした</string>
-	<string name="IMParentEstate">parent estate</string>
-	<string name="IMMainland">メインランド</string>
-	<string name="IMTeen">ティーン</string>
-	<string name="Anyone">全員</string>
-	<string name="RegionInfoError">エラー</string>
-	<string name="RegionInfoAllEstatesOwnedBy">[OWNER] が所有するすべての不動産</string>
-	<string name="RegionInfoAllEstatesYouOwn">あなたが所有するすべての不動産</string>
-	<string name="RegionInfoAllEstatesYouManage">あなたが [OWNER] のために管理するすべての不動産</string>
-	<string name="RegionInfoAllowedResidents">常に許可：（[ALLOWEDAGENTS] 人、最大 [MAXACCESS] 人）</string>
-	<string name="RegionInfoAllowedGroups">グループを常に許可：（[ALLOWEDGROUPS]、最大 [MAXACCESS]）</string>
-	<string name="RegionInfoBannedResidents">常に禁止：（[BANNEDAGENTS] 人、最大 [MAXBANNED] 人）</string>
-	<string name="RegionInfoListTypeAllowedAgents">常に許可</string>
-	<string name="RegionInfoListTypeBannedAgents">常に禁止</string>
-	<string name="RegionInfoAllEstates">すべての不動産</string>
-	<string name="RegionInfoManagedEstates">管理されている不動産</string>
-	<string name="RegionInfoThisEstate">この不動産</string>
-	<string name="AndNMore">および [EXTRA_COUNT] つの不動産</string>
-	<string name="ScriptLimitsParcelScriptMemory">区画スクリプトメモリ</string>
-	<string name="ScriptLimitsParcelsOwned">区画一覧： [PARCELS]</string>
-	<string name="ScriptLimitsMemoryUsed">使用されたメモリ： [MAX] kb 中 [COUNT] kb：[AVAILABLE] kb 利用可</string>
-	<string name="ScriptLimitsMemoryUsedSimple">使用されたメモリ： [COUNT] kb</string>
-	<string name="ScriptLimitsParcelScriptURLs">区画のスクリプトURL</string>
-	<string name="ScriptLimitsURLsUsed">使用された URL： [MAX] 中 [COUNT] ：[AVAILABLE] 利用可</string>
-	<string name="ScriptLimitsURLsUsedSimple">使用された URL： [COUNT]</string>
-	<string name="ScriptLimitsRequestError">情報のリクエスト中にエラーが発生しました</string>
-	<string name="ScriptLimitsRequestNoParcelSelected">区画が選択されていません。</string>
-	<string name="ScriptLimitsRequestWrongRegion">エラー： スクリプト情報は現在地のみ取得できます</string>
-	<string name="ScriptLimitsRequestWaiting">情報を取得中...</string>
-	<string name="ScriptLimitsRequestDontOwnParcel">この区画を調査する権限がありません。</string>
-	<string name="SITTING_ON">着席中</string>
-	<string name="ATTACH_CHEST">胸部</string>
-	<string name="ATTACH_HEAD">頭蓋</string>
-	<string name="ATTACH_LSHOULDER">左肩</string>
-	<string name="ATTACH_RSHOULDER">右肩</string>
-	<string name="ATTACH_LHAND">左手</string>
-	<string name="ATTACH_RHAND">右手</string>
-	<string name="ATTACH_LFOOT">左足</string>
-	<string name="ATTACH_RFOOT">右足</string>
-	<string name="ATTACH_BACK">背骨</string>
-	<string name="ATTACH_PELVIS">骨盤</string>
-	<string name="ATTACH_MOUTH">口</string>
-	<string name="ATTACH_CHIN">あご</string>
-	<string name="ATTACH_LEAR">左耳</string>
-	<string name="ATTACH_REAR">右耳</string>
-	<string name="ATTACH_LEYE">左目</string>
-	<string name="ATTACH_REYE">右目</string>
-	<string name="ATTACH_NOSE">鼻</string>
-	<string name="ATTACH_RUARM">右腕（上）</string>
-	<string name="ATTACH_RLARM">右前腕</string>
-	<string name="ATTACH_LUARM">左腕（上）</string>
-	<string name="ATTACH_LLARM">左前腕</string>
-	<string name="ATTACH_RHIP">右腰</string>
-	<string name="ATTACH_RULEG">右脚（上）</string>
-	<string name="ATTACH_RLLEG">右脚（下）</string>
-	<string name="ATTACH_LHIP">左腰</string>
-	<string name="ATTACH_LULEG">左脚（上）</string>
-	<string name="ATTACH_LLLEG">左脚（下）</string>
-	<string name="ATTACH_BELLY">腹</string>
-	<string name="ATTACH_LEFT_PEC">左胸筋</string>
-	<string name="ATTACH_RIGHT_PEC">右胸筋</string>
-	<string name="ATTACH_HUD_CENTER_2">HUD（中央 2）</string>
-	<string name="ATTACH_HUD_TOP_RIGHT">HUD（右上）</string>
-	<string name="ATTACH_HUD_TOP_CENTER">HUD（上・中央）</string>
-	<string name="ATTACH_HUD_TOP_LEFT">HUD（左上）</string>
-	<string name="ATTACH_HUD_CENTER_1">HUD（中央 1）</string>
-	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD（左下）</string>
-	<string name="ATTACH_HUD_BOTTOM">HUD（下）</string>
-	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD（右下）</string>
-	<string name="ATTACH_NECK">首</string>
-	<string name="ATTACH_AVATAR_CENTER">アバターの中央</string>
-	<string name="ATTACH_LHAND_RING1">左薬指</string>
-	<string name="ATTACH_RHAND_RING1">右薬指</string>
-	<string name="ATTACH_TAIL_BASE">しっぽのベース</string>
-	<string name="ATTACH_TAIL_TIP">しっぽの先</string>
-	<string name="ATTACH_LWING">左の翼</string>
-	<string name="ATTACH_RWING">右の翼</string>
-	<string name="ATTACH_FACE_JAW">顎</string>
-	<string name="ATTACH_FACE_LEAR">代わりの左耳</string>
-	<string name="ATTACH_FACE_REAR">代わりの右耳</string>
-	<string name="ATTACH_FACE_LEYE">代わりの左目</string>
-	<string name="ATTACH_FACE_REYE">代わりの右目</string>
-	<string name="ATTACH_FACE_TONGUE">舌</string>
-	<string name="ATTACH_GROIN">脚の付け根</string>
-	<string name="ATTACH_HIND_LFOOT">左後足</string>
-	<string name="ATTACH_HIND_RFOOT">右後足</string>
-	<string name="CursorPos">[LINE] 行目、[COLUMN] 列目</string>
-	<string name="PanelDirCountFound">[COUNT] 件見つかりました</string>
-	<string name="PanelDirTimeStr">[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]</string>
-	<string name="PanelDirEventsDateText">[mthnum,datetime,slt]/[day,datetime,slt]</string>
-	<string name="PanelContentsTooltip">オブジェクトの中身</string>
-	<string name="PanelContentsNewScript">新規スクリプト</string>
-	<string name="DoNotDisturbModeResponseDefault">この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。</string>
-	<string name="MuteByName">（名称別）</string>
-	<string name="MuteAgent">（住人）</string>
-	<string name="MuteObject">（オブジェクト）</string>
-	<string name="MuteGroup">（グループ）</string>
-	<string name="MuteExternal">（外部）</string>
-	<string name="RegionNoCovenant">この不動産には約款がありません。</string>
-	<string name="RegionNoCovenantOtherOwner">この不動産には約款がありません。 この不動産上の土地は不動産所有者により販売され、Linden Lab は販売しません。  販売に関するお問い合わせは、不動産所有者までお願い致します。</string>
-	<string name="covenant_last_modified" value="最終修正日："/>
-	<string name="none_text" value=" （なし） "/>
-	<string name="never_text" value=" （無） "/>
-	<string name="GroupOwned">グループ所有</string>
-	<string name="Public">パブリック</string>
-	<string name="LocalSettings">ローカル設定</string>
-	<string name="RegionSettings">リージョン（地域）の設定</string>
-	<string name="NoEnvironmentSettings">このリージョンは環境設定をサポートしていません。</string>
-	<string name="EnvironmentSun">太陽</string>
-	<string name="EnvironmentMoon">月</string>
-	<string name="EnvironmentBloom">花</string>
-	<string name="EnvironmentCloudNoise">雲の音</string>
-	<string name="EnvironmentNormalMap">ノーマル・マップ</string>
-	<string name="EnvironmentTransparent">Transparent</string>
-	<string name="ClassifiedClicksTxt">クリック数： [TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール</string>
-	<string name="ClassifiedUpdateAfterPublish">（掲載後更新）</string>
-	<string name="NoPicksClassifiedsText">ピックやクラシファイド広告を作成していません。 作成するには、下にある「プラス」ボタンをクリックします。</string>
-	<string name="NoPicksText">ピックを作成していません。[新規] ボタンをクリックしてピックを作成する。</string>
-	<string name="NoClassifiedsText">クラシファイド広告を作成していません。[新規] ボタンをクリックしてクラシファイド広告を作成する。</string>
-	<string name="NoAvatarPicksClassifiedsText">ピック、またはクラシファイド広告がありません</string>
-	<string name="NoAvatarPicksText">ピックがありません</string>
-	<string name="NoAvatarClassifiedsText">クラシファイド広告がありません</string>
-	<string name="PicksClassifiedsLoadingText">ローディング...</string>
-	<string name="MultiPreviewTitle">プレビュー</string>
-	<string name="MultiPropertiesTitle">プロパティ</string>
-	<string name="InvOfferAnObjectNamed">オブジェクト名</string>
-	<string name="InvOfferOwnedByGroup">所有グループ</string>
-	<string name="InvOfferOwnedByUnknownGroup">不明なグループ所有</string>
-	<string name="InvOfferOwnedBy">所有者</string>
-	<string name="InvOfferOwnedByUnknownUser">不明なユーザー所有</string>
-	<string name="InvOfferGaveYou">が渡しました</string>
-	<string name="InvOfferDecline">&lt;nolink&gt;[NAME]&lt;/nolink&gt; からの [DESC] を拒否しました。</string>
-	<string name="GroupMoneyTotal">合計</string>
-	<string name="GroupMoneyBought">購入：</string>
-	<string name="GroupMoneyPaidYou">あなたに支払い：</string>
-	<string name="GroupMoneyPaidInto">paid into</string>
-	<string name="GroupMoneyBoughtPassTo">入場許可を購入：</string>
-	<string name="GroupMoneyPaidFeeForEvent">がイベント用の費用を支払いました</string>
-	<string name="GroupMoneyPaidPrizeForEvent">がイベント用の賞金を支払いました</string>
-	<string name="GroupMoneyBalance">残高</string>
-	<string name="GroupMoneyCredits">収入</string>
-	<string name="GroupMoneyDebits">支出</string>
-	<string name="GroupMoneyDate">[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]</string>
-	<string name="AcquiredItems">取得アイテム</string>
-	<string name="Cancel">キャンセル</string>
-	<string name="UploadingCosts">[NAME] のアップロード料金は L$[AMOUNT] です</string>
-	<string name="BuyingCosts">これを L$[AMOUNT] で購入します</string>
-	<string name="UnknownFileExtension">不明の拡張子： %s
-使用可能な拡張子： .wav, .tga, .bmp, .jpg, .jpeg, or .bvh</string>
-	<string name="MuteObject2">ブロック</string>
-	<string name="MuteAvatar">ブロック</string>
-	<string name="UnmuteObject">ブロック解除</string>
-	<string name="UnmuteAvatar">ブロック解除</string>
-	<string name="AddLandmarkNavBarMenu">マイ ランドマークに追加...</string>
-	<string name="EditLandmarkNavBarMenu">マイ ランドマークを編集...</string>
-	<string name="accel-mac-control">⌃</string>
-	<string name="accel-mac-command">⌘</string>
-	<string name="accel-mac-option">⌥</string>
-	<string name="accel-mac-shift">⇧</string>
-	<string name="accel-win-control">Ctrl+</string>
-	<string name="accel-win-alt">Alt+</string>
-	<string name="accel-win-shift">Shift+</string>
-	<string name="FileSaved">ファイルが保存されました</string>
-	<string name="Receiving">取得中</string>
-	<string name="AM">AM</string>
-	<string name="PM">PM</string>
-	<string name="PST">太平洋標準時</string>
-	<string name="PDT">太平洋夏時間</string>
-	<string name="Direction_Forward">前</string>
-	<string name="Direction_Left">左</string>
-	<string name="Direction_Right">右</string>
-	<string name="Direction_Back">戻る</string>
-	<string name="Direction_North">北</string>
-	<string name="Direction_South">南</string>
-	<string name="Direction_West">西</string>
-	<string name="Direction_East">東</string>
-	<string name="Direction_Up">上</string>
-	<string name="Direction_Down">下</string>
-	<string name="Any Category">全カテゴリ</string>
-	<string name="Shopping">ショッピング</string>
-	<string name="Land Rental">土地のレンタル</string>
-	<string name="Property Rental">プロパティのレンタル</string>
-	<string name="Special Attraction">特別アトラクション</string>
-	<string name="New Products">新製品</string>
-	<string name="Employment">雇用</string>
-	<string name="Wanted">求む</string>
-	<string name="Service">サービス</string>
-	<string name="Personal">パーソナル</string>
-	<string name="None">なし</string>
-	<string name="Linden Location">Linden 所在地</string>
-	<string name="Adult">Adult</string>
-	<string name="Arts&amp;Culture">アートとカルチャー</string>
-	<string name="Business">ビジネス</string>
-	<string name="Educational">教育的</string>
-	<string name="Gaming">ゲーム</string>
-	<string name="Hangout">たまり場</string>
-	<string name="Newcomer Friendly">新住人に優しい</string>
-	<string name="Parks&amp;Nature">公園と自然</string>
-	<string name="Residential">住宅用</string>
-	<string name="Stage">ステージ</string>
-	<string name="Other">その他</string>
-	<string name="Rental">レンタル</string>
-	<string name="Any">全員</string>
-	<string name="You">あなた</string>
-	<string name=":">:</string>
-	<string name=",">,</string>
-	<string name="...">...</string>
-	<string name="***">***</string>
-	<string name="(">(</string>
-	<string name=")">)</string>
-	<string name=".">.</string>
-	<string name="'">'</string>
-	<string name="---">---</string>
-	<string name="Multiple Media">複数のメディア</string>
-	<string name="Play Media">メディアを再生/一時停止</string>
-	<string name="IntelDriverPage">http://www.intel.com/p/en_US/support/detect/graphics</string>
-	<string name="NvidiaDriverPage">http://www.nvidia.com/Download/index.aspx?lang=en-us</string>
-	<string name="AMDDriverPage">http://support.amd.com/us/Pages/AMDSupportHub.aspx</string>
-	<string name="MBCmdLineError">コマンドラインにエラーが見つかりました。
-リンク先を参照してください： http://wiki.secondlife.com/wiki/Client_parameters
+
+  <!-- searching - generic -->
+  <string name="Searching">検索中…</string>
+  <string name="NoneFound">見つかりませんでした。</string>
+
+  <!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
+  <string name="RetrievingData">取得中…</string>
+
+  <string name="ReleaseNotes">リリースノート</string>
+  <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
+  <string name="RELEASE_NOTES_BASE_URL" translate="false">https://releasenotes.secondlife.com/viewer/</string>
+
+  <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+  <string name="LoadingData">読み込んでいます…</string>
+
+  <!-- namecache -->
+  <!-- Avatar name: text shown for LLUUID::null -->
+  <string name="AvatarNameNobody">（なし）</string>
+
+  <!-- Avatar name: text shown while fetching name -->
+  <string name="AvatarNameWaiting">（待機中）</string>
+
+  <!-- Avatar name: More than one avatar is selected/used here -->
+  <string name="AvatarNameMultiple">（複数）</string>
+
+  <!-- Group name: text shown for LLUUID::null -->
+  <string name="GroupNameNone">（なし）</string>
+
+  <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+  <string name="AssetErrorNone">エラーなし</string>
+  <string name="AssetErrorRequestFailed">アセットリクエスト：失敗</string>
+  <string name="AssetErrorNonexistentFile">アセットリクエスト：存在しないファイル</string>
+  <string name="AssetErrorNotInDatabase">アセットリクエスト：データベースに見つかりませんでした。</string>
+  <string name="AssetErrorEOF">終了</string>
+  <string name="AssetErrorCannotOpenFile">ファイルを開けません</string>
+  <string name="AssetErrorFileNotFound">ファイルが見つかりません</string>
+  <string name="AssetErrorTCPTimeout">ファイルの転送タイムアウト</string>
+  <string name="AssetErrorCircuitGone">サーキットエラー</string>
+  <string name="AssetErrorPriceMismatch">ビューアーとサーバー上の値段が一致していません。</string>
+  <string name="AssetErrorUnknownStatus">不明のステータス</string>
+
+  <!-- Asset upload errors. -->
+  <string name="AssetUploadServerUnreacheble">現在、サービスをご利用いただけません。</string>
+  <string name="AssetUploadServerDifficulties">サーバーで予期せぬ問題が発生しました。</string>
+  <string name="AssetUploadServerUnavaliable">サービスがご利用いただけないか、アップロードがタイムアウトしました。</string>
+  <string name="AssetUploadRequestInvalid">アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート
+（ https://support.secondlife.com/ ）にお問い合わせください。</string>
+
+  <!-- Settings errors -->
+  <string name="SettingValidationError">インポートする設定[NAME]の検証に失敗しました。</string>
+  <string name="SettingImportFileError">ファイル[FILE]を開くことができません。</string>
+  <string name="SettingParseFileError">ファイル[FILE]を開くことができません。</string>
+  <string name="SettingTranslateError">過去のウインドライト[NAME]を変換できません。</string>
+  <!-- Asset Type human readable names:  these will replace variable [TYPE] in notification FailedToFindWearable* -->
+  <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
+  <string name="texture">テクスチャ</string>
+  <string name="sound">サウンド</string>
+  <string name="calling card">コーリングカード</string>
+  <string name="landmark">ランドマーク</string>
+  <string name="legacy script">レガシースクリプト</string>
+  <string name="clothing">服装</string>
+  <string name="object">オブジェクト</string>
+  <string name="note card">ノートカード</string>
+  <string name="folder">フォルダ</string>
+  <string name="root">ルート</string>
+  <string name="lsl2 script">LSL2スクリプト</string>
+  <string name="lsl bytecode">LSLバイトコード</string>
+  <string name="tga texture">tgaテクスチャ</string>
+  <string name="body part">身体部位</string>
+  <string name="snapshot">スナップショット</string>
+  <string name="lost and found">遺失物</string>
+  <string name="targa image">targa画像</string>
+  <string name="trash">ごみ箱</string>
+  <string name="jpeg image">jpeg画像</string>
+  <string name="animation">アニメーション</string>
+  <string name="gesture">ジェスチャー</string>
+  <string name="simstate">統計</string>
+  <string name="favorite">お気に入り</string>
+  <string name="symbolic link">リンク</string>
+  <string name="symbolic folder link">フォルダのリンク</string>
+  <string name="settings blob">設定</string>
+  <string name="mesh">メッシュ</string>
+
+  <!-- llvoavatar. Displayed in the avatar chat bubble -->
+  <string name="AvatarEditingAppearance">（容姿の編集中）</string>
+  <string name="AvatarAway">一時退席中</string>
+  <string name="AvatarDoNotDisturb">着信拒否</string>
+  <string name="AvatarMuted">ブロック中</string>
+
+  <!-- animations -->
+  <string name="anim_express_afraid">怖れ</string>
+  <string name="anim_express_anger">怒り</string>
+  <string name="anim_away">退席中</string>
+  <string name="anim_backflip">後ろ宙返り</string>
+  <string name="anim_express_laugh">大笑い</string>
+  <string name="anim_express_toothsmile">満面の笑顔</string>
+  <string name="anim_blowkiss">投げキッス</string>
+  <string name="anim_express_bored">退屈</string>
+  <string name="anim_bow">おじぎ</string>
+  <string name="anim_clap">拍手</string>
+  <string name="anim_courtbow">深いおじぎ</string>
+  <string name="anim_express_cry">泣く</string>
+  <string name="anim_dance1">ダンス１</string>
+  <string name="anim_dance2">ダンス２</string>
+  <string name="anim_dance3">ダンス３</string>
+  <string name="anim_dance4">ダンス４</string>
+  <string name="anim_dance5">ダンス５</string>
+  <string name="anim_dance6">ダンス６</string>
+  <string name="anim_dance7">ダンス７</string>
+  <string name="anim_dance8">ダンス８</string>
+  <string name="anim_express_disdain">侮蔑</string>
+  <string name="anim_drink">酔っぱらう</string>
+  <string name="anim_express_embarrased">困惑</string>
+  <string name="anim_angry_fingerwag">指を振る</string>
+  <string name="anim_fist_pump">ガッツポーズ</string>
+  <string name="anim_yoga_float">ヨガ浮遊</string>
+  <string name="anim_express_frown">しかめっ面</string>
+  <string name="anim_impatient">いらいらする</string>
+  <string name="anim_jumpforjoy">飛び上がって喜ぶ</string>
+  <string name="anim_kissmybutt">挑発ポーズ</string>
+  <string name="anim_express_kiss">キス</string>
+  <string name="anim_laugh_short">笑う</string>
+  <string name="anim_musclebeach">力こぶを見せる</string>
+  <string name="anim_no_unhappy">不満げに否定する</string>
+  <string name="anim_no_head">否定する</string>
+  <string name="anim_nyanya">冷やかす</string>
+  <string name="anim_punch_onetwo">ワンツー・パンチ</string>
+  <string name="anim_express_open_mouth">口を開けて驚く</string>
+  <string name="anim_peace">ピース・サイン</string>
+  <string name="anim_point_you">他人を指差す</string>
+  <string name="anim_point_me">自分を指差す</string>
+  <string name="anim_punch_l">左パンチ</string>
+  <string name="anim_punch_r">右パンチ</string>
+  <string name="anim_rps_countdown">じゃんけんポーズ</string>
+  <string name="anim_rps_paper">パー</string>
+  <string name="anim_rps_rock">グー</string>
+  <string name="anim_rps_scissors">チョキ</string>
+  <string name="anim_express_repulsed">嫌悪感</string>
+  <string name="anim_kick_roundhouse_r">まわし蹴り</string>
+  <string name="anim_express_sad">悲しむ</string>
+  <string name="anim_salute">敬礼する</string>
+  <string name="anim_shout">叫ぶ</string>
+  <string name="anim_express_shrug">肩をすくめる</string>
+  <string name="anim_express_smile">微笑む</string>
+  <string name="anim_smoke_idle">たばこをくゆらす</string>
+  <string name="anim_smoke_inhale">たばこを吸う</string>
+  <string name="anim_smoke_throw_down">たばこを捨てる</string>
+  <string name="anim_express_surprise">驚く</string>
+  <string name="anim_sword_strike_r">剣で斬りつける</string>
+  <string name="anim_angry_tantrum">じだんだを踏む</string>
+  <string name="anim_express_tongue_out">舌を出す</string>
+  <string name="anim_hello">手を振る</string>
+  <string name="anim_whisper">小声で話す</string>
+  <string name="anim_whistle">口笛を吹く</string>
+  <string name="anim_express_wink">ウィンク</string>
+  <string name="anim_wink_hollywood">ウィンク（ハリウッド）</string>
+  <string name="anim_express_worry">心配する</string>
+  <string name="anim_yes_happy">笑顔で頷く</string>
+  <string name="anim_yes_head">頷く</string>
+
+  <!-- build floater -->
+  <string name="multiple_textures">複数</string>
+
+  <string name="use_texture">テクスチャを使用</string>
+  <string name="manip_hint1">マウスカーソルをルーラに合わせて</string>
+  <string name="manip_hint2">グリッドにスナップ</string>
+
+  <!-- world map -->
+  <string name="texture_loading">読み込んでいます…</string>
+  <string name="worldmap_offline">オフライン</string>
+  <string name="worldmap_item_tooltip_format">[AREA]㎡　L$ [PRICE]（[SQMPRICE] L$／㎡）</string>
+  <string name="worldmap_results_none_found">何も見つかりませんでした。</string>
+
+  <!-- animations uploading status codes -->
+  <string name="Ok">OK</string>
+  <string name="Premature end of file">不完全なファイル</string>
+  <string name="ST_NO_JOINT">ROOT または JOINT が見つかりません</string>
+
+  <!-- Chat -->
+  <string name="NearbyChatTitle">近隣チャット</string>
+  <string name="NearbyChatLabel">（近隣のチャット）</string>
+  <string name="whisper">のささやき：</string>
+  <string name="shout">のシャウト：</string>
+  <string name="ringing">インワールドボイスチャットに接続中…</string>
+  <string name="connected">接続しました</string>
+  <string name="unavailable">現在地では、ボイスを利用できません。</string>
+  <string name="hang_up">インワールドボイスチャットの通話が切断されました。</string>
+  <string name="reconnect_nearby">「近隣ボイスチャット」に再接続されます。</string>
+  <string name="ScriptQuestionCautionChatGranted">リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を許可しました：[PERMISSIONS]</string>
+  <string name="ScriptQuestionCautionChatDenied">リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を拒否しました：[PERMISSIONS]</string>
+  <string name="AdditionalPermissionsRequestHeader">あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：</string>
+  <string name="ScriptTakeMoney">リンデンドル（L$）のお支払い</string>
+  <string name="ActOnControlInputs">制御入力に基づいて行動</string>
+  <string name="RemapControlInputs">制御入力のリマップ</string>
+  <string name="AnimateYourAvatar">アバターへのアニメーション動作</string>
+  <string name="AttachToYourAvatar">アバターに装着</string>
+  <string name="ReleaseOwnership">所有権を解放し公共物とする</string>
+  <string name="LinkAndDelink">他のオブジェクトのリンクとリンク解除</string>
+  <string name="AddAndRemoveJoints">他のオブジェクトとのジョイントの追加と削除</string>
+  <string name="ChangePermissions">権限の変更</string>
+  <string name="TrackYourCamera">カメラ追従</string>
+  <string name="ControlYourCamera">カメラ操作</string>
+  <string name="TeleportYourAgent">あなたをテレポート</string>
+  <string name="ForceSitAvatar">アバターを強制的に座らせる</string>
+  <string name="ChangeEnvSettings">自然環境の設定を変更する</string>
+
+  <string name="NotConnected">接続されていません</string>
+  <!-- Substitution for agent name -->
+  <string name="AgentNameSubst">（あなた）</string>
+  <!-- intentionally blank -->
+  <string name="JoinAnExperience">体験に参加</string>
+  <string name="SilentlyManageEstateAccess">土地のアクセスリストを管理するときにアラートを表示しない</string>
+  <string name="OverrideYourAnimations">デフォルトのアニメーションを置き換え</string>
+  <string name="ScriptReturnObjects">あなたの代わりにオブジェクトを返却</string>
+  <string name="UnknownScriptPermission">（不明）！</string>
+
+  <!-- Sim Access labels -->
+  <string name="SIM_ACCESS_PG">General</string>
+  <string name="SIM_ACCESS_MATURE">Moderate</string>
+  <string name="SIM_ACCESS_ADULT">Adult</string>
+  <string name="SIM_ACCESS_DOWN">オフライン</string>
+  <string name="SIM_ACCESS_MIN">不明</string>
+
+  <!-- For use when we do not have land type back from the server -->
+  <string name="land_type_unknown">（不明）</string>
+
+  <!-- For land type back from the simulator -->
+  <string name="Estate / Full Region">不動産／フルリージョン</string>
+  <string name="Estate / Homestead">不動産／入植地</string>
+  <string name="Mainland / Homestead">メインランド／入植地</string>
+  <string name="Mainland / Full Region">メインランド／フルリージョン</string>
+
+  <!-- File load/save dialogs -->
+  <string name="all_files">全てのファイル</string>
+  <string name="sound_files">サウンド</string>
+  <string name="animation_files">アニメーション</string>
+  <string name="image_files">画像</string>
+  <string name="save_file_verb">保存</string>
+  <string name="load_file_verb">ロード</string>
+  <string name="targa_image_files">Targa画像</string>
+  <string name="bitmap_image_files">ビットマップ画像</string>
+  <string name="png_image_files">PNG画像</string>
+  <string name="save_texture_image_files">TargaまたはPNG画像</string>
+  <string name="avi_movie_file">AVIムービーファイル</string>
+  <string name="xaf_animation_file">XAFアニメーションファイル</string>
+  <string name="xml_file">XMLファイル</string>
+  <string name="raw_file">RAWファイル</string>
+  <string name="compressed_image_files">圧縮画像</string>
+  <string name="load_files">ファイルのロード</string>
+  <string name="choose_the_directory">参照</string>
+  <string name="script_files">スクリプト</string>
+  <string name="dictionary_files">辞書</string>
+
+  <!-- LSL Usage Hover Tips -->
+  <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window).
+This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings.  -->
+  <string name="LSLTipSleepTime" translate="false">
+Sleeps script for [SLEEP_TIME] seconds.
+  </string>
+
+  <string name="LSLTipText_llSin" translate="false">
+float llSin(float theta)
+Returns the sine of theta (theta in radians)
+  </string>
+  <string name="LSLTipText_llCos" translate="false">
+float llCos(float theta)
+Returns the cosine of theta (theta in radians)
+  </string>
+  <string name="LSLTipText_llTan" translate="false">
+float llTan(float theta)
+Returns the tangent of theta (theta in radians)
+  </string>
+  <string name="LSLTipText_llAtan2" translate="false">
+float llAtan2(float y, float x)
+Returns the arctangent2 of y, x
+  </string>
+  <string name="LSLTipText_llSqrt" translate="false">
+float llSqrt(float val)
+Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results
+  </string>
+  <string name="LSLTipText_llPow" translate="false">
+float llPow(float base, float exponent)
+Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results
+  </string>
+  <string name="LSLTipText_llAbs" translate="false">
+integer llAbs(integer val)
+Returns the positive version of val
+  </string>
+  <string name="LSLTipText_llFabs" translate="false">
+float llFabs(float val)
+Returns the positive version of val
+  </string>
+  <string name="LSLTipText_llFrand" translate="false">
+float llFrand(float mag)
+Returns a pseudo random number in the range [0,mag) or (mag,0]
+  </string>
+  <string name="LSLTipText_llFloor" translate="false">
+integer llFloor(float val)
+Returns largest integer value &lt;= val
+  </string>
+  <string name="LSLTipText_llCeil" translate="false">
+integer llCeil(float val)
+Returns smallest integer value &gt;= val
+  </string>
+  <string name="LSLTipText_llRound" translate="false">
+integer llRound(float val)
+Returns val rounded to the nearest integer
+  </string>
+  <string name="LSLTipText_llVecMag" translate="false">
+float llVecMag(vector v)
+Returns the magnitude of v
+  </string>
+  <string name="LSLTipText_llVecNorm" translate="false">
+vector llVecNorm(vector v)
+Returns the v normalized
+  </string>
+  <string name="LSLTipText_llVecDist" translate="false">
+float llVecDist(vector v1, vector v2)
+Returns the 3D distance between v1 and v2
+  </string>
+  <string name="LSLTipText_llRot2Euler" translate="false">
+vector llRot2Euler(rotation q)
+Returns the Euler representation (roll, pitch, yaw) of q
+  </string>
+  <string name="LSLTipText_llEuler2Rot" translate="false">
+rotation llEuler2Rot(vector v)
+Returns the rotation representation of Euler Angles v
+  </string>
+  <string name="LSLTipText_llAxes2Rot" translate="false">
+rotation llAxes2Rot(vector fwd, vector left, vector up)
+Returns the rotation defined by the coordinate axes
+  </string>
+  <string name="LSLTipText_llRot2Fwd" translate="false">
+vector llRot2Fwd(rotation q)
+Returns the forward vector defined by q
+  </string>
+  <string name="LSLTipText_llRot2Left" translate="false">
+vector llRot2Left(rotation q)
+Returns the left vector defined by q
+  </string>
+  <string name="LSLTipText_llRot2Up" translate="false">
+vector llRot2Up(rotation q)
+Returns the up vector defined by q
+  </string>
+  <string name="LSLTipText_llRotBetween" translate="false">
+rotation llRotBetween(vector v1, vector v2)
+Returns the rotation to rotate v1 to v2
+  </string>
+  <string name="LSLTipText_llWhisper" translate="false">
+llWhisper(integer channel, string msg)
+Whispers the text of msg on channel
+  </string>
+  <string name="LSLTipText_llSay" translate="false">
+llSay(integer channel, string msg)
+Says the text of msg on channel
+  </string>
+  <string name="LSLTipText_llShout" translate="false">
+llShout(integer channel, string msg)
+Shouts the text of msg on channel
+  </string>
+  <string name="LSLTipText_llListen" translate="false">
+integer llListen(integer channel, string name, key id, string msg)
+Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen
+  </string>
+  <string name="LSLTipText_llListenControl" translate="false">
+llListenControl(integer number, integer active)
+Makes a listen event callback active or inactive
+  </string>
+  <string name="LSLTipText_llListenRemove" translate="false">
+llListenRemove(integer number)
+Removes listen event callback number
+  </string>
+  <string name="LSLTipText_llSensor" translate="false">
+llSensor(string name, key id, integer type, float range, float arc)
+Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)
+  </string>
+  <string name="LSLTipText_llSensorRepeat" translate="false">
+llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
+Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds
+  </string>
+  <string name="LSLTipText_llSensorRemove" translate="false">
+llSensorRemove()
+Removes the sensor setup by llSensorRepeat
+  </string>
+  <string name="LSLTipText_llDetectedName" translate="false">
+string llDetectedName(integer number)
+Returns the name of detected object number (returns empty string if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedKey" translate="false">
+key llDetectedKey(integer number)
+Returns the key of detected object number (returns empty key if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedOwner" translate="false">
+key llDetectedOwner(integer number)
+Returns the key of detected object&apos;s owner (returns empty key if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedType" translate="false">
+integer llDetectedType(integer number)
+Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedPos" translate="false">
+vector llDetectedPos(integer number)
+Returns the position of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedVel" translate="false">
+vector llDetectedVel(integer number)
+Returns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedGrab" translate="false">
+vector llDetectedGrab(integer number)
+Returns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedRot" translate="false">
+rotation llDetectedRot(integer number)
+Returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedGroup" translate="false">
+integer llDetectedGroup(integer number)
+Returns TRUE if detected object is part of same group as owner
+  </string>
+  <string name="LSLTipText_llDetectedLinkNumber" translate="false">
+integer llDetectedLinkNumber(integer number)
+Returns the link position of the triggered event for touches and collisions only
+  </string>
+  <string name="LSLTipText_llDie" translate="false">
+llDie()
+Deletes the object
+  </string>
+  <string name="LSLTipText_llGround" translate="false">
+float llGround(vector offset)
+Returns the ground height below the object position + offset
+  </string>
+  <string name="LSLTipText_llCloud" translate="false">
+float llCloud(vector offset)
+Returns the cloud density at the object position + offset
+  </string>
+  <string name="LSLTipText_llWind" translate="false">
+vector llWind(vector offset)
+Returns the wind velocity at the object position + offset
+  </string>
+  <string name="LSLTipText_llSetStatus" translate="false">
+llSetStatus(integer status, integer value)
+Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+  </string>
+  <string name="LSLTipText_llGetStatus" translate="false">
+integer llGetStatus(integer status)
+Returns the boolean value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, or STATUS_ROTATE_Z)
+  </string>
+  <string name="LSLTipText_llSetScale" translate="false">
+llSetScale(vector scale)
+Sets the scale of the prim
+  </string>
+  <string name="LSLTipText_llGetScale" translate="false">
+vector llGetScale()
+Returns the scale of the prim
+  </string>
+  <string name="LSLTipText_llSetColor" translate="false">
+llSetColor(vector color, integer face)
+Sets the color on face of the prim
+  </string>
+  <string name="LSLTipText_llGetAlpha" translate="false">
+float llGetAlpha(integer face)
+Returns the alpha of face
+  </string>
+  <string name="LSLTipText_llSetAlpha" translate="false">
+llSetAlpha(float alpha, integer face)
+Sets the alpha on face
+  </string>
+  <string name="LSLTipText_llGetColor" translate="false">
+vector llGetColor(integer face)
+Returns the color on face
+  </string>
+  <string name="LSLTipText_llSetTexture" translate="false">
+llSetTexture(string texture, integer face)
+Sets the texture of face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llScaleTexture" translate="false">
+llScaleTexture(float u, float v, integer face)
+Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llOffsetTexture" translate="false">
+llOffsetTexture(float u, float v, integer face)
+Sets the texture u  &amp; v offsets for the chosen face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llRotateTexture" translate="false">
+llRotateTexture(float rotation, integer face)
+Sets the texture rotation for the chosen face
+  </string>
+  <string name="LSLTipText_llGetTexture" translate="false">
+string llGetTexture(integer face)
+Returns a string that is the texture on face (the inventory name if it is a texture in the prim&apos;s inventory, otherwise the key)
+  </string>
+  <string name="LSLTipText_llSetPos" translate="false">
+llSetPos(vector pos)
+Moves the object or prim towards pos without using physics (if the script isn&apos;t physical)
+  </string>
+  <string name="LSLTipText_llGetPos" translate="false">
+vector llGetPos()
+Returns the position of the task in region coordinates
+  </string>
+  <string name="LSLTipText_llGetLocalPos" translate="false">
+vector llGetLocalPos()
+Returns the position relative to the root
+  </string>
+  <string name="LSLTipText_llSetRot" translate="false">
+llSetRot(rotation rot)
+Sets the rotation
+  </string>
+  <string name="LSLTipText_llGetRot" translate="false">
+rotation llGetRot()
+Returns the rotation relative to the region&apos;s axes
+  </string>
+  <string name="LSLTipText_llGetLocalRot" translate="false">
+rotation llGetLocalRot()
+Returns the rotation local to the root
+  </string>
+  <string name="LSLTipText_llSetForce" translate="false">
+llSetForce(vector force, integer local)
+Applies force to the object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetForce" translate="false">
+vector llGetForce()
+Returns the force (if the script is physical)
+  </string>
+  <string name="LSLTipText_llTarget" translate="false">
+integer llTarget(vector position, float range)
+Sets positions within range of position as a target and return an ID for the target
+  </string>
+  <string name="LSLTipText_llTargetRemove" translate="false">
+llTargetRemove(integer number)
+Removes positional target number registered with llTarget
+  </string>
+  <string name="LSLTipText_llRotTarget" translate="false">
+integer llRotTarget(rotation rot, float error)
+Set rotations with error of rot as a rotational target and return an ID for the rotational target
+  </string>
+  <string name="LSLTipText_llRotTargetRemove" translate="false">
+llRotTargetRemove(integer number)
+Removes rotational target number registered with llRotTarget
+  </string>
+  <string name="LSLTipText_llMoveToTarget" translate="false">
+llMoveToTarget(vector target, float tau)
+Critically damps to target in tau seconds (if the script is physical)
+  </string>
+  <string name="LSLTipText_llStopMoveToTarget" translate="false">
+llStopMoveToTarget()
+Stops critically damped motion
+  </string>
+  <string name="LSLTipText_llApplyImpulse" translate="false">
+llApplyImpulse(vector force, integer local)
+Applies impulse to object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llApplyRotationalImpulse" translate="false">
+llApplyRotationalImpulse(vector force, integer local)
+Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llSetTorque" translate="false">
+llSetTorque(vector torque, integer local)
+Sets the torque of object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetTorque" translate="false">
+vector llGetTorque()
+Returns the torque (if the script is physical)
+  </string>
+  <string name="LSLTipText_llSetForceAndTorque" translate="false">
+llSetForceAndTorque(vector force, vector torque, integer local)
+Sets the force and torque of object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetVel" translate="false">
+vector llGetVel()
+Returns the velocity of the object
+  </string>
+  <string name="LSLTipText_llGetAccel" translate="false">
+vector llGetAccel()
+Returns the acceleration of the object relative to the region&apos;s axes
+  </string>
+  <string name="LSLTipText_llGetOmega" translate="false">
+vector llGetOmega()
+Returns the rotation velocity in radians per second
+  </string>
+  <string name="LSLTipText_llGetTimeOfDay" translate="false">
+float llGetTimeOfDay()
+Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
+  </string>
+  <string name="LSLTipText_llGetWallclock" translate="false">
+float llGetWallclock()
+Returns the time in seconds since midnight California Pacific time (PST/PDT)
+  </string>
+  <string name="LSLTipText_llGetTime" translate="false">
+float llGetTime()
+Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime
+  </string>
+  <string name="LSLTipText_llResetTime" translate="false">
+llResetTime()
+Sets the script timer to zero
+  </string>
+  <string name="LSLTipText_llGetAndResetTime" translate="false">
+float llGetAndResetTime()
+Returns the script time in seconds and then resets the script timer to zero
+  </string>
+  <string name="LSLTipText_llSound" translate="false">
+llSound(string sound, float volume, integer queue, integer loop)
+Plays sound at volume and whether it should loop or not.
+  </string>
+  <string name="LSLTipText_llPlaySound" translate="false">
+llPlaySound(string sound, float volume)
+Plays attached sound once at volume (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llLoopSound" translate="false">
+llLoopSound(string sound, float volume)
+Plays attached sound looping indefinitely at volume (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llLoopSoundMaster" translate="false">
+llLoopSoundMaster(string sound, float volume)
+Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master
+  </string>
+  <string name="LSLTipText_llLoopSoundSlave" translate="false">
+llLoopSoundSlave(string sound, float volume)
+Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master
+  </string>
+  <string name="LSLTipText_llPlaySoundSlave" translate="false">
+llPlaySoundSlave(string sound, float volume)
+Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master
+  </string>
+  <string name="LSLTipText_llTriggerSound" translate="false">
+llTriggerSound(string sound, float volume)
+Plays sound at volume (0.0 - 1.0), centered at but not attached to object
+  </string>
+  <string name="LSLTipText_llStopSound" translate="false">
+llStopSound()
+Stops currently attached sound
+  </string>
+  <string name="LSLTipText_llPreloadSound" translate="false">
+llPreloadSound(string sound)
+Preloads a sound on viewers within range
+  </string>
+  <string name="LSLTipText_llGetSubString" translate="false">
+string llGetSubString(string src, integer start, integer end)
+Returns the indicated substring
+  </string>
+  <string name="LSLTipText_llDeleteSubString" translate="false">
+string llDeleteSubString(string src, integer start, integer end)
+Removes the indicated substring and returns the result
+  </string>
+  <string name="LSLTipText_llInsertString" translate="false">
+string llInsertString(string dst, integer position, string src)
+Returns a destination string dst with the string src inserted starting at position pos
+  </string>
+  <string name="LSLTipText_llToUpper" translate="false">
+string llToUpper(string src)
+Returns a string that is src with all upper-case characters
+  </string>
+  <string name="LSLTipText_llToLower" translate="false">
+string llToLower(string src)
+Returns a string that is src with all lower-case characters
+  </string>
+  <string name="LSLTipText_llGiveMoney" translate="false">
+llGiveMoney(key destination, integer amount)
+Transfers amount of L$ from script owner to destination
+  </string>
+  <string name="LSLTipText_llMakeExplosion" translate="false">
+llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes a round explosion of particles
+  </string>
+  <string name="LSLTipText_llMakeFountain" translate="false">
+llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
+Makes a fountain of particles
+  </string>
+  <string name="LSLTipText_llMakeSmoke" translate="false">
+llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes smoke like particles
+  </string>
+  <string name="LSLTipText_llMakeFire" translate="false">
+llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes fire like particles
+  </string>
+  <string name="LSLTipText_llRezObject" translate="false">
+llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner&apos;s inventory object at pos with velocity vel and rotation rot with start parameter param
+  </string>
+  <string name="LSLTipText_llLookAt" translate="false">
+llLookAt(vector target, float strength, float damping)
+Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon
+  </string>
+  <string name="LSLTipText_llStopLookAt" translate="false">
+llStopLookAt()
+Stops causing object to point at a target
+  </string>
+  <string name="LSLTipText_llSetTimerEvent" translate="false">
+llSetTimerEvent(float sec)
+Causes the timer event to be triggered a maximum of once every sec seconds
+  </string>
+  <string name="LSLTipText_llSleep" translate="false">
+llSleep(float sec)
+Puts the script to sleep for sec seconds
+  </string>
+  <string name="LSLTipText_llGetMass" translate="false">
+float llGetMass()
+Returns the mass of object that the script is attached to
+  </string>
+  <string name="LSLTipText_llCollisionFilter" translate="false">
+llCollisionFilter(string name, key id, integer accept)
+Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id
+  </string>
+  <string name="LSLTipText_llTakeControls" translate="false">
+llTakeControls(integer controls, integer accept, integer pass_on)
+Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for
+  </string>
+  <string name="LSLTipText_llReleaseControls" translate="false">
+llReleaseControls()
+Stops taking inputs that were taken with llTakeControls
+  </string>
+  <string name="LSLTipText_llAttachToAvatar" translate="false">
+llAttachToAvatar(integer attach_point)
+Attaches the object to the avatar who has granted permission to the script
+  </string>
+  <string name="LSLTipText_llDetachFromAvatar" translate="false">
+llDetachFromAvatar()
+Detaches object from avatar
+  </string>
+  <string name="LSLTipText_llTakeCamera" translate="false">
+llTakeCamera(key avatar)
+Moves avatar&apos;s viewpoint to task
+  </string>
+  <string name="LSLTipText_llReleaseCamera" translate="false">
+llReleaseCamera(key avatar)
+Returns camera to agent avatar
+  </string>
+  <string name="LSLTipText_llGetOwner" translate="false">
+key llGetOwner()
+Returns the object owner&apos;s UUID
+  </string>
+  <string name="LSLTipText_llInstantMessage" translate="false">
+llInstantMessage(key user, string message)
+Sends the specified string as an Instant Message to the user
+  </string>
+  <string name="LSLTipText_llEmail" translate="false">
+llEmail(string address, string subject, string message)
+Sends an email to address with the subject and message
+  </string>
+  <string name="LSLTipText_llGetNextEmail" translate="false">
+llGetNextEmail(string address, string subject)
+Gets the next waiting email that comes from address, with specified subject
+  </string>
+  <string name="LSLTipText_llGetKey" translate="false">
+key llGetKey()
+Returns the key of the prim the script is attached to
+  </string>
+  <string name="LSLTipText_llSetBuoyancy" translate="false">
+llSetBuoyancy(float buoyancy)
+Sets the buoyancy of the task or object (0 is disabled, &lt; 1.0 sinks, 1.0 floats, &gt; 1.0 rises)
+  </string>
+  <string name="LSLTipText_llSetHoverHeight" translate="false">
+llSetHoverHeight(float height, integer water, float tau)
+Critically damps to a height above the ground (or water) in tau seconds
+  </string>
+  <string name="LSLTipText_llStopHover" translate="false">
+llStopHover()
+Stops hovering to a height
+  </string>
+  <string name="LSLTipText_llMinEventDelay" translate="false">
+llMinEventDelay(float delay)
+Sets the minimum time between events being handled
+  </string>
+  <string name="LSLTipText_llSoundPreload" translate="false">
+llSoundPreload(string sound)
+Preloads a sound on viewers within range
+  </string>
+  <string name="LSLTipText_llRotLookAt" translate="false">
+llRotLookAt(rotation target, float strength, float damping)
+Causes object to point its forward axis towards target
+  </string>
+  <string name="LSLTipText_llStringLength" translate="false">
+integer llStringLength(string str)
+Returns the length of string
+  </string>
+  <string name="LSLTipText_llStartAnimation" translate="false">
+llStartAnimation(string anim)
+Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked
+  </string>
+  <string name="LSLTipText_llStopAnimation" translate="false">
+llStopAnimation(string anim)
+Stops animation anim for agent that granted permission
+  </string>
+  <string name="LSLTipText_llPointAt" translate="false">
+llPointAt(vector pos)
+Makes agent that owns object point at pos
+  </string>
+  <string name="LSLTipText_llStopPointAt" translate="false">
+llStopPointAt()
+Stops pointing agent that owns object
+  </string>
+  <string name="LSLTipText_llTargetOmega" translate="false">
+llTargetOmega(vector axis, float spinrate, float gain)
+Rotates the object around axis at spinrate with strength gain
+  </string>
+  <string name="LSLTipText_llGetStartParameter" translate="false">
+integer llGetStartParameter()
+Returns an integer that is the script start/rez parameter
+  </string>
+  <string name="LSLTipText_llGodLikeRezObject" translate="false">
+llGodLikeRezObject(key inventory, vector pos)
+Rezzes directly off of UUID if owner is in God Mode
+  </string>
+  <string name="LSLTipText_llRequestPermissions" translate="false">
+llRequestPermissions(key agent, integer perm)
+Asks the agent for permission to run certain classes of functions
+  </string>
+  <string name="LSLTipText_llGetPermissionsKey" translate="false">
+key llGetPermissionsKey()
+Returns the key of the avatar that last granted permissions to the script
+  </string>
+  <string name="LSLTipText_llGetPermissions" translate="false">
+integer llGetPermissions()
+Returns an integer bitfield with the permissions that have been granted
+  </string>
+  <string name="LSLTipText_llGetLinkNumber" translate="false">
+integer llGetLinkNumber()
+Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc)
+  </string>
+  <string name="LSLTipText_llSetLinkColor" translate="false">
+llSetLinkColor(integer linknumber, vector color, integer face)
+Sets face to color if a task exists in the link chain at linknumber
+  </string>
+  <string name="LSLTipText_llCreateLink" translate="false">
+llCreateLink(key target, integer parent)
+Attempts to link the script&apos;s object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script&apos;s object becomes the root
+  </string>
+  <string name="LSLTipText_llBreakLink" translate="false">
+llBreakLink(integer linknum)
+Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted)
+  </string>
+  <string name="LSLTipText_llBreakAllLinks" translate="false">
+llBreakAllLinks()
+Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted)
+  </string>
+  <string name="LSLTipText_llGetLinkKey" translate="false">
+key llGetLinkKey(integer linknumber)
+Returns the key of the linked prim linknumber
+  </string>
+  <string name="LSLTipText_llGetLinkName" translate="false">
+string llGetLinkName(integer linknumber)
+Returns the name of linknumber in a link set
+  </string>
+  <string name="LSLTipText_llGetInventoryNumber" translate="false">
+integer llGetInventoryNumber(integer type)
+Returns the number of items of a given type (INVENTORY_* flag) in the prim&apos;s inventory
+  </string>
+  <string name="LSLTipText_llGetInventoryName" translate="false">
+string llGetInventoryName(integer type, integer number)
+Returns the name of the inventory item number of a given type
+  </string>
+  <string name="LSLTipText_llSetScriptState" translate="false">
+llSetScriptState(string name, integer run)
+Sets the running state of the specified script
+  </string>
+  <string name="LSLTipText_llGetEnergy" translate="false">
+float llGetEnergy()
+Returns how much energy is in the object as a percentage of maximum
+  </string>
+  <string name="LSLTipText_llGiveInventory" translate="false">
+llGiveInventory(key destination, string inventory)
+Gives inventory to destination
+  </string>
+  <string name="LSLTipText_llRemoveInventory" translate="false">
+llRemoveInventory(string item)
+Removes the named inventory item
+  </string>
+  <string name="LSLTipText_llSetText" translate="false">
+llSetText(string text, vector color, float alpha)
+Displays text that hovers over the prim with specific color and translucency specified with alpha
+  </string>
+  <string name="LSLTipText_llWater" translate="false">
+float llWater(vector offset)
+Returns the water height below the object position + offset
+  </string>
+  <string name="LSLTipText_llPassTouches" translate="false">
+llPassTouches(integer pass)
+If pass == TRUE, touches are passed from children on to parents
+  </string>
+  <string name="LSLTipText_llRequestAgentData" translate="false">
+key llRequestAgentData(key id, integer data)
+Requests data about agent id. When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llRequestInventoryData" translate="false">
+key llRequestInventoryData(string name)
+Requests data from object&apos;s inventory object. When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llSetDamage" translate="false">
+llSetDamage(float damage)
+Sets the amount of damage that will be done when this object hits an avatar.
+  </string>
+  <string name="LSLTipText_llTeleportAgentHome" translate="false">
+llTeleportAgentHome(key id)
+Teleports avatar on the owner&apos;s land to their home location without any warning
+  </string>
+  <string name="LSLTipText_llModifyLand" translate="false">
+llModifyLand(integer action, integer brush)
+Modifies land using the specified action on the specified brush size of land
+  </string>
+  <string name="LSLTipText_llCollisionSound" translate="false">
+llCollisionSound(string impact_sound, float impact_volume)
+Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume
+  </string>
+  <string name="LSLTipText_llCollisionSprite" translate="false">
+llCollisionSprite(string impact_sprite)
+Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress)
+  </string>
+  <string name="LSLTipText_llGetAnimation" translate="false">
+string llGetAnimation(key id)
+Returns the name of the currently playing locomotion animation for avatar id
+  </string>
+  <string name="LSLTipText_llResetScript" translate="false">
+llResetScript()
+Resets the script
+  </string>
+  <string name="LSLTipText_llMessageLinked" translate="false">
+llMessageLinked(integer linknum, integer num, string str, key id)
+Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum.
+  </string>
+  <string name="LSLTipText_llPushObject" translate="false">
+llPushObject(key id, vector impulse, vector ang_impulse, integer local)
+Applies impulse and ang_impulse to object id
+  </string>
+  <string name="LSLTipText_llPassCollisions" translate="false">
+llPassCollisions(integer pass)
+If pass == TRUE, collisions are passed from children on to parents (default is FALSE)
+  </string>
+  <string name="LSLTipText_llGetScriptName" translate="false">
+string llGetScriptName()
+Returns the name of the script that this function is used in
+  </string>
+  <string name="LSLTipText_llGetNumberOfSides" translate="false">
+integer llGetNumberOfSides()
+Returns the number of faces (or sides) of the prim
+  </string>
+  <string name="LSLTipText_llAxisAngle2Rot" translate="false">
+rotation llAxisAngle2Rot(vector axis, float angle)
+Returns the rotation that is a generated angle about axis
+  </string>
+  <string name="LSLTipText_llRot2Axis" translate="false">
+vector llRot2Axis(rotation rot)
+Returns the rotation axis represented by rot
+  </string>
+  <string name="LSLTipText_llRot2Angle" translate="false">
+float llRot2Angle(rotation rot)
+Returns the rotation angle represented by rot
+  </string>
+  <string name="LSLTipText_llAcos" translate="false">
+float llAcos(float val)
+Returns the arccosine in radians of val
+  </string>
+  <string name="LSLTipText_llAsin" translate="false">
+float llAsin(float val)
+Returns the arcsine in radians of val
+  </string>
+  <string name="LSLTipText_llAngleBetween" translate="false">
+float llAngleBetween(rotation a, rotation b)
+Returns angle between rotation a and b
+  </string>
+  <string name="LSLTipText_llGetInventoryKey" translate="false">
+key llGetInventoryKey(string name)
+Returns the key that is the UUID of the inventory name
+  </string>
+  <string name="LSLTipText_llAllowInventoryDrop" translate="false">
+llAllowInventoryDrop(integer add)
+If add == TRUE, users without modify permissions can still drop inventory items onto a prim
+  </string>
+  <string name="LSLTipText_llGetSunDirection" translate="false">
+vector llGetSunDirection()
+Returns a normalized vector of the direction of the sun in the region
+  </string>
+  <string name="LSLTipText_llGetTextureOffset" translate="false">
+vector llGetTextureOffset(integer face)
+Returns the texture offset of face in the x and y components of a vector
+  </string>
+  <string name="LSLTipText_llGetTextureScale" translate="false">
+vector llGetTextureScale(integer side)
+Returns the texture scale of side in the x and y components of a vector
+  </string>
+  <string name="LSLTipText_llGetTextureRot" translate="false">
+float llGetTextureRot(integer side)
+Returns the texture rotation of side
+  </string>
+  <string name="LSLTipText_llSubStringIndex" translate="false">
+integer llSubStringIndex(string source, string pattern)
+Returns an integer that is the index in source where pattern first appears.
+(Returns -1 if not found)
+  </string>
+  <string name="LSLTipText_llGetOwnerKey" translate="false">
+key llGetOwnerKey(key id)
+Returns the owner of object id
+  </string>
+  <string name="LSLTipText_llGetCenterOfMass" translate="false">
+vector llGetCenterOfMass()
+Returns the prim&apos;s center of mass (unless called from the root prim, where it returns the object&apos;s center of mass)
+  </string>
+  <string name="LSLTipText_llListSort" translate="false">
+list llListSort(list src, integer stride, integer ascending)
+Sorts the list into blocks of stride, in ascending order if ascending == TRUE.
+The sort order is affected by type.
+  </string>
+  <string name="LSLTipText_llGetListLength" translate="false">
+integer llGetListLength(list src)
+Returns the number of elements in the list
+  </string>
+  <string name="LSLTipText_llList2Integer" translate="false">
+integer llList2Integer(list src, integer index)
+Copies the integer at index in the list
+  </string>
+  <string name="LSLTipText_llList2Float" translate="false">
+float llList2Float(list src, integer index)
+Copies the float at index in the list
+  </string>
+  <string name="LSLTipText_llList2String" translate="false">
+string llList2String(list src, integer index)
+Copies the string at index in the list
+  </string>
+  <string name="LSLTipText_llList2Key" translate="false">
+key llList2Key(list src, integer index)
+Copies the key at index in the list
+  </string>
+  <string name="LSLTipText_llList2Vector" translate="false">
+vector llList2Vector(list src, integer index)
+Copies the vector at index in the list
+  </string>
+  <string name="LSLTipText_llList2Rot" translate="false">
+rotation llList2Rot(list src, integer index)
+Copies the rotation at index in the list
+  </string>
+  <string name="LSLTipText_llList2List" translate="false">
+list llList2List(list src, integer start, integer end)
+Copies the slice of the list from start to end
+  </string>
+  <string name="LSLTipText_llDeleteSubList" translate="false">
+list llDeleteSubList(list src, integer start, integer end)
+Removes the slice from start to end and returns the remainder of the list
+  </string>
+  <string name="LSLTipText_llGetListEntryType" translate="false">
+integer llGetListEntryType(list src, integer index)
+Returns the type of the index entry in the list
+(TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)
+  </string>
+  <string name="LSLTipText_llList2CSV" translate="false">
+string llList2CSV(list src)
+Creates a string of comma separated values from list
+  </string>
+  <string name="LSLTipText_llCSV2List" translate="false">
+list llCSV2List(string src)
+Creates a list from a string of comma separated values
+  </string>
+  <string name="LSLTipText_llListRandomize" translate="false">
+list llListRandomize(list src, integer stride)
+Returns a randomized list of blocks of size stride
+  </string>
+  <string name="LSLTipText_llList2ListStrided" translate="false">
+list llList2ListStrided(list src, integer start, integer end, integer stride)
+Copies the strided slice of the list from start to end
+  </string>
+  <string name="LSLTipText_llGetRegionCorner" translate="false">
+vector llGetRegionCorner()
+Returns a vector in meters that is the global location of the south-west corner of the region which the object is in
+  </string>
+  <string name="LSLTipText_llListInsertList" translate="false">
+list llListInsertList(list dest, list src, integer start)
+Returns a list that contains all the elements from dest but with the elements from src inserted at position start
+  </string>
+  <string name="LSLTipText_llListFindList" translate="false">
+integer llListFindList(list src, list test)
+Returns the index of the first instance of test in src.
+(Returns -1 if not found)
+  </string>
+  <string name="LSLTipText_llGetObjectName" translate="false">
+string llGetObjectName()
+Returns the name of the prim which the script is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectName" translate="false">
+llSetObjectName(string name)
+Sets the prim&apos;s name to the name parameter
+  </string>
+  <string name="LSLTipText_llGetDate" translate="false">
+string llGetDate()
+Returns the current date in the UTC time zone in the format YYYY-MM-DD
+  </string>
+  <string name="LSLTipText_llEdgeOfWorld" translate="false">
+integer llEdgeOfWorld(vector pos, vector dir)
+Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region)
+  </string>
+  <string name="LSLTipText_llGetAgentInfo" translate="false">
+integer llGetAgentInfo(key id)
+Returns an integer bitfield containing the agent information about id.
+Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.
+  </string>
+  <string name="LSLTipText_llAdjustSoundVolume" translate="false">
+llAdjustSoundVolume(float volume)
+Adjusts volume of attached sound (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llSetSoundQueueing" translate="false">
+llSetSoundQueueing(integer queue)
+Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default])
+  </string>
+  <string name="LSLTipText_llSetSoundRadius" translate="false">
+llSetSoundRadius(float radius)
+Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)
+  </string>
+  <string name="LSLTipText_llKey2Name" translate="false">
+string llKey2Name(key id)
+Returns the name of the prim or avatar specified by id.
+(The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.)
+  </string>
+  <string name="LSLTipText_llSetTextureAnim" translate="false">
+llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animates the texture on the specified face/faces
+  </string>
+  <string name="LSLTipText_llTriggerSoundLimited" translate="false">
+llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west)
+Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west
+  </string>
+  <string name="LSLTipText_llEjectFromLand" translate="false">
+llEjectFromLand(key avatar)
+Ejects avatar from the parcel
+  </string>
+  <string name="LSLTipText_llParseString2List" translate="false">
+list llParseString2List(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers
+(separators and spacers must be lists of strings, maximum of 8 each)
+  </string>
+  <string name="LSLTipText_llOverMyLand" translate="false">
+integer llOverMyLand(key id)
+Returns TRUE if id is over land owned by the script owner, otherwise FALSE
+  </string>
+  <string name="LSLTipText_llGetLandOwnerAt" translate="false">
+key llGetLandOwnerAt(vector pos)
+Returns the key of the land owner, returns NULL_KEY if public
+  </string>
+  <string name="LSLTipText_llGetNotecardLine" translate="false">
+key llGetNotecardLine(string name, integer line)
+Returns line line of notecard name via the dataserver event
+  </string>
+  <string name="LSLTipText_llGetAgentSize" translate="false">
+vector llGetAgentSize(key id)
+If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR
+  </string>
+  <string name="LSLTipText_llSameGroup" translate="false">
+integer llSameGroup(key id)
+Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE
+  </string>
+  <string name="LSLTipText_llUnSit" translate="false">
+key llUnSit(key id)
+If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object&apos;s owner, the avatar is forced to stand up
+  </string>
+  <string name="LSLTipText_llGroundSlope" translate="false">
+vector llGroundSlope(vector offset)
+Returns the ground slope below the object position + offset
+  </string>
+  <string name="LSLTipText_llGroundNormal" translate="false">
+vector llGroundNormal(vector offset)
+Returns the ground normal below the object position + offset
+  </string>
+  <string name="LSLTipText_llGroundContour" translate="false">
+vector llGroundCountour(vector offset)
+Returns the ground contour direction below the object position + offset
+  </string>
+  <string name="LSLTipText_llGetAttached" translate="false">
+integer llGetAttached()
+Returns the object&apos;s attachment point, or 0 if not attached
+  </string>
+  <string name="LSLTipText_llGetFreeMemory" translate="false">
+integer llGetFreeMemory()
+Returns the number of free bytes of memory the script can use
+  </string>
+  <string name="LSLTipText_llGetRegionName" translate="false">
+string llGetRegionName()
+Returns the current region name
+  </string>
+  <string name="LSLTipText_llGetRegionTimeDilation" translate="false">
+float llGetRegionTimeDilation()
+Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation)
+  </string>
+  <string name="LSLTipText_llGetRegionFPS" translate="false">
+float llGetRegionFPS()
+Returns the mean region frames per second
+  </string>
+  <string name="LSLTipText_llParticleSystem" translate="false">
+llParticleSystem(list rules)
+Creates a particle system based on rules.  An empty list removes the particle system.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+  </string>
+  <string name="LSLTipText_llGroundRepel" translate="false">
+llGroundRepel(float height, integer water, float tau)
+Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE)
+  </string>
+  <string name="LSLTipText_llGiveInventoryList" translate="false">
+llGiveInventoryList(key target, string folder, list inventory)
+Gives inventory items to target, creating a new folder to put them in
+  </string>
+  <string name="LSLTipText_llSetVehicleType" translate="false">
+llSetVehicleType(integer type)
+Sets the vehicle to one of the default types
+  </string>
+  <string name="LSLTipText_llSetVehicleFloatParam" translate="false">
+llSetVehicleFloatParam(integer param, float value)
+Sets the specified vehicle float parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleVectorParam" translate="false">
+llSetVehicleVectorParam(integer param, vector vec)
+Sets the specified vehicle vector parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleRotationParam" translate="false">
+llSetVehicleVectorParam(integer param, rotation rot)
+Sets the specified vehicle rotation parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleFlags" translate="false">
+llSetVehicleFlags(integer flags)
+Sets the enabled bits in &apos;flags&apos;
+  </string>
+  <string name="LSLTipText_llRemoveVehicleFlags" translate="false">
+llRemoveVehicleFlags(integer flags)
+Removes the enabled bits in &apos;flags&apos;
+  </string>
+  <string name="LSLTipText_llSitTarget" translate="false">
+llSitTarget(vector offset, rotation rot)
+Sets the sit location for the prim.  If offset == &lt;0,0,0&gt; then the sit target is removed.
+  </string>
+  <string name="LSLTipText_llAvatarOnSitTarget" translate="false">
+key llAvatarOnSitTarget()
+If an avatar is seated on the sit target, returns the avatar&apos;s key, otherwise NULL_KEY
+  </string>
+  <string name="LSLTipText_llAddToLandPassList" translate="false">
+llAddToLandPassList(key avatar, float hours)
+Adds avatar to the land pass list for hours, or indefinitely if hours is 0
+  </string>
+  <string name="LSLTipText_llSetTouchText" translate="false">
+llSetTouchText(string text)
+Displays text rather than the default &apos;Touch&apos; in the pie menu
+  </string>
+  <string name="LSLTipText_llSetSitText" translate="false">
+llSetSitText(string text)
+Displays text rather than the default &apos;Sit Here&apos; in the pie menu
+  </string>
+  <string name="LSLTipText_llSetCameraEyeOffset" translate="false">
+llSetCameraEyeOffset(vector offset)
+Sets the camera eye offset for avatars that sit on the object
+  </string>
+  <string name="LSLTipText_llSetCameraAtOffset" translate="false">
+llSetCameraAtOffset(vector offset)
+Sets the point the camera is looking at to offset for avatars that sit on the object
+  </string>
+  <string name="LSLTipText_llDumpList2String" translate="false">
+string llDumpList2String(list src, string separator)
+Returns the list in a single string, using separator between the entries
+  </string>
+  <string name="LSLTipText_llScriptDanger" translate="false">
+integer llScriptDanger(vector pos)
+Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
+  </string>
+  <string name="LSLTipText_llDialog" translate="false">
+llDialog(key avatar, string message, list buttons, integer chat_channel)
+Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
+If a button is pressed, the avatar says the text of the button label on chat_channel.
+  </string>
+  <string name="LSLTipText_llVolumeDetect" translate="false">
+llVolumeDetect(integer detect)
+If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating.
+Must be applied to the root prim.
+  </string>
+  <string name="LSLTipText_llResetOtherScript" translate="false">
+llResetOtherScript(string name)
+Resets script name
+  </string>
+  <string name="LSLTipText_llGetScriptState" translate="false">
+integer llGetScriptState(string name)
+Returns TRUE if the script name is running
+  </string>
+  <string name="LSLTipText_llRemoteLoadScript" translate="false">
+DEPRECATED!  Please use llRemoteLoadScriptPin instead.
+  </string>
+  <string name="LSLTipText_llSetRemoteScriptAccessPin" translate="false">
+llSetRemoteScriptAccessPin(integer pin)
+If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored.
+  </string>
+  <string name="LSLTipText_llRemoteLoadScriptPin" translate="false">
+llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
+Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used.
+If running == TRUE, starts the script with start_param
+  </string>
+  <string name="LSLTipText_llOpenRemoteDataChannel" translate="false">
+llOpenRemoteDataChannel()
+Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available
+  </string>
+  <string name="LSLTipText_llSendRemoteData" translate="false">
+key llSendRemoteData(key channel, string dest, integer idata, string sdata)
+Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.
+Returns a key that is the message_id for the resulting remote_data events.
+  </string>
+  <string name="LSLTipText_llRemoteDataReply" translate="false">
+llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
+Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata
+  </string>
+  <string name="LSLTipText_llCloseRemoteDataChannel" translate="false">
+llCloseRemoteDataChannel(key channel)
+Closes XML-RPC channel
+  </string>
+  <string name="LSLTipText_llMD5String" translate="false">
+string llMD5String(string src, integer nonce)
+Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce
+  </string>
+  <string name="LSLTipText_llSetPrimitiveParams" translate="false">
+llSetPrimitiveParams(list rules)
+Sets the prim&apos;s parameters according to rules
+  </string>
+  <string name="LSLTipText_llStringToBase64" translate="false">
+string llStringToBase64(string str)
+Converts a string to the Base64 representation of the string
+  </string>
+  <string name="LSLTipText_llBase64ToString" translate="false">
+string llBase64ToString(string str)
+Converts a Base64 string to a conventional string.
+If the conversion creates any unprintable characters, they are converted to spaces.
+  </string>
+  <string name="LSLTipText_llXorBase64Strings" translate="false">
+string llXorBase64Strings(string s1, string s2)
+DEPRECATED!  Please use llXorBase64StringsCorrect instead.
+Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string.  s2 repeats if it is shorter than s1.  Retained for backwards compatability.
+  </string>
+  <string name="LSLTipText_llRemoteDataSetRegion" translate="false">
+llRemoteDataSetRegion()
+DEPRECATED!  Please use llOpenRemoteDataChannel instead.
+If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions.
+  </string>
+  <string name="LSLTipText_llLog10" translate="false">
+float llLog10(float val)
+Returns the base 10 logarithm of val.  Returns zero if val &lt;= 0.
+  </string>
+  <string name="LSLTipText_llLog" translate="false">
+float llLog(float val)
+Returns the natural logarithm of val.  Returns zero if val &lt;= 0.
+  </string>
+  <string name="LSLTipText_llGetAnimationList" translate="false">
+list llGetAnimationList(key id)
+Returns a list of keys of playing animations for avatar described by id
+  </string>
+  <string name="LSLTipText_llSetParcelMusicURL" translate="false">
+llSetParcelMusicURL(string url)
+Sets the streaming audio URL for the parcel which the object is on
+  </string>
+  <string name="LSLTipText_llGetRootPosition" translate="false">
+vector llGetRootPosition()
+Returns the position (in region coordinates) of the root prim of the object which the script is attached to
+  </string>
+  <string name="LSLTipText_llGetRootRotation" translate="false">
+rotation llGetRootRotation()
+Returns the rotation (relative to the region) of the root prim of the object which the script is attached to
+  </string>
+  <string name="LSLTipText_llGetObjectDesc" translate="false">
+string llGetObjectDesc()
+Returns the description of the prim the script is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectDesc" translate="false">
+llSetObjectDesc(string name)
+Sets the prim&apos;s description
+  </string>
+  <string name="LSLTipText_llGetCreator" translate="false">
+key llGetCreator()
+Returns a key for the creator of the prim
+  </string>
+  <string name="LSLTipText_llGetTimestamp" translate="false">
+string llGetTimestamp()
+Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ
+  </string>
+  <string name="LSLTipText_llSetLinkAlpha" translate="false">
+llSetLinkAlpha(integer linknumber, float alpha, integer face)
+If a prim exists in the link chain at linknumber, sets face to alpha
+  </string>
+  <string name="LSLTipText_llGetNumberOfPrims" translate="false">
+integer llGetNumberOfPrims()
+Returns the number of prims in a link set the script is attached to
+  </string>
+  <string name="LSLTipText_llGetNumberOfNotecardLines" translate="false">
+key llGetNumberOfNotecardLines(string name)
+Returns number of lines in notecard name via the dataserver event (cast return value to integer)
+  </string>
+  <string name="LSLTipText_llGetBoundingBox" translate="false">
+list llGetBoundingBox(key object)
+Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ]
+  </string>
+  <string name="LSLTipText_llGetGeometricCenter" translate="false">
+vector llGetGeometricCenter()
+Returns the geometric center of the linked set the script is attached to.
+  </string>
+  <string name="LSLTipText_llGetPrimitiveParams" translate="false">
+list llGetPrimitiveParams(list params)
+Returns the primitive parameters specified in the params list.
+  </string>
+  <string name="LSLTipText_llIntegerToBase64" translate="false">
+string llIntegerToBase64(integer number)
+Returns a string that is a Base64 big endian encode of number
+  </string>
+  <string name="LSLTipText_llBase64ToInteger" translate="false">
+integer llBase64ToInteger(string str)
+Returns an integer that is the str Base64 decoded as a big endian integer
+  </string>
+  <string name="LSLTipText_llGetGMTclock" translate="false">
+float llGetGMTclock()
+Returns the time in seconds since midnight GMT
+  </string>
+  <string name="LSLTipText_llGetSimulatorHostname" translate="false">
+string llGetSimulatorHostname()
+Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog)
+  </string>
+  <string name="LSLTipText_llSetLocalRot" translate="false">
+llSetLocalRot(rotation rot)
+Sets the rotation of a child prim relative to the root prim
+  </string>
+  <string name="LSLTipText_llParseStringKeepNulls" translate="false">
+list llParseStringKeepNulls(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated.
+(separators and spacers must be lists of strings, maximum of 8 each)
+  </string>
+  <string name="LSLTipText_llRezAtRoot" translate="false">
+llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner&apos;s inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter
+  </string>
+  <string name="LSLTipText_llGetObjectPermMask" translate="false">
+integer llGetObjectPermMask(integer mask)
+Returns the requested permission mask for the root object the task is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectPermMask" translate="false">
+llSetObjectPermMask(integer mask, integer value)
+Sets the given permission mask to the new value on the root object the task is attached to (requires God Mode)
+  </string>
+  <string name="LSLTipText_llGetInventoryPermMask" translate="false">
+integer llGetInventoryPermMask(string item, integer mask)
+Returns the requested permission mask for the inventory item
+  </string>
+  <string name="LSLTipText_llSetInventoryPermMask" translate="false">
+llSetInventoryPermMask(string item, integer mask, integer value)
+Sets the given permission mask to the new value on the inventory item (requires God Mode)
+  </string>
+  <string name="LSLTipText_llGetInventoryCreator" translate="false">
+key llGetInventoryCreator(string item)
+Returns a key for the creator of the inventory item
+  </string>
+  <string name="LSLTipText_llOwnerSay" translate="false">
+llOwnerSay(string msg)
+Says msg to owner only.  (Owner must be in the same region.)
+  </string>
+  <string name="LSLTipText_llRequestSimulatorData" translate="false">
+key llRequestSimulatorData(string simulator, integer data)
+Requests data about simulator.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llForceMouselook" translate="false">
+llForceMouselook(integer mouselook)
+If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode
+  </string>
+  <string name="LSLTipText_llGetObjectMass" translate="false">
+float llGetObjectMass(key id)
+Returns the mass of the avatar or object in the region
+  </string>
+  <string name="LSLTipText_llListReplaceList" translate="false">
+list llListReplaceList(list dest, list src, integer start, integer end)
+Returns a list that is dest with start through end removed and src inserted at start
+  </string>
+  <string name="LSLTipText_llLoadURL" translate="false">
+llLoadURL(key avatar, string message, string url)
+Shows a dialog to avatar offering to load the web page at url with a message.
+If user clicks yes, launches the page in their web browser.
+  </string>
+  <string name="LSLTipText_llParcelMediaCommandList" translate="false">
+llParcelMediaCommandList(list command)
+Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media
+  </string>
+  <string name="LSLTipText_llParcelMediaQuery" translate="false">
+list llParcelMediaQuery(list query)
+Returns a list containing results of the sent query
+  </string>
+  <string name="LSLTipText_llModPow" translate="false">
+integer llModPow(integer a, integer b, integer c)
+Returns a raised to the b power, mod c. ( (a**b)%c )
+b is capped at 0xFFFF (16 bits).
+  </string>
+  <string name="LSLTipText_llGetInventoryType" translate="false">
+integer llGetInventoryType(string name)
+Returns the type of the inventory item name
+  </string>
+  <string name="LSLTipText_llSetPayPrice" translate="false">
+llSetPayPrice(integer price, list quick_pay_buttons)
+Sets the default amount on the dialog that appears when someone chooses to pay this prim
+  </string>
+  <string name="LSLTipText_llGetCameraPos" translate="false">
+vector llGetCameraPos()
+Returns the current camera position for the agent the task has permissions for
+  </string>
+  <string name="LSLTipText_llGetCameraRot" translate="false">
+rotation llGetCameraRot()
+Returns the current camera orientation for the agent the task has permissions for
+  </string>
+  <string name="LSLTipText_llSetPrimURL" translate="false">
+llSetPrimURL(string url)
+Updates the URL for the web page shown on the sides of the object
+  </string>
+  <string name="LSLTipText_llRefreshPrimURL" translate="false">
+llRefreshPrimURL()
+Reloads the web page shown on the sides of the object
+  </string>
+  <string name="LSLTipText_llEscapeURL" translate="false">
+string llEscapeURL(string url)
+Returns an escaped/encoded version of url, replacing spaces with %20 etc.
+  </string>
+  <string name="LSLTipText_llUnescapeURL" translate="false">
+string llUnescapeURL(string url)
+Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc.
+  </string>
+  <string name="LSLTipText_llMapDestination" translate="false">
+llMapDestination(string simname, vector pos, vector look_at)
+Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.)
+Only works for scripts attached to avatar, or during touch events.
+  </string>
+  <string name="LSLTipText_llAddToLandBanList" translate="false">
+llAddToLandBanList(key avatar, float hours)
+Adds avatar to the land ban list for hours, or indefinitely if hours is 0
+  </string>
+  <string name="LSLTipText_llRemoveFromLandPassList" translate="false">
+llRemoveFromLandPassList(key avatar)
+Removes avatar from the land pass list
+  </string>
+  <string name="LSLTipText_llRemoveFromLandBanList" translate="false">
+llRemoveFromLandBanList(key avatar)
+Removes avatar from the land ban list
+  </string>
+  <string name="LSLTipText_llSetCameraParams" translate="false">
+llSetCameraParams(list rules)
+Sets multiple camera parameters at once.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+  </string>
+  <string name="LSLTipText_llClearCameraParams" translate="false">
+llClearCameraParams()
+Resets all camera parameters to default values and turns off scripted camera control
+  </string>
+  <string name="LSLTipText_llListStatistics" translate="false">
+float llListStatistics(integer operation, list src)
+Performs statistical aggregate functions on list src using LIST_STAT_* operations
+  </string>
+  <string name="LSLTipText_llGetUnixTime" translate="false">
+integer llGetUnixTime()
+Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock
+  </string>
+  <string name="LSLTipText_llGetParcelFlags" translate="false">
+integer llGetParcelFlags(vector pos)
+Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos
+  </string>
+  <string name="LSLTipText_llGetRegionFlags" translate="false">
+integer llGetRegionFlags()
+Returns the region flags (REGION_FLAG_*) for the region the object is in
+  </string>
+  <string name="LSLTipText_llXorBase64StringsCorrect" translate="false">
+string llXorBase64StringsCorrect(string s1, string s2)
+Correctly performs an exclusive or on two Base64 strings and returns a Base64 string.
+s2 repeats if it is shorter than s1.
+  </string>
+  <string name="LSLTipText_llHTTPRequest" translate="false">
+llHTTPRequest(string url, list parameters, string body)
+Sends an HTTP request to the specified url with the body of the request and parameters
+  </string>
+  <string name="LSLTipText_llResetLandBanList" translate="false">
+llResetLandBanList()
+Removes all Residents from the land ban list
+  </string>
+  <string name="LSLTipText_llResetLandPassList" translate="false">
+llResetLandPassList()
+Removes all Residents from the land access/pass list
+  </string>
+  <string name="LSLTipText_llGetObjectPrimCount" translate="false">
+integer llGetObjectPrimCount(key object_id)
+Returns the total number of prims for an object in the region
+  </string>
+  <string name="LSLTipText_llGetParcelPrimOwners" translate="false">
+list llGetParcelPrimOwners(vector pos)
+Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts.
+Requires owner-like permissions for the parcel.
+  </string>
+  <string name="LSLTipText_llGetParcelPrimCount" translate="false">
+integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
+Returns the number of prims on the parcel at pos of the given category.
+Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP
+  </string>
+  <string name="LSLTipText_llGetParcelMaxPrims" translate="false">
+integer llGetParcelMaxPrims(vector pos, integer sim_wide)
+Returns the maximum number of prims allowed on the parcel at pos
+  </string>
+  <string name="LSLTipText_llGetParcelDetails" translate="false">
+list llGetParcelDetails(vector pos, list params)
+Returns the parcel details specified in params for the parcel at pos.
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
+  </string>
+  <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
+llSetLinkPrimitiveParams(integer linknumber, list rules)
+Sets primitive parameters for linknumber based on rules
+  </string>
+  <string name="LSLTipText_llSetLinkTexture" translate="false">
+llSetLinkTexture(integer linknumber, string texture, integer face)
+Sets the texture of face for a task that exists in the link chain at linknumber
+  </string>
+  <string name="LSLTipText_llStringTrim" translate="false">
+string llStringTrim(string src, integer trim_type)
+Trims the leading and/or trailing white spaces from a string.
+trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.
+  </string>
+  <string name="LSLTipText_llRegionSay" translate="false">
+llRegionSay(integer channel, string msg)
+Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel
+  </string>
+  <string name="LSLTipText_llGetObjectDetails" translate="false">
+list llGetObjectDetails(key id, list params)
+Returns the object details specified in params for the object with key id.
+Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR
+  </string>
+  <string name="LSLTipText_llSetClickAction" translate="false">
+llSetClickAction(integer action)
+Sets the action performed when a prim is clicked upon
+  </string>
+  <string name="LSLTipText_llGetRegionAgentCount" translate="false">
+integer llGetRegionAgentCount()
+Returns the number of avatars in the region
+  </string>
+  <string name="LSLTipText_llTextBox" translate="false">
+llTextBox(key avatar, string message, integer chat_channel)
+Shows a window on the avatar&apos;s screen with the message.
+It contains a text box for input, and if entered that text is chatted on chat_channel.
+  </string>
+  <string name="LSLTipText_llGetAgentLanguage" translate="false">
+string llGetAgentLanguage(key avatar)
+Returns the language code of the preferred interface language of the avatar
+  </string>
+  <string name="LSLTipText_llDetectedTouchUV" translate="false">
+vector llDetectedTouchUV(integer index)
+Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchFace" translate="false">
+integer llDetectedTouchFace(integer index)
+Returns the index of the face where the avatar clicked in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchPos" translate="false">
+vector llDetectedTouchPos(integer index)
+Returns the position where the object was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchNormal" translate="false">
+vector llDetectedTouchNormal(integer index)
+Returns the surface normal for a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchBinormal" translate="false">
+vector llDetectedTouchBinormal(integer index)
+Returns the surface binormal for a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchST" translate="false">
+vector llDetectedTouchST(integer index)
+Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llSHA1String" translate="false">
+string llSHA1String(string src)
+Returns a string of 40 hex characters that is the SHA1 security Hash of src
+  </string>
+  <string name="LSLTipText_llGetFreeURLs" translate="false">
+integer llGetFreeURLs()
+Returns the number of available URLs for the current script
+  </string>
+  <string name="LSLTipText_llRequestURL" translate="false">
+key llRequestURL()
+Requests one HTTP:// url for use by this object.
+An http_request event is triggered with the results.
+  </string>
+  <string name="LSLTipText_llRequestSecureURL" translate="false">
+key llRequestSecureURL()
+Requests one HTTPS:// (SSL) url for use by this object.
+An http_request event is triggered with the results.
+  </string>
+  <string name="LSLTipText_llReleaseURL" translate="false">
+llReleaseURL(string url)
+Releases the specified URL, it will no longer be usable
+  </string>
+  <string name="LSLTipText_llHTTPResponse" translate="false">
+llHTTPResponse(key request_id, integer status, string body)
+Responds to request_id with status and body
+  </string>
+  <string name="LSLTipText_llGetHTTPHeader" translate="false">
+string llGetHTTPHeader(key request_id, string header)
+Returns the value for header for request_id
+  </string>
+  <string name="LSLTipText_llSetPrimMediaParams" translate="false">
+llSetPrimMediaParams(integer face, list params)
+Sets the media params for a particular face on an object. If media is not already on this object, add it.
+List is a set of name/value pairs in no particular order.  Params not specified are unchanged, or if new media is added then set to the default specified.
+The possible names are below, along with the types of values and what they mean.
+  </string>
+  <string name="LSLTipText_llGetPrimMediaParams" translate="false">
+list llGetPrimMediaParams(integer face, list params)
+Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
+(Returns an empty list if no media exists on the face.)
+  </string>
+  <string name="LSLTipText_llClearPrimMedia" translate="false">
+llClearPrimMedia(integer face)
+Clears (deletes) the media and all params from the given face.
+  </string>
+  <string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
+llSetLinkPrimitiveParamsFast(integer linknumber,list rules)
+Set primitive parameters for linknumber based on rules.
+  </string>
+  <string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
+llGetLinkPrimitiveParams(integer linknumber,list rules)
+Get primitive parameters for linknumber based on rules.
+  </string>
+  <string name="LSLTipText_llLinkParticleSystem" translate="false">
+llLinkParticleSystem(integer linknumber,list rules)
+Creates a particle system based on rules.  Empty list removes particle system from object.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
+  </string>
+  <string name="LSLTipText_llSetLinkTextureAnim" translate="false">
+llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animate the texture on the specified prim&apos;s face/faces.
+  </string>
+  <string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
+integer llGetLinkNumberOfSides(integer link)
+Returns the number of sides of the specified linked prim.
+  </string>
+  <string name="LSLTipText_llGetUsername" translate="false">
+string llGetUsername(key id)
+Returns the single-word username of an avatar, iff the avatar is in the current region, otherwise the empty string.
+  </string>
+  <string name="LSLTipText_llRequestUsername" translate="false">
+key llRequestUsername(key id)
+Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llGetDisplayName" translate="false">
+string llGetDisplayName(key id)
+Returns the name of an avatar, iff the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername.  Use llRequestDisplayName if you absolutely must have the display name.
+  </string>
+  <string name="LSLTipText_llRequestDisplayName" translate="false">
+key llRequestDisplayName(key id)
+Requests name of an avatar.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llGetEnv" translate="false">
+llGetEnv(string name)
+Returns a string with the requested data about the region
+  </string>
+  <string name="LSLTipText_llCastRay" translate="false">
+llCastRay(vector start, vector end, list params)
+Casts a ray into the physics world from &apos;start&apos; to &apos;end&apos; and returns data according to details in params.
+  </string>
+  <string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
+  </string>
+  <string name="LSLTipText_llGetSPMaxMemory" translate="false">
+integer llGetSPMaxMemory()
+Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
+  </string>
+  <string name="LSLTipText_llGetUsedMemory" translate="false">
+integer llGetUsedMemory()
+Returns the current used memory for the current script. Non-mono scripts always use 16k.
+  </string>
+  <string name="LSLTipText_llScriptProfiler" translate="false">
+llScriptProfiler(integer flags)
+Enabled or disables script profiling options. Currently only supports PROFILE_SCRIPT_MEMORY (mono only) and PROFILE_NONE.
+MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
+  </string>
+  <string name="LSLTipText_llSetMemoryLimit" translate="false">
+integer llSetMemoryLimit(integer mem)
+  </string>
+  <string name="LSLTipText_llGetMemoryLimit" translate="false">
+integer llGetMemoryLimit()
+  </string>
+  <string name="LSLTipText_llSetLinkMedia" translate="false">
+llSetLinkMedia(integer link, integer face, list params)
+Set the media params for a particular face on linked prim.  List is a set of name/value pairs (in no particular order). The possible names are below, along with the types of values and what they mean.  If media is not already on this object, add it. Params not specified are unchanged, or if new media is added set to the default specified.
+  </string>
+  <string name="LSLTipText_llGetLinkMedia" translate="false">
+list llGetLinkMedia(integer link, integer face, list params)
+Get the media params for a particular face on linked prim, given the desired list of names. Returns a list of values in the order requested.  Returns an empty list if no media exists on the face.
+  </string>
+  <string name="LSLTipText_llClearLinkMedia" translate="false">
+llClearLinkMedia(integer link, integer face)
+Clears (deletes) the media and all params from the given face on linked prim.
+  </string>
+  <string name="LSLTipText_llSetContentType" translate="false">
+llSetContentType(key id, integer content_type)
+  </string>
+  <string name="LSLTipText_llLinkSitTarget" translate="false">
+llLinkSitTarget(integer link, vector offset, rotation rot)
+Set the sit location for this object (if offset == &lt;0,0,0&gt; clear it)
+  </string>
+  <string name="LSLTipText_llAvatarOnLinkSitTarget" translate="false">
+key llAvatarOnLinkSitTarget(integer link)
+If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KEY otherwise
+  </string>
+  <string name="LSLTipText_llSetLinkCamera" translate="false">
+llSetLinkCamera(integer link, vector eye, vector at)
+  </string>
+  <string name="LSLTipText_llSetVelocity" translate="false">
+llSetVelocity(vector velocity, integer local)
+Sets an objects velocity, in local coords if local == TRUE (if the script is physical)
+  </string>
+  <string name="LSLTipText_llSetAngularVelocity" translate="false">
+llSetAngularVelocity(vector angular_velocity, integer local)
+Sets an objects angular velocity, in local coords if local == TRUE (if the script is physical)
+  </string>
+  <string name="LSLTipText_llSetPhysicsMaterial" translate="false">
+llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
+Sets the requested attributes of the root object&apos;s physics material.
+  </string>
+  <string name="LSLTipText_llGetPhysicsMaterial" translate="false">
+llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
+  </string>
+  <string name="LSLTipText_llGetMassMKS" translate="false">
+llGetMassMKS() returns the mass of the linkset in kilograms.
+  </string>
+  <string name="LSLTipText_llGenerateKey" translate="false">
+llGenerateKey()
+Retun a unique generated key
+  </string>
+  <string name="LSLTipText_llSetKeyframedMotion" translate="false">
+llSetKeyframedMotion(list keyframes, list options)
+Requests that a nonphysical object be keyframed according to keyframe list.
+  </string>
+  <string name="LSLTipText_llTransferLindenDollars" translate="false">
+key llTransferLindenDollars(key destination, integer amount)
+Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
+  </string>
+  <string name="LSLTipText_llGetParcelMusicURL" translate="false">
+string llGetParcelMusicURL()
+Gets the streaming audio URL for the parcel of land on which the object is located.
+  </string>
+  <string name="LSLTipText_llSetRegionPos" translate="false">
+integer llSetRegionPos(vector pos)
+Sets the position anywhere within the region (if the object isn&apos;t physical)
+  </string>
+  <string name="LSLTipText_llNavigateTo" translate="false">
+llNavigateTo(vector point, list options)
+For AI Character: Navigate to destination.
+  </string>
+  <string name="LSLTipText_llCreateCharacter" translate="false">
+llCreateCharacter(list options)
+Convert linkset to AI Character which can navigate the world.
+  </string>
+  <string name="LSLTipText_llPursue" translate="false">
+llPursue(key target, list options)
+For AI Character: Chase after a target.
+  </string>
+  <string name="LSLTipText_llWanderWithin" translate="false">
+llWanderWithin(vector center, float radius, list options)
+For AI Character: Wander within a specified volume.
+  </string>
+  <string name="LSLTipText_llFleeFrom" translate="false">
+llFleeFrom(vector source, float radius, list options)
+For AI Character: Flee from a point.
+  </string>
+  <string name="LSLTipText_llPatrolPoints" translate="false">
+llPatrolPoints(list points, list options)
+For AI Character: Patrol a list of points.
+  </string>
+  <string name="LSLTipText_llExecCharacterCmd" translate="false">
+llExecCharacterCmd(integer cmd, list options)
+For AI Character: Execute a character command.
+  </string>
+  <string name="LSLTipText_llDeleteCharacter" translate="false">
+llDeleteCharacter()
+Convert linkset from AI Character to Physics object.
+  </string>
+  <string name="LSLTipText_llUpdateCharacter" translate="false">
+llUpdateCharacter(list options)
+Change the AI Character&apos;s settings.
+  </string>
+  <string name="LSLTipText_llEvade" translate="false">
+llEvade(key target, list options)
+For AI Character: Evade a specified target.
+  </string>
+  <string name="LSLTipText_llGetClosestNavPoint" translate="false">
+list llGetClosestNavPoint(vector point, list options)
+For AI Character: Get the closest navigable point to the point provided.
+  </string>
+
+
+  <!-- Wearable Types -->
+  <string name="shape">シェイプ</string>
+  <string name="skin">スキン</string>
+  <string name="hair">髪</string>
+  <string name="eyes">目</string>
+  <string name="shirt">シャツ</string>
+  <string name="pants">ズボン</string>
+  <string name="shoes">靴</string>
+  <string name="socks">靴下</string>
+  <string name="jacket">ジャケット</string>
+  <string name="gloves">手袋</string>
+  <string name="undershirt">下着（上半身）</string>
+  <string name="underpants">下着（下半身）</string>
+  <string name="skirt">スカート</string>
+  <string name="alpha">アルファ</string>
+  <string name="tattoo">タトゥ</string>
+  <string name="universal">ユニバーサル</string>
+  <string name="physics">物理作用</string>
+  <string name="invalid">無効</string>
+  <string name="none">なし</string>
+  <string name="shirt_not_worn">シャツ未着用</string>
+  <string name="pants_not_worn">ズボン未着用</string>
+  <string name="shoes_not_worn">靴未着用</string>
+  <string name="socks_not_worn">靴下未着用</string>
+  <string name="jacket_not_worn">ジャケット未着用</string>
+  <string name="gloves_not_worn">手袋未着用</string>
+  <string name="undershirt_not_worn">下着（上半身）未着用</string>
+  <string name="underpants_not_worn">下着（下半身）未着用</string>
+
+  <!-- Not Worn Wearable Types -->
+  <string name="skirt_not_worn">スカート未着用</string>
+  <string name="alpha_not_worn">アルファ未着用</string>
+  <string name="tattoo_not_worn">タトゥ未着用</string>
+  <string name="universal_not_worn">ユニバーサルなし</string>
+  <string name="physics_not_worn">物理作用なし</string>
+  <string name="invalid_not_worn">無効</string>
+
+  <!-- Create new wearable of the specified type -->
+  <string name="create_new_shape">新しいシェイプを作成</string>
+  <string name="create_new_skin">新しいスキンを作成</string>
+  <string name="create_new_hair">新しい髪を作成</string>
+  <string name="create_new_eyes">新しい目を作成</string>
+  <string name="create_new_shirt">新しいシャツを作成</string>
+  <string name="create_new_pants">新しいズボンを作成</string>
+  <string name="create_new_shoes">新しい靴を作成</string>
+  <string name="create_new_socks">新しい靴下を作成</string>
+  <string name="create_new_jacket">新しい上着を作成</string>
+  <string name="create_new_gloves">新しい手袋を作成</string>
+  <string name="create_new_undershirt">新しい下着（上半身）を作成</string>
+  <string name="create_new_underpants">新しい下着（下半身）を作成</string>
+  <string name="create_new_skirt">新しいスカートを作成</string>
+  <string name="create_new_alpha">新しいアルファを作成</string>
+  <string name="create_new_tattoo">新しいタトゥを作成</string>
+  <string name="create_new_universal">新しいユニバーサルを作成</string>
+  <string name="create_new_physics">新しい物理作用を作成</string>
+  <string name="create_new_invalid">無効</string>
+
+  <!-- Wearable List-->
+  <string name="NewWearable">新しい[WEARABLE_ITEM]</string>
+
+  <!-- LLGroupNotify -->
+  <!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
+  <string name="next">次へ</string>
+  <string name="ok">OK</string>
+  <string name="GroupNotifyGroupNotice">グループ通知</string>
+  <string name="GroupNotifyGroupNotices">グループ通知</string>
+  <string name="GroupNotifySentBy">送信者</string>
+  <string name="GroupNotifyAttached">添付：</string>
+  <string name="GroupNotifyViewPastNotices">ここで過去の通知を表示するか、メッセージを受け取らない設定をします。</string>
+  <string name="GroupNotifyOpenAttachment">添付アイテムを開く</string>
+  <string name="GroupNotifySaveAttachment">添付アイテムを保存</string>
+
+  <string name="TeleportOffer">テレポートを送る</string>
+  <!-- start-up toast's string-->
+  <string name="StartUpNotifications">不在中に新しい通知が届きました。</string>
+  <!-- overflow toast's string-->
+  <string name="OverflowInfoChannelString">あなたにはさらに%d件の通知があります</string>
+
+
+  <!-- body parts -->
+  <string name="BodyPartsRightArm">右腕</string>
+  <string name="BodyPartsHead">頭</string>
+  <string name="BodyPartsLeftArm">左腕</string>
+  <string name="BodyPartsLeftLeg">左脚</string>
+  <string name="BodyPartsTorso">上半身</string>
+  <string name="BodyPartsRightLeg">右脚</string>
+  <string name="BodyPartsEnhancedSkeleton">拡張スケルトン</string>
+
+  <!-- slider -->
+  <string name="GraphicsQualityLow">低</string>
+  <string name="GraphicsQualityMid">中</string>
+  <string name="GraphicsQualityHigh">高</string>
+
+  <!-- mouselook -->
+  <string name="LeaveMouselook">ESCキーを押してワールドビューに戻ります</string>
+
+  <!-- inventory -->
+  <string name="InventoryNoMatchingItems">お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。</string>
+  <string name="InventoryNoMatchingRecentItems">お探しのものは見つかりましたか？[secondlife:///app/inventory/filters フィルタを表示]をお試しください。</string>
+  <string name="PlacesNoMatchingItems">お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。</string>
+  <string name="FavoritesNoMatchingItems">ここにランドマークをドラッグしてお気に入りに追加します。</string>
+  <string name="MarketplaceNoMatchingItems">アイテムが見つかりませんでした。検索文字列のスペルを確認して、もう一度やり直してください。</string>
+  <string name="InventoryNoTexture">インベントリ内にこのテクスチャのコピーがありません</string>
+  <string name="InventoryInboxNoItems">マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。</string>
+  <string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/?lang=ja-JP</string>
+  <string name="MarketplaceURL_CreateStore">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%9E%E3%83%BC%E3%82%B1%E3%83%83%E3%83%88%E3%83%97%E3%83%AC%E3%82%A4%E3%82%B9%E3%81%A7%E8%B2%A9%E5%A3%B2%E3%81%99%E3%82%8B-r769/</string>
+  <string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard?lang=ja-JP</string>
+  <string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports?lang=ja-JP</string>
+  <string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more?lang=ja-JP</string>
+  <string name="InventoryPlayAnimationTooltip">[再生]オプションでウィンドウを開ける。</string>
+  <string name="InventoryPlayGestureTooltip">インワールドで選択済みのジェスチャーを実行する。</string>
+  <string name="InventoryPlaySoundTooltip">[再生]オプションでウィンドウを開ける。</string>
+  <string name="InventoryOutboxNotMerchantTitle">マーケットプレイスでは誰でもアイテムを売ることができます。</string>
+  <string name="InventoryOutboxNotMerchantTooltip" />
+  <string name="InventoryOutboxNotMerchant">販売者になりたい方は、[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストアを作成]する必要があります。</string>
+  <string name="InventoryOutboxNoItemsTitle">アウトボックスは空です。</string>
+  <string name="InventoryOutboxNoItemsTooltip" />
+  <string name="InventoryOutboxNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグし、「マーケットプレイスに送信」をクリックします。</string>
+  <string name="InventoryOutboxInitializingTitle">マーケットプレイスの初期化。</string>
+  <string name="InventoryOutboxInitializing">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア]のアカウントにアクセスしています。</string>
+  <string name="InventoryOutboxErrorTitle">マーケットプレイス エラー</string>
+  <string name="InventoryOutboxError">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストア]がエラーを返しています。</string>
+  <string name="InventoryMarketplaceError">マーケットプレイスのリストを開くときにエラーが発生しました。引き続きこのメッセージを受信するには、Second Lifeのサポート（http://support.secondlife.com）にお問い合わせください</string>
+  <string name="InventoryMarketplaceListingsNoItemsTitle">マーケットプレイスのリストフォルダが空です。</string>
+  <string name="InventoryMarketplaceListingsNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。</string>
+  <string name="InventoryItemsCount">（[ITEMS_COUNT]個のアイテム）</string>
+  <string name="Marketplace Validation Warning Stock">バージョンフォルダには、在庫フォルダが含まれなければなりません。</string>
+  <string name="Marketplace Validation Error Mixed Stock">エラー：在庫フォルダ内のすべてのアイテムは、コピー不可で同じ種類でなければなりません。</string>
+  <string name="Marketplace Validation Error Subfolder In Stock">エラー：在庫フォルダにサブフォルダを含めることはできません。</string>
+  <string name="Marketplace Validation Warning Empty">警告：フォルダにアイテムが含まれていません。</string>
+  <string name="Marketplace Validation Warning Create Stock">警告：在庫フォルダを作成しています。</string>
+  <string name="Marketplace Validation Warning Create Version">警告：バージョンフォルダを作成しています。</string>
+  <string name="Marketplace Validation Warning Move">: 警告：アイテムを移動しています。</string>
+  <string name="Marketplace Validation Warning Delete">: 警告：フォルダの中身が在庫フォルダに移されました。空のフォルダを削除します。</string>
+  <string name="Marketplace Validation Error Stock Item">: エラー：在庫フォルダには、コピー不可アイテムを含める必要があります。</string>
+  <string name="Marketplace Validation Warning Unwrapped Item">: 警告：バージョンフォルダには、アイテムが含まれていなければなりません。</string>
+  <string name="Marketplace Validation Error">エラー：</string>
+  <string name="Marketplace Validation Warning">警告：</string>
+  <string name="Marketplace Validation Error Empty Version">警告：バージョンフォルダには、最低１アイテムが含まれなければなりません</string>
+  <string name="Marketplace Validation Error Empty Stock">警告：在庫フォルダには、最低１アイテムが含まれていなければなりません</string>
+
+  <string name="Marketplace Validation No Error">報告するエラーまたは警告はありません</string>
+  <string name="Marketplace Error None">エラーなし</string>
+  <string name="Marketplace Error Prefix">エラー：</string>
+  <string name="Marketplace Error Not Merchant">マーケットプレイスに商品を送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。</string>
+  <string name="Marketplace Error Not Accepted">アイテムをそのフォルダに移動できません。</string>
+  <string name="Marketplace Error Unsellable Item">このアイテムをマーケットプレイスで販売することはできません。</string>
+
+  <string name="MarketplaceNoID">Mkt ID なし</string>
+  <string name="MarketplaceLive">リスト掲載済み</string>
+  <string name="MarketplaceActive">有効</string>
+  <string name="MarketplaceMax">最大</string>
+  <string name="MarketplaceStock">在庫</string>
+  <string name="MarketplaceNoStock">在庫なし</string>
+  <string name="MarketplaceUpdating">アップデート中…</string>
+
+  <string name="UploadFeeInfo">料金はサブスクリプションのレベルにより異なります。レベルが高いほど、料金が下がります。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細]</string>
+
+  <string name="Open landmarks">オープン ランドマーク</string>
+  <string name="Unconstrained">アンコンストレインド（制約なし）</string>
+
+  <!-- use value="" because they have preceding spaces -->
+  <string name="no_transfer" value=" （再販・譲渡不可）" />
+  <string name="no_modify" value=" （編集不可）" />
+  <string name="no_copy" value=" （コピー不可）" />
+  <string name="worn" value=" （着用中）" />
+  <string name="link" value=" （リンク）" />
+  <string name="broken_link" value=" （壊れたリンク）" />
+  <string name="LoadingContents">コンテンツをロード中です…</string>
+  <string name="NoContents">コンテンツなし</string>
+  <string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT]に装着中）" />
+  <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])" />
+  <string name="ActiveGesture" value="[GESLABEL]（アクティブ）" />
+  <!-- Inventory permissions -->
+  <string name="PermYes">はい</string>
+  <string name="PermNo">いいえ</string>
+
+  <!-- Gestures labels -->
+  <!-- use value="" because they have preceding spaces -->
+  <string name="Chat Message" value="チャット：" />
+  <string name="Sound" value=" サウンド：" />
+  <string name="Wait" value=" --- 待機：:" />
+  <string name="AnimFlagStop" value=" アニメーションを停止：" />
+  <string name="AnimFlagStart" value=" アニメーションを開始：" />
+  <string name="Wave" value=" 手を振る" />
+  <string name="GestureActionNone" value="なし" />
+  <string name="HelloAvatar" value=" やあ、アバター！" />
+  <string name="ViewAllGestures" value="すべて表示 &gt;&gt;" />
+  <string name="GetMoreGestures" value="ショッピング &gt;&gt;" />
+  <string name="Animations" value="アニメーション、" />
+  <string name="Calling Cards" value="コーリングカード、" />
+  <string name="Clothing" value="服装、" />
+  <string name="Gestures" value="ジェスチャー、" />
+  <string name="Landmarks" value="ランドマーク、" />
+  <string name="Notecards" value="ノートカード、" />
+  <string name="Objects" value="オブジェクト、" />
+  <string name="Scripts" value="スクリプト、" />
+  <string name="Sounds" value="サウンド、" />
+  <string name="Textures" value="テクスチャ、" />
+  <string name="Snapshots" value="スナップショット、" />
+  <string name="No Filters" value="いいえ" />
+  <string name="Since Logoff" value="–ログオフ以来" />
+
+  <!-- inventory folder -->
+  <string name="InvFolder My Inventory">インベントリ</string>
+  <string name="InvFolder Library">ライブラリ</string>
+  <string name="InvFolder Textures">テクスチャ</string>
+  <string name="InvFolder Sounds">サウンド</string>
+  <string name="InvFolder Calling Cards">コーリングカード</string>
+  <string name="InvFolder Landmarks">ランドマーク</string>
+  <string name="InvFolder Scripts">スクリプト</string>
+  <string name="InvFolder Clothing">服装</string>
+  <string name="InvFolder Objects">オブジェクト</string>
+  <string name="InvFolder Notecards">ノートカード</string>
+  <string name="InvFolder New Folder">新規フォルダ</string>
+  <string name="InvFolder Inventory">インベントリ</string>
+  <string name="InvFolder Uncompressed Images">圧縮されていない画像</string>
+  <string name="InvFolder Body Parts">身体部位</string>
+  <string name="InvFolder Trash">ごみ箱</string>
+  <string name="InvFolder Photo Album">フォトアルバム</string>
+  <string name="InvFolder Lost And Found">遺失物</string>
+  <string name="InvFolder Uncompressed Sounds">圧縮されていないサウンド</string>
+  <string name="InvFolder Animations">アニメーション</string>
+  <string name="InvFolder Gestures">ジェスチャー</string>
+  <string name="InvFolder Favorite">お気に入り</string>
+  <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
+      Also, it can be written as "Favorite" or "Favorites".
+  We should localize all variants of them with the same value -->
+  <string name="InvFolder favorite">お気に入り</string>
+  <string name="InvFolder Favorites">お気に入り</string>
+  <string name="InvFolder favorites">お気に入り</string>
+  <string name="InvFolder Current Outfit">着用中のアウトフィット</string>
+  <string name="InvFolder Initial Outfits">最初のアウトフィット</string>
+  <string name="InvFolder My Outfits">アウトフィット</string>
+  <string name="InvFolder Accessories">アクセサリ</string>
+  <string name="InvFolder Meshes">メッシュ</string>
+  <string name="InvFolder Received Items">受け取った商品</string>
+  <string name="InvFolder Merchant Outbox">販売品ボックス</string>
+
+  <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
+  <string name="InvFolder Friends">フレンド</string>
+  <string name="InvFolder All">全員</string>
+
+  <string name="no_attachments">着用している装着物はありません</string>
+  <string name="Attachments remain">装着物（残りのスロット数：[COUNT]）</string>
+
+  <!-- inventory FVBridge -->
+  <!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
+  <string name="Buy">購入</string>
+  <string name="BuyforL$">L$ で購入</string>
+
+  <string name="Stone">石</string>
+  <string name="Metal">金属</string>
+  <string name="Glass">ガラス</string>
+  <string name="Wood">木</string>
+  <string name="Flesh">肌</string>
+  <string name="Plastic">プラスチック</string>
+  <string name="Rubber">ゴム</string>
+  <string name="Light">ライト</string>
+
+  <!-- keyboard -->
+  <string name="KBShift">Shift</string>
+  <string name="KBCtrl">Ctrl</string>
+
+  <!-- Avatar Skeleton -->
+  <string name="Chest">胸部</string>
+  <string name="Skull">頭蓋</string>
+  <string name="Left Shoulder">左肩</string>
+  <string name="Right Shoulder">右肩</string>
+  <string name="Left Hand">左手</string>
+  <string name="Right Hand">右手</string>
+  <string name="Left Foot">左足</string>
+  <string name="Right Foot">右足</string>
+  <string name="Spine">背骨</string>
+  <string name="Pelvis">骨盤</string>
+  <string name="Mouth">口</string>
+  <string name="Chin">あご</string>
+  <string name="Left Ear">左耳</string>
+  <string name="Right Ear">右耳</string>
+  <string name="Left Eyeball">左目眼球</string>
+  <string name="Right Eyeball">右目眼球</string>
+  <string name="Nose">鼻</string>
+  <string name="R Upper Arm">右上腕</string>
+  <string name="R Forearm">右前腕</string>
+  <string name="L Upper Arm">左上腕</string>
+  <string name="L Forearm">左前腕</string>
+  <string name="Right Hip">右腰</string>
+  <string name="R Upper Leg">右上脚</string>
+  <string name="R Lower Leg">右下脚</string>
+  <string name="Left Hip">左腰</string>
+  <string name="L Upper Leg">左上脚</string>
+  <string name="L Lower Leg">左下脚</string>
+  <string name="Stomach">腹</string>
+  <string name="Left Pec">左胸筋</string>
+  <string name="Right Pec">右胸筋</string>
+  <string name="Neck">首</string>
+  <string name="Avatar Center">アバターの中央</string>
+  <string name="Left Ring Finger">左薬指</string>
+  <string name="Right Ring Finger">右薬指</string>
+  <string name="Tail Base">しっぽのベース</string>
+  <string name="Tail Tip">しっぽの先</string>
+  <string name="Left Wing">左の翼</string>
+  <string name="Right Wing">右の翼</string>
+  <string name="Jaw">顎</string>
+  <string name="Alt Left Ear">代わりの左耳</string>
+  <string name="Alt Right Ear">代わりの右耳</string>
+  <string name="Alt Left Eye">代わりの左目</string>
+  <string name="Alt Right Eye">代わりの右目</string>
+  <string name="Tongue">舌</string>
+  <string name="Groin">脚の付け根</string>
+  <string name="Left Hind Foot">左後足</string>
+  <string name="Right Hind Foot">右後足</string>
+  <string name="Invalid Attachment">装着先が正しくありません</string>
+  <string name="ATTACHMENT_MISSING_ITEM">エラー：アイテムが見つかりません。</string>
+  <string name="ATTACHMENT_MISSING_BASE_ITEM">エラー：ベースアイテムが見つかりません。</string>
+  <string name="ATTACHMENT_NOT_ATTACHED">エラー：オブジェクトは現在のアウトフィットにありますが、添付されていません。</string>
+
+  <!-- Avatar age computation, see LLDateUtil::ageFromDate -->
+  <string name="YearsMonthsOld">[AGEYEARS][AGEMONTHS]</string>
+  <string name="YearsOld">[AGEYEARS]</string>
+  <string name="MonthsOld">[AGEMONTHS]</string>
+  <string name="WeeksOld">[AGEWEEKS]</string>
+  <string name="DaysOld">[AGEDAYS]</string>
+  <string name="TodayOld">本日参加</string>
+
+  <!-- Avatar complexity rendering messages, see llavatarrendernotifier. -->
+  <string name="av_render_everyone_now">あなたは、全員から見えるようになりました。</string>
+  <string name="av_render_not_everyone">あなたは、周囲にいる一部の人から、見えない可能性があります。</string>
+  <string name="av_render_over_half">あなたは、周囲にいる半分以上の人から、見えない可能性があります。</string>
+  <string name="av_render_most_of">あなたは、周囲にいるほとんどの人から、見えない可能性があります。</string>
+  <string name="av_render_anyone">あなたは、周囲の誰からも見えていない可能性があります。</string>
+
+  <!-- HUD complexity rendering messages, see llavatarrendernotifier. -->
+  <string name="hud_description_total">利用中のＨＵＤ</string>
+  <string name="hud_name_with_joint">[OBJ_NAME]（[JNT_NAME]に装着中）</string>
+  <string name="hud_render_memory_warning">[HUD_DETAILS]は、大量のテクスチャメモリを使用しています。</string>
+  <string name="hud_render_cost_warning">[HUD_DETAILS]は、計算コストが高いオブジェクトやテクスチャがたくさん含まれています。</string>
+  <string name="hud_render_heavy_textures_warning">[HUD_DETAILS]には、容量が多いテクスチャが使用されています。</string>
+  <string name="hud_render_cramped_warning">[HUD_DETAILS]は、使用されているオブジェクトが多すぎます。</string>
+  <string name="hud_render_textures_warning">[HUD_DETAILS]は、使用されているテクスチャが多すぎます。</string>
+
+  <!-- AgeYearsA = singular,
+       AgeYearsB = plural,
+       AgeYearsC = plural for non-English languages like Russian
+       For example, LLTrans::getCountString("AgeYears", 3) is plural form B
+       in English and form C in Russian -->
+  <string name="AgeYearsA">[COUNT]年</string>
+  <string name="AgeYearsB">[COUNT]年</string>
+  <string name="AgeYearsC">[COUNT]年</string>
+  <string name="AgeMonthsA">[COUNT]ヶ月</string>
+  <string name="AgeMonthsB">[COUNT]ヶ月</string>
+  <string name="AgeMonthsC">[COUNT]ヶ月</string>
+  <string name="AgeWeeksA">[COUNT]週間</string>
+  <string name="AgeWeeksB">[COUNT]週間</string>
+  <string name="AgeWeeksC">[COUNT]週間</string>
+  <string name="AgeDaysA">[COUNT]日間</string>
+  <string name="AgeDaysB">[COUNT]日間</string>
+  <string name="AgeDaysC">[COUNT]日間</string>
+  <!-- Group member counts -->
+  <string name="GroupMembersA">[COUNT]人</string>
+  <string name="GroupMembersB">[COUNT]人</string>
+  <string name="GroupMembersC">[COUNT]人</string>
+
+  <!-- Account types, see LLAvatarPropertiesProcessor -->
+  <string name="AcctTypeResident">住人</string>
+  <string name="AcctTypeTrial">トライアル</string>
+  <string name="AcctTypeCharterMember">創立メンバー</string>
+  <string name="AcctTypeEmployee">Linden Lab従業員</string>
+  <string name="PaymentInfoUsed">支払情報使用履歴あり</string>
+  <string name="PaymentInfoOnFile">支払情報登録済</string>
+  <string name="NoPaymentInfoOnFile">支払情報未登録</string>
+  <string name="AgeVerified">年齢確認済</string>
+  <string name="NotAgeVerified">年齢未確認</string>
+
+  <!-- HUD Position -->
+  <string name="Center 2">中央２</string>
+  <string name="Top Right">右上</string>
+  <string name="Top">上部</string>
+  <string name="Top Left">左上</string>
+  <string name="Center">中央</string>
+  <string name="Bottom Left">左下</string>
+  <string name="Bottom">下部</string>
+  <string name="Bottom Right">右下</string>
+
+  <!-- compile queue-->
+  <string name="CompileQueueDownloadedCompiling">ダウンロードが完了しました。コンパイルしています。</string>
+  <string name="CompileQueueServiceUnavailable">スクリプトのコンパイルサービスを利用できません</string>
+  <string name="CompileQueueScriptNotFound">サーバー上にスクリプトが見つかりません。</string>
+  <string name="CompileQueueProblemDownloading">ダウンロードに問題があります</string>
+  <string name="CompileQueueInsufficientPermDownload">権限不足のためスクリプトをダウンロードできません。</string>
+  <string name="CompileQueueInsufficientPermFor">権限不足：</string>
+  <string name="CompileQueueUnknownFailure">原因不明の失敗によりダウンロードができません</string>
+  <string name="CompileNoExperiencePerm">[EXPERIENCE]体験による[SCRIPT]スクリプトのスキップ。</string>
+  <string name="CompileQueueTitle">再コンパイル進行</string>
+  <string name="CompileQueueStart">再コンパイル</string>
+  <string name="ResetQueueTitle">進行をリセット</string>
+  <string name="ResetQueueStart">リセット</string>
+  <string name="RunQueueTitle">実行を続けるよう設定</string>
+  <string name="RunQueueStart">実行中に設定</string>
+  <string name="NotRunQueueTitle">実行を停止するよう設定</string>
+  <string name="NotRunQueueStart">実行停止に設定</string>
+
+  <!-- compile comment text-->
+  <string name="CompileSuccessful">コンパイルが完了しました！</string>
+  <string name="CompileSuccessfulSaving">コンパイル完了、保存しています…</string>
+  <string name="SaveComplete">保存完了。</string>
+  <string name="UploadFailed">ファイルのアップロードが失敗しました:</string>
+  <string name="ObjectOutOfRange">スクリプト（オブジェクトが範囲外にあります）</string>
+  <string name="ScriptWasDeleted">スクリプト（インベントリから削除済み）</string>
+
+  <!-- god tools -->
+  <string name="GodToolsObjectOwnedBy">[OWNER]が所有している「[OBJECT]」というオブジェクト</string>
+
+  <!-- groups -->
+  <string name="GroupsNone">なし</string>
+  <string name="Group" value="（グループ）" />
+  <string name="Unknown">（不明）</string>
+  <string name="SummaryForTheWeek" value="今週のまとめ。開始日は" />
+  <string name="NextStipendDay" value="です。次回のお小遣い支給日：" />
+  <string name="GroupPlanningDate">[year,datetime,utc]年[mthnum,datetime,utc]月[day,datetime,utc]日</string>
+  <string name="GroupIndividualShare" value="グループ 個人の割り当て" />
+  <string name="GroupColumn" value="グループの設定" />
+  <string name="Balance">残高</string>
+  <string name="Credits">収入</string>
+  <string name="Debits">支出</string>
+  <string name="Total">合計</string>
+  <string name="NoGroupDataFound">グループのデータが見つかりませんでした。</string>
+
+  <!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar.
+       This is to help Lindens when answering questions. -->
+  <string name="IMParentEstate">親の不動産</string>
+  <string name="IMMainland">メインランド</string>
+  <string name="IMTeen">ティーン</string>
+
+  <!-- floater about land -->
+  <string name="Anyone">全員</string>
+
+  <!-- floater region info -->
+  <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
+  <string name="RegionInfoError">エラー</string>
+  <string name="RegionInfoAllEstatesOwnedBy">[OWNER]が所有するすべての不動産</string>
+  <string name="RegionInfoAllEstatesYouOwn">あなたが所有するすべての不動産</string>
+  <string name="RegionInfoAllEstatesYouManage">あなたが[OWNER]のために管理するすべての不動産</string>
+  <string name="RegionInfoAllowedResidents">常に許可：（[ALLOWEDAGENTS]人、最大[MAXACCESS]人）</string>
+  <string name="RegionInfoAllowedGroups">グループを常に許可：（[ALLOWEDGROUPS]、最大[MAXACCESS]）</string>
+  <string name="RegionInfoBannedResidents">常に禁止：（[BANNEDAGENTS]人、最大[MAXBANNED]人）</string>
+  <string name="RegionInfoListTypeAllowedAgents">常に許可</string>
+  <string name="RegionInfoListTypeBannedAgents">常に禁止</string>
+  <string name="RegionInfoAllEstates">すべての不動産</string>
+  <string name="RegionInfoManagedEstates">管理されている不動産</string>
+  <string name="RegionInfoThisEstate">この不動産</string>
+  <string name="AndNMore">および[EXTRA_COUNT]つの不動産</string>
+
+  <!-- script limits floater -->
+  <string name="ScriptLimitsParcelScriptMemory">区画スクリプトメモリ</string>
+  <string name="ScriptLimitsParcelsOwned">区画一覧：[PARCELS]個</string>
+  <string name="ScriptLimitsMemoryUsed">使用されたメモリ：[MAX]㎅中[COUNT]㎅　[AVAILABLE]㎅利用可</string>
+  <string name="ScriptLimitsMemoryUsedSimple">使用されたメモリ：[COUNT]㎅</string>
+  <string name="ScriptLimitsParcelScriptURLs">区画のスクリプトＵＲＬ</string>
+  <string name="ScriptLimitsURLsUsed">使用されたＵＲＬ：[MAX]件中[COUNT]件　[AVAILABLE]件利用可</string>
+  <string name="ScriptLimitsURLsUsedSimple">使用されたＵＲＬ：[COUNT]件</string>
+  <string name="ScriptLimitsRequestError">情報のリクエスト中にエラーが発生しました</string>
+  <string name="ScriptLimitsRequestNoParcelSelected">区画が選択されていません。</string>
+  <string name="ScriptLimitsRequestWrongRegion">エラー：スクリプト情報は現在地のみ取得できます</string>
+  <string name="ScriptLimitsRequestWaiting">情報を取得中…</string>
+  <string name="ScriptLimitsRequestDontOwnParcel">この区画を調査する権限がありません。</string>
+
+  <string name="SITTING_ON">着席中</string>
+  <string name="ATTACH_CHEST">胸部</string>
+  <string name="ATTACH_HEAD">頭頂部</string>
+  <string name="ATTACH_LSHOULDER">左肩</string>
+  <string name="ATTACH_RSHOULDER">右肩</string>
+  <string name="ATTACH_LHAND">左手</string>
+  <string name="ATTACH_RHAND">右手</string>
+  <string name="ATTACH_LFOOT">左足</string>
+  <string name="ATTACH_RFOOT">右足</string>
+  <string name="ATTACH_BACK">背骨</string>
+  <string name="ATTACH_PELVIS">骨盤</string>
+  <string name="ATTACH_MOUTH">口</string>
+  <string name="ATTACH_CHIN">あご</string>
+  <string name="ATTACH_LEAR">左耳</string>
+  <string name="ATTACH_REAR">右耳</string>
+  <string name="ATTACH_LEYE">左目</string>
+  <string name="ATTACH_REYE">右目</string>
+  <string name="ATTACH_NOSE">鼻</string>
+  <string name="ATTACH_RUARM">右上腕</string>
+  <string name="ATTACH_RLARM">右前腕</string>
+  <string name="ATTACH_LUARM">左上腕</string>
+  <string name="ATTACH_LLARM">左前腕</string>
+  <string name="ATTACH_RHIP">右腰</string>
+  <string name="ATTACH_RULEG">右脚（上）</string>
+  <string name="ATTACH_RLLEG">右脚（下）</string>
+  <string name="ATTACH_LHIP">左腰</string>
+  <string name="ATTACH_LULEG">左脚（上）</string>
+  <string name="ATTACH_LLLEG">左脚（下）</string>
+  <string name="ATTACH_BELLY">腹</string>
+  <string name="ATTACH_LEFT_PEC">左胸筋</string>
+  <string name="ATTACH_RIGHT_PEC">右胸筋</string>
+  <string name="ATTACH_HUD_CENTER_2">ＨＵＤ（中央 2）</string>
+  <string name="ATTACH_HUD_TOP_RIGHT">ＨＵＤ（右上）</string>
+  <string name="ATTACH_HUD_TOP_CENTER">ＨＵＤ（上・中央）</string>
+  <string name="ATTACH_HUD_TOP_LEFT">ＨＵＤ（左上）</string>
+  <string name="ATTACH_HUD_CENTER_1">ＨＵＤ（中央 1）</string>
+  <string name="ATTACH_HUD_BOTTOM_LEFT">ＨＵＤ（左下）</string>
+  <string name="ATTACH_HUD_BOTTOM">ＨＵＤ（下）</string>
+  <string name="ATTACH_HUD_BOTTOM_RIGHT">ＨＵＤ（右下）</string>
+  <string name="ATTACH_NECK">首</string>
+  <string name="ATTACH_AVATAR_CENTER">アバターの中央</string>
+  <string name="ATTACH_LHAND_RING1">左薬指</string>
+  <string name="ATTACH_RHAND_RING1">右薬指</string>
+  <string name="ATTACH_TAIL_BASE">しっぽのベース</string>
+  <string name="ATTACH_TAIL_TIP">しっぽの先</string>
+  <string name="ATTACH_LWING">左の翼</string>
+  <string name="ATTACH_RWING">右の翼</string>
+  <string name="ATTACH_FACE_JAW">顎</string>
+  <string name="ATTACH_FACE_LEAR">代わりの左耳</string>
+  <string name="ATTACH_FACE_REAR">代わりの右耳</string>
+  <string name="ATTACH_FACE_LEYE">代わりの左目</string>
+  <string name="ATTACH_FACE_REYE">代わりの右目</string>
+  <string name="ATTACH_FACE_TONGUE">舌</string>
+  <string name="ATTACH_GROIN">脚の付け根</string>
+  <string name="ATTACH_HIND_LFOOT">左後足</string>
+  <string name="ATTACH_HIND_RFOOT">右後足</string>
+
+  <!-- script editor -->
+  <string name="CursorPos">[LINE]行目、[COLUMN]列目</string>
+
+  <!-- panel dir browser -->
+  <string name="PanelDirCountFound">[COUNT]件見つかりました</string>
+  <string name="PanelDirTimeStr">[ampm,datetime,utc]　[hour12,datetime,utc]：[min,datetime,utc]</string>
+
+  <!-- panel dir events -->
+  <string name="PanelDirEventsDateText">[mthnum,datetime,slt]／[day,datetime,slt]</string>
+
+  <!-- panel contents -->
+  <string name="PanelContentsTooltip">オブジェクトの中身</string>
+  <string name="PanelContentsNewScript">新規スクリプト</string>
+
+  <!-- panel preferences general -->
+  <string name="DoNotDisturbModeResponseDefault">この住民が「着信拒否」をオンにすると、あなたのメッセージが後で表示されるようになります。</string>
+
+  <!-- Mute -->
+  <string name="MuteByName">（名前で）</string>
+  <string name="MuteAgent">（住人）</string>
+  <string name="MuteObject">（オブジェクト）</string>
+  <string name="MuteGroup">（グループ）</string>
+  <string name="MuteExternal">（外部）</string>
+
+  <!-- Region/Estate Covenant -->
+  <string name="RegionNoCovenant">この不動産には約款がありません。</string>
+  <string name="RegionNoCovenantOtherOwner">この不動産には約款がありません。この不動産上の土地は不動産所有者により販売され、Linden Labは販売しません。販売に関するお問い合わせは、不動産所有者までお願い致します。</string>
+  <!-- use value="" to keep the trailing space -->
+  <string name="covenant_last_modified" value="最終更新日：" />
+  <string name="none_text" value="（なし）" />
+  <string name="never_text" value="（無）" />
+
+  <!--Region Details-->
+  <string name="GroupOwned">グループ所有</string>
+  <string name="Public">公共</string>
+
+  <!-- Environment settings -->
+  <string name="LocalSettings">ローカル設定</string>
+  <string name="RegionSettings">リージョン（地域）の設定</string>
+
+  <string name="NoEnvironmentSettings">このリージョンは環境設定をサポートしていません。</string>
+  <string name="EnvironmentSun">太陽</string>
+  <string name="EnvironmentMoon">月</string>
+  <string name="EnvironmentBloom">花</string>
+  <string name="EnvironmentCloudNoise">雲の音</string>
+  <string name="EnvironmentNormalMap">ノーマル・マップ</string>
+  <string name="EnvironmentTransparent">透過</string>
+
+  <!-- panel classified -->
+  <string name="ClassifiedClicksTxt">クリック数：[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</string>
+  <string name="ClassifiedUpdateAfterPublish">（掲載後更新）</string>
+
+  <!-- panel picks -->
+  <string name="NoPicksClassifiedsText">ピックやクラシファイド広告を作成していません。作成するには、下にある「＋」ボタンをクリックします。</string>
+  <string name="NoPicksText">ピックを作成していません。「新規」ボタンをクリックしてピックを作成する。</string>
+  <string name="NoClassifiedsText">クラシファイド広告を作成していません。「新規」ボタンをクリックしてクラシファイド広告を作成する。</string>
+  <string name="NoAvatarPicksClassifiedsText">ピック、またはクラシファイド広告がありません</string>
+  <string name="NoAvatarPicksText">ピックがありません</string>
+  <string name="NoAvatarClassifiedsText">クラシファイド広告がありません</string>
+  <string name="PicksClassifiedsLoadingText">読み込んでいます…</string>
+
+  <!-- Multi Preview Floater -->
+  <string name="MultiPreviewTitle">プレビュー</string>
+  <string name="MultiPropertiesTitle">プロパティ</string>
+
+  <!-- inventory offer -->
+  <string name="InvOfferAnObjectNamed">オブジェクト名</string>
+  <string name="InvOfferOwnedByGroup">所有グループ</string>
+  <string name="InvOfferOwnedByUnknownGroup">不明なグループ所有</string>
+  <string name="InvOfferOwnedBy">所有者</string>
+  <string name="InvOfferOwnedByUnknownUser">不明なユーザー所有</string>
+  <string name="InvOfferGaveYou">が渡しました。</string>
+  <string name="InvOfferDecline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;からの[DESC]を拒否しました。</string>
+
+  <!-- group money -->
+  <string name="GroupMoneyTotal">合計</string>
+  <string name="GroupMoneyBought">購入：</string>
+  <string name="GroupMoneyPaidYou">あなたに支払い：</string>
+  <string name="GroupMoneyPaidInto">支払情報</string>
+  <string name="GroupMoneyBoughtPassTo">入場許可を購入：</string>
+  <string name="GroupMoneyPaidFeeForEvent">が、イベント用の費用を支払いました。</string>
+  <string name="GroupMoneyPaidPrizeForEvent">が、イベント用の賞金を支払いました。</string>
+  <string name="GroupMoneyBalance">残高</string>
+  <string name="GroupMoneyCredits">収入</string>
+  <string name="GroupMoneyDebits">支出</string>
+  <string name="GroupMoneyDate">[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日　[weekday,datetime,utc]</string>
+
+  <!-- Viewer menu -->
+  <string name="AcquiredItems">取得アイテム</string>
+  <string name="Cancel">キャンセル</string>
+  <string name="UploadingCosts">[NAME]のアップロード料金は L$ [AMOUNT]です。</string>
+  <string name="BuyingCosts">これをL$ [AMOUNT]で購入します。</string>
+  <string name="UnknownFileExtension">不明な拡張子：%s
+使用可能な拡張子：.wav, .tga, .bmp, .jpg, .jpeg, or .bvh</string>
+  <string name="MuteObject2">オブジェクトのブロック</string>
+  <string name="MuteAvatar">アバターのブロック</string>
+  <string name="UnmuteObject">オブジェクトのブロック解除</string>
+  <string name="UnmuteAvatar">アバターのブロック解除</string>
+  <string name="AddLandmarkNavBarMenu">ランドマークに追加…</string>
+  <string name="EditLandmarkNavBarMenu">ランドマークを編集…</string>
+  <!-- menu accelerators -->
+  <string name="accel-mac-control">⌃</string>
+  <string name="accel-mac-command">⌘</string>
+  <string name="accel-mac-option">⌥</string>
+  <string name="accel-mac-shift">⇧</string>
+  <string name="accel-win-control">Ctrl＋</string>
+  <string name="accel-win-alt">Alt＋</string>
+  <string name="accel-win-shift">Shift＋</string>
+
+  <!-- Previews -->
+  <string name="FileSaved">ファイルが保存されました。</string>
+  <string name="Receiving">取得中</string>
+
+  <!-- status bar , Time -->
+  <string name="AM">午前</string>
+  <string name="PM">午後</string>
+  <string name="PST">太平洋標準時</string>
+  <string name="PDT">太平洋夏時間</string>
+
+  <!-- Directions, HUD -->
+  <string name="Direction_Forward">前</string>
+  <string name="Direction_Left">左</string>
+  <string name="Direction_Right">右</string>
+  <string name="Direction_Back">後</string>
+  <string name="Direction_North">北</string>
+  <string name="Direction_South">南</string>
+  <string name="Direction_West">西</string>
+  <string name="Direction_East">東</string>
+  <string name="Direction_Up">上</string>
+  <string name="Direction_Down">下</string>
+
+  <!-- Search Category Strings -->
+  <string name="Any Category">全カテゴリ</string>
+  <string name="Shopping">ショッピング</string>
+  <string name="Land Rental">土地のレンタル</string>
+  <string name="Property Rental">プロパティのレンタル</string>
+  <string name="Special Attraction">特別なアトラクション</string>
+  <string name="New Products">新製品</string>
+  <string name="Employment">雇用</string>
+  <string name="Wanted">求む</string>
+  <string name="Service">サービス</string>
+  <string name="Personal">パーソナル</string>
+
+  <!-- PARCEL_CATEGORY_UI_STRING -->
+  <string name="None">なし</string>
+  <string name="Linden Location">Linden 所在地</string>
+  <string name="Adult">成人向け</string>
+  <string name="Arts&amp;Culture">芸術と文化</string>
+  <string name="Business">ビジネス</string>
+  <string name="Educational">教育</string>
+  <string name="Gaming">ゲーム</string>
+  <string name="Hangout">たまり場</string>
+  <string name="Newcomer Friendly">新規住民歓迎</string>
+  <string name="Parks&amp;Nature">公園と自然</string>
+  <string name="Residential">住宅用</string>
+  <!--<string name="Shopping">Shopping</string>	-->
+  <string name="Stage">ステージ</string>
+  <string name="Other">その他</string>
+  <string name="Rental">レンタル</string>
+  <string name="Any">全員</string>
+  <string name="You">あなた</string>
+
+  <!-- punctuations -->
+  <string name=":">：</string>
+  <string name=",">、</string>
+  <string name="...">…</string>
+  <string name="***">***</string>
+  <string name="(">（</string>
+  <string name=")">）</string>
+  <string name=".">。</string>
+  <string name="'">'</string>
+  <string name="---">─</string>
+
+  <!-- media -->
+  <string name="Multiple Media">複数のメディア</string>
+  <string name="Play Media">メディアの再生／一時停止</string>
+
+  <!-- Drivers support/update pages -->
+  <string name="IntelDriverPage">https://www.intel.co.jp/content/www/jp/ja/support/detect.html</string>
+  <string name="NvidiaDriverPage">https://www.nvidia.com/Download/index.aspx?lang=ja-jp</string>
+  <string name="AMDDriverPage">https://www.amd.com/ja/support</string>
+
+  <!-- OSMessageBox messages -->
+  <string name="MBCmdLineError">コマンドラインにエラーが見つかりました。
+リンク先を参照してください：https://wiki.secondlife.com/wiki/%E3%83%93%E3%83%A5%E3%83%BC%E3%83%AF%E5%BC%95%E6%95%B0
 エラー：</string>
-	<string name="MBCmdLineUsg">[APP_NAME] コマンドライン使用：</string>
-	<string name="MBUnableToAccessFile">[APP_NAME] は必要なファイルにアクセスできません。
+  <string name="MBCmdLineUsg">[APP_NAME]コマンドライン使用：</string>
+  <string name="MBUnableToAccessFile">[APP_NAME]は必要なファイルにアクセスできません。
 
 複数のコピーを実行中か、ファイルが既に開いているとあなたのシステムが誤認識している可能性があります。
 このメッセージが何度も出る場合は、コンピューターを再起動してもう一度お試しください。
-それでも問題が続く場合、[APP_NAME] を完全にアンインストールして、再インストールをしてください。</string>
-	<string name="MBFatalError">致命的なエラー</string>
-	<string name="MBRequiresAltiVec">[APP_NAME] は、AltiVec搭載のプロセッサが必要です。（G4 以降）</string>
-	<string name="MBAlreadyRunning">[APP_NAME] はすでに実行中です。
+それでも問題が続く場合、[APP_NAME]を完全にアンインストールして、再インストールをしてください。</string>
+  <string name="MBFatalError">致命的なエラー</string>
+  <string name="MBRequiresAltiVec">[APP_NAME]は、AltiVec搭載のプロセッサが必要です。（G4 以降）</string>
+  <string name="MBAlreadyRunning">[APP_NAME]はすでに実行中です。
 最小化されたプログラムのコピーをタスクバーで確認してください。
 このメッセージが何度も出る場合はコンピューターを再起動してください。</string>
-	<string name="MBFrozenCrashed">[APP_NAME] は前回の実行時にフリーズしています。
+  <string name="MBFrozenCrashed">[APP_NAME]は前回の実行時にフリーズしています。
 クラッシュ報告を送信しますか？</string>
-	<string name="MBAlert">通知</string>
-	<string name="MBNoDirectX">[APP_NAME] は DirectX 9.0b 及びそれ以降のバージョンを検出することができませんでした。
-[APP_NAME] は DirectX を使用して安定性の問題、低パフォーマンス、クラッシュ等悪影響を与えるハードウェアや古いドライバを検出します。  DirectX 9.0b がなくても [APP_NAME] を実行できますが、DirectX 9.0bとのご使用を強く推奨します。
+  <string name="MBAlert">通知</string>
+  <string name="MBNoDirectX">[APP_NAME]は、DirectX 9.0b及びそれ以降のバージョンを検出することができませんでした。
+[APP_NAME]は DirectX を使用して安定性の問題、低パフォーマンス、クラッシュ等悪影響を与えるハードウェアや古いドライバを検出します。DirectX 9.0b がなくても
+[APP_NAME]を実行できますが、DirectX 9.0bとのご使用を強く推奨します。
 
 続けますか？</string>
-	<string name="MBWarning">警告</string>
-	<string name="MBNoAutoUpdate">自動更新は現在 Linux には対応していません。
+  <string name="MBWarning">警告</string>
+  <string name="MBNoAutoUpdate">自動更新は現在 Linux には対応していません。
 www.secondlife.com から最新バージョンをダウンロードしてください。</string>
-	<string name="MBRegClassFailed">RegisterClass 失敗</string>
-	<string name="MBError">エラー</string>
-	<string name="MBFullScreenErr">[WIDTH] x [HEIGHT] では全画面で実行することができません。
+  <string name="MBRegClassFailed">RegisterClass 失敗</string>
+  <string name="MBError">エラー</string>
+  <string name="MBFullScreenErr">[WIDTH]✕[HEIGHT]では全画面で実行することができません。
 ウィンドウモードで実行中です。</string>
-	<string name="MBDestroyWinFailed">シャットダウンエラー（DestroyWindow() 失敗）</string>
-	<string name="MBShutdownErr">シャットダウンエラー</string>
-	<string name="MBDevContextErr">GL ディバイスコンテキストが作れません</string>
-	<string name="MBPixelFmtErr">適切なピクセル形式が見つかりません</string>
-	<string name="MBPixelFmtDescErr">ピクセル形式情報が見つかりません</string>
-	<string name="MBTrueColorWindow">[APP_NAME] を実行するには、True Color （32ビット）が必要です。
-お使いのコンピューターの「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （32 ビット)」に設定してください。</string>
-	<string name="MBAlpha">[APP_NAME] は 8 ビットのアルファチャンネルを取得できないため実行できません。  通常ビデオカードのドライバの問題で起こります。
+  <string name="MBDestroyWinFailed">シャットダウンエラー（DestroyWindow() 失敗）</string>
+  <string name="MBShutdownErr">シャットダウンエラー</string>
+  <string name="MBDevContextErr">GL ディバイスコンテキストが作れません</string>
+  <string name="MBPixelFmtErr">適切なピクセル形式が見つかりません</string>
+  <string name="MBPixelFmtDescErr">ピクセル形式情報が見つかりません</string>
+  <string name="MBTrueColorWindow">[APP_NAME]を実行するには、True Color（３２ビット）が必要です。
+お使いのコンピューターの「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （３２ビット）」に設定してください。</string>
+  <string name="MBAlpha">[APP_NAME]は８ビットのアルファチャンネルを取得できないため実行できません。通常ビデオカードのドライバの問題で起こります。
 お使いのコンピューターに最新のビデオカードドライバがインストールされているかご確認ください。
-また、「コントロールパネル」＞「画面」＞「設定」内で、モニターが「最高 （32 ビット）」に設定されていることもご確認ください。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。</string>
-	<string name="MBPixelFmtSetErr">ピクセル形式が設定できません</string>
-	<string name="MBGLContextErr">GL レンダーコンテキストが作れません</string>
-	<string name="MBGLContextActErr">GL レンダーコンテキストをアクティベートできません</string>
-	<string name="MBVideoDrvErr">お使いのコンピューターのビデオカードドライバが正常にインストールできなかった、または古いかサポート対象外のため、[APP_NAME]  は実行できません。 最新のビデオカードドライバがインストールされているのを確認し、されている場合は再インストールをお試しください。
-
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。</string>
-	<string name="5 O'Clock Shadow">うっすらとしたヒゲ</string>
-	<string name="All White">真っ白</string>
-	<string name="Anime Eyes">アニメ風の目</string>
-	<string name="Arced">アーチ</string>
-	<string name="Arm Length">腕の長さ</string>
-	<string name="Attached">小</string>
-	<string name="Attached Earlobes">耳たぶ</string>
-	<string name="Back Fringe">後ろ髪の毛先</string>
-	<string name="Baggy">たるんだ下まぶた</string>
-	<string name="Bangs">前髪</string>
-	<string name="Beady Eyes">ビーズのような目</string>
-	<string name="Belly Size">お腹の大きさ</string>
-	<string name="Big">大</string>
-	<string name="Big Butt">大</string>
-	<string name="Big Hair Back">髪の大部分： 後ろ</string>
-	<string name="Big Hair Front">髪の大部分： 前</string>
-	<string name="Big Hair Top">髪の大部分： 上部</string>
-	<string name="Big Head">大</string>
-	<string name="Big Pectorals">大</string>
-	<string name="Big Spikes">とげあり</string>
-	<string name="Black">黒</string>
-	<string name="Blonde">ブロンド</string>
-	<string name="Blonde Hair">ブロンドの髪</string>
-	<string name="Blush">チーク</string>
-	<string name="Blush Color">チークカラー</string>
-	<string name="Blush Opacity">チークの濃さ</string>
-	<string name="Body Definition">体の精細度</string>
-	<string name="Body Fat">体脂肪</string>
-	<string name="Body Freckles">体のしみ・そばかす</string>
-	<string name="Body Thick">骨太</string>
-	<string name="Body Thickness">体の厚み</string>
-	<string name="Body Thin">細め</string>
-	<string name="Bow Legged">外股</string>
-	<string name="Breast Buoyancy">胸の重力</string>
-	<string name="Breast Cleavage">胸の谷間</string>
-	<string name="Breast Size">胸の大きさ</string>
-	<string name="Bridge Width">両目の間の幅</string>
-	<string name="Broad">広</string>
-	<string name="Brow Size">眉毛上の隆起</string>
-	<string name="Bug Eyes">Bug Eyes</string>
-	<string name="Bugged Eyes">突き出た目</string>
-	<string name="Bulbous">だんご</string>
-	<string name="Bulbous Nose">だんご鼻</string>
-	<string name="Breast Physics Mass">胸の豊かさ</string>
-	<string name="Breast Physics Smoothing">胸の平滑化</string>
-	<string name="Breast Physics Gravity">胸の垂れ具合</string>
-	<string name="Breast Physics Drag">胸の空気抵抗</string>
-	<string name="Breast Physics InOut Max Effect">最大エフェクト数</string>
-	<string name="Breast Physics InOut Spring">振動速度</string>
-	<string name="Breast Physics InOut Gain">増加率</string>
-	<string name="Breast Physics InOut Damping">減衰</string>
-	<string name="Breast Physics UpDown Max Effect">最大エフェクト数</string>
-	<string name="Breast Physics UpDown Spring">振動速度</string>
-	<string name="Breast Physics UpDown Gain">増加率</string>
-	<string name="Breast Physics UpDown Damping">減衰</string>
-	<string name="Breast Physics LeftRight Max Effect">最大エフェクト数</string>
-	<string name="Breast Physics LeftRight Spring">振動速度</string>
-	<string name="Breast Physics LeftRight Gain">増加率</string>
-	<string name="Breast Physics LeftRight Damping">減衰</string>
-	<string name="Belly Physics Mass">お腹の豊かさ</string>
-	<string name="Belly Physics Smoothing">お腹の平滑化</string>
-	<string name="Belly Physics Gravity">お腹の垂れ具合</string>
-	<string name="Belly Physics Drag">お腹の空気抵抗</string>
-	<string name="Belly Physics UpDown Max Effect">最大エフェクト数</string>
-	<string name="Belly Physics UpDown Spring">振動速度</string>
-	<string name="Belly Physics UpDown Gain">増加率</string>
-	<string name="Belly Physics UpDown Damping">減衰</string>
-	<string name="Butt Physics Mass">お尻の豊かさ</string>
-	<string name="Butt Physics Smoothing">お尻の平滑化</string>
-	<string name="Butt Physics Gravity">お尻の垂れ具合</string>
-	<string name="Butt Physics Drag">お尻の空気抵抗</string>
-	<string name="Butt Physics UpDown Max Effect">最大エフェクト数</string>
-	<string name="Butt Physics UpDown Spring">振動速度</string>
-	<string name="Butt Physics UpDown Gain">増加率</string>
-	<string name="Butt Physics UpDown Damping">減衰</string>
-	<string name="Butt Physics LeftRight Max Effect">最大エフェクト数</string>
-	<string name="Butt Physics LeftRight Spring">振動速度</string>
-	<string name="Butt Physics LeftRight Gain">増加率</string>
-	<string name="Butt Physics LeftRight Damping">減衰</string>
-	<string name="Bushy Eyebrows">太</string>
-	<string name="Bushy Hair">ぼさぼさヘア</string>
-	<string name="Butt Size">お尻の大きさ</string>
-	<string name="Butt Gravity">お尻の垂れ具合</string>
-	<string name="bustle skirt">後ろの膨らみ</string>
-	<string name="no bustle">膨らみなし</string>
-	<string name="more bustle">膨らみ大</string>
-	<string name="Chaplin">チャップリン</string>
-	<string name="Cheek Bones">ほお骨</string>
-	<string name="Chest Size">胸部の大きさ</string>
-	<string name="Chin Angle">あごの角度</string>
-	<string name="Chin Cleft">あごの先の割れ</string>
-	<string name="Chin Curtains">あごに沿ったひげ</string>
-	<string name="Chin Depth">あごの長さ</string>
-	<string name="Chin Heavy">あごを強調</string>
-	<string name="Chin In">ひいたあご</string>
-	<string name="Chin Out">突き出たあご</string>
-	<string name="Chin-Neck">あごと首</string>
-	<string name="Clear">クリア</string>
-	<string name="Cleft">割れた</string>
-	<string name="Close Set Eyes">顔の中心寄りの目</string>
-	<string name="Closed">クローズ</string>
-	<string name="Closed Back">後ろとじ</string>
-	<string name="Closed Front">前とじ</string>
-	<string name="Closed Left">左とじ</string>
-	<string name="Closed Right">右とじ</string>
-	<string name="Coin Purse">コイン入れ</string>
-	<string name="Collar Back">後ろえり</string>
-	<string name="Collar Front">前えり</string>
-	<string name="Corner Down">ダウン</string>
-	<string name="Corner Up">アップ</string>
-	<string name="Creased">重いまぶた</string>
-	<string name="Crooked Nose">曲がった鼻</string>
-	<string name="Cuff Flare">袖口のフレア</string>
-	<string name="Dark">ダーク</string>
-	<string name="Dark Green">ダークグリーン</string>
-	<string name="Darker">ダーク</string>
-	<string name="Deep">尖った</string>
-	<string name="Default Heels">デフォルトのかかと</string>
-	<string name="Dense">濃</string>
-	<string name="Double Chin">二重あご</string>
-	<string name="Downturned">下向き</string>
-	<string name="Duffle Bag">ダッフルバッグ</string>
-	<string name="Ear Angle">耳の角度</string>
-	<string name="Ear Size">耳の大きさ</string>
-	<string name="Ear Tips">耳の先</string>
-	<string name="Egg Head">たまご頭</string>
-	<string name="Eye Bags">下まぶた</string>
-	<string name="Eye Color">瞳の色</string>
-	<string name="Eye Depth">目のくぼみ</string>
-	<string name="Eye Lightness">瞳の明るさ</string>
-	<string name="Eye Opening">見開き具合</string>
-	<string name="Eye Pop">両目の大きさの対称</string>
-	<string name="Eye Size">目の大きさ</string>
-	<string name="Eye Spacing">目と目のあいだの幅</string>
-	<string name="Eyebrow Arc">眉毛のアーチ</string>
-	<string name="Eyebrow Density">眉毛の密集度</string>
-	<string name="Eyebrow Height">眉毛の高さ</string>
-	<string name="Eyebrow Points">眉毛の角</string>
-	<string name="Eyebrow Size">眉毛の大きさ</string>
-	<string name="Eyelash Length">まつげの長さ</string>
-	<string name="Eyeliner">アイライナー</string>
-	<string name="Eyeliner Color">アイライナーの色</string>
-	<string name="Eyes Bugged">下まぶたがたるんだ目</string>
-	<string name="Face Shear">顔のゆがみ</string>
-	<string name="Facial Definition">顔の精細度</string>
-	<string name="Far Set Eyes">離れた目</string>
-	<string name="Fat Lips">大</string>
-	<string name="Female">女性</string>
-	<string name="Fingerless">指なし</string>
-	<string name="Fingers">指あり</string>
-	<string name="Flared Cuffs">広がった袖口</string>
-	<string name="Flat">平ら</string>
-	<string name="Flat Butt">小</string>
-	<string name="Flat Head">絶壁頭</string>
-	<string name="Flat Toe">フラット</string>
-	<string name="Foot Size">足の大きさ</string>
-	<string name="Forehead Angle">ひたいの角度</string>
-	<string name="Forehead Heavy">ひたいを強調</string>
-	<string name="Freckles">しみ・そばかす</string>
-	<string name="Front Fringe">前髪の毛先</string>
-	<string name="Full Back">刈られていない髪</string>
-	<string name="Full Eyeliner">あり</string>
-	<string name="Full Front">刈られていない髪</string>
-	<string name="Full Hair Sides">サイドの髪</string>
-	<string name="Full Sides">生え揃ったサイド</string>
-	<string name="Glossy">あり</string>
-	<string name="Glove Fingers">手袋の指</string>
-	<string name="Glove Length">手袋の長さ</string>
-	<string name="Hair">髪</string>
-	<string name="Hair Back">髪： 後ろ</string>
-	<string name="Hair Front">髪： 前</string>
-	<string name="Hair Sides">髪： サイド</string>
-	<string name="Hair Sweep">流す</string>
-	<string name="Hair Thickess">髪の量</string>
-	<string name="Hair Thickness">髪の量</string>
-	<string name="Hair Tilt">髪の向き</string>
-	<string name="Hair Tilted Left">左向き</string>
-	<string name="Hair Tilted Right">右向き</string>
-	<string name="Hair Volume">髪： ボリューム</string>
-	<string name="Hand Size">手の大きさ</string>
-	<string name="Handlebars">ハンドルバー</string>
-	<string name="Head Length">頭の長さ</string>
-	<string name="Head Shape">頭の形</string>
-	<string name="Head Size">頭の大きさ</string>
-	<string name="Head Stretch">縦横の長さ</string>
-	<string name="Heel Height">ヒールの高さ</string>
-	<string name="Heel Shape">ヒールの形</string>
-	<string name="Height">身長</string>
-	<string name="High">高</string>
-	<string name="High Heels">ハイヒール</string>
-	<string name="High Jaw">高</string>
-	<string name="High Platforms">厚底</string>
-	<string name="High and Tight">高めでタイト</string>
-	<string name="Higher">高</string>
-	<string name="Hip Length">腰の長さ</string>
-	<string name="Hip Width">腰の幅</string>
-	<string name="Hover">ホバー</string>
-	<string name="In">内向き</string>
-	<string name="In Shdw Color">内側のシャドウカラー</string>
-	<string name="In Shdw Opacity">内側のシャドウの濃さ</string>
-	<string name="Inner Eye Corner">目頭</string>
-	<string name="Inner Eye Shadow">内側のアイシャドウ</string>
-	<string name="Inner Shadow">内側のシャドウ</string>
-	<string name="Jacket Length">ジャケット丈</string>
-	<string name="Jacket Wrinkles">ジャケットのしわ</string>
-	<string name="Jaw Angle">あごの角度</string>
-	<string name="Jaw Jut">あごの突出</string>
-	<string name="Jaw Shape">あごの形</string>
-	<string name="Join">寄せた胸</string>
-	<string name="Jowls">えら</string>
-	<string name="Knee Angle">膝の角度</string>
-	<string name="Knock Kneed">内股</string>
-	<string name="Large">大</string>
-	<string name="Large Hands">大</string>
-	<string name="Left Part">左分け</string>
-	<string name="Leg Length">脚の長さ</string>
-	<string name="Leg Muscles">脚の筋肉</string>
-	<string name="Less">小</string>
-	<string name="Less Body Fat">少なめ</string>
-	<string name="Less Curtains">少なめ</string>
-	<string name="Less Freckles">少なめ</string>
-	<string name="Less Full">薄い</string>
-	<string name="Less Gravity">少</string>
-	<string name="Less Love">少</string>
-	<string name="Less Muscles">少なめ</string>
-	<string name="Less Muscular">少なめ</string>
-	<string name="Less Rosy">少な目</string>
-	<string name="Less Round">丸み少な目</string>
-	<string name="Less Saddle">小</string>
-	<string name="Less Square">小</string>
-	<string name="Less Volume">ボリューム少な目</string>
-	<string name="Less soul">小</string>
-	<string name="Lighter">ライト</string>
-	<string name="Lip Cleft">唇の山</string>
-	<string name="Lip Cleft Depth">唇の山の高さ</string>
-	<string name="Lip Fullness">唇の厚み</string>
-	<string name="Lip Pinkness">唇の赤み</string>
-	<string name="Lip Ratio">上下唇の大きさ</string>
-	<string name="Lip Thickness">唇の前後幅</string>
-	<string name="Lip Width">口の大きさ</string>
-	<string name="Lipgloss">リップグロス</string>
-	<string name="Lipstick">口紅</string>
-	<string name="Lipstick Color">口紅の色</string>
-	<string name="Long">ロング</string>
-	<string name="Long Head">前後幅が広い頭</string>
-	<string name="Long Hips">長</string>
-	<string name="Long Legs">長</string>
-	<string name="Long Neck">長</string>
-	<string name="Long Pigtails">長</string>
-	<string name="Long Ponytail">長</string>
-	<string name="Long Torso">長</string>
-	<string name="Long arms">長</string>
-	<string name="Loose Pants">ゆったり</string>
-	<string name="Loose Shirt">ゆるめ</string>
-	<string name="Loose Sleeves">ゆるめ</string>
-	<string name="Love Handles">ウエスト周り</string>
-	<string name="Low">低</string>
-	<string name="Low Heels">ローヒール</string>
-	<string name="Low Jaw">低</string>
-	<string name="Low Platforms">低め</string>
-	<string name="Low and Loose">低めでゆったり</string>
-	<string name="Lower">低</string>
-	<string name="Lower Bridge">鼻筋</string>
-	<string name="Lower Cheeks">ほおの下部</string>
-	<string name="Male">男性</string>
-	<string name="Middle Part">真ん中分け</string>
-	<string name="More">大</string>
-	<string name="More Blush">きつめ</string>
-	<string name="More Body Fat">多め</string>
-	<string name="More Curtains">多め</string>
-	<string name="More Eyeshadow">あり</string>
-	<string name="More Freckles">多め</string>
-	<string name="More Full">厚い</string>
-	<string name="More Gravity">大</string>
-	<string name="More Lipstick">あり</string>
-	<string name="More Love">大</string>
-	<string name="More Lower Lip">大</string>
-	<string name="More Muscles">多め</string>
-	<string name="More Muscular">筋骨隆々</string>
-	<string name="More Rosy">多め</string>
-	<string name="More Round">まる</string>
-	<string name="More Saddle">大</string>
-	<string name="More Sloped">なだらか</string>
-	<string name="More Square">四角</string>
-	<string name="More Upper Lip">大</string>
-	<string name="More Vertical">垂直</string>
-	<string name="More Volume">大</string>
-	<string name="More soul">大</string>
-	<string name="Moustache">口ひげ</string>
-	<string name="Mouth Corner">口角</string>
-	<string name="Mouth Position">口の位置</string>
-	<string name="Mowhawk">モヒカン</string>
-	<string name="Muscular">筋骨たくましい</string>
-	<string name="Mutton Chops">マトンチョップス</string>
-	<string name="Nail Polish">マニキュア</string>
-	<string name="Nail Polish Color">マニキュアの色</string>
-	<string name="Narrow">狭</string>
-	<string name="Narrow Back">狭</string>
-	<string name="Narrow Front">狭</string>
-	<string name="Narrow Lips">おちょぼ口</string>
-	<string name="Natural">ナチュラル</string>
-	<string name="Neck Length">首の長さ</string>
-	<string name="Neck Thickness">首の太さ</string>
-	<string name="No Blush">なし</string>
-	<string name="No Eyeliner">なし</string>
-	<string name="No Eyeshadow">なし</string>
-	<string name="No Lipgloss">なし</string>
-	<string name="No Lipstick">なし</string>
-	<string name="No Part">なし</string>
-	<string name="No Polish">なし</string>
-	<string name="No Red">なし</string>
-	<string name="No Spikes">なし</string>
-	<string name="No White">なし</string>
-	<string name="No Wrinkles">なし</string>
-	<string name="Normal Lower">下</string>
-	<string name="Normal Upper">上</string>
-	<string name="Nose Left">左曲がり</string>
-	<string name="Nose Right">右曲がり</string>
-	<string name="Nose Size">鼻の大きさ</string>
-	<string name="Nose Thickness">鼻の厚み</string>
-	<string name="Nose Tip Angle">鼻先の角度</string>
-	<string name="Nose Tip Shape">鼻先の形</string>
-	<string name="Nose Width">鼻の幅</string>
-	<string name="Nostril Division">鼻の穴の高さ</string>
-	<string name="Nostril Width">鼻の穴の幅</string>
-	<string name="Opaque">濃いめ</string>
-	<string name="Open">オープン</string>
-	<string name="Open Back">後ろあき</string>
-	<string name="Open Front">前あき</string>
-	<string name="Open Left">左あき</string>
-	<string name="Open Right">右あき</string>
-	<string name="Orange">オレンジ</string>
-	<string name="Out">外向き</string>
-	<string name="Out Shdw Color">外側のシャドウカラー</string>
-	<string name="Out Shdw Opacity">外側のシャドウの濃さ</string>
-	<string name="Outer Eye Corner">目尻</string>
-	<string name="Outer Eye Shadow">外側のアイシャドウ</string>
-	<string name="Outer Shadow">外側のシャドウ</string>
-	<string name="Overbite">出っ歯</string>
-	<string name="Package">パッケージ</string>
-	<string name="Painted Nails">あり</string>
-	<string name="Pale">悪い</string>
-	<string name="Pants Crotch">パンツの股</string>
-	<string name="Pants Fit">パンツのフィット感</string>
-	<string name="Pants Length">パンツ丈</string>
-	<string name="Pants Waist">ウエスト</string>
-	<string name="Pants Wrinkles">パンツのしわ</string>
-	<string name="Part">あり</string>
-	<string name="Part Bangs">分けた前髪</string>
-	<string name="Pectorals">胸筋</string>
-	<string name="Pigment">色素</string>
-	<string name="Pigtails">下げ髪</string>
-	<string name="Pink">ピンク</string>
-	<string name="Pinker">ピンク</string>
-	<string name="Platform Height">靴底の高さ</string>
-	<string name="Platform Width">靴底の幅</string>
-	<string name="Pointy">尖った</string>
-	<string name="Pointy Heels">幅狭</string>
-	<string name="Ponytail">ポニーテール</string>
-	<string name="Poofy Skirt">ふんわり</string>
-	<string name="Pop Left Eye">左目を大きく</string>
-	<string name="Pop Right Eye">右目を大きく</string>
-	<string name="Puffy">ふっくら</string>
-	<string name="Puffy Eyelids">目の周りの膨らみ</string>
-	<string name="Rainbow Color">虹色</string>
-	<string name="Red Hair">赤毛</string>
-	<string name="Regular">均整のとれた</string>
-	<string name="Right Part">右分け</string>
-	<string name="Rosy Complexion">ほおの赤らみ</string>
-	<string name="Round">まるっこい</string>
-	<string name="Ruddiness">血色</string>
-	<string name="Ruddy">良い</string>
-	<string name="Rumpled Hair">くしゃくしゃヘア</string>
-	<string name="Saddle Bags">腰回りの肉付き</string>
-	<string name="Scrawny Leg">骨張った脚</string>
-	<string name="Separate">離れた胸</string>
-	<string name="Shallow">なだらか</string>
-	<string name="Shear Back">後方を刈る</string>
-	<string name="Shear Face">顔のゆがみ</string>
-	<string name="Shear Front">前方を刈る</string>
-	<string name="Shear Left Up">左半分を上に</string>
-	<string name="Shear Right Up">右半分を上に</string>
-	<string name="Sheared Back">後ろを刈られた髪</string>
-	<string name="Sheared Front">前を刈られた髪</string>
-	<string name="Shift Left">左向き</string>
-	<string name="Shift Mouth">口の向き</string>
-	<string name="Shift Right">右向き</string>
-	<string name="Shirt Bottom">シャツの裾</string>
-	<string name="Shirt Fit">シャツのフィット感</string>
-	<string name="Shirt Wrinkles">シャツのしわ</string>
-	<string name="Shoe Height">靴の長さ</string>
-	<string name="Short">ショート</string>
-	<string name="Short Arms">短</string>
-	<string name="Short Legs">短</string>
-	<string name="Short Neck">短</string>
-	<string name="Short Pigtails">短</string>
-	<string name="Short Ponytail">短</string>
-	<string name="Short Sideburns">短め</string>
-	<string name="Short Torso">短</string>
-	<string name="Short hips">短</string>
-	<string name="Shoulders">肩</string>
-	<string name="Side Fringe">サイドの毛先</string>
-	<string name="Sideburns">もみあげ</string>
-	<string name="Sides Hair">サイドの髪</string>
-	<string name="Sides Hair Down">ダウン</string>
-	<string name="Sides Hair Up">アップ</string>
-	<string name="Skinny Neck">細</string>
-	<string name="Skirt Fit">スカートのフィット感</string>
-	<string name="Skirt Length">スカート丈</string>
-	<string name="Slanted Forehead">傾斜した額</string>
-	<string name="Sleeve Length">袖丈</string>
-	<string name="Sleeve Looseness">袖のフィット感</string>
-	<string name="Slit Back">スリット： 後ろ</string>
-	<string name="Slit Front">スリット： 前</string>
-	<string name="Slit Left">スリット： 左</string>
-	<string name="Slit Right">スリット： 右</string>
-	<string name="Small">小</string>
-	<string name="Small Hands">小</string>
-	<string name="Small Head">小</string>
-	<string name="Smooth">滑らか</string>
-	<string name="Smooth Hair">スムーズ</string>
-	<string name="Socks Length">靴下丈</string>
-	<string name="Soulpatch">ソウルパッチ</string>
-	<string name="Sparse">薄</string>
-	<string name="Spiked Hair">とげとげヘア</string>
-	<string name="Square">角張った</string>
-	<string name="Square Toe">スクエアトゥ</string>
-	<string name="Squash Head">カボチャ型</string>
-	<string name="Stretch Head">縦長</string>
-	<string name="Sunken">こけたほお</string>
-	<string name="Sunken Chest">小</string>
-	<string name="Sunken Eyes">くぼんだ目</string>
-	<string name="Sweep Back">後ろへ</string>
-	<string name="Sweep Forward">前へ</string>
-	<string name="Tall">トール</string>
-	<string name="Taper Back">後ろに先細</string>
-	<string name="Taper Front">前に先細</string>
-	<string name="Thick Heels">幅広</string>
-	<string name="Thick Neck">太</string>
-	<string name="Thick Toe">厚め</string>
-	<string name="Thin">薄い</string>
-	<string name="Thin Eyebrows">細</string>
-	<string name="Thin Lips">小</string>
-	<string name="Thin Nose">細い鼻</string>
-	<string name="Tight Chin">ひきしまったあご</string>
-	<string name="Tight Cuffs">タイト</string>
-	<string name="Tight Pants">タイト</string>
-	<string name="Tight Shirt">タイト</string>
-	<string name="Tight Skirt">タイト</string>
-	<string name="Tight Sleeves">タイト</string>
-	<string name="Toe Shape">つま先の形</string>
-	<string name="Toe Thickness">つま先の厚み</string>
-	<string name="Torso Length">上半身の長さ</string>
-	<string name="Torso Muscles">上半身の筋肉</string>
-	<string name="Torso Scrawny">上半身の骨張り</string>
-	<string name="Unattached">大</string>
-	<string name="Uncreased">軽いまぶた</string>
-	<string name="Underbite">受け口</string>
-	<string name="Unnatural">ユニーク</string>
-	<string name="Upper Bridge">両目のあいだ</string>
-	<string name="Upper Cheeks">ほおの上部</string>
-	<string name="Upper Chin Cleft">あご上部の割れ</string>
-	<string name="Upper Eyelid Fold">二重の幅</string>
-	<string name="Upturned">上向き</string>
-	<string name="Very Red">真っ赤</string>
-	<string name="Waist Height">ウエストの高さ</string>
-	<string name="Well-Fed">つまったほお</string>
-	<string name="White Hair">白髪</string>
-	<string name="Wide">広</string>
-	<string name="Wide Back">広</string>
-	<string name="Wide Front">広</string>
-	<string name="Wide Lips">大きい口</string>
-	<string name="Wild">ワイルド</string>
-	<string name="Wrinkles">しわ</string>
-	<string name="LocationCtrlAddLandmarkTooltip">マイ ランドマークに追加</string>
-	<string name="LocationCtrlEditLandmarkTooltip">マイ ランドマークを編集</string>
-	<string name="LocationCtrlInfoBtnTooltip">現在地の詳細を見る</string>
-	<string name="LocationCtrlComboBtnTooltip">マイ ロケーション履歴</string>
-	<string name="LocationCtrlForSaleTooltip">この土地を購入</string>
-	<string name="LocationCtrlVoiceTooltip">ここではボイスの利用ができません</string>
-	<string name="LocationCtrlFlyTooltip">飛行は禁止されています</string>
-	<string name="LocationCtrlPushTooltip">プッシュ禁止</string>
-	<string name="LocationCtrlBuildTooltip">オブジェクトの制作・ドロップは禁止されています</string>
-	<string name="LocationCtrlScriptsTooltip">スクリプト不可</string>
-	<string name="LocationCtrlDamageTooltip">体力</string>
-	<string name="LocationCtrlAdultIconTooltip">Adult リージョン</string>
-	<string name="LocationCtrlModerateIconTooltip">Moderate リージョン</string>
-	<string name="LocationCtrlGeneralIconTooltip">General リージョン</string>
-	<string name="LocationCtrlSeeAVsTooltip">この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。</string>
-	<string name="LocationCtrlPathfindingDirtyTooltip">地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。</string>
-	<string name="LocationCtrlPathfindingDisabledTooltip">この地域（リージョン）でダイナミックパスファインディングが有効になっていません。</string>
-	<string name="UpdaterWindowTitle">[APP_NAME] アップデート</string>
-	<string name="UpdaterNowUpdating">只今 [APP_NAME] をアップデート中です...</string>
-	<string name="UpdaterNowInstalling">[APP_NAME] をインストール中です...</string>
-	<string name="UpdaterUpdatingDescriptive">お使いの [APP_NAME] ビューワが最新バージョンにアップデートされています。  数分かかることがありますのでしばらくお待ちください。</string>
-	<string name="UpdaterProgressBarTextWithEllipses">アップデートをダウンロード中です...</string>
-	<string name="UpdaterProgressBarText">アップデートをダウンロード中</string>
-	<string name="UpdaterFailDownloadTitle">アップデートのダウンロードに失敗しました</string>
-	<string name="UpdaterFailUpdateDescriptive">[APP_NAME] をアップデート中にエラーが発生しました。 www.secondlife.com から最新バージョンをダウンロードしてください。</string>
-	<string name="UpdaterFailInstallTitle">アップデートのインストールに失敗しました</string>
-	<string name="UpdaterFailStartTitle">ビューワの起動に失敗しました</string>
-	<string name="ItemsComingInTooFastFrom">[APP_NAME] ： アイテムが [FROM_NAME] から同時にたくさん読み込まれているため、自動プレビューが [TIME] 秒間無効となります。</string>
-	<string name="ItemsComingInTooFast">[APP_NAME] ： アイテムが同時にたくさん読み込まれているため、自動プレビューが [TIME] 秒間無効となります。</string>
-	<string name="IM_logging_string">-- インスタントメッセージの保存開始 --</string>
-	<string name="IM_typing_start_string">[NAME] は入力中です...</string>
-	<string name="Unnamed">（名前なし）</string>
-	<string name="IM_moderated_chat_label">（モデレート： デフォルトでボイスはオフ）</string>
-	<string name="IM_unavailable_text_label">このコールでは文字チャットが利用できません。</string>
-	<string name="IM_muted_text_label">グループのモデレータが、あなたの文字チャットを使用禁止にしました。</string>
-	<string name="IM_default_text_label">ここをクリックしてインスタントメッセージを開始。</string>
-	<string name="IM_to_label">宛先</string>
-	<string name="IM_moderator_label">（モデレータ）</string>
-	<string name="Saved_message">（保存日時：[LONG_TIMESTAMP]）</string>
-	<string name="IM_unblock_only_groups_friends">このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。</string>
-	<string name="OnlineStatus">オンライン</string>
-	<string name="OfflineStatus">オフライン</string>
-	<string name="not_online_msg">ユーザーがオンラインでありません - メッセージは保存され、後で配信されます。</string>
-	<string name="not_online_inventory">ユーザーがオンラインでありません - インベントリが保存されました。</string>
-	<string name="answered_call">相手がコールを受けました</string>
-	<string name="you_started_call">ボイスコールを開始します</string>
-	<string name="you_joined_call">ボイスコールに参加しました</string>
-	<string name="you_auto_rejected_call-im">「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。</string>
-	<string name="name_started_call">[NAME] はボイスコールを開始します</string>
-	<string name="ringing-im">ボイスコールに参加...</string>
-	<string name="connected-im">接続しました。コール終了をクリックして切ります</string>
-	<string name="hang_up-im">ボイスコールから退席しました</string>
-	<string name="answering-im">接続中...</string>
-	<string name="conference-title">複数人チャット</string>
-	<string name="conference-title-incoming">[AGENT_NAME] とコンファレンスする</string>
-	<string name="inventory_item_offered-im">持ち物アイテム '[ITEM_NAME]' が送られてきました</string>
-	<string name="inventory_folder_offered-im">持ち物フォルダ '[ITEM_NAME]' が送られてきました</string>
-	<string name="share_alert">インベントリからここにアイテムをドラッグします</string>
-	<string name="facebook_post_success">Facebook に投稿しました。</string>
-	<string name="flickr_post_success">Flickr に投稿しました。</string>
-	<string name="twitter_post_success">Twitter に投稿しました。</string>
-	<string name="no_session_message">（IM セッションが存在しません）</string>
-	<string name="only_user_message">このセッションにいるユーザーはあなただけです。</string>
-	<string name="offline_message">[NAME] はオフライン中です。</string>
-	<string name="invite_message">このボイスチャットに応答・接続する場合は、[BUTTON NAME] をクリックしてください。</string>
-	<string name="muted_message">この住人をブロックしています。 メッセージを送ると、ブロックが自動的に解除されます。</string>
-	<string name="generic">リクエスト中にエラーが発生しました。あとでもう一度お試しください。</string>
-	<string name="generic_request_error">要求中にエラーが発生しました。後でもう一度試してください。</string>
-	<string name="insufficient_perms_error">あなたには充分な権限がありません。</string>
-	<string name="session_does_not_exist_error">このセッションは既に切断されています。</string>
-	<string name="no_ability_error">あなたにはその能力がありません。</string>
-	<string name="no_ability">あなたにはその能力がありません。</string>
-	<string name="not_a_mod_error">あなたはセッションモデレータではありません。</string>
-	<string name="muted">グループのモデレーターが、あなたのテキストチャットを禁止しました。</string>
-	<string name="muted_error">グループモデレータがあなたのテキストチャットを無効化しました</string>
-	<string name="add_session_event">[RECIPIENT] とのチャットセッションにユーザーを追加することができません</string>
-	<string name="message">[RECIPIENT] とのチャットセッションに、メッセージを送信することができません。</string>
-	<string name="message_session_event">[RECIPIENT] とのチャットセッションにメッセージを送ることができません</string>
-	<string name="mute">モデレート中にエラーが発生しました。</string>
-	<string name="removed">グループから脱退しました。</string>
-	<string name="removed_from_group">あなたはグループから削除されました。</string>
-	<string name="close_on_no_ability">このチャットセッションを継続することはできません</string>
-	<string name="unread_chat_single">[SOURCES] は何か新しいことを言いました。</string>
-	<string name="unread_chat_multiple">[SOURCES] は何か新しいことを言いました。</string>
-	<string name="session_initialization_timed_out_error">セッションの初期化がタイムアウトしました</string>
-	<string name="Home position set.">家の配置の設定。</string>
-	<string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
-	<string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
-	<string name="paid_you_ldollars">[NAME] は [REASON] のために L$[AMOUNT] を支払いました。</string>
-	<string name="paid_you_ldollars_gift">[NAME] は L$[AMOUNT] 支払いました：[REASON]</string>
-	<string name="paid_you_ldollars_no_reason">[NAME] は L$[AMOUNT] を支払いました。</string>
-	<string name="you_paid_ldollars">[NAME] に L$ [AMOUNT] を支払いました：[REASON]</string>
-	<string name="you_paid_ldollars_gift">[NAME] に L$ [AMOUNT] を支払いました：[REASON]</string>
-	<string name="you_paid_ldollars_no_info">L$ [AMOUNT] を支払いました。</string>
-	<string name="you_paid_ldollars_no_reason">[NAME] に L$ [AMOUNT] を支払いました。</string>
-	<string name="you_paid_ldollars_no_name">L$ [AMOUNT] を支払いました：[REASON]</string>
-	<string name="you_paid_failure_ldollars">[NAME] に [REASON] の代金 L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="you_paid_failure_ldollars_gift">[NAME] に L$ [AMOUNT] を支払えませんでした：[REASON]</string>
-	<string name="you_paid_failure_ldollars_no_info">L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="you_paid_failure_ldollars_no_reason">[NAME] に L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="you_paid_failure_ldollars_no_name">[REASON] の 代金 L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="for item">[ITEM] 向け</string>
-	<string name="for a parcel of land">土地区画のため</string>
-	<string name="for a land access pass">土地の入場許可を得るため</string>
-	<string name="for deeding land">土地を譲渡するため</string>
-	<string name="to create a group">グループを作成するため</string>
-	<string name="to join a group">グループに参加するため</string>
-	<string name="to upload">アップロードするため</string>
-	<string name="to publish a classified ad">クラシファイド広告を掲載する</string>
-	<string name="giving">L$[AMOUNT] を渡します</string>
-	<string name="uploading_costs">アップロード料金は L$[AMOUNT] です</string>
-	<string name="this_costs">料金は L$[AMOUNT] です</string>
-	<string name="buying_selected_land">選択した土地を L$ [AMOUNT] で購入します</string>
-	<string name="this_object_costs">このオブジェクトは L$[AMOUNT] です</string>
-	<string name="group_role_everyone">全員</string>
-	<string name="group_role_officers">オフィサー</string>
-	<string name="group_role_owners">オーナー</string>
-	<string name="group_member_status_online">オンライン</string>
-	<string name="uploading_abuse_report">アップロード中...
+また、「コントロールパネル」＞「画面」＞「設定」内で、モニターが「最高 （３２ビット）」に設定されていることもご確認ください。
+このメッセージが何度も出る場合は、 [SUPPORT_SITE] へご連絡ください。</string>
+  <string name="MBPixelFmtSetErr">ピクセル形式が設定できません。</string>
+  <string name="MBGLContextErr">ＧＬレンダーコンテキストが作れません</string>
+  <string name="MBGLContextActErr">ＧＬレンダーコンテキストを有効化できません。</string>
+  <string name="MBVideoDrvErr">お使いのコンピューターのビデオカードのドライバが正常にインストールされていないか、古いまたはサポート対象外のため、[APP_NAME]を実行することができませんでした。
+最新のビデオカードドライバがインストールされているのを確認し、されている場合は再インストールをお試しください。
+
+このメッセージが何度も出る場合は、[SUPPORT_SITE]へご連絡ください。</string>
+
+  <!-- Avatar Shape Information -->
+  <string name="5 O'Clock Shadow">うっすらとしたヒゲ</string>
+
+  <string name="All White">真っ白</string>
+  <string name="Anime Eyes">アニメ風の目</string>
+  <string name="Arced">アーチ</string>
+  <string name="Arm Length">腕の長さ</string>
+  <string name="Attached">小</string>
+  <string name="Attached Earlobes">耳たぶ</string>
+
+
+  <string name="Back Fringe">後ろ髪の毛先</string>
+
+  <string name="Baggy">たるんだ下まぶた</string>
+  <string name="Bangs">前髪</string>
+
+  <string name="Beady Eyes">ビーズのような目</string>
+  <string name="Belly Size">お腹の大きさ</string>
+  <string name="Big">大</string>
+  <string name="Big Butt">大</string>
+
+  <string name="Big Hair Back">髪の大部分：後ろ</string>
+  <string name="Big Hair Front">髪の大部分：前</string>
+  <string name="Big Hair Top">髪の大部分：上部</string>
+  <string name="Big Head">大</string>
+  <string name="Big Pectorals">大</string>
+  <string name="Big Spikes">とげあり</string>
+  <string name="Black">黒</string>
+  <string name="Blonde">ブロンド</string>
+  <string name="Blonde Hair">ブロンドの髪</string>
+  <string name="Blush">チーク</string>
+  <string name="Blush Color">チークカラー</string>
+  <string name="Blush Opacity">チークの濃さ</string>
+  <string name="Body Definition">体の精細度</string>
+  <string name="Body Fat">体脂肪</string>
+  <string name="Body Freckles">体のしみ・そばかす</string>
+  <string name="Body Thick">骨太</string>
+  <string name="Body Thickness">体の厚み</string>
+  <string name="Body Thin">細め</string>
+
+  <string name="Bow Legged">股</string>
+  <string name="Breast Buoyancy">胸の重力</string>
+  <string name="Breast Cleavage">胸の谷間</string>
+  <string name="Breast Size">胸の大きさ</string>
+  <string name="Bridge Width">両目の間の幅</string>
+  <string name="Broad">広</string>
+  <string name="Brow Size">眉毛上の隆起</string>
+  <string name="Bug Eyes">Bug Eyes</string>
+  <string name="Bugged Eyes">突き出た目</string>
+  <string name="Bulbous">だんご</string>
+  <string name="Bulbous Nose">だんご鼻</string>
+
+  <string name="Breast Physics Mass">胸の豊かさ</string>
+  <string name="Breast Physics Smoothing">胸の平滑化</string>
+  <string name="Breast Physics Gravity">胸の垂れ具合</string>
+  <string name="Breast Physics Drag">胸の空気抵抗</string>
+
+  <string name="Breast Physics InOut Max Effect">最大エフェクト数</string>
+  <string name="Breast Physics InOut Spring">振動速度</string>
+  <string name="Breast Physics InOut Gain">増加率</string>
+  <string name="Breast Physics InOut Damping">減衰</string>
+
+  <string name="Breast Physics UpDown Max Effect">最大エフェクト数</string>
+  <string name="Breast Physics UpDown Spring">振動速度</string>
+  <string name="Breast Physics UpDown Gain">増加率</string>
+  <string name="Breast Physics UpDown Damping">減衰</string>
+
+  <string name="Breast Physics LeftRight Max Effect">最大エフェクト数</string>
+  <string name="Breast Physics LeftRight Spring">振動速度</string>
+  <string name="Breast Physics LeftRight Gain">増加率</string>
+  <string name="Breast Physics LeftRight Damping">減衰</string>
+
+  <string name="Belly Physics Mass">お腹の豊かさ</string>
+  <string name="Belly Physics Smoothing">お腹の平滑化</string>
+  <string name="Belly Physics Gravity">お腹の垂れ具合</string>
+  <string name="Belly Physics Drag">お腹の空気抵抗</string>
+
+  <string name="Belly Physics UpDown Max Effect">最大エフェクト数</string>
+  <string name="Belly Physics UpDown Spring">振動速度</string>
+  <string name="Belly Physics UpDown Gain">増加率</string>
+  <string name="Belly Physics UpDown Damping">減衰</string>
+
+  <string name="Butt Physics Mass">お尻の豊かさ</string>
+  <string name="Butt Physics Smoothing">お尻の平滑化</string>
+  <string name="Butt Physics Gravity">お尻の垂れ具合</string>
+  <string name="Butt Physics Drag">お尻の空気抵抗</string>
+
+  <string name="Butt Physics UpDown Max Effect">最大エフェクト数</string>
+  <string name="Butt Physics UpDown Spring">振動速度</string>
+  <string name="Butt Physics UpDown Gain">増加率</string>
+  <string name="Butt Physics UpDown Damping">減衰</string>
+
+  <string name="Butt Physics LeftRight Max Effect">最大エフェクト数</string>
+  <string name="Butt Physics LeftRight Spring">振動速度</string>
+  <string name="Butt Physics LeftRight Gain">増加率</string>
+  <string name="Butt Physics LeftRight Damping">減衰</string>
+
+  <string name="Bushy Eyebrows">太</string>
+  <string name="Bushy Hair">ぼさぼさヘア</string>
+  <string name="Butt Size">お尻の大きさ</string>
+  <string name="Butt Gravity">お尻の垂れ具合</string>
+  <string name="bustle skirt">後ろの膨らみ</string>
+  <string name="no bustle">膨らみなし</string>
+  <string name="more bustle">膨らみ大</string>
+
+  <string name="Chaplin">チャップリン</string>
+  <string name="Cheek Bones">ほお骨</string>
+  <string name="Chest Size">胸部の大きさ</string>
+  <string name="Chin Angle">あごの角度</string>
+  <string name="Chin Cleft">あごの先の割れ</string>
+  <string name="Chin Curtains">あごに沿ったひげ</string>
+
+  <string name="Chin Depth">あごの長さ</string>
+  <string name="Chin Heavy">あごを強調</string>
+  <string name="Chin In">ひいたあご</string>
+  <string name="Chin Out">突き出たあご</string>
+  <string name="Chin-Neck">あごと首</string>
+  <string name="Clear">クリア</string>
+  <string name="Cleft">割れた</string>
+  <string name="Close Set Eyes">顔の中心寄りの目</string>
+  <string name="Closed">クローズ</string>
+  <string name="Closed Back">後ろとじ</string>
+  <string name="Closed Front">前とじ</string>
+  <string name="Closed Left">左とじ</string>
+  <string name="Closed Right">右とじ</string>
+  <string name="Coin Purse">コイン入れ</string>
+  <string name="Collar Back">後ろえり</string>
+
+
+
+  <string name="Collar Front">前えり</string>
+
+
+
+  <string name="Corner Down">ダウン</string>
+
+  <string name="Corner Up">アップ</string>
+  <string name="Creased">重いまぶた</string>
+  <string name="Crooked Nose">曲がった鼻</string>
+
+  <string name="Cuff Flare">袖口のフレア</string>
+  <string name="Dark">ダーク</string>
+  <string name="Dark Green">ダークグリーン</string>
+  <string name="Darker">ダーク</string>
+  <string name="Deep">尖った</string>
+  <string name="Default Heels">デフォルトのかかと</string>
+
+  <string name="Dense">濃</string>
+
+  <string name="Double Chin">二重あご</string>
+  <string name="Downturned">下向き</string>
+  <string name="Duffle Bag">ダッフルバッグ</string>
+  <string name="Ear Angle">耳の角度</string>
+  <string name="Ear Size">耳の大きさ</string>
+  <string name="Ear Tips">耳の先</string>
+  <string name="Egg Head">たまご頭</string>
+  <string name="Eye Bags">下まぶた</string>
+  <string name="Eye Color">瞳の色</string>
+  <string name="Eye Depth">目のくぼみ</string>
+  <string name="Eye Lightness">瞳の明るさ</string>
+  <string name="Eye Opening">見開き具合</string>
+  <string name="Eye Pop">両目の大きさの対称</string>
+  <string name="Eye Size">目の大きさ</string>
+  <string name="Eye Spacing">目と目のあいだの幅</string>
+
+  <string name="Eyebrow Arc">眉毛のアーチ</string>
+  <string name="Eyebrow Density">眉毛の密集度</string>
+
+  <string name="Eyebrow Height">眉毛の高さ</string>
+  <string name="Eyebrow Points">眉毛の角</string>
+  <string name="Eyebrow Size">眉毛の大きさ</string>
+
+  <string name="Eyelash Length">まつげの長さ</string>
+  <string name="Eyeliner">アイライナー</string>
+  <string name="Eyeliner Color">アイライナーの色</string>
+
+  <string name="Eyes Bugged">下まぶたがたるんだ目</string>
+
+
+
+
+
+
+
+
+  <string name="Face Shear">顔のゆがみ</string>
+  <string name="Facial Definition">顔の精細度</string>
+  <string name="Far Set Eyes">離れた目</string>
+
+  <string name="Fat Lips">大</string>
+
+  <string name="Female">女性</string>
+  <string name="Fingerless">指なし</string>
+  <string name="Fingers">指あり</string>
+  <string name="Flared Cuffs">広がった袖口</string>
+  <string name="Flat">平ら</string>
+  <string name="Flat Butt">小</string>
+  <string name="Flat Head">絶壁頭</string>
+  <string name="Flat Toe">フラット</string>
+  <string name="Foot Size">足の大きさ</string>
+  <string name="Forehead Angle">ひたいの角度</string>
+  <string name="Forehead Heavy">ひたいを強調</string>
+  <string name="Freckles">しみ・そばかす</string>
+
+  <string name="Front Fringe">前髪の毛先</string>
+
+  <string name="Full Back">刈られていない髪</string>
+  <string name="Full Eyeliner">あり</string>
+  <string name="Full Front">刈られていない髪</string>
+  <string name="Full Hair Sides">サイドの髪</string>
+  <string name="Full Sides">生え揃ったサイド</string>
+  <string name="Glossy">あり</string>
+  <string name="Glove Fingers">手袋の指</string>
+
+  <string name="Glove Length">手袋の長さ</string>
+
+
+  <string name="Hair">髪</string>
+  <string name="Hair Back">髪：後ろ</string>
+  <string name="Hair Front">髪：前</string>
+  <string name="Hair Sides">髪：サイド</string>
+  <string name="Hair Sweep">流す</string>
+  <string name="Hair Thickess">髪の量</string>
+  <string name="Hair Thickness">髪の量</string>
+  <string name="Hair Tilt">髪の向き</string>
+  <string name="Hair Tilted Left">左向き</string>
+  <string name="Hair Tilted Right">右向き</string>
+  <string name="Hair Volume">髪：ボリューム</string>
+  <string name="Hand Size">手の大きさ</string>
+  <string name="Handlebars">ハンドルバー</string>
+  <string name="Head Length">頭の長さ</string>
+  <string name="Head Shape">頭の形</string>
+  <string name="Head Size">頭の大きさ</string>
+  <string name="Head Stretch">縦横の長さ</string>
+  <string name="Heel Height">ヒールの高さ</string>
+  <string name="Heel Shape">ヒールの形</string>
+  <string name="Height">身長</string>
+  <string name="High">高</string>
+  <string name="High Heels">ハイヒール</string>
+  <string name="High Jaw">高</string>
+  <string name="High Platforms">厚底</string>
+  <string name="High and Tight">高めでタイト</string>
+  <string name="Higher">高</string>
+  <string name="Hip Length">腰の長さ</string>
+  <string name="Hip Width">腰の幅</string>
+  <string name="Hover">ホバー</string>
+  <string name="In">内向き</string>
+  <string name="In Shdw Color">内側のシャドウカラー</string>
+  <string name="In Shdw Opacity">内側のシャドウの濃さ</string>
+  <string name="Inner Eye Corner">目頭</string>
+  <string name="Inner Eye Shadow">内側のアイシャドウ</string>
+  <string name="Inner Shadow">内側のシャドウ</string>
+
+
+  <string name="Jacket Length">ジャケット丈</string>
+  <string name="Jacket Wrinkles">ジャケットのしわ</string>
+  <string name="Jaw Angle">あごの角度</string>
+  <string name="Jaw Jut">あごの突出</string>
+  <string name="Jaw Shape">あごの形</string>
+  <string name="Join">寄せた胸</string>
+  <string name="Jowls">えら</string>
+  <string name="Knee Angle">膝の角度</string>
+  <string name="Knock Kneed">内股</string>
+
+  <string name="Large">大</string>
+  <string name="Large Hands">大</string>
+  <string name="Left Part">左分け</string>
+  <string name="Leg Length">脚の長さ</string>
+  <string name="Leg Muscles">脚の筋肉</string>
+  <string name="Less">小</string>
+  <string name="Less Body Fat">少なめ</string>
+  <string name="Less Curtains">少なめ</string>
+  <string name="Less Freckles">少なめ</string>
+  <string name="Less Full">薄い</string>
+  <string name="Less Gravity">少</string>
+  <string name="Less Love">少</string>
+  <string name="Less Muscles">少なめ</string>
+  <string name="Less Muscular">少なめ</string>
+  <string name="Less Rosy">少な目</string>
+  <string name="Less Round">丸み少な目</string>
+  <string name="Less Saddle">小</string>
+  <string name="Less Square">小</string>
+  <string name="Less Volume">ボリューム少な目</string>
+  <string name="Less soul">小</string>
+  <string name="Lighter">ライト</string>
+  <string name="Lip Cleft">唇の山</string>
+  <string name="Lip Cleft Depth">唇の山の高さ</string>
+  <string name="Lip Fullness">唇の厚み</string>
+  <string name="Lip Pinkness">唇の赤み</string>
+  <string name="Lip Ratio">上下唇の大きさ</string>
+  <string name="Lip Thickness">唇の前後幅</string>
+  <string name="Lip Width">口の大きさ</string>
+  <string name="Lipgloss">リップグロス</string>
+  <string name="Lipstick">口紅</string>
+  <string name="Lipstick Color">口紅の色</string>
+  <string name="Long">ロング</string>
+  <string name="Long Head">前後幅が広い頭</string>
+  <string name="Long Hips">長</string>
+  <string name="Long Legs">長</string>
+  <string name="Long Neck">長</string>
+  <string name="Long Pigtails">長</string>
+  <string name="Long Ponytail">長</string>
+  <string name="Long Torso">長</string>
+  <string name="Long arms">長</string>
+
+
+  <string name="Loose Pants">ゆったり</string>
+  <string name="Loose Shirt">ゆるめ</string>
+  <string name="Loose Sleeves">ゆるめ</string>
+
+  <string name="Love Handles">ウエスト周り</string>
+  <string name="Low">低</string>
+  <string name="Low Heels">ローヒール</string>
+  <string name="Low Jaw">低</string>
+  <string name="Low Platforms">低め</string>
+  <string name="Low and Loose">低めでゆったり</string>
+  <string name="Lower">低</string>
+  <string name="Lower Bridge">鼻筋</string>
+  <string name="Lower Cheeks">ほおの下部</string>
+
+  <string name="Male">男性</string>
+  <string name="Middle Part">真ん中分け</string>
+  <string name="More">大</string>
+  <string name="More Blush">きつめ</string>
+  <string name="More Body Fat">多め</string>
+  <string name="More Curtains">多め</string>
+  <string name="More Eyeshadow">あり</string>
+  <string name="More Freckles">多め</string>
+  <string name="More Full">厚い</string>
+  <string name="More Gravity">大</string>
+  <string name="More Lipstick">あり</string>
+  <string name="More Love">大</string>
+  <string name="More Lower Lip">大</string>
+  <string name="More Muscles">多め</string>
+  <string name="More Muscular">筋骨隆々</string>
+  <string name="More Rosy">多め</string>
+  <string name="More Round">まる</string>
+  <string name="More Saddle">大</string>
+  <string name="More Sloped">なだらか</string>
+  <string name="More Square">四角</string>
+  <string name="More Upper Lip">大</string>
+  <string name="More Vertical">垂直</string>
+  <string name="More Volume">大</string>
+  <string name="More soul">大</string>
+  <string name="Moustache">口ひげ</string>
+
+  <string name="Mouth Corner">口角</string>
+  <string name="Mouth Position">口の位置</string>
+  <string name="Mowhawk">モヒカン</string>
+  <string name="Muscular">筋骨隆々</string>
+  <string name="Mutton Chops">マトンチョップス</string>
+
+  <string name="Nail Polish">マニキュア</string>
+  <string name="Nail Polish Color">マニキュアの色</string>
+  <string name="Narrow">狭</string>
+  <string name="Narrow Back">狭</string>
+  <string name="Narrow Front">狭</string>
+  <string name="Narrow Lips">おちょぼ口</string>
+  <string name="Natural">ナチュラル</string>
+  <string name="Neck Length">首の長さ</string>
+  <string name="Neck Thickness">首の太さ</string>
+  <string name="No Blush">なし</string>
+  <string name="No Eyeliner">なし</string>
+  <string name="No Eyeshadow">なし</string>
+
+  <string name="No Lipgloss">なし</string>
+  <string name="No Lipstick">なし</string>
+  <string name="No Part">なし</string>
+  <string name="No Polish">なし</string>
+  <string name="No Red">なし</string>
+  <string name="No Spikes">なし</string>
+  <string name="No White">なし</string>
+  <string name="No Wrinkles">なし</string>
+  <string name="Normal Lower">下</string>
+  <string name="Normal Upper">上</string>
+  <string name="Nose Left">左曲がり</string>
+  <string name="Nose Right">右曲がり</string>
+  <string name="Nose Size">鼻の大きさ</string>
+  <string name="Nose Thickness">鼻の厚み</string>
+  <string name="Nose Tip Angle">鼻先の角度</string>
+  <string name="Nose Tip Shape">鼻先の形</string>
+  <string name="Nose Width">鼻の幅</string>
+  <string name="Nostril Division">鼻の穴の高さ</string>
+  <string name="Nostril Width">鼻の穴の幅</string>
+
+
+  <string name="Opaque">濃いめ</string>
+  <string name="Open">オープン</string>
+  <string name="Open Back">後ろあき</string>
+  <string name="Open Front">前あき</string>
+  <string name="Open Left">左あき</string>
+  <string name="Open Right">右あき</string>
+  <string name="Orange">オレンジ</string>
+  <string name="Out">外向き</string>
+  <string name="Out Shdw Color">外側のシャドウカラー</string>
+  <string name="Out Shdw Opacity">外側のシャドウの濃さ</string>
+  <string name="Outer Eye Corner">目尻</string>
+  <string name="Outer Eye Shadow">外側のアイシャドウ</string>
+  <string name="Outer Shadow">外側のシャドウ</string>
+  <string name="Overbite">出っ歯</string>
+
+  <string name="Package">パッケージ</string>
+  <string name="Painted Nails">あり</string>
+  <string name="Pale">悪い</string>
+  <string name="Pants Crotch">ズボンの股</string>
+  <string name="Pants Fit">ズボンのフィット感</string>
+  <string name="Pants Length">ズボン丈</string>
+
+
+  <string name="Pants Waist">ウエスト</string>
+  <string name="Pants Wrinkles">ズボンのしわ</string>
+  <string name="Part">あり</string>
+  <string name="Part Bangs">分けた前髪</string>
+  <string name="Pectorals">胸筋</string>
+  <string name="Pigment">色素</string>
+  <string name="Pigtails">下げ髪</string>
+  <string name="Pink">ピンク</string>
+  <string name="Pinker">ピンク</string>
+  <string name="Platform Height">靴底の高さ</string>
+  <string name="Platform Width">靴底の幅</string>
+  <string name="Pointy">尖った</string>
+  <string name="Pointy Heels">幅狭</string>
+
+  <string name="Ponytail">ポニーテール</string>
+  <string name="Poofy Skirt">ふんわり</string>
+  <string name="Pop Left Eye">左目を大きく</string>
+  <string name="Pop Right Eye">右目を大きく</string>
+  <string name="Puffy">ふっくら</string>
+  <string name="Puffy Eyelids">目の周りの膨らみ</string>
+  <string name="Rainbow Color">虹色</string>
+  <string name="Red Hair">赤毛</string>
+
+  <string name="Regular">均整のとれた</string>
+
+  <string name="Right Part">右分け</string>
+  <string name="Rosy Complexion">頬紅</string>
+  <string name="Round">まるっこい</string>
+
+  <string name="Ruddiness">血色</string>
+  <string name="Ruddy">良い</string>
+  <string name="Rumpled Hair">くしゃくしゃヘア</string>
+  <string name="Saddle Bags">腰回りの肉付き</string>
+
+
+  <string name="Scrawny Leg">骨張った脚</string>
+  <string name="Separate">離れた胸</string>
+  <string name="Shallow">なだらか</string>
+  <string name="Shear Back">後方を刈る</string>
+  <string name="Shear Face">顔のゆがみ</string>
+  <string name="Shear Front">前方を刈る</string>
+
+  <string name="Shear Left Up">左半分を上に</string>
+
+  <string name="Shear Right Up">右半分を上に</string>
+  <string name="Sheared Back">後ろを刈られた髪</string>
+  <string name="Sheared Front">前を刈られた髪</string>
+  <string name="Shift Left">左向き</string>
+  <string name="Shift Mouth">口の向き</string>
+  <string name="Shift Right">右向き</string>
+  <string name="Shirt Bottom">シャツの裾</string>
+
+  <string name="Shirt Fit">シャツのフィット感</string>
+
+  <string name="Shirt Wrinkles">シャツのしわ</string>
+  <string name="Shoe Height">靴の長さ</string>
+
+  <string name="Short">ショート</string>
+  <string name="Short Arms">短</string>
+  <string name="Short Legs">短</string>
+  <string name="Short Neck">短</string>
+  <string name="Short Pigtails">短</string>
+  <string name="Short Ponytail">短</string>
+  <string name="Short Sideburns">短め</string>
+  <string name="Short Torso">短</string>
+  <string name="Short hips">短</string>
+  <string name="Shoulders">肩</string>
+
+  <string name="Side Fringe">サイドの毛先</string>
+  <string name="Sideburns">もみあげ</string>
+
+  <string name="Sides Hair">サイドの髪</string>
+  <string name="Sides Hair Down">ダウン</string>
+  <string name="Sides Hair Up">アップ</string>
+
+  <string name="Skinny Neck">細</string>
+  <string name="Skirt Fit">スカートのフィット感</string>
+  <string name="Skirt Length">スカート丈</string>
+  <string name="Slanted Forehead">傾斜した額</string>
+  <string name="Sleeve Length">袖丈</string>
+
+
+
+  <string name="Sleeve Looseness">袖のフィット感</string>
+  <string name="Slit Back">スリット：後ろ</string>
+  <string name="Slit Front">スリット：前</string>
+  <string name="Slit Left">スリット：左</string>
+  <string name="Slit Right">スリット：右</string>
+  <string name="Small">小</string>
+  <string name="Small Hands">小</string>
+  <string name="Small Head">小</string>
+  <string name="Smooth">滑らか</string>
+  <string name="Smooth Hair">スムーズ</string>
+  <string name="Socks Length">靴下丈</string>
+
+
+  <string name="Soulpatch">ソウルパッチ</string>
+
+  <string name="Sparse">薄</string>
+  <string name="Spiked Hair">とげとげヘア</string>
+  <string name="Square">角張った</string>
+  <string name="Square Toe">スクエアトゥ</string>
+  <string name="Squash Head">カボチャ型</string>
+
+  <string name="Stretch Head">縦長</string>
+  <string name="Sunken">こけたほお</string>
+  <string name="Sunken Chest">小</string>
+  <string name="Sunken Eyes">くぼんだ目</string>
+  <string name="Sweep Back">後ろへ</string>
+  <string name="Sweep Forward">前へ</string>
+
+  <string name="Tall">トール</string>
+  <string name="Taper Back">後ろに先細</string>
+  <string name="Taper Front">前に先細</string>
+  <string name="Thick Heels">幅広</string>
+  <string name="Thick Neck">太</string>
+  <string name="Thick Toe">厚め</string>
+
+  <string name="Thin">薄い</string>
+  <string name="Thin Eyebrows">細</string>
+  <string name="Thin Lips">小</string>
+  <string name="Thin Nose">細い鼻</string>
+  <string name="Tight Chin">ひきしまったあご</string>
+  <string name="Tight Cuffs">タイト</string>
+  <string name="Tight Pants">タイト</string>
+  <string name="Tight Shirt">タイト</string>
+  <string name="Tight Skirt">タイト</string>
+  <string name="Tight Sleeves">タイト</string>
+
+  <string name="Toe Shape">つま先の形</string>
+  <string name="Toe Thickness">つま先の厚み</string>
+  <string name="Torso Length">上半身の長さ</string>
+  <string name="Torso Muscles">上半身の筋肉</string>
+  <string name="Torso Scrawny">上半身の骨張り</string>
+  <string name="Unattached">大</string>
+  <string name="Uncreased">軽いまぶた</string>
+  <string name="Underbite">受け口</string>
+  <string name="Unnatural">ユニーク</string>
+  <string name="Upper Bridge">両目のあいだ</string>
+  <string name="Upper Cheeks">ほおの上部</string>
+  <string name="Upper Chin Cleft">あご上部の割れ</string>
+
+  <string name="Upper Eyelid Fold">二重の幅</string>
+  <string name="Upturned">上向き</string>
+  <string name="Very Red">真っ赤</string>
+  <string name="Waist Height">ウエストの高さ</string>
+
+
+  <string name="Well-Fed">つまったほお</string>
+  <string name="White Hair">白髪</string>
+  <string name="Wide">広</string>
+  <string name="Wide Back">広</string>
+  <string name="Wide Front">広</string>
+  <string name="Wide Lips">大きい口</string>
+  <string name="Wild">ワイルド</string>
+  <string name="Wrinkles">しわ</string>
+
+  <!-- Navigation bar location input control.
+       Strings are here because widget xml is not localizable -->
+  <string name="LocationCtrlAddLandmarkTooltip">ランドマークに追加</string>
+  <string name="LocationCtrlEditLandmarkTooltip">ランドマークを編集</string>
+  <string name="LocationCtrlInfoBtnTooltip">現在地の詳細を見る</string>
+  <string name="LocationCtrlComboBtnTooltip">ロケーション履歴</string>
+  <string name="LocationCtrlForSaleTooltip">この土地を購入</string>
+  <string name="LocationCtrlVoiceTooltip">ここではボイスを利用できません。</string>
+  <string name="LocationCtrlFlyTooltip">飛行は禁止されています。</string>
+  <string name="LocationCtrlPushTooltip">プッシュ禁止</string>
+  <string name="LocationCtrlBuildTooltip">オブジェクトの制作や落とす事は禁止されています。</string>
+  <string name="LocationCtrlScriptsTooltip">スクリプト不可</string>
+  <string name="LocationCtrlDamageTooltip">体力</string>
+  <string name="LocationCtrlAdultIconTooltip">Adultリージョン</string>
+  <string name="LocationCtrlModerateIconTooltip">Moderateリージョン</string>
+  <string name="LocationCtrlGeneralIconTooltip">Generalリージョン</string>
+  <string name="LocationCtrlSeeAVsTooltip">この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">リージョン（地域）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。</string>
+  <string name="LocationCtrlPathfindingDisabledTooltip">このリージョン（地域）では、動的経路探索が有効になっていません。</string>
+  <!-- Strings used by the (currently Linux) auto-updater app -->
+  <string name="UpdaterWindowTitle">[APP_NAME]の更新</string>
+  <string name="UpdaterNowUpdating">只今[APP_NAME]を更新中です…</string>
+  <string name="UpdaterNowInstalling">[APP_NAME]をインストール中です…</string>
+  <string name="UpdaterUpdatingDescriptive">お使いの[APP_NAME]ビューアーを最新バージョンに更新しています。数分かかることがありますのでしばらくお待ちください。</string>
+  <string name="UpdaterProgressBarTextWithEllipses">アップデートをダウンロード中です…</string>
+  <string name="UpdaterProgressBarText">更新をダウンロード中…</string>
+  <string name="UpdaterFailDownloadTitle">更新のダウンロードに失敗しました。</string>
+  <string name="UpdaterFailUpdateDescriptive">[APP_NAME]の更新中にエラーが発生しました。www.secondlife.com から最新バージョンをダウンロードしてください。</string>
+  <string name="UpdaterFailInstallTitle">更新のインストールに失敗しました。</string>
+  <string name="UpdaterFailStartTitle">ビューアーの起動に失敗しました。</string>
+
+  <!-- System Messages -->
+  <string name="ItemsComingInTooFastFrom">[APP_NAME]：アイテムが[FROM_NAME]から同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。</string>
+  <string name="ItemsComingInTooFast">[APP_NAME]：アイテムが同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。</string>
+
+  <!-- IM system messages -->
+  <string name="IM_logging_string">－インスタントメッセージの保存開始－</string>
+  <string name="IM_typing_start_string">[NAME]は入力中です…</string>
+  <string name="Unnamed">（名前なし）</string>
+  <string name="IM_moderated_chat_label">（モデレート：デフォルトでボイスはオフ）</string>
+  <string name="IM_unavailable_text_label">このコールでは文字チャットが利用できません。</string>
+  <string name="IM_muted_text_label">グループのモデレータが、あなたの文字チャットを使用禁止にしました。</string>
+  <string name="IM_default_text_label">ここをクリックしてインスタントメッセージを開始。</string>
+  <string name="IM_to_label">宛先</string>
+  <string name="IM_moderator_label">（モデレータ）</string>
+  <!-- TODO: [LOGN_TIMESTAMP]の時刻表記が日本で標準的な書式でない -->
+  <string name="Saved_message">（保存日時：[LONG_TIMESTAMP]）</string>
+  <string name="IM_unblock_only_groups_friends">このメッセージを表示するには、「初期設定」の「プライバシー」で「フレンドとグループ以外からはコールとIMを受信しない」チェックボックスをオフにします。</string>
+  <string name="OnlineStatus">オンライン</string>
+  <string name="OfflineStatus">オフライン</string>
+  <string name="not_online_msg">ユーザーがオンラインでありません－メッセージは保存され、後で配信されます。</string>
+  <string name="not_online_inventory">ユーザーがオンラインでありません–インベントリに保存されました。</string>
+
+  <!-- voice calls -->
+  <string name="answered_call">相手がコールを受けました。</string>
+  <string name="you_started_call">ボイスコールを開始します。</string>
+  <string name="you_joined_call">ボイスコールに参加しました。</string>
+  <string name="you_auto_rejected_call-im">「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。</string>
+  <string name="name_started_call">[NAME]はボイスコールを開始します</string>
+
+  <string name="ringing-im">ボイスコールに参加…</string>
+  <string name="connected-im">接続しました。「通話終了」をクリックして切断します。</string>
+  <string name="hang_up-im">ボイスコールから退席しました</string>
+  <string name="answering-im">接続中…</string>
+  <string name="conference-title">複数人チャット</string>
+  <string name="conference-title-incoming">[AGENT_NAME]と会話する</string>
+  <string name="inventory_item_offered-im">アイテム「[ITEM_NAME]」がインベントリに送られてきました。</string>
+  <string name="inventory_folder_offered-im">フォルダ「[ITEM_NAME]」がインベントリに送られてきました。</string>
+  <string name="share_alert">インベントリからここにアイテムをドラッグします。</string>
+
+  <string name="no_session_message">（ＩＭセッションが存在しません）</string>
+  <string name="only_user_message">このセッションにいるユーザーはあなただけです。</string>
+  <string name="offline_message">[NAME]はオフライン中です。</string>
+  <string name="invite_message">このボイスチャットに応答・接続する場合は、[BUTTON NAME]をクリックしてください。</string>
+  <string name="muted_message">この住人をブロックしています。メッセージを送ると、ブロックが自動的に解除されます。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
+  Also there are some other places where "generic" is used.
+  So, let add string with name="generic" with the same value as "generic_request_error" -->
+  <string name="generic">リクエスト中にエラーが発生しました。お手数ですが、もう一度やり直してください。</string>
+  <string name="generic_request_error">要求中にエラーが発生しました。お手数ですが、もう一度やり直してください。</string>
+  <string name="insufficient_perms_error">あなたには充分な権限がありません。</string>
+  <string name="session_does_not_exist_error">このセッションは既に切断されています。</string>
+  <string name="no_ability_error">あなたにはその能力がありません。</string>
+  <string name="no_ability">あなたにはその能力がありません。</string>
+  <string name="not_a_mod_error">あなたは、セッションモデレータではありません。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="muted" with the same value as "muted_error" -->
+  <string name="muted">グループのモデレーターが、あなたのテキストチャットを禁止しました。</string>
+  <string name="muted_error">グループモデレータが、あなたのテキストチャットを無効化しました。</string>
+  <string name="add_session_event">[RECIPIENT]とのチャットセッションにユーザーを追加することができません。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="message" with the same value as "message_session_event" -->
+  <string name="message">[RECIPIENT]とのチャットセッションに、メッセージを送信することができません。</string>
+  <string name="message_session_event">[RECIPIENT]とのチャットセッションにメッセージを送ることができません。</string>
+  <string name="mute">モデレート中にエラーが発生しました。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3459 issue 'removed' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="removed" with the same value as "removed_from_group" -->
+  <string name="removed">グループから脱退しました。</string>
+  <string name="removed_from_group">あなたは、グループから削除されました。</string>
+  <string name="close_on_no_ability">このチャットセッションを継続することはできません。</string>
+  <string name="unread_chat_single">[SOURCES]は、何か新しいことを言いました。</string>
+  <string name="unread_chat_multiple">[SOURCES]は、何か新しいことを言いました。</string>
+  <string name="session_initialization_timed_out_error">セッションの初期化がタイムアウトしました。</string>
+
+  <string name="Home position set.">家の配置の設定。</string>
+
+  <string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
+  <string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
+
+  <string name="lindenhomes_get_home_url">https://secondlife.com/land/lindenhomes/member.php?lang=ja-JP</string>
+  <string name="lindenhomes_my_home_url">https://land.secondlife.com/ja-JP/lindenhomes/my-home.php</string>
+  <string name="membership_url">https://accounts.secondlife.com/change_membership/?lang=ja-JP</string>
+
+  <!-- Financial operations strings -->
+  <string name="paid_you_ldollars">[NAME]は、[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="paid_you_ldollars_gift">[NAME]は、[REASON]費用のL$ [AMOUNT]支払いました。</string>
+  <string name="paid_you_ldollars_no_reason">[NAME]は、L$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars">[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_gift">[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_no_info">L$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_no_reason">[NAME]にL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_no_name">[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_failure_ldollars">[NAME]に[REASON]費用L$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_gift">[NAME]に[REASON]費用のL$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_no_info">L$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_no_reason">[NAME]にL$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_no_name">[REASON]費用L$ [AMOUNT]を支払えませんでした。</string>
+  <string name="for item">[ITEM]</string>
+  <string name="for a parcel of land">土地区画</string>
+  <string name="for a land access pass">土地への入場許可</string>
+  <string name="for deeding land">土地を譲渡</string>
+  <string name="to create a group">グループ作成</string>
+  <string name="to join a group">グループ参加</string>
+  <string name="to upload">アップロード</string>
+  <string name="to publish a classified ad">クラシファイド広告掲載</string>
+
+  <string name="uploading_costs">アップロード費用はL$ [AMOUNT]です。</string>
+  <string name="this_costs">費用はL$ [AMOUNT]です。</string>
+
+  <string name="buying_selected_land">選択した土地をL$ [AMOUNT]で購入します。</string>
+  <string name="this_object_costs">このオブジェクトの費用は、L$ [AMOUNT]です。</string>
+  <string name="giving">L$ [AMOUNT]を渡します。</string>
+
+  <string name="group_role_everyone">全員</string>
+  <string name="group_role_officers">オフィサー</string>
+  <string name="group_role_owners">所有者</string>
+  <string name="group_member_status_online">オンライン</string>
+
+  <string name="uploading_abuse_report">アップロード中…
 
 嫌がらせの報告</string>
-	<string name="New Shape">新しいシェイプ</string>
-	<string name="New Skin">新しいスキン</string>
-	<string name="New Hair">新しい髪</string>
-	<string name="New Eyes">新しい目</string>
-	<string name="New Shirt">新しいシャツ</string>
-	<string name="New Pants">新しいパンツ</string>
-	<string name="New Shoes">新しい靴</string>
-	<string name="New Socks">新しい靴下</string>
-	<string name="New Jacket">新しいジャケット</string>
-	<string name="New Gloves">新しい手袋</string>
-	<string name="New Undershirt">新しい下着（上）</string>
-	<string name="New Underpants">新しい下着（下）</string>
-	<string name="New Skirt">新しいスカート</string>
-	<string name="New Alpha">新しいアルファ</string>
-	<string name="New Tattoo">新しいタトゥ</string>
-	<string name="New Universal">新しいユニバーサル</string>
-	<string name="New Physics">新規の物理作用</string>
-	<string name="Invalid Wearable">無効な着用物</string>
-	<string name="New Gesture">ジェスチャー</string>
-	<string name="New Script">新規スクリプト</string>
-	<string name="New Note">ノート</string>
-	<string name="New Folder">新規フォルダ</string>
-	<string name="Contents">コンテンツ</string>
-	<string name="Gesture">ジェスチャー</string>
-	<string name="Male Gestures">男性用ジェスチャー</string>
-	<string name="Female Gestures">女性用ジェスチャー</string>
-	<string name="Other Gestures">その他のジェスチャー</string>
-	<string name="Speech Gestures">会話ジェスチャー</string>
-	<string name="Common Gestures">一般的ジェスチャー</string>
-	<string name="Male - Excuse me">男性 - すみません</string>
-	<string name="Male - Get lost">男性 - Get lost</string>
-	<string name="Male - Blow kiss">男性 - 投げキッス</string>
-	<string name="Male - Boo">男性 - Boo</string>
-	<string name="Male - Bored">男性 - 退屈</string>
-	<string name="Male - Hey">男性 - Hey</string>
-	<string name="Male - Laugh">男性 - 笑う</string>
-	<string name="Male - Repulsed">男性 - 拒絶</string>
-	<string name="Male - Shrug">男性 - 肩をすくめる</string>
-	<string name="Male - Stick tougue out">男性 - 舌を出す</string>
-	<string name="Male - Wow">男性 - Wow</string>
-	<string name="Female - Chuckle">女性 – クスクス</string>
-	<string name="Female - Cry">女性 – 泣く</string>
-	<string name="Female - Embarrassed">女性 – 恥ずかしい</string>
-	<string name="Female - Excuse me">女性 – すみません</string>
-	<string name="Female - Get lost">女性 – あっち行ってよ</string>
-	<string name="Female - Blow kiss">女性 - 投げキッス</string>
-	<string name="Female - Boo">女性 – ワッ！</string>
-	<string name="Female - Bored">女性 - 退屈</string>
-	<string name="Female - Hey">女性 - Hey</string>
-	<string name="Female - Hey baby">女性 – ヘイ、ベィビー！</string>
-	<string name="Female - Laugh">女性 - 笑う</string>
-	<string name="Female - Looking good">女性 – いい感じ</string>
-	<string name="Female - Over here">女性 – こっちよ</string>
-	<string name="Female - Please">女性 – プリーズ</string>
-	<string name="Female - Repulsed">女性 - 拒絶</string>
-	<string name="Female - Shrug">女性 - 肩をすくめる</string>
-	<string name="Female - Stick tougue out">女性 - 舌を出す</string>
-	<string name="Female - Wow">女性 - Wow</string>
-	<string name="New Daycycle">新しいデイサイクル</string>
-	<string name="New Water">新しい水</string>
-	<string name="New Sky">新しい空</string>
-	<string name="/bow">/おじぎする</string>
-	<string name="/clap">/拍手</string>
-	<string name="/count">/数える</string>
-	<string name="/extinguish">/消す</string>
-	<string name="/kmb">/くそくらえ</string>
-	<string name="/muscle">/筋肉もりもり</string>
-	<string name="/no">/いいえ</string>
-	<string name="/no!">/だめ！</string>
-	<string name="/paper">/パー</string>
-	<string name="/pointme">/自分を指差す</string>
-	<string name="/pointyou">/相手を指差す</string>
-	<string name="/rock">/グー</string>
-	<string name="/scissor">/チョキ</string>
-	<string name="/smoke">/タバコを吸う</string>
-	<string name="/stretch">/伸びをする</string>
-	<string name="/whistle">/口笛を吹く</string>
-	<string name="/yes">/はい</string>
-	<string name="/yes!">/イエス！</string>
-	<string name="afk">一時退席中</string>
-	<string name="dance1">ダンス1</string>
-	<string name="dance2">ダンス2</string>
-	<string name="dance3">ダンス3</string>
-	<string name="dance4">ダンス4</string>
-	<string name="dance5">ダンス5</string>
-	<string name="dance6">ダンス6</string>
-	<string name="dance7">ダンス7</string>
-	<string name="dance8">ダンス8</string>
-	<string name="AvatarBirthDateFormat">[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]</string>
-	<string name="DefaultMimeType">なし/なし</string>
-	<string name="texture_load_dimensions_error">[WIDTH]*[HEIGHT] 以上の画像は読み込めません</string>
-	<string name="outfit_photo_load_dimensions_error">最大アウトフィット写真サイズは [WIDTH]*[HEIGHT] です。画像のサイズを調整するか、別の画像を使用してください</string>
-	<string name="outfit_photo_select_dimensions_error">最大アウトフィット写真サイズは [WIDTH]*[HEIGHT] です。別のテクスチャを選択してください</string>
-	<string name="outfit_photo_verify_dimensions_error">写真の寸法を確認できません。写真サイズがピッカーに表示されるまでお待ちください</string>
-	<string name="words_separator" value=","/>
-	<string name="server_is_down">大変申し訳ございませんが、予期しない問題が発生しました。
-
-サービスに関する既知の問題については、http://status.secondlifegrid.net をご覧ください。
-問題が引き続き発生する場合は、お使いのネットワークやファイアウォールの設定を調べてください。</string>
-	<string name="dateTimeWeekdaysNames">日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日</string>
-	<string name="dateTimeWeekdaysShortNames">日:月:火:水:木:金:土</string>
-	<string name="dateTimeMonthNames">1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月</string>
-	<string name="dateTimeMonthShortNames">1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月</string>
-	<string name="dateTimeDayFormat">[MDAY]</string>
-	<string name="dateTimeAM">AM</string>
-	<string name="dateTimePM">PM</string>
-	<string name="LocalEstimateUSD">US$ [AMOUNT]</string>
-	<string name="Group Ban">グループへの立入禁止</string>
-	<string name="Membership">会員</string>
-	<string name="Roles">役割</string>
-	<string name="Group Identity">グループの識別情報</string>
-	<string name="Parcel Management">区画の管理</string>
-	<string name="Parcel Identity">区画の識別情報</string>
-	<string name="Parcel Settings">区画の設定</string>
-	<string name="Parcel Powers">区画の権限</string>
-	<string name="Parcel Access">区画へのアクセス</string>
-	<string name="Parcel Content">区画のコンテンツ</string>
-	<string name="Object Management">オブジェクトの管理</string>
-	<string name="Accounting">会計</string>
-	<string name="Notices">通知</string>
-	<string name="Chat" value=" チャット：">チャット</string>
-	<string name="BaseMembership">ベース</string>
-	<string name="PremiumMembership">プレミアム</string>
-	<string name="Premium_PlusMembership">プレミアムプラス</string>
-	<string name="DeleteItems">選択したアイテムを削除しますか</string>
-	<string name="DeleteItem">選択したアイテムを削除しますか</string>
-	<string name="EmptyOutfitText">このアウトフィットにはアイテムがありません</string>
-	<string name="ExternalEditorNotSet">ExternalEditor 設定を使ってエディターを選択します。</string>
-	<string name="ExternalEditorNotFound">指定された外部エディターが見つかりません。
-エディターへのパスを二重引用符で囲んでみてください。
-（例：&quot;/path to my/editor&quot; &quot;%s&quot;）</string>
-	<string name="ExternalEditorCommandParseError">外部エディターのコマンドの解析中にエラーが見つかりました。</string>
-	<string name="ExternalEditorFailedToRun">外部エディターを実行できませんでした。</string>
-	<string name="TranslationFailed">翻訳できませんでした：[REASON]</string>
-	<string name="TranslationResponseParseError">翻訳の応答にエラーが発生しました。</string>
-	<string name="Esc">Esc</string>
-	<string name="Space">Space</string>
-	<string name="Enter">Enter</string>
-	<string name="Tab">Tab</string>
-	<string name="Ins">Ins</string>
-	<string name="Del">Del</string>
-	<string name="Backsp">Backsp</string>
-	<string name="Shift">Shift</string>
-	<string name="Ctrl">Ctrl</string>
-	<string name="Alt">Alt</string>
-	<string name="CapsLock">CapsLock</string>
-	<string name="Home">ホーム</string>
-	<string name="End">End</string>
-	<string name="PgUp">PgUp</string>
-	<string name="PgDn">PgDn</string>
-	<string name="F1">F1</string>
-	<string name="F2">F2</string>
-	<string name="F3">F3</string>
-	<string name="F4">F4</string>
-	<string name="F5">F5</string>
-	<string name="F6">F6</string>
-	<string name="F7">F7</string>
-	<string name="F8">F8</string>
-	<string name="F9">F9</string>
-	<string name="F10">F10</string>
-	<string name="F11">F11</string>
-	<string name="F12">F12</string>
-	<string name="Add">追加</string>
-	<string name="Subtract">減算</string>
-	<string name="Multiply">乗算</string>
-	<string name="Divide">除算</string>
-	<string name="PAD_DIVIDE">PAD_DIVIDE</string>
-	<string name="PAD_LEFT">PAD_LEFT</string>
-	<string name="PAD_RIGHT">PAD_RIGHT</string>
-	<string name="PAD_DOWN">PAD_DOWN</string>
-	<string name="PAD_UP">PAD_UP</string>
-	<string name="PAD_HOME">PAD_HOME</string>
-	<string name="PAD_END">PAD_END</string>
-	<string name="PAD_PGUP">PAD_PGUP</string>
-	<string name="PAD_PGDN">PAD_PGDN</string>
-	<string name="PAD_CENTER">PAD_CENTER</string>
-	<string name="PAD_INS">PAD_INS</string>
-	<string name="PAD_DEL">PAD_DEL</string>
-	<string name="PAD_Enter">PAD_Enter</string>
-	<string name="PAD_BUTTON0">PAD_BUTTON0</string>
-	<string name="PAD_BUTTON1">PAD_BUTTON1</string>
-	<string name="PAD_BUTTON2">PAD_BUTTON2</string>
-	<string name="PAD_BUTTON3">PAD_BUTTON3</string>
-	<string name="PAD_BUTTON4">PAD_BUTTON4</string>
-	<string name="PAD_BUTTON5">PAD_BUTTON5</string>
-	<string name="PAD_BUTTON6">PAD_BUTTON6</string>
-	<string name="PAD_BUTTON7">PAD_BUTTON7</string>
-	<string name="PAD_BUTTON8">PAD_BUTTON8</string>
-	<string name="PAD_BUTTON9">PAD_BUTTON9</string>
-	<string name="PAD_BUTTON10">PAD_BUTTON10</string>
-	<string name="PAD_BUTTON11">PAD_BUTTON11</string>
-	<string name="PAD_BUTTON12">PAD_BUTTON12</string>
-	<string name="PAD_BUTTON13">PAD_BUTTON13</string>
-	<string name="PAD_BUTTON14">PAD_BUTTON14</string>
-	<string name="PAD_BUTTON15">PAD_BUTTON15</string>
-	<string name="-">-</string>
-	<string name="=">=</string>
-	<string name="`">`</string>
-	<string name=";">;</string>
-	<string name="[">[</string>
-	<string name="]">]</string>
-	<string name="\">\</string>
-	<string name="0">0</string>
-	<string name="1">1</string>
-	<string name="2">2</string>
-	<string name="3">3</string>
-	<string name="4">4</string>
-	<string name="5">5</string>
-	<string name="6">6</string>
-	<string name="7">7</string>
-	<string name="8">8</string>
-	<string name="9">9</string>
-	<string name="A">A</string>
-	<string name="B">B</string>
-	<string name="C">C</string>
-	<string name="D">D</string>
-	<string name="E">E</string>
-	<string name="F">F</string>
-	<string name="G">G</string>
-	<string name="H">H</string>
-	<string name="I">I</string>
-	<string name="J">J</string>
-	<string name="K">K</string>
-	<string name="L">L</string>
-	<string name="M">M</string>
-	<string name="N">N</string>
-	<string name="O">O</string>
-	<string name="P">P</string>
-	<string name="Q">Q</string>
-	<string name="R">R</string>
-	<string name="S">S</string>
-	<string name="T">T</string>
-	<string name="U">U</string>
-	<string name="V">V</string>
-	<string name="W">W</string>
-	<string name="X">X</string>
-	<string name="Y">Y</string>
-	<string name="Z">Z</string>
-	<string name="BeaconParticle">パーティクル源ビーコン（青）を表示中</string>
-	<string name="BeaconPhysical">物理的オブジェクトのビーコン（緑）を表示中</string>
-	<string name="BeaconScripted">スクリプトのオブジェクトのビーコン（赤）を表示中</string>
-	<string name="BeaconScriptedTouch">タッチ機能のビーコンが付いたスクリプトのオブジェクト（赤）を表示中</string>
-	<string name="BeaconSound">サウンドビーコン（黄）を表示中</string>
-	<string name="BeaconMedia">メディアビーコン（白）を表示中</string>
-	<string name="BeaconSun">太陽の方角ビーコン（オレンジ）を表示中</string>
-	<string name="BeaconMoon">月の方角ビーコン（紫）を表示中</string>
-	<string name="ParticleHiding">パーティクルを非表示</string>
-	<string name="Command_AboutLand_Label">土地情報</string>
-	<string name="Command_Appearance_Label">容姿</string>
-	<string name="Command_Avatar_Label">アバター</string>
-	<string name="Command_Build_Label">制作</string>
-	<string name="Command_Chat_Label">チャット</string>
-	<string name="Command_Conversations_Label">会話</string>
-	<string name="Command_Compass_Label">コンパス</string>
-	<string name="Command_Destinations_Label">行き先</string>
-	<string name="Command_Environments_Label">私の環境</string>
-	<string name="Command_Facebook_Label">Facebook</string>
-	<string name="Command_Flickr_Label">Flickr</string>
-	<string name="Command_Gestures_Label">ジェスチャー</string>
-	<string name="Command_Grid_Status_Label">グリッドステータス</string>
-	<string name="Command_HowTo_Label">ハウツー</string>
-	<string name="Command_Inventory_Label">インベントリ</string>
-	<string name="Command_Map_Label">地図</string>
-	<string name="Command_Marketplace_Label">マーケットプレイス</string>
-	<string name="Command_MarketplaceListings_Label">マーケットプレイス</string>
-	<string name="Command_MiniMap_Label">ミニマップ</string>
-	<string name="Command_Move_Label">歩行 / 走行 / 飛行</string>
-	<string name="Command_Outbox_Label">マーチャントアウトボックス</string>
-	<string name="Command_People_Label">人</string>
-	<string name="Command_Picks_Label">ピック</string>
-	<string name="Command_Places_Label">場所</string>
-	<string name="Command_Preferences_Label">環境設定</string>
-	<string name="Command_Profile_Label">プロフィール</string>
-	<string name="Command_Report_Abuse_Label">嫌がらせの報告</string>
-	<string name="Command_Search_Label">検索</string>
-	<string name="Command_Snapshot_Label">スナップショット</string>
-	<string name="Command_Speak_Label">話す</string>
-	<string name="Command_Twitter_Label">Twitter</string>
-	<string name="Command_View_Label">カメラコントロール</string>
-	<string name="Command_Voice_Label">ボイス設定</string>
-	<string name="Command_AboutLand_Tooltip">訪問先に関する情報</string>
-	<string name="Command_Appearance_Tooltip">アバターを変更</string>
-	<string name="Command_Avatar_Tooltip">アバター一式を選択</string>
-	<string name="Command_Build_Tooltip">オブジェクトの制作と地形の変形</string>
-	<string name="Command_Chat_Tooltip">近くの人と文字チャットする</string>
-	<string name="Command_Conversations_Tooltip">全員との会話</string>
-	<string name="Command_Compass_Tooltip">コンパス</string>
-	<string name="Command_Destinations_Tooltip">行ってみたい場所</string>
-	<string name="Command_Environments_Tooltip">私の環境</string>
-	<string name="Command_Facebook_Tooltip">Facebook へ投稿</string>
-	<string name="Command_Flickr_Tooltip">Flickr にアップロード</string>
-	<string name="Command_Gestures_Tooltip">アバターのジェスチャー</string>
-	<string name="Command_Grid_Status_Tooltip">現在のグリッドステータスを表示</string>
-	<string name="Command_HowTo_Tooltip">一般的タスクの実行方法</string>
-	<string name="Command_Inventory_Tooltip">インベントリを表示・使用</string>
-	<string name="Command_Map_Tooltip">世界地図</string>
-	<string name="Command_Marketplace_Tooltip">ショッピングに出掛ける</string>
-	<string name="Command_MarketplaceListings_Tooltip">創作アイテムを販売します</string>
-	<string name="Command_MiniMap_Tooltip">近くの人を表示する</string>
-	<string name="Command_Move_Tooltip">アバターの移動</string>
-	<string name="Command_Outbox_Tooltip">販売用にアイテムをマーケットプレイスに転送</string>
-	<string name="Command_People_Tooltip">フレンド、グループ、近くの人</string>
-	<string name="Command_Picks_Tooltip">プロフィールで紹介するお気に入りの場所</string>
-	<string name="Command_Places_Tooltip">保存済みの場所</string>
-	<string name="Command_Preferences_Tooltip">環境設定</string>
-	<string name="Command_Profile_Tooltip">プロフィールを編集・表示</string>
-	<string name="Command_Report_Abuse_Tooltip">嫌がらせの報告</string>
-	<string name="Command_Search_Tooltip">場所、イベント、人を検索</string>
-	<string name="Command_Snapshot_Tooltip">ピクチャを撮る</string>
-	<string name="Command_Speak_Tooltip">マイクを使って近くの人と話す</string>
-	<string name="Command_Twitter_Tooltip">Twitter</string>
-	<string name="Command_View_Tooltip">カメラの角度を変更</string>
-	<string name="Command_Voice_Tooltip">インワールドでのコールや近くにいる人の音量調整</string>
-	<string name="Toolbar_Bottom_Tooltip">現在、下のツールバーにあります</string>
-	<string name="Toolbar_Left_Tooltip">現在、左のツールバーにあります</string>
-	<string name="Toolbar_Right_Tooltip">現在、右のツールバーにあります</string>
-	<string name="Retain%">維持率</string>
-	<string name="Detail">詳細</string>
-	<string name="Better Detail">もっと詳しく</string>
-	<string name="Surface">表面</string>
-	<string name="Solid">ソリッド</string>
-	<string name="Wrap">ラップ</string>
-	<string name="Preview">プレビュー</string>
-	<string name="Normal">普通</string>
-	<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-	<string name="Pathfinding_Object_Attr_None">なし</string>
-	<string name="Pathfinding_Object_Attr_Permanent">ナビメッシュに影響を与える</string>
-	<string name="Pathfinding_Object_Attr_Character">キャラクター</string>
-	<string name="Pathfinding_Object_Attr_MultiSelect">（複数）</string>
-	<string name="snapshot_quality_very_low">非常に低い</string>
-	<string name="snapshot_quality_low">低</string>
-	<string name="snapshot_quality_medium">中</string>
-	<string name="snapshot_quality_high">高</string>
-	<string name="snapshot_quality_very_high">非常に高い</string>
-	<string name="TeleportMaturityExceeded">住人はこの地域（リージョン）を訪問できません。</string>
-	<string name="UserDictionary">[User]</string>
-	<string name="experience_tools_experience">体験</string>
-	<string name="ExperienceNameNull">(体験なし)</string>
-	<string name="ExperienceNameUntitled">(タイトルのない体験)</string>
-	<string name="Land-Scope">ランドスコープ</string>
-	<string name="Grid-Scope">グリッドスコープ</string>
-	<string name="Allowed_Experiences_Tab">許可</string>
-	<string name="Blocked_Experiences_Tab">停止</string>
-	<string name="Contrib_Experiences_Tab">貢献者</string>
-	<string name="Admin_Experiences_Tab">管理</string>
-	<string name="Recent_Experiences_Tab">最新</string>
-	<string name="Owned_Experiences_Tab">所有</string>
-	<string name="ExperiencesCounter">([EXPERIENCES], max [MAXEXPERIENCES])</string>
-	<string name="ExperiencePermission1">コントロールを引き継ぐ</string>
-	<string name="ExperiencePermission3">アバターでアニメーションをトリガー</string>
-	<string name="ExperiencePermission4">アバターに装着</string>
-	<string name="ExperiencePermission9">カメラ追従</string>
-	<string name="ExperiencePermission10">カメラのコントロール</string>
-	<string name="ExperiencePermission11">あなたをテレポート</string>
-	<string name="ExperiencePermission12">体験の権限を自動的に承諾</string>
-	<string name="ExperiencePermission16">あなたのアバターを強制的に座らせる</string>
-	<string name="ExperiencePermission17">自然環境の設定を変更する</string>
-	<string name="ExperiencePermissionShortUnknown">が不明な操作を実行しました： [Permission]</string>
-	<string name="ExperiencePermissionShort1">コントロールする</string>
-	<string name="ExperiencePermissionShort3">アニメーションをトリガー</string>
-	<string name="ExperiencePermissionShort4">取り付ける</string>
-	<string name="ExperiencePermissionShort9">カメラを追跡</string>
-	<string name="ExperiencePermissionShort10">カメラを制御</string>
-	<string name="ExperiencePermissionShort11">テレポート</string>
-	<string name="ExperiencePermissionShort12">権限</string>
-	<string name="ExperiencePermissionShort16">Sit</string>
-	<string name="ExperiencePermissionShort17">環境</string>
-	<string name="logging_calls_disabled_log_empty">会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。</string>
-	<string name="logging_calls_disabled_log_not_empty">これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。</string>
-	<string name="logging_calls_enabled_log_empty">ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。</string>
-	<string name="loading_chat_logs">ロード中...</string>
-	<string name="na">該当なし</string>
-	<string name="preset_combo_label">-空リスト-</string>
-	<string name="Default">デフォルト</string>
-	<string name="none_paren_cap">(なし)</string>
-	<string name="no_limit">無制限</string>
-	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。</string>
-	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">物理形状に不正な確認データがあります。物理モデルを修正してください。</string>
-	<string name="Mav_Details_MAV_UNKNOWN_VERSION">物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。</string>
-	<string name="couldnt_resolve_host">DNS がホスト名 ([HOSTNAME]) を解決できませんでした。
+
+  <!-- names for new inventory items-->
+  <string name="New Shape">新しいシェイプ</string>
+  <string name="New Skin">新しいスキン</string>
+  <string name="New Hair">新しい髪</string>
+  <string name="New Eyes">新しい目</string>
+  <string name="New Shirt">新しいシャツ</string>
+  <string name="New Pants">新しいズボン</string>
+  <string name="New Shoes">新しい靴</string>
+  <string name="New Socks">新しい靴下</string>
+  <string name="New Jacket">新しいジャケット</string>
+  <string name="New Gloves">新しい手袋</string>
+  <string name="New Undershirt">新しい下着（上半身）</string>
+  <string name="New Underpants">新しい下着（下半身）</string>
+  <string name="New Skirt">新しいスカート</string>
+  <string name="New Alpha">新しいアルファ</string>
+  <string name="New Tattoo">新しいタトゥ</string>
+  <string name="New Universal">新しいユニバーサル</string>
+  <string name="New Physics">新規の物理作用</string>
+  <string name="Invalid Wearable">無効な着用物</string>
+  <string name="New Gesture">ジェスチャー</string>
+  <string name="New Script">新規スクリプト</string>
+  <string name="New Note">ノート</string>
+  <string name="New Folder">新規フォルダ</string>
+  <string name="Contents">コンテンツ</string>
+  <string name="Gesture">ジェスチャー</string>
+  <string name="Male Gestures">男性用ジェスチャー</string>
+  <string name="Female Gestures">女性用ジェスチャー</string>
+  <string name="Other Gestures">その他のジェスチャー</string>
+  <string name="Speech Gestures">会話ジェスチャー</string>
+  <string name="Common Gestures">一般的ジェスチャー</string>
+  <!-- gestures -->
+  <string name="Male - Excuse me">男性－すみません</string>
+  <string name="Male - Get lost">男性－あっち行けよ</string>
+  <string name="Male - Blow kiss">男性－投げキッス</string>
+  <string name="Male - Boo">男性－ぶー</string>
+  <string name="Male - Bored">男性－退屈</string>
+  <string name="Male - Hey">男性－–やぁ</string>
+  <string name="Male - Laugh">男性－笑う</string>
+  <string name="Male - Repulsed">男性－拒絶</string>
+  <string name="Male - Shrug">男性－肩をすくめる</string>
+  <string name="Male - Stick tougue out">男性－舌を出す</string>
+  <string name="Male - Wow">男性－わぁ</string>
+
+  <string name="Female - Chuckle">女性－クスクス</string>
+  <string name="Female - Cry">女性－泣く</string>
+  <string name="Female - Embarrassed">女性－恥ずかしい</string>
+  <string name="Female - Excuse me">女性－すみません</string>
+  <string name="Female - Get lost">女性－あっち行ってよ</string>
+  <string name="Female - Blow kiss">女性–投げキッス</string>
+  <string name="Female - Boo">女性－ぶー</string>
+  <string name="Female - Bored">女性－退屈</string>
+  <string name="Female - Hey">女性－やぁ</string>
+  <string name="Female - Hey baby">女性－ヘイ、ベィビー！</string>
+  <string name="Female - Laugh">女性－笑う</string>
+  <string name="Female - Looking good">女性－いい感じ</string>
+  <string name="Female - Over here">女性－こっちよ</string>
+  <string name="Female - Please">女性－プリーズ</string>
+  <string name="Female - Repulsed">女性－拒絶</string>
+  <string name="Female - Shrug">女性－肩をすくめる</string>
+  <string name="Female - Stick tougue out">女性－舌を出す</string>
+  <string name="Female - Wow">女性－わぁ</string>
+
+  <!-- settings -->
+  <string name="New Daycycle">新しいデイサイクル</string>
+  <string name="New Water">新しい水</string>
+  <string name="New Sky">新しい空</string>
+
+
+  <string name="/bow">/おじぎする</string>
+  <string name="/clap">/拍手</string>
+  <string name="/count">/数える</string>
+  <string name="/extinguish">/消す</string>
+  <string name="/kmb">/くそくらえ</string>
+  <string name="/muscle">/筋肉もりもり</string>
+  <string name="/no">/いいえ</string>
+  <string name="/no!">/だめ！</string>
+  <string name="/paper">/パー</string>
+  <string name="/pointme">/自分を指差す</string>
+  <string name="/pointyou">/相手を指差す</string>
+  <string name="/rock">/グー</string>
+  <string name="/scissor">/チョキ</string>
+  <string name="/smoke">/タバコを吸う</string>
+  <string name="/stretch">/伸びをする</string>
+  <string name="/whistle">/口笛を吹く</string>
+  <string name="/yes">/はい</string>
+  <string name="/yes!">/イエス！</string>
+  <string name="afk">一時退席中</string>
+  <string name="dance1">ダンス１</string>
+  <string name="dance2">ダンス２</string>
+  <string name="dance3">ダンス３</string>
+  <string name="dance4">ダンス４</string>
+  <string name="dance5">ダンス５</string>
+  <string name="dance6">ダンス６</string>
+  <string name="dance7">ダンス７</string>
+  <string name="dance8">ダンス８</string>
+
+  <!-- birth date format shared by avatar inspector and profile panels -->
+  <string name="AvatarBirthDateFormat">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</string>
+  <string name="DefaultMimeType">none/none</string>
+
+  <string name="texture_load_dimensions_error">[WIDTH]✕[HEIGHT]以上の画像は読み込めません。</string>
+  <string name="outfit_photo_load_dimensions_error">アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。画像のサイズを調整するか、別の画像を使用してください。</string>
+  <string name="outfit_photo_select_dimensions_error">アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。別のテクスチャを選択してください。</string>
+  <string name="outfit_photo_verify_dimensions_error">画像の寸法を確認できません。画像サイズがピッカーに表示されるまでお待ちください。</string>
+  <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
+  <string name="sentences_separator" value="　"></string>
+  <string name="words_separator" value="、"/>
+
+  <string name="server_is_down">
+大変申し訳ございませんが、予期しない問題が発生しました。サービスに関する既知の問題については、 https://status.secondlifegrid.net/?lang=ja-JP をご覧ください。
+問題が引き続き発生する場合は、お使いのネットワークやファイヤーウォールの設定を調べてください。</string>
+  <string name="dateTimeWeekdaysNames">日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日</string>
+  <string name="dateTimeWeekdaysShortNames">日:月:火:水:木:金:土</string>
+
+  <!-- overriding datetime formating.
+	didn't translate if this is not needed for current localization
+  -->
+  <string name="dateTimeMonthNames">１月:２月:３月:４月:５月:６月:７月:８月:９月:１０月:１１月:１２月</string>
+  <string name="dateTimeMonthShortNames">㋀:㋁:㋂:㋃:㋄:㋅:㋆:㋇:㋈:㋉:㋊:㋋</string>
+  <string name="dateTimeDayFormat">[MDAY]</string>
+  <string name="dateTimeAM">午前</string>
+  <string name="dateTimePM">午後</string>
+
+  <!--  currency formatting -->
+  <string name="LocalEstimateUSD">[AMOUNT]米ドル</string>
+
+  <!-- Group Profile roles and powers -->
+  <string name="Group Ban">グループからバン</string>
+  <string name="Membership">会員</string>
+  <string name="Roles">役割</string>
+  <string name="Group Identity">グループの識別情報</string>
+  <string name="Parcel Management">区画の管理</string>
+  <string name="Parcel Identity">区画の識別情報</string>
+  <string name="Parcel Settings">区画の設定</string>
+  <string name="Parcel Powers">区画の権限</string>
+  <string name="Parcel Access">区画へのアクセス</string>
+  <string name="Parcel Content">区画のコンテンツ</string>
+  <string name="Object Management">オブジェクトの管理</string>
+  <string name="Accounting">会計</string>
+  <string name="Notices">通知</string>
+
+  <!-- SL Membership -->
+  <string name="Chat" value="チャット：">チャット</string>
+  <string name="BaseMembership">ベース</string>
+  <string name="PremiumMembership">プレミアム</string>
+  <string name="Premium_PlusMembership">プレミアムプラス</string>
+  <!-- No need to translate -->
+  <string name="InternalMembership">Internal</string>
+
+  <string name="MembershipUpgradeText">メンバーシッププランの変更…</string>
+  <string name="MembershipPremiumText">プレミアムメンバーシップ</string>
+
+  <!-- Question strings for delete items notifications -->
+  <string name="DeleteItems">選択したアイテムを削除しますか？</string>
+  <string name="DeleteItem">選択したアイテムを削除しますか？</string>
+
+  <string name="EmptyOutfitText">このアウトフィットにはアイテムがありません。</string>
+
+  <!-- External editor status codes -->
+  <string name="ExternalEditorNotSet">ExternalEditor 設定を使ってエディターを選択します。</string>
+  <string name="ExternalEditorNotFound">指定された外部エディターが見つかりません。
+エディターへのパスを二重引用符で囲んでみてください。（例："/path to my/editor" "%s"）</string>
+  <string name="ExternalEditorCommandParseError">外部エディターのコマンドの解析中にエラーが見つかりました。</string>
+  <string name="ExternalEditorFailedToRun">外部エディターを実行できませんでした。</string>
+
+  <!--  Machine translation of chat messahes -->
+  <string name="TranslationFailed">翻訳できませんでした：[REASON]</string>
+  <string name="TranslationResponseParseError">翻訳の応答にエラーが発生しました。</string>
+
+  <!-- Key names begin -->
+  <string name="Esc">Esc</string>
+  <string name="Space">Space</string>
+  <string name="Enter">Enter</string>
+  <string name="Tab">Tab</string>
+  <string name="Ins">Ins</string>
+  <string name="Del">Del</string>
+  <string name="Backsp">BackSp</string>
+  <string name="Shift">Shift</string>
+  <string name="Ctrl">Ctrl</string>
+  <string name="Alt">Alt</string>
+  <string name="CapsLock">CapsLock</string>
+  <string name="Left">←</string>
+  <string name="Right">→</string>
+  <string name="Up">↑</string>
+  <string name="Down">↓</string>
+  <string name="Home">Home</string>
+  <string name="End">End</string>
+  <string name="PgUp">PgUp</string>
+  <string name="PgDn">PgDn</string>
+
+  <string name="F1">F1</string>
+  <string name="F2">F2</string>
+  <string name="F3">F3</string>
+  <string name="F4">F4</string>
+  <string name="F5">F5</string>
+  <string name="F6">F6</string>
+  <string name="F7">F7</string>
+  <string name="F8">F8</string>
+  <string name="F9">F9</string>
+  <string name="F10">F10</string>
+  <string name="F11">F11</string>
+  <string name="F12">F12</string>
+
+  <string name="Add">追加</string>
+  <string name="Subtract">減算</string>
+  <string name="Multiply">乗算</string>
+  <string name="Divide">除算</string>
+  <string name="PAD_DIVIDE">PAD_DIVIDE</string>
+  <string name="PAD_LEFT">PAD_LEFT</string>
+  <string name="PAD_RIGHT">PAD_RIGHT</string>
+  <string name="PAD_DOWN">PAD_DOWN</string>
+  <string name="PAD_UP">PAD_UP</string>
+  <string name="PAD_HOME">PAD_HOME</string>
+  <string name="PAD_END">PAD_END</string>
+  <string name="PAD_PGUP">PAD_PGUP</string>
+  <string name="PAD_PGDN">PAD_PGDN</string>
+  <string name="PAD_CENTER">PAD_CENTER</string>
+  <string name="PAD_INS">PAD_INS</string>
+  <string name="PAD_DEL">PAD_DEL</string>
+  <string name="PAD_Enter">PAD_Enter</string>
+  <string name="PAD_BUTTON0">PAD_BUTTON0</string>
+  <string name="PAD_BUTTON1">PAD_BUTTON1</string>
+  <string name="PAD_BUTTON2">PAD_BUTTON2</string>
+  <string name="PAD_BUTTON3">PAD_BUTTON3</string>
+  <string name="PAD_BUTTON4">PAD_BUTTON4</string>
+  <string name="PAD_BUTTON5">PAD_BUTTON5</string>
+  <string name="PAD_BUTTON6">PAD_BUTTON6</string>
+  <string name="PAD_BUTTON7">PAD_BUTTON7</string>
+  <string name="PAD_BUTTON8">PAD_BUTTON8</string>
+  <string name="PAD_BUTTON9">PAD_BUTTON9</string>
+  <string name="PAD_BUTTON10">PAD_BUTTON10</string>
+  <string name="PAD_BUTTON11">PAD_BUTTON11</string>
+  <string name="PAD_BUTTON12">PAD_BUTTON12</string>
+  <string name="PAD_BUTTON13">PAD_BUTTON13</string>
+  <string name="PAD_BUTTON14">PAD_BUTTON14</string>
+  <string name="PAD_BUTTON15">PAD_BUTTON15</string>
+
+  <string name="-">-</string>
+  <string name="=">=</string>
+  <string name="`">`</string>
+  <string name=";">;</string>
+  <string name="[">[</string>
+  <string name="]">]</string>
+  <string name="\">\</string>
+
+  <string name="0">0</string>
+  <string name="1">1</string>
+  <string name="2">2</string>
+  <string name="3">3</string>
+  <string name="4">4</string>
+  <string name="5">5</string>
+  <string name="6">6</string>
+  <string name="7">7</string>
+  <string name="8">8</string>
+  <string name="9">9</string>
+
+  <string name="A">A</string>
+  <string name="B">B</string>
+  <string name="C">C</string>
+  <string name="D">D</string>
+  <string name="E">E</string>
+  <string name="F">F</string>
+  <string name="G">G</string>
+  <string name="H">H</string>
+  <string name="I">I</string>
+  <string name="J">J</string>
+  <string name="K">K</string>
+  <string name="L">L</string>
+  <string name="M">M</string>
+  <string name="N">N</string>
+  <string name="O">O</string>
+  <string name="P">P</string>
+  <string name="Q">Q</string>
+  <string name="R">R</string>
+  <string name="S">S</string>
+  <string name="T">T</string>
+  <string name="U">U</string>
+  <string name="V">V</string>
+  <string name="W">W</string>
+  <string name="X">X</string>
+  <string name="Y">Y</string>
+  <string name="Z">Z</string>
+  <!-- Key names end -->
+
+  <!-- Mouse button names (short) begin -->
+  <string name="LMB">左クリック</string>
+  <string name="MMB">ホイールクリック</string>
+  <string name="RMB">右クリック</string>
+  <string name="MB4">進むボタン</string>
+  <string name="MB5">戻るボタン</string>
+  <string name="Double LMB">左ダブルクリック</string>
+  <!-- Mouse button names end -->
+
+  <!-- llviewerwindow -->
+  <string name="BeaconParticle">パーティクル源ビーコン（青）を表示中</string>
+  <string name="BeaconPhysical">物理的オブジェクトのビーコン（緑）を表示中</string>
+  <string name="BeaconScripted">スクリプトのオブジェクトのビーコン（赤）を表示中</string>
+  <string name="BeaconScriptedTouch">タッチ機能のビーコンが付いたスクリプトのオブジェクト（赤）を表示中</string>
+  <string name="BeaconSound">サウンドビーコン（黄）を表示中</string>
+  <string name="BeaconMedia">メディアビーコン（白）を表示中</string>
+  <string name="BeaconSun">太陽の方角ビーコン（オレンジ）を表示中</string>
+  <string name="BeaconMoon">月の方角ビーコン（紫）を表示中</string>
+  <string name="ParticleHiding">パーティクルを非表示</string>
+
+  <!-- commands -->
+  <!-- 「360度スナップショット」だと文字が切れてしまうため -->
+  <string name="Command_360_Capture_Label">３６０度Ｓショット</string>
+  <string name="Command_AboutLand_Label">土地情報</string>
+  <string name="Command_Appearance_Label">アウトフィット</string>
+  <string name="Command_Avatar_Label">アバター一式</string>
+  <string name="Command_Build_Label">制作</string>
+  <string name="Command_Chat_Label">チャット</string>
+  <string name="Command_Conversations_Label">会話</string>
+  <string name="Command_Compass_Label">コンパス</string>
+  <string name="Command_Destinations_Label">行き先</string>
+  <string name="Command_Environments_Label">環境</string>
+  <string name="Command_Gestures_Label">ジェスチャー</string>
+  <string name="Command_Grid_Status_Label">グリッド状況</string>
+  <string name="Command_HowTo_Label">ハウツー</string>
+  <string name="Command_Inventory_Label">インベントリ</string>
+  <string name="Command_Map_Label">マップ</string>
+  <string name="Command_Marketplace_Label">マーケットプレイス</string>
+  <string name="Command_MarketplaceListings_Label">マーケットプレイス</string>
+  <string name="Command_MiniMap_Label">ミニマップ</string>
+  <string name="Command_Move_Label">歩行／走行／飛行</string>
+  <string name="Command_People_Label">人物</string>
+  <string name="Command_Picks_Label">ピック</string>
+  <string name="Command_Places_Label">場所</string>
+  <string name="Command_Preferences_Label">初期設定</string>
+  <string name="Command_Profile_Label">プロフィール</string>
+  <string name="Command_Report_Abuse_Label">嫌がらせの報告</string>
+  <string name="Command_Search_Label">検索</string>
+  <string name="Command_Snapshot_Label">スナップショット</string>
+  <string name="Command_Speak_Label">ボイスチャット</string>
+  <string name="Command_View_Label">カメラ操作</string>
+  <string name="Command_Voice_Label">ボイス設定</string>
+
+  <string name="Command_360_Capture_Tooltip">３６０度の正距円筒図法のスナップショット画像を撮影します。</string>
+  <string name="Command_AboutLand_Tooltip">訪問先に関する情報を表示します。</string>
+  <string name="Command_Appearance_Tooltip">アバターの外観を変更します。</string>
+  <string name="Command_Avatar_Tooltip">アバター一式を選択します。</string>
+  <string name="Command_Build_Tooltip">オブジェクトの制作や地形の変形をします。</string>
+  <string name="Command_Chat_Tooltip">近くにいる人物とテキストチャットします。</string>
+  <string name="Command_Conversations_Tooltip">全員との会話を表示します。</string>
+  <string name="Command_Compass_Tooltip">コンパスを表示します。</string>
+  <string name="Command_Destinations_Tooltip">行ってみたい場所を表示します。</string>
+  <string name="Command_Environments_Tooltip">自分の環境を表示します。</string>
+  <string name="Command_Gestures_Tooltip">アバターのジェスチャーを表示します。</string>
+  <string name="Command_Grid_Status_Tooltip">現在のグリッドステータスを表示します。</string>
+  <string name="Command_HowTo_Tooltip">一般的タスクの実行方法を表示します。</string>
+  <string name="Command_Inventory_Tooltip">インベントリの内容を表示したり使用したりします。</string>
+  <string name="Command_Map_Tooltip">ワールドマップを表示します。</string>
+  <string name="Command_Marketplace_Tooltip">ショッピングに出掛ける</string>
+  <string name="Command_MarketplaceListings_Tooltip">創作アイテムを販売します。</string>
+  <string name="Command_MiniMap_Tooltip">近隣の人を表示します。</string>
+  <string name="Command_Move_Tooltip">アバターの移動操作をします。</string>
+  <string name="Command_People_Tooltip">フレンド、グループ、近隣の人物を表示します。</string>
+  <string name="Command_Picks_Tooltip">プロフィールで紹介しているお気に入りの場所を表示します。</string>
+  <string name="Command_Places_Tooltip">保存済みの場所を表示します。</string>
+  <string name="Command_Preferences_Tooltip">初期設定を表示します。</string>
+  <string name="Command_Profile_Tooltip">自分のプロフィールの表示や編集を行います。</string>
+  <string name="Command_Report_Abuse_Tooltip">嫌がらせを報告します。</string>
+  <string name="Command_Search_Tooltip">場所、イベント、人物を検索します。</string>
+  <string name="Command_Snapshot_Tooltip">スナップショット画像を撮ります。</string>
+  <string name="Command_Speak_Tooltip">マイクを使って近くの人と話します。</string>
+  <string name="Command_View_Tooltip">カメラアングルの変更を表示します。</string>
+  <string name="Command_Voice_Tooltip">インワールドでのコールや近くにいる人物の音量調整します。</string>
+
+  <string name="Toolbar_Bottom_Tooltip">現在、下のツールバーにあります。</string>
+  <string name="Toolbar_Left_Tooltip">現在、左のツールバーにあります。</string>
+  <string name="Toolbar_Right_Tooltip">現在、右のツールバーにあります。</string>
+
+  <!-- Mesh UI terms -->
+  <string name="Retain%">維持率</string>
+  <string name="Detail">詳細</string>
+  <string name="Better Detail">より詳細</string>
+  <string name="Surface">表面</string>
+  <string name="Solid">ソリッド</string>
+  <string name="Wrap">ラップ</string>
+  <string name="Preview">プレビュー</string>
+  <string name="Normal">通常</string>
+
+  <!-- Pathfinding -->
+  <string name="Pathfinding_Wiki_URL">https://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+  <string name="Pathfinding_Object_Attr_None">なし</string>
+  <string name="Pathfinding_Object_Attr_Permanent">ナビメッシュに影響を与える</string>
+  <string name="Pathfinding_Object_Attr_Character">キャラクター</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">（複数）</string>
+
+  <!-- Snapshot image quality levels -->
+  <string name="snapshot_quality_very_low">最低</string>
+  <string name="snapshot_quality_low">低</string>
+  <string name="snapshot_quality_medium">中</string>
+  <string name="snapshot_quality_high">高</string>
+  <string name="snapshot_quality_very_high">最高</string>
+
+  <string name="TeleportMaturityExceeded">住人はこのリージョン（地域）を訪問できません。</string>
+
+  <!-- Spell check settings floater -->
+  <string name="UserDictionary">[User]</string>
+  <string name="experience_tools_experience">体験</string>
+  <string name="ExperienceNameNull">（体験なし）</string>
+  <string name="ExperienceNameUntitled">（タイトルのない体験）</string>
+  <string name="Land-Scope">ランドスコープ</string>
+  <string name="Grid-Scope">グリッドスコープ</string>
+  <string name="Allowed_Experiences_Tab">許可</string>
+  <string name="Blocked_Experiences_Tab">停止</string>
+  <string name="Contrib_Experiences_Tab">貢献者</string>
+  <string name="Admin_Experiences_Tab">管理</string>
+  <string name="Recent_Experiences_Tab">最新</string>
+  <string name="Owned_Experiences_Tab">所有</string>
+  <string name="ExperiencesCounter">（[EXPERIENCES]、最大[MAXEXPERIENCES]）</string>
+  <string name="ExperiencePermission1">コントロールを引き継ぐ</string>
+  <string name="ExperiencePermission3">アバターでアニメーションをトリガー</string>
+  <string name="ExperiencePermission4">アバターに装着</string>
+  <string name="ExperiencePermission9">カメラ追従</string>
+  <string name="ExperiencePermission10">カメラのコントロール</string>
+  <string name="ExperiencePermission11">あなたをテレポート</string>
+  <string name="ExperiencePermission12">体験の権限を自動的に承諾</string>
+  <string name="ExperiencePermission16">あなたのアバターを強制的に座らせる</string>
+  <string name="ExperiencePermission17">自然環境の設定を変更する</string>
+  <string name="ExperiencePermissionShortUnknown">が、不明な操作を実行しました：[Permission]</string>
+  <string name="ExperiencePermissionShort1">コントロールする</string>
+  <string name="ExperiencePermissionShort3">アニメーションをトリガー</string>
+  <string name="ExperiencePermissionShort4">取り付ける</string>
+  <string name="ExperiencePermissionShort9">カメラを追跡</string>
+  <string name="ExperiencePermissionShort10">カメラを制御</string>
+  <string name="ExperiencePermissionShort11">テレポート</string>
+  <string name="ExperiencePermissionShort12">権限</string>
+  <string name="ExperiencePermissionShort16">座る</string>
+  <string name="ExperiencePermissionShort17">環境</string>
+
+  <!-- Conversation log messages -->
+  <string name="logging_calls_disabled_log_empty">会話はログに記録されていません。ログの記録を開始するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。</string>
+  <string name="logging_calls_disabled_log_not_empty">これ以上の会話は記録されません。ログの記録を再開するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。</string>
+  <string name="logging_calls_enabled_log_empty">ログイン時の会話はありません。誰かと話した後や、誰かがあなたに話しかけた後に、そのときのログがここに記載されます。</string>
+  <string name="loading_chat_logs">読み込み中…</string>
+
+  <!-- Statistics -->
+  <string name="na">該当なし</string>
+
+  <!-- Presets graphic/camera -->
+  <string name="preset_combo_label">－空のリスト－</string>
+  <string name="Default">デフォルト</string>
+  <string name="none_paren_cap">（なし）</string>
+  <string name="no_limit">無制限</string>
+
+  <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。</string>
+  <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">物理形状に不正な確認データがあります。物理モデルを修正してください。</string>
+  <!-- MAV_BLOCK_MISSING means server didn't get and couldn't substitute physics_convex, high_lod or BoundingVerts-->
+  <string name="Mav_Details_MAV_BLOCK_MISSING">データがありません。高ＬＯＤが存在し、有効であることを確認してください。設定されていない場合は、物理モデルを設定します。</string>
+  <string name="Mav_Details_MAV_UNKNOWN_VERSION">物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。</string>
+
+  <!-- CURL error messages -->
+  <string name="couldnt_resolve_host">DNSがホスト名 ([HOSTNAME]) を解決できませんでした。
 www.secondlife.com のウェブサイトに接続できるかご確認ください。
-接続できても、このエラーが継続的に起こる場合は、
-サポートセクションから問題を報告してください。</string>
-	<string name="ssl_peer_certificate">ログインサーバーが SSL 経由で確認できませんでした。
-このエラーが継続的に起こる場合は、
-Secondlife.com のサポートセクションから
-問題を報告してください。</string>
-	<string name="ssl_connect_error">この問題の多くは、お使いのコンピュータの時計が正しく設定されていないために起こります。
-コントロールパネルから時刻と日付が正しく設定されているかご確認ください。
-お使いのネットワークとファイアウォールも正しく設定されているかお確かめください。
-このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから
-問題を報告してください。
-
-[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 ナレッジベース]</string>
-</strings>
+接続できても、このエラーが継続的に起こる場合は、サポートセクションから問題を報告してください。</string>
+  <string name="ssl_peer_certificate">ログインサーバーがＳＳＬ経由で確認できませんでした。
+このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。</string>
+  <string name="ssl_connect_error">この問題の多くは、お使いのコンピュータの時計が正しく設定されていないために起こります。
+コントロールパネルから、時刻と日付が正しく設定されている事をご確認してください。
+また、お使いのネットワークとファイアウォールが正しく設定されている事もお確かめください。
+このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。
+[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AD%E3%82%B0%E3%82%A4%E3%83%B3%E3%82%A8%E3%83%A9%E3%83%BC-r1283/ ナレッジベース]</string>
+</strings>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 5316211e10..f771678c8f 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
-	<message_set name="errors">
-		<message name="invalid_tport">テレポート処理中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</message>
-		<message name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</message>
-		<message name="blocked_tport">申し訳ございませんが、テレポートは現在、ブロックされています。もう少し後でやり直してください。
+  <message_set name="errors">
+    <message name="invalid_tport">テレポート処理中に問題が発生しました。ログインし直す必要があるかもしれません。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。</message>
+    <message name="invalid_region_handoff">リージョン横断の処理中に問題が発生しました。リージョン（地域）を越える前に、再度ログインする必要がある場合があります。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。</message>
+    <message name="blocked_tport">申し訳ありませんが、テレポートは現在ブロックされています。しばらくしてから、もう一度やりなおしてください。
 やり直してもテレポートできない場合は、いったんログアウトし、再度ログインして問題を解決してください。</message>
-		<message name="nolandmark_tport">残念ながら、システムはランドマークの目的地を探せませんでした。</message>
-		<message name="timeout_tport">申し訳ございませんが、システムはテレポートの接続を完了できませんでした。
-もう少し後でやり直してください。</message>
-		<message name="NoHelpIslandTP">ウェルカムアイランドにテレポートで戻ることはできません。
+    <message name="nolandmark_tport">残念ながら、システムはランドマークの目的地を探せませんでした。</message>
+    <message name="timeout_tport">申し訳ございませんが、システムはテレポートの接続を完了できませんでした。しばらくしてから、もう一度やりなおしてください。</message>
+    <message name="NoHelpIslandTP">ウェルカムアイランドにテレポートで戻ることはできません。
 「Welcome Island Public」に行き再度チュートリアルを行ってください。</message>
-		<message name="noaccess_tport">残念ながら、そのテレポート目的地へのアクセスがありません。</message>
-		<message name="missing_attach_tport">添付物は、まだ到着していません。あと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてからテレポートをやり直してださい。</message>
-		<message name="too_many_uploads_tport">この地域の資産キューが現在込み合っているため、要求されたテレポートを処理することが難しい状況です。
-数分後にやり直すか、または混雑していない他の地域をお試しください。</message>
-		<message name="expired_tport">申し訳ございませんが、システムは要求されたテレポートを完了できませんでした。数分後にやり直してください。</message>
-		<message name="expired_region_handoff">申し訳ございませんが、システムは地域間の移動を時間どおりに完了できませんでした。
-数分後にやり直してください。</message>
-		<message name="no_host">テレポートの目的地を見つけられません。目的地が一時的に利用できない状態か、またはすでに消滅している可能性があります。数分後にやり直してください。</message>
-		<message name="no_inventory_host">インベントリシステムは現在利用できません。</message>
-		<message name="MustGetAgeRegion">この地域（リージョン）に入るには 18 才以上である必要があります。</message>
-		<message name="RegionTPSpecialUsageBlocked">リージョンに入ることができません。'[REGION_NAME]' はスキル ゲーミング リージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキル ゲーミングのよくある質問] を参照してください。</message>
-		<message name="preexisting_tport">ごめんなさい。システムはテレポートを始めることができません。数分後にもう一度やり直してください。</message>
-	</message_set>
-	<message_set name="progress">
-		<message name="sending_dest">目的地に送信しています。</message>
-		<message name="redirecting">別の目的地にリダイレクトしています。</message>
-		<message name="relaying">目的地に中継しています。</message>
-		<message name="sending_home">ホーム位置のリクエストを送信しています。</message>
-		<message name="sending_landmark">ランドマーク位置のリクエストを送信しています。</message>
-		<message name="completing">テレポートを完了します。</message>
-		<message name="completed_from">[T_SLURL] からのテレポートが完了しました</message>
-		<message name="resolving">目的地を解決しています。</message>
-		<message name="contacting">新しい地域にコンタクトしています。</message>
-		<message name="arriving">到着...</message>
-		<message name="requesting">テレポートをリクエスト...</message>
-		<message name="pending">テレポートを保留中...</message>
-	</message_set>
-</teleport_messages>
+    <message name="noaccess_tport">残念ながら、そのテレポート目的地へのアクセスがありません。</message>
+    <message name="missing_attach_tport">添付物は、まだ到着していません。あと数秒間お待ちいただくか、いったんログアウトしてから再度ログインし、テレポートし直してださい。</message>
+    <message name="too_many_uploads_tport">このリージョン（地域）のアセットのキューが現在混み合っているため、要求されたテレポートを処理することが難しい状況です。
+数分後にやり直すか、混雑していない他のリージョンをお試しください。</message>
+    <message name="expired_tport">申し訳ございませんが、システムは要求されたテレポートを完了できませんでした。お手数ですが、数分程度時間をおいてからやり直してください。</message>
+    <message name="expired_region_handoff">申し訳ございませんが、システムは地域間の移動を時間どおりに完了できませんでした。
+お手数ですが、数分程度時間をおいてからやり直してください。</message>
+    <message name="no_host">テレポートの目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。お手数ですが、数分程度時間をおいてからやり直してください。</message>
+    <message name="no_inventory_host">インベントリシステムは現在利用できません。</message>
+    <message name="MustGetAgeRegion">このリージョン（地域）に入るには、１８歳以上である必要があります。</message>
+    <message name="RegionTPSpecialUsageBlocked">リージョンに入ることができません。
+「[REGION_NAME]」はスキルゲーミングリージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。
+詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキルゲーミングのよくある質問]を参照してください。</message>
+  </message_set>
+  <message_set name="progress">
+    <message name="sending_dest">目的地に送信しています。</message>
+    <message name="redirecting">別の目的地にリダイレクトしています。</message>
+    <message name="relaying">目的地に中継しています。</message>
+    <message name="sending_home">ホーム位置のリクエストを送信しています。</message>
+    <message name="sending_landmark">ランドマーク位置のリクエストを送信しています。</message>
+    <message name="completing">テレポートを完了します。</message>
+    <message name="completed_from">[T_SLURL] からのテレポートが完了しました。</message>
+    <message name="resolving">目的地を解決しています。</message>
+    <message name="contacting">新しい地域にコンタクトしています。</message>
+    <message name="arriving">到着中…</message>
+    <message name="requesting">テレポートをリクエスト…</message>
+    <message name="pending">テレポートを保留中…</message>
+  </message_set>
+</teleport_messages>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
new file mode 100644
index 0000000000..e43f975d8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<bodyparts_list_item name="wearable_item">
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <lock_panel name="btn_lock" tool_tip="編集権限がありません。" />
+  <lock_icon name="btn_lock1" />
+  <edit_panel name="btn_edit_panel" />
+  <edit_btn name="btn_edit" tool_tip="このシェイプを編集" />
+</bodyparts_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
new file mode 100644
index 0000000000..534ce0bbb9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<clothing_list_item name="wearable_item">
+  <lock_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <up_btn name="btn_move_up" />
+  <down_btn name="btn_move_down" />
+  <lock_panel name="btn_lock" tool_tip="編集権限がありません。" />
+  <lock_icon name="btn_lock1" />
+  <edit_panel name="btn_edit_panel" />
+  <edit_btn name="btn_edit" tool_tip="アウトフィットを編集" />
+</clothing_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..61bb12412b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<deletable_wearable_list_item name="deletable_wearable_item">
+  <delete_btn name="btn_delete" tool_tip="服装から削除" />
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+</deletable_wearable_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
index 485ebb3e39..9c14c98f96 100644
--- a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
@@ -1,2 +1,21 @@
-<?xml version="1.0" ?>
-<densityctrl name="density_ctrl" label="密度"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<densityctrl abel="密度" name="density_ctrl">
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">指数項</text>
+  <slider dname="level_exponential" />
+
+  <view left_pad="15" top="15" name="preview_image" height="140" width="140" follows="left|top" />
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">指数尺度係数</text>
+  <slider dname="exponential_scale" />
+
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">線形項</text>
+  <slider dname="level_linear" />
+
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">定数項</text>
+  <slider dname="level_constant" />
+
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="15" width="80">最大高度</text>
+  <slider name="max_altitude" />
+
+  <text follows="left|top" height="11" layout="topleft" name="aniso_factor_label" left="15" top_pad="15" width="80">異方性係数</text>
+  <slider name="aniso_factor" />
+</densityctrl>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..4e06928c7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<dummy_clothing_list_item name="dummy_clothing_item">
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <add_panel name="btn_add_panel" />
+  <add_btn name="btn_add" tool_tip="この種類のアイテムを更に追加します。" />
+</dummy_clothing_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
new file mode 100644
index 0000000000..bf6e105465
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<flat_list_view allow_select="true" color="PanelFocusBackgroundColor" item_pad="0" keep_one_selected="true" multi_select="false" opaque="true">
+  <flat_list_view.no_items_text follows="all" name="no_items_msg" v_pad="10" h_pad="10" value="一致するものが見つかりませんでした。" wrap="true" />
+</flat_list_view>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
new file mode 100644
index 0000000000..12f5a53a8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_folder folder_arrow_image="Folder_Arrow" folder_indentation="8" item_height="20" item_top_pad="4" selection_image="Rounded_Square" left_pad="5" icon_pad="2" icon_width="16" text_pad="1" text_pad_right="4" arrow_size="12" max_folder_item_overlap="2">
+  <new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black" />
+</inbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
new file mode 100644
index 0000000000..1034e63fe8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_item item_height="20" item_top_pad="4" selection_image="Rounded_Square">
+  <new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black" />
+</inbox_folder_view_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
new file mode 100644
index 0000000000..c42b38a3f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_item_separator name="separator" label="─────" />
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
new file mode 100644
index 0000000000..c71fc8cd5e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Use "disabled color" to make it look like menu separators -->
+<menu_item_tear_off enabled_color="MenuItemDisabledColor" name="tear_off" label="〰〰〰〰〰" disabled_color="MenuItemDisabledColor" highlight_bg_color="MenuItemHighlightBgColor" highlight_fg_color="MenuItemHighlightFgColor" />
diff --git a/indra/newview/skins/default/xui/ja/widgets/name_editor.xml b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
new file mode 100644
index 0000000000..3de33594dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<name_editor default_text="（取得しています）"/>
diff --git a/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
new file mode 100644
index 0000000000..0db8e89b3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel_camera_item>
+  <panel_camera_item.icon_over name="hovered_icon" />
+  <panel_camera_item.icon_selected name="selected_icon" />
+  <panel_camera_item.picture name="picture" />
+  <panel_camera_item.selected_picture fname="selected_picture" />
+  <panel_camera_item.text name="picture_name">テキスト</panel_camera_item.text>
+</panel_camera_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/person_view.xml b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
new file mode 100644
index 0000000000..bdf1d67c2f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<person_view>
+  <avatar_icon />
+  <last_interaction_time_textbox name="last_interaction_time_textbox" />
+  <permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することはできません。" />
+  <permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトの編集や、削除、取得することができます。" />
+  <permission_map_icon tool_tip="このフレンドは、マップ上であなたのいる場所を探すことができます。" name="permission_map_icon" />
+  <permission_online_icon name="permission_online_icon" tool_tip="このフレンドは、あなたがオンラインになったことがわかります。" />
+  <info_btn name="info_btn" tool_tip="詳細情報" />
+  <profile_btn name="profile_btn" tool_tip="プロフィールを見る" />
+  <output_monitor name="speaking_indicator" />
+</person_view>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
new file mode 100644
index 0000000000..7a25a6cc13
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<sun_moon_trackball name="virtualtrackball">
+
+  <sun_moon_trackball.border  />
+
+  <sun_moon_trackball.labelN name="labelN" label="北" />
+  <sun_moon_trackball.labelS name="labelS" label="南" />
+  <sun_moon_trackball.labelW name="labelW" label="西" />
+  <sun_moon_trackball.labelE name="labelE" label="東" />
+
+  <sun_moon_trackball.button_rotate_top name="btn_rotate_top" />
+
+  <sun_moon_trackball.button_rotate_bottom name="btn_rotate_bottom" />
+
+  <sun_moon_trackball.button_rotate_left name="btn_rotate_left" />
+
+  <sun_moon_trackball.button_rotate_right name="btn_rotate_right" />
+
+</sun_moon_trackball>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
new file mode 100644
index 0000000000..e34ca44481
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_list_item>
+  <!-- DEFAULT style for inventory list item -->
+  <default_style />
+
+  <!-- style for inventory list item WORN on avatar -->
+  <worn_style />
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <add_btn name="add_wearable" />
+  <remove_btn name="remove_wearable" />
+</inventory_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
new file mode 100644
index 0000000000..c829604f9a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<xy_vector name="xyvector">
+
+  <xy_vector.border visible="true" />
+
+  <xy_vector.x_entry name="XEntry" tab_stop="true" label="Ｘ軸：" />
+  <xy_vector.y_entry name="YEntry" tab_stop="true" label="Ｙ軸：" />
+
+  <xy_vector.touch_area name="TouchArea" />
+
+</xy_vector>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml
index 0e777751d3..98a3b2e6c4 100644
--- a/indra/newview/skins/default/xui/ja/xui_version.xml
+++ b/indra/newview/skins/default/xui/ja/xui_version.xml
@@ -1,4 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
-	1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<xui_version>1.0</xui_version>
\ No newline at end of file
-- 
cgit v1.2.3


From 6586055320922b4219d382f24383b00e20387e03 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 29 May 2023 21:04:52 +0300
Subject: SL-19787 Crash at LLUIColor::operator

---
 indra/llui/lluicolortable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index b84bb13edb..096336045c 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -230,7 +230,7 @@ void LLUIColorTable::saveUserSettings() const
 	{
 		// Compare user color value with the default value, skip if equal
 		string_color_map_t::const_iterator itd = mLoadedColors.find(it->first);
-		if(itd != mUserSetColors.end() && itd->second == it->second)
+		if(itd != mLoadedColors.end() && itd->second == it->second)
 			continue;
 
 		ColorEntryParams color_entry;
-- 
cgit v1.2.3


From 352ca2f881b02bd455d0f191d93737d3dc3dd52d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 22:47:31 +0300
Subject: SL-19652 Folder fetch dupplicate protection and over limit handling

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 73 ++++++++++++++++++-----
 1 file changed, 59 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 8f1012868f..b0ebe83f57 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -945,6 +945,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 	// *TODO:  Think I'd like to get a shared pointer to this and share it
 	// among all the folder requests.
 	uuid_vec_t recursive_cats;
+    uuid_vec_t all_cats; // dupplicate avoidance
 
 	LLSD folder_request_body;
 	LLSD folder_request_body_lib;
@@ -976,22 +977,25 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
                 {
                     if (LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
                     {
-                        LLSD folder_sd;
-                        folder_sd["folder_id"] = cat->getUUID();
-                        folder_sd["owner_id"] = cat->getOwnerID();
-                        folder_sd["sort_order"] = LLSD::Integer(sort_order);
-                        folder_sd["fetch_folders"] = LLSD::Boolean(true); //(LLSD::Boolean)sFullFetchStarted;
-                        folder_sd["fetch_items"] = LLSD::Boolean(true);
-
-                        if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
-                        {
-                            folder_request_body_lib["folders"].append(folder_sd);
-                        }
-                        else
+                        if (std::find(all_cats.begin(), all_cats.end(), cat_id) == all_cats.end())
                         {
-                            folder_request_body["folders"].append(folder_sd);
+                            LLSD folder_sd;
+                            folder_sd["folder_id"] = cat->getUUID();
+                            folder_sd["owner_id"] = cat->getOwnerID();
+                            folder_sd["sort_order"] = LLSD::Integer(sort_order);
+                            folder_sd["fetch_folders"] = LLSD::Boolean(TRUE); //(LLSD::Boolean)sFullFetchStarted;
+                            folder_sd["fetch_items"] = LLSD::Boolean(TRUE);
+
+                            if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
+                            {
+                                folder_request_body_lib["folders"].append(folder_sd);
+                            }
+                            else
+                            {
+                                folder_request_body["folders"].append(folder_sd);
+                            }
+                            folder_count++;
                         }
-                        folder_count++;
                     }
                     else
                     {
@@ -1015,6 +1019,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
 			{
 				recursive_cats.push_back(cat_id);
 			}
+            all_cats.push_back(cat_id);
 		}
 
         mFetchFolderQueue.pop_front();
@@ -1349,6 +1354,46 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
 					  << LLCoreHttpUtil::responseToString(response) << "]" << LL_ENDL;
 
 	// Could use a 404 test here to try to detect revoked caps...
+
+    if(status == LLCore::HttpStatus(HTTP_FORBIDDEN))
+    {
+        // too large, split into two, assume that this isn't the library
+        const std::string url(gAgent.getRegionCapability("FetchInventoryDescendents2"));
+        S32 size = mRequestSD["folders"].size();
+
+        if (!gDisconnected && !LLApp::isExiting() && !url.empty() && size > 1)
+        {
+            LLSD folders;
+            uuid_vec_t recursive_cats;
+            LLSD::array_iterator iter = mRequestSD["folders"].beginArray();
+            LLSD::array_iterator end = mRequestSD["folders"].endArray();
+            while (iter != end)
+            {
+                folders.append(*iter);
+                LLUUID fodler_id = iter->get("folder_id").asUUID();
+                if (std::find(mRecursiveCatUUIDs.begin(), mRecursiveCatUUIDs.end(), fodler_id) != mRecursiveCatUUIDs.end())
+                {
+                    recursive_cats.push_back(fodler_id);
+                }
+                if (folders.size() == (S32)(size / 2))
+                {
+                    LLSD request_body;
+                    request_body["folders"] = folders;
+                    LLCore::HttpHandler::ptr_t  handler(new BGFolderHttpHandler(request_body, recursive_cats));
+                    gInventory.requestPost(false, url, request_body, handler, "Inventory Folder");
+                    recursive_cats.clear();
+                    folders.clear();
+                }
+                iter++;
+            }
+
+            LLSD request_body;
+            request_body["folders"] = folders;
+            LLCore::HttpHandler::ptr_t  handler(new BGFolderHttpHandler(request_body, recursive_cats));
+            gInventory.requestPost(false, url, request_body, handler, "Inventory Folder");
+            return;
+        }
+    }
 	
 	// This was originally the request retry logic for the inventory
 	// request which tested on HTTP_INTERNAL_ERROR status.  This
-- 
cgit v1.2.3


From b9fad316a356fd223dcf29ed000de1b86e6a93d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 29 May 2023 23:37:58 +0300
Subject: SL-17429 Message user when their inventory hits AIS2 limits

---
 indra/newview/llinventorymodelbackgroundfetch.cpp  | 22 ++++++++++++++++++++--
 .../newview/skins/default/xui/en/notifications.xml |  8 ++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index b0ebe83f57..0eb07523ae 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -34,6 +34,7 @@
 #include "llinventorymodel.h"
 #include "llinventoryobserver.h"
 #include "llinventorypanel.h"
+#include "llnotificationsutil.h"
 #include "llstartup.h"
 #include "llviewercontrol.h"
 #include "llviewerinventory.h"
@@ -1357,12 +1358,24 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
 
     if(status == LLCore::HttpStatus(HTTP_FORBIDDEN))
     {
-        // too large, split into two, assume that this isn't the library
+        // Too large, split into two if possible
+        if (gDisconnected || LLApp::isExiting())
+        {
+            return;
+        }
+
         const std::string url(gAgent.getRegionCapability("FetchInventoryDescendents2"));
+        if (url.empty())
+        {
+            LL_WARNS(LOG_INV) << "Failed to get AIS2 cap" << LL_ENDL;
+            return;
+        }
+
         S32 size = mRequestSD["folders"].size();
 
-        if (!gDisconnected && !LLApp::isExiting() && !url.empty() && size > 1)
+        if (size > 1)
         {
+            // Can split, assume that this isn't the library
             LLSD folders;
             uuid_vec_t recursive_cats;
             LLSD::array_iterator iter = mRequestSD["folders"].beginArray();
@@ -1393,6 +1406,11 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
             gInventory.requestPost(false, url, request_body, handler, "Inventory Folder");
             return;
         }
+        else
+        {
+            // Can't split
+            LLNotificationsUtil::add("InventoryLimitReachedAIS");
+        }
     }
 	
 	// This was originally the request retry logic for the inventory
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e8fdc84fae..4c8d7fbd83 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6440,6 +6440,14 @@ Your trash is overflowing. This may cause problems logging in.
          yestext="Check trash folder"/>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="InventoryLimitReachedAIS"
+   type="notifytip">
+Your inventory is experiencing issues. Please, contact support.
+  <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmClearBrowserCache"
-- 
cgit v1.2.3


From d42f2a1887a1bc94a97c08bfe676731672ce53d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 30 May 2023 00:01:58 +0300
Subject: SL-17429 Message user when their inventory hits AIS3 limits

---
 indra/newview/llaisapi.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index b09b8ec517..fcee3a3e91 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -32,11 +32,12 @@
 #include "llappviewer.h"
 #include "llcallbacklist.h"
 #include "llinventorymodel.h"
+#include "llinventoryobserver.h"
+#include "llnotificationsutil.h"
 #include "llsdutil.h"
 #include "llviewerregion.h"
 #include "llvoavatar.h"
 #include "llvoavatarself.h"
-#include "llinventoryobserver.h"
 #include "llviewercontrol.h"
 
 ///----------------------------------------------------------------------------
@@ -893,11 +894,21 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
                 }
             }
         }
-        else if (status.getType() == 403)
+        else if (status == LLCore::HttpStatus(HTTP_FORBIDDEN) /*403*/)
         {
             if (type == FETCHCATEGORYCHILDREN)
             {
-                LL_DEBUGS("Inventory") << "Fetch failed, content is over imit" << LL_ENDL;
+                if (body.has("depth") && body["depth"].asInteger() == 0)
+                {
+                    // Can't fetch a single folder with depth 0, folder is too big.
+                    LLNotificationsUtil::add("InventoryLimitReachedAIS");
+                    LL_WARNS("Inventory") << "Fetch failed, content is over limit, url: " << url << LL_ENDL;
+                }
+                else
+                {
+                    // Result was too big, but situation is recoverable by requesting with lower depth
+                    LL_DEBUGS("Inventory") << "Fetch failed, content is over limit, url: " << url << LL_ENDL;
+                }
             }
         }
         LL_WARNS("Inventory") << "Inventory error: " << status.toString() << LL_ENDL;
-- 
cgit v1.2.3


From 5b9b4fcf6657ce2cfa5fde85012fe24213df37b5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 29 May 2023 23:37:58 +0300
Subject: SL-17429 Message user when their inventory hits AIS2 limits

---
 indra/newview/llinventorymodelbackgroundfetch.cpp  | 25 +++++++++++++++++++---
 .../newview/skins/default/xui/en/notifications.xml |  8 +++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 6b88d0aaf7..f544b318d6 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -30,8 +30,10 @@
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llcallbacklist.h"
-#include "llinventorypanel.h"
 #include "llinventorymodel.h"
+#include "llinventorypanel.h"
+#include "llnotificationsutil.h"
+#include "llstartup.h"
 #include "llviewercontrol.h"
 #include "llviewerinventory.h"
 #include "llviewermessage.h"
@@ -802,12 +804,24 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
 
     if(status == LLCore::HttpStatus(HTTP_FORBIDDEN))
     {
-        // too large, split into two, assume that this isn't the library
+        // Too large, split into two if possible
+        if (gDisconnected || LLApp::isExiting())
+        {
+            return;
+        }
+
         const std::string url(gAgent.getRegionCapability("FetchInventoryDescendents2"));
+        if (url.empty())
+        {
+            LL_WARNS(LOG_INV) << "Failed to get AIS2 cap" << LL_ENDL;
+            return;
+        }
+
         S32 size = mRequestSD["folders"].size();
 
-        if (!gDisconnected && !LLApp::isExiting() && !url.empty() && size > 1)
+        if (size > 1)
         {
+            // Can split, assume that this isn't the library
             LLSD folders;
             uuid_vec_t recursive_cats;
             LLSD::array_iterator iter = mRequestSD["folders"].beginArray();
@@ -838,6 +852,11 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
             gInventory.requestPost(false, url, request_body, handler, "Inventory Folder");
             return;
         }
+        else
+        {
+            // Can't split
+            LLNotificationsUtil::add("InventoryLimitReachedAIS");
+        }
     }
 	
 	// This was originally the request retry logic for the inventory
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f9211600ea..a216ef7c0d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6369,6 +6369,14 @@ Your trash is overflowing. This may cause problems logging in.
          yestext="Check trash folder"/>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="InventoryLimitReachedAIS"
+   type="notifytip">
+Your inventory is experiencing issues. Please, contact support.
+  <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmClearBrowserCache"
-- 
cgit v1.2.3


From 5ffe1353a777455bb788d4851215ae272f6f0df6 Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Tue, 30 May 2023 11:03:26 +0900
Subject: Removed unused Japanese translation *.xml files.

---
 .../skins/default/xui/ja/floater_chat_bar.xml      |  7 -----
 .../skins/default/xui/ja/floater_perm_prefs.xml    | 16 ----------
 .../default/xui/ja/floater_voice_controls.xml      | 30 -------------------
 .../default/xui/ja/menu_inspect_avatar_gear.xml    | 21 -------------
 .../default/xui/ja/menu_inspect_self_gear.xml      | 31 -------------------
 .../skins/default/xui/ja/menu_name_field.xml       |  6 ----
 .../xui/ja/menu_people_friends_view_sort.xml       |  8 -----
 .../xui/ja/menu_people_groups_view_sort.xml        |  5 ----
 .../xui/ja/menu_people_nearby_view_sort.xml        |  9 ------
 .../xui/ja/menu_people_recent_view_sort.xml        |  7 -----
 .../default/xui/ja/panel_adhoc_control_panel.xml   | 14 ---------
 .../default/xui/ja/panel_facebook_account.xml      | 15 ----------
 .../default/xui/ja/panel_group_control_panel.xml   | 17 -----------
 .../default/xui/ja/panel_im_control_panel.xml      | 30 -------------------
 .../default/xui/ja/panel_profile_interests.xml     | 35 ----------------------
 15 files changed, 251 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_voice_controls.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_name_field.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_facebook_account.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_profile_interests.xml

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
deleted file mode 100644
index 9f5df6fb85..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="近くのチャット">
-	<panel name="bottom_panel">
-		<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して話し、Ctrl + Enter キーで叫びます。"/>
-		<button name="show_nearby_chat" tool_tip="近くのチャットログを表示／非表示"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
deleted file mode 100644
index 98cda25a81..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="デフォルトのアップロード権限">
-	<panel label="権限" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="グループで共同管理" name="share_with_group"/>
-		<check_box label="誰に対してもコピーを許可" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			次の所有者ができる操作：
-		</text>
-		<check_box label="修正" name="next_owner_modify"/>
-		<check_box label="コピー" name="next_owner_copy"/>
-		<check_box label="再販・プレゼント" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
deleted file mode 100644
index f7d3fd11e0..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="ボイスコントロール">
-	<string name="title_nearby">
-		ボイス設定
-	</string>
-	<string name="title_group">
-		[GROUP] とグループコール
-	</string>
-	<string name="title_adhoc">
-		コンファレンスコール
-	</string>
-	<string name="title_peer_2_peer">
-		[NAME] とコール
-	</string>
-	<string name="no_one_near">
-		近くにボイスを有効にしている人はいません。
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="マイ アバター："/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="コール終了" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 9d0d0f10a6..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="プロフィールの表示" name="view_profile"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="コール" name="call"/>
-	<menu_item_call label="テレポート" name="teleport"/>
-	<menu_item_call label="グループに招待" name="invite_to_group"/>
-	<menu_item_call label="ブロック" name="block"/>
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="報告" name="report"/>
-	<menu_item_call label="フリーズ" name="freeze"/>
-	<menu_item_call label="追放" name="eject"/>
-	<menu_item_call label="追放" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="テクスチャのデバッグ" name="debug"/>
-	<menu_item_call label="地図で探す" name="find_on_map"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="支払う" name="pay"/>
-	<menu_item_call label="共有" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
deleted file mode 100644
index e3e206f3aa..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="座る" name="Sit Down Here"/>
-	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<context_menu label="取り外す" name="Take Off &gt;">
-		<context_menu label="衣類" name="Clothes &gt;">
-			<menu_item_call label="シャツ" name="Shirt"/>
-			<menu_item_call label="パンツ" name="Pants"/>
-			<menu_item_call label="スカート" name="Skirt"/>
-			<menu_item_call label="靴" name="Shoes"/>
-			<menu_item_call label="靴下" name="Socks"/>
-			<menu_item_call label="ジャケット" name="Jacket"/>
-			<menu_item_call label="手袋" name="Gloves"/>
-			<menu_item_call label="下着シャツ" name="Self Undershirt"/>
-			<menu_item_call label="下着パンツ" name="Self Underpants"/>
-			<menu_item_call label="タトゥ" name="Self Tattoo"/>
-			<menu_item_call label="アルファ" name="Self Alpha"/>
-			<menu_item_call label="すべての衣類" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="取り外す" name="Object Detach"/>
-		<menu_item_call label="すべて取り外す" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="アウトフィットの変更" name="Chenge Outfit"/>
-	<menu_item_call label="アウトフィットの編集" name="Edit Outfit"/>
-	<menu_item_call label="シェイプの編集" name="Edit My Shape"/>
-	<menu_item_call label="フレンド" name="Friends..."/>
-	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="プロフィール" name="Profile..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_name_field.xml b/indra/newview/skins/default/xui/ja/menu_name_field.xml
deleted file mode 100644
index 8c37d95073..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="表示名をコピー" name="copy_display"/>
-	<menu_item_call label="エージェント名をコピー" name="copy_name"/>
-	<menu_item_call label="エージェント ID をコピー" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
deleted file mode 100644
index 76340e4d76..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="オンライン状態で並べ替え" name="sort_status"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
-	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
deleted file mode 100644
index bfc7d15017..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
-	<menu_item_call label="選択したグループから脱退" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 44c5438509..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="地図を表示" name="view_map"/>
-	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
deleted file mode 100644
index b4f177a068..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
-	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
deleted file mode 100644
index 17e1283d24..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="コール" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="コール終了" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="ボイスコントロール" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_account.xml b/indra/newview/skins/default/xui/ja/panel_facebook_account.xml
deleted file mode 100644
index 5269e5a2da..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="次のユーザーとして Facebook に接続:"/>
-	<string name="facebook_disconnected" value="Facebook に接続していません"/>
-	<text name="account_caption_label">
-		Facebook に接続していません。
-	</text>
-	<panel name="panel_buttons">
-		<button label="接続..." name="connect_btn"/>
-		<button label="切断" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook への投稿について]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
deleted file mode 100644
index 49749732c9..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="グループプロフィール" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="グループコール" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="コール終了" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="ボイスコントロールを開く" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
deleted file mode 100644
index f2429ac12a..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<text name="avatar_name" value="不明"/>
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="プロフィール" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="フレンド登録" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="テレポート" name="teleport_btn" tool_tip="この人にテレポートを送ります"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="共有" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="支払う" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="コール" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="コール終了" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="ボイスコントロール" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_interests.xml b/indra/newview/skins/default/xui/ja/panel_profile_interests.xml
deleted file mode 100644
index 93cde6ffec..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="趣味" name="panel_profile_interests">
-	<text name="I Want To:">
-		次の内容を実行：
-	</text>
-	<check_box label="作る" name="chk0"/>
-	<check_box label="探検" name="chk1"/>
-	<check_box label="出会う" name="chk2"/>
-	<check_box label="雇ってもらう" name="chk6"/>
-	<check_box label="グループ" name="chk3"/>
-	<check_box label="買う" name="chk4"/>
-	<check_box label="販売する" name="chk5"/>
-	<check_box label="雇う" name="chk7"/>
-	<line_editor name="want_to_edit">
-		(ロード中...)
-	</line_editor>
-	<text name="Skills:">
-		スキル：
-	</text>
-	<check_box label="テクスチャ" name="schk0"/>
-	<check_box label="建築" name="schk1"/>
-	<check_box label="モデリング" name="schk3"/>
-	<check_box label="イベント計画" name="schk2"/>
-	<check_box label="スクリプト" name="schk4"/>
-	<check_box label="キャラクターのカスタマイズ" name="schk5"/>
-	<line_editor name="skills_edit">
-		(ロード中...)
-	</line_editor>
-	<text name="Languages:">
-		言語：
-	</text>
-	<line_editor name="languages_edit">
-		(ロード中...)
-	</line_editor>
-</panel>
-- 
cgit v1.2.3


From 5c55adae47cab93a12793528373f639ea9e8efcf Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 30 May 2023 13:10:36 +0300
Subject: SL-19773 add context menu for root folder in single folder mode

---
 indra/llui/llfolderview.cpp              | 12 +++++++++---
 indra/llui/llfolderview.h                |  6 +++++-
 indra/newview/llinventorybridge.cpp      | 20 ++++++++++++++++----
 indra/newview/llinventoryfunctions.cpp   |  8 ++++++++
 indra/newview/llinventorygallerymenu.cpp |  6 ++----
 indra/newview/llinventorypanel.cpp       | 17 ++++++++++++++++-
 indra/newview/llinventorypanel.h         |  1 +
 7 files changed, 57 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 798c00d0ca..f0106e345c 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -190,7 +190,8 @@ LLFolderView::LLFolderView(const Params& p)
 	mShowItemLinkOverlays(p.show_item_link_overlays),
 	mViewModel(p.view_model),
     mGroupedItemModel(p.grouped_item_model),
-    mForceArrange(false)
+    mForceArrange(false),
+    mSingleFolderMode(false)
 {
     LLPanel* panel = p.parent_panel;
     mParentPanel = panel->getHandle();
@@ -1475,8 +1476,8 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 		}
 	}
 	bool hide_folder_menu = mSuppressFolderMenu && isFolderSelected();
-	if (menu && (handled
-		&& ( count > 0 && (hasVisibleChildren()) )) && // show menu only if selected items are visible
+	if (menu && (mSingleFolderMode || (handled
+		&& ( count > 0 && (hasVisibleChildren()) ))) && // show menu only if selected items are visible
 		!hide_folder_menu)
 	{
 		if (mCallbackRegistrar)
@@ -1918,6 +1919,11 @@ void LLFolderView::updateMenuOptions(LLMenuGL* menu)
 		flags = multi_select_flag;
 	}
 
+    if(mSingleFolderMode && (mSelectedItems.size() == 0))
+    {
+        buildContextMenu(*menu, flags);
+    }
+
 	// This adds a check for restrictions based on the entire
 	// selection set - for example, any one wearable may not push you
 	// over the limit, but all wearables together still might.
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 73028f31b1..ed84b29fd9 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -127,6 +127,9 @@ public:
 	bool getAllowMultiSelect() { return mAllowMultiSelect; }
 	bool getAllowDrag() { return mAllowDrag; }
 
+    void setSingleFolderMode(bool is_single_mode) { mSingleFolderMode = is_single_mode; }
+    bool isSingleFolderMode() { return mSingleFolderMode; }
+
 	// Close all folders in the view
 	void closeAllFolders();
 	void openTopLevelFolders();
@@ -300,7 +303,8 @@ protected:
 									mShowItemLinkOverlays,
 									mShowSelectionContext,
 									mShowSingleSelection,
-									mSuppressFolderMenu;
+									mSuppressFolderMenu,
+                                    mSingleFolderMode;
 
 	// Renaming variables and methods
 	LLFolderViewItem*				mRenameItem;  // The item currently being renamed
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1c8342cdda..3c1e58205a 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -791,6 +791,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 										menuentry_vec_t &disabled_items, U32 flags)
 {
 	const LLInventoryObject *obj = getInventoryObject();
+    bool single_folder_root = (mRoot == NULL);
 
 	if (obj)
 	{
@@ -802,7 +803,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 			disabled_items.push_back(std::string("Copy"));
 		}
 
-        if (isAgentInventory())
+        if (isAgentInventory() && !single_folder_root)
         {
             items.push_back(std::string("New folder from selected"));
             items.push_back(std::string("Subfolder Separator"));
@@ -836,7 +837,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 				items.push_back(std::string("Find Links"));
 			}
 
-			if (!isInboxFolder())
+			if (!isInboxFolder() && !single_folder_root)
 			{
 				items.push_back(std::string("Rename"));
 				if (!isItemRenameable() || ((flags & FIRST_SELECTED_ITEM) == 0))
@@ -870,6 +871,8 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 				}
 			}
 
+            if(!single_folder_root)
+            {
 			items.push_back(std::string("Cut"));
 			if (!isItemMovable() || !isItemRemovable())
 			{
@@ -891,6 +894,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
                     }
                 }
 			}
+            }
 		}
 	}
 
@@ -916,7 +920,10 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
 	items.push_back(std::string("Paste Separator"));
 
-	addDeleteContextMenuOptions(items, disabled_items);
+    if(!single_folder_root)
+    {
+        addDeleteContextMenuOptions(items, disabled_items);
+    }
 
 	if (!isPanelActive("All Items") && !isPanelActive("single_folder_inv") && !isPanelActive("comb_single_folder_inv"))
 	{
@@ -4382,7 +4389,7 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
 	const bool is_agent_inventory = isAgentInventory();
 
 	// Only enable calling-card related options for non-system folders.
-	if (!is_system_folder && is_agent_inventory)
+	if (!is_system_folder && is_agent_inventory && (mRoot != NULL))
 	{
 		LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD);
 		if (mCallingCards || checkFolderForContentsOfType(model, is_callingcard))
@@ -4402,6 +4409,11 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
         disabled_items.push_back(std::string("New folder from selected"));
     }
 
+    //skip the rest options in single-folder mode
+    if (mRoot == NULL)
+    {
+        return;
+    }
 
     if ((flags & ITEM_IN_MULTI_SELECTION) == 0)
     {
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index b934ccd22b..a259dad08a 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -3194,6 +3194,14 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
             if(!bridge) continue;
             bridge->performAction(model, action);
         }
+        if(root->isSingleFolderMode() && selected_items.empty())
+        {
+            LLInvFVBridge* bridge = (LLInvFVBridge*)root->getViewModelItem();
+            if(bridge)
+            {
+                bridge->performAction(model, action);
+            }
+        }
     }
 
     // Update the marketplace listings that have been affected by the operation
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 8a99b79e2b..6dc749fab6 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -544,10 +544,8 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
             }
 
             items.push_back(std::string("Subfolder Separator"));
-            if (!is_system_folder)
+            if (!is_system_folder && !isRootFolder())
             {
-                if(!isRootFolder())
-                {
                 if(has_children && (folder_type != LLFolderType::FT_OUTFIT))
                 {
                     items.push_back(std::string("Ungroup folder items"));
@@ -559,7 +557,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                     disabled_items.push_back(std::string("Delete"));
                     disabled_items.push_back(std::string("Cut"));
                 }
-                }
+
                 if(!is_inbox)
                 {
                     items.push_back(std::string("Rename"));
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 2226384ba2..bd15e55b9a 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2116,6 +2116,7 @@ LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
 
     mCommitCallbackRegistrar.add("Inventory.OpenSelectedFolder", boost::bind(&LLInventorySingleFolderPanel::openInCurrentWindow, this, _2));
     mCommitCallbackRegistrar.replace("Inventory.DoCreate", boost::bind(&LLInventorySingleFolderPanel::doCreate, this, _2));
+    mCommitCallbackRegistrar.replace("Inventory.Share", boost::bind(&LLInventorySingleFolderPanel::doShare, this));
 }
 
 LLInventorySingleFolderPanel::~LLInventorySingleFolderPanel()
@@ -2138,6 +2139,7 @@ void LLInventorySingleFolderPanel::initFromParams(const Params& p)
     pane_params.open_first_folder = false;
     pane_params.start_folder.id = mFolderID;
     LLInventoryPanel::initFromParams(pane_params);
+    mFolderRoot.get()->setSingleFolderMode(true);
 }
 
 void LLInventorySingleFolderPanel::openInCurrentWindow(const LLSD& userdata)
@@ -2219,7 +2221,7 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
             LLFolderView* folder_view = createFolderRoot(root_id);
             folder_view->setChildrenInited(false);
             mFolderRoot = folder_view->getHandle();
-
+            mFolderRoot.get()->setSingleFolderMode(true);
             addItemID(root_id, mFolderRoot.get());
 
             LLRect scroller_view_rect = getRect();
@@ -2285,6 +2287,19 @@ void LLInventorySingleFolderPanel::doCreate(const LLSD& userdata)
     reset_inventory_filter();
     menu_create_inventory_item(this, dest_id, userdata);
 }
+
+void LLInventorySingleFolderPanel::doShare()
+{
+    if(mFolderRoot.get()->getCurSelectedItem() == NULL)
+    {
+        std::set<LLUUID> uuids{mFolderID};
+        LLAvatarActions::shareWithAvatars(uuids, gFloaterView->getParentFloater(this));
+    }
+    else
+    {
+        LLAvatarActions::shareWithAvatars(this);
+    }
+}
 /************************************************************************/
 /* Asset Pre-Filtered Inventory Panel related class                     */
 /************************************************************************/
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 7b54a5bbf2..2754d79fbe 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -409,6 +409,7 @@ public:
     LLUUID getSingleFolderRoot() { return mFolderID; }
 
     void doCreate(const LLSD& userdata);
+    void doShare();
 
     bool isBackwardAvailable();
     bool isForwardAvailable();
-- 
cgit v1.2.3


From caa21f9054c51eea6557c9f0d080d91e43e44018 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 30 May 2023 22:08:51 +0300
Subject: SL-19748 Thumbnail to clipboard not working

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 1ac6ee72bf..c3392889fb 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -468,6 +468,7 @@ void LLFloaterChangeItemThumbnail::onCopyToClipboard(void *userdata)
     LLInventoryObject* obj = self->getInventoryObject();
     if (obj)
     {
+        LLClipboard::instance().reset();
         LLClipboard::instance().addToClipboard(obj->getThumbnailUUID(), LLAssetType::AT_NONE);
         self->mPasteFromClipboardBtn->setEnabled(true);
     }
-- 
cgit v1.2.3


From 1834cc1a8be0b4519d774ca52202677ccaf40933 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 May 2023 00:17:36 +0300
Subject: SL-19795 Creating folders in combination mode does not scroll to new
 folder

---
 indra/newview/llinventorypanel.cpp | 9 +++++++++
 indra/newview/llinventorypanel.h   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index bd15e55b9a..9827fa8c5c 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2132,6 +2132,15 @@ void LLInventorySingleFolderPanel::setSelectCallback(const boost::function<void(
     }
 }
 
+void LLInventorySingleFolderPanel::setScroller(LLScrollContainer* scroller)
+{
+    mExternalScroller = scroller;
+    if (mFolderRoot.get())
+    {
+        mFolderRoot.get()->setScrollContainer(mExternalScroller);
+    }
+}
+
 void LLInventorySingleFolderPanel::initFromParams(const Params& p)
 {
     mFolderID = gInventory.getRootFolderID();
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 2754d79fbe..8d3edebcb4 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -422,7 +422,7 @@ public:
     std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
 
     void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
-    void setScroller(LLScrollContainer* scroller) { mExternalScroller = scroller; }
+    void setScroller(LLScrollContainer* scroller);
 
     typedef boost::function<void()> root_changed_callback_t;
     boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
-- 
cgit v1.2.3


From b586e6a9c2ab8b2efb48039738751ffeb3e85dee Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Wed, 31 May 2023 07:05:03 +0900
Subject: Merged DRTVWR-577 Japanese Translation.

---
 .../xui/ja/control_table_contents_camera.xml       |   72 +
 .../ja/control_table_contents_columns_basic.xml    |    7 +
 .../xui/ja/control_table_contents_editing.xml      |   24 +
 .../xui/ja/control_table_contents_media.xml        |   27 +
 .../xui/ja/control_table_contents_movement.xml     |   60 +
 .../skins/default/xui/ja/floater_360capture.xml    |   18 +
 indra/newview/skins/default/xui/ja/floater_aaa.xml |   51 +
 .../newview/skins/default/xui/ja/floater_about.xml |   39 +-
 .../skins/default/xui/ja/floater_about_land.xml    |  723 +-
 .../skins/default/xui/ja/floater_activeim.xml      |    2 +-
 .../default/xui/ja/floater_add_payment_method.xml  |   12 +
 .../default/xui/ja/floater_adjust_environment.xml  |   89 +-
 .../xui/ja/floater_animation_anim_preview.xml      |   14 +-
 .../xui/ja/floater_animation_bvh_preview.xml       |  282 +-
 .../default/xui/ja/floater_associate_listing.xml   |   12 +-
 .../skins/default/xui/ja/floater_auction.xml       |   16 +-
 .../skins/default/xui/ja/floater_autoreplace.xml   |   54 +-
 .../skins/default/xui/ja/floater_avatar.xml        |    2 +-
 .../skins/default/xui/ja/floater_avatar_picker.xml |   98 +-
 .../xui/ja/floater_avatar_render_settings.xml      |   20 +-
 .../default/xui/ja/floater_avatar_textures.xml     |  118 +-
 .../skins/default/xui/ja/floater_ban_duration.xml  |   28 +-
 .../skins/default/xui/ja/floater_beacons.xml       |   39 +-
 .../skins/default/xui/ja/floater_big_preview.xml   |    2 +-
 .../skins/default/xui/ja/floater_build_options.xml |   50 +-
 .../skins/default/xui/ja/floater_bulk_perms.xml    |   92 +-
 .../newview/skins/default/xui/ja/floater_bumps.xml |   30 +-
 .../skins/default/xui/ja/floater_buy_contents.xml  |   32 +-
 .../skins/default/xui/ja/floater_buy_currency.xml  |  111 +-
 .../default/xui/ja/floater_buy_currency_html.xml   |    2 +-
 .../skins/default/xui/ja/floater_buy_land.xml      |  323 +-
 .../skins/default/xui/ja/floater_buy_object.xml    |   38 +-
 .../skins/default/xui/ja/floater_camera.xml        |   78 +-
 .../default/xui/ja/floater_camera_presets.xml      |    6 +-
 .../skins/default/xui/ja/floater_choose_group.xml  |   10 +-
 .../skins/default/xui/ja/floater_classified.xml    |    4 +
 .../skins/default/xui/ja/floater_color_picker.xml  |   62 +-
 .../default/xui/ja/floater_conversation_log.xml    |   12 +-
 .../xui/ja/floater_conversation_preview.xml        |   10 +-
 .../default/xui/ja/floater_create_landmark.xml     |   14 +
 .../skins/default/xui/ja/floater_critical.xml      |   22 +-
 .../default/xui/ja/floater_delete_pref_preset.xml  |   25 +-
 .../skins/default/xui/ja/floater_destinations.xml  |    2 +-
 .../skins/default/xui/ja/floater_display_name.xml  |   24 +-
 .../default/xui/ja/floater_edit_ext_day_cycle.xml  |  214 +-
 .../default/xui/ja/floater_edit_hover_height.xml   |    4 +-
 .../newview/skins/default/xui/ja/floater_event.xml |   16 +-
 .../default/xui/ja/floater_experience_search.xml   |    2 +-
 .../default/xui/ja/floater_experienceprofile.xml   |  146 +-
 .../skins/default/xui/ja/floater_experiences.xml   |    4 +-
 .../skins/default/xui/ja/floater_fast_timers.xml   |   34 +-
 .../skins/default/xui/ja/floater_fbc_web.xml       |    2 +
 .../default/xui/ja/floater_fixedenvironment.xml    |   50 +-
 .../skins/default/xui/ja/floater_font_test.xml     |   39 +-
 .../skins/default/xui/ja/floater_forget_user.xml   |   11 +-
 .../skins/default/xui/ja/floater_gesture.xml       |   44 +-
 .../skins/default/xui/ja/floater_god_tools.xml     |  166 +-
 .../skins/default/xui/ja/floater_goto_line.xml     |    8 +-
 .../skins/default/xui/ja/floater_help_browser.xml  |   12 +-
 .../skins/default/xui/ja/floater_how_to.xml        |    4 +-
 indra/newview/skins/default/xui/ja/floater_hud.xml |    2 +-
 .../skins/default/xui/ja/floater_im_container.xml  |   52 +-
 .../skins/default/xui/ja/floater_im_session.xml    |  106 +-
 .../skins/default/xui/ja/floater_image_preview.xml |   51 +-
 .../default/xui/ja/floater_import_collada.xml      |   34 +-
 .../skins/default/xui/ja/floater_incoming_call.xml |   44 +-
 .../skins/default/xui/ja/floater_inspect.xml       |   25 +-
 .../xui/ja/floater_inventory_item_properties.xml   |   68 +-
 .../xui/ja/floater_inventory_view_finder.xml       |   66 +-
 .../default/xui/ja/floater_item_properties.xml     |    2 +-
 .../skins/default/xui/ja/floater_joystick.xml      |  204 +-
 .../skins/default/xui/ja/floater_lagmeter.xml      |  206 +-
 .../skins/default/xui/ja/floater_land_holdings.xml |   60 +-
 .../skins/default/xui/ja/floater_linkreplace.xml   |   18 +-
 .../default/xui/ja/floater_live_lsleditor.xml      |   46 +-
 .../default/xui/ja/floater_load_pref_preset.xml    |   22 +-
 .../skins/default/xui/ja/floater_lsl_guide.xml     |   14 +-
 indra/newview/skins/default/xui/ja/floater_map.xml |   46 +-
 .../xui/ja/floater_marketplace_listings.xml        |   22 +-
 .../xui/ja/floater_marketplace_validation.xml      |    6 +-
 .../skins/default/xui/ja/floater_media_browser.xml |   52 +-
 .../default/xui/ja/floater_media_settings.xml      |    8 +-
 .../skins/default/xui/ja/floater_mem_leaking.xml   |   26 +-
 indra/newview/skins/default/xui/ja/floater_mfa.xml |    7 +
 .../skins/default/xui/ja/floater_model_preview.xml |  502 +-
 .../skins/default/xui/ja/floater_moveview.xml      |  110 +-
 .../skins/default/xui/ja/floater_mute_object.xml   |   20 +-
 .../skins/default/xui/ja/floater_my_appearance.xml |    4 +-
 .../default/xui/ja/floater_my_environments.xml     |   53 +-
 .../skins/default/xui/ja/floater_my_inventory.xml  |    2 +-
 .../skins/default/xui/ja/floater_my_scripts.xml    |    2 +-
 .../skins/default/xui/ja/floater_notification.xml  |    8 +-
 .../xui/ja/floater_notifications_console.xml       |    6 +-
 .../xui/ja/floater_notifications_tabbed.xml        |   64 +-
 .../default/xui/ja/floater_object_weights.xml      |   52 +-
 .../skins/default/xui/ja/floater_openobject.xml    |   18 +-
 .../xui/ja/floater_outfit_photo_preview.xml        |   10 +
 .../default/xui/ja/floater_outfit_save_as.xml      |   17 +-
 .../skins/default/xui/ja/floater_outgoing_call.xml |   52 +-
 .../xui/ja/floater_pathfinding_characters.xml      |   90 +-
 .../default/xui/ja/floater_pathfinding_console.xml |  199 +-
 .../xui/ja/floater_pathfinding_linksets.xml        |  270 +-
 indra/newview/skins/default/xui/ja/floater_pay.xml |   48 +-
 .../skins/default/xui/ja/floater_pay_object.xml    |   40 +-
 .../skins/default/xui/ja/floater_people.xml        |   13 +-
 .../skins/default/xui/ja/floater_perms_default.xml |   64 +-
 .../skins/default/xui/ja/floater_pick_track.xml    |   38 +-
 .../skins/default/xui/ja/floater_places.xml        |    4 +-
 .../skins/default/xui/ja/floater_post_process.xml  |   85 +-
 .../skins/default/xui/ja/floater_preferences.xml   |   47 +-
 .../ja/floater_preferences_graphics_advanced.xml   |  230 +-
 .../default/xui/ja/floater_preferences_proxy.xml   |   64 +-
 .../xui/ja/floater_preferences_view_advanced.xml   |   16 +-
 .../default/xui/ja/floater_preview_animation.xml   |   14 +-
 .../default/xui/ja/floater_preview_gesture.xml     |  110 +-
 .../default/xui/ja/floater_preview_notecard.xml    |   28 +-
 .../skins/default/xui/ja/floater_preview_sound.xml |   14 +-
 .../default/xui/ja/floater_preview_texture.xml     |   42 +-
 .../skins/default/xui/ja/floater_preview_trash.xml |   15 +-
 .../default/xui/ja/floater_price_for_listing.xml   |   21 +-
 .../skins/default/xui/ja/floater_profile.xml       |   26 +-
 .../default/xui/ja/floater_profile_permissions.xml |   10 +
 .../default/xui/ja/floater_profile_texture.xml     |   17 +
 .../default/xui/ja/floater_publish_classified.xml  |   22 +-
 .../xui/ja/floater_region_debug_console.xml        |    2 +-
 .../skins/default/xui/ja/floater_region_info.xml   |    2 +-
 .../default/xui/ja/floater_region_restarting.xml   |   30 +-
 .../skins/default/xui/ja/floater_report_abuse.xml  |  166 +-
 .../default/xui/ja/floater_save_camera_preset.xml  |   21 +-
 .../default/xui/ja/floater_save_pref_preset.xml    |   22 +-
 .../default/xui/ja/floater_scene_load_stats.xml    |  124 +-
 .../skins/default/xui/ja/floater_script_debug.xml  |   10 +-
 .../default/xui/ja/floater_script_debug_panel.xml  |    2 +-
 .../default/xui/ja/floater_script_ed_prefs.xml     |   64 +-
 .../skins/default/xui/ja/floater_script_limits.xml |    2 +-
 .../default/xui/ja/floater_script_preview.xml      |   14 +-
 .../skins/default/xui/ja/floater_script_queue.xml  |   36 +-
 .../skins/default/xui/ja/floater_script_search.xml |   18 +-
 .../skins/default/xui/ja/floater_search.xml        |   22 +-
 .../skins/default/xui/ja/floater_select_key.xml    |   22 +-
 .../skins/default/xui/ja/floater_sell_land.xml     |   96 +-
 .../default/xui/ja/floater_settings_debug.xml      |   32 +-
 .../default/xui/ja/floater_settings_picker.xml     |   44 +-
 .../xui/ja/floater_simple_outfit_snapshot.xml      |    7 +
 .../skins/default/xui/ja/floater_snapshot.xml      |  128 +-
 .../skins/default/xui/ja/floater_sound_devices.xml |    8 +-
 .../skins/default/xui/ja/floater_sound_preview.xml |   30 +-
 .../skins/default/xui/ja/floater_spellcheck.xml    |   24 +-
 .../default/xui/ja/floater_spellcheck_import.xml   |   20 +-
 .../newview/skins/default/xui/ja/floater_stats.xml |  215 +-
 .../skins/default/xui/ja/floater_sys_well.xml      |   10 +-
 .../skins/default/xui/ja/floater_telehub.xml       |   35 +-
 .../skins/default/xui/ja/floater_test_button.xml   |   16 +
 .../skins/default/xui/ja/floater_test_checkbox.xml |   10 +
 .../skins/default/xui/ja/floater_test_combobox.xml |   30 +
 .../default/xui/ja/floater_test_inspectors.xml     |   21 +
 .../default/xui/ja/floater_test_layout_stacks.xml  |    2 +-
 .../default/xui/ja/floater_test_line_editor.xml    |   14 +
 .../default/xui/ja/floater_test_radiogroup.xml     |   16 +
 .../skins/default/xui/ja/floater_test_slider.xml   |   12 +
 .../skins/default/xui/ja/floater_test_spinner.xml  |   12 +
 .../default/xui/ja/floater_test_text_editor.xml    |    6 +
 .../xui/ja/floater_test_text_vertical_aligment.xml |    2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |   86 +-
 .../xui/ja/floater_texture_fetch_debugger.xml      |  112 +-
 .../newview/skins/default/xui/ja/floater_tools.xml |  728 +-
 .../skins/default/xui/ja/floater_top_objects.xml   |   96 +-
 indra/newview/skins/default/xui/ja/floater_tos.xml |   33 +-
 .../skins/default/xui/ja/floater_toybox.xml        |   14 +-
 .../xui/ja/floater_translation_settings.xml        |   94 +-
 .../skins/default/xui/ja/floater_ui_preview.xml    |   48 +
 .../skins/default/xui/ja/floater_url_entry.xml     |   22 +-
 .../default/xui/ja/floater_voice_chat_volume.xml   |    4 +-
 .../skins/default/xui/ja/floater_voice_effect.xml  |  214 +-
 .../skins/default/xui/ja/floater_voice_volume.xml  |    4 +-
 .../skins/default/xui/ja/floater_web_content.xml   |   32 +-
 .../default/xui/ja/floater_whitelist_entry.xml     |   12 +-
 .../skins/default/xui/ja/floater_window_size.xml   |   40 +-
 .../skins/default/xui/ja/floater_world_map.xml     |  179 +-
 indra/newview/skins/default/xui/ja/fonts.xml       |  125 +
 .../skins/default/xui/ja/inspect_avatar.xml        |   31 +-
 .../newview/skins/default/xui/ja/inspect_group.xml |   42 +-
 .../skins/default/xui/ja/inspect_object.xml        |   69 +-
 .../skins/default/xui/ja/inspect_remote_object.xml |   32 +-
 .../skins/default/xui/ja/language_settings.xml     |   83 +-
 .../default/xui/ja/menu_add_wearable_gear.xml      |    8 +-
 .../skins/default/xui/ja/menu_attachment_other.xml |   54 +-
 .../skins/default/xui/ja/menu_attachment_self.xml  |   38 +-
 .../skins/default/xui/ja/menu_avatar_icon.xml      |   24 +-
 .../skins/default/xui/ja/menu_avatar_other.xml     |   46 +-
 .../xui/ja/menu_avatar_rendering_settings.xml      |    8 +-
 .../xui/ja/menu_avatar_rendering_settings_add.xml  |    6 +-
 .../skins/default/xui/ja/menu_avatar_self.xml      |   70 +-
 .../skins/default/xui/ja/menu_cof_attachment.xml   |    8 +-
 .../skins/default/xui/ja/menu_cof_body_part.xml    |    6 +-
 .../skins/default/xui/ja/menu_cof_clothing.xml     |    8 +-
 .../newview/skins/default/xui/ja/menu_cof_gear.xml |    6 +-
 .../skins/default/xui/ja/menu_conversation.xml     |   63 +-
 .../default/xui/ja/menu_conversation_log_gear.xml  |   26 +-
 .../default/xui/ja/menu_conversation_log_view.xml  |   10 +-
 .../skins/default/xui/ja/menu_copy_paste_color.xml |    5 +
 .../default/xui/ja/menu_copy_paste_features.xml    |    5 +
 .../skins/default/xui/ja/menu_copy_paste_light.xml |    5 +
 .../default/xui/ja/menu_copy_paste_object.xml      |    5 +
 .../skins/default/xui/ja/menu_copy_paste_pos.xml   |    7 +
 .../skins/default/xui/ja/menu_copy_paste_rot.xml   |    7 +
 .../skins/default/xui/ja/menu_copy_paste_size.xml  |    7 +
 .../default/xui/ja/menu_copy_paste_texture.xml     |    5 +
 indra/newview/skins/default/xui/ja/menu_edit.xml   |   20 +-
 .../skins/default/xui/ja/menu_favorites.xml        |   20 +-
 .../default/xui/ja/menu_gallery_outfit_tab.xml     |   56 +-
 .../skins/default/xui/ja/menu_gesture_gear.xml     |   17 +-
 .../skins/default/xui/ja/menu_group_plus.xml       |    6 +-
 .../skins/default/xui/ja/menu_hide_navbar.xml      |    7 +-
 .../skins/default/xui/ja/menu_im_conversation.xml  |   27 +-
 .../default/xui/ja/menu_im_session_showmodes.xml   |   10 +-
 .../skins/default/xui/ja/menu_imchiclet_adhoc.xml  |    4 +-
 .../skins/default/xui/ja/menu_imchiclet_group.xml  |    8 +-
 .../skins/default/xui/ja/menu_imchiclet_p2p.xml    |   10 +-
 .../default/xui/ja/menu_inspect_object_gear.xml    |   34 +-
 .../default/xui/ja/menu_inv_offer_chiclet.xml      |    4 +-
 .../skins/default/xui/ja/menu_inventory.xml        |  246 +-
 .../skins/default/xui/ja/menu_inventory_add.xml    |   76 +-
 .../default/xui/ja/menu_inventory_gear_default.xml |   35 +-
 .../xui/ja/menu_inventory_search_visibility.xml    |    7 +
 indra/newview/skins/default/xui/ja/menu_land.xml   |   19 +-
 .../newview/skins/default/xui/ja/menu_landmark.xml |   10 +-
 indra/newview/skins/default/xui/ja/menu_login.xml  |   74 +-
 .../skins/default/xui/ja/menu_marketplace_view.xml |   10 +-
 .../skins/default/xui/ja/menu_media_ctrl.xml       |   11 +-
 .../newview/skins/default/xui/ja/menu_mini_map.xml |   18 +-
 .../xui/ja/menu_model_import_gear_default.xml      |   12 +-
 .../skins/default/xui/ja/menu_mute_particle.xml    |    4 +-
 indra/newview/skins/default/xui/ja/menu_navbar.xml |   18 +-
 .../skins/default/xui/ja/menu_nearby_chat.xml      |   17 +-
 .../xui/ja/menu_notification_well_button.xml       |    4 +-
 indra/newview/skins/default/xui/ja/menu_object.xml |   67 +-
 .../skins/default/xui/ja/menu_object_icon.xml      |   13 +-
 .../skins/default/xui/ja/menu_outfit_gear.xml      |   74 +-
 .../skins/default/xui/ja/menu_outfit_tab.xml       |   18 +-
 .../skins/default/xui/ja/menu_participant_list.xml |   42 +-
 .../skins/default/xui/ja/menu_participant_view.xml |   25 +-
 .../default/xui/ja/menu_people_blocked_gear.xml    |   15 +-
 .../default/xui/ja/menu_people_blocked_plus.xml    |    6 +-
 .../default/xui/ja/menu_people_blocked_view.xml    |    6 +-
 .../default/xui/ja/menu_people_friends_view.xml    |   14 +-
 .../skins/default/xui/ja/menu_people_groups.xml    |   12 +-
 .../default/xui/ja/menu_people_groups_view.xml     |    4 +-
 .../skins/default/xui/ja/menu_people_nearby.xml    |   32 +-
 .../xui/ja/menu_people_nearby_multiselect.xml      |   16 +-
 .../default/xui/ja/menu_people_nearby_view.xml     |   16 +-
 .../default/xui/ja/menu_people_recent_view.xml     |    8 +-
 indra/newview/skins/default/xui/ja/menu_picks.xml  |   14 +-
 .../skins/default/xui/ja/menu_picks_plus.xml       |    6 +-
 indra/newview/skins/default/xui/ja/menu_place.xml  |    8 +-
 .../skins/default/xui/ja/menu_place_add_button.xml |    6 +-
 .../default/xui/ja/menu_places_gear_folder.xml     |   29 +-
 .../default/xui/ja/menu_places_gear_landmark.xml   |   39 +-
 .../default/xui/ja/menu_places_gear_sorting.xml    |    7 +
 .../skins/default/xui/ja/menu_profile_other.xml    |   23 +
 .../skins/default/xui/ja/menu_profile_overflow.xml |   20 +-
 .../skins/default/xui/ja/menu_profile_self.xml     |   12 +
 .../skins/default/xui/ja/menu_save_outfit.xml      |    6 +-
 .../skins/default/xui/ja/menu_save_settings.xml    |   14 +-
 .../skins/default/xui/ja/menu_script_chiclet.xml   |    4 +-
 .../skins/default/xui/ja/menu_settings_add.xml     |    8 +-
 .../skins/default/xui/ja/menu_settings_gear.xml    |   16 +-
 indra/newview/skins/default/xui/ja/menu_slurl.xml  |    8 +-
 .../default/xui/ja/menu_teleport_history_gear.xml  |    9 +-
 .../default/xui/ja/menu_teleport_history_item.xml  |    8 +-
 .../default/xui/ja/menu_teleport_history_tab.xml   |    6 +-
 .../skins/default/xui/ja/menu_text_editor.xml      |   26 +-
 .../newview/skins/default/xui/ja/menu_toolbars.xml |   10 +-
 .../skins/default/xui/ja/menu_topinfobar.xml       |   14 +-
 .../skins/default/xui/ja/menu_url_agent.xml        |   15 +-
 .../skins/default/xui/ja/menu_url_email.xml        |    6 +-
 .../skins/default/xui/ja/menu_url_experience.xml   |    4 +-
 .../skins/default/xui/ja/menu_url_group.xml        |    9 +-
 .../newview/skins/default/xui/ja/menu_url_http.xml |   10 +-
 .../skins/default/xui/ja/menu_url_inventory.xml    |   11 +-
 .../newview/skins/default/xui/ja/menu_url_map.xml  |   10 +-
 .../skins/default/xui/ja/menu_url_objectim.xml     |   18 +-
 .../skins/default/xui/ja/menu_url_parcel.xml       |   10 +-
 .../skins/default/xui/ja/menu_url_slapp.xml        |    7 +-
 .../skins/default/xui/ja/menu_url_slurl.xml        |   12 +-
 .../skins/default/xui/ja/menu_url_teleport.xml     |   10 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml | 1162 +--
 .../default/xui/ja/menu_wearable_list_item.xml     |   26 +-
 .../skins/default/xui/ja/menu_wearing_gear.xml     |   12 +-
 .../skins/default/xui/ja/menu_wearing_tab.xml      |   14 +-
 indra/newview/skins/default/xui/ja/mime_types.xml  |  379 +-
 .../skins/default/xui/ja/mime_types_linux.xml      |  352 +-
 .../skins/default/xui/ja/mime_types_mac.xml        |  355 +-
 .../newview/skins/default/xui/ja/notifications.xml | 8177 ++++++++++++--------
 .../skins/default/xui/ja/outfit_accordion_tab.xml  |    2 +-
 .../default/xui/ja/panel_active_object_row.xml     |   12 +-
 .../default/xui/ja/panel_avatar_list_item.xml      |   58 +-
 .../skins/default/xui/ja/panel_avatar_tag.xml      |   16 +-
 .../default/xui/ja/panel_block_list_sidetray.xml   |   22 +-
 .../default/xui/ja/panel_body_parts_list_item.xml  |   22 +-
 .../xui/ja/panel_bodyparts_list_button_bar.xml     |   10 +-
 .../skins/default/xui/ja/panel_bottomtray_lite.xml |   21 +-
 .../default/xui/ja/panel_camera_preset_item.xml    |    8 +
 .../skins/default/xui/ja/panel_chat_header.xml     |   10 +-
 .../skins/default/xui/ja/panel_chiclet_bar.xml     |   30 +-
 .../skins/default/xui/ja/panel_classified_info.xml |  116 +-
 .../xui/ja/panel_clothing_list_button_bar.xml      |    6 +-
 .../default/xui/ja/panel_clothing_list_item.xml    |   22 +-
 .../skins/default/xui/ja/panel_cof_wearables.xml   |   13 +-
 .../xui/ja/panel_conversation_list_item.xml        |   17 +-
 .../xui/ja/panel_conversation_log_list_item.xml    |   16 +-
 .../xui/ja/panel_deletable_wearable_list_item.xml  |   10 +-
 .../xui/ja/panel_dummy_clothing_list_item.xml      |   16 +-
 .../skins/default/xui/ja/panel_edit_alpha.xml      |   25 +-
 .../skins/default/xui/ja/panel_edit_eyes.xml       |   18 +-
 .../skins/default/xui/ja/panel_edit_gloves.xml     |   20 +-
 .../skins/default/xui/ja/panel_edit_hair.xml       |   24 +-
 .../skins/default/xui/ja/panel_edit_jacket.xml     |   25 +-
 .../skins/default/xui/ja/panel_edit_pants.xml      |   22 +-
 .../skins/default/xui/ja/panel_edit_physics.xml    |   38 +-
 .../skins/default/xui/ja/panel_edit_shape.xml      |   64 +-
 .../skins/default/xui/ja/panel_edit_shirt.xml      |   26 +-
 .../skins/default/xui/ja/panel_edit_shoes.xml      |   26 +-
 .../skins/default/xui/ja/panel_edit_skin.xml       |   32 +-
 .../skins/default/xui/ja/panel_edit_skirt.xml      |   24 +-
 .../skins/default/xui/ja/panel_edit_socks.xml      |   24 +-
 .../skins/default/xui/ja/panel_edit_tattoo.xml     |   22 +-
 .../skins/default/xui/ja/panel_edit_underpants.xml |   24 +-
 .../skins/default/xui/ja/panel_edit_undershirt.xml |   24 +-
 .../skins/default/xui/ja/panel_edit_universal.xml  |   38 +-
 .../skins/default/xui/ja/panel_edit_wearable.xml   |  184 +-
 .../skins/default/xui/ja/panel_experience_info.xml |  101 +-
 .../xui/ja/panel_experience_list_editor.xml        |   38 +-
 .../default/xui/ja/panel_experience_list_item.xml  |    8 +-
 .../skins/default/xui/ja/panel_experience_log.xml  |   53 +-
 .../default/xui/ja/panel_experience_search.xml     |   73 +-
 .../skins/default/xui/ja/panel_experiences.xml     |   18 +-
 .../skins/default/xui/ja/panel_group_bulk_ban.xml  |   58 +-
 .../xui/ja/panel_group_creation_sidetray.xml       |   81 +-
 .../skins/default/xui/ja/panel_group_general.xml   |   90 +-
 .../default/xui/ja/panel_group_info_sidetray.xml   |   72 +-
 .../skins/default/xui/ja/panel_group_invite.xml    |   43 +-
 .../default/xui/ja/panel_group_land_money.xml      |  129 +-
 .../skins/default/xui/ja/panel_group_list_item.xml |   13 +-
 .../default/xui/ja/panel_group_list_item_short.xml |   14 +-
 .../skins/default/xui/ja/panel_group_notices.xml   |   94 +-
 .../skins/default/xui/ja/panel_group_notify.xml    |   24 +-
 .../skins/default/xui/ja/panel_group_roles.xml     |  206 +-
 .../skins/default/xui/ja/panel_hide_beacon.xml     |    4 +
 .../skins/default/xui/ja/panel_instant_message.xml |   23 +-
 .../skins/default/xui/ja/panel_inventory_item.xml  |   11 +-
 .../skins/default/xui/ja/panel_landmark_info.xml   |   88 +-
 .../skins/default/xui/ja/panel_landmarks.xml       |   42 +-
 indra/newview/skins/default/xui/ja/panel_login.xml |   50 +-
 .../skins/default/xui/ja/panel_login_first.xml     |   89 +-
 .../skins/default/xui/ja/panel_main_inventory.xml  |   70 +-
 .../default/xui/ja/panel_marketplace_listings.xml  |   21 +-
 .../ja/panel_marketplace_listings_inventory.xml    |    2 +-
 .../xui/ja/panel_marketplace_listings_listed.xml   |    2 +-
 .../ja/panel_marketplace_listings_unassociated.xml |    2 +-
 .../xui/ja/panel_marketplace_listings_unlisted.xml |    2 +-
 .../xui/ja/panel_media_settings_general.xml        |   60 +-
 .../xui/ja/panel_media_settings_permissions.xml    |   42 +-
 .../xui/ja/panel_media_settings_security.xml       |   16 +-
 .../skins/default/xui/ja/panel_navigation_bar.xml  |   38 +-
 .../skins/default/xui/ja/panel_nearby_chat.xml     |   12 +-
 .../skins/default/xui/ja/panel_nearby_chat_bar.xml |    6 +-
 .../skins/default/xui/ja/panel_nearby_media.xml    |  124 +-
 .../skins/default/xui/ja/panel_notification.xml    |   15 +
 .../xui/ja/panel_notification_list_item.xml        |  127 +-
 .../default/xui/ja/panel_notifications_channel.xml |   34 +-
 .../skins/default/xui/ja/panel_notify_textbox.xml  |   20 +-
 .../default/xui/ja/panel_online_status_toast.xml   |    2 +-
 .../skins/default/xui/ja/panel_outfit_edit.xml     |  146 +-
 .../skins/default/xui/ja/panel_outfit_gallery.xml  |   55 +-
 .../default/xui/ja/panel_outfit_gallery_item.xml   |   12 +-
 .../xui/ja/panel_outfit_snapshot_inventory.xml     |   10 +
 .../default/xui/ja/panel_outfits_inventory.xml     |   46 +-
 .../ja/panel_outfits_inventory_gear_default.xml    |   13 +-
 .../skins/default/xui/ja/panel_outfits_list.xml    |   19 +-
 .../skins/default/xui/ja/panel_outfits_wearing.xml |   26 +-
 .../newview/skins/default/xui/ja/panel_people.xml  |  132 +-
 .../skins/default/xui/ja/panel_place_profile.xml   |  214 +-
 .../newview/skins/default/xui/ja/panel_places.xml  |  115 +-
 .../default/xui/ja/panel_postcard_message.xml      |   28 +-
 .../default/xui/ja/panel_postcard_settings.xml     |   26 +-
 .../default/xui/ja/panel_preferences_advanced.xml  |   56 +-
 .../default/xui/ja/panel_preferences_alerts.xml    |   20 +-
 .../default/xui/ja/panel_preferences_chat.xml      |  196 +-
 .../default/xui/ja/panel_preferences_colors.xml    |   60 +-
 .../default/xui/ja/panel_preferences_controls.xml  |   11 +
 .../default/xui/ja/panel_preferences_general.xml   |  124 +-
 .../default/xui/ja/panel_preferences_graphics1.xml |   77 +-
 .../default/xui/ja/panel_preferences_grids.xml     |   17 +
 .../default/xui/ja/panel_preferences_move.xml      |   66 +-
 .../default/xui/ja/panel_preferences_privacy.xml   |   46 +-
 .../default/xui/ja/panel_preferences_setup.xml     |   62 +-
 .../default/xui/ja/panel_preferences_sound.xml     |   72 +-
 .../default/xui/ja/panel_preferences_uploads.xml   |   29 +-
 .../xui/ja/panel_presets_camera_pulldown.xml       |    7 +
 .../default/xui/ja/panel_presets_pulldown.xml      |   12 +-
 .../default/xui/ja/panel_prim_media_controls.xml   |  132 +-
 .../default/xui/ja/panel_profile_classified.xml    |  184 +-
 .../default/xui/ja/panel_profile_classifieds.xml   |   16 +-
 .../default/xui/ja/panel_profile_firstlife.xml     |    2 +-
 .../skins/default/xui/ja/panel_profile_notes.xml   |   12 +-
 .../skins/default/xui/ja/panel_profile_pick.xml    |   22 +-
 .../skins/default/xui/ja/panel_profile_picks.xml   |   16 +-
 .../default/xui/ja/panel_profile_secondlife.xml    |  163 +-
 .../skins/default/xui/ja/panel_profile_web.xml     |   22 +-
 .../skins/default/xui/ja/panel_progress.xml        |   16 +-
 .../skins/default/xui/ja/panel_region_access.xml   |  108 +-
 .../skins/default/xui/ja/panel_region_covenant.xml |  106 +-
 .../skins/default/xui/ja/panel_region_debug.xml    |   58 +-
 .../default/xui/ja/panel_region_environment.xml    |  147 +-
 .../skins/default/xui/ja/panel_region_estate.xml   |   82 +-
 .../default/xui/ja/panel_region_experiences.xml    |   41 +-
 .../skins/default/xui/ja/panel_region_general.xml  |   73 +-
 .../skins/default/xui/ja/panel_region_terrain.xml  |   92 +-
 .../skins/default/xui/ja/panel_script_ed.xml       |   84 +-
 .../default/xui/ja/panel_script_experience.xml     |   20 +-
 .../xui/ja/panel_script_limits_my_avatar.xml       |   28 +-
 .../xui/ja/panel_script_limits_region_memory.xml   |   36 +-
 .../default/xui/ja/panel_script_question_toast.xml |    4 +-
 .../skins/default/xui/ja/panel_scrolling_param.xml |   20 +-
 .../default/xui/ja/panel_scrolling_param_base.xml  |    8 +-
 .../default/xui/ja/panel_settings_sky_atmos.xml    |   40 +-
 .../default/xui/ja/panel_settings_sky_clouds.xml   |   41 +-
 .../default/xui/ja/panel_settings_sky_density.xml  |   50 +-
 .../default/xui/ja/panel_settings_sky_sunmoon.xml  |   63 +-
 .../skins/default/xui/ja/panel_settings_water.xml  |   66 +-
 .../default/xui/ja/panel_side_tray_tab_caption.xml |   10 +-
 .../default/xui/ja/panel_sidetray_home_tab.xml     |   60 +-
 .../default/xui/ja/panel_snapshot_inventory.xml    |   40 +-
 .../skins/default/xui/ja/panel_snapshot_local.xml  |   56 +-
 .../default/xui/ja/panel_snapshot_options.xml      |   14 +-
 .../default/xui/ja/panel_snapshot_postcard.xml     |   30 +-
 .../default/xui/ja/panel_snapshot_profile.xml      |   34 +-
 .../skins/default/xui/ja/panel_sound_devices.xml   |   32 +-
 .../default/xui/ja/panel_stand_stop_flying.xml     |   13 +-
 .../skins/default/xui/ja/panel_status_bar.xml      |   51 +-
 .../skins/default/xui/ja/panel_sys_well_item.xml   |   12 +-
 .../default/xui/ja/panel_teleport_history.xml      |   34 +-
 .../default/xui/ja/panel_teleport_history_item.xml |   12 +-
 .../skins/default/xui/ja/panel_tools_texture.xml   |  196 +-
 .../skins/default/xui/ja/panel_voice_effect.xml    |   20 +-
 .../skins/default/xui/ja/panel_volume_pulldown.xml |   24 +-
 .../skins/default/xui/ja/panel_world_map.xml       |   82 +-
 .../newview/skins/default/xui/ja/role_actions.xml  |  154 +-
 .../skins/default/xui/ja/sidepanel_appearance.xml  |   34 +-
 .../skins/default/xui/ja/sidepanel_inventory.xml   |   72 +-
 .../skins/default/xui/ja/sidepanel_item_info.xml   |  138 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   |  206 +-
 indra/newview/skins/default/xui/ja/strings.xml     | 6093 ++++++++++-----
 .../skins/default/xui/ja/teleport_strings.xml      |   78 +-
 .../default/xui/ja/widgets/bodyparts_list_item.xml |    9 +
 .../default/xui/ja/widgets/clothing_list_item.xml  |   11 +
 .../ja/widgets/deletable_wearable_list_item.xml    |    6 +
 .../skins/default/xui/ja/widgets/density_ctrl.xml  |   23 +-
 .../xui/ja/widgets/dummy_clothing_list_item.xml    |    7 +
 .../default/xui/ja/widgets/flat_list_view.xml      |    4 +
 .../xui/ja/widgets/inbox_folder_view_folder.xml    |    4 +
 .../xui/ja/widgets/inbox_folder_view_item.xml      |    4 +
 .../default/xui/ja/widgets/menu_item_separator.xml |    2 +
 .../default/xui/ja/widgets/menu_item_tear_off.xml  |    3 +
 .../skins/default/xui/ja/widgets/name_editor.xml   |    2 +
 .../default/xui/ja/widgets/panel_camera_item.xml   |    8 +
 .../skins/default/xui/ja/widgets/person_view.xml   |   12 +
 .../default/xui/ja/widgets/sun_moon_trackball.xml  |   19 +
 .../xui/ja/widgets/wearable_outfit_list_item.xml   |   12 +
 .../skins/default/xui/ja/widgets/xy_vector.xml     |   11 +
 indra/newview/skins/default/xui/ja/xui_version.xml |    6 +-
 472 files changed, 19989 insertions(+), 17266 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_media.xml
 create mode 100644 indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_360capture.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_aaa.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_classified.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_create_landmark.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_fbc_web.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_mfa.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_profile_texture.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_button.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_combobox.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_slider.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_spinner.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_ui_preview.xml
 create mode 100644 indra/newview/skins/default/xui/ja/fonts.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_profile_other.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_profile_self.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_notification.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/name_editor.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/person_view.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/ja/widgets/xy_vector.xml

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml b/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
new file mode 100644
index 0000000000..a46087d47f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows name="camera_actions" value="">
+    <columns label="カメラ" name="lst_action" />
+  </rows>
+  <rows name="look_up" value="look_up">
+    <columns name="lst_action" value="上に向ける" />
+  </rows>
+  <rows name="look_down" value="look_down">
+    <columns name="lst_action" value="下に向ける" />
+  </rows>
+  <rows name="move_forward" value="move_forward">
+    <columns name="lst_action" value="カメラを近づける" />
+  </rows>
+  <rows name="move_backward" value="move_backward">
+    <columns name="lst_action" value="カメラを遠ざける" />
+  </rows>
+  <rows name="move_forward_fast" value="move_forward_fast">
+    <columns name="lst_action" value="カメラを高速に近づける" />
+  </rows>
+  <rows name="move_backward_fast" value="move_backward_fast">
+    <columns name="lst_action" value="カメラを高速に遠ざける" />
+  </rows>
+  <rows name="spin_over" value="spin_over">
+    <columns name="lst_action" value="カメラの仰角を上げる" />
+  </rows>
+  <rows name="spin_under" value="spin_under">
+    <columns name="lst_action" value="カメラの仰角を下げる" />
+  </rows>
+  <rows name="pan_up" value="pan_up">
+    <columns name="lst_action" value="カメラの中心を上に移動" />
+  </rows>
+  <rows name="pan_down" value="pan_down">
+    <columns name="lst_action" value="カメラの中心を下に移動" />
+  </rows>
+  <rows name="pan_left" value="pan_left">
+    <columns name="lst_action" value="カメラの中心を左に移動" />
+  </rows>
+  <rows name="pan_right" value="pan_right">
+    <columns name="lst_action" value="カメラの中心を右に移動" />
+  </rows>
+  <rows name="pan_in" value="pan_in">
+    <columns name="lst_action" value="カメラの中心を拡大" />
+  </rows>
+  <rows name="pan_out" value="pan_out">
+    <columns name="lst_action" value="カメラの中心を縮小" />
+  </rows>
+  <rows name="spin_around_ccw" value="spin_around_ccw">
+    <columns name="lst_action" tool_tip="対象に対して、カメラを反時計回りに回します。" value="反時計回り" />
+  </rows>
+  <rows name="spin_around_cw" value="spin_around_cw">
+    <columns name="lst_action" tool_tip="対象に対して、カメラをカメラを時計回りに回します。" value="時計回り" />
+  </rows>
+  <rows name="move_forward_sitting" value="move_forward_sitting">
+    <columns name="lst_action" value="座ってカメラを近づける" />
+  </rows>
+  <rows name="move_backward_sitting" value="move_backward_sitting">
+    <columns name="lst_action" value="座ってカメラを遠ざける" />
+  </rows>
+  <rows name="spin_over_sitting" value="spin_over_sitting">
+    <columns name="lst_action" value="座ってカメラの仰角を上げる" />
+  </rows>
+  <rows name="spin_under_sitting" value="spin_under_sitting">
+    <columns name="lst_action" value="座ってカメラの仰角を下げる" />
+  </rows>
+  <rows name="spin_around_ccw_sitting" value="spin_around_ccw_sitting">
+    <columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを反時計回りに回します。" value="座って反時計回り" />
+  </rows>
+  <rows name="spin_around_cw_sitting" value="spin_around_cw_sitting">
+    <columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを時計回りに回します。" value="座って時計回り" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
new file mode 100644
index 0000000000..e556a41e57
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <columns label="アクション" name="lst_action" />
+  <columns label="優先コントロール" name="lst_ctrl1" />
+  <columns label="代わり１" name="lst_ctrl2" />
+  <columns label="代わり２" name="lst_ctrl3" />
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml b/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
new file mode 100644
index 0000000000..9a2286b873
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows enabled="false" name="editing_actions" value="">
+    <columns label="編集中" name="lst_action" value="Tool_Dozer" />
+  </rows>
+  <rows name="edit_avatar_spin_ccw" value="edit_avatar_spin_ccw">
+    <columns name="lst_action" tool_tip="アバターを中心にカメラを反時計回りに回します。" value="反時計回り" />
+  </rows>
+  <rows name="edit_avatar_spin_cw" value="edit_avatar_spin_cw">
+    <columns name="lst_action" tool_tip="アバターを中心にカメラを時計回りに回します。" value="時計回り" />
+  </rows>
+  <rows name="edit_avatar_spin_over" value="edit_avatar_spin_over">
+    <columns name="lst_action" tool_tip="アバターに対するカメラの仰角を上げます。" value="カメラの仰角を上げる" />
+  </rows>
+  <rows name="edit_avatar_spin_under" value="edit_avatar_spin_under">
+    <columns name="lst_action" tool_tip="アバターに対するカメラの仰角を下げます。" value="カメラの仰角を下げる" />
+  </rows>
+  <rows name="edit_avatar_move_forward" value="edit_avatar_move_forward">
+    <columns name="lst_action" value="カメラを近づける" />
+  </rows>
+  <rows name="edit_avatar_move_backward" value="edit_avatar_move_backward">
+    <columns name="lst_action" value="カメラを遠ざける" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_media.xml b/indra/newview/skins/default/xui/ja/control_table_contents_media.xml
new file mode 100644
index 0000000000..0d69c10a0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_media.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows enabled="false" name="media_actions" value="">
+    <columns type="icontext" label="サウンドとメディア" name="lst_action" value="Audio_Press" />
+  </rows>
+  <rows name="toggle_pause_media" value="toggle_pause_media">
+    <columns name="lst_action" value="メディアの再生／停止" />
+  </rows>
+  <rows name="toggle_enable_media" value="toggle_enable_media">
+    <columns name="lst_action" value="全てのメディアを再生／停止" />
+  </rows>
+  <rows name="voice_follow_key" value="voice_follow_key">
+    <columns name="lst_action" value="ボイスチャット" />
+  </rows>
+  <rows name="toggle_voice" value="toggle_voice">
+    <columns name="lst_action" value="ボイスチャット切り替え" />
+  </rows>
+  <rows name="start_chat" value="start_chat">
+    <columns name="lst_action" value="チャットを開始" />
+  </rows>
+  <rows name="start_gesture" value="start_gesture">
+    <columns name="lst_action" value="ジェスチャーを開始" />
+  </rows>
+  <rows name="script_trigger_lbutton" value="script_trigger_lbutton">
+    <columns name="lst_action" value="インタラクト（左クリックスクリプト）" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml b/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
new file mode 100644
index 0000000000..64b72f0404
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<contents>
+  <rows name="move_actions" value="">
+    <columns type="icontext" label="移動アクション" name="lst_action" value="Move_Walk_Off" />
+  </rows>
+  <rows name="walk_to" value="walk_to">
+    <columns name="lst_action" tool_tip="マウスカーソルが指している場所に向かって歩きます。" value="移動先" />
+  </rows>
+  <rows name="teleport_to" value="teleport_to">
+    <columns name="lst_action" tool_tip="マウスカーソルが指す場所にテレポートしますが、すべての場所において、必ずしも直接テレポートできるとは限らないため、代わりに目的地の近くにテレポートする場合があります。" value="テレポートする" />
+  </rows>
+  <rows name="push_forward" value="push_forward">
+    <columns name="lst_action" value="前に移動" />
+  </rows>
+  <rows name="push_backward" value="push_backward">
+    <columns name="lst_action" value="後ろに移動" />
+  </rows>
+  <rows name="turn_left" value="turn_left">
+    <columns name="lst_action" value="左を向いて移動" />
+  </rows>
+  <rows name="turn_right" value="turn_right">
+    <columns name="lst_action" value="右を向いて移動" />
+  </rows>
+  <rows name="slide_left" value="slide_left">
+    <columns name="lst_action" value="左へ平行移動" />
+  </rows>
+  <rows name="slide_right" value="slide_right">
+    <columns name="lst_action" value="右へ平行移動" />
+  </rows>
+  <rows name="jump" value="jump">
+    <columns name="lst_action" value="ジャンプ／飛行" />
+  </rows>
+  <rows name="push_down" value="push_down">
+    <columns name="lst_action" value="下降" />
+  </rows>
+  <rows name="run_forward" value="run_forward">
+    <columns name="lst_action" value="前に走る" />
+  </rows>
+  <rows name="run_backward" value="run_backward">
+    <columns name="lst_action" value="後ろに走る" />
+  </rows>
+  <rows name="run_left" value="run_left">
+    <columns name="lst_action" value="左に走る" />
+  </rows>
+  <rows name="run_right" value="run_right">
+    <columns name="lst_action" value="右に走る" />
+  </rows>
+  <rows name="toggle_run" value="toggle_run">
+    <columns name="lst_action" value="常時走行切り替え" />
+  </rows>
+  <rows name="toggle_fly" value="toggle_fly">
+    <columns name="lst_action" value="飛行／停止切り替え" />
+  </rows>
+  <rows name="toggle_sit" value="toggle_sit">
+    <columns name="lst_action" value="座る／立つ" />
+  </rows>
+  <rows name="stop_moving" value="stop_moving">
+    <columns name="lst_action" value="立ち止まる" />
+  </rows>
+</contents>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_360capture.xml b/indra/newview/skins/default/xui/ja/floater_360capture.xml
new file mode 100644
index 0000000000..8bf1fd2504
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_360capture.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="360capture" title="３６０度スナップショット">
+  <panel name="ui_panel_left">
+    <text name="quality_level_label">品質</text>
+    <radio_group name="360_quality_selection">
+      <radio_item label="プレビュー（高速）" name="preview_quality" tool_tip="プレビュー程度の品質" />
+      <radio_item label="通常" name="medium_quality" value="512" tool_tip="通常品質" />
+      <radio_item label="高" name="high_quality" value="1024" tool_tip="高品質" />
+      <radio_item label="最高品位" name="maximum_quality" value="2048" tool_tip="最高品質" />
+    </radio_group>
+    <check_box label="アバターをすべて隠す" name="360_hide_avatar" />
+    <button label="３６０度画像を作成" name="capture_button" />
+    <button label="名前をつけて保存…" name="save_local_button" />
+  </panel>
+  <panel name="ui_panel_right">
+    <text name="statusbar">クリックとドラッグで視点変更</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_aaa.xml b/indra/newview/skins/default/xui/ja/floater_aaa.xml
new file mode 100644
index 0000000000..9cca52cf61
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_aaa.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Test Floater" title="フローターのテスト">
+  <text left="0" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
+ここに
+記載される
+なんらかの
+テキストは
+上部に
+寄せられて
+います</text>
+  <text left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
+ここに
+記載される
+なんらかの
+テキストは
+中央に
+寄せられて
+います</text>
+  <text left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
+ここに
+記載される
+なんらかの
+テキストは
+下部に
+寄せられて
+います</text>
+  <text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
+ここに
+記載される
+なんらかの
+テキストは
+上部に
+寄せられて
+います</text_editor>
+  <text_editor left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
+ここに
+記載される
+なんらかの
+テキストは
+中央に
+寄せられて
+います</text_editor>
+  <text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
+ここに
+記載される
+なんらかの
+テキストは
+下部に
+寄せられて
+います</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 22a65003d3..aac914b714 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="[CAPITALIZED_APP_NAME] について">
-	<tab_container name="about_tab">
-		<panel label="情報" name="support_panel">
-			<button label="クリップボードにコピー" name="copy_btn"/>
-			<button label="アップデートを確認" name="update_btn"/>
-		</panel>
-		<panel label="クレジット" name="credits_panel">
-			<text name="linden_intro">Second Life の提供元： Lindens の、 
-オープンソースの提供：</text>
-			<text_editor name="contrib_names">Dummy Name は実行時間に置き換え</text_editor>
-		</panel>
-		<panel label="ライセンス" name="licenses_panel">
-			<text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+<floater name="floater_about" title="[CAPITALIZED_APP_NAME]について">
+  <tab_container name="about_tab">
+    <panel label="情報" name="support_panel">
+      <!-- 正確には「クリップボードへコピー」字数制限のためコピーに変更 -->
+      <button label="コピー" name="copy_btn" />
+      <button label="更新の確認" name="update_btn" />
+    </panel>
+    <panel label="クレジット" name="credits_panel">
+      <text name="linden_intro">Second Life は Lindens によって開発され、以下のオープンソースの貢献があります：</text>
+      <text_editor name="contrib_names">Dummy Nameは実行時間に置き換えられます。</text_editor>
+    </panel>
+    <panel label="ライセンス" name="licenses_panel">
+      <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
 APR Copyright (C) 2011 The Apache Software Foundation
 Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
 cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -23,6 +23,7 @@ google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
 ogg/vorbis Copyright (C) 2002, Xiphophorus
 OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
 PCRE Copyright (c) 1997-2012 University of Cambridge
@@ -32,13 +33,15 @@ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 xxHash Copyright (C) 2012-2020 Yann Collet.
 zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
-Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
+Second Life ビューアでは Havok (TM) Physics が使用されています。
+(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).
+無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
 
-このソフトウェアには、NVIDIA Corporation によるソースコードが含まれます。
+このソフトウェアには、NVIDIA Corporationによるソースコードが含まれます。
 
 無断複写・複製・転載を禁じます。詳細については licenses.txt をご参照ください。
 
 ボイスチャットのオーディオコーディング：Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)</text_editor>
-		</panel>
-	</tab_container>
-</floater>
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 4703dfaa34..0ed0706a2d 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -1,483 +1,244 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="土地情報">
-	<floater.string name="maturity_icon_general">
-		&quot;Parcel_PG_Dark&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_moderate">
-		&quot;Parcel_M_Dark&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_adult">
-		&quot;Parcel_R_Dark&quot;
-	</floater.string>
-	<floater.string name="Hours">
-		[HOURS] 時間
-	</floater.string>
-	<floater.string name="Hour">
-		時間
-	</floater.string>
-	<floater.string name="Minutes">
-		[MINUTES] 分
-	</floater.string>
-	<floater.string name="Minute">
-		分
-	</floater.string>
-	<floater.string name="Seconds">
-		[SECONDS] 秒
-	</floater.string>
-	<floater.string name="Remaining">
-		残り
-	</floater.string>
-	<floater.string name="Always">
-		常時
-	</floater.string>
-	<tab_container name="landtab">
-		<panel label="一般" name="land_general_panel">
-			<panel.string name="new users only">
-				新規住人専用
-			</panel.string>
-			<panel.string name="anyone">
-				誰でも
-			</panel.string>
-			<panel.string name="area_text">
-				面積：
-			</panel.string>
-			<panel.string name="area_size_text">
-				[AREA] 平方メートル
-			</panel.string>
-			<panel.string name="auction_id_text">
-				オークション ID： [ID]
-			</panel.string>
-			<panel.string name="need_tier_to_modify">
-				この土地を修正変更するには、購入を承認する必要があります。
-			</panel.string>
-			<panel.string name="group_owned_text">
-				（グループ所有）
-			</panel.string>
-			<panel.string name="profile_text">
-				プロフィール
-			</panel.string>
-			<panel.string name="info_text">
-				情報
-			</panel.string>
-			<panel.string name="public_text">
-				（公共）
-			</panel.string>
-			<panel.string name="none_text">
-				（なし）
-			</panel.string>
-			<panel.string name="sale_pending_text">
-				（購入審査中）
-			</panel.string>
-			<panel.string name="no_selection_text">
-				区画が選択されていません。
-			</panel.string>
-			<panel.string name="time_stamp_template">
-				[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-			</panel.string>
-			<text name="Name:">
-				名前：
-			</text>
-			<line_editor name="Name"/>
-			<text name="Description:">
-				説明：
-			</text>
-			<text name="LandType">
-				種類：
-			</text>
-			<text name="LandTypeText">
-				メインランド/ホームステッド
-			</text>
-			<text name="ContentRating">
-				区分：
-			</text>
-			<text name="ContentRatingText">
-				Adult
-			</text>
-			<text name="Owner:">
-				所有者：
-			</text>
-			<text name="Group:">
-				グループ：
-			</text>
-			<button label="設定" label_selected="設定..." name="Set..."/>
-			<check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。グループの土地割り当てによってサポートされます。"/>
-			<button label="譲渡" label_selected="譲渡..." name="Deed..." tool_tip="選択したグループのオフィサーのみ、土地を譲渡できます。"/>
-			<check_box label="所有者が譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。"/>
-			<text name="For Sale:">
-				販売の有無：
-			</text>
-			<text name="Not for sale.">
-				販売対象外
-			</text>
-			<text name="For Sale: Price L$[PRICE].">
-				価格： L$ [PRICE] （L$ [PRICE_PER_SQM] / 平方メートル）
-			</text>
-			<button label="土地を売る" label_selected="土地を販売..." name="Sell Land..."/>
-			<text name="For sale to">
-				販売先：[BUYER]
-			</text>
-			<text name="Sell with landowners objects in parcel.">
-				オブジェクトを一緒に販売
-			</text>
-			<text name="Selling with no objects in parcel.">
-				オブジェクトは販売しない
-			</text>
-			<button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"/>
-			<text name="Claimed:">
-				取得日時：
-			</text>
-			<text name="DateClaimText">
-				2006年8月15日火曜日13:47:25
-			</text>
-			<text name="PriceLabel">
-				面積：
-			</text>
-			<text name="PriceText">
-				4048 m²
-			</text>
-			<text name="Traffic:">
-				交通量:
-			</text>
-			<text name="DwellText">
-				ローディング...
-			</text>
-			<button label="土地の購入" label_selected="土地を購入..." left="130" name="Buy Land..." width="100"/>
-			<button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
-			<button label="スクリプト情報" name="Scripts..." width="100"/>
-			<button label="グループに購入" label_selected="グループ用に購入..." name="Buy For Group..."/>
-			<button label="入場許可を購入" label_selected="入場許可を購入..." left="130" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="100"/>
-			<button label="土地の放棄" label_selected="土地を放棄..." name="Abandon Land..."/>
-			<button label="土地を取り戻す" label_selected="土地の返還を要求..." name="Reclaim Land..."/>
-		</panel>
-		<panel label="約款" name="land_covenant_panel">
-			<panel.string name="can_resell">
-				このリージョン（地域）で購入した土地は、再販できます。
-			</panel.string>
-			<panel.string name="can_not_resell">
-				このリージョン（地域）で購入した土地は、再販できないことがあります。
-			</panel.string>
-			<panel.string name="can_change">
-				このリージョン（地域）で購入した土地は、統合または再分割できます。
-			</panel.string>
-			<panel.string name="can_not_change">
-				このリージョン（地域）で購入した土地は、統合・再分割できないことがあります。
-あります。
-			</panel.string>
-			<text font="SansSerifLarge" name="estate_section_lbl">
-				不動産：
-			</text>
-			<text name="estate_name_text">
-				メインランド
-			</text>
-			<text name="estate_owner_lbl">
-				所有者：
-			</text>
-			<text name="estate_owner_text">
-				（なし）
-			</text>
-			<text_editor name="covenant_editor">
-				この不動産には約款がありません。
-			</text_editor>
-			<text name="covenant_timestamp_text">
-				最後の更新1969年12月31日水曜日16：00：00
-			</text>
-			<text font="SansSerifLarge" name="region_section_lbl">
-				地域：
-			</text>
-			<text name="region_name_text">
-				EricaVille
-			</text>
-			<text name="region_landtype_lbl">
-				種類：
-			</text>
-			<text name="region_landtype_text">
-				メインランド/ホームステッド
-			</text>
-			<text name="region_maturity_lbl">
-				区分：
-			</text>
-			<text name="region_maturity_text">
-				Adult
-			</text>
-			<text name="resellable_lbl">
-				再販：
-			</text>
-			<text name="resellable_clause">
-				このリージョン（地域）にある土地は再販できません。
-			</text>
-			<text name="changeable_lbl">
-				再分割：
-			</text>
-			<text name="changeable_clause">
-				このリージョン（地域）にある土地は統合または分割ができないことがあります。
-			</text>
-		</panel>
-		<panel label="オブジェクト" name="land_objects_panel">
-			<panel.string name="objects_available_text">
-				[MAX] の内 [COUNT]（[AVAILABLE] 利用可能）
-			</panel.string>
-			<panel.string name="objects_deleted_text">
-				[MAX] の内 [COUNT]（[DELETED] を削除）
-			</panel.string>
-			<text name="parcel_object_bonus">
-				オブジェクトボーナス: [BONUS]
-			</text>
-			<text name="Simulator primitive usage:">
-				リージョン（地域）の許容数：
-			</text>
-			<text name="objects_available">
-				[MAX] の内 [COUNT] （[AVAILABLE] 利用可能）
-			</text>
-			<text name="Primitives parcel supports:">
-				区画の許容数：
-			</text>
-			<text name="object_contrib_text">
-				[COUNT]
-			</text>
-			<text name="Primitives on parcel:">
-				区画の負荷：
-			</text>
-			<text name="total_objects_text">
-				[COUNT]
-			</text>
-			<text name="Owned by parcel owner:">
-				区画所有者の所有物：
-			</text>
-			<text name="owner_objects_text">
-				[COUNT]
-			</text>
-			<button label="表示" label_selected="表示" name="ShowOwner"/>
-			<button label="返却" label_selected="返却..." name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します"/>
-			<text name="Set to group:">
-				グループに設定：
-			</text>
-			<text name="group_objects_text">
-				[COUNT]
-			</text>
-			<button label="表示" label_selected="表示" name="ShowGroup"/>
-			<button label="返却" label_selected="返却..." name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します"/>
-			<text name="Owned by others:">
-				他人の所有物：
-			</text>
-			<text name="other_objects_text">
-				[COUNT]
-			</text>
-			<button label="表示" label_selected="表示" name="ShowOther"/>
-			<button label="返却" label_selected="返却..." name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します"/>
-			<text name="Selected / sat upon:">
-				選択済み・決定済み：
-			</text>
-			<text name="selected_objects_text">
-				[COUNT]
-			</text>
-			<text name="Autoreturn">
-				他人のオブジェクトを自動返却（分単位、0 で自動返却なし）：
-			</text>
-			<line_editor left_delta="5" name="clean other time"/>
-			<text name="Object Owners:">
-				オブジェクトの所有者：
-			</text>
-			<button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/>
-			<button label="オブジェクトを返却する" label_selected="オブジェクトの返却..." name="Return objects..."/>
-			<name_list label="カウント" name="owner list">
-				<name_list.columns label="タイプ" name="type"/>
-				<name_list.columns name="online_status"/>
-				<name_list.columns label="名前" name="name"/>
-				<name_list.columns label="数" name="count"/>
-				<name_list.columns label="最新" name="mostrecent"/>
-			</name_list>
-		</panel>
-		<panel label="オプション" name="land_options_panel">
-			<panel.string name="search_enabled_tooltip">
-				この区画を検索結果に表示する
-			</panel.string>
-			<panel.string name="search_disabled_small_tooltip">
-				区画面積が 128 平方メートルかそれ以下のため、このオプションは無効です。
-大きな区画のみ検索に表示させることが可能です。
-			</panel.string>
-			<panel.string name="search_disabled_permissions_tooltip">
-				あなたはこの区画の設定編集ができないため、このオプションは無効です。
-			</panel.string>
-			<panel.string name="mature_check_mature">
-				「Moderate」コンテンツ
-			</panel.string>
-			<panel.string name="mature_check_adult">
-				「Adult」コンテンツ
-			</panel.string>
-			<panel.string name="mature_check_mature_tooltip">
-				あなたの区画情報及びコンテンツは「Moderate」とされています。
-			</panel.string>
-			<panel.string name="mature_check_adult_tooltip">
-				あなたの区画情報及びコンテンツは「Adult」とされています。
-			</panel.string>
-			<panel.string name="landing_point_none">
-				（なし）
-			</panel.string>
-			<panel.string name="push_restrict_text">
-				プッシュ禁止
-			</panel.string>
-			<panel.string name="push_restrict_region_text">
-				プッシュ禁止 （地域設定優先）
-			</panel.string>
-			<text name="allow_label">
-				他の住人への許可：
-			</text>
-			<text name="allow_label0">
-				飛行：
-			</text>
-			<check_box label="全員" name="check fly" tool_tip="チェックを入れるとこの土地での飛行が可能となります。チェックを外すと土地に入る際と通り過ぎるときのみ飛行可能となります。"/>
-			<text name="allow_label2">
-				制作：
-			</text>
-			<check_box label="全員" name="edit objects check" tool_tip="このオプションを選択すると、住人はあなたの土地でオブジェクトの制作や rez ができます。"/>
-			<check_box label="グループ" name="edit group objects check" tool_tip="このオプションを選択すると、区画のグループメンバーは、あなたの土地でオブジェクトの制作や rez ができます。"/>
-			<text name="allow_label3">
-				オブジェクトの進入：
-			</text>
-			<check_box label="全員" name="all object entry check" tool_tip="このオプションを選択すると、住人は他の区画にあるオブジェクトをこの区画に移動することが可能です。"/>
-			<check_box label="グループ" name="group object entry check" tool_tip="このオプションを選択すると、区画のグループメンバーは他の区画にあるオブジェクトをこの区画に移動することが可能です。"/>
-			<text name="allow_label4">
-				スクリプトの実行：
-			</text>
-			<check_box label="全員" name="check other scripts" tool_tip="このオプションを選択すると、住人はアタッチメントなどのスクリプトをあなたの区画で実行できます。"/>
-			<check_box label="グループ" name="check group scripts" tool_tip="このオプションを選択すると、区画のグループメンバーは、アタッチメントなどのスクリプトをあなたの区画で実行できます。"/>
-			<check_box label="安全（ダメージなし）" name="check safe" tool_tip="チェックを入れるとこの土地でのダメージコンバットが無効になり、「安全」に設定されます。 チェックを外すとダメージコンバットが有効になります。"/>
-			<check_box label="プッシュ禁止" name="PushRestrictCheck" tool_tip="スクリプトによるプッシュを禁止します。 このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。"/>
-			<check_box label="検索に区画を表示（週 L$ 30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します"/>
-			<combo_box name="land category">
-				<combo_box.item label="全カテゴリ" name="item0"/>
-				<combo_box.item label="Linden 所在地" name="item1"/>
-				<combo_box.item label="アート&amp;カルチャー" name="item3"/>
-				<combo_box.item label="ビジネス" name="item4"/>
-				<combo_box.item label="教育的" name="item5"/>
-				<combo_box.item label="ゲーム" name="item6"/>
-				<combo_box.item label="たまり場" name="item7"/>
-				<combo_box.item label="新住人に好意的" name="item8"/>
-				<combo_box.item label="公園と自然" name="item9"/>
-				<combo_box.item label="住宅用" name="item10"/>
-				<combo_box.item label="ショッピング" name="item11"/>
-				<combo_box.item label="レンタル" name="item13"/>
-				<combo_box.item label="その他" name="item12"/>
-			</combo_box>
-			<check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip=""/>
-			<text name="Snapshot:">
-				スナップショット：
-			</text>
-			<texture_picker label="" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
-			<text name="allow_see_label">
-				他の区画にいるアバターがこの区画にいるアバターに会ってチャットできます
-			</text>
-			<check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="他の区画のアバターが、この区画にいるアバターに会ってチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。"/>
-			<text name="landing_point">
-				着地点: [LANDING]
-			</text>
-			<button label="設定" label_selected="設定" name="Set" tool_tip="訪問者の着地点の設定を行います。この区画内に立って行ってください。"/>
-			<button label="クリア" label_selected="クリア" name="Clear" tool_tip="着地点をクリア"/>
-			<text name="Teleport Routing: ">
-				テレポート経路：
-			</text>
-			<combo_box name="landing type" tool_tip="テレポート経路 -- あなたの土地へのテレポート経路を選択">
-				<combo_box.item label="不可" name="Blocked"/>
-				<combo_box.item label="着地点" name="LandingPoint"/>
-				<combo_box.item label="どこでも" name="Anywhere"/>
-			</combo_box>
-		</panel>
-		<panel label="メディア" name="land_media_panel">
-			<text name="with media:">
-				種類：
-			</text>
-			<combo_box name="media type" tool_tip="URL が動画、Web ページ、その他のメディアかを指定します"/>
-			<text name="at URL:">
-				ホームページ：
-			</text>
-			<button label="設定" name="set_media_url"/>
-			<text name="Description:">
-				説明：
-			</text>
-			<line_editor name="url_description" tool_tip="「再生」「ロード」ボタンの隣に表示されるテキストです"/>
-			<text name="Media texture:">
-				テクスチャ置き換え：
-			</text>
-			<texture_picker label="" left="120" name="media texture" tool_tip="写真をクリックして選択"/>
-			<text name="replace_texture_help" width="290">
-				このテクスチャを使用するオブジェクトの「再生」をクリックすると、動画や Web ページを表示します。  テクスチャを変更するにはサムネイルを選択してください。
-			</text>
-			<check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。 動作速度と画質が少し低下することがありますが、他のテクスチャのスケーリングや整列が必要になることはありません。"/>
-			<text name="media_size" tool_tip="レンダリングする Web メディアのサイズです。デフォルトの 0 のままにします。">
-				サイズ：
-			</text>
-			<spinner name="media_size_width" tool_tip="レンダリングする Web メディアのサイズです。デフォルトの 0 のままにします。"/>
-			<spinner name="media_size_height" tool_tip="レンダリングする Web メディアのサイズです。デフォルトの 0 のままにします。"/>
-			<text name="pixels">
-				ピクセル
-			</text>
-			<text name="Options:">
-				オプション：
-			</text>
-			<check_box label="ループ" name="media_loop" tool_tip="メディアをループ再生します。  メディアの再生が終わったら、最初から再生し直します。"/>
-		</panel>
-		<panel label="サウンド" name="land_audio_panel">
-			<text name="MusicURL:">
-				音楽 URL：
-			</text>
-			<text name="Sound:">
-				サウンド：
-			</text>
-			<check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local"/>
-			<text name="Avatar Sounds:">
-				アバターのサウンド：
-			</text>
-			<check_box label="全員" name="all av sound check"/>
-			<check_box label="グループ" name="group av sound check"/>
-			<text name="Voice settings:">
-				ボイス：
-			</text>
-			<check_box label="ボイスを有効にする" name="parcel_enable_voice_channel"/>
-			<check_box label="ボイスを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled"/>
-			<check_box label="ボイスをこの区画に限定する" name="parcel_enable_voice_channel_local"/>
-		</panel>
-		<panel label="アクセス" name="land_access_panel">
-			<panel.string name="access_estate_defined">
-				（エステートに限定）
-			</panel.string>
-			<panel.string name="estate_override">
-				1 つ以上のオプションが、不動産レベルで設定されています。
-			</panel.string>
-			<check_box label="誰でも訪問可（このオプションをオフにすると立入禁止ラインが作成されます）" name="public_access"/>
-			<check_box label="18 歳以上である必要があります [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-			<check_box label="支払情報が登録されている必要があります [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="支払情報が登録されていないと、この区画にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-			<check_box label="制約なしにグループ [GROUP] を許可する" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。"/>
-			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。"/>
-			<combo_box name="pass_combo">
-				<combo_box.item label="誰でも" name="Anyone"/>
-				<combo_box.item label="グループ" name="Group"/>
-			</combo_box>
-			<spinner label="価格（L$）：" name="PriceSpin"/>
-			<spinner label="アクセス時間：" name="HoursSpin"/>
-			<text name="OwnerLimited">
-				（不動産所有者がこのオプションに制約を与えている場合があります）
-			</text>
-			<panel name="Allowed_layout_panel">
-				<text label="常に許可" name="AllowedText">
-					常に許可する （[COUNT] 人、最大 [MAX] 人）
-				</text>
-				<name_list name="AccessList" tool_tip="(合計[LISTED] 人、最大 [MAX] 人）"/>
-				<button label="追加" name="add_allowed"/>
-				<button label="削除" label_selected="削除" name="remove_allowed"/>
-			</panel>
-			<panel name="Banned_layout_panel">
-				<text label="禁止" name="BanCheck">
-					禁止する （[COUNT] 人、最大 [MAX] 人）
-				</text>
-				<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人）">
-					<columns label="名前" name="name"/>
-					<columns label="期間" name="duration"/>
-				</name_list>
-				<button label="追加" name="add_banned"/>
-				<button label="削除" label_selected="削除" name="remove_banned"/>
-			</panel>
-		</panel>
-		<panel label="体験" name="land_experiences_panel"/>
-		<panel label="環境" name="land_environment_panel"/>
-	</tab_container>
-</floater>
+  <floater.string name="maturity_icon_general">"Parcel_PG_Dark"</floater.string>
+  <floater.string name="maturity_icon_moderate">"Parcel_M_Dark"</floater.string>
+  <floater.string name="maturity_icon_adult">"Parcel_R_Dark"</floater.string>
+  <floater.string name="Hours">[HOURS]時間</floater.string>
+  <floater.string name="Hour">時間</floater.string>
+  <floater.string name="Minutes">[MINUTES]分</floater.string>
+  <floater.string name="Minute">分</floater.string>
+  <floater.string name="Seconds">[SECONDS]秒</floater.string>
+  <floater.string name="Remaining">残り</floater.string>
+  <floater.string name="Always">常時</floater.string>
+  <tab_container name="landtab">
+    <panel label="一般" name="land_general_panel">
+      <panel.string name="new users only">新規住人専用</panel.string>
+      <panel.string name="anyone">誰でも</panel.string>
+      <panel.string name="area_text">面積：</panel.string>
+      <panel.string name="area_size_text">[AREA]㎡</panel.string>
+      <panel.string name="auction_id_text">オークションＩＤ：[ID]</panel.string>
+      <panel.string name="need_tier_to_modify">この土地を修正変更するには、購入を承認する必要があります。</panel.string>
+      <panel.string name="group_owned_text">（グループ所有）</panel.string>
+      <panel.string name="profile_text">プロフィール</panel.string>
+      <panel.string name="info_text">情報</panel.string>
+      <panel.string name="public_text">（公共）</panel.string>
+      <panel.string name="none_text">（なし）</panel.string>
+      <panel.string name="sale_pending_text">（購入審査中）</panel.string>
+      <panel.string name="no_selection_text">区画が選択されていません。</panel.string>
+      <panel.string name="time_stamp_template">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</panel.string>
+      <text name="Name:">名前：</text>
+      <line_editor name="Name" />
+      <text name="Description:">説明：</text>
+      <text name="LandType">種類：</text>
+      <text name="LandTypeText">メインランド／入植地</text>
+      <text name="ContentRating">区分：</text>
+      <text name="ContentRatingText">Adult</text>
+      <text name="Owner:">所有者：</text>
+      <text name="Group:">グループ：</text>
+      <button label="設定" label_selected="設定…" name="Set..." />
+      <check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。グループの土地割り当てによってサポートされます。" />
+      <button label="譲渡" label_selected="譲渡…" name="Deed..." tool_tip="選択したグループのオフィサーのみ、土地を譲渡できます。" />
+      <check_box label="所有者が譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。" />
+      <text name="For Sale:">販売の有無：</text>
+      <text name="Not for sale.">販売対象外</text>
+      <text name="For Sale: Price L$[PRICE].">価格：L$ [PRICE]（L$ [PRICE_PER_SQM]／㎡）</text>
+      <button label="土地を売る" label_selected="土地を販売…" name="Sell Land..." />
+      <text name="For sale to">販売先：[BUYER]</text>
+      <text name="Sell with landowners objects in parcel.">オブジェクトを一緒に販売</text>
+      <text name="Selling with no objects in parcel.">オブジェクトは販売しない</text>
+      <button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale" />
+      <text name="Claimed:">取得日時：</text>
+      <text name="DateClaimText">2006年8月15日火曜日13:47:25</text>
+      <text name="PriceLabel">面積：</text>
+      <text name="PriceText">4048m²</text>
+      <text name="Traffic:">トラフィック：</text>
+      <text name="DwellText">読み込んでいます…</text>
+      <button label="土地の購入" label_selected="土地を購入…" name="Buy Land..." />
+      <button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。" />
+      <button label="スクリプト情報…" name="Scripts..." />
+      <button label="グループに購入" label_selected="グループ用に購入…" name="Buy For Group..." />
+      <button label="入場許可を購入" label_selected="入場許可を購入…" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" />
+      <button label="土地の放棄" label_selected="土地を放棄…" name="Abandon Land..." />
+      <button label="土地を取り戻す" label_selected="土地の返還を要求…" name="Reclaim Land..." />
+    </panel>
+    <panel label="約款" name="land_covenant_panel">
+      <panel.string name="can_resell">このリージョン（地域）で購入した土地は、再販することができます。</panel.string>
+      <panel.string name="can_not_resell">このリージョン（地域）で購入した土地は、再販することができないことがあります。</panel.string>
+      <panel.string name="can_change">このリージョン（地域）で購入した土地は、結合や再分割することができます。</panel.string>
+      <panel.string name="can_not_change">このリージョン（地域）で購入した土地は、結合や再分割することができないことがあります。</panel.string>
+      <text font="SansSerifLarge" name="estate_section_lbl">不動産：</text>
+      <text name="estate_name_text">メインランド</text>
+      <text name="estate_owner_lbl">所有者：</text>
+      <text name="estate_owner_text">（なし）</text>
+      <text_editor name="covenant_editor">この不動産には約款がありません。</text_editor>
+      <text name="covenant_timestamp_text">最後更新：1969年12月31日水曜日　16：00：00</text>
+      <text font="SansSerifLarge" name="region_section_lbl">地域：</text>
+      <text name="region_name_text">EricaVille</text>
+      <text name="region_landtype_lbl">種類：</text>
+      <text name="region_landtype_text">メインランド／入植地</text>
+      <text name="region_maturity_lbl">区分：</text>
+      <text name="region_maturity_text">Adult</text>
+      <text name="resellable_lbl">再販：</text>
+      <text name="resellable_clause">このリージョン（地域）にある土地は再販できません。</text>
+      <text name="changeable_lbl">再分割：</text>
+      <text name="changeable_clause">このリージョン（地域）にある土地は統合または分割ができないことがあります。</text>
+    </panel>
+    <panel label="オブジェクト" name="land_objects_panel">
+      <panel.string name="objects_available_text">[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）</panel.string>
+      <panel.string name="objects_deleted_text">[MAX]個中[COUNT]個（[DELETED]個を削除しました）</panel.string>
+      <text name="parcel_object_bonus">オブジェクトボーナス：[BONUS]個</text>
+      <text name="Simulator primitive usage:">リージョン全体の最大プリム数：</text>
+      <text name="objects_available">[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）</text>
+      <text name="Primitives parcel supports:">区画で利用可能な最大プリム数：</text>
+      <text name="object_contrib_text">[COUNT]個</text>
+      <text name="Primitives on parcel:">区画で使用中のプリム数：</text>
+      <text name="total_objects_text">[COUNT]個</text>
+      <text name="Owned by parcel owner:">うち区画所有者のプリム数：</text>
+      <text name="owner_objects_text">[COUNT]個</text>
+      <button label="表示" label_selected="表示" name="ShowOwner" />
+      <button label="返却" label_selected="返却…" name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します" />
+      <text name="Set to group:">グループに設定：</text>
+      <text name="group_objects_text">[COUNT]</text>
+      <button label="表示" label_selected="表示" name="ShowGroup" />
+      <button label="返却" label_selected="返却…" name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します" />
+      <text name="Owned by others:">他人の所有物：</text>
+      <text name="other_objects_text">[COUNT]個</text>
+      <button label="表示" label_selected="表示" name="ShowOther" />
+      <button label="返却" label_selected="返却…" name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します" />
+      <text name="Selected / sat upon:">選択済み／決定済み：</text>
+      <text name="selected_objects_text">[COUNT]個</text>
+      <text name="Autoreturn">他者のオブジェクトの自動返却（分単位、０で自動返却なし）：</text>
+      <line_editor name="clean other time" />
+      <text name="Object Owners:">オブジェクトの所有者：</text>
+      <button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します" />
+      <button label="オブジェクトを返却する" label_selected="オブジェクトの返却…" name="Return objects..." />
+      <name_list label="カウント" name="owner list">
+        <name_list.columns label="タイプ" name="type" />
+        <name_list.columns name="online_status" />
+        <name_list.columns label="名前" name="name" />
+        <name_list.columns label="数" name="count" />
+        <name_list.columns label="最新" name="mostrecent" />
+      </name_list>
+    </panel>
+    <panel label="オプション" name="land_options_panel">
+      <panel.string name="search_enabled_tooltip">この区画を検索結果に表示する</panel.string>
+      <panel.string name="search_disabled_small_tooltip">区画面積が１２８㎡未満のため、このオプションは無効です。
+大きな区画のみ検索に表示させることが可能です。</panel.string>
+      <panel.string name="search_disabled_permissions_tooltip">あなたはこの区画の設定編集ができないため、このオプションは無効です。</panel.string>
+      <panel.string name="mature_check_mature">「Moderate」コンテンツ</panel.string>
+      <panel.string name="mature_check_adult">「Adult」コンテンツ</panel.string>
+      <panel.string name="mature_check_mature_tooltip">あなたの区画情報及びコンテンツは「Moderate」とされています。</panel.string>
+      <panel.string name="mature_check_adult_tooltip">あなたの区画情報及びコンテンツは「Adult」とされています。</panel.string>
+      <panel.string name="landing_point_none">（なし）</panel.string>
+      <panel.string name="push_restrict_text">プッシュ禁止</panel.string>
+      <panel.string name="push_restrict_region_text">プッシュ禁止 （リージョン設定優先）</panel.string>
+      <text name="allow_label">他の住人への許可：</text>
+      <text name="allow_label0">飛行：</text>
+      <check_box label="全員" name="check fly" tool_tip="チェックを入れると、この土地での飛行が可能となります。このチェックを外すと、土地に入る時や通過する時のみ飛行可能となります。" />
+      <text name="allow_label2">制作：</text>
+      <check_box label="全員" name="edit objects check" tool_tip="このオプションを選択すると、住人があなたの土地でオブジェクトの制作や、rezすることができるようになります。" />
+      <check_box label="グループ" name="edit group objects check" tool_tip="このオプションを選択すると、区画のグループメンバーが、あなたの土地でオブジェクトの制作やrezができるようになります。" />
+      <text name="allow_label3">オブジェクトの進入：</text>
+      <check_box label="全員" name="all object entry check" tool_tip="このオプションを選択すると、住人が他の区画にあるオブジェクトをこの区画へ移動することができるようになります。" />
+      <check_box label="グループ" name="group object entry check" tool_tip="このオプションを選択すると、区画のグループメンバーが、他の区画にあるオブジェクトからこの区画へ移動することができるようになります。" />
+      <text name="allow_label4">スクリプトの実行：</text>
+      <check_box label="全員" name="check other scripts" tool_tip="このオプションを選択すると、住人が装着物などのスクリプトの実行をあなたの区画でえるようになります。" />
+      <check_box label="グループ" name="check group scripts" tool_tip="このオプションを選択すると、区画のグループメンバーは、装着物などのスクリプトの実行をあなたの区画で行えるようになります。" />
+      <check_box label="安全（ダメージなし）" name="check safe" tool_tip="このチェックを入れると、この土地での戦闘行為が無効になり、「安全」に設定されます。チェックを外すと戦闘行為が有効になります。" />
+      <check_box label="プッシュ禁止" name="PushRestrictCheck" tool_tip="スクリプトによるプッシュを禁止します。このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。" />
+      <check_box label="検索に区画を表示（週L$ 30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します。" />
+      <combo_box name="land category">
+        <combo_box.item label="全カテゴリ" name="item0" />
+        <combo_box.item label="Linden所在地" name="item1" />
+        <combo_box.item label="芸術と文化" name="item3" />
+        <combo_box.item label="ビジネス" name="item4" />
+        <combo_box.item label="教育的" name="item5" />
+        <combo_box.item label="ゲーム" name="item6" />
+        <combo_box.item label="たまり場" name="item7" />
+        <combo_box.item label="新住民歓迎" name="item8" />
+        <combo_box.item label="公園と自然" name="item9" />
+        <combo_box.item label="住宅用" name="item10" />
+        <combo_box.item label="ショッピング" name="item11" />
+        <combo_box.item label="レンタル" name="item13" />
+        <combo_box.item label="その他" name="item12" />
+      </combo_box>
+      <check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip="" />
+      <text name="Snapshot:">スナップショット：</text>
+      <texture_picker label="" name="snapshot_ctrl" tool_tip="画像をクリックして選択" />
+      <text name="allow_see_label">別の区画にいるアバターが、この区画にいるアバターとチャットできるようになります。</text>
+      <check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="別の区画のアバターが、この区画にいるアバターとチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。" />
+      <text name="landing_point">ランディング地点：[LANDING]</text>
+      <button label="設定" label_selected="設定" name="Set" tool_tip="訪問者が最初に訪れる場所の設定を行います。この区画内に立って行ってください。" />
+      <button label="クリア" label_selected="クリア" name="Clear" tool_tip="ランディング地点をクリアする。" />
+      <text name="Teleport Routing: ">テレポート経路：</text>
+      <combo_box name="landing type" tool_tip="テレポート経路－あなたの土地へのテレポート経路を選択してください。">
+        <combo_box.item label="不可" name="Blocked" />
+        <combo_box.item label="ランディング地点のみ" name="LandingPoint" />
+        <combo_box.item label="どこでも可能" name="Anywhere" />
+      </combo_box>
+    </panel>
+    <panel label="メディア" name="land_media_panel">
+      <text name="with media:">種類：</text>
+      <combo_box name="media type" tool_tip="動画や、Webページ、その他のメディアのＵＲＬを指定します。" />
+      <text name="at URL:">ホームページ：</text>
+      <button label="設定" name="set_media_url" />
+      <text name="Description:">説明：</text>
+      <line_editor name="url_description" tool_tip="「再生」「読み込み」ボタンの隣に表示されるテキストです。" />
+      <text name="Media texture:">テクスチャの差し替え：</text>
+      <texture_picker label="" name="media texture" tool_tip="画像をクリックして選択" />
+      <text name="replace_texture_help">このテクスチャを使用するオブジェクトの「再生」をクリックすると、動画やWebページを表示します。テクスチャを変更するにはサムネイルを選択してください。</text>
+      <check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。動作速度と画質が少し低下することがありますが、他のテクスチャのスケーリングや整列が必要になることはありません。" />
+      <text name="media_size" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。">サイズ：</text>
+      <spinner name="media_size_width" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。" />
+      <spinner name="media_size_height" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。" />
+      <text name="pixels">ピクセル</text>
+      <text name="Options:">オプション：</text>
+      <check_box label="ループ" name="media_loop" tool_tip="メディアをループ再生します。メディアの再生が終わったら、最初から再生し直します。" />
+    </panel>
+    <panel label="サウンド" name="land_audio_panel">
+      <text name="MusicURL:">音楽ＵＲＬ：</text>
+      <text name="Sound:">サウンド：</text>
+      <check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local" />
+      <text name="Avatar Sounds:">アバターのサウンド：</text>
+      <check_box label="全員" name="all av sound check" />
+      <check_box label="グループ" name="group av sound check" />
+      <text name="Voice settings:">ボイス：</text>
+      <check_box label="ボイスチャットを有効にする" name="parcel_enable_voice_channel" />
+      <check_box label="ボイスチャットを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled" />
+      <check_box label="ボイスチャットをこの区画内に限定する" name="parcel_enable_voice_channel_local" />
+    </panel>
+    <panel label="アクセス" name="land_access_panel">
+      <panel.string name="access_estate_defined">（不動産に限定）</panel.string>
+      <panel.string name="estate_override">１つ以上のオプションが、不動産レベルで設定されています。</panel.string>
+      <check_box label="誰でも訪問可（このオプションをオフにすると立入禁止ラインが作成されます）" name="public_access" />
+      <check_box label="１８歳以上である必要があります。[ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、１８歳以上でなければなりません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。" />
+      <check_box label="支払情報が登録されている必要があります。[ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="アカウントに支払情報が登録されていない場合、この区画にアクセスすることはできません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。" />
+      <check_box label="制約なしにグループ[GROUP]を許可する。" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。" />
+      <check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。" />
+      <combo_box name="pass_combo">
+        <combo_box.item label="誰でも" name="Anyone" />
+        <combo_box.item label="グループ" name="Group" />
+      </combo_box>
+      <spinner label="価格（L$）：" name="PriceSpin" />
+      <spinner label="アクセス時間：" name="HoursSpin" />
+      <text name="OwnerLimited">（不動産所有者が、このオプションに制約を与えている場合があります）</text>
+      <panel name="Allowed_layout_panel">
+        <text label="常に許可" name="AllowedText">常に許可する人（[COUNT]人、最大[MAX]人）</text>
+        <name_list name="AccessList" tool_tip="（合計[LISTED]人、最大[MAX]人）" />
+        <button label="追加" name="add_allowed" />
+        <button label="削除" label_selected="削除" name="remove_allowed" />
+      </panel>
+      <panel name="Banned_layout_panel">
+        <text label="バン" name="BanCheck">バンした人（[COUNT]人、最大[MAX]人）</text>
+        <name_list name="BannedList" tool_tip="（合計[LISTED]人、最大[MAX]人）">
+          <columns label="名前" name="name" />
+          <columns label="期間" name="duration" />
+        </name_list>
+        <button label="追加" name="add_banned" />
+        <button label="削除" label_selected="削除" name="remove_banned" />
+      </panel>
+    </panel>
+    <panel label="体験" name="land_experiences_panel" />
+    <panel label="環境" name="land_environment_panel" />
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
index 1c743e1fd2..ea959d9de3 100644
--- a/indra/newview/skins/default/xui/ja/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_activeim" title="アクティブな IM"/>
+<floater name="floater_activeim" title="有効なＩＭ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
new file mode 100644
index 0000000000..fee738726d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_add_payment_method">
+  <floater.string name="continue_url">https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1</floater.string>
+  <panel label="wrapper_panel" name="wrapper_panel">
+    <text name="title_txt">支払い方法を追加してリンデンドルを購入し、Second Lifeをもっと楽しみましょう。</text>
+    <button label="始めましょう" name="continue_btn" />
+    <button label="後で" name="close_btn"/>
+    <text name="image_left_desc">お気に入りのアバターを作成します。店舗やSecond Life Marketplaceにある何百万ものアイテムから選択できます。あなたのスタイルがここにあります。</text>
+    <text name="image_center_desc">お気に入りのパフォーマーやホストに寄付してください。あなたのサポートは、彼らが素晴らしい体験を生み出すのに役立ちます。</text>
+    <text name="image_right_desc">あなたの夢の家を作ります。何百万ものアイテムを購入できるので、あなただけの住まいを作ることができます。</text>
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
index 6736dad336..9046dbf8be 100644
--- a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
@@ -1,24 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="env_adjust_snapshot" title="個人的な照明">
-	<layout_stack name="outer_stack">
-		<layout_panel name="env_controls">
-			<layout_stack name="settings_stack">
-				<layout_panel>
-					<button label="リセット" name="btn_reset" tool_tip="閉じて共有された環境にリセットする"/>
-					<text name="cloud_map_label">
-						雲の画像：
-					</text>
-				</layout_panel>
-				<layout_panel>
-					<text name="label">
-						太陽：
-					</text>
-					<check_box label="ビーコンを表示" name="sunbeacon"/>
-				</layout_panel>
-				<layout_panel>
-					<check_box label="ビーコンを表示" name="moonbeacon"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
+<floater name="env_adjust_snapshot" title="個人的な光源">
+  <!-- TODO: 翻訳不能 -->
+  <layout_stack name="outer_stack">
+    <!-- If I put in a timeline it would go here -->
+    <layout_panel name="env_controls">
+      <layout_stack name="settings_stack">
+        <layout_panel>
+          <text>周辺：</text>
+          <color_swatch name="ambient_light" />
+          <text>青のホライズン：</text>
+          <color_swatch name="blue_horizon" />
+          <text>青の濃度：</text>
+          <color_swatch name="blue_density" />
+          <button label="リセット" tool_tip="閉じて共有された環境にリセットします。" name="btn_reset" />
+          <text>太陽の色：</text>
+          <color_swatch name="sun_color" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="80">雲の色：:</text>
+          <color_swatch name="cloud_color" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="10" name="cloud_map_label" width="80">雲の画像：:</text>
+          <texture_picker height="63" layout="topleft" left_delta="0" name="cloud_map" top_pad="5" width="60" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="-13" name="cloud_map_label" width="80">水の画像：</text>
+          <texture_picker height="63" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="60" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" visible="true" width="200" height="150">
+          <text follows="left|top" height="10" layout="topleft" left_delta="5" top_pad="5" width="80">靄のホライズン：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="80">靄の濃度：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">雲の量：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1" name="cloud_coverage" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">雲のスケール：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.01" max_val="3" name="cloud_scale" top_pad="5" width="185" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="15" width="80">シーンのガンマ値：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_pad="5" width="185" can_edit_text="true" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="310" min_height="0" visible="true">
+          <text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">太陽：</text>
+          <sun_moon_trackball name="sun_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="sun" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">方位角：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="sun_azimuth" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">標高：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="sun_elevation" top_pad="5" width="130" can_edit_text="true" />
+          <check_box control_name="sunbeacon" width="60" height="16" label="ビーコンを表示" layout="topleft" name="sunbeacon" left_delta="-5" top_pad="8" follows="left|top" />
+          <text follows="left|top" height="10" layout="topleft" left_pad="95" top="25" width="80">
+            スケール：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.25" max_val="20" name="sun_scale" top_delta="15" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="100">フォーカスの発光量：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-2" max_val="2" name="glow_focus" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">グローサイズ：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1.99" name="glow_size" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="10" width="200">星の輝度：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="500" name="star_brightness" top_pad="5" width="130" can_edit_text="true" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="160" min_height="0" visible="true">
+          <text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">月：</text>
+          <sun_moon_trackball name="moon_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="moon" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">方位角：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="moon_azimuth" top_pad="5" width="130" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">標高：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="moon_elevation" top_pad="5" width="130" can_edit_text="true" />
+          <check_box control_name="moonbeacon" label="ビーコンを表示" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
index 2bada303ae..78bac0a555 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Anim Preview" title="ANIMATION.ANIM">
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<button label="アップロード（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-</floater>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <button label="アップロード（L$ [AMOUNT]）" name="ok_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
index 20c7298462..207d016bf6 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
@@ -1,186 +1,100 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		動きを初期化できませんでした
-	</floater.string>
-	<floater.string name="anim_too_long">
-		アニメーションファイルの長さは [LENGTH] 秒です。
-
-アニメーションの最大長は [MAX_LENGTH] 秒です。
-	</floater.string>
-	<floater.string name="failed_file_read">
-		アニメーションファイルを読み取れません。
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		ファイルの終端が不完全です。
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		制約定義を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		HIERARCHY ヘッダーが無効です。
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		ROOT または JOINT が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		JOINT 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		OFFSET が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		CHANNELS が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		回転順序を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		回転軸を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		MOTION が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		フレーム数を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		フレーム時間を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		位置の値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		回転値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		変換ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		変換ヘッダーを読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		変換名を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		変換無視値を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		変換相対値を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		変換 outname 値を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		変換行列を読み取れません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Mergechild 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Mergeparent 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		priority 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		loop 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		easeln 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		easeOut 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Hand morph 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		emote 名を読みとれません。
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		ルートジョイント名が不正です。「hip」を使用してください。
-	</floater.string>
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<spinner label="優先度" name="priority" tool_tip="このアニメーションでどのアニメーションを上書きできるかを決めます"/>
-	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生にします"/>
-	<spinner label="イン（％）" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します"/>
-	<spinner label="アウト（％）" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します"/>
-	<text name="hand_label">
-		手のポーズ
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
-		<combo_box.item label="広げる" name="Spread"/>
-		<combo_box.item label="リラックス" name="Relaxed"/>
-		<combo_box.item label="指を指す・両手" name="PointBoth"/>
-		<combo_box.item label="拳" name="Fist"/>
-		<combo_box.item label="リラックス・左" name="RelaxedLeft"/>
-		<combo_box.item label="指を指す・左" name="PointLeft"/>
-		<combo_box.item label="拳を上げる・左" name="FistLeft"/>
-		<combo_box.item label="リラックス・右" name="RelaxedRight"/>
-		<combo_box.item label="指を指す・右" name="PointRight"/>
-		<combo_box.item label="拳を上げる・右" name="FistRight"/>
-		<combo_box.item label="敬礼・右" name="SaluteRight"/>
-		<combo_box.item label="タイピング" name="Typing"/>
-		<combo_box.item label="ピース・右" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		表情
-	</text>
-	<combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
-		<item label="（なし）" name="[None]"/>
-		<item label="アーーーーー" name="Aaaaah"/>
-		<item label="恐れる" name="Afraid"/>
-		<item label="怒る" name="Angry"/>
-		<item label="満面の笑み" name="BigSmile"/>
-		<item label="退屈" name="Bored"/>
-		<item label="泣く" name="Cry"/>
-		<item label="軽蔑" name="Disdain"/>
-		<item label="恥ずかしがる" name="Embarrassed"/>
-		<item label="しかめっ面" name="Frown"/>
-		<item label="キス" name="Kiss"/>
-		<item label="笑う" name="Laugh"/>
-		<item label="むかつく" name="Plllppt"/>
-		<item label="嫌悪感" name="Repulsed"/>
-		<item label="悲しい" name="Sad"/>
-		<item label="肩をすくめる" name="Shrug"/>
-		<item label="微笑む" name="Smile"/>
-		<item label="驚く" name="Surprise"/>
-		<item label="ウィンク" name="Wink"/>
-		<item label="心配する" name="Worry"/>
-	</combo_box>
-	<text name="preview_label">
-		プレビュー中の動作
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。">
-		<item label="立つ" name="Standing"/>
-		<item label="歩く" name="Walking"/>
-		<item label="座る" name="Sitting"/>
-		<item label="飛ぶ" name="Flying"/>
-	</combo_box>
-	<spinner label="イーズイン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
-	<spinner label="イーズアウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
-	<button name="play_btn" tool_tip="アニメーションを再生する"/>
-	<button name="pause_btn" tool_tip="アニメーションを一時停止する"/>
-	<button name="stop_btn" tool_tip="アニメーションの再生を停止する"/>
-	<text name="bad_animation_text">
-		アニメーションファイルを読み取れません。
-
-Poser 4 からエクスポートした BVH ファイルをお勧めします。
-	</text>
-	<button label="アップロード（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <floater.string name="failed_to_initialize"> 動きを初期化できませんでした </floater.string>
+  <floater.string name="anim_too_long">このアニメーションファイルの長さは[LENGTH]秒です。
+アニメーションの最大長は[MAX_LENGTH]秒です。</floater.string>
+  <floater.string name="failed_file_read">アニメーションファイルを読み取れません。
+[STATUS]</floater.string>
+  <floater.string name="E_ST_OK">Ok </floater.string>
+  <floater.string name="E_ST_EOF">ファイルの終端が不完全です。</floater.string>
+  <floater.string name="E_ST_NO_CONSTRAINT">制約定義を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_FILE">BVHファイルを開けません。</floater.string>
+  <floater.string name="E_ST_NO_HIER">HIERARCHYヘッダーが無効です。</floater.string>
+  <floater.string name="E_ST_NO_JOINT">ROOTまたはJOINTが見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_NAME">JOINT名を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_OFFSET">OFFSETが見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_CHANNELS">CHANNELSが見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_ROTATION">回転順序を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_AXIS">回転軸を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_MOTION">MOTION が見つかりません。</floater.string>
+  <floater.string name="E_ST_NO_FRAMES">フレーム数を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_FRAME_TIME">フレーム時間を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_POS">位置の値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_ROT">回転値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_FILE">変換ファイルを開けません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_HEADER">変換ヘッダーを読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_NAME">変換名を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_IGNORE">変換無視値を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_RELATIVE">変換相対値を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_OUTNAME">変換outname値を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_MATRIX">変換行列を読み取れません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_MERGECHILD">Mergechild名を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_MERGEPARENT">Mergeparent名を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_PRIORITY">priority値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_LOOP">loop値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_EASEIN">easeln値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_EASEOUT">easeOut値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_HAND">Hand morph値を取得できません。</floater.string>
+  <floater.string name="E_ST_NO_XLT_EMOTE">emote名を読みとれません。</floater.string>
+  <floater.string name="E_ST_BAD_ROOT">ルートジョイント名が不正です。「hip」を使用してください。</floater.string>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <spinner label="優先度" name="priority" tool_tip="このアニメーションでどのアニメーションを上書きできるかを決めます" />
+  <check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生にします" />
+  <spinner label="イン（％）" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" />
+  <spinner label="アウト（％）" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" />
+  <text name="hand_label">手のポーズ</text>
+  <combo_box name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
+    <combo_box.item label="広げる" name="Spread" />
+    <combo_box.item label="リラックス" name="Relaxed" />
+    <combo_box.item label="指を指す・両手" name="PointBoth" />
+    <combo_box.item label="拳" name="Fist" />
+    <combo_box.item label="リラックス・左" name="RelaxedLeft" />
+    <combo_box.item label="指を指す・左" name="PointLeft" />
+    <combo_box.item label="拳を上げる・左" name="FistLeft" />
+    <combo_box.item label="リラックス・右" name="RelaxedRight" />
+    <combo_box.item label="指を指す・右" name="PointRight" />
+    <combo_box.item label="拳を上げる・右" name="FistRight" />
+    <combo_box.item label="敬礼・右" name="SaluteRight" />
+    <combo_box.item label="タイピング" name="Typing" />
+    <combo_box.item label="ピース・右" name="PeaceRight" />
+  </combo_box>
+  <text name="emote_label">表情</text>
+  <combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
+    <item label="（なし）" name="[None]" />
+    <item label="アーーーーー" name="Aaaaah" />
+    <item label="恐れる" name="Afraid" />
+    <item label="怒る" name="Angry" />
+    <item label="満面の笑み" name="BigSmile" />
+    <item label="退屈" name="Bored" />
+    <item label="泣く" name="Cry" />
+    <item label="軽蔑" name="Disdain" />
+    <item label="恥ずかしがる" name="Embarrassed" />
+    <item label="しかめっ面" name="Frown" />
+    <item label="キス" name="Kiss" />
+    <item label="笑う" name="Laugh" />
+    <item label="むかつく" name="Plllppt" />
+    <item label="嫌悪感" name="Repulsed" />
+    <item label="悲しい" name="Sad" />
+    <item label="肩をすくめる" name="Shrug" />
+    <item label="微笑む" name="Smile" />
+    <item label="驚く" name="Surprise" />
+    <item label="ウィンク" name="Wink" />
+    <item label="心配する" name="Worry" />
+  </combo_box>
+  <text name="preview_label">プレビュー中の動作</text>
+  <combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。">
+    <item label="立つ" name="Standing" />
+    <item label="歩く" name="Walking" />
+    <item label="座る" name="Sitting" />
+    <item label="飛ぶ" name="Flying" />
+  </combo_box>
+  <spinner label="イーズ・イン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）" />
+  <spinner label="イーズ・アウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）" />
+  <button name="play_btn" tool_tip="アニメーションを再生する。" />
+  <button name="pause_btn" tool_tip="アニメーションを一時停止する。" />
+  <button name="stop_btn" tool_tip="アニメーションの再生を停止する。" />
+  <text name="bad_animation_text"> アニメーションファイルを読み取れません。Poser 4からエクスポートしたBVHファイルをお勧めします。</text>
+  <button label="アップロード（L$ [AMOUNT]）" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_associate_listing.xml b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
index b106750a6f..3f5c0237e3 100644
--- a/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="associate listing" title="リストを関連付ける">
-	<text name="message">リスト ID:</text>
-	<line_editor name="listing_id">ここに ID を入力</line_editor>
-	<button label="OK" name="OK"/>
-	<button label="取り消し" name="Cancel"/>
-</floater>
+<floater name="associate listing" title="一覧の関連付け">
+  <text name="message">一覧ＩＤ：</text>
+  <line_editor name="listing_id">ここにＩＤを入力</line_editor>
+  <button label="ＯＫ" name="OK" />
+  <button label="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
index 21c8d90b01..418e43e2cb 100644
--- a/indra/newview/skins/default/xui/ja/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ja/floater_auction.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_auction" title="リンデンランドの販売開始">
-	<floater.string name="already for sale">
-		販売中の区画をオークションに出品することはできません。
-	</floater.string>
-	<check_box initial_value="true" label="黄色のセレクションフェンスを含める" name="fence_check"/>
-	<button label="スナップショット" label_selected="スナップショット" name="snapshot_btn"/>
-	<button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn"/>
-	<button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn"/>
-	<button label="オークション開始" label_selected="オークション開始" name="start_auction_btn"/>
-</floater>
+  <floater.string name="already for sale">販売中の区画をオークションに出品することはできません。</floater.string>
+  <check_box initial_value="true" label="黄色のセレクションフェンスを含める" name="fence_check" />
+  <button label="スナップショット" label_selected="スナップショット" name="snapshot_btn" />
+  <button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn" />
+  <button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn" />
+  <button label="オークション開始" label_selected="オークション開始" name="start_auction_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
index cf75fa3372..46e2e3e631 100644
--- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -1,38 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="autoreplace_floater" title="自動置換設定">
-	<check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます"/>
-	<button label="リストをインポート..." name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。"/>
-	<button label="リストをエクスポート..." name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。"/>
-	<button label="新規リスト..." name="autoreplace_new_list" tool_tip="新規リストを作成します。"/>
-	<button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。"/>
-	<button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。"/>
-	<button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。"/>
-	<scroll_list name="autoreplace_list_replacements">
-		<scroll_list.columns label="キーワード" name="keyword"/>
-		<scroll_list.columns label="置換" name="replacement"/>
-	</scroll_list>
-	<button label="追加..." name="autoreplace_add_entry"/>
-	<button label="削除" name="autoreplace_delete_entry"/>
-	<text name="autoreplace_keyword_txt">
-		キーワード：
-	</text>
-	<text name="autoreplace_replacement_txt">
-		置換：
-	</text>
-	<button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。"/>
-	<button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。"/>
-	<button label="取り消し" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。"/>
+  <check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます" />
+  <button label="リストをインポート…" name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。" />
+  <button label="リストをエクスポート…" name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。" />
+  <button label="新規リスト…" name="autoreplace_new_list" tool_tip="新規リストを作成します。" />
+  <button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。" />
+  <button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。" />
+  <button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。" />
+  <scroll_list name="autoreplace_list_replacements">
+    <scroll_list.columns label="キーワード" name="keyword" />
+    <scroll_list.columns label="置換" name="replacement" />
+  </scroll_list>
+  <button label="追加…" name="autoreplace_add_entry" />
+  <button label="削除" name="autoreplace_delete_entry" />
+  <text name="autoreplace_keyword_txt">キーワード：</text>
+  <text name="autoreplace_replacement_txt">置換：</text>
+  <button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。" />
+  <button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。" />
+  <button label="キャンセル" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。" />
 </floater>
 <!--
-  <text 
-   top_pad="10"
-   left="10"
-   height="16"
-   width="260"
-   follows="left|top"
-   halign="center"
-   mouse_opaque="true"
-   name="autoreplace_text2">
-    Entries
-  </text>
--->
+  <text top_ name="autoreplace_text2">エントリ</text>
+-->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml
index d289580506..167a9b1fb4 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Avatar" title="アバターを選択"/>
+<floater name="Avatar" title="アバター選択" />
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index da2c9d1e58..ada91aa554 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
@@ -1,57 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="275" name="avatarpicker" title="住人を選択" width="275">
-	<floater.string name="not_found">
-		「[TEXT]」は見つかりませんでした
-	</floater.string>
-	<floater.string name="not_found_text">
-		住人が見つかりませんでした。
-	</floater.string>
-	<floater.string name="no_one_near">
-		近くに誰もいません
-	</floater.string>
-	<floater.string name="no_results">
-		検索結果：ゼロ
-	</floater.string>
-	<floater.string name="searching">
-		検索中...
-	</floater.string>
-	<string label="OK" label_selected="OK" name="Select">
-		選択
-	</string>
-	<string name="Close">
-		閉じる
-	</string>
-	<tab_container name="ResidentChooserTabs" width="265">
-		<panel label="検索" name="SearchPanel" width="145">
-			<text name="InstructSearchResidentName">
-				名前の一部を入力：
-			</text>
-			<button label="検索" label_selected="検索" name="Find"/>
-			<scroll_list name="SearchResults">
-				<columns label="名前" name="name"/>
-				<columns label="ユーザー名" name="username"/>
-			</scroll_list>
-		</panel>
-		<panel label="フレンド" name="FriendsPanel">
-			<text name="InstructSelectFriend">
-				アバターを選択：
-			</text>
-		</panel>
-		<panel label="自分の近く" name="NearMePanel" width="145">
-			<text name="InstructSelectResident">
-				近くの人を選択：
-			</text>
-			<slider label="範囲" name="near_me_range"/>
-			<text name="meters" width="50">
-				メートル
-			</text>
-			<button label="リスト更新" label_selected="リスト更新" name="Refresh"/>
-			<scroll_list name="NearMe">
-				<columns label="名前" name="name"/>
-				<columns label="ユーザー名" name="username"/>
-			</scroll_list>
-		</panel>
-	</tab_container>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
-</floater>
+<floater name="avatarpicker" title="住人を選択">
+  <floater.string name="not_found">「[TEXT]」は見つかりませんでした</floater.string>
+  <floater.string name="not_found_text">住人が見つかりませんでした。</floater.string>
+  <floater.string name="no_one_near">近くに誰もいません</floater.string>
+  <floater.string name="no_results">検索結果：なし</floater.string>
+  <floater.string name="searching">検索しています…</floater.string>
+  <!-- For multiple person selection, use "Select" and "Close" 
+    instead of "OK" and "Cancel" because "Cancel" still keeps the ones 
+    you have already selected.  The code will show the appropriate
+    set of buttons. -->
+  <string label="ＯＫ" label_selected="ＯＫ" name="Select">選択</string>
+  <string name="Close">閉じる</string>
+  <tab_container name="ResidentChooserTabs">
+    <panel label="検索" name="SearchPanel">
+      <text name="InstructSearchResidentName">名前の一部を入力：</text>
+      <line_editor name="Edit" />
+      <button label="実行" label_selected="実行" name="Find" />
+      <scroll_list name="SearchResults">
+        <columns label="名前" name="name" />
+        <columns label="ユーザ名" name="username" />
+      </scroll_list>
+    </panel>
+    <panel label="フレンド" name="FriendsPanel">
+      <text name="InstructSelectFriend">人物を選択</text>
+      <button name="RefreshFriends" />
+      <scroll_list name="Friends" />
+    </panel>
+
+    <panel label="近くにいる人" name="NearMePanel">
+      <text name="InstructSelectResident">近くにいる人を選択：</text>
+      <slider label="範囲" name="near_me_range" />
+      <text name="meters">メートル</text>
+      <button name="Refresh" />
+      <scroll_list name="NearMe">
+        <columns label="名前" name="name" />
+        <columns label="ユーザ名" name="username" />
+      </scroll_list>
+    </panel>
+  </tab_container>
+  <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
index 0d16510c92..e51bd0e935 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_avatar_render_settings" title="アバターの描画設定">
-	<string name="av_never_render" value="使用しない"/>
-	<string name="av_always_render" value="常に使用する"/>
-	<filter_editor label="人をフィルター" name="people_filter_input"/>
-	<menu_button name="plus_btn" tool_tip="選択した人に対するアクション:"/>
-	<name_list name="render_settings_list">
-		<name_list.columns label="名前" name="name"/>
-		<name_list.columns label="描画設定" name="setting"/>
-		<name_list.columns label="日付を追加" name="timestamp"/>
-	</name_list>
-</floater>
+  <string name="av_never_render" value="使用しない" />
+  <string name="av_always_render" value="常に使用する" />
+  <filter_editor label="人物をフィルタ" name="people_filter_input" />
+  <menu_button name="plus_btn" tool_tip="選択した人に対するアクション：" />
+  <name_list name="render_settings_list">
+    <name_list.columns label="名前" name="name" />
+    <name_list.columns label="描画設定" name="setting" />
+    <name_list.columns label="日付を追加" name="timestamp" />
+  </name_list>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index 19b3be60b1..8d1399f3b3 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -1,60 +1,64 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="アバターのテクスチャ">
-	<floater.string name="InvalidAvatar">無効なアバター</floater.string>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<text name="label">ベークド
+  <floater.string name="InvalidAvatar">無効なアバター</floater.string>
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <text name="label">ベークド
 テクスチャ</text>
-			<text name="composite_label">合成
-テクスチャ</text>
-			<button label="ID をコンソールにダンプ" label_selected="ダンプ" name="Dump"/>
-			<panel name="scroll_content_panel">
-				<texture_picker label="髪" name="hair-baked"/>
-				<texture_picker label="髪" name="hair_grain"/>
-				<texture_picker label="髪のアルファ" name="hair_alpha"/>
-				<texture_picker label="頭" name="head-baked"/>
-				<texture_picker label="メイクアップ" name="head_bodypaint"/>
-				<texture_picker label="頭部のアルファ" name="head_alpha"/>
-				<texture_picker label="頭部のタトゥー" name="head_tattoo"/>
-				<texture_picker label="目" name="eyes-baked"/>
-				<texture_picker label="目" name="eyes_iris"/>
-				<texture_picker label="目のアルファ" name="eyes_alpha"/>
-				<texture_picker label="上半身" name="upper-baked"/>
-				<texture_picker label="ボディペイント（上）" name="upper_bodypaint"/>
-				<texture_picker label="下着シャツ" name="upper_undershirt"/>
-				<texture_picker label="手袋" name="upper_gloves"/>
-				<texture_picker label="シャツ" name="upper_shirt"/>
-				<texture_picker label="上着" name="upper_jacket"/>
-				<texture_picker label="アルファ（上）" name="upper_alpha"/>
-				<texture_picker label="上部のタトゥー" name="upper_tattoo"/>
-				<texture_picker label="下半身" name="lower-baked"/>
-				<texture_picker label="ボディペイント（下）" name="lower_bodypaint"/>
-				<texture_picker label="下着パンツ" name="lower_underpants"/>
-				<texture_picker label="靴下" name="lower_socks"/>
-				<texture_picker label="靴" name="lower_shoes"/>
-				<texture_picker label="パンツ" name="lower_pants"/>
-				<texture_picker label="ジャケット" name="lower_jacket"/>
-				<texture_picker label="アルファ（下）" name="lower_alpha"/>
-				<texture_picker label="下部のタトゥー" name="lower_tattoo"/>
-				<texture_picker label="スカート" name="skirt-baked"/>
-				<texture_picker label="スカート" name="skirt"/>
-			</panel>
-		</panel>
-		<texture_picker name="upper_universal_tattoo" label="上腕 タトゥー"/>
-		<texture_picker name="aux1_tattoo" label="予備 1 タトゥー"/>
-		<texture_picker name="leftarm-baked" label="左腕"/>
-		<texture_picker name="aux1-baked" label="予備 1"/>
-		<texture_picker name="skirt_tattoo" label="スカートタトゥー"/>
-		<texture_picker name="aux2_tattoo" label="予備 2 タトゥー"/>
-		<texture_picker name="eyes_tattoo" label="アイタトゥー"/>
-		<texture_picker name="head_universal_tattoo" label="頭 Unv タトゥー"/>
-		<texture_picker name="leftleg_tattoo" label="左脚タトゥー"/>
-		<texture_picker name="aux3-baked" label="予備 3"/>
-		<texture_picker name="hair_tattoo" label="ヘアータトゥー"/>
-		<texture_picker name="leftleg-baked" label="左脚"/>
-		<texture_picker name="aux2-baked" label="予備 2"/>
-		<texture_picker name="aux3_tattoo" label="予備 3 タトゥー"/>
-		<texture_picker name="leftarm_tattoo" label="左腕タトゥー"/>
-		<texture_picker name="lower_universal_tattoo" label="下腕タトゥー"/>
-	</scroll_container>
+      <text name="composite_label">合成テクスチャ</text>
+      <button label="ＩＤをコンソールにダンプ" label_selected="ダンプ" name="Dump" />
+      <panel name="scroll_content_panel">
+        <texture_picker label="髪" name="hair-baked" />
+        <texture_picker label="髪" name="hair_grain" />
+        <texture_picker label="髪のアルファ" name="hair_alpha" />
+        <texture_picker label="髪のタトゥ" name="hair_tattoo" />
+
+        <texture_picker label="頭" name="head-baked" />
+        <texture_picker label="メイクアップ" name="head_bodypaint" />
+        <texture_picker label="頭部のアルファ" name="head_alpha" />
+        <texture_picker label="頭部のタトゥ" name="head_tattoo" />
+        <texture_picker label="頭部全般のタトゥ" name="head_universal_tattoo" />
+
+        <texture_picker label="目" name="eyes-baked" />
+        <texture_picker label="目" name="eyes_iris" />
+        <texture_picker label="目のアルファ" name="eyes_alpha" />
+        <texture_picker label="目のタトゥ" name="eyes_tattoo" />
+
+        <texture_picker label="上半身" name="upper-baked" />
+        <texture_picker label="上半身のボディペイント" name="upper_bodypaint" />
+        <texture_picker label="上半身の下着" name="upper_undershirt" />
+        <texture_picker label="手袋" name="upper_gloves" />
+        <texture_picker label="シャツ" name="upper_shirt" />
+        <texture_picker label="上着" name="upper_jacket" />
+        <texture_picker label="上半身のアルファ" name="upper_alpha" />
+        <texture_picker label="上半身のタトゥ" name="upper_tattoo" />
+        <texture_picker label="上半身全般のタトゥ" name="upper_universal_tattoo" />
+
+        <texture_picker label="下半身" name="lower-baked" />
+        <texture_picker label="下半身のボディペイント" name="lower_bodypaint" />
+        <texture_picker label="下半身の下着" name="lower_underpants" />
+        <texture_picker label="靴下" name="lower_socks" />
+        <texture_picker label="靴" name="lower_shoes" />
+        <texture_picker label="ズボン" name="lower_pants" />
+        <texture_picker label="ジャケット" name="lower_jacket" />
+        <texture_picker label="下半身のアルファ" name="lower_alpha" />
+        <texture_picker label="下半身のタトゥ" name="lower_tattoo" />
+        <texture_picker label="スカート" name="skirt-baked" />
+        <texture_picker label="スカート" name="skirt" />
+        <texture_picker label="スカートのタトゥ" name="skirt_tattoo" />
+        <texture_picker label="下半身全般のタトゥ" name="lower_universal_tattoo" />
+
+        <texture_picker label="左腕" name="leftarm-baked" />
+        <texture_picker label="左腕のタトゥ" name="leftarm_tattoo" />
+        <texture_picker label="左足" name="leftleg-baked" />
+        <texture_picker label="左足のタトゥ" name="leftleg_tattoo" />
+        <texture_picker label="予備１" name="aux1-baked" />
+        <texture_picker label="予備１タトゥ" name="aux1_tattoo" />
+        <texture_picker label="予備２" name="aux2-baked" />
+        <texture_picker label="予備２タトゥ" name="aux2_tattoo" />
+        <texture_picker label="予備３" name="aux3-baked" />
+        <texture_picker label="予備３タトゥ" name="aux3_tattoo" />
+      </panel>
+    </panel>
+  </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_ban_duration.xml b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
index a9d00b0116..53a9c58a98 100644
--- a/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ban_duration" title="禁止期間">
-	<text name="duration_textbox">
-		禁止期間：
-	</text>
-	<radio_group name="ban_duration_radio">
-		<radio_item label="常時" name="always_radio">
-			常時
-		</radio_item>
-		<radio_item label="一時的" name="temporary_radio">
-			一時的
-		</radio_item>
-	</radio_group>
-	<text name="hours_textbox">
-		時間
-	</text>
-	<button label="Ok" name="ok_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+<floater name="ban_duration" title="バン期間">
+  <text name="duration_textbox">バンする期間：</text>
+  <radio_group name="ban_duration_radio">
+    <radio_item label="常時" name="always_radio">常時</radio_item>
+    <radio_item label="一時的" name="temporary_radio">一時的</radio_item>
+  </radio_group>
+  <text name="hours_textbox">時間</text>
+  <button label="Ok" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index cb3dae0644..b8719f78f9 100644
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="beacons" title="ビーコン（標識）">
-	<panel name="beacons_panel">
-		<text name="label_show">
-			表示：
-		</text>
-		<check_box label="ビーコン（標識）" name="beacons"/>
-		<check_box label="ハイライト" name="highlights"/>
-		<text name="beacon_width_label" tool_tip="ビーコン（標識）の幅">
-			幅：
-		</text>
-		<text name="label_objects">
-			対象オブジェクト：
-		</text>
-		<check_box label="物理的" name="physical"/>
-		<check_box label="スクリプト" name="scripted"/>
-		<check_box label="触れる" name="touch_only"/>
-		<check_box label="音源" name="sounds"/>
-		<check_box label="パーティクル源" name="particles"/>
-		<check_box label="メディア源" name="moapbeacon"/>
-		<check_box label="太陽" name="sun"/>
-		<check_box label="月" name="moon"/>
-	</panel>
-</floater>
+  <panel name="beacons_panel">
+    <text name="label_show">表示：</text>
+    <check_box label="ビーコン（標識）" name="beacons" />
+    <check_box label="ハイライト" name="highlights" />
+    <text name="beacon_width_label" tool_tip="ビーコンの幅">幅：</text>
+    <text name="label_objects">対象オブジェクト：</text>
+    <check_box label="物理的" name="physical" />
+    <check_box label="スクリプト" name="scripted" />
+    <check_box label="触れる" name="touch_only" />
+    <check_box label="音源" name="sounds" />
+    <check_box label="パーティクル源" name="particles" />
+    <check_box label="メディア源" name="moapbeacon" />
+    <text name="label_objects">以下の向きを示す：</text>
+    <check_box label="太陽" name="sun" />
+    <check_box label="月" name="moon" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_big_preview.xml b/indra/newview/skins/default/xui/ja/floater_big_preview.xml
index bb55db7a13..69cf50947f 100644
--- a/indra/newview/skins/default/xui/ja/floater_big_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_big_preview.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="プレビュー"/>
+<floater name="floater_big_preview" title="プレビュー" />
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 6865409e7a..d6e51f0856 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -1,34 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="グリッドオプション">
-	<floater.string name="grid_screen_text">
-		画面
-	</floater.string>
-	<floater.string name="grid_local_text">
-		ローカル
-	</floater.string>
-	<floater.string name="grid_world_text">
-		世界
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		リファレンス
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		アタッチメント
-	</floater.string>
-	<text name="grid_mode_label" tool_tip="グリッドの不透明度">
-		モード
-	</text>
-	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択">
-		<combo_box.item label="インワールドグリッド" name="World"/>
-		<combo_box.item label="ローカルグリッド" name="Local"/>
-		<combo_box.item label="リファレンスグリッド" name="Reference"/>
-	</combo_box>
-	<spinner label="単位（メートル）" name="GridResolution"/>
-	<spinner label="範囲（メートル）" name="GridDrawSize"/>
-	<check_box label="より細かい単位でスナップフィット" name="GridSubUnit"/>
-	<check_box label="横断面を表示" name="GridCrossSection"/>
-	<text name="grid_opacity_label" tool_tip="グリッドの不透明度">
-		不透明度：
-	</text>
-	<slider label="グリッドの不透明度" name="GridOpacity"/>
-</floater>
+  <floater.string name="grid_screen_text">画面</floater.string>
+  <floater.string name="grid_local_text">ローカル</floater.string>
+  <floater.string name="grid_world_text">ワールド</floater.string>
+  <floater.string name="grid_reference_text">リファレンス</floater.string>
+  <floater.string name="grid_attachment_text">装着物</floater.string>
+  <text name="grid_mode_label" tool_tip="グリッドの不透明度">モード</text>
+  <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択">
+    <combo_box.item label="インワールドグリッド" name="World" />
+    <combo_box.item label="ローカルグリッド" name="Local" />
+    <combo_box.item label="リファレンスグリッド" name="Reference" />
+  </combo_box>
+  <spinner label="単位（メートル）" name="GridResolution" />
+  <spinner label="範囲（メートル）" name="GridDrawSize" />
+  <check_box label="より細かい単位でスナップフィット" name="GridSubUnit" />
+  <check_box label="横断面を表示" name="GridCrossSection" />
+  <text name="grid_opacity_label" tool_tip="グリッドの不透明度">不透明度：</text>
+  <slider label="グリッドの不透明度" name="GridOpacity" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index fc9b35a34d..b0a8298b06 100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,56 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterbulkperms" title="コンテンツ権限を調整">
-	<floater.string name="nothing_to_modify_text">
-		選択した中に編集できないものが含まれています
-	</floater.string>
-	<floater.string name="status_text">
-		[NAME]に権限を設定中です。
-	</floater.string>
-	<floater.string name="start_text">
-		権限変更リクエストをしています
-	</floater.string>
-	<floater.string name="done_text">
-		権限変更リクエストが完了しました
-	</floater.string>
-	<check_box label="アニメーション" name="check_animation"/>
-	<icon name="icon_animation" tool_tip="アニメーション"/>
-	<check_box label="身体部位" name="check_bodypart"/>
-	<icon name="icon_bodypart" tool_tip="身体部位"/>
-	<check_box label="服" name="check_clothing"/>
-	<icon name="icon_clothing" tool_tip="衣類"/>
-	<check_box label="ジェスチャー" name="check_gesture"/>
-	<icon name="icon_gesture" tool_tip="ジェスチャー"/>
-	<check_box label="ノートカード" name="check_notecard"/>
-	<icon name="icon_notecard" tool_tip="ノートカード"/>
-	<check_box label="オブジェクト" name="check_object"/>
-	<icon name="icon_object" tool_tip="オブジェクト"/>
-	<check_box label="スクリプト" name="check_script"/>
-	<icon name="icon_script" tool_tip="スクリプト"/>
-	<check_box label="サウンド" name="check_sound"/>
-	<icon name="icon_sound" tool_tip="サウンド"/>
-	<check_box label="テクスチャ" name="check_texture"/>
-	<icon name="icon_texture" tool_tip="テクスチャ"/>
-	<icon name="icon_setting" tool_tip="自然環境の設定"/>
-	<button label="すべてに √" label_selected="全て" name="check_all"/>
-	<button label="クリア" label_selected="なし" name="check_none"/>
-	<text name="newperms">
-		コンテンツ権限を以下に調整
-	</text>
-	<text name="GroupLabel">
-		グループ：
-	</text>
-	<check_box label="共有" name="share_with_group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。"/>
-	<text name="AnyoneLabel">
-		全員：
-	</text>
-	<check_box label="コピー" name="everyone_copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります"/>
-	<text name="NextOwnerLabel">
-		次の所有者：
-	</text>
-	<check_box label="修正" name="next_owner_modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-	<check_box label="コピー" name="next_owner_copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-	<check_box initial_value="true" label="再販・プレゼント" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
-	<button label="OK" name="ok"/>
-	<button label="適用" name="apply"/>
-	<button label="キャンセル" name="close"/>
-</floater>
+  <floater.string name="nothing_to_modify_text">選択した中に編集できないものが含まれています。</floater.string>
+  <floater.string name="status_text">[NAME]に権限を設定中です。</floater.string>
+  <floater.string name="start_text">権限変更リクエストをしています。</floater.string>
+  <floater.string name="done_text">権限変更リクエストが完了しました。</floater.string>
+  <check_box label="アニメーション" name="check_animation" />
+  <icon name="icon_animation" tool_tip="アニメーション" />
+  <check_box label="身体部位" name="check_bodypart" />
+  <icon name="icon_bodypart" tool_tip="身体部位" />
+  <check_box label="服装" name="check_clothing" />
+  <icon name="icon_clothing" tool_tip="服装" />
+  <check_box label="ジェスチャー" name="check_gesture" />
+  <icon name="icon_gesture" tool_tip="ジェスチャー" />
+  <check_box label="ノートカード" name="check_notecard" />
+  <icon name="icon_notecard" tool_tip="ノートカード" />
+  <check_box label="オブジェクト" name="check_object" />
+  <icon name="icon_object" tool_tip="オブジェクト" />
+  <check_box label="スクリプト" name="check_script" />
+  <icon name="icon_script" tool_tip="スクリプト" />
+  <check_box label="サウンド" name="check_sound" />
+  <icon name="icon_sound" tool_tip="サウンド" />
+  <check_box label="テクスチャ" name="check_texture" />
+  <icon name="icon_texture" tool_tip="テクスチャ" />
+  <icon name="icon_setting" tool_tip="自然環境の設定" />
+  <button label="すべてに √" label_selected="全て" name="check_all" />
+  <button label="クリア" label_selected="なし" name="check_none" />
+  <text name="newperms">コンテンツ権限を以下に調整</text>
+  <text name="GroupLabel">グループ：</text>
+  <check_box label="共有" name="share_with_group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
+  <text name="AnyoneLabel">全員：</text>
+  <check_box label="コピー" name="everyone_copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります" />
+  <text name="NextOwnerLabel">次の所有者：</text>
+  <check_box label="修正" name="next_owner_modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+  <check_box label="コピー" name="next_owner_copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
+  <check_box initial_value="true" label="再販・譲渡" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。" />
+  <button label="ＯＫ" name="ok" />
+  <button label="適用" name="apply" />
+  <button label="キャンセル" name="close" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index 62f8a0669e..15905ad51a 100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -1,24 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_bumps" title="衝突・プッシュ・打撃">
-	<floater.string name="none_detected">
-		検出なし
-	</floater.string>
-	<floater.string name="bump">
-		[TIME]  [NAME] があなたに衝突しました
-	</floater.string>
-	<floater.string name="llpushobject">
-		[TIME]  [NAME] がスクリプトであなたを押しました
-	</floater.string>
-	<floater.string name="selected_object_collide">
-		[TIME]  [NAME] がオブジェクトであなたをたたきました
-	</floater.string>
-	<floater.string name="scripted_object_collide">
-		[TIME]  [NAME] がスクリプトのオブジェクトであなたをたたきました
-	</floater.string>
-	<floater.string name="physical_object_collide">
-		[TIME]  [NAME] が物理的オブジェクトであなたをたたきました
-	</floater.string>
-	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
-	</floater.string>
-</floater>
+  <floater.string name="none_detected">検出なし</floater.string>
+  <floater.string name="bump">[TIME]　[NAME]があなたに衝突しました。</floater.string>
+  <floater.string name="llpushobject">[TIME]　[NAME]がスクリプトであなたを押しました。</floater.string>
+  <floater.string name="selected_object_collide">[TIME]　[NAME]が、オブジェクトであなたを叩きました。</floater.string>
+  <floater.string name="scripted_object_collide">[TIME]　[NAME]が、スクリプトのオブジェクトであなたを叩きました。</floater.string>
+  <floater.string name="physical_object_collide">[TIME]　[NAME]が、物理オブジェクトであなたを叩きました。</floater.string>
+  <floater.string name="timeStr">[[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]]</floater.string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 7e4932c78f..24520be6ad 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="340" name="floater_buy_contents" title="中身の購入" width="340">
-	<text name="contains_text" width="320">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; に含まれるもの：
-	</text>
-	<scroll_list name="item_list" width="310"/>
-	<text name="buy_text" width="320">
-		中身を [NAME] から L$[AMOUNT] で購入しますか？
-	</text>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn" width="73"/>
-	<button label="購入" label_selected="購入" left_delta="-77" name="buy_btn" width="73"/>
-	<check_box label="今すぐ着る" left_delta="-125" name="wear_check"/>
-	<text name="no_copy_text">
-		（コピー不可）
-	</text>
-	<text name="no_modify_text">
-		（修正不可）
-	</text>
-	<text name="no_transfer_text">
-		（再販・プレゼント不可）
-	</text>
-</floater>
+<floater name="floater_buy_contents" title="中身の購入">
+  <text name="contains_text">&lt;nolink&gt;[NAME]&lt;/nolink&gt;に含まれるもの：</text>
+  <scroll_list name="item_list" />
+  <text name="buy_text">[NAME]から、L$ [AMOUNT]で購入しますか？</text>
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <button label="購入" label_selected="購入" name="buy_btn" />
+  <check_box label="今すぐ着る" name="wear_check" />
+  <text name="no_copy_text">（コピー不可）</text>
+  <text name="no_modify_text">（修正不可）</text>
+  <text name="no_transfer_text">（再販・譲渡不可）</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index ac2db917cc..218fcb589d 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -1,65 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy currency" title="L$ の購入">
-	<floater.string name="buy_currency">
-		約 [LOCALAMOUNT] で L$ [LINDENS] を購入
-	</floater.string>
-	<text name="info_need_more">
-		L$ が足りません
-	</text>
-	<text name="contacting">
-		LindeXとコンタクト中…
-	</text>
-	<text name="info_buying">
-		L$ の購入
-	</text>
-	<text name="balance_label">
-		残高
-	</text>
-	<text name="balance_amount">
-		L$ [AMT]
-	</text>
-	<text name="currency_action">
-		購入希望額
-	</text>
-	<text name="currency_label">
-		L$
-	</text>
-	<line_editor label="L$" name="currency_amt">
-		1234
-	</line_editor>
-	<text name="buying_label">
-		価格
-	</text>
-	<text name="currency_est">
-		約 [LOCALAMOUNT]
-	</text>
-	<text left_delta="3" name="getting_data">
-		見積もり中...
-	</text>
-	<text name="buy_action">
-		[ACTION]
-	</text>
-	<text name="total_label">
-		購入後の残高
-	</text>
-	<text name="total_amount">
-		L$ [AMT]
-	</text>
-	<text name="currency_links">
-		[http://www.secondlife.com/my/account/payment_method_management.php 支払方法] | [http://www.secondlife.com/my/account/currency.php 通貨]
-	</text>
-	<text name="exchange_rate_note">
-		金額を再入力して最新換算レートを確認します。
-	</text>
-	<text name="purchase_warning_repurchase">
-		この取引を決定すると、L$ を購入します。オブジェクトは購入しません。
-	</text>
-	<text name="purchase_warning_notenough">
-		購入しようとしている L$ が不足しています。 金額を上げてください。
-	</text>
-	<button label="購入する" name="buy_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<floater.string name="info_cannot_buy">
-		購入できません
-	</floater.string>
-</floater>
+<floater title="L$の購入" name="buy currency">
+  <floater.string name="buy_currency">約[LOCALAMOUNT]でL$ [LINDENS]を購入</floater.string>
+  <floater.string name="info_cannot_buy">購入できません。</floater.string>
+  <floater.string name="estimated_zero">US$ 0.00</floater.string>
+  <icon name="normal_background" />
+  <layout_stack name="outer_stack">
+    <layout_panel name="layout_panel_title">
+      <text name="info_need_more">L$が足りません。</text>
+      <text name="info_buying">L$を購入</text>
+      <view_border name="text_border" />
+    </layout_panel>
+    <layout_panel name="layout_panel_price">
+      <text name="target_price_label">必要金額</text>
+      <text name="target_price">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_balance">
+      <text name="balance_label">所持金</text>
+      <text name="balance_amount">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_required">
+      <text name="required_label">必要最低金額</text>
+      <text name="required_amount">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_action">
+      <view_border name="text_border_2" />
+      <text name="currency_action">購入金額を選択</text>
+      <text name="currency_label">L$</text>
+      <line_editor label="L$" name="currency_amt">1234</line_editor>
+      <text name="currency_est">平均[LOCALAMOUNT]</text>
+      <text name="getting_data">見積もり中…</text>
+      <text name="total_label">購入後の残高</text>
+      <text name="total_amount">L$ [AMT]</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_msg">
+      <view_border name="text_border_3" />
+      <text name="currency_links">[https://accounts.secondlife.com/billing_information/ 支払い方法]｜[https://www.secondlife.com/my/lindex/buy.php L$の購入]</text>
+      <text name="exchange_rate_note">金額を再入力して、最新の為替レートを確認してください。</text>
+      <text name="purchase_warning_repurchase">L$ を受け取ったら、
+もう一度購入してください。</text>
+    </layout_panel>
+    <layout_panel name="layout_panel_buttons">
+      <text name="contacting">LindeXに接続中…</text>
+      <button label="今すぐL$を購入" name="buy_btn" />
+      <button label="キャンセル" name="cancel_btn" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
index 37fd6826e5..26c001da36 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_currency_html" title="通貨の購入"/>
+<floater name="floater_buy_currency_html" title="通貨の購入" />
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 34f9d38de1..7eda56c6a3 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -1,234 +1,93 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="土地の購入">
-	<floater.string name="can_resell">
-		再販可能
-	</floater.string>
-	<floater.string name="can_not_resell">
-		再販不可能
-	</floater.string>
-	<floater.string name="can_change">
-		統合・再分割可能
-	</floater.string>
-	<floater.string name="can_not_change">
-		統合・再分割不可能
-	</floater.string>
-	<floater.string name="cant_buy_for_group">
-		あなたはアクティブなグループ用の土地購入を許可されていません
-	</floater.string>
-	<floater.string name="no_land_selected">
-		土地が選択されていません
-	</floater.string>
-	<floater.string name="multiple_parcels_selected">
-		複数の異なった区画を選択しました。 
-これより小さな範囲を選択してください。
-	</floater.string>
-	<floater.string name="no_permission">
-		あなたはアクティブなグループ用の土地購入を許可されていません
-	</floater.string>
-	<floater.string name="parcel_not_for_sale">
-		選択された区画は販売対象外です
-	</floater.string>
-	<floater.string name="group_already_owns">
-		グループはすでにこの区画を所有しています
-	</floater.string>
-	<floater.string name="you_already_own">
-		あなたはすでにこの区画を所有しています
-	</floater.string>
-	<floater.string name="set_to_sell_to_other">
-		選択された区画は、他の人への販売が決まっています
-	</floater.string>
-	<floater.string name="no_public_land">
-		選択された地域に、公共の土地はありません
-	</floater.string>
-	<floater.string name="not_owned_by_you">
-		他の住人が所有する土地を選択しています。 
-もっと狭い範囲を選択してみてください。
-	</floater.string>
-	<floater.string name="processing">
-		購入処理中...
- 
-（数分かかることがあります）
-	</floater.string>
-	<floater.string name="fetching_error">
-		土地購入の情報入手中にエラーが起きました
-	</floater.string>
-	<floater.string name="buying_will">
-		この土地を買うと：
-	</floater.string>
-	<floater.string name="buying_for_group">
-		グループ用の土地を購入すると：
-	</floater.string>
-	<floater.string name="cannot_buy_now">
-		現在購入不可：
-	</floater.string>
-	<floater.string name="not_for_sale">
-		販売対象外：
-	</floater.string>
-	<floater.string name="none_needed">
-		一切必要なし
-	</floater.string>
-	<floater.string name="must_upgrade">
-		アカウントをアップグレードしないと、土地を所有できません
-	</floater.string>
-	<floater.string name="cant_own_land">
-		あなたのアカウントで土地を所有できます
-	</floater.string>
-	<floater.string name="land_holdings">
-		あなたは、[BUYER] 平方メートルの土地を所有しています。
-	</floater.string>
-	<floater.string name="pay_to_for_land">
-		この土地の代金として、[SELLER]にL$[AMOUNT]を支払う
-	</floater.string>
-	<floater.string name="buy_for_US">
-		L$ [AMOUNT] を、約 [LOCAL_AMOUNT] で購入します。
-	</floater.string>
-	<floater.string name="parcel_meters">
-		この区画は [AMOUNT] 平方メートルです。
-	</floater.string>
-	<floater.string name="premium_land">
-		この土地は割り増し付です。 [AMOUNT] 平方メートルの料金がかかります。
-	</floater.string>
-	<floater.string name="discounted_land">
-		この土地はディスカウントされています。 [AMOUNT] 平方メートルの料金がかかります。
-	</floater.string>
-	<floater.string name="meters_supports_object">
-		[AMOUNT] 平方メートル
-オブジェクト [AMOUNT2] 個サポート
-	</floater.string>
-	<floater.string name="sold_with_objects">
-		オブジェクト込みで販売
-	</floater.string>
-	<floater.string name="sold_without_objects">
-		オブジェクトは含まれていません
-	</floater.string>
-	<floater.string name="info_price_string">
-		L$ [PRICE]
-（L$[PRICE_PER_SQM]/平方メートル）
-[SOLD_WITH_OBJECTS]
-	</floater.string>
-	<floater.string name="insufficient_land_credits">
-		この [GROUP] が区画の購入手続きを完了するには、 価格に見合うだけの寄付された土地の利用実績が必要です
-	</floater.string>
-	<floater.string name="have_enough_lindens">
-		あなたの所持する L$ [AMOUNT]で、この土地を購入できます
-	</floater.string>
-	<floater.string name="not_enough_lindens">
-		あなたの所持金は L$ [AMOUNT]だけで、あとL$ [AMOUNT2] 必要です
-	</floater.string>
-	<floater.string name="balance_left">
-		購入後、あなたの残額はL$[AMOUNT]になります
-	</floater.string>
-	<floater.string name="balance_needed">
-		この土地を買うには、少なくとも L$ [AMOUNT] を購入する必要があります
-	</floater.string>
-	<floater.string name="no_parcel_selected">
-		(区画が選定されていません)
-	</floater.string>
-	<text name="region_name_label">
-		地域：
-	</text>
-	<text name="region_name_text">
-		（不明）
-	</text>
-	<text name="region_type_label">
-		種類：
-	</text>
-	<text name="region_type_text">
-		（不明）
-	</text>
-	<text name="estate_name_label">
-		不動産：
-	</text>
-	<text name="estate_name_text">
-		（不明）
-	</text>
-	<text name="estate_owner_label">
-		不動産オーナー：
-	</text>
-	<text name="estate_owner_text">
-		（不明）
-	</text>
-	<text name="resellable_changeable_label">
-		この地域で購入した土地：
-	</text>
-	<text left="460" name="resellable_clause">
-		再販できる場合とできない場合があります。
-	</text>
-	<text left="460" name="changeable_clause">
-		統合または再分割できる場合とできない場合があります。
-	</text>
-	<text name="covenant_text">
-		不動産約款に同意してください：
-	</text>
-	<text left="470" name="covenant_timestamp_text"/>
-	<text_editor name="covenant_editor">
-		ロード中．．．
-	</text_editor>
-	<check_box label="上記の約款に同意します" name="agree_covenant"/>
-	<text name="info_parcel_label">
-		区画：
-	</text>
-	<text name="info_parcel">
-		Scotopteryx138,204
-	</text>
-	<text name="info_size_label">
-		サイズ：
-	</text>
-	<text bottom_delta="-37" height="48" name="info_size">
-		1024 平方メートル
-	</text>
-	<text name="info_price_label">
-		価格：
-	</text>
-	<text name="info_price">
-		L$ 1500
-(L$ 1.1/平方メートル)
-オブジェクトも土地販売価格に含まれます
-	</text>
-	<text name="info_action">
-		この土地を買うと：
-	</text>
-	<text name="error_message">
-		何か変です
-	</text>
-	<button label="Webサイトに移動" name="error_web"/>
-	<text name="account_action">
-		プレミアム会員にアップグレード
-	</text>
-	<text name="account_reason">
-		土地を保有できるのはプレミアム会員だけです
-	</text>
-	<combo_box name="account_level">
-		<combo_box.item label="月額 9.95米ドル、 月払い" name="US$9.95/month,billedmonthly"/>
-		<combo_box.item label="月額 7.50米ドル、 年4回3ヶ月毎" name="US$7.50/month,billedquarterly"/>
-		<combo_box.item label="月額 6.00米ドル、 年間一括払い" name="US$6.00/month,billedannually"/>
-	</combo_box>
-	<text name="land_use_action">
-		毎月の土地使用料をUS$40に引き上げます
-	</text>
-	<text name="land_use_reason">
-		あなたは 1309 平方メートルの土地を所有しています。
-この区画の大きさは、512 平方メートルです。
-	</text>
-	<text name="purchase_action">
-		Joe ResidentにL$4000支払って土地を購入
-	</text>
-	<text name="currency_reason">
-		所持金は L$2,100です。
-	</text>
-	<text name="currency_action">
-		追加でL$の購入
-	</text>
-	<line_editor name="currency_amt">
-		1000
-	</line_editor>
-	<text name="currency_est">
-		約 [LOCAL_AMOUNT]
-	</text>
-	<text name="currency_balance">
-		所持金は L$2,100です。
-	</text>
-	<check_box label="グループから [AMOUNT] 平方メートルの貢献を取り除きます。" name="remove_contribution"/>
-	<button label="購入" name="buy_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <floater.string name="can_resell">再販可能</floater.string>
+  <floater.string name="can_not_resell">再販不可能</floater.string>
+  <floater.string name="can_change">統合・再分割可能</floater.string>
+  <floater.string name="can_not_change">統合・再分割不可能</floater.string>
+  <floater.string name="cant_buy_for_group">あなたはアクティブなグループ用の土地購入を許可されていません。</floater.string>
+  <floater.string name="no_land_selected">土地が選択されていません。</floater.string>
+  <floater.string name="multiple_parcels_selected">複数の異なった区画を選択しました。
+これより小さな範囲を選択してください。</floater.string>
+  <floater.string name="no_permission">あなたはアクティブなグループ用の土地購入を許可されていません。</floater.string>
+  <floater.string name="parcel_not_for_sale">選択された区画は販売対象外です。</floater.string>
+  <floater.string name="group_already_owns">グループはすでにこの区画を所有しています。</floater.string>
+  <floater.string name="you_already_own">あなたはすでにこの区画を所有しています</floater.string>
+  <floater.string name="set_to_sell_to_other">選択された区画は、他の人への販売が決まっています。</floater.string>
+  <floater.string name="no_public_land">選択された地域に、公共の土地はありません。</floater.string>
+  <floater.string name="not_owned_by_you">他の住人が所有する土地を選択しています。
+もっと狭い範囲を選択してみてください。</floater.string>
+  <floater.string name="processing">購入処理中…
+（数分かかることがあります）</floater.string>
+  <floater.string name="fetching_error">土地購入の情報入手中にエラーが起きました</floater.string>
+  <floater.string name="buying_will">この土地を買うと：</floater.string>
+  <floater.string name="buying_for_group">グループ用の土地の購入：</floater.string>
+  <floater.string name="cannot_buy_now">現在購入不可：</floater.string>
+  <floater.string name="not_for_sale">販売対象外：</floater.string>
+  <floater.string name="none_needed">一切必要なし</floater.string>
+  <floater.string name="must_upgrade">アカウントをアップグレードしないと、土地を所有できません</floater.string>
+  <floater.string name="cant_own_land">あなたのアカウントで土地を所有できます。</floater.string>
+  <floater.string name="land_holdings">あなたは、[BUYER]㎡の土地を所有しています。</floater.string>
+  <floater.string name="pay_to_for_land">この土地の代金として、[SELLER]にL$[AMOUNT]を支払う。</floater.string>
+  <floater.string name="buy_for_US">L$[AMOUNT]を、約[LOCAL_AMOUNT]で購入します。</floater.string>
+  <floater.string name="parcel_meters">この区画は[AMOUNT]㎡です。</floater.string>
+  <floater.string name="premium_land">この土地は割り増し付です。[AMOUNT]㎡の料金がかかります。</floater.string>
+  <floater.string name="discounted_land">この土地はディスカウントされています。[AMOUNT]㎡の料金がかかります。</floater.string>
+  <floater.string name="meters_supports_object">[AMOUNT]㎡
+オブジェクト[AMOUNT2]個サポート</floater.string>
+  <floater.string name="sold_with_objects">オブジェクト込みで販売</floater.string>
+  <floater.string name="sold_without_objects">オブジェクトは含まれていません。</floater.string>
+  <floater.string name="info_price_string">L$ [PRICE]
+（L$ [PRICE_PER_SQM]/㎡）
+[SOLD_WITH_OBJECTS]</floater.string>
+  <floater.string name="insufficient_land_credits">
+この[GROUP]が区画の購入手続きを完了するには、価格に見合うだけの寄付された土地の利用実績が必要です。</floater.string>
+  <floater.string name="have_enough_lindens">あなたの現在の所持金L$ [AMOUNT]で、この土地を購入できます。</floater.string>
+  <floater.string name="not_enough_lindens">あなたの現在の所持金は、L$ [AMOUNT]で、L$ [AMOUNT2]不足しています。</floater.string>
+  <floater.string name="balance_left">購入後、残額はL$ [AMOUNT]になります。</floater.string>
+  <floater.string name="balance_needed">この土地を買うには、少なくともL$ [AMOUNT]購入する必要があります。</floater.string>
+  <floater.string name="no_parcel_selected">（区画が選定されていません）</floater.string>
+  <text name="region_name_label">地域：</text>
+  <text name="region_name_text">（不明）</text>
+  <text name="region_type_label">種類：</text>
+  <text name="region_type_text">（不明）</text>
+  <text name="estate_name_label">不動産：</text>
+  <text name="estate_name_text">（不明）</text>
+  <text name="estate_owner_label">不動産オーナー：</text>
+  <text name="estate_owner_text">（不明）</text>
+  <text name="resellable_changeable_label">このリージョン（地域）で購入した土地：</text>
+  <text name="resellable_clause">再販できる場合とできない場合があります。</text>
+  <text name="changeable_clause">統合または再分割できる場合とできない場合があります。</text>
+  <text name="covenant_text">不動産約款に同意してください：</text>
+  <text name="covenant_timestamp_text" />
+  <text_editor name="covenant_editor">読み込んでいます…。</text_editor>
+  <check_box label="上記の約款に同意します" name="agree_covenant" />
+  <text name="info_parcel_label">区画：</text>
+  <text name="info_parcel">Scotopteryx138,204</text>
+  <text name="info_size_label">サイズ：</text>
+  <text bottom_delta="-37" height="48" name="info_size">1024㎡</text>
+  <text name="info_price_label">価格：</text>
+  <text name="info_price">L$ 1500
+（L$ 1.1／㎡）
+オブジェクトも土地販売価格に含まれます</text>
+  <text name="info_action">この土地を買うと：</text>
+  <text name="error_message">何か変です</text>
+  <button label="Webサイトに移動" name="error_web" />
+  <text name="account_action">プレミアム会員にアップグレードする</text>
+  <text name="account_reason">土地を保有できるのはプレミアム会員だけです。</text>
+  <combo_box name="account_level">
+    <combo_box.item label="月額9.95米ドル、月払い" name="US$9.95/month,billedmonthly" />
+    <combo_box.item label="月額7.50米ドル、四半期払い" name="US$7.50/month,billedquarterly" />
+    <combo_box.item label="月額6.00米ドル、年間一括払い" name="US$6.00/month,billedannually" />
+  </combo_box>
+  <text name="land_use_action">毎月の土地使用料をUS $40に引き上げます</text>
+  <text name="land_use_reason">あなたは、1309㎡の土地を所有しています。この区画の大きさは、512㎡です。</text>
+  <text name="purchase_action">Joe ResidentにL$ 4000支払って土地を購入</text>
+  <text name="currency_reason">所持金は、L$ 2,100です。</text>
+  <text name="currency_action">追加でL$の購入</text>
+  <line_editor name="currency_amt">1000</line_editor>
+  <text name="currency_est">約[LOCAL_AMOUNT]</text>
+  <text name="currency_balance">所持金はL$ 2,100です。</text>
+  <check_box label="グループから[AMOUNT]㎡の貢献を取り除きます。" name="remove_contribution" />
+  <button label="購入" name="buy_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index ce269df6da..8e249359f2 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
@@ -1,29 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="オブジェクトのコピーを購入">
-	<floater.string name="title_buy_text">
-		購入
-	</floater.string>
-	<floater.string name="title_buy_copy_text">
-		次のものを購入
-	</floater.string>
-	<floater.string name="no_copy_text">
-		（コピー不可）
-	</floater.string>
-	<floater.string name="no_modify_text">
-		（修正不可）
-	</floater.string>
-	<floater.string name="no_transfer_text">
-		（再販・プレゼント不可）
-	</floater.string>
-	<text name="contents_text">
-		中身：
-	</text>
-	<text name="buy_text">
-		次の売り手から L$[AMOUNT] で購入：
-	</text>
-	<text name="buy_name_text">
-		[NAME]?
-	</text>
-	<button label="購入" label_selected="購入" name="buy_btn"/>
-	<button label="取消" label_selected="取消" name="cancel_btn"/>
-</floater>
+  <floater.string name="title_buy_text">購入</floater.string>
+  <floater.string name="title_buy_copy_text">以下を購入：</floater.string>
+  <floater.string name="no_copy_text">（コピー不可）</floater.string>
+  <floater.string name="no_modify_text">（修正不可）</floater.string>
+  <floater.string name="no_transfer_text">（再販・譲渡不可）</floater.string>
+  <text name="contents_text">中身：</text>
+  <text name="buy_text">次の売り手から L$ [AMOUNT]で購入：</text>
+  <text name="buy_name_text">[NAME]？</text>
+  <button label="購入" label_selected="購入" name="buy_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index a690fbd844..86db0cfe99 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -1,45 +1,33 @@
-<?xml version="1.0" ?>
-<floater name="camera_floater" title="カメラのコントロール">
-	<floater.string name="rotate_tooltip">フォーカスを中心にカメラを回転</floater.string>
-	<floater.string name="zoom_tooltip">フォーカスに向けてカメラをズーム</floater.string>
-	<floater.string name="move_tooltip">カメラを上下左右に移動</floater.string>
-	<floater.string name="free_mode_title">オブジェクトを見る</floater.string>
-	<panel name="controls">
-		<panel name="preset_views_list">
-			<panel_camera_item name="front_view" tool_tip="前側">
-				<panel_camera_item.text name="front_view_text">前方視界</panel_camera_item.text>
-			</panel_camera_item>
-			<panel_camera_item name="group_view" tool_tip="側面">
-				<panel_camera_item.text name="side_view_text">グループ視界</panel_camera_item.text>
-			</panel_camera_item>
-			<panel_camera_item name="rear_view" tool_tip="後側">
-				<panel_camera_item.text name="rear_view_text">後方視界</panel_camera_item.text>
-			</panel_camera_item>
-		</panel>
-		<panel name="camera_modes_list">
-			<panel_camera_item name="object_view" tool_tip="オブジェクトビュー">
-				<panel_camera_item.text name="object_view_text">オブジェクト視点</panel_camera_item.text>
-			</panel_camera_item>
-			<panel_camera_item name="mouselook_view" tool_tip="マウスルックビュー">
-				<panel_camera_item.text name="mouselook_view_text">一人称視点</panel_camera_item.text>
-			</panel_camera_item>
-		</panel>
-		<panel name="zoom" tool_tip="向いている方法にカメラをズーム">
-			<joystick_rotate name="cam_rotate_stick" tool_tip="自分を軸にカメラを回す"/>
-			<slider_bar name="zoom_slider" tool_tip="向いている方向にカメラをズーム"/>
-			<joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に動かします"/>
-		</panel>
-		<text name="precise_ctrs_label">精密制御を使用する</text>
-	</panel>
-	<panel name="buttons">
-		<button label="" name="presets_btn" tool_tip="事前設定の視野"/>
-		<button label="" name="pan_btn" tool_tip="旋回 - ズーム - 水平・垂直移動"/>
-		<button label="" name="avatarview_btn" tool_tip="カメラモード"/>
-	</panel>
-	<panel name="buttons_panel">
-		<button name="gear_btn" tool_tip="カメラプリセット"/>
-		<button name="save_preset_btn" label="プリセットとして保存する..."/>
-		<combo_box.item name="Use preset" label="プリセットを使用する"/>
-	</panel>
-	<combo_box name="preset_combo"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="camera_floater" help_topic="camera_floater" title="カメラ操作">
+  <floater.string name="rotate_tooltip">対象を中心にカメラを回す</floater.string>
+  <floater.string name="zoom_tooltip">対象にカメラをズーム</floater.string>
+  <floater.string name="move_tooltip">カメラを上下左右に移動</floater.string>
+  <floater.string name="free_mode_title">オブジェクト視点</floater.string>
+  <string name="inactive_combo_text">プリセットを使用</string>
+  <panel name="controls">
+    <!--TODO:
+    replace + - images -->
+    <panel name="zoom">
+      <joystick_rotate name="cam_rotate_stick" tool_tip="対象にカメラを追尾" />
+      <button name="zoom_plus_btn" />
+      <slider_bar tool_tip="対象にカメラをズーム" />
+      <button name="zoom_minus_btn" />
+      <joystick_track tool_tip="カメラを上下左右に動かします。" />
+      <text name="precise_ctrs_label">数値で角度方位を指定</text>
+    </panel>
+  </panel>
+  <panel name="buttons_panel">
+    <panel_camera_item name="front_view" tool_tip="前方視界" />
+    <panel_camera_item name="group_view" tool_tip="斜方視界" />
+    <panel_camera_item name="rear_view" tool_tip="後方視界" />
+    <panel_camera_item name="object_view" tool_tip="オブジェクト視点" />
+    <panel_camera_item name="mouselook_view" tool_tip="マウスルックビュー" />
+    <combo_box name="preset_combo">
+      <combo_list mouse_wheel_opaque="true" />
+      <combo_box.item label="プリセットを使用" name="Use preset" value="default" />
+    </combo_box>
+    <button name="gear_btn" tool_tip="カメラのプリセット" />
+    <button label="プリセットを保存…" name="save_preset_btn" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_camera_presets.xml b/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
index d394c0547c..37ce29a2e7 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
@@ -1,2 +1,4 @@
-<?xml version="1.0" ?>
-<floater name="floater_camera_presets" title="カメラプリセット"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="カメラのプリセット" name="floater_camera_presets">
+  <flat_list_view name="preset_list" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 7d91cb69ed..8fe572fc82 100644
--- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="グループ">
-	<text name="groupdesc">
-		グループを選択：
-	</text>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-</floater>
+  <text name="groupdesc">グループを選択：</text>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_classified.xml b/indra/newview/skins/default/xui/ja/floater_classified.xml
new file mode 100644
index 0000000000..2a5037d6e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_classified.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_classified" title="クラシファイド広告">
+  <panel name="main_panel" filename="panel_classified_info.xml" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index dc87d27a15..aeadcdced3 100644
--- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="ColorPicker" title="カラーピッカー">
-	<text name="r_val_text">
-		赤：
-	</text>
-	<text name="g_val_text">
-		緑：
-	</text>
-	<text name="b_val_text">
-		青：
-	</text>
-	<text name="h_val_text">
-		色相：
-	</text>
-	<text name="s_val_text">
-		色調：
-	</text>
-	<text name="l_val_text">
-		輝度：
-	</text>
-	<check_box label="すぐ適用" name="apply_immediate"/>
-	<button label="" label_selected="" name="color_pipette"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-	<button label="OK" label_selected="OK" name="select_btn"/>
-	<text name="Current color:">
-		現在の色：
-	</text>
-	<text name="(Drag below to save.)">
-		（下にドラッグして保存）
-	</text>
-</floater>
+  <tab_container name="color_type_container">
+    <panel name="RGB" label="RGB">
+      <text name="r_val_text">赤：</text>
+      <spinner name="rspin" />
+      <text name="g_val_text">緑：</text>
+      <spinner name="gspin" />
+      <text name="b_val_text">青：</text>
+      <spinner name="bspin" />
+    </panel>
+    <panel name="LSL" label="LSL">
+      <text name="r_val_text_float">赤：</text>
+      <spinner decimal_digits="3" name="rspin_float" />
+      <text name="g_val_text_float">緑：</text>
+      <spinner decimal_digits="3" name="gspin_float" />
+      <text name="b_val_text_float">青：</text>
+      <spinner decimal_digits="3" name="bspin_float" />
+    </panel>
+  </tab_container>
+  <text name="h_val_text">色相：</text>
+  <spinner name="hspin" />
+  <text name="s_val_text">彩度：</text>
+  <spinner name="sspin" />
+  <text name="l_val_text">輝度：</text>
+  <spinner name="lspin" />
+  <text name="hex_text">Hex #</text>
+  <line_editor name="hex_value" />
+  <check_box label="すぐ適用" name="apply_immediate" />
+  <button name="color_pipette" />
+  <button label="ＯＫ" name="select_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <text tool_tip="パレットの下にドラッグして保存" name="Current color:">現在の色：</text>
+  <menu_button menu_filename="menu_copy_color_picker.xml" name="clipboard_color" tool_tip="色のコピー時のオプション" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
index 98b1a59a0d..8e50a74897 100644
--- a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_conversation_log" title="会話ログ">
-	<panel name="buttons_panel">
-		<filter_editor label="人をフィルター" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
-	</panel>
-</floater>
+  <panel name="buttons_panel">
+    <filter_editor label="人物をフィルタ" name="people_filter_input" />
+    <menu_button name="conversation_view_btn" tool_tip="表示／並べ替えのオプション" />
+    <menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
index ea0b23de48..d05a2bcfba 100644
--- a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="会話:">
-	<floater.string name="Title">
-		会話:[NAME]
-	</floater.string>
-	<text name="page_label" value="ページ"/>
-</floater>
+<floater name="preview_conversation" title="会話：">
+  <floater.string name="Title">会話：[NAME]</floater.string>
+  <text name="page_label" value="ページ" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_create_landmark.xml b/indra/newview/skins/default/xui/ja/floater_create_landmark.xml
new file mode 100644
index 0000000000..eb0772b8b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_create_landmark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="create_landmark" title="ランドマーク作成">
+  <string name="favorites_bar">お気に入りバー</string>
+  <text name="title_label" value="ランドマークの追加" />
+  <text name="name_label" value="名前" />
+  <line_editor name="title_editor" />
+  <text name="folder_label" value="ランドマークの保存先：" />
+  <combo_box name="folder_combo" />
+  <text name="new_folder_textbox">[secondlife:/// フォルダを作成]</text>
+  <text name="notes_label" value="私のノート" />
+  <text_editor name="notes_editor" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
index f69c24622a..8bae565e65 100644
--- a/indra/newview/skins/default/xui/ja/floater_critical.xml
+++ b/indra/newview/skins/default/xui/ja/floater_critical.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
-	<button label="続行" label_selected="続行" name="Continue" />
-	<button label="取り消し" label_selected="取り消し" name="Cancel" />
-	<text name="tos_title">
-		クリティカルメッセージ
-	</text>
-	<text name="tos_heading">
-		次のメッセージを注意してよくお読みください。
-	</text>
-	<text_editor name="tos_text">
-		TOS_TEXT
-	</text_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container">
+  <button label="続行" label_selected="続行" name="Continue" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <text name="tos_title">重要なメッセージ</text>
+  <text name="tos_heading">次のメッセージを注意してよくお読みください。</text>
+  <text_editor name="tos_text">TOS_TEXT</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
index 50e508ad40..4d6f0e87ca 100644
--- a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Pref Preset" title="優先プリセットを削除">
-	<string name="title_graphic">
-		グラフィックプリセットを削除
-	</string>
-	<string name="title_camera">
-		カメラプリセットを削除
-	</string>
-	<text name="Preset">
-		プリセットを選択
-	</text>
-	<button label="削除" name="delete"/>
-	<button label="取り消し" name="cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="delete_pref_preset" title="プリセットの削除">
+
+  <string name="title_graphic">グラフィックのプリセットを削除</string>
+  <string name="title_camera">カメラのプリセットを削除</string>
+
+  <text name="Preset">プリセットを選択</text>
+  <combo_box name="preset_combo" />
+  <button label="削除" name="delete" />
+  <button label="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml
index b7f6ad4d4e..b7c3ede317 100644
--- a/indra/newview/skins/default/xui/ja/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ja/floater_destinations.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Destinations" title="行き先"/>
+<floater name="Destinations" title="行き先" />
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
index cc71b1cd9f..0c21cbd0da 100644
--- a/indra/newview/skins/default/xui/ja/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Display Name" title="表示名を変更">
-	<text name="info_text">
-		アバターにつけた名前があなたの表示名となります。表示名は週一回の頻度で変更することが可能です。
-	</text>
-	<text name="lockout_text">
-		表示名は次の日付まで変更できません：[TIME]。
-	</text>
-	<text name="set_name_label">
-		新しい表示名：
-	</text>
-	<text name="name_confirm_label">
-		新しい表示名を再入力して確認：
-	</text>
-	<button label="保存" name="save_btn" tool_tip="新しい表示名を保存"/>
-	<button label="リセット" name="reset_btn" tool_tip="表示名とユーザー名を統一"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <text name="info_text">アバターにつけた名前があなたの表示名になります。表示名は週に一回まで変更することができます。</text>
+  <text name="lockout_text">表示名は次の日付まで変更できません：[TIME]</text>
+  <text name="set_name_label">新しい表示名：</text>
+  <text name="name_confirm_label">新しい表示名を再入力して確認：</text>
+  <button label="保存" name="save_btn" tool_tip="この表示名を保存します。" />
+  <button label="リセット" name="reset_btn" tool_tip="表示名をユーザー名に戻します。" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
index 79c97472df..e81e1417b6 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
@@ -1,107 +1,111 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="env_edit_extdaycycle" title="デイサイクルを編集">
-	<string name="title_new">
-		新しいデイサイクルを作成
-	</string>
-	<string name="title_edit">
-		デイサイクルを編集
-	</string>
-	<string name="hint_new">
-		新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。
-	</string>
-	<string name="hint_edit">
-		自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。
-	</string>
-	<string name="time_label">
-		([HH]:[MM])
-	</string>
-	<string name="sky_track_label">
-		空 [ALT]
-	</string>
-	<string name="sky_label">
-		空
-	</string>
-	<string name="water_label">
-		水
-	</string>
-	<string name="commit_parcel">
-		区画に適用
-	</string>
-	<string name="commit_region">
-		リージョンに適用
-	</string>
-	<layout_stack name="outer_stack">
-		<layout_panel name="name_and_import">
-			<text name="label">
-				デイサイクル名：
-			</text>
-			<button label="インポート" name="btn_import" tool_tip="ディスクから過去の設定をインポートする。"/>
-		</layout_panel>
-		<layout_panel name="content">
-			<layout_stack name="content_stack">
-				<layout_panel name="timeline_track_selection">
-					<panel name="timeline_layers">
-						<button label="空 4" name="sky4_track"/>
-						<button label="空 3" name="sky3_track"/>
-						<button label="空 2" name="sky2_track"/>
-						<button label="地表レベル" name="sky1_track"/>
-						<button label="水" name="water_track"/>
-					</panel>
-					<panel name="timeline">
-						<text name="p0" value="0%[DSC]"/>
-						<text name="p1" value="25%[DSC]"/>
-						<text name="p2" value="50%[DSC]"/>
-						<text name="p3" value="75%[DSC]"/>
-						<text name="p4" value="100%[DSC]"/>
-						<multi_slider initial_value="0" name="WLTimeSlider"/>
-						<multi_slider initial_value="0" name="WLDayCycleFrames"/>
-						<text name="current_time" value="[PRCNT]%[DSC]"/>
-						<layout_stack>
-							<layout_panel>
-								<button label="トラックを以下からクローン" name="copy_track"/>
-								<button label="トラックを以下からロード" name="load_track"/>
-								<button label="トラックをクリア" name="clear_track"/>
-							</layout_panel>
-							<layout_panel>
-								<layout_stack name="progress_control">
-									<layout_panel name="skip_back">
-										<button name="skip_back_btn" tool_tip="後ろに移動"/>
-									</layout_panel>
-									<layout_panel name="skip_forward">
-										<button name="skip_forward_btn" tool_tip="前に移動"/>
-									</layout_panel>
-								</layout_stack>
-							</layout_panel>
-							<layout_panel>
-								<button label="[FRAME] を追加" name="add_frame"/>
-								<button label="[FRAME] をロード" name="btn_load_frame"/>
-								<button label="[FRAME] を削除" name="delete_frame"/>
-							</layout_panel>
-						</layout_stack>
-					</panel>
-				</layout_panel>
-				<layout_panel name="frame_edit_controls">
-					<text name="icn_lock_edit">
-						上部のタイムラインからキーフレームを選択し、設定を編集します。
-					</text>
-				</layout_panel>
-				<layout_panel name="frame_settings_water">
-					<tab_container name="water_tabs">
-						<panel label="水" name="water_panel"/>
-					</tab_container>
-				</layout_panel>
-				<layout_panel name="frame_settings_sky">
-					<tab_container name="sky_tabs">
-						<panel label="大気＆光" name="atmosphere_panel"/>
-						<panel label="雲" name="clouds_panel"/>
-						<panel label="太陽＆月" name="moon_panel"/>
-					</tab_container>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="buttons">
-			<button label="保存" name="save_btn"/>
-			<button label="キャンセル" name="cancel_btn"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+
+  <!-- obsolete?, add as hint for 'save' button? -->
+  <string name="title_new">新しいデイサイクルを作成</string>
+  <string name="title_edit">デイサイクルを編集</string>
+  <string name="hint_new">新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。</string>
+  <string name="hint_edit">自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。</string>
+
+  <!-- Substitutions -->
+  <string name="time_label">（[HH]：[MM]）</string>
+  <string name="sky_track_label">空[ALT]</string>
+  <string name="sky_label">空</string>
+  <string name="water_label">水</string>
+
+  <string name="commit_parcel">区画に適用</string>
+  <string name="commit_region">リージョン（地域）に適用</string>
+
+  <!-- Layout -->
+  <layout_stack name="outer_stack">
+    <layout_panel name="name_and_import">
+      <!-- This layout_panel is for loading legacy presets -->
+      <text name="label">デイサイクル名：</text>
+      <line_editor name="day_cycle_name" />
+      <button label="インポート" fname="btn_import" tool_tip="ディスクから過去の設定をインポートする。" />
+    </layout_panel>
+    <layout_panel name="content">
+      <layout_stack name="content_stack">
+        <layout_panel name="timeline_track_selection">
+          <panel name="timeline_layers">
+            <button label="空４" name="sky4_track" />
+            <button label="空３" name="sky3_track" />
+            <button label="空２" name="sky2_track" />
+            <button label="地表レベル" name="sky1_track" />
+            <button label="水面" name="water_track" />
+          </panel>
+          <panel name="timeline">
+            <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated,
+            consider using layout_stack to get dynamic width adjustment-->
+            <text value="0％[DSC]" />
+            <text name="p1" value="25％ [DSC]" />
+            <text name="p2" value="50％ [DSC]" />
+            <text name="p3" value="75％ [DSC]" />
+            <text name="p4" value="100％ [DSC]" />
+            <multi_slider name="WLTimeSlider" />
+
+            <multi_slider name="WLDayCycleFrames" />
+
+            <text name="current_time" value="[PRCNT]％ [DSC]" />
+
+            <layout_stack name="track_options_ls">
+              <layout_panel name="track_options_lp">
+                <button label="トラックを以下から複製" name="copy_track" />
+                <button label="トラックを以下から読み込み" name="load_track" />
+                <button label="トラックを消去" name="clear_track" />
+
+              </layout_panel>
+              <layout_panel name="track_progress_lp">
+                <layout_stack name="progress_control">
+
+                  <layout_panel name="skip_back">
+                    <button name="skip_back_btn" tool_tip="後ろに移動" />
+                  </layout_panel>
+
+                  <layout_panel name="play_layout" />
+
+                  <layout_panel name="pause_layout" />
+
+                  <layout_panel name="skip_forward" />
+                </layout_stack>
+              </layout_panel>
+              <layout_panel name="frames_lp">
+                <button label="[FRAME]を追加" name="add_frame" />
+                <button label="[FRAME]を読み込む" name="btn_load_frame" />
+                <button label="[FRAME]を削除" name="delete_frame" />
+              </layout_panel>
+            </layout_stack>
+          </panel>
+        </layout_panel>
+        <layout_panel name="frame_edit_controls">
+          <!--bg_alpha_color="blue" background_visible="true" -->
+          <text name="icn_lock_edit">上部のタイムラインからキーフレームを選択し、設定を編集します。</text>
+        </layout_panel>
+        <layout_panel name="frame_settings_water">
+          <tab_container name="water_tabs">
+            <panel filename="panel_settings_water.xml" label="水" name="water_panel" />
+          </tab_container>
+        </layout_panel>
+        <layout_panel name="frame_settings_sky">
+          <tab_container name="sky_tabs">
+            <panel filename="panel_settings_sky_atmos.xml" label="大気＆光源" name="atmosphere_panel" />
+            <panel filename="panel_settings_sky_clouds.xml" label="雲" name="clouds_panel" />
+            <panel filename="panel_settings_sky_sunmoon.xml" label="太陽＆月" name="moon_panel" />
+            <!-- added programatically so it doesn't show up whether we want it or not
+            <panel name="density_panel" label="密度" />
+            -->
+          </tab_container>
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="buttons">
+      <button label="保存" name="save_btn" />
+
+      <button label="" name="btn_flyout" />
+
+      <button label="キャンセル" name="cancel_btn" />
+
+    </layout_panel>
+  </layout_stack>
+
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
index ac5b2839d1..32c3f4d9cf 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="HoverHeight" title="ホバー高さの設定">
-	<slider label="高さ" name="HoverHeightSlider"/>
-</floater>
+  <slider label="高さ" name="HoverHeightSlider" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index ca50ba8ef8..b4b3e2c09d 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater can_resize="true" follows="all" height="400" help_topic="event_details" label="Event" layout="topleft" name="Event" save_rect="true" save_visibility="false" title="EVENT DETAILS" width="600">
-	<floater.string name="loading_text">
-		ローディング...
-	</floater.string>
-	<floater.string name="done_text">
-		完了
-	</floater.string>
-	<web_browser follows="left|right|top|bottom" height="365" layout="topleft" left="10" name="browser" top="0" trusted_content="true" width="580"/>
-	<text follows="bottom|left" height="16" layout="topleft" left_delta="0" name="status_text" top_pad="10" width="150"/>
-</floater>
+<floater label="イベント" name="Event" title="イベントの情報">
+  <floater.string name="loading_text">読み込んでいます…</floater.string>
+  <floater.string name="done_text">完了</floater.string>
+  <web_browser name="browser" />
+  <text name="status_text" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_experience_search.xml b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
index 37f3da7d73..1d9243fb85 100644
--- a/indra/newview/skins/default/xui/ja/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="experiencepicker" title="体験を選択"/>
+<floater name="experiencepicker" title="体験を選択" />
diff --git a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
index be9cfd8c01..f496e99032 100644
--- a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
@@ -1,85 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater title="EXPERIENCE PROFILE">
-	<floater.string name="empty_slurl">
-		(なし)
-	</floater.string>
-	<floater.string name="maturity_icon_general">
-		&quot;Parcel_PG_Light&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_moderate">
-		&quot;Parcel_M_Light&quot;
-	</floater.string>
-	<floater.string name="maturity_icon_adult">
-		&quot;Parcel_R_Light&quot;
-	</floater.string>
-	<text name="edit_title" value="体験プロフィール"/>
-	<tab_container name="tab_container">
-		<panel name="panel_experience_info">
-			<scroll_container name="xp_scroll">
-				<panel name="scrolling_panel">
-					<layout_stack>
-						<layout_panel name="top panel">
-							<button label="編集" name="edit_btn"/>
-						</layout_panel>
-						<layout_panel name="maturity panel">
-							<text name="ContentRating">
-								評価：
-							</text>
-						</layout_panel>
-						<layout_panel name="location panel">
-							<text name="Location">
-								場所：
-							</text>
-						</layout_panel>
-						<layout_panel>
-							<text name="Owner">
-								所有者：
-							</text>
-						</layout_panel>
-						<layout_panel name="group_panel">
-							<text name="Group">
-								グループ：
-							</text>
-						</layout_panel>
-						<layout_panel name="perm panel">
-							<button label="許可" name="allow_btn"/>
-							<button label="無視" name="forget_btn"/>
-							<button label="ブロック" name="block_btn"/>
-							<text name="privileged">
-								この体験はすべての住人に対して有効です。
-							</text>
-							<button label="嫌がらせの報告" name="report_btn"/>
-						</layout_panel>
-					</layout_stack>
-				</panel>
-			</scroll_container>
-		</panel>
-		<panel name="edit_panel_experience_info">
-			<scroll_container name="edit_xp_scroll">
-				<panel name="edit_scrolling_panel">
-					<text name="edit_experience_title_label" value="名前："/>
-					<text name="edit_experience_desc_label" value="説明："/>
-					<button label="グループ" name="Group_btn"/>
-					<text name="edit_ContentRating">
-						評価：
-					</text>
-					<icons_combo_box label="Moderate" name="edit_ContentRatingText" tool_tip="体験のレーティング区分を上げると、体験を許可したすべての住人の権限がリセットされます。">
-						<icons_combo_box.item label="Adult" name="Adult" value="42"/>
-						<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-						<icons_combo_box.item label="全般" name="PG" value="13"/>
-					</icons_combo_box>
-					<text name="edit_Location">
-						場所：
-					</text>
-					<button label="現在に設定" name="location_btn"/>
-					<button label="場所をクリア" name="clear_btn"/>
-					<check_box label="体験を有効にする" name="edit_enable_btn" tool_tip=""/>
-					<check_box label="検索で表示しない" name="edit_private_btn"/>
-					<text name="changes" value="体験がすべてのリージョンに表示されるには数分かかる場合があります。"/>
-					<button label="戻る" name="cancel_btn"/>
-					<button label="保存" name="save_btn"/>
-				</panel>
-			</scroll_container>
-		</panel>
-	</tab_container>
-</floater>
+<floater name="experience_profile" title="体験プロフィール">
+  <floater.string name="empty_slurl">（なし）</floater.string>
+  <floater.string name="maturity_icon_general">"Parcel_PG_Light"</floater.string>
+  <floater.string name="maturity_icon_moderate">"Parcel_M_Light"</floater.string>
+  <floater.string name="maturity_icon_adult">"Parcel_R_Light"</floater.string>
+  <text name="edit_title" value="体験プロフィール" />
+  <tab_container name="tab_container">
+    <panel name="panel_experience_info">
+      <scroll_container name="xp_scroll">
+        <panel name="scrolling_panel">
+          <layout_stack>
+            <layout_panel name="top panel">
+              <button label="編集" name="edit_btn" />
+            </layout_panel>
+            <layout_panel name="maturity panel">
+              <text name="ContentRating">評価：</text>
+            </layout_panel>
+            <layout_panel name="location panel">
+              <text name="Location">場所：</text>
+            </layout_panel>
+            <layout_panel>
+              <text name="Owner">所有者：</text>
+            </layout_panel>
+            <layout_panel name="group_panel">
+              <text name="Group">グループ：</text>
+            </layout_panel>
+            <layout_panel name="perm panel">
+              <button label="許可" name="allow_btn" />
+              <button label="無視" name="forget_btn" />
+              <button label="ブロック" name="block_btn" />
+              <text name="privileged">この体験はすべての住人に対して有効です。</text>
+              <button label="嫌がらせの報告" name="report_btn" />
+            </layout_panel>
+          </layout_stack>
+        </panel>
+      </scroll_container>
+    </panel>
+    <panel name="edit_panel_experience_info">
+      <scroll_container name="edit_xp_scroll">
+        <panel name="edit_scrolling_panel">
+          <text name="edit_experience_title_label" value="名前：" />
+          <text name="edit_experience_desc_label" value="説明：" />
+          <button label="グループ" name="Group_btn" />
+          <text name="edit_ContentRating">評価：</text>
+          <icons_combo_box label="Moderate" name="edit_ContentRatingText" tool_tip="体験のレーティング区分を上げると、体験を許可したすべての住人の権限がリセットされます。">
+            <icons_combo_box.item label="Adult" name="Adult" value="42" />
+            <icons_combo_box.item label="Moderate" name="Mature" value="21" />
+            <icons_combo_box.item label="全般" name="PG" value="13" />
+          </icons_combo_box>
+          <text name="edit_Location">場所：</text>
+          <button label="現在に設定" name="location_btn" />
+          <button label="場所をクリア" name="clear_btn" />
+          <check_box label="体験を有効にする" name="edit_enable_btn" tool_tip="" />
+          <check_box label="検索で表示しない" name="edit_private_btn" />
+          <text name="changes" value="体験がすべてのリージョンに表示されるには数分かかる場合があります。" />
+          <button label="戻る" name="cancel_btn" />
+          <button label="保存" name="save_btn" />
+        </panel>
+      </scroll_container>
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_experiences.xml b/indra/newview/skins/default/xui/ja/floater_experiences.xml
index 5186f8ee38..c17d570c27 100644
--- a/indra/newview/skins/default/xui/ja/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experiences.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_experiences" title="体験"/>
+<floater name="floater_experiences" title="体験">
+  <tab_container name="xp_tabs" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
index b226dfbfe1..7a41239ca4 100644
--- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="fast_timers">
-	<string name="pause">
-		一時停止
-	</string>
-	<string name="run">
-		走る
-	</string>
-	<combo_box name="time_scale_combo">
-		<item label="2x 平均" name="2x Average"/>
-		<item label="最大" name="Max"/>
-		<item label="最近の最大" name="Recent Max"/>
-		<item label="100ms" name="100ms"/>
-	</combo_box>
-	<combo_box name="metric_combo">
-		<item label="時間" name="Time"/>
-		<item label="通話数" name="Number of Calls"/>
-		<item label="Hz" name="Hz"/>
-	</combo_box>
-	<button label="一時停止" name="pause_btn"/>
-</floater>
+  <string name="pause">一時停止</string>
+  <string name="run">走る</string>
+  <combo_box name="time_scale_combo">
+    <item label="平均の２倍" name="2x Average" />
+    <item label="最大" name="Max" />
+    <item label="最近の最大" name="Recent Max" />
+    <item label="１００㎳" name="100ms" />
+  </combo_box>
+  <combo_box name="metric_combo">
+    <item label="時間" name="Time" />
+    <item label="通話数" name="Number of Calls" />
+    <item label="㎐" name="Hz" />
+  </combo_box>
+  <button label="一時停止" name="pause_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_fbc_web.xml b/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
new file mode 100644
index 0000000000..ab29b442cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_fbc_web" filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
index a00b87b990..888981b576 100644
--- a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Fixed Environment" title="固定された環境">
-	<string name="edit_sky">
-		空を編集：
-	</string>
-	<string name="edit_water">
-		水を編集：
-	</string>
-	<layout_stack name="floater_stack">
-		<layout_panel name="info_panel">
-			<button label="ロード" name="btn_load" tool_tip="持ち物から設定をロードする"/>
-			<button label="インポート" name="btn_import" tool_tip="ディスクから過去の設定をインポートする。"/>
-		</layout_panel>
-		<layout_panel name="button_panel">
-			<layout_stack name="button_bar_ls">
-				<layout_panel name="save_btn_lp">
-					<button label="保存" name="btn_commit"/>
-				</layout_panel>
-				<layout_panel name="revert_btn_lp">
-					<button label="キャンセル" name="btn_cancel" tool_tip="最後に保存された状態に戻す"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <string name="edit_sky">空を編集：</string>
+  <string name="edit_water">水を編集</string>
+  <layout_stack name="floater_stack">
+    <layout_panel name="info_panel">
+      <text name="info_panel_label">名前：</text>
+      <line_editor name="settings_name" />
+      <button label="読み込む" tool_tip="インベントリから設定を読み込みます。" />
+      <button label="インポート" tool_tip="ディスクから過去の設定をインポートします。" />
+    </layout_panel>
+    <layout_panel name="tab_area">
+      <tab_container name="tab_settings">
+        <!-- Tabs inserted here in code -->
+      </tab_container>
+    </layout_panel>
+    <layout_panel name="button_panel">
+      <layout_stack name="button_bar_ls">
+        <layout_panel name="save_btn_lp">
+          <button label="保存" name="btn_commit" />
+          <button name="btn_flyout" />
+        </layout_panel>
+        <layout_panel name="revert_btn_lp">
+          <button label="キャンセル" name="btn_cancel" tool_tip="最後に保存された状態に戻す。" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
index b853f395dd..1953e9010b 100644
--- a/indra/newview/skins/default/xui/ja/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml
@@ -1,6 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="フォントのテスト">
-	<text name="linea">
-		オーバーライドテスト - Times Romanでここに表示されます。 （default/xui/en-us フォルダー内）
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="フォントテスト">
+  <text type="string" length="1" bottom_delta="40" follows="left|top|right" height="16" layout="topleft" left="16">小さいサンセリフ</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifMedium" height="16" layout="topleft" left="16">普通の大きさのサンセリフ</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">サンセリフ。スタイル設定無し（普通の大きさと同じ） </text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" height="16" layout="topleft" left="16">大きいサンセリフ</text>
+  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" height="32" layout="topleft" left="16">サンセリフ size=huge</text>
+  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" font.style.="BOLD" height="32" layout="topleft" left="16">巨大なサンセリフ style=BOLD</text>
+  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifBold" font.size="Huge" height="32" layout="topleft" left="16">ボールドのサンセリフ size=huge</text>
+  <text type="string" length="1" bottom_delta="40" follows="left|top|right" font="Monospace" height="16" layout="topleft" left="16">等幅</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Monospace" font.size="Large" height="16" layout="topleft" left="16">等幅 size=large</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" font.style="BOLD" height="16" layout="topleft" left="16">大きなサンセリフ style=BOLD</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifBold" height="16" layout="topleft" left="16">ボールドのサンセリフ</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD" height="16" layout="topleft" left="16">サンセリフ style=BOLD（ボールドのサンセリフと一緒）</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="ITALIC" height="16" layout="topleft" left="16">サンセリフ style=ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">サンセリフ style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">サンセリフ style=BOLD|ITALIC shadow=soft</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="UNDERLINE" height="16" layout="topleft" left="16">サンセリフ style=UNDERLINE</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font_shadow="none" height="16" layout="topleft" left="16">サンセリフ style=hard</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">サンセリフ shadow=soft</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" height="16" layout="topleft" left="16">DejaVu</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD" height="16" layout="topleft" left="16">DejaVu style=BOLD</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="ITALIC" height="16" layout="topleft" left="16">DejaVu style=ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">DejaVu style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">DejaVu size=Large style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" height="16" layout="topleft" left="16">Helvetica</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD" height="16" layout="topleft" left="16">Helvetica style=BOLD</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="ITALIC" height="16" layout="topleft" left="16">Helvetica style=ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">Helvetica style=BOLD|ITALIC</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">Helvetica size=Large style=BOLD|ITALIC</text>
+  <!--
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="OverrideTest" height="16" layout="topleft" left="16" name="linea">OverrideTest, should be times, from default/xui/en</text>
+  <text type="string" length="1" bottom_delta="20" follows="left|top|right" height="16" layout="topleft" left="16">BogusFontName</text>
+  -->
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_forget_user.xml b/indra/newview/skins/default/xui/ja/floater_forget_user.xml
index 63d6d05a5e..9099bd8784 100644
--- a/indra/newview/skins/default/xui/ja/floater_forget_user.xml
+++ b/indra/newview/skins/default/xui/ja/floater_forget_user.xml
@@ -1,2 +1,9 @@
-<?xml version="1.0" ?>
-<floater name="groups" title="記憶されたユーザー名"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="groups" title="記録済みのユーザ名">
+  <scroll_list name="user_list">
+    <scroll_list.columns name="user" />
+  </scroll_list>
+  <!-- 原文はForgotだが「忘れる」という翻訳はおかしいので削除に変更 -->
+  <button label="削除" label_selected="削除" name="forget" />
+  <check_box height="20" label="このユーザー名のローカルデータも削除する" name="delete_data" tool_tip="削除対象：チャット履歴、最後のセッションのスクリーンショット、ブラウザのCookie、テレポート履歴、ツールバー設定など。一部のローカルファイルは、グリッド間で共有されます。" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index b5b1efe386..96d3c87835 100644
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="場所" name="gestures" title="ジェスチャー">
-	<floater.string name="loading">
-		ローディング...
-	</floater.string>
-	<floater.string name="playing">
-		（再生中）
-	</floater.string>
-	<floater.string name="copy_name">
-		[COPY_NAME] のコピー
-	</floater.string>
-	<scroll_list name="gesture_list">
-		<scroll_list.columns label="名前" name="name"/>
-		<scroll_list.columns label="チャット" name="trigger"/>
-		<scroll_list.columns label="" name="key"/>
-		<scroll_list.columns label="キー" name="shortcut"/>
-	</scroll_list>
-	<panel label="bottom_panel" name="bottom_panel">
-		<menu_button name="gear_btn" tool_tip="詳細オプション"/>
-		<button name="new_gesture_btn" tool_tip="新規ジェスチャーを作成"/>
-		<button name="activate_btn" tool_tip="選択したジェスチャーのアクティベートの有無"/>
-		<button name="del_btn" tool_tip="このジェスチャーを削除"/>
-	</panel>
-	<button label="編集" name="edit_btn" tool_tip="選択済みのジェスチャーを編集するためにウィンドウを開ける。"/>
-	<button label="再生" name="play_btn" tool_tip="インワールドで選択済みのジェスチャーを実行する。"/>
-	<button label="停止" name="stop_btn"/>
-</floater>
+  <floater.string name="loading">読み込んでいます…。</floater.string>
+  <floater.string name="playing">（再生中）</floater.string>
+  <floater.string name="copy_name">[COPY_NAME]のコピー</floater.string>
+  <scroll_list name="gesture_list">
+    <scroll_list.columns label="名前" name="name" />
+    <scroll_list.columns label="チャット" name="trigger" />
+    <scroll_list.columns label="" name="key" />
+    <scroll_list.columns label="キー" name="shortcut" />
+  </scroll_list>
+  <panel label="bottom_panel" name="bottom_panel">
+    <menu_button name="gear_btn" tool_tip="詳細オプション" />
+    <button name="new_gesture_btn" tool_tip="新しいジェスチャーを作成" />
+    <button name="activate_btn" tool_tip="選択したジェスチャーの有効化／無効化" />
+    <button name="del_btn" tool_tip="このジェスチャーを削除" />
+  </panel>
+  <button label="編集" name="edit_btn" tool_tip="選択したジェスチャーの編集ウィンドウを開く。" />
+  <button label="再生" name="play_btn" tool_tip="インワールドで選択したジェスチャーを実行する。" />
+  <button label="停止" name="stop_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 9e5d473db7..22a6eedd0d 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -1,98 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="godtools floater" title="ゴッド・ツール">
-	<tab_container name="GodTools Tabs">
-		<panel label="グリッド" name="grid">
-			<button label="この地域の地図の表示キャッシュを消去" label_selected="この地域の地図の表示キャッシュを消去" name="Flush This Region&apos;s Map Visibility Caches"/>
-		</panel>
-		<panel label="地域" name="region">
-			<text name="Region Name:">
-				リージョン名：
-			</text>
-			<check_box label="準備" name="check prelude" tool_tip="この設定により、この地域の準備をします。"/>
-			<check_box label="太陽固定" name="check fixed sun" tool_tip="太陽位置を固定（[地域／不動産]＞[地形]の場合と同様）"/>
-			<check_box label="テレポートのホームをリセット" name="check reset home" tool_tip="住人がテレポートで外に出たら、ホームを目的地にリセットします。"/>
-			<check_box label="可視" name="check visible" tool_tip="この設定により、この地域をゴッド・モード以外でも可視にします。"/>
-			<check_box label="ダメージ" name="check damage" tool_tip="この設定により、この地域内でダメージを有効化します。"/>
-			<check_box label="トラフィック・トラッキングをブロック" name="block dwell" tool_tip="この設定により、この地域内のトラフィック計算をオフにします。"/>
-			<check_box label="地形編集をブロック" name="block terraform" tool_tip="この設定により、この地域内での土地整備を禁止"/>
-			<check_box label="サンドボックス" name="is sandbox" tool_tip="これがサンドボックス地域でも切り替え"/>
-			<button label="地形を構築する" label_selected="地形を構築する" name="Bake Terrain" tool_tip="現在の地形をデフォルトとして保存します。"/>
-			<button label="地形を元に戻す" label_selected="地形を元に戻す" name="Revert Terrain" tool_tip="現在の地形をデフォルトに置換します。"/>
-			<button label="地形を交換" label_selected="地形を交換" name="Swap Terrain" tool_tip="現在の地形をデフォルトと入れ替えます。"/>
-			<text name="estate id">
-				不動産ID：
-			</text>
-			<text name="parent id">
-				親ID：
-			</text>
-			<line_editor name="parentestate" tool_tip="これは、この地域の親不動産です。"/>
-			<text name="Grid Pos: ">
-				グリッド位置：
-			</text>
-			<line_editor name="gridposx" tool_tip="これは、この地域のグリッドxの位置です。"/>
-			<line_editor name="gridposy" tool_tip="これは、この地域のグリッドyの位置です。"/>
-			<text name="Redirect to Grid: ">
-				グリッドにリダ
-イレクト：
-			</text>
-			<text name="billable factor text">
-				請求率：
-			</text>
-			<text name="land cost text">
-				平方メートル当
-たりL$：
-			</text>
-			<button label="更新" label_selected="更新" name="Refresh" tool_tip="上記の情報を更新するには、ここをクリックします。"/>
-			<button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。"/>
-			<button label="地域を選択" label_selected="地域を選択" name="Select Region" tool_tip="土地ツールで地域全体を選択してください。"/>
-			<button label="ただちに自動保存する" label_selected="ただちに自動保存する" name="Autosave now" tool_tip="Gzip状態を自動保存ディレクトリに保存します。"/>
-		</panel>
-		<panel label="オブジェクト" name="objects">
-			<panel.string name="no_target">
-				（ターゲットなし）
-			</panel.string>
-			<text name="Region Name:">
-				リージョン名：
-			</text>
-			<text name="region name">
-				ウェルシュ
-			</text>
-			<check_box label="スクリプトを無効化" name="disable scripts" tool_tip="この設定により、この地域内のスクリプトをすべて無効化"/>
-			<check_box label="衝突を無効化" name="disable collisions" tool_tip="この設定により、この地域内の非エージェント衝突を無効化"/>
-			<check_box label="物理作用を無効化" name="disable physics" tool_tip="この設定により、この地域内の物理的作用をすべて無効化"/>
-			<button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。"/>
-			<button label="対象の設定" label_selected="対象の設定" name="Set Target" tool_tip="オブジェクト削除の対象となるアバターを設定してください。"/>
-			<text name="target_avatar_name">
-				（対象なし）
-			</text>
-			<button label="他の土地における対象のスクリプト・オブジェクトを削除" label_selected="他の土地における対象のスクリプト・オブジェクトを削除" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="この地域において対象が所有していないスクリプト・オブジェクトをすべて削除します。 （コピー禁止）オブジェクトは返却されます。"/>
-			<button label="「すべての」土地における対象のスクリプト・オブジェクトを削除" label_selected="「すべての」土地における対象のスクリプト・オブジェクトを削除" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="この地域において対象が所有しているスクリプト・オブジェクトをすべて削除します。 （コピー禁止）オブジェクトは返却されます。"/>
-			<button label="対象のオブジェクトを「すべて」削除" label_selected="対象のオブジェクトを「すべて」削除" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="この地域において対象が所有しているオブジェクトをすべて削除します。 （コピー禁止）オブジェクトは返却されます。"/>
-			<button label="トップ・コライダーを取得" label_selected="トップ・コライダーを取得" name="Get Top Colliders" tool_tip="最も段階の狭いコールバックが発生したオブジェクトのリストを取得します。"/>
-			<button label="トップ・スクリプトを取得" label_selected="トップ・スクリプトを取得" name="Get Top Scripts" tool_tip="スクリプトの起動に最も時間を費やしているオブジェクトのリストを取得します。"/>
-			<button label="スクリプト・ダイジェスト" label_selected="スクリプト・ダイジェスト" name="Scripts digest" tool_tip="すべてのスクリプトとそれらの使用回数のリストを取得します。"/>
-		</panel>
-		<panel label="要求" name="request">
-			<text name="Destination:">
-				目的地：
-			</text>
-			<combo_box name="destination">
-				<combo_box.item label="選択" name="item1"/>
-				<combo_box.item label="エージェント地域" name="item2"/>
-			</combo_box>
-			<text name="Request:">
-				要求：
-			</text>
-			<combo_box name="request">
-				<combo_box.item label="コライダー＜ステップ＞" name="item1"/>
-				<combo_box.item label="スクリプト＜回数＞、＜オプション・パターン＞" name="item2"/>
-				<combo_box.item label="オブジェクト＜パターン＞" name="item3"/>
-				<combo_box.item label="rez ＜asset_id＞" name="item4"/>
-			</combo_box>
-			<text name="Parameter:">
-				パラメーター：
-			</text>
-			<button label="リクエストする" label_selected="リクエストする" name="Make Request"/>
-		</panel>
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="ゴッド・ツール">
+  <tab_container name="GodTools Tabs">
+    <panel label="グリッド" name="grid">
+      <button label="このリージョン（地域）のマップの表示キャッシュを消去" label_selected="このリージョン（地域）のマップの表示キャッシュを消去" name="Flush This Region's Map Visibility Caches" />
+    </panel>
+    <panel label="地域" name="region">
+      <text name="Region Name:">リージョン（地域）名：</text>
+      <check_box label="準備" name="check prelude" tool_tip="この設定により、この地域の準備をします。" />
+      <check_box label="太陽固定" name="check fixed sun" tool_tip="太陽位置を固定（「地域／不動産」＞「地形」の場合と同様）" />
+      <check_box label="テレポートのホームをリセット" name="check reset home" tool_tip="住人がテレポートで外に出たら、ホームを目的地にリセットします。" />
+      <check_box label="可視" name="check visible" tool_tip="この設定により、この地域をゴッド・モード以外でも可視にします。" />
+      <check_box label="ダメージ" name="check damage" tool_tip="この設定により、この地域内でダメージを有効化します。" />
+      <check_box label="トラフィックのトラッキングをブロック" name="block dwell" tool_tip="この設定により、この地域内のトラフィック計算をオフにします。" />
+      <check_box label="地形編集をブロック" name="block terraform" tool_tip="この設定により、この地域内での土地整備を禁止" />
+      <check_box label="サンドボックス" name="is sandbox" tool_tip="これがサンドボックス地域でも切り替え" />
+      <button label="地形を構築する" label_selected="地形を構築する" name="Bake Terrain" tool_tip="現在の地形をデフォルトとして保存します。" />
+      <button label="地形を元に戻す" label_selected="地形を元に戻す" name="Revert Terrain" tool_tip="現在の地形をデフォルトに置換します。" />
+      <button label="地形を交換" label_selected="地形を交換" name="Swap Terrain" tool_tip="現在の地形をデフォルトと入れ替えます。" />
+      <text name="estate id">不動産ＩＤ：</text>
+      <text name="parent id">親ＩＤ：</text>
+      <line_editor name="parentestate" tool_tip="これは、このリージョン（地域）の親不動産です。" />
+      <text name="Grid Pos: ">グリッド位置：</text>
+      <line_editor name="gridposx" tool_tip="これは、このリージョン（地域）のグリッドＸ座標です。" />
+      <line_editor name="gridposy" tool_tip="これは、このリージョン（地域）のグリッドＹ座標です。" />
+      <text name="Redirect to Grid: ">グリッドにリダイレクト：</text>
+      <text name="billable factor text">請求率：</text>
+      <text name="land cost text">㎡当たりのL$：</text>
+      <button label="更新" label_selected="更新" name="Refresh" tool_tip="上記の情報を更新するには、ここをクリックします。" />
+      <button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。" />
+      <button label="リージョン（地域）を選択" label_selected="地域を選択" name="Select Region" tool_tip="土地ツールで地域全体を選択してください。" />
+      <button label="ただちに自動保存する" label_selected="ただちに自動保存する" name="Autosave now" tool_tip="Gzip状態を自動保存ディレクトリに保存します。" />
+    </panel>
+    <panel label="オブジェクト" name="objects">
+      <panel.string name="no_target">（ターゲットなし）</panel.string>
+      <text name="Region Name:">リージョン（地域）名：</text>
+      <text name="region name">ウェルシュ</text>
+      <check_box label="スクリプトを無効化" name="disable scripts" tool_tip="この設定により、この地域内のスクリプトをすべて無効化" />
+      <check_box label="衝突を無効化" name="disable collisions" tool_tip="この設定により、この地域内の非エージェント衝突を無効化" />
+      <check_box label="物理作用を無効化" name="disable physics" tool_tip="この設定により、この地域内の物理的作用をすべて無効化" />
+      <button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。" />
+      <button label="対象の設定" label_selected="対象の設定" name="Set Target" tool_tip="オブジェクト削除の対象となるアバターを設定してください。" />
+      <text name="target_avatar_name">（対象なし）</text>
+      <button label="他の土地における対象のスクリプト・オブジェクトを削除" label_selected="他の土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On Others Land" tool_tip="この地域において対象が所有していないスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
+      <button label="「すべての」土地における対象のスクリプト・オブジェクトを削除" label_selected="「すべての」土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="この地域において対象が所有しているスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
+      <button label="対象のオブジェクトを「すべて」削除" label_selected="対象のオブジェクトを「すべて」削除" name="Delete *ALL* Of Target's Objects" tool_tip="この地域において対象が所有しているオブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
+      <button label="トップ・コライダーを取得" label_selected="トップ・コライダーを取得" name="Get Top Colliders" tool_tip="最も段階の狭いコールバックが発生したオブジェクトのリストを取得します。" />
+      <button label="トップ・スクリプトを取得" label_selected="トップ・スクリプトを取得" name="Get Top Scripts" tool_tip="スクリプトの起動に最も時間を費やしているオブジェクトのリストを取得します。" />
+      <button label="スクリプト・ダイジェスト" label_selected="スクリプト・ダイジェスト" name="Scripts digest" tool_tip="すべてのスクリプトとそれらの使用回数のリストを取得します。" />
+    </panel>
+    <panel label="要求" name="request">
+      <text name="Destination:">目的地：</text>
+      <combo_box name="destination">
+        <combo_box.item label="選択" name="item1" />
+        <combo_box.item label="エージェント地域" name="item2" />
+      </combo_box>
+      <text name="Request:">要求：</text>
+      <combo_box name="request">
+        <combo_box.item label="コライダー＜ステップ＞" name="item1" />
+        <combo_box.item label="スクリプト＜回数＞、＜オプション・パターン＞" name="item2" />
+        <combo_box.item label="オブジェクト＜パターン＞" name="item3" />
+        <combo_box.item label="rez ＜アセットＩＤ＞" name="item4" />
+      </combo_box>
+      <text name="Parameter:">パラメーター：</text>
+      <button label="リクエストする" label_selected="リクエストする" name="Make Request" />
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_goto_line.xml b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
index 5f2717ace5..c403d24942 100644
--- a/indra/newview/skins/default/xui/ja/floater_goto_line.xml
+++ b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script goto" title="行に移動">
-	<button label="OK" label_selected="OK" name="goto_btn"/>
-	<text name="txt">
-		行に移動
-	</text>
-</floater>
+  <button label="ＯＫ" label_selected="ＯＫ" name="goto_btn" />
+  <text name="txt">行に移動</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
index 15200d7ef7..dfc5eb1250 100644
--- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_help_browser" title="ヘルプブラウザ">
-	<floater.string name="loading_text">
-		ローディング...
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="external_controls"/>
-	</layout_stack>
-</floater>
+  <floater.string name="loading_text">読み込んでいます…。</floater.string>
+  <layout_stack name="stack1">
+    <layout_panel name="external_controls" />
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml
index 4cebe27226..3a02e5f889 100644
--- a/indra/newview/skins/default/xui/ja/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/ja/floater_how_to.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_how_to" title="ハウツー"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_how_to" title="ウェルカムアイランドガイドブック" filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
index e3841c2cd9..862991f87e 100644
--- a/indra/newview/skins/default/xui/ja/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hud.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_hud" title="チュートリアル"/>
+<floater name="floater_hud" title="チュートリアル" />
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index a155efdc1e..81c89fe9bc 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="floater_im_box" title="会話">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
-					<button name="add_btn" tool_tip="新しい会話を開始"/>
-					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
-					<text name="stub_textbox">
-						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+  <string name="collapse_icon" value="Conv_toolbar_collapse" />
+  <string name="expand_icon" value="Conv_toolbar_expand" />
+  <layout_stack name="conversations_stack">
+    <layout_panel name="conversations_layout_panel">
+      <layout_stack name="conversations_pane_buttons_stack">
+        <layout_panel name="conversations_pane_buttons_expanded">
+          <menu_button name="sort_btn" tool_tip="オプションの表示／並べ替え" />
+          <button name="add_btn" tool_tip="新しい会話を開始" />
+          <button name="speak_btn" tool_tip="マイクを使って人と話す" />
+        </layout_panel>
+        <layout_panel name="conversations_pane_buttons_collapsed">
+          <button name="expand_collapse_btn" tool_tip="このリストを閉じる／開く" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="messages_layout_panel">
+      <panel_container name="im_box_tab_container">
+        <panel name="stub_panel">
+          <button name="stub_collapse_btn" tool_tip="このペインを閉じる" />
+          <text name="stub_textbox">この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]</text>
+        </panel>
+      </panel_container>
+    </layout_panel>
+  </layout_stack>
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index 7ed46f7f01..aa73f53677 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,57 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
-	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
-	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
-	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
-				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
-				<button name="close_btn" tool_tip="この会話を終了する"/>
-				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<layout_stack name="translate_and_chat_stack">
-							<layout_panel name="translate_chat_checkbox_lp">
-								<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-							</layout_panel>
-						</layout_stack>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="宛先" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
-</floater>
+  <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
+  <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
+  <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line" />
+  <floater.string name="expandline_icon" value="Conv_expand_one_line" />
+  <floater.string name="collapse_icon" value="Conv_toolbar_collapse" />
+  <floater.string name="expand_icon" value="Conv_toolbar_expand" />
+  <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne" />
+  <floater.string name="return_icon" value="Conv_toolbar_arrow_sw" />
+  <floater.string name="participant_added" value="[NAME]に会話を招待されました。" />
+  <floater.string name="multiple_participants_added" value="[NAME]は会話に招待されました。" />
+  <floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する" />
+  <floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す" />
+  <floater.string name="start_call_button_tooltip" value="会話の接続を開く" />
+  <floater.string name="end_call_button_tooltip" value="会話の接続を閉じる" />
+  <floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる" />
+  <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる" />
+  <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く" />
+  <view name="contents_view">
+    <layout_stack name="main_stack">
+      <layout_panel name="toolbar_panel">
+        <menu_button name="view_options_btn" tool_tip="表示／並べ替えのオプション" />
+        <menu_button name="gear_btn" tool_tip="選択した人に対するアクション" />
+        <button name="add_btn" tool_tip="この会話に他の人を追加する" />
+        <button name="voice_call_btn" tool_tip="会話の接続を開く" />
+        <button name="close_btn" tool_tip="この会話を終了する" />
+        <button name="expand_collapse_btn" tool_tip="このペインを閉じる／開く" />
+      </layout_panel>
+      <layout_panel name="body_panel">
+        <layout_stack name="im_panels">
+          <layout_panel name="right_part_holder">
+            <layout_stack name="translate_and_chat_stack">
+              <layout_panel name="translate_chat_checkbox_lp">
+                <check_box label="チャットを翻訳" name="translate_chat_checkbox" />
+              </layout_panel>
+            </layout_stack>
+          </layout_panel>
+        </layout_stack>
+      </layout_panel>
+      <layout_panel name="chat_layout_panel">
+        <layout_stack name="input_panels">
+          <layout_panel name="input_editor_layout_panel">
+            <chat_editor label="送信先" name="chat_editor" />
+          </layout_panel>
+          <layout_panel name="input_button_layout_panel">
+            <button name="minz_btn" tool_tip="メッセージパネルの表示／非表示" />
+          </layout_panel>
+        </layout_stack>
+      </layout_panel>
+    </layout_stack>
+  </view>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index 1ffc27fd70..5391591f36 100644
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<text name="preview_label">
-		プレビュー：
-	</text>
-	<combo_box label="服の種類" name="clothing_type_combo">
-		<item label="画像" name="Image" value="画像"/>
-		<item label="髪" name="Hair" value="髪"/>
-		<item label="女性の頭" name="FemaleHead" value="女性の頭"/>
-		<item label="女性の上半身" name="FemaleUpperBody" value="女性の上半身"/>
-		<item label="女性の下半身" name="FemaleLowerBody" value="女性の下半身"/>
-		<item label="男性の頭" name="MaleHead" value="男性の頭"/>
-		<item label="男性の上半身" name="MaleUpperBody" value="男性の上半身"/>
-		<item label="男性の下半身" name="MaleLowerBody" value="男性の下半身"/>
-		<item label="スカート" name="Skirt" value="スカート"/>
-		<item label="スカルプトプリム" name="SculptedPrim" value="スカルプトプリム"/>
-	</combo_box>
-	<text name="bad_image_text">
-		イメージを読み取れません。
-
-24bitTarga(.tga)でイメージを保存してください。
-	</text>
-	<check_box label="可逆圧縮" name="lossless_check"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="アップロードﾞL$[AMOUNT]" name="ok_btn"/>
-</floater>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <text name="preview_label">プレビュー：</text>
+  <combo_box label="服装の種類" name="clothing_type_combo">
+    <item label="画像" name="Image" value="画像" />
+    <item label="髪型" name="Hair" value="髪型" />
+    <item label="女性の頭" name="FemaleHead" value="女性の頭" />
+    <item label="女性の上半身" name="FemaleUpperBody" value="女性の上半身" />
+    <item label="女性の下半身" name="FemaleLowerBody" value="女性の下半身" />
+    <item label="男性の頭" name="MaleHead" value="男性の頭" />
+    <item label="男性の上半身" name="MaleUpperBody" value="男性の上半身" />
+    <item label="男性の下半身" name="MaleLowerBody" value="男性の下半身" />
+    <item label="スカート" name="Skirt" value="スカート" />
+    <item label="スカルプトプリム" name="SculptedPrim" value="スカルプトプリム" />
+  </combo_box>
+  <text name="bad_image_text">画像を読み込めませんでした。
+24bitのTarga（.tga）形式で画像を保存してください。</text>
+  <check_box label="可逆圧縮" name="lossless_check" />
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="アップロードﾞL$[AMOUNT]" name="ok_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
index 65edafb169..5040450015 100644
--- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
@@ -1,23 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Import Collada" title="風景のインポート">
-	<text name="mesh count">
-		メッシュ： [COUNT]
-	</text>
-	<text name="texture count">
-		テクスチャ： [COUNT]
-	</text>
-	<text name="status">
-		ステータス： [STATUS]
-	</text>
-	<button label="取り消し" name="cancel"/>
-	<button label="OK" name="ok"/>
-	<string name="status_idle">
-		待機状態
-	</string>
-	<string name="status_uploading">
-		[NAME]をアップロード中
-	</string>
-	<string name="status_creating">
-		オブジェクト[NAME]を作成中
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="風景のインポート">
+  <text name="mesh count">メッシュ：[COUNT]</text>
+  <text name="texture count">テクスチャ：[COUNT]</text>
+  <text name="status">ステータス：[STATUS]</text>
+  <button label="キャンセル" name="cancel" />
+  <button label="ＯＫ" name="ok" />
+  <string name="status_idle">待機状態</string>
+  <string name="status_uploading">[NAME]をアップロード中</string>
+  <string name="status_creating">オブジェクト[NAME]を作成中</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index 308f6f9a3d..dc42f741c5 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -1,33 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="incoming call" title="着信">
-	<floater.string name="lifetime">
-		5
-	</floater.string>
-	<floater.string name="localchat">
-		近くのボイスチャット
-	</floater.string>
-	<floater.string name="anonymous">
-		匿名ユーザー
-	</floater.string>
-	<floater.string name="VoiceInviteP2P">
-		からコールを受けています。
-	</floater.string>
-	<floater.string name="VoiceInviteAdHoc">
-		がコンファレンスチャットで、ボイスチャットに参加しました。
-	</floater.string>
-	<floater.string name="VoiceInviteGroup">
-		&apos;[GROUP]&apos;のボイスチャネルに参加なさいました。
-	</floater.string>
-	<floater.string name="VoiceInviteQuestionGroup">
-		[CURRENT_CHAT]を退席して、&apos;[GROUP]&apos;とのチャットに参加しますか？
-	</floater.string>
-	<floater.string name="VoiceInviteQuestionDefault">
-		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
-	</floater.string>
-	<text name="question">
-		コールに応答すると、現在のボイスチャットから切断されます。
-	</text>
-	<button label="取る" label_selected="取る" name="Accept"/>
-	<button label="無視" label_selected="無視" name="Reject"/>
-	<button label="代わりに IM を開く" name="Start IM"/>
-</floater>
+  <floater.string name="lifetime">5</floater.string>
+  <floater.string name="localchat">近隣のボイスチャット</floater.string>
+  <floater.string name="anonymous">匿名ユーザー</floater.string>
+  <floater.string name="VoiceInviteP2P">からコールを受けています。</floater.string>
+  <floater.string name="VoiceInviteAdHoc">が会話チャットで、ボイスチャットに参加しました。</floater.string>
+  <floater.string name="VoiceInviteGroup">「[GROUP]」のボイスチャネルに参加なさいました。</floater.string>
+  <floater.string name="VoiceInviteQuestionGroup">[CURRENT_CHAT]を退席して、「[GROUP]」とのチャットに参加しますか？</floater.string>
+  <floater.string name="VoiceInviteQuestionDefault">[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？</floater.string>
+  <text name="question">コールに応答すると、現在のボイスチャットから切断されます。</text>
+  <button label="取る" label_selected="取る" name="Accept" />
+  <button label="無視" label_selected="無視" name="Reject" />
+  <button label="代わりにIMを開く" name="Start IM" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index b3825c0b7f..dfbf698c7e 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="450" name="inspect" title="オブジェクトのチェック">
-	<floater.string name="timeStamp">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</floater.string>
-	<scroll_list name="object_list" tool_tip="リストからオブジェクトを選択し、インワールドで強調表示します。">
-		<scroll_list.columns label="名前" name="object_name"/>
-		<scroll_list.columns label="所有者名" name="owner_name"/>
-		<scroll_list.columns label="制作者名" name="creator_name"/>
-		<scroll_list.columns label="作成日" name="creation_date"/>
-	</scroll_list>
-	<button label="所有者のプロフィールを表示..." name="button owner" tool_tip="選択したオブジェクトの所有者のプロフィールを表示します" width="180"/>
-	<button label="制作者のプロフィールを表示..." name="button creator" tool_tip="選択したオブジェクトの制作者のプロフィールを表示します" width="180"/>
-</floater>
+<floater name="inspect" title="オブジェクトの調査">
+  <floater.string name="timeStamp">[year,datetime,slt]年[mth,datetime,slt]月[day,datetime,slt]日（[wkday,datetime,slt]）　[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]</floater.string>
+  <scroll_list name="object_list" tool_tip="このリストからオブジェクトを選択して、インワールドでハイライトします。">
+    <scroll_list.columns label="オブジェクト名" name="object_name" />
+    <scroll_list.columns label="所有者" name="owner_name" />
+    <scroll_list.columns label="制作者" name="creator_name" />
+    <scroll_list.columns label="制作日" name="creation_date" />
+    <scroll_list.commit_callback function="Inspect.SelectObject" />
+  </scroll_list>
+  <button label="所有者のプロフィール…" name="button owner" tool_tip="ハイライトされたオブジェクトの所有者のプロフィールを見る" />
+  <button label="制作者のプロフィール…" name="button creator" tool_tip="ハイライトされたオブジェクトの元の作成者のプロフィールを見る" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index 8d3a655a06..da67de74af 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="item properties" title="インベントリアイテムのプロパティ">
-	<floater.string name="unknown">(不明）</floater.string>
-	<floater.string name="public">(公共)</floater.string>
-	<floater.string name="you_can">できること：</floater.string>
-	<floater.string name="owner_can">オーナーは次のことができます：</floater.string>
-	<floater.string name="acquiredDate">[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">名前：</text>
-	<text name="LabelItemDescTitle">説明：</text>
-	<text name="LabelCreatorTitle">クリエーター</text>
-	<button label="プロフィール..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">オーナー：</text>
-	<button label="プロフィール..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">入手日時：</text>
-	<text name="LabelAcquiredDate">2006年5月24日水曜日12:50:46</text>
-	<text name="OwnerLabel">あなた：</text>
-	<check_box label="編集" name="CheckOwnerModify"/>
-	<check_box label="コピー" name="CheckOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">全員：</text>
-	<check_box label="コピー" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">グループ：</text>
-	<check_box label="共有" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="158">次の所有者：</text>
-	<check_box label="編集" name="CheckNextOwnerModify"/>
-	<check_box label="コピー" name="CheckNextOwnerCopy"/>
-	<check_box label="再販・プレゼント" name="CheckNextOwnerTransfer"/>
-	<check_box label="売り出し中" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="コピー" name="Copy"/>
-		<combo_box.item label="コンテンツ" name="Contents"/>
-		<combo_box.item label="オリジナル" name="Original"/>
-	</combo_box>
-	<spinner label="価格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
+  <floater.string name="unknown">（不明）</floater.string>
+  <floater.string name="public">（公共）</floater.string>
+  <floater.string name="you_can">できること：</floater.string>
+  <floater.string name="owner_can">オーナーは次のことができます：</floater.string>
+  <floater.string name="acquiredDate">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</floater.string>
+  <text name="LabelItemNameTitle">名前：</text>
+  <text name="LabelItemDescTitle">説明：</text>
+  <text name="LabelCreatorTitle">制作者：</text>
+  <button label="プロフィール…" label_selected="" name="BtnCreator" />
+  <text name="LabelOwnerTitle">所有者：</text>
+  <button label="プロフィール…" label_selected="" name="BtnOwner" />
+  <text name="LabelAcquiredTitle">入手日時：</text>
+  <text name="LabelAcquiredDate">2006年5月24日水曜日　12：50：46</text>
+  <text name="OwnerLabel">あなた：</text>
+  <check_box label="編集" name="CheckOwnerModify" />
+  <check_box label="コピー" name="CheckOwnerCopy" />
+  <check_box label="再販・譲渡" name="CheckOwnerTransfer" />
+  <text name="AnyoneLabel">全員：</text>
+  <check_box label="コピー" name="CheckEveryoneCopy" />
+  <text name="GroupLabel">グループ：</text>
+  <check_box label="共有" name="CheckShareWithGroup" />
+  <text name="NextOwnerLabel">次の所有者：</text>
+  <check_box label="編集" name="CheckNextOwnerModify" />
+  <check_box label="コピー" name="CheckNextOwnerCopy" />
+  <check_box label="再販・譲渡" name="CheckNextOwnerTransfer" />
+  <check_box label="売り出し中" name="CheckPurchase" />
+  <combo_box name="ComboBoxSaleType">
+    <combo_box.item label="コピー" name="Copy" />
+    <combo_box.item label="コンテンツ" name="Contents" />
+    <combo_box.item label="オリジナル" name="Original" />
+  </combo_box>
+  <spinner label="価格：" name="Edit Cost" />
+  <text name="CurrencySymbol">L$</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 425cb7ad81..56438767d6 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="インベントリ最近取得したアイテム">
-	<check_box label="アニメーション" name="check_animation"/>
-	<check_box label="コーリング・カード" name="check_calling_card"/>
-	<check_box label="服" name="check_clothing"/>
-	<check_box label="ジェスチャー" name="check_gesture"/>
-	<check_box label="ランドマーク" name="check_landmark"/>
-	<check_box label="ノートカード" name="check_notecard"/>
-	<check_box label="メッシュ" name="check_mesh"/>
-	<check_box label="オブジェクト" name="check_object"/>
-	<check_box label="スクリプト" name="check_script"/>
-	<check_box label="サウンド" name="check_sound"/>
-	<check_box label="テクスチャ" name="check_texture"/>
-	<check_box label="スナップショット" name="check_snapshot"/>
-	<check_box label="設定" name="check_settings"/>
-	<button label="すべて" label_selected="すべて" name="All"/>
-	<button label="なし" label_selected="なし" name="None"/>
-	<check_box label="常にフォルダを表示" name="check_show_empty"/>
-	<check_box label="自作" name="check_created_by_me"/>
-	<check_box label="他のユーザー作成" name="check_created_by_others"/>
-	<check_box label="ログオフ以降" name="check_since_logoff"/>
-	<text name="- OR -">
-		－または－
-	</text>
-	<radio_group name="date_search_direction">
-		<radio_item label="より新しい" name="newer"/>
-		<radio_item label="より古い" name="older"/>
-	</radio_group>
-	<spinner label="経過時間" name="spin_hours_ago"/>
-	<text name="label_hours">
-		時間
-	</text>
-	<spinner label="経過日数" name="spin_days_ago"/>
-	<text name="label_days">
-		日間
-	</text>
-	<button label="閉じる" label_selected="閉じる" name="Close"/>
-</floater>
+  <check_box label="アニメーション" name="check_animation" />
+  <check_box label="コーリング・カード" name="check_calling_card" />
+  <check_box label="服装" name="check_clothing" />
+  <check_box label="ジェスチャー" name="check_gesture" />
+  <check_box label="ランドマーク" name="check_landmark" />
+  <check_box label="ノートカード" name="check_notecard" />
+  <check_box label="メッシュ" name="check_mesh" />
+  <check_box label="オブジェクト" name="check_object" />
+  <check_box label="スクリプト" name="check_script" />
+  <check_box label="サウンド" name="check_sound" />
+  <check_box label="テクスチャ" name="check_texture" />
+  <check_box label="スナップショット" name="check_snapshot" />
+  <check_box label="設定" name="check_settings" />
+  <button label="すべて" label_selected="すべて" name="All" />
+  <button label="なし" label_selected="なし" name="None" />
+  <check_box label="常にフォルダを表示" name="check_show_empty" />
+  <check_box label="自作" name="check_created_by_me" />
+  <check_box label="他のユーザー作成" name="check_created_by_others" />
+  <check_box label="ログオフ以降" name="check_since_logoff" />
+  <text name="- OR -">－または－</text>
+  <radio_group name="date_search_direction">
+    <radio_item label="より新しい" name="newer" />
+    <radio_item label="より古い" name="older" />
+  </radio_group>
+  <spinner label="経過時間" name="spin_hours_ago" />
+  <text name="label_hours">時間</text>
+  <spinner label="経過日数" name="spin_days_ago" />
+  <text name="label_days">日間</text>
+  <button label="閉じる" label_selected="閉じる" name="Close" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
index c8648503d7..54f6a87b5e 100644
--- a/indra/newview/skins/default/xui/ja/floater_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Item Properties" title="アイテムのプロパティ"/>
+<floater name="Item Properties" title="アイテムのプロパティ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index daa480ef5a..f207d959e5 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,119 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="ジョイスティックの設定">
-	<check_box label="ジョイスティックを使う：" name="enable_joystick" width="120"/>
-	<text left="180" name="joystick_type" width="320"/>
-	<spinner label="X軸マッピング" name="JoystickAxis1"/>
-	<spinner label="Y軸マッピング" name="JoystickAxis2"/>
-	<spinner label="Z軸マッピング" name="JoystickAxis0"/>
-	<spinner label="ピッチ・マッピング" label_width="110" left="10" name="JoystickAxis4" width="150"/>
-	<spinner label="ヨー・マッピング" name="JoystickAxis5"/>
-	<spinner label="ロール・マッピング" label_width="110" left="350" name="JoystickAxis3" width="150"/>
-	<spinner label="ズーム・マッピング" label_width="110" left="10" name="JoystickAxis6" width="150"/>
-	<check_box label="直接ズーム" name="ZoomDirect"/>
-	<check_box label="3Dカーソル" name="Cursor3D"/>
-	<check_box label="自動レベル" name="AutoLeveling"/>
-	<text name="Control Modes:">
-		制御モード：
-	</text>
-	<check_box label="アバター" left="131" name="JoystickAvatarEnabled"/>
-	<check_box label="造る" left="201" name="JoystickBuildEnabled"/>
-	<check_box label="フライ・カメラ" left="271" name="JoystickFlycamEnabled"/>
-	<text left="5" name="XScale" width="120">
-		Xスケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale1" width="50"/>
-	<spinner left="205" name="BuildAxisScale1" width="50"/>
-	<spinner left="275" name="FlycamAxisScale1" width="50"/>
-	<text left="5" name="YScale" width="120">
-		Yスケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale2" width="50"/>
-	<spinner left="205" name="BuildAxisScale2" width="50"/>
-	<spinner left="275" name="FlycamAxisScale2" width="50"/>
-	<text left="5" name="ZScale" width="120">
-		Zスケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale0" width="50"/>
-	<spinner left="205" name="BuildAxisScale0" width="50"/>
-	<spinner left="275" name="FlycamAxisScale0" width="50"/>
-	<text left="5" name="PitchScale" width="120">
-		ピッチ・スケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale4" width="50"/>
-	<spinner left="205" name="BuildAxisScale4" width="50"/>
-	<spinner left="275" name="FlycamAxisScale4" width="50"/>
-	<text left="5" name="YawScale" width="120">
-		ヨー・スケール
-	</text>
-	<spinner left="135" name="AvatarAxisScale5" width="50"/>
-	<spinner left="205" name="BuildAxisScale5" width="50"/>
-	<spinner left="275" name="FlycamAxisScale5" width="50"/>
-	<text left="5" name="RollScale" width="120">
-		ロール・スケール
-	</text>
-	<spinner left="205" name="BuildAxisScale3" width="50"/>
-	<spinner left="275" name="FlycamAxisScale3" width="50"/>
-	<text left="5" name="XDeadZone" width="120">
-		Xデッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone1" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone1" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone1" width="50"/>
-	<text left="5" name="YDeadZone" width="120">
-		Yデッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone2" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone2" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone2" width="50"/>
-	<text left="5" name="ZDeadZone" width="120">
-		Zデッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone0" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone0" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone0" width="50"/>
-	<text left="0" name="PitchDeadZone" width="125">
-		ピッチ・デッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone4" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone4" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone4" width="50"/>
-	<text left="5" name="YawDeadZone" width="120">
-		ヨー・デッド・ゾーン
-	</text>
-	<spinner left="135" name="AvatarAxisDeadZone5" width="50"/>
-	<spinner left="205" name="BuildAxisDeadZone5" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone5" width="50"/>
-	<text left="0" name="RollDeadZone" width="125">
-		ロール・デッド・ゾーン
-	</text>
-	<spinner left="205" name="BuildAxisDeadZone3" width="50"/>
-	<spinner left="275" name="FlycamAxisDeadZone3" width="50"/>
-	<text name="Feathering">
-		感度調整
-	</text>
-	<slider label="" left="126" name="AvatarFeathering" width="67"/>
-	<slider label="" left="196" name="BuildFeathering" width="67"/>
-	<slider label="" left="266" name="FlycamFeathering" width="67"/>
-	<text left="0" name="ZoomScale2" width="140">
-		ズーム・スケール
-	</text>
-	<spinner label="" left="275" name="FlycamAxisScale6" width="50"/>
-	<text left="0" name="ZoomDeadZone" width="140">
-		ズーム・デッド・ゾーン
-	</text>
-	<spinner label="" left="275" name="FlycamAxisDeadZone6" width="50"/>
-	<button label="SpaceNavigatorのデフォルト設定" left="330" name="SpaceNavigatorDefaults" width="210"/>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-	<stat_view label="ジョイスティック・モニター" name="axis_view">
-		<stat_bar label="軸 0" name="axis0"/>
-		<stat_bar label="軸 1" name="axis1"/>
-		<stat_bar label="軸 2" name="axis2"/>
-		<stat_bar label="軸 3" name="axis3"/>
-		<stat_bar label="軸 4" name="axis4"/>
-		<stat_bar label="軸 5" name="axis5"/>
-	</stat_view>
-	<string name="NoDevice">
-		デバイスは検出されませんでした
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="ジョイスティックの設定">
+  <floater.string name="JoystickDisabled">なし</floater.string>
+  <text name="joystick_lbl">ジョイスティック：</text>
+  <spinner label="Ｘ軸マッピング" name="JoystickAxis1" />
+  <spinner label="Ｙ軸マッピング" name="JoystickAxis2" />
+  <spinner label="Ｚ軸マッピング" name="JoystickAxis0" />
+  <spinner label="ピッチ・マッピング" name="JoystickAxis4" />
+  <spinner label="ヨー・マッピング" name="JoystickAxis5" />
+  <spinner label="ロール・マッピング" name="JoystickAxis3" />
+  <spinner label="ズーム・マッピング" name="JoystickAxis6" />
+  <check_box label="直接ズーム" name="ZoomDirect" />
+  <check_box label="3Dカーソル" name="Cursor3D" />
+  <check_box label="自動レベル" name="AutoLeveling" />
+  <text name="Control Modes:">制御モード：</text>
+  <check_box label="アバター" name="JoystickAvatarEnabled" />
+  <check_box label="造る" name="JoystickBuildEnabled" />
+  <check_box label="フライ・カメラ" name="JoystickFlycamEnabled" />
+  <text name="XScale">Ｘスケール</text>
+  <spinner name="AvatarAxisScale1" />
+  <spinner name="BuildAxisScale1" />
+  <spinner name="FlycamAxisScale1" />
+  <text name="YScale">Ｙスケール</text>
+  <spinner name="AvatarAxisScale2" />
+  <spinner name="BuildAxisScale2" />
+  <spinner name="FlycamAxisScale2" />
+  <text name="ZScale">Ｚスケール</text>
+  <spinner name="AvatarAxisScale0" />
+  <spinner name="BuildAxisScale0" />
+  <spinner name="FlycamAxisScale0" />
+  <text name="PitchScale">ピッチ・スケール</text>
+  <spinner name="AvatarAxisScale4" />
+  <spinner name="BuildAxisScale4" />
+  <spinner name="FlycamAxisScale4" />
+  <text name="YawScale">ヨー・スケール</text>
+  <spinner name="AvatarAxisScale5" />
+  <spinner name="BuildAxisScale5" />
+  <spinner name="FlycamAxisScale5" />
+  <text name="RollScale">ロール・スケール</text>
+  <spinner name="BuildAxisScale3" />
+  <spinner name="FlycamAxisScale3" />
+  <text name="XDeadZone">Ｘデッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone1" />
+  <spinner name="BuildAxisDeadZone1" />
+  <spinner name="FlycamAxisDeadZone1" />
+  <text name="YDeadZone">Ｙデッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone2" />
+  <spinner name="BuildAxisDeadZone2" />
+  <spinner name="FlycamAxisDeadZone2" />
+  <text name="ZDeadZone">Ｚデッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone0" />
+  <spinner name="BuildAxisDeadZone0" />
+  <spinner name="FlycamAxisDeadZone0" />
+  <text name="PitchDeadZone">ピッチ・デッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone4" />
+  <spinner name="BuildAxisDeadZone4" />
+  <spinner name="FlycamAxisDeadZone4" />
+  <text name="YawDeadZone">ヨー・デッド・ゾーン</text>
+  <spinner name="AvatarAxisDeadZone5" />
+  <spinner name="BuildAxisDeadZone5" />
+  <spinner name="FlycamAxisDeadZone5" />
+  <text name="RollDeadZone">ロール・デッド・ゾーン</text>
+  <spinner name="BuildAxisDeadZone3" />
+  <spinner name="FlycamAxisDeadZone3" />
+  <text name="Feathering">感度調整</text>
+  <slider label="" name="AvatarFeathering" />
+  <slider label="" name="BuildFeathering" />
+  <slider label="" name="FlycamFeathering" />
+  <text name="ZoomScale2">ズーム・スケール</text>
+  <spinner label="" name="FlycamAxisScale6" />
+  <text name="ZoomDeadZone">ズーム・デッド・ゾーン</text>
+  <spinner label="" name="FlycamAxisDeadZone6" />
+  <button label="SpaceNavigatorのデフォルト設定" name="SpaceNavigatorDefaults" />
+  <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <stat_view label="ジョイスティック・モニター" name="axis_view">
+    <stat_bar label="軸０" name="axis0" />
+    <stat_bar label="軸１" name="axis1" />
+    <stat_bar label="軸２" name="axis2" />
+    <stat_bar label="軸３" name="axis3" />
+    <stat_bar label="軸４" name="axis4" />
+    <stat_bar label="軸５" name="axis5" />
+  </stat_view>
+  <string name="NoDevice">デバイスは検出されませんでした。</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index dd51d64ed2..47b76e7306 100644
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
@@ -1,151 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="ラグメーター">
-	<floater.string name="max_title_msg">
-		ラグ計測器
-	</floater.string>
-	<floater.string name="max_width_px">
-		360
-	</floater.string>
-	<floater.string name="min_title_msg">
-		ラグ
-	</floater.string>
-	<floater.string name="min_width_px">
-		90
-	</floater.string>
-	<floater.string name="client_text_msg">
-		クライアント
-	</floater.string>
-	<floater.string name="client_frame_rate_critical_fps">
-		10
-	</floater.string>
-	<floater.string name="client_frame_rate_warning_fps">
-		15
-	</floater.string>
-	<floater.string name="client_frame_time_window_bg_msg">
-		標準、ウィンドウは背景に
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		クライアントのフレームレートが [CLIENT_FRAME_RATE_CRITICAL] 以下
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		クライアントのフレーム レートが [CLIENT_FRAME_RATE_CRITICAL] と [CLIENT_FRAME_RATE_WARNING] の間
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		標準
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		考えられる原因：描画距離の設定が高すぎる
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		考えられる原因：画像のロード中
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		考えられる原因：メモリ内に画像が多すぎる
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		考えられる原因：シーンに複雑なオブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="network_text_msg">
-		ネットワーク
-	</floater.string>
-	<floater.string name="network_packet_loss_critical_pct">
-		10
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_pct">
-		5
-	</floater.string>
-	<floater.string name="network_packet_loss_critical_msg">
-		接続で [NETWORK_PACKET_LOSS_CRITICAL]% を超えるパケットが脱落しています
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		接続で [NETWORK_PACKET_LOSS_WARNING]%～[NETWORK_PACKET_LOSS_CRITICAL]% のパケットが脱落しています
-	</floater.string>
-	<floater.string name="network_performance_normal_msg">
-		標準
-	</floater.string>
-	<floater.string name="network_ping_critical_ms">
-		600
-	</floater.string>
-	<floater.string name="network_ping_warning_ms">
-		300
-	</floater.string>
-	<floater.string name="network_ping_critical_msg">
-		接続の ping 時間が [NETWORK_PING_CRITICAL] ms 以上です
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		接続の ping 時間が [NETWORK_PING_WARNING]～[NETWORK_PING_CRITICAL] ms です
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		接続不良または &apos;帯域幅&apos; の設定が高すぎる可能性があります
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		接続不良またはファイル共有アプリの可能性があります。
-	</floater.string>
-	<floater.string name="server_text_msg">
-		サーバー
-	</floater.string>
-	<floater.string name="server_frame_rate_critical_fps">
-		20
-	</floater.string>
-	<floater.string name="server_frame_rate_warning_fps">
-		30
-	</floater.string>
-	<floater.string name="server_single_process_max_time_ms">
-		20
-	</floater.string>
-	<floater.string name="server_frame_time_critical_msg">
-		シミュレータのフレームレートが [SERVER_FRAME_RATE_CRITICAL] 以下
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		シミュレータのフレームレートが [SERVER_FRAME_RATE_CRITICAL] ～ [SERVER_FRAME_RATE_WARNING] の間
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		標準
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		考えられる原因：物理オブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		考えられる原因：スクリプトオブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		考えられる原因：ネットワークトラフィックが多すぎる
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		考えられる原因：リージョン内の人の移動が多すぎる
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		考えられる原因：画像計算が多すぎる
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		考えられる原因：シミュレータのロードが重すぎる
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="クライアント ラグ ステータス"/>
-	<text name="client">
-		クライアント
-	</text>
-	<text name="client_text">
-		標準
-	</text>
-	<button name="network_lagmeter" tool_tip="ネットワーク ラグ ステータス"/>
-	<text name="network">
-		ネットワーク
-	</text>
-	<text name="network_text">
-		標準
-	</text>
-	<button name="server_lagmeter" tool_tip="サーバー ラグ ステータス"/>
-	<text name="server">
-		サーバー
-	</text>
-	<text name="server_text">
-		標準
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="フローターのサイズをトグル"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="ラグメーター">
+  <floater.string name="max_title_msg">遅延計測器</floater.string>
+  <floater.string name="max_width_px">360</floater.string>
+  <floater.string name="min_title_msg">遅延</floater.string>
+  <floater.string name="min_width_px">90</floater.string>
+  <floater.string name="client_text_msg">クライアント</floater.string>
+  <floater.string name="client_frame_rate_critical_fps">10</floater.string>
+  <floater.string name="client_frame_rate_warning_fps">15</floater.string>
+  <floater.string name="client_frame_time_window_bg_msg">標準、ウィンドウは背景に</floater.string>
+  <floater.string name="client_frame_time_critical_msg">クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]以下</floater.string>
+  <floater.string name="client_frame_time_warning_msg">クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]と[CLIENT_FRAME_RATE_WARNING]の間</floater.string>
+  <floater.string name="client_frame_time_normal_msg">標準</floater.string>
+  <floater.string name="client_draw_distance_cause_msg">考えられる原因：描画距離の設定が高すぎる</floater.string>
+  <floater.string name="client_texture_loading_cause_msg">考えられる原因：画像のロード中</floater.string>
+  <floater.string name="client_texture_memory_cause_msg">考えられる原因：メモリ内に画像が多すぎる</floater.string>
+  <floater.string name="client_complex_objects_cause_msg">考えられる原因：シーンに複雑なオブジェクトが多すぎる</floater.string>
+  <floater.string name="network_text_msg">ネットワーク</floater.string>
+  <floater.string name="network_packet_loss_critical_pct">10</floater.string>
+  <floater.string name="network_packet_loss_warning_pct">5</floater.string>
+  <floater.string name="network_packet_loss_critical_msg">接続で[NETWORK_PACKET_LOSS_CRITICAL]％を超えるパケットが脱落しています。</floater.string>
+  <floater.string name="network_packet_loss_warning_msg">接続で[NETWORK_PACKET_LOSS_WARNING]％～[NETWORK_PACKET_LOSS_CRITICAL]％のパケットが脱落しています。</floater.string>
+  <floater.string name="network_performance_normal_msg">標準</floater.string>
+  <floater.string name="network_ping_critical_ms">600</floater.string>
+  <floater.string name="network_ping_warning_ms">300</floater.string>
+  <floater.string name="network_ping_critical_msg">接続のping時間が、[NETWORK_PING_CRITICAL]ms以上です</floater.string>
+  <floater.string name="network_ping_warning_msg">接続のping時間が、[NETWORK_PING_WARNING]～[NETWORK_PING_CRITICAL]msです。</floater.string>
+  <floater.string name="network_packet_loss_cause_msg">接続不良または、'帯域幅'の設定が高すぎる可能性があります。</floater.string>
+  <floater.string name="network_ping_cause_msg">接続不良または、ファイル共有アプリの可能性があります。</floater.string>
+  <floater.string name="server_text_msg">サーバー</floater.string>
+  <floater.string name="server_frame_rate_critical_fps">20</floater.string>
+  <floater.string name="server_frame_rate_warning_fps">30</floater.string>
+  <floater.string name="server_single_process_max_time_ms">20</floater.string>
+  <floater.string name="server_frame_time_critical_msg">シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]以下</floater.string>
+  <floater.string name="server_frame_time_warning_msg">シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]～[SERVER_FRAME_RATE_WARNING]の間</floater.string>
+  <floater.string name="server_frame_time_normal_msg">標準</floater.string>
+  <floater.string name="server_physics_cause_msg">考えられる原因：物理オブジェクトが多すぎる</floater.string>
+  <floater.string name="server_scripts_cause_msg">考えられる原因：スクリプトオブジェクトが多すぎる</floater.string>
+  <floater.string name="server_net_cause_msg">考えられる原因：ネットワークトラフィックが多すぎる</floater.string>
+  <floater.string name="server_agent_cause_msg">考えられる原因：リージョン内の人の移動が多すぎる</floater.string>
+  <floater.string name="server_images_cause_msg">考えられる原因：画像計算が多すぎる</floater.string>
+  <floater.string name="server_generic_cause_msg">考えられる原因：シミュレータのロードが重すぎる</floater.string>
+  <floater.string name="smaller_label">》</floater.string>
+  <floater.string name="bigger_label">《</floater.string>
+  <button name="client_lagmeter" tool_tip="クライアントの遅延ステータス" />
+  <text name="client">クライアント</text>
+  <text name="client_text">標準</text>
+  <button name="network_lagmeter" tool_tip="ネットワークの遅延ステータス" />
+  <text name="network">ネットワーク</text>
+  <text name="network_text">標準</text>
+  <button name="server_lagmeter" tool_tip="サーバーの遅延ステータス" />
+  <text name="server">サーバー</text>
+  <text name="server_text">標準</text>
+  <button label="》" name="minimize" tool_tip="フローターのサイズをトグル" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index aca916f22f..34cb28a80b 100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -1,40 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="自分の土地">
-	<scroll_list name="parcel list">
-		<column label="区画" name="name"/>
-		<column label="地域（リージョン）" name="location"/>
-		<column label="種類" name="type"/>
-		<column label="面積" name="area"/>
-		<column label="" name="hidden"/>
-	</scroll_list>
-	<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポートします"/>
-	<button label="地図" label_selected="地図" name="Show on Map" tool_tip="この土地を世界地図に表示します"/>
-	<text name="contrib_label">
-		所属グループへの貢献：
-	</text>
-	<scroll_list name="grant list">
-		<column label="グループ名" name="group"/>
-		<column label="面積" name="area"/>
-	</scroll_list>
-	<text name="allowed_label">
-		現在の支払いプランで許可された保有地：
-	</text>
-	<text name="allowed_text">
-		[AREA] 平方メートル
-	</text>
-	<text name="current_label">
-		現在の保有地：
-	</text>
-	<text name="current_text">
-		[AREA] 平方メートル
-	</text>
-	<text name="available_label">
-		購入可能な土地：
-	</text>
-	<text name="available_text">
-		[AREA] 平方メートル
-	</text>
-	<string name="area_string">
-		[AREA] 平方メートル
-	</string>
-</floater>
+  <scroll_list name="parcel list">
+    <column label="区画" name="name" />
+    <column label="リージョン（地域）" name="location" />
+    <column label="種類" name="type" />
+    <column label="面積" name="area" />
+    <column label="" name="hidden" />
+  </scroll_list>
+  <button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポートします。" />
+  <button label="マップ" label_selected="マップ" name="Show on Map" tool_tip="この土地をワールドマップに表示します。" />
+  <text name="contrib_label">所属グループへの貢献：</text>
+  <scroll_list name="grant list">
+    <column label="グループ名" name="group" />
+    <column label="面積" name="area" />
+  </scroll_list>
+  <text name="allowed_label">現在の支払いプランで利用可能な入植地：</text>
+  <text name="allowed_text">[AREA]㎡</text>
+  <text name="current_label">現在の保有地：</text>
+  <text name="current_text">[AREA]㎡</text>
+  <text name="available_label">購入可能な土地：</text>
+  <text name="available_text">[AREA]㎡</text>
+  <string name="area_string">[AREA]㎡</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_linkreplace.xml b/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
index 806543dcc5..8a8d643f69 100644
--- a/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
@@ -1,2 +1,16 @@
-<?xml version="1.0" ?>
-<floater name="linkreplace" title="インベントリ リンク交換"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="linkreplace" title="インベントリのリンク置換え">
+  <string name="Ready">準備中…</string>
+  <string name="TargetNotFound">置換先のアイテムは見つかりませんでした。</string>
+  <string name="ItemsIdentical">置換元と置換先が同一です。</string>
+  <string name="ItemsFound">[NUM]件のリンクが見つかりました。</string>
+  <string name="ItemsRemaining">残りリンク数：[NUM]件</string>
+  <string name="ReplaceFinished">インベントリのリンクの置換えが完了しました。</string>
+  <text name="source_label">置換元：</text>
+  <inventory_link_replace_drop_target name="source_uuid_editor" tool_tip="置換えたいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。" />
+  <text type="string" name="target_label">置換先：</text>
+  <inventory_link_replace_drop_target name="target_uuid_editor" tool_tip="新しいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。" />
+  <text type="string" name="status_text">準備中…</text>
+  <button name="btn_refresh" label="リフレッシュ" />
+  <button name="btn_start" label="開始" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index f48cc642ee..daaabbcc64 100644
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -1,32 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="スクリプト： 新しいスクリプト">
-	<floater.string name="not_allowed">
-		このスクリプトは「コピー不可」のため、表示・編集することができません。 オブジェクト内のスクリプトの表示・編集には、全権限が必要です。
-	</floater.string>
-	<floater.string name="script_running">
-		実行中
-	</floater.string>
-	<floater.string name="Title">
-		スクリプト： [NAME]
-	</floater.string>
-	<floater.string name="experience_enabled">
-		オフにして、現在の体験を削除する
-	</floater.string>
-	<floater.string name="no_experiences">
-		どの体験にも権限がありません
-	</floater.string>
-	<floater.string name="add_experiences">
-		選択して、体験を追加する
-	</floater.string>
-	<floater.string name="show_experience_profile">
-		クリックして、体験プロフィールを表示する
-	</floater.string>
-	<floater.string name="loading">
-		ロード中...
-	</floater.string>
-	<button label="リセット" label_selected="リセット" name="Reset"/>
-	<check_box initial_value="true" label="実行中" name="running"/>
-	<check_box initial_value="true" label="Mono" name="mono"/>
-	<check_box label="体験を使用：" name="enable_xp"/>
-	<button label="&gt;" name="view_profile"/>
-</floater>
+<floater name="script ed float" title="スクリプト：新しいスクリプト">
+  <floater.string name="not_allowed">このスクリプトは「複製不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。</floater.string>
+  <floater.string name="script_running">実行中</floater.string>
+  <floater.string name="Title">スクリプト：[NAME]</floater.string>
+  <floater.string name="experience_enabled">オフにして、現在の体験を削除する</floater.string>
+  <floater.string name="no_experiences">どの体験にも権限がありません</floater.string>
+  <floater.string name="add_experiences">選択して、体験を追加する</floater.string>
+  <floater.string name="show_experience_profile">クリックして、体験プロフィールを表示する</floater.string>
+  <floater.string name="loading">読み込んでいます…</floater.string>
+  <button label="リセット" label_selected="リセット" name="Reset" />
+  <check_box initial_value="true" label="実行中" name="running" />
+  <check_box initial_value="true" label="Mono" name="mono" />
+  <check_box label="体験を使用：" name="enable_xp" />
+  <button label="&gt;" name="view_profile" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
index 351d8507cc..6d3497659e 100644
--- a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Load Pref Preset" title="優先プリセットをロード">
-	<string name="title_graphic">
-		グラフィックプリセットをロード
-	</string>
-	<string name="title_camera">
-		カメラプリセットをロード
-	</string>
-	<text name="Preset">
-		プリセットを選択
-	</text>
-	<button label="OK" name="ok"/>
-	<button label="取り消し" name="cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="load_pref_preset" title="プリセット設定を読み込み">
+  <string name="title_graphic">グラフィックのプリセットを読み込む</string>
+  <string name="title_camera">カメラのプリセットを読み込む</string>
+  <text name="Preset">プリセットを選択</text>
+  <button label="ＯＫ" name="ok" />
+  <button label="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 5773752788..ec2038038b 100644
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="LSL レファレンス">
-	<check_box label="カーソルを追う" name="lock_check"/>
-	<combo_box label="ロック" name="history_combo"/>
-	<button label="戻る" name="back_btn"/>
-	<button label="進む" name="fwd_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script ed float" title="ＬＳＬレファレンス">
+  <check_box label="カーソルを追う" name="lock_check" />
+  <combo_box label="ロック" name="history_combo" />
+  <button label="戻る" name="back_btn" />
+  <button label="進む" name="fwd_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index 1122203446..f70d10470d 100644
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
@@ -1,36 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Map" title="ミニマップ">
-	<floater.string name="ToolTipMsg">
-		[REGION]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）
-	</floater.string>
-	<floater.string name="AltToolTipMsg">
-		[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）
-	</floater.string>
-	<floater.string name="mini_map_caption">
-		ミニマップ
-	</floater.string>
-	<text label="北" name="floater_map_north" text="北">
-		北
-	</text>
-	<text label="東" name="floater_map_east" text="東">
-		東
-	</text>
-	<text label="西" name="floater_map_west" text="西">
-		西
-	</text>
-	<text label="南" name="floater_map_south" text="南">
-		南
-	</text>
-	<text label="南東" name="floater_map_southeast" text="南東">
-		南東
-	</text>
-	<text label="北東" name="floater_map_northeast" text="北東">
-		北東
-	</text>
-	<text label="南西" name="floater_map_southwest" text="南西">
-		南西
-	</text>
-	<text label="北西" name="floater_map_northwest" text="北西">
-		北西
-	</text>
-</floater>
+  <floater.string name="ToolTipMsg">[REGION]（ダブルクリックでマップを表示。Shift＋ドラッグで水平・垂直移動）</floater.string>
+  <floater.string name="AltToolTipMsg">[REGION]（ダブルクリックでテレポート。Shift＋ドラッグで水平・垂直移動）</floater.string>
+  <floater.string name="mini_map_caption">ミニマップ</floater.string>
+  <text label="北" name="floater_map_north" text="北">北</text>
+  <text label="東" name="floater_map_east" text="東">東</text>
+  <text label="西" name="floater_map_west" text="西">西</text>
+  <text label="南" name="floater_map_south" text="南">南</text>
+  <text label="南東" name="floater_map_southeast" text="南東">南東</text>
+  <text label="北東" name="floater_map_northeast" text="北東">北東</text>
+  <text label="南西" name="floater_map_southwest" text="南西">南西</text>
+  <text label="北西" name="floater_map_northwest" text="北西">北西</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
index f6b8e2928e..06c2d0bafc 100644
--- a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
@@ -1,10 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_marketplace_listings" title="マーケットプレイスのリスト">
-	<panel name="marketplace_listings_panel">
-		<panel>
-			<panel name="marketplace_listings_inventory_placeholder_panel">
-				<text name="marketplace_listings_inventory_placeholder_title">ロード中...</text>
-			</panel>
-		</panel>
-	</panel>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater title="マーケットプレイス一覧" name="floater_marketplace_listings">
+  <panel name="marketplace_listings_panel">
+    <panel>
+      <panel name="marketplace_listings_inventory_placeholder_panel">
+        <text name="marketplace_listings_inventory_placeholder_title">読み込んでいます…</text>
+        <text name="marketplace_listings_inventory_placeholder_text" />
+      </panel>
+      <panel name="panel_marketplace_listing" filename="panel_marketplace_listings.xml" class="llpanelmarketplacelistings" top="0" follows="all"/>
+    </panel>
+    <panel name="marketplace_panel_status" />
+    <layout_stack name="initialization_progress_indicator" />
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
index 164864ed4e..b5638cdb34 100644
--- a/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_marketplace_validation" title="マーケットプレイスのリストの監査">
-	<button label="OK" label_selected="OK" name="OK"/>
-	<text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
-</floater>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index c4731b73a3..5a486a4d3c 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="メディアブラウザ">
-	<floater.string name="home_page_url">
-		http://jp.secondlife.com
-	</floater.string>
-	<floater.string name="support_page_url">
-		http://jp.secondlife.com/support
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="nav_controls">
-			<button label="戻る" name="back"/>
-			<button label="進む" name="forward"/>
-			<button label="更新" name="reload"/>
-			<button label="閲覧" name="go"/>
-		</layout_panel>
-		<layout_panel name="time_controls">
-			<button label="巻き戻し" name="rewind"/>
-			<button label="停止" name="stop"/>
-			<button label="早送り" name="seek"/>
-		</layout_panel>
-		<layout_panel name="parcel_owner_controls">
-			<button label="現在のページを区画に送る" name="assign"/>
-		</layout_panel>
-		<layout_panel name="external_controls">
-			<button label="外部Webブラウザで開く" name="open_browser"/>
-			<check_box label="常に外部のWebブラウザで開く" name="open_always"/>
-			<button label="閉じる" name="close"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="home_page_url">https://secondlife.com</floater.string>
+  <floater.string name="support_page_url">https://support.secondlife.com/</floater.string>
+  <layout_stack name="stack1">
+    <layout_panel name="nav_controls">
+      <button label="戻る" name="back" />
+      <button label="進む" name="forward" />
+      <button label="リロード" name="reload" />
+      <button label="閲覧" name="go" />
+    </layout_panel>
+    <layout_panel name="time_controls">
+      <button label="巻き戻し" name="rewind" />
+      <button label="停止" name="stop" />
+      <button label="早送り" name="seek" />
+    </layout_panel>
+    <layout_panel name="parcel_owner_controls">
+      <button label="現在のページを区画に送る" name="assign" />
+    </layout_panel>
+    <layout_panel name="external_controls">
+      <button label="外部Webブラウザで開く" name="open_browser" />
+      <check_box label="常に外部のWebブラウザで開く" name="open_always" />
+      <button label="閉じる" name="close" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
index 46ac1a8dfd..75f7cba89a 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="media_settings" title="メディアの設定">
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-	<button label="適用" label_selected="適用" name="Apply"/>
-</floater>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <button label="適用" label_selected="適用" name="Apply" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
index f48bb94e32..a429a3a47e 100644
--- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="MemLeak" title="メモリリークのシミュレート">
-	<spinner label="リーク速度(1フレームごとのバイト数)：" label_width="244" name="leak_speed"/>
-	<spinner label="最大メモリリーク(MB)：" label_width="244" name="max_leak"/>
-	<text name="total_leaked_label">
-		現在のメモリリーク： [SIZE] KB
-	</text>
-	<text name="note_label_1">
-		[NOTE1]
-	</text>
-	<text name="note_label_2">
-		[NOTE2]
-	</text>
-	<button label="開始" name="start_btn"/>
-	<button label="停止" name="stop_btn"/>
-	<button label="解放" name="release_btn"/>
-	<button label="閉じる" name="close_btn"/>
-</floater>
+  <spinner label="リーク速度（１フレームごとのバイト数）：" name="leak_speed" />
+  <spinner label="最大メモリリーク（㎆）：" name="max_leak" />
+  <text name="total_leaked_label">現在のメモリリーク：[SIZE]㎅</text>
+  <text name="note_label_1">[NOTE1]	</text>
+  <text name="note_label_2">[NOTE2]</text>
+  <button label="開始" name="start_btn" />
+  <button label="停止" name="stop_btn" />
+  <button label="解放" name="release_btn" />
+  <button label="閉じる" name="close_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_mfa.xml b/indra/newview/skins/default/xui/ja/floater_mfa.xml
new file mode 100644
index 0000000000..9eefb3c7be
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_mfa.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater title="二段階認証トークンが必要です" name="mfa_challenge">
+  <text name="token_prompt_text">トークンのプロンプト</text>
+  <line_editor name="token_edit" />
+  <button label="続ける" name="continue_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 9292433cd2..22dfdc23dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -1,319 +1,187 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="モデルウィザード">
-	<string name="status_idle"/>
-	<string name="status_parse_error">
-		エラー：Dae に問題が見つかりました - 詳細についてはログをご参照ください。
-	</string>
-	<string name="status_bind_shape_orientation">
-		警告： バインドシェイプマトリックスは、標準の X 軸正方向にはありません。
-	</string>
-	<string name="status_material_mismatch">
-		エラー：モデルの材料は参考モデルのサブセットではありません。
-	</string>
-	<string name="status_reading_file">
-		ローディング...
-	</string>
-	<string name="status_generating_meshes">
-		メッシュを作成中
-	</string>
-	<string name="status_vertex_number_overflow">
-		エラー：頂点の数が65534を超過したので中止されました。
-	</string>
-	<string name="bad_element">
-		エラー：要素が無効です
-	</string>
-	<string name="high">
-		高
-	</string>
-	<string name="medium">
-		中
-	</string>
-	<string name="low">
-		低
-	</string>
-	<string name="lowest">
-		最低
-	</string>
-	<string name="mesh_status_good">
-		発送
-	</string>
-	<string name="mesh_status_na">
-		該当なし
-	</string>
-	<string name="mesh_status_none">
-		なし
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		テクスチャ編集可能な面の数は描画詳細度に応じて異なります。
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		メッシュインスタンスの数は描画詳細度に応じて異なります。
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		描画詳細度に対して頂点の数が多すぎます。
-	</string>
-	<string name="mesh_status_missing_lod">
-		必要な描画詳細度が見つかりません。
-	</string>
-	<string name="mesh_status_invalid_material_list">
-		LOD 付きの材料は参考モデルのサブセットではありません。
-	</string>
-	<string name="phys_status_vertex_limit_exceeded">
-		一部の物理的な外殻構造が頂点の制限を超えます。
-	</string>
-	<string name="layer_all">
-		全て
-	</string>
-	<string name="decomposing">
-		分析中
-	</string>
-	<string name="simplifying">
-		単純化
-	</string>
-	<string name="tbd">
-		未定
-	</string>
-	<panel name="left_panel">
-		<panel name="model_name_representation_panel">
-			<text name="name_label">
-				モデル名：
-			</text>
-			<text name="model_category_label">
-				このモデルは...
-			</text>
-			<combo_box name="model_category_combo">
-				<combo_item label="1つを選択..." name="Choose one"/>
-				<combo_item label="アバターの形" name="Avatar shape"/>
-				<combo_item label="アバターのアタッチメント" name="Avatar attachment"/>
-				<combo_item label="動くオブジェクト（車、動物）" name="Moving object (vehicle, animal)"/>
-				<combo_item label="制作用コンポーネント" name="Building Component"/>
-				<combo_item label="大型、不動、等" name="Large, non moving etc"/>
-				<combo_item label="やや小型、不動、等" name="Smaller, non-moving etc"/>
-				<combo_item label="いずれにも該当しない" name="Not really any of these"/>
-			</combo_box>
-		</panel>
-		<tab_container name="import_tab">
-			<panel label="描画詳細度" name="lod_panel" title="描画詳細度">
-				<text initial_value="データ源" name="source" value="データ源"/>
-				<text initial_value="三角形" name="triangles" value="三角形"/>
-				<text initial_value="頂点" name="vertices" value="頂点"/>
-				<text initial_value="高" name="high_label" value="高"/>
-				<combo_box name="lod_source_high">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_high"/>
-				<combo_box name="lod_mode_high">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="high_triangles" value="0"/>
-				<text initial_value="0" name="high_vertices" value="0"/>
-				<text initial_value="中" name="medium_label" value="中"/>
-				<combo_box name="lod_source_medium">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_medium"/>
-				<combo_box name="lod_mode_medium">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="medium_triangles" value="0"/>
-				<text initial_value="0" name="medium_vertices" value="0"/>
-				<text initial_value="低" name="low_label" value="低"/>
-				<combo_box name="lod_source_low">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_low"/>
-				<combo_box name="lod_mode_low">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="low_triangles" value="0"/>
-				<text initial_value="0" name="low_vertices" value="0"/>
-				<text initial_value="最低" name="lowest_label" value="最低"/>
-				<combo_box name="lod_source_lowest">
-					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
-					<item label="生成" name="Generate" value="生成"/>
-					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
-				</combo_box>
-				<button label="参照" name="lod_browse_lowest"/>
-				<combo_box name="lod_mode_lowest">
-					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
-					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
-				</combo_box>
-				<text initial_value="0" name="lowest_triangles" value="0"/>
-				<text initial_value="0" name="lowest_vertices" value="0"/>
-				<check_box label="ノーマルの作成" name="gen_normals"/>
-				<text initial_value="折れ角度：" name="crease_label" value="折れ角度："/>
-				<spinner name="crease_angle" value="75"/>
-			</panel>
-			<panel label="物理効果" name="physics_panel">
-				<panel name="physics geometry">
-					<text name="first_step_name">
-						手順1：描画詳細度
-					</text>
-					<combo_box name="physics_lod_combo" tool_tip="実像に適用するLOD">
-						<combo_item name="choose_one">
-							1つを選択...
-						</combo_item>
-						<combo_item name="physics_high">
-							高
-						</combo_item>
-						<combo_item name="physics_medium">
-							中
-						</combo_item>
-						<combo_item name="physics_low">
-							低
-						</combo_item>
-						<combo_item name="physics_lowest">
-							最低
-						</combo_item>
-						<combo_item name="load_from_file">
-							ファイルから
-						</combo_item>
-					</combo_box>
-					<button label="参照" name="physics_browse"/>
-				</panel>
-				<panel name="physics analysis">
-					<text name="method_label">
-						手順2：分析
-					</text>
-					<text name="analysis_method_label">
-						方法：
-					</text>
-					<text name="quality_label">
-						品質：
-					</text>
-					<text name="smooth_method_label">
-						滑らかさ：
-					</text>
-					<check_box label="穴を閉じる" name="Close Holes (Slow)"/>
-					<button label="分析" name="Decompose"/>
-					<button label="取り消し" name="decompose_cancel"/>
-				</panel>
-				<panel name="physics simplification">
-					<text name="second_step_label">
-						手順3：単純化
-					</text>
-					<text name="simp_method_header">
-						方法：
-					</text>
-					<text name="pass_method_header">
-						パス：
-					</text>
-					<text name="Detail Scale label">
-						詳細度：
-					</text>
-					<text name="Retain%_label">
-						維持率：
-					</text>
-					<combo_box name="Combine Quality" value="1"/>
-					<button label="単純化" name="Simplify"/>
-					<button label="取り消し" name="simplify_cancel"/>
-				</panel>
-				<panel name="physics info">
-					<text name="results_text">
-						結果：
-					</text>
-					<text name="physics_triangles">
-						三角形：[TRIANGLES],
-					</text>
-					<text name="physics_points">
-						頂点：[POINTS],
-					</text>
-					<text name="physics_hulls">
-						外殻構造：[HULLS]
-					</text>
-				</panel>
-			</panel>
-			<panel label="アップロードのオプション" name="modifiers_panel">
-				<text name="scale_label">
-					スケール（1=増減なし）：
-				</text>
-				<spinner name="import_scale" value="1.0"/>
-				<text name="dimensions_label">
-					サイズ：
-				</text>
-				<text name="import_dimensions">
-					[X] X [Y] X [Z]
-				</text>
-				<check_box label="テクスチャを含む" name="upload_textures"/>
-				<text name="include_label">
-					アバターモデル専用：
-				</text>
-				<check_box label="スキンの重さを含む" name="upload_skin"/>
-				<check_box label="ジョイントポジションを含む" name="upload_joints"/>
-				<check_box label="ジョイント位置が定義されている場合、スケールをロック" name="lock_scale_if_joint_position"/>
-				<text name="pelvis_offset_label">
-					Z オフセット（アバターを上下調整）：
-				</text>
-				<spinner name="pelvis_offset" value="0.0"/>
-			</panel>
-		</tab_container>
-		<panel name="weights_and_warning_panel">
-			<button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算"/>
-			<button label="取り消し" name="cancel_btn"/>
-			<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
-			<button label="設定をクリアしてフォームをリセット" name="reset_btn"/>
-			<text name="upload_fee">
-				アップロード料金：L$ [FEE]
-			</text>
-			<text name="prim_weight">
-				土地の負荷：[EQ]
-			</text>
-			<text name="download_weight">
-				ダウンロード：[ST]
-			</text>
-			<text name="physics_weight">
-				物理演算：[PH]
-			</text>
-			<text name="server_weight">
-				サーバー負荷：[SIM]
-			</text>
-			<text name="warning_title">
-				ご注意：
-			</text>
-			<text name="warning_message">
-				メッシュモデルをアップロードする権利がありません。権利の取得方法については [[VURL]] こちらを参照してください。
-			</text>
-			<text name="status">
-				[STATUS]
-			</text>
-		</panel>
-	</panel>
-	<text name="lod_label">
-		プレビュー：
-	</text>
-	<panel name="right_panel">
-		<combo_box name="preview_lod_combo" tool_tip="プレビュー表示の LOD 設定">
-			<combo_item name="high">
-				高
-			</combo_item>
-			<combo_item name="medium">
-				中
-			</combo_item>
-			<combo_item name="low">
-				低
-			</combo_item>
-			<combo_item name="lowest">
-				最低
-			</combo_item>
-		</combo_box>
-		<text name="label_display">
-			ディスプレイ...
-		</text>
-		<check_box label="稜" name="show_edges"/>
-		<check_box label="物理効果" name="show_physics"/>
-		<check_box label="テクスチャ" name="show_textures"/>
-		<check_box label="スキンの重さ" name="show_skin_weight"/>
-		<check_box label="ジョイント" name="show_joint_positions"/>
-		<text name="physics_explode_label">
-			プレビュースプレッド：
-		</text>
-	</panel>
-</floater>
+  <string name="status_idle" />
+  <string name="status_parse_error">エラー：Dae に問題が見つかりました - 詳細についてはログをご参照ください。</string>
+  <string name="status_bind_shape_orientation">警告：バインドシェイプマトリックスは、標準の X 軸正方向にはありません。</string>
+  <string name="status_material_mismatch">エラー：モデルの材料は参考モデルのサブセットではありません。</string>
+  <string name="status_reading_file">読み込んでいます…</string>
+  <string name="status_generating_meshes">メッシュを作成中</string>
+  <string name="status_vertex_number_overflow">エラー：頂点の数が65534を超過したので中止されました。</string>
+  <string name="bad_element">エラー：要素が無効です</string>
+  <string name="high">高</string>
+  <string name="medium">中</string>
+  <string name="low">低</string>
+  <string name="lowest">最低</string>
+  <string name="mesh_status_good">発送</string>
+  <string name="mesh_status_na">該当なし</string>
+  <string name="mesh_status_none">なし</string>
+  <string name="mesh_status_submesh_mismatch">テクスチャ編集可能な面の数は、描画詳細度に応じて異なります。</string>
+  <string name="mesh_status_mesh_mismatch">メッシュインスタンスの数は、描画詳細度に応じて異なります。</string>
+  <string name="mesh_status_too_many_vertices">描画詳細度に対して頂点の数が多すぎます。</string>
+  <string name="mesh_status_missing_lod">必要な描画詳細度が見つかりません。</string>
+  <string name="mesh_status_invalid_material_list">LOD付きの材料は、参考モデルのサブセットではありません。</string>
+  <string name="phys_status_vertex_limit_exceeded">一部の物理的な外殻構造が、頂点の制限を超えます。</string>
+  <string name="layer_all">全て</string>
+  <string name="decomposing">分析中</string>
+  <string name="simplifying">簡素化</string>
+  <string name="tbd">未定</string>
+  <panel name="left_panel">
+    <panel name="model_name_representation_panel">
+      <text name="name_label">モデル名：</text>
+      <text name="model_category_label">このモデルは…</text>
+      <combo_box name="model_category_combo">
+        <combo_item label="1つを選択…" name="Choose one" />
+        <combo_item label="アバターの形" name="Avatar shape" />
+        <combo_item label="アバターの装着物" name="Avatar attachment" />
+        <combo_item label="動くオブジェクト（車、動物）" name="Moving object (vehicle, animal)" />
+        <combo_item label="制作用コンポーネント" name="Building Component" />
+        <combo_item label="大型、不動、等" name="Large, non moving etc" />
+        <combo_item label="やや小型、不動、等" name="Smaller, non-moving etc" />
+        <combo_item label="いずれにも該当しない" name="Not really any of these" />
+      </combo_box>
+    </panel>
+    <tab_container name="import_tab">
+      <panel label="描画詳細度" name="lod_panel" title="描画詳細度">
+        <text initial_value="データ源" name="source" value="データ源" />
+        <text initial_value="三角形" name="triangles" value="三角形" />
+        <text initial_value="頂点" name="vertices" value="頂点" />
+        <text initial_value="高" name="high_label" value="高" />
+        <combo_box name="lod_source_high">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+        </combo_box>
+        <button label="参照" name="lod_browse_high" />
+        <combo_box name="lod_mode_high">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="high_triangles" value="0" />
+        <text initial_value="0" name="high_vertices" value="0" />
+        <text initial_value="中" name="medium_label" value="中" />
+        <combo_box name="lod_source_medium">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
+        </combo_box>
+        <button label="参照" name="lod_browse_medium" />
+        <combo_box name="lod_mode_medium">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="medium_triangles" value="0" />
+        <text initial_value="0" name="medium_vertices" value="0" />
+        <text initial_value="低" name="low_label" value="低" />
+        <combo_box name="lod_source_low">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
+        </combo_box>
+        <button label="参照" name="lod_browse_low" />
+        <combo_box name="lod_mode_low">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="low_triangles" value="0" />
+        <text initial_value="0" name="low_vertices" value="0" />
+        <text initial_value="最低" name="lowest_label" value="最低" />
+        <combo_box name="lod_source_lowest">
+          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
+          <item label="生成" name="Generate" value="生成" />
+          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
+        </combo_box>
+        <button label="参照" name="lod_browse_lowest" />
+        <combo_box name="lod_mode_lowest">
+          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
+          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
+        </combo_box>
+        <text initial_value="0" name="lowest_triangles" value="0" />
+        <text initial_value="0" name="lowest_vertices" value="0" />
+        <check_box label="ノーマルの作成" name="gen_normals" />
+        <text initial_value="折れ角度：" name="crease_label" value="折れ角度：" />
+        <spinner name="crease_angle" value="75" />
+      </panel>
+      <panel label="物理効果" name="physics_panel">
+        <panel name="physics geometry">
+          <text name="first_step_name">手順１：描画詳細度</text>
+          <combo_box name="physics_lod_combo" tool_tip="実像に適用するLOD">
+            <combo_item name="choose_one">１つを選択…</combo_item>
+            <combo_item name="physics_high">高</combo_item>
+            <combo_item name="physics_medium">中</combo_item>
+            <combo_item name="physics_low">低</combo_item>
+            <combo_item name="physics_lowest">最低</combo_item>
+            <combo_item name="load_from_file">ファイルから</combo_item>
+          </combo_box>
+          <button label="参照" name="physics_browse" />
+        </panel>
+        <panel name="physics analysis">
+          <text name="method_label">手順２：分析</text>
+          <text name="analysis_method_label">方法：</text>
+          <text name="quality_label">品質：</text>
+          <text name="smooth_method_label">滑らかさ：</text>
+          <check_box label="穴を閉じる" name="Close Holes (Slow)" />
+          <button label="分析" name="Decompose" />
+          <button label="キャンセル" name="decompose_cancel" />
+        </panel>
+        <panel name="physics simplification">
+          <text name="second_step_label">手順３：簡素化</text>
+          <text name="simp_method_header">方法：</text>
+          <text name="pass_method_header">パス：</text>
+          <text name="Detail Scale label">詳細度：</text>
+          <text name="Retain%_label">維持率：</text>
+          <combo_box name="Combine Quality" value="1" />
+          <button label="簡素化" name="Simplify" />
+          <button label="キャンセル" name="simplify_cancel" />
+        </panel>
+        <panel name="physics info">
+          <text name="results_text">結果：</text>
+          <text name="physics_triangles">三角形：[TRIANGLES],</text>
+          <text name="physics_points">頂点：[POINTS],</text>
+          <text name="physics_hulls">外殻構造：[HULLS]</text>
+        </panel>
+      </panel>
+      <panel label="アップロードのオプション" name="modifiers_panel">
+        <text name="scale_label"> スケール（１＝増減なし）：</text>
+        <spinner name="import_scale" value="1.0" />
+        <text name="dimensions_label">サイズ：</text>
+        <text name="import_dimensions">[X]✕[Y]✕[Z]</text>
+        <check_box label="テクスチャを含む" name="upload_textures" />
+        <text name="include_label">アバターモデル専用：</text>
+        <check_box label="スキンの重さを含む" name="upload_skin" />
+        <check_box label="ジョイント位置を含む" name="upload_joints" />
+        <check_box label="ジョイント位置が定義されている場合、スケールをロック" name="lock_scale_if_joint_position" />
+        <text name="pelvis_offset_label">Ｚオフセット（アバターを上下調整）：</text>
+        <spinner name="pelvis_offset" value="0.0" />
+      </panel>
+    </tab_container>
+    <panel name="weights_and_warning_panel">
+      <button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算" />
+      <button label="キャンセル" name="cancel_btn" />
+      <button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード" />
+      <button label="設定をクリアしてフォームをリセット" name="reset_btn" />
+      <text name="upload_fee">アップロード料金：L$ [FEE]</text>
+      <text name="prim_weight">土地の負荷：[EQ]</text>
+      <text name="download_weight">ダウンロード：[ST]</text>
+      <text name="physics_weight">物理演算：[PH]</text>
+      <text name="server_weight">サーバー負荷：[SIM]</text>
+      <text name="warning_title">ご注意：</text>
+      <text name="warning_message">メッシュモデルをアップロードする権利がありません。権利の取得方法については[[VURL]]こちらを参照してください。</text>
+      <text name="status">[STATUS]</text>
+    </panel>
+  </panel>
+  <text name="lod_label">プレビュー：</text>
+  <panel name="right_panel">
+    <combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
+      <combo_item name="high">高</combo_item>
+      <combo_item name="medium">中</combo_item>
+      <combo_item name="low">低</combo_item>
+      <combo_item name="lowest">最低</combo_item>
+    </combo_box>
+    <text name="label_display">外観…</text>
+    <check_box label="輪部" name="show_edges" />
+    <check_box label="物理効果" name="show_physics" />
+    <check_box label="テクスチャ" name="show_textures" />
+    <check_box label="スキンの重さ" name="show_skin_weight" />
+    <check_box label="ジョイント位置" name="show_joint_positions" />
+    <text name="physics_explode_label">プレビュースプレッド：</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
index aed3b78a14..4a87b46b6b 100644
--- a/indra/newview/skins/default/xui/ja/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml
@@ -1,75 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move_floater" title="歩行 / 走行 / 飛行">
-	<string name="walk_forward_tooltip">
-		前に進む（上矢印か W を押す）
-	</string>
-	<string name="walk_back_tooltip">
-		後ろに歩く（下矢印か S を押す）
-	</string>
-	<string name="walk_left_tooltip">
-		左に水平移動（Shift + 左矢印か A を押す）
-	</string>
-	<string name="walk_right_tooltip">
-		右に水平移動（Shift + 右矢印か D を押す）
-	</string>
-	<string name="run_forward_tooltip">
-		前に走る（上矢印か W を押す）
-	</string>
-	<string name="run_back_tooltip">
-		後ろに走る（下矢印か S を押す）
-	</string>
-	<string name="run_left_tooltip">
-		左に水平移動（Shift + 左矢印か A を押す）
-	</string>
-	<string name="run_right_tooltip">
-		右に水平移動（Shift + 右矢印か D を押す）
-	</string>
-	<string name="fly_forward_tooltip">
-		前に飛ぶ（上矢印か W を押す）
-	</string>
-	<string name="fly_back_tooltip">
-		後ろに飛ぶ（下矢印か S を押す）
-	</string>
-	<string name="fly_left_tooltip">
-		左に水平移動（Shift + 左矢印か A を押す）
-	</string>
-	<string name="fly_right_tooltip">
-		右に水平移動（Shift + 右矢印か D を押す）
-	</string>
-	<string name="fly_up_tooltip">
-		上に移動（E を押す）
-	</string>
-	<string name="fly_down_tooltip">
-		下に移動（C を押す）
-	</string>
-	<string name="jump_tooltip">
-		ジャンプ（E を押す）
-	</string>
-	<string name="crouch_tooltip">
-		かがむ（C を押す）
-	</string>
-	<string name="walk_title">
-		歩く
-	</string>
-	<string name="run_title">
-		走る
-	</string>
-	<string name="fly_title">
-		飛ぶ
-	</string>
-	<panel name="panel_actions">
-		<button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）"/>
-		<joystick_slide name="move left btn" tool_tip="左に歩く（Shift + 左矢印か A を押す）"/>
-		<button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）"/>
-		<joystick_slide name="move right btn" tool_tip="右に歩く（Shift + 右矢印か D を押す）"/>
-		<joystick_turn name="forward btn" tool_tip="前に進む（上矢印か W を押す）"/>
-		<joystick_turn name="backward btn" tool_tip="後ろに歩く（下矢印か S を押す）"/>
-		<button label="" label_selected="" name="move up btn" tool_tip="上に移動（E を押す）"/>
-		<button label="" label_selected="" name="move down btn" tool_tip="下に移動（C を押す）"/>
-	</panel>
-	<panel name="panel_modes">
-		<button label="" name="mode_walk_btn" tool_tip="歩行モード"/>
-		<button label="" name="mode_run_btn" tool_tip="走行モード"/>
-		<button label="" name="mode_fly_btn" tool_tip="飛行モード"/>
-	</panel>
-</floater>
+<floater name="move_floater" title="歩行／走行／飛行">
+  <string name="walk_forward_tooltip">前に進む（上矢印か W を押す）</string>
+  <string name="walk_back_tooltip">後ろに歩く（下矢印か S を押す）</string>
+  <string name="walk_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
+  <string name="walk_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
+  <string name="run_forward_tooltip">前に走る（上矢印か W を押す）</string>
+  <string name="run_back_tooltip">後ろに走る（下矢印か S を押す）</string>
+  <string name="run_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
+  <string name="run_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
+  <string name="fly_forward_tooltip">前に飛ぶ（上矢印か W を押す）</string>
+  <string name="fly_back_tooltip">後ろに飛ぶ（下矢印か S を押す）</string>
+  <string name="fly_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
+  <string name="fly_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
+  <string name="fly_up_tooltip">上に移動（E を押す）</string>
+  <string name="fly_down_tooltip">下に移動（C を押す）</string>
+  <string name="jump_tooltip">ジャンプ（E を押す）</string>
+  <string name="crouch_tooltip">かがむ（C を押す）</string>
+  <string name="walk_title">歩く</string>
+  <string name="run_title">走る</string>
+  <string name="fly_title">飛ぶ</string>
+  <panel name="panel_actions">
+    <button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）" />
+    <joystick_slide name="move left btn" tool_tip="左に歩く（Shift + 左矢印か A を押す）" />
+    <button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）" />
+    <joystick_slide name="move right btn" tool_tip="右に歩く（Shift + 右矢印か D を押す）" />
+    <joystick_turn name="forward btn" tool_tip="前に進む（上矢印か W を押す）" />
+    <joystick_turn name="backward btn" tool_tip="後ろに歩く（下矢印か S を押す）" />
+    <button label="" label_selected="" name="move up btn" tool_tip="上に移動（E を押す）" />
+    <button label="" label_selected="" name="move down btn" tool_tip="下に移動（C を押す）" />
+  </panel>
+  <panel name="panel_modes">
+    <button label="" name="mode_walk_btn" tool_tip="歩行モード" />
+    <button label="" name="mode_run_btn" tool_tip="走行モード" />
+    <button label="" name="mode_fly_btn" tool_tip="飛行モード" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index 04ffd5254d..b1d14e9bcd 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="名前でオブジェクトをブロック">
-	<text name="message">
-		オブジェクトをブロックします：
-	</text>
-	<line_editor name="object_name">
-		オブジェクト名
-	</line_editor>
-	<text name="note">
-		* ブロックされるのはオブジェクトの文字だけで、音はブロックされません。
-	</text>
-	<button label="OK" name="OK"/>
-	<button label="ｷｬﾝｾﾙ" name="Cancel"/>
-</floater>
+<floater name="block by name" title="名前でオブジェクトをブロック">
+  <text name="message">オブジェクトをブロックします：</text>
+  <line_editor name="object_name">オブジェクト名</line_editor>
+  <text name="note">* ブロックされるのはオブジェクトの文字だけで、音はブロックされません。</text>
+  <button label="ＯＫ" name="OK" top_pad="10" />
+  <button label="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
index c9a0ecefd7..44ba494b91 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_my_appearance" title="容姿">
-	<panel label="容姿の編集" name="main_panel"/>
-</floater>
+  <panel label="容姿の編集" name="main_panel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
index d697a9f321..ea78425211 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="my_environments" title="私の環境">
-	<layout_stack>
-		<layout_panel label="フィルター" name="filter_panel">
-			<check_box label="日間" name="chk_days"/>
-			<check_box label="空" name="chk_skies"/>
-			<check_box label="水" name="chk_water"/>
-			<filter_editor label="環境の絞り込み" name="flt_search"/>
-		</layout_panel>
-		<layout_panel label="環境" name="list_panel">
-			<panel label="pnl_inv_wrap" name="pnl_inv_wrap"/>
-		</layout_panel>
-		<layout_panel>
-			<check_box initial_value="false" label="すべてのフォルダを表示" name="chk_showfolders"/>
-		</layout_panel>
-		<layout_panel name="pnl_control">
-			<panel label="bottom_panel" name="pnl_bottom">
-				<menu_button name="btn_gear" tool_tip="その他のオプションを表示"/>
-				<menu_button name="btn_newsettings" tool_tip="新規設定を作成"/>
-				<button name="btn_del" tool_tip="選択したアイテムを削除"/>
-			</panel>
-		</layout_panel>
-	</layout_stack>
-</floater>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="my_environments" title="私の環境">
+  <layout_stack name="main_layout">
+    <layout_panel name="filter_panel" label="フィルタ">
+      <icon name="icon_settingsdays" />
+      <check_box label="日間" name="chk_days" />
+      <icon name="icon_settingsskies" />
+      <check_box label="空" name="chk_skies" />
+      <icon name="icon_settingswater" />
+      <check_box label="水" name="chk_water" />
+      <filter_editor label="環境の絞り込み" name="flt_search" />
+    </layout_panel>
+    <layout_panel name="list_panel" label="環境">
+      <panel name="pnl_inv_wrap" label="pnl_inv_wrap">
+        <asset_filtered_inv_panel name="pnl_settings" />
+      </panel>
+    </layout_panel>
+    <layout_panel name="lp_showfolders">
+      <check_box label="全てのフォルダを開く" name="chk_showfolders" />
+    </layout_panel>
+    <layout_panel name="pnl_control">
+      <panel label="ボトムパネル" name="pnl_bottom">
+        <menu_button name="btn_gear" tool_tip="その他のオプションを表示" />
+        <menu_button name="btn_newsettings" tool_tip="新しい設定を作成" />
+        <button name="btn_del" tool_tip="選択した項目を削除" />
+      </panel>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
index d708fc3dec..614b79fb35 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_my_inventory" title="インベントリ"/>
+<floater name="floater_my_inventory" title="インベントリ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_my_scripts.xml b/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
index c691e37613..3d79996a24 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="myscripts" title="スクリプト"/>
+<floater name="myscripts" title="スクリプト" />
diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml
index 0f37b30f52..76b62f3d9f 100644
--- a/indra/newview/skins/default/xui/ja/floater_notification.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notification.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notification" title="通知コンソール">
-	<text_editor name="payload">
-		ローディング...
-	</text_editor>
-	<combo_box label="応答" name="response"/>
-</floater>
+  <text_editor name="payload">読み込んでいます…。</text_editor>
+  <combo_box label="レスポンス" name="response" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
index c9d9ea7acb..3bb61af89f 100644
--- a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notifications_console" title="通知コンソール">
-	<combo_box label="種類を選択" name="notification_types"/>
-	<button label="追加" name="add_notification"/>
-</floater>
+  <combo_box label="種類を選択" name="notification_types" />
+  <button label="追加" name="add_notification" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
index feac052d6c..5d2085973e 100644
--- a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
@@ -1,39 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_notifications_tabbed" title="通知">
-	<floater.string name="system_tab_title">
-		システム ([COUNT])
-	</floater.string>
-	<floater.string name="transactions_tab_title">
-		取引 ([COUNT])
-	</floater.string>
-	<floater.string name="group_invitations_tab_title">
-		招待 ([COUNT])
-	</floater.string>
-	<floater.string name="group_notices_tab_title">
-		グループ ([COUNT])
-	</floater.string>
-	<string name="title_notification_tabbed_window">
-		通知
-	</string>
-	<layout_stack name="TabButtonsStack">
-		<layout_panel name="TabButtonsLayoutPanel">
-			<tab_container name="notifications_tab_container">
-				<panel label="システム (0)" name="system_notification_list_tab"/>
-				<panel label="取引 (0)" name="transaction_notifications_tab"/>
-				<panel label="招待 (0)" name="group_invite_notifications_tab"/>
-				<panel label="グループ (0)" name="group_notice_notifications_tab"/>
-			</tab_container>
-			<layout_stack name="ButtonsStack">
-				<layout_panel name="CondenseAllButtonPanel">
-					<button label="全て折り畳む" name="collapse_all_button"/>
-				</layout_panel>
-				<layout_panel name="GapLayoutPanel">
-					<panel label="ギャップパネル" name="GapPanel"/>
-				</layout_panel>
-				<layout_panel name="DeleteAllButtonPanel">
-					<button label="全て削除" name="delete_all_button"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="system_tab_title">システム ([COUNT])</floater.string>
+  <floater.string name="transactions_tab_title">取引 ([COUNT])</floater.string>
+  <floater.string name="group_invitations_tab_title">招待 ([COUNT])</floater.string>
+  <floater.string name="group_notices_tab_title">グループ ([COUNT])</floater.string>
+  <string name="title_notification_tabbed_window">通知</string>
+  <layout_stack name="TabButtonsStack">
+    <layout_panel name="TabButtonsLayoutPanel">
+      <tab_container name="notifications_tab_container">
+        <panel label="システム (0)" name="system_notification_list_tab" />
+        <panel label="取引 (0)" name="transaction_notifications_tab" />
+        <panel label="招待 (0)" name="group_invite_notifications_tab" />
+        <panel label="グループ (0)" name="group_notice_notifications_tab" />
+      </tab_container>
+      <layout_stack name="ButtonsStack">
+        <layout_panel name="CondenseAllButtonPanel">
+          <button label="全て折り畳む" name="collapse_all_button" />
+        </layout_panel>
+        <layout_panel name="GapLayoutPanel">
+          <panel label="ギャップパネル" name="GapPanel" />
+        </layout_panel>
+        <layout_panel name="DeleteAllButtonPanel">
+          <button label="全て削除" name="delete_all_button" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
index d727a268fb..77212c42db 100644
--- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="object_weights" title="詳しい設定">
-	<floater.string name="nothing_selected" value="--"/>
-	<text name="selected_text" value="選択済"/>
-	<text name="objects" value="--"/>
-	<text name="objects_label" value="オブジェクト"/>
-	<text name="prims" value="--"/>
-	<text name="prims_label" value="プリム"/>
-	<text name="weights_of_selected_text" value="選択済みアイテムのウエイト"/>
-	<text name="download" value="--"/>
-	<text name="download_label" value="ダウンロード"/>
-	<text name="physics" value="--"/>
-	<text name="physics_label" value="物理効果"/>
-	<text name="server" value="--"/>
-	<text name="server_label" value="サーバー"/>
-	<text name="display" value="--"/>
-	<text name="display_label" value="ディスプレイ"/>
-	<text name="land_impacts_text" value="土地の負荷"/>
-	<text name="selected" value="--"/>
-	<text name="selected_label" value="選択済"/>
-	<text name="rezzed_on_land" value="--"/>
-	<text name="rezzed_on_land_label" value="土地に Rez 済み"/>
-	<text name="remaining_capacity" value="--"/>
-	<text name="remaining_capacity_label" value="残りの許容数"/>
-	<text name="total_capacity" value="--"/>
-	<text name="total_capacity_label" value="許容合計"/>
-	<text name="help_SLURL" value="[secondlife:///app/help/object_weights オブジェクトのウェイトとは？]"/>
-</floater>
+  <floater.string name="nothing_selected" value="─" />
+  <text name="selected_text" value="選択済" />
+  <text name="objects" value="─" />
+  <text name="objects_label" value="オブジェクト" />
+  <text name="prims" value="─" />
+  <text name="prims_label" value="プリム" />
+  <text name="weights_of_selected_text" value="選択済みアイテムのウエイト" />
+  <text name="download" value="─" />
+  <text name="download_label" value="ダウンロード" />
+  <text name="physics" value="─" />
+  <text name="physics_label" value="物理効果" />
+  <text name="server" value="─" />
+  <text name="server_label" value="サーバー" />
+  <text name="display" value="─" />
+  <text name="display_label" value="ディスプレイ" />
+  <text name="land_impacts_text" value="土地の負荷" />
+  <text name="selected" value="─" />
+  <text name="selected_label" value="選択済" />
+  <text name="rezzed_on_land" value="─" />
+  <text name="rezzed_on_land_label" value="土地に Rez 済み" />
+  <text name="remaining_capacity" value="─" />
+  <text name="remaining_capacity_label" value="残りの許容数" />
+  <text name="total_capacity" value="─" />
+  <text name="total_capacity_label" value="許容合計" />
+  <text name="help_SLURL" value="[secondlife:///app/help/object_weights オブジェクトのウェイトとは？]" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
index 3f2f71511b..15d59f4adf 100644
--- a/indra/newview/skins/default/xui/ja/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="objectcontents" title="オブジェクトの中身">
-	<text name="object_name">
-		[DESC]:
-	</text>
-	<text name="border_note">
-		インベントリおよびウェアにコピー
-	</text>
-	<button label="アウトフィットに追加" label_selected="アウトフィットに追加" name="copy_and_wear_button"/>
-	<button label="アウトフィットを交換" label_selected="アウトフィットを交換" name="copy_and_replace_button"/>
-	<button label="インベントリにコピーするだけ" label_selected="インベントリにコピーするだけ" name="copy_to_inventory_button"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_button"/>
-</floater>
+<floater name="objectcontents" title="オブジェクトのコンテンツ">
+  <text name="object_name">[DESC]：</text>
+  <panel_inventory_object name="object_contents" />
+  <button label="インベントリにコピーのみ" label_selected="インベントリにコピー" name="copy_to_inventory_button" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_button" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
new file mode 100644
index 0000000000..906e68a961
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="outfit_photo_preview">
+  <floater.string name="Title">テスクチャ：[NAME]</floater.string>
+  <floater.string name="exceed_limits">アウトフィット画像の最大サイズは[MAX_WIDTH]✕[MAX_HEIGHT]です。他のテスクチャを選択してください。</floater.string>
+  <floater.string name="photo_confirmation">この画像を[OUTFIT]のアウトフィット画像にしますか？</floater.string>
+  <text name="dimensions">[WIDTH]px✕[HEIGHT]px</text>
+  <text name="notification" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
index 70555e6ded..7e949e5c26 100644
--- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="アウトフィットを保存する">
-	<button label="保存" label_selected="保存" name="Save"/>
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-	<text name="Save item as:">
-		着用しているものを
-新しいアウトフィットに保存：
-	</text>
-	<line_editor name="name ed">
-		[DESC] （新）
-	</line_editor>
-</floater>
+  <button label="保存" label_selected="保存" name="Save" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <!-- 字数制限のため「着用中のアウトフィットを名前をつけて保存：」ではない-->
+  <text name="Save item as:">名前をつけて保存：</text>
+  <!-- 名前には、非ASCII文字が使えないため翻訳しない -->
+  <line_editor name="name ed">[DESC] (NEW)</line_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
index f1a05e0eec..d9699c2661 100644
--- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
@@ -1,40 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="outgoing call" title="コール中">
-	<floater.string name="lifetime">
-		5
-	</floater.string>
-	<floater.string name="localchat">
-		近くのボイスチャット
-	</floater.string>
-	<floater.string name="anonymous">
-		匿名ユーザー
-	</floater.string>
-	<floater.string name="VoiceInviteP2P">
-		がコールしています。
-	</floater.string>
-	<floater.string name="VoiceInviteAdHoc">
-		がコンファレンスチャットで、ボイスチャットに参加しました。
-	</floater.string>
-	<text name="connecting">
-		[CALLEE_NAME] に接続中
-	</text>
-	<text name="calling">
-		[CALLEE_NAME] にコール中
-	</text>
-	<text name="noanswer">
-		繋がりませんでした。  あとでもう一度お試しください。
-	</text>
-	<text name="nearby">
-		[VOICE_CHANNEL_NAME] への接続が切れました。  [RECONNECT_NEARBY]
-	</text>
-	<text name="nearby_P2P_by_other">
-		コールを切りました。  [RECONNECT_NEARBY]
-	</text>
-	<text name="nearby_P2P_by_agent">
-		コールを終了しました。  [RECONNECT_NEARBY]
-	</text>
-	<text name="leaving">
-		[CURRENT_CHAT] を終了します。
-	</text>
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-</floater>
+  <floater.string name="lifetime">5</floater.string>
+  <floater.string name="localchat">近隣のボイスチャット</floater.string>
+  <floater.string name="anonymous">匿名ユーザー</floater.string>
+  <floater.string name="VoiceInviteP2P">がコールしています。</floater.string>
+  <floater.string name="VoiceInviteAdHoc">が会話チャットで、ボイスチャットに参加しました。</floater.string>
+  <text name="connecting">[CALLEE_NAME]に接続中</text>
+  <text name="calling">[CALLEE_NAME]をコール中</text>
+  <text name="noanswer">繋がりませんでした。あとでもう一度お試しください。</text>
+  <text name="nearby">[VOICE_CHANNEL_NAME]への接続が切れました。[RECONNECT_NEARBY]</text>
+  <text name="nearby_P2P_by_other">コールを切りました。[RECONNECT_NEARBY]</text>
+  <text name="nearby_P2P_by_agent">コールを終了しました。[RECONNECT_NEARBY]</text>
+  <text name="leaving">[CURRENT_CHAT]を終了します。</text>
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
index 0e72b40dc6..a4ac5ab356 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -1,57 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_pathfinding_characters" title="パスファインディングキャラクター">
-	<floater.string name="messaging_get_inprogress">
-		パスファインディングキャラクターを照会中...
-	</floater.string>
-	<floater.string name="messaging_get_error">
-		パスファインディングキャラクターの照会中にエラーが発生しました。
-	</floater.string>
-	<floater.string name="messaging_complete_none_found">
-		パスファインディングキャラクターがありません。
-	</floater.string>
-	<floater.string name="messaging_complete_available">
-		[NUM_TOTAL] キャラクター中 [NUM_SELECTED] キャラクターが選択されました。
-	</floater.string>
-	<floater.string name="messaging_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="character_cpu_time">
-		[CPU_TIME] µs
-	</floater.string>
-	<floater.string name="character_owner_loading">
-		[Loading]
-	</floater.string>
-	<floater.string name="character_owner_unknown">
-		[Unknown]
-	</floater.string>
-	<floater.string name="character_owner_group">
-		[group]
-	</floater.string>
-	<panel name="pathfinding_chars_main">
-		<scroll_list name="objects_scroll_list">
-			<scroll_list.columns label="名前" name="name"/>
-			<scroll_list.columns label="説明" name="description"/>
-			<scroll_list.columns label="所有者" name="owner"/>
-			<scroll_list.columns label="CPU" name="cpu_time"/>
-			<scroll_list.columns label="高度" name="altitude"/>
-		</scroll_list>
-		<text name="messaging_status">
-			キャラクター：
-		</text>
-		<button label="リスト更新" name="refresh_objects_list"/>
-		<button label="すべて選択" name="select_all_objects"/>
-		<button label="何も選択しない" name="select_none_objects"/>
-	</panel>
-	<panel name="pathfinding_chars_actions">
-		<text name="actions_label">
-			選択したキャラクターに対するアクション：
-		</text>
-		<check_box label="ビーコンを表示" name="show_beacon"/>
-		<check_box label="物理効果カプセルを表示" name="show_physics_capsule"/>
-		<button label="取る" name="take_objects"/>
-		<button label="コピーを取る" name="take_copy_objects"/>
-		<button label="私をそこにテレポートする" name="teleport_me_to_object" tool_tip="1 つのキャラクターが選択された場合にのみ有効です。"/>
-		<button label="返却" name="return_objects"/>
-		<button label="削除" name="delete_objects"/>
-	</panel>
-</floater>
+<floater name="floater_pathfinding_characters" title="経路探索キャラクター">
+  <floater.string name="messaging_get_inprogress">経路探索キャラクターを照会中…</floater.string>
+  <floater.string name="messaging_get_error">経路探索キャラクターの照会中にエラーが発生しました。</floater.string>
+  <floater.string name="messaging_complete_none_found">経路探索キャラクターがありません。</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_TOTAL]人のキャラクター中[NUM_SELECTED]人のキャラクターが選択されました。</floater.string>
+  <floater.string name="messaging_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="character_cpu_time">[CPU_TIME]㎲</floater.string>
+  <floater.string name="character_owner_loading">[Loading]</floater.string>
+  <floater.string name="character_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="character_owner_group">[group]</floater.string>
+  <panel name="pathfinding_chars_main">
+    <scroll_list name="objects_scroll_list">
+      <scroll_list.columns label="名前" name="name" />
+      <scroll_list.columns label="説明" name="description" />
+      <scroll_list.columns label="所有者" name="owner" />
+      <scroll_list.columns label="ＣＰＵ" name="cpu_time" />
+      <scroll_list.columns label="高度" name="altitude" />
+    </scroll_list>
+    <text name="messaging_status">キャラクター：</text>
+    <button label="リスト更新" name="refresh_objects_list" />
+    <button label="すべて選択" name="select_all_objects" />
+    <button label="何も選択しない" name="select_none_objects" />
+  </panel>
+  <panel name="pathfinding_chars_actions">
+    <text name="actions_label">選択したキャラクターに対するアクション：</text>
+    <check_box label="ビーコンを表示" name="show_beacon" />
+    <check_box label="物理効果カプセルを表示" name="show_physics_capsule" />
+    <button label="取る" name="take_objects" />
+    <button label="コピーを取る" name="take_copy_objects" />
+    <button label="その場所にテレポート" name="teleport_me_to_object" tool_tip="１つのキャラクターが選択された場合にのみ有効です。" />
+    <button label="返却" name="return_objects" />
+    <button label="削除" name="delete_objects" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index d531d588f7..4434f44cb8 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -1,131 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_pathfinding_console" title="パスファインディングの表示/テスト">
-	<floater.string name="navmesh_viewer_status_library_not_implemented">
-		パスファインディングライブラリの実装が見つかりません。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_region_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_region_loading">
-		地域（リージョン）の読み込みを待機しています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_checking_version">
-		ナビメッシュのステータスを確認しています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_downloading">
-		ナビメッシュをダウンロードしています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_updating">
-		サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_has_navmesh">
-		最新のナビメッシュがダウンロードされました。
-	</floater.string>
-	<floater.string name="navmesh_viewer_status_error">
-		ナビメッシュを正しくダウンロードできません。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_pending">
-		ナビメッシュに保留中の変更があります。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_building">
-		ナビメッシュを作成しています。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_some_pending">
-		ナビメッシュの一部の地域（リージョン）に保留中の変更があります。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_some_building">
-		一部のナビメッシュ地域（リージョン）を構築しています。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_pending_and_building">
-		ナビメッシュの一部の地域（リージョン）に保留中の変更があり、その他の地域（リージョン）は構築中です。
-	</floater.string>
-	<floater.string name="navmesh_simulator_status_complete">
-		ナビメッシュは最新です。
-	</floater.string>
-	<floater.string name="pathing_library_not_implemented">
-		パスファインディングライブラリの実装が見つかりません。
-	</floater.string>
-	<floater.string name="pathing_region_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="pathing_choose_start_and_end_points">
-		開始点と終了点を選択してください。
-	</floater.string>
-	<floater.string name="pathing_choose_start_point">
-		開始点を選択してください。
-	</floater.string>
-	<floater.string name="pathing_choose_end_point">
-		終了点を選択してください。
-	</floater.string>
-	<floater.string name="pathing_path_valid">
-		パスはオレンジ色で表示されています。
-	</floater.string>
-	<floater.string name="pathing_path_invalid">
-		選択した 2 点間のパスが見つかりません。
-	</floater.string>
-	<floater.string name="pathing_error">
-		パスの生成中にエラーが発生しました。
-	</floater.string>
-	<panel name="pathfinding_console_main">
-		<text name="viewer_status_label">
-			ビューワステータス
-		</text>
-	</panel>
-	<panel name="pathfinding_console_simulator">
-		<text name="simulator_status_label">
-			シミュレータステータス
-		</text>
-	</panel>
-	<tab_container name="view_test_tab_container">
-		<panel label="表示" name="view_panel">
-			<text name="show_label">
-				表示：
-			</text>
-			<check_box label="世界" name="show_world"/>
-			<check_box label="可動物のみ" name="show_world_movables_only"/>
-			<check_box label="ナビメッシュ" name="show_navmesh"/>
-			<text name="show_walkability_label">
-				歩行可能マップを表示:
-			</text>
-			<combo_box name="show_heatmap_mode">
-				<combo_box.item label="表示しない" name="show_heatmap_mode_none"/>
-				<combo_box.item label="キャラクター タイプ A" name="show_heatmap_mode_a"/>
-				<combo_box.item label="キャラクター タイプ B" name="show_heatmap_mode_b"/>
-				<combo_box.item label="キャラクター タイプ C" name="show_heatmap_mode_c"/>
-				<combo_box.item label="キャラクター タイプ D" name="show_heatmap_mode_d"/>
-			</combo_box>
-			<check_box label="歩行可能" name="show_walkables"/>
-			<check_box label="素材ボリューム" name="show_material_volumes"/>
-			<check_box label="静的障害物" name="show_static_obstacles"/>
-			<check_box label="除外ボリューム" name="show_exclusion_volumes"/>
-			<check_box label="水上飛行機" name="show_water_plane"/>
-			<check_box label="X 線表示による" name="show_xray"/>
-		</panel>
-		<panel label="パスをテスト" name="test_panel">
-			<text name="ctrl_click_label">
-				Ctrl キーを押しながらクリックして、開始点を選択します。
-			</text>
-			<text name="shift_click_label">
-				Shift キーを押しながらクリックして、終了点を選択します。
-			</text>
-			<text name="character_width_label">
-				キャラクターの幅
-			</text>
-			<slider name="character_width" value="1"/>
-			<text name="character_width_unit_label">
-				m
-			</text>
-			<text name="character_type_label">
-				キャラクタータイプ
-			</text>
-			<combo_box name="path_character_type">
-				<combo_box.item label="なし" name="path_character_type_none"/>
-				<combo_box.item label="A" name="path_character_type_a"/>
-				<combo_box.item label="B" name="path_character_type_b"/>
-				<combo_box.item label="C" name="path_character_type_c"/>
-				<combo_box.item label="D" name="path_character_type_d"/>
-			</combo_box>
-			<button label="パスをクリア" name="clear_path"/>
-		</panel>
-	</tab_container>
-</floater>
+<floater name="floater_pathfinding_console" title="経路探索の表示／テスト">
+  <floater.string name="navmesh_viewer_status_library_not_implemented">経路探索ライブラリの実装が見つかりません。</floater.string>
+  <floater.string name="navmesh_viewer_status_region_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="navmesh_viewer_status_region_loading">リージョン（地域）の読み込みを待機しています。</floater.string>
+  <floater.string name="navmesh_viewer_status_checking_version">ナビメッシュのステータスを確認しています。</floater.string>
+  <floater.string name="navmesh_viewer_status_downloading">ナビメッシュをダウンロードしています。</floater.string>
+  <floater.string name="navmesh_viewer_status_updating">サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。</floater.string>
+  <floater.string name="navmesh_viewer_status_has_navmesh">最新のナビメッシュがダウンロードされました。
+  </floater.string>
+  <floater.string name="navmesh_viewer_status_error">ナビメッシュが正しくダウンロードできませんでした。</floater.string>
+  <floater.string name="navmesh_simulator_status_pending">ナビメッシュに保留中の変更があります。</floater.string>
+  <floater.string name="navmesh_simulator_status_building">ナビメッシュを作成しています。</floater.string>
+  <floater.string name="navmesh_simulator_status_some_pending">ナビメッシュの一部のリージョン（地域）に保留中の変更があります。</floater.string>
+  <floater.string name="navmesh_simulator_status_some_building">一部のナビメッシュのリージョン（地域）を構築しています。</floater.string>
+  <floater.string name="navmesh_simulator_status_pending_and_building">ナビメッシュの一部のリージョン（地域）に保留中の変更があり、その他のリージョンは構築中です。</floater.string>
+  <floater.string name="navmesh_simulator_status_complete">ナビメッシュは最新です。</floater.string>
+  <floater.string name="pathing_library_not_implemented">経路探索ライブラリの実装が見つかりません。</floater.string>
+  <floater.string name="pathing_region_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="pathing_choose_start_and_end_points">開始点と終了点を選択してください。</floater.string>
+  <floater.string name="pathing_choose_start_point">開始点を選択してください。</floater.string>
+  <floater.string name="pathing_choose_end_point">終了点を選択してください。</floater.string>
+  <floater.string name="pathing_path_valid">パスはオレンジ色で表示されています。</floater.string>
+  <floater.string name="pathing_path_invalid">選択した２点間のパスが見つかりません。</floater.string>
+  <floater.string name="pathing_error">パスの生成中にエラーが発生しました。</floater.string>
+  <panel name="pathfinding_console_main">
+    <text name="viewer_status_label">ビューアのステータス</text>
+  </panel>
+  <panel name="pathfinding_console_simulator">
+    <text name="simulator_status_label">シミュレータのステータス</text>
+  </panel>
+  <tab_container name="view_test_tab_container">
+    <panel label="表示" name="view_panel">
+      <text name="show_label">表示：</text>
+      <check_box label="ワールド" name="show_world" />
+      <check_box label="可動物のみ" name="show_world_movables_only" />
+      <check_box label="ナビメッシュ" name="show_navmesh" />
+      <text name="show_walkability_label">歩行可能マップを表示：</text>
+      <combo_box name="show_heatmap_mode">
+        <combo_box.item label="表示しない" name="show_heatmap_mode_none" />
+        <combo_box.item label="キャラクタータイプＡ" name="show_heatmap_mode_a" />
+        <combo_box.item label="キャラクタータイプＢ" name="show_heatmap_mode_b" />
+        <combo_box.item label="キャラクタータイプＣ" name="show_heatmap_mode_c" />
+        <combo_box.item label="キャラクタータイプＤ" name="show_heatmap_mode_d" />
+      </combo_box>
+      <check_box label="歩行可能" name="show_walkables" />
+      <check_box label="素材ボリューム" name="show_material_volumes" />
+      <check_box label="静的障害物" name="show_static_obstacles" />
+      <check_box label="除外ボリューム" name="show_exclusion_volumes" />
+      <check_box label="水上飛行機" name="show_water_plane" />
+      <check_box label="Ｘ線表示" name="show_xray" />
+    </panel>
+    <panel label="パスをテスト" name="test_panel">
+      <text name="ctrl_click_label">Ctrlキーを押しながらクリックして、開始点を選択します。</text>
+      <text name="shift_click_label">Shiftキーを押しながらクリックして、終了点を選択します。</text>
+      <text name="character_width_label">キャラクターの幅</text>
+      <slider name="character_width" value="1" />
+      <text name="character_width_unit_label">ｍ</text>
+      <text name="character_type_label">キャラクタータイプ</text>
+      <combo_box name="path_character_type">
+        <combo_box.item label="なし" name="path_character_type_none" />
+        <combo_box.item label="Ａ" name="path_character_type_a" />
+        <combo_box.item label="Ｂ" name="path_character_type_b" />
+        <combo_box.item label="Ｃ" name="path_character_type_c" />
+        <combo_box.item label="Ｄ" name="path_character_type_d" />
+      </combo_box>
+      <button label="経路をクリア" name="clear_path" />
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
index 16d6acfeef..b28071be68 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -1,182 +1,92 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_linksets" title="リージョンオブジェクト">
-	<floater.string name="messaging_get_inprogress">
-		パスファインディングリンクセットを照会中...
-	</floater.string>
-	<floater.string name="messaging_get_error">
-		パスファインディングリンクセットの照会中にエラーが発生しました。
-	</floater.string>
-	<floater.string name="messaging_set_inprogress">
-		選択したパスファインディングリンクセットを修正中...
-	</floater.string>
-	<floater.string name="messaging_set_error">
-		選択したパスファインディングリンクセットの修正中にエラーが発生しました。
-	</floater.string>
-	<floater.string name="messaging_complete_none_found">
-		パスファインディングリンクセットがありません。
-	</floater.string>
-	<floater.string name="messaging_complete_available">
-		[NUM_TOTAL] 中 [NUM_SELECTED] が選択されました。
-	</floater.string>
-	<floater.string name="messaging_not_enabled">
-		この地域（リージョン）はパスファインディングに対応していません。
-	</floater.string>
-	<floater.string name="linkset_terrain_name">
-		[Terrain]
-	</floater.string>
-	<floater.string name="linkset_terrain_description">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_owner">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_scripted">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_land_impact">
-		--
-	</floater.string>
-	<floater.string name="linkset_terrain_dist_from_you">
-		--
-	</floater.string>
-	<floater.string name="linkset_owner_loading">
-		[Loading]
-	</floater.string>
-	<floater.string name="linkset_owner_unknown">
-		[Unknown]
-	</floater.string>
-	<floater.string name="linkset_owner_group">
-		[group]
-	</floater.string>
-	<floater.string name="linkset_is_scripted">
-		はい
-	</floater.string>
-	<floater.string name="linkset_is_not_scripted">
-		いいえ
-	</floater.string>
-	<floater.string name="linkset_is_unknown_scripted">
-		不明
-	</floater.string>
-	<floater.string name="linkset_use_walkable">
-		歩行可能
-	</floater.string>
-	<floater.string name="linkset_use_static_obstacle">
-		静的障害物
-	</floater.string>
-	<floater.string name="linkset_use_dynamic_obstacle">
-		可動障害物
-	</floater.string>
-	<floater.string name="linkset_use_material_volume">
-		素材ボリューム
-	</floater.string>
-	<floater.string name="linkset_use_exclusion_volume">
-		除外ボリューム
-	</floater.string>
-	<floater.string name="linkset_use_dynamic_phantom">
-		可動ボリューム
-	</floater.string>
-	<floater.string name="linkset_is_terrain">
-		[unmodifiable]
-	</floater.string>
-	<floater.string name="linkset_is_restricted_state">
-		[restricted]
-	</floater.string>
-	<floater.string name="linkset_is_non_volume_state">
-		[concave]
-	</floater.string>
-	<floater.string name="linkset_is_restricted_non_volume_state">
-		[restricted,concave]
-	</floater.string>
-	<floater.string name="linkset_choose_use">
-		リンクセットの用途を選択...
-	</floater.string>
-	<panel name="pathfinding_linksets_main">
-		<text name="linksets_filter_label">
-			フィルター：
-		</text>
-		<text name="linksets_name_label">
-			名前
-		</text>
-		<text name="linksets_desc_label">
-			説明
-		</text>
-		<combo_box name="filter_by_linkset_use">
-			<combo_box.item label="リンクセットの用途でフィルター..." name="filter_by_linkset_use_none"/>
-			<combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable"/>
-			<combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle"/>
-			<combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle"/>
-			<combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume"/>
-			<combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume"/>
-			<combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom"/>
-		</combo_box>
-		<button label="適用" name="apply_filters"/>
-		<button label="クリア" name="clear_filters"/>
-		<scroll_list name="objects_scroll_list">
-			<scroll_list.columns label="名前 (ルートプリム)" name="name"/>
-			<scroll_list.columns label="説明 (ルートプリム)" name="description"/>
-			<scroll_list.columns label="所有者" name="owner"/>
-			<scroll_list.columns label="スクリプト" name="scripted"/>
-			<scroll_list.columns label="負荷" name="land_impact"/>
-			<scroll_list.columns label="距離" name="dist_from_you"/>
-			<scroll_list.columns label="パスファインディング使用" name="linkset_use"/>
-			<scroll_list.columns label="A %" name="a_percent"/>
-			<scroll_list.columns label="B %" name="b_percent"/>
-			<scroll_list.columns label="C %" name="c_percent"/>
-			<scroll_list.columns label="D %" name="d_percent"/>
-		</scroll_list>
-		<text name="messaging_status">
-			リンクセット：
-		</text>
-		<button label="リスト更新" name="refresh_objects_list"/>
-		<button label="すべて選択" name="select_all_objects"/>
-		<button label="何も選択しない" name="select_none_objects"/>
-	</panel>
-	<panel name="pathfinding_linksets_actions">
-		<text name="linksets_actions_label">
-			選択されたアクション
-		</text>
-		<check_box label="ビーコンを表示" name="show_beacon"/>
-		<button label="取る" name="take_objects"/>
-		<button label="コピーを取る" name="take_copy_objects"/>
-		<button label="私をそこにテレポートする" name="teleport_me_to_object"/>
-		<button label="返却" name="return_objects"/>
-		<button label="削除" name="delete_objects"/>
-	</panel>
-	<panel name="pathfinding_linksets_attributes">
-		<text name="linksets_attributes_label">
-			パスファインディング属性を編集する
-		</text>
-		<text name="walkability_coefficients_label">
-			歩行可能性：
-		</text>
-		<text name="edit_a_label">
-			A
-		</text>
-		<line_editor name="edit_a_value" tool_tip="タイプ A のキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。"/>
-		<text name="edit_b_label">
-			B
-		</text>
-		<line_editor name="edit_b_value" tool_tip="タイプ B のキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。"/>
-		<text name="edit_c_label">
-			C
-		</text>
-		<line_editor name="edit_c_value" tool_tip="タイプ C のキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。"/>
-		<text name="edit_d_label">
-			D
-		</text>
-		<line_editor name="edit_d_value" tool_tip="タイプ D のキャラクターの歩行可能性。キャラクタータイプの例はその他です。"/>
-		<button label="変更を適用" name="apply_edit_values"/>
-		<text name="suggested_use_a_label">
-			(ヒューマノイド)
-		</text>
-		<text name="suggested_use_b_label">
-			(クリーチャー)
-		</text>
-		<text name="suggested_use_c_label">
-			(メカニカル)
-		</text>
-		<text name="suggested_use_d_label">
-			(その他)
-		</text>
-	</panel>
-</floater>
+  <floater.string name="messaging_get_inprogress">経路探索リンクセットを照会中…</floater.string>
+  <floater.string name="messaging_get_error">経路探索リンクセットの照会中にエラーが発生しました。</floater.string>
+  <floater.string name="messaging_set_inprogress">選択した経路探索リンクセットを修正中…</floater.string>
+  <floater.string name="messaging_set_error">選択した経路探索リンクセットの修正中にエラーが発生しました。</floater.string>
+  <floater.string name="messaging_complete_none_found">経路探索リンクセットがありません。</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_TOTAL]個中[NUM_SELECTED]個が選択されました。</floater.string>
+  <floater.string name="messaging_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
+  <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
+  <floater.string name="linkset_terrain_description">－</floater.string>
+  <floater.string name="linkset_terrain_owner">－</floater.string>
+  <floater.string name="linkset_terrain_scripted">－</floater.string>
+  <floater.string name="linkset_terrain_land_impact">－</floater.string>
+  <floater.string name="linkset_terrain_dist_from_you">－</floater.string>
+  <floater.string name="linkset_owner_loading">[Loading]</floater.string>
+  <floater.string name="linkset_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="linkset_owner_group">[group]</floater.string>
+  <floater.string name="linkset_is_scripted">はい</floater.string>
+  <floater.string name="linkset_is_not_scripted">いいえ</floater.string>
+  <floater.string name="linkset_is_unknown_scripted">不明</floater.string>
+  <floater.string name="linkset_use_walkable">歩行可能</floater.string>
+  <floater.string name="linkset_use_static_obstacle">静的障害物</floater.string>
+  <floater.string name="linkset_use_dynamic_obstacle">可動障害物</floater.string>
+  <floater.string name="linkset_use_material_volume">素材ボリューム</floater.string>
+  <floater.string name="linkset_use_exclusion_volume">除外ボリューム</floater.string>
+  <floater.string name="linkset_use_dynamic_phantom">可動ボリューム</floater.string>
+  <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string>
+  <floater.string name="linkset_is_restricted_state">[restricted]</floater.string>
+  <floater.string name="linkset_is_non_volume_state">[concave]</floater.string>
+  <floater.string name="linkset_is_restricted_non_volume_state">[restricted,concave]</floater.string>
+  <floater.string name="linkset_choose_use">リンクセットの用途を選択…</floater.string>
+  <panel name="pathfinding_linksets_main">
+    <text name="linksets_filter_label">フィルタ：</text>
+    <text name="linksets_name_label">名前</text>
+    <text name="linksets_desc_label">説明</text>
+    <combo_box name="filter_by_linkset_use">
+      <combo_box.item label="リンクセットの用途でフィルタ…" name="filter_by_linkset_use_none" />
+      <combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable" />
+      <combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle" />
+      <combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle" />
+      <combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume" />
+      <combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume" />
+      <combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom" />
+    </combo_box>
+    <button label="適用" name="apply_filters" />
+    <button label="クリア" name="clear_filters" />
+    <scroll_list name="objects_scroll_list">
+      <scroll_list.columns label="名前（ルートプリム）" name="name" />
+      <scroll_list.columns label="説明（ルートプリム）" name="description" />
+      <scroll_list.columns label="所有者" name="owner" />
+      <scroll_list.columns label="スクリプト" name="scripted" />
+      <scroll_list.columns label="ランドインパクト" name="land_impact" />
+      <scroll_list.columns label="距離" name="dist_from_you" />
+      <scroll_list.columns label="経路探索で使用" name="linkset_use" />
+      <scroll_list.columns label="Ａ％" name="a_percent" />
+      <scroll_list.columns label="Ｂ％" name="b_percent" />
+      <scroll_list.columns label="Ｃ％" name="c_percent" />
+      <scroll_list.columns label="Ｄ％" name="d_percent" />
+    </scroll_list>
+    <text name="messaging_status">リンクセット：</text>
+    <button label="リスト更新" name="refresh_objects_list" />
+    <button label="すべて選択" name="select_all_objects" />
+    <button label="何も選択しない" name="select_none_objects" />
+  </panel>
+  <panel name="pathfinding_linksets_actions">
+    <text name="linksets_actions_label">選択されたアクション</text>
+    <check_box label="ビーコンを表示" name="show_beacon" />
+    <button label="取る" name="take_objects" />
+    <button label="コピーを取る" name="take_copy_objects" />
+    <button label="その場所にテレポート" name="teleport_me_to_object" />
+    <button label="返却" name="return_objects" />
+    <button label="削除" name="delete_objects" />
+  </panel>
+  <panel name="pathfinding_linksets_attributes">
+    <text name="linksets_attributes_label">経路探索属性を編集する</text>
+    <text name="walkability_coefficients_label">歩行可能性：</text>
+    <text name="edit_a_label">Ａ</text>
+    <line_editor name="edit_a_value" tool_tip="タイプＡのキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。" />
+    <text name="edit_b_label">Ｂ</text>
+    <line_editor name="edit_b_value" tool_tip="タイプＢのキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。" />
+    <text name="edit_c_label">Ｃ</text>
+    <line_editor name="edit_c_value" tool_tip="タイプＣのキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。" />
+    <text name="edit_d_label">Ｄ</text>
+    <line_editor name="edit_d_value" tool_tip="タイプＤのキャラクターの歩行可能性。キャラクタータイプの例はその他です。" />
+    <button label="変更を適用" name="apply_edit_values" />
+    <text name="suggested_use_a_label">（ヒューマノイド）</text>
+    <text name="suggested_use_b_label">（クリーチャー）</text>
+    <text name="suggested_use_c_label">（メカニカル）</text>
+    <text name="suggested_use_d_label">（その他）</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index 7807fdf7b4..b4773dcd2f 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,31 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<string name="payee_group">
-		グループに支払う
-	</string>
-	<string name="payee_resident">
-		住人に支払う
-	</string>
-	<text name="paying_text">
-		支払中:
-	</text>
-	<text name="payee_name">
-		非常に長い名前が途中で切れていないかをテストして確認
-	</text>
-	<text name="payment_message_label">
-		説明（任意項目）：
-	</text>
-	<panel label="検索" name="PatternsPanel">
-		<button label="L$ 1 支払う" label_selected="L$ 1 支払う" name="fastpay 1"/>
-		<button label="L$ 5 支払う" label_selected="L$ 5 支払う" name="fastpay 5"/>
-		<button label="L$ 10 支払う" label_selected="L$ 10 支払う" name="fastpay 10"/>
-		<button label="L$ 20 支払う" label_selected="L$ 20 支払う" name="fastpay 20"/>
-	</panel>
-	<panel label="検索" name="InputPanel">
-		<text name="amount text">
-			その他の金額:
-		</text>
-		<button label="支払い" label_selected="支払い" name="pay btn"/>
-		<button label="取り消し" label_selected="取り消し" name="cancel btn"/>
-	</panel>
-</floater>
+<floater name="Give Money" title="お支払い">
+  <string name="payee_group">グループに支払う</string>
+  <string name="payee_resident">住人に支払う</string>
+  <text name="paying_text">支払い先：</text>
+  <text name="payee_name">非常に長い名前が途中で切れていないかをテストして確認</text>
+  <text name="payment_message_label">説明（任意項目）：</text>
+  <panel label="検索" name="PatternsPanel">
+    <button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1" />
+    <button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5" />
+    <button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10" />
+    <button label="L$ 20 払う" label_selected="L$ 20支払う" name="fastpay 20" />
+  </panel>
+  <panel label="検索" name="InputPanel">
+    <text name="amount text">その他の金額：</text>
+    <button label="支払い" label_selected="支払い" name="pay btn" />
+    <button label="キャンセル" label_selected="支払いの取り消し" name="cancel btn" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 3331cee0e0..5206011675 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<string name="payee_group">グループに支払う</string>
-	<string name="payee_resident">住人に支払う</string>
-	<text name="paying_text">支払中:</text>
-	<text name="payee_name">Ericacita Moostopolison</text>
-	<text name="object_name_label">オブジェクトを介して：</text>
-	<icon name="icon_object" tool_tip="オブジェクト"/>
-	<text name="object_name_text">...</text>
-	<panel label="検索" name="PatternsPanel">
-		<button label="L$ 1 支払う" label_selected="L$ 1 支払う" name="fastpay 1"/>
-		<button label="L$ 5 支払う" label_selected="L$ 5 支払う" name="fastpay 5"/>
-		<button label="L$ 10 支払う" label_selected="L$ 10 支払う" name="fastpay 10"/>
-		<button label="L$ 20 支払う" label_selected="L$ 20 支払う" name="fastpay 20"/>
-	</panel>
-	<panel label="検索" name="InputPanel">
-		<text name="amount text">その他の金額:</text>
-		<button label="支払い" label_selected="支払い" name="pay btn"/>
-		<button label="取り消し" label_selected="取り消し" name="cancel btn"/>
-	</panel>
-</floater>
+<floater name="Give Money" title="オブジェクトにお支払い">
+  <string name="payee_group">グループに支払う</string>
+  <string name="payee_resident">住人に支払う</string>
+  <text name="paying_text">支払い先：</text>
+  <text name="payee_name">エリカシタ・モストポリゾン</text>
+  <text name="object_name_label">以下のオブジェクトを介して支払う：</text>
+  <icon name="icon_object" tool_tip="オブジェクト" />
+  <text name="object_name_text">…</text>
+  <panel label="検索" name="PatternsPanel">
+    <button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1" />
+    <button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5" />
+    <button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10" />
+    <button label="L$ 20支払う" label_selected="L$ 20支払う" name="fastpay 20" />
+  </panel>
+  <panel label="検索" name="InputPanel">
+    <text name="amount text">その他の金額:</text>
+    <button label="支払い" label_selected="オブジェクトに支払います。" name="pay btn" />
+    <button label="キャンセル" label_selected="オブジェクトへの支払いを取り消します。" name="cancel btn" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml
index 0f7c298289..e996f0adbf 100644
--- a/indra/newview/skins/default/xui/ja/floater_people.xml
+++ b/indra/newview/skins/default/xui/ja/floater_people.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" ?>
-<floater name="floater_people" title="人">
-	<panel_container name="main_panel">
-		<panel label="グループプロフィール" name="panel_group_info_sidetray"/>
-		<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		<panel name="panel_group_creation_sidetray" label="グループ作成"/>
-	</panel_container>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_people" title="人物">
+  <panel_container name="main_panel">
+    <panel label="グループのプロフィール" name="panel_group_info_sidetray" />
+    <panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray" />
+  </panel_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_perms_default.xml b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
index 33551a5706..8fa98e8665 100644
--- a/indra/newview/skins/default/xui/ja/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
@@ -1,47 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="デフォルトの作成権限">
-	<panel label="デフォルト権限" name="default permissions">
-		<text name="label_1">
-			次の所有者：
-		</text>
-		<text name="label_2">
-			コピー
-		</text>
-		<text name="label_3">
-			修正
-		</text>
-		<text name="label_4">
-			再販・プレゼント
-		</text>
-		<text name="label_5">
-			グループで共同管理
-		</text>
-		<text name="label_6">
-			誰に対してもコピーを許可
-		</text>
-		<text name="label_7" tool_tip="オブジェクトを作成するときにデフォルトの権限を設定する">
-			オブジェクト
-		</text>
-		<text name="label_8" tool_tip="アップロードしたアイテムにデフォルトの権限を設定する">
-			アップロード
-		</text>
-		<text name="label_9" tool_tip="スクリプトを作成するときにデフォルトの権限を設定する">
-			スクリプト
-		</text>
-		<text name="label_10" tool_tip="ノートカードを作成するときにデフォルトの権限を設定する">
-			ノートカード
-		</text>
-		<text name="label_11" tool_tip="ジェスチャーを作成するときにデフォルトの権限を設定する">
-			ジェスチャー
-		</text>
-		<text name="label_12" tool_tip="衣服またはボディパーツを作成するときにデフォルトの権限を設定する">
-			着用物
-		</text>
-		<text name="label_13" tool_tip="自然環境の設定を作成するときにデフォルトの権限を設定する">
-			設定
-		</text>
-		<check_box name="env_settings_c" value="true"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel"/>
-</floater>
+  <panel label="デフォルト権限" name="default permissions">
+    <text name="label_1">次の所有者：</text>
+    <text name="label_2">コピー</text>
+    <text name="label_3">修正</text>
+    <text name="label_4">再販・譲渡</text>
+    <text name="label_5">グループで共同管理</text>
+    <text name="label_6">誰に対してもコピーを許可</text>
+    <text name="label_7" tool_tip="オブジェクトを作成するときに、デフォルトの権限を設定する。">オブジェクト</text>
+    <text name="label_8" tool_tip="アップロードしたアイテムに、デフォルトの権限を設定する。">アップロード</text>
+    <text name="label_9" tool_tip="スクリプトを作成するときに、デフォルトの権限を設定する。">スクリプト</text>
+    <text name="label_10" tool_tip="ノートカードを作成するときに、デフォルトの権限を設定する。">ノートカード</text>
+    <text name="label_11" tool_tip="ジェスチャーを作成するときに、デフォルトの権限を設定する。">ジェスチャー</text>
+    <text name="label_12" tool_tip="衣服装またはボディパーツを作成するときに、デフォルトの権限を設定する。">装着するもの</text>
+    <text name="label_13" tool_tip="自然環境の設定を作成するときに、デフォルトの権限を設定する。">設定</text>
+    <check_box name="env_settings_c" value="true" />
+  </panel>
+  <button label="ＯＫ" label_selected="ＯＫ" name="ok" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_pick_track.xml b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
index e5773e1ec8..d2a4de4562 100644
--- a/indra/newview/skins/default/xui/ja/floater_pick_track.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="track picker" title="選択：トラック">
-	<layout_stack name="adjuster">
-		<layout_panel name="pnl_desc">
-			<text name="select_description">
-				空のソースを選択：
-			</text>
-		</layout_panel>
-		<layout_panel name="pnl_traks">
-			<radio_group name="track_selection">
-				<radio_item label="空 4 [ALT]" name="radio_sky4" value="4"/>
-				<radio_item label="空 3 [ALT]" name="radio_sky3" value="3"/>
-				<radio_item label="空 2 [ALT]" name="radio_sky2" value="2"/>
-				<radio_item label="地面" name="radio_sky1" value="1"/>
-			</radio_group>
-		</layout_panel>
-		<layout_panel name="pnl_ok_cancel">
-			<button label="OK" label_selected="OK" name="btn_select"/>
-			<button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <layout_stack name="adjuster">
+    <layout_panel name="pnl_desc">
+      <text name="select_description">空のソースを選択：</text>
+    </layout_panel>
+    <layout_panel name="pnl_traks">
+      <radio_group name="track_selection">
+        <radio_item label="空４[ALT]" name="radio_sky4" value="4" />
+        <radio_item label="空３[ALT]" name="radio_sky3" value="3" />
+        <radio_item label="空２[ALT]" name="radio_sky2" value="2" />
+        <radio_item label="地表" name="radio_sky1" value="1" />
+      </radio_group>
+    </layout_panel>
+    <layout_panel name="pnl_ok_cancel">
+      <button label="ＯＫ" label_selected="ＯＫ" name="btn_select" />
+      <button label="キャンセル" label_selected="キャンセル" name="btn_cancel" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml
index 0d167444db..9eefc4b054 100644
--- a/indra/newview/skins/default/xui/ja/floater_places.xml
+++ b/indra/newview/skins/default/xui/ja/floater_places.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_places" title="場所">
-	<panel label="場所" name="main_panel"/>
-</floater>
+  <panel label="場所" name="main_panel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
index 7c4d9c78ee..94ed8ec288 100644
--- a/indra/newview/skins/default/xui/ja/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml
@@ -1,54 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Post-Process Floater" title="ポストプロセス設定">
-	<tab_container name="Post-Process Tabs">
-		<panel label="カラー・フィルター" name="wmiColorFilterPanel">
-			<check_box label="有効" name="wmiColorFilterToggle" />
-			<text name="wmiColorFilterBrightnessText">
-				明るさ
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				彩度
-			</text>
-			<text name="wmiColorFilterContrastText">
-				コントラスト
-			</text>
-			<text name="wmiColorFilterBaseText">
-				コントラストの基本色
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR" />
-			<slider label="G" name="wmiColorFilterBaseG" />
-			<slider label="B" name="wmiColorFilterBaseB" />
-			<slider label="I" name="wmiColorFilterBaseI" />
-		</panel>
-		<panel label="ナイトビジョン" name="wmiNightVisionPanel">
-			<check_box label="有効" name="wmiNightVisionToggle" />
-			<text name="wmiNightVisionBrightMultText">
-				光の増幅（マルチ）
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				ノイズ・サイズ
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				ノイズ強度
-			</text>
-		</panel>
-		<panel label="ブルーム" name="wmiBloomPanel">
-			<check_box label="有効" name="wmiBloomToggle" />
-			<text name="wmiBloomExtractText">
-				明度の抽出
-			</text>
-			<text name="wmiBloomSizeText">
-				ブルーム・サイズ
-			</text>
-			<text name="wmiBloomStrengthText">
-				ブルーム強度
-			</text>
-		</panel>
-		<panel label="その他" name="Extras">
-			<button label="効果読み込み" label_selected="効果読み込み"
-			     name="PPLoadEffect" />
-			<button label="効果保存" label_selected="効果保存" name="PPSaveEffect" />
-			<line_editor label="効果名" name="PPEffectNameEditor" />
-		</panel>
-	</tab_container>
-</floater>
+  <tab_container name="Post-Process Tabs">
+    <panel label="カラー・フィルタ" name="wmiColorFilterPanel">
+      <check_box label="有効" name="wmiColorFilterToggle" />
+      <text name="wmiColorFilterBrightnessText">明度</text>
+      <text name="wmiColorFilterSaturationText">彩度</text>
+      <text name="wmiColorFilterContrastText">輝度</text>
+      <text name="wmiColorFilterBaseText">輝度の基準色</text>
+      <slider label="赤" name="wmiColorFilterBaseR" />
+      <slider label="緑" name="wmiColorFilterBaseG" />
+      <slider label="青" name="wmiColorFilterBaseB" />
+      <slider label="I" name="wmiColorFilterBaseI" />
+    </panel>
+    <panel label="暗視" name="wmiNightVisionPanel">
+      <check_box label="有効" name="wmiNightVisionToggle" />
+      <text name="wmiNightVisionBrightMultText">光の増幅（マルチ）</text>
+      <text name="wmiNightVisionNoiseSizeText">ノイズ・サイズ</text>
+      <text name="wmiNightVisionNoiseStrengthText">ノイズ強度</text>
+    </panel>
+    <panel label="ブルーム" name="wmiBloomPanel">
+      <check_box label="有効" name="wmiBloomToggle" />
+      <text name="wmiBloomExtractText">明度の抽出</text>
+      <text name="wmiBloomSizeText">ブルーム・サイズ</text>
+      <text name="wmiBloomStrengthText">ブルーム強度</text>
+    </panel>
+    <panel label="その他" name="Extras">
+      <button label="効果読み込み" label_selected="効果読み込み" name="PPLoadEffect" />
+      <button label="効果保存" label_selected="効果保存" name="PPSaveEffect" />
+      <line_editor label="効果名" name="PPEffectNameEditor" />
+    </panel>
+  </tab_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 4a316ef606..56601963dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="環境設定">
-	<floater.string name="email_unverified_tooltip">
-		IM を有効にするには、https://accounts.secondlife.com/change_email/ からあなたのメールアドレスを確認してください
-	</floater.string>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<panel name="search_panel">
-		<search_editor label="設定の検索" name="search_prefs_edit" tool_tip="検索したい内容をここに入力してください。設定の名前またはコメントに部分的に一致する結果が表示されます。"/>
-	</panel>
-	<tab_container name="pref core">
-		<panel label="一般" name="general"/>
-		<panel label="グラフィック" name="display"/>
-		<panel label="サウンドとメディア" name="audio"/>
-		<panel label="チャット" name="chat"/>
-		<panel label="移動 &amp; 表示" name="move"/>
-		<panel label="メッセージ" name="msgs"/>
-		<panel label="色" name="colors"/>
-		<panel label="プライバシー" name="im"/>
-		<panel label="セットアップ" name="input"/>
-		<panel label="詳細" name="advanced1"/>
-		<panel label="アップロード" name="uploads"/>
-	</tab_container>
-</floater>
+<floater name="Preferences" title="初期設定">
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+
+  <panel name="search_panel">
+    <search_editor label="設定を検索" name="search_prefs_edit" tool_tip="検索したい内容をここに入力してください。設定の名前またはコメントに部分的に一致する結果が表示されます。" />
+  </panel>
+
+  <tab_container name="pref core">
+    <panel label="一般" name="general" />
+    <panel label="グラフィック" name="display" />
+    <panel label="サウンドとメディア" name="audio" />
+    <panel label="チャット" name="chat" />
+    <panel label="移動と表示" name="move" />
+    <panel label="通知" name="msgs" />
+    <panel label="色" name="colors" />
+    <panel label="プライバシー" name="im" />
+    <panel label="セットアップ" name="input" />
+    <panel label="拡張" name="advanced1" />
+    <panel label="アップロード" name="uploads" />
+    <panel label="操作" name="controls" />
+  </tab_container>
+
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index 8ba537faa2..109428debc 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -1,122 +1,110 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="prefs_graphics_advanced" title="詳細グラフィックス設定">
-	<text name="GeneralText">
-		全般
-	</text>
-	<slider label="描画距離：" name="DrawDistance"/>
-	<text name="DrawDistanceMeterText2">
-		m
-	</text>
-	<slider label="最大パーティクル数：" name="MaxParticleCount"/>
-	<slider label="ポストプロセス品質：" name="RenderPostProcess"/>
-	<text name="PostProcessText">
-		低
-	</text>
-	<text name="AvatarText">
-		アバター
-	</text>
-	<slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します"/>
-	<text name="IndirectMaxComplexityText">
-		0
-	</text>
-	<slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors"/>
-	<text name="IndirectMaxNonImpostorsText">
-		0
-	</text>
-	<slider label="詳細：" name="AvatarMeshDetail"/>
-	<text name="AvatarMeshDetailText">
-		低
-	</text>
-	<slider label="物理演算：" name="AvatarPhysicsDetail"/>
-	<text name="AvatarPhysicsDetailText">
-		低
-	</text>
-	<text name="HardwareText">
-		ハードウェア
-	</text>
-	<slider label="テクスチャメモリ (MB)：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。ビデオカードのメモリに既定。数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
-	<slider label="フォグの距離比率：" name="fog"/>
-	<slider label="ガンマ：" name="gamma"/>
-	<text name="(brightness, lower is brighter)">
-		(0 でデフォルト、低いほど明るい)
-	</text>
-	<check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani"/>
-	<check_box initial_value="true" label="OpenGL Vertex Buffer Objects を有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。"/>
-	<check_box initial_value="true" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。"/>
-	<check_box initial_value="true" label="HiDPI 表示のためにサポートを有効にする（再起動が必要）" name="use HiDPI" tool_tip="高画質の描画のために OpenGL を有効にする"/>
-	<text name="antialiasing label">
-		アンチエイリアシング：
-	</text>
-	<combo_box label="アンチエイリアシング" name="fsaa">
-		<combo_box.item label="無効" name="FSAADisabled"/>
-		<combo_box.item label="2x" name="2x"/>
-		<combo_box.item label="4x" name="4x"/>
-		<combo_box.item label="8x" name="8x"/>
-		<combo_box.item label="16x" name="16x"/>
-	</combo_box>
-	<text name="antialiasing restart">
-		(再起動後に反映)
-	</text>
-	<text name="MeshText">
-		メッシュ
-	</text>
-	<slider label="地形のメッシュの詳細：" name="TerrainMeshDetail"/>
-	<text name="TerrainMeshDetailText">
-		低
-	</text>
-	<slider label="木：" name="TreeMeshDetail"/>
-	<text name="TreeMeshDetailText">
-		低
-	</text>
-	<slider label="オブジェクト：" name="ObjectMeshDetail"/>
-	<text name="ObjectMeshDetailText">
-		低
-	</text>
-	<slider label="フレキシプリム：" name="FlexibleMeshDetail"/>
-	<text name="FlexibleMeshDetailText">
-		低
-	</text>
-	<text name="ShadersText">
-		シェーダー
-	</text>
-	<check_box initial_value="true" label="透明な水" name="TransparentWater"/>
-	<check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/>
-	<check_box initial_value="true" label="近くの光" name="LocalLights"/>
-	<slider label="地形詳細：" name="TerrainDetail"/>
-	<text name="TerrainDetailText">
-		低
-	</text>
-	<check_box initial_value="true" label="アバターハードウェアスキﾆﾝｸﾞ" name="AvatarVertexProgram"/>
-	<check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
-	<text name="ReflectionsText">
-		水の反射：
-	</text>
-	<combo_box name="Reflections">
-		<combo_box.item label="最小" name="0"/>
-		<combo_box.item label="地形と樹木" name="1"/>
-		<combo_box.item label="すべての静止オブジェクト" name="2"/>
-		<combo_box.item label="すべてのアバターとオブジェクト" name="3"/>
-		<combo_box.item label="すべて" name="4"/>
-	</combo_box>
-	<check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
-	<slider label="空：" name="SkyMeshDetail"/>
-	<text name="SkyMeshDetailText">
-		低
-	</text>
-	<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
-	<check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
-	<check_box initial_value="true" label="フィールドの遠近感" name="UseDoF"/>
-	<text name="RenderShadowDetailText">
-		影：
-	</text>
-	<combo_box name="ShadowDetail">
-		<combo_box.item label="なし" name="0"/>
-		<combo_box.item label="太陽/月" name="1"/>
-		<combo_box.item label="太陽/月・プロジェクタ" name="2"/>
-	</combo_box>
-	<button label="推奨設定にリセット" name="Defaults"/>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxComplexity"/>
-	<check_box label="RenderAvatarMaxNonImpostors" name="RenderAvatarMaxNonImpostors"/>
-</floater>
+<floater name="prefs_graphics_advanced" title="拡張グラフィック設定">
+  <!-- This block shows Advanced Settings -->
+  <text name="GeneralText">全般</text>
+
+  <slider label="描画距離：" name="DrawDistance" />
+  <text name="DrawDistanceMeterText2">ｍ</text>
+  <slider label="最大パーティクル数：" name="MaxParticleCount" />
+
+  <slider label="ポストプロセス品質：" name="RenderPostProcess" />
+  <text name="PostProcessText">低</text>
+
+  <check_box label="垂直同期を有効化" name="vsync" tool_tip="フレーム レートをモニターのリフレッシュレートに同期させ、スムーズなパフォーマンスを実現します。" />
+
+  <text name="AvatarText">アバター</text>
+
+  <slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します" />
+  <text name="IndirectMaxComplexityText">0</text>
+
+  <slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors" />
+  <text name="IndirectMaxNonImpostorsText">0</text>
+
+  <slider label="詳細：" name="AvatarMeshDetail" />
+  <text name="AvatarMeshDetailText">低</text>
+
+  <slider label="物理演算：" name="AvatarPhysicsDetail" />
+  <text name="AvatarPhysicsDetailText">低</text>
+
+  <text name="HardwareText">ハードウェア</text>
+
+  <slider label="テクスチャメモリ（㎆）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。ビデオカードのメモリに既定。数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。" />
+
+  <slider label="フォグの距離比率：" name="fog" />
+
+  <slider label="ガンマ：" name="gamma" />
+  <text name="(brightness, lower is brighter)">（0がデフォルト、低いほど明るい）</text>
+
+  <check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani" />
+
+  <check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。" />
+
+  <check_box label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。" />
+
+  <check_box label="HiDPI 表示のためにサポートを有効にする（再起動が必要）" name="use HiDPI" tool_tip="高画質の描画のために OpenGL を有効にする" />
+
+  <text name="antialiasing label">アンチエイリアシング：</text>
+  <combo_box label="アンチエイリアシング" name="fsaa">
+    <combo_box.item label="無効" name="FSAADisabled" value="0" />
+    <combo_box.item label="2x" name="2x" value="2" />
+    <combo_box.item label="4x" name="4x" value="4" />
+    <combo_box.item label="8x" name="8x" value="8" />
+    <combo_box.item label="16x" name="16x" value="16" />
+  </combo_box>
+  <text name="antialiasing restart">（起動後に反映）</text>
+  <view_border name="vert_border" />
+  <text name="MeshText">メッシュ</text>
+
+  <slider label="地形のメッシュの詳細：" name="TerrainMeshDetail" />
+  <text name="TerrainMeshDetailText">低</text>
+
+  <slider label="木：" name="TreeMeshDetail" />
+  <text name="TreeMeshDetailText">低</text>
+
+  <slider label="オブジェクト：" name="ObjectMeshDetail" />
+  <text name="ObjectMeshDetailText">低</text>
+
+  <slider label="フレキシプリム：" name="FlexibleMeshDetail" />
+  <text name="FlexibleMeshDetailText">低</text>
+  <text name="ShadersText">シェーダー</text>
+
+  <check_box label="透明な水" name="TransparentWater" />
+  <check_box label="バンプマッピングと光沢" name="BumpShiny" />
+  <check_box label="近くの光" name="LocalLights" />
+
+  <slider label="地形詳細：" name="TerrainDetail" />
+  <text name="TerrainDetailText">低</text>
+  <check_box label="アバターのハードウェアスキニング" name="AvatarVertexProgram" />
+  <check_box label="アバターの布" name="AvatarCloth" />
+
+  <text name="ReflectionsText">水の反射：</text>
+  <combo_box name="Reflections">
+    <combo_box.item label="無し：不透明" name="0" value="-2"/>
+    <combo_box.item label="無し・透過" name="0" value="-1"/>
+    <combo_box.item label="最小" name="0" value="0"/>
+    <combo_box.item label="地形と樹木" name="1" value="1"/>
+    <combo_box.item label="すべての静的オブジェクト" name="2" value="2"/>
+    <combo_box.item label="すべてのアバターとオブジェクト" name="3" value="3"/>
+    <combo_box.item label="すべて" name="4" value="4"/>
+  </combo_box>
+
+  <check_box label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders" />
+  <slider label="空：" name="SkyMeshDetail" />
+
+  <text name="SkyMeshDetailText">低</text>
+  <check_box label="高度な光源モデル" name="UseLightShaders" />
+  <check_box label="アンビエントオクルージョン" name="UseSSAO" />
+  <check_box label="被写体深度（DoF）" name="UseDoF" />
+  <text name="RenderShadowDetailText">影：</text>
+
+  <combo_box name="ShadowDetail">
+    <combo_box.item label="なし" name="0" />
+    <combo_box.item label="太陽／月" name="1" />
+    <combo_box.item label="太陽／月＋プロジェクタ" name="2" />
+  </combo_box>
+  <button label="推奨設定にリセット" name="Defaults" />
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxComplexity" />
+  <check_box label="RenderAvatarMaxNonImpostors" name="RenderAvatarMaxNonImpostors" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
index 4638fd002e..7afda68409 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
@@ -1,40 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Proxy Settings Floater" title="プロキシ設定">
-	<check_box initial_value="false" label="ウェブページに HTTP プロキシを使う" name="web_proxy_enabled"/>
-	<text name="http_proxy_label">
-		HTTP プロキシ：
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="使用する HTTP プロキシの DNS 名または IP アドレス。"/>
-	<spinner label="ポート番号：" name="web_proxy_port" tool_tip="使用する HTTP プロキシポート。"/>
-	<check_box label="UDP トラフィックに SOCKS 5 プロキシを使う" name="socks_proxy_enabled"/>
-	<text name="socks5_proxy_label">
-		SOCKS 5 プロキシ：
-	</text>
-	<line_editor name="socks_proxy_editor" tool_tip="使用する SOCKS 5 プロキシの DNS 名または IP アドレス。"/>
-	<spinner label="ポート番号：" name="socks_proxy_port" tool_tip="使用する SOCKS 5 プロキシポート。"/>
-	<text name="socks_auth_label">
-		SOCKS 認証：
-	</text>
-	<radio_group name="socks5_auth_type">
-		<radio_item label="認証なし" name="Socks5NoAuth" tool_tip="Socks 5 プロキシは認証の必要がありません。" value="なし"/>
-		<radio_item label="ユーザー名/パスワード" name="Socks5UserPass" tool_tip="Socks5 プロキシはユーザー名/パスワードの認証が必要です。" value="UserPass"/>
-	</radio_group>
-	<text name="socks5_username_label">
-		ユーザー名：
-	</text>
-	<text name="socks5_password_label">
-		パスワード：
-	</text>
-	<line_editor name="socks5_username" tool_tip="SOCKS 5 サーバーの認証に使用されたユーザー名"/>
-	<line_editor name="socks5_password" tool_tip="SOCKS 5 サーバーの認証に使用されたパスワード"/>
-	<text name="other_proxy_label">
-		他の HTTP トラフィックプロキシ：
-	</text>
-	<radio_group name="other_http_proxy_type">
-		<radio_item label="プロキシしない" name="OtherNoProxy" tool_tip="ウェブ以外の HTTP トラフィックはいずれのプロキシにもルーティングされません。" value="なし"/>
-		<radio_item label="HTTP プロキシを使う" name="OtherHTTPProxy" tool_tip="ウェブ以外の HTTP は設定済みウェブプロキシを通してルーティングされます。" value="Web"/>
-		<radio_item label="SOCKS 5 プロキシを使う" name="OtherSocksProxy" tool_tip="ウェブ以外の HTTP トラフィックは設定済みの Socks 5 プロキシを通してルーティングされます。" value="Socks"/>
-	</radio_group>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-</floater>
+  <check_box initial_value="false" label="ウェブページに HTTP プロキシを使う" name="web_proxy_enabled" />
+  <text name="http_proxy_label">HTTP プロキシ：</text>
+  <line_editor name="web_proxy_editor" tool_tip="使用する HTTP プロキシの DNS 名または IP アドレス。" />
+  <spinner label="ポート番号：" name="web_proxy_port" tool_tip="使用する HTTP プロキシポート。" />
+  <check_box label="UDP トラフィックに SOCKS 5 プロキシを使う" name="socks_proxy_enabled" />
+  <text name="socks5_proxy_label">SOCKS 5 プロキシ：</text>
+  <line_editor name="socks_proxy_editor" tool_tip="使用する SOCKS 5 プロキシの DNS 名または IP アドレス。" />
+  <spinner label="ポート番号：" name="socks_proxy_port" tool_tip="使用する SOCKS 5 プロキシポート。" />
+  <text name="socks_auth_label">SOCKS 認証：</text>
+  <radio_group name="socks5_auth_type">
+    <radio_item label="認証なし" name="Socks5NoAuth" tool_tip="Socks 5 プロキシは認証の必要がありません。" value="なし" />
+    <radio_item label="ユーザー名/パスワード" name="Socks5UserPass" tool_tip="Socks5 プロキシはユーザー名/パスワードの認証が必要です。" value="UserPass" />
+  </radio_group>
+  <text name="socks5_username_label">ユーザー名：</text>
+  <text name="socks5_password_label">パスワード：</text>
+  <line_editor name="socks5_username" tool_tip="SOCKS 5 サーバーの認証に使用されたユーザー名" />
+  <line_editor name="socks5_password" tool_tip="SOCKS 5 サーバーの認証に使用されたパスワード" />
+  <text name="other_proxy_label">他の HTTP トラフィックプロキシ：</text>
+  <radio_group name="other_http_proxy_type">
+    <radio_item label="プロキシを使用しない" name="OtherNoProxy" tool_tip="ウェブ以外の HTTP トラフィックはいずれのプロキシにもルーティングされません。" value="なし" />
+    <radio_item label="HTTP プロキシを使う" name="OtherHTTPProxy" tool_tip="ウェブ以外の HTTP は設定済みウェブプロキシを通してルーティングされます。" value="Web" />
+    <radio_item label="SOCKS 5 プロキシを使う" name="OtherSocksProxy" tool_tip="ウェブ以外の HTTP トラフィックは設定済みの Socks 5 プロキシを通してルーティングされます。" value="Socks" />
+  </radio_group>
+  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
index 09eaf7b294..68bd58f3db 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
@@ -1,2 +1,14 @@
-<?xml version="1.0" ?>
-<floater name="floaterpreferencesviewadvanced" title="カメラ位置"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterpreferencesviewadvanced" title="カメラの位置">
+  <text name="camera_offset_lbl">カメラのオフセット：</text>
+  <spinner name="camera_x" />
+  <spinner label="Ｙ" name="camera_y" />
+  <spinner label="Ｚ" name="camera_z" />
+  <text name="focus_offset_lbl">焦点のオフセット：</text>
+  <spinner name="focus_x" />
+  <spinner label="Ｙ" name="focus_y" />
+  <spinner label="Ｚ" name="focus_z" />
+  <text name="offset_scale_lbl">カメラのオフセット倍率：</text>
+  <slider name="offset_scale_sld" />
+  <spinner name="offset_scale_ctrl" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index a3042f66ea..c7295e3532 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim">
-	<floater.string name="Title">
-		アニメーション： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人に見えるように再生"/>
-	<button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生"/>
-</floater>
+  <floater.string name="Title">アニメーション：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+  <button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人から見えるように再生します。" />
+  <button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生します。" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 59ce36b022..fb6a65f812 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -1,73 +1,41 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
-	<floater.string name="step_anim">
-		プレイするアニメーション：
-	</floater.string>
-	<floater.string name="step_sound">
-		プレイするサウンド：
-	</floater.string>
-	<floater.string name="step_chat">
-		発言するチャット：
-	</floater.string>
-	<floater.string name="step_wait">
-		待機：
-	</floater.string>
-	<floater.string name="stop_txt">
-		止まる
-	</floater.string>
-	<floater.string name="preview_txt">
-		プレビュー
-	</floater.string>
-	<floater.string name="none_text">
-		-- なし --
-	</floater.string>
-	<floater.string name="Title">
-		ジェスチャー： [NAME]
-	</floater.string>
-	<text name="desc_label">
-		説明：
-	</text>
-	<text name="trigger_label">
-		トリガー:
-	</text>
-	<text name="replace_text" tool_tip="トリガーワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。">
-		置換：
-	</text>
-	<line_editor name="replace_editor" tool_tip="トリガーワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"/>
-	<text name="key_label">
-		ショートカット：
-	</text>
-	<combo_box label="なし" left="160" name="modifier_combo"/>
-	<combo_box label="なし" name="key_combo"/>
-	<text name="library_label">
-		ライブラリ：
-	</text>
-	<scroll_list name="library_list">
-		<scroll_list.rows name="action_animation" value="アニメーション"/>
-		<scroll_list.rows name="action_sound" value="サウンド"/>
-		<scroll_list.rows name="action_chat" value="チャット"/>
-		<scroll_list.rows name="action_wait" value="待機"/>
-	</scroll_list>
-	<button label="追加＞＞" name="add_btn"/>
-	<text name="steps_label">
-		手順：
-	</text>
-	<button label="上" name="up_btn"/>
-	<button label="下" name="down_btn"/>
-	<button label="削除" name="delete_btn"/>
-	<text name="options_text">
-		（オプション）
-	</text>
-	<radio_group name="animation_trigger_type">
-		<radio_item label="開始" name="start"/>
-		<radio_item label="停止" name="stop"/>
-	</radio_group>
-	<check_box label="アニメーションが完了するまで" name="wait_anim_check"/>
-	<check_box label="時間（秒）：" name="wait_time_check"/>
-	<text name="help_label">
-		待機ステップを入れない限りは、すべてのステップが同時に起こります。
-	</text>
-	<check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーフレーズを使うか、ホットキーを押すと切り替わります。  1つのショートカットキーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。"/>
-	<button label="プレビュー" name="preview_btn"/>
-	<button label="保存" name="save_btn"/>
-</floater>
+  <floater.string name="step_anim">再生するアニメーション：</floater.string>
+  <floater.string name="step_sound">再生するサウンド：</floater.string>
+  <floater.string name="step_chat">発言するチャット：</floater.string>
+  <floater.string name="step_wait">待機：</floater.string>
+  <floater.string name="stop_txt">停止</floater.string>
+  <floater.string name="preview_txt">プレビュー</floater.string>
+  <floater.string name="none_text">－なし－</floater.string>
+  <floater.string name="Title">ジェスチャー：[NAME]</floater.string>
+  <text name="desc_label">説明：</text>
+  <text name="trigger_label">トリガー：</text>
+  <text name="replace_text" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。">置換：</text>
+  <line_editor name="replace_editor" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。" />
+  <text name="key_label">ショートカット：</text>
+  <combo_box label="なし" name="modifier_combo" />
+  <combo_box label="なし" name="key_combo" />
+  <text name="library_label">ライブラリ：</text>
+  <scroll_list name="library_list">
+    <scroll_list.rows name="action_animation" value="アニメーション" />
+    <scroll_list.rows name="action_sound" value="サウンド" />
+    <scroll_list.rows name="action_chat" value="チャット" />
+    <scroll_list.rows name="action_wait" value="待機" />
+  </scroll_list>
+  <button label="追加＞＞" name="add_btn" />
+  <text name="steps_label">手順：</text>
+  <button label="上" name="up_btn" />
+  <button label="下" name="down_btn" />
+  <button label="削除" name="delete_btn" />
+  <text name="options_text">（オプション）</text>
+  <radio_group name="animation_trigger_type">
+    <radio_item label="開始" name="start" />
+    <radio_item label="停止" name="stop" />
+  </radio_group>
+  <check_box label="アニメーションが完了するまで" name="wait_anim_check" />
+  <check_box label="時間（秒）：" name="wait_time_check" />
+  <text name="help_label">待機ステップを入れない限りは、すべてのステップが同時に起こります。</text>
+  <check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーフレーズを使うか、ホットキーを押すと切り替わります。 1つのショートカットキーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。" />
+  <button label="プレビュー" name="preview_btn" />
+  <button label="保存" name="save_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
index ef7e90a6bc..eb97279249 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="ノートカード：">
-	<floater.string name="no_object">
-		このノートカードが含まれたオブジェクトが見つかりません。
-	</floater.string>
-	<floater.string name="not_allowed">
-		このノートを見る権限がありません。
-	</floater.string>
-	<floater.string name="Title">
-		ノートカード： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<text_editor name="Notecard Editor">
-		ローディング．．．
-	</text_editor>
-	<button label="編集..." label_selected="編集" name="Edit"/>
-	<button label="保存" label_selected="保存" name="Save"/>
-	<button label="削除" label_selected="削除" name="Delete"/>
-</floater>
+  <floater.string name="no_object">このノートカードが含まれたオブジェクトが見つかりません。</floater.string>
+  <floater.string name="not_allowed">このノートを見る権限がありません。</floater.string>
+  <floater.string name="Title">ノートカード：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+  <text_editor name="Notecard Editor">読み込んでいます…</text_editor>
+  <button label="編集…" label_selected="編集" name="Edit" />
+  <button label="保存" label_selected="保存" name="Save" />
+  <button label="削除" label_selected="削除" name="Delete" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index 5c0f05cec6..9eef0cc5e3 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_sound">
-	<floater.string name="Title">
-		サウンド： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<button label="インワールドで再生" label_selected="インワールドで再生" name="Sound play btn" tool_tip="他人にも聞こえるように再生します"/>
-	<button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分だけが聞こえるように再生します"/>
-</floater>
+  <floater.string name="Title">サウンド：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+  <button label="インワールドで再生" label_selected="インワールドで再生" name="Sound play btn" tool_tip="他人からも聞こえるように再生します。" />
+  <button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分のみ聞こえるように再生します。" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index 66ef13948a..c9713e3d43 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
@@ -1,28 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_texture">
-	<floater.string name="Title">
-		テクスチャ： [NAME]
-	</floater.string>
-	<floater.string name="Copy">
-		インベントリにコピー
-	</floater.string>
-	<layout_stack name="preview_stack">
-		<layout_panel name="texture_panel">
-			<text name="desc txt">
-				説明：
-			</text>
-			<text name="dimensions">
-				[WIDTH]px x [HEIGHT]px
-			</text>
-			<text name="aspect_ratio">
-				縦横比のプレビュー
-			</text>
-			<combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー"/>
-		</layout_panel>
-		<layout_panel name="buttons_panel">
-			<button label="OK" name="Keep"/>
-			<button label="処分する" name="Discard"/>
-			<button label="別名で保存" name="save_tex_btn"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="Title">テクスチャ：[NAME]</floater.string>
+  <floater.string name="Copy">インベントリにコピー</floater.string>
+  <layout_stack name="preview_stack">
+    <layout_panel name="texture_panel">
+      <text name="desc txt">説明：</text>
+      <text name="dimensions">[WIDTH]px✕[HEIGHT]px</text>
+      <text name="aspect_ratio">縦横比のプレビュー</text>
+      <combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー" />
+    </layout_panel>
+    <layout_panel name="buttons_panel">
+      <button label="ＯＫ" name="Keep" />
+      <button label="破棄" name="Discard" />
+      <button label="名前をつけて保存" name="save_tex_btn" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
index 54cf632727..728256b324 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
@@ -1,7 +1,12 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_preview_trash" title="ゴミ箱">
-	<layout_panel name="empty_btn_lp"/>
-	<layout_stack name="button_panel_ls">
-		<button name="empty_btn" label="ゴミ箱を空にする"/>
-	</layout_stack>
+  <inventory_panel name="inventory_trash" />
+  <layout_stack name="button_panel_ls">
+    <layout_panel name="empty_btn_lp">
+      <button label="ゴミ箱を空に" name="empty_btn"/>
+    </layout_panel>
+    <layout_panel name="share_btn_lp">
+      <button label="キャンセル" name="cancel_btn" />
+    </layout_panel>
+  </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
index 10a46247a7..57f7946ecb 100644
--- a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="price_for_listing" title="クラシファイド広告の掲載">
-	<text name="explanation_text">
-		あなたのクラシファイド広告は、公開された日から1週間有効です。
-
+  <text name="explanation_text">あなたのクラシファイド広告は、公開された日から１週間有効です。
 クラシファイドリストのあなたの広告の位置は、広告費をいくら支払うかで決まります。
 
-最高金額を支払った広告がリストのトップに載り、検索で上位に表示されます。
-	</text>
-	<text name="price_text">
-		広告費：
-	</text>
-	<text name="price_symbol">
-		L$
-	</text>
-	<button label="OK" name="set_price_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+最高金額を支払った広告がリストのトップに載り、検索で上位に表示されます。</text>
+  <text name="price_text">広告掲載費：</text>
+  <text name="price_symbol">L$ </text>
+  <button label="ＯＫ" name="set_price_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_profile.xml b/indra/newview/skins/default/xui/ja/floater_profile.xml
index 4192dc38f1..303a95baac 100644
--- a/indra/newview/skins/default/xui/ja/floater_profile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_profile.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarinfo" title="プロフィール">
-	<panel name="panel_profile_view">
-		<tab_container name="panel_profile_tabs">
-			<panel label="Second Life" name="panel_profile_secondlife"/>
-			<panel label="フィード" name="panel_profile_web"/>
-			<panel label="趣味" name="panel_profile_interests"/>
-			<panel label="ピック" name="panel_profile_picks"/>
-			<panel label="クラシファイド広告" name="panel_profile_classifieds"/>
-			<panel label="リアルライフ（現実世界）" name="panel_profile_firstlife"/>
-			<panel label="メモ" name="panel_profile_notes"/>
-		</tab_container>
-		<button label="OK" name="ok_btn" tool_tip="プロフィールの変更を保存して閉じる"/>
-		<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
-	</panel>
+  <panel name="panel_profile_view">
+    <tab_container name="panel_profile_tabs">
+      <panel label="Second Life" name="panel_profile_secondlife" />
+      <panel label="Web" name="panel_profile_web" />
+      <panel label="趣味" name="panel_profile_interests" />
+      <panel label="ピック" name="panel_profile_picks" />
+      <panel label="クラシファイド広告" name="panel_profile_classifieds" />
+      <panel label="リアルライフ（現実世界）" name="panel_profile_firstlife" />
+      <panel label="メモ" name="panel_profile_notes" />
+    </tab_container>
+    <button label="ＯＫ" name="ok_btn" tool_tip="プロフィールの変更を保存して閉じる" />
+    <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml b/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
new file mode 100644
index 0000000000..18e19cf11c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="profile_permissions">
+  <string name="description_string" value="エージェントの[AGENT_NAME]に許可：" />
+  <text name="perm_description" value="許可するエージェント：" />
+  <check_box name="online_check" label="自分のオンライン状況" />
+  <check_box name="map_check" label="ワールドマップ上の自分の位置" />
+  <check_box name="objects_check" label="自分の土地からの自分のオブジェクトの編集、削除、または取得" />
+  <button name="perms_btn_ok" label="ＯＫ" />
+  <button name="perms_btn_cancel" label="キャンセル" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_texture.xml b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml
new file mode 100644
index 0000000000..a2075d93ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="profile_texture">
+  <layout_stack name="preview_stack">
+    <layout_panel name="texture_panel">
+      <icon name="profile_pic" />
+    </layout_panel>
+    <layout_panel name="buttons_panel">
+      <layout_stack name="buttons_stack">
+        <layout_panel name="resizer_left" />
+        <layout_panel name="close_panel">
+          <button label="閉じる" name="close_btn" />
+        </layout_panel>
+        <layout_panel name="resizer_right" />
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
index f33406da51..a719124db5 100644
--- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="publish_classified" title="クラシファイド広告掲載">
-	<text name="explanation_text">
-		あなたのクラシファイド広告は、掲載された日から1週間有効です。
-        
-クラシファイド広告は返金できませんのでご了承ください。
-	</text>
-	<spinner label="価格：L$" name="price_for_listing" tool_tip="掲載価格" value="50"/>
-	<text name="l$_text" value="L$"/>
-	<text name="more_info_text">
-		詳しい情報（クラシファイドヘルプへのリンク）
-	</text>
-	<button label="掲載" name="publish_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+  <text name="explanation_text">あなたのクラシファイド広告は、掲載された日から１週間有効です。
+
+クラシファイド広告は返金できませんのでご了承ください。</text>
+  <spinner label="掲載費：L$" name="price_for_listing" tool_tip="掲載価格" value="50" />
+  <text name="l$_text" value="L$" />
+  <text name="more_info_text">詳しい情報（クラシファイドヘルプへのリンク）</text>
+  <button label="掲載する" name="publish_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
index 4edb4972e4..ba673208bb 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="region_debug_console" title="地域デバッグ"/>
+<floater name="region_debug_console" title="リージョン（地域）のデバッグ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
index d08c51c61e..85ae83ae66 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="地域 / 不動産"/>
+<floater name="regioninfo" title="リージョン（地域）／不動産" />
diff --git a/indra/newview/skins/default/xui/ja/floater_region_restarting.xml b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
index e9ba9d230d..810f32ea24 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="region_restarting" title="リージョンの再起動">
-	<string name="RegionName">
-		今 ([NAME]) がいるリージョンを再起動しようとしています。
+  <string name="RegionName">現在あなたがいるリージョン「[NAME]」は、再起動しようとしています。
 
-このままここにいるとログアウトされます。
-	</string>
-	<string name="RestartSeconds">
-		再起動までの秒数
-[SECONDS]
-	</string>
-	<panel name="layout_panel_1">
-		<text name="region_name">
-			今 (-最長リージョン名-) がいるリージョンを再起動しようとしています。
+このまま、この場所にいるとログアウトされます。</string>
+  <string name="RestartSeconds">再起動まであと
+[SECONDS]秒</string>
+  <panel name="layout_panel_1">
+    <text name="region_name">現在あなたがいるリージョン「-最長リージョン名-」は、再起動しようとしています。
 
-このままここにいるとログアウトされます。
-		</text>
-		<text name="restart_seconds">
-			再起動までの秒数
-     32767
-		</text>
-	</panel>
-</floater>
+このまま、この場所にいるとログアウトされます。</text>
+    <text name="restart_seconds">再起動まであと
+32767秒</text>
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 4ddd0d2605..f232dee5ab 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -1,103 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="嫌がらせの報告">
-	<floater.string name="Screenshot">
-		スクリーンショット
-	</floater.string>
-	<check_box label="このスクリーンショットを使用" name="screen_check"/>
-	<text name="reporter_title">
-		報告者：
-	</text>
-	<text name="reporter_field">
-		Loremipsum Dolorsitamut Longnamez
-	</text>
-	<text name="sim_title">
-		地域：
-	</text>
-	<text name="sim_field">
-		地域名
-	</text>
-	<text name="pos_title">
-		位置：
-	</text>
-	<text name="pos_field">
-		{128.1, 128.1, 15.4}
-	</text>
-	<text name="select_object_label">
-		ボタンをクリックしてから、悪意のあるオブジェクトをクリック：
-	</text>
-	<button label="" label_selected="" name="pick_btn" tool_tip="オブジェクトピッカー - 報告対象のオブジェクトを選択してください"/>
-	<text name="object_name_label">
-		オブジェクト：
-	</text>
-	<text name="object_name">
-		Consetetur Sadipscing
-	</text>
-	<text name="owner_name_label">
-		所有者：
-	</text>
-	<text name="owner_name">
-		Hendrerit Vulputate Kamawashi Longname
-	</text>
-	<combo_box name="category_combo" tool_tip="カテゴリ -- この報告に最も適したカテゴリを選択してください">
-		<combo_box.item label="カテゴリを選択してください" name="Select_category"/>
-		<combo_box.item label="年齢＞年齢偽証" name="Age__Age_play"/>
-		<combo_box.item label="年齢 &gt; 成人の住人が Teen Second Life にいる" name="Age__Adult_resident_on_Teen_Second_Life"/>
-		<combo_box.item label="年齢 &gt; 未成年の住人がTeen Second Life の外にいる" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
-		<combo_box.item label="攻撃＞コンバット・サンドボックス/危険なエリア" name="Assault__Combat_sandbox___unsafe_area"/>
-		<combo_box.item label="攻撃 &gt; 安全エリアで他の住人を銃撃、プッシュ、または突き飛ばす" name="Assault__Safe_area"/>
-		<combo_box.item label="攻撃＞武器テスト用サンドボックス" name="Assault__Weapons_testing_sandbox"/>
-		<combo_box.item label="商取引＞製品またはサービスの提供が行われない" name="Commerce__Failure_to_deliver_product_or_service"/>
-		<combo_box.item label="開示＞リアルワールドの情報" name="Disclosure__Real_world_information"/>
-		<combo_box.item label="開示＞離れたところからチャットをモニターしている" name="Disclosure__Remotely_monitoring chat"/>
-		<combo_box.item label="開示＞Second Life の情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs"/>
-		<combo_box.item label="平穏を乱す行為＞地域リソースの使用が不公平" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
-		<combo_box.item label="平穏を乱す行為＞スクリプト・オブジェクトの乱用" name="Disturbing_the_peace__Excessive_scripted_objects"/>
-		<combo_box.item label="平穏を乱す行為＞オブジェクトの捨て置き" name="Disturbing_the_peace__Object_littering"/>
-		<combo_box.item label="平穏を乱す行為＞繰り返しスパム" name="Disturbing_the_peace__Repetitive_spam"/>
-		<combo_box.item label="平穏を乱す行為＞不要な広告スパム" name="Disturbing_the_peace__Unwanted_advert_spam"/>
-		<combo_box.item label="詐欺＞ L$" name="Fraud__L$"/>
-		<combo_box.item label="詐欺＞土地" name="Fraud__Land"/>
-		<combo_box.item label="詐欺＞マルチ商法またはチェーンメール" name="Fraud__Pyramid_scheme_or_chain_letter"/>
-		<combo_box.item label="詐欺 &gt; リンデンドルまたは米ドル" name="Fraud__US$"/>
-		<combo_box.item label="嫌がらせ＞広告委託/視覚的なスパム" name="Harassment__Advert_farms___visual_spam"/>
-		<combo_box.item label="嫌がらせ＞個人またはグループの中傷" name="Harassment__Defaming_individuals_or_groups"/>
-		<combo_box.item label="嫌がらせ＞移動の妨害" name="Harassment__Impeding_movement"/>
-		<combo_box.item label="嫌がらせ＞性的な嫌がらせ" name="Harassment__Sexual_harassment"/>
-		<combo_box.item label="ハラスメント &gt; 対象者を定めて嫌がらせを目的とした行為" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
-		<combo_box.item label="嫌がらせ＞暴言" name="Harassment__Verbal_abuse"/>
-		<combo_box.item label="わいせつ＞著しく不快であると見なされるコンテンツまたは行為" name="Indecency__Broadly_offensive_content_or_conduct"/>
-		<combo_box.item label="わいせつ＞不適切なアバター名" name="Indecency__Inappropriate_avatar_name"/>
-		<combo_box.item label="わいせつ &gt; 地域（リージョン）のレーティング区分に対して不適切なコンテンツまたは行為" name="Indecency__Mature_content_in_PG_region"/>
-		<combo_box.item label="わいせつ &gt; 「Moderate」指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region"/>
-		<combo_box.item label="知的財産の侵害＞コンテンツの撤去" name="Intellectual_property_infringement_Content_Removal"/>
-		<combo_box.item label="知的財産の侵害＞コピーBot及び権限の悪用" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
-		<combo_box.item label="不寛容" name="Intolerance"/>
-		<combo_box.item label="土地＞サンドボックスのリソースの乱用" name="Land__Abuse_of_sandbox_resources"/>
-		<combo_box.item label="土地 &gt; 不法侵入 &gt; オブジェクトまたはテクスチャ" name="Land__Encroachment__Objects_textures"/>
-		<combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles"/>
-		<combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="スキルゲーミング ポリシー違反" name="Wagering_gambling"/>
-		<combo_box.item label="その他" name="Other"/>
-	</combo_box>
-	<text name="abuser_name_title">
-		迷惑ユーザーの名前：
-	</text>
-	<button label="選択" label_selected="" name="select_abuser" tool_tip="嫌がらせをした人の名前をリストから選択してください。"/>
-	<text name="abuser_name_title2">
-		嫌がらせの起きた場所：
-	</text>
-	<text name="sum_title">
-		概要：
-	</text>
-	<text name="dscr_title">
-		詳細：
-	</text>
-	<text name="bug_aviso">
-		できるだけ具体的に詳しく記入してください。
-	</text>
-	<text name="incomplete_title">
-		* 不完全な報告は調査対象になりません。
-	</text>
-	<button label="嫌がらせの報告" label_selected="嫌がらせの報告" name="send_btn"/>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-</floater>
+  <floater.string name="Screenshot">スクリーンショット</floater.string>
+  <check_box label="このスクリーンショットを使用" name="screen_check" />
+  <text name="reporter_title">報告者：</text>
+  <text name="reporter_field">Loremipsum Dolorsitamut Longnamez</text>
+  <text name="sim_title">リージョン（地域）：</text>
+  <text name="sim_field">リージョン（地域）名</text>
+  <text name="pos_title">位置：</text>
+  <text name="pos_field">{128.1, 128.1, 15.4}</text>
+  <text name="select_object_label">ボタンをクリックしてから、悪意のあるオブジェクトをクリック：</text>
+  <button label="" label_selected="" name="pick_btn" tool_tip="オブジェクトピッカー - 報告対象のオブジェクトを選択してください" />
+  <text name="object_name_label">オブジェクト：</text>
+  <text name="object_name">Consetetur Sadipscing</text>
+  <text name="owner_name_label">所有者：</text>
+  <text name="owner_name">Hendrerit Vulputate Kamawashi Longname</text>
+  <combo_box name="category_combo" tool_tip="カテゴリ－この報告に最も適したカテゴリを選択してください">
+    <combo_box.item label="カテゴリを選択してください" name="Select_category" />
+    <combo_box.item label="年齢＞年齢偽証" name="Age__Age_play" />
+    <combo_box.item label="年齢＞成人の住人が Teen Second Life にいる" name="Age__Adult_resident_on_Teen_Second_Life" />
+    <combo_box.item label="年齢＞未成年の住人がTeen Second Life の外にいる" name="Age__Underage_resident_outside_of_Teen_Second_Life" />
+    <combo_box.item label="攻撃＞コンバット・サンドボックス/危険なエリア" name="Assault__Combat_sandbox___unsafe_area" />
+    <combo_box.item label="攻撃＞安全エリアで他の住人を銃撃、プッシュ、または突き飛ばす" name="Assault__Safe_area" />
+    <combo_box.item label="攻撃＞武器テスト用サンドボックス" name="Assault__Weapons_testing_sandbox" />
+    <combo_box.item label="商取引＞製品またはサービスの提供が行われない" name="Commerce__Failure_to_deliver_product_or_service" />
+    <combo_box.item label="開示＞リアルワールドの情報" name="Disclosure__Real_world_information" />
+    <combo_box.item label="開示＞離れたところからチャットをモニターしている" name="Disclosure__Remotely_monitoring chat" />
+    <combo_box.item label="開示＞Second Life の情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs" />
+    <combo_box.item label="平穏を乱す行為＞地域リソースの使用が不公平" name="Disturbing_the_peace__Unfair_use_of_region_resources" />
+    <combo_box.item label="平穏を乱す行為＞スクリプト・オブジェクトの乱用" name="Disturbing_the_peace__Excessive_scripted_objects" />
+    <combo_box.item label="平穏を乱す行為＞オブジェクトの捨て置き" name="Disturbing_the_peace__Object_littering" />
+    <combo_box.item label="平穏を乱す行為＞繰り返しスパム" name="Disturbing_the_peace__Repetitive_spam" />
+    <combo_box.item label="平穏を乱す行為＞不要な広告スパム" name="Disturbing_the_peace__Unwanted_advert_spam" />
+    <combo_box.item label="詐欺＞ L$" name="Fraud__L$" />
+    <combo_box.item label="詐欺＞土地" name="Fraud__Land" />
+    <combo_box.item label="詐欺＞マルチ商法またはチェーンメール" name="Fraud__Pyramid_scheme_or_chain_letter" />
+    <combo_box.item label="詐欺＞リンデンドルまたは米ドル" name="Fraud__US$" />
+    <combo_box.item label="嫌がらせ＞広告委託/視覚的なスパム" name="Harassment__Advert_farms___visual_spam" />
+    <combo_box.item label="嫌がらせ＞個人またはグループの中傷" name="Harassment__Defaming_individuals_or_groups" />
+    <combo_box.item label="嫌がらせ＞移動の妨害" name="Harassment__Impeding_movement" />
+    <combo_box.item label="嫌がらせ＞性的な嫌がらせ" name="Harassment__Sexual_harassment" />
+    <combo_box.item label="ハラスメント＞対象者を定めて嫌がらせを目的とした行為" name="Harassment__Solicting_inciting_others_to_violate_ToS" />
+    <combo_box.item label="嫌がらせ＞暴言" name="Harassment__Verbal_abuse" />
+    <combo_box.item label="猥褻＞著しく不快であると見なされるコンテンツまたは行為" name="Indecency__Broadly_offensive_content_or_conduct" />
+    <combo_box.item label="猥褻＞不適切なアバター名" name="Indecency__Inappropriate_avatar_name" />
+    <combo_box.item label="猥褻＞リージョン（地域）のレーティング区分に対して不適切なコンテンツまたは行為" name="Indecency__Mature_content_in_PG_region" />
+    <combo_box.item label="猥褻＞「Moderate」指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region" />
+    <combo_box.item label="知的財産の侵害＞コンテンツの撤去" name="Intellectual_property_infringement_Content_Removal" />
+    <combo_box.item label="知的財産の侵害＞コピーBot及び権限の悪用" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" />
+    <combo_box.item label="不寛容" name="Intolerance" />
+    <combo_box.item label="土地＞サンドボックスのリソースの乱用" name="Land__Abuse_of_sandbox_resources" />
+    <combo_box.item label="土地＞不法侵入＞オブジェクトまたはテクスチャ" name="Land__Encroachment__Objects_textures" />
+    <combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles" />
+    <combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants" />
+    <combo_box.item label="スキルゲーミング ポリシー違反" name="Wagering_gambling" />
+    <combo_box.item label="その他" name="Other" />
+  </combo_box>
+  <text name="abuser_name_title">迷惑ユーザーの名前：</text>
+  <button label="選択" label_selected="" name="select_abuser" tool_tip="嫌がらせをした人の名前をリストから選択してください。" />
+  <text name="abuser_name_title2">嫌がらせを受けた場所：</text>
+  <text name="sum_title">概要：</text>
+  <text name="dscr_title">詳細：</text>
+  <text name="bug_aviso">できるだけ具体的に詳しく記入してください。</text>
+  <text name="incomplete_title">* 不完全な報告は調査対象になりません。</text>
+  <button label="嫌がらせを報告する" label_selected="嫌がらせを報告する" name="send_btn" />
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
index c3d7db85c7..aa2422e2c3 100644
--- a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
@@ -1,7 +1,14 @@
-<?xml version="1.0" ?>
-<floater name="save_camera_preset" title="カメラプリセットを保存">
-	<radio_group name="radio_save_preset">
-		<radio_item name="replace_preset" label="プリセットを交換する"/>
-		<radio_item name="new_preset" label="新しいプリセットとして保存する"/>
-	</radio_group>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="save_camera_preset" title="カメラプリセットの保存">
+  <string name="btn_label_save">保存</string>
+  <string name="btn_label_replace">置き換え</string>
+  <radio_group name="radio_save_preset">
+    <radio_item label="新しいプリセットとして保存" name="new_preset" />
+    <radio_item label="プリセットを置き換え" name="replace_preset" />
+  </radio_group>
+  <line_editor name="preset_txt_editor" />
+  <button label="保存" name="save" />
+  <button label="キャンセル" name="cancel" />
+  <!-- *HACK to correctly draw drop-down list over the buttons-->
+  <combo_box name="preset_combo" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
index cdc67b3148..fa3ebb6d34 100644
--- a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Save Pref Preset" title="優先プリセットを保存">
-	<string name="title_graphic">
-		グラフィックプリセットを保存
-	</string>
-	<string name="title_camera">
-		カメラプリセットを保存
-	</string>
-	<text name="Preset">
-		プリセットの名前を入力するか、既存のプリセットを選択します。
-	</text>
-	<button label="保存" name="save"/>
-	<button label="取り消し" name="cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="save_pref_preset" title="グラフィックプリセットの保存">
+  <string name="title_graphic">グラフィックのプリセットを保存</string>
+  <string name="title_camera">カメラのプリセットを保存</string>
+  <text name="Preset">プリセットの名前を入力するか、既存のプリセットを選択します。</text>
+  <button label="保存" name="save" />
+  <button label="キャンセル" name="cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
index f348ce3c4d..6e6c0f355b 100644
--- a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Scene Load Statistics" title="シーン ロード統計情報">
-	<button label="一時停止" name="playpause"/>
-	<scroll_container name="statistics_scroll">
-		<container_view name="statistics_view">
-			<stat_view label="ベーシック" name="basic">
-				<stat_bar label="フレーム ピクセル差" name="frame difference"/>
-				<stat_bar label="UDP データを受け取りました" name="bandwidth"/>
-				<stat_bar label="パケットロス" name="packet_loss"/>
-			</stat_view>
-			<stat_view label="アドバンス" name="advanced">
-				<stat_view label="描画" name="render">
-					<stat_bar label="オブジェクト合計" name="objs"/>
-					<stat_bar label="新規オブジェクト" name="newobjs"/>
-					<stat_bar label="オブジェクト キャッシュ ヒット率" name="object_cache_hits"/>
-				</stat_view>
-				<stat_view label="テクスチャ" name="texture">
-					<stat_bar label="キャッシュ ヒット率" name="texture_cache_hits"/>
-					<stat_bar label="キャッシュ読み込み遅延" name="texture_cache_read_latency"/>
-					<stat_bar label="カウント" name="numimagesstat"/>
-					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
-				</stat_view>
-				<stat_view label="ネットワーク" name="network">
-					<stat_bar label="パケットイン" name="packetsinstat"/>
-					<stat_bar label="パケットアウト" name="packetsoutstat"/>
-					<stat_bar label="オブジェクト" name="objectdatareceived"/>
-					<stat_bar label="テクスチャ" name="texturedatareceived"/>
-					<stat_bar label="資産" name="assetudpdatareceived"/>
-					<stat_bar label="レイヤー" name="layersdatareceived"/>
-					<stat_bar label="実際の受信" name="messagedatain"/>
-					<stat_bar label="実際の送信" name="messagedataout"/>
-				</stat_view>
-			</stat_view>
-			<stat_view label="シミュレーター" name="sim">
-				<stat_bar label="オブジェクト" name="simobjects"/>
-				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
-				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
-				<stat_bar label="パケットイン" name="siminpps"/>
-				<stat_bar label="パケットアウト" name="simoutpps"/>
-				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
-				<stat_bar label="保留中のアップロード" name="simpendinguploads"/>
-				<stat_bar label="未送信バイト合計" name="simtotalunackedbytes"/>
-				<stat_view label="時間（ms）" name="simperf">
-					<stat_bar label="フレーム時間合計" name="simframemsec"/>
-					<stat_bar label="総時間数" name="simnetmsec"/>
-					<stat_bar label="物理的作用時間" name="simsimphysicsmsec"/>
-					<stat_bar label="シミュレーション時間" name="simsimothermsec"/>
-					<stat_bar label="エージェント時間" name="simagentmsec"/>
-					<stat_bar label="イメージ時間" name="simimagesmsec"/>
-					<stat_bar label="スクリプト時間" name="simscriptmsec"/>
-					<stat_bar label="余暇" name="simsparemsec"/>
-					<stat_view label="時間の詳細（ms）" name="timedetails">
-						<stat_bar label="物理効果の単位" name="simsimphysicsstepmsec"/>
-						<stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec"/>
-						<stat_bar label="他の物理効果" name="simsimphysicsothermsec"/>
-						<stat_bar label="スリープ時間" name="simsleepmsec"/>
-						<stat_bar label="ポンプ I/O" name="simpumpiomsec"/>
-					</stat_view>
-				</stat_view>
-			</stat_view>
-		</container_view>
-	</scroll_container>
-</floater>
+<floater name="Scene Load Statistics" title="シーンの読み込みの統計情報">
+  <button label="一時停止" name="playpause" />
+  <scroll_container name="statistics_scroll">
+    <container_view name="statistics_view">
+      <stat_view label="基本" name="basic">
+        <stat_bar label="フレームごとのピクセル差" name="frame difference" />
+        <stat_bar label="ＵＤＰデータの受信量" name="bandwidth" />
+        <stat_bar label="パケットロス" name="packet_loss" />
+      </stat_view>
+      <stat_view label="拡張" name="advanced">
+        <stat_view label="描画" name="render">
+          <stat_bar label="オブジェクト合計" name="objs" />
+          <stat_bar label="新規オブジェクト" name="newobjs" />
+          <stat_bar label="オブジェクトのキャッシュのヒット率" name="object_cache_hits" />
+        </stat_view>
+        <stat_view label="テクスチャ" name="texture">
+          <stat_bar label="キャッシュのヒット率" name="texture_cache_hits" />
+          <stat_bar label="キャッシュの読み込みの遅延量" name="texture_cache_read_latency" />
+          <stat_bar label="カウント" name="numimagesstat" />
+          <stat_bar label="Raw カウント" name="numrawimagesstat" />
+        </stat_view>
+        <stat_view label="ネットワーク" name="network">
+          <stat_bar label="受信パケット量" name="packetsinstat" />
+          <stat_bar label="送信パケット量" name="packetsoutstat" />
+          <stat_bar label="オブジェクト" name="objectdatareceived" />
+          <stat_bar label="テクスチャ" name="texturedatareceived" />
+          <stat_bar label="資産" name="assetudpdatareceived" />
+          <stat_bar label="レイヤー" name="layersdatareceived" />
+          <stat_bar label="実際の受信" name="messagedatain" />
+          <stat_bar label="実際の送信" name="messagedataout" />
+        </stat_view>
+      </stat_view>
+      <stat_view label="シミュレーター" name="sim">
+        <stat_bar label="オブジェクト" name="simobjects" />
+        <stat_bar label="アクティブなオブジェクト" name="simactiveobjects" />
+        <stat_bar label="アクティブなスクリプト" name="simactivescripts" />
+        <stat_bar label="受信パケット" name="siminpps" />
+        <stat_bar label="送信パケット" name="simoutpps" />
+        <stat_bar label="保留中のダウンロード" name="simpendingdownloads" />
+        <stat_bar label="保留中のアップロード" name="simpendinguploads" />
+        <stat_bar label="未送信バイト合計" name="simtotalunackedbytes" />
+        <stat_view label="時間（㎳）" name="simperf">
+          <stat_bar label="フレーム時間合計" name="simframemsec" />
+          <stat_bar label="総時間数" name="simnetmsec" />
+          <stat_bar label="物理的作用時間" name="simsimphysicsmsec" />
+          <stat_bar label="シミュレーション時間" name="simsimothermsec" />
+          <stat_bar label="エージェント時間" name="simagentmsec" />
+          <stat_bar label="イメージ時間" name="simimagesmsec" />
+          <stat_bar label="スクリプト時間" name="simscriptmsec" />
+          <stat_bar label="余暇" name="simsparemsec" />
+          <stat_view label="時間の詳細（㎳）" name="timedetails">
+            <stat_bar label="物理効果の単位" name="simsimphysicsstepmsec" />
+            <stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec" />
+            <stat_bar label="他の物理効果" name="simsimphysicsothermsec" />
+            <stat_bar label="スリープ時間" name="simsleepmsec" />
+            <stat_bar label="ポンプ I/O" name="simpumpiomsec" />
+          </stat_view>
+        </stat_view>
+      </stat_view>
+    </container_view>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
index 0ac7a988e0..a7a7e97bd3 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="script debug floater" title="スクリプト警告／エラー">
-	<tab_container name="Preview Tabs">
-		<floater label="スクリプト" name="all_scripts" title="[ALL SCRIPTS]" />
-	</tab_container>
-</multi_floater>
+  <tab_container name="Preview Tabs">
+    <floater label="スクリプト" name="all_scripts" title="[ALL SCRIPTS]" />
+  </tab_container>
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
index e70a30fa24..cf859bb629 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
+<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]" />
diff --git a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
index 3a90e673ae..69953bf07f 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
@@ -1,48 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_script_colors" title="スクリプトの色">
-	<text name="color_pickers_label">
-		希望の色を選択:
-	</text>
-	<text name="text_label">
-		テキスト
-	</text>
-	<text name="cursor_label">
-		カーソル
-	</text>
-	<text name="background_label">
-		背景
-	</text>
-	<text name="datatype_label">
-		データ型
-	</text>
-	<text name="event_label">
-		イベント
-	</text>
-	<text name="string_literal_label">
-		文字列リテラル
-	</text>
-	<text name="constant_label">
-		定数
-	</text>
-	<text name="flow_control_label">
-		フロー制御
-	</text>
-	<text name="function_label">
-		関数
-	</text>
-	<text name="comment_label">
-		コメント
-	</text>
-	<script_editor name="Script Preview">
-		/* サンプル スクリプト */
+  <text name="color_pickers_label">希望の色を選択：</text>
+  <text name="text_label">テキスト</text>
+  <text name="cursor_label">カーソル</text>
+  <text name="background_label">背景</text>
+  <text name="datatype_label">データ型</text>
+  <text name="event_label">イベント</text>
+  <text name="string_literal_label">文字列リテラル</text>
+  <text name="constant_label">定数</text>
+  <text name="flow_control_label">フロー制御</text>
+  <text name="function_label">関数</text>
+  <text name="comment_label">コメント</text>
+  <script_editor name="Script Preview">/* サンプル スクリプト */
 default
 {
-state_entry()
-    {
-// コメント
-string greeting = &quot;こんにちは&quot;;
-llSay(PUBLIC_CHANNEL, greeting);
-    }
-}
-	</script_editor>
-</floater>
+  state_entry()
+  {
+    // コメント
+    string greeting = "こんにちは";
+    llSay(PUBLIC_CHANNEL, greeting);
+  }
+}</script_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
index 7ccd858af7..a5e161be2d 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="scriptlimits" title="スクリプト情報"/>
+<floater name="scriptlimits" title="スクリプト情報" />
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
index 656357aa17..a6d556fb48 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
@@ -1,9 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="スクリプト： 回転スクリプト">
-	<floater.string name="Title">
-		スクリプト： [NAME]
-	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview lsl text" title="スクリプト：回転スクリプト">
+  <floater.string name="Title">スクリプト：[NAME]</floater.string>
+  <text name="desc txt">説明：</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index de0c4469c1..99cfbe233c 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="進行のリセット">
-	<floater.string name="Starting">
-		[COUNT] アイテムの [START] を開始します。
-	</floater.string>
-	<floater.string name="Done">
-		完了。
-	</floater.string>
-	<floater.string name="Resetting">
-		リセット中
-	</floater.string>
-	<floater.string name="Running">
-		実行中
-	</floater.string>
-	<floater.string name="NotRunning">
-		実行されていません
-	</floater.string>
-	<floater.string name="Timeout">
-		タイムアウト： [OBJECT_NAME]
-	</floater.string>
-	<floater.string name="LoadingObjInv">
-		次のインベントリをロード中： [OBJECT_NAME]
-	</floater.string>
-	<button label="閉じる" label_selected="閉じる" name="close"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="queue" title="進行のリセット">
+  <floater.string name="Starting">[COUNT]アイテムの[START]を開始します。</floater.string>
+  <floater.string name="Done">完了。</floater.string>
+  <floater.string name="Resetting">リセット中</floater.string>
+  <floater.string name="Running">実行中</floater.string>
+  <floater.string name="NotRunning">実行されていません</floater.string>
+  <floater.string name="Timeout">タイムアウト：[OBJECT_NAME]</floater.string>
+  <floater.string name="LoadingObjInv">次のインベントリをロード中：[OBJECT_NAME]</floater.string>
+  <button label="閉じる" label_selected="閉じる" name="close" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
index bc4f48c995..e0414706e9 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script search" title="スクリプトの検索">
-	<check_box label="大文字と小文字を区別しない" name="case_text"/>
-	<button label="検索" label_selected="検索" name="search_btn"/>
-	<button label="置換" label_selected="置換" name="replace_btn"/>
-	<button label="すべて置換" label_selected="すべて置換" name="replace_all_btn"/>
-	<text name="txt">
-		検索
-	</text>
-	<text name="txt2">
-		置換
-	</text>
-</floater>
+  <check_box label="大文字と小文字を区別しない" name="case_text" />
+  <button label="検索" label_selected="検索" name="search_btn" />
+  <button label="置換" label_selected="置換" name="replace_btn" />
+  <button label="すべて置換" label_selected="すべて置換" name="replace_all_btn" />
+  <text name="txt">検索</text>
+  <text name="txt2">置換</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
index 0723be0068..772d3a9719 100644
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		ローディング...
-	</floater.string>
-	<floater.string name="done_text">
-		完了
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				現在のゴッドレベルに反映させるため検索をやり直してください
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="loading_text">読み込んでいます…。</floater.string>
+  <floater.string name="done_text">完了</floater.string>
+  <layout_stack name="stack1">
+    <layout_panel name="browser_layout">
+      <text name="refresh_search">現在のゴッドレベルに反映させるため、検索をやり直してください。</text>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
index d41be86873..a31295f2fe 100644
--- a/indra/newview/skins/default/xui/ja/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml
@@ -1,7 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container">
-	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
-	<text name="Save item as:">
-		キーを押してスピーカーボタンのトリガーを設定します。
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container">
+  <floater.string name="keyboard">キーボード</floater.string>
+  <floater.string name="mouse">マウスのボタン</floater.string>
+  <floater.string name="basic_description">キーを押してトリガーを設定します。
+許可される入力：[INPUT]</floater.string>
+  <floater.string name="reserved_by_menu">その組み合わせ（[KEYSTR]）は、メニューで予約されています。</floater.string>
+  <text name="description">キーを押してトリガーを設定します。
+許可される入力：[INPUT]</text>
+  <check_box label="全てに適用" name="apply_all" tool_tip="ビューアは、ワールドで何をしているかに応じて、さまざまなコントロールの組み合わせを使用します。これを設定すると、変更がすべての組み合わせに適用されます。" />
+
+  <button label="空欄にする" name="SetEmpty" />
+  <button label="デフォルト" name="Default" />
+  <button label="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index aa368eef11..4a5fd8d396 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -1,65 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sell land" title="土地の販売">
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<text name="info_parcel_label">
-				区画：
-			</text>
-			<text name="info_parcel">
-				PARCEL NAME
-			</text>
-			<text name="info_size_label">
-				サイズ：
-			</text>
-			<text name="info_size">
-				[AREA] 平方メートル
-			</text>
-			<text name="info_action">
-				この区画を販売：
-			</text>
-			<text name="price_label">
-				1. 価格の設定：
-			</text>
-			<text name="price_text">
-				適正価格を設定してください。
-			</text>
-			<text name="price_ld">
-				L$
-			</text>
-			<line_editor name="price">
-				0
-			</line_editor>
-			<text name="price_per_m">
-				（1平方メートルあたり L$[PER_METER]）
-			</text>
-			<text name="sell_to_label">
-				2. 特定の人に販売：
-			</text>
-			<text name="sell_to_text">
-				販売先の指定なしか、特定の人に販売するかを選択してください。
-			</text>
-			<combo_box name="sell_to">
-				<combo_box.item label="- 1つ選択 -" name="--selectone--"/>
-				<combo_box.item label="指定なし・誰にでも販売" name="Anyone"/>
-				<combo_box.item label="特定の人：" name="Specificuser:"/>
-			</combo_box>
-			<button label="選択" name="sell_to_select_agent"/>
-			<text name="sell_objects_label">
-				3. オブジェクトも土地と一緒に販売しますか？
-			</text>
-			<text name="sell_objects_text">
-				区画上にある、土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。
-			</text>
-			<radio_group name="sell_objects">
-				<radio_item label="いいえ、オブジェクトの所有権を保持します" name="no"/>
-				<radio_item label="はい、オブジェクトと土地を一緒に販売します" name="yes"/>
-			</radio_group>
-			<button label="オブジェクトを表示" name="show_objects"/>
-			<text name="nag_message_label">
-				注意： 返品・交換はできません。
-			</text>
-			<button label="土地を販売" name="sell_btn"/>
-			<button label="キャンセル" name="cancel_btn"/>
-		</panel>
-	</scroll_container>
-</floater>
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <text name="info_parcel_label">区画：</text>
+      <text name="info_parcel">区画名</text>
+      <text name="info_size_label">サイズ：</text>
+      <text name="info_size">[AREA]㎡</text>
+      <text name="info_action">この区画を販売：</text>
+      <text name="price_label">１．価格の設定：</text>
+      <text name="price_text">適正と思われる価格を入力してください。</text>
+      <text name="price_ld">L$ </text>
+      <line_editor name="price">0</line_editor>
+      <text name="price_per_m">（1㎡あたりL$ [PER_METER]）</text>
+      <text name="sell_to_label">２．特定の人物に販売：</text>
+      <text name="sell_to_text">販売先を特定の人物に限定するか、しないかを選択してください。</text>
+      <combo_box name="sell_to">
+        <combo_box.item label="─１つ選択─" name="--selectone--" />
+        <combo_box.item label="指定なし・誰にでも販売" name="Anyone" />
+        <combo_box.item label="特定の人物：" name="Specificuser:" />
+      </combo_box>
+      <button label="選択" name="sell_to_select_agent" />
+      <text name="sell_objects_label">３．オブジェクトと土地を一緒に販売しますか？</text>
+      <text name="sell_objects_text">区画上の土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。</text>
+      <radio_group name="sell_objects">
+        <radio_item label="いいえ、オブジェクトの所有権は保持します。" name="no" />
+        <radio_item label="はい、オブジェクトと土地を一緒に販売します。" name="yes" />
+      </radio_group>
+      <button label="オブジェクトを表示" name="show_objects" />
+      <text name="nag_message_label">注意：返品・交換はできません。</text>
+      <button label="土地を販売する" name="sell_btn" />
+      <button label="キャンセル" name="cancel_btn" />
+    </panel>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index cb7950bf53..974f1bd0f1 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="デバッグ設定">
-	<combo_box name="boolean_combo">
-		<combo_box.item label="TRUE" name="TRUE"/>
-		<combo_box.item label="FALSE" name="FALSE"/>
-	</combo_box>
-	<color_swatch label="色" name="val_color_swatch"/>
-	<spinner label="x" name="val_spinner_1"/>
-	<spinner label="x" name="val_spinner_2"/>
-	<spinner label="x" name="val_spinner_3"/>
-	<spinner label="x" name="val_spinner_4"/>
-	<button label="デフォルトにリセット" name="default_btn"/>
-</floater>
+  <filter_editor name="filter_input" />
+  <scroll_list name="setting_list">
+    <scroll_list.columns name="changed_setting" />
+    <scroll_list.columns label="設定" name="setting" />
+  </scroll_list>
+  <text name="setting_name_txt">デバッグ設定名</text>
+  <text_editor name="comment_text" />
+  <radio_group name="boolean_combo">
+    <radio_item label="有効" name="TRUE" value="true" />
+    <radio_item label="無効" name="FALSE" value="" />
+    <commit_callback function="CommitSettings" />
+  </radio_group>
+  <line_editor name="val_text" />
+  <color_swatch label="色" name="val_color_swatch" />
+  <spinner label="Ｘ" name="val_spinner_1" />
+  <spinner label="Ｘ" name="val_spinner_2" />
+  <spinner label="Ｘ" name="val_spinner_3" />
+  <spinner label="Ｘ" name="val_spinner_4" />
+  <button label="デフォルトにリセット" name="default_btn" />
+  <check_box label="変更された設定のみ表示" name="hide_default" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
index b8b1699f03..91c05a1c3a 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings picker" title="選択：設定">
-	<floater.string name="pick title">
-		選択：
-	</floater.string>
-	<floater.string name="pick_track">
-		トラックを選択
-	</floater.string>
-	<floater.string name="pick_settings">
-		設定を選択
-	</floater.string>
-	<floater.string name="track_water">
-		水
-	</floater.string>
-	<floater.string name="track_ground">
-		地面
-	</floater.string>
-	<floater.string name="track_sky">
-		空 [NUM]
-	</floater.string>
-	<layout_stack name="test_stack">
-		<layout_panel name="inv_list">
-			<filter_editor label="テクスチャをフィルター" name="flt_inventory_search"/>
-		</layout_panel>
-		<layout_panel name="temp">
-			<button label="OK" label_selected="OK" name="btn_select"/>
-			<button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <floater.string name="pick title">選択：</floater.string>
+  <floater.string name="pick_track">トラックを選択</floater.string>
+  <floater.string name="pick_settings">設定を選択</floater.string>
+  <floater.string name="track_water">水</floater.string>
+  <floater.string name="track_ground">地面</floater.string>
+  <floater.string name="track_sky">空[NUM]</floater.string>
+  <layout_stack name="test_stack">
+    <layout_panel name="inv_list">
+      <filter_editor label="テクスチャをフィルタ" name="flt_inventory_search" />
+    </layout_panel>
+    <layout_panel name="temp">
+      <button label="ＯＫ" label_selected="ＯＫ" name="btn_select" />
+      <button label="キャンセル" label_selected="キャンセル" name="btn_cancel" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
new file mode 100644
index 0000000000..56ebcc9b2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="simple_outfit_snapshot" title="アウトフィットのスナップショット">
+  <ui_ctrl name="thumbnail_placeholder" />
+  <button label="画像を撮影" name="new_snapshot_btn" />
+  <button label="保存（L$ [UPLOAD_COST]）" name="save_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 64f292c75c..de778e2d8b 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -1,77 +1,55 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Snapshot" title="スナップショット">
-	<floater.string name="unknown">
-		不明
-	</floater.string>
-	<string name="postcard_progress_str">
-		メールの送信
-	</string>
-	<string name="facebook_progress_str">
-		Facebook へ投稿中
-	</string>
-	<string name="profile_progress_str">
-		投稿
-	</string>
-	<string name="inventory_progress_str">
-		インベントリに保存
-	</string>
-	<string name="local_progress_str">
-		コンピュータに保存
-	</string>
-	<string name="facebook_succeeded_str">
-		画像がアップロードされました
-	</string>
-	<string name="profile_succeeded_str">
-		画像がアップロードされました
-	</string>
-	<string name="postcard_succeeded_str">
-		メールが送信されました
-	</string>
-	<string name="inventory_succeeded_str">
-		インベントリに保存されました
-	</string>
-	<string name="local_succeeded_str">
-		コンピュータに保存されました
-	</string>
-	<string name="facebook_failed_str">
-		Facebook のタイムラインに画像をアップロードできませんでした。
-	</string>
-	<string name="profile_failed_str">
-		プロフィールフィードに画像をアップロードできませんでした。
-	</string>
-	<string name="postcard_failed_str">
-		メールを送信できませんでした。
-	</string>
-	<string name="inventory_failed_str">
-		インベントリに保存できませんでした。
-	</string>
-	<string name="local_failed_str">
-		コンピュータに保存できませんでした。
-	</string>
-	<button label="更新" name="new_snapshot_btn"/>
-	<panel name="advanced_options_panel">
-		<text name="layer_type_label">
-			キャプチャ：
-		</text>
-		<combo_box label="画像レイヤー" name="layer_types">
-			<combo_box.item label="色" name="Colors"/>
-			<combo_box.item label="深度" name="Depth"/>
-		</combo_box>
-		<check_box label="インターフェース" name="ui_check"/>
-		<check_box label="HUD" name="hud_check"/>
-		<check_box label="画面全体を静止" name="freeze_frame_check"/>
-		<check_box label="自動更新" name="auto_snapshot_check"/>
-		<text name="filter_list_label">
-			フィルター:
-		</text>
-		<combo_box name="filters_combobox" tool_tip="画像フィルター">
-			<combo_box.item label="フィルターなし" name="NoFilter"/>
-		</combo_box>
-	</panel>
-	<text name="image_res_text">
-		[WIDTH]px (横幅) x [HEIGHT]px (高さ)
-	</text>
-	<text name="file_size_label">
-		[SIZE] キロバイト
-	</text>
-</floater>
+  <floater.string name="unknown">不明</floater.string>
+  <string name="postcard_progress_str">メール送信</string>
+  <string name="profile_progress_str">プロフィールに投稿</string>
+  <string name="inventory_progress_str">インベントリに保存</string>
+  <string name="local_progress_str">コンピュータに保存</string>
+  <string name="profile_succeeded_str">画像がアップロードされました。</string>
+  <string name="postcard_succeeded_str">メールが送信されました！</string>
+  <string name="inventory_succeeded_str">インベントリに保存されました！</string>
+  <string name="local_succeeded_str">コンピュータに保存されました！</string>
+  <!-- 字数制限のため「プロフィールフィードに画像をアップロードできませんでした。」から変更 -->
+  <string name="profile_failed_str">フィードにアップできませんでした。</string>
+  <string name="postcard_failed_str">メール送信に失敗しました。</string>
+  <string name="inventory_failed_str">インベントリに保存できませんでした。</string>
+  <string name="local_failed_str">コンピュータへの保存に失敗しました。</string>
+  <button label="リフレッシュ" name="new_snapshot_btn" />
+  <panel name="advanced_options_panel">
+    <text name="layer_type_label">キャプチャーオプション：</text>
+    <combo_box label="画像レイヤー" name="layer_types">
+      <combo_box.item label="カラー" name="Colors" value="colors" />
+      <combo_box.item label="色深度" name="Depth" value="depth" />
+    </combo_box>
+    <check_box label="インターフェース" name="ui_check" />
+    <check_box label="ＨＵＤ" name="hud_check" />
+    <check_box label="フレームをフリーズ（全画面）" name="freeze_frame_check" />
+    <check_box label="自動リフレッシュ" name="auto_snapshot_check" />
+    <text name="filter_list_label">フィルタ：</text>
+    <combo_box name="filters_combobox" tool_tip="画像フィルタ">
+      <combo_box.item label="フィルタなし" name="NoFilter" value="NoFilter" />
+    </combo_box>
+  </panel>
+  <panel_container name="panel_container">
+    <panel name="panel_snapshot_options" filename="panel_snapshot_options.xml" />
+    <panel name="panel_snapshot_profile" filename="panel_snapshot_profile.xml" />
+    <panel name="panel_snapshot_postcard" filename="panel_snapshot_postcard.xml" />
+    <panel name="panel_snapshot_inventory" filename="panel_snapshot_inventory.xml" />
+    <panel name="panel_snapshot_local" filename="panel_snapshot_local.xml" />
+  </panel_container>
+  <view_border name="status_hr" />
+  <panel name="succeeded_panel">
+    <text name="succeeded_lbl">成功</text>
+  </panel>
+  <panel name="failed_panel">
+    <text name="failed_lbl">失敗</text>
+  </panel>
+  <loading_indicator name="working_indicator" />
+  <text name="working_lbl">処理中</text>
+  <text name="refresh_lbl">リフレッシュして保存</text>
+  <ui_ctrl name="thumbnail_placeholder" />
+  <view_border name="img_info_border" />
+  <text name="image_res_text">[WIDTH]px（幅）✕[HEIGHT]px（高さ）</text>
+  <text name="file_size_label">[SIZE]㎅</text>
+  <text name="360_label">３６０度Ｓショットを撮影</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
index 28d2388bed..8732e59ed6 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_sound_devices" title="サウンドデバイス">
-	<text name="voice_label">
-		ボイスチャット
-	</text>
-	<check_box label="有効" name="enable_voice"/>
-</floater>
+  <text name="voice_label">ボイスチャット</text>
+  <check_box label="有効" name="enable_voice" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index 7d83309c46..ec6cb56d40 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Sound Preview" title="SOUND.WAV">
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-	<button label="アップロード　（L$[AMOUNT]）" label_selected="アップロード　（L$[AMOUNT]）" name="ok_btn"/>
-	<text name="text">
-		ビットレート(kbps)：
-	</text>
-	<radio_group name="bitrate">
-		<radio_item label="32" name="32"/>
-		<radio_item label="64" name="64"/>
-		<radio_item label="96" name="96"/>
-		<radio_item label="128" name="128"/>
-	</radio_group>
-</floater>
+  <text name="name_label">名前：</text>
+  <text name="description_label">説明：</text>
+  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
+  <button label="アップロード（L$[AMOUNT]）" label_selected="アップロード（L$ [AMOUNT]）" name="ok_btn" />
+  <text name="text">ビットレート（kbps）：</text>
+  <radio_group name="bitrate">
+    <radio_item label="32" name="32" />
+    <radio_item label="64" name="64" />
+    <radio_item label="96" name="96" />
+    <radio_item label="128" name="128" />
+  </radio_group>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
index 31fbef9bcf..0e9397d428 100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_floater" title="スペルチェッカーの設定">
-	<check_box label="スペルチェッカーを有効にする" name="spellcheck_enable"/>
-	<text name="spellcheck_main">
-		メイン辞書:
-	</text>
-	<text label="ログ：" name="spellcheck_additional">
-		その他の辞書：
-	</text>
-	<text name="spellcheck_available">
-		入手可
-	</text>
-	<text name="spellcheck_active">
-		有効
-	</text>
-	<button label="削除" name="spellcheck_remove_btn"/>
-	<button label="インポート..." name="spellcheck_import_btn"/>
-</floater>
+  <check_box label="スペルチェッカーを有効にする" name="spellcheck_enable" />
+  <text name="spellcheck_main">メイン辞書:</text>
+  <text label="ログ：" name="spellcheck_additional">その他の辞書：</text>
+  <text name="spellcheck_available">入手可</text>
+  <text name="spellcheck_active">有効</text>
+  <button label="削除" name="spellcheck_remove_btn" />
+  <button label="インポート…" name="spellcheck_import_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
index 81bfbe15f5..3a82e0dd4e 100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="辞書をインポート">
-	<text name="import_dict">
-		辞書：
-	</text>
-	<button label="参照" label_selected="参照" name="dictionary_path_browse"/>
-	<text name="import_name">
-		名前：
-	</text>
-	<text name="import_lang">
-		言語：
-	</text>
-	<button label="インポート" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <text name="import_dict">辞書：</text>
+  <button label="参照" label_selected="参照" name="dictionary_path_browse" />
+  <text name="import_name">名前：</text>
+  <text name="import_lang">言語：</text>
+  <button label="インポート" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 1da0e5ebc9..b512b6202a 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -1,108 +1,111 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Statistics" title="統計">
-	<scroll_container name="statistics_scroll">
-		<container_view name="statistics_view">
-			<stat_view label="ベーシック" name="basic">
-				<stat_bar label="FPS" name="fps"/>
-				<stat_bar label="UDP データを受け取りました" name="bandwidth"/>
-				<stat_bar label="パケットロス" name="packet_loss"/>
-				<stat_bar label="Pingシム" name="ping"/>
-			</stat_view>
-			<stat_view label="アドバンス" name="advanced">
-				<stat_view label="描画" name="render">
-					<stat_bar label="KTris (フレームごと)" name="ktrisframe"/>
-					<stat_bar label="KTris (秒ごと)" name="ktrissec"/>
-					<stat_bar label="オブジェクト合計" name="totalobjs"/>
-					<stat_bar label="キャッシュされたオブジェクト" name="cachedobjs"/>
-					<stat_bar label="新規オブジェクト" name="newobjs"/>
-					<stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits"/>
-					<stat_bar label="閉鎖クエリ実行" name="occlusion_queries"/>
-					<stat_bar label="閉鎖オブジェクト" name="occluded"/>
-					<stat_bar label="非閉鎖オブジェクト" name="unoccluded"/>
-				</stat_view>
-				<stat_view label="テクスチャ" name="texture">
-					<stat_bar label="キャッシュヒット率" name="texture_cache_hits"/>
-					<stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency"/>
-					<stat_bar label="カウント" name="numimagesstat"/>
-					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
-					<stat_bar label="GL メモリ" name="gltexmemstat"/>
-					<stat_bar label="フォーマット済メモリ" name="formattedmemstat"/>
-					<stat_bar label="Raw メモリ" name="rawmemstat"/>
-					<stat_bar label="統合メモリ" name="glboundmemstat"/>
-				</stat_view>
-				<stat_view label="メモリ使用量" name="memory">
-					<stat_bar label="LLTrace" name="LLTrace"/>
-					<stat_bar label="UI" name="LLView"/>
-					<stat_bar label="フォント" name="LLFontFreetype"/>
-					<stat_bar label="インベントリ" name="LLInventoryObject"/>
-					<stat_bar label="ビューワ オブジェクト" name="LLViewerObject"/>
-					<stat_bar label="Octree グループ データ" name="LLViewerOctreeGroup"/>
-					<stat_bar label="Octree データ" name="LLViewerOctreeEntry"/>
-					<stat_bar label="ビューワ オブジェクト キャッシュ" name="LLVOCacheEntry"/>
-					<stat_bar label="描画可能オブジェクト" name="LLDrawable"/>
-					<stat_bar label="顔データ" name="LLFace"/>
-					<stat_bar label="描画情報" name="LLDrawInfo"/>
-					<stat_bar label="テクスチャ データ" name="LLTexture"/>
-					<stat_bar label="画像データ" name="LLImage"/>
-					<stat_bar label="GL 画像データ" name="LLImageGL"/>
-					<stat_bar label="頂点バッファ" name="LLVertexBuffer"/>
-				</stat_view>
-				<stat_view label="ネットワーク" name="network">
-					<stat_bar label="パケットイン" name="packetsinstat"/>
-					<stat_bar label="パケットアウト" name="packetsoutstat"/>
-					<stat_bar label="オブジェクト" name="objectdatareceived"/>
-					<stat_bar label="テクスチャ" name="texturedatareceived"/>
-					<stat_bar label="資産" name="assetudpdatareceived"/>
-					<stat_bar label="レイヤー" name="layersdatareceived"/>
-					<stat_bar label="実際の受信" name="messagedatain"/>
-					<stat_bar label="実際の送信" name="messagedataout"/>
-				</stat_view>
-			</stat_view>
-			<stat_view label="シミュレーター" name="sim">
-				<stat_bar label="時間の遅れ" name="simtimedilation"/>
-				<stat_bar label="シム FPS" name="simfps"/>
-				<stat_bar label="物理作用 FPS" name="simphysicsfps"/>
-				<stat_view label="物理作用の詳細" name="physicsdetail">
-					<stat_bar label="ピン留めオブジェクト" name="physicspinnedtasks"/>
-					<stat_bar label="低 LOD オブジェクト" name="physicslodtasks"/>
-					<stat_bar label="メモリ配分" name="physicsmemoryallocated"/>
-				</stat_view>
-				<stat_bar label="エージェントの更新/秒" name="simagentups"/>
-				<stat_bar label="メインエージェント" name="simmainagents"/>
-				<stat_bar label="チャイルドエージェント" name="simchildagents"/>
-				<stat_bar label="オブジェクト" name="simobjects"/>
-				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
-				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
-				<stat_bar label="スクリプト実行" name="simpctscriptsrun"/>
-				<stat_bar label="スクリプトイベント" name="simscripteps"/>
-				<stat_view label="パスファインディング" name="simpathfinding">
-					<stat_bar label="AIステップ時間" name="simsimaistepmsec"/>
-					<stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps"/>
-					<stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters"/>
-				</stat_view>
-				<stat_bar label="パケットイン" name="siminpps"/>
-				<stat_bar label="パケットアウト" name="simoutpps"/>
-				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
-				<stat_bar label="保留中のアップロード" name="simpendinguploads"/>
-				<stat_bar label="合計未承認データ" name="simtotalunackedbytes"/>
-				<stat_view label="時間" name="simperf">
-					<stat_bar label="フレーム時間合計" name="simframemsec"/>
-					<stat_bar label="総時間数" name="simnetmsec"/>
-					<stat_bar label="物理的作用時間" name="simsimphysicsmsec"/>
-					<stat_bar label="シミュレーション時間" name="simsimothermsec"/>
-					<stat_bar label="エージェント時間" name="simagentmsec"/>
-					<stat_bar label="イメージ時間" name="simimagesmsec"/>
-					<stat_bar label="スクリプト時間" name="simscriptmsec"/>
-					<stat_bar label="余暇" name="simsparemsec"/>
-					<stat_view label="時間の詳細" name="timedetails">
-						<stat_bar label="物理効果の単位" name="simsimphysicsstepmsec"/>
-						<stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec"/>
-						<stat_bar label="他の物理効果" name="simsimphysicsothermsec"/>
-						<stat_bar label="スリープ時間" name="simsleepmsec"/>
-						<stat_bar label="ポンプ I/O" name="simpumpiomsec"/>
-					</stat_view>
-				</stat_view>
-			</stat_view>
-		</container_view>
-	</scroll_container>
-</floater>
+  <scroll_container name="statistics_scroll">
+    <container_view name="statistics_view">
+      <stat_view label="基本" name="basic">
+        <stat_bar label="ＦＰＳ" name="fps" unit_label="／秒" />
+        <stat_bar name="frame_mean" label="フレーム（平均）" unit_label="㎳" />
+        <stat_bar name="frame_median" label="フレーム（中央値）" unit_label="㎳" />
+        <stat_bar name="framet_jitter" label="ジッタ" />
+        <stat_bar label="受信したＵＤＰデータ" name="bandwidth" />
+        <stat_bar label="パケットロス" name="packet_loss" />
+        <stat_bar label="シムのPing" name="ping" />
+      </stat_view>
+      <stat_view label="拡張" name="advanced">
+        <stat_view label="描画" name="render">
+          <stat_bar label="フレームあたりのKTris" name="ktrisframe" unit_label="ktris／フレーム" />
+          <stat_bar label="秒あたりのKTris" name="ktrissec" />
+          <stat_bar label="オブジェクト合計" name="totalobjs" />
+          <stat_bar label="キャッシュされたオブジェクト" name="cachedobjs" />
+          <stat_bar label="新規オブジェクト" name="newobjs" />
+          <stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits" />
+          <stat_bar label="閉鎖クエリ実行" name="occlusion_queries" />
+          <stat_bar label="閉鎖オブジェクト" name="occluded" />
+          <stat_bar label="非閉鎖オブジェクト" name="unoccluded" />
+        </stat_view>
+        <stat_view label="テクスチャ" name="texture">
+          <stat_bar label="キャッシュヒット率" name="texture_cache_hits" />
+          <stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency" />
+          <stat_bar label="カウント" name="numimagesstat" />
+          <stat_bar label="ＲＡＷカウント" name="numrawimagesstat" />
+          <stat_bar label="ＧＬメモリ" name="gltexmemstat" />
+          <stat_bar label="フォーマット済メモリ" name="formattedmemstat" />
+          <stat_bar label="ＲＡＷメモリ" name="rawmemstat" />
+          <stat_bar label="統合メモリ" name="glboundmemstat" />
+        </stat_view>
+        <stat_view label="メモリ使用量" name="memory">
+          <stat_bar label="ＬＬトレース" name="LLTrace" />
+          <stat_bar label="ＵＩ" name="LLView" />
+          <stat_bar label="フォント" name="LLFontFreetype" />
+          <stat_bar label="インベントリ" name="LLInventoryObject" />
+          <stat_bar label="ビューアオブジェクト" name="LLViewerObject" />
+          <stat_bar label="八分木グループデータ" name="LLViewerOctreeGroup" />
+          <stat_bar label="八分木データ" name="LLViewerOctreeEntry" />
+          <stat_bar label="ビューアのオブジェクトキャッシュ" name="LLVOCacheEntry" />
+          <stat_bar label="描画可能オブジェクト" name="LLDrawable" />
+          <stat_bar label="顔データ" name="LLFace" />
+          <stat_bar label="描画情報" name="LLDrawInfo" />
+          <stat_bar label="テクスチャデータ" name="LLTexture" />
+          <stat_bar label="画像データ" name="LLImage" />
+          <stat_bar label="ＧＬ画像データ" name="LLImageGL" />
+          <stat_bar label="頂点バッファ" name="LLVertexBuffer" />
+        </stat_view>
+        <stat_view label="ネットワーク" name="network">
+          <stat_bar label="パケットイン" name="packetsinstat" />
+          <stat_bar label="パケットアウト" name="packetsoutstat" />
+          <stat_bar label="オブジェクト" name="objectdatareceived" />
+          <stat_bar label="テクスチャ" name="texturedatareceived" />
+          <stat_bar label="アセット" name="assetudpdatareceived" />
+          <stat_bar label="レイヤー" name="layersdatareceived" />
+          <stat_bar label="実際の受信" name="messagedatain" />
+          <stat_bar label="実際の送信" name="messagedataout" />
+        </stat_view>
+      </stat_view>
+      <stat_view label="シミュレーター" name="sim">
+        <stat_bar label="遅延時間" name="simtimedilation" />
+        <stat_bar label="シムのＦＰＳ" name="simfps" />
+        <stat_bar label="物理作用のＦＰＳ" name="simphysicsfps" />
+        <stat_view label="物理作用の詳細" name="physicsdetail">
+          <stat_bar label="ピン留めオブジェクト" name="physicspinnedtasks" />
+          <stat_bar label="低ＬＯＤオブジェクト" name="physicslodtasks" />
+          <stat_bar label="メモリ配分" name="physicsmemoryallocated" />
+        </stat_view>
+        <stat_bar label="エージェントの更新／秒" name="simagentups" />
+        <stat_bar label="メインエージェント" name="simmainagents" />
+        <stat_bar label="チャイルドエージェント" name="simchildagents" />
+        <stat_bar label="オブジェクト" name="simobjects" />
+        <stat_bar label="アクティブなオブジェクト" name="simactiveobjects" />
+        <stat_bar label="アクティブなスクリプト" name="simactivescripts" />
+        <stat_bar label="スクリプト実行" name="simpctscriptsrun" />
+        <stat_bar label="スクリプトイベント" name="simscripteps" unit_label="eps" />
+        <stat_view label="経路探索" name="simpathfinding">
+          <stat_bar label="ＡＩステップ時間" name="simsimaistepmsec" />
+          <stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps" unit_label="／秒" />
+          <stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters" unit_label="％" />
+        </stat_view>
+        <stat_bar label="入力パケット" name="siminpps" unit_label="パケット／秒" />
+        <stat_bar label="出力パケット" name="simoutpps" unit_label="パケット／秒" />
+        <stat_bar label="保留中のダウンロード" name="simpendingdownloads" />
+        <stat_bar label="保留中のアップロード" name="simpendinguploads" />
+        <stat_bar label="未承認の合計データ" name="simtotalunackedbytes" />
+        <stat_view label="時間" name="simperf">
+          <stat_bar label="フレーム時間合計" name="simframemsec" />
+          <stat_bar label="総時間数" name="simnetmsec" />
+          <stat_bar label="物理的作用時間" name="simsimphysicsmsec" />
+          <stat_bar label="シミュレーション時間" name="simsimothermsec" />
+          <stat_bar label="エージェント時間" name="simagentmsec" />
+          <stat_bar label="イメージ時間" name="simimagesmsec" />
+          <stat_bar label="スクリプト時間" name="simscriptmsec" />
+          <stat_bar label="スペア時間" name="simsparemsec" />
+          <stat_view label="時間の詳細" name="timedetails">
+            <stat_bar label="物理効果の単位" name="simsimphysicsstepmsec" />
+            <stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec" />
+            <stat_bar label="他の物理効果" name="simsimphysicsothermsec" />
+            <stat_bar label="スリープ時間" name="simsleepmsec" />
+            <stat_bar label="ポンプ入出力" name="simpumpiomsec" />
+          </stat_view>
+        </stat_view>
+      </stat_view>
+    </container_view>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
index 45e97bdf5d..b57857a09c 100644
--- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sys_well_window" title="通知">
-	<string name="title_im_well_window">
-		会話
-	</string>
-	<string name="title_notification_well_window">
-		通知
-	</string>
-</floater>
+  <string name="title_im_well_window">会話</string>
+  <string name="title_notification_well_window">通知</string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index 7318083771..1e68e1caf3 100644
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="telehub" title="テレハブ">
-	<text name="status_text_connected">
-		物体[OBJECT]に接続されたテレハブ
-	</text>
-	<text name="status_text_not_connected">
-		テレハブ未接続
-	</text>
-	<text name="help_text_connected">
-		「切断」をクリックして削除します。
-	</text>
-	<text name="help_text_not_connected">
-		物体を選択して「テレハブの接続」をクリックしてください。
-	</text>
-	<button label="テレハブの接続" name="connect_btn"/>
-	<button label="切断" name="disconnect_btn"/>
-	<text name="spawn_points_text">
-		出現地点（物体ではなく位置）
-	</text>
-	<button label="出現位置を追加" name="add_spawn_point_btn"/>
-	<button label="出現地点を削除" name="remove_spawn_point_btn"/>
-	<text name="spawn_point_help">
-		オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。そうするとそのオブジェクトを移動させたり削除できます。位置はテレハブセンターに関連します。リストのアイテムを選択してインワールドでハイライトさせます。
-	</text>
-</floater>
+  <text name="status_text_connected">物体[OBJECT]に接続されたテレハブ</text>
+  <text name="status_text_not_connected">テレハブ未接続</text>
+  <text name="help_text_connected">「切断」をクリックして削除します。</text>
+  <text name="help_text_not_connected">物体を選択して「テレハブの接続」をクリックしてください。</text>
+  <button label="テレハブの接続" name="connect_btn" />
+  <button label="切断" name="disconnect_btn" />
+  <text name="spawn_points_text">出現地点（物体ではなく位置）</text>
+  <button label="出現位置を追加" name="add_spawn_point_btn" />
+  <button label="出現地点を削除" name="remove_spawn_point_btn" />
+  <text name="spawn_point_help">オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。そうするとそのオブジェクトを移動させたり削除できます。
+位置はテレハブセンターに関連します。リストのアイテムを選択してインワールドでハイライトさせます。</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_button.xml b/indra/newview/skins/default/xui/ja/floater_test_button.xml
new file mode 100644
index 0000000000..39579f0477
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_button.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_button">
+  <button label="汎用ボタン" name="generic_button" />
+  <button name="bottom_delta_button" />
+  <button name="sans_serif_small_button" />
+  <button label="自動リサイズ" name="auto_resize_button" />
+  <button label="クリックでラベル変更" label_selected="新しいラベル" name="label_selected_button" />
+  <button label="ラベルに影をつけない" name="label_shadow_button" />
+  <button label="強調色のラベル" name="label_color_button" />
+  <button label="トグル" label_selected="トグル入" name="label_color_selected_button" />
+  <button label="無効" label_selected="選択済み" name="label_color_disabled_button" />
+  <button label="ハイライト" name="highlight_color_button" />
+  <button label="ホーバーでグローさせない" name="hover_glow_amount_button" />
+  <button name="image_button" />
+  <button name="image_color_button" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml b/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
new file mode 100644
index 0000000000..856f3b3748
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_checkbox">
+  <check_box label="おおっ！これはチェックボックスのようだ！" name="show_location_checkbox" />
+  <check_box label="最小のチェックボックス" name="minimal_checkbox" />
+  <check_box label="無効状態のチェックボックス" name="disabled_checkbox" />
+  <check_box label="有効時の文字色" name="text_enabled_color_checkbox" />
+  <check_box label="無効時の文字色" name="text_disabled_color_checkbox" />
+  <check_box label="チェックボックスの初期値" name="initial_value_checkbox" />
+  <check_box label="等幅フォント" name="font_checkbox" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_combobox.xml b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml
new file mode 100644
index 0000000000..fe6ff97098
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_combobox">
+  <text type="string" length="1" height="16" layout="topleft" left="10" top="24" width="200">現実の使い道（ログイン場所）：</text>
+  <combo_box name="start_location_combo">
+    <combo_box.item label="最後に訪れた場所" name="MyLastLocation" value="last" />
+    <combo_box.item label="自分の家" name="MyHome" value="home" />
+    <combo_box.item label="＜リージョン（地域）名を入力＞" name="Typeregionname" value="" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">最小のコンボボックス：</text>
+  <combo_box name="minimal_combo">
+    <combo_box.item label="最初" name="item1" value="first" />
+    <combo_box.item label="２つ目" name="item2" value="second" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">テキスト入力を許可：</text>
+  <combo_box name="text_entry_combo">
+    <combo_box.item label="最初の項目" name="item1" value="first" />
+    <combo_box.item label="２つ目の項目" name="item2" value="second" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">テキスト入力を許可。デフォルトは２つ目の項目：</text>
+  <combo_box name="text_entry_combo2">
+    <combo_box.item label="最初の項目" name="item1" value="first" />
+    <combo_box.item label="２つ目の項目" name="item2" value="second" />
+  </combo_box>
+  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">２文字まで入力可能：</text>
+  <combo_box name="state_combo">
+    <combo_box.item label="CA" name="item1" value="ca" />
+    <combo_box.item label="NY" name="item2" value="ny" />
+    <combo_box.item label="TX" name="item3" value="tx" />
+  </combo_box>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml b/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
new file mode 100644
index 0000000000..c3c1de2a2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_inspectors" title="インスペクタのテスト">
+  <text name="test_inspectors">クリックしてインスペクターを生成します：</text>
+  <button name="avatar_2d_btn1" label="2Dアバター" />
+  <!-- InspectorA Tester -->
+  <button name="avatar_2d_btn5" label="2Dアバター" />
+  <!-- InspectorB Tester -->
+  <button name="avatar_2d_btn2" label="2Dアバター" />
+  <!-- InspectorC Tester -->
+  <button name="avatar_2d_btn3" label=" 2Dアバター" />
+  <!-- jarvtest Bombastic 2009-10-3 -->
+  <button name="avatar_2d_btn4" label="2Dアバター" />
+  <button name="avatar_3d_btn" label="3Dアバター" />
+  <button name="object_2d_btn" label="2Dオブジェクト" />
+  <button name="object_3d_btn" label="3Dオブジェクト" />
+  <button name="group_btn" label="グループ" />
+  <button name="place_btn" label="場所" />
+  <button name="event_btn" label="イベント" />
+  <text name="slurl">secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect</text>
+  <text name="slurl_group">secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
index 31b5bbd3bf..26c78fe384 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Test Floater" title="レイアウトスタックテスト"/>
+<floater name="Test Floater" title="レイアウトスタックテスト" />
diff --git a/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml b/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
new file mode 100644
index 0000000000..32204b6e88
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_test_line_editor">
+  <line_editor name="enabled_line_editor" tool_tip="有効なラインエディタ">ラインエディタを有効化</line_editor>
+  <line_editor name="ascii_line_editor" prevalidate_callback="ascii" tool_tip="asciiラインエディタ">ASCIIのみのラインエディタ</line_editor>
+  <line_editor name="disabled_line_editor" tool_tip="無効なラインエディタ">ラインエディタを無効化</line_editor>
+  <line_editor name="enabled_colored_line_editor" tool_tip="有効な色付けされたラインエディタ">赤文字ラインエディタを有効化</line_editor>
+  <line_editor name="disabled_colored_line_editor" tool_tip="無効な色付けされたラインエディタ">赤文字ラインエディタを無効化</line_editor>
+  <line_editor name="left_pad_editor">左に25pxの余白</line_editor>
+  <line_editor name="left_pad_editor">右に75pxの余白</line_editor>
+  <line_editor name="left_pad_editor">左に25px、右に75pxの余白</line_editor>
+  <!-- "search_editor" is a specialized line_editor that shows read-only
+help text until the user clicks in the widget. -->
+  <search_editor label="検索語句を入力" name="search editor" tool_tip="エディタを検索" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
new file mode 100644
index 0000000000..f9c3275e7f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_radiogroup">
+  <radio_group name="parcel_voice_channel">
+    <radio_item label="不動産空間チャネルを使用" name="Estate" />
+    <radio_item label="プライベート空間チャネルを使用" name="Private" />
+    <radio_item label="この区画の空間でのボイスチャットを無効化" name="Disabled" />
+  </radio_group>
+  <radio_group name="simple_radio_group">
+    <radio_item label="label属性のラベル" name="label_radio_item" />
+    <radio_item label="テキストコンテンツのラベル" name="contents_radio_item" />
+  </radio_group>
+  <radio_group name="no_border_radio_group">
+    <radio_item label="Fooにはボーダーがありません" name="foo_radio_item" />
+    <radio_item label="ボーダーのバー無し" name="bar_item" />
+  </radio_group>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_slider.xml b/indra/newview/skins/default/xui/ja/floater_test_slider.xml
new file mode 100644
index 0000000000..5b02d51b14
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_slider.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_slider">
+  <slider label="Generic Slider" name="generic_slider" />
+  <slider label="コールバックスライダー" name="callback_slider" />
+  <slider label="値スライダー" max_val="5" min_val="1" name="value_slider" />
+  <slider label="ミニスライダー１" name="mini_slider_1" />
+  <slider label="ミニスライダー２" name="mini_slider_2" />
+  <slider_ name="slider_bar_vertical" />
+  <slider_bar label="スライダーバー" name="slider_bar" />
+  <slider label="赤スライダー" name="red_slider" />
+  <slider label="赤い垂直スライダー" name="red_slider_vertical" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_spinner.xml b/indra/newview/skins/default/xui/ja/floater_test_spinner.xml
new file mode 100644
index 0000000000..2b3ce66c7a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_spinner.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_test_spinner">
+  <spinner label="汎用スピナー" name="generic_spinner" />
+  <spinner label="コールバックスピナー" name="callback_spinner" />
+  <spinner label="カラフルなスピナー" name="colorful_spinner" />
+  <spinner label="値スピナー" name="value_spinner" />
+  <spinner label="ミニスピナー１" name="mini_spinner_1" />
+  <spinner label="ミニスピナー２" name="mini_spinner_2" />
+  <spinner label="操作スピナー" name="control_spinner" />
+  <spinner label="左に続く" name="follows_left" />
+  <spinner label="右に続く" name="follows_right" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml b/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
new file mode 100644
index 0000000000..36c59bfc2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_test_text_editor">
+  <text_editor name="test_text_editor" tool_tip="テキストエディタ">テキストエディタ</text_editor>
+  <text_editor name="test_text_editor" tool_tip="テキストエディタ">これには長いテキストが含まれており、右に水平にスクロールする必要があります。</text_editor>
+  <text_editor name="numeric_text_editor" tool_tip="数値のみ入力可能なテキストエディタ">これは数字ではないテキストなので、表示されるべきではありません。</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
index 40fd8e9f93..15feab05e8 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Test Floater" title="テスト用ウィンドウ"/>
+<floater name="Test Floater" title="テスト用ウィンドウ" />
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 1221702e9b..8f69c43a85 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -1,48 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="テクスチャの選択">
-	<floater.string name="choose_picture">
-		クリックして写真を選択
-	</floater.string>
-	<floater.string name="pick title">
-		ピック:
-	</floater.string>
-	<text name="Multiple">
-		複数のテクスチャ
-	</text>
-	<combo_box name="mode_selection">
-		<combo_box.item label="インベントリ" name="inventory" value="0"/>
-		<combo_box.item label="ローカル" name="local" value="1"/>
-	</combo_box>
-	<button label="デフォルト" label_selected="デフォルト" name="Default"/>
-	<button label="ブランク" label_selected="ブランク" name="Blank"/>
-	<button label="なし" label_selected="なし" name="None"/>
-	<button label="" label_selected="" name="Pipette"/>
-	<text name="preview_disabled" value="プレビュー無効"/>
-	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
-	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
-	<button label="追加" label_selected="追加" name="l_add_btn"/>
-	<button label="削除" label_selected="削除" name="l_rem_btn"/>
-	<button label="アップロード" label_selected="アップロード" name="l_upl_btn"/>
-	<scroll_list name="l_name_list">
-		<column label="名前" name="unit_name"/>
-		<column label="ID" name="unit_id_HIDDEN"/>
-	</scroll_list>
-	<combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/>
-		<combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/>
-		<combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/>
-		<combo_box.item label="BAKED_EYES" name="BAKED_EYES"/>
-		<combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/>
-		<combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/>
-		<combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/>
-		<combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/>
-		<combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/>
-		<combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/>
-		<combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/>
-	</combo_box>
-	<check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
-</floater>
+  <floater.string name="choose_picture">クリックして画像を選択</floater.string>
+  <floater.string name="pick title">ピック：</floater.string>
+  <text name="Multiple">複数のテクスチャ</text>
+  <combo_box name="mode_selection">
+    <combo_box.item label="インベントリ" name="inventory" value="0" />
+    <combo_box.item label="ローカル" name="local" value="1" />
+  </combo_box>
+  <button label="デフォルト" label_selected="デフォルト" name="Default" />
+  <button label="ブランク" label_selected="ブランク" name="Blank" />
+  <button label="なし" label_selected="なし" name="None" />
+  <button label="" label_selected="" name="Pipette" />
+  <text name="preview_disabled" value="プレビュー無効" />
+  <filter_editor label="テクスチャをフィルタ" name="inventory search editor" />
+  <check_box initial_value="false" label="フォルダを表示" name="show_folders_check" />
+  <button label="追加" label_selected="追加" name="l_add_btn" />
+  <button label="削除" label_selected="削除" name="l_rem_btn" />
+  <button label="アップロード" label_selected="アップロード" name="l_upl_btn" />
+  <scroll_list name="l_name_list">
+    <column label="名前" name="unit_name" />
+    <column label="ＩＤ" name="unit_id_HIDDEN" />
+  </scroll_list>
+  <combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD" />
+    <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER" />
+    <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER" />
+    <combo_box.item label="BAKED_EYES" name="BAKED_EYES" />
+    <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT" />
+    <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR" />
+    <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM" />
+    <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG" />
+    <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1" />
+    <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2" />
+    <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3" />
+  </combo_box>
+  <check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region" />
+  <button label="ＯＫ" label_selected="ＯＫ" name="Select" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+  <check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
index adc35137b5..8cc433f08c 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
@@ -1,77 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="TexFetchDebugger" title="テクスチャ取得デバッガ">
-	<text name="total_num_fetched_label">
-		1, 取得したテクスチャの合計数：[NUM]
-	</text>
-	<text name="total_num_fetching_requests_label">
-		2, 取得リクエストの合計数：[NUM]
-	</text>
-	<text name="total_num_cache_hits_label">
-		3, キャッシュヒットの合計数：[NUM]
-	</text>
-	<text name="total_num_visible_tex_label">
-		4, 表示テクスチャの合計数：[NUM]
-	</text>
-	<text name="total_num_visible_tex_fetch_req_label">
-		5, 表示テクスチャ取得リクエストの合計数：[NUM]
-	</text>
-	<text name="total_fetched_data_label">
-		6, 取得したデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_fetched_vis_data_label">
-		7, 表示データの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB
-	</text>
-	<text name="total_fetched_rendered_data_label">
-		8, レンダリングされたデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_cache_read_label">
-		9, キャッシュ読み取りの合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_cache_write_label">
-		10, キャッシュ書き込みの合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_decode_label">
-		11, デコードの合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_gl_label">
-		12, glテクスチャ作成の合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_http_label">
-		13, HTTP 取得の合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_fetch_label">
-		14, 取得全体の合計時間：[TIME] 秒
-	</text>
-	<text name="total_time_refetch_vis_cache_label">
-		15, キャッシュから表示テクスチャを再取得、時間：[TIME] 秒、取得：[SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_refetch_all_cache_label">
-		16、キャッシュからすべてのテクスチャを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_refetch_vis_http_label">
-		17、HTTP から可視ファイルを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<text name="total_time_refetch_all_http_label">
-		18、HTTP からすべてのテクスチャを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
-	</text>
-	<spinner label="19、テセル/ピクセル比:" name="texel_pixel_ratio"/>
-	<text name="texture_source_label">
-		20、テクスチャ ソース:
-	</text>
-	<radio_group name="texture_source">
-		<radio_item label="キャッシュ + HTTP" name="0"/>
-		<radio_item label="HTTP のみ" name="1"/>
-	</radio_group>
-	<button label="開始" name="start_btn"/>
-	<button label="リセット" name="clear_btn"/>
-	<button label="閉じる" name="close_btn"/>
-	<button label="キャッシュ読み取り" name="cacheread_btn"/>
-	<button label="キャッシュ書き込み" name="cachewrite_btn"/>
-	<button label="HTTP" name="http_btn"/>
-	<button label="デコード" name="decode_btn"/>
-	<button label="GL テクスチャ" name="gl_btn"/>
-	<button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/>
-	<button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn"/>
-	<button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/>
-	<button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn"/>
-</floater>
+  <text name="total_num_fetched_label">１，取得したテクスチャの合計数：[NUM]</text>
+  <text name="total_num_fetching_requests_label">２，取得リクエストの合計数：[NUM]</text>
+  <text name="total_num_cache_hits_label">３，キャッシュヒットの合計数：[NUM]</text>
+  <text name="total_num_visible_tex_label">４，表示テクスチャの合計数：[NUM]</text>
+  <text name="total_num_visible_tex_fetch_req_label">５，表示テクスチャ取得リクエストの合計数：[NUM]</text>
+  <text name="total_fetched_data_label">６，取得したデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_fetched_vis_data_label">７，表示データの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅</text>
+  <text name="total_fetched_rendered_data_label">８，レンダリングされたデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_cache_read_label">９，キャッシュ読み取りの合計時間：[TIME]秒</text>
+  <text name="total_time_cache_write_label">１０，キャッシュ書き込みの合計時間：[TIME]秒</text>
+  <text name="total_time_decode_label">１１，デコードの合計時間：[TIME]秒</text>
+  <text name="total_time_gl_label">１２，glテクスチャ作成の合計時間：[TIME]秒</text>
+  <text name="total_time_http_label">１３，HTTP取得の合計時間：[TIME]秒</text>
+  <text name="total_time_fetch_label">１４，取得全体の合計時間：[TIME]秒</text>
+  <text name="total_time_refetch_vis_cache_label">１５，キャッシュから表示テクスチャを再取得、時間：[TIME]秒、取得：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_refetch_all_cache_label">１６，キャッシュからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_refetch_vis_http_label">１７，HTTPから可視ファイルを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <text name="total_time_refetch_all_http_label">１８，HTTPからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
+  <spinner label="19、テセル／ピクセル比：" name="texel_pixel_ratio" />
+  <text name="texture_source_label">20、テクスチャ ソース：</text>
+  <radio_group name="texture_source">
+    <radio_item label="キャッシュ + HTTP" name="0" />
+    <radio_item label="HTTP のみ" name="1" />
+  </radio_group>
+  <button label="開始" name="start_btn" />
+  <button label="リセット" name="clear_btn" />
+  <button label="閉じる" name="close_btn" />
+  <button label="キャッシュ読み取り" name="cacheread_btn" />
+  <button label="キャッシュ書き込み" name="cachewrite_btn" />
+  <button label="HTTP" name="http_btn" />
+  <button label="デコード" name="decode_btn" />
+  <button label="GLテクスチャ" name="gl_btn" />
+  <button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn" />
+  <button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn" />
+  <button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn" />
+  <button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 13f766698e..92cbdf9382 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -1,447 +1,283 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" short_title="制作ツール" title="">
-	<floater.string name="grid_screen_text">
-		画面
-	</floater.string>
-	<floater.string name="grid_local_text">
-		ローカル
-	</floater.string>
-	<floater.string name="grid_world_text">
-		世界
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		リファレンス
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		アタッチメント
-	</floater.string>
-	<floater.string name="status_rotate">
-		色の付いたバンドをドラッグしてオブジェクトを回転
-	</floater.string>
-	<floater.string name="status_scale">
-		選択した側をクリックし、ドラッグで引き伸ばす
-	</floater.string>
-	<floater.string name="status_move">
-		移動：ドラッグ、コピー：Shift + ドラッグ
-	</floater.string>
-	<floater.string name="status_modifyland">
-		土地をクリックし、ボタンを押したまま入力して修正変更
-	</floater.string>
-	<floater.string name="status_camera">
-		クリック + ドラッグで視界移動
-	</floater.string>
-	<floater.string name="status_grab">
-		ドラッグで移動、Ctrlで持ち上げ、Ctrl + Shiftで回転
-	</floater.string>
-	<floater.string name="status_place">
-		インワールドでクリックして作成
-	</floater.string>
-	<floater.string name="status_selectland">
-		土地をクリックし、ドラッグして選択
-	</floater.string>
-	<floater.string name="status_selectcount">
-		選択されているオブジェクトは [OBJ_COUNT] 個、土地の負荷は [LAND_IMPACT] [secondlife:///app/openfloater/object_weights 詳細]
-	</floater.string>
-	<floater.string name="status_remaining_capacity">
-		残りの許容数 [LAND_CAPACITY]。
-	</floater.string>
-	<button label="" label_selected="" name="button focus" tool_tip="フォーカス"/>
-	<button label="" label_selected="" name="button move" tool_tip="動かす"/>
-	<button label="" label_selected="" name="button edit" tool_tip="編集"/>
-	<button label="" label_selected="" name="button create" tool_tip="作成"/>
-	<button label="" label_selected="" name="button land" tool_tip="土地"/>
-	<text name="text status">
-		移動するにはドラッグ、コピーするにはShiftキーを押しながらドラッグ
-	</text>
-	<radio_group name="focus_radio_group">
-		<radio_item label="ズーム" name="radio zoom"/>
-		<radio_item label="旋回（Ctrl）" name="radio orbit"/>
-		<radio_item label="水平・垂直移動 (Ctrl + Shift)" name="radio pan"/>
-	</radio_group>
-	<radio_group name="move_radio_group">
-		<radio_item label="移動" name="radio move"/>
-		<radio_item label="持ち上げる（Ctrl）" name="radio lift"/>
-		<radio_item label="回転 (Ctrl + Shift)" name="radio spin"/>
-	</radio_group>
-	<radio_group name="edit_radio_group">
-		<radio_item label="移動" name="radio position"/>
-		<radio_item label="回転（Ctrl）" name="radio rotate"/>
-		<radio_item label="引き延ばす (Ctrl+Shift)" name="radio stretch"/>
-		<radio_item label="面を選択" name="radio select face"/>
-	</radio_group>
-	<check_box label="リンク部分を編集" name="checkbox edit linked parts"/>
-	<button label="リンク" name="link_btn"/>
-	<button label="リンクを外す" name="unlink_btn"/>
-	<check_box label="両側を引き伸ばす" name="checkbox uniform"/>
-	<check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="スナップ" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
-		<combo_box.item label="世界" name="World"/>
-		<combo_box.item label="ローカル" name="Local"/>
-		<combo_box.item label="リファレンス" name="Reference"/>
-	</combo_box>
-	<button label="" label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/>
-	<button label="" label_selected="" name="ToolCube" tool_tip="キューブ"/>
-	<button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/>
-	<button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/>
-	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="4面体"/>
-	<button label="" label_selected="" name="ToolCylinder" tool_tip="シリンダー"/>
-	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="半円柱"/>
-	<button label="" label_selected="" name="ToolCone" tool_tip="円錐"/>
-	<button label="" label_selected="" name="ToolHemiCone" tool_tip="半円錐"/>
-	<button label="" label_selected="" name="ToolSphere" tool_tip="球体"/>
-	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="半球"/>
-	<button label="" label_selected="" name="ToolTorus" tool_tip="トーラス"/>
-	<button label="" label_selected="" name="ToolTube" tool_tip="チューブ"/>
-	<button label="" label_selected="" name="ToolRing" tool_tip="リング"/>
-	<button label="" label_selected="" name="ToolTree" tool_tip="樹木"/>
-	<button label="" label_selected="" name="ToolGrass" tool_tip="草地"/>
-	<check_box label="選択したツールを維持" name="checkbox sticky"/>
-	<check_box label="選択したものをコピー" name="checkbox copy selection"/>
-	<check_box initial_value="true" label="中央に位置" name="checkbox copy centers"/>
-	<check_box label="回転" name="checkbox copy rotates"/>
-	<radio_group name="land_radio_group">
-		<radio_item label="土地を選択" name="radio select land"/>
-		<radio_item label="ならす" name="radio flatten"/>
-		<radio_item label="隆起" name="radio raise"/>
-		<radio_item label="低くする" name="radio lower"/>
-		<radio_item label="滑らかにする" name="radio smooth"/>
-		<radio_item label="凸凹にする" name="radio noise"/>
-		<radio_item label="元に戻す" name="radio revert"/>
-	</radio_group>
-	<text name="Bulldozer:">
-		ブルドーザー：
-	</text>
-	<text name="Dozer Size:">
-		サイズ
-	</text>
-	<text name="Strength:">
-		強度
-	</text>
-	<button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します"/>
-	<text name="selection_empty">
-		何も選択されていません。
-	</text>
-	<text name="remaining_capacity">
-		[CAPACITY_STRING] [secondlife:///app/openfloater/object_weights 詳細]
-	</text>
-	<tab_container name="Object Info Tabs">
-		<panel label="一般" name="General">
-			<panel.string name="text deed continued">
-				譲渡
-			</panel.string>
-			<panel.string name="text deed">
-				譲渡
-			</panel.string>
-			<panel.string name="text modify info 1">
-				このオブジェクトを修正できます
-			</panel.string>
-			<panel.string name="text modify info 2">
-				これらのオブジェクトを修正できます
-			</panel.string>
-			<panel.string name="text modify info 3">
-				このオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify info 4">
-				これらのオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify info 5">
-				地域（リージョン）の境界を越えてこのオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify info 6">
-				地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
-			</panel.string>
-			<panel.string name="text modify warning">
-				オブジェクト全体を選択して権限の設定を行ってください。
-			</panel.string>
-			<panel.string name="Cost Default">
-				価格： L$
-			</panel.string>
-			<panel.string name="Cost Total">
-				合計： L$
-			</panel.string>
-			<panel.string name="Cost Per Unit">
-				単価： L$
-			</panel.string>
-			<panel.string name="Cost Mixed">
-				混合価格
-			</panel.string>
-			<panel.string name="Sale Mixed">
-				混合販売
-			</panel.string>
-			<text name="Name:">
-				名前：
-			</text>
-			<line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大 63 文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
-			<text name="Description:">
-				説明：
-			</text>
-			<line_editor name="Object Description" tool_tip="ビューワの設定で [すべてのオブジェクト上でヒントを表示] が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
-			<text name="Creator:">
-				制作者：
-			</text>
-			<text name="Creator Name">
-				Mrs. Esbee Linden (esbee.linden)
-			</text>
-			<text name="Owner:">
-				所有者：
-			</text>
-			<text name="Owner Name">
-				Mrs. Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
-			<text name="Group:">
-				グループ：
-			</text>
-			<name_box initial_value="ローディング..." name="Group Name Proxy"/>
-			<button label="設定..." label_selected="設定..." name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します"/>
-			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません"/>
-			<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます"/>
-			<text name="label click action">
-				クリックで：
-			</text>
-			<combo_box name="clickaction" tool_tip="マウスを 1 回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。たとえば、[タッチ] や [支払い] にはスクリプトが必要になるなどです">
-				<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
-				<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
-				<combo_box.item label="オブジェクトを購入する" name="Buyobject"/>
-				<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
-				<combo_box.item label="開く" name="Open"/>
-				<combo_box.item label="ズームする" name="Zoom"/>
-				<combo_box.item label="なし" name="None"/>
-			</combo_box>
-			<check_box label="販売対象：" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
-			<spinner label="L$" name="Edit Cost" tool_tip="オブジェクトの価格。"/>
-			<combo_box name="sale type" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
-				<combo_box.item label="コピー" name="Copy"/>
-				<combo_box.item label="中身" name="Contents"/>
-				<combo_box.item label="オリジナル" name="Original"/>
-			</combo_box>
-			<check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します"/>
-			<panel name="perms_build">
-				<text name="perm_modify">
-					あなたはこのオブジェクトを修正できます
-				</text>
-				<text name="Anyone can:">
-					全員：
-				</text>
-				<check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。"/>
-				<check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
-				<text name="Next owner can:">
-					次の所有者：
-				</text>
-				<check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-				<check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-				<check_box label="再販・プレゼント" name="checkbox next owner can transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
-				<text name="B:">
-					B:
-				</text>
-				<text name="O:">
-					O:
-				</text>
-				<text name="G:">
-					G:
-				</text>
-				<text name="E:">
-					E:
-				</text>
-				<text name="N:">
-					N：
-				</text>
-				<text name="F:">
-					F：
-				</text>
-			</panel>
-			<panel name="pathfinding_attrs_panel">
-				<text name="pathfinding_attributes_label">
-					パスファインディング属性:
-				</text>
-			</panel>
-		</panel>
-		<panel label="形状" name="Object">
-			<check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。 この機能を使うと、制作中の意図せぬ編集を防ぐことができます"/>
-			<check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にします"/>
-			<check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後 1 分でオブジェクトは削除されます"/>
-			<check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突またはオブジェクトとアバターの衝突を回避します"/>
-			<text name="label position">
-				位置（メートル）
-			</text>
-			<spinner label="X" name="Pos X"/>
-			<spinner label="Y" name="Pos Y"/>
-			<spinner label="Z" name="Pos Z"/>
-			<text name="label size">
-				サイズ（メートル）
-			</text>
-			<spinner label="X" name="Scale X"/>
-			<spinner label="Y" name="Scale Y"/>
-			<spinner label="Z" name="Scale Z"/>
-			<text name="label rotation">
-				回転（度）
-			</text>
-			<spinner label="X" name="Rot X"/>
-			<spinner label="Y" name="Rot Y"/>
-			<spinner label="Z" name="Rot Z"/>
-			<combo_box name="comboBaseType">
-				<combo_box.item label="ボックス" name="Box"/>
-				<combo_box.item label="シリンダー" name="Cylinder"/>
-				<combo_box.item label="プリズム" name="Prism"/>
-				<combo_box.item label="球体" name="Sphere"/>
-				<combo_box.item label="トーラス" name="Torus"/>
-				<combo_box.item label="チューブ" name="Tube"/>
-				<combo_box.item label="リング" name="Ring"/>
-				<combo_box.item label="スカルプト" name="Sculpted"/>
-			</combo_box>
-			<text name="text cut">
-				パスカット（始点と終点）
-			</text>
-			<spinner label="B" name="cut begin"/>
-			<spinner label="E" name="cut end"/>
-			<text name="text hollow">
-				中空（空洞）
-			</text>
-			<text name="text skew">
-				傾斜
-			</text>
-			<text name="Hollow Shape">
-				中空（空洞）の形
-			</text>
-			<combo_box name="hole">
-				<combo_box.item label="デフォルト" name="Default"/>
-				<combo_box.item label="サークル" name="Circle"/>
-				<combo_box.item label="正方形" name="Square"/>
-				<combo_box.item label="三角形" name="Triangle"/>
-			</combo_box>
-			<text name="text twist">
-				ひねり（始点と終点）
-			</text>
-			<spinner label="B" name="Twist Begin"/>
-			<spinner label="E" name="Twist End"/>
-			<text name="scale_taper">
-				テーパー
-			</text>
-			<text name="scale_hole">
-				穴寸法
-			</text>
-			<spinner label="X" name="Taper Scale X"/>
-			<spinner label="Y" name="Taper Scale Y"/>
-			<text name="text topshear">
-				上部層
-			</text>
-			<spinner label="X" name="Shear X"/>
-			<spinner label="Y" name="Shear Y"/>
-			<text name="advanced_cut">
-				プロフィールカット（始点と終点）
-			</text>
-			<text name="advanced_dimple">
-				くぼみ（始点と終点）
-			</text>
-			<text name="advanced_slice">
-				切り取り（始点と終点）
-			</text>
-			<spinner label="B" name="Path Limit Begin"/>
-			<spinner label="E" name="Path Limit End"/>
-			<text name="text taper2">
-				テーパー
-			</text>
-			<spinner label="X" name="Taper X"/>
-			<spinner label="Y" name="Taper Y"/>
-			<text name="text radius delta">
-				半径
-			</text>
-			<text name="text revolutions">
-				回転体
-			</text>
-			<texture_picker label="スカルプトテクスチャ" name="sculpt texture control" tool_tip="クリックして写真を選択してください"/>
-			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムを X 軸上で反転させます"/>
-			<check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返します"/>
-			<text name="label sculpt type">
-				縫い目のタイプ
-			</text>
-			<combo_box name="sculpt type control">
-				<combo_box.item label="球体" name="Sphere"/>
-				<combo_box.item label="トーラス" name="Torus"/>
-				<combo_box.item label="平面" name="Plane"/>
-				<combo_box.item label="シリンダー" name="Cylinder"/>
-			</combo_box>
-		</panel>
-		<panel label="特徴" name="Features">
-			<panel.string name="None">
-				なし
-			</panel.string>
-			<panel.string name="Prim">
-				プリム
-			</panel.string>
-			<panel.string name="Convex Hull">
-				凸状の外殻構造
-			</panel.string>
-			<text name="select_single">
-				プリムを 1 つだけ選択して編集してください
-			</text>
-			<text name="edit_object">
-				オブジェクトの特徴を編集：
-			</text>
-			<check_box label="アニメーションメッシュ" name="Animated Mesh Checkbox Ctrl" tool_tip="リグ入りメッシュオブジェクトをそれぞれアニメーションさせることができるようになります"/>
-			<check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にします（クライアント側のみ）"/>
-			<spinner label="柔軟性" name="FlexNumSections"/>
-			<spinner label="重力" name="FlexGravity"/>
-			<spinner label="ドラッグ" name="FlexFriction"/>
-			<spinner label="風" name="FlexWind"/>
-			<spinner label="緊張" name="FlexTension"/>
-			<spinner label="X 軸方向の力" name="FlexForceX"/>
-			<spinner label="Y 軸方向の力" name="FlexForceY"/>
-			<spinner label="Z 軸方向の力" name="FlexForceZ"/>
-			<check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します"/>
-			<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）"/>
-			<spinner label="輝度" name="Light Intensity"/>
-			<spinner label="FOV" name="Light FOV"/>
-			<spinner label="半径" name="Light Radius"/>
-			<spinner label="焦点" name="Light Focus"/>
-			<spinner label="弱まる" name="Light Falloff"/>
-			<spinner label="環境" name="Light Ambiance"/>
-			<text name="label physicsshapetype">
-				実像の種類：
-			</text>
-			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="実像の種類を選択"/>
-			<combo_box name="material">
-				<combo_box.item label="石" name="Stone"/>
-				<combo_box.item label="金属" name="Metal"/>
-				<combo_box.item label="ガラス" name="Glass"/>
-				<combo_box.item label="木" name="Wood"/>
-				<combo_box.item label="肌" name="Flesh"/>
-				<combo_box.item label="プラスチック" name="Plastic"/>
-				<combo_box.item label="ゴム" name="Rubber"/>
-			</combo_box>
-			<spinner label="重力" name="Physics Gravity"/>
-			<spinner label="摩擦" name="Physics Friction"/>
-			<spinner label="密度（100 kg/m^3）" name="Physics Density"/>
-			<spinner label="復元" name="Physics Restitution"/>
-		</panel>
-		<panel label="材質" name="Texture"/>
-		<panel label="中身" name="Contents">
-			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script"/>
-			<button label="権限" name="button permissions"/>
-		</panel>
-	</tab_container>
-	<panel name="land info panel">
-		<text name="label_parcel_info">
-			区画情報
-		</text>
-		<text name="label_area_price">
-			価格： [AREA] 平方メートル L$ [PRICE]
-		</text>
-		<text name="label_area">
-			面積： [AREA] 平方メートル
-		</text>
-		<button label="土地情報" label_selected="土地情報" name="button about land"/>
-		<check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけます：   緑 = あなたの土地  アクア = あなたのグループ所有地  赤 = 他人が所有する土地  黄色 = 売り出し中  紫 = オークション  グレー = パブリック"/>
-		<text name="label_parcel_modify">
-			区画の編集
-		</text>
-		<button label="再分割" label_selected="再分割" name="button subdivide land"/>
-		<button label="統合" label_selected="統合" name="button join land"/>
-		<text name="label_parcel_trans">
-			土地取引
-		</text>
-		<button label="土地の購入" label_selected="土地の購入" name="button buy land"/>
-		<button label="土地の放棄" label_selected="土地の放棄" name="button abandon land"/>
-	</panel>
-</floater>
+<floater name="toolbox floater" short_title="制作" title="制作ツール">
+  <floater.string name="grid_screen_text">画面</floater.string>
+  <floater.string name="grid_local_text">ローカル</floater.string>
+  <floater.string name="grid_world_text">ワールド</floater.string>
+  <floater.string name="grid_reference_text">リファレンス</floater.string>
+  <floater.string name="grid_attachment_text">装着物</floater.string>
+  <floater.string name="status_rotate">色の付いたバンドをドラッグしてオブジェクトを回転</floater.string>
+  <floater.string name="status_scale">選択した側をクリックし、ドラッグで引き伸ばす</floater.string>
+  <floater.string name="status_move">移動：ドラッグ、コピー：Shift＋ドラッグ</floater.string>
+  <floater.string name="status_modifyland">土地をクリックし、ボタンを押したまま入力して修正変更</floater.string>
+  <floater.string name="status_camera">クリック＋ドラッグで視界移動</floater.string>
+  <floater.string name="status_grab">ドラッグで移動、Ctrlで持ち上げ、Ctrl＋Shiftで回転</floater.string>
+  <floater.string name="status_place">インワールドでクリックして作成</floater.string>
+  <floater.string name="status_selectland">土地をクリックし、ドラッグして選択</floater.string>
+  <floater.string name="status_selectcount">選択されているオブジェクトは[OBJ_COUNT]個、土地の負荷は[LAND_IMPACT]　[secondlife:///app/openfloater/object_weights 詳細]</floater.string>
+  <floater.string name="status_remaining_capacity">残りの許容数[LAND_CAPACITY]</floater.string>
+  <button label="" label_selected="" name="button focus" tool_tip="フォーカス" />
+  <button label="" label_selected="" name="button move" tool_tip="動かす" />
+  <button label="" label_selected="" name="button edit" tool_tip="編集" />
+  <button label="" label_selected="" name="button create" tool_tip="作成" />
+  <button label="" label_selected="" name="button land" tool_tip="土地" />
+  <text name="text status">移動するにはドラッグ、コピーするにはShiftキーを押しながらドラッグ</text>
+  <radio_group name="focus_radio_group">
+    <radio_item label="ズーム" name="radio zoom" />
+    <radio_item label="旋回（Ctrl）" name="radio orbit" />
+    <radio_item label="水平・垂直移動 (Ctrl＋Shift)" name="radio pan" />
+  </radio_group>
+  <radio_group name="move_radio_group">
+    <radio_item label="移動" name="radio move" />
+    <radio_item label="持ち上げる（Ctrl）" name="radio lift" />
+    <radio_item label="回転 (Ctrl＋Shift)" name="radio spin" />
+  </radio_group>
+  <radio_group name="edit_radio_group">
+    <radio_item label="移動" name="radio position" />
+    <radio_item label="回転（Ctrl）" name="radio rotate" />
+    <radio_item label="引き延ばす (Ctrl＋Shift)" name="radio stretch" />
+    <radio_item label="面を選択" name="radio select face" />
+  </radio_group>
+  <check_box label="リンク部分を編集" name="checkbox edit linked parts" />
+  <button label="リンク" name="link_btn" />
+  <button label="リンクを外す" name="unlink_btn" />
+  <check_box label="両側を引き伸ばす" name="checkbox uniform" />
+  <check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures" />
+  <check_box initial_value="true" label="グリッドにスナップ" name="checkbox snap to grid" />
+  <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
+    <combo_box.item label="ワールド" name="World" />
+    <combo_box.item label="ローカル" name="Local" />
+    <combo_box.item label="リファレンス" name="Reference" />
+  </combo_box>
+  <button label="" label_selected="オプション…" name="Options..." tool_tip="グリッドオプションを表示します" />
+  <button label="" label_selected="" name="ToolCube" tool_tip="キューブ" />
+  <button label="" label_selected="" name="ToolPrism" tool_tip="プリズム" />
+  <button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド" />
+  <button label="" label_selected="" name="ToolTetrahedron" tool_tip="4面体" />
+  <button label="" label_selected="" name="ToolCylinder" tool_tip="シリンダー" />
+  <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="半円柱" />
+  <button label="" label_selected="" name="ToolCone" tool_tip="円錐" />
+  <button label="" label_selected="" name="ToolHemiCone" tool_tip="半円錐" />
+  <button label="" label_selected="" name="ToolSphere" tool_tip="球体" />
+  <button label="" label_selected="" name="ToolHemiSphere" tool_tip="半球" />
+  <button label="" label_selected="" name="ToolTorus" tool_tip="トーラス" />
+  <button label="" label_selected="" name="ToolTube" tool_tip="チューブ" />
+  <button label="" label_selected="" name="ToolRing" tool_tip="リング" />
+  <button label="" label_selected="" name="ToolTree" tool_tip="樹木" />
+  <button label="" label_selected="" name="ToolGrass" tool_tip="草地" />
+  <check_box label="選択したツールを維持" name="checkbox sticky" />
+  <check_box label="選択したものをコピー" name="checkbox copy selection" />
+  <check_box label="中央に位置" name="checkbox copy centers" />
+  <check_box label="回転" name="checkbox copy rotates" />
+  <radio_group name="land_radio_group">
+    <radio_item label="土地を選択" name="radio select land" />
+    <radio_item label="ならす" name="radio flatten" />
+    <radio_item label="隆起" name="radio raise" />
+    <radio_item label="低くする" name="radio lower" />
+    <radio_item label="滑らかにする" name="radio smooth" />
+    <radio_item label="凸凹にする" name="radio noise" />
+    <radio_item label="元に戻す" name="radio revert" />
+  </radio_group>
+  <text name="Bulldozer:">ブルドーザー：</text>
+  <text name="Dozer Size:">サイズ：</text>
+  <text name="Strength:">強度：</text>
+  <button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します" />
+  <text name="selection_empty">何も選択されていません。</text>
+  <text name="remaining_capacity">[CAPACITY_STRING]　[secondlife:///app/openfloater/object_weights 詳細]</text>
+  <tab_container name="Object Info Tabs">
+    <panel label="一般" name="General">
+      <panel.string name="text deed continued">譲渡</panel.string>
+      <panel.string name="text deed">譲渡</panel.string>
+      <panel.string name="text modify info 1">このオブジェクトは、修正することができます。</panel.string>
+      <panel.string name="text modify info 2">これらのオブジェクトは、修正することができます。</panel.string>
+      <panel.string name="text modify info 3">このオブジェクトは、修正することができません。</panel.string>
+      <panel.string name="text modify info 4">これらのオブジェクトは、修正することができません。</panel.string>
+      <panel.string name="text modify info 5">リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。</panel.string>
+      <panel.string name="text modify info 6">リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。</panel.string>
+      <panel.string name="text modify warning">オブジェクト全体を選択して、権限の設定を行ってください。</panel.string>
+      <panel.string name="Cost Default">価格：L$</panel.string>
+      <panel.string name="Cost Total">合計：L$</panel.string>
+      <panel.string name="Cost Per Unit">単価：L$</panel.string>
+      <panel.string name="Cost Mixed">総額</panel.string>
+      <panel.string name="Sale Mixed">販売価格</panel.string>
+      <text name="Name:">名前：</text>
+      <line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大６３文字までです。長いプリム名は短縮されます。名前に使用できる文字は、ASCII-7（非拡張）に含まれる印字可能な文字のみです（パイプ文字「|」は例外）。" />
+      <text name="Description:">説明：</text>
+      <line_editor name="Object Description" tool_tip="ビューアーの設定で「すべてのオブジェクト上でヒントを表示」が選択されている場合、オブジェクトにマウスのポインタをかざすと、そのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
+      <text name="Creator:">制作者：</text>
+      <text name="Creator Name">Mrs. Esbee Linden (esbee.linden)</text>
+      <text name="Owner:">所有者：</text>
+      <text name="Owner Name">Mrs. Erica "Moose" Linden (erica.linden)</text>
+      <text name="Group:">グループ：</text>
+      <name_box initial_value="読み込んでいます…" name="Group Name Proxy" />
+      <button label="設定…" label_selected="設定…" name="button set group" tool_tip="このオブジェクト権限を共有したいグループを選択します。" />
+      <check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員に、このオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません" />
+      <button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます" />
+      <text name="label click action">クリックで：</text>
+      <combo_box name="clickaction" tool_tip="マウスを１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリック・アクションによっては、動作要件が必要なものもあります。たとえば、「触る」や「お支払い」には、スクリプトが必要になるなどです">
+        <combo_box.item label="触る（デフォルト）" name="Touch/grab(default)" />
+        <combo_box.item label="オブジェクトに座る" name="Sitonobject" />
+        <combo_box.item label="オブジェクトを購入する" name="Buyobject" />
+        <combo_box.item label="オブジェクトに支払う" name="Payobject" />
+        <combo_box.item label="開く" name="Open" />
+        <combo_box.item label="ズームする" name="Zoom" />
+        <combo_box.item label="なし" name="None" />
+      </combo_box>
+      <check_box label="販売対象：" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
+      <spinner label="L$" name="Edit Cost" tool_tip="オブジェクトの価格" />
+      <combo_box name="sale type" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
+        <combo_box.item label="コピー" name="Copy" />
+        <combo_box.item label="中身" name="Contents" />
+        <combo_box.item label="オブジェクトそのもの" name="Original" />
+      </combo_box>
+      <check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します。" />
+      <panel name="perms_build">
+        <text name="perm_modify">あなたは、このオブジェクトを修正することができます。</text>
+        <text name="Anyone can:">全員：</text>
+        <check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。" />
+        <check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
+        <text name="Next owner can:">譲渡先の所有者：</text>
+        <check_box label="修正" name="checkbox next owner can modify" tool_tip="譲渡先の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+        <check_box label="コピー" name="checkbox next owner can copy" tool_tip="譲渡先の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制約があります。" />
+        <check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="譲渡先の所有者は、このオブジェクトを他人に譲渡したり再販することができます。" />
+        <text name="B:">Ｂ：</text>
+        <text name="O:">Ｃ：</text>
+        <text name="G:">Ｇ：</text>
+        <text name="E:">Ｅ：</text>
+        <text name="N:">Ｎ：</text>
+        <text name="F:">Ｆ：</text>
+      </panel>
+      <panel name="pathfinding_attrs_panel">
+        <text name="pathfinding_attributes_label">経路探索属性：</text>
+      </panel>
+    </panel>
+    <panel label="形状" name="Object">
+      <check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。この機能を使うと、制作中の意図せぬ編集を防ぐことができます。" />
+      <check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にします。" />
+      <check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後１分でオブジェクトは削除されます。" />
+      <check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突、またはオブジェクトとアバターの衝突を回避します。" />
+      <text name="label position">位置（メートル）</text>
+      <spinner label="Ｘ" name="Pos X" />
+      <spinner label="Ｙ" name="Pos Y" />
+      <spinner label="Ｚ" name="Pos Z" />
+      <text name="label size">サイズ（メートル）</text>
+      <spinner label="Ｘ" name="Scale X" />
+      <spinner label="Ｙ" name="Scale Y" />
+      <spinner label="Ｚ" name="Scale Z" />
+      <text name="label rotation">回転（度）</text>
+      <spinner label="Ｘ" name="Rot X" />
+      <spinner label="Ｙ" name="Rot Y" />
+      <spinner label="Ｚ" name="Rot Z" />
+      <combo_box name="comboBaseType">
+        <combo_box.item label="ボックス" name="Box" />
+        <combo_box.item label="シリンダー" name="Cylinder" />
+        <combo_box.item label="プリズム" name="Prism" />
+        <combo_box.item label="球体" name="Sphere" />
+        <combo_box.item label="トーラス" name="Torus" />
+        <combo_box.item label="チューブ" name="Tube" />
+        <combo_box.item label="リング" name="Ring" />
+        <combo_box.item label="スカルプト" name="Sculpted" />
+      </combo_box>
+      <text name="text cut">パスカット（始点と終点）</text>
+      <spinner label="始" name="cut begin" />
+      <spinner label="終" name="cut end" />
+      <text name="text hollow">中空（空洞）</text>
+      <text name="text skew">傾斜</text>
+      <text name="Hollow Shape">中空（空洞）の形</text>
+      <combo_box name="hole">
+        <combo_box.item label="デフォルト" name="Default" />
+        <combo_box.item label="サークル" name="Circle" />
+        <combo_box.item label="正方形" name="Square" />
+        <combo_box.item label="三角形" name="Triangle" />
+      </combo_box>
+      <text name="text twist">ひねり（始点と終点）</text>
+      <spinner label="始" name="Twist Begin" />
+      <spinner label="終" name="Twist End" />
+      <text name="scale_taper">テーパー</text>
+      <text name="scale_hole">穴寸法</text>
+      <spinner label="Ｘ" name="Taper Scale X" />
+      <spinner label="Ｙ" name="Taper Scale Y" />
+      <text name="text topshear">上部層</text>
+      <spinner label="Ｘ" name="Shear X" />
+      <spinner label="Ｙ" name="Shear Y" />
+      <text name="advanced_cut">プロフィールカット（始点と終点）</text>
+      <text name="advanced_dimple">くぼみ（始点と終点）</text>
+      <text name="advanced_slice">切り取り（始点と終点）</text>
+      <spinner label="始" name="Path Limit Begin" />
+      <spinner label="終" name="Path Limit End" />
+      <text name="text taper2">テーパー</text>
+      <spinner label="Ｘ" name="Taper X" />
+      <spinner label="Ｙ" name="Taper Y" />
+      <text name="text radius delta">半径</text>
+      <text name="text revolutions">回転体</text>
+      <texture_picker label="スカルプトテクスチャ" name="sculpt texture control" tool_tip="クリックして画像を選択してください。" />
+      <check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムをＸ軸上で反転させます" />
+      <check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返します" />
+      <text name="label sculpt type">縫い目のタイプ</text>
+      <combo_box name="sculpt type control">
+        <combo_box.item label="球体" name="Sphere" />
+        <combo_box.item label="トーラス" name="Torus" />
+        <combo_box.item label="平面" name="Plane" />
+        <combo_box.item label="シリンダー" name="Cylinder" />
+      </combo_box>
+    </panel>
+    <panel label="特徴" name="Features">
+      <panel.string name="None">なし</panel.string>
+      <panel.string name="Prim">プリム</panel.string>
+      <panel.string name="Convex Hull">凸状の外殻構造</panel.string>
+      <text name="select_single">プリムを１つだけ選択して編集してください。</text>
+      <text name="edit_object">オブジェクトの特徴を編集：</text>
+      <check_box label="アニメーションメッシュ" name="Animated Mesh Checkbox Ctrl" tool_tip="リグ入りメッシュオブジェクトを、それぞれアニメーションさせることができるようになります。" />
+      <check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Ｚ軸を中心に、オブジェクトの屈曲を有効にします。（クライアント側のみ）" />
+      <spinner label="柔軟性" name="FlexNumSections" />
+      <spinner label="重力" name="FlexGravity" />
+      <spinner label="ドラッグ" name="FlexFriction" />
+      <spinner label="風" name="FlexWind" />
+      <spinner label="緊張" name="FlexTension" />
+      <spinner label="Ｘ軸方向の力" name="FlexForceX" />
+      <spinner label="Ｙ軸方向の力" name="FlexForceY" />
+      <spinner label="Ｚ軸方向の力" name="FlexForceZ" />
+      <check_box label="発光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します" />
+      <color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
+      <texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）" />
+      <spinner label="輝度" name="Light Intensity" />
+      <spinner label="ＦＯＶ" name="Light FOV" />
+      <spinner label="半径" name="Light Radius" />
+      <spinner label="焦点" name="Light Focus" />
+      <spinner label="弱まる" name="Light Falloff" />
+      <spinner label="環境" name="Light Ambiance" />
+      <text name="label physicsshapetype">実像の種類：</text>
+      <combo_box name="Physics Shape Type Combo Ctrl" tool_tip="実像の種類を選択" />
+      <combo_box name="material">
+        <combo_box.item label="石" name="Stone" />
+        <combo_box.item label="金属" name="Metal" />
+        <combo_box.item label="ガラス" name="Glass" />
+        <combo_box.item label="木" name="Wood" />
+        <combo_box.item label="肌" name="Flesh" />
+        <combo_box.item label="プラスチック" name="Plastic" />
+        <combo_box.item label="ゴム" name="Rubber" />
+      </combo_box>
+      <spinner label="重力" name="Physics Gravity" />
+      <spinner label="摩擦" name="Physics Friction" />
+      <spinner label="密度（１００㎏/㎥）" name="Physics Density" />
+      <spinner label="復元" name="Physics Restitution" />
+    </panel>
+    <panel label="材質" name="Texture" />
+    <panel label="中身" name="Contents">
+      <button label="新規スクリプト" label_selected="新規スクリプト" name="button new script" />
+      <button label="権限" name="button permissions" />
+    </panel>
+  </tab_container>
+  <panel name="land info panel">
+    <text name="label_parcel_info">区画情報</text>
+    <text name="label_area_price">価格：[AREA]㎡　L$ [PRICE]</text>
+    <text name="label_area">面積：[AREA]㎡</text>
+    <button label="土地情報" label_selected="土地情報" name="button about land" />
+    <check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけます：緑色＝あなたの土地　水色＝あなたのグループ所有地　赤色＝他人が所有する土地　黄色 = 売り出し中　紫色＝オークション　灰色＝公共領域" />
+    <text name="label_parcel_modify">区画の編集</text>
+    <button label="再分割" label_selected="再分割" name="button subdivide land" />
+    <button label="統合" label_selected="統合" name="button join land" />
+    <text name="label_parcel_trans">土地取引</text>
+    <button label="土地の購入" label_selected="土地の購入" name="button buy land" />
+    <button label="土地の放棄" label_selected="土地の放棄" name="button abandon land" />
+  </panel>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index c57f91f619..81e4a74d48 100644
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -1,64 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="トップオブジェクト">
-	<floater.string name="top_scripts_title">
-		トップ・スクリプト
-	</floater.string>
-	<floater.string name="top_scripts_text">
-		[COUNT] スクリプトには合計で [TIME] 分かかり、[MEMORY] KB 使用しています。
-	</floater.string>
-	<floater.string name="scripts_score_label">
-		時間
-	</floater.string>
-	<floater.string name="top_colliders_title">
-		上部コライダー
-	</floater.string>
-	<floater.string name="top_colliders_text">
-		上位[COUNT]個の物体は多くの衝突可能性があります。
-	</floater.string>
-	<floater.string name="colliders_score_label">
-		数
-	</floater.string>
-	<floater.string name="none_descriptor">
-		何も見つかりませんでした。
-	</floater.string>
-	<floater.string name="URLs">
-		URL
-	</floater.string>
-	<floater.string name="memory">
-		メモリ（KB）
-	</floater.string>
-	<text name="title_text">
-		ロード中．．．
-	</text>
-	<scroll_list name="objects_list">
-		<scroll_list.columns label="数" name="score"/>
-		<scroll_list.columns label="名前" name="name"/>
-		<scroll_list.columns label="所有者" name="owner"/>
-		<scroll_list.columns label="ロケーション" name="location"/>
-		<scroll_list.columns label="区画" name="parcel"/>
-		<scroll_list.columns label="日付" name="time"/>
-		<scroll_list.columns label="URL" name="URLs"/>
-		<scroll_list.columns label="メモリ（KB）" name="memory"/>
-	</scroll_list>
-	<text name="id_text">
-		物体ID：
-	</text>
-	<button label="標識を表示" name="show_beacon_btn"/>
-	<text name="obj_name_text">
-		オブジェクト名：
-	</text>
-	<button label="フィルタ" name="filter_object_btn"/>
-	<text name="owner_name_text">
-		所有者：
-	</text>
-	<button label="フィルタ" name="filter_owner_btn"/>
-	<text name="parcel_name_text">
-		区画：
-	</text>
-	<button label="フィルター" name="filter_parcel_btn"/>
-	<button label="更新" name="refresh_btn"/>
-	<button label="選択内容を返却" name="return_selected_btn"/>
-	<button label="すべて返却" name="return_all_btn"/>
-	<button label="選択内容を無効化" name="disable_selected_btn"/>
-	<button label="すべて無効化" name="disable_all_btn"/>
-</floater>
+  <floater.string name="top_scripts_title">トップ・スクリプト</floater.string>
+  <floater.string name="top_scripts_text">[COUNT]個のスクリプトの実行に[TIME]分かかり、[MEMORY]㎅使用しています。</floater.string>
+  <floater.string name="scripts_score_label">時間</floater.string>
+  <floater.string name="top_colliders_title">上部コライダー</floater.string>
+  <floater.string name="top_colliders_text">上位[COUNT]個の物体は多くの衝突可能性があります。</floater.string>
+  <floater.string name="colliders_score_label">数</floater.string>
+  <floater.string name="none_descriptor">何も見つかりませんでした。</floater.string>
+  <floater.string name="URLs">ＵＲＬ</floater.string>
+  <floater.string name="memory">メモリ（㎅）</floater.string>
+  <text name="title_text">読み込んでいます…</text>
+  <scroll_list name="objects_list">
+    <scroll_list.columns label="数" name="score" />
+    <scroll_list.columns label="名前" name="name" />
+    <scroll_list.columns label="所有者" name="owner" />
+    <scroll_list.columns label="ロケーション" name="location" />
+    <scroll_list.columns label="区画" name="parcel" />
+    <scroll_list.columns label="日付" name="time" />
+    <scroll_list.columns label="URL" name="URLs" />
+    <scroll_list.columns label="メモリ（㎅）" name="memory" />
+  </scroll_list>
+  <text name="id_text">物体ＩＤ：</text>
+  <button label="標識を表示" name="show_beacon_btn" />
+  <text name="obj_name_text">オブジェクト名：</text>
+  <button label="フィルタ" name="filter_object_btn" />
+  <text name="owner_name_text">所有者：</text>
+  <button label="フィルタ" name="filter_owner_btn" />
+  <text name="parcel_name_text">区画：</text>
+  <button label="フィルタ" name="filter_parcel_btn" />
+  <button label="更新" name="refresh_btn" />
+  <button label="選択内容を返却" name="return_selected_btn" />
+  <button label="すべて返却" name="return_all_btn" />
+  <button label="選択内容を無効化" name="disable_selected_btn" />
+  <button label="すべて無効化" name="disable_all_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
index 8a6a6ff58a..3ac0219b6b 100644
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
@@ -1,21 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
-	<floater.string name="real_url">
-		http://secondlife.com/app/tos/
-	</floater.string>
-	<floater.string name="loading_url">
-		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
-	</floater.string>
-	<text name="tos_heading">
-		次の Second Life の利用規約、プライバシーポリシー、およびサービス規約（仲裁の利用および紛争解決のためのいかなるクラスまたはグループの請求の放棄に関する必要条件を含む）をお読みください。[SECOND_LIFE] へのログインを続けるには、これらの規約に同意する必要があります。
-	</text>
-	<text name="external_tos_required">
-		操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。
-	</text>
-	<check_box label="" name="agree_chk"/>
-	<text name="agree_list">
-		私は、Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）を読み、同意しました。
-	</text>
-	<button label="続行" label_selected="続行" name="Continue"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+  <floater.string name="real_url">http://secondlife.com/app/tos/</floater.string>
+  <floater.string name="loading_url">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</floater.string>
+  <text name="tos_heading">次の Second Lifeの利用規約、プライバシーポリシー、およびサービス規約（仲裁の利用および紛争解決のためのいかなるクラスまたはグループの請求の放棄に関する必要条件を含む）をお読みください。
+[SECOND_LIFE]へのログインを続けるには、これらの規約に同意する必要があります。</text>
+  <text name="external_tos_required">操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。</text>
+  <check_box label="" name="agree_chk" />
+  <text name="agree_list">私は、Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）を読み、同意しました。	</text>
+  <button label="続ける" label_selected="続ける" name="Continue" />
+  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml
index 682352ec82..0a3b29b22f 100644
--- a/indra/newview/skins/default/xui/ja/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_toybox.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Toybox" title="ツールバーのボタン">
-	<text name="toybox label 1">
-		ボタンをツールバーに追加または削除するにはボタンをドラッグします。
-	</text>
-	<text name="toybox label 2">
-		各ツールバーの設定に応じて、ボタンは以下のように表示されたり、アイコンのみで表示されます。
-	</text>
-	<button label="ツールバーを全てクリア" label_selected="ツールバーを全てクリア" name="btn_clear_all"/>
-	<button label="デフォルト設定を復元" label_selected="デフォルト設定を復元" name="btn_restore_defaults"/>
-</floater>
+  <text name="toybox label 1">ボタンをツールバーに追加または削除するにはボタンをドラッグします。</text>
+  <text name="toybox label 2">各ツールバーの設定に応じて、ボタンは以下のように表示されたり、アイコンのみで表示されます。</text>
+  <button label="ツールバーを全てクリア" label_selected="ツールバーを全てクリア" name="btn_clear_all" />
+  <button label="デフォルト設定を復元" label_selected="デフォルト設定を復元" name="btn_restore_defaults" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
index 27143086ac..c2a448913f 100644
--- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
@@ -1,58 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_translation_settings" title="チャットの翻訳設定">
-	<string name="bing_api_key_not_verified">
-		Bing appID を認証できませんでした。もう一度お試しください。
-	</string>
-	<string name="google_api_key_not_verified">
-		Google API キーを認証できませんでした。もう一度お試しください。
-	</string>
-	<string name="bing_api_key_verified">
-		Bing appID が認証されました。
-	</string>
-	<string name="google_api_key_verified">
-		Google API キーが認証されました。
-	</string>
-	<check_box label="チャット中の機械翻訳機能を有効にする" name="translate_chat_checkbox"/>
-	<text name="translate_language_label">
-		翻訳する言語：
-	</text>
-	<combo_box name="translate_language_combo">
-		<combo_box.item label="システム標準" name="System Default Language"/>
-		<combo_box.item label="英語" name="English"/>
-		<combo_box.item label="Dansk（デンマーク語）" name="Danish"/>
-		<combo_box.item label="Deutsch（ドイツ語）" name="German"/>
-		<combo_box.item label="Español（スペイン語）" name="Spanish"/>
-		<combo_box.item label="Français（フランス語）" name="French"/>
-		<combo_box.item label="Italiano（イタリア語）" name="Italian"/>
-		<combo_box.item label="Magyar（ハンガリー語）" name="Hungarian"/>
-		<combo_box.item label="Nederlands（オランダ語）" name="Dutch"/>
-		<combo_box.item label="Polski（ポーランド語）" name="Polish"/>
-		<combo_box.item label="Português（ポルトガル語）" name="Portugese"/>
-		<combo_box.item label="Русский（ロシア語）" name="Russian"/>
-		<combo_box.item label="Türkçe（トルコ語）" name="Turkish"/>
-		<combo_box.item label="Українська （ウクライナ語）" name="Ukrainian"/>
-		<combo_box.item label="中文 (正體) （中国語）" name="Chinese"/>
-		<combo_box.item label="日本語（日本語）" name="Japanese"/>
-		<combo_box.item label="한국어（韓国語）" name="Korean"/>
-	</combo_box>
-	<text name="tip">
-		翻訳サービスを選択してください：
-	</text>
-	<radio_group name="translation_service_rg">
-		<radio_item initial_value="bing" label="Bing Translator" name="bing"/>
-		<radio_item initial_value="google" label="Google Translate" name="google"/>
-	</radio_group>
-	<text name="bing_api_key_label">
-		Bing AppID [http://www.bing.com/developers/createapp.aspx AppID]:
-	</text>
-	<button label="認証" name="verify_bing_api_key_btn"/>
-	<text name="google_api_key_label">
-		Google API key [http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]:
-	</text>
-	<button label="認証" name="verify_google_api_key_btn"/>
-	<text name="google_links_text">
-		[http://code.google.com/apis/language/translate/v2/pricing.html 価格] | [https://code.google.com/apis/console 統計]
-	</text>
-	<button label="OK" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
+  <string name="bing_api_key_not_verified">Bing appIDを認証できませんでした。もう一度お試しください。</string>
+  <string name="google_api_key_not_verified">Google APIキーを認証できませんでした。もう一度お試しください。</string>
+  <string name="bing_api_key_verified">Bing appIDが認証されました。</string>
+  <string name="google_api_key_verified">Google APIキーが認証されました。</string>
+  <check_box label="チャット中の機械翻訳機能を有効にする" name="translate_chat_checkbox" />
+  <text name="translate_language_label">翻訳する言語：</text>
+  <combo_box name="translate_language_combo">
+    <combo_box.item label="システム標準" name="System Default Language" />
+    <combo_box.item label="英語" name="English" />
+    <combo_box.item label="Dansk（デンマーク語）" name="Danish" />
+    <combo_box.item label="Deutsch（ドイツ語）" name="German" />
+    <combo_box.item label="Español（スペイン語）" name="Spanish" />
+    <combo_box.item label="Français（フランス語）" name="French" />
+    <combo_box.item label="Italiano（イタリア語）" name="Italian" />
+    <combo_box.item label="Magyar（ハンガリー語）" name="Hungarian" />
+    <combo_box.item label="Nederlands（オランダ語）" name="Dutch" />
+    <combo_box.item label="Polski（ポーランド語）" name="Polish" />
+    <combo_box.item label="Português（ポルトガル語）" name="Portugese" />
+    <combo_box.item label="Русский（ロシア語）" name="Russian" />
+    <combo_box.item label="Türkçe（トルコ語）" name="Turkish" />
+    <combo_box.item label="Українська （ウクライナ語）" name="Ukrainian" />
+    <combo_box.item label="中文 (正體) （中国語）" name="Chinese" />
+    <combo_box.item label="日本語（日本語）" name="Japanese" />
+    <combo_box.item label="한국어（韓国語）" name="Korean" />
+  </combo_box>
+  <text name="tip">翻訳サービスを選択してください：</text>
+  <radio_group name="translation_service_rg">
+    <radio_item initial_value="bing" label="Bing Translator" name="bing" />
+    <radio_item initial_value="google" label="Google Translate" name="google" />
+  </radio_group>
+  <text name="bing_api_key_label">Bing AppID[http://www.bing.com/developers/createapp.aspx AppID]：</text>
+  <button label="認証" name="verify_bing_api_key_btn" />
+  <text name="google_api_key_label">Google API key[http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]：</text>
+  <button label="認証" name="verify_google_api_key_btn" />
+  <text name="google_links_text">[http://code.google.com/apis/language/translate/v2/pricing.html 価格]|[https://code.google.com/apis/console 統計]</text>
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
new file mode 100644
index 0000000000..ea135a149d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gui_preview_tool" title="ＸＵＩプレビューツール">
+  <string name="ExternalEditorNotSet">環境変数LL_XUI_EDITORまたはExternalEditor設定を設定するか、[EDITOR PATH]フィールドにそのパスを指定して、エディターを選択します。</string>
+  <panel name="main_panel">
+    <text name="select_language_label">優先言語：</text>
+    <combo_box name="language_select_combo">
+      <combo_box.item label="ja" name="item1" value="ja" />
+    </combo_box>
+    <button label="表示" label_selected="表示" name="display_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。" />
+    <button label="非表示" label_selected="非表示" name="close_displayed_floater" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。" />
+    <button label="編集…" label_selected="編集…" name="edit_floater" tool_tip="選択したＸＭＬファイルによって定義されたＸＵＩフローターを編集します。（外部エディターを開きます）ローカライズされたバージョンが存在しない場合は、enバージョンを開きます。" />
+    <button label="保存" label_selected="保存" name="save_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを保存します。" />
+    <button label="全て保存" label_selected="全て保存" name="save_all_floaters" tool_tip="選択した言語で定義されたすべてのＸＵＩフロータを保存します。" />
+    <button label="≫" label_selected="≪" name="toggle_overlap_panel" tool_tip="重なっている要素の強調表示と表示パネルを切り替えます。要素を右クリックして、この機能用に選択します。選択した要素は、赤い四角形でマークされます。" />
+    <text name="select_language_label_2">二次言語：</text>
+    <combo_box name="language_select_combo_2">
+      <combo_box.item label="en" name="item1" value="en" />
+    </combo_box>
+    <button label="表示" name="display_floater_2" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。" />
+    <button enabled="false" label="非表示" name="close_displayed_floater_2" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。" />
+    <button label="スキーマをエクスポート" name="export_schema" />
+    <check_box label="四角形を表示" name="show_rectangles" />
+    <scroll_list name="name_list">
+      <scroll_list.columns label="タイトル" name="title_column" />
+      <scroll_list.columns label="ファイル名" name="file_column" />
+      <scroll_list.columns label="トップレベルのノード" name="top_level_node_column" />
+    </scroll_list>
+    <panel name="editor_panel">
+      <text name="editor_path_label">エディタのパス：</text>
+      <line_editor name="executable_path_field" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）へのフルパス。（引用符は必要ありません）" />
+      <button follows="left|bottom" label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_executable" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）を参照します。" />
+      <text name="executable_args_label">エディタの引数：</text>
+      <line_editor name="executable_args_field" tool_tip="エディターへのコマンドライン引数。'%FILE%'を使用してターゲット ファイルを参照します。このフィールドが空の場合、「YourProgram.exe FileName.xml」が実行されます" />
+    </panel>
+    <panel name="vlt_panel">
+      <text name="diff_file_label">差分ファイル：</text>
+      <line_editor name="vlt_diff_path_field" tool_tip="Viewer Localization Toolkitによって生成されたＸＭＬのD0、D1言語差分ファイルへのフルパス" />
+      <button label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_vlt_diffs" tool_tip="VLTで生成されたD0、D1差分ファイルを参照して、変更されたファイルと要素を強調表示します。" />
+      <button label="差分をハイライト" label_selected="ハイライトを解除" name="toggle_vlt_diff_highlight" tool_tip="変更された言語データを含むファイルと要素の強調表示を切り替えます。" />
+    </panel>
+  </panel>
+  <scroll_container follows="top|right|bottom" height="600" layout="topleft" name="overlap_scroll">
+    <panel name="overlap_dummy_panel">
+      <overlap_panel label="オーバーラップパネル" ame="overlap_panel" tool_tip="このパネルには、現在選択されている要素と、それに重なっているすべての要素が水平線で区切られて表示されます。" />
+      <text name="overlap_panel_label">重なる要素：</text>
+    </panel>
+  </scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 8e09e4748a..0de37b7ff3 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="url_entry">
-	<text name="media_label">
-		メディア URL：
-	</text>
-	<combo_box name="media_entry"/>
-	<button label="OK" name="ok_btn" width="38"/>
-	<button label="キャンセル" name="cancel_btn" width="80"/>
-	<button label="クリア" name="clear_btn" left_pad="76"/>
-	<text name="loading_label" left="140">
-		ロード中．．．
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="url_entry">
+  <text name="media_label">メディアＵＲＬ：</text>
+  <combo_box name="media_entry" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="クリア" name="clear_btn" />
+  <text name="loading_label">読み込んでいます…	</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
index 44e96c35ad..f0ecf182e8 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_voice_volume" title="ボイスチャットの音量">
-	<slider label="ボイスチャット" name="chat_voice_volume"/>
-</floater>
+  <slider label="ボイスチャット" name="chat_voice_volume" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index b38ea9331a..c57db0713b 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,159 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
-	<string name="no_voice_effect">
-		（ボイスモーフィングなし）
-	</string>
-	<string name="active_voice_effect">
-		（アクティブ）
-	</string>
-	<string name="unsubscribed_voice_effect">
-		（取消し済み）
-	</string>
-	<string name="new_voice_effect">
-		（新登場！）
-	</string>
-	<string name="effect_Arena">
-		アリーナ
-	</string>
-	<string name="effect_Beast">
-		野獣
-	</string>
-	<string name="effect_Buff">
-		がっしり
-	</string>
-	<string name="effect_Buzz">
-		ブザー
-	</string>
-	<string name="effect_Camille">
-		カミール
-	</string>
-	<string name="effect_Creepy">
-		気味の悪い
-	</string>
-	<string name="effect_CreepyBot">
-		気味わるボット
-	</string>
-	<string name="effect_Cyber">
-		サイバー
-	</string>
-	<string name="effect_DeepBot">
-		ディープボット
-	</string>
-	<string name="effect_Demon">
-		デーモン
-	</string>
-	<string name="effect_Female Elf">
-		女性のエルフ
-	</string>
-	<string name="effect_Flirty">
-		気のありそうな
-	</string>
-	<string name="effect_Foxy">
-		魅惑的
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		ハロウィン_2010_ボーナス
-	</string>
-	<string name="effect_Helium">
-		ヘリウム
-	</string>
-	<string name="effect_Husky">
-		ハスキー
-	</string>
-	<string name="effect_Husky Whisper">
-		スモーキーウィスパー
-	</string>
-	<string name="effect_Intercom">
-		インターホン
-	</string>
-	<string name="effect_Julia">
-		ジュリア
-	</string>
-	<string name="effect_Lo Lilt">
-		軽快
-	</string>
-	<string name="effect_Macho">
-		マッチョ
-	</string>
-	<string name="effect_Micro">
-		ミクロ
-	</string>
-	<string name="effect_Mini">
-		ミニ
-	</string>
-	<string name="effect_Model">
-		モデル
-	</string>
-	<string name="effect_Nano">
-		ナノ
-	</string>
-	<string name="effect_Nightmare">
-		悪夢
-	</string>
-	<string name="effect_PopBot">
-		ポップボット
-	</string>
-	<string name="effect_Rachel">
-		レイチェル
-	</string>
-	<string name="effect_Radio">
-		ラジオ
-	</string>
-	<string name="effect_Robot">
-		ロボット
-	</string>
-	<string name="effect_Roxanne">
-		ロクサン
-	</string>
-	<string name="effect_Rumble">
-		ランブル
-	</string>
-	<string name="effect_Sabrina">
-		サブリナ
-	</string>
-	<string name="effect_Samantha">
-		サマンサ
-	</string>
-	<string name="effect_Sexy">
-		セクシー
-	</string>
-	<string name="effect_Shorty">
-		チビ
-	</string>
-	<string name="effect_Smaller">
-		小さめ
-	</string>
-	<string name="effect_Sneaky">
-		コソコソ
-	</string>
-	<string name="effect_Stallion">
-		雄馬
-	</string>
-	<string name="effect_Sultry">
-		艶かしい
-	</string>
-	<string name="effect_Thunder">
-		サンダー
-	</string>
-	<string name="effect_Vixen">
-		性悪な
-	</string>
-	<string name="effect_WhinyBot">
-		不機嫌ボット
-	</string>
-	<text name="preview_text">
-		プレビュー
-	</text>
-	<text name="status_text">
-		声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。
-	</text>
-	<button label="録音" name="record_btn" tool_tip="あなたの声を録音します。"/>
-	<button label="停止" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] 今すぐ申し込む]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。">
-		<scroll_list.columns label="ボイス名" name="name"/>
-		<scroll_list.columns label="有効期限" name="expires"/>
-	</scroll_list>
-</floater>
+  <string name="no_voice_effect">（ボイスモーフィングなし）</string>
+  <string name="active_voice_effect">（アクティブ）</string>
+  <string name="unsubscribed_voice_effect">（取消し済み）</string>
+  <string name="new_voice_effect">（新登場！）</string>
+  <string name="effect_Arena">アリーナ</string>
+  <string name="effect_Beast">野獣</string>
+  <string name="effect_Buff">がっしり</string>
+  <string name="effect_Buzz">ブザー</string>
+  <string name="effect_Camille">カミール</string>
+  <string name="effect_Creepy">気味の悪い</string>
+  <string name="effect_CreepyBot">気味わるボット</string>
+  <string name="effect_Cyber">サイバー</string>
+  <string name="effect_DeepBot">ディープボット</string>
+  <string name="effect_Demon">デーモン</string>
+  <string name="effect_Female Elf">女性のエルフ</string>
+  <string name="effect_Flirty">気のありそうな</string>
+  <string name="effect_Foxy">魅惑的</string>
+  <string name="effect_Halloween 2010 Bonus">ハロウィン_2010_ボーナス</string>
+  <string name="effect_Helium">ヘリウム</string>
+  <string name="effect_Husky">ハスキー</string>
+  <string name="effect_Husky Whisper">スモーキーウィスパー</string>
+  <string name="effect_Intercom">インターホン</string>
+  <string name="effect_Julia">ジュリア</string>
+  <string name="effect_Lo Lilt">軽快</string>
+  <string name="effect_Macho">マッチョ</string>
+  <string name="effect_Micro">ミクロ</string>
+  <string name="effect_Mini">ミニ</string>
+  <string name="effect_Model">モデル</string>
+  <string name="effect_Nano">ナノ</string>
+  <string name="effect_Nightmare">悪夢</string>
+  <string name="effect_PopBot">ポップボット</string>
+  <string name="effect_Rachel">レイチェル</string>
+  <string name="effect_Radio">ラジオ</string>
+  <string name="effect_Robot">ロボット</string>
+  <string name="effect_Roxanne">ロクサン</string>
+  <string name="effect_Rumble">ランブル</string>
+  <string name="effect_Sabrina">サブリナ</string>
+  <string name="effect_Samantha">サマンサ</string>
+  <string name="effect_Sexy">セクシー</string>
+  <string name="effect_Shorty">チビ</string>
+  <string name="effect_Smaller">小さめ</string>
+  <string name="effect_Sneaky">コソコソ</string>
+  <string name="effect_Stallion">雄馬</string>
+  <string name="effect_Sultry">艶かしい</string>
+  <string name="effect_Thunder">サンダー</string>
+  <string name="effect_Vixen">性悪な</string>
+  <string name="effect_WhinyBot">不機嫌ボット</string>
+  <text name="preview_text">プレビュー</text>
+  <text name="status_text">声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。</text>
+  <button label="録音" name="record_btn" tool_tip="あなたの声を録音します。" />
+  <button label="停止" name="record_stop_btn" />
+  <text name="voice_morphing_link">[[URL] 今すぐ申し込む]</text>
+  <scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。">
+    <scroll_list.columns label="ボイス名" name="name" />
+    <scroll_list.columns label="有効期限" name="expires" />
+  </scroll_list>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
index a380615d5a..084a1ffde9 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
@@ -4,5 +4,5 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="floater_voice_volume" title="ボイス音量">
-	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
-</floater>
+  <slider name="volume_slider" tool_tip="ボイス音量" value="0.5" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
index d57cd4e297..b7b3650ed9 100644
--- a/indra/newview/skins/default/xui/ja/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_web_content" title="">
-	<layout_stack name="stack1">
-		<layout_panel name="nav_controls">
-			<button name="back" tool_tip="前へ"/>
-			<button name="forward" tool_tip="次へ"/>
-			<button name="stop" tool_tip="ナビゲーションを停止"/>
-			<button name="reload" tool_tip="ページを更新"/>
-			<combo_box name="address" tool_tip="ここに URL を入力"/>
-			<icon name="media_secure_lock_flag" tool_tip="安全な閲覧"/>
-			<button name="popexternal" tool_tip="この URL をブラウザで開く"/>
-		</layout_panel>
-		<layout_panel name="debug_controls">
-			<button name="web_test_home_page" tool_tip="Web テストのホームページ"/>
-			<button name="VLC Plugin Test" tool_tip="MPEG4 ビデオテスト"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
+  <layout_stack name="stack1">
+    <layout_panel name="nav_controls">
+      <button name="back" tool_tip="前へ" />
+      <button name="forward" tool_tip="次へ" />
+      <button name="stop" tool_tip="ナビゲーションを停止" />
+      <button name="reload" tool_tip="ページを更新" />
+      <combo_box name="address" tool_tip="ここに URL を入力" />
+      <icon name="media_secure_lock_flag" tool_tip="安全な閲覧" />
+      <button name="popexternal" tool_tip="この URL をブラウザで開く" />
+    </layout_panel>
+    <layout_panel name="debug_controls">
+      <button name="web_test_home_page" tool_tip="Web テストのホームページ" />
+      <button name="VLC Plugin Test" tool_tip="MPEG4 ビデオテスト" />
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
index 34aba9d485..fe63e1f96c 100644
--- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="whitelist_entry" title="ホワイトリストの入力">
-	<text name="media_label">
-		URL か URL パターンを入力して、許可するドメインをリストに追加します。
-	</text>
-	<line_editor name="whitelist_entry" tool_tip="URL か URL パターンをホワイトリストに入力します"/>
-	<button label="OK" name="ok_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+  <text name="media_label">ＵＲＬかＵＲＬパターンを入力して、許可するドメインをリストに追加します。</text>
+  <line_editor name="whitelist_entry" tool_tip="ＵＲＬかＵＲＬパターンをホワイトリストに入力します。" />
+  <button label="ＯＫ" name="ok_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index 416813d6cc..ab7811f9aa 100644
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="window_size" title="ウィンドウサイズ">
-	<string name="resolution_format">
-		[RES_X] x [RES_Y]
-	</string>
-	<text name="windowsize_text">
-		ウィンドウのサイズを設定：
-	</text>
-	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
-		<combo_box.item label="1000 x 700 （デフォルト）" name="item1"/>
-		<combo_box.item label="1024 x 768 （4:3 XGA）" name="item2"/>
-		<combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3"/>
-		<combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4"/>
-		<combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5"/>
-		<combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7"/>
-		<combo_box.item label="1600 x 900 （16:9 HD+）" name="item8"/>
-		<combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9"/>
-		<combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10"/>
-		<combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11"/>
-		<combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12"/>
-	</combo_box>
-	<button label="設定" name="set_btn"/>
-	<button label="キャンセル" name="cancel_btn"/>
-</floater>
+  <string name="resolution_format">[RES_X]x[RES_Y]</string>
+  <text name="windowsize_text">ウィンドウのサイズを設定：</text>
+  <combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
+    <combo_box.item label="1000 x 700 （デフォルト）" name="item1" />
+    <combo_box.item label="1024 x 768 （4:3 XGA）" name="item2" />
+    <combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3" />
+    <combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4" />
+    <combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5" />
+    <combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7" />
+    <combo_box.item label="1600 x 900 （16:9 HD+）" name="item8" />
+    <combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9" />
+    <combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10" />
+    <combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11" />
+    <combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12" />
+  </combo_box>
+  <button label="設定" name="set_btn" />
+  <button label="キャンセル" name="cancel_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index cc07596adc..02e8ae352a 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -1,85 +1,96 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="worldmap" title="世界地図">
-	<panel name="layout_panel_1">
-		<text name="events_label">
-			表記・記号
-		</text>
-	</panel>
-	<panel name="layout_panel_2">
-		<button label="現在地を表示" label_selected="現在地を表示" name="Show My Location" tool_tip="アバターの位置を地図の中心に表示します"/>
-		<text name="me_label">
-			自分
-		</text>
-		<check_box label="住人" name="people_chk"/>
-		<text name="person_label">
-			住人
-		</text>
-		<check_box label="インフォハブ" name="infohub_chk"/>
-		<text name="infohub_label">
-			インフォハブ
-		</text>
-		<check_box label="売り地" name="land_for_sale_chk"/>
-		<text name="land_sale_label">
-			土地販売
-		</text>
-		<text name="auction_label">
-			土地オークション
-		</text>
-		<text name="by_owner_label">
-			所有者の販売
-		</text>
-		<button label="ホームへ" label_selected="ホームへ" name="Go Home" tool_tip="「ホーム」にテレポートします"/>
-		<text name="Home_label">
-			ホーム
-		</text>
-		<text name="events_label">
-			イベント：
-		</text>
-		<check_box label="PG" name="event_chk"/>
-		<text name="pg_label">
-			General
-		</text>
-		<check_box initial_value="true" label="Mature" name="events_mature_chk"/>
-		<text name="events_mature_label">
-			Moderate
-		</text>
-		<check_box label="Adult" name="events_adult_chk"/>
-		<text name="events_adult_label">
-			Adult
-		</text>
-	</panel>
-	<panel name="layout_panel_3">
-		<text name="find_on_map_label">
-			地図上で見つける
-		</text>
-	</panel>
-	<panel name="layout_panel_4">
-		<combo_box label="オンラインのフレンド" name="friend combo" tool_tip="フレンドを地図に表示">
-			<combo_box.item label="オンラインのフレンド" name="item1"/>
-		</combo_box>
-		<combo_box label="マイ ランドマーク" name="landmark combo" tool_tip="地図上に表示するランドマーク">
-			<combo_box.item label="マイ ランドマーク" name="item1"/>
-		</combo_box>
-		<search_editor label="リージョン名" name="location" tool_tip="リージョン名を入力します"/>
-		<button label="検索" name="DoSearch" tool_tip="リージョン検索"/>
-		<button name="Clear" tool_tip="追跡ラインをクリアして地図をリセットします"/>
-		<scroll_list name="search_results">
-			<scroll_list.columns label="" name="icon"/>
-			<scroll_list.columns label="" name="sim_name"/>
-		</scroll_list>
-		<text name="events_label">
-			場所：
-		</text>
-		<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="選択した場所にテレポートします"/>
-		<button label="SLurl をコピー" name="copy_slurl" tool_tip="現在地の SLurl をコピーして Web で使用します"/>
-		<button label="選択を表示する" label_selected="目的地を表示" name="Show Destination" tool_tip="選択した場所を地図の中心に表示します"/>
-	</panel>
-	<panel name="layout_panel_5">
-		<text name="zoom_label">
-			ズーム
-		</text>
-	</panel>
-	<panel name="layout_panel_6">
-		<slider label="ズーム" name="zoom slider"/>
-	</panel>
-</floater>
+<floater name="worldmap" title="ワールドマップ">
+  <string name="collapse_icon" value="map_ui_collapse_icon.png" />
+  <string name="expand_icon" value="map_ui_expand_icon.png" />
+  <string name="collapse_tooltip" value="マップ操作パネルを隠す" />
+  <string name="expand_tooltip" value="マップ操作を表示" />
+  <layout_stack name="floater_map_stack">
+    <layout_panel name="map_lp">
+      <panel filename="panel_world_map.xml" name="objects_mapview" />
+      <panel name="expand_btn_panel" tool_tip="マップ操作パネルを隠す">
+        <icon name="expand_collapse_icon" tool_tip="マップ操作パネルを隠す" />
+      </panel>
+    </layout_panel>
+    <layout_panel name="controls_lp">
+      <panel name="layout_panel_1">
+        <text name="events_label">凡例</text>
+      </panel>
+      <panel name="layout_panel_2">
+        <button name="Show My Location" tool_tip="現在、自分のアバターがいる場所をマップの中心にする。" />
+        <text name="me_label">自分</text>
+        <check_box control_name="MapShowPeople" name="people_chk" />
+        <icon name="person" />
+        <text name="person_label">人物</text>
+        <check_box name="infohub_chk" />
+        <icon name="infohub" />
+        <text name="infohub_label">情報ハブ</text>
+        <check_box name="land_for_sale_chk" />
+        <icon name="landforsale" />
+        <text name="land_sale_label">販売中の土地</text>
+        <icon name="square2" />
+        <text name="auction_label">オークション中の土地</text>
+        <icon name="square2" />
+        <text name="by_owner_label">所有者で</text>
+
+        <button name="Go Home" tool_tip="自分のホームの場所にテレポート" />
+
+        <text name="Home_label">ホーム</text>
+        <text name="events_label">イベント：</text>
+
+        <check_box name="event_chk" />
+        <icon name="event" />
+        <text name="pg_label">General</text>
+
+        <check_box name="events_mature_chk" />
+        <icon name="events_mature_icon" />
+        <text name="events_mature_label">Moderate</text>
+
+        <check_box name="events_adult_chk" />
+        <icon name="events_adult_icon" />
+        <text name="events_adult_label">Adult</text>
+      </panel>
+
+
+      <panel name="layout_panel_3">
+        <text name="find_on_map_label">マップから探す</text>
+      </panel>
+
+      <panel name="layout_panel_4">
+        <icon name="friends_icon" />
+        <combo_box label="オンラインのフレンド" name="friend combo" tool_tip="マップにフレンドを表示する。">
+          <combo_box.item label="オンラインのフレンド" name="item1" value="None" />
+          <combo_box.commit_callback function="WMap.AvatarCombo" />
+        </combo_box>
+        <icon name="landmark_icon" />
+        <combo_box label="ランドマーク" name="landmark combo" tool_tip="マップにランドマークを表示する。">
+          <combo_box.item label="ランドマーク" name="item1" value="None" />
+          <combo_box.commit_callback function="WMap.Landmark" />
+        </combo_box>
+        <icon name="location_icon" />
+        <search_editor label="リージョン（地域）名で" tool_tip="リージョン（地域）名を入力してください" />
+        <button label="探す" name="DoSearch" tool_tip="リージョン（地域）を検索する。" />
+        <button name="Clear" tool_tip="追跡ラインをクリアしてマップをリセットする。" />
+        <scroll_list name="search_results">
+          <scroll_list.columns label="" name="icon" />
+          <scroll_list.columns label="" name="sim_name" />
+          <scroll_list.commit_callback function="WMap.SearchResult" />
+        </scroll_list>
+        <text name="events_label">場所：</text>
+        <spinner name="teleport_coordinate_x" />
+        <spinner name="teleport_coordinate_y" />
+        <spinner name="teleport_coordinate_z" />
+        <button label="テレポート" name="Teleport" tool_tip="選択した場所にテレポートする。" />
+        <button label="SLurlをコピー" layout="topleft" name="copy_slurl" tool_tip="現在の場所をWebで使えるSLurlにしてコピーする。" />
+        <button label="選択を表示" name="Show Destination" tool_tip="選択した場所をマップの中心にする。" />
+      </panel>
+      <panel name="layout_panel_5">
+        <text name="zoom_label">縮尺</text>
+      </panel>
+      <panel name="layout_panel_6">
+        <icon name="zoom_icon" />
+        <!-- NOTE: min_val for zoom slider is hardcoded for performance reasons -->
+        <slider name="zoom slider" />
+      </panel>
+    </layout_panel>
+  </layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml
new file mode 100644
index 0000000000..02c81a8902
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/fonts.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<fonts>
+  <font name="default" comment="default font files (global fallbacks)">
+    <file>NotoSansCJKjp-Medium.otf</file>
+    <file>DejaVuSans.ttf</file>
+    <os name="Windows">
+      <file load_collection="true">YuGothM.ttc</file>
+      <file>meiryo.TTC</file>
+      <file>MSGOTHIC.TTC</file>
+      <file>gulim.ttc</file>
+      <file>simhei.ttf</file>
+      <file>ArialUni.ttf</file>
+      <file>msyh.ttc</file>
+      <file load_collection="true">Cambria.ttc</file>
+      <file>malgun.ttf</file>
+      <file>micross.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>YuGothic-Medium.otf</file>
+      <file>ヒラギノ角ゴシック W3.ttc</file>
+      <file>ヒラギノ角ゴ Pro W3.otf</file>
+      <file>ヒラギノ角ゴ ProN W3.otf</file>
+      <file>AppleGothic.dfont</file>
+      <file>AppleGothic.ttf</file>
+      <file>AppleSDGothicNeo-Regular.otf</file>
+      <file>AppleSDGothicNeo.ttc</file>
+      <file>华文细黑.ttf</file>
+      <file>PingFang.ttc</file>
+      <file>STIXGeneral.otf</file>
+      <file>Thonburi.ttc</file>
+    </os>
+  </font>
+  <font name="SansSerifBold" comment="Name of bold sans-serif font">
+    <file>NotoSansCJKjp-Bold.otf</file>
+    <file>DejaVuSans-Bold.ttf</file>
+    <os name="Windows">
+      <file load_collection="true">YuGothB.ttc</file>
+      <file>arialbd.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>YuGothic-Bold.otf</file>
+      <file>Helvetica.dfont</file>
+    </os>
+  </font>
+  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
+    <file>NotoSansCJKjp-Bold.otf</file>
+    <file>DejaVuSans.ttf</file>
+    <os name="Windows">
+      <file>arial.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>Helvetica.dfont</file>
+    </os>
+  </font>
+  <font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
+    <file>DejaVuSans-Bold.ttf</file>
+  </font>
+  <font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
+    <file>DejaVuSans-Oblique.ttf</file>
+  </font>
+  <font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
+    <file>DejaVuSans-BoldOblique.ttf</file>
+  </font>
+  <font name="Monospace" comment="Name of monospace font">
+    <file>NotoSansMonoCJKjp-Regular.otf</file>
+    <file>DejaVuSansMono.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font">
+    <file>DejaVuSans.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD">
+    <file>DejaVuSans-Bold.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC">
+    <file>DejaVuSans-Oblique.ttf</file>
+  </font>
+  <font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC">
+    <file>DejaVuSans-BoldOblique.ttf</file>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font">
+    <file>DejaVuSans.ttf</file>
+    <os name="Windows">
+      <file>arial.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>arial.ttf</file>
+    </os>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
+    <file>DejaVuSans-Bold.ttf</file>
+    <os name="Windows">
+      <file>arialbd.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>arialbd.ttf</file>
+    </os>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
+    <file>DejaVuSans-Oblique.ttf</file>
+    <os name="Windows">
+      <file>ariali.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>ariali.ttf</file>
+    </os>
+  </font>
+  <font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
+    <file>DejaVuSans-BoldOblique.ttf</file>
+    <os name="Windows">
+      <file>arialbi.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>arialbi.ttf</file>
+    </os>
+  </font>
+  <font name="OverrideTest" comment="Name of font to test overriding">
+    <file>times.ttf</file>
+    <file>DejaVuSans.ttf</file>
+  </font>
+  <font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0" />
+  <font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0" />
+  <font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="10.6" />
+  <font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="8.6" />
+  <font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="7.6" />
+</fonts>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index 42b67cd333..81844aec52 100644
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
@@ -4,24 +4,13 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_avatar">
-	<string name="Subtitle">
-		[AGE]
-	</string>
-	<string name="Details">
-		[SL_PROFILE]
-	</string>
-	<text name="user_name_small" value="Grumpity ProductEngine with a long name"/>
-	<text name="user_slid" value="james.linden"/>
-	<text name="user_subtitle" value="11 Months, 3 days old"/>
-	<text name="user_details">
-		This is my second life description and I really think it is great.But for some reason my description is super extra long because I like to talk a whole lot
-	</text>
-	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
-	<button label="フレンド登録" name="add_friend_btn"/>
-	<button label="IM" name="im_btn"/>
-	<button label="プロフィール" name="view_profile_btn"/>
-	<panel name="moderator_panel">
-		<button label="ボイスを無効" name="disable_voice"/>
-		<button label="ボイスを有効" name="enable_voice"/>
-	</panel>
-</floater>
+  <string name="Subtitle">[AGE]</string>
+  <string name="Details">[SL_PROFILE]</string>
+  <text name="user_name_small" value="長い名前のGrumpity ProductEngine" />
+  <text name="user_slid" value="james.linden" />
+  <text name="user_subtitle" value="１１ヶ月３日" />
+  <text name="user_details">これは私のSecondLifeの説明であり、本当に素晴らしいと思います。しかし、どういうわけか、私の説明は非常に長くなっています。なぜなら、私はたくさん話すのが好きだからです。</text>
+  <slider name="volume_slider" tool_tip="ボイス音量" value="0.5" />
+  <text name="avatar_profile_link" value="[[LINK] プロフィールを閲覧]" />
+  <avatar_icon name="avatar_icon" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
index be628befdf..84a2e49824 100644
--- a/indra/newview/skins/default/xui/ja/inspect_group.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_group.xml
@@ -1,32 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
+Not can_close / no title to avoid window chrome
+Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_group">
-	<string name="PrivateGroup">
-		プライベートグループ
-	</string>
-	<string name="FreeToJoin">
-		参加費無料
-	</string>
-	<string name="CostToJoin">
-		参加費 L$[AMOUNT]
-	</string>
-	<string name="YouAreMember">
-		あなたはメンバーです
-	</string>
-	<text name="group_subtitle">
-		123 メートル
-	</text>
-	<text name="group_details">
-		A group of folks charged with creating a room with a moose.
-Fear the moose!  Fear it!  And the mongoose too!
-	</text>
-	<text name="group_cost">
-		L$123 to join
-	</text>
-	<button label="参加" name="join_btn"/>
-	<button label="脱退" name="leave_btn"/>
-	<button label="プロフィールの表示" name="view_profile_btn"/>
-</floater>
+  <string name="PrivateGroup">プライベートグループ</string>
+  <string name="FreeToJoin">参加費無料</string>
+  <string name="CostToJoin">参加費L$ [AMOUNT]</string>
+  <string name="YouAreMember">あなたはメンバーです。</string>
+  <text name="group_subtitle">123メートル</text>
+  <text name="group_details">ヘラジカがいる部屋を作る任務を負った人々のグループ。
+ヘラジカを恐れてください！恐れよ！そしてマングースも！</text>
+  <text name="group_cost">L$123 to join</text>
+  <button label="参加" name="join_btn" />
+  <button label="脱退" name="leave_btn" />
+  <button label="プロフィールの表示" name="view_profile_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
index e6999ac9b1..7ac3ea0991 100644
--- a/indra/newview/skins/default/xui/ja/inspect_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_object.xml
@@ -1,48 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
+Not can_close / no title to avoid window chrome
+Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_object">
-	<string name="Creator">
-		制作者： [CREATOR]
-	</string>
-	<string name="CreatorAndOwner">
-		[CREATOR]によるチェック
-[OWNER]によるチェック
-	</string>
-	<string name="Price">
-		L$[AMOUNT]
-	</string>
-	<string name="PriceFree">
-		無料です！
-	</string>
-	<string name="Touch">
-		触る
-	</string>
-	<string name="Sit">
-		座る
-	</string>
-	<text name="object_name" value="二行にわたる長いオブジェクト名をテスト"/>
-	<text name="object_creator">
-		by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-	</text>
-	<text name="price_text">
-		L$30,000
-	</text>
-	<text name="object_description">
-		This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really?
-	</text>
-	<text name="object_media_url">
-		http://www.superdupertest.com
-	</text>
-	<button label="買う" name="buy_btn"/>
-	<button label="支払う" name="pay_btn"/>
-	<button label="コピーを取る" name="take_free_copy_btn"/>
-	<button label="触る" name="touch_btn"/>
-	<button label="座る" name="sit_btn"/>
-	<button label="開く" name="open_btn"/>
-	<icon name="secure_browsing" tool_tip="安全な閲覧"/>
-	<button label="詳細" name="more_info_btn"/>
-</floater>
+  <string name="Creator">制作者：[CREATOR]</string>
+  <string name="CreatorAndOwner">[CREATOR]によるチェック
+[OWNER]によるチェック</string>
+  <string name="Price">L$[AMOUNT]</string>
+  <string name="PriceFree">無料です！</string>
+  <string name="Touch">触る</string>
+  <string name="Sit">座る</string>
+  <text name="object_name" value="二行にわたる長いオブジェクト名をテスト" />
+  <text name="object_creator">by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about</text>
+  <text name="price_text">L$30,000</text>
+  <text name="object_description">これは、オブジェクトがどのようなものであるかについての非常に長い説明であり、少なくとも８０文字は含まれます。
+長さなどですが、この時点ではおそらく１２０くらいです。本当のところは、誰にも分かりません。</text>
+  <text name="object_media_url">http://www.superdupertest.com</text>
+  <button label="買う" name="buy_btn" />
+  <button label="支払う" name="pay_btn" />
+  <button label="コピーを取る" name="take_free_copy_btn" />
+  <button label="触る" name="touch_btn" />
+  <button label="座る" name="sit_btn" />
+  <button label="開く" name="open_btn" />
+  <icon name="secure_browsing" tool_tip="セキュアブラウジング" />
+  <button label="詳細" name="more_info_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
index 483d3fec52..615ca720e9 100644
--- a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
@@ -1,25 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
+Not can_close / no title to avoid window chrome
+Single instance - only have one at a time, recycle it each spawn
 -->
 <floater name="inspect_remote_object">
-	<text name="object_name">
-		Test Object Name That Is Really Long
-	</text>
-	<text name="object_owner_label">
-		所有者：
-	</text>
-	<text name="object_owner">
-		Longavatarname Johnsonlongstonnammer
-	</text>
-	<text name="object_slurl_label">
-		位置：
-	</text>
-	<text name="object_slurl">
-		http://slurl.com/Ahern/50/50/50
-	</text>
-	<button label="地図" name="map_btn"/>
-	<button label="ブロック" name="block_btn"/>
-	<button label="閉じる" name="close_btn"/>
-</floater>
+  <text name="object_name">非常に長いテスト オブジェクト名</text>
+  <text name="object_owner_label">所有者：</text>
+  <text name="object_owner">Longavatarname Johnsonlongstonnammer</text>
+  <text name="object_slurl_label">位置：</text>
+  <text name="object_slurl">http://slurl.com/Ahern/50/50/50</text>
+  <button label="マップ" name="map_btn" />
+  <button label="ブロック" name="block_btn" />
+  <button label="閉じる" name="close_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
index 91e8f4be7c..76fdca24eb 100644
--- a/indra/newview/skins/default/xui/ja/language_settings.xml
+++ b/indra/newview/skins/default/xui/ja/language_settings.xml
@@ -1,57 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.-->
 <strings>
-
-	<!-- Locale Information -->
-	<string name="MicrosoftLocale">japanese</string>
-	<string name="MacLocale">ja_JP.UTF-8</string>
-	<string name="DarwinLocale">ja_JP.UTF-8</string>
-	<string name="LinuxLocale">ja_JP.UTF-8</string>
-	
-	<!-- 
+  <!-- Locale Information -->
+  <string name="MicrosoftLocale">japanese</string>
+  <string name="MacLocale">ja_JP.UTF-8</string>
+  <string name="DarwinLocale">ja_JP.UTF-8</string>
+  <string name="LinuxLocale">ja_JP.UTF-8</string>
+  <!-- 
 	datetimeToCodes["wkday"]	= "%a";		// Thu
 	datetimeToCodes["weekday"]	= "%A";		// Thursday
 	datetimeToCodes["year4"]	= "%Y";		// 2009
-	datetimeToCodes["year"]		= "%Y";		// 2009
+	datetimeToCodes["year"]= "%Y";		// 2009
 	datetimeToCodes["year2"]	= "%y";		// 09
-	datetimeToCodes["mth"]		= "%b";		// Aug
+	datetimeToCodes["mth"]= "%b";		// Aug
 	datetimeToCodes["month"]	= "%B";		// August
 	datetimeToCodes["mthnum"]	= "%m";		// 08
-	datetimeToCodes["day"]		= "%d";		// 31
-	datetimeToCodes["sday"]		= "%-d";	// 9
+	datetimeToCodes["day"]= "%d";		// 31
+	datetimeToCodes["sday"]= "%-d";	// 9
 	datetimeToCodes["hour24"]	= "%H";		// 14
-	datetimeToCodes["hour"]		= "%H";		// 14
+	datetimeToCodes["hour"]= "%H";		// 14
 	datetimeToCodes["hour12"]	= "%I";		// 02
-	datetimeToCodes["min"]		= "%M";		// 59
-	datetimeToCodes["ampm"]		= "%p";		// AM
+	datetimeToCodes["min"]= "%M";		// 59
+	datetimeToCodes["ampm"]= "%p";		// AM
 	datetimeToCodes["second"]	= "%S";		// 59
 	datetimeToCodes["timezone"]	= "%Z";		// PST	
 	-->
-
-	<string name="TimeHour">hour,datetime,slt</string>
-	<string name="TimeMin">min,datetime,slt</string>	
-	<string name="TimeYear">year,datetime,slt</string>	
-	<string name="TimeDay">day,datetime,slt</string>	
-	<string name="TimeMonth">mthnum,datetime,slt</string>	
-	<string name="TimeWeek">wkday,datetime,slt</string>
-	<string name="TimeAMPM">ampm,datetime,slt</string>
-	<string name="TimeHour12">hour12,datetime,slt</string>	
-
-	<string name="LTimeMthNum">mthnum,datetime,local</string>
-	<string name="LTimeWeek">wkday,datetime,local</string>
-	<string name="LTimeMonth">mth,datetime,local</string>	
-	<string name="LTimeDay">day,datetime,local</string>	
-	<string name="LTimeSec">second,datetime,local</string>
-	<string name="LTimeHour">hour,datetime,local</string>
-	<string name="LTimeMin">min,datetime,local</string>	
-	<string name="LTimeYear">year,datetime,local</string>	
-	
-	<string name="UTCTimeWeek">weekday,datetime,utc</string>
-	<string name="UTCTimeDay">day,datetime,utc</string>
-	<string name="UTCTimeMth">mth,datetime,utc</string>
-	<string name="UTCTimeYr">year,datetime,utc</string>
-	<string name="UTCTimeHr">hour,datetime,utc</string>
-	<string name="UTCTimeMin">min,datetime,utc</string>
-	<string name="UTCTimeSec">second,datetime,utc</string>
-	<string name="UTCTimeTimezone">timezone,datetime,utc</string>							
-</strings>
+  <string name="TimeHour">hour,datetime,slt</string>
+  <string name="TimeMin">min,datetime,slt</string>
+  <string name="TimeYear">year,datetime,slt</string>
+  <string name="TimeDay">day,datetime,slt</string>
+  <string name="TimeMonth">mthnum,datetime,slt</string>
+  <string name="TimeWeek">wkday,datetime,slt</string>
+  <string name="TimeAMPM">ampm,datetime,slt</string>
+  <string name="TimeHour12">hour12,datetime,slt</string>
+  <string name="LTimeMthNum">mthnum,datetime,local</string>
+  <string name="LTimeWeek">wkday,datetime,local</string>
+  <string name="LTimeMonth">mth,datetime,local</string>
+  <string name="LTimeDay">day,datetime,local</string>
+  <string name="LTimeSec">second,datetime,local</string>
+  <string name="LTimeHour">hour,datetime,local</string>
+  <string name="LTimeMin">min,datetime,local</string>
+  <string name="LTimeYear">year,datetime,local</string>
+  <string name="UTCTimeWeek">weekday,datetime,utc</string>
+  <string name="UTCTimeDay">day,datetime,utc</string>
+  <string name="UTCTimeMth">mth,datetime,utc</string>
+  <string name="UTCTimeYr">year,datetime,utc</string>
+  <string name="UTCTimeHr">hour,datetime,utc</string>
+  <string name="UTCTimeMin">min,datetime,utc</string>
+  <string name="UTCTimeSec">second,datetime,utc</string>
+  <string name="UTCTimeTimezone">timezone,datetime,utc</string>
+</strings>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
index 982a03c6a8..c3b216ee79 100644
--- a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Add Wearable Gear Menu">
-	<menu_item_check label="新しい順に並べ替え" name="sort_by_most_recent"/>
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
-</menu>
+  <menu_item_check label="新しい順で並べ替え" name="sort_by_most_recent" />
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="種別で並べ替え" name="sort_by_type" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index b9e10c071c..4f5d1c61de 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: See also menu_avatar_other.xml -->
-<context_menu name="Avatar Pie">
-	<menu_item_call label="プロフィールの表示" name="Profile..."/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="IM" name="Send IM..."/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="グループに招待" name="Invite..."/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="ブロック" name="Avatar Mute"/>
-	<menu_item_call label="報告" name="abuse"/>
-	<menu_item_call label="フリーズ" name="Freeze..."/>
-	<menu_item_call label="追放" name="Eject..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="ズームイン" name="Zoom In"/>
-	<menu_item_call label="支払う" name="Pay..."/>
-	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
-	<context_menu label="アバターを描画" name="Render Avatar">
-		<menu_item_check label="デフォルト" name="RenderNormally"/>
-		<menu_item_check label="常に使用する" name="AlwaysRenderFully"/>
-		<menu_item_check label="使用しない" name="DoNotRender"/>
-		<menu_item_call label="例外…" name="RenderExceptions"/>
-	</context_menu>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_avatar_other.xml -->
+<context_menu name="Avatar Pie">
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="IMのやり取り…" name="Send IM..." />
+  <menu_item_call label="呼び出し" name="Call" />
+  <menu_item_call label="グループに招待…" name="Invite..." />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="ブロック" name="Avatar Mute" />
+  <menu_item_call label="報告" name="abuse" />
+  <menu_item_call label="フリーズ…" name="Freeze..." />
+  <menu_item_call label="追放" name="Eject..." />
+  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="ズームイン" name="Zoom In" />
+  <menu_item_call label="支払う…" name="Pay..." />
+  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
+  <context_menu label="アバターを描画" name="Render Avatar">
+    <menu_item_check label="デフォルト" name="RenderNormally" />
+    <menu_item_check label="常に使用する" name="AlwaysRenderFully" />
+    <menu_item_check label="使用しない" name="DoNotRender" />
+    <menu_item_call label="例外…" name="RenderExceptions" />
+  </context_menu>
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index fa1137c7c5..aae708e257 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Attachment Pie">
-	<menu_item_call label="触る" name="Attachment Object Touch"/>
-	<menu_item_call label="編集" name="Edit..."/>
-	<menu_item_call label="取り外す" name="Detach"/>
-	<menu_item_call label="座る" name="Sit Down Here"/>
-	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<menu_item_call label="容姿" name="Change Outfit"/>
-	<menu_item_call label="アウトフィットの編集" name="Edit Outfit"/>
-	<menu_item_call label="シェイプの編集" name="Edit My Shape"/>
-	<menu_item_call label="ホバー高さ" name="Hover Height"/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="フレンド" name="Friends..."/>
-	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="プロフィール" name="Profile..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="下に落とす" name="Drop"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="触る" name="Attachment Object Touch" />
+  <menu_item_call label="編集…" name="Edit..." />
+  <menu_item_call label="取り外す" name="Detach" />
+  <menu_item_call label="座る" name="Sit Down Here" />
+  <menu_item_call label="立ち上がる" name="Stand Up" />
+  <menu_item_call label="アウトフィットを変更" name="Change Outfit" />
+  <menu_item_call label="アウトフィットを編集" name="Edit Outfit" />
+  <menu_item_call label="シェイプの編集" name="Edit My Shape" />
+  <menu_item_call label="ホバー高さ" name="Hover Height" />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="フレンド…" name="Friends..." />
+  <menu_item_call label="グループ…" name="Groups..." />
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="下に置く" name="Drop" />
+  <menu_item_call label="パーティクルの所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
index 01699d1593..8c697317a5 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Avatar Icon Menu">
-	<menu_item_call label="プロフィールの表示" name="Show Profile"/>
-	<menu_item_call label="IMを送信..." name="Send IM"/>
-	<menu_item_call label="テレポートをリクエスト" name="Request Teleport"/>
-	<menu_item_call label="フレンドを追加..." name="Add Friend"/>
-	<menu_item_call label="フレンドを削除..." name="Remove Friend"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-	</context_menu>
-	<menu_item_call label="メンバーを立入禁止" name="BanMember"/>
-</toggleable_menu>
+  <menu_item_call label="プロフィールの表示" name="Show Profile" />
+  <menu_item_call label="IMを送信…" name="Send IM" />
+  <menu_item_call label="テレポートをリクエスト" name="Request Teleport" />
+  <menu_item_call label="フレンドを追加…" name="Add Friend" />
+  <menu_item_call label="フレンドを削除…" name="Remove Friend" />
+  <context_menu label="モデレーターのオプション" name="Moderator Options">
+    <menu_item_check label="文字チャットを許可" name="AllowTextChat" />
+    <menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected" />
+    <menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected" />
+  </context_menu>
+  <menu_item_call label="メンバーを立入禁止" name="BanMember" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index 3e706cd403..8a691467a8 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Avatar Pie">
-	<menu_item_call label="プロフィールの表示" name="Profile..."/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="IM" name="Send IM..."/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="グループに招待" name="Invite..."/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="ブロック" name="Avatar Mute"/>
-	<menu_item_call label="報告" name="abuse"/>
-	<menu_item_call label="フリーズ" name="Freeze..."/>
-	<menu_item_call label="追放" name="Eject..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="ズームイン" name="Zoom In"/>
-	<menu_item_call label="支払う" name="Pay..."/>
-	<context_menu label="アバターを描画" name="Render Avatar">
-		<menu_item_check label="デフォルト" name="RenderNormally"/>
-		<menu_item_check label="常に使用する" name="AlwaysRenderFully"/>
-		<menu_item_check label="使用しない" name="DoNotRender"/>
-		<menu_item_call label="例外…" name="RenderExceptions"/>
-	</context_menu>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="IMのやり取り…" name="Send IM..." />
+  <menu_item_call label="コール" name="Call" />
+  <menu_item_call label="グループへ招待…" name="Invite..." />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="ブロック" name="Avatar Mute" />
+  <menu_item_call label="報告" name="abuse" />
+  <menu_item_call label="フリーズ…" name="Freeze..." />
+  <menu_item_call label="追放…" name="Eject..." />
+  <menu_item_call label="テクスチャのデバッグ" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="ズームイン" name="Zoom In" />
+  <menu_item_call label="支払う…" name="Pay..." />
+  <context_menu label="アバターを描画" name="Render Avatar">
+    <menu_item_check label="デフォルト" name="RenderNormally" />
+    <menu_item_check label="常に使用する" name="AlwaysRenderFully" />
+    <menu_item_check label="使用しない" name="DoNotRender" />
+    <menu_item_call label="例外…" name="RenderExceptions" />
+  </context_menu>
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
index 59c80bdb0e..0b60751bb3 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Settings">
-	<menu_item_check label="デフォルト" name="default"/>
-	<menu_item_check label="常に描画" name="always_render"/>
-	<menu_item_check label="描画しない" name="never_render"/>
-</context_menu>
+  <menu_item_check label="デフォルト" name="default" />
+  <menu_item_check label="常に描画" name="always_render" />
+  <menu_item_check label="描画しない" name="never_render" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
index e4f78cad31..eb696ec534 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_add.xml">
-	<menu_item_call label="常に住人を描画する..." name="add_avatar_always_render"/>
-	<menu_item_call label="住人を描画しない..." name="add_avatar_never_render"/>
-</toggleable_menu>
+  <menu_item_call label="常に住人を描画する…" name="add_avatar_always_render" />
+  <menu_item_call label="住人を描画しない…" name="add_avatar_never_render" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index b0a619bcb0..80ed3b19c8 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
-	<menu_item_call label="座る" name="Sit Down Here"/>
-	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<context_menu label="取り外す" name="Take Off &gt;">
-		<context_menu label="衣類" name="Clothes &gt;">
-			<menu_item_call label="シャツ" name="Shirt"/>
-			<menu_item_call label="パンツ" name="Pants"/>
-			<menu_item_call label="スカート" name="Skirt"/>
-			<menu_item_call label="靴" name="Shoes"/>
-			<menu_item_call label="靴下" name="Socks"/>
-			<menu_item_call label="ジャケット" name="Jacket"/>
-			<menu_item_call label="手袋" name="Gloves"/>
-			<menu_item_call label="下着シャツ" name="Self Undershirt"/>
-			<menu_item_call label="下着パンツ" name="Self Underpants"/>
-			<menu_item_call label="タトゥ" name="Self Tattoo"/>
-			<menu_item_call label="物理作用" name="Self Physics"/>
-			<menu_item_call label="アルファ" name="Self Alpha"/>
-			<menu_item_call label="すべての衣類" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
-		<context_menu label="取り外す" name="Object Detach"/>
-		<menu_item_call label="すべて取り外す" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="容姿" name="Chenge Outfit"/>
-	<menu_item_call label="アウトフィットを編集" name="Edit Outfit"/>
-	<menu_item_call label="シェイプを編集" name="Edit My Shape"/>
-	<menu_item_call label="ホバー高さ" name="Hover Height"/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
-	<menu_item_call label="フレンド" name="Friends..."/>
-	<menu_item_call label="グループ" name="Groups..."/>
-	<menu_item_call label="プロフィール" name="Profile..."/>
-	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="座る" name="Sit Down Here" />
+  <menu_item_call label="立ち上がる" name="Stand Up" />
+  <context_menu label="脱ぐ" name="Take Off &gt;">
+    <context_menu label="服装" name="Clothes &gt;">
+      <menu_item_call label="シャツ" name="Shirt" />
+      <menu_item_call label="ズボン" name="Pants" />
+      <menu_item_call label="スカート" name="Skirt" />
+      <menu_item_call label="靴" name="Shoes" />
+      <menu_item_call label="靴下" name="Socks" />
+      <menu_item_call label="ジャケット" name="Jacket" />
+      <menu_item_call label="手袋" name="Gloves" />
+      <menu_item_call label="下着（上半身）" name="Self Undershirt" />
+      <menu_item_call label="下着（下半身）" name="Self Underpants" />
+      <menu_item_call label="タトゥ" name="Self Tattoo" />
+      <menu_item_call label="物理作用" name="Self Physics" />
+      <menu_item_call label="アルファ" name="Self Alpha" />
+      <menu_item_call label="すべての服装" name="All Clothes" />
+    </context_menu>
+    <context_menu label="HUD" name="Object Detach HUD" />
+    <context_menu label="取り外す" name="Object Detach" />
+    <menu_item_call label="すべて取り外す" name="Detach All" />
+  </context_menu>
+  <menu_item_call label="アウトフィットを変更" name="Chenge Outfit" />
+  <menu_item_call label="アウトフィットの編集" name="Edit Outfit" />
+  <menu_item_call label="シェイプを編集" name="Edit My Shape" />
+  <menu_item_call label="ホバー高さ" name="Hover Height" />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+  <menu_item_call label="フレンド…" name="Friends..." />
+  <menu_item_call label="グループ…" name="Groups..." />
+  <menu_item_call label="プロフィール…" name="Profile..." />
+  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
index aa07b9476e..3e4ab1f856 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Attachment">
-	<menu_item_call label="触る" name="touch_attach" />
-	<menu_item_call label="編集" name="edit_item" />
-	<menu_item_call label="取り外す" name="detach"/>
-</context_menu>
+  <menu_item_call label="触る" name="touch_attach" />
+  <menu_item_call label="編集" name="edit_item" />
+  <menu_item_call label="取り外す" name="detach" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
index eb5faa2545..8af5189f87 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Body">
-	<menu_item_call label="交換" name="replace"/>
-	<menu_item_call label="編集" name="edit"/>
-</context_menu>
+  <menu_item_call label="交換" name="replace" />
+  <menu_item_call label="編集" name="edit" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
index d984342896..47d4f76e48 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Clothing">
-	<menu_item_call label="取り外す" name="take_off"/>
-	<menu_item_call label="編集" name="edit"/>
-	<menu_item_call label="交換" name="replace"/>
-</context_menu>
+  <menu_item_call label="脱ぐ" name="take_off" />
+  <menu_item_call label="編集" name="edit" />
+  <menu_item_call label="着替える" name="replace" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index 07bcefd9b3..f6ce0e6c6c 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
-	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+  <menu label="新しい服装" name="COF.Gear.New_Clothes" />
+  <menu label="新しい身体部位" name="COF.Gear.New_Body_Parts" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
index 0de6a5f22f..ff6884f24d 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="会話を終える" name="close_conversation"/>
-	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
-	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
-	<menu_item_call label="選択した項目を閉じる" name="close_selected_conversations"/>
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="フレンドを追加" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-	<menu_item_call label="グループ情報" name="group_profile"/>
-	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
-	<menu_item_call label="グループから脱退する" name="leave_group"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
-		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
-	</context_menu>
-	<menu_item_call label="メンバーを立入禁止" name="BanMember"/>
-</toggleable_menu>
+  <menu_item_call label="会話を終える" name="close_conversation" />
+  <menu_item_call label="ボイスチャットを始める" name="open_voice_conversation" />
+  <menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice" />
+  <menu_item_call label="選択した項目を閉じる" name="close_selected_conversations" />
+  <menu_item_call label="プロフィールを表示" name="view_profile" />
+  <menu_item_call label="ＩＭ" name="im" />
+  <menu_item_call label="テレポートのオファー" name="offer_teleport" />
+  <menu_item_call label="ボイスコール" name="voice_call" />
+  <menu_item_call label="チャットの履歴…" name="chat_history" />
+  <menu_item_call label="フレンド追加" name="add_friend" />
+  <menu_item_call label="フレンド削除" name="remove_friend" />
+  <menu_item_call label="フレンド削除" name="remove_friends" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_call label="嫌がらせの報告" name="report_abuse" />
+  <menu_item_check label="ボイスをブロック" name="block_unblock" />
+  <menu_item_check label="テキストをブロックする" name="MuteText" />
+  <menu_item_call label="グループのプロフィール" name="group_profile" />
+  <menu_item_call label="このグループをアクティブ化" name="activate_group" />
+  <menu_item_call label="このグループから脱退する" name="leave_group" />
+  <context_menu label="モデレーターのオプション" name="Moderator Options">
+    <menu_item_check label="テキストチャットを許可" name="AllowTextChat" />
+    <menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected" />
+    <menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected" />
+    <menu_item_call label="全員のボイスをミュートする" name="ModerateVoiceMute" />
+    <menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute" />
+  </context_menu>
+  <menu_item_call label="メンバーをバンする" name="BanMember" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
index c9d4f947a4..7e43b8b61f 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="ボイスコール..." name="Call"/>
-	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="Invite"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-</toggleable_menu>
+  <menu_item_call label="ＩＭ…" name="IM" />
+  <menu_item_call label="ボイスコール…" name="Call" />
+  <menu_item_call label="チャットの履歴を開く…" name="Chat history" />
+  <menu_item_call label="プロフィールを表示" name="View Profile" />
+  <menu_item_call label="テレポートのオファー" name="teleport" />
+  <menu_item_call label="フレンド登録" name="add_friend" />
+  <menu_item_call label="フレンドを削除" name="remove_friend" />
+  <menu_item_call label="グループに招待…." name="Invite" />
+  <menu_item_call label="マップ" name="Map" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="支払い" name="Pay" />
+  <menu_item_check label="ブロック・ブロック解除" name="Block/Unblock" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
index bd4812603f..c239eb9543 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
-	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
-</toggleable_menu>
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="日付で並べ替え" name="sort_by_date" />
+  <menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends" />
+  <menu_item_call label="近隣チャットの履歴を表示…" name="view_nearby_chat_history" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
new file mode 100644
index 0000000000..819b05f854
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Color Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
new file mode 100644
index 0000000000..ac211997bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu layout="topleft" name="Copy Paste Features Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
new file mode 100644
index 0000000000..80d7eeff31
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Light Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
new file mode 100644
index 0000000000..ed1491298f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Object Menu">
+  <menu_item_call label="コピー" name="params_copy"/>
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
new file mode 100644
index 0000000000..92e0ec74ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Position Menu">
+  <menu_item_call label="すべてをコピー" name="psr_copy" />
+  <menu_item_call label="位置をコピー" name="pos_copy" />
+  <menu_item_call label="すべてペースト" name="psr_paste" />
+  <menu_item_call label="位置をペースト" name="pos_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
new file mode 100644
index 0000000000..9504f39ef1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Rotation Menu">
+  <menu_item_call label="すべてをコピー" name="psr_copy" />
+  <menu_item_call label="回転をコピー" name="rot_copy" />
+  <menu_item_call label="すべてをペースト" name="psr_paste" />
+  <menu_item_call label="回転をペースト" name="rot_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
new file mode 100644
index 0000000000..1ee1d6a914
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Size Menu">
+  <menu_item_call label="すべてをコピー" name="psr_copy" />
+  <menu_item_call label="サイズをコピー" name="size_copy" />
+  <menu_item_call label="すべてをペースト" name="psr_paste" />
+  <menu_item_call label="サイズをペースト" name="size_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
new file mode 100644
index 0000000000..a596fbe103
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Copy Paste Texture Menu">
+  <menu_item_call label="コピー" name="params_copy" />
+  <menu_item_call label="ペースト" name="params_paste" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml
index c2ef0179b2..0152675de7 100644
--- a/indra/newview/skins/default/xui/ja/menu_edit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_edit.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu label="編集" name="Edit">
-	<menu_item_call label="元に戻す" name="Undo"/>
-	<menu_item_call label="やり直し" name="Redo"/>
-	<menu_item_call label="切り取り" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="複製" name="Duplicate"/>
-	<menu_item_call label="すべて選択" name="Select All"/>
-	<menu_item_call label="選択解除" name="Deselect"/>
-</menu>
+  <menu_item_call label="元に戻す" name="Undo" />
+  <menu_item_call label="やり直し" name="Redo" />
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="複製" name="Duplicate" />
+  <menu_item_call label="すべて選択" name="Select All" />
+  <menu_item_call label="選択解除" name="Deselect" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml
index 4708b1446c..94361555fe 100644
--- a/indra/newview/skins/default/xui/ja/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="テレポート" name="Teleport To Landmark"/>
-	<menu_item_call label="ランドマークを表示・編集" name="Landmark Open"/>
-	<menu_item_call label="SLurl をコピー" name="Copy slurl"/>
-	<menu_item_call label="地図に表示" name="Show On Map"/>
-	<menu_item_call label="コピー" name="Landmark Copy"/>
-	<menu_item_call label="貼り付け" name="Landmark Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-</menu>
+  <menu_item_call label="テレポート" name="Teleport To Landmark" />
+  <menu_item_call label="ランドマークの表示／編集" name="Landmark Open" />
+  <menu_item_call label="ランドマークに移動" name="Move to Landmarks" />
+  <menu_item_call label="マップに表示" name="Show On Map" />
+  <menu_item_call label="SLurlをコピー" name="Copy slurl" />
+  <menu_item_call label="ピックを作成" name="create_pick" />
+  <menu_item_separator />
+  <menu_item_call label="コピー" name="Landmark Copy" />
+  <menu_item_call label="ペースト" name="Landmark Paste" />
+  <menu_item_call label="名前変更" name="rename" />
+  <menu_item_call label="削除" name="Delete" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
index 88c3aee042..2527e373f4 100644
--- a/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
@@ -1,23 +1,35 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit">
-	<menu name="New Clothes" label="新しい洋服">
-		<menu_item_call name="New Skirt" label="新しいスカート"/>
-		<menu_item_call name="New Underpants" label="新しい下着"/>
-		<menu_item_call name="New Undershirt" label="新しい肌着"/>
-		<menu_item_call name="New Shirt" label="新しいシャツ"/>
-		<menu_item_call name="New Pants" label="新しいパンツ"/>
-		<menu_item_call name="New Tattoo" label="新しいタトゥー"/>
-		<menu_item_call name="New Physics" label="新しい体"/>
-		<menu_item_call name="New Jacket" label="新しいジャケット"/>
-		<menu_item_call name="New Shoes" label="新しい靴"/>
-		<menu_item_call name="New Gloves" label="新しいグローブ"/>
-		<menu_item_call name="New Alpha" label="新しいアルファ"/>
-		<menu_item_call name="New Socks" label="新しい靴下"/>
-	</menu>
-	<menu name="New Body Parts" label="新しいボディーパーツ">
-		<menu_item_call name="New Hair" label="新しい髪"/>
-		<menu_item_call name="New Eyes" label="新しい目"/>
-		<menu_item_call name="New Shape" label="新しいシェイプ"/>
-		<menu_item_call name="New Skin" label="新しい皮膚"/>
-	</menu>
-</context_menu>
+  <menu_item_call label="着る－このアウトフィットに着替える" name="wear_replace" />
+  <menu_item_call label="着る－このアウトフィットに追加する" name="wear_add" />
+  <menu_item_call label="脱ぐ－このアウトフィットから取り外す" name="take_off" />
+  <menu_item_call label="画像をアップロード（L$ [UPLOAD_COST]）" name="upload_photo" />
+  <menu_item_call label="画像を選択" name="select_photo" />
+  <menu_item_call label="スナップショットを撮影" name="take_snapshot" />
+  <menu_item_call label="画像を削除" name="remove_photo" />
+  <menu_item_separator name="sepatator1" />
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しいジャケット" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
+    <menu_item_call label="新しいアルファ" name="New Alpha" />
+    <menu_item_call label="新しい物理作用" name="New Physics" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ" name="New Shape" />
+    <menu_item_call label="新しい肌" name="New Skin" />
+    <menu_item_call label="新しい髪型" name="New Hair" />
+    <menu_item_call label="新しい目" name="New Eyes" />
+  </menu>
+  <menu_item_separator name="sepatator2" />
+  <menu_item_call label="アウトフィットを編集" name="edit" />
+  <menu_item_call label="アウトフィットの名前変更" name="rename" />
+  <menu_item_call label="アウトフィットを削除" name="delete" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
index 3eacfb3507..333db46380 100644
--- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_gesture_gear">
-	<menu_item_call label="選択したジェスチャーのアクティベートの有無" name="activate"/>
-	<menu_item_call label="コピー" name="copy_gesture"/>
-	<menu_item_call label="貼り付け" name="paste"/>
-	<menu_item_call label="UUID をコピー" name="copy_uuid"/>
-	<menu_item_call label="現在のアウトフィットに保存" name="save_to_outfit"/>
-	<menu_item_call label="編集" name="edit_gesture"/>
-	<menu_item_call label="調べる" name="inspect"/>
-</menu>
+  <menu_item_call label="選択したジェスチャーの有効化／無効化" name="activate" />
+  <menu_item_call label="名前変更" name="rename" />
+  <menu_item_call label="コピー" name="copy_gesture" />
+  <menu_item_call label="ペースト" name="paste" />
+  <menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid" />
+  <menu_item_call label="現在のアウトフィットに保存" name="save_to_outfit" />
+  <menu_item_call label="編集" name="edit_gesture" />
+  <menu_item_call label="調べる" name="inspect" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
index 3787f7d645..52cc5e69e1 100644
--- a/indra/newview/skins/default/xui/ja/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-	<menu_item_call label="グループに参加..." name="item_join"/>
-	<menu_item_call label="新しいグループ..." name="item_new"/>
-</menu>
+  <menu_item_call label="グループに参加…" name="item_join" />
+  <menu_item_call label="新しいグループ…" name="item_new" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
index 2e633ae1b2..3a9fb3570a 100644
--- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_navbar_menu">
-	<menu_item_check label="ナビゲーションバーとお気に入りバーを表示" name="ShowNavbarNavigationPanel"/>
-	<menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
-	<menu_item_check label="「場所」のミニフィールドを表示" name="ShowMiniLocationPanel"/>
-</menu>
+  <menu_item_check label="ナビゲーションバーとお気に入りバーを表示" name="ShowNavbarNavigationPanel" />
+  <menu_item_check label="「場所」のミニフィールドを表示" name="ShowMiniLocationPanel" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
index 55cd6610f7..8899b69f1a 100644
--- a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-</toggleable_menu>
+  <menu_item_call label="プロフィールを表示" name="View Profile" />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="フレンドを削除" name="remove_friend" />
+  <menu_item_call label="テレポートをオファー" name="offer_teleport" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_call label="チャットの履歴…" name="chat_history" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="支払い" name="Pay" />
+  <menu_item_call label="迷惑行為の報告" name="Report Abuse" />
+  <menu_item_check label="ボイスのブロック／解除" name="Block/Unblock" />
+  <menu_item_check label="テキストをブロックする" name="MuteText" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
index 222a741718..5ef2a4152a 100644
--- a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_modes">
-	<menu_item_check label="簡略表示" name="compact_view"/>
-	<menu_item_check label="詳細表示" name="expanded_view"/>
-	<menu_item_check label="時間を表示" name="IMShowTime"/>
-	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
+  <menu_item_check label="簡易表示" name="compact_view" />
+  <menu_item_check label="詳細表示" name="expanded_view" />
+  <menu_item_check label="時間を表示" name="IMShowTime" />
+  <menu_item_check label="１対１の会話で名前を表示" name="IMShowNamesForP2PConv" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
index 8cd6fa4a27..26b581b793 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet AdHoc Menu">
-	<menu_item_call label="セッション終了" name="End Session"/>
-</menu>
+  <menu_item_call label="セッション終了" name="End Session" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
index 5bcb96f083..7ae8765df4 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet Group Menu">
-	<menu_item_call label="グループ情報" name="Show Profile"/>
-	<menu_item_call label="セッションを表示" name="Chat"/>
-	<menu_item_call label="セッション終了" name="End Session"/>
-</menu>
+  <menu_item_call label="プロフィールを表示" name="Show Profile" />
+  <menu_item_call label="セッションを表示" name="Chat" />
+  <menu_item_call label="セッション終了" name="End Session" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
index 5453f998fa..61a9bae73c 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet P2P Menu">
-	<menu_item_call label="プロフィールの表示" name="Show Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="セッションを表示" name="Send IM"/>
-	<menu_item_call label="セッション終了" name="End Session"/>
-</menu>
+  <menu_item_call label="プロフィールの表示" name="Show Profile" />
+  <menu_item_call label="フレンドに追加" name="Add Friend" />
+  <menu_item_call label="セッションを表示" name="Send IM" />
+  <menu_item_call label="セッション終了" name="End Session" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
index 5a0519ba19..ec5abea6b2 100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <toggleable_menu name="Gear Menu">
-	<menu_item_call label="触る" name="touch"/>
-	<menu_item_call label="座る" name="sit"/>
-	<menu_item_call label="支払う" name="pay"/>
-	<menu_item_call label="買う" name="buy"/>
-	<menu_item_call label="取る" name="take"/>
-	<menu_item_call label="コピーを取る" name="take_copy"/>
-	<menu_item_call label="開く" name="open"/>
-	<menu_item_call label="編集" name="edit"/>
-	<menu_item_call label="装着" name="wear"/>
-	<menu_item_call label="追加" name="add"/>
-	<menu_item_call label="報告" name="report"/>
-	<menu_item_call label="ブロック" name="block"/>
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="削除" name="remove"/>
-	<menu_item_call label="詳細" name="more_info"/>
-</toggleable_menu>
+  <menu_item_call label="触る" name="touch" />
+  <menu_item_call label="座る" name="sit" />
+  <menu_item_call label="支払う" name="pay" />
+  <menu_item_call label="買う" name="buy" />
+  <menu_item_call label="取る" name="take" />
+  <menu_item_call label="コピーを取る" name="take_copy" />
+  <menu_item_call label="開く" name="open" />
+  <menu_item_call label="編集" name="edit" />
+  <menu_item_call label="装着" name="wear" />
+  <menu_item_call label="追加" name="add" />
+  <menu_item_call label="報告" name="report" />
+  <menu_item_call label="ブロック" name="block" />
+  <menu_item_call label="ブロック解除" name="unblock" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="削除" name="remove" />
+  <menu_item_call label="詳細" name="more_info" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
index 9a4a8138f5..d9642e3c0c 100644
--- a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="InvOfferChiclet Menu">
-	<menu_item_call label="閉じる" name="Close"/>
-</menu>
+  <menu_item_call label="閉じる" name="Close" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 7f68c18e0b..f25c32c084 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -1,117 +1,133 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="リストを作成" name="Marketplace Create Listing"/>
-	<menu_item_call label="リストを関連付け" name="Marketplace Associate Listing"/>
-	<menu_item_call label="リストを取得 (更新)" name="Marketplace Get Listing"/>
-	<menu_item_call label="エラーを確認" name="Marketplace Check Listing"/>
-	<menu_item_call label="リストを編集" name="Marketplace Edit Listing"/>
-	<menu_item_call label="リスト" name="Marketplace List"/>
-	<menu_item_call label="リストから取り除く" name="Marketplace Unlist"/>
-	<menu_item_call label="有効にする" name="Marketplace Activate"/>
-	<menu_item_call label="無効にする" name="Marketplace Deactivate"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="開く" name="Task Open"/>
-	<menu_item_call label="再生" name="Task Play"/>
-	<menu_item_call label="プロパティ" name="Task Properties"/>
-	<menu_item_call label="名前の変更" name="Task Rename"/>
-	<menu_item_call label="削除" name="Task Remove"/>
-	<menu_item_call label="ごみ箱を空にする" name="Empty Trash"/>
-	<menu_item_call label="紛失物フォルダを空にする" name="Empty Lost And Found"/>
-	<menu_item_call label="新しいフォルダ" name="New Folder"/>
-	<menu_item_call label="新しいスクリプト" name="New Script"/>
-	<menu_item_call label="新しいノートカード" name="New Note"/>
-	<menu_item_call label="新しいジェスチャー" name="New Gesture"/>
-	<menu label="新しい衣類" name="New Clothes">
-		<menu_item_call label="新しいシャツ" name="New Shirt"/>
-		<menu_item_call label="新しいズボン" name="New Pants"/>
-		<menu_item_call label="新しい靴" name="New Shoes"/>
-		<menu_item_call label="新しい靴下" name="New Socks"/>
-		<menu_item_call label="新しいジャケット" name="New Jacket"/>
-		<menu_item_call label="新しいスカート" name="New Skirt"/>
-		<menu_item_call label="新しい手袋" name="New Gloves"/>
-		<menu_item_call label="新しい下着" name="New Undershirt"/>
-		<menu_item_call label="新しいパンツ" name="New Underpants"/>
-		<menu_item_call label="新しいアルファマスク" name="New Alpha Mask"/>
-		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
-		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
-		<menu_item_call label="新規の物理作用" name="New Physics"/>
-	</menu>
-	<menu label="新しい身体部位" name="New Body Parts">
-		<menu_item_call label="新しいシェイプ(体型)" name="New Shape"/>
-		<menu_item_call label="新しいスキン" name="New Skin"/>
-		<menu_item_call label="新しい髪" name="New Hair"/>
-		<menu_item_call label="新しい眼" name="New Eyes"/>
-	</menu>
-	<menu label="新しい設定" name="New Settings">
-		<menu_item_call label="新しい空" name="New Sky"/>
-		<menu_item_call label="新しい水" name="New Water"/>
-		<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
-	</menu>
-	<menu label="次のデフォルトとして使用" name="upload_def">
-		<menu_item_call label="画像のアップロード" name="Image uploads"/>
-		<menu_item_call label="サウンドのアップロード" name="Sound uploads"/>
-		<menu_item_call label="アニメーションのアップロード" name="Animation uploads"/>
-		<menu_item_call label="モデルのアップロード" name="Model uploads"/>
-	</menu>
-	<menu label="種類を変更" name="Change Type">
-		<menu_item_call label="デフォルト" name="Default"/>
-		<menu_item_call label="手袋" name="Gloves"/>
-		<menu_item_call label="ジャケット" name="Jacket"/>
-		<menu_item_call label="パンツ" name="Pants"/>
-		<menu_item_call label="シェイプ" name="Shape"/>
-		<menu_item_call label="靴" name="Shoes"/>
-		<menu_item_call label="シャツ" name="Shirt"/>
-		<menu_item_call label="スカート" name="Skirt"/>
-		<menu_item_call label="下着パンツ" name="Underpants"/>
-		<menu_item_call label="下着シャツ" name="Undershirt"/>
-	</menu>
-	<menu_item_call label="テレポート" name="Landmark Open"/>
-	<menu_item_call label="開く" name="Animation Open"/>
-	<menu_item_call label="開く" name="Sound Open"/>
-	<menu_item_call label="着用中のアウトフィットを入れ替える" name="Replace Outfit"/>
-	<menu_item_call label="着用中のアウトフィットに追加する" name="Add To Outfit"/>
-	<menu_item_call label="着用中のアウトフィットから取り除く" name="Remove From Outfit"/>
-	<menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="Copy outfit list to clipboard"/>
-	<menu_item_call label="オリジナルを探す" name="Find Original"/>
-	<menu_item_call label="アイテムを除外する" name="Purge Item"/>
-	<menu_item_call label="アイテムを復元する" name="Restore Item"/>
-	<menu_item_call label="開く" name="Open"/>
-	<menu_item_call label="オリジナルを開きます" name="Open Original"/>
-	<menu_item_call label="プロパティ" name="Properties"/>
-	<menu_item_call label="名前を変更する" name="Rename"/>
-	<menu_item_call label="UUID をコピーする" name="Copy Asset UUID"/>
-	<menu_item_call label="メイン画面で表示する" name="Show in Main Panel"/>
-	<menu_item_call label="カット" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="リンクを貼り付ける" name="Paste As Link"/>
-	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="システムフォルダを削除する" name="Delete System Folder"/>
-	<menu_item_call label="コンファレンスチャットを開始する" name="Conference Chat Folder"/>
-	<menu_item_call label="再生する" name="Sound Play"/>
-	<menu_item_call label="SLurl をコピー" name="url_copy"/>
-	<menu_item_call label="ランドマークの情報" name="About Landmark"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="インワールドで再生する" name="Animation Play"/>
-	<menu_item_call label="ローカルで再生する" name="Animation Audition"/>
-	<menu_item_call label="インスタントメッセージを送信する" name="Send Instant Message"/>
-	<menu_item_call label="テレポートを送る..." name="Offer Teleport..."/>
-	<menu_item_call label="コンファレンスチャットを開始する" name="Conference Chat"/>
-	<menu_item_call label="アクティブ" name="Activate"/>
-	<menu_item_call label="非アクティブ" name="Deactivate"/>
-	<menu_item_call label="別名で保存する" name="Save As"/>
-	<menu_item_call label="自分から取り外す" name="Detach From Yourself"/>
-	<menu_item_call label="装着" name="Wearable And Object Wear"/>
-	<menu label="装着先" name="Attach To"/>
-	<menu label="HUD 装着先" name="Attach To HUD"/>
-	<menu_item_call label="触る" name="Attachment Touch" />
-	<menu_item_call label="編集" name="Wearable Edit"/>
-	<menu_item_call label="追加" name="Wearable Add"/>
-	<menu_item_call label="取り外す" name="Take Off"/>
-	<menu_item_call label="自分にのみ適用" name="Settings Apply Local"/>
-	<menu_item_call label="区画に適用" name="Settings Apply Parcel"/>
-	<menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy"/>
-	<menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move"/>
-	<menu_item_call label="－－オプションなし－－" name="--no options--"/>
-</menu>
+  <menu_item_call label="リストを作成" name="Marketplace Create Listing" />
+  <menu_item_call label="リストを関連付け" name="Marketplace Associate Listing" />
+  <menu_item_call label="リストを取得 (更新)" name="Marketplace Get Listing" />
+  <menu_item_call label="エラーを確認" name="Marketplace Check Listing" />
+  <menu_item_call label="リストを編集" name="Marketplace Edit Listing" />
+  <menu_item_call label="リスト" name="Marketplace List" />
+  <menu_item_call label="リストから取り除く" name="Marketplace Unlist" />
+  <menu_item_call label="有効に" name="Marketplace Activate" />
+  <menu_item_call label="無効に" name="Marketplace Deactivate" />
+  <menu_item_separator name="Marketplace Listings Separator" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="開く" name="Task Open" />
+  <menu_item_call label="再生" name="Task Play" />
+  <menu_item_call label="プロパティ" name="Task Properties" />
+  <menu_item_call label="名前の変更" name="Task Rename" />
+  <menu_item_call label="削除" name="Task Remove" />
+  <menu_item_call label="ごみ箱を空に" name="Empty Trash" />
+  <menu_item_call label="遺失物フォルダを空に" name="Empty Lost And Found" />
+  <menu_item_call label="新しいフォルダ" name="New Folder" />
+  <menu_item_call label="新しいアウトフィット" name="New Outfit" />
+  <menu_item_call label="新しいスクリプト" name="New Script" />
+  <menu_item_call label="新しいノートカード" name="New Note" />
+  <menu_item_call label="新しいジェスチャー" name="New Gesture" />
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しいジャケット" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下）" name="New Underpants" />
+    <menu_item_call label="新しいアルファマスク" name="New Alpha Mask" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+    <menu_item_call label="新しいユニバーサル" name="New Universal" />
+    <menu_item_call label="新規の物理作用" name="New Physics" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ(体型)" name="New Shape" />
+    <menu_item_call label="新しいスキン" name="New Skin" />
+    <menu_item_call label="新しい髪" name="New Hair" />
+    <menu_item_call label="新しい眼" name="New Eyes" />
+  </menu>
+  <menu label="新しい設定" name="New Settings">
+    <menu_item_call label="新しい空" name="New Sky" />
+    <menu_item_call label="新しい水" name="New Water" />
+    <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
+  </menu>
+  <menu label="次のデフォルトとして使用" name="upload_def">
+    <menu_item_call label="画像のアップロード" name="Image uploads" />
+    <menu_item_call label="サウンドのアップロード" name="Sound uploads" />
+    <menu_item_call label="アニメーションのアップロード" name="Animation uploads" />
+    <menu_item_call label="モデルのアップロード" name="Model uploads" />
+  </menu>
+  <menu label="種類を変更" name="Change Type">
+    <menu_item_call label="デフォルト" name="Default" />
+    <menu_item_call label="手袋" name="Gloves" />
+    <menu_item_call label="上着" name="Jacket" />
+    <menu_item_call label="ズボン" name="Pants" />
+    <menu_item_call label="シェイプ" name="Shape" />
+    <menu_item_call label="靴" name="Shoes" />
+    <menu_item_call label="シャツ" name="Shirt" />
+    <menu_item_call label="スカート" name="Skirt" />
+    <menu_item_call label="下着（上半身）" name="Underpants" />
+    <menu_item_call label="下着（下半身）" name="Undershirt" />
+  </menu>
+  <menu_item_call label="テレポート" name="Landmark Open" />
+  <menu_item_call label="開く" name="Animation Open" />
+  <menu_item_call label="開く" name="Sound Open" />
+  <menu_item_call label="着用中のアウトフィットと入れ替え" name="Replace Outfit" />
+  <menu_item_call label="着用中のアウトフィットに追加" name="Add To Outfit" />
+  <menu_item_call label="着用中のアウトフィットから取り外す" name="Remove From Outfit" />
+  <menu_item_call label="アウトフィット一覧をクリップボードにコピー" name="Copy outfit list to clipboard" />
+  <menu_item_separator name="Outfit Separator" />
+  <menu_item_call label="オリジナルを探す" name="Find Original" />
+  <menu_item_call label="アイテムを除外" name="Purge Item" />
+  <menu_item_call label="アイテムを復元" name="Restore Item" />
+  <menu_item_call label="開く" name="Open" />
+  <menu_item_call label="オリジナルを開く" name="Open Original" />
+  <menu_item_call label="プロパティ" name="Properties" />
+  <menu_item_call label="名前を変更" name="Rename" />
+  <menu_item_call label="アセットのＵＵＩＤをコピー" name="Copy Asset UUID" />
+  <menu_item_call label="メインパネルで表示" name="Show in Main Panel" />
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="リンクとしてペースト" name="Paste As Link" />
+  <menu_item_call label="リンクを置き換える" name="Replace Links" />
+  <menu_item_separator name="Paste Separator" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="システムフォルダを削除" name="Delete System Folder" />
+  <menu_item_separator />
+  <menu_item_separator />
+  <menu_item_call label="会話チャットを開始" name="Conference Chat Folder" />
+  <menu_item_call label="再生" name="Sound Play" />
+  <menu_item_call label="SLurlをコピー" name="url_copy" />
+  <menu_item_call label="ランドマークの情報" name="About Landmark" />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator name="Animation Separator" />
+  <menu_item_call label="インワールドで再生" name="Animation Play" />
+  <menu_item_call label="ローカルで再生" name="Animation Audition" />
+  <menu_item_call label="インスタントメッセージを送信" name="Send Instant Message" />
+  <menu_item_call label="テレポートをオファー…" name="Offer Teleport..." />
+  <menu_item_call label="テレポートをリクエスト…" name="Request Teleport..." />
+  <menu_item_call label="会話チャットを開始" name="Conference Chat" />
+  <menu_item_call label="有効化" name="Activate" />
+  <menu_item_call label="無効化" name="Deactivate" />
+  <menu_item_call label="名前をつけて保存" name="Save As" />
+  <menu_item_call label="選択を名前をつけて保存" layout="topleft" name="Save Selected As" />
+  <menu_item_separator name="Wearable And Object Separator" />
+  <!-- COMMENTED OUT for DEV-32347 -->
+  <!--
+  <menu_item_call label="最後の場所へリストア" name="Restore to Last Position" />
+  -->
+  <menu_item_call label="装着" name="Wearable And Object Wear" />
+  <menu label="装着先" name="Attach To" />
+  <menu label="HUD 装着先" name="Attach To HUD" />
+  <menu_item_call label="触る" name="Attachment Touch" />
+  <menu_item_call label="編集" name="Wearable Edit" />
+  <menu_item_call label="追加" name="Wearable Add" />
+  <menu_item_call label="取り外す" name="Detach From Yourself" />
+  <menu_item_call label="脱ぐ" name="Take Off" />
+  <menu_item_separator name="Settings Separator" />
+  <menu_item_call label="自分にのみ適用" name="Settings Apply Local" />
+  <menu_item_call label="区画に適用" name="Settings Apply Parcel" />
+  <menu_item_separator layout="topleft" />
+  <menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy" />
+  <menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move" />
+  <menu_item_call label="－オプションなし－" name="--no options--" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index eecf166a70..3f43469c6f 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_inventory_add">
-	<menu label="アップロード" name="upload">
-		<menu_item_call label="画像 （L$ [COST] ）..." name="Upload Image"/>
-		<menu_item_call label="サウンド （L$[COST] ）..." name="Upload Sound"/>
-		<menu_item_call label="アニメーション （L$ [COST] ）..." name="Upload Animation"/>
-		<menu_item_call label="モデル" name="Upload Model"/>
-		<menu_item_call label="一括 （ファイルにつき L$[COST] ）..." name="Bulk Upload"/>
-	</menu>
-	<menu_item_call label="新規フォルダ" name="New Folder"/>
-	<menu_item_call label="新規スクリプト" name="New Script"/>
-	<menu_item_call label="新しいノートカード" name="New Note"/>
-	<menu_item_call label="新規ジェスチャー" name="New Gesture"/>
-	<menu label="新しい衣類" name="New Clothes">
-		<menu_item_call label="新しいシャツ" name="New Shirt"/>
-		<menu_item_call label="新しいパンツ" name="New Pants"/>
-		<menu_item_call label="新しい靴" name="New Shoes"/>
-		<menu_item_call label="新しい靴下" name="New Socks"/>
-		<menu_item_call label="新しいジャケット" name="New Jacket"/>
-		<menu_item_call label="新しいスカート" name="New Skirt"/>
-		<menu_item_call label="新しい手袋" name="New Gloves"/>
-		<menu_item_call label="新しい下着（上）" name="New Undershirt"/>
-		<menu_item_call label="新しい下着（下）" name="New Underpants"/>
-		<menu_item_call label="新しいアルファ" name="New Alpha"/>
-		<menu_item_call label="新しいタトゥー" name="New Tattoo"/>
-		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
-		<menu_item_call label="新規の物理作用" name="New Physics"/>
-	</menu>
-	<menu label="新しい身体部位" name="New Body Parts">
-		<menu_item_call label="新しいシェイプ（体型）" name="New Shape"/>
-		<menu_item_call label="新しいスキン" name="New Skin"/>
-		<menu_item_call label="新しい髪" name="New Hair"/>
-		<menu_item_call label="新しい目" name="New Eyes"/>
-	</menu>
-	<menu label="新しい設定" name="New Settings">
-		<menu_item_call label="新しい空" name="New Sky"/>
-		<menu_item_call label="新しい水" name="New Water"/>
-		<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
-	</menu>
-</menu>
+  <menu label="アップロード" name="upload">
+    <menu_item_call label="画像 （L$ [COST]）…" name="Upload Image" />
+    <menu_item_call label="サウンド （L$ [COST]）…" name="Upload Sound" />
+    <menu_item_call label="アニメーション （L$ [COST]）…" name="Upload Animation" />
+    <menu_item_call label="モデル" name="Upload Model" />
+    <menu_item_call label="一括 （ファイルにつき L$ [COST]）…" name="Bulk Upload" />
+  </menu>
+  <menu_item_call label="新規フォルダ" name="New Folder" />
+  <menu_item_call label="新規スクリプト" name="New Script" />
+  <menu_item_call label="新しいノートカード" name="New Note" />
+  <menu_item_call label="新規ジェスチャー" name="New Gesture" />
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しいジャケット" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
+    <menu_item_call label="新しいアルファ" name="New Alpha" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+    <menu_item_call label="新しいユニバーサル" name="New Universal" />
+    <menu_item_call label="新しい物理作用" name="New Physics" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ（体型）" name="New Shape" />
+    <menu_item_call label="新しいスキン" name="New Skin" />
+    <menu_item_call label="新しい髪" name="New Hair" />
+    <menu_item_call label="新しい目" name="New Eyes" />
+  </menu>
+  <menu label="新しい環境設定" name="New Settings">
+    <menu_item_call label="新しい空" name="New Sky" />
+    <menu_item_call label="新しい水" name="New Water" />
+    <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
+  </menu>
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
index ad60b0d01f..7a8adcb9fb 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gear_default">
-	<menu_item_call label="新しいインベントリウィンドウ" name="new_window"/>
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
-	<menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/>
-	<menu_item_check label="システムフォルダを上にソートする" name="sort_system_folders_to_top"/>
-	<menu_item_call label="フィルターを表示..." name="show_filters"/>
-	<menu_item_call label="フィルターをリセット" name="reset_filters"/>
-	<menu_item_call label="すべてのフォルダを閉じる" name="close_folders"/>
-	<menu_item_call label="紛失物を空にする" name="empty_lostnfound"/>
-	<menu_item_call label="別名でテクスチャを保存" name="Save Texture As"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="オリジナルを表示" name="Find Original"/>
-	<menu_item_call label="すべてのリンクを表示" name="Find All Links"/>
-	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
-	<menu_item_call label="ごみ箱を空にする" name="empty_trash"/>
-</toggleable_menu>
+  <menu_item_call label="新しいインベントリウィンドウ" name="new_window" />
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="新しい順に並べ替え" name="sort_by_recent" />
+  <menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name" />
+  <menu_item_check label="システムフォルダを上にソートする" name="sort_system_folders_to_top" />
+  <menu_item_separator />
+  <menu_item_call label="フィルタを表示…" name="show_filters" />
+  <menu_item_call label="フィルタをリセット" name="reset_filters" />
+  <menu_item_call label="すべてのフォルダを閉じる" name="close_folders" />
+  <menu_item_separator />
+  <menu_item_call label="遺失物を空にする" name="empty_lostnfound" />
+  <menu_item_call label="別名でテクスチャを保存" name="Save Texture As" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="オリジナルを表示" name="Find Original" />
+  <menu_item_call label="すべてのリンクを表示" name="Find All Links" />
+  <menu_item_call label="リンクを置き換える" name="Replace Links" />
+  <menu_item_separator />
+  <menu_item_call label="ごみ箱を空にする" name="empty_trash" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
new file mode 100644
index 0000000000..f76be9631a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_search_visibility">
+  <menu_item_check label="ゴミ箱を検索" name="search_trash"/>
+  <menu_item_check label="ライブラリを検索" name="search_library"/>
+  <menu_item_separator />
+  <menu_item_check label="リンクを含む" name="include_links"/>
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
index 3754bd7fa4..a65504b14c 100644
--- a/indra/newview/skins/default/xui/ja/menu_land.xml
+++ b/indra/newview/skins/default/xui/ja/menu_land.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Land Pie">
-	<menu_item_call label="土地情報" name="Place Information..."/>
-	<menu_item_call label="ここに座る" name="Sit Here"/>
-	<menu_item_call label="この土地を購入" name="Land Buy"/>
-	<menu_item_call label="入場許可を購入" name="Land Buy Pass"/>
-	<menu_item_call label="制作" name="Create"/>
-	<menu_item_call label="地形を編集" name="Edit Terrain"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="土地情報…" name="Place Information..." />
+  <!--
+  <menu_item_call label="ホームへ" name="Go Here" />
+  -->
+  <menu_item_call label="ここに座る" name="Sit Here" />
+  <menu_item_call label="この土地を購入" name="Land Buy" />
+  <menu_item_call label="入場許可を購入" name="Land Buy Pass" />
+  <menu_item_call label="作成" name="Create" />
+  <menu_item_call label="地形を編集" name="Edit Terrain" />
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
index c134422955..06345c5074 100644
--- a/indra/newview/skins/default/xui/ja/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="landmark_overflow_menu">
-	<menu_item_call label="SLurl をコピー" name="copy"/>
-	<menu_item_call label="削除" name="delete"/>
-	<menu_item_call label="ピックを作成" name="pick"/>
-	<menu_item_call label="お気に入りバーに追加" name="add_to_favbar"/>
-</toggleable_menu>
+  <menu_item_call label="SLurl をコピー" name="copy" />
+  <menu_item_call label="削除" name="delete" />
+  <menu_item_call label="ピックを作成" name="pick" />
+  <menu_item_call label="お気に入りバーに追加" name="add_to_favbar" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index 61b473858b..5ba2092648 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-	<menu label="ミー" name="File">
-		<menu_item_call label="環境設定..." name="Preferences..."/>
-		<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
-		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
-		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
-	</menu>
-	<menu label="ヘルプ" name="Help">
-		<menu_item_call label="ハウツー..." name="How To"/>
-		<menu_item_call label="クイックスタート" name="Quickstart"/>
-		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="コミュニティ フォーラム" name="Community Forums"/>
-		<menu_item_call label="日本語サポートページ" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
-		<menu_item_call label="バグを報告する" name="Report Bug"/>
-		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
-	</menu>
-	<menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu"/>
-	<menu label="デバッグ" name="Debug">
-		<menu_item_call label="デバッグ設定を表示" name="Debug Settings"/>
-		<menu_item_call label="XUI プレビューツール" name="UI Preview Tool"/>
-		<menu label="UI テスト" name="UI Tests"/>
-		<menu_item_call label="ウィンドウのサイズを設定..." name="Set Window Size..."/>
-		<menu_item_call label="利用規約を表示" name="TOS"/>
-		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
-		<menu_item_call label="メディアブラウザ" name="Media Browser"/>
-		<menu label="ログレベルを設定" name="Set Logging Level">
-			<menu_item_check label="デバッグ" name="Debug"/>
-			<menu_item_check label="情報" name="Info"/>
-			<menu_item_check label="警告" name="Warning"/>
-			<menu_item_check label="エラー" name="Error"/>
-			<menu_item_check label="なし" name="None"/>
-		</menu>
-		<menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/>
-	</menu>
-</menu_bar>
+  <menu label="私" name="File">
+    <menu_item_call label="初期設定…" name="Preferences..." />
+    <menu_item_call label="ウィンドウを閉じる" name="Close Window" />
+    <menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker" />
+    <menu_item_call label="[APP_NAME]を終了" name="Quit" />
+  </menu>
+  <menu label="ヘルプ" name="Help">
+    <menu_item_call label="ハウツー…" name="How To" />
+    <menu_item_call label="クイックスタート" name="Quickstart" />
+    <menu_item_call label="ナレッジベース" name="Knowledge Base" />
+    <menu_item_call label="Wiki" name="Wiki" />
+    <menu_item_call label="コミュニティ フォーラム" name="Community Forums" />
+    <menu_item_call label="日本語サポートページ" name="Support portal" />
+    <menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News" />
+    <menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs" />
+    <menu_item_call label="バグを報告する" name="Report Bug" />
+    <menu_item_call label="[APP_NAME]について" name="About Second Life" />
+  </menu>
+  <menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu" />
+  <menu label="デバッグ" name="Debug">
+    <menu_item_call label="デバッグ設定を表示" name="Debug Settings" />
+    <menu_item_call label="XUIプレビューツール" name="UI Preview Tool" />
+    <menu label="UI テスト" name="UI Tests" />
+    <menu_item_call label="ウィンドウのサイズを設定…" name="Set Window Size..." />
+    <menu_item_call label="利用規約を表示" name="TOS" />
+    <menu_item_call label="クリティカルメッセージを表示" name="Critical" />
+    <menu_item_call label="メディアブラウザ" name="Media Browser" />
+    <menu label="ログレベルを設定" name="Set Logging Level">
+      <menu_item_check label="デバッグ" name="Debug" />
+      <menu_item_check label="情報" name="Info" />
+      <menu_item_check label="警告" name="Warning" />
+      <menu_item_check label="エラー" name="Error" />
+      <menu_item_check label="なし" name="None" />
+    </menu>
+    <menu_item_call label="通知コンソールを表示する" name="Show Notifications Console" />
+  </menu>
+</menu_bar>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
index bf38075556..6c6913db5d 100644
--- a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
-	<menu_item_check label="名前による並べ替え" name="sort_by_name"/>
-	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
-	<menu_item_check label="在庫高順に並べ替え (低から高へ)" name="sort_by_stock_amount"/>
-	<menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders"/>
-</toggleable_menu>
+  <menu_item_check label="名前による並べ替え" name="sort_by_name" />
+  <menu_item_check label="新しい順に並べ替え" name="sort_by_recent" />
+  <menu_item_check label="在庫数順に並べ替え (低から高へ)" name="sort_by_stock_amount" />
+  <menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
index faae4ef717..6f4f4938f4 100644
--- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="media ctrl context menu">
-	<menu_item_call label="カット" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="ウェブインスペクターを開く" name="open_webinspector"/>
-</context_menu>
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_separator name="debug_separator" />
+  <menu_item_call label="Webインスペクターを開く" name="open_webinspector" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index 2e733ee24b..77a2e60cda 100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="ズーム（近）" name="Zoom Close"/>
-	<menu_item_call label="ズーム（中）" name="Zoom Medium"/>
-	<menu_item_call label="ズーム（遠）" name="Zoom Far"/>
-	<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
-	<menu_item_check label="地図を回転" name="Rotate Map"/>
-	<menu_item_check label="中央へ自動移動" name="Auto Center"/>
-	<menu_item_call label="追跡をやめる" name="Stop Tracking"/>
-	<menu_item_call label="世界地図" name="World Map"/>
-</menu>
+  <menu_item_call label="ズーム（近）" name="Zoom Close" />
+  <menu_item_call label="ズーム（中）" name="Zoom Medium" />
+  <menu_item_call label="ズーム（遠）" name="Zoom Far" />
+  <menu_item_call label="ズーム（デフォルト）" name="Zoom Default" />
+  <menu_item_check label="マップを回転" name="Rotate Map" />
+  <menu_item_check label="中央へ自動移動" name="Auto Center" />
+  <menu_item_call label="追跡をやめる" name="Stop Tracking" />
+  <menu_item_call label="ワールドマップ" name="World Map" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
index 43f86e84bf..f35e74afc5 100644
--- a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="model_menu_gear_default">
-	<menu_item_check label="稜を表示" name="show_edges"/>
-	<menu_item_check label="物理効果を表示" name="show_physics"/>
-	<menu_item_check label="テクスチャを表示" name="show_textures"/>
-	<menu_item_check label="スキンの重さを表示" name="show_skin_weight"/>
-	<menu_item_check label="ジョイントポジションを表示" name="show_joint_positions"/>
-</toggleable_menu>
+  <menu_item_check label="縁を表示" name="show_edges" />
+  <menu_item_check label="物理効果を表示" name="show_physics" />
+  <menu_item_check label="テクスチャを表示" name="show_textures" />
+  <menu_item_check label="スキンのウエイトを表示" name="show_skin_weight" />
+  <menu_item_check label="ジョイントポジションを表示" name="show_joint_positions" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
index 8dab025309..38b736ae9b 100644
--- a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Mute Particle Pie">
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-</context_menu>
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
index 9ae2e58198..f3e274313e 100644
--- a/indra/newview/skins/default/xui/ja/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Navbar Menu">
-	<menu_item_check label="座標を表示" name="Show Coordinates"/>
-	<menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/>
-	<menu_item_call label="ランドマーク" name="Landmark"/>
-	<menu_item_call label="切り取り" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="すべて選択" name="Select All"/>
-</menu>
+  <menu_item_check label="座標を表示" name="Show Coordinates" />
+  <menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties" />
+  <menu_item_call label="ランドマーク" name="Landmark" />
+  <menu_item_call label="カット" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="すべて選択" name="Select All" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
index c2e4a27686..42a6c66168 100644
--- a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="NearBy Chat Menu">
-	<menu_item_call label="近くの人を表示する..." name="nearby_people"/>
-	<menu_item_check label="ブロックされた文字を表示" name="muted_text"/>
-	<menu_item_check label="バディアイコンを表示" name="show_buddy_icons"/>
-	<menu_item_check label="名前を表示" name="show_names"/>
-	<menu_item_check label="アイコンと名前を表示" name="show_icons_and_names"/>
-	<menu_item_call label="文字の大きさ" name="font_size"/>
-</menu>
+  <menu_item_call label="近隣の人物を表示する…" name="nearby_people" />
+  <menu_item_separator />
+  <menu_item_check label="ブロックされた文字を表示" name="muted_text" />
+  <menu_item_separator />
+  <menu_item_check label="バディアイコンを表示" name="show_buddy_icons" />
+  <menu_item_check label="名前を表示" name="show_names" />
+  <menu_item_check label="アイコンと名前を表示" name="show_icons_and_names" />
+  <menu_item_separator />
+  <menu_item_call label="文字の大きさ" name="font_size" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
index 913bae8958..3852efcdd4 100644
--- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Notification Well Button Context Menu">
-	<menu_item_call label="すべて閉じる" name="Close All"/>
-</context_menu>
+  <menu_item_call label="すべて閉じる" name="Close All" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 8da1d5d000..f7e64e015a 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Object Pie">
-	<menu_item_call label="触る" name="Object Touch">
-		<menu_item_call.on_enable name="EnableTouch" parameter="触る"/>
-	</menu_item_call>
-	<menu_item_call label="編集" name="Edit..."/>
-	<menu_item_call label="制作" name="Build"/>
-	<menu_item_call label="開く" name="Open"/>
-	<menu_item_call label="ここに座る" name="Object Sit"/>
-	<menu_item_call label="立ち上がる" name="Object Stand Up"/>
-	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
-	<menu_item_call label="ズームイン" name="Zoom In"/>
-	<menu_item_call label="リンクセットで表示" name="show_in_linksets"/>
-	<menu_item_call label="キャラクターで表示" name="show_in_characters"/>
-	<context_menu label="装着" name="Put On">
-		<menu_item_call label="装着" name="Wear"/>
-		<menu_item_call label="追加" name="Add"/>
-		<context_menu label="取り付ける" name="Object Attach"/>
-		<context_menu label="HUD を取り付ける" name="Object Attach HUD"/>
-	</context_menu>
-	<context_menu label="管理" name="Remove">
-		<menu_item_call label="嫌がらせの報告" name="Report Abuse..."/>
-		<menu_item_call label="ブロック" name="Object Mute"/>
-		<menu_item_call label="ブロック解除" name="Object Unmute"/>
-		<menu_item_call label="返却" name="Return..."/>
-	</context_menu>
-	<menu_item_call label="取る" name="Pie Object Take"/>
-	<menu_item_call label="コピーを取る" name="Take Copy"/>
-	<menu_item_call label="支払う" name="Pay..."/>
-	<menu_item_call label="買う" name="Buy..."/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
-	<menu_item_call label="ダンプ XML" name="Dump XML"/>
-	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
-</context_menu>
+  <menu_item_call label="触る" name="Object Touch" />
+  <menu_item_call label="編集…" name="Edit..." />
+  <menu_item_call label="制作" name="Build" />
+  <menu_item_call label="開く" name="Open" />
+  <menu_item_call label="ここに座る" name="Object Sit" />
+  <menu_item_call label="立ち上がる" name="Object Stand Up" />
+  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
+  <menu_item_call label="ズームイン" name="Zoom In" />
+  <menu_item_call label="リンクセットで表示" name="show_in_linksets" />
+  <menu_item_call label="キャラクターで表示" name="show_in_characters" />
+  <menu_item_separator />
+  <context_menu label="取り付ける" name="Put On">
+    <menu_item_call label="着用" name="Wear" />
+    <menu_item_call label="追加" name="Add" />
+    <context_menu label="装着" name="Object Attach" />
+    <context_menu label="HUDに装着" name="Object Attach HUD" />
+  </context_menu>
+  <context_menu label="管理" name="Remove">
+    <menu_item_call label="嫌がらせの報告…" name="Report Abuse..." />
+    <menu_item_call label="ブロック" name="Object Mute" />
+    <menu_item_call label="ブロック解除" name="Object Unmute" />
+    <menu_item_call label="返却…" name="Return..." />
+  </context_menu>
+  <menu_item_separator />
+  <menu_item_call label="取る" name="Pie Object Take" />
+  <menu_item_call label="コピーを取る" name="Take Copy" />
+  <menu_item_call label="支払う…" name="Pay..." />
+  <menu_item_call label="購入…" name="Buy..." />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_separator />
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 7b55a64eef..163c8d1779 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Object Icon Menu">
-	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
-	<menu_item_call label="ブロック..." name="Block"/>
-	<menu_item_call label="ブロック解除" name="Unblock"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
-</menu>
+  <menu_item_call label="オブジェクトのプロフィール…" name="Object Profile" />
+  <menu_item_call label="ブロック…" name="Block" />
+  <menu_item_call label="ブロック解除" name="Unblock" />
+  <menu_item_separator  />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 4946d58fd8..962d25bb07 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -1,36 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Outfit">
-	<menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear"/>
-	<menu_item_call label="着る - 着用中のアウトフィットに追加する" name="wear_add"/>
-	<menu_item_call label="取り外す - 着用中のアウトフィットから取り除く" name="take_off"/>
-	<menu_item_call label="写真をアップロード（L$10）" name="upload_photo"/>
-	<menu_item_call label="写真を選択" name="select_photo"/>
-	<menu_item_call label="スナップショットを撮る" name="take_snapshot"/>
-	<menu_item_call label="写真を削除" name="remove_photo"/>
-	<menu label="衣類" name="New Clothes">
-		<menu_item_call label="シャツ" name="New Shirt"/>
-		<menu_item_call label="パンツ" name="New Pants"/>
-		<menu_item_call label="靴" name="New Shoes"/>
-		<menu_item_call label="靴下" name="New Socks"/>
-		<menu_item_call label="ジャケット" name="New Jacket"/>
-		<menu_item_call label="スカート" name="New Skirt"/>
-		<menu_item_call label="手袋" name="New Gloves"/>
-		<menu_item_call label="下着（上）" name="New Undershirt"/>
-		<menu_item_call label="下着（下）" name="New Underpants"/>
-		<menu_item_call label="アルファ" name="New Alpha"/>
-		<menu_item_call label="新規の物理作用" name="New Physics"/>
-		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
-		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
-	</menu>
-	<menu label="新しい身体部位" name="New Body Parts">
-		<menu_item_call label="新しいシェイプ" name="New Shape"/>
-		<menu_item_call label="スキン" name="New Skin"/>
-		<menu_item_call label="髪" name="New Hair"/>
-		<menu_item_call label="目" name="New Eyes"/>
-	</menu>
-	<menu_item_call label="フォルダをすべて開く" name="expand"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
-	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
-	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
-	<menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/>
-</toggleable_menu>
+  <menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear" />
+  <menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add" />
+  <menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off" />
+  <menu_item_call label="画像をアップロード（L$ 10）" name="upload_photo" />
+  <menu_item_call label="画像を選択" name="select_photo" />
+  <menu_item_call label="スナップショットを撮る" name="take_snapshot" />
+  <menu_item_call label="画像を削除" name="remove_photo" />
+  <menu_item_separator name="sepatator1" />
+  <!-- copied (with minor modifications) from menu_inventory_add.xml -->
+  <!--  *TODO: generate dynamically? -->
+  <menu label="新しい服装" name="New Clothes">
+    <menu_item_call label="新しいシャツ" name="New Shirt" />
+    <menu_item_call label="新しいズボン" name="New Pants" />
+    <menu_item_call label="新しい靴" name="New Shoes" />
+    <menu_item_call label="新しい靴下" name="New Socks" />
+    <menu_item_call label="新しい上着" name="New Jacket" />
+    <menu_item_call label="新しいスカート" name="New Skirt" />
+    <menu_item_call label="新しい手袋" name="New Gloves" />
+    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
+    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
+    <menu_item_call label="新しいアルファ" name="New Alpha" />
+    <menu_item_call label="新しい物理作用" name="New Physics" />
+    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
+    <menu_item_call label="新しいユニバーサル" name="New Universal" />
+  </menu>
+  <menu label="新しい身体部位" name="New Body Parts">
+    <menu_item_call label="新しいシェイプ" name="New Shape" />
+    <menu_item_call label="新しいスキン" name="New Skin" />
+    <menu_item_call label="新しい髪型" name="New Hair" />
+    <menu_item_call label="新しい目" name="New Eyes" />
+  </menu>
+  <!-- copied from menu_inventory_add.xml -->
+  <menu_item_separator name="sepatator2" />
+  <menu_item_call label="全てのフォルダを開く" name="expand" />
+  <menu_item_call label="全てのフォルダを閉じる" name="collapse" />
+  <menu_item_call label="アウトフィットの名前を変更" name="rename" />
+  <menu_item_call label="アウトフィットを削除" name="delete_outfit" />
+  <menu_item_separator name="sepatator3" />
+  <menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
index 9491c22f31..042a3222d1 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Outfit">
-	<menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear_replace"/>
-	<menu_item_call label="着る - 着用中のアウトフィットに追加する" name="wear_add"/>
-	<menu_item_call label="取り外す - 着用中のアウトフィットから取り除く" name="take_off"/>
-	<menu_item_call label="アウトフィットの編集" name="edit"/>
-	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
-	<menu_item_call label="アウトフィットを削除する" name="delete"/>
-</context_menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Outfit">
+  <menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear_replace" />
+  <menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add" />
+  <menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off" />
+  <menu_item_call label="アウトフィットの編集" name="edit" />
+  <menu_item_call label="アウトフィットの名前を変更" name="rename" />
+  <menu_item_call label="アウトフィットを削除" name="delete" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index 64d8ded722..f64a6dc55c 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Participant List Context Menu">
-	<menu_item_check label="名前で並べ替え" name="SortByName"/>
-	<menu_item_check label="最近の発言者で並べ替え" name="SortByRecentSpeakers"/>
-	<menu_item_call label="プロフィールの表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_check label="人のアイコン表示" name="View Icons"/>
-	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
-	<menu_item_check label="文字をブロック" name="MuteText"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="全員をミュート" name="ModerateVoiceMute"/>
-		<menu_item_call label="全員のミュート解除" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</context_menu>
+  <menu_item_check label="名前で並べ替え" name="SortByName" />
+  <menu_item_check label="最近の発言者で並べ替え" name="SortByRecentSpeakers" />
+  <menu_item_call label="プロフィールの表示" name="View Profile" />
+  <menu_item_call label="フレンド登録" name="Add Friend" />
+  <menu_item_call label="ＩＭ" name="IM" />
+  <menu_item_call label="呼び出し" name="Call" />
+  <menu_item_call label="共有" name="Share" />
+  <menu_item_call label="支払う" name="Pay" />
+  <menu_item_separator name="View Icons Separator" />
+  <menu_item_check label="人物のアイコン表示" name="View Icons" />
+  <menu_item_separator />
+  <menu_item_check label="ボイスをブロック／解除" name="Block/Unblock" />
+  <menu_item_check label="文字をブロック" name="MuteText" />
+  <menu_item_separator name="Moderator Options Separator" />
+  <context_menu label="モデレーターのオプション" name="Moderator Options">
+    <menu_item_separator name="moderate_voice_separator" />
+    <menu_item_check label="文字チャットを許可" name="AllowTextChat" />
+    <menu_item_call label="この参加者をミュート" name="ModerateVoiceMuteSelected" />
+    <menu_item_call label="この参加者のミュートを解除" name="ModerateVoiceUnMuteSelected" />
+    <menu_item_call label="全員をミュート" name="ModerateVoiceMute" />
+    <menu_item_call label="全員のミュート解除" name="ModerateVoiceUnmute" />
+  </context_menu>
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
index 5816351d9d..ef61874763 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="participant_manu_view">
-	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
-	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
-	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
-	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
-	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
-	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
-	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
-	<menu_item_check label="会話ログ..." name="Conversation"/>
-	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
-	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
-</toggleable_menu>
+  <menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type" />
+  <menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name" />
+  <menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent" />
+  <menu_item_separator />
+  <menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name" />
+  <menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent" />
+  <menu_item_separator />
+  <menu_item_call label="チャットの初期設定…" name="chat_preferences" />
+  <menu_item_call label="プライバシーの初期設定…" name="privacy_preferences" />
+  <menu_item_check label="会話ログ…" name="Conversation" />
+  <menu_item_separator />
+  <menu_item_check label="近隣のチャットを翻訳" name="Translate_chat" />
+  <menu_item_check label="翻訳の設定…" name="Translation_settings" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
index f74399f2ba..8d80ddebad 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_check label="ボイスをブロック" name="BlockVoice"/>
-	<menu_item_check label="文字をブロック" name="MuteText"/>
-	<menu_item_check label="パーティクルをブロック" name="MuteParticles"/>
-	<menu_item_check label="オブジェクトのサウンドをブロック" name="BlockObjectSounds"/>
-	<menu_item_call label="プロフィール..." name="profile"/>
-</toggleable_menu>
+  <menu_item_call label="ブロック解除" name="unblock" />
+  <menu_item_check label="ボイスをブロック" name="BlockVoice" />
+  <menu_item_check label="文字をブロック" name="MuteText" />
+  <menu_item_check label="パーティクルをブロック" name="MuteParticles" />
+  <menu_item_check label="オブジェクトのサウンドをブロック" name="BlockObjectSounds" />
+  <menu_item_separator />
+  <menu_item_call label="プロフィール…" name="profile" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
index 3e74b2ddff..1d89e15f64 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
-	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
-</toggleable_menu>
+  <menu_item_call label="名前で住人をブロック…" name="block_resident_by_name" />
+  <menu_item_call label="名前でオブジェクトをブロック…" name="block_object_by_name" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
index 4b86a353f4..db586365b2 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
-</toggleable_menu>
+  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
+  <menu_item_check label="種類で並べ替え" name="sort_by_type" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
index f290bec652..fee506c511 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
-	<menu_item_check label="ユーザー名を非表示" name="view_usernames"/>
-	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
-</toggleable_menu>
+  <menu_item_check label="名前で並べ替え" name="sort_name" />
+  <menu_item_check label="オンライン状況で並べ替え" name="sort_status" />
+  <menu_item_check label="人物のアイコン表示" name="view_icons" />
+  <menu_item_check label="与えられた権限を表示" name="view_permissions" />
+  <menu_item_check label="ユーザー名を非表示" name="view_usernames" />
+  <menu_item_check label="会話ログを表示…" name="view_conversation" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 2c0c85ba28..91044bd283 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-	<menu_item_call label="情報を表示" name="View Info"/>
-	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="ボイスコール" name="Call"/>
-	<menu_item_call label="アクティブ" name="Activate"/>
-	<menu_item_call label="脱退" name="Leave"/>
-</menu>
+  <menu_item_call label="情報を表示" name="View Info" />
+  <menu_item_call label="チャット" name="Chat" />
+  <menu_item_call label="ボイスコール" name="Call" />
+  <menu_item_call label="アクティブ" name="Activate" />
+  <menu_item_call label="脱退" name="Leave" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
index 4a9e402fa4..07144be420 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
-</toggleable_menu>
+  <menu_item_check label="グループアイコンを表示" name="Display Group Icons" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 87f1d26ca4..f59ebfa154 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
-	<menu_item_call label="フリーズ" name="freeze"/>
-	<menu_item_call label="追放" name="eject"/>
-</context_menu>
+  <menu_item_call label="プロフィールを表示" name="view_profile" />
+  <menu_item_call label="ＩＭ" name="im" />
+  <menu_item_call label="テレポートを送る" name="offer_teleport" />
+  <menu_item_call label="ボイスコール" name="voice_call" />
+  <menu_item_call label="チャットの履歴を表示…" name="chat_history" />
+  <menu_item_call label="フレンド登録" name="add_friend" />
+  <menu_item_call label="フレンドを削除" name="remove_friend" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_call label="ズームイン" name="zoom_in" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払う" name="pay" />
+  <menu_item_check label="ブロック／解除" name="block_unblock" />
+  <menu_item_call label="フリーズ" name="freeze" />
+  <menu_item_call label="追放" name="eject" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index fe85e278cf..5c73eb5a4f 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="add_friends"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="コール" name="call"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-</context_menu>
+  <menu_item_call label="フレンド登録" name="add_friends" />
+  <menu_item_call label="フレンドを削除" name="remove_friends" />
+  <menu_item_call label="ＩＭ" name="im" />
+  <menu_item_call label="コール" name="call" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_call label="テレポートをオファー" name="offer_teleport" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
index 2217288987..7b56f1daf8 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
-	<menu_item_check label="到着した順に並べ替え" name="sort_arrival"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="地図を表示" name="view_map"/>
-	<menu_item_check label="ユーザー名を非表示" name="view_usernames"/>
-</toggleable_menu>
+  <menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers" />
+  <menu_item_check label="名前で並べ替え" name="sort_name" />
+  <menu_item_check label="距離で並べ替え" name="sort_distance" />
+  <menu_item_check label="到着した順に並べ替え" name="sort_arrival" />
+  <menu_item_check label="人物のアイコン表示" name="view_icons" />
+  <menu_item_check label="マップを表示" name="view_map" />
+  <menu_item_check label="ユーザー名を非表示" name="view_usernames" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
index feaeba4398..da27372963 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-</toggleable_menu>
+  <menu_item_check label="新しい順に並べ替え" name="sort_most" />
+  <menu_item_check label="名前で並べ替え" name="sort_name" />
+  <menu_item_check label="人物のアイコン表示" name="view_icons" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml
index 011d3d2526..4a5a42ad05 100644
--- a/indra/newview/skins/default/xui/ja/menu_picks.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Picks">
-	<menu_item_call label="情報" name="pick_info"/>
-	<menu_item_call label="編集" name="pick_edit"/>
-	<menu_item_call label="テレポート" name="pick_teleport"/>
-	<menu_item_call label="地図" name="pick_map"/>
-	<menu_item_call label="削除" name="pick_delete"/>
-</context_menu>
+  <menu_item_call label="テレポート" name="pick_teleport"/>
+  <menu_item_call label="ピックの情報" name="pick_info" />
+  <menu_item_call label="ピックを編集" name="pick_edit" />
+  <menu_item_call label="テレポート" name="pick_teleport" />
+  <menu_item_call label="マップに表示" name="pick_map" />
+  <menu_item_separator name="pick_separator" />
+  <menu_item_call label="削除" name="pick_delete" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
index 84bf90fea0..62eb8327bc 100644
--- a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="picks_plus_menu">
-	<menu_item_call label="新しいピック" name="create_pick"/>
-	<menu_item_call label="新しいクラシファイド広告" name="create_classified"/>
-</toggleable_menu>
+  <menu_item_call label="新しいピック" name="create_pick" />
+  <menu_item_call label="新しいクラシファイド広告" name="create_classified" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml
index a9f05e126d..f45f9211ed 100644
--- a/indra/newview/skins/default/xui/ja/menu_place.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="place_overflow_menu">
-	<menu_item_call label="ランドマークを作成" name="landmark"/>
-	<menu_item_call label="ピックを作成" name="pick"/>
-	<menu_item_call label="入場許可を購入" name="pass"/>
-	<menu_item_call label="編集" name="edit"/>
-</toggleable_menu>
+  <menu_item_call label="ランドマークを作成" name="landmark" />
+  <menu_item_call label="ピックを作成" name="pick" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
index d19bc44451..d6a13b92ba 100644
--- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_create">
-	<menu_item_call label="フォルダを追加" name="add_folder"/>
-	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-</toggleable_menu>
+  <menu_item_call label="現在の場所にランドマーク作成" name="add_landmark" />
+  <menu_item_call label="フォルダ作成" name="add_folder" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
index c455204722..c9fa92b6a2 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_folder_gear">
-	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-	<menu_item_call label="フォルダを追加" name="add_folder"/>
-	<menu_item_call label="アイテムを復元" name="restore_item"/>
-	<menu_item_call label="切り取り" name="cut"/>
-	<menu_item_call label="コピー" name="copy_folder"/>
-	<menu_item_call label="貼り付け" name="paste"/>
-	<menu_item_call label="名前の変更" name="rename"/>
-	<menu_item_call label="削除" name="delete"/>
-	<menu_item_call label="拡大" name="expand"/>
-	<menu_item_call label="戻す" name="collapse"/>
-	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-</toggleable_menu>
+  <menu_item_call label="ランドマークを追加" name="add_landmark" />
+  <menu_item_call label="フォルダを追加" name="add_folder" />
+  <menu_item_call label="アイテムを復元" name="restore_item" />
+  <menu_item_separator />
+  <menu_item_call label="カット" name="cut" />
+  <menu_item_call label="コピー" name="copy_folder" />
+  <menu_item_call label="ペースト" name="paste" />
+  <menu_item_call label="名前の変更" name="rename" />
+  <menu_item_call label="削除" name="delete" />
+  <menu_item_separator />
+  <menu_item_call label="広げる" name="expand" />
+  <menu_item_call label="閉じる" name="collapse" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
index 579f2c2cbd..16508dde4a 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
-	<menu_item_call label="テレポート" name="teleport"/>
-	<menu_item_call label="もっと詳しく" name="more_info"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-	<menu_item_call label="フォルダを追加" name="add_folder"/>
-	<menu_item_call label="アイテムを復元" name="restore_item"/>
-	<menu_item_call label="切り取り" name="cut"/>
-	<menu_item_call label="ランドマークをコピー" name="copy_landmark"/>
-	<menu_item_call label="SLurl をコピー" name="copy_slurl"/>
-	<menu_item_call label="貼り付け" name="paste"/>
-	<menu_item_call label="名前の変更" name="rename"/>
-	<menu_item_call label="削除" name="delete"/>
-	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-	<menu_item_call label="ピックを作成" name="create_pick"/>
-</toggleable_menu>
+  <menu_item_call label="テレポート" name="teleport" />
+  <menu_item_call label="共有" name="share"/>
+  <menu_item_call label="ランドマークの表示／編集" name="more_info"/>
+  <menu_item_call label="ランドマークをコピー" name="copy_landmark" />
+  <menu_item_call label="ランドマークに移動" name="Move to Landmarks"/>
+  <menu_item_call label="お気に入りに移動" name="Move to Favorites" />
+  <menu_item_call label="フォルダをすべて開く" name="expand_all" />
+  <menu_item_call label="フォルダをすべて閉じる" name="collapse_all" />
+  <menu_item_check label="日付で並べ替え" name="sort_by_date" />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="SLurlをコピー" name="copy_slurl" />
+  <menu_item_call label="ピックを作成" name="create_pick" />
+  <menu_item_call label="アイテムを復元" name="restore_item" />
+  <menu_item_separator  />
+  <menu_item_call label="カット" name="cut"/>
+  <menu_item_call label="コピー" name="copy_landmark"/>
+  <menu_item_call label="ペースト" name="paste"/>
+  <menu_item_call label="名前の変更" name="rename"/>
+  <menu_item_call label="削除" name="delete"/>
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
new file mode 100644
index 0000000000..197b61af30
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_sorter_gear">
+  <menu_item_call label="全てのフォルダを開く" name="expand_all" />
+  <menu_item_call label="全てのフォルダを閉じる" name="collapse_all" />
+  <menu_item_separator />
+  <menu_item_check label="日付でソート" name="sort_by_date" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_other.xml b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
new file mode 100644
index 0000000000..0ff41f91a2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Avatar Profile Menu">
+  <menu_item_call label="ＩＭ" name="im" />
+  <menu_item_call label="テレポートのオファー" name="offer_teleport" />
+  <menu_item_call label="テレポートのリクエスト" name="request_teleport" />
+  <menu_item_call label="ボイスコール" name="voice_call" />
+  <menu_item_separator />
+  <menu_item_call label="チャット履歴を表示…" name="chat_history" />
+  <menu_item_separator name="separator_chat_history" />
+  <menu_item_call label="フレンド追加" name="add_friend" />
+  <menu_item_call label="フレンド削除" name="remove_friend" />
+  <menu_item_call label="グループに招待…" name="invite_to_group" />
+  <menu_item_separator name="separator_invite_to_group" />
+  <menu_item_call label="権限" name="agent_permissions" />
+  <menu_item_call label="マップ" name="map" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="支払い" name="pay" />
+  <menu_item_check label="ブロック／解除" name="block_unblock" />
+  <menu_item_separator name="separator_copy_options" />
+  <menu_item_call label="表示名をコピー" name="copy_display_name" />
+  <menu_item_call label="エージェント名をコピー" name="copy_name" />
+  <menu_item_call label="エージェントＩＤをコピー" name="copy_id" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
index 9d3a5dda1c..67c481cdd6 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="profile_overflow_menu">
-	<menu_item_call label="地図" name="show_on_map"/>
-	<menu_item_call label="支払う" name="pay"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="ブロック" name="block"/>
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="追放" name="kick"/>
-	<menu_item_call label="フリーズ" name="freeze"/>
-	<menu_item_call label="フリーズ解除" name="unfreeze"/>
-	<menu_item_call label="CSR" name="csr"/>
-</toggleable_menu>
+  <menu_item_call label="マップ" name="show_on_map" />
+  <menu_item_call label="支払う" name="pay" />
+  <menu_item_call label="共有" name="share" />
+  <menu_item_call label="ブロック" name="block" />
+  <menu_item_call label="ブロック解除" name="unblock" />
+  <menu_item_call label="追放" name="kick" />
+  <menu_item_call label="フリーズ" name="freeze" />
+  <menu_item_call label="フリーズ解除" name="unfreeze" />
+  <menu_item_call label="CSR" name="csr" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_self.xml b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
new file mode 100644
index 0000000000..ec10d92629
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Avatar Profile Menu Self">
+  <menu_item_call label="表示名を編集" name="edit_display_name" />
+  <menu_item_call label="パートナーを編集" name="edit_partner" />
+  <menu_item_call label="画像をアップロード" name="upload_photo" />
+  <menu_item_call label="画像を変更" name="change_photo" />
+  <menu_item_call label="画像を削除" name="remove_photo" />
+  <menu_item_separator name="separator_copy_options" />
+  <menu_item_call label="表示名をコピー" name="copy_display_name" />
+  <menu_item_call label="エージェント名をコピー" name="copy_name" />
+  <menu_item_call label="エージェントＩＤをコピー" name="copy_id" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
index 6513d9264a..6d8f2381d9 100644
--- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_outfit_menu">
-	<menu_item_call label="保存" name="save_outfit"/>
-	<menu_item_call label="別名で保存" name="save_as_new_outfit"/>
-</toggleable_menu>
+  <menu_item_call label="保存" name="save_outfit" />
+  <menu_item_call label="名前をつけて保存" name="save_as_new_outfit" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_save_settings.xml b/indra/newview/skins/default/xui/ja/menu_save_settings.xml
index 44fb1fb30b..a8bb95a661 100644
--- a/indra/newview/skins/default/xui/ja/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_settings_menu">
-	<menu_item_check label="保存" name="save_settings"/>
-	<menu_item_check label="別名で保存" name="save_as_new_settings"/>
-	<menu_item_check label="約束する" name="commit_changes"/>
-	<menu_item_check label="自分にのみ適用" name="apply_local"/>
-	<menu_item_check label="区画に適用" name="apply_parcel"/>
-	<menu_item_check label="リージョンに適用" name="apply_region"/>
-</toggleable_menu>
+  <menu_item_check label="保存" name="save_settings" />
+  <menu_item_check label="名前をつけて保存" name="save_as_new_settings" />
+  <menu_item_check label="変更をコミット" name="commit_changes" />
+  <menu_item_check label="自分にのみ適用" name="apply_local" />
+  <menu_item_check label="区画に適用" name="apply_parcel" />
+  <menu_item_check label="リージョン（地域）に適用" name="apply_region" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
index a89dd0bcbe..c4bc424927 100644
--- a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="ScriptChiclet Menu">
-	<menu_item_call label="閉じる" name="Close"/>
-</menu>
+  <menu_item_call label="閉じる" name="Close" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_settings_add.xml
index 814ad9c1a6..9e64476446 100644
--- a/indra/newview/skins/default/xui/ja/menu_settings_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_settings_add.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_add">
-	<menu_item_call label="新しい空" name="New Sky"/>
-	<menu_item_call label="新しい水" name="New Water"/>
-	<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
-</toggleable_menu>
+  <menu_item_call label="新しい空" name="New Sky" />
+  <menu_item_call label="新しい水" name="New Water" />
+  <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
index 064eae95bf..a44786b414 100644
--- a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_gear">
-	<menu_item_call label="編集" name="edit_settings"/>
-	<menu_item_call label="自分にのみ適用" name="Settings Apply Local"/>
-	<menu_item_call label="区画に適用" name="Settings Apply Parcel"/>
-	<menu_item_call label="リージョンに適用" name="Settings Apply Region"/>
-	<menu_item_call label="コピー" name="copy_settings"/>
-	<menu_item_call label="貼り付け" name="paste_settings"/>
-	<menu_item_call label="UUID をコピー" name="copy_uuid"/>
-</toggleable_menu>
+  <menu_item_call label="編集" name="edit_settings" />
+  <menu_item_call label="自分にのみ適用" name="Settings Apply Local" />
+  <menu_item_call label="区画に適用" name="Settings Apply Parcel" />
+  <menu_item_call label="リージョン（地域）に適用" name="Settings Apply Region" />
+  <menu_item_call label="コピー" name="copy_settings" />
+  <menu_item_call label="ペースト" name="paste_settings" />
+  <menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 61ba3085d9..3d5ea3f616 100644
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="URL について" name="about_url"/>
-	<menu_item_call label="URL にテレポートする" name="teleport_to_url"/>
-	<menu_item_call label="地図" name="show_on_map"/>
-</menu>
+  <menu_item_call label="ＵＲＬについて" name="about_url" />
+  <menu_item_call label="ＵＲＬにテレポートする" name="teleport_to_url" />
+  <menu_item_call label="マップ" name="show_on_map" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
index 901eab9166..fd4dffeefa 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Teleport History Gear Context Menu">
-	<menu_item_call label="フォルダをすべて開く" name="Expand all folders"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="Collapse all folders"/>
-	<menu_item_call label="テレポートの履歴をクリア" name="Clear Teleport History"/>
-</menu>
+  <menu_item_separator name="Landmark Separator" />
+  <menu_item_call label="フォルダをすべて展開" name="Expand all folders" />
+  <menu_item_call label="フォルダをすべて縮小" name="Collapse all folders" />
+  <menu_item_call label="テレポートの履歴をクリア" name="Clear Teleport History" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
index 1cc230e5b6..dc34bc6463 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Teleport History Item Menu">
-	<menu_item_call label="テレポート" name="Teleport"/>
-	<menu_item_call label="もっと詳しく" name="More Information"/>
-	<menu_item_call label="SLurl をコピー" name="CopyToClipboard"/>
-</toggleable_menu>
+  <menu_item_call label="テレポート" name="Teleport" />
+  <menu_item_call label="より詳細な情報" name="More Information" />
+  <menu_item_call label="SLurlをコピー" name="CopyToClipboard" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
index 4dd44d2ec8..391be973f8 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Teleport History Item Context Menu">
-	<menu_item_call label="開く" name="TabOpen"/>
-	<menu_item_call label="閉じる" name="TabClose"/>
-</context_menu>
+  <menu_item_call label="開く" name="TabOpen" />
+  <menu_item_call label="閉じる" name="TabClose" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
index eda973c888..48fd8ad243 100644
--- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
-	<menu_item_call label="（不明）" name="Suggestion 1"/>
-	<menu_item_call label="（不明）" name="Suggestion 2"/>
-	<menu_item_call label="（不明）" name="Suggestion 3"/>
-	<menu_item_call label="（不明）" name="Suggestion 4"/>
-	<menu_item_call label="（不明）" name="Suggestion 5"/>
-	<menu_item_call label="辞書に追加" name="Add to Dictionary"/>
-	<menu_item_call label="無視に追加" name="Add to Ignore"/>
-	<menu_item_call label="切り取り" name="Cut"/>
-	<menu_item_call label="コピー" name="Copy"/>
-	<menu_item_call label="貼り付け" name="Paste"/>
-	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="すべて選択" name="Select All"/>
-</context_menu>
+  <menu_item_call label="（不明）" name="Suggestion 1" />
+  <menu_item_call label="（不明）" name="Suggestion 2" />
+  <menu_item_call label="（不明）" name="Suggestion 3" />
+  <menu_item_call label="（不明）" name="Suggestion 4" />
+  <menu_item_call label="（不明）" name="Suggestion 5" />
+  <menu_item_call label="辞書に追加" name="Add to Dictionary" />
+  <menu_item_call label="無視に追加" name="Add to Ignore" />
+  <menu_item_call label="切り取り" name="Cut" />
+  <menu_item_call label="コピー" name="Copy" />
+  <menu_item_call label="ペースト" name="Paste" />
+  <menu_item_call label="削除" name="Delete" />
+  <menu_item_call label="すべて選択" name="Select All" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
index d5363a5131..9bb4eaf496 100644
--- a/indra/newview/skins/default/xui/ja/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Toolbars Popup">
-	<menu_item_call label="このボタンを削除" name="Remove button"/>
-	<menu_item_call label="ツールバーのボタン..." name="Choose Buttons"/>
-	<menu_item_check label="アイコンとラベル" name="icons_with_text"/>
-	<menu_item_check label="アイコンのみ" name="icons_only"/>
-</context_menu>
+  <menu_item_call label="このボタンを削除" name="Remove button" />
+  <menu_item_call label="ツールバーのボタン…" name="Choose Buttons" />
+  <menu_item_check label="アイコンとラベル" name="icons_with_text" />
+  <menu_item_check label="アイコンのみ" name="icons_only" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
index 1a67a2a8f7..ea1e12ab2b 100644
--- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_topinfobar">
-	<menu_item_check label="座標を表示" name="Show Coordinates"/>
-	<menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/>
-	<menu_item_call label="ランドマーク" name="Landmark"/>
-	<menu_item_call label="コピー" name="Copy"/>
-</menu>
+  <menu_item_check label="座標を表示" name="Show Coordinates" />
+  <menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties" />
+  <menu_item_separator name="Separator" />
+  <!-- Label of 'Landmark' item is changing in runtime, 
+    see  AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml -->
+  <menu_item_call label="ランドマーク" name="Landmark" />
+  <menu_item_separator name="Separator" />
+  <menu_item_call label="コピー" name="Copy" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 639602ce3c..dc9a6af8fe 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="プロフィールを表示" name="show_agent"/>
-	<menu_item_call label="IM を送信..." name="send_im"/>
-	<menu_item_call label="フレンドを追加..." name="add_friend"/>
-	<menu_item_call label="フレンドを削除..." name="remove_friend"/>
-	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="プロフィールを表示" name="show_agent" />
+  <menu_item_call label="ＩＭを送信…" name="send_im" />
+  <menu_item_call label="フレンドを追加…" name="add_friend" />
+  <menu_item_call label="フレンドを削除…" name="remove_friend" />
+  <menu_item_call label="嫌がらせの報告" name="report_abuse" />
+  <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurl をクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_email.xml b/indra/newview/skins/default/xui/ja/menu_url_email.xml
index 6c41d759fe..1ba8d6a64e 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_email.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_email.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Email Popup">
-	<menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external"/>
-	<menu_item_call label="電子メールをクリップボードにコピー" name="email_copy"/>
-</context_menu>
+  <menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external" />
+  <menu_item_call label="電子メールをクリップボードにコピー" name="email_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_experience.xml b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
index 582784c2f0..83d7029527 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_experience.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
index 1dd3d79438..9214d67dea 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="グループ情報を表示" name="show_group"/>
-	<menu_item_call label="グループをクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="グループ情報を表示" name="show_group" />
+  <menu_item_separator />
+  <menu_item_call label="グループをクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
index c3da8a8686..ba5048094d 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Web ページを開く" name="url_open"/>
-	<menu_item_call label="内蔵ブラウザで開く" name="url_open_internal"/>
-	<menu_item_call label="外部ブラウザで開く" name="url_open_external"/>
-	<menu_item_call label="URLをクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="Web ページを開く" name="url_open" />
+  <menu_item_call label="内蔵ブラウザで開く" name="url_open_internal" />
+  <menu_item_call label="外部ブラウザで開く" name="url_open_external" />
+  <menu_item_call label="ＵＲＬをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
index 147ab44a1b..7a13030b64 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="インベントリアイテムを表示" name="show_item"/>
-	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="インベントリのアイテムを表示" name="show_item" />
+  <menu_item_separator />
+  <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
index 8d41e1a571..75813f9017 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator />
+  <menu_item_call label="現地にテレポート" name="teleport_to_location" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index 96f8b3f7b1..ef76e5484f 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
-	<menu_item_call label="ブロック..." name="block_object"/>
-	<menu_item_call label="ブロック解除" name="unblock_object"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
-	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="オブジェクトのプロフィール…" name="show_object" />
+  <menu_item_call label="ブロック…" name="block_object" />
+  <menu_item_call label="ブロック解除" name="unblock_object" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object" />
+  <menu_item_separator />
+  <menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label" />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
index 8d264059d3..0c1eab8dad 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="区画情報を表示" name="show_parcel"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="区画情報を表示" name="show_parcel" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
index a516c5a075..78f3997bf8 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="このコマンドを実行" name="run_slapp"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="このコマンドを実行" name="run_slapp" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
index 2c857ec915..e0d4427008 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="場所の情報を表示" name="show_place"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="場所の情報を表示" name="show_place" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_call label="現地にテレポート" name="teleport_to_location" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
index c3507a9a33..e6941fb8bd 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="この場所にテレポート" name="teleport"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
-</context_menu>
+  <menu_item_call label="この場所にテレポート" name="teleport" />
+  <menu_item_separator />
+  <menu_item_call label="マップに表示" name="show_on_map" />
+  <menu_item_separator />
+  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index d5ac67b9e6..35e4db743b 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,495 +1,669 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <menu_bar name="Main Menu">
-	<menu label="ミー" name="Me">
-		<menu_item_call label="プロフィール..." name="Profile"/>
-		<menu_item_call label="容姿..." name="ChangeOutfit"/>
-		<menu_item_call label="アバターを選択..." name="Avatar Picker"/>
-		<menu_item_check label="インベントリ..." name="Inventory"/>
-		<menu_item_call label="新しいインベントリウィンドウ" name="NewInventoryWindow"/>
-		<menu_item_call label="場所..." name="Places"/>
-		<menu_item_call label="ピック..." name="Picks"/>
-		<menu_item_call label="体験..." name="Experiences"/>
-		<menu_item_call label="スクリプト…" name="MyScripts"/>
-		<menu_item_call label="カメラコントロール..." name="Camera Controls"/>
-		<menu label="ムーブメント" name="Movement">
-			<menu_item_call label="座る" name="Sit Down Here"/>
-			<menu_item_call label="立ち上がる" name="Stand up"/>
-			<menu_item_check label="飛ぶ" name="Fly"/>
-			<menu_item_check label="常に走る" name="Always Run"/>
-			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
-			<menu_item_call label="歩行／走行／飛行..." name="WalkRunFly"/>
-		</menu>
-		<menu label="ログイン" name="Status">
-			<menu_item_check label="一時退席中" name="Away"/>
-			<menu_item_check label="着信拒否" name="Do Not Disturb"/>
-		</menu>
-		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
-		<menu_item_call label="マーケティングプレイスのリスト..." name="MarketplaceListings"/>
-		<menu_item_call label="マイアカウント..." name="Manage My Account">
-			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
-		</menu_item_call>
-		<menu_item_call label="環境設定..." name="Preferences"/>
-		<menu_item_call label="ツールバーのボタン..." name="Toolbars"/>
-		<menu_item_call label="全てのコントロールを非表示にする" name="Hide UI"/>
-		<menu_item_check label="HUD を表示" name="Show HUD Attachments"/>
-		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
-	</menu>
-	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="会話..." name="Conversations"/>
-		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
-		<menu_item_check label="話す" name="Speak"/>
-		<menu_item_check label="会話ログ..." name="Conversation Log..."/>
-		<menu_item_call label="Facebook..." name="Facebook"/>
-		<menu_item_call label="Twitter..." name="Twitter"/>
-		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="ボイスモーフィング" name="VoiceMorphing">
-			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
-			<menu_item_check label="プレビュー..." name="Preview"/>
-			<menu_item_call label="申し込む..." name="Subscribe"/>
-			<menu_item_call label="プレミアム会員特典..." name="PremiumPerk"/>
-		</menu>
-		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_check label="フレンド" name="My Friends"/>
-		<menu_item_check label="グループ" name="My Groups"/>
-		<menu_item_check label="近くにいる人" name="Active Speakers"/>
-		<menu_item_check label="リストをブロック" name="Block List"/>
-		<menu_item_check label="着信拒否" name="Do Not Disturb"/>
-	</menu>
-	<menu label="世界" name="World">
-		<menu_item_call label="現在地をランドマーク" name="Create Landmark Here"/>
-		<menu_item_call label="行き先..." name="Destinations"/>
-		<menu_item_check label="世界地図" name="World Map"/>
-		<menu_item_check label="ミニマップ" name="Mini-Map"/>
-		<menu_item_call label="イベント" name="Events"/>
-		<menu_item_check label="検索..." name="Search"/>
-		<menu_item_call label="ホームにテレポート" name="Teleport Home"/>
-		<menu_item_call label="現在地をホームに設定" name="Set Home to Here"/>
-		<menu_item_call label="スナップショット" name="Take Snapshot"/>
-		<menu_item_call label="場所のプロフィール" name="Place Profile"/>
-		<menu_item_call label="土地情報" name="About Land"/>
-		<menu_item_call label="地域 / 不動産" name="RegionEstate"/>
-		<menu_item_call label="保有地..." name="My Land"/>
-		<menu_item_call label="この土地を購入" name="Buy Land"/>
-		<menu label="表示" name="LandShow">
-			<menu_item_check label="立入禁止ライン" name="Ban Lines"/>
-			<menu_item_check label="ビーコン（標識）" name="beacons"/>
-			<menu_item_check label="プロパティ境界線" name="Property Lines"/>
-			<menu_item_check label="土地所有者" name="Land Owners"/>
-			<menu_item_check label="座標" name="Coordinates"/>
-			<menu_item_check label="区画プロパティ" name="Parcel Properties"/>
-			<menu_item_check label="アドバンスメニュー" name="Show Advanced Menu"/>
-		</menu>
-		<menu label="環境" name="Environment">
-			<menu_item_check label="日の出" name="Sunrise"/>
-			<menu_item_check label="正午" name="Noon"/>
-			<menu_item_check label="日没" name="Sunset"/>
-			<menu_item_check label="深夜" name="Midnight"/>
-			<menu_item_check label="共有された環境を使用" name="Use Shared Environment"/>
-			<menu_item_call label="私の環境…" name="my_environs"/>
-			<menu_item_call label="個人的な照明…" name="adjustment_tool"/>
-			<menu_item_check label="雲を一時停止" name="pause_clouds"/>
-		</menu>
-	</menu>
-	<menu label="制作" name="BuildTools">
-		<menu_item_check label="制作" name="Show Build Tools"/>
-		<menu label="制作ツールを選択する" name="Select Tool">
-			<menu_item_call label="フォーカスツール" name="Focus"/>
-			<menu_item_call label="移動ツール" name="Move"/>
-			<menu_item_call label="編集ツール" name="Edit"/>
-			<menu_item_call label="作成ツール" name="Create"/>
-			<menu_item_call label="土地ツール" name="Land"/>
-		</menu>
-		<menu_item_call label="リンク" name="Link"/>
-		<menu_item_call label="リンクを外す" name="Unlink"/>
-		<menu_item_check label="リンクした部分を編集" name="Edit Linked Parts"/>
-		<menu label="要素を選択" name="Select Elements">
-			<menu_item_call label="次のパーツまたは面を選択" name="Select Next Part or Face"/>
-			<menu_item_call label="前のパーツまたは面を選択" name="Select Previous Part or Face"/>
-			<menu_item_call label="次のパーツまたは面を含める" name="Include Next Part or Face"/>
-			<menu_item_call label="前のパーツまたは面を含める" name="Include Previous Part or Face"/>
-		</menu>
-		<menu_item_call label="リージョンオブジェクト" name="pathfinding_linkset_menu_item"/>
-		<menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/>
-		<menu_item_call label="選択したものをズームする" name="Zoom to Selection"/>
-		<menu label="オブジェクト" name="Object">
-			<menu_item_call label="買う" name="Menu Object Buy"/>
-			<menu_item_call label="取る" name="Menu Object Take"/>
-			<menu_item_call label="コピーを取る" name="Take Copy"/>
-			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
-			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
-			<menu_item_call label="複製" name="DuplicateObject"/>
-		</menu>
-		<menu label="スクリプト" name="Scripts">
-			<menu_item_check label="スクリプトの警告/エラー..." name="Script debug"/>
-			<menu_item_call label="スクリプトのリコンパイル（Mono）" name="Mono"/>
-			<menu_item_call label="スクリプトのリコンパイル（LSL）" name="LSL"/>
-			<menu_item_call label="スクリプトのリセット" name="Reset Scripts"/>
-			<menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running"/>
-			<menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running"/>
-		</menu>
-		<menu label="パスファインディング" name="Pathfinding">
-			<menu_item_call label="リージョンオブジェクト" name="pathfinding_linksets_menu_item"/>
-			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
-			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
-		</menu>
-		<menu label="オプション" name="Options">
-			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
-			<menu_item_check label="私のオブジェクトだけを選択する" name="Select Only My Objects"/>
-			<menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects"/>
-			<menu_item_check label="範囲内を選択する" name="Select By Surrounding"/>
-			<menu_item_check label="選択外形を表示" name="Show Selection Outlines"/>
-			<menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection"/>
-			<menu_item_check label="選択した光の半径範囲を表示する" name="Show Light Radius for Selection"/>
-			<menu_item_check label="選択ビームを表示する" name="Show Selection Beam"/>
-			<menu_item_check label="グリッドポイントにスナップする" name="Snap to Grid"/>
-			<menu_item_call label="オブジェクトの XY 軸をグリッドにスナップする" name="Snap Object XY to Grid"/>
-			<menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid"/>
-			<menu_item_call label="グリッドオプション..." name="Grid Options"/>
-			<menu_item_call label="デフォルト権限の設定..." name="Set default permissions"/>
-		</menu>
-		<menu label="アップロード" name="Upload">
-			<menu_item_call label="画像（L$[COST]）..." name="Upload Image"/>
-			<menu_item_call label="サウンド（L$[COST]）..." name="Upload Sound"/>
-			<menu_item_call label="アニメーション（L$[COST]）..." name="Upload Animation"/>
-			<menu_item_call label="モデル" name="Upload Model"/>
-			<menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/>
-		</menu>
-		<menu_item_call label="元に戻す" name="Undo"/>
-		<menu_item_call label="やり直し" name="Redo"/>
-	</menu>
-	<menu label="ヘルプ" name="Help">
-		<menu_item_call label="ハウツー..." name="How To"/>
-		<menu_item_call label="クイックスタート" name="Quickstart"/>
-		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
-		<menu_item_call label="日本語サポートページ" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
-		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
-		<menu_item_call label="バグを報告する" name="Report Bug"/>
-		<menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp;amp; Hits"/>
-		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
-	</menu>
-	<menu label="アドバンス" name="Advanced">
-		<menu_item_call label="テクスチャのリベークをする" name="Rebake Texture"/>
-		<menu_item_call label="UI のサイズをデフォルトに設定する" name="Set UI Size to Default"/>
-		<menu_item_call label="ウィンドウのサイズを設定する" name="Set Window Size..."/>
-		<menu_item_check label="遠くのオブジェクトを選択しない" name="Limit Select Distance"/>
-		<menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance"/>
-		<menu_item_check label="高解像度スナップショット" name="HighResSnapshot"/>
-		<menu_item_check label="シャッター音とアニメーションなしでスナップショットをディスクに保存する" name="QuietSnapshotsToDisk"/>
-		<menu label="パフォーマンスツール" name="Performance Tools">
-			<menu_item_call label="ラグ計測器" name="Lag Meter"/>
-			<menu_item_check label="統計バー" name="Statistics Bar"/>
-			<menu_item_call label="シーン ロード統計情報" name="Scene Load Statistics"/>
-			<menu_item_check label="アバターの複雑さ情報を表示" name="Avatar Draw Info"/>
-		</menu>
-		<menu label="ハイライトと目に見えるもの" name="Highlighting and Visibility">
-			<menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
-			<menu_item_check label="パーティクルを非表示にする" name="Hide Particles"/>
-			<menu_item_check label="選択したものを非表示にする" name="Hide Selected"/>
-			<menu_item_check label="透明部分をハイライトする" name="Highlight Transparent"/>
-			<menu_item_check label="一人称視点のときに十字線を表示する" name="ShowCrosshairs"/>
-		</menu>
-		<menu label="レンダリング（種類）" name="Rendering Types">
-			<menu_item_check label="シンプル" name="Rendering Type Simple"/>
-			<menu_item_check label="アルファ" name="Rendering Type Alpha"/>
-			<menu_item_check label="木" name="Rendering Type Tree"/>
-			<menu_item_check label="アバター" name="Rendering Type Character"/>
-			<menu_item_check label="サーフェスパッチ" name="Rendering Type Surface Patch"/>
-			<menu_item_check label="空" name="Rendering Type Sky"/>
-			<menu_item_check label="水" name="Rendering Type Water"/>
-			<menu_item_check label="地面" name="Rendering Type Ground"/>
-			<menu_item_check label="取引高" name="Rendering Type Volume"/>
-			<menu_item_check label="草" name="Rendering Type Grass"/>
-			<menu_item_check label="雲" name="Rendering Type Clouds"/>
-			<menu_item_check label="パーティクル" name="Rendering Type Particles"/>
-			<menu_item_check label="衝突" name="Rendering Type Bump"/>
-		</menu>
-		<menu label="レンダリング（機能）" name="Rendering Features">
-			<menu_item_check label="UI" name="ToggleUI"/>
-			<menu_item_check label="選択済" name="Selected"/>
-			<menu_item_check label="ハイライト" name="Highlighted"/>
-			<menu_item_check label="ダイナミックテクスチャ" name="Dynamic Textures"/>
-			<menu_item_check label="足の影" name="Foot Shadows"/>
-			<menu_item_check label="くもり" name="Fog"/>
-			<menu_item_check label="FRInfo のテスト" name="Test FRInfo"/>
-			<menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects"/>
-		</menu>
-		<menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"/>
-		<menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache"/>
-		<menu_item_check label="マウスの平滑化" name="Mouse Smoothing"/>
-		<menu_item_call label="リリースキー" name="Release Keys"/>
-		<menu label="ショートカット" name="Shortcuts">
-			<menu_item_check label="アドバンスメニューを表示 - レガシーのショートカット" name="Show Advanced Menu - legacy shortcut"/>
-			<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
-			<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
-			<menu_item_call label="スナップショットをディスクに保存する" name="Snapshot to Disk"/>
-			<menu_item_call label="一人称視点" name="Mouselook"/>
-			<menu_item_check label="ジョイスティックフライカム" name="Joystick Flycam"/>
-			<menu_item_call label="表示をリセットする" name="Reset View"/>
-			<menu_item_call label="最後の発言者を見る" name="Look at Last Chatter"/>
-			<menu_item_call label="ズームイン" name="Zoom In"/>
-			<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
-			<menu_item_call label="ズームアウト" name="Zoom Out"/>
-		</menu>
-		<menu_item_call label="デバッグ設定を表示する" name="Debug Settings"/>
-		<menu_item_check label="開発メニューを表示する" name="Debug Mode"/>
-	</menu>
-	<menu label="開発" name="Develop">
-		<menu label="コンソール" name="Consoles">
-			<menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
-			<menu_item_check label="デバッグコンソール" name="Debug Console"/>
-			<menu_item_call label="通知コンソール" name="Notifications"/>
-			<menu_item_check label="地域デバッグコンソール" name="Region Debug Console"/>
-			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
-			<menu_item_check label="メモリ" name="Memory"/>
-			<menu_item_check label="風景の統計" name="Scene Statistics"/>
-			<menu_item_check label="シーン ローディング モニター" name="Scene Loading Monitor"/>
-			<menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console"/>
-			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
-			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
-			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
-			<menu_item_check label="カメラ" name="Camera"/>
-			<menu_item_check label="風" name="Wind"/>
-			<menu_item_check label="FOV" name="FOV"/>
-			<menu_item_check label="バッジ" name="Badge"/>
-		</menu>
-		<menu label="情報を表示" name="Display Info">
-			<menu_item_check label="時間を表示する" name="Show Time"/>
-			<menu_item_check label="アップロード代金を表示" name="Show Upload Cost"/>
-			<menu_item_check label="描画情報を表示する" name="Show Render Info"/>
-			<menu_item_check label="テクスチャ情報を表示" name="Show Texture Info"/>
-			<menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
-			<menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor"/>
-			<menu_item_check label="メモリを表示：" name="Show Memory"/>
-			<menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates"/>
-		</menu>
-		<menu label="エラー実行" name="Force Errors">
-			<menu_item_call label="ブレークポイント" name="Force Breakpoint"/>
-			<menu_item_call label="LLError とクラッシュを実行する" name="Force LLError And Crash"/>
-			<menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access"/>
-			<menu_item_call label="無限ループ" name="Force Infinite Loop"/>
-			<menu_item_call label="ドライバのクラッシュを実行する" name="Force Driver Carsh"/>
-			<menu_item_call label="ソフトウェア例外エラーの実行する" name="Force Software Exception"/>
-			<menu_item_call label="ビューワの接続遮断を実行する" name="Force Disconnect Viewer"/>
-			<menu_item_call label="メモリリークをシミュレートする" name="Memory Leaking Simulation"/>
-		</menu>
-		<menu label="レンダーテスト" name="Render Tests">
-			<menu_item_check label="カメラオフセット" name="Camera Offset"/>
-			<menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
-			<menu_item_check label="定期的に遅いフレームを挿入する" name="Periodic Slow Frame"/>
-			<menu_item_check label="フレームテスト" name="Frame Test"/>
-			<menu_item_call label="フレームプロフィール" name="Frame Profile"/>
-			<menu_item_call label="ベンチマーク" name="Benchmark"/>
-		</menu>
-		<menu label="メタデータのレンダー" name="Render Metadata">
-			<menu_item_check label="バウンディングボックス" name="Bounding Boxes"/>
-			<menu_item_check label="普通" name="Normals"/>
-			<menu_item_check label="オクトリー" name="Octree"/>
-			<menu_item_check label="シャドウ円錐" name="Shadow Frusta"/>
-			<menu_item_check label="実像" name="Physics Shapes"/>
-			<menu_item_check label="オクルージョン" name="Occlusion"/>
-			<menu_item_check label="バッチの描画" name="Render Batches"/>
-			<menu_item_check label="タイプを更新" name="Update Type"/>
-			<menu_item_check label="アニメーション部分をテクスチャで表示" name="Texture Anim"/>
-			<menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
-			<menu_item_check label="テクスチャの範囲" name="Texture Area"/>
-			<menu_item_check label="側面" name="Face Area"/>
-			<menu_item_check label="LOD 情報" name="LOD Info"/>
-			<menu_item_check label="三角形の数" name="Triangle Count"/>
-			<menu_item_check label="制作キュー" name="Build Queue"/>
-			<menu_item_check label="光" name="Lights"/>
-			<menu_item_check label="パーティクル" name="Particles"/>
-			<menu_item_check label="骨組みの衝突判定" name="Collision Skeleton"/>
-			<menu_item_check label="ジョイント" name="Joints"/>
-			<menu_item_check label="レイキャスト" name="Raycast"/>
-			<menu_item_check label="風のベクトル" name="Wind Vectors"/>
-			<menu_item_check label="スカルプト" name="Sculpt"/>
-			<menu label="テクスチャの密度" name="Texture Density">
-				<menu_item_check label="なし" name="None"/>
-				<menu_item_check label="現在" name="Current"/>
-				<menu_item_check label="望ましい" name="Desired"/>
-				<menu_item_check label="フル" name="Full"/>
-			</menu>
-		</menu>
-		<menu label="レンダリング" name="Rendering">
-			<menu_item_check label="軸" name="Axes"/>
-			<menu_item_check label="接線基底" name="Tangent Basis"/>
-			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
-			<menu_item_call label="選択したマテリアル情報" name="Selected Material Info"/>
-			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
-			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
-			<menu_item_check label="高度なライティングモデル" name="Advanced Lighting Model"/>
-			<menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
-			<menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/>
-			<menu_item_check label="GL デバッグ" name="Debug GL"/>
-			<menu_item_check label="経路をデバッグ" name="Debug Pipeline"/>
-			<menu_item_check label="自動アルファマスク（遅延）" name="Automatic Alpha Masks (deferred)"/>
-			<menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)"/>
-			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
-			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
-			<menu_item_check label="アンビエントを無効にする" name="Disable Ambient"/>
-			<menu_item_check label="日の出を無効にする" name="Disable Sunlight"/>
-			<menu_item_check label="近くの光を無効にする" name="Disable Local Lights"/>
-			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
-			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
-			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>
-			<menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects"/>
-			<menu_item_call label="キャッシュをすぐにクリア" name="Cache Clear"/>
-		</menu>
-		<menu label="ネットワーク" name="Network">
-			<menu_item_check label="エージェントを一時停止する" name="AgentPause"/>
-			<menu_item_call label="メッセージログを有効にする" name="Enable Message Log"/>
-			<menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log"/>
-			<menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects"/>
-			<menu_item_check label="挿入されたオブジェクトの位置の Ping" name="Ping Interpolate Object Positions"/>
-			<menu_item_call label="パケットドロップ" name="Drop a Packet"/>
-		</menu>
-		<menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
-		<menu label="レコーダー" name="Recorder">
-			<menu_item_call label="再生開始" name="Start Playback"/>
-			<menu_item_call label="再生停止" name="Stop Playback"/>
-			<menu_item_check label="再生をループ" name="Loop Playback"/>
-			<menu_item_call label="記録開始" name="Start Record"/>
-			<menu_item_call label="記録停止" name="Stop Record"/>
-		</menu>
-		<menu label="世界" name="DevelopWorld">
-			<menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override"/>
-			<menu_item_check label="固定された天気" name="Fixed Weather"/>
-			<menu_item_call label="リージョンオブジェクトのキャッシュをダンプ" name="Dump Region Object Cache"/>
-		</menu>
-		<menu label="UI" name="UI">
-			<menu_item_call label="メディアブラウザ" name="Media Browser"/>
-			<menu_item_call label="SelectMgr をダンプ" name="Dump SelectMgr"/>
-			<menu_item_call label="インベントリの出力" name="Dump Inventory"/>
-			<menu_item_call label="タイマーをダンプ" name="Dump Timers"/>
-			<menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
-			<menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
-			<menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
-			<menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
-			<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
-			<menu_item_check label="デバッグ表示" name="Debug Views"/>
-			<menu_item_check label="デバッグ名ツールチップ" name="Debug Name Tooltips"/>
-			<menu_item_check label="マウス操作で発生するもののデバッグ" name="Debug Mouse Events"/>
-			<menu_item_check label="デバッグキー" name="Debug Keys"/>
-			<menu_item_check label="WindowProc のデバッグ" name="Debug WindowProc"/>
-		</menu>
-		<menu label="XUI" name="XUI">
-			<menu_item_call label="色の設定を更新する" name="Reload Color Settings"/>
-			<menu_item_call label="フォントテストを表示する" name="Show Font Test"/>
-			<menu_item_check label="XUI ネームを表示する" name="Show XUI Names"/>
-			<menu_item_call label="テスト用 IM を送信する" name="Send Test IMs"/>
-			<menu_item_call label="名前のキャッシュをフラッシュ" name="Flush Names Caches"/>
-		</menu>
-		<menu label="アバター" name="Character">
-			<menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
-				<menu_item_call label="瞳" name="Grab Iris"/>
-				<menu_item_call label="頭" name="Grab Head"/>
-				<menu_item_call label="上半身" name="Grab Upper Body"/>
-				<menu_item_call label="下半身" name="Grab Lower Body"/>
-				<menu_item_call label="スカート" name="Grab Skirt"/>
-			</menu>
-			<menu label="キャラクターテスト" name="Character Tests">
-				<menu_item_call label="容姿を XML に保存する" name="Appearance To XML"/>
-				<menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
-				<menu_item_call label="男性アバターのテスト" name="Test Male"/>
-				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
-				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
-			</menu>
-			<menu label="アニメーションのスピード" name="Animation Speed">
-				<menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/>
-				<menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/>
-				<menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/>
-				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
-			</menu>
-			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
-			<menu_item_check label="アニメーション情報" name="Animation Info"/>
-			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
-			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
-			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
-			<menu_item_check label="LOD を無効にする" name="Disable LOD"/>
-			<menu_item_check label="キャラクター Vis のデバッグ" name="Debug Character Vis"/>
-			<menu_item_check label="骨組みの衝突判定を表示する" name="Show Collision Skeleton"/>
-			<menu_item_check label="骨を表示" name="Show Bones"/>
-			<menu_item_check label="エージェントのターゲットを表示する" name="Display Agent Target"/>
-			<menu_item_check label="インポスターの範囲を表示" name="Show Impostor Extents"/>
-			<menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
-			<menu_item_call label="アバターテクスチャをデバッグ" name="Debug Avatar Textures"/>
-			<menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/>
-		</menu>
-		<menu_item_check label="HTTP Texture" name="HTTP Textures"/>
-		<menu_item_call label="圧縮画像" name="Compress Images"/>
-		<menu_item_call label="Visual Leak Detector を有効にする" name="Enable Visual Leak Detector"/>
-		<menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
-		<menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/>
-		<menu label="ログレベルを設定" name="Set Logging Level">
-			<menu_item_check label="デバッグ" name="Debug"/>
-			<menu_item_check label="情報" name="Info"/>
-			<menu_item_check label="警告" name="Warning"/>
-			<menu_item_check label="エラー" name="Error"/>
-			<menu_item_check label="なし" name="None"/>
-		</menu>
-		<menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options"/>
-		<menu_item_call label="管理者ステータス解除" name="Leave Admin Options"/>
-		<menu_item_check label="管理者メニューを表示する" name="View Admin Options"/>
-		<menu_item_check name="Show Avatar Render Info" label="アバター描画情報を表示"/>
-		<menu_item_call name="Playback event recording" label="イベントの記録を再生する"/>
-		<menu_item_call name="FB Connect Test" label="FB コンテンツテスト"/>
-		<menu_item_call name="Stop event recording" label="イベントの記録を停止する"/>
-		<menu_item_call name="Start event recording" label="イベントの記録を開始する"/>
-	</menu>
-	<menu label="管理者" name="Admin">
-		<menu label="オブジェクト" name="AdminObject">
-			<menu_item_call label="コピーを取る" name="Admin Take Copy"/>
-			<menu_item_call label="私を所有者にする" name="Force Owner To Me"/>
-			<menu_item_call label="所有者権限の実行" name="Force Owner Permissive"/>
-			<menu_item_call label="削除" name="Delete"/>
-			<menu_item_call label="ロック" name="Lock"/>
-			<menu_item_call label="アセット ID を取得" name="Get Assets IDs"/>
-		</menu>
-		<menu label="区画" name="Parcel">
-			<menu_item_call label="私を所有者にする" name="Owner To Me"/>
-			<menu_item_call label="リンデンコンテンツに設定する" name="Set to Linden Content"/>
-			<menu_item_call label="パブリックの土地を取得する" name="Claim Public Land"/>
-		</menu>
-		<menu label="リージョン/地域" name="Region">
-			<menu_item_call label="一時アセットデータをダンプ" name="Dump Temp Asset Data"/>
-			<menu_item_call label="リージョンの状態を保存する" name="Save Region State"/>
-		</menu>
-		<menu_item_call label="グリッドツール" name="God Tools"/>
-	</menu>
-	<menu label="管理者" name="Deprecated">
-		<menu label="オブジェクトを取り付ける" name="Attach Object"/>
-		<menu label="オブジェクトを取り外す" name="Detach Object"/>
-		<menu label="衣類を脱ぐ" name="Take Off Clothing">
-			<menu_item_call label="シャツ" name="Shirt"/>
-			<menu_item_call label="パンツ" name="Pants"/>
-			<menu_item_call label="靴" name="Shoes"/>
-			<menu_item_call label="靴下" name="Socks"/>
-			<menu_item_call label="ジャケット" name="Jacket"/>
-			<menu_item_call label="手袋" name="Gloves"/>
-			<menu_item_call label="下着シャツ" name="Menu Undershirt"/>
-			<menu_item_call label="下着パンツ" name="Menu Underpants"/>
-			<menu_item_call label="スカート" name="Skirt"/>
-			<menu_item_call label="アルファ" name="Alpha"/>
-			<menu_item_call label="タトゥ" name="Tattoo"/>
-			<menu_item_call label="ユニバーサル" name="Universal"/>
-			<menu_item_call label="物理作用" name="Physics"/>
-			<menu_item_call label="すべての衣類" name="All Clothes"/>
-		</menu>
-		<menu label="ヘルプ" name="DeprecatedHelp">
-			<menu_item_call label="リンデン公式ブログ" name="Official Linden Blog"/>
-			<menu_item_call label="スクリプトポータル" name="Scripting Portal"/>
-			<menu label="バグの報告" name="Bug Reporting">
-				<menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker"/>
-				<menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help"/>
-				<menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101"/>
-				<menu_item_call label="セキュリティ問題" name="Security Issues"/>
-				<menu_item_call label="QA Wiki" name="QA Wiki"/>
-			</menu>
-		</menu>
-	</menu>
-</menu_bar>
+  <menu label="私" name="Me">
+    <menu_item_call label="プロフィール…" name="Profile" />
+    <menu_item_check label="インベントリ…" name="Inventory" />
+    <menu_item_call label="新しいインベントリウィンドウ" name="NewInventoryWindow" />
+    <menu_item_call label="場所…" name="Places" />
+    <menu_item_call label="ピック…" name="Picks" />
+    <menu_item_call label="体験…" name="Experiences" />
+    <menu_item_call label="カメラコントロール…" name="Camera Controls" />
+
+    <menu_item_separator />
+    <menu_item_check label="一時退席中" name="Away" />
+    <menu_item_check label="着信拒否" name="Do Not Disturb" />
+
+    <menu_item_separator />
+    <!-- L$は空白になってしまうため翻訳を変更 -->
+    <menu_item_call label="リンデンドルの購入…" name="Buy and Sell L$" />
+    <menu_item_call label="マーケットプレイスのリスト…" name="MarketplaceListings" />
+    <menu_item_call label="アカウントのダッシュボード…" name="Manage My Account" />
+    <menu_item_call label="[Membership]" name="Membership" />
+
+    <menu_item_separator />
+
+    <menu_item_call label="初期設定…" name="Preferences" />
+    <menu_item_call label="ツールバーのボタン…" name="Toolbars" />
+    <menu_item_call label="全てのコントロールを隠す" name="Hide UI" shortcut="control|shift|U" />
+    <menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H" />
+
+    <menu_item_separator />
+    <menu_item_call label="[APP_NAME]の終了" name="Quit" />
+  </menu>
+
+  <menu label="アバター" name="Avatar">
+    <menu_item_call label="着用中…" name="NowWearing" />
+    <menu_item_call label="アウトフィット…" name="ChangeOutfit" />
+    <menu_item_call label="ホバーする高さ…" name="Hover Height" />
+    <menu_item_call label="シェイプの編集…" name="Edit My Shape" />
+    <menu_item_call label="アウトフィットパーツの編集…" name="Edit Outfit" />
+    <menu label="脱ぐ" name="Take Off &gt;">
+      <menu label="服装" name="Clothes &gt;">
+        <menu_item_call label="シャツ" name="Shirt" />
+        <menu_item_call label="ズボン" name="Pants" />
+        <menu_item_call label="スカート" name="Skirt" />
+        <menu_item_call label="靴" name="Shoes" />
+        <menu_item_call label="靴下" name="Socks" />
+        <menu_item_call label="上着" name="Jacket" />
+        <menu_item_call label="手袋" name="Gloves" />
+        <menu_item_call label="下着（上半身）" name="Self Undershirt" />
+        <menu_item_call label="下着（下半身）" name="Self Underpants" />
+        <menu_item_call label="タトゥ" name="Self Tattoo" />
+        <menu_item_call label="物理作用" name="Self Physics" />
+        <menu_item_call label="アルファ" name="Self Alpha" />
+        <menu_item_separator />
+        <menu_item_call label="すべての服装" name="All Clothes" />
+      </menu>
+      <menu label="HUD" name="Avatar Detach HUD" />
+      <menu label="取り外し" name="Avatar Detach" />
+      <menu_item_call label="全てを取り外す" name="Detach All" />
+    </menu>
+    <menu_item_separator />
+    <menu_item_call label="アバターを選択…" name="Avatar Picker" />
+    <menu_item_separator />
+
+    <menu_item_call label="座る／立つ" shortcut="alt|shift|S" name="Sit stand" />
+    <menu_item_call label="飛行／歩行" name="Fly land" shortcut="HOME" />
+    <menu_item_call label="アニメーション停止" name="Stop Animating My Avatar" />
+    <menu_item_check label="歩行／走行／飛行…" name="WalkRunFly" />
+    <menu_item_check label="常時走行" name="Always Run" shortcut="control|R" />
+    <menu_item_separator />
+    <menu_item_check label="ジェスチャー…" name="Gestures" shortcut="control|G" />
+    <menu_item_separator />
+    <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+    <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+    <menu_item_call label="スクリプトを装着…" name="MyScripts" />
+    <menu_item_separator />
+    <menu_item_call label="アバターに関するヘルプ…" name="Help with avatars" />
+  </menu>
+  <menu label="コミュニケーション" name="Communicate">
+    <menu_item_check label="会話…" name="Conversations" />
+    <menu_item_check label="近くのチャット…" name="Nearby Chat" />
+    <menu_item_check label="ボイスチャット" name="Speak" />
+    <menu_item_check label="会話ログ…" name="Conversation Log..." />
+    <menu label="ボイスモーフィング" name="VoiceMorphing">
+      <menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing" />
+      <menu_item_check label="プレビュー…" name="Preview" />
+      <menu_item_call label="申し込む…" name="Subscribe" />
+      <menu_item_call label="プレミアム会員特典…" name="PremiumPerk" />
+    </menu>
+    <menu_item_check label="ジェスチャー…" name="Gestures" />
+    <menu_item_check label="フレンド" name="My Friends" />
+    <menu_item_check label="グループ" name="My Groups" />
+    <menu_item_check label="近くにいる人物" name="Active Speakers" />
+    <menu_item_check label="リストをブロック" name="Block List" />
+    <menu_item_check label="着信拒否" name="Do Not Disturb" />
+  </menu>
+  <menu label="ワールド" name="World">
+    <menu_item_call label="現在地をランドマーク" name="Create Landmark Here" />
+    <menu_item_call label="行き先…" name="Destinations" />
+    <menu_item_check label="ワールドマップ" name="World Map" />
+    <menu_item_check label="ミニマップ" name="Mini-Map" />
+    <menu_item_call label="イベント" name="Events" />
+    <menu_item_check label="検索…" name="Search" />
+    <menu_item_separator />
+    <menu_item_call label="ホームにテレポート" name="Teleport Home" />
+    <menu_item_call label="現在地をホームに設定" name="Set Home to Here" />
+    <menu_item_separator />
+    <menu_item_call label="スナップショット" name="Take Snapshot" />
+
+    <menu_item_call label="360度スナップショット" name="Capture 360" />
+    <menu_item_call label="場所のプロフィール" name="Place Profile" />
+    <menu_item_separator />
+    <menu_item_call label="土地情報" name="About Land" />
+    <menu_item_call label="リージョン（地域）／不動産" name="RegionEstate" />
+    <menu_item_call label="自分のLindenホーム…" name="Linden Home" />
+    <menu_item_call label="自分の所有地…" name="My Land" />
+    <menu_item_call label="この土地を購入" name="Buy Land" />
+
+    <menu_item_separator />
+
+    <menu label="表示" name="LandShow">
+      <menu_item_check label="立入禁止ライン" name="Ban Lines" />
+      <menu_item_check label="ビーコン（標識）" name="beacons" />
+      <menu_item_check label="敷地の境界線" name="Property Lines" />
+      <menu_item_check label="土地所有者" name="Land Owners" />
+      <menu_item_check label="座標" name="Coordinates" />
+      <menu_item_check label="区画のプロパティ" name="Parcel Properties" />
+      <menu_item_separator />
+      <menu_item_check label="拡張メニュー" name="Show Advanced Menu" />
+    </menu>
+
+    <!--
+    <menu_item_separator/>
+      <menu_item_check label="ナビゲーションバーを表示" name="ShowNavbarNavigationPanel"/>
+      <menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
+    <menu_item_separator/>
+    -->
+
+    <menu label="環境" name="Environment">
+      <menu_item_check label="夜明け" name="Sunrise" />
+      <menu_item_check label="正午" name="Noon" />
+      <menu_item_check label="夕方" name="Sunset" />
+      <menu_item_check label="深夜" name="Midnight" />
+      <menu_item_check label="共有された環境を使用" name="Use Shared Environment" />
+      <menu_item_call label="自分の環境…" name="my_environs" />
+      <menu_item_call label="個人的な照明…" name="adjustment_tool" />
+      <menu_item_check label="雲を一時停止" name="pause_clouds" />
+    </menu>
+  </menu>
+
+  <!--
+  <menu create_jump_keys="true" label="環境編集" name="Environment Editor" tear_off="true">
+    <menu_item_call label="初期設定…" name="Environment Settings"/>
+    <menu_item_separator/>
+    <menu name="Water Presets" label="水のプリセット"/>
+    <menu name="Sky Presets" label="空のプリセット">
+      <menu_item_call label="新規プリセット…" name="new_sky_preset"/>
+      <menu_item_call label="プリセット編集…" name="edit_sky_preset"/>
+    </menu>
+    <menu name="Day Presets" label="日のプリセット">
+      <menu_item_call label="新規プリセット…" name="new_day_preset"/>
+      <menu_item_call label="プリセット編集…" name="edit_day_preset"/>
+    </menu>
+  </menu>
+  -->
+
+  <menu label="制作" name="BuildTools">
+    <menu_item_check label="制作" name="Show Build Tools" />
+    <menu label="制作ツールを選択する" name="Select Tool">
+      <menu_item_call label="フォーカスツール" name="Focus" />
+      <menu_item_call label="移動ツール" name="Move" />
+      <menu_item_call label="編集ツール" name="Edit" />
+      <menu_item_call label="作成ツール" name="Create" />
+      <menu_item_call label="土地ツール" name="Land" />
+    </menu>
+    <menu_item_call label="リンク" name="Link" />
+    <menu_item_call label="リンク解除" name="Unlink" />
+    <menu_item_check label="リンク部分を編集" name="Edit Linked Parts" />
+    <menu label="要素を選択" name="Select Elements">
+      <menu_item_call label="次のパーツまたは面を選択" name="Select Next Part or Face" />
+      <menu_item_call label="前のパーツまたは面を選択" name="Select Previous Part or Face" />
+      <menu_item_call label="次のパーツまたは面を含める" name="Include Next Part or Face" />
+      <menu_item_call label="前のパーツまたは面を含める" name="Include Previous Part or Face" />
+    </menu>
+    <menu_item_call label="リージョン（地域）オブジェクト" name="pathfinding_linkset_menu_item" />
+    <menu_item_separator />
+    <menu_item_call label="選択をフォーカス" name="Focus on Selection" />
+    <menu_item_call label="選択をズーム" name="Zoom to Selection" />
+    <menu_item_separator />
+    <menu label="オブジェクト" name="Object">
+      <menu_item_call label="購入" name="Menu Object Buy" />
+      <menu_item_call label="取得" name="Menu Object Take" />
+      <menu_item_call label="コピーを取得" name="Take Copy" />
+      <menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents" />
+      <menu_item_call label="オブジェクトを返却" name="Return Object back to Owner" />
+      <menu_item_call label="複製" name="DuplicateObject" />
+    </menu>
+    <menu label="スクリプト" name="Scripts">
+      <menu_item_check label="スクリプトの警告／エラー…" name="Script debug" />
+      <menu_item_call label="スクリプトの再コンパイル（Mono）" name="Mono" />
+      <menu_item_call label="スクリプトの再コンパイル（LSL）" name="LSL" />
+      <menu_item_call label="スクリプトのリセット" name="Reset Scripts" />
+      <menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running" />
+      <menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running" />
+    </menu>
+
+    <menu label="経路探索" name="Pathfinding">
+      <menu_item_call label="リージョン（地域）のオブジェクト" name="pathfinding_linksets_menu_item" />
+      <menu_item_call label="キャラクター…" name="pathfinding_characters_menu_item" />
+      <menu_item_call label="表示／テスト…" name="pathfinding_console_menu_item" />
+      <menu_item_call label="リージョン（地域）の再構築" name="pathfinding_rebake_navmesh_item" />
+    </menu>
+
+
+    <menu_item_separator />
+
+    <menu label="オプション" name="Options">
+      <menu_item_check label="権限の詳細を表示する" name="DebugPermissions" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="自分のオブジェクトだけを選択する" name="Select Only My Objects" />
+      <menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects" />
+      <menu_item_check label="範囲内を選択する" name="Select By Surrounding" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="選択のアウトラインを表示" name="Show Selection Outlines" />
+      <menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection" />
+      <menu_item_check label="選択した光の効果範囲を表示する" name="Show Light Radius for Selection" />
+      <menu_item_check label="選択ビームを表示する" name="Show Selection Beam" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="グリッド吸着" name="Snap to Grid" />
+      <menu_item_call label="オブジェクトのＸＹ軸をグリッドに吸着" name="Snap Object XY to Grid" />
+      <menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid" />
+      <menu_item_call label="グリッドオプション…" name="Grid Options" />
+      <menu_item_call label="デフォルトの権限設定…" name="Set default permissions" />
+    </menu>
+    <menu label="アップロード" name="Upload">
+      <menu_item_call label="画像（L$ [COST]）…" name="Upload Image" />
+      <menu_item_call label="サウンド（L$ [COST]）…" name="Upload Sound" />
+      <menu_item_call label="アニメーション（L$ [COST]）…" name="Upload Animation" />
+      <menu_item_call label="モデル" name="Upload Model" />
+      <menu_item_call label="一括 （ファイルにつきL$ [COST]）…" name="Bulk Upload" />
+    </menu>
+    <menu_item_separator />
+    <menu_item_call label="取り消し" name="Undo" />
+    <menu_item_call label="やり直し" name="Redo" />
+  </menu>
+  <menu label="ヘルプ" name="Help">
+    <menu_item_call label="ハウツー…" name="How To" />
+    <!-- <menu_item_call label="チュートリアル" name="Tutorial" /> -->
+    <menu_item_call label="ナレッジベース" name="Knowledge Base" />
+    <menu_item_call label="Wiki" name="Wiki" />
+    <menu_item_call label="コミュニティフォーラム" name="Community Forums" />
+    <menu_item_call label="日本語サポートページ" name="Support portal" />
+    <menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News" />
+    <menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs" />
+    <menu_item_separator />
+
+    <menu_item_call label="嫌がらせを報告する" name="Report Abuse" />
+    <menu_item_call label="バグを報告する" name="Report Bug" />
+    <menu_item_separator />
+
+    <menu_item_call label="衝突・プッシュ＆打撃" name="Bumps, Pushes &amp;amp; Hits" />
+    <menu_item_call label="[APP_NAME]について" name="About Second Life" />
+  </menu>
+  <menu label="拡張" name="Advanced">
+    <menu_item_call label="テクスチャをリベークする" name="Rebake Texture" />
+    <menu_item_call label="UIサイズをデフォルトにする" name="Set UI Size to Default" />
+    <menu_item_call label="ウィンドウサイズ設定…" name="Set Window Size..." />
+
+    <menu_item_separator />
+
+    <menu_item_check label="遠くのオブジェクトを選択しない" name="Limit Select Distance" />
+    <menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance" />
+
+    <menu_item_separator />
+
+    <menu label="パフォーマンスツール" name="Performance Tools">
+      <menu_item_call label="遅延メーター" name="Lag Meter" />
+      <menu_item_check label="統計バー" name="Statistics Bar" />
+      <menu_item_call label="シーン負荷の統計情報" name="Scene Load Statistics" />
+      <menu_item_check label="アバターの複雑さ情報を表示" name="Avatar Draw Info" />
+    </menu>
+    <menu label="ハイライトと表示" name="Highlighting and Visibility">
+      <menu_item_check label="ビーコンを簡素化" name="Cheesy Beacon" />
+      <menu_item_check label="パーティクルを非表示" name="Hide Particles" />
+      <menu_item_check label="選択を非表示" name="Hide Selected" />
+      <menu_item_check label="透明部分をハイライト" name="Highlight Transparent" />
+      <menu_item_check label="一人称視点のときに十字線を表示" name="ShowCrosshairs" />
+      <!--
+      <menu create_jump_keys="true" label="ホバーでTips表示" name="Hover Tips" tear_off="true">
+        <menu_item_check label="Tips表示" name="Show Tips" shortcut="control|shift|T"/>
+
+        <menu_item_separator/>
+
+        <menu_item_check label="土地のツールチップを表示" name="Land Tips"/>
+        <menu_item_check label="すべてのオブジェクトのツールチップを表示" name="Tips On All Objects"/>
+      </menu>
+      -->
+    </menu>
+    <menu label="レンダリング種別" name="Rendering Types">
+      <menu_item_check label="シンプル" name="Rendering Type Simple" />
+      <menu_item_check label="アルファ" name="Rendering Type Alpha" />
+      <menu_item_check label="木" name="Rendering Type Tree" />
+      <menu_item_check label="アバター" name="Rendering Type Character" />
+      <menu_item_check label="アニメッシュ" name="Rendering Type Control Avatar" />
+      <menu_item_check label="サーフェスパッチ" name="Rendering Type Surface Patch" />
+      <menu_item_check label="空" name="Rendering Type Sky" />
+      <menu_item_check label="水" name="Rendering Type Water" />
+      <menu_item_check label="地面" name="Rendering Type Ground" />
+      <menu_item_check label="ボリューム" name="Rendering Type Volume" />
+      <menu_item_check label="草" name="Rendering Type Grass" />
+      <menu_item_check label="雲" name="Rendering Type Clouds" />
+      <menu_item_check label="パーティクル" name="Rendering Type Particles" />
+      <menu_item_check label="衝突" name="Rendering Type Bump" />
+    </menu>
+    <menu label="レンダリング機能" name="Rendering Features">
+      <menu_item_check label="UI" name="ToggleUI" />
+      <menu_item_check label="選択済" name="Selected" />
+      <menu_item_check label="ハイライト" name="Highlighted" />
+      <menu_item_check label="動的テクスチャ" name="Dynamic Textures" />
+      <menu_item_check label="足の影" name="Foot Shadows" />
+      <menu_item_check label="フォグ" name="Fog" />
+      <menu_item_check label="FRInfoのテスト" name="Test FRInfo" />
+      <menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects" />
+    </menu>
+    <menu_item_check label="プラグイン読み取りスレッドを使用" name="Use Plugin Read Thread" />
+    <menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache" />
+    <menu_item_check label="マウスの平滑化" name="Mouse Smoothing" />
+    <menu_item_call label="リリースキー" name="Release Keys" />
+
+    <menu_item_separator />
+
+    <menu label="ショートカット" name="Shortcuts">
+
+      <menu_item_call label="ウィンドウを閉じる" name="Close Window" />
+      <menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="スナップショットをディスクに保存する" name="Snapshot to Disk" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="マウスルック" name="Mouselook" />
+      <menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam" />
+      <menu_item_call label="表示をリセットする" name="Reset View" />
+      <menu_item_call label="最後の発言者を見る" name="Look at Last Chatter" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="ズーム・イン" name="Zoom In" />
+      <menu_item_call label="ズーム（デフォルト）" name="Zoom Default" />
+      <menu_item_call label="ズーム・アウト" name="Zoom Out" />
+    </menu>
+    <!--Shortcuts-->
+    <menu_item_call label="デバッグ設定を表示する" name="Debug Settings" />
+    <menu_item_check label="開発メニューを表示する" name="Debug Mode" />
+  </menu>
+
+
+  <menu label="開発" name="Develop">
+    <menu label="コンソール" name="Consoles">
+      <menu_item_check label="テクスチャのコンソール" name="Texture Console" />
+      <menu_item_check label="デバッグコンソール" name="Debug Console" />
+      <menu_item_call label="通知コンソール" name="Notifications" />
+      <menu_item_check label="リージョン（地域）デバッグコンソール" name="Region Debug Console" />
+      <menu_item_check label="ファーストタイマー" name="Fast Timers" />
+      <menu_item_check label="メモリ" name="Memory" />
+      <menu_item_check label="シーンの統計" name="Scene Statistics" />
+      <menu_item_check label="シーンの読み込みモニター" name="Scene Loading Monitor" />
+      <menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console" />
+      <menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console" />
+      <menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="カメラ" name="Camera" />
+      <menu_item_check label="風" name="Wind" />
+      <menu_item_check label="FOV" name="FOV" />
+      <menu_item_check label="バッジ" name="Badge" />
+    </menu>
+    <menu label="情報を表示" name="Display Info">
+      <menu_item_check label="時間を表示する" name="Show Time" />
+      <menu_item_check label="アップロードコストを表示" name="Show Upload Cost" />
+      <menu_item_check label="描画情報を表示する" name="Show Render Info" />
+      <menu_item_check label="アバターの描画情報を表示" name="Show Avatar Render Info" />
+      <menu_item_check label="テクスチャ情報を表示" name="Show Texture Info" />
+      <menu_item_check label="マトリックスを表示する" name="Show Matrices" />
+      <menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor" />
+      <menu_item_check label="メモリを表示" name="Show Memory" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates" />
+    </menu>
+    <menu label="エラー実行" name="Force Errors">
+      <menu_item_call label="ブレークポイント" name="Force Breakpoint" />
+      <menu_item_call label="LLErrorとクラッシュを実行する" name="Force LLError And Crash" />
+      <menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access" />
+      <menu_item_call label="無限ループ" name="Force Infinite Loop" />
+      <menu_item_call label="ドライバのクラッシュを実行する" name="Force Driver Carsh" />
+      <menu_item_call label="ソフトウェア例外エラーの実行する" name="Force Software Exception" />
+      <menu_item_call label="ビューアーの接続遮断を実行する" name="Force Disconnect Viewer" />
+      <menu_item_call label="メモリリークをシミュレートする" name="Memory Leaking Simulation" />
+    </menu>
+    <menu label="描画テスト" name="Render Tests">
+      <menu_item_check label="カメラのオフセット" name="Camera Offset" />
+      <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate" />
+      <menu_item_check label="周期的な遅いフレーム" name="Periodic Slow Frame" />
+      <menu_item_check label="フレームテスト" name="Frame Test" />
+      <menu_item_call label="フレームプロフィール" name="Frame Profile" />
+      <menu_item_call label="ベンチマーク" name="Benchmark" />
+    </menu>
+    <menu label="メタデータの描画" name="Render Metadata">
+      <menu_item_check label="バウンディングボックス" name="Bounding Boxes" />
+      <menu_item_check label="普通" name="Normals" />
+      <menu_item_check label="八分木" name="Octree" />
+      <menu_item_check label="シャドウ円錐" name="Shadow Frusta" />
+      <menu_item_check label="実像" name="Physics Shapes" />
+      <menu_item_check label="オクルージョン" name="Occlusion" />
+      <menu_item_check label="バッチの描画" name="Render Batches" />
+      <menu_item_check label="タイプを更新" name="Update Type" />
+      <menu_item_check label="テクスチャのアニメ" name="Texture Anim" />
+      <menu_item_check label="テクスチャ優先度" name="Texture Priority" />
+      <menu_item_check label="テクスチャの範囲" name="Texture Area" />
+      <menu_item_check label="側面" name="Face Area" />
+      <menu_item_check label="LOD情報" name="LOD Info" />
+      <menu_item_check label="三角形の数" name="Triangle Count" />
+      <menu_item_check label="制作・キュー" name="Build Queue" />
+      <menu_item_check label="光" name="Lights" />
+      <menu_item_check label="パーティクル" name="Particles" />
+      <menu_item_check label="骨組みの衝突判定" name="Collision Skeleton" />
+      <menu_item_check label="ジョイント" name="Joints" />
+      <menu_item_check label="レイキャスト" name="Raycast" />
+      <menu_item_check label="風のベクトル" name="Wind Vectors" />
+      <menu_item_check label="彫刻" name="Sculpt" />
+      <menu label="テクスチャの密度" name="Texture Density">
+        <menu_item_check label="なし" name="None" />
+        <menu_item_check label="現在" name="Current" />
+        <menu_item_check label="望ましい" name="Desired" />
+        <menu_item_check label="完全" name="Full" />
+      </menu>
+    </menu>
+    <menu label="レンダリング" name="Rendering">
+      <menu_item_check label="軸" name="Axes" />
+      <menu_item_check label="接線基準" name="Tangent Basis" />
+      <menu_item_call label="選択されたテクスチャ情報基準" name="Selected Texture Info Basis" />
+      <menu_item_call label="選択したマテリアルの情報" name="Selected Material Info" />
+      <menu_item_check label="ワイヤーフレーム" name="Wireframe" />
+      <menu_item_check label="オブジェクト間のオクルージョン" name="Object-Object Occlusion" />
+      <menu_item_separator />
+
+      <menu_item_check label="高度な光源モデル" name="Advanced Lighting Model" />
+      <menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors" />
+      <menu_item_check label="SSAOと影の平滑化" name="SSAO and Shadow Smoothing" />
+      <menu_item_separator />
+
+      <menu_item_check label="次回起動時にGLをデバッグ" name="Debug GL" />
+      <menu_item_check label="パイプラインをデバッグ" name="Debug Pipeline" />
+      <menu_item_check label="自動アルファマスク（遅延）" name="Automatic Alpha Masks (deferred)" />
+      <menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)" />
+      <menu_item_check label="アニメーションテクスチャ" name="Animation Textures" />
+      <menu_item_check label="テクスチャを無効にする" name="Disable Textures" />
+      <menu_item_check label="アンビエントを無効にする" name="Disable Ambient" />
+      <menu_item_check label="日の光を無効にする" name="Disable Sunlight" />
+      <menu_item_check label="近くの光を無効にする" name="Disable Local Lights" />
+      <menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures" />
+      <menu_item_check label="装着された光源を描画する" name="Render Attached Lights" />
+      <menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles" />
+      <menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects" />
+      <menu_item_separator />
+
+      <menu_item_call label="キャッシュをすぐにクリア" name="Cache Clear" />
+    </menu>
+
+    <menu label="ネットワーク" name="Network">
+      <menu_item_check label="エージェントを一時停止する" name="AgentPause" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="メッセージログを有効にする" name="Enable Message Log" />
+      <menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log" />
+
+      <menu_item_separator />
+
+      <menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects" />
+      <menu_item_check label="挿入されたオブジェクトの位置のPing" name="Ping Interpolate Object Positions" />
+
+      <menu_item_separator />
+
+      <menu_item_call label="パケットをドロップ" name="Drop a Packet" />
+    </menu>
+    <menu label="キャッシュ" name="Cache">
+      <menu_item_call label="ディスクキャッシュをパージ" name="Purge Disk Cache" />
+    </menu>
+    <menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera" />
+    <menu label="レコーダー" name="Recorder">
+      <menu_item_call label="イベントの記録開始" name="Start event recording" />
+      <menu_item_call label="イベントの記録停止" name="Stop event recording" />
+      <menu_item_call label="イベントの記録のプレイバック" name="Playback event recording" />
+
+      <menu_item_call label="再生開始" name="Start Playback" />
+      <menu_item_call label="再生停止" name="Stop Playback" />
+      <menu_item_check label="再生をループ" name="Loop Playback" />
+      <menu_item_call label="記録開始" name="Start Record" />
+      <menu_item_call label="記録停止" name="Stop Record" />
+    </menu>
+
+    <menu label="ワールド" name="DevelopWorld">
+      <menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override" />
+      <menu_item_check label="固定された天気" name="Fixed Weather" />
+      <menu_item_call label="リージョンオブジェクトのキャッシュをダンプ" name="Dump Region Object Cache" />
+
+      <menu_item_call label="関心リスト：フルアップデート" name="Interest List: Full Update" />
+    </menu>
+    <menu label="UI" name="UI">
+      <menu_item_call label="メディアブラウザ" name="Media Browser" />
+      <menu_item_call label="FB接続テスト" name="FB Connect Test" />
+      <menu_item_call label="SelectMgrをダンプ" name="Dump SelectMgr" />
+      <menu_item_call label="インベントリの出力" name="Dump Inventory" />
+      <menu_item_call label="タイマーをダンプ" name="Dump Timers" />
+      <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder" />
+      <menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info" />
+      <menu_item_call label="エージェント情報をプリント" name="Print Agent Info" />
+      <menu_item_separator />
+
+      <menu_item_check label="SelectMgrのデバッグ" name="Debug SelectMgr" />
+      <menu_item_check label="ダブルクリック" name="Debug Clicks" />
+      <menu_item_check label="デバッグ表示" name="Debug Views" />
+      <menu_item_check label="デバッグ名ツールチップ" name="Debug Name Tooltips" />
+      <menu_item_check label="マウスイベントのデバッグ" name="Debug Mouse Events" />
+      <menu_item_check label="デバッグキー" name="Debug Keys" />
+      <menu_item_check label="WindowProcのデバッグ" name="Debug WindowProc" />
+    </menu>
+    <menu label="XUI" name="XUI">
+      <menu_item_call label="色の設定をリロード" name="Reload Color Settings" />
+      <menu_item_call label="フォントテストを表示" name="Show Font Test" />
+      <menu_item_check label="XUI名を表示" name="Show XUI Names" />
+      <menu_item_call label="テストIMを送信する" name="Send Test IMs" />
+      <menu_item_call label="名前キャッシュをフラッシュ" name="Flush Names Caches" />
+    </menu>
+    <menu label="アバター" name="Character">
+      <menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
+        <menu_item_call label="瞳" name="Grab Iris" />
+        <menu_item_call label="頭" name="Grab Head" />
+        <menu_item_call label="上半身" name="Grab Upper Body" />
+        <menu_item_call label="下半身" name="Grab Lower Body" />
+        <menu_item_call label="スカート" name="Grab Skirt" />
+      </menu>
+      <menu label="キャラクターテスト" name="Character Tests">
+        <menu_item_call label="容姿をXMLに保存する" name="Appearance To XML" />
+        <menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry" />
+        <menu_item_call label="男性アバターのテスト" name="Test Male" />
+        <menu_item_call label="女性アバターのテスト" name="Test Female" />
+        <menu_item_check label="選択アバター許可" name="Allow Select Avatar" />
+      </menu>
+      <menu label="アニメーションの速度" name="Animation Speed">
+        <menu_item_call label="すべてのアニメーションを10%速く" name="All Animations 10 Faster" />
+        <menu_item_call label="すべてのアニメーションを10%遅く" name="All Animations 10 Slower" />
+        <menu_item_call label="すべてのアニメーションの速度をリセット" name="Reset All Animation Speed" />
+        <menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations" />
+      </menu>
+      <menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default" />
+      <menu_item_check label="アニメーション情報" name="Animation Info" />
+      <menu_item_check label="見ているものを表示する" name="Show Look At" />
+      <menu_item_check label="クリックした場所を表示する" name="Show Point At" />
+      <menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates" />
+      <menu_item_check label="LODを無効にする" name="Disable LOD" />
+      <menu_item_check label="キャラクターVisのデバッグ" name="Debug Character Vis" />
+      <menu_item_check label="スケルトンの衝突判定を表示する" name="Show Collision Skeleton" />
+      <menu_item_check label="ボーンを表示" name="Show Bones" />
+      <menu_item_check label="エージェントの目標を表示する" name="Display Agent Target" />
+      <menu_item_check label="インポスターの範囲を表示" name="Show Impostor Extents" />
+      <!-- Appears not to exist anymore
+      <menu_item_check label="回転をデバッグ" name="Debug Rotation" />
+      -->
+      <menu_item_call label="装着物のダンプ" name="Dump Attachments" />
+      <menu_item_call label="アバターのテクスチャをデバッグ" name="Debug Avatar Textures" />
+      <menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures" />
+    </menu>
+
+    <menu_item_separator />
+
+    <menu_item_check label="HTTPテスクチャ" name="HTTP Textures" />
+    <menu_item_call label="圧縮画像" name="Compress Images" />
+    <menu_item_call label="圧縮ファイルテスト" name="Compress File Test" />
+
+    <menu_item_call label="Visual Leak Detectorを有効にする" name="Enable Visual Leak Detector" />
+
+    <menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump" />
+    <menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window" />
+    <menu label="ログレベルを設定" name="Set Logging Level">
+      <menu_item_check label="デバッグ" name="Debug" />
+      <menu_item_check label="情報" name="Info" />
+      <menu_item_check label="警告" name="Warning" />
+      <menu_item_check label="エラー" name="Error" />
+      <menu_item_check label="なし" name="None" />
+    </menu>
+
+    <menu_item_separator />
+
+    <menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options" />
+    <menu_item_call label="管理者ステータス解除" name="Leave Admin Options" />
+    <menu_item_check label="管理者メニューを表示する" name="View Admin Options" />
+  </menu>
+  <menu label="管理" name="Admin">
+    <menu label="オブジェクト" name="AdminObject">
+      <menu_item_call label="コピーを取る" name="Admin Take Copy" />
+      <menu_item_call label="自分を所有者にする" name="Force Owner To Me" />
+      <menu_item_call label="所有者権限の実行" name="Force Owner Permissive" />
+      <menu_item_call label="削除" name="Delete" />
+      <menu_item_call label="ロック" name="Lock" />
+      <menu_item_call label="アセットのIDを取得" name="Get Assets IDs" />
+    </menu>
+    <menu label="区画" name="Parcel">
+      <menu_item_call label="自分を所有者にする" name="Owner To Me" />
+      <menu_item_call label="Lindenのコンテンツに設定する" name="Set to Linden Content" />
+      <menu_item_call label="パブリックの土地を取得する" name="Claim Public Land" />
+    </menu>
+    <menu label="リージョン（地域）" name="Region">
+      <menu_item_call label="一時アセットデータのダンプ" name="Dump Temp Asset Data" />
+      <menu_item_call label="リージョンの状態を保存する" name="Save Region State" />
+    </menu>
+    <menu_item_call label="神のツール" name="God Tools" />
+  </menu>
+  <menu label="管理者" name="Deprecated">
+    <menu label="オブジェクトを取り付ける" name="Attach Object" />
+    <menu label="オブジェクトを取り外す" name="Detach Object" />
+    <menu label="服装を脱ぐ" name="Take Off Clothing">
+      <menu_item_call label="シャツ" name="Shirt" />
+      <menu_item_call label="ズボン" name="Pants" />
+      <menu_item_call label="靴" name="Shoes" />
+      <menu_item_call label="靴下" name="Socks" />
+      <menu_item_call label="ジャケット" name="Jacket" />
+      <menu_item_call label="手袋" name="Gloves" />
+      <menu_item_call label="下着（上半身）" name="Menu Undershirt" />
+      <menu_item_call label="下着（下半身）" name="Menu Underpants" />
+      <menu_item_call label="スカート" name="Skirt" />
+      <menu_item_call label="アルファ" name="Alpha" />
+      <menu_item_call label="タトゥ" name="Tattoo" />
+      <menu_item_call label="ユニバーサル" name="Universal" />
+      <menu_item_call label="物理作用" name="Physics" />
+      <menu_item_call label="すべての服装" name="All Clothes" />
+    </menu>
+    <menu label="ヘルプ" name="DeprecatedHelp">
+      <menu_item_call label="リンデン公式ブログ" name="Official Linden Blog" />
+      <menu_item_call label="スクリプトポータル" name="Scripting Portal" />
+      <menu label="バグの報告" name="Bug Reporting">
+        <menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker" />
+        <menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help" />
+
+        <menu_item_separator />
+
+        <menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101" />
+        <menu_item_call label="セキュリティ問題" name="Security Issues" />
+        <menu_item_call label="QA Wiki" name="QA Wiki" />
+      </menu>
+    </menu>
+  </menu>
+</menu_bar>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
index 02029230ba..7ea696d6ca 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit Wearable Context Menu">
-	<menu_item_call label="交換" name="wear_replace"/>
-	<menu_item_call label="装着" name="wear_wear"/>
-	<menu_item_call label="追加" name="wear_add"/>
-	<menu_item_call label="触る" name="touch" />
-	<menu_item_call label="取り外す" name="take_off_or_detach"/>
-	<menu_item_call label="取り外す" name="detach"/>
-	<context_menu label="装着：" name="wearable_attach_to"/>
-	<context_menu label="HUD に装着" name="wearable_attach_to_hud"/>
-	<menu_item_call label="取り外す" name="take_off"/>
-	<menu_item_call label="編集" name="edit"/>
-	<menu_item_call label="アイテムのプロフィール" name="object_profile"/>
-	<menu_item_call label="オリジナルを表示" name="show_original"/>
-</context_menu>
+  <menu_item_call label="着替える" name="wear_replace" />
+  <menu_item_call label="着る" name="wear_wear" />
+  <menu_item_call label="追加" name="wear_add" />
+  <menu_item_call label="触る" name="touch" />
+  <menu_item_call label="脱ぐ" name="take_off_or_detach" />
+  <menu_item_call label="取り外す" name="detach" />
+  <context_menu label="装着：" name="wearable_attach_to" />
+  <context_menu label="ＨＵＤに装着" name="wearable_attach_to_hud" />
+  <menu_item_call label="取り外す" name="take_off" />
+  <menu_item_call label="編集" name="edit" />
+  <menu_item_call label="アイテムのプロフィール" name="object_profile" />
+  <menu_item_call label="オリジナルを表示" name="show_original" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
index 48aac2ed05..75fa3f69b3 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Wearing">
-	<menu_item_call label="触る" name="touch"/>
-	<menu_item_call label="編集" name="edit_item"/>
-	<menu_item_call label="アウトフットの編集" name="edit_outfit"/>
-	<menu_item_call label="取り外す" name="takeoff"/>
-	<menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy"/>
-</toggleable_menu>
+  <menu_item_call label="触る" name="touch" />
+  <menu_item_call label="編集" name="edit_item" />
+  <menu_item_call label="アウトフィットの編集" name="edit_outfit" />
+  <menu_item_call label="脱ぐ" name="takeoff" />
+  <menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy" />
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
index 8c331bc008..7845ff9aad 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Wearing">
-	<menu_item_call label="触る" name="touch_attach"/>
-	<menu_item_call label="取り外す" name="take_off"/>
-	<menu_item_call label="取り外す" name="detach"/>
-	<menu_item_call label="アウトフットの編集" name="edit_outfit"/>
-	<menu_item_call label="編集" name="edit_item"/>
-	<menu_item_call label="オリジナルを表示" name="show_original"/>
-</context_menu>
+  <menu_item_call label="触る" name="touch_attach" />
+  <menu_item_call label="脱ぐ" name="take_off" />
+  <menu_item_call label="取り外す" name="detach" />
+  <menu_item_call label="アウトフィットの編集" name="edit_outfit" />
+  <menu_item_call label="編集" name="edit_item" />
+  <menu_item_call label="オリジナルを表示" name="show_original" />
+</context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index 3b29a622a4..23bab3b0b2 100644
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
@@ -1,240 +1,143 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-	<widgetset name="web">
-		<label name="web_label">
-			Webコンテンツ
-		</label>
-		<tooltip name="web_tooltip">
-			ここにWebコンテンツがあります。
-		</tooltip>
-		<playtip name="web_playtip">
-			Webコンテンツを表示
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			ムービー
-		</label>
-		<tooltip name="movie_tooltip">
-			ここにはムービーがあります
-		</tooltip>
-		<playtip name="movie_playtip">
-			ムービー再生
-		</playtip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			画像
-		</label>
-		<tooltip name="image_tooltip">
-			ここには画像があります
-		</tooltip>
-		<playtip name="image_playtip">
-			ここの画像を表示
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			オーディオ
-		</label>
-		<tooltip name="audio_tooltip">
-			ここではオーディオが聞けます
-		</tooltip>
-		<playtip name="audio_playtip">
-			ここのオーディオを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			コンテンツなし
-		</label>
-		<tooltip name="none_tooltip">
-			ここにメディアなし
-		</tooltip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			リアルタイム・ストリーミング
-		</label>
-	</scheme>
-	<scheme name="example">
-		<label name="example_label">
-			例　プラグイン スキーム トリガー
-		</label>
-	</scheme>
-	<scheme name="libvlc">
-		<label name="libvlc_label">
-			LibVLC 対応メディア
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			-- なし --
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			-- なし --
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			オーディオ
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			画像
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			ムービー (QuickTime)
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Oggオーディオ/ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			PDFドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Postscriptドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			リッチ・テキスト (RTF)
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			同期マルチメディア統合言語(SMIL)
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Webページ (XHTML)
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			Macromedia Director
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			オーディオ (MIDI)
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			オーディオ (MP3)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			オーディオ (AIFF)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			オーディオ (WAV)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/bmp">
-		<label name="image/bmp_label">
-			画像 (BMP)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/gif">
-		<label name="image/gif_label">
-			画像 (GIF)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/jpeg">
-		<label name="image/jpeg_label">
-			画像 (JPEG)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/png">
-		<label name="image/png_label">
-			画像 (PNG)
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			画像 (SVG)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="image/tiff">
-		<label name="image/tiff_label">
-			画像 (TIFF)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="text/html">
-		<label name="text/html_label">
-			Webページ
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="text/plain">
-		<label name="text/plain_label">
-			テキスト
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/mpeg">
-		<label name="video/mpeg_label">
-			ムービー (MPEG)
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			ムービー (MP4)
-		</label>
-	</mimetype>
-	<mimetype name="application/octet-stream">
-		<label name="video/octet-stream">
-			ムービー
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
-		<label name="video/quicktime_label">
-			ムービー (QuickTime)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			ムービー (Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			ムービー (Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype menu="1" name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			ムービー (AVI)
-		</label>
-	</mimetype>
-</mimetypes>
+  <defaultlabel>（不明）</defaultlabel>
+  <defaultwidget>なし</defaultwidget>
+  <widgetset name="web">
+    <label name="web_label">Webコンテンツ</label>
+    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
+    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
+  </widgetset>
+  <widgetset name="movie">
+    <label name="movie_label">ムービー</label>
+    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
+    <playtip name="movie_playtip">ムービーを再生する</playtip>
+  </widgetset>
+  <widgetset name="image">
+    <label name="image_label">画像</label>
+    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
+    <playtip name="image_playtip">この場所の画像を表示する</playtip>
+  </widgetset>
+  <widgetset name="audio">
+    <label name="audio_label">オーディオ</label>
+    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
+    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
+  </widgetset>
+  <widgetset name="none">
+    <label name="none_label">コンテンツなし</label>
+    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
+  </widgetset>
+  <scheme name="rtsp">
+    <label name="rtsp_label">リアルタイム・ストリーミング</label>
+  </scheme>
+  <scheme name="example">
+    <label name="example_label">例 プラグイン スキーム トリガー</label>
+  </scheme>
+  <scheme name="libvlc">
+    <label name="libvlc_label">LibVLC対応メディア</label>
+  </scheme>
+  <mimetype name="blank">
+    <label name="blank_label">─なし─</label>
+  </mimetype>
+  <mimetype name="none/none">
+    <label name="none/none_label">─なし─</label>
+  </mimetype>
+  <mimetype name="audio/*">
+    <label name="audio2_label">オーディオ</label>
+  </mimetype>
+  <mimetype name="video/*">
+    <label name="video2_label">ビデオ</label>
+  </mimetype>
+  <mimetype name="image/*">
+    <label name="image2_label">画像</label>
+  </mimetype>
+  <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="application/javascript">
+    <label name="application/javascript_label">JavaScript</label>
+  </mimetype>
+  <mimetype name="application/ogg">
+    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
+  </mimetype>
+  <mimetype name="application/pdf">
+    <label name="application/pdf_label">PDFドキュメント</label>
+  </mimetype>
+  <mimetype name="application/postscript">
+    <label name="application/postscript_label">PostScriptドキュメント</label>
+  </mimetype>
+  <mimetype name="application/rtf">
+    <label name="application/rtf_label">リッチ・テキスト（RTF）</label>
+  </mimetype>
+  <mimetype name="application/smil">
+    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
+  </mimetype>
+  <mimetype name="application/xhtml+xml">
+    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
+  </mimetype>
+  <mimetype name="application/x-director">
+    <label name="application/x-director_label">Macromedia Director</label>
+  </mimetype>
+  <mimetype name="application/octet-stream">
+    <label name="application/octet-stream_label">ストリーム</label>
+  </mimetype>
+  <mimetype name="audio/mid">
+    <label name="audio/mid_label">オーディオ（MIDI）</label>
+  </mimetype>
+  <mimetype name="audio/mpeg">
+    <label name="audio/mpeg_label">オーディオ（MP3）</label>
+  </mimetype>
+  <mimetype name="audio/x-aiff">
+    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
+  </mimetype>
+  <mimetype name="audio/x-wav">
+    <label name="audio/x-wav_label">オーディオ（WAV）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/bmp">
+    <label name="image/bmp_label">画像（BMP）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/gif">
+    <label name="image/gif_label">画像（GIF）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/jpeg">
+    <label name="image/jpeg_label">画像（JPEG）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/png">
+    <label name="image/png_label">画像（PNG）</label>
+  </mimetype>
+  <mimetype name="image/svg+xml">
+    <label name="image/svg+xml_label">画像（SVG）</label>
+  </mimetype>
+  <mimetype menu="1" name="image/tiff">
+    <label name="image/tiff_label">画像（TIFF）</label>
+  </mimetype>
+  <mimetype menu="1" name="text/html">
+    <label name="text/html_label">Webページ</label>
+  </mimetype>
+  <mimetype menu="1" name="text/plain">
+    <label name="text/plain_label">テキスト</label>
+  </mimetype>
+  <mimetype name="text/xml">
+    <label name="text/xml_label">XML</label>
+  </mimetype>
+  <mimetype menu="1" name="video/mpeg">
+    <label name="video/mpeg_label">ムービー（MPEG）</label>
+  </mimetype>
+  <mimetype name="video/mp4">
+    <label name="video/mp4_label">ムービー（MP4）</label>
+  </mimetype>
+  <mimetype name="application/octet-stream">
+    <label name="video/octet-stream">ムービー</label>
+  </mimetype>
+  <mimetype menu="1" name="video/quicktime">
+    <label name="video/quicktime_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-asf">
+    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-wmv">
+    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
+  </mimetype>
+  <mimetype menu="1" name="video/x-msvideo">
+    <label name="video/x-msvideo_label">ムービー（AVI）</label>
+  </mimetype>
+</mimetypes>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
index cb1e48148f..61574b74f9 100644
--- a/indra/newview/skins/default/xui/ja/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
@@ -1,225 +1,131 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-	<widgetset name="web">
-		<label name="web_label">
-			Web コンテンツ
-		</label>
-		<tooltip name="web_tooltip">
-			このロケーションには Web コンテンツが含まれています
-		</tooltip>
-		<playtip name="web_playtip">
-			Web コンテンツを表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			ムービー
-		</label>
-		<tooltip name="movie_tooltip">
-			ここにはムービーがあります
-		</tooltip>
-		<playtip name="movie_playtip">
-			ムービーを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			画像
-		</label>
-		<tooltip name="image_tooltip">
-			このロケーションには画像があります
-		</tooltip>
-		<playtip name="image_playtip">
-			このロケーションの画像を表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			オーディオ
-		</label>
-		<tooltip name="audio_tooltip">
-			このロケーションにはオーディオがあります
-		</tooltip>
-		<playtip name="audio_playtip">
-			このロケーションのオーディオを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			コンテンツなし
-		</label>
-		<tooltip name="none_tooltip">
-			ここにメディアなし
-		</tooltip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			リアルタイム・ストリーミング
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			オーディオ
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			画像
-		</label>
-	</mimetype>
-	<mimetype name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Ogg オーディオ・ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			PDF ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Postscript ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			リッチテキスト（RTF）
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language （SMIL）
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Web ページ（XHTML）
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			マクロメディアディレクター
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			オーディオ（MIDI）
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			オーディオ（MP3）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			オーディオ（AIFF）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			オーディオ（WAV）
-		</label>
-	</mimetype>
-	<mimetype name="image/bmp">
-		<label name="image/bmp_label">
-			画像（BMP）
-		</label>
-	</mimetype>
-	<mimetype name="image/gif">
-		<label name="image/gif_label">
-			画像（GIF）
-		</label>
-	</mimetype>
-	<mimetype name="image/jpeg">
-		<label name="image/jpeg_label">
-			画像（JPEG）
-		</label>
-	</mimetype>
-	<mimetype name="image/png">
-		<label name="image/png_label">
-			画像（PNG）
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			画像（SVG）
-		</label>
-	</mimetype>
-	<mimetype name="image/tiff">
-		<label name="image/tiff_label">
-			画像（TIFF）
-		</label>
-	</mimetype>
-	<mimetype name="text/html">
-		<label name="text/html_label">
-			Web ページ
-		</label>
-	</mimetype>
-	<mimetype name="text/plain">
-		<label name="text/plain_label">
-			テキスト
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype name="video/mpeg">
-		<label name="video/mpeg_label">
-			ムービー（MPEG）
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			ムービー（MP4）
-		</label>
-	</mimetype>
-	<mimetype name="video/quicktime">
-		<label name="video/quicktime_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			ムービー（Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			ムービー（Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			ムービー（AVI）
-		</label>
-	</mimetype>
-</mimetypes>
+  <defaultlabel>（不明）</defaultlabel>
+  <defaultwidget>なし</defaultwidget>
+  <widgetset name="web">
+    <label name="web_label">Webコンテンツ</label>
+    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
+    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
+  </widgetset>
+  <widgetset name="movie">
+    <label name="movie_label">ムービー</label>
+    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
+    <playtip name="movie_playtip">ムービーを再生する</playtip>
+  </widgetset>
+  <widgetset name="image">
+    <label name="image_label">画像</label>
+    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
+    <playtip name="image_playtip">この場所の画像を表示する</playtip>
+  </widgetset>
+  <widgetset name="audio">
+    <label name="audio_label">オーディオ</label>
+    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
+    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
+  </widgetset>
+  <widgetset name="none">
+    <label name="none_label">コンテンツなし</label>
+    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
+  </widgetset>
+  <scheme name="rtsp">
+    <label name="rtsp_label">リアルタイム・ストリーミング</label>
+  </scheme>
+  <mimetype name="blank">
+    <label name="blank_label">─なし─</label>
+  </mimetype>
+  <mimetype name="none/none">
+    <label name="none/none_label">─なし─</label>
+  </mimetype>
+  <mimetype name="audio/*">
+    <label name="audio2_label">オーディオ</label>
+  </mimetype>
+  <mimetype name="video/*">
+    <label name="video2_label">ビデオ</label>
+  </mimetype>
+  <mimetype name="image/*">
+    <label name="image2_label">画像</label>
+  </mimetype>
+  <mimetype name="video/vnd.secondlife.qt.legacy">
+    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="application/javascript">
+    <label name="application/javascript_label">JavaScript</label>
+  </mimetype>
+  <mimetype name="application/ogg">
+    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
+  </mimetype>
+  <mimetype name="application/pdf">
+    <label name="application/pdf_label">PDFドキュメント</label>
+  </mimetype>
+  <mimetype name="application/postscript">
+    <label name="application/postscript_label">PostScriptドキュメント</label>
+  </mimetype>
+  <mimetype name="application/rtf">
+    <label name="application/rtf_label">リッチテキスト（RTF）</label>
+  </mimetype>
+  <mimetype name="application/smil">
+    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
+  </mimetype>
+  <mimetype name="application/xhtml+xml">
+    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
+  </mimetype>
+  <mimetype name="application/x-director">
+    <label name="application/x-director_label">Macromedia Director</label>
+  </mimetype>
+  <mimetype name="audio/mid">
+    <label name="audio/mid_label">オーディオ（MIDI）</label>
+  </mimetype>
+  <mimetype name="audio/mpeg">
+    <label name="audio/mpeg_label">オーディオ（MP3）</label>
+  </mimetype>
+  <mimetype name="audio/x-aiff">
+    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
+  </mimetype>
+  <mimetype name="audio/x-wav">
+    <label name="audio/x-wav_label">オーディオ（WAV）</label>
+  </mimetype>
+  <mimetype name="image/bmp">
+    <label name="image/bmp_label">画像（BMP）</label>
+  </mimetype>
+  <mimetype name="image/gif">
+    <label name="image/gif_label">画像（GIF）</label>
+  </mimetype>
+  <mimetype name="image/jpeg">
+    <label name="image/jpeg_label">画像（JPEG）</label>
+  </mimetype>
+  <mimetype name="image/png">
+    <label name="image/png_label">画像（PNG）</label>
+  </mimetype>
+  <mimetype name="image/svg+xml">
+    <label name="image/svg+xml_label">画像（SVG）</label>
+  </mimetype>
+  <mimetype name="image/tiff">
+    <label name="image/tiff_label">画像（TIFF）</label>
+  </mimetype>
+  <mimetype name="text/html">
+    <label name="text/html_label">Webページ</label>
+  </mimetype>
+  <mimetype name="text/plain">
+    <label name="text/plain_label">テキスト</label>
+  </mimetype>
+  <mimetype name="text/xml">
+    <label name="text/xml_label">XML</label>
+  </mimetype>
+  <mimetype name="video/mpeg">
+    <label name="video/mpeg_label">ムービー（MPEG）</label>
+  </mimetype>
+  <mimetype name="video/mp4">
+    <label name="video/mp4_label">ムービー（MP4）</label>
+  </mimetype>
+  <mimetype name="video/quicktime">
+    <label name="video/quicktime_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-asf">
+    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-wmv">
+    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
+  </mimetype>
+  <mimetype name="video/x-msvideo">
+    <label name="video/x-msvideo_label">ムービー（AVI）</label>
+  </mimetype>
+</mimetypes>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
index cb1e48148f..0bfc9aeb99 100644
--- a/indra/newview/skins/default/xui/ja/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
@@ -1,225 +1,134 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-	<widgetset name="web">
-		<label name="web_label">
-			Web コンテンツ
-		</label>
-		<tooltip name="web_tooltip">
-			このロケーションには Web コンテンツが含まれています
-		</tooltip>
-		<playtip name="web_playtip">
-			Web コンテンツを表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			ムービー
-		</label>
-		<tooltip name="movie_tooltip">
-			ここにはムービーがあります
-		</tooltip>
-		<playtip name="movie_playtip">
-			ムービーを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			画像
-		</label>
-		<tooltip name="image_tooltip">
-			このロケーションには画像があります
-		</tooltip>
-		<playtip name="image_playtip">
-			このロケーションの画像を表示する
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			オーディオ
-		</label>
-		<tooltip name="audio_tooltip">
-			このロケーションにはオーディオがあります
-		</tooltip>
-		<playtip name="audio_playtip">
-			このロケーションのオーディオを再生する
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			コンテンツなし
-		</label>
-		<tooltip name="none_tooltip">
-			ここにメディアなし
-		</tooltip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			リアルタイム・ストリーミング
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			- なし -
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			オーディオ
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			画像
-		</label>
-	</mimetype>
-	<mimetype name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Ogg オーディオ・ビデオ
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			PDF ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Postscript ドキュメント
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			リッチテキスト（RTF）
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language （SMIL）
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Web ページ（XHTML）
-		</label>
-	</mimetype>
-	<mimetype name="application/x-director">
-		<label name="application/x-director_label">
-			マクロメディアディレクター
-		</label>
-	</mimetype>
-	<mimetype name="audio/mid">
-		<label name="audio/mid_label">
-			オーディオ（MIDI）
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			オーディオ（MP3）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			オーディオ（AIFF）
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			オーディオ（WAV）
-		</label>
-	</mimetype>
-	<mimetype name="image/bmp">
-		<label name="image/bmp_label">
-			画像（BMP）
-		</label>
-	</mimetype>
-	<mimetype name="image/gif">
-		<label name="image/gif_label">
-			画像（GIF）
-		</label>
-	</mimetype>
-	<mimetype name="image/jpeg">
-		<label name="image/jpeg_label">
-			画像（JPEG）
-		</label>
-	</mimetype>
-	<mimetype name="image/png">
-		<label name="image/png_label">
-			画像（PNG）
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			画像（SVG）
-		</label>
-	</mimetype>
-	<mimetype name="image/tiff">
-		<label name="image/tiff_label">
-			画像（TIFF）
-		</label>
-	</mimetype>
-	<mimetype name="text/html">
-		<label name="text/html_label">
-			Web ページ
-		</label>
-	</mimetype>
-	<mimetype name="text/plain">
-		<label name="text/plain_label">
-			テキスト
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype name="video/mpeg">
-		<label name="video/mpeg_label">
-			ムービー（MPEG）
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			ムービー（MP4）
-		</label>
-	</mimetype>
-	<mimetype name="video/quicktime">
-		<label name="video/quicktime_label">
-			ムービー（QuickTime）
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			ムービー（Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			ムービー（Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			ムービー（AVI）
-		</label>
-	</mimetype>
-</mimetypes>
+  <defaultlabel>（不明）</defaultlabel>
+  <defaultwidget>なし</defaultwidget>
+  <widgetset name="web">
+    <label name="web_label">Webコンテンツ</label>
+    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
+    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
+  </widgetset>
+  <widgetset name="movie">
+    <label name="movie_label">ムービー</label>
+    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
+    <playtip name="movie_playtip">ムービーを再生する</playtip>
+  </widgetset>
+  <widgetset name="image">
+    <label name="image_label">画像</label>
+    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
+    <playtip name="image_playtip">この場所の画像を表示する</playtip>
+  </widgetset>
+  <widgetset name="audio">
+    <label name="audio_label">オーディオ</label>
+    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
+    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
+  </widgetset>
+  <widgetset name="none">
+    <label name="none_label">コンテンツなし</label>
+    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
+  </widgetset>
+  <scheme name="rtsp">
+    <label name="rtsp_label">リアルタイム・ストリーミング</label>
+  </scheme>
+  <mimetype name="blank">
+    <label name="blank_label">─なし─</label>
+  </mimetype>
+  <mimetype name="none/none">
+    <label name="none/none_label">─なし─</label>
+  </mimetype>
+  <mimetype name="audio/*">
+    <label name="audio2_label">オーディオ</label>
+  </mimetype>
+  <mimetype name="video/*">
+    <label name="video2_label">ビデオ</label>
+  </mimetype>
+  <mimetype name="image/*">
+    <label name="image2_label">画像</label>
+  </mimetype>
+  <mimetype name="video/vnd.secondlife.qt.legacy">
+    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="application/javascript">
+    <label name="application/javascript_label">JavasScript</label>
+  </mimetype>
+  <mimetype name="application/ogg">
+    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
+  </mimetype>
+  <mimetype name="application/pdf">
+    <label name="application/pdf_label">PDFドキュメント</label>
+  </mimetype>
+  <mimetype name="application/postscript">
+    <label name="application/postscript_label">PostScriptドキュメント</label>
+  </mimetype>
+  <mimetype name="application/rtf">
+    <label name="application/rtf_label">リッチテキスト（RTF）</label>
+  </mimetype>
+  <mimetype name="application/smil">
+    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
+  </mimetype>
+  <mimetype name="application/xhtml+xml">
+    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
+  </mimetype>
+  <mimetype name="application/x-director">
+    <label name="application/x-director_label">Macromedia Director</label>
+  </mimetype>
+  <mimetype name="application/octet-stream">
+    <label name="application/octet-stream_label">ストリーム</label>
+  </mimetype>
+  <mimetype name="audio/mid">
+    <label name="audio/mid_label">オーディオ（MIDI）</label>
+  </mimetype>
+  <mimetype name="audio/mpeg">
+    <label name="audio/mpeg_label">オーディオ（MP3）</label>
+  </mimetype>
+  <mimetype name="audio/x-aiff">
+    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
+  </mimetype>
+  <mimetype name="audio/x-wav">
+    <label name="audio/x-wav_label">オーディオ（WAV）</label>
+  </mimetype>
+  <mimetype name="image/bmp">
+    <label name="image/bmp_label">画像（BMP）</label>
+  </mimetype>
+  <mimetype name="image/gif">
+    <label name="image/gif_label">画像（GIF）</label>
+  </mimetype>
+  <mimetype name="image/jpeg">
+    <label name="image/jpeg_label">画像（JPEG）</label>
+  </mimetype>
+  <mimetype name="image/png">
+    <label name="image/png_label">画像（PNG）</label>
+  </mimetype>
+  <mimetype name="image/svg+xml">
+    <label name="image/svg+xml_label">画像（SVG）</label>
+  </mimetype>
+  <mimetype name="image/tiff">
+    <label name="image/tiff_label">画像（TIFF）</label>
+  </mimetype>
+  <mimetype name="text/html">
+    <label name="text/html_label">Webページ</label>
+  </mimetype>
+  <mimetype name="text/plain">
+    <label name="text/plain_label">テキスト</label>
+  </mimetype>
+  <mimetype name="text/xml">
+    <label name="text/xml_label">XML</label>
+  </mimetype>
+  <mimetype name="video/mpeg">
+    <label name="video/mpeg_label">ムービー（MPEG）</label>
+  </mimetype>
+  <mimetype name="video/mp4">
+    <label name="video/mp4_label">ムービー（MP4）</label>
+  </mimetype>
+  <mimetype name="video/quicktime">
+    <label name="video/quicktime_label">ムービー（QuickTime）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-asf">
+    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
+  </mimetype>
+  <mimetype name="video/x-ms-wmv">
+    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
+  </mimetype>
+  <mimetype name="video/x-msvideo">
+    <label name="video/x-msvideo_label">ムービー（AVI）</label>
+  </mimetype>
+</mimetypes>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 72b4d21eb2..48983f3157 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1,3184 +1,5315 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notifications>
-	<global name="skipnexttime">今後は表示しない</global>
-	<global name="skipnexttimesessiononly">以後、これを表示しない
+  <global name="skipnexttime">次回からこのメッセージを表示しない</global>
+
+  <global name="skipnexttimesessiononly">次回からこのメッセージを表示しない
 （現セッションで）</global>
-	<global name="alwayschoose">常にこのオプションを選択</global>
-	<global name="implicitclosebutton">閉じる</global>
-	<template name="okbutton">
-		<form>
-			<button name="OK_okbutton" text="$yestext"/>
-		</form>
-	</template>
-	<template name="okignore">
-		<form>
-			<button name="OK_okignore" text="$yestext"/>
-		</form>
-	</template>
-	<template name="okcancelbuttons">
-		<form>
-			<button name="OK_okcancelbuttons" text="$yestext"/>
-			<button name="Cancel_okcancelbuttons" text="$notext"/>
-		</form>
-	</template>
-	<template name="okcancelignore">
-		<form>
-			<button name="OK_okcancelignore" text="$yestext"/>
-			<button name="Cancel_okcancelignore" text="$notext"/>
-		</form>
-	</template>
-	<template name="okhelpbuttons">
-		<form>
-			<button name="OK_okhelpbuttons" text="$yestext"/>
-			<button name="Help" text="$helptext"/>
-		</form>
-	</template>
-	<template name="okhelpignore">
-		<form>
-			<button name="OK_okhelpignore" text="$yestext"/>
-			<button name="Help_okhelpignore" text="$helptext"/>
-		</form>
-	</template>
-	<template name="yesnocancelbuttons">
-		<form>
-			<button name="Yes" text="$yestext"/>
-			<button name="No" text="$notext"/>
-			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
-		</form>
-	</template>
-	<notification functor="GenericAcknowledge" label="不明の通知メッセージ" name="MissingAlert">
-		あなたの [APP_NAME] のバージョンでは今受け取った通知メッセージを表示することができません。  最新ビューワがインストールされているかご確認ください。
-
-エラー詳細： 「 [_NAME] 」という通知は notifications.xml にありませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FloaterNotFound">
-		フロータエラー：下記のコントロールが見つかりませんでした：
+
+  <global name="alwayschoose">常にこのオプションを選択</global>
+
+  <global name="implicitclosebutton">閉じる</global>
+
+  <template name="okbutton">
+    <form>
+      <button name="OK_okbutton" text="$yestext" />
+    </form>
+  </template>
+
+  <template name="okignore">
+    <form>
+      <button name="OK_okignore" text="$yestext" />
+    </form>
+  </template>
+
+  <template name="okcancelbuttons">
+    <form>
+      <button name="OK_okcancelbuttons" text="$yestext" />
+      <button name="Cancel_okcancelbuttons" text="$notext" />
+    </form>
+  </template>
+
+  <template name="okcancelignore">
+    <form>
+      <button name="OK_okcancelignore" text="$yestext" />
+      <button name="Cancel_okcancelignore" text="$notext" />
+    </form>
+  </template>
+
+  <template name="okhelpbuttons">
+    <form>
+      <button name="OK_okhelpbuttons" text="$yestext" />
+      <button name="Help" text="$helptext" />
+    </form>
+  </template>
+
+  <template name="okhelpignore">
+    <form>
+      <button name="OK_okhelpignore" text="$yestext" />
+      <button name="Help_okhelpignore" text="$helptext" />
+    </form>
+  </template>
+
+  <template name="yesnocancelbuttons">
+    <form>
+      <button name="Yes" text="$yestext" />
+      <button name="No" text="$notext" />
+      <button name="Cancel_yesnocancelbuttons" text="$canceltext" />
+    </form>
+  </template>
+
+  <notification functor="GenericAcknowledge" label="不明な通知メッセージ" name="MissingAlert">現在使用中の[APP_NAME]のバージョンでは、受け取った通知メッセージを表示することができません。
+最新のビューアーがインストールされている事をご確認ください。
+
+エラー詳細：「 [_NAME] 」という通知メッセージは、notifications.xmlに定義されていませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FloaterNotFound">フローターエラー：以下のコントロールが見つかりませんでした：
+
 [CONTROLS]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TutorialNotFound">
-		現在利用可能なチュートリアルはありません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GenericAlert">[MESSAGE]</notification>
-	<notification name="GenericAlertYesCancel">
-		[MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="はい"/>
-	</notification>
-	<notification name="GenericAlertOK">
-		[MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="BadInstallation">
-		[APP_NAME] をアップデート中にエラーが発生しました。  ビューワの [http://get.secondlife.com 最新バージョンをダウンロード] してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LoginFailedNoNetwork">
-		[SECOND_LIFE_GRID] に接続できませんでした。
-「[DIAGNOSTIC]」
-インターネット接続が正常かご確認ください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MessageTemplateNotFound">
-		メッセージテンプレート [PATH] がありませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="WearableSave">
-		現在の衣類、身体部位の変更を保存しますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
-	</notification>
-	<notification name="ConfirmNoCopyToOutbox">
-		これらのアイテムの 1 つまたは複数をマーチャントアウトボックスにコピーする許可がありません。移動するか、置き去りにすることはできます。
-		<usetemplate name="okcancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動"/>
-	</notification>
-	<notification name="OutboxFolderCreated">
-		マーチャントアウトボックスの最上位に転送した各アイテムにつき、それぞれ 1 つの新しいフォルダが作成されました。
-		<usetemplate ignoretext="新しいフォルダがマーチャントアウトボックス内に作成されました" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="OutboxImportComplete">
-		成功
-
-マーケットプレイスに正常に送信されたすべてのフォルダ
-		<usetemplate ignoretext="マーケットプレイスに送信されたすべてのフォルダ" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="OutboxImportHadErrors">
-		一部のフォルダは転送されませんでした
-
-一部のフォルダがマーケットプレイスに送信されたときにエラーが発生しました。これらのフォルダはまだマーチャントアウトボックス内にあります。
-
-詳細については、[[MARKETPLACE_IMPORTS_URL] エラーログ]をご覧ください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OutboxImportFailed">
-		'[ERROR_CODE]' エラーで転送できませんでした
-
-システムまたはネットワークのエラーのため、フォルダはマーケットプレイスに送信されませんでした。後でもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OutboxInitFailed">
-		'[ERROR_CODE]' エラーでマーケットプレイスを初期化できませんでした
-
-システムまたはネットワークのエラーのため、マーケットプレイスの初期化に失敗しました。後でもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="StockPasteFailed">
-		在庫フォルダへのコピーまたは移動がエラーにより失敗しました:        
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
 
-'[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantPasteFailed">
-		マーケットプレイスのリストへのコピーまたは移動がエラーにより失敗しました:        
+  <notification name="TutorialNotFound">現在利用可能なチュートリアルはありません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
 
-'[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantTransactionFailed">
-		マーケットプレイスによる取引が次のエラーにより失敗しました:
-        
-[ERROR_REASON][ERROR_DESCRIPTION]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantUnprocessableEntity">
-		この製品をリストに表示できないか、バージョンフォルダを有効にできません。通常、これはリスト説明フォームに情報が不足しているために起こりますが、フォルダ構造のエラーが原因の場合もあります。リストを編集するか、リストフォルダにエラーがないか確認してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantListingFailed">
-		マーケットプレイスへのリスト表示が次のエラーで失敗しました :
-        
-'[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantFolderActivationFailed">
-		このバージョンフォルダの有効化が次のエラーにより失敗しました :
+  <notification name="GenericAlert">[MESSAGE]</notification>
+
+  <notification name="GenericAlertYesCancel">[MESSAGE]
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
+  </notification>
 
+  <notification name="GenericAlertOK">[MESSAGE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BadInstallation">[APP_NAME]のアップデート中にエラーが発生しました。[http://get.secondlife.com 最新バージョンのビューアーをダウンロード]してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LoginFailedNoNetwork">[SECOND_LIFE_GRID]に接続できませんでした。
+[DIAGNOSTIC]
+
+インターネット接続が正常かご確認ください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LoginFailedToParse">ビューアがサーバーから不正な形式の応答を受け取りました。インターネット接続が正常に機能していることを確認してから、後でもう一度お試しください。
+
+これが誤りだと思われる場合は、サポートにお問い合わせください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="MessageTemplateNotFound">メッセージテンプレート[PATH]がありませんでした。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WearableSave">現在の服装／身体部位の変更を保存しますか？
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
+  </notification>
+
+  <notification name="ConfirmNoCopyToOutbox">これらのアイテムの１つ以上を販売用の送信トレイにコピーする権限がありません。移動したり残したままにすることはできます。
+    <usetemplate name="okcancelbuttons" notext="アイテムを販売ボックスに移動できなかった" yestext="アイテムを移動" />
+  </notification>
+
+  <notification name="OutboxFolderCreated">販売ボックスの最上位に転送した各アイテムにつき、それぞれ１つの新しいフォルダが作成されました。
+    <unique />
+    <usetemplate ignoretext="販売ボックス内に新しいフォルダを作成した" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutboxImportComplete">成功しました。
+
+すべてのフォルダが、マーケットプレイスに正常に送信されました。
+    <usetemplate ignoretext="マーケットプレイスへフォルダの送信に成功した" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutboxImportHadErrors">一部のフォルダは送信できていません。
+
+一部のフォルダが、マーケットプレイスに送信されるときにエラーが発生しました。これらのフォルダは、販売者の送信トレイにまだ残っています。
+
+詳細につきましては、[[MARKETPLACE_IMPORTS_URL] エラーログ]をご確認ください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="OutboxImportFailed">以下のエラーで転送できませんでした：[ERROR_CODE]
+
+システムまたはネットワークのエラーのため、フォルダはマーケットプレイスに送信されませんでした。お手数ですが、後でもう一度やり直してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutboxInitFailed">以下のエラーでマーケットプレイスを初期化できませんでした：[ERROR_CODE]
+
+システムまたはネットワークのエラーのため、マーケットプレイスの初期化に失敗しました。お手数ですが、後でもう一度やり直してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="StockPasteFailed">在庫フォルダへのコピーまたは移動がエラーにより失敗しました：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantPasteFailed">マーケットプレイスのリストへのコピーまたは移動が以下のエラーにより失敗しました：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantTransactionFailed">マーケットプレイスによる取引が以下のエラーにより失敗しました：[ERROR_REASON]
+[ERROR_DESCRIPTION]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantUnprocessableEntity">この商品をリストに表示できないか、バージョンフォルダを有効にできません。通常、これはリスト説明フォームに情報が不足しているために起こりますが、フォルダ構造のエラーが原因の場合もあります。
+リストを編集するか、リストフォルダにエラーがないか確認してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantListingFailed">マーケットプレイスへのリスト表示が次のエラーで失敗しました：
 '[ERROR_CODE]'
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MerchantForceValidateListing">
-		リストを作成するために、リストするコンテンツの階層を固定しました。
-		<usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmMerchantActiveChange">
-		この操作により、このリストの有効な内容が変更されます。続けますか？
-		<usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmMerchantMoveInventory">
-		マーケットプレイスのリストウィンドウにドラッグしたアイテムは元の場所からコピーされるのではなく、移動します。続けますか？
-		<usetemplate ignoretext="アイテムをインベントリからマーケットプレイスに移動する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmListingCutOrDelete">
-		リストフォルダを移動または削除すると、マーケットプレイスのリストが削除されます。マーケットプレイスのリストを維持する場合は、変更するバージョンフォルダの中身を移動または削除してください。続けますか？
-		<usetemplate ignoretext="マーケットプレイスからリストを移動または削除する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmCopyToMarketplace">
-		これらのアイテムの 1 つまたは複数をマーケットプレイスにコピーする権限がありません。移動するか、置き去りにすることはできます。
-		<usetemplate canceltext="取り消し" ignoretext="コピー付加アイテムを含む選択内容をマーケットプレイスへコピーする前に確認する" name="yesnocancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動"/>
-	</notification>
-	<notification name="ConfirmMerchantUnlist">
-		この操作により、このリストが削除されます。続けますか？
-		<usetemplate ignoretext="マーケットプレイスで有効なリストを削除する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmMerchantClearVersion">
-		この操作により、現在のリストのバージョンフォルダが無効になります。続けますか？
-		<usetemplate ignoretext="マーケットプレイスでリストのバージョンフォルダを無効にする前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantListingNotUpdated">
-		このリストをアップデートできませんでした。
-[[URL] ここをクリック] してマーケットプレイスで編集します。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantListingCannotWear">マーケットプレイスのリストフォルダにある衣服やボディパーツを着用できません。</notification>
-	<notification name="AlertMerchantListingInvalidID">リスト ID が無効です。</notification>
-	<notification name="AlertMerchantListingActivateRequired">
-		このリストには複数のバージョンフォルダがあるか、バージョンフォルダがありません。後で、単独でバージョンフォルダを選択して有効にする必要があります。
-		<usetemplate ignoretext="複数のバージョンフォルダのあるリストを作成するときに、バージョンフォルダの有効化に関する警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantStockFolderSplit">
-		各種の在庫品目を別々の在庫フォルダに分けたため、フォルダはリストに表示できるように配置されています。
-		<usetemplate ignoretext="リストに表示する前に在庫フォルダが分割されると、警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantStockFolderEmpty">
-		在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
-		<usetemplate ignoretext="在庫フォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="AlertMerchantVersionFolderEmpty">
-		バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
-		<usetemplate ignoretext="バージョンフォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="WriteAnimationFail">アニメーションデータの書き込みに問題があります。後でもう一度お試しください。</notification>
-	<notification name="UploadAuctionSnapshotFail">次の理由で、オークションのスナップショットのアップロード時に問題が起こりました。
-[REASON]</notification>
-	<notification name="UnableToViewContentsMoreThanOne">一度に複数のアイテムの中身を表示できません。
-アイテムを 1 つだけ選択して、もう一度お試しください。</notification>
-	<notification name="SaveClothingBodyChanges">
-		衣服、身体部位に対する変更をすべて保存しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存"/>
-	</notification>
-	<notification name="FriendsAndGroupsOnly">
-		フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FavoritesOnLogin">
-		注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AllowMultipleViewers">
-		複数の Second Life ビューワを実行することはサポートされていません。テクスチャキャッシュのコリジョンや破損、およびビジュアルとパフォーマンスの低下につながる恐れがあります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GrantModifyRights">
-		他人に修正権限を与えると、権限を与えられた人はあなたが所有するインワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。
-[NAME] に修正権限を与えますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="GrantModifyRightsMultiple">
-		他人に修正権限を与えると、権限を与えられた人はあなたが所有するインワールドのオブジェクトを変更することができます。 この権限を与える際には十分に注意してください。
-選択した住人に修正権限を与えますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="RevokeModifyRights">
-		[NAME] の修正権限を解約しますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="RevokeModifyRightsMultiple">
-		選択した住人から変更権限を取り下げますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="GroupNameLengthWarning">
-		グループ名は [MIN_LEN] ～ [MAX_LEN] 文字である必要があります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="UnableToCreateGroup">
-		グループを作成できません。
-[MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PanelGroupApply">
-		[NEEDS_APPLY_MESSAGE]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantFolderActivationFailed">このバージョンフォルダの有効化が次のエラーにより失敗しました：
+'[ERROR_CODE]'
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="MerchantForceValidateListing">リストを作成するために、リストするコンテンツの階層を固定しました。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmMerchantActiveChange">この操作により、このリストの有効な内容が変更されます。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmMerchantMoveInventory">マーケットプレイスのリストウィンドウにドラッグしたアイテムは、元の場所からコピーされるのではなく移動となります。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="アイテムをインベントリからマーケットプレイスに移動する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmListingCutOrDelete">リストフォルダを移動または削除すると、マーケットプレイスのリストが削除されます。マーケットプレイスのリストを維持する場合は、変更するバージョンフォルダの中身を移動または削除してください。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスからリストを移動または削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmCopyToMarketplace">これらのアイテムの１つまたは複数をマーケットプレイスにコピーする権限がありません。移動するか、残したままにすることはできます。
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" ignoretext="マーケットプレイスへコピーする際に、コピー不可のアイテムが選択内容に含まれている場合の確認" name="yesnocancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動" />
+  </notification>
+  <notification name="ConfirmMerchantUnlist">この操作により、このリストが削除されます。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスで有効なリストを削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmMerchantClearVersion">この操作により、現在のリストのバージョンフォルダが無効になります。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="マーケットプレイスでリストのバージョンフォルダを無効にする前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantListingNotUpdated">このリストをアップデートできませんでした。
+[[URL] ここをクリック]してマーケットプレイスで編集します。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantListingCannotWear">マーケットプレイスのリストフォルダにある衣服装やボディパーツを着用できません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AlertMerchantListingInvalidID">リストIDが無効です。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AlertMerchantListingActivateRequired">このリストには複数のバージョンフォルダがあるか、バージョンフォルダがありません。後で、単独でバージョンフォルダを選択して有効にする必要があります。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="複数のバージョンフォルダのあるリストを作成するときに、バージョンフォルダの有効化に関する警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantStockFolderSplit">各種の在庫品目を別々の在庫フォルダに分けたため、フォルダはリストに表示できるように配置されています。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="商品リストで在庫フォルダを分割する際に警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantStockFolderEmpty">在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="商品リストで在庫フォルダが空だったときに警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="AlertMerchantVersionFolderEmpty">バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="商品リストでバージョンフォルダが空で表示されないときに警告を表示" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="WriteAnimationFail">アニメーションデータの書き込みに問題があります。後でもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="UploadAuctionSnapshotFail">以下の理由で、オークションのスナップショットのアップロード時に問題が起こりました：[REASON]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnableToViewContentsMoreThanOne">一度に複数のアイテムの中身を表示できません。
+アイテムを１つだけ選択して、もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SaveClothingBodyChanges">服装、身体部位に対する変更をすべて保存しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存" />
+  </notification>
+  <notification name="FriendsAndGroupsOnly">フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="FavoritesOnLogin">注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="AllowMultipleViewers">Second Lifeビューアーの多重起動はサポートされていません。
+テクスチャキャッシュの競合による破損や、およびビジュアルとパフォーマンスの低下につながる恐れがあります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="GrantModifyRights">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。
+[NAME]に修正権限を与えますか？
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="GrantModifyRightsMultiple">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更することができます。
+この権限を与える際には十分に注意してください。選択した住人に修正権限を与えますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="RevokeModifyRights">[NAME]の修正権限を解除しますか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="RevokeModifyRightsMultiple">選択した住人から変更権限を取り下げますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="GroupNameLengthWarning">グループ名は[MIN_LEN]～[MAX_LEN]文字である必要があります。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="UnableToCreateGroup">グループを作成できません。
+[MESSAGE] 
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="PanelGroupApply">[NEEDS_APPLY_MESSAGE]
 [WANT_APPLY_MESSAGE]
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="変更を無視" yestext="変更を適用"/>
-	</notification>
-	<notification name="MustSpecifyGroupNoticeSubject">
-		グループ通知の送信には、件名の記入が必要です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AddGroupOwnerWarning">
-		あなたは [ROLE_NAME] の役割にメンバーを与えようとしています。
-任命されたメンバーが自ら退任しない限り、
-役柄から削除できません。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="変更を無視" yestext="変更を適用" />
+  </notification>
+  <notification name="MustSpecifyGroupNoticeSubject">グループ通知の送信には、件名の記入が必要です。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="AddGroupOwnerWarning">あなたは、[ROLE_NAME]の役割にメンバーを与えようとしています。任命されたメンバーが自ら退任しない限り、 役柄から削除できません。
 操作を続行しますか？
-		<usetemplate ignoretext="グループオーナーを新しく追加する前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AssignDangerousActionWarning">
-		あなたは [ROLE_NAME] に [ACTION_NAME] の能力を
-与えようとしています。
-
- *警告*
-この能力を持つ役割のメンバーは、
-自分と他のメンバーに現在より強力な権限を割り当て、
-自分をオーナーとほぼ同様の立場に任命することもできるようになります。
-この行為の意味をよく理解してから実行してください。
+    <usetemplate ignoretext="グループオーナーを新しく追加する前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="AssignDangerousActionWarning">あなたは[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
 
+*警告*
+この能力を持つ役割のメンバーは、 自分と他のメンバーに現在より強力な権限を割り当て、 自分をオーナーとほぼ同様の立場に任命することもできるようになります。
+この行為の意味をよく理解してから実行してください。
 この能力を [ROLE_NAME] に割り当てますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AssignDangerousAbilityWarning">
-		あなたは [ROLE_NAME] に [ACTION_NAME] の能力を
-与えようとしています。
-
- *警告*
-この能力をもつ役割のメンバーは、
-自分と他のメンバーにすべての能力を割り当て、
-自分をオーナーとほぼ同様の立場に任命できます。
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="AssignDangerousAbilityWarning">あなたは、[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
 
-この能力を [ROLE_NAME] に割り当てますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AssignBanAbilityWarning">
-		役割 '[ROLE_NAME]' に能力 '[ACTION_NAME]' を追加しようとしています。
+*警告*
+この能力をもつ役割のメンバーは、自分と他のメンバーにすべての能力を割り当て、自分をオーナーとほぼ同様の立場に任命できます。
+この能力を[ROLE_NAME] に割り当てますか？
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="AssignBanAbilityWarning">役割「[ROLE_NAME]」に能力「[ACTION_NAME]」を追加しようとしています。
 
 *警告*
-この能力を持つ役割のメンバーにも能力 '[ACTION_NAME_2]' と '[ACTION_NAME_3]' が許可されます
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RemoveBanAbilityWarning">
-		役割 '[ROLE_NAME]' から能力 '[ACTION_NAME]' を削除しようとしています。
+この能力を持つ役割のメンバーにも能力「[ACTION_NAME_2]」と「[ACTION_NAME_3]」が許可されます。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="RemoveBanAbilityWarning">役割「[ROLE_NAME]」から能力「[ACTION_NAME]」を削除しようとしています。
 
 *警告*
-この能力を削除しても能力 '[ACTION_NAME_2]' と '[ACTION_NAME_3]' は削除されません。
- 
+この能力を削除しても能力「[ACTION_NAME_2]」と「[ACTION_NAME_3]」は削除されません。
 これらの能力をこの役割に許可しない場合は、すぐに削除してください!
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="EjectGroupMemberWarning">
-		[AVATAR_NAME] をグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
-	</notification>
-	<notification name="EjectGroupMembersWarning">
-		[COUNT] 名のメンバーをグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
-	</notification>
-	<notification name="BanGroupMemberWarning">
-		[AVATAR_NAME] をグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
-	</notification>
-	<notification name="BanGroupMembersWarning">
-		[COUNT] 名のメンバーをグループから追放しようとしています。
-		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
-	</notification>
-	<notification name="GroupBanUserOnBanlist">一部の住人がグループから追放されたため、招待状が送られませんでした。</notification>
-	<notification name="AttachmentDrop">
-		アタッチメントを下に置こうとしています。
-続けますか？
-		<usetemplate ignoretext="アタッチメントを下に落とす前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="JoinGroupCanAfford">
-		このグループに参加するには、L$ [COST] かかります。
-続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="参加"/>
-	</notification>
-	<notification name="JoinGroupNoCost">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; というグループに入ろうとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加"/>
-	</notification>
-	<notification name="JoinGroupCannotAfford">このグループに加入するには、L$ [COST] 必要です。
-L$ が不足しているのでこのグループに参加することができません。</notification>
-	<notification name="CreateGroupCost">
-		このグループ作成にかかる費用：L$[COST]
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="EjectGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="EjectGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="BanGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止" />
+  </notification>
+  <notification name="BanGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止" />
+  </notification>
+  <notification name="GroupBanUserOnBanlist">一部の住人がグループから追放されたため、招待状が送られませんでした。</notification>
+  <notification name="AttachmentDrop">装着物を下に置こうとしています。
+このまま続けてもよろしいですか？
+    <usetemplate ignoretext="装着物を下に落とす前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="JoinGroupCanAfford">このグループに参加するには、L$ [COST]かかります。
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <tag>group</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加" />
+  </notification>
+  <notification name="JoinGroupNoCost">「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」というグループに入ろうとしています。
+このまま続けてもよろしいですか？
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加" />
+  </notification>
+  <notification name="JoinGroupCannotAfford">このグループに加入するには、L$ [COST]必要です。
+L$が不足しているので、このグループに参加することができません。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <tag>funds</tag>
+  </notification>
+  <notification name="CreateGroupCost">このグループ作成にかかる費用：L$[COST]
 一人ではグループにならないので、永久に削除されてしまいます。
-48 時間以内にメンバーを勧誘し、入会してもらってください。
-		<usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成"/>
-	</notification>
-	<notification name="JoinGroupInaccessible">
-		あなたはグループに参加することはできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupError">
-		グループ参加リクエスト中にエラーが発生しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupErrorReason">
-		グループに参加できません： [reason]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupTrialUser">
-		申し訳ありませんが、トライアルユーザーはグループに参加できません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupMaxGroups">
-		「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません:
-既に [group_count] グループのメンバーになっています。参加できるのは最大 [max_groups] グループまでです。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupClosedEnrollment">
-		「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません:
+４８時間以内にメンバーを勧誘し、入会してもらってください。
+    <tag>group</tag>
+    <tag>funds</tag>
+    <usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成" />
+  </notification>
+  <notification name="JoinGroupInaccessible">あなたはグループに参加することはできません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupError">グループ参加リクエスト中にエラーが発生しました。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupErrorReason">以下のグループに参加できませんでした：[reason]
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <tag>reason</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupTrialUser">申し訳ありませんが、トライアルユーザーはグループに参加できません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupMaxGroups">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
+既に[group_count]個のグループのメンバーになっています。参加できるのは最大[max_groups]グループまでです。
+    <tag>success</tag>
+    <tag>group_id</tag>
+    <tag>group_name</tag>
+    <tag>group_count</tag>
+    <tag>max_groups</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupClosedEnrollment">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
 このグループは現在、参加が制限されています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupSuccess">
-		このユーザーグループに追加されました
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="JoinGroupInsufficientFunds">
-		会員料金として必要な L$ [membership_fee] を送金することができません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandBuyPass">
-		L$ [COST] で [TIME] 時間 [PARCEL_NAME] に入ることができます。
-入場許可を購入しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SalePriceRestriction">不特定の人に売却する場合には、
-売却価格はL$ 0 以上に設定する必要があります。
-売却価格をL$ 0 に設定する場合は、
-売却する個人を選択してください。</notification>
-	<notification name="ConfirmLandSaleChange">
-		選択した [LAND_SIZE] 平方メートルの土地は、売り出し中に設定されています。
-売却価格 L$ [SALE_PRICE] で、[NAME] に売却を認可します。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmLandSaleToAnyoneChange">
-		注意： 「誰にでも販売」をクリックすることで、あなたの土地はこのリージョンにいる人に限らず [SECOND_LIFE] コミュニティ全体で利用可能となります。
-
-選択した [LAND_SIZE] 平方メートルの土地は、販売対象に設定されました。
-販売価格 L$ [SALE_PRICE] で、[NAME] が販売対象者となります。
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsDeededToGroup">
-		グループ「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」と共有するこのにある区画のすべてのオブジェクトを前のオーナーのインベントリに返却しますか？
-
-*注意*この操作をすると、グループに譲渡された譲渡禁止のオブジェクトを削除することになります。
-
-オブジェクト: [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsOwnedByUser">
-		この区画で、
-住人 [NAME] が所有する全てのオブジェクトを
-本人のインベントリに本当に返却してもよいですか？
-
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsOwnedBySelf">
-		この土地区画内にある、あなたが所有するすべてのオブジェクトを、
-あなたのインベントリに戻そうとしています。続けますか？
-
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedBySelf">
-		この土地区画内にある、あなた以外が所有するすべてのオブジェクトを、
-それぞれの所有者のインベントリに戻そうとしています。
-操作を続行しますか？
-グループに譲渡された「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されます。
-
-*警告* これにより、
-グループに譲渡された「再販・プレゼント不可」のオブジェクトは削除されます！
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedByUser">
-		この土地区画内にある、
-[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者のインベントリに返却しようとしています。
-操作を続行しますか？グループに譲渡された「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されます。
-
-*警告* これにより、
-グループに譲渡された「再販・プレゼント不可」のオブジェクトは削除されます！
-オブジェクト： [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnAllTopObjects">
-		リストされた全てのオブジェクトを所有者の持ち物に戻しますか?これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります!
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DisableAllTopObjects">
-		このリージョン（地域）内のすべてのオブジェクトを無効にしようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedByGroup">
-		グループ &lt;nolink&gt;[NAME]&lt;/nolink&gt; と共有されていない、この区画にあるオブジェクトを前のオーナーに返却しますか？
-
-オブジェクト: [N]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="UnableToDisableOutsideScripts">スクリプトを無効にできません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupSuccess">このユーザーグループに入会しました。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="JoinGroupInsufficientFunds">会員料金として必要なL$ [membership_fee]を送金することができません。
+    <tag>group_id</tag>
+    <tag>success</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="LandBuyPass">この区画（[PARCEL_NAME]）は、L$ [COST]で[TIME]時間入ることができます。入場許可証を購入しますか？
+    <tag>fail</tag>
+    <tag>funds</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SalePriceRestriction">不特定の人に売却する場合には、売却価格はL$ 0以上に設定する必要があります。
+売却価格をL$ 0に設定する場合は、売却する個人を選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ConfirmLandSaleChange">選択した[LAND_SIZE]㎡の土地は、売り出し中に設定されています。
+売却価格L$ [SALE_PRICE]で、[NAME]に売却を認可します。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmLandSaleToAnyoneChange">注意：「誰にでも販売」をクリックすることで、あなたの土地はこのリージョンにいる人に限らず、[SECOND_LIFE]コミュニティ全体で利用可能となります。
+選択した[LAND_SIZE]㎡の土地は、販売対象に設定されました。
+販売価格L$ [SALE_PRICE]で、[NAME]が販売対象者となります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsDeededToGroup">グループ「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」と共有するこのにある区画のすべてのオブジェクトを前のオーナーのインベントリに返却しますか？
+*警告*
+この操作をすると、グループに譲渡された譲渡禁止のオブジェクトを削除することになります。
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <tag>group</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsOwnedByUser">この区画で、住人[NAME]が所有する全てのオブジェクトを本人のインベントリに本当に返却してもよいですか？
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsOwnedBySelf">この土地区画内にある、あなたが所有するすべてのオブジェクトを、あなたのインベントリに戻そうとしています。このまま続けてもよろしいですか？
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsNotOwnedBySelf">この土地区画内にある、あなた以外が所有するすべてのオブジェクトを、それぞれの所有者のインベントリに戻そうとしています。このまま操作を続行してもよろしいですか？
+グループに譲渡された「再販・譲渡可」のオブジェクトは、以前の所有者に返却されます。
+
+*警告*
+
+これにより、グループに譲渡された「再販・譲渡不可」のオブジェクトは削除されます！
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsNotOwnedByUser">この土地区画内にある、[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者のインベントリに返却しようとしています。このまま操作を続行してもよろしいですか？
+グループに譲渡された「再販・譲渡可」のオブジェクトは、以前の所有者に返却されます。
+
+*警告*
+
+これにより、グループに譲渡された「再販・譲渡不可」のオブジェクトは削除されます！ 
+オブジェクト：[N]
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnAllTopObjects">リストされた全てのオブジェクトを所有者の持ち物に戻しますか？
+これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります！
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="DisableAllTopObjects">このリージョン（地域）内のすべてのオブジェクトを無効にしようとしています。このまま操作を続行してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ReturnObjectsNotOwnedByGroup">グループ &lt;nolink&gt;[NAME]&lt;/nolink&gt;と共有されていない、この区画にあるオブジェクトを前のオーナーに返却しますか？
+オブジェクト：[N] 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="UnableToDisableOutsideScripts">スクリプトを無効にできません。
 このリージョン（地域）全体が「ダメージ有効」に設定されています。
-武器を使用するにはスクリプトの実行を許可する必要があります。</notification>
-	<notification name="MultipleFacesSelected">
-		現在複数の面が選択されています。
+武器を使用するには、スクリプトの実行を許可する必要があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MultipleFacesSelected">現在複数の面が選択されています。
 このまま続けた場合、メディアの別々のインスタンスがオブジェクトの複数の面に設定されます。
-メディアを 1 つの面だけに取り付けるには、「面を選択」を選んでオブジェクトの希望する面をクリック、それから「追加」をクリックしてください。
-		<usetemplate ignoretext="メディアが選択した複数の面にセットされるとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="MustBeInParcel">着地点を設定するには、この区画の内側に
-立ってください。</notification>
-	<notification name="PromptRecipientEmail">受信者の有効なメールアドレスを入力してください。</notification>
-	<notification name="PromptSelfEmail">あなたのメールアドレスを入力してください。</notification>
-	<notification name="PromptMissingSubjMsg">
-		デフォルトの件名またはメッセージを付けて、スナップショットを送信しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ErrorProcessingSnapshot">スナップショットデータの処理エラー</notification>
-	<notification name="ErrorEncodingSnapshot">スナップショットのエンコード化でエラーが出ました！</notification>
-	<notification name="ErrorCannotAffordUpload">このアイテムをアップロードするには L$[COST] が必要です。</notification>
-	<notification name="ErrorPhotoCannotAfford">インベントリに写真を保存するには L$[COST] が必要です。L$ を購入するか、代わりに写真をっコンピュータに保存できます。</notification>
-	<notification name="ErrorTextureCannotAfford">インベントリにテクスチャを保存するには L$[COST] が必要です。L$ を購入するか、代わりに写真をコンピュータに保存できます。</notification>
-	<notification name="ErrorUploadingPostcard">次の理由で、スナップショットの送信時に問題が起こりました： [REASON]</notification>
-	<notification name="ErrorUploadingReportScreenshot">次の理由で、レポートのスクリーンショットのアップロード時に問題が起こりました。 [REASON]</notification>
-	<notification name="MustAgreeToLogIn">[SECOND_LIFE] へのログインを続けるには、Second Life の利用規約、プライバシーポリシー、およびサービス規約に同意する必要があります。</notification>
-	<notification name="CouldNotPutOnOutfit">アウトフィットを装着できません。
-アウトフィットフォルダに衣類、身体部位、アタッチメントがありません。</notification>
-	<notification name="CannotWearTrash">ごみ箱にある衣類や身体部位の着用はできません。</notification>
-	<notification name="MaxAttachmentsOnOutfit">オブジェクトを付けられませんでした。
-最大数の [MAX_ATTACHMENTS] 個を越えています。 どれか取り外してからお試しください。</notification>
-	<notification name="CannotWearInfoNotComplete">まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。</notification>
-	<notification name="MustEnterPasswordToLogIn">ログインするためにパスワードを入力してください</notification>
-	<notification name="MustHaveAccountToLogIn">
-		注意：記入漏れの箇所があります。
+メディアを１つの面だけに取り付けるには、「面を選択」を選んでオブジェクトの希望する面をクリック、それから「追加」をクリックしてください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="メディアが選択した複数の面にセットされるとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="MustBeInParcel">着地点を設定するには、この区画の内側に立ってください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptRecipientEmail">受信者の有効なメールアドレスを入力してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptSelfEmail">あなたのメールアドレスを入力してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptMissingSubjMsg">デフォルトの件名またはメッセージを付けて、スナップショットを送信しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ErrorProcessingSnapshot">スナップショットデータの処理エラー
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorEncodingSnapshot">スナップショットのエンコードエラー
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorCannotAffordUpload">このアイテムをアップロードするには、L$ [COST]が必要です。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorPhotoCannotAfford">インベントリに写真を保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorTextureCannotAfford">インベントリにテクスチャを保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorUploadingPostcard">以下の理由でスナップショットの送信時に問題が起こりました：[REASON]
+    <tag>fail</tag>
+  </notification>
+  <notification name="ErrorUploadingReportScreenshot">以下の理由で、レポートのスクリーンショットのアップロード時に問題が起こりました：[REASON]
+    <tag>fail</tag>
+  </notification>
+  <notification name="MustAgreeToLogIn">[SECOND_LIFE]へのログインを続けるには、Second Lifeの利用規約、プライバシーポリシー、およびサービス規約に同意する必要があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CouldNotPutOnOutfit">アウトフィットを装着できません。
+アウトフィットフォルダに服装、身体部位、装着物がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotWearTrash">ごみ箱にある服装や身体部位は、着用できません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MaxAttachmentsOnOutfit">オブジェクトを装着できませんでした。
+最大装着数[MAX_ATTACHMENTS]個を越えています。どれか取り外してからお試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotWearInfoNotComplete">まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MustEnterPasswordToLogIn">ログインするためにパスワードを入力してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="MustHaveAccountToLogIn">おっと、記入漏れがあります。
 アバターのユーザー名を入力してください。
 
-[SECOND_LIFE] に入るにはアカウントが必要です。今すぐアカウントを作成しますか？
-		<url name="url">[create_account_url]</url>
-		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
-	</notification>
-	<notification name="InvalidCredentialFormat">ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。</notification>
-	<notification name="InvalidGrid">'[GRID]' は有効なグリッド ID ではありません。</notification>
-	<notification name="InvalidLocationSLURL">ログイン位置で有効なグリッドが指定されませんでした。</notification>
-	<notification name="DeleteClassified">
-		クラシファイド広告 [NAME] を削除しますか？
+[SECOND_LIFE]に入るにはアカウントが必要です。今すぐアカウントを作成しますか？
+    <tag>confirm</tag>
+    <url name="url">[create_account_url]</url>
+    <usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成" />
+  </notification>
+  <notification name="InvalidCredentialFormat">ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="InvalidGrid">「[GRID]」は、有効なグリッドIDではありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="InvalidLocationSLURL">ログイン位置で有効なグリッドが指定されませんでした。
+    <tag>fail</tag>
+  </notification>
+  <notification name="DeleteClassified">クラシファイド広告『[NAME]』を削除してもよろしいですか？
 支払い済みの料金は返金されません。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeleteMedia">
-		この面にあるメディアを削除する選択をしました。
-続けますか？
-		<usetemplate ignoretext="オブジェクトからメディアを削除する前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="ClassifiedSave">
-		クラシファイド広告 [NAME] への変更を保存しますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
-	</notification>
-	<notification name="ClassifiedInsufficientFunds">
-		クラシファイド広告を出すには、資金が足りません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="DeleteAvatarPick">
-		&lt;nolink&gt;[PICK]&lt;/nolink&gt; を削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeleteOutfits">
-		選択したアウトフィットを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PromptGoToEventsPage">
-		[SECOND_LIFE] イベント Web ページに移動しますか？
-		<url name="url">http://secondlife.com/events/?lang=ja-JP</url>
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SelectProposalToView">表示する提案を選択してください。</notification>
-	<notification name="SelectHistoryItemToView">表示する履歴アイテムを選択してください。</notification>
-	<notification name="CacheWillClear">[APP_NAME] を再起動後にキャッシュがクリアされます。</notification>
-	<notification name="CacheWillBeMoved">[APP_NAME] を再起動後にキャッシュが移動されます。
-ご注意： キャッシュがクリアされます。</notification>
-	<notification name="ChangeConnectionPort">ポートの設定は [APP_NAME] を再起動後に反映されます。</notification>
-	<notification name="ChangeDeferredDebugSetting">デバッグ設定の変更は [APP_NAME] を再起動後に反映されます。</notification>
-	<notification name="ChangeSkin">新しいスキンは [APP_NAME] を再起動後に表示されます。</notification>
-	<notification name="ChangeLanguage">言語の変更は [APP_NAME] を再起動後に反映されます。</notification>
-	<notification name="GoToAuctionPage">
-		[SECOND_LIFE]の Web ページに移動し、入札あるいはオークションの詳細を確認しますか？
-		<url name="url">http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]</url>
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SaveChanges">
-		変更を保存しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
-	</notification>
-	<notification name="DeleteNotecard">
-		ノートカードを削除しますか?
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="LoadPreviousReportScreenshot">
-		以前のスクリーンショットをレポートに使用しますか?
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GestureSaveFailedTooManySteps">ジェスチャーの保存に失敗しました。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="DeleteMedia">この顔に紐づけられたメディアの削除を選択しました。
+続行してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトからメディアを削除する前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="ClassifiedSave">クラシファイド広告[NAME]への変更を保存しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
+  </notification>
+  <notification name="ClassifiedInsufficientFunds">クラシファイド広告を出すには、資金が足りません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ProfileDeleteClassified">クラシファイド広告&lt;nolink&gt;[CLASSIFIED]&lt;/nolink&gt;を削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ProfileDeletePick">ピック&lt;nolink&gt;[PICK]&lt;/nolink&gt;を削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ProfileUnpublishedClassified">未公開のクラシファイド広告があります。
+ウィンドウを閉じると変更が失われます。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ProfileUnsavedChanges">保存されていない変更があります。
+    <tag>confirm</tag>
+    <tag>save</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="破棄" yestext="保存" />
+  </notification>
+  <notification name="DeleteAvatarPick">「&lt;nolink&gt;[PICK]&lt;/nolink&gt;」を削除してもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="DeleteOutfits">このアウトフィットを削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="PromptGoToEventsPage">[SECOND_LIFE]イベントWebページに移動しますか？
+    <url name="url">https://secondlife.com/my/community/events/?lang=ja-JP</url>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SelectProposalToView">表示する提案を選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SelectHistoryItemToView">表示する履歴アイテムを選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <!--
+  <notification name="ResetShowNextTimeDialogs">Would you like to re-enable all these popups, which you previously indicated &apos;Don&apos;t show me again&apos;?
+    <usetemplate name="okcancelbuttons" notext="Cancel" yestext="ＯＫ"/>
+  </notification>
+  <notification name="SkipShowNextTimeDialogs">Would you like to disable all popups which can be skipped?
+    <usetemplate name="okcancelbuttons" notext="Cancel" yestext="ＯＫ"/>
+  </notification>
+  -->
+
+  <notification name="CacheWillClear">キャッシュは、[APP_NAME]再起動後にクリアされます。</notification>
+  <notification name="CacheWillBeMoved">キャッシュは、[APP_NAME]再起動後が移動されます。
+注意：キャッシュがクリアされます。</notification>
+  <notification name="ChangeConnectionPort">ポートの設定は、[APP_NAME]再起動後に反映されます。</notification>
+  <notification name="ChangeDeferredDebugSetting">デバッグ設定の変更は、[APP_NAME]再起動後に反映されます。</notification>
+  <notification name="ChangeSkin">新しいスキンは、[APP_NAME]再起動後に表示されます。</notification>
+  <notification name="ChangeLanguage">言語の変更は、[APP_NAME]再起動後に反映されます。</notification>
+  <notification name="GoToAuctionPage">[SECOND_LIFE]のWebページに移動し、入札あるいはオークションの詳細を確認しますか？
+    <tag>confirm</tag>
+    <url name="url">http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]</url>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SaveChanges">変更を保存しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
+  </notification>
+  <notification name="DeleteNotecard">このノートカードを削除してもよろしいですか？
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="LoadPreviousReportScreenshot">以前のスクリーンショットをレポートに使用しますか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="GestureSaveFailedTooManySteps">ジェスチャーの保存に失敗しました。
 ステップが多すぎます。
-ステップをいくつか削除してから再保存してください</notification>
-	<notification name="GestureSaveFailedTryAgain">ジェスチャーの保存に失敗しました。少し待ってからもう一度試してください。</notification>
-	<notification name="GestureSaveFailedObjectNotFound">ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
-オブジェクトが範囲内に存在しないか、または削除された可能性があります。</notification>
-	<notification name="GestureSaveFailedReason">次の理由で、ジェスチャーの保存時に問題が起こりました。 [REASON]。  後でもう一度試してください。</notification>
-	<notification name="SaveNotecardFailObjectNotFound">ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
-オブジェクトが範囲内に存在しないか、または削除された可能性があります。</notification>
-	<notification name="SaveNotecardFailReason">次の理由で、ノートカードの保存時に問題が起こりました。 [REASON]。  後でもう一度試してください。</notification>
-	<notification name="ScriptCannotUndo">
-		あなたのスクリプトのバージョンでは、変更を元に戻すことはできませんでした。
+ステップをいくつか削除してから再保存してください
+    <tag>fail</tag>
+  </notification>
+  <notification name="GestureSaveFailedTryAgain">ジェスチャーの保存に失敗しました。
+少し待ってからもう一度試してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="GestureSaveFailedObjectNotFound">ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
+オブジェクトが範囲内に存在しないか、削除された可能性があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="GestureSaveFailedReason">以下の理由で、ジェスチャーの保存時に問題が起こりました：[REASON]
+お手数ですが、後でもう一度試してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SaveNotecardFailObjectNotFound">ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
+オブジェクトが範囲内に存在しないか、削除された可能性があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="SaveNotecardFailReason">以下の理由で、ノートカードの保存時に問題が起こりました：[REASON]
+お手数ですが、後でもう一度試してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ScriptCannotUndo">あなたのスクリプトのバージョンでは、変更を元に戻すことはできませんでした。
 サーバーの最新保存バージョンをロードしますか？
 （**警告**：この操作後元に戻すことはできません）
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="SaveScriptFailObjectNotFound">スクリプトの保存に失敗しました。スクリプトが入ったオブジェクトが見つかりません。
-オブジェクトは範囲外か、または削除されているかもしれません。</notification>
-	<notification name="StartRegionEmpty">
-		ログイン位置が指定されていません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="SaveScriptFailObjectNotFound">スクリプトの保存に失敗しました。スクリプトが入ったオブジェクトが見つかりません。
+オブジェクトは範囲外か、または削除されているかもしれません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="StartRegionEmpty">ログイン位置が指定されていません。
 ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「自宅（ホーム）」を選択してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CouldNotStartStopScript">スクリプトの起動または停止に失敗しました。スクリプトが格納されているオブジェクトが見つかりません。
-オブジェクトが範囲内に存在しないか、または削除された可能性があります。</notification>
-	<notification name="CannotDownloadFile">ファイルをダウンロードできません。</notification>
-	<notification label="" name="MediaFileDownloadUnsupported">
-		[SECOND_LIFE] でサポートされていないファイルのダウンロードを要求しました。
-		<usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="CannotWriteFile">ファイル [[FILE]] を書き込めません。</notification>
-	<notification name="UnsupportedHardware">
-		お使いのコンピューターは [APP_NAME] の必要最低限の動作環境を満たしていません。 パフォーマンスの低下を感じるかもしれません。 恐れ入りますが [SUPPORT_SITE] ではサポート対象外のシステムに関する技術的サポートは行っておりません。
-
-[_URL] に移動して確認をしますか？
-		<url name="url" option="0">http://secondlife.com/support/sysreqs.php?lang=ja</url>
-		<usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="RunLauncher">ビューワ実行ファイルを直接実行しないでください。代わりに、既存のショートカットの内のどれかをアップデートし、SL_Launcher を実行してください。</notification>
-	<notification name="OldGPUDriver">
-		グラフィックスチップに最新のドライバがある可能性があります。グラフィックドライバを更新することにより、大幅にパフォーマンスが向上します。
-
-    ドライバの更新を確認するために [URL] にアクセスしますか?
-		<url name="url">[URL]</url>
-		<usetemplate ignoretext="使用中のグラフィックドライバが古くなっています" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="UnknownGPU">
-		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
-[APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
-（ミー ＞ 環境設定 ＞ グラフィック）
-		<form name="form">
-			<ignore name="ignore" text="使用中のグラフックカードが認識されないとき"/>
-		</form>
-	</notification>
-	<notification name="DisplaySettingsNoShaders">グラフィックドライバを初期化中に [APP_NAME] がクラッシュしました。
-ドライバの一般的なエラーを防ぐために、画質が低に設定されます。 そのため、一部のグラフィック特性に制限が出ます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="CouldNotStartStopScript">スクリプトの起動または停止に失敗しました。スクリプトが格納されているオブジェクトが見つかりません。
+オブジェクトが範囲内に存在しないか、または削除された可能性があります。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotDownloadFile">ファイルをダウンロードできません。
+    <tag>fail</tag>
+  </notification>
+  <notification label="" name="MediaFileDownloadUnsupported">ダウンロードをリクエストしたファイルは、[SECOND_LIFE]でサポートされていません。
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="ＯＫ" />
+  </notification>
+  <notification name="CannotWriteFile">ファイル[[FILE]]に書き込むことができませんでした。
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnsupportedHardware">お使いのコンピュータは、[APP_NAME]の最小システム要件を満たしていません。
+このためパフォーマンスが低下する場合があります。恐れ入りますが[SUPPORT_SITE]は、サポートされていないシステム構成に対する技術的サポートを提供できません。
+
+詳細について、[_URL]を確認しますか？
+    <url name="url" option="0">http://secondlife.com/support/sysreqs.php?lang=ja</url>
+    <tag>fail</tag>
+    <usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="OldGPUDriver">グラフィックスチップに最新のドライバがある可能性があります。グラフィックドライバを更新することにより、大幅にパフォーマンスが向上します。
+ドライバの更新を確認するために[URL]にアクセスしますか？
+    <url name="url">[URL]</url>
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <usetemplate ignoretext="使用中のグラフィックドライバが古くなっています" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="UnknownGPU">お使いのシステムには、[APP_NAME]が認識できないグラフィックカードが搭載されています。[APP_NAME]でまだテストされていない最新ハードウェアのためだと考えられます。
+問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
+（「私」＞「初期設定」＞「グラフィック」）
+    <tag>fail</tag>
+    <form name="form">
+      <ignore name="ignore" text="使用中のグラフックカードが認識されないとき" />
+    </form>
+  </notification>
+  <notification name="DisplaySettingsNoShaders">グラフィックドライバを初期化中に[APP_NAME]がクラッシュしました。
+ドライバの一般的なエラーを防ぐために、画質が低に設定されます。このため、一部のグラフィック特性に制限が出ます。
 お使いのグラフィックカードのドライバをアップデートするようおすすめします。
-画質は、環境設定 ＞ グラフィック で設定できます。</notification>
-	<notification name="RegionNoTerraforming">[REGION] では、地形の変更ができません。</notification>
-	<notification name="ParcelNoTerraforming">あなたには [PARCEL] 区画を地形編集する許可がありません。</notification>
-	<notification name="CannotCopyWarning">
-		あなたには次アイテムをコピーする権限がありません： 
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt; 
-他の住人に譲ると、そのアイテムはあなたの持ち物から削除されます。本当にこれらのアイテムを譲りますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="CannotGiveItem">インベントリのアイテムを渡せません。</notification>
-	<notification name="TransactionCancelled">取引がキャンセルされました。</notification>
-	<notification name="TooManyItems">一度に 42 個以上のアイテムは渡せません。</notification>
-	<notification name="NoItems">選択したアイテムを渡す権限がありません。</notification>
-	<notification name="CannotCopyCountItems">
-		あなたは選択した [COUNT] 個のアイテムののコピーを許されていません。
+画質は、「初期設定」＞「グラフィック」で設定できます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AutoFPSConfirmDisable">この設定を変更すると、「自動調整」の設定が無効になります。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="続ける"/>
+  </notification>
+  <notification name="AdvancedLightingConfirm">高度な照明をオンにするには、品質をレベル4以上にする必要があります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+  </notification>
+  <notification name="ShadowsConfirm">影を有効にするには、品質をレベルを4以上にする必要があります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+  </notification>
+  <notification name="RegionNoTerraforming">[REGION]では、地形の変更ができません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="ParcelNoTerraforming">[PARCEL]区画の地形を編集する権限がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotCopyWarning">以下のアイテムをコピーする権限がありません：
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+他の人に譲ると、そのアイテムはあなたの持ち物から削除されます。本当にこれらのアイテムを譲ってもよろしいですか？
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="CannotGiveItem">インベントリのアイテムを渡すことができません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="TransactionCancelled">取引がキャンセルされました。
+    <tag>fail</tag>
+  </notification>
+  <notification name="TooManyItems">一度に42個以上のアイテムを渡すことはできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="NoItems">選択したアイテムを渡す権限がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotCopyCountItems">あなたは選択した[COUNT]個のアイテムをコピーする権限がありません。
 これらのアイテムはあなたのインベントリから失われます。
-本当にアイテムを渡したいですか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="CannotGiveCategory">選択したフォルダを渡す権限がありません</notification>
-	<notification name="FreezeAvatar">
-		このアバターをフリーズしますか？
+本当にアイテムを渡してもよろしいですか？
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+  <notification name="CannotGiveCategory">選択したフォルダを渡す権限がありません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="FreezeAvatar">このアバターをフリーズしますか？
 アバターは一時的に動けなくなり、チャットを含めインワールドで何もできなくなります。
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/>
-	</notification>
-	<notification name="FreezeAvatarFullname">
-		[AVATAR_NAME]をフリーズしますか？
-フリーズされた人は一時的に動けなくなり、チャットなど、この世界に対する関わりを持つことができなくなります。
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/>
-	</notification>
-	<notification name="EjectAvatarFullname">
-		あなたの土地から [AVATAR_NAME] を追放しますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="追放と禁止" yestext="追放"/>
-	</notification>
-	<notification name="EjectAvatarNoBan">
-		このアバターをあなたの土地から追放しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
-	</notification>
-	<notification name="EjectAvatarFullnameNoBan">
-		[AVATAR_NAME] をあなたの土地から追放しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
-	</notification>
-	<notification name="EjectAvatarFromGroup">&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt; から [AVATAR_NAME] を追放しました</notification>
-	<notification name="AcquireErrorTooManyObjects">取得エラー：選択したオブジェクトの数が多すぎます。</notification>
-	<notification name="AcquireErrorObjectSpan">取得エラー：
-オブジェクトが複数のリージョン（地域）にまたがって存在しています。
-すべて同じリージョン内に移動させてから取得してください。</notification>
-	<notification name="PromptGoToCurrencyPage">
-		[EXTRA]
-
-[_URL] に移動してリンデンドル購入に関する情報を確認しますか？
-		<url name="url">http://secondlife.com/app/currency/?lang=ja-JP</url>
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="MuteLimitReached">[MUTE_LIMIT] エントリの制限に達したため、ブロックリストに新しいエントリを追加できません。</notification>
-	<notification name="UnableToLinkObjects">[COUNT] 個のオブジェクトをリンクできません。
-リンクできるのは最大 [MAX] 個です。</notification>
-	<notification name="CannotLinkIncompleteSet">セットで揃っているオブジェクトのみリンクできます。
-複数のオブジェクトを選択してください。</notification>
-	<notification name="CannotLinkModify">すべてのオブジェクトの修正許可がないためリンクできません。
-
-どのオブジェクトもロックされておらず、あなたのものであることを確認してください。</notification>
-	<notification name="CannotLinkPermanent">地域（リージョン）の境界を越えてオブジェクトをリンクできません。</notification>
-	<notification name="CannotLinkAcrossRegions">地域（リージョン）の境界を越えてオブジェクトをリンクできません。</notification>
-	<notification name="CannotLinkDifferentOwners">所有者が異なるため、オブジェクトをリンクできません。
-
-自分が所有しているオブジェクトだけを選択してください。</notification>
-	<notification name="NoFileExtension">「 [FILE] 」の拡張子が無効です。
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
+  </notification>
+  <notification name="FreezeAvatarFullname">[AVATAR_NAME]をフリーズしますか？
+フリーズされた人は一時的に動けなくなり、チャットなど、ワールドに対する関わりを持つことができなくなります。
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
+  </notification>
+  <notification name="EjectAvatarFullname">あなたの土地から[AVATAR_NAME]を追放しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="追放しバンする" yestext="追放する" />
+  </notification>
+  <notification name="EjectAvatarNoBan">このアバターをあなたの土地から追放しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="EjectAvatarFullnameNoBan">[AVATAR_NAME]をあなたの土地から追放しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放" />
+  </notification>
+  <notification name="EjectAvatarFromGroup">&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;から[AVATAR_NAME]を追放しました。
+    <tag>group</tag>
+  </notification>
+  <notification name="AcquireErrorTooManyObjects">取得エラー：選択したオブジェクトの数が多すぎます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="AcquireErrorObjectSpan">取得エラー：オブジェクトが複数のリージョン（地域）にまたがって存在しています。
+すべて同じリージョン内に移動させてから取得してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="PromptGoToCurrencyPage">[EXTRA]
+  
+[_URL]に移動してリンデンドル購入に関する情報を確認しますか？ 
+    <url name="url">https://secondlife.com/my/lindex/?lang=ja-JP</url>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="MuteLimitReached">[MUTE_LIMIT]エントリの制限に達したため、ブロックリストに新しいエントリを追加できません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnableToLinkObjects">[COUNT]個のオブジェクトをリンクできませんでした。
+リンクできるオブジェクトは最大[MAX]個です。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkIncompleteSet">セットが揃っているオブジェクトのみリンクできます。複数のオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkModify">すべてのオブジェクトの修正許可がないためリンクできません。
+
+どのオブジェクトもロックされておらず、あなたのものであることを確認してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkPermanent">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkAcrossRegions">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotLinkDifferentOwners">所有者が異なるため、オブジェクトをリンクできません。
+自分が所有しているオブジェクトだけを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="NoFileExtension">ファイル「[FILE]」は、無効な拡張子です。
 
 このファイルの拡張子が正しいかどうかを確認してください。</notification>
-	<notification name="InvalidFileExtension">
-		[EXTENSION] は無効です。
-正しい拡張子：[VALIDS]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotUploadSoundFile">読み込みのためにアップロードされたサウンドファイルを開けません：
-[FILE]</notification>
-	<notification name="SoundFileNotRIFF">RIFF WAVE ファイルとして認識されません：
-[FILE]</notification>
-	<notification name="SoundFileNotPCM">PCM WAVE オーディオファイルとして認識されません：
-[FILE]</notification>
-	<notification name="SoundFileInvalidChannelCount">ファイルのチャンネル数が無効です（モノラルまたはステレオを使用する必要があります）：
-[FILE]</notification>
-	<notification name="SoundFileInvalidSampleRate">ファイルのサンプルレートがサポートされていません（44.1k である必要があります）：
-[FILE]</notification>
-	<notification name="SoundFileInvalidWordSize">ファイルのワードサイズがサポートされていません（8 または 16 ビットである必要があります）：
-[FILE]</notification>
-	<notification name="SoundFileInvalidHeader">WAV ヘッダーにデータチャンクが見つかりません：
-[FILE]</notification>
-	<notification name="SoundFileInvalidChunkSize">WAV ファイルのチャンクサイズが間違っています：
-[FILE]</notification>
-	<notification name="SoundFileInvalidTooLong">オーディオファイルが長すぎます。（最大 10 秒）：
-[FILE]</notification>
-	<notification name="ProblemWithFile">「 [FILE] 」に問題があります。
-
-[ERROR]</notification>
-	<notification name="CannotOpenTemporarySoundFile">書き込み用の一時圧縮サウンドファイルを開くことができません：[FILE]</notification>
-	<notification name="UnknownVorbisEncodeFailure">不明の Vorbis のエンコードに失敗： [FILE]</notification>
-	<notification name="CannotEncodeFile">次のファイルのエンコードができません： [FILE]</notification>
-	<notification name="CorruptedProtectedDataStore">
-		ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CorruptResourceFile">破損したリソースファイル： [FILE]</notification>
-	<notification name="UnknownResourceFileVersion">不明のリンデンリソースファイルのバージョン： [FILE]</notification>
-	<notification name="UnableToCreateOutputFile">出力ファイルを作成できません： [FILE]</notification>
-	<notification name="DoNotSupportBulkAnimationUpload">現在 [APP_NAME] では、BVH 形式のアニメーションファイルの一括アップロードはサポートされていません。</notification>
-	<notification name="CannotUploadReason">次の理由で、「 [FILE] 」をアップロードできません： [REASON]
-あとでもう一度試してください。</notification>
-	<notification name="LandmarkCreated">「 [LANDMARK_NAME] 」を「 [FOLDER_NAME] 」フォルダに追加しました。</notification>
-	<notification name="LandmarkAlreadyExists">
-		現在地のランドマークを既に持っています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotCreateLandmarkNotOwner">土地の所有者が許可していないため、ランドマークを作成することはできません。</notification>
-	<notification name="CannotRecompileSelectObjectsNoScripts">「リコンパイル」できません。
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotRecompileSelectObjectsNoPermission">「リコンパイル」できません。
-
-修正修正権限のあるスクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotResetSelectObjectsNoScripts">「再設定」ができません。
-
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotResetSelectObjectsNoPermission">「再設定」ができません。
-
-修正権限のあるスクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotOpenScriptObjectNoMod">修正権限のないオブジェクトのスクリプトは開くことはできません。</notification>
-	<notification name="CannotSetRunningSelectObjectsNoScripts">スクリプトの「実行」ができません。
-
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="CannotSetRunningNotSelectObjectsNoScripts">スクリプトを「実行しない」設定にできません。
-
-スクリプトのオブジェクトを選択してください。</notification>
-	<notification name="NoFrontmostFloater">保存する frontmost フロータがありません。</notification>
-	<notification name="SeachFilteredOnShortWords">指定した検索クエリは変更され、短すぎる語句は取り除かれています。
-
-検索語句： [FINALQUERY]</notification>
-	<notification name="SeachFilteredOnShortWordsEmpty">指定した検索語句が短すぎたため、検索は行われませんでした。</notification>
-	<notification name="CouldNotTeleportReason">テレポートに失敗しました。
-[REASON]</notification>
-	<notification name="invalid_tport">テレポート処理中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</notification>
-	<notification name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</notification>
-	<notification name="blocked_tport">申し訳ございません。テレポートは現在、ブロックされています。しばらくしてから再度お試しください。
-それでもテレポートできない場合は、ログアウトし、ログインし直して問題を解決してください。</notification>
-	<notification name="nolandmark_tport">申し訳ございません。ランドマークの目的地が見つかりませんでした。</notification>
-	<notification name="timeout_tport">申し訳ございません。システムによるテレポート接続が完了できませんでした。
-しばらくしてから再度お試しください。</notification>
-	<notification name="noaccess_tport">残念ながら、目的地へアクセスが許可されていないため、テレポートできません。</notification>
-	<notification name="missing_attach_tport">添付物がまだ届いていません。テレポートをする前にあと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてください。</notification>
-	<notification name="too_many_uploads_tport">このリージョンのアセットキューが現在混み合っているため、テレポートのリクエストをすぐに処理することが難しい状況です。
-数分後にやり直すか、混雑していない他のリージョンでお試しください。</notification>
-	<notification name="expired_tport">申し訳ございません。システムはテレポートのリクエストを時間どおりに完了できませんでした。数分後にやり直してください。</notification>
-	<notification name="expired_region_handoff">申し訳ございません。システムはリージョン間の移動を時間どおりに完了できませんでした。
-数分後にやり直してください。</notification>
-	<notification name="no_host">テレポート目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。数分後にやり直してください。</notification>
-	<notification name="no_inventory_host">インベントリシステムは現在利用できません。</notification>
-	<notification name="CannotSetLandOwnerNothingSelected">土地所有者設定ができません：
-区画が選定されていません。</notification>
-	<notification name="CannotSetLandOwnerMultipleRegions">複数のリージョンが選択されたため、土地の所有権を取得できません。
-選択する面積を小さくして、もう一度お試しください。</notification>
-	<notification name="ForceOwnerAuctionWarning">
-		この区画はオークションに出されています。 所有権を変更するとオークションはキャンセルとなり、既にオークションに参加している住人がいればその人に迷惑をかけてしまいます。
+  <notification name="InvalidFileExtension">「[EXTENSION]」は、無効な拡張子です。
+有効な拡張子：[VALIDS] 
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="CannotUploadSoundFile">読み込みのためにアップロードされたサウンドファイルを開けません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileNotRIFF">RIFF WAVEファイルとして認識されません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileNotPCM">PCM WAVEオーディオファイルとして認識されません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidChannelCount">このファイルのチャンネル数は無効です（モノラルか、ステレオである必要があります）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidSampleRate">このファイルのサンプリングレートはサポートされていません（44.1kである必要があります）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidWordSize">このファイルのビットサイズはサポートされていません（8bitか、16bitである必要があります）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidHeader">WAVヘッダーにデータチャンクが見つかりません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidChunkSize">WAVファイルのチャンクサイズが間違っています：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="SoundFileInvalidTooLong">オーディオファイルが長すぎます。（最大１０秒）：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="ProblemWithFile">「[FILE]」に問題があります。
+
+[ERROR]
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotOpenTemporarySoundFile">書き込み用の一時圧縮サウンドファイルを開くことができません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnknownVorbisEncodeFailure">不明なVorbisのエンコードに失敗しました：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotEncodeFile">次のファイルのエンコードができません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="CorruptedProtectedDataStore">ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="CorruptResourceFile">破損したリソースファイル：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnknownResourceFileVersion">不明なLindenリソースファイルのバージョンです：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="UnableToCreateOutputFile">出力ファイルを作成できません：
+[FILE]
+    <tag>fail</tag>
+  </notification>
+  <notification name="DoNotSupportBulkAnimationUpload">現在[APP_NAME]では、BVH形式のアニメーションファイルの一括アップロードはサポートされていません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotUploadReason">以下の理由で「[FILE]」をアップロードできませんでした：
+[REASON]
+
+お手数ですがもう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="LandmarkCreated">「[LANDMARK_NAME]」を「[FOLDER_NAME]」フォルダに追加しました。</notification>
+  <notification name="LandmarkAlreadyExists">この場所のランドマークは、既に持っています。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification label="フォルダ作成" name="CreateLandmarkFolder">
+    <unique />
+フォルダ名を入力してください：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+      </input>
+      <button default="true" index="0" name="ＯＫ" text="ＯＫ"/>
+      <button index="1" name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+  <notification name="CannotRecompileSelectObjectsNoScripts">「再コンパイル」できませんでした。
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotRecompileSelectObjectsNoPermission">「再コンパイル」できませんでした。
+修正権限のある、スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotResetSelectObjectsNoScripts">「再設定」ができません。
+
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotResetSelectObjectsNoPermission">「再設定」ができません。
+修正権限のある、スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotOpenScriptObjectNoMod">修正権限のないオブジェクトのスクリプトは開くことはできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotSetRunningSelectObjectsNoScripts">スクリプトの「実行」ができません。
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="CannotSetRunningNotSelectObjectsNoScripts">スクリプトを「実行しない」設定にできません。
+スクリプトが入ったオブジェクトを選択してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="NoFrontmostFloater">保存するfrontmostフロータがありません。</notification>
+  <notification name="SeachFilteredOnShortWords">指定した検索クエリは変更され、短すぎる語句は取り除かれています。
+
+検索語句：[FINALQUERY]</notification>
+  <notification name="SeachFilteredOnShortWordsEmpty">指定した検索語句が短すぎたため、検索は行われませんでした。
+    <tag>fail</tag>
+  </notification>
+  <!-- Generic Teleport failure modes - strings will be inserted from teleport_strings.xml if available. -->
+  <notification name="CouldNotTeleportReason">テレポートに失敗しました。
+[REASON]
+    <tag>fail</tag>
+  </notification>
+  <!-- Teleport failure modes not delivered via the generic mechanism
+    above (for example, delivered as an AlertMessage on
+    region-crossing :( ) - these paths should really be merged
+    in the future. -->
+  <notification name="invalid_tport">テレポートの試行は１分間に６回までと制限されています。１分待ってからもう一度テレポートしてみてください。問題が解決しない場合は、ログインし直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。ログインし直す必要があるかもしれません。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="blocked_tport">申し訳ございません。テレポートは現在ブロックされています。お手数ですが、しばらくしてから再度お試しください。
+それでもテレポートできない場合は、ログアウトし、ログインし直して問題を解決してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="nolandmark_tport">申し訳ございません。ランドマークの目的地が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+  <notification name="timeout_tport">申し訳ございません。システムによるテレポート接続が完了できませんでした。
+しばらくしてから再度お試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="noaccess_tport">残念ながら、目的地へアクセスが許可されていないため、テレポートできません。
+    <tag>fail</tag>
+  </notification>
+  <notification name="missing_attach_tport">添付物がまだ届いていません。テレポートをする前にあと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="too_many_uploads_tport">このリージョンのアセットキューが現在混み合っているため、テレポートのリクエストをすぐに処理することが難しい状況です。
+数分後にやり直すか、混雑していない他のリージョンでお試しください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="expired_tport">申し訳ございません。システムはテレポートのリクエストを時間どおりに完了できませんでした。
+数分後にやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="expired_region_handoff">申し訳ございません。システムはリージョン間の移動を時間どおりに完了できませんでした。
+数分後にやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="no_host">テレポート目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。
+  数分後にやり直してください。
+    <tag>fail</tag>
+  </notification>
+  <notification name="no_inventory_host">インベントリシステムは現在利用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSetLandOwnerNothingSelected">土地所有者設定ができません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSetLandOwnerMultipleRegions">複数のリージョンが選択されたため、土地の所有権を取得できません。
+選択する面積を小さくして、もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ForceOwnerAuctionWarning">この区画はオークションに出されています。所有権を変更するとオークションはキャンセルとなり、既にオークションに参加している住人がいればその人に迷惑をかけてしまいます。
 所有権を変更しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="CannotContentifyNothingSelected">コンテンツ化は不可能です：
-区画が選定されていません。</notification>
-	<notification name="CannotContentifyNoRegion">コンテンツ化は不可能です：
-土地が選択されていません。</notification>
-	<notification name="CannotReleaseLandNothingSelected">土地を破棄できません：
-区画が選定されていません。</notification>
-	<notification name="CannotReleaseLandNoRegion">土地を破棄できません：
-リージョンが見つかりません。</notification>
-	<notification name="CannotBuyLandNothingSelected">土地を購入できません：
-区画が選定されていません。</notification>
-	<notification name="CannotBuyLandNoRegion">土地を購入できません：
-この土地があるリージョンを見つけることができません</notification>
-	<notification name="CannotCloseFloaterBuyLand">[APP_NAME] がこの取引価格を見積もるまでは、土地の購入ウィンドウを閉じることはできません。</notification>
-	<notification name="CannotDeedLandNothingSelected">土地を譲渡できません：
-区画が選定されていません。</notification>
-	<notification name="CannotDeedLandNoGroup">土地を譲渡できません：
-グループが選択されていません。</notification>
-	<notification name="CannotDeedLandNoRegion">土地を譲渡できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotDeedLandMultipleSelected">土地を譲渡できません：
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CannotContentifyNothingSelected">コンテンツ化は不可能です：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotContentifyNoRegion">コンテンツ化は不可能です：
+土地が選択されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandNothingSelected">土地を破棄できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandNoRegion">土地を破棄できません：
+リージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotBuyLandNothingSelected">土地を購入できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotBuyLandNoRegion">土地を購入できません：
+この土地があるリージョンを見つけることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotCloseFloaterBuyLand">[APP_NAME] がこの取引価格を見積もるまでは、土地の購入ウィンドウを閉じることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNothingSelected">土地を譲渡できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNoGroup">土地を譲渡できません：
+グループが選択されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNoRegion">土地を譲渡できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandMultipleSelected">土地を譲渡できません：
 複数の区画が選択されています。
 
-区画を 1 つ選択してください。</notification>
-	<notification name="CannotDeedLandWaitingForServer">土地を譲渡できません：
+区画を１つ選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandWaitingForServer">土地を譲渡できません：
 サーバーからの所有権情報を待っています。
 
-再度、試みてください。</notification>
-	<notification name="CannotDeedLandNoTransfer">土地を譲渡できません：
-[REGION] では土地の譲渡が許されていません。</notification>
-	<notification name="CannotReleaseLandWatingForServer">土地を破棄できません：
+お手数ですが、もう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotDeedLandNoTransfer">土地を譲渡できません：
+[REGION]では、土地の譲渡が許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandWatingForServer">土地を破棄できません：
 サーバーが区画情報を更新するのを待っています。
 
-もう少し後でやり直してください。</notification>
-	<notification name="CannotReleaseLandSelected">土地を破棄できません：
+お手数ですが、もう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandSelected">土地を破棄できません：
 あなたは、選択した区画のすべてを所有していません。
 
-区画を 1 つ選択してください。</notification>
-	<notification name="CannotReleaseLandDontOwn">土地を破棄できません：
+区画を１つ選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandDontOwn">土地を破棄できません：
 あなたはこの土地を手放すことを許可されていません。
-あなたの区画は緑色で表示されています。</notification>
-	<notification name="CannotReleaseLandRegionNotFound">土地を放棄できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotReleaseLandNoTransfer">土地を破棄できません：
-[REGION] では土地の譲渡が許されていません。</notification>
-	<notification name="CannotReleaseLandPartialSelection">土地を破棄できません：
+あなたの区画は緑色で表示されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandRegionNotFound">土地を放棄できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandNoTransfer">土地を破棄できません：
+[REGION]では土地の譲渡が許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotReleaseLandPartialSelection">土地を破棄できません：
 区画全体を選択して破棄する必要があります。
 
-区画全体を選択するか、または、まず最初に区画を分割してください。</notification>
-	<notification name="ReleaseLandWarning">
-		あなたは、[AREA] 平方メートルの土地を破棄しようとしています。
-この区画を破棄するとあなたの土地ではなくなりますが、
-L$ は返金されません。
+区画全体を選択するか、まず最初に区画を分割してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleaseLandWarning">あなたは、[AREA]㎡の土地を破棄しようとしています。
+この区画を破棄するとあなたの土地ではなくなりますが、L$ は返金されません。
+
+土地を破棄してもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CannotDivideLandNothingSelected">土地を分割できません：
 
-土地を破棄しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="CannotDivideLandNothingSelected">土地を分割できません：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
 
-区画が選定されていません。</notification>
-	<notification name="CannotDivideLandPartialSelection">土地を分割できません：
+  <notification name="CannotDivideLandPartialSelection">土地を分割できません：
 
 区画全体が選択されています。
-区画の一部を選択してください。</notification>
-	<notification name="LandDivideWarning">
-		この土地を分割すると、2 つの区画に別れます。
-区画ごとの設定が可能になります。 この操作を行うと、一部の設定がデフォルトにリセットされます。
-
-土地の分割操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="CannotDivideLandNoRegion">土地を分割できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotJoinLandNoRegion">土地を統合できません：
-この土地があるリージョンが見つかりません。</notification>
-	<notification name="CannotJoinLandNothingSelected">土地を統合できませんでした：
-区画が選定されていません。</notification>
-	<notification name="CannotJoinLandEntireParcelSelected">土地を統合できません：
-区画が 1 つしか選択されていません。
-
-両方の区画をまたいで土地を選択してください。</notification>
-	<notification name="CannotJoinLandSelection">土地を統合できません：
-区画を 1 つ以上選択する必要があります。
-
-両方の区画をまたいで土地を選択してください。</notification>
-	<notification name="JoinLandWarning">
-		この土地を統合すると、選択された長方形に交差する全ての区画を基にして、大きな区画が 1 つ作成されます。
+区画の一部を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandDivideWarning">この土地を分割すると、２つの区画に分割され各々の設定が可能になります。
+この操作を行うと、一部の設定がデフォルトにリセットされます。
+
+土地を分割してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="CannotDivideLandNoRegion">土地を分割できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandNoRegion">土地を結合できません：
+この土地があるリージョンが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandNothingSelected">土地を結合できませんでした：
+区画が選定されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandEntireParcelSelected">土地を結合できません：
+区画が１つしか選択されていません。
+
+両方の区画をまたいで土地を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotJoinLandSelection">土地を結合できません：
+区画を１つ以上選択する必要があります。
+
+両方の区画をまたいで土地を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="JoinLandWarning">この土地を結合すると、選択された長方形に交差する全ての区画を基にして、大きな区画が１つ作成されます。
 新しい区画の名前とオプションを再設定する必要があります。
 
-土地を統合しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmNotecardSave">
-		このアイテムをコピー、表示する前に、ノートカードの保存が必要です。 保存しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmItemCopy">
-		このアイテムをあなたのインベントリにコピーしますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="コピー"/>
-	</notification>
-	<notification name="ResolutionSwitchFail">解像度を [RESX]x[RESY] に切り替えることができませんでした。</notification>
-	<notification name="ErrorUndefinedGrasses">エラー：未定義の植物：[SPECIES]</notification>
-	<notification name="ErrorUndefinedTrees">エラー：未定義の樹木：[SPECIES]</notification>
-	<notification name="CannotSaveWearableOutOfSpace">「 [NAME] 」を衣類のファイルに保存できません。
-コンピューターのディスクスペースを少し増やしてから、もう一度保存してみてください。</notification>
-	<notification name="CannotSaveToAssetStore">「 [NAME] 」を保存できません。
-通常これは一時的なエラーです。 数分後にもう一度着用物をカスタマイズ・保存してください。</notification>
-	<notification name="YouHaveBeenLoggedOut">
-		しまった、[SECOND_LIFE] からログアウトされてしまいました。
+土地を結合してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmNotecardSave">このアイテムをコピー、表示する前に、ノートカードの保存が必要です。
+保存してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmItemCopy">このアイテムをあなたのインベントリにコピーしますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="コピー" />
+  </notification>
+
+  <notification name="ResolutionSwitchFail">解像度を[RESX]✕[RESY]に変更することができませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ErrorUndefinedGrasses">エラー：未定義の植物：[SPECIES]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ErrorUndefinedTrees">エラー：未定義の樹木：[SPECIES]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSaveWearableOutOfSpace">「[NAME]」を服装のファイルに保存できません。
+コンピューターのディスクスペースを少し増やしてから、もう一度保存してみてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotSaveToAssetStore">「[NAME]」を保存できません。
+通常これは一時的なエラーです。数分後にもう一度着用物をカスタマイズ・保存してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="YouHaveBeenLoggedOut">しまった、[SECOND_LIFE]からログアウトされてしまいました。[MESSAGE]
+    <usetemplate name="okcancelbuttons" notext="終了" yestext="ＩＭでチャット" />
+  </notification>
+
+  <notification name="InventoryUnusable">インベントリの読み込み中に問題が発生しました。まず、ログアウトして再度ログインし直してみてください。
+このメッセージが再度表示される場合は、サポートに連絡して問題を解決してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OnlyOfficerCanBuyLand">グループ用の土地の購入ができません：
+あなたにはアクティブなグループのために土地を購入する権限がありません。
+    <tag>group</tag>
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="フレンド登録" name="AddFriendWithMessage">フレンド登録すると、お互いの現在いる場所のマップへの表示許可や、オンライン状態の表示設定ができます。
+
+[NAME]にフレンドの申請を行いますか？
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">フレンド登録してくれますか？</input>
+      <button name="Offer" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="自動置換リストを追加" name="AddAutoReplaceList">新しいリストの名前：
+    <tag>addlist</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="SetName" text="ＯＫ" />
+    </form>
+  </notification>
+
+  <notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">名前「[DUPNAME]」は既に使われています。
+一意の名前を入力してください：
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ReplaceList" text="着用中のリストを入れ替える" />
+      <button name="SetName" text="新しい名前を使用" />
+    </form>
+  </notification>
+
+  <notification name="InvalidAutoReplaceEntry">キーワードは一語でなければならず、置換は空にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidAutoReplaceList">その置換リストは無効です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpellingDictImportRequired">ファイル、名前および言語を指定する必要があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpellingDictIsSecondary">辞書 [DIC_NAME]に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
+この辞書は追加辞書として使用できますが、メイン辞書としては使用できません。詳細については下記をご覧ください。
+https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpellingDictImportFailed">[FROM_NAME]から[TO_NAME]へコピーすることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <!-- [DESC] (new)は日本語が使えないので翻訳しない。-->
+  <notification label="アウトフィットの保存" name="SaveOutfitAs">着用中のアウトフィットを新しいアウトフィットとして保存：
+    <unique />
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC] (new)</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="着用物の保存" name="SaveWearableAs">アイテムを別名でインベントリに保存：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC] (new)</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="アウトフィットの名前変更" name="RenameOutfit">新しいアウトフィット名：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="new_name">[NAME]</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="ジェスチャーの名前変更" name="RenameGesture">新しいジェスチャー名：
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="new_name">[NAME]</input>
+      <button name="ＯＫ" text="ＯＫ"/>
+      <button name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification label="ランドマークの名前変更" name="RenameLandmark">[NAME]の新しい名前を入力してください。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="new_name">[NAME]</input>
+      <button name="ＯＫ" text="ＯＫ"/>
+      <button name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification name="RemoveFromFriends">フレンドリストから&lt;nolink&gt;[NAME]&lt;/nolink&gt;を削除しますか？
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RemoveMultipleFromFriends">フレンドリストから複数のフレンドを削除しますか？
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GodDeleteAllScriptedPublicObjectsByUser">**[AVATAR_NAME]**
+が所有するすべてのスクリプトオブジェクトを、このシム内の他のすべての土地から削除しようとしています。
+操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
 
-[MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="終了" yestext="IMとチャットを表示"/>
-	</notification>
-	<notification name="OnlyOfficerCanBuyLand">グループ用の土地の購入ができません：
-あなたにはアクティブなグループのために土地を購入する権限がありません。</notification>
-	<notification label="フレンド登録" name="AddFriendWithMessage">
-		フレンド登録すると、お互いの現在地の地図への表示許可、オンライン状態の表示設定ができます。
-
-[NAME] にフレンドシップを申し出ますか？
-		<form name="form">
-			<input name="message">フレンド登録してくれますか？</input>
-			<button name="Offer" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification label="自動置換リストを追加" name="AddAutoReplaceList">
-		新しいリストの名前:
-		<form name="form">
-			<button name="SetName" text="OK"/>
-		</form>
-	</notification>
-	<notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">
-		名前 '[DUPNAME]' は既に使われています
-一意の名前を入力してください:
-		<form name="form">
-			<button name="ReplaceList" text="着用中のリストを入れ替える"/>
-			<button name="SetName" text="新しい名前を使用"/>
-		</form>
-	</notification>
-	<notification name="InvalidAutoReplaceEntry">キーワードは一語でなければならず、置換は空にできません。</notification>
-	<notification name="InvalidAutoReplaceList">その置換リストは無効です。</notification>
-	<notification name="SpellingDictImportRequired">ファイル、名前および言語を指定する必要があります。</notification>
-	<notification name="SpellingDictIsSecondary">辞書 [DIC_NAME] に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
-この辞書は追加辞書として使用できますが、メイン辞書としては使用できません。
-
-https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してください。</notification>
-	<notification name="SpellingDictImportFailed">[FROM_NAME] から
-
-[TO_NAME] へコピーできません</notification>
-	<notification label="アウトフィットを保存する" name="SaveOutfitAs">
-		着用中のアウトフィットを新しいアウトフットとして保存：
-		<form name="form">
-			<input name="message">[DESC] （新）</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification label="着用物を保存" name="SaveWearableAs">
-		アイテムを別名でインベントリに保存：
-		<form name="form">
-			<input name="message">[DESC]（新規）</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="アウトフィットの名前を変更する" name="RenameOutfit">
-		新しいアウトフィットの名前：
-		<form name="form">
-			<input name="new_name">[NAME]</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="RemoveFromFriends">
-		フレンドリストから &lt;nolink&gt;[NAME]&lt;/nolink&gt; を削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="RemoveMultipleFromFriends">
-		フレンドリストから複数のフレンドを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
-		**[AVATAR_NAME]**
-所有のすべてのスクリプトオブジェクトをこのシム内の他のすべての土地から削除しようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllScriptedObjectsByUser">
-		**[AVATAR_NAME]**
-所有のすべてのスクリプトオブジェクトをこのシム内のすべての土地から削除しようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllObjectsByUser">
-		**[AVATAR_NAME]**
-所有のすべてのオブジェクト（スクリプトオブジェクトと非スクリプトオブジェクト）を
-このシム内のすべての土地から削除しようとしています。操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BlankClassifiedName">クラシファイドの名前を指定してください。</notification>
-	<notification name="MinClassifiedPrice">広告料は最低 L$ [MIN_PRICE] 必要です。
-
-金額を増やしてください。</notification>
-	<notification name="ConfirmItemDeleteHasLinks">
-		1 つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。まず最初にリンクを削除することを強くお勧めします。
+  <notification name="GodDeleteAllScriptedObjectsByUser">**[AVATAR_NAME]**
+が所有するすべてのスクリプトオブジェクトを、このシム内の他のすべての土地から削除しようとしています。
+操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GodDeleteAllObjectsByUser">**[AVATAR_NAME]**
+が所有するすべてのオブジェクト（スクリプトオブジェクトと非スクリプトオブジェクト）を、このシム内のすべての土地から削除しようとしています。
+操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BlankClassifiedName">クラシファイド広告の名前を指定してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="MinClassifiedPrice">クラシファイド広告掲載料は最低L$ [MIN_PRICE]必要です。
+
+金額を増やしてください。
+    <tag>fail</tag>
+  </notification>
 
+  <notification name="ConfirmItemDeleteHasLinks">１つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。
+まず最初にリンクを削除することを強くお勧めします。
+  
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLock">
-		選択したアイテムのうち、少なくとも 1 つがロックされています。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmObjectDeleteLock">選択したアイテムのうち、少なくとも１つがロックされています。
 
 本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoCopy">
-		選択したアイテムのうち、少なくとも 1 つがコピーできません。
-
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+  <notification name="ConfirmObjectDeleteNoCopy">選択したアイテムのうち、少なくとも１つがコピーできません。
+  
 本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoOwn">
-		選択したアイテムの 1 つ以上を所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
 
+  <notification name="ConfirmObjectDeleteNoOwn">選択したアイテムの１つ以上を所有していません。
+  
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoCopy">
-		少なくとも 1 つのオブジェクトがロックされています。
-少なくとも 1 つのオブジェクトがコピーできません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteLockNoCopy">少なくとも１つのオブジェクトがロックされています。
+少なくとも１つのオブジェクトがコピーできません。
 
 本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoOwn">
-		1 つ以上のオブジェクトがロックされました。
-1 つ以上のオブジェクトを所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteLockNoOwn">１つ以上のオブジェクトがロックされました。
+１つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		1 つ以上のオブジェクトがコピーできません。
-1 つ以上のオブジェクトを所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteNoCopyNoOwn">１つ以上のオブジェクトがコピーできません。
+１つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		1 つ以上のオブジェクトがロックされています。
-1 つ以上のオブジェクトがコピーできません。
-1 つ以上のオブジェクトを所有していません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectDeleteLockNoCopyNoOwn">１つ以上のオブジェクトがロックされています。
+１つ以上のオブジェクトがコピーできません。
+１つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeLock">
-		少なくとも 1 つのオブジェクトがロックされています。
-
-本当にこのまま取得を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeNoOwn">
-		取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
-あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。
-そのため、将来、修正やコピーの能力が制限される可能性があります。
-
-本当にこのまま取得を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeLockNoOwn">
-		少なくとも 1 つのオブジェクトがロックされています。
-取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
-あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectTakeLock">少なくとも１つのオブジェクトがロックされています。
+  
+本当にこのまま取得を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectTakeNoOwn">取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
+あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。そのため、将来、修正やコピーの能力が制限される可能性があります。
+
+本当にこのまま取得を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmObjectTakeLockNoOwn">少なくとも１つのオブジェクトがロックされています。
+取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。
 そのため、将来、編集やコピーの能力が制限される可能性があります。
-この選択内容のままで続行することは可能ですが、
 
-本当にこのまま取得を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="CantBuyLandAcrossMultipleRegions">複数のリージョンが選択されたため、土地を購入できません。
+この選択内容のままで続行することは可能ですが、本当にこのまま取得を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantBuyLandAcrossMultipleRegions">複数のリージョンが選択されたため、土地を購入できません。
+選択する面積を小さくしてもう一度試してください。
+    <tag>fail</tag>
+  </notification>
 
-選択する面積を小さくしてもう一度試してください。</notification>
-	<notification name="DeedLandToGroup">
-		この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
+  <notification name="DeedLandToGroup">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
 土地の購入価格は所有者に返金されません。譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 
-この [AREA] m² の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeedLandToGroupWithContribution">
-		この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
-譲渡には同時に [NAME] からグループへの土地の貢献が含まれます。土地の購入価格は所有者に返金されません。
+この[AREA]㎡の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DeedLandToGroupWithContribution">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
+譲渡には同時に [NAME]からグループへの土地の貢献が含まれます。土地の購入価格は所有者に返金されません。
 譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 
-この [AREA] m² の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DisplaySetToSafe">-safe オプションを指定したので、
-表示設定はセーフレベルに設定されています。</notification>
-	<notification name="DisplaySetToRecommendedGPUChange">グラフィックの変更により、画面設定は推奨レベルに設定されました。
-'[LAST_GPU]' から
-'[THIS_GPU]' まで</notification>
-	<notification name="DisplaySetToRecommendedFeatureChange">レンダリングサブシステムの変更により、画面設定は推奨レベルに設定されました。</notification>
-	<notification name="ErrorMessage">
-		[ERROR_MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AvatarMovedDesired">目的地は現在ご利用いただけません。
-近くのリージョンに移動しました。</notification>
-	<notification name="AvatarMovedLast">リクエストされた場所は現在ご利用いただけません。
-近くのリージョンに移動しました。</notification>
-	<notification name="AvatarMovedHome">ホームロケーションは現在ご利用いただけません。
+この[AREA]㎡の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DisplaySetToSafe">-safe オプションを指定したので、表示設定はセーフレベルに設定されています。</notification>
+
+  <notification name="DisplaySetToRecommendedGPUChange">グラフィックの変更により、画面設定は推奨レベルに設定されました。
+「[LAST_GPU]」から
+「[THIS_GPU]」まで</notification>
+
+  <notification name="DisplaySetToRecommendedFeatureChange">レンダリングサブシステムの変更により、画面設定は推奨レベルに設定されました。</notification>
+
+  <notification name="ErrorMessage">
+[ERROR_MESSAGE]
+    <unique>
+      <context>ERROR_MESSAGE</context>
+    </unique>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AvatarMovedDesired">目的地は現在ご利用いただけません。
+近くのリージョンに移動しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarMovedLast">リクエストされた場所は現在ご利用いただけません。
+近くのリージョンに移動しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarMovedHome">ホームロケーションは現在ご利用いただけません。
 近くのリージョンに移動しました。
-新たにホームを設定し直す必要があるかもしれません。</notification>
-	<notification name="ClothingLoading">
-		現在衣類をダウンロード中です。
-このまま [SECOND_LIFE] を通常通りご使用いただけます。他人からはあなたは正しく表示されます。
-		<form name="form">
-			<ignore name="ignore" text="衣類がダウンロードされるまで時間がかかっているとき"/>
-		</form>
-	</notification>
-	<notification name="AgentComplexityWithVisibility">
-		あなたの [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] は [AGENT_COMPLEXITY] です。
+新たにホームを設定し直す必要があるかもしれません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ClothingLoading">現在服装をダウンロード中です。
+このまま[SECOND_LIFE]を通常通りご使用いただけます。他人からはあなたは正しく表示されます。
+    <form name="form">
+      <ignore name="ignore" text="服装がダウンロードされるまで時間がかかっているとき" />
+    </form>
+  </notification>
+
+  <notification name="AgentComplexityWithVisibility">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
 [OVERLIMIT_MSG]
-		<usetemplate ignoretext="アバターの複雑度が高すぎる場合は警告する" name="notifyignore"/>
-	</notification>
-	<notification name="AgentComplexity">
-		あなたの [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] は [AGENT_COMPLEXITY] です。
-		<usetemplate ignoretext="アバターの複雑さの変更について警告する" name="notifyignore"/>
-	</notification>
-	<notification name="HUDComplexityWarning">
-		[HUD_REASON]、パフォーマンスに悪影響を与える恐れがあります。
-		<usetemplate ignoretext="HUD が複雑すぎる場合はお知らせください" name="notifyignore"/>
-	</notification>
-	<notification name="FirstRun">
-		[APP_NAME] のインストールが完了しました。
-
-[SECOND_LIFE] を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
-		<usetemplate name="okcancelbuttons" notext="続行" yestext="アカウントを作成..."/>
-	</notification>
-	<notification name="LoginPacketNeverReceived">
-		接続がなかなかできません。 お使いのインターネット接続か、[SECOND_LIFE_GRID] の問題と考えられます。
-
-インターネット接続を確認してから数分後に再接続するか、ヘルプをクリックして [SUPPORT_SITE] をご覧になるか、テレポートをクリックしてホームに移動してみてください。
-		<url name="url">http://jp.secondlife.com/support/</url>
-		<form name="form">
-			<button name="OK" text="OK"/>
-			<button name="Help" text="ヘルプ"/>
-			<button name="Teleport" text="テレポート"/>
-		</form>
-	</notification>
-	<notification name="WelcomeChooseSex">
-		まもなくあなたのアバターが表示されます。
-
-矢印キーを使用して歩きます。
-ヘルプが必要なときや [SECOND_LIFE] について知りたいときは、
-F1 キーを押してください。
-男性あるいは女性のアバターを選択してください。
-あなたの決定は後で変更できます。
-		<usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/>
-	</notification>
-	<notification name="CantTeleportToGrid">
-		現在のグリッド（[CURRENT_GRID]）とはグリッド（[GRID]）が異なるため、[SLURL] にテレポートできませんでした。   ビューワを閉じてからもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GeneralCertificateError">
-		サーバーに接続できませんでした。
+    <unique combine="cancel_old">
+      <context>AgentComplexityNotice</context>
+    </unique>
+    <usetemplate ignoretext="アバターの複雑度が高すぎる場合の警告" name="notifyignore" />
+  </notification>
+
+  <notification name="AgentComplexity">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
+    <unique combine="cancel_old">
+      <context>AgentComplexityNotice</context>
+    </unique>
+    <usetemplate ignoretext="アバターの複雑さの変更についての警告" name="notifyignore" />
+  </notification>
+
+  <notification name="HUDComplexityWarning">[HUD_REASON]
+このため、パフォーマンスに悪影響を与える恐れがあります。
+    <unique combine="cancel_old">
+      <context>HUDComplexityWarning</context>
+    </unique>
+    <usetemplate ignoretext="ＨＵＤが複雑すぎる場合の警告" name="notifyignore" />
+  </notification>
+
+  <notification name="FirstRun">[APP_NAME]のインストールが完了しました。
+[SECOND_LIFE]を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="続行" yestext="アカウントを作成…" />
+  </notification>
+
+  <notification name="LoginCantRemoveUsername">すでに記憶されているユーザーは「私」メニューの「初期設定」＞「拡張設定」＞「記憶されたユーザー名」から削除することができます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LoginCantRemoveCurUsername">ログインしているユーザーを忘れた場合は、ログアウトする必要があります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Confirm and log out"/>
+  </notification>
+
+  <notification name="LoginPacketNeverReceived">接続に時間がかかっております。お使いのインターネット接続か、[SECOND_LIFE_GRID]の問題と考えられます。
+
+インターネット接続を確認してから数分後に再接続するか、ヘルプをクリックして [SUPPORT_SITE]をご覧になるか、テレポートをクリックしてホームに移動してみてください。
+    <tag>fail</tag>
+    <url name="url">https://support.secondlife.com/</url>
+    <form name="form">
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Help" text="ヘルプ" />
+      <button name="Teleport" text="テレポート" />
+    </form>
+  </notification>
+
+  <notification name="WelcomeChooseSex">まもなく、あなたのアバターが表示されます。矢印キーを使用して歩きます。
+ヘルプが必要なときや、[SECOND_LIFE]について知りたいときは、Ｆ１キーを押してください。
+男性あるいは女性のアバターを選択してください。この設定は後で変更できます。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="女性" yestext="男性" />
+  </notification>
+  <notification name="CantTeleportToGrid">現在のグリッド（[CURRENT_GRID]）とはグリッド（[GRID]）が異なるため、[SLURL] にテレポートできませんでした。ビューアーを閉じてからもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GeneralCertificateErrorShort">サーバーに接続できませんでした。
 [REASON]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
 
-サブジェクト名： [SUBJECT_NAME_STRING]
-発行元： [ISSUER_NAME_STRING]
-有効日： [VALID_FROM]
-次の更新日： [VALID_TO]
-MD5 フィンガープリント： [SHA1_DIGEST]
-SHA1 フィンガープリント： [MD5_DIGEST]
-キー使用法： [KEYUSAGE]
-拡張キー使用法： [EXTENDEDKEYUSAGE]
-サブジェクトキー認識別子： [SUBJECTKEYIDENTIFIER]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TrustCertificateError">
-		このサーバーの認証機関は不明です。
+  <notification name="GeneralCertificateError">サーバーに接続できませんでした。
+[REASON]
 
+サブジェクト名：[SUBJECT_NAME_STRING]
+発行元：[ISSUER_NAME_STRING]
+有効日：[VALID_FROM]
+次の更新日：[VALID_TO]
+ＭＤ５フィンガープリント：[SHA1_DIGEST]
+ＳＨＡ１フィンガープリント：[MD5_DIGEST]
+キー使用法：[KEYUSAGE] 
+拡張キー使用法：[EXTENDEDKEYUSAGE]
+サブジェクトキー認識別子：[SUBJECTKEYIDENTIFIER]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TrustCertificateError">このサーバーの認証機関は不明です。
 認証情報：
-サブジェクト名： [SUBJECT_NAME_STRING]
-発行元： [ISSUER_NAME_STRING]
-有効日： [VALID_FROM]
-次の更新日： [VALID_TO]
-MD5 フィンガープリント： [SHA1_DIGEST]
-SHA1 フィンガープリント： [MD5_DIGEST]
-キー使用法： [KEYUSAGE]
-拡張キー使用法： [EXTENDEDKEYUSAGE]
-サブジェクトキー認識別子： [SUBJECTKEYIDENTIFIER]
+　サブジェクト名：[SUBJECT_NAME_STRING]
+　発行元：[ISSUER_NAME_STRING]
+　有効日：[VALID_FROM]
+　次の更新日：[VALID_TO]
+　ＭＤ５フィンガープリント：[SHA1_DIGEST] 
+　ＳＨＡ１フィンガープリント：[MD5_DIGEST]
+　キー使用法：[KEYUSAGE] 
+　拡張キー使用法：[EXTENDEDKEYUSAGE] 
+　サブジェクトキー認識別子：[SUBJECTKEYIDENTIFIER] 
 
 この認証局を信頼しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="信用する"/>
-	</notification>
-	<notification name="NotEnoughCurrency">[NAME] L$[PRICE] 残高不足のため実行不可です。</notification>
-	<notification name="GrantedModifyRights">[NAME] は、あなたにオブジェクトの編集権限を与えました。</notification>
-	<notification name="RevokedModifyRights">[NAME] のオブジェクトを編集する権限は取り消されました。</notification>
-	<notification name="FlushMapVisibilityCaches">
-		このリージョンの地図のキャッシュを消去します。
-デバッグ目的のみに便利な操作です。
-（作成中は 5 分間経つと、全員の地図が再度ログイン後に更新されます）
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyOneObjectOnly">一度に 1 つ以上のオブジェクトを買うことはできません。  オブジェクトを 1 つだけ選んでもう一度お試しください。</notification>
-	<notification name="OnlyCopyContentsOfSingleItem">
-		一度に複数のアイテムの中身をコピーできません。
-オブジェクトを 1 つだけ選択して、もう一度お試しください。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="KickUsersFromRegion">
-		このリージョンにいる全ての住人をホームにテレポートしますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ChangeObjectBonusFactor">
-		地域（リージョン）内でビルドが確立された後にオブジェクトボーナスを下げると、オブジェクトが返されたり、削除されたりします。本当にオブジェクトボーナスを変更しますか?
-		<usetemplate ignoretext="オブジェクトボーナス係数の変更を確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="EstateObjectReturn">
-		[USER_NAME] が所有しているオブジェクトを返却しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="InvalidTerrainBitDepth">地域テクスチャを設定できませんでした：
-地形テクスチャ[TEXTURE_NUM]は、無効のビット深度[TEXTURE_BIT_DEPTH]です。
-
-テクスチャ[TEXTURE_NUM]を24ビット512x512かそれ以下のイメージと交換し、「適用」を再度クリックしてください。</notification>
-	<notification name="InvalidTerrainSize">地域テクスチャを設定できませんでした：
-地形テクスチャ「 [TEXTURE_NUM] 」は、[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] では大きすぎます。
-
-「 [TEXTURE_NUM] 」を 24 ビット 512x512 かそれ以下のイメージと交換し、「適用」を再度クリックしてください。</notification>
-	<notification name="RawUploadStarted">アップロードを開始しました。 接続速度によっては、最大 2 分間かかります。</notification>
-	<notification name="ConfirmBakeTerrain">
-		現在の地形を構築しようとしています。
-この操作を行うと、現在の地形が上昇・下降の制限範囲の中心となり、「復元」ツールのデフォルトになります。
-操作を続行しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmTextureHeights">
-		使用しようとしている隆起範囲の低い値は高い値よりも大きくなっています。それでも続けますか？
-		<usetemplate canceltext="聞かないでください" name="yesnocancelbuttons" notext="取り消し" yestext="Ok"/>
-	</notification>
-	<notification name="MaxAllowedAgentOnRegion">許可住人は [MAX_AGENTS] 人までです。</notification>
-	<notification name="MaxBannedAgentsOnRegion">禁止住人は [MAX_BANNED] 人までです。</notification>
-	<notification name="MaxAgentOnRegionBatch">[NUM_ADDED] 個のエージェントを追加しようとして失敗しました： [MAX_AGENTS] [LIST_TYPE] 制限を [NUM_EXCESS] 個超過しています。</notification>
-	<notification name="MaxAllowedGroupsOnRegion">
-		許可グループは [MAX_GROUPS] グループまでです。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="構築する"/>
-	</notification>
-	<notification name="MaxManagersOnRegion">不動産マネージャーは [MAX_MANAGER] 人までです。</notification>
-	<notification name="OwnerCanNotBeDenied">不動産オーナーを不動産の「禁止住人」リストに追加できません。</notification>
-	<notification name="ProblemAddingEstateManagerBanned">追放された住人を不動産管理者リストに追加できません。</notification>
-	<notification name="ProblemBanningEstateManager">禁止リストに不動産マネージャー [AGENT] を追加できません。</notification>
-	<notification name="GroupIsAlreadyInList">&lt;nolink&gt;[GROUP]&lt;/nolink&gt; はすでに許可されたグループのリストに追加されています。</notification>
-	<notification name="AgentIsAlreadyInList">[AGENT] はすでにあなたの [LIST_TYPE] リストに追加されています。</notification>
-	<notification name="AgentsAreAlreadyInList">[AGENT] はすでにあなたの [LIST_TYPE] リストに追加されています。</notification>
-	<notification name="AgentWasAddedToList">[AGENT] が [ESTATE] の [LIST_TYPE] リストに追加されました。</notification>
-	<notification name="AgentsWereAddedToList">[AGENT] が [ESTATE] の [LIST_TYPE] リストに追加されました。</notification>
-	<notification name="AgentWasRemovedFromList">[AGENT] が [ESTATE] の [LIST_TYPE] リストから削除されました。</notification>
-	<notification name="AgentsWereRemovedFromList">[AGENT] が [ESTATE] の [LIST_TYPE] リストから削除されました。</notification>
-	<notification name="CanNotChangeAppearanceUntilLoaded">衣類およびシェイプが読み込まれるまでは、容姿の変更はできません。</notification>
-	<notification name="ClassifiedMustBeAlphanumeric">クラシファイド広告の名前は、アルファベットか数字で始めます。句読点では始められません。</notification>
-	<notification name="CantSetBuyObject">オブジェクトが販売対象ではないため、オブジェクトの購入ができません。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="信用する" />
+  </notification>
+
+  <notification name="NotEnoughCurrency">[NAME]は、L$ [PRICE]残高不足のため実行不可です。
+    <tag>fail</tag>
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="GrantedModifyRights">[NAME]は、あなたにオブジェクトの編集権限を与えました。</notification>
+
+  <notification name="RevokedModifyRights">[NAME]は、オブジェクトを編集する権限を取り消されました。</notification>
+
+  <notification name="FlushMapVisibilityCaches">このリージョンのマップのキャッシュを消去します。デバッグ目的のみに便利な操作です。
+（作成中は５分経過すると、全員のマップが再度ログイン後に更新されます）
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyOneObjectOnly">一度に１つ以上のオブジェクトを買うことはできません。オブジェクトを１つだけ選んでもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OnlyCopyContentsOfSingleItem">一度に複数のアイテムの中身をコピーできません。
+オブジェクトを１つだけ選択して、もう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="KickUsersFromRegion">このリージョンにいる全ての住人をホームにテレポートさせますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChangeObjectBonusFactor">リージョン（地域）のオブジェクトボーナスを下げると、制作されたオブジェクトが返却されたり、削除されます。本当にオブジェクトボーナスを変更してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトボーナス係数変更の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateObjectReturn">[USER_NAME]が、所有しているオブジェクトを返却しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="InvalidTerrainBitDepth">地域テクスチャを設定できませんでした：
+地形テクスチャ「[TEXTURE_NUM]」は、無効なビット深度（[TEXTURE_BIT_DEPTH]ビット）です。
+
+テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。</notification>
+
+  <notification name="InvalidTerrainSize">地域テクスチャを設定できませんでした：
+地形テクスチャ「[TEXTURE_NUM]」は、[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] では大きすぎます。
+
+テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。</notification>
+
+  <notification name="RawUploadStarted">アップロードを開始しました。接続速度によっては、最大２分程度かかります。</notification>
+
+  <notification name="ConfirmBakeTerrain">現在の地形を構築しようとしています。この操作を行うと現在の地形が、土地の隆起と沈降の制限範囲の基準となり、「復元」ツールのデフォルトになります。操作を続行しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmTextureHeights">標高範囲に、最高値よりも大きい値を最低値にしようとしています。このまま続行してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="聞かないでください" name="yesnocancelbuttons" notext="キャンセル" yestext="Ok" />
+  </notification>
+
+  <notification name="MaxAllowedAgentOnRegion">許可できる住人は、[MAX_AGENTS]人までです。</notification>
+
+  <notification name="MaxBannedAgentsOnRegion">バンできる住人は、[MAX_BANNED]人までです。</notification>
+
+  <notification name="MaxAgentOnRegionBatch">[NUM_ADDED]人のエージェントを追加しようとして失敗しました：[MAX_AGENTS]
+[LIST_TYPE]人中[NUM_EXCESS]人超過しています。</notification>
+
+  <notification name="MaxAllowedGroupsOnRegion">許可グループは、[MAX_GROUPS]グループまでです。
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="構築する" />
+  </notification>
+
+  <notification name="MaxManagersOnRegion">不動産マネージャーは、[MAX_MANAGER]人までです。</notification>
+
+  <notification name="OwnerCanNotBeDenied">不動産所有者を不動産の「バンした住人」リストに追加することはできません。</notification>
+
+  <notification name="ProblemAddingEstateManagerBanned">「バンした住人」を不動産管理者リストに追加することはできません。</notification>
+
+  <notification name="ProblemBanningEstateManager">「バンした住民」リストに不動産マネージャー[AGENT]を追加することはできません。</notification>
+
+  <notification name="GroupIsAlreadyInList">「&lt;nolink&gt;[GROUP]&lt;/nolink&gt;」は、すでに許可されたグループのリストに追加されています。</notification>
+
+  <notification name="AgentIsAlreadyInList">[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。</notification>
+
+  <notification name="AgentsAreAlreadyInList">[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。</notification>
+
+  <notification name="AgentWasAddedToList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。</notification>
+
+  <notification name="AgentsWereAddedToList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。</notification>
+
+  <notification name="AgentWasRemovedFromList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。</notification>
+
+  <notification name="AgentsWereRemovedFromList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。</notification>
+
+  <notification name="CanNotChangeAppearanceUntilLoaded">服装およびシェイプが読み込まれるまでは、容姿の変更はできません。</notification>
+
+  <notification name="ClassifiedMustBeAlphanumeric">クラシファイド広告の名前は、アルファベットか数字で始めます。句読点から始めることはできません。</notification>
+
+  <notification name="CantSetBuyObject">オブジェクトが販売対象ではないため、オブジェクトの購入ができません。
 販売対象のオブジェクトを指定してもう一度試してください。</notification>
-	<notification name="FinishedRawDownload">未加工の地形ファイルをダウンロードしました：
-[DOWNLOAD_PATH]</notification>
-	<notification name="RequiredUpdate">
-		ログインするには、バージョン [VERSION] が必要です。
-https://secondlife.com/support/downloads/ からダウンロードしてください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PauseForUpdate">
-		ログインするには、バージョン [VERSION] が必要です。
-[OK] をクリックして、ダウンロードとインストールを開始します。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OptionalUpdateReady">
-		バージョン [VERSION] のダウンロードが完了し、インストールの準備ができました。
-[OK] をクリックして、インストールを開始します。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PromptOptionalUpdate">
-		バージョン [VERSION] のダウンロードが完了し、インストールの準備ができました。
-続けますか？
-		<usetemplate canceltext="あとで" name="yesnocancelbuttons" notext="スキップ" yestext="インストール"/>
-	</notification>
-	<notification name="LoginFailedUnknown">
-		申し訳ありませんが、不明な理由によってログインに失敗しました。このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
-		<usetemplate name="okbutton" yestext="終了"/>
-	</notification>
-	<notification name="DeedObjectToGroup">
-		このオブジェクトを譲渡するとグループは以下のことが可能です：
-* オブジェクトに支払われた L$ を受領します。
-		<usetemplate ignoretext="オブジェクトをグループに譲渡する前の確認" name="okcancelignore" notext="取り消し" yestext="譲渡"/>
-	</notification>
-	<notification name="WebLaunchExternalTarget">
-		Web ブラウザを開いてこのコンテンツを表示しますか？
-		<usetemplate ignoretext="ブラウザを起動して Web ページを見るとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchJoinNow">
-		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウントを管理しますか？
-		<usetemplate ignoretext="ブラウザを起動してアカウントを管理するとき" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchSecurityIssues">
-		[SECOND_LIFE] Wiki で、セキュリティ問題を報告する方法をご覧ください。
-		<usetemplate ignoretext="ブラウザを起動してセキュリティ問題の報告の仕方を確認するとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchQAWiki">
-		[SECOND_LIFE] 品質保証関連 Wiki をご覧ください。
-		<usetemplate ignoretext="ブラウザを起動して QA Wiki を見るとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchPublicIssue">
-		[SECOND_LIFE] のパブリック問題トラッカーで、
-バグやその他の問題を報告できます。
-		<usetemplate ignoretext="ブラウザを起動してパブリック問題トラッカーを使用するとき" name="okcancelignore" notext="キャンセル" yestext="ページへ行く"/>
-	</notification>
-	<notification name="WebLaunchSupportWiki">
-		Linden 公式ブログで、最新のニュースや情報を入手してください。
-		<usetemplate ignoretext="ブラウザを起動して公式ブログを見るとき" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchLSLGuide">
-		スクリプトガイドを開きますか？
-		<usetemplate ignoretext="ブラウザを起動してスクリプトガイドを見るとき" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchLSLWiki">
-		LSL ポータルでスクリプトに関する情報を確認しますか？
-		<usetemplate ignoretext="ブラウザを起動して LSL ポータルを見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
-	</notification>
-	<notification name="ReturnToOwner">
-		選択したオブジェクトを、所有者に返却しますか？
-「再販・プレゼント可」の譲渡されたオブジェクトは、以前の所有者に返却されます。
-
-*警告*　「再販・プレゼント不可」の譲渡されたオブジェクトは、削除されます！
-		<usetemplate ignoretext="オブジェクトを所有者に返却する前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GroupLeaveConfirmMember">
-		現在、あなたは &lt;nolink&gt;[GROUP]&lt;/nolink&gt; グループのメンバーです。
-グループから脱退しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">グループ「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」を抜けました。</notification>
-	<notification name="OwnerCannotLeaveGroup">
-		グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepartError">
-		グループを抜けることができません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmKick">
-		本当に住人全員をグリッドから追い出しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/>
-	</notification>
-	<notification name="MuteLinden">
-		リンデンをブロックすることはできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotStartAuctionAlreadyForSale">既に売り出し中の区画なのでオークションにかけることはできません。  オークションにかけたい場合は売り出し設定を解除してから行ってください。</notification>
-	<notification label="名前でのオブジェクトのブロックに失敗しました" name="MuteByNameFailed">
-		この名前は既にブロック済みです。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RemoveItemWarn">
-		コンテンツを削除すると、許可があってもオブジェクトに損傷を与えることがあります。
-削除を続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="CantOfferCallingCard">
-		現在コーリングカードを送れません。数分後にもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CantOfferFriendship">
-		現在フレンドシップを送れません。数分後にもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="DoNotDisturbModeSet">
-		着信拒否がオンになっています。着信する通信が通知されません。
-
-- 他の住人は「着信拒否」応答を受け取ります (「環境設定」 &gt; 「一般」で設定)。
-- 音声通話は拒否されます。
-		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="JoinedTooManyGroupsMember">
-		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
-[NAME] があなたをグループのメンバーとして勧誘しています。
-		<usetemplate name="okcancelbuttons" notext="辞退" yestext="参加"/>
-	</notification>
-	<notification name="JoinedTooManyGroups">
-		加入できるグループの最大限に達しました。 新しくグループに参加、または作成する前に、どれかグループから抜けてください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupLimitInfo">
-		ベーシック会員の住民は、最大 [MAX_BASIC] グループまで参加することができます。
-プレミアム会員は、最大 [MAX_PREMIUM] まで可能です。[https://secondlife.com/my/account/membership.php? 詳細、またはアップグレード]
-		<usetemplate name="okbutton" yestext="閉じる"/>
-	</notification>
-	<notification name="GroupLimitInfoPlus">
-		ベーシック会員の住人は最大 [MAX_BASIC] までグループに参加できます。
-プレミアム会員は最大 [MAX_PREMIUM] です。プレミアムプラス会員
-は最大 [MAX_PREMIUM_PLUS] です。 [https://secondlife.com/my/account/membership.php? 詳細またはアップグレード]
-		<usetemplate name="okbutton" yestext="閉じる"/>
-	</notification>
-	<notification name="KickUser">
-		どのようなメッセージを添えてこの住人を追い出しますか？
-		<form name="form">
-			<input name="message">あなたは管理者によりログオフされました。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="KickAllUsers">
-		どのようなメッセージをつけてグリッドにいる全員を追い出しますか？
-		<form name="form">
-			<input name="message">あなたは管理者によりログオフされました。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="FreezeUser">
-		どのようなメッセージを添えてこの住人をフリーズしますか？
-		<form name="form">
-			<input name="message">あなたはフリーズされています。 動くこともチャットすることもできません。 管理者が IM であなたに連絡します。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="UnFreezeUser">
-		どのようなメッセージを添えてこの住人のフリーズを解除しますか？
-		<form name="form">
-			<input name="message">もうフリーズされていません。</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="SetDisplayNameSuccess">[DISPLAY_NAME] さん、
-
-現実の世界と同じく、Second Life でも新しい名前が浸透するには時間がかかります。オブジェクト、スクリプト、検索などで名前が更新されるまでに（[http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update]）数日かかりますのでご了承ください。</notification>
-	<notification name="SetDisplayNameBlocked">申し訳ありませんが、現在表示名は変更できません。システムのエラーだと思われる場合は、サポートにお問い合わせください。</notification>
-	<notification name="SetDisplayNameFailedLength">申し訳ありませんが、その名前は長すぎます。表示名は最長 [LENGTH] 文字までです。
+
+  <notification name="FinishedRawDownload">未加工の地形ファイルをダウンロードしました：[DOWNLOAD_PATH]</notification>
+
+  <notification name="RequiredUpdate">ログインするには、バージョン[VERSION]が必要です。以下からダウンロードしてください。
+https://secondlife.com/support/downloads/
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+  <notification name="PauseForUpdate">ログインするには、バージョン[VERSION]が必要です。
+リリースノート：[URL]
+
+OKをクリックして、ダウンロードとインストールを開始します。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OptionalUpdateReady">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
+リリースノート：[URL]
+
+ＯＫをクリックして、ダウンロードとインストールを開始します。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PromptOptionalUpdate">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
+リリースノート：[URL]
+
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="あとで" name="yesnocancelbuttons" notext="スキップ" yestext="インストール" />
+  </notification>
+
+  <notification name="LoginFailedUnknown">申し訳ありませんが、不明な理由によってログインに失敗しました。
+このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="終了" />
+  </notification>
+
+  <notification name="DeedObjectToGroup">このオブジェクトを譲渡するとグループは以下のことが可能です：
+・オブジェクトに支払われたL$を受領します。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトをグループに譲渡する前の確認" name="okcancelignore" notext="キャンセル" yestext="譲渡する" />
+  </notification>
+
+  <notification name="WebLaunchExternalTarget">Webブラウザを開いてこのコンテンツを表示しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、Webページを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchJoinNow">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]ページに移動してアカウントを管理しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、アカウントを管理するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchSecurityIssues">[SECOND_LIFE] Wikiで、セキュリティ問題を報告する方法をご覧ください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、セキュリティ問題の報告方法を確認するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchQAWiki">[SECOND_LIFE] QA（品質保証）Wikiをご覧ください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、QA Wikiを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchPublicIssue">[SECOND_LIFE] Public Issue Trackerにアクセスして、バグやその他の問題を報告できます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、Public Issue Trackerにアクセスするとき" name="okcancelignore" notext="キャンセル" yestext="ページへ行く" />
+  </notification>
+
+  <notification name="WebLaunchSupportWiki">Linden公式ブログで、最新のニュースや情報を入手してください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、公式ブログを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchLSLGuide">スクリプトガイドを開きますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して、スクリプトガイドを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="WebLaunchLSLWiki">LSLポータルでスクリプトに関する情報を確認しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動して LSL ポータルを見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動" />
+  </notification>
+  <notification name="ReturnToOwner">選択したオブジェクトを、所有者に返却しますか？「再販・譲渡可」の譲渡されたオブジェクトは、以前の所有者に返却されます。
+
+*警告*「再販・譲渡不可」の譲渡されたオブジェクトは、削除されます！
+    <tag>confirm</tag>
+    <usetemplate ignoretext="オブジェクトを所有者に返却するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupLeaveConfirmMember">現在、あなたは &lt;nolink&gt;[GROUP]&lt;/nolink&gt;グループのメンバーです。グループから脱退しますか？
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupDepart">グループ「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」から抜けました。</notification>
+  <notification name="OwnerCannotLeaveGroup">グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupDepartError">グループを抜けることができません。
+    <tag>group</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmKick">本当に住人全員をグリッドから追い出してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す" />
+  </notification>
+
+  <notification name="MuteLinden">リンデンをブロックすることはできません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CannotStartAuctionAlreadyForSale">既に売り出し中の区画なので、オークションにかけることはできません。
+オークションにかけたい場合は、売り出し設定を解除してから行ってください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="名前でのオブジェクトのブロックに失敗しました" name="MuteByNameFailed">この名前は既にブロック済みです。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RemoveItemWarn">コンテンツを削除すると、許可があってもオブジェクトに損傷を与えることがあります。削除を続けてもよろしいですか？
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantOfferCallingCard">現在コーリングカードを送れません。数分後にもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantOfferFriendship">現在フレンド申請を送れません。数分後にもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DoNotDisturbModeSet">「着信拒否」がオンになっています。通信の受信は通知されません。
+  
+・他の居住者はあなたの「着信拒否」応答を受け取ります。（「初期設定」＞「全般」で設定）
+・音声通話は拒否されます。
+    <usetemplate ignoretext="ログイン状態を「着信拒否」モードに変更したとき" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="JoinedTooManyGroupsMember">グループの最大数に達しました。このグループに参加する前に別のグループから退会するか、オファーを断ってください。
+[NAME]さんが、あなたをグループのメンバーに参加するよう招待しました。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okcancelbuttons" notext="辞退" yestext="参加" />
+  </notification>
+
+  <notification name="JoinedTooManyGroups">グループの最大数に達しました。新しいグループに参加、作成する前に、グループから退出してください。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="GroupLimitInfo">ベーシック会員の住民は、最大[MAX_BASIC]個のグループまで参加することができます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード] 
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="閉じる" />
+  </notification>
+
+  <notification name="GroupLimitInfoPlus">ベーシック会員の住人は、最大[MAX_BASIC]個までグループに参加できます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。プレミアム・プラス会員は最大[MAX_PREMIUM_PLUS]個です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード]
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="閉じる" />
+  </notification>
+
+  <notification name="KickUser">どのようなメッセージを添えて、この住人を追い出しますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">あなたは管理者によりログオフされました。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="KickAllUsers">どのようなメッセージをつけて、グリッドにいる全員を追い出しますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">あなたは管理者によりログオフされました。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="FreezeUser">どのようなメッセージを添えて、この住人をフリーズしますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">あなたはフリーズされています。動くこともチャットすることもできません。管理者がＩＭであなたに連絡します。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="UnFreezeUser">どのようなメッセージを添えて、この住人のフリーズを解除しますか？
+    <tag>win</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">もうフリーズされていません。</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+  <notification name="SetDisplayNameSuccess">[DISPLAY_NAME]さん、
+
+現実の世界と同じく、Second Lifeでも新しい名前が浸透するには時間がかかります。
+[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC%E5%90%8D%E3%81%A8%E8%A1%A8%E7%A4%BA%E5%90%8D-r1333/ ユーザー名と表示名]が、オブジェクトやスクリプト、検索結果などに更新されるまで、数日かかりますのでご了承ください。</notification>
+
+  <notification name="SetDisplayNameBlocked">申し訳ありませんが、現在表示名は変更できません。システムエラーと思われる場合は、サポートにお問い合わせください。</notification>
+
+  <notification name="SetDisplayNameFailedLength">申し訳ありませんが、その名前は長すぎます。表示名で使用できる文字数は、[LENGTH]文字までです。
 
 もう少し短い名前をお試しください。</notification>
-	<notification name="SetDisplayNameFailedGeneric">申し訳ありませんが、表示名を設定できませんでした。あとでもう一度お試しください。</notification>
-	<notification name="SetDisplayNameMismatch">入力した表示名が一致しません。もう一度入力してください。</notification>
-	<notification name="AgentDisplayNameUpdateThresholdExceeded">しばらくは表示名を変更できません。
-
-http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してください。
-
-あとでもう一度お試しください。</notification>
-	<notification name="AgentDisplayNameSetBlocked">申し訳ありませんが、リクエストされた名前は禁句を含むために設定できませんでした。
- 
-別の名前をお試しください。</notification>
-	<notification name="AgentDisplayNameSetInvalidUnicode">設定しようとする表示名には使えない文字が含まれます。</notification>
-	<notification name="AgentDisplayNameSetOnlyPunctuation">表示名には句読点以外の文字を含む必要があります。</notification>
-	<notification name="DisplayNameUpdate">[OLD_NAME] ([SLID]) は [NEW_NAME] に変更されました。</notification>
-	<notification name="OfferTeleport">
-		次のメッセージを添えて現在地にテレポートを送りますか？
-		<form name="form">
-			<input name="message">[REGION] に来ませんか？</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TooManyTeleportOffers">
-		[OFFERS] 回にわたってテレポートを送ろうとしましたが、
-それは限度数 [LIMIT] を超えています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OfferTeleportFromGod">
-		現在地に住人をゴッドサモンしますか？
-		<form name="form">
-			<input name="message">[REGION] に来ませんか？</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TeleportFromLandmark">
-		このまま &lt;nolink&gt;[LOCATION]&lt;/nolink&gt; にテレポートしますか？
-		<usetemplate ignoretext="ランドマークにテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportViaSLAPP">
-		このまま &lt;nolink&gt;[LOCATION]&lt;/nolink&gt; にテレポートしますか？
-		<usetemplate ignoretext="SLAPP でテレポートすることを確認" name="okcancelignore" notext="取り消し" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportToPick">
-		[PICK] にテレポートしますか？
-		<usetemplate ignoretext="ピックの場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportToClassified">
-		[CLASSIFIED] にテレポートしますか？
-		<usetemplate ignoretext="クラシファイド広告の場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification name="TeleportToHistoryEntry">
-		[HISTORY_ENTRY] にテレポートしますか？
-		<usetemplate ignoretext="履歴の場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
-	</notification>
-	<notification label="あなたの不動産内の全員にメッセージを送信" name="MessageEstate">
-		今あなたの不動産にいる人全員に送る、短いメッセージを入力してください。
-		<form name="form">
-			<input name="message"/>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="Lindenの不動産を変更" name="ChangeLindenEstate">
-		リンデンが所有するエステート（メインランド、ティーングリッド、オリエンテーションなど）を変更しようとしています。
-
-住人の体験に根本的に影響を与えるため、非常に危険な行為です。  メインランドでは、何千というリージョンが変更による影響を受け、そのためスペースサーバーに負担をかけることになります。
-
-それでも続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess">
-		あなたはリンデン所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）へのアクセスリストを変更しようとしています。
+
+  <notification name="SetDisplayNameFailedGeneric">申し訳ありませんが、表示名を設定できませんでした。あとでもう一度お試しください。</notification>
+
+  <notification name="SetDisplayNameMismatch">入力した表示名が一致しません。もう一度入力してください。
+    <tag>fail</tag>
+  </notification>
+
+  <!-- *NOTE: This should never happen -->
+  <notification name="AgentDisplayNameUpdateThresholdExceeded">申し訳ありませんが、表示名を変更できるようになるまで、さらに長く待つ必要があります。
+
+https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC%E5%90%8D%E3%81%A8%E8%A1%A8%E7%A4%BA%E5%90%8D-r1333/ を参照してください。
+
+あとでもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AgentDisplayNameSetBlocked">申し訳ありませんが、要求された名前には禁止ワードが含まれているため、設定できませんでした。
+
+別の名前をお試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AgentDisplayNameSetInvalidUnicode">設定しようとしている表示名に、使用できない文字が含まれます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AgentDisplayNameSetOnlyPunctuation">設定しようとしている表示名には、句読点以外の文字を含む必要があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DisplayNameUpdate">[OLD_NAME] ([SLID]) は、[NEW_NAME]に変更されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OfferTeleport">次のメッセージを使用して、あなたのいる場所へのテレポートのオファーしますか？
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[REGION]に来てみませんか？</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TooManyTeleportOffers">[OFFERS]回にわたってテレポートを送ろうとしましたが、限度数[LIMIT]を超えてしましました。
+    <tag>group</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OfferTeleportFromGod">現在地に住人をゴッド・サモンしますか？
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[REGION]に来てみませんか？</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TeleportFromLandmark">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ランドマークに指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportViaSLAPP">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="SLAPPからテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportToPick">[PICK]にテレポートしますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ピックに指定されてる場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportToClassified">[CLASSIFIED]にテレポートしますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="クラシファイド広告で指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification name="TeleportToHistoryEntry">[HISTORY_ENTRY]にテレポートしますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="履歴の場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
+  </notification>
+
+  <notification label="あなたの不動産にいる全員に送信するメッセージ" name="MessageEstate">今あなたの不動産にいる人全員に送る、短いメッセージを入力してください。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" />
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="Lindenの不動産を変更" name="ChangeLindenEstate">リンデンが所有する不動産（メインランド、ティーングリッド、オリエンテーションなど）を変更しようとしています。住人の体験に根本的に影響を与えるため、非常に危険な行為です。
+
+メインランドでは、何千というリージョンが変更による影響を受け、そのためスペースサーバーに負担をかけることになります。
+
+それでも続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess">あなたはリンデン所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）へのアクセスリストを変更しようとしています。
 
 この行為は「危険」であり、グリッドからオブジェクトやお金の転送をもたらすハッキングを引き起こす可能性があるため、完全にそれを意図した場合のみ行うべきものです。
+
 これにより多数のリージョン（地域）が変更され、スペースサーバーに悪影響が生じます。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedAgentAdd">
-		この不動産限定の許可リストに追加しますか？ それとも [ALL_ESTATES] の許可リストに追加しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedAgentRemove">
-		この不動産限定の許可リストから削除しますか？ それとも、[ALL_ESTATES] から削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedGroupAdd">
-		この不動産限定のグループ許可リストに追加しますか？ それとも [ALL_ESTATES] のグループ許可リストに追加しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedGroupRemove">
-		この不動産限定の許可リストから削除しますか？ それとも、[ALL_ESTATES] から削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBannedAgentAdd">
-		この不動産限定でアクセスを拒否しますか？ それとも [ALL_ESTATE] へのアクセスを拒否しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBannedAgentRemove">
-		この住人をこの不動産の立入禁止リストからのみ削除しますか？それとも [ALL_ESTATES] の立入禁止リストから削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateManagerAdd">
-		この不動産限定、または [ALL_ESTATES] の不動産マネージャーを追加しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateManagerRemove">
-		不動産マネージャーを、この不動産限定、または [ALL_ESTATES] から、削除しますか？
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedExperienceAdd">
-		この不動産の許可リストにのみ追加しますか、それとも [ALL_ESTATES] の許可リストに追加しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateAllowedExperienceRemove">
-		この不動産の許可リストからのみ削除しますか、それとも [ALL_ESTATES] の許可リストから削除しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBlockedExperienceAdd">
-		この不動産のブロックされたリストにのみ追加しますか、それとも [ALL_ESTATES] のブロックされたリストに追加しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateBlockedExperienceRemove">
-		この不動産のブロックされたリストからのみ削除しますか、それとも [ALL_ESTATES] のブロックされたリストから削除しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateTrustedExperienceAdd">
-		この不動産のキー リストにのみ追加しますか、それとも [ALL_ESTATES] のキー リストに追加しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="不動産を選択" name="EstateTrustedExperienceRemove">
-		この不動産のキーリストからのみ削除しますか、それとも [ALL_ESTATES] のキーリストから削除しますか?
-		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
-	</notification>
-	<notification label="キックを確認" name="EstateKickUser">
-		この不動産から [EVIL_USER] を追い出しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="EstateChangeCovenant">
-		不動産約款を変更しようとしています。続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="EstateParcelAccessOverride">
-		このオプションをオフにすると、嫌がらせの防止やプライバシーの維持、18 才以下の住人を Adult コンテンツから守るために区画所有者が加えた制限が解除される可能性があります。必要に応じて区画所有者と相談してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="EstateParcelEnvironmentOverride">
-		このオプションをオフにすると、区画所有者がその区画に加えたカスタム環境が削除されます。必要に応じて区画所有者と相談してください。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="RegionEntryAccessBlocked">
-		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SLM_UPDATE_FOLDER">[MESSAGE]</notification>
-	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
-		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="RegionEntryAccessBlocked_Notify">訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツ除外するように設定されています。</notification>
-	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="RegionEntryAccessBlocked_Change">
-		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、取り消すことができます。環境設定を変更した後、もう一度、地域（リージョン）に入ることができます。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button default="true" name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
-		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked">
-		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
-		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="テレポート：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_Notify">訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。</notification>
-	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
-		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
-		<form name="form">
-			<button name="OK" text="変更して続ける"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_Change">
-		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、テレポートを取り消すことができます。環境設定を変更した後、もう一度テレポートを実行する必要があります。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
-		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RegionTPSpecialUsageBlocked">
-		リージョンに入ることができません。'[REGION_NAME]' はスキル ゲーミング リージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキル ゲーミングのよくある質問] を参照してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PreferredMaturityChanged">
-		今後、[RATING] コンテンツ付きの地域（リージョン）を訪問しようとしているという通知を受け取りません。後でメニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、コンテンツの環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MaturityChangeError">
-		現在、[PREFERRED_MATURITY] コンテンツを表示するように環境設定を変更できませんでした。あなたの環境設定は、[ACTUAL_MATURITY] コンテンツを表示するようにリセットされました。メニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、もう一度環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked">
-		取得しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
-		この土地を購入できるのは、成人だけです。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="この土地を購入できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked_Notify">取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。</notification>
-	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">取得しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="LandClaimAccessBlocked_Change">
-		取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の取得を試みることができます。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="取得しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="LandBuyAccessBlocked">
-		購入しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
-		この土地を取得できるのは、成人だけです。
-		<url name="url">http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview</url>
-		<usetemplate ignoretext="この土地を取得できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
-	</notification>
-	<notification name="LandBuyAccessBlocked_Notify">購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。</notification>
-	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">購入しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。</notification>
-	<notification name="LandBuyAccessBlocked_Change">
-		購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の購入を試みることができます。
-		<form name="form">
-			<button name="OK" text="環境設定の変更"/>
-			<button name="Cancel" text="取り消し"/>
-			<ignore name="ignore" text="購入しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
-		</form>
-	</notification>
-	<notification name="TooManyPrimsSelected">
-		選択したプリムが多すぎます。  [MAX_PRIM_COUNT] 個選択するか、プリム数を減らしてもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TooManyScriptsSelected">
-		スクリプト内で選択されたオブジェクトが多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ProblemImportingEstateCovenant">
-		不動産約款のインポート時に問題が発生しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ProblemAddingEstateManager">新しい不動産マネージャーの追加に関する問題：
-いずれかの不動産のマネージャーリストが満杯になっています。</notification>
-	<notification name="ProblemAddingEstateBanManager">不動産所有者または管理者を禁止リストに追加できません。</notification>
-	<notification name="ProblemAddingEstateGeneric">不動産リストの追加に関する問題：
-いずれかの不動産のリストが満杯になっています。</notification>
-	<notification name="UnableToLoadNotecardAsset">
-		現在ノートカードのアセット ID を読み込むことができません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NotAllowedToViewNotecard">
-		要求したアセット ID に関するノートカードを閲覧するには、権限が不十分です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MissingNotecardAssetID">
-		ノートカード用のアセット ID がデータベースに登録されていません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PublishClassified">
-		注意：クラシファイド広告の料金は払い戻しされません。
-
-L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開しますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="SetClassifiedMature">
-		この広告に「Moderate」コンテンツは含まれていますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="SetGroupMature">
-		このグループに「Moderate」コンテンツが含まれていますか？
-		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification label="再起動を確認" name="ConfirmRestart">
-		このリージョンを 2 分後に再起動しようとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="このリージョンにメッセージを送信" name="MessageRegion">
-		このリージョンにいる人全員に送る短いメッセージを入力してください。
-		<form name="form">
-			<input name="message"/>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="地域のレーティング区分指定変更済み" name="RegionMaturityChange">
-		このリージョンのレーティング区分が変更されました。
-地図にこの変更が反映するには数分かかることがあります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">[APP_NAME] のこのバージョンは、このリージョンにおけるボイスチャットの互換性がありません。 ボイスチャットを正常に行うためには、[APP_NAME] のアップデートが必要です。</notification>
-	<notification label="オブジェクトを購入できません" name="BuyObjectOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
-単一のオブジェクトを選択し、もう一度試してください。</notification>
-	<notification label="コンテンツを購入できません" name="BuyContentsOneOnly">一度に複数のオブジェクトのコンテンツは購入できません。
-選択するオブジェクトを1つだけにして、もう一度試してください。</notification>
-	<notification label="コンテンツを購入できません" name="BuyContentsOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
-単一のオブジェクトを選択し、もう一度試してください。</notification>
-	<notification name="BuyOriginal">
-		オリジナルのオブジェクトを [OWNER] から L$ [PRICE] で購入しますか？
-購入すると、あなたがオブジェクトの所有者となります。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyOriginalNoOwner">
-		L$ [PRICE] でオリジナルのオブジェクトを購入しますか？
-購入すると、あなたがオブジェクトの所有者となります。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyCopy">
-		コピーを [OWNER] から L$ [PRICE] で購入しますか？
-購入したオブジェクトは、あなたのインベントリにコピーされます。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyCopyNoOwner">
-		L$ [PRICE] でコピーを購入しますか？
-購入したオブジェクトは、あなたのインベントリにコピーされます。
-可能な操作は、
-修正：[MODIFYPERM]、コピー：[COPYPERM]、
-再販・プレゼント：[RESELLPERM] です。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyContents">
-		中身を [OWNER] から L$ [PRICE] で購入しますか？
-購入した中身は、あなたのインベントリにコピーされます。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="BuyContentsNoOwner">
-		L＄ [PRICE] で中身を購入しますか？
-購入した中身は、あなたのインベントリにコピーされます。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmPurchase">
-		この取引は以下のとおり行われます：
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedAgentAdd">この不動産限定の許可リストに追加しますか？それとも、[ALL_ESTATES]の許可リストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedAgentRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES]から削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedGroupAdd">この不動産限定のグループ許可リストに追加しますか？それとも、[ALL_ESTATES]のグループ許可リストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedGroupRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES] から削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBannedAgentAdd">この不動産限定でアクセスを拒否しますか？それとも、[ALL_ESTATE]へのアクセスを拒否しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBannedAgentRemove">この住人をこの不動産のバンリストからのみ削除しますか？それとも、[ALL_ESTATES]のバンリストから削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateManagerAdd">この不動産限定、または[ALL_ESTATES]の不動産マネージャーを追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateManagerRemove">不動産マネージャーをこの不動産限定、または[ALL_ESTATES]から削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedExperienceAdd">この不動産の許可リストにのみ追加しますか、それとも[ALL_ESTATES]の許可リストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateAllowedExperienceRemove">この不動産の許可リストからのみ削除しますか、それとも[ALL_ESTATES]の許可リストから削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBlockedExperienceAdd">この不動産のブロックされたリストにのみ追加しますか、それとも[ALL_ESTATES]のブロックされたリストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateBlockedExperienceRemove">この不動産のブロックされたリストからのみ削除しますか、それとも[ALL_ESTATES]のブロックされたリストから削除しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateTrustedExperienceAdd">この不動産のキー リストにのみ追加しますか、それとも[ALL_ESTATES]のキーリストに追加しますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="不動産を選択" name="EstateTrustedExperienceRemove">この不動産のキーリストからのみ削除しますか、それとも[ALL_ESTATES]のキーリストから削除しますか？
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
+  </notification>
+
+  <notification label="バンの確認" name="EstateKickUser">この不動産から[EVIL_USER]を追い出しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateChangeCovenant">不動産約款を変更しようとしています。続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateParcelAccessOverride">このオプションのチェックを外すと、グリーティングの防止、プライバシーの維持、成人向けコンテンツから未成年の居住者を保護するために区画所有者が追加した制限が削除される場合があります。必要に応じて土地所有者と相談してください。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EstateParcelEnvironmentOverride">（不動産全体の変更：[ESTATENAME]）このオプションのチェックを外すと、区画所有者が区画に追加したカスタム環境がすべて削除されます。必要に応じて土地所有者と相談してください。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked">訪問しようとしているリージョン（地域）には、現在の初期設定を超えるレーティングのコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+
+レーティング制限に関する詳細情報は、[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/ こちら]をご覧になってください。
+    <tag>confirm</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <tag>fail</tag>
+    <usetemplate ignoretext="リージョン（地域）の横断：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="SLM_UPDATE_FOLDER">[MESSAGE]</notification>
+
+  <notification name="RegionEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツ除外するように設定されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY] コンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_Change">訪問しようとしているリ－ジョン（地域）は、[REGIONMATURITY]コンテンツが含まれていますが、現在の設定では[REGIONMATURITY]コンテンツを除外するように設定されています。ご希望を変更することも、キャンセルすることもできます。この設定を変更すると、そのリージョンに入ることができるようになります。
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button default="true" name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしているリージョン（地域）には現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <usetemplate ignoretext="テレポート：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+初期設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="変更して続ける" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_Change">訪問しようとしているリージョン（地域）には、 [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+初期設定を変更するか、テレポートを取り消すことができます。初期設定を変更した後、もう一度テレポートを実行する必要があります。
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="RegionTPSpecialUsageBlocked">リージョン（地域）に入ることができません。「[REGION_NAME]」は、スキルゲーミングリージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。
+詳しくは、[https://wiki.secondlife.com/wiki/Linden_Lab_Official:Second_Life_Skill_Gaming_FAQ スキルゲーミングのよくある質問]を参照してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PreferredMaturityChanged">今後、[RATING]コンテンツ付きのリージョン（地域）を訪問しようとしているという通知を受け取りません。後でメニューバーの「私」＞「初期設定」＞「一般」を使用して、コンテンツの初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MaturityChangeError">現在、[PREFERRED_MATURITY]コンテンツを表示するように初期設定を変更できませんでした。あなたの初期設定は、[ACTUAL_MATURITY]コンテンツを表示するようにリセットされました。メニューバーの「私」＞「初期設定」＞「一般」を使用して、もう一度初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LandClaimAccessBlocked">取得しようとしている土地には現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_AdultsOnlyContent">この土地を購入できるのは、成人だけです。   
+    <tag>fail</tag>
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <usetemplate ignoretext="土地を購入：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_Notify">取得しようとしている土地には。[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_NotifyAdultsOnly">取得しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandClaimAccessBlocked_Change">取得しようとしている土地には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の取得を試みることができます。
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="取得しようとしている土地には、現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="LandBuyAccessBlocked">購入しようとしている土地には、現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」から設定を変更できます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_AdultsOnlyContent">この土地を取得できるのは、成人だけです。
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
+    <usetemplate ignoretext="土地の取得：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_Notify">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_NotifyAdultsOnly">購入しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandBuyAccessBlocked_Change">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の購入を試みることができます。
+    <tag>confirm</tag>
+    <tag>fail</tag>
+    <form name="form">
+      <button name="ＯＫ" text="初期設定の変更" />
+      <button name="Cancel" text="キャンセル" />
+      <ignore name="ignore" text="購入しようとしている土地には現在の初期設定により除外されたコンテンツが含まれています。" />
+    </form>
+  </notification>
+
+  <notification name="TooManyPrimsSelected">選択したプリムが多すぎます：[MAX_PRIM_COUNT]
+個選択するか、プリム数を減らしてもう一度お試しください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TooManyScriptsSelected">
+スクリプト内で選択されたオブジェクトが多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ProblemImportingEstateCovenant">不動産約款のインポート時に問題が発生しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ProblemAddingEstateManager">新しい不動産マネージャーの追加に関する問題：
+いずれかの不動産のマネージャーリストが満杯になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ProblemAddingEstateBanManager">不動産所有者または管理者を禁止リストに追加できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ProblemAddingEstateGeneric">不動産リストの追加に関する問題：
+いずれかの不動産のリストが満杯になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToLoadNotecardAsset">現在ノートカードのアセットＩＤを読み込むことができません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NotAllowedToViewNotecard">要求したアセットＩＤに関するノートカードを閲覧するには、権限が不十分です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MissingNotecardAssetID">ノートカード用のアセットＩＤがデータベースに登録されていません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PublishClassified">注意：クラシファイド広告の掲載料金の払い戻しはできません。L$ [AMOUNT]で、このクラシファイド広告を今すぐ公開しますか？
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SetClassifiedMature">この広告に「Moderate」コンテンツは含まれていますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="SetGroupMature">このグループに「Moderate」コンテンツが含まれていますか？
+    <tag>confirm</tag>
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification label="再起動を確認" name="ConfirmRestart">このリージョンを２分後に再起動しようとしています。このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="このリージョンにメッセージを送信" name="MessageRegion">このリージョン（地域）にいる人全員に送る、短いメッセージを入力してください。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" />
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="地域のレーティング区分指定変更しました" name="RegionMaturityChange">このリージョン（地域）のレーティング区分が変更されました。
+マップにこの変更が反映するには数分かかることがあります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">[APP_NAME]のこのバージョンは、このリージョン（地域）におけるボイスチャットの互換性がありません。ボイスチャットを正常に行うためには、[APP_NAME]のアップデートが必要です。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification label="オブジェクトを購入できません" name="BuyObjectOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
+単一のオブジェクトを選択し、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="コンテンツを購入できません" name="BuyContentsOneOnly">一度に複数のオブジェクトのコンテンツは購入できません。
+選択するオブジェクトを一つだけにして、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="コンテンツを購入できません" name="BuyContentsOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
+単一のオブジェクトを選択し、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyOriginal">オリジナルのオブジェクトを[OWNER]からL$ [PRICE]で購入しますか？
+購入すると、あなたがオブジェクトの所有者となり、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyOriginalNoOwner">L$ [PRICE]でオリジナルのオブジェクトを購入しますか？
+購入すると、あなたがオブジェクトの所有者となり、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyCopy">コピーを[OWNER]からL$ [PRICE]で購入しますか？
+購入したオブジェクトは、あなたのインベントリにコピーされ、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyCopyNoOwner">L$ [PRICE]でコピーを購入しますか？
+購入したオブジェクトは、あなたのインベントリにコピーされ、以下の操作が可能になります。
+修正：[MODIFYPERM]
+コピー：[COPYPERM]
+再販・譲渡：[RESELLPERM]
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyContents">中身を[OWNER]からL$ [PRICE]で購入しますか？購入した中身は、あなたのインベントリにコピーされます。
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BuyContentsNoOwner">L$ [PRICE]で中身を購入しますか？ 購入した中身は、あなたのインベントリにコピーされます。
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmPurchase">この取引は以下のとおり行われます：
 [ACTION]
 
-購入を続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmPurchasePassword">
-		この取引は以下のとおり行われます：
+このまま購入を続けてもよろしいですか？
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmPurchasePassword">この取引は以下のとおり行われます：
 [ACTION]
 
-購入を続けますか？
-パスワードを再入力し、「 OK 」をクリックしてください。
-		<form name="form">
-			<input name="message"/>
-			<button name="ConfirmPurchase" text="OK"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="SetPickLocation">
-		メモ：
-本ピックの位置を更新しましたが、
-他の詳細は元の値のままになります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MoveInventoryFromObject">
-		「コピー不可」のインベントリアイテムを選択しました。
+このまま購入を続けてもよろしいですか？
+パスワードを再入力し、「ＯＫ」をクリックしてください。
+    <tag>confirm</tag>
+    <tag>funds</tag>
+    <form name="form">
+      <input name="message" />
+      <button name="ConfirmPurchase" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="SetPickLocation">メモ：
+本ピックの位置を更新しましたが、 他の詳細は元の値のままになります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MoveInventoryFromObject">「コピー不可」のインベントリアイテムを選択しました。
 これらのアイテムはコピーされないまま、あなたのインベントリに移動されます。
 
+このままインベントリにアイテムを移動しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="「コピー不可」のアイテムをオブジェクトから動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="MoveInventoryFromScriptedObject">「コピー不可」のインベントリアイテムを選択しました。
+これらのアイテムはコピーされずに、あなたのインベントリに移動されます。このオブジェクトはスクリプト付きなので、インベントリに移動させると、スクリプトに誤動作が起きる可能性があります。
+
+このままインベントリにアイテムを移動しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="スクリプト入りのオブジェクトを壊す恐れのある「コピー不可」のアイテムを動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ClickActionNotPayable">警告：クリックで「オブジェクトに支払う」設定をしました。スクリプトにmoney()イベントが追加されると動作します。
+    <form name="form">
+      <ignore name="ignore" text="オブジェクトを作成中に、money() スクリプトを入れずに「オブジェクトに支払う」アクションを設定したとき" />
+    </form>
+  </notification>
+
+  <notification name="PayConfirmation">[TARGET]にL$ [AMOUNT]を支払うことを確認してください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="支払い前に確認 (合計金額がL$ 200を超える場合)" name="okcancelignore" notext="キャンセル" yestext="支払い" />
+  </notification>
+
+  <notification name="PayObjectFailed">支払いが失敗しました：オブジェクトが見つかりませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PaymentBlockedButtonMismatch">支払いが停止されました：
+支払われた価格が、このオブジェクトに設定された支払いボタンのどれとも一致しません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OpenObjectCannotCopy">このオブジェクトには、あなたがコピーできるアイテムはありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WebLaunchAccountHistory">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]
+ページに移動してアカウント履歴を確認しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動" />
+  </notification>
+
+  <notification name="ConfirmAddingChatParticipants">既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="会話へ参加者を追加する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmQuit">終了してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification name="ConfirmRestoreToybox">この操作を実行すると、デフォルト設定のボタンとツールバーが復元されます。
 
-アイテムを動かしますか？
-		<usetemplate ignoretext="「コピー不可」のアイテムをオブジェクトから動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="MoveInventoryFromScriptedObject">
-		「コピー不可」のインベントリアイテムを選択しました。
-これらのアイテムはコピーされずに、あなたのインベントリに移動されます。
-このオブジェクトはスクリプト付きなので、インベントリに移動させると
-スクリプトに誤動作が起きる可能性があります。
-
-インベントリアイテムを移動しますか？
-		<usetemplate ignoretext="スクリプト入りのオブジェクトを壊す恐れのある「コピー不可」のアイテムを動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ClickActionNotPayable">
-		警告： クリックで「オブジェクトに支払う」設定をしました。スクリプトに money()イベントが追加されると動作します。
-		<form name="form">
-			<ignore name="ignore" text="オブジェクトを作成中に、money() スクリプトを入れずに「オブジェクトに支払う」アクションを設定したとき"/>
-		</form>
-	</notification>
-	<notification name="PayConfirmation">
-		L$[AMOUNT] を [TARGET] に支払うことを確認してください。
-		<usetemplate ignoretext="支払い前に確認 (合計金額が L$200 以上の場合)" name="okcancelignore" notext="取り消し" yestext="支払い"/>
-	</notification>
-	<notification name="PayObjectFailed">
-		支払いが失敗しました： オブジェクトが見つかりませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PaymentBlockedButtonMismatch">
-		支払いが停止されました： 支払われた価格がこのオブジェクトに設定された支払いボタンのどれとも一致しません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OpenObjectCannotCopy">このオブジェクトには、あなたがコピーできるアイテムはありません。</notification>
-	<notification name="WebLaunchAccountHistory">
-		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
-		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
-	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
-		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
-	</notification>
-	<notification name="ConfirmQuit">
-		終了しようとしています。続けますか？
-		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification name="ConfirmRestoreToybox">
-		この操作を実行すると、デフォルト設定のボタンとツールバーが復元されます。
-
-この操作は元に戻せません。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmClearAllToybox">
-		この操作により、全てのボタンはツールボックスに戻り、ツールバーは空になります。
-    
 この操作は元に戻せません。
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="DeleteItems">
-		[QUESTION]
-		<form name="form">
-			<ignore name="ignore" text="アイテムを削除する前の確認"/>
-			<button name="Yes" text="OK"/>
-			<button name="No" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification name="DeleteFilteredItems">
-		あなたのインベントリには現在フィルターがかけられているため、削除しようとしているアイテムによっては表示されないことがあります。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
 
+  <notification name="ConfirmClearAllToybox">この操作により、全てのボタンはツールボックスに戻り、ツールバーは空になります。
+
+この操作は元に戻せません。
+    <unique />
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DeleteItems">[QUESTION]
+    <tag>confirm</tag>
+    <form name="form">
+      <ignore name="ignore" text="アイテムを削除する前の確認" />
+      <button name="Yes" text="ＯＫ" />
+      <button name="No" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="DeleteFilteredItems">あなたのインベントリには現在フィルタがかけられているため、削除しようとしているアイテムによっては表示されないことがあります。
+  
 これらのアイテムを削除しますか？
-		<usetemplate ignoretext="フィルリングされたアイテムを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmUnlink">
-		これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。そのような場合に備えて、リンクセットを自分の持ち物にコピーできます。
-		<usetemplate ignoretext="リンクセットのリンクを解除するときに確認する" name="okcancelignore" notext="取り消し" yestext="リンクを外す"/>
-	</notification>
-	<notification name="HelpReportAbuseConfirm">
-		この問題のご報告にお時間を割いていただきありがとうございます。 
-お知らせいただいた内容について違反がないか確認し、適切に
-対処いたします。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="HelpReportAbuseSelectCategory">嫌がらせ報告のカテゴリを選択してください。
-カテゴリを選択することにより、嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseAbuserNameEmpty">嫌がらせ行為をした人の名前を入力してください。
-正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseAbuserLocationEmpty">嫌がらせがあった場所を入力してください。
-正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseSummaryEmpty">嫌がらせの概要を入力してください。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="フィルリングされたアイテムを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmUnlink">これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。
+そのような場合に備えて、リンクセットを自分のインベントリにコピーできます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットのリンクを解除する前の確認" name="okcancelignore" notext="キャンセル" yestext="リンクを外す" />
+  </notification>
+
+  <notification name="HelpReportAbuseConfirm">この問題のご報告にお時間を割いていただきありがとうございます。
+お知らせいただいた内容について違反がないか確認し、適切に 対処いたします。
+    <unique />
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="HelpReportAbuseSelectCategory">嫌がらせ報告のカテゴリを選択してください。
+カテゴリを選択することにより、嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseAbuserNameEmpty">嫌がらせ行為をした人の名前を入力してください。
+正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseAbuserLocationEmpty">嫌がらせがあった場所を入力してください。
+正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseSummaryEmpty">嫌がらせの概要を入力してください。
 正確な概要の入力により、
-嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseDetailsEmpty">嫌がらせの詳細な説明を入力してください。
+嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HelpReportAbuseDetailsEmpty">嫌がらせの詳細な説明を入力してください。
 名前や嫌がらせの詳細を、できるだけ具体的に入力してください。
 
 正確な説明の入力により、
-嫌がらせ報告の処理や保管に大変役立ちます。</notification>
-	<notification name="HelpReportAbuseContainsCopyright">こんにちは、
+嫌がらせ報告の処理や保管に大変役立ちます。
+    <tag>fail</tag>
+  </notification>
+  <notification name="HelpReportAbuseContainsCopyright">親愛なる居住者様
 
-知的財産権の侵害を報告しようとしています。 正確に報告するために、以下をご確認ください：
+知的財産権の侵害を報告しているようです。正しく報告していることを確認してください。
 
-(1) 嫌がらせの報告の手順 住人が [SECOND_LIFE] の権限システムを悪用しているのを見つけたら、嫌がらせの報告をすることができます。例えば、CopyBot や似たようなコピーツールを使用して知的財産権を侵害している場合です。 担当チームは調査を行い、[SECOND_LIFE] [http://secondlife.com/corporate/tos.php 利用規約] や [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] に違反する行為に対する適切な処罰を下します。  ただし、担当チームは [SECOND_LIFE] の世界からコンテンツを削除して欲しいというリクエストには応じません。
+⑴嫌がらせの報告の手順。居住者が、[SECOND_LIFE]権限システムを悪用していると思われる場合（たとえば、CopyBotまたは同様のコピーツールを使用して、知的財産権を侵害していると思われる場合）は、不正使用報告を提出することができます。不正行為チームは、[SECOND_LIFE][http://secondlife.com/corporate/tos.php 利用規約]や、[http://jp.secondlife.com/corporate/cs.php コミュニティ・スタンダード]に違反する行為を調査し、に違反する行為に対する適切な処罰を下します。ただし、担当チームは[SECOND_LIFE]の世界からコンテンツを削除して欲しいというリクエストには応じません。
 
-(2) DMCA またはコンテンツの撤去の手順 コンテンツを [SECOND_LIFE] から削除して欲しいというリクエストをするには、弊社 [http://secondlife.com/corporate/dmca.php DMCA ポリシー] で提示されているとおり、有効な侵害の通知を提出しなければなりません。.
+⑵DMCA またはコンテンツ削除プロセス。[SECOND_LIFE]からコンテンツの削除をリクエストするには、[https://www.lindenlab.com/legal/intellectual-property-infringement-notification-policy ＤＣＭＡポリシー]に規定されている有効な権利侵害通知を提出する必要があります。
 
-このまま嫌がらせの報告を続けたい場合は、このウィンドウを閉じて報告を送ってください。  「コピー Bot 及び権限の悪用」のカテゴリを選んだ方が適切の場合があります。
+このまま嫌がらせの報告を続けたい場合は、このウィンドウを閉じて報告の送信を完了してください。特定のカテゴリ「コピー Bot 及び権限の悪用」を選択する必要がある場合があります。
 
 ご協力ありがとうございます。
 
 Linden Lab</notification>
-	<notification name="FailedRequirementsCheck">以下の必要なコンポーネントが、[FLOATER] から抜け落ちています
-[COMPONENTS]</notification>
-	<notification label="既存の付属品を置換" name="ReplaceAttachment">
-		体のこの部位には既にオブジェクトが装着されています。
+
+  <notification name="FailedRequirementsCheck">以下の必要なコンポーネントが、[FLOATER]から抜け落ちています
+[COMPONENTS]
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="既存の付属品を置換" name="ReplaceAttachment">体のこの部位には既にオブジェクトが装着されています。
 選択されたオブジェクトと置き換えますか？
-		<form name="form">
-			<ignore name="ignore" save_option="true" text="装着しているアイテムと選択したアイテムを入れ替えるとき"/>
-			<button ignore="自動的に交換" name="Yes" text="OK"/>
-			<button ignore="交換しない" name="No" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification name="TooManyWearables">[AMOUNT] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 &gt; 「デバッグ設定を表示」 &gt; 「WearFolderLimit」でこの制限を変更できます。</notification>
-	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
-		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
-
-このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
-		<form name="form">
-			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
-			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
-			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="ConfirmDeleteProtectedCategory">
-		「 [FOLDERNAME] 」 は、システムフォルダです。 システムフォルダを削除すると不安定になることがあります。  続けますか？
-		<usetemplate ignoretext="システムフォルダを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="PurgeSelectedItems">
-		[COUNT] アイテムが完全に削除されます。ごみ箱内の選択した項目をすべて削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmEmptyTrash">
-		[COUNT] 個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="TrashIsFull">
-		ゴミ箱があふれています。これはログイン時に問題を引き起こします。
-		<usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する"/>
-	</notification>
-	<notification name="ConfirmClearBrowserCache">
-		トラベル、Web、検索の履歴をすべて削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmClearCache">
-		ビューワのキャッシュをクリアしますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmClearCookies">
-		本当にクッキーをクリアしますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
-	</notification>
-	<notification name="ConfirmClearMediaUrlList">
-		保存された URL のリストを消去します。よろしいですか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
-	</notification>
-	<notification name="ConfirmEmptyLostAndFound">
-		紛失物の中身をすべて削除しますか？
-		<usetemplate ignoretext="紛失物フォルダを空にする前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="CopySLURL">
-		次の SLurl がクリップボードにコピーされました：
- [SLURL]
-
-Web ページにリンクすると、他人がこの場所に簡単にアクセスできます。Web ブラウザのアドレスバーに貼り付けて試してみてください。
-		<form name="form">
-			<ignore name="ignore" text="クリップボードに SLurl をコピーするとき"/>
-		</form>
-	</notification>
-	<notification name="WLSavePresetAlert">
-		保存された事前設定を上書きしますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="WLNoEditDefault">デフォルトの設定を編集したり削除したりすることはできません。</notification>
-	<notification name="WLMissingSky">このデイサイクルのファイルは次の存在しない「空」ファイルを参照しています： [SKY]。</notification>
-	<notification name="WLRegionApplyFail">申し訳ございませんが、設定をリージョンに適用できませんでした。理由： [FAIL_REASON]</notification>
-	<notification name="WLLocalTextureDayBlock">ローカルテクスチャは、フィールド [FIELD] 内のトラック [TRACK]、フレーム #[FRAMENO] ([FRAME]%) で使用されています。ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
-	<notification name="WLLocalTextureFixedBlock">ローカルテクスチャは、フィールド [FIELD] で使用されています。
+    <tag>confirm</tag>
+    <form name="form">
+      <ignore name="ignore" save_option="true" text="装着しているアイテムと選択したアイテムを入れ替える" />
+      <button ignore="自動的に交換" name="Yes" text="ＯＫ" />
+      <button ignore="交換しない" name="No" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TooManyWearables">[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="「着信拒否」モードの警告" name="DoNotDisturbModePay">「着信拒否」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
+このトランザクションを完了するために、「着信拒否」をオフにしてもよろしいですか。
+    <tag>confirm</tag>
+    <form name="form">
+      <ignore name="ignore" text="「着信拒否」モード時に、人や物を支払う予定です。" />
+      <button ignore="「着信拒否」モードを解除する" name="Yes" text="ＯＫ" />
+      <button ignore="「着信拒否」モードを維持する" name="No" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="ConfirmDeleteProtectedCategory">「[FOLDERNAME]」は、システムフォルダです。
+システムフォルダを削除すると不安定になることがあります。このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="システムフォルダを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PurgeSelectedItems">[COUNT]個のアイテムが完全に削除されます。ごみ箱内の選択した項目を削除してもよろしいですか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmEmptyTrash">[COUNT]個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除してもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TrashIsFull">ゴミ箱があふれています。これはログイン時に問題を引き起こします。
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する" />
+  </notification>
+
+  <notification name="ConfirmClearBrowserCache">トラベル、Web、検索の履歴をすべて削除しますか？ 
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmClearCache">ビューアーのキャッシュをクリアしますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ConfirmClearCookies">本当にクッキーをクリアしますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
+  </notification>
+
+  <notification name="ConfirmClearMediaUrlList">保存されたＵＲＬのリストを消去します。よろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
+  </notification>
+
+  <notification name="ConfirmEmptyLostAndFound">紛失物の中身をすべて削除しますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="紛失物フォルダを空にする前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="CopySLURL">次のSLurlがクリップボードにコピーされました：
+[SLURL]
+  
+Webページにリンクすると、他人がこの場所に簡単にアクセスできます。Webブラウザのアドレスバーに貼り付けて試してみてください。
+    <form name="form">
+      <ignore name="ignore" text="クリップボードにSLurlをコピーする" />
+    </form>
+  </notification>
+
+  <notification name="WLSavePresetAlert">保存されたプリセットを上書きしてもよろしいですか？
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="WLNoEditDefault">デフォルトの設定を編集したり削除したりすることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WLMissingSky">このデイサイクルのファイルは、以下の存在しない「空」ファイルを参照しています：[SKY]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WLRegionApplyFail">申し訳ございませんが、設定をリージョンに適用できませんでした。理由：[FAIL_REASON]</notification>
+
+  <notification name="WLLocalTextureDayBlock">ローカルテクスチャは、フィールド[FIELD]内のトラック[TRACK]、フレーム＃[FRAMENO] ([FRAME]％) で使用されています。
 ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
-	<notification name="EnvCannotDeleteLastDayCycleKey">
-		デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="DayCycleTooManyKeyframes">
-		このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE] の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="EnvUpdateRate">
-		リージョンの自然環境の設定は [WAIT] 秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PPSaveEffectAlert">
-		ポストプロセス効果が存在します。 上書きしますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="ChatterBoxSessionStartError">
-		[RECIPIENT] と新しいチャットを開始することができません。
+
+  <notification name="WLLocalTextureFixedBlock">ローカルテクスチャは、フィールド[FIELD]で使用されています。
+ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
+
+  <notification name="EnvCannotDeleteLastDayCycleKey">デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。
+最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DayCycleTooManyKeyframes">このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE]の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="EnvUpdateRate">リージョンの自然環境の設定は、[WAIT]秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PPSaveEffectAlert">ポストプロセス効果が存在します。上書きしますか？
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="ChatterBoxSessionStartError">[RECIPIENT]と新しいチャットを開始することができません。
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChatterBoxSessionEventError">
-		[EVENT]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChatterBoxSessionEventError">[EVENT]
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ForceCloseChatterBoxSession">
-		[NAME] とのチャットセッションを閉じます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ForceCloseChatterBoxSession">[NAME]とのチャットセッションを閉じます。
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="Cannot_Purchase_an_Attachment">オブジェクトが取り付けられているままでは購入できません。</notification>
-	<notification label="引き出し許可のリクエストについて" name="DebitPermissionDetails">
-		このリクエストを許可すると、スクリプトであなたのアカウントからリンデンドルを引き出せるようになります。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="Cannot_Purchase_an_Attachment">オブジェクトが取り付けられているままでは購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="引き出し許可のリクエストについて" name="DebitPermissionDetails">このリクエストを許可すると、スクリプトであなたのアカウントからリンデンドルを引き出せるようになります。
 この許可を取り消すには、オブジェクトの所有者がオブジェクトを削除するか、オブジェクトのスクリプトをリセットしなければなりません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AutoWearNewClothing">
-		作成する衣類を自動的に装着しますか？
-		<usetemplate ignoretext="「容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="NotAgeVerified">
-		訪問しようとしているロケーションは、18 才以上の住人に制限されています。
-		<usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="NotAgeVerified_Notify">ロケーションは 18 才以上に制限されています。</notification>
-	<notification name="Cannot enter parcel: no payment info on file">
-		支払情報が登録されていないとこのエリアを訪れることができません。  [SECOND_LIFE] サイトで登録を行いますか？
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AutoWearNewClothing">作成する服装を自動的に装着しますか？
+    <usetemplate ignoretext="「容姿」を編集中に、作成する服装を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
 
+  <notification name="NotAgeVerified">訪問しようとしている場所は、１８歳以上の住人に制限されています。
+    <usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NotAgeVerified_Notify">この場所への入場は、１８歳以上に制限されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: no payment info on file">支払情報が登録されていないため、このエリアを訪れることができません。[SECOND_LIFE]サイトで登録を行いますか？
+  
 [_URL]
-		<url name="url" option="0">https://secondlife.com/account/index.php?lang=ja</url>
-		<usetemplate ignoretext="支払情報が登録されていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="MissingString">文字列 [STRING_NAME] が strings.xml に含まれていません。</notification>
-	<notification name="SystemMessageTip">[MESSAGE]</notification>
-	<notification name="IMSystemMessageTip">[MESSAGE]</notification>
-	<notification name="Cancelled">取り消されました。</notification>
-	<notification name="CancelledAttach">添付が取り消されました。</notification>
-	<notification name="ReplacedMissingWearable">欠落している衣類や身体部位をデフォルトに置き換えます。</notification>
-	<notification name="GroupNotice">件名： [SUBJECT]、メッセージ： [MESSAGE]</notification>
-	<notification name="FriendOnlineOffline">&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です</notification>
-	<notification name="AddSelfFriend">残念ながら自分自身をフレンド登録することはできません。</notification>
-	<notification name="AddSelfRenderExceptions">あなた自身をレンダリングの例外リストに加えることはできません。</notification>
-	<notification name="UploadingAuctionSnapshot">インワールドと Web サイトのスナップショットをアップロード中です...
-（所要時間：約 5 分）</notification>
-	<notification name="UploadPayment">アップロードに L$ [AMOUNT] 支払いました。</notification>
-	<notification name="UploadWebSnapshotDone">Web サイトのスナップショットがアップロードされました。</notification>
-	<notification name="UploadSnapshotDone">インワールドでのスナップショットのアップロードが完了しました。</notification>
-	<notification name="TerrainDownloaded">raw 地形がダウンロードされました</notification>
-	<notification name="GestureMissing">ジェスチャーの [NAME] がデータベースに見つかりません。</notification>
-	<notification name="UnableToLoadGesture">[NAME] というジェスチャーを読み込むことができませんでした。</notification>
-	<notification name="LandmarkMissing">データベースにランドマークがありません。</notification>
-	<notification name="UnableToLoadLandmark">ランドマークを読み込めません。  もう一度お試しください。</notification>
-	<notification name="CapsKeyOn">CapsLock キーが有効になっています。
+    <tag>confirm</tag>
+    <url name="url" option="0">https://secondlife.com/account/index.php?lang=ja</url>
+    <usetemplate ignoretext="支払情報が登録されていません" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="MissingString">文字列[STRING_NAME]がstrings.xmlに含まれていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SystemMessageTip">[MESSAGE]</notification>
+
+  <notification name="IMSystemMessageTip">[MESSAGE]</notification>
+
+  <notification name="Cancelled">取り消されました。</notification>
+
+  <notification name="CancelledAttach">添付が取り消されました。</notification>
+
+  <notification name="ReplacedMissingWearable">欠落している服装や身体部位をデフォルトに置き換えます。</notification>
+
+  <notification name="GroupNotice">件名：[SUBJECT]　メッセージ：[MESSAGE]
+    <tag>group</tag>
+  </notification>
+
+  <notification name="FriendOnlineOffline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、[STATUS]です。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="AddSelfFriend">残念ながら自分自身をフレンド登録することはできません。</notification>
+
+  <notification name="AddSelfRenderExceptions">あなた自身をレンダリングの例外リストに加えることはできません。</notification>
+
+  <notification name="UploadingAuctionSnapshot">インワールドとWebサイトのスナップショットをアップロード中です…
+（所要時間：約５分）</notification>
+  <notification name="UploadPayment">アップロードにL$ [AMOUNT]支払いました。
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="UploadWebSnapshotDone">Webサイトのスナップショットにアップロードされました。</notification>
+
+  <notification name="UploadSnapshotDone">インワールドでのスナップショットのアップロードが完了しました。</notification>
+
+  <notification name="TerrainDownloaded">Terrain.rawがダウンロードされました。</notification>
+
+  <notification name="GestureMissing">ジェスチャー「[NAME]」がデータベースに見つかりません。</notification>
+
+  <notification name="UnableToLoadGesture">ジェスチャー「[NAME]」を読み込むことができませんでした。</notification>
+
+  <notification name="LandmarkMissing">データベースにランドマークがありません。</notification>
+
+  <notification name="UnableToLoadLandmark">ランドマークを読み込めませんでした。もう一度お試しください。</notification>
+
+  <notification name="CapsKeyOn">CapsLockキーが有効になっています。
 パスワードに影響するかもしれません。</notification>
-	<notification name="NotecardMissing">ノートカードがデータベースにありません。</notification>
-	<notification name="NotecardNoPermissions">このノートカードを見る権限がありません。</notification>
-	<notification name="RezItemNoPermissions">オブジェクトを Rez するには権限が不足しています。</notification>
-	<notification name="IMAcrossParentEstates">親エステート間では IM を送信できません。</notification>
-	<notification name="TransferInventoryAcrossParentEstates">親エステート間でインベントリを移動することはできません。</notification>
-	<notification name="UnableToLoadNotecard">ノートカードを読み込めません。あとで再度お試しください。</notification>
-	<notification name="ScriptMissing">データベースにスクリプトがありません。</notification>
-	<notification name="ScriptNoPermissions">スクリプトを閲覧するには権限が不十分です。</notification>
-	<notification name="UnableToLoadScript">スクリプトをロードできません。  もう一度試してください。</notification>
-	<notification name="IncompleteInventory">あなたの提供するコンテンツは、ローカルではまだ全部揃っていません。
-しばらくしてからもう一度お試しください。</notification>
-	<notification name="CannotModifyProtectedCategories">保護されたカテゴリは修正できません。</notification>
-	<notification name="CannotRemoveProtectedCategories">保護されたカテゴリは削除できません。</notification>
-	<notification name="UnableToBuyWhileDownloading">オブジェクトデータのダウンロード中は購入できません。
-もう一度お試しください。</notification>
-	<notification name="UnableToLinkWhileDownloading">オブジェクトデータのウンロード中はリンクできません。
-もう一度お試しください。</notification>
-	<notification name="CannotBuyObjectsFromDifferentOwners">オブジェクトは一度に一人の所有者から購入できます。
-オブジェクトを 1 つだけ選んでください。</notification>
-	<notification name="ObjectNotForSale">このオブジェクトは販売対象ではありません。</notification>
-	<notification name="EnteringGodMode">レベル [LEVEL] のゴッドモードに入ります</notification>
-	<notification name="LeavingGodMode">レベル [LEVEL] のゴッドモードを解除します</notification>
-	<notification name="CopyFailed">これをコピーする権限がありません。</notification>
-	<notification name="InventoryAccepted">[NAME] は、あなたが渡したアイテムを受け取りました。</notification>
-	<notification name="InventoryDeclined">[NAME] は、インベントリの提供を断りました。</notification>
-	<notification name="ObjectMessage">[NAME]： [MESSAGE]</notification>
-	<notification name="CallingCardAccepted">コーリングカードが受理されました。</notification>
-	<notification name="CallingCardDeclined">コーリングカードが拒否されました。</notification>
-	<notification name="TeleportToLandmark">[NAME] などの場所にテレポートするには、「場所」ボタンをクリックしてから、
-表示されたウィンドウで「ランドマーク」タブを選択します。ランドマークを
-いずれか 1 つ選択してから、ウィンドウ下部にある「テレポート」をクリックします。
-（この操作は、ランドマークをダブルクリックするか、右クリックして
-「テレポート」を選択して実行することもできます。）</notification>
-	<notification name="TeleportToPerson">誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「IM」を選択します。</notification>
-	<notification name="CantSelectLandFromMultipleRegions">サーバーの境界を越えて土地を選択することできません。
-もっと小さな土地を選択してください。</notification>
-	<notification name="SearchWordBanned">コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。</notification>
-	<notification name="NoContentToSearch">少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）</notification>
-	<notification name="SystemMessage">[MESSAGE]</notification>
-	<notification name="FacebookConnect">[MESSAGE]</notification>
-	<notification name="FlickrConnect">[MESSAGE]</notification>
-	<notification name="TwitterConnect">[MESSAGE]</notification>
-	<notification name="PaymentReceived">[MESSAGE]</notification>
-	<notification name="PaymentSent">[MESSAGE]</notification>
-	<notification name="PaymentFailure">[MESSAGE]</notification>
-	<notification name="EventNotification">
-		イベント通知：
+
+  <notification name="NotecardMissing">ノートカードがデータベースにありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NotecardNoPermissions">このノートカードを見る権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezItemNoPermissions">オブジェクトをRezするには権限が不足しています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="IMAcrossParentEstates">親不動産間では、ＩＭを送信できません。</notification>
+
+  <notification name="TransferInventoryAcrossParentEstates">親不動産間でインベントリを移動することはできません。</notification>
+
+  <notification name="UnableToLoadNotecard">ノートカードを読み込めません。
+あとで再度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ScriptMissing">データベースにスクリプトがありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ScriptNoPermissions">スクリプトを閲覧するには権限が不十分です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToLoadScript">スクリプトをロードできません。もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="IncompleteInventory">あなたの提供するコンテンツは、ローカルではまだ全部揃っていません。
+しばらくしてからもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotModifyProtectedCategories">保護されたカテゴリは修正できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotRemoveProtectedCategories">保護されたカテゴリは削除できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToBuyWhileDownloading">オブジェクトデータのダウンロード中は購入できません。
+もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToLinkWhileDownloading">オブジェクトデータのウンロード中はリンクできません。
+もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CannotBuyObjectsFromDifferentOwners">オブジェクトは一度に一人の所有者から購入できます。
+オブジェクトを１つだけ選んでください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ObjectNotForSale">このオブジェクトは販売対象ではありません。</notification>
+
+  <notification name="EnteringGodMode">レベル[LEVEL]のゴッドモードに入ります。</notification>
+
+  <notification name="LeavingGodMode">レベル[LEVEL]のゴッドモードを解除します。</notification>
+
+  <notification name="CopyFailed">これをコピーする権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InventoryAccepted">[NAME]は、あなたが渡したアイテムを受け取りました。</notification>
+
+  <notification name="InventoryDeclined">[NAME]は、インベントリの提供を断りました。</notification>
+
+  <notification name="ObjectMessage">[NAME]：[MESSAGE]</notification>
+
+  <notification name="CallingCardAccepted">コーリングカードが受理されました。</notification>
+
+  <notification name="CallingCardDeclined">コーリングカードが拒否されました。</notification>
+
+  <notification name="TeleportToLandmark">[NAME]などの場所にテレポートするには、「場所」ボタンをクリックしてから、
+表示されたウィンドウで「ランドマーク」タブを選択します。
+ランドマークをいずれか１つ選択してから、ウィンドウ下部にある「テレポート」をクリックします。
+（この操作は、ランドマークをダブルクリックするか、右クリックして「テレポート」を選択して実行することもできます。）</notification>
+
+  <notification name="TeleportToPerson">誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「ＩＭ」を選択します。</notification>
+
+  <notification name="CantSelectLandFromMultipleRegions">サーバーの境界を越えて土地を選択することできません。
+もっと小さな土地を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SearchWordBanned">コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoContentToSearch">少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SystemMessage">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="PaymentReceived">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="PaymentSent">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="PaymentFailure">[MESSAGE]
+    <tag>funds</tag>
+  </notification>
+
+  <!-- EventNotification couldn't be persist since server decide is it necessary to notify user about subscribed event via LLEventNotifier-->
+  <notification name="EventNotification">イベント通知：
 
 [NAME]
 [DATE]
-		<form name="form">
-			<button name="Details" text="詳細"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TransferObjectsHighlighted">
-		この区画の購入者に受け渡されるオブジェクトは、すべて区画上で強調表示されています。
-
-
-*受け渡される樹木や植物は、強調表示されていません。
-		<form name="form">
-			<button name="Done" text="完了"/>
-		</form>
-	</notification>
-	<notification name="DeactivatedGesturesTrigger">同じトリガーでアクティブにしないジェスチャー：
+    <form name="form">
+      <button name="Details" text="詳細" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TransferObjectsHighlighted">この区画の購入者に受け渡されるオブジェクトは、すべて区画上で強調表示されています。
+
+・受け渡される樹木や植物は、強調表示されていません。
+    <form name="form">
+      <button name="Done" text="完了" />
+    </form>
+  </notification>
+
+  <notification name="DeactivatedGesturesTrigger">同じトリガーでアクティブにしないジェスチャー：
 [NAMES]</notification>
-	<notification name="NoQuickTime">Apple の QuickTime ソフトウェアがお使いのシステムにインストールされていないようです。
-ストリーミングメディアをサポートする区画で見たい場合は、[http://www.apple.com/jp/quicktime QuickTime サイト] から QuickTime プレイヤーをインストールしてください。</notification>
-	<notification name="NoPlugin">「 [MIME_TYPE] 」の MIME タイプを扱うメディアプラグインが見つかりませんでした。  このタイプのメディアはご利用いただけません。</notification>
-	<notification name="MediaPluginFailed">
-		次のメディアプラグインが実行できませんでした：
-    [PLUGIN]
 
+  <notification name="NoQuickTime">Apple の QuickTime ソフトウェアがお使いのシステムにインストールされていないようです。
+ストリーミングメディアをサポートする区画で見たい場合は、[http://www.apple.com/jp/quicktime QuickTimeサイト] から QuickTimeプレイヤーをインストールしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPlugin">「[MIME_TYPE]」のmimeタイプを扱うメディアプラグインが見つかりませんでした。
+このタイプのメディアはご利用いただけません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="MediaPluginFailed">次のメディアプラグインが実行できませんでした：[PLUGIN]
 プラグインをインストールしなおすか、問題が解決しない場合はメーカーにお問い合わせください。
-		<form name="form">
-			<ignore name="ignore" text="メディアプラグインの実行に失敗したとき"/>
-		</form>
-	</notification>
-	<notification name="OwnedObjectsReturned">選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたのインベントリに返却されました。</notification>
-	<notification name="OtherObjectsReturned">[NAME] が所有する、選択した区画にあるオブジェクトは、所有者のインベントリに返却されました。</notification>
-	<notification name="OtherObjectsReturned2">「 [NAME] 」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。</notification>
-	<notification name="GroupObjectsReturned">グループ &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; と共有する、選択した区画にあるオブジェクトは、オブジェクトのオーナーのインベントリに返却されました。
+    <tag>fail</tag>
+    <form name="form">
+      <ignore name="ignore" text="メディアプラグインの実行に失敗したとき" />
+    </form>
+  </notification>
+
+  <notification name="OwnedObjectsReturned">選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたのインベントリに返却されました。</notification>
+
+  <notification name="OtherObjectsReturned">[NAME]が所有する、選択した区画にあるオブジェクトは、所有者のインベントリに返却されました。</notification>
+
+  <notification name="OtherObjectsReturned2">「[NAME]」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。</notification>
+
+  <notification name="GroupObjectsReturned">グループ&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;と共有する、選択した区画にあるオブジェクトは、オブジェクトのオーナーのインベントリに返却されました。
 譲渡済みの譲渡可能なオブジェクトが前のオーナーに返却されました。
-グループに譲渡された譲渡禁止のオブジェクトは削除されました。</notification>
-	<notification name="UnOwnedObjectsReturned">選択した土地の区画上の、あなたの所有物では「なかった」オブジェクトは、本来の所有者に返却されました。</notification>
-	<notification name="ServerObjectMessage">[NAME] からのメッセージ：
+グループに譲渡された譲渡禁止のオブジェクトは削除されました。
+    <tag>group</tag>
+  </notification>
+
+  <notification name="UnOwnedObjectsReturned">選択した土地の区画上の、あなたの所有物では「なかった」オブジェクトは、本来の所有者に返却されました。</notification>
+
+  <notification name="ServerObjectMessage">[NAME]からのメッセージ：
 &lt;nolink&gt;[MSG]&lt;/nolink&gt;</notification>
-	<notification name="NotSafe">この土地ではダメージが有効です。
-ケガをするかもしれません。 死んでしまった場合は「ホーム」にテレポートされます。</notification>
-	<notification name="NoFly">このエリアでは飛行が禁止されています。
+
+  <notification name="NotSafe">この土地ではダメージが有効になっています。ケガをするかもしれません。
+死んでしまった場合は「ホーム」にテレポートされます。</notification>
+
+  <notification name="NoFly">このエリアでの飛行は禁止されています。
 ここでは飛べません。</notification>
-	<notification name="PushRestricted">このエリアではプッシュが禁止されています。 土地所有者以外は他人をプッシュすることはできません。</notification>
-	<notification name="NoVoice">このエリアではボイスチャットが無効です。 誰かが話しているのを聞くことはできません。</notification>
-	<notification name="NoBuild">このエリアでは制作が禁止されています。 オブジェクトを制作したり Rez することはできません。</notification>
-	<notification name="PathfindingDirty">この値域（リージョン）には、保留中のパスファインディングの変更があります。制作権がある場合は、「地域の再構築」ボタンをクリックして、地域（リージョン）を再構築できます。</notification>
-	<notification name="PathfindingDirtyRebake">
-		この値域（リージョン）には、保留中のパスファインディングの変更があります。制作権がある場合は、「地域の再構築」ボタンをクリックして、地域（リージョン）を再構築できます。
-		<usetemplate name="okbutton" yestext="地域の再構築"/>
-	</notification>
-	<notification name="DynamicPathfindingDisabled">この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。</notification>
-	<notification name="PathfindingCannotRebakeNavmesh">
-		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SeeAvatars">この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル 0 での通常の文字チャットもブロックされます。</notification>
-	<notification name="ScriptsStopped">管理者がこのリージョンのスクリプトを一時停止しました。</notification>
-	<notification name="ScriptsNotRunning">このリージョンではスクリプトの使用が禁止されています。</notification>
-	<notification name="NoOutsideScripts">この土地では、外部のスクリプトが禁止されています。
-
-土地所有者のもの以外はスクリプトが実行されません。</notification>
-	<notification name="ClaimPublicLand">そのリージョンにいないと公共の土地を取得することはできません。</notification>
-	<notification name="RegionTPAccessBlocked">訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。</notification>
-	<notification name="URBannedFromRegion">あなたはリージョンへの立入が禁止されています。</notification>
-	<notification name="NoTeenGridAccess">あなたのアカウントではティーングリッドに接続できません。</notification>
-	<notification name="ImproperPaymentStatus">このリージョンに入るために適した支払いステータスがありません。</notification>
-	<notification name="MustGetAgeRegion">この地域（リージョン）に入るには 18 才以上である必要があります。</notification>
-	<notification name="MustGetAgeParcel">この区画に入るには 18 才以上である必要があります。</notification>
-	<notification name="NoDestRegion">目的地のリージョンが見つかりませんでした。</notification>
-	<notification name="NotAllowedInDest">目的地に入る許可がありません。</notification>
-	<notification name="RegionParcelBan">立入禁止された区画を横断することはできません。 別の方法をお試しください。</notification>
-	<notification name="TelehubRedirect">テレハブに転送されました。</notification>
-	<notification name="CouldntTPCloser">これ以上目的地に近い場所にテレポートができませんでした。</notification>
-	<notification name="TPCancelled">テレポートがキャンセルされました。</notification>
-	<notification name="FullRegionTryAgain">入ろうとしているリージョンは現在満員です。
-しばらくしてから再度お試しください。</notification>
-	<notification name="GeneralFailure">よくある失敗</notification>
-	<notification name="RoutedWrongRegion">異なるリージョンに迂回されました。 もう一度お試しください。</notification>
-	<notification name="NoValidAgentID">エージェント ID が無効です。</notification>
-	<notification name="NoValidSession">セッション ID が無効です。</notification>
-	<notification name="NoValidCircuit">回路コードが無効です。</notification>
-	<notification name="NoPendingConnection">接続を生成できません。</notification>
-	<notification name="InternalUsherError">内部エラーが発生しました。</notification>
-	<notification name="NoGoodTPDestination">このリージョンでは、適切なテレポート目的地が見つかりませんでした。</notification>
-	<notification name="InternalErrorRegionResolver">内部エラーが発生しました。</notification>
-	<notification name="NoValidLanding">有効な着地点が見つかりませんでした。</notification>
-	<notification name="NoValidParcel">有効な区画が見つかりませんでした。</notification>
-	<notification name="ObjectGiveItem">
-		[NAME_SLURL] が所有する &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました：
-&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
-		<form name="form">
-			<button name="Keep" text="受け取る"/>
-			<button name="Discard" text="破棄"/>
-			<button name="Mute" text="所有者をブロック"/>
-		</form>
-	</notification>
-	<notification name="OwnObjectGiveItem">
-		&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました：
-&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
-		<form name="form">
-			<button name="Keep" text="キープ"/>
-			<button name="Discard" text="処分する"/>
-		</form>
-	</notification>
-	<notification name="UserGiveItem">
-		[NAME_SLURL] があなたに [OBJECTTYPE] を渡しました：
-[ITEM_SLURL]
-		<form name="form">
-			<button name="Show" text="表示"/>
-			<button name="Discard" text="破棄"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="GodMessage">[NAME]
 
-[MESSAGE]</notification>
-	<notification name="JoinGroup">
-		[MESSAGE]
-		<form name="form">
-			<button name="Join" text="参加"/>
-			<button name="Decline" text="辞退"/>
-			<button name="Info" text="情報"/>
-		</form>
-	</notification>
-	<notification name="TeleportOffered">
-		[NAME_SLURL] はテレポートであなたを呼んでいます。
-
-“[MESSAGE]”
-&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-		<form name="form">
-			<button name="Teleport" text="テレポート"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] はテレポートであなたを呼んでいます。
-
-“[MESSAGE]”
-&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-
-この地域（リージョン）には [REGION_CONTENT_MATURITY] コンテンツが含まれていますが、現在の環境設定は [REGION_CONTENT_MATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
-		<form name="form">
-			<button name="Teleport" text="変更して続ける"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="TeleportOffered_MaturityBlocked">[NAME_SLURL] はテレポートであなたを呼んでいます。
-
-“[MESSAGE]”
-&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-
-ただし、この地域（リージョン）には成人のみアクセスできるコンテンツが含まれています。</notification>
-	<notification name="TeleportOfferSent">[TO_NAME] にテレポートを送りました。</notification>
-	<notification name="GotoURL">
-		[MESSAGE]
-[URL]
-		<form name="form">
-			<button name="Later" text="あとで"/>
-			<button name="GoNow..." text="今すぐ行く"/>
-		</form>
-	</notification>
-	<notification name="OfferFriendship">
-		[NAME_SLURL] はフレンド登録を申し込んでいます。
+  <notification name="PushRestricted">このエリアでのプッシュは禁止されています。
+土地所有者以外は他人をプッシュすることはできません。</notification>
 
-[MESSAGE]
+  <notification name="NoVoice">このエリアでのボイスチャットは無効になっています。
+音声で誰かと話ことはできません。
+    <tag>voice</tag>
+  </notification>
 
-（デフォルト設定だとお互いのオンライン状態を見ることができます）
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="辞退"/>
-		</form>
-	</notification>
-	<notification name="FriendshipOffered">[TO_NAME] にフレンド登録を申し出ました。</notification>
-	<notification name="OfferFriendshipNoMessage">
-		[NAME_SLURL] はフレンド登録を申し込んでいます。
+  <notification name="NoBuild">このエリアでの制作は禁止されています。オブジェクトを制作したりRezすることはできません。</notification>
 
-（デフォルト設定だとお互いのオンライン状態を見ることができます）
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-		</form>
-	</notification>
-	<notification name="FriendshipAccepted">&lt;nolink&gt;[NAME]&lt;/nolink&gt; はあなたからの友人登録リクエストを受諾しました。</notification>
-	<notification name="FriendshipDeclined">&lt;nolink&gt;[NAME]&lt;/nolink&gt; はあなたからの友人登録リクエストを拒否しました。</notification>
-	<notification name="FriendshipAcceptedByMe">フレンドの登録依頼が承認されました。</notification>
-	<notification name="FriendshipDeclinedByMe">フレンドの登録依頼が拒否されました。</notification>
-	<notification name="OfferCallingCard">
-		[NAME] がコーリングカードを渡そうとしています。
-あなたのインベントリにブックマークが追加され、この住人に素早く IM を送ることができます。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="辞退"/>
-		</form>
-	</notification>
-	<notification name="RegionRestartMinutes">このリージョンは [SECONDS] 分後に再起動されます。
-このままここにいるとログアウトされます。</notification>
-	<notification name="RegionRestartSeconds">このリージョンは [SECONDS] 秒後に再起動されます。.
-このままここにいるとログアウトされます。</notification>
-	<notification name="LoadWebPage">
-		Web ページ [URL] をロードしますか？
+  <notification name="PathfindingDirty">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
+    <unique />
+  </notification>
 
-[MESSAGE]
+  <notification name="PathfindingDirtyRebake">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
+    <unique />
+    <usetemplate name="okbutton" yestext="リージョンの再構築" />
+  </notification>
 
-送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;、所有者:[NAME_SLURL]
-		<form name="form">
-			<button name="Gotopage" text="ページに移動"/>
-			<button name="Cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification name="FailedToFindWearableUnnamed">データベースに [TYPE] が見つかりませんでした</notification>
-	<notification name="FailedToFindWearable">データベースに [DESC] という名前の [TYPE] が見つかりませんでした。</notification>
-	<notification name="InvalidWearable">着用しようとしているアイテムはあなたのビューワでは読み込むことができません。 [APP_NAME] のバージョンをアップグレードしてからこのアイテムを着用してください。</notification>
-	<notification name="ScriptQuestion">
-		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、次のことをしようとしています：
+  <notification name="DynamicPathfindingDisabled">このリージョン（地域）において、動的経路探索が有効になっていません。経路探索ＬＳＬ呼び出しを使用するスクリプトの入ったオブジェクトは、このリージョンで期待どおりに動作しない可能性があります。
+    <unique />
+  </notification>
 
-[QUESTIONS]
-よろしいですか？
-		<form name="form">
-			<button name="Yes" text="はい"/>
-			<button name="No" text="いいえ"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="ExperienceAcquireFailed">
-		新しい体験を取得できません：
-[ERROR_MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NotInGroupExperienceProfileMessage">所有者が選択されたグループのメンバーでないため、体験グループへの変更が無視されました。</notification>
-	<notification name="UneditableExperienceProfileMessage">体験プロフィールを更新するときに、編集不可の '[field]' フィールドが無視されました。</notification>
-	<notification name="RestrictedToOwnerExperienceProfileMessage">体験の所有者のみが設定できる '[field]'フィールドへの変更を無視しました。</notification>
-	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">所有者のレーティング区分より高いレーティング区分の体験を設定できません。</notification>
-	<notification name="RestrictedTermExperienceProfileMessage">次の条件により、体験プロフィール名および説明の更新ができませんでした： [extra_info]</notification>
-	<notification name="TeleportedHomeExperienceRemoved">
-		体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name] リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
-		<form name="form">
-			<ignore name="ignore" text="体験を削除するために、リージョンから追放されました"/>
-		</form>
-	</notification>
-	<notification name="TrustedExperienceEntry">
-		キー体験 secondlife:///app/experience/[public_id]/profile に参加することにより、[region_name] リージョンに入ることを許可されました。この体験を削除すると、このリージョンから追放される可能性があります。
-		<form name="form">
-			<ignore name="ignore" text="体験によりリージョンに入ることを許可されました"/>
-		</form>
-	</notification>
-	<notification name="TrustedExperiencesAvailable">この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます：
+  <notification name="PathfindingCannotRebakeNavmesh">エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作する権限がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
+    <unique />
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
 
-[EXPERIENCE_LIST]
+  <notification name="SeeAvatars">この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル０での通常の文字チャットもブロックされます。
+    <unique />
+  </notification>
 
-その他のキー体験を利用できます。</notification>
-	<notification name="ExperienceEvent">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション ([EventType]) を実行することが許可されました。
-所有者：secondlife:///app/agent/[OwnerID]/inspect
-オブジェクト名：[ObjectName]
-区画名：[ParcelName]</notification>
-	<notification name="ExperienceEventAttachment">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、添付ファイルでアクション ([EventType]) を実行することが許可されました。
-所有者：secondlife:///app/agent/[OwnerID]/inspect</notification>
-	<notification name="ScriptQuestionExperience">
-		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、[GRID_WIDE] 体験への参加を要求しています：
+  <notification name="ScriptsStopped">管理者が、このリージョンのスクリプトを一時停止しました。</notification>
 
-[EXPERIENCE]
+  <notification name="ScriptsNotRunning">このリージョンでは、スクリプトの使用が禁止されています。</notification>
 
-権限が許可されると、体験プロフィールから呼び出さない限り、この体験にこのメッセージが再び表示されることはありません。
+  <notification name="NoOutsideScripts">この土地では、外部スクリプトの実行が無効になっています。
 
-この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます：  
+ここでは、土地所有者に属するスクリプト以外のスクリプトは機能しません。
+    <tag>fail</tag>
+  </notification>
 
-[QUESTIONS] よろしいですか？
-		<form name="form">
-			<button name="BlockExperience" text="体験をブロック"/>
-			<button name="Mute" text="オブジェクトをブロックする"/>
-			<button name="Yes" text="はい"/>
-			<button name="No" text="いいえ"/>
-		</form>
-	</notification>
-	<notification name="ScriptQuestionCaution">
-		警告:オブジェクト '&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;' は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
-  
-そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
-		<form name="form">
-			<button name="Grant" text="トータルアクセスを許可"/>
-			<button name="Deny" text="拒否"/>
-		</form>
-	</notification>
-	<notification name="ScriptDialog">
-		[NAME] の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
-[MESSAGE]
-		<form name="form">
-			<button name="Client_Side_Mute" text="ブロック"/>
-			<button name="Client_Side_Ignore" text="無視"/>
-		</form>
-	</notification>
-	<notification name="ScriptDialogGroup">
-		&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; の 「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」 
-[MESSAGE]
-		<form name="form">
-			<button name="Client_Side_Mute" text="ブロック"/>
-			<button name="Client_Side_Ignore" text="無視"/>
-		</form>
-	</notification>
-	<notification name="BuyLindenDollarSuccess">お支払ありがとうございます。
-
-あなたの L$ 残高は、処理が完了するとアップデートされます。 処理に 20 分以上かかった場合、お取り引きがキャンセルされることがあります。 その場合は、購入金額はあなたの US$ 残高に追加されます。
-
-[http://secondlife.com/account/ マイアカウント] の取引履歴ページで、支払状況を確認できます。</notification>
-	<notification name="FirstOverrideKeys">あなたの移動キーをオブジェクトが操作しています。
-矢印か AWSD のキーで動作を確認してください。
-銃などのオブジェクトだと、一人称視点に変更する必要があります。
-M キーを押して変更します。</notification>
-	<notification name="FirstSandbox">ここはサンドボックスエリアです。住人が制作を学ぶことができます。
+  <notification name="ClaimPublicLand">あなたが所有できるのは、自分がいるリージョン（地域）の公有地のみです。
+    <tag>fail</tag>
+  </notification>
 
-ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、インベントリに入れてお持ち帰りするのをお忘れなく。</notification>
-	<notification name="MaxListSelectMessage">このリストから [MAX_SELECT] 個までのアイテムを選択できます。</notification>
-	<notification name="VoiceInviteP2P">
-		[NAME] があなたをボイスチャットコールに招待しています。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="AutoUnmuteByIM">[NAME] はインスタントメッセージを受け取り、自動的にブロックが解除されました。</notification>
-	<notification name="AutoUnmuteByMoney">[NAME] はお金を受け取り、自動的にブロックが解除されました。</notification>
-	<notification name="AutoUnmuteByInventory">[NAME] はインベントリを受け取り、自動的にブロックが解除されました。</notification>
-	<notification name="VoiceInviteGroup">
-		[NAME] は &lt;nolink&gt;[GROUP]&lt;/nolink&gt; のボイスチャットコールに参加しました。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="VoiceInviteAdHoc">
-		[NAME] は コンファレンスチャットののボイスチャットコールに参加しました。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="InviteAdHoc">
-		[NAME] があなたをコンファレンスチャットに招待しています。
-受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
-		<form name="form">
-			<button name="Accept" text="受け入れる"/>
-			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ブロック"/>
-		</form>
-	</notification>
-	<notification name="VoiceChannelFull">あなたが参加しようとしているボイスコール [VOICE_CHANNEL_NAME] は、参加者が最大限に達しました。後でもう一度お試しください。</notification>
-	<notification name="ProximalVoiceChannelFull">このエリアのボイスチャットは、混雑のため容量を超えてしまっています。申し訳ありませんが、他のエリアでボイスチャットをお試しください。</notification>
-	<notification name="VoiceChannelDisconnected">[VOICE_CHANNEL_NAME] への接続が切れました。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="VoiceChannelDisconnectedP2P">[VOICE_CHANNEL_NAME] がコールを終了しました。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="P2PCallDeclined">[VOICE_CHANNEL_NAME] があなたのコールを拒否しました。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="P2PCallNoAnswer">[VOICE_CHANNEL_NAME] はあなたのコールを受けることができません。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="VoiceChannelJoinFailed">[VOICE_CHANNEL_NAME] への接続に失敗しました。あとで再度お試しください。  「近くのボイスチャット」に再接続されます。</notification>
-	<notification name="VoiceEffectsExpired">ボイスモーフィング効果の1つまたは複数の有効期限が終了しました。
-期限を延長・更新するには [[URL] Click here] をクリックしてください。
+  <notification name="RegionTPAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>fail</tag>
+  </notification>
 
-プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。</notification>
-	<notification name="VoiceEffectsExpiredInUse">ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
-期限を延長・更新するには [[URL] Click here] をクリックしてください。
+  <notification name="URBannedFromRegion">あなたは、このリージョン（地域）への立ち入りが禁止されています。
+    <tag>fail</tag>
+  </notification>
 
-プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。</notification>
-	<notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の1つまたは複数の有効期限が [INTERVAL] 日以内に終了します。
-期限を延長・更新するには [[URL] Click here] をクリックしてください。
+  <notification name="NoTeenGridAccess">お使いのアカウントは、ティーングリッドに接続できません。
+    <tag>fail</tag>
+  </notification>
 
-プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。</notification>
-	<notification name="VoiceEffectsNew">新しいボイスモーフィング効果が登場！</notification>
-	<notification name="Cannot enter parcel: not a group member">特定のグループメンバーのみこのエリアを訪問することができます。</notification>
-	<notification name="Cannot enter parcel: banned">立入禁止されているため、区画に入ることができません。</notification>
-	<notification name="Cannot enter parcel: not on access list">アクセスリストに含まれていないため、区画に入ることができません。</notification>
-	<notification name="VoiceNotAllowed">あなたには [VOICE_CHANNEL_NAME] のボイスチャットに接続する権限がありません。</notification>
-	<notification name="VoiceCallGenericError">[VOICE_CHANNEL_NAME] のボイスチャットに接続中に、エラーが発生しました。後でもう一度お試しください。</notification>
-	<notification name="UnsupportedCommandSLURL">クリックした SLurl はサポートされていません。</notification>
-	<notification name="BlockedSLURL">信用できないブラウザから SLurl が送られてきたので、セキュリティのためブロックされました。</notification>
-	<notification name="ThrottledSLURL">短期間のあいだに、信用できないブラウザから複数の SLurls が送られてきました。
-安全のために数秒間ブロックされます。</notification>
-	<notification name="IMToast">
-		[MESSAGE]
-		<form name="form">
-			<button name="respondbutton" text="返答"/>
-		</form>
-	</notification>
-	<notification name="ConfirmCloseAll">
-		すべての IM を閉じますか？
-		<usetemplate ignoretext="すべての IM を閉じる前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="AttachmentSaved">アタッチメントが保存されました。</notification>
-	<notification name="AppearanceToXMLSaved">外観が XML で [PATH] に保存されました</notification>
-	<notification name="AppearanceToXMLFailed">外観を XML に保存できませんでした。</notification>
-	<notification name="SnapshotToComputerFailed">スナップショットを [PATH] に保存できませんでした:ディスクの空き容量が不足しています。[NEED_MEMORY]KB が必要ですが、[FREE_MEMORY]KB しかありません。</notification>
-	<notification name="SnapshotToLocalDirNotExist">スナップショットを [PATH] に保存できませんでした:ディレクトリは存在しません。</notification>
-	<notification name="PresetNotSaved">プリセット [NAME] の保存エラー。</notification>
-	<notification name="DefaultPresetNotSaved">デフォルトの事前設定を上書きすることはできません。</notification>
-	<notification name="PresetNotDeleted">プリセット [NAME] の削除エラー。</notification>
-	<notification name="UnableToFindHelpTopic">ヘルプトピックが見つかりませんでした。</notification>
-	<notification name="ObjectMediaFailure">
-		サーバーエラー： メディアのアップデートまたは失敗。
-「[ERROR]」
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TextChatIsMutedByModerator">
-		モデレーターがあなたの文字チャットをミュートしました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="VoiceIsMutedByModerator">
-		モデレーターがあなたのボイスをミュートしました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FailedToGetBenefits">
-		残念ながら、このセッションで特典情報を得ることができませんでした。これは通常の本番環境で起こるものではありません。恐れ入りますがサポートまでご連絡ください。このセッションが通常通り作動することはありません。再起動することをお勧めします。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="BulkUploadCostConfirmation">
-		これは [COUNT] アイテムをアップロードします。総費用は L$[COST] です。アップロードを続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="アップロード"/>
-	</notification>
-	<notification name="BulkUploadNoCompatibleFiles">
-		選択されたファイルは一括アップロードできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="BulkUploadIncompatibleFiles">
-		選択されたファイルのいくつかは一括アップロードできません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="UploadCostConfirmation">
-		このアップロードは L$[PRICE] のコストがかかります。アップロードを続けますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="アップロード"/>
-	</notification>
-	<notification name="ConfirmClearTeleportHistory">
-		テレポート履歴を削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
-	</notification>
-	<notification name="BottomTrayButtonCanNotBeShown">選択したボタンを現在表示することができません。
-じゅうぶんなスペースができればボタンは表示されます。</notification>
-	<notification name="ShareNotification">共有する住人を選択します。</notification>
-	<notification name="MeshUploadErrorDetails">[LABEL] をアップロードできませんでした： [MESSAGE] 
-[DETAILS]詳しくは、SecondLife.log をご覧ください。</notification>
-	<notification name="MeshUploadError">[LABEL] をアップロードできませんでした： [MESSAGE] 
-
-詳しくは、SecondLife.log をご覧ください</notification>
-	<notification name="MeshUploadPermError">メッシュのアップロード許可をリクエスト中にエラーが発生しました。</notification>
-	<notification name="RegionCapabilityRequestError">リージョンの '[CAPABILITY]' という機能を取得できませんでした。</notification>
-	<notification name="ShareItemsConfirmation">
-		次のアイテムを共有しますか？
+  <notification name="ImproperPaymentStatus">このリージョン（地域）に入るための適切な支払い状況がありません。
+    <tag>fail</tag>
+  </notification>
 
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+  <notification name="MustGetAgeRegion">このリージョン（地域）に入るには、１８歳以上である必要があります。
+    <tag>fail</tag>
+  </notification>
 
-次の住人と共有：
+  <notification name="MustGetAgeParcel">この区画に入るには、１８歳以上である必要があります。
+    <tag>fail</tag>
+  </notification>
 
-&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="ShareFolderConfirmation">
-		フォルダは一度に 1 つしか共有できません。
+  <notification name="NoDestRegion">目的地のリージョン（地域）が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
 
-次のアイテムを共有しますか？
+  <notification name="NotAllowedInDest">目的地に入る許可がありません。
+    <tag>fail</tag>
+  </notification>
 
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+  <notification name="RegionParcelBan">立入禁止された区画を横断することはできません。別の方法をお試しください。
+    <tag>fail</tag>
+  </notification>
 
-次の住人と共有：
-
-&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
-	</notification>
-	<notification name="ItemsShared">アイテムが共有されました。</notification>
-	<notification name="DeedToGroupFail">グループへの譲渡に失敗しました。</notification>
-	<notification name="ReleaseLandThrottled">区画「[PARCEL_NAME]」は現在放棄できません。</notification>
-	<notification name="ReleasedLandWithReclaim">[AREA] m² の区画「[PARCEL_NAME]」が公開されました。
-
-同区画が他の住人に売り出される前の [RECLAIM_PERIOD] 時間内であれば無償で土地を取り戻すことができます。</notification>
-	<notification name="ReleasedLandNoReclaim">[AREA] m² の区画「[PARCEL_NAME]」が公開されました。
-
-一般に公開されたので、今なら誰でも購入可能です。</notification>
-	<notification name="AvatarRezNotification">（作成後[EXISTENCE]秒経過）
-'[NAME]'というアバターは[TIME]秒後に姿を現わしました。</notification>
-	<notification name="AvatarRezSelfBakedDoneNotification">（作成後[EXISTENCE]秒経過）
-アウトフィットのベークは[TIME]秒後に完了しました。</notification>
-	<notification name="AvatarRezSelfBakedUpdateNotification">（作成後[EXISTENCE]秒経過）
-容姿の更新は[TIME]秒後に送信されました。
-[STATUS]</notification>
-	<notification name="AvatarRezCloudNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」がクラウドになりました。</notification>
-	<notification name="AvatarRezArrivedNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が現れました。</notification>
-	<notification name="AvatarRezLeftCloudNotification">（ [EXISTENCE] 秒）
-アバター「 [NAME] 」が [TIME] 秒でクラウド状態から出現します。</notification>
-	<notification name="AvatarRezEnteredAppearanceNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が容姿編集モードに入りました。</notification>
-	<notification name="AvatarRezLeftAppearanceNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が容姿編集モードを解除しました。</notification>
-	<notification name="NoConnect">
-		[PROTOCOL] [HOSTID]を使って接続できません。
-お使いのネットワークやファイアウォールの設定を確認してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NoVoiceConnect">
-		ボイスサーバーに接続できません： 音声に許可される必要のある 
+  <notification name="TelehubRedirect">テレハブに転送されました。
+    <tag>fail</tag>
+  </notification>
 
-[HOSTID]
+  <notification name="CouldntTPCloser">これ以上目的地に近い場所にテレポートができませんでした。
+    <tag>fail</tag>
+  </notification>
 
-ポート: 
-:TCP:80, 443 
-:UDP:3478, 3479, 5060, 5062, 6250, 12000-32000
+  <notification name="TPCancelled">テレポートがキャンセルされました。</notification>
 
-お使いのネットワークやファイアウォールの設定を確認してください。
-お使いのルーターの SIP ALG 機能をすべて無効にしてください。
+  <notification name="FullRegionTryAgain">入ろうとしているリージョンは現在満員です。
+しばらくしてから再度お試しください。
+    <tag>fail</tag>
+  </notification>
 
-ボイスチャットによるコミュニケーションが利用できません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="NoVoiceConnect-GIAB">
-		ボイスサーバーに接続できません。ボイスチャットによるコミュニケーションが利用できません。お使いのネットワークやファイアウォールの設定を確認してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AvatarRezLeftNotification">（ [EXISTENCE] 秒）
-アバター「 NAME 」が完全に読み込まれました。</notification>
-	<notification name="AvatarRezSelfBakedTextureUploadNotification">( 作成後[EXISTENCE]秒経過）
-'[BODYREGION]'の[RESOLUTION]のベークドテクスチャは[TIME]秒後にアップロードされました。</notification>
-	<notification name="AvatarRezSelfBakedTextureUpdateNotification">( 作成後[EXISTENCE]秒経過）
-'[BODYREGION]'の[RESOLUTION]のベークドテクスチャは[TIME]秒後にローカルに更新されました。</notification>
-	<notification name="CannotUploadTexture">テクスチャをアップロードできません。
-[REASON]</notification>
-	<notification name="LivePreviewUnavailable">
-		コピー不可および/または転送不可のため、このテクスチャを表示できません。
-		<usetemplate ignoretext="コピー不可および/または転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmLeaveCall">
-		このコールから抜けますか？
-		<usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="ConfirmMuteAll">
-		グループコールの参加者全員をミュートしました。
-あとからこのコールに参加する住人も
-ミュートされます。あなたがコールを終了しても他の参加者のミュート状態が続きます。
+  <notification name="GeneralFailure">よくある失敗
+    <tag>fail</tag>
+  </notification>
 
-全員をミュートしますか？
-		<usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification label="チャット" name="HintChat">チャットに参加するには、画面下のチャットフィールドにテキストを入力します。</notification>
-	<notification label="立ち上がる" name="HintSit">座る姿勢から立ち上がるには、「立ち上がる」ボタンをクリックします。</notification>
-	<notification label="話す" name="HintSpeak">「スピーカー」ボタンをクリックすると、マイクのオン・オフが切り替わります。
+  <notification name="RoutedWrongRegion">異なるリージョンに迂回されました。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
 
-上矢印をクリックすると、ボイスコントロールパネルが表示されます。
+  <notification name="NoValidAgentID">無効なエージェントIDです。
+    <tag>fail</tag>
+  </notification>
 
-「スピーカー」ボタンを非表示にすると、ボイス機能も無効になります。</notification>
-	<notification label="世界を探検" name="HintDestinationGuide">行き先ガイドには数多くの探索場所が含まれます。どこか行き先を決めたら、テレポートして探索に出かけましょう。</notification>
-	<notification label="サイドパネル" name="HintSidePanel">サイドパネルでインベントリ、服、プロフィールなどにすばやくアクセスできます。</notification>
-	<notification label="移動" name="HintMove">歩行や走行は、「移動」パネルを開き、矢印コントロールによって操作します。この操作はキーボードの矢印キーで実行することも可能です。</notification>
-	<notification label="" name="HintMoveClick">1. クリックして歩行
-地面の一箇所をクリックすると、その場所まで歩きます。
-
-2. クリック・ドラッグで視界を回転
-世界の一箇所をクリックしてドラッグすると、視界の向きが変わります。</notification>
-	<notification label="表示名" name="HintDisplayName">表示名（カスタマイズ可能）を設定します。ユーザー名は固有で変更できませんが、ここで追加する表示名は変更可能です。他の住人の名前の表示方法は環境設定で変更してください。</notification>
-	<notification label="表示" name="HintView">カメラの視点を変更するには、水平・垂直コントロールを使います。Escape を押すか、または歩行すると、視点がリセットされます。</notification>
-	<notification label="インベントリ" name="HintInventory">インベントリにはあなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。</notification>
-	<notification label="あなたのリンデンドル" name="HintLindenDollar">これがあなたの L$ 残高です。リンデンドルを購入するには「L$ の購入」をクリックします。</notification>
-	<notification name="LowMemory">メモリプール残量が少なくなっています。クラッシュを避けるため SL の機能の一部は無効になりました。他のアプリケーションを終了し、状況が継続または再発する場合には SL を再起動してください。</notification>
-	<notification name="ForceQuitDueToLowMemory">メモリ不足のため 30 秒以内に SL は終了します。</notification>
-	<notification name="SOCKS_NOT_PERMITTED">
-		ルールセットによって許可されていないため、SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; が接続を拒絶しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_CONNECT_ERROR">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; が接続を拒絶したため、TCP チャンネルを開くことができませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_NOT_ACCEPTABLE">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; は選択された認証システムを拒絶しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_AUTH_FAIL">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; はあなたの資格が無効だと報告しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
-		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; は UDP アソシエートのリクエストを拒絶しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_HOST_CONNECT_FAILED">
-		SOCKS 5 プロキシサーバー &quot;[HOST]:[PORT]&quot; に接続できませんでした。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_UNKNOWN_STATUS">
-		不明のプロキシエラーがサーバー &quot;[HOST]:[PORT]&quot; で発生しました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_INVALID_HOST">
-		SOCKS プロキシのアドレスまたはポート &quot;[HOST]:[PORT]&quot;が無効です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="SOCKS_BAD_CREDS">
-		SOCKS 5 のユーザー名またはパスワードが正しくありません。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PROXY_INVALID_HTTP_HOST">
-		HTTP プロキシのアドレスまたはポート &quot;[HOST]:[PORT]&quot;が無効です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PROXY_INVALID_SOCKS_HOST">
-		SOCKS プロキシのアドレスまたはポート &quot;[HOST]:[PORT]&quot;が無効です。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChangeProxySettings">
-		プロキシの設定は [APP_NAME] を再起動後に反映されます。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AuthRequest">
-		「[REALM]」にある「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;」のサイトにはユーザー名とパスワードが必要です。
-		<form name="form">
-			<input name="username" text="ユーザー名"/>
-			<input name="password" text="パスワード"/>
-			<button name="ok" text="送信"/>
-			<button name="cancel" text="取り消し"/>
-		</form>
-	</notification>
-	<notification label="" name="NoClassifieds">
-		クラシファイド広告の作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoGroupInfo">
-		グループの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoPlaceInfo">
-		場所のプロフィールの表示はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoPicks">
-		ピックの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoWorldMap">
-		世界地図の表示はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoVoiceCall">
-		ボイスコールはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoAvatarShare">
-		共有はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoAvatarPay">
-		他の住人への支払いはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoInventory">
-		インベントリの表示はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoAppearance">
-		容姿エディターはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="NoSearch">
-		検索はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
-		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
-	</notification>
-	<notification label="" name="ConfirmHideUI">
-		この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには [SHORTCUT] をもう一度クリックしてください。
-		<usetemplate ignoretext="UI を非表示にする前に確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられます。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_MismatchOnRestricted">
-		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-続けますか？
-		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されているため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_MismatchOnVolume">
-		選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットは、形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限されているため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットは形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
-		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットの用途タイプは変わりません。
-
-続けますか？
-		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されており、また形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
-		選択された一部のリンクセットはファントムフラグが切り替えられます。
-
-一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットは代わりに '[RESTRICTED_TYPE]' に設定されます。
-
-選択された一部のリンクセットは、形状が凸状でないため、'[REQUESTED_TYPE]' に設定できません。これらのリンクセットの用途タイプは変わりません。
-
-続けますか？
-		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限され、また形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
-		選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
-		<usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<global name="UnsupportedGLRequirements">[APP_NAME] に必要なハードウェアがないようです。 [APP_NAME] にはマルチテクスチャをサポートする OpenGL グラフィックカードが必要です。 お使いのグラフィックカードの最新ドライバがインストールされているかどうか、オペレーティングシステムのサービスパックとパッチが入っているかをご確認ください。
-
-この問題が何度も起きる場合は、[SUPPORT_SITE] をご確認ください。</global>
-	<global name="UnsupportedCPUAmount">796</global>
-	<global name="UnsupportedRAMAmount">510</global>
-	<global name="UnsupportedGPU">- あなたのグラフィックカードは必須動作環境の条件を満たしていません。</global>
-	<global name="UnsupportedRAM">- あなたのシステムメモリは必須動作環境の条件を満たしていません。</global>
-	<global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">自分の土地をお持ちの場合、「ホーム」に設定できます。
-お持ちでない場合は、地図で「インフォハブ」をお探しください。</global>
-	<global name="You died and have been teleported to your home location">死んでしまったので、ホームにテレポートされました。</global>
-	<notification name="LocalBitmapsUpdateFileNotFound">[FNAME] は、見つからなかったため、更新できませんでした。
-このファイルに対する今後の更新を無効にします。</notification>
-	<notification name="LocalBitmapsUpdateFailedFinal">[FNAME] を開くまたはデコードする試行に失敗しました（試行回数 [NRETRIES] 回）。そのため、このファイルは壊れているものとして処理されました。
-このファイルに対する今後の更新を無効にします。</notification>
-	<notification name="LocalBitmapsVerifyFail">開くことができない、またはデコードできない無効または読み取り不能な画像ファイル [FNAME] を追加しようとしました。
-この試行はキャンセルされました。</notification>
-	<notification name="PathfindingReturnMultipleItems">
-		[NUM_ITEMS] 個のアイテムを返却中です。続けますか？
-		<usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="PathfindingDeleteMultipleItems">
-		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
-		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="AvatarFrozen">[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。</notification>
-	<notification name="AvatarFrozenDuration">[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。</notification>
-	<notification name="YouFrozeAvatar">アバターがフリーズされています。</notification>
-	<notification name="AvatarHasUnFrozenYou">[AV_FREEZER] によってフリーズが解除されています。</notification>
-	<notification name="AvatarUnFrozen">アバターのフリーズが解除されました。</notification>
-	<notification name="AvatarFreezeFailure">その区画の管理権限を持っていないため、フリーズに失敗しました。</notification>
-	<notification name="AvatarFreezeThaw">フリーズ期間が切れました。仕事に戻ってください。</notification>
-	<notification name="AvatarCantFreeze">残念ながら、そのユーザーをフリーズできません。</notification>
-	<notification name="NowOwnObject">これで、オブジェクト [OBJECT_NAME] の所有者になりました</notification>
-	<notification name="CantRezOnLand">この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。</notification>
-	<notification name="RezFailTooManyRequests">リクエストが多すぎて、オブジェクトを Rez することができません。</notification>
-	<notification name="SitFailCantMove">今回移動できなかったため、座ることができません。</notification>
-	<notification name="SitFailNotAllowedOnLand">その土地に対して許可を受けていないため、座ることができません。</notification>
-	<notification name="SitFailNotSameRegion">移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。</notification>
-	<notification name="NoNewObjectRegionFull">新しいオブジェクトを作成できません。リージョンが埋まっています。</notification>
-	<notification name="FailedToPlaceObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。</notification>
-	<notification name="NoOwnNoGardening">所有していない土地に木や草を植えることはできません。</notification>
-	<notification name="NoCopyPermsNoObject">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をコピーする権限がないため、コピーに失敗しました。</notification>
-	<notification name="NoTransPermsNoObject">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; はあなたに譲渡できないため、コピーに失敗しました。</notification>
-	<notification name="AddToNavMeshNoCopy">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; は navmesh に関連があるため、コピーに失敗しました。</notification>
-	<notification name="DupeWithNoRootsSelected">ルートオブジェクトを選択せずに複製します。</notification>
-	<notification name="CantDupeCuzRegionIsFull">リージョンが埋まっているため、オブジェクトのコピーを作成することができません。</notification>
-	<notification name="CantDupeCuzParcelNotFound">オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。</notification>
-	<notification name="CantCreateCuzParcelFull">区画がいっぱいのため、
-オブジェクトを作成できません。</notification>
-	<notification name="RezAttemptFailed">オブジェクトへの Rez の試みに失敗しました。</notification>
-	<notification name="ToxicInvRezAttemptFailed">このリージョンで問題を引き起こすアイテムは作成できません。</notification>
-	<notification name="InvItemIsBlacklisted">その持ち物アイテムはブラックリストに登録されています。</notification>
-	<notification name="NoCanRezObjects">現在あなたにはオブジェクトを作成するための許可がありません。</notification>
-	<notification name="LandSearchBlocked">土地の検索がブロックされました。
-短期間に多くの土地を検索したためです。
-しばらくしてから再度お試しください。</notification>
-	<notification name="NotEnoughResourcesToAttach">オブジェクトの着用に使用できるスクリプトリソースが足りません。</notification>
-	<notification name="YouDiedAndGotTPHome">死んでしまったので、ホームにテレポートされました。</notification>
-	<notification name="EjectComingSoon">ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。</notification>
-	<notification name="SaveBackToInvDisabled">「「持ち物」に保存」が無効になっています。</notification>
-	<notification name="NoExistNoSaveToContents">「存在しません」から rez されたため、&lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をオブジェクトの中身に保存できませんでした。</notification>
-	<notification name="NoModNoSaveToContents">あなたにはオブジェクト &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt; を修正する権限がないため、&lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。</notification>
-	<notification name="NoSaveBackToInvDisabled">&lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をインベントリに保存できません。この操作は無効になりました。</notification>
-	<notification name="NoCopyNoSelCopy">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をコピーする権限がないため、選択内容をコピーできません。</notification>
-	<notification name="NoTransNoSelCopy">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を譲渡できないため、選択内容をコピーできません。</notification>
-	<notification name="NoTransNoCopy">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を譲渡できないため、選択内容をコピーできません。</notification>
-	<notification name="NoPermsNoRemoval">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; をシミュレーターから削除することは、権限のシステムにより許可されていません。</notification>
-	<notification name="NoModNoSaveSelection">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を修正する権限がないため、選択内容を保存できません。</notification>
-	<notification name="NoCopyNoSaveSelection">オブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; はコピー不可なため、選択内容を保存できません。</notification>
-	<notification name="NoModNoTaking">あなたにはオブジェクト &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; を修正する権限がないため、選択内容を選ぶことはできません。</notification>
-	<notification name="RezDestInternalError">内部エラー: 不明な宛先タイプ。</notification>
-	<notification name="DeleteFailObjNotFound">オブジェクトが見つからないため削除できませんでした。</notification>
-	<notification name="SorryCantEjectUser">残念ながら、そのユーザーを追放することはできません。</notification>
-	<notification name="RegionSezNotAHome">このリージョンでは、ここにホームの位置を設定できません。</notification>
-	<notification name="HomeLocationLimits">ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。</notification>
-	<notification name="HomePositionSet">家の配置の設定。</notification>
-	<notification name="AvatarEjected">アバターが追放されました。</notification>
-	<notification name="AvatarEjectFailed">その区画の管理権限がないため、追放できませんでした。</notification>
-	<notification name="CMOParcelFull">区画がいっぱいなので、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMOParcelPerms">ご使用のオブジェクトはこの区画で使用が許可されていないため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMOParcelResources">この区画にこのオブジェクトのリソースが不足しているため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="NoParcelPermsNoObject">その区画へのアクセス権がないため、コピーが失敗しました。</notification>
-	<notification name="CMORegionVersion">他の地域（リージョン）でこのオブジェクトの地域（リージョン）をまたがる受け取りに対応していない旧バージョンを実行しているため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMONavMesh">リージョンの境界にわたってナビメッシュを変更できないため、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。</notification>
-	<notification name="CMOWTF">不明な理由により、オブジェクト '[O]' を地域（リージョン） [R] の [P] に移動できません。 ([F])</notification>
-	<notification name="NoPermModifyObject">そのオブジェクトを変更する権限がありません</notification>
-	<notification name="TooMuchObjectInventorySelected">
-		大きなインベントリを持つオブジェクトの選択が多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。</notification>
-	<notification name="CantEnablePhysKeyframedObj">キーフレームオブジェクトのために物理を有効にできません。</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">土地のリソースが足りないため、オブジェクトの物理を有効にできません。</notification>
-	<notification name="CantEnablePhysCostTooGreat">[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。</notification>
-	<notification name="PhantomWithConcavePiece">このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。</notification>
-	<notification name="UnableAddItem">アイテムを追加できません!</notification>
-	<notification name="UnableEditItem">これは編集できません!</notification>
-	<notification name="NoPermToEdit">これを編集する許可がありません。</notification>
-	<notification name="NoPermToCopyInventory">そのインベントリをコピーすることは許可されません。</notification>
-	<notification name="CantSaveItemDoesntExist">オブジェクトのコンテンツに保存できません。アイテムが存在していません。</notification>
-	<notification name="CantSaveItemAlreadyExists">オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。</notification>
-	<notification name="CantSaveModifyAttachment">オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。</notification>
-	<notification name="AttachmentHasTooMuchInventory">ご使用のアタッチメントに含まれるインベントリが多すぎるため、インベントリを追加できません。</notification>
-	<notification name="IllegalAttachment">添付ファイルはアバターの存在しない点を要求しました。代わりに胸に添付されていました。</notification>
-	<notification name="TooManyScripts">スクリプトが多すぎます。</notification>
-	<notification name="UnableAddScript">テキストを追加できません!</notification>
-	<notification name="AssetServerTimeoutObjReturn">資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。</notification>
-	<notification name="RegionDisablePhysicsShapes">このリージョンでは、物理的シェイプが有効にされていません。</notification>
-	<notification name="NoModNavmeshAcrossRegions">リージョンの境界をまたぐナビメッシュは変更できません。</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">そのオブジェクトタイプの物理的プロパティを設定できません。</notification>
-	<notification name="NoSetRootPrimWithNoShape">ルートプリムを設定できないため、シェイプがありません。</notification>
-	<notification name="NoRegionSupportPhysMats">このリージョンでは、物理的素材が有効にされていません。</notification>
-	<notification name="OnlyRootPrimPhysMats">物理的素材を調整できるのは、ルートプリムだけです。</notification>
-	<notification name="NoSupportCharacterPhysMats">キャラクターへの物理的素材の設定はまだサポートされていません。</notification>
-	<notification name="InvalidPhysMatProperty">指定した物理的素材のプロパティが 1 つ以上無効です。</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">メッシュオブジェクトの縫い目のタイプを変更することはできません。</notification>
-	<notification name="NoPermsAlterShapeMeshObj">メッシュオブジェクトの形状を変更することはできません</notification>
-	<notification name="FullRegionCantEnter">リージョンが埋まっているため、\nこのリージョンに入場できません。</notification>
-	<notification name="LinkFailedOwnersDiffer">リンクエラー -- 所有者が違います</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。</notification>
-	<notification name="LinkFailedNoPermToEdit">リンクエラー -- 編集権限がありません。</notification>
-	<notification name="LinkFailedTooManyPrims">リンクエラー -- プリミティブが多すぎます。</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">リンクエラー -- コピーなしと転送なしをリンクできません。</notification>
-	<notification name="LinkFailedNothingLinkable">リンクエラー -- リンクできるものがありません。</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">リンクエラー -- パスファインディングの文字数が多すぎます</notification>
-	<notification name="LinkFailedInsufficientLand">リンクエラー -- 土地のリソースが足りません</notification>
-	<notification name="LinkFailedTooMuchPhysics">オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。</notification>
-	<notification name="EstateManagerFailedllTeleportHome">[SLURL] のオブジェクト '[OBJECT_NAME]' で不動産マネージャーのホームをテレポートできません。</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">区画 '[PARCEL_NAME]' のオブジェクト '[OBJECT_NAME]' によって、あなたはホームにテレポートされました。</notification>
-	<notification name="TeleportedHomeByObject">​オブジェクト ​'[OBJECT_NAME]' によって、あなたはホームへテレポートされています。</notification>
-	<notification name="TeleportedByAttachment">
-		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
-		<usetemplate ignoretext="テレポート：アタッチメントによりテレポートされました" name="notifyignore"/>
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		区画 '[PARCEL_NAME]' のオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。
-		<usetemplate ignoretext="テレポート：区画上のオブジェクトによりテレポートされました" name="notifyignore"/>
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">[OWNER_ID] が所有しているオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。</notification>
-	<notification name="TeleportedByObjectUnknownUser">不明なユーザーが所有しているオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。</notification>
-	<notification name="StandDeniedByObject">'[OBJECT_NAME]' はこの時点であなたが立つことを許可しません。</notification>
-	<notification name="ResitDeniedByObject">'[OBJECT_NAME]' はこの時点であなたが席を変更することを許可しません。</notification>
-	<notification name="CantCreateObjectRegionFull">リクエストされたオブジェクトを作成できません。リージョンが埋まっています。</notification>
-	<notification name="CantCreateAnimatedObjectTooLarge">リグ入三角形の限度数を超えるため、リクエストされたアニメーションオブジェクトを作成することができません。</notification>
-	<notification name="CantAttackMultipleObjOneSpot">1 つの場所に複数のオブジェクトを着用することはできません。</notification>
-	<notification name="CantCreateMultipleObjAtLoc">ここでは、複数のオブジェクトを作成することはできません。</notification>
-	<notification name="UnableToCreateObjTimeOut">リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。</notification>
-	<notification name="UnableToCreateObjUnknown">リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。</notification>
-	<notification name="UnableToCreateObjMissingFromDB">要求されたオブジェクトを作成できません。もう一度お試しください。</notification>
-	<notification name="RezFailureTookTooLong">リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。</notification>
-	<notification name="FailedToPlaceObjAtLoc">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。</notification>
-	<notification name="CantCreatePlantsOnLand">この土地に木を植えることはできません。</notification>
-	<notification name="CantRestoreObjectNoWorldPos">オブジェクトをリストアできません。ワールドの位置が見つかりません。</notification>
-	<notification name="CantRezObjectInvalidMeshData">メッシュデータが無効なため、オブジェクトを Rez することができません。</notification>
-	<notification name="CantRezObjectTooManyScripts">このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。</notification>
-	<notification name="CantCreateObjectNoAccess">現在のアクセス権限では、そこにオブジェクトを作成できません。</notification>
-	<notification name="CantCreateObject">現在あなたにはオブジェクト作成する許可がありません。</notification>
-	<notification name="InvalidObjectParams">無効なオブジェクトパラメーター</notification>
-	<notification name="CantDuplicateObjectNoAcess">現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。</notification>
-	<notification name="CantChangeShape">あなたにはこのシェイプを変更する許可がありません。</notification>
-	<notification name="NoPermsTooManyAttachedAnimatedObjects">この操作を行うと、装着されたアニメーションオブジェクトが限度数を超えます。</notification>
-	<notification name="NoPermsLinkAnimatedObjectTooLarge">結果として、アニメーションオブジェクトがリグ入り三角形の限度数を超えるため、これらのオブジェクトを結合できません。</notification>
-	<notification name="NoPermsSetFlagAnimatedObjectTooLarge">リグ入り三角形の限度数を超えるため、このオブジェクトをアニメーションオブジェクトにすることはできません。</notification>
-	<notification name="CantChangeAnimatedObjectStateInsufficientLand">このオブジェクトをアニメーションオブジェクトの状態に変えると、区画の限度数を超えるため変更できません。</notification>
-	<notification name="ErrorNoMeshData">サーバーエラー： メッシュデータが読み込まれていないため、この操作を完了できません。</notification>
-	<notification name="NoAccessToClaimObjects">現在のアクセス権限では、ここにオブジェクトを取得できません。</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。</notification>
-	<notification name="NoPrivsToBuyObject">現在のアクセス権限では、ここでオブジェクトを購入できません。</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">アバターがオブジェクトに存在するため、オブジェクトを着用できません。</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">木や草をアタッチメントとして着用できません。</notification>
-	<notification name="CantAttachGroupOwnedObjs">グループが所有しているオブジェクトは着用できません。</notification>
-	<notification name="CantAttachObjectsNotOwned">所有していないオブジェクトは着用できません。</notification>
-	<notification name="CantAttachNavmeshObjects">ナビメッシュに貢献しているオブジェクトは着用できません。</notification>
-	<notification name="CantAttachObjectNoMovePermissions">あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。</notification>
-	<notification name="CantAttachNotEnoughScriptResources">オブジェクトの着用に使用できるスクリプトリソースが足りません。</notification>
-	<notification name="CantDropItemTrialUser">オブジェクトをここにドロップできません。フリートライアル領域をお試しください。</notification>
-	<notification name="CantDropMeshAttachment">メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。</notification>
-	<notification name="CantDropAttachmentNoPermission">アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。</notification>
-	<notification name="CantDropAttachmentInsufficientResources">利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。</notification>
-	<notification name="CantDropObjectFullParcel">ここにオブジェクトをドロップできません。区画が埋まっています。</notification>
-	<notification name="CantTouchObjectBannedFromParcel">土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。</notification>
-	<notification name="PlzNarrowDeleteParams">削除パラメーターを絞ってください。</notification>
-	<notification name="UnableToUploadAsset">資産をアップロードできません。</notification>
-	<notification name="CantTeleportCouldNotFindUser">ホームをテレポートするユーザーが見つかりませんでした。</notification>
-	<notification name="GodlikeRequestFailed">過剰なリクエストが失敗しました</notification>
-	<notification name="GenericRequestFailed">一般的なリクエストに失敗しました</notification>
-	<notification name="CantUploadPostcard">ポストカードをアップロードできません。後でもう一度お試しください。</notification>
-	<notification name="CantFetchInventoryForGroupNotice">グループ通知のインベントリの詳細を取得できません。</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">グループ通知の送信が許可されないため、送信できません。</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。持ち物を作成することもできません。</notification>
-	<notification name="CantParceInventoryInNotice">通知内の持ち物を検出できません。</notification>
-	<notification name="TerrainUploadFailed">地形のアップロードに失敗しました。</notification>
-	<notification name="TerrainFileWritten">地形ファイルが書き込まれました。</notification>
-	<notification name="TerrainFileWrittenStartingDownload">地形ファイルを書き出し、ダウンロードを開始しています...</notification>
-	<notification name="TerrainBaked">地形がベークされました。</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。</notification>
-	<notification name="UpdateViewerBuyParcel">この区画を購入するには、ビューワをアップデートする必要があります。</notification>
-	<notification name="CantBuyParcelNotForSale">購入することができません。この区画は販売対象ではありません。</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">販売価格または土地の面積が変わったため、購入できません。</notification>
-	<notification name="CantBuyParcelNotAuthorized">あなたはこの区画の委任された買い手ではありません。</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">すでに購入の認証を待機しているため、この区画を購入できません。</notification>
-	<notification name="CantBuildOverflowParcel">区画をオーバーフローするため、ここでオブジェクトを構築することはできません。</notification>
-	<notification name="SelectedMultipleOwnedLand">所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。</notification>
-	<notification name="CantJoinTooFewLeasedParcels">選択範囲のリース区画の数が少ないため、参加できません。</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">土地を分割できません。
-複数の区画が選択されました。
-小さい区画を選択してください。</notification>
-	<notification name="CantDivideLandCantFindParcel">土地を分割できません。
-区画が見つかりません。
-「ヘルプ」 -&gt; 「バグの報告」で報告してください。</notification>
-	<notification name="CantDivideLandWholeParcelSelected">土地を分割できません。区画全体が選択されています。
-小さい区画を選択してください。</notification>
-	<notification name="LandHasBeenDivided">土地が分割されています。</notification>
-	<notification name="PassPurchased">入場許可を購入しました。</notification>
-	<notification name="RegionDisallowsClassifieds">リージョンでは、クラシファイド広告を許可しません。</notification>
-	<notification name="LandPassExpireSoon">この土地への入場許可はまもなく期限が切れます。</notification>
-	<notification name="CantSitNoSuitableSurface">配置に適した表面がありません。別の場所を試してみたください。</notification>
-	<notification name="CantSitNoRoom">ここには座る余地がありません。他の場所を試してください。</notification>
-	<notification name="ClaimObjectFailedNoPermission">権限がないため、オブジェクトを取得できませんでした。</notification>
-	<notification name="ClaimObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの取得に失敗しました。</notification>
-	<notification name="CantDeedGroupLand">グループ所有の土地は、譲渡できません。</notification>
-	<notification name="BuyObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの購入に失敗しました。</notification>
-	<notification name="BuyInventoryFailedNoMoney">リンデンドルが不足しているため、インベントリを購入できませんでした。</notification>
-	<notification name="BuyPassFailedNoMoney">リンデンドルが足りないため、この土地への入場許可を購入できません。</notification>
-	<notification name="CantBuyPassTryAgain">今すぐには入場許可を購入できません。後でもう一度お試しください。</notification>
-	<notification name="CantCreateObjectParcelFull">区画が埋まっているため、オブジェクトを\n作成することができません。</notification>
-	<notification name="FailedPlacingObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。</notification>
-	<notification name="CantCreateLandmarkForEvent">イベントのためのランドマークを作成することができません。</notification>
-	<notification name="GodBeatsFreeze">強力な力でフリーズを解除します。</notification>
-	<notification name="SpecialPowersRequestFailedLogged">特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。</notification>
-	<notification name="ExpireExplanation">システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。</notification>
-	<notification name="DieExplanation">システムは、あなたのリクエストを処理できません。</notification>
-	<notification name="AddPrimitiveFailure">プリミティブ広告を出すには、資金が足りません。</notification>
-	<notification name="RezObjectFailure">資金が足りないため、オブジェクトを作成できません。</notification>
-	<notification name="ResetHomePositionNotLegal">ホームが不正なため、ホームの位置をリセットします。</notification>
-	<notification name="CantInviteRegionFull">リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。</notification>
-	<notification name="CantSetHomeAtRegion">このリージョンでは、ここにホームの位置を設定できません。</notification>
-	<notification name="ListValidHomeLocations">ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。</notification>
-	<notification name="SetHomePosition">家の配置の設定。</notification>
-	<notification name="CantDerezInventoryError">インベントリエラーのため、オブジェクトの Rez 解除ができません。</notification>
-	<notification name="CantCreateRequestedInv">リクエストされたインベントリを作成できません。</notification>
-	<notification name="CantCreateRequestedInvFolder">リクエストされた持ち物フォルダーを作成できません。</notification>
-	<notification name="CantCreateInventory">そのインベントリを作成できません。</notification>
-	<notification name="CantCreateLandmark">ランドマークを作成できません。</notification>
-	<notification name="CantCreateOutfit">アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。</notification>
-	<notification name="InventoryNotForSale">インベントリは販売対象ではありません。</notification>
-	<notification name="CantFindInvItem">持ち物アイテムを見つけることができません。</notification>
-	<notification name="CantFindObject">オブジェクトが見つかりません。</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">オブジェクトへの送金は、このリージョンでは現在無効にされています。</notification>
-	<notification name="DroppedMoneyTransferRequest">システムロードにより、支払いを実行できません。</notification>
-	<notification name="CantPayNoAgent">支払いの相手を把握できませんでした。</notification>
-	<notification name="CantDonateToPublicObjects">パブリックオブジェクトにリンデンドルを与えることはできません。</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">インワールドオブジェクトでのインベントリ作成に失敗しました。</notification>
-	<notification name="UserBalanceOrLandUsageError">内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。</notification>
-	<notification name="LargePrimAgentIntersect">他の住民と交差する大きなプリムを作成することはできません。他の住民が移動した場合は再度お試しください。</notification>
-	<notification name="PreferenceChatClearLog">
-		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
-		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
-		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		ファイルを移動できません。以前のパスがリストアされました。
-		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="DefaultObjectPermissions">
-		デフォルトのオブジェクト権限を保存するときに問題が発生しました: [REASON]。後でデフォルトの権限を設定してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChatHistoryIsBusyAlert">
-		チャット履歴ファイルが前の操作でビジーです。2、3 分経ってからもう一度試すか、別の人とのチャットを選択してください。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="OutfitPhotoLoadError">
-		[REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FailedToFindSettings">データベースから [NAME] の設定の読み込みができませんでした。</notification>
-	<notification name="FailedToLoadSettingsApply">環境にこれらの設定を適用することができません。</notification>
-	<notification name="FailedToBuildSettingsDay">環境にこれらの設定を適用することができません。</notification>
-	<notification name="NoEnvironmentSettings">このリージョンは環境設定をサポートしていません。</notification>
-	<notification label="アウトフィットを保存する" name="SaveSettingAs">
-		現在の環境設定を次の内容で保存する：
-		<form name="form">
-			<input name="message">[DESC] （新）</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification name="WLImportFail">[FILE] から過去のウインドライトの設定 [NAME] をインポートできません。 
-
-[REASONS]</notification>
-	<notification name="WLParcelApplyFail">この区画で環境を設定することはできません。
-変更する権限のある区画を入力または選択してください。</notification>
-	<notification name="SettingsUnsuported">このリージョンでは設定をサポートしていません。
-設定に対応しているリージョンに移動し、アクションを再試行してください。</notification>
-	<notification name="SettingsConfirmLoss">
-		&quot;[NAME]&quot;と名付けられたこの [TYPE] に加えられた変更が失われます。
-続けますか？
-		<usetemplate ignoretext="変更を失いますがよろしいですか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="SettingsConfirmReset">
-		適用されたすべての設定を削除しようとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="PersonalSettingsConfirmReset">
-		適用されたすべての個人的な照明の設定を削除しようとしています。
-続けますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="SettingsMakeNoTrans">
-		このデイサイクルに移行不可の設定をインポートしようとしています。このまま続けると、編集中の設定も移行不可になります。
+  <notification name="NoValidSession">無効なセッションIDです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoValidCircuit">無効な回路コードです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPendingConnection">接続を生成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InternalUsherError">エージェント案内に接続時に、内部エラーが発生しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoGoodTPDestination">このリージョン（地域）では、適切なテレポート目的地が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InternalErrorRegionResolver">リージョンリゾルバーを有効化しようとしたときに内部エラーが発生しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoValidLanding">有効な着地点が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoValidParcel">有効な区画が見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ObjectGiveItem">[NAME_SLURL]が所有する&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;という名前のオブジェクトが、あなたに[OBJECTTYPE]を渡しました：
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+    <form name="form">
+      <button name="Keep" text="受け取る" />
+      <button name="Discard" text="破棄" />
+      <button name="Mute" text="所有者をブロック" />
+    </form>
+  </notification>
+
+  <notification name="OwnObjectGiveItem">オブジェクト「&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;」が、あなたに[OBJECTTYPE]を渡しました：
+
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+    <form name="form">
+      <button name="Keep" text="キープ" />
+      <button name="Discard" text="処分する" />
+    </form>
+  </notification>
+
+  <notification name="UserGiveItem">[NAME_SLURL] が、あなたに[OBJECTTYPE]を渡しました：
+[ITEM_SLURL]
+    <form name="form">
+      <button name="Show" text="表示" />
+      <button name="Discard" text="破棄" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="GodMessage">[NAME]
+
+[MESSAGE]</notification>
+
+  <notification name="JoinGroup">[MESSAGE]
+    <tag>group</tag>
+    <form name="form">
+      <button name="Join" text="参加" />
+      <button name="Decline" text="辞退" />
+      <button name="Info" text="情報" />
+    </form>
+  </notification>
+
+  <notification name="TeleportOffered">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Teleport" text="テレポート" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="TeleportOffered_MaturityExceeded">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
+
+このリージョン（地域）には[REGION_CONTENT_MATURITY]コンテンツが含まれていますが、現在の初期設定は[REGION_CONTENT_MATURITY]コンテンツを除外するように設定されています。初期設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Teleport" text="変更して続ける" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+  <notification name="TeleportOffered_MaturityBlocked">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
+
+ただし、このリージョン（地域）には成人のみアクセスできるコンテンツが含まれています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportOfferSent">[TO_NAME]にテレポートを送りました。</notification>
+
+  <notification name="TeleportRequest">[NAME_SLURL]は、テレポートであなたを呼んでいます。
+[MESSAGE]
+
+テレポートのオファーを受けますか？
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Yes" text="はい"/>
+      <button name="No" text="いいえ"/>
+    </form>
+  </notification>
+
+  <notification name="GotoURL">
+[MESSAGE]
+[URL]
+    <form name="form">
+      <button name="Later" text="あとで" />
+      <button name="GoNow..." text="今すぐ行く…" />
+    </form>
+  </notification>
+
+  <notification name="OfferFriendship">[NAME_SLURL] は、あなたにフレンド登録を申し込んでいます。
+
+[MESSAGE]
+
+（デフォルト設定だとお互いのオンライン状態を見ることができます）
+    <tag>friendship</tag>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="断る" />
+    </form>
+  </notification>
+
+  <notification name="FriendshipOffered">[TO_NAME]にフレンド登録依頼を送りました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="OfferFriendshipNoMessage">[NAME_SLURL] は、フレンド登録を申し込んでいます。（デフォルト設定だとお互いのオンライン状態を見ることができます）
+    <tag>friendship</tag>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="断る" />
+    </form>
+  </notification>
+
+  <notification name="FriendshipAccepted">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を受け入れました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="FriendshipDeclined">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を断りました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="FriendshipAcceptedByMe">フレンドの登録依頼を受け入れました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="FriendshipDeclinedByMe">フレンドの登録依頼を断りました。
+    <tag>friendship</tag>
+  </notification>
+
+  <notification name="OfferCallingCard">[NAME]が、コーリングカードを渡そうとしています。
+あなたのインベントリにブックマークが追加され、この住人に素早くＩＭを送ることができます。
+    <tag>friendship</tag>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="辞退" />
+    </form>
+  </notification>
+
+  <notification name="RegionRestartMinutes">このリージョン「[NAME]」は、[SECONDS]分後に再起動されます。
+このまま、このリージョンに留まっているとログアウトされます。</notification>
+
+  <notification name="RegionRestartSeconds">このリージョン「[NAME]」は、[SECONDS]秒後に再起動されます。
+このまま、このリージョンに留まっているとログアウトされます。</notification>
+
+  <notification name="LoadWebPage">のWebページ[URL] を開きますか？
+
+[MESSAGE]
+
+送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;　所有者：[NAME_SLURL]
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Gotopage" text="ページに移動" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="FailedToFindWearableUnnamed">データベースに[TYPE]は見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToFindWearable">データベースに[DESC]という名前の[TYPE]は見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidWearable">着用しようとしているアイテムはあなたのビューアーでは読み込むことができません。[APP_NAME]のバージョンをアップグレードしてからこのアイテムを着用してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ScriptQuestion">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、次のことをしようとしています：
+
+[QUESTIONS]
+よろしいですか？ 
+    <tag>fail</tag>
+    <form name="form">
+      <button name="Yes" text="はい" />
+      <button name="No" text="いいえ" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="ExperienceAcquireFailed">新しい体験を取得できません：
+[ERROR_MESSAGE]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NotInGroupExperienceProfileMessage">所有者が選択されたグループのメンバーでないため、体験グループへの変更が無視されました。</notification>
+
+  <notification name="UneditableExperienceProfileMessage">体験プロフィールを更新するときに、編集不可の「[field]」フィールドが無視されました。</notification>
+
+  <notification name="RestrictedToOwnerExperienceProfileMessage">体験の所有者のみが設定できる「[field]」フィールドへの変更を無視しました。</notification>
+
+  <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">所有者のレーティング区分より高いレーティング区分の体験を設定できません。</notification>
+
+  <notification name="RestrictedTermExperienceProfileMessage">次の条件により、体験プロフィール名および説明の更新ができませんでした：[extra_info]</notification>
+
+  <notification name="TeleportedHomeExperienceRemoved">体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name]リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
+    <form name="form">
+      <ignore name="ignore" text="体験を削除するために、リージョンから追放されました" />
+    </form>
+  </notification>
+
+  <notification name="TrustedExperienceEntry">キー体験 secondlife:///app/experience/[public_id]/profile に参加することにより、[region_name]リージョンに入ることを許可されました。
+この体験を削除すると、このリージョンから追放される可能性があります。
+    <form name="form">
+      <ignore name="ignore" text="体験によりリージョンに入ることを許可されました" />
+    </form>
+  </notification>
+
+  <notification name="TrustedExperiencesAvailable">この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます：
+[EXPERIENCE_LIST]
+
+その他のキー体験を利用できます。</notification>
+
+  <notification name="ExperienceEvent">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション（[EventType]）を実行することが許可されました。
+所有者：secondlife:///app/agent/[OwnerID]/inspect
+オブジェクト名：[ObjectName]
+区画名：[ParcelName]</notification>
+
+  <notification name="ExperienceEventAttachment">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、添付ファイルでアクション（[EventType]）を実行することが許可されました。
+所有者：secondlife:///app/agent/[OwnerID]/inspect</notification>
+
+  <notification name="ScriptQuestionExperience">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、[GRID_WIDE]体験への参加を要求しています：
+[EXPERIENCE]権限が許可されると、体験プロフィールから呼び出さない限り、この体験にこのメッセージが再び表示されることはありません。
+この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます：
+[QUESTIONS]
+よろしいですか？
+    <unique combine="combine_with_new">
+      <context>experience</context>
+    </unique>
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="BlockExperience" text="体験をブロック" />
+      <button name="Mute" text="オブジェクトをブロックする" />
+      <button name="Yes" text="はい" />
+      <button name="No" text="いいえ" />
+    </form>
+  </notification>
+
+  <notification name="ScriptQuestionCaution">警告：オブジェクト「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」は、あなたのリンデンドルアカウントへの完全なアクセスを求めています。アクセスを許可すると、追加の警告なしで、いつでもアカウントから資金が削除されたり、アカウントが完全に空になったりする可能性があります。
+  
+アカウントへのアクセスが必要な理由が十分に理解できない場合は、アクセスを許可しないでください。
+
+    <tag>confirm</tag>
+    <form name="form">
+      <button name="Grant" text="トータルアクセスを許可" />
+      <button name="Deny" text="拒否" />
+    </form>
+    <footer>[FOOTERTEXT]</footer>
+  </notification>
+
+  <notification name="ScriptDialog">[NAME]の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
+[MESSAGE]
+    <form name="form">
+      <button name="Client_Side_Mute" text="ブロック" />
+      <button name="Client_Side_Ignore" text="無視" />
+    </form>
+  </notification>
+
+  <notification name="ScriptDialogGroup">&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
+[MESSAGE] 
+    <tag>group</tag>
+    <form name="form">
+      <button name="Client_Side_Mute" text="ブロック" />
+      <button name="Client_Side_Ignore" text="無視" />
+    </form>
+  </notification>
+
+  <!--
+  <notification name="FirstBalanceIncrease"">
+   <tag>win</tag>
+You just received L$[AMOUNT].
+Your L$ balance is shown in the upper-right.
+  </notification>
+
+  <notification name="FirstBalanceDecrease">
+You just paid L$[AMOUNT].
+Your L$ balance is shown in the upper-right.
+  </notification>
+-->
+
+  <notification name="BuyLindenDollarSuccess">お支払ありがとうございます。
+
+あなたのL$残高は、処理が完了するとアップデートされます。処理に２０分以上かかった場合、お取り引きがキャンセルされることがあります。その場合は、購入金額はあなたの US$残高に追加されます。 [https://secondlife.com/my/account/?lang=ja-JP マイアカウント]の取引履歴ページで、支払状況を確認できます。
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="FirstOverrideKeys">あなたの移動キーをオブジェクトが操作しています。
+矢印かAWSDのキーで動作を確認してください。
+銃などのオブジェクトだと、一人称視点に変更する必要があります。
+「M」キーを押して変更します。</notification>
+
+  <notification name="FirstSandbox">ここはサンドボックスエリアです。住人が制作を学ぶことができます。
+ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、インベントリに入れてお持ち帰りするのをお忘れなく。</notification>
+
+  <notification name="MaxListSelectMessage">このリストから[MAX_SELECT]個までのアイテムを選択できます。</notification>
+
+  <notification name="VoiceInviteP2P">[NAME]があなたをボイスチャットコールに招待しています。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>NAME</context>
+    </unique>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="AutoUnmuteByIM">[NAME]はインスタントメッセージを受け取り、自動的にブロックが解除されました。</notification>
+
+  <notification name="AutoUnmuteByMoney">[NAME]はお金を受け取り、自動的にブロックが解除されました。</notification>
+
+  <notification name="AutoUnmuteByInventory">[NAME]はインベントリを受け取り、自動的にブロックが解除されました。</notification>
+
+  <notification name="VoiceInviteGroup">[NAME]は &lt;nolink&gt;[GROUP]&lt;/nolink&gt;のボイスチャットコールに参加しました。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>NAME</context>
+      <context>GROUP</context>
+    </unique>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="VoiceInviteAdHoc">[NAME]は、会話チャットでボイスチャットコールに参加しました。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="InviteAdHoc">[NAME]があなたを会話チャットに招待しています。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>NAME</context>
+    </unique>
+    <form name="form">
+      <button name="Accept" text="受け入れる" />
+      <button name="Decline" text="拒否" />
+      <button name="Mute" text="ブロック" />
+    </form>
+  </notification>
+
+  <notification name="VoiceChannelFull">あなたが参加しようとしているボイスコール[VOICE_CHANNEL_NAME]は、参加者が最大限に達しました。後でもう一度お試しください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="ProximalVoiceChannelFull">
+このエリアのボイスチャットは、混雑のため容量を超えてしまっています。申し訳ありませんが、他のエリアでボイスチャットをお試しください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceChannelDisconnected">[VOICE_CHANNEL_NAME]への接続が切れました。
+「近隣のボイスチャット」に再接続されます。
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceChannelDisconnectedP2P">[VOICE_CHANNEL_NAME]がコールを終了しました。
+「近隣のボイスチャット」に再接続されます。
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="P2PCallDeclined">[VOICE_CHANNEL_NAME]があなたのコールを拒否しました。
+「近隣のボイスチャット」に再接続されます。
+    <tag>voice</tag>
+    <tag>fail</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="P2PCallNoAnswer">[VOICE_CHANNEL_NAME]はあなたのコールを受けることができません。
+「近隣のボイスチャット」に再接続されます。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceChannelJoinFailed">[VOICE_CHANNEL_NAME]への接続に失敗しました。あとで再度お試しください。
+「近隣のボイスチャット」に再接続されます。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceEffectsExpired">ボイスモーフィング効果の１つ、または複数の有効期限が終了しました。
+期限を延長・更新するには [[URL] Click here] をクリックしてください。
+
+プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceEffectsExpiredInUse">ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
+期限を延長・更新するには[[URL] ここ]をクリックしてください。
+
+プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の１つ、または複数の有効期限が[INTERVAL]日以内に終了します。
+期限を延長・更新するには[[URL] ここ]をクリックしてください。
+
+プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="VoiceEffectsNew">新しいボイスモーフィング効果が登場！
+    <tag>voice</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: not a group member">特定のグループメンバーのみこのエリアを訪問することができます。
+    <tag>fail</tag>
+    <tag>group</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: banned">立入禁止されているため、この区画に入ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="Cannot enter parcel: not on access list">アクセスリストに含まれていないため、この区画に入ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="VoiceNotAllowed">あなたには[VOICE_CHANNEL_NAME]のボイスチャットに接続する権限がありません。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="VoiceCallGenericError">[VOICE_CHANNEL_NAME]のボイスチャットに接続中に、エラーが発生しました。後でもう一度お試しください。
+    <tag>fail</tag>
+    <tag>voice</tag>
+    <unique>
+      <context>VOICE_CHANNEL_NAME</context>
+    </unique>
+  </notification>
+
+  <notification name="UnsupportedCommandSLURL">クリックしたSLurlはサポートされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BlockedSLURL">信用できないブラウザからSLurlが送られてきたので、セキュリティのためブロックされました。
+    <tag>security</tag>
+  </notification>
+
+  <notification name="ThrottledSLURL">短期間のあいだに、信用できないブラウザから複数のSLurlが送られてきました。
+安全のために数秒間ブロックされます。</notification>
+  <notification name="IMToast">[MESSAGE]
+    <tag>security</tag>
+    <form name="form">
+      <button name="respondbutton" text="返答" />
+    </form>
+  </notification>
+
+  <notification name="ConfirmCloseAll">すべてのＩＭを閉じますか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="すべてのＩＭを閉じる前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AttachmentSaved">装着物が保存されました。</notification>
+
+  <notification name="AppearanceToXMLSaved">外観がXML[PATH]に保存されました</notification>
+
+  <notification name="AppearanceToXMLFailed">外観をXMLに保存できませんでした。</notification>
+
+  <notification name="SnapshotToComputerFailed">スナップショットを[PATH]に保存できませんでした：ディスクの空き容量が不足しています。
+[NEED_MEMORY]㎅が必要ですが、[FREE_MEMORY]㎅しかありません。</notification>
+
+  <notification name="SnapshotToLocalDirNotExist">スナップショットを[PATH]に保存できませんでした：ディレクトリは存在しません。</notification>
+
+  <notification name="PresetNotSaved">プリセット[NAME]の保存時にエラーが発生しました。</notification>
+
+  <notification name="DefaultPresetNotSaved">デフォルトのプリセットを上書きすることはできません。</notification>
+
+  <notification name="PresetAlreadyExists">「[NAME]」は使用中です。
+このプリセットを置き換えるか、別の名前を選択することができます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="PresetNotDeleted">プリセット[NAME]の削除時にエラーが発生しました。</notification>
+
+  <notification name="UnableToFindHelpTopic">ヘルプトピックが見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ObjectMediaFailure">サーバーエラー：メディアの更新に失敗しました。
+[ERROR]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="TextChatIsMutedByModerator">モデレーターがあなたの文字チャットをミュートしました。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="VoiceIsMutedByModerator">モデレーターがあなたのボイスをミュートしました。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FailedToGetBenefits">残念ながら、このセッションで特典情報を得ることができませんでした。これは通常の本番環境で起こるものではありません。
+恐れ入りますがサポートまでご連絡ください。このセッションが通常通り作動することはありません。再起動することをお勧めします。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BulkUploadCostConfirmation">[COUNT]個アイテムを一括アップロードします。総費用はL$ [COST]です。アップロードを続けてもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード" />
+  </notification>
+
+  <notification name="BulkUploadNoCompatibleFiles">選択されたファイルは一括アップロードできません。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BulkUploadIncompatibleFiles">選択されたファイルのいくつかは一括アップロードできません。
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="UploadCostConfirmation">このアップロードは L$ [PRICE]の費用がかかります。このままアップロードを続けてもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード" />
+  </notification>
+
+  <notification name="ConfirmClearTeleportHistory">テレポート履歴を削除しますか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="BottomTrayButtonCanNotBeShown">選択したボタンを現在表示することができません。
+十分なスペースができればボタンは表示されます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ShareNotification">共有する住人を選択します。</notification>
+
+  <notification name="MeshUploadErrorDetails">[LABEL]をアップロードできませんでした：[MESSAGE]
+[DETAILS]
+詳しくは、SecondLife.logをご覧ください。</notification>
+
+  <notification name="MeshUploadError">[LABEL]をアップロードできませんでした：[MESSAGE]
+
+詳しくは、SecondLife.logをご覧ください</notification>
+
+  <notification name="MeshUploadPermError">メッシュのアップロード許可をリクエスト中にエラーが発生しました。</notification>
+
+  <notification name="RegionCapabilityRequestError">リージョンの「[CAPABILITY]」という機能を取得できませんでした。</notification>
+
+  <notification name="ShareItemsConfirmation">次のアイテムを共有しますか？
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+次の住人と共有：&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ShareFolderConfirmation">フォルダは一度に１つしか共有できません。
+  
+次のアイテムを共有しますか？
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+次の住人と共有：&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Ok" />
+  </notification>
+
+  <notification name="ItemsShared">アイテムが共有されました。</notification>
+  <notification name="DeedToGroupFail">グループへの譲渡に失敗しました。
+    <tag>group</tag>
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleaseLandThrottled">区画「[PARCEL_NAME]」は現在放棄できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleasedLandWithReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
+
+同区画が他の住人に売り出される前の[RECLAIM_PERIOD]時間内であれば、無償で土地を取り戻すことができます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ReleasedLandNoReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
+一般に公開されたので、今なら誰でも購入可能です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarRezNotification">（作成後[EXISTENCE]秒経過）
+「[NAME]」というアバターは、[TIME]秒後に姿を現わします。</notification>
+
+  <notification name="AvatarRezSelfBakedDoneNotification">（作成後[EXISTENCE]秒経過）
+アウトフィットのベークは、[TIME]秒後に完了します。</notification>
+
+  <notification name="AvatarRezSelfBakedUpdateNotification">（作成後[EXISTENCE]秒経過）
+容姿の更新は、[TIME]秒後に送信されます。
+[STATUS]</notification>
+  <notification name="AvatarRezCloudNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、クラウドになります。</notification>
+
+  <notification name="AvatarRezArrivedNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、現れます。</notification>
+
+  <notification name="AvatarRezLeftCloudNotification">（[EXISTENCE]秒）
+アバター「[NAME]」は、[TIME]秒でクラウド状態から出現します。</notification>
+
+  <notification name="AvatarRezEnteredAppearanceNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、容姿編集モードに入りました。</notification>
+
+  <notification name="AvatarRezLeftAppearanceNotification">（[EXISTENCE]秒）
+アバター「[NAME]」が、容姿編集モードを解除しました。</notification>
+
+  <notification name="NoConnect">[PROTOCOL] [HOSTID]を使って接続できません。
+お使いのネットワークやファイアウォールの設定を確認してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NoVoiceConnect">ボイスサーバーに接続できません：
+
+[ホストID]
+
+音声に対して許可する必要があるポートは次のとおりです。
+TCP： 80, 443
+UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
+
+ネットワークとファイアウォールの設定を確認してください。
+ルーターの SIP ALG 機能を無効にします。
+
+音声通話は利用できなくなります。
+    <tag>voice</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="NoVoiceConnect-GIAB">ボイスサーバーに接続できません。
+  
+ボイスチャットによるコミュニケーションが利用できません。
+お使いのネットワークやファイアウォールの設定を確認してください。
+    <tag>voice</tag>
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AvatarRezLeftNotification">（[EXISTENCE]秒経過）
+アバター「[NAME]」は、完全に読み込まれています。</notification>
+
+  <notification name="AvatarRezSelfBakedTextureUploadNotification">（[EXISTENCE]秒経過）
+[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、アップロードされます。</notification>
+
+  <notification name="AvatarRezSelfBakedTextureUpdateNotification">（[EXISTENCE]秒経過）
+[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、ローカル反映されます。</notification>
+
+  <notification name="CannotUploadTexture">テクスチャをアップロードできません。
+[REASON]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LivePreviewUnavailable">コピー不可／転送不可のため、このテクスチャを表示できません。
+    <usetemplate ignoretext="コピー不可／転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FacePasteFailed">ペーストに失敗しました：[REASON]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="FacePasteTexturePermissions">アクセス許可が制限されたテクスチャを適用したため、オブジェクトはテクスチャの持つアクセス制限を継承します。
+    <usetemplate ignoretext="ペースト：権限が制限されているテクスチャを適用した。" name="notifyignore"/>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="ConfirmLeaveCall">このコールから抜けてもよろしいですか？
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="ConfirmMuteAll">グループコールの参加者全員をミュートしました。
+あとからこのコールに参加する住人もミュートされます。
+あなたがコールを終了しても他の参加者のミュート状態が続きます。
+
+全員をミュートしますか？
+    <unique />
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification label="チャット" name="HintChat">チャットに参加するには、画面下のチャットフィールドにテキストを入力します。
+    <unique />
+  </notification>
+
+  <notification label="立ち上がる" name="HintSit">座る姿勢から立ち上がるには、「立ち上がる」ボタンをクリックします。
+    <unique />
+  </notification>
+
+  <notification label="話す" name="HintSpeak">「スピーカー」ボタンをクリックすると、マイクのオン・オフが切り替わります。
+
+上矢印をクリックすると、ボイスコントロールパネルが表示されます。
+
+「スピーカー」ボタンを非表示にすると、ボイス機能も無効になります。
+    <unique />
+  </notification>
+
+  <notification label="世界を探検" name="HintDestinationGuide">行き先ガイドには数多くの探索場所が含まれます。どこか行きたい場所をみつけたら、テレポートして探索に出かけましょう。
+    <unique />
+  </notification>
+
+  <notification label="サイドパネル" name="HintSidePanel">サイドパネルから、インベントリや服装、プロフィールなどに素早くアクセスできます。
+    <unique />
+  </notification>
+
+  <notification label="移動" name="HintMove">歩行や走行は、「移動」パネルを開き、矢印コントロールによって操作します。この操作はキーボードの矢印キーで実行することも可能です。
+    <unique />
+  </notification>
+
+  <notification label="" name="HintMoveClick">⒈クリックで移動
+行地面の一箇所をクリックすると、その場所まで歩きます。
+
+⒉クリック・ドラッグで視界を回転
+任意の場所をクリックしてドラッグすると視界を回転させることができます。
+    <tag>custom_skin</tag>
+  </notification>
+
+  <notification label="表示名" name="HintDisplayName">表示名（カスタマイズ可能）を設定します。ユーザー名は固有で変更できませんが、ここで追加する表示名は変更可能です。他の住人の名前の表示方法は初期設定で変更してください。
+    <unique />
+  </notification>
+
+  <notification label="表示" name="HintView">カメラの視点を変更するには、水平・垂直コントロールを使います。Escキーを押すか、移動キーを押すると、視点がリセットされます。
+    <unique />
+    <tag>custom_skin</tag>
+  </notification>
+
+  <notification label="インベントリ" name="HintInventory">インベントリには、あなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。
+    <unique />
+  </notification>
+
+  <notification label="あなたのリンデンドル" name="HintLindenDollar">これがあなたのL$残高です。リンデンドルを購入するには「L$の購入」をクリックします。
+    <unique />
+    <tag>funds</tag>
+  </notification>
+
+  <notification name="LowMemory">メモリプール残量が少なくなっています。クラッシュを避けるため[APP_NAME]の機能の一部は無効になりました。他のアプリケーションを終了し、状況が継続または再発する場合にはSecond Lifeを再起動してください。</notification>
+
+  <notification name="ForceQuitDueToLowMemory">メモリ不足のため３０秒以内に[APP_NAME]は終了します。</notification>
+
+  <notification name="SOCKS_NOT_PERMITTED">ルールセットによって許可されていないため、SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;が接続を拒絶しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_CONNECT_ERROR">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot; が接続を拒絶したため、TCPチャンネルを開くことができませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_NOT_ACCEPTABLE">OCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、選択された認証システムを拒絶しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_AUTH_FAIL">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、あなたの資格が無効だと報告しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_UDP_FWD_NOT_GRANTED">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、UDPアソシエートのリクエストを拒絶しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_HOST_CONNECT_FAILED">SOCKS 5プロキシサーバー&quot;[HOST]:[PORT]&quot;に接続できませんでした。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_UNKNOWN_STATUS">不明のプロキシエラーがサーバー&quot;[HOST]:[PORT]&quot;で発生しました。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_INVALID_HOST">SOCKS 5プロキシのアドレスまたはポート&quot;[HOST]:[PORT]&quot;が無効です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="SOCKS_BAD_CREDS">SOCKS 5 のユーザー名またはパスワードが正しくありません。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PROXY_INVALID_HTTP_HOST">HTTP プロキシのアドレス、またはポート &quot;[HOST]:[PORT]&quot;が無効です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PROXY_INVALID_SOCKS_HOST">SOCKS プロキシのアドレス、またはポート&quot;[HOST]:[PORT]&quot;が無効です。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChangeProxySettings">プロキシの設定は[APP_NAME]を再起動後に反映されます。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="AuthRequest">「[REALM]」にある「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;」のサイトには、ユーザー名とパスワードが必要です。
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="username" text="ユーザー名" />
+      <input name="password" text="パスワード" />
+      <button name="ok" text="送信" />
+      <button name="cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification label="" name="NoClassifieds">クラシファイド広告の作成と編集は、拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoGroupInfo">グループの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoPlaceInfo">場所のプロフィールの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoPicks">ピックの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoWorldMap">ワールドマップの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoVoiceCall">ボイスコールは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoAvatarShare">共有は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoAvatarPay">他の住人への支払いは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoInventory">インベントリの表示は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoAppearance">容姿エディターは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="NoSearch">検索は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique />
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
+  </notification>
+
+  <notification label="" name="ConfirmHideUI">この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには、[SHORTCUT]をもう一度クリックしてください。
+    <unique />
+    <tag>confirm</tag>
+    <usetemplate ignoretext="ＵＩを非表示前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom">選択された一部のリンクセットはファントムフラグが切り替えられます。
+  
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットのファントムフラグの切替えができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_MismatchOnRestricted">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」 に設定されます。
+  
+続けてもよろしいですか？
+    <tag>confirm</tag>？
+    <usetemplate ignoretext="リンクセットの権限制限のため変更ができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_MismatchOnVolume">選択された一部のリンクセットは、形状が凸状でないため「[REQUESTED_TYPE]」に設定できません。
+  
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの形状が凸状でないため変更できなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">選択された一部のリンクセットはファントムフラグが切り替えられます。
+  
+一部の選択されたリンクセットは、リンクセットへの権限が制限されているため「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部のファントムフラグの設定ができたが、権限設定できなかったものがあった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
+  
+選択された一部のリンクセットは、形状が凸状でないため「[REQUESTED_TYPE]」に設定できません。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部のファントムフラグは切り替えられたが、他のリンクセットは形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため「[REQUESTED_TYPE]」に設定できません。
+
+これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。選択された一部のリンクセットは、形状が凸状でないため、「[REQUESTED_TYPE]」に設定できません。
+
+これらのリンクセットの用途タイプは変わりません。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部の権限が制限されており、また形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
+
+一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。
+
+選択された一部のリンクセットは、形状が凸状でないため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットの用途タイプは変わりません。
+
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リンクセットの一部のファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限され、また形状が凸状でないため設定できません。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PathfindingLinksets_ChangeToFlexiblePath">選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <global name="UnsupportedGLRequirements">[APP_NAME]の動作に必要なハードウェア要件を満たしていないようです。[APP_NAME]にはマルチテクスチャをサポートするOpenGLグラフィックカードが必要です。
+お使いのグラフィックカードの最新ドライバがインストールされているか、もしくは、オペレーティングシステムに最新のサービスパックやパッチが当たっているかをご確認ください。
+
+この問題が何度も起きる場合は、[SUPPORT_SITE]をご確認ください。</global>
+  <global name="UnsupportedCPUAmount">796</global>
+
+  <global name="UnsupportedRAMAmount">510</global>
+
+  <global name="UnsupportedGPU">－あなたのグラフィックカードは、必須動作環境の条件を満たしていません。</global>
+
+  <global name="UnsupportedRAM">－あなたのシステムメモリは、必須動作環境の条件を満たしていません。</global>
+
+  <global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">自分の土地を持っている場合、そこを「ホーム」に設定できます。持っていない場合は、マップから「情報ハブ」をお探しください。</global>
+
+  <global name="You died and have been teleported to your home location">死んでしまったので、ホームにテレポートされました。</global>
+
+  <notification name="LocalBitmapsUpdateFileNotFound">[FNAME]が見つからなかったため、更新できませんでした。
+このファイルに対する今後の更新を無効にします。</notification>
+
+  <notification name="LocalBitmapsUpdateFailedFinal">[FNAME]は、[NRETRIES]回の試行で開くこともデコードすることもできなかったため、壊れているとみなしました。
+このファイルに対する今後の更新を無効にします。</notification>
+
+  <notification name="LocalBitmapsVerifyFail">開いたりデコードすることができない、無効である、もしくは読み取り不能な画像ファイル「[FNAME]」を追加しようとしました。
+この試行はキャンセルされました。</notification>
+
+  <notification name="PathfindingReturnMultipleItems">[NUM_ITEMS]個のアイテムを返却中しようとしています。
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="PathfindingDeleteMultipleItems">[NUM_ITEMS]個のアイテムを削除しようとしています。
+このまま続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+
+  <notification name="AvatarFrozen">[AV_FREEZER]によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarFrozenDuration">[AV_FREEZER]によって、あなたは[AV_FREEZE_TIME]秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="YouFrozeAvatar">アバターがフリーズされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarHasUnFrozenYou">[AV_FREEZER]によってフリーズが解除されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarUnFrozen">アバターのフリーズが解除されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarFreezeFailure">その区画の管理権限を持っていないため、フリーズに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarFreezeThaw">フリーズ期間が切れました。仕事に戻ってください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarCantFreeze">残念ながら、そのユーザーをフリーズできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NowOwnObject">これで、オブジェクト[OBJECT_NAME]の所有者になりました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRezOnLand">この土地の所有者が許可していないため、[OBJECT_POS]でオブジェクトをRezすることができません。土地ツールを使用して、土地の所有を確認してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezFailTooManyRequests">リクエストが多すぎて、オブジェクトをRezすることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SitFailCantMove">今回移動できなかったため、座ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SitFailNotAllowedOnLand">その土地に対して許可を受けていないため、座ることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SitFailNotSameRegion">移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoNewObjectRegionFull">新しいオブジェクトを作成できません。リージョンが埋まっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToPlaceObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoOwnNoGardening">所有していない土地に木や草を植えることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCopyPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、コピーに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoTransPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を譲渡する権限がないため、コピーに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AddToNavMeshNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt; は、ナビメッシュに関連付けがあるため、コピーに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DupeWithNoRootsSelected">ルートオブジェクトを選択せずに複製します。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDupeCuzRegionIsFull">リージョン（地域）が埋まっているため、オブジェクトのコピーを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDupeCuzParcelNotFound">オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateCuzParcelFull">区画がいっぱいのため、オブジェクトを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezAttemptFailed">オブジェクトのRezに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ToxicInvRezAttemptFailed">このリージョン（地域）で問題を引き起こすアイテムは作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvItemIsBlacklisted">そのインベントリアイテムは、ブラックリストに登録されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCanRezObjects">現在あなたには、オブジェクトを作成する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandSearchBlocked">土地の検索がブロックされました。
+短期間に多くの土地を検索したためです。
+
+お手数ですが、しばらくしてからもう一度やり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NotEnoughResourcesToAttach">オブジェクトの着用に使用できるスクリプトのリソースが足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="YouDiedAndGotTPHome">死んでしまったので、ホームにテレポートされました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="EjectComingSoon">ここへの入場が許可されていないため、[EJECT_TIME]秒後に追放されます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoEnterRegionMaybeFull">このリージョン（地域）「[NAME]」へ入場することはできません。
+いっぱいになるか、すぐに再起動される可能性があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SaveBackToInvDisabled">「インベントリに保存」が無効になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoExistNoSaveToContents">「存在しません」からrezされたため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNoSaveToContents">あなたには、オブジェクト &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt;を修正する権限がないため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSaveBackToInvDisabled">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をインベントリに保存できません。この操作は無効になりました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCopyNoSelCopy">あなたには、オブジェクト &lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、選択内容をコピーできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoTransNoSelCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoTransNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsNoRemoval">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をシミュレーターから削除することは、権限のシステムにより許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNoSaveSelection">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を保存できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoCopyNoSaveSelection">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;はコピー不可なため、選択内容を保存できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNoTaking">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を選ぶことはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezDestInternalError">内部エラー：不明な宛先タイプ。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DeleteFailObjNotFound">そのオブジェクトは、見つからないため削除できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SorryCantEjectUser">残念ながら、そのユーザーを追放することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionSezNotAHome">このリージョンでは、ここにホームの位置を設定できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HomeLocationLimits">ホームの場所を設定できるのは、自分の土地か、またはメインランドの情報ハブでのみです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="HomePositionSet">家の配置の設定。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarEjected">アバターが追放されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AvatarEjectFailed">その区画の管理権限がないため、追放できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOParcelFull">区画がいっぱいなので、オブジェクト「[O]」を
+リージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOParcelPerms">ご使用のオブジェクトは、この区画で使用が許可されていないため、
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOParcelResources">この区画にこのオブジェクトのリソースが不足しているため、
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoParcelPermsNoObject">その区画へのアクセス権がないため、コピーが失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMORegionVersion">オブジェクトの受け取りに対応していない、旧バージョンを実行しているため、
+他のリージョン（地域）でリージョンをまたがる
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMONavMesh">リージョンの境界にわたって、ナビメッシュを変更できないため、
+オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CMOWTF">不明な理由により、オブジェクト「[O]」を
+リージョン（地域）[R]の[P]に移動できません。（[F]）
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermModifyObject">そのオブジェクトを変更する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TooMuchObjectInventorySelected">大きなインベントリを持つオブジェクトの選択が多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="CantEnablePhysObjContributesToNav">ナビメッシュに貢献するオブジェクトに対して物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantEnablePhysKeyframedObj">キーフレームオブジェクトのために物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantEnablePhysNotEnoughLandResources">土地のリソースが足りないため、オブジェクトの物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantEnablePhysCostTooGreat">[MAX_OBJECTS]より大きい物理リソースコストを持つオブジェクトでは、物理作用を有効にできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PhantomWithConcavePiece">このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableAddItem">アイテムを追加できません！
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableEditItem">これは編集できません！
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermToEdit">これを編集する許可がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermToCopyInventory">そのインベントリをコピーすることは許可されません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSaveItemDoesntExist">オブジェクトのコンテンツに保存できません。アイテムが存在していません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSaveItemAlreadyExists">オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSaveModifyAttachment">オブジェクトのコンテンツに保存できません。このため、装着物の権限が変更されます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AttachmentHasTooMuchInventory">ご使用の装着物に含まれるインベントリが多すぎるため、インベントリを追加できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="IllegalAttachment">添付ファイルはアバターの存在しない点を要求しました。代わりに胸に添付されていました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TooManyScripts">スクリプトが多すぎます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableAddScript">テキストを追加できません！
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AssetServerTimeoutObjReturn">アセットサーバーが適時に応答しませんでした。オブジェクトが地域に返されました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionDisablePhysicsShapes">このリージョンでは、物理的シェイプが有効にされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoModNavmeshAcrossRegions">リージョンの境界をまたぐナビメッシュは変更できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSetPhysicsPropertiesOnObjectType">そのオブジェクトタイプの物理的プロパティを設定できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSetRootPrimWithNoShape">ルートプリムを設定できないため、シェイプがありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoRegionSupportPhysMats">このリージョンでは、物理的素材が有効にされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="OnlyRootPrimPhysMats">物理的素材を調整できるのは、ルートプリムだけです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoSupportCharacterPhysMats">キャラクターへの物理的素材の設定はまだサポートされていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidPhysMatProperty">指定した物理的素材のプロパティが１つ以上無効です。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsAlterStitchingMeshObj">メッシュオブジェクトのメッシュ種別を変更することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsAlterShapeMeshObj">メッシュオブジェクトの形状を変更することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FullRegionCantEnter">リージョンが埋まっているため、このリージョンに入場できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedOwnersDiffer">リンクエラー－所有者が違います。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedNoModNavmeshAcrossRegions">リンクエラー－リージョンの境界をまたぐナビメッシュは変更できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedNoPermToEdit">リンクエラー－編集権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedTooManyPrims">リンクエラー－プリミティブが多すぎます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedCantLinkNoCopyNoTrans">リンクエラー－コピーなしと転送なしをリンクできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedNothingLinkable">リンクエラー－リンクできるものがありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedTooManyPathfindingChars">リンクエラー－経路探索の文字数が多すぎます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedInsufficientLand">リンクエラー－土地のリソースが足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LinkFailedTooMuchPhysics">オブジェクトが使用する物理リソースが多すぎます－そのダイナミクスが無効になっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="EstateManagerFailedllTeleportHome">[SLURL] のオブジェクト「[OBJECT_NAME]」で不動産マネージャーのホームをテレポートできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedHomeByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはホームにテレポートされました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedHomeByObject">​オブジェクト​「[OBJECT_NAME]」によって、あなたはホームへテレポートされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedByAttachment">[ITEM_ID]への装着物によって、あなたはテレポートされています。
+    <tag>fail</tag>
+    <usetemplate ignoretext="テレポート：装着物によりテレポートされました" name="notifyignore" />
+  </notification>
+
+  <notification name="TeleportedByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>fail</tag>
+    <usetemplate ignoretext="テレポート：区画上のオブジェクトによりテレポートされました" name="notifyignore" />
+  </notification>
+
+  <notification name="TeleportedByObjectOwnedBy">[OWNER_ID]が所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TeleportedByObjectUnknownUser">不明なユーザーが所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="StandDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが立つことを許可しません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ResitDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが席を変更することを許可しません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObjectRegionFull">リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateAnimatedObjectTooLarge">リグ入三角形の限度数を超えるため、リクエストされたアニメーションオブジェクトを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttackMultipleObjOneSpot">１つの箇所に複数のオブジェクトを着用することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateMultipleObjAtLoc">ここでは、複数のオブジェクトを作成することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToCreateObjTimeOut">リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToCreateObjUnknown">リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToCreateObjMissingFromDB">要求されたオブジェクトを作成できません。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezFailureTookTooLong">リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rezに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToPlaceObjAtLoc">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreatePlantsOnLand">この土地に木を植えることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRestoreObjectNoWorldPos">オブジェクトをリストアできません。ワールドの位置が見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRezObjectInvalidMeshData">メッシュデータが無効なため、オブジェクトをRezすることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantRezObjectTooManyScripts">このリージョンに既に多くのスクリプトが存在するため、オブジェクトをRezすることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObjectNoAccess">現在のアクセス権限では、そこにオブジェクトを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObject">現在あなたにはオブジェクト作成する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InvalidObjectParams">無効なオブジェクトパラメーター
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDuplicateObjectNoAcess">現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantChangeShape">あなたにはこのシェイプを変更する権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsTooManyAttachedAnimatedObjects">この操作を行うと、装着されたアニメーションオブジェクトが限度数を超えます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsLinkAnimatedObjectTooLarge">結果として、アニメーションオブジェクトがリグ入り三角形の限度数を超えるため、これらのオブジェクトを結合できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPermsSetFlagAnimatedObjectTooLarge">リグ入り三角形の限度数を超えるため、このオブジェクトをアニメーションオブジェクトにすることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantChangeAnimatedObjectStateInsufficientLand">このオブジェクトをアニメーションオブジェクトの状態に変えると、区画の限度数を超えるため変更できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ErrorNoMeshData">サーバーエラー：メッシュデータが読み込まれていないため、この操作を完了できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoAccessToClaimObjects">現在のアクセス権限では、ここにオブジェクトを取得できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DeedFailedNoPermToDeedForGroup">あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoPrivsToBuyObject">現在のアクセス権限では、ここでオブジェクトを購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachObjectAvatarSittingOnIt">アバターがオブジェクトに存在するため、オブジェクトを着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WhyAreYouTryingToWearShrubbery">木や草を装着物として着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachGroupOwnedObjs">グループが所有しているオブジェクトは着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachObjectsNotOwned">所有していないオブジェクトは着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachNavmeshObjects">ナビメッシュに貢献しているオブジェクトは着用できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachObjectNoMovePermissions">あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantAttachNotEnoughScriptResources">オブジェクトの着用に使用できるスクリプトリソースが足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropItemTrialUser">オブジェクトを下に置く事はできません。フリートライアル領域をお試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropMeshAttachment">メッシュ装着物を下に置く事はできません。インベントリから切り離して、ワールドでRezしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropAttachmentNoPermission">装着物を下に置く事に失敗しました。そこへ置ける権限がありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropAttachmentInsufficientLandResources">装着物のドロップに失敗しました。利用できる土地リソースの数が足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropAttachmentInsufficientResources">利用できるリソースが足りないため、装着物のドロップに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDropObjectFullParcel">ここにオブジェクトをドロップできません。区画が埋まっています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantTouchObjectBannedFromParcel">この土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PlzNarrowDeleteParams">削除パラメーターを絞ってください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UnableToUploadAsset">アセットをアップロードできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantTeleportCouldNotFindUser">ホームをテレポートするユーザーが見つかりませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="GodlikeRequestFailed">過剰なリクエストで失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="GenericRequestFailed">一般的なリクエストに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantUploadPostcard">ポストカードをアップロードできません。後でもう一度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantFetchInventoryForGroupNotice">グループ通知のインベントリの詳細を取得できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSendGroupNoticeNotPermitted">グループ通知の送信が許可されないため、送信できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。持ち物を作成することもできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantParceInventoryInNotice">通知内の持ち物を検出できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainUploadFailed">地形のアップロードに失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainFileWritten">地形ファイルが書き込まれました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainFileWrittenStartingDownload">地形ファイルを書き出し、ダウンロードを開始しています…
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TerrainBaked">地形がベークされました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TenObjectsDisabledPlzRefresh">選択された最初の１０個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UpdateViewerBuyParcel">この区画を購入するには、ビューアーを更新する必要があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyParcelNotForSale">購入することができません。この区画は販売対象ではありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuySalePriceOrLandAreaChanged">販売価格または土地の面積が変わったため、購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyParcelNotAuthorized">あなたは、この区画の委任された購入者ではありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyParcelAwaitingPurchaseAuth">すでに購入の認証を待機しているため、この区画を購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuildOverflowParcel">区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SelectedMultipleOwnedLand">所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantJoinTooFewLeasedParcels">選択範囲のリース区画の数が少ないため、参加できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDivideLandMultipleParcelsSelected">土地を分割できません。
+複数の区画が選択されました。
+小さい区画を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDivideLandCantFindParcel">土地を分割できません。
+区画が見つかりません。
+「ヘルプ」→「バグの報告」で報告してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDivideLandWholeParcelSelected">土地を分割できません。区画全体が選択されています。
+小さい区画を選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandHasBeenDivided">土地が分割されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PassPurchased">入場許可を購入しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RegionDisallowsClassifieds">このリージョン（地域）では、クラシファイド広告の掲載が許可されていません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LandPassExpireSoon">この土地への入場許可は、まもなく期限が切れます。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSitNoSuitableSurface">配置に適した表面がありません。別の場所を試してみたください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSitNoRoom">ここには座れる場所がありません。他の場所を試してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ClaimObjectFailedNoPermission">権限がないため、オブジェクトを取得できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ClaimObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの取得に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDeedGroupLand">グループ所有の土地は、譲渡できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの購入に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyInventoryFailedNoMoney">リンデンドルが不足しているため、インベントリを購入できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="BuyPassFailedNoMoney">リンデンドルが足りないため、この土地への入場許可を購入できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantBuyPassTryAgain">今すぐには入場許可を購入できません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateObjectParcelFull">区画が埋まっているため、オブジェクトを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedPlacingObject">指定した場所にオブジェクトを配置できませんでした。お手数ですが、もう一度やりなおしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateLandmarkForEvent">イベントのためのランドマークを作成することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="GodBeatsFreeze">強力な力でフリーズを解除します。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SpecialPowersRequestFailedLogged">特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ExpireExplanation">システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DieExplanation">システムは、あなたのリクエストを処理できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="AddPrimitiveFailure">プリミティブ広告を出すには、資金が足りません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="RezObjectFailure">資金が足りないため、オブジェクトを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ResetHomePositionNotLegal">ホームが不正なため、ホームの位置をリセットします。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantInviteRegionFull">リージョンが埋まっているため、現在の場所に誰かを招待することはできません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantSetHomeAtRegion">このリージョンでは、この位置にホームを設定できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="ListValidHomeLocations">ホームの場所を設定できるのは、自分の土地かメインランドの情報ハブのみです。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SetHomePosition">家の配置の設定。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDerezInventoryError">インベントリエラーのため、オブジェクトのRezの解除ができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateRequestedInv">リクエストされたインベントリを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateRequestedInvFolder">リクエストされた持ち物フォルダーを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateInventory">そのインベントリを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateLandmark">ランドマークを作成できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantCreateOutfit">アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InventoryNotForSale">インベントリは販売対象ではありません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantFindInvItem">持ち物アイテムを見つけることができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantFindObject">オブジェクトが見つかりません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantTransfterMoneyRegionDisabled">オブジェクトへの送金は、このリージョンでは現在無効にされています。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="DroppedMoneyTransferRequest">システムロードにより、支払いを実行できません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantPayNoAgent">支払いの相手を把握できませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CantDonateToPublicObjects">パブリックオブジェクトにリンデンドルを与えることはできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="InventoryCreationInWorldObjectFailed">インワールドオブジェクトでのインベントリ作成に失敗しました。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="UserBalanceOrLandUsageError">内部エラーが発生したため、ビューアーを正しく更新できませんでした。ビューアーに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="LargePrimAgentIntersect">他の住民と交差する大きなプリムを作成することはできません。他の住民が移動した場合は再度お試しください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="PreferenceChatClearLog">これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PreferenceChatDeleteTranscripts">これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。
+.txtおよびtxt.backupの拡張子が付いたすべてのファイルが[FOLDER]フォルダから削除されます。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="PreferenceChatPathChanged">ファイルを移動できません。以前のパスがリストアされました。
+    <usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="DefaultObjectPermissions">デフォルトのオブジェクト権限を保存するときに問題が発生しました：[REASON]
+後でデフォルトの権限を設定してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="ChatHistoryIsBusyAlert">チャット履歴ファイルが前の操作でビジーです。２、３分経ってからもう一度試すか、別の人とのチャットを選択してください。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="OutfitPhotoLoadError">[REASON]
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ" />
+  </notification>
+
+  <notification name="FailedToFindSettings">データベースから「[NAME]」の設定の読み込みができませんでした。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToLoadSettingsApply">環境にこれらの設定を適用することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="FailedToBuildSettingsDay">環境にこれらの設定を適用することができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="NoEnvironmentSettings">このリージョン（地域）は初期設定をサポートしていません。
+    <tag>fail</tag>
+  </notification>
+
+  <!-- messageには日本語が使えないため翻訳しない -->
+  <notification label="アウトフィットを保存する" name="SaveSettingAs">現在の設定を次の内容で保存する：
+    <unique />
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC] (New)</input>
+      <button name="ＯＫ" text="ＯＫ" />
+      <button name="Cancel" text="キャンセル" />
+    </form>
+  </notification>
+
+  <notification name="WLImportFail">[FILE]から過去のウインドライトの設定「[NAME]」をインポートできません。
+
+[REASONS]
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="WLParcelApplyFail">この区画で環境を設定することはできません。
+変更する権限のある区画を入力または選択してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SettingsUnsuported">このリージョン（地域）では設定をサポートしていません。
+設定に対応しているリージョンに移動し、アクションを再試行してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="SettingsConfirmLoss">「[NAME]」と名付けられたこの[TYPE]に加えられた変更が失われます。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="変更を失いますがよろしいですか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="SettingsConfirmReset">適用されたすべての設定を削除しようとしています。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="PersonalSettingsConfirmReset">適用されたすべての個人的な照明の設定を削除しようとしています。
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="SettingsMakeNoTrans">このデイサイクルに移行不可の設定をインポートしようとしています。このまま続けると、編集中の設定も移行不可になります。
 
 この変更は元に戻すことができません。
 
-続けますか？
-		<usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。
-自分の持ち物からコピーしてやり直してください。</notification>
-	<notification name="EnvironmentApplyFailed">この設定で問題が発生しました。この設定は現在保存または適用ができません。</notification>
-	<notification name="TrackLoadFailed">トラックを [TRACK] にロードできません。</notification>
-	<notification name="TrackLoadMismatch">トラックを [TRACK1] から [TRACK2] にロードできません。</notification>
-</notifications>
+続けてもよろしいですか？
+    <tag>confirm</tag>
+    <usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
+  </notification>
+
+  <notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。自分の持ち物からコピーしてやり直してください。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="EnvironmentApplyFailed">この設定で問題が発生しました。この設定は現在保存または適用ができません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TrackLoadFailed">トラックを[TRACK]にロードできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="TrackLoadMismatch">トラックを[TRACK1]から[TRACK2]にロードできません。
+    <tag>fail</tag>
+  </notification>
+
+  <notification name="CompressionTestResults">サイズ[SIZE]㎅のファイル[FILE]をgzipのレベル６で圧縮したテスト結果：
+圧縮：[PACK_TIME]秒　[PSIZE]㎅
+解凍：[UNPACK_TIME]秒　[USIZE]㎅
+    <tag>fail</tag>
+  </notification>
+
+  <notification label="二段階認証トークンプロンプト" name="PromptMFAToken">[MESSAGE]
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="token" />
+      <button name="continue" text="確認"/>
+      <button name="cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification label="サブフォルダの作成" name="CreateSubfolder">新しいフォルダーに名前を付けます：
+    <unique />
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message">[DESC]</input>
+      <button name="ＯＫ" text="ＯＫ"/>
+      <button name="Cancel" text="キャンセル"/>
+    </form>
+  </notification>
+
+  <notification name="SameFolderRequired">選択したアイテムは、同じフォルダー内に存在する必要があります。
+    <tag>fail</tag>
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="RiggedMeshAttachedToHUD">ＨＵＤポイント「[POINT]」にアタッチされたオブジェクト「[NAME]」にはリグメッシュが含まれています。
+
+リグメッシュオブジェクトは、アバターに取り付けるように設計されています。あなたにはこのオブジェクトが表示されますが、他の人には表示されません。
+
+他の人にこのオブジェクトを見てもらいたい場合は、オブジェクトを削除して、アバターのアタッチメントポイントに再度アタッチします。
+    <tag>confirm</tag>
+    <usetemplate ignoretext="リグメッシュがＨＵＤポイントにアタッチされている場合に警告します。" name="okignore" yestext="ＯＫ"/>
+  </notification>
+
+  <notification name="EnableAutoFPSWarning" type="alertmodal">自動ＦＰＳを有効にしようとしています。保存されていないグラフィック設定はすべて失われます。
+
+まずそれらを保存しますか？
+    <tag>confirm</tag>
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+  </notification>
+</notifications>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
index bac885e5d8..4587679b70 100644
--- a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
 <!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume-->
-<accordion_tab name="Mockup Tab" title="Mockup Tab"/>
+<accordion_tab name="Mockup Tab" title="モックアップタブ" />
diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
index 90491e84c5..393ca8fb65 100644
--- a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_activeim_row">
-	<string name="unknown_obj">
-		不明のオブジェクト
-	</string>
-	<text name="object_name">
-		名前のないオブジェクト
-	</text>
-</panel>
+  <chiclet_script name="object_chiclet" />
+  <chiclet_offer name="inv_offer_chiclet" />
+  <text name="object_name">無名のオブジェクト</text>
+  <button name="hide_btn" label="" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 3ef8eba19f..84ceeb4be5 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_list_item">
-	<string name="FormatSeconds">
-		[COUNT] 秒
-	</string>
-	<string name="FormatMinutes">
-		[COUNT] 分
-	</string>
-	<string name="FormatHours">
-		[COUNT] 時間
-	</string>
-	<string name="FormatDays">
-		[COUNT] 日
-	</string>
-	<string name="FormatWeeks">
-		[COUNT] 週間
-	</string>
-	<string name="FormatMonths">
-		[COUNT] ヶ月
-	</string>
-	<string name="FormatYears">
-		[COUNT] 年
-	</string>
-	<text name="avatar_name" value="（ローディング）"/>
-	<text name="last_interaction" value="0 秒"/>
-	<icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することができます"/>
-	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
-	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
-	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
-	<button name="info_btn" tool_tip="詳細"/>
-	<button name="profile_btn" tool_tip="プロフィールの表示"/>
-</panel>
+  <!-- 
+    Strings used to localize last interaction time.
+    See last_interaction textbox below.
+    -->
+  <string name="FormatSeconds">[COUNT]秒</string>
+  <string name="FormatMinutes">[COUNT]分</string>
+  <string name="FormatHours">[COUNT]時間</string>
+  <string name="FormatDays">[COUNT]日</string>
+  <string name="FormatWeeks">[COUNT]週間</string>
+  <string name="FormatMonths">[COUNT]ヶ月</string>
+  <string name="FormatYears">[COUNT]年</string>
+  <!-- *NOTE: 
+    llavatarlistitem.cpp lays these controls out depending on which
+    ones are visible. Trying to change their order here will break it
+    ... which kinda sucks.
+  -->
+  <icon name="hovered_icon"/>
+  <icon name="selected_icon" />
+  <text name="avatar_name" value="（読み込んでいます）" />
+  <text name="last_interaction" value="０秒" />
+  <icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することができます。" />
+  <icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます。" />
+  <icon tool_tip="このフレンドはマップ上であなたの位置を表示できます。" name="permission_map_icon" />
+  <icon name="permission_online_icon" tool_tip="このフレンドは、あなたのオンライン状況を確認できます。" />
+  <button name="info_btn" tool_tip="詳細" />
+  <button name="profile_btn" tool_tip="プロフィールの閲覧" />
+  <output_monitor name="speaking_indicator" tool_tip="ボイスのボリューム" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
index fd91ea97d1..0c6c7bdd4c 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_tag_notification">
-	<panel name="msg_caption">
-		<text name="sender_tag_name">
-			Angela Tester
-		</text>
-		<text name="tag_time" value="23:30"/>
-	</panel>
-	<text_editor name="msg_text">
-		The quick brown fox jumps over the lazy dog.
-	</text_editor>
-</panel>
+  <panel name="msg_caption">
+    <text name="sender_tag_name">Angela Tester</text>
+    <text name="tag_time" value="23：30" />
+  </panel>
+  <text_editor name="msg_text">いろはにほへと　ちりぬるを　わかよたれそ　つねならむ　うゐのおくやま　けふこえて　あさきゆめみし　ゑひもせす</text_editor>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 2fb3206c7d..97c392e807 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="フィルター" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
-		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
-		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
-		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
-	</panel>
-	<text name="block_limit">
-		[COUNT] 件のエントリーがブロック リストにあり、制限は [LIMIT] です。
-	</text>
-	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
-</panel>
+  <panel label="bottom_panel" name="blocked_buttons_panel">
+    <filter_editor label="フィルタ" name="blocked_filter_input" />
+    <menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション" />
+    <menu_button name="view_btn" tool_tip="オプションを並べ替える" />
+    <menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択" />
+    <button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除" />
+  </panel>
+  <text name="block_limit">[COUNT]件のエントリーが、ブロックリストにあり、制限は[LIMIT]です。</text>
+  <block_list name="blocked" tool_tip="現在ブロックされている住人一覧" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
index 95a5a26d4e..00730526ad 100644
--- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
@@ -1,8 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="wearable_item">
-	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="これを編集する権限がありません"/>
-	<panel name="btn_edit_panel">
-		<button name="btn_edit" tool_tip="このシェイプを編集"/>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="wearable_item">
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <panel name="btn_lock" tool_tip="これを編集する権限がありません。">
+    <icon name="btn_lock1" />
+  </panel>
+  <panel name="btn_edit_panel">
+    <button name="btn_edit" tool_tip="このシェイプを編集" />
+  </panel>
+  <icon name="wearable_type_separator_icon" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
index 42d8a21660..c2cab606eb 100644
--- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="clothing_list_button_bar_panel">
-	<button label="交換" name="switch_btn"/>
-	<button label="買い物 &gt;" name="bodyparts_shop_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="clothing_list_button_bar_panel">
+  <button label="切り替え" name="switch_btn" />
+  <button name="bodyparts_shop_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
index 6eca8adfe5..2c41860433 100644
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray_lite">
-	<layout_stack name="toolbar_stack_lite">
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray_lite">
+  <layout_stack name="toolbar_stack_lite">
+    <layout_panel />
+    <layout_panel>
+      <panel name="nearby_chat" />
+    </layout_panel>
+    <layout_panel name="gesture_panel">
+      <gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示／非表示" />
+    </layout_panel>
+    <layout_panel name="after_gesture_panel" />
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml b/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
new file mode 100644
index 0000000000..d5c2ed01e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="camera_preset_item">
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <text name="preset_name" value="デフォルト" />
+  <button name="delete_btn" tool_tip="プリセットを削除"/>
+  <button name="reset_btn" tool_tip="デフォルトのプリセットにリセットします。" />
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
index 7916bf5155..8827f1c780 100644
--- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="im_header" name="im_header">
-	<text name="time_box" value="23:30"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_header" name="im_header">
+  <avatar_icon name="avatar_icon" />
+  <text name="user_name" value="テスト文字列　無視してください" />
+  <text name="time_box" value="23：30" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
index 6717ba9ba3..9cf8f65fbb 100644
--- a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chiclet_bar">
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="会話"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="通知"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="chiclet_bar">
+  <layout_stack name="toolbar_stack">
+    <layout_panel name="im_well_panel">
+      <chiclet_im_well name="im_well">
+        <button name="Unread IM messages" tool_tip="会話" />
+      </chiclet_im_well>
+    </layout_panel>
+    <layout_panel name="notification_well_panel">
+      <chiclet_notification name="notification_well">
+        <button name="Unread" tool_tip="通知" />
+      </chiclet_notification>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
index 57a255afde..9851ca70b3 100644
--- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
@@ -1,67 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
-	<panel.string name="type_mature">
-		Moderate
-	</panel.string>
-	<panel.string name="type_pg">
-		「General」コンテンツ
-	</panel.string>
-	<panel.string name="l$_price">
-		L$ [PRICE]
-	</panel.string>
-	<panel.string name="click_through_text_fmt">
-		[TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール
-	</panel.string>
-	<panel.string name="date_fmt">
-		[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
-	</panel.string>
-	<panel.string name="auto_renew_on">
-		有効
-	</panel.string>
-	<panel.string name="auto_renew_off">
-		無効
-	</panel.string>
-	<text name="title" value="クラシファイド広告情報"/>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<text_editor name="classified_name" value="[name]"/>
-			<text name="classified_location_label" value="場所："/>
-			<text_editor name="classified_location" value="[loading...]"/>
-			<text name="content_type_label" value="内容の種類："/>
-			<text_editor name="content_type" value="[content type]"/>
-			<text name="category_label" value="カテゴリ："/>
-			<text_editor name="category" value="[category]"/>
-			<text name="creation_date_label" value="制作日："/>
-			<text_editor name="creation_date" tool_tip="制作日" value="[date]"/>
-			<text name="price_for_listing_label" value="掲載価格："/>
-			<text_editor name="price_for_listing" tool_tip="掲載価格" value="[price]"/>
-			<layout_stack name="descr_stack">
-				<layout_panel name="clickthrough_layout_panel">
-					<text name="click_through_label" value="クリック数："/>
-					<text_editor name="click_through_text" tool_tip="Click through data" value="[clicks]"/>
-				</layout_panel>
-				<layout_panel name="price_layout_panel">
-					<text name="auto_renew_label" value="自動更新："/>
-					<text name="auto_renew" value="有効"/>
-				</layout_panel>
-				<layout_panel name="descr_layout_panel">
-					<text name="classified_desc_label" value="説明："/>
-					<text_editor name="classified_desc" value="[description]"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</scroll_container>
-	<panel name="buttons">
-		<layout_stack name="layout_stack1">
-			<layout_panel name="layout_panel1">
-				<button label="テレポート" name="teleport_btn"/>
-			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
-				<button label="地図" name="show_on_map_btn"/>
-			</layout_panel>
-			<layout_panel name="edit_btn_lp">
-				<button label="編集" name="edit_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+  <panel.string name="type_mature">Moderate</panel.string>
+  <panel.string name="type_pg">「General」コンテンツ</panel.string>
+  <panel.string name="l$_price">L$ [PRICE]</panel.string>
+  <panel.string name="click_through_text_fmt">[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</panel.string>
+  <panel.string name="date_fmt">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</panel.string>
+  <panel.string name="auto_renew_on">有効</panel.string>
+  <panel.string name="auto_renew_off">無効</panel.string>
+  <text name="title" value="クラシファイド広告情報" />
+  <scroll_container name="profile_scroll">
+    <panel name="scroll_content_panel">
+      <text_editor name="classified_name" value="[name]" />
+      <text name="classified_location_label" value="場所：" />
+      <text_editor name="classified_location" value="[loading...]" />
+      <text name="content_type_label" value="内容の種類：" />
+      <text_editor name="content_type" value="[content type]" />
+      <text name="category_label" value="カテゴリ：" />
+      <text_editor name="category" value="[category]" />
+      <text name="creation_date_label" value="制作日：" />
+      <text_editor name="creation_date" tool_tip="制作日" value="[date]" />
+      <text name="price_for_listing_label" value="掲載価格：" />
+      <text_editor name="price_for_listing" tool_tip="掲載価格" value="[price]" />
+      <layout_stack name="descr_stack">
+        <layout_panel name="clickthrough_layout_panel">
+          <text name="click_through_label" value="クリック数：" />
+          <text_editor name="click_through_text" tool_tip="クリックされた回数" value="[clicks]" />
+        </layout_panel>
+        <layout_panel name="price_layout_panel">
+          <text name="auto_renew_label" value="自動更新：" />
+          <text name="auto_renew" value="有効" />
+        </layout_panel>
+        <layout_panel name="descr_layout_panel">
+          <text name="classified_desc_label" value="説明：" />
+          <text_editor name="classified_desc" value="[description]" />
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </scroll_container>
+  <panel name="buttons">
+    <layout_stack name="layout_stack1">
+      <layout_panel name="layout_panel1">
+        <button label="テレポート" name="teleport_btn" />
+      </layout_panel>
+      <layout_panel name="show_on_map_btn_lp">
+        <button label="マップ" name="show_on_map_btn" />
+      </layout_panel>
+      <layout_panel name="edit_btn_lp">
+        <button label="編集" name="edit_btn" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
index 2159f17fec..c1102ad318 100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-	<button label="追加 +" name="add_btn"/>
-	<button label="買い物 &gt;" name="clothing_shop_btn"/>
-</panel>
+  <button label="追加＋" name="add_btn" />
+  <button name="clothing_shop_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
index 158b2fa6ac..0fee393d95 100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
-	<button name="btn_delete" tool_tip="アウトフィットから取り除く"/>
-	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="これを編集する権限がありません"/>
-	<panel name="btn_edit_panel">
-		<button name="btn_edit" tool_tip="この着用物を編集"/>
-	</panel>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <button name="btn_delete" tool_tip="アウトフィットから削除" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <button name="btn_move_up" />
+  <button name="btn_move_down" />
+  <panel name="btn_lock" tool_tip="これを編集する権限がありません">
+    <icon name="btn_lock1" />
+  </panel>
+  <panel name="btn_edit_panel">
+    <button name="btn_edit" tool_tip="この着用物を編集" />
+  </panel>
+  <icon name="wearable_type_separator_icon" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
index b9bc10c220..d483d781e0 100644
--- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="cof_wearables">
-	<accordion name="cof_wearables_accordion">
-		<accordion_tab name="tab_attachments" title="アタッチメント"/>
-		<accordion_tab name="tab_clothing" title="衣類"/>
-		<accordion_tab name="tab_body_parts" title="身体部位"/>
-	</accordion>
-</panel>
+  <accordion name="cof_wearables_accordion">
+    <accordion_tab name="tab_clothing" title="服装" />
+    <!-- The Attachments title is overwritten by the definition of "Attachments remain" in strings.xml -->
+    <accordion_tab name="tab_attachments" title="装着物" />
+    <accordion_tab name="tab_body_parts" title="身体部位" />
+  </accordion>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
index 09ffb92d36..f4c46f1b0c 100644
--- a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="（ローディング）"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <icon name="nearby_chat_icon" />
+  <layout_stack name="conversation_item_stack">
+    <layout_panel name="call_icon_panel">
+      <icon name="selected_icon" />
+    </layout_panel>
+    <layout_panel name="conversation_title_panel">
+      <text name="conversation_title" value="（読み込み中）" />
+      <output_monitor name="speaking_indicator" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
index e05a67e31d..8fad652c2f 100644
--- a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
-	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
-	<button name="delete_btn" tool_tip="このエントリーを削除"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+  <icon name="selected_icon" />
+  <icon name="hovered_icon" />
+  <icon name="voice_session_icon" tool_tip="ボイスチャット" />
+  <icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ" />
+  <text name="conversation_name" />
+  <text name="date_time"/>
+  <button name="delete_btn" tool_tip="このエントリーを削除" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
index a1e30283ee..9190d55cc6 100644
--- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="deletable_wearable_item">
-	<button name="btn_delete" tool_tip="アウトフィットから取り除く"/>
-	<text name="item_name" value="..."/>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <button name="btn_delete" tool_tip="アウトフィットから削除" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <icon name="wearable_type_separator_icon" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
index 0395d4edd8..7a80c51027 100644
--- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="dummy_clothing_item">
-	<text name="item_name" value="..."/>
-	<panel name="btn_add_panel">
-		<button name="btn_add" tool_tip="この種類のアイテムを追加する"/>
-	</panel>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+  <panel name="btn_add_panel">
+    <button name="btn_add" tool_tip="この種類のアイテムを追加する。" />
+  </panel>
+  <icon name="wearable_type_separator_icon" />
+  <text name="item_name" />
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
index 7250da69a4..97186070c3 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_alpha_panel">
-	<scroll_container name="avatar_alpha_color_panel_scroll">
-		<panel name="avatar_alpha_color_panel">
-			<texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="目のアルファ" name="Eye Alpha" tool_tip="クリックして写真を選択します"/>
-			<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックして写真を選択します"/>
-		</panel>
-	</scroll_container>
-</panel>
+  <scroll_container name="avatar_alpha_color_panel_scroll">
+    <panel name="avatar_alpha_color_panel">
+      <check_box name="lower alpha texture invisible" />
+      <texture_picker label="アルファ（下半身）" name="Lower Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="upper alpha texture invisible" />
+      <texture_picker label="アルファ（上半身）" name="Upper Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="head alpha texture invisible" />
+      <texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="eye alpha texture invisible" />
+      <texture_picker label="瞳のアルファ" name="Eye Alpha" tool_tip="クリックで画像を選択できます。" />
+      <check_box name="hair alpha texture invisible" />
+      <texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックで画像を選択できます。" />
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
index 94967999a1..a4a289d783 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_eyes_panel">
-	<panel name="avatar_eye_color_panel">
-		<texture_picker label="瞳" name="Iris" tool_tip="クリックして写真を選択します"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="eyes_main_tab" title="目"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_eye_color_panel">
+    <texture_picker label="瞳" name="Iris" tool_tip="クリックして画像を選択します" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="eyes_main_tab" title="目" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
index 72eb120c3d..6905c83daa 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
-	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="gloves_main_tab" title="手袋"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_gloves_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="gloves_main_tab" title="手袋" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
index f73f760192..53c03ba94b 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_hair_panel">
-	<panel name="avatar_hair_color_panel">
-		<texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして写真を選択"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="hair_color_tab" title="色"/>
-			<accordion_tab name="hair_style_tab" title="スタイル"/>
-			<accordion_tab name="hair_eyebrows_tab" title="眉毛"/>
-			<accordion_tab name="hair_facial_tab" title="フェイシャル"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_hair_color_panel">
+    <texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして画像を選択" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="hair_color_tab" title="色" />
+      <accordion_tab name="hair_style_tab" title="スタイル" />
+      <accordion_tab name="hair_eyebrows_tab" title="眉毛" />
+      <accordion_tab name="hair_facial_tab" title="フェイシャル" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
index ee39e9435c..6b8a43676f 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
-	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="上半身のテクスチャ" name="Upper Fabric" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="下半身のテクスチャ" name="Lower Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="jacket_main_tab" title="ジャケット"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_jacket_color_panel">
+    <!-- 字数制限のためUpperを上部と翻訳 -->
+    <texture_picker label="上部テクスチャ" name="Upper Fabric" tool_tip="クリックして画像を選択します。" />
+    <texture_picker label="下部テクスチャ" name="Lower Fabric" tool_tip="クリックして画像を選択します。" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます。" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="jacket_main_tab" title="ジャケット">
+        <scrolling_panel_list name="jacket_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
index 6a1789c9f4..be136e882e 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
-	<panel name="avatar_pants_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="pants_main_tab" title="パンツ"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel name="avatar_pants_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="pants_main_tab" title="ズボン">
+        <scrolling_panel_list name="pants_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
index 6ebf0062dc..c929b4001a 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_physics_panel">
-	<panel label="" name="accordion_panel">
-		<accordion name="physics_accordion">
-			<accordion_tab name="physics_breasts_updown_tab" title="胸の弾み"/>
-			<accordion_tab name="physics_breasts_inout_tab" title="胸の谷間"/>
-			<accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ"/>
-			<accordion_tab name="physics_belly_tab" title="お腹の弾み"/>
-			<accordion_tab name="physics_butt_tab" title="お尻の弾み"/>
-			<accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ"/>
-			<accordion_tab name="physics_advanced_tab" title="高度なパラメーター"/>
-		</accordion>
-	</panel>
-</panel>
+  <panel label="" name="accordion_panel">
+    <accordion name="physics_accordion">
+      <accordion_tab name="physics_breasts_updown_tab" title="胸の弾み">
+        <scrolling_panel_list name="physics_breasts_updown_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_breasts_inout_tab" title="胸の谷間">
+        <scrolling_panel_list name="physics_breasts_inout_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ">
+        <scrolling_panel_list name="physics_breasts_leftright_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_belly_tab" title="お腹の弾み">
+        <scrolling_panel_list name="physics_belly_updown_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_butt_tab" title="お尻の弾み">
+        <scrolling_panel_list name="physics_butt_updown_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ">
+        <scrolling_panel_list name="physics_butt_leftright_param_list" />
+      </accordion_tab>
+      <accordion_tab name="physics_advanced_tab" title="高度なパラメーター">
+        <scrolling_panel_list name="physics_advanced_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
index 5a3a949150..a5f0141c84 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
@@ -1,26 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_shape_panel">
-	<string name="meters">
-		メートル
-	</string>
-	<string name="feet">
-		フィート
-	</string>
-	<string name="height">
-		高さ：
-	</string>
-	<text name="avatar_height"/>
-	<panel label="シャツ" name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="shape_body_tab" title="身体"/>
-			<accordion_tab name="shape_head_tab" title="頭"/>
-			<accordion_tab name="shape_eyes_tab" title="目"/>
-			<accordion_tab name="shape_ears_tab" title="耳"/>
-			<accordion_tab name="shape_nose_tab" title="鼻"/>
-			<accordion_tab name="shape_mouth_tab" title="口"/>
-			<accordion_tab name="shape_chin_tab" title="あご"/>
-			<accordion_tab name="shape_torso_tab" title="上半身"/>
-			<accordion_tab name="shape_legs_tab" title="脚"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shape_panel">
+  <string name="meters">メートル</string>
+  <string name="feet">フィート</string>
+  <string name="height">高さ：</string>
+  <text name="avatar_height" />
+  <panel label="シャツ" name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="shape_body_tab" title="身体">
+        <scrolling_panel_list name="shape_body_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_head_tab" title="頭">
+        <scrolling_panel_list name="shape_head_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_eyes_tab" title="目">
+        <scrolling_panel_list name="shape_eyes_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_ears_tab" title="耳">
+        <scrolling_panel_list name="shape_ears_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_nose_tab" title="鼻">
+        <scrolling_panel_list name="shape_nose_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_mouth_tab" title="口">
+        <scrolling_panel_list name="shape_mouth_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_chin_tab" title="あご">
+        <scrolling_panel_list name="shape_chin_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_torso_tab" title="上半身">
+        <scrolling_panel_list name="shape_torso_param_list" />
+      </accordion_tab>
+      <accordion_tab name="shape_legs_tab" title="脚">
+        <scrolling_panel_list name="shape_legs_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
index f33daa4eba..0df166d5bb 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_shirt_panel">
-	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="shirt_main_tab" title="シャツ"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shirt_panel">
+  <panel name="avatar_shirt_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きで色を選択" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="shirt_main_tab" title="シャツ">
+        <scrolling_panel_list name="shirt_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
index c7626189af..a64e838a07 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_shoes_panel">
-	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="shoes_main_tab" title="靴"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shoes_panel">
+  <panel name="avatar_shoes_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="shoes_main_tab" title="靴">
+        <scrolling_panel_list name="shoes_main_param_list" />
+      </accordion_tab>
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
index 7573132576..c488184835 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_skin_panel">
-	<panel name="avatar_skin_color_panel">
-		<texture_picker label="頭" name="Head" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="上半身" name="Upper Body" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="下半身" name="Lower Body" tool_tip="クリックして写真を選択します"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="skin_color_tab" title="肌の色"/>
-			<accordion_tab name="skin_face_tab" title="顔の詳細"/>
-			<accordion_tab name="skin_makeup_tab" title="メイクアップ"/>
-			<accordion_tab name="skin_body_tab" title="身体の詳細"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skin_panel">
+  <panel name="avatar_skin_color_panel">
+    <texture_picker label="頭" name="Head" tool_tip="クリックして画像を選択します" />
+    <texture_picker label="上半身" name="Upper Body" tool_tip="クリックして画像を選択します" />
+    <texture_picker label="下半身" name="Lower Body" tool_tip="クリックして画像を選択します" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="skin_color_tab" title="肌の色" />
+      <accordion_tab name="skin_face_tab" title="顔の詳細" />
+      <accordion_tab name="skin_makeup_tab" title="メイクアップ" />
+      <accordion_tab name="skin_body_tab" title="身体の詳細" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
index 6efc4ce99a..339c362155 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_skirt_panel">
-	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="skirt_main_tab" title="スカート"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skirt_panel">
+  <panel name="avatar_skirt_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="skirt_main_tab" title="スカート" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
index 71fc7c5682..44bd1501b6 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_socks_panel">
-	<panel name="avatar_socks_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="socks_main_tab" title="靴下"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_socks_panel">
+  <panel name="avatar_socks_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="socks_main_tab" title="靴下" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
index 5729cb7552..9a0be6ac75 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_tattoo_panel">
-	<scroll_container name="avatar_tattoo_scroll">
-		<panel name="avatar_tattoo_color_panel">
-			<texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択する"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-		</panel>
-	</scroll_container>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_tattoo_panel">
+  <scroll_container name="avatar_tattoo_scroll">
+    <panel name="avatar_tattoo_color_panel">
+      <texture_picker label="頭部のタトゥ" name="Head Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="上半身のタトゥ" name="Upper Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="下半身のタトゥ" name="Lower Tattoo" tool_tip="クリックして画像を選択する" />
+      <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
index f345a81922..e8fecdfe52 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_underpants_panel">
-	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="underpants_main_tab" title="下着パンツ"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_underpants_panel">
+  <panel name="avatar_underpants_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="underpants_main_tab" title="下着（下半身）" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
index 66b2ffa8ba..d1097f2cad 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_undershirt_panel">
-	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
-		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-	</panel>
-	<panel name="accordion_panel">
-		<accordion name="wearable_accordion">
-			<accordion_tab name="undershirt_main_tab" title="下着シャツ"/>
-		</accordion>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_undershirt_panel">
+  <panel name="avatar_undershirt_color_panel">
+    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
+    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+  </panel>
+  <panel name="accordion_panel">
+    <accordion name="wearable_accordion">
+      <accordion_tab name="undershirt_main_tab" title="下着（上半身）" />
+    </accordion>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
index 614fd1059f..03583324f6 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_universal_panel">
-	<scroll_container name="avatar_universal_scroll">
-		<panel name="avatar_universal_color_panel">
-			<texture_picker label="頭部のタトゥー" name="Head Universal Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="上部のタトゥー" name="Upper Universal Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="下部のタトゥー" name="Lower Universal Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="スカートのタトゥー" name="Skirt Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="髪の毛のタトゥー" name="Hair Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="目のタトゥー" name="Eyes Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="左腕のタトゥー" name="Left Arm Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="左脚のタトゥー" name="Left Leg Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="Aux1 のタトゥー" name="Aux1 Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="Aux2 のタトゥー" name="Aux2 Tattoo" tool_tip="クリックして写真を選択する"/>
-			<texture_picker label="Aux3 のタトゥー" name="Aux3 Tattoo" tool_tip="クリックして写真を選択する"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
-		</panel>
-	</scroll_container>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_universal_panel">
+  <scroll_container name="avatar_universal_scroll">
+    <panel name="avatar_universal_color_panel">
+      <texture_picker label="頭部のタトゥ" name="Head Universal Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="上部のタトゥ" name="Upper Universal Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="下部のタトゥ" name="Lower Universal Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="スカートのタトゥ" name="Skirt Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="髪の毛のタトゥ" name="Hair Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="目のタトゥ" name="Eyes Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="左腕のタトゥ" name="Left Arm Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="左脚のタトゥ" name="Left Leg Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="予備１のタトゥ" name="Aux1 Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="予備２のタトゥ" name="Aux2 Tattoo" tool_tip="クリックして画像を選択する" />
+      <texture_picker label="予備３のタトゥ" name="Aux3 Tattoo" tool_tip="クリックして画像を選択する" />
+      <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
index 9101920f1b..8cb6fe18ab 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
@@ -1,126 +1,58 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="着用可能なもの" name="panel_edit_wearable">
-	<string name="edit_shape_title">
-		シェイプを編集中
-	</string>
-	<string name="edit_skin_title">
-		スキンを編集中
-	</string>
-	<string name="edit_hair_title">
-		髪を編集中
-	</string>
-	<string name="edit_eyes_title">
-		目を編集中
-	</string>
-	<string name="edit_shirt_title">
-		シャツを編集中
-	</string>
-	<string name="edit_pants_title">
-		パンツを編集中
-	</string>
-	<string name="edit_shoes_title">
-		靴を編集中
-	</string>
-	<string name="edit_socks_title">
-		靴下を編集中
-	</string>
-	<string name="edit_jacket_title">
-		ジャケットを編集中
-	</string>
-	<string name="edit_skirt_title">
-		スカートを編集中
-	</string>
-	<string name="edit_gloves_title">
-		手袋を編集中
-	</string>
-	<string name="edit_undershirt_title">
-		下着（上）を編集中
-	</string>
-	<string name="edit_underpants_title">
-		下着（下）を編集中
-	</string>
-	<string name="edit_alpha_title">
-		アルファマスクを編集中
-	</string>
-	<string name="edit_tattoo_title">
-		タトゥーを編集中
-	</string>
-	<string name="edit_universal_title">
-		ユニバーサルを編集中
-	</string>
-	<string name="edit_physics_title">
-		物理作用の編集中
-	</string>
-	<string name="shape_desc_text">
-		シェイプ：
-	</string>
-	<string name="skin_desc_text">
-		スキン：
-	</string>
-	<string name="hair_desc_text">
-		髪：
-	</string>
-	<string name="eyes_desc_text">
-		目：
-	</string>
-	<string name="shirt_desc_text">
-		シャツ：
-	</string>
-	<string name="pants_desc_text">
-		パンツ：
-	</string>
-	<string name="shoes_desc_text">
-		靴：
-	</string>
-	<string name="socks_desc_text">
-		靴下：
-	</string>
-	<string name="jacket_desc_text">
-		ジャケット：
-	</string>
-	<string name="skirt_desc_text">
-		スカート：
-	</string>
-	<string name="gloves_desc_text">
-		手袋：
-	</string>
-	<string name="undershirt_desc_text">
-		下着シャツ：
-	</string>
-	<string name="underpants_desc_text">
-		下着パンツ：
-	</string>
-	<string name="alpha_desc_text">
-		アルファマスク：
-	</string>
-	<string name="tattoo_desc_text">
-		タトゥ：
-	</string>
-	<string name="universal_desc_text">
-		ユニバーサル：
-	</string>
-	<string name="physics_desc_text">
-		物理作用：
-	</string>
-	<labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る"/>
-	<text name="edit_wearable_title" value="シェイプを編集中"/>
-	<panel label="シャツ" name="wearable_type_panel">
-		<text name="description_text" value="シェイプ："/>
-		<radio_group name="sex_radio">
-			<radio_item label="" name="sex_male" tool_tip="男性" value="1"/>
-			<radio_item label="" name="sex_female" tool_tip="女性" value="0"/>
-		</radio_group>
-		<icon name="male_icon" tool_tip="男性"/>
-		<icon name="female_icon" tool_tip="女性"/>
-	</panel>
-	<panel name="button_panel">
-		<layout_stack name="button_panel_ls">
-			<layout_panel name="save_as_btn_lp">
-				<button label="別名で保存" name="save_as_button"/>
-			</layout_panel>
-			<layout_panel name="revert_btn_lp">
-				<button label="変更を元に戻す" name="revert_button"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="着用可能なもの" name="panel_edit_wearable">
+  <string name="edit_shape_title">シェイプを編集中</string>
+  <string name="edit_skin_title">スキンを編集中</string>
+  <string name="edit_hair_title">髪を編集中</string>
+  <string name="edit_eyes_title">目を編集中</string>
+  <string name="edit_shirt_title">シャツを編集中</string>
+  <string name="edit_pants_title">パンツを編集中</string>
+  <string name="edit_shoes_title">靴を編集中</string>
+  <string name="edit_socks_title">靴下を編集中</string>
+  <string name="edit_jacket_title">ジャケットを編集中</string>
+  <string name="edit_skirt_title">スカートを編集中</string>
+  <string name="edit_gloves_title">手袋を編集中</string>
+  <string name="edit_undershirt_title">下着（上半身）を編集中</string>
+  <string name="edit_underpants_title">下着（下半身）を編集中</string>
+  <string name="edit_alpha_title">アルファマスクを編集中</string>
+  <string name="edit_tattoo_title">タトゥを編集中</string>
+  <string name="edit_universal_title">全般を編集中</string>
+  <string name="edit_physics_title">物理作用の編集中</string>
+  <string name="shape_desc_text">シェイプ：</string>
+  <string name="skin_desc_text">スキン：</string>
+  <string name="hair_desc_text">髪：</string>
+  <string name="eyes_desc_text">目：</string>
+  <string name="shirt_desc_text">シャツ：</string>
+  <string name="pants_desc_text">ズボン：</string>
+  <string name="shoes_desc_text">靴：</string>
+  <string name="socks_desc_text">靴下：</string>
+  <string name="jacket_desc_text">ジャケット：</string>
+  <string name="skirt_desc_text">スカート：</string>
+  <string name="gloves_desc_text">手袋：</string>
+  <string name="undershirt_desc_text">下着（上半身）：</string>
+  <string name="underpants_desc_text">下着（下半身）：</string>
+  <string name="alpha_desc_text">アルファマスク：</string>
+  <string name="tattoo_desc_text">タトゥ：</string>
+  <string name="universal_desc_text">全般：</string>
+  <string name="physics_desc_text">物理作用：</string>
+  <labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る" />
+  <text name="edit_wearable_title" value="シェイプを編集中" />
+  <panel label="シャツ" name="wearable_type_panel">
+    <text name="description_text" value="シェイプ：" />
+    <radio_group name="sex_radio">
+      <radio_item label="" name="sex_male" tool_tip="男性" value="1" />
+      <radio_item label="" name="sex_female" tool_tip="女性" value="0" />
+    </radio_group>
+    <icon name="male_icon" tool_tip="男性" />
+    <icon name="female_icon" tool_tip="女性" />
+  </panel>
+  <panel name="button_panel">
+    <layout_stack name="button_panel_ls">
+      <layout_panel name="save_as_btn_lp">
+        <button label="名前をつけて保存" name="save_as_button" />
+      </layout_panel>
+      <layout_panel name="revert_btn_lp">
+        <button label="変更を元に戻す" name="revert_button" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_info.xml b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
index b3a17fcb56..3e4ac72756 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
@@ -1,46 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experience_info">
-	<text name="title" value="体験プロフィール"/>
-	<scroll_container name="xp_scroll">
-		<panel name="scrolling_panel">
-			<layout_stack>
-				<layout_panel>
-					<text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
-				</layout_panel>
-				<layout_panel name="location panel">
-					<text name="Location">
-						場所：
-					</text>
-					<text name="LocationTextText">
-						どこか
-					</text>
-					<button label="テレポート" name="teleport_btn"/>
-					<button label="地図" name="map_btn"/>
-				</layout_panel>
-				<layout_panel name="marketplace panel">
-					<text name="Location">
-						マーケットプレイスストア：
-					</text>
-					<text name="LocationTextText">
-						どこか
-					</text>
-				</layout_panel>
-				<layout_panel>
-					<text name="ContentRating">
-						評価：
-					</text>
-					<text name="ContentRatingText">
-						Adult
-					</text>
-					<text name="Owner">
-						所有者：
-					</text>
-					<text name="OwnerText">
-						Kyle
-					</text>
-					<button label="編集" name="edit_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</scroll_container>
-</panel>
+  <text name="title" value="体験のプロフィール" />
+  <scroll_container name="xp_scroll">
+    <panel name="scrolling_panel">
+      <layout_stack name="ls1">
+        <layout_panel name="image_panel">
+          <texture_picker name="logo" />
+        </layout_panel>
+        <layout_panel name="title panel">
+          <text name="experience_title" value="カイルのスーパーヒーローRPG" />
+        </layout_panel>
+        <layout_panel name="description panel">
+          <expandable_text name="experience_description" />
+        </layout_panel>
+        <layout_panel name="location panel">
+          <text name="Location">場所：</text>
+          <text name="LocationTextText">どこか</text>
+          <button label="テレポート" name="teleport_btn" />
+          <button label="マップ" name="map_btn" />
+        </layout_panel>
+        <layout_panel name="marketplace panel">
+          <text name="Location">マーケットプレイスストア：</text>
+          <text name="LocationTextText">どこか</text>
+        </layout_panel>
+        <layout_panel name="details panel">
+          <text name="ContentRating">レーティング：</text>
+          <text name="ContentRatingText">Adult</text>
+          <text name="Owner">所有者：</text>
+          <text name="OwnerText">カイル</text>
+          <button label="編集" name="edit_btn" />
+
+
+          <!--
+          <expandable_text name="pick_name" value="これは体験です。" />
+
+          <text follows="left|top" height="16" layout="topleft" left="10" top_pad="10" value="Maturity
+          level:" width="130" />
+          <icon name="maturity_icon" />
+          <text name="maturity_value" value="不明" />
+          <panel name="location_panel">
+            <text follows="left|top|right" height="16" layout="topleft" left="00" top="0" value="場所：" width="280" />
+
+            <text follows="left|top|right" height="16" layout="topleft" left="0" top_pad="10" value="場所：" width="280" />
+          </panel>
+
+          <panel name="location_panel">
+            <text follows="left|top|right" height="16" layout="topleft" left="00" top="0" value="場所：" width="280" />
+
+            <text follows="left|top|right" height="16" layout="topleft" left="0" top_pad="10" value="場所：" width="280" />
+          </panel>
+          -->
+
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </scroll_container>
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
index 84e60aea56..abeefdf9a0 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
@@ -1,27 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="experince_list_editor">
-	<panel.string name="loading">
-		ローディング...
-	</panel.string>
-	<panel.string name="panel_allowed">
-		許可された体験：
-	</panel.string>
-	<panel.string name="panel_blocked">
-		ブロックされた体験：
-	</panel.string>
-	<panel.string name="panel_trusted">
-		キー体験：
-	</panel.string>
-	<panel.string name="no_results">
-		(空)
-	</panel.string>
-	<text name="text_name">
-		体験リスト
-	</text>
-	<scroll_list name="experience_list">
-		<columns label="名前" name="experience_name"/>
-	</scroll_list>
-	<button label="追加..." name="btn_add"/>
-	<button label="削除" name="btn_remove"/>
-	<button label="プロフィール..." name="btn_profile"/>
-</panel>
+  <panel.string name="loading">読み込んでいます…</panel.string>
+  <panel.string name="panel_allowed">許可された体験：</panel.string>
+  <panel.string name="panel_blocked">ブロックされた体験：</panel.string>
+  <panel.string name="panel_trusted">キー体験：</panel.string>
+  <panel.string name="no_results">（空）</panel.string>
+  <text name="text_name">体験リスト</text>
+  <scroll_list name="experience_list">
+    <columns label="名前" name="experience_name" />
+  </scroll_list>
+  <button label="追加…" name="btn_add" />
+  <button label="削除" name="btn_remove" />
+  <button label="プロフィール…" name="btn_profile" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
index d72d2bebf6..a3acb55cb4 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Experiences">
-	<text name="experience_name">
-		ダミー名
-	</text>
-</panel>
+<panel name="panel_experience_list_item" label="体験一覧">
+  <text name="experience_name">ダミー名</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
index 16976df035..d4eb8daf01 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="EVENTS">
-	<string name="no_events" value="イベントなし。"/>
-	<string name="loading" value="ローディング..."/>
-	<layout_stack>
-		<layout_panel>
-			<scroll_list name="experience_log_list">
-				<columns label="時間" name="time"/>
-				<columns label="イベント" name="event"/>
-				<columns label="体験" name="experience_name"/>
-				<columns label="オブジェクト" name="object_name"/>
-			</scroll_list>
-			<button label="知らせる" name="btn_notify"/>
-			<button label="プロフィール" name="btn_profile_xp"/>
-			<button label="報告" name="btn_report_xp"/>
-		</layout_panel>
-		<layout_panel name="button_panel">
-			<check_box label="すべてのイベント   日数を通知" name="notify_all"/>
-			<button label="クリア" name="btn_clear"/>
-			<button label="&lt;" name="btn_prev"/>
-			<button label="&gt;" name="btn_next"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_experience_log" label="イベント">
+  <string name="no_events" value="イベントはありません。" />
+  <string name="loading" value="読み込んでいます…。" />
+  <layout_stack name="ls1">
+    <layout_panel name="list panel">
+      <scroll_list name="experience_log_list">
+        <columns name="time" label="時間" />
+        <columns name="event" label="イベント" />
+        <columns name="experience_name" label="体験" />
+        <columns name="object_name" label="オブジェクト" />
+      </scroll_list>
+
+      <button name="btn_notify" label="通知" />
+
+      <button name="btn_profile_xp" label="プロフィール" />
+
+      <button name="btn_report_xp" label="報告" />
+    </layout_panel>
+    <layout_panel name="button_panel">
+      <check_box label="すべてのイベント日数を通知" name="notify_all" />
+
+      <spinner name="logsizespinner" />
+      <button name="btn_clear" label="クリア" />
+      <button name="btn_prev" label="⇦" />
+      <button name="btn_next" label="⇨" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_search.xml b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
index 9ab84e7d18..5530168dc0 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
@@ -1,41 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="SEARCH">
-	<string name="not_found">
-		「[TEXT]」は見つかりませんでした
-	</string>
-	<string name="no_results">
-		検索結果：ゼロ
-	</string>
-	<string name="searching">
-		検索中...
-	</string>
-	<string name="loading">
-		ロード中...
-	</string>
-	<string name="maturity_icon_general">
-		&quot;Parcel_PG_Light&quot;
-	</string>
-	<string name="maturity_icon_moderate">
-		&quot;Parcel_M_Light&quot;
-	</string>
-	<string name="maturity_icon_adult">
-		&quot;Parcel_R_Light&quot;
-	</string>
-	<panel name="search_panel">
-		<button label="進む" name="find"/>
-		<icons_combo_box label="Moderate" name="maturity">
-			<icons_combo_box.item label="Adult" name="Adult" value="42"/>
-			<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-			<icons_combo_box.item label="全般" name="PG" value="13"/>
-		</icons_combo_box>
-		<scroll_list name="search_results">
-			<columns label="名前" name="experience_name"/>
-			<columns label="所有者" name="owner"/>
-		</scroll_list>
-		<button label="OK" label_selected="OK" name="ok_btn"/>
-		<button label="取り消し" name="cancel_btn"/>
-		<button label="プロフィールを表示" name="profile_btn"/>
-		<button label="&lt;" name="left_btn"/>
-		<button label="&gt;" name="right_btn"/>
-	</panel>
-</panel>
+<panel name="panel_experience_search" label="検索">
+  <string name="not_found">「[TEXT]」は見つかりませんでした。</string>
+  <string name="no_results">検索結果：なし</string>
+  <string name="searching">検索しています…。</string>
+  <string name="loading">読み込みんでいます…。</string>
+  <string name="maturity_icon_general">"Parcel_PG_Light"</string>
+  <string name="maturity_icon_moderate">"Parcel_M_Light"</string>
+  <string name="maturity_icon_adult">"Parcel_R_Light"</string>
+  <panel name="search_panel">
+    <text name="lbl name part">名前の一部を入力してください：</text>
+    <line_editor name="edit" />
+    <button label="進む" name="find" />
+    <text name="lbl max content rating">コンテンツの最大レーティング：</text>
+    <icons_combo_box label="Moderate" name="maturity">
+      <icons_combo_box.drop_down_button  />
+      <icons_combo_box.item label="Adult" name="Adult" value="42" />
+      <icons_combo_box.item label="Moderate" name="Mature" value="21"/>
+      <icons_combo_box.item label="General" name="PG" value="13"/>
+    </icons_combo_box>
+    <scroll_list name="search_results">
+      <columns name="maturity" label="" />
+      <columns name="experience_name" label="名前" />
+      <columns name="owner" label="所有者" />
+    </scroll_list>
+
+    <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
+    <button label="キャンセル" name="cancel_btn" />
+    <button label="プロフィール表示" name="profile_btn" />
+    <button label="⇦" name="left_btn" />
+    <button label="⇨" name="right_btn" />
+
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_experiences.xml b/indra/newview/skins/default/xui/ja/panel_experiences.xml
index ab0d2a97a4..9bbe43f40d 100644
--- a/indra/newview/skins/default/xui/ja/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experiences.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Experiences">
-	<string name="loading_experiences" value="体験をロード中..."/>
-	<string name="no_experiences" value="体験がありません。"/>
-	<string name="acquire" value="体験を取得"/>
-</panel>
+<panel name="panel_experiences" label="体験">
+  <string name="loading_experiences" value="体験を読み込んでいます…" />
+  <string name="no_experiences" value="体験はありません。" />
+  <string name="acquire" value="体験する" />
+  <layout_stack>
+    <layout_panel>
+      <flat_list_view name="experiences_list" />
+    </layout_panel>
+    <layout_panel name="button_panel">
+      <button name="btn_action" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
index 343db03030..ea03979c92 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
@@ -1,41 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="住人を立入禁止" name="bulk_ban_panel">
-	<panel.string name="loading">
-		(ロード中...)
-	</panel.string>
-	<panel.string name="ban_selection_too_large">
-		グループへの立入禁止が送信されていません: 選択した住人が多すぎます。グループへの立入禁止の数は 1 リクエスト当たり 100 人に制限されています。
-	</panel.string>
-	<panel.string name="ban_not_permitted">
-		グループへの立入禁止が送信されていません: 「立入禁止リストの管理」の能力がありません。
-	</panel.string>
-	<panel.string name="ban_limit_fail">
-		グループへの立入禁止が送信されていません: グループへの立入禁止の登録許容数に達しました。
-	</panel.string>
-	<panel.string name="partial_ban">
-		グループへの立入禁止の一部が送信されませんでした: [REASONS]
-	</panel.string>
-	<panel.string name="ban_failed">
-		グループへの立入禁止が送信されませんでした: [REASONS]
-	</panel.string>
-	<panel.string name="residents_already_banned">
-		- 次の住民は既に立入禁止にされています: [RESIDENTS]。
-	</panel.string>
-	<panel.string name="ban_limit_reached">
-		- 立入禁止の許容値に達しました。次のエージェントは立入禁止にされません: [RESIDENTS]。
-	</panel.string>
-	<panel.string name="cant_ban_yourself">
-		- グループから自分自身を立入禁止にすることはできません。
-	</panel.string>
-	<text name="help_text">
-		グループから一度に複数の住人を立入禁止にすることができます。「リストから住人を選択」をクリックしてください。
-	</text>
-	<button label="リストから住人を選択" name="add_button"/>
-	<name_list name="banned_agent_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます"/>
-	<button label="選択した住人をリストから削除" name="remove_button" tool_tip="立入禁止リストから上で選択した住人を削除します"/>
-	<button label="住人を立入禁止" name="ban_button"/>
-	<button label="取り消し" name="cancel_button"/>
-	<string name="GroupBulkBan">
-		グループへの立入禁止
-	</string>
-</panel>
+<panel label="住人をバン" name="bulk_ban_panel">
+  <panel.string name="loading">（読み込んでいます…）</panel.string>
+  <panel.string name="ban_selection_too_large">グループのバンが送信されていません：選択した住人が多すぎます。グループへの立入禁止の数は１リクエスト当たり１００人に制限されています。</panel.string>
+  <panel.string name="ban_not_permitted">グループのバンが送信されていません：「立入禁止リストの管理」の能力がありません。</panel.string>
+  <panel.string name="ban_limit_fail">グループのバンが送信されていません：グループへの立入禁止の登録許容数に達しました。</panel.string>
+  <panel.string name="partial_ban">グループのバンが送信されていません：[REASONS]</panel.string>
+  <panel.string name="ban_failed">グループのバンが送信されていません：[REASONS]</panel.string>
+  <panel.string name="residents_already_banned">・次の住民は既にバンされています：[RESIDENTS]</panel.string>
+  <panel.string name="ban_limit_reached">・バンの上限人数に達しました。次のエージェントは立入禁止にされません：[RESIDENTS]</panel.string>
+  <panel.string name="cant_ban_yourself">・グループから自分自身をバンにすることはできません。</panel.string>
+  <text name="help_text">グループから複数の住人を一括でバンすることができます。「リストから住人を選択」をクリックしてください。</text>
+  <button label="リストから住人を選択" name="add_button" />
+  <name_list name="banned_agent_list" tool_tip="Ctrlキーを押しながらクリックすることで複数の住人を選択できます。" />
+  <button label="選択した住人をリストから削除" name="remove_button" tool_tip="バンリストから、選択した住人を削除します。" />
+  <button label="住人をバン" name="ban_button" />
+  <button label="キャンセル" name="cancel_button" />
+  <string name="GroupBulkBan">グループから一括バン</string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
index d771751293..51c016657d 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
@@ -1,30 +1,51 @@
-<?xml version="1.0" ?>
-<panel name="GroupCreation" label="グループ作成">
-	<panel name="group_info_top">
-		<line_editor name="group_name_editor" label="ここにグループ名を入力する"/>
-	</panel>
-	<layout_panel name="group_info"/>
-	<layout_stack name="layout">
-		<texture_picker name="insignia" tool_tip="クリックして写真を選択すする"/>
-		<text_editor name="charter">グループ チャーター</text_editor>
-		<button name="back" tool_tip="グループのリストに戻る"/>
-		<text name="info_deletion">ご注意：7 日後、メンバーのいないグループ（作成者以外）は削除されます。</text>
-		<check_box name="check_enrollment_fee" label="参加費用" tool_tip="グループへの参加費用の有無を設定する"/>
-		<combo_box.item name="pg" label="一般的なコンテンツ"/>
-		<scroll_list.rows name="basic" value="ベーシック（プレースホルダー）"/>
-		<button name="btn_create" label="L$ [COST] でグループを作成する" tool_tip="新しいグループを作成する"/>
-		<text name="fee_information">グループ作成費用は会員レベルにより異なります。[https://secondlife.com/my/account/membership.php 詳細]</text>
-		<scroll_list.rows name="premium" value="プレミアム（プレースホルダー）"/>
-		<check_box name="open_enrollement" label="どなたでも参加できます" tool_tip="招待されていない新メンバーがこのグループに参加できるように設定する。"/>
-		<combo_item name="select_mature">- 成熟度評価を選択する -</combo_item>
-		<spinner name="spin_enrollment_fee" label="L$" tool_tip="新メンバーは参加費用が確認された際、グループ参加費用を支払う必要があります。"/>
-		<combo_box.item name="mature" label="控えめなコンテンツ"/>
-	</layout_stack>
-	<layout_panel name="layout_crt"/>
-	<layout_stack name="button_row_ls"/>
-	<layout_panel name="create_actions"/>
-	<panel name="preferences_container"/>
-	<combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです"/>
-	<scroll_list name="membership_list"/>
-	<layout_panel name="create_info"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="グループ作成" name="GroupCreation">
+  <panel.string name="current_membership">（あなたのメンバーシップ）</panel.string>
+  <panel name="group_info_top">
+    <line_editor label="グループ名をここに入力してください。" name="group_name_editor" />
+  </panel>
+  <layout_stack name="layout">
+    <layout_panel name="group_info">
+      <panel name="group_info_top">
+        <texture_picker name="insignia" tool_tip="クリックして写真を選択" />
+        <text_editor name="charter">グループ憲章</text_editor>
+      </panel>
+      <panel name="preferences_container">
+        <check_box label="誰でも加入可能" name="open_enrollement" tool_tip="このグループが招待なしで、新しいメンバーに参加できるようにするかどうかを設定します。" />
+        <check_box label="入会費" name="check_enrollment_fee" tool_tip="グループへへの加入に入会費が必要かどうかを設定します。" />
+        <spinner name="spin_enrollment_fee" tool_tip="登録料がチェックされている場合、新しいメンバーはグループに参加するためにこの料金を支払う必要があります。" />
+        <combo_box name="group_mature_check" tool_tip="レーティングは、グループで許可されるコンテンツと行動のタイプを指定します。">
+          <combo_item name="select_mature" value="Select">－レーティングの選択－</combo_item>
+          <combo_box.item label="Moderateコンテンツ" name="mature" value="Mature" />
+          <combo_box.item label="Generalコンテンツ" name="pg" value="Not Mature" />
+        </combo_box>
+      </panel>
+    </layout_panel>
+    <layout_panel name="create_info">
+      <text name="fee_information">グループを作成するための料金は、メンバーシップレベルに基づいています。[https://secondlife.com/my/account/membership.php 詳細]</text>
+      <scroll_list name="membership_list">
+        <scroll_list.columns name="clmn_name" />
+        <scroll_list.columns name="clmn_price" />
+        <scroll_list.rows name="basic" value="基本（プレースホルダ）" />
+        <scroll_list.rows name="plc2" value="" />
+        <scroll_list.rows name="premium" value="プレミアム（プレースホルダ）" />
+      </scroll_list>
+    </layout_panel>
+    <layout_panel name="create_actions">
+
+      <layout_stack name="button_row_ls">
+        <layout_panel name="layout_crt">
+          <!-- placeholder to autoadjust buttons (since they are of different sizes)-->
+        </layout_panel>
+        <layout_panel name="layout_crt">
+          <button label="グループ作成：L$[COST]" name="btn_create" tool_tip="新しいグループを作成" />
+          <button name="back" label="キャンセル" tool_tip="グループ一覧に戻ります。" />
+        </layout_panel>
+        <layout_panel name="layout_crt">
+          <!-- placeholder to autoadjust buttons-->
+        </layout_panel>
+      </layout_stack>
+      <text name="info_deletion">注：４８時間メンバーが２人未満のグループは、自動的に解散されます。</text>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index aab536f653..f2a11becf3 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -1,58 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_tab">
-	<panel.string name="help_text">
-		「一般」タブには、メンバー一覧、設定、メンバーのオプションなど、このグループに関する一般的な情報が記されています。
+  <panel.string name="help_text">「一般」タブには、メンバー一覧、設定、メンバーのオプションなど、このグループに関する一般的な情報が記されています。
 
-オプションにマウスカーソルを当てると詳しい説明が表示されます。
-	</panel.string>
-	<panel.string name="group_info_unchanged">
-		一般的なグループ情報が変更されました。
-	</panel.string>
-	<panel.string name="incomplete_member_data_str">
-		メンバーのデータを検索
-	</panel.string>
-	<panel name="group_info_top">
-		<texture_picker label="" name="insignia" tool_tip="クリックして写真を選択します"/>
-		<text name="prepend_founded_by">
-			創設者：
-		</text>
-		<name_box initial_value="（取得中）" name="founder_name"/>
-		<text name="join_cost_text">
-			無料
-		</text>
-		<button label="参加します！" name="btn_join"/>
-	</panel>
-	<text_editor name="charter">
-		グループの理念、指針を記入してください
-	</text_editor>
-	<name_list name="visible_members">
-		<name_list.columns label="メンバー" name="name"/>
-		<name_list.columns label="タイトル" name="title"/>
-		<name_list.columns label="ログイン" name="status"/>
-	</name_list>
-	<text name="my_group_settngs_label">
-		個人の設定
-	</text>
-	<text name="active_title_label">
-		私のタイトル：
-	</text>
-	<combo_box name="active_title" tool_tip="このグループをアクティブにしたときに、アバター名の上に表示されるタイトルを設定します。"/>
-	<check_box label="グループ通知を受信" name="receive_notices" tool_tip="このグループからの通知を受信するかどうかの設定を行います。  グループからスパムが送られてくる場合はこのボックスのチェックを外してください。"/>
-	<check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="あなたのプロフィールにこのグループを表示するかどうかの設定を行います。"/>
-	<panel name="preferences_container">
-		<text name="group_settngs_label">
-			グループの設定
-		</text>
-		<check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。"/>
-		<check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。"/>
-		<spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。"/>
-		<combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです">
-			<combo_item name="select_mature">
-				- レーティング区分を指定 -
-			</combo_item>
-			<combo_box.item label="「Moderate」コンテンツ" name="mature"/>
-			<combo_box.item label="「General」コンテンツ" name="pg"/>
-		</combo_box>
-		<check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます"/>
-	</panel>
-</panel>
+オプションにマウスカーソルを当てると詳しい説明が表示されます。</panel.string>
+  <panel.string name="group_info_unchanged">一般的なグループ情報が変更されました。</panel.string>
+  <panel.string name="incomplete_member_data_str">メンバーのデータを検索</panel.string>
+  <panel name="group_info_top">
+    <texture_picker label="" name="insignia" tool_tip="クリックして画像を選択します" />
+    <text name="prepend_founded_by">創設者：</text>
+    <name_box initial_value="（取得中）" name="founder_name" />
+    <text name="join_cost_text">無料</text>
+    <button label="参加します！" name="btn_join" />
+  </panel>
+  <text_editor name="charter">グループの理念、指針を記入してください。</text_editor>
+  <name_list name="visible_members">
+    <name_list.columns label="メンバー" name="name" />
+    <name_list.columns label="タイトル" name="title" />
+    <name_list.columns label="ログイン" name="status" />
+  </name_list>
+  <text name="my_group_settngs_label">自分の設定</text>
+  <text name="active_title_label">タイトル：</text>
+  <combo_box name="active_title" tool_tip="このグループをアクティブにしたときに、アバター名の上に表示されるタイトルを設定します。" />
+  <check_box label="グループ通知を受信" name="receive_notices" tool_tip="このグループからの通知を受信するかどうかの設定を行います。グループからスパムが送られてくる場合は、このボックスのチェックを外してください。" />
+  <check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="あなたのプロフィールにこのグループを表示するかどうかの設定を行います。" />
+  <panel name="preferences_container">
+    <text name="group_settngs_label">グループの設定</text>
+    <check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。" />
+    <check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。" />
+    <spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。" />
+    <combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです。">
+      <combo_item name="select_mature">─レーティング区分を指定─</combo_item>
+      <combo_box.item label="「Moderate」コンテンツ" name="mature" />
+      <combo_box.item label="「General」コンテンツ" name="pg" />
+    </combo_box>
+    <check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます。" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
index bd1013d6ca..d405ba2ab5 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
@@ -1,42 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="グループインベントリ" name="GroupInfo">
-	<panel.string name="default_needs_apply_text">
-		保存していない変更があります
-	</panel.string>
-	<panel.string name="want_apply_text">
-		変更を保存しますか？
-	</panel.string>
-	<panel.string name="group_join_btn">
-		参加 （L$[AMOUNT]）
-	</panel.string>
-	<panel.string name="group_join_free">
-		無料
-	</panel.string>
-	<panel name="group_info_top">
-		<text_editor name="group_name" value="（ローディング...）"/>
-		<line_editor label="新しいグループの名前を入力してください" name="group_name_editor"/>
-	</panel>
-	<layout_stack name="layout">
-		<layout_panel name="group_accordions">
-			<accordion name="groups_accordion">
-				<accordion_tab name="group_general_tab" title="一般"/>
-				<accordion_tab name="group_roles_tab" title="役割 &amp; メンバー"/>
-				<accordion_tab name="group_notices_tab" title="通知"/>
-				<accordion_tab name="group_land_tab" title="土地・資産"/>
-				<accordion_tab name="group_experiences_tab" title="体験"/>
-			</accordion>
-		</layout_panel>
-	</layout_stack>
-	<layout_stack name="button_row_ls">
-		<layout_panel name="btn_chat_lp">
-			<button label="チャット" name="btn_chat"/>
-		</layout_panel>
-		<layout_panel name="call_btn_lp">
-			<button label="グループコール" name="btn_call" tool_tip="このグループにコールする"/>
-		</layout_panel>
-		<layout_panel name="btn_apply_lp">
-			<button label="保存" label_selected="保存" name="btn_apply"/>
-			<button label="グループを作成" name="btn_create" tool_tip="新しいグループを作成"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <panel.string name="default_needs_apply_text">保存していない変更があります。</panel.string>
+  <panel.string name="want_apply_text">変更を保存しますか？</panel.string>
+  <panel.string name="group_join_btn">入会費（L$ [AMOUNT]）</panel.string>
+  <panel.string name="group_join_free">無料</panel.string>
+  <panel name="group_info_top">
+    <text_editor name="group_name" value="（読み込んでいます…）" />
+    <line_editor label="新しいグループの名前を入力してください" name="group_name_editor" />
+  </panel>
+  <layout_stack name="layout">
+    <layout_panel name="group_accordions">
+      <accordion name="groups_accordion">
+        <accordion_tab name="group_general_tab" title="一般" />
+        <accordion_tab name="group_roles_tab" title="役割とメンバー" />
+        <accordion_tab name="group_notices_tab" title="通知" />
+        <accordion_tab name="group_land_tab" title="土地・資産" />
+        <accordion_tab name="group_experiences_tab" title="体験" />
+      </accordion>
+    </layout_panel>
+  </layout_stack>
+  <layout_stack name="button_row_ls">
+    <layout_panel name="btn_chat_lp">
+      <button label="チャット" name="btn_chat" />
+    </layout_panel>
+    <layout_panel name="call_btn_lp">
+      <button label="グループコール" name="btn_call" tool_tip="このグループにコールする" />
+    </layout_panel>
+    <layout_panel name="btn_apply_lp">
+      <button label="保存" label_selected="保存" name="btn_apply" />
+      <button label="グループを作成" name="btn_create" tool_tip="新しいグループを作成" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index 2639454a01..1cc01009e4 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -1,30 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーを招待" name="invite_panel">
-	<panel.string name="confirm_invite_owner_str">
-		本当に新しい所有者を招待しますか？この操作は取り消しできません。
-	</panel.string>
-	<panel.string name="loading">
-		(ローディング．．．)
-	</panel.string>
-	<panel.string name="already_in_group">
-		選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。
-	</panel.string>
-	<panel.string name="invite_selection_too_large">
-		グループへの招待が送信されていません: 選択された住人が多すぎます。グループへの招待は1回のリクエストあたり100人に制限されています。
-	</panel.string>
-	<text bottom_delta="-96" font="SansSerifSmall" height="72" name="help_text">
-		グループには一度に複数の住人を招待することができます。 「リストから住人を選択」をクリックしてください。
-	</text>
-	<button bottom_delta="-10" label="リストから住人を選択" name="add_button" tool_tip=""/>
-	<name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます"/>
-	<button label="リストから選択したものを削除" name="remove_button" tool_tip="招待リストから上で選択した住人を削除します"/>
-	<text name="role_text">
-		割り当て先の役割を選択：
-	</text>
-	<combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください"/>
-	<button label="招待状を送信" name="invite_button"/>
-	<button label="取り消し" name="cancel_button"/>
-	<string name="GroupInvitation">
-		グループへの招待
-	</string>
-</panel>
+  <panel.string name="confirm_invite_owner_str">本当に新しい所有者を招待しますか？この操作は取り消しできません。</panel.string>
+  <panel.string name="loading">（読み込んでいます…）</panel.string>
+  <panel.string name="already_in_group">選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。</panel.string>
+  <panel.string name="invite_selection_too_large">グループへの招待が送信されていません：選択された住人が多すぎます。
+グループへの招待は１回のリクエストあたり１００人に制限されています。</panel.string>
+  <text name="help_text">グループには一度に複数の住人を招待することができます。「リストから住人を選択」をクリックしてください。</text>
+  <button label="リストから住人を選択" name="add_button" tool_tip="" />
+  <name_list name="invitee_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます" />
+  <button label="リストから選択したものを削除" name="remove_button" tool_tip="招待リストから上で選択した住人を削除します" />
+  <text name="role_text">割り当て先の役割を選択：</text>
+  <combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください" />
+  <button label="招待状を送信" name="invite_button" />
+  <button label="キャンセル" name="cancel_button" />
+  <string name="GroupInvitation">グループへの招待</string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 82be58a0fb..f5ab70b68e 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -1,85 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="土地とL$" name="land_money_tab">
-	<panel.string name="help_text">
-		「土地利用の合計」が「寄付総額」以下、または同じになるまで警告が表示されます。
-	</panel.string>
-	<panel.string name="cant_view_group_land_text">
-		グループ所有地を確認する権限がありません。
-	</panel.string>
-	<panel.string name="epmty_view_group_land_text">
-		なし
-	</panel.string>
-	<panel.string name="cant_view_group_accounting_text">
-		グループの会計情報を確認する権限がありません。
-	</panel.string>
-	<panel.string name="loading_txt">
-		ロード中．．．
-	</panel.string>
-	<panel.string name="land_contrib_error">
-		土地の貢献を設定することができません
-	</panel.string>
-	<panel name="layout_panel_landmoney">
-		<scroll_list name="group_parcel_list">
-			<scroll_list.columns label="区画" name="name"/>
-			<scroll_list.columns label="地域" name="location"/>
-			<scroll_list.columns label="種類" name="type"/>
-			<scroll_list.columns label="面積" name="area"/>
-			<scroll_list.columns label="非表示" name="hidden"/>
-		</scroll_list>
-		<text name="total_contributed_land_label">
-			寄付合計：
-		</text>
-		<text name="total_contributed_land_value">
-			[AREA] 平方メートル
-		</text>
-		<button label="地図" label_selected="地図" name="map_button"/>
-		<text name="total_land_in_use_label">
-			土地利用の合計：
-		</text>
-		<text name="total_land_in_use_value">
-			[AREA] 平方メートル
-		</text>
-		<text name="land_available_label">
-			利用可能の土地：
-		</text>
-		<text name="land_available_value">
-			[AREA] 平方メートル
-		</text>
-		<text name="your_contribution_label">
-			あなたの貢献：
-		</text>
-		<text name="your_contribution_units">
-			平方メートル
-		</text>
-		<text name="your_contribution_max_value">
-			（最大 [AMOUNT]）
-		</text>
-		<text name="group_over_limit_text">
-			土地利用をサポートするための土地クレジットが足りません
-		</text>
-		<text name="group_money_heading">
-			グループの L$
-		</text>
-	</panel>
-	<tab_container name="group_money_tab_container">
-		<panel label="計画" name="group_money_planning_tab">
-			<text_editor name="group_money_planning_text">
-				ローディング...
-			</text_editor>
-		</panel>
-		<panel label="詳細" name="group_money_details_tab">
-			<text_editor name="group_money_details_text">
-				ローディング...
-			</text_editor>
-			<button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週"/>
-			<button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週"/>
-		</panel>
-		<panel label="販売取引" name="group_money_sales_tab">
-			<text_editor name="group_money_sales_text">
-				ローディング...
-			</text_editor>
-			<button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週"/>
-			<button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週"/>
-		</panel>
-	</tab_container>
-</panel>
+  <panel.string name="help_text">「土地の総利用量」が「総貢献額」以下、または同じになるまで警告が表示されます。</panel.string>
+  <panel.string name="cant_view_group_land_text">グループ所有地を確認する権限がありません。</panel.string>
+  <panel.string name="epmty_view_group_land_text">なし</panel.string>
+  <panel.string name="cant_view_group_accounting_text">グループの会計情報を確認する権限がありません。</panel.string>
+  <panel.string name="loading_txt">読み込んでいます…</panel.string>
+  <panel.string name="land_contrib_error">土地の貢献を設定することができません。</panel.string>
+  <!--
+  <text name="group_land_heading">グループ所有の土地</text>
+  -->
+  <panel name="layout_panel_landmoney">
+    <scroll_list name="group_parcel_list">
+      <scroll_list.columns label="区画" name="name" />
+      <scroll_list.columns label="リージョン（地域）" name="location" />
+      <scroll_list.columns label="種別" name="type" />
+      <scroll_list.columns label="エリア" name="area" />
+      <scroll_list.columns label="非表示" name="hidden" />
+    </scroll_list>
+    <text name="total_contributed_land_label">総貢献額：</text>
+    <text name="total_contributed_land_value">[AREA]㎡</text>
+    <button label="マップ" name="map_button" />
+    <text name="total_land_in_use_label">土地の総利用量：</text>
+    <text name="land_available_label">利用可能な土地：</text>
+    <text name="land_available_value">[AREA]㎡</text>
+    <text name="your_contribution_label">あなたの貢献：</text>
+    <line_editor name="your_contribution_line_editor" />
+    <text name="your_contribution_units">㎡</text>
+    <text name="your_contribution_max_value">（最大[AMOUNT]）</text>
+    <text name="group_over_limit_text">使用中の土地をサポートするには、より多くの土地クレジットが必要です。</text>
+    <text name="group_money_heading">グループのL$</text>
+  </panel>
+  <tab_container name="group_money_tab_container">
+    <panel label="計画中" name="group_money_planning_tab">
+      <text_editor name="group_money_planning_text">読み込んでいます…</text_editor>
+    </panel>
+    <panel label="詳細情報" name="group_money_details_tab">
+      <text_editor name="group_money_details_text">読み込んでいます…</text_editor>
+      <button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週" />
+      <button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週" />
+    </panel>
+    <panel label="販売中" name="group_money_sales_tab">
+      <text_editor name="group_money_sales_text">読み込んでいます…</text_editor>
+      <button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週" />
+      <button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週" />
+    </panel>
+  </tab_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 77d3d8f391..e5eee591bf 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
-	<text name="group_name" value="不明"/>
-	<button name="info_btn" tool_tip="詳細"/>
-	<button name="profile_btn" tool_tip="プロフィールの表示"/>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <group_icon name="group_icon" />
+  <text name="group_name" value="不明" />
+  <button name="info_btn" tool_tip="詳細詳細" />
+  <!--*TODO: Should only appear on rollover-->
+  <button name="profile_btn" tool_tip="プロフィールの表示" />
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
index 77d3d8f391..49f9c85545 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
-	<text name="group_name" value="不明"/>
-	<button name="info_btn" tool_tip="詳細"/>
-	<button name="profile_btn" tool_tip="プロフィールの表示"/>
-</panel>
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <group_icon name="group_icon" />
+  <text name="group_name" value="不明" />
+  <button name="visibility_hide_btn" tool_tip="プロフィールでグループを非表示にする" />
+  <button name="visibility_show_btn" tool_tip="プロフィールでグループを表示する" />
+  <button name="info_btn" tool_tip="詳細情報" />
+  <!--*TODO: Should only appear on rollover-->
+  <button name="profile_btn" tool_tip="プロフィールの表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index ddad6c1f9b..0fbdc693f8 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
@@ -1,62 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="通知" name="notices_tab">
-	<panel.string name="help_text">
-		通知でメッセージを送ることができ、通知にアイテムを添付することができます。
+  <panel.string name="help_text">通知でメッセージを送ることができ、アイテムを添付することができます。
 通知を受け取ることができる「役割」にあるメンバーだけに送信されます。
-「一般」タブで通知の受信をオフにすることができます。
-	</panel.string>
-	<panel.string name="no_notices_text">
-		過去の通知はありません
-	</panel.string>
-	<text name="lbl2">
-		通知は 14 日間保存されます。
-1 日の制限数は 200 通です。
-	</text>
-	<scroll_list name="notice_list">
-		<scroll_list.columns label="" name="icon"/>
-		<scroll_list.columns label="件名" name="subject"/>
-		<scroll_list.columns label="送信者" name="from"/>
-		<scroll_list.columns label="日付" name="date"/>
-	</scroll_list>
-	<text name="notice_list_none_found">
-		見つかりませんでした
-	</text>
-	<button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します"/>
-	<button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します"/>
-	<panel label="新しい通知を作成" name="panel_create_new_notice">
-		<text name="lbl">
-			通知の作成
-		</text>
-		<text name="lbl3">
-			件名：
-		</text>
-		<text name="lbl4">
-			内容：
-		</text>
-		<text name="lbl5">
-			添付：
-		</text>
-		<text name="string">
-			ここにアイテムをドラッグ＆ドロップして添付してください：
-		</text>
-		<button label="インベントリ" name="open_inventory" tool_tip="インベントリを開きます"/>
-		<button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します"/>
-		<button label="送信" label_selected="送信" name="send_notice"/>
-		<group_drop_target name="drop_target" tool_tip="インベントリのアイテムをこのボックスにドラッグして、通知と一緒に送ります。 添付するには、そのアイテムのコピーと再販・プレゼントの権限があなたにある必要があります。"/>
-	</panel>
-	<panel label="過去の通知を表示" name="panel_view_past_notice">
-		<text name="lbl">
-			アーカイブ通知
-		</text>
-		<text name="lbl2">
-			新しい通知を送信するには、+ ボタンを押してください
-		</text>
-		<text name="lbl3">
-			件名：
-		</text>
-		<text name="lbl4">
-			内容：
-		</text>
-		<button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment"/>
-	</panel>
-</panel>
+「一般」タブで通知の受信をオフにすることができます。</panel.string>
+  <panel.string name="no_notices_text">過去の通知はありません</panel.string>
+  <text name="lbl2">通知は１４日間保存されます。
+１日の制限数は２００通です。</text>
+  <scroll_list name="notice_list">
+    <scroll_list.columns label="" name="icon" />
+    <scroll_list.columns label="件名" name="subject" />
+    <scroll_list.columns label="送信者" name="from" />
+    <scroll_list.columns label="日付" name="date" />
+  </scroll_list>
+  <text name="notice_list_none_found">見つかりませんでした</text>
+  <button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します" />
+  <button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します" />
+  <panel label="新しい通知を作成" name="panel_create_new_notice">
+    <text name="lbl">通知の作成</text>
+    <text name="lbl3">件名：</text>
+    <text name="lbl4">内容：</text>
+    <text name="lbl5">添付：</text>
+    <text name="string">ここにアイテムをドラッグ＆ドロップして添付してください：</text>
+    <button label="インベントリ" name="open_inventory" tool_tip="インベントリを開きます" />
+    <button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します" />
+    <button label="送信" label_selected="送信" name="send_notice" />
+    <group_drop_target name="drop_target" tool_tip="インベントリのアイテムをこのボックスにドラッグして、通知と一緒に送ります。添付するには、そのアイテムのコピーと再販・譲渡の権限があなたにある必要があります。" />
+  </panel>
+  <panel label="過去の通知を表示" name="panel_view_past_notice">
+    <text name="lbl">アーカイブ通知</text>
+    <text name="lbl2">新しい通知を送信するには、＋ボタンを押してください</text>
+    <text name="lbl3">件名：</text>
+    <text name="lbl4">内容：</text>
+    <button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
index 7135ae780d..a30a906bc7 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="instant_message" name="panel_group_notify">
-	<string name="message_max_lines_count" value="7"/>
-	<string name="subject_font" value="SANSSERIF_BIG"/>
-	<string name="date_font" value="SANSSERIF"/>
-	<panel label="header" name="header">
-		<text name="title" value="送信者の名前 / グループ名"/>
-	</panel>
-	<text_editor name="message" value="message"/>
-	<text name="attachment" value="添付アイテム"/>
-	<button label="OK" name="btn_ok"/>
-</panel>
+<panel label="インスタントメッセージ" name="panel_group_notify">
+  <string name="message_max_lines_count" value="7" />
+  <string name="subject_font" value="サンセリフ大" />
+  <string name="date_font" value="サンセリフ" />
+  <panel label="header" name="header">
+    <group_icon name="group_icon" />
+    <text name="title" value="送信者の名前／グループ名" />
+  </panel>
+  <text_editor name="message" value="メッセージ" />
+  <icon name="attachment_icon" />
+  <text name="attachment" value="添付アイテム" />
+  <button label="ＯＫ" name="btn_ok" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index ef8f55b60e..2487264d87 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
@@ -1,98 +1,110 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーと役割" name="roles_tab">
-	<panel.string name="default_needs_apply_text">保存していない変更があります</panel.string>
-	<panel.string name="want_apply_text">変更を保存しますか？</panel.string>
-	<tab_container name="roles_tab_container">
-		<panel label="メンバー" name="members_sub_tab" tool_tip="メンバー">
-			<panel.string name="help_text">あなたはメンバーに割り当てられた役割を付加、削除できます。
-Ctrl キーを押しながらメンバー名をクリックすると
-複数の人を選択できます。</panel.string>
-			<panel.string name="donation_area">[AREA] 平方メートル</panel.string>
-			<filter_editor label="メンバーを選別" name="filter_input"/>
-			<name_list name="member_list">
-				<name_list.columns label="メンバー" name="name"/>
-				<name_list.columns label="寄付" name="donated"/>
-				<name_list.columns label="ステータス" name="online"/>
-				<name_list.columns label="職名" name="title"/>
-			</name_list>
-			<button label="招待" name="member_invite"/>
-			<button label="追放" name="member_eject"/>
-			<button label="メンバーの立入禁止" name="member_ban"/>
-		</panel>
-		<panel label="役割" name="roles_sub_tab">
-			<panel.string name="help_text">役割には、タイトルと許可された能力が
-割り当てられています。メンバーは
-1つ以上の役割を持つことができます。グループで使える役割は10つまでで、
-「全員（Everyone）」と「オーナー（Owner）」がそれに含まれています。</panel.string>
-			<panel.string name="cant_delete_role">「全員（Everyone）」と「オーナー（Owner）」の役割は削除することができません。</panel.string>
-			<panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
-			<panel.string name="power_all_have_icon">Checkbox_On</panel.string>
-			<panel.string name="power_partial_icon">Checkbox_Off</panel.string>
-			<filter_editor label="役割を選別" name="filter_input"/>
-			<scroll_list name="role_list">
-				<scroll_list.columns label="役割" name="name"/>
-				<scroll_list.columns label="肩書き" name="title"/>
-				<scroll_list.columns label="#" name="members"/>
-			</scroll_list>
-			<button label="新しい役割" name="role_create"/>
-			<button label="役割を削除" name="role_delete"/>
-		</panel>
-		<panel label="能力" name="actions_sub_tab" tool_tip="能力の説明文には、どの役割・メンバーがその能力を持つかが書かれています。">
-			<panel.string name="help_text">役割に含まれたメンバーに、このグループで特定の
-活動を行うことを許可する能力。さまざまな能力が提供されます。</panel.string>
-			<filter_editor label="能力を選別" name="filter_input"/>
-			<scroll_list name="action_list" tool_tip="詳細を見るには、能力を選んでください。">
-				<scroll_list.columns label="" name="action"/>
-			</scroll_list>
-		</panel>
-		<panel label="立入禁止にされた住人" name="banlist_sub_tab" tool_tip="このグループから立ち入り禁止にされた住人を表示します。">
-			<panel.string name="help_text">立入禁止リストに登録された住人はグループに参加できません。</panel.string>
-			<panel.string name="ban_count_template">立入禁止の人数: [COUNT]/[LIMIT]</panel.string>
-			<name_list name="ban_list">
-				<name_list.columns label="住人" name="name"/>
-				<name_list.columns label="立入禁止にされた日付" name="ban_date"/>
-			</name_list>
-			<button label="住人の立入禁止" name="ban_create" tool_tip="グループから住人を立入禁止にする"/>
-			<button label="立入禁止の解除" name="ban_delete" tool_tip="選択した住人のグループへの立ち入り禁止を解除"/>
-			<button name="ban_refresh" tool_tip="立入禁止リストの更新"/>
-		</panel>
-		<button name="role_copy" label="コピーロール"/>
-	</tab_container>
-	<panel name="members_footer">
-		<text name="static">割当られた役割</text>
-		<scroll_list name="member_assigned_roles">
-			<scroll_list.columns label="" name="checkbox"/>
-			<scroll_list.columns label="" name="role"/>
-		</scroll_list>
-		<text name="static2">許可された能力</text>
-		<scroll_list name="member_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
-			<scroll_list.columns label="" name="action"/>
-		</scroll_list>
-	</panel>
-	<panel name="members_header">
-		<text_editor name="member_action_description">これは「このグループからメンバーを追放」する能力です。「オーナー」のみが他の「オーナー」を追放できます。</text_editor>
-	</panel>
-	<panel name="roles_footer">
-		<text name="static">役割名</text>
-		<line_editor name="role_name"/>
-		<text name="static3">役割タイトル</text>
-		<line_editor name="role_title"/>
-		<text name="static2">説明</text>
-		<text_editor name="role_description"/>
-		<text name="static4">割当られたメンバー</text>
-		<check_box label="Reveal members" name="role_visible_in_list" tool_tip="グループ外の人が一般タブを見たときに、この役割のメンバーが表示されるかどうかを設定します。"/>
-		<text name="static5" tool_tip="現在選択されている役割で実行できる能力のリスト">許可された能力</text>
-		<scroll_list name="role_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
-			<scroll_list.columns label="" name="checkbox"/>
-			<scroll_list.columns label="" name="action"/>
-		</scroll_list>
-	</panel>
-	<panel name="roles_header">
-		<text_editor name="role_action_description">これは「このグループからメンバーを追放」する能力です。「オーナー」のみが他の「オーナー」を追放できます。</text_editor>
-	</panel>
-	<panel name="actions_footer">
-		<text_editor name="action_description">これは「グループからメンバーを追放する」能力です。 オーナーを追放できるのは、別のオーナーだけです。</text_editor>
-		<text name="static2">この能力を持つ役割</text>
-		<text name="static3">この能力を持つメンバー</text>
-	</panel>
-</panel>
+  <panel.string name="default_needs_apply_text">保存していない変更があります。</panel.string>
+  <panel.string name="want_apply_text">変更を保存しますか？</panel.string>
+  <tab_container name="roles_tab_container">
+    <panel label="メンバー" name="members_sub_tab" tool_tip="メンバー">
+      <panel.string name="help_text">ここからメンバーに役割を付与したり、削除することができます。
+Ctrlキーを押しながら、メンバー名をクリックすることで複数の人を選択できます。</panel.string>
+      <panel.string name="donation_area">[AREA]㎡</panel.string>
+      <filter_editor label="メンバーをフィルタ" name="filter_input" />
+      <name_list name="member_list">
+        <name_list.columns label="メンバー" name="name" />
+        <name_list.columns label="寄付" name="donated" />
+        <name_list.columns label="ステータス" name="online" />
+        <name_list.columns label="タイトル" name="title" />
+      </name_list>
+      <button label="招待" name="member_invite" />
+      <button label="追放" name="member_eject" />
+      <button label="メンバーの立入禁止" name="member_ban" />
+    </panel>
+    <panel label="役割" name="roles_sub_tab">
+      <!-- <button label="すべてを表示" name="show_all_button" />-->
+      <panel.string name="help_text">役割には、タイトルと許可された能力が割り当てられています。
+メンバーは１つ以上の役割を持つことができます。
+グループで使える役割は１０個までで、「全員（Everyone）」と「所有者（Owner）」がそれに含まれています。</panel.string>
+      <panel.string name="cant_delete_role">「全員（Everyone）」と「所有者（Owner）」の役割は削除することができません。</panel.string>
+      <panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
+      <panel.string name="power_all_have_icon">Checkbox_On</panel.string>
+      <panel.string name="power_partial_icon">Checkbox_Off</panel.string>
+      <filter_editor label="役割をフィルタ" name="filter_input" />
+      <scroll_list name="role_list">
+        <scroll_list.columns label="役割" name="name" />
+        <scroll_list.columns label="タイトル" name="title" />
+        <scroll_list.columns label="＃" name="members" />
+      </scroll_list>
+      <button label="新しい役割" name="role_create" />
+      <button label="役割をコピー" name="role_copy" />
+      <button label="役割を削除" name="role_delete" />
+    </panel>
+    <panel label="能力" name="actions_sub_tab" tool_tip="能力の説明と、その能力を実行できるロールとメンバーを表示できます。">
+      <panel.string name="help_text">能力は、ロール内のメンバーはこのグループ内で特定のことを行うことができます。
+多種多様な能力が指定可能です。</panel.string>
+      <panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
+      <panel.string name="power_all_have_icon">Checkbox_On</panel.string>
+      <panel.string name="power_partial_icon">Checkbox_Off</panel.string>
+      <filter_editor label="能力でフィルタ" name="filter_input" />
+      <scroll_list name="action_list" tool_tip="詳細を見るには、能力を選んでください。">
+        <scroll_list.columns label="" name="icon" />
+        <scroll_list.columns label="" name="checkbox" />
+        <scroll_list.columns label="" name="action" />
+      </scroll_list>
+    </panel>
+    <panel label="バンされた住民" name="banlist_sub_tab" tool_tip="このグループからバンされた住人を表示します。">
+      <panel.string name="help_text">バンリストに登録された住人は、グループに参加できません。</panel.string>
+      <panel.string name="ban_count_template">バンされた人数：[LIMIT]人中[COUNT]人</panel.string>
+      <name_list name="ban_list">
+        <name_list.columns label="住人" name="name" />
+        <name_list.columns label="バンした日付" name="ban_date" />
+      </name_list>
+      <button label="住人をバンする" name="ban_create" tool_tip="グループから住人をバンします。" />
+      <button label="バンの解除" name="ban_delete" tool_tip="選択した住人のバンを解除します。" />
+      <button label="リフレッシュ" name="ban_refresh" tool_tip="バンリストをリフレッシュします。" />
+      <text name="ban_count" width="100" />
+    </panel>
+  </tab_container>
+  <panel name="members_footer">
+    <text name="static">割当られた役割</text>
+    <scroll_list name="member_assigned_roles">
+      <scroll_list.columns label="" name="checkbox" />
+      <scroll_list.columns label="" name="role" />
+    </scroll_list>
+    <text name="static2">許可されたアクション</text>
+    <scroll_list name="member_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
+      <scroll_list.columns label="" name="icon" />
+      <scroll_list.columns label="" name="checkbox" />
+      <scroll_list.columns label="" name="action" />
+    </scroll_list>
+  </panel>
+  <panel name="members_header">
+    <text_editor name="member_action_description">
+      これは「このグループからメンバーを追放」する能力です。「所有者」のみが他の「所有者」を追放できます。</text_editor>
+  </panel>
+  <panel name="roles_footer">
+    <text name="static">役割名</text>
+    <line_editor name="role_name" />
+    <text name="static3">役割タイトル</text>
+    <line_editor name="role_title" />
+    <text name="static2">説明</text>
+    <text_editor name="role_description" />
+    <text name="static4">割当られたメンバー</text>
+    <check_box label="Reveal members" name="role_visible_in_list" tool_tip="グループ外の人が一般タブを見たときに、この役割のメンバーが表示されるかどうかを設定します。" />
+    <text name="static5" tool_tip="現在選択されている役割で実行できる能力のリスト">許可された能力</text>
+    <scroll_list name="role_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
+      <scroll_list.columns label="" name="icon" />
+      <scroll_list.columns label="" name="checkbox" />
+      <scroll_list.columns label="" name="action" />
+    </scroll_list>
+  </panel>
+  <panel name="roles_header">
+    <text_editor name="role_action_description">これは「このグループからメンバーを追放」する能力です。
+「所有者」のみが他の「所有者」を追放できます。</text_editor>
+  </panel>
+  <panel name="actions_footer">
+    <text_editor name="action_description">これは「グループからメンバーを追放する」能力です。
+「所有者」を追放できるのは、別の「所有者」だけです。</text_editor>
+    <text name="static2">この能力を持つ役割</text>
+    <text name="static3">この能力を持つメンバー</text>
+    <name_list name="action_members" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml b/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
new file mode 100644
index 0000000000..e815842746
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_hide_beacon">
+  <button label="ビーコンを隠す" name="hide_beacon_btn" tool_tip="トラッキングを停止してビーコンを隠す。" />
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
index bf4cbcdc46..e2bf98c3dd 100644
--- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="im_panel" name="im_panel">
-	<string name="message_max_lines_count">
-		6
-	</string>
-	<panel label="im_header" name="im_header">
-		<text name="time_box" value="23:30"/>
-	</panel>
-	<button label="返信" name="reply"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_panel" name="im_panel">
+  <string name="message_max_lines_count">6</string>
+  <panel label="IMのヘッダ" name="im_header">
+    <avatar_icon name="avatar_icon" />
+    <group_icon name="group_icon" />
+    <avatar_icon name="adhoc_icon" />
+    <text name="user_name" value="テスト文字列　無視してください" />
+    <!-- TIME STAMP -->
+    <text name="time_box" value="23：30" />
+  </panel>
+  <text name="message" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
index d18047fbcf..fdab97cfe3 100644
--- a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="inventory_item">
-	<text name="item_name" value="..."/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="inventory_item">
+  <icon name="hovered_icon" />
+  <icon name="selected_icon" />
+  <icon name="item_icon" />
+  <text name="item_name" value="…" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index 7fca66f90f..7681a423d8 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
@@ -1,41 +1,51 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="landmark_info">
-	<string name="title_create_landmark" value="ランドマークを作成"/>
-	<string name="title_edit_landmark" value="ランドマークを編集"/>
-	<string name="title_landmark" value="ランドマーク"/>
-	<string name="not_available" value="（該当なし）"/>
-	<string name="unknown" value="（不明）"/>
-	<string name="public" value="（公開）"/>
-	<string name="server_update_text">
-		場所の情報はサーバーがアップデートされるまでご利用いただけません。
-	</string>
-	<string name="server_error_text">
-		この位置の情報は現在ご利用いただけません。あとでもう一度お試しください。
-	</string>
-	<string name="server_forbidden_text">
-		この位置の情報は、アクセス制限のためご利用いただけません。  許可については区画所有者にお問い合わせください。
-	</string>
-	<string name="acquired_date">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</string>
-	<button name="back_btn" tool_tip="戻る"/>
-	<text name="title" value="場所のプロフィール"/>
-	<scroll_container name="place_scroll">
-		<panel name="scrolling_panel">
-			<text name="region_title" value="SampleRegion"/>
-			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
-			<expandable_text name="description" value="Du waltz die spritz"/>
-			<text name="maturity_value" value="不明"/>
-			<panel name="landmark_info_panel">
-				<text name="owner_label" value="所有者："/>
-				<text name="creator_label" value="制作者："/>
-				<text name="created_label" value="制作日："/>
-			</panel>
-			<panel name="landmark_edit_panel">
-				<text name="title_label" value="タイトル："/>
-				<text name="notes_label" value="メモ："/>
-				<text name="folder_label" value="ランドマークの位置："/>
-			</panel>
-		</panel>
-	</scroll_container>
-</panel>
+  <string name="title_create_landmark" value="ランドマークを作成" />
+  <string name="title_edit_landmark" value="ランドマークを編集" />
+  <string name="title_landmark" value="ランドマーク" />
+  <string name="not_available" value="（該当なし）" />
+  <string name="unknown" value="（不明）" />
+  <string name="public" value="（公開）" />
+  <string name="server_update_text">場所の情報はサーバーがアップデートされるまでご利用いただけません。</string>
+  <string name="server_error_text">この位置の情報は現在ご利用いただけません。あとでもう一度お試しください。</string>
+  <string name="server_forbidden_text">この位置の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。</string>
+  <string name="acquired_date">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日（[wkday,datetime,local]）　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</string>
+  <string name="icon_PG" value="Parcel_PG_Dark" />
+  <string name="icon_M" value="Parcel_M_Dark" />
+  <string name="icon_R" value="Parcel_R_Dark" />
+  <button name="back_btn" tool_tip="戻る" />
+  <text name="title" value="場所のプロフィール" />
+  <scroll_container name="place_scroll">
+    <panel name="scrolling_panel">
+      <texture_picker name="logo" />
+      <!-- texture picker has an empty label section, compensate for it with negative top_pad-->
+      <text name="parcel_title" value="SampleParcel, Name Long" />
+      <text name="region_title">リージョン（地域）：[REGIONAMEPOS]</text>
+      <text name="parcel_owner_label" value="所有者：" />
+      <text name="parcel_owner" value="一時的な所有者" />
+      <expandable_text name="description" value="Du waltz die spritz" />
+      <icon name="maturity_icon" />
+      <text name="maturity_value" value="不明" />
+      <panel name="landmark_info_panel">
+        <view_border name="lod_tab_border" />
+        <text name="this_landmark">ランドマーク：</text>
+        <text name="owner_label" value="所有者：" />
+        <text name="owner" />
+        <text name="creator_label" value="作成者：" />
+        <text name="creator" />
+        <text name="created_label" value="作成日：" />
+        <text name="created" />
+      </panel>
+      <panel name="landmark_edit_panel">
+        <text value="タイトル：" />
+        <line_editor name="title_value" />
+        <button name="edit_btn" tool_tip="ランドマーク情報を編集" />
+        <line_editor name="title_editor"/>
+        <text name="notes_label" value="ノート：" />
+        <text_editor name="notes_editor" />
+        <text name="folder_label" value="ランドマークの場所：" />
+        <combo_box name="folder_combo" />
+      </panel>
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
index 24d6ff23ae..b33813f017 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Landmarks">
-	<accordion name="landmarks_accordion">
-		<accordion_tab name="tab_favorites" title="お気に入りバー"/>
-		<accordion_tab name="tab_landmarks" title="マイ ランドマーク"/>
-		<accordion_tab name="tab_inventory" title="インベントリ"/>
-		<accordion_tab name="tab_library" title="ライブラリ"/>
-	</accordion>
-	<panel name="bottom_panel">
-		<layout_stack name="bottom_panel">
-			<layout_panel name="options_gear_btn_panel">
-				<button name="options_gear_btn" tool_tip="オプションを表示します"/>
-			</layout_panel>
-			<layout_panel name="add_btn_panel">
-				<button name="add_btn" tool_tip="新しいランドマークを追加"/>
-			</layout_panel>
-			<layout_panel name="trash_btn_panel">
-				<dnd_button name="trash_btn" tool_tip="選択したランドマークを削除します"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+  <accordion name="landmarks_accordion">
+    <accordion_tab name="tab_favorites" title="お気に入りバー" />
+    <accordion_tab name="tab_landmarks" title="ランドマーク" />
+    <accordion_tab name="tab_inventory" title="インベントリ" />
+    <accordion_tab name="tab_library" title="ライブラリ" />
+  </accordion>
+  <panel name="bottom_panel">
+    <layout_stack name="bottom_panel">
+      <layout_panel name="options_gear_btn_panel">
+        <button name="options_gear_btn" tool_tip="オプションを表示します" />
+      </layout_panel>
+      <layout_panel name="add_btn_panel">
+        <button name="add_btn" tool_tip="新しいランドマークを追加" />
+      </layout_panel>
+      <layout_panel name="trash_btn_panel">
+        <dnd_button name="trash_btn" tool_tip="選択したランドマークを削除します" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index db4b0aea23..a1af2cbf85 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,22 +1,28 @@
-<?xml version="1.0" ?>
-<panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=ja</panel.string>
-	<panel.string name="sign_up_url">https://join.secondlife.com/</panel.string>
-	<layout_stack name="ui_stack">
-		<layout_panel name="ui_container">
-			<combo_box label="ユーザー名" name="username_combo" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）"/>
-			<line_editor label="パスワード" name="password_edit"/>
-			<combo_box label="お気に入りの場所" name="start_location_combo">
-				<combo_box.item label="最後にログアウトした場所" name="MyLastLocation"/>
-				<combo_box.item label="ホーム" name="MyHome"/>
-			</combo_box>
-			<button label="ログイン" name="connect_btn"/>
-			<check_box label="記憶する" name="remember_check"/>
-			<text name="forgot_password_text">パスワードを忘れた場合</text>
-			<combo_box label="グリッドを選択" name="server_combo"/>
-			<text name="sign_up_text">登録</text>
-		</layout_panel>
-		<check_box name="remember_name" label="記憶する" tool_tip="記憶されたユーザーを削除することができます。私 &gt; プリファレンス&gt; アドバンス &gt; 記憶されたユーザー名"/>
-		<check_box name="remember_password" label="パスワードを記憶する"/>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login" focus_root="true">
+  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
+  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
+  <layout_stack name="ui_stack">
+    <layout_panel name="ui_elastic_pad_left" />
+    <layout_panel name="ui_container">
+      <icon name="sl_logo_small" />
+      <combo_box label="Username" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
+        <combo_box.combo_editor />
+      </combo_box>
+      <line_editor name="password_edit" label="パスワード" />
+      <combo_box label="お気に入りの場所" name="start_location_combo">
+        <combo_box.combo_editor />
+        <combo_box.item label="最後にいた場所" name="MyLastLocation" value="last" />
+        <combo_box.item label="ホーム" name="MyHome" value="home" />
+      </combo_box>
+      <button label="ログイン" name="connect_btn" />
+      <text name="sign_up_text">サインアップ</text>
+      <check_box label="名前を記録" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。" />
+      <check_box label="パスワードを記録" name="remember_password" />
+      <combo_box label="Select grid" name="server_combo" />
+      <text name="forgot_password_text">パスワードに関するヘルプ</text>
+    </layout_panel>
+    <layout_panel name="ui_elastic_pad_right" />
+  </layout_stack>
+  <web_browser name="login_html" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_login_first.xml b/indra/newview/skins/default/xui/ja/panel_login_first.xml
index 644cee25f2..e878b2524a 100644
--- a/indra/newview/skins/default/xui/ja/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login_first.xml
@@ -1,39 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">
-		http://secondlife.com/account/request.php?lang=ja
-	</panel.string>
-	<panel.string name="sign_up_url">
-		https://join.secondlife.com/
-	</panel.string>
-	<layout_stack name="logo_stack">
-		<layout_panel name="parent_panel2">
-			<layout_stack name="widget_stack">
-				<layout_panel name="widget_container">
-					<combo_box label="ユーザー名" name="username_combo" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）"/>
-					<line_editor label="パスワード" name="password_edit"/>
-					<button label="ログイン" name="connect_btn"/>
-					<check_box label="記憶する" name="remember_check"/>
-					<text name="forgot_password_text">
-						パスワードを忘れた場合
-					</text>
-					<text name="sign_up_text">
-						登録
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="parent_panel3">
-			<layout_stack name="images_stack">
-				<layout_panel name="images_container">
-					<text name="image_caption_left">
-						最初のステップは、アイランドについて学ぶことです。さあ、アイランド探検の入口を見つけてください!
-					</text>
-					<text name="image_caption_right">
-						ソーシャル アイランドを探検して、他の新しい住人を探してください!
-					</text>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
+  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
+  <layout_stack name="logo_stack">
+    <layout_panel name="page_top" />
+    <!-- start of logo stack -->
+    <layout_panel name="parent_panel">
+      <layout_stack name="logo_stack">
+        <layout_panel name="logo_left" />
+        <layout_panel name="logo_container">
+          <icon name="sl_logo" />
+        </layout_panel>
+        <layout_panel auto_resize="true" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of logo stack -->
+    <!-- start of widget stack -->
+    <layout_panel name="parent_panel2">
+      <layout_stack name="widget_stack">
+        <layout_panel name="widget_left" />
+        <layout_panel name="widget_container">
+          <combo_box label="ユーザ名" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
+            <combo_box.combo_editor />
+            <combo_box.combo_button />
+            <combo_box.drop_down_button />
+          </combo_box>
+          <line_editor name="password_edit" label="パスワード" />
+          <button label="ログイン" name="connect_btn" />
+          <text name="sign_up_text" valign="center">サインアップ</text>
+          <check_box label="ユーザ名を記憶" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。" />
+          <check_box label="パスワード記憶" name="remember_password" />
+          <text name="forgot_password_text">
+            パスワードを忘れましたか？
+          </text>
+        </layout_panel>
+        <layout_panel name="widget_right" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of widget stack -->
+    <!-- start of images stack -->
+    <layout_panel name="parent_panel3">
+      <layout_stack name="images_stack">
+        <layout_panel name="images_left" />
+        <layout_panel name="images_container">
+          <icon name="image_left" />
+        </layout_panel>
+        <layout_panel name="images_right" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of images stack -->
+    <layout_panel name="page_bottom" />
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 5751154163..4d337a50c7 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -1,38 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="もの" name="main inventory panel">
-	<panel.string name="ItemcountFetching">
-		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得中です... [FILTER]
-	</panel.string>
-	<panel.string name="ItemcountCompleted">
-		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダー [FILTER]
-	</panel.string>
-	<panel.string name="ItemcountUnknown">
-		[ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得しました [FILTER]
-	</panel.string>
-	<text name="ItemcountText">
-		アイテム：
-	</text>
-	<filter_editor label="検索用語を入力する" name="inventory search editor"/>
-	<combo_box name="search_type">
-		<item label="名前" name="Name" value="search_by_name"/>
-		<item label="制作者" name="Creator" value="search_by_creator"/>
-		<item label="説明" name="Description" value="search_by_description"/>
-		<item label="UUID" name="UUID" value="search_by_UUID"/>
-	</combo_box>
-	<tab_container name="inventory filter tabs">
-		<inventory_panel label="インベントリ" name="All Items"/>
-		<recent_inventory_panel label="最新" name="Recent Items"/>
-		<inventory_panel label="着用中" name="Worn Items"/>
-	</tab_container>
-	<layout_stack name="bottom_panel">
-		<layout_panel name="options_gear_btn_panel">
-			<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
-		</layout_panel>
-		<layout_panel name="add_btn_panel">
-			<button name="add_btn" tool_tip="新しいアイテムを追加します"/>
-		</layout_panel>
-		<layout_panel name="trash_btn_panel">
-			<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="もの" name="main inventory panel">
+  <panel.string name="ItemcountFetching">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得中です…。[FILTER]</panel.string>
+  <panel.string name="ItemcountCompleted">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーの取得が完了しました。[FILTER]</panel.string>
+  <panel.string name="ItemcountUnknown">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得しました。[FILTER]</panel.string>
+  <text name="ItemcountText">アイテム：</text>
+  <filter_editor label="検索用語を入力する" name="inventory search editor" />
+  <combo_box name="search_type">
+    <item label="名前" name="Name" value="search_by_name" />
+    <item label="制作者" name="Creator" value="search_by_creator" />
+    <item label="説明" name="Description" value="search_by_description" />
+    <item label="ＵＵＩＤ" name="UUID" value="search_by_UUID" />
+  </combo_box>
+  <menu_button tool_tip="検索表示オプションを表示" name="options_visibility_btn" />
+  <filter_editor label="検索語句を入力" name="inventory search editor" />
+  <tab_container name="inventory filter tabs">
+    <inventory_panel label="インベントリ" name="All Items" />
+    <recent_inventory_panel label="最新" name="Recent Items" />
+    <inventory_panel label="着用中" name="Worn Items" />
+  </tab_container>
+  <layout_stack name="bottom_panel">
+    <layout_panel name="options_gear_btn_panel">
+      <menu_button name="options_gear_btn" tool_tip="オプションを表示します。" />
+    </layout_panel>
+    <layout_panel name="add_btn_panel">
+      <button name="add_btn" tool_tip="新しいアイテムを追加します。" />
+    </layout_panel>
+    <layout_panel name="trash_btn_panel">
+      <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します。" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
index a9218bebff..4cfc74bf3b 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="マーケットプレイス" name="Marketplace Panel">
-	<panel name="tool_panel">
-		<menu_button name="sort_btn" tool_tip="表示/並べ替えオプション"/>
-		<button name="add_btn" tool_tip="新規リストフォルダの作成"/>
-		<button label="エラーを確認" name="audit_btn" tool_tip="マーケットプレイスのリストを確認"/>
-	</panel>
-	<panel name="tab_container_panel">
-		<filter_editor label="マーケットプレイスのリストをフィルタ" name="filter_editor"/>
-	</panel>
-</panel>
+  <panel name="tool_panel">
+    <menu_button name="sort_btn" tool_tip="表示／並べ替えオプション" />
+    <button name="add_btn" tool_tip="新規リストフォルダの作成" />
+    <button label="エラーを確認" name="audit_btn" tool_tip="マーケットプレイスのリストを確認" />
+  </panel>
+  <panel name="tab_container_panel">
+    <filter_editor label="マーケットプレイスのリストをフィルタ" name="filter_editor" />
+  </panel>
+  <panel name="marketplace_drop_zone">
+    <text>ここにフォルダをドロップして新しいリストを作成</text>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
index 43cb64d6ba..6d447509b6 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="すべて" name="All Items" tool_tip="ここにアイテムをドラッグ＆ドロップしてリストに表示します"/>
+<inventory_panel label="すべて" name="All Items" tool_tip="ここにアイテムをドラッグ＆ドロップしてリストに表示します。" />
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
index 7f27231cbd..41ca08fe4b 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="リストに掲載" name="Active Items"/>
+<inventory_panel label="リストに掲載" name="Active Items" />
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
index 215be9ae6d..410661a3e5 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="関連付けされていない" name="Unassociated Items"/>
+<inventory_panel label="関連付けされていない" name="Unassociated Items" />
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
index 04530477f6..e29bbc62e3 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="リストから削除済み" name="Inactive Items"/>
+<inventory_panel label="リストから削除済み" name="Inactive Items" />
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
index 6321dbb048..011b626b46 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
@@ -1,32 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="一般" name="Media Settings General">
-	<text name="home_label">
-		ホームページ：
-	</text>
-	<text name="home_fails_whitelist_label">
-		（このページは指定したホワイトリストをパスしません）
-	</text>
-	<line_editor name="home_url" tool_tip="このメディアソースのホームページ"/>
-	<text name="preview_label">
-		プレビュー
-	</text>
-	<text name="current_url_label">
-		現在のページ：
-	</text>
-	<text name="current_url" tool_tip="メディアソースの現在のページ" value=""/>
-	<button label="リセット" name="current_url_reset_btn"/>
-	<check_box initial_value="false" label="ループ再生" name="auto_loop"/>
-	<check_box initial_value="false" label="最初にクリックしたときの動作" name="first_click_interact"/>
-	<check_box initial_value="false" label="自動ズーム" name="auto_zoom"/>
-	<check_box initial_value="false" label="自動メディア再生" name="auto_play"/>
-	<text name="media_setting_note">
-		注意： 住人はこの設定を無視できます
-	</text>
-	<check_box initial_value="false" label="オブジェクトの表面サイズに合わせて自動調整" name="auto_scale"/>
-	<text name="size_label">
-		サイズ：
-	</text>
-	<text name="X_label">
-		X
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="一般" name="Media Settings General">
+  <text name="home_label">ホームページ：</text>
+  <text name="home_fails_whitelist_label">（このページは指定したホワイトリストをパスしません）</text>
+  <line_editor name="home_url" tool_tip="このメディアソースのホームページ" />
+
+  <web_browser name="preview_media" />
+
+  <text name="preview_label">プレビュー</text>
+
+  <text name="current_url_label">現在のページ：</text>
+  <text name="current_url" tool_tip="メディアソースの現在のページ" value="" />
+  <button label="リセット" name="current_url_reset_btn" />
+  <check_box label="ループ再生" name="auto_loop" />
+  <check_box label="最初にクリックしたときの動作" name="first_click_interact" />
+
+  <check_box label="自動ズーム" name="auto_zoom" />
+
+  <check_box label="自動メディア再生" name="auto_play" />
+
+  <text name="media_setting_note">注意： 住人はこの設定を無視できます</text>
+
+  <check_box label="オブジェクトの表面サイズに合わせて自動調整" name="auto_scale" />
+
+  <text name="size_label">サイズ：</text>
+  <text name="X_label">Ｘ</text>
+  <spinner label="" name="height_pixels" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
index 11d9ed4c16..509885d11d 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
@@ -1,29 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="カスタマイズ" name="Media settings for controls">
-	<text name="controls_label">
-		コントロール：
-	</text>
-	<combo_box name="controls">
-		<combo_item name="Standard">
-			標準
-		</combo_item>
-		<combo_item name="Mini">
-			ミニ
-		</combo_item>
-	</combo_box>
-	<text name="owner_label">
-		所有者
-	</text>
-	<check_box initial_value="false" label="ナビゲーションと相互作用力を有効にする" name="perms_owner_interact"/>
-	<check_box initial_value="false" label="コントロールバーを表示する" name="perms_owner_control"/>
-	<text name="group_label">
-		グループ：
-	</text>
-	<check_box initial_value="false" label="ナビゲーションと相互作用力を有効にする" name="perms_group_interact"/>
-	<check_box initial_value="false" label="コントロールバーを表示する" name="perms_group_control"/>
-	<text name="anyone_label">
-		全員
-	</text>
-	<check_box initial_value="false" label="ナビゲーションと相互作用力を有効にする" name="perms_anyone_interact"/>
-	<check_box initial_value="false" label="コントロールバーを表示する" name="perms_anyone_control"/>
-</panel>
+  <text name="controls_label">コントロール：</text>
+  <combo_box name="controls">
+    <combo_item name="Standard">標準</combo_item>
+    <combo_item name="Mini">ミニ</combo_item>
+  </combo_box>
+  <text name="owner_label">所有者</text>
+  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_owner_interact" />
+  <check_box label="コントロールバーを表示する" name="perms_owner_control" />
+  <text name="group_label">グループ：</text>
+  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_group_interact" />
+  <check_box label="コントロールバーを表示する" name="perms_group_control" />
+  <text name="anyone_label">全員</text>
+  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_anyone_interact" />
+  <check_box label="コントロールバーを表示する" name="perms_anyone_control" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
index ea4fdb9ce5..12bb265af2 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セキュリティ" name="Media Settings Security">
-	<check_box initial_value="false" label="指定した URL パターンから始まる接続を許可する" name="whitelist_enable"/>
-	<text name="home_url_fails_some_items_in_whitelist">
-		ホームページに失敗したエントリーがありました：
-	</text>
-	<button label="追加" name="whitelist_add"/>
-	<button label="削除" name="whitelist_del"/>
-	<text name="home_url_fails_whitelist">
-		警告： 「一般」タブで指定されたホームページは、ホワイトリストに掲載されていません。 正しい機能が設定されるまで、この機能は一時停止します。
-	</text>
-</panel>
+  <check_box label="指定したURLパターンから始まる接続を許可する。" name="whitelist_enable" />
+  <text name="home_url_fails_some_items_in_whitelist">ホームページに失敗したエントリーがありました：</text>
+  <button label="追加" name="whitelist_add" />
+  <button label="削除" name="whitelist_del" />
+  <text name="home_url_fails_whitelist">警告：「一般」タブで指定されたホームページは、ホワイトリストに掲載されていません。正しい機能が設定されるまで、この機能は一時停止します。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
index 51402b2e00..6a2e272a38 100644
--- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
-	<layout_stack name="nvp_stack">
-		<layout_panel name="navigation_layout_panel">
-			<panel name="navigation_panel">
-				<pull_button name="back_btn" tool_tip="前の場所"/>
-				<pull_button name="forward_btn" tool_tip="次の場所"/>
-				<button name="home_btn" tool_tip="「ホーム」にテレポートします"/>
-				<location_input label="所在地" name="location_combo"/>
-			</panel>
-		</layout_panel>
-		<layout_panel name="favorites_layout_panel">
-			<favorites_bar name="favorite" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
-				<label name="favorites_bar_label" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
-					お気に入りバー
-				</label>
-				<more_button name="&gt;&gt;" tool_tip="お気に入りをもっと表示">
-					詳細 ▼
-				</more_button>
-			</favorites_bar>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="nvp_stack">
+    <layout_panel name="navigation_layout_panel">
+      <panel name="navigation_panel">
+        <pull_button name="back_btn" tool_tip="前の場所" />
+        <pull_button name="forward_btn" tool_tip="次の場所" />
+        <button name="home_btn" tool_tip="「ホーム」にテレポートします" />
+        <location_input label="所在地" name="location_combo" />
+      </panel>
+    </layout_panel>
+    <layout_panel name="favorites_layout_panel">
+      <favorites_bar name="favorite" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
+        <label name="favorites_bar_label" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">お気に入りバー</label>
+        <more_button name="&gt;&gt;" tool_tip="お気に入りをもっと表示">詳細 ▼</more_button>
+      </favorites_bar>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
index 4048b48d3a..a4bd7963fb 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_chat">
-	<layout_stack name="stack">
-		<layout_panel name="translate_chat_checkbox_lp">
-			<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="stack">
+    <layout_panel name="translate_chat_checkbox_lp">
+      <check_box label="チャットを翻訳" name="translate_chat_checkbox" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 201fb0a376..b47a924f8e 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_chat">
-	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して発言し、Ctrl + Enter キーで叫びます。"/>
-	<button name="show_nearby_chat" tool_tip="近くのチャットログを表示・非表示"/>
-</panel>
+  <line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enterキーで発言し、Ctrl＋Enterキーでシャウトします。" />
+  <button name="show_nearby_chat" tool_tip="近隣チャットログを表示／非表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index c29ec64304..8ab941fe3a 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -1,71 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		（メディアアイテム %ld ）
-	</string>
-	<string name="empty_item_text">
-		&lt;空&gt;
-	</string>
-	<string name="parcel_media_name">
-		区画ストリーミングメディア
-	</string>
-	<string name="parcel_audio_name">
-		区画ストリーミングオーディオ
-	</string>
-	<string name="playing_suffix">
-		（再生中）
-	</string>
-	<panel name="minimized_controls">
-		<button label="すべて停止" name="all_nearby_media_disable_btn" tool_tip="近くのメディアをすべてオフにします"/>
-		<button label="すべて開始" name="all_nearby_media_enable_btn" tool_tip="近くのメディアをすべてオンにします"/>
-		<button name="open_prefs_btn" tool_tip="メディアの設定を開きます"/>
-		<button label="詳細 &gt;&gt;" label_selected="&lt;&lt; 簡易" name="more_btn" tool_tip="アドバンスコントロール"/>
-		<button label="詳細 &gt;&gt;" label_selected="簡易 &lt;&lt;" name="less_btn" tool_tip="アドバンスコントロール"/>
-	</panel>
-	<panel name="nearby_media_panel">
-		<text name="nearby_media_title">
-			近くのメディア
-		</text>
-		<text name="show_text">
-			表示：
-		</text>
-		<combo_box name="show_combo">
-			<combo_box.item label="すべて" name="All"/>
-			<combo_box.item label="この区画内" name="WithinParcel"/>
-			<combo_box.item label="この区画外" name="OutsideParcel"/>
-			<combo_box.item label="他のアバター" name="OnOthers"/>
-		</combo_box>
-		<scroll_list name="media_list">
-			<scroll_list.columns label="近接" name="media_proximity"/>
-			<scroll_list.columns label="表示" name="media_visibility"/>
-			<scroll_list.columns label="クラス" name="media_class"/>
-			<scroll_list.columns label="名前" name="media_name"/>
-			<scroll_list.columns label="デバッグ" name="media_debug"/>
-		</scroll_list>
-		<panel name="media_controls_panel">
-			<layout_stack name="media_controls">
-				<layout_panel name="stop">
-					<button name="stop_btn" tool_tip="選択したメディアを停止"/>
-				</layout_panel>
-				<layout_panel name="play">
-					<button name="play_btn" tool_tip="選択したメディアを再生"/>
-				</layout_panel>
-				<layout_panel name="pause">
-					<button name="pause_btn" tool_tip="選択したメディアを一時停止"/>
-				</layout_panel>
-				<layout_panel name="volume_slider_ctrl">
-					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="選択したメディアの音量"/>
-				</layout_panel>
-				<layout_panel name="mute">
-					<button name="mute_btn" tool_tip="選択したメディアの音をミュート"/>
-				</layout_panel>
-				<layout_panel name="zoom">
-					<button name="zoom_btn" tool_tip="選択したメディアにズーム"/>
-				</layout_panel>
-				<layout_panel name="unzoom">
-					<button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</panel>
-</panel>
+  <string name="media_item_count_format">（メディアアイテム %ld ）</string>
+  <string name="empty_item_text">&lt;空&gt;</string>
+  <string name="parcel_media_name">区画ストリーミングメディア</string>
+  <string name="parcel_audio_name">区画ストリーミングオーディオ</string>
+  <string name="playing_suffix">（再生中）</string>
+  <panel name="minimized_controls">
+    <button label="すべて停止" name="all_nearby_media_disable_btn" tool_tip="近隣のメディアをすべてオフにします" />
+    <button label="すべて開始" name="all_nearby_media_enable_btn" tool_tip="近隣のメディアをすべてオンにします" />
+    <button name="open_prefs_btn" tool_tip="メディアの設定を開きます" />
+    <button label="詳細　≫" label_selected="≪　簡易" name="more_btn" tool_tip="拡張コントロール" />
+    <button label="詳細　≫" label_selected="≪　簡易" name="less_btn" tool_tip="拡張コントロール" />
+  </panel>
+  <panel name="nearby_media_panel">
+    <text name="nearby_media_title">近隣のメディア</text>
+    <text name="show_text">表示：</text>
+    <combo_box name="show_combo">
+      <combo_box.item label="すべて" name="All" />
+      <combo_box.item label="この区画内" name="WithinParcel" />
+      <combo_box.item label="この区画外" name="OutsideParcel" />
+      <combo_box.item label="他のアバター" name="OnOthers" />
+    </combo_box>
+    <scroll_list name="media_list">
+      <scroll_list.columns label="近接" name="media_proximity" />
+      <scroll_list.columns label="表示" name="media_visibility" />
+      <scroll_list.columns label="クラス" name="media_class" />
+      <scroll_list.columns label="名前" name="media_name" />
+      <scroll_list.columns label="デバッグ" name="media_debug" />
+    </scroll_list>
+    <panel name="media_controls_panel">
+      <layout_stack name="media_controls">
+        <layout_panel name="stop">
+          <button name="stop_btn" tool_tip="選択したメディアを停止" />
+        </layout_panel>
+        <layout_panel name="play">
+          <button name="play_btn" tool_tip="選択したメディアを再生" />
+        </layout_panel>
+        <layout_panel name="pause">
+          <button name="pause_btn" tool_tip="選択したメディアを一時停止" />
+        </layout_panel>
+        <layout_panel name="volume_slider_ctrl">
+          <slider_bar name="volume_slider" tool_tip="選択したメディアの音量" />
+        </layout_panel>
+        <layout_panel name="mute">
+          <button name="mute_btn" tool_tip="選択したメディアの音をミュート" />
+        </layout_panel>
+        <layout_panel name="zoom">
+          <button name="zoom_btn" tool_tip="選択したメディアにズーム" />
+        </layout_panel>
+        <layout_panel name="unzoom">
+          <button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる" />
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notification.xml b/indra/newview/skins/default/xui/ja/panel_notification.xml
new file mode 100644
index 0000000000..ec3bc6a2b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_notification.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="通知パネル" name="notification_panel">
+  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
+  <panel label="情報パネル" name="info_panel">
+    <text name="text_box" />
+    <text name="caution_text_box" />
+    <text_editor name="text_editor_box" />
+  </panel>
+  <panel label="コントロールパネル" name="control_panel">
+    <!-- 
+    Notes:
+    This panel holds buttons of notification. Change of its size can affect the layout of buttons. 
+    -->
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
index 698aefdb3d..2ae07c1034 100644
--- a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
@@ -1,39 +1,88 @@
-<?xml version="1.0" ?>
-<panel name="main_panel">
-	<panel name="sender_time_panel_exp"/>
-	<panel name="main_info_panel_expanded"/>
-	<layout_panel name="layout_panel_middle_exp"/>
-	<layout_stack name="horizontal_stack"/>
-	<panel name="panel_expanded_view"/>
-	<layout_panel name="layout_panel_expanded_view"/>
-	<layout_stack name="item_vertical_stack"/>
-	<panel name="panel_total_view">
-		<text name="notification_time_exp" value="2014/12/24 23:30"/>
-		<text name="sender_or_fee_box_exp">送信者：「住人 住人 住人」</text>
-		<text name="notification_title_exp">通知件名 通知件名 通知件名 通知件名</text>
-		<avatar_icon name="avatar_icon" tool_tip="アバター"/>
-		<button name="join_btn" label="参加"/>
-		<chat_editor name="notification_text_exp">通知件名がここに入る。あーだこーだ.</chat_editor>
-		<button name="decline_btn" label="拒否"/>
-		<group_icon name="group_icon_exp" tool_tip="グループ"/>
-		<text name="sender_or_fee_box">送信者：「住人 住人 住人」</text>
-		<icon name="attachment_icon_exp" tool_tip="アタッチメント"/>
-		<icon name="system_notification_icon_exp" tool_tip="アイコン"/>
-		<text name="notification_title">グループ名：通知件名 通知件名 通知件名 通知件名 通知件名</text>
-		<button name="info_btn" label="情報"/>
-		<text name="group_name_exp">グループ名 グループ名 グループ名</text>
-		<text name="attachment_text">アタッチメントがここに入る。あーだこーだ.</text>
-	</panel>
-	<panel name="notification_title_panel_exp"/>
-	<layout_panel name="layout_panel_right"/>
-	<panel name="panel_condensed_view"/>
-	<layout_panel name="layout_panel_condensed_view"/>
-	<panel name="button_panel"/>
-	<panel name="notification_text_panel_exp"/>
-	<layout_panel name="layout_panel_right_exp"/>
-	<panel name="sender_time_panel"/>
-	<panel name="main_info_panel"/>
-	<layout_panel name="layout_panel_middle"/>
-	<panel name="notification_title_panel"/>
-	<panel name="attachment_panel"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="main_panel" title="panel_notification_list_item">
+  <!-- background_opaque="false" -->
+  <!-- background_visible="true"> -->
+  <!-- bg_alpha_color="PanelNotificationListItem"> -->
+  <panel.string name="sender_resident_text">送信者："[SENDER_RESIDENT]"</panel.string>
+  <panel.string name="group_name_text">グループ："[GROUP_NAME]"</panel.string>
+  <panel.string name="group_fee_text">費用：[GROUP_FEE]</panel.string>
+  <panel.string name="item_condensed_height">50</panel.string>
+  <panel.string name="item_expanded_height">87</panel.string>
+  <panel.string name="expanded_height_resize_for_attachment">27</panel.string>
+
+  <panel name="panel_total_view">
+    <layout_stack name="item_vertical_stack">
+      <layout_panel name="layout_panel_condensed_view">
+        <panel name="panel_condensed_view">
+          <layout_stack name="horizontal_stack">
+            <layout_panel name="layout_panel_right">
+              <group_icon name="group_icon" tool_tip="グループ" />
+              <avatar_icon name="avatar_icon" tool_tip="アバター" />
+              <icon name="system_notification_icon" tool_tip="アイコン" />
+            </layout_panel>
+            <layout_panel name="layout_panel_middle">
+              <panel name="main_info_panel">
+                <panel name="notification_title_panel">
+                  <text name="notification_title">グループ名：通知件名 通知件名 通知件名 通知件名 通知件名</text>
+                  <icon name="attachment_icon" tool_tip="装着物" />
+                </panel>
+                <panel name="sender_time_panel">
+                  <text name="sender_or_fee_box">送信者：住民 じゅうみん</text>
+                  <text name="notification_time" value="2014年12月24日　23：30" />
+                </panel>
+              </panel>
+            </layout_panel>
+            <layout_panel name="layout_panel_right">
+              <panel name="close_expand_panel">
+                <button name="close_btn" />
+                <button name="expand_btn" />
+              </panel>
+            </layout_panel>
+          </layout_stack>
+        </panel>
+      </layout_panel>
+      <layout_panel name="layout_panel_expanded_view">
+        <panel name="panel_expanded_view">
+          <layout_stack name="horizontal_stack">
+            <layout_panel name="layout_panel_right_exp">
+              <group_icon name="group_icon_exp" tool_tip="グループ" />
+              <avatar_icon name="avatar_icon_exp" tool_tip="アバター" />
+              <icon name="system_notification_icon_exp" tool_tip="アイコン" />
+              <icon name="attachment_icon_exp" tool_tip="添付" />
+            </layout_panel>
+            <layout_panel name="layout_panel_middle_exp">
+              <panel name="main_info_panel_expanded">
+                <panel name="notification_title_panel_exp">
+                  <text name="notification_title_exp">通知件名 通知件名 通知件名 通知件名</text>
+                  <text name="group_name_exp">グループ名 グループ名 グループ名</text>
+                </panel>
+                <panel name="sender_time_panel_exp">
+                  <text name="sender_or_fee_box_exp">送信者：住民 じゅうみん</text>
+                  <text name="notification_time_exp" value="2014年12月24日　23：30" />
+                </panel>
+                <panel name="notification_text_panel_exp">
+                  <chat_editor name="notification_text_exp">通知件名がここに入る。あーだこーだ</chat_editor>
+                </panel>
+                <panel name="attachment_panel">
+                  <text name="attachment_text">装着物がここに入る。あーだこーだ</text>
+                </panel>
+                <panel name="button_panel">
+                  <button name="join_btn" label="参加" />
+                  <button name="decline_btn" label="却下" />
+                  <button name="info_btn" label="情報" />
+                </panel>
+              </panel>
+            </layout_panel>
+            <layout_panel name="layout_panel_left_exp">
+              <panel name="close_expand_panel_exp">
+                <button name="close_expanded_btn" />
+                <button name="condense_btn" />
+              </panel>
+            </layout_panel>
+          </layout_stack>
+        </panel>
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
index aff427ed49..3d08e0731f 100644
--- a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="notifications_panel">
-	<layout_stack name="stack1">
-		<layout_panel name="notifications_list_panel">
-			<scroll_list name="notifications_list">
-				<column label="名前" name="name"/>
-				<column label="コンテンツ" name="content"/>
-				<column label="日付" name="date"/>
-			</scroll_list>
-		</layout_panel>
-		<layout_panel name="rejects_list_panel">
-			<scroll_list name="notification_rejects_list">
-				<column label="名前" name="name"/>
-				<column label="コンテンツ" name="content"/>
-				<column label="日付" name="date"/>
-			</scroll_list>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="stack1">
+    <layout_panel name="notifications_list_panel">
+      <scroll_list name="notifications_list">
+        <column label="名前" name="name" />
+        <column label="コンテンツ" name="content" />
+        <column label="日付" name="date" />
+      </scroll_list>
+    </layout_panel>
+    <layout_panel name="rejects_list_panel">
+      <scroll_list name="notification_rejects_list">
+        <column label="名前" name="name" />
+        <column label="コンテンツ" name="content" />
+        <column label="日付" name="date" />
+      </scroll_list>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
index 5a8ff858df..dd0dc42614 100644
--- a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="instant_message" name="panel_notify_textbox">
-	<string name="message_max_lines_count" value="14"/>
-	<panel label="info_panel" name="info_panel"/>
-	<panel label="info_panel" name="textbox_panel">
-		<text_editor name="message" value="メッセージ"/>
-	</panel>
-	<panel label="control_panel" name="control_panel">
-		<button label="送信" name="btn_submit"/>
-		<button label="無視" name="ignore_btn"/>
-	</panel>
-</panel>
+  <string name="message_max_lines_count" value="14" />
+  <panel label="info_panel" name="info_panel" />
+  <panel label="info_panel" name="textbox_panel">
+    <text_editor name="message" value="メッセージ" />
+  </panel>
+  <panel label="control_panel" name="control_panel">
+    <button label="送信" name="btn_submit" />
+    <button label="無視" name="ignore_btn" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
index fdc489f375..7e4568e1ca 100644
--- a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="friend_online_status" name="friend_online_status"/>
+<panel label="フレンドのオンライン状況" name="friend_online_status" />
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
index e89ce0c479..95b315db40 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
@@ -1,57 +1,91 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray Outfit Edit panel -->
-<panel label="アウトフットの編集" name="outfit_edit">
-	<string name="No Outfit" value="アウトフィットなし"/>
-	<string name="unsaved_changes" value="保存されていない変更"/>
-	<string name="now_editing" value="編集しています..."/>
-	<panel.string name="not_available">
-		（該当なし）
-	</panel.string>
-	<panel.string name="unknown">
-		（不明）
-	</panel.string>
-	<string name="Filter.All" value="すべて"/>
-	<string name="Filter.Clothes/Body" value="衣類/身体"/>
-	<string name="Filter.Objects" value="オブジェクト"/>
-	<string name="Filter.Clothing" value="衣類"/>
-	<string name="Filter.Bodyparts" value="身体部位"/>
-	<string name="replace_body_part" value="クリックして既存のシェイプと置き換える"/>
-	<text name="title" value="アウトフットの編集"/>
-	<panel label="bottom_panel" name="header_panel">
-		<panel label="bottom_panel" name="outfit_name_and_status">
-			<text name="status" value="編集しています..."/>
-			<text name="curr_outfit_name" value="[Current Outfit]"/>
-		</panel>
-	</panel>
-	<layout_stack name="im_panels">
-		<layout_panel label="IM コントロールパネル" name="outfit_wearables_panel">
-			<layout_stack name="filter_panels">
-				<layout_panel name="add_button_and_combobox">
-					<button label="さらに追加..." name="show_add_wearables_btn" tool_tip="開く／閉じる"/>
-				</layout_panel>
-				<layout_panel name="filter_panel">
-					<filter_editor label="インベントリの着用物をフィルター" name="look_item_filter"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="add_wearables_panel">
-			<button label="アイテムを装着" name="plus_btn"/>
-		</layout_panel>
-	</layout_stack>
-	<panel name="no_add_wearables_button_bar">
-		<button name="shop_btn_1" tool_tip="「SL マーケットプレイス」ページをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
-	</panel>
-	<panel name="add_wearables_button_bar">
-		<button name="shop_btn_2" tool_tip="「SL マーケットプレイス」ページをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
-	</panel>
-	<panel name="save_revert_button_bar">
-		<layout_stack name="button_bar_ls">
-			<layout_panel name="save_btn_lp">
-				<button label="保存" name="save_btn"/>
-			</layout_panel>
-			<layout_panel name="revert_btn_lp">
-				<button label="変更を元に戻す" name="revert_btn" tool_tip="前回保存された状態に戻す"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+<panel name="outfit_edit">
+  <string name="No Outfit" value="アウトフィットなし" />
+  <string name="unsaved_changes" value="保存されていない変更" />
+  <string name="now_editing" value="編集中" />
+  <string name="folder_view_off" value="Hierarchy_View_Disabled" translate="false" />
+  <string name="folder_view_on" value="Hierarchy_View_On" translate="false" />
+  <string name="list_view_off" value="List_View_Disabled" translate="false" />
+  <string name="list_view_on" value="List_View_On" translate="false" />
+  <panel.string name="not_available">（無し）</panel.string>
+  <panel.string name="unknown">（不明）</panel.string>
+  <!-- Wearables filtering strings -->
+  <string name="Filter.All" value="全て" />
+  <string name="Filter.Clothes/Body" value="服装／身体" />
+  <string name="Filter.Objects" value="オブジェクト" />
+  <string name="Filter.Clothing" value="服装" />
+  <string name="Filter.Bodyparts" value="身体部位" />
+  <string name="replace_body_part" value="クリックして既存のシェイプと置き換える" />
+  <button name="back_btn" />
+  <text name="title" value="アウトフィットのパーツを編集" />
+  <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
+  <panel name="header_panel">
+    <icon name="outfit_icon" top="2" />
+    <panel name="outfit_name_and_status">
+      <text name="status" value="編集中…" />
+      <text name="curr_outfit_name" value="[現在のアウトフィット]" />
+      <loading_indicator name="edit_outfit_loading_indicator" />
+    </panel>
+  </panel>
+  <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
+  <!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height.
+Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px.
+It is calculated as border_size + 2*UIResizeBarOverlap
+-->
+  <layout_stack name="im_panels">
+    <layout_panel lname="outfit_wearables_panel">
+      <layout_stack name="filter_panels">
+        <layout_panel name="add_button_and_combobox">
+          <!-- List containing items from the COF and Base outfit -->
+          <panel name="cof_wearables_list" />
+          <button name="show_add_wearables_btn" label="更に追加…" tool_tip="開く／閉じる" />
+          <combo_box name="list_view_filter_combobox" />
+          <combo_box name="folder_view_filter_combobox" />
+          <button name="filter_button" />
+        </layout_panel>
+        <layout_panel name="filter_panel">
+          <filter_editor label="インベントリを着用可能物でフィルタ" name="look_item_filter" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="add_wearables_panel">
+      <!-- this icon represent dragbar between layout panels.
+      This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) -->
+      <icon follows="left|top|right" height="10" image_name="Dragbar" left="0" top_pad="-9" width="313" />
+      <inventory_panel name="folder_view" />
+      <panel name="filtered_wearables_panel">
+        <wearable_items_list name="list_view" />
+      </panel>
+      <button label="アイテムを着用" name="plus_btn" />
+    </layout_panel>
+  </layout_stack>
+  <!-- BUTTON BAR -->
+  <panel name="no_add_wearables_button_bar">
+    <menu_button name="gear_menu_btn" />
+    <icon name="dummy_right_icon" />
+    <button name="shop_btn_1" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。" />
+  </panel>
+  <!-- BUTTON BAR - WEARABLES ADDING MODE -->
+  <panel name="add_wearables_button_bar">
+    <menu_button name="wearables_gear_menu_btn" />
+    <button name="folder_view_btn" />
+    <button name="list_view_btn" />
+    <icon name="dummy_right_icon" />
+    <button name="shop_btn_2" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。" />
+  </panel>
+  <!-- SAVE AND REVERT BUTTONS -->
+  <panel name="save_revert_button_bar">
+    <layout_stack name="button_bar_ls">
+      <layout_panel name="save_btn_lp">
+        <button label="変更を保存" name="save_btn" />
+      </layout_panel>
+      <layout_panel name="save_as_btn_lp">
+        <button label="別名で保存…" name="save_as_btn" />
+      </layout_panel>
+      <layout_panel name="revert_btn_lp">
+        <button label="変更を元に戻す" name="revert_btn" tool_tip="最後に保存されたバージョンに復元します。" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
index 74c3bdac47..3dc17eca6a 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
@@ -1,7 +1,52 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Outfit Gallery">
-	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="追加オプションを表示する"/>
-		<button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/>
-	</panel>
+  <string name="outfit_photo_string">"[OUTFIT_NAME]"のアウトフィットの画像</string>
+  <string name="no_outfits_msg">あなたは、まだアウトフィットを持っていません。[secondlife:///app/search/all/ 検索]してみてください。</string>
+  <string name="no_matched_outfits_msg">お探しのものが見つかりませんでしたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]してみてください。</string>
+  <text name="no_outfits_txt">検索中…</text>
+  <scroll_container name="gallery_scroll_panel">
+    <!--outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/-->
+    <!--layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="0" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack>
+    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="190" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack>
+    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="380" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack-->
+    <!--</panel>-->
+  </scroll_container>
+  <panel name="bottom_panel">
+    <menu_button tool_tip="追加オプションを表示" name="options_gear_btn" />
+    <icon name="dummy_icon" />
+    <!-- 字数制限のため「[COUNT]個のアウトフィット」にしない。-->
+    <text name="OutfitcountText">[COUNT]個</text>
+    <text name="avatar_complexity_label">複雑度：[WEIGHT]</text>
+    <button name="trash_btn" tool_tip="選択されたアウトフィットを削除" />
+  </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml b/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
index 8069321dac..7d6e84bfc6 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="gallery_item_panel">
-	<panel name="text_bg_panel">
-		<text name="outfit_name">サマーヒップスター、ピアス ピアス ピアス ピアス ピアス</text>
-		<text name="outfit_worn_text">（装着）</text>
-	</panel>
+  <string name="worn_string">（着用中）</string>
+  <icon name="preview_outfit" />
+  <panel name="text_bg_panel">
+    <text name="outfit_name">夏のヒップスター、ピアス、ピアス、ピアス、ピアス</text>
+    <text name="outfit_worn_text">（着用中）</text>
+  </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
new file mode 100644
index 0000000000..29bf11cdd6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_outfit_snapshot_inventory">
+  <icon name="title_icon" />
+  <text name="title">インベントリ</text>
+  <view_border name="hr" />
+  <text name="hint_lbl">インベントリ画像をアップロードするには、L$[UPLOAD_COST]かかります。
+金額はサブスクリプションレベルによって異なります。高いレベルでは減額されます。</text>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="アップロード（L$ [UPLOAD_COST]）" name="save_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index 8633bfb2ad..5a47c4e4de 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="もの" name="Outfits">
-	<panel.string name="wear_outfit_tooltip">
-		選択したアウトフィットを着用する
-	</panel.string>
-	<panel.string name="wear_items_tooltip">
-		選択したアイテムを着用
-	</panel.string>
-	<tab_container name="appearance_tabs">
-		<panel label="アウトフィットギャラリー" name="outfit_gallery_tab"/>
-		<panel label="マイ アウトフィット" name="outfitslist_tab"/>
-		<panel label="着用中" name="cof_tab"/>
-	</tab_container>
-	<panel name="bottom_panel">
-		<layout_stack name="bottom_panel_ls">
-			<layout_panel name="save_btn_lp">
-				<button label="別名で保存" name="save_btn"/>
-			</layout_panel>
-			<layout_panel name="wear_btn_lp">
-				<button label="装着" name="wear_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+<panel name="Outfits" label="モノ">
+  <panel.string name="wear_outfit_tooltip">選択したアウトフィットに着替える</panel.string>
+  <panel.string name="wear_items_tooltip">選択したアイテムを着用</panel.string>
+  <tab_container name="appearance_tabs">
+    <panel name="outfit_gallery_tab" label="アウトフィットギャラリー" />
+    <panel name="outfitslist_tab" label="自分のアウトフィット" />
+    <panel name="cof_tab" label="着用中" />
+  </tab_container>
+
+  <panel name="bottom_panel">
+    <layout_stack name="bottom_panel_ls">
+      <layout_panel name="save_btn_lp">
+        <button label="変更を保存" name="save_btn" />
+      </layout_panel>
+      <layout_panel name="save_as_btn_lp">
+        <button label="名前をつけて保存…" name="save_as_btn" />
+      </layout_panel>
+      <layout_panel name="wear_btn_lp">
+        <button label="着用" name="wear_btn" />
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
index e8caab0696..21cf7898f1 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_gear_default">
-	<menu_item_call label="着用中のアウトフィットを入れ替える" name="wear"/>
-	<menu_item_call label="着用中のアウトフィットから取り除く" name="remove"/>
-	<menu_item_call label="名前の変更" name="rename"/>
-	<menu_item_call label="リンクを外す" name="remove_link"/>
-	<menu_item_call label="アウトフィットを削除する" name="delete"/>
-</menu>
+  <menu_item_call label="このアウトフィットに着替える" name="wear" />
+  <menu_item_call label="このアウトフィットから取り除く" name="remove" />
+  <menu_item_separator name="Outfits Gear Separator" />
+  <menu_item_call label="名前変更" name="rename" />
+  <menu_item_call label="リンクを外す" name="remove_link" />
+  <menu_item_call label="アウトフィットを削除する" name="delete" />
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
index df9ef40113..098128bb6d 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
-	<accordion name="outfits_accordion">
-		<no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索] をお試しください。"/>
-		<no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索] をお試しください。"/>
-	</accordion>
-	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
-		<button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/>
-	</panel>
-</panel>
+  <accordion name="outfits_accordion">
+    <no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。" />
+    <no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索]をお試しください。" />
+  </accordion>
+  <panel name="bottom_panel">
+    <menu_button tool_tip="追加オプションを表示" name="options_gear_btn" />
+    <icon name="dummy_icon" />
+    <button name="trash_btn" tool_tip="選択されたアウトフィットを削除する。" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
index a6fbaae58d..b5ac432826 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Wearing">
-	<panel.string name="no_attachments">
-		着用しているアタッチメントはありません。
-	</panel.string>
-	<accordion name="wearables_accordion">
-		<accordion_tab name="tab_wearables" title="着用物"/>
-		<accordion_tab name="tab_temp_attachments" title="一時的なアタッチメント"/>
-	</accordion>
-	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
-	</panel>
-</panel>
+  <panel.string name="no_attachments">着用している装着物はありません。</panel.string>
+  <accordion name="wearables_accordion">
+    <accordion_tab name="tab_wearables" title="着用物"/>
+    <accordion_tab name="cof_items_list" title="一時的な装着物">
+      <scroll_list name="temp_attachments_list">
+        <scroll_list.columns name="icon" />
+        <scroll_list.columns name="text" />
+      </scroll_list>
+    </accordion_tab>
+  </accordion>
+  <panel name="bottom_panel">
+    <menu_button name="options_gear_btn" tool_tip="オプションを表示します。" />
+    <icon name="dummy_icon" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index be00a3c122..90bac4b044 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,71 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
-<panel label="人" name="people_panel">
-	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
-	<string name="no_filtered_recent_people" value="お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。"/>
-	<string name="no_one_near" value="近くに誰もいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
-	<string name="no_one_filtered_near" value="お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。"/>
-	<string name="no_friends_online" value="オンラインのフレンドはいません"/>
-	<string name="no_friends" value="フレンドはいません"/>
-	<string name="no_friends_msg">
-		友達を見つけるには、[secondlife:///app/search/people 検索] をするか、住人を右クリックしてフレンド登録してください。
-一緒に何かする仲間をお探しですか？ [secondlife:///app/worldmap 世界地図] をお試しください。
-	</string>
-	<string name="no_filtered_friends_msg">
-		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
-	</string>
-	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
-	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
-	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
-	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
-	<string name="GroupCountWithInfo" value="あなたは現在、[COUNT] グループに属しています。あと [REMAINING] グループに参加することができます。[secondlife:/// 上限を増やす]"/>
-	<tab_container name="tabs">
-		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
-		</panel>
-		<panel label="フレンド" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="人をフィルター" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
-			<accordion name="friends_accordion">
-				<accordion_tab name="tab_online" title="オンライン"/>
-				<accordion_tab name="tab_all" title="全員"/>
-				<accordion_tab name="tab_suggested_friends" title="友だちになりたくない人"/>
-			</accordion>
-		</panel>
-		<panel label="グループ" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
-				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
-			</panel>
-			<text name="groupcount">
-				あなたは現在、[COUNT] グループに属しています。あと [REMAINING] グループに参加することができます。
-			</text>
-		</panel>
-		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="人をフィルター" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
-		</panel>
-		<panel label="停止" name="blocked_panel">
-			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		</panel>
-	</tab_container>
-</panel>
+<panel label="人物" name="people_panel">
+  <string name="no_recent_people" value="最近交流があった人物はいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。" />
+  <string name="no_filtered_recent_people" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。" />
+  <string name="no_one_near" value="近くに誰もいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。" />
+  <string name="no_one_filtered_near" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。" />
+  <string name="no_friends_online" value="オンラインのフレンドはいません" />
+  <string name="no_friends" value="フレンドはいません" />
+  <string name="no_friends_msg">フレンドを見つけるには、[secondlife:///app/search/people 検索]をするか、人物を右クリックしてフレンド登録してください。
+一緒に何かするフレンドをお探しですか？[secondlife:///app/worldmap ワールドマップ]をお試しください。</string>
+  <string name="no_filtered_friends_msg">お探しのフレンドは見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。</string>
+  <string name="no_filtered_groups_msg" value="お探しのフレンドは見つかりましたか？[secondlife:///app/search/groups/[SEARCH_TERM] 検索]をお試しください。" />
+  <string name="no_groups_msg" value="グループをお探しですか？[secondlife:///app/search/groups 検索]をお試しください。" />
+  <string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックでマップを開く。Shift‐ドラッグで水平・垂直移動）" />
+  <string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）" />
+  <string name="GroupCountWithInfo" value="あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。[secondlife:/// 上限を増やす]" />
+  <tab_container name="tabs">
+    <panel label="近隣" name="nearby_panel">
+      <panel label="bottom_panel" name="nearby_buttons_panel">
+        <filter_editor label="人物をフィルタ" name="nearby_filter_input" />
+        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
+        <menu_button name="nearby_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <button name="add_friend_btn" tool_tip="フレンド登録を申し込みます" />
+        <dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人物を削除" />
+      </panel>
+    </panel>
+    <panel label="フレンド" name="friends_panel">
+      <panel label="bottom_panel" name="friends_buttons_panel">
+        <filter_editor label="人物をフィルタ" name="friends_filter_input" />
+        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
+        <menu_button name="friends_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <button name="friends_add_btn" tool_tip="フレンド登録を申し込みます" />
+        <dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人物を削除" />
+      </panel>
+      <accordion name="friends_accordion">
+        <accordion_tab name="tab_online" title="オンライン" />
+        <accordion_tab name="tab_all" title="全員" />
+        <accordion_tab name="tab_suggested_friends" title="友だちになりたくない人物" />
+      </accordion>
+    </panel>
+    <panel label="グループ" name="groups_panel">
+      <panel label="bottom_panel" name="groups_buttons_panel">
+        <filter_editor label="グループをフィルタ" name="groups_filter_input" />
+        <menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション" />
+        <menu_button name="groups_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <menu_button name="plus_btn" tool_tip="グループに参加／新規グループを作成します" />
+        <dnd_button name="minus_btn" tool_tip="選択したグループから脱退" />
+      </panel>
+      <text name="groupcount">あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。</text>
+    </panel>
+    <panel label="最新" name="recent_panel">
+      <panel label="bottom_panel" name="recent_buttons_panel">
+        <filter_editor label="人物をフィルタ" name="recent_filter_input" />
+        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
+        <menu_button name="recent_view_btn" tool_tip="表示／並べ替えのオプション" />
+        <button name="add_friend_btn" tool_tip="フレンド登録を申し込みます。" />
+        <dnd_button name="recent_del_btn" tool_tip="選択されているフレンドを削除" />
+      </panel>
+    </panel>
+    <panel label="ブロック" name="blocked_panel">
+      <panel label="ブロックされた人物とオブジェクト" name="panel_block_list_sidetray" />
+    </panel>
+  </tab_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 7235bc0f18..59136a27a0 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -1,118 +1,100 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="place_profile">
-	<string name="on" value="オン"/>
-	<string name="off" value="オフ"/>
-	<string name="anyone" value="全員"/>
-	<string name="available" value="利用可"/>
-	<string name="allocated" value="割り当て済"/>
-	<string name="title_place" value="場所のプロフィール"/>
-	<string name="title_teleport_history" value="テレポートの履歴"/>
-	<string name="not_available" value="（該当なし）"/>
-	<string name="unknown" value="（不明）"/>
-	<string name="public" value="（公開）"/>
-	<string name="none_text" value="（なし）"/>
-	<string name="sale_pending_text" value="（販売処理中）"/>
-	<string name="group_owned_text" value="（グループ所有）"/>
-	<string name="price_text" value="L$"/>
-	<string name="area_text" value="平方メートル"/>
-	<string name="all_residents_text" value="すべての住人"/>
-	<string name="group_text" value="グループ"/>
-	<string name="can_resell">
-		このリージョンで購入した土地は、再販することができます。
-	</string>
-	<string name="can_not_resell">
-		このリージョンで購入した土地は、再販できません。
-	</string>
-	<string name="can_change">
-		このリージョンで購入した土地は、統合・分割することができます。
-	</string>
-	<string name="can_not_change">
-		このリージョンで購入した土地は、統合・分割できません。
-	</string>
-	<string name="server_update_text">
-		場所の情報は、サーバーがアップデートされるまでご利用いただけません。
-	</string>
-	<string name="server_error_text">
-		この場所の情報は現在ご利用いただけません。あとでもう一度お試しください。
-	</string>
-	<string name="server_forbidden_text">
-		この場所の情報は、アクセス制限のためご利用いただけません。  許可については区画所有者にお問い合わせください。
-	</string>
-	<string name="acquired_date">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</string>
-	<button name="back_btn" tool_tip="戻る"/>
-	<text name="title" value="場所のプロフィール"/>
-	<scroll_container name="place_scroll">
-		<panel name="scrolling_panel">
-			<text name="region_title" value="SampleRegion"/>
-			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
-			<expandable_text name="description" value="Du waltz die spritz"/>
-			<text name="owner_label" value="所有者："/>
-			<text name="owner_value" value="Alex Superduperlongenamenton"/>
-			<text name="maturity_value" value="不明"/>
-			<accordion name="advanced_info_accordion">
-				<accordion_tab name="parcel_characteristics_tab" title="区画">
-					<panel name="parcel_characteristics_panel">
-						<text name="rating_label" value="レーティング："/>
-						<text name="rating_value" value="不明"/>
-						<text name="voice_label" value="ボイス："/>
-						<text name="voice_value" value="オン"/>
-						<text name="fly_label" value="飛行："/>
-						<text name="fly_value" value="オン"/>
-						<text name="push_label" value="プッシュ："/>
-						<text name="push_value" value="オフ"/>
-						<text name="build_label" value="制作："/>
-						<text name="build_value" value="オン"/>
-						<text name="scripts_label" value="スクリプト："/>
-						<text name="scripts_value" value="オン"/>
-						<text name="damage_label" value="ダメージ："/>
-						<text name="damage_value" value="オフ"/>
-						<text name="see_avatars_label" value="アバターを表示："/>
-						<text name="see_avatars_value" value="オフ"/>
-						<button label="土地情報" name="about_land_btn"/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="region_information_tab" title="リージョン（地域）     ">
-					<panel name="region_information_panel">
-						<text name="region_name_label" value="リージョン:"/>
-						<text name="region_name" value="Mooseland"/>
-						<text name="region_type_label" value="種類："/>
-						<text name="region_type" value="Moose"/>
-						<text name="region_rating_label" value="レーティング："/>
-						<text name="region_rating" value="Adult"/>
-						<text name="region_owner_label" value="所有者："/>
-						<text name="region_owner" value="moose Van Moose extra long name moose"/>
-						<text name="region_group_label" value="グループ："/>
-						<text name="region_group">
-							The Mighty Moose of mooseville soundvillemoose
-						</text>
-						<button label="地域 / 不動産" name="region_info_btn"/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="estate_information_tab" title="エステート（不動産）">
-					<panel name="estate_information_panel">
-						<text name="estate_name_label" value="エステート："/>
-						<text name="estate_rating_label" value="レーティング："/>
-						<text name="estate_owner_label" value="所有者："/>
-						<text name="estate_owner" value="長い所有者の名前をテスト"/>
-						<text name="covenant_label" value="約款："/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="sales_tab" title="販売中">
-					<panel name="sales_panel">
-						<text name="sales_price_label" value="価格："/>
-						<text name="area_label" value="面積："/>
-						<text name="traffic_label" value="トラフィック："/>
-						<text name="primitives_label" value="プリム："/>
-						<text name="parcel_scripts_label" value="スクリプト："/>
-						<text name="terraform_limits_label" value="地形編集制限："/>
-						<text name="subdivide_label" value="分割・統合許可："/>
-						<text name="resale_label" value="再版許可："/>
-						<text name="sale_to_label" value="販売先："/>
-					</panel>
-				</accordion_tab>
-			</accordion>
-		</panel>
-	</scroll_container>
-</panel>
+  <string name="on" value="オン" />
+  <string name="off" value="オフ" />
+  <string name="anyone" value="全員" />
+  <string name="available" value="利用可" />
+  <string name="allocated" value="割り当て済" />
+  <string name="title_place" value="場所のプロフィール" />
+  <string name="title_teleport_history" value="テレポートの履歴" />
+  <string name="not_available" value="（該当なし）" />
+  <string name="unknown" value="（不明）" />
+  <string name="public" value="（公開）" />
+  <string name="none_text" value="（なし）" />
+  <string name="sale_pending_text" value="（販売処理中）" />
+  <string name="group_owned_text" value="（グループ所有）" />
+  <string name="price_text" value="L$" />
+  <string name="area_text" value="㎡" />
+  <string name="all_residents_text" value="すべての住人" />
+  <string name="group_text" value="グループ" />
+  <string name="can_resell">このリージョンで購入した土地は、再販することができます。</string>
+  <string name="can_not_resell">このリージョンで購入した土地は、再販できません。</string>
+  <string name="can_change">このリージョンで購入した土地は、統合・分割することができます。</string>
+  <string name="can_not_change">このリージョンで購入した土地は、統合・分割できません。</string>
+  <string name="server_update_text">場所の情報は、サーバーがアップデートされるまでご利用いただけません。</string>
+  <string name="server_error_text">この場所の情報は現在ご利用いただけません。あとでもう一度お試しください。</string>
+  <string name="server_forbidden_text">この場所の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。</string>
+  <string name="acquired_date">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</string>
+  <button name="back_btn" tool_tip="戻る" />
+  <text name="title" value="場所のプロフィール" />
+  <scroll_container name="place_scroll">
+    <panel name="scrolling_panel">
+      <text name="region_title" value="SampleRegion" />
+      <text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)" />
+      <expandable_text name="description" value="Du waltz die spritz" />
+      <text name="owner_label" value="所有者：" />
+      <text name="owner_value" value="Alex Superduperlongenamenton" />
+      <text name="maturity_value" value="不明" />
+      <accordion name="advanced_info_accordion">
+        <accordion_tab name="parcel_characteristics_tab" title="区画">
+          <panel name="parcel_characteristics_panel">
+            <text name="rating_label" value="レーティング：" />
+            <text name="rating_value" value="不明" />
+            <text name="voice_label" value="ボイス：" />
+            <text name="voice_value" value="オン" />
+            <text name="fly_label" value="飛行：" />
+            <text name="fly_value" value="オン" />
+            <text name="push_label" value="プッシュ：" />
+            <text name="push_value" value="オフ" />
+            <text name="build_label" value="制作：" />
+            <text name="build_value" value="オン" />
+            <text name="scripts_label" value="スクリプト：" />
+            <text name="scripts_value" value="オン" />
+            <text name="damage_label" value="ダメージ：" />
+            <text name="damage_value" value="オフ" />
+            <text name="see_avatars_label" value="アバターを表示：" />
+            <text name="see_avatars_value" value="オフ" />
+            <button label="土地情報" name="about_land_btn" />
+          </panel>
+        </accordion_tab>
+        <accordion_tab name="region_information_tab" title="リージョン（地域）">
+          <panel name="region_information_panel">
+            <text name="region_name_label" value="リージョン:" />
+            <text name="region_name" value="Mooseland" />
+            <text name="region_type_label" value="種類：" />
+            <text name="region_type" value="Moose" />
+            <text name="region_rating_label" value="レーティング：" />
+            <text name="region_rating" value="Adult" />
+            <text name="region_owner_label" value="所有者：" />
+            <text name="region_owner" value="moose Van Moose extra long name moose" />
+            <text name="region_group_label" value="グループ：" />
+            <text name="region_group">The Mighty Moose of mooseville soundvillemoose</text>
+            <button label="リージョン（地域）／不動産" name="region_info_btn" />
+          </panel>
+        </accordion_tab>
+        <accordion_tab name="estate_information_tab" title="不動産（不動産）">
+          <panel name="estate_information_panel">
+            <text name="estate_name_label" value="不動産：" />
+            <text name="estate_rating_label" value="レーティング：" />
+            <text name="estate_owner_label" value="所有者：" />
+            <text name="estate_owner" value="長い所有者の名前をテスト" />
+            <text name="covenant_label" value="約款：" />
+          </panel>
+        </accordion_tab>
+        <accordion_tab name="sales_tab" title="販売中">
+          <panel name="sales_panel">
+            <text name="sales_price_label" value="価格：" />
+            <text name="area_label" value="面積：" />
+            <text name="traffic_label" value="トラフィック：" />
+            <text name="primitives_label" value="プリム：" />
+            <text name="parcel_scripts_label" value="スクリプト：" />
+            <text name="terraform_limits_label" value="地形編集制限：" />
+            <text name="subdivide_label" value="分割・統合許可：" />
+            <text name="resale_label" value="再版許可：" />
+            <text name="sale_to_label" value="販売先：" />
+          </panel>
+        </accordion_tab>
+      </accordion>
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index 9d3925afdc..0f3c6b44ff 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -1,48 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="場所" name="places panel">
-	<string name="landmarks_tab_title" value="マイ ランドマーク"/>
-	<string name="teleport_history_tab_title" value="テレポートの履歴"/>
-	<filter_editor label="場所をフィルター" name="Filter"/>
-	<panel name="button_panel">
-		<layout_stack name="bottom_bar_ls0">
-			<layout_panel name="lp1">
-				<layout_stack name="bottom_bar_ls1">
-					<layout_panel name="teleport_btn_lp">
-						<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/>
-					</layout_panel>
-					<layout_panel name="chat_btn_lp">
-						<button label="地図" name="map_btn" tool_tip="世界地図に該当するエリアを表示"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="lp2">
-				<layout_stack name="bottom_bar_ls3">
-					<layout_panel name="edit_btn_lp">
-						<button label="編集" name="edit_btn" tool_tip="ランドマークの情報を編集します"/>
-					</layout_panel>
-					<layout_panel name="overflow_btn_lp">
-						<menu_button label="▼" name="overflow_btn" tool_tip="オプションを表示します"/>
-					</layout_panel>
-				</layout_stack>
-				<layout_stack name="bottom_bar_profile_ls">
-					<layout_panel name="profile_btn_lp">
-						<button label="プロフィール" name="profile_btn" tool_tip="場所のプロフィールを表示"/>
-					</layout_panel>
-				</layout_stack>
-				<layout_stack name="bottom_bar_close_ls3">
-					<layout_panel name="close_btn_lp">
-						<button label="閉じる" name="close_btn"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls2">
-			<layout_panel name="save_btn_lp">
-				<button label="保存" name="save_btn"/>
-			</layout_panel>
-			<layout_panel name="cancel_btn_lp">
-				<button label="取り消し" name="cancel_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
-</panel>
+  <string name="landmarks_tab_title" value="ランドマーク" />
+  <string name="teleport_history_tab_title" value="訪問した場所" />
+  <string name="favorites_tab_title" value="お気に入り" />
+  <string name="tooltip_trash_items" value="選択されたランドマークかフォルダを削除" />
+  <string name="tooltip_trash_history" value="訪問した場所一覧を削除" />
+  <layout_stack name="places_layout_panel">
+    <layout_panel name="main_panel">
+      <layout_stack name="top_menu_panel">
+        <layout_panel name="filter_panel">
+          <filter_editor label="場所をフィルタ" name="Filter" />
+        </layout_panel>
+        <layout_panel name="options_gear_btn_panel">
+          <menu_button tool_tip="オプションを表示" name="options_gear_btn" />
+        </layout_panel>
+        <layout_panel name="options_sort_btn_panel">
+          <menu_button tool_tip="ソートオプションを表示" name="sorting_menu_btn" />
+        </layout_panel>
+        <layout_panel name="add_btn_panel">
+          <menu_button name="add_menu_btn" tool_tip="新しいランドマークかフォルダを追加" />
+        </layout_panel>
+        <layout_panel name="trash_btn_panel">
+          <dnd_button name="trash_btn"/>
+        </layout_panel>
+      </layout_stack>
+      <tab_container name="Places Tabs" />
+      <panel name="panel_place_profile" />
+      <panel name="panel_landmark_info" />
+    </layout_panel>
+    <!--*********************** Button wrappers ***********************-->
+    <layout_panel auto_resize="false" layout="topleft" height="25" name="button_layout_panel">
+      <panel name="button_panel">
+        <layout_stack name="bottom_bar_ls0">
+          <layout_panel name="lp1">
+            <!--*********************** Teleport, Map buttons ***********************-->
+            <layout_stack name="bottom_bar_ls1">
+              <layout_panel name="teleport_btn_lp">
+                <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする" />
+              </layout_panel>
+              <layout_panel name="chat_btn_lp">
+                <button label="マップ" name="map_btn" tool_tip="ワールドマップに該当するエリアを表示" />
+              </layout_panel>
+            </layout_stack>
+          </layout_panel>
+          <!--*********************** Options button ***********************-->
+          <layout_panel name="lp_options">
+            <menu_button name="overflow_btn" tool_tip="追加オプションを表示" />
+          </layout_panel>
+          <layout_panel name="lp2">
+            <!--*********************** Close button ***********************-->
+            <layout_stack name="bottom_bar_close_ls3">
+              <layout_panel name="close_btn_lp">
+                <button label="閉じる" name="close_btn" />
+              </layout_panel>
+            </layout_stack>
+          </layout_panel>
+        </layout_stack>
+        <!--*********************** Save, Cancel buttons ***********************-->
+        <layout_stack name="bottom_bar_ls2">
+          <layout_panel name="save_btn_lp">
+            <button label="保存" name="save_btn" />
+          </layout_panel>
+          <layout_panel name="cancel_btn_lp">
+            <button label="キャンセル" name="cancel_btn" />
+          </layout_panel>
+        </layout_stack>
+      </panel>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
index b7c3f48557..0899e4ce25 100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_postcard_message">
-	<text name="to_label">
-		終：
-	</text>
-	<text name="name_label">
-		始：
-	</text>
-	<text name="subject_label">
-		件名：
-	</text>
-	<line_editor label="件名をここに入力してください。" name="subject_form"/>
-	<text name="msg_label">
-		メッセージ：
-	</text>
-	<text_editor name="msg_form">
-		メッセージをここに入力してください。
-	</text_editor>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="送信" name="send_btn"/>
-</panel>
+  <text name="to_label">宛先：</text>
+  <text name="name_label">名前：</text>
+  <text name="subject_label">件名：</text>
+  <line_editor label="件名をここに入力してください。" name="subject_form" />
+  <text name="msg_label">メッセージ：</text>
+  <text_editor name="msg_form">メッセージをここに入力してください。</text_editor>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="送信" name="send_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
index f34fdc6b67..ba8a708cf8 100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_postcard_settings">
-	<combo_box label="解像度" name="postcard_size_combo">
-		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="postcard_snapshot_width"/>
-	<check_box label="縦横比の固定" name="postcard_keep_aspect_check"/>
-	<slider label="品質：" name="image_quality_slider"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_postcard_settings">
+  <combo_box label="解像度" name="postcard_size_combo">
+    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
+    <combo_box.item label="６４０✕４８０" name="640x480" />
+    <combo_box.item label="８００✕６００" name="800x600" />
+    <combo_box.item label="１０２４✕７６８" name="1024x768" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="postcard_snapshot_width" />
+  <check_box label="縦横比の固定" name="postcard_keep_aspect_check" />
+  <slider label="品質：" name="image_quality_slider" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 64bd382575..030ca3a1f3 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -1,32 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel label="アドバンス" name="advanced">
-	<panel.string name="aspect_ratio_text">
-		[NUM]:[DEN]
-	</panel.string>
-	<text name="Cache:">
-		キャッシュ：
-	</text>
-	<spinner label="キャッシュサイズ (256 - 9984MB)" name="cachesizespinner"/>
-	<text name="text_box5">
-		MB
-	</text>
-	<button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache"/>
-	<text name="Cache location">
-		キャッシュの保存場所：
-	</text>
-	<button label="参照" label_selected="参照" name="set_cache"/>
-	<button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location"/>
-	<text name="UI Size:">
-		UI サイズ：
-	</text>
-	<check_box label="スクリプトのエラーを表示：" name="show_script_errors"/>
-	<radio_group name="show_location">
-		<radio_item label="近くのチャット" name="0"/>
-		<radio_item label="別々のウィンドウ" name="1"/>
-	</radio_group>
-	<check_box label="複数のビューワを許可" name="allow_multiple_viewer_check"/>
-	<check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check"/>
-	<check_box label="アドバンスメニューを表示" name="show_advanced_menu_check"/>
-	<check_box label="開発メニューを表示" name="show_develop_menu_check"/>
-	<button label="デフォルト作成許可" name="default_creation_permissions"/>
-</panel>
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="拡張" name="advanced">
+  <panel.string name="aspect_ratio_text">[NUM]：[DEN]</panel.string>
+  <text name="Cache:">キャッシュ：</text>
+  <spinner label="キャッシュ容量（256～9984㎆）" name="cachesizespinner" />
+  <text name="text_box5">㎆</text>
+  <button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache" />
+  <text name="Cache location">キャッシュ保存先：</text>
+  <button label="参照" label_selected="参照" name="set_cache" />
+  <button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location" />
+  <text name="UI Size:">ＵＩのサイズ：</text>
+  <text name="HUD Size:">ＨＵＤのスケール：</text>
+  <check_box label="スクリプトのエラーを表示：" name="show_script_errors" />
+  <radio_group name="show_location">
+    <radio_item label="近隣チャット" name="0" />
+    <radio_item label="別々のウィンドウ" name="1" />
+  </radio_group>
+  <check_box label="複数のビューアを許可" name="allow_multiple_viewer_check" />
+  <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" />
+  <check_box label="拡張メニューを表示" name="show_advanced_menu_check" />
+  <check_box label="開発メニューを表示" name="show_develop_menu_check" />
+  <button label="記録済みのユーザ名" name="remembered_usernames" />
+  <button label="デフォルトの作成権限" name="default_creation_permissions" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 4c2906cc18..49a7aaee90 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ポップアップ" name="popups" title="ポップアップ">
-	<text name="tell_me_label">
-		知らせる：
-	</text>
-	<check_box label="L$ を使用する場合" name="notify_money_spend_checkbox"/>
-	<check_box label="フレンドがログイン・ログアウトするとき" name="friends_online_notify_checkbox"/>
-	<check_box label="L$ を手に入れる場合" name="notify_money_received_checkbox"/>
-	<text name="show_label" width="300">
-		常に表示するメッセージ：
-	</text>
-	<text name="dont_show_label">
-		表示しないメッセージ：
-	</text>
-</panel>
+  <text name="tell_me_label">知らせる：</text>
+  <check_box label="L$の使用時" name="notify_money_spend_checkbox" />
+  <check_box label="フレンドのログイン状態変化時" name="friends_online_notify_checkbox" />
+  <check_box label="L$の入手時" name="notify_money_received_checkbox" />
+  <text name="show_label">常に表示するメッセージ：</text>
+  <text name="dont_show_label">表示しないメッセージ：</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 5046c11194..f0d697052e 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,111 +1,89 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<check_box initial_value="true" label="近くのチャットでジェスチャーを自動コンプリートする" name="auto_complete_gestures"/>
-	<panel name="general_chat_settings">
-		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			文字の大きさ：
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="小規模" name="Small" value="0"/>
-			<item label="中" name="Medium" value="1"/>
-			<item label="大規模" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	</panel>
-	<panel name="im_notification_settings">
-		<text name="friend_ims">
-			フレンド IM:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_friend_im"/>
-		<text name="non_friend_ims">
-			フレンドのいない IM:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_non_friend_im"/>
-		<text name="conference_ims">
-			会議 IM:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_conference_im"/>
-		<text name="group_chat">
-			グループチャット:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_group_chat_im"/>
-		<text name="nearby_chat">
-			近くのチャット:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_nearby_chat_im"/>
-		<text name="object_ims">
-			オブジェクト IM：
-		</text>
-		<combo_box name="ObjectIMOptions">
-			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
-			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
-			<item label="動作なし" name="NoAction" value="noaction"/>
-		</combo_box>
-		<check_box label="サウンドを再生" name="play_sound_object_im"/>
-		<text name="notifications_alert">
-			一時的にすべての通知を停止するには、「コミュニケーション」 &gt; 「着信拒否]を使用します。
-		</text>
-	</panel>
-	<panel name="play_sound_settings">
-		<text name="play_sound">
-			サウンドを再生:
-		</text>
-		<check_box label="新しい会話" name="new_conversation"/>
-		<check_box label="受信音声コール" name="incoming_voice_call"/>
-		<check_box label="テレポートを送る" name="teleport_offer"/>
-		<check_box label="インベントリを送る" name="inventory_offer"/>
-	</panel>
-	<panel name="log_settings">
-		<text name="logging_label">
-			保存：
-		</text>
-		<combo_box name="conversation_log_combo">
-			<item label="ログおよびテキストチャット" name="log_and_transcripts" value="2"/>
-			<item label="ログのみ" name="log_only" value="1"/>
-			<item label="ログまたはテキストチャットなし" name="no_log_or_transcript" value="0"/>
-		</combo_box>
-		<button label="ログを消去..." name="clear_log"/>
-		<button label="テキストチャットを削除..." name="delete_transcripts"/>
-		<text name="log_location_label">
-			場所：
-		</text>
-		<button label="参照..." label_selected="参照" name="log_path_button"/>
-	</panel>
-	<button label="他の言語..." name="ok_btn"/>
-	<button label="自動置換..." name="autoreplace_showgui"/>
-	<button label="スペルチェック中..." name="spellcheck_showgui"/>
-</panel>
+  <check_box initial_value="true" label="近隣チャットでジェスチャーを自動補完する" name="auto_complete_gestures" />
+  <panel name="general_chat_settings">
+    <check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation" />
+    <check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email" />
+    <check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check" />
+    <text name="font_size">文字の大きさ：</text>
+    <combo_box name="chat_font_size">
+      <item label="小" name="Small" value="0" />
+      <item label="中" name="Medium" value="1" />
+      <item label="大" name="Large" value="2" />
+    </combo_box>
+    <check_box label="吹き出しチャット" name="bubble_text_chat" />
+  </panel>
+  <panel name="im_notification_settings">
+    <text name="friend_ims">フレンドＩＭ：</text>
+    <combo_box name="FriendIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_friend_im" />
+    <text name="non_friend_ims">フレンドのいないＩＭ：</text>
+    <combo_box name="NonFriendIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_non_friend_im" />
+    <text name="conference_ims">会話ＩＭ：</text>
+    <combo_box name="ConferenceIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_conference_im" />
+    <text name="group_chat">グループチャット：</text>
+    <combo_box name="GroupChatOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_group_chat_im" />
+    <text name="nearby_chat">近隣チャット：</text>
+    <combo_box name="NearbyChatOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_nearby_chat_im" />
+    <text name="object_ims">オブジェクトによるＩＭ：</text>
+    <combo_box name="ObjectIMOptions">
+      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
+      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
+      <item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ" />
+      <item label="動作なし" name="NoAction" value="noaction" />
+    </combo_box>
+    <check_box label="サウンドを再生" name="play_sound_object_im" />
+    <text name="notifications_alert">一時的にすべての通知を停止するには、「コミュニケーション」＞「着信拒否」を使用します。</text>
+  </panel>
+  <panel name="play_sound_settings">
+    <text name="play_sound">サウンドを再生：</text>
+    <check_box label="新しい会話" name="new_conversation" />
+    <check_box label="受信音声コール" name="incoming_voice_call" />
+    <check_box label="テレポートを送る" name="teleport_offer" />
+    <check_box label="インベントリを送る" name="inventory_offer" />
+  </panel>
+  <panel name="log_settings">
+    <text name="logging_label">保存：</text>
+    <combo_box name="conversation_log_combo">
+      <item label="ログおよびテキストチャット" name="log_and_transcripts" value="2" />
+      <item label="ログのみ" name="log_only" value="1" />
+      <item label="ログまたはテキストチャットなし" name="no_log_or_transcript" value="0" />
+    </combo_box>
+    <button label="ログを消去…" name="clear_log" />
+    <button label="テキストチャットを削除…" name="delete_transcripts" />
+    <text name="log_location_label">場所：</text>
+    <button label="参照…" label_selected="参照" name="log_path_button" />
+  </panel>
+  <button label="他の言語…" name="ok_btn" />
+  <button label="自動置換…" name="autoreplace_showgui" />
+  <button label="スペルチェック中…" name="spellcheck_showgui" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index 9f6abf8fcb..2ed930c9ca 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
@@ -1,44 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="色" name="colors_panel">
-	<text name="effects_color_textbox">
-		ビームの色（選択ビーム）：
-	</text>
-	<color_swatch name="effect_color_swatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="font_colors">
-		チャットの文字の色
-	</text>
-	<text name="text_box1">
-		自分
-	</text>
-	<text name="text_box2">
-		他の住人
-	</text>
-	<text name="text_box3">
-		オブジェクト
-	</text>
-	<text name="text_box4">
-		システム
-	</text>
-	<text name="text_box5">
-		エラー
-	</text>
-	<text name="text_box10">
-		ダイレクト
-	</text>
-	<text name="text_box7">
-		所有者
-	</text>
-	<text name="text_box9">
-		URL
-	</text>
-	<text name="bubble_chat">
-		名前の表示の背景色（吹き出しチャットにも適用）：
-	</text>
-	<color_swatch name="background" tool_tip="名前の表示色を選択"/>
-	<slider label="不透明度：" name="bubble_chat_opacity" tool_tip="名前の表示の不透明度を選択"/>
-	<text name="floater_opacity">
-		フローターの不透明度：
-	</text>
-	<slider label="有効：" name="active"/>
-	<slider label="無効：" name="inactive"/>
-</panel>
+  <text name="effects_color_textbox">自分のエフェクト（選択ビーム）：</text>
+  <color_swatch name="effect_color_swatch" tool_tip="クリックしてカラーピッカーを開きます" />
+  <text name="font_colors">チャットの文字の色</text>
+  <text name="text_box1">自分</text>
+  <text name="text_box2">他人</text>
+  <text name="text_box3">オブジェクト</text>
+  <text name="text_box4">システム</text>
+  <text name="text_box5">エラー</text>
+  <text name="text_box10">ダイレクト</text>
+  <text name="text_box7">所有者</text>
+  <text name="text_box9">ＵＲＬ</text>
+  <text name="bubble_chat">名前の表示の背景色（吹き出しチャットにも適用）：</text>
+  <color_swatch name="background" tool_tip="名前の表示色を選択" />
+  <slider label="不透明度：" name="bubble_chat_opacity" tool_tip="名前の表示の不透明度を選択" />
+  <text name="floater_opacity">フローターの透過度：</text>
+  <slider label="アクティブなフローター：" name="active" />
+  <slider label="非アクティブなフローター：" name="inactive" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml b/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
new file mode 100644
index 0000000000..9e4122af4b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="操作設定" name="controls">
+  <combo_box name="key_mode">
+    <combo_box.item label="三人称視点のとき" name="third_person" value="1" />
+    <combo_box.item label="一人称視点のとき（マウスルック）" name="first_person" value="0" />
+    <combo_box.item label="アバター編集時" name="edit_avatar" value="2" />
+    <combo_box.item label="着席時" name="sitting" value="3" />
+  </combo_box>
+  <button label="デフォルトに戻す" tool_tip="すべての操作設定をデフォルト値に戻します。" name="restore_defaults" />
+  <scroll_list name="controls_list" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 378cf8652e..9b8b4d352a 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -1,72 +1,56 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_panel">
-	<text name="language_textbox">
-		言語：
-	</text>
-	<combo_box name="language_combobox">
-		<combo_box.item label="English （英語）" name="English"/>
-		<combo_box.item label="Dansk (デンマーク語) - ベータ" name="Danish"/>
-		<combo_box.item label="Deutsch （ドイツ語） – ベータ" name="Deutsch(German)"/>
-		<combo_box.item label="Español （スペイン語） – ベータ" name="Spanish"/>
-		<combo_box.item label="Français （フランス語） – ベータ" name="French"/>
-		<combo_box.item label="Italiano （イタリア語） - ベータ" name="Italian"/>
-		<combo_box.item label="Polski (ポーランド語) - ベータ" name="Polish"/>
-		<combo_box.item label="Português（ポルトガル語） - ベータ" name="Portugese"/>
-		<combo_box.item label="Русский （ロシア語） - ベータ" name="Russian"/>
-		<combo_box.item label="Türkçe （トルコ語） - ベータ" name="Turkish"/>
-		<combo_box.item label="日本語 – ベータ" name="(Japanese)"/>
-		<combo_box.item label="正體中文（簡体字中国語）- ベータ版" name="Traditional Chinese"/>
-	</combo_box>
-	<text name="language_textbox2">
-		（再起動後に反映）
-	</text>
-	<text name="maturity_desired_prompt">
-		アクセスしたいコンテンツ：
-	</text>
-	<text name="maturity_desired_textbox"/>
-	<combo_box name="maturity_desired_combobox">
-		<combo_box.item label="General、Moderate、Adult" name="Desired_Adult"/>
-		<combo_box.item label="General と Moderate" name="Desired_Mature"/>
-		<combo_box.item label="General" name="Desired_PG"/>
-	</combo_box>
-	<check_box label="ログイン画面にお気に入りの場所を表示" name="favorites_on_login_check"/>
-	<text name="favorites_check_extra_text">
-		(このコンピュータを使用する他の人にも表示されます)
-	</text>
-	<text name="name_tags_textbox">
-		名前の表示：
-	</text>
-	<radio_group name="Name_Tag_Preference">
-		<radio_item label="オフ" name="radio" value="0"/>
-		<radio_item label="オン" name="radio2" value="1"/>
-		<radio_item label="一時的に表示" name="radio3" value="2"/>
-	</radio_group>
-	<check_box label="マイネーム" name="show_my_name_checkbox1"/>
-	<check_box label="ユーザー名" name="show_slids" tool_tip="bobsmith123 などユーザー名を表示"/>
-	<check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサーまたはメンバーなど、グループタイトルを表示"/>
-	<check_box label="フレンドをハイライト表示" name="show_friends" tool_tip="フレンドの名前をハイライト表示"/>
-	<check_box label="表示名を表示" name="display_names_check" tool_tip="これを選択すると、チャット、IM などで表示名が表示されます。"/>
-	<text name="inworld_typing_rg_label">
-		文字キーを押して次の操作：
-	</text>
-	<radio_group name="inworld_typing_preference">
-		<radio_item label="ローカル・チャットを始める" name="radio_start_chat" value="1"/>
-		<radio_item label="ムーブメントに影響（WASD など）" name="radio_move" value="0"/>
-	</radio_group>
-	<text name="title_afk_text">
-		一時退席までの時間：
-	</text>
-	<combo_box label="一時退席までの時間：" name="afk">
-		<combo_box.item label="2 分" name="item0"/>
-		<combo_box.item label="5 分" name="item1"/>
-		<combo_box.item label="10 分" name="item2"/>
-		<combo_box.item label="30 分" name="item3"/>
-		<combo_box.item label="一時退席設定なし" name="item4"/>
-	</combo_box>
-	<text name="text_box3">
-		「通知を受けない」応答:
-	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
-</panel>
+  <text name="language_textbox">言語：</text>
+  <combo_box name="language_combobox">
+    <combo_box.item label="English （英語）" name="English" />
+    <combo_box.item label="Dansk（デンマーク語）－ベータ" name="Danish" />
+    <combo_box.item label="Deutsch（ドイツ語）－ベータ" name="Deutsch(German)" />
+    <combo_box.item label="Español（スペイン語）－ベータ" name="Spanish" />
+    <combo_box.item label="Français（フランス語）－ベータ" name="French" />
+    <combo_box.item label="Italiano（イタリア語）－ベータ" name="Italian" />
+    <combo_box.item label="Polski（ポーランド語）－ベータ" name="Polish" />
+    <combo_box.item label="Português（ポルトガル語）－ベータ" name="Portugese" />
+    <combo_box.item label="Русский（ロシア語）－ベータ" name="Russian" />
+    <combo_box.item label="Türkçe（トルコ語）－ベータ" name="Turkish" />
+    <combo_box.item label="日本語－ベータ" name="(Japanese)" />
+    <combo_box.item label="正體中文（簡体字中国語）－ベータ版" name="Traditional Chinese" />
+  </combo_box>
+  <text name="language_textbox2">（再起動後に反映）</text>
+  <text name="maturity_desired_prompt">アクセスしたいコンテンツ：</text>
+  <text name="maturity_desired_textbox" />
+  <combo_box name="maturity_desired_combobox">
+    <combo_box.item label="General、Moderate、Adult" name="Desired_Adult" />
+    <combo_box.item label="GeneralとModerate" name="Desired_Mature" />
+    <combo_box.item label="General" name="Desired_PG" />
+  </combo_box>
+  <check_box label="ログイン画面にお気に入りの場所を表示" name="favorites_on_login_check" />
+  <text name="favorites_check_extra_text">（このコンピュータを使用する他の人にも表示されます）</text>
+  <text name="name_tags_textbox">名前の表示：</text>
+  <radio_group name="Name_Tag_Preference">
+    <radio_item label="オフ" name="radio" value="0" />
+    <radio_item label="オン" name="radio2" value="1" />
+    <radio_item label="一時的に表示" name="radio3" value="2" />
+  </radio_group>
+  <check_box label="マイネーム" name="show_my_name_checkbox1" />
+  <check_box label="ユーザー名" name="show_slids" tool_tip="bobsmith123 などユーザー名を表示" />
+  <check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサーまたはメンバーなど、グループタイトルを表示" />
+  <check_box label="フレンドをハイライト表示" name="show_friends" tool_tip="フレンドの名前をハイライト表示" />
+  <check_box label="表示名を表示" name="display_names_check" tool_tip="これを選択すると、チャット、ＩＭなどで表示名が表示されます。" />
+
+  <text name="inworld_typing_rg_label">特定キーを押したときの動作：</text>
+  <radio_group name="inworld_typing_preference">
+    <radio_item label="チャットを始める" name="radio_start_chat" value="1" />
+    <radio_item label="移動する（WSADなど）" name="radio_move" value="0" />
+  </radio_group>
+
+  <text name="title_afk_text">「離席」とするまでの時間：</text>
+  <combo_box label="「離席」とするまでの時間：" name="afk">
+    <combo_box.item label="２分" name="item0" />
+    <combo_box.item label="５分" name="item1" />
+    <combo_box.item label="１０分" name="item2" />
+    <combo_box.item label="３０分" name="item3" />
+    <combo_box.item label="離席設定なし" name="item4" />
+  </combo_box>
+  <text name="text_box3">「着信拒否」時の応答：</text>
+  <text_editor name="do_not_disturb_response">log_in_to_change</text_editor>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index fc966dc08a..e83f093caa 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,41 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="表示" name="Display panel">
-	<text name="preset_text">
-		(なし)
-	</text>
-	<text name="QualitySpeed">
-		クオリティとスピード：
-	</text>
-	<text name="ShadersPrefText">
-		低
-	</text>
-	<text name="ShadersPrefText2">
-		中
-	</text>
-	<text name="ShadersPrefText3">
-		高
-	</text>
-	<text name="ShadersPrefText4">
-		超高
-	</text>
-	<text name="FasterText">
-		速い
-	</text>
-	<text name="BetterText">
-		遅い
-	</text>
-	<check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
-	<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
-	<slider label="アバターの最大複雑度:" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します"/>
-	<text name="IndirectMaxComplexityText">
-		0
-	</text>
-	<check_box initial_value="true" label="常に友人を描画" name="AlwaysRenderFriends"/>
-	<button label="例外..." name="RenderExceptionsButton"/>
-	<button label="設定をプリセットとして保存..." name="PrefSaveButton"/>
-	<button label="プリセットをロード..." name="PrefLoadButton"/>
-	min_val=&quot;0.125&quot;
-	<button label="事前設定を削除..." name="PrefDeleteButton"/>
-	<button label="推奨設定にリセット" name="Defaults"/>
-	<button label="詳細設定..." name="AdvancedSettings"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="表示" name="Display panel">
+  <text name="preset_text">（なし）</text>
+  <text name="QualitySpeed">品質と速度：</text>
+  <text name="ShadersPrefText">低</text>
+  <text name="ShadersPrefText2">中</text>
+  <text name="ShadersPrefText3">高</text>
+  <text name="ShadersPrefText4">最高</text>
+  <text name="FasterText">速度優先</text>
+  <text name="BetterText">品質優先</text>
+
+  <!-- This block shows Basic Settings -->
+
+  <slider control_name="RenderFarClip" label="描画距離：" name="DrawDistance" />
+  <text name="DrawDistanceMeterText2">ｍ</text>
+
+  <check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders" />
+
+  <check_box initial_value="true" label="高度な光源モデル" name="UseLightShaders" />
+
+  <slider label="アバターの最大複雑度：" name="IndirectMaxComplexity" tool_tip="どの程度の複雑度で他のアバターをJellyDollとして描画するを設定します。" />
+  <text name="IndirectMaxComplexityText">0</text>
+  <text name="IndirectMaxComplexityLink">[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 これはなんですか？]</text>
+
+
+  <check_box initial_value="true" label="フレンドは常に描画" name="AlwaysRenderFriends" />
+  <button label="例外…" name="RenderExceptionsButton" />
+
+  <!-- End of Basic Settings block -->
+
+  <button label="設定をプリセットとして保存…" name="PrefSaveButton" />
+  <button label="プリセットをロード…" name="PrefLoadButton" />
+  <button label="プリセットを削除…" name="PrefDeleteButton" />
+  <button label="推奨設定にリセット" name="Defaults" />
+  <button label="拡張設定…" name="AdvancedSettings" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml b/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
new file mode 100644
index 0000000000..8173e57205
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="グリッド" name="grids">
+  <text name="add_grid_text">新しいグリッドを追加：</text>
+  <line_editor name="add_grid" label="ログインURIを入力" />
+  <button label="追加" name="add_grid_commit" />
+  <text name="manage_grid_text">グリッド管理：</text>
+  <scroll_list name="grid_list">
+    <scroll_list.columns label="グリッド名" name="grid_label" />
+    <scroll_list.columns label="ログインURI" name="login_uri" />
+    <scroll_list.commit_callback function="Pref.SelectGrid" />
+  </scroll_list>
+  <button label="有効化" name="activate_grid" />
+  <button label="リフレッシュ" name="refresh_grid" />
+  <button label="削除" name="remove_grid" />
+  <button label="デバッグ" name="debug_grid" />
+  <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" tool_tip="ログイン画面にグリッド選択を表示して、他のワールドにログインします。" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
index 121bebfd52..bb1e62e505 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="移動" name="move_panel">
-	<slider label="視界角" name="camera_fov"/>
-	<slider label="距離" name="camera_offset_scale"/>
-	<text name="heading2">
-		自動ポジション：
-	</text>
-	<check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います"/>
-	<check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います"/>
-	<text name="keyboard_lbl">
-		キーボード：
-	</text>
-	<check_box label="常にキー操作で動くようにする" name="arrow_keys_move_avatar_check"/>
-	<check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run"/>
-	<text name="mouse_lbl">
-		マウス：
-	</text>
-	<check_box label="一人称視点で表示する" name="first_person_avatar_visible"/>
-	<text name=" Mouse Sensitivity">
-		一人称視点のマウスの感度：
-	</text>
-	<check_box label="切り替え" name="invert_mouse"/>
-	<text name="single_click_action_lbl">
-		土地をシングルクリック：
-	</text>
-	<combo_box name="single_click_action_combo">
-		<combo_box.item label="動作なし" name="0"/>
-		<combo_box.item label="クリックされた地点に移動" name="1"/>
-	</combo_box>
-	<text name="double_click_action_lbl">
-		土地をダブルクリック：
-	</text>
-	<combo_box name="double_click_action_combo">
-		<combo_box.item label="動作なし" name="0"/>
-		<combo_box.item label="クリックされた地点に移動" name="1"/>
-		<combo_box.item label="クリックされた地点にテレポート" name="2"/>
-	</combo_box>
-	<button label="その他のディバイス" name="joystick_setup_button"/>
-</panel>
+  <icon name="camera_icon"/>
+  <slider label="視界角" name="camera_fov" />
+  <slider label="距離" name="camera_offset_scale" />
+  <text name="heading2">自動ポジション：</text>
+  <check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います" />
+  <check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います" />
+  <icon name="avatar_icon" />
+  <text name="keyboard_lbl">キーボード：</text>
+  <check_box label="方向キー押下時は、常に移動するようにする" name="arrow_keys_move_avatar_check" />
+  <check_box label="移動キー２度押し＋長押しで走る" name="tap_tap_hold_to_run" />
+  <check_box label="ジャンプまたはしゃがみキーを押し続けると、飛行を開始または停止します。" name="automatic_fly" />
+  <text name="mouse_lbl">マウス：</text>
+  <check_box label="一人称視点で表示する" name="first_person_avatar_visible" />
+  <text name=" Mouse Sensitivity">一人称視点時のマウスの感度：</text>
+  <check_box label="切り替え" name="invert_mouse" />
+  <text name="single_click_action_lbl">土地をシングルクリック：</text>
+  <combo_box name="single_click_action_combo">
+    <combo_box.item label="動作なし" name="0" value="0" />
+    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
+  </combo_box>
+  <text name="double_click_action_lbl">土地をダブルクリック：</text>
+  <combo_box name="double_click_action_combo">
+    <combo_box.item label="動作なし" name="0" value="0" />
+    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
+    <combo_box.item label="クリックされた地点にテレポート" name="2" value="2" />
+  </combo_box>
+  <check_box control_name="EnableCollisionSounds" label="ぶつかったときにサウンドを鳴らす" name="sound_on_collisions" />
+  <button label="その他のデバイス" name="joystick_setup_button" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index 2db6a688f3..d5aeeb81b3 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット設定" name="im">
-	<panel.string name="log_in_to_change">
-		ログインして変更
-	</panel.string>
-	<button label="履歴を消去" name="clear_cache" tool_tip="ログイン画像、最後にいた場所、テレポート履歴、Web、テクスチャキャッシュを削除します"/>
-	<text name="cache_size_label_l">
-		（位置、画像、web、検索履歴）
-	</text>
-	<check_box label="プロフィールを検索結果に表示する" name="online_searchresults"/>
-	<check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility"/>
-	<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
-	<check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check"/>
-	<check_box label="ログイン時にお気に入りのランドマークを表示（「開始地点」ドロップダウンメニュー経由）" name="favorites_on_login_check"/>
-	<text name="Logs:">
-		チャットログ：
-	</text>
-	<check_box label="近くのチャットログをコンピューターに保存する" name="log_nearby_chat"/>
-	<check_box label="IM ログをコンピューターに保存する" name="log_instant_messages"/>
-	<check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im"/>
-	<check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp"/>
-	<text name="log_path_desc">
-		ログの保存場所：
-	</text>
-	<button label="参照" label_selected="参照" name="log_path_button"/>
-	<button label="ブロックリスト" name="block_list"/>
-	<text name="block_list_label">
-		（あなたがブロックした住人/オブジェクト）
-	</text>
-</panel>
+  <panel.string name="log_in_to_change">ログインして変更</panel.string>
+  <button label="履歴を消去" name="clear_cache" tool_tip="ログイン画像、最後にいた場所、テレポート履歴、Web、テクスチャキャッシュを削除します" />
+  <text name="cache_size_label_l">（位置、画像、Web、検索履歴）</text>
+  <check_box label="プロフィールを検索結果に表示する" name="online_searchresults" />
+  <check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility" />
+  <check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check" />
+  <check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check" />
+  <check_box label="ログイン時にお気に入りのランドマークを表示（「開始地点」ドロップダウンメニュー経由）" name="favorites_on_login_check" />
+  <text name="Logs:">チャットログ：</text>
+  <check_box label="近隣チャットログをコンピューターに保存する" name="log_nearby_chat" />
+  <check_box label="ＩＭログをコンピューターに保存する" name="log_instant_messages" />
+  <check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im" />
+  <check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp" />
+  <text name="log_path_desc">ログの保存場所：</text>
+  <button label="参照" label_selected="参照" name="log_path_button" />
+  <button label="ブロックリスト" name="block_list" />
+  <text name="block_list_label">（あなたがブロックした住人／オブジェクト）</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 2ceecf9df6..3c485e46ac 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -1,39 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セットアップ" name="Input panel">
-	<text name="Network:">
-		ネットワーク：
-	</text>
-	<text name="Maximum bandwidth">
-		最大帯域幅
-	</text>
-	<text name="text_box2">
-		kbps
-	</text>
-	<check_box label="カスタムポート" name="connection_port_enabled"/>
-	<spinner label="ポート番号：" name="connection_port"/>
-	<text name="Web:">
-		Web：
-	</text>
-	<radio_group name="preferred_browser_behavior">
-		<radio_item label="すべてのリンクにデフォルトシステムのブラウザを使用します" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0"/>
-		<radio_item label="Second Life リンクにのみ内蔵ブラウザを使用します" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します内蔵ブラウザは LindenLab/Second Life リンクにのみ使用されます。" value="1"/>
-		<radio_item label="すべてのリンクに内蔵ブラウザを使用します" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME] 内に新しいウィンドウでこのブラウザが開きます。" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled"/>
-	<check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled"/>
-	<check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled"/>
-	<text name="Software updates:">
-		ソフトウェアアップデート：
-	</text>
-	<combo_box name="updater_service_combobox">
-		<combo_box.item label="各アップデートを自動的にインストールする" name="Install_automatically"/>
-		<combo_box.item label="オプションのアップデートのインストール準備ができたら通知する" name="Install_ask"/>
-		<combo_box.item label="必須アップデートのみインストールする" name="Install_manual"/>
-	</combo_box>
-	<check_box label="release candidate にアップグレードします" name="update_willing_to_test"/>
-	<check_box label="更新後にリリースノートを表示する" name="update_show_release_notes"/>
-	<text name="Proxy Settings:">
-		プロキシ設定：
-	</text>
-	<button label="プロキシ設定を調整" label_selected="参照" name="set_proxy"/>
-</panel>
+  <text name="Network:">ネットワーク：</text>
+  <text name="Maximum bandwidth">最大帯域幅</text>
+  <text name="text_box2">kbps</text>
+  <check_box label="カスタムポート" name="connection_port_enabled" />
+  <spinner label="ポート番号：" name="connection_port" />
+  <text name="Web:">Web：</text>
+  <radio_group name="preferred_browser_behavior">
+    <radio_item label="すべてのリンクにデフォルトシステムのブラウザを使用します" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0" />
+    <radio_item label="Second Life リンクにのみ内蔵ブラウザを使用します" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します内蔵ブラウザは LindenLab/Second Life リンクにのみ使用されます。" value="1" />
+    <radio_item label="すべてのリンクに内蔵ブラウザを使用します" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME]内に新しいウィンドウでこのブラウザが開きます。" value="2" />
+  </radio_group>
+  <check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled" />
+  <check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled" />
+  <check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled" />
+  <text name="Software updates:">ソフトウェアの更新：</text>
+  <combo_box name="updater_service_combobox">
+    <combo_box.item label="各アップデートを自動的にインストールする" name="Install_automatically" />
+    <combo_box.item label="オプションのアップデートのインストール準備ができたら通知する" name="Install_ask" />
+    <combo_box.item label="必須アップデートのみインストールする" name="Install_manual" />
+  </combo_box>
+  <check_box label="release candidate にアップグレードします" name="update_willing_to_test" />
+  <check_box label="更新後にリリースノートを表示する" name="update_show_release_notes" />
+  <text name="Proxy Settings:">プロキシ設定：</text>
+  <button label="プロキシ設定を調整" label_selected="参照" name="set_proxy" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 899b7c1b84..4b6972c015 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -1,37 +1,35 @@
-<?xml version="1.0" ?>
-<panel label="サウンド" name="Preference Media panel">
-	<panel.string name="middle_mouse">マウスの中央</panel.string>
-	<slider label="全体の音量" name="System Volume"/>
-	<check_box initial_value="true" label="Mute when minimized" name="mute_when_minimized"/>
-	<text name="mute_chb_label">最小化でミュート</text>
-	<slider label="ボタン" name="UI Volume"/>
-	<slider label="風" name="Wind Volume"/>
-	<slider label="効果音" name="SFX Volume"/>
-	<slider label="ストリーミング音楽" name="Music Volume"/>
-	<check_box label="有効" name="enable_music"/>
-	<slider label="メディア" name="Media Volume"/>
-	<check_box label="有効" name="enable_media"/>
-	<slider label="ボイスチャット" name="Voice Volume"/>
-	<check_box label="有効" name="enable_voice_check"/>
-	<check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します" value="true"/>
-	<check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" value="true"/>
-	<check_box label="ジェスチャーの音を再生" name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を聞くにはこれを選択" value="true"/>
-	<text name="voice_chat_settings">ボイスチャットの設定</text>
-	<text name="Listen from">方向：</text>
-	<radio_group name="ear_location">
-		<radio_item label="カメラの位置から聞く" name="0"/>
-		<radio_item label="アバターの位置から聞く" name="1"/>
-	</radio_group>
-	<check_box label="話すときにアバターの口を動かす" name="enable_lip_sync"/>
-	<check_box label="ボイスのオン・オフ切り替えに使用するトリガーキー：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを1度押して放すと、マイクのオン・オフ設定を切り替えます。トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。"/>
-	<line_editor label="プッシュ・トゥ・スピークのトリガー" name="modifier_combo"/>
-	<button label="キー設定" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="マウスの中央ボタンにリセット"/>
-	<button label="入力・出力機器" name="device_settings_btn"/>
-	<panel label="機器の設定" name="device_settings_panel"/>
-	<combo_box name="media_auto_play_combo">
-		<item name="autoplay_enabled" label="はい"/>
-		<item name="autoplay_ask" label="求める"/>
-		<item name="autoplay_disabled" label="いいえ"/>
-	</combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="サウンド" name="Preference Media panel">
+  <panel.string name="middle_mouse">マウスの中央</panel.string>
+  <slider label="全体の音量" name="System Volume" />
+  <check_box label="最小化時にミュート" name="mute_when_minimized" />
+  <text name="mute_chb_label">最小化時にミュート</text>
+  <slider label="ボタン" name="UI Volume" />
+  <slider label="風" name="Wind Volume" />
+  <slider label="効果音" name="SFX Volume" />
+  <slider label="ストリーミング音楽" name="Music Volume" />
+  <check_box label="有効" name="enable_music" />
+  <slider label="メディア" name="Media Volume" />
+  <check_box label="有効" name="enable_media" />
+  <slider label="ボイスチャット" name="Voice Volume" />
+  <check_box label="有効" name="enable_voice_check" />
+  <!-- -->
+  <check_box label="ジェスチャーの音を再生" name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を聞くにはこれを選択" />
+  <check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" />
+  <!-- -->
+  <text name="Listen media from">メディアとサウンドを聞く場所：</text>
+  <radio_group name="media_ear_location">
+    <radio_item label="カメラの位置から聞く" name="0" />
+    <radio_item label="アバターの位置から聞く" name="1" />
+  </radio_group>
+  <text name="media_autoplay_label">メディアの自動再生</text>
+  <combo_box name="media_auto_play_combo">
+    <item name="autoplay_enabled" label="再生する"/>
+    <item name="autoplay_ask" label="確認する"/>
+    <item name="autoplay_disabled" label="再生しない"/>
+  </combo_box>
+  <check_box label="話すときにアバターの口を動かす" name="enable_lip_sync" />
+  <check_box label="ボイスのオン・オフ切り替えに使用するトリガーキー：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを1度押して放すと、マイクのオン・オフ設定を切り替えます。トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。" />
+  <button label="入力・出力機器" name="device_settings_btn" />
+  <panel label="機器の設定" name="device_settings_panel" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
index 50d0e311a0..acea0ea965 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アップロード" name="uploads">
-	<text name="title">
-		アップロード用の最新の宛先フォルダ
-	</text>
-	<text name="title_models">
-		画像
-	</text>
-	<text name="title_sounds">
-		サウンド
-	</text>
-	<text name="title_animation">
-		アニメーション
-	</text>
-	<text name="title_model">
-		モデル
-	</text>
-	<text name="upload_help">
-		宛先フォルダを変更するには、持ち物でそのフォルダを右クリックして、&quot;デフォルトとして使用&quot; を選択します
-	</text>
-</panel>
+  <text name="title">アップロード先のフォルダ</text>
+  <text name="title_models">画像</text>
+  <text name="title_sounds">サウンド</text>
+  <text name="title_animation">アニメーション</text>
+  <text name="title_model">モデル</text>
+  <text name="upload_help">宛先フォルダを変更するには、持ち物でそのフォルダを右クリックして、
+「デフォルトとして使用」を選択します。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
new file mode 100644
index 0000000000..f2d3494fd8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_camera_pulldown">
+  <text name="Camera Presets">カメラのプリセット</text>
+  <scroll_list name="preset_camera_list" />
+  <view_border name="horiz_separator" />
+  <button name="open_prefs_btn" label="カメラのフローターを表示" tool_tip="カメラのフローターを起動する" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
index 422ed01cbb..9ba82b7834 100644
--- a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="presets_pulldown">
-	<text name="Graphic Presets">
-		グラフィックプリセット
-	</text>
-	<button label="グラフィックス設定を開く" name="open_prefs_btn" tool_tip="グラフィックス設定を開きます"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+  <text name="Graphic Presets">グラフィックプリセット</text>
+  <button label="グラフィックス設定を開く" name="open_prefs_btn" tool_tip="グラフィックス設定を開きます" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 9eb384830b..8aed758d1e 100644
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="MediaControls">
-	<string name="control_background_image_name">Inspector_Background</string>
-	<string name="skip_step">0.2</string>
-	<layout_stack name="progress_indicator_area">
-		<layout_panel name="media_progress_indicator">
-			<progress_bar name="media_progress_bar" tool_tip="ローディング"/>
-		</layout_panel>
-	</layout_stack>
-	<layout_stack name="media_controls">
-		<layout_panel name="back">
-			<button name="back_btn" tool_tip="前へ"/>
-		</layout_panel>
-		<layout_panel name="fwd">
-			<button name="fwd_btn" tool_tip="次へ"/>
-		</layout_panel>
-		<layout_panel name="home">
-			<button name="home_btn" tool_tip="ホームページ"/>
-		</layout_panel>
-		<layout_panel name="media_stop">
-			<button name="media_stop_btn" tool_tip="メディアを停止"/>
-		</layout_panel>
-		<layout_panel name="reload">
-			<button name="reload_btn" tool_tip="更新"/>
-		</layout_panel>
-		<layout_panel name="stop">
-			<button name="stop_btn" tool_tip="読み込み停止"/>
-		</layout_panel>
-		<layout_panel name="play">
-			<button name="play_btn" tool_tip="メディアを再生"/>
-		</layout_panel>
-		<layout_panel name="pause">
-			<button name="pause_btn" tool_tip="メディアを一時停止"/>
-		</layout_panel>
-		<layout_panel name="media_address">
-			<line_editor name="media_address_url" tool_tip="メディア URL"/>
-			<layout_stack name="media_address_url_icons">
-				<layout_panel name="media_address_url_icons_wl">
-					<icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="media_play_position">
-			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="ムービー再生進行"/>
-		</layout_panel>
-		<layout_panel name="skip_back">
-			<button name="skip_back_btn" tool_tip="前にステップ"/>
-		</layout_panel>
-		<layout_panel name="skip_forward">
-			<button name="skip_forward_btn" tool_tip="次にステップ"/>
-		</layout_panel>
-		<layout_panel name="media_volume">
-			<button name="media_mute_button" tool_tip="ミュート"/>
-			<slider name="volume_slider" tool_tip="メディアの音量"/>
-		</layout_panel>
-		<layout_panel name="zoom_frame">
-			<button name="zoom_frame_btn" tool_tip="メディアにズームイン"/>
-		</layout_panel>
-		<layout_panel name="close">
-			<button name="close_btn" tool_tip="ズームバック"/>
-		</layout_panel>
-		<layout_panel name="new_window">
-			<button name="new_window_btn" tool_tip="URL をブラウザで開く"/>
-		</layout_panel>
-		<icon name="media_secure_lock_flag" tool_tip="安全なブラウジング"/>
-	</layout_stack>
-</panel>
+  <string name="control_background_image_name">Inspector_Background</string>
+  <string name="skip_step">0.2</string>
+  <layout_stack name="progress_indicator_area">
+    <layout_panel name="media_progress_indicator">
+      <progress_bar name="media_progress_bar" tool_tip="読み込んでいます…" />
+    </layout_panel>
+  </layout_stack>
+  <layout_stack name="media_controls">
+    <layout_panel name="back">
+      <button name="back_btn" tool_tip="前へ" />
+    </layout_panel>
+    <layout_panel name="fwd">
+      <button name="fwd_btn" tool_tip="次へ" />
+    </layout_panel>
+    <layout_panel name="home">
+      <button name="home_btn" tool_tip="ホームページ" />
+    </layout_panel>
+    <layout_panel name="media_stop">
+      <button name="media_stop_btn" tool_tip="メディアを停止" />
+    </layout_panel>
+    <layout_panel name="reload">
+      <button name="reload_btn" tool_tip="更新" />
+    </layout_panel>
+    <layout_panel name="stop">
+      <button name="stop_btn" tool_tip="読み込み停止" />
+    </layout_panel>
+    <layout_panel name="play">
+      <button name="play_btn" tool_tip="メディアを再生" />
+    </layout_panel>
+    <layout_panel name="pause">
+      <button name="pause_btn" tool_tip="メディアを一時停止" />
+    </layout_panel>
+    <layout_panel name="media_address">
+      <line_editor name="media_address_url" tool_tip="メディア URL" />
+      <layout_stack name="media_address_url_icons">
+        <layout_panel name="media_address_url_icons_wl">
+          <icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="media_play_position">
+      <slider_bar name="media_play_slider" tool_tip="ムービー再生進行" />
+    </layout_panel>
+    <layout_panel name="skip_back">
+      <button name="skip_back_btn" tool_tip="前にステップ" />
+    </layout_panel>
+    <layout_panel name="skip_forward">
+      <button name="skip_forward_btn" tool_tip="次にステップ" />
+    </layout_panel>
+    <layout_panel name="media_volume">
+      <button name="media_mute_button" tool_tip="ミュート" />
+      <slider name="volume_slider" tool_tip="メディアの音量" />
+    </layout_panel>
+    <layout_panel name="zoom_frame">
+      <button name="zoom_frame_btn" tool_tip="メディアにズームイン" />
+    </layout_panel>
+    <layout_panel name="close">
+      <button name="close_btn" tool_tip="ズームバック" />
+    </layout_panel>
+    <layout_panel name="new_window">
+      <button name="new_window_btn" tool_tip="ＵＲＬをブラウザで開く" />
+    </layout_panel>
+  </layout_stack>
+  <icon name="media_secure_lock_flag" tool_tip="安全なブラウジング" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classified.xml b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
index 2d1bc07e2c..9129349310 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
@@ -1,110 +1,78 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_profile_classified">
-	<panel.string name="type_mature">
-		Moderate
-	</panel.string>
-	<panel.string name="type_pg">
-		General コンテンツ
-	</panel.string>
-	<panel.string name="l$_price">
-		L$[PRICE]
-	</panel.string>
-	<panel.string name="click_through_text_fmt">
-		[TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール
-	</panel.string>
-	<panel.string name="date_fmt">
-		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
-	</panel.string>
-	<panel.string name="auto_renew_on">
-		有効
-	</panel.string>
-	<panel.string name="auto_renew_off">
-		無効
-	</panel.string>
-	<panel.string name="location_notice">
-		（掲載後更新）
-	</panel.string>
-	<string name="publish_label">
-		掲載
-	</string>
-	<string name="save_label">
-		保存
-	</string>
-	<scroll_container name="profile_scroll">
-		<panel name="info_scroll_content_panel">
-			<icon label="" name="edit_icon" tool_tip="クリックして画像を選択"/>
-			<layout_stack name="info_panel">
-				<layout_panel name="main_info_panel">
-					<text_editor name="classified_name">
-						[name]
-					</text_editor>
-					<text name="classified_location_label" value="場所："/>
-					<text_editor name="classified_location" value="[loading...]"/>
-					<text name="content_type_label" value="コンテンツの種類："/>
-					<text_editor name="content_type" value="[content type]"/>
-					<text name="category_label" value="カテゴリ："/>
-					<text_editor name="category" value="[category]"/>
-					<text name="creation_date_label" value="制作日："/>
-					<text_editor name="creation_date" tool_tip="制作日" value="[date]"/>
-					<text name="price_for_listing_label" value="掲載価格："/>
-					<text_editor name="price_for_listing" tool_tip="掲載価格。">
-						[PRICE]
-					</text_editor>
-				</layout_panel>
-				<layout_panel name="clickthrough_layout_panel">
-					<text name="click_through_label" value="クリック数："/>
-					<text_editor name="click_through_text" tool_tip="クリックスルーデータ" value="[clicks]"/>
-				</layout_panel>
-				<layout_panel name="auto_renew_layout_panel">
-					<text name="auto_renew_label" value="自動更新："/>
-					<text name="auto_renew" value="有効"/>
-				</layout_panel>
-				<layout_panel name="descr_layout_panel">
-					<text name="classified_desc_label" value="説明："/>
-					<text_editor name="classified_desc" value="[description]"/>
-				</layout_panel>
-			</layout_stack>
-			<panel name="edit_panel">
-				<text name="Name:">
-					タイトル：
-				</text>
-				<text name="description_label">
-					説明：
-				</text>
-				<text name="location_label">
-					場所：
-				</text>
-				<text name="classified_location_edit">
-					ロード中...
-				</text>
-				<button label="現在地に設定" name="set_to_curr_location_btn"/>
-				<text name="category_label" value="カテゴリ："/>
-				<text name="content_type_label" value="コンテンツの種類："/>
-				<icons_combo_box label="General コンテンツ" name="content_type_edit">
-					<icons_combo_box.item label="Moderate コンテンツ" name="mature_ci" value="Mature"/>
-					<icons_combo_box.item label="General コンテンツ" name="pg_ci" value="PG"/>
-				</icons_combo_box>
-				<check_box label="毎週自動更新" name="auto_renew_edit"/>
-				<text name="price_for_listing_edit_label" value="掲載価格："/>
-				<spinner label="L$" name="price_for_listing_edit" tool_tip="掲載価格。" value="50"/>
-			</panel>
-		</panel>
-	</scroll_container>
-	<layout_stack name="edit_btns_pnl">
-		<layout_panel name="teleport_btn_lp">
-			<button label="テレポート" name="teleport_btn"/>
-		</layout_panel>
-		<layout_panel name="map_btn_lp">
-			<button label="地図" name="show_on_map_btn"/>
-		</layout_panel>
-		<layout_panel name="edit_btn_lp">
-			<button label="編集" name="edit_btn"/>
-		</layout_panel>
-		<layout_panel name="save_btn_lp">
-			<button label="[LABEL]" name="save_changes_btn"/>
-		</layout_panel>
-		<layout_panel name="cancel_btn_lp">
-			<button label="キャンセル" name="cancel_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <panel.string name="type_mature">Moderate</panel.string>
+  <panel.string name="type_pg">General コンテンツ</panel.string>
+  <panel.string name="l$_price">L$[PRICE]</panel.string>
+  <panel.string name="click_through_text_fmt">[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</panel.string>
+  <panel.string name="date_fmt">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</panel.string>
+  <panel.string name="auto_renew_on">有効</panel.string>
+  <panel.string name="auto_renew_off">無効</panel.string>
+  <panel.string name="location_notice">（掲載後更新）</panel.string>
+  <string name="publish_label">掲載</string>
+  <string name="save_label">保存</string>
+  <scroll_container name="profile_scroll">
+    <panel name="info_scroll_content_panel">
+      <icon label="" name="edit_icon" tool_tip="クリックして画像を選択" />
+      <layout_stack name="info_panel">
+        <layout_panel name="main_info_panel">
+          <text_editor name="classified_name">[name]</text_editor>
+          <text name="classified_location_label" value="場所：" />
+          <text_editor name="classified_location" value="[loading...]" />
+          <text name="content_type_label" value="コンテンツの種類：" />
+          <text_editor name="content_type" value="[content type]" />
+          <text name="category_label" value="カテゴリ：" />
+          <text_editor name="category" value="[category]" />
+          <text name="creation_date_label" value="制作日：" />
+          <text_editor name="creation_date" tool_tip="制作日" value="[date]" />
+          <text name="price_for_listing_label" value="掲載価格：" />
+          <text_editor name="price_for_listing" tool_tip="掲載価格">[PRICE]</text_editor>
+        </layout_panel>
+        <layout_panel name="clickthrough_layout_panel">
+          <text name="click_through_label" value="クリック数：" />
+          <text_editor name="click_through_text" tool_tip="クリックスルーデータ" value="[clicks]" />
+        </layout_panel>
+        <layout_panel name="auto_renew_layout_panel">
+          <text name="auto_renew_label" value="自動更新：" />
+          <text name="auto_renew" value="有効" />
+        </layout_panel>
+        <layout_panel name="descr_layout_panel">
+          <text name="classified_desc_label" value="説明：" />
+          <text_editor name="classified_desc" value="[description]" />
+        </layout_panel>
+      </layout_stack>
+      <panel name="edit_panel">
+        <text name="Name:">タイトル：</text>
+        <text name="description_label">説明：</text>
+        <text name="location_label">場所：</text>
+        <text name="classified_location_edit">読み込んでいます…</text>
+        <button label="現在地に設定" name="set_to_curr_location_btn" />
+        <text name="category_label" value="カテゴリ：" />
+        <text name="content_type_label" value="コンテンツの種類：" />
+        <icons_combo_box label="General コンテンツ" name="content_type_edit">
+          <icons_combo_box.item label="Moderate コンテンツ" name="mature_ci" value="Mature" />
+          <icons_combo_box.item label="General コンテンツ" name="pg_ci" value="PG" />
+        </icons_combo_box>
+        <check_box label="毎週自動更新" name="auto_renew_edit" />
+        <text name="price_for_listing_edit_label" value="掲載価格：" />
+        <spinner label="L$" name="price_for_listing_edit" tool_tip="掲載価格。" value="50" />
+      </panel>
+    </panel>
+  </scroll_container>
+  <layout_stack name="edit_btns_pnl">
+    <layout_panel name="teleport_btn_lp">
+      <button label="テレポート" name="teleport_btn" />
+    </layout_panel>
+    <layout_panel name="map_btn_lp">
+      <button label="マップ" name="show_on_map_btn" />
+    </layout_panel>
+    <layout_panel name="edit_btn_lp">
+      <button label="編集" name="edit_btn" />
+    </layout_panel>
+    <layout_panel name="save_btn_lp">
+      <button label="[LABEL]" name="save_changes_btn" />
+    </layout_panel>
+    <layout_panel name="cancel_btn_lp">
+      <button label="キャンセル" name="cancel_btn" />
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
index 1980c0fa62..cdba0f49a6 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="クラシファイド広告" name="panel_profile_classifieds">
-	<string name="no_classifieds" value="クラシファイド広告なし"/>
-	<button label="新規…" name="new_btn"/>
-	<button label="削除…" name="delete_btn"/>
-	<text name="classifieds_panel_text">
-		ロード中...
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="クラシファイド広告" name="panel_profile_classifieds">
+  <string name="no_classifieds" value="クラシファイド広告なし" />
+  <button label="新規…" name="new_btn" />
+  <button label="削除…" name="delete_btn" />
+  <text name="classifieds_panel_text">読み込んでいます…</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
index a4ee262cb3..22a0e619f6 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="プロフィール" name="panel_profile_firstlife"/>
+<panel label="プロフィール" name="panel_profile_firstlife" />
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_notes.xml b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
index 4b4e0d5e4e..3408aafabe 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メモとプライバシー" name="panel_notes">
-	<text name="status_message" value="このアバターのプライベートメモ："/>
-	<text name="status_message2" value="このアバターに次の許可を与える："/>
-	<check_box label="自分のオンラインステータスを表示する" name="status_check"/>
-	<check_box label="世界地図で自分を探せるようにする" name="map_check"/>
-	<check_box label="自分のオブジェクトを編集・削除・取得できるようにする" name="objects_check"/>
-</panel>
+  <text name="status_message" value="このアバターのプライベートメモ：" />
+  <text name="status_message2" value="このアバターに次の許可を与える：" />
+  <check_box label="自分のオンラインステータスを表示する" name="status_check" />
+  <check_box label="ワールドマップで自分を探せるようにする" name="map_check" />
+  <check_box label="自分のオブジェクトを編集・削除・取得できるようにする" name="objects_check" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
index 0a20c04ad6..3466cf6480 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
-	<panel.string name="location_notice">
-		（掲載後更新）
-	</panel.string>
-	<line_editor name="pick_location">
-		ロード中...
-	</line_editor>
-	<button label="テレポート" name="teleport_btn"/>
-	<button label="地図に表示" name="show_on_map_btn"/>
-	<button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定"/>
-	<button label="ピックを保存" name="save_changes_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+  <panel.string name="location_notice">（掲載後更新）</panel.string>
+  <line_editor name="pick_location">（読み込んでいます…）</line_editor>
+  <button label="テレポート" name="teleport_btn" />
+  <button label="マップに表示" name="show_on_map_btn" />
+  <button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定" />
+  <button label="ピックを保存" name="save_changes_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_picks.xml b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
index 4cbfadd09d..4f2950f6b4 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ピック" name="panel_picks">
-	<string name="no_picks" value="ピックなし"/>
-	<text name="Tell everyone about your favorite places in Second Life.">
-		Second Life のお気に入りの場所を紹介しましょう。
-	</text>
-	<button label="新規…" name="new_btn"/>
-	<button label="削除…" name="delete_btn"/>
-	<text name="picks_panel_text">
-		ロード中...
-	</text>
-</panel>
+  <string name="no_picks" value="ピックなし" />
+  <text name="Tell everyone about your favorite places in Second Life.">Second Lifeのお気に入りの場所を紹介しましょう。</text>
+  <button label="新規…" name="new_btn" />
+  <button label="削除…" name="delete_btn" />
+  <text name="picks_panel_text">読み込んでいます…</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
index 5470dc6c82..1a3fbec783 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
@@ -1,77 +1,90 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="プロフィール" name="panel_profile">
-	<string name="status_online">
-		オンライン中
-	</string>
-	<string name="status_offline">
-		オフライン中
-	</string>
-	<string name="CaptionTextAcctInfo">
-		[ACCTTYPE]
-[PAYMENTINFO]
-	</string>
-	<string name="payment_update_link_url">
-		http://www.secondlife.com/account/billing.php?lang=en
-	</string>
-	<string name="partner_edit_link_url">
-		http://www.secondlife.com/account/partners.php?lang=en
-	</string>
-	<string name="my_account_link_url" value="http://secondlife.com/account"/>
-	<string name="no_partner_text" value="なし"/>
-	<string name="no_group_text" value="なし"/>
-	<string name="RegisterDateFormat">
-		[REG_DATE]
-	</string>
-	<string name="name_text_args">
-		[NAME]
-	</string>
-	<string name="display_name_text_args">
-		[DISPLAY_NAME]
-	</string>
-	<string name="FSDev" value="開発者"/>
-	<string name="FSSupp" value="サポート"/>
-	<string name="FSQualityAssurance" value="バグハンター"/>
-	<string name="FSGW" value="ゲートウェイ"/>
-	<text name="name_label" value="名前："/>
-	<button label="名前：" name="set_name" tool_tip="表示名を設定"/>
-	<panel name="name_holder">
-		<text_editor name="complete_name" value="(ロード中...)"/>
-	</panel>
-	<layout_stack name="imagepositioner">
-		<layout_panel name="label_stack">
-			<text name="status" value="ステータス不明"/>
-			<text name="label" value="Second Life 生年月日："/>
-			<text name="label2" value="アカウント："/>
-			<text name="partner_label" value="パートナー："/>
-		</layout_panel>
-	</layout_stack>
-	<text name="Groups:" value="グループ："/>
-	<button label="+" label_selected="+" name="group_invite" tool_tip="グループに招待"/>
-	<layout_stack name="aboutpositioner">
-		<layout_panel name="about_stack">
-			<text name="About:" value="詳細："/>
-		</layout_panel>
-		<layout_panel name="give_stack">
-			<text name="Give item:" value="アイテムを渡す："/>
-			<text name="Give inventory" tool_tip="インベントリのアイテムをここにドロップしてこの人に渡します。">
-				インベントリのアイテムをここにドロップしてください。
-			</text>
-		</layout_panel>
-	</layout_stack>
-	<layout_stack name="buttonstack">
-		<layout_panel name="left_buttonstack">
-			<button label="地図上で見つける" label_selected="地図上で見つける" name="show_on_map_btn" tool_tip="住人を地図上で探す"/>
-			<button label="お金を払う" label_selected="お金を払う" name="pay" tool_tip="住人にお金を支払う"/>
-		</layout_panel>
-		<layout_panel name="middle_buttonstack">
-			<button label="テレポートを送る" label_selected="テレポートを送る" name="teleport" tool_tip="住人にテレポートを送る"/>
-			<button label="インスタントメッセージ" label_selected="インスタントメッセージ" name="im" tool_tip="インスタントメッセージを開きます"/>
-		</layout_panel>
-		<layout_panel name="right_buttonstack">
-			<button label="フレンド登録" label_selected="フレンド登録" name="add_friend" tool_tip="フレンド登録を申し出ます"/>
-			<button label="ブロック" name="block" tool_tip="この住人をブロックする"/>
-			<button label="ブロック解除" name="unblock" tool_tip="この住人のブロックを解除する"/>
-		</layout_panel>
-	</layout_stack>
-	<check_box label="検索に表示" name="show_in_search_checkbox"/>
-</panel>
+  <!--
+  Date from server comes already converted to stl timezone,
+  so display it as an UTC+0
+  -->
+  <string name="date_format" value="ＳＬでの誕生日：[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日" />
+  <string name="age_format" value="[AGE]歳" />
+  <string name="partner_text" value="パートナー：[LINK]" />
+
+
+  <layout_stack name="image_stack">
+    <layout_panel name="image_panel">
+
+      <icon name="2nd_life_pic" />
+
+      <loading_indicator name="image_upload_indicator" />
+    </layout_panel>
+
+    <layout_panel name="basics_panel">
+      <line_editor name="user_name" value="（読み込んでいます…）" />
+
+      <line_editor name="sl_birth_date" value="（読み込んでいます…）" />
+
+      <line_editor name="user_age" value="（読み込んでいます…）" />
+    </layout_panel>
+    <layout_panel name="partner_layout">
+      <text name="partner_link" value="パートナー：（読み込んでいます…）" />
+    </layout_panel>
+
+    <layout_panel name="partner_spacer_layout" />
+
+    <layout_panel name="frind_layout">
+      <text name="frind_text" value="あなたはフレンドです。" />
+    </layout_panel>
+    <layout_panel name="online_layout">
+      <icon name="online_icon" />
+      <text name="online_text" value="オンライン" />
+    </layout_panel>
+    <layout_panel name="offline_layout">
+      <icon name="offline_icon" />
+      <text name="offline_text" value="オフライン" />
+    </layout_panel>
+    <layout_panel name="account_layout">
+      <text name="account_info" value="アカウント：（読み込んでいます…）" />
+    </layout_panel>
+    <layout_panel name="indicator_stack">
+      <loading_indicator name="progress_indicator" />
+    </layout_panel>
+    <layout_panel name="settings_panel">
+      <!-- only for self -->
+      <text name="search_label" value="自分のプロフィールを検索結果に反映：" />
+      <combo_box name="show_in_search" tool_tip="検索結果から、あなたを見つけてもらいましょう。">
+        <combo_box.item name="Hide" label="表示しない" value="0" />
+        <combo_box.item name="Show" label="表示する" value="1" />
+      </combo_box>
+    </layout_panel>
+
+    <layout_panel name="menu_panel">
+      <menu_button label="アクション" name="agent_actions_menu" />
+    </layout_panel>
+  </layout_stack>
+
+  <layout_stack name="main_stack">
+    <layout_panel name="display_name_panel">
+      <line_editor name="display_name" value="（読み込んでいます…）" />
+      <icon tool_tip="フレンドは、自分のオンライン状況を見ることができます。" name="can_see_online" />
+      <icon tool_tip="フレンドは、自分のオンライン状況を見ることができません。" name="cant_see_online" />
+      <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができます。" name="can_see_on_map" />
+      <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができません。" name="cant_see_on_map" />
+      <icon tool_tip="フレンドは、自分のオブジェクトを編集できます。" name="can_edit_objects" />
+      <icon tool_tip="フレンドは、自分のオブジェクトを編集できません。" name="cant_edit_objects" />
+    </layout_panel>
+
+    <layout_panel name="about_panel">
+      <text_editor name="sl_description_edit" />
+    </layout_panel>
+    <layout_panel name="about_buttons_panel">
+      <button name="save_description_changes" label="保存" />
+      <button name="discard_description_changes" label="破棄" />
+      <view_border name="cost_text_border" />
+    </layout_panel>
+
+    <layout_panel name="groups_panel">
+      <text name="group_label" value="グループのメンバーシップ" />
+      <group_list name="group_list" />
+
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_web.xml b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
index 4f56a7e98d..c6572a9d3a 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Web" name="panel_profile_web">
-	<panel.string name="LoadTime" value="ロード時間：[TIME] 秒"/>
-	<line_editor name="url_edit">
-		(ロード中...)
-	</line_editor>
-	<flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。">
-		<flyout_button.item label="ビューワ内のブラウザを開く" name="open_item"/>
-		<flyout_button.item label="外部ブラウザを開く" name="home_item"/>
-	</flyout_button>
-	<button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+  <panel.string name="LoadTime" value="ロード時間：[TIME]秒" />
+  <line_editor name="url_edit">（読み込んでいます…）</line_editor>
+  <flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。">
+    <flyout_button.item label="ビューア内のブラウザを開く" name="open_item" />
+    <flyout_button.item label="外部ブラウザを開く" name="home_item" />
+  </flyout_button>
+  <button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_progress.xml b/indra/newview/skins/default/xui/ja/panel_progress.xml
index 4a47412521..400a4a6bf2 100644
--- a/indra/newview/skins/default/xui/ja/panel_progress.xml
+++ b/indra/newview/skins/default/xui/ja/panel_progress.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="login_progress_panel">
-	<layout_panel name="panel_icons"/>
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
-	<layout_stack name="horizontal_centering">
-		<text name="logos_lbl">セカンドライフ使用</text>
-	</layout_stack>
+  <layout_panel name="panel_icons"/>
+  <layout_stack name="vertical_centering"/>
+  <layout_panel name="panel4"/>
+  <layout_panel name="center"/>
+  <layout_stack name="horizontal_centering">
+    <text name="logos_lbl">セカンドライフ使用</text>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_access.xml b/indra/newview/skins/default/xui/ja/panel_region_access.xml
index 34809688d0..b827cc0553 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_access.xml
@@ -1,60 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アクセス" name="Access">
-	<tab_container name="tabs">
-		<panel label="不動産マネージャー" name="estate_managers_panel">
-			<text name="estate_manager_label">
-				不動産マネージャー:
-			</text>
-			<name_list name="estate_manager_name_list">
-				<columns label="名前" name="name"/>
-			</name_list>
-			<button label="追加..." name="add_estate_manager_btn"/>
-			<button label="削除…" name="remove_estate_manager_btn"/>
-		</panel>
-		<panel label="許可" name="allowed_panel">
-			<panel label="top_panel" name="allowed_search_panel">
-				<filter_editor label="許可されたエージェントを検索" name="allowed_search_input"/>
-				<button label="コピー" name="copy_allowed_list_btn"/>
-			</panel>
-			<text name="allow_resident_label">
-				常に許可：
-			</text>
-			<name_list name="allowed_avatar_name_list">
-				<columns label="名前" name="name"/>
-			</name_list>
-			<button label="追加..." name="add_allowed_avatar_btn"/>
-			<button label="削除…" name="remove_allowed_avatar_btn"/>
-		</panel>
-		<panel label="許可されたグループ" name="allowed_groups_panel">
-			<panel label="top_panel" name="allowed_group_search_panel">
-				<filter_editor label="許可されたグループを検索" name="allowed_group_search_input"/>
-				<button label="コピー" name="copy_allowed_group_list_btn"/>
-			</panel>
-			<text name="allow_group_label">
-				常に許可されたグループ：
-			</text>
-			<name_list name="allowed_group_name_list">
-				<columns label="名前" name="name"/>
-			</name_list>
-			<button label="追加..." name="add_allowed_group_btn"/>
-			<button label="削除…" name="remove_allowed_group_btn"/>
-		</panel>
-		<panel label="禁止" name="banned_panel">
-			<panel label="top_panel" name="banned_search_panel">
-				<filter_editor label="禁止されたエージェントを検索" name="banned_search_input"/>
-				<button label="コピー" name="copy_banned_list_btn"/>
-			</panel>
-			<text name="ban_resident_label">
-				常に禁止：
-			</text>
-			<name_list name="banned_avatar_name_list">
-				<columns label="名前" name="name"/>
-				<columns label="最後にログインした日" name="last_login_date"/>
-				<columns label="禁止された日付" name="ban_date"/>
-				<columns label="禁止した人：" name="bannedby"/>
-			</name_list>
-			<button label="追加..." name="add_banned_avatar_btn"/>
-			<button label="削除…" name="remove_banned_avatar_btn"/>
-		</panel>
-	</tab_container>
-</panel>
+  <tab_container name="tabs">
+    <panel label="不動産マネージャー" name="estate_managers_panel">
+      <text name="estate_manager_label">不動産マネージャー：</text>
+      <name_list name="estate_manager_name_list">
+        <columns label="名前" name="name" />
+      </name_list>
+      <button label="追加…" name="add_estate_manager_btn" />
+      <button label="削除…" name="remove_estate_manager_btn" />
+    </panel>
+    <panel label="許可" name="allowed_panel">
+      <panel label="top_panel" name="allowed_search_panel">
+        <filter_editor label="許可されたエージェントを検索" name="allowed_search_input" />
+        <button label="コピー" name="copy_allowed_list_btn" />
+      </panel>
+      <text name="allow_resident_label">常に許可：</text>
+      <name_list name="allowed_avatar_name_list">
+        <columns label="名前" name="name" />
+      </name_list>
+      <button label="追加…" name="add_allowed_avatar_btn" />
+      <button label="削除…" name="remove_allowed_avatar_btn" />
+    </panel>
+    <panel label="許可されたグループ" name="allowed_groups_panel">
+      <panel label="top_panel" name="allowed_group_search_panel">
+        <filter_editor label="許可されたグループを検索" name="allowed_group_search_input" />
+        <button label="コピー" name="copy_allowed_group_list_btn" />
+      </panel>
+      <text name="allow_group_label">常に許可されたグループ：</text>
+      <name_list name="allowed_group_name_list">
+        <columns label="名前" name="name" />
+      </name_list>
+      <button label="追加…" name="add_allowed_group_btn" />
+      <button label="削除…" name="remove_allowed_group_btn" />
+    </panel>
+    <panel label="禁止" name="banned_panel">
+      <panel label="top_panel" name="banned_search_panel">
+        <filter_editor label="禁止されたエージェントを検索" name="banned_search_input" />
+        <button label="コピー" name="copy_banned_list_btn" />
+      </panel>
+      <text name="ban_resident_label">常にバン：</text>
+      <name_list name="banned_avatar_name_list">
+        <columns label="名前" name="name" />
+        <columns label="最後にログインした日" name="last_login_date" />
+        <columns label="バンされた日付" name="ban_date" />
+        <columns label="バンした人：" name="bannedby" />
+      </name_list>
+      <button label="追加…" name="add_banned_avatar_btn" />
+      <button label="削除…" name="remove_banned_avatar_btn" />
+    </panel>
+  </tab_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 5214f79141..b213f11d43 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -1,80 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="約款" name="Covenant">
-	<text font="SansSerifLarge" name="estate_section_lbl" width="200">
-		不動産
-	</text>
-	<text name="estate_name_lbl">
-		名前：
-	</text>
-	<text name="estate_name_text">
-		メインランド
-	</text>
-	<text name="estate_owner_lbl">
-		オーナー：
-	</text>
-	<text name="estate_owner_text">
-		（無）
-	</text>
-	<text name="estate_cov_lbl">
-		約款：
-	</text>
-	<text name="covenant_timestamp_text">
-		最終更新日：1969年12月31日（水）16:00:00
-	</text>
-	<button label="?" name="covenant_help"/>
-	<text_editor bottom="-263" height="178" name="covenant_editor">
-		この不動産には約款がありません。
-	</text_editor>
-	<button label="リセット" name="reset_covenant"/>
-	<text name="covenant_help_text" left="100">
-		約款の変更は不動産全区画に適用となります。
-	</text>
-	<text name="covenant_instructions" width="390">
-		この不動産約款を変更する際は、ノートカードをドラッグ＆ドロップしてください。
-	</text>
-	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl" width="200">
-		地域
-	</text>
-	<text name="region_name_lbl">
-		名前：
-	</text>
-	<text name="region_name_text">
-		Erica
-	</text>
-	<text name="region_landtype_lbl">
-		種類：
-	</text>
-	<text name="region_landtype_text">
-		メインランド/ホームステッド
-	</text>
-	<text name="region_maturity_lbl">
-		区分：
-	</text>
-	<text name="region_maturity_text">
-		Adult
-	</text>
-	<text name="resellable_lbl">
-		再販：
-	</text>
-	<text name="resellable_clause">
-		この地域（リージョン）にある土地は再販できません。
-	</text>
-	<text name="changeable_lbl">
-		再分割：
-	</text>
-	<text name="changeable_clause">
-		この地域（リージョン）にある土地は統合または分割ができません。
-	</text>
-	<string name="can_resell">
-		この地域で購入した土地は、再販できます。
-	</string>
-	<string name="can_not_resell">
-		この地域の購入地は再販できないことがあります。
-	</string>
-	<string name="can_change">
-		この地域の購入地は統合または再分割できます。
-	</string>
-	<string name="can_not_change">
-		この地域の購入地は統合／再分割できないことがあります。
-	</string>
-</panel>
+  <text font="SansSerifLarge" name="estate_section_lbl">不動産</text>
+  <text name="estate_name_lbl">名前：</text>
+  <text name="estate_name_text">メインランド</text>
+  <text name="estate_owner_lbl">所有者：</text>
+  <text name="estate_owner_text">（無）</text>
+  <text name="estate_cov_lbl">約款：</text>
+  <text name="covenant_timestamp_text">最終更新日：1969年12月31日（水）16:00:00</text>
+  <button label="?" name="covenant_help" />
+  <text_editor bottom="-263" height="178" name="covenant_editor">この不動産には約款がありません。</text_editor>
+  <button label="リセット" name="reset_covenant" />
+  <text name="covenant_help_text">約款の変更は不動産全区画に適用となります。</text>
+  <text name="covenant_instructions">この不動産約款を変更する際は、ノートカードをドラッグ＆ドロップしてください。</text>
+  <text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl">リージョン</text>
+  <text name="region_name_lbl">名前：</text>
+  <text name="region_name_text">エリカ</text>
+  <text name="region_landtype_lbl">種類：</text>
+  <text name="region_landtype_text">メインランド／入植地</text>
+  <text name="region_maturity_lbl">区分：</text>
+  <text name="region_maturity_text">アダルト</text>
+  <text name="resellable_lbl">再販：</text>
+  <text name="resellable_clause">このリージョン（地域）にある土地は再販できません。</text>
+  <text name="changeable_lbl">再分割：</text>
+  <text name="changeable_clause">このリージョン（地域）にある土地は統合または分割ができません。</text>
+  <string name="can_resell">このリージョン（地域）で購入した土地は、再販できます。</string>
+  <string name="can_not_resell">このリージョン（地域）の購入地は再販できないことがあります。</string>
+  <string name="can_change">このリージョン（地域）の購入地は統合または再分割できます。</string>
+  <string name="can_not_change">このリージョン（地域）の購入地は統合／再分割できないことがあります。</string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 908af3d66a..dd0ba7b8f4 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -1,35 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="デバッグ" name="Debug">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="この地域のスクリプトをすべて無効にします"/>
-	<check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="この地域の非アバター衝突を無効にします"/>
-	<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="この地域の物理作用をすべて無効にします"/>
-	<button label="適用" name="apply_btn"/>
-	<text name="objret_text_lbl" width="120">
-		オブジェクトの返却
-	</text>
-	<text name="resident_text_lbl">
-		住人:
-	</text>
-	<line_editor name="target_avatar_name">
-		(なし)
-	</line_editor>
-	<button label="選択" name="choose_avatar_btn"/>
-	<text name="options_text_lbl">
-		オプション:
-	</text>
-	<check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します"/>
-	<check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却します"/>
-	<check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却します"/>
-	<button label="返却" name="return_btn"/>
-	<button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト"/>
-	<button label="地域再起動" name="restart_btn" tool_tip="2分間のカウントダウン後、地域を再起動します"/>
-	<button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト"/>
-	<button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="リージョンの再起動をキャンセル"/>
-	<button label="地域デバッグコンソール" name="region_debug_console_btn" tool_tip="地域デバッグコンソールを開く"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="デバッグ" name="Debug">
+  <text name="region_text_lbl">リージョン（地域）：</text>
+  <text name="region_text">未知</text>
+  <check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="このリージョン（地域）のスクリプトをすべて無効にします" />
+  <check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="このリージョン（地域）の非アバター衝突を無効にします" />
+  <check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="このリージョン（地域）の物理作用をすべて無効にします" />
+  <button label="適用" name="apply_btn" />
+  <text name="objret_text_lbl">オブジェクトの返却</text>
+  <text name="resident_text_lbl">住人：</text>
+  <line_editor name="target_avatar_name">（なし）</line_editor>
+  <button label="選択" name="choose_avatar_btn" />
+  <text name="options_text_lbl">オプション：</text>
+  <check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します" />
+  <check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却します" />
+  <check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべてのリージョン（地域）のオブジェクトを返却します" />
+  <button label="返却" name="return_btn" />
+  <button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト" />
+  <button label="リージョン（地域）再起動" name="restart_btn" tool_tip="２分間のカウントダウン後、リージョン（地域）を再起動します" />
+  <button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト" />
+  <button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="リージョンの再起動をキャンセル" />
+  <button label="リージョン（地域）デバッグコンソール" name="region_debug_console_btn" tool_tip="リージョン（地域）デバッグコンソールを開く" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index 02c08e4999..a11ebb1fb3 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
@@ -1,76 +1,73 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="環境" name="panel_env_info">
-	<string name="str_label_use_default">既定の設定を使用</string>
-	<string name="str_label_use_region">リージョンの設定を使用</string>
-	<string name="str_altitude_desription">空 [INDEX]([ALTITUDE]m)</string>
-	<string name="str_no_parcel">区画が選択されていません。環境設定が無効になっています。</string>
-	<string name="str_cross_region">リージョンの境界では環境設定ができません。</string>
-	<string name="str_legacy">このリージョンで環境設定はできません。</string>
-	<string name="str_disallowed">不動産マネージャーが、このリージョンで区画の環境を変更することを許可していません。</string>
-	<string name="str_too_small">環境をサポートするには、最低でも 128 平方メートルの区画が必要です。</string>
-	<string name="str_empty">(空)</string>
-	<string name="str_region_env">（リージョンの環境）</string>
-	<layout_stack>
-		<layout_panel name="pnl_environment_disabled">
-			<text name="txt_environment_disabled">...</text>
-		</layout_panel>
-		<layout_panel name="pnl_environment_config">
-			<layout_stack>
-				<layout_panel name="pnl_environment_config">
-					<layout_stack>
-						<layout_panel name="pnl_environment_current">
-							<button label="[USEDEFAULT]" name="btn_usedefault"/>
-							<button label="持ち物を使う" name="btn_select_inventory"/>
-							<button label="カスタマイズ" name="btn_edit"/>
-							<check_box label="区画所有者が環境を上書きすることがあります" name="chk_allow_override"/>
-						</layout_panel>
-						<layout_panel name="pnl_environment_length">
-							<text name="lbl_apparent_time">[HH]:[MM][AP] ([PRC]%)</text>
-						</layout_panel>
-						<layout_panel name="pnl_environment_buttons"/>
-					</layout_stack>
-				</layout_panel>
-				<layout_panel name="pnl_environment_altitudes">
-					<panel name="pnl_alt1">
-						<text name="txt_alt1">空 [INDEX]
-                            [ALTITUDE]m</text>
-						<line_editor name="edt_invname_alt1">不明</line_editor>
-						<settings_drop_target name="sdt_alt1" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/>
-					</panel>
-					<panel name="pnl_alt2">
-						<text name="txt_alt2">空 [INDEX]
-                            [ALTITUDE]m</text>
-						<line_editor name="edt_invname_alt2">不明</line_editor>
-						<settings_drop_target name="sdt_alt2" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/>
-					</panel>
-					<panel name="pnl_alt3">
-						<text name="txt_alt3">空 [INDEX]
-                            [ALTITUDE]m</text>
-						<line_editor name="edt_invname_alt3">不明</line_editor>
-						<settings_drop_target name="sdt_alt3" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/>
-					</panel>
-					<multi_slider initial_value="0" name="sld_altitudes">
-						<slider name="sld1" value="1000"/>
-						<slider name="sld2" value="2000"/>
-						<slider name="sld3" value="3000"/>
-					</multi_slider>
-					<panel name="pnl_ground">
-						<text name="txt_ground">地面</text>
-						<line_editor name="edt_invname_ground">不明</line_editor>
-						<settings_drop_target name="sdt_ground" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、地表レベルの空として選択します。"/>
-					</panel>
-					<panel name="pnl_water">
-						<text name="txt_water">水</text>
-						<line_editor name="edt_invname_water">不明</line_editor>
-						<settings_drop_target name="sdt_water" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の水として選択する"/>
-					</panel>
-					<button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-	<layout_panel name="pnl_environment_region_msg">
-		<text name="region_text_lbl">地域：</text>
-		<text name="region_text">不明</text>
-	</layout_panel>
-</panel>
+  <string name="str_label_use_default">既定の設定を使用</string>
+  <string name="str_label_use_region">リージョン（地域）の設定を使用</string>
+  <string name="str_altitude_desription">空 [INDEX]（[ALTITUDE]m）</string>
+  <string name="str_no_parcel">区画が選択されていません。環境設定が無効になっています。</string>
+  <string name="str_cross_region">リージョン（地域）の境界では環境設定ができません。</string>
+  <string name="str_legacy">このリージョン（地域）で環境設定はできません。</string>
+  <string name="str_disallowed">不動産マネージャーが、このリージョン（地域）で区画の環境を変更することを許可していません。</string>
+  <string name="str_too_small">環境をサポートするには、最低でも128㎡の区画が必要です。</string>
+  <string name="str_empty">（空）</string>
+  <string name="str_region_env">（リージョンの環境）</string>
+  <layout_stack>
+    <layout_panel name="pnl_environment_disabled">
+      <text name="txt_environment_disabled">…</text>
+    </layout_panel>
+    <layout_panel name="pnl_environment_config">
+      <layout_stack>
+        <layout_panel name="pnl_environment_config">
+          <layout_stack>
+            <layout_panel name="pnl_environment_current">
+              <button label="[USEDEFAULT]" name="btn_usedefault" />
+              <button label="持ち物を使う" name="btn_select_inventory" />
+              <button label="カスタマイズ" name="btn_edit" />
+              <check_box label="区画所有者が環境を上書きすることがあります" name="chk_allow_override" />
+            </layout_panel>
+            <layout_panel name="pnl_environment_length">
+              <text name="lbl_apparent_time">[AP]　[HH]：[MM]（[PRC]％）</text>
+            </layout_panel>
+            <layout_panel name="pnl_environment_buttons" />
+          </layout_stack>
+        </layout_panel>
+        <layout_panel name="pnl_environment_altitudes">
+          <panel name="pnl_alt1">
+            <text name="txt_alt1">空[INDEX]　[ALTITUDE]m</text>
+            <line_editor name="edt_invname_alt1">不明</line_editor>
+            <settings_drop_target name="sdt_alt1" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+          </panel>
+          <panel name="pnl_alt2">
+            <text name="txt_alt2">空[INDEX]　[ALTITUDE]m</text>
+            <line_editor name="edt_invname_alt2">不明</line_editor>
+            <settings_drop_target name="sdt_alt2" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+          </panel>
+          <panel name="pnl_alt3">
+            <text name="txt_alt3">空[INDEX]　[ALTITUDE]m</text>
+            <line_editor name="edt_invname_alt3">不明</line_editor>
+            <settings_drop_target name="sdt_alt3" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+          </panel>
+          <multi_slider initial_value="0" name="sld_altitudes">
+            <slider name="sld1" value="1000" />
+            <slider name="sld2" value="2000" />
+            <slider name="sld3" value="3000" />
+          </multi_slider>
+          <panel name="pnl_ground">
+            <text name="txt_ground">地面</text>
+            <line_editor name="edt_invname_ground">不明</line_editor>
+            <settings_drop_target name="sdt_ground" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、地表レベルの空として選択します。" />
+          </panel>
+          <panel name="pnl_water">
+            <text name="txt_water">水面</text>
+            <line_editor name="edt_invname_water">不明</line_editor>
+            <settings_drop_target name="sdt_water" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の水として選択する" />
+          </panel>
+          <button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+  <layout_panel name="pnl_environment_region_msg">
+    <text name="region_text_lbl">リージョン（地域）：</text>
+    <text name="region_text">不明</text>
+  </layout_panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 6464a65feb..a2c0e36d41 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,50 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="不動産" name="Estate">
-	<text name="estate_help_text">
-		このタブ内の設定変更は、不動産内のすべての地域に影響します。
-	</text>
-	<text name="estate_text">
-		不動産：
-	</text>
-	<text name="estate_name">
-		（不明）
-	</text>
-	<text name="owner_text">
-		所有者：
-	</text>
-	<text name="estate_owner">
-		（不明）
-	</text>
-	<radio_group name="externally_visible_radio">
-		<radio_item label="アクセスタブに記載された住人とグループのみ許可する" name="estate_restricted_access"/>
-		<radio_item label="誰でも訪問可" name="estate_public_access"/>
-	</radio_group>
-	<check_box label="18 歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産（エステート）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-	<check_box label="支払情報が登録されている必要があります" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-	<check_box label="区画所有者" name="parcel_access_override"/>
-	<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
-	<check_box label="直接テレポートを許可" name="allow_direct_teleport"/>
-	<button label="適用" name="apply_btn"/>
-	<text name="estate_manager_label">
-		不動産マネージャー：
-	</text>
-	<text name="allow_resident_label">
-		常に許可：
-	</text>
-	<button label="追加..." name="add_estate_manager_btn"/>
-	<button label="削除..." name="remove_estate_manager_btn"/>
-	<button label="追加..." name="add_allowed_avatar_btn"/>
-	<button label="削除..." name="remove_allowed_avatar_btn"/>
-	<text name="allow_group_label">
-		グループを常に許可：
-	</text>
-	<text name="ban_resident_label">
-		常に禁止：
-	</text>
-	<button label="追加..." name="add_allowed_group_btn"/>
-	<button label="削除..." name="remove_allowed_group_btn"/>
-	<button label="追加..." name="add_banned_avatar_btn"/>
-	<button label="削除..." name="remove_banned_avatar_btn"/>
-	<button label="メッセージを不動産に送信..." name="message_estate_btn"/>
-	<button label="不動産から住人を追い出す..." name="kick_user_from_estate_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="不動産" name="Estate">
+  <text name="estate_help_text">このタブ内の設定変更は、不動産内のすべてのリージョン（地域）に影響します。</text>
+  <text name="estate_text">不動産：</text>
+  <text name="estate_name">（不明）</text>
+  <text name="owner_text">所有者：</text>
+  <text name="estate_owner">（不明）</text>
+  <radio_group name="externally_visible_radio">
+    <radio_item label="アクセスタブに記載された住人とグループのみ許可する" name="estate_restricted_access" />
+    <radio_item label="誰でも訪問可" name="estate_public_access" />
+  </radio_group>
+  <check_box label="１８歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産（不動産）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE]をご覧ください。" />
+  <check_box label="支払情報が登録されている必要があります" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE]をご覧ください。" />
+  <check_box label="区画所有者" name="parcel_access_override" />
+  <check_box label="ボイスチャットを許可" name="voice_chat_check" />
+  <check_box label="直接テレポートを許可" name="allow_direct_teleport" />
+  <button label="適用" name="apply_btn" />
+  <text name="estate_manager_label">不動産マネージャー：</text>
+  <text name="allow_resident_label">常に許可：</text>
+  <button label="追加…" name="add_estate_manager_btn" />
+  <button label="削除…" name="remove_estate_manager_btn" />
+  <button label="追加…" name="add_allowed_avatar_btn" />
+  <button label="削除…" name="remove_allowed_avatar_btn" />
+  <text name="allow_group_label">グループを常に許可：</text>
+  <text name="ban_resident_label">常に禁止：</text>
+  <button label="追加…" name="add_allowed_group_btn" />
+  <button label="削除…" name="remove_allowed_group_btn" />
+  <button label="追加…" name="add_banned_avatar_btn" />
+  <button label="削除…" name="remove_banned_avatar_btn" />
+  <button label="メッセージを不動産に送信…" name="message_estate_btn" />
+  <button label="不動産から住人を追い出す…" name="kick_user_from_estate_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
index 711b8e7291..f2551a7853 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
@@ -1,33 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="体験" name="Experiences">
-	<panel.string name="trusted_estate_text">
-		どんな体験でもキーになる可能性があります。
+	<panel.string name="trusted_estate_text">どんな体験でもキーになる可能性があります。
 
 キー体験には、この不動産で実行する権限があります。
 
-さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。
-	</panel.string>
-	<panel.string name="allowed_estate_text">
-		ランドスコープとなる体験のみ許可されます。
+さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。</panel.string>
+	<panel.string name="allowed_estate_text">ランドスコープとなる体験のみ許可されます。
 
-許可される体験には、この不動産で実行する権限があります。
-	</panel.string>
-	<panel.string name="blocked_estate_text">
-		グリッドスコープ体験のみブロックできます。
-      
-ブロックされた体験は、この不動産では実行できません。
-	</panel.string>
-	<panel.string name="estate_caption">
-		このタブの設定への変更は、不動産内のすべての地域に影響されます。
-	</panel.string>
-	<panel.string name="allowed_parcel_text">
-		ランドスコープとなる体験のみ許可されます。
-      
-許可された体験には、この不動産でブロックされていない場合、この区画で実行する権限があります。
-	</panel.string>
-	<panel.string name="blocked_parcel_text">
-		住人の体験をブロックできます。
-      
-ブロックされた体験は、この区画では実行できません。
+許可される体験には、この不動産で実行する権限があります。</panel.string>
+	<panel.string name="blocked_estate_text">グリッドスコープ体験のみブロックできます。
+
+ブロックされた体験は、この不動産では実行できません。</panel.string>
+	<panel.string name="estate_caption">このタブの設定への変更は、不動産内のすべての地域に影響されます。
 	</panel.string>
-</panel>
+	<panel.string name="allowed_parcel_text">ランドスコープとなる体験のみ許可されます。
+
+許可された体験には、この不動産でブロックされていない場合、この区画で実行する権限があります。</panel.string>
+	<panel.string name="blocked_parcel_text">住人の体験をブロックできます。
+
+ブロックされた体験は、この区画では実行できません。</panel.string>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index d23007dc6b..1109715ca6 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -1,44 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="地域" name="General">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text left_delta="70" name="region_text">
-		未知
-	</text>
-	<text name="version_channel_text_lbl" width="100">
-		バージョン：
-	</text>
-	<text left_delta="70" name="version_channel_text">
-		不明
-	</text>
-	<text name="region_type_lbl">
-		種類：
-	</text>
-	<text left_delta="70" name="region_type">
-		不明
-	</text>
-	<check_box label="地形編集をブロック" name="block_terraform_check"/>
-	<check_box label="飛行をブロック" name="block_fly_check"/>
-	<check_box label="区画の飛行をブロック" name="block_fly_over_check" tool_tip="アクセス チェックを上方向に拡大し、区画を超える飛行を防ぎます"/>
-	<check_box label="ダメージを許可" name="allow_damage_check"/>
-	<check_box label="プッシュを制限" name="restrict_pushobject"/>
-	<check_box label="土地の再販を許可" name="allow_land_resell_check"/>
-	<check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check"/>
-	<check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です"/>
-	<spinner label="アバター数上限" name="agent_limit_spin"/>
-	<spinner label="物体ボーナス" name="object_bonus_spin"/>
-	<text label="成人指定" name="access_text">
-		区分：
-	</text>
-	<icons_combo_box label="Moderate" name="access_combo">
-		<icons_combo_box.item label="Adult" name="Adult" value="42"/>
-		<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-		<icons_combo_box.item label="General" name="PG" value="13"/>
-	</icons_combo_box>
-	<button label="適用" name="apply_btn"/>
-	<button label="住人 1 名をホームにテレポート..." name="kick_btn"/>
-	<button label="住人全員をホームにテレポート..." name="kick_all_btn"/>
-	<button label="メッセージを地域に送信..." name="im_btn"/>
-	<button label="テレハブの管理..." name="manage_telehub_btn"/>
-</panel>
+<panel label="リージョン（地域）" name="General">
+  <text name="region_text_lbl">リージョン（地域）：</text>
+  <text left_delta="70" name="region_text">未知</text>
+  <text name="version_channel_text_lbl">バージョン：</text>
+  <text left_delta="70" name="version_channel_text">不明</text>
+  <text name="region_type_lbl">種類：</text>
+  <text left_delta="70" name="region_type">不明
+  </text>
+  <check_box label="地形編集をブロック" name="block_terraform_check" />
+  <check_box label="飛行をブロック" name="block_fly_check" />
+  <check_box label="区画の飛行をブロック" name="block_fly_over_check" tool_tip="アクセス チェックを上方向に拡大し、区画を超える飛行を防ぎます" />
+  <check_box label="ダメージを許可" name="allow_damage_check" />
+  <check_box label="プッシュを制限" name="restrict_pushobject" />
+  <check_box label="土地の再販を許可" name="allow_land_resell_check" />
+  <check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check" />
+  <check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です" />
+  <spinner label="アバター数上限" name="agent_limit_spin" />
+  <spinner label="物体ボーナス" name="object_bonus_spin" />
+  <text label="成人指定" name="access_text">区分：</text>
+  <icons_combo_box label="Moderate" name="access_combo">
+    <icons_combo_box.item label="Adult" name="Adult" value="42" />
+    <icons_combo_box.item label="Moderate" name="Mature" value="21" />
+    <icons_combo_box.item label="General" name="PG" value="13" />
+  </icons_combo_box>
+  <button label="適用" name="apply_btn" />
+  <button label="住人 1 名をホームにテレポート…" name="kick_btn" />
+  <button label="住人全員をホームにテレポート…" name="kick_all_btn" />
+  <button label="メッセージを地域に送信…" name="im_btn" />
+  <button label="テレハブの管理…" name="manage_telehub_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index c1080a7d7b..7bff93f105 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -1,60 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="地形" name="Terrain">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<spinner label="水面の高さ" name="water_height_spin"/>
-	<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
-	<spinner label="地形の下降限度" name="terrain_lower_spin"/>
-	<text name="detail_texture_text">
-    地形テクスチャ（1024x1024 の 24 bit .tga ファイル）
-  </text>
-	<text name="height_text_lbl">
-		1（低）
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4（高）
-	</text>
-	<text name="height_text_lbl5">
-		地形の隆起範囲
-	</text>
-	<text name="height_text_lbl10">
-		数値は上のテクスチャのブレンド範囲を示します。
-	</text>
-	<text name="height_text_lbl11">
-		計測単位はメートルで、「低」の値は、1番のテクスチャの高さの「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。
-	</text>
-	<text name="height_text_lbl6">
-		北西
-	</text>
-	<text name="height_text_lbl7">
-		北東
-	</text>
-	<spinner label="低" name="height_start_spin_1"/>
-	<spinner label="低" name="height_start_spin_3"/>
-	<spinner label="高" name="height_range_spin_1"/>
-	<spinner label="高" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		南西
-	</text>
-	<text name="height_text_lbl9">
-		南東
-	</text>
-	<spinner label="低" name="height_start_spin_0"/>
-	<spinner label="低" name="height_start_spin_2"/>
-	<spinner label="高" name="height_range_spin_0"/>
-	<spinner label="高" name="height_range_spin_2"/>
-	<button label="RAW 地形ダウンロード..." name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
-	<button label="RAW 地形アップロード..." name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
-	<button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します"/>
-	<button label="適用" name="apply_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="地形" name="Terrain">
+  <text name="region_text_lbl">地域：</text>
+  <text name="region_text">未知</text>
+  <spinner label="水面の高さ" name="water_height_spin" />
+  <spinner label="地形の上昇限度" name="terrain_raise_spin" />
+  <spinner label="地形の下降限度" name="terrain_lower_spin" />
+  <text name="detail_texture_text">地形テクスチャ（1024✕1024 の 24 bit .tga ファイル）</text>
+  <text name="height_text_lbl">１（低）</text>
+  <text name="height_text_lbl2">２</text>
+  <text name="height_text_lbl3">３</text>
+  <text name="height_text_lbl4">４（高）</text>
+  <text name="height_text_lbl5">地形の隆起範囲</text>
+  <text name="height_text_lbl10">数値は上のテクスチャのブレンド範囲を示します。</text>
+  <text name="height_text_lbl11">計測単位はメートルで、「低」の値は、１番のテクスチャの高さの「最大値」です。「高」の値は、４番のテクスチャの高さの「最低値」です。</text>
+  <text name="height_text_lbl6">北西</text>
+  <text name="height_text_lbl7">北東</text>
+  <spinner label="低" name="height_start_spin_1" />
+  <spinner label="低" name="height_start_spin_3" />
+  <spinner label="高" name="height_range_spin_1" />
+  <spinner label="高" name="height_range_spin_3" />
+  <text name="height_text_lbl8">南西</text>
+  <text name="height_text_lbl9">南東</text>
+  <spinner label="低" name="height_start_spin_0" />
+  <spinner label="低" name="height_start_spin_2" />
+  <spinner label="高" name="height_range_spin_0" />
+  <spinner label="高" name="height_range_spin_2" />
+  <button label="RAW 地形ダウンロード…" name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
+  <button label="RAW 地形アップロード…" name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
+  <button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します" />
+  <button label="適用" name="apply_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index 3aa20d0a3c..c2fd022564 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
@@ -1,51 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="script panel">
-	<panel.string name="loading">
-		ローディング...
-	</panel.string>
-	<panel.string name="can_not_view">
-		このスクリプトは「コピー不可」のため、表示・編集することができません。 オブジェクト内のスクリプトの表示・編集には、全権限が必要です。
-	</panel.string>
-	<panel.string name="public_objects_can_not_run">
-		公共のオブジェクトではスクリプトを実行できません
-	</panel.string>
-	<panel.string name="script_running">
-		実行中
-	</panel.string>
-	<panel.string name="Title">
-		スクリプト： [NAME]
-	</panel.string>
-	<panel.string name="external_editor_not_set">
-		環境変数 LL_SCRIPT_EDITOR または ExternalEditor を設定してエディターを選択します。
-	</panel.string>
-	<menu_bar name="script_menu">
-		<menu label="ファイル" name="File">
-			<menu_item_call label="保存" name="Save"/>
-			<menu_item_call label="変更を元に戻す" name="Revert All Changes"/>
-			<menu_item_call label="ファイルからロード..." name="LoadFromFile"/>
-			<menu_item_call label="ファイルに保存..." name="SaveToFile"/>
-			<menu_item_call label="色..." name="Colors"/>
-		</menu>
-		<menu label="編集" name="Edit">
-			<menu_item_call label="元に戻す" name="Undo"/>
-			<menu_item_call label="やり直し" name="Redo"/>
-			<menu_item_call label="切り取り" name="Cut"/>
-			<menu_item_call label="コピー" name="Copy"/>
-			<menu_item_call label="貼り付け" name="Paste"/>
-			<menu_item_call label="すべて選択" name="Select All"/>
-			<menu_item_call label="選択解除" name="Deselect"/>
-			<menu_item_call label="検索 / 再配置..." name="Search / Replace..."/>
-			<menu_item_call label="行に移動..." name="Go to line..."/>
-		</menu>
-		<menu label="ヘルプ" name="Help">
-			<menu_item_call label="ヘルプ..." name="Help..."/>
-			<menu_item_call label="キーワードヘルプ..." name="Keyword Help..."/>
-		</menu>
-	</menu_bar>
-	<script_editor name="Script Editor">
-		ローディング...
-	</script_editor>
-	<combo_box label="挿入..." name="Insert..."/>
-	<button label="保存" label_selected="保存" name="Save_btn"/>
-	<button label="編集..." name="Edit_btn"/>
-</panel>
+  <panel.string name="loading">読み込んでいます…</panel.string>
+  <panel.string name="can_not_view">このスクリプトは「コピー不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。</panel.string>
+  <panel.string name="public_objects_can_not_run">公共オブジェクトで、スクリプトを実行することはできません。</panel.string>
+  <panel.string name="script_running">実行中</panel.string>
+  <panel.string name="Title">スクリプト：[NAME]</panel.string>
+  <panel.string name="external_editor_not_set">環境変数 LL_SCRIPT_EDITOR か、外部のエディタを指定して、編集に使うアプリケーションを選択します。</panel.string>
+  <menu_bar name="script_menu">
+    <menu label="ファイル" name="File">
+      <menu_item_call label="保存" name="Save" />
+      <menu_item_call label="復帰" name="Revert All Changes" />
+      <menu_item_call label="ファイルを開く…" name="LoadFromFile" />
+      <menu_item_call label="ファイルへ保存…" name="SaveToFile" />
+      <menu_item_call label="色…" name="Colors" />
+    </menu>
+    <menu label="編集" name="Edit">
+      <menu_item_call label="取り消し" name="Undo" />
+      <menu_item_call label="やり直し" name="Redo" />
+      <menu_item_call label="カット" name="Cut" />
+      <menu_item_call label="コピー" name="Copy" />
+      <menu_item_call label="ペースト" name="Paste" />
+      <menu_item_call label="すべて選択" name="Select All" />
+      <menu_item_call label="選択解除" name="Deselect" />
+      <menu_item_call label="検索／再配置…" name="Search / Replace..." />
+      <menu_item_call label="行に移動…" name="Go to line..." />
+    </menu>
+    <menu label="ヘルプ" name="Help">
+      <menu_item_call label="ヘルプ…" name="Help..." />
+      <menu_item_call label="キーワードヘルプ…" name="Keyword Help..." />
+    </menu>
+  </menu_bar>
+  <script_editor name="Script Editor">読み込んでいます…</script_editor>
+  <combo_box label="挿入…" name="Insert..." />
+  <button label="保存" label_selected="保存" name="Save_btn" />
+  <button label="編集…" name="Edit_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_experience.xml b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
index eb8a510b20..5b89d3280c 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="script_experience" title="体験">
-	<button label="体験" name="Expand Experience"/>
-	<check_box label="体験を使用" name="enable_xp"/>
-	<layout_stack name="xp_details">
-		<layout_panel>
-			<combo_box label="体験を選択..." name="Experiences..."/>
-		</layout_panel>
-	</layout_stack>
-	<text name="No Experiences">
-		体験の貢献者ではありません。
-	</text>
-</panel>
+  <button label="体験" name="Expand Experience" />
+  <check_box label="体験を使用" name="enable_xp" />
+  <layout_stack name="xp_details">
+    <layout_panel>
+      <combo_box label="体験を選択…" name="Experiences..." />
+    </layout_panel>
+  </layout_stack>
+  <text name="No Experiences">体験の貢献者ではありません。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
index 494884c187..4f31966f8d 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
@@ -1,16 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="マイ アバター" name="script_limits_my_avatar_panel">
-	<text name="script_memory">
-		アバターのスクリプト使用
-	</text>
-	<text name="loading_text">
-		ローディング...
-	</text>
-	<scroll_list name="scripts_list">
-		<scroll_list.columns label="サイズ （kb）" name="size" width="90"/>
-		<scroll_list.columns label="URL" name="urls"/>
-		<scroll_list.columns label="オブジェクト名" name="name"/>
-		<scroll_list.columns label="場所" name="location"/>
-	</scroll_list>
-	<button label="リスト更新" name="refresh_list_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="自分のアバター" name="script_limits_my_avatar_panel">
+  <text name="script_memory">アバターのスクリプト使用</text>
+  <text name="loading_text">読み込んでいます…</text>
+  <scroll_list name="scripts_list">
+    <scroll_list.columns label="サイズ （㎅）" name="size" />
+    <scroll_list.columns label="ＵＲＬ" name="urls" />
+    <scroll_list.columns label="オブジェクト名" name="name" />
+    <scroll_list.columns label="場所" name="location" />
+  </scroll_list>
+  <button label="リスト更新" name="refresh_list_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
index d91eba9699..288a03d346 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="リージョンメモリ" name="script_limits_region_memory_panel">
-	<text name="script_memory">
-		区画スクリプトメモリ
-	</text>
-	<text name="parcels_listed"/>
-	<text name="memory_used"/>
-	<text name="loading_text">
-		ローディング...
-	</text>
-	<scroll_list name="scripts_list">
-		<scroll_list.columns label="サイズ （kb）" name="size" width="90"/>
-		<scroll_list.columns label="URL" name="urls"/>
-		<scroll_list.columns label="オブジェクト名" name="name"/>
-		<scroll_list.columns label="オブジェクトの所有者" name="owner" width="120"/>
-		<scroll_list.columns label="区画" name="parcel"/>
-		<scroll_list.columns label="場所" name="location"/>
-	</scroll_list>
-	<button label="リスト更新" name="refresh_list_btn"/>
-	<button label="ハイライト" name="highlight_btn"/>
-	<button label="返却" name="return_btn"/>
-</panel>
+  <text name="script_memory">区画スクリプトメモリ</text>
+  <text name="parcels_listed" />
+  <text name="memory_used" />
+  <text name="loading_text">読み込んでいます…</text>
+  <scroll_list name="scripts_list">
+    <scroll_list.columns label="サイズ （㎅）" name="size"/>
+    <scroll_list.columns label="ＵＲＬ" name="urls" />
+    <scroll_list.columns label="オブジェクト名" name="name" />
+    <scroll_list.columns label="オブジェクトの所有者" name="owner" />
+    <scroll_list.columns label="区画" name="parcel" />
+    <scroll_list.columns label="場所" name="location" />
+  </scroll_list>
+  <button label="リスト更新" name="refresh_list_btn" />
+  <button label="ハイライト" name="highlight_btn" />
+  <button label="返却" name="return_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
index a2d0237da0..2e0e28a607 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel label="script_question_panel" name="panel_script_question_toast">
-	<panel label="buttons_panel" name="buttons_panel"/>
-</panel>
+  <panel label="buttons_panel" name="buttons_panel" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
index b698fa762d..bc008da255 100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="LLScrollingPanelParam">
-	<text name="Loading...">
-		ロード中．．．
-	</text>
-	<text name="Loading...2">
-		ロード中．．．
-	</text>
-	<button label="" label_selected="" name="less" />
-	<button label="" label_selected="" name="more" />
-	<slider label="[DESC]" name="param slider" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="LLScrollingPanelParam">
+  <text name="Loading...">読み込んでいます…</text>
+  <text name="Loading...2">読み込んでいます…</text>
+  <button label="" label_selected="" name="less" />
+  <button label="" label_selected="" name="more" />
+  <slider label="[DESC]" name="param slider" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
index fa659040ea..96903d9e61 100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="LLScrollingPanelParamBase">
-	<slider label="[DESC]" name="param slider"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="LLScrollingPanelParamBase">
+  <slider label="[DESC]" name="param slider" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
index 56fab14f7c..2ee9031359 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
@@ -1,2 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="大気＆光" name="panel_settings_sky_atmos"/>
+<panel label="大気と雷" name="panel_settings_sky_atmos">
+  <layout_stack follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
+    <layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="75">
+
+      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">アンビエントカラー：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="ambient_light" top_pad="5" width="60" />
+      <text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">青のホライズン：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_horizon" top_pad="5" width="60" />
+      <text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">青の濃度：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_density" top_pad="5" width="60" />
+    </layout_panel>
+    <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true">
+      <layout_stack name="atmosphere1" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="hoizontal">
+        <layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
+          <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">霞の地平線：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_delta="20" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">霞の密度:</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_delta="20" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">水分レベル：</text>
+          <slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="moisture_level" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">液滴半径：</text>
+          <slider decimal_digits="2" follows="left|top" height="14" increment="0.01" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="5.0" max_val="1000.0" name="droplet_radius" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">氷のレベル：</text>
+          <slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="ice_level" width="207" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">シーンのガンマ値：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_delta="20" width="207" can_edit_text="true" />
+        </layout_panel>
+        <layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
+          <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">密度乗数：</text>
+          <slider decimal_digits="4" follows="left|top" height="16" increment="0.0001" initial_value="0" layout="topleft" left_delta="5" min_val="0.0001" max_val="2" name="density_multip" top_delta="20" width="219" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">距離乗数：</text>
+          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.8" layout="topleft" left_delta="5" min_val="0.05" max_val="1000" name="distance_multip" top_delta="20" width="219" can_edit_text="true" />
+          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">最大高度：</text>
+          <slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="10000" name="max_alt" top_delta="20" width="219" can_edit_text="true" />
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
index 232530c5f8..c1c54d2c9c 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
@@ -1,13 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="雲" name="panel_settings_sky_clouds">
-	<layout_stack>
-		<layout_panel>
-			<slider label="X" name="cloud_density_x"/>
-			<slider label="Y" name="cloud_density_y"/>
-			<slider label="D" name="cloud_density_d"/>
-			<slider label="X" name="cloud_detail_x"/>
-			<slider label="Y" name="cloud_detail_y"/>
-			<slider label="D" name="cloud_detail_d"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack >
+    <layout_panel>
+      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">雲の色：</text>
+      <color_swatch name="cloud_color" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="0" top_delta="47" width="200">雲の量：</text>
+      <slider name="cloud_coverage" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲のスケール：</text>
+      <slider name="cloud_scale" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲の分散：</text>
+      <slider name="cloud_variance" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲の移動：</text>
+      <xy_vector name="cloud_scroll_xy" />
+
+      <text follows="left|top" height="10" layout="topleft" left_delta="160" top_delta="-20" width="200">雲の画像：</text>
+      <texture_picker name="cloud_map" />
+    </layout_panel>
+    <layout_panel>
+      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">雲の密度：</text>
+      <slider label="Ｘ" name="cloud_density_x"/>
+      <slider label="Ｙ" name="cloud_density_y" />
+      <slider label="密度" name="cloud_density_d" />
+      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="35" width="200">雲の詳細：</text>
+      <slider label="Ｘ" name="cloud_detail_x" />
+      <slider label="Ｙ" name="cloud_detail_y" />
+      <slider label="密度" name="cloud_detail_d" />
+    </layout_panel>
+  </layout_stack>
+</panel>                
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
index cb746d8792..4ffae24e0b 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="密度" name="panel_settings_sky_density">
-	<layout_stack>
-		<layout_panel>
-			<slider label="レイリー指数項：" name="rayleigh_exponential"/>
-			<slider label="レイリー指数スケール：" name="rayleigh_exponential_scale"/>
-			<slider label="レイリー線形項：" name="rayleigh_linear"/>
-			<slider label="レイリー定数項：" name="rayleigh_constant"/>
-			<slider label="レイリー最大高度：" name="rayleigh_max_altitude"/>
-		</layout_panel>
-		<layout_panel>
-			<slider label="レイリー指数項：" name="mie_exponential"/>
-			<slider label="Mie 指数スケール：" name="mie_exponential_scale"/>
-			<slider label="Mie 線形項：" name="mie_linear"/>
-			<slider label="Mie 定数項：" name="mie_constant"/>
-			<slider label="Mie 不等要素：" name="mie_aniso_factor"/>
-			<slider label="Mie 最大高度：" name="mie_max_altitude"/>
-		</layout_panel>
-		<layout_panel>
-			<slider label="吸収指数項：" name="absorption_exponential"/>
-			<slider label="吸収指数スケール：" name="absorption_exponential_scale"/>
-			<slider label="吸収線形項：" name="absorption_linear"/>
-			<slider label="吸収定数項：" name="absorption_constant"/>
-			<slider label="吸収最大高度：" name="absorption_max_altitude"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack>
+    <layout_panel>
+      <slider name="rayleigh_exponential" label="レイリー指数項：" />
+      <slider name="rayleigh_exponential_scale" label="レイリー指数スケール：" />
+      <slider name="rayleigh_linear" label="レイリー線形項：" />
+      <slider name="rayleigh_constant" label="レイリー定数項：" />
+      <slider name="rayleigh_max_altitude" label="レイリー最大高度：" />
+    </layout_panel>
+    <layout_panel>
+      <slider name="mie_exponential" label="Mie指数項：" />
+      <slider name="mie_exponential_scale" label="Mie指数スケール：" />
+      <slider name="mie_linear" label="Mie線形期間：" />
+      <slider name="mie_constant" label="Mie定数項：" />
+      <slider name="mie_aniso_factor" label="Mieアニソ係数：" />
+      <slider name="mie_max_altitude" label="Mieの最高高度：" />
+    </layout_panel>
+    <layout_panel>
+      <slider name="absorption_exponential" label="吸収指数項：" />
+      <slider name="absorption_exponential_scale" label="吸収指数スケール：" />
+      <slider name="absorption_linear" label="吸収線形項：" />
+      <slider name="absorption_constant" label="吸収定数項：" />
+      <slider name="absorption_max_altitude" label="吸収最大高度：" />
+    </layout_panel>
+  </layout_stack>
+</panel> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
index e5026dc9fd..addcb378ae 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
@@ -1,15 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="太陽＆月" name="panel_settings_sky_hbodies">
-	<layout_stack>
-		<layout_panel name="sun_layout">
-			<check_box label="ビーコンを表示" name="sunbeacon"/>
-		</layout_panel>
-		<layout_panel>
-			<layout_stack>
-				<layout_panel name="moon_layout">
-					<check_box label="ビーコンを表示" name="moonbeacon"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<panel name="panel_settings_sky_hbodies">
+  <layout_stack name="main_ls">
+    <layout_panel name="sun_layout">
+      <text name="sun_stars_label">太陽＆星</text>
+      <text name="position_label">位置：</text>
+      <sun_moon_trackball name="sun_rotation" />
+      <text name="image_label">画像：</text>
+      <texture_picker name="sun_image" />
+      <text name="scale_label">スケール：</text>
+      <slider name="sun_scale" />
+      <text name="color_label">色：</text>
+      <color_swatch name="sun_moon_color" />
+      <text name="sun_azimuth_label">方位角：</text>
+      <slider name="sun_azimuth" />
+      <text name="sun_elevation_label">標高：</text>
+      <slider name="sun_elevation" />
+      <text name="glow_focus_label">グローフォーカス：</text>
+      <slider name="glow_focus" />
+      <text name="glow_size_label">グローサイズ：</text>
+      <slider name="glow_size" />
+      <text name="star_brightness_label">星の輝度：</text>
+      <slider name="star_brightness" />
+
+      <check_box label="ビーコンを表示" name="sunbeacon" />
+
+    </layout_panel>
+    <layout_panel name="moon_layout">
+      <layout_stack name="moon_stack">
+        <layout_panel name="moon_layout">
+          <text name="moon_label">月</text>
+          <text name="position_label">位置：</text>
+          <sun_moon_trackball name="moon_rotation" />
+          <text name="moon_image_label">画像：</text>
+          <texture_picker name="moon_image" />
+          <text name="scale_label">スケール：</text>
+          <slider name="moon_scale" />
+          <text name="moon_azimuth_label">方位角：</text>
+          <slider name="moon_azimuth" />
+          <text name="moon_elevation_label">標高：</text>
+          <slider name="moon_elevation" />
+          <text name="brightness_label">輝度：</text>
+          <slider name="moon_brightness" />
+          <check_box label="ビーコンを表示" name="moonbeacon" />
+
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</panel>                
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_water.xml b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
index 20341fcb8d..21b434d11a 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
@@ -1,19 +1,49 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="水" name="panel_settings_water">
-	<layout_stack name="water_stack1">
-		<layout_panel>
-			<text name="FresnelOffsetText">
-				フレネル・オフセット：
-			</text>
-		</layout_panel>
-		<layout_panel>
-			<layout_stack name="water_stack2">
-				<layout_panel>
-					<slider label="X：" name="water_normal_scale_x"/>
-					<slider label="Y：" name="water_normal_scale_y"/>
-					<slider label="Z：" name="water_normal_scale_z"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
+  <layout_stack name="water_stack1" follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
+    <layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="105">
+      <text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">水中のフォグ：</text>
+      <text follows="left|top" height="10" layout="left|top" left_delta="15" top_delta="0" width="60">色：</text>
+      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="water_fog_color" top_pad="5" width="60" />
+      <text follows="left|top" height="10" top_delta="-15" left_delta="80" width="150">密度指数：</text>
+      <slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="-10" max_val="10" name="water_fog_density" top_delta="5" width="150" can_edit_text="true"/>
+      <text follows="left|top" height="10" top_delta="25" left_delta="-15" width="150">水中の修飾子：</text>
+      <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="0.0" max_val="20.0" name="water_underwater_mod" top_delta="20" width="150" can_edit_text="true"/>
+
+      <text follows="left|top|right" height="10" layout="topleft" left_delta="165" top_delta="-53" width="150">フレネル係数：</text>
+      <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.7" layout="topleft" left_delta="5" name="water_fresnel_scale" top_delta="15" width="150" can_edit_text="true"/>
+      <text follows="left|top|right" layout="topleft" left_delta="-5" name="FresnelOffsetText" top_delta="25" width="150">フレネルオフセット：</text>
+      <slider decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" left_delta="5" name="water_fresnel_offset" top_pad="5" width="150" can_edit_text="true"/>
+
+    </layout_panel>
+    <layout_panel auto_resize="true" user_resize="false" visible="true">
+      <layout_stack name="water_stack2" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="horizontal">
+        <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="460" width="50">
+          <text follows="left|top|right" height="16" layout="topleft" left="15" top="5" width="215">ノーマルマップ</text>
+          <texture_picker height="84" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="61"/>
+
+          <text follows="left|top" height="16" width="120" layout="topleft" top_delta="-20" left_delta="175">大波の速度</text>
+          <xy_vector follows="top|left" name="water_wave1_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" increment_x="0.01f" min_val_y="-20" max_val_y="20" increment_y="0.01f" arrow_color="white"/>
+
+          <text follows="left|top" height="16" layout="topleft" top_delta="-20" left_delta="140">小波の速度</text>
+          <xy_vector follows="top|left" name="water_wave2_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" min_val_y="-20" max_val_y="20" increment_x="0.01f" increment_y="0.01f" arrow_color="white"/>
+
+          <text follows="left|top|right" height="16" layout="topleft" left="10" top="90" width="215">さざ波の反射係数</text>
+          <slider decimal_digits="1" follows="left|top" increment="0.01" height="16" initial_value="0.7" layout="topleft" label="Ｘ：" left_delta="10" max_val="10" name="water_normal_scale_x" top_pad="5" width="150" can_edit_text="true"/>
+          <slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_y" top_pad="6" label="Ｙ：" width="150" can_edit_text="true"/>
+          <slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_z" top_pad="6" label="Ｚ：" width="150" can_edit_text="true"/>
+
+        </layout_panel>
+        <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" width="50" visible="true">
+          <text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">反射とブラー：</text>
+          <text follows="left|top|right" height="16" layout="topleft" top_delta="25" left_delta="5" width="215">反射係数（上）</text>
+          <slider control_name="water_scale_above" decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.1" height="16" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_above" top_pad="5" width="200" can_edit_text="true" />
+          <text type="string" length="1" follows="left|top|right" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">反射係数（下）</text>
+          <slider control_name="water_scale_below" decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_below" top_pad="5" width="200" can_edit_text="true"/>
+          <text follows="left|top|right" font="SansSerif" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">ブラー乗数</text>
+          <slider control_name="water_blur_multip" follows="left|top" height="16" increment="0.001" initial_value="0" layout="topleft" left_delta="5" min_val="-0.5" max_val="0.5" name="water_blur_multip" top_pad="5" width="200" can_edit_text="true"/>
+        </layout_panel>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
+</panel>     
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
index d06db8ccb1..4bc7411e35 100644
--- a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="sidetray_tab_panel">
-	<text name="sidetray_tab_title" value="サイドパネル"/>
-	<button name="undock" tool_tip="切り離す"/>
-	<button name="dock" tool_tip="ドッキング"/>
-	<button name="show_help" tool_tip="ヘルプを表示"/>
-</panel>
+  <text name="sidetray_tab_title" value="サイドパネル" />
+  <button name="undock" tool_tip="切り離す" />
+  <button name="dock" tool_tip="ドッキング" />
+  <button name="show_help" tool_tip="ヘルプを表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index ea17cd6526..e231a3565b 100644
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
@@ -1,38 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Part of side tray, see that XML file for panel config -->
 <panel label="home_tab" name="home_tab">
-	<scroll_container name="profile_scroll">
-		<panel name="profile_scroll_panel">
-			<panel name="sidebar_people">
-				<text name="tab_name" value="人"/>
-				<text name="tab_description">
-					あなたのフレンド、グループ、連絡先、近くの人を探します。
-				</text>
-			</panel>
-			<panel name="sidebar_places">
-				<text name="tab_name" value="場所"/>
-				<text name="tab_description">
-					行きたい場所、行ったことのある場所を探します。
-				</text>
-			</panel>
-			<panel name="sidebar_me">
-				<text name="tab_name" value="マイ プロフィール"/>
-				<text name="tab_description">
-					あなたの公開プロフィールを編集します。
-				</text>
-			</panel>
-			<panel name="sidebar_appearance">
-				<text name="tab_name" value="容姿"/>
-				<text name="tab_description">
-					あなたの容姿や現在の見た目を変更します。
-				</text>
-			</panel>
-			<panel name="sidebar_inventory">
-				<text name="tab_name" value="持ち物"/>
-				<text name="tab_description">
-					あなたの持ち物を眺めます。
-				</text>
-			</panel>
-		</panel>
-	</scroll_container>
-</panel>
+  <scroll_container name="profile_scroll">
+    <panel name="profile_scroll_panel">
+      <panel name="sidebar_people">
+        <text name="tab_name" value="人物" />
+        <text name="tab_description">あなたのフレンド、グループ、連絡先、近隣の人物を探します。</text>
+      </panel>
+      <panel name="sidebar_places">
+        <text name="tab_name" value="場所" />
+        <text name="tab_description">行きたい場所、行ったことのある場所を探します。</text>
+      </panel>
+      <panel name="sidebar_me">
+        <text name="tab_name" value="プロフィール" />
+        <text name="tab_description">公開プロフィールを編集します。</text>
+      </panel>
+      <panel name="sidebar_appearance">
+        <text name="tab_name" value="容姿" />
+        <text name="tab_description">現在の見た目を変更します。</text>
+      </panel>
+      <panel name="sidebar_inventory">
+        <text name="tab_name" value="持ち物" />
+        <text name="tab_description">現在の持ち物を確認します。</text>
+      </panel>
+    </panel>
+  </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index 32aeca0026..1a1af17e18 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -1,21 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_inventory">
-	<text name="title">
-		インベントリ
-	</text>
-	<text name="hint_lbl">
-		画像をインベントリに保存するには L$[UPLOAD_COST] の費用がかかります。画像をテクスチャとして保存するには平方形式の 1 つを選択してください。
-	</text>
-	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item label="現在のウィンドウ (512x512)" name="CurrentWindow"/>
-		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
-		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
-		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="inventory_snapshot_width"/>
-	<spinner label="" name="inventory_snapshot_height"/>
-	<check_box label="縦横比の固定" name="inventory_keep_aspect_check"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="保存" name="save_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_inventory">
+  <icon name="title_icon" />
+  <text name="title">インベントリに保存</text>
+  <view_border name="hr" />
+  <combo_box label="解像度" name="texture_size_combo">
+    <combo_box.item label="現在のウィンドウ (512✕512)" name="CurrentWindow" />
+    <combo_box.item label="小（128✕128）" name="Small(128x128)" />
+    <combo_box.item label="中（256✕256）" name="Medium(256x256)" />
+    <combo_box.item label="大（512✕512）" name="Large(512x512)" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="inventory_snapshot_width" />
+  <spinner label="" name="inventory_snapshot_height" />
+  <check_box label="縦横比の固定" name="inventory_keep_aspect_check" />
+  <text name="hint_lbl">画像をテクスチャとして保存する場合は、いずれかの正方形を選択してください。</text>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="保存" name="save_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
index d23056a3d5..f6d9025f10 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_local">
-	<text name="title">
-		ディスク
-	</text>
-	<combo_box label="解像度" name="local_size_combo">
-		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
-		<combo_box.item label="320x240" name="320x240"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="1280x1024" name="1280x1024"/>
-		<combo_box.item label="1600x1200" name="1600x1200"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="local_snapshot_width"/>
-	<check_box label="縦横比の固定" name="local_keep_aspect_check"/>
-	<text name="local_format_label">
-		フォーマット：
-	</text>
-	<combo_box label="書式" name="local_format_combo">
-		<combo_box.item label="PNG（可逆圧縮）" name="PNG"/>
-		<combo_box.item label="JPEG" name="JPEG"/>
-		<combo_box.item label="BMP（可逆圧縮）" name="BMP"/>
-	</combo_box>
-	<slider label="品質：" name="image_quality_slider"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<flyout_button label="保存" name="save_btn" tool_tip="画像をファイルに保存">
-		<flyout_button.item label="保存" name="save_item"/>
-		<flyout_button.item label="別名で保存..." name="saveas_item"/>
-	</flyout_button>
-</panel>
+  <text name="title">ディスクに保存</text>
+  <combo_box label="解像度" name="local_size_combo">
+    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
+    <combo_box.item label="320✕240" name="320x240" />
+    <combo_box.item label="640✕480" name="640x480" />
+    <combo_box.item label="800✕600" name="800x600" />
+    <combo_box.item label="1024✕768" name="1024x768" />
+    <combo_box.item label="1280✕1024" name="1280x1024" />
+    <combo_box.item label="1600✕1200" name="1600x1200" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="local_snapshot_width" />
+  <check_box label="縦横比の固定" name="local_keep_aspect_check" />
+  <text name="local_format_label">形式：</text>
+  <combo_box label="ファイル形式" name="local_format_combo">
+    <combo_box.item label="PNG（可逆圧縮）" name="PNG" />
+    <combo_box.item label="JPEG" name="JPEG" />
+    <combo_box.item label="BMP（可逆圧縮）" name="BMP" />
+  </combo_box>
+  <slider label="品質：" name="image_quality_slider" />
+  <button label="キャンセル" name="cancel_btn" />
+  <flyout_button label="保存" name="save_btn" tool_tip="画像をファイルとして保存">
+    <flyout_button.item label="保存" name="save_item" />
+    <flyout_button.item label="名前をつけて保存…" name="saveas_item" />
+  </flyout_button>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index f222a4d61a..df00d0610f 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
-	<button label="ディスクに保存" name="save_to_computer_btn"/>
-	<button label="持ち物に保存（L$[AMOUNT]）" name="save_to_inventory_btn"/>
-	<button label="プロフィールフィードで共有する" name="save_to_profile_btn"/>
-	<button label="Facebook でシェア" name="send_to_facebook_btn"/>
-	<button label="Twitter で共有する" name="send_to_twitter_btn"/>
-	<button label="Flickr で共有する" name="send_to_flickr_btn"/>
-	<button label="メールにより送信" name="save_to_email_btn"/>
-</panel>
+  <button label="ディスクに保存" name="save_to_computer_btn" />
+  <button label="インベントリに保存（L$ [AMOUNT]）" name="save_to_inventory_btn" />
+  <button label="プロフィールフィードで共有する" name="save_to_profile_btn" />
+  <button label="メールで送信" name="save_to_email_btn" />
+  <text name="fee_hint_lbl">料金はサブスクリプションレベルに基づきます。レベルが高くなるほど、料金は安くなります。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
index 569c07ad47..0b05219433 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		[SECOND_LIFE] からのポストカードです。
-	</string>
-	<string name="default_message">
-		ぜひご覧ください！
-	</string>
-	<string name="upload_message">
-		送信中...
-	</string>
-	<text name="title">
-		E メール
-	</text>
-	<tab_container name="postcard_tabs">
-		<panel label="メッセージ" name="panel_postcard_message"/>
-		<panel label="設定" name="panel_postcard_settings"/>
-	</tab_container>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="送信" name="send_btn"/>
-</panel>
+  <string name="default_subject">[SECOND_LIFE]からのポストカードです。</string>
+  <string name="default_message">ぜひご覧ください！</string>
+  <string name="upload_message">送信中…</string>
+  <text name="title">Ｅメール</text>
+  <tab_container name="postcard_tabs">
+    <panel label="メッセージ" name="panel_postcard_message" />
+    <panel label="設定" name="panel_postcard_settings" />
+  </tab_container>
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="送信" name="send_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
index 80d400c846..a7dd3649ec 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_profile">
-	<text name="title">
-		プロフィール
-	</text>
-	<combo_box label="解像度" name="profile_size_combo">
-		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="カスタム" name="Custom"/>
-	</combo_box>
-	<spinner label="横幅 x 高さ" name="profile_snapshot_width"/>
-	<check_box label="縦横比の固定" name="profile_keep_aspect_check"/>
-	<text name="caption_label">
-		キャプション：
-	</text>
-	<check_box initial_value="true" label="場所を含む" name="add_location_cb"/>
-	<button label="取り消し" name="cancel_btn"/>
-	<button label="投稿" name="post_btn"/>
-</panel>
+  <text name="title">プロフィール</text>
+  <combo_box label="解像度" name="profile_size_combo">
+    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
+    <combo_box.item label="640✕480" name="640x480" />
+    <combo_box.item label="800✕600" name="800x600" />
+    <combo_box.item label="1024✕768" name="1024x768" />
+    <combo_box.item label="カスタム" name="Custom" />
+  </combo_box>
+  <spinner label="横幅✕高さ" name="profile_snapshot_width" />
+  <check_box label="縦横比の固定" name="profile_keep_aspect_check" />
+  <text name="caption_label">キャプション：</text>
+  <check_box label="場所を含む" name="add_location_cb" />
+  <button label="キャンセル" name="cancel_btn" />
+  <button label="投稿" name="post_btn" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index d57e6c796c..92d5215988 100644
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel label="機器の設定" name="device_settings_panel">
-	<panel.string name="default_text">
-		デフォルト
-	</panel.string>
-	<string name="name_no_device">
-		機器が設定されていません
-	</string>
-	<string name="name_default_system_device">
-		デフォルトのシステム機器
-	</string>
-	<text name="Input">
-		入力
-	</text>
-	<text name="Output">
-		出力
-	</text>
-	<text name="My volume label">
-		マイク音量:
-	</text>
-	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します"/>
-	<text name="wait_text">
-		しばらくお待ちください。
-	</text>
-</panel>
+  <panel.string name="default_text">デフォルト</panel.string>
+  <string name="name_no_device">機器が設定されていません。</string>
+  <string name="name_default_system_device">デフォルトのシステム機器</string>
+  <text name="Input">入力</text>
+  <text name="Output">出力</text>
+  <text name="My volume label">マイク音量：</text>
+  <slider_bar name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します。" />
+  <text name="wait_text">しばらくお待ちください。</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
index 2308aff19b..d26b6c7161 100644
--- a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
-<panel name="panel_stand_stop_flying">
-	<button label="立ち上がる" name="stand_btn" tool_tip="ここをクリックして立ち上がります。"/>
-	<button label="飛行停止" name="stop_fly_btn" tool_tip="飛行停止"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Width and height of this panel should be synchronized with "panel_modes" in the
+floater_moveview.xml-->
+<panel name="panel_stand_stop_flying">
+  <button label="立ち上がる" name="stand_btn" tool_tip="ここをクリックして立ち上がります。" />
+  <button label="飛行停止" name="stop_fly_btn" tool_tip="飛行停止" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 139c4d7fdd..b4e129ab03 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="status">
-	<panel.string name="packet_loss_tooltip">
-		パケット損失
-	</panel.string>
-	<panel.string name="bandwidth_tooltip">
-		帯域幅
-	</panel.string>
-	<panel.string name="time">
-		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
-	</panel.string>
-	<panel.string name="timeTooltip">
-		[year, datetime, slt] [month, datetime, slt] [day, datetime, slt] （[weekday, datetime, slt]）
-	</panel.string>
-	<panel.string name="buycurrencylabel">
-		L$ [AMT]
-	</panel.string>
-	<panel name="menu_search_panel">
-		<search_editor label="メニューの検索" name="search_menu_edit" tool_tip="検索したい内容をここに入力してください。メニューに部分的に一致する結果が表示されます。"/>
-	</panel>
-	<panel left="-391" name="balance_bg" width="160">
-		<text name="balance" tool_tip="クリックして L$ 残高を更新" value="L$??"/>
-		<button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/>
-		<button label="店" name="goShop" tool_tip="Second Life マーケットプレイスを開く" width="40"/>
-	</panel>
-	<text name="TimeText" tool_tip="現在時刻（太平洋）">
-		24:00 AM PST
-	</text>
-	<button name="media_toggle_btn" tool_tip="すべてのメディアを開始・停止（音楽、ビデオ、Web ページ）"/>
-	<button name="volume_btn" tool_tip="グローバル音量設定"/>
-</panel>
+<panel name="status" title="ステータスバー">
+  <panel.string name="packet_loss_tooltip">パケット損失</panel.string>
+  <panel.string name="bandwidth_tooltip">帯域幅</panel.string>
+  <panel.string name="time">[ampm, datetime, slt]　[hour12, datetime, slt]：[min, datetime, slt]　[timezone,datetime, slt]</panel.string>
+  <panel.string name="timeTooltip">[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日（[weekday, datetime, slt]）</panel.string>
+  <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
+  <panel name="menu_search_panel">
+    <search_editor label="メニューの検索" name="search_menu_edit" tool_tip="検索したい内容をここに入力してください。メニューに部分的に一致する結果が表示されます。" />
+  </panel>
+  <panel name="balance_bg">
+    <text tool_tip="クリックしてL$残高を更新" value="L$ ??" />
+    <!-- 以下２行のWidthは消さないこと -->
+    <button label="L$を購入" name="buyL" tool_tip="クリックしてL$を購入します" width="60" />
+    <button label="ショップ" name="goShop" tool_tip="Second Lifeのマーケットプレイスを開きます。" width="70" />
+  </panel>
+  <text name="TimeText" tool_tip="現在時刻（太平洋）">午前　24：00 PST</text>
+  <icon image_name="Cam_FreeCam_Off" name="presets_icon_camera" tool_tip="カメラ" />
+  <icon image_name="Presets_Icon" name="presets_icon_graphic" tool_tip="グラフィックのプリセット" />
+  <button name="media_toggle_btn" tool_tip="すべてのメディアを開始・停止（音楽、ビデオ、Webページ）" />
+  <button name="volume_btn" tool_tip="ボリューム" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
index 81db7c8989..d7478d6866 100644
--- a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-<panel name="sys_well_item" title="sys_well_item">
-	<text name="title">
-		Beware the trout. BEWARE! THE! TROUT!
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="sys_well_item" title="sys_well_item">
+  <text name="title">鱒にご用心！鱒！に！ご用心！</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
index 58e396877c..82c81bcef3 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Teleport History">
-	<accordion name="history_accordion">
-		<no_matched_tabs_text name="no_matched_teleports_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM]をお試しください。"/>
-		<no_visible_tabs_text name="no_teleports_msg" value="テレポートの履歴には何も情報がありません。[secondlife:///app/search/places/ Search]をお試しください。"/>
-		<accordion_tab name="today" title="今日"/>
-		<accordion_tab name="yesterday" title="昨日"/>
-		<accordion_tab name="2_days_ago" title="2日前"/>
-		<accordion_tab name="3_days_ago" title="3日前"/>
-		<accordion_tab name="4_days_ago" title="4日前"/>
-		<accordion_tab name="5_days_ago" title="5日前"/>
-		<accordion_tab name="6_days_and_older" title="6日以上前"/>
-		<accordion_tab name="1_month_and_older" title="1ヶ月以上前"/>
-		<accordion_tab name="6_months_and_older" title="半年以上前"/>
-	</accordion>
-	<panel label="bottom_panel" name="bottom_panel">
-		<button name="gear_btn" tool_tip="オプションを表示します"/>
-	</panel>
-</panel>
+  <accordion name="history_accordion">
+    <no_matched_tabs_text name="no_matched_teleports_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。" />
+    <no_visible_tabs_text name="no_teleports_msg" value="テレポートの履歴には何も情報がありません。[secondlife:///app/search/places/ 検索]をお試しください。" />
+    <accordion_tab name="today" title="今日" />
+    <accordion_tab name="yesterday" title="昨日" />
+    <accordion_tab name="2_days_ago" title="一昨日" />
+    <accordion_tab name="3_days_ago" title="３日前" />
+    <accordion_tab name="4_days_ago" title="４日前" />
+    <accordion_tab name="5_days_ago" title="５日前" />
+    <accordion_tab name="6_days_and_older" title="６日以上前" />
+    <accordion_tab name="1_month_and_older" title="１ヶ月以上前" />
+    <accordion_tab name="6_months_and_older" title="半年以上前" />
+  </accordion>
+  <panel label="bottom_panel" name="bottom_panel">
+    <button name="gear_btn" tool_tip="オプションを表示します" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
index 0340bfe754..43d26867c4 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="teleport_history_item">
-	<text name="region" value="..."/>
-	<text name="timestamp" value="..."/>
-	<button name="profile_btn" tool_tip="アイテム情報を表示"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+  <text name="region" value="…" />
+  <text name="timestamp" value="…" />
+  <button name="profile_btn" tool_tip="アイテム情報を表示" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
index 75bc8eb86f..fba2427895 100644
--- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -1,112 +1,88 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="テクスチャ" name="Texture">
-	<text name="color label">
-		色
-	</text>
-	<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="color trans">
-		透過度 %
-	</text>
-	<text name="glow label">
-		グロー
-	</text>
-	<check_box label="明るさ全開" name="checkbox fullbright"/>
-	<combo_box name="combobox matmedia">
-		<combo_box.item label="材質" name="Materials"/>
-		<combo_box.item label="メディア" name="Media"/>
-	</combo_box>
-	<radio_group name="radio_material_type">
-		<radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0"/>
-		<radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
-		<radio_item label="輝き (反射)" name="Shininess (specular)" value="2"/>
-	</radio_group>
-	<check_box initial_value="false" label="繰り返しをロックする" name="checkbox_sync_settings" tool_tip="すべてのマップの繰り返しを調整する"/>
-	<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして写真を選択します"/>
-	<text name="label alphamode">
-		アルファモード
-	</text>
-	<combo_box name="combobox alphamode">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="アルファブレンディング" name="Alpha blending"/>
-		<combo_box.item label="アルファマスキング" name="Alpha masking"/>
-		<combo_box.item label="放射状マスク" name="Emissive mask"/>
-	</combo_box>
-	<text name="label maskcutoff">
-		マスクカットオフ
-	</text>
-	<texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして写真を選択します"/>
-	<text name="label bumpiness">
-		凹凸
-	</text>
-	<combo_box name="combobox bumpiness">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="明るさ" name="Brightness"/>
-		<combo_box.item label="暗さ" name="Darkness"/>
-		<combo_box.item label="木目調" name="woodgrain"/>
-		<combo_box.item label="バーク" name="bark"/>
-		<combo_box.item label="レンガ" name="bricks"/>
-		<combo_box.item label="市松模様" name="checker"/>
-		<combo_box.item label="コンクリート" name="concrete"/>
-		<combo_box.item label="堅いタイル" name="crustytile"/>
-		<combo_box.item label="カットストーン" name="cutstone"/>
-		<combo_box.item label="円板" name="discs"/>
-		<combo_box.item label="小石" name="gravel"/>
-		<combo_box.item label="ペトリ皿" name="petridish"/>
-		<combo_box.item label="サイディング" name="siding"/>
-		<combo_box.item label="ストーンタイル" name="stonetile"/>
-		<combo_box.item label="化粧しっくい" name="stucco"/>
-		<combo_box.item label="サクション" name="suction"/>
-		<combo_box.item label="ウィーブ" name="weave"/>
-	</combo_box>
-	<texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして写真を選択します"/>
-	<text name="label shininess">
-		輝き
-	</text>
-	<combo_box name="combobox shininess">
-		<combo_box.item label="なし" name="None"/>
-		<combo_box.item label="低" name="Low"/>
-		<combo_box.item label="中" name="Medium"/>
-		<combo_box.item label="高" name="High"/>
-	</combo_box>
-	<text name="label glossiness">
-		光沢度
-	</text>
-	<text name="label environment">
-		環境
-	</text>
-	<text name="label shinycolor">
-		色
-	</text>
-	<color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="media_info">
-		選択したメディアの URL がもしあれば、ここに入ります
-	</text>
-	<button label="選択..." name="add_media" tool_tip="メディアを追加します"/>
-	<button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します"/>
-	<button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）"/>
-	<text name="tex gen">
-		マッピング
-	</text>
-	<combo_box name="combobox texgen">
-		<combo_box.item label="デフォルト" name="Default"/>
-		<combo_box.item label="平面" name="Planar"/>
-	</combo_box>
-	<spinner label="水平スケール" name="TexScaleU"/>
-	<spinner label="垂直スケール" name="TexScaleV"/>
-	<spinner label="メーターごとに繰り返す" name="rptctrl"/>
-	<spinner label="回転度" name="TexRot"/>
-	<spinner label="水平オフセット" name="TexOffsetU"/>
-	<spinner label="垂直オフセット" name="TexOffsetV"/>
-	<spinner label="水平スケール" name="bumpyScaleU"/>
-	<spinner label="垂直スケール" name="bumpyScaleV"/>
-	<spinner label="回転度" name="bumpyRot"/>
-	<spinner label="水平オフセット" name="bumpyOffsetU"/>
-	<spinner label="垂直オフセット" name="bumpyOffsetV"/>
-	<spinner label="水平スケール" name="shinyScaleU"/>
-	<spinner label="垂直スケール" name="shinyScaleV"/>
-	<spinner label="回転度" name="shinyRot"/>
-	<spinner label="水平オフセット" name="shinyOffsetU"/>
-	<spinner label="垂直オフセット" name="shinyOffsetV"/>
-	<check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。"/>
-	<button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える"/>
-</panel>
+  <text name="color label">色</text>
+  <color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
+  <text name="color trans">透過度％</text>
+  <text name="glow label">グロー</text>
+  <check_box label="明るさ全開" name="checkbox fullbright" />
+  <combo_box name="combobox matmedia">
+    <combo_box.item label="材質" name="Materials" />
+    <combo_box.item label="メディア" name="Media" />
+  </combo_box>
+  <radio_group name="radio_material_type">
+    <radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0" />
+    <radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1" />
+    <radio_item label="輝き (反射)" name="Shininess (specular)" value="2" />
+  </radio_group>
+  <check_box initial_value="false" label="繰り返しをロックする" name="checkbox_sync_settings" tool_tip="すべてのマップの繰り返しを調整する" />
+  <texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして画像を選択します" />
+  <text name="label alphamode">アルファモード</text>
+  <combo_box name="combobox alphamode">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="アルファブレンディング" name="Alpha blending" />
+    <combo_box.item label="アルファマスキング" name="Alpha masking" />
+    <combo_box.item label="放射状マスク" name="Emissive mask" />
+  </combo_box>
+  <text name="label maskcutoff">マスクカットオフ</text>
+  <texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして画像を選択します" />
+  <text name="label bumpiness">凹凸</text>
+  <combo_box name="combobox bumpiness">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="明るさ" name="Brightness" />
+    <combo_box.item label="暗い" name="Darkness" />
+    <combo_box.item label="木目調" name="woodgrain" />
+    <combo_box.item label="樹皮" name="bark" />
+    <combo_box.item label="レンガ" name="bricks" />
+    <combo_box.item label="市松模様" name="checker" />
+    <combo_box.item label="コンクリート" name="concrete" />
+    <combo_box.item label="堅いタイル" name="crustytile" />
+    <combo_box.item label="カットストーン" name="cutstone" />
+    <combo_box.item label="円板" name="discs" />
+    <combo_box.item label="小石" name="gravel" />
+    <combo_box.item label="ペトリ皿" name="petridish" />
+    <combo_box.item label="側線" name="siding" />
+    <combo_box.item label="ストーンタイル" name="stonetile" />
+    <combo_box.item label="化粧しっくい" name="stucco" />
+    <combo_box.item label="吸盤" name="suction" />
+    <combo_box.item label="織物" name="weave" />
+  </combo_box>
+  <texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして画像を選択します" />
+  <text name="label shininess">輝き</text>
+  <combo_box name="combobox shininess">
+    <combo_box.item label="なし" name="None" />
+    <combo_box.item label="低" name="Low" />
+    <combo_box.item label="中" name="Medium" />
+    <combo_box.item label="高" name="High" />
+  </combo_box>
+  <text name="label glossiness">光沢度</text>
+  <text name="label environment">環境</text>
+  <text name="label shinycolor">色</text>
+  <color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
+  <text name="media_info">選択したメディアのＵＲＬがもしあれば、ここに入ります。</text>
+  <button label="選択…" name="add_media" tool_tip="メディアを追加します" />
+  <button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します" />
+  <button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）" />
+  <text name="tex gen">マッピング</text>
+  <combo_box name="combobox texgen">
+    <combo_box.item label="デフォルト" name="Default" />
+    <combo_box.item label="平面" name="Planar" />
+  </combo_box>
+  <spinner label="水平スケール" name="TexScaleU" />
+  <spinner label="垂直スケール" name="TexScaleV" />
+  <spinner label="メーターごとに繰り返す" name="rptctrl" />
+  <spinner label="回転度" name="TexRot" />
+  <spinner label="水平オフセット" name="TexOffsetU" />
+  <spinner label="垂直オフセット" name="TexOffsetV" />
+  <spinner label="水平スケール" name="bumpyScaleU" />
+  <spinner label="垂直スケール" name="bumpyScaleV" />
+  <spinner label="回転度" name="bumpyRot" />
+  <spinner label="水平オフセット" name="bumpyOffsetU" />
+  <spinner label="垂直オフセット" name="bumpyOffsetV" />
+  <spinner label="水平スケール" name="shinyScaleU" />
+  <spinner label="垂直スケール" name="shinyScaleV" />
+  <spinner label="回転度" name="shinyRot" />
+  <spinner label="水平オフセット" name="shinyOffsetU" />
+  <spinner label="垂直オフセット" name="shinyOffsetV" />
+  <check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。" />
+  <button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
index 530f0fb59d..4a8f974719 100644
--- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		ボイスモーフィングなし
-	</string>
-	<string name="preview_voice_effects">
-		ボイスモーフィングをプレビュー  ▶
-	</string>
-	<string name="get_voice_effects">
-		ボイスモーフィングを取得  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択して音声を変更">
-		<combo_box.item label="ボイスモーフィングなし" name="no_voice_effect"/>
-	</combo_box>
-</panel>
+  <string name="no_voice_effect">ボイスモーフィングなし</string>
+  <string name="preview_voice_effects">ボイスモーフィングをプレビュー</string>
+  <string name="get_voice_effects">ボイスモーフィングを取得</string>
+  <combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択してボイスを変更">
+    <combo_box.item label="ボイスモーフィングなし" name="no_voice_effect" />
+  </combo_box>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
index 967dedf061..5165fa8639 100644
--- a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="volumepulldown_floater">
-	<slider label="マスター" name="System Volume"/>
-	<slider label="ボタン" name="UI Volume"/>
-	<slider label="環境音" name="Wind Volume"/>
-	<slider label="サウンド" name="SFX Volume"/>
-	<check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする"/>
-	<slider label="音楽" name="Music Volume"/>
-	<check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする"/>
-	<slider label="メディア" name="Media Volume"/>
-	<check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする"/>
-	<slider label="ボイス" name="Voice Volume"/>
-	<check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする"/>
-</panel>
+  <slider label="マスター" name="System Volume" />
+  <slider label="ボタン" name="UI Volume" />
+  <slider label="環境音" name="Wind Volume" />
+  <slider label="サウンド" name="SFX Volume" />
+  <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする。" />
+  <slider label="音楽" name="Music Volume" />
+  <check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする。" />
+  <slider label="メディア" name="Media Volume" />
+  <check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする。" />
+  <slider label="ボイス" name="Voice Volume" />
+  <check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする。" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml
index 8ff853193a..3811c1e624 100644
--- a/indra/newview/skins/default/xui/ja/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml
@@ -1,63 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="world_map">
-	<panel.string name="Loading">
-		ローディング...
-	</panel.string>
-	<panel.string name="InvalidLocation">
-		無効な位置
-	</panel.string>
-	<panel.string name="world_map_north">
-		北
-	</panel.string>
-	<panel.string name="world_map_east">
-		東
-	</panel.string>
-	<panel.string name="world_map_west">
-		西
-	</panel.string>
-	<panel.string name="world_map_south">
-		南
-	</panel.string>
-	<panel.string name="world_map_southeast">
-		南東
-	</panel.string>
-	<panel.string name="world_map_northeast">
-		北東
-	</panel.string>
-	<panel.string name="world_map_southwest">
-		南西
-	</panel.string>
-	<panel.string name="world_map_northwest">
-		北西
-	</panel.string>
-	<panel.string name="world_map_person">
-		1 人
-	</panel.string>
-	<panel.string name="world_map_people">
-		[NUMBER] 人
-	</panel.string>
-	<text label="北" name="floater_map_north" text="北">
-		北
-	</text>
-	<text label="東" name="floater_map_east" text="東">
-		東
-	</text>
-	<text label="西" name="floater_map_west" text="西">
-		西
-	</text>
-	<text label="南" name="floater_map_south" text="南">
-		南
-	</text>
-	<text label="南東" name="floater_map_southeast" text="南東">
-		南東
-	</text>
-	<text label="北東" name="floater_map_northeast" text="北東">
-		北東
-	</text>
-	<text label="南西" name="floater_map_southwest" text="南西">
-		南西
-	</text>
-	<text label="北西" name="floater_map_northwest" text="北西">
-		北西
-	</text>
-</panel>
+	<panel.string name="Loading">読み込んでいます…</panel.string>
+	<panel.string name="InvalidLocation">無効な位置</panel.string>
+	<panel.string name="world_map_north">北</panel.string>
+	<panel.string name="world_map_east">東</panel.string>
+	<panel.string name="world_map_west">西</panel.string>
+	<panel.string name="world_map_south">南</panel.string>
+	<panel.string name="world_map_southeast">南東</panel.string>
+	<panel.string name="world_map_northeast">北東</panel.string>
+	<panel.string name="world_map_southwest">南西</panel.string>
+	<panel.string name="world_map_northwest">北西</panel.string>
+	<panel.string name="world_map_person">1人</panel.string>
+	<panel.string name="world_map_people">[NUMBER]人</panel.string>
+	<text label="北" name="floater_map_north" text="北">北</text>
+	<text label="東" name="floater_map_east" text="東">東</text>
+	<text label="西" name="floater_map_west" text="西">西</text>
+	<text label="南" name="floater_map_south" text="南">南</text>
+	<text label="南東" name="floater_map_southeast" text="南東">南東</text>
+	<text label="北東" name="floater_map_northeast" text="北東">北東</text>
+	<text label="南西" name="floater_map_southwest" text="南西">南西</text>
+	<text label="北西" name="floater_map_northwest" text="北西">北西</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index 05eca2cca3..73b6681772 100644
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
-	<action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
-		<action description="このグループに人を招待" longdescription="「役割&amp;メンバー」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1"/>
-		<action description="このグループから「全員（Everyone）」の役割に属するメンバーを追放します" longdescription="「役割&amp;メンバー」セクションの「メンバー」タブ内にある「追放」ボタンを押して、このグループからメンバーを追放します。「オーナー」は、他の「オーナー」以外は誰でも追放できます。「オーナー」ではない人が「全員（Everyone）」にしか役割がない場合、メンバーはグループから追放されることがあります。「役割」からメンバーを削除するには、「役割からメンバーを削除」の能力が与えられている必要があります。" name="member eject" value="2"/>
-		<action description="立入禁止リストの管理" longdescription="グループのメンバーに、このグループから住人を立入禁止/立入禁止解除できるようにします。" name="allow ban" value="51"/>
-		<action description="「自由参加」と「入会費」の切り替え" longdescription="「自由参加」に切り替えると、招待されなくても新しいメンバーが入会できます。「入会費」は「一般」セクションで変更します。" name="member options" value="3"/>
-	</action_set>
-	<action_set description="これらの能力には、グループ内の役割を追加、削除、変更し、役割にメンバーを追加、削除し、さらに役割へ能力を割り当てる権限が含まれます。" name="Roles">
-		<action description="新しい役割を作成" longdescription="新しい「役割」は、「役割&amp;メンバー」セクション &gt; 「役割」タブで作成します。" name="role create" value="4"/>
-		<action description="役割を削除" longdescription="「役割」は、「役割&amp;メンバー」セクション &gt; 「役割」タブで削除します。" name="role delete" value="5"/>
-		<action description="「役割」の名前、タイトル、説明、メンバー公開の有無を変更" longdescription="「役割」の名前、肩書き、説明、メンバー公開の有無を変更します。「役割」を選択後に、「役割&amp;メンバー」セクション &gt; 「役割」タブ の下で設定できます。" name="role properties" value="6"/>
-		<action description="メンバーを割り当て人の役割に割り当てる" longdescription="「割り当てられた役割」（「役割&amp;メンバー」セクション &gt; 「メンバー」タブ）のリストで、メンバーを「役割」に割り当てます。この能力があるメンバーは、割り当てる人が既に所属する「役割」にのみメンバーを追加できます。" name="role assign member limited" value="7"/>
-		<action description="メンバーを任意の役割に割り当てる" longdescription="「割り当てられた役割」（「役割&amp;メンバー」セクション &gt; 「メンバー」タブ）のリストで、メンバーを「いずれかの役割」に割り当てます。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーを現在以上の権限のある「役割」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い力を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role assign member" value="8"/>
-		<action description="役割からメンバーを解除" longdescription="「割り当てられた役割」（「役割&amp;メンバー」セクション &gt; 「メンバー」タブ）のリストで、メンバーを「役割」から削除します。「オーナー」は削除できません。" name="role remove member" value="9"/>
-		<action description="役割の能力の割り当てと解除" longdescription="「許可された能力」（「役割&amp;メンバー」セクション &gt; 「役割」タブ）のリストで、各「役割」に対する「能力」を割り当てたり削除したりします。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーをすべての「能力」」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い権限を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role change actions" value="10"/>
-	</action_set>
-	<action_set description="これらの能力には、グループの公開性や理念、記章の変更といった、グループのアイデンティティを修正する権限が含まれます。" name="Group Identity">
-		<action description="理念、記章、「Web 上で公開」、およびグループ情報内で公開のメンバーを変更。" longdescription="理念、記章、「検索に表示」の変更をします。 「一般」セクションで行えます。" name="group change identity" value="11"/>
-	</action_set>
-	<action_set description="これらの「能力」には、このグループの所有地の譲渡、修正、販売をする権限があります。 「土地情報」ウィンドウを見るには、地面を右クリックして「土地情報」を選ぶか、ナビゲーションバーの「i」アイコンをクリックします。" name="Parcel Management">
-		<action description="グループ用の土地の譲渡と購入" longdescription="グループ用の土地の譲渡と購入を行います。 この操作には、土地情報画面 ＞ 一般タブを使います。" name="land deed" value="12"/>
-		<action description="リンデン総督に土地を明け渡す" longdescription="リンデン総督に土地を明け渡します。 *警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」でグループ所有の土地を放棄して、売り上げなしでリンデン総督に明け渡すことができます。 この能力の割り当ては、そのことを理解した上で行ってください。" name="land release" value="13"/>
-		<action description="売り地情報の設定" longdescription="売り地情報を設定します。 *警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」タブでグループ所有の土地を自分の思いどおりに販売することができます。 この能力の割り当ては、そのことを理解した上で行ってください。" name="land set sale info" value="14"/>
-		<action description="区画の再分割と統合" longdescription="区画を再分割、統合します。 地面を右クリックして「地形を編集」を選び、マウスを土地の上でドラッグして範囲を選択します。 再分割するには、分割対象を選んで「再分割」をクリックします。 統合するには、2つ以上の隣接する区画を選んで「統合」をクリックします。" name="land divide join" value="15"/>
-	</action_set>
-	<action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびに TP ルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
-		<action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」 &gt; 「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17"/>
-		<action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderate コンテンツ」設定を変更します。「土地情報」 &gt; 「オプション」タブで行います。" name="land change identity" value="18"/>
-		<action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。 この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19"/>
-	</action_set>
-	<action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
-		<action description="音楽とメディアの設定を変更" longdescription="ストリーミングミュージックと動画の設定を変更するには、「土地情報」 ＞ 「メディア」タブを使います。" name="land change media" value="20"/>
-		<action description="「地形を編集」に切り替え" longdescription="「地形を編集」に切り替えます。 *警告* 「土地情報」＞「オプション」＞「地形を編集」の順で進むと、誰でもあなたの土地の形の整備や、リンデン製の樹木の設置、移動ができます。  この能力を割り振る前に、このことをよく理解しておいてください。 「土地情報」＞「オプション」タブから「地形を編集」に切り替えられます。" name="land edit" value="21"/>
-		<action description="「土地情報」＞「オプション」タブ内のさまざまな設定を切り替え" longdescription="「安全（ダメージなし）」、「飛行」を切り替え、住人に以下を許可します： グループ所有地の「土地情報」 &gt; 「オプション」タブ内の、「地形を編集」、「制作」、「ランドマークの作成」、「スクリプトの実行」。" name="land options" value="22"/>
-		<action description="自然環境の設定とデイサイクルを修正する。" longdescription="「土地について」 &gt; 「環境」タブから自然環境の設定とデイサイクルを変更する。" name="land change environment" value="46"/>
-	</action_set>
-	<action_set description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。" name="Parcel Powers">
-		<action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23"/>
-		<action description="常に「飛行」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、飛行が可能です。" name="land allow fly" value="24"/>
-		<action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25"/>
-		<action description="着地点を無視する" longdescription="この能力を持つ役割のメンバーは、。[土地について &gt; オプション] タブで着地点が設定されている場合でもグループ所有の区画に直接テレポートできます。" name="land allow direct teleport" value="26"/>
-		<action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「世界」メニュー &gt; ランドマーク &gt; 現在地をホームに設定 を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28"/>
-		<action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41"/>
-	</action_set>
-	<action_set description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。" name="Parcel Access">
-		<action description="区画アクセスリストの管理" longdescription="区画アクセス・リストの管理は、「土地情報」＞「アクセス」タブで行います。" name="land manage allowed" value="29"/>
-		<action description="区画禁止リストの管理" longdescription="「土地情報」 &gt; 「アクセス」タブの、区画の禁止リストの管理ができます。" name="land manage banned" value="30"/>
-		<action description="「入場許可を販売」の設定を変更" longdescription="「土地情報」 &gt; 「アクセス」タブで、区画の「入場許可を販売」の設定を変更します。" name="land manage passes" value="31"/>
-		<action description="区画上の住人の追放とフリーズ" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有地にいて欲しくない住人を右クリックし、「追放」や「フリーズ」を選んで対応できます。" name="land admin" value="32"/>
-	</action_set>
-	<action_set description="これらの能力には、オブジェクトの返却、リンデンプラントの設置や移動を、メンバーに許可する権限が含まれます。 これはメンバーがゴミ処理や景観作成をする際に便利ですが、返却したオブジェクトは元に戻せないので、注意して行いましょう。" name="Parcel Content">
-		<action description="グループ所有オブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group owned" value="48"/>
-		<action description="グループに設定されているオブジェクトを返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group set" value="33"/>
-		<action description="非グループオブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return non group" value="34"/>
-		<action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。 これらの植物はあなたのインベントリ内の「ライブラリ」 &gt; 「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35"/>
-	</action_set>
-	<action_set description="これらの「能力」には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。 変更は「制作ツール」 &gt; 「一般」タブで行います。 オブジェクトを右クリックして「編集」を開くと設定内容を確認できます。" name="Object Management">
-		<action description="グループにオブジェクトを譲渡" longdescription="「制作ツール」 &gt; 「一般」タブで、オブジェクトをグループに譲渡します。" name="object deed" value="36"/>
-		<action description="グループ所有オブジェクトの操作（移動、コピー、修正）" longdescription="「制作ツール」 &gt; 「一般」タブで、グループ所有のオブジェクトを操作（移動、コピー、修正）します。" name="object manipulate" value="38"/>
-		<action description="グループ所有オブジェクトを販売可能に設定" longdescription="「制作ツール」 &gt; 「一般」タブで、グループ所有のオブジェクトを販売対象に設定します。" name="object set sale" value="39"/>
-	</action_set>
-	<action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting">
-		<action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。   つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40"/>
-	</action_set>
-	<action_set description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。" name="Notices">
-		<action description="通知を送信" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」 &gt; 「通知」セクションから通知を送信できます。" name="notices send" value="42"/>
-		<action description="通知の受信と過去の通知の閲覧" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」 &gt; 「通知」セクションで通知を受信したり過去の通知を見ることができます。" name="notices receive" value="43"/>
-	</action_set>
-	<action_set description=" これらの能力には、グループチャットセッションやグループボイスチャットへのアクセスの許可や制限の権限が含まれます。 " name="Chat">
-		<action description="グループチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。 " name="join group chat" value="16"/>
-		<action description="グループボイスチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。  注： ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。 " name="join voice chat" value="27"/>
-		<action description="グループチャットを管理する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。 " name="moderate group chat" value="37"/>
-	</action_set>
-	<action_set description="これらの機能には、このグループにより所有される体験を変更する機能が含まれます。" name="experience_tools_experience">
-		<action description="体験管理者" longdescription="この機能を持つ役割のメンバーは、体験のメタデータを編集できます。" name="experience admin" value="49"/>
-		<action description="体験貢献者" longdescription="この機能を持つ役割のメンバーは、体験のスクリプトを提供できます。" name="experience contributor" value="50"/>
-	</action_set>
-</role_actions>
+  <action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
+    <action description="このグループに人を招待" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1" />
+    <action description="このグループから「全員（Everyone）」の役割に属するメンバーを追放します" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「追放」ボタンを押して、このグループからメンバーを追放します。「オーナー」は、他の「オーナー」以外は誰でも追放できます。「オーナー」ではない人が「全員（Everyone）」にしか役割がない場合、メンバーはグループから追放されることがあります。「役割」からメンバーを削除するには、「役割からメンバーを削除」の能力が与えられている必要があります。" name="member eject" value="2" />
+    <action description="立入禁止リストの管理" longdescription="グループのメンバーに、このグループから住人を立入禁止/立入禁止解除できるようにします。" name="allow ban" value="51" />
+    <action description="「自由参加」と「入会費」の切り替え" longdescription="「自由参加」に切り替えると、招待されなくても新しいメンバーが入会できます。「入会費」は「一般」セクションで変更します。" name="member options" value="3" />
+  </action_set>
+  <action_set description="これらの能力には、グループ内の役割を追加、削除、変更し、役割にメンバーを追加、削除し、さらに役割へ能力を割り当てる権限が含まれます。" name="Roles">
+    <action description="新しい役割を作成" longdescription="新しい「役割」は、「役割とメンバー」セクション＞「役割」タブで作成します。" name="role create" value="4" />
+    <action description="役割を削除" longdescription="「役割」は、「役割とメンバー」セクション＞「役割」タブで削除します。" name="role delete" value="5" />
+    <action description="「役割」の名前、タイトル、説明、メンバー公開の有無を変更" longdescription="「役割」の名前、肩書き、説明、メンバー公開の有無を変更します。「役割」を選択後に、「役割とメンバー」セクション＞「役割」タブ の下で設定できます。" name="role properties" value="6" />
+    <action description="メンバーを割り当て人の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」に割り当てます。この能力があるメンバーは、割り当てる人が既に所属する「役割」にのみメンバーを追加できます。" name="role assign member limited" value="7" />
+    <action description="メンバーを任意の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「いずれかの役割」に割り当てます。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーを現在以上の権限のある「役割」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い力を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role assign member" value="8" />
+    <action description="役割からメンバーを解除" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」から削除します。「オーナー」は削除できません。" name="role remove member" value="9" />
+    <action description="役割の能力の割り当てと解除" longdescription="「許可された能力」（「役割とメンバー」セクション＞「役割」タブ）のリストで、各「役割」に対する「能力」を割り当てたり削除したりします。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーをすべての「能力」」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い権限を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role change actions" value="10" />
+  </action_set>
+  <action_set description="これらの能力には、グループの公開性や理念、記章の変更といった、グループのアイデンティティを修正する権限が含まれます。" name="Group Identity">
+    <action description="理念、記章、「Web 上で公開」、およびグループ情報内で公開のメンバーを変更。" longdescription="理念、記章、「検索に表示」の変更をします。「一般」セクションで行えます。" name="group change identity" value="11" />
+  </action_set>
+  <action_set description="これらの「能力」には、このグループの所有地の譲渡、修正、販売をする権限があります。「土地情報」ウィンドウを見るには、地面を右クリックして「土地情報」を選ぶか、ナビゲーションバーの「i」アイコンをクリックします。" name="Parcel Management">
+    <action description="グループ用の土地の譲渡と購入" longdescription="グループ用の土地の譲渡と購入を行います。この操作には、「土地情報」＞「一般」タブを使います。" name="land deed" value="12" />
+    <action description="リンデン総督に土地を明け渡す" longdescription="リンデン総督に土地を明け渡します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」でグループ所有の土地を放棄して、売り上げなしでリンデン総督に明け渡すことができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land release" value="13" />
+    <action description="売り地情報の設定" longdescription="売り地情報を設定します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」タブでグループ所有の土地を自分の思いどおりに販売することができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land set sale info" value="14" />
+    <action description="区画の再分割と統合" longdescription="区画を再分割、統合します。地面を右クリックして「地形を編集」を選び、マウスを土地の上でドラッグして範囲を選択します。再分割するには、分割対象を選んで「再分割」をクリックします。統合するには、2つ以上の隣接する区画を選んで「統合」をクリックします。" name="land divide join" value="15" />
+  </action_set>
+  <action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびにTPルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
+    <action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」＞「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17" />
+    <action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderateコンテンツ」設定を変更します。「土地情報」＞「オプション」タブで行います。" name="land change identity" value="18" />
+    <action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19" />
+  </action_set>
+  <action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
+    <action description="音楽とメディアの設定を変更" longdescription="ストリーミングミュージックと動画の設定を変更するには、「土地情報」＞「メディア」タブを使います。" name="land change media" value="20" />
+    <action description="「地形を編集」に切り替え" longdescription="「地形を編集」に切り替えます.*警告* 「土地情報」＞「オプション」＞「地形を編集」の順で進むと、誰でもあなたの土地の形の整備や、リンデン製の樹木の設置、移動ができます。この能力を割り振る前に、このことをよく理解しておいてください。「土地情報」＞「オプション」タブから「地形を編集」に切り替えられます。" name="land edit" value="21" />
+    <action description="「土地情報」＞「オプション」タブ内のさまざまな設定を切り替え" longdescription="「安全（ダメージなし）」、「飛行」を切り替え、住人に以下を許可します： グループ所有地の「土地情報」＞「オプション」タブ内の、「地形を編集」、「制作」、「ランドマークの作成」、「スクリプトの実行」。" name="land options" value="22" />
+    <action description="自然環境の設定とデイサイクルを修正する。" longdescription="「土地について」＞「環境」タブから自然環境の設定とデイサイクルを変更する。" name="land change environment" value="46" />
+  </action_set>
+  <action_set description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。" name="Parcel Powers">
+    <action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23" />
+    <action description="常に「飛行」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、飛行が可能です。" name="land allow fly" value="24" />
+    <action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25" />
+    <action description="着地点を無視する" longdescription="この能力を持つ役割のメンバーは、。「土地情報」＞「オプション」タブで着地点が設定されている場合でもグループ所有の区画に直接テレポートできます。" name="land allow direct teleport" value="26" />
+    <action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「ワールド」＞「ランドマーク」＞「現在地をホームに設定」を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28" />
+    <action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41" />
+  </action_set>
+  <action_set description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。" name="Parcel Access">
+    <action description="区画アクセスリストの管理" longdescription="区画アクセス・リストの管理は、「土地情報」＞「アクセス」タブで行います。" name="land manage allowed" value="29" />
+    <action description="区画禁止リストの管理" longdescription="「土地情報」＞「アクセス」タブの、区画の禁止リストの管理ができます。" name="land manage banned" value="30" />
+    <action description="「入場許可を販売」の設定を変更" longdescription="「土地情報」＞「アクセス」タブで、区画の「入場許可を販売」の設定を変更します。" name="land manage passes" value="31" />
+    <action description="区画上の住人の追放とフリーズ" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有地にいて欲しくない住人を右クリックし、「追放」や「フリーズ」を選んで対応できます。" name="land admin" value="32" />
+  </action_set>
+  <action_set description="これらの能力には、オブジェクトの返却、リンデンプラントの設置や移動を、メンバーに許可する権限が含まれます。これはメンバーがゴミ処理や景観作成をする際に便利ですが、返却したオブジェクトは元に戻せないので、注意して行いましょう。" name="Parcel Content">
+    <action description="グループ所有オブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group owned" value="48" />
+    <action description="グループに設定されているオブジェクトを返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group set" value="33" />
+    <action description="非グループオブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return non group" value="34" />
+    <action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。これらの植物はあなたのインベントリ内の「ライブラリ」＞「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35" />
+  </action_set>
+  <action_set description="これらの「能力」には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。変更は「制作ツール」＞「一般」タブで行います。オブジェクトを右クリックして「編集」を開くと設定内容を確認できます。" name="Object Management">
+    <action description="グループにオブジェクトを譲渡" longdescription="「制作ツール」＞「一般」タブで、オブジェクトをグループに譲渡します。" name="object deed" value="36" />
+    <action description="グループ所有オブジェクトの操作（移動、コピー、修正）" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを操作（移動、コピー、修正）します。" name="object manipulate" value="38" />
+    <action description="グループ所有オブジェクトを販売可能に設定" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを販売対象に設定します。" name="object set sale" value="39" />
+  </action_set>
+  <action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting">
+    <action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40" />
+  </action_set>
+  <action_set description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。" name="Notices">
+    <action description="通知を送信" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションから通知を送信できます。" name="notices send" value="42" />
+    <action description="通知の受信と過去の通知の閲覧" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションで通知を受信したり過去の通知を見ることができます。" name="notices receive" value="43" />
+  </action_set>
+  <action_set description="これらの能力には、グループチャットセッションやグループボイスチャットへのアクセスの許可や制限の権限が含まれます。" name="Chat">
+    <action description="グループチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。" name="join group chat" value="16" />
+    <action description="グループボイスチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。注：ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。" name="join voice chat" value="27" />
+    <action description="グループチャットを管理する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。" name="moderate group chat" value="37" />
+  </action_set>
+  <action_set description="これらの機能には、このグループにより所有される体験を変更する機能が含まれます。" name="experience_tools_experience">
+    <action description="体験管理者" longdescription="この機能を持つ役割のメンバーは、体験のメタデータを編集できます。" name="experience admin" value="49" />
+    <action description="体験貢献者" longdescription="この機能を持つ役割のメンバーは、体験のスクリプトを提供できます。" name="experience contributor" value="50" />
+  </action_set>
+</role_actions>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
index 30cef9ccc0..aad157ea20 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
@@ -1,19 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="アウトフィット" name="appearance panel">
-	<string name="No Outfit" value="アウトフィットなし"/>
-	<string name="Unsaved Changes" value="保存されていない変更"/>
-	<string name="Now Wearing" value="着用しています..."/>
-	<string name="Changing outfits" value="アウトフィットの変更"/>
-	<panel name="panel_currentlook">
-		<button label="E" name="editappearance_btn"/>
-		<button label="O" name="openoutfit_btn"/>
-		<text name="currentlook_status">
-			（状態）
-		</text>
-		<text name="currentlook_name">
-			MyOutfit With a really Long Name like MOOSE
-		</text>
-		<button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集"/>
-	</panel>
-	<filter_editor label="アウトフィットをフィルター" name="Filter"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="アウトフィット" name="appearance panel">
+  <string name="No Outfit" value="アウトフィットなし" />
+  <string name="Unsaved Changes" value="保存されていない変更" />
+  <string name="Now Wearing" value="着用しています…" />
+  <string name="Changing outfits" value="アウトフィットの変更" />
+  <panel name="panel_currentlook">
+    <button label="E" name="editappearance_btn" />
+    <button label="O" name="openoutfit_btn" />
+    <text name="currentlook_status">（状態）</text>
+    <text name="currentlook_name">MOOSEみたいな長い名前の私のアウトフィット</text>
+    <button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集" />
+  </panel>
+  <filter_editor label="アウトフィットをフィルタ" name="Filter" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 5aa0e86a5b..559db635fc 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -1,42 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="もの" name="objects panel">
-	<panel label="" name="sidepanel_inventory_panel">
-		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						受け取ったアイテム（[NUM]）
-					</string>
-					<string name="InboxLabelNoArg">
-						受け取ったアイテム
-					</string>
-					<button label="受け取ったアイテム" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] 個の新アイテム
-					</text>
-					<panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
-						<text name="inbox_inventory_placeholder">
-							マーケットプレイスから購入した商品はここに配達されます。
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-		</layout_stack>
-		<panel name="button_panel">
-			<layout_stack name="button_panel_ls">
-				<layout_panel name="info_btn_lp">
-					<button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する"/>
-				</layout_panel>
-				<layout_panel name="share_btn_lp">
-					<button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/>
-				</layout_panel>
-				<layout_panel name="shop_btn_lp">
-					<button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く"/>
-					<button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する"/>
-					<button label="再生" name="play_btn"/>
-					<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/>
-				</layout_panel>
-			</layout_stack>
-		</panel>
-	</panel>
-</panel>
+  <panel label="" name="sidepanel_inventory_panel">
+    <layout_stack name="inventory_layout_stack">
+      <layout_panel name="inbox_layout_panel">
+        <panel label="" name="marketplace_inbox">
+          <string name="InboxLabelWithArg">受け取ったアイテム（[NUM]個）</string>
+          <string name="InboxLabelNoArg">受け取ったアイテム</string>
+          <button label="受け取ったアイテム" name="inbox_btn" />
+          <text name="inbox_fresh_new_count">[NUM]個の新アイテム</text>
+          <panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
+            <text name="inbox_inventory_placeholder">マーケットプレイスから購入した商品はここに配達されます。</text>
+          </panel>
+        </panel>
+      </layout_panel>
+    </layout_stack>
+    <panel name="button_panel">
+      <layout_stack name="button_panel_ls">
+        <layout_panel name="info_btn_lp">
+          <button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する" />
+        </layout_panel>
+        <layout_panel name="share_btn_lp">
+          <button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する" />
+        </layout_panel>
+        <layout_panel name="shop_btn_lp">
+          <button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く" />
+          <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する" />
+          <button label="再生" name="play_btn" />
+          <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする" />
+        </layout_panel>
+      </layout_stack>
+    </panel>
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index 3bdf8405e7..f52e9cddc2 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,88 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="アイテムのプロフィール">
-	<panel.string name="loading_experience">
-		(ローディング)
-	</panel.string>
-	<panel.string name="unknown">
-		（不明）
-	</panel.string>
-	<panel.string name="unknown_multiple">
-		(不明/複数)
-	</panel.string>
-	<panel.string name="public">
-		（公開）
-	</panel.string>
-	<panel.string name="you_can">
-		あなたができること：
-	</panel.string>
-	<panel.string name="owner_can">
-		所有者ができること：
-	</panel.string>
-	<panel.string name="acquiredDate">
-		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
-	</panel.string>
-	<panel.string name="origin_inventory">
-		（インベントリ）
-	</panel.string>
-	<panel.string name="origin_inworld">
-		（インワールド）
-	</panel.string>
-	<text name="title" value="アイテムのプロフィール"/>
-	<text name="origin" value="（インベントリ）"/>
-	<scroll_container name="item_profile_scroll">
-		<panel label="" name="item_profile">
-			<text name="LabelItemNameTitle">
-				名前：
-			</text>
-			<line_editor name="LabelItemName" tool_tip="使用できる名前の文字数は最大 63 文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
-			<text name="LabelItemDescTitle">
-				説明：
-			</text>
-			<line_editor name="LabelItemDesc" tool_tip="ビューワの設定で [すべてのオブジェクト上でヒントを表示] が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
-			<text name="LabelCreatorTitle">
-				制作者：
-			</text>
-			<text name="LabelOwnerTitle">
-				所有者：
-			</text>
-			<text name="LabelAcquiredTitle">
-				取得：
-			</text>
-			<text name="LabelItemExperienceTitle">
-				体験：
-			</text>
-			<panel name="perms_inv">
-				<text name="perm_modify">
-					あなたができること：
-				</text>
-				<check_box label="修正" name="CheckOwnerModify"/>
-				<check_box label="コピー" name="CheckOwnerCopy"/>
-				<check_box label="再販・プレゼント" name="CheckOwnerTransfer"/>
-				<text name="AnyoneLabel">
-					全員：
-				</text>
-				<check_box label="コピー" name="CheckEveryoneCopy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
-				<text name="GroupLabel">
-					グループ：
-				</text>
-				<check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/>
-				<text name="NextOwnerLabel">
-					次の所有者：
-				</text>
-				<check_box label="修正" name="CheckNextOwnerModify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-				<check_box label="コピー" name="CheckNextOwnerCopy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-				<check_box label="再販・プレゼント" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
-			</panel>
-			<check_box label="販売中" name="CheckPurchase" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
-			<combo_box name="ComboBoxSaleType" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
-				<combo_box.item label="コピー" name="Copy"/>
-				<combo_box.item label="コンテンツ" name="Contents"/>
-				<combo_box.item label="オリジナル" name="Original"/>
-			</combo_box>
-			<spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。"/>
-		</panel>
-	</scroll_container>
-	<panel name="button_panel">
-		<button label="キャンセル" name="cancel_btn"/>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="item properties" title="アイテムのプロフィール">
+  <panel.string name="loading_experience">（読み込んでいます…）</panel.string>
+  <panel.string name="unknown">（不明）</panel.string>
+  <panel.string name="unknown_multiple">（不明／複数）</panel.string>
+  <panel.string name="public">（公開）</panel.string>
+  <panel.string name="you_can">あなたができること：</panel.string>
+  <panel.string name="owner_can">所有者ができること：</panel.string>
+  <panel.string name="acquiredDate">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</panel.string>
+  <panel.string name="origin_inventory">（インベントリ）</panel.string>
+  <panel.string name="origin_inworld">（インワールド）</panel.string>
+  <text name="title" value="アイテムのプロフィール" />
+  <text name="origin" value="（インベントリ）" />
+  <scroll_container name="item_profile_scroll">
+    <panel label="" name="item_profile">
+      <text name="LabelItemNameTitle">名前：</text>
+      <line_editor name="LabelItemName" tool_tip="使用できる名前の文字数は最大63文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7（非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。" />
+      <text name="LabelItemDescTitle">説明：</text>
+      <line_editor name="LabelItemDesc" tool_tip="ビューアの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
+      <text name="LabelCreatorTitle">制作者：</text>
+      <text name="LabelOwnerTitle">所有者：</text>
+      <text name="LabelAcquiredTitle">取得：</text>
+      <text name="LabelItemExperienceTitle">体験：</text>
+      <panel name="perms_inv">
+        <text name="perm_modify">あなたができること：</text>
+        <check_box label="修正" name="CheckOwnerModify" />
+        <check_box label="コピー" name="CheckOwnerCopy" />
+        <check_box label="再販・譲渡" name="CheckOwnerTransfer" />
+        <text name="AnyoneLabel">全員：</text>
+        <check_box label="コピー" name="CheckEveryoneCopy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
+        <text name="GroupLabel">グループ：</text>
+        <check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
+        <text name="NextOwnerLabel">次の所有者：</text>
+        <check_box label="修正" name="CheckNextOwnerModify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+        <check_box label="コピー" name="CheckNextOwnerCopy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
+        <check_box label="再販・譲渡" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。" />
+      </panel>
+      <check_box label="販売品" name="CheckPurchase" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
+      <combo_box name="ComboBoxSaleType" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
+        <combo_box.item label="コピー" name="Copy" />
+        <combo_box.item label="コンテンツ" name="Contents" />
+        <combo_box.item label="オリジナル" name="Original" />
+      </combo_box>
+      <spinner label="価格：L$" name="Edit Cost" tool_tip="オブジェクトの価格" />
+    </panel>
+  </scroll_container>
+  <panel name="button_panel">
+    <button label="キャンセル" name="cancel_btn" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index d8325d8dc0..902961d931 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -1,136 +1,74 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="オブジェクトのプロフィール">
-	<panel.string name="text deed continued">
-		譲渡
-	</panel.string>
-	<panel.string name="text deed">
-		譲渡
-	</panel.string>
-	<panel.string name="text modify info 1">
-		このオブジェクトを修正できます
-	</panel.string>
-	<panel.string name="text modify info 2">
-		これらのオブジェクトを修正できます
-	</panel.string>
-	<panel.string name="text modify info 3">
-		このオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify info 4">
-		これらのオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify info 5">
-		地域（リージョン）の境界を越えてこのオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify info 6">
-		地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
-	</panel.string>
-	<panel.string name="text modify warning">
-		このオブジェクトには、パーツがリンクされています
-	</panel.string>
-	<panel.string name="Cost Default">
-		価格： L$
-	</panel.string>
-	<panel.string name="Cost Total">
-		合計価格: L$
-	</panel.string>
-	<panel.string name="Cost Per Unit">
-		Price Per: L$
-	</panel.string>
-	<panel.string name="Cost Mixed">
-		Mixed Price
-	</panel.string>
-	<panel.string name="Sale Mixed">
-		Mixed Sale
-	</panel.string>
-	<text name="title" value="オブジェクトのプロフィール"/>
-	<text name="where" value="（インワールド）"/>
-	<panel label="" name="properties_panel">
-		<text name="Name:">
-			名前：
-		</text>
-		<line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大 63 文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
-		<text name="Description:">
-			説明：
-		</text>
-		<line_editor name="Object Description" tool_tip="ビューワの設定で [すべてのオブジェクト上でヒントを表示] が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
-		<text name="CreatorNameLabel">
-			制作者：
-		</text>
-		<text name="Owner:">
-			所有者：
-		</text>
-		<text name="Group_label">
-			グループ：
-		</text>
-		<button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します"/>
-		<name_box initial_value="ローディング..." name="Group Name Proxy"/>
-		<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます。"/>
-		<text name="label click action">
-			クリックで：
-		</text>
-		<combo_box name="clickaction" tool_tip="マウスを 1 回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。たとえば、[タッチ] や [支払い] にはスクリプトが必要になるなどです">
-			<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
-			<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
-			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
-			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
-			<combo_box.item label="開く" name="Open"/>
-			<combo_box.item label="ズーム" name="Zoom"/>
-			<combo_box.item label="なし" name="None"/>
-		</combo_box>
-		<panel name="perms_inv">
-			<text name="perm_modify">
-				このオブジェクトを修正できます
-			</text>
-			<text name="Anyone can:">
-				全員：
-			</text>
-			<check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
-			<check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。"/>
-			<text name="GroupLabel">
-				グループ：
-			</text>
-			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/>
-			<text name="NextOwnerLabel">
-				次の所有者：
-			</text>
-			<check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
-			<check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
-			<check_box label="再販・プレゼント" name="checkbox next owner can transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます"/>
-		</panel>
-		<check_box label="販売中" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
-		<combo_box name="sale type" tool_tip="購入者がコピーを受け取るのか、コピーの中身を受け取るのか、またはアイテム自体を受け取るのかを選択してください。">
-			<combo_box.item label="コピー" name="Copy"/>
-			<combo_box.item label="中身" name="Contents"/>
-			<combo_box.item label="オリジナル" name="Original"/>
-		</combo_box>
-		<spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。"/>
-		<check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します"/>
-		<text name="pathfinding_attributes_label">
-			パスファインディング属性:
-		</text>
-		<text name="B:">
-			B.
-		</text>
-		<text name="O:">
-			O:
-		</text>
-		<text name="G:">
-			G:
-		</text>
-		<text name="E:">
-			E:
-		</text>
-		<text name="N:">
-			N:
-		</text>
-		<text name="F:">
-			F:
-		</text>
-	</panel>
-	<panel name="button_panel">
-		<button label="開く" name="open_btn" tool_tip="[オブジェクトの中身] を開いて確認します。"/>
-		<button label="支払う" name="pay_btn" tool_tip="[支払い] ウィンドウを開きます。オブジェクトでこの動作を実行するには、支払い用のスクリプトが必要です。"/>
-		<button label="買う" name="buy_btn" tool_tip="[購入] ウィンドウを開きます。オブジェクトは販売用に設定する必要があります。"/>
-		<button label="詳細" name="details_btn" tool_tip="[オブジェクトを調べる] ウィンドウを開きます。"/>
-	</panel>
-</panel>
+  <panel.string name="text deed continued">再譲渡</panel.string>
+  <panel.string name="text deed">譲渡</panel.string>
+  <panel.string name="text modify info 1">このオブジェクトは、修正することができます。</panel.string>
+  <panel.string name="text modify info 2">これらのオブジェクトは、修正することができます。</panel.string>
+  <panel.string name="text modify info 3">このオブジェクトは、修正することができません。</panel.string>
+  <panel.string name="text modify info 4">これらのオブジェクトは、修正することができません。</panel.string>
+  <panel.string name="text modify info 5">リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。</panel.string>
+  <panel.string name="text modify info 6">リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。</panel.string>
+  <panel.string name="text modify warning">このオブジェクトには、パーツがリンクされています。</panel.string>
+  <panel.string name="Cost Default">価格：L$</panel.string>
+  <panel.string name="Cost Total">合計価格：L$</panel.string>
+  <panel.string name="Cost Per Unit">単価：L$</panel.string>
+  <panel.string name="Cost Mixed">総額</panel.string>
+  <panel.string name="Sale Mixed">販売額</panel.string>
+  <text name="title" value="オブジェクトのプロフィール" />
+  <text name="where" value="（インワールド）" />
+  <panel label="" name="properties_panel">
+    <text name="Name:">名前：</text>
+    <line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大６３文字までです。長いプリム名は短縮されます。名前に使用できる文字はASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。" />
+    <text name="Description:">説明：</text>
+    <line_editor name="Object Description" tool_tip="ビューアの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
+    <text name="CreatorNameLabel">制作者：</text>
+    <text name="Owner:">所有者：</text>
+    <text name="Group_label">グループ：</text>
+    <button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します" />
+    <name_box initial_value="読み込んでいます…" name="Group Name Proxy" />
+    <button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます。" />
+    <text name="label click action">クリックで：</text>
+    <combo_box name="clickaction" tool_tip="マウスで１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。例えば、「触る」や「支払い」にはスクリプトが必要になります。">
+      <combo_box.item label="触る（デフォルト）" name="Touch/grab(default)" />
+      <combo_box.item label="オブジェクトに座る" name="Sitonobject" />
+      <combo_box.item label="オブジェクトを買う" name="Buyobject" />
+      <combo_box.item label="オブジェクトに支払う" name="Payobject" />
+      <combo_box.item label="開く" name="Open" />
+      <combo_box.item label="ズーム" name="Zoom" />
+      <combo_box.item label="なし" name="None" />
+    </combo_box>
+    <panel name="perms_inv">
+      <text name="perm_modify">このオブジェクトは以下の条件で修正することができます。</text>
+      <text name="Anyone can:">全員：</text>
+      <check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
+      <check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。" />
+      <text name="GroupLabel">グループ：</text>
+      <check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
+      <text name="NextOwnerLabel">次の所有者：</text>
+      <check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
+      <check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
+      <check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="次の所有者は、このオブジェクトを他人に譲渡したり再販できます" />
+    </panel>
+    <check_box label="販売" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
+    <combo_box name="sale type" tool_tip="購入者がコピーを受け取るのか、コピーの中身を受け取るのか、またはアイテム自体を受け取るのかを選択してください。">
+      <combo_box.item label="コピー" name="Copy" />
+      <combo_box.item label="中身" name="Contents" />
+      <combo_box.item label="オリジナル" name="Original" />
+    </combo_box>
+    <spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。" />
+    <check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します" />
+    <text name="pathfinding_attributes_label">経路探索属性：</text>
+    <text name="B:">B：</text>
+    <text name="O:">O：</text>
+    <text name="G:">G：</text>
+    <text name="E:">E：</text>
+    <text name="N:">N：</text>
+    <text name="F:">F：</text>
+  </panel>
+  <panel name="button_panel">
+    <button label="開く" name="open_btn" tool_tip="「オブジェクトの中身」を開いて確認します。" />
+    <button label="支払う" name="pay_btn" tool_tip="「支払い」ウィンドウを開きます。オブジェクトでこの動作を実行するには、支払い用のスクリプトが必要です。" />
+    <button label="買う" name="buy_btn" tool_tip="「購入」ウィンドウを開きます。オブジェクトは販売用に設定する必要があります。" />
+    <button label="詳細" name="details_btn" tool_tip="「オブジェクトを調べる」ウィンドウを開きます。" />
+  </panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 367d43fb4c..9f0c4841d3 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1,2074 +1,4115 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- 
+This file contains strings that used to be hardcoded in the source.
+It is only for those strings which do not belong in a floater.
+For example, the strings used in avatar chat bubbles, and strings
+that are returned from one component and may appear in many places
+-->
 <strings>
-	<string name="SECOND_LIFE">Second Life</string>
-	<string name="APP_NAME">Second Life</string>
-	<string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
-	<string name="SECOND_LIFE_GRID">Second Life Grid</string>
-	<string name="SUPPORT_SITE">Second Life サポートポータル</string>
-	<string name="StartupDetectingHardware">ハードウェアの検出中です...</string>
-	<string name="StartupLoading">[APP_NAME] をインストール中です...</string>
-	<string name="StartupClearingCache">キャッシュをクリア中です...</string>
-	<string name="StartupInitializingTextureCache">テクスチャキャッシュを初期化中です...</string>
-	<string name="StartupRequireDriverUpdate">グラフィックを初期化できませんでした。グラフィックドライバを更新してください。</string>
-	<string name="AboutHeader">[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) 
+
+  <!-- Default Args - these arguments will be replaced in all strings -->
+  <string name="SECOND_LIFE">Second Life</string>
+  <string name="APP_NAME">Second Life</string>
+  <string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
+  <string name="SECOND_LIFE_GRID">Second Lifeグリッド</string>
+  <string name="SUPPORT_SITE">Second Lifeサポートポータル</string>
+  <!-- starting up -->
+  <string name="StartupDetectingHardware">ハードウェアの検出中です…</string>
+  <string name="StartupLoading">[APP_NAME]をインストール中です…</string>
+  <string name="StartupClearingCache">キャッシュをクリア中です…</string>
+  <string name="StartupInitializingTextureCache">テクスチャキャッシュを初期化中です…</string>
+  <string name="StartupRequireDriverUpdate">グラフィックを初期化できませんでした。グラフィックドライバを更新してください。</string>
+
+  <!-- about dialog/support string-->
+  <string name="AboutHeader">[CHANNEL]　[VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3]（[ADDRESS_SIZE]bit）
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
-	<string name="BuildConfig">ビルド構成 [BUILD_CONFIG]</string>
-	<string name="AboutPosition">あなたの現在地は、[POSITION_LOCAL_0,number,1]、[POSITION_LOCAL_1,number,1]、[POSITION_LOCAL_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。（[HOSTIP]）
-SLURL:&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
-(グローバル座標 [POSITION_0,number,1]、[POSITION_1,number,1]、[POSITION_2,number,1])
+  <string name="BuildConfig">ビルド構成：[BUILD_CONFIG]</string>
+
+  <string name="AboutPosition">あなたは、現在[REGION]の[POSITION_LOCAL_0,number,1]，[POSITION_LOCAL_1,number,1]，[POSITION_LOCAL_2,number,1]にいます。
+位置は、&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;です。（[HOSTIP]）
+SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+（グローバル座標は、[POSITION_0,number,1]，[POSITION_1,number,1]，[POSITION_2,number,1]です。）
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]</string>
-	<string name="AboutSystem">CPU：[CPU]
-メモリ：[MEMORY_MB] MB
-OS バージョン：[OS_VERSION]
+  <!-- *NOTE: Do not translate text like GPU, Graphics Card, etc -
+       Most PC users who know what these mean will be used to the English versions,
+       and this info sometimes gets sent to support. -->
+  <string name="AboutSystem">ＣＰＵ：[CPU]
+メモリ：[MEMORY_MB]㎆
+ＯＳのバージョン：[OS_VERSION]
 グラフィックカード製造元：[GRAPHICS_CARD_VENDOR]
 グラフィックカード:[GRAPHICS_CARD]</string>
-	<string name="AboutDriver">Windows グラフィックドライババージョン：[GRAPHICS_DRIVER_VERSION]</string>
-	<string name="AboutOGL">OpenGL バージョン：[OPENGL_VERSION]</string>
-	<string name="AboutSettings">ウィンドウサイズ: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
-フォントサイズ調整: [FONT_SIZE_ADJUSTMENT]pt
-UI スケーリング: [UI_SCALE]
-描画距離: [DRAW_DISTANCE]m
-帯域幅: [NET_BANDWITH]kbit/s
-LOD 係数: [LOD_FACTOR]
-描画の質: [RENDER_QUALITY]
-高度なライティングモデル: [GPU_SHADERS]
-テクスチャメモリ: [TEXTURE_MEMORY]MB</string>
-	<string name="AboutOSXHiDPI">HiDPI 表示モード: [HIDPI]</string>
-	<string name="AboutLibs">J2C デコーダバージョン： [J2C_VERSION] 
-オーディオドライババージョン： [AUDIO_DRIVER_VERSION] 
-[LIBCEF_VERSION] LibVLC バージョン： [LIBVLC_VERSION] 
-ボイスサーバーバージョン: [VOICE_VERSION]</string>
-	<string name="AboutTraffic">パケットロス：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%）</string>
-	<string name="AboutTime">[month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]</string>
-	<string name="ErrorFetchingServerReleaseNotesURL">サーバーのリリースノートの URL を取得中にエラーが発生しました。</string>
-	<string name="BuildConfiguration">ビルド構成</string>
-	<string name="ProgressRestoring">復元中です...</string>
-	<string name="ProgressChangingResolution">解像度を変更中です...</string>
-	<string name="Fullbright">明るさ全開（レガシー）</string>
-	<string name="LoginInProgress">ログイン中です。[APP_NAME]の表示がフリーズする場合があります。  しばらくお待ちください。</string>
-	<string name="LoginInProgressNoFrozen">ログイン中です...</string>
-	<string name="LoginAuthenticating">認証しています...</string>
-	<string name="LoginMaintenance">アカウントのメンテナンスを実行しています...</string>
-	<string name="LoginAttempt">前回のログインに失敗しました。 ログイン中です（[NUMBER] 回目）</string>
-	<string name="LoginPrecaching">ワールドを読み込んでいます...</string>
-	<string name="LoginInitializingBrowser">内蔵 Web ブラウザを初期化しています...</string>
-	<string name="LoginInitializingMultimedia">マルチメディアを初期化しています...</string>
-	<string name="LoginInitializingFonts">フォントをローディング中...</string>
-	<string name="LoginVerifyingCache">キャッシュファイルを検証しています（所要時間は 60 ～ 90 秒）...</string>
-	<string name="LoginProcessingResponse">対応を処理中です...</string>
-	<string name="LoginInitializingWorld">ワールドを初期化中です...</string>
-	<string name="LoginDecodingImages">画像をデコードしています...</string>
-	<string name="LoginInitializingQuicktime">QuickTime を初期化しています...</string>
-	<string name="LoginQuicktimeNotFound">QuickTime が見つかりません。初期化に失敗しました。</string>
-	<string name="LoginQuicktimeOK">QuickTime が正常に初期化されました。</string>
-	<string name="LoginRequestSeedCapGrant">リージョンの機能をリクエストしています...</string>
-	<string name="LoginRetrySeedCapGrant">リージョンの機能をリクエスト、試行 [NUMBER] 回....</string>
-	<string name="LoginWaitingForRegionHandshake">リージョンのハンドシェイクを待っています...</string>
-	<string name="LoginConnectingToRegion">リージョンに接続しています...</string>
-	<string name="LoginDownloadingClothing">衣類をダウンロードしています...</string>
-	<string name="InvalidCertificate">証明書が無効または壊れています。 グリッド管理者にご連絡ください。</string>
-	<string name="CertInvalidHostname">無効なホストネームがサーバーにアクセスしていました。SLURL かグリッドのホストネームをご確認ください。</string>
-	<string name="CertExpired">グリッドが返した証明書は有効期限が終了していると考えられます。お使いのシステムクロックを確認するか、グリッドの管理者にお問い合わせください。</string>
-	<string name="CertKeyUsage">SSL 証明書のエラーが発生しました。  グリッド管理者にご連絡ください。</string>
-	<string name="CertBasicConstraints">サーバーの証明書チェーンに証明書が多すぎます。  グリッド管理者にご連絡ください。</string>
-	<string name="CertInvalidSignature">グリッドサーバーが返した証明書の署名を認証できませんでした。グリッドの管理者にお問い合わせください。</string>
-	<string name="LoginFailedNoNetwork">ネットワークエラー：接続を確立できませんでした。お使いのネットワーク接続をご確認ください。</string>
-	<string name="LoginFailedHeader">ログインに失敗しました。</string>
-	<string name="Quit">終了</string>
-	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
-	<string name="AgniGridLabel">Second Life メイングリッド (Agni)</string>
-	<string name="AditiGridLabel">Second Life ベータテストグリッド (Aditi)</string>
-	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
-	<string name="LoginFailedViewerNotPermitted">お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
-http://secondlife.com/download
+  <string name="AboutDriver">Windowsグラフィックドライババージョン：[GRAPHICS_DRIVER_VERSION]</string>
+  <string name="AboutOGL">OpenGLバージョン：[OPENGL_VERSION]</string>
+  <string name="AboutSettings">ウィンドウサイズ:[WINDOW_WIDTH]x[WINDOW_HEIGHT]
+フォントサイズ調整：[FONT_SIZE_ADJUSTMENT]pt
+ＵＩスケーリング：[UI_SCALE]
+描画距離：[DRAW_DISTANCE]ｍ
+帯域幅：[NET_BANDWITH]kbit／秒
+ＬＯＤ係数：[LOD_FACTOR]
+描画の質：[RENDER_QUALITY]
+高度な光源モデル：[GPU_SHADERS]
+テクスチャメモリ：[TEXTURE_MEMORY]㎆</string>
+  <string name="AboutOSXHiDPI">高ＤＰＩ表示モード：[HIDPI]</string>
+  <string name="AboutLibs">J2Cデコーダバージョン：[J2C_VERSION]
+オーディオドライババージョン：[AUDIO_DRIVER_VERSION]
+LibCEFバージョン：[LIBCEF_VERSION]
+LibVLCバージョン：[LIBVLC_VERSION]
+ボイスサーバーバージョン：[VOICE_VERSION]</string>
+  <string name="AboutTraffic">パケット損失：[PACKETS_LOST,number,0]／[PACKETS_IN,number,0]（[PACKETS_PCT,number,1]％）</string>
+  <string name="AboutTime">[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日　[hour, datetime, slt]：[min,datetime, slt]：[second,datetime,slt]</string>
+  <string name="ErrorFetchingServerReleaseNotesURL">サーバーのリリースノートのＵＲＬ取得時にエラーが発生しました。</string>
+  <string name="BuildConfiguration">ビルド構成</string>
+
+  <!--  progress -->
+  <string name="ProgressRestoring">修復しています…</string>
+  <string name="ProgressChangingResolution">解像度を変更しています…</string>
+
+  <!-- Legacy strings, almost never used -->
+  <string name="Fullbright">明るさ全開（レガシー）</string>  <!-- used in the Build > materials dropdown-->
+
+  <!-- Login -->
+  <string name="LoginInProgress">ログイン中です。[APP_NAME]の表示がフリーズする場合があります。しばらくお待ちください。</string>
+  <string name="LoginInProgressNoFrozen">ログイン中です…</string>
+  <string name="LoginAuthenticating">認証しています…</string>
+  <string name="LoginMaintenance">アカウントのメンテナンスを実行しています…</string>
+  <string name="LoginAttempt">前回のログインに失敗しました。ログイン中です（[NUMBER]回目）</string>
+  <string name="LoginPrecaching">ワールドを読み込んでいます…</string>
+  <string name="LoginInitializingBrowser">内蔵Webブラウザを初期化しています…</string>
+  <string name="LoginInitializingMultimedia">マルチメディアを初期化しています…</string>
+  <string name="LoginInitializingFonts">フォントを読み込んでいます…</string>
+  <string name="LoginVerifyingCache">キャッシュファイルを検証しています（所要時間は60～90秒）…</string>
+  <string name="LoginProcessingResponse">レスポンスを処理しています…</string>
+  <string name="LoginInitializingWorld">ワールドを初期化しています…</string>
+  <string name="LoginDecodingImages">画像をデコードしています…</string>
+  <string name="LoginInitializingQuicktime">QuickTimeを初期化しています…</string>
+  <string name="LoginQuicktimeNotFound">QuickTimeが見つかりません。初期化に失敗しました。</string>
+  <string name="LoginQuicktimeOK">QuickTimeが正常に初期化されました。</string>
+  <string name="LoginRequestSeedCapGrant">リージョン（地域）の機能をリクエストしています…</string>
+  <string name="LoginRetrySeedCapGrant">リージョン（地域）の機能をリクエストしています…（試行[NUMBER]回目）</string>
+  <string name="LoginWaitingForRegionHandshake">リージョン（地域）のハンドシェイクを待っています…</string>
+  <string name="LoginConnectingToRegion">リージョン（地域）に接続しています…</string>
+  <string name="LoginDownloadingClothing">服装をダウンロードしています…</string>
+  <string name="InvalidCertificate">証明書が無効であるか、壊れています。グリッド管理者にご連絡ください。</string>
+  <string name="CertInvalidHostname">無効なホストネームがサーバーにアクセスしようとしています。SLURLかグリッドのホストネームをご確認ください。</string>
+  <string name="CertExpired">グリッドが返した証明書は、有効期限が過ぎていると考えられます。お使いのシステムクロックを確認するか、グリッドの管理者にお問い合わせください。</string>
+  <string name="CertKeyUsage">SSL証明書のエラーが発生しました。グリッド管理者にご連絡ください。</string>
+  <string name="CertBasicConstraints">サーバーの証明書チェーンに証明書が多すぎます。グリッド管理者にご連絡ください。</string>
+  <string name="CertInvalid">証明書が読み込めませんでした。グリッド管理者に連絡してください。</string>
+  <string name="CertInvalidSignature">グリッドが返したサーバー証明書の署名を認証できませんでした。グリッドの管理者にお問い合わせください。</string>
+  <string name="CertAllocationFailure">証明書にOpenSSLメモリを割り当てることができませんでした。</string>
+
+  <string name="LoginFailedNoNetwork">ネットワークエラー：接続を確立できませんでした。お使いのネットワーク接続をご確認ください。</string>
+  <string name="LoginFailedHeader">ログインに失敗しました。</string>
+  <string name="Quit">終了</string>
+  <string name="create_account_url">https://join.secondlife.com/?lang=ja&amp;sourceid=[sourceid]</string>
+
+  <string name="AgniGridLabel">Second Lifeメイングリッド (Agni)</string>
+  <string name="AditiGridLabel">Second Lifeベータテストグリッド (Aditi)</string>
+
+  <string name="ViewerDownloadURL">https://secondlife.com/support/downloads/?lang=ja</string>
+  <string name="LoginFailedViewerNotPermitted">お使いの古いビューアでは、Second Lifeにアクセスできません。以下のページから新しいビューアをダウンロードしてください： https://secondlife.com/support/downloads/?lang=ja
 
 詳細については、FAQ を参照してください：
-http://secondlife.com/viewer-access-faq</string>
-	<string name="LoginIntermediateOptionalUpdateAvailable">ビューワアップデート（オプション）があります： [VERSION]</string>
-	<string name="LoginFailedRequiredUpdate">ビューワアップデート（必須）： [VERSION]</string>
-	<string name="LoginFailedAlreadyLoggedIn">このエージェントは既にログインされています。</string>
-	<string name="LoginFailedAuthenticationFailed">申し訳ありませんが、ログインできませんでした。
+https://secondlife.com/viewer-access-faq</string>
+  <string name="LoginIntermediateOptionalUpdateAvailable">ビューアの更新（オプション）があります：[VERSION]</string>
+  <string name="LoginFailedRequiredUpdate">ビューアの更新（必須）：[VERSION]</string>
+  <string name="LoginFailedAlreadyLoggedIn">このエージェントは既にログインしています。</string>
+  <string name="LoginFailedAuthenticationFailed">申し訳ありませんが、ログインできませんでした。
 以下の情報が正しく入力されたことを確認してください：
-* ユーザー名（bobsmith12 または steller.sunshine など）
-* パスワード
-また、Caps Lock キーが有効になっていないこともお確かめください。</string>
-	<string name="LoginFailedPasswordChanged">セキュリティ上の理由により、あなたのパスワードは変更されました。
-アカウントページ（http://secondlife.com/password）に移動し、
+・ユーザー名（bobsmith12 または steller.sunshine など）
+・パスワード
+・２段階認証（使用している場合）
+また、Caps Lockが入っていないこともご確認ください。</string>
+  <string name="LoginFailedPasswordChanged">セキュリティ上の理由により、あなたのパスワードは変更されました。 アカウントページ（https://secondlife.com/my/account/request.php?lang=ja-JP）へ移動し、
 秘密の質問に答えて、パスワードをリセットしてください。
 ご迷惑をおかけして申し訳ございません。</string>
-	<string name="LoginFailedPasswordReset">弊社はシステムを若干変更しました。お手数ですが、パスワードのリセットをお願いします。
-アカウントページ（http://secondlife.com/password）に移動し、
+  <string name="LoginFailedPasswordReset">弊社はシステムを若干変更しました。お手数ですが、パスワードのリセットをお願いします。アカウントページ（ https://secondlife.com/my/account/request.php?lang=ja-JP ）に移動し、
 秘密の質問に答えて、パスワードをリセットしてください。
 ご迷惑をおかけして申し訳ございません。</string>
-	<string name="LoginFailedEmployeesOnly">Second Life はメンテナンスのため、一時的にご利用いただけません。
+  <string name="LoginFailedEmployeesOnly">Second Lifeは、メンテナンス中につき一時的にご利用いただけません。
 従業員以外にはログインをご遠慮いただいています。
 最新の状況については www.secondlife.com/status でお確かめください。</string>
-	<string name="LoginFailedPremiumOnly">既にログインしているユーザーに最上のインワールド体験を提供するため、Second Life へのログインは一時的に制限されています。
+  <string name="LoginFailedPremiumOnly">既にログインしているユーザーに最上のインワールド体験を提供するため、Second Lifeへのログインは一時的に制限されています。
+申し訳ございませんが、有料アカウントのユーザーを優先するため、現在のところ無料アカウントのユーザーには Second Lifeへのアクセスをご遠慮いただいています。</string>
 
-申し訳ございませんが、有料アカウントのユーザーを優先するため、現在のところ無料アカウントのユーザーには Second Life へのアクセスをご遠慮いただいています。</string>
-	<string name="LoginFailedComputerProhibited">このパソコンからは Second Life にアクセスできません。
-システムのエラーだと思われる場合は、
-support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedAcountSuspended">あなたのアカウントは
-太平洋時間の [TIME] までご利用いただけません。</string>
-	<string name="LoginFailedAccountDisabled">現在リクエストを完了することができません。
-Second Life のサポート（http://support.secondlife.com）にお問い合わせください。</string>
-	<string name="LoginFailedTransformError">ログイン時にデータの不一致が見つかりました。
+  <string name="LoginFailedComputerProhibited">お使いのパソコンからは、Second Lifeにアクセスできません。
+システムエラーだと思われる場合は、 support@secondlife.com にお問い合わせください。</string>
+  <string name="LoginFailedAcountSuspended">あなたのアカウントは、太平洋時間の[TIME]までご利用いただけません。</string>
+  <string name="LoginFailedAccountDisabled">現在リクエストを完了することができません。
+Second Life のサポート（ https://support.secondlife.com/ ）にお問い合わせください。</string>
+  <string name="LoginFailedTransformError">ログイン時にデータの不一致が見つかりました。
 support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedAccountMaintenance">現在アカウントのメインテナンスが行われています。
-あなたのアカウントは
-太平洋時間の [TIME] までご利用いただけません。
+  <!--'Pacific time' placeholder for [TIME] in case time from server can't be decoded-->
+  <string name="PacificTime">太平洋時間</string>
+  <string name="LoginFailedAccountMaintenance">現在アカウントのメンテナンスが行われています。
+あなたのアカウントは、
+太平洋時間の[TIME]までご利用いただけません。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedPendingLogoutFault">ログアウトをリスクエストしたら、シミュレーターから「fault」が返されました。</string>
-	<string name="LoginFailedPendingLogout">システムによるログアウトが実行されました。
+  <string name="LoginFailedPendingLogoutFault">ログアウトのリスクエスト時に、シミュレーターから「fault」が返されました。</string>
+  <string name="LoginFailedPendingLogout">システムによるログアウトが実行されました。
 しばらくしてから再度お試しください。</string>
-	<string name="LoginFailedUnableToCreateSession">有効なセッションを生成できません。</string>
-	<string name="LoginFailedUnableToConnectToSimulator">シミュレーターに接続できませんでした。</string>
-	<string name="LoginFailedRestrictedHours">あなたの Second Life アカウントにアクセスできるのは、
-太平洋時間の [START] ～ [END] の間に限られます。
+  <string name="LoginFailedUnableToCreateSession">有効なセッションを生成できませんでした。</string>
+  <string name="LoginFailedUnableToConnectToSimulator">シミュレーターに接続できませんでした。</string>
+  <string name="LoginFailedRestrictedHours">あなたのSecond Lifeアカウントにアクセスできるのは、
+太平洋時間の[START]～[END]の間に限られます。
 有効な時間帯に再度お試しください。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedIncorrectParameters">パラメーターが正しくありません。
+  <string name="LoginFailedIncorrectParameters">パラメーターが正しくありません。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedFirstNameNotAlphanumeric">ファーストネームのパラメーターは英数字です。
+  <string name="LoginFailedFirstNameNotAlphanumeric">ファーストネームのパラメーターは英数字です。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LoginFailedLastNameNotAlphanumeric">ラストネームのパラメーターは英数字です。
+  <string name="LoginFailedLastNameNotAlphanumeric">ラストネームのパラメーターは英数字です。
 システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-	<string name="LogoutFailedRegionGoingOffline">リージョンはオフライン中です。
+  <string name="LogoutFailedRegionGoingOffline">リージョンは、オフライン中です。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedAgentNotInRegion">エージェントがリージョンに不在です。
+  <string name="LogoutFailedPendingLogin">このリージョンでは、別のセッションでログインされていました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedPendingLogin">このリージョンでは別のセッションがログインされていました。
+  <string name="LogoutFailedLoggingOut">このリージョンでは前のセッションがログアウトされました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedLoggingOut">このリージョンでは前のセッションがログアウトされました。
+  <string name="LogoutFailedStillLoggingOut">このリージョンでは現在も前のセッションのログアウトが処理されています。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedStillLoggingOut">このリージョンでは現在も前のセッションのログアウトが処理されています。
+  <string name="LogoutSucceeded">リージョンでは、前のセッションがログアウトされました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutSucceeded">リージョンでは前のセッションがログアウトされました。
+  <string name="LogoutFailedLogoutBegun">このリージョンで、ログアウトプロセスが開始されました。
 しばらくしてから再度お試しください。</string>
-	<string name="LogoutFailedLogoutBegun">リージョンではログアウトプロセスが開始されました。
+  <string name="LoginFailedLoggingOutSession">あなたの前のセッションはシステムによってログアウトされています。
 しばらくしてから再度お試しください。</string>
-	<string name="LoginFailedLoggingOutSession">あなたの前のセッションはシステムによってログアウトされています。
-しばらくしてから再度お試しください。</string>
-	<string name="AgentLostConnection">このリージョンに不都合が発生している可能性があります。  ご使用のインターネット接続をご確認ください。</string>
-	<string name="SavingSettings">設定を保存中です...</string>
-	<string name="LoggingOut">ログアウト中です...</string>
-	<string name="ShuttingDown">シャットダウン中です...</string>
-	<string name="YouHaveBeenDisconnected">あなたがいたリージョンへの接続が切れました。</string>
-	<string name="SentToInvalidRegion">無効なリージョンにテレポートされました。</string>
-	<string name="TestingDisconnect">ビューワの接続を切るテスト中</string>
-	<string name="SocialFacebookConnecting">Facebook に接続中...</string>
-	<string name="SocialFacebookPosting">投稿中...</string>
-	<string name="SocialFacebookDisconnecting">Facebook から切断中...</string>
-	<string name="SocialFacebookErrorConnecting">Facebook への接続時のエラー</string>
-	<string name="SocialFacebookErrorPosting">Facebook への投稿時のエラー</string>
-	<string name="SocialFacebookErrorDisconnecting">Facebook からの切断時のエラー</string>
-	<string name="SocialFlickrConnecting">Flickr に接続中...</string>
-	<string name="SocialFlickrPosting">投稿中...</string>
-	<string name="SocialFlickrDisconnecting">Flickr から切断中...</string>
-	<string name="SocialFlickrErrorConnecting">Flickr への接続時のエラー</string>
-	<string name="SocialFlickrErrorPosting">Flickr への投稿時のエラー</string>
-	<string name="SocialFlickrErrorDisconnecting">Flickr からの切断時のエラー</string>
-	<string name="SocialTwitterConnecting">Twitter に接続中...</string>
-	<string name="SocialTwitterPosting">投稿中...</string>
-	<string name="SocialTwitterDisconnecting">Twitter から切断中...</string>
-	<string name="SocialTwitterErrorConnecting">Twitter への接続時のエラー</string>
-	<string name="SocialTwitterErrorPosting">Twitter への投稿時のエラー</string>
-	<string name="SocialTwitterErrorDisconnecting">Twitter からの切断時のエラー</string>
-	<string name="BlackAndWhite">白黒</string>
-	<string name="Colors1970">1970 年代のカラー</string>
-	<string name="Intense">強調</string>
-	<string name="Newspaper">新聞紙</string>
-	<string name="Sepia">セピア</string>
-	<string name="Spotlight">スポットライト</string>
-	<string name="Video">ビデオ</string>
-	<string name="Autocontrast">オートコントラスト</string>
-	<string name="LensFlare">レンズフレア</string>
-	<string name="Miniature">ミニチュア</string>
-	<string name="Toycamera">おもちゃのカメラ</string>
-	<string name="TooltipPerson">人</string>
-	<string name="TooltipNoName">（名前なし）</string>
-	<string name="TooltipOwner">所有者:</string>
-	<string name="TooltipPublic">公共</string>
-	<string name="TooltipIsGroup">（グループ）</string>
-	<string name="TooltipForSaleL$">売り出し中:L$ [AMOUNT]</string>
-	<string name="TooltipFlagGroupBuild">グループ作成</string>
-	<string name="TooltipFlagNoBuild">作成禁止</string>
-	<string name="TooltipFlagNoEdit">グループ作成</string>
-	<string name="TooltipFlagNotSafe">危険</string>
-	<string name="TooltipFlagNoFly">飛行禁止</string>
-	<string name="TooltipFlagGroupScripts">グループスクリプト</string>
-	<string name="TooltipFlagNoScripts">スクリプトなし</string>
-	<string name="TooltipLand">土地:</string>
-	<string name="TooltipMustSingleDrop">アイテムは 1 つだけここにドラッグできます</string>
-	<string name="TooltipTooManyWearables">[AMOUNT] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 &gt; 「デバッグ設定を表示」 &gt; 「WearFolderLimit」でこの制限を変更できます。</string>
-	<string name="TooltipPrice" value="L$[AMOUNT]："/>
-	<string name="TooltipSLIcon">これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。</string>
-	<string name="TooltipOutboxDragToWorld">マーケットプレイスのリストフォルダからアイテムを Rez できません</string>
-	<string name="TooltipOutboxWorn">着ているアイテムをマーケットプレイスのリストフォルダに置くことはできません</string>
-	<string name="TooltipOutboxFolderLevels">ネスト入りフォルダの深さが [AMOUNT] 階層を超えています必要に応じてアイテムを箱に入れ、フォルダの階層を減らします。</string>
-	<string name="TooltipOutboxTooManyFolders">サブフォルダ数が [AMOUNT] 個を超えています。必要に応じてアイテムを箱に入れ、リストのフォルダ階層を減らします。</string>
-	<string name="TooltipOutboxTooManyObjects">アイテム数が [AMOUNT] 個を超えています。1 つのリスト内で [AMOUNT] 個を超えるアイテムを販売するためには、いくつかのアイテムを箱に入れる必要があります。</string>
-	<string name="TooltipOutboxTooManyStockItems">在庫アイテム数が [AMOUNT] 個を超えています。</string>
-	<string name="TooltipOutboxCannotDropOnRoot">アイテムまたはフォルダは「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。</string>
-	<string name="TooltipOutboxNoTransfer">これらのオブジェクトの 1 つまたは複数は売り渡したり譲渡したりできないものです</string>
-	<string name="TooltipOutboxNotInInventory">アイテムはインベントリからマーケットプレイスへの移動のみできます</string>
-	<string name="TooltipOutboxLinked">リンクされた相手またはフォルダをマーケットプレイスに置くことはできません</string>
-	<string name="TooltipOutboxCallingCard">コーリングカードをマーケットプレイスに置くことはできません</string>
-	<string name="TooltipOutboxDragActive">表示されているリストを移動できません</string>
-	<string name="TooltipOutboxCannotMoveRoot">ルートフォルダをリストに表示するマーケットプレイスを移動できません</string>
-	<string name="TooltipOutboxMixedStock">在庫フォルダ内のアイテムはすべて同じ種類と権限でなければなりません</string>
-	<string name="TooltipDragOntoOwnChild">フォルダをその子フォルダに移動することはできません</string>
-	<string name="TooltipDragOntoSelf">フォルダをそのフォルダ自身に移動することはできません</string>
-	<string name="TooltipHttpUrl">クリックしてこの Web ページを見ます</string>
-	<string name="TooltipSLURL">クリックしてこの場所の情報を見ます</string>
-	<string name="TooltipAgentUrl">クリックしてこの住人のプロフィールを見ます</string>
-	<string name="TooltipAgentInspect">この住人の詳細を参照</string>
-	<string name="TooltipAgentMute">クリックしてこの住人に対して無視設定をします</string>
-	<string name="TooltipAgentUnmute">クリックしてこの住人に対する無視設定を解除します</string>
-	<string name="TooltipAgentIM">クリックしてこの住人に IM を送ります</string>
-	<string name="TooltipAgentPay">クリックしてこの住人に支払います</string>
-	<string name="TooltipAgentOfferTeleport">クリックしてこの住人にテレポートのリクエストを送ります</string>
-	<string name="TooltipAgentRequestFriend">クリックしてこの住人にフレンド登録リクエストを送ります</string>
-	<string name="TooltipGroupUrl">クリックしてこのグループの説明文を見ます</string>
-	<string name="TooltipEventUrl">クリックしてこのグループの説明文を見ます</string>
-	<string name="TooltipClassifiedUrl">クリックしてこのクラシファイド広告を見ます</string>
-	<string name="TooltipParcelUrl">クリックしてこの区画の説明文を見ます</string>
-	<string name="TooltipTeleportUrl">クリックしてこの場所にテレポートします</string>
-	<string name="TooltipObjectIMUrl">クリックしてこのオブジェクトの説明文を見ます</string>
-	<string name="TooltipMapUrl">クリックしてこの場所を地図に表示します</string>
-	<string name="TooltipSLAPP">クリックして secondlife:// コマンドを出します</string>
-	<string name="CurrentURL" value=" 現在の URL： [CurrentURL]"/>
-	<string name="TooltipEmail">クリックして電子メールを作成</string>
-	<string name="SLurlLabelTeleport">テレポート</string>
-	<string name="SLurlLabelShowOnMap">地図に表示</string>
-	<string name="SLappAgentMute">無視</string>
-	<string name="SLappAgentUnmute">ミュート解除</string>
-	<string name="SLappAgentIM">IM</string>
-	<string name="SLappAgentPay">支払う</string>
-	<string name="SLappAgentOfferTeleport">次の場所にテレポートを送ります：</string>
-	<string name="SLappAgentRequestFriend">フレンド登録リクエスト</string>
-	<string name="SLappAgentRemoveFriend">フレンドの削除</string>
-	<string name="BUTTON_CLOSE_DARWIN">閉じる （⌘W）</string>
-	<string name="BUTTON_CLOSE_WIN">閉じる （Ctrl+W）</string>
-	<string name="BUTTON_CLOSE_CHROME">閉じる</string>
-	<string name="BUTTON_RESTORE">復元</string>
-	<string name="BUTTON_MINIMIZE">元に戻す（縮小）</string>
-	<string name="BUTTON_TEAR_OFF">別ウィンドウで開く</string>
-	<string name="BUTTON_DOCK">ドッキング</string>
-	<string name="BUTTON_HELP">ヘルプを表示</string>
-	<string name="TooltipNotecardNotAllowedTypeDrop">このタイプのアイテムは、このリージョンのノートカード
-に添付することができません。</string>
-	<string name="TooltipNotecardOwnerRestrictedDrop">制限のない「次の所有者」の
+
+  <!-- Disconnection -->
+  <string name="AgentLostConnection">このリージョンに不都合が発生している可能性があります。ご使用のインターネット接続をご確認ください。</string>
+  <string name="SavingSettings">設定を保存中です…</string>
+  <string name="LoggingOut">ログアウト中です…</string>
+  <string name="ShuttingDown">シャットダウン中です…</string>
+  <string name="YouHaveBeenDisconnected">あなたがいたリージョンへの接続が切れました。</string>
+  <string name="SentToInvalidRegion">無効なリージョンにテレポートされました。</string>
+  <string name="TestingDisconnect">ビューアの接続を切るテスト中</string>
+
+  <!-- SLShare: User Friendly Filter Names Translation -->
+  <string name="BlackAndWhite">白黒</string>
+  <string name="Colors1970">１９７０年代のカラー</string>
+  <string name="Intense">強調</string>
+  <string name="Newspaper">新聞紙</string>
+  <string name="Sepia">セピア</string>
+  <string name="Spotlight">スポットライト</string>
+  <string name="Video">ビデオ</string>
+  <string name="Autocontrast">オートコントラスト</string>
+  <string name="LensFlare">レンズフレア</string>
+  <string name="Miniature">ミニチュア</string>
+  <string name="Toycamera">トイカメラ</string>
+
+  <!-- Tooltip -->
+  <string name="TooltipPerson">人</string>
+  <string name="TooltipNoName">（名前なし）</string>
+  <string name="TooltipOwner">所有者：</string>
+  <string name="TooltipPublic">公共</string>
+  <string name="TooltipIsGroup">（グループ）</string>
+  <string name="TooltipForSaleL$">売り出し中：L$[AMOUNT]</string>
+  <string name="TooltipFlagGroupBuild">グループ作成</string>
+  <string name="TooltipFlagNoBuild">作成禁止</string>
+  <string name="TooltipFlagNoEdit">グループ作成</string>
+  <string name="TooltipFlagNotSafe">危険</string>
+  <string name="TooltipFlagNoFly">飛行禁止</string>
+  <string name="TooltipFlagGroupScripts">グループスクリプト</string>
+  <string name="TooltipFlagNoScripts">スクリプトなし</string>
+  <string name="TooltipLand">土地：</string>
+  <string name="TooltipMustSingleDrop">アイテムは１つだけここにドラッグできます。</string>
+  <string name="TooltipTooManyWearables">[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。</string>
+  <string name="TooltipPrice" value="L$ [AMOUNT]：" />
+  <string name="TooltipSLIcon">これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。</string>
+
+  <string name="TooltipOutboxDragToWorld">マーケットプレイスのリストフォルダから、直接アイテムをRezすることはできません</string>
+  <string name="TooltipOutboxWorn">着用しているアイテムをマーケットプレイスのリストフォルダに置くことはできません。</string>
+  <string name="TooltipOutboxFolderLevels">フォルダの階層の深さが、[AMOUNT]階層を超えています。必要に応じてアイテムをボックスに入れるなどをして、フォルダの階層数を減らしてください。</string>
+  <string name="TooltipOutboxTooManyFolders">サブフォルダの数が、[AMOUNT]個を超えています。必要に応じてアイテムをボックスに入れ、リストのフォルダ階層を減らしてください。</string>
+  <string name="TooltipOutboxTooManyObjects">アイテムの数が、[AMOUNT]個を超えています。１つのリスト内で[AMOUNT]個を超えるアイテムを販売するためには、いくつかのアイテムをボックスに入れる必要があります。</string>
+  <string name="TooltipOutboxTooManyStockItems">在庫アイテム数が[AMOUNT]個を超えています。</string>
+  <string name="TooltipOutboxCannotDropOnRoot">アイテムまたはフォルダは、「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。</string>
+  <string name="TooltipOutboxNoTransfer">これらのオブジェクトは、再販したり譲渡することができません。</string>
+  <string name="TooltipOutboxNotInInventory">アイテムは、インベントリからマーケットプレイスへの移動のみできます。</string>
+  <string name="TooltipOutboxLinked">リンクされた相手またはフォルダは、マーケットプレイスに置くことはできません。</string>
+  <string name="TooltipOutboxCallingCard">コーリングカードは、マーケットプレイスに置くことはできません。</string>
+  <string name="TooltipOutboxDragActive">表示されているリストを移動できません。</string>
+  <string name="TooltipOutboxCannotMoveRoot">ルートフォルダをリストに表示するマーケットプレイスを移動できません。</string>
+  <string name="TooltipOutboxMixedStock">在庫フォルダ内のアイテムは、すべて同じ種類と権限でなければなりません。</string>
+
+  <string name="TooltipDragOntoOwnChild">フォルダをその子フォルダに移動することはできません。</string>
+  <string name="TooltipDragOntoSelf">フォルダをそのフォルダ自身に移動することはできません。</string>
+
+  <!-- tooltips for Urls -->
+  <string name="TooltipHttpUrl">クリックしてこのWebページを開きます。</string>
+  <string name="TooltipSLURL">クリックしてこの場所の情報を閲覧します。</string>
+  <string name="TooltipAgentUrl">クリックしてこの住人のプロフィールを閲覧します。</string>
+  <string name="TooltipAgentInspect">この住人の詳細を参照</string>
+  <string name="TooltipAgentMute">クリックしてこの住人に対して無視設定をします。</string>
+  <string name="TooltipAgentUnmute">クリックしてこの住人に対する無視設定を解除します。</string>
+  <string name="TooltipAgentIM">クリックしてこの住人に IM を送ります。</string>
+  <string name="TooltipAgentPay">クリックしてこの住人に支払います。</string>
+  <string name="TooltipAgentOfferTeleport">クリックしてこの住人にテレポートのオファーを送ります。</string>
+  <string name="TooltipAgentRequestFriend">クリックしてこの住人にフレンド登録リクエストを送ります。</string>
+  <string name="TooltipGroupUrl">クリックしてこのグループの説明文を閲覧します。</string>
+  <string name="TooltipEventUrl">クリックしてこのグループの説明文を閲覧します。</string>
+  <string name="TooltipClassifiedUrl">クリックしてこのクラシファイド広告を見ます。</string>
+  <string name="TooltipParcelUrl">クリックしてこの区画の説明文を見ます。</string>
+  <string name="TooltipTeleportUrl">クリックしてこの場所にテレポートします。</string>
+  <string name="TooltipObjectIMUrl">クリックしてこのオブジェクトの説明文を見ます。</string>
+  <string name="TooltipMapUrl">クリックしてこの場所をマップに表示します。</string>
+  <string name="TooltipSLAPP">クリックして secondlife:// コマンドを出します。</string>
+  <string name="CurrentURL" value="現在のＵＲＬ：[CurrentURL]" />
+  <string name="TooltipEmail">クリックして電子メールを作成します。</string>
+
+  <!-- text for SLURL labels -->
+  <string name="SLurlLabelTeleport">テレポート</string>
+  <string name="SLurlLabelShowOnMap">マップに表示</string>
+
+  <!-- label strings for secondlife:///app/agent SLapps -->
+  <string name="SLappAgentMute">無視</string>
+  <string name="SLappAgentUnmute">ミュート解除</string>
+  <string name="SLappAgentIM">ＩＭ</string>
+  <string name="SLappAgentPay">支払い</string>
+  <string name="SLappAgentOfferTeleport">次の場所へのテレポートのオファーを送ります：</string>
+  <string name="SLappAgentRequestFriend">フレンド登録リクエスト</string>
+  <string name="SLappAgentRemoveFriend">フレンドの削除</string>
+
+  <!-- ButtonToolTips, llfloater.cpp -->
+  <string name="BUTTON_CLOSE_DARWIN">閉じる（⌘W）</string>
+  <string name="BUTTON_CLOSE_WIN">閉じる（Ctrl＋W）</string>
+  <string name="BUTTON_CLOSE_CHROME">閉じる</string>
+  <string name="BUTTON_RESTORE">復帰</string>
+  <string name="BUTTON_MINIMIZE">元に戻す（縮小）</string>
+  <string name="BUTTON_TEAR_OFF">別ウィンドウで開く</string>
+  <string name="BUTTON_DOCK">ドッキング</string>
+  <string name="BUTTON_HELP">ヘルプを表示</string>
+
+  <!-- ToolTips for notecards -->
+  <string name="TooltipNotecardNotAllowedTypeDrop">このタイプのアイテムは、このリージョン（地域）のノートカードに添付することができません。</string>
+  <string name="TooltipNotecardOwnerRestrictedDrop">制限のない「次の所有者」の
 許可のみノートカードに
 添付できます。</string>
-	<string name="Searching">検索中...</string>
-	<string name="NoneFound">見つかりませんでした。</string>
-	<string name="RetrievingData">取得中...</string>
-	<string name="ReleaseNotes">リリースノート</string>
-	<string name="RELEASE_NOTES_BASE_URL">https://releasenotes.secondlife.com/viewer/</string>
-	<string name="LoadingData">ローディング...</string>
-	<string name="AvatarNameNobody">（なし）</string>
-	<string name="AvatarNameWaiting">（待機中）</string>
-	<string name="AvatarNameMultiple">（複数）</string>
-	<string name="GroupNameNone">（なし）</string>
-	<string name="AssetErrorNone">エラーなし</string>
-	<string name="AssetErrorRequestFailed">アセットリクエスト： 失敗</string>
-	<string name="AssetErrorNonexistentFile">アセットリクエスト： 存在しないファイル</string>
-	<string name="AssetErrorNotInDatabase">アセットリクエスト： データベースに見つかりませんでした</string>
-	<string name="AssetErrorEOF">終了</string>
-	<string name="AssetErrorCannotOpenFile">ファイルを開けません</string>
-	<string name="AssetErrorFileNotFound">ファイルが見つかりません</string>
-	<string name="AssetErrorTCPTimeout">ファイルの転送タイムアウト</string>
-	<string name="AssetErrorCircuitGone">サーキットエラー</string>
-	<string name="AssetErrorPriceMismatch">ビューワとサーバーの価格が一致していません</string>
-	<string name="AssetErrorUnknownStatus">不明のステータス</string>
-	<string name="AssetUploadServerUnreacheble">サービスがご利用いただけません。</string>
-	<string name="AssetUploadServerDifficulties">サーバーに予期せぬ問題が発生しました。</string>
-	<string name="AssetUploadServerUnavaliable">サービスがご利用いただけないか、アップロードがタイムアウトしました。</string>
-	<string name="AssetUploadRequestInvalid">アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート
-（http://secondlife.com/support）にお問い合わせください。</string>
-	<string name="SettingValidationError">インポートする設定 [NAME] の検証に失敗しました。</string>
-	<string name="SettingImportFileError">ファイル [FILE] を開くことができません</string>
-	<string name="SettingParseFileError">ファイル [FILE] を開くことができません</string>
-	<string name="SettingTranslateError">過去のウインドライト [NAME] を変換できません</string>
-	<string name="texture">テクスチャ</string>
-	<string name="sound">サウンド</string>
-	<string name="calling card">コーリングカード</string>
-	<string name="landmark">ランドマーク</string>
-	<string name="legacy script">レガシースクリプト</string>
-	<string name="clothing">衣類</string>
-	<string name="object">オブジェクト</string>
-	<string name="note card">ノートカード</string>
-	<string name="folder">フォルダ</string>
-	<string name="root">ルート</string>
-	<string name="lsl2 script">LSL2 スクリプト</string>
-	<string name="lsl bytecode">LSL バイトコード</string>
-	<string name="tga texture">tga テクスチャ</string>
-	<string name="body part">身体部位</string>
-	<string name="snapshot">スナップショット</string>
-	<string name="lost and found">紛失物</string>
-	<string name="targa image">targa 画像</string>
-	<string name="trash">ごみ箱</string>
-	<string name="jpeg image">jpeg 画像</string>
-	<string name="animation">アニメーション</string>
-	<string name="gesture">ジェスチャー</string>
-	<string name="simstate">統計</string>
-	<string name="favorite">お気に入り</string>
-	<string name="symbolic link">リンク</string>
-	<string name="symbolic folder link">フォルダのリンク</string>
-	<string name="settings blob">設定</string>
-	<string name="mesh">メッシュ</string>
-	<string name="AvatarEditingAppearance">（容姿の編集中）</string>
-	<string name="AvatarAway">一時退席中</string>
-	<string name="AvatarDoNotDisturb">通知を受けない</string>
-	<string name="AvatarMuted">ブロック中</string>
-	<string name="anim_express_afraid">怖れ</string>
-	<string name="anim_express_anger">怒り</string>
-	<string name="anim_away">退席中</string>
-	<string name="anim_backflip">後ろ宙返り</string>
-	<string name="anim_express_laugh">大笑い</string>
-	<string name="anim_express_toothsmile">満面の笑顔</string>
-	<string name="anim_blowkiss">投げキッス</string>
-	<string name="anim_express_bored">退屈</string>
-	<string name="anim_bow">おじぎ</string>
-	<string name="anim_clap">拍手</string>
-	<string name="anim_courtbow">深いおじぎ</string>
-	<string name="anim_express_cry">泣く</string>
-	<string name="anim_dance1">ダンス 1</string>
-	<string name="anim_dance2">ダンス 2</string>
-	<string name="anim_dance3">ダンス 3</string>
-	<string name="anim_dance4">ダンス 4</string>
-	<string name="anim_dance5">ダンス 5</string>
-	<string name="anim_dance6">ダンス 6</string>
-	<string name="anim_dance7">ダンス 7</string>
-	<string name="anim_dance8">ダンス 8</string>
-	<string name="anim_express_disdain">侮蔑</string>
-	<string name="anim_drink">酔っぱらう</string>
-	<string name="anim_express_embarrased">困惑</string>
-	<string name="anim_angry_fingerwag">指を振る</string>
-	<string name="anim_fist_pump">ガッツポーズ</string>
-	<string name="anim_yoga_float">ヨガ浮遊</string>
-	<string name="anim_express_frown">しかめっ面</string>
-	<string name="anim_impatient">いらいらする</string>
-	<string name="anim_jumpforjoy">飛び上がって喜ぶ</string>
-	<string name="anim_kissmybutt">挑発ポーズ</string>
-	<string name="anim_express_kiss">キス</string>
-	<string name="anim_laugh_short">笑う</string>
-	<string name="anim_musclebeach">力こぶを見せる</string>
-	<string name="anim_no_unhappy">不満げに否定する</string>
-	<string name="anim_no_head">否定する</string>
-	<string name="anim_nyanya">冷やかす</string>
-	<string name="anim_punch_onetwo">ワンツー・パンチ</string>
-	<string name="anim_express_open_mouth">口を開けて驚く</string>
-	<string name="anim_peace">ピース・サイン</string>
-	<string name="anim_point_you">他人を指差す</string>
-	<string name="anim_point_me">自分を指差す</string>
-	<string name="anim_punch_l">左パンチ</string>
-	<string name="anim_punch_r">右パンチ</string>
-	<string name="anim_rps_countdown">じゃんけんポーズ</string>
-	<string name="anim_rps_paper">パー</string>
-	<string name="anim_rps_rock">グー</string>
-	<string name="anim_rps_scissors">チョキ</string>
-	<string name="anim_express_repulsed">嫌悪感</string>
-	<string name="anim_kick_roundhouse_r">まわし蹴り</string>
-	<string name="anim_express_sad">悲しむ</string>
-	<string name="anim_salute">敬礼する</string>
-	<string name="anim_shout">叫ぶ</string>
-	<string name="anim_express_shrug">肩をすくめる</string>
-	<string name="anim_express_smile">微笑む</string>
-	<string name="anim_smoke_idle">たばこをくゆらす</string>
-	<string name="anim_smoke_inhale">たばこを吸う</string>
-	<string name="anim_smoke_throw_down">たばこを捨てる</string>
-	<string name="anim_express_surprise">驚く</string>
-	<string name="anim_sword_strike_r">剣で斬りつける</string>
-	<string name="anim_angry_tantrum">じだんだを踏む</string>
-	<string name="anim_express_tongue_out">舌を出す</string>
-	<string name="anim_hello">手を振る</string>
-	<string name="anim_whisper">小声で話す</string>
-	<string name="anim_whistle">口笛を吹く</string>
-	<string name="anim_express_wink">ウィンク</string>
-	<string name="anim_wink_hollywood">ウィンク(ハリウッド)</string>
-	<string name="anim_express_worry">心配する</string>
-	<string name="anim_yes_happy">笑顔で頷く</string>
-	<string name="anim_yes_head">頷く</string>
-	<string name="multiple_textures">複数</string>
-	<string name="use_texture">テクスチャを使用</string>
-	<string name="manip_hint1">マウスカーソルをルーラに合わせて</string>
-	<string name="manip_hint2">グリッドにスナップ</string>
-	<string name="texture_loading">ローディング...</string>
-	<string name="worldmap_offline">オフライン</string>
-	<string name="worldmap_item_tooltip_format">[AREA] 平方メートル L$[PRICE]</string>
-	<string name="worldmap_results_none_found">見つかりませんでした。</string>
-	<string name="Ok">OK</string>
-	<string name="Premature end of file">不完全なファイル</string>
-	<string name="ST_NO_JOINT">ROOT または JOINT が見つかりません</string>
-	<string name="NearbyChatTitle">近くのチャット</string>
-	<string name="NearbyChatLabel">(近くのチャット)</string>
-	<string name="whisper">のささやき:</string>
-	<string name="shout">の叫び:</string>
-	<string name="ringing">インワールドボイスチャットに接続中...</string>
-	<string name="connected">接続しました</string>
-	<string name="unavailable">現在地では、ボイスを利用できません。</string>
-	<string name="hang_up">インワールドボイスチャットの通話が切断されました</string>
-	<string name="reconnect_nearby">「近くのボイスチャット」に再接続されます</string>
-	<string name="ScriptQuestionCautionChatGranted">[REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を許可しました： [PERMISSIONS]</string>
-	<string name="ScriptQuestionCautionChatDenied">[REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を拒否しました： [PERMISSIONS]</string>
-	<string name="AdditionalPermissionsRequestHeader">あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：</string>
-	<string name="ScriptTakeMoney">リンデンドル（L$）を支払う</string>
-	<string name="ActOnControlInputs">制御入力に基づいて行動</string>
-	<string name="RemapControlInputs">制御入力のリマップ</string>
-	<string name="AnimateYourAvatar">アバターへのアニメーション動作</string>
-	<string name="AttachToYourAvatar">アバターに装着</string>
-	<string name="ReleaseOwnership">所有権を解放し公のものとする</string>
-	<string name="LinkAndDelink">他のオブジェクトのリンクとリンク解除</string>
-	<string name="AddAndRemoveJoints">他のオブジェクトとのジョイントの追加と削除</string>
-	<string name="ChangePermissions">権限の変更</string>
-	<string name="TrackYourCamera">カメラ追従</string>
-	<string name="ControlYourCamera">カメラのコントロール</string>
-	<string name="TeleportYourAgent">あなたをテレポート</string>
-	<string name="ForceSitAvatar">アバターを強制的に座らせる</string>
-	<string name="ChangeEnvSettings">自然環境の設定を変更する</string>
-	<string name="NotConnected">接続されていません</string>
-	<string name="AgentNameSubst">(あなた)</string>
-	<string name="JoinAnExperience"/>
-	<string name="SilentlyManageEstateAccess">土地のアクセスリストを管理するときにアラートを表示しない</string>
-	<string name="OverrideYourAnimations">デフォルトのアニメーションを置き換え</string>
-	<string name="ScriptReturnObjects">あなたの代わりにオブジェクトを返却</string>
-	<string name="UnknownScriptPermission">(不明)!</string>
-	<string name="SIM_ACCESS_PG">General</string>
-	<string name="SIM_ACCESS_MATURE">Moderate</string>
-	<string name="SIM_ACCESS_ADULT">Adult</string>
-	<string name="SIM_ACCESS_DOWN">オフライン</string>
-	<string name="SIM_ACCESS_MIN">不明</string>
-	<string name="land_type_unknown">（不明）</string>
-	<string name="Estate / Full Region">不動産 / フルリージョン</string>
-	<string name="Estate / Homestead">エステート/ホームステッド</string>
-	<string name="Mainland / Homestead">メインランド/ホームステッド</string>
-	<string name="Mainland / Full Region">メインランド / フルリージョン</string>
-	<string name="all_files">全てのファイル</string>
-	<string name="sound_files">サウンド</string>
-	<string name="animation_files">アニメーション</string>
-	<string name="image_files">画像</string>
-	<string name="save_file_verb">保存</string>
-	<string name="load_file_verb">ロード</string>
-	<string name="targa_image_files">Targa 画像</string>
-	<string name="bitmap_image_files">ビットマップ画像</string>
-	<string name="png_image_files">PNG 画像</string>
-	<string name="save_texture_image_files">Targa または PNG 画像</string>
-	<string name="avi_movie_file">AVI ムービーファイル</string>
-	<string name="xaf_animation_file">XAF アニメーションファイル</string>
-	<string name="xml_file">XML ファイル</string>
-	<string name="raw_file">RAW ファイル</string>
-	<string name="compressed_image_files">圧縮画像</string>
-	<string name="load_files">ファイルのロード</string>
-	<string name="choose_the_directory">参照</string>
-	<string name="script_files">スクリプト</string>
-	<string name="dictionary_files">辞書</string>
-	<string name="shape">シェイプ</string>
-	<string name="skin">スキン</string>
-	<string name="hair">髪</string>
-	<string name="eyes">目</string>
-	<string name="shirt">シャツ</string>
-	<string name="pants">パンツ</string>
-	<string name="shoes">靴</string>
-	<string name="socks">靴下</string>
-	<string name="jacket">ジャケット</string>
-	<string name="gloves">手袋</string>
-	<string name="undershirt">下着シャツ</string>
-	<string name="underpants">下着パンツ</string>
-	<string name="skirt">スカート</string>
-	<string name="alpha">アルファ</string>
-	<string name="tattoo">タトゥ</string>
-	<string name="universal">ユニバーサル</string>
-	<string name="physics">物理作用</string>
-	<string name="invalid">無効</string>
-	<string name="none">なし</string>
-	<string name="shirt_not_worn">シャツ未着用</string>
-	<string name="pants_not_worn">パンツ未着用</string>
-	<string name="shoes_not_worn">靴未着用</string>
-	<string name="socks_not_worn">靴下未着用</string>
-	<string name="jacket_not_worn">ジャケット未着用</string>
-	<string name="gloves_not_worn">手袋未着用</string>
-	<string name="undershirt_not_worn">下着（上）未着用</string>
-	<string name="underpants_not_worn">下着（下）未着用</string>
-	<string name="skirt_not_worn">スカート未着用</string>
-	<string name="alpha_not_worn">アルファ未着用</string>
-	<string name="tattoo_not_worn">タトゥー未着用</string>
-	<string name="universal_not_worn">ユニバーサルなし</string>
-	<string name="physics_not_worn">物理作用なし</string>
-	<string name="invalid_not_worn">無効</string>
-	<string name="create_new_shape">新しいシェイプを作成</string>
-	<string name="create_new_skin">新しいスキンを作成</string>
-	<string name="create_new_hair">新しい髪を作成</string>
-	<string name="create_new_eyes">新しい目を作成</string>
-	<string name="create_new_shirt">新しいシャツを作成</string>
-	<string name="create_new_pants">新しいパンツを作成</string>
-	<string name="create_new_shoes">新しい靴を作成</string>
-	<string name="create_new_socks">新しい靴下を作成</string>
-	<string name="create_new_jacket">新しい上着を作成</string>
-	<string name="create_new_gloves">新しい手袋を作成</string>
-	<string name="create_new_undershirt">新しい下着シャツを作成</string>
-	<string name="create_new_underpants">新しい下着パンツを作成</string>
-	<string name="create_new_skirt">新しいスカートを作成</string>
-	<string name="create_new_alpha">新しいアルファを作成</string>
-	<string name="create_new_tattoo">新しいタトゥを作成</string>
-	<string name="create_new_universal">新しいユニバーサルを作成</string>
-	<string name="create_new_physics">新しい物理作用を作成</string>
-	<string name="create_new_invalid">無効</string>
-	<string name="NewWearable">新しい [WEARABLE_ITEM]</string>
-	<string name="next">次へ</string>
-	<string name="ok">OK</string>
-	<string name="GroupNotifyGroupNotice">グループ通知</string>
-	<string name="GroupNotifyGroupNotices">グループ通知</string>
-	<string name="GroupNotifySentBy">送信者</string>
-	<string name="GroupNotifyAttached">添付：</string>
-	<string name="GroupNotifyViewPastNotices">ここで過去の通知を表示するか、メッセージを受け取らない設定をします。</string>
-	<string name="GroupNotifyOpenAttachment">添付アイテムを開く</string>
-	<string name="GroupNotifySaveAttachment">添付アイテムを保存</string>
-	<string name="TeleportOffer">テレポートを送る</string>
-	<string name="StartUpNotifications">不在中に新しい通知が届きました。</string>
-	<string name="OverflowInfoChannelString">あなたにはさらに %d 通の通知があります</string>
-	<string name="BodyPartsRightArm">右腕</string>
-	<string name="BodyPartsHead">頭</string>
-	<string name="BodyPartsLeftArm">左腕</string>
-	<string name="BodyPartsLeftLeg">左脚</string>
-	<string name="BodyPartsTorso">上半身</string>
-	<string name="BodyPartsRightLeg">右脚</string>
-	<string name="BodyPartsEnhancedSkeleton">拡張スケルトン</string>
-	<string name="GraphicsQualityLow">低</string>
-	<string name="GraphicsQualityMid">中</string>
-	<string name="GraphicsQualityHigh">高</string>
-	<string name="LeaveMouselook">ESC キーを押してワールドビューに戻ります</string>
-	<string name="InventoryNoMatchingItems">お探しのものは見つかりましたか？ [secondlife:///app/search/all/[SEARCH_TERM] 検索] をお試しください。</string>
-	<string name="InventoryNoMatchingRecentItems">お探しのものは見つかりましたか？[secondlife:///app/inventory/filters Show filters] をお試しください。</string>
-	<string name="PlacesNoMatchingItems">お探しのものは見つかりましたか？ [secondlife:///app/search/places/[SEARCH_TERM] 検索] をお試しください。</string>
-	<string name="FavoritesNoMatchingItems">ここにランドマークをドラッグしてお気に入りに追加します。</string>
-	<string name="MarketplaceNoMatchingItems">アイテムが見つかりませんでした。検索文字列のスペルを確認して、もう一度やり直してください。</string>
-	<string name="InventoryNoTexture">インベントリ内にこのテクスチャのコピーがありません</string>
-	<string name="InventoryInboxNoItems">マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。</string>
-	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3</string>
-	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
-	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
-	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
-	<string name="InventoryPlayAnimationTooltip">[再生] オプションでウィンドウを開ける。</string>
-	<string name="InventoryPlayGestureTooltip">インワールドで選択済みのジェスチャーを実行する。</string>
-	<string name="InventoryPlaySoundTooltip">[再生] オプションでウィンドウを開ける。</string>
-	<string name="InventoryOutboxNotMerchantTitle">マーケットプレイスでは誰でもアイテムを売ることができます。</string>
-	<string name="InventoryOutboxNotMerchantTooltip"/>
-	<string name="InventoryOutboxNotMerchant">マーチャントになりたい方は、[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストアを作成]する必要があります。</string>
-	<string name="InventoryOutboxNoItemsTitle">アウトボックスは空です。</string>
-	<string name="InventoryOutboxNoItemsTooltip"/>
-	<string name="InventoryOutboxNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグし、「マーケットプレイスに送信」をクリックします。</string>
-	<string name="InventoryOutboxInitializingTitle">マーケットプレイスの初期化。</string>
-	<string name="InventoryOutboxInitializing">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア] のアカウントにアクセスしています。</string>
-	<string name="InventoryOutboxErrorTitle">マーケットプレイス エラー。</string>
-	<string name="InventoryOutboxError">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア] がエラーを返しています。</string>
-	<string name="InventoryMarketplaceError">マーケットプレイスのリストを開くときにエラーが発生しました。引き続きこのメッセージを受信するには、Second Life のサポート (http://support.secondlife.com) にお問い合わせください</string>
-	<string name="InventoryMarketplaceListingsNoItemsTitle">マーケットプレイスのリストフォルダが空です。</string>
-	<string name="InventoryMarketplaceListingsNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。</string>
-	<string name="InventoryItemsCount">（[ITEMS_COUNT] 個のアイテム）</string>
-	<string name="Marketplace Validation Warning Stock">バージョンフォルダに在庫フォルダが含まれなければなりません</string>
-	<string name="Marketplace Validation Error Mixed Stock">: エラー：在庫フォルダ内のすべてのアイテムはコピー不可で同じ種類でなければなりません</string>
-	<string name="Marketplace Validation Error Subfolder In Stock">: エラー：在庫フォルダにサブフォルダを含めることはできません</string>
-	<string name="Marketplace Validation Warning Empty">: 警告：フォルダにアイテムが含まれていません</string>
-	<string name="Marketplace Validation Warning Create Stock">: 警告：在庫フォルダを作成しています</string>
-	<string name="Marketplace Validation Warning Create Version">: 警告：バージョンフォルダ作成中</string>
-	<string name="Marketplace Validation Warning Move">: 警告：アイテム移動中</string>
-	<string name="Marketplace Validation Warning Delete">: 警告：フォルダの中身が在庫フォルダに移されました。空のフォルダを削除します</string>
-	<string name="Marketplace Validation Error Stock Item">: エラー：在庫フォルダにコピー不可アイテムを含める必要があります</string>
-	<string name="Marketplace Validation Warning Unwrapped Item">: 警告：バージョンフォルダにアイテムが含まれていなければなりません</string>
-	<string name="Marketplace Validation Error">: エラー：</string>
-	<string name="Marketplace Validation Warning">: 警告：</string>
-	<string name="Marketplace Validation Error Empty Version">: 警告：バージョンフォルダには、最低 1 アイテムが含まれなければなりません</string>
-	<string name="Marketplace Validation Error Empty Stock">: 警告：在庫フォルダには、最低 1 アイテムが含まれていなければなりません</string>
-	<string name="Marketplace Validation No Error">報告するエラーまたは警告はありません</string>
-	<string name="Marketplace Error None">エラーなし</string>
-	<string name="Marketplace Error Prefix">エラー：</string>
-	<string name="Marketplace Error Not Merchant">マーケットプレイスに商品を送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。</string>
-	<string name="Marketplace Error Not Accepted">アイテムをそのフォルダに移動できません。</string>
-	<string name="Marketplace Error Unsellable Item">このアイテムをマーケットプレイスで販売することはできません。</string>
-	<string name="MarketplaceNoID">Mkt ID なし</string>
-	<string name="MarketplaceLive">リスト掲載済み</string>
-	<string name="MarketplaceActive">有効</string>
-	<string name="MarketplaceMax">最大</string>
-	<string name="MarketplaceStock">在庫</string>
-	<string name="MarketplaceNoStock">在庫なし</string>
-	<string name="MarketplaceUpdating">アップデート中...</string>
-	<string name="UploadFeeInfo">費用はサブスクリプションのレベルにより異なります。レベルが高いほど費用が下がります。[https://secondlife.com/my/account/membership.php? 詳細]</string>
-	<string name="Open landmarks">オープン ランドマーク</string>
-	<string name="Unconstrained">アンコンストレインド（制約なし）</string>
-	<string name="no_transfer" value=" （再販・プレゼント不可）"/>
-	<string name="no_modify" value=" （編集不可）"/>
-	<string name="no_copy" value=" （コピー不可）"/>
-	<string name="worn" value=" （着用中）"/>
-	<string name="link" value=" （リンク）"/>
-	<string name="broken_link" value=" （壊れたリンク）"/>
-	<string name="LoadingContents">コンテンツをロード中です...</string>
-	<string name="NoContents">コンテンツなし</string>
-	<string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT] に装着中）"/>
-	<string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
-	<string name="ActiveGesture" value="[GESLABEL] （アクティブ）"/>
-	<string name="PermYes">はい</string>
-	<string name="PermNo">いいえ</string>
-	<string name="Chat Message" value="チャット："/>
-	<string name="Sound" value=" サウンド："/>
-	<string name="Wait" value=" --- 待機：:"/>
-	<string name="AnimFlagStop" value=" アニメーションを停止："/>
-	<string name="AnimFlagStart" value=" アニメーションを開始："/>
-	<string name="Wave" value=" 手を振る"/>
-	<string name="GestureActionNone" value="なし"/>
-	<string name="HelloAvatar" value=" やあ、アバター！"/>
-	<string name="ViewAllGestures" value="  すべて表示 &gt;&gt;"/>
-	<string name="GetMoreGestures" value="ショッピング &gt;&gt;"/>
-	<string name="Animations" value="アニメーション、"/>
-	<string name="Calling Cards" value="コーリングカード、"/>
-	<string name="Clothing" value="衣類、"/>
-	<string name="Gestures" value="ジェスチャー、"/>
-	<string name="Landmarks" value="ランドマーク、"/>
-	<string name="Notecards" value="ノートカード、"/>
-	<string name="Objects" value="オブジェクト、"/>
-	<string name="Scripts" value="スクリプト、"/>
-	<string name="Sounds" value="サウンド、"/>
-	<string name="Textures" value="テクスチャ、"/>
-	<string name="Snapshots" value="スナップショット、"/>
-	<string name="No Filters" value="いいえ "/>
-	<string name="Since Logoff" value=" - ログオフ以来"/>
-	<string name="InvFolder My Inventory">インベントリ</string>
-	<string name="InvFolder Library">ライブラリ</string>
-	<string name="InvFolder Textures">テクスチャ</string>
-	<string name="InvFolder Sounds">サウンド</string>
-	<string name="InvFolder Calling Cards">コーリングカード</string>
-	<string name="InvFolder Landmarks">ランドマーク</string>
-	<string name="InvFolder Scripts">スクリプト</string>
-	<string name="InvFolder Clothing">衣類</string>
-	<string name="InvFolder Objects">オブジェクト</string>
-	<string name="InvFolder Notecards">ノートカード</string>
-	<string name="InvFolder New Folder">新規フォルダ</string>
-	<string name="InvFolder Inventory">インベントリ</string>
-	<string name="InvFolder Uncompressed Images">圧縮されていない画像</string>
-	<string name="InvFolder Body Parts">身体部位</string>
-	<string name="InvFolder Trash">ごみ箱</string>
-	<string name="InvFolder Photo Album">フォトアルバム</string>
-	<string name="InvFolder Lost And Found">紛失物</string>
-	<string name="InvFolder Uncompressed Sounds">圧縮されていないサウンド</string>
-	<string name="InvFolder Animations">アニメーション</string>
-	<string name="InvFolder Gestures">ジェスチャー</string>
-	<string name="InvFolder Favorite">お気に入り</string>
-	<string name="InvFolder favorite">お気に入り</string>
-	<string name="InvFolder Favorites">お気に入り</string>
-	<string name="InvFolder favorites">お気に入り</string>
-	<string name="InvFolder Current Outfit">着用中のアウトフィット</string>
-	<string name="InvFolder Initial Outfits">最初のアウトフィット</string>
-	<string name="InvFolder My Outfits">マイ アウトフィット</string>
-	<string name="InvFolder Accessories">アクセサリ</string>
-	<string name="InvFolder Meshes">メッシュ</string>
-	<string name="InvFolder Received Items">受け取った商品</string>
-	<string name="InvFolder Merchant Outbox">マーチャントのアウトボックス</string>
-	<string name="InvFolder Friends">フレンド</string>
-	<string name="InvFolder All">全員</string>
-	<string name="no_attachments">着用しているアタッチメントはありません</string>
-	<string name="Attachments remain">アタッチメント（残りのスロット数：[COUNT]）</string>
-	<string name="Buy">買う</string>
-	<string name="BuyforL$">L$ で購入</string>
-	<string name="Stone">石</string>
-	<string name="Metal">金属</string>
-	<string name="Glass">ガラス</string>
-	<string name="Wood">木</string>
-	<string name="Flesh">肌</string>
-	<string name="Plastic">プラスチック</string>
-	<string name="Rubber">ゴム</string>
-	<string name="Light">ライト</string>
-	<string name="KBShift">Shift</string>
-	<string name="KBCtrl">Ctrl</string>
-	<string name="Chest">胸部</string>
-	<string name="Skull">頭蓋</string>
-	<string name="Left Shoulder">左肩</string>
-	<string name="Right Shoulder">右肩</string>
-	<string name="Left Hand">左手</string>
-	<string name="Right Hand">右手</string>
-	<string name="Left Foot">左足</string>
-	<string name="Right Foot">右足</string>
-	<string name="Spine">背骨</string>
-	<string name="Pelvis">骨盤</string>
-	<string name="Mouth">口</string>
-	<string name="Chin">あご</string>
-	<string name="Left Ear">左耳</string>
-	<string name="Right Ear">右耳</string>
-	<string name="Left Eyeball">左目眼球</string>
-	<string name="Right Eyeball">右目眼球</string>
-	<string name="Nose">鼻</string>
-	<string name="R Upper Arm">右上腕</string>
-	<string name="R Forearm">右前腕</string>
-	<string name="L Upper Arm">左上腕</string>
-	<string name="L Forearm">左前腕</string>
-	<string name="Right Hip">右腰</string>
-	<string name="R Upper Leg">右上脚</string>
-	<string name="R Lower Leg">右下脚</string>
-	<string name="Left Hip">左腰</string>
-	<string name="L Upper Leg">左上脚</string>
-	<string name="L Lower Leg">左下脚</string>
-	<string name="Stomach">腹</string>
-	<string name="Left Pec">左胸筋</string>
-	<string name="Right Pec">右胸筋</string>
-	<string name="Neck">首</string>
-	<string name="Avatar Center">アバターの中央</string>
-	<string name="Left Ring Finger">左薬指</string>
-	<string name="Right Ring Finger">右薬指</string>
-	<string name="Tail Base">しっぽのベース</string>
-	<string name="Tail Tip">しっぽの先</string>
-	<string name="Left Wing">左の翼</string>
-	<string name="Right Wing">右の翼</string>
-	<string name="Jaw">顎</string>
-	<string name="Alt Left Ear">代わりの左耳</string>
-	<string name="Alt Right Ear">代わりの右耳</string>
-	<string name="Alt Left Eye">代わりの左目</string>
-	<string name="Alt Right Eye">代わりの右目</string>
-	<string name="Tongue">舌</string>
-	<string name="Groin">脚の付け根</string>
-	<string name="Left Hind Foot">左後足</string>
-	<string name="Right Hind Foot">右後足</string>
-	<string name="Invalid Attachment">装着先が正しくありません</string>
-	<string name="ATTACHMENT_MISSING_ITEM">エラー：アイテムが見つかりません</string>
-	<string name="ATTACHMENT_MISSING_BASE_ITEM">エラー：ベースアイテムが見つかりません</string>
-	<string name="ATTACHMENT_NOT_ATTACHED">エラー：オブジェクトは現在のアウトフィット内にありますが、添付されていません</string>
-	<string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS]</string>
-	<string name="YearsOld">[AGEYEARS]</string>
-	<string name="MonthsOld">[AGEMONTHS]</string>
-	<string name="WeeksOld">[AGEWEEKS]</string>
-	<string name="DaysOld">[AGEDAYS]</string>
-	<string name="TodayOld">今日参加</string>
-	<string name="av_render_everyone_now">全員にあなたが見えるようになりました。</string>
-	<string name="av_render_not_everyone">あなたのまわりの一部の人には、あなたが見えない可能性があります。</string>
-	<string name="av_render_over_half">あなたの周囲の半分以上の人に、あなたが表示されない可能性があります。</string>
-	<string name="av_render_most_of">あなたのまわりのほとんどの人に、あなたが見えない可能性があります。</string>
-	<string name="av_render_anyone">あなたのまわりの誰にもあなたが見えない可能性があります。</string>
-	<string name="hud_description_total">ご利用の HUD</string>
-	<string name="hud_name_with_joint">[OBJ_NAME]（[JNT_NAME] に装着中）</string>
-	<string name="hud_render_memory_warning">[HUD_DETAILS] はたくさんのテクスチャメモリを使用します</string>
-	<string name="hud_render_cost_warning">[HUD_DETAILS] には高価なオブジェクトやテクスチャがたくさん含まれています</string>
-	<string name="hud_render_heavy_textures_warning">[HUD_DETAILS] は大きなテクスチャがたくさん含まれています</string>
-	<string name="hud_render_cramped_warning">[HUD_DETAILS] に含まれるオブジェクトが多すぎます</string>
-	<string name="hud_render_textures_warning">[HUD_DETAILS] に含まれるテクスチャが多すぎます</string>
-	<string name="AgeYearsA">[COUNT] 年</string>
-	<string name="AgeYearsB">[COUNT] 年</string>
-	<string name="AgeYearsC">[COUNT] 年</string>
-	<string name="AgeMonthsA">[COUNT] ヶ月</string>
-	<string name="AgeMonthsB">[COUNT] ヶ月</string>
-	<string name="AgeMonthsC">[COUNT] ヶ月</string>
-	<string name="AgeWeeksA">[COUNT] 週間</string>
-	<string name="AgeWeeksB">[COUNT] 週間</string>
-	<string name="AgeWeeksC">[COUNT] 週間</string>
-	<string name="AgeDaysA">[COUNT] 日間</string>
-	<string name="AgeDaysB">[COUNT] 日間</string>
-	<string name="AgeDaysC">[COUNT] 日間</string>
-	<string name="GroupMembersA">[COUNT] 人</string>
-	<string name="GroupMembersB">[COUNT] 人</string>
-	<string name="GroupMembersC">[COUNT] 人</string>
-	<string name="AcctTypeResident">住人</string>
-	<string name="AcctTypeTrial">トライアル</string>
-	<string name="AcctTypeCharterMember">創立メンバー</string>
-	<string name="AcctTypeEmployee">Linden Lab 従業員</string>
-	<string name="PaymentInfoUsed">支払情報使用履歴あり</string>
-	<string name="PaymentInfoOnFile">支払情報登録済</string>
-	<string name="NoPaymentInfoOnFile">支払情報未登録</string>
-	<string name="AgeVerified">年齢確認済</string>
-	<string name="NotAgeVerified">年齢未確認</string>
-	<string name="Center 2">中心 2</string>
-	<string name="Top Right">右上</string>
-	<string name="Top">上部</string>
-	<string name="Top Left">左上</string>
-	<string name="Center">中心</string>
-	<string name="Bottom Left">左下</string>
-	<string name="Bottom">下部</string>
-	<string name="Bottom Right">右下</string>
-	<string name="CompileQueueDownloadedCompiling">ダウンロード完了、コンパイル中</string>
-	<string name="CompileQueueServiceUnavailable">スクリプト コンパイル サービスを利用できません</string>
-	<string name="CompileQueueScriptNotFound">サーバー上にスクリプトが見つかりません。</string>
-	<string name="CompileQueueProblemDownloading">ダウンロードに問題があります</string>
-	<string name="CompileQueueInsufficientPermDownload">権限不足のためスクリプトをダウンロードできません。</string>
-	<string name="CompileQueueInsufficientPermFor">権限不足：</string>
-	<string name="CompileQueueUnknownFailure">原因不明の失敗によりダウンロードができません</string>
-	<string name="CompileNoExperiencePerm">[EXPERIENCE] 体験による [SCRIPT] スクリプトのスキップ。</string>
-	<string name="CompileQueueTitle">リコンパイル進行</string>
-	<string name="CompileQueueStart">リコンパイル</string>
-	<string name="ResetQueueTitle">進行をリセット</string>
-	<string name="ResetQueueStart">リセット</string>
-	<string name="RunQueueTitle">実行を続けるよう設定</string>
-	<string name="RunQueueStart">実行中に設定</string>
-	<string name="NotRunQueueTitle">実行を停止するよう設定</string>
-	<string name="NotRunQueueStart">実行停止に設定</string>
-	<string name="CompileSuccessful">コンパイルが完了しました！</string>
-	<string name="CompileSuccessfulSaving">コンパイル完了、保存中です...</string>
-	<string name="SaveComplete">保存完了。</string>
-	<string name="UploadFailed">ファイルのアップロードが失敗しました:</string>
-	<string name="ObjectOutOfRange">スクリプト（オブジェクトが範囲外にあります）</string>
-	<string name="ScriptWasDeleted">スクリプト（インベントリから削除済み）</string>
-	<string name="GodToolsObjectOwnedBy">[OWNER] 所有のオブジェクト「[OBJECT]」</string>
-	<string name="GroupsNone">なし</string>
-	<string name="Group" value=" （グループ）"/>
-	<string name="Unknown">（不明）</string>
-	<string name="SummaryForTheWeek" value="今週のまとめ。開始日は"/>
-	<string name="NextStipendDay" value="です。次回のお小遣い支給日："/>
-	<string name="GroupPlanningDate">[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc]</string>
-	<string name="GroupIndividualShare" value="                      グループ       個人の割り当て"/>
-	<string name="GroupColumn" value="グループの設定"/>
-	<string name="Balance">残高</string>
-	<string name="Credits">収入</string>
-	<string name="Debits">支出</string>
-	<string name="Total">合計</string>
-	<string name="NoGroupDataFound">グループのデータが見つかりませんでした</string>
-	<string name="IMParentEstate">parent estate</string>
-	<string name="IMMainland">メインランド</string>
-	<string name="IMTeen">ティーン</string>
-	<string name="Anyone">全員</string>
-	<string name="RegionInfoError">エラー</string>
-	<string name="RegionInfoAllEstatesOwnedBy">[OWNER] が所有するすべての不動産</string>
-	<string name="RegionInfoAllEstatesYouOwn">あなたが所有するすべての不動産</string>
-	<string name="RegionInfoAllEstatesYouManage">あなたが [OWNER] のために管理するすべての不動産</string>
-	<string name="RegionInfoAllowedResidents">常に許可：（[ALLOWEDAGENTS] 人、最大 [MAXACCESS] 人）</string>
-	<string name="RegionInfoAllowedGroups">グループを常に許可：（[ALLOWEDGROUPS]、最大 [MAXACCESS]）</string>
-	<string name="RegionInfoBannedResidents">常に禁止：（[BANNEDAGENTS] 人、最大 [MAXBANNED] 人）</string>
-	<string name="RegionInfoListTypeAllowedAgents">常に許可</string>
-	<string name="RegionInfoListTypeBannedAgents">常に禁止</string>
-	<string name="RegionInfoAllEstates">すべての不動産</string>
-	<string name="RegionInfoManagedEstates">管理されている不動産</string>
-	<string name="RegionInfoThisEstate">この不動産</string>
-	<string name="AndNMore">および [EXTRA_COUNT] つの不動産</string>
-	<string name="ScriptLimitsParcelScriptMemory">区画スクリプトメモリ</string>
-	<string name="ScriptLimitsParcelsOwned">区画一覧： [PARCELS]</string>
-	<string name="ScriptLimitsMemoryUsed">使用されたメモリ： [MAX] kb 中 [COUNT] kb：[AVAILABLE] kb 利用可</string>
-	<string name="ScriptLimitsMemoryUsedSimple">使用されたメモリ： [COUNT] kb</string>
-	<string name="ScriptLimitsParcelScriptURLs">区画のスクリプトURL</string>
-	<string name="ScriptLimitsURLsUsed">使用された URL： [MAX] 中 [COUNT] ：[AVAILABLE] 利用可</string>
-	<string name="ScriptLimitsURLsUsedSimple">使用された URL： [COUNT]</string>
-	<string name="ScriptLimitsRequestError">情報のリクエスト中にエラーが発生しました</string>
-	<string name="ScriptLimitsRequestNoParcelSelected">区画が選択されていません。</string>
-	<string name="ScriptLimitsRequestWrongRegion">エラー： スクリプト情報は現在地のみ取得できます</string>
-	<string name="ScriptLimitsRequestWaiting">情報を取得中...</string>
-	<string name="ScriptLimitsRequestDontOwnParcel">この区画を調査する権限がありません。</string>
-	<string name="SITTING_ON">着席中</string>
-	<string name="ATTACH_CHEST">胸部</string>
-	<string name="ATTACH_HEAD">頭蓋</string>
-	<string name="ATTACH_LSHOULDER">左肩</string>
-	<string name="ATTACH_RSHOULDER">右肩</string>
-	<string name="ATTACH_LHAND">左手</string>
-	<string name="ATTACH_RHAND">右手</string>
-	<string name="ATTACH_LFOOT">左足</string>
-	<string name="ATTACH_RFOOT">右足</string>
-	<string name="ATTACH_BACK">背骨</string>
-	<string name="ATTACH_PELVIS">骨盤</string>
-	<string name="ATTACH_MOUTH">口</string>
-	<string name="ATTACH_CHIN">あご</string>
-	<string name="ATTACH_LEAR">左耳</string>
-	<string name="ATTACH_REAR">右耳</string>
-	<string name="ATTACH_LEYE">左目</string>
-	<string name="ATTACH_REYE">右目</string>
-	<string name="ATTACH_NOSE">鼻</string>
-	<string name="ATTACH_RUARM">右腕（上）</string>
-	<string name="ATTACH_RLARM">右前腕</string>
-	<string name="ATTACH_LUARM">左腕（上）</string>
-	<string name="ATTACH_LLARM">左前腕</string>
-	<string name="ATTACH_RHIP">右腰</string>
-	<string name="ATTACH_RULEG">右脚（上）</string>
-	<string name="ATTACH_RLLEG">右脚（下）</string>
-	<string name="ATTACH_LHIP">左腰</string>
-	<string name="ATTACH_LULEG">左脚（上）</string>
-	<string name="ATTACH_LLLEG">左脚（下）</string>
-	<string name="ATTACH_BELLY">腹</string>
-	<string name="ATTACH_LEFT_PEC">左胸筋</string>
-	<string name="ATTACH_RIGHT_PEC">右胸筋</string>
-	<string name="ATTACH_HUD_CENTER_2">HUD（中央 2）</string>
-	<string name="ATTACH_HUD_TOP_RIGHT">HUD（右上）</string>
-	<string name="ATTACH_HUD_TOP_CENTER">HUD（上・中央）</string>
-	<string name="ATTACH_HUD_TOP_LEFT">HUD（左上）</string>
-	<string name="ATTACH_HUD_CENTER_1">HUD（中央 1）</string>
-	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD（左下）</string>
-	<string name="ATTACH_HUD_BOTTOM">HUD（下）</string>
-	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD（右下）</string>
-	<string name="ATTACH_NECK">首</string>
-	<string name="ATTACH_AVATAR_CENTER">アバターの中央</string>
-	<string name="ATTACH_LHAND_RING1">左薬指</string>
-	<string name="ATTACH_RHAND_RING1">右薬指</string>
-	<string name="ATTACH_TAIL_BASE">しっぽのベース</string>
-	<string name="ATTACH_TAIL_TIP">しっぽの先</string>
-	<string name="ATTACH_LWING">左の翼</string>
-	<string name="ATTACH_RWING">右の翼</string>
-	<string name="ATTACH_FACE_JAW">顎</string>
-	<string name="ATTACH_FACE_LEAR">代わりの左耳</string>
-	<string name="ATTACH_FACE_REAR">代わりの右耳</string>
-	<string name="ATTACH_FACE_LEYE">代わりの左目</string>
-	<string name="ATTACH_FACE_REYE">代わりの右目</string>
-	<string name="ATTACH_FACE_TONGUE">舌</string>
-	<string name="ATTACH_GROIN">脚の付け根</string>
-	<string name="ATTACH_HIND_LFOOT">左後足</string>
-	<string name="ATTACH_HIND_RFOOT">右後足</string>
-	<string name="CursorPos">[LINE] 行目、[COLUMN] 列目</string>
-	<string name="PanelDirCountFound">[COUNT] 件見つかりました</string>
-	<string name="PanelDirTimeStr">[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]</string>
-	<string name="PanelDirEventsDateText">[mthnum,datetime,slt]/[day,datetime,slt]</string>
-	<string name="PanelContentsTooltip">オブジェクトの中身</string>
-	<string name="PanelContentsNewScript">新規スクリプト</string>
-	<string name="DoNotDisturbModeResponseDefault">この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。</string>
-	<string name="MuteByName">（名称別）</string>
-	<string name="MuteAgent">（住人）</string>
-	<string name="MuteObject">（オブジェクト）</string>
-	<string name="MuteGroup">（グループ）</string>
-	<string name="MuteExternal">（外部）</string>
-	<string name="RegionNoCovenant">この不動産には約款がありません。</string>
-	<string name="RegionNoCovenantOtherOwner">この不動産には約款がありません。 この不動産上の土地は不動産所有者により販売され、Linden Lab は販売しません。  販売に関するお問い合わせは、不動産所有者までお願い致します。</string>
-	<string name="covenant_last_modified" value="最終修正日："/>
-	<string name="none_text" value=" （なし） "/>
-	<string name="never_text" value=" （無） "/>
-	<string name="GroupOwned">グループ所有</string>
-	<string name="Public">パブリック</string>
-	<string name="LocalSettings">ローカル設定</string>
-	<string name="RegionSettings">リージョン（地域）の設定</string>
-	<string name="NoEnvironmentSettings">このリージョンは環境設定をサポートしていません。</string>
-	<string name="EnvironmentSun">太陽</string>
-	<string name="EnvironmentMoon">月</string>
-	<string name="EnvironmentBloom">花</string>
-	<string name="EnvironmentCloudNoise">雲の音</string>
-	<string name="EnvironmentNormalMap">ノーマル・マップ</string>
-	<string name="EnvironmentTransparent">Transparent</string>
-	<string name="ClassifiedClicksTxt">クリック数： [TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール</string>
-	<string name="ClassifiedUpdateAfterPublish">（掲載後更新）</string>
-	<string name="NoPicksClassifiedsText">ピックやクラシファイド広告を作成していません。 作成するには、下にある「プラス」ボタンをクリックします。</string>
-	<string name="NoPicksText">ピックを作成していません。[新規] ボタンをクリックしてピックを作成する。</string>
-	<string name="NoClassifiedsText">クラシファイド広告を作成していません。[新規] ボタンをクリックしてクラシファイド広告を作成する。</string>
-	<string name="NoAvatarPicksClassifiedsText">ピック、またはクラシファイド広告がありません</string>
-	<string name="NoAvatarPicksText">ピックがありません</string>
-	<string name="NoAvatarClassifiedsText">クラシファイド広告がありません</string>
-	<string name="PicksClassifiedsLoadingText">ローディング...</string>
-	<string name="MultiPreviewTitle">プレビュー</string>
-	<string name="MultiPropertiesTitle">プロパティ</string>
-	<string name="InvOfferAnObjectNamed">オブジェクト名</string>
-	<string name="InvOfferOwnedByGroup">所有グループ</string>
-	<string name="InvOfferOwnedByUnknownGroup">不明なグループ所有</string>
-	<string name="InvOfferOwnedBy">所有者</string>
-	<string name="InvOfferOwnedByUnknownUser">不明なユーザー所有</string>
-	<string name="InvOfferGaveYou">が渡しました</string>
-	<string name="InvOfferDecline">&lt;nolink&gt;[NAME]&lt;/nolink&gt; からの [DESC] を拒否しました。</string>
-	<string name="GroupMoneyTotal">合計</string>
-	<string name="GroupMoneyBought">購入：</string>
-	<string name="GroupMoneyPaidYou">あなたに支払い：</string>
-	<string name="GroupMoneyPaidInto">paid into</string>
-	<string name="GroupMoneyBoughtPassTo">入場許可を購入：</string>
-	<string name="GroupMoneyPaidFeeForEvent">がイベント用の費用を支払いました</string>
-	<string name="GroupMoneyPaidPrizeForEvent">がイベント用の賞金を支払いました</string>
-	<string name="GroupMoneyBalance">残高</string>
-	<string name="GroupMoneyCredits">収入</string>
-	<string name="GroupMoneyDebits">支出</string>
-	<string name="GroupMoneyDate">[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]</string>
-	<string name="AcquiredItems">取得アイテム</string>
-	<string name="Cancel">キャンセル</string>
-	<string name="UploadingCosts">[NAME] のアップロード料金は L$[AMOUNT] です</string>
-	<string name="BuyingCosts">これを L$[AMOUNT] で購入します</string>
-	<string name="UnknownFileExtension">不明の拡張子： %s
-使用可能な拡張子： .wav, .tga, .bmp, .jpg, .jpeg, or .bvh</string>
-	<string name="MuteObject2">ブロック</string>
-	<string name="MuteAvatar">ブロック</string>
-	<string name="UnmuteObject">ブロック解除</string>
-	<string name="UnmuteAvatar">ブロック解除</string>
-	<string name="AddLandmarkNavBarMenu">マイ ランドマークに追加...</string>
-	<string name="EditLandmarkNavBarMenu">マイ ランドマークを編集...</string>
-	<string name="accel-mac-control">⌃</string>
-	<string name="accel-mac-command">⌘</string>
-	<string name="accel-mac-option">⌥</string>
-	<string name="accel-mac-shift">⇧</string>
-	<string name="accel-win-control">Ctrl+</string>
-	<string name="accel-win-alt">Alt+</string>
-	<string name="accel-win-shift">Shift+</string>
-	<string name="FileSaved">ファイルが保存されました</string>
-	<string name="Receiving">取得中</string>
-	<string name="AM">AM</string>
-	<string name="PM">PM</string>
-	<string name="PST">太平洋標準時</string>
-	<string name="PDT">太平洋夏時間</string>
-	<string name="Direction_Forward">前</string>
-	<string name="Direction_Left">左</string>
-	<string name="Direction_Right">右</string>
-	<string name="Direction_Back">戻る</string>
-	<string name="Direction_North">北</string>
-	<string name="Direction_South">南</string>
-	<string name="Direction_West">西</string>
-	<string name="Direction_East">東</string>
-	<string name="Direction_Up">上</string>
-	<string name="Direction_Down">下</string>
-	<string name="Any Category">全カテゴリ</string>
-	<string name="Shopping">ショッピング</string>
-	<string name="Land Rental">土地のレンタル</string>
-	<string name="Property Rental">プロパティのレンタル</string>
-	<string name="Special Attraction">特別アトラクション</string>
-	<string name="New Products">新製品</string>
-	<string name="Employment">雇用</string>
-	<string name="Wanted">求む</string>
-	<string name="Service">サービス</string>
-	<string name="Personal">パーソナル</string>
-	<string name="None">なし</string>
-	<string name="Linden Location">Linden 所在地</string>
-	<string name="Adult">Adult</string>
-	<string name="Arts&amp;Culture">アートとカルチャー</string>
-	<string name="Business">ビジネス</string>
-	<string name="Educational">教育的</string>
-	<string name="Gaming">ゲーム</string>
-	<string name="Hangout">たまり場</string>
-	<string name="Newcomer Friendly">新住人に優しい</string>
-	<string name="Parks&amp;Nature">公園と自然</string>
-	<string name="Residential">住宅用</string>
-	<string name="Stage">ステージ</string>
-	<string name="Other">その他</string>
-	<string name="Rental">レンタル</string>
-	<string name="Any">全員</string>
-	<string name="You">あなた</string>
-	<string name=":">:</string>
-	<string name=",">,</string>
-	<string name="...">...</string>
-	<string name="***">***</string>
-	<string name="(">(</string>
-	<string name=")">)</string>
-	<string name=".">.</string>
-	<string name="'">'</string>
-	<string name="---">---</string>
-	<string name="Multiple Media">複数のメディア</string>
-	<string name="Play Media">メディアを再生/一時停止</string>
-	<string name="IntelDriverPage">http://www.intel.com/p/en_US/support/detect/graphics</string>
-	<string name="NvidiaDriverPage">http://www.nvidia.com/Download/index.aspx?lang=en-us</string>
-	<string name="AMDDriverPage">http://support.amd.com/us/Pages/AMDSupportHub.aspx</string>
-	<string name="MBCmdLineError">コマンドラインにエラーが見つかりました。
-リンク先を参照してください： http://wiki.secondlife.com/wiki/Client_parameters
+
+  <!-- searching - generic -->
+  <string name="Searching">検索中…</string>
+  <string name="NoneFound">見つかりませんでした。</string>
+
+  <!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
+  <string name="RetrievingData">取得中…</string>
+
+  <string name="ReleaseNotes">リリースノート</string>
+  <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
+  <string name="RELEASE_NOTES_BASE_URL" translate="false">https://releasenotes.secondlife.com/viewer/</string>
+
+  <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+  <string name="LoadingData">読み込んでいます…</string>
+
+  <!-- namecache -->
+  <!-- Avatar name: text shown for LLUUID::null -->
+  <string name="AvatarNameNobody">（なし）</string>
+
+  <!-- Avatar name: text shown while fetching name -->
+  <string name="AvatarNameWaiting">（待機中）</string>
+
+  <!-- Avatar name: More than one avatar is selected/used here -->
+  <string name="AvatarNameMultiple">（複数）</string>
+
+  <!-- Group name: text shown for LLUUID::null -->
+  <string name="GroupNameNone">（なし）</string>
+
+  <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+  <string name="AssetErrorNone">エラーなし</string>
+  <string name="AssetErrorRequestFailed">アセットリクエスト：失敗</string>
+  <string name="AssetErrorNonexistentFile">アセットリクエスト：存在しないファイル</string>
+  <string name="AssetErrorNotInDatabase">アセットリクエスト：データベースに見つかりませんでした。</string>
+  <string name="AssetErrorEOF">終了</string>
+  <string name="AssetErrorCannotOpenFile">ファイルを開けません</string>
+  <string name="AssetErrorFileNotFound">ファイルが見つかりません</string>
+  <string name="AssetErrorTCPTimeout">ファイルの転送タイムアウト</string>
+  <string name="AssetErrorCircuitGone">サーキットエラー</string>
+  <string name="AssetErrorPriceMismatch">ビューアとサーバー上の値段が一致していません。</string>
+  <string name="AssetErrorUnknownStatus">不明のステータス</string>
+
+  <!-- Asset upload errors. -->
+  <string name="AssetUploadServerUnreacheble">現在、サービスをご利用いただけません。</string>
+  <string name="AssetUploadServerDifficulties">サーバーで予期せぬ問題が発生しました。</string>
+  <string name="AssetUploadServerUnavaliable">サービスがご利用いただけないか、アップロードがタイムアウトしました。</string>
+  <string name="AssetUploadRequestInvalid">アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート
+（ https://support.secondlife.com/ ）にお問い合わせください。</string>
+
+  <!-- Settings errors -->
+  <string name="SettingValidationError">インポートする設定[NAME]の検証に失敗しました。</string>
+  <string name="SettingImportFileError">ファイル[FILE]を開くことができません。</string>
+  <string name="SettingParseFileError">ファイル[FILE]を開くことができません。</string>
+  <string name="SettingTranslateError">過去のウインドライト[NAME]を変換できません。</string>
+  <!-- Asset Type human readable names:  these will replace variable [TYPE] in notification FailedToFindWearable* -->
+  <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
+  <string name="texture">テクスチャ</string>
+  <string name="sound">サウンド</string>
+  <string name="calling card">コーリングカード</string>
+  <string name="landmark">ランドマーク</string>
+  <string name="legacy script">レガシースクリプト</string>
+  <string name="clothing">服装</string>
+  <string name="object">オブジェクト</string>
+  <string name="note card">ノートカード</string>
+  <string name="folder">フォルダ</string>
+  <string name="root">ルート</string>
+  <string name="lsl2 script">LSL2スクリプト</string>
+  <string name="lsl bytecode">LSLバイトコード</string>
+  <string name="tga texture">tgaテクスチャ</string>
+  <string name="body part">身体部位</string>
+  <string name="snapshot">スナップショット</string>
+  <string name="lost and found">遺失物</string>
+  <string name="targa image">targa画像</string>
+  <string name="trash">ごみ箱</string>
+  <string name="jpeg image">jpeg画像</string>
+  <string name="animation">アニメーション</string>
+  <string name="gesture">ジェスチャー</string>
+  <string name="simstate">統計</string>
+  <string name="favorite">お気に入り</string>
+  <string name="symbolic link">リンク</string>
+  <string name="symbolic folder link">フォルダのリンク</string>
+  <string name="settings blob">設定</string>
+  <string name="mesh">メッシュ</string>
+
+  <!-- llvoavatar. Displayed in the avatar chat bubble -->
+  <string name="AvatarEditingAppearance">（容姿の編集中）</string>
+  <string name="AvatarAway">一時退席中</string>
+  <string name="AvatarDoNotDisturb">着信拒否</string>
+  <string name="AvatarMuted">ブロック中</string>
+
+  <!-- animations -->
+  <string name="anim_express_afraid">怖れ</string>
+  <string name="anim_express_anger">怒り</string>
+  <string name="anim_away">退席中</string>
+  <string name="anim_backflip">後ろ宙返り</string>
+  <string name="anim_express_laugh">大笑い</string>
+  <string name="anim_express_toothsmile">満面の笑顔</string>
+  <string name="anim_blowkiss">投げキッス</string>
+  <string name="anim_express_bored">退屈</string>
+  <string name="anim_bow">おじぎ</string>
+  <string name="anim_clap">拍手</string>
+  <string name="anim_courtbow">深いおじぎ</string>
+  <string name="anim_express_cry">泣く</string>
+  <string name="anim_dance1">ダンス１</string>
+  <string name="anim_dance2">ダンス２</string>
+  <string name="anim_dance3">ダンス３</string>
+  <string name="anim_dance4">ダンス４</string>
+  <string name="anim_dance5">ダンス５</string>
+  <string name="anim_dance6">ダンス６</string>
+  <string name="anim_dance7">ダンス７</string>
+  <string name="anim_dance8">ダンス８</string>
+  <string name="anim_express_disdain">侮蔑</string>
+  <string name="anim_drink">酔っぱらう</string>
+  <string name="anim_express_embarrased">困惑</string>
+  <string name="anim_angry_fingerwag">指を振る</string>
+  <string name="anim_fist_pump">ガッツポーズ</string>
+  <string name="anim_yoga_float">ヨガ浮遊</string>
+  <string name="anim_express_frown">しかめっ面</string>
+  <string name="anim_impatient">いらいらする</string>
+  <string name="anim_jumpforjoy">飛び上がって喜ぶ</string>
+  <string name="anim_kissmybutt">挑発ポーズ</string>
+  <string name="anim_express_kiss">キス</string>
+  <string name="anim_laugh_short">笑う</string>
+  <string name="anim_musclebeach">力こぶを見せる</string>
+  <string name="anim_no_unhappy">不満げに否定する</string>
+  <string name="anim_no_head">否定する</string>
+  <string name="anim_nyanya">冷やかす</string>
+  <string name="anim_punch_onetwo">ワンツー・パンチ</string>
+  <string name="anim_express_open_mouth">口を開けて驚く</string>
+  <string name="anim_peace">ピース・サイン</string>
+  <string name="anim_point_you">他人を指差す</string>
+  <string name="anim_point_me">自分を指差す</string>
+  <string name="anim_punch_l">左パンチ</string>
+  <string name="anim_punch_r">右パンチ</string>
+  <string name="anim_rps_countdown">じゃんけんポーズ</string>
+  <string name="anim_rps_paper">パー</string>
+  <string name="anim_rps_rock">グー</string>
+  <string name="anim_rps_scissors">チョキ</string>
+  <string name="anim_express_repulsed">嫌悪感</string>
+  <string name="anim_kick_roundhouse_r">まわし蹴り</string>
+  <string name="anim_express_sad">悲しむ</string>
+  <string name="anim_salute">敬礼する</string>
+  <string name="anim_shout">叫ぶ</string>
+  <string name="anim_express_shrug">肩をすくめる</string>
+  <string name="anim_express_smile">微笑む</string>
+  <string name="anim_smoke_idle">たばこをくゆらす</string>
+  <string name="anim_smoke_inhale">たばこを吸う</string>
+  <string name="anim_smoke_throw_down">たばこを捨てる</string>
+  <string name="anim_express_surprise">驚く</string>
+  <string name="anim_sword_strike_r">剣で斬りつける</string>
+  <string name="anim_angry_tantrum">じだんだを踏む</string>
+  <string name="anim_express_tongue_out">舌を出す</string>
+  <string name="anim_hello">手を振る</string>
+  <string name="anim_whisper">小声で話す</string>
+  <string name="anim_whistle">口笛を吹く</string>
+  <string name="anim_express_wink">ウィンク</string>
+  <string name="anim_wink_hollywood">ウィンク（ハリウッド）</string>
+  <string name="anim_express_worry">心配する</string>
+  <string name="anim_yes_happy">笑顔で頷く</string>
+  <string name="anim_yes_head">頷く</string>
+
+  <!-- build floater -->
+  <string name="multiple_textures">複数</string>
+
+  <string name="use_texture">テクスチャを使用</string>
+  <string name="manip_hint1">マウスカーソルをルーラに合わせて</string>
+  <string name="manip_hint2">グリッドにスナップ</string>
+
+  <!-- world map -->
+  <string name="texture_loading">読み込んでいます…</string>
+  <string name="worldmap_offline">オフライン</string>
+  <string name="worldmap_item_tooltip_format">[AREA]㎡　L$ [PRICE]（[SQMPRICE] L$／㎡）</string>
+  <string name="worldmap_results_none_found">何も見つかりませんでした。</string>
+
+  <!-- animations uploading status codes -->
+  <string name="Ok">OK</string>
+  <string name="Premature end of file">不完全なファイル</string>
+  <string name="ST_NO_JOINT">ROOT または JOINT が見つかりません</string>
+
+  <!-- Chat -->
+  <string name="NearbyChatTitle">近隣チャット</string>
+  <string name="NearbyChatLabel">（近隣のチャット）</string>
+  <string name="whisper">のささやき：</string>
+  <string name="shout">のシャウト：</string>
+  <string name="ringing">インワールドボイスチャットに接続中…</string>
+  <string name="connected">接続しました</string>
+  <string name="unavailable">現在地では、ボイスを利用できません。</string>
+  <string name="hang_up">インワールドボイスチャットの通話が切断されました。</string>
+  <string name="reconnect_nearby">「近隣ボイスチャット」に再接続されます。</string>
+  <string name="ScriptQuestionCautionChatGranted">リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を許可しました：[PERMISSIONS]</string>
+  <string name="ScriptQuestionCautionChatDenied">リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を拒否しました：[PERMISSIONS]</string>
+  <string name="AdditionalPermissionsRequestHeader">あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：</string>
+  <string name="ScriptTakeMoney">リンデンドル（L$）のお支払い</string>
+  <string name="ActOnControlInputs">制御入力に基づいて行動</string>
+  <string name="RemapControlInputs">制御入力のリマップ</string>
+  <string name="AnimateYourAvatar">アバターへのアニメーション動作</string>
+  <string name="AttachToYourAvatar">アバターに装着</string>
+  <string name="ReleaseOwnership">所有権を解放し公共物とする</string>
+  <string name="LinkAndDelink">他のオブジェクトのリンクとリンク解除</string>
+  <string name="AddAndRemoveJoints">他のオブジェクトとのジョイントの追加と削除</string>
+  <string name="ChangePermissions">権限の変更</string>
+  <string name="TrackYourCamera">カメラ追従</string>
+  <string name="ControlYourCamera">カメラ操作</string>
+  <string name="TeleportYourAgent">あなたをテレポート</string>
+  <string name="ForceSitAvatar">アバターを強制的に座らせる</string>
+  <string name="ChangeEnvSettings">自然環境の設定を変更する</string>
+
+  <string name="NotConnected">接続されていません</string>
+  <!-- Substitution for agent name -->
+  <string name="AgentNameSubst">（あなた）</string>
+  <!-- intentionally blank -->
+  <string name="JoinAnExperience">体験に参加</string>
+  <string name="SilentlyManageEstateAccess">土地のアクセスリストを管理するときにアラートを表示しない</string>
+  <string name="OverrideYourAnimations">デフォルトのアニメーションを置き換え</string>
+  <string name="ScriptReturnObjects">あなたの代わりにオブジェクトを返却</string>
+  <string name="UnknownScriptPermission">（不明）！</string>
+
+  <!-- Sim Access labels -->
+  <string name="SIM_ACCESS_PG">General</string>
+  <string name="SIM_ACCESS_MATURE">Moderate</string>
+  <string name="SIM_ACCESS_ADULT">Adult</string>
+  <string name="SIM_ACCESS_DOWN">オフライン</string>
+  <string name="SIM_ACCESS_MIN">不明</string>
+
+  <!-- For use when we do not have land type back from the server -->
+  <string name="land_type_unknown">（不明）</string>
+
+  <!-- For land type back from the simulator -->
+  <string name="Estate / Full Region">不動産／フルリージョン</string>
+  <string name="Estate / Homestead">不動産／入植地</string>
+  <string name="Mainland / Homestead">メインランド／入植地</string>
+  <string name="Mainland / Full Region">メインランド／フルリージョン</string>
+
+  <!-- File load/save dialogs -->
+  <string name="all_files">全てのファイル</string>
+  <string name="sound_files">サウンド</string>
+  <string name="animation_files">アニメーション</string>
+  <string name="image_files">画像</string>
+  <string name="save_file_verb">保存</string>
+  <string name="load_file_verb">ロード</string>
+  <string name="targa_image_files">Targa画像</string>
+  <string name="bitmap_image_files">ビットマップ画像</string>
+  <string name="png_image_files">PNG画像</string>
+  <string name="save_texture_image_files">TargaまたはPNG画像</string>
+  <string name="avi_movie_file">AVIムービーファイル</string>
+  <string name="xaf_animation_file">XAFアニメーションファイル</string>
+  <string name="xml_file">XMLファイル</string>
+  <string name="raw_file">RAWファイル</string>
+  <string name="compressed_image_files">圧縮画像</string>
+  <string name="load_files">ファイルのロード</string>
+  <string name="choose_the_directory">参照</string>
+  <string name="script_files">スクリプト</string>
+  <string name="dictionary_files">辞書</string>
+
+  <!-- LSL Usage Hover Tips -->
+  <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window).
+This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings.  -->
+  <string name="LSLTipSleepTime" translate="false">
+Sleeps script for [SLEEP_TIME] seconds.
+  </string>
+
+  <string name="LSLTipText_llSin" translate="false">
+float llSin(float theta)
+Returns the sine of theta (theta in radians)
+  </string>
+  <string name="LSLTipText_llCos" translate="false">
+float llCos(float theta)
+Returns the cosine of theta (theta in radians)
+  </string>
+  <string name="LSLTipText_llTan" translate="false">
+float llTan(float theta)
+Returns the tangent of theta (theta in radians)
+  </string>
+  <string name="LSLTipText_llAtan2" translate="false">
+float llAtan2(float y, float x)
+Returns the arctangent2 of y, x
+  </string>
+  <string name="LSLTipText_llSqrt" translate="false">
+float llSqrt(float val)
+Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results
+  </string>
+  <string name="LSLTipText_llPow" translate="false">
+float llPow(float base, float exponent)
+Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results
+  </string>
+  <string name="LSLTipText_llAbs" translate="false">
+integer llAbs(integer val)
+Returns the positive version of val
+  </string>
+  <string name="LSLTipText_llFabs" translate="false">
+float llFabs(float val)
+Returns the positive version of val
+  </string>
+  <string name="LSLTipText_llFrand" translate="false">
+float llFrand(float mag)
+Returns a pseudo random number in the range [0,mag) or (mag,0]
+  </string>
+  <string name="LSLTipText_llFloor" translate="false">
+integer llFloor(float val)
+Returns largest integer value &lt;= val
+  </string>
+  <string name="LSLTipText_llCeil" translate="false">
+integer llCeil(float val)
+Returns smallest integer value &gt;= val
+  </string>
+  <string name="LSLTipText_llRound" translate="false">
+integer llRound(float val)
+Returns val rounded to the nearest integer
+  </string>
+  <string name="LSLTipText_llVecMag" translate="false">
+float llVecMag(vector v)
+Returns the magnitude of v
+  </string>
+  <string name="LSLTipText_llVecNorm" translate="false">
+vector llVecNorm(vector v)
+Returns the v normalized
+  </string>
+  <string name="LSLTipText_llVecDist" translate="false">
+float llVecDist(vector v1, vector v2)
+Returns the 3D distance between v1 and v2
+  </string>
+  <string name="LSLTipText_llRot2Euler" translate="false">
+vector llRot2Euler(rotation q)
+Returns the Euler representation (roll, pitch, yaw) of q
+  </string>
+  <string name="LSLTipText_llEuler2Rot" translate="false">
+rotation llEuler2Rot(vector v)
+Returns the rotation representation of Euler Angles v
+  </string>
+  <string name="LSLTipText_llAxes2Rot" translate="false">
+rotation llAxes2Rot(vector fwd, vector left, vector up)
+Returns the rotation defined by the coordinate axes
+  </string>
+  <string name="LSLTipText_llRot2Fwd" translate="false">
+vector llRot2Fwd(rotation q)
+Returns the forward vector defined by q
+  </string>
+  <string name="LSLTipText_llRot2Left" translate="false">
+vector llRot2Left(rotation q)
+Returns the left vector defined by q
+  </string>
+  <string name="LSLTipText_llRot2Up" translate="false">
+vector llRot2Up(rotation q)
+Returns the up vector defined by q
+  </string>
+  <string name="LSLTipText_llRotBetween" translate="false">
+rotation llRotBetween(vector v1, vector v2)
+Returns the rotation to rotate v1 to v2
+  </string>
+  <string name="LSLTipText_llWhisper" translate="false">
+llWhisper(integer channel, string msg)
+Whispers the text of msg on channel
+  </string>
+  <string name="LSLTipText_llSay" translate="false">
+llSay(integer channel, string msg)
+Says the text of msg on channel
+  </string>
+  <string name="LSLTipText_llShout" translate="false">
+llShout(integer channel, string msg)
+Shouts the text of msg on channel
+  </string>
+  <string name="LSLTipText_llListen" translate="false">
+integer llListen(integer channel, string name, key id, string msg)
+Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen
+  </string>
+  <string name="LSLTipText_llListenControl" translate="false">
+llListenControl(integer number, integer active)
+Makes a listen event callback active or inactive
+  </string>
+  <string name="LSLTipText_llListenRemove" translate="false">
+llListenRemove(integer number)
+Removes listen event callback number
+  </string>
+  <string name="LSLTipText_llSensor" translate="false">
+llSensor(string name, key id, integer type, float range, float arc)
+Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)
+  </string>
+  <string name="LSLTipText_llSensorRepeat" translate="false">
+llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
+Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds
+  </string>
+  <string name="LSLTipText_llSensorRemove" translate="false">
+llSensorRemove()
+Removes the sensor setup by llSensorRepeat
+  </string>
+  <string name="LSLTipText_llDetectedName" translate="false">
+string llDetectedName(integer number)
+Returns the name of detected object number (returns empty string if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedKey" translate="false">
+key llDetectedKey(integer number)
+Returns the key of detected object number (returns empty key if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedOwner" translate="false">
+key llDetectedOwner(integer number)
+Returns the key of detected object&apos;s owner (returns empty key if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedType" translate="false">
+integer llDetectedType(integer number)
+Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedPos" translate="false">
+vector llDetectedPos(integer number)
+Returns the position of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedVel" translate="false">
+vector llDetectedVel(integer number)
+Returns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedGrab" translate="false">
+vector llDetectedGrab(integer number)
+Returns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedRot" translate="false">
+rotation llDetectedRot(integer number)
+Returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedGroup" translate="false">
+integer llDetectedGroup(integer number)
+Returns TRUE if detected object is part of same group as owner
+  </string>
+  <string name="LSLTipText_llDetectedLinkNumber" translate="false">
+integer llDetectedLinkNumber(integer number)
+Returns the link position of the triggered event for touches and collisions only
+  </string>
+  <string name="LSLTipText_llDie" translate="false">
+llDie()
+Deletes the object
+  </string>
+  <string name="LSLTipText_llGround" translate="false">
+float llGround(vector offset)
+Returns the ground height below the object position + offset
+  </string>
+  <string name="LSLTipText_llCloud" translate="false">
+float llCloud(vector offset)
+Returns the cloud density at the object position + offset
+  </string>
+  <string name="LSLTipText_llWind" translate="false">
+vector llWind(vector offset)
+Returns the wind velocity at the object position + offset
+  </string>
+  <string name="LSLTipText_llSetStatus" translate="false">
+llSetStatus(integer status, integer value)
+Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+  </string>
+  <string name="LSLTipText_llGetStatus" translate="false">
+integer llGetStatus(integer status)
+Returns the boolean value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, or STATUS_ROTATE_Z)
+  </string>
+  <string name="LSLTipText_llSetScale" translate="false">
+llSetScale(vector scale)
+Sets the scale of the prim
+  </string>
+  <string name="LSLTipText_llGetScale" translate="false">
+vector llGetScale()
+Returns the scale of the prim
+  </string>
+  <string name="LSLTipText_llSetColor" translate="false">
+llSetColor(vector color, integer face)
+Sets the color on face of the prim
+  </string>
+  <string name="LSLTipText_llGetAlpha" translate="false">
+float llGetAlpha(integer face)
+Returns the alpha of face
+  </string>
+  <string name="LSLTipText_llSetAlpha" translate="false">
+llSetAlpha(float alpha, integer face)
+Sets the alpha on face
+  </string>
+  <string name="LSLTipText_llGetColor" translate="false">
+vector llGetColor(integer face)
+Returns the color on face
+  </string>
+  <string name="LSLTipText_llSetTexture" translate="false">
+llSetTexture(string texture, integer face)
+Sets the texture of face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llScaleTexture" translate="false">
+llScaleTexture(float u, float v, integer face)
+Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llOffsetTexture" translate="false">
+llOffsetTexture(float u, float v, integer face)
+Sets the texture u  &amp; v offsets for the chosen face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llRotateTexture" translate="false">
+llRotateTexture(float rotation, integer face)
+Sets the texture rotation for the chosen face
+  </string>
+  <string name="LSLTipText_llGetTexture" translate="false">
+string llGetTexture(integer face)
+Returns a string that is the texture on face (the inventory name if it is a texture in the prim&apos;s inventory, otherwise the key)
+  </string>
+  <string name="LSLTipText_llSetPos" translate="false">
+llSetPos(vector pos)
+Moves the object or prim towards pos without using physics (if the script isn&apos;t physical)
+  </string>
+  <string name="LSLTipText_llGetPos" translate="false">
+vector llGetPos()
+Returns the position of the task in region coordinates
+  </string>
+  <string name="LSLTipText_llGetLocalPos" translate="false">
+vector llGetLocalPos()
+Returns the position relative to the root
+  </string>
+  <string name="LSLTipText_llSetRot" translate="false">
+llSetRot(rotation rot)
+Sets the rotation
+  </string>
+  <string name="LSLTipText_llGetRot" translate="false">
+rotation llGetRot()
+Returns the rotation relative to the region&apos;s axes
+  </string>
+  <string name="LSLTipText_llGetLocalRot" translate="false">
+rotation llGetLocalRot()
+Returns the rotation local to the root
+  </string>
+  <string name="LSLTipText_llSetForce" translate="false">
+llSetForce(vector force, integer local)
+Applies force to the object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetForce" translate="false">
+vector llGetForce()
+Returns the force (if the script is physical)
+  </string>
+  <string name="LSLTipText_llTarget" translate="false">
+integer llTarget(vector position, float range)
+Sets positions within range of position as a target and return an ID for the target
+  </string>
+  <string name="LSLTipText_llTargetRemove" translate="false">
+llTargetRemove(integer number)
+Removes positional target number registered with llTarget
+  </string>
+  <string name="LSLTipText_llRotTarget" translate="false">
+integer llRotTarget(rotation rot, float error)
+Set rotations with error of rot as a rotational target and return an ID for the rotational target
+  </string>
+  <string name="LSLTipText_llRotTargetRemove" translate="false">
+llRotTargetRemove(integer number)
+Removes rotational target number registered with llRotTarget
+  </string>
+  <string name="LSLTipText_llMoveToTarget" translate="false">
+llMoveToTarget(vector target, float tau)
+Critically damps to target in tau seconds (if the script is physical)
+  </string>
+  <string name="LSLTipText_llStopMoveToTarget" translate="false">
+llStopMoveToTarget()
+Stops critically damped motion
+  </string>
+  <string name="LSLTipText_llApplyImpulse" translate="false">
+llApplyImpulse(vector force, integer local)
+Applies impulse to object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llApplyRotationalImpulse" translate="false">
+llApplyRotationalImpulse(vector force, integer local)
+Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llSetTorque" translate="false">
+llSetTorque(vector torque, integer local)
+Sets the torque of object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetTorque" translate="false">
+vector llGetTorque()
+Returns the torque (if the script is physical)
+  </string>
+  <string name="LSLTipText_llSetForceAndTorque" translate="false">
+llSetForceAndTorque(vector force, vector torque, integer local)
+Sets the force and torque of object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetVel" translate="false">
+vector llGetVel()
+Returns the velocity of the object
+  </string>
+  <string name="LSLTipText_llGetAccel" translate="false">
+vector llGetAccel()
+Returns the acceleration of the object relative to the region&apos;s axes
+  </string>
+  <string name="LSLTipText_llGetOmega" translate="false">
+vector llGetOmega()
+Returns the rotation velocity in radians per second
+  </string>
+  <string name="LSLTipText_llGetTimeOfDay" translate="false">
+float llGetTimeOfDay()
+Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
+  </string>
+  <string name="LSLTipText_llGetWallclock" translate="false">
+float llGetWallclock()
+Returns the time in seconds since midnight California Pacific time (PST/PDT)
+  </string>
+  <string name="LSLTipText_llGetTime" translate="false">
+float llGetTime()
+Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime
+  </string>
+  <string name="LSLTipText_llResetTime" translate="false">
+llResetTime()
+Sets the script timer to zero
+  </string>
+  <string name="LSLTipText_llGetAndResetTime" translate="false">
+float llGetAndResetTime()
+Returns the script time in seconds and then resets the script timer to zero
+  </string>
+  <string name="LSLTipText_llSound" translate="false">
+llSound(string sound, float volume, integer queue, integer loop)
+Plays sound at volume and whether it should loop or not.
+  </string>
+  <string name="LSLTipText_llPlaySound" translate="false">
+llPlaySound(string sound, float volume)
+Plays attached sound once at volume (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llLoopSound" translate="false">
+llLoopSound(string sound, float volume)
+Plays attached sound looping indefinitely at volume (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llLoopSoundMaster" translate="false">
+llLoopSoundMaster(string sound, float volume)
+Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master
+  </string>
+  <string name="LSLTipText_llLoopSoundSlave" translate="false">
+llLoopSoundSlave(string sound, float volume)
+Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master
+  </string>
+  <string name="LSLTipText_llPlaySoundSlave" translate="false">
+llPlaySoundSlave(string sound, float volume)
+Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master
+  </string>
+  <string name="LSLTipText_llTriggerSound" translate="false">
+llTriggerSound(string sound, float volume)
+Plays sound at volume (0.0 - 1.0), centered at but not attached to object
+  </string>
+  <string name="LSLTipText_llStopSound" translate="false">
+llStopSound()
+Stops currently attached sound
+  </string>
+  <string name="LSLTipText_llPreloadSound" translate="false">
+llPreloadSound(string sound)
+Preloads a sound on viewers within range
+  </string>
+  <string name="LSLTipText_llGetSubString" translate="false">
+string llGetSubString(string src, integer start, integer end)
+Returns the indicated substring
+  </string>
+  <string name="LSLTipText_llDeleteSubString" translate="false">
+string llDeleteSubString(string src, integer start, integer end)
+Removes the indicated substring and returns the result
+  </string>
+  <string name="LSLTipText_llInsertString" translate="false">
+string llInsertString(string dst, integer position, string src)
+Returns a destination string dst with the string src inserted starting at position pos
+  </string>
+  <string name="LSLTipText_llToUpper" translate="false">
+string llToUpper(string src)
+Returns a string that is src with all upper-case characters
+  </string>
+  <string name="LSLTipText_llToLower" translate="false">
+string llToLower(string src)
+Returns a string that is src with all lower-case characters
+  </string>
+  <string name="LSLTipText_llGiveMoney" translate="false">
+llGiveMoney(key destination, integer amount)
+Transfers amount of L$ from script owner to destination
+  </string>
+  <string name="LSLTipText_llMakeExplosion" translate="false">
+llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes a round explosion of particles
+  </string>
+  <string name="LSLTipText_llMakeFountain" translate="false">
+llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
+Makes a fountain of particles
+  </string>
+  <string name="LSLTipText_llMakeSmoke" translate="false">
+llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes smoke like particles
+  </string>
+  <string name="LSLTipText_llMakeFire" translate="false">
+llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes fire like particles
+  </string>
+  <string name="LSLTipText_llRezObject" translate="false">
+llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner&apos;s inventory object at pos with velocity vel and rotation rot with start parameter param
+  </string>
+  <string name="LSLTipText_llLookAt" translate="false">
+llLookAt(vector target, float strength, float damping)
+Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon
+  </string>
+  <string name="LSLTipText_llStopLookAt" translate="false">
+llStopLookAt()
+Stops causing object to point at a target
+  </string>
+  <string name="LSLTipText_llSetTimerEvent" translate="false">
+llSetTimerEvent(float sec)
+Causes the timer event to be triggered a maximum of once every sec seconds
+  </string>
+  <string name="LSLTipText_llSleep" translate="false">
+llSleep(float sec)
+Puts the script to sleep for sec seconds
+  </string>
+  <string name="LSLTipText_llGetMass" translate="false">
+float llGetMass()
+Returns the mass of object that the script is attached to
+  </string>
+  <string name="LSLTipText_llCollisionFilter" translate="false">
+llCollisionFilter(string name, key id, integer accept)
+Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id
+  </string>
+  <string name="LSLTipText_llTakeControls" translate="false">
+llTakeControls(integer controls, integer accept, integer pass_on)
+Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for
+  </string>
+  <string name="LSLTipText_llReleaseControls" translate="false">
+llReleaseControls()
+Stops taking inputs that were taken with llTakeControls
+  </string>
+  <string name="LSLTipText_llAttachToAvatar" translate="false">
+llAttachToAvatar(integer attach_point)
+Attaches the object to the avatar who has granted permission to the script
+  </string>
+  <string name="LSLTipText_llDetachFromAvatar" translate="false">
+llDetachFromAvatar()
+Detaches object from avatar
+  </string>
+  <string name="LSLTipText_llTakeCamera" translate="false">
+llTakeCamera(key avatar)
+Moves avatar&apos;s viewpoint to task
+  </string>
+  <string name="LSLTipText_llReleaseCamera" translate="false">
+llReleaseCamera(key avatar)
+Returns camera to agent avatar
+  </string>
+  <string name="LSLTipText_llGetOwner" translate="false">
+key llGetOwner()
+Returns the object owner&apos;s UUID
+  </string>
+  <string name="LSLTipText_llInstantMessage" translate="false">
+llInstantMessage(key user, string message)
+Sends the specified string as an Instant Message to the user
+  </string>
+  <string name="LSLTipText_llEmail" translate="false">
+llEmail(string address, string subject, string message)
+Sends an email to address with the subject and message
+  </string>
+  <string name="LSLTipText_llGetNextEmail" translate="false">
+llGetNextEmail(string address, string subject)
+Gets the next waiting email that comes from address, with specified subject
+  </string>
+  <string name="LSLTipText_llGetKey" translate="false">
+key llGetKey()
+Returns the key of the prim the script is attached to
+  </string>
+  <string name="LSLTipText_llSetBuoyancy" translate="false">
+llSetBuoyancy(float buoyancy)
+Sets the buoyancy of the task or object (0 is disabled, &lt; 1.0 sinks, 1.0 floats, &gt; 1.0 rises)
+  </string>
+  <string name="LSLTipText_llSetHoverHeight" translate="false">
+llSetHoverHeight(float height, integer water, float tau)
+Critically damps to a height above the ground (or water) in tau seconds
+  </string>
+  <string name="LSLTipText_llStopHover" translate="false">
+llStopHover()
+Stops hovering to a height
+  </string>
+  <string name="LSLTipText_llMinEventDelay" translate="false">
+llMinEventDelay(float delay)
+Sets the minimum time between events being handled
+  </string>
+  <string name="LSLTipText_llSoundPreload" translate="false">
+llSoundPreload(string sound)
+Preloads a sound on viewers within range
+  </string>
+  <string name="LSLTipText_llRotLookAt" translate="false">
+llRotLookAt(rotation target, float strength, float damping)
+Causes object to point its forward axis towards target
+  </string>
+  <string name="LSLTipText_llStringLength" translate="false">
+integer llStringLength(string str)
+Returns the length of string
+  </string>
+  <string name="LSLTipText_llStartAnimation" translate="false">
+llStartAnimation(string anim)
+Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked
+  </string>
+  <string name="LSLTipText_llStopAnimation" translate="false">
+llStopAnimation(string anim)
+Stops animation anim for agent that granted permission
+  </string>
+  <string name="LSLTipText_llPointAt" translate="false">
+llPointAt(vector pos)
+Makes agent that owns object point at pos
+  </string>
+  <string name="LSLTipText_llStopPointAt" translate="false">
+llStopPointAt()
+Stops pointing agent that owns object
+  </string>
+  <string name="LSLTipText_llTargetOmega" translate="false">
+llTargetOmega(vector axis, float spinrate, float gain)
+Rotates the object around axis at spinrate with strength gain
+  </string>
+  <string name="LSLTipText_llGetStartParameter" translate="false">
+integer llGetStartParameter()
+Returns an integer that is the script start/rez parameter
+  </string>
+  <string name="LSLTipText_llGodLikeRezObject" translate="false">
+llGodLikeRezObject(key inventory, vector pos)
+Rezzes directly off of UUID if owner is in God Mode
+  </string>
+  <string name="LSLTipText_llRequestPermissions" translate="false">
+llRequestPermissions(key agent, integer perm)
+Asks the agent for permission to run certain classes of functions
+  </string>
+  <string name="LSLTipText_llGetPermissionsKey" translate="false">
+key llGetPermissionsKey()
+Returns the key of the avatar that last granted permissions to the script
+  </string>
+  <string name="LSLTipText_llGetPermissions" translate="false">
+integer llGetPermissions()
+Returns an integer bitfield with the permissions that have been granted
+  </string>
+  <string name="LSLTipText_llGetLinkNumber" translate="false">
+integer llGetLinkNumber()
+Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc)
+  </string>
+  <string name="LSLTipText_llSetLinkColor" translate="false">
+llSetLinkColor(integer linknumber, vector color, integer face)
+Sets face to color if a task exists in the link chain at linknumber
+  </string>
+  <string name="LSLTipText_llCreateLink" translate="false">
+llCreateLink(key target, integer parent)
+Attempts to link the script&apos;s object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script&apos;s object becomes the root
+  </string>
+  <string name="LSLTipText_llBreakLink" translate="false">
+llBreakLink(integer linknum)
+Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted)
+  </string>
+  <string name="LSLTipText_llBreakAllLinks" translate="false">
+llBreakAllLinks()
+Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted)
+  </string>
+  <string name="LSLTipText_llGetLinkKey" translate="false">
+key llGetLinkKey(integer linknumber)
+Returns the key of the linked prim linknumber
+  </string>
+  <string name="LSLTipText_llGetLinkName" translate="false">
+string llGetLinkName(integer linknumber)
+Returns the name of linknumber in a link set
+  </string>
+  <string name="LSLTipText_llGetInventoryNumber" translate="false">
+integer llGetInventoryNumber(integer type)
+Returns the number of items of a given type (INVENTORY_* flag) in the prim&apos;s inventory
+  </string>
+  <string name="LSLTipText_llGetInventoryName" translate="false">
+string llGetInventoryName(integer type, integer number)
+Returns the name of the inventory item number of a given type
+  </string>
+  <string name="LSLTipText_llSetScriptState" translate="false">
+llSetScriptState(string name, integer run)
+Sets the running state of the specified script
+  </string>
+  <string name="LSLTipText_llGetEnergy" translate="false">
+float llGetEnergy()
+Returns how much energy is in the object as a percentage of maximum
+  </string>
+  <string name="LSLTipText_llGiveInventory" translate="false">
+llGiveInventory(key destination, string inventory)
+Gives inventory to destination
+  </string>
+  <string name="LSLTipText_llRemoveInventory" translate="false">
+llRemoveInventory(string item)
+Removes the named inventory item
+  </string>
+  <string name="LSLTipText_llSetText" translate="false">
+llSetText(string text, vector color, float alpha)
+Displays text that hovers over the prim with specific color and translucency specified with alpha
+  </string>
+  <string name="LSLTipText_llWater" translate="false">
+float llWater(vector offset)
+Returns the water height below the object position + offset
+  </string>
+  <string name="LSLTipText_llPassTouches" translate="false">
+llPassTouches(integer pass)
+If pass == TRUE, touches are passed from children on to parents
+  </string>
+  <string name="LSLTipText_llRequestAgentData" translate="false">
+key llRequestAgentData(key id, integer data)
+Requests data about agent id. When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llRequestInventoryData" translate="false">
+key llRequestInventoryData(string name)
+Requests data from object&apos;s inventory object. When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llSetDamage" translate="false">
+llSetDamage(float damage)
+Sets the amount of damage that will be done when this object hits an avatar.
+  </string>
+  <string name="LSLTipText_llTeleportAgentHome" translate="false">
+llTeleportAgentHome(key id)
+Teleports avatar on the owner&apos;s land to their home location without any warning
+  </string>
+  <string name="LSLTipText_llModifyLand" translate="false">
+llModifyLand(integer action, integer brush)
+Modifies land using the specified action on the specified brush size of land
+  </string>
+  <string name="LSLTipText_llCollisionSound" translate="false">
+llCollisionSound(string impact_sound, float impact_volume)
+Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume
+  </string>
+  <string name="LSLTipText_llCollisionSprite" translate="false">
+llCollisionSprite(string impact_sprite)
+Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress)
+  </string>
+  <string name="LSLTipText_llGetAnimation" translate="false">
+string llGetAnimation(key id)
+Returns the name of the currently playing locomotion animation for avatar id
+  </string>
+  <string name="LSLTipText_llResetScript" translate="false">
+llResetScript()
+Resets the script
+  </string>
+  <string name="LSLTipText_llMessageLinked" translate="false">
+llMessageLinked(integer linknum, integer num, string str, key id)
+Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum.
+  </string>
+  <string name="LSLTipText_llPushObject" translate="false">
+llPushObject(key id, vector impulse, vector ang_impulse, integer local)
+Applies impulse and ang_impulse to object id
+  </string>
+  <string name="LSLTipText_llPassCollisions" translate="false">
+llPassCollisions(integer pass)
+If pass == TRUE, collisions are passed from children on to parents (default is FALSE)
+  </string>
+  <string name="LSLTipText_llGetScriptName" translate="false">
+string llGetScriptName()
+Returns the name of the script that this function is used in
+  </string>
+  <string name="LSLTipText_llGetNumberOfSides" translate="false">
+integer llGetNumberOfSides()
+Returns the number of faces (or sides) of the prim
+  </string>
+  <string name="LSLTipText_llAxisAngle2Rot" translate="false">
+rotation llAxisAngle2Rot(vector axis, float angle)
+Returns the rotation that is a generated angle about axis
+  </string>
+  <string name="LSLTipText_llRot2Axis" translate="false">
+vector llRot2Axis(rotation rot)
+Returns the rotation axis represented by rot
+  </string>
+  <string name="LSLTipText_llRot2Angle" translate="false">
+float llRot2Angle(rotation rot)
+Returns the rotation angle represented by rot
+  </string>
+  <string name="LSLTipText_llAcos" translate="false">
+float llAcos(float val)
+Returns the arccosine in radians of val
+  </string>
+  <string name="LSLTipText_llAsin" translate="false">
+float llAsin(float val)
+Returns the arcsine in radians of val
+  </string>
+  <string name="LSLTipText_llAngleBetween" translate="false">
+float llAngleBetween(rotation a, rotation b)
+Returns angle between rotation a and b
+  </string>
+  <string name="LSLTipText_llGetInventoryKey" translate="false">
+key llGetInventoryKey(string name)
+Returns the key that is the UUID of the inventory name
+  </string>
+  <string name="LSLTipText_llAllowInventoryDrop" translate="false">
+llAllowInventoryDrop(integer add)
+If add == TRUE, users without modify permissions can still drop inventory items onto a prim
+  </string>
+  <string name="LSLTipText_llGetSunDirection" translate="false">
+vector llGetSunDirection()
+Returns a normalized vector of the direction of the sun in the region
+  </string>
+  <string name="LSLTipText_llGetTextureOffset" translate="false">
+vector llGetTextureOffset(integer face)
+Returns the texture offset of face in the x and y components of a vector
+  </string>
+  <string name="LSLTipText_llGetTextureScale" translate="false">
+vector llGetTextureScale(integer side)
+Returns the texture scale of side in the x and y components of a vector
+  </string>
+  <string name="LSLTipText_llGetTextureRot" translate="false">
+float llGetTextureRot(integer side)
+Returns the texture rotation of side
+  </string>
+  <string name="LSLTipText_llSubStringIndex" translate="false">
+integer llSubStringIndex(string source, string pattern)
+Returns an integer that is the index in source where pattern first appears.
+(Returns -1 if not found)
+  </string>
+  <string name="LSLTipText_llGetOwnerKey" translate="false">
+key llGetOwnerKey(key id)
+Returns the owner of object id
+  </string>
+  <string name="LSLTipText_llGetCenterOfMass" translate="false">
+vector llGetCenterOfMass()
+Returns the prim&apos;s center of mass (unless called from the root prim, where it returns the object&apos;s center of mass)
+  </string>
+  <string name="LSLTipText_llListSort" translate="false">
+list llListSort(list src, integer stride, integer ascending)
+Sorts the list into blocks of stride, in ascending order if ascending == TRUE.
+The sort order is affected by type.
+  </string>
+  <string name="LSLTipText_llGetListLength" translate="false">
+integer llGetListLength(list src)
+Returns the number of elements in the list
+  </string>
+  <string name="LSLTipText_llList2Integer" translate="false">
+integer llList2Integer(list src, integer index)
+Copies the integer at index in the list
+  </string>
+  <string name="LSLTipText_llList2Float" translate="false">
+float llList2Float(list src, integer index)
+Copies the float at index in the list
+  </string>
+  <string name="LSLTipText_llList2String" translate="false">
+string llList2String(list src, integer index)
+Copies the string at index in the list
+  </string>
+  <string name="LSLTipText_llList2Key" translate="false">
+key llList2Key(list src, integer index)
+Copies the key at index in the list
+  </string>
+  <string name="LSLTipText_llList2Vector" translate="false">
+vector llList2Vector(list src, integer index)
+Copies the vector at index in the list
+  </string>
+  <string name="LSLTipText_llList2Rot" translate="false">
+rotation llList2Rot(list src, integer index)
+Copies the rotation at index in the list
+  </string>
+  <string name="LSLTipText_llList2List" translate="false">
+list llList2List(list src, integer start, integer end)
+Copies the slice of the list from start to end
+  </string>
+  <string name="LSLTipText_llDeleteSubList" translate="false">
+list llDeleteSubList(list src, integer start, integer end)
+Removes the slice from start to end and returns the remainder of the list
+  </string>
+  <string name="LSLTipText_llGetListEntryType" translate="false">
+integer llGetListEntryType(list src, integer index)
+Returns the type of the index entry in the list
+(TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)
+  </string>
+  <string name="LSLTipText_llList2CSV" translate="false">
+string llList2CSV(list src)
+Creates a string of comma separated values from list
+  </string>
+  <string name="LSLTipText_llCSV2List" translate="false">
+list llCSV2List(string src)
+Creates a list from a string of comma separated values
+  </string>
+  <string name="LSLTipText_llListRandomize" translate="false">
+list llListRandomize(list src, integer stride)
+Returns a randomized list of blocks of size stride
+  </string>
+  <string name="LSLTipText_llList2ListStrided" translate="false">
+list llList2ListStrided(list src, integer start, integer end, integer stride)
+Copies the strided slice of the list from start to end
+  </string>
+  <string name="LSLTipText_llGetRegionCorner" translate="false">
+vector llGetRegionCorner()
+Returns a vector in meters that is the global location of the south-west corner of the region which the object is in
+  </string>
+  <string name="LSLTipText_llListInsertList" translate="false">
+list llListInsertList(list dest, list src, integer start)
+Returns a list that contains all the elements from dest but with the elements from src inserted at position start
+  </string>
+  <string name="LSLTipText_llListFindList" translate="false">
+integer llListFindList(list src, list test)
+Returns the index of the first instance of test in src.
+(Returns -1 if not found)
+  </string>
+  <string name="LSLTipText_llGetObjectName" translate="false">
+string llGetObjectName()
+Returns the name of the prim which the script is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectName" translate="false">
+llSetObjectName(string name)
+Sets the prim&apos;s name to the name parameter
+  </string>
+  <string name="LSLTipText_llGetDate" translate="false">
+string llGetDate()
+Returns the current date in the UTC time zone in the format YYYY-MM-DD
+  </string>
+  <string name="LSLTipText_llEdgeOfWorld" translate="false">
+integer llEdgeOfWorld(vector pos, vector dir)
+Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region)
+  </string>
+  <string name="LSLTipText_llGetAgentInfo" translate="false">
+integer llGetAgentInfo(key id)
+Returns an integer bitfield containing the agent information about id.
+Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.
+  </string>
+  <string name="LSLTipText_llAdjustSoundVolume" translate="false">
+llAdjustSoundVolume(float volume)
+Adjusts volume of attached sound (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llSetSoundQueueing" translate="false">
+llSetSoundQueueing(integer queue)
+Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default])
+  </string>
+  <string name="LSLTipText_llSetSoundRadius" translate="false">
+llSetSoundRadius(float radius)
+Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)
+  </string>
+  <string name="LSLTipText_llKey2Name" translate="false">
+string llKey2Name(key id)
+Returns the name of the prim or avatar specified by id.
+(The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.)
+  </string>
+  <string name="LSLTipText_llSetTextureAnim" translate="false">
+llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animates the texture on the specified face/faces
+  </string>
+  <string name="LSLTipText_llTriggerSoundLimited" translate="false">
+llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west)
+Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west
+  </string>
+  <string name="LSLTipText_llEjectFromLand" translate="false">
+llEjectFromLand(key avatar)
+Ejects avatar from the parcel
+  </string>
+  <string name="LSLTipText_llParseString2List" translate="false">
+list llParseString2List(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers
+(separators and spacers must be lists of strings, maximum of 8 each)
+  </string>
+  <string name="LSLTipText_llOverMyLand" translate="false">
+integer llOverMyLand(key id)
+Returns TRUE if id is over land owned by the script owner, otherwise FALSE
+  </string>
+  <string name="LSLTipText_llGetLandOwnerAt" translate="false">
+key llGetLandOwnerAt(vector pos)
+Returns the key of the land owner, returns NULL_KEY if public
+  </string>
+  <string name="LSLTipText_llGetNotecardLine" translate="false">
+key llGetNotecardLine(string name, integer line)
+Returns line line of notecard name via the dataserver event
+  </string>
+  <string name="LSLTipText_llGetAgentSize" translate="false">
+vector llGetAgentSize(key id)
+If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR
+  </string>
+  <string name="LSLTipText_llSameGroup" translate="false">
+integer llSameGroup(key id)
+Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE
+  </string>
+  <string name="LSLTipText_llUnSit" translate="false">
+key llUnSit(key id)
+If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object&apos;s owner, the avatar is forced to stand up
+  </string>
+  <string name="LSLTipText_llGroundSlope" translate="false">
+vector llGroundSlope(vector offset)
+Returns the ground slope below the object position + offset
+  </string>
+  <string name="LSLTipText_llGroundNormal" translate="false">
+vector llGroundNormal(vector offset)
+Returns the ground normal below the object position + offset
+  </string>
+  <string name="LSLTipText_llGroundContour" translate="false">
+vector llGroundCountour(vector offset)
+Returns the ground contour direction below the object position + offset
+  </string>
+  <string name="LSLTipText_llGetAttached" translate="false">
+integer llGetAttached()
+Returns the object&apos;s attachment point, or 0 if not attached
+  </string>
+  <string name="LSLTipText_llGetFreeMemory" translate="false">
+integer llGetFreeMemory()
+Returns the number of free bytes of memory the script can use
+  </string>
+  <string name="LSLTipText_llGetRegionName" translate="false">
+string llGetRegionName()
+Returns the current region name
+  </string>
+  <string name="LSLTipText_llGetRegionTimeDilation" translate="false">
+float llGetRegionTimeDilation()
+Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation)
+  </string>
+  <string name="LSLTipText_llGetRegionFPS" translate="false">
+float llGetRegionFPS()
+Returns the mean region frames per second
+  </string>
+  <string name="LSLTipText_llParticleSystem" translate="false">
+llParticleSystem(list rules)
+Creates a particle system based on rules.  An empty list removes the particle system.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+  </string>
+  <string name="LSLTipText_llGroundRepel" translate="false">
+llGroundRepel(float height, integer water, float tau)
+Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE)
+  </string>
+  <string name="LSLTipText_llGiveInventoryList" translate="false">
+llGiveInventoryList(key target, string folder, list inventory)
+Gives inventory items to target, creating a new folder to put them in
+  </string>
+  <string name="LSLTipText_llSetVehicleType" translate="false">
+llSetVehicleType(integer type)
+Sets the vehicle to one of the default types
+  </string>
+  <string name="LSLTipText_llSetVehicleFloatParam" translate="false">
+llSetVehicleFloatParam(integer param, float value)
+Sets the specified vehicle float parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleVectorParam" translate="false">
+llSetVehicleVectorParam(integer param, vector vec)
+Sets the specified vehicle vector parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleRotationParam" translate="false">
+llSetVehicleVectorParam(integer param, rotation rot)
+Sets the specified vehicle rotation parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleFlags" translate="false">
+llSetVehicleFlags(integer flags)
+Sets the enabled bits in &apos;flags&apos;
+  </string>
+  <string name="LSLTipText_llRemoveVehicleFlags" translate="false">
+llRemoveVehicleFlags(integer flags)
+Removes the enabled bits in &apos;flags&apos;
+  </string>
+  <string name="LSLTipText_llSitTarget" translate="false">
+llSitTarget(vector offset, rotation rot)
+Sets the sit location for the prim.  If offset == &lt;0,0,0&gt; then the sit target is removed.
+  </string>
+  <string name="LSLTipText_llAvatarOnSitTarget" translate="false">
+key llAvatarOnSitTarget()
+If an avatar is seated on the sit target, returns the avatar&apos;s key, otherwise NULL_KEY
+  </string>
+  <string name="LSLTipText_llAddToLandPassList" translate="false">
+llAddToLandPassList(key avatar, float hours)
+Adds avatar to the land pass list for hours, or indefinitely if hours is 0
+  </string>
+  <string name="LSLTipText_llSetTouchText" translate="false">
+llSetTouchText(string text)
+Displays text rather than the default &apos;Touch&apos; in the pie menu
+  </string>
+  <string name="LSLTipText_llSetSitText" translate="false">
+llSetSitText(string text)
+Displays text rather than the default &apos;Sit Here&apos; in the pie menu
+  </string>
+  <string name="LSLTipText_llSetCameraEyeOffset" translate="false">
+llSetCameraEyeOffset(vector offset)
+Sets the camera eye offset for avatars that sit on the object
+  </string>
+  <string name="LSLTipText_llSetCameraAtOffset" translate="false">
+llSetCameraAtOffset(vector offset)
+Sets the point the camera is looking at to offset for avatars that sit on the object
+  </string>
+  <string name="LSLTipText_llDumpList2String" translate="false">
+string llDumpList2String(list src, string separator)
+Returns the list in a single string, using separator between the entries
+  </string>
+  <string name="LSLTipText_llScriptDanger" translate="false">
+integer llScriptDanger(vector pos)
+Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
+  </string>
+  <string name="LSLTipText_llDialog" translate="false">
+llDialog(key avatar, string message, list buttons, integer chat_channel)
+Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
+If a button is pressed, the avatar says the text of the button label on chat_channel.
+  </string>
+  <string name="LSLTipText_llVolumeDetect" translate="false">
+llVolumeDetect(integer detect)
+If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating.
+Must be applied to the root prim.
+  </string>
+  <string name="LSLTipText_llResetOtherScript" translate="false">
+llResetOtherScript(string name)
+Resets script name
+  </string>
+  <string name="LSLTipText_llGetScriptState" translate="false">
+integer llGetScriptState(string name)
+Returns TRUE if the script name is running
+  </string>
+  <string name="LSLTipText_llRemoteLoadScript" translate="false">
+DEPRECATED!  Please use llRemoteLoadScriptPin instead.
+  </string>
+  <string name="LSLTipText_llSetRemoteScriptAccessPin" translate="false">
+llSetRemoteScriptAccessPin(integer pin)
+If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored.
+  </string>
+  <string name="LSLTipText_llRemoteLoadScriptPin" translate="false">
+llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
+Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used.
+If running == TRUE, starts the script with start_param
+  </string>
+  <string name="LSLTipText_llOpenRemoteDataChannel" translate="false">
+llOpenRemoteDataChannel()
+Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available
+  </string>
+  <string name="LSLTipText_llSendRemoteData" translate="false">
+key llSendRemoteData(key channel, string dest, integer idata, string sdata)
+Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.
+Returns a key that is the message_id for the resulting remote_data events.
+  </string>
+  <string name="LSLTipText_llRemoteDataReply" translate="false">
+llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
+Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata
+  </string>
+  <string name="LSLTipText_llCloseRemoteDataChannel" translate="false">
+llCloseRemoteDataChannel(key channel)
+Closes XML-RPC channel
+  </string>
+  <string name="LSLTipText_llMD5String" translate="false">
+string llMD5String(string src, integer nonce)
+Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce
+  </string>
+  <string name="LSLTipText_llSetPrimitiveParams" translate="false">
+llSetPrimitiveParams(list rules)
+Sets the prim&apos;s parameters according to rules
+  </string>
+  <string name="LSLTipText_llStringToBase64" translate="false">
+string llStringToBase64(string str)
+Converts a string to the Base64 representation of the string
+  </string>
+  <string name="LSLTipText_llBase64ToString" translate="false">
+string llBase64ToString(string str)
+Converts a Base64 string to a conventional string.
+If the conversion creates any unprintable characters, they are converted to spaces.
+  </string>
+  <string name="LSLTipText_llXorBase64Strings" translate="false">
+string llXorBase64Strings(string s1, string s2)
+DEPRECATED!  Please use llXorBase64StringsCorrect instead.
+Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string.  s2 repeats if it is shorter than s1.  Retained for backwards compatability.
+  </string>
+  <string name="LSLTipText_llRemoteDataSetRegion" translate="false">
+llRemoteDataSetRegion()
+DEPRECATED!  Please use llOpenRemoteDataChannel instead.
+If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions.
+  </string>
+  <string name="LSLTipText_llLog10" translate="false">
+float llLog10(float val)
+Returns the base 10 logarithm of val.  Returns zero if val &lt;= 0.
+  </string>
+  <string name="LSLTipText_llLog" translate="false">
+float llLog(float val)
+Returns the natural logarithm of val.  Returns zero if val &lt;= 0.
+  </string>
+  <string name="LSLTipText_llGetAnimationList" translate="false">
+list llGetAnimationList(key id)
+Returns a list of keys of playing animations for avatar described by id
+  </string>
+  <string name="LSLTipText_llSetParcelMusicURL" translate="false">
+llSetParcelMusicURL(string url)
+Sets the streaming audio URL for the parcel which the object is on
+  </string>
+  <string name="LSLTipText_llGetRootPosition" translate="false">
+vector llGetRootPosition()
+Returns the position (in region coordinates) of the root prim of the object which the script is attached to
+  </string>
+  <string name="LSLTipText_llGetRootRotation" translate="false">
+rotation llGetRootRotation()
+Returns the rotation (relative to the region) of the root prim of the object which the script is attached to
+  </string>
+  <string name="LSLTipText_llGetObjectDesc" translate="false">
+string llGetObjectDesc()
+Returns the description of the prim the script is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectDesc" translate="false">
+llSetObjectDesc(string name)
+Sets the prim&apos;s description
+  </string>
+  <string name="LSLTipText_llGetCreator" translate="false">
+key llGetCreator()
+Returns a key for the creator of the prim
+  </string>
+  <string name="LSLTipText_llGetTimestamp" translate="false">
+string llGetTimestamp()
+Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ
+  </string>
+  <string name="LSLTipText_llSetLinkAlpha" translate="false">
+llSetLinkAlpha(integer linknumber, float alpha, integer face)
+If a prim exists in the link chain at linknumber, sets face to alpha
+  </string>
+  <string name="LSLTipText_llGetNumberOfPrims" translate="false">
+integer llGetNumberOfPrims()
+Returns the number of prims in a link set the script is attached to
+  </string>
+  <string name="LSLTipText_llGetNumberOfNotecardLines" translate="false">
+key llGetNumberOfNotecardLines(string name)
+Returns number of lines in notecard name via the dataserver event (cast return value to integer)
+  </string>
+  <string name="LSLTipText_llGetBoundingBox" translate="false">
+list llGetBoundingBox(key object)
+Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ]
+  </string>
+  <string name="LSLTipText_llGetGeometricCenter" translate="false">
+vector llGetGeometricCenter()
+Returns the geometric center of the linked set the script is attached to.
+  </string>
+  <string name="LSLTipText_llGetPrimitiveParams" translate="false">
+list llGetPrimitiveParams(list params)
+Returns the primitive parameters specified in the params list.
+  </string>
+  <string name="LSLTipText_llIntegerToBase64" translate="false">
+string llIntegerToBase64(integer number)
+Returns a string that is a Base64 big endian encode of number
+  </string>
+  <string name="LSLTipText_llBase64ToInteger" translate="false">
+integer llBase64ToInteger(string str)
+Returns an integer that is the str Base64 decoded as a big endian integer
+  </string>
+  <string name="LSLTipText_llGetGMTclock" translate="false">
+float llGetGMTclock()
+Returns the time in seconds since midnight GMT
+  </string>
+  <string name="LSLTipText_llGetSimulatorHostname" translate="false">
+string llGetSimulatorHostname()
+Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog)
+  </string>
+  <string name="LSLTipText_llSetLocalRot" translate="false">
+llSetLocalRot(rotation rot)
+Sets the rotation of a child prim relative to the root prim
+  </string>
+  <string name="LSLTipText_llParseStringKeepNulls" translate="false">
+list llParseStringKeepNulls(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated.
+(separators and spacers must be lists of strings, maximum of 8 each)
+  </string>
+  <string name="LSLTipText_llRezAtRoot" translate="false">
+llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner&apos;s inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter
+  </string>
+  <string name="LSLTipText_llGetObjectPermMask" translate="false">
+integer llGetObjectPermMask(integer mask)
+Returns the requested permission mask for the root object the task is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectPermMask" translate="false">
+llSetObjectPermMask(integer mask, integer value)
+Sets the given permission mask to the new value on the root object the task is attached to (requires God Mode)
+  </string>
+  <string name="LSLTipText_llGetInventoryPermMask" translate="false">
+integer llGetInventoryPermMask(string item, integer mask)
+Returns the requested permission mask for the inventory item
+  </string>
+  <string name="LSLTipText_llSetInventoryPermMask" translate="false">
+llSetInventoryPermMask(string item, integer mask, integer value)
+Sets the given permission mask to the new value on the inventory item (requires God Mode)
+  </string>
+  <string name="LSLTipText_llGetInventoryCreator" translate="false">
+key llGetInventoryCreator(string item)
+Returns a key for the creator of the inventory item
+  </string>
+  <string name="LSLTipText_llOwnerSay" translate="false">
+llOwnerSay(string msg)
+Says msg to owner only.  (Owner must be in the same region.)
+  </string>
+  <string name="LSLTipText_llRequestSimulatorData" translate="false">
+key llRequestSimulatorData(string simulator, integer data)
+Requests data about simulator.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llForceMouselook" translate="false">
+llForceMouselook(integer mouselook)
+If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode
+  </string>
+  <string name="LSLTipText_llGetObjectMass" translate="false">
+float llGetObjectMass(key id)
+Returns the mass of the avatar or object in the region
+  </string>
+  <string name="LSLTipText_llListReplaceList" translate="false">
+list llListReplaceList(list dest, list src, integer start, integer end)
+Returns a list that is dest with start through end removed and src inserted at start
+  </string>
+  <string name="LSLTipText_llLoadURL" translate="false">
+llLoadURL(key avatar, string message, string url)
+Shows a dialog to avatar offering to load the web page at url with a message.
+If user clicks yes, launches the page in their web browser.
+  </string>
+  <string name="LSLTipText_llParcelMediaCommandList" translate="false">
+llParcelMediaCommandList(list command)
+Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media
+  </string>
+  <string name="LSLTipText_llParcelMediaQuery" translate="false">
+list llParcelMediaQuery(list query)
+Returns a list containing results of the sent query
+  </string>
+  <string name="LSLTipText_llModPow" translate="false">
+integer llModPow(integer a, integer b, integer c)
+Returns a raised to the b power, mod c. ( (a**b)%c )
+b is capped at 0xFFFF (16 bits).
+  </string>
+  <string name="LSLTipText_llGetInventoryType" translate="false">
+integer llGetInventoryType(string name)
+Returns the type of the inventory item name
+  </string>
+  <string name="LSLTipText_llSetPayPrice" translate="false">
+llSetPayPrice(integer price, list quick_pay_buttons)
+Sets the default amount on the dialog that appears when someone chooses to pay this prim
+  </string>
+  <string name="LSLTipText_llGetCameraPos" translate="false">
+vector llGetCameraPos()
+Returns the current camera position for the agent the task has permissions for
+  </string>
+  <string name="LSLTipText_llGetCameraRot" translate="false">
+rotation llGetCameraRot()
+Returns the current camera orientation for the agent the task has permissions for
+  </string>
+  <string name="LSLTipText_llSetPrimURL" translate="false">
+llSetPrimURL(string url)
+Updates the URL for the web page shown on the sides of the object
+  </string>
+  <string name="LSLTipText_llRefreshPrimURL" translate="false">
+llRefreshPrimURL()
+Reloads the web page shown on the sides of the object
+  </string>
+  <string name="LSLTipText_llEscapeURL" translate="false">
+string llEscapeURL(string url)
+Returns an escaped/encoded version of url, replacing spaces with %20 etc.
+  </string>
+  <string name="LSLTipText_llUnescapeURL" translate="false">
+string llUnescapeURL(string url)
+Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc.
+  </string>
+  <string name="LSLTipText_llMapDestination" translate="false">
+llMapDestination(string simname, vector pos, vector look_at)
+Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.)
+Only works for scripts attached to avatar, or during touch events.
+  </string>
+  <string name="LSLTipText_llAddToLandBanList" translate="false">
+llAddToLandBanList(key avatar, float hours)
+Adds avatar to the land ban list for hours, or indefinitely if hours is 0
+  </string>
+  <string name="LSLTipText_llRemoveFromLandPassList" translate="false">
+llRemoveFromLandPassList(key avatar)
+Removes avatar from the land pass list
+  </string>
+  <string name="LSLTipText_llRemoveFromLandBanList" translate="false">
+llRemoveFromLandBanList(key avatar)
+Removes avatar from the land ban list
+  </string>
+  <string name="LSLTipText_llSetCameraParams" translate="false">
+llSetCameraParams(list rules)
+Sets multiple camera parameters at once.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+  </string>
+  <string name="LSLTipText_llClearCameraParams" translate="false">
+llClearCameraParams()
+Resets all camera parameters to default values and turns off scripted camera control
+  </string>
+  <string name="LSLTipText_llListStatistics" translate="false">
+float llListStatistics(integer operation, list src)
+Performs statistical aggregate functions on list src using LIST_STAT_* operations
+  </string>
+  <string name="LSLTipText_llGetUnixTime" translate="false">
+integer llGetUnixTime()
+Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock
+  </string>
+  <string name="LSLTipText_llGetParcelFlags" translate="false">
+integer llGetParcelFlags(vector pos)
+Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos
+  </string>
+  <string name="LSLTipText_llGetRegionFlags" translate="false">
+integer llGetRegionFlags()
+Returns the region flags (REGION_FLAG_*) for the region the object is in
+  </string>
+  <string name="LSLTipText_llXorBase64StringsCorrect" translate="false">
+string llXorBase64StringsCorrect(string s1, string s2)
+Correctly performs an exclusive or on two Base64 strings and returns a Base64 string.
+s2 repeats if it is shorter than s1.
+  </string>
+  <string name="LSLTipText_llHTTPRequest" translate="false">
+llHTTPRequest(string url, list parameters, string body)
+Sends an HTTP request to the specified url with the body of the request and parameters
+  </string>
+  <string name="LSLTipText_llResetLandBanList" translate="false">
+llResetLandBanList()
+Removes all Residents from the land ban list
+  </string>
+  <string name="LSLTipText_llResetLandPassList" translate="false">
+llResetLandPassList()
+Removes all Residents from the land access/pass list
+  </string>
+  <string name="LSLTipText_llGetObjectPrimCount" translate="false">
+integer llGetObjectPrimCount(key object_id)
+Returns the total number of prims for an object in the region
+  </string>
+  <string name="LSLTipText_llGetParcelPrimOwners" translate="false">
+list llGetParcelPrimOwners(vector pos)
+Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts.
+Requires owner-like permissions for the parcel.
+  </string>
+  <string name="LSLTipText_llGetParcelPrimCount" translate="false">
+integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
+Returns the number of prims on the parcel at pos of the given category.
+Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP
+  </string>
+  <string name="LSLTipText_llGetParcelMaxPrims" translate="false">
+integer llGetParcelMaxPrims(vector pos, integer sim_wide)
+Returns the maximum number of prims allowed on the parcel at pos
+  </string>
+  <string name="LSLTipText_llGetParcelDetails" translate="false">
+list llGetParcelDetails(vector pos, list params)
+Returns the parcel details specified in params for the parcel at pos.
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
+  </string>
+  <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
+llSetLinkPrimitiveParams(integer linknumber, list rules)
+Sets primitive parameters for linknumber based on rules
+  </string>
+  <string name="LSLTipText_llSetLinkTexture" translate="false">
+llSetLinkTexture(integer linknumber, string texture, integer face)
+Sets the texture of face for a task that exists in the link chain at linknumber
+  </string>
+  <string name="LSLTipText_llStringTrim" translate="false">
+string llStringTrim(string src, integer trim_type)
+Trims the leading and/or trailing white spaces from a string.
+trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.
+  </string>
+  <string name="LSLTipText_llRegionSay" translate="false">
+llRegionSay(integer channel, string msg)
+Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel
+  </string>
+  <string name="LSLTipText_llGetObjectDetails" translate="false">
+list llGetObjectDetails(key id, list params)
+Returns the object details specified in params for the object with key id.
+Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR
+  </string>
+  <string name="LSLTipText_llSetClickAction" translate="false">
+llSetClickAction(integer action)
+Sets the action performed when a prim is clicked upon
+  </string>
+  <string name="LSLTipText_llGetRegionAgentCount" translate="false">
+integer llGetRegionAgentCount()
+Returns the number of avatars in the region
+  </string>
+  <string name="LSLTipText_llTextBox" translate="false">
+llTextBox(key avatar, string message, integer chat_channel)
+Shows a window on the avatar&apos;s screen with the message.
+It contains a text box for input, and if entered that text is chatted on chat_channel.
+  </string>
+  <string name="LSLTipText_llGetAgentLanguage" translate="false">
+string llGetAgentLanguage(key avatar)
+Returns the language code of the preferred interface language of the avatar
+  </string>
+  <string name="LSLTipText_llDetectedTouchUV" translate="false">
+vector llDetectedTouchUV(integer index)
+Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchFace" translate="false">
+integer llDetectedTouchFace(integer index)
+Returns the index of the face where the avatar clicked in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchPos" translate="false">
+vector llDetectedTouchPos(integer index)
+Returns the position where the object was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchNormal" translate="false">
+vector llDetectedTouchNormal(integer index)
+Returns the surface normal for a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchBinormal" translate="false">
+vector llDetectedTouchBinormal(integer index)
+Returns the surface binormal for a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchST" translate="false">
+vector llDetectedTouchST(integer index)
+Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llSHA1String" translate="false">
+string llSHA1String(string src)
+Returns a string of 40 hex characters that is the SHA1 security Hash of src
+  </string>
+  <string name="LSLTipText_llGetFreeURLs" translate="false">
+integer llGetFreeURLs()
+Returns the number of available URLs for the current script
+  </string>
+  <string name="LSLTipText_llRequestURL" translate="false">
+key llRequestURL()
+Requests one HTTP:// url for use by this object.
+An http_request event is triggered with the results.
+  </string>
+  <string name="LSLTipText_llRequestSecureURL" translate="false">
+key llRequestSecureURL()
+Requests one HTTPS:// (SSL) url for use by this object.
+An http_request event is triggered with the results.
+  </string>
+  <string name="LSLTipText_llReleaseURL" translate="false">
+llReleaseURL(string url)
+Releases the specified URL, it will no longer be usable
+  </string>
+  <string name="LSLTipText_llHTTPResponse" translate="false">
+llHTTPResponse(key request_id, integer status, string body)
+Responds to request_id with status and body
+  </string>
+  <string name="LSLTipText_llGetHTTPHeader" translate="false">
+string llGetHTTPHeader(key request_id, string header)
+Returns the value for header for request_id
+  </string>
+  <string name="LSLTipText_llSetPrimMediaParams" translate="false">
+llSetPrimMediaParams(integer face, list params)
+Sets the media params for a particular face on an object. If media is not already on this object, add it.
+List is a set of name/value pairs in no particular order.  Params not specified are unchanged, or if new media is added then set to the default specified.
+The possible names are below, along with the types of values and what they mean.
+  </string>
+  <string name="LSLTipText_llGetPrimMediaParams" translate="false">
+list llGetPrimMediaParams(integer face, list params)
+Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
+(Returns an empty list if no media exists on the face.)
+  </string>
+  <string name="LSLTipText_llClearPrimMedia" translate="false">
+llClearPrimMedia(integer face)
+Clears (deletes) the media and all params from the given face.
+  </string>
+  <string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
+llSetLinkPrimitiveParamsFast(integer linknumber,list rules)
+Set primitive parameters for linknumber based on rules.
+  </string>
+  <string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
+llGetLinkPrimitiveParams(integer linknumber,list rules)
+Get primitive parameters for linknumber based on rules.
+  </string>
+  <string name="LSLTipText_llLinkParticleSystem" translate="false">
+llLinkParticleSystem(integer linknumber,list rules)
+Creates a particle system based on rules.  Empty list removes particle system from object.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
+  </string>
+  <string name="LSLTipText_llSetLinkTextureAnim" translate="false">
+llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animate the texture on the specified prim&apos;s face/faces.
+  </string>
+  <string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
+integer llGetLinkNumberOfSides(integer link)
+Returns the number of sides of the specified linked prim.
+  </string>
+  <string name="LSLTipText_llGetUsername" translate="false">
+string llGetUsername(key id)
+Returns the single-word username of an avatar, iff the avatar is in the current region, otherwise the empty string.
+  </string>
+  <string name="LSLTipText_llRequestUsername" translate="false">
+key llRequestUsername(key id)
+Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llGetDisplayName" translate="false">
+string llGetDisplayName(key id)
+Returns the name of an avatar, iff the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername.  Use llRequestDisplayName if you absolutely must have the display name.
+  </string>
+  <string name="LSLTipText_llRequestDisplayName" translate="false">
+key llRequestDisplayName(key id)
+Requests name of an avatar.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llGetEnv" translate="false">
+llGetEnv(string name)
+Returns a string with the requested data about the region
+  </string>
+  <string name="LSLTipText_llCastRay" translate="false">
+llCastRay(vector start, vector end, list params)
+Casts a ray into the physics world from &apos;start&apos; to &apos;end&apos; and returns data according to details in params.
+  </string>
+  <string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
+  </string>
+  <string name="LSLTipText_llGetSPMaxMemory" translate="false">
+integer llGetSPMaxMemory()
+Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
+  </string>
+  <string name="LSLTipText_llGetUsedMemory" translate="false">
+integer llGetUsedMemory()
+Returns the current used memory for the current script. Non-mono scripts always use 16k.
+  </string>
+  <string name="LSLTipText_llScriptProfiler" translate="false">
+llScriptProfiler(integer flags)
+Enabled or disables script profiling options. Currently only supports PROFILE_SCRIPT_MEMORY (mono only) and PROFILE_NONE.
+MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
+  </string>
+  <string name="LSLTipText_llSetMemoryLimit" translate="false">
+integer llSetMemoryLimit(integer mem)
+  </string>
+  <string name="LSLTipText_llGetMemoryLimit" translate="false">
+integer llGetMemoryLimit()
+  </string>
+  <string name="LSLTipText_llSetLinkMedia" translate="false">
+llSetLinkMedia(integer link, integer face, list params)
+Set the media params for a particular face on linked prim.  List is a set of name/value pairs (in no particular order). The possible names are below, along with the types of values and what they mean.  If media is not already on this object, add it. Params not specified are unchanged, or if new media is added set to the default specified.
+  </string>
+  <string name="LSLTipText_llGetLinkMedia" translate="false">
+list llGetLinkMedia(integer link, integer face, list params)
+Get the media params for a particular face on linked prim, given the desired list of names. Returns a list of values in the order requested.  Returns an empty list if no media exists on the face.
+  </string>
+  <string name="LSLTipText_llClearLinkMedia" translate="false">
+llClearLinkMedia(integer link, integer face)
+Clears (deletes) the media and all params from the given face on linked prim.
+  </string>
+  <string name="LSLTipText_llSetContentType" translate="false">
+llSetContentType(key id, integer content_type)
+  </string>
+  <string name="LSLTipText_llLinkSitTarget" translate="false">
+llLinkSitTarget(integer link, vector offset, rotation rot)
+Set the sit location for this object (if offset == &lt;0,0,0&gt; clear it)
+  </string>
+  <string name="LSLTipText_llAvatarOnLinkSitTarget" translate="false">
+key llAvatarOnLinkSitTarget(integer link)
+If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KEY otherwise
+  </string>
+  <string name="LSLTipText_llSetLinkCamera" translate="false">
+llSetLinkCamera(integer link, vector eye, vector at)
+  </string>
+  <string name="LSLTipText_llSetVelocity" translate="false">
+llSetVelocity(vector velocity, integer local)
+Sets an objects velocity, in local coords if local == TRUE (if the script is physical)
+  </string>
+  <string name="LSLTipText_llSetAngularVelocity" translate="false">
+llSetAngularVelocity(vector angular_velocity, integer local)
+Sets an objects angular velocity, in local coords if local == TRUE (if the script is physical)
+  </string>
+  <string name="LSLTipText_llSetPhysicsMaterial" translate="false">
+llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
+Sets the requested attributes of the root object&apos;s physics material.
+  </string>
+  <string name="LSLTipText_llGetPhysicsMaterial" translate="false">
+llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
+  </string>
+  <string name="LSLTipText_llGetMassMKS" translate="false">
+llGetMassMKS() returns the mass of the linkset in kilograms.
+  </string>
+  <string name="LSLTipText_llGenerateKey" translate="false">
+llGenerateKey()
+Retun a unique generated key
+  </string>
+  <string name="LSLTipText_llSetKeyframedMotion" translate="false">
+llSetKeyframedMotion(list keyframes, list options)
+Requests that a nonphysical object be keyframed according to keyframe list.
+  </string>
+  <string name="LSLTipText_llTransferLindenDollars" translate="false">
+key llTransferLindenDollars(key destination, integer amount)
+Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
+  </string>
+  <string name="LSLTipText_llGetParcelMusicURL" translate="false">
+string llGetParcelMusicURL()
+Gets the streaming audio URL for the parcel of land on which the object is located.
+  </string>
+  <string name="LSLTipText_llSetRegionPos" translate="false">
+integer llSetRegionPos(vector pos)
+Sets the position anywhere within the region (if the object isn&apos;t physical)
+  </string>
+  <string name="LSLTipText_llNavigateTo" translate="false">
+llNavigateTo(vector point, list options)
+For AI Character: Navigate to destination.
+  </string>
+  <string name="LSLTipText_llCreateCharacter" translate="false">
+llCreateCharacter(list options)
+Convert linkset to AI Character which can navigate the world.
+  </string>
+  <string name="LSLTipText_llPursue" translate="false">
+llPursue(key target, list options)
+For AI Character: Chase after a target.
+  </string>
+  <string name="LSLTipText_llWanderWithin" translate="false">
+llWanderWithin(vector center, float radius, list options)
+For AI Character: Wander within a specified volume.
+  </string>
+  <string name="LSLTipText_llFleeFrom" translate="false">
+llFleeFrom(vector source, float radius, list options)
+For AI Character: Flee from a point.
+  </string>
+  <string name="LSLTipText_llPatrolPoints" translate="false">
+llPatrolPoints(list points, list options)
+For AI Character: Patrol a list of points.
+  </string>
+  <string name="LSLTipText_llExecCharacterCmd" translate="false">
+llExecCharacterCmd(integer cmd, list options)
+For AI Character: Execute a character command.
+  </string>
+  <string name="LSLTipText_llDeleteCharacter" translate="false">
+llDeleteCharacter()
+Convert linkset from AI Character to Physics object.
+  </string>
+  <string name="LSLTipText_llUpdateCharacter" translate="false">
+llUpdateCharacter(list options)
+Change the AI Character&apos;s settings.
+  </string>
+  <string name="LSLTipText_llEvade" translate="false">
+llEvade(key target, list options)
+For AI Character: Evade a specified target.
+  </string>
+  <string name="LSLTipText_llGetClosestNavPoint" translate="false">
+list llGetClosestNavPoint(vector point, list options)
+For AI Character: Get the closest navigable point to the point provided.
+  </string>
+
+
+  <!-- Wearable Types -->
+  <string name="shape">シェイプ</string>
+  <string name="skin">スキン</string>
+  <string name="hair">髪</string>
+  <string name="eyes">目</string>
+  <string name="shirt">シャツ</string>
+  <string name="pants">ズボン</string>
+  <string name="shoes">靴</string>
+  <string name="socks">靴下</string>
+  <string name="jacket">ジャケット</string>
+  <string name="gloves">手袋</string>
+  <string name="undershirt">下着（上半身）</string>
+  <string name="underpants">下着（下半身）</string>
+  <string name="skirt">スカート</string>
+  <string name="alpha">アルファ</string>
+  <string name="tattoo">タトゥ</string>
+  <string name="universal">ユニバーサル</string>
+  <string name="physics">物理作用</string>
+  <string name="invalid">無効</string>
+  <string name="none">なし</string>
+  <string name="shirt_not_worn">シャツ未着用</string>
+  <string name="pants_not_worn">ズボン未着用</string>
+  <string name="shoes_not_worn">靴未着用</string>
+  <string name="socks_not_worn">靴下未着用</string>
+  <string name="jacket_not_worn">ジャケット未着用</string>
+  <string name="gloves_not_worn">手袋未着用</string>
+  <string name="undershirt_not_worn">下着（上半身）未着用</string>
+  <string name="underpants_not_worn">下着（下半身）未着用</string>
+
+  <!-- Not Worn Wearable Types -->
+  <string name="skirt_not_worn">スカート未着用</string>
+  <string name="alpha_not_worn">アルファ未着用</string>
+  <string name="tattoo_not_worn">タトゥ未着用</string>
+  <string name="universal_not_worn">ユニバーサルなし</string>
+  <string name="physics_not_worn">物理作用なし</string>
+  <string name="invalid_not_worn">無効</string>
+
+  <!-- Create new wearable of the specified type -->
+  <string name="create_new_shape">新しいシェイプを作成</string>
+  <string name="create_new_skin">新しいスキンを作成</string>
+  <string name="create_new_hair">新しい髪を作成</string>
+  <string name="create_new_eyes">新しい目を作成</string>
+  <string name="create_new_shirt">新しいシャツを作成</string>
+  <string name="create_new_pants">新しいズボンを作成</string>
+  <string name="create_new_shoes">新しい靴を作成</string>
+  <string name="create_new_socks">新しい靴下を作成</string>
+  <string name="create_new_jacket">新しい上着を作成</string>
+  <string name="create_new_gloves">新しい手袋を作成</string>
+  <string name="create_new_undershirt">新しい下着（上半身）を作成</string>
+  <string name="create_new_underpants">新しい下着（下半身）を作成</string>
+  <string name="create_new_skirt">新しいスカートを作成</string>
+  <string name="create_new_alpha">新しいアルファを作成</string>
+  <string name="create_new_tattoo">新しいタトゥを作成</string>
+  <string name="create_new_universal">新しいユニバーサルを作成</string>
+  <string name="create_new_physics">新しい物理作用を作成</string>
+  <string name="create_new_invalid">無効</string>
+
+  <!-- Wearable List-->
+  <string name="NewWearable">新しい[WEARABLE_ITEM]</string>
+
+  <!-- LLGroupNotify -->
+  <!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
+  <string name="next">次へ</string>
+  <string name="ok">OK</string>
+  <string name="GroupNotifyGroupNotice">グループ通知</string>
+  <string name="GroupNotifyGroupNotices">グループ通知</string>
+  <string name="GroupNotifySentBy">送信者</string>
+  <string name="GroupNotifyAttached">添付：</string>
+  <string name="GroupNotifyViewPastNotices">ここで過去の通知を表示するか、メッセージを受け取らない設定をします。</string>
+  <string name="GroupNotifyOpenAttachment">添付アイテムを開く</string>
+  <string name="GroupNotifySaveAttachment">添付アイテムを保存</string>
+
+  <string name="TeleportOffer">テレポートを送る</string>
+  <!-- start-up toast's string-->
+  <string name="StartUpNotifications">不在中に新しい通知が届きました。</string>
+  <!-- overflow toast's string-->
+  <string name="OverflowInfoChannelString">あなたにはさらに%d件の通知があります</string>
+
+
+  <!-- body parts -->
+  <string name="BodyPartsRightArm">右腕</string>
+  <string name="BodyPartsHead">頭</string>
+  <string name="BodyPartsLeftArm">左腕</string>
+  <string name="BodyPartsLeftLeg">左脚</string>
+  <string name="BodyPartsTorso">上半身</string>
+  <string name="BodyPartsRightLeg">右脚</string>
+  <string name="BodyPartsEnhancedSkeleton">拡張スケルトン</string>
+
+  <!-- slider -->
+  <string name="GraphicsQualityLow">低</string>
+  <string name="GraphicsQualityMid">中</string>
+  <string name="GraphicsQualityHigh">高</string>
+
+  <!-- mouselook -->
+  <string name="LeaveMouselook">ESCキーを押してワールドビューに戻ります</string>
+
+  <!-- inventory -->
+  <string name="InventoryNoMatchingItems">お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。</string>
+  <string name="InventoryNoMatchingRecentItems">お探しのものは見つかりましたか？[secondlife:///app/inventory/filters フィルタを表示]をお試しください。</string>
+  <string name="PlacesNoMatchingItems">お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。</string>
+  <string name="FavoritesNoMatchingItems">ここにランドマークをドラッグしてお気に入りに追加します。</string>
+  <string name="MarketplaceNoMatchingItems">アイテムが見つかりませんでした。検索文字列のスペルを確認して、もう一度やり直してください。</string>
+  <string name="InventoryNoTexture">インベントリ内にこのテクスチャのコピーがありません</string>
+  <string name="InventoryInboxNoItems">マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。</string>
+  <string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/?lang=ja-JP</string>
+  <string name="MarketplaceURL_CreateStore">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%9E%E3%83%BC%E3%82%B1%E3%83%83%E3%83%88%E3%83%97%E3%83%AC%E3%82%A4%E3%82%B9%E3%81%A7%E8%B2%A9%E5%A3%B2%E3%81%99%E3%82%8B-r769/</string>
+  <string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard?lang=ja-JP</string>
+  <string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports?lang=ja-JP</string>
+  <string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more?lang=ja-JP</string>
+  <string name="InventoryPlayAnimationTooltip">[再生]オプションでウィンドウを開ける。</string>
+  <string name="InventoryPlayGestureTooltip">インワールドで選択済みのジェスチャーを実行する。</string>
+  <string name="InventoryPlaySoundTooltip">[再生]オプションでウィンドウを開ける。</string>
+  <string name="InventoryOutboxNotMerchantTitle">マーケットプレイスでは誰でもアイテムを売ることができます。</string>
+  <string name="InventoryOutboxNotMerchantTooltip" />
+  <string name="InventoryOutboxNotMerchant">販売者になりたい方は、[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストアを作成]する必要があります。</string>
+  <string name="InventoryOutboxNoItemsTitle">アウトボックスは空です。</string>
+  <string name="InventoryOutboxNoItemsTooltip" />
+  <string name="InventoryOutboxNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグし、「マーケットプレイスに送信」をクリックします。</string>
+  <string name="InventoryOutboxInitializingTitle">マーケットプレイスの初期化。</string>
+  <string name="InventoryOutboxInitializing">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア]のアカウントにアクセスしています。</string>
+  <string name="InventoryOutboxErrorTitle">マーケットプレイス エラー</string>
+  <string name="InventoryOutboxError">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストア]がエラーを返しています。</string>
+  <string name="InventoryMarketplaceError">マーケットプレイスのリストを開くときにエラーが発生しました。引き続きこのメッセージを受信するには、Second Lifeのサポート（http://support.secondlife.com）にお問い合わせください</string>
+  <string name="InventoryMarketplaceListingsNoItemsTitle">マーケットプレイスのリストフォルダが空です。</string>
+  <string name="InventoryMarketplaceListingsNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。</string>
+  <string name="InventoryItemsCount">（[ITEMS_COUNT]個のアイテム）</string>
+  <string name="Marketplace Validation Warning Stock">バージョンフォルダには、在庫フォルダが含まれなければなりません。</string>
+  <string name="Marketplace Validation Error Mixed Stock">エラー：在庫フォルダ内のすべてのアイテムは、コピー不可で同じ種類でなければなりません。</string>
+  <string name="Marketplace Validation Error Subfolder In Stock">エラー：在庫フォルダにサブフォルダを含めることはできません。</string>
+  <string name="Marketplace Validation Warning Empty">警告：フォルダにアイテムが含まれていません。</string>
+  <string name="Marketplace Validation Warning Create Stock">警告：在庫フォルダを作成しています。</string>
+  <string name="Marketplace Validation Warning Create Version">警告：バージョンフォルダを作成しています。</string>
+  <string name="Marketplace Validation Warning Move">: 警告：アイテムを移動しています。</string>
+  <string name="Marketplace Validation Warning Delete">: 警告：フォルダの中身が在庫フォルダに移されました。空のフォルダを削除します。</string>
+  <string name="Marketplace Validation Error Stock Item">: エラー：在庫フォルダには、コピー不可アイテムを含める必要があります。</string>
+  <string name="Marketplace Validation Warning Unwrapped Item">: 警告：バージョンフォルダには、アイテムが含まれていなければなりません。</string>
+  <string name="Marketplace Validation Error">エラー：</string>
+  <string name="Marketplace Validation Warning">警告：</string>
+  <string name="Marketplace Validation Error Empty Version">警告：バージョンフォルダには、最低１アイテムが含まれなければなりません</string>
+  <string name="Marketplace Validation Error Empty Stock">警告：在庫フォルダには、最低１アイテムが含まれていなければなりません</string>
+
+  <string name="Marketplace Validation No Error">報告するエラーまたは警告はありません</string>
+  <string name="Marketplace Error None">エラーなし</string>
+  <string name="Marketplace Error Prefix">エラー：</string>
+  <string name="Marketplace Error Not Merchant">マーケットプレイスに商品を送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。</string>
+  <string name="Marketplace Error Not Accepted">アイテムをそのフォルダに移動できません。</string>
+  <string name="Marketplace Error Unsellable Item">このアイテムをマーケットプレイスで販売することはできません。</string>
+
+  <string name="MarketplaceNoID">Mkt ID なし</string>
+  <string name="MarketplaceLive">リスト掲載済み</string>
+  <string name="MarketplaceActive">有効</string>
+  <string name="MarketplaceMax">最大</string>
+  <string name="MarketplaceStock">在庫</string>
+  <string name="MarketplaceNoStock">在庫なし</string>
+  <string name="MarketplaceUpdating">アップデート中…</string>
+
+  <string name="UploadFeeInfo">料金はサブスクリプションのレベルにより異なります。レベルが高いほど、料金が下がります。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細]</string>
+
+  <string name="Open landmarks">オープン ランドマーク</string>
+  <string name="Unconstrained">アンコンストレインド（制約なし）</string>
+
+  <!-- use value="" because they have preceding spaces -->
+  <string name="no_transfer" value=" （再販・譲渡不可）" />
+  <string name="no_modify" value=" （編集不可）" />
+  <string name="no_copy" value=" （コピー不可）" />
+  <string name="worn" value=" （着用中）" />
+  <string name="link" value=" （リンク）" />
+  <string name="broken_link" value=" （壊れたリンク）" />
+  <string name="LoadingContents">コンテンツをロード中です…</string>
+  <string name="NoContents">コンテンツなし</string>
+  <string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT]に装着中）" />
+  <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])" />
+  <string name="ActiveGesture" value="[GESLABEL]（アクティブ）" />
+  <!-- Inventory permissions -->
+  <string name="PermYes">はい</string>
+  <string name="PermNo">いいえ</string>
+
+  <!-- Gestures labels -->
+  <!-- use value="" because they have preceding spaces -->
+  <string name="Chat Message" value="チャット：" />
+  <string name="Sound" value=" サウンド：" />
+  <string name="Wait" value=" --- 待機：:" />
+  <string name="AnimFlagStop" value=" アニメーションを停止：" />
+  <string name="AnimFlagStart" value=" アニメーションを開始：" />
+  <string name="Wave" value=" 手を振る" />
+  <string name="GestureActionNone" value="なし" />
+  <string name="HelloAvatar" value=" やあ、アバター！" />
+  <string name="ViewAllGestures" value="すべて表示 &gt;&gt;" />
+  <string name="GetMoreGestures" value="ショッピング &gt;&gt;" />
+  <string name="Animations" value="アニメーション、" />
+  <string name="Calling Cards" value="コーリングカード、" />
+  <string name="Clothing" value="服装、" />
+  <string name="Gestures" value="ジェスチャー、" />
+  <string name="Landmarks" value="ランドマーク、" />
+  <string name="Notecards" value="ノートカード、" />
+  <string name="Objects" value="オブジェクト、" />
+  <string name="Scripts" value="スクリプト、" />
+  <string name="Sounds" value="サウンド、" />
+  <string name="Textures" value="テクスチャ、" />
+  <string name="Snapshots" value="スナップショット、" />
+  <string name="No Filters" value="いいえ" />
+  <string name="Since Logoff" value="–ログオフ以来" />
+
+  <!-- inventory folder -->
+  <string name="InvFolder My Inventory">インベントリ</string>
+  <string name="InvFolder Library">ライブラリ</string>
+  <string name="InvFolder Textures">テクスチャ</string>
+  <string name="InvFolder Sounds">サウンド</string>
+  <string name="InvFolder Calling Cards">コーリングカード</string>
+  <string name="InvFolder Landmarks">ランドマーク</string>
+  <string name="InvFolder Scripts">スクリプト</string>
+  <string name="InvFolder Clothing">服装</string>
+  <string name="InvFolder Objects">オブジェクト</string>
+  <string name="InvFolder Notecards">ノートカード</string>
+  <string name="InvFolder New Folder">新規フォルダ</string>
+  <string name="InvFolder Inventory">インベントリ</string>
+  <string name="InvFolder Uncompressed Images">圧縮されていない画像</string>
+  <string name="InvFolder Body Parts">身体部位</string>
+  <string name="InvFolder Trash">ごみ箱</string>
+  <string name="InvFolder Photo Album">フォトアルバム</string>
+  <string name="InvFolder Lost And Found">遺失物</string>
+  <string name="InvFolder Uncompressed Sounds">圧縮されていないサウンド</string>
+  <string name="InvFolder Animations">アニメーション</string>
+  <string name="InvFolder Gestures">ジェスチャー</string>
+  <string name="InvFolder Favorite">お気に入り</string>
+  <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
+      Also, it can be written as "Favorite" or "Favorites".
+  We should localize all variants of them with the same value -->
+  <string name="InvFolder favorite">お気に入り</string>
+  <string name="InvFolder Favorites">お気に入り</string>
+  <string name="InvFolder favorites">お気に入り</string>
+  <string name="InvFolder Current Outfit">着用中のアウトフィット</string>
+  <string name="InvFolder Initial Outfits">最初のアウトフィット</string>
+  <string name="InvFolder My Outfits">アウトフィット</string>
+  <string name="InvFolder Accessories">アクセサリ</string>
+  <string name="InvFolder Meshes">メッシュ</string>
+  <string name="InvFolder Received Items">受け取った商品</string>
+  <string name="InvFolder Merchant Outbox">販売品ボックス</string>
+
+  <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
+  <string name="InvFolder Friends">フレンド</string>
+  <string name="InvFolder All">全員</string>
+
+  <string name="no_attachments">着用している装着物はありません</string>
+  <string name="Attachments remain">装着物（残りのスロット数：[COUNT]）</string>
+
+  <!-- inventory FVBridge -->
+  <!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
+  <string name="Buy">購入</string>
+  <string name="BuyforL$">L$ で購入</string>
+
+  <string name="Stone">石</string>
+  <string name="Metal">金属</string>
+  <string name="Glass">ガラス</string>
+  <string name="Wood">木</string>
+  <string name="Flesh">肌</string>
+  <string name="Plastic">プラスチック</string>
+  <string name="Rubber">ゴム</string>
+  <string name="Light">ライト</string>
+
+  <!-- keyboard -->
+  <string name="KBShift">Shift</string>
+  <string name="KBCtrl">Ctrl</string>
+
+  <!-- Avatar Skeleton -->
+  <string name="Chest">胸部</string>
+  <string name="Skull">頭蓋</string>
+  <string name="Left Shoulder">左肩</string>
+  <string name="Right Shoulder">右肩</string>
+  <string name="Left Hand">左手</string>
+  <string name="Right Hand">右手</string>
+  <string name="Left Foot">左足</string>
+  <string name="Right Foot">右足</string>
+  <string name="Spine">背骨</string>
+  <string name="Pelvis">骨盤</string>
+  <string name="Mouth">口</string>
+  <string name="Chin">あご</string>
+  <string name="Left Ear">左耳</string>
+  <string name="Right Ear">右耳</string>
+  <string name="Left Eyeball">左目眼球</string>
+  <string name="Right Eyeball">右目眼球</string>
+  <string name="Nose">鼻</string>
+  <string name="R Upper Arm">右上腕</string>
+  <string name="R Forearm">右前腕</string>
+  <string name="L Upper Arm">左上腕</string>
+  <string name="L Forearm">左前腕</string>
+  <string name="Right Hip">右腰</string>
+  <string name="R Upper Leg">右上脚</string>
+  <string name="R Lower Leg">右下脚</string>
+  <string name="Left Hip">左腰</string>
+  <string name="L Upper Leg">左上脚</string>
+  <string name="L Lower Leg">左下脚</string>
+  <string name="Stomach">腹</string>
+  <string name="Left Pec">左胸筋</string>
+  <string name="Right Pec">右胸筋</string>
+  <string name="Neck">首</string>
+  <string name="Avatar Center">アバターの中央</string>
+  <string name="Left Ring Finger">左薬指</string>
+  <string name="Right Ring Finger">右薬指</string>
+  <string name="Tail Base">しっぽのベース</string>
+  <string name="Tail Tip">しっぽの先</string>
+  <string name="Left Wing">左の翼</string>
+  <string name="Right Wing">右の翼</string>
+  <string name="Jaw">顎</string>
+  <string name="Alt Left Ear">代わりの左耳</string>
+  <string name="Alt Right Ear">代わりの右耳</string>
+  <string name="Alt Left Eye">代わりの左目</string>
+  <string name="Alt Right Eye">代わりの右目</string>
+  <string name="Tongue">舌</string>
+  <string name="Groin">脚の付け根</string>
+  <string name="Left Hind Foot">左後足</string>
+  <string name="Right Hind Foot">右後足</string>
+  <string name="Invalid Attachment">装着先が正しくありません</string>
+  <string name="ATTACHMENT_MISSING_ITEM">エラー：アイテムが見つかりません。</string>
+  <string name="ATTACHMENT_MISSING_BASE_ITEM">エラー：ベースアイテムが見つかりません。</string>
+  <string name="ATTACHMENT_NOT_ATTACHED">エラー：オブジェクトは現在のアウトフィットにありますが、添付されていません。</string>
+
+  <!-- Avatar age computation, see LLDateUtil::ageFromDate -->
+  <string name="YearsMonthsOld">[AGEYEARS][AGEMONTHS]</string>
+  <string name="YearsOld">[AGEYEARS]</string>
+  <string name="MonthsOld">[AGEMONTHS]</string>
+  <string name="WeeksOld">[AGEWEEKS]</string>
+  <string name="DaysOld">[AGEDAYS]</string>
+  <string name="TodayOld">本日参加</string>
+
+  <!-- Avatar complexity rendering messages, see llavatarrendernotifier. -->
+  <string name="av_render_everyone_now">あなたは、全員から見えるようになりました。</string>
+  <string name="av_render_not_everyone">あなたは、周囲にいる一部の人から、見えない可能性があります。</string>
+  <string name="av_render_over_half">あなたは、周囲にいる半分以上の人から、見えない可能性があります。</string>
+  <string name="av_render_most_of">あなたは、周囲にいるほとんどの人から、見えない可能性があります。</string>
+  <string name="av_render_anyone">あなたは、周囲の誰からも見えていない可能性があります。</string>
+
+  <!-- HUD complexity rendering messages, see llavatarrendernotifier. -->
+  <string name="hud_description_total">利用中のＨＵＤ</string>
+  <string name="hud_name_with_joint">[OBJ_NAME]（[JNT_NAME]に装着中）</string>
+  <string name="hud_render_memory_warning">[HUD_DETAILS]は、大量のテクスチャメモリを使用しています。</string>
+  <string name="hud_render_cost_warning">[HUD_DETAILS]は、計算コストが高いオブジェクトやテクスチャがたくさん含まれています。</string>
+  <string name="hud_render_heavy_textures_warning">[HUD_DETAILS]には、容量が多いテクスチャが使用されています。</string>
+  <string name="hud_render_cramped_warning">[HUD_DETAILS]は、使用されているオブジェクトが多すぎます。</string>
+  <string name="hud_render_textures_warning">[HUD_DETAILS]は、使用されているテクスチャが多すぎます。</string>
+
+  <!-- AgeYearsA = singular,
+       AgeYearsB = plural,
+       AgeYearsC = plural for non-English languages like Russian
+       For example, LLTrans::getCountString("AgeYears", 3) is plural form B
+       in English and form C in Russian -->
+  <string name="AgeYearsA">[COUNT]年</string>
+  <string name="AgeYearsB">[COUNT]年</string>
+  <string name="AgeYearsC">[COUNT]年</string>
+  <string name="AgeMonthsA">[COUNT]ヶ月</string>
+  <string name="AgeMonthsB">[COUNT]ヶ月</string>
+  <string name="AgeMonthsC">[COUNT]ヶ月</string>
+  <string name="AgeWeeksA">[COUNT]週間</string>
+  <string name="AgeWeeksB">[COUNT]週間</string>
+  <string name="AgeWeeksC">[COUNT]週間</string>
+  <string name="AgeDaysA">[COUNT]日間</string>
+  <string name="AgeDaysB">[COUNT]日間</string>
+  <string name="AgeDaysC">[COUNT]日間</string>
+  <!-- Group member counts -->
+  <string name="GroupMembersA">[COUNT]人</string>
+  <string name="GroupMembersB">[COUNT]人</string>
+  <string name="GroupMembersC">[COUNT]人</string>
+
+  <!-- Account types, see LLAvatarPropertiesProcessor -->
+  <string name="AcctTypeResident">住人</string>
+  <string name="AcctTypeTrial">トライアル</string>
+  <string name="AcctTypeCharterMember">創立メンバー</string>
+  <string name="AcctTypeEmployee">Linden Lab従業員</string>
+  <string name="PaymentInfoUsed">支払情報使用履歴あり</string>
+  <string name="PaymentInfoOnFile">支払情報登録済</string>
+  <string name="NoPaymentInfoOnFile">支払情報未登録</string>
+  <string name="AgeVerified">年齢確認済</string>
+  <string name="NotAgeVerified">年齢未確認</string>
+
+  <!-- HUD Position -->
+  <string name="Center 2">中央２</string>
+  <string name="Top Right">右上</string>
+  <string name="Top">上部</string>
+  <string name="Top Left">左上</string>
+  <string name="Center">中央</string>
+  <string name="Bottom Left">左下</string>
+  <string name="Bottom">下部</string>
+  <string name="Bottom Right">右下</string>
+
+  <!-- compile queue-->
+  <string name="CompileQueueDownloadedCompiling">ダウンロードが完了しました。コンパイルしています。</string>
+  <string name="CompileQueueServiceUnavailable">スクリプトのコンパイルサービスを利用できません</string>
+  <string name="CompileQueueScriptNotFound">サーバー上にスクリプトが見つかりません。</string>
+  <string name="CompileQueueProblemDownloading">ダウンロードに問題があります</string>
+  <string name="CompileQueueInsufficientPermDownload">権限不足のためスクリプトをダウンロードできません。</string>
+  <string name="CompileQueueInsufficientPermFor">権限不足：</string>
+  <string name="CompileQueueUnknownFailure">原因不明の失敗によりダウンロードができません</string>
+  <string name="CompileNoExperiencePerm">[EXPERIENCE]体験による[SCRIPT]スクリプトのスキップ。</string>
+  <string name="CompileQueueTitle">再コンパイル進行</string>
+  <string name="CompileQueueStart">再コンパイル</string>
+  <string name="ResetQueueTitle">進行をリセット</string>
+  <string name="ResetQueueStart">リセット</string>
+  <string name="RunQueueTitle">実行を続けるよう設定</string>
+  <string name="RunQueueStart">実行中に設定</string>
+  <string name="NotRunQueueTitle">実行を停止するよう設定</string>
+  <string name="NotRunQueueStart">実行停止に設定</string>
+
+  <!-- compile comment text-->
+  <string name="CompileSuccessful">コンパイルが完了しました！</string>
+  <string name="CompileSuccessfulSaving">コンパイル完了、保存しています…</string>
+  <string name="SaveComplete">保存完了。</string>
+  <string name="UploadFailed">ファイルのアップロードが失敗しました:</string>
+  <string name="ObjectOutOfRange">スクリプト（オブジェクトが範囲外にあります）</string>
+  <string name="ScriptWasDeleted">スクリプト（インベントリから削除済み）</string>
+
+  <!-- god tools -->
+  <string name="GodToolsObjectOwnedBy">[OWNER]が所有している「[OBJECT]」というオブジェクト</string>
+
+  <!-- groups -->
+  <string name="GroupsNone">なし</string>
+  <string name="Group" value="（グループ）" />
+  <string name="Unknown">（不明）</string>
+  <string name="SummaryForTheWeek" value="今週のまとめ。開始日は" />
+  <string name="NextStipendDay" value="です。次回のお小遣い支給日：" />
+  <string name="GroupPlanningDate">[year,datetime,utc]年[mthnum,datetime,utc]月[day,datetime,utc]日</string>
+  <string name="GroupIndividualShare" value="グループ 個人の割り当て" />
+  <string name="GroupColumn" value="グループの設定" />
+  <string name="Balance">残高</string>
+  <string name="Credits">収入</string>
+  <string name="Debits">支出</string>
+  <string name="Total">合計</string>
+  <string name="NoGroupDataFound">グループのデータが見つかりませんでした。</string>
+
+  <!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar.
+       This is to help Lindens when answering questions. -->
+  <string name="IMParentEstate">親の不動産</string>
+  <string name="IMMainland">メインランド</string>
+  <string name="IMTeen">ティーン</string>
+
+  <!-- floater about land -->
+  <string name="Anyone">全員</string>
+
+  <!-- floater region info -->
+  <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
+  <string name="RegionInfoError">エラー</string>
+  <string name="RegionInfoAllEstatesOwnedBy">[OWNER]が所有するすべての不動産</string>
+  <string name="RegionInfoAllEstatesYouOwn">あなたが所有するすべての不動産</string>
+  <string name="RegionInfoAllEstatesYouManage">あなたが[OWNER]のために管理するすべての不動産</string>
+  <string name="RegionInfoAllowedResidents">常に許可：（[ALLOWEDAGENTS]人、最大[MAXACCESS]人）</string>
+  <string name="RegionInfoAllowedGroups">グループを常に許可：（[ALLOWEDGROUPS]、最大[MAXACCESS]）</string>
+  <string name="RegionInfoBannedResidents">常に禁止：（[BANNEDAGENTS]人、最大[MAXBANNED]人）</string>
+  <string name="RegionInfoListTypeAllowedAgents">常に許可</string>
+  <string name="RegionInfoListTypeBannedAgents">常に禁止</string>
+  <string name="RegionInfoAllEstates">すべての不動産</string>
+  <string name="RegionInfoManagedEstates">管理されている不動産</string>
+  <string name="RegionInfoThisEstate">この不動産</string>
+  <string name="AndNMore">および[EXTRA_COUNT]つの不動産</string>
+
+  <!-- script limits floater -->
+  <string name="ScriptLimitsParcelScriptMemory">区画スクリプトメモリ</string>
+  <string name="ScriptLimitsParcelsOwned">区画一覧：[PARCELS]個</string>
+  <string name="ScriptLimitsMemoryUsed">使用されたメモリ：[MAX]㎅中[COUNT]㎅　[AVAILABLE]㎅利用可</string>
+  <string name="ScriptLimitsMemoryUsedSimple">使用されたメモリ：[COUNT]㎅</string>
+  <string name="ScriptLimitsParcelScriptURLs">区画のスクリプトＵＲＬ</string>
+  <string name="ScriptLimitsURLsUsed">使用されたＵＲＬ：[MAX]件中[COUNT]件　[AVAILABLE]件利用可</string>
+  <string name="ScriptLimitsURLsUsedSimple">使用されたＵＲＬ：[COUNT]件</string>
+  <string name="ScriptLimitsRequestError">情報のリクエスト中にエラーが発生しました</string>
+  <string name="ScriptLimitsRequestNoParcelSelected">区画が選択されていません。</string>
+  <string name="ScriptLimitsRequestWrongRegion">エラー：スクリプト情報は現在地のみ取得できます</string>
+  <string name="ScriptLimitsRequestWaiting">情報を取得中…</string>
+  <string name="ScriptLimitsRequestDontOwnParcel">この区画を調査する権限がありません。</string>
+
+  <string name="SITTING_ON">着席中</string>
+  <string name="ATTACH_CHEST">胸部</string>
+  <string name="ATTACH_HEAD">頭頂部</string>
+  <string name="ATTACH_LSHOULDER">左肩</string>
+  <string name="ATTACH_RSHOULDER">右肩</string>
+  <string name="ATTACH_LHAND">左手</string>
+  <string name="ATTACH_RHAND">右手</string>
+  <string name="ATTACH_LFOOT">左足</string>
+  <string name="ATTACH_RFOOT">右足</string>
+  <string name="ATTACH_BACK">背骨</string>
+  <string name="ATTACH_PELVIS">骨盤</string>
+  <string name="ATTACH_MOUTH">口</string>
+  <string name="ATTACH_CHIN">あご</string>
+  <string name="ATTACH_LEAR">左耳</string>
+  <string name="ATTACH_REAR">右耳</string>
+  <string name="ATTACH_LEYE">左目</string>
+  <string name="ATTACH_REYE">右目</string>
+  <string name="ATTACH_NOSE">鼻</string>
+  <string name="ATTACH_RUARM">右上腕</string>
+  <string name="ATTACH_RLARM">右前腕</string>
+  <string name="ATTACH_LUARM">左上腕</string>
+  <string name="ATTACH_LLARM">左前腕</string>
+  <string name="ATTACH_RHIP">右腰</string>
+  <string name="ATTACH_RULEG">右脚（上）</string>
+  <string name="ATTACH_RLLEG">右脚（下）</string>
+  <string name="ATTACH_LHIP">左腰</string>
+  <string name="ATTACH_LULEG">左脚（上）</string>
+  <string name="ATTACH_LLLEG">左脚（下）</string>
+  <string name="ATTACH_BELLY">腹</string>
+  <string name="ATTACH_LEFT_PEC">左胸筋</string>
+  <string name="ATTACH_RIGHT_PEC">右胸筋</string>
+  <string name="ATTACH_HUD_CENTER_2">ＨＵＤ（中央 2）</string>
+  <string name="ATTACH_HUD_TOP_RIGHT">ＨＵＤ（右上）</string>
+  <string name="ATTACH_HUD_TOP_CENTER">ＨＵＤ（上・中央）</string>
+  <string name="ATTACH_HUD_TOP_LEFT">ＨＵＤ（左上）</string>
+  <string name="ATTACH_HUD_CENTER_1">ＨＵＤ（中央 1）</string>
+  <string name="ATTACH_HUD_BOTTOM_LEFT">ＨＵＤ（左下）</string>
+  <string name="ATTACH_HUD_BOTTOM">ＨＵＤ（下）</string>
+  <string name="ATTACH_HUD_BOTTOM_RIGHT">ＨＵＤ（右下）</string>
+  <string name="ATTACH_NECK">首</string>
+  <string name="ATTACH_AVATAR_CENTER">アバターの中央</string>
+  <string name="ATTACH_LHAND_RING1">左薬指</string>
+  <string name="ATTACH_RHAND_RING1">右薬指</string>
+  <string name="ATTACH_TAIL_BASE">しっぽのベース</string>
+  <string name="ATTACH_TAIL_TIP">しっぽの先</string>
+  <string name="ATTACH_LWING">左の翼</string>
+  <string name="ATTACH_RWING">右の翼</string>
+  <string name="ATTACH_FACE_JAW">顎</string>
+  <string name="ATTACH_FACE_LEAR">代わりの左耳</string>
+  <string name="ATTACH_FACE_REAR">代わりの右耳</string>
+  <string name="ATTACH_FACE_LEYE">代わりの左目</string>
+  <string name="ATTACH_FACE_REYE">代わりの右目</string>
+  <string name="ATTACH_FACE_TONGUE">舌</string>
+  <string name="ATTACH_GROIN">脚の付け根</string>
+  <string name="ATTACH_HIND_LFOOT">左後足</string>
+  <string name="ATTACH_HIND_RFOOT">右後足</string>
+
+  <!-- script editor -->
+  <string name="CursorPos">[LINE]行目、[COLUMN]列目</string>
+
+  <!-- panel dir browser -->
+  <string name="PanelDirCountFound">[COUNT]件見つかりました</string>
+  <string name="PanelDirTimeStr">[ampm,datetime,utc]　[hour12,datetime,utc]：[min,datetime,utc]</string>
+
+  <!-- panel dir events -->
+  <string name="PanelDirEventsDateText">[mthnum,datetime,slt]／[day,datetime,slt]</string>
+
+  <!-- panel contents -->
+  <string name="PanelContentsTooltip">オブジェクトの中身</string>
+  <string name="PanelContentsNewScript">新規スクリプト</string>
+
+  <!-- panel preferences general -->
+  <string name="DoNotDisturbModeResponseDefault">この住民が「着信拒否」をオンにすると、あなたのメッセージが後で表示されるようになります。</string>
+
+  <!-- Mute -->
+  <string name="MuteByName">（名前で）</string>
+  <string name="MuteAgent">（住人）</string>
+  <string name="MuteObject">（オブジェクト）</string>
+  <string name="MuteGroup">（グループ）</string>
+  <string name="MuteExternal">（外部）</string>
+
+  <!-- Region/Estate Covenant -->
+  <string name="RegionNoCovenant">この不動産には約款がありません。</string>
+  <string name="RegionNoCovenantOtherOwner">この不動産には約款がありません。この不動産上の土地は不動産所有者により販売され、Linden Labは販売しません。販売に関するお問い合わせは、不動産所有者までお願い致します。</string>
+  <!-- use value="" to keep the trailing space -->
+  <string name="covenant_last_modified" value="最終更新日：" />
+  <string name="none_text" value="（なし）" />
+  <string name="never_text" value="（無）" />
+
+  <!--Region Details-->
+  <string name="GroupOwned">グループ所有</string>
+  <string name="Public">公共</string>
+
+  <!-- Environment settings -->
+  <string name="LocalSettings">ローカル設定</string>
+  <string name="RegionSettings">リージョン（地域）の設定</string>
+
+  <string name="NoEnvironmentSettings">このリージョンは環境設定をサポートしていません。</string>
+  <string name="EnvironmentSun">太陽</string>
+  <string name="EnvironmentMoon">月</string>
+  <string name="EnvironmentBloom">花</string>
+  <string name="EnvironmentCloudNoise">雲の音</string>
+  <string name="EnvironmentNormalMap">ノーマル・マップ</string>
+  <string name="EnvironmentTransparent">透過</string>
+
+  <!-- panel classified -->
+  <string name="ClassifiedClicksTxt">クリック数：[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</string>
+  <string name="ClassifiedUpdateAfterPublish">（掲載後更新）</string>
+
+  <!-- panel picks -->
+  <string name="NoPicksClassifiedsText">ピックやクラシファイド広告を作成していません。作成するには、下にある「＋」ボタンをクリックします。</string>
+  <string name="NoPicksText">ピックを作成していません。「新規」ボタンをクリックしてピックを作成する。</string>
+  <string name="NoClassifiedsText">クラシファイド広告を作成していません。「新規」ボタンをクリックしてクラシファイド広告を作成する。</string>
+  <string name="NoAvatarPicksClassifiedsText">ピック、またはクラシファイド広告がありません</string>
+  <string name="NoAvatarPicksText">ピックがありません</string>
+  <string name="NoAvatarClassifiedsText">クラシファイド広告がありません</string>
+  <string name="PicksClassifiedsLoadingText">読み込んでいます…</string>
+
+  <!-- Multi Preview Floater -->
+  <string name="MultiPreviewTitle">プレビュー</string>
+  <string name="MultiPropertiesTitle">プロパティ</string>
+
+  <!-- inventory offer -->
+  <string name="InvOfferAnObjectNamed">オブジェクト名</string>
+  <string name="InvOfferOwnedByGroup">所有グループ</string>
+  <string name="InvOfferOwnedByUnknownGroup">不明なグループ所有</string>
+  <string name="InvOfferOwnedBy">所有者</string>
+  <string name="InvOfferOwnedByUnknownUser">不明なユーザー所有</string>
+  <string name="InvOfferGaveYou">が渡しました。</string>
+  <string name="InvOfferDecline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;からの[DESC]を拒否しました。</string>
+
+  <!-- group money -->
+  <string name="GroupMoneyTotal">合計</string>
+  <string name="GroupMoneyBought">購入：</string>
+  <string name="GroupMoneyPaidYou">あなたに支払い：</string>
+  <string name="GroupMoneyPaidInto">支払情報</string>
+  <string name="GroupMoneyBoughtPassTo">入場許可を購入：</string>
+  <string name="GroupMoneyPaidFeeForEvent">が、イベント用の費用を支払いました。</string>
+  <string name="GroupMoneyPaidPrizeForEvent">が、イベント用の賞金を支払いました。</string>
+  <string name="GroupMoneyBalance">残高</string>
+  <string name="GroupMoneyCredits">収入</string>
+  <string name="GroupMoneyDebits">支出</string>
+  <string name="GroupMoneyDate">[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日　[weekday,datetime,utc]</string>
+
+  <!-- Viewer menu -->
+  <string name="AcquiredItems">取得アイテム</string>
+  <string name="Cancel">キャンセル</string>
+  <string name="UploadingCosts">[NAME]のアップロード料金は L$ [AMOUNT]です。</string>
+  <string name="BuyingCosts">これをL$ [AMOUNT]で購入します。</string>
+  <string name="UnknownFileExtension">不明な拡張子：%s
+使用可能な拡張子：.wav, .tga, .bmp, .jpg, .jpeg, or .bvh</string>
+  <string name="MuteObject2">オブジェクトのブロック</string>
+  <string name="MuteAvatar">アバターのブロック</string>
+  <string name="UnmuteObject">オブジェクトのブロック解除</string>
+  <string name="UnmuteAvatar">アバターのブロック解除</string>
+  <string name="AddLandmarkNavBarMenu">ランドマークに追加…</string>
+  <string name="EditLandmarkNavBarMenu">ランドマークを編集…</string>
+  <!-- menu accelerators -->
+  <string name="accel-mac-control">⌃</string>
+  <string name="accel-mac-command">⌘</string>
+  <string name="accel-mac-option">⌥</string>
+  <string name="accel-mac-shift">⇧</string>
+  <string name="accel-win-control">Ctrl＋</string>
+  <string name="accel-win-alt">Alt＋</string>
+  <string name="accel-win-shift">Shift＋</string>
+
+  <!-- Previews -->
+  <string name="FileSaved">ファイルが保存されました。</string>
+  <string name="Receiving">取得中</string>
+
+  <!-- status bar , Time -->
+  <string name="AM">午前</string>
+  <string name="PM">午後</string>
+  <string name="PST">太平洋標準時</string>
+  <string name="PDT">太平洋夏時間</string>
+
+  <!-- Directions, HUD -->
+  <string name="Direction_Forward">前</string>
+  <string name="Direction_Left">左</string>
+  <string name="Direction_Right">右</string>
+  <string name="Direction_Back">後</string>
+  <string name="Direction_North">北</string>
+  <string name="Direction_South">南</string>
+  <string name="Direction_West">西</string>
+  <string name="Direction_East">東</string>
+  <string name="Direction_Up">上</string>
+  <string name="Direction_Down">下</string>
+
+  <!-- Search Category Strings -->
+  <string name="Any Category">全カテゴリ</string>
+  <string name="Shopping">ショッピング</string>
+  <string name="Land Rental">土地のレンタル</string>
+  <string name="Property Rental">プロパティのレンタル</string>
+  <string name="Special Attraction">特別なアトラクション</string>
+  <string name="New Products">新製品</string>
+  <string name="Employment">雇用</string>
+  <string name="Wanted">求む</string>
+  <string name="Service">サービス</string>
+  <string name="Personal">パーソナル</string>
+
+  <!-- PARCEL_CATEGORY_UI_STRING -->
+  <string name="None">なし</string>
+  <string name="Linden Location">Linden 所在地</string>
+  <string name="Adult">成人向け</string>
+  <string name="Arts&amp;Culture">芸術と文化</string>
+  <string name="Business">ビジネス</string>
+  <string name="Educational">教育</string>
+  <string name="Gaming">ゲーム</string>
+  <string name="Hangout">たまり場</string>
+  <string name="Newcomer Friendly">新規住民歓迎</string>
+  <string name="Parks&amp;Nature">公園と自然</string>
+  <string name="Residential">住宅用</string>
+  <!--<string name="Shopping">Shopping</string>	-->
+  <string name="Stage">ステージ</string>
+  <string name="Other">その他</string>
+  <string name="Rental">レンタル</string>
+  <string name="Any">全員</string>
+  <string name="You">あなた</string>
+
+  <!-- punctuations -->
+  <string name=":">：</string>
+  <string name=",">、</string>
+  <string name="...">…</string>
+  <string name="***">***</string>
+  <string name="(">（</string>
+  <string name=")">）</string>
+  <string name=".">。</string>
+  <string name="'">'</string>
+  <string name="---">─</string>
+
+  <!-- media -->
+  <string name="Multiple Media">複数のメディア</string>
+  <string name="Play Media">メディアの再生／一時停止</string>
+
+  <!-- Drivers support/update pages -->
+  <string name="IntelDriverPage">https://www.intel.co.jp/content/www/jp/ja/support/detect.html</string>
+  <string name="NvidiaDriverPage">https://www.nvidia.com/Download/index.aspx?lang=ja-jp</string>
+  <string name="AMDDriverPage">https://www.amd.com/ja/support</string>
+
+  <!-- OSMessageBox messages -->
+  <string name="MBCmdLineError">コマンドラインにエラーが見つかりました。
+リンク先を参照してください：https://wiki.secondlife.com/wiki/%E3%83%93%E3%83%A5%E3%83%BC%E3%83%AF%E5%BC%95%E6%95%B0
 エラー：</string>
-	<string name="MBCmdLineUsg">[APP_NAME] コマンドライン使用：</string>
-	<string name="MBUnableToAccessFile">[APP_NAME] は必要なファイルにアクセスできません。
+  <string name="MBCmdLineUsg">[APP_NAME]コマンドライン使用：</string>
+  <string name="MBUnableToAccessFile">[APP_NAME]は必要なファイルにアクセスできません。
 
 複数のコピーを実行中か、ファイルが既に開いているとあなたのシステムが誤認識している可能性があります。
 このメッセージが何度も出る場合は、コンピューターを再起動してもう一度お試しください。
-それでも問題が続く場合、[APP_NAME] を完全にアンインストールして、再インストールをしてください。</string>
-	<string name="MBFatalError">致命的なエラー</string>
-	<string name="MBRequiresAltiVec">[APP_NAME] は、AltiVec搭載のプロセッサが必要です。（G4 以降）</string>
-	<string name="MBAlreadyRunning">[APP_NAME] はすでに実行中です。
+それでも問題が続く場合、[APP_NAME]を完全にアンインストールして、再インストールをしてください。</string>
+  <string name="MBFatalError">致命的なエラー</string>
+  <string name="MBRequiresAltiVec">[APP_NAME]は、AltiVec搭載のプロセッサが必要です。（G4 以降）</string>
+  <string name="MBAlreadyRunning">[APP_NAME]はすでに実行中です。
 最小化されたプログラムのコピーをタスクバーで確認してください。
 このメッセージが何度も出る場合はコンピューターを再起動してください。</string>
-	<string name="MBFrozenCrashed">[APP_NAME] は前回の実行時にフリーズしています。
+  <string name="MBFrozenCrashed">[APP_NAME]は前回の実行時にフリーズしています。
 クラッシュ報告を送信しますか？</string>
-	<string name="MBAlert">通知</string>
-	<string name="MBNoDirectX">[APP_NAME] は DirectX 9.0b 及びそれ以降のバージョンを検出することができませんでした。
-[APP_NAME] は DirectX を使用して安定性の問題、低パフォーマンス、クラッシュ等悪影響を与えるハードウェアや古いドライバを検出します。  DirectX 9.0b がなくても [APP_NAME] を実行できますが、DirectX 9.0bとのご使用を強く推奨します。
+  <string name="MBAlert">通知</string>
+  <string name="MBNoDirectX">[APP_NAME]は、DirectX 9.0b及びそれ以降のバージョンを検出することができませんでした。
+[APP_NAME]は DirectX を使用して安定性の問題、低パフォーマンス、クラッシュ等悪影響を与えるハードウェアや古いドライバを検出します。DirectX 9.0b がなくても
+[APP_NAME]を実行できますが、DirectX 9.0bとのご使用を強く推奨します。
 
 続けますか？</string>
-	<string name="MBWarning">警告</string>
-	<string name="MBNoAutoUpdate">自動更新は現在 Linux には対応していません。
+  <string name="MBWarning">警告</string>
+  <string name="MBNoAutoUpdate">自動更新は現在 Linux には対応していません。
 www.secondlife.com から最新バージョンをダウンロードしてください。</string>
-	<string name="MBRegClassFailed">RegisterClass 失敗</string>
-	<string name="MBError">エラー</string>
-	<string name="MBFullScreenErr">[WIDTH] x [HEIGHT] では全画面で実行することができません。
+  <string name="MBRegClassFailed">RegisterClass 失敗</string>
+  <string name="MBError">エラー</string>
+  <string name="MBFullScreenErr">[WIDTH]✕[HEIGHT]では全画面で実行することができません。
 ウィンドウモードで実行中です。</string>
-	<string name="MBDestroyWinFailed">シャットダウンエラー（DestroyWindow() 失敗）</string>
-	<string name="MBShutdownErr">シャットダウンエラー</string>
-	<string name="MBDevContextErr">GL ディバイスコンテキストが作れません</string>
-	<string name="MBPixelFmtErr">適切なピクセル形式が見つかりません</string>
-	<string name="MBPixelFmtDescErr">ピクセル形式情報が見つかりません</string>
-	<string name="MBTrueColorWindow">[APP_NAME] を実行するには、True Color （32ビット）が必要です。
-お使いのコンピューターの「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （32 ビット)」に設定してください。</string>
-	<string name="MBAlpha">[APP_NAME] は 8 ビットのアルファチャンネルを取得できないため実行できません。  通常ビデオカードのドライバの問題で起こります。
+  <string name="MBDestroyWinFailed">シャットダウンエラー（DestroyWindow() 失敗）</string>
+  <string name="MBShutdownErr">シャットダウンエラー</string>
+  <string name="MBDevContextErr">GL ディバイスコンテキストが作れません</string>
+  <string name="MBPixelFmtErr">適切なピクセル形式が見つかりません</string>
+  <string name="MBPixelFmtDescErr">ピクセル形式情報が見つかりません</string>
+  <string name="MBTrueColorWindow">[APP_NAME]を実行するには、True Color（３２ビット）が必要です。
+お使いのコンピューターの「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （３２ビット）」に設定してください。</string>
+  <string name="MBAlpha">[APP_NAME]は８ビットのアルファチャンネルを取得できないため実行できません。通常ビデオカードのドライバの問題で起こります。
 お使いのコンピューターに最新のビデオカードドライバがインストールされているかご確認ください。
-また、「コントロールパネル」＞「画面」＞「設定」内で、モニターが「最高 （32 ビット）」に設定されていることもご確認ください。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。</string>
-	<string name="MBPixelFmtSetErr">ピクセル形式が設定できません</string>
-	<string name="MBGLContextErr">GL レンダーコンテキストが作れません</string>
-	<string name="MBGLContextActErr">GL レンダーコンテキストをアクティベートできません</string>
-	<string name="MBVideoDrvErr">お使いのコンピューターのビデオカードドライバが正常にインストールできなかった、または古いかサポート対象外のため、[APP_NAME]  は実行できません。 最新のビデオカードドライバがインストールされているのを確認し、されている場合は再インストールをお試しください。
-
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。</string>
-	<string name="5 O'Clock Shadow">うっすらとしたヒゲ</string>
-	<string name="All White">真っ白</string>
-	<string name="Anime Eyes">アニメ風の目</string>
-	<string name="Arced">アーチ</string>
-	<string name="Arm Length">腕の長さ</string>
-	<string name="Attached">小</string>
-	<string name="Attached Earlobes">耳たぶ</string>
-	<string name="Back Fringe">後ろ髪の毛先</string>
-	<string name="Baggy">たるんだ下まぶた</string>
-	<string name="Bangs">前髪</string>
-	<string name="Beady Eyes">ビーズのような目</string>
-	<string name="Belly Size">お腹の大きさ</string>
-	<string name="Big">大</string>
-	<string name="Big Butt">大</string>
-	<string name="Big Hair Back">髪の大部分： 後ろ</string>
-	<string name="Big Hair Front">髪の大部分： 前</string>
-	<string name="Big Hair Top">髪の大部分： 上部</string>
-	<string name="Big Head">大</string>
-	<string name="Big Pectorals">大</string>
-	<string name="Big Spikes">とげあり</string>
-	<string name="Black">黒</string>
-	<string name="Blonde">ブロンド</string>
-	<string name="Blonde Hair">ブロンドの髪</string>
-	<string name="Blush">チーク</string>
-	<string name="Blush Color">チークカラー</string>
-	<string name="Blush Opacity">チークの濃さ</string>
-	<string name="Body Definition">体の精細度</string>
-	<string name="Body Fat">体脂肪</string>
-	<string name="Body Freckles">体のしみ・そばかす</string>
-	<string name="Body Thick">骨太</string>
-	<string name="Body Thickness">体の厚み</string>
-	<string name="Body Thin">細め</string>
-	<string name="Bow Legged">外股</string>
-	<string name="Breast Buoyancy">胸の重力</string>
-	<string name="Breast Cleavage">胸の谷間</string>
-	<string name="Breast Size">胸の大きさ</string>
-	<string name="Bridge Width">両目の間の幅</string>
-	<string name="Broad">広</string>
-	<string name="Brow Size">眉毛上の隆起</string>
-	<string name="Bug Eyes">Bug Eyes</string>
-	<string name="Bugged Eyes">突き出た目</string>
-	<string name="Bulbous">だんご</string>
-	<string name="Bulbous Nose">だんご鼻</string>
-	<string name="Breast Physics Mass">胸の豊かさ</string>
-	<string name="Breast Physics Smoothing">胸の平滑化</string>
-	<string name="Breast Physics Gravity">胸の垂れ具合</string>
-	<string name="Breast Physics Drag">胸の空気抵抗</string>
-	<string name="Breast Physics InOut Max Effect">最大エフェクト数</string>
-	<string name="Breast Physics InOut Spring">振動速度</string>
-	<string name="Breast Physics InOut Gain">増加率</string>
-	<string name="Breast Physics InOut Damping">減衰</string>
-	<string name="Breast Physics UpDown Max Effect">最大エフェクト数</string>
-	<string name="Breast Physics UpDown Spring">振動速度</string>
-	<string name="Breast Physics UpDown Gain">増加率</string>
-	<string name="Breast Physics UpDown Damping">減衰</string>
-	<string name="Breast Physics LeftRight Max Effect">最大エフェクト数</string>
-	<string name="Breast Physics LeftRight Spring">振動速度</string>
-	<string name="Breast Physics LeftRight Gain">増加率</string>
-	<string name="Breast Physics LeftRight Damping">減衰</string>
-	<string name="Belly Physics Mass">お腹の豊かさ</string>
-	<string name="Belly Physics Smoothing">お腹の平滑化</string>
-	<string name="Belly Physics Gravity">お腹の垂れ具合</string>
-	<string name="Belly Physics Drag">お腹の空気抵抗</string>
-	<string name="Belly Physics UpDown Max Effect">最大エフェクト数</string>
-	<string name="Belly Physics UpDown Spring">振動速度</string>
-	<string name="Belly Physics UpDown Gain">増加率</string>
-	<string name="Belly Physics UpDown Damping">減衰</string>
-	<string name="Butt Physics Mass">お尻の豊かさ</string>
-	<string name="Butt Physics Smoothing">お尻の平滑化</string>
-	<string name="Butt Physics Gravity">お尻の垂れ具合</string>
-	<string name="Butt Physics Drag">お尻の空気抵抗</string>
-	<string name="Butt Physics UpDown Max Effect">最大エフェクト数</string>
-	<string name="Butt Physics UpDown Spring">振動速度</string>
-	<string name="Butt Physics UpDown Gain">増加率</string>
-	<string name="Butt Physics UpDown Damping">減衰</string>
-	<string name="Butt Physics LeftRight Max Effect">最大エフェクト数</string>
-	<string name="Butt Physics LeftRight Spring">振動速度</string>
-	<string name="Butt Physics LeftRight Gain">増加率</string>
-	<string name="Butt Physics LeftRight Damping">減衰</string>
-	<string name="Bushy Eyebrows">太</string>
-	<string name="Bushy Hair">ぼさぼさヘア</string>
-	<string name="Butt Size">お尻の大きさ</string>
-	<string name="Butt Gravity">お尻の垂れ具合</string>
-	<string name="bustle skirt">後ろの膨らみ</string>
-	<string name="no bustle">膨らみなし</string>
-	<string name="more bustle">膨らみ大</string>
-	<string name="Chaplin">チャップリン</string>
-	<string name="Cheek Bones">ほお骨</string>
-	<string name="Chest Size">胸部の大きさ</string>
-	<string name="Chin Angle">あごの角度</string>
-	<string name="Chin Cleft">あごの先の割れ</string>
-	<string name="Chin Curtains">あごに沿ったひげ</string>
-	<string name="Chin Depth">あごの長さ</string>
-	<string name="Chin Heavy">あごを強調</string>
-	<string name="Chin In">ひいたあご</string>
-	<string name="Chin Out">突き出たあご</string>
-	<string name="Chin-Neck">あごと首</string>
-	<string name="Clear">クリア</string>
-	<string name="Cleft">割れた</string>
-	<string name="Close Set Eyes">顔の中心寄りの目</string>
-	<string name="Closed">クローズ</string>
-	<string name="Closed Back">後ろとじ</string>
-	<string name="Closed Front">前とじ</string>
-	<string name="Closed Left">左とじ</string>
-	<string name="Closed Right">右とじ</string>
-	<string name="Coin Purse">コイン入れ</string>
-	<string name="Collar Back">後ろえり</string>
-	<string name="Collar Front">前えり</string>
-	<string name="Corner Down">ダウン</string>
-	<string name="Corner Up">アップ</string>
-	<string name="Creased">重いまぶた</string>
-	<string name="Crooked Nose">曲がった鼻</string>
-	<string name="Cuff Flare">袖口のフレア</string>
-	<string name="Dark">ダーク</string>
-	<string name="Dark Green">ダークグリーン</string>
-	<string name="Darker">ダーク</string>
-	<string name="Deep">尖った</string>
-	<string name="Default Heels">デフォルトのかかと</string>
-	<string name="Dense">濃</string>
-	<string name="Double Chin">二重あご</string>
-	<string name="Downturned">下向き</string>
-	<string name="Duffle Bag">ダッフルバッグ</string>
-	<string name="Ear Angle">耳の角度</string>
-	<string name="Ear Size">耳の大きさ</string>
-	<string name="Ear Tips">耳の先</string>
-	<string name="Egg Head">たまご頭</string>
-	<string name="Eye Bags">下まぶた</string>
-	<string name="Eye Color">瞳の色</string>
-	<string name="Eye Depth">目のくぼみ</string>
-	<string name="Eye Lightness">瞳の明るさ</string>
-	<string name="Eye Opening">見開き具合</string>
-	<string name="Eye Pop">両目の大きさの対称</string>
-	<string name="Eye Size">目の大きさ</string>
-	<string name="Eye Spacing">目と目のあいだの幅</string>
-	<string name="Eyebrow Arc">眉毛のアーチ</string>
-	<string name="Eyebrow Density">眉毛の密集度</string>
-	<string name="Eyebrow Height">眉毛の高さ</string>
-	<string name="Eyebrow Points">眉毛の角</string>
-	<string name="Eyebrow Size">眉毛の大きさ</string>
-	<string name="Eyelash Length">まつげの長さ</string>
-	<string name="Eyeliner">アイライナー</string>
-	<string name="Eyeliner Color">アイライナーの色</string>
-	<string name="Eyes Bugged">下まぶたがたるんだ目</string>
-	<string name="Face Shear">顔のゆがみ</string>
-	<string name="Facial Definition">顔の精細度</string>
-	<string name="Far Set Eyes">離れた目</string>
-	<string name="Fat Lips">大</string>
-	<string name="Female">女性</string>
-	<string name="Fingerless">指なし</string>
-	<string name="Fingers">指あり</string>
-	<string name="Flared Cuffs">広がった袖口</string>
-	<string name="Flat">平ら</string>
-	<string name="Flat Butt">小</string>
-	<string name="Flat Head">絶壁頭</string>
-	<string name="Flat Toe">フラット</string>
-	<string name="Foot Size">足の大きさ</string>
-	<string name="Forehead Angle">ひたいの角度</string>
-	<string name="Forehead Heavy">ひたいを強調</string>
-	<string name="Freckles">しみ・そばかす</string>
-	<string name="Front Fringe">前髪の毛先</string>
-	<string name="Full Back">刈られていない髪</string>
-	<string name="Full Eyeliner">あり</string>
-	<string name="Full Front">刈られていない髪</string>
-	<string name="Full Hair Sides">サイドの髪</string>
-	<string name="Full Sides">生え揃ったサイド</string>
-	<string name="Glossy">あり</string>
-	<string name="Glove Fingers">手袋の指</string>
-	<string name="Glove Length">手袋の長さ</string>
-	<string name="Hair">髪</string>
-	<string name="Hair Back">髪： 後ろ</string>
-	<string name="Hair Front">髪： 前</string>
-	<string name="Hair Sides">髪： サイド</string>
-	<string name="Hair Sweep">流す</string>
-	<string name="Hair Thickess">髪の量</string>
-	<string name="Hair Thickness">髪の量</string>
-	<string name="Hair Tilt">髪の向き</string>
-	<string name="Hair Tilted Left">左向き</string>
-	<string name="Hair Tilted Right">右向き</string>
-	<string name="Hair Volume">髪： ボリューム</string>
-	<string name="Hand Size">手の大きさ</string>
-	<string name="Handlebars">ハンドルバー</string>
-	<string name="Head Length">頭の長さ</string>
-	<string name="Head Shape">頭の形</string>
-	<string name="Head Size">頭の大きさ</string>
-	<string name="Head Stretch">縦横の長さ</string>
-	<string name="Heel Height">ヒールの高さ</string>
-	<string name="Heel Shape">ヒールの形</string>
-	<string name="Height">身長</string>
-	<string name="High">高</string>
-	<string name="High Heels">ハイヒール</string>
-	<string name="High Jaw">高</string>
-	<string name="High Platforms">厚底</string>
-	<string name="High and Tight">高めでタイト</string>
-	<string name="Higher">高</string>
-	<string name="Hip Length">腰の長さ</string>
-	<string name="Hip Width">腰の幅</string>
-	<string name="Hover">ホバー</string>
-	<string name="In">内向き</string>
-	<string name="In Shdw Color">内側のシャドウカラー</string>
-	<string name="In Shdw Opacity">内側のシャドウの濃さ</string>
-	<string name="Inner Eye Corner">目頭</string>
-	<string name="Inner Eye Shadow">内側のアイシャドウ</string>
-	<string name="Inner Shadow">内側のシャドウ</string>
-	<string name="Jacket Length">ジャケット丈</string>
-	<string name="Jacket Wrinkles">ジャケットのしわ</string>
-	<string name="Jaw Angle">あごの角度</string>
-	<string name="Jaw Jut">あごの突出</string>
-	<string name="Jaw Shape">あごの形</string>
-	<string name="Join">寄せた胸</string>
-	<string name="Jowls">えら</string>
-	<string name="Knee Angle">膝の角度</string>
-	<string name="Knock Kneed">内股</string>
-	<string name="Large">大</string>
-	<string name="Large Hands">大</string>
-	<string name="Left Part">左分け</string>
-	<string name="Leg Length">脚の長さ</string>
-	<string name="Leg Muscles">脚の筋肉</string>
-	<string name="Less">小</string>
-	<string name="Less Body Fat">少なめ</string>
-	<string name="Less Curtains">少なめ</string>
-	<string name="Less Freckles">少なめ</string>
-	<string name="Less Full">薄い</string>
-	<string name="Less Gravity">少</string>
-	<string name="Less Love">少</string>
-	<string name="Less Muscles">少なめ</string>
-	<string name="Less Muscular">少なめ</string>
-	<string name="Less Rosy">少な目</string>
-	<string name="Less Round">丸み少な目</string>
-	<string name="Less Saddle">小</string>
-	<string name="Less Square">小</string>
-	<string name="Less Volume">ボリューム少な目</string>
-	<string name="Less soul">小</string>
-	<string name="Lighter">ライト</string>
-	<string name="Lip Cleft">唇の山</string>
-	<string name="Lip Cleft Depth">唇の山の高さ</string>
-	<string name="Lip Fullness">唇の厚み</string>
-	<string name="Lip Pinkness">唇の赤み</string>
-	<string name="Lip Ratio">上下唇の大きさ</string>
-	<string name="Lip Thickness">唇の前後幅</string>
-	<string name="Lip Width">口の大きさ</string>
-	<string name="Lipgloss">リップグロス</string>
-	<string name="Lipstick">口紅</string>
-	<string name="Lipstick Color">口紅の色</string>
-	<string name="Long">ロング</string>
-	<string name="Long Head">前後幅が広い頭</string>
-	<string name="Long Hips">長</string>
-	<string name="Long Legs">長</string>
-	<string name="Long Neck">長</string>
-	<string name="Long Pigtails">長</string>
-	<string name="Long Ponytail">長</string>
-	<string name="Long Torso">長</string>
-	<string name="Long arms">長</string>
-	<string name="Loose Pants">ゆったり</string>
-	<string name="Loose Shirt">ゆるめ</string>
-	<string name="Loose Sleeves">ゆるめ</string>
-	<string name="Love Handles">ウエスト周り</string>
-	<string name="Low">低</string>
-	<string name="Low Heels">ローヒール</string>
-	<string name="Low Jaw">低</string>
-	<string name="Low Platforms">低め</string>
-	<string name="Low and Loose">低めでゆったり</string>
-	<string name="Lower">低</string>
-	<string name="Lower Bridge">鼻筋</string>
-	<string name="Lower Cheeks">ほおの下部</string>
-	<string name="Male">男性</string>
-	<string name="Middle Part">真ん中分け</string>
-	<string name="More">大</string>
-	<string name="More Blush">きつめ</string>
-	<string name="More Body Fat">多め</string>
-	<string name="More Curtains">多め</string>
-	<string name="More Eyeshadow">あり</string>
-	<string name="More Freckles">多め</string>
-	<string name="More Full">厚い</string>
-	<string name="More Gravity">大</string>
-	<string name="More Lipstick">あり</string>
-	<string name="More Love">大</string>
-	<string name="More Lower Lip">大</string>
-	<string name="More Muscles">多め</string>
-	<string name="More Muscular">筋骨隆々</string>
-	<string name="More Rosy">多め</string>
-	<string name="More Round">まる</string>
-	<string name="More Saddle">大</string>
-	<string name="More Sloped">なだらか</string>
-	<string name="More Square">四角</string>
-	<string name="More Upper Lip">大</string>
-	<string name="More Vertical">垂直</string>
-	<string name="More Volume">大</string>
-	<string name="More soul">大</string>
-	<string name="Moustache">口ひげ</string>
-	<string name="Mouth Corner">口角</string>
-	<string name="Mouth Position">口の位置</string>
-	<string name="Mowhawk">モヒカン</string>
-	<string name="Muscular">筋骨たくましい</string>
-	<string name="Mutton Chops">マトンチョップス</string>
-	<string name="Nail Polish">マニキュア</string>
-	<string name="Nail Polish Color">マニキュアの色</string>
-	<string name="Narrow">狭</string>
-	<string name="Narrow Back">狭</string>
-	<string name="Narrow Front">狭</string>
-	<string name="Narrow Lips">おちょぼ口</string>
-	<string name="Natural">ナチュラル</string>
-	<string name="Neck Length">首の長さ</string>
-	<string name="Neck Thickness">首の太さ</string>
-	<string name="No Blush">なし</string>
-	<string name="No Eyeliner">なし</string>
-	<string name="No Eyeshadow">なし</string>
-	<string name="No Lipgloss">なし</string>
-	<string name="No Lipstick">なし</string>
-	<string name="No Part">なし</string>
-	<string name="No Polish">なし</string>
-	<string name="No Red">なし</string>
-	<string name="No Spikes">なし</string>
-	<string name="No White">なし</string>
-	<string name="No Wrinkles">なし</string>
-	<string name="Normal Lower">下</string>
-	<string name="Normal Upper">上</string>
-	<string name="Nose Left">左曲がり</string>
-	<string name="Nose Right">右曲がり</string>
-	<string name="Nose Size">鼻の大きさ</string>
-	<string name="Nose Thickness">鼻の厚み</string>
-	<string name="Nose Tip Angle">鼻先の角度</string>
-	<string name="Nose Tip Shape">鼻先の形</string>
-	<string name="Nose Width">鼻の幅</string>
-	<string name="Nostril Division">鼻の穴の高さ</string>
-	<string name="Nostril Width">鼻の穴の幅</string>
-	<string name="Opaque">濃いめ</string>
-	<string name="Open">オープン</string>
-	<string name="Open Back">後ろあき</string>
-	<string name="Open Front">前あき</string>
-	<string name="Open Left">左あき</string>
-	<string name="Open Right">右あき</string>
-	<string name="Orange">オレンジ</string>
-	<string name="Out">外向き</string>
-	<string name="Out Shdw Color">外側のシャドウカラー</string>
-	<string name="Out Shdw Opacity">外側のシャドウの濃さ</string>
-	<string name="Outer Eye Corner">目尻</string>
-	<string name="Outer Eye Shadow">外側のアイシャドウ</string>
-	<string name="Outer Shadow">外側のシャドウ</string>
-	<string name="Overbite">出っ歯</string>
-	<string name="Package">パッケージ</string>
-	<string name="Painted Nails">あり</string>
-	<string name="Pale">悪い</string>
-	<string name="Pants Crotch">パンツの股</string>
-	<string name="Pants Fit">パンツのフィット感</string>
-	<string name="Pants Length">パンツ丈</string>
-	<string name="Pants Waist">ウエスト</string>
-	<string name="Pants Wrinkles">パンツのしわ</string>
-	<string name="Part">あり</string>
-	<string name="Part Bangs">分けた前髪</string>
-	<string name="Pectorals">胸筋</string>
-	<string name="Pigment">色素</string>
-	<string name="Pigtails">下げ髪</string>
-	<string name="Pink">ピンク</string>
-	<string name="Pinker">ピンク</string>
-	<string name="Platform Height">靴底の高さ</string>
-	<string name="Platform Width">靴底の幅</string>
-	<string name="Pointy">尖った</string>
-	<string name="Pointy Heels">幅狭</string>
-	<string name="Ponytail">ポニーテール</string>
-	<string name="Poofy Skirt">ふんわり</string>
-	<string name="Pop Left Eye">左目を大きく</string>
-	<string name="Pop Right Eye">右目を大きく</string>
-	<string name="Puffy">ふっくら</string>
-	<string name="Puffy Eyelids">目の周りの膨らみ</string>
-	<string name="Rainbow Color">虹色</string>
-	<string name="Red Hair">赤毛</string>
-	<string name="Regular">均整のとれた</string>
-	<string name="Right Part">右分け</string>
-	<string name="Rosy Complexion">ほおの赤らみ</string>
-	<string name="Round">まるっこい</string>
-	<string name="Ruddiness">血色</string>
-	<string name="Ruddy">良い</string>
-	<string name="Rumpled Hair">くしゃくしゃヘア</string>
-	<string name="Saddle Bags">腰回りの肉付き</string>
-	<string name="Scrawny Leg">骨張った脚</string>
-	<string name="Separate">離れた胸</string>
-	<string name="Shallow">なだらか</string>
-	<string name="Shear Back">後方を刈る</string>
-	<string name="Shear Face">顔のゆがみ</string>
-	<string name="Shear Front">前方を刈る</string>
-	<string name="Shear Left Up">左半分を上に</string>
-	<string name="Shear Right Up">右半分を上に</string>
-	<string name="Sheared Back">後ろを刈られた髪</string>
-	<string name="Sheared Front">前を刈られた髪</string>
-	<string name="Shift Left">左向き</string>
-	<string name="Shift Mouth">口の向き</string>
-	<string name="Shift Right">右向き</string>
-	<string name="Shirt Bottom">シャツの裾</string>
-	<string name="Shirt Fit">シャツのフィット感</string>
-	<string name="Shirt Wrinkles">シャツのしわ</string>
-	<string name="Shoe Height">靴の長さ</string>
-	<string name="Short">ショート</string>
-	<string name="Short Arms">短</string>
-	<string name="Short Legs">短</string>
-	<string name="Short Neck">短</string>
-	<string name="Short Pigtails">短</string>
-	<string name="Short Ponytail">短</string>
-	<string name="Short Sideburns">短め</string>
-	<string name="Short Torso">短</string>
-	<string name="Short hips">短</string>
-	<string name="Shoulders">肩</string>
-	<string name="Side Fringe">サイドの毛先</string>
-	<string name="Sideburns">もみあげ</string>
-	<string name="Sides Hair">サイドの髪</string>
-	<string name="Sides Hair Down">ダウン</string>
-	<string name="Sides Hair Up">アップ</string>
-	<string name="Skinny Neck">細</string>
-	<string name="Skirt Fit">スカートのフィット感</string>
-	<string name="Skirt Length">スカート丈</string>
-	<string name="Slanted Forehead">傾斜した額</string>
-	<string name="Sleeve Length">袖丈</string>
-	<string name="Sleeve Looseness">袖のフィット感</string>
-	<string name="Slit Back">スリット： 後ろ</string>
-	<string name="Slit Front">スリット： 前</string>
-	<string name="Slit Left">スリット： 左</string>
-	<string name="Slit Right">スリット： 右</string>
-	<string name="Small">小</string>
-	<string name="Small Hands">小</string>
-	<string name="Small Head">小</string>
-	<string name="Smooth">滑らか</string>
-	<string name="Smooth Hair">スムーズ</string>
-	<string name="Socks Length">靴下丈</string>
-	<string name="Soulpatch">ソウルパッチ</string>
-	<string name="Sparse">薄</string>
-	<string name="Spiked Hair">とげとげヘア</string>
-	<string name="Square">角張った</string>
-	<string name="Square Toe">スクエアトゥ</string>
-	<string name="Squash Head">カボチャ型</string>
-	<string name="Stretch Head">縦長</string>
-	<string name="Sunken">こけたほお</string>
-	<string name="Sunken Chest">小</string>
-	<string name="Sunken Eyes">くぼんだ目</string>
-	<string name="Sweep Back">後ろへ</string>
-	<string name="Sweep Forward">前へ</string>
-	<string name="Tall">トール</string>
-	<string name="Taper Back">後ろに先細</string>
-	<string name="Taper Front">前に先細</string>
-	<string name="Thick Heels">幅広</string>
-	<string name="Thick Neck">太</string>
-	<string name="Thick Toe">厚め</string>
-	<string name="Thin">薄い</string>
-	<string name="Thin Eyebrows">細</string>
-	<string name="Thin Lips">小</string>
-	<string name="Thin Nose">細い鼻</string>
-	<string name="Tight Chin">ひきしまったあご</string>
-	<string name="Tight Cuffs">タイト</string>
-	<string name="Tight Pants">タイト</string>
-	<string name="Tight Shirt">タイト</string>
-	<string name="Tight Skirt">タイト</string>
-	<string name="Tight Sleeves">タイト</string>
-	<string name="Toe Shape">つま先の形</string>
-	<string name="Toe Thickness">つま先の厚み</string>
-	<string name="Torso Length">上半身の長さ</string>
-	<string name="Torso Muscles">上半身の筋肉</string>
-	<string name="Torso Scrawny">上半身の骨張り</string>
-	<string name="Unattached">大</string>
-	<string name="Uncreased">軽いまぶた</string>
-	<string name="Underbite">受け口</string>
-	<string name="Unnatural">ユニーク</string>
-	<string name="Upper Bridge">両目のあいだ</string>
-	<string name="Upper Cheeks">ほおの上部</string>
-	<string name="Upper Chin Cleft">あご上部の割れ</string>
-	<string name="Upper Eyelid Fold">二重の幅</string>
-	<string name="Upturned">上向き</string>
-	<string name="Very Red">真っ赤</string>
-	<string name="Waist Height">ウエストの高さ</string>
-	<string name="Well-Fed">つまったほお</string>
-	<string name="White Hair">白髪</string>
-	<string name="Wide">広</string>
-	<string name="Wide Back">広</string>
-	<string name="Wide Front">広</string>
-	<string name="Wide Lips">大きい口</string>
-	<string name="Wild">ワイルド</string>
-	<string name="Wrinkles">しわ</string>
-	<string name="LocationCtrlAddLandmarkTooltip">マイ ランドマークに追加</string>
-	<string name="LocationCtrlEditLandmarkTooltip">マイ ランドマークを編集</string>
-	<string name="LocationCtrlInfoBtnTooltip">現在地の詳細を見る</string>
-	<string name="LocationCtrlComboBtnTooltip">マイ ロケーション履歴</string>
-	<string name="LocationCtrlForSaleTooltip">この土地を購入</string>
-	<string name="LocationCtrlVoiceTooltip">ここではボイスの利用ができません</string>
-	<string name="LocationCtrlFlyTooltip">飛行は禁止されています</string>
-	<string name="LocationCtrlPushTooltip">プッシュ禁止</string>
-	<string name="LocationCtrlBuildTooltip">オブジェクトの制作・ドロップは禁止されています</string>
-	<string name="LocationCtrlScriptsTooltip">スクリプト不可</string>
-	<string name="LocationCtrlDamageTooltip">体力</string>
-	<string name="LocationCtrlAdultIconTooltip">Adult リージョン</string>
-	<string name="LocationCtrlModerateIconTooltip">Moderate リージョン</string>
-	<string name="LocationCtrlGeneralIconTooltip">General リージョン</string>
-	<string name="LocationCtrlSeeAVsTooltip">この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。</string>
-	<string name="LocationCtrlPathfindingDirtyTooltip">地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。</string>
-	<string name="LocationCtrlPathfindingDisabledTooltip">この地域（リージョン）でダイナミックパスファインディングが有効になっていません。</string>
-	<string name="UpdaterWindowTitle">[APP_NAME] アップデート</string>
-	<string name="UpdaterNowUpdating">只今 [APP_NAME] をアップデート中です...</string>
-	<string name="UpdaterNowInstalling">[APP_NAME] をインストール中です...</string>
-	<string name="UpdaterUpdatingDescriptive">お使いの [APP_NAME] ビューワが最新バージョンにアップデートされています。  数分かかることがありますのでしばらくお待ちください。</string>
-	<string name="UpdaterProgressBarTextWithEllipses">アップデートをダウンロード中です...</string>
-	<string name="UpdaterProgressBarText">アップデートをダウンロード中</string>
-	<string name="UpdaterFailDownloadTitle">アップデートのダウンロードに失敗しました</string>
-	<string name="UpdaterFailUpdateDescriptive">[APP_NAME] をアップデート中にエラーが発生しました。 www.secondlife.com から最新バージョンをダウンロードしてください。</string>
-	<string name="UpdaterFailInstallTitle">アップデートのインストールに失敗しました</string>
-	<string name="UpdaterFailStartTitle">ビューワの起動に失敗しました</string>
-	<string name="ItemsComingInTooFastFrom">[APP_NAME] ： アイテムが [FROM_NAME] から同時にたくさん読み込まれているため、自動プレビューが [TIME] 秒間無効となります。</string>
-	<string name="ItemsComingInTooFast">[APP_NAME] ： アイテムが同時にたくさん読み込まれているため、自動プレビューが [TIME] 秒間無効となります。</string>
-	<string name="IM_logging_string">-- インスタントメッセージの保存開始 --</string>
-	<string name="IM_typing_start_string">[NAME] は入力中です...</string>
-	<string name="Unnamed">（名前なし）</string>
-	<string name="IM_moderated_chat_label">（モデレート： デフォルトでボイスはオフ）</string>
-	<string name="IM_unavailable_text_label">このコールでは文字チャットが利用できません。</string>
-	<string name="IM_muted_text_label">グループのモデレータが、あなたの文字チャットを使用禁止にしました。</string>
-	<string name="IM_default_text_label">ここをクリックしてインスタントメッセージを開始。</string>
-	<string name="IM_to_label">宛先</string>
-	<string name="IM_moderator_label">（モデレータ）</string>
-	<string name="Saved_message">（保存日時：[LONG_TIMESTAMP]）</string>
-	<string name="IM_unblock_only_groups_friends">このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。</string>
-	<string name="OnlineStatus">オンライン</string>
-	<string name="OfflineStatus">オフライン</string>
-	<string name="not_online_msg">ユーザーがオンラインでありません - メッセージは保存され、後で配信されます。</string>
-	<string name="not_online_inventory">ユーザーがオンラインでありません - インベントリが保存されました。</string>
-	<string name="answered_call">相手がコールを受けました</string>
-	<string name="you_started_call">ボイスコールを開始します</string>
-	<string name="you_joined_call">ボイスコールに参加しました</string>
-	<string name="you_auto_rejected_call-im">「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。</string>
-	<string name="name_started_call">[NAME] はボイスコールを開始します</string>
-	<string name="ringing-im">ボイスコールに参加...</string>
-	<string name="connected-im">接続しました。コール終了をクリックして切ります</string>
-	<string name="hang_up-im">ボイスコールから退席しました</string>
-	<string name="answering-im">接続中...</string>
-	<string name="conference-title">複数人チャット</string>
-	<string name="conference-title-incoming">[AGENT_NAME] とコンファレンスする</string>
-	<string name="inventory_item_offered-im">持ち物アイテム '[ITEM_NAME]' が送られてきました</string>
-	<string name="inventory_folder_offered-im">持ち物フォルダ '[ITEM_NAME]' が送られてきました</string>
-	<string name="share_alert">インベントリからここにアイテムをドラッグします</string>
-	<string name="facebook_post_success">Facebook に投稿しました。</string>
-	<string name="flickr_post_success">Flickr に投稿しました。</string>
-	<string name="twitter_post_success">Twitter に投稿しました。</string>
-	<string name="no_session_message">（IM セッションが存在しません）</string>
-	<string name="only_user_message">このセッションにいるユーザーはあなただけです。</string>
-	<string name="offline_message">[NAME] はオフライン中です。</string>
-	<string name="invite_message">このボイスチャットに応答・接続する場合は、[BUTTON NAME] をクリックしてください。</string>
-	<string name="muted_message">この住人をブロックしています。 メッセージを送ると、ブロックが自動的に解除されます。</string>
-	<string name="generic">リクエスト中にエラーが発生しました。あとでもう一度お試しください。</string>
-	<string name="generic_request_error">要求中にエラーが発生しました。後でもう一度試してください。</string>
-	<string name="insufficient_perms_error">あなたには充分な権限がありません。</string>
-	<string name="session_does_not_exist_error">このセッションは既に切断されています。</string>
-	<string name="no_ability_error">あなたにはその能力がありません。</string>
-	<string name="no_ability">あなたにはその能力がありません。</string>
-	<string name="not_a_mod_error">あなたはセッションモデレータではありません。</string>
-	<string name="muted">グループのモデレーターが、あなたのテキストチャットを禁止しました。</string>
-	<string name="muted_error">グループモデレータがあなたのテキストチャットを無効化しました</string>
-	<string name="add_session_event">[RECIPIENT] とのチャットセッションにユーザーを追加することができません</string>
-	<string name="message">[RECIPIENT] とのチャットセッションに、メッセージを送信することができません。</string>
-	<string name="message_session_event">[RECIPIENT] とのチャットセッションにメッセージを送ることができません</string>
-	<string name="mute">モデレート中にエラーが発生しました。</string>
-	<string name="removed">グループから脱退しました。</string>
-	<string name="removed_from_group">あなたはグループから削除されました。</string>
-	<string name="close_on_no_ability">このチャットセッションを継続することはできません</string>
-	<string name="unread_chat_single">[SOURCES] は何か新しいことを言いました。</string>
-	<string name="unread_chat_multiple">[SOURCES] は何か新しいことを言いました。</string>
-	<string name="session_initialization_timed_out_error">セッションの初期化がタイムアウトしました</string>
-	<string name="Home position set.">家の配置の設定。</string>
-	<string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
-	<string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
-	<string name="paid_you_ldollars">[NAME] は [REASON] のために L$[AMOUNT] を支払いました。</string>
-	<string name="paid_you_ldollars_gift">[NAME] は L$[AMOUNT] 支払いました：[REASON]</string>
-	<string name="paid_you_ldollars_no_reason">[NAME] は L$[AMOUNT] を支払いました。</string>
-	<string name="you_paid_ldollars">[NAME] に L$ [AMOUNT] を支払いました：[REASON]</string>
-	<string name="you_paid_ldollars_gift">[NAME] に L$ [AMOUNT] を支払いました：[REASON]</string>
-	<string name="you_paid_ldollars_no_info">L$ [AMOUNT] を支払いました。</string>
-	<string name="you_paid_ldollars_no_reason">[NAME] に L$ [AMOUNT] を支払いました。</string>
-	<string name="you_paid_ldollars_no_name">L$ [AMOUNT] を支払いました：[REASON]</string>
-	<string name="you_paid_failure_ldollars">[NAME] に [REASON] の代金 L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="you_paid_failure_ldollars_gift">[NAME] に L$ [AMOUNT] を支払えませんでした：[REASON]</string>
-	<string name="you_paid_failure_ldollars_no_info">L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="you_paid_failure_ldollars_no_reason">[NAME] に L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="you_paid_failure_ldollars_no_name">[REASON] の 代金 L$ [AMOUNT] を支払えませんでした。</string>
-	<string name="for item">[ITEM] 向け</string>
-	<string name="for a parcel of land">土地区画のため</string>
-	<string name="for a land access pass">土地の入場許可を得るため</string>
-	<string name="for deeding land">土地を譲渡するため</string>
-	<string name="to create a group">グループを作成するため</string>
-	<string name="to join a group">グループに参加するため</string>
-	<string name="to upload">アップロードするため</string>
-	<string name="to publish a classified ad">クラシファイド広告を掲載する</string>
-	<string name="giving">L$[AMOUNT] を渡します</string>
-	<string name="uploading_costs">アップロード料金は L$[AMOUNT] です</string>
-	<string name="this_costs">料金は L$[AMOUNT] です</string>
-	<string name="buying_selected_land">選択した土地を L$ [AMOUNT] で購入します</string>
-	<string name="this_object_costs">このオブジェクトは L$[AMOUNT] です</string>
-	<string name="group_role_everyone">全員</string>
-	<string name="group_role_officers">オフィサー</string>
-	<string name="group_role_owners">オーナー</string>
-	<string name="group_member_status_online">オンライン</string>
-	<string name="uploading_abuse_report">アップロード中...
+また、「コントロールパネル」＞「画面」＞「設定」内で、モニターが「最高 （３２ビット）」に設定されていることもご確認ください。
+このメッセージが何度も出る場合は、 [SUPPORT_SITE] へご連絡ください。</string>
+  <string name="MBPixelFmtSetErr">ピクセル形式が設定できません。</string>
+  <string name="MBGLContextErr">ＧＬレンダーコンテキストが作れません</string>
+  <string name="MBGLContextActErr">ＧＬレンダーコンテキストを有効化できません。</string>
+  <string name="MBVideoDrvErr">お使いのコンピューターのビデオカードのドライバが正常にインストールされていないか、古いまたはサポート対象外のため、[APP_NAME]を実行することができませんでした。
+最新のビデオカードドライバがインストールされているのを確認し、されている場合は再インストールをお試しください。
+
+このメッセージが何度も出る場合は、[SUPPORT_SITE]へご連絡ください。</string>
+
+  <!-- Avatar Shape Information -->
+  <string name="5 O'Clock Shadow">うっすらとしたヒゲ</string>
+
+  <string name="All White">真っ白</string>
+  <string name="Anime Eyes">アニメ風の目</string>
+  <string name="Arced">アーチ</string>
+  <string name="Arm Length">腕の長さ</string>
+  <string name="Attached">小</string>
+  <string name="Attached Earlobes">耳たぶ</string>
+
+
+  <string name="Back Fringe">後ろ髪の毛先</string>
+
+  <string name="Baggy">たるんだ下まぶた</string>
+  <string name="Bangs">前髪</string>
+
+  <string name="Beady Eyes">ビーズのような目</string>
+  <string name="Belly Size">お腹の大きさ</string>
+  <string name="Big">大</string>
+  <string name="Big Butt">大</string>
+
+  <string name="Big Hair Back">髪の大部分：後ろ</string>
+  <string name="Big Hair Front">髪の大部分：前</string>
+  <string name="Big Hair Top">髪の大部分：上部</string>
+  <string name="Big Head">大</string>
+  <string name="Big Pectorals">大</string>
+  <string name="Big Spikes">とげあり</string>
+  <string name="Black">黒</string>
+  <string name="Blonde">ブロンド</string>
+  <string name="Blonde Hair">ブロンドの髪</string>
+  <string name="Blush">チーク</string>
+  <string name="Blush Color">チークカラー</string>
+  <string name="Blush Opacity">チークの濃さ</string>
+  <string name="Body Definition">体の精細度</string>
+  <string name="Body Fat">体脂肪</string>
+  <string name="Body Freckles">体のしみ・そばかす</string>
+  <string name="Body Thick">骨太</string>
+  <string name="Body Thickness">体の厚み</string>
+  <string name="Body Thin">細め</string>
+
+  <string name="Bow Legged">股</string>
+  <string name="Breast Buoyancy">胸の重力</string>
+  <string name="Breast Cleavage">胸の谷間</string>
+  <string name="Breast Size">胸の大きさ</string>
+  <string name="Bridge Width">両目の間の幅</string>
+  <string name="Broad">広</string>
+  <string name="Brow Size">眉毛上の隆起</string>
+  <string name="Bug Eyes">Bug Eyes</string>
+  <string name="Bugged Eyes">突き出た目</string>
+  <string name="Bulbous">だんご</string>
+  <string name="Bulbous Nose">だんご鼻</string>
+
+  <string name="Breast Physics Mass">胸の豊かさ</string>
+  <string name="Breast Physics Smoothing">胸の平滑化</string>
+  <string name="Breast Physics Gravity">胸の垂れ具合</string>
+  <string name="Breast Physics Drag">胸の空気抵抗</string>
+
+  <string name="Breast Physics InOut Max Effect">最大エフェクト数</string>
+  <string name="Breast Physics InOut Spring">振動速度</string>
+  <string name="Breast Physics InOut Gain">増加率</string>
+  <string name="Breast Physics InOut Damping">減衰</string>
+
+  <string name="Breast Physics UpDown Max Effect">最大エフェクト数</string>
+  <string name="Breast Physics UpDown Spring">振動速度</string>
+  <string name="Breast Physics UpDown Gain">増加率</string>
+  <string name="Breast Physics UpDown Damping">減衰</string>
+
+  <string name="Breast Physics LeftRight Max Effect">最大エフェクト数</string>
+  <string name="Breast Physics LeftRight Spring">振動速度</string>
+  <string name="Breast Physics LeftRight Gain">増加率</string>
+  <string name="Breast Physics LeftRight Damping">減衰</string>
+
+  <string name="Belly Physics Mass">お腹の豊かさ</string>
+  <string name="Belly Physics Smoothing">お腹の平滑化</string>
+  <string name="Belly Physics Gravity">お腹の垂れ具合</string>
+  <string name="Belly Physics Drag">お腹の空気抵抗</string>
+
+  <string name="Belly Physics UpDown Max Effect">最大エフェクト数</string>
+  <string name="Belly Physics UpDown Spring">振動速度</string>
+  <string name="Belly Physics UpDown Gain">増加率</string>
+  <string name="Belly Physics UpDown Damping">減衰</string>
+
+  <string name="Butt Physics Mass">お尻の豊かさ</string>
+  <string name="Butt Physics Smoothing">お尻の平滑化</string>
+  <string name="Butt Physics Gravity">お尻の垂れ具合</string>
+  <string name="Butt Physics Drag">お尻の空気抵抗</string>
+
+  <string name="Butt Physics UpDown Max Effect">最大エフェクト数</string>
+  <string name="Butt Physics UpDown Spring">振動速度</string>
+  <string name="Butt Physics UpDown Gain">増加率</string>
+  <string name="Butt Physics UpDown Damping">減衰</string>
+
+  <string name="Butt Physics LeftRight Max Effect">最大エフェクト数</string>
+  <string name="Butt Physics LeftRight Spring">振動速度</string>
+  <string name="Butt Physics LeftRight Gain">増加率</string>
+  <string name="Butt Physics LeftRight Damping">減衰</string>
+
+  <string name="Bushy Eyebrows">太</string>
+  <string name="Bushy Hair">ぼさぼさヘア</string>
+  <string name="Butt Size">お尻の大きさ</string>
+  <string name="Butt Gravity">お尻の垂れ具合</string>
+  <string name="bustle skirt">後ろの膨らみ</string>
+  <string name="no bustle">膨らみなし</string>
+  <string name="more bustle">膨らみ大</string>
+
+  <string name="Chaplin">チャップリン</string>
+  <string name="Cheek Bones">ほお骨</string>
+  <string name="Chest Size">胸部の大きさ</string>
+  <string name="Chin Angle">あごの角度</string>
+  <string name="Chin Cleft">あごの先の割れ</string>
+  <string name="Chin Curtains">あごに沿ったひげ</string>
+
+  <string name="Chin Depth">あごの長さ</string>
+  <string name="Chin Heavy">あごを強調</string>
+  <string name="Chin In">ひいたあご</string>
+  <string name="Chin Out">突き出たあご</string>
+  <string name="Chin-Neck">あごと首</string>
+  <string name="Clear">クリア</string>
+  <string name="Cleft">割れた</string>
+  <string name="Close Set Eyes">顔の中心寄りの目</string>
+  <string name="Closed">クローズ</string>
+  <string name="Closed Back">後ろとじ</string>
+  <string name="Closed Front">前とじ</string>
+  <string name="Closed Left">左とじ</string>
+  <string name="Closed Right">右とじ</string>
+  <string name="Coin Purse">コイン入れ</string>
+  <string name="Collar Back">後ろえり</string>
+
+
+
+  <string name="Collar Front">前えり</string>
+
+
+
+  <string name="Corner Down">ダウン</string>
+
+  <string name="Corner Up">アップ</string>
+  <string name="Creased">重いまぶた</string>
+  <string name="Crooked Nose">曲がった鼻</string>
+
+  <string name="Cuff Flare">袖口のフレア</string>
+  <string name="Dark">ダーク</string>
+  <string name="Dark Green">ダークグリーン</string>
+  <string name="Darker">ダーク</string>
+  <string name="Deep">尖った</string>
+  <string name="Default Heels">デフォルトのかかと</string>
+
+  <string name="Dense">濃</string>
+
+  <string name="Double Chin">二重あご</string>
+  <string name="Downturned">下向き</string>
+  <string name="Duffle Bag">ダッフルバッグ</string>
+  <string name="Ear Angle">耳の角度</string>
+  <string name="Ear Size">耳の大きさ</string>
+  <string name="Ear Tips">耳の先</string>
+  <string name="Egg Head">たまご頭</string>
+  <string name="Eye Bags">下まぶた</string>
+  <string name="Eye Color">瞳の色</string>
+  <string name="Eye Depth">目のくぼみ</string>
+  <string name="Eye Lightness">瞳の明るさ</string>
+  <string name="Eye Opening">見開き具合</string>
+  <string name="Eye Pop">両目の大きさの対称</string>
+  <string name="Eye Size">目の大きさ</string>
+  <string name="Eye Spacing">目と目のあいだの幅</string>
+
+  <string name="Eyebrow Arc">眉毛のアーチ</string>
+  <string name="Eyebrow Density">眉毛の密集度</string>
+
+  <string name="Eyebrow Height">眉毛の高さ</string>
+  <string name="Eyebrow Points">眉毛の角</string>
+  <string name="Eyebrow Size">眉毛の大きさ</string>
+
+  <string name="Eyelash Length">まつげの長さ</string>
+  <string name="Eyeliner">アイライナー</string>
+  <string name="Eyeliner Color">アイライナーの色</string>
+
+  <string name="Eyes Bugged">下まぶたがたるんだ目</string>
+
+
+
+
+
+
+
+
+  <string name="Face Shear">顔のゆがみ</string>
+  <string name="Facial Definition">顔の精細度</string>
+  <string name="Far Set Eyes">離れた目</string>
+
+  <string name="Fat Lips">大</string>
+
+  <string name="Female">女性</string>
+  <string name="Fingerless">指なし</string>
+  <string name="Fingers">指あり</string>
+  <string name="Flared Cuffs">広がった袖口</string>
+  <string name="Flat">平ら</string>
+  <string name="Flat Butt">小</string>
+  <string name="Flat Head">絶壁頭</string>
+  <string name="Flat Toe">フラット</string>
+  <string name="Foot Size">足の大きさ</string>
+  <string name="Forehead Angle">ひたいの角度</string>
+  <string name="Forehead Heavy">ひたいを強調</string>
+  <string name="Freckles">しみ・そばかす</string>
+
+  <string name="Front Fringe">前髪の毛先</string>
+
+  <string name="Full Back">刈られていない髪</string>
+  <string name="Full Eyeliner">あり</string>
+  <string name="Full Front">刈られていない髪</string>
+  <string name="Full Hair Sides">サイドの髪</string>
+  <string name="Full Sides">生え揃ったサイド</string>
+  <string name="Glossy">あり</string>
+  <string name="Glove Fingers">手袋の指</string>
+
+  <string name="Glove Length">手袋の長さ</string>
+
+
+  <string name="Hair">髪</string>
+  <string name="Hair Back">髪：後ろ</string>
+  <string name="Hair Front">髪：前</string>
+  <string name="Hair Sides">髪：サイド</string>
+  <string name="Hair Sweep">流す</string>
+  <string name="Hair Thickess">髪の量</string>
+  <string name="Hair Thickness">髪の量</string>
+  <string name="Hair Tilt">髪の向き</string>
+  <string name="Hair Tilted Left">左向き</string>
+  <string name="Hair Tilted Right">右向き</string>
+  <string name="Hair Volume">髪：ボリューム</string>
+  <string name="Hand Size">手の大きさ</string>
+  <string name="Handlebars">ハンドルバー</string>
+  <string name="Head Length">頭の長さ</string>
+  <string name="Head Shape">頭の形</string>
+  <string name="Head Size">頭の大きさ</string>
+  <string name="Head Stretch">縦横の長さ</string>
+  <string name="Heel Height">ヒールの高さ</string>
+  <string name="Heel Shape">ヒールの形</string>
+  <string name="Height">身長</string>
+  <string name="High">高</string>
+  <string name="High Heels">ハイヒール</string>
+  <string name="High Jaw">高</string>
+  <string name="High Platforms">厚底</string>
+  <string name="High and Tight">高めでタイト</string>
+  <string name="Higher">高</string>
+  <string name="Hip Length">腰の長さ</string>
+  <string name="Hip Width">腰の幅</string>
+  <string name="Hover">ホバー</string>
+  <string name="In">内向き</string>
+  <string name="In Shdw Color">内側のシャドウカラー</string>
+  <string name="In Shdw Opacity">内側のシャドウの濃さ</string>
+  <string name="Inner Eye Corner">目頭</string>
+  <string name="Inner Eye Shadow">内側のアイシャドウ</string>
+  <string name="Inner Shadow">内側のシャドウ</string>
+
+
+  <string name="Jacket Length">ジャケット丈</string>
+  <string name="Jacket Wrinkles">ジャケットのしわ</string>
+  <string name="Jaw Angle">あごの角度</string>
+  <string name="Jaw Jut">あごの突出</string>
+  <string name="Jaw Shape">あごの形</string>
+  <string name="Join">寄せた胸</string>
+  <string name="Jowls">えら</string>
+  <string name="Knee Angle">膝の角度</string>
+  <string name="Knock Kneed">内股</string>
+
+  <string name="Large">大</string>
+  <string name="Large Hands">大</string>
+  <string name="Left Part">左分け</string>
+  <string name="Leg Length">脚の長さ</string>
+  <string name="Leg Muscles">脚の筋肉</string>
+  <string name="Less">小</string>
+  <string name="Less Body Fat">少なめ</string>
+  <string name="Less Curtains">少なめ</string>
+  <string name="Less Freckles">少なめ</string>
+  <string name="Less Full">薄い</string>
+  <string name="Less Gravity">少</string>
+  <string name="Less Love">少</string>
+  <string name="Less Muscles">少なめ</string>
+  <string name="Less Muscular">少なめ</string>
+  <string name="Less Rosy">少な目</string>
+  <string name="Less Round">丸み少な目</string>
+  <string name="Less Saddle">小</string>
+  <string name="Less Square">小</string>
+  <string name="Less Volume">ボリューム少な目</string>
+  <string name="Less soul">小</string>
+  <string name="Lighter">ライト</string>
+  <string name="Lip Cleft">唇の山</string>
+  <string name="Lip Cleft Depth">唇の山の高さ</string>
+  <string name="Lip Fullness">唇の厚み</string>
+  <string name="Lip Pinkness">唇の赤み</string>
+  <string name="Lip Ratio">上下唇の大きさ</string>
+  <string name="Lip Thickness">唇の前後幅</string>
+  <string name="Lip Width">口の大きさ</string>
+  <string name="Lipgloss">リップグロス</string>
+  <string name="Lipstick">口紅</string>
+  <string name="Lipstick Color">口紅の色</string>
+  <string name="Long">ロング</string>
+  <string name="Long Head">前後幅が広い頭</string>
+  <string name="Long Hips">長</string>
+  <string name="Long Legs">長</string>
+  <string name="Long Neck">長</string>
+  <string name="Long Pigtails">長</string>
+  <string name="Long Ponytail">長</string>
+  <string name="Long Torso">長</string>
+  <string name="Long arms">長</string>
+
+
+  <string name="Loose Pants">ゆったり</string>
+  <string name="Loose Shirt">ゆるめ</string>
+  <string name="Loose Sleeves">ゆるめ</string>
+
+  <string name="Love Handles">ウエスト周り</string>
+  <string name="Low">低</string>
+  <string name="Low Heels">ローヒール</string>
+  <string name="Low Jaw">低</string>
+  <string name="Low Platforms">低め</string>
+  <string name="Low and Loose">低めでゆったり</string>
+  <string name="Lower">低</string>
+  <string name="Lower Bridge">鼻筋</string>
+  <string name="Lower Cheeks">ほおの下部</string>
+
+  <string name="Male">男性</string>
+  <string name="Middle Part">真ん中分け</string>
+  <string name="More">大</string>
+  <string name="More Blush">きつめ</string>
+  <string name="More Body Fat">多め</string>
+  <string name="More Curtains">多め</string>
+  <string name="More Eyeshadow">あり</string>
+  <string name="More Freckles">多め</string>
+  <string name="More Full">厚い</string>
+  <string name="More Gravity">大</string>
+  <string name="More Lipstick">あり</string>
+  <string name="More Love">大</string>
+  <string name="More Lower Lip">大</string>
+  <string name="More Muscles">多め</string>
+  <string name="More Muscular">筋骨隆々</string>
+  <string name="More Rosy">多め</string>
+  <string name="More Round">まる</string>
+  <string name="More Saddle">大</string>
+  <string name="More Sloped">なだらか</string>
+  <string name="More Square">四角</string>
+  <string name="More Upper Lip">大</string>
+  <string name="More Vertical">垂直</string>
+  <string name="More Volume">大</string>
+  <string name="More soul">大</string>
+  <string name="Moustache">口ひげ</string>
+
+  <string name="Mouth Corner">口角</string>
+  <string name="Mouth Position">口の位置</string>
+  <string name="Mowhawk">モヒカン</string>
+  <string name="Muscular">筋骨隆々</string>
+  <string name="Mutton Chops">マトンチョップス</string>
+
+  <string name="Nail Polish">マニキュア</string>
+  <string name="Nail Polish Color">マニキュアの色</string>
+  <string name="Narrow">狭</string>
+  <string name="Narrow Back">狭</string>
+  <string name="Narrow Front">狭</string>
+  <string name="Narrow Lips">おちょぼ口</string>
+  <string name="Natural">ナチュラル</string>
+  <string name="Neck Length">首の長さ</string>
+  <string name="Neck Thickness">首の太さ</string>
+  <string name="No Blush">なし</string>
+  <string name="No Eyeliner">なし</string>
+  <string name="No Eyeshadow">なし</string>
+
+  <string name="No Lipgloss">なし</string>
+  <string name="No Lipstick">なし</string>
+  <string name="No Part">なし</string>
+  <string name="No Polish">なし</string>
+  <string name="No Red">なし</string>
+  <string name="No Spikes">なし</string>
+  <string name="No White">なし</string>
+  <string name="No Wrinkles">なし</string>
+  <string name="Normal Lower">下</string>
+  <string name="Normal Upper">上</string>
+  <string name="Nose Left">左曲がり</string>
+  <string name="Nose Right">右曲がり</string>
+  <string name="Nose Size">鼻の大きさ</string>
+  <string name="Nose Thickness">鼻の厚み</string>
+  <string name="Nose Tip Angle">鼻先の角度</string>
+  <string name="Nose Tip Shape">鼻先の形</string>
+  <string name="Nose Width">鼻の幅</string>
+  <string name="Nostril Division">鼻の穴の高さ</string>
+  <string name="Nostril Width">鼻の穴の幅</string>
+
+
+  <string name="Opaque">濃いめ</string>
+  <string name="Open">オープン</string>
+  <string name="Open Back">後ろあき</string>
+  <string name="Open Front">前あき</string>
+  <string name="Open Left">左あき</string>
+  <string name="Open Right">右あき</string>
+  <string name="Orange">オレンジ</string>
+  <string name="Out">外向き</string>
+  <string name="Out Shdw Color">外側のシャドウカラー</string>
+  <string name="Out Shdw Opacity">外側のシャドウの濃さ</string>
+  <string name="Outer Eye Corner">目尻</string>
+  <string name="Outer Eye Shadow">外側のアイシャドウ</string>
+  <string name="Outer Shadow">外側のシャドウ</string>
+  <string name="Overbite">出っ歯</string>
+
+  <string name="Package">パッケージ</string>
+  <string name="Painted Nails">あり</string>
+  <string name="Pale">悪い</string>
+  <string name="Pants Crotch">ズボンの股</string>
+  <string name="Pants Fit">ズボンのフィット感</string>
+  <string name="Pants Length">ズボン丈</string>
+
+
+  <string name="Pants Waist">ウエスト</string>
+  <string name="Pants Wrinkles">ズボンのしわ</string>
+  <string name="Part">あり</string>
+  <string name="Part Bangs">分けた前髪</string>
+  <string name="Pectorals">胸筋</string>
+  <string name="Pigment">色素</string>
+  <string name="Pigtails">下げ髪</string>
+  <string name="Pink">ピンク</string>
+  <string name="Pinker">ピンク</string>
+  <string name="Platform Height">靴底の高さ</string>
+  <string name="Platform Width">靴底の幅</string>
+  <string name="Pointy">尖った</string>
+  <string name="Pointy Heels">幅狭</string>
+
+  <string name="Ponytail">ポニーテール</string>
+  <string name="Poofy Skirt">ふんわり</string>
+  <string name="Pop Left Eye">左目を大きく</string>
+  <string name="Pop Right Eye">右目を大きく</string>
+  <string name="Puffy">ふっくら</string>
+  <string name="Puffy Eyelids">目の周りの膨らみ</string>
+  <string name="Rainbow Color">虹色</string>
+  <string name="Red Hair">赤毛</string>
+
+  <string name="Regular">均整のとれた</string>
+
+  <string name="Right Part">右分け</string>
+  <string name="Rosy Complexion">頬紅</string>
+  <string name="Round">まるっこい</string>
+
+  <string name="Ruddiness">血色</string>
+  <string name="Ruddy">良い</string>
+  <string name="Rumpled Hair">くしゃくしゃヘア</string>
+  <string name="Saddle Bags">腰回りの肉付き</string>
+
+
+  <string name="Scrawny Leg">骨張った脚</string>
+  <string name="Separate">離れた胸</string>
+  <string name="Shallow">なだらか</string>
+  <string name="Shear Back">後方を刈る</string>
+  <string name="Shear Face">顔のゆがみ</string>
+  <string name="Shear Front">前方を刈る</string>
+
+  <string name="Shear Left Up">左半分を上に</string>
+
+  <string name="Shear Right Up">右半分を上に</string>
+  <string name="Sheared Back">後ろを刈られた髪</string>
+  <string name="Sheared Front">前を刈られた髪</string>
+  <string name="Shift Left">左向き</string>
+  <string name="Shift Mouth">口の向き</string>
+  <string name="Shift Right">右向き</string>
+  <string name="Shirt Bottom">シャツの裾</string>
+
+  <string name="Shirt Fit">シャツのフィット感</string>
+
+  <string name="Shirt Wrinkles">シャツのしわ</string>
+  <string name="Shoe Height">靴の長さ</string>
+
+  <string name="Short">ショート</string>
+  <string name="Short Arms">短</string>
+  <string name="Short Legs">短</string>
+  <string name="Short Neck">短</string>
+  <string name="Short Pigtails">短</string>
+  <string name="Short Ponytail">短</string>
+  <string name="Short Sideburns">短め</string>
+  <string name="Short Torso">短</string>
+  <string name="Short hips">短</string>
+  <string name="Shoulders">肩</string>
+
+  <string name="Side Fringe">サイドの毛先</string>
+  <string name="Sideburns">もみあげ</string>
+
+  <string name="Sides Hair">サイドの髪</string>
+  <string name="Sides Hair Down">ダウン</string>
+  <string name="Sides Hair Up">アップ</string>
+
+  <string name="Skinny Neck">細</string>
+  <string name="Skirt Fit">スカートのフィット感</string>
+  <string name="Skirt Length">スカート丈</string>
+  <string name="Slanted Forehead">傾斜した額</string>
+  <string name="Sleeve Length">袖丈</string>
+
+
+
+  <string name="Sleeve Looseness">袖のフィット感</string>
+  <string name="Slit Back">スリット：後ろ</string>
+  <string name="Slit Front">スリット：前</string>
+  <string name="Slit Left">スリット：左</string>
+  <string name="Slit Right">スリット：右</string>
+  <string name="Small">小</string>
+  <string name="Small Hands">小</string>
+  <string name="Small Head">小</string>
+  <string name="Smooth">滑らか</string>
+  <string name="Smooth Hair">スムーズ</string>
+  <string name="Socks Length">靴下丈</string>
+
+
+  <string name="Soulpatch">ソウルパッチ</string>
+
+  <string name="Sparse">薄</string>
+  <string name="Spiked Hair">とげとげヘア</string>
+  <string name="Square">角張った</string>
+  <string name="Square Toe">スクエアトゥ</string>
+  <string name="Squash Head">カボチャ型</string>
+
+  <string name="Stretch Head">縦長</string>
+  <string name="Sunken">こけたほお</string>
+  <string name="Sunken Chest">小</string>
+  <string name="Sunken Eyes">くぼんだ目</string>
+  <string name="Sweep Back">後ろへ</string>
+  <string name="Sweep Forward">前へ</string>
+
+  <string name="Tall">トール</string>
+  <string name="Taper Back">後ろに先細</string>
+  <string name="Taper Front">前に先細</string>
+  <string name="Thick Heels">幅広</string>
+  <string name="Thick Neck">太</string>
+  <string name="Thick Toe">厚め</string>
+
+  <string name="Thin">薄い</string>
+  <string name="Thin Eyebrows">細</string>
+  <string name="Thin Lips">小</string>
+  <string name="Thin Nose">細い鼻</string>
+  <string name="Tight Chin">ひきしまったあご</string>
+  <string name="Tight Cuffs">タイト</string>
+  <string name="Tight Pants">タイト</string>
+  <string name="Tight Shirt">タイト</string>
+  <string name="Tight Skirt">タイト</string>
+  <string name="Tight Sleeves">タイト</string>
+
+  <string name="Toe Shape">つま先の形</string>
+  <string name="Toe Thickness">つま先の厚み</string>
+  <string name="Torso Length">上半身の長さ</string>
+  <string name="Torso Muscles">上半身の筋肉</string>
+  <string name="Torso Scrawny">上半身の骨張り</string>
+  <string name="Unattached">大</string>
+  <string name="Uncreased">軽いまぶた</string>
+  <string name="Underbite">受け口</string>
+  <string name="Unnatural">ユニーク</string>
+  <string name="Upper Bridge">両目のあいだ</string>
+  <string name="Upper Cheeks">ほおの上部</string>
+  <string name="Upper Chin Cleft">あご上部の割れ</string>
+
+  <string name="Upper Eyelid Fold">二重の幅</string>
+  <string name="Upturned">上向き</string>
+  <string name="Very Red">真っ赤</string>
+  <string name="Waist Height">ウエストの高さ</string>
+
+
+  <string name="Well-Fed">つまったほお</string>
+  <string name="White Hair">白髪</string>
+  <string name="Wide">広</string>
+  <string name="Wide Back">広</string>
+  <string name="Wide Front">広</string>
+  <string name="Wide Lips">大きい口</string>
+  <string name="Wild">ワイルド</string>
+  <string name="Wrinkles">しわ</string>
+
+  <!-- Navigation bar location input control.
+       Strings are here because widget xml is not localizable -->
+  <string name="LocationCtrlAddLandmarkTooltip">ランドマークに追加</string>
+  <string name="LocationCtrlEditLandmarkTooltip">ランドマークを編集</string>
+  <string name="LocationCtrlInfoBtnTooltip">現在地の詳細を見る</string>
+  <string name="LocationCtrlComboBtnTooltip">ロケーション履歴</string>
+  <string name="LocationCtrlForSaleTooltip">この土地を購入</string>
+  <string name="LocationCtrlVoiceTooltip">ここではボイスを利用できません。</string>
+  <string name="LocationCtrlFlyTooltip">飛行は禁止されています。</string>
+  <string name="LocationCtrlPushTooltip">プッシュ禁止</string>
+  <string name="LocationCtrlBuildTooltip">オブジェクトの制作や落とす事は禁止されています。</string>
+  <string name="LocationCtrlScriptsTooltip">スクリプト不可</string>
+  <string name="LocationCtrlDamageTooltip">体力</string>
+  <string name="LocationCtrlAdultIconTooltip">Adultリージョン</string>
+  <string name="LocationCtrlModerateIconTooltip">Moderateリージョン</string>
+  <string name="LocationCtrlGeneralIconTooltip">Generalリージョン</string>
+  <string name="LocationCtrlSeeAVsTooltip">この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">リージョン（地域）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。</string>
+  <string name="LocationCtrlPathfindingDisabledTooltip">このリージョン（地域）では、動的経路探索が有効になっていません。</string>
+  <!-- Strings used by the (currently Linux) auto-updater app -->
+  <string name="UpdaterWindowTitle">[APP_NAME]の更新</string>
+  <string name="UpdaterNowUpdating">只今[APP_NAME]を更新中です…</string>
+  <string name="UpdaterNowInstalling">[APP_NAME]をインストール中です…</string>
+  <string name="UpdaterUpdatingDescriptive">お使いの[APP_NAME]ビューアを最新バージョンに更新しています。数分かかることがありますのでしばらくお待ちください。</string>
+  <string name="UpdaterProgressBarTextWithEllipses">アップデートをダウンロード中です…</string>
+  <string name="UpdaterProgressBarText">更新をダウンロード中…</string>
+  <string name="UpdaterFailDownloadTitle">更新のダウンロードに失敗しました。</string>
+  <string name="UpdaterFailUpdateDescriptive">[APP_NAME]の更新中にエラーが発生しました。www.secondlife.com から最新バージョンをダウンロードしてください。</string>
+  <string name="UpdaterFailInstallTitle">更新のインストールに失敗しました。</string>
+  <string name="UpdaterFailStartTitle">ビューアの起動に失敗しました。</string>
+
+  <!-- System Messages -->
+  <string name="ItemsComingInTooFastFrom">[APP_NAME]：アイテムが[FROM_NAME]から同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。</string>
+  <string name="ItemsComingInTooFast">[APP_NAME]：アイテムが同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。</string>
+
+  <!-- IM system messages -->
+  <string name="IM_logging_string">－インスタントメッセージの保存開始－</string>
+  <string name="IM_typing_start_string">[NAME]は入力中です…</string>
+  <string name="Unnamed">（名前なし）</string>
+  <string name="IM_moderated_chat_label">（モデレート：デフォルトでボイスはオフ）</string>
+  <string name="IM_unavailable_text_label">このコールでは文字チャットが利用できません。</string>
+  <string name="IM_muted_text_label">グループのモデレータが、あなたの文字チャットを使用禁止にしました。</string>
+  <string name="IM_default_text_label">ここをクリックしてインスタントメッセージを開始。</string>
+  <string name="IM_to_label">宛先</string>
+  <string name="IM_moderator_label">（モデレータ）</string>
+  <!-- TODO: [LOGN_TIMESTAMP]の時刻表記が日本で標準的な書式でない -->
+  <string name="Saved_message">（保存日時：[LONG_TIMESTAMP]）</string>
+  <string name="IM_unblock_only_groups_friends">このメッセージを表示するには、「初期設定」の「プライバシー」で「フレンドとグループ以外からはコールとIMを受信しない」チェックボックスをオフにします。</string>
+  <string name="OnlineStatus">オンライン</string>
+  <string name="OfflineStatus">オフライン</string>
+  <string name="not_online_msg">ユーザーがオンラインでありません－メッセージは保存され、後で配信されます。</string>
+  <string name="not_online_inventory">ユーザーがオンラインでありません–インベントリに保存されました。</string>
+
+  <!-- voice calls -->
+  <string name="answered_call">相手がコールを受けました。</string>
+  <string name="you_started_call">ボイスコールを開始します。</string>
+  <string name="you_joined_call">ボイスコールに参加しました。</string>
+  <string name="you_auto_rejected_call-im">「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。</string>
+  <string name="name_started_call">[NAME]はボイスコールを開始します</string>
+
+  <string name="ringing-im">ボイスコールに参加…</string>
+  <string name="connected-im">接続しました。「通話終了」をクリックして切断します。</string>
+  <string name="hang_up-im">ボイスコールから退席しました</string>
+  <string name="answering-im">接続中…</string>
+  <string name="conference-title">複数人チャット</string>
+  <string name="conference-title-incoming">[AGENT_NAME]と会話する</string>
+  <string name="inventory_item_offered-im">アイテム「[ITEM_NAME]」がインベントリに送られてきました。</string>
+  <string name="inventory_folder_offered-im">フォルダ「[ITEM_NAME]」がインベントリに送られてきました。</string>
+  <string name="share_alert">インベントリからここにアイテムをドラッグします。</string>
+
+  <string name="no_session_message">（ＩＭセッションが存在しません）</string>
+  <string name="only_user_message">このセッションにいるユーザーはあなただけです。</string>
+  <string name="offline_message">[NAME]はオフライン中です。</string>
+  <string name="invite_message">このボイスチャットに応答・接続する場合は、[BUTTON NAME]をクリックしてください。</string>
+  <string name="muted_message">この住人をブロックしています。メッセージを送ると、ブロックが自動的に解除されます。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
+  Also there are some other places where "generic" is used.
+  So, let add string with name="generic" with the same value as "generic_request_error" -->
+  <string name="generic">リクエスト中にエラーが発生しました。お手数ですが、もう一度やり直してください。</string>
+  <string name="generic_request_error">要求中にエラーが発生しました。お手数ですが、もう一度やり直してください。</string>
+  <string name="insufficient_perms_error">あなたには充分な権限がありません。</string>
+  <string name="session_does_not_exist_error">このセッションは既に切断されています。</string>
+  <string name="no_ability_error">あなたにはその能力がありません。</string>
+  <string name="no_ability">あなたにはその能力がありません。</string>
+  <string name="not_a_mod_error">あなたは、セッションモデレータではありません。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="muted" with the same value as "muted_error" -->
+  <string name="muted">グループのモデレーターが、あなたのテキストチャットを禁止しました。</string>
+  <string name="muted_error">グループモデレータが、あなたのテキストチャットを無効化しました。</string>
+  <string name="add_session_event">[RECIPIENT]とのチャットセッションにユーザーを追加することができません。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="message" with the same value as "message_session_event" -->
+  <string name="message">[RECIPIENT]とのチャットセッションに、メッセージを送信することができません。</string>
+  <string name="message_session_event">[RECIPIENT]とのチャットセッションにメッセージを送ることができません。</string>
+  <string name="mute">モデレート中にエラーが発生しました。</string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3459 issue 'removed' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="removed" with the same value as "removed_from_group" -->
+  <string name="removed">グループから脱退しました。</string>
+  <string name="removed_from_group">あなたは、グループから削除されました。</string>
+  <string name="close_on_no_ability">このチャットセッションを継続することはできません。</string>
+  <string name="unread_chat_single">[SOURCES]は、何か新しいことを言いました。</string>
+  <string name="unread_chat_multiple">[SOURCES]は、何か新しいことを言いました。</string>
+  <string name="session_initialization_timed_out_error">セッションの初期化がタイムアウトしました。</string>
+
+  <string name="Home position set.">家の配置の設定。</string>
+
+  <string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
+  <string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
+
+  <string name="lindenhomes_get_home_url">https://secondlife.com/land/lindenhomes/member.php?lang=ja-JP</string>
+  <string name="lindenhomes_my_home_url">https://land.secondlife.com/ja-JP/lindenhomes/my-home.php</string>
+  <string name="membership_url">https://accounts.secondlife.com/change_membership/?lang=ja-JP</string>
+
+  <!-- Financial operations strings -->
+  <string name="paid_you_ldollars">[NAME]は、[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="paid_you_ldollars_gift">[NAME]は、[REASON]費用のL$ [AMOUNT]支払いました。</string>
+  <string name="paid_you_ldollars_no_reason">[NAME]は、L$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars">[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_gift">[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_no_info">L$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_no_reason">[NAME]にL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_ldollars_no_name">[REASON]費用のL$ [AMOUNT]を支払いました。</string>
+  <string name="you_paid_failure_ldollars">[NAME]に[REASON]費用L$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_gift">[NAME]に[REASON]費用のL$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_no_info">L$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_no_reason">[NAME]にL$ [AMOUNT]を支払えませんでした。</string>
+  <string name="you_paid_failure_ldollars_no_name">[REASON]費用L$ [AMOUNT]を支払えませんでした。</string>
+  <string name="for item">[ITEM]</string>
+  <string name="for a parcel of land">土地区画</string>
+  <string name="for a land access pass">土地への入場許可</string>
+  <string name="for deeding land">土地を譲渡</string>
+  <string name="to create a group">グループ作成</string>
+  <string name="to join a group">グループ参加</string>
+  <string name="to upload">アップロード</string>
+  <string name="to publish a classified ad">クラシファイド広告掲載</string>
+
+  <string name="uploading_costs">アップロード費用はL$ [AMOUNT]です。</string>
+  <string name="this_costs">費用はL$ [AMOUNT]です。</string>
+
+  <string name="buying_selected_land">選択した土地をL$ [AMOUNT]で購入します。</string>
+  <string name="this_object_costs">このオブジェクトの費用は、L$ [AMOUNT]です。</string>
+  <string name="giving">L$ [AMOUNT]を渡します。</string>
+
+  <string name="group_role_everyone">全員</string>
+  <string name="group_role_officers">オフィサー</string>
+  <string name="group_role_owners">所有者</string>
+  <string name="group_member_status_online">オンライン</string>
+
+  <string name="uploading_abuse_report">アップロード中…
 
 嫌がらせの報告</string>
-	<string name="New Shape">新しいシェイプ</string>
-	<string name="New Skin">新しいスキン</string>
-	<string name="New Hair">新しい髪</string>
-	<string name="New Eyes">新しい目</string>
-	<string name="New Shirt">新しいシャツ</string>
-	<string name="New Pants">新しいパンツ</string>
-	<string name="New Shoes">新しい靴</string>
-	<string name="New Socks">新しい靴下</string>
-	<string name="New Jacket">新しいジャケット</string>
-	<string name="New Gloves">新しい手袋</string>
-	<string name="New Undershirt">新しい下着（上）</string>
-	<string name="New Underpants">新しい下着（下）</string>
-	<string name="New Skirt">新しいスカート</string>
-	<string name="New Alpha">新しいアルファ</string>
-	<string name="New Tattoo">新しいタトゥ</string>
-	<string name="New Universal">新しいユニバーサル</string>
-	<string name="New Physics">新規の物理作用</string>
-	<string name="Invalid Wearable">無効な着用物</string>
-	<string name="New Gesture">ジェスチャー</string>
-	<string name="New Script">新規スクリプト</string>
-	<string name="New Note">ノート</string>
-	<string name="New Folder">新規フォルダ</string>
-	<string name="Contents">コンテンツ</string>
-	<string name="Gesture">ジェスチャー</string>
-	<string name="Male Gestures">男性用ジェスチャー</string>
-	<string name="Female Gestures">女性用ジェスチャー</string>
-	<string name="Other Gestures">その他のジェスチャー</string>
-	<string name="Speech Gestures">会話ジェスチャー</string>
-	<string name="Common Gestures">一般的ジェスチャー</string>
-	<string name="Male - Excuse me">男性 - すみません</string>
-	<string name="Male - Get lost">男性 - Get lost</string>
-	<string name="Male - Blow kiss">男性 - 投げキッス</string>
-	<string name="Male - Boo">男性 - Boo</string>
-	<string name="Male - Bored">男性 - 退屈</string>
-	<string name="Male - Hey">男性 - Hey</string>
-	<string name="Male - Laugh">男性 - 笑う</string>
-	<string name="Male - Repulsed">男性 - 拒絶</string>
-	<string name="Male - Shrug">男性 - 肩をすくめる</string>
-	<string name="Male - Stick tougue out">男性 - 舌を出す</string>
-	<string name="Male - Wow">男性 - Wow</string>
-	<string name="Female - Chuckle">女性 – クスクス</string>
-	<string name="Female - Cry">女性 – 泣く</string>
-	<string name="Female - Embarrassed">女性 – 恥ずかしい</string>
-	<string name="Female - Excuse me">女性 – すみません</string>
-	<string name="Female - Get lost">女性 – あっち行ってよ</string>
-	<string name="Female - Blow kiss">女性 - 投げキッス</string>
-	<string name="Female - Boo">女性 – ワッ！</string>
-	<string name="Female - Bored">女性 - 退屈</string>
-	<string name="Female - Hey">女性 - Hey</string>
-	<string name="Female - Hey baby">女性 – ヘイ、ベィビー！</string>
-	<string name="Female - Laugh">女性 - 笑う</string>
-	<string name="Female - Looking good">女性 – いい感じ</string>
-	<string name="Female - Over here">女性 – こっちよ</string>
-	<string name="Female - Please">女性 – プリーズ</string>
-	<string name="Female - Repulsed">女性 - 拒絶</string>
-	<string name="Female - Shrug">女性 - 肩をすくめる</string>
-	<string name="Female - Stick tougue out">女性 - 舌を出す</string>
-	<string name="Female - Wow">女性 - Wow</string>
-	<string name="New Daycycle">新しいデイサイクル</string>
-	<string name="New Water">新しい水</string>
-	<string name="New Sky">新しい空</string>
-	<string name="/bow">/おじぎする</string>
-	<string name="/clap">/拍手</string>
-	<string name="/count">/数える</string>
-	<string name="/extinguish">/消す</string>
-	<string name="/kmb">/くそくらえ</string>
-	<string name="/muscle">/筋肉もりもり</string>
-	<string name="/no">/いいえ</string>
-	<string name="/no!">/だめ！</string>
-	<string name="/paper">/パー</string>
-	<string name="/pointme">/自分を指差す</string>
-	<string name="/pointyou">/相手を指差す</string>
-	<string name="/rock">/グー</string>
-	<string name="/scissor">/チョキ</string>
-	<string name="/smoke">/タバコを吸う</string>
-	<string name="/stretch">/伸びをする</string>
-	<string name="/whistle">/口笛を吹く</string>
-	<string name="/yes">/はい</string>
-	<string name="/yes!">/イエス！</string>
-	<string name="afk">一時退席中</string>
-	<string name="dance1">ダンス1</string>
-	<string name="dance2">ダンス2</string>
-	<string name="dance3">ダンス3</string>
-	<string name="dance4">ダンス4</string>
-	<string name="dance5">ダンス5</string>
-	<string name="dance6">ダンス6</string>
-	<string name="dance7">ダンス7</string>
-	<string name="dance8">ダンス8</string>
-	<string name="AvatarBirthDateFormat">[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]</string>
-	<string name="DefaultMimeType">なし/なし</string>
-	<string name="texture_load_dimensions_error">[WIDTH]*[HEIGHT] 以上の画像は読み込めません</string>
-	<string name="outfit_photo_load_dimensions_error">最大アウトフィット写真サイズは [WIDTH]*[HEIGHT] です。画像のサイズを調整するか、別の画像を使用してください</string>
-	<string name="outfit_photo_select_dimensions_error">最大アウトフィット写真サイズは [WIDTH]*[HEIGHT] です。別のテクスチャを選択してください</string>
-	<string name="outfit_photo_verify_dimensions_error">写真の寸法を確認できません。写真サイズがピッカーに表示されるまでお待ちください</string>
-	<string name="words_separator" value=","/>
-	<string name="server_is_down">大変申し訳ございませんが、予期しない問題が発生しました。
-
-サービスに関する既知の問題については、http://status.secondlifegrid.net をご覧ください。
-問題が引き続き発生する場合は、お使いのネットワークやファイアウォールの設定を調べてください。</string>
-	<string name="dateTimeWeekdaysNames">日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日</string>
-	<string name="dateTimeWeekdaysShortNames">日:月:火:水:木:金:土</string>
-	<string name="dateTimeMonthNames">1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月</string>
-	<string name="dateTimeMonthShortNames">1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月</string>
-	<string name="dateTimeDayFormat">[MDAY]</string>
-	<string name="dateTimeAM">AM</string>
-	<string name="dateTimePM">PM</string>
-	<string name="LocalEstimateUSD">US$ [AMOUNT]</string>
-	<string name="Group Ban">グループへの立入禁止</string>
-	<string name="Membership">会員</string>
-	<string name="Roles">役割</string>
-	<string name="Group Identity">グループの識別情報</string>
-	<string name="Parcel Management">区画の管理</string>
-	<string name="Parcel Identity">区画の識別情報</string>
-	<string name="Parcel Settings">区画の設定</string>
-	<string name="Parcel Powers">区画の権限</string>
-	<string name="Parcel Access">区画へのアクセス</string>
-	<string name="Parcel Content">区画のコンテンツ</string>
-	<string name="Object Management">オブジェクトの管理</string>
-	<string name="Accounting">会計</string>
-	<string name="Notices">通知</string>
-	<string name="Chat" value=" チャット：">チャット</string>
-	<string name="BaseMembership">ベース</string>
-	<string name="PremiumMembership">プレミアム</string>
-	<string name="Premium_PlusMembership">プレミアムプラス</string>
-	<string name="DeleteItems">選択したアイテムを削除しますか</string>
-	<string name="DeleteItem">選択したアイテムを削除しますか</string>
-	<string name="EmptyOutfitText">このアウトフィットにはアイテムがありません</string>
-	<string name="ExternalEditorNotSet">ExternalEditor 設定を使ってエディターを選択します。</string>
-	<string name="ExternalEditorNotFound">指定された外部エディターが見つかりません。
-エディターへのパスを二重引用符で囲んでみてください。
-（例：&quot;/path to my/editor&quot; &quot;%s&quot;）</string>
-	<string name="ExternalEditorCommandParseError">外部エディターのコマンドの解析中にエラーが見つかりました。</string>
-	<string name="ExternalEditorFailedToRun">外部エディターを実行できませんでした。</string>
-	<string name="TranslationFailed">翻訳できませんでした：[REASON]</string>
-	<string name="TranslationResponseParseError">翻訳の応答にエラーが発生しました。</string>
-	<string name="Esc">Esc</string>
-	<string name="Space">Space</string>
-	<string name="Enter">Enter</string>
-	<string name="Tab">Tab</string>
-	<string name="Ins">Ins</string>
-	<string name="Del">Del</string>
-	<string name="Backsp">Backsp</string>
-	<string name="Shift">Shift</string>
-	<string name="Ctrl">Ctrl</string>
-	<string name="Alt">Alt</string>
-	<string name="CapsLock">CapsLock</string>
-	<string name="Home">ホーム</string>
-	<string name="End">End</string>
-	<string name="PgUp">PgUp</string>
-	<string name="PgDn">PgDn</string>
-	<string name="F1">F1</string>
-	<string name="F2">F2</string>
-	<string name="F3">F3</string>
-	<string name="F4">F4</string>
-	<string name="F5">F5</string>
-	<string name="F6">F6</string>
-	<string name="F7">F7</string>
-	<string name="F8">F8</string>
-	<string name="F9">F9</string>
-	<string name="F10">F10</string>
-	<string name="F11">F11</string>
-	<string name="F12">F12</string>
-	<string name="Add">追加</string>
-	<string name="Subtract">減算</string>
-	<string name="Multiply">乗算</string>
-	<string name="Divide">除算</string>
-	<string name="PAD_DIVIDE">PAD_DIVIDE</string>
-	<string name="PAD_LEFT">PAD_LEFT</string>
-	<string name="PAD_RIGHT">PAD_RIGHT</string>
-	<string name="PAD_DOWN">PAD_DOWN</string>
-	<string name="PAD_UP">PAD_UP</string>
-	<string name="PAD_HOME">PAD_HOME</string>
-	<string name="PAD_END">PAD_END</string>
-	<string name="PAD_PGUP">PAD_PGUP</string>
-	<string name="PAD_PGDN">PAD_PGDN</string>
-	<string name="PAD_CENTER">PAD_CENTER</string>
-	<string name="PAD_INS">PAD_INS</string>
-	<string name="PAD_DEL">PAD_DEL</string>
-	<string name="PAD_Enter">PAD_Enter</string>
-	<string name="PAD_BUTTON0">PAD_BUTTON0</string>
-	<string name="PAD_BUTTON1">PAD_BUTTON1</string>
-	<string name="PAD_BUTTON2">PAD_BUTTON2</string>
-	<string name="PAD_BUTTON3">PAD_BUTTON3</string>
-	<string name="PAD_BUTTON4">PAD_BUTTON4</string>
-	<string name="PAD_BUTTON5">PAD_BUTTON5</string>
-	<string name="PAD_BUTTON6">PAD_BUTTON6</string>
-	<string name="PAD_BUTTON7">PAD_BUTTON7</string>
-	<string name="PAD_BUTTON8">PAD_BUTTON8</string>
-	<string name="PAD_BUTTON9">PAD_BUTTON9</string>
-	<string name="PAD_BUTTON10">PAD_BUTTON10</string>
-	<string name="PAD_BUTTON11">PAD_BUTTON11</string>
-	<string name="PAD_BUTTON12">PAD_BUTTON12</string>
-	<string name="PAD_BUTTON13">PAD_BUTTON13</string>
-	<string name="PAD_BUTTON14">PAD_BUTTON14</string>
-	<string name="PAD_BUTTON15">PAD_BUTTON15</string>
-	<string name="-">-</string>
-	<string name="=">=</string>
-	<string name="`">`</string>
-	<string name=";">;</string>
-	<string name="[">[</string>
-	<string name="]">]</string>
-	<string name="\">\</string>
-	<string name="0">0</string>
-	<string name="1">1</string>
-	<string name="2">2</string>
-	<string name="3">3</string>
-	<string name="4">4</string>
-	<string name="5">5</string>
-	<string name="6">6</string>
-	<string name="7">7</string>
-	<string name="8">8</string>
-	<string name="9">9</string>
-	<string name="A">A</string>
-	<string name="B">B</string>
-	<string name="C">C</string>
-	<string name="D">D</string>
-	<string name="E">E</string>
-	<string name="F">F</string>
-	<string name="G">G</string>
-	<string name="H">H</string>
-	<string name="I">I</string>
-	<string name="J">J</string>
-	<string name="K">K</string>
-	<string name="L">L</string>
-	<string name="M">M</string>
-	<string name="N">N</string>
-	<string name="O">O</string>
-	<string name="P">P</string>
-	<string name="Q">Q</string>
-	<string name="R">R</string>
-	<string name="S">S</string>
-	<string name="T">T</string>
-	<string name="U">U</string>
-	<string name="V">V</string>
-	<string name="W">W</string>
-	<string name="X">X</string>
-	<string name="Y">Y</string>
-	<string name="Z">Z</string>
-	<string name="BeaconParticle">パーティクル源ビーコン（青）を表示中</string>
-	<string name="BeaconPhysical">物理的オブジェクトのビーコン（緑）を表示中</string>
-	<string name="BeaconScripted">スクリプトのオブジェクトのビーコン（赤）を表示中</string>
-	<string name="BeaconScriptedTouch">タッチ機能のビーコンが付いたスクリプトのオブジェクト（赤）を表示中</string>
-	<string name="BeaconSound">サウンドビーコン（黄）を表示中</string>
-	<string name="BeaconMedia">メディアビーコン（白）を表示中</string>
-	<string name="BeaconSun">太陽の方角ビーコン（オレンジ）を表示中</string>
-	<string name="BeaconMoon">月の方角ビーコン（紫）を表示中</string>
-	<string name="ParticleHiding">パーティクルを非表示</string>
-	<string name="Command_AboutLand_Label">土地情報</string>
-	<string name="Command_Appearance_Label">容姿</string>
-	<string name="Command_Avatar_Label">アバター</string>
-	<string name="Command_Build_Label">制作</string>
-	<string name="Command_Chat_Label">チャット</string>
-	<string name="Command_Conversations_Label">会話</string>
-	<string name="Command_Compass_Label">コンパス</string>
-	<string name="Command_Destinations_Label">行き先</string>
-	<string name="Command_Environments_Label">私の環境</string>
-	<string name="Command_Facebook_Label">Facebook</string>
-	<string name="Command_Flickr_Label">Flickr</string>
-	<string name="Command_Gestures_Label">ジェスチャー</string>
-	<string name="Command_Grid_Status_Label">グリッドステータス</string>
-	<string name="Command_HowTo_Label">ハウツー</string>
-	<string name="Command_Inventory_Label">インベントリ</string>
-	<string name="Command_Map_Label">地図</string>
-	<string name="Command_Marketplace_Label">マーケットプレイス</string>
-	<string name="Command_MarketplaceListings_Label">マーケットプレイス</string>
-	<string name="Command_MiniMap_Label">ミニマップ</string>
-	<string name="Command_Move_Label">歩行 / 走行 / 飛行</string>
-	<string name="Command_Outbox_Label">マーチャントアウトボックス</string>
-	<string name="Command_People_Label">人</string>
-	<string name="Command_Picks_Label">ピック</string>
-	<string name="Command_Places_Label">場所</string>
-	<string name="Command_Preferences_Label">環境設定</string>
-	<string name="Command_Profile_Label">プロフィール</string>
-	<string name="Command_Report_Abuse_Label">嫌がらせの報告</string>
-	<string name="Command_Search_Label">検索</string>
-	<string name="Command_Snapshot_Label">スナップショット</string>
-	<string name="Command_Speak_Label">話す</string>
-	<string name="Command_Twitter_Label">Twitter</string>
-	<string name="Command_View_Label">カメラコントロール</string>
-	<string name="Command_Voice_Label">ボイス設定</string>
-	<string name="Command_AboutLand_Tooltip">訪問先に関する情報</string>
-	<string name="Command_Appearance_Tooltip">アバターを変更</string>
-	<string name="Command_Avatar_Tooltip">アバター一式を選択</string>
-	<string name="Command_Build_Tooltip">オブジェクトの制作と地形の変形</string>
-	<string name="Command_Chat_Tooltip">近くの人と文字チャットする</string>
-	<string name="Command_Conversations_Tooltip">全員との会話</string>
-	<string name="Command_Compass_Tooltip">コンパス</string>
-	<string name="Command_Destinations_Tooltip">行ってみたい場所</string>
-	<string name="Command_Environments_Tooltip">私の環境</string>
-	<string name="Command_Facebook_Tooltip">Facebook へ投稿</string>
-	<string name="Command_Flickr_Tooltip">Flickr にアップロード</string>
-	<string name="Command_Gestures_Tooltip">アバターのジェスチャー</string>
-	<string name="Command_Grid_Status_Tooltip">現在のグリッドステータスを表示</string>
-	<string name="Command_HowTo_Tooltip">一般的タスクの実行方法</string>
-	<string name="Command_Inventory_Tooltip">インベントリを表示・使用</string>
-	<string name="Command_Map_Tooltip">世界地図</string>
-	<string name="Command_Marketplace_Tooltip">ショッピングに出掛ける</string>
-	<string name="Command_MarketplaceListings_Tooltip">創作アイテムを販売します</string>
-	<string name="Command_MiniMap_Tooltip">近くの人を表示する</string>
-	<string name="Command_Move_Tooltip">アバターの移動</string>
-	<string name="Command_Outbox_Tooltip">販売用にアイテムをマーケットプレイスに転送</string>
-	<string name="Command_People_Tooltip">フレンド、グループ、近くの人</string>
-	<string name="Command_Picks_Tooltip">プロフィールで紹介するお気に入りの場所</string>
-	<string name="Command_Places_Tooltip">保存済みの場所</string>
-	<string name="Command_Preferences_Tooltip">環境設定</string>
-	<string name="Command_Profile_Tooltip">プロフィールを編集・表示</string>
-	<string name="Command_Report_Abuse_Tooltip">嫌がらせの報告</string>
-	<string name="Command_Search_Tooltip">場所、イベント、人を検索</string>
-	<string name="Command_Snapshot_Tooltip">ピクチャを撮る</string>
-	<string name="Command_Speak_Tooltip">マイクを使って近くの人と話す</string>
-	<string name="Command_Twitter_Tooltip">Twitter</string>
-	<string name="Command_View_Tooltip">カメラの角度を変更</string>
-	<string name="Command_Voice_Tooltip">インワールドでのコールや近くにいる人の音量調整</string>
-	<string name="Toolbar_Bottom_Tooltip">現在、下のツールバーにあります</string>
-	<string name="Toolbar_Left_Tooltip">現在、左のツールバーにあります</string>
-	<string name="Toolbar_Right_Tooltip">現在、右のツールバーにあります</string>
-	<string name="Retain%">維持率</string>
-	<string name="Detail">詳細</string>
-	<string name="Better Detail">もっと詳しく</string>
-	<string name="Surface">表面</string>
-	<string name="Solid">ソリッド</string>
-	<string name="Wrap">ラップ</string>
-	<string name="Preview">プレビュー</string>
-	<string name="Normal">普通</string>
-	<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-	<string name="Pathfinding_Object_Attr_None">なし</string>
-	<string name="Pathfinding_Object_Attr_Permanent">ナビメッシュに影響を与える</string>
-	<string name="Pathfinding_Object_Attr_Character">キャラクター</string>
-	<string name="Pathfinding_Object_Attr_MultiSelect">（複数）</string>
-	<string name="snapshot_quality_very_low">非常に低い</string>
-	<string name="snapshot_quality_low">低</string>
-	<string name="snapshot_quality_medium">中</string>
-	<string name="snapshot_quality_high">高</string>
-	<string name="snapshot_quality_very_high">非常に高い</string>
-	<string name="TeleportMaturityExceeded">住人はこの地域（リージョン）を訪問できません。</string>
-	<string name="UserDictionary">[User]</string>
-	<string name="experience_tools_experience">体験</string>
-	<string name="ExperienceNameNull">(体験なし)</string>
-	<string name="ExperienceNameUntitled">(タイトルのない体験)</string>
-	<string name="Land-Scope">ランドスコープ</string>
-	<string name="Grid-Scope">グリッドスコープ</string>
-	<string name="Allowed_Experiences_Tab">許可</string>
-	<string name="Blocked_Experiences_Tab">停止</string>
-	<string name="Contrib_Experiences_Tab">貢献者</string>
-	<string name="Admin_Experiences_Tab">管理</string>
-	<string name="Recent_Experiences_Tab">最新</string>
-	<string name="Owned_Experiences_Tab">所有</string>
-	<string name="ExperiencesCounter">([EXPERIENCES], max [MAXEXPERIENCES])</string>
-	<string name="ExperiencePermission1">コントロールを引き継ぐ</string>
-	<string name="ExperiencePermission3">アバターでアニメーションをトリガー</string>
-	<string name="ExperiencePermission4">アバターに装着</string>
-	<string name="ExperiencePermission9">カメラ追従</string>
-	<string name="ExperiencePermission10">カメラのコントロール</string>
-	<string name="ExperiencePermission11">あなたをテレポート</string>
-	<string name="ExperiencePermission12">体験の権限を自動的に承諾</string>
-	<string name="ExperiencePermission16">あなたのアバターを強制的に座らせる</string>
-	<string name="ExperiencePermission17">自然環境の設定を変更する</string>
-	<string name="ExperiencePermissionShortUnknown">が不明な操作を実行しました： [Permission]</string>
-	<string name="ExperiencePermissionShort1">コントロールする</string>
-	<string name="ExperiencePermissionShort3">アニメーションをトリガー</string>
-	<string name="ExperiencePermissionShort4">取り付ける</string>
-	<string name="ExperiencePermissionShort9">カメラを追跡</string>
-	<string name="ExperiencePermissionShort10">カメラを制御</string>
-	<string name="ExperiencePermissionShort11">テレポート</string>
-	<string name="ExperiencePermissionShort12">権限</string>
-	<string name="ExperiencePermissionShort16">Sit</string>
-	<string name="ExperiencePermissionShort17">環境</string>
-	<string name="logging_calls_disabled_log_empty">会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。</string>
-	<string name="logging_calls_disabled_log_not_empty">これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。</string>
-	<string name="logging_calls_enabled_log_empty">ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。</string>
-	<string name="loading_chat_logs">ロード中...</string>
-	<string name="na">該当なし</string>
-	<string name="preset_combo_label">-空リスト-</string>
-	<string name="Default">デフォルト</string>
-	<string name="none_paren_cap">(なし)</string>
-	<string name="no_limit">無制限</string>
-	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。</string>
-	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">物理形状に不正な確認データがあります。物理モデルを修正してください。</string>
-	<string name="Mav_Details_MAV_UNKNOWN_VERSION">物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。</string>
-	<string name="couldnt_resolve_host">DNS がホスト名 ([HOSTNAME]) を解決できませんでした。
+
+  <!-- names for new inventory items-->
+  <string name="New Shape">新しいシェイプ</string>
+  <string name="New Skin">新しいスキン</string>
+  <string name="New Hair">新しい髪</string>
+  <string name="New Eyes">新しい目</string>
+  <string name="New Shirt">新しいシャツ</string>
+  <string name="New Pants">新しいズボン</string>
+  <string name="New Shoes">新しい靴</string>
+  <string name="New Socks">新しい靴下</string>
+  <string name="New Jacket">新しいジャケット</string>
+  <string name="New Gloves">新しい手袋</string>
+  <string name="New Undershirt">新しい下着（上半身）</string>
+  <string name="New Underpants">新しい下着（下半身）</string>
+  <string name="New Skirt">新しいスカート</string>
+  <string name="New Alpha">新しいアルファ</string>
+  <string name="New Tattoo">新しいタトゥ</string>
+  <string name="New Universal">新しいユニバーサル</string>
+  <string name="New Physics">新規の物理作用</string>
+  <string name="Invalid Wearable">無効な着用物</string>
+  <string name="New Gesture">ジェスチャー</string>
+  <string name="New Script">新規スクリプト</string>
+  <string name="New Note">ノート</string>
+  <string name="New Folder">新規フォルダ</string>
+  <string name="Contents">コンテンツ</string>
+  <string name="Gesture">ジェスチャー</string>
+  <string name="Male Gestures">男性用ジェスチャー</string>
+  <string name="Female Gestures">女性用ジェスチャー</string>
+  <string name="Other Gestures">その他のジェスチャー</string>
+  <string name="Speech Gestures">会話ジェスチャー</string>
+  <string name="Common Gestures">一般的ジェスチャー</string>
+  <!-- gestures -->
+  <string name="Male - Excuse me">男性－すみません</string>
+  <string name="Male - Get lost">男性－あっち行けよ</string>
+  <string name="Male - Blow kiss">男性－投げキッス</string>
+  <string name="Male - Boo">男性－ぶー</string>
+  <string name="Male - Bored">男性－退屈</string>
+  <string name="Male - Hey">男性－–やぁ</string>
+  <string name="Male - Laugh">男性－笑う</string>
+  <string name="Male - Repulsed">男性－拒絶</string>
+  <string name="Male - Shrug">男性－肩をすくめる</string>
+  <string name="Male - Stick tougue out">男性－舌を出す</string>
+  <string name="Male - Wow">男性－わぁ</string>
+
+  <string name="Female - Chuckle">女性－クスクス</string>
+  <string name="Female - Cry">女性－泣く</string>
+  <string name="Female - Embarrassed">女性－恥ずかしい</string>
+  <string name="Female - Excuse me">女性－すみません</string>
+  <string name="Female - Get lost">女性－あっち行ってよ</string>
+  <string name="Female - Blow kiss">女性–投げキッス</string>
+  <string name="Female - Boo">女性－ぶー</string>
+  <string name="Female - Bored">女性－退屈</string>
+  <string name="Female - Hey">女性－やぁ</string>
+  <string name="Female - Hey baby">女性－ヘイ、ベィビー！</string>
+  <string name="Female - Laugh">女性－笑う</string>
+  <string name="Female - Looking good">女性－いい感じ</string>
+  <string name="Female - Over here">女性－こっちよ</string>
+  <string name="Female - Please">女性－プリーズ</string>
+  <string name="Female - Repulsed">女性－拒絶</string>
+  <string name="Female - Shrug">女性－肩をすくめる</string>
+  <string name="Female - Stick tougue out">女性－舌を出す</string>
+  <string name="Female - Wow">女性－わぁ</string>
+
+  <!-- settings -->
+  <string name="New Daycycle">新しいデイサイクル</string>
+  <string name="New Water">新しい水</string>
+  <string name="New Sky">新しい空</string>
+
+
+  <string name="/bow">/おじぎする</string>
+  <string name="/clap">/拍手</string>
+  <string name="/count">/数える</string>
+  <string name="/extinguish">/消す</string>
+  <string name="/kmb">/くそくらえ</string>
+  <string name="/muscle">/筋肉もりもり</string>
+  <string name="/no">/いいえ</string>
+  <string name="/no!">/だめ！</string>
+  <string name="/paper">/パー</string>
+  <string name="/pointme">/自分を指差す</string>
+  <string name="/pointyou">/相手を指差す</string>
+  <string name="/rock">/グー</string>
+  <string name="/scissor">/チョキ</string>
+  <string name="/smoke">/タバコを吸う</string>
+  <string name="/stretch">/伸びをする</string>
+  <string name="/whistle">/口笛を吹く</string>
+  <string name="/yes">/はい</string>
+  <string name="/yes!">/イエス！</string>
+  <string name="afk">一時退席中</string>
+  <string name="dance1">ダンス１</string>
+  <string name="dance2">ダンス２</string>
+  <string name="dance3">ダンス３</string>
+  <string name="dance4">ダンス４</string>
+  <string name="dance5">ダンス５</string>
+  <string name="dance6">ダンス６</string>
+  <string name="dance7">ダンス７</string>
+  <string name="dance8">ダンス８</string>
+
+  <!-- birth date format shared by avatar inspector and profile panels -->
+  <string name="AvatarBirthDateFormat">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</string>
+  <string name="DefaultMimeType">none/none</string>
+
+  <string name="texture_load_dimensions_error">[WIDTH]✕[HEIGHT]以上の画像は読み込めません。</string>
+  <string name="outfit_photo_load_dimensions_error">アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。画像のサイズを調整するか、別の画像を使用してください。</string>
+  <string name="outfit_photo_select_dimensions_error">アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。別のテクスチャを選択してください。</string>
+  <string name="outfit_photo_verify_dimensions_error">画像の寸法を確認できません。画像サイズがピッカーに表示されるまでお待ちください。</string>
+  <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
+  <string name="sentences_separator" value="　"></string>
+  <string name="words_separator" value="、"/>
+
+  <string name="server_is_down">
+大変申し訳ございませんが、予期しない問題が発生しました。サービスに関する既知の問題については、 https://status.secondlifegrid.net/?lang=ja-JP をご覧ください。
+問題が引き続き発生する場合は、お使いのネットワークやファイヤーウォールの設定を調べてください。</string>
+  <string name="dateTimeWeekdaysNames">日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日</string>
+  <string name="dateTimeWeekdaysShortNames">日:月:火:水:木:金:土</string>
+
+  <!-- overriding datetime formating.
+	didn't translate if this is not needed for current localization
+  -->
+  <string name="dateTimeMonthNames">１月:２月:３月:４月:５月:６月:７月:８月:９月:１０月:１１月:１２月</string>
+  <string name="dateTimeMonthShortNames">㋀:㋁:㋂:㋃:㋄:㋅:㋆:㋇:㋈:㋉:㋊:㋋</string>
+  <string name="dateTimeDayFormat">[MDAY]</string>
+  <string name="dateTimeAM">午前</string>
+  <string name="dateTimePM">午後</string>
+
+  <!--  currency formatting -->
+  <string name="LocalEstimateUSD">[AMOUNT]米ドル</string>
+
+  <!-- Group Profile roles and powers -->
+  <string name="Group Ban">グループからバン</string>
+  <string name="Membership">会員</string>
+  <string name="Roles">役割</string>
+  <string name="Group Identity">グループの識別情報</string>
+  <string name="Parcel Management">区画の管理</string>
+  <string name="Parcel Identity">区画の識別情報</string>
+  <string name="Parcel Settings">区画の設定</string>
+  <string name="Parcel Powers">区画の権限</string>
+  <string name="Parcel Access">区画へのアクセス</string>
+  <string name="Parcel Content">区画のコンテンツ</string>
+  <string name="Object Management">オブジェクトの管理</string>
+  <string name="Accounting">会計</string>
+  <string name="Notices">通知</string>
+
+  <!-- SL Membership -->
+  <string name="Chat" value="チャット：">チャット</string>
+  <string name="BaseMembership">ベース</string>
+  <string name="PremiumMembership">プレミアム</string>
+  <string name="Premium_PlusMembership">プレミアムプラス</string>
+  <!-- No need to translate -->
+  <string name="InternalMembership">Internal</string>
+
+  <string name="MembershipUpgradeText">メンバーシッププランの変更…</string>
+  <string name="MembershipPremiumText">プレミアムメンバーシップ</string>
+
+  <!-- Question strings for delete items notifications -->
+  <string name="DeleteItems">選択したアイテムを削除しますか？</string>
+  <string name="DeleteItem">選択したアイテムを削除しますか？</string>
+
+  <string name="EmptyOutfitText">このアウトフィットにはアイテムがありません。</string>
+
+  <!-- External editor status codes -->
+  <string name="ExternalEditorNotSet">ExternalEditor 設定を使ってエディターを選択します。</string>
+  <string name="ExternalEditorNotFound">指定された外部エディターが見つかりません。
+エディターへのパスを二重引用符で囲んでみてください。（例："/path to my/editor" "%s"）</string>
+  <string name="ExternalEditorCommandParseError">外部エディターのコマンドの解析中にエラーが見つかりました。</string>
+  <string name="ExternalEditorFailedToRun">外部エディターを実行できませんでした。</string>
+
+  <!--  Machine translation of chat messahes -->
+  <string name="TranslationFailed">翻訳できませんでした：[REASON]</string>
+  <string name="TranslationResponseParseError">翻訳の応答にエラーが発生しました。</string>
+
+  <!-- Key names begin -->
+  <string name="Esc">Esc</string>
+  <string name="Space">Space</string>
+  <string name="Enter">Enter</string>
+  <string name="Tab">Tab</string>
+  <string name="Ins">Ins</string>
+  <string name="Del">Del</string>
+  <string name="Backsp">BackSp</string>
+  <string name="Shift">Shift</string>
+  <string name="Ctrl">Ctrl</string>
+  <string name="Alt">Alt</string>
+  <string name="CapsLock">CapsLock</string>
+  <string name="Left">←</string>
+  <string name="Right">→</string>
+  <string name="Up">↑</string>
+  <string name="Down">↓</string>
+  <string name="Home">Home</string>
+  <string name="End">End</string>
+  <string name="PgUp">PgUp</string>
+  <string name="PgDn">PgDn</string>
+
+  <string name="F1">F1</string>
+  <string name="F2">F2</string>
+  <string name="F3">F3</string>
+  <string name="F4">F4</string>
+  <string name="F5">F5</string>
+  <string name="F6">F6</string>
+  <string name="F7">F7</string>
+  <string name="F8">F8</string>
+  <string name="F9">F9</string>
+  <string name="F10">F10</string>
+  <string name="F11">F11</string>
+  <string name="F12">F12</string>
+
+  <string name="Add">追加</string>
+  <string name="Subtract">減算</string>
+  <string name="Multiply">乗算</string>
+  <string name="Divide">除算</string>
+  <string name="PAD_DIVIDE">PAD_DIVIDE</string>
+  <string name="PAD_LEFT">PAD_LEFT</string>
+  <string name="PAD_RIGHT">PAD_RIGHT</string>
+  <string name="PAD_DOWN">PAD_DOWN</string>
+  <string name="PAD_UP">PAD_UP</string>
+  <string name="PAD_HOME">PAD_HOME</string>
+  <string name="PAD_END">PAD_END</string>
+  <string name="PAD_PGUP">PAD_PGUP</string>
+  <string name="PAD_PGDN">PAD_PGDN</string>
+  <string name="PAD_CENTER">PAD_CENTER</string>
+  <string name="PAD_INS">PAD_INS</string>
+  <string name="PAD_DEL">PAD_DEL</string>
+  <string name="PAD_Enter">PAD_Enter</string>
+  <string name="PAD_BUTTON0">PAD_BUTTON0</string>
+  <string name="PAD_BUTTON1">PAD_BUTTON1</string>
+  <string name="PAD_BUTTON2">PAD_BUTTON2</string>
+  <string name="PAD_BUTTON3">PAD_BUTTON3</string>
+  <string name="PAD_BUTTON4">PAD_BUTTON4</string>
+  <string name="PAD_BUTTON5">PAD_BUTTON5</string>
+  <string name="PAD_BUTTON6">PAD_BUTTON6</string>
+  <string name="PAD_BUTTON7">PAD_BUTTON7</string>
+  <string name="PAD_BUTTON8">PAD_BUTTON8</string>
+  <string name="PAD_BUTTON9">PAD_BUTTON9</string>
+  <string name="PAD_BUTTON10">PAD_BUTTON10</string>
+  <string name="PAD_BUTTON11">PAD_BUTTON11</string>
+  <string name="PAD_BUTTON12">PAD_BUTTON12</string>
+  <string name="PAD_BUTTON13">PAD_BUTTON13</string>
+  <string name="PAD_BUTTON14">PAD_BUTTON14</string>
+  <string name="PAD_BUTTON15">PAD_BUTTON15</string>
+
+  <string name="-">-</string>
+  <string name="=">=</string>
+  <string name="`">`</string>
+  <string name=";">;</string>
+  <string name="[">[</string>
+  <string name="]">]</string>
+  <string name="\">\</string>
+
+  <string name="0">0</string>
+  <string name="1">1</string>
+  <string name="2">2</string>
+  <string name="3">3</string>
+  <string name="4">4</string>
+  <string name="5">5</string>
+  <string name="6">6</string>
+  <string name="7">7</string>
+  <string name="8">8</string>
+  <string name="9">9</string>
+
+  <string name="A">A</string>
+  <string name="B">B</string>
+  <string name="C">C</string>
+  <string name="D">D</string>
+  <string name="E">E</string>
+  <string name="F">F</string>
+  <string name="G">G</string>
+  <string name="H">H</string>
+  <string name="I">I</string>
+  <string name="J">J</string>
+  <string name="K">K</string>
+  <string name="L">L</string>
+  <string name="M">M</string>
+  <string name="N">N</string>
+  <string name="O">O</string>
+  <string name="P">P</string>
+  <string name="Q">Q</string>
+  <string name="R">R</string>
+  <string name="S">S</string>
+  <string name="T">T</string>
+  <string name="U">U</string>
+  <string name="V">V</string>
+  <string name="W">W</string>
+  <string name="X">X</string>
+  <string name="Y">Y</string>
+  <string name="Z">Z</string>
+  <!-- Key names end -->
+
+  <!-- Mouse button names (short) begin -->
+  <string name="LMB">左クリック</string>
+  <string name="MMB">ホイールクリック</string>
+  <string name="RMB">右クリック</string>
+  <string name="MB4">進むボタン</string>
+  <string name="MB5">戻るボタン</string>
+  <string name="Double LMB">左ダブルクリック</string>
+  <!-- Mouse button names end -->
+
+  <!-- llviewerwindow -->
+  <string name="BeaconParticle">パーティクル源ビーコン（青）を表示中</string>
+  <string name="BeaconPhysical">物理的オブジェクトのビーコン（緑）を表示中</string>
+  <string name="BeaconScripted">スクリプトのオブジェクトのビーコン（赤）を表示中</string>
+  <string name="BeaconScriptedTouch">タッチ機能のビーコンが付いたスクリプトのオブジェクト（赤）を表示中</string>
+  <string name="BeaconSound">サウンドビーコン（黄）を表示中</string>
+  <string name="BeaconMedia">メディアビーコン（白）を表示中</string>
+  <string name="BeaconSun">太陽の方角ビーコン（オレンジ）を表示中</string>
+  <string name="BeaconMoon">月の方角ビーコン（紫）を表示中</string>
+  <string name="ParticleHiding">パーティクルを非表示</string>
+
+  <!-- commands -->
+  <!-- 「360度スナップショット」だと文字が切れてしまうため -->
+  <string name="Command_360_Capture_Label">３６０度Ｓショット</string>
+  <string name="Command_AboutLand_Label">土地情報</string>
+  <string name="Command_Appearance_Label">アウトフィット</string>
+  <string name="Command_Avatar_Label">アバター一式</string>
+  <string name="Command_Build_Label">制作</string>
+  <string name="Command_Chat_Label">チャット</string>
+  <string name="Command_Conversations_Label">会話</string>
+  <string name="Command_Compass_Label">コンパス</string>
+  <string name="Command_Destinations_Label">行き先</string>
+  <string name="Command_Environments_Label">環境</string>
+  <string name="Command_Gestures_Label">ジェスチャー</string>
+  <string name="Command_Grid_Status_Label">グリッド状況</string>
+  <string name="Command_HowTo_Label">ハウツー</string>
+  <string name="Command_Inventory_Label">インベントリ</string>
+  <string name="Command_Map_Label">マップ</string>
+  <string name="Command_Marketplace_Label">マーケットプレイス</string>
+  <string name="Command_MarketplaceListings_Label">マーケットプレイス</string>
+  <string name="Command_MiniMap_Label">ミニマップ</string>
+  <string name="Command_Move_Label">歩行／走行／飛行</string>
+  <string name="Command_People_Label">人物</string>
+  <string name="Command_Picks_Label">ピック</string>
+  <string name="Command_Places_Label">場所</string>
+  <string name="Command_Preferences_Label">初期設定</string>
+  <string name="Command_Profile_Label">プロフィール</string>
+  <string name="Command_Report_Abuse_Label">嫌がらせの報告</string>
+  <string name="Command_Search_Label">検索</string>
+  <string name="Command_Snapshot_Label">スナップショット</string>
+  <string name="Command_Speak_Label">ボイスチャット</string>
+  <string name="Command_View_Label">カメラ操作</string>
+  <string name="Command_Voice_Label">ボイス設定</string>
+
+  <string name="Command_360_Capture_Tooltip">３６０度の正距円筒図法のスナップショット画像を撮影します。</string>
+  <string name="Command_AboutLand_Tooltip">訪問先に関する情報を表示します。</string>
+  <string name="Command_Appearance_Tooltip">アバターの外観を変更します。</string>
+  <string name="Command_Avatar_Tooltip">アバター一式を選択します。</string>
+  <string name="Command_Build_Tooltip">オブジェクトの制作や地形の変形をします。</string>
+  <string name="Command_Chat_Tooltip">近くにいる人物とテキストチャットします。</string>
+  <string name="Command_Conversations_Tooltip">全員との会話を表示します。</string>
+  <string name="Command_Compass_Tooltip">コンパスを表示します。</string>
+  <string name="Command_Destinations_Tooltip">行ってみたい場所を表示します。</string>
+  <string name="Command_Environments_Tooltip">自分の環境を表示します。</string>
+  <string name="Command_Gestures_Tooltip">アバターのジェスチャーを表示します。</string>
+  <string name="Command_Grid_Status_Tooltip">現在のグリッドステータスを表示します。</string>
+  <string name="Command_HowTo_Tooltip">一般的タスクの実行方法を表示します。</string>
+  <string name="Command_Inventory_Tooltip">インベントリの内容を表示したり使用したりします。</string>
+  <string name="Command_Map_Tooltip">ワールドマップを表示します。</string>
+  <string name="Command_Marketplace_Tooltip">ショッピングに出掛ける</string>
+  <string name="Command_MarketplaceListings_Tooltip">創作アイテムを販売します。</string>
+  <string name="Command_MiniMap_Tooltip">近隣の人を表示します。</string>
+  <string name="Command_Move_Tooltip">アバターの移動操作をします。</string>
+  <string name="Command_People_Tooltip">フレンド、グループ、近隣の人物を表示します。</string>
+  <string name="Command_Picks_Tooltip">プロフィールで紹介しているお気に入りの場所を表示します。</string>
+  <string name="Command_Places_Tooltip">保存済みの場所を表示します。</string>
+  <string name="Command_Preferences_Tooltip">初期設定を表示します。</string>
+  <string name="Command_Profile_Tooltip">自分のプロフィールの表示や編集を行います。</string>
+  <string name="Command_Report_Abuse_Tooltip">嫌がらせを報告します。</string>
+  <string name="Command_Search_Tooltip">場所、イベント、人物を検索します。</string>
+  <string name="Command_Snapshot_Tooltip">スナップショット画像を撮ります。</string>
+  <string name="Command_Speak_Tooltip">マイクを使って近くの人と話します。</string>
+  <string name="Command_View_Tooltip">カメラアングルの変更を表示します。</string>
+  <string name="Command_Voice_Tooltip">インワールドでのコールや近くにいる人物の音量調整します。</string>
+
+  <string name="Toolbar_Bottom_Tooltip">現在、下のツールバーにあります。</string>
+  <string name="Toolbar_Left_Tooltip">現在、左のツールバーにあります。</string>
+  <string name="Toolbar_Right_Tooltip">現在、右のツールバーにあります。</string>
+
+  <!-- Mesh UI terms -->
+  <string name="Retain%">維持率</string>
+  <string name="Detail">詳細</string>
+  <string name="Better Detail">より詳細</string>
+  <string name="Surface">表面</string>
+  <string name="Solid">ソリッド</string>
+  <string name="Wrap">ラップ</string>
+  <string name="Preview">プレビュー</string>
+  <string name="Normal">通常</string>
+
+  <!-- Pathfinding -->
+  <string name="Pathfinding_Wiki_URL">https://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+  <string name="Pathfinding_Object_Attr_None">なし</string>
+  <string name="Pathfinding_Object_Attr_Permanent">ナビメッシュに影響を与える</string>
+  <string name="Pathfinding_Object_Attr_Character">キャラクター</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">（複数）</string>
+
+  <!-- Snapshot image quality levels -->
+  <string name="snapshot_quality_very_low">最低</string>
+  <string name="snapshot_quality_low">低</string>
+  <string name="snapshot_quality_medium">中</string>
+  <string name="snapshot_quality_high">高</string>
+  <string name="snapshot_quality_very_high">最高</string>
+
+  <string name="TeleportMaturityExceeded">住人はこのリージョン（地域）を訪問できません。</string>
+
+  <!-- Spell check settings floater -->
+  <string name="UserDictionary">[User]</string>
+  <string name="experience_tools_experience">体験</string>
+  <string name="ExperienceNameNull">（体験なし）</string>
+  <string name="ExperienceNameUntitled">（タイトルのない体験）</string>
+  <string name="Land-Scope">ランドスコープ</string>
+  <string name="Grid-Scope">グリッドスコープ</string>
+  <string name="Allowed_Experiences_Tab">許可</string>
+  <string name="Blocked_Experiences_Tab">停止</string>
+  <string name="Contrib_Experiences_Tab">貢献者</string>
+  <string name="Admin_Experiences_Tab">管理</string>
+  <string name="Recent_Experiences_Tab">最新</string>
+  <string name="Owned_Experiences_Tab">所有</string>
+  <string name="ExperiencesCounter">（[EXPERIENCES]、最大[MAXEXPERIENCES]）</string>
+  <string name="ExperiencePermission1">コントロールを引き継ぐ</string>
+  <string name="ExperiencePermission3">アバターでアニメーションをトリガー</string>
+  <string name="ExperiencePermission4">アバターに装着</string>
+  <string name="ExperiencePermission9">カメラ追従</string>
+  <string name="ExperiencePermission10">カメラのコントロール</string>
+  <string name="ExperiencePermission11">あなたをテレポート</string>
+  <string name="ExperiencePermission12">体験の権限を自動的に承諾</string>
+  <string name="ExperiencePermission16">あなたのアバターを強制的に座らせる</string>
+  <string name="ExperiencePermission17">自然環境の設定を変更する</string>
+  <string name="ExperiencePermissionShortUnknown">が、不明な操作を実行しました：[Permission]</string>
+  <string name="ExperiencePermissionShort1">コントロールする</string>
+  <string name="ExperiencePermissionShort3">アニメーションをトリガー</string>
+  <string name="ExperiencePermissionShort4">取り付ける</string>
+  <string name="ExperiencePermissionShort9">カメラを追跡</string>
+  <string name="ExperiencePermissionShort10">カメラを制御</string>
+  <string name="ExperiencePermissionShort11">テレポート</string>
+  <string name="ExperiencePermissionShort12">権限</string>
+  <string name="ExperiencePermissionShort16">座る</string>
+  <string name="ExperiencePermissionShort17">環境</string>
+
+  <!-- Conversation log messages -->
+  <string name="logging_calls_disabled_log_empty">会話はログに記録されていません。ログの記録を開始するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。</string>
+  <string name="logging_calls_disabled_log_not_empty">これ以上の会話は記録されません。ログの記録を再開するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。</string>
+  <string name="logging_calls_enabled_log_empty">ログイン時の会話はありません。誰かと話した後や、誰かがあなたに話しかけた後に、そのときのログがここに記載されます。</string>
+  <string name="loading_chat_logs">読み込み中…</string>
+
+  <!-- Statistics -->
+  <string name="na">該当なし</string>
+
+  <!-- Presets graphic/camera -->
+  <string name="preset_combo_label">－空のリスト－</string>
+  <string name="Default">デフォルト</string>
+  <string name="none_paren_cap">（なし）</string>
+  <string name="no_limit">無制限</string>
+
+  <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。</string>
+  <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">物理形状に不正な確認データがあります。物理モデルを修正してください。</string>
+  <!-- MAV_BLOCK_MISSING means server didn't get and couldn't substitute physics_convex, high_lod or BoundingVerts-->
+  <string name="Mav_Details_MAV_BLOCK_MISSING">データがありません。高ＬＯＤが存在し、有効であることを確認してください。設定されていない場合は、物理モデルを設定します。</string>
+  <string name="Mav_Details_MAV_UNKNOWN_VERSION">物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。</string>
+
+  <!-- CURL error messages -->
+  <string name="couldnt_resolve_host">DNSがホスト名 ([HOSTNAME]) を解決できませんでした。
 www.secondlife.com のウェブサイトに接続できるかご確認ください。
-接続できても、このエラーが継続的に起こる場合は、
-サポートセクションから問題を報告してください。</string>
-	<string name="ssl_peer_certificate">ログインサーバーが SSL 経由で確認できませんでした。
-このエラーが継続的に起こる場合は、
-Secondlife.com のサポートセクションから
-問題を報告してください。</string>
-	<string name="ssl_connect_error">この問題の多くは、お使いのコンピュータの時計が正しく設定されていないために起こります。
-コントロールパネルから時刻と日付が正しく設定されているかご確認ください。
-お使いのネットワークとファイアウォールも正しく設定されているかお確かめください。
-このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから
-問題を報告してください。
-
-[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 ナレッジベース]</string>
-</strings>
+接続できても、このエラーが継続的に起こる場合は、サポートセクションから問題を報告してください。</string>
+  <string name="ssl_peer_certificate">ログインサーバーがＳＳＬ経由で確認できませんでした。
+このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。</string>
+  <string name="ssl_connect_error">この問題の多くは、お使いのコンピュータの時計が正しく設定されていないために起こります。
+コントロールパネルから、時刻と日付が正しく設定されている事をご確認してください。
+また、お使いのネットワークとファイアウォールが正しく設定されている事もお確かめください。
+このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。
+[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AD%E3%82%B0%E3%82%A4%E3%83%B3%E3%82%A8%E3%83%A9%E3%83%BC-r1283/ ナレッジベース]</string>
+</strings>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 5316211e10..f771678c8f 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
-	<message_set name="errors">
-		<message name="invalid_tport">テレポート処理中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</message>
-		<message name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。</message>
-		<message name="blocked_tport">申し訳ございませんが、テレポートは現在、ブロックされています。もう少し後でやり直してください。
+  <message_set name="errors">
+    <message name="invalid_tport">テレポート処理中に問題が発生しました。ログインし直す必要があるかもしれません。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。</message>
+    <message name="invalid_region_handoff">リージョン横断の処理中に問題が発生しました。リージョン（地域）を越える前に、再度ログインする必要がある場合があります。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。</message>
+    <message name="blocked_tport">申し訳ありませんが、テレポートは現在ブロックされています。しばらくしてから、もう一度やりなおしてください。
 やり直してもテレポートできない場合は、いったんログアウトし、再度ログインして問題を解決してください。</message>
-		<message name="nolandmark_tport">残念ながら、システムはランドマークの目的地を探せませんでした。</message>
-		<message name="timeout_tport">申し訳ございませんが、システムはテレポートの接続を完了できませんでした。
-もう少し後でやり直してください。</message>
-		<message name="NoHelpIslandTP">ウェルカムアイランドにテレポートで戻ることはできません。
+    <message name="nolandmark_tport">残念ながら、システムはランドマークの目的地を探せませんでした。</message>
+    <message name="timeout_tport">申し訳ございませんが、システムはテレポートの接続を完了できませんでした。しばらくしてから、もう一度やりなおしてください。</message>
+    <message name="NoHelpIslandTP">ウェルカムアイランドにテレポートで戻ることはできません。
 「Welcome Island Public」に行き再度チュートリアルを行ってください。</message>
-		<message name="noaccess_tport">残念ながら、そのテレポート目的地へのアクセスがありません。</message>
-		<message name="missing_attach_tport">添付物は、まだ到着していません。あと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてからテレポートをやり直してださい。</message>
-		<message name="too_many_uploads_tport">この地域の資産キューが現在込み合っているため、要求されたテレポートを処理することが難しい状況です。
-数分後にやり直すか、または混雑していない他の地域をお試しください。</message>
-		<message name="expired_tport">申し訳ございませんが、システムは要求されたテレポートを完了できませんでした。数分後にやり直してください。</message>
-		<message name="expired_region_handoff">申し訳ございませんが、システムは地域間の移動を時間どおりに完了できませんでした。
-数分後にやり直してください。</message>
-		<message name="no_host">テレポートの目的地を見つけられません。目的地が一時的に利用できない状態か、またはすでに消滅している可能性があります。数分後にやり直してください。</message>
-		<message name="no_inventory_host">インベントリシステムは現在利用できません。</message>
-		<message name="MustGetAgeRegion">この地域（リージョン）に入るには 18 才以上である必要があります。</message>
-		<message name="RegionTPSpecialUsageBlocked">リージョンに入ることができません。'[REGION_NAME]' はスキル ゲーミング リージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキル ゲーミングのよくある質問] を参照してください。</message>
-		<message name="preexisting_tport">ごめんなさい。システムはテレポートを始めることができません。数分後にもう一度やり直してください。</message>
-	</message_set>
-	<message_set name="progress">
-		<message name="sending_dest">目的地に送信しています。</message>
-		<message name="redirecting">別の目的地にリダイレクトしています。</message>
-		<message name="relaying">目的地に中継しています。</message>
-		<message name="sending_home">ホーム位置のリクエストを送信しています。</message>
-		<message name="sending_landmark">ランドマーク位置のリクエストを送信しています。</message>
-		<message name="completing">テレポートを完了します。</message>
-		<message name="completed_from">[T_SLURL] からのテレポートが完了しました</message>
-		<message name="resolving">目的地を解決しています。</message>
-		<message name="contacting">新しい地域にコンタクトしています。</message>
-		<message name="arriving">到着...</message>
-		<message name="requesting">テレポートをリクエスト...</message>
-		<message name="pending">テレポートを保留中...</message>
-	</message_set>
-</teleport_messages>
+    <message name="noaccess_tport">残念ながら、そのテレポート目的地へのアクセスがありません。</message>
+    <message name="missing_attach_tport">添付物は、まだ到着していません。あと数秒間お待ちいただくか、いったんログアウトしてから再度ログインし、テレポートし直してださい。</message>
+    <message name="too_many_uploads_tport">このリージョン（地域）のアセットのキューが現在混み合っているため、要求されたテレポートを処理することが難しい状況です。
+数分後にやり直すか、混雑していない他のリージョンをお試しください。</message>
+    <message name="expired_tport">申し訳ございませんが、システムは要求されたテレポートを完了できませんでした。お手数ですが、数分程度時間をおいてからやり直してください。</message>
+    <message name="expired_region_handoff">申し訳ございませんが、システムは地域間の移動を時間どおりに完了できませんでした。
+お手数ですが、数分程度時間をおいてからやり直してください。</message>
+    <message name="no_host">テレポートの目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。お手数ですが、数分程度時間をおいてからやり直してください。</message>
+    <message name="no_inventory_host">インベントリシステムは現在利用できません。</message>
+    <message name="MustGetAgeRegion">このリージョン（地域）に入るには、１８歳以上である必要があります。</message>
+    <message name="RegionTPSpecialUsageBlocked">リージョンに入ることができません。
+「[REGION_NAME]」はスキルゲーミングリージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。
+詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキルゲーミングのよくある質問]を参照してください。</message>
+  </message_set>
+  <message_set name="progress">
+    <message name="sending_dest">目的地に送信しています。</message>
+    <message name="redirecting">別の目的地にリダイレクトしています。</message>
+    <message name="relaying">目的地に中継しています。</message>
+    <message name="sending_home">ホーム位置のリクエストを送信しています。</message>
+    <message name="sending_landmark">ランドマーク位置のリクエストを送信しています。</message>
+    <message name="completing">テレポートを完了します。</message>
+    <message name="completed_from">[T_SLURL] からのテレポートが完了しました。</message>
+    <message name="resolving">目的地を解決しています。</message>
+    <message name="contacting">新しい地域にコンタクトしています。</message>
+    <message name="arriving">到着中…</message>
+    <message name="requesting">テレポートをリクエスト…</message>
+    <message name="pending">テレポートを保留中…</message>
+  </message_set>
+</teleport_messages>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
new file mode 100644
index 0000000000..e43f975d8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<bodyparts_list_item name="wearable_item">
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <lock_panel name="btn_lock" tool_tip="編集権限がありません。" />
+  <lock_icon name="btn_lock1" />
+  <edit_panel name="btn_edit_panel" />
+  <edit_btn name="btn_edit" tool_tip="このシェイプを編集" />
+</bodyparts_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
new file mode 100644
index 0000000000..534ce0bbb9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<clothing_list_item name="wearable_item">
+  <lock_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <up_btn name="btn_move_up" />
+  <down_btn name="btn_move_down" />
+  <lock_panel name="btn_lock" tool_tip="編集権限がありません。" />
+  <lock_icon name="btn_lock1" />
+  <edit_panel name="btn_edit_panel" />
+  <edit_btn name="btn_edit" tool_tip="アウトフィットを編集" />
+</clothing_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..61bb12412b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<deletable_wearable_list_item name="deletable_wearable_item">
+  <delete_btn name="btn_delete" tool_tip="服装から削除" />
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+</deletable_wearable_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
index 485ebb3e39..9c14c98f96 100644
--- a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
@@ -1,2 +1,21 @@
-<?xml version="1.0" ?>
-<densityctrl name="density_ctrl" label="密度"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<densityctrl abel="密度" name="density_ctrl">
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">指数項</text>
+  <slider dname="level_exponential" />
+
+  <view left_pad="15" top="15" name="preview_image" height="140" width="140" follows="left|top" />
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">指数尺度係数</text>
+  <slider dname="exponential_scale" />
+
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">線形項</text>
+  <slider dname="level_linear" />
+
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">定数項</text>
+  <slider dname="level_constant" />
+
+  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="15" width="80">最大高度</text>
+  <slider name="max_altitude" />
+
+  <text follows="left|top" height="11" layout="topleft" name="aniso_factor_label" left="15" top_pad="15" width="80">異方性係数</text>
+  <slider name="aniso_factor" />
+</densityctrl>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..4e06928c7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<dummy_clothing_list_item name="dummy_clothing_item">
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <add_panel name="btn_add_panel" />
+  <add_btn name="btn_add" tool_tip="この種類のアイテムを更に追加します。" />
+</dummy_clothing_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
new file mode 100644
index 0000000000..bf6e105465
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<flat_list_view allow_select="true" color="PanelFocusBackgroundColor" item_pad="0" keep_one_selected="true" multi_select="false" opaque="true">
+  <flat_list_view.no_items_text follows="all" name="no_items_msg" v_pad="10" h_pad="10" value="一致するものが見つかりませんでした。" wrap="true" />
+</flat_list_view>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
new file mode 100644
index 0000000000..12f5a53a8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_folder folder_arrow_image="Folder_Arrow" folder_indentation="8" item_height="20" item_top_pad="4" selection_image="Rounded_Square" left_pad="5" icon_pad="2" icon_width="16" text_pad="1" text_pad_right="4" arrow_size="12" max_folder_item_overlap="2">
+  <new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black" />
+</inbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
new file mode 100644
index 0000000000..1034e63fe8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_item item_height="20" item_top_pad="4" selection_image="Rounded_Square">
+  <new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black" />
+</inbox_folder_view_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
new file mode 100644
index 0000000000..c42b38a3f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_item_separator name="separator" label="─────" />
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
new file mode 100644
index 0000000000..c71fc8cd5e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Use "disabled color" to make it look like menu separators -->
+<menu_item_tear_off enabled_color="MenuItemDisabledColor" name="tear_off" label="〰〰〰〰〰" disabled_color="MenuItemDisabledColor" highlight_bg_color="MenuItemHighlightBgColor" highlight_fg_color="MenuItemHighlightFgColor" />
diff --git a/indra/newview/skins/default/xui/ja/widgets/name_editor.xml b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
new file mode 100644
index 0000000000..3de33594dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<name_editor default_text="（取得しています）"/>
diff --git a/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
new file mode 100644
index 0000000000..0db8e89b3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel_camera_item>
+  <panel_camera_item.icon_over name="hovered_icon" />
+  <panel_camera_item.icon_selected name="selected_icon" />
+  <panel_camera_item.picture name="picture" />
+  <panel_camera_item.selected_picture fname="selected_picture" />
+  <panel_camera_item.text name="picture_name">テキスト</panel_camera_item.text>
+</panel_camera_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/person_view.xml b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
new file mode 100644
index 0000000000..bdf1d67c2f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<person_view>
+  <avatar_icon />
+  <last_interaction_time_textbox name="last_interaction_time_textbox" />
+  <permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することはできません。" />
+  <permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトの編集や、削除、取得することができます。" />
+  <permission_map_icon tool_tip="このフレンドは、マップ上であなたのいる場所を探すことができます。" name="permission_map_icon" />
+  <permission_online_icon name="permission_online_icon" tool_tip="このフレンドは、あなたがオンラインになったことがわかります。" />
+  <info_btn name="info_btn" tool_tip="詳細情報" />
+  <profile_btn name="profile_btn" tool_tip="プロフィールを見る" />
+  <output_monitor name="speaking_indicator" />
+</person_view>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
new file mode 100644
index 0000000000..7a25a6cc13
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<sun_moon_trackball name="virtualtrackball">
+
+  <sun_moon_trackball.border  />
+
+  <sun_moon_trackball.labelN name="labelN" label="北" />
+  <sun_moon_trackball.labelS name="labelS" label="南" />
+  <sun_moon_trackball.labelW name="labelW" label="西" />
+  <sun_moon_trackball.labelE name="labelE" label="東" />
+
+  <sun_moon_trackball.button_rotate_top name="btn_rotate_top" />
+
+  <sun_moon_trackball.button_rotate_bottom name="btn_rotate_bottom" />
+
+  <sun_moon_trackball.button_rotate_left name="btn_rotate_left" />
+
+  <sun_moon_trackball.button_rotate_right name="btn_rotate_right" />
+
+</sun_moon_trackball>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
new file mode 100644
index 0000000000..e34ca44481
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<inventory_list_item>
+  <!-- DEFAULT style for inventory list item -->
+  <default_style />
+
+  <!-- style for inventory list item WORN on avatar -->
+  <worn_style />
+  <item_icon name="item_icon" />
+  <item_name name="item_name" value="…" />
+  <add_btn name="add_wearable" />
+  <remove_btn name="remove_wearable" />
+</inventory_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
new file mode 100644
index 0000000000..c829604f9a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<xy_vector name="xyvector">
+
+  <xy_vector.border visible="true" />
+
+  <xy_vector.x_entry name="XEntry" tab_stop="true" label="Ｘ軸：" />
+  <xy_vector.y_entry name="YEntry" tab_stop="true" label="Ｙ軸：" />
+
+  <xy_vector.touch_area name="TouchArea" />
+
+</xy_vector>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml
index 0e777751d3..98a3b2e6c4 100644
--- a/indra/newview/skins/default/xui/ja/xui_version.xml
+++ b/indra/newview/skins/default/xui/ja/xui_version.xml
@@ -1,4 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
-	1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<xui_version>1.0</xui_version>
\ No newline at end of file
-- 
cgit v1.2.3


From 972e159aaf12a93d9612449b88fd5287670b1ad1 Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Wed, 31 May 2023 07:08:30 +0900
Subject: Merged DRTVWR-577 Japanese Translation. (HTML)

---
 .../skins/default/html/ja/help-offline/index.html  |  42 +++++++
 .../skins/default/html/ja/loading-error/index.html | 124 ++++++++++++++++-----
 .../skins/default/html/ja/loading/loading.html     |  32 ++++--
 3 files changed, 163 insertions(+), 35 deletions(-)
 create mode 100644 indra/newview/skins/default/html/ja/help-offline/index.html

(limited to 'indra')

diff --git a/indra/newview/skins/default/html/ja/help-offline/index.html b/indra/newview/skins/default/html/ja/help-offline/index.html
new file mode 100644
index 0000000000..aeaafe8216
--- /dev/null
+++ b/indra/newview/skins/default/html/ja/help-offline/index.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="ja" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta encoding="utf-8" />
+    <title>オフラインヘルプ</title>
+    <style>
+      body {
+        background-color: #000000;
+        font-family: '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
+          sans-serif;
+        font-size: 62.5%;
+        color: #e9f1f8;
+        width: 100%;
+        padding: 0px;
+        margin: 0px;
+      }
+      #infobox {
+        position: absolute;
+        top: 40%;
+        left: 50%;
+        z-index: 1;
+        padding: 0;
+        width: 592px;
+        margin-left: -296px;
+        margin-top: -150px;
+        text-align: center;
+        font-size: 1.2em;
+        color: #ccc;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="infobox">
+      <p>Second Lifeオフラインヘルプ</p>
+      <p>
+        オンラインではなく、リモートでヘルプを取得しないように構成されています。
+        <br />
+        これは、さらに作業が完了するまで利用できるすべてのヘルプです。うん。
+      </p>
+    </div>
+  </body>
+</html>
diff --git a/indra/newview/skins/default/html/ja/loading-error/index.html b/indra/newview/skins/default/html/ja/loading-error/index.html
index d969c03098..27d4425016 100644
--- a/indra/newview/skins/default/html/ja/loading-error/index.html
+++ b/indra/newview/skins/default/html/ja/loading-error/index.html
@@ -1,25 +1,99 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>接続できません</title>
-<style> 
-body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
-a {color:#93a9d5;} 
-a:active {color:#50607C;text-decoration:underline;} 
-a:hover {color:#ff7900;text-decoration:underline;} 
-#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
-#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
-#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
-#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
-#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
-#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
-</style>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
-		<p> Second Lifeによるログインサーバーへの接続が確立できません。
-		</p>
-		<p> インターネット接続を確認してください。 お使いのコンピュータやネットワークがファイヤウォールまたはプロキシにより保護されている場合は、Second  Lifeによるネットワークへのアクセスが許可されていることを確認してください。
-		</p> <div id="submitbtn">
-			<input class="input_over" type="submit" value="もう一度試す" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
-</div>
-</body>
+<!DOCTYPE html>
+<html lang="ja" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta encoding="utf-8" />
+    <title>接続できません</title>
+    <style>
+      body {
+        background-color: #000000;
+        font-family: '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
+          sans-serif;
+        font-size: 62.5%;
+        color: #e9f1f8;
+        width: 100%;
+        padding: 0px;
+        margin: 0px;
+      }
+      a {
+        color: #93a9d5;
+      }
+      a:active {
+        color: #50607c;
+        text-decoration: underline;
+      }
+      a:hover {
+        color: #ff7900;
+        text-decoration: underline;
+      }
+      #infobox {
+        position: absolute;
+        top: 40%;
+        left: 50%;
+        z-index: 1;
+        padding: 0;
+        width: 592px;
+        margin-left: -296px;
+        margin-top: -150px;
+        text-align: center;
+        font-size: 1.2em;
+        color: #ccc;
+      }
+      #infobox #submitbtn {
+        padding: 15px 3px 5px 15px;
+        height: 28px;
+        width: 127px;
+        margin-left: 244px;
+      }
+      #infobox #submitbtn input {
+        text-transform: capitalize;
+        color: #fff;
+        font-size: 1em;
+        height: 28px;
+        width: 127px;
+        border: none;
+        font-weight: normal;
+        background: url(../../btn_purplepill_bg.png) bottom left no-repeat;
+        vertical-align: text-bottom;
+      }
+      #infobox #submitbtn input:hover.input_over,
+      #login_box #submitbtn input:hover.input_off {
+        color: #fff;
+        border: none;
+        background: url(../../btn_purplepill_bg.png) bottom right no-repeat;
+      }
+      #infobox #submitbtn input:active.input_over {
+        color: #fff;
+        border: none;
+        background: url(../../btn_purplepill_bg.png) top left no-repeat;
+      }
+      #infobox #submitbtn input.pressed {
+        color: #888;
+        border: none;
+        background: url(../../btn_purplepill_bg.png) top right no-repeat;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="infobox">
+      <img src="../../unabletoconnect.png" alt="unabletoconnect" />
+      <br />
+      <p>Second Lifeによるログインサーバーへの接続が確立できません。</p>
+      <p>
+        インターネット接続を確認してください。
+        お使いのコンピュータやネットワークがファイヤウォールまたはプロキシにより保護されている場合は、
+        Second
+        Lifeによるネットワークへのアクセスが許可されていることを確認してください。
+      </p>
+      <div id="submitbtn">
+        <input
+          class="input_over"
+          type="submit"
+          value="もう一度試す"
+          onclick="document.location='secondlife:\/\/\/app/login_refresh'; this.className='pressed';"
+          onmouseover="this.className='input_over';"
+          onmouseout="this.className='input_off';"
+        />
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html
index 35cf74a35f..ea576ed082 100644
--- a/indra/newview/skins/default/html/ja/loading/loading.html
+++ b/indra/newview/skins/default/html/ja/loading/loading.html
@@ -1,10 +1,22 @@
-<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
-	<tr>
-		<td align="center" valign="middle" style="font-size:0.8em;">
-			<img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;ロード中...
-		</td>
-	</tr>
-</table>
-</body>
+<!DOCTYPE html>
+<html lang="ja" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="utf-8" />
+    <title>読み込んでいます…</title>
+    <style>
+      body {
+        background-color: #000000;
+        font-family: '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
+          sans-serif;
+        font-size: 62.5%;
+        color: #e9f1f8;
+        text-align: center;
+      }
+    </style>
+  </head>
+  <body>
+    <img src="../../en-us/loading/sl_logo_rotate_black.gif" alt="loading" />
+    <br />
+    <p>&nbsp;&nbsp;&nbsp;読み込んでいます…</p>
+  </body>
+</html>
-- 
cgit v1.2.3


From a6efb920e8e0d9add76ec86c3ed158c691685727 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 May 2023 01:09:57 +0300
Subject: SL-19795 Creating folders in combination mode does not scroll to new
 folder #2

---
 indra/newview/llinventorygallery.cpp   |  3 ++-
 indra/newview/llpanelmaininventory.cpp | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c6fee42297..2f9f594790 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -183,7 +183,8 @@ void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
 
 void LLInventoryGallery::updateRootFolder()
 {
-    if (mIsInitialized)
+    llassert(mFolderID.notNull());
+    if (mIsInitialized && mFolderID.notNull())
     {
         S32 count = mItemsAddedCount;
         for (S32 i = count - 1; i >= 0; i--)
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 39add4ee1c..381506c2a6 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1011,9 +1011,12 @@ void LLPanelMainInventory::updateItemcountText()
 
         gInventory.getDirectDescendentsOf(getCurrentSFVRoot(), cats, items);
 
-        string_args["[ITEM_COUNT]"] = llformat("%d", items->size());
-        string_args["[CATEGORY_COUNT]"] = llformat("%d", cats->size());
-        text = getString("ItemcountCompleted", string_args);
+        if (items && cats)
+        {
+            string_args["[ITEM_COUNT]"] = llformat("%d", items->size());
+            string_args["[CATEGORY_COUNT]"] = llformat("%d", cats->size());
+            text = getString("ItemcountCompleted", string_args);
+        }
     }
 	
     mCounterCtrl->setValue(text);
@@ -1532,6 +1535,13 @@ void LLPanelMainInventory::toggleViewMode()
     }
 
     mSingleFolderMode = !mSingleFolderMode;
+    mCombinationShapeDirty = true;
+
+    if (mCombinationGalleryPanel->getRootFolder().isNull())
+    {
+        mCombinationGalleryPanel->setRootFolder(mCombinationInventoryPanel->getSingleFolderRoot());
+        mCombinationGalleryPanel->updateRootFolder();
+    }
 
     getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
     getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
-- 
cgit v1.2.3


From c3e200cef41a602c13d3115cfec777eff63d5028 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 31 May 2023 17:03:19 +0300
Subject: SL-19686 don't search views every time

---
 indra/newview/llpanelmaininventory.cpp | 38 +++++++++++++++++++++-------------
 indra/newview/llpanelmaininventory.h   | 10 +++++++++
 2 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 381506c2a6..16f7abee23 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -249,6 +249,16 @@ BOOL LLPanelMainInventory::postBuild()
 	mVisibilityMenuButton = getChild<LLMenuButton>("options_visibility_btn");
     mViewMenuButton = getChild<LLMenuButton>("view_btn");
 
+    mBackBtn = getChild<LLButton>("back_btn");
+    mForwardBtn = getChild<LLButton>("forward_btn");
+    mUpBtn = getChild<LLButton>("up_btn");
+    mViewModeBtn = getChild<LLButton>("view_mode_btn");
+    mNavigationBtnsPanel = getChild<LLLayoutPanel>("nav_buttons");
+
+    mDefaultViewPanel = getChild<LLPanel>("default_inventory_panel");
+    mListViewPanel = getChild<LLPanel>("single_folder_inventory");
+    mGalleryViewPanel = getChild<LLPanel>("gallery_view_inventory");
+
     mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
     mListViewRootUpdatedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
     mSingleFolderPanelInventory->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mSingleFolderPanelInventory, _1, _2));
@@ -1543,11 +1553,11 @@ void LLPanelMainInventory::toggleViewMode()
         mCombinationGalleryPanel->updateRootFolder();
     }
 
-    getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
-    getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
-    getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
-    getChild<LLLayoutPanel>("nav_buttons")->setVisible(mSingleFolderMode);
-    getChild<LLButton>("view_mode_btn")->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
+    mDefaultViewPanel->setVisible(!mSingleFolderMode);
+    mListViewPanel->setVisible(mSingleFolderMode && isListViewMode());
+    mGalleryViewPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
+    mNavigationBtnsPanel->setVisible(mSingleFolderMode);
+    mViewModeBtn->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
     mCombinationScrollPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
 
     setActivePanel();
@@ -2396,23 +2406,23 @@ void LLPanelMainInventory::updateNavButtons()
 {
     if(isListViewMode())
     {
-        getChild<LLButton>("back_btn")->setEnabled(mSingleFolderPanelInventory->isBackwardAvailable());
-        getChild<LLButton>("forward_btn")->setEnabled(mSingleFolderPanelInventory->isForwardAvailable());
+        mBackBtn->setEnabled(mSingleFolderPanelInventory->isBackwardAvailable());
+        mForwardBtn->setEnabled(mSingleFolderPanelInventory->isForwardAvailable());
     }
     if(isGalleryViewMode())
     {
-        getChild<LLButton>("back_btn")->setEnabled(mInventoryGalleryPanel->isBackwardAvailable());
-        getChild<LLButton>("forward_btn")->setEnabled(mInventoryGalleryPanel->isForwardAvailable());
+        mBackBtn->setEnabled(mInventoryGalleryPanel->isBackwardAvailable());
+        mForwardBtn->setEnabled(mInventoryGalleryPanel->isForwardAvailable());
     }
     if(isCombinationViewMode())
     {
-        getChild<LLButton>("back_btn")->setEnabled(mCombinationInventoryPanel->isBackwardAvailable());
-        getChild<LLButton>("forward_btn")->setEnabled(mCombinationInventoryPanel->isForwardAvailable());
+        mBackBtn->setEnabled(mCombinationInventoryPanel->isBackwardAvailable());
+        mForwardBtn->setEnabled(mCombinationInventoryPanel->isForwardAvailable());
     }
 
     const LLViewerInventoryCategory* cat = gInventory.getCategory(getCurrentSFVRoot());
     bool up_enabled = (cat && cat->getParentUUID().notNull());
-    getChild<LLButton>("up_btn")->setEnabled(up_enabled);
+    mUpBtn->setEnabled(up_enabled);
 }
 
 LLSidepanelInventory* LLPanelMainInventory::getParentSidepanelInventory()
@@ -2451,8 +2461,8 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
         LLUUID cur_root = getCurrentSFVRoot();
         mViewMode = mode;
 
-        getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());
-        getChild<LLPanel>("gallery_view_inventory")->setVisible(mSingleFolderMode && isGalleryViewMode());
+        mListViewPanel->setVisible(mSingleFolderMode && isListViewMode());
+        mGalleryViewPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
         mCombinationScrollPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
 
         if(isListViewMode())
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 2c3379996f..056b26b6ec 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -192,6 +192,16 @@ private:
 	std::string					mCategoryCountString;
 	LLComboBox*					mSearchTypeCombo;
 
+    LLButton* mBackBtn;
+    LLButton* mForwardBtn;
+    LLButton* mUpBtn;
+    LLButton* mViewModeBtn;
+    LLLayoutPanel* mNavigationBtnsPanel;
+
+    LLPanel* mListViewPanel;
+    LLPanel* mGalleryViewPanel;
+    LLPanel* mDefaultViewPanel;
+
     bool mSingleFolderMode;
     EViewModeType mViewMode;
     LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
-- 
cgit v1.2.3


From 4536c59c5d5da22ee09d95104fc86215c107da9f Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Wed, 31 May 2023 23:37:07 +0900
Subject: =?UTF-8?q?Follow=205b9b4fcf6657ce2cfa5fde85012fe24213df37b5=20tra?=
 =?UTF-8?q?nslation.=20(Add=20Performance=20floater=20translation=20etc.)?=
 =?UTF-8?q?=20Changed=20'lighting'=20translation=20('=E7=85=A7=E6=98=8E'?=
 =?UTF-8?q?=20and=20'=E3=83=A9=E3=82=A4=E3=83=86=E3=82=A3=E3=83=B3?=
 =?UTF-8?q?=E3=82=B0')=20to=20'=E5=85=89=E6=BA=90'.=20Changed=20'world'=20?=
 =?UTF-8?q?translation=20'=E4=B8=96=E7=95=8C'=20to=20'=E3=83=AF=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E3=83=89'.=20(To=20be=20consistent=20with=20'?=
 =?UTF-8?q?=E3=83=9F=E3=83=8B=E3=83=9E=E3=83=83=E3=83=97'=20translations.)?=
 =?UTF-8?q?=20Adjusted=20the=20translation=20to=20be=20more=20natural=20Ja?=
 =?UTF-8?q?panese=20when=20the=20settings.xml=20object=20passed=20items.?=
 =?UTF-8?q?=20(experimental)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skins/default/xui/ja/floater_360capture.xml    |   3 +-
 .../default/xui/ja/floater_add_payment_method.xml  |  19 +-
 .../xui/ja/floater_avatar_render_settings.xml      |   6 +-
 .../skins/default/xui/ja/floater_performance.xml   |  45 +++++
 .../ja/floater_preferences_graphics_advanced.xml   |  79 ++++++---
 .../default/xui/ja/floater_preview_gesture.xml     |   4 +-
 .../default/xui/ja/floater_scene_load_stats.xml    | 115 +++++++-----
 .../xui/ja/floater_translation_settings.xml        |  67 +++++--
 .../skins/default/xui/ja/menu_attachment_other.xml |  61 ++++---
 .../skins/default/xui/ja/menu_avatar_other.xml     |  42 +++--
 .../xui/ja/menu_avatar_rendering_settings.xml      |   2 +-
 .../xui/ja/menu_avatar_rendering_settings_add.xml  |   5 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml | 197 ++++++++++++---------
 .../newview/skins/default/xui/ja/notifications.xml |  26 +--
 .../xui/ja/panel_performance_autoadjustments.xml   |  41 +++++
 .../xui/ja/panel_performance_complexity.xml        |  14 ++
 .../default/xui/ja/panel_performance_huds.xml      |  13 ++
 .../default/xui/ja/panel_performance_nearby.xml    |  28 +++
 .../xui/ja/panel_performance_preferences.xml       |  66 +++++++
 .../default/xui/ja/panel_preferences_graphics1.xml |  90 ++++++----
 .../default/xui/ja/panel_presets_pulldown.xml      |  11 +-
 .../default/xui/ja/panel_profile_secondlife.xml    |  29 ++-
 indra/newview/skins/default/xui/ja/strings.xml     |  16 +-
 23 files changed, 682 insertions(+), 297 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/ja/floater_performance.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_performance_complexity.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_performance_huds.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_performance_nearby.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_performance_preferences.xml

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/ja/floater_360capture.xml b/indra/newview/skins/default/xui/ja/floater_360capture.xml
index 8bf1fd2504..a68f5994f2 100644
--- a/indra/newview/skins/default/xui/ja/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_360capture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="360capture" title="３６０度スナップショット">
+<floater name="360capture" title="３６０度Ｓショット">
   <panel name="ui_panel_left">
     <text name="quality_level_label">品質</text>
     <radio_group name="360_quality_selection">
@@ -13,6 +13,7 @@
     <button label="名前をつけて保存…" name="save_local_button" />
   </panel>
   <panel name="ui_panel_right">
+    <web_browser name="360capture_contents" />
     <text name="statusbar">クリックとドラッグで視点変更</text>
   </panel>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
index fee738726d..23695f3fe6 100644
--- a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_add_payment_method">
-  <floater.string name="continue_url">https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1</floater.string>
+  <floater.string name="continue_url">https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1&amp;lang=ja-JP</floater.string>
   <panel label="wrapper_panel" name="wrapper_panel">
-    <text name="title_txt">支払い方法を追加してリンデンドルを購入し、Second Lifeをもっと楽しみましょう。</text>
+    <text name="title_txt">支払い方法を登録してリンデンドルを購入し、Second Lifeをもっと楽しみましょう。</text>
     <button label="始めましょう" name="continue_btn" />
-    <button label="後で" name="close_btn"/>
-    <text name="image_left_desc">お気に入りのアバターを作成します。店舗やSecond Life Marketplaceにある何百万ものアイテムから選択できます。あなたのスタイルがここにあります。</text>
-    <text name="image_center_desc">お気に入りのパフォーマーやホストに寄付してください。あなたのサポートは、彼らが素晴らしい体験を生み出すのに役立ちます。</text>
-    <text name="image_right_desc">あなたの夢の家を作ります。何百万ものアイテムを購入できるので、あなただけの住まいを作ることができます。</text>
+    <button label="また後で" />
+    <icon name="image_left" />
+    <icon name="image_center" />
+    <icon name="image_right" />
+    <text name="image_left_desc">お気に入りのアバターを作成しましょう。ストアやSecond Lifeマーケットプレイスにある何百万ものアイテムからお選びください。あなただけのスタイルがここにあります。</text>
+    <text name="image_center_desc">お気に入りのパフォーマーやホストに寄付をしましょう。あなたのサポートは、彼らが素晴らしい体験を生み出すのに役立ちます。</text>
+    <text name="image_right_desc">あなたの夢の家を作りましょう。何百万ものアイテムを購入できるので、あなただけの住まいを作ることができます。</text>
   </panel>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
index e51bd0e935..85912cb69b 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
@@ -2,11 +2,11 @@
 <floater name="floater_avatar_render_settings" title="アバターの描画設定">
   <string name="av_never_render" value="使用しない" />
   <string name="av_always_render" value="常に使用する" />
-  <filter_editor label="人物をフィルタ" name="people_filter_input" />
-  <menu_button name="plus_btn" tool_tip="選択した人に対するアクション：" />
   <name_list name="render_settings_list">
     <name_list.columns label="名前" name="name" />
     <name_list.columns label="描画設定" name="setting" />
-    <name_list.columns label="日付を追加" name="timestamp" />
   </name_list>
+  <panel name="add_subpanel">
+    <menu_button label="何かを追加…" name="plus_btn" tool_tip="選択した人物に対するアクション" />
+  </panel>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_performance.xml b/indra/newview/skins/default/xui/ja/floater_performance.xml
new file mode 100644
index 0000000000..ef0669fb7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_performance.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="performance" title="グラフィックの最適化">
+  <string name="fps_text" value="フレーム／秒" />
+  <string name="max_text" value="（最大）" />
+  <panel name="panel_top">
+    <panel name="fps_subpanel">
+      <text name="fps_value">167</text>
+      <text name="fps_lbl">フレーム／秒</text>
+      <text name="fps_desc1_lbl">変更が完全に反映されるまで</text>
+      <text name="fps_desc2_lbl">５～１０秒程度かかります。</text>
+    </panel>
+  </panel>
+  <panel name="panel_performance_main">
+    <panel name="autoadjustments_subpanel">
+      <text name="auto_adj_lbl">自動調整設定（推奨）</text>
+      <text name="auto_adj_desc">求めているフレームレートになるように自動調整します。</text>
+      <icon name="icon_arrow4" />
+    </panel>
+    <panel name="settings_subpanel">
+      <text name="settings_lbl">グラフィック設定</text>
+      <text name="settings_desc">距離、水、照明などの設定を選択します。</text>
+      <icon name="icon_arrow3" />
+    </panel>
+    <panel name="nearby_subpanel">
+      <text name="avatars_nearby_lbl">近隣のアバター</text>
+      <text name="avatars_nearby_desc">近くにいるアバターのうち、どのタイプのアバターを完全に表示するかを管理します。</text>
+      <icon name="icon_arrow2" />
+    </panel>
+    <panel name="complexity_subpanel">
+      <text name="complexity_lbl">アバターの複雑度</text>
+      <text name="complexity_info">ＦＰＳが出ない場合は、アバターの複雑度を減らしてください。</text>
+      <icon name="icon_arrow4" />
+    </panel>
+    <panel name="huds_subpanel">
+      <text name="huds_lbl">アクティブなＨＵＤ</text>
+      <text name="huds_desc">使用していないＨＵＤを外すと、速度が向上する可能性があります。</text>
+      <icon name="icon_arrow4" />
+    </panel>
+  </panel>
+  <panel filename="panel_performance_nearby.xml" name="panel_performance_nearby" />
+  <panel filename="panel_performance_complexity.xml" name="panel_performance_complexity" />
+  <panel filename="panel_performance_preferences.xml" name="panel_performance_preferences" />
+  <panel filename="panel_performance_huds.xml" name="panel_performance_huds" />
+  <panel filename="panel_performance_autoadjustments.xml" name="panel_performance_autoadjustments" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index 109428debc..571c2b7039 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="prefs_graphics_advanced" title="拡張グラフィック設定">
+
   <!-- This block shows Advanced Settings -->
+
   <text name="GeneralText">全般</text>
 
   <slider label="描画距離：" name="DrawDistance" />
@@ -10,11 +12,11 @@
   <slider label="ポストプロセス品質：" name="RenderPostProcess" />
   <text name="PostProcessText">低</text>
 
-  <check_box label="垂直同期を有効化" name="vsync" tool_tip="フレーム レートをモニターのリフレッシュレートに同期させ、スムーズなパフォーマンスを実現します。" />
+  <check_box label="垂直同期を有効化" name="vsync" tool_tip="フレームレートをモニターのリフレッシュレートに同期させ、スムーズなパフォーマンスを実現します。" />
 
   <text name="AvatarText">アバター</text>
 
-  <slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの点で視覚的に複雑なアバターを JellyDoll として描くかを制御します" />
+  <slider tool_tip="複雑なアバターがどの時点でJellyDollとして描画されるかを制御します。" label="最大複雑度：" name="IndirectMaxComplexity" />
   <text name="IndirectMaxComplexityText">0</text>
 
   <slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors" />
@@ -28,30 +30,29 @@
 
   <text name="HardwareText">ハードウェア</text>
 
-  <slider label="テクスチャメモリ（㎆）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。ビデオカードのメモリに既定。数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。" />
+  <slider label="テクスチャメモリ（㎆）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てるメモリの量を指定します。デフォルトはビデオカードの搭載メモリの値です。この値を減らすとパフォーマンスが向上する可能性がありますが、テクスチャがぼやける可能性があります。" />
 
   <slider label="フォグの距離比率：" name="fog" />
 
   <slider label="ガンマ：" name="gamma" />
-  <text name="(brightness, lower is brighter)">（0がデフォルト、低いほど明るい）</text>
-
-  <check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani" />
+  <text name="(brightness, lower is brighter)">（０がデフォルトです。低い値ほど明るくなります。）</text>
 
-  <check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。" />
+  <check_box label="異方的フィルタリング（有効にすると速度が低下します）" name="ani" />
 
-  <check_box label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。" />
+  <check_box control_name="RenderCompressTextures" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリ内のテクスチャを圧縮し、色の品質をある程度犠牲にして、より高解像度のテクスチャを読み込むようにします。" />
 
-  <check_box label="HiDPI 表示のためにサポートを有効にする（再起動が必要）" name="use HiDPI" tool_tip="高画質の描画のために OpenGL を有効にする" />
+  <check_box control_name="HiDPIディスプレイのサポートを有効にする（再起動後に反映）" name="高解像度の描画のためにOpenGLを有効にします。" />
 
-  <text name="antialiasing label">アンチエイリアシング：</text>
-  <combo_box label="アンチエイリアシング" name="fsaa">
+  <!-- 字数制限につき「アンチエイリアシング」から「アンチエイリアス」に変更 -->
+  <text name="antialiasing label">アンチエイリアス：</text>
+  <combo_box label="アンチエイリアス" name="fsaa">
     <combo_box.item label="無効" name="FSAADisabled" value="0" />
     <combo_box.item label="2x" name="2x" value="2" />
     <combo_box.item label="4x" name="4x" value="4" />
     <combo_box.item label="8x" name="8x" value="8" />
     <combo_box.item label="16x" name="16x" value="16" />
   </combo_box>
-  <text name="antialiasing restart">（起動後に反映）</text>
+  <text name="antialiasing restart">（再起動後に反映）</text>
   <view_border name="vert_border" />
   <text name="MeshText">メッシュ</text>
 
@@ -66,45 +67,67 @@
 
   <slider label="フレキシプリム：" name="FlexibleMeshDetail" />
   <text name="FlexibleMeshDetailText">低</text>
+
   <text name="ShadersText">シェーダー</text>
 
   <check_box label="透明な水" name="TransparentWater" />
+
   <check_box label="バンプマッピングと光沢" name="BumpShiny" />
-  <check_box label="近くの光" name="LocalLights" />
 
-  <slider label="地形詳細：" name="TerrainDetail" />
+  <check_box label="ローカル光源" name="LocalLights" />
+
+  <slider label="地形の詳細：" name="TerrainDetail" />
   <text name="TerrainDetailText">低</text>
-  <check_box label="アバターのハードウェアスキニング" name="AvatarVertexProgram" />
-  <check_box label="アバターの布" name="AvatarCloth" />
+
+  <check_box label="アバターの衣類" name="AvatarCloth" />
 
   <text name="ReflectionsText">水の反射：</text>
   <combo_box name="Reflections">
-    <combo_box.item label="無し：不透明" name="0" value="-2"/>
-    <combo_box.item label="無し・透過" name="0" value="-1"/>
-    <combo_box.item label="最小" name="0" value="0"/>
-    <combo_box.item label="地形と樹木" name="1" value="1"/>
-    <combo_box.item label="すべての静的オブジェクト" name="2" value="2"/>
-    <combo_box.item label="すべてのアバターとオブジェクト" name="3" value="3"/>
-    <combo_box.item label="すべて" name="4" value="4"/>
+    <combo_box.item label="無し；不透明" name="0" value="-2" />
+    <combo_box.item label="無し；透明" name="0" value="-1" />
+    <combo_box.item label="最小限" name="0" value="0" />
+    <combo_box.item label="地形と樹木" name="1" value="1" />
+    <combo_box.item label="すべての静止オブジェクト" name="2" value="2" />
+    <combo_box.item label="すべてのアバターとオブジェクト" name="3" value="3" />
+    <combo_box.item label="すべて" name="4" value="4" />
   </combo_box>
 
-  <check_box label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders" />
-  <slider label="空：" name="SkyMeshDetail" />
+  <check_box label="大気（周囲）シェーダー" name="WindLightUseAtmosShaders" />
 
+  <slider label="空：" name="SkyMeshDetail"/>
   <text name="SkyMeshDetailText">低</text>
+
   <check_box label="高度な光源モデル" name="UseLightShaders" />
+
   <check_box label="アンビエントオクルージョン" name="UseSSAO" />
-  <check_box label="被写体深度（DoF）" name="UseDoF" />
-  <text name="RenderShadowDetailText">影：</text>
 
+  <check_box label="被写界深度（DoF）" name="UseDoF" />
+
+  <!--
+  <check_box control_name="RenderUseAdvancedAtmospherics" label="Advanced Atmospherics" name="UseAdvancedAtmo" top_delta="16" width="240">
+    <check_box.commit_callback function="Pref.AdvancedAtmosphericsEnable" />
+  </check_box>
+  -->
+
+  <text name="RenderShadowDetailText">影：</text>
   <combo_box name="ShadowDetail">
     <combo_box.item label="なし" name="0" />
     <combo_box.item label="太陽／月" name="1" />
     <combo_box.item label="太陽／月＋プロジェクタ" name="2" />
   </combo_box>
-  <button label="推奨設定にリセット" name="Defaults" />
+
+  <!-- End of Advanced Settings block -->
+  <view_border name="horiz_border" />
+  <button label="推奨設定値にリセット" name="Defaults" />
+
   <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
+
   <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
+
+  <!-- These two check boxes are dummies and will never be displayed.  They are here so the control
+  variables
+are saved in a preset file. -->
   <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxComplexity" />
+
   <check_box label="RenderAvatarMaxNonImpostors" name="RenderAvatarMaxNonImpostors" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index fb6a65f812..10f4a61ca2 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -34,8 +34,8 @@
   </radio_group>
   <check_box label="アニメーションが完了するまで" name="wait_anim_check" />
   <check_box label="時間（秒）：" name="wait_time_check" />
-  <text name="help_label">待機ステップを入れない限りは、すべてのステップが同時に起こります。</text>
-  <check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーフレーズを使うか、ホットキーを押すと切り替わります。 1つのショートカットキーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。" />
+  <text name="help_label">待機ステップを入れていない場合、すべてのステップが同時に実行されます。</text>
+  <check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーとなる語句を入力するか、ホットキーを押すことで実行されます。通常、同じキーバインディングを使用するゼスチャーがある場合、そのゼスチャーは非アクティブになります。" />
   <button label="プレビュー" name="preview_btn" />
   <button label="保存" name="save_btn" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
index 6e6c0f355b..9ac84b9db7 100644
--- a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
@@ -1,63 +1,80 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Scene Load Statistics" title="シーンの読み込みの統計情報">
-  <button label="一時停止" name="playpause" />
+<floater name="Scene Load Statistics" title="シーン読み込みの統計情報">
   <scroll_container name="statistics_scroll">
     <container_view name="statistics_view">
-      <stat_view label="基本" name="basic">
-        <stat_bar label="フレームごとのピクセル差" name="frame difference" />
-        <stat_bar label="ＵＤＰデータの受信量" name="bandwidth" />
-        <stat_bar label="パケットロス" name="packet_loss" />
+      <!--Basic Section-->
+      <stat_view name="basic" label="基本">
+        <stat_bar label="フレームごとのピクセル差" name="frame difference" unit_label="％" />
+        <stat_bar label="ＵＤＰデータの受信量" name="bandwidth" unit_label="kbps" />
+        <stat_bar label="パケットロス" name="packet_loss" unit_label="％" />
       </stat_view>
-      <stat_view label="拡張" name="advanced">
-        <stat_view label="描画" name="render">
-          <stat_bar label="オブジェクト合計" name="objs" />
-          <stat_bar label="新規オブジェクト" name="newobjs" />
-          <stat_bar label="オブジェクトのキャッシュのヒット率" name="object_cache_hits" />
+      <!--Advanced Section-->
+      <stat_view name="advanced" label="拡張">
+        <stat_view name="render" label="描画">
+          <stat_bar name="objs" label="オブジェクト合計" />
+          <stat_bar name="newobjs" label="新しいオブジェクト" unit_label="／秒" />
+          <stat_bar name="object_cache_hits" label="オブジェクトのキャッシュのヒット率" unit_label="％" />
         </stat_view>
-        <stat_view label="テクスチャ" name="texture">
-          <stat_bar label="キャッシュのヒット率" name="texture_cache_hits" />
-          <stat_bar label="キャッシュの読み込みの遅延量" name="texture_cache_read_latency" />
-          <stat_bar label="カウント" name="numimagesstat" />
-          <stat_bar label="Raw カウント" name="numrawimagesstat" />
+        <!--Texture Stats-->
+        <stat_view name="texture" label="テクスチャ">
+          <stat_bar name="texture_cache_hits" label="キャッシュヒット率" unit_label="％" />
+          <stat_bar name="texture_cache_read_latency" label="キャッシュ読み込み遅延量" unit_label="秒" />
+          <stat_bar name="texture_decode_latency" label="キャッシュデコード遅延量" unit_label="秒" />
+          <stat_bar name="texture_decode_latency" label="キャッシュ書き込み遅延量" unit_label="秒" />
+          <stat_bar name="texture_fetch_latency" label="キャッシュ取得遅延量" unit_label="秒" />
+          <stat_bar name="texture_fetch_time" label="キャッシュ取得時間" unit_label="秒" />
+          <stat_bar name="numimagesstat" label="カウント" />
+          <stat_bar name="numrawimagesstat" label="Rawカウント" />
         </stat_view>
-        <stat_view label="ネットワーク" name="network">
-          <stat_bar label="受信パケット量" name="packetsinstat" />
-          <stat_bar label="送信パケット量" name="packetsoutstat" />
-          <stat_bar label="オブジェクト" name="objectdatareceived" />
-          <stat_bar label="テクスチャ" name="texturedatareceived" />
-          <stat_bar label="資産" name="assetudpdatareceived" />
-          <stat_bar label="レイヤー" name="layersdatareceived" />
-          <stat_bar label="実際の受信" name="messagedatain" />
-          <stat_bar label="実際の送信" name="messagedataout" />
+        <!--Network Stats-->
+        <stat_view name="network" label="ネットワーク">
+          <stat_bar name="packetsinstat" label="受信パケット量" unit_label="／秒" />
+          <stat_bar name="packetsoutstat" label="送信パケット量" unit_label="／秒" />
+          <stat_bar name="objectdatareceived" label="オブジェクト" unit_label="kbps" />
+          <stat_bar name="texturedatareceived" label="テスクチャ" unit_label="kbps" />
+          <stat_bar name="assetudpdatareceived" label="アセット" unit_label="kbps" />
+          <stat_bar name="layersdatareceived" label="レイヤー" unit_label="kbps" />
+          <stat_bar name="messagedatain" label="実効受信量" unit_label="kbps" />
+          <stat_bar name="messagedataout" label="実効送信量" unit_label="kbps" />
         </stat_view>
       </stat_view>
-      <stat_view label="シミュレーター" name="sim">
-        <stat_bar label="オブジェクト" name="simobjects" />
-        <stat_bar label="アクティブなオブジェクト" name="simactiveobjects" />
-        <stat_bar label="アクティブなスクリプト" name="simactivescripts" />
-        <stat_bar label="受信パケット" name="siminpps" />
-        <stat_bar label="送信パケット" name="simoutpps" />
-        <stat_bar label="保留中のダウンロード" name="simpendingdownloads" />
-        <stat_bar label="保留中のアップロード" name="simpendinguploads" />
-        <stat_bar label="未送信バイト合計" name="simtotalunackedbytes" />
-        <stat_view label="時間（㎳）" name="simperf">
-          <stat_bar label="フレーム時間合計" name="simframemsec" />
-          <stat_bar label="総時間数" name="simnetmsec" />
-          <stat_bar label="物理的作用時間" name="simsimphysicsmsec" />
-          <stat_bar label="シミュレーション時間" name="simsimothermsec" />
-          <stat_bar label="エージェント時間" name="simagentmsec" />
-          <stat_bar label="イメージ時間" name="simimagesmsec" />
-          <stat_bar label="スクリプト時間" name="simscriptmsec" />
-          <stat_bar label="余暇" name="simsparemsec" />
-          <stat_view label="時間の詳細（㎳）" name="timedetails">
-            <stat_bar label="物理効果の単位" name="simsimphysicsstepmsec" />
-            <stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec" />
-            <stat_bar label="他の物理効果" name="simsimphysicsothermsec" />
-            <stat_bar label="スリープ時間" name="simsleepmsec" />
-            <stat_bar label="ポンプ I/O" name="simpumpiomsec" />
+      <!--Sim Stats-->
+      <stat_view name="sim" label="シミュレーター">
+        <stat_bar name="simobjects" label="オブジェクト" />
+        <stat_bar name="simactiveobjects" label="アクティブなオブジェクト" />
+        <stat_bar name="simactivescripts" label="アクティブなスクリプト" />
+        <stat_bar name="siminpps" label="受信パケット" unit_label="pps" />
+        <stat_bar name="simoutpps" label="送信パケット" unit_label="pps" />
+        <stat_bar name="simpendingdownloads" label="保留中のダウンロード" />
+        <stat_bar name="simpendinguploads" label="保留中のアップロード" />
+        <stat_bar name="simtotalunackedbytes" label="未確認バイトの合計" unit_label="㎅" />
+        <stat_view name="simperf" label="時間（㎳）">
+          <stat_bar name="simframemsec" label="合計フレーム時間" unit_label="㎳" />
+          <stat_bar name="simnetmsec" label="ネット時間" unit_label="㎳" />
+          <stat_bar name="simsimphysicsmsec" label="物理作用時間" unit_label="㎳" />
+          <stat_bar name="simsimothermsec" label="シミュレーション時間" unit_label="㎳" />
+          <stat_bar name="simagentmsec" label="エージェント時間" unit_label="㎳" />
+          <stat_bar name="simimagesmsec" label="イメージ時間" unit_label="㎳" />
+          <stat_bar name="simscriptmsec" label="スクリプト時間" unit_label="㎳" />
+          <stat_bar name="simsparemsec" label="スペア時間" unit_label="㎳" />
+          <!--2nd level time blocks under 'Details' second-->
+          <stat_view name="timedetails" label="時間詳細（㎳）">
+            <stat_bar name="simsimphysicsstepmsec" label="　物理作用単位" unit_label="㎳" />
+            <stat_bar name="simsimphysicsshapeupdatemsec" label="　物理形状更新" unit_label="㎳" />
+            <stat_bar name="simsimphysicsothermsec" label="　他の物理作用" unit_label="㎳" />
+            <stat_bar name="simsleepmsec" label="　スリープ時間" unit_label="㎳" />
+            <stat_bar name="simpumpiomsec" label="　ポンプＩ／Ｏ" unit_label="㎳" />
           </stat_view>
         </stat_view>
       </stat_view>
+      <stat_view name="frame_stats" label="フレームの内訳">
+        <stat_bar name="scenery_frame_pct" label="景色" unit_label="％" />
+        <stat_bar name="avatar_frame_pct" label="アバター" unit_label="％" />
+        <stat_bar name="ui_frame_pct" label="ＵＩ" unit_label="％" />
+        <stat_bar name="huds_frame_pct" label="ＨＵＤ" unit_label="％" />
+        <stat_bar name="swap_frame_pct" label="スワップ" unit_label="％" />
+        <stat_bar name="idle_frame_pct" label="タスク" unit_label="％" />
+      </stat_view>
     </container_view>
   </scroll_container>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
index c2a448913f..8498e76095 100644
--- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_translation_settings" title="チャットの翻訳設定">
-  <string name="bing_api_key_not_verified">Bing appIDを認証できませんでした。もう一度お試しください。</string>
-  <string name="google_api_key_not_verified">Google APIキーを認証できませんでした。もう一度お試しください。</string>
-  <string name="bing_api_key_verified">Bing appIDが認証されました。</string>
+
+  <string name="azure_api_key_not_verified">Azureサービス識別子の認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。</string>
+  <string name="google_api_key_not_verified">Google APIキーの認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。</string>
+  <string name="deepl_api_key_not_verified">DeepL Authキーの認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。</string>
+
+  <string name="azure_api_key_verified">Azureサービス識別子が認証されました。</string>
   <string name="google_api_key_verified">Google APIキーが認証されました。</string>
-  <check_box label="チャット中の機械翻訳機能を有効にする" name="translate_chat_checkbox" />
+  <string name="deepl_api_key_verified">DeepL APIキーが認証されました。</string>
+
+  <check_box label="チャット時の機械翻訳機能を有効にする" name="translate_chat_checkbox" />
   <text name="translate_language_label">翻訳する言語：</text>
   <combo_box name="translate_language_combo">
     <combo_box.item label="システム標準" name="System Default Language" />
     <combo_box.item label="英語" name="English" />
+    <!-- After "System Default" and "English", please keep the rest of these combo_box.items in alphabetical order by the first character in the string. -->
     <combo_box.item label="Dansk（デンマーク語）" name="Danish" />
     <combo_box.item label="Deutsch（ドイツ語）" name="German" />
     <combo_box.item label="Español（スペイン語）" name="Spanish" />
@@ -25,16 +31,53 @@
     <combo_box.item label="日本語（日本語）" name="Japanese" />
     <combo_box.item label="한국어（韓国語）" name="Korean" />
   </combo_box>
+
   <text name="tip">翻訳サービスを選択してください：</text>
+
   <radio_group name="translation_service_rg">
-    <radio_item initial_value="bing" label="Bing Translator" name="bing" />
-    <radio_item initial_value="google" label="Google Translate" name="google" />
+    <radio_item initial_value="azure" label="Azure翻訳" name="azure" />
+    <radio_item initial_value="google" label="Google翻訳" name="google" />
+    <radio_item initial_value="deepl" label="DeepL翻訳" name="deepl" />
   </radio_group>
-  <text name="bing_api_key_label">Bing AppID[http://www.bing.com/developers/createapp.aspx AppID]：</text>
-  <button label="認証" name="verify_bing_api_key_btn" />
-  <text name="google_api_key_label">Google API key[http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]：</text>
+
+  <text name="azure_links_text">[https://learn.microsoft.com/ja-jp/azure/cognitive-services/translator/create-translator-resource セットアップ]</text>
+
+  <text name="azure_api_endoint_label">エンドポイント：</text>
+
+  <combo_box name="azure_api_endpoint_combo" value="https://api.cognitive.microsofttranslator.com">
+    <combo_box.item label="https://api.cognitive.microsofttranslator.com" name="global" value="https://api.cognitive.microsofttranslator.com" />
+    <combo_box.item label="https://api-apc.cognitive.microsofttranslator.com" name="api-apc" value="https://api-apc.cognitive.microsofttranslator.com" />
+    <combo_box.item label="https://api-eur.cognitive.microsofttranslator.com" name="api-eur" value="https://api-eur.cognitive.microsofttranslator.com" />
+    <combo_box.item label="https://api-nam.cognitive.microsofttranslator.com" name="api-nam" value="https://api-nam.cognitive.microsofttranslator.com" />
+  </combo_box>
+
+  <text name="azure_api_key_label">Azureキー：</text>
+  <line_editor default_text="翻訳キーを入力して「確認」ボタンをクリックしてください。" name="azure_api_key" />
+  <text name="azure_api_region_label">地域：</text>
+  <line_editor default_text="グローバルサービスの場合は空のままにすることができます。" />
+  <button label="認証" name="verify_azure_api_key_btn" />
+
+  <text name="google_api_key_label">Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth APIキー]：</text>
+  <line_editor default_text="Google APIキーを入力して「確認」ボタンをクリックしてください。" name="google_api_key" />
   <button label="認証" name="verify_google_api_key_btn" />
-  <text name="google_links_text">[http://code.google.com/apis/language/translate/v2/pricing.html 価格]|[https://code.google.com/apis/console 統計]</text>
-  <button label="ＯＫ" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
+
+  <text name="google_links_text">[http://code.google.com/apis/language/translate/v2/pricing.html 価格]｜[https://code.google.com/apis/console 統計]</text>
+
+  <text name="deepl_api_domain_label">エンドポイント：</text>
+
+  <combo_box name="deepl_api_domain_combo" value="https://api-free.deepl.com">
+    <combo_box.item label="DeepL無料版" name="global" value="https://api-free.deepl.com" />
+    <combo_box.item label="DeepL Pro" name="api-apc" value="https://api.deepl.com" />
+  </combo_box>
+
+  <text name="deepl_api_key_label">DeepL APIキー：</text>
+
+  <line_editor default_text="DeepL APIのキーを入力して「認証」をクリックしてください。" name="deepl_api_key" />
+
+  <button label="認証" name="verify_deepl_api_key_btn" />
+
+  <text name="deepl_links_text">[https://www.deepl.com/pro/select-country?cta=header-prices 価格]</text>
+
+  <button label=" ＯＫ" name=" ok_btn" />
+  <button label=" キャンセル" name=" cancel_btn" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 4f5d1c61de..6dd6b486a7 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -1,27 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: See also menu_avatar_other.xml -->
-<context_menu name="Avatar Pie">
-  <menu_item_call label="プロフィール…" name="Profile..." />
-  <menu_item_call label="フレンド登録" name="Add Friend" />
-  <menu_item_call label="IMのやり取り…" name="Send IM..." />
-  <menu_item_call label="呼び出し" name="Call" />
-  <menu_item_call label="グループに招待…" name="Invite..." />
-  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
-  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
-  <menu_item_call label="ブロック" name="Avatar Mute" />
-  <menu_item_call label="報告" name="abuse" />
-  <menu_item_call label="フリーズ…" name="Freeze..." />
-  <menu_item_call label="追放" name="Eject..." />
-  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
-  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
-  <menu_item_call label="ズームイン" name="Zoom In" />
-  <menu_item_call label="支払う…" name="Pay..." />
-  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
-  <context_menu label="アバターを描画" name="Render Avatar">
-    <menu_item_check label="デフォルト" name="RenderNormally" />
-    <menu_item_check label="常に使用する" name="AlwaysRenderFully" />
-    <menu_item_check label="使用しない" name="DoNotRender" />
-    <menu_item_call label="例外…" name="RenderExceptions" />
-  </context_menu>
-  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_avatar_other.xml -->
+<context_menu name="Avatar Pie">
+  <menu_item_call label="プロフィールを見る" name="Profile..." />
+  <menu_item_call label="フレンドに追加" name="Add Friend" />
+  <menu_item_call label="ＩＭ" name="Send IM..." />
+  <menu_item_call label="コール" name="Call" />
+  <menu_item_call label="グループに招待…" name="Invite..." />
+  <menu_item_separator />
+
+  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+
+  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
+
+  <menu_item_separator />
+  <menu_item_call label="ブロック" name="Avatar Mute"/>
+  <menu_item_call label="報告" name="abuse"/>
+  <menu_item_call label="フリーズ" name="Freeze..."/>
+  <menu_item_call label="追放" name="Eject..."/>
+  <menu_item_call label="テクスチャのデバッグ" name="Debug..." />
+  <menu_item_call label="ＸＭＬとしてダンプ" name="Dump XML"/>
+  <menu_item_call label="ズームイン" name="Zoom In" />
+  <menu_item_call label="支払う" name="Pay..."/>
+  <menu_item_separator />
+  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
+
+  <menu_item_separator />
+  <context_menu label="アバターを描画" name="Render Avatar">
+    <menu_item_check name="常に完全描画する" label="Always full detail"/>
+    <menu_item_check name="描画しない" label="Never full detail"/>
+    <menu_item_call name="通常の描画設定" label="Remove from exceptions"/>
+    <menu_item_separator />
+    <menu_item_call label="例外…" name="RenderExceptions" />
+  </context_menu>
+  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index 8a691467a8..237d66c54d 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -1,26 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Avatar Pie">
-  <menu_item_call label="プロフィール…" name="Profile..." />
-  <menu_item_call label="フレンド登録" name="Add Friend" />
-  <menu_item_call label="IMのやり取り…" name="Send IM..." />
-  <menu_item_call label="コール" name="Call" />
-  <menu_item_call label="グループへ招待…" name="Invite..." />
+  <menu_item_call label="プロフィールを見る" name="Profile..."/>
+  <menu_item_call label="フレンドに追加" name="Add Friend"/>
+  <menu_item_call label="ＩＭ" name="Send IM..."/>
+  <menu_item_call label="コール" name="Call"/>
+  <menu_item_call label="グループへ招待" name="Invite..." />
+
+  <menu_item_separator />
+
   <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
+
   <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
-  <menu_item_call label="ブロック" name="Avatar Mute" />
-  <menu_item_call label="報告" name="abuse" />
-  <menu_item_call label="フリーズ…" name="Freeze..." />
-  <menu_item_call label="追放…" name="Eject..." />
+
+  <menu_item_separator />
+
+  <menu_item_call label="ブロック" name="Avatar Mute"/>
+  <menu_item_call label="報告" name="abuse"/>
+  <menu_item_call label="フリーズ" name="Freeze..."/>
+  <menu_item_call label="追放" name="Eject..."/>
   <menu_item_call label="テクスチャのデバッグ" name="Debug..." />
-  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
+  <menu_item_call label="ＸＭＬとしてダンプ" name="Dump XML"/>
   <menu_item_call label="ズームイン" name="Zoom In" />
-  <menu_item_call label="支払う…" name="Pay..." />
-  <context_menu label="アバターを描画" name="Render Avatar">
-    <menu_item_check label="デフォルト" name="RenderNormally" />
-    <menu_item_check label="常に使用する" name="AlwaysRenderFully" />
-    <menu_item_check label="使用しない" name="DoNotRender" />
+  <menu_item_call label="支払う" name="Pay..."/>
+
+  <menu_item_separator />
+
+  <context_menu label="このアバターの描画" name="Render Avatar">
+    <menu_item_check name="常に完全描画する" label="Always full detail"/>
+    <menu_item_check name="描画しない" label="Never full detail"/>
+    <menu_item_call name="通常の描画設定" label="Remove from exceptions"/>
+    <menu_item_separator />
     <menu_item_call label="例外…" name="RenderExceptions" />
   </context_menu>
+
   <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
index 0b60751bb3..0205564756 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Settings">
-  <menu_item_check label="デフォルト" name="default" />
   <menu_item_check label="常に描画" name="always_render" />
   <menu_item_check label="描画しない" name="never_render" />
+  <menu_item_check label="例外から削除" name="default" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
index eb696ec534..65f7fae6bd 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_add.xml">
-  <menu_item_call label="常に住人を描画する…" name="add_avatar_always_render" />
-  <menu_item_call label="住人を描画しない…" name="add_avatar_never_render" />
+  <!-- TODO:翻訳は正しいが整合性が取れていない -->
+  <menu_item_call label="常に詳細まで全て描画…" name="add_avatar_always_render" />
+  <menu_item_call label="詳細まで全て描画しない…" name="add_avatar_never_render" />
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 35e4db743b..cc5bed8331 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
   <menu label="私" name="Me">
     <menu_item_call label="プロフィール…" name="Profile" />
@@ -10,11 +10,12 @@
     <menu_item_call label="カメラコントロール…" name="Camera Controls" />
 
     <menu_item_separator />
-    <menu_item_check label="一時退席中" name="Away" />
-    <menu_item_check label="着信拒否" name="Do Not Disturb" />
+    <menu_item_check name="Away" label="一時退席中" />
+    <menu_item_check name="Do Not Disturb" label="着信拒否" />
 
     <menu_item_separator />
-    <!-- L$は空白になってしまうため翻訳を変更 -->
+
+    <!-- L$が空白になってしまうため翻訳を変更 -->
     <menu_item_call label="リンデンドルの購入…" name="Buy and Sell L$" />
     <menu_item_call label="マーケットプレイスのリスト…" name="MarketplaceListings" />
     <menu_item_call label="アカウントのダッシュボード…" name="Manage My Account" />
@@ -28,9 +29,9 @@
     <menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H" />
 
     <menu_item_separator />
+
     <menu_item_call label="[APP_NAME]の終了" name="Quit" />
   </menu>
-
   <menu label="アバター" name="Avatar">
     <menu_item_call label="着用中…" name="NowWearing" />
     <menu_item_call label="アウトフィット…" name="ChangeOutfit" />
@@ -54,15 +55,15 @@
         <menu_item_separator />
         <menu_item_call label="すべての服装" name="All Clothes" />
       </menu>
-      <menu label="HUD" name="Avatar Detach HUD" />
-      <menu label="取り外し" name="Avatar Detach" />
+      <menu label="ＨＵＤ" name="Avatar Detach HUD" />
+      <menu label="取り外す" name="Avatar Detach" />
       <menu_item_call label="全てを取り外す" name="Detach All" />
     </menu>
     <menu_item_separator />
     <menu_item_call label="アバターを選択…" name="Avatar Picker" />
     <menu_item_separator />
 
-    <menu_item_call label="座る／立つ" shortcut="alt|shift|S" name="Sit stand" />
+    <menu_item_call label="座る／立つ" name="Sit stand" />
     <menu_item_call label="飛行／歩行" name="Fly land" shortcut="HOME" />
     <menu_item_call label="アニメーション停止" name="Stop Animating My Avatar" />
     <menu_item_check label="歩行／走行／飛行…" name="WalkRunFly" />
@@ -78,21 +79,20 @@
   </menu>
   <menu label="コミュニケーション" name="Communicate">
     <menu_item_check label="会話…" name="Conversations" />
-    <menu_item_check label="近くのチャット…" name="Nearby Chat" />
+    <menu_item_check label="近隣のチャット…" name="Nearby Chat" />
     <menu_item_check label="ボイスチャット" name="Speak" />
-    <menu_item_check label="会話ログ…" name="Conversation Log..." />
-    <menu label="ボイスモーフィング" name="VoiceMorphing">
-      <menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing" />
-      <menu_item_check label="プレビュー…" name="Preview" />
-      <menu_item_call label="申し込む…" name="Subscribe" />
-      <menu_item_call label="プレミアム会員特典…" name="PremiumPerk" />
-    </menu>
+    <menu_item_check name="Conversation Log..." label="会話ログ…" />
+    <menu_item_separator />
+    <menu label="ボイスモーフィング" name="VoiceMorphing" />
     <menu_item_check label="ジェスチャー…" name="Gestures" />
+    <menu_item_separator />
     <menu_item_check label="フレンド" name="My Friends" />
     <menu_item_check label="グループ" name="My Groups" />
     <menu_item_check label="近くにいる人物" name="Active Speakers" />
-    <menu_item_check label="リストをブロック" name="Block List" />
+    <menu_item_check label="ブロックリスト" name="Block List" />
+    <menu_item_separator />
     <menu_item_check label="着信拒否" name="Do Not Disturb" />
+
   </menu>
   <menu label="ワールド" name="World">
     <menu_item_call label="現在地をランドマーク" name="Create Landmark Here" />
@@ -107,9 +107,9 @@
     <menu_item_separator />
     <menu_item_call label="スナップショット" name="Take Snapshot" />
 
-    <menu_item_call label="360度スナップショット" name="Capture 360" />
-    <menu_item_call label="場所のプロフィール" name="Place Profile" />
+    <menu_item_call label="３６０度スナップショット" name="Capture 360" />
     <menu_item_separator />
+    <menu_item_call label="場所のプロフィール" name="Place Profile" />
     <menu_item_call label="土地情報" name="About Land" />
     <menu_item_call label="リージョン（地域）／不動産" name="RegionEstate" />
     <menu_item_call label="自分のLindenホーム…" name="Linden Home" />
@@ -121,18 +121,18 @@
     <menu label="表示" name="LandShow">
       <menu_item_check label="立入禁止ライン" name="Ban Lines" />
       <menu_item_check label="ビーコン（標識）" name="beacons" />
-      <menu_item_check label="敷地の境界線" name="Property Lines" />
+      <menu_item_check label="敷地境界線" name="Property Lines" />
       <menu_item_check label="土地所有者" name="Land Owners" />
       <menu_item_check label="座標" name="Coordinates" />
       <menu_item_check label="区画のプロパティ" name="Parcel Properties" />
       <menu_item_separator />
       <menu_item_check label="拡張メニュー" name="Show Advanced Menu" />
     </menu>
-
+    <menu_item_check label="グラフィック性能の最適化…" name="Performance" />
+    <menu_item_separator />
     <!--
-    <menu_item_separator/>
-      <menu_item_check label="ナビゲーションバーを表示" name="ShowNavbarNavigationPanel"/>
-      <menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
+    <menu_item_check label="ナビゲーションバーを表示" name="ShowNavbarNavigationPanel"/>
+    <menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
     <menu_item_separator/>
     -->
 
@@ -142,28 +142,31 @@
       <menu_item_check label="夕方" name="Sunset" />
       <menu_item_check label="深夜" name="Midnight" />
       <menu_item_check label="共有された環境を使用" name="Use Shared Environment" />
+      <menu_item_separator />
       <menu_item_call label="自分の環境…" name="my_environs" />
-      <menu_item_call label="個人的な照明…" name="adjustment_tool" />
-      <menu_item_check label="雲を一時停止" name="pause_clouds" />
-    </menu>
-  </menu>
 
-  <!--
-  <menu create_jump_keys="true" label="環境編集" name="Environment Editor" tear_off="true">
-    <menu_item_call label="初期設定…" name="Environment Settings"/>
-    <menu_item_separator/>
-    <menu name="Water Presets" label="水のプリセット"/>
-    <menu name="Sky Presets" label="空のプリセット">
-      <menu_item_call label="新規プリセット…" name="new_sky_preset"/>
-      <menu_item_call label="プリセット編集…" name="edit_sky_preset"/>
+      <menu_item_call label="自分の光源…" name="adjustment_tool" />
+      <menu_item_separator />
+      <menu_item_check label="雲の動きを一時停止" name="pause_clouds" />
     </menu>
-    <menu name="Day Presets" label="日のプリセット">
-      <menu_item_call label="新規プリセット…" name="new_day_preset"/>
-      <menu_item_call label="プリセット編集…" name="edit_day_preset"/>
+
+    <!--
+    <menu create_jump_keys="true" label="環境編集" name="Environment Editor" tear_off="true">
+      <menu_item_call label="初期設定…" name="Environment Settings"/>
+      <menu_item_separator/>
+      <menu name="Water Presets" label="水のプリセット"/>
+      <menu name="Sky Presets" label="空のプリセット">
+        <menu_item_call label="新規プリセット…" name="new_sky_preset"/>
+        <menu_item_call label="プリセット編集…" name="edit_sky_preset"/>
+      </menu>
+      <menu name="Day Presets" label="一日のプリセット">
+        <menu_item_call label="新規プリセット…" name="new_day_preset"/>
+        <menu_item_call label="プリセット編集…" name="edit_day_preset"/>
+      </menu>
     </menu>
-  </menu>
-  -->
+    -->
 
+  </menu>
   <menu label="制作" name="BuildTools">
     <menu_item_check label="制作" name="Show Build Tools" />
     <menu label="制作ツールを選択する" name="Select Tool">
@@ -175,7 +178,7 @@
     </menu>
     <menu_item_call label="リンク" name="Link" />
     <menu_item_call label="リンク解除" name="Unlink" />
-    <menu_item_check label="リンク部分を編集" name="Edit Linked Parts" />
+    <menu_item_check label="リンクされた部分の編集" name="Edit Linked Parts" />
     <menu label="要素を選択" name="Select Elements">
       <menu_item_call label="次のパーツまたは面を選択" name="Select Next Part or Face" />
       <menu_item_call label="前のパーツまたは面を選択" name="Select Previous Part or Face" />
@@ -184,9 +187,12 @@
     </menu>
     <menu_item_call label="リージョン（地域）オブジェクト" name="pathfinding_linkset_menu_item" />
     <menu_item_separator />
+
     <menu_item_call label="選択をフォーカス" name="Focus on Selection" />
     <menu_item_call label="選択をズーム" name="Zoom to Selection" />
+
     <menu_item_separator />
+
     <menu label="オブジェクト" name="Object">
       <menu_item_call label="購入" name="Menu Object Buy" />
       <menu_item_call label="取得" name="Menu Object Take" />
@@ -235,6 +241,7 @@
       <menu_item_check label="グリッド吸着" name="Snap to Grid" />
       <menu_item_call label="オブジェクトのＸＹ軸をグリッドに吸着" name="Snap Object XY to Grid" />
       <menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid" />
+      <menu_item_separator />
       <menu_item_call label="グリッドオプション…" name="Grid Options" />
       <menu_item_call label="デフォルトの権限設定…" name="Set default permissions" />
     </menu>
@@ -242,66 +249,75 @@
       <menu_item_call label="画像（L$ [COST]）…" name="Upload Image" />
       <menu_item_call label="サウンド（L$ [COST]）…" name="Upload Sound" />
       <menu_item_call label="アニメーション（L$ [COST]）…" name="Upload Animation" />
-      <menu_item_call label="モデル" name="Upload Model" />
-      <menu_item_call label="一括 （ファイルにつきL$ [COST]）…" name="Bulk Upload" />
+      <menu_item_call label="モデル…" name="Upload Model" />
+      <menu_item_call label="一括…" name="Bulk Upload" />
     </menu>
     <menu_item_separator />
     <menu_item_call label="取り消し" name="Undo" />
     <menu_item_call label="やり直し" name="Redo" />
   </menu>
   <menu label="ヘルプ" name="Help">
-    <menu_item_call label="ハウツー…" name="How To" />
-    <!-- <menu_item_call label="チュートリアル" name="Tutorial" /> -->
+    <menu_item_call label="ガイドブック" name="How To" />
+    <!--
+    <menu_item_call label="チュートリアル" name="Tutorial" />
+    -->
+    <menu_item_separator />
     <menu_item_call label="ナレッジベース" name="Knowledge Base" />
     <menu_item_call label="Wiki" name="Wiki" />
     <menu_item_call label="コミュニティフォーラム" name="Community Forums" />
-    <menu_item_call label="日本語サポートページ" name="Support portal" />
+    <menu_item_call label="サポートページ" name="Support portal" />
     <menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News" />
     <menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs" />
     <menu_item_separator />
 
     <menu_item_call label="嫌がらせを報告する" name="Report Abuse" />
     <menu_item_call label="バグを報告する" name="Report Bug" />
-    <menu_item_separator />
 
+    <menu_item_separator />
     <menu_item_call label="衝突・プッシュ＆打撃" name="Bumps, Pushes &amp;amp; Hits" />
     <menu_item_call label="[APP_NAME]について" name="About Second Life" />
   </menu>
   <menu label="拡張" name="Advanced">
     <menu_item_call label="テクスチャをリベークする" name="Rebake Texture" />
-    <menu_item_call label="UIサイズをデフォルトにする" name="Set UI Size to Default" />
+    <menu_item_call label="ＵＩサイズをデフォルトにする" name="Set UI Size to Default" />
     <menu_item_call label="ウィンドウサイズ設定…" name="Set Window Size..." />
 
     <menu_item_separator />
 
-    <menu_item_check label="遠くのオブジェクトを選択しない" name="Limit Select Distance" />
+    <menu_item_check label="オブジェクトの選択距離の制限" name="Limit Select Distance" />
     <menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance" />
 
     <menu_item_separator />
 
+    <menu_item_check label="高解像度スナップショット" name="HighResSnapshot" />
+    <menu_item_check label="スナップショットをディスクに保存" name="QuietSnapshotsToDisk" />
+
+    <menu_item_separator />
+
     <menu label="パフォーマンスツール" name="Performance Tools">
       <menu_item_call label="遅延メーター" name="Lag Meter" />
       <menu_item_check label="統計バー" name="Statistics Bar" />
       <menu_item_call label="シーン負荷の統計情報" name="Scene Load Statistics" />
-      <menu_item_check label="アバターの複雑さ情報を表示" name="Avatar Draw Info" />
+      <menu_item_check label="アバターの複雑度を表示" name="Avatar Draw Info" />
     </menu>
     <menu label="ハイライトと表示" name="Highlighting and Visibility">
       <menu_item_check label="ビーコンを簡素化" name="Cheesy Beacon" />
       <menu_item_check label="パーティクルを非表示" name="Hide Particles" />
       <menu_item_check label="選択を非表示" name="Hide Selected" />
       <menu_item_check label="透明部分をハイライト" name="Highlight Transparent" />
-      <menu_item_check label="一人称視点のときに十字線を表示" name="ShowCrosshairs" />
-      <!--
+      <menu_item_check label="マウスルックのときに十字線を表示" name="ShowCrosshairs" />
+      <!-- 
       <menu create_jump_keys="true" label="ホバーでTips表示" name="Hover Tips" tear_off="true">
         <menu_item_check label="Tips表示" name="Show Tips" shortcut="control|shift|T"/>
 
-        <menu_item_separator/>
+        <menu_item_separator />
 
         <menu_item_check label="土地のツールチップを表示" name="Land Tips"/>
         <menu_item_check label="すべてのオブジェクトのツールチップを表示" name="Tips On All Objects"/>
       </menu>
       -->
     </menu>
+
     <menu label="レンダリング種別" name="Rendering Types">
       <menu_item_check label="シンプル" name="Rendering Type Simple" />
       <menu_item_check label="アルファ" name="Rendering Type Alpha" />
@@ -319,7 +335,7 @@
       <menu_item_check label="衝突" name="Rendering Type Bump" />
     </menu>
     <menu label="レンダリング機能" name="Rendering Features">
-      <menu_item_check label="UI" name="ToggleUI" />
+      <menu_item_check label="ＵＩ" name="ToggleUI" />
       <menu_item_check label="選択済" name="Selected" />
       <menu_item_check label="ハイライト" name="Highlighted" />
       <menu_item_check label="動的テクスチャ" name="Dynamic Textures" />
@@ -332,7 +348,6 @@
     <menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache" />
     <menu_item_check label="マウスの平滑化" name="Mouse Smoothing" />
     <menu_item_call label="リリースキー" name="Release Keys" />
-
     <menu_item_separator />
 
     <menu label="ショートカット" name="Shortcuts">
@@ -348,7 +363,7 @@
 
       <menu_item_call label="マウスルック" name="Mouselook" />
       <menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam" />
-      <menu_item_call label="表示をリセットする" name="Reset View" />
+      <menu_item_call label="視界をリセット" name="Reset View" />
       <menu_item_call label="最後の発言者を見る" name="Look at Last Chatter" />
 
       <menu_item_separator />
@@ -358,11 +373,12 @@
       <menu_item_call label="ズーム・アウト" name="Zoom Out" />
     </menu>
     <!--Shortcuts-->
-    <menu_item_call label="デバッグ設定を表示する" name="Debug Settings" />
-    <menu_item_check label="開発メニューを表示する" name="Debug Mode" />
-  </menu>
 
+    <menu_item_separator />
 
+    <menu_item_call label="デバッグ設定を表示" name="Debug Settings" />
+    <menu_item_check label="開発メニューを表示" name="Debug Mode" />
+  </menu>
   <menu label="開発" name="Develop">
     <menu label="コンソール" name="Consoles">
       <menu_item_check label="テクスチャのコンソール" name="Texture Console" />
@@ -385,7 +401,7 @@
 
       <menu_item_check label="カメラ" name="Camera" />
       <menu_item_check label="風" name="Wind" />
-      <menu_item_check label="FOV" name="FOV" />
+      <menu_item_check label="ＦＯＶ" name="FOV" />
       <menu_item_check label="バッジ" name="Badge" />
     </menu>
     <menu label="情報を表示" name="Display Info">
@@ -400,15 +416,21 @@
 
       <menu_item_separator />
 
-      <menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates" />
+      <menu_item_check label="オブジェクトの更新を表示する" name="Show Updates" />
     </menu>
+
+    <menu_item_separator />
+
     <menu label="エラー実行" name="Force Errors">
       <menu_item_call label="ブレークポイント" name="Force Breakpoint" />
       <menu_item_call label="LLErrorとクラッシュを実行する" name="Force LLError And Crash" />
       <menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access" />
+      <menu_item_call label="コルーチン内で不正なメモリアクセスを発生させる" name="Force Bad Memory Access in Coroutine" />
       <menu_item_call label="無限ループ" name="Force Infinite Loop" />
-      <menu_item_call label="ドライバのクラッシュを実行する" name="Force Driver Carsh" />
-      <menu_item_call label="ソフトウェア例外エラーの実行する" name="Force Software Exception" />
+      <menu_item_call label="ドライバのクラッシュを発生させる" name="Force Driver Carsh" />
+      <menu_item_call label="ソフトウェア例外エラーの発生させる" name="Force Software Exception" />
+      <menu_item_call label="コルーチン内でクラッシュを発生させる" name="Force a Crash in a Coroutine" />
+      <menu_item_call label="スレッド内でクラッシュを発生させる" name="Force a Crash in a Thread" />
       <menu_item_call label="ビューアーの接続遮断を実行する" name="Force Disconnect Viewer" />
       <menu_item_call label="メモリリークをシミュレートする" name="Memory Leaking Simulation" />
     </menu>
@@ -417,7 +439,7 @@
       <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate" />
       <menu_item_check label="周期的な遅いフレーム" name="Periodic Slow Frame" />
       <menu_item_check label="フレームテスト" name="Frame Test" />
-      <menu_item_call label="フレームプロフィール" name="Frame Profile" />
+      <menu_item_call label="フレームのプロフィール" name="Frame Profile" />
       <menu_item_call label="ベンチマーク" name="Benchmark" />
     </menu>
     <menu label="メタデータの描画" name="Render Metadata">
@@ -433,7 +455,7 @@
       <menu_item_check label="テクスチャ優先度" name="Texture Priority" />
       <menu_item_check label="テクスチャの範囲" name="Texture Area" />
       <menu_item_check label="側面" name="Face Area" />
-      <menu_item_check label="LOD情報" name="LOD Info" />
+      <menu_item_check label="ＬＯＤ情報" name="LOD Info" />
       <menu_item_check label="三角形の数" name="Triangle Count" />
       <menu_item_check label="制作・キュー" name="Build Queue" />
       <menu_item_check label="光" name="Lights" />
@@ -444,10 +466,10 @@
       <menu_item_check label="風のベクトル" name="Wind Vectors" />
       <menu_item_check label="彫刻" name="Sculpt" />
       <menu label="テクスチャの密度" name="Texture Density">
-        <menu_item_check label="なし" name="None" />
-        <menu_item_check label="現在" name="Current" />
+        <menu_item_check label="無し" name="None" />
+        <menu_item_check label="原行" name="Current" />
         <menu_item_check label="望ましい" name="Desired" />
-        <menu_item_check label="完全" name="Full" />
+        <menu_item_check label="全て" name="Full" />
       </menu>
     </menu>
     <menu label="レンダリング" name="Rendering">
@@ -460,11 +482,11 @@
       <menu_item_separator />
 
       <menu_item_check label="高度な光源モデル" name="Advanced Lighting Model" />
-      <menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors" />
-      <menu_item_check label="SSAOと影の平滑化" name="SSAO and Shadow Smoothing" />
+      <menu_item_check label="　太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors" />
+      <menu_item_check label="　SSAOと影のスムージング" name="SSAO and Shadow Smoothing" />
       <menu_item_separator />
 
-      <menu_item_check label="次回起動時にGLをデバッグ" name="Debug GL" />
+      <menu_item_check label="次回起動時にＧＬをデバッグ" name="Debug GL" />
       <menu_item_check label="パイプラインをデバッグ" name="Debug Pipeline" />
       <menu_item_check label="自動アルファマスク（遅延）" name="Automatic Alpha Masks (deferred)" />
       <menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)" />
@@ -479,7 +501,8 @@
       <menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects" />
       <menu_item_separator />
 
-      <menu_item_call label="キャッシュをすぐにクリア" name="Cache Clear" />
+      <menu_item_call label="キャッシュを直ちにクリア" name="Cache Clear" />
+
     </menu>
 
     <menu label="ネットワーク" name="Network">
@@ -492,8 +515,8 @@
 
       <menu_item_separator />
 
-      <menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects" />
-      <menu_item_check label="挿入されたオブジェクトの位置のPing" name="Ping Interpolate Object Positions" />
+      <menu_item_check label="速度補間オブジェクト" name="Velocity Interpolate Objects" />
+      <menu_item_check label="速度補間オブジェクトへPing" name="Ping Interpolate Object Positions" />
 
       <menu_item_separator />
 
@@ -522,10 +545,8 @@
 
       <menu_item_call label="関心リスト：フルアップデート" name="Interest List: Full Update" />
     </menu>
-    <menu label="UI" name="UI">
+    <menu label="ＵＩ" name="UI">
       <menu_item_call label="メディアブラウザ" name="Media Browser" />
-      <menu_item_call label="FB接続テスト" name="FB Connect Test" />
-      <menu_item_call label="SelectMgrをダンプ" name="Dump SelectMgr" />
       <menu_item_call label="インベントリの出力" name="Dump Inventory" />
       <menu_item_call label="タイマーをダンプ" name="Dump Timers" />
       <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder" />
@@ -541,11 +562,11 @@
       <menu_item_check label="デバッグキー" name="Debug Keys" />
       <menu_item_check label="WindowProcのデバッグ" name="Debug WindowProc" />
     </menu>
-    <menu label="XUI" name="XUI">
+    <menu label="ＸＵＩ" name="XUI">
       <menu_item_call label="色の設定をリロード" name="Reload Color Settings" />
       <menu_item_call label="フォントテストを表示" name="Show Font Test" />
-      <menu_item_check label="XUI名を表示" name="Show XUI Names" />
-      <menu_item_call label="テストIMを送信する" name="Send Test IMs" />
+      <menu_item_check label="ＸＵＩ名を表示" name="Show XUI Names" />
+      <menu_item_call label="テストＩＭを送信する" name="Send Test IMs" />
       <menu_item_call label="名前キャッシュをフラッシュ" name="Flush Names Caches" />
     </menu>
     <menu label="アバター" name="Character">
@@ -574,7 +595,7 @@
       <menu_item_check label="見ているものを表示する" name="Show Look At" />
       <menu_item_check label="クリックした場所を表示する" name="Show Point At" />
       <menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates" />
-      <menu_item_check label="LODを無効にする" name="Disable LOD" />
+      <menu_item_check label="ＬＯＤを無効にする" name="Disable LOD" />
       <menu_item_check label="キャラクターVisのデバッグ" name="Debug Character Vis" />
       <menu_item_check label="スケルトンの衝突判定を表示する" name="Show Collision Skeleton" />
       <menu_item_check label="ボーンを表示" name="Show Bones" />
@@ -590,7 +611,7 @@
 
     <menu_item_separator />
 
-    <menu_item_check label="HTTPテスクチャ" name="HTTP Textures" />
+    <menu_item_check label="ＨＴＴＰテスクチャ" name="HTTP Textures" />
     <menu_item_call label="圧縮画像" name="Compress Images" />
     <menu_item_call label="圧縮ファイルテスト" name="Compress File Test" />
 
@@ -619,7 +640,7 @@
       <menu_item_call label="所有者権限の実行" name="Force Owner Permissive" />
       <menu_item_call label="削除" name="Delete" />
       <menu_item_call label="ロック" name="Lock" />
-      <menu_item_call label="アセットのIDを取得" name="Get Assets IDs" />
+      <menu_item_call label="アセットのＩＤを取得" name="Get Assets IDs" />
     </menu>
     <menu label="区画" name="Parcel">
       <menu_item_call label="自分を所有者にする" name="Owner To Me" />
@@ -630,9 +651,9 @@
       <menu_item_call label="一時アセットデータのダンプ" name="Dump Temp Asset Data" />
       <menu_item_call label="リージョンの状態を保存する" name="Save Region State" />
     </menu>
-    <menu_item_call label="神のツール" name="God Tools" />
+    <menu_item_call label="ゴッド・ツール" name="God Tools" />
   </menu>
-  <menu label="管理者" name="Deprecated">
+  <menu label="管理" name="Deprecated">
     <menu label="オブジェクトを取り付ける" name="Attach Object" />
     <menu label="オブジェクトを取り外す" name="Detach Object" />
     <menu label="服装を脱ぐ" name="Take Off Clothing">
@@ -654,7 +675,7 @@
     <menu label="ヘルプ" name="DeprecatedHelp">
       <menu_item_call label="リンデン公式ブログ" name="Official Linden Blog" />
       <menu_item_call label="スクリプトポータル" name="Scripting Portal" />
-      <menu label="バグの報告" name="Bug Reporting">
+      <menu label="バグ報告" name="Bug Reporting">
         <menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker" />
         <menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help" />
 
@@ -662,7 +683,7 @@
 
         <menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101" />
         <menu_item_call label="セキュリティ問題" name="Security Issues" />
-        <menu_item_call label="QA Wiki" name="QA Wiki" />
+        <menu_item_call label="品質保証ポータル" name="QA Wiki" />
       </menu>
     </menu>
   </menu>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 48983f3157..66ac069be4 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -364,7 +364,7 @@ L$が不足しているので、このグループに参加することができ
     <tag>fail</tag>
     <tag>funds</tag>
   </notification>
-  <notification name="CreateGroupCost">このグループ作成にかかる費用：L$[COST]
+  <notification name="CreateGroupCost">このグループ作成にかかる費用：L$ [COST]
 一人ではグループにならないので、永久に削除されてしまいます。
 ４８時間以内にメンバーを勧誘し、入会してもらってください。
     <tag>group</tag>
@@ -646,7 +646,7 @@ L$が不足しているので、このグループに参加することができ
   <notification name="ChangeLanguage">言語の変更は、[APP_NAME]再起動後に反映されます。</notification>
   <notification name="GoToAuctionPage">[SECOND_LIFE]のWebページに移動し、入札あるいはオークションの詳細を確認しますか？
     <tag>confirm</tag>
-    <url name="url">http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]</url>
+    <url name="url">http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]&amp;lang=ja-JP</url>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
   </notification>
   <notification name="SaveChanges">変更を保存しますか？
@@ -719,13 +719,13 @@ L$が不足しているので、このグループに参加することができ
   <notification name="UnsupportedHardware">お使いのコンピュータは、[APP_NAME]の最小システム要件を満たしていません。
 このためパフォーマンスが低下する場合があります。恐れ入りますが[SUPPORT_SITE]は、サポートされていないシステム構成に対する技術的サポートを提供できません。
 
-詳細について、[_URL]を確認しますか？
-    <url name="url" option="0">http://secondlife.com/support/sysreqs.php?lang=ja</url>
+詳細について、[_URL] を確認しますか？
+    <url name="url" option="0">https://secondlife.com/system-requirements?lang=ja</url>
     <tag>fail</tag>
     <usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい" />
   </notification>
   <notification name="OldGPUDriver">グラフィックスチップに最新のドライバがある可能性があります。グラフィックドライバを更新することにより、大幅にパフォーマンスが向上します。
-ドライバの更新を確認するために[URL]にアクセスしますか？
+ドライバの更新を確認するために[URL] にアクセスしますか？
     <url name="url">[URL]</url>
     <tag>confirm</tag>
     <tag>fail</tag>
@@ -799,7 +799,7 @@ L$が不足しているので、このグループに参加することができ
     <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
   </notification>
   <notification name="FreezeAvatarFullname">[AVATAR_NAME]をフリーズしますか？
-フリーズされた人は一時的に動けなくなり、チャットなど、ワールドに対する関わりを持つことができなくなります。
+フリーズされた人は一時的に動けなくなり、チャットなど、この世界に対する関わりを持つことができなくなります。
     <tag>confirm</tag>
     <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
   </notification>
@@ -827,7 +827,7 @@ L$が不足しているので、このグループに参加することができ
   </notification>
   <notification name="PromptGoToCurrencyPage">[EXTRA]
   
-[_URL]に移動してリンデンドル購入に関する情報を確認しますか？ 
+[_URL] に移動してリンデンドル購入に関する情報を確認しますか？ 
     <url name="url">https://secondlife.com/my/lindex/?lang=ja-JP</url>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
   </notification>
@@ -2738,6 +2738,10 @@ Linden Lab</notification>
     <usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する" />
   </notification>
 
+  <notification name="InventoryLimitReachedAIS">インベントリに問題が発生しています。お手数ですが、サポートにお問い合わせください。
+    <tag>fail</tag>
+  </notification>
+
   <notification name="ConfirmClearBrowserCache">トラベル、Web、検索の履歴をすべて削除しますか？ 
     <tag>confirm</tag>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
@@ -2753,7 +2757,7 @@ Linden Lab</notification>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
   </notification>
 
-  <notification name="ConfirmClearMediaUrlList">保存されたＵＲＬのリストを消去します。よろしいですか？
+  <notification name="ConfirmClearMediaUrlList">保存されたＵＲＬのリストを消去します。このまま、リストを消去してもよろしいですか？
     <tag>confirm</tag>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
   </notification>
@@ -3227,7 +3231,7 @@ Webページにリンクすると、他人がこの場所に簡単にアクセ
     <tag>fail</tag>
   </notification>
 
-  <notification name="ObjectGiveItem">[NAME_SLURL]が所有する&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;という名前のオブジェクトが、あなたに[OBJECTTYPE]を渡しました：
+  <notification name="ObjectGiveItem">[NAME_SLURL] が所有する&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;という名前のオブジェクトが、あなたに[OBJECTTYPE]を渡しました：
 &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
     <form name="form">
       <button name="Keep" text="受け取る" />
@@ -3301,7 +3305,7 @@ Webページにリンクすると、他人がこの場所に簡単にアクセ
 
   <notification name="TeleportOfferSent">[TO_NAME]にテレポートを送りました。</notification>
 
-  <notification name="TeleportRequest">[NAME_SLURL]は、テレポートであなたを呼んでいます。
+  <notification name="TeleportRequest">[NAME_SLURL] は、テレポートであなたを呼んでいます。
 [MESSAGE]
 
 テレポートのオファーを受けますか？
@@ -3647,7 +3651,7 @@ Your L$ balance is shown in the upper-right.
   </notification>
 
   <notification name="VoiceEffectsExpired">ボイスモーフィング効果の１つ、または複数の有効期限が終了しました。
-期限を延長・更新するには [[URL] Click here] をクリックしてください。
+期限を延長・更新するには[[URL] ここ]をクリックしてください。
 
 プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
     <tag>fail</tag>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
new file mode 100644
index 0000000000..bdafc69cf8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_performance_autoadjustments">
+  <button name="back_btn" />
+  <text name="back_lbl">戻る</text>
+  <text name="settings_title">設定を自動調整</text>
+  <button label="推奨設定にリセット" name="defaults_btn" />
+  <view_border name="border0" />
+  <text name="targetfps_desc">目標フレームレート</text>
+  <spinner name="target_fps" tool_tip="ビューアーは、グラフィック設定を調整することでこれを実現しようとします。" />
+  <text name="display_desc">お使いのディスプレイは、最大[FPS_LIMIT]fpsをサポートしています。</text>
+  <text name="settings_desc">影響する設定</text>
+  <combo_box name="TuningFPSStrategy">
+    <combo_box.item label="アバターのみ" name="av_only" value="0" />
+    <combo_box.item label="アバターとワールド" name="av_and_scene" value="1" />
+    <combo_box.item label="ワールドのみ" name="scene_only" value="2" />
+  </combo_box>
+  <button label="今すぐ自動調整" name="start_autotune" tool_tip="ビューアーは、目標ＦＰＳを満たすように設定が調整されるまで停止します。" />
+  <button label="キャンセル" name="stop_autotune" tool_tip="自動調整を中断します。" />
+  <text name="wip_desc">調整中です…</text>
+  <check_box label="継続的に調整する" name="AutoTuneContinuous" tool_tip="ビューアーは、このフローターが閉じていても停止するまで、目標ＦＰＳを満たすように設定を継続的に調整します。">
+  </check_box>
+  <radio_group name="autotune_lock_type">
+    <radio_item label="このログインセッションのみ" name="one_session_lock" value="0" />
+    <radio_item label="今後のログインセッションから" name="next_session_lock" value="1" />
+  </radio_group>
+  <view_border name="border_vsync" />
+  <check_box label="VSyncを有効化" tool_tip="垂直同期を有効にして、画面のティアリングや途切れを軽減します。" />
+  <text name="vsync_desc">モニターのリフレッシュレートをフレームレートと同期させます。</text>
+  <text name="vsync_desc_limit">注意：VSyncをオンにすると、フレームレートが[FPS_LIMIT]fpsに制限されます。</text>
+  <view_border name="border1" />
+  <text name="simplify_dist_desc">遠くにあるアバターの表示の詳細度を減らすと、グラフィックスの速度が向上します。</text>
+  <check_box label="アバターをさらに簡素化" name="AutoTuneImpostorByDistEnabled" tool_tip="有効にするとビューアは、MaxNonImpostorsの設定を調整して、完全にレンダリングされるアバターを指定された半径内のアバターに限定します。" />
+  <spinner name="ffa_autotune"/>
+  <text name="dist_meters">メートル</text>
+  <view_border name="border2" />
+  <text name="dist_limits_desc">自動設定が影響を及ぼす距離範囲を選択します。</text>
+  <text name="min_dist_lbl">最小距離</text>
+  <spinner name="min_dd_autotune" />
+  <text name="pref_dist_lbl">最大距離</text>
+  <spinner name="pref_dd_autotune" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_complexity.xml b/indra/newview/skins/default/xui/ja/panel_performance_complexity.xml
new file mode 100644
index 0000000000..f4e01f152d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_performance_complexity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_performance_complexity">
+  <button name="back_btn"/>
+  <text name="back_lbl">戻る</text>
+  <text name="attachments_title">現在のアバターの複雑度</text>
+  <text name="attachments_desc1">装着物を付けるとアバターがより複雑になります。アバターの複雑度が高い場合、</text>
+  <text name="attachments_desc2">他の人からあなたの詳細が見えず、グラフィック速度が低下する可能性があります。</text>
+  <text name="attachments_desc3">不要な重い装着物を削除すると解決することがあります。</text>
+  <name_list name="obj_list">
+    <name_list.columns label="" name="complex_visual" />
+    <name_list.columns label="" name="complex_value" />
+    <name_list.columns label="" name="name" />
+  </name_list>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_huds.xml b/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
new file mode 100644
index 0000000000..63ec6c20ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_performance_huds">
+  <button name="back_btn" />
+  <text name="back_lbl">戻る</text>
+  <text name="huds_title">アクティブなＨＵＤ</text>
+  <text name="huds_desc1">使用していないＨＵＤを取り外すとメモリが節約され、Second Lifeの処理が高速化されます。</text>
+  <text name="huds_desc2">注意：ＨＵＤの最小化ボタンを使用しても、ＨＵＤを取り外したことにはなりません。</text>
+  <name_list name="hud_list">
+    <name_list.columns label="" name="complex_visual" />
+    <name_list.columns label="" name="complex_value" />
+    <name_list.columns label="" name="name" />
+  </name_list>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_nearby.xml b/indra/newview/skins/default/xui/ja/panel_performance_nearby.xml
new file mode 100644
index 0000000000..073965031f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_performance_nearby.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_performance_nearby">
+  <button name="back_btn" />
+  <text name="back_lbl">戻る</text>
+  <text name="av_nearby_title">近くのアバター</text>
+  <text name="av_nearby_desc">複雑度の高いアバターの表示を省略して速度を上げることができます。</text>
+  <slider tool_tip="複雑度が高いアバターをレンダリングする際に時間がかかるとみなすタイミングを制御します。（単位：マイクロ秒）" name="RenderAvatarMaxART">
+  </slider>
+  <text name="RenderAvatarMaxARTText">制限なし</text>
+  <name_list name="nearby_list">
+    <name_list.columns label="" name="complex_visual" />
+    <name_list.columns label="" name="complex_value" />
+    <name_list.columns label="" name="name" />
+  </name_list>
+  <text name="av_nearby_desc2">インワールド内のアバターを右クリックして表示を制御することもできます。</text>
+  <button label="例外…" name="exceptions_btn">
+  </button>
+  <check_box label="フレンドは常に詳細表示する" name="display_friends" />
+  <view_border name="border" />
+  <check_box label="アバターを完全に非表示にする（風景写真に適しています）" name="hide_avatars" />
+  <text name="name_tags_textbox">名前タグ：</text>
+  <radio_group name="name_tag_mode">
+    <radio_item label="オフ" name="radio" />
+    <radio_item label="オン" name="radio2" />
+    <radio_item label="簡略表示" name="radio3" />
+  </radio_group>
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
new file mode 100644
index 0000000000..21dabb133c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_performance_preferences">
+  <button name="back_btn" />
+  <text name="back_lbl">戻る</text>
+  <text name="settings_title">グラフィック設定</text>
+  <button label="拡張設定を開く" name="advanced_btn" />
+  <button label="推奨設定にリセット" name="defaults_btn" />
+  <view_border name="border0" />
+  <text name="quality_lbl">品質と速度</text>
+  <text name="fastest_lbl">距離と速度</text>
+  <radio_group name="graphics_quality">
+    <radio_item name="0" />
+    <radio_item name="1" />
+    <radio_item name="2" />
+    <radio_item name="3" />
+    <radio_item name="4" />
+    <radio_item name="5" />
+    <radio_item name="6" />
+  </radio_group>
+  <text name="quality_lbl">最高品位</text>
+  <text name="quality_desc">ショートカットを選択すると、手動で行った変更がすべてリセットされます。</text>
+  <view_border name="border2" />
+  <text name="distance_lbl">距離</text>
+  <text name="faster_lbl">速度</text>
+  <slider name="draw_distance" />
+  <text name="draw_distance_m">ｍ</text>
+  <text name="farther_lbl">遠景</text>
+  <text name="distance_desc1">ズームアウト時に遠くまで見たい場合は、距離を長く設定してください。</text>
+  <view_border name="border3" />
+  <text name="environment_lbl">環境</text>
+  <text name="enhancements_desc">この設定によりリアリズムは向上しますが、速度が低下する可能性があります。</text>
+  <check_box label="大気（周辺）シェーダー" name="atmospheric_shaders" />
+  <check_box label="高度な光源モデル" name="advanced_lighting_model" />
+  <text name="RenderShadowDetailText">影：</text>
+  <combo_box name="ShadowDetail">
+    <combo_box.item label="なし" name="0" value="0" />
+    <combo_box.item label="太陽／月" name="1" value="1" />
+    <combo_box.item label="太陽／月＋プロジェクター" name="2" value="2" />
+  </combo_box>
+  <view_border name="border3" />
+  <text name="water_lbl">水</text>
+  <text name="water_desc">水の効果を簡素化するかオフにすると、フレームレートが大幅に向上します。</text>
+  <check_box label="透明な水" name="TransparentWater" />
+  <text name="ReflectionsText">水の反射：</text>
+  <combo_box name="Reflections">
+    <combo_box.item label="なし；不透明" name="0" value="-2" />
+    <combo_box.item label="なし；透明" name="0" value="-1" />
+    <combo_box.item label="最小限" name="0" value="0" />
+    <combo_box.item label="地形と樹木" name="1" value="1" />
+    <combo_box.item label="全ての静的なオブジェクト" name="2" value="2" />
+    <combo_box.item label="全てのアバターとオブジェクト" name="3" value="3" />
+    <combo_box.item label="全て" name="4" value="4" />
+  </combo_box>
+  <view_border name="border4" />
+  <text name="photo_lbl">写真</text>
+  <text name="photo_desc">詳細度を最大にすると撮影に適した画像になりますが、フレームレートが下がります。</text>
+  <spinner label="距離の詳細：" name="render_volume_lod" />
+  <text name="photo_desc">（0.0～4.0の値を入れてください）</text>
+  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" top="80" left="213" name="1_lbl" width="7">1</text>
+  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="31" name="2_lbl" width="7">2</text>
+  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="3_lbl" width="7">3</text>
+  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="4_lbl" width="7">4</text>
+  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="5_lbl" width="7">5</text>
+  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="6_lbl" width="7">6</text>
+  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="7_lbl" width="7">7</text>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index e83f093caa..49a98a33f4 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,36 +1,56 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="表示" name="Display panel">
-  <text name="preset_text">（なし）</text>
-  <text name="QualitySpeed">品質と速度：</text>
-  <text name="ShadersPrefText">低</text>
-  <text name="ShadersPrefText2">中</text>
-  <text name="ShadersPrefText3">高</text>
-  <text name="ShadersPrefText4">最高</text>
-  <text name="FasterText">速度優先</text>
-  <text name="BetterText">品質優先</text>
-
-  <!-- This block shows Basic Settings -->
-
-  <slider control_name="RenderFarClip" label="描画距離：" name="DrawDistance" />
-  <text name="DrawDistanceMeterText2">ｍ</text>
-
-  <check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders" />
-
-  <check_box initial_value="true" label="高度な光源モデル" name="UseLightShaders" />
-
-  <slider label="アバターの最大複雑度：" name="IndirectMaxComplexity" tool_tip="どの程度の複雑度で他のアバターをJellyDollとして描画するを設定します。" />
-  <text name="IndirectMaxComplexityText">0</text>
-  <text name="IndirectMaxComplexityLink">[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 これはなんですか？]</text>
-
-
-  <check_box initial_value="true" label="フレンドは常に描画" name="AlwaysRenderFriends" />
-  <button label="例外…" name="RenderExceptionsButton" />
-
-  <!-- End of Basic Settings block -->
-
-  <button label="設定をプリセットとして保存…" name="PrefSaveButton" />
-  <button label="プリセットをロード…" name="PrefLoadButton" />
-  <button label="プリセットを削除…" name="PrefDeleteButton" />
-  <button label="推奨設定にリセット" name="Defaults" />
-  <button label="拡張設定…" name="AdvancedSettings" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="グラフィック" name="Display panel">
+  <text follows="top|left|right" height="16" layout="topleft" left="5" top="5" width="100">使用中のプリセット：</text>
+
+  <text name="preset_text">（なし）</text>
+
+  <text name="QualitySpeed">品質と速度：</text>
+  <text name="ShadersPrefText">低</text>
+  <text name="ShadersPrefText2">中</text>
+  <text name="ShadersPrefText3">高</text>
+  <text name="ShadersPrefText4">最高</text>
+  <text name="FasterText">速度優先</text>
+  <text name="BetterText">品質優先</text>
+  <icon name="LowGraphicsDivet" />
+  <icon name="LowMidGraphicsDivet" />
+  <icon name="MidGraphicsDivet" />
+  <icon name="MidHighGraphicsDivet" />
+  <icon name="HighGraphicsDivet" />
+  <icon name="HighUltraGraphicsDivet" />
+  <icon name="UltraGraphicsDivet" />
+  <slider name="QualityPerformanceSelection" />
+
+  <!-- This block shows Basic Settings -->
+
+  <slider control_name="RenderFarClip" label="描画距離：" name="DrawDistance" />
+  <text name="DrawDistanceMeterText2">ｍ</text>
+
+  <check_box initial_value="true" label="大気（周辺）シェーダー" name="WindLightUseAtmosShaders" />
+
+  <check_box initial_value="true" label="高度な光源モデル" name="UseLightShaders" />
+
+  <button height="23" label="Automatic adjustments settings" layout="topleft" left="30" name="AutoAdjustmentsButton" top_delta="30" width="200">
+    <button.commit_callback function="Pref.AutoAdjustments" />
+  </button>
+
+  <slider label="アバターの最大複雑度：" name="IndirectMaxComplexity" tool_tip="どの程度の複雑度で他のアバターをJellyDollとして描画するを設定します。" />
+  <text name="IndirectMaxComplexityText">0</text>
+  <text name="IndirectMaxComplexityLink">[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 これはなんですか？]</text>
+
+
+  <check_box label="フレンドは常に描画" name="AlwaysRenderFriends" />
+  <button label="例外…" name="RenderExceptionsButton" />
+
+  <!-- End of Basic Settings block -->
+
+  <button label="設定をプリセットとして保存…" name="PrefSaveButton" />
+
+  <button label="プリセットを読み込む…" name="PrefLoadButton" />
+
+  <button label="プリセットを削除…" name="PrefDeleteButton" />
+
+  <button label="プリセットを削除…" name="PrefDeleteButton" />
+
+  <button label="拡張設定…" name="AdvancedSettings" />
+
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
index 9ba82b7834..06ee4f1b3a 100644
--- a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="presets_pulldown">
-  <text name="Graphic Presets">グラフィックプリセット</text>
-  <button label="グラフィックス設定を開く" name="open_prefs_btn" tool_tip="グラフィックス設定を開きます" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+  <text name="Graphic Presets">グラフィックのプリセット</text>
+  <scroll_list name="preset_list"/>
+  <view_border name="horiz_separator" />
+  <button name="open_prefs_btn" label="グラフィック初期設定" tool_tip="グラフィック設定を呼び出します。"/>
+  <button name="open_autofps_btn" label="自動ＦＰＳ設定" tool_tip="自動調整設定を呼び出します。" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
index 1a3fbec783..e278bfd4eb 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="プロフィール" name="panel_profile">
+<panel name="panel_profile" label="プロフィール">
   <!--
   Date from server comes already converted to stl timezone,
   so display it as an UTC+0
   -->
   <string name="date_format" value="ＳＬでの誕生日：[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日" />
-  <string name="age_format" value="[AGE]歳" />
+  <string name="age_format" value="[AGE]経過" />
   <string name="partner_text" value="パートナー：[LINK]" />
+  <string name="CaptionTextAcctInfo">アカウント：[ACCTTYPE]
+[PAYMENTINFO]</string>
 
+  <!--Badges-->
+  <string name="BadgeBeta" value="オリジナルβテスター" />
+  <string name="BadgeBetaLifetime" value="β会員" />
+  <string name="BadgeLifetime" value="会員" />
+  <string name="BadgeLinden" value="Linden Lab社員" />
+  <string name="BadgePremiumLifetime" value="プレミアム会員" />
+  <string name="BadgePremiumPlusLifetime" value="プレミアム・プラス会員" />
 
   <layout_stack name="image_stack">
     <layout_panel name="image_panel">
@@ -30,8 +39,13 @@
 
     <layout_panel name="partner_spacer_layout" />
 
-    <layout_panel name="frind_layout">
-      <text name="frind_text" value="あなたはフレンドです。" />
+    <layout_panel name="badge_layout">
+      <icon name="badge_icon" />
+      <text name="badge_text" value="バッチのテスト" />
+    </layout_panel>
+
+    <layout_panel name="friend_layout">
+      <text name="friend_text" value="あなたはフレンドです。" />
     </layout_panel>
     <layout_panel name="online_layout">
       <icon name="online_icon" />
@@ -64,12 +78,19 @@
   <layout_stack name="main_stack">
     <layout_panel name="display_name_panel">
       <line_editor name="display_name" value="（読み込んでいます…）" />
+
       <icon tool_tip="フレンドは、自分のオンライン状況を見ることができます。" name="can_see_online" />
+
       <icon tool_tip="フレンドは、自分のオンライン状況を見ることができません。" name="cant_see_online" />
+
       <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができます。" name="can_see_on_map" />
+
       <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができません。" name="cant_see_on_map" />
+
       <icon tool_tip="フレンドは、自分のオブジェクトを編集できます。" name="can_edit_objects" />
+
       <icon tool_tip="フレンドは、自分のオブジェクトを編集できません。" name="cant_edit_objects" />
+
     </layout_panel>
 
     <layout_panel name="about_panel">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 9f0c4841d3..42f8e0ebdc 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -2758,11 +2758,11 @@ For AI Character: Get the closest navigable point to the point provided.
 
   <!-- inventory offer -->
   <string name="InvOfferAnObjectNamed">オブジェクト名</string>
-  <string name="InvOfferOwnedByGroup">所有グループ</string>
-  <string name="InvOfferOwnedByUnknownGroup">不明なグループ所有</string>
-  <string name="InvOfferOwnedBy">所有者</string>
-  <string name="InvOfferOwnedByUnknownUser">不明なユーザー所有</string>
-  <string name="InvOfferGaveYou">が渡しました。</string>
+  <string name="InvOfferOwnedByGroup">グループが所有している</string>
+  <string name="InvOfferOwnedByUnknownGroup">不明なグループが所有している</string>
+  <string name="InvOfferOwnedBy">が所有している</string>
+  <string name="InvOfferOwnedByUnknownUser">不明なユーザーが所有している</string>
+  <string name="InvOfferGaveYou">を渡してきました。</string>
   <string name="InvOfferDecline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;からの[DESC]を拒否しました。</string>
 
   <!-- group money -->
@@ -2771,8 +2771,8 @@ For AI Character: Get the closest navigable point to the point provided.
   <string name="GroupMoneyPaidYou">あなたに支払い：</string>
   <string name="GroupMoneyPaidInto">支払情報</string>
   <string name="GroupMoneyBoughtPassTo">入場許可を購入：</string>
-  <string name="GroupMoneyPaidFeeForEvent">が、イベント用の費用を支払いました。</string>
-  <string name="GroupMoneyPaidPrizeForEvent">が、イベント用の賞金を支払いました。</string>
+  <string name="GroupMoneyPaidFeeForEvent">が、イベントの費用を支払いました。</string>
+  <string name="GroupMoneyPaidPrizeForEvent">が、イベントの賞金を支払いました。</string>
   <string name="GroupMoneyBalance">残高</string>
   <string name="GroupMoneyCredits">収入</string>
   <string name="GroupMoneyDebits">支出</string>
@@ -2784,7 +2784,7 @@ For AI Character: Get the closest navigable point to the point provided.
   <string name="UploadingCosts">[NAME]のアップロード料金は L$ [AMOUNT]です。</string>
   <string name="BuyingCosts">これをL$ [AMOUNT]で購入します。</string>
   <string name="UnknownFileExtension">不明な拡張子：%s
-使用可能な拡張子：.wav, .tga, .bmp, .jpg, .jpeg, or .bvh</string>
+使用可能な拡張子：.wav，.tga，.bmp，.jpg，.jpeg，.bvh</string>
   <string name="MuteObject2">オブジェクトのブロック</string>
   <string name="MuteAvatar">アバターのブロック</string>
   <string name="UnmuteObject">オブジェクトのブロック解除</string>
-- 
cgit v1.2.3


From 23311903106293f29e22d21314bdab03bbd499f7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 May 2023 19:28:48 +0300
Subject: Revert "SL-19795 Unified scroll"

---
 indra/llui/llfolderview.cpp                        |  15 +--
 indra/llui/llfolderview.h                          |   2 +-
 indra/newview/llinventorymodel.cpp                 |   2 +-
 indra/newview/llinventorypanel.cpp                 |  23 +---
 indra/newview/llinventorypanel.h                   |   3 -
 indra/newview/llpanelmaininventory.cpp             | 132 +++------------------
 indra/newview/llpanelmaininventory.h               |  20 ++--
 .../skins/default/xui/en/panel_main_inventory.xml  | 113 +++++++++++-------
 8 files changed, 103 insertions(+), 207 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index f0106e345c..70c2a79d25 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -695,18 +695,11 @@ void LLFolderView::draw()
 		}
 	}
 
-	if (mRenameItem
-        && mRenamer
-        && mRenamer->getVisible())
+	if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().overlaps(mRenamer->getRect()))
 	{
-        LLRect renamer_rect;
-        localRectToOtherView(mRenamer->getRect(), &renamer_rect, mScrollContainer);
-        if (!mScrollContainer->getRect().overlaps(renamer_rect))
-        {
-            // renamer is not connected to the item we are renaming in any form so manage it manually
-            // TODO: consider stopping on any scroll action instead of when out of visible area
-            finishRenamingItem();
-        }
+		// renamer is not connected to the item we are renaming in any form so manage it manually
+		// TODO: consider stopping on any scroll action instead of when out of visible area
+		finishRenamingItem();
 	}
 
 	// skip over LLFolderViewFolder::draw since we don't want the folder icon, label, 
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index ed84b29fd9..6de366044c 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -258,13 +258,13 @@ public:
 	virtual void updateMenu();
 
 	void finishRenamingItem( void );
-    void updateRenamerPosition();
 
     // Note: We may eventually have to move that method up the hierarchy to LLFolderViewItem.
 	LLHandle<LLFolderView>	getHandle() const { return getDerivedHandle<LLFolderView>(); }
     
 private:
 	void updateMenuOptions(LLMenuGL* menu);
+	void updateRenamerPosition();
 
 protected:
 	LLScrollContainer* mScrollContainer;  // NULL if this is not a child of a scroll container.
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index bc0d523bd2..59b34cc95c 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -914,7 +914,7 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
         // if it does not exists, it should either be added
         // to createCommonSystemCategories or server should
         // have set it
-        llassert(false);
+        llassert(!isInventoryUsable());
         LL_WARNS("Inventory") << "Tried to find folder, type " << preferred_type
 								  << " but category does not exist" << LL_ENDL;
 	}
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 9827fa8c5c..a76769d25a 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2107,7 +2107,6 @@ static LLDefaultChildRegistry::Register<LLInventorySingleFolderPanel> t_single_f
 
 LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     : LLInventoryPanel(params)
-    , mExternalScroller(NULL)
 {
     mBuildChildrenViews = false;
     getFilter().setSingleFolderMode(true);
@@ -2132,15 +2131,6 @@ void LLInventorySingleFolderPanel::setSelectCallback(const boost::function<void(
     }
 }
 
-void LLInventorySingleFolderPanel::setScroller(LLScrollContainer* scroller)
-{
-    mExternalScroller = scroller;
-    if (mFolderRoot.get())
-    {
-        mFolderRoot.get()->setScrollContainer(mExternalScroller);
-    }
-}
-
 void LLInventorySingleFolderPanel::initFromParams(const Params& p)
 {
     mFolderID = gInventory.getRootFolderID();
@@ -2247,18 +2237,7 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
             mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
             addChild(mScroller);
             mScroller->addChild(mFolderRoot.get());
-            if (!mExternalScroller)
-            {
-                mFolderRoot.get()->setScrollContainer(mScroller);
-            }
-            else
-            {
-                // Hack to use exteranl scroll in combination view
-                // Todo: find a way to avoid this
-                // ideally combination view should be own inventory panel
-                // instead of piggy backing on two different ones
-                mFolderRoot.get()->setScrollContainer(mExternalScroller);
-            }
+            mFolderRoot.get()->setScrollContainer(mScroller);
             mFolderRoot.get()->setFollowsAll();
             mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
 
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 8d3edebcb4..61d59e001e 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -214,7 +214,6 @@ public:
 	LLUUID getRootFolderID();
 	LLScrollContainer* getScrollableContainer() { return mScroller; }
     bool getAllowDropOnRoot() { return mParams.allow_drop_on_root; }
-    bool areViewsInitialized() { return mViewsInitialized == VIEWS_INITIALIZED && !mFolderRoot.get()->needsArrange(); }
 	
 	void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
 	
@@ -422,7 +421,6 @@ public:
     std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
 
     void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
-    void setScroller(LLScrollContainer* scroller);
 
     typedef boost::function<void()> root_changed_callback_t;
     boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
@@ -438,7 +436,6 @@ protected:
     LLUUID mFolderID;
     std::list<LLUUID> mBackwardFolders;
     std::list<LLUUID> mForwardFolders;
-    LLScrollContainer* mExternalScroller;
 
     boost::signals2::signal<void()> mRootChangedSignal;
 };
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 16f7abee23..f3241c6e5e 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -120,7 +120,6 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
       mSingleFolderMode(false),
       mForceShowInvLayout(false),
       mViewMode(MODE_COMBINATION),
-      mCombinationShapeDirty(true),
       mListViewRootUpdatedConnection(),
       mGalleryRootUpdatedConnection(),
       mDelayedCombGalleryScroll(false),
@@ -258,6 +257,7 @@ BOOL LLPanelMainInventory::postBuild()
     mDefaultViewPanel = getChild<LLPanel>("default_inventory_panel");
     mListViewPanel = getChild<LLPanel>("single_folder_inventory");
     mGalleryViewPanel = getChild<LLPanel>("gallery_view_inventory");
+    mCombinationViewPanel = getChild<LLPanel>("combination_view_inventory");
 
     mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
     mListViewRootUpdatedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
@@ -266,15 +266,12 @@ BOOL LLPanelMainInventory::postBuild()
     mInventoryGalleryPanel = getChild<LLInventoryGallery>("gallery_view_inv");
     mGalleryRootUpdatedConnection = mInventoryGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
 
-    mCombinationScrollPanel = getChild<LLScrollContainer>("combination_view_inventory");
-
     mCombinationInventoryPanel = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
     LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
     comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_EXCLUDE_THUMBNAILS);
     comb_inv_filter.markDefault();
     mCombinationInventoryPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onCombinationInventorySelectionChanged, this, _1, _2));
     mCombinationInventoryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
-    mCombinationInventoryPanel->setScroller(mCombinationScrollPanel);
 
     mCombinationGalleryPanel = getChild<LLInventoryGallery>("comb_gallery_view_inv");
     LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
@@ -283,8 +280,6 @@ BOOL LLPanelMainInventory::postBuild()
     mCombinationGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, true));
     mCombinationGalleryPanel->setSelectionChangeCallback(boost::bind(&LLPanelMainInventory::onCombinationGallerySelectionChanged, this, _1));
 
-    mCombinationScroller = getChild<LLView>("combination_scroller");
-
 	initListCommandsHandlers();
 
 	const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
@@ -301,7 +296,6 @@ BOOL LLPanelMainInventory::postBuild()
 
 	// Trigger callback for focus received so we can deselect items in inbox/outbox
 	LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLPanelMainInventory::onFocusReceived, this));
-    mCombinationShapeDirty = true;
 
 	return TRUE;
 }
@@ -750,8 +744,6 @@ void LLPanelMainInventory::onClearSearch()
 			inbox_panel->onClearSearch();
 		}
 	}
-
-    mCombinationShapeDirty = true;
 }
 
 void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
@@ -809,8 +801,6 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
 			inbox_panel->onFilterEdit(search_string);
 		}
 	}
-
-    mCombinationShapeDirty = true;
 }
 
 
@@ -921,19 +911,9 @@ BOOL LLPanelMainInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 }
 
 // virtual
-void LLPanelMainInventory::changed(U32 mask)
+void LLPanelMainInventory::changed(U32)
 {
 	updateItemcountText();
-    if ((mask & LLInventoryObserver::REBUILD)
-        || (mask & LLInventoryObserver::STRUCTURE)
-        || (mask & LLInventoryObserver::REMOVE)
-        || (mask & LLInventoryObserver::ADD)
-        || (mask & LLInventoryObserver::INTERNAL) // Thumbnail
-        || (mask & LLInventoryObserver::LABEL))
-    {
-        // todo: can be limited to just observed folder
-        mCombinationShapeDirty = true;
-    }
 }
 
 void LLPanelMainInventory::setFocusFilterEditor()
@@ -944,14 +924,6 @@ void LLPanelMainInventory::setFocusFilterEditor()
 	}
 }
 
-
-void LLPanelMainInventory::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
-    mCombinationShapeDirty = true;
-    LLPanel::reshape(width, height, called_from_parent);
-    updateCombinationVisibility();
-}
-
 // virtual
 void LLPanelMainInventory::draw()
 {
@@ -970,10 +942,9 @@ void LLPanelMainInventory::draw()
 		mActivePanel->setSortOrder(order);
 		mResortActivePanel = false;
 	}
-
-    updateCombinationVisibility();
 	LLPanel::draw();
 	updateItemcountText();
+    updateCombinationVisibility();
 }
 
 void LLPanelMainInventory::updateItemcountText()
@@ -1545,7 +1516,6 @@ void LLPanelMainInventory::toggleViewMode()
     }
 
     mSingleFolderMode = !mSingleFolderMode;
-    mCombinationShapeDirty = true;
 
     if (mCombinationGalleryPanel->getRootFolder().isNull())
     {
@@ -1556,9 +1526,9 @@ void LLPanelMainInventory::toggleViewMode()
     mDefaultViewPanel->setVisible(!mSingleFolderMode);
     mListViewPanel->setVisible(mSingleFolderMode && isListViewMode());
     mGalleryViewPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
+    mCombinationViewPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
     mNavigationBtnsPanel->setVisible(mSingleFolderMode);
     mViewModeBtn->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
-    mCombinationScrollPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
 
     setActivePanel();
     updateTitle();
@@ -1711,8 +1681,6 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
         mCombinationInventoryPanel->changeFolderRoot(folder_id);
     }
     updateNavButtons();
-
-    mCombinationShapeDirty = true;
 }
 
 LLUUID LLPanelMainInventory::getSingleFolderViewRoot()
@@ -1997,7 +1965,6 @@ void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
 		}
 		getActivePanel()->getRootFolder()->finishRenamingItem();
 	}
-    mCombinationShapeDirty = true;
 }
 
 bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
@@ -2313,10 +2280,6 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
     }
     mForceShowInvLayout = false;
     updateTitle();
-
-    //force update scroll container
-    mCombinationShapeDirty = true;
-    mCombinationInventoryPanel->reshape(1, 1);
 }
 
 void LLPanelMainInventory::onCombinationGallerySelectionChanged(const LLUUID& category_id)
@@ -2339,66 +2302,23 @@ void LLPanelMainInventory::onCombinationInventorySelectionChanged(const std::deq
 
 void LLPanelMainInventory::updateCombinationVisibility()
 {
-    if(mSingleFolderMode
-       && isCombinationViewMode()
-       && mCombinationShapeDirty)
+    if(mSingleFolderMode && isCombinationViewMode())
     {
-        if (mCombinationInventoryPanel->areViewsInitialized())
+        bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
+        bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
+        getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
+        getChild<LLLayoutPanel>("comb_inventory_layout")->setVisible(show_inv_pane);
+        mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
+        if(mCombinationInventoryPanel->hasVisibleItems())
         {
-            mCombinationShapeDirty = false;
-            mCombinationInventoryPanel->reshape(1,1); // HACK: force reduce visible area
-            LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder();
-            if (root_folder)
-            {
-                root_folder->arrangeAll();
-            }
+            mForceShowInvLayout = false;
         }
-        if (!mCombinationGalleryPanel->hasVisibleItems())
+        if(is_gallery_empty)
         {
             mCombinationGalleryPanel->handleModifiedFilter();
         }
-        LLRect inv_rect = mCombinationInventoryPanel->getRect();
-        LLRect inv_inner_rect = mCombinationInventoryPanel->getScrollableContainer()->getScrolledViewRect();
-        LLRect galery_rect = mCombinationGalleryPanel->getRect();
-        LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
-        LLRect scroller_window_rect = mCombinationScrollPanel->getContentWindowRect();
-
-        inv_rect.mBottom = 0;
-        inv_rect.mRight = inv_rect.mLeft + inv_inner_rect.getWidth() + mCombinationInventoryPanel->getScrollableContainer()->getBorderWidth();
-        if (!mCombinationGalleryPanel->hasVisibleItems() || mCombinationInventoryPanel->hasVisibleItems())
-        {
-            inv_rect.mTop = inv_rect.mBottom + inv_inner_rect.getHeight() + mCombinationInventoryPanel->getScrollableContainer()->getBorderWidth();
-        }
-        else
-        {
-            inv_rect.mTop = inv_rect.mBottom + mCombinationInventoryPanel->getScrollableContainer()->getBorderWidth();
-        }
-
-        galery_rect.mBottom = inv_rect.mTop;
-        galery_rect.mRight = galery_rect.mLeft + scroller_window_rect.getWidth();
-        if (mCombinationGalleryPanel->hasVisibleItems())
-        {
-            mCombinationGalleryPanel->setVisible(true);
-            galery_rect.mTop = galery_rect.mBottom + inner_galery_rect.getHeight() + mCombinationGalleryPanel->getScrollableContainer()->getBorderWidth();
-        }
-        else
-        {
-            mCombinationGalleryPanel->setVisible(false);
-            galery_rect.mTop = galery_rect.mBottom + mCombinationGalleryPanel->getScrollableContainer()->getBorderWidth();
-        }
-
-        mCombinationScroller->reshape(scroller_window_rect.getWidth(), inv_rect.getHeight() + galery_rect.getHeight(), true);
-        mCombinationGalleryPanel->setShape(galery_rect, false);
-        mCombinationInventoryPanel->setShape(inv_rect, false);
-
-        if(mDelayedCombGalleryScroll)
-        {
-            scrollToGallerySelection();
-        }
-        else if(mDelayedCombInvPanelScroll)
-        {
-            scrollToInvPanelSelection();
-        }
+        
+        getActivePanel()->getRootFolder();
     }
 }
 
@@ -2463,7 +2383,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
 
         mListViewPanel->setVisible(mSingleFolderMode && isListViewMode());
         mGalleryViewPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
-        mCombinationScrollPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
+        mCombinationViewPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
 
         if(isListViewMode())
         {
@@ -2573,28 +2493,12 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_w
 
 void LLPanelMainInventory::scrollToGallerySelection()
 {
-    LLInventoryGalleryItem* item = mCombinationGalleryPanel->getSelectedItem();
-    LLScrollContainer* scroll_panel = getChild<LLScrollContainer>("combination_view_inventory");
-
-    if(item)
-    {
-        LLRect item_rect;
-        item->localRectToOtherView(item->getLocalRect(), &item_rect, mCombinationScroller);
-        scroll_panel->scrollToShowRect(item_rect);
-    }
+    mCombinationGalleryPanel->scrollToShowItem(mCombinationGalleryPanel->getSelectedItemID());
 }
 
 void LLPanelMainInventory::scrollToInvPanelSelection()
 {
-    LLFolderViewItem* item = mCombinationInventoryPanel->getRootFolder()->getCurSelectedItem();
-    LLScrollContainer* scroll_panel = getChild<LLScrollContainer>("combination_view_inventory");
-
-    if(item)
-    {
-        LLRect item_rect;
-        item->localRectToOtherView(item->getLocalRect(), &item_rect, mCombinationScroller);
-        scroll_panel->scrollToShowRect(item_rect);
-    }
+    mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
 }
 
 // List Commands                                                              //
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 056b26b6ec..cc36385e90 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -36,20 +36,19 @@
 #include "llfolderview.h"
 
 class LLComboBox;
+class LLFolderViewItem;
 class LLInventoryPanel;
 class LLInventoryGallery;
+class LLSaveFolderState;
 class LLFilterEditor;
-class LLFloater;
+class LLTabContainer;
 class LLFloaterInventoryFinder;
-class LLFloaterSidePanelContainer;
-class LLFolderViewItem;
 class LLMenuButton;
 class LLMenuGL;
-class LLSaveFolderState;
-class LLScrollContainer;
 class LLSidepanelInventory;
-class LLTabContainer;
 class LLToggleableMenu;
+class LLFloater;
+class LLFloaterSidePanelContainer;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLPanelMainInventory
@@ -84,9 +83,8 @@ public:
 									   EAcceptance* accept,
 									   std::string& tooltip_msg);
 	/*virtual*/ void changed(U32);
-    /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	/*virtual*/ void draw();
-	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );
+	/*virtual*/ void 	onVisibilityChange ( BOOL new_visibility );
 
 	LLInventoryPanel* getPanel() { return mActivePanel; }
 	LLInventoryPanel* getActivePanel() { return mActivePanel; }
@@ -148,6 +146,8 @@ protected:
 
 	static BOOL filtersVisible(void* user_data);
 	void onClearSearch();
+	static void onFoldersByName(void *user_data);
+	static BOOL checkFoldersByName(void *user_data);
 	
 	static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
 	void onFilterSelected();
@@ -207,10 +207,9 @@ private:
     LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
     LLInventoryGallery* mInventoryGalleryPanel;
 
-    LLScrollContainer* mCombinationScrollPanel;
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
-    LLView* mCombinationScroller;
+    LLPanel* mCombinationViewPanel;
 
     boost::signals2::connection mListViewRootUpdatedConnection;
     boost::signals2::connection mGalleryRootUpdatedConnection;
@@ -251,7 +250,6 @@ private:
 	bool						mNeedUploadCost;
 
     bool                        mForceShowInvLayout;
-    bool                        mCombinationShapeDirty;
     bool                        mDelayedCombGalleryScroll;
     bool                        mDelayedCombInvPanelScroll;
 	// List Commands                                                              //
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index f772c1fde2..1a9816247b 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -327,7 +327,7 @@
        follows="all"
        layout="topleft" />
     </panel>
-    <scroll_container
+    <panel
      follows="all"
      halign="center"
      height="372"
@@ -337,48 +337,73 @@
      top_delta="0"
      visible="false"
      width="312">
-           <panel
-            name="combination_scroller"
-            follows="all"
-            layout="topleft"
-            left="0"
-            top="0"
-            height="20"
-            width="291">
-            <panel
-             class="inventory_gallery"
-             filename="panel_inventory_gallery.xml"
-             follows="left|right"
-             layout="topleft"
-             left="0"
-             top="0"
-             height="10"
-             width="290"
-             name="comb_gallery_view_inv"
-             background_visible="true">
-            </panel>
-            <single_folder_inventory_panel
-             name="comb_single_folder_inv"
-             follows="left|right"
-             layout="topleft"
-             left="0"
-             top="200"
-             height="10"
-             width="290"
-             show_item_link_overlays="true"
-             bg_opaque_color="DkGray2"
-             bg_alpha_color="DkGray2"
-             background_visible="true"
-             border="false"
-             bevel_style="none"
-             scroll.reserve_scroll_corner="false">
-                <item
-                 single_folder_mode="true"
-                 folder_indentation="-8"/>
-                <folder
-                 single_folder_mode="true"
-                 folder_indentation="-8"/>
-            </single_folder_inventory_panel>
+     <layout_stack
+      follows="all"
+      height="372"
+      width="312"
+      animate="false"
+      drag_handle_gap="13"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_shift="5"
+      show_drag_handle="true"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="246"
+        width="312"
+        min_width="150"
+        name="comb_gallery_layout">
+        <panel
+         class="inventory_gallery"
+         filename="panel_inventory_gallery.xml"
+         left="0"
+         top_pad="0"
+         height="246"
+         width="312"
+         name="comb_gallery_view_inv"
+         background_visible="true"
+         follows="all"
+         layout="topleft">
         </panel>
-    </scroll_container>
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="126"
+        width="312"
+        name="comb_inventory_layout">
+        <single_folder_inventory_panel
+         name="comb_single_folder_inv"
+         follows="all"
+         left="0"
+         top="1"
+         height="126"
+         width="312"
+         layout="topleft"
+         show_item_link_overlays="true"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+        </single_folder_inventory_panel>
+       </layout_panel>
+     </layout_stack>
+    </panel>
 </panel>
-- 
cgit v1.2.3


From 49b817d5062dbffb915facc3cda7e31dd2322e6e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 May 2023 22:31:24 +0300
Subject: SL-19795 fix inventory list offset

---
 indra/newview/llpanelmaininventory.cpp                      | 6 ++++--
 indra/newview/llpanelmaininventory.h                        | 2 ++
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index f3241c6e5e..52cf2f1d54 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -258,6 +258,8 @@ BOOL LLPanelMainInventory::postBuild()
     mListViewPanel = getChild<LLPanel>("single_folder_inventory");
     mGalleryViewPanel = getChild<LLPanel>("gallery_view_inventory");
     mCombinationViewPanel = getChild<LLPanel>("combination_view_inventory");
+    mCombinationGalleryLayoutPanel = getChild<LLLayoutPanel>("comb_gallery_layout");
+    mCombinationListLayoutPanel = getChild<LLLayoutPanel>("comb_inventory_layout");
 
     mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
     mListViewRootUpdatedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
@@ -2306,8 +2308,8 @@ void LLPanelMainInventory::updateCombinationVisibility()
     {
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
         bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
-        getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
-        getChild<LLLayoutPanel>("comb_inventory_layout")->setVisible(show_inv_pane);
+        mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty);
+        mCombinationListLayoutPanel->setVisible(show_inv_pane);
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
         if(mCombinationInventoryPanel->hasVisibleItems())
         {
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index cc36385e90..daf7cf5ad3 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -210,6 +210,8 @@ private:
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
     LLPanel* mCombinationViewPanel;
+    LLPanel* mCombinationGalleryLayoutPanel;
+    LLPanel* mCombinationListLayoutPanel;
 
     boost::signals2::connection mListViewRootUpdatedConnection;
     boost::signals2::connection mGalleryRootUpdatedConnection;
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 1a9816247b..b3ca712aee 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -339,6 +339,7 @@
      width="312">
      <layout_stack
       follows="all"
+      layout="topleft"
       height="372"
       width="312"
       animate="false"
@@ -364,7 +365,7 @@
          class="inventory_gallery"
          filename="panel_inventory_gallery.xml"
          left="0"
-         top_pad="0"
+         top="1"
          height="246"
          width="312"
          name="comb_gallery_view_inv"
-- 
cgit v1.2.3


From b11b53b72cebe85b0fd2a6c8e18c0aca3cf16430 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 31 May 2023 16:33:01 -0400
Subject: SL-18330: Change to strip_deprecated_header(size_t* header_size)

from U32*.
---
 indra/llcommon/llsdserialize.cpp   | 2 +-
 indra/llcommon/llsdserialize.h     | 2 +-
 indra/newview/llmeshrepository.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index c8dbcb2404..9181600f23 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2388,7 +2388,7 @@ U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size
 	return result;
 }
 
-char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size)
+char* strip_deprecated_header(char* in, llssize& cur_size, size_t* header_size)
 {
 	const char* deprecated_header = "<? LLSD/Binary ?>";
 	constexpr size_t deprecated_header_size = 17;
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index 5ddf0ff552..0957ba9714 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -873,5 +873,5 @@ LL_COMMON_API std::string zip_llsd(LLSD& data);
 LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size);
 
 // returns a pointer to the array or past the array if the deprecated header exists
-LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size = nullptr);
+LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, size_t* header_size = nullptr);
 #endif // LL_LLSDSERIALIZE_H
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 18420a2356..3e7f79b60a 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1861,8 +1861,8 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
 {
 	const LLUUID mesh_id = mesh_params.getSculptID();
 	LLSD header;
-	
-	U32 header_size = 0;
+
+	size_t header_size = 0;
 	if (data_size > 0)
 	{
 		llssize dsize = data_size;
-- 
cgit v1.2.3


From ed92f1d8034dcaa84f808b3267c772202e7ce113 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 31 May 2023 16:34:04 -0400
Subject: SL-18330: Consistently use new standalone Python llsd package.

---
 indra/llcommon/tests/llleap_test.cpp           | 2 +-
 indra/llcommon/tests/llsdserialize_test.cpp    | 2 +-
 indra/llcorehttp/tests/test_llcorehttp_peer.py | 2 +-
 indra/llmessage/tests/test_llsdmessage_peer.py | 4 ++--
 indra/newview/viewer_manifest.py               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 7ee36a9ea6..60005fc6a9 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -109,7 +109,7 @@ namespace tut
                    "import os\n"
                    "import sys\n"
                    "\n"
-                   "from llbase import llsd\n"
+                   "import llsd\n"
                    "\n"
                    "class ProtocolError(Exception):\n"
                    "    def __init__(self, msg, data):\n"
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index c246f5ee56..be7ec12094 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1706,7 +1706,7 @@ namespace tut
             // scanner.
             import_llsd("import os.path\n"
                         "import sys\n"
-                        "from llbase import llsd\n")
+                        "import llsd\n")
         {}
         ~TestPythonCompatible() {}
 
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 185e8e25c6..b9992538ba 100755
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -38,7 +38,7 @@ from io import StringIO
 from http.server import HTTPServer, BaseHTTPRequestHandler
 
 
-from llbase import llsd
+import llsd
 
 # we're in llcorehttp/tests ; testrunner.py is found in llmessage/tests
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py
index 5ba0749e31..8e9b6c09e7 100755
--- a/indra/llmessage/tests/test_llsdmessage_peer.py
+++ b/indra/llmessage/tests/test_llsdmessage_peer.py
@@ -33,8 +33,8 @@ import os
 import sys
 from http.server import HTTPServer, BaseHTTPRequestHandler
 
-from llbase.fastest_elementtree import parse as xml_parse
-from llbase import llsd
+from llsd.fastest_elementtree import parse as xml_parse
+import llsd
 from testrunner import freeport, run, debug, VERBOSE
 import time
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 89481add29..8a6a9b7b68 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -49,7 +49,7 @@ viewer_dir = os.path.dirname(__file__)
 # indra.util.llmanifest under their system Python!
 sys.path.insert(0, os.path.join(viewer_dir, os.pardir, "lib", "python"))
 from indra.util.llmanifest import LLManifest, main, path_ancestors, CHANNEL_VENDOR_BASE, RELEASE_CHANNEL, ManifestError, MissingError
-from llbase import llsd
+import llsd
 
 class ViewerManifest(LLManifest):
     def is_packaging_viewer(self):
-- 
cgit v1.2.3


From c6eeb65d18861ea346cf199faba7bf3f493fdabe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Jun 2023 00:14:06 +0300
Subject: SL-19795 Smarter combination inventory resizing

---
 indra/newview/llinventorypanel.h                   |  1 +
 indra/newview/llpanelmaininventory.cpp             | 51 ++++++++++++++++++++++
 indra/newview/llpanelmaininventory.h               |  1 +
 .../skins/default/xui/en/panel_main_inventory.xml  |  1 +
 4 files changed, 54 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 61d59e001e..54ecdc8322 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -214,6 +214,7 @@ public:
 	LLUUID getRootFolderID();
 	LLScrollContainer* getScrollableContainer() { return mScroller; }
     bool getAllowDropOnRoot() { return mParams.allow_drop_on_root; }
+    bool areViewsInitialized() { return mViewsInitialized == VIEWS_INITIALIZED && mFolderRoot.get() && !mFolderRoot.get()->needsArrange(); }
 	
 	void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
 	
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 52cf2f1d54..3c867f0e90 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1518,6 +1518,7 @@ void LLPanelMainInventory::toggleViewMode()
     }
 
     mSingleFolderMode = !mSingleFolderMode;
+    mReshapeInvLayout = true;
 
     if (mCombinationGalleryPanel->getRootFolder().isNull())
     {
@@ -2282,6 +2283,7 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
     }
     mForceShowInvLayout = false;
     updateTitle();
+    mReshapeInvLayout = true;
 }
 
 void LLPanelMainInventory::onCombinationGallerySelectionChanged(const LLUUID& category_id)
@@ -2321,6 +2323,55 @@ void LLPanelMainInventory::updateCombinationVisibility()
         }
         
         getActivePanel()->getRootFolder();
+
+        if (mReshapeInvLayout
+            && show_inv_pane
+            && mCombinationGalleryPanel->hasVisibleItems()
+            && mCombinationInventoryPanel->areViewsInitialized())
+        {
+            mReshapeInvLayout = false;
+
+            // force drop previous shape (because panel doesn't decrease shape properly)
+            LLRect list_latout = mCombinationListLayoutPanel->getRect();
+            list_latout.mTop = list_latout.mBottom; // min height is at 100, so it should snap to be bigger
+            mCombinationListLayoutPanel->setShape(list_latout, false);
+
+            LLRect inv_inner_rect = mCombinationInventoryPanel->getScrollableContainer()->getScrolledViewRect();
+            S32 inv_height = inv_inner_rect.getHeight()
+                + (mCombinationInventoryPanel->getScrollableContainer()->getBorderWidth() * 2)
+                + mCombinationInventoryPanel->getScrollableContainer()->getSize();
+            LLRect inner_galery_rect = mCombinationGalleryPanel->getScrollableContainer()->getScrolledViewRect();
+            S32 gallery_height = inner_galery_rect.getHeight()
+                + (mCombinationGalleryPanel->getScrollableContainer()->getBorderWidth() * 2)
+                + mCombinationGalleryPanel->getScrollableContainer()->getSize();
+            LLRect layout_rect = mCombinationViewPanel->getRect();
+
+            // by default make it take 1/3 of the panel
+            S32 list_default_height = layout_rect.getHeight() / 3;
+            // Don't set height from gallery_default_height - needs to account for a resizer in such case
+            S32 gallery_default_height = layout_rect.getHeight() - list_default_height;
+
+            if (inv_height > list_default_height
+                && gallery_height < gallery_default_height)
+            {
+                LLRect gallery_latout = mCombinationGalleryLayoutPanel->getRect();
+                gallery_latout.mTop = gallery_latout.mBottom + gallery_height;
+                mCombinationGalleryLayoutPanel->setShape(gallery_latout, true /*tell stack to account for new shape*/);
+            }
+            else if (inv_height < list_default_height
+                     && gallery_height > gallery_default_height)
+            {
+                LLRect list_latout = mCombinationListLayoutPanel->getRect();
+                list_latout.mTop = list_latout.mBottom + inv_height;
+                mCombinationListLayoutPanel->setShape(list_latout, true /*tell stack to account for new shape*/);
+            }
+            else
+            {
+                LLRect list_latout = mCombinationListLayoutPanel->getRect();
+                list_latout.mTop = list_latout.mBottom + list_default_height;
+                mCombinationListLayoutPanel->setShape(list_latout, true /*tell stack to account for new shape*/);
+            }
+        }
     }
 }
 
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index daf7cf5ad3..a02c13ddde 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -252,6 +252,7 @@ private:
 	bool						mNeedUploadCost;
 
     bool                        mForceShowInvLayout;
+    bool                        mReshapeInvLayout;
     bool                        mDelayedCombGalleryScroll;
     bool                        mDelayedCombInvPanelScroll;
 	// List Commands                                                              //
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index b3ca712aee..53803f8067 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -381,6 +381,7 @@
         auto_resize="true"
         height="126"
         width="312"
+        min_height="100"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
          name="comb_single_folder_inv"
-- 
cgit v1.2.3


From 6e30df2f370dd3b382a7404484e72a47adaf921e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 1 Jun 2023 17:37:10 +0300
Subject: SL-19762 fix for cropped label text

---
 indra/llui/lltextbox.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index c567451973..521dabf9d4 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -171,7 +171,8 @@ void LLTextBox::reshapeToFitText(BOOL called_from_parent)
 
 	S32 width = getTextPixelWidth();
 	S32 height = getTextPixelHeight();
-	reshape( width + 2 * mHPad, height + 2 * mVPad, called_from_parent );
+    //consider investigating reflow() to find missing width pixel (see SL-17045 changes)
+	reshape( width + 2 * mHPad + 1, height + 2 * mVPad, called_from_parent );
 }
 
 
-- 
cgit v1.2.3


From 364516e8bc19f6435fd42893809080d4f64a3232 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 1 Jun 2023 11:34:48 -0400
Subject: DRTVWR-575: GCC prefers std::make_signed<std::size_t> for llssize.

---
 indra/llcommon/stdtypes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h
index da8512169c..0b43d7ad4b 100644
--- a/indra/llcommon/stdtypes.h
+++ b/indra/llcommon/stdtypes.h
@@ -41,7 +41,7 @@ typedef unsigned int			U32;
 
 // to express an index that might go negative
 // (ssize_t is provided by SOME compilers, don't collide)
-typedef typename std::make_signed<size_t>::type llssize;
+typedef typename std::make_signed<std::size_t>::type llssize;
 
 #if LL_WINDOWS
 // https://docs.microsoft.com/en-us/cpp/build/reference/zc-wchar-t-wchar-t-is-native-type
-- 
cgit v1.2.3


From 6f58bc78fe2c8667e1f5ac40a309620fd98a5f36 Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Fri, 2 Jun 2023 01:09:21 +0900
Subject: =?UTF-8?q?Revert=20Call=20translation=20to=20'=E3=82=B3=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB'.=20Chang=20'water'=20translation=20'=E6=B0=B4'=20to?=
 =?UTF-8?q?=20'=E6=B0=B4=E9=9D=A2'.=20Unify=20the=20ground=20translation?=
 =?UTF-8?q?=20with=E3=80=80'=E5=9C=B0=E9=9D=A2'=20expect=20land=20floater.?=
 =?UTF-8?q?=20Fixed=20mistranslation=20of=20widget.=20Re-translate=20panel?=
 =?UTF-8?q?=5Fsettings=5Fsky=5Fdensity.xml.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/xui/ja/floater_adjust_environment.xml  |  2 +-
 .../default/xui/ja/floater_edit_ext_day_cycle.xml  |  6 ++--
 .../default/xui/ja/floater_fixedenvironment.xml    |  2 +-
 .../default/xui/ja/floater_my_environments.xml     |  2 +-
 .../skins/default/xui/ja/floater_performance.xml   |  2 +-
 .../skins/default/xui/ja/floater_pick_track.xml    |  2 +-
 .../ja/floater_preferences_graphics_advanced.xml   |  2 +-
 .../default/xui/ja/floater_settings_picker.xml     |  2 +-
 .../skins/default/xui/ja/menu_inventory.xml        |  2 +-
 .../skins/default/xui/ja/menu_inventory_add.xml    |  2 +-
 .../skins/default/xui/ja/menu_participant_list.xml |  2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  2 +-
 .../newview/skins/default/xui/ja/notifications.xml | 10 +++----
 .../xui/ja/panel_performance_preferences.xml       | 20 ++++++-------
 .../default/xui/ja/panel_region_environment.xml    | 30 +++++++++----------
 .../default/xui/ja/panel_settings_sky_density.xml  | 34 +++++++++++-----------
 indra/newview/skins/default/xui/ja/strings.xml     |  2 +-
 .../default/xui/ja/widgets/clothing_list_item.xml  |  2 +-
 .../ja/widgets/deletable_wearable_list_item.xml    |  2 +-
 .../default/xui/ja/widgets/flat_list_view.xml      |  6 ++--
 .../default/xui/ja/widgets/menu_item_separator.xml |  2 +-
 .../default/xui/ja/widgets/menu_item_tear_off.xml  |  4 +--
 22 files changed, 70 insertions(+), 70 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
index 9046dbf8be..f4294a0ef7 100644
--- a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
@@ -19,7 +19,7 @@
           <color_swatch name="cloud_color" />
           <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="10" name="cloud_map_label" width="80">雲の画像：:</text>
           <texture_picker height="63" layout="topleft" left_delta="0" name="cloud_map" top_pad="5" width="60" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="-13" name="cloud_map_label" width="80">水の画像：</text>
+          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="-13" name="cloud_map_label" width="80">水面の画像：</text>
           <texture_picker height="63" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="60" />
         </layout_panel>
         <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" visible="true" width="200" height="150">
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
index e81e1417b6..aea5d80375 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
@@ -11,7 +11,7 @@
   <string name="time_label">（[HH]：[MM]）</string>
   <string name="sky_track_label">空[ALT]</string>
   <string name="sky_label">空</string>
-  <string name="water_label">水</string>
+  <string name="water_label">水面</string>
 
   <string name="commit_parcel">区画に適用</string>
   <string name="commit_region">リージョン（地域）に適用</string>
@@ -31,7 +31,7 @@
             <button label="空４" name="sky4_track" />
             <button label="空３" name="sky3_track" />
             <button label="空２" name="sky2_track" />
-            <button label="地表レベル" name="sky1_track" />
+            <button label="地面" name="sky1_track" />
             <button label="水面" name="water_track" />
           </panel>
           <panel name="timeline">
@@ -83,7 +83,7 @@
         </layout_panel>
         <layout_panel name="frame_settings_water">
           <tab_container name="water_tabs">
-            <panel filename="panel_settings_water.xml" label="水" name="water_panel" />
+            <panel filename="panel_settings_water.xml" label="水面" name="water_panel" />
           </tab_container>
         </layout_panel>
         <layout_panel name="frame_settings_sky">
diff --git a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
index 888981b576..9d0628f364 100644
--- a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Fixed Environment" title="固定された環境">
   <string name="edit_sky">空を編集：</string>
-  <string name="edit_water">水を編集</string>
+  <string name="edit_water">水面を編集</string>
   <layout_stack name="floater_stack">
     <layout_panel name="info_panel">
       <text name="info_panel_label">名前：</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
index ea78425211..8ca0cf4242 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
@@ -7,7 +7,7 @@
       <icon name="icon_settingsskies" />
       <check_box label="空" name="chk_skies" />
       <icon name="icon_settingswater" />
-      <check_box label="水" name="chk_water" />
+      <check_box label="水面" name="chk_water" />
       <filter_editor label="環境の絞り込み" name="flt_search" />
     </layout_panel>
     <layout_panel name="list_panel" label="環境">
diff --git a/indra/newview/skins/default/xui/ja/floater_performance.xml b/indra/newview/skins/default/xui/ja/floater_performance.xml
index ef0669fb7e..c3e22b0bda 100644
--- a/indra/newview/skins/default/xui/ja/floater_performance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_performance.xml
@@ -18,7 +18,7 @@
     </panel>
     <panel name="settings_subpanel">
       <text name="settings_lbl">グラフィック設定</text>
-      <text name="settings_desc">距離、水、照明などの設定を選択します。</text>
+      <text name="settings_desc">距離、水面、照明などの設定を選択します。</text>
       <icon name="icon_arrow3" />
     </panel>
     <panel name="nearby_subpanel">
diff --git a/indra/newview/skins/default/xui/ja/floater_pick_track.xml b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
index d2a4de4562..24213982dd 100644
--- a/indra/newview/skins/default/xui/ja/floater_pick_track.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
@@ -9,7 +9,7 @@
         <radio_item label="空４[ALT]" name="radio_sky4" value="4" />
         <radio_item label="空３[ALT]" name="radio_sky3" value="3" />
         <radio_item label="空２[ALT]" name="radio_sky2" value="2" />
-        <radio_item label="地表" name="radio_sky1" value="1" />
+        <radio_item label="地面" name="radio_sky1" value="1" />
       </radio_group>
     </layout_panel>
     <layout_panel name="pnl_ok_cancel">
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index 571c2b7039..61aa90fe6a 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -81,7 +81,7 @@
 
   <check_box label="アバターの衣類" name="AvatarCloth" />
 
-  <text name="ReflectionsText">水の反射：</text>
+  <text name="ReflectionsText">水面の反射：</text>
   <combo_box name="Reflections">
     <combo_box.item label="無し；不透明" name="0" value="-2" />
     <combo_box.item label="無し；透明" name="0" value="-1" />
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
index 91c05a1c3a..2cb9a908d9 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
@@ -3,7 +3,7 @@
   <floater.string name="pick title">選択：</floater.string>
   <floater.string name="pick_track">トラックを選択</floater.string>
   <floater.string name="pick_settings">設定を選択</floater.string>
-  <floater.string name="track_water">水</floater.string>
+  <floater.string name="track_water">水面</floater.string>
   <floater.string name="track_ground">地面</floater.string>
   <floater.string name="track_sky">空[NUM]</floater.string>
   <layout_stack name="test_stack">
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index f25c32c084..03e02ff200 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -46,7 +46,7 @@
   </menu>
   <menu label="新しい設定" name="New Settings">
     <menu_item_call label="新しい空" name="New Sky" />
-    <menu_item_call label="新しい水" name="New Water" />
+    <menu_item_call label="新しい水面" name="New Water" />
     <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
   </menu>
   <menu label="次のデフォルトとして使用" name="upload_def">
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index 3f43469c6f..8311f0859f 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
@@ -34,7 +34,7 @@
   </menu>
   <menu label="新しい環境設定" name="New Settings">
     <menu_item_call label="新しい空" name="New Sky" />
-    <menu_item_call label="新しい水" name="New Water" />
+    <menu_item_call label="新しい水面" name="New Water" />
     <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
   </menu>
 </menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index f64a6dc55c..76b484a816 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
@@ -5,7 +5,7 @@
   <menu_item_call label="プロフィールの表示" name="View Profile" />
   <menu_item_call label="フレンド登録" name="Add Friend" />
   <menu_item_call label="ＩＭ" name="IM" />
-  <menu_item_call label="呼び出し" name="Call" />
+  <menu_item_call label="コール" name="Call" />
   <menu_item_call label="共有" name="Share" />
   <menu_item_call label="支払う" name="Pay" />
   <menu_item_separator name="View Icons Separator" />
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index cc5bed8331..5227c0d583 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -326,7 +326,7 @@
       <menu_item_check label="アニメッシュ" name="Rendering Type Control Avatar" />
       <menu_item_check label="サーフェスパッチ" name="Rendering Type Surface Patch" />
       <menu_item_check label="空" name="Rendering Type Sky" />
-      <menu_item_check label="水" name="Rendering Type Water" />
+      <menu_item_check label="水面" name="Rendering Type Water" />
       <menu_item_check label="地面" name="Rendering Type Ground" />
       <menu_item_check label="ボリューム" name="Rendering Type Volume" />
       <menu_item_check label="草" name="Rendering Type Grass" />
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 66ac069be4..13f94172b6 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -3303,7 +3303,7 @@ Webページにリンクすると、他人がこの場所に簡単にアクセ
     <tag>fail</tag>
   </notification>
 
-  <notification name="TeleportOfferSent">[TO_NAME]にテレポートを送りました。</notification>
+  <notification name="TeleportOfferSent">[TO_NAME]にテレポートのオファーを送りました。</notification>
 
   <notification name="TeleportRequest">[NAME_SLURL] は、テレポートであなたを呼んでいます。
 [MESSAGE]
@@ -3329,7 +3329,7 @@ Webページにリンクすると、他人がこの場所に簡単にアクセ
 
 [MESSAGE]
 
-（デフォルト設定だとお互いのオンライン状態を見ることができます）
+（デフォルトの設定では、お互いのオンライン状態を知ることができます。）
     <tag>friendship</tag>
     <tag>confirm</tag>
     <form name="form">
@@ -3984,10 +3984,10 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
     <unique />
   </notification>
 
-  <notification label="" name="HintMoveClick">⒈クリックで移動
-行地面の一箇所をクリックすると、その場所まで歩きます。
+  <notification label="" name="HintMoveClick">１，クリックで移動
+地面をクリックすると、その場所まで歩きます。
 
-⒉クリック・ドラッグで視界を回転
+２，クリック・ドラッグで視界を回転
 任意の場所をクリックしてドラッグすると視界を回転させることができます。
     <tag>custom_skin</tag>
   </notification>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
index 21dabb133c..f5f1bc1b03 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
@@ -38,10 +38,10 @@
     <combo_box.item label="太陽／月＋プロジェクター" name="2" value="2" />
   </combo_box>
   <view_border name="border3" />
-  <text name="water_lbl">水</text>
-  <text name="water_desc">水の効果を簡素化するかオフにすると、フレームレートが大幅に向上します。</text>
+  <text name="water_lbl">水面</text>
+  <text name="water_desc">水面の効果を簡素化するかオフにすると、フレームレートが大幅に向上します。</text>
   <check_box label="透明な水" name="TransparentWater" />
-  <text name="ReflectionsText">水の反射：</text>
+  <text name="ReflectionsText">水面の反射：</text>
   <combo_box name="Reflections">
     <combo_box.item label="なし；不透明" name="0" value="-2" />
     <combo_box.item label="なし；透明" name="0" value="-1" />
@@ -56,11 +56,11 @@
   <text name="photo_desc">詳細度を最大にすると撮影に適した画像になりますが、フレームレートが下がります。</text>
   <spinner label="距離の詳細：" name="render_volume_lod" />
   <text name="photo_desc">（0.0～4.0の値を入れてください）</text>
-  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" top="80" left="213" name="1_lbl" width="7">1</text>
-  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="31" name="2_lbl" width="7">2</text>
-  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="3_lbl" width="7">3</text>
-  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="4_lbl" width="7">4</text>
-  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="5_lbl" width="7">5</text>
-  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="6_lbl" width="7">6</text>
-  <text follows="left|top" font="SansSerifSmall" height="18" layout="topleft" left_pad="30" name="7_lbl" width="7">7</text>
+  <text name="1_lbl">1</text>
+  <text name="2_lbl">2</text>
+  <text name="3_lbl">3</text>
+  <text name="4_lbl">4</text>
+  <text name="5_lbl">5</text>
+  <text name="6_lbl">6</text>
+  <text name="7_lbl">7</text>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index a11ebb1fb3..092ea431b9 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
@@ -2,12 +2,12 @@
 <panel label="環境" name="panel_env_info">
   <string name="str_label_use_default">既定の設定を使用</string>
   <string name="str_label_use_region">リージョン（地域）の設定を使用</string>
-  <string name="str_altitude_desription">空 [INDEX]（[ALTITUDE]m）</string>
-  <string name="str_no_parcel">区画が選択されていません。環境設定が無効になっています。</string>
-  <string name="str_cross_region">リージョン（地域）の境界では環境設定ができません。</string>
-  <string name="str_legacy">このリージョン（地域）で環境設定はできません。</string>
-  <string name="str_disallowed">不動産マネージャーが、このリージョン（地域）で区画の環境を変更することを許可していません。</string>
-  <string name="str_too_small">環境をサポートするには、最低でも128㎡の区画が必要です。</string>
+  <string name="str_altitude_desription">空 [INDEX]（[ALTITUDE]ｍ）</string>
+  <string name="str_no_parcel">区画が選択されていません。環境の設定は無効になっています。</string>
+  <string name="str_cross_region">リージョン（地域）の境界では環境の設定ができません。</string>
+  <string name="str_legacy">このリージョン（地域）で環境の設定ができません。</string>
+  <string name="str_disallowed">このリージョン（地域）の不動産マネージャーは、区画ごとの環境の変更を許可していません。</string>
+  <string name="str_too_small">環境を変更するには、最低でも128㎡の区画が必要です。</string>
   <string name="str_empty">（空）</string>
   <string name="str_region_env">（リージョンの環境）</string>
   <layout_stack>
@@ -22,7 +22,7 @@
               <button label="[USEDEFAULT]" name="btn_usedefault" />
               <button label="持ち物を使う" name="btn_select_inventory" />
               <button label="カスタマイズ" name="btn_edit" />
-              <check_box label="区画所有者が環境を上書きすることがあります" name="chk_allow_override" />
+              <check_box label="区画所有者による環境を上書きを許可" name="chk_allow_override" />
             </layout_panel>
             <layout_panel name="pnl_environment_length">
               <text name="lbl_apparent_time">[AP]　[HH]：[MM]（[PRC]％）</text>
@@ -32,19 +32,19 @@
         </layout_panel>
         <layout_panel name="pnl_environment_altitudes">
           <panel name="pnl_alt1">
-            <text name="txt_alt1">空[INDEX]　[ALTITUDE]m</text>
+            <text name="txt_alt1">空[INDEX]　[ALTITUDE]ｍ</text>
             <line_editor name="edt_invname_alt1">不明</line_editor>
-            <settings_drop_target name="sdt_alt1" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+            <settings_drop_target name="sdt_alt1" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。" />
           </panel>
           <panel name="pnl_alt2">
-            <text name="txt_alt2">空[INDEX]　[ALTITUDE]m</text>
+            <text name="txt_alt2">空[INDEX]　[ALTITUDE]ｍ</text>
             <line_editor name="edt_invname_alt2">不明</line_editor>
-            <settings_drop_target name="sdt_alt2" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+            <settings_drop_target name="sdt_alt2" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。" />
           </panel>
           <panel name="pnl_alt3">
-            <text name="txt_alt3">空[INDEX]　[ALTITUDE]m</text>
+            <text name="txt_alt3">空[INDEX]　[ALTITUDE]ｍ</text>
             <line_editor name="edt_invname_alt3">不明</line_editor>
-            <settings_drop_target name="sdt_alt3" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する" />
+            <settings_drop_target name="sdt_alt3" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。" />
           </panel>
           <multi_slider initial_value="0" name="sld_altitudes">
             <slider name="sld1" value="1000" />
@@ -54,12 +54,12 @@
           <panel name="pnl_ground">
             <text name="txt_ground">地面</text>
             <line_editor name="edt_invname_ground">不明</line_editor>
-            <settings_drop_target name="sdt_ground" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、地表レベルの空として選択します。" />
+            <settings_drop_target name="sdt_ground" tool_tip="インベントリからターゲットボックスに設定をドラッグし、地面レベルの空として選択します。" />
           </panel>
           <panel name="pnl_water">
             <text name="txt_water">水面</text>
             <line_editor name="edt_invname_water">不明</line_editor>
-            <settings_drop_target name="sdt_water" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の水として選択する" />
+            <settings_drop_target name="sdt_water" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の水面として選択する" />
           </panel>
           <button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット" />
         </layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
index 4ffae24e0b..5c646f18bd 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="密度" name="panel_settings_sky_density">
+<panel label="空中の光の散乱密度" name="panel_settings_sky_density">
   <layout_stack>
     <layout_panel>
-      <slider name="rayleigh_exponential" label="レイリー指数項：" />
-      <slider name="rayleigh_exponential_scale" label="レイリー指数スケール：" />
-      <slider name="rayleigh_linear" label="レイリー線形項：" />
-      <slider name="rayleigh_constant" label="レイリー定数項：" />
-      <slider name="rayleigh_max_altitude" label="レイリー最大高度：" />
+      <slider name="rayleigh_exponential" label="レイリー散乱の指数：" />
+      <slider name="rayleigh_exponential_scale" label="レイリー散乱の指数係数：" />
+      <slider name="rayleigh_linear" label="レイリー散乱の線形項：" />
+      <slider name="rayleigh_constant" label="レイリー散乱の定数：" />
+      <slider name="rayleigh_max_altitude" label="レイリー散乱の最大高度：" />
     </layout_panel>
     <layout_panel>
-      <slider name="mie_exponential" label="Mie指数項：" />
-      <slider name="mie_exponential_scale" label="Mie指数スケール：" />
-      <slider name="mie_linear" label="Mie線形期間：" />
-      <slider name="mie_constant" label="Mie定数項：" />
-      <slider name="mie_aniso_factor" label="Mieアニソ係数：" />
-      <slider name="mie_max_altitude" label="Mieの最高高度：" />
+      <slider name="mie_exponential" label="ミー散乱の指数：" />
+      <slider name="mie_exponential_scale" label="ミー散乱の指数係数：" />
+      <slider name="mie_linear" label="ミー散乱の線形項：" />
+      <slider name="mie_constant" label="ミー散乱の定数" />
+      <slider name="mie_aniso_factor" label="ミー散乱の異方性因子：" />
+      <slider name="mie_max_altitude" label="ミー散乱の最高高度：" />
     </layout_panel>
     <layout_panel>
-      <slider name="absorption_exponential" label="吸収指数項：" />
-      <slider name="absorption_exponential_scale" label="吸収指数スケール：" />
-      <slider name="absorption_linear" label="吸収線形項：" />
-      <slider name="absorption_constant" label="吸収定数項：" />
-      <slider name="absorption_max_altitude" label="吸収最大高度：" />
+      <slider name="absorption_exponential" label="光の吸収の指数：" />
+      <slider name="absorption_exponential_scale" label="光の吸収の指数係数：" />
+      <slider name="absorption_linear" label="光の吸収の線形項：" />
+      <slider name="absorption_constant" label="光の吸収の定数：" />
+      <slider name="absorption_max_altitude" label="光の吸収の最大高度：" />
     </layout_panel>
   </layout_stack>
 </panel> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 42f8e0ebdc..3d2c592ffb 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -3712,7 +3712,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 
   <!-- settings -->
   <string name="New Daycycle">新しいデイサイクル</string>
-  <string name="New Water">新しい水</string>
+  <string name="New Water">新しい水面</string>
   <string name="New Sky">新しい空</string>
 
 
diff --git a/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
index 534ce0bbb9..b6cad64188 100644
--- a/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
@@ -7,5 +7,5 @@
   <lock_panel name="btn_lock" tool_tip="編集権限がありません。" />
   <lock_icon name="btn_lock1" />
   <edit_panel name="btn_edit_panel" />
-  <edit_btn name="btn_edit" tool_tip="アウトフィットを編集" />
+  <edit_btn name="btn_edit" tool_tip="この衣装を編集" />
 </clothing_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
index 61bb12412b..418c1d47f0 100644
--- a/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <deletable_wearable_list_item name="deletable_wearable_item">
-  <delete_btn name="btn_delete" tool_tip="服装から削除" />
+  <delete_btn name="btn_delete" tool_tip="アウトフィットから削除"/>
   <item_icon name="item_icon" />
   <item_name name="item_name" value="…" />
 </deletable_wearable_list_item>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
index bf6e105465..1a2e7e6b31 100644
--- a/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<flat_list_view allow_select="true" color="PanelFocusBackgroundColor" item_pad="0" keep_one_selected="true" multi_select="false" opaque="true">
-  <flat_list_view.no_items_text follows="all" name="no_items_msg" v_pad="10" h_pad="10" value="一致するものが見つかりませんでした。" wrap="true" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<flat_list_view>
+  <flat_list_view.no_items_text name="no_items_msg" value="一致するものが見つかりませんでした。" />
 </flat_list_view>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
index c42b38a3f6..b0fdbf31da 100644
--- a/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_item_separator name="separator" label="─────" />
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
index c71fc8cd5e..418cbd1d9e 100644
--- a/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Use "disabled color" to make it look like menu separators -->
-<menu_item_tear_off enabled_color="MenuItemDisabledColor" name="tear_off" label="〰〰〰〰〰" disabled_color="MenuItemDisabledColor" highlight_bg_color="MenuItemHighlightBgColor" highlight_fg_color="MenuItemHighlightFgColor" />
+<menu_item_tear_off name="tear_off" label="〰〰〰〰〰" />
-- 
cgit v1.2.3


From d134d155e2ddaf07ba1cdac50c1e31781e451ee5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Jun 2023 22:15:33 +0300
Subject: SL-19806 Crash at vobj

---
 indra/newview/lldrawpool.cpp      | 12 ++++++------
 indra/newview/lldrawpoolalpha.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
index 594cfe513d..3fd15d36df 100644
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -402,7 +402,7 @@ void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL t
             if(pparams->mFace)
             {
                 LLViewerObject* vobj = pparams->mFace->getViewerObject();
-                if(vobj->isAttachment())
+                if(vobj && vobj->isAttachment())
                 {
                     trackAttachments(vobj, false, &ratPtr);
                 }
@@ -429,7 +429,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, U32 mask,
             if(pparams->mFace)
             {
                 LLViewerObject* vobj = pparams->mFace->getViewerObject();
-                if(vobj->isAttachment())
+                if(vobj && vobj->isAttachment())
                 {
                     trackAttachments( vobj, true ,&ratPtr);
                 }
@@ -459,7 +459,7 @@ void LLRenderPass::pushBatches(U32 type, U32 mask, BOOL texture, BOOL batch_text
             if(pparams->mFace)
             {
                 LLViewerObject* vobj = pparams->mFace->getViewerObject();
-                if(vobj->isAttachment())
+                if(vobj && vobj->isAttachment())
                 {
                     trackAttachments( vobj, false, &ratPtr);
                 }
@@ -484,7 +484,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, U32 mask, BOOL texture, BOOL batc
             if(pparams->mFace)
             {
                 LLViewerObject* vobj = pparams->mFace->getViewerObject();
-                if(vobj->isAttachment())
+                if(vobj && vobj->isAttachment())
                 {
                     trackAttachments( vobj, true, &ratPtr);
                 }
@@ -514,7 +514,7 @@ void LLRenderPass::pushMaskBatches(U32 type, U32 mask, BOOL texture, BOOL batch_
             if((*pparams).mFace)
             {
                 LLViewerObject* vobj = (*pparams).mFace->getViewerObject();
-                if(vobj->isAttachment())
+                if(vobj && vobj->isAttachment())
                 {
                     trackAttachments( vobj, false, &ratPtr);
                 }
@@ -539,7 +539,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, U32 mask, BOOL texture, BOOL
             if((*pparams).mFace)
             {
                 LLViewerObject* vobj = (*pparams).mFace->getViewerObject();
-                if(vobj->isAttachment())
+                if(vobj && vobj->isAttachment())
                 {
                     trackAttachments( vobj, true, &ratPtr);
                 }
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index edd0afe357..ab1ac7e30c 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -349,7 +349,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask)
                     if(params.mFace)
                     {
                         LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
-                        if(vobj->isAttachment())
+                        if(vobj && vobj->isAttachment())
                         {
                             trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
                         }
@@ -622,7 +622,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged)
                 {
                     LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
 
-                    if(vobj->isAttachment())
+                    if(vobj && vobj->isAttachment())
                     {
                         trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
                     }
-- 
cgit v1.2.3


From 87d24252df91284eb0cd9ab2f08b376ded05554c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 01:58:30 +0300
Subject: SL-19795 Remove extra panels, reuse combination ones instead

---
 indra/newview/llinventoryfilter.cpp                |  17 ++-
 indra/newview/llinventorygallery.cpp               |   6 +-
 indra/newview/llpanelmaininventory.cpp             | 165 ++++++++++++---------
 indra/newview/llpanelmaininventory.h               |   7 +-
 .../skins/default/xui/en/panel_main_inventory.xml  |  55 -------
 5 files changed, 114 insertions(+), 136 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 5d6c3be168..5cf6c3fb7d 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -763,11 +763,24 @@ void LLInventoryFilter::setFilterThumbnails(U64 filter_thumbnails)
 {
     if (mFilterOps.mFilterThumbnails != filter_thumbnails)
     {
-        if (mFilterOps.mFilterThumbnails == FILTER_EXCLUDE_THUMBNAILS ||
-            mFilterOps.mFilterThumbnails == FILTER_ONLY_THUMBNAILS)
+        if (mFilterOps.mFilterThumbnails == FILTER_EXCLUDE_THUMBNAILS
+            && filter_thumbnails == FILTER_ONLY_THUMBNAILS)
+        {
+            setModified(FILTER_RESTART);
+        }
+        else if (mFilterOps.mFilterThumbnails == FILTER_ONLY_THUMBNAILS
+            && filter_thumbnails == FILTER_EXCLUDE_THUMBNAILS)
+        {
+            setModified(FILTER_RESTART);
+        }
+        else if (mFilterOps.mFilterThumbnails == FILTER_INCLUDE_THUMBNAILS)
+        {
             setModified(FILTER_MORE_RESTRICTIVE);
+        }
         else
+        {
             setModified(FILTER_LESS_RESTRICTIVE);
+        }
     }
     mFilterOps.mFilterThumbnails = filter_thumbnails;
 }
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 2f9f594790..efc78c5357 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -711,11 +711,7 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
         LL_WARNS("InventoryGallery") << "Failed to find item: " << item_id << LL_ENDL;
         return;
     }
-    if(!mFilter->checkAgainstFilterThumbnails(item_id))
-    {
-        mThumbnailsObserver->addSkippedItem(item_id, boost::bind(&LLInventoryGallery::onThumbnailAdded, this, item_id));
-        return;
-    }
+
     std::string name = obj->getName();
     LLUUID thumbnail_id = obj->getThumbnailUUID();;
     LLInventoryType::EType inventory_type(LLInventoryType::IT_CATEGORY);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 3c867f0e90..2939bc2aaf 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -255,31 +255,22 @@ BOOL LLPanelMainInventory::postBuild()
     mNavigationBtnsPanel = getChild<LLLayoutPanel>("nav_buttons");
 
     mDefaultViewPanel = getChild<LLPanel>("default_inventory_panel");
-    mListViewPanel = getChild<LLPanel>("single_folder_inventory");
-    mGalleryViewPanel = getChild<LLPanel>("gallery_view_inventory");
     mCombinationViewPanel = getChild<LLPanel>("combination_view_inventory");
     mCombinationGalleryLayoutPanel = getChild<LLLayoutPanel>("comb_gallery_layout");
     mCombinationListLayoutPanel = getChild<LLLayoutPanel>("comb_inventory_layout");
 
-    mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
-    mListViewRootUpdatedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
-    mSingleFolderPanelInventory->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mSingleFolderPanelInventory, _1, _2));
-
-    mInventoryGalleryPanel = getChild<LLInventoryGallery>("gallery_view_inv");
-    mGalleryRootUpdatedConnection = mInventoryGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
-
     mCombinationInventoryPanel = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
     LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
     comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_EXCLUDE_THUMBNAILS);
     comb_inv_filter.markDefault();
     mCombinationInventoryPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onCombinationInventorySelectionChanged, this, _1, _2));
-    mCombinationInventoryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
+    mListViewRootUpdatedConnection = mCombinationInventoryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
 
     mCombinationGalleryPanel = getChild<LLInventoryGallery>("comb_gallery_view_inv");
     LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
     comb_gallery_filter.setFilterThumbnails(LLInventoryFilter::FILTER_ONLY_THUMBNAILS);
     comb_gallery_filter.markDefault();
-    mCombinationGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, true));
+    mGalleryRootUpdatedConnection = mCombinationGalleryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, true));
     mCombinationGalleryPanel->setSelectionChangeCallback(boost::bind(&LLPanelMainInventory::onCombinationGallerySelectionChanged, this, _1));
 
 	initListCommandsHandlers();
@@ -652,7 +643,7 @@ void LLPanelMainInventory::setSearchType(LLInventoryFilter::ESearchType type)
 {
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        mInventoryGalleryPanel->setSearchType(type);
+        mCombinationGalleryPanel->setSearchType(type);
     }
     if(mSingleFolderMode && isCombinationViewMode())
     {
@@ -671,7 +662,7 @@ void LLPanelMainInventory::updateSearchTypeCombo()
 
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        search_type = mInventoryGalleryPanel->getSearchType();
+        search_type = mCombinationGalleryPanel->getSearchType();
     }
     else if(mSingleFolderMode && isCombinationViewMode())
     {
@@ -753,7 +744,7 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
     if(mSingleFolderMode && isGalleryViewMode())
     {
         mFilterSubString = search_string;
-        mInventoryGalleryPanel->setFilterSubString(mFilterSubString);
+        mCombinationGalleryPanel->setFilterSubString(mFilterSubString);
         return;
     }
     if(mSingleFolderMode && isCombinationViewMode())
@@ -1282,9 +1273,9 @@ void LLFloaterInventoryFinder::draw()
     bool is_sf_mode = mPanelMainInventory->isSingleFolderMode();
     if(is_sf_mode && mPanelMainInventory->isGalleryViewMode())
     {
-        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setShowFolderState(getCheckShowEmpty() ?
+        mPanelMainInventory->mCombinationGalleryPanel->getFilter().setShowFolderState(getCheckShowEmpty() ?
             LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
-        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setFilterObjectTypes(filter);
+        mPanelMainInventory->mCombinationGalleryPanel->getFilter().setFilterObjectTypes(filter);
     }
     else
     {
@@ -1324,9 +1315,9 @@ void LLFloaterInventoryFinder::draw()
 	mPanelMainInventory->setFilterTextFromFilter();
     if(is_sf_mode && mPanelMainInventory->isGalleryViewMode())
     {
-        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setHoursAgo(hours);
-        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setDateRangeLastLogoff(getCheckSinceLogoff());
-        mPanelMainInventory->mInventoryGalleryPanel->getFilter().setDateSearchDirection(getDateSearchDirection());
+        mPanelMainInventory->mCombinationGalleryPanel->getFilter().setHoursAgo(hours);
+        mPanelMainInventory->mCombinationGalleryPanel->getFilter().setDateRangeLastLogoff(getCheckSinceLogoff());
+        mPanelMainInventory->mCombinationGalleryPanel->getFilter().setDateSearchDirection(getDateSearchDirection());
     }
     else
     {
@@ -1526,13 +1517,7 @@ void LLPanelMainInventory::toggleViewMode()
         mCombinationGalleryPanel->updateRootFolder();
     }
 
-    mDefaultViewPanel->setVisible(!mSingleFolderMode);
-    mListViewPanel->setVisible(mSingleFolderMode && isListViewMode());
-    mGalleryViewPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
-    mCombinationViewPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
-    mNavigationBtnsPanel->setVisible(mSingleFolderMode);
-    mViewModeBtn->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
-
+    updatePanelVisibility();
     setActivePanel();
     updateTitle();
     onFilterSelected();
@@ -1615,11 +1600,11 @@ void LLPanelMainInventory::onUpFolderClicked()
         {
             if(isListViewMode())
             {
-                mSingleFolderPanelInventory->changeFolderRoot(cat->getParentUUID());
+                mCombinationInventoryPanel->changeFolderRoot(cat->getParentUUID());
             }
             if(isGalleryViewMode())
             {
-                mInventoryGalleryPanel->setRootFolder(cat->getParentUUID());
+                mCombinationGalleryPanel->setRootFolder(cat->getParentUUID());
             }
             if(isCombinationViewMode())
             {
@@ -1633,11 +1618,11 @@ void LLPanelMainInventory::onBackFolderClicked()
 {
     if(isListViewMode())
     {
-        mSingleFolderPanelInventory->onBackwardFolder();
+        mCombinationInventoryPanel->onBackwardFolder();
     }
     if(isGalleryViewMode())
     {
-        mInventoryGalleryPanel->onBackwardFolder();
+        mCombinationGalleryPanel->onBackwardFolder();
     }
     if(isCombinationViewMode())
     {
@@ -1649,11 +1634,11 @@ void LLPanelMainInventory::onForwardFolderClicked()
 {
     if(isListViewMode())
     {
-        mSingleFolderPanelInventory->onForwardFolder();
+        mCombinationInventoryPanel->onForwardFolder();
     }
     if(isGalleryViewMode())
     {
-        mInventoryGalleryPanel->onForwardFolder();
+        mCombinationGalleryPanel->onForwardFolder();
     }
     if(isCombinationViewMode())
     {
@@ -1665,18 +1650,18 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
 {
     if(isListViewMode())
     {
-        mSingleFolderPanelInventory->changeFolderRoot(folder_id);
+        mCombinationInventoryPanel->changeFolderRoot(folder_id);
         if(clear_nav_history)
         {
-            mSingleFolderPanelInventory->clearNavigationHistory();
+            mCombinationInventoryPanel->clearNavigationHistory();
         }
     }
     else if(isGalleryViewMode())
     {
-        mInventoryGalleryPanel->setRootFolder(folder_id);
+        mCombinationGalleryPanel->setRootFolder(folder_id);
         if(clear_nav_history)
         {
-            mInventoryGalleryPanel->clearNavigationHistory();
+            mCombinationGalleryPanel->clearNavigationHistory();
         }
     }
     else if(isCombinationViewMode())
@@ -1688,7 +1673,7 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
 
 LLUUID LLPanelMainInventory::getSingleFolderViewRoot()
 {
-    return mSingleFolderPanelInventory->getSingleFolderRoot();
+    return mCombinationInventoryPanel->getSingleFolderRoot();
 }
 
 void LLPanelMainInventory::showActionMenu(LLMenuGL* menu, std::string spawning_view_name)
@@ -1716,7 +1701,7 @@ void LLPanelMainInventory::saveTexture(const LLSD& userdata)
     LLUUID item_id;
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        item_id = mInventoryGalleryPanel->getSelectedItemID();
+        item_id = mCombinationGalleryPanel->getSelectedItemID();
         if (item_id.isNull()) return;
     }
     else
@@ -1814,7 +1799,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 	{
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            LLInventoryObject *obj = gInventory.getObject(mInventoryGalleryPanel->getSelectedItemID());
+            LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getSelectedItemID());
             if (obj && obj->getIsLinkType())
             {
                 show_item_original(obj->getUUID());
@@ -1844,7 +1829,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
                     LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
                     if (main_inventory)
                     {
-                        LLInventoryObject *obj = gInventory.getObject(mInventoryGalleryPanel->getSelectedItemID());
+                        LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getSelectedItemID());
                         if (obj)
                         {
                             main_inventory->findLinks(obj->getUUID(), obj->getName());
@@ -1871,7 +1856,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
         LLSD params;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            params = LLSD(mInventoryGalleryPanel->getSelectedItemID());
+            params = LLSD(mCombinationGalleryPanel->getSelectedItemID());
         }
         else
         {
@@ -1931,7 +1916,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
     {
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            std::set<LLUUID> uuids{mInventoryGalleryPanel->getSelectedItemID()};
+            std::set<LLUUID> uuids{ mCombinationGalleryPanel->getSelectedItemID()};
             LLAvatarActions::shareWithAvatars(uuids, gFloaterView->getParentFloater(this));
         }
         else
@@ -1975,7 +1960,7 @@ bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
     LLViewerInventoryItem *inv_item = NULL;
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        inv_item = gInventory.getItem(mInventoryGalleryPanel->getSelectedItemID());
+        inv_item = gInventory.getItem(mCombinationGalleryPanel->getSelectedItemID());
     }
     else
     {
@@ -2025,7 +2010,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
         LLUUID item_id;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            item_id = mInventoryGalleryPanel->getSelectedItemID();
+            item_id = mCombinationGalleryPanel->getSelectedItemID();
         }
         else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
@@ -2045,7 +2030,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
         LLUUID item_id;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            item_id = mInventoryGalleryPanel->getSelectedItemID();
+            item_id = mCombinationGalleryPanel->getSelectedItemID();
         }
         else{
 		LLFolderView* root = getActivePanel()->getRootFolder();
@@ -2080,7 +2065,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 	{
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            return can_share_item(mInventoryGalleryPanel->getSelectedItemID());
+            return can_share_item(mCombinationGalleryPanel->getSelectedItemID());
         }
         else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
@@ -2304,6 +2289,50 @@ void LLPanelMainInventory::onCombinationInventorySelectionChanged(const std::deq
     }
 }
 
+void LLPanelMainInventory::updatePanelVisibility()
+{
+    mDefaultViewPanel->setVisible(!mSingleFolderMode);
+    mCombinationViewPanel->setVisible(mSingleFolderMode);
+    mNavigationBtnsPanel->setVisible(mSingleFolderMode);
+    mViewModeBtn->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
+
+    if (mSingleFolderMode)
+    {
+        if (isCombinationViewMode())
+        {
+            LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
+            comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_EXCLUDE_THUMBNAILS);
+            comb_inv_filter.markDefault();
+
+            LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
+            comb_gallery_filter.setFilterThumbnails(LLInventoryFilter::FILTER_ONLY_THUMBNAILS);
+            comb_gallery_filter.markDefault();
+
+            // visibility will be controled by updateCombinationVisibility()
+            mCombinationGalleryLayoutPanel->setVisible(true);
+            mCombinationListLayoutPanel->setVisible(true);
+        }
+        else
+        {
+            LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
+            comb_inv_filter.setFilterThumbnails(LLInventoryFilter::FILTER_INCLUDE_THUMBNAILS);
+            comb_inv_filter.markDefault();
+
+            LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
+            comb_gallery_filter.setFilterThumbnails(LLInventoryFilter::FILTER_INCLUDE_THUMBNAILS);
+            comb_gallery_filter.markDefault();
+
+            mCombinationGalleryLayoutPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
+            mCombinationListLayoutPanel->setVisible(mSingleFolderMode && isListViewMode());
+        }
+    }
+    else
+    {
+        mCombinationGalleryLayoutPanel->setVisible(false);
+        mCombinationListLayoutPanel->setVisible(false);
+    }
+}
+
 void LLPanelMainInventory::updateCombinationVisibility()
 {
     if(mSingleFolderMode && isCombinationViewMode())
@@ -2379,13 +2408,13 @@ void LLPanelMainInventory::updateNavButtons()
 {
     if(isListViewMode())
     {
-        mBackBtn->setEnabled(mSingleFolderPanelInventory->isBackwardAvailable());
-        mForwardBtn->setEnabled(mSingleFolderPanelInventory->isForwardAvailable());
+        mBackBtn->setEnabled(mCombinationInventoryPanel->isBackwardAvailable());
+        mForwardBtn->setEnabled(mCombinationInventoryPanel->isForwardAvailable());
     }
     if(isGalleryViewMode())
     {
-        mBackBtn->setEnabled(mInventoryGalleryPanel->isBackwardAvailable());
-        mForwardBtn->setEnabled(mInventoryGalleryPanel->isForwardAvailable());
+        mBackBtn->setEnabled(mCombinationGalleryPanel->isBackwardAvailable());
+        mForwardBtn->setEnabled(mCombinationGalleryPanel->isForwardAvailable());
     }
     if(isCombinationViewMode())
     {
@@ -2417,12 +2446,12 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
         switch(mViewMode)
         {
             case MODE_LIST:
-                forward_history = mSingleFolderPanelInventory->getNavForwardList();
-                backward_history = mSingleFolderPanelInventory->getNavBackwardList();
+                forward_history = mCombinationInventoryPanel->getNavForwardList();
+                backward_history = mCombinationInventoryPanel->getNavBackwardList();
                 break;
             case MODE_GALLERY:
-                forward_history = mInventoryGalleryPanel->getNavForwardList();
-                backward_history = mInventoryGalleryPanel->getNavBackwardList();
+                forward_history = mCombinationGalleryPanel->getNavForwardList();
+                backward_history = mCombinationGalleryPanel->getNavBackwardList();
                 break;
             case MODE_COMBINATION:
                 forward_history = mCombinationInventoryPanel->getNavForwardList();
@@ -2434,21 +2463,19 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
         LLUUID cur_root = getCurrentSFVRoot();
         mViewMode = mode;
 
-        mListViewPanel->setVisible(mSingleFolderMode && isListViewMode());
-        mGalleryViewPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
-        mCombinationViewPanel->setVisible(mSingleFolderMode && isCombinationViewMode());
+        updatePanelVisibility();
 
         if(isListViewMode())
         {
-            mSingleFolderPanelInventory->changeFolderRoot(cur_root);
-            mSingleFolderPanelInventory->setNavForwardList(forward_history);
-            mSingleFolderPanelInventory->setNavBackwardList(backward_history);
+            mCombinationInventoryPanel->changeFolderRoot(cur_root);
+            mCombinationInventoryPanel->setNavForwardList(forward_history);
+            mCombinationInventoryPanel->setNavBackwardList(backward_history);
         }
         if(isGalleryViewMode())
         {
-            mInventoryGalleryPanel->setRootFolder(cur_root);
-            mInventoryGalleryPanel->setNavForwardList(forward_history);
-            mInventoryGalleryPanel->setNavBackwardList(backward_history);
+            mCombinationGalleryPanel->setRootFolder(cur_root);
+            mCombinationGalleryPanel->setNavForwardList(forward_history);
+            mCombinationGalleryPanel->setNavBackwardList(backward_history);
         }
         if(isCombinationViewMode())
         {
@@ -2464,7 +2491,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
 
         onFilterSelected();
         if((isListViewMode() && (mActivePanel->getFilterSubString() != mFilterSubString)) ||
-           (isGalleryViewMode() && (mInventoryGalleryPanel->getFilterSubString() != mFilterSubString)))
+           (isGalleryViewMode() && (mCombinationGalleryPanel->getFilterSubString() != mFilterSubString)))
         {
             onFilterEdit(mFilterSubString);
         }
@@ -2480,11 +2507,11 @@ LLUUID LLPanelMainInventory::getCurrentSFVRoot()
 {
     if(isListViewMode())
     {
-        return mSingleFolderPanelInventory->getSingleFolderRoot();
+        return mCombinationInventoryPanel->getSingleFolderRoot();
     }
     if(isGalleryViewMode())
     {
-        return mInventoryGalleryPanel->getRootFolder();
+        return mCombinationGalleryPanel->getRootFolder();
     }
     if(isCombinationViewMode())
     {
@@ -2497,7 +2524,7 @@ LLInventoryFilter& LLPanelMainInventory::getCurrentFilter()
 {
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        return mInventoryGalleryPanel->getFilter();
+        return mCombinationGalleryPanel->getFilter();
     }
     else
     {
@@ -2509,7 +2536,7 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_w
 {
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        mInventoryGalleryPanel->changeItemSelection(item_id, true);
+        mCombinationGalleryPanel->changeItemSelection(item_id, true);
     }
     else if(mSingleFolderMode && isCombinationViewMode())
     {
@@ -2540,7 +2567,7 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_w
     }
     else if (mSingleFolderMode && isListViewMode())
     {
-        mSingleFolderPanelInventory->setSelection(item_id, true);
+        mCombinationInventoryPanel->setSelection(item_id, true);
     }
 }
 
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index a02c13ddde..61ccfc02a1 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -164,6 +164,7 @@ protected:
 	bool isSaveTextureEnabled(const LLSD& userdata);
 	void updateItemcountText();
 
+    void updatePanelVisibility();
     void updateCombinationVisibility();
 
 	void onFocusReceived();
@@ -198,18 +199,14 @@ private:
     LLButton* mViewModeBtn;
     LLLayoutPanel* mNavigationBtnsPanel;
 
-    LLPanel* mListViewPanel;
-    LLPanel* mGalleryViewPanel;
     LLPanel* mDefaultViewPanel;
+    LLPanel* mCombinationViewPanel;
 
     bool mSingleFolderMode;
     EViewModeType mViewMode;
-    LLInventorySingleFolderPanel* mSingleFolderPanelInventory;
-    LLInventoryGallery* mInventoryGalleryPanel;
 
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
-    LLPanel* mCombinationViewPanel;
     LLPanel* mCombinationGalleryLayoutPanel;
     LLPanel* mCombinationListLayoutPanel;
 
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 53803f8067..3391c1d00c 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -272,61 +272,6 @@
         </inventory_panel>
       </tab_container>
     </panel>
-    <panel
-     follows="all"
-     halign="center"
-     height="372"
-     layout="topleft"
-     left="7"
-     name="single_folder_inventory"
-     top_delta="0"
-     visible="false"
-     width="312">
-      <single_folder_inventory_panel
-       name="single_folder_inv"
-       follows="all"
-       left="0"
-       top_pad="1"
-       height="372"
-       width="312"
-       layout="topleft"
-       show_item_link_overlays="true"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
-       border="false"
-       bevel_style="none"
-       scroll.reserve_scroll_corner="false">
-        <item
-         single_folder_mode="true"
-         folder_indentation="-8"/>
-        <folder
-         single_folder_mode="true"
-         folder_indentation="-8"/>
-      </single_folder_inventory_panel>
-    </panel>
-    <panel
-     follows="all"
-     halign="center"
-     height="372"
-     layout="topleft"
-     left="7"
-     name="gallery_view_inventory"
-     top_delta="0"
-     visible="false"
-     width="312">
-      <panel
-       class="inventory_gallery"
-       filename="panel_inventory_gallery.xml"
-       left="0"
-       top="0"
-       height="372"
-       width="312"
-       name="gallery_view_inv"
-       background_visible="true"
-       follows="all"
-       layout="topleft" />
-    </panel>
     <panel
      follows="all"
      halign="center"
-- 
cgit v1.2.3


From c813a322fb89e94f3666cea3ff16b69127f3dcc1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 02:47:46 +0300
Subject: SL-19796 Fix inventory autoscroll and autoraneme

---
 indra/newview/llpanelmaininventory.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2939bc2aaf..6a5b0eebed 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -517,8 +517,13 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                     mForceShowInvLayout = true;
                 }
 
-                LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
-                menu_create_inventory_item(getPanel(), bridge, userdata);
+                std::function<void(const LLUUID&)> callback_cat_created = [this](const LLUUID& new_category_id)
+                {
+                    gInventory.notifyObservers();
+                    mCombinationInventoryPanel->setSelectionByID(new_category_id, TRUE);
+                    mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
+                };
+                menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
             }
         }
         else
-- 
cgit v1.2.3


From 959829bb7ef737bd5d9748dd27e074d23974e654 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 02:58:56 +0300
Subject: SL-19796 Small cleanup

---
 indra/newview/llpanelmaininventory.cpp | 22 +++-------------------
 indra/newview/llpanelmaininventory.h   |  2 --
 2 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 6a5b0eebed..e4de6078f3 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -121,9 +121,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
       mForceShowInvLayout(false),
       mViewMode(MODE_COMBINATION),
       mListViewRootUpdatedConnection(),
-      mGalleryRootUpdatedConnection(),
-      mDelayedCombGalleryScroll(false),
-      mDelayedCombInvPanelScroll(false)
+      mGalleryRootUpdatedConnection()
 {
 	// Menu Callbacks (non contex menus)
 	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2));
@@ -2548,26 +2546,12 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_w
         if(mCombinationGalleryPanel->getFilter().checkAgainstFilterThumbnails(item_id))
         {
             mCombinationGalleryPanel->changeItemSelection(item_id, false);
-            if(new_window)
-            {
-                mDelayedCombGalleryScroll = new_window;
-            }
-            else
-            {
-                scrollToGallerySelection();
-            }
+            scrollToGallerySelection();
         }
         else
         {
             mCombinationInventoryPanel->setSelection(item_id, true);
-            if(new_window)
-            {
-                mDelayedCombInvPanelScroll = new_window;
-            }
-            else
-            {
-                scrollToInvPanelSelection();
-            }
+            scrollToInvPanelSelection();
         }
     }
     else if (mSingleFolderMode && isListViewMode())
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 61ccfc02a1..ae2e07da11 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -250,8 +250,6 @@ private:
 
     bool                        mForceShowInvLayout;
     bool                        mReshapeInvLayout;
-    bool                        mDelayedCombGalleryScroll;
-    bool                        mDelayedCombInvPanelScroll;
 	// List Commands                                                              //
 	////////////////////////////////////////////////////////////////////////////////
 };
-- 
cgit v1.2.3


From e4906b2ab9922453b1f29d2a29b4306c2722cd1a Mon Sep 17 00:00:00 2001
From: Logue <logue@hotmail.co.jp>
Date: Sat, 3 Jun 2023 03:01:26 +0900
Subject: Inventory mistranslation fix. Translate untranslated parts of
 Preferences panel.

---
 .../newview/skins/default/xui/ja/notifications.xml | 14 ++--
 .../default/xui/ja/panel_preferences_chat.xml      | 12 +--
 .../default/xui/ja/panel_preferences_graphics1.xml |  6 +-
 .../default/xui/ja/panel_preferences_sound.xml     | 86 +++++++++++++---------
 .../default/xui/ja/panel_preferences_uploads.xml   |  2 +-
 .../default/xui/ja/panel_region_environment.xml    |  2 +-
 .../default/xui/ja/panel_sidetray_home_tab.xml     |  4 +-
 .../skins/default/xui/ja/sidepanel_inventory.xml   |  8 +-
 8 files changed, 77 insertions(+), 57 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 13f94172b6..31c54b58e8 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -476,7 +476,7 @@ L$が不足しているので、このグループに参加することができ
     <tag>confirm</tag>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
   </notification>
-  <notification name="ReturnAllTopObjects">リストされた全てのオブジェクトを所有者の持ち物に戻しますか？
+  <notification name="ReturnAllTopObjects">リストされた全てのオブジェクトを所有者のインベントリに戻しますか？
 これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります！
     <tag>confirm</tag>
     <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
@@ -766,7 +766,7 @@ L$が不足しているので、このグループに参加することができ
   </notification>
   <notification name="CannotCopyWarning">以下のアイテムをコピーする権限がありません：
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
-他の人に譲ると、そのアイテムはあなたの持ち物から削除されます。本当にこれらのアイテムを譲ってもよろしいですか？
+他の人に譲ると、そのアイテムはあなたのインベントリから削除されます。本当にこれらのアイテムを譲ってもよろしいですか？
     <tag>confirm</tag>
     <tag>fail</tag>
     <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
@@ -4905,11 +4905,11 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
     <tag>fail</tag>
   </notification>
 
-  <notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。持ち物を作成することもできません。
+  <notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。インベントリを作成することもできません。
     <tag>fail</tag>
   </notification>
 
-  <notification name="CantParceInventoryInNotice">通知内の持ち物を検出できません。
+  <notification name="CantParceInventoryInNotice">通知内のインベントリを検出できません。
     <tag>fail</tag>
   </notification>
 
@@ -5098,7 +5098,7 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
     <tag>fail</tag>
   </notification>
 
-  <notification name="CantCreateRequestedInvFolder">リクエストされた持ち物フォルダーを作成できません。
+  <notification name="CantCreateRequestedInvFolder">リクエストされたインベントリフォルダーを作成できません。
     <tag>fail</tag>
   </notification>
 
@@ -5118,7 +5118,7 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
     <tag>fail</tag>
   </notification>
 
-  <notification name="CantFindInvItem">持ち物アイテムを見つけることができません。
+  <notification name="CantFindInvItem">インベントリアイテムを見つけることができません。
     <tag>fail</tag>
   </notification>
 
@@ -5255,7 +5255,7 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
     <usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
   </notification>
 
-  <notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。自分の持ち物からコピーしてやり直してください。
+  <notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。自分のインベントリからコピーしてやり直してください。
     <tag>fail</tag>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index f0d697052e..63fed75b7d 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -3,8 +3,9 @@
   <check_box initial_value="true" label="近隣チャットでジェスチャーを自動補完する" name="auto_complete_gestures" />
   <panel name="general_chat_settings">
     <check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation" />
-    <check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email" />
-    <check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check" />
+    <check_box label="オフライン時に受け取ったＩＭはメールで受信する" name="send_im_to_email" />
+    <check_box label="フレンドとグループ以外からのコールとＩＭは受信しない" name="voice_call_friends_only_check" />
+    <text name="email_settings">[https://accounts.secondlife.com/change_email?lang=ja オフライン時のＩＭのメール送信先の設定]</text>
     <text name="font_size">文字の大きさ：</text>
     <combo_box name="chat_font_size">
       <item label="小" name="Small" value="0" />
@@ -74,9 +75,10 @@
   <panel name="log_settings">
     <text name="logging_label">保存：</text>
     <combo_box name="conversation_log_combo">
-      <item label="ログおよびテキストチャット" name="log_and_transcripts" value="2" />
+      <!-- TODO: Transscript翻訳が疑わしい -->
+      <item label="ログとテキストチャット" name="log_and_transcripts" value="2" />
       <item label="ログのみ" name="log_only" value="1" />
-      <item label="ログまたはテキストチャットなし" name="no_log_or_transcript" value="0" />
+      <item label="ログかテキストチャットなし" name="no_log_or_transcript" value="0" />
     </combo_box>
     <button label="ログを消去…" name="clear_log" />
     <button label="テキストチャットを削除…" name="delete_transcripts" />
@@ -85,5 +87,5 @@
   </panel>
   <button label="他の言語…" name="ok_btn" />
   <button label="自動置換…" name="autoreplace_showgui" />
-  <button label="スペルチェック中…" name="spellcheck_showgui" />
+  <button label="スペルチェック…" name="spellcheck_showgui" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 49a98a33f4..0f36d31d79 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -29,9 +29,7 @@
 
   <check_box initial_value="true" label="高度な光源モデル" name="UseLightShaders" />
 
-  <button height="23" label="Automatic adjustments settings" layout="topleft" left="30" name="AutoAdjustmentsButton" top_delta="30" width="200">
-    <button.commit_callback function="Pref.AutoAdjustments" />
-  </button>
+  <button label="自動調整" name="AutoAdjustmentsButton" />
 
   <slider label="アバターの最大複雑度：" name="IndirectMaxComplexity" tool_tip="どの程度の複雑度で他のアバターをJellyDollとして描画するを設定します。" />
   <text name="IndirectMaxComplexityText">0</text>
@@ -51,6 +49,8 @@
 
   <button label="プリセットを削除…" name="PrefDeleteButton" />
 
+  <button label="推奨設定にリセット" name="Defaults" />
+
   <button label="拡張設定…" name="AdvancedSettings" />
 
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 4b6972c015..2d9a01d2d7 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -1,35 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="サウンド" name="Preference Media panel">
-  <panel.string name="middle_mouse">マウスの中央</panel.string>
-  <slider label="全体の音量" name="System Volume" />
-  <check_box label="最小化時にミュート" name="mute_when_minimized" />
-  <text name="mute_chb_label">最小化時にミュート</text>
-  <slider label="ボタン" name="UI Volume" />
-  <slider label="風" name="Wind Volume" />
-  <slider label="効果音" name="SFX Volume" />
-  <slider label="ストリーミング音楽" name="Music Volume" />
-  <check_box label="有効" name="enable_music" />
-  <slider label="メディア" name="Media Volume" />
-  <check_box label="有効" name="enable_media" />
-  <slider label="ボイスチャット" name="Voice Volume" />
-  <check_box label="有効" name="enable_voice_check" />
-  <!-- -->
-  <check_box label="ジェスチャーの音を再生" name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を聞くにはこれを選択" />
-  <check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" />
-  <!-- -->
-  <text name="Listen media from">メディアとサウンドを聞く場所：</text>
-  <radio_group name="media_ear_location">
-    <radio_item label="カメラの位置から聞く" name="0" />
-    <radio_item label="アバターの位置から聞く" name="1" />
-  </radio_group>
-  <text name="media_autoplay_label">メディアの自動再生</text>
-  <combo_box name="media_auto_play_combo">
-    <item name="autoplay_enabled" label="再生する"/>
-    <item name="autoplay_ask" label="確認する"/>
-    <item name="autoplay_disabled" label="再生しない"/>
-  </combo_box>
-  <check_box label="話すときにアバターの口を動かす" name="enable_lip_sync" />
-  <check_box label="ボイスのオン・オフ切り替えに使用するトリガーキー：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを1度押して放すと、マイクのオン・オフ設定を切り替えます。トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。" />
-  <button label="入力・出力機器" name="device_settings_btn" />
-  <panel label="機器の設定" name="device_settings_panel" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="サウンド" name="Preference Media panel">
+  <panel.string name="middle_mouse">中央のボタン</panel.string>
+  <panel.string name="button4_mouse">４ボタン</panel.string>
+  <panel.string name="button5_mouse">５ボタン</panel.string>
+  <slider label="全体のボリューム" name="System Volume" />
+  <button name="mute_audio" />
+  <check_box name="mute_when_minimized" />
+  <!-- *HACK 
+  After storm-1109 will be fixed: instead of using this text_box, word_wrap should be applied for
+  "mute_when_minimized" check_box's label.-->
+  <text name="mute_chb_label">最小化時にミュート</text>
+  <slider label="ボタン" name="UI Volume" />
+
+  <button name="mute_audio" />
+  <slider label="環境音" name="Wind Volume" />
+  <button name="mute_audio" />
+  <slider label="効果音" name="SFX Volume" />
+  <button name="mute_audio" />
+  <slider label="ストリーミング音楽" name="Music Volume" />
+
+  <button name="mute_audio" />
+  <check_box label="有効" name="enable_music" />
+  <slider label="メディア" name="Media Volume" />
+  <button name="mute_audio" />
+  <check_box label="有効" name="enable_media" />
+  <slider label="ボイスチャット" name="Voice Volume" />
+  <button name="mute_audio" />
+  <check_box label="有効" name="enable_voice_check" />
+  <!-- -->
+  <text name="Listen media from">メディアとサウンドの聞き取り位置：</text>
+  <radio_group name="media_ear_location">
+    <radio_item label="カメラの位置" name="0" />
+    <radio_item label="アバターの位置" name="1" />
+  </radio_group>
+  <check_box name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします。" label="他のアバターに取り付けられたメディアを再生する" />
+  <text name="media_autoplay_label">メディアの自動再生</text>
+  <combo_box name="media_auto_play_combo">
+    <item label="再生しない" name="autoplay_disabled" value="0" />
+    <item label="常に再生" name="autoplay_enabled" value="1" />
+    <item label="その都度確認" name="autoplay_ask" value="2" />
+  </combo_box>
+  <text name="Listen from">ボイスの聞き取り位置：</text>
+  <radio_group name="ear_location">
+    <radio_item label="カメラの位置" name="0" />
+    <radio_item label="アバターの位置" name="1" />
+  </radio_group>
+  <check_box label="喋るときにアバターの口を動かす" name="enable_lip_sync" />
+  <check_box label="ボイスチャットをトグルモードにする" name="push_to_talk_toggle_check" tool_tip="トグルモードでは、トリガーキーを押すことでマイクのオン／オフを切り替えます。そうでない場合は、トリガーキーを押している間だけマイクがオンになります。" />
+  <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーからのサウンドを聞くにはこれを選択" label="ゼスチャーのサウンドを再生" />
+  <button label=入出力機器の設定" name="device_settings_btn" />
+  <panel name="device_settings_panel" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
index acea0ea965..2abebfffd3 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
@@ -5,6 +5,6 @@
   <text name="title_sounds">サウンド</text>
   <text name="title_animation">アニメーション</text>
   <text name="title_model">モデル</text>
-  <text name="upload_help">宛先フォルダを変更するには、持ち物でそのフォルダを右クリックして、
+  <text name="upload_help">宛先フォルダを変更するには、インベントリでそのフォルダを右クリックして、
 「デフォルトとして使用」を選択します。</text>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index 092ea431b9..de2c777612 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
@@ -20,7 +20,7 @@
           <layout_stack>
             <layout_panel name="pnl_environment_current">
               <button label="[USEDEFAULT]" name="btn_usedefault" />
-              <button label="持ち物を使う" name="btn_select_inventory" />
+              <button label="インベントリを使う" name="btn_select_inventory" />
               <button label="カスタマイズ" name="btn_edit" />
               <check_box label="区画所有者による環境を上書きを許可" name="chk_allow_override" />
             </layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index e231a3565b..7e358185b9 100644
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
@@ -20,8 +20,8 @@
         <text name="tab_description">現在の見た目を変更します。</text>
       </panel>
       <panel name="sidebar_inventory">
-        <text name="tab_name" value="持ち物" />
-        <text name="tab_description">現在の持ち物を確認します。</text>
+        <text name="tab_name" value="インベントリ" />
+        <text name="tab_description">現在のインベントリを確認します。</text>
       </panel>
     </panel>
   </scroll_container>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 559db635fc..939e530a55 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="もの" name="objects panel">
+<panel label="オブジェクト" name="objects panel">
   <panel label="" name="sidepanel_inventory_panel">
     <layout_stack name="inventory_layout_stack">
       <layout_panel name="inbox_layout_panel">
@@ -20,13 +20,13 @@
           <button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する" />
         </layout_panel>
         <layout_panel name="share_btn_lp">
-          <button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する" />
+          <button label="共有" name="share_btn" tool_tip="インベントリ内のアイテムを共有する。" />
         </layout_panel>
         <layout_panel name="shop_btn_lp">
           <button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く" />
-          <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する" />
+          <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用す。る" />
           <button label="再生" name="play_btn" />
-          <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする" />
+          <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする。" />
         </layout_panel>
       </layout_stack>
     </panel>
-- 
cgit v1.2.3


From 07fc011e209ab24069d06df961a000dc7d6de3cf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 21:24:15 +0300
Subject: SL-19796 Creating folders in list mode does not scroll to new folder

---
 indra/llui/llfolderview.cpp            | 20 ++++++++++++++------
 indra/newview/llpanelmaininventory.cpp | 21 +++++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 70c2a79d25..19855c9c76 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -695,12 +695,20 @@ void LLFolderView::draw()
 		}
 	}
 
-	if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().overlaps(mRenamer->getRect()))
-	{
-		// renamer is not connected to the item we are renaming in any form so manage it manually
-		// TODO: consider stopping on any scroll action instead of when out of visible area
-		finishRenamingItem();
-	}
+	if (mRenameItem
+        && mRenamer
+        && mRenamer->getVisible()
+        )
+	{
+        LLRect renamer_rect;
+        localRectToOtherView(mRenamer->getRect(), &renamer_rect, mScrollContainer);
+        if (!mScrollContainer->getRect().overlaps(renamer_rect))
+        {
+            // renamer is not connected to the item we are renaming in any form so manage it manually
+            // TODO: consider stopping on any scroll action instead of when out of visible area
+            finishRenamingItem();
+        }
+    }
 
 	// skip over LLFolderViewFolder::draw since we don't want the folder icon, label, 
 	// and arrow for the root folder
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index e4de6078f3..afb69d9b6d 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -515,11 +515,17 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                     mForceShowInvLayout = true;
                 }
 
-                std::function<void(const LLUUID&)> callback_cat_created = [this](const LLUUID& new_category_id)
+                LLHandle<LLPanel> handle = mCombinationInventoryPanel->getHandle();
+                std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID& new_category_id)
                 {
-                    gInventory.notifyObservers();
-                    mCombinationInventoryPanel->setSelectionByID(new_category_id, TRUE);
-                    mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
+                    gInventory.notifyObservers(); // not really needed, should have been already done
+                    LLInventorySingleFolderPanel* panel = (LLInventorySingleFolderPanel*)handle.get();
+                    if (new_category_id.notNull() && panel)
+                    {
+                        panel->setSelectionByID(new_category_id, TRUE);
+                        panel->getRootFolder()->scrollToShowSelection();
+                        panel->getRootFolder()->setNeedsAutoRename(TRUE);
+                    }
                 };
                 menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
             }
@@ -528,8 +534,11 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
         {
             std::function<void(const LLUUID&)> callback_cat_created = [this](const LLUUID &new_category_id)
             {
-                gInventory.notifyObservers();
-                setGallerySelection(new_category_id);
+                gInventory.notifyObservers(); // not really needed, should have been already done
+                if (new_category_id.notNull())
+                {
+                    setGallerySelection(new_category_id);
+                }
             };
             menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
         }
-- 
cgit v1.2.3


From 8a33d65e984431d47f260b2cacbfc20ed4f8124c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 22:48:57 +0300
Subject: SL-19815 Suppors Page Up, Page Down, Home, End and Delete

---
 indra/newview/llinventorygallery.cpp   | 103 +++++++++++++++++++++++++++++++++
 indra/newview/llinventorygallery.h     |   9 +--
 indra/newview/llinventorygallerymenu.h |   2 +-
 3 files changed, 109 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index efc78c5357..f4bd98a9f7 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -858,6 +858,109 @@ BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
     return res;
 }
 
+
+BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
+{
+    BOOL handled = FALSE;
+    switch (key)
+    {
+        case KEY_RETURN:
+            // Open selected items if enter key hit on the inventory panel
+            if (mask == MASK_NONE && mInventoryGalleryMenu && mSelectedItemID.notNull())
+            {
+                LLViewerInventoryCategory* category = gInventory.getCategory(mSelectedItemID);
+                if (category)
+                {
+                    setRootFolder(mSelectedItemID);
+                    handled = TRUE;
+                }
+            }
+            break;
+        case KEY_DELETE:
+#if LL_DARWIN
+        case KEY_BACKSPACE:
+#endif
+            // Delete selected items if delete or backspace key hit on the inventory panel
+            // Note: on Mac laptop keyboards, backspace and delete are one and the same
+            if (mSelectedItemID.notNull())
+            {
+                LLViewerInventoryCategory* category = gInventory.getCategory(mSelectedItemID);
+                if (category)
+                {
+                    if (get_is_category_removable(&gInventory, mSelectedItemID))
+                    {
+                        gInventory.removeCategory(mSelectedItemID);
+                        handled = TRUE;
+                    }
+                }
+                else
+                {
+                    if (get_is_item_removable(&gInventory, mSelectedItemID))
+                    {
+                        gInventory.removeItem(mSelectedItemID);
+                        handled = TRUE;
+                    }
+                }
+            }
+            break;
+
+        case KEY_F2:
+            mFilterSubString.clear();
+            if (mInventoryGalleryMenu && mSelectedItemID.notNull())
+            {
+                mInventoryGalleryMenu->doToSelected("rename", mSelectedItemID);
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_PAGE_UP:
+            mFilterSubString.clear();
+            if (mScrollPanel)
+            {
+                mScrollPanel->pageUp(30);
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_PAGE_DOWN:
+            mFilterSubString.clear();
+            if (mScrollPanel)
+            {
+                mScrollPanel->pageDown(30);
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_HOME:
+            mFilterSubString.clear();
+            if (mScrollPanel)
+            {
+                mScrollPanel->goToTop();
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_END:
+            mFilterSubString.clear();
+            if (mScrollPanel)
+            {
+                mScrollPanel->goToBottom();
+            }
+            handled = TRUE;
+            break;
+
+        default:
+            break;
+    }
+
+    if (handled)
+    {
+        mInventoryGalleryMenu->hide();
+    }
+
+    return handled;
+}
+
 void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
 {
     if (mInventoryGalleryMenu && item_id.notNull())
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 7e4ed9725b..de0cba6e63 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -73,12 +73,13 @@ public:
     LLInventoryGallery(const LLInventoryGallery::Params& params = getDefaultParams());
     ~LLInventoryGallery();
 
-    BOOL postBuild();
+    BOOL postBuild() override;
     void initGallery();
-    void draw();
+    void draw() override;
     BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type,
-                           void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
-    BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+                           void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) override;
+    BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+    BOOL handleKeyHere(KEY key, MASK mask) override;
 
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
diff --git a/indra/newview/llinventorygallerymenu.h b/indra/newview/llinventorygallerymenu.h
index fd542e7d79..67cf9a569a 100644
--- a/indra/newview/llinventorygallerymenu.h
+++ b/indra/newview/llinventorygallerymenu.h
@@ -39,12 +39,12 @@ public:
 
     bool isRootFolder() { return mRootFolder; }
     void setRootFolder(bool is_root) { mRootFolder = is_root; }
+    void doToSelected(const LLSD& userdata, const LLUUID& selected_id);
 
 protected:
     //virtual void buildContextMenu(class LLMenuGL& menu, U32 flags);
     void updateMenuItemsVisibility(LLContextMenu* menu);
 
-    void doToSelected(const LLSD& userdata, const LLUUID& selected_id);
     void fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id);
 
     static void onRename(const LLSD& notification, const LLSD& response);
-- 
cgit v1.2.3


From 42e6c35ace5c54c17460815a19c82486d8b450ca Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Jun 2023 23:03:52 +0300
Subject: SL-17429 Message user when their inventory hits AIS3 limits #2

---
 indra/newview/llaisapi.cpp                           | 11 ++++++++++-
 indra/newview/skins/default/xui/en/notifications.xml |  8 ++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index fcee3a3e91..4ac2acf1d1 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -901,7 +901,16 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
                 if (body.has("depth") && body["depth"].asInteger() == 0)
                 {
                     // Can't fetch a single folder with depth 0, folder is too big.
-                    LLNotificationsUtil::add("InventoryLimitReachedAIS");
+                    static bool first_call = true;
+                    if (first_call)
+                    {
+                        first_call = false;
+                        LLNotificationsUtil::add("InventoryLimitReachedAISAlert");
+                    }
+                    else
+                    {
+                        LLNotificationsUtil::add("InventoryLimitReachedAIS");
+                    }
                     LL_WARNS("Inventory") << "Fetch failed, content is over limit, url: " << url << LL_ENDL;
                 }
                 else
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4c8d7fbd83..aa8e6176e1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6440,6 +6440,14 @@ Your trash is overflowing. This may cause problems logging in.
          yestext="Check trash folder"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryLimitReachedAISAlert"
+   type="alertmodal">
+Your inventory is experiencing issues. Please, contact support.
+  <tag>fail</tag>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="InventoryLimitReachedAIS"
-- 
cgit v1.2.3


From bbd0a09fbaaa354f522bf77241b9039288f10479 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 31 May 2023 12:45:22 +0200
Subject: SL-18251 Expand extents to include the Control Avatar bounds

---
 indra/newview/llcontrolavatar.cpp    |  7 +++++
 indra/newview/llcontrolavatar.h      |  6 +++-
 indra/newview/lldrawable.cpp         | 22 ++++++++++++---
 indra/newview/llspatialpartition.cpp | 53 ++++++++++++++++++++++++++++++++++++
 indra/newview/llspatialpartition.h   |  3 ++
 indra/newview/llvovolume.cpp         | 22 +++++++++++++++
 6 files changed, 108 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 4a87273372..91031034c6 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -47,6 +47,7 @@ LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewer
     mGlobalScale(1.0f),
     mMarkedForDeath(false),
     mRootVolp(NULL),
+    mControlAVBridge(NULL),
     mScaleConstraintFixup(1.0),
 	mRegionChanged(false)
 {
@@ -376,6 +377,12 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
     }
 }
 
+void LLControlAvatar::markDead()
+{
+    super::markDead();
+    mControlAVBridge = NULL;
+}
+
 bool LLControlAvatar::computeNeedsUpdate()
 {
 	computeUpdatePeriod();
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index 8e87299f3e..50e02d2d91 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -35,9 +35,12 @@ class LLControlAvatar:
 {
     LOG_CLASS(LLControlAvatar);
 
+    using super = LLVOAvatar;
+
 public:
     LLControlAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-	virtual void 			initInstance(); // Called after construction to initialize the class.
+    virtual void initInstance(); // Called after construction to initialize the class.
+    virtual void markDead();
 	virtual	~LLControlAvatar();
 
 	// If this is an attachment, return the avatar it is attached to. Otherwise NULL.
@@ -87,6 +90,7 @@ public:
     F32 mGlobalScale;
 
     LLVOVolume *mRootVolp;
+    class LLControlAVBridge* mControlAVBridge;
 
     bool mMarkedForDeath;
 
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4a0c9d399f..bb4174d3b6 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -763,6 +763,19 @@ void LLDrawable::movePartition()
 	if (part)
 	{
 		part->move(this, getSpatialGroup());
+
+		// SL-18251 "On-screen animesh characters using pelvis offset animations
+		// disappear when root goes off-screen"
+		//
+		// Update extents of the root node when Control Avatar changes it's bounds
+		if (mRenderType == LLPipeline::RENDER_TYPE_CONTROL_AV && isRoot())
+		{
+			LLControlAvatar* controlAvatar = dynamic_cast<LLControlAvatar*>(getVObj().get());
+			if (controlAvatar && controlAvatar->mControlAVBridge)
+			{
+				((LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0))->setState(LLViewerOctreeGroup::DIRTY);
+			}
+		}
 	}
 }
 
@@ -1216,10 +1229,11 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
 			{
 				setSpatialBridge(new LLHUDBridge(this, getRegion()));
 			}
-            else if (mVObjp->isAnimatedObject() && mVObjp->getControlAvatar())
-            {
-                setSpatialBridge(new LLControlAVBridge(this, getRegion()));
-            }
+			else if (mVObjp->isAnimatedObject() && mVObjp->getControlAvatar())
+			{
+				setSpatialBridge(new LLControlAVBridge(this, getRegion()));
+				mVObjp->getControlAvatar()->mControlAVBridge = (LLControlAVBridge*)getSpatialBridge();
+			}
 			// check HUD first, because HUD is also attachment
 			else if (mVObjp->isAttachment())
 			{
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 42cd1133a2..3e801a47d7 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -237,6 +237,59 @@ BOOL LLSpatialGroup::updateInGroup(LLDrawable *drawablep, BOOL immediate)
 	return FALSE;
 }
 
+void LLSpatialGroup::expandExtents(const LLVector4a* addingExtents, const LLXformMatrix& currentTransform)
+{
+	// Get coordinates of the adding extents
+	const LLVector4a& min = addingExtents[0];
+	const LLVector4a& max = addingExtents[1];
+
+	// Get coordinates of all corners of the bounding box
+	LLVector3 corners[] =
+	{
+		LLVector3(min[0], min[1], min[2]),
+		LLVector3(min[0], min[1], max[2]),
+		LLVector3(min[0], max[1], min[2]),
+		LLVector3(min[0], max[1], max[2]),
+		LLVector3(max[0], min[1], min[2]),
+		LLVector3(max[0], min[1], max[2]),
+		LLVector3(max[0], max[1], min[2]),
+		LLVector3(max[0], max[1], max[2])
+	};
+
+	// New extents (to be expanded)
+	LLVector3 extents[] =
+	{
+		LLVector3(mExtents[0].getF32ptr()),
+		LLVector3(mExtents[1].getF32ptr())
+	};
+
+	LLQuaternion backwardRotation = ~currentTransform.getRotation();
+	for (LLVector3& corner : corners)
+	{
+		// Make coordinates relative to the current position
+		corner -= currentTransform.getPosition();
+		// Rotate coordinates backward to the current rotation
+		corner.rotVec(backwardRotation);
+		// Expand root extents on the current corner
+		for (int j = 0; j < 3; ++j)
+		{
+			if (corner[j] < extents[0][j])
+				extents[0][j] = corner[j];
+			if (corner[j] > extents[1][j])
+				extents[1][j] = corner[j];
+		}
+	}
+
+	// Set new expanded extents
+	mExtents[0].load3(extents[0].mV);
+	mExtents[1].load3(extents[1].mV);
+
+	// Calculate new center and size
+	mBounds[0].setAdd(mExtents[0], mExtents[1]);
+	mBounds[0].mul(0.5f);
+	mBounds[1].setSub(mExtents[0], mExtents[1]);
+	mBounds[1].mul(0.5f);
+}
 
 BOOL LLSpatialGroup::addObject(LLDrawable *drawablep)
 {
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 6d3ef33801..cdb591083c 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -298,6 +298,7 @@ public:
 	BOOL addObject(LLDrawable *drawablep);
 	BOOL removeObject(LLDrawable *drawablep, BOOL from_octree = FALSE);
 	BOOL updateInGroup(LLDrawable *drawablep, BOOL immediate = FALSE); // Update position if it's in the group
+	void expandExtents(const LLVector4a* addingExtents, const LLXformMatrix& currentTransform);
 	void shift(const LLVector4a &offset);
 	void destroyGL(bool keep_occlusion = false);
 	
@@ -699,8 +700,10 @@ public:
 
 class LLControlAVBridge : public LLVolumeBridge
 {
+	using super = LLVolumeBridge;
 public:
 	LLControlAVBridge(LLDrawable* drawablep, LLViewerRegion* regionp);
+	virtual void updateSpatialExtents();
 };
 
 class LLHUDBridge : public LLVolumeBridge
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index e9a1724639..3842dfff7c 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5110,6 +5110,28 @@ LLControlAVBridge::LLControlAVBridge(LLDrawable* drawablep, LLViewerRegion* regi
 	mPartitionType = LLViewerRegion::PARTITION_CONTROL_AV;
 }
 
+void LLControlAVBridge::updateSpatialExtents()
+{
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWABLE
+
+	LLControlAvatar* controlAvatar = getVObj()->getControlAvatar();
+
+	LLSpatialGroup* root = (LLSpatialGroup*)mOctree->getListener(0);
+
+	bool rootWasDirty = root->isDirty();
+
+	super::updateSpatialExtents(); // root becomes non-dirty here
+
+	// SL-18251 "On-screen animesh characters using pelvis offset animations
+	// disappear when root goes off-screen"
+	//
+	// Expand extents to include Control Avatar placed outside of the bounds
+	if (controlAvatar && (rootWasDirty || controlAvatar->mPlaying))
+	{
+		root->expandExtents(controlAvatar->mDrawable->getSpatialExtents(), *mDrawable->getXform());
+	}
+}
+
 bool can_batch_texture(LLFace* facep)
 {
 	if (facep->getTextureEntry()->getBumpmap())
-- 
cgit v1.2.3


From ac5c62de965f3e6547cec657bb97c55ebaa40c53 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 3 Jun 2023 01:07:34 +0300
Subject: SL-19795 Fixed gallery autoscrolling

---
 indra/newview/llinventorygallery.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index f4bd98a9f7..f791521e3e 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1008,7 +1008,7 @@ void LLInventoryGallery::scrollToShowItem(const LLUUID& item_id)
         const LLRect visible_content_rect = mScrollPanel->getVisibleContentRect();
 
         LLRect item_rect;
-        item->localRectToOtherView(item->getLocalRect(), &item_rect, this);
+        item->localRectToOtherView(item->getLocalRect(), &item_rect, mScrollPanel);
         LLRect overlap_rect(item_rect);
         overlap_rect.intersectWith(visible_content_rect);
 
@@ -1020,7 +1020,7 @@ void LLInventoryGallery::scrollToShowItem(const LLUUID& item_id)
             constraint_rect.setOriginAndSize(0, 0, content_rect.getWidth(), content_rect.getHeight());
 
             LLRect item_doc_rect;
-            item->localRectToOtherView(item->getLocalRect(), &item_doc_rect, this);
+            item->localRectToOtherView(item->getLocalRect(), &item_doc_rect, mGalleryPanel);
 
             mScrollPanel->scrollToShowRect( item_doc_rect, constraint_rect );
         }
-- 
cgit v1.2.3


From fb248ad2bc106bad827e624b4bb6b99a3f97d266 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 3 Jun 2023 02:05:17 +0300
Subject: SL-19815 Gallery support for left, right, up and down

---
 indra/llui/llscrollbar.cpp           |  7 ++++-
 indra/newview/llinventorygallery.cpp | 53 +++++++++++++++++++++++++++++++++++-
 indra/newview/llinventorygallery.h   |  1 +
 3 files changed, 59 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index fde6de4921..62be0c28e8 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -591,7 +591,12 @@ void LLScrollbar::setValue(const LLSD& value)
 
 BOOL LLScrollbar::handleKeyHere(KEY key, MASK mask)
 {
-	BOOL handled = FALSE;
+    if (getDocPosMax() == 0 && !getVisible())
+    {
+        return FALSE;
+    }
+
+    BOOL handled = FALSE;
 
 	switch( key )
 	{
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index f791521e3e..80bfbb8d23 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -421,8 +421,9 @@ void LLInventoryGallery::addToGallery(LLInventoryGalleryItem* item)
         mHiddenItems.push_back(item);
         return;
     }
+    mItemIndexMap[item] = mItemsAddedCount;
+    mIndexToItemMap[mItemsAddedCount] = item;
     mItemsAddedCount++;
-    mItemIndexMap[item] = mItemsAddedCount - 1;
     int n = mItemsAddedCount;
     int row_count = (n % mItemsInRow) == 0 ? n / mItemsInRow : n / mItemsInRow + 1;
     int n_prev = n - 1;
@@ -458,6 +459,7 @@ void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item)
     int row_count = (n % mItemsInRow) == 0 ? n / mItemsInRow : n / mItemsInRow + 1;
     int row_count_prev = (n_prev % mItemsInRow) == 0 ? n_prev / mItemsInRow : n_prev / mItemsInRow + 1;
     mItemsAddedCount--;
+    mIndexToItemMap.erase(mItemsAddedCount);
 
     bool remove_row = row_count != row_count_prev;
     removeFromLastRow(mItems[mItemsAddedCount]);
@@ -483,6 +485,7 @@ void LLInventoryGallery::removeFromGalleryMiddle(LLInventoryGalleryItem* item)
     }
     int n = mItemIndexMap[item];
     mItemIndexMap.erase(item);
+    mIndexToItemMap.erase(n);
     std::vector<LLInventoryGalleryItem*> saved;
     for (int i = mItemsAddedCount - 1; i > n; i--)
     {
@@ -949,6 +952,54 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
             handled = TRUE;
             break;
 
+        case KEY_LEFT:
+            mFilterSubString.clear();
+
+            if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+            {
+                LLInventoryGalleryItem* item = getSelectedItem();
+                if (item)
+                {
+                    // Might be better to get item from panel
+                    S32 n = mItemIndexMap[item];
+                    if (n == 0)
+                    {
+                        n = mItemsAddedCount - 1;
+                    }
+                    n--;
+                    item = mIndexToItemMap[n];
+                    LLUUID item_id = item->getUUID();
+                    changeItemSelection(item_id, true);
+                    item->setFocus(TRUE);
+
+                }
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_RIGHT:
+            mFilterSubString.clear();
+
+            if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+            {
+                LLInventoryGalleryItem* item = getSelectedItem();
+                if (item)
+                {
+                    S32 n = mItemIndexMap[item];
+                    n++;
+                    if (n == mItemsAddedCount)
+                    {
+                        n = 0;
+                    }
+                    item = mIndexToItemMap[n];
+                    LLUUID item_id = item->getUUID();
+                    changeItemSelection(item_id, true);
+                    item->setFocus(TRUE);
+                }
+            }
+            handled = TRUE;
+            break;
+
         default:
             break;
     }
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index de0cba6e63..7d4431dbfb 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -215,6 +215,7 @@ private:
     uuid_vec_t mCOFLinkedItems;
     uuid_vec_t mActiveGestures;
     std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
+    std::map<S32, LLInventoryGalleryItem*> mIndexToItemMap;
 
     LLInventoryFilter::ESearchType mSearchType;
     std::string mUsername;
-- 
cgit v1.2.3


From 11457017a1d0f9eeb365186dc09a6a68a895c623 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 3 Jun 2023 02:10:30 +0300
Subject: SL-19815 Return key should open items in gallery view

---
 indra/newview/llinventorygallery.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 80bfbb8d23..a6cadea712 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -877,6 +877,14 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
                     setRootFolder(mSelectedItemID);
                     handled = TRUE;
                 }
+                else
+                {
+                    LLViewerInventoryItem* item = gInventory.getItem(mSelectedItemID);
+                    if (item)
+                    {
+                        LLInvFVBridgeAction::doAction(item->getType(), mSelectedItemID, &gInventory);
+                    }
+                }
             }
             break;
         case KEY_DELETE:
-- 
cgit v1.2.3


From d30d865f87cbebb6bec3ce8157957fb1e817ba68 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sun, 4 Jun 2023 05:03:27 +0300
Subject: SL-19669 Restored XML formatting for the Japanese translations

---
 .../xui/ja/control_table_contents_camera.xml       |   140 +-
 .../ja/control_table_contents_columns_basic.xml    |    10 +-
 .../xui/ja/control_table_contents_editing.xml      |    44 +-
 .../xui/ja/control_table_contents_media.xml        |    50 +-
 .../xui/ja/control_table_contents_movement.xml     |   116 +-
 .../skins/default/xui/ja/floater_360capture.xml    |    38 +-
 indra/newview/skins/default/xui/ja/floater_aaa.xml |    46 +-
 .../newview/skins/default/xui/ja/floater_about.xml |    37 +-
 .../skins/default/xui/ja/floater_about_land.xml    |   722 +-
 .../skins/default/xui/ja/floater_activeim.xml      |     2 +-
 .../default/xui/ja/floater_add_payment_method.xml  |    34 +-
 .../default/xui/ja/floater_adjust_environment.xml  |   171 +-
 .../xui/ja/floater_animation_anim_preview.xml      |    14 +-
 .../xui/ja/floater_animation_bvh_preview.xml       |   278 +-
 .../default/xui/ja/floater_associate_listing.xml   |    14 +-
 .../skins/default/xui/ja/floater_auction.xml       |    16 +-
 .../skins/default/xui/ja/floater_autoreplace.xml   |    43 +-
 .../skins/default/xui/ja/floater_avatar.xml        |     2 +-
 .../skins/default/xui/ja/floater_avatar_picker.xml |    99 +-
 .../xui/ja/floater_avatar_render_settings.xml      |    20 +-
 .../default/xui/ja/floater_avatar_textures.xml     |   123 +-
 .../skins/default/xui/ja/floater_ban_duration.xml  |    26 +-
 .../skins/default/xui/ja/floater_beacons.xml       |    42 +-
 .../skins/default/xui/ja/floater_big_preview.xml   |     2 +-
 .../skins/default/xui/ja/floater_build_options.xml |    50 +-
 .../skins/default/xui/ja/floater_bulk_perms.xml    |    92 +-
 .../newview/skins/default/xui/ja/floater_bumps.xml |    30 +-
 .../skins/default/xui/ja/floater_buy_contents.xml  |    30 +-
 .../skins/default/xui/ja/floater_buy_currency.xml  |   136 +-
 .../default/xui/ja/floater_buy_currency_html.xml   |     2 +-
 .../skins/default/xui/ja/floater_buy_land.xml      |   317 +-
 .../skins/default/xui/ja/floater_buy_object.xml    |    38 +-
 .../skins/default/xui/ja/floater_camera.xml        |    72 +-
 .../default/xui/ja/floater_camera_presets.xml      |     4 +-
 .../skins/default/xui/ja/floater_choose_group.xml  |    10 +-
 .../skins/default/xui/ja/floater_classified.xml    |     4 +-
 .../skins/default/xui/ja/floater_color_picker.xml  |    88 +-
 .../default/xui/ja/floater_conversation_log.xml    |    12 +-
 .../xui/ja/floater_conversation_preview.xml        |     8 +-
 .../default/xui/ja/floater_create_landmark.xml     |    28 +-
 .../skins/default/xui/ja/floater_critical.xml      |    18 +-
 .../default/xui/ja/floater_delete_pref_preset.xml  |    22 +-
 .../skins/default/xui/ja/floater_destinations.xml  |     2 +-
 .../skins/default/xui/ja/floater_display_name.xml  |    24 +-
 .../default/xui/ja/floater_edit_ext_day_cycle.xml  |   216 +-
 .../default/xui/ja/floater_edit_hover_height.xml   |     4 +-
 .../newview/skins/default/xui/ja/floater_event.xml |    14 +-
 .../default/xui/ja/floater_experience_search.xml   |     2 +-
 .../default/xui/ja/floater_experienceprofile.xml   |   144 +-
 .../skins/default/xui/ja/floater_experiences.xml   |     2 +-
 .../skins/default/xui/ja/floater_fast_timers.xml   |    34 +-
 .../skins/default/xui/ja/floater_fbc_web.xml       |     4 +-
 .../default/xui/ja/floater_fixedenvironment.xml    |    58 +-
 .../skins/default/xui/ja/floater_font_test.xml     |   118 +-
 .../skins/default/xui/ja/floater_forget_user.xml   |    13 +-
 .../skins/default/xui/ja/floater_gesture.xml       |    44 +-
 .../skins/default/xui/ja/floater_god_tools.xml     |   160 +-
 .../skins/default/xui/ja/floater_goto_line.xml     |     8 +-
 .../skins/default/xui/ja/floater_help_browser.xml  |    12 +-
 .../skins/default/xui/ja/floater_how_to.xml        |     4 +-
 indra/newview/skins/default/xui/ja/floater_hud.xml |     2 +-
 .../skins/default/xui/ja/floater_im_container.xml  |    52 +-
 .../skins/default/xui/ja/floater_im_session.xml    |   106 +-
 .../skins/default/xui/ja/floater_image_preview.xml |    50 +-
 .../default/xui/ja/floater_import_collada.xml      |    30 +-
 .../skins/default/xui/ja/floater_incoming_call.xml |    44 +-
 .../skins/default/xui/ja/floater_inspect.xml       |    24 +-
 .../xui/ja/floater_inventory_item_properties.xml   |   100 +-
 .../xui/ja/floater_inventory_view_finder.xml       |    66 +-
 .../default/xui/ja/floater_item_properties.xml     |     2 +-
 .../skins/default/xui/ja/floater_joystick.xml      |   204 +-
 .../skins/default/xui/ja/floater_lagmeter.xml      |   202 +-
 .../skins/default/xui/ja/floater_land_holdings.xml |    60 +-
 .../skins/default/xui/ja/floater_linkreplace.xml   |    44 +-
 .../default/xui/ja/floater_live_lsleditor.xml      |    44 +-
 .../default/xui/ja/floater_load_pref_preset.xml    |    18 +-
 .../skins/default/xui/ja/floater_lsl_guide.xml     |    10 +-
 indra/newview/skins/default/xui/ja/floater_map.xml |    46 +-
 .../xui/ja/floater_marketplace_listings.xml        |    26 +-
 .../xui/ja/floater_marketplace_validation.xml      |     8 +-
 .../skins/default/xui/ja/floater_media_browser.xml |    52 +-
 .../default/xui/ja/floater_media_settings.xml      |     8 +-
 .../skins/default/xui/ja/floater_mem_leaking.xml   |    26 +-
 indra/newview/skins/default/xui/ja/floater_mfa.xml |    12 +-
 .../skins/default/xui/ja/floater_model_preview.xml |   502 +-
 .../skins/default/xui/ja/floater_moveview.xml      |   108 +-
 .../skins/default/xui/ja/floater_mute_object.xml   |    18 +-
 .../skins/default/xui/ja/floater_my_appearance.xml |     4 +-
 .../default/xui/ja/floater_my_environments.xml     |    56 +-
 .../skins/default/xui/ja/floater_my_inventory.xml  |     2 +-
 .../skins/default/xui/ja/floater_my_scripts.xml    |     2 +-
 .../skins/default/xui/ja/floater_notification.xml  |     8 +-
 .../xui/ja/floater_notifications_console.xml       |     6 +-
 .../xui/ja/floater_notifications_tabbed.xml        |    64 +-
 .../default/xui/ja/floater_object_weights.xml      |    52 +-
 .../skins/default/xui/ja/floater_openobject.xml    |    12 +-
 .../xui/ja/floater_outfit_photo_preview.xml        |    24 +-
 .../default/xui/ja/floater_outfit_save_as.xml      |    16 +-
 .../skins/default/xui/ja/floater_outgoing_call.xml |    52 +-
 .../xui/ja/floater_pathfinding_characters.xml      |    88 +-
 .../default/xui/ja/floater_pathfinding_console.xml |   197 +-
 .../xui/ja/floater_pathfinding_linksets.xml        |   270 +-
 indra/newview/skins/default/xui/ja/floater_pay.xml |    46 +-
 .../skins/default/xui/ja/floater_pay_object.xml    |    52 +-
 .../skins/default/xui/ja/floater_people.xml        |     8 +-
 .../skins/default/xui/ja/floater_performance.xml   |   114 +-
 .../skins/default/xui/ja/floater_perms_default.xml |    64 +-
 .../skins/default/xui/ja/floater_pick_track.xml    |    38 +-
 .../skins/default/xui/ja/floater_places.xml        |     4 +-
 .../skins/default/xui/ja/floater_post_process.xml  |    82 +-
 .../skins/default/xui/ja/floater_preferences.xml   |    43 +-
 .../ja/floater_preferences_graphics_advanced.xml   |   254 +-
 .../default/xui/ja/floater_preferences_proxy.xml   |    64 +-
 .../xui/ja/floater_preferences_view_advanced.xml   |    30 +-
 .../default/xui/ja/floater_preview_animation.xml   |    14 +-
 .../default/xui/ja/floater_preview_gesture.xml     |   110 +-
 .../default/xui/ja/floater_preview_notecard.xml    |    28 +-
 .../skins/default/xui/ja/floater_preview_sound.xml |    14 +-
 .../default/xui/ja/floater_preview_texture.xml     |    42 +-
 .../skins/default/xui/ja/floater_preview_trash.xml |    18 +-
 .../default/xui/ja/floater_price_for_listing.xml   |    20 +-
 .../skins/default/xui/ja/floater_profile.xml       |    26 +-
 .../default/xui/ja/floater_profile_permissions.xml |    16 +-
 .../default/xui/ja/floater_profile_texture.xml     |    30 +-
 .../default/xui/ja/floater_publish_classified.xml  |    20 +-
 .../xui/ja/floater_region_debug_console.xml        |     2 +-
 .../skins/default/xui/ja/floater_region_info.xml   |     2 +-
 .../default/xui/ja/floater_region_restarting.xml   |    30 +-
 .../skins/default/xui/ja/floater_report_abuse.xml  |   166 +-
 .../default/xui/ja/floater_save_camera_preset.xml  |    27 +-
 .../default/xui/ja/floater_save_pref_preset.xml    |    18 +-
 .../default/xui/ja/floater_scene_load_stats.xml    |   150 +-
 .../skins/default/xui/ja/floater_script_debug.xml  |     8 +-
 .../default/xui/ja/floater_script_debug_panel.xml  |     2 +-
 .../default/xui/ja/floater_script_ed_prefs.xml     |    52 +-
 .../skins/default/xui/ja/floater_script_limits.xml |     2 +-
 .../default/xui/ja/floater_script_preview.xml      |    10 +-
 .../skins/default/xui/ja/floater_script_queue.xml  |    32 +-
 .../skins/default/xui/ja/floater_script_search.xml |    18 +-
 .../skins/default/xui/ja/floater_search.xml        |    22 +-
 .../skins/default/xui/ja/floater_select_key.xml    |    35 +-
 .../skins/default/xui/ja/floater_sell_land.xml     |    96 +-
 .../default/xui/ja/floater_settings_debug.xml      |    44 +-
 .../default/xui/ja/floater_settings_picker.xml     |    44 +-
 .../xui/ja/floater_simple_outfit_snapshot.xml      |    10 +-
 .../skins/default/xui/ja/floater_snapshot.xml      |   149 +-
 .../skins/default/xui/ja/floater_sound_devices.xml |     8 +-
 .../skins/default/xui/ja/floater_sound_preview.xml |    30 +-
 .../skins/default/xui/ja/floater_spellcheck.xml    |    24 +-
 .../default/xui/ja/floater_spellcheck_import.xml   |    20 +-
 .../newview/skins/default/xui/ja/floater_stats.xml |   218 +-
 .../skins/default/xui/ja/floater_sys_well.xml      |    10 +-
 .../skins/default/xui/ja/floater_telehub.xml       |    36 +-
 .../skins/default/xui/ja/floater_test_button.xml   |    28 +-
 .../skins/default/xui/ja/floater_test_checkbox.xml |    16 +-
 .../skins/default/xui/ja/floater_test_combobox.xml |    66 +-
 .../default/xui/ja/floater_test_inspectors.xml     |    40 +-
 .../default/xui/ja/floater_test_layout_stacks.xml  |     2 +-
 .../default/xui/ja/floater_test_line_editor.xml    |    38 +-
 .../default/xui/ja/floater_test_radiogroup.xml     |    28 +-
 .../skins/default/xui/ja/floater_test_slider.xml   |    20 +-
 .../skins/default/xui/ja/floater_test_spinner.xml  |    20 +-
 .../default/xui/ja/floater_test_text_editor.xml    |    16 +-
 .../xui/ja/floater_test_text_vertical_aligment.xml |     2 +-
 .../skins/default/xui/ja/floater_texture_ctrl.xml  |    86 +-
 .../xui/ja/floater_texture_fetch_debugger.xml      |   112 +-
 .../newview/skins/default/xui/ja/floater_tools.xml |   726 +-
 .../skins/default/xui/ja/floater_top_objects.xml   |    96 +-
 indra/newview/skins/default/xui/ja/floater_tos.xml |    30 +-
 .../skins/default/xui/ja/floater_toybox.xml        |    14 +-
 .../xui/ja/floater_translation_settings.xml        |   177 +-
 .../skins/default/xui/ja/floater_ui_preview.xml    |   106 +-
 .../skins/default/xui/ja/floater_url_entry.xml     |    18 +-
 .../default/xui/ja/floater_voice_chat_volume.xml   |     4 +-
 .../skins/default/xui/ja/floater_voice_effect.xml  |   214 +-
 .../skins/default/xui/ja/floater_voice_volume.xml  |     8 +-
 .../skins/default/xui/ja/floater_web_content.xml   |    32 +-
 .../default/xui/ja/floater_whitelist_entry.xml     |    12 +-
 .../skins/default/xui/ja/floater_window_size.xml   |    40 +-
 .../skins/default/xui/ja/floater_world_map.xml     |   209 +-
 indra/newview/skins/default/xui/ja/fonts.xml       |   360 +-
 .../skins/default/xui/ja/inspect_avatar.xml        |    30 +-
 .../newview/skins/default/xui/ja/inspect_group.xml |    42 +-
 .../skins/default/xui/ja/inspect_object.xml        |    70 +-
 .../skins/default/xui/ja/inspect_remote_object.xml |    32 +-
 .../skins/default/xui/ja/language_settings.xml     |   135 +-
 .../default/xui/ja/menu_add_wearable_gear.xml      |     8 +-
 .../skins/default/xui/ja/menu_attachment_other.xml |    63 +-
 .../skins/default/xui/ja/menu_attachment_self.xml  |    38 +-
 .../skins/default/xui/ja/menu_avatar_icon.xml      |    24 +-
 .../skins/default/xui/ja/menu_avatar_other.xml     |    63 +-
 .../xui/ja/menu_avatar_rendering_settings.xml      |     8 +-
 .../xui/ja/menu_avatar_rendering_settings_add.xml  |     7 +-
 .../skins/default/xui/ja/menu_avatar_self.xml      |    70 +-
 .../skins/default/xui/ja/menu_cof_attachment.xml   |     8 +-
 .../skins/default/xui/ja/menu_cof_body_part.xml    |     6 +-
 .../skins/default/xui/ja/menu_cof_clothing.xml     |     8 +-
 .../newview/skins/default/xui/ja/menu_cof_gear.xml |     6 +-
 .../skins/default/xui/ja/menu_conversation.xml     |    64 +-
 .../default/xui/ja/menu_conversation_log_gear.xml  |    26 +-
 .../default/xui/ja/menu_conversation_log_view.xml  |    10 +-
 .../skins/default/xui/ja/menu_copy_paste_color.xml |     6 +-
 .../default/xui/ja/menu_copy_paste_features.xml    |     6 +-
 .../skins/default/xui/ja/menu_copy_paste_light.xml |     6 +-
 .../default/xui/ja/menu_copy_paste_object.xml      |     6 +-
 .../skins/default/xui/ja/menu_copy_paste_pos.xml   |    10 +-
 .../skins/default/xui/ja/menu_copy_paste_rot.xml   |    10 +-
 .../skins/default/xui/ja/menu_copy_paste_size.xml  |    10 +-
 .../default/xui/ja/menu_copy_paste_texture.xml     |     6 +-
 indra/newview/skins/default/xui/ja/menu_edit.xml   |    20 +-
 .../skins/default/xui/ja/menu_favorites.xml        |    24 +-
 .../default/xui/ja/menu_gallery_outfit_tab.xml     |    66 +-
 .../skins/default/xui/ja/menu_gesture_gear.xml     |    18 +-
 .../skins/default/xui/ja/menu_group_plus.xml       |     6 +-
 .../skins/default/xui/ja/menu_hide_navbar.xml      |     6 +-
 .../skins/default/xui/ja/menu_im_conversation.xml  |    28 +-
 .../default/xui/ja/menu_im_session_showmodes.xml   |    10 +-
 .../skins/default/xui/ja/menu_imchiclet_adhoc.xml  |     4 +-
 .../skins/default/xui/ja/menu_imchiclet_group.xml  |     8 +-
 .../skins/default/xui/ja/menu_imchiclet_p2p.xml    |    10 +-
 .../default/xui/ja/menu_inspect_object_gear.xml    |    36 +-
 .../default/xui/ja/menu_inv_offer_chiclet.xml      |     4 +-
 .../skins/default/xui/ja/menu_inventory.xml        |   258 +-
 .../skins/default/xui/ja/menu_inventory_add.xml    |    76 +-
 .../default/xui/ja/menu_inventory_gear_default.xml |    38 +-
 .../xui/ja/menu_inventory_search_visibility.xml    |    10 +-
 indra/newview/skins/default/xui/ja/menu_land.xml   |    19 +-
 .../newview/skins/default/xui/ja/menu_landmark.xml |    10 +-
 indra/newview/skins/default/xui/ja/menu_login.xml  |    74 +-
 .../skins/default/xui/ja/menu_marketplace_view.xml |    10 +-
 .../skins/default/xui/ja/menu_media_ctrl.xml       |    12 +-
 .../newview/skins/default/xui/ja/menu_mini_map.xml |    18 +-
 .../xui/ja/menu_model_import_gear_default.xml      |    12 +-
 .../skins/default/xui/ja/menu_mute_particle.xml    |     5 +-
 indra/newview/skins/default/xui/ja/menu_navbar.xml |    18 +-
 .../skins/default/xui/ja/menu_nearby_chat.xml      |    20 +-
 .../xui/ja/menu_notification_well_button.xml       |     4 +-
 indra/newview/skins/default/xui/ja/menu_object.xml |    68 +-
 .../skins/default/xui/ja/menu_object_icon.xml      |    14 +-
 .../skins/default/xui/ja/menu_outfit_gear.xml      |    77 +-
 .../skins/default/xui/ja/menu_outfit_tab.xml       |    14 +-
 .../skins/default/xui/ja/menu_participant_list.xml |    46 +-
 .../skins/default/xui/ja/menu_participant_view.xml |    28 +-
 .../default/xui/ja/menu_people_blocked_gear.xml    |    16 +-
 .../default/xui/ja/menu_people_blocked_plus.xml    |     6 +-
 .../default/xui/ja/menu_people_blocked_view.xml    |     6 +-
 .../default/xui/ja/menu_people_friends_view.xml    |    14 +-
 .../skins/default/xui/ja/menu_people_groups.xml    |    12 +-
 .../default/xui/ja/menu_people_groups_view.xml     |     4 +-
 .../skins/default/xui/ja/menu_people_nearby.xml    |    32 +-
 .../xui/ja/menu_people_nearby_multiselect.xml      |    16 +-
 .../default/xui/ja/menu_people_nearby_view.xml     |    16 +-
 .../default/xui/ja/menu_people_recent_view.xml     |     8 +-
 indra/newview/skins/default/xui/ja/menu_picks.xml  |    16 +-
 .../skins/default/xui/ja/menu_picks_plus.xml       |     6 +-
 indra/newview/skins/default/xui/ja/menu_place.xml  |     6 +-
 .../skins/default/xui/ja/menu_place_add_button.xml |     6 +-
 .../default/xui/ja/menu_places_gear_folder.xml     |    26 +-
 .../default/xui/ja/menu_places_gear_landmark.xml   |    40 +-
 .../default/xui/ja/menu_places_gear_sorting.xml    |    10 +-
 .../skins/default/xui/ja/menu_profile_other.xml    |    42 +-
 .../skins/default/xui/ja/menu_profile_overflow.xml |    20 +-
 .../skins/default/xui/ja/menu_profile_self.xml     |    20 +-
 .../skins/default/xui/ja/menu_save_outfit.xml      |     6 +-
 .../skins/default/xui/ja/menu_save_settings.xml    |    14 +-
 .../skins/default/xui/ja/menu_script_chiclet.xml   |     4 +-
 .../skins/default/xui/ja/menu_settings_add.xml     |     8 +-
 .../skins/default/xui/ja/menu_settings_gear.xml    |    16 +-
 indra/newview/skins/default/xui/ja/menu_slurl.xml  |     8 +-
 .../default/xui/ja/menu_teleport_history_gear.xml  |    10 +-
 .../default/xui/ja/menu_teleport_history_item.xml  |     8 +-
 .../default/xui/ja/menu_teleport_history_tab.xml   |     6 +-
 .../skins/default/xui/ja/menu_text_editor.xml      |    26 +-
 .../newview/skins/default/xui/ja/menu_toolbars.xml |    10 +-
 .../skins/default/xui/ja/menu_topinfobar.xml       |    16 +-
 .../skins/default/xui/ja/menu_url_agent.xml        |    16 +-
 .../skins/default/xui/ja/menu_url_email.xml        |     6 +-
 .../skins/default/xui/ja/menu_url_experience.xml   |     4 +-
 .../skins/default/xui/ja/menu_url_group.xml        |    10 +-
 .../newview/skins/default/xui/ja/menu_url_http.xml |    10 +-
 .../skins/default/xui/ja/menu_url_inventory.xml    |    10 +-
 .../newview/skins/default/xui/ja/menu_url_map.xml  |    12 +-
 .../skins/default/xui/ja/menu_url_objectim.xml     |    20 +-
 .../skins/default/xui/ja/menu_url_parcel.xml       |    12 +-
 .../skins/default/xui/ja/menu_url_slapp.xml        |     8 +-
 .../skins/default/xui/ja/menu_url_slurl.xml        |    14 +-
 .../skins/default/xui/ja/menu_url_teleport.xml     |    12 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  1259 +--
 .../default/xui/ja/menu_wearable_list_item.xml     |    26 +-
 .../skins/default/xui/ja/menu_wearing_gear.xml     |    12 +-
 .../skins/default/xui/ja/menu_wearing_tab.xml      |    14 +-
 indra/newview/skins/default/xui/ja/mime_types.xml  |   390 +-
 .../skins/default/xui/ja/mime_types_linux.xml      |   358 +-
 .../skins/default/xui/ja/mime_types_mac.xml        |   366 +-
 .../newview/skins/default/xui/ja/notifications.xml | 10654 ++++++++++--------
 .../skins/default/xui/ja/outfit_accordion_tab.xml  |     4 +-
 .../default/xui/ja/panel_active_object_row.xml     |    12 +-
 .../default/xui/ja/panel_avatar_list_item.xml      |    61 +-
 .../skins/default/xui/ja/panel_avatar_tag.xml      |    16 +-
 .../default/xui/ja/panel_block_list_sidetray.xml   |    22 +-
 .../default/xui/ja/panel_body_parts_list_item.xml  |    24 +-
 .../xui/ja/panel_bodyparts_list_button_bar.xml     |     6 +-
 .../skins/default/xui/ja/panel_bottomtray_lite.xml |    22 +-
 .../default/xui/ja/panel_camera_preset_item.xml    |    12 +-
 .../skins/default/xui/ja/panel_chat_header.xml     |     8 +-
 .../skins/default/xui/ja/panel_chiclet_bar.xml     |    26 +-
 .../skins/default/xui/ja/panel_classified_info.xml |   116 +-
 .../xui/ja/panel_clothing_list_button_bar.xml      |     6 +-
 .../default/xui/ja/panel_clothing_list_item.xml    |    30 +-
 .../skins/default/xui/ja/panel_cof_wearables.xml   |    13 +-
 .../xui/ja/panel_conversation_list_item.xml        |    22 +-
 .../xui/ja/panel_conversation_log_list_item.xml    |    16 +-
 .../xui/ja/panel_deletable_wearable_list_item.xml  |    14 +-
 .../xui/ja/panel_dummy_clothing_list_item.xml      |    21 +-
 .../skins/default/xui/ja/panel_edit_alpha.xml      |    30 +-
 .../skins/default/xui/ja/panel_edit_eyes.xml       |    18 +-
 .../skins/default/xui/ja/panel_edit_gloves.xml     |    20 +-
 .../skins/default/xui/ja/panel_edit_hair.xml       |    24 +-
 .../skins/default/xui/ja/panel_edit_jacket.xml     |    27 +-
 .../skins/default/xui/ja/panel_edit_pants.xml      |    24 +-
 .../skins/default/xui/ja/panel_edit_physics.xml    |    52 +-
 .../skins/default/xui/ja/panel_edit_shape.xml      |    78 +-
 .../skins/default/xui/ja/panel_edit_shirt.xml      |    24 +-
 .../skins/default/xui/ja/panel_edit_shoes.xml      |    24 +-
 .../skins/default/xui/ja/panel_edit_skin.xml       |    28 +-
 .../skins/default/xui/ja/panel_edit_skirt.xml      |    20 +-
 .../skins/default/xui/ja/panel_edit_socks.xml      |    20 +-
 .../skins/default/xui/ja/panel_edit_tattoo.xml     |    18 +-
 .../skins/default/xui/ja/panel_edit_underpants.xml |    20 +-
 .../skins/default/xui/ja/panel_edit_undershirt.xml |    20 +-
 .../skins/default/xui/ja/panel_edit_universal.xml  |    34 +-
 .../skins/default/xui/ja/panel_edit_wearable.xml   |   180 +-
 .../skins/default/xui/ja/panel_experience_info.xml |   107 +-
 .../xui/ja/panel_experience_list_editor.xml        |    38 +-
 .../default/xui/ja/panel_experience_list_item.xml  |     6 +-
 .../skins/default/xui/ja/panel_experience_log.xml  |    50 +-
 .../default/xui/ja/panel_experience_search.xml     |    80 +-
 .../skins/default/xui/ja/panel_experiences.xml     |    24 +-
 .../skins/default/xui/ja/panel_group_bulk_ban.xml  |    56 +-
 .../xui/ja/panel_group_creation_sidetray.xml       |   103 +-
 .../skins/default/xui/ja/panel_group_general.xml   |    90 +-
 .../default/xui/ja/panel_group_info_sidetray.xml   |    72 +-
 .../skins/default/xui/ja/panel_group_invite.xml    |    44 +-
 .../default/xui/ja/panel_group_land_money.xml      |   127 +-
 .../skins/default/xui/ja/panel_group_list_item.xml |    16 +-
 .../default/xui/ja/panel_group_list_item_short.xml |    19 +-
 .../skins/default/xui/ja/panel_group_notices.xml   |    92 +-
 .../skins/default/xui/ja/panel_group_notify.xml    |    24 +-
 .../skins/default/xui/ja/panel_group_roles.xml     |   266 +-
 .../skins/default/xui/ja/panel_hide_beacon.xml     |     4 +-
 .../skins/default/xui/ja/panel_instant_message.xml |    23 +-
 .../skins/default/xui/ja/panel_inventory_item.xml  |    10 +-
 .../skins/default/xui/ja/panel_landmark_info.xml   |   109 +-
 .../skins/default/xui/ja/panel_landmarks.xml       |    40 +-
 indra/newview/skins/default/xui/ja/panel_login.xml |    60 +-
 .../skins/default/xui/ja/panel_login_first.xml     |   106 +-
 .../skins/default/xui/ja/panel_main_inventory.xml  |    68 +-
 .../default/xui/ja/panel_marketplace_listings.xml  |    26 +-
 .../ja/panel_marketplace_listings_inventory.xml    |     2 +-
 .../xui/ja/panel_marketplace_listings_listed.xml   |     2 +-
 .../ja/panel_marketplace_listings_unassociated.xml |     2 +-
 .../xui/ja/panel_marketplace_listings_unlisted.xml |     2 +-
 .../xui/ja/panel_media_settings_general.xml        |    58 +-
 .../xui/ja/panel_media_settings_permissions.xml    |    42 +-
 .../xui/ja/panel_media_settings_security.xml       |    16 +-
 .../skins/default/xui/ja/panel_navigation_bar.xml  |    38 +-
 .../skins/default/xui/ja/panel_nearby_chat.xml     |    12 +-
 .../skins/default/xui/ja/panel_nearby_chat_bar.xml |     6 +-
 .../skins/default/xui/ja/panel_nearby_media.xml    |   124 +-
 .../skins/default/xui/ja/panel_notification.xml    |    20 +-
 .../xui/ja/panel_notification_list_item.xml        |   193 +-
 .../default/xui/ja/panel_notifications_channel.xml |    34 +-
 .../skins/default/xui/ja/panel_notify_textbox.xml  |    20 +-
 .../default/xui/ja/panel_online_status_toast.xml   |     2 +-
 .../skins/default/xui/ja/panel_outfit_edit.xml     |   168 +-
 .../skins/default/xui/ja/panel_outfit_gallery.xml  |    77 +-
 .../default/xui/ja/panel_outfit_gallery_item.xml   |    20 +-
 .../xui/ja/panel_outfit_snapshot_inventory.xml     |    20 +-
 .../default/xui/ja/panel_outfits_inventory.xml     |    47 +-
 .../ja/panel_outfits_inventory_gear_default.xml    |    14 +-
 .../skins/default/xui/ja/panel_outfits_list.xml    |    20 +-
 .../skins/default/xui/ja/panel_outfits_wearing.xml |    32 +-
 .../newview/skins/default/xui/ja/panel_people.xml  |   131 +-
 .../xui/ja/panel_performance_autoadjustments.xml   |   102 +-
 .../xui/ja/panel_performance_complexity.xml        |    34 +-
 .../default/xui/ja/panel_performance_huds.xml      |    30 +-
 .../default/xui/ja/panel_performance_nearby.xml    |    59 +-
 .../xui/ja/panel_performance_preferences.xml       |   182 +-
 .../skins/default/xui/ja/panel_place_profile.xml   |   214 +-
 .../newview/skins/default/xui/ja/panel_places.xml  |   133 +-
 .../default/xui/ja/panel_postcard_message.xml      |    28 +-
 .../default/xui/ja/panel_postcard_settings.xml     |    22 +-
 .../default/xui/ja/panel_preferences_advanced.xml  |    58 +-
 .../default/xui/ja/panel_preferences_alerts.xml    |    20 +-
 .../default/xui/ja/panel_preferences_chat.xml      |   201 +-
 .../default/xui/ja/panel_preferences_colors.xml    |    60 +-
 .../default/xui/ja/panel_preferences_controls.xml  |    20 +-
 .../default/xui/ja/panel_preferences_general.xml   |   124 +-
 .../default/xui/ja/panel_preferences_graphics1.xml |   112 +-
 .../default/xui/ja/panel_preferences_grids.xml     |    34 +-
 .../default/xui/ja/panel_preferences_move.xml      |    70 +-
 .../default/xui/ja/panel_preferences_privacy.xml   |    46 +-
 .../default/xui/ja/panel_preferences_setup.xml     |    62 +-
 .../default/xui/ja/panel_preferences_sound.xml     |   110 +-
 .../default/xui/ja/panel_preferences_uploads.xml   |    28 +-
 .../xui/ja/panel_presets_camera_pulldown.xml       |    12 +-
 .../default/xui/ja/panel_presets_pulldown.xml      |    14 +-
 .../default/xui/ja/panel_prim_media_controls.xml   |   134 +-
 .../default/xui/ja/panel_profile_classified.xml    |   184 +-
 .../default/xui/ja/panel_profile_classifieds.xml   |    12 +-
 .../default/xui/ja/panel_profile_firstlife.xml     |     2 +-
 .../skins/default/xui/ja/panel_profile_notes.xml   |    12 +-
 .../skins/default/xui/ja/panel_profile_pick.xml    |    18 +-
 .../skins/default/xui/ja/panel_profile_picks.xml   |    16 +-
 .../default/xui/ja/panel_profile_secondlife.xml    |   192 +-
 .../skins/default/xui/ja/panel_profile_web.xml     |    18 +-
 .../skins/default/xui/ja/panel_progress.xml        |    16 +-
 .../skins/default/xui/ja/panel_region_access.xml   |   108 +-
 .../skins/default/xui/ja/panel_region_covenant.xml |   106 +-
 .../skins/default/xui/ja/panel_region_debug.xml    |    54 +-
 .../default/xui/ja/panel_region_environment.xml    |   190 +-
 .../skins/default/xui/ja/panel_region_estate.xml   |    78 +-
 .../default/xui/ja/panel_region_experiences.xml    |    35 +-
 .../skins/default/xui/ja/panel_region_general.xml  |    71 +-
 .../skins/default/xui/ja/panel_region_terrain.xml  |    88 +-
 .../skins/default/xui/ja/panel_script_ed.xml       |    84 +-
 .../default/xui/ja/panel_script_experience.xml     |    22 +-
 .../xui/ja/panel_script_limits_my_avatar.xml       |    24 +-
 .../xui/ja/panel_script_limits_region_memory.xml   |    36 +-
 .../default/xui/ja/panel_script_question_toast.xml |     6 +-
 .../skins/default/xui/ja/panel_scrolling_param.xml |    16 +-
 .../default/xui/ja/panel_scrolling_param_base.xml  |     4 +-
 .../default/xui/ja/panel_settings_sky_atmos.xml    |    99 +-
 .../default/xui/ja/panel_settings_sky_clouds.xml   |    73 +-
 .../default/xui/ja/panel_settings_sky_density.xml  |    50 +-
 .../default/xui/ja/panel_settings_sky_sunmoon.xml  |   127 +-
 .../skins/default/xui/ja/panel_settings_water.xml  |   118 +-
 .../default/xui/ja/panel_side_tray_tab_caption.xml |    10 +-
 .../default/xui/ja/panel_sidetray_home_tab.xml     |    61 +-
 .../default/xui/ja/panel_snapshot_inventory.xml    |    38 +-
 .../skins/default/xui/ja/panel_snapshot_local.xml  |    56 +-
 .../default/xui/ja/panel_snapshot_options.xml      |    14 +-
 .../default/xui/ja/panel_snapshot_postcard.xml     |    30 +-
 .../default/xui/ja/panel_snapshot_profile.xml      |    34 +-
 .../skins/default/xui/ja/panel_sound_devices.xml   |    34 +-
 .../default/xui/ja/panel_stand_stop_flying.xml     |     8 +-
 .../skins/default/xui/ja/panel_status_bar.xml      |    51 +-
 .../skins/default/xui/ja/panel_sys_well_item.xml   |     7 +-
 .../default/xui/ja/panel_teleport_history.xml      |    34 +-
 .../default/xui/ja/panel_teleport_history_item.xml |     8 +-
 .../skins/default/xui/ja/panel_tools_texture.xml   |   196 +-
 .../skins/default/xui/ja/panel_voice_effect.xml    |    20 +-
 .../skins/default/xui/ja/panel_volume_pulldown.xml |    24 +-
 .../skins/default/xui/ja/panel_world_map.xml       |    82 +-
 .../newview/skins/default/xui/ja/role_actions.xml  |   154 +-
 .../skins/default/xui/ja/sidepanel_appearance.xml  |    30 +-
 .../skins/default/xui/ja/sidepanel_inventory.xml   |    72 +-
 .../skins/default/xui/ja/sidepanel_item_info.xml   |   134 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   |   206 +-
 indra/newview/skins/default/xui/ja/strings.xml     | 10737 ++++++++++++-------
 .../skins/default/xui/ja/teleport_strings.xml      |   132 +-
 .../default/xui/ja/widgets/bodyparts_list_item.xml |    14 +-
 .../default/xui/ja/widgets/clothing_list_item.xml  |    18 +-
 .../ja/widgets/deletable_wearable_list_item.xml    |     8 +-
 .../skins/default/xui/ja/widgets/density_ctrl.xml  |    45 +-
 .../xui/ja/widgets/dummy_clothing_list_item.xml    |    10 +-
 .../default/xui/ja/widgets/flat_list_view.xml      |     4 +-
 .../xui/ja/widgets/inbox_folder_view_folder.xml    |     4 +-
 .../xui/ja/widgets/inbox_folder_view_item.xml      |     4 +-
 .../default/xui/ja/widgets/menu_item_separator.xml |     2 +-
 .../default/xui/ja/widgets/menu_item_tear_off.xml  |     3 +-
 .../skins/default/xui/ja/widgets/name_editor.xml   |     4 +-
 .../default/xui/ja/widgets/panel_camera_item.xml   |    14 +-
 .../skins/default/xui/ja/widgets/person_view.xml   |    20 +-
 .../default/xui/ja/widgets/sun_moon_trackball.xml  |    27 +-
 .../xui/ja/widgets/wearable_outfit_list_item.xml   |    17 +-
 .../skins/default/xui/ja/widgets/xy_vector.xml     |    14 +-
 indra/newview/skins/default/xui/ja/xui_version.xml |     4 +-
 478 files changed, 27951 insertions(+), 19143 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml b/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
index a46087d47f..f72ebcbbf3 100644
--- a/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
-  <rows name="camera_actions" value="">
-    <columns label="カメラ" name="lst_action" />
-  </rows>
-  <rows name="look_up" value="look_up">
-    <columns name="lst_action" value="上に向ける" />
-  </rows>
-  <rows name="look_down" value="look_down">
-    <columns name="lst_action" value="下に向ける" />
-  </rows>
-  <rows name="move_forward" value="move_forward">
-    <columns name="lst_action" value="カメラを近づける" />
-  </rows>
-  <rows name="move_backward" value="move_backward">
-    <columns name="lst_action" value="カメラを遠ざける" />
-  </rows>
-  <rows name="move_forward_fast" value="move_forward_fast">
-    <columns name="lst_action" value="カメラを高速に近づける" />
-  </rows>
-  <rows name="move_backward_fast" value="move_backward_fast">
-    <columns name="lst_action" value="カメラを高速に遠ざける" />
-  </rows>
-  <rows name="spin_over" value="spin_over">
-    <columns name="lst_action" value="カメラの仰角を上げる" />
-  </rows>
-  <rows name="spin_under" value="spin_under">
-    <columns name="lst_action" value="カメラの仰角を下げる" />
-  </rows>
-  <rows name="pan_up" value="pan_up">
-    <columns name="lst_action" value="カメラの中心を上に移動" />
-  </rows>
-  <rows name="pan_down" value="pan_down">
-    <columns name="lst_action" value="カメラの中心を下に移動" />
-  </rows>
-  <rows name="pan_left" value="pan_left">
-    <columns name="lst_action" value="カメラの中心を左に移動" />
-  </rows>
-  <rows name="pan_right" value="pan_right">
-    <columns name="lst_action" value="カメラの中心を右に移動" />
-  </rows>
-  <rows name="pan_in" value="pan_in">
-    <columns name="lst_action" value="カメラの中心を拡大" />
-  </rows>
-  <rows name="pan_out" value="pan_out">
-    <columns name="lst_action" value="カメラの中心を縮小" />
-  </rows>
-  <rows name="spin_around_ccw" value="spin_around_ccw">
-    <columns name="lst_action" tool_tip="対象に対して、カメラを反時計回りに回します。" value="反時計回り" />
-  </rows>
-  <rows name="spin_around_cw" value="spin_around_cw">
-    <columns name="lst_action" tool_tip="対象に対して、カメラをカメラを時計回りに回します。" value="時計回り" />
-  </rows>
-  <rows name="move_forward_sitting" value="move_forward_sitting">
-    <columns name="lst_action" value="座ってカメラを近づける" />
-  </rows>
-  <rows name="move_backward_sitting" value="move_backward_sitting">
-    <columns name="lst_action" value="座ってカメラを遠ざける" />
-  </rows>
-  <rows name="spin_over_sitting" value="spin_over_sitting">
-    <columns name="lst_action" value="座ってカメラの仰角を上げる" />
-  </rows>
-  <rows name="spin_under_sitting" value="spin_under_sitting">
-    <columns name="lst_action" value="座ってカメラの仰角を下げる" />
-  </rows>
-  <rows name="spin_around_ccw_sitting" value="spin_around_ccw_sitting">
-    <columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを反時計回りに回します。" value="座って反時計回り" />
-  </rows>
-  <rows name="spin_around_cw_sitting" value="spin_around_cw_sitting">
-    <columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを時計回りに回します。" value="座って時計回り" />
-  </rows>
-</contents>
\ No newline at end of file
+	<rows name="camera_actions" value="">
+		<columns label="カメラ" name="lst_action"/>
+	</rows>
+	<rows name="look_up" value="look_up">
+		<columns name="lst_action" value="上に向ける"/>
+	</rows>
+	<rows name="look_down" value="look_down">
+		<columns name="lst_action" value="下に向ける"/>
+	</rows>
+	<rows name="move_forward" value="move_forward">
+		<columns name="lst_action" value="カメラを近づける"/>
+	</rows>
+	<rows name="move_backward" value="move_backward">
+		<columns name="lst_action" value="カメラを遠ざける"/>
+	</rows>
+	<rows name="move_forward_fast" value="move_forward_fast">
+		<columns name="lst_action" value="カメラを高速に近づける"/>
+	</rows>
+	<rows name="move_backward_fast" value="move_backward_fast">
+		<columns name="lst_action" value="カメラを高速に遠ざける"/>
+	</rows>
+	<rows name="spin_over" value="spin_over">
+		<columns name="lst_action" value="カメラの仰角を上げる"/>
+	</rows>
+	<rows name="spin_under" value="spin_under">
+		<columns name="lst_action" value="カメラの仰角を下げる"/>
+	</rows>
+	<rows name="pan_up" value="pan_up">
+		<columns name="lst_action" value="カメラの中心を上に移動"/>
+	</rows>
+	<rows name="pan_down" value="pan_down">
+		<columns name="lst_action" value="カメラの中心を下に移動"/>
+	</rows>
+	<rows name="pan_left" value="pan_left">
+		<columns name="lst_action" value="カメラの中心を左に移動"/>
+	</rows>
+	<rows name="pan_right" value="pan_right">
+		<columns name="lst_action" value="カメラの中心を右に移動"/>
+	</rows>
+	<rows name="pan_in" value="pan_in">
+		<columns name="lst_action" value="カメラの中心を拡大"/>
+	</rows>
+	<rows name="pan_out" value="pan_out">
+		<columns name="lst_action" value="カメラの中心を縮小"/>
+	</rows>
+	<rows name="spin_around_ccw" value="spin_around_ccw">
+		<columns name="lst_action" tool_tip="対象に対して、カメラを反時計回りに回します。" value="反時計回り"/>
+	</rows>
+	<rows name="spin_around_cw" value="spin_around_cw">
+		<columns name="lst_action" tool_tip="対象に対して、カメラをカメラを時計回りに回します。" value="時計回り"/>
+	</rows>
+	<rows name="move_forward_sitting" value="move_forward_sitting">
+		<columns name="lst_action" value="座ってカメラを近づける"/>
+	</rows>
+	<rows name="move_backward_sitting" value="move_backward_sitting">
+		<columns name="lst_action" value="座ってカメラを遠ざける"/>
+	</rows>
+	<rows name="spin_over_sitting" value="spin_over_sitting">
+		<columns name="lst_action" value="座ってカメラの仰角を上げる"/>
+	</rows>
+	<rows name="spin_under_sitting" value="spin_under_sitting">
+		<columns name="lst_action" value="座ってカメラの仰角を下げる"/>
+	</rows>
+	<rows name="spin_around_ccw_sitting" value="spin_around_ccw_sitting">
+		<columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを反時計回りに回します。" value="座って反時計回り"/>
+	</rows>
+	<rows name="spin_around_cw_sitting" value="spin_around_cw_sitting">
+		<columns name="lst_action" tool_tip="座った状態で対象に対して、カメラを時計回りに回します。" value="座って時計回り"/>
+	</rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
index e556a41e57..83f204648d 100644
--- a/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
-  <columns label="アクション" name="lst_action" />
-  <columns label="優先コントロール" name="lst_ctrl1" />
-  <columns label="代わり１" name="lst_ctrl2" />
-  <columns label="代わり２" name="lst_ctrl3" />
-</contents>
\ No newline at end of file
+	<columns label="アクション" name="lst_action"/>
+	<columns label="優先コントロール" name="lst_ctrl1"/>
+	<columns label="代わり１" name="lst_ctrl2"/>
+	<columns label="代わり２" name="lst_ctrl3"/>
+</contents>
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml b/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
index 9a2286b873..3842a92db9 100644
--- a/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
-  <rows enabled="false" name="editing_actions" value="">
-    <columns label="編集中" name="lst_action" value="Tool_Dozer" />
-  </rows>
-  <rows name="edit_avatar_spin_ccw" value="edit_avatar_spin_ccw">
-    <columns name="lst_action" tool_tip="アバターを中心にカメラを反時計回りに回します。" value="反時計回り" />
-  </rows>
-  <rows name="edit_avatar_spin_cw" value="edit_avatar_spin_cw">
-    <columns name="lst_action" tool_tip="アバターを中心にカメラを時計回りに回します。" value="時計回り" />
-  </rows>
-  <rows name="edit_avatar_spin_over" value="edit_avatar_spin_over">
-    <columns name="lst_action" tool_tip="アバターに対するカメラの仰角を上げます。" value="カメラの仰角を上げる" />
-  </rows>
-  <rows name="edit_avatar_spin_under" value="edit_avatar_spin_under">
-    <columns name="lst_action" tool_tip="アバターに対するカメラの仰角を下げます。" value="カメラの仰角を下げる" />
-  </rows>
-  <rows name="edit_avatar_move_forward" value="edit_avatar_move_forward">
-    <columns name="lst_action" value="カメラを近づける" />
-  </rows>
-  <rows name="edit_avatar_move_backward" value="edit_avatar_move_backward">
-    <columns name="lst_action" value="カメラを遠ざける" />
-  </rows>
-</contents>
\ No newline at end of file
+	<rows enabled="false" name="editing_actions" value="">
+		<columns label="編集中" name="lst_action" value="Tool_Dozer"/>
+	</rows>
+	<rows name="edit_avatar_spin_ccw" value="edit_avatar_spin_ccw">
+		<columns name="lst_action" tool_tip="アバターを中心にカメラを反時計回りに回します。" value="反時計回り"/>
+	</rows>
+	<rows name="edit_avatar_spin_cw" value="edit_avatar_spin_cw">
+		<columns name="lst_action" tool_tip="アバターを中心にカメラを時計回りに回します。" value="時計回り"/>
+	</rows>
+	<rows name="edit_avatar_spin_over" value="edit_avatar_spin_over">
+		<columns name="lst_action" tool_tip="アバターに対するカメラの仰角を上げます。" value="カメラの仰角を上げる"/>
+	</rows>
+	<rows name="edit_avatar_spin_under" value="edit_avatar_spin_under">
+		<columns name="lst_action" tool_tip="アバターに対するカメラの仰角を下げます。" value="カメラの仰角を下げる"/>
+	</rows>
+	<rows name="edit_avatar_move_forward" value="edit_avatar_move_forward">
+		<columns name="lst_action" value="カメラを近づける"/>
+	</rows>
+	<rows name="edit_avatar_move_backward" value="edit_avatar_move_backward">
+		<columns name="lst_action" value="カメラを遠ざける"/>
+	</rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_media.xml b/indra/newview/skins/default/xui/ja/control_table_contents_media.xml
index 0d69c10a0d..00d19b81a3 100644
--- a/indra/newview/skins/default/xui/ja/control_table_contents_media.xml
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_media.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
-  <rows enabled="false" name="media_actions" value="">
-    <columns type="icontext" label="サウンドとメディア" name="lst_action" value="Audio_Press" />
-  </rows>
-  <rows name="toggle_pause_media" value="toggle_pause_media">
-    <columns name="lst_action" value="メディアの再生／停止" />
-  </rows>
-  <rows name="toggle_enable_media" value="toggle_enable_media">
-    <columns name="lst_action" value="全てのメディアを再生／停止" />
-  </rows>
-  <rows name="voice_follow_key" value="voice_follow_key">
-    <columns name="lst_action" value="ボイスチャット" />
-  </rows>
-  <rows name="toggle_voice" value="toggle_voice">
-    <columns name="lst_action" value="ボイスチャット切り替え" />
-  </rows>
-  <rows name="start_chat" value="start_chat">
-    <columns name="lst_action" value="チャットを開始" />
-  </rows>
-  <rows name="start_gesture" value="start_gesture">
-    <columns name="lst_action" value="ジェスチャーを開始" />
-  </rows>
-  <rows name="script_trigger_lbutton" value="script_trigger_lbutton">
-    <columns name="lst_action" value="インタラクト（左クリックスクリプト）" />
-  </rows>
-</contents>
\ No newline at end of file
+	<rows enabled="false" name="media_actions" value="">
+		<columns type="icontext" label="サウンドとメディア" name="lst_action" value="Audio_Press"/>
+	</rows>
+	<rows name="toggle_pause_media" value="toggle_pause_media">
+		<columns name="lst_action" value="メディアの再生／停止"/>
+	</rows>
+	<rows name="toggle_enable_media" value="toggle_enable_media">
+		<columns name="lst_action" value="全てのメディアを再生／停止"/>
+	</rows>
+	<rows name="voice_follow_key" value="voice_follow_key">
+		<columns name="lst_action" value="ボイスチャット"/>
+	</rows>
+	<rows name="toggle_voice" value="toggle_voice">
+		<columns name="lst_action" value="ボイスチャット切り替え"/>
+	</rows>
+	<rows name="start_chat" value="start_chat">
+		<columns name="lst_action" value="チャットを開始"/>
+	</rows>
+	<rows name="start_gesture" value="start_gesture">
+		<columns name="lst_action" value="ジェスチャーを開始"/>
+	</rows>
+	<rows name="script_trigger_lbutton" value="script_trigger_lbutton">
+		<columns name="lst_action" value="インタラクト（左クリックスクリプト）"/>
+	</rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml b/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
index 64b72f0404..4f1cd7d9e7 100644
--- a/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
-  <rows name="move_actions" value="">
-    <columns type="icontext" label="移動アクション" name="lst_action" value="Move_Walk_Off" />
-  </rows>
-  <rows name="walk_to" value="walk_to">
-    <columns name="lst_action" tool_tip="マウスカーソルが指している場所に向かって歩きます。" value="移動先" />
-  </rows>
-  <rows name="teleport_to" value="teleport_to">
-    <columns name="lst_action" tool_tip="マウスカーソルが指す場所にテレポートしますが、すべての場所において、必ずしも直接テレポートできるとは限らないため、代わりに目的地の近くにテレポートする場合があります。" value="テレポートする" />
-  </rows>
-  <rows name="push_forward" value="push_forward">
-    <columns name="lst_action" value="前に移動" />
-  </rows>
-  <rows name="push_backward" value="push_backward">
-    <columns name="lst_action" value="後ろに移動" />
-  </rows>
-  <rows name="turn_left" value="turn_left">
-    <columns name="lst_action" value="左を向いて移動" />
-  </rows>
-  <rows name="turn_right" value="turn_right">
-    <columns name="lst_action" value="右を向いて移動" />
-  </rows>
-  <rows name="slide_left" value="slide_left">
-    <columns name="lst_action" value="左へ平行移動" />
-  </rows>
-  <rows name="slide_right" value="slide_right">
-    <columns name="lst_action" value="右へ平行移動" />
-  </rows>
-  <rows name="jump" value="jump">
-    <columns name="lst_action" value="ジャンプ／飛行" />
-  </rows>
-  <rows name="push_down" value="push_down">
-    <columns name="lst_action" value="下降" />
-  </rows>
-  <rows name="run_forward" value="run_forward">
-    <columns name="lst_action" value="前に走る" />
-  </rows>
-  <rows name="run_backward" value="run_backward">
-    <columns name="lst_action" value="後ろに走る" />
-  </rows>
-  <rows name="run_left" value="run_left">
-    <columns name="lst_action" value="左に走る" />
-  </rows>
-  <rows name="run_right" value="run_right">
-    <columns name="lst_action" value="右に走る" />
-  </rows>
-  <rows name="toggle_run" value="toggle_run">
-    <columns name="lst_action" value="常時走行切り替え" />
-  </rows>
-  <rows name="toggle_fly" value="toggle_fly">
-    <columns name="lst_action" value="飛行／停止切り替え" />
-  </rows>
-  <rows name="toggle_sit" value="toggle_sit">
-    <columns name="lst_action" value="座る／立つ" />
-  </rows>
-  <rows name="stop_moving" value="stop_moving">
-    <columns name="lst_action" value="立ち止まる" />
-  </rows>
-</contents>
\ No newline at end of file
+	<rows name="move_actions" value="">
+		<columns type="icontext" label="移動アクション" name="lst_action" value="Move_Walk_Off"/>
+	</rows>
+	<rows name="walk_to" value="walk_to">
+		<columns name="lst_action" tool_tip="マウスカーソルが指している場所に向かって歩きます。" value="移動先"/>
+	</rows>
+	<rows name="teleport_to" value="teleport_to">
+		<columns name="lst_action" tool_tip="マウスカーソルが指す場所にテレポートしますが、すべての場所において、必ずしも直接テレポートできるとは限らないため、代わりに目的地の近くにテレポートする場合があります。" value="テレポートする"/>
+	</rows>
+	<rows name="push_forward" value="push_forward">
+		<columns name="lst_action" value="前に移動"/>
+	</rows>
+	<rows name="push_backward" value="push_backward">
+		<columns name="lst_action" value="後ろに移動"/>
+	</rows>
+	<rows name="turn_left" value="turn_left">
+		<columns name="lst_action" value="左を向いて移動"/>
+	</rows>
+	<rows name="turn_right" value="turn_right">
+		<columns name="lst_action" value="右を向いて移動"/>
+	</rows>
+	<rows name="slide_left" value="slide_left">
+		<columns name="lst_action" value="左へ平行移動"/>
+	</rows>
+	<rows name="slide_right" value="slide_right">
+		<columns name="lst_action" value="右へ平行移動"/>
+	</rows>
+	<rows name="jump" value="jump">
+		<columns name="lst_action" value="ジャンプ／飛行"/>
+	</rows>
+	<rows name="push_down" value="push_down">
+		<columns name="lst_action" value="下降"/>
+	</rows>
+	<rows name="run_forward" value="run_forward">
+		<columns name="lst_action" value="前に走る"/>
+	</rows>
+	<rows name="run_backward" value="run_backward">
+		<columns name="lst_action" value="後ろに走る"/>
+	</rows>
+	<rows name="run_left" value="run_left">
+		<columns name="lst_action" value="左に走る"/>
+	</rows>
+	<rows name="run_right" value="run_right">
+		<columns name="lst_action" value="右に走る"/>
+	</rows>
+	<rows name="toggle_run" value="toggle_run">
+		<columns name="lst_action" value="常時走行切り替え"/>
+	</rows>
+	<rows name="toggle_fly" value="toggle_fly">
+		<columns name="lst_action" value="飛行／停止切り替え"/>
+	</rows>
+	<rows name="toggle_sit" value="toggle_sit">
+		<columns name="lst_action" value="座る／立つ"/>
+	</rows>
+	<rows name="stop_moving" value="stop_moving">
+		<columns name="lst_action" value="立ち止まる"/>
+	</rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/ja/floater_360capture.xml b/indra/newview/skins/default/xui/ja/floater_360capture.xml
index a68f5994f2..d0a6eef0e0 100644
--- a/indra/newview/skins/default/xui/ja/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_360capture.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="360capture" title="３６０度Ｓショット">
-  <panel name="ui_panel_left">
-    <text name="quality_level_label">品質</text>
-    <radio_group name="360_quality_selection">
-      <radio_item label="プレビュー（高速）" name="preview_quality" tool_tip="プレビュー程度の品質" />
-      <radio_item label="通常" name="medium_quality" value="512" tool_tip="通常品質" />
-      <radio_item label="高" name="high_quality" value="1024" tool_tip="高品質" />
-      <radio_item label="最高品位" name="maximum_quality" value="2048" tool_tip="最高品質" />
-    </radio_group>
-    <check_box label="アバターをすべて隠す" name="360_hide_avatar" />
-    <button label="３６０度画像を作成" name="capture_button" />
-    <button label="名前をつけて保存…" name="save_local_button" />
-  </panel>
-  <panel name="ui_panel_right">
-    <web_browser name="360capture_contents" />
-    <text name="statusbar">クリックとドラッグで視点変更</text>
-  </panel>
-</floater>
\ No newline at end of file
+	<panel name="ui_panel_left">
+		<text name="quality_level_label">
+			品質
+		</text>
+		<radio_group name="360_quality_selection">
+			<radio_item label="プレビュー（高速）" name="preview_quality" tool_tip="プレビュー程度の品質"/>
+			<radio_item label="通常" name="medium_quality" value="512" tool_tip="通常品質"/>
+			<radio_item label="高" name="high_quality" value="1024" tool_tip="高品質"/>
+			<radio_item label="最高品位" name="maximum_quality" value="2048" tool_tip="最高品質"/>
+		</radio_group>
+		<check_box label="アバターをすべて隠す" name="360_hide_avatar"/>
+		<button label="３６０度画像を作成" name="capture_button"/>
+		<button label="名前をつけて保存…" name="save_local_button"/>
+	</panel>
+	<panel name="ui_panel_right">
+		<web_browser name="360capture_contents"/>
+		<text name="statusbar">
+			クリックとドラッグで視点変更
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_aaa.xml b/indra/newview/skins/default/xui/ja/floater_aaa.xml
index 9cca52cf61..91fb4f4662 100644
--- a/indra/newview/skins/default/xui/ja/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/ja/floater_aaa.xml
@@ -1,51 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Test Floater" title="フローターのテスト">
-  <text left="0" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
-ここに
+	<text left="0" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
+		ここに
 記載される
 なんらかの
 テキストは
 上部に
 寄せられて
-います</text>
-  <text left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
-ここに
+います
+	</text>
+	<text left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
+		ここに
 記載される
 なんらかの
 テキストは
 中央に
 寄せられて
-います</text>
-  <text left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
-ここに
+います
+	</text>
+	<text left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
+		ここに
 記載される
 なんらかの
 テキストは
 下部に
 寄せられて
-います</text>
-  <text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
-ここに
+います
+	</text>
+	<text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="top">
+		ここに
 記載される
 なんらかの
 テキストは
 上部に
 寄せられて
-います</text_editor>
-  <text_editor left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
-ここに
+います
+	</text_editor>
+	<text_editor left_pad="5" follows="left|top|bottom" top="5" bottom="-5" clip_partial="true" width="100" valign="center">
+		ここに
 記載される
 なんらかの
 テキストは
 中央に
 寄せられて
-います</text_editor>
-  <text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
-ここに
+います
+	</text_editor>
+	<text_editor left_pad="5" follows="left|top|bottom" top="5" clip_partial="true" bottom="-5" width="100" valign="bottom">
+		ここに
 記載される
 なんらかの
 テキストは
 下部に
 寄せられて
-います</text_editor>
-</floater>
\ No newline at end of file
+います
+	</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index aac914b714..12d763be37 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="[CAPITALIZED_APP_NAME]について">
-  <tab_container name="about_tab">
-    <panel label="情報" name="support_panel">
-      <!-- 正確には「クリップボードへコピー」字数制限のためコピーに変更 -->
-      <button label="コピー" name="copy_btn" />
-      <button label="更新の確認" name="update_btn" />
-    </panel>
-    <panel label="クレジット" name="credits_panel">
-      <text name="linden_intro">Second Life は Lindens によって開発され、以下のオープンソースの貢献があります：</text>
-      <text_editor name="contrib_names">Dummy Nameは実行時間に置き換えられます。</text_editor>
-    </panel>
-    <panel label="ライセンス" name="licenses_panel">
-      <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+	<tab_container name="about_tab">
+		<panel label="情報" name="support_panel">
+			<button label="コピー" name="copy_btn"/>
+			<button label="更新の確認" name="update_btn"/>
+		</panel>
+		<panel label="クレジット" name="credits_panel">
+			<text name="linden_intro">
+				Second Life は Lindens によって開発され、以下のオープンソースの貢献があります：
+			</text>
+			<text_editor name="contrib_names">
+				Dummy Nameは実行時間に置き換えられます。
+			</text_editor>
+		</panel>
+		<panel label="ライセンス" name="licenses_panel">
+			<text_editor name="licenses_editor">
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
 APR Copyright (C) 2011 The Apache Software Foundation
 Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
 cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
@@ -41,7 +45,8 @@ Second Life ビューアでは Havok (TM) Physics が使用されています。
 
 無断複写・複製・転載を禁じます。詳細については licenses.txt をご参照ください。
 
-ボイスチャットのオーディオコーディング：Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)</text_editor>
-    </panel>
-  </tab_container>
-</floater>
\ No newline at end of file
+ボイスチャットのオーディオコーディング：Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)
+			</text_editor>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 0ed0706a2d..7da5f41f90 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -1,244 +1,482 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="土地情報">
-  <floater.string name="maturity_icon_general">"Parcel_PG_Dark"</floater.string>
-  <floater.string name="maturity_icon_moderate">"Parcel_M_Dark"</floater.string>
-  <floater.string name="maturity_icon_adult">"Parcel_R_Dark"</floater.string>
-  <floater.string name="Hours">[HOURS]時間</floater.string>
-  <floater.string name="Hour">時間</floater.string>
-  <floater.string name="Minutes">[MINUTES]分</floater.string>
-  <floater.string name="Minute">分</floater.string>
-  <floater.string name="Seconds">[SECONDS]秒</floater.string>
-  <floater.string name="Remaining">残り</floater.string>
-  <floater.string name="Always">常時</floater.string>
-  <tab_container name="landtab">
-    <panel label="一般" name="land_general_panel">
-      <panel.string name="new users only">新規住人専用</panel.string>
-      <panel.string name="anyone">誰でも</panel.string>
-      <panel.string name="area_text">面積：</panel.string>
-      <panel.string name="area_size_text">[AREA]㎡</panel.string>
-      <panel.string name="auction_id_text">オークションＩＤ：[ID]</panel.string>
-      <panel.string name="need_tier_to_modify">この土地を修正変更するには、購入を承認する必要があります。</panel.string>
-      <panel.string name="group_owned_text">（グループ所有）</panel.string>
-      <panel.string name="profile_text">プロフィール</panel.string>
-      <panel.string name="info_text">情報</panel.string>
-      <panel.string name="public_text">（公共）</panel.string>
-      <panel.string name="none_text">（なし）</panel.string>
-      <panel.string name="sale_pending_text">（購入審査中）</panel.string>
-      <panel.string name="no_selection_text">区画が選択されていません。</panel.string>
-      <panel.string name="time_stamp_template">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</panel.string>
-      <text name="Name:">名前：</text>
-      <line_editor name="Name" />
-      <text name="Description:">説明：</text>
-      <text name="LandType">種類：</text>
-      <text name="LandTypeText">メインランド／入植地</text>
-      <text name="ContentRating">区分：</text>
-      <text name="ContentRatingText">Adult</text>
-      <text name="Owner:">所有者：</text>
-      <text name="Group:">グループ：</text>
-      <button label="設定" label_selected="設定…" name="Set..." />
-      <check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。グループの土地割り当てによってサポートされます。" />
-      <button label="譲渡" label_selected="譲渡…" name="Deed..." tool_tip="選択したグループのオフィサーのみ、土地を譲渡できます。" />
-      <check_box label="所有者が譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。" />
-      <text name="For Sale:">販売の有無：</text>
-      <text name="Not for sale.">販売対象外</text>
-      <text name="For Sale: Price L$[PRICE].">価格：L$ [PRICE]（L$ [PRICE_PER_SQM]／㎡）</text>
-      <button label="土地を売る" label_selected="土地を販売…" name="Sell Land..." />
-      <text name="For sale to">販売先：[BUYER]</text>
-      <text name="Sell with landowners objects in parcel.">オブジェクトを一緒に販売</text>
-      <text name="Selling with no objects in parcel.">オブジェクトは販売しない</text>
-      <button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale" />
-      <text name="Claimed:">取得日時：</text>
-      <text name="DateClaimText">2006年8月15日火曜日13:47:25</text>
-      <text name="PriceLabel">面積：</text>
-      <text name="PriceText">4048m²</text>
-      <text name="Traffic:">トラフィック：</text>
-      <text name="DwellText">読み込んでいます…</text>
-      <button label="土地の購入" label_selected="土地を購入…" name="Buy Land..." />
-      <button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。" />
-      <button label="スクリプト情報…" name="Scripts..." />
-      <button label="グループに購入" label_selected="グループ用に購入…" name="Buy For Group..." />
-      <button label="入場許可を購入" label_selected="入場許可を購入…" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" />
-      <button label="土地の放棄" label_selected="土地を放棄…" name="Abandon Land..." />
-      <button label="土地を取り戻す" label_selected="土地の返還を要求…" name="Reclaim Land..." />
-    </panel>
-    <panel label="約款" name="land_covenant_panel">
-      <panel.string name="can_resell">このリージョン（地域）で購入した土地は、再販することができます。</panel.string>
-      <panel.string name="can_not_resell">このリージョン（地域）で購入した土地は、再販することができないことがあります。</panel.string>
-      <panel.string name="can_change">このリージョン（地域）で購入した土地は、結合や再分割することができます。</panel.string>
-      <panel.string name="can_not_change">このリージョン（地域）で購入した土地は、結合や再分割することができないことがあります。</panel.string>
-      <text font="SansSerifLarge" name="estate_section_lbl">不動産：</text>
-      <text name="estate_name_text">メインランド</text>
-      <text name="estate_owner_lbl">所有者：</text>
-      <text name="estate_owner_text">（なし）</text>
-      <text_editor name="covenant_editor">この不動産には約款がありません。</text_editor>
-      <text name="covenant_timestamp_text">最後更新：1969年12月31日水曜日　16：00：00</text>
-      <text font="SansSerifLarge" name="region_section_lbl">地域：</text>
-      <text name="region_name_text">EricaVille</text>
-      <text name="region_landtype_lbl">種類：</text>
-      <text name="region_landtype_text">メインランド／入植地</text>
-      <text name="region_maturity_lbl">区分：</text>
-      <text name="region_maturity_text">Adult</text>
-      <text name="resellable_lbl">再販：</text>
-      <text name="resellable_clause">このリージョン（地域）にある土地は再販できません。</text>
-      <text name="changeable_lbl">再分割：</text>
-      <text name="changeable_clause">このリージョン（地域）にある土地は統合または分割ができないことがあります。</text>
-    </panel>
-    <panel label="オブジェクト" name="land_objects_panel">
-      <panel.string name="objects_available_text">[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）</panel.string>
-      <panel.string name="objects_deleted_text">[MAX]個中[COUNT]個（[DELETED]個を削除しました）</panel.string>
-      <text name="parcel_object_bonus">オブジェクトボーナス：[BONUS]個</text>
-      <text name="Simulator primitive usage:">リージョン全体の最大プリム数：</text>
-      <text name="objects_available">[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）</text>
-      <text name="Primitives parcel supports:">区画で利用可能な最大プリム数：</text>
-      <text name="object_contrib_text">[COUNT]個</text>
-      <text name="Primitives on parcel:">区画で使用中のプリム数：</text>
-      <text name="total_objects_text">[COUNT]個</text>
-      <text name="Owned by parcel owner:">うち区画所有者のプリム数：</text>
-      <text name="owner_objects_text">[COUNT]個</text>
-      <button label="表示" label_selected="表示" name="ShowOwner" />
-      <button label="返却" label_selected="返却…" name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します" />
-      <text name="Set to group:">グループに設定：</text>
-      <text name="group_objects_text">[COUNT]</text>
-      <button label="表示" label_selected="表示" name="ShowGroup" />
-      <button label="返却" label_selected="返却…" name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します" />
-      <text name="Owned by others:">他人の所有物：</text>
-      <text name="other_objects_text">[COUNT]個</text>
-      <button label="表示" label_selected="表示" name="ShowOther" />
-      <button label="返却" label_selected="返却…" name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します" />
-      <text name="Selected / sat upon:">選択済み／決定済み：</text>
-      <text name="selected_objects_text">[COUNT]個</text>
-      <text name="Autoreturn">他者のオブジェクトの自動返却（分単位、０で自動返却なし）：</text>
-      <line_editor name="clean other time" />
-      <text name="Object Owners:">オブジェクトの所有者：</text>
-      <button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します" />
-      <button label="オブジェクトを返却する" label_selected="オブジェクトの返却…" name="Return objects..." />
-      <name_list label="カウント" name="owner list">
-        <name_list.columns label="タイプ" name="type" />
-        <name_list.columns name="online_status" />
-        <name_list.columns label="名前" name="name" />
-        <name_list.columns label="数" name="count" />
-        <name_list.columns label="最新" name="mostrecent" />
-      </name_list>
-    </panel>
-    <panel label="オプション" name="land_options_panel">
-      <panel.string name="search_enabled_tooltip">この区画を検索結果に表示する</panel.string>
-      <panel.string name="search_disabled_small_tooltip">区画面積が１２８㎡未満のため、このオプションは無効です。
-大きな区画のみ検索に表示させることが可能です。</panel.string>
-      <panel.string name="search_disabled_permissions_tooltip">あなたはこの区画の設定編集ができないため、このオプションは無効です。</panel.string>
-      <panel.string name="mature_check_mature">「Moderate」コンテンツ</panel.string>
-      <panel.string name="mature_check_adult">「Adult」コンテンツ</panel.string>
-      <panel.string name="mature_check_mature_tooltip">あなたの区画情報及びコンテンツは「Moderate」とされています。</panel.string>
-      <panel.string name="mature_check_adult_tooltip">あなたの区画情報及びコンテンツは「Adult」とされています。</panel.string>
-      <panel.string name="landing_point_none">（なし）</panel.string>
-      <panel.string name="push_restrict_text">プッシュ禁止</panel.string>
-      <panel.string name="push_restrict_region_text">プッシュ禁止 （リージョン設定優先）</panel.string>
-      <text name="allow_label">他の住人への許可：</text>
-      <text name="allow_label0">飛行：</text>
-      <check_box label="全員" name="check fly" tool_tip="チェックを入れると、この土地での飛行が可能となります。このチェックを外すと、土地に入る時や通過する時のみ飛行可能となります。" />
-      <text name="allow_label2">制作：</text>
-      <check_box label="全員" name="edit objects check" tool_tip="このオプションを選択すると、住人があなたの土地でオブジェクトの制作や、rezすることができるようになります。" />
-      <check_box label="グループ" name="edit group objects check" tool_tip="このオプションを選択すると、区画のグループメンバーが、あなたの土地でオブジェクトの制作やrezができるようになります。" />
-      <text name="allow_label3">オブジェクトの進入：</text>
-      <check_box label="全員" name="all object entry check" tool_tip="このオプションを選択すると、住人が他の区画にあるオブジェクトをこの区画へ移動することができるようになります。" />
-      <check_box label="グループ" name="group object entry check" tool_tip="このオプションを選択すると、区画のグループメンバーが、他の区画にあるオブジェクトからこの区画へ移動することができるようになります。" />
-      <text name="allow_label4">スクリプトの実行：</text>
-      <check_box label="全員" name="check other scripts" tool_tip="このオプションを選択すると、住人が装着物などのスクリプトの実行をあなたの区画でえるようになります。" />
-      <check_box label="グループ" name="check group scripts" tool_tip="このオプションを選択すると、区画のグループメンバーは、装着物などのスクリプトの実行をあなたの区画で行えるようになります。" />
-      <check_box label="安全（ダメージなし）" name="check safe" tool_tip="このチェックを入れると、この土地での戦闘行為が無効になり、「安全」に設定されます。チェックを外すと戦闘行為が有効になります。" />
-      <check_box label="プッシュ禁止" name="PushRestrictCheck" tool_tip="スクリプトによるプッシュを禁止します。このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。" />
-      <check_box label="検索に区画を表示（週L$ 30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します。" />
-      <combo_box name="land category">
-        <combo_box.item label="全カテゴリ" name="item0" />
-        <combo_box.item label="Linden所在地" name="item1" />
-        <combo_box.item label="芸術と文化" name="item3" />
-        <combo_box.item label="ビジネス" name="item4" />
-        <combo_box.item label="教育的" name="item5" />
-        <combo_box.item label="ゲーム" name="item6" />
-        <combo_box.item label="たまり場" name="item7" />
-        <combo_box.item label="新住民歓迎" name="item8" />
-        <combo_box.item label="公園と自然" name="item9" />
-        <combo_box.item label="住宅用" name="item10" />
-        <combo_box.item label="ショッピング" name="item11" />
-        <combo_box.item label="レンタル" name="item13" />
-        <combo_box.item label="その他" name="item12" />
-      </combo_box>
-      <check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip="" />
-      <text name="Snapshot:">スナップショット：</text>
-      <texture_picker label="" name="snapshot_ctrl" tool_tip="画像をクリックして選択" />
-      <text name="allow_see_label">別の区画にいるアバターが、この区画にいるアバターとチャットできるようになります。</text>
-      <check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="別の区画のアバターが、この区画にいるアバターとチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。" />
-      <text name="landing_point">ランディング地点：[LANDING]</text>
-      <button label="設定" label_selected="設定" name="Set" tool_tip="訪問者が最初に訪れる場所の設定を行います。この区画内に立って行ってください。" />
-      <button label="クリア" label_selected="クリア" name="Clear" tool_tip="ランディング地点をクリアする。" />
-      <text name="Teleport Routing: ">テレポート経路：</text>
-      <combo_box name="landing type" tool_tip="テレポート経路－あなたの土地へのテレポート経路を選択してください。">
-        <combo_box.item label="不可" name="Blocked" />
-        <combo_box.item label="ランディング地点のみ" name="LandingPoint" />
-        <combo_box.item label="どこでも可能" name="Anywhere" />
-      </combo_box>
-    </panel>
-    <panel label="メディア" name="land_media_panel">
-      <text name="with media:">種類：</text>
-      <combo_box name="media type" tool_tip="動画や、Webページ、その他のメディアのＵＲＬを指定します。" />
-      <text name="at URL:">ホームページ：</text>
-      <button label="設定" name="set_media_url" />
-      <text name="Description:">説明：</text>
-      <line_editor name="url_description" tool_tip="「再生」「読み込み」ボタンの隣に表示されるテキストです。" />
-      <text name="Media texture:">テクスチャの差し替え：</text>
-      <texture_picker label="" name="media texture" tool_tip="画像をクリックして選択" />
-      <text name="replace_texture_help">このテクスチャを使用するオブジェクトの「再生」をクリックすると、動画やWebページを表示します。テクスチャを変更するにはサムネイルを選択してください。</text>
-      <check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。動作速度と画質が少し低下することがありますが、他のテクスチャのスケーリングや整列が必要になることはありません。" />
-      <text name="media_size" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。">サイズ：</text>
-      <spinner name="media_size_width" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。" />
-      <spinner name="media_size_height" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。" />
-      <text name="pixels">ピクセル</text>
-      <text name="Options:">オプション：</text>
-      <check_box label="ループ" name="media_loop" tool_tip="メディアをループ再生します。メディアの再生が終わったら、最初から再生し直します。" />
-    </panel>
-    <panel label="サウンド" name="land_audio_panel">
-      <text name="MusicURL:">音楽ＵＲＬ：</text>
-      <text name="Sound:">サウンド：</text>
-      <check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local" />
-      <text name="Avatar Sounds:">アバターのサウンド：</text>
-      <check_box label="全員" name="all av sound check" />
-      <check_box label="グループ" name="group av sound check" />
-      <text name="Voice settings:">ボイス：</text>
-      <check_box label="ボイスチャットを有効にする" name="parcel_enable_voice_channel" />
-      <check_box label="ボイスチャットを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled" />
-      <check_box label="ボイスチャットをこの区画内に限定する" name="parcel_enable_voice_channel_local" />
-    </panel>
-    <panel label="アクセス" name="land_access_panel">
-      <panel.string name="access_estate_defined">（不動産に限定）</panel.string>
-      <panel.string name="estate_override">１つ以上のオプションが、不動産レベルで設定されています。</panel.string>
-      <check_box label="誰でも訪問可（このオプションをオフにすると立入禁止ラインが作成されます）" name="public_access" />
-      <check_box label="１８歳以上である必要があります。[ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、１８歳以上でなければなりません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。" />
-      <check_box label="支払情報が登録されている必要があります。[ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="アカウントに支払情報が登録されていない場合、この区画にアクセスすることはできません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。" />
-      <check_box label="制約なしにグループ[GROUP]を許可する。" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。" />
-      <check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。" />
-      <combo_box name="pass_combo">
-        <combo_box.item label="誰でも" name="Anyone" />
-        <combo_box.item label="グループ" name="Group" />
-      </combo_box>
-      <spinner label="価格（L$）：" name="PriceSpin" />
-      <spinner label="アクセス時間：" name="HoursSpin" />
-      <text name="OwnerLimited">（不動産所有者が、このオプションに制約を与えている場合があります）</text>
-      <panel name="Allowed_layout_panel">
-        <text label="常に許可" name="AllowedText">常に許可する人（[COUNT]人、最大[MAX]人）</text>
-        <name_list name="AccessList" tool_tip="（合計[LISTED]人、最大[MAX]人）" />
-        <button label="追加" name="add_allowed" />
-        <button label="削除" label_selected="削除" name="remove_allowed" />
-      </panel>
-      <panel name="Banned_layout_panel">
-        <text label="バン" name="BanCheck">バンした人（[COUNT]人、最大[MAX]人）</text>
-        <name_list name="BannedList" tool_tip="（合計[LISTED]人、最大[MAX]人）">
-          <columns label="名前" name="name" />
-          <columns label="期間" name="duration" />
-        </name_list>
-        <button label="追加" name="add_banned" />
-        <button label="削除" label_selected="削除" name="remove_banned" />
-      </panel>
-    </panel>
-    <panel label="体験" name="land_experiences_panel" />
-    <panel label="環境" name="land_environment_panel" />
-  </tab_container>
-</floater>
\ No newline at end of file
+	<floater.string name="maturity_icon_general">
+		"Parcel_PG_Dark"
+	</floater.string>
+	<floater.string name="maturity_icon_moderate">
+		"Parcel_M_Dark"
+	</floater.string>
+	<floater.string name="maturity_icon_adult">
+		"Parcel_R_Dark"
+	</floater.string>
+	<floater.string name="Hours">
+		[HOURS]時間
+	</floater.string>
+	<floater.string name="Hour">
+		時間
+	</floater.string>
+	<floater.string name="Minutes">
+		[MINUTES]分
+	</floater.string>
+	<floater.string name="Minute">
+		分
+	</floater.string>
+	<floater.string name="Seconds">
+		[SECONDS]秒
+	</floater.string>
+	<floater.string name="Remaining">
+		残り
+	</floater.string>
+	<floater.string name="Always">
+		常時
+	</floater.string>
+	<tab_container name="landtab">
+		<panel label="一般" name="land_general_panel">
+			<panel.string name="new users only">
+				新規住人専用
+			</panel.string>
+			<panel.string name="anyone">
+				誰でも
+			</panel.string>
+			<panel.string name="area_text">
+				面積：
+			</panel.string>
+			<panel.string name="area_size_text">
+				[AREA]㎡
+			</panel.string>
+			<panel.string name="auction_id_text">
+				オークションＩＤ：[ID]
+			</panel.string>
+			<panel.string name="need_tier_to_modify">
+				この土地を修正変更するには、購入を承認する必要があります。
+			</panel.string>
+			<panel.string name="group_owned_text">
+				（グループ所有）
+			</panel.string>
+			<panel.string name="profile_text">
+				プロフィール
+			</panel.string>
+			<panel.string name="info_text">
+				情報
+			</panel.string>
+			<panel.string name="public_text">
+				（公共）
+			</panel.string>
+			<panel.string name="none_text">
+				（なし）
+			</panel.string>
+			<panel.string name="sale_pending_text">
+				（購入審査中）
+			</panel.string>
+			<panel.string name="no_selection_text">
+				区画が選択されていません。
+			</panel.string>
+			<panel.string name="time_stamp_template">
+				[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+			</panel.string>
+			<text name="Name:">
+				名前：
+			</text>
+			<line_editor name="Name"/>
+			<text name="Description:">
+				説明：
+			</text>
+			<text name="LandType">
+				種類：
+			</text>
+			<text name="LandTypeText">
+				メインランド／入植地
+			</text>
+			<text name="ContentRating">
+				区分：
+			</text>
+			<text name="ContentRatingText">
+				Adult
+			</text>
+			<text name="Owner:">
+				所有者：
+			</text>
+			<text name="Group:">
+				グループ：
+			</text>
+			<button label="設定" label_selected="設定…" name="Set..."/>
+			<check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。グループの土地割り当てによってサポートされます。"/>
+			<button label="譲渡" label_selected="譲渡…" name="Deed..." tool_tip="選択したグループのオフィサーのみ、土地を譲渡できます。"/>
+			<check_box label="所有者が譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。"/>
+			<text name="For Sale:">
+				販売の有無：
+			</text>
+			<text name="Not for sale.">
+				販売対象外
+			</text>
+			<text name="For Sale: Price L$[PRICE].">
+				価格：L$ [PRICE]（L$ [PRICE_PER_SQM]／㎡）
+			</text>
+			<button label="土地を売る" label_selected="土地を販売…" name="Sell Land..."/>
+			<text name="For sale to">
+				販売先：[BUYER]
+			</text>
+			<text name="Sell with landowners objects in parcel.">
+				オブジェクトを一緒に販売
+			</text>
+			<text name="Selling with no objects in parcel.">
+				オブジェクトは販売しない
+			</text>
+			<button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"/>
+			<text name="Claimed:">
+				取得日時：
+			</text>
+			<text name="DateClaimText">
+				2006年8月15日火曜日13:47:25
+			</text>
+			<text name="PriceLabel">
+				面積：
+			</text>
+			<text name="PriceText">
+				4048m²
+			</text>
+			<text name="Traffic:">
+				トラフィック：
+			</text>
+			<text name="DwellText">
+				読み込んでいます…
+			</text>
+			<button label="土地の購入" label_selected="土地を購入…" name="Buy Land..."/>
+			<button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
+			<button label="スクリプト情報…" name="Scripts..."/>
+			<button label="グループに購入" label_selected="グループ用に購入…" name="Buy For Group..."/>
+			<button label="入場許可を購入" label_selected="入場許可を購入…" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。"/>
+			<button label="土地の放棄" label_selected="土地を放棄…" name="Abandon Land..."/>
+			<button label="土地を取り戻す" label_selected="土地の返還を要求…" name="Reclaim Land..."/>
+		</panel>
+		<panel label="約款" name="land_covenant_panel">
+			<panel.string name="can_resell">
+				このリージョン（地域）で購入した土地は、再販することができます。
+			</panel.string>
+			<panel.string name="can_not_resell">
+				このリージョン（地域）で購入した土地は、再販することができないことがあります。
+			</panel.string>
+			<panel.string name="can_change">
+				このリージョン（地域）で購入した土地は、結合や再分割することができます。
+			</panel.string>
+			<panel.string name="can_not_change">
+				このリージョン（地域）で購入した土地は、結合や再分割することができないことがあります。
+			</panel.string>
+			<text font="SansSerifLarge" name="estate_section_lbl">
+				不動産：
+			</text>
+			<text name="estate_name_text">
+				メインランド
+			</text>
+			<text name="estate_owner_lbl">
+				所有者：
+			</text>
+			<text name="estate_owner_text">
+				（なし）
+			</text>
+			<text_editor name="covenant_editor">
+				この不動産には約款がありません。
+			</text_editor>
+			<text name="covenant_timestamp_text">
+				最後更新：1969年12月31日水曜日　16：00：00
+			</text>
+			<text font="SansSerifLarge" name="region_section_lbl">
+				地域：
+			</text>
+			<text name="region_name_text">
+				EricaVille
+			</text>
+			<text name="region_landtype_lbl">
+				種類：
+			</text>
+			<text name="region_landtype_text">
+				メインランド／入植地
+			</text>
+			<text name="region_maturity_lbl">
+				区分：
+			</text>
+			<text name="region_maturity_text">
+				Adult
+			</text>
+			<text name="resellable_lbl">
+				再販：
+			</text>
+			<text name="resellable_clause">
+				このリージョン（地域）にある土地は再販できません。
+			</text>
+			<text name="changeable_lbl">
+				再分割：
+			</text>
+			<text name="changeable_clause">
+				このリージョン（地域）にある土地は統合または分割ができないことがあります。
+			</text>
+		</panel>
+		<panel label="オブジェクト" name="land_objects_panel">
+			<panel.string name="objects_available_text">
+				[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）
+			</panel.string>
+			<panel.string name="objects_deleted_text">
+				[MAX]個中[COUNT]個（[DELETED]個を削除しました）
+			</panel.string>
+			<text name="parcel_object_bonus">
+				オブジェクトボーナス：[BONUS]個
+			</text>
+			<text name="Simulator primitive usage:">
+				リージョン全体の最大プリム数：
+			</text>
+			<text name="objects_available">
+				[MAX]個中[COUNT]個（[AVAILABLE]個が利用可能）
+			</text>
+			<text name="Primitives parcel supports:">
+				区画で利用可能な最大プリム数：
+			</text>
+			<text name="object_contrib_text">
+				[COUNT]個
+			</text>
+			<text name="Primitives on parcel:">
+				区画で使用中のプリム数：
+			</text>
+			<text name="total_objects_text">
+				[COUNT]個
+			</text>
+			<text name="Owned by parcel owner:">
+				うち区画所有者のプリム数：
+			</text>
+			<text name="owner_objects_text">
+				[COUNT]個
+			</text>
+			<button label="表示" label_selected="表示" name="ShowOwner"/>
+			<button label="返却" label_selected="返却…" name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します"/>
+			<text name="Set to group:">
+				グループに設定：
+			</text>
+			<text name="group_objects_text">
+				[COUNT]
+			</text>
+			<button label="表示" label_selected="表示" name="ShowGroup"/>
+			<button label="返却" label_selected="返却…" name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します"/>
+			<text name="Owned by others:">
+				他人の所有物：
+			</text>
+			<text name="other_objects_text">
+				[COUNT]個
+			</text>
+			<button label="表示" label_selected="表示" name="ShowOther"/>
+			<button label="返却" label_selected="返却…" name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します"/>
+			<text name="Selected / sat upon:">
+				選択済み／決定済み：
+			</text>
+			<text name="selected_objects_text">
+				[COUNT]個
+			</text>
+			<text name="Autoreturn">
+				他者のオブジェクトの自動返却（分単位、０で自動返却なし）：
+			</text>
+			<line_editor name="clean other time"/>
+			<text name="Object Owners:">
+				オブジェクトの所有者：
+			</text>
+			<button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/>
+			<button label="オブジェクトを返却する" label_selected="オブジェクトの返却…" name="Return objects..."/>
+			<name_list label="カウント" name="owner list">
+				<name_list.columns label="タイプ" name="type"/>
+				<name_list.columns name="online_status"/>
+				<name_list.columns label="名前" name="name"/>
+				<name_list.columns label="数" name="count"/>
+				<name_list.columns label="最新" name="mostrecent"/>
+			</name_list>
+		</panel>
+		<panel label="オプション" name="land_options_panel">
+			<panel.string name="search_enabled_tooltip">
+				この区画を検索結果に表示する
+			</panel.string>
+			<panel.string name="search_disabled_small_tooltip">
+				区画面積が１２８㎡未満のため、このオプションは無効です。
+大きな区画のみ検索に表示させることが可能です。
+			</panel.string>
+			<panel.string name="search_disabled_permissions_tooltip">
+				あなたはこの区画の設定編集ができないため、このオプションは無効です。
+			</panel.string>
+			<panel.string name="mature_check_mature">
+				「Moderate」コンテンツ
+			</panel.string>
+			<panel.string name="mature_check_adult">
+				「Adult」コンテンツ
+			</panel.string>
+			<panel.string name="mature_check_mature_tooltip">
+				あなたの区画情報及びコンテンツは「Moderate」とされています。
+			</panel.string>
+			<panel.string name="mature_check_adult_tooltip">
+				あなたの区画情報及びコンテンツは「Adult」とされています。
+			</panel.string>
+			<panel.string name="landing_point_none">
+				（なし）
+			</panel.string>
+			<panel.string name="push_restrict_text">
+				プッシュ禁止
+			</panel.string>
+			<panel.string name="push_restrict_region_text">
+				プッシュ禁止 （リージョン設定優先）
+			</panel.string>
+			<text name="allow_label">
+				他の住人への許可：
+			</text>
+			<text name="allow_label0">
+				飛行：
+			</text>
+			<check_box label="全員" name="check fly" tool_tip="チェックを入れると、この土地での飛行が可能となります。このチェックを外すと、土地に入る時や通過する時のみ飛行可能となります。"/>
+			<text name="allow_label2">
+				制作：
+			</text>
+			<check_box label="全員" name="edit objects check" tool_tip="このオプションを選択すると、住人があなたの土地でオブジェクトの制作や、rezすることができるようになります。"/>
+			<check_box label="グループ" name="edit group objects check" tool_tip="このオプションを選択すると、区画のグループメンバーが、あなたの土地でオブジェクトの制作やrezができるようになります。"/>
+			<text name="allow_label3">
+				オブジェクトの進入：
+			</text>
+			<check_box label="全員" name="all object entry check" tool_tip="このオプションを選択すると、住人が他の区画にあるオブジェクトをこの区画へ移動することができるようになります。"/>
+			<check_box label="グループ" name="group object entry check" tool_tip="このオプションを選択すると、区画のグループメンバーが、他の区画にあるオブジェクトからこの区画へ移動することができるようになります。"/>
+			<text name="allow_label4">
+				スクリプトの実行：
+			</text>
+			<check_box label="全員" name="check other scripts" tool_tip="このオプションを選択すると、住人が装着物などのスクリプトの実行をあなたの区画でえるようになります。"/>
+			<check_box label="グループ" name="check group scripts" tool_tip="このオプションを選択すると、区画のグループメンバーは、装着物などのスクリプトの実行をあなたの区画で行えるようになります。"/>
+			<check_box label="安全（ダメージなし）" name="check safe" tool_tip="このチェックを入れると、この土地での戦闘行為が無効になり、「安全」に設定されます。チェックを外すと戦闘行為が有効になります。"/>
+			<check_box label="プッシュ禁止" name="PushRestrictCheck" tool_tip="スクリプトによるプッシュを禁止します。このオプションを選択することにより、あなたの土地での破壊的行動を防ぐことができます。"/>
+			<check_box label="検索に区画を表示（週L$ 30）" name="ShowDirectoryCheck" tool_tip="この区画を検索結果に表示します。"/>
+			<combo_box name="land category">
+				<combo_box.item label="全カテゴリ" name="item0"/>
+				<combo_box.item label="Linden所在地" name="item1"/>
+				<combo_box.item label="芸術と文化" name="item3"/>
+				<combo_box.item label="ビジネス" name="item4"/>
+				<combo_box.item label="教育的" name="item5"/>
+				<combo_box.item label="ゲーム" name="item6"/>
+				<combo_box.item label="たまり場" name="item7"/>
+				<combo_box.item label="新住民歓迎" name="item8"/>
+				<combo_box.item label="公園と自然" name="item9"/>
+				<combo_box.item label="住宅用" name="item10"/>
+				<combo_box.item label="ショッピング" name="item11"/>
+				<combo_box.item label="レンタル" name="item13"/>
+				<combo_box.item label="その他" name="item12"/>
+			</combo_box>
+			<check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip=""/>
+			<text name="Snapshot:">
+				スナップショット：
+			</text>
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="画像をクリックして選択"/>
+			<text name="allow_see_label">
+				別の区画にいるアバターが、この区画にいるアバターとチャットできるようになります。
+			</text>
+			<check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="別の区画のアバターが、この区画にいるアバターとチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。"/>
+			<text name="landing_point">
+				ランディング地点：[LANDING]
+			</text>
+			<button label="設定" label_selected="設定" name="Set" tool_tip="訪問者が最初に訪れる場所の設定を行います。この区画内に立って行ってください。"/>
+			<button label="クリア" label_selected="クリア" name="Clear" tool_tip="ランディング地点をクリアする。"/>
+			<text name="Teleport Routing: ">
+				テレポート経路：
+			</text>
+			<combo_box name="landing type" tool_tip="テレポート経路－あなたの土地へのテレポート経路を選択してください。">
+				<combo_box.item label="不可" name="Blocked"/>
+				<combo_box.item label="ランディング地点のみ" name="LandingPoint"/>
+				<combo_box.item label="どこでも可能" name="Anywhere"/>
+			</combo_box>
+		</panel>
+		<panel label="メディア" name="land_media_panel">
+			<text name="with media:">
+				種類：
+			</text>
+			<combo_box name="media type" tool_tip="動画や、Webページ、その他のメディアのＵＲＬを指定します。"/>
+			<text name="at URL:">
+				ホームページ：
+			</text>
+			<button label="設定" name="set_media_url"/>
+			<text name="Description:">
+				説明：
+			</text>
+			<line_editor name="url_description" tool_tip="「再生」「読み込み」ボタンの隣に表示されるテキストです。"/>
+			<text name="Media texture:">
+				テクスチャの差し替え：
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="画像をクリックして選択"/>
+			<text name="replace_texture_help">
+				このテクスチャを使用するオブジェクトの「再生」をクリックすると、動画やWebページを表示します。テクスチャを変更するにはサムネイルを選択してください。
+			</text>
+			<check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。動作速度と画質が少し低下することがありますが、他のテクスチャのスケーリングや整列が必要になることはありません。"/>
+			<text name="media_size" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。">
+				サイズ：
+			</text>
+			<spinner name="media_size_width" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。"/>
+			<spinner name="media_size_height" tool_tip="レンダリングするWebメディアのサイズです。デフォルトの０のままにします。"/>
+			<text name="pixels">
+				ピクセル
+			</text>
+			<text name="Options:">
+				オプション：
+			</text>
+			<check_box label="ループ" name="media_loop" tool_tip="メディアをループ再生します。メディアの再生が終わったら、最初から再生し直します。"/>
+		</panel>
+		<panel label="サウンド" name="land_audio_panel">
+			<text name="MusicURL:">
+				音楽ＵＲＬ：
+			</text>
+			<text name="Sound:">
+				サウンド：
+			</text>
+			<check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				アバターのサウンド：
+			</text>
+			<check_box label="全員" name="all av sound check"/>
+			<check_box label="グループ" name="group av sound check"/>
+			<text name="Voice settings:">
+				ボイス：
+			</text>
+			<check_box label="ボイスチャットを有効にする" name="parcel_enable_voice_channel"/>
+			<check_box label="ボイスチャットを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled"/>
+			<check_box label="ボイスチャットをこの区画内に限定する" name="parcel_enable_voice_channel_local"/>
+		</panel>
+		<panel label="アクセス" name="land_access_panel">
+			<panel.string name="access_estate_defined">
+				（不動産に限定）
+			</panel.string>
+			<panel.string name="estate_override">
+				１つ以上のオプションが、不動産レベルで設定されています。
+			</panel.string>
+			<check_box label="誰でも訪問可（このオプションをオフにすると立入禁止ラインが作成されます）" name="public_access"/>
+			<check_box label="１８歳以上である必要があります。[ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、１８歳以上でなければなりません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。"/>
+			<check_box label="支払情報が登録されている必要があります。[ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="アカウントに支払情報が登録されていない場合、この区画にアクセスすることはできません。詳細につきましては、[SUPPORT_SITE]をご覧になってください。"/>
+			<check_box label="制約なしにグループ[GROUP]を許可する。" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。"/>
+			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。"/>
+			<combo_box name="pass_combo">
+				<combo_box.item label="誰でも" name="Anyone"/>
+				<combo_box.item label="グループ" name="Group"/>
+			</combo_box>
+			<spinner label="価格（L$）：" name="PriceSpin"/>
+			<spinner label="アクセス時間：" name="HoursSpin"/>
+			<text name="OwnerLimited">
+				（不動産所有者が、このオプションに制約を与えている場合があります）
+			</text>
+			<panel name="Allowed_layout_panel">
+				<text label="常に許可" name="AllowedText">
+					常に許可する人（[COUNT]人、最大[MAX]人）
+				</text>
+				<name_list name="AccessList" tool_tip="（合計[LISTED]人、最大[MAX]人）"/>
+				<button label="追加" name="add_allowed"/>
+				<button label="削除" label_selected="削除" name="remove_allowed"/>
+			</panel>
+			<panel name="Banned_layout_panel">
+				<text label="バン" name="BanCheck">
+					バンした人（[COUNT]人、最大[MAX]人）
+				</text>
+				<name_list name="BannedList" tool_tip="（合計[LISTED]人、最大[MAX]人）">
+					<columns label="名前" name="name"/>
+					<columns label="期間" name="duration"/>
+				</name_list>
+				<button label="追加" name="add_banned"/>
+				<button label="削除" label_selected="削除" name="remove_banned"/>
+			</panel>
+		</panel>
+		<panel label="体験" name="land_experiences_panel"/>
+		<panel label="環境" name="land_environment_panel"/>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
index ea959d9de3..c953c2e8d0 100644
--- a/indra/newview/skins/default/xui/ja/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_activeim" title="有効なＩＭ" />
+<floater name="floater_activeim" title="有効なＩＭ"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
index 895cb8137f..fb2cd37cc3 100644
--- a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_add_payment_method">
-  <floater.string name="continue_url">https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1&amp;lang=ja-JP</floater.string>
-  <panel label="wrapper_panel" name="wrapper_panel">
-    <text name="title_txt">支払い方法を登録してリンデンドルを購入し、Second Lifeをもっと楽しみましょう。</text>
-    <button label="始めましょう" name="continue_btn" />
-    <button label="また後で" />
-    <icon name="image_left" />
-    <icon name="image_center" />
-    <icon name="image_right" />
-    <text name="image_left_desc">お気に入りのアバターを作成しましょう。ストアやSecond Lifeマーケットプレイスにある何百万ものアイテムからお選びください。あなただけのスタイルがここにあります。</text>
-    <text name="image_center_desc">お気に入りのパフォーマーやホストに寄付をしましょう。あなたのサポートは、彼らが素晴らしい体験を生み出すのに役立ちます。</text>
-    <text name="image_right_desc">あなたの夢の家を作りましょう。何百万ものアイテムを購入できるので、あなただけの住まいを作ることができます。</text>
-  </panel>
+	<floater.string name="continue_url">
+		https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1&amp;lang=ja-JP
+	</floater.string>
+	<panel label="wrapper_panel" name="wrapper_panel">
+		<text name="title_txt">
+			支払い方法を登録してリンデンドルを購入し、Second Lifeをもっと楽しみましょう。
+		</text>
+		<button label="始めましょう" name="continue_btn"/>
+		<button label="また後で"/>
+		<icon name="image_left"/>
+		<icon name="image_center"/>
+		<icon name="image_right"/>
+		<text name="image_left_desc">
+			お気に入りのアバターを作成しましょう。ストアやSecond Lifeマーケットプレイスにある何百万ものアイテムからお選びください。あなただけのスタイルがここにあります。
+		</text>
+		<text name="image_center_desc">
+			お気に入りのパフォーマーやホストに寄付をしましょう。あなたのサポートは、彼らが素晴らしい体験を生み出すのに役立ちます。
+		</text>
+		<text name="image_right_desc">
+			あなたの夢の家を作りましょう。何百万ものアイテムを購入できるので、あなただけの住まいを作ることができます。
+		</text>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
index f4294a0ef7..75747d61a0 100644
--- a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
@@ -1,67 +1,108 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="env_adjust_snapshot" title="個人的な光源">
-  <!-- TODO: 翻訳不能 -->
-  <layout_stack name="outer_stack">
-    <!-- If I put in a timeline it would go here -->
-    <layout_panel name="env_controls">
-      <layout_stack name="settings_stack">
-        <layout_panel>
-          <text>周辺：</text>
-          <color_swatch name="ambient_light" />
-          <text>青のホライズン：</text>
-          <color_swatch name="blue_horizon" />
-          <text>青の濃度：</text>
-          <color_swatch name="blue_density" />
-          <button label="リセット" tool_tip="閉じて共有された環境にリセットします。" name="btn_reset" />
-          <text>太陽の色：</text>
-          <color_swatch name="sun_color" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="80">雲の色：:</text>
-          <color_swatch name="cloud_color" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="10" name="cloud_map_label" width="80">雲の画像：:</text>
-          <texture_picker height="63" layout="topleft" left_delta="0" name="cloud_map" top_pad="5" width="60" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="-13" name="cloud_map_label" width="80">水面の画像：</text>
-          <texture_picker height="63" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="60" />
-        </layout_panel>
-        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" visible="true" width="200" height="150">
-          <text follows="left|top" height="10" layout="topleft" left_delta="5" top_pad="5" width="80">靄のホライズン：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_pad="5" width="185" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="80">靄の濃度：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_pad="5" width="185" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">雲の量：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1" name="cloud_coverage" top_pad="5" width="185" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">雲のスケール：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.01" max_val="3" name="cloud_scale" top_pad="5" width="185" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="15" width="80">シーンのガンマ値：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_pad="5" width="185" can_edit_text="true" />
-        </layout_panel>
-        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="310" min_height="0" visible="true">
-          <text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">太陽：</text>
-          <sun_moon_trackball name="sun_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="sun" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">方位角：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="sun_azimuth" top_pad="5" width="130" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">標高：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="sun_elevation" top_pad="5" width="130" can_edit_text="true" />
-          <check_box control_name="sunbeacon" width="60" height="16" label="ビーコンを表示" layout="topleft" name="sunbeacon" left_delta="-5" top_pad="8" follows="left|top" />
-          <text follows="left|top" height="10" layout="topleft" left_pad="95" top="25" width="80">
-            スケール：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.25" max_val="20" name="sun_scale" top_delta="15" width="130" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="100">フォーカスの発光量：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-2" max_val="2" name="glow_focus" top_pad="5" width="130" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">グローサイズ：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1.99" name="glow_size" top_pad="5" width="130" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="10" width="200">星の輝度：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="500" name="star_brightness" top_pad="5" width="130" can_edit_text="true" />
-        </layout_panel>
-        <layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="160" min_height="0" visible="true">
-          <text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">月：</text>
-          <sun_moon_trackball name="moon_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="moon" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">方位角：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="moon_azimuth" top_pad="5" width="130" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">標高：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="moon_elevation" top_pad="5" width="130" can_edit_text="true" />
-          <check_box control_name="moonbeacon" label="ビーコンを表示" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<layout_stack name="outer_stack">
+		<layout_panel name="env_controls">
+			<layout_stack name="settings_stack">
+				<layout_panel>
+					<text>
+						周辺：
+					</text>
+					<color_swatch name="ambient_light"/>
+					<text>
+						青のホライズン：
+					</text>
+					<color_swatch name="blue_horizon"/>
+					<text>
+						青の濃度：
+					</text>
+					<color_swatch name="blue_density"/>
+					<button label="リセット" tool_tip="閉じて共有された環境にリセットします。" name="btn_reset"/>
+					<text>
+						太陽の色：
+					</text>
+					<color_swatch name="sun_color"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="80">
+						雲の色：:
+					</text>
+					<color_swatch name="cloud_color"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="10" name="cloud_map_label" width="80">
+						雲の画像：:
+					</text>
+					<texture_picker height="63" layout="topleft" left_delta="0" name="cloud_map" top_pad="5" width="60"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="-13" name="cloud_map_label" width="80">
+						水面の画像：
+					</text>
+					<texture_picker height="63" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="60"/>
+				</layout_panel>
+				<layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" visible="true" width="200" height="150">
+					<text follows="left|top" height="10" layout="topleft" left_delta="5" top_pad="5" width="80">
+						靄のホライズン：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_pad="5" width="185" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="80">
+						靄の濃度：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_pad="5" width="185" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">
+						雲の量：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1" name="cloud_coverage" top_pad="5" width="185" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="185">
+						雲のスケール：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.01" max_val="3" name="cloud_scale" top_pad="5" width="185" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="15" width="80">
+						シーンのガンマ値：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_pad="5" width="185" can_edit_text="true"/>
+				</layout_panel>
+				<layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="310" min_height="0" visible="true">
+					<text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">
+						太陽：
+					</text>
+					<sun_moon_trackball name="sun_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="sun"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">
+						方位角：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="sun_azimuth" top_pad="5" width="130" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">
+						標高：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="sun_elevation" top_pad="5" width="130" can_edit_text="true"/>
+					<check_box control_name="sunbeacon" width="60" height="16" label="ビーコンを表示" layout="topleft" name="sunbeacon" left_delta="-5" top_pad="8" follows="left|top"/>
+					<text follows="left|top" height="10" layout="topleft" left_pad="95" top="25" width="80">
+						スケール：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0.25" max_val="20" name="sun_scale" top_delta="15" width="130" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="100">
+						フォーカスの発光量：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-2" max_val="2" name="glow_focus" top_pad="5" width="130" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">
+						グローサイズ：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="1.99" name="glow_size" top_pad="5" width="130" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="10" width="200">
+						星の輝度：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="500" name="star_brightness" top_pad="5" width="130" can_edit_text="true"/>
+				</layout_panel>
+				<layout_panel border="false" bevel_style="in" auto_resize="false" user_resize="false" height="150" width="160" min_height="0" visible="true">
+					<text follows="top|left" font="SansSerifBold" height="10" layout="topleft" name="label" left="5" top="5" width="105">
+						月：
+					</text>
+					<sun_moon_trackball name="moon_rotation" follows="left|top" left_delta="0" top_delta="20" height="150" width="150" thumb_mode="moon"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="0" top_pad="5" width="200">
+						方位角：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="359.99" name="moon_azimuth" top_pad="5" width="130" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_pad="5" width="200">
+						標高：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="-90" max_val="90" name="moon_elevation" top_pad="5" width="130" can_edit_text="true"/>
+					<check_box control_name="moonbeacon" label="ビーコンを表示"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
index 78bac0a555..7dddd2c23d 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Anim Preview" title="ANIMATION.ANIM">
-  <text name="name_label">名前：</text>
-  <text name="description_label">説明：</text>
-  <button label="アップロード（L$ [AMOUNT]）" name="ok_btn" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<text name="name_label">
+		名前：
+	</text>
+	<text name="description_label">
+		説明：
+	</text>
+	<button label="アップロード（L$ [AMOUNT]）" name="ok_btn"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
index 207d016bf6..15f4d42fd6 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
@@ -1,100 +1,182 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview">
-  <floater.string name="failed_to_initialize"> 動きを初期化できませんでした </floater.string>
-  <floater.string name="anim_too_long">このアニメーションファイルの長さは[LENGTH]秒です。
-アニメーションの最大長は[MAX_LENGTH]秒です。</floater.string>
-  <floater.string name="failed_file_read">アニメーションファイルを読み取れません。
-[STATUS]</floater.string>
-  <floater.string name="E_ST_OK">Ok </floater.string>
-  <floater.string name="E_ST_EOF">ファイルの終端が不完全です。</floater.string>
-  <floater.string name="E_ST_NO_CONSTRAINT">制約定義を読み取れません。</floater.string>
-  <floater.string name="E_ST_NO_FILE">BVHファイルを開けません。</floater.string>
-  <floater.string name="E_ST_NO_HIER">HIERARCHYヘッダーが無効です。</floater.string>
-  <floater.string name="E_ST_NO_JOINT">ROOTまたはJOINTが見つかりません。</floater.string>
-  <floater.string name="E_ST_NO_NAME">JOINT名を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_OFFSET">OFFSETが見つかりません。</floater.string>
-  <floater.string name="E_ST_NO_CHANNELS">CHANNELSが見つかりません。</floater.string>
-  <floater.string name="E_ST_NO_ROTATION">回転順序を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_AXIS">回転軸を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_MOTION">MOTION が見つかりません。</floater.string>
-  <floater.string name="E_ST_NO_FRAMES">フレーム数を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_FRAME_TIME">フレーム時間を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_POS">位置の値を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_ROT">回転値を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_FILE">変換ファイルを開けません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_HEADER">変換ヘッダーを読み取れません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_NAME">変換名を読み取れません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_IGNORE">変換無視値を読み取れません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_RELATIVE">変換相対値を読み取れません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_OUTNAME">変換outname値を読み取れません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_MATRIX">変換行列を読み取れません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_MERGECHILD">Mergechild名を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_MERGEPARENT">Mergeparent名を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_PRIORITY">priority値を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_LOOP">loop値を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_EASEIN">easeln値を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_EASEOUT">easeOut値を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_HAND">Hand morph値を取得できません。</floater.string>
-  <floater.string name="E_ST_NO_XLT_EMOTE">emote名を読みとれません。</floater.string>
-  <floater.string name="E_ST_BAD_ROOT">ルートジョイント名が不正です。「hip」を使用してください。</floater.string>
-  <text name="name_label">名前：</text>
-  <text name="description_label">説明：</text>
-  <spinner label="優先度" name="priority" tool_tip="このアニメーションでどのアニメーションを上書きできるかを決めます" />
-  <check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生にします" />
-  <spinner label="イン（％）" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" />
-  <spinner label="アウト（％）" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" />
-  <text name="hand_label">手のポーズ</text>
-  <combo_box name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
-    <combo_box.item label="広げる" name="Spread" />
-    <combo_box.item label="リラックス" name="Relaxed" />
-    <combo_box.item label="指を指す・両手" name="PointBoth" />
-    <combo_box.item label="拳" name="Fist" />
-    <combo_box.item label="リラックス・左" name="RelaxedLeft" />
-    <combo_box.item label="指を指す・左" name="PointLeft" />
-    <combo_box.item label="拳を上げる・左" name="FistLeft" />
-    <combo_box.item label="リラックス・右" name="RelaxedRight" />
-    <combo_box.item label="指を指す・右" name="PointRight" />
-    <combo_box.item label="拳を上げる・右" name="FistRight" />
-    <combo_box.item label="敬礼・右" name="SaluteRight" />
-    <combo_box.item label="タイピング" name="Typing" />
-    <combo_box.item label="ピース・右" name="PeaceRight" />
-  </combo_box>
-  <text name="emote_label">表情</text>
-  <combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
-    <item label="（なし）" name="[None]" />
-    <item label="アーーーーー" name="Aaaaah" />
-    <item label="恐れる" name="Afraid" />
-    <item label="怒る" name="Angry" />
-    <item label="満面の笑み" name="BigSmile" />
-    <item label="退屈" name="Bored" />
-    <item label="泣く" name="Cry" />
-    <item label="軽蔑" name="Disdain" />
-    <item label="恥ずかしがる" name="Embarrassed" />
-    <item label="しかめっ面" name="Frown" />
-    <item label="キス" name="Kiss" />
-    <item label="笑う" name="Laugh" />
-    <item label="むかつく" name="Plllppt" />
-    <item label="嫌悪感" name="Repulsed" />
-    <item label="悲しい" name="Sad" />
-    <item label="肩をすくめる" name="Shrug" />
-    <item label="微笑む" name="Smile" />
-    <item label="驚く" name="Surprise" />
-    <item label="ウィンク" name="Wink" />
-    <item label="心配する" name="Worry" />
-  </combo_box>
-  <text name="preview_label">プレビュー中の動作</text>
-  <combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。">
-    <item label="立つ" name="Standing" />
-    <item label="歩く" name="Walking" />
-    <item label="座る" name="Sitting" />
-    <item label="飛ぶ" name="Flying" />
-  </combo_box>
-  <spinner label="イーズ・イン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）" />
-  <spinner label="イーズ・アウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）" />
-  <button name="play_btn" tool_tip="アニメーションを再生する。" />
-  <button name="pause_btn" tool_tip="アニメーションを一時停止する。" />
-  <button name="stop_btn" tool_tip="アニメーションの再生を停止する。" />
-  <text name="bad_animation_text"> アニメーションファイルを読み取れません。Poser 4からエクスポートしたBVHファイルをお勧めします。</text>
-  <button label="アップロード（L$ [AMOUNT]）" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="failed_to_initialize">
+		動きを初期化できませんでした
+	</floater.string>
+	<floater.string name="anim_too_long">
+		このアニメーションファイルの長さは[LENGTH]秒です。
+アニメーションの最大長は[MAX_LENGTH]秒です。
+	</floater.string>
+	<floater.string name="failed_file_read">
+		アニメーションファイルを読み取れません。
+[STATUS]
+	</floater.string>
+	<floater.string name="E_ST_OK">
+		Ok
+	</floater.string>
+	<floater.string name="E_ST_EOF">
+		ファイルの終端が不完全です。
+	</floater.string>
+	<floater.string name="E_ST_NO_CONSTRAINT">
+		制約定義を読み取れません。
+	</floater.string>
+	<floater.string name="E_ST_NO_FILE">
+		BVHファイルを開けません。
+	</floater.string>
+	<floater.string name="E_ST_NO_HIER">
+		HIERARCHYヘッダーが無効です。
+	</floater.string>
+	<floater.string name="E_ST_NO_JOINT">
+		ROOTまたはJOINTが見つかりません。
+	</floater.string>
+	<floater.string name="E_ST_NO_NAME">
+		JOINT名を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_OFFSET">
+		OFFSETが見つかりません。
+	</floater.string>
+	<floater.string name="E_ST_NO_CHANNELS">
+		CHANNELSが見つかりません。
+	</floater.string>
+	<floater.string name="E_ST_NO_ROTATION">
+		回転順序を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_AXIS">
+		回転軸を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_MOTION">
+		MOTION が見つかりません。
+	</floater.string>
+	<floater.string name="E_ST_NO_FRAMES">
+		フレーム数を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_FRAME_TIME">
+		フレーム時間を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_POS">
+		位置の値を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_ROT">
+		回転値を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_FILE">
+		変換ファイルを開けません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_HEADER">
+		変換ヘッダーを読み取れません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_NAME">
+		変換名を読み取れません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_IGNORE">
+		変換無視値を読み取れません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_RELATIVE">
+		変換相対値を読み取れません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_OUTNAME">
+		変換outname値を読み取れません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MATRIX">
+		変換行列を読み取れません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MERGECHILD">
+		Mergechild名を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
+		Mergeparent名を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_PRIORITY">
+		priority値を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_LOOP">
+		loop値を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EASEIN">
+		easeln値を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EASEOUT">
+		easeOut値を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_HAND">
+		Hand morph値を取得できません。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EMOTE">
+		emote名を読みとれません。
+	</floater.string>
+	<floater.string name="E_ST_BAD_ROOT">
+		ルートジョイント名が不正です。「hip」を使用してください。
+	</floater.string>
+	<text name="name_label">
+		名前：
+	</text>
+	<text name="description_label">
+		説明：
+	</text>
+	<spinner label="優先度" name="priority" tool_tip="このアニメーションでどのアニメーションを上書きできるかを決めます"/>
+	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生にします"/>
+	<spinner label="イン（％）" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します"/>
+	<spinner label="アウト（％）" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します"/>
+	<text name="hand_label">
+		手のポーズ
+	</text>
+	<combo_box name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
+		<combo_box.item label="広げる" name="Spread"/>
+		<combo_box.item label="リラックス" name="Relaxed"/>
+		<combo_box.item label="指を指す・両手" name="PointBoth"/>
+		<combo_box.item label="拳" name="Fist"/>
+		<combo_box.item label="リラックス・左" name="RelaxedLeft"/>
+		<combo_box.item label="指を指す・左" name="PointLeft"/>
+		<combo_box.item label="拳を上げる・左" name="FistLeft"/>
+		<combo_box.item label="リラックス・右" name="RelaxedRight"/>
+		<combo_box.item label="指を指す・右" name="PointRight"/>
+		<combo_box.item label="拳を上げる・右" name="FistRight"/>
+		<combo_box.item label="敬礼・右" name="SaluteRight"/>
+		<combo_box.item label="タイピング" name="Typing"/>
+		<combo_box.item label="ピース・右" name="PeaceRight"/>
+	</combo_box>
+	<text name="emote_label">
+		表情
+	</text>
+	<combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
+		<item label="（なし）" name="[None]"/>
+		<item label="アーーーーー" name="Aaaaah"/>
+		<item label="恐れる" name="Afraid"/>
+		<item label="怒る" name="Angry"/>
+		<item label="満面の笑み" name="BigSmile"/>
+		<item label="退屈" name="Bored"/>
+		<item label="泣く" name="Cry"/>
+		<item label="軽蔑" name="Disdain"/>
+		<item label="恥ずかしがる" name="Embarrassed"/>
+		<item label="しかめっ面" name="Frown"/>
+		<item label="キス" name="Kiss"/>
+		<item label="笑う" name="Laugh"/>
+		<item label="むかつく" name="Plllppt"/>
+		<item label="嫌悪感" name="Repulsed"/>
+		<item label="悲しい" name="Sad"/>
+		<item label="肩をすくめる" name="Shrug"/>
+		<item label="微笑む" name="Smile"/>
+		<item label="驚く" name="Surprise"/>
+		<item label="ウィンク" name="Wink"/>
+		<item label="心配する" name="Worry"/>
+	</combo_box>
+	<text name="preview_label">
+		プレビュー中の動作
+	</text>
+	<combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。">
+		<item label="立つ" name="Standing"/>
+		<item label="歩く" name="Walking"/>
+		<item label="座る" name="Sitting"/>
+		<item label="飛ぶ" name="Flying"/>
+	</combo_box>
+	<spinner label="イーズ・イン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
+	<spinner label="イーズ・アウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
+	<button name="play_btn" tool_tip="アニメーションを再生する。"/>
+	<button name="pause_btn" tool_tip="アニメーションを一時停止する。"/>
+	<button name="stop_btn" tool_tip="アニメーションの再生を停止する。"/>
+	<text name="bad_animation_text">
+		アニメーションファイルを読み取れません。Poser 4からエクスポートしたBVHファイルをお勧めします。
+	</text>
+	<button label="アップロード（L$ [AMOUNT]）" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_associate_listing.xml b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
index 3f5c0237e3..00fe1059c8 100644
--- a/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_associate_listing.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="associate listing" title="一覧の関連付け">
-  <text name="message">一覧ＩＤ：</text>
-  <line_editor name="listing_id">ここにＩＤを入力</line_editor>
-  <button label="ＯＫ" name="OK" />
-  <button label="キャンセル" name="Cancel" />
-</floater>
\ No newline at end of file
+	<text name="message">
+		一覧ＩＤ：
+	</text>
+	<line_editor name="listing_id">
+		ここにＩＤを入力
+	</line_editor>
+	<button label="ＯＫ" name="OK"/>
+	<button label="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
index 418e43e2cb..21c8d90b01 100644
--- a/indra/newview/skins/default/xui/ja/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ja/floater_auction.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_auction" title="リンデンランドの販売開始">
-  <floater.string name="already for sale">販売中の区画をオークションに出品することはできません。</floater.string>
-  <check_box initial_value="true" label="黄色のセレクションフェンスを含める" name="fence_check" />
-  <button label="スナップショット" label_selected="スナップショット" name="snapshot_btn" />
-  <button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn" />
-  <button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn" />
-  <button label="オークション開始" label_selected="オークション開始" name="start_auction_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="already for sale">
+		販売中の区画をオークションに出品することはできません。
+	</floater.string>
+	<check_box initial_value="true" label="黄色のセレクションフェンスを含める" name="fence_check"/>
+	<button label="スナップショット" label_selected="スナップショット" name="snapshot_btn"/>
+	<button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn"/>
+	<button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn"/>
+	<button label="オークション開始" label_selected="オークション開始" name="start_auction_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
index 46e2e3e631..e193505cab 100644
--- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="autoreplace_floater" title="自動置換設定">
-  <check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます" />
-  <button label="リストをインポート…" name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。" />
-  <button label="リストをエクスポート…" name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。" />
-  <button label="新規リスト…" name="autoreplace_new_list" tool_tip="新規リストを作成します。" />
-  <button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。" />
-  <button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。" />
-  <button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。" />
-  <scroll_list name="autoreplace_list_replacements">
-    <scroll_list.columns label="キーワード" name="keyword" />
-    <scroll_list.columns label="置換" name="replacement" />
-  </scroll_list>
-  <button label="追加…" name="autoreplace_add_entry" />
-  <button label="削除" name="autoreplace_delete_entry" />
-  <text name="autoreplace_keyword_txt">キーワード：</text>
-  <text name="autoreplace_replacement_txt">置換：</text>
-  <button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。" />
-  <button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。" />
-  <button label="キャンセル" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。" />
+	<check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます"/>
+	<button label="リストをインポート…" name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。"/>
+	<button label="リストをエクスポート…" name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。"/>
+	<button label="新規リスト…" name="autoreplace_new_list" tool_tip="新規リストを作成します。"/>
+	<button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。"/>
+	<button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。"/>
+	<button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。"/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="キーワード" name="keyword"/>
+		<scroll_list.columns label="置換" name="replacement"/>
+	</scroll_list>
+	<button label="追加…" name="autoreplace_add_entry"/>
+	<button label="削除" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		キーワード：
+	</text>
+	<text name="autoreplace_replacement_txt">
+		置換：
+	</text>
+	<button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。"/>
+	<button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。"/>
+	<button label="キャンセル" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。"/>
 </floater>
-<!--
-  <text top_ name="autoreplace_text2">エントリ</text>
--->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml
index 167a9b1fb4..acb22181f5 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Avatar" title="アバター選択" />
+<floater name="Avatar" title="アバター選択"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index ada91aa554..8dd8aca32a 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
@@ -1,43 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="住人を選択">
-  <floater.string name="not_found">「[TEXT]」は見つかりませんでした</floater.string>
-  <floater.string name="not_found_text">住人が見つかりませんでした。</floater.string>
-  <floater.string name="no_one_near">近くに誰もいません</floater.string>
-  <floater.string name="no_results">検索結果：なし</floater.string>
-  <floater.string name="searching">検索しています…</floater.string>
-  <!-- For multiple person selection, use "Select" and "Close" 
-    instead of "OK" and "Cancel" because "Cancel" still keeps the ones 
-    you have already selected.  The code will show the appropriate
-    set of buttons. -->
-  <string label="ＯＫ" label_selected="ＯＫ" name="Select">選択</string>
-  <string name="Close">閉じる</string>
-  <tab_container name="ResidentChooserTabs">
-    <panel label="検索" name="SearchPanel">
-      <text name="InstructSearchResidentName">名前の一部を入力：</text>
-      <line_editor name="Edit" />
-      <button label="実行" label_selected="実行" name="Find" />
-      <scroll_list name="SearchResults">
-        <columns label="名前" name="name" />
-        <columns label="ユーザ名" name="username" />
-      </scroll_list>
-    </panel>
-    <panel label="フレンド" name="FriendsPanel">
-      <text name="InstructSelectFriend">人物を選択</text>
-      <button name="RefreshFriends" />
-      <scroll_list name="Friends" />
-    </panel>
-
-    <panel label="近くにいる人" name="NearMePanel">
-      <text name="InstructSelectResident">近くにいる人を選択：</text>
-      <slider label="範囲" name="near_me_range" />
-      <text name="meters">メートル</text>
-      <button name="Refresh" />
-      <scroll_list name="NearMe">
-        <columns label="名前" name="name" />
-        <columns label="ユーザ名" name="username" />
-      </scroll_list>
-    </panel>
-  </tab_container>
-  <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="not_found">
+		「[TEXT]」は見つかりませんでした
+	</floater.string>
+	<floater.string name="not_found_text">
+		住人が見つかりませんでした。
+	</floater.string>
+	<floater.string name="no_one_near">
+		近くに誰もいません
+	</floater.string>
+	<floater.string name="no_results">
+		検索結果：なし
+	</floater.string>
+	<floater.string name="searching">
+		検索しています…
+	</floater.string>
+	<string label="ＯＫ" label_selected="ＯＫ" name="Select">
+		選択
+	</string>
+	<string name="Close">
+		閉じる
+	</string>
+	<tab_container name="ResidentChooserTabs">
+		<panel label="検索" name="SearchPanel">
+			<text name="InstructSearchResidentName">
+				名前の一部を入力：
+			</text>
+			<line_editor name="Edit"/>
+			<button label="実行" label_selected="実行" name="Find"/>
+			<scroll_list name="SearchResults">
+				<columns label="名前" name="name"/>
+				<columns label="ユーザ名" name="username"/>
+			</scroll_list>
+		</panel>
+		<panel label="フレンド" name="FriendsPanel">
+			<text name="InstructSelectFriend">
+				人物を選択
+			</text>
+			<button name="RefreshFriends"/>
+			<scroll_list name="Friends"/>
+		</panel>
+		<panel label="近くにいる人" name="NearMePanel">
+			<text name="InstructSelectResident">
+				近くにいる人を選択：
+			</text>
+			<slider label="範囲" name="near_me_range"/>
+			<text name="meters">
+				メートル
+			</text>
+			<button name="Refresh"/>
+			<scroll_list name="NearMe">
+				<columns label="名前" name="name"/>
+				<columns label="ユーザ名" name="username"/>
+			</scroll_list>
+		</panel>
+	</tab_container>
+	<button label="ＯＫ" label_selected="ＯＫ" name="ok_btn"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
index 85912cb69b..19e93ed51b 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_avatar_render_settings" title="アバターの描画設定">
-  <string name="av_never_render" value="使用しない" />
-  <string name="av_always_render" value="常に使用する" />
-  <name_list name="render_settings_list">
-    <name_list.columns label="名前" name="name" />
-    <name_list.columns label="描画設定" name="setting" />
-  </name_list>
-  <panel name="add_subpanel">
-    <menu_button label="何かを追加…" name="plus_btn" tool_tip="選択した人物に対するアクション" />
-  </panel>
-</floater>
\ No newline at end of file
+	<string name="av_never_render" value="使用しない"/>
+	<string name="av_always_render" value="常に使用する"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="名前" name="name"/>
+		<name_list.columns label="描画設定" name="setting"/>
+	</name_list>
+	<panel name="add_subpanel">
+		<menu_button label="何かを追加…" name="plus_btn" tool_tip="選択した人物に対するアクション"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index 8d1399f3b3..e71ed5c599 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -1,64 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="アバターのテクスチャ">
-  <floater.string name="InvalidAvatar">無効なアバター</floater.string>
-  <scroll_container name="profile_scroll">
-    <panel name="scroll_content_panel">
-      <text name="label">ベークド
-テクスチャ</text>
-      <text name="composite_label">合成テクスチャ</text>
-      <button label="ＩＤをコンソールにダンプ" label_selected="ダンプ" name="Dump" />
-      <panel name="scroll_content_panel">
-        <texture_picker label="髪" name="hair-baked" />
-        <texture_picker label="髪" name="hair_grain" />
-        <texture_picker label="髪のアルファ" name="hair_alpha" />
-        <texture_picker label="髪のタトゥ" name="hair_tattoo" />
-
-        <texture_picker label="頭" name="head-baked" />
-        <texture_picker label="メイクアップ" name="head_bodypaint" />
-        <texture_picker label="頭部のアルファ" name="head_alpha" />
-        <texture_picker label="頭部のタトゥ" name="head_tattoo" />
-        <texture_picker label="頭部全般のタトゥ" name="head_universal_tattoo" />
-
-        <texture_picker label="目" name="eyes-baked" />
-        <texture_picker label="目" name="eyes_iris" />
-        <texture_picker label="目のアルファ" name="eyes_alpha" />
-        <texture_picker label="目のタトゥ" name="eyes_tattoo" />
-
-        <texture_picker label="上半身" name="upper-baked" />
-        <texture_picker label="上半身のボディペイント" name="upper_bodypaint" />
-        <texture_picker label="上半身の下着" name="upper_undershirt" />
-        <texture_picker label="手袋" name="upper_gloves" />
-        <texture_picker label="シャツ" name="upper_shirt" />
-        <texture_picker label="上着" name="upper_jacket" />
-        <texture_picker label="上半身のアルファ" name="upper_alpha" />
-        <texture_picker label="上半身のタトゥ" name="upper_tattoo" />
-        <texture_picker label="上半身全般のタトゥ" name="upper_universal_tattoo" />
-
-        <texture_picker label="下半身" name="lower-baked" />
-        <texture_picker label="下半身のボディペイント" name="lower_bodypaint" />
-        <texture_picker label="下半身の下着" name="lower_underpants" />
-        <texture_picker label="靴下" name="lower_socks" />
-        <texture_picker label="靴" name="lower_shoes" />
-        <texture_picker label="ズボン" name="lower_pants" />
-        <texture_picker label="ジャケット" name="lower_jacket" />
-        <texture_picker label="下半身のアルファ" name="lower_alpha" />
-        <texture_picker label="下半身のタトゥ" name="lower_tattoo" />
-        <texture_picker label="スカート" name="skirt-baked" />
-        <texture_picker label="スカート" name="skirt" />
-        <texture_picker label="スカートのタトゥ" name="skirt_tattoo" />
-        <texture_picker label="下半身全般のタトゥ" name="lower_universal_tattoo" />
-
-        <texture_picker label="左腕" name="leftarm-baked" />
-        <texture_picker label="左腕のタトゥ" name="leftarm_tattoo" />
-        <texture_picker label="左足" name="leftleg-baked" />
-        <texture_picker label="左足のタトゥ" name="leftleg_tattoo" />
-        <texture_picker label="予備１" name="aux1-baked" />
-        <texture_picker label="予備１タトゥ" name="aux1_tattoo" />
-        <texture_picker label="予備２" name="aux2-baked" />
-        <texture_picker label="予備２タトゥ" name="aux2_tattoo" />
-        <texture_picker label="予備３" name="aux3-baked" />
-        <texture_picker label="予備３タトゥ" name="aux3_tattoo" />
-      </panel>
-    </panel>
-  </scroll_container>
+	<floater.string name="InvalidAvatar">
+		無効なアバター
+	</floater.string>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="label">
+				ベークド
+テクスチャ
+			</text>
+			<text name="composite_label">
+				合成テクスチャ
+			</text>
+			<button label="ＩＤをコンソールにダンプ" label_selected="ダンプ" name="Dump"/>
+			<panel name="scroll_content_panel">
+				<texture_picker label="髪" name="hair-baked"/>
+				<texture_picker label="髪" name="hair_grain"/>
+				<texture_picker label="髪のアルファ" name="hair_alpha"/>
+				<texture_picker label="髪のタトゥ" name="hair_tattoo"/>
+				<texture_picker label="頭" name="head-baked"/>
+				<texture_picker label="メイクアップ" name="head_bodypaint"/>
+				<texture_picker label="頭部のアルファ" name="head_alpha"/>
+				<texture_picker label="頭部のタトゥ" name="head_tattoo"/>
+				<texture_picker label="頭部全般のタトゥ" name="head_universal_tattoo"/>
+				<texture_picker label="目" name="eyes-baked"/>
+				<texture_picker label="目" name="eyes_iris"/>
+				<texture_picker label="目のアルファ" name="eyes_alpha"/>
+				<texture_picker label="目のタトゥ" name="eyes_tattoo"/>
+				<texture_picker label="上半身" name="upper-baked"/>
+				<texture_picker label="上半身のボディペイント" name="upper_bodypaint"/>
+				<texture_picker label="上半身の下着" name="upper_undershirt"/>
+				<texture_picker label="手袋" name="upper_gloves"/>
+				<texture_picker label="シャツ" name="upper_shirt"/>
+				<texture_picker label="上着" name="upper_jacket"/>
+				<texture_picker label="上半身のアルファ" name="upper_alpha"/>
+				<texture_picker label="上半身のタトゥ" name="upper_tattoo"/>
+				<texture_picker label="上半身全般のタトゥ" name="upper_universal_tattoo"/>
+				<texture_picker label="下半身" name="lower-baked"/>
+				<texture_picker label="下半身のボディペイント" name="lower_bodypaint"/>
+				<texture_picker label="下半身の下着" name="lower_underpants"/>
+				<texture_picker label="靴下" name="lower_socks"/>
+				<texture_picker label="靴" name="lower_shoes"/>
+				<texture_picker label="ズボン" name="lower_pants"/>
+				<texture_picker label="ジャケット" name="lower_jacket"/>
+				<texture_picker label="下半身のアルファ" name="lower_alpha"/>
+				<texture_picker label="下半身のタトゥ" name="lower_tattoo"/>
+				<texture_picker label="スカート" name="skirt-baked"/>
+				<texture_picker label="スカート" name="skirt"/>
+				<texture_picker label="スカートのタトゥ" name="skirt_tattoo"/>
+				<texture_picker label="下半身全般のタトゥ" name="lower_universal_tattoo"/>
+				<texture_picker label="左腕" name="leftarm-baked"/>
+				<texture_picker label="左腕のタトゥ" name="leftarm_tattoo"/>
+				<texture_picker label="左足" name="leftleg-baked"/>
+				<texture_picker label="左足のタトゥ" name="leftleg_tattoo"/>
+				<texture_picker label="予備１" name="aux1-baked"/>
+				<texture_picker label="予備１タトゥ" name="aux1_tattoo"/>
+				<texture_picker label="予備２" name="aux2-baked"/>
+				<texture_picker label="予備２タトゥ" name="aux2_tattoo"/>
+				<texture_picker label="予備３" name="aux3-baked"/>
+				<texture_picker label="予備３タトゥ" name="aux3_tattoo"/>
+			</panel>
+		</panel>
+	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_ban_duration.xml b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
index 53a9c58a98..479468c156 100644
--- a/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/ja/floater_ban_duration.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="ban_duration" title="バン期間">
-  <text name="duration_textbox">バンする期間：</text>
-  <radio_group name="ban_duration_radio">
-    <radio_item label="常時" name="always_radio">常時</radio_item>
-    <radio_item label="一時的" name="temporary_radio">一時的</radio_item>
-  </radio_group>
-  <text name="hours_textbox">時間</text>
-  <button label="Ok" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<text name="duration_textbox">
+		バンする期間：
+	</text>
+	<radio_group name="ban_duration_radio">
+		<radio_item label="常時" name="always_radio">
+			常時
+		</radio_item>
+		<radio_item label="一時的" name="temporary_radio">
+			一時的
+		</radio_item>
+	</radio_group>
+	<text name="hours_textbox">
+		時間
+	</text>
+	<button label="Ok" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index b8719f78f9..f8b50b4bfa 100644
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="beacons" title="ビーコン（標識）">
-  <panel name="beacons_panel">
-    <text name="label_show">表示：</text>
-    <check_box label="ビーコン（標識）" name="beacons" />
-    <check_box label="ハイライト" name="highlights" />
-    <text name="beacon_width_label" tool_tip="ビーコンの幅">幅：</text>
-    <text name="label_objects">対象オブジェクト：</text>
-    <check_box label="物理的" name="physical" />
-    <check_box label="スクリプト" name="scripted" />
-    <check_box label="触れる" name="touch_only" />
-    <check_box label="音源" name="sounds" />
-    <check_box label="パーティクル源" name="particles" />
-    <check_box label="メディア源" name="moapbeacon" />
-    <text name="label_objects">以下の向きを示す：</text>
-    <check_box label="太陽" name="sun" />
-    <check_box label="月" name="moon" />
-  </panel>
-</floater>
\ No newline at end of file
+	<panel name="beacons_panel">
+		<text name="label_show">
+			表示：
+		</text>
+		<check_box label="ビーコン（標識）" name="beacons"/>
+		<check_box label="ハイライト" name="highlights"/>
+		<text name="beacon_width_label" tool_tip="ビーコンの幅">
+			幅：
+		</text>
+		<text name="label_objects">
+			対象オブジェクト：
+		</text>
+		<check_box label="物理的" name="physical"/>
+		<check_box label="スクリプト" name="scripted"/>
+		<check_box label="触れる" name="touch_only"/>
+		<check_box label="音源" name="sounds"/>
+		<check_box label="パーティクル源" name="particles"/>
+		<check_box label="メディア源" name="moapbeacon"/>
+		<text name="label_objects">
+			以下の向きを示す：
+		</text>
+		<check_box label="太陽" name="sun"/>
+		<check_box label="月" name="moon"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_big_preview.xml b/indra/newview/skins/default/xui/ja/floater_big_preview.xml
index 69cf50947f..e88d6fc488 100644
--- a/indra/newview/skins/default/xui/ja/floater_big_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_big_preview.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="プレビュー" />
+<floater name="floater_big_preview" title="プレビュー"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index d6e51f0856..783bd0278f 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="グリッドオプション">
-  <floater.string name="grid_screen_text">画面</floater.string>
-  <floater.string name="grid_local_text">ローカル</floater.string>
-  <floater.string name="grid_world_text">ワールド</floater.string>
-  <floater.string name="grid_reference_text">リファレンス</floater.string>
-  <floater.string name="grid_attachment_text">装着物</floater.string>
-  <text name="grid_mode_label" tool_tip="グリッドの不透明度">モード</text>
-  <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択">
-    <combo_box.item label="インワールドグリッド" name="World" />
-    <combo_box.item label="ローカルグリッド" name="Local" />
-    <combo_box.item label="リファレンスグリッド" name="Reference" />
-  </combo_box>
-  <spinner label="単位（メートル）" name="GridResolution" />
-  <spinner label="範囲（メートル）" name="GridDrawSize" />
-  <check_box label="より細かい単位でスナップフィット" name="GridSubUnit" />
-  <check_box label="横断面を表示" name="GridCrossSection" />
-  <text name="grid_opacity_label" tool_tip="グリッドの不透明度">不透明度：</text>
-  <slider label="グリッドの不透明度" name="GridOpacity" />
-</floater>
\ No newline at end of file
+	<floater.string name="grid_screen_text">
+		画面
+	</floater.string>
+	<floater.string name="grid_local_text">
+		ローカル
+	</floater.string>
+	<floater.string name="grid_world_text">
+		ワールド
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		リファレンス
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		装着物
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="グリッドの不透明度">
+		モード
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択">
+		<combo_box.item label="インワールドグリッド" name="World"/>
+		<combo_box.item label="ローカルグリッド" name="Local"/>
+		<combo_box.item label="リファレンスグリッド" name="Reference"/>
+	</combo_box>
+	<spinner label="単位（メートル）" name="GridResolution"/>
+	<spinner label="範囲（メートル）" name="GridDrawSize"/>
+	<check_box label="より細かい単位でスナップフィット" name="GridSubUnit"/>
+	<check_box label="横断面を表示" name="GridCrossSection"/>
+	<text name="grid_opacity_label" tool_tip="グリッドの不透明度">
+		不透明度：
+	</text>
+	<slider label="グリッドの不透明度" name="GridOpacity"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index b0a8298b06..74f133ba79 100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,40 +1,56 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterbulkperms" title="コンテンツ権限を調整">
-  <floater.string name="nothing_to_modify_text">選択した中に編集できないものが含まれています。</floater.string>
-  <floater.string name="status_text">[NAME]に権限を設定中です。</floater.string>
-  <floater.string name="start_text">権限変更リクエストをしています。</floater.string>
-  <floater.string name="done_text">権限変更リクエストが完了しました。</floater.string>
-  <check_box label="アニメーション" name="check_animation" />
-  <icon name="icon_animation" tool_tip="アニメーション" />
-  <check_box label="身体部位" name="check_bodypart" />
-  <icon name="icon_bodypart" tool_tip="身体部位" />
-  <check_box label="服装" name="check_clothing" />
-  <icon name="icon_clothing" tool_tip="服装" />
-  <check_box label="ジェスチャー" name="check_gesture" />
-  <icon name="icon_gesture" tool_tip="ジェスチャー" />
-  <check_box label="ノートカード" name="check_notecard" />
-  <icon name="icon_notecard" tool_tip="ノートカード" />
-  <check_box label="オブジェクト" name="check_object" />
-  <icon name="icon_object" tool_tip="オブジェクト" />
-  <check_box label="スクリプト" name="check_script" />
-  <icon name="icon_script" tool_tip="スクリプト" />
-  <check_box label="サウンド" name="check_sound" />
-  <icon name="icon_sound" tool_tip="サウンド" />
-  <check_box label="テクスチャ" name="check_texture" />
-  <icon name="icon_texture" tool_tip="テクスチャ" />
-  <icon name="icon_setting" tool_tip="自然環境の設定" />
-  <button label="すべてに √" label_selected="全て" name="check_all" />
-  <button label="クリア" label_selected="なし" name="check_none" />
-  <text name="newperms">コンテンツ権限を以下に調整</text>
-  <text name="GroupLabel">グループ：</text>
-  <check_box label="共有" name="share_with_group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
-  <text name="AnyoneLabel">全員：</text>
-  <check_box label="コピー" name="everyone_copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります" />
-  <text name="NextOwnerLabel">次の所有者：</text>
-  <check_box label="修正" name="next_owner_modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
-  <check_box label="コピー" name="next_owner_copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
-  <check_box initial_value="true" label="再販・譲渡" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。" />
-  <button label="ＯＫ" name="ok" />
-  <button label="適用" name="apply" />
-  <button label="キャンセル" name="close" />
-</floater>
\ No newline at end of file
+	<floater.string name="nothing_to_modify_text">
+		選択した中に編集できないものが含まれています。
+	</floater.string>
+	<floater.string name="status_text">
+		[NAME]に権限を設定中です。
+	</floater.string>
+	<floater.string name="start_text">
+		権限変更リクエストをしています。
+	</floater.string>
+	<floater.string name="done_text">
+		権限変更リクエストが完了しました。
+	</floater.string>
+	<check_box label="アニメーション" name="check_animation"/>
+	<icon name="icon_animation" tool_tip="アニメーション"/>
+	<check_box label="身体部位" name="check_bodypart"/>
+	<icon name="icon_bodypart" tool_tip="身体部位"/>
+	<check_box label="服装" name="check_clothing"/>
+	<icon name="icon_clothing" tool_tip="服装"/>
+	<check_box label="ジェスチャー" name="check_gesture"/>
+	<icon name="icon_gesture" tool_tip="ジェスチャー"/>
+	<check_box label="ノートカード" name="check_notecard"/>
+	<icon name="icon_notecard" tool_tip="ノートカード"/>
+	<check_box label="オブジェクト" name="check_object"/>
+	<icon name="icon_object" tool_tip="オブジェクト"/>
+	<check_box label="スクリプト" name="check_script"/>
+	<icon name="icon_script" tool_tip="スクリプト"/>
+	<check_box label="サウンド" name="check_sound"/>
+	<icon name="icon_sound" tool_tip="サウンド"/>
+	<check_box label="テクスチャ" name="check_texture"/>
+	<icon name="icon_texture" tool_tip="テクスチャ"/>
+	<icon name="icon_setting" tool_tip="自然環境の設定"/>
+	<button label="すべてに √" label_selected="全て" name="check_all"/>
+	<button label="クリア" label_selected="なし" name="check_none"/>
+	<text name="newperms">
+		コンテンツ権限を以下に調整
+	</text>
+	<text name="GroupLabel">
+		グループ：
+	</text>
+	<check_box label="共有" name="share_with_group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。"/>
+	<text name="AnyoneLabel">
+		全員：
+	</text>
+	<check_box label="コピー" name="everyone_copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります"/>
+	<text name="NextOwnerLabel">
+		次の所有者：
+	</text>
+	<check_box label="修正" name="next_owner_modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
+	<check_box label="コピー" name="next_owner_copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
+	<check_box initial_value="true" label="再販・譲渡" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
+	<button label="ＯＫ" name="ok"/>
+	<button label="適用" name="apply"/>
+	<button label="キャンセル" name="close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index 15905ad51a..8cd9c0cff9 100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_bumps" title="衝突・プッシュ・打撃">
-  <floater.string name="none_detected">検出なし</floater.string>
-  <floater.string name="bump">[TIME]　[NAME]があなたに衝突しました。</floater.string>
-  <floater.string name="llpushobject">[TIME]　[NAME]がスクリプトであなたを押しました。</floater.string>
-  <floater.string name="selected_object_collide">[TIME]　[NAME]が、オブジェクトであなたを叩きました。</floater.string>
-  <floater.string name="scripted_object_collide">[TIME]　[NAME]が、スクリプトのオブジェクトであなたを叩きました。</floater.string>
-  <floater.string name="physical_object_collide">[TIME]　[NAME]が、物理オブジェクトであなたを叩きました。</floater.string>
-  <floater.string name="timeStr">[[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]]</floater.string>
-</floater>
\ No newline at end of file
+	<floater.string name="none_detected">
+		検出なし
+	</floater.string>
+	<floater.string name="bump">
+		[TIME]　[NAME]があなたに衝突しました。
+	</floater.string>
+	<floater.string name="llpushobject">
+		[TIME]　[NAME]がスクリプトであなたを押しました。
+	</floater.string>
+	<floater.string name="selected_object_collide">
+		[TIME]　[NAME]が、オブジェクトであなたを叩きました。
+	</floater.string>
+	<floater.string name="scripted_object_collide">
+		[TIME]　[NAME]が、スクリプトのオブジェクトであなたを叩きました。
+	</floater.string>
+	<floater.string name="physical_object_collide">
+		[TIME]　[NAME]が、物理オブジェクトであなたを叩きました。
+	</floater.string>
+	<floater.string name="timeStr">
+		[[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]]
+	</floater.string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 24520be6ad..152fd7e87a 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="中身の購入">
-  <text name="contains_text">&lt;nolink&gt;[NAME]&lt;/nolink&gt;に含まれるもの：</text>
-  <scroll_list name="item_list" />
-  <text name="buy_text">[NAME]から、L$ [AMOUNT]で購入しますか？</text>
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-  <button label="購入" label_selected="購入" name="buy_btn" />
-  <check_box label="今すぐ着る" name="wear_check" />
-  <text name="no_copy_text">（コピー不可）</text>
-  <text name="no_modify_text">（修正不可）</text>
-  <text name="no_transfer_text">（再販・譲渡不可）</text>
-</floater>
\ No newline at end of file
+	<text name="contains_text">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt;に含まれるもの：
+	</text>
+	<scroll_list name="item_list"/>
+	<text name="buy_text">
+		[NAME]から、L$ [AMOUNT]で購入しますか？
+	</text>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+	<button label="購入" label_selected="購入" name="buy_btn"/>
+	<check_box label="今すぐ着る" name="wear_check"/>
+	<text name="no_copy_text">
+		（コピー不可）
+	</text>
+	<text name="no_modify_text">
+		（修正不可）
+	</text>
+	<text name="no_transfer_text">
+		（再販・譲渡不可）
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index 218fcb589d..6e369671ca 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -1,48 +1,92 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater title="L$の購入" name="buy currency">
-  <floater.string name="buy_currency">約[LOCALAMOUNT]でL$ [LINDENS]を購入</floater.string>
-  <floater.string name="info_cannot_buy">購入できません。</floater.string>
-  <floater.string name="estimated_zero">US$ 0.00</floater.string>
-  <icon name="normal_background" />
-  <layout_stack name="outer_stack">
-    <layout_panel name="layout_panel_title">
-      <text name="info_need_more">L$が足りません。</text>
-      <text name="info_buying">L$を購入</text>
-      <view_border name="text_border" />
-    </layout_panel>
-    <layout_panel name="layout_panel_price">
-      <text name="target_price_label">必要金額</text>
-      <text name="target_price">L$ [AMT]</text>
-    </layout_panel>
-    <layout_panel name="layout_panel_balance">
-      <text name="balance_label">所持金</text>
-      <text name="balance_amount">L$ [AMT]</text>
-    </layout_panel>
-    <layout_panel name="layout_panel_required">
-      <text name="required_label">必要最低金額</text>
-      <text name="required_amount">L$ [AMT]</text>
-    </layout_panel>
-    <layout_panel name="layout_panel_action">
-      <view_border name="text_border_2" />
-      <text name="currency_action">購入金額を選択</text>
-      <text name="currency_label">L$</text>
-      <line_editor label="L$" name="currency_amt">1234</line_editor>
-      <text name="currency_est">平均[LOCALAMOUNT]</text>
-      <text name="getting_data">見積もり中…</text>
-      <text name="total_label">購入後の残高</text>
-      <text name="total_amount">L$ [AMT]</text>
-    </layout_panel>
-    <layout_panel name="layout_panel_msg">
-      <view_border name="text_border_3" />
-      <text name="currency_links">[https://accounts.secondlife.com/billing_information/ 支払い方法]｜[https://www.secondlife.com/my/lindex/buy.php L$の購入]</text>
-      <text name="exchange_rate_note">金額を再入力して、最新の為替レートを確認してください。</text>
-      <text name="purchase_warning_repurchase">L$ を受け取ったら、
-もう一度購入してください。</text>
-    </layout_panel>
-    <layout_panel name="layout_panel_buttons">
-      <text name="contacting">LindeXに接続中…</text>
-      <button label="今すぐL$を購入" name="buy_btn" />
-      <button label="キャンセル" name="cancel_btn" />
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<floater.string name="buy_currency">
+		約[LOCALAMOUNT]でL$ [LINDENS]を購入
+	</floater.string>
+	<floater.string name="info_cannot_buy">
+		購入できません。
+	</floater.string>
+	<floater.string name="estimated_zero">
+		US$ 0.00
+	</floater.string>
+	<icon name="normal_background"/>
+	<layout_stack name="outer_stack">
+		<layout_panel name="layout_panel_title">
+			<text name="info_need_more">
+				L$が足りません。
+			</text>
+			<text name="info_buying">
+				L$を購入
+			</text>
+			<view_border name="text_border"/>
+		</layout_panel>
+		<layout_panel name="layout_panel_price">
+			<text name="target_price_label">
+				必要金額
+			</text>
+			<text name="target_price">
+				L$ [AMT]
+			</text>
+		</layout_panel>
+		<layout_panel name="layout_panel_balance">
+			<text name="balance_label">
+				所持金
+			</text>
+			<text name="balance_amount">
+				L$ [AMT]
+			</text>
+		</layout_panel>
+		<layout_panel name="layout_panel_required">
+			<text name="required_label">
+				必要最低金額
+			</text>
+			<text name="required_amount">
+				L$ [AMT]
+			</text>
+		</layout_panel>
+		<layout_panel name="layout_panel_action">
+			<view_border name="text_border_2"/>
+			<text name="currency_action">
+				購入金額を選択
+			</text>
+			<text name="currency_label">
+				L$
+			</text>
+			<line_editor label="L$" name="currency_amt">
+				1234
+			</line_editor>
+			<text name="currency_est">
+				平均[LOCALAMOUNT]
+			</text>
+			<text name="getting_data">
+				見積もり中…
+			</text>
+			<text name="total_label">
+				購入後の残高
+			</text>
+			<text name="total_amount">
+				L$ [AMT]
+			</text>
+		</layout_panel>
+		<layout_panel name="layout_panel_msg">
+			<view_border name="text_border_3"/>
+			<text name="currency_links">
+				[https://accounts.secondlife.com/billing_information/ 支払い方法]｜[https://www.secondlife.com/my/lindex/buy.php L$の購入]
+			</text>
+			<text name="exchange_rate_note">
+				金額を再入力して、最新の為替レートを確認してください。
+			</text>
+			<text name="purchase_warning_repurchase">
+				L$ を受け取ったら、
+もう一度購入してください。
+			</text>
+		</layout_panel>
+		<layout_panel name="layout_panel_buttons">
+			<text name="contacting">
+				LindeXに接続中…
+			</text>
+			<button label="今すぐL$を購入" name="buy_btn"/>
+			<button label="キャンセル" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
index 26c001da36..fc9c619be7 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_currency_html" title="通貨の購入" />
+<floater name="floater_buy_currency_html" title="通貨の購入"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 7eda56c6a3..a99321a43f 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -1,93 +1,232 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="土地の購入">
-  <floater.string name="can_resell">再販可能</floater.string>
-  <floater.string name="can_not_resell">再販不可能</floater.string>
-  <floater.string name="can_change">統合・再分割可能</floater.string>
-  <floater.string name="can_not_change">統合・再分割不可能</floater.string>
-  <floater.string name="cant_buy_for_group">あなたはアクティブなグループ用の土地購入を許可されていません。</floater.string>
-  <floater.string name="no_land_selected">土地が選択されていません。</floater.string>
-  <floater.string name="multiple_parcels_selected">複数の異なった区画を選択しました。
-これより小さな範囲を選択してください。</floater.string>
-  <floater.string name="no_permission">あなたはアクティブなグループ用の土地購入を許可されていません。</floater.string>
-  <floater.string name="parcel_not_for_sale">選択された区画は販売対象外です。</floater.string>
-  <floater.string name="group_already_owns">グループはすでにこの区画を所有しています。</floater.string>
-  <floater.string name="you_already_own">あなたはすでにこの区画を所有しています</floater.string>
-  <floater.string name="set_to_sell_to_other">選択された区画は、他の人への販売が決まっています。</floater.string>
-  <floater.string name="no_public_land">選択された地域に、公共の土地はありません。</floater.string>
-  <floater.string name="not_owned_by_you">他の住人が所有する土地を選択しています。
-もっと狭い範囲を選択してみてください。</floater.string>
-  <floater.string name="processing">購入処理中…
-（数分かかることがあります）</floater.string>
-  <floater.string name="fetching_error">土地購入の情報入手中にエラーが起きました</floater.string>
-  <floater.string name="buying_will">この土地を買うと：</floater.string>
-  <floater.string name="buying_for_group">グループ用の土地の購入：</floater.string>
-  <floater.string name="cannot_buy_now">現在購入不可：</floater.string>
-  <floater.string name="not_for_sale">販売対象外：</floater.string>
-  <floater.string name="none_needed">一切必要なし</floater.string>
-  <floater.string name="must_upgrade">アカウントをアップグレードしないと、土地を所有できません</floater.string>
-  <floater.string name="cant_own_land">あなたのアカウントで土地を所有できます。</floater.string>
-  <floater.string name="land_holdings">あなたは、[BUYER]㎡の土地を所有しています。</floater.string>
-  <floater.string name="pay_to_for_land">この土地の代金として、[SELLER]にL$[AMOUNT]を支払う。</floater.string>
-  <floater.string name="buy_for_US">L$[AMOUNT]を、約[LOCAL_AMOUNT]で購入します。</floater.string>
-  <floater.string name="parcel_meters">この区画は[AMOUNT]㎡です。</floater.string>
-  <floater.string name="premium_land">この土地は割り増し付です。[AMOUNT]㎡の料金がかかります。</floater.string>
-  <floater.string name="discounted_land">この土地はディスカウントされています。[AMOUNT]㎡の料金がかかります。</floater.string>
-  <floater.string name="meters_supports_object">[AMOUNT]㎡
-オブジェクト[AMOUNT2]個サポート</floater.string>
-  <floater.string name="sold_with_objects">オブジェクト込みで販売</floater.string>
-  <floater.string name="sold_without_objects">オブジェクトは含まれていません。</floater.string>
-  <floater.string name="info_price_string">L$ [PRICE]
+	<floater.string name="can_resell">
+		再販可能
+	</floater.string>
+	<floater.string name="can_not_resell">
+		再販不可能
+	</floater.string>
+	<floater.string name="can_change">
+		統合・再分割可能
+	</floater.string>
+	<floater.string name="can_not_change">
+		統合・再分割不可能
+	</floater.string>
+	<floater.string name="cant_buy_for_group">
+		あなたはアクティブなグループ用の土地購入を許可されていません。
+	</floater.string>
+	<floater.string name="no_land_selected">
+		土地が選択されていません。
+	</floater.string>
+	<floater.string name="multiple_parcels_selected">
+		複数の異なった区画を選択しました。
+これより小さな範囲を選択してください。
+	</floater.string>
+	<floater.string name="no_permission">
+		あなたはアクティブなグループ用の土地購入を許可されていません。
+	</floater.string>
+	<floater.string name="parcel_not_for_sale">
+		選択された区画は販売対象外です。
+	</floater.string>
+	<floater.string name="group_already_owns">
+		グループはすでにこの区画を所有しています。
+	</floater.string>
+	<floater.string name="you_already_own">
+		あなたはすでにこの区画を所有しています
+	</floater.string>
+	<floater.string name="set_to_sell_to_other">
+		選択された区画は、他の人への販売が決まっています。
+	</floater.string>
+	<floater.string name="no_public_land">
+		選択された地域に、公共の土地はありません。
+	</floater.string>
+	<floater.string name="not_owned_by_you">
+		他の住人が所有する土地を選択しています。
+もっと狭い範囲を選択してみてください。
+	</floater.string>
+	<floater.string name="processing">
+		購入処理中…
+（数分かかることがあります）
+	</floater.string>
+	<floater.string name="fetching_error">
+		土地購入の情報入手中にエラーが起きました
+	</floater.string>
+	<floater.string name="buying_will">
+		この土地を買うと：
+	</floater.string>
+	<floater.string name="buying_for_group">
+		グループ用の土地の購入：
+	</floater.string>
+	<floater.string name="cannot_buy_now">
+		現在購入不可：
+	</floater.string>
+	<floater.string name="not_for_sale">
+		販売対象外：
+	</floater.string>
+	<floater.string name="none_needed">
+		一切必要なし
+	</floater.string>
+	<floater.string name="must_upgrade">
+		アカウントをアップグレードしないと、土地を所有できません
+	</floater.string>
+	<floater.string name="cant_own_land">
+		あなたのアカウントで土地を所有できます。
+	</floater.string>
+	<floater.string name="land_holdings">
+		あなたは、[BUYER]㎡の土地を所有しています。
+	</floater.string>
+	<floater.string name="pay_to_for_land">
+		この土地の代金として、[SELLER]にL$[AMOUNT]を支払う。
+	</floater.string>
+	<floater.string name="buy_for_US">
+		L$[AMOUNT]を、約[LOCAL_AMOUNT]で購入します。
+	</floater.string>
+	<floater.string name="parcel_meters">
+		この区画は[AMOUNT]㎡です。
+	</floater.string>
+	<floater.string name="premium_land">
+		この土地は割り増し付です。[AMOUNT]㎡の料金がかかります。
+	</floater.string>
+	<floater.string name="discounted_land">
+		この土地はディスカウントされています。[AMOUNT]㎡の料金がかかります。
+	</floater.string>
+	<floater.string name="meters_supports_object">
+		[AMOUNT]㎡
+オブジェクト[AMOUNT2]個サポート
+	</floater.string>
+	<floater.string name="sold_with_objects">
+		オブジェクト込みで販売
+	</floater.string>
+	<floater.string name="sold_without_objects">
+		オブジェクトは含まれていません。
+	</floater.string>
+	<floater.string name="info_price_string">
+		L$ [PRICE]
 （L$ [PRICE_PER_SQM]/㎡）
-[SOLD_WITH_OBJECTS]</floater.string>
-  <floater.string name="insufficient_land_credits">
-この[GROUP]が区画の購入手続きを完了するには、価格に見合うだけの寄付された土地の利用実績が必要です。</floater.string>
-  <floater.string name="have_enough_lindens">あなたの現在の所持金L$ [AMOUNT]で、この土地を購入できます。</floater.string>
-  <floater.string name="not_enough_lindens">あなたの現在の所持金は、L$ [AMOUNT]で、L$ [AMOUNT2]不足しています。</floater.string>
-  <floater.string name="balance_left">購入後、残額はL$ [AMOUNT]になります。</floater.string>
-  <floater.string name="balance_needed">この土地を買うには、少なくともL$ [AMOUNT]購入する必要があります。</floater.string>
-  <floater.string name="no_parcel_selected">（区画が選定されていません）</floater.string>
-  <text name="region_name_label">地域：</text>
-  <text name="region_name_text">（不明）</text>
-  <text name="region_type_label">種類：</text>
-  <text name="region_type_text">（不明）</text>
-  <text name="estate_name_label">不動産：</text>
-  <text name="estate_name_text">（不明）</text>
-  <text name="estate_owner_label">不動産オーナー：</text>
-  <text name="estate_owner_text">（不明）</text>
-  <text name="resellable_changeable_label">このリージョン（地域）で購入した土地：</text>
-  <text name="resellable_clause">再販できる場合とできない場合があります。</text>
-  <text name="changeable_clause">統合または再分割できる場合とできない場合があります。</text>
-  <text name="covenant_text">不動産約款に同意してください：</text>
-  <text name="covenant_timestamp_text" />
-  <text_editor name="covenant_editor">読み込んでいます…。</text_editor>
-  <check_box label="上記の約款に同意します" name="agree_covenant" />
-  <text name="info_parcel_label">区画：</text>
-  <text name="info_parcel">Scotopteryx138,204</text>
-  <text name="info_size_label">サイズ：</text>
-  <text bottom_delta="-37" height="48" name="info_size">1024㎡</text>
-  <text name="info_price_label">価格：</text>
-  <text name="info_price">L$ 1500
+[SOLD_WITH_OBJECTS]
+	</floater.string>
+	<floater.string name="insufficient_land_credits">
+		この[GROUP]が区画の購入手続きを完了するには、価格に見合うだけの寄付された土地の利用実績が必要です。
+	</floater.string>
+	<floater.string name="have_enough_lindens">
+		あなたの現在の所持金L$ [AMOUNT]で、この土地を購入できます。
+	</floater.string>
+	<floater.string name="not_enough_lindens">
+		あなたの現在の所持金は、L$ [AMOUNT]で、L$ [AMOUNT2]不足しています。
+	</floater.string>
+	<floater.string name="balance_left">
+		購入後、残額はL$ [AMOUNT]になります。
+	</floater.string>
+	<floater.string name="balance_needed">
+		この土地を買うには、少なくともL$ [AMOUNT]購入する必要があります。
+	</floater.string>
+	<floater.string name="no_parcel_selected">
+		（区画が選定されていません）
+	</floater.string>
+	<text name="region_name_label">
+		地域：
+	</text>
+	<text name="region_name_text">
+		（不明）
+	</text>
+	<text name="region_type_label">
+		種類：
+	</text>
+	<text name="region_type_text">
+		（不明）
+	</text>
+	<text name="estate_name_label">
+		不動産：
+	</text>
+	<text name="estate_name_text">
+		（不明）
+	</text>
+	<text name="estate_owner_label">
+		不動産オーナー：
+	</text>
+	<text name="estate_owner_text">
+		（不明）
+	</text>
+	<text name="resellable_changeable_label">
+		このリージョン（地域）で購入した土地：
+	</text>
+	<text name="resellable_clause">
+		再販できる場合とできない場合があります。
+	</text>
+	<text name="changeable_clause">
+		統合または再分割できる場合とできない場合があります。
+	</text>
+	<text name="covenant_text">
+		不動産約款に同意してください：
+	</text>
+	<text name="covenant_timestamp_text"/>
+	<text_editor name="covenant_editor">
+		読み込んでいます…。
+	</text_editor>
+	<check_box label="上記の約款に同意します" name="agree_covenant"/>
+	<text name="info_parcel_label">
+		区画：
+	</text>
+	<text name="info_parcel">
+		Scotopteryx138,204
+	</text>
+	<text name="info_size_label">
+		サイズ：
+	</text>
+	<text bottom_delta="-37" height="48" name="info_size">
+		1024㎡
+	</text>
+	<text name="info_price_label">
+		価格：
+	</text>
+	<text name="info_price">
+		L$ 1500
 （L$ 1.1／㎡）
-オブジェクトも土地販売価格に含まれます</text>
-  <text name="info_action">この土地を買うと：</text>
-  <text name="error_message">何か変です</text>
-  <button label="Webサイトに移動" name="error_web" />
-  <text name="account_action">プレミアム会員にアップグレードする</text>
-  <text name="account_reason">土地を保有できるのはプレミアム会員だけです。</text>
-  <combo_box name="account_level">
-    <combo_box.item label="月額9.95米ドル、月払い" name="US$9.95/month,billedmonthly" />
-    <combo_box.item label="月額7.50米ドル、四半期払い" name="US$7.50/month,billedquarterly" />
-    <combo_box.item label="月額6.00米ドル、年間一括払い" name="US$6.00/month,billedannually" />
-  </combo_box>
-  <text name="land_use_action">毎月の土地使用料をUS $40に引き上げます</text>
-  <text name="land_use_reason">あなたは、1309㎡の土地を所有しています。この区画の大きさは、512㎡です。</text>
-  <text name="purchase_action">Joe ResidentにL$ 4000支払って土地を購入</text>
-  <text name="currency_reason">所持金は、L$ 2,100です。</text>
-  <text name="currency_action">追加でL$の購入</text>
-  <line_editor name="currency_amt">1000</line_editor>
-  <text name="currency_est">約[LOCAL_AMOUNT]</text>
-  <text name="currency_balance">所持金はL$ 2,100です。</text>
-  <check_box label="グループから[AMOUNT]㎡の貢献を取り除きます。" name="remove_contribution" />
-  <button label="購入" name="buy_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+オブジェクトも土地販売価格に含まれます
+	</text>
+	<text name="info_action">
+		この土地を買うと：
+	</text>
+	<text name="error_message">
+		何か変です
+	</text>
+	<button label="Webサイトに移動" name="error_web"/>
+	<text name="account_action">
+		プレミアム会員にアップグレードする
+	</text>
+	<text name="account_reason">
+		土地を保有できるのはプレミアム会員だけです。
+	</text>
+	<combo_box name="account_level">
+		<combo_box.item label="月額9.95米ドル、月払い" name="US$9.95/month,billedmonthly"/>
+		<combo_box.item label="月額7.50米ドル、四半期払い" name="US$7.50/month,billedquarterly"/>
+		<combo_box.item label="月額6.00米ドル、年間一括払い" name="US$6.00/month,billedannually"/>
+	</combo_box>
+	<text name="land_use_action">
+		毎月の土地使用料をUS $40に引き上げます
+	</text>
+	<text name="land_use_reason">
+		あなたは、1309㎡の土地を所有しています。この区画の大きさは、512㎡です。
+	</text>
+	<text name="purchase_action">
+		Joe ResidentにL$ 4000支払って土地を購入
+	</text>
+	<text name="currency_reason">
+		所持金は、L$ 2,100です。
+	</text>
+	<text name="currency_action">
+		追加でL$の購入
+	</text>
+	<line_editor name="currency_amt">
+		1000
+	</line_editor>
+	<text name="currency_est">
+		約[LOCAL_AMOUNT]
+	</text>
+	<text name="currency_balance">
+		所持金はL$ 2,100です。
+	</text>
+	<check_box label="グループから[AMOUNT]㎡の貢献を取り除きます。" name="remove_contribution"/>
+	<button label="購入" name="buy_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index 8e249359f2..e3fb13be0a 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="オブジェクトのコピーを購入">
-  <floater.string name="title_buy_text">購入</floater.string>
-  <floater.string name="title_buy_copy_text">以下を購入：</floater.string>
-  <floater.string name="no_copy_text">（コピー不可）</floater.string>
-  <floater.string name="no_modify_text">（修正不可）</floater.string>
-  <floater.string name="no_transfer_text">（再販・譲渡不可）</floater.string>
-  <text name="contents_text">中身：</text>
-  <text name="buy_text">次の売り手から L$ [AMOUNT]で購入：</text>
-  <text name="buy_name_text">[NAME]？</text>
-  <button label="購入" label_selected="購入" name="buy_btn" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="title_buy_text">
+		購入
+	</floater.string>
+	<floater.string name="title_buy_copy_text">
+		以下を購入：
+	</floater.string>
+	<floater.string name="no_copy_text">
+		（コピー不可）
+	</floater.string>
+	<floater.string name="no_modify_text">
+		（修正不可）
+	</floater.string>
+	<floater.string name="no_transfer_text">
+		（再販・譲渡不可）
+	</floater.string>
+	<text name="contents_text">
+		中身：
+	</text>
+	<text name="buy_text">
+		次の売り手から L$ [AMOUNT]で購入：
+	</text>
+	<text name="buy_name_text">
+		[NAME]？
+	</text>
+	<button label="購入" label_selected="購入" name="buy_btn"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 86db0cfe99..38de4374ac 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -1,33 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="camera_floater" help_topic="camera_floater" title="カメラ操作">
-  <floater.string name="rotate_tooltip">対象を中心にカメラを回す</floater.string>
-  <floater.string name="zoom_tooltip">対象にカメラをズーム</floater.string>
-  <floater.string name="move_tooltip">カメラを上下左右に移動</floater.string>
-  <floater.string name="free_mode_title">オブジェクト視点</floater.string>
-  <string name="inactive_combo_text">プリセットを使用</string>
-  <panel name="controls">
-    <!--TODO:
-    replace + - images -->
-    <panel name="zoom">
-      <joystick_rotate name="cam_rotate_stick" tool_tip="対象にカメラを追尾" />
-      <button name="zoom_plus_btn" />
-      <slider_bar tool_tip="対象にカメラをズーム" />
-      <button name="zoom_minus_btn" />
-      <joystick_track tool_tip="カメラを上下左右に動かします。" />
-      <text name="precise_ctrs_label">数値で角度方位を指定</text>
-    </panel>
-  </panel>
-  <panel name="buttons_panel">
-    <panel_camera_item name="front_view" tool_tip="前方視界" />
-    <panel_camera_item name="group_view" tool_tip="斜方視界" />
-    <panel_camera_item name="rear_view" tool_tip="後方視界" />
-    <panel_camera_item name="object_view" tool_tip="オブジェクト視点" />
-    <panel_camera_item name="mouselook_view" tool_tip="マウスルックビュー" />
-    <combo_box name="preset_combo">
-      <combo_list mouse_wheel_opaque="true" />
-      <combo_box.item label="プリセットを使用" name="Use preset" value="default" />
-    </combo_box>
-    <button name="gear_btn" tool_tip="カメラのプリセット" />
-    <button label="プリセットを保存…" name="save_preset_btn" />
-  </panel>
-</floater>
\ No newline at end of file
+	<floater.string name="rotate_tooltip">
+		対象を中心にカメラを回す
+	</floater.string>
+	<floater.string name="zoom_tooltip">
+		対象にカメラをズーム
+	</floater.string>
+	<floater.string name="move_tooltip">
+		カメラを上下左右に移動
+	</floater.string>
+	<floater.string name="free_mode_title">
+		オブジェクト視点
+	</floater.string>
+	<string name="inactive_combo_text">
+		プリセットを使用
+	</string>
+	<panel name="controls">
+		<panel name="zoom">
+			<joystick_rotate name="cam_rotate_stick" tool_tip="対象にカメラを追尾"/>
+			<button name="zoom_plus_btn"/>
+			<slider_bar tool_tip="対象にカメラをズーム"/>
+			<button name="zoom_minus_btn"/>
+			<joystick_track tool_tip="カメラを上下左右に動かします。"/>
+			<text name="precise_ctrs_label">
+				数値で角度方位を指定
+			</text>
+		</panel>
+	</panel>
+	<panel name="buttons_panel">
+		<panel_camera_item name="front_view" tool_tip="前方視界"/>
+		<panel_camera_item name="group_view" tool_tip="斜方視界"/>
+		<panel_camera_item name="rear_view" tool_tip="後方視界"/>
+		<panel_camera_item name="object_view" tool_tip="オブジェクト視点"/>
+		<panel_camera_item name="mouselook_view" tool_tip="マウスルックビュー"/>
+		<combo_box name="preset_combo">
+			<combo_list mouse_wheel_opaque="true"/>
+			<combo_box.item label="プリセットを使用" name="Use preset" value="default"/>
+		</combo_box>
+		<button name="gear_btn" tool_tip="カメラのプリセット"/>
+		<button label="プリセットを保存…" name="save_preset_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_camera_presets.xml b/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
index 37ce29a2e7..7b643feb24 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera_presets.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater title="カメラのプリセット" name="floater_camera_presets">
-  <flat_list_view name="preset_list" />
-</floater>
\ No newline at end of file
+	<flat_list_view name="preset_list"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 8fe572fc82..1fe04626aa 100644
--- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="グループ">
-  <text name="groupdesc">グループを選択：</text>
-  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-</floater>
\ No newline at end of file
+	<text name="groupdesc">
+		グループを選択：
+	</text>
+	<button label="ＯＫ" label_selected="ＯＫ" name="OK"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_classified.xml b/indra/newview/skins/default/xui/ja/floater_classified.xml
index 2a5037d6e2..a83463de00 100644
--- a/indra/newview/skins/default/xui/ja/floater_classified.xml
+++ b/indra/newview/skins/default/xui/ja/floater_classified.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_classified" title="クラシファイド広告">
-  <panel name="main_panel" filename="panel_classified_info.xml" />
-</floater>
\ No newline at end of file
+	<panel name="main_panel" filename="panel_classified_info.xml"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index aeadcdced3..814dd24df1 100644
--- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
@@ -1,35 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="ColorPicker" title="カラーピッカー">
-  <tab_container name="color_type_container">
-    <panel name="RGB" label="RGB">
-      <text name="r_val_text">赤：</text>
-      <spinner name="rspin" />
-      <text name="g_val_text">緑：</text>
-      <spinner name="gspin" />
-      <text name="b_val_text">青：</text>
-      <spinner name="bspin" />
-    </panel>
-    <panel name="LSL" label="LSL">
-      <text name="r_val_text_float">赤：</text>
-      <spinner decimal_digits="3" name="rspin_float" />
-      <text name="g_val_text_float">緑：</text>
-      <spinner decimal_digits="3" name="gspin_float" />
-      <text name="b_val_text_float">青：</text>
-      <spinner decimal_digits="3" name="bspin_float" />
-    </panel>
-  </tab_container>
-  <text name="h_val_text">色相：</text>
-  <spinner name="hspin" />
-  <text name="s_val_text">彩度：</text>
-  <spinner name="sspin" />
-  <text name="l_val_text">輝度：</text>
-  <spinner name="lspin" />
-  <text name="hex_text">Hex #</text>
-  <line_editor name="hex_value" />
-  <check_box label="すぐ適用" name="apply_immediate" />
-  <button name="color_pipette" />
-  <button label="ＯＫ" name="select_btn" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-  <text tool_tip="パレットの下にドラッグして保存" name="Current color:">現在の色：</text>
-  <menu_button menu_filename="menu_copy_color_picker.xml" name="clipboard_color" tool_tip="色のコピー時のオプション" />
-</floater>
\ No newline at end of file
+	<tab_container name="color_type_container">
+		<panel name="RGB" label="RGB">
+			<text name="r_val_text">
+				赤：
+			</text>
+			<spinner name="rspin"/>
+			<text name="g_val_text">
+				緑：
+			</text>
+			<spinner name="gspin"/>
+			<text name="b_val_text">
+				青：
+			</text>
+			<spinner name="bspin"/>
+		</panel>
+		<panel name="LSL" label="LSL">
+			<text name="r_val_text_float">
+				赤：
+			</text>
+			<spinner decimal_digits="3" name="rspin_float"/>
+			<text name="g_val_text_float">
+				緑：
+			</text>
+			<spinner decimal_digits="3" name="gspin_float"/>
+			<text name="b_val_text_float">
+				青：
+			</text>
+			<spinner decimal_digits="3" name="bspin_float"/>
+		</panel>
+	</tab_container>
+	<text name="h_val_text">
+		色相：
+	</text>
+	<spinner name="hspin"/>
+	<text name="s_val_text">
+		彩度：
+	</text>
+	<spinner name="sspin"/>
+	<text name="l_val_text">
+		輝度：
+	</text>
+	<spinner name="lspin"/>
+	<text name="hex_text">
+		Hex #
+	</text>
+	<line_editor name="hex_value"/>
+	<check_box label="すぐ適用" name="apply_immediate"/>
+	<button name="color_pipette"/>
+	<button label="ＯＫ" name="select_btn"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+	<text tool_tip="パレットの下にドラッグして保存" name="Current color:">
+		現在の色：
+	</text>
+	<menu_button menu_filename="menu_copy_color_picker.xml" name="clipboard_color" tool_tip="色のコピー時のオプション"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
index 8e50a74897..3742030dff 100644
--- a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_conversation_log" title="会話ログ">
-  <panel name="buttons_panel">
-    <filter_editor label="人物をフィルタ" name="people_filter_input" />
-    <menu_button name="conversation_view_btn" tool_tip="表示／並べ替えのオプション" />
-    <menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション" />
-  </panel>
-</floater>
\ No newline at end of file
+	<panel name="buttons_panel">
+		<filter_editor label="人物をフィルタ" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="表示／並べ替えのオプション"/>
+		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
index d05a2bcfba..da6e0ea364 100644
--- a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_conversation" title="会話：">
-  <floater.string name="Title">会話：[NAME]</floater.string>
-  <text name="page_label" value="ページ" />
-</floater>
\ No newline at end of file
+	<floater.string name="Title">
+		会話：[NAME]
+	</floater.string>
+	<text name="page_label" value="ページ"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_create_landmark.xml b/indra/newview/skins/default/xui/ja/floater_create_landmark.xml
index eb0772b8b9..da39d4917d 100644
--- a/indra/newview/skins/default/xui/ja/floater_create_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/floater_create_landmark.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="create_landmark" title="ランドマーク作成">
-  <string name="favorites_bar">お気に入りバー</string>
-  <text name="title_label" value="ランドマークの追加" />
-  <text name="name_label" value="名前" />
-  <line_editor name="title_editor" />
-  <text name="folder_label" value="ランドマークの保存先：" />
-  <combo_box name="folder_combo" />
-  <text name="new_folder_textbox">[secondlife:/// フォルダを作成]</text>
-  <text name="notes_label" value="私のノート" />
-  <text_editor name="notes_editor" />
-  <button label="ＯＫ" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<string name="favorites_bar">
+		お気に入りバー
+	</string>
+	<text name="title_label" value="ランドマークの追加"/>
+	<text name="name_label" value="名前"/>
+	<line_editor name="title_editor"/>
+	<text name="folder_label" value="ランドマークの保存先："/>
+	<combo_box name="folder_combo"/>
+	<text name="new_folder_textbox">
+		[secondlife:/// フォルダを作成]
+	</text>
+	<text name="notes_label" value="私のノート"/>
+	<text_editor name="notes_editor"/>
+	<button label="ＯＫ" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
index 8bae565e65..0ca8971a5b 100644
--- a/indra/newview/skins/default/xui/ja/floater_critical.xml
+++ b/indra/newview/skins/default/xui/ja/floater_critical.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container">
-  <button label="続行" label_selected="続行" name="Continue" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-  <text name="tos_title">重要なメッセージ</text>
-  <text name="tos_heading">次のメッセージを注意してよくお読みください。</text>
-  <text_editor name="tos_text">TOS_TEXT</text_editor>
-</floater>
\ No newline at end of file
+	<button label="続行" label_selected="続行" name="Continue"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+	<text name="tos_title">
+		重要なメッセージ
+	</text>
+	<text name="tos_heading">
+		次のメッセージを注意してよくお読みください。
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
index 4d6f0e87ca..9cb93619dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="delete_pref_preset" title="プリセットの削除">
-
-  <string name="title_graphic">グラフィックのプリセットを削除</string>
-  <string name="title_camera">カメラのプリセットを削除</string>
-
-  <text name="Preset">プリセットを選択</text>
-  <combo_box name="preset_combo" />
-  <button label="削除" name="delete" />
-  <button label="キャンセル" name="cancel" />
-</floater>
\ No newline at end of file
+	<string name="title_graphic">
+		グラフィックのプリセットを削除
+	</string>
+	<string name="title_camera">
+		カメラのプリセットを削除
+	</string>
+	<text name="Preset">
+		プリセットを選択
+	</text>
+	<combo_box name="preset_combo"/>
+	<button label="削除" name="delete"/>
+	<button label="キャンセル" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml
index b7c3ede317..723bad5832 100644
--- a/indra/newview/skins/default/xui/ja/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ja/floater_destinations.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Destinations" title="行き先" />
+<floater name="Destinations" title="行き先"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
index 0c21cbd0da..4f47dbc162 100644
--- a/indra/newview/skins/default/xui/ja/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Display Name" title="表示名を変更">
-  <text name="info_text">アバターにつけた名前があなたの表示名になります。表示名は週に一回まで変更することができます。</text>
-  <text name="lockout_text">表示名は次の日付まで変更できません：[TIME]</text>
-  <text name="set_name_label">新しい表示名：</text>
-  <text name="name_confirm_label">新しい表示名を再入力して確認：</text>
-  <button label="保存" name="save_btn" tool_tip="この表示名を保存します。" />
-  <button label="リセット" name="reset_btn" tool_tip="表示名をユーザー名に戻します。" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<text name="info_text">
+		アバターにつけた名前があなたの表示名になります。表示名は週に一回まで変更することができます。
+	</text>
+	<text name="lockout_text">
+		表示名は次の日付まで変更できません：[TIME]
+	</text>
+	<text name="set_name_label">
+		新しい表示名：
+	</text>
+	<text name="name_confirm_label">
+		新しい表示名を再入力して確認：
+	</text>
+	<button label="保存" name="save_btn" tool_tip="この表示名を保存します。"/>
+	<button label="リセット" name="reset_btn" tool_tip="表示名をユーザー名に戻します。"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
index aea5d80375..f75564cd4c 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
@@ -1,111 +1,109 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="env_edit_extdaycycle" title="デイサイクルを編集">
-
-  <!-- obsolete?, add as hint for 'save' button? -->
-  <string name="title_new">新しいデイサイクルを作成</string>
-  <string name="title_edit">デイサイクルを編集</string>
-  <string name="hint_new">新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。</string>
-  <string name="hint_edit">自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。</string>
-
-  <!-- Substitutions -->
-  <string name="time_label">（[HH]：[MM]）</string>
-  <string name="sky_track_label">空[ALT]</string>
-  <string name="sky_label">空</string>
-  <string name="water_label">水面</string>
-
-  <string name="commit_parcel">区画に適用</string>
-  <string name="commit_region">リージョン（地域）に適用</string>
-
-  <!-- Layout -->
-  <layout_stack name="outer_stack">
-    <layout_panel name="name_and_import">
-      <!-- This layout_panel is for loading legacy presets -->
-      <text name="label">デイサイクル名：</text>
-      <line_editor name="day_cycle_name" />
-      <button label="インポート" fname="btn_import" tool_tip="ディスクから過去の設定をインポートする。" />
-    </layout_panel>
-    <layout_panel name="content">
-      <layout_stack name="content_stack">
-        <layout_panel name="timeline_track_selection">
-          <panel name="timeline_layers">
-            <button label="空４" name="sky4_track" />
-            <button label="空３" name="sky3_track" />
-            <button label="空２" name="sky2_track" />
-            <button label="地面" name="sky1_track" />
-            <button label="水面" name="water_track" />
-          </panel>
-          <panel name="timeline">
-            <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated,
-            consider using layout_stack to get dynamic width adjustment-->
-            <text value="0％[DSC]" />
-            <text name="p1" value="25％ [DSC]" />
-            <text name="p2" value="50％ [DSC]" />
-            <text name="p3" value="75％ [DSC]" />
-            <text name="p4" value="100％ [DSC]" />
-            <multi_slider name="WLTimeSlider" />
-
-            <multi_slider name="WLDayCycleFrames" />
-
-            <text name="current_time" value="[PRCNT]％ [DSC]" />
-
-            <layout_stack name="track_options_ls">
-              <layout_panel name="track_options_lp">
-                <button label="トラックを以下から複製" name="copy_track" />
-                <button label="トラックを以下から読み込み" name="load_track" />
-                <button label="トラックを消去" name="clear_track" />
-
-              </layout_panel>
-              <layout_panel name="track_progress_lp">
-                <layout_stack name="progress_control">
-
-                  <layout_panel name="skip_back">
-                    <button name="skip_back_btn" tool_tip="後ろに移動" />
-                  </layout_panel>
-
-                  <layout_panel name="play_layout" />
-
-                  <layout_panel name="pause_layout" />
-
-                  <layout_panel name="skip_forward" />
-                </layout_stack>
-              </layout_panel>
-              <layout_panel name="frames_lp">
-                <button label="[FRAME]を追加" name="add_frame" />
-                <button label="[FRAME]を読み込む" name="btn_load_frame" />
-                <button label="[FRAME]を削除" name="delete_frame" />
-              </layout_panel>
-            </layout_stack>
-          </panel>
-        </layout_panel>
-        <layout_panel name="frame_edit_controls">
-          <!--bg_alpha_color="blue" background_visible="true" -->
-          <text name="icn_lock_edit">上部のタイムラインからキーフレームを選択し、設定を編集します。</text>
-        </layout_panel>
-        <layout_panel name="frame_settings_water">
-          <tab_container name="water_tabs">
-            <panel filename="panel_settings_water.xml" label="水面" name="water_panel" />
-          </tab_container>
-        </layout_panel>
-        <layout_panel name="frame_settings_sky">
-          <tab_container name="sky_tabs">
-            <panel filename="panel_settings_sky_atmos.xml" label="大気＆光源" name="atmosphere_panel" />
-            <panel filename="panel_settings_sky_clouds.xml" label="雲" name="clouds_panel" />
-            <panel filename="panel_settings_sky_sunmoon.xml" label="太陽＆月" name="moon_panel" />
-            <!-- added programatically so it doesn't show up whether we want it or not
-            <panel name="density_panel" label="密度" />
-            -->
-          </tab_container>
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-    <layout_panel name="buttons">
-      <button label="保存" name="save_btn" />
-
-      <button label="" name="btn_flyout" />
-
-      <button label="キャンセル" name="cancel_btn" />
-
-    </layout_panel>
-  </layout_stack>
-
-</floater>
\ No newline at end of file
+	<string name="title_new">
+		新しいデイサイクルを作成
+	</string>
+	<string name="title_edit">
+		デイサイクルを編集
+	</string>
+	<string name="hint_new">
+		新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="hint_edit">
+		自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="time_label">
+		（[HH]：[MM]）
+	</string>
+	<string name="sky_track_label">
+		空[ALT]
+	</string>
+	<string name="sky_label">
+		空
+	</string>
+	<string name="water_label">
+		水面
+	</string>
+	<string name="commit_parcel">
+		区画に適用
+	</string>
+	<string name="commit_region">
+		リージョン（地域）に適用
+	</string>
+	<layout_stack name="outer_stack">
+		<layout_panel name="name_and_import">
+			<text name="label">
+				デイサイクル名：
+			</text>
+			<line_editor name="day_cycle_name"/>
+			<button label="インポート" fname="btn_import" tool_tip="ディスクから過去の設定をインポートする。"/>
+		</layout_panel>
+		<layout_panel name="content">
+			<layout_stack name="content_stack">
+				<layout_panel name="timeline_track_selection">
+					<panel name="timeline_layers">
+						<button label="空４" name="sky4_track"/>
+						<button label="空３" name="sky3_track"/>
+						<button label="空２" name="sky2_track"/>
+						<button label="地面" name="sky1_track"/>
+						<button label="水面" name="water_track"/>
+					</panel>
+					<panel name="timeline">
+						<text value="0％[DSC]"/>
+						<text name="p1" value="25％ [DSC]"/>
+						<text name="p2" value="50％ [DSC]"/>
+						<text name="p3" value="75％ [DSC]"/>
+						<text name="p4" value="100％ [DSC]"/>
+						<multi_slider name="WLTimeSlider"/>
+						<multi_slider name="WLDayCycleFrames"/>
+						<text name="current_time" value="[PRCNT]％ [DSC]"/>
+						<layout_stack name="track_options_ls">
+							<layout_panel name="track_options_lp">
+								<button label="トラックを以下から複製" name="copy_track"/>
+								<button label="トラックを以下から読み込み" name="load_track"/>
+								<button label="トラックを消去" name="clear_track"/>
+							</layout_panel>
+							<layout_panel name="track_progress_lp">
+								<layout_stack name="progress_control">
+									<layout_panel name="skip_back">
+										<button name="skip_back_btn" tool_tip="後ろに移動"/>
+									</layout_panel>
+									<layout_panel name="play_layout"/>
+									<layout_panel name="pause_layout"/>
+									<layout_panel name="skip_forward"/>
+								</layout_stack>
+							</layout_panel>
+							<layout_panel name="frames_lp">
+								<button label="[FRAME]を追加" name="add_frame"/>
+								<button label="[FRAME]を読み込む" name="btn_load_frame"/>
+								<button label="[FRAME]を削除" name="delete_frame"/>
+							</layout_panel>
+						</layout_stack>
+					</panel>
+				</layout_panel>
+				<layout_panel name="frame_edit_controls">
+					<text name="icn_lock_edit">
+						上部のタイムラインからキーフレームを選択し、設定を編集します。
+					</text>
+				</layout_panel>
+				<layout_panel name="frame_settings_water">
+					<tab_container name="water_tabs">
+						<panel filename="panel_settings_water.xml" label="水面" name="water_panel"/>
+					</tab_container>
+				</layout_panel>
+				<layout_panel name="frame_settings_sky">
+					<tab_container name="sky_tabs">
+						<panel filename="panel_settings_sky_atmos.xml" label="大気＆光源" name="atmosphere_panel"/>
+						<panel filename="panel_settings_sky_clouds.xml" label="雲" name="clouds_panel"/>
+						<panel filename="panel_settings_sky_sunmoon.xml" label="太陽＆月" name="moon_panel"/>
+					</tab_container>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="buttons">
+			<button label="保存" name="save_btn"/>
+			<button label="" name="btn_flyout"/>
+			<button label="キャンセル" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
index 32c3f4d9cf..ac5b2839d1 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="HoverHeight" title="ホバー高さの設定">
-  <slider label="高さ" name="HoverHeightSlider" />
-</floater>
\ No newline at end of file
+	<slider label="高さ" name="HoverHeightSlider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index b4b3e2c09d..a4b6a5c7ad 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="イベント" name="Event" title="イベントの情報">
-  <floater.string name="loading_text">読み込んでいます…</floater.string>
-  <floater.string name="done_text">完了</floater.string>
-  <web_browser name="browser" />
-  <text name="status_text" />
-</floater>
\ No newline at end of file
+	<floater.string name="loading_text">
+		読み込んでいます…
+	</floater.string>
+	<floater.string name="done_text">
+		完了
+	</floater.string>
+	<web_browser name="browser"/>
+	<text name="status_text"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_experience_search.xml b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
index 1d9243fb85..e913c35e1a 100644
--- a/indra/newview/skins/default/xui/ja/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experience_search.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="experiencepicker" title="体験を選択" />
+<floater name="experiencepicker" title="体験を選択"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
index f496e99032..f2f6d5e039 100644
--- a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
@@ -1,63 +1,85 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="experience_profile" title="体験プロフィール">
-  <floater.string name="empty_slurl">（なし）</floater.string>
-  <floater.string name="maturity_icon_general">"Parcel_PG_Light"</floater.string>
-  <floater.string name="maturity_icon_moderate">"Parcel_M_Light"</floater.string>
-  <floater.string name="maturity_icon_adult">"Parcel_R_Light"</floater.string>
-  <text name="edit_title" value="体験プロフィール" />
-  <tab_container name="tab_container">
-    <panel name="panel_experience_info">
-      <scroll_container name="xp_scroll">
-        <panel name="scrolling_panel">
-          <layout_stack>
-            <layout_panel name="top panel">
-              <button label="編集" name="edit_btn" />
-            </layout_panel>
-            <layout_panel name="maturity panel">
-              <text name="ContentRating">評価：</text>
-            </layout_panel>
-            <layout_panel name="location panel">
-              <text name="Location">場所：</text>
-            </layout_panel>
-            <layout_panel>
-              <text name="Owner">所有者：</text>
-            </layout_panel>
-            <layout_panel name="group_panel">
-              <text name="Group">グループ：</text>
-            </layout_panel>
-            <layout_panel name="perm panel">
-              <button label="許可" name="allow_btn" />
-              <button label="無視" name="forget_btn" />
-              <button label="ブロック" name="block_btn" />
-              <text name="privileged">この体験はすべての住人に対して有効です。</text>
-              <button label="嫌がらせの報告" name="report_btn" />
-            </layout_panel>
-          </layout_stack>
-        </panel>
-      </scroll_container>
-    </panel>
-    <panel name="edit_panel_experience_info">
-      <scroll_container name="edit_xp_scroll">
-        <panel name="edit_scrolling_panel">
-          <text name="edit_experience_title_label" value="名前：" />
-          <text name="edit_experience_desc_label" value="説明：" />
-          <button label="グループ" name="Group_btn" />
-          <text name="edit_ContentRating">評価：</text>
-          <icons_combo_box label="Moderate" name="edit_ContentRatingText" tool_tip="体験のレーティング区分を上げると、体験を許可したすべての住人の権限がリセットされます。">
-            <icons_combo_box.item label="Adult" name="Adult" value="42" />
-            <icons_combo_box.item label="Moderate" name="Mature" value="21" />
-            <icons_combo_box.item label="全般" name="PG" value="13" />
-          </icons_combo_box>
-          <text name="edit_Location">場所：</text>
-          <button label="現在に設定" name="location_btn" />
-          <button label="場所をクリア" name="clear_btn" />
-          <check_box label="体験を有効にする" name="edit_enable_btn" tool_tip="" />
-          <check_box label="検索で表示しない" name="edit_private_btn" />
-          <text name="changes" value="体験がすべてのリージョンに表示されるには数分かかる場合があります。" />
-          <button label="戻る" name="cancel_btn" />
-          <button label="保存" name="save_btn" />
-        </panel>
-      </scroll_container>
-    </panel>
-  </tab_container>
-</floater>
\ No newline at end of file
+	<floater.string name="empty_slurl">
+		（なし）
+	</floater.string>
+	<floater.string name="maturity_icon_general">
+		"Parcel_PG_Light"
+	</floater.string>
+	<floater.string name="maturity_icon_moderate">
+		"Parcel_M_Light"
+	</floater.string>
+	<floater.string name="maturity_icon_adult">
+		"Parcel_R_Light"
+	</floater.string>
+	<text name="edit_title" value="体験プロフィール"/>
+	<tab_container name="tab_container">
+		<panel name="panel_experience_info">
+			<scroll_container name="xp_scroll">
+				<panel name="scrolling_panel">
+					<layout_stack>
+						<layout_panel name="top panel">
+							<button label="編集" name="edit_btn"/>
+						</layout_panel>
+						<layout_panel name="maturity panel">
+							<text name="ContentRating">
+								評価：
+							</text>
+						</layout_panel>
+						<layout_panel name="location panel">
+							<text name="Location">
+								場所：
+							</text>
+						</layout_panel>
+						<layout_panel>
+							<text name="Owner">
+								所有者：
+							</text>
+						</layout_panel>
+						<layout_panel name="group_panel">
+							<text name="Group">
+								グループ：
+							</text>
+						</layout_panel>
+						<layout_panel name="perm panel">
+							<button label="許可" name="allow_btn"/>
+							<button label="無視" name="forget_btn"/>
+							<button label="ブロック" name="block_btn"/>
+							<text name="privileged">
+								この体験はすべての住人に対して有効です。
+							</text>
+							<button label="嫌がらせの報告" name="report_btn"/>
+						</layout_panel>
+					</layout_stack>
+				</panel>
+			</scroll_container>
+		</panel>
+		<panel name="edit_panel_experience_info">
+			<scroll_container name="edit_xp_scroll">
+				<panel name="edit_scrolling_panel">
+					<text name="edit_experience_title_label" value="名前："/>
+					<text name="edit_experience_desc_label" value="説明："/>
+					<button label="グループ" name="Group_btn"/>
+					<text name="edit_ContentRating">
+						評価：
+					</text>
+					<icons_combo_box label="Moderate" name="edit_ContentRatingText" tool_tip="体験のレーティング区分を上げると、体験を許可したすべての住人の権限がリセットされます。">
+						<icons_combo_box.item label="Adult" name="Adult" value="42"/>
+						<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
+						<icons_combo_box.item label="全般" name="PG" value="13"/>
+					</icons_combo_box>
+					<text name="edit_Location">
+						場所：
+					</text>
+					<button label="現在に設定" name="location_btn"/>
+					<button label="場所をクリア" name="clear_btn"/>
+					<check_box label="体験を有効にする" name="edit_enable_btn" tool_tip=""/>
+					<check_box label="検索で表示しない" name="edit_private_btn"/>
+					<text name="changes" value="体験がすべてのリージョンに表示されるには数分かかる場合があります。"/>
+					<button label="戻る" name="cancel_btn"/>
+					<button label="保存" name="save_btn"/>
+				</panel>
+			</scroll_container>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_experiences.xml b/indra/newview/skins/default/xui/ja/floater_experiences.xml
index c17d570c27..b275204921 100644
--- a/indra/newview/skins/default/xui/ja/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experiences.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_experiences" title="体験">
-  <tab_container name="xp_tabs" />
+	<tab_container name="xp_tabs"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
index 7a41239ca4..1d5ec4135f 100644
--- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="fast_timers">
-  <string name="pause">一時停止</string>
-  <string name="run">走る</string>
-  <combo_box name="time_scale_combo">
-    <item label="平均の２倍" name="2x Average" />
-    <item label="最大" name="Max" />
-    <item label="最近の最大" name="Recent Max" />
-    <item label="１００㎳" name="100ms" />
-  </combo_box>
-  <combo_box name="metric_combo">
-    <item label="時間" name="Time" />
-    <item label="通話数" name="Number of Calls" />
-    <item label="㎐" name="Hz" />
-  </combo_box>
-  <button label="一時停止" name="pause_btn" />
-</floater>
\ No newline at end of file
+	<string name="pause">
+		一時停止
+	</string>
+	<string name="run">
+		走る
+	</string>
+	<combo_box name="time_scale_combo">
+		<item label="平均の２倍" name="2x Average"/>
+		<item label="最大" name="Max"/>
+		<item label="最近の最大" name="Recent Max"/>
+		<item label="１００㎳" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="時間" name="Time"/>
+		<item label="通話数" name="Number of Calls"/>
+		<item label="㎐" name="Hz"/>
+	</combo_box>
+	<button label="一時停止" name="pause_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_fbc_web.xml b/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
index ab29b442cc..cb54288a49 100644
--- a/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fbc_web.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_fbc_web" filename="floater_web_content.xml"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_fbc_web" filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
index 9d0628f364..a54ebe5c38 100644
--- a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Fixed Environment" title="固定された環境">
-  <string name="edit_sky">空を編集：</string>
-  <string name="edit_water">水面を編集</string>
-  <layout_stack name="floater_stack">
-    <layout_panel name="info_panel">
-      <text name="info_panel_label">名前：</text>
-      <line_editor name="settings_name" />
-      <button label="読み込む" tool_tip="インベントリから設定を読み込みます。" />
-      <button label="インポート" tool_tip="ディスクから過去の設定をインポートします。" />
-    </layout_panel>
-    <layout_panel name="tab_area">
-      <tab_container name="tab_settings">
-        <!-- Tabs inserted here in code -->
+	<string name="edit_sky">
+		空を編集：
+	</string>
+	<string name="edit_water">
+		水面を編集
+	</string>
+	<layout_stack name="floater_stack">
+		<layout_panel name="info_panel">
+			<text name="info_panel_label">
+				名前：
+			</text>
+			<line_editor name="settings_name"/>
+			<button label="読み込む" tool_tip="インベントリから設定を読み込みます。"/>
+			<button label="インポート" tool_tip="ディスクから過去の設定をインポートします。"/>
+		</layout_panel>
+		<layout_panel name="tab_area">
+			<tab_container name="tab_settings">
+        
       </tab_container>
-    </layout_panel>
-    <layout_panel name="button_panel">
-      <layout_stack name="button_bar_ls">
-        <layout_panel name="save_btn_lp">
-          <button label="保存" name="btn_commit" />
-          <button name="btn_flyout" />
-        </layout_panel>
-        <layout_panel name="revert_btn_lp">
-          <button label="キャンセル" name="btn_cancel" tool_tip="最後に保存された状態に戻す。" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+		</layout_panel>
+		<layout_panel name="button_panel">
+			<layout_stack name="button_bar_ls">
+				<layout_panel name="save_btn_lp">
+					<button label="保存" name="btn_commit"/>
+					<button name="btn_flyout"/>
+				</layout_panel>
+				<layout_panel name="revert_btn_lp">
+					<button label="キャンセル" name="btn_cancel" tool_tip="最後に保存された状態に戻す。"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
index 1953e9010b..a1669a52e3 100644
--- a/indra/newview/skins/default/xui/ja/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml
@@ -1,35 +1,87 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="フォントテスト">
-  <text type="string" length="1" bottom_delta="40" follows="left|top|right" height="16" layout="topleft" left="16">小さいサンセリフ</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifMedium" height="16" layout="topleft" left="16">普通の大きさのサンセリフ</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">サンセリフ。スタイル設定無し（普通の大きさと同じ） </text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" height="16" layout="topleft" left="16">大きいサンセリフ</text>
-  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" height="32" layout="topleft" left="16">サンセリフ size=huge</text>
-  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" font.style.="BOLD" height="32" layout="topleft" left="16">巨大なサンセリフ style=BOLD</text>
-  <text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifBold" font.size="Huge" height="32" layout="topleft" left="16">ボールドのサンセリフ size=huge</text>
-  <text type="string" length="1" bottom_delta="40" follows="left|top|right" font="Monospace" height="16" layout="topleft" left="16">等幅</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Monospace" font.size="Large" height="16" layout="topleft" left="16">等幅 size=large</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" font.style="BOLD" height="16" layout="topleft" left="16">大きなサンセリフ style=BOLD</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifBold" height="16" layout="topleft" left="16">ボールドのサンセリフ</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD" height="16" layout="topleft" left="16">サンセリフ style=BOLD（ボールドのサンセリフと一緒）</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="ITALIC" height="16" layout="topleft" left="16">サンセリフ style=ITALIC</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">サンセリフ style=BOLD|ITALIC</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">サンセリフ style=BOLD|ITALIC shadow=soft</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="UNDERLINE" height="16" layout="topleft" left="16">サンセリフ style=UNDERLINE</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font_shadow="none" height="16" layout="topleft" left="16">サンセリフ style=hard</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">サンセリフ shadow=soft</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" height="16" layout="topleft" left="16">DejaVu</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD" height="16" layout="topleft" left="16">DejaVu style=BOLD</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="ITALIC" height="16" layout="topleft" left="16">DejaVu style=ITALIC</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">DejaVu style=BOLD|ITALIC</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">DejaVu size=Large style=BOLD|ITALIC</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" height="16" layout="topleft" left="16">Helvetica</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD" height="16" layout="topleft" left="16">Helvetica style=BOLD</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="ITALIC" height="16" layout="topleft" left="16">Helvetica style=ITALIC</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">Helvetica style=BOLD|ITALIC</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">Helvetica size=Large style=BOLD|ITALIC</text>
-  <!--
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" font="OverrideTest" height="16" layout="topleft" left="16" name="linea">OverrideTest, should be times, from default/xui/en</text>
-  <text type="string" length="1" bottom_delta="20" follows="left|top|right" height="16" layout="topleft" left="16">BogusFontName</text>
-  -->
+	<text type="string" length="1" bottom_delta="40" follows="left|top|right" height="16" layout="topleft" left="16">
+		小さいサンセリフ
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifMedium" height="16" layout="topleft" left="16">
+		普通の大きさのサンセリフ
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">
+		サンセリフ。スタイル設定無し（普通の大きさと同じ）
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" height="16" layout="topleft" left="16">
+		大きいサンセリフ
+	</text>
+	<text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" height="32" layout="topleft" left="16">
+		サンセリフ size=huge
+	</text>
+	<text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifHuge" font.style.="BOLD" height="32" layout="topleft" left="16">
+		巨大なサンセリフ style=BOLD
+	</text>
+	<text type="string" length="1" bottom_delta="36" follows="left|top|right" font="SansSerifBold" font.size="Huge" height="32" layout="topleft" left="16">
+		ボールドのサンセリフ size=huge
+	</text>
+	<text type="string" length="1" bottom_delta="40" follows="left|top|right" font="Monospace" height="16" layout="topleft" left="16">
+		等幅
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Monospace" font.size="Large" height="16" layout="topleft" left="16">
+		等幅 size=large
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifLarge" font.style="BOLD" height="16" layout="topleft" left="16">
+		大きなサンセリフ style=BOLD
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerifBold" height="16" layout="topleft" left="16">
+		ボールドのサンセリフ
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD" height="16" layout="topleft" left="16">
+		サンセリフ style=BOLD（ボールドのサンセリフと一緒）
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="ITALIC" height="16" layout="topleft" left="16">
+		サンセリフ style=ITALIC
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">
+		サンセリフ style=BOLD|ITALIC
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">
+		サンセリフ style=BOLD|ITALIC shadow=soft
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font.style="UNDERLINE" height="16" layout="topleft" left="16">
+		サンセリフ style=UNDERLINE
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" font_shadow="none" height="16" layout="topleft" left="16">
+		サンセリフ style=hard
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left="16">
+		サンセリフ shadow=soft
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" height="16" layout="topleft" left="16">
+		DejaVu
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD" height="16" layout="topleft" left="16">
+		DejaVu style=BOLD
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="ITALIC" height="16" layout="topleft" left="16">
+		DejaVu style=ITALIC
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">
+		DejaVu style=BOLD|ITALIC
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="DejaVu" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">
+		DejaVu size=Large style=BOLD|ITALIC
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" height="16" layout="topleft" left="16">
+		Helvetica
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD" height="16" layout="topleft" left="16">
+		Helvetica style=BOLD
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="ITALIC" height="16" layout="topleft" left="16">
+		Helvetica style=ITALIC
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">
+		Helvetica style=BOLD|ITALIC
+	</text>
+	<text type="string" length="1" bottom_delta="20" follows="left|top|right" font="Helvetica" font.size="Large" font.style="BOLD|ITALIC" height="16" layout="topleft" left="16">
+		Helvetica size=Large style=BOLD|ITALIC
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_forget_user.xml b/indra/newview/skins/default/xui/ja/floater_forget_user.xml
index 9099bd8784..349bb11d3e 100644
--- a/indra/newview/skins/default/xui/ja/floater_forget_user.xml
+++ b/indra/newview/skins/default/xui/ja/floater_forget_user.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="記録済みのユーザ名">
-  <scroll_list name="user_list">
-    <scroll_list.columns name="user" />
-  </scroll_list>
-  <!-- 原文はForgotだが「忘れる」という翻訳はおかしいので削除に変更 -->
-  <button label="削除" label_selected="削除" name="forget" />
-  <check_box height="20" label="このユーザー名のローカルデータも削除する" name="delete_data" tool_tip="削除対象：チャット履歴、最後のセッションのスクリーンショット、ブラウザのCookie、テレポート履歴、ツールバー設定など。一部のローカルファイルは、グリッド間で共有されます。" />
-</floater>
\ No newline at end of file
+	<scroll_list name="user_list">
+		<scroll_list.columns name="user"/>
+	</scroll_list>
+	<button label="削除" label_selected="削除" name="forget"/>
+	<check_box height="20" label="このユーザー名のローカルデータも削除する" name="delete_data" tool_tip="削除対象：チャット履歴、最後のセッションのスクリーンショット、ブラウザのCookie、テレポート履歴、ツールバー設定など。一部のローカルファイルは、グリッド間で共有されます。"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index 96d3c87835..087919946d 100644
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="場所" name="gestures" title="ジェスチャー">
-  <floater.string name="loading">読み込んでいます…。</floater.string>
-  <floater.string name="playing">（再生中）</floater.string>
-  <floater.string name="copy_name">[COPY_NAME]のコピー</floater.string>
-  <scroll_list name="gesture_list">
-    <scroll_list.columns label="名前" name="name" />
-    <scroll_list.columns label="チャット" name="trigger" />
-    <scroll_list.columns label="" name="key" />
-    <scroll_list.columns label="キー" name="shortcut" />
-  </scroll_list>
-  <panel label="bottom_panel" name="bottom_panel">
-    <menu_button name="gear_btn" tool_tip="詳細オプション" />
-    <button name="new_gesture_btn" tool_tip="新しいジェスチャーを作成" />
-    <button name="activate_btn" tool_tip="選択したジェスチャーの有効化／無効化" />
-    <button name="del_btn" tool_tip="このジェスチャーを削除" />
-  </panel>
-  <button label="編集" name="edit_btn" tool_tip="選択したジェスチャーの編集ウィンドウを開く。" />
-  <button label="再生" name="play_btn" tool_tip="インワールドで選択したジェスチャーを実行する。" />
-  <button label="停止" name="stop_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="loading">
+		読み込んでいます…。
+	</floater.string>
+	<floater.string name="playing">
+		（再生中）
+	</floater.string>
+	<floater.string name="copy_name">
+		[COPY_NAME]のコピー
+	</floater.string>
+	<scroll_list name="gesture_list">
+		<scroll_list.columns label="名前" name="name"/>
+		<scroll_list.columns label="チャット" name="trigger"/>
+		<scroll_list.columns label="" name="key"/>
+		<scroll_list.columns label="キー" name="shortcut"/>
+	</scroll_list>
+	<panel label="bottom_panel" name="bottom_panel">
+		<menu_button name="gear_btn" tool_tip="詳細オプション"/>
+		<button name="new_gesture_btn" tool_tip="新しいジェスチャーを作成"/>
+		<button name="activate_btn" tool_tip="選択したジェスチャーの有効化／無効化"/>
+		<button name="del_btn" tool_tip="このジェスチャーを削除"/>
+	</panel>
+	<button label="編集" name="edit_btn" tool_tip="選択したジェスチャーの編集ウィンドウを開く。"/>
+	<button label="再生" name="play_btn" tool_tip="インワールドで選択したジェスチャーを実行する。"/>
+	<button label="停止" name="stop_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 747b9c36e9..3c96e2e340 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -1,68 +1,96 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="godtools floater" title="ゴッド・ツール">
-  <tab_container name="GodTools Tabs">
-    <panel label="グリッド" name="grid">
-      <button label="このリージョン（地域）のマップの表示キャッシュを消去" label_selected="このリージョン（地域）のマップの表示キャッシュを消去" name="Flush This Region's Map Visibility Caches" />
-    </panel>
-    <panel label="地域" name="region">
-      <text name="Region Name:">リージョン（地域）名：</text>
-      <check_box label="準備" name="check prelude" tool_tip="この設定により、この地域の準備をします。" />
-      <check_box label="太陽固定" name="check fixed sun" tool_tip="太陽位置を固定（「地域／不動産」＞「地形」の場合と同様）" />
-      <check_box label="テレポートのホームをリセット" name="check reset home" tool_tip="住人がテレポートで外に出たら、ホームを目的地にリセットします。" />
-      <check_box label="可視" name="check visible" tool_tip="この設定により、この地域をゴッド・モード以外でも可視にします。" />
-      <check_box label="ダメージ" name="check damage" tool_tip="この設定により、この地域内でダメージを有効化します。" />
-      <check_box label="トラフィックのトラッキングをブロック" name="block dwell" tool_tip="この設定により、この地域内のトラフィック計算をオフにします。" />
-      <check_box label="地形編集をブロック" name="block terraform" tool_tip="この設定により、この地域内での土地整備を禁止" />
-      <check_box label="サンドボックス" name="is sandbox" tool_tip="これがサンドボックス地域でも切り替え" />
-      <button label="地形を構築する" label_selected="地形を構築する" name="Bake Terrain" tool_tip="現在の地形をデフォルトとして保存します。" />
-      <button label="地形を元に戻す" label_selected="地形を元に戻す" name="Revert Terrain" tool_tip="現在の地形をデフォルトに置換します。" />
-      <button label="地形を交換" label_selected="地形を交換" name="Swap Terrain" tool_tip="現在の地形をデフォルトと入れ替えます。" />
-      <text name="estate id">不動産ＩＤ：</text>
-      <text name="parent id">親ＩＤ：</text>
-      <line_editor name="parentestate" tool_tip="これは、このリージョン（地域）の親不動産です。" />
-      <text name="Grid Pos: ">グリッド位置：</text>
-      <line_editor name="gridposx" tool_tip="これは、このリージョン（地域）のグリッドＸ座標です。" />
-      <line_editor name="gridposy" tool_tip="これは、このリージョン（地域）のグリッドＹ座標です。" />
-      <text name="Redirect to Grid: ">グリッドにリダイレクト：</text>
-      <text name="billable factor text">請求率：</text>
-      <text name="land cost text">㎡当たりのL$：</text>
-      <button label="更新" label_selected="更新" name="Refresh" tool_tip="上記の情報を更新するには、ここをクリックします。" />
-      <button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。" />
-      <button label="リージョン（地域）を選択" label_selected="地域を選択" name="Select Region" tool_tip="土地ツールで地域全体を選択してください。" />
-      <button label="ただちに自動保存する" label_selected="ただちに自動保存する" name="Autosave now" tool_tip="Gzip状態を自動保存ディレクトリに保存します。" />
-    </panel>
-    <panel label="オブジェクト" name="objects">
-      <panel.string name="no_target">（ターゲットなし）</panel.string>
-      <text name="Region Name:">リージョン（地域）名：</text>
-      <text name="region name">ウェルシュ</text>
-      <check_box label="スクリプトを無効化" name="disable scripts" tool_tip="この設定により、この地域内のスクリプトをすべて無効化" />
-      <check_box label="衝突を無効化" name="disable collisions" tool_tip="この設定により、この地域内の非エージェント衝突を無効化" />
-      <check_box label="物理作用を無効化" name="disable physics" tool_tip="この設定により、この地域内の物理的作用をすべて無効化" />
-      <button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。" />
-      <button label="対象の設定" label_selected="対象の設定" name="Set Target" tool_tip="オブジェクト削除の対象となるアバターを設定してください。" />
-      <text name="target_avatar_name">（対象なし）</text>
-      <button label="他の土地における対象のスクリプト・オブジェクトを削除" label_selected="他の土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On Others Land" tool_tip="この地域において対象が所有していないスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
-      <button label="「すべての」土地における対象のスクリプト・オブジェクトを削除" label_selected="「すべての」土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="この地域において対象が所有しているスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
-      <button label="対象のオブジェクトを「すべて」削除" label_selected="対象のオブジェクトを「すべて」削除" name="Delete *ALL* Of Target's Objects" tool_tip="この地域において対象が所有しているオブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。" />
-      <button label="トップ・コライダーを取得" label_selected="トップ・コライダーを取得" name="Get Top Colliders" tool_tip="最も段階の狭いコールバックが発生したオブジェクトのリストを取得します。" />
-      <button label="トップ・スクリプトを取得" label_selected="トップ・スクリプトを取得" name="Get Top Scripts" tool_tip="スクリプトの起動に最も時間を費やしているオブジェクトのリストを取得します。" />
-      <button label="スクリプト・ダイジェスト" label_selected="スクリプト・ダイジェスト" name="Scripts digest" tool_tip="すべてのスクリプトとそれらの使用回数のリストを取得します。" />
-    </panel>
-    <panel label="要求" name="request">
-      <text name="Destination:">目的地：</text>
-      <combo_box name="destination">
-        <combo_box.item label="選択" name="item1" />
-        <combo_box.item label="エージェント地域" name="item2" />
-      </combo_box>
-      <text name="Request:">要求：</text>
-      <combo_box name="request">
-        <combo_box.item label="コライダー＜ステップ＞" name="item1" />
-        <combo_box.item label="スクリプト＜回数＞、＜オプション・パターン＞" name="item2" />
-        <combo_box.item label="オブジェクト＜パターン＞" name="item3" />
-        <combo_box.item label="rez ＜アセットＩＤ＞" name="item4" />
-      </combo_box>
-      <text name="Parameter:">パラメーター：</text>
-      <button label="リクエストする" label_selected="リクエストする" name="Make Request" />
-    </panel>
-  </tab_container>
-</floater>
\ No newline at end of file
+	<tab_container name="GodTools Tabs">
+		<panel label="グリッド" name="grid">
+			<button label="このリージョン（地域）のマップの表示キャッシュを消去" label_selected="このリージョン（地域）のマップの表示キャッシュを消去" name="Flush This Region's Map Visibility Caches"/>
+		</panel>
+		<panel label="地域" name="region">
+			<text name="Region Name:">
+				リージョン（地域）名：
+			</text>
+			<check_box label="準備" name="check prelude" tool_tip="この設定により、この地域の準備をします。"/>
+			<check_box label="太陽固定" name="check fixed sun" tool_tip="太陽位置を固定（「地域／不動産」＞「地形」の場合と同様）"/>
+			<check_box label="テレポートのホームをリセット" name="check reset home" tool_tip="住人がテレポートで外に出たら、ホームを目的地にリセットします。"/>
+			<check_box label="可視" name="check visible" tool_tip="この設定により、この地域をゴッド・モード以外でも可視にします。"/>
+			<check_box label="ダメージ" name="check damage" tool_tip="この設定により、この地域内でダメージを有効化します。"/>
+			<check_box label="トラフィックのトラッキングをブロック" name="block dwell" tool_tip="この設定により、この地域内のトラフィック計算をオフにします。"/>
+			<check_box label="地形編集をブロック" name="block terraform" tool_tip="この設定により、この地域内での土地整備を禁止"/>
+			<check_box label="サンドボックス" name="is sandbox" tool_tip="これがサンドボックス地域でも切り替え"/>
+			<button label="地形を構築する" label_selected="地形を構築する" name="Bake Terrain" tool_tip="現在の地形をデフォルトとして保存します。"/>
+			<button label="地形を元に戻す" label_selected="地形を元に戻す" name="Revert Terrain" tool_tip="現在の地形をデフォルトに置換します。"/>
+			<button label="地形を交換" label_selected="地形を交換" name="Swap Terrain" tool_tip="現在の地形をデフォルトと入れ替えます。"/>
+			<text name="estate id">
+				不動産ＩＤ：
+			</text>
+			<text name="parent id">
+				親ＩＤ：
+			</text>
+			<line_editor name="parentestate" tool_tip="これは、このリージョン（地域）の親不動産です。"/>
+			<text name="Grid Pos: ">
+				グリッド位置：
+			</text>
+			<line_editor name="gridposx" tool_tip="これは、このリージョン（地域）のグリッドＸ座標です。"/>
+			<line_editor name="gridposy" tool_tip="これは、このリージョン（地域）のグリッドＹ座標です。"/>
+			<text name="Redirect to Grid: ">
+				グリッドにリダイレクト：
+			</text>
+			<text name="billable factor text">
+				請求率：
+			</text>
+			<text name="land cost text">
+				㎡当たりのL$：
+			</text>
+			<button label="更新" label_selected="更新" name="Refresh" tool_tip="上記の情報を更新するには、ここをクリックします。"/>
+			<button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。"/>
+			<button label="リージョン（地域）を選択" label_selected="地域を選択" name="Select Region" tool_tip="土地ツールで地域全体を選択してください。"/>
+			<button label="ただちに自動保存する" label_selected="ただちに自動保存する" name="Autosave now" tool_tip="Gzip状態を自動保存ディレクトリに保存します。"/>
+		</panel>
+		<panel label="オブジェクト" name="objects">
+			<panel.string name="no_target">
+				（ターゲットなし）
+			</panel.string>
+			<text name="Region Name:">
+				リージョン（地域）名：
+			</text>
+			<text name="region name">
+				ウェルシュ
+			</text>
+			<check_box label="スクリプトを無効化" name="disable scripts" tool_tip="この設定により、この地域内のスクリプトをすべて無効化"/>
+			<check_box label="衝突を無効化" name="disable collisions" tool_tip="この設定により、この地域内の非エージェント衝突を無効化"/>
+			<check_box label="物理作用を無効化" name="disable physics" tool_tip="この設定により、この地域内の物理的作用をすべて無効化"/>
+			<button label="適用" label_selected="適用" name="Apply" tool_tip="上記の変更を適用するには、ここをクリックします。"/>
+			<button label="対象の設定" label_selected="対象の設定" name="Set Target" tool_tip="オブジェクト削除の対象となるアバターを設定してください。"/>
+			<text name="target_avatar_name">
+				（対象なし）
+			</text>
+			<button label="他の土地における対象のスクリプト・オブジェクトを削除" label_selected="他の土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On Others Land" tool_tip="この地域において対象が所有していないスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。"/>
+			<button label="「すべての」土地における対象のスクリプト・オブジェクトを削除" label_selected="「すべての」土地における対象のスクリプト・オブジェクトを削除" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="この地域において対象が所有しているスクリプト・オブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。"/>
+			<button label="対象のオブジェクトを「すべて」削除" label_selected="対象のオブジェクトを「すべて」削除" name="Delete *ALL* Of Target's Objects" tool_tip="この地域において対象が所有しているオブジェクトをすべて削除します。（コピー禁止）オブジェクトは返却されます。"/>
+			<button label="トップ・コライダーを取得" label_selected="トップ・コライダーを取得" name="Get Top Colliders" tool_tip="最も段階の狭いコールバックが発生したオブジェクトのリストを取得します。"/>
+			<button label="トップ・スクリプトを取得" label_selected="トップ・スクリプトを取得" name="Get Top Scripts" tool_tip="スクリプトの起動に最も時間を費やしているオブジェクトのリストを取得します。"/>
+			<button label="スクリプト・ダイジェスト" label_selected="スクリプト・ダイジェスト" name="Scripts digest" tool_tip="すべてのスクリプトとそれらの使用回数のリストを取得します。"/>
+		</panel>
+		<panel label="要求" name="request">
+			<text name="Destination:">
+				目的地：
+			</text>
+			<combo_box name="destination">
+				<combo_box.item label="選択" name="item1"/>
+				<combo_box.item label="エージェント地域" name="item2"/>
+			</combo_box>
+			<text name="Request:">
+				要求：
+			</text>
+			<combo_box name="request">
+				<combo_box.item label="コライダー＜ステップ＞" name="item1"/>
+				<combo_box.item label="スクリプト＜回数＞、＜オプション・パターン＞" name="item2"/>
+				<combo_box.item label="オブジェクト＜パターン＞" name="item3"/>
+				<combo_box.item label="rez ＜アセットＩＤ＞" name="item4"/>
+			</combo_box>
+			<text name="Parameter:">
+				パラメーター：
+			</text>
+			<button label="リクエストする" label_selected="リクエストする" name="Make Request"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_goto_line.xml b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
index c403d24942..90c264b898 100644
--- a/indra/newview/skins/default/xui/ja/floater_goto_line.xml
+++ b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script goto" title="行に移動">
-  <button label="ＯＫ" label_selected="ＯＫ" name="goto_btn" />
-  <text name="txt">行に移動</text>
-</floater>
\ No newline at end of file
+	<button label="ＯＫ" label_selected="ＯＫ" name="goto_btn"/>
+	<text name="txt">
+		行に移動
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
index dfc5eb1250..5828d1b00e 100644
--- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_help_browser" title="ヘルプブラウザ">
-  <floater.string name="loading_text">読み込んでいます…。</floater.string>
-  <layout_stack name="stack1">
-    <layout_panel name="external_controls" />
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<floater.string name="loading_text">
+		読み込んでいます…。
+	</floater.string>
+	<layout_stack name="stack1">
+		<layout_panel name="external_controls"/>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml
index 3a02e5f889..480fb4649c 100644
--- a/indra/newview/skins/default/xui/ja/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/ja/floater_how_to.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_how_to" title="ウェルカムアイランドガイドブック" filename="floater_web_content.xml"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_how_to" title="ウェルカムアイランドガイドブック" filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
index 862991f87e..ce36051ea3 100644
--- a/indra/newview/skins/default/xui/ja/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hud.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_hud" title="チュートリアル" />
+<floater name="floater_hud" title="チュートリアル"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index 81c89fe9bc..83ccb3995c 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="floater_im_box" title="会話">
-  <string name="collapse_icon" value="Conv_toolbar_collapse" />
-  <string name="expand_icon" value="Conv_toolbar_expand" />
-  <layout_stack name="conversations_stack">
-    <layout_panel name="conversations_layout_panel">
-      <layout_stack name="conversations_pane_buttons_stack">
-        <layout_panel name="conversations_pane_buttons_expanded">
-          <menu_button name="sort_btn" tool_tip="オプションの表示／並べ替え" />
-          <button name="add_btn" tool_tip="新しい会話を開始" />
-          <button name="speak_btn" tool_tip="マイクを使って人と話す" />
-        </layout_panel>
-        <layout_panel name="conversations_pane_buttons_collapsed">
-          <button name="expand_collapse_btn" tool_tip="このリストを閉じる／開く" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-    <layout_panel name="messages_layout_panel">
-      <panel_container name="im_box_tab_container">
-        <panel name="stub_panel">
-          <button name="stub_collapse_btn" tool_tip="このペインを閉じる" />
-          <text name="stub_textbox">この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]</text>
-        </panel>
-      </panel_container>
-    </layout_panel>
-  </layout_stack>
-</multi_floater>
\ No newline at end of file
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="オプションの表示／並べ替え"/>
+					<button name="add_btn" tool_tip="新しい会話を開始"/>
+					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="このリストを閉じる／開く"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
+					<text name="stub_textbox">
+						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index aa73f53677..a2c116dbdc 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-  <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
-  <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
-  <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line" />
-  <floater.string name="expandline_icon" value="Conv_expand_one_line" />
-  <floater.string name="collapse_icon" value="Conv_toolbar_collapse" />
-  <floater.string name="expand_icon" value="Conv_toolbar_expand" />
-  <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne" />
-  <floater.string name="return_icon" value="Conv_toolbar_arrow_sw" />
-  <floater.string name="participant_added" value="[NAME]に会話を招待されました。" />
-  <floater.string name="multiple_participants_added" value="[NAME]は会話に招待されました。" />
-  <floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する" />
-  <floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す" />
-  <floater.string name="start_call_button_tooltip" value="会話の接続を開く" />
-  <floater.string name="end_call_button_tooltip" value="会話の接続を閉じる" />
-  <floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる" />
-  <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる" />
-  <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く" />
-  <view name="contents_view">
-    <layout_stack name="main_stack">
-      <layout_panel name="toolbar_panel">
-        <menu_button name="view_options_btn" tool_tip="表示／並べ替えのオプション" />
-        <menu_button name="gear_btn" tool_tip="選択した人に対するアクション" />
-        <button name="add_btn" tool_tip="この会話に他の人を追加する" />
-        <button name="voice_call_btn" tool_tip="会話の接続を開く" />
-        <button name="close_btn" tool_tip="この会話を終了する" />
-        <button name="expand_collapse_btn" tool_tip="このペインを閉じる／開く" />
-      </layout_panel>
-      <layout_panel name="body_panel">
-        <layout_stack name="im_panels">
-          <layout_panel name="right_part_holder">
-            <layout_stack name="translate_and_chat_stack">
-              <layout_panel name="translate_chat_checkbox_lp">
-                <check_box label="チャットを翻訳" name="translate_chat_checkbox" />
-              </layout_panel>
-            </layout_stack>
-          </layout_panel>
-        </layout_stack>
-      </layout_panel>
-      <layout_panel name="chat_layout_panel">
-        <layout_stack name="input_panels">
-          <layout_panel name="input_editor_layout_panel">
-            <chat_editor label="送信先" name="chat_editor" />
-          </layout_panel>
-          <layout_panel name="input_button_layout_panel">
-            <button name="minz_btn" tool_tip="メッセージパネルの表示／非表示" />
-          </layout_panel>
-        </layout_stack>
-      </layout_panel>
-    </layout_stack>
-  </view>
-</floater>
\ No newline at end of file
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME]に会話を招待されました。"/>
+	<floater.string name="multiple_participants_added" value="[NAME]は会話に招待されました。"/>
+	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
+	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
+	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
+	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="表示／並べ替えのオプション"/>
+				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
+				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
+				<button name="close_btn" tool_tip="この会話を終了する"/>
+				<button name="expand_collapse_btn" tool_tip="このペインを閉じる／開く"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="送信先" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="メッセージパネルの表示／非表示"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index 5391591f36..09097d79ea 100644
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
@@ -1,23 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
-  <text name="name_label">名前：</text>
-  <text name="description_label">説明：</text>
-  <text name="preview_label">プレビュー：</text>
-  <combo_box label="服装の種類" name="clothing_type_combo">
-    <item label="画像" name="Image" value="画像" />
-    <item label="髪型" name="Hair" value="髪型" />
-    <item label="女性の頭" name="FemaleHead" value="女性の頭" />
-    <item label="女性の上半身" name="FemaleUpperBody" value="女性の上半身" />
-    <item label="女性の下半身" name="FemaleLowerBody" value="女性の下半身" />
-    <item label="男性の頭" name="MaleHead" value="男性の頭" />
-    <item label="男性の上半身" name="MaleUpperBody" value="男性の上半身" />
-    <item label="男性の下半身" name="MaleLowerBody" value="男性の下半身" />
-    <item label="スカート" name="Skirt" value="スカート" />
-    <item label="スカルプトプリム" name="SculptedPrim" value="スカルプトプリム" />
-  </combo_box>
-  <text name="bad_image_text">画像を読み込めませんでした。
-24bitのTarga（.tga）形式で画像を保存してください。</text>
-  <check_box label="可逆圧縮" name="lossless_check" />
-  <button label="キャンセル" name="cancel_btn" />
-  <button label="アップロードﾞL$[AMOUNT]" name="ok_btn" />
-</floater>
\ No newline at end of file
+	<text name="name_label">
+		名前：
+	</text>
+	<text name="description_label">
+		説明：
+	</text>
+	<text name="preview_label">
+		プレビュー：
+	</text>
+	<combo_box label="服装の種類" name="clothing_type_combo">
+		<item label="画像" name="Image" value="画像"/>
+		<item label="髪型" name="Hair" value="髪型"/>
+		<item label="女性の頭" name="FemaleHead" value="女性の頭"/>
+		<item label="女性の上半身" name="FemaleUpperBody" value="女性の上半身"/>
+		<item label="女性の下半身" name="FemaleLowerBody" value="女性の下半身"/>
+		<item label="男性の頭" name="MaleHead" value="男性の頭"/>
+		<item label="男性の上半身" name="MaleUpperBody" value="男性の上半身"/>
+		<item label="男性の下半身" name="MaleLowerBody" value="男性の下半身"/>
+		<item label="スカート" name="Skirt" value="スカート"/>
+		<item label="スカルプトプリム" name="SculptedPrim" value="スカルプトプリム"/>
+	</combo_box>
+	<text name="bad_image_text">
+		画像を読み込めませんでした。
+24bitのTarga（.tga）形式で画像を保存してください。
+	</text>
+	<check_box label="可逆圧縮" name="lossless_check"/>
+	<button label="キャンセル" name="cancel_btn"/>
+	<button label="アップロードﾞL$[AMOUNT]" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
index 8a67b8c4f3..a5a62d6304 100644
--- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
@@ -1,11 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Import Collada" title="風景のインポート">
-  <text name="mesh count">メッシュ：[COUNT]</text>
-  <text name="texture count">テクスチャ：[COUNT]</text>
-  <text name="status">ステータス：[STATUS]</text>
-  <button label="キャンセル" name="cancel" />
-  <button label="ＯＫ" name="ok" />
-  <string name="status_idle">待機状態</string>
-  <string name="status_uploading">[NAME]をアップロード中</string>
-  <string name="status_creating">オブジェクト[NAME]を作成中</string>
-</floater>
\ No newline at end of file
+	<text name="mesh count">
+		メッシュ：[COUNT]
+	</text>
+	<text name="texture count">
+		テクスチャ：[COUNT]
+	</text>
+	<text name="status">
+		ステータス：[STATUS]
+	</text>
+	<button label="キャンセル" name="cancel"/>
+	<button label="ＯＫ" name="ok"/>
+	<string name="status_idle">
+		待機状態
+	</string>
+	<string name="status_uploading">
+		[NAME]をアップロード中
+	</string>
+	<string name="status_creating">
+		オブジェクト[NAME]を作成中
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index dc42f741c5..319db34879 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -1,15 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="incoming call" title="着信">
-  <floater.string name="lifetime">5</floater.string>
-  <floater.string name="localchat">近隣のボイスチャット</floater.string>
-  <floater.string name="anonymous">匿名ユーザー</floater.string>
-  <floater.string name="VoiceInviteP2P">からコールを受けています。</floater.string>
-  <floater.string name="VoiceInviteAdHoc">が会話チャットで、ボイスチャットに参加しました。</floater.string>
-  <floater.string name="VoiceInviteGroup">「[GROUP]」のボイスチャネルに参加なさいました。</floater.string>
-  <floater.string name="VoiceInviteQuestionGroup">[CURRENT_CHAT]を退席して、「[GROUP]」とのチャットに参加しますか？</floater.string>
-  <floater.string name="VoiceInviteQuestionDefault">[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？</floater.string>
-  <text name="question">コールに応答すると、現在のボイスチャットから切断されます。</text>
-  <button label="取る" label_selected="取る" name="Accept" />
-  <button label="無視" label_selected="無視" name="Reject" />
-  <button label="代わりにIMを開く" name="Start IM" />
-</floater>
\ No newline at end of file
+	<floater.string name="lifetime">
+		5
+	</floater.string>
+	<floater.string name="localchat">
+		近隣のボイスチャット
+	</floater.string>
+	<floater.string name="anonymous">
+		匿名ユーザー
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		からコールを受けています。
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		が会話チャットで、ボイスチャットに参加しました。
+	</floater.string>
+	<floater.string name="VoiceInviteGroup">
+		「[GROUP]」のボイスチャネルに参加なさいました。
+	</floater.string>
+	<floater.string name="VoiceInviteQuestionGroup">
+		[CURRENT_CHAT]を退席して、「[GROUP]」とのチャットに参加しますか？
+	</floater.string>
+	<floater.string name="VoiceInviteQuestionDefault">
+		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
+	</floater.string>
+	<text name="question">
+		コールに応答すると、現在のボイスチャットから切断されます。
+	</text>
+	<button label="取る" label_selected="取る" name="Accept"/>
+	<button label="無視" label_selected="無視" name="Reject"/>
+	<button label="代わりにIMを開く" name="Start IM"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index dfbf698c7e..fca7b2eab8 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="inspect" title="オブジェクトの調査">
-  <floater.string name="timeStamp">[year,datetime,slt]年[mth,datetime,slt]月[day,datetime,slt]日（[wkday,datetime,slt]）　[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]</floater.string>
-  <scroll_list name="object_list" tool_tip="このリストからオブジェクトを選択して、インワールドでハイライトします。">
-    <scroll_list.columns label="オブジェクト名" name="object_name" />
-    <scroll_list.columns label="所有者" name="owner_name" />
-    <scroll_list.columns label="制作者" name="creator_name" />
-    <scroll_list.columns label="制作日" name="creation_date" />
-    <scroll_list.commit_callback function="Inspect.SelectObject" />
-  </scroll_list>
-  <button label="所有者のプロフィール…" name="button owner" tool_tip="ハイライトされたオブジェクトの所有者のプロフィールを見る" />
-  <button label="制作者のプロフィール…" name="button creator" tool_tip="ハイライトされたオブジェクトの元の作成者のプロフィールを見る" />
-</floater>
\ No newline at end of file
+	<floater.string name="timeStamp">
+		[year,datetime,slt]年[mth,datetime,slt]月[day,datetime,slt]日（[wkday,datetime,slt]）　[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]
+	</floater.string>
+	<scroll_list name="object_list" tool_tip="このリストからオブジェクトを選択して、インワールドでハイライトします。">
+		<scroll_list.columns label="オブジェクト名" name="object_name"/>
+		<scroll_list.columns label="所有者" name="owner_name"/>
+		<scroll_list.columns label="制作者" name="creator_name"/>
+		<scroll_list.columns label="制作日" name="creation_date"/>
+		<scroll_list.commit_callback function="Inspect.SelectObject"/>
+	</scroll_list>
+	<button label="所有者のプロフィール…" name="button owner" tool_tip="ハイライトされたオブジェクトの所有者のプロフィールを見る"/>
+	<button label="制作者のプロフィール…" name="button creator" tool_tip="ハイライトされたオブジェクトの元の作成者のプロフィールを見る"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index da67de74af..2a8c9f83b2 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
@@ -1,36 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="item properties" title="インベントリアイテムのプロパティ">
-  <floater.string name="unknown">（不明）</floater.string>
-  <floater.string name="public">（公共）</floater.string>
-  <floater.string name="you_can">できること：</floater.string>
-  <floater.string name="owner_can">オーナーは次のことができます：</floater.string>
-  <floater.string name="acquiredDate">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</floater.string>
-  <text name="LabelItemNameTitle">名前：</text>
-  <text name="LabelItemDescTitle">説明：</text>
-  <text name="LabelCreatorTitle">制作者：</text>
-  <button label="プロフィール…" label_selected="" name="BtnCreator" />
-  <text name="LabelOwnerTitle">所有者：</text>
-  <button label="プロフィール…" label_selected="" name="BtnOwner" />
-  <text name="LabelAcquiredTitle">入手日時：</text>
-  <text name="LabelAcquiredDate">2006年5月24日水曜日　12：50：46</text>
-  <text name="OwnerLabel">あなた：</text>
-  <check_box label="編集" name="CheckOwnerModify" />
-  <check_box label="コピー" name="CheckOwnerCopy" />
-  <check_box label="再販・譲渡" name="CheckOwnerTransfer" />
-  <text name="AnyoneLabel">全員：</text>
-  <check_box label="コピー" name="CheckEveryoneCopy" />
-  <text name="GroupLabel">グループ：</text>
-  <check_box label="共有" name="CheckShareWithGroup" />
-  <text name="NextOwnerLabel">次の所有者：</text>
-  <check_box label="編集" name="CheckNextOwnerModify" />
-  <check_box label="コピー" name="CheckNextOwnerCopy" />
-  <check_box label="再販・譲渡" name="CheckNextOwnerTransfer" />
-  <check_box label="売り出し中" name="CheckPurchase" />
-  <combo_box name="ComboBoxSaleType">
-    <combo_box.item label="コピー" name="Copy" />
-    <combo_box.item label="コンテンツ" name="Contents" />
-    <combo_box.item label="オリジナル" name="Original" />
-  </combo_box>
-  <spinner label="価格：" name="Edit Cost" />
-  <text name="CurrencySymbol">L$</text>
-</floater>
\ No newline at end of file
+	<floater.string name="unknown">
+		（不明）
+	</floater.string>
+	<floater.string name="public">
+		（公共）
+	</floater.string>
+	<floater.string name="you_can">
+		できること：
+	</floater.string>
+	<floater.string name="owner_can">
+		オーナーは次のことができます：
+	</floater.string>
+	<floater.string name="acquiredDate">
+		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+	</floater.string>
+	<text name="LabelItemNameTitle">
+		名前：
+	</text>
+	<text name="LabelItemDescTitle">
+		説明：
+	</text>
+	<text name="LabelCreatorTitle">
+		制作者：
+	</text>
+	<button label="プロフィール…" label_selected="" name="BtnCreator"/>
+	<text name="LabelOwnerTitle">
+		所有者：
+	</text>
+	<button label="プロフィール…" label_selected="" name="BtnOwner"/>
+	<text name="LabelAcquiredTitle">
+		入手日時：
+	</text>
+	<text name="LabelAcquiredDate">
+		2006年5月24日水曜日　12：50：46
+	</text>
+	<text name="OwnerLabel">
+		あなた：
+	</text>
+	<check_box label="編集" name="CheckOwnerModify"/>
+	<check_box label="コピー" name="CheckOwnerCopy"/>
+	<check_box label="再販・譲渡" name="CheckOwnerTransfer"/>
+	<text name="AnyoneLabel">
+		全員：
+	</text>
+	<check_box label="コピー" name="CheckEveryoneCopy"/>
+	<text name="GroupLabel">
+		グループ：
+	</text>
+	<check_box label="共有" name="CheckShareWithGroup"/>
+	<text name="NextOwnerLabel">
+		次の所有者：
+	</text>
+	<check_box label="編集" name="CheckNextOwnerModify"/>
+	<check_box label="コピー" name="CheckNextOwnerCopy"/>
+	<check_box label="再販・譲渡" name="CheckNextOwnerTransfer"/>
+	<check_box label="売り出し中" name="CheckPurchase"/>
+	<combo_box name="ComboBoxSaleType">
+		<combo_box.item label="コピー" name="Copy"/>
+		<combo_box.item label="コンテンツ" name="Contents"/>
+		<combo_box.item label="オリジナル" name="Original"/>
+	</combo_box>
+	<spinner label="価格：" name="Edit Cost"/>
+	<text name="CurrencySymbol">
+		L$
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 56438767d6..e9d5757e84 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -1,32 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="インベントリ最近取得したアイテム">
-  <check_box label="アニメーション" name="check_animation" />
-  <check_box label="コーリング・カード" name="check_calling_card" />
-  <check_box label="服装" name="check_clothing" />
-  <check_box label="ジェスチャー" name="check_gesture" />
-  <check_box label="ランドマーク" name="check_landmark" />
-  <check_box label="ノートカード" name="check_notecard" />
-  <check_box label="メッシュ" name="check_mesh" />
-  <check_box label="オブジェクト" name="check_object" />
-  <check_box label="スクリプト" name="check_script" />
-  <check_box label="サウンド" name="check_sound" />
-  <check_box label="テクスチャ" name="check_texture" />
-  <check_box label="スナップショット" name="check_snapshot" />
-  <check_box label="設定" name="check_settings" />
-  <button label="すべて" label_selected="すべて" name="All" />
-  <button label="なし" label_selected="なし" name="None" />
-  <check_box label="常にフォルダを表示" name="check_show_empty" />
-  <check_box label="自作" name="check_created_by_me" />
-  <check_box label="他のユーザー作成" name="check_created_by_others" />
-  <check_box label="ログオフ以降" name="check_since_logoff" />
-  <text name="- OR -">－または－</text>
-  <radio_group name="date_search_direction">
-    <radio_item label="より新しい" name="newer" />
-    <radio_item label="より古い" name="older" />
-  </radio_group>
-  <spinner label="経過時間" name="spin_hours_ago" />
-  <text name="label_hours">時間</text>
-  <spinner label="経過日数" name="spin_days_ago" />
-  <text name="label_days">日間</text>
-  <button label="閉じる" label_selected="閉じる" name="Close" />
-</floater>
\ No newline at end of file
+	<check_box label="アニメーション" name="check_animation"/>
+	<check_box label="コーリング・カード" name="check_calling_card"/>
+	<check_box label="服装" name="check_clothing"/>
+	<check_box label="ジェスチャー" name="check_gesture"/>
+	<check_box label="ランドマーク" name="check_landmark"/>
+	<check_box label="ノートカード" name="check_notecard"/>
+	<check_box label="メッシュ" name="check_mesh"/>
+	<check_box label="オブジェクト" name="check_object"/>
+	<check_box label="スクリプト" name="check_script"/>
+	<check_box label="サウンド" name="check_sound"/>
+	<check_box label="テクスチャ" name="check_texture"/>
+	<check_box label="スナップショット" name="check_snapshot"/>
+	<check_box label="設定" name="check_settings"/>
+	<button label="すべて" label_selected="すべて" name="All"/>
+	<button label="なし" label_selected="なし" name="None"/>
+	<check_box label="常にフォルダを表示" name="check_show_empty"/>
+	<check_box label="自作" name="check_created_by_me"/>
+	<check_box label="他のユーザー作成" name="check_created_by_others"/>
+	<check_box label="ログオフ以降" name="check_since_logoff"/>
+	<text name="- OR -">
+		－または－
+	</text>
+	<radio_group name="date_search_direction">
+		<radio_item label="より新しい" name="newer"/>
+		<radio_item label="より古い" name="older"/>
+	</radio_group>
+	<spinner label="経過時間" name="spin_hours_ago"/>
+	<text name="label_hours">
+		時間
+	</text>
+	<spinner label="経過日数" name="spin_days_ago"/>
+	<text name="label_days">
+		日間
+	</text>
+	<button label="閉じる" label_selected="閉じる" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
index 54f6a87b5e..61ae5b83d7 100644
--- a/indra/newview/skins/default/xui/ja/floater_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_item_properties.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Item Properties" title="アイテムのプロパティ" />
+<floater name="Item Properties" title="アイテムのプロパティ"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index e389f34778..559ecee5a8 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,85 +1,123 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="ジョイスティックの設定">
-  <floater.string name="JoystickDisabled">なし</floater.string>
-  <text name="joystick_lbl">ジョイスティック：</text>
-  <spinner label="Ｘ軸マッピング" name="JoystickAxis1" />
-  <spinner label="Ｙ軸マッピング" name="JoystickAxis2" />
-  <spinner label="Ｚ軸マッピング" name="JoystickAxis0" />
-  <spinner label="ピッチ・マッピング" name="JoystickAxis4" />
-  <spinner label="ヨー・マッピング" name="JoystickAxis5" />
-  <spinner label="ロール・マッピング" name="JoystickAxis3" />
-  <spinner label="ズーム・マッピング" name="JoystickAxis6" />
-  <check_box label="直接ズーム" name="ZoomDirect" />
-  <check_box label="3Dカーソル" name="Cursor3D" />
-  <check_box label="自動レベル" name="AutoLeveling" />
-  <text name="Control Modes:">制御モード：</text>
-  <check_box label="アバター" name="JoystickAvatarEnabled" />
-  <check_box label="造る" name="JoystickBuildEnabled" />
-  <check_box label="フライ・カメラ" name="JoystickFlycamEnabled" />
-  <text name="XScale">Ｘスケール</text>
-  <spinner name="AvatarAxisScale1" />
-  <spinner name="BuildAxisScale1" />
-  <spinner name="FlycamAxisScale1" />
-  <text name="YScale">Ｙスケール</text>
-  <spinner name="AvatarAxisScale2" />
-  <spinner name="BuildAxisScale2" />
-  <spinner name="FlycamAxisScale2" />
-  <text name="ZScale">Ｚスケール</text>
-  <spinner name="AvatarAxisScale0" />
-  <spinner name="BuildAxisScale0" />
-  <spinner name="FlycamAxisScale0" />
-  <text name="PitchScale">ピッチ・スケール</text>
-  <spinner name="AvatarAxisScale4" />
-  <spinner name="BuildAxisScale4" />
-  <spinner name="FlycamAxisScale4" />
-  <text name="YawScale">ヨー・スケール</text>
-  <spinner name="AvatarAxisScale5" />
-  <spinner name="BuildAxisScale5" />
-  <spinner name="FlycamAxisScale5" />
-  <text name="RollScale">ロール・スケール</text>
-  <spinner name="BuildAxisScale3" />
-  <spinner name="FlycamAxisScale3" />
-  <text name="XDeadZone">Ｘデッド・ゾーン</text>
-  <spinner name="AvatarAxisDeadZone1" />
-  <spinner name="BuildAxisDeadZone1" />
-  <spinner name="FlycamAxisDeadZone1" />
-  <text name="YDeadZone">Ｙデッド・ゾーン</text>
-  <spinner name="AvatarAxisDeadZone2" />
-  <spinner name="BuildAxisDeadZone2" />
-  <spinner name="FlycamAxisDeadZone2" />
-  <text name="ZDeadZone">Ｚデッド・ゾーン</text>
-  <spinner name="AvatarAxisDeadZone0" />
-  <spinner name="BuildAxisDeadZone0" />
-  <spinner name="FlycamAxisDeadZone0" />
-  <text name="PitchDeadZone">ピッチ・デッド・ゾーン</text>
-  <spinner name="AvatarAxisDeadZone4" />
-  <spinner name="BuildAxisDeadZone4" />
-  <spinner name="FlycamAxisDeadZone4" />
-  <text name="YawDeadZone">ヨー・デッド・ゾーン</text>
-  <spinner name="AvatarAxisDeadZone5" />
-  <spinner name="BuildAxisDeadZone5" />
-  <spinner name="FlycamAxisDeadZone5" />
-  <text name="RollDeadZone">ロール・デッド・ゾーン</text>
-  <spinner name="BuildAxisDeadZone3" />
-  <spinner name="FlycamAxisDeadZone3" />
-  <text name="Feathering">感度調整</text>
-  <slider label="" name="AvatarFeathering" />
-  <slider label="" name="BuildFeathering" />
-  <slider label="" name="FlycamFeathering" />
-  <text name="ZoomScale2">ズーム・スケール</text>
-  <spinner label="" name="FlycamAxisScale6" />
-  <text name="ZoomDeadZone">ズーム・デッド・ゾーン</text>
-  <spinner label="" name="FlycamAxisDeadZone6" />
-  <button label="SpaceNavigatorのデフォルト設定" name="SpaceNavigatorDefaults" />
-  <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-  <stat_view label="ジョイスティック・モニター" name="axis_view">
-    <stat_bar label="軸０" name="axis0" />
-    <stat_bar label="軸１" name="axis1" />
-    <stat_bar label="軸２" name="axis2" />
-    <stat_bar label="軸３" name="axis3" />
-    <stat_bar label="軸４" name="axis4" />
-    <stat_bar label="軸５" name="axis5" />
-  </stat_view>
-  <string name="NoDevice">デバイスは検出されませんでした。</string>
-</floater>
\ No newline at end of file
+	<floater.string name="JoystickDisabled">
+		なし
+	</floater.string>
+	<text name="joystick_lbl">
+		ジョイスティック：
+	</text>
+	<spinner label="Ｘ軸マッピング" name="JoystickAxis1"/>
+	<spinner label="Ｙ軸マッピング" name="JoystickAxis2"/>
+	<spinner label="Ｚ軸マッピング" name="JoystickAxis0"/>
+	<spinner label="ピッチ・マッピング" name="JoystickAxis4"/>
+	<spinner label="ヨー・マッピング" name="JoystickAxis5"/>
+	<spinner label="ロール・マッピング" name="JoystickAxis3"/>
+	<spinner label="ズーム・マッピング" name="JoystickAxis6"/>
+	<check_box label="直接ズーム" name="ZoomDirect"/>
+	<check_box label="3Dカーソル" name="Cursor3D"/>
+	<check_box label="自動レベル" name="AutoLeveling"/>
+	<text name="Control Modes:">
+		制御モード：
+	</text>
+	<check_box label="アバター" name="JoystickAvatarEnabled"/>
+	<check_box label="造る" name="JoystickBuildEnabled"/>
+	<check_box label="フライ・カメラ" name="JoystickFlycamEnabled"/>
+	<text name="XScale">
+		Ｘスケール
+	</text>
+	<spinner name="AvatarAxisScale1"/>
+	<spinner name="BuildAxisScale1"/>
+	<spinner name="FlycamAxisScale1"/>
+	<text name="YScale">
+		Ｙスケール
+	</text>
+	<spinner name="AvatarAxisScale2"/>
+	<spinner name="BuildAxisScale2"/>
+	<spinner name="FlycamAxisScale2"/>
+	<text name="ZScale">
+		Ｚスケール
+	</text>
+	<spinner name="AvatarAxisScale0"/>
+	<spinner name="BuildAxisScale0"/>
+	<spinner name="FlycamAxisScale0"/>
+	<text name="PitchScale">
+		ピッチ・スケール
+	</text>
+	<spinner name="AvatarAxisScale4"/>
+	<spinner name="BuildAxisScale4"/>
+	<spinner name="FlycamAxisScale4"/>
+	<text name="YawScale">
+		ヨー・スケール
+	</text>
+	<spinner name="AvatarAxisScale5"/>
+	<spinner name="BuildAxisScale5"/>
+	<spinner name="FlycamAxisScale5"/>
+	<text name="RollScale">
+		ロール・スケール
+	</text>
+	<spinner name="BuildAxisScale3"/>
+	<spinner name="FlycamAxisScale3"/>
+	<text name="XDeadZone">
+		Ｘデッド・ゾーン
+	</text>
+	<spinner name="AvatarAxisDeadZone1"/>
+	<spinner name="BuildAxisDeadZone1"/>
+	<spinner name="FlycamAxisDeadZone1"/>
+	<text name="YDeadZone">
+		Ｙデッド・ゾーン
+	</text>
+	<spinner name="AvatarAxisDeadZone2"/>
+	<spinner name="BuildAxisDeadZone2"/>
+	<spinner name="FlycamAxisDeadZone2"/>
+	<text name="ZDeadZone">
+		Ｚデッド・ゾーン
+	</text>
+	<spinner name="AvatarAxisDeadZone0"/>
+	<spinner name="BuildAxisDeadZone0"/>
+	<spinner name="FlycamAxisDeadZone0"/>
+	<text name="PitchDeadZone">
+		ピッチ・デッド・ゾーン
+	</text>
+	<spinner name="AvatarAxisDeadZone4"/>
+	<spinner name="BuildAxisDeadZone4"/>
+	<spinner name="FlycamAxisDeadZone4"/>
+	<text name="YawDeadZone">
+		ヨー・デッド・ゾーン
+	</text>
+	<spinner name="AvatarAxisDeadZone5"/>
+	<spinner name="BuildAxisDeadZone5"/>
+	<spinner name="FlycamAxisDeadZone5"/>
+	<text name="RollDeadZone">
+		ロール・デッド・ゾーン
+	</text>
+	<spinner name="BuildAxisDeadZone3"/>
+	<spinner name="FlycamAxisDeadZone3"/>
+	<text name="Feathering">
+		感度調整
+	</text>
+	<slider label="" name="AvatarFeathering"/>
+	<slider label="" name="BuildFeathering"/>
+	<slider label="" name="FlycamFeathering"/>
+	<text name="ZoomScale2">
+		ズーム・スケール
+	</text>
+	<spinner label="" name="FlycamAxisScale6"/>
+	<text name="ZoomDeadZone">
+		ズーム・デッド・ゾーン
+	</text>
+	<spinner label="" name="FlycamAxisDeadZone6"/>
+	<button label="SpaceNavigatorのデフォルト設定" name="SpaceNavigatorDefaults"/>
+	<button label="ＯＫ" label_selected="ＯＫ" name="ok_btn"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+	<stat_view label="ジョイスティック・モニター" name="axis_view">
+		<stat_bar label="軸０" name="axis0"/>
+		<stat_bar label="軸１" name="axis1"/>
+		<stat_bar label="軸２" name="axis2"/>
+		<stat_bar label="軸３" name="axis3"/>
+		<stat_bar label="軸４" name="axis4"/>
+		<stat_bar label="軸５" name="axis5"/>
+	</stat_view>
+	<string name="NoDevice">
+		デバイスは検出されませんでした。
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index 7c0e421002..e7830bbd25 100644
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
@@ -1,55 +1,151 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="ラグメーター">
-  <floater.string name="max_title_msg">遅延計測器</floater.string>
-  <floater.string name="max_width_px">360</floater.string>
-  <floater.string name="min_title_msg">遅延</floater.string>
-  <floater.string name="min_width_px">90</floater.string>
-  <floater.string name="client_text_msg">クライアント</floater.string>
-  <floater.string name="client_frame_rate_critical_fps">10</floater.string>
-  <floater.string name="client_frame_rate_warning_fps">15</floater.string>
-  <floater.string name="client_frame_time_window_bg_msg">標準、ウィンドウは背景に</floater.string>
-  <floater.string name="client_frame_time_critical_msg">クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]以下</floater.string>
-  <floater.string name="client_frame_time_warning_msg">クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]と[CLIENT_FRAME_RATE_WARNING]の間</floater.string>
-  <floater.string name="client_frame_time_normal_msg">標準</floater.string>
-  <floater.string name="client_draw_distance_cause_msg">考えられる原因：描画距離の設定が高すぎる</floater.string>
-  <floater.string name="client_texture_loading_cause_msg">考えられる原因：画像のロード中</floater.string>
-  <floater.string name="client_texture_memory_cause_msg">考えられる原因：メモリ内に画像が多すぎる</floater.string>
-  <floater.string name="client_complex_objects_cause_msg">考えられる原因：シーンに複雑なオブジェクトが多すぎる</floater.string>
-  <floater.string name="network_text_msg">ネットワーク</floater.string>
-  <floater.string name="network_packet_loss_critical_pct">10</floater.string>
-  <floater.string name="network_packet_loss_warning_pct">5</floater.string>
-  <floater.string name="network_packet_loss_critical_msg">接続で[NETWORK_PACKET_LOSS_CRITICAL]％を超えるパケットが脱落しています。</floater.string>
-  <floater.string name="network_packet_loss_warning_msg">接続で[NETWORK_PACKET_LOSS_WARNING]％～[NETWORK_PACKET_LOSS_CRITICAL]％のパケットが脱落しています。</floater.string>
-  <floater.string name="network_performance_normal_msg">標準</floater.string>
-  <floater.string name="network_ping_critical_ms">600</floater.string>
-  <floater.string name="network_ping_warning_ms">300</floater.string>
-  <floater.string name="network_ping_critical_msg">接続のping時間が、[NETWORK_PING_CRITICAL]ms以上です</floater.string>
-  <floater.string name="network_ping_warning_msg">接続のping時間が、[NETWORK_PING_WARNING]～[NETWORK_PING_CRITICAL]msです。</floater.string>
-  <floater.string name="network_packet_loss_cause_msg">接続不良または、'帯域幅'の設定が高すぎる可能性があります。</floater.string>
-  <floater.string name="network_ping_cause_msg">接続不良または、ファイル共有アプリの可能性があります。</floater.string>
-  <floater.string name="server_text_msg">サーバー</floater.string>
-  <floater.string name="server_frame_rate_critical_fps">20</floater.string>
-  <floater.string name="server_frame_rate_warning_fps">30</floater.string>
-  <floater.string name="server_single_process_max_time_ms">20</floater.string>
-  <floater.string name="server_frame_time_critical_msg">シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]以下</floater.string>
-  <floater.string name="server_frame_time_warning_msg">シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]～[SERVER_FRAME_RATE_WARNING]の間</floater.string>
-  <floater.string name="server_frame_time_normal_msg">標準</floater.string>
-  <floater.string name="server_physics_cause_msg">考えられる原因：物理オブジェクトが多すぎる</floater.string>
-  <floater.string name="server_scripts_cause_msg">考えられる原因：スクリプトオブジェクトが多すぎる</floater.string>
-  <floater.string name="server_net_cause_msg">考えられる原因：ネットワークトラフィックが多すぎる</floater.string>
-  <floater.string name="server_agent_cause_msg">考えられる原因：リージョン内の人の移動が多すぎる</floater.string>
-  <floater.string name="server_images_cause_msg">考えられる原因：画像計算が多すぎる</floater.string>
-  <floater.string name="server_generic_cause_msg">考えられる原因：シミュレータのロードが重すぎる</floater.string>
-  <floater.string name="smaller_label">》</floater.string>
-  <floater.string name="bigger_label">《</floater.string>
-  <button name="client_lagmeter" tool_tip="クライアントの遅延ステータス" />
-  <text name="client">クライアント</text>
-  <text name="client_text">標準</text>
-  <button name="network_lagmeter" tool_tip="ネットワークの遅延ステータス" />
-  <text name="network">ネットワーク</text>
-  <text name="network_text">標準</text>
-  <button name="server_lagmeter" tool_tip="サーバーの遅延ステータス" />
-  <text name="server">サーバー</text>
-  <text name="server_text">標準</text>
-  <button label="》" name="minimize" tool_tip="フローターのサイズをトグル" />
-</floater>
\ No newline at end of file
+	<floater.string name="max_title_msg">
+		遅延計測器
+	</floater.string>
+	<floater.string name="max_width_px">
+		360
+	</floater.string>
+	<floater.string name="min_title_msg">
+		遅延
+	</floater.string>
+	<floater.string name="min_width_px">
+		90
+	</floater.string>
+	<floater.string name="client_text_msg">
+		クライアント
+	</floater.string>
+	<floater.string name="client_frame_rate_critical_fps">
+		10
+	</floater.string>
+	<floater.string name="client_frame_rate_warning_fps">
+		15
+	</floater.string>
+	<floater.string name="client_frame_time_window_bg_msg">
+		標準、ウィンドウは背景に
+	</floater.string>
+	<floater.string name="client_frame_time_critical_msg">
+		クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]以下
+	</floater.string>
+	<floater.string name="client_frame_time_warning_msg">
+		クライアントのフレームレートが[CLIENT_FRAME_RATE_CRITICAL]と[CLIENT_FRAME_RATE_WARNING]の間
+	</floater.string>
+	<floater.string name="client_frame_time_normal_msg">
+		標準
+	</floater.string>
+	<floater.string name="client_draw_distance_cause_msg">
+		考えられる原因：描画距離の設定が高すぎる
+	</floater.string>
+	<floater.string name="client_texture_loading_cause_msg">
+		考えられる原因：画像のロード中
+	</floater.string>
+	<floater.string name="client_texture_memory_cause_msg">
+		考えられる原因：メモリ内に画像が多すぎる
+	</floater.string>
+	<floater.string name="client_complex_objects_cause_msg">
+		考えられる原因：シーンに複雑なオブジェクトが多すぎる
+	</floater.string>
+	<floater.string name="network_text_msg">
+		ネットワーク
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_pct">
+		10
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_pct">
+		5
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_msg">
+		接続で[NETWORK_PACKET_LOSS_CRITICAL]％を超えるパケットが脱落しています。
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_msg">
+		接続で[NETWORK_PACKET_LOSS_WARNING]％～[NETWORK_PACKET_LOSS_CRITICAL]％のパケットが脱落しています。
+	</floater.string>
+	<floater.string name="network_performance_normal_msg">
+		標準
+	</floater.string>
+	<floater.string name="network_ping_critical_ms">
+		600
+	</floater.string>
+	<floater.string name="network_ping_warning_ms">
+		300
+	</floater.string>
+	<floater.string name="network_ping_critical_msg">
+		接続のping時間が、[NETWORK_PING_CRITICAL]ms以上です
+	</floater.string>
+	<floater.string name="network_ping_warning_msg">
+		接続のping時間が、[NETWORK_PING_WARNING]～[NETWORK_PING_CRITICAL]msです。
+	</floater.string>
+	<floater.string name="network_packet_loss_cause_msg">
+		接続不良または、'帯域幅'の設定が高すぎる可能性があります。
+	</floater.string>
+	<floater.string name="network_ping_cause_msg">
+		接続不良または、ファイル共有アプリの可能性があります。
+	</floater.string>
+	<floater.string name="server_text_msg">
+		サーバー
+	</floater.string>
+	<floater.string name="server_frame_rate_critical_fps">
+		20
+	</floater.string>
+	<floater.string name="server_frame_rate_warning_fps">
+		30
+	</floater.string>
+	<floater.string name="server_single_process_max_time_ms">
+		20
+	</floater.string>
+	<floater.string name="server_frame_time_critical_msg">
+		シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]以下
+	</floater.string>
+	<floater.string name="server_frame_time_warning_msg">
+		シミュレータのフレームレートが、[SERVER_FRAME_RATE_CRITICAL]～[SERVER_FRAME_RATE_WARNING]の間
+	</floater.string>
+	<floater.string name="server_frame_time_normal_msg">
+		標準
+	</floater.string>
+	<floater.string name="server_physics_cause_msg">
+		考えられる原因：物理オブジェクトが多すぎる
+	</floater.string>
+	<floater.string name="server_scripts_cause_msg">
+		考えられる原因：スクリプトオブジェクトが多すぎる
+	</floater.string>
+	<floater.string name="server_net_cause_msg">
+		考えられる原因：ネットワークトラフィックが多すぎる
+	</floater.string>
+	<floater.string name="server_agent_cause_msg">
+		考えられる原因：リージョン内の人の移動が多すぎる
+	</floater.string>
+	<floater.string name="server_images_cause_msg">
+		考えられる原因：画像計算が多すぎる
+	</floater.string>
+	<floater.string name="server_generic_cause_msg">
+		考えられる原因：シミュレータのロードが重すぎる
+	</floater.string>
+	<floater.string name="smaller_label">
+		》
+	</floater.string>
+	<floater.string name="bigger_label">
+		《
+	</floater.string>
+	<button name="client_lagmeter" tool_tip="クライアントの遅延ステータス"/>
+	<text name="client">
+		クライアント
+	</text>
+	<text name="client_text">
+		標準
+	</text>
+	<button name="network_lagmeter" tool_tip="ネットワークの遅延ステータス"/>
+	<text name="network">
+		ネットワーク
+	</text>
+	<text name="network_text">
+		標準
+	</text>
+	<button name="server_lagmeter" tool_tip="サーバーの遅延ステータス"/>
+	<text name="server">
+		サーバー
+	</text>
+	<text name="server_text">
+		標準
+	</text>
+	<button label="》" name="minimize" tool_tip="フローターのサイズをトグル"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index 34cb28a80b..31009cb2e0 100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -1,24 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="自分の土地">
-  <scroll_list name="parcel list">
-    <column label="区画" name="name" />
-    <column label="リージョン（地域）" name="location" />
-    <column label="種類" name="type" />
-    <column label="面積" name="area" />
-    <column label="" name="hidden" />
-  </scroll_list>
-  <button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポートします。" />
-  <button label="マップ" label_selected="マップ" name="Show on Map" tool_tip="この土地をワールドマップに表示します。" />
-  <text name="contrib_label">所属グループへの貢献：</text>
-  <scroll_list name="grant list">
-    <column label="グループ名" name="group" />
-    <column label="面積" name="area" />
-  </scroll_list>
-  <text name="allowed_label">現在の支払いプランで利用可能な入植地：</text>
-  <text name="allowed_text">[AREA]㎡</text>
-  <text name="current_label">現在の保有地：</text>
-  <text name="current_text">[AREA]㎡</text>
-  <text name="available_label">購入可能な土地：</text>
-  <text name="available_text">[AREA]㎡</text>
-  <string name="area_string">[AREA]㎡</string>
-</floater>
\ No newline at end of file
+	<scroll_list name="parcel list">
+		<column label="区画" name="name"/>
+		<column label="リージョン（地域）" name="location"/>
+		<column label="種類" name="type"/>
+		<column label="面積" name="area"/>
+		<column label="" name="hidden"/>
+	</scroll_list>
+	<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポートします。"/>
+	<button label="マップ" label_selected="マップ" name="Show on Map" tool_tip="この土地をワールドマップに表示します。"/>
+	<text name="contrib_label">
+		所属グループへの貢献：
+	</text>
+	<scroll_list name="grant list">
+		<column label="グループ名" name="group"/>
+		<column label="面積" name="area"/>
+	</scroll_list>
+	<text name="allowed_label">
+		現在の支払いプランで利用可能な入植地：
+	</text>
+	<text name="allowed_text">
+		[AREA]㎡
+	</text>
+	<text name="current_label">
+		現在の保有地：
+	</text>
+	<text name="current_text">
+		[AREA]㎡
+	</text>
+	<text name="available_label">
+		購入可能な土地：
+	</text>
+	<text name="available_text">
+		[AREA]㎡
+	</text>
+	<string name="area_string">
+		[AREA]㎡
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_linkreplace.xml b/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
index 8a8d643f69..98711ccea7 100644
--- a/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_linkreplace.xml
@@ -1,16 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="linkreplace" title="インベントリのリンク置換え">
-  <string name="Ready">準備中…</string>
-  <string name="TargetNotFound">置換先のアイテムは見つかりませんでした。</string>
-  <string name="ItemsIdentical">置換元と置換先が同一です。</string>
-  <string name="ItemsFound">[NUM]件のリンクが見つかりました。</string>
-  <string name="ItemsRemaining">残りリンク数：[NUM]件</string>
-  <string name="ReplaceFinished">インベントリのリンクの置換えが完了しました。</string>
-  <text name="source_label">置換元：</text>
-  <inventory_link_replace_drop_target name="source_uuid_editor" tool_tip="置換えたいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。" />
-  <text type="string" name="target_label">置換先：</text>
-  <inventory_link_replace_drop_target name="target_uuid_editor" tool_tip="新しいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。" />
-  <text type="string" name="status_text">準備中…</text>
-  <button name="btn_refresh" label="リフレッシュ" />
-  <button name="btn_start" label="開始" />
+	<string name="Ready">
+		準備中…
+	</string>
+	<string name="TargetNotFound">
+		置換先のアイテムは見つかりませんでした。
+	</string>
+	<string name="ItemsIdentical">
+		置換元と置換先が同一です。
+	</string>
+	<string name="ItemsFound">
+		[NUM]件のリンクが見つかりました。
+	</string>
+	<string name="ItemsRemaining">
+		残りリンク数：[NUM]件
+	</string>
+	<string name="ReplaceFinished">
+		インベントリのリンクの置換えが完了しました。
+	</string>
+	<text name="source_label">
+		置換元：
+	</text>
+	<inventory_link_replace_drop_target name="source_uuid_editor" tool_tip="置換えたいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。"/>
+	<text type="string" name="target_label">
+		置換先：
+	</text>
+	<inventory_link_replace_drop_target name="target_uuid_editor" tool_tip="新しいインベントリ内のアイテムを、ここへドラッグ・アンド・ドロップしてください。"/>
+	<text type="string" name="status_text">
+		準備中…
+	</text>
+	<button name="btn_refresh" label="リフレッシュ"/>
+	<button name="btn_start" label="開始"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index daaabbcc64..770d7b4a13 100644
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -1,16 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="スクリプト：新しいスクリプト">
-  <floater.string name="not_allowed">このスクリプトは「複製不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。</floater.string>
-  <floater.string name="script_running">実行中</floater.string>
-  <floater.string name="Title">スクリプト：[NAME]</floater.string>
-  <floater.string name="experience_enabled">オフにして、現在の体験を削除する</floater.string>
-  <floater.string name="no_experiences">どの体験にも権限がありません</floater.string>
-  <floater.string name="add_experiences">選択して、体験を追加する</floater.string>
-  <floater.string name="show_experience_profile">クリックして、体験プロフィールを表示する</floater.string>
-  <floater.string name="loading">読み込んでいます…</floater.string>
-  <button label="リセット" label_selected="リセット" name="Reset" />
-  <check_box initial_value="true" label="実行中" name="running" />
-  <check_box initial_value="true" label="Mono" name="mono" />
-  <check_box label="体験を使用：" name="enable_xp" />
-  <button label="&gt;" name="view_profile" />
-</floater>
\ No newline at end of file
+	<floater.string name="not_allowed">
+		このスクリプトは「複製不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。
+	</floater.string>
+	<floater.string name="script_running">
+		実行中
+	</floater.string>
+	<floater.string name="Title">
+		スクリプト：[NAME]
+	</floater.string>
+	<floater.string name="experience_enabled">
+		オフにして、現在の体験を削除する
+	</floater.string>
+	<floater.string name="no_experiences">
+		どの体験にも権限がありません
+	</floater.string>
+	<floater.string name="add_experiences">
+		選択して、体験を追加する
+	</floater.string>
+	<floater.string name="show_experience_profile">
+		クリックして、体験プロフィールを表示する
+	</floater.string>
+	<floater.string name="loading">
+		読み込んでいます…
+	</floater.string>
+	<button label="リセット" label_selected="リセット" name="Reset"/>
+	<check_box initial_value="true" label="実行中" name="running"/>
+	<check_box initial_value="true" label="Mono" name="mono"/>
+	<check_box label="体験を使用：" name="enable_xp"/>
+	<button label="&gt;" name="view_profile"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
index 6d3497659e..fa27721bd4 100644
--- a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="load_pref_preset" title="プリセット設定を読み込み">
-  <string name="title_graphic">グラフィックのプリセットを読み込む</string>
-  <string name="title_camera">カメラのプリセットを読み込む</string>
-  <text name="Preset">プリセットを選択</text>
-  <button label="ＯＫ" name="ok" />
-  <button label="キャンセル" name="cancel" />
-</floater>
\ No newline at end of file
+	<string name="title_graphic">
+		グラフィックのプリセットを読み込む
+	</string>
+	<string name="title_camera">
+		カメラのプリセットを読み込む
+	</string>
+	<text name="Preset">
+		プリセットを選択
+	</text>
+	<button label="ＯＫ" name="ok"/>
+	<button label="キャンセル" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 3d215f2798..4bb370f6ea 100644
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="ＬＳＬレファレンス">
-  <check_box label="カーソルを追う" name="lock_check" />
-  <combo_box label="ロック" name="history_combo" />
-  <button label="戻る" name="back_btn" />
-  <button label="進む" name="fwd_btn" />
-</floater>
\ No newline at end of file
+	<check_box label="カーソルを追う" name="lock_check"/>
+	<combo_box label="ロック" name="history_combo"/>
+	<button label="戻る" name="back_btn"/>
+	<button label="進む" name="fwd_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index f70d10470d..000f2ce67e 100644
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
@@ -1,14 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Map" title="ミニマップ">
-  <floater.string name="ToolTipMsg">[REGION]（ダブルクリックでマップを表示。Shift＋ドラッグで水平・垂直移動）</floater.string>
-  <floater.string name="AltToolTipMsg">[REGION]（ダブルクリックでテレポート。Shift＋ドラッグで水平・垂直移動）</floater.string>
-  <floater.string name="mini_map_caption">ミニマップ</floater.string>
-  <text label="北" name="floater_map_north" text="北">北</text>
-  <text label="東" name="floater_map_east" text="東">東</text>
-  <text label="西" name="floater_map_west" text="西">西</text>
-  <text label="南" name="floater_map_south" text="南">南</text>
-  <text label="南東" name="floater_map_southeast" text="南東">南東</text>
-  <text label="北東" name="floater_map_northeast" text="北東">北東</text>
-  <text label="南西" name="floater_map_southwest" text="南西">南西</text>
-  <text label="北西" name="floater_map_northwest" text="北西">北西</text>
-</floater>
\ No newline at end of file
+	<floater.string name="ToolTipMsg">
+		[REGION]（ダブルクリックでマップを表示。Shift＋ドラッグで水平・垂直移動）
+	</floater.string>
+	<floater.string name="AltToolTipMsg">
+		[REGION]（ダブルクリックでテレポート。Shift＋ドラッグで水平・垂直移動）
+	</floater.string>
+	<floater.string name="mini_map_caption">
+		ミニマップ
+	</floater.string>
+	<text label="北" name="floater_map_north" text="北">
+		北
+	</text>
+	<text label="東" name="floater_map_east" text="東">
+		東
+	</text>
+	<text label="西" name="floater_map_west" text="西">
+		西
+	</text>
+	<text label="南" name="floater_map_south" text="南">
+		南
+	</text>
+	<text label="南東" name="floater_map_southeast" text="南東">
+		南東
+	</text>
+	<text label="北東" name="floater_map_northeast" text="北東">
+		北東
+	</text>
+	<text label="南西" name="floater_map_southwest" text="南西">
+		南西
+	</text>
+	<text label="北西" name="floater_map_northwest" text="北西">
+		北西
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
index 06c2d0bafc..522d558aba 100644
--- a/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater title="マーケットプレイス一覧" name="floater_marketplace_listings">
-  <panel name="marketplace_listings_panel">
-    <panel>
-      <panel name="marketplace_listings_inventory_placeholder_panel">
-        <text name="marketplace_listings_inventory_placeholder_title">読み込んでいます…</text>
-        <text name="marketplace_listings_inventory_placeholder_text" />
-      </panel>
-      <panel name="panel_marketplace_listing" filename="panel_marketplace_listings.xml" class="llpanelmarketplacelistings" top="0" follows="all"/>
-    </panel>
-    <panel name="marketplace_panel_status" />
-    <layout_stack name="initialization_progress_indicator" />
-  </panel>
+	<panel name="marketplace_listings_panel">
+		<panel>
+			<panel name="marketplace_listings_inventory_placeholder_panel">
+				<text name="marketplace_listings_inventory_placeholder_title">
+					読み込んでいます…
+				</text>
+				<text name="marketplace_listings_inventory_placeholder_text"/>
+			</panel>
+			<panel name="panel_marketplace_listing" filename="panel_marketplace_listings.xml" class="llpanelmarketplacelistings" top="0" follows="all"/>
+		</panel>
+		<panel name="marketplace_panel_status"/>
+		<layout_stack name="initialization_progress_indicator"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
index b5638cdb34..bc74ac5d48 100644
--- a/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_marketplace_validation" title="マーケットプレイスのリストの監査">
-  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
-  <text_editor name="validation_text">MARKETPLACE_VALIDATION_TEXT</text_editor>
-</floater>
\ No newline at end of file
+	<button label="ＯＫ" label_selected="ＯＫ" name="OK"/>
+	<text_editor name="validation_text">
+		MARKETPLACE_VALIDATION_TEXT
+	</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index 5a486a4d3c..038e484655 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -1,26 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="メディアブラウザ">
-  <floater.string name="home_page_url">https://secondlife.com</floater.string>
-  <floater.string name="support_page_url">https://support.secondlife.com/</floater.string>
-  <layout_stack name="stack1">
-    <layout_panel name="nav_controls">
-      <button label="戻る" name="back" />
-      <button label="進む" name="forward" />
-      <button label="リロード" name="reload" />
-      <button label="閲覧" name="go" />
-    </layout_panel>
-    <layout_panel name="time_controls">
-      <button label="巻き戻し" name="rewind" />
-      <button label="停止" name="stop" />
-      <button label="早送り" name="seek" />
-    </layout_panel>
-    <layout_panel name="parcel_owner_controls">
-      <button label="現在のページを区画に送る" name="assign" />
-    </layout_panel>
-    <layout_panel name="external_controls">
-      <button label="外部Webブラウザで開く" name="open_browser" />
-      <check_box label="常に外部のWebブラウザで開く" name="open_always" />
-      <button label="閉じる" name="close" />
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<floater.string name="home_page_url">
+		https://secondlife.com
+	</floater.string>
+	<floater.string name="support_page_url">
+		https://support.secondlife.com/
+	</floater.string>
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button label="戻る" name="back"/>
+			<button label="進む" name="forward"/>
+			<button label="リロード" name="reload"/>
+			<button label="閲覧" name="go"/>
+		</layout_panel>
+		<layout_panel name="time_controls">
+			<button label="巻き戻し" name="rewind"/>
+			<button label="停止" name="stop"/>
+			<button label="早送り" name="seek"/>
+		</layout_panel>
+		<layout_panel name="parcel_owner_controls">
+			<button label="現在のページを区画に送る" name="assign"/>
+		</layout_panel>
+		<layout_panel name="external_controls">
+			<button label="外部Webブラウザで開く" name="open_browser"/>
+			<check_box label="常に外部のWebブラウザで開く" name="open_always"/>
+			<button label="閉じる" name="close"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
index 75f7cba89a..423a329871 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="media_settings" title="メディアの設定">
-  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-  <button label="適用" label_selected="適用" name="Apply" />
-</floater>
\ No newline at end of file
+	<button label="ＯＫ" label_selected="ＯＫ" name="OK"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+	<button label="適用" label_selected="適用" name="Apply"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
index a429a3a47e..b483dc2134 100644
--- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="MemLeak" title="メモリリークのシミュレート">
-  <spinner label="リーク速度（１フレームごとのバイト数）：" name="leak_speed" />
-  <spinner label="最大メモリリーク（㎆）：" name="max_leak" />
-  <text name="total_leaked_label">現在のメモリリーク：[SIZE]㎅</text>
-  <text name="note_label_1">[NOTE1]	</text>
-  <text name="note_label_2">[NOTE2]</text>
-  <button label="開始" name="start_btn" />
-  <button label="停止" name="stop_btn" />
-  <button label="解放" name="release_btn" />
-  <button label="閉じる" name="close_btn" />
-</floater>
\ No newline at end of file
+	<spinner label="リーク速度（１フレームごとのバイト数）：" name="leak_speed"/>
+	<spinner label="最大メモリリーク（㎆）：" name="max_leak"/>
+	<text name="total_leaked_label">
+		現在のメモリリーク：[SIZE]㎅
+	</text>
+	<text name="note_label_1">
+		[NOTE1]
+	</text>
+	<text name="note_label_2">
+		[NOTE2]
+	</text>
+	<button label="開始" name="start_btn"/>
+	<button label="停止" name="stop_btn"/>
+	<button label="解放" name="release_btn"/>
+	<button label="閉じる" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_mfa.xml b/indra/newview/skins/default/xui/ja/floater_mfa.xml
index 9eefb3c7be..8bce64ae45 100644
--- a/indra/newview/skins/default/xui/ja/floater_mfa.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mfa.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater title="二段階認証トークンが必要です" name="mfa_challenge">
-  <text name="token_prompt_text">トークンのプロンプト</text>
-  <line_editor name="token_edit" />
-  <button label="続ける" name="continue_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<text name="token_prompt_text">
+		トークンのプロンプト
+	</text>
+	<line_editor name="token_edit"/>
+	<button label="続ける" name="continue_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 22dfdc23dc..69629f357f 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -1,187 +1,319 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="モデルウィザード">
-  <string name="status_idle" />
-  <string name="status_parse_error">エラー：Dae に問題が見つかりました - 詳細についてはログをご参照ください。</string>
-  <string name="status_bind_shape_orientation">警告：バインドシェイプマトリックスは、標準の X 軸正方向にはありません。</string>
-  <string name="status_material_mismatch">エラー：モデルの材料は参考モデルのサブセットではありません。</string>
-  <string name="status_reading_file">読み込んでいます…</string>
-  <string name="status_generating_meshes">メッシュを作成中</string>
-  <string name="status_vertex_number_overflow">エラー：頂点の数が65534を超過したので中止されました。</string>
-  <string name="bad_element">エラー：要素が無効です</string>
-  <string name="high">高</string>
-  <string name="medium">中</string>
-  <string name="low">低</string>
-  <string name="lowest">最低</string>
-  <string name="mesh_status_good">発送</string>
-  <string name="mesh_status_na">該当なし</string>
-  <string name="mesh_status_none">なし</string>
-  <string name="mesh_status_submesh_mismatch">テクスチャ編集可能な面の数は、描画詳細度に応じて異なります。</string>
-  <string name="mesh_status_mesh_mismatch">メッシュインスタンスの数は、描画詳細度に応じて異なります。</string>
-  <string name="mesh_status_too_many_vertices">描画詳細度に対して頂点の数が多すぎます。</string>
-  <string name="mesh_status_missing_lod">必要な描画詳細度が見つかりません。</string>
-  <string name="mesh_status_invalid_material_list">LOD付きの材料は、参考モデルのサブセットではありません。</string>
-  <string name="phys_status_vertex_limit_exceeded">一部の物理的な外殻構造が、頂点の制限を超えます。</string>
-  <string name="layer_all">全て</string>
-  <string name="decomposing">分析中</string>
-  <string name="simplifying">簡素化</string>
-  <string name="tbd">未定</string>
-  <panel name="left_panel">
-    <panel name="model_name_representation_panel">
-      <text name="name_label">モデル名：</text>
-      <text name="model_category_label">このモデルは…</text>
-      <combo_box name="model_category_combo">
-        <combo_item label="1つを選択…" name="Choose one" />
-        <combo_item label="アバターの形" name="Avatar shape" />
-        <combo_item label="アバターの装着物" name="Avatar attachment" />
-        <combo_item label="動くオブジェクト（車、動物）" name="Moving object (vehicle, animal)" />
-        <combo_item label="制作用コンポーネント" name="Building Component" />
-        <combo_item label="大型、不動、等" name="Large, non moving etc" />
-        <combo_item label="やや小型、不動、等" name="Smaller, non-moving etc" />
-        <combo_item label="いずれにも該当しない" name="Not really any of these" />
-      </combo_box>
-    </panel>
-    <tab_container name="import_tab">
-      <panel label="描画詳細度" name="lod_panel" title="描画詳細度">
-        <text initial_value="データ源" name="source" value="データ源" />
-        <text initial_value="三角形" name="triangles" value="三角形" />
-        <text initial_value="頂点" name="vertices" value="頂点" />
-        <text initial_value="高" name="high_label" value="高" />
-        <combo_box name="lod_source_high">
-          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
-          <item label="生成" name="Generate" value="生成" />
-        </combo_box>
-        <button label="参照" name="lod_browse_high" />
-        <combo_box name="lod_mode_high">
-          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
-          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
-        </combo_box>
-        <text initial_value="0" name="high_triangles" value="0" />
-        <text initial_value="0" name="high_vertices" value="0" />
-        <text initial_value="中" name="medium_label" value="中" />
-        <combo_box name="lod_source_medium">
-          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
-          <item label="生成" name="Generate" value="生成" />
-          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
-        </combo_box>
-        <button label="参照" name="lod_browse_medium" />
-        <combo_box name="lod_mode_medium">
-          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
-          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
-        </combo_box>
-        <text initial_value="0" name="medium_triangles" value="0" />
-        <text initial_value="0" name="medium_vertices" value="0" />
-        <text initial_value="低" name="low_label" value="低" />
-        <combo_box name="lod_source_low">
-          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
-          <item label="生成" name="Generate" value="生成" />
-          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
-        </combo_box>
-        <button label="参照" name="lod_browse_low" />
-        <combo_box name="lod_mode_low">
-          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
-          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
-        </combo_box>
-        <text initial_value="0" name="low_triangles" value="0" />
-        <text initial_value="0" name="low_vertices" value="0" />
-        <text initial_value="最低" name="lowest_label" value="最低" />
-        <combo_box name="lod_source_lowest">
-          <item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む" />
-          <item label="生成" name="Generate" value="生成" />
-          <item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用" />
-        </combo_box>
-        <button label="参照" name="lod_browse_lowest" />
-        <combo_box name="lod_mode_lowest">
-          <item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数" />
-          <item label="エラーしきい値" name="Error Threshold" value="エラーしきい値" />
-        </combo_box>
-        <text initial_value="0" name="lowest_triangles" value="0" />
-        <text initial_value="0" name="lowest_vertices" value="0" />
-        <check_box label="ノーマルの作成" name="gen_normals" />
-        <text initial_value="折れ角度：" name="crease_label" value="折れ角度：" />
-        <spinner name="crease_angle" value="75" />
-      </panel>
-      <panel label="物理効果" name="physics_panel">
-        <panel name="physics geometry">
-          <text name="first_step_name">手順１：描画詳細度</text>
-          <combo_box name="physics_lod_combo" tool_tip="実像に適用するLOD">
-            <combo_item name="choose_one">１つを選択…</combo_item>
-            <combo_item name="physics_high">高</combo_item>
-            <combo_item name="physics_medium">中</combo_item>
-            <combo_item name="physics_low">低</combo_item>
-            <combo_item name="physics_lowest">最低</combo_item>
-            <combo_item name="load_from_file">ファイルから</combo_item>
-          </combo_box>
-          <button label="参照" name="physics_browse" />
-        </panel>
-        <panel name="physics analysis">
-          <text name="method_label">手順２：分析</text>
-          <text name="analysis_method_label">方法：</text>
-          <text name="quality_label">品質：</text>
-          <text name="smooth_method_label">滑らかさ：</text>
-          <check_box label="穴を閉じる" name="Close Holes (Slow)" />
-          <button label="分析" name="Decompose" />
-          <button label="キャンセル" name="decompose_cancel" />
-        </panel>
-        <panel name="physics simplification">
-          <text name="second_step_label">手順３：簡素化</text>
-          <text name="simp_method_header">方法：</text>
-          <text name="pass_method_header">パス：</text>
-          <text name="Detail Scale label">詳細度：</text>
-          <text name="Retain%_label">維持率：</text>
-          <combo_box name="Combine Quality" value="1" />
-          <button label="簡素化" name="Simplify" />
-          <button label="キャンセル" name="simplify_cancel" />
-        </panel>
-        <panel name="physics info">
-          <text name="results_text">結果：</text>
-          <text name="physics_triangles">三角形：[TRIANGLES],</text>
-          <text name="physics_points">頂点：[POINTS],</text>
-          <text name="physics_hulls">外殻構造：[HULLS]</text>
-        </panel>
-      </panel>
-      <panel label="アップロードのオプション" name="modifiers_panel">
-        <text name="scale_label"> スケール（１＝増減なし）：</text>
-        <spinner name="import_scale" value="1.0" />
-        <text name="dimensions_label">サイズ：</text>
-        <text name="import_dimensions">[X]✕[Y]✕[Z]</text>
-        <check_box label="テクスチャを含む" name="upload_textures" />
-        <text name="include_label">アバターモデル専用：</text>
-        <check_box label="スキンの重さを含む" name="upload_skin" />
-        <check_box label="ジョイント位置を含む" name="upload_joints" />
-        <check_box label="ジョイント位置が定義されている場合、スケールをロック" name="lock_scale_if_joint_position" />
-        <text name="pelvis_offset_label">Ｚオフセット（アバターを上下調整）：</text>
-        <spinner name="pelvis_offset" value="0.0" />
-      </panel>
-    </tab_container>
-    <panel name="weights_and_warning_panel">
-      <button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算" />
-      <button label="キャンセル" name="cancel_btn" />
-      <button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード" />
-      <button label="設定をクリアしてフォームをリセット" name="reset_btn" />
-      <text name="upload_fee">アップロード料金：L$ [FEE]</text>
-      <text name="prim_weight">土地の負荷：[EQ]</text>
-      <text name="download_weight">ダウンロード：[ST]</text>
-      <text name="physics_weight">物理演算：[PH]</text>
-      <text name="server_weight">サーバー負荷：[SIM]</text>
-      <text name="warning_title">ご注意：</text>
-      <text name="warning_message">メッシュモデルをアップロードする権利がありません。権利の取得方法については[[VURL]]こちらを参照してください。</text>
-      <text name="status">[STATUS]</text>
-    </panel>
-  </panel>
-  <text name="lod_label">プレビュー：</text>
-  <panel name="right_panel">
-    <combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
-      <combo_item name="high">高</combo_item>
-      <combo_item name="medium">中</combo_item>
-      <combo_item name="low">低</combo_item>
-      <combo_item name="lowest">最低</combo_item>
-    </combo_box>
-    <text name="label_display">外観…</text>
-    <check_box label="輪部" name="show_edges" />
-    <check_box label="物理効果" name="show_physics" />
-    <check_box label="テクスチャ" name="show_textures" />
-    <check_box label="スキンの重さ" name="show_skin_weight" />
-    <check_box label="ジョイント位置" name="show_joint_positions" />
-    <text name="physics_explode_label">プレビュースプレッド：</text>
-  </panel>
-</floater>
\ No newline at end of file
+	<string name="status_idle"/>
+	<string name="status_parse_error">
+		エラー：Dae に問題が見つかりました - 詳細についてはログをご参照ください。
+	</string>
+	<string name="status_bind_shape_orientation">
+		警告：バインドシェイプマトリックスは、標準の X 軸正方向にはありません。
+	</string>
+	<string name="status_material_mismatch">
+		エラー：モデルの材料は参考モデルのサブセットではありません。
+	</string>
+	<string name="status_reading_file">
+		読み込んでいます…
+	</string>
+	<string name="status_generating_meshes">
+		メッシュを作成中
+	</string>
+	<string name="status_vertex_number_overflow">
+		エラー：頂点の数が65534を超過したので中止されました。
+	</string>
+	<string name="bad_element">
+		エラー：要素が無効です
+	</string>
+	<string name="high">
+		高
+	</string>
+	<string name="medium">
+		中
+	</string>
+	<string name="low">
+		低
+	</string>
+	<string name="lowest">
+		最低
+	</string>
+	<string name="mesh_status_good">
+		発送
+	</string>
+	<string name="mesh_status_na">
+		該当なし
+	</string>
+	<string name="mesh_status_none">
+		なし
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		テクスチャ編集可能な面の数は、描画詳細度に応じて異なります。
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		メッシュインスタンスの数は、描画詳細度に応じて異なります。
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		描画詳細度に対して頂点の数が多すぎます。
+	</string>
+	<string name="mesh_status_missing_lod">
+		必要な描画詳細度が見つかりません。
+	</string>
+	<string name="mesh_status_invalid_material_list">
+		LOD付きの材料は、参考モデルのサブセットではありません。
+	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		一部の物理的な外殻構造が、頂点の制限を超えます。
+	</string>
+	<string name="layer_all">
+		全て
+	</string>
+	<string name="decomposing">
+		分析中
+	</string>
+	<string name="simplifying">
+		簡素化
+	</string>
+	<string name="tbd">
+		未定
+	</string>
+	<panel name="left_panel">
+		<panel name="model_name_representation_panel">
+			<text name="name_label">
+				モデル名：
+			</text>
+			<text name="model_category_label">
+				このモデルは…
+			</text>
+			<combo_box name="model_category_combo">
+				<combo_item label="1つを選択…" name="Choose one"/>
+				<combo_item label="アバターの形" name="Avatar shape"/>
+				<combo_item label="アバターの装着物" name="Avatar attachment"/>
+				<combo_item label="動くオブジェクト（車、動物）" name="Moving object (vehicle, animal)"/>
+				<combo_item label="制作用コンポーネント" name="Building Component"/>
+				<combo_item label="大型、不動、等" name="Large, non moving etc"/>
+				<combo_item label="やや小型、不動、等" name="Smaller, non-moving etc"/>
+				<combo_item label="いずれにも該当しない" name="Not really any of these"/>
+			</combo_box>
+		</panel>
+		<tab_container name="import_tab">
+			<panel label="描画詳細度" name="lod_panel" title="描画詳細度">
+				<text initial_value="データ源" name="source" value="データ源"/>
+				<text initial_value="三角形" name="triangles" value="三角形"/>
+				<text initial_value="頂点" name="vertices" value="頂点"/>
+				<text initial_value="高" name="high_label" value="高"/>
+				<combo_box name="lod_source_high">
+					<item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む"/>
+					<item label="生成" name="Generate" value="生成"/>
+				</combo_box>
+				<button label="参照" name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
+				<text initial_value="0" name="high_triangles" value="0"/>
+				<text initial_value="0" name="high_vertices" value="0"/>
+				<text initial_value="中" name="medium_label" value="中"/>
+				<combo_box name="lod_source_medium">
+					<item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む"/>
+					<item label="生成" name="Generate" value="生成"/>
+					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
+				<button label="参照" name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
+				<text initial_value="0" name="medium_triangles" value="0"/>
+				<text initial_value="0" name="medium_vertices" value="0"/>
+				<text initial_value="低" name="low_label" value="低"/>
+				<combo_box name="lod_source_low">
+					<item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む"/>
+					<item label="生成" name="Generate" value="生成"/>
+					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
+				<button label="参照" name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
+				<text initial_value="0" name="low_triangles" value="0"/>
+				<text initial_value="0" name="low_vertices" value="0"/>
+				<text initial_value="最低" name="lowest_label" value="最低"/>
+				<combo_box name="lod_source_lowest">
+					<item label="ファイルから読み込む" name="Load from file" value="ファイルから読み込む"/>
+					<item label="生成" name="Generate" value="生成"/>
+					<item label="上記の LoD を使用" name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
+				<button label="参照" name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
+				<text initial_value="0" name="lowest_triangles" value="0"/>
+				<text initial_value="0" name="lowest_vertices" value="0"/>
+				<check_box label="ノーマルの作成" name="gen_normals"/>
+				<text initial_value="折れ角度：" name="crease_label" value="折れ角度："/>
+				<spinner name="crease_angle" value="75"/>
+			</panel>
+			<panel label="物理効果" name="physics_panel">
+				<panel name="physics geometry">
+					<text name="first_step_name">
+						手順１：描画詳細度
+					</text>
+					<combo_box name="physics_lod_combo" tool_tip="実像に適用するLOD">
+						<combo_item name="choose_one">
+							１つを選択…
+						</combo_item>
+						<combo_item name="physics_high">
+							高
+						</combo_item>
+						<combo_item name="physics_medium">
+							中
+						</combo_item>
+						<combo_item name="physics_low">
+							低
+						</combo_item>
+						<combo_item name="physics_lowest">
+							最低
+						</combo_item>
+						<combo_item name="load_from_file">
+							ファイルから
+						</combo_item>
+					</combo_box>
+					<button label="参照" name="physics_browse"/>
+				</panel>
+				<panel name="physics analysis">
+					<text name="method_label">
+						手順２：分析
+					</text>
+					<text name="analysis_method_label">
+						方法：
+					</text>
+					<text name="quality_label">
+						品質：
+					</text>
+					<text name="smooth_method_label">
+						滑らかさ：
+					</text>
+					<check_box label="穴を閉じる" name="Close Holes (Slow)"/>
+					<button label="分析" name="Decompose"/>
+					<button label="キャンセル" name="decompose_cancel"/>
+				</panel>
+				<panel name="physics simplification">
+					<text name="second_step_label">
+						手順３：簡素化
+					</text>
+					<text name="simp_method_header">
+						方法：
+					</text>
+					<text name="pass_method_header">
+						パス：
+					</text>
+					<text name="Detail Scale label">
+						詳細度：
+					</text>
+					<text name="Retain%_label">
+						維持率：
+					</text>
+					<combo_box name="Combine Quality" value="1"/>
+					<button label="簡素化" name="Simplify"/>
+					<button label="キャンセル" name="simplify_cancel"/>
+				</panel>
+				<panel name="physics info">
+					<text name="results_text">
+						結果：
+					</text>
+					<text name="physics_triangles">
+						三角形：[TRIANGLES],
+					</text>
+					<text name="physics_points">
+						頂点：[POINTS],
+					</text>
+					<text name="physics_hulls">
+						外殻構造：[HULLS]
+					</text>
+				</panel>
+			</panel>
+			<panel label="アップロードのオプション" name="modifiers_panel">
+				<text name="scale_label">
+					スケール（１＝増減なし）：
+				</text>
+				<spinner name="import_scale" value="1.0"/>
+				<text name="dimensions_label">
+					サイズ：
+				</text>
+				<text name="import_dimensions">
+					[X]✕[Y]✕[Z]
+				</text>
+				<check_box label="テクスチャを含む" name="upload_textures"/>
+				<text name="include_label">
+					アバターモデル専用：
+				</text>
+				<check_box label="スキンの重さを含む" name="upload_skin"/>
+				<check_box label="ジョイント位置を含む" name="upload_joints"/>
+				<check_box label="ジョイント位置が定義されている場合、スケールをロック" name="lock_scale_if_joint_position"/>
+				<text name="pelvis_offset_label">
+					Ｚオフセット（アバターを上下調整）：
+				</text>
+				<spinner name="pelvis_offset" value="0.0"/>
+			</panel>
+		</tab_container>
+		<panel name="weights_and_warning_panel">
+			<button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算"/>
+			<button label="キャンセル" name="cancel_btn"/>
+			<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
+			<button label="設定をクリアしてフォームをリセット" name="reset_btn"/>
+			<text name="upload_fee">
+				アップロード料金：L$ [FEE]
+			</text>
+			<text name="prim_weight">
+				土地の負荷：[EQ]
+			</text>
+			<text name="download_weight">
+				ダウンロード：[ST]
+			</text>
+			<text name="physics_weight">
+				物理演算：[PH]
+			</text>
+			<text name="server_weight">
+				サーバー負荷：[SIM]
+			</text>
+			<text name="warning_title">
+				ご注意：
+			</text>
+			<text name="warning_message">
+				メッシュモデルをアップロードする権利がありません。権利の取得方法については[[VURL]]こちらを参照してください。
+			</text>
+			<text name="status">
+				[STATUS]
+			</text>
+		</panel>
+	</panel>
+	<text name="lod_label">
+		プレビュー：
+	</text>
+	<panel name="right_panel">
+		<combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
+			<combo_item name="high">
+				高
+			</combo_item>
+			<combo_item name="medium">
+				中
+			</combo_item>
+			<combo_item name="low">
+				低
+			</combo_item>
+			<combo_item name="lowest">
+				最低
+			</combo_item>
+		</combo_box>
+		<text name="label_display">
+			外観…
+		</text>
+		<check_box label="輪部" name="show_edges"/>
+		<check_box label="物理効果" name="show_physics"/>
+		<check_box label="テクスチャ" name="show_textures"/>
+		<check_box label="スキンの重さ" name="show_skin_weight"/>
+		<check_box label="ジョイント位置" name="show_joint_positions"/>
+		<text name="physics_explode_label">
+			プレビュースプレッド：
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
index 4a87b46b6b..e56a93e891 100644
--- a/indra/newview/skins/default/xui/ja/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml
@@ -1,37 +1,75 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="move_floater" title="歩行／走行／飛行">
-  <string name="walk_forward_tooltip">前に進む（上矢印か W を押す）</string>
-  <string name="walk_back_tooltip">後ろに歩く（下矢印か S を押す）</string>
-  <string name="walk_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
-  <string name="walk_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
-  <string name="run_forward_tooltip">前に走る（上矢印か W を押す）</string>
-  <string name="run_back_tooltip">後ろに走る（下矢印か S を押す）</string>
-  <string name="run_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
-  <string name="run_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
-  <string name="fly_forward_tooltip">前に飛ぶ（上矢印か W を押す）</string>
-  <string name="fly_back_tooltip">後ろに飛ぶ（下矢印か S を押す）</string>
-  <string name="fly_left_tooltip">左に水平移動（Shift + 左矢印か A を押す）</string>
-  <string name="fly_right_tooltip">右に水平移動（Shift + 右矢印か D を押す）</string>
-  <string name="fly_up_tooltip">上に移動（E を押す）</string>
-  <string name="fly_down_tooltip">下に移動（C を押す）</string>
-  <string name="jump_tooltip">ジャンプ（E を押す）</string>
-  <string name="crouch_tooltip">かがむ（C を押す）</string>
-  <string name="walk_title">歩く</string>
-  <string name="run_title">走る</string>
-  <string name="fly_title">飛ぶ</string>
-  <panel name="panel_actions">
-    <button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）" />
-    <joystick_slide name="move left btn" tool_tip="左に歩く（Shift + 左矢印か A を押す）" />
-    <button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）" />
-    <joystick_slide name="move right btn" tool_tip="右に歩く（Shift + 右矢印か D を押す）" />
-    <joystick_turn name="forward btn" tool_tip="前に進む（上矢印か W を押す）" />
-    <joystick_turn name="backward btn" tool_tip="後ろに歩く（下矢印か S を押す）" />
-    <button label="" label_selected="" name="move up btn" tool_tip="上に移動（E を押す）" />
-    <button label="" label_selected="" name="move down btn" tool_tip="下に移動（C を押す）" />
-  </panel>
-  <panel name="panel_modes">
-    <button label="" name="mode_walk_btn" tool_tip="歩行モード" />
-    <button label="" name="mode_run_btn" tool_tip="走行モード" />
-    <button label="" name="mode_fly_btn" tool_tip="飛行モード" />
-  </panel>
-</floater>
\ No newline at end of file
+	<string name="walk_forward_tooltip">
+		前に進む（上矢印か W を押す）
+	</string>
+	<string name="walk_back_tooltip">
+		後ろに歩く（下矢印か S を押す）
+	</string>
+	<string name="walk_left_tooltip">
+		左に水平移動（Shift + 左矢印か A を押す）
+	</string>
+	<string name="walk_right_tooltip">
+		右に水平移動（Shift + 右矢印か D を押す）
+	</string>
+	<string name="run_forward_tooltip">
+		前に走る（上矢印か W を押す）
+	</string>
+	<string name="run_back_tooltip">
+		後ろに走る（下矢印か S を押す）
+	</string>
+	<string name="run_left_tooltip">
+		左に水平移動（Shift + 左矢印か A を押す）
+	</string>
+	<string name="run_right_tooltip">
+		右に水平移動（Shift + 右矢印か D を押す）
+	</string>
+	<string name="fly_forward_tooltip">
+		前に飛ぶ（上矢印か W を押す）
+	</string>
+	<string name="fly_back_tooltip">
+		後ろに飛ぶ（下矢印か S を押す）
+	</string>
+	<string name="fly_left_tooltip">
+		左に水平移動（Shift + 左矢印か A を押す）
+	</string>
+	<string name="fly_right_tooltip">
+		右に水平移動（Shift + 右矢印か D を押す）
+	</string>
+	<string name="fly_up_tooltip">
+		上に移動（E を押す）
+	</string>
+	<string name="fly_down_tooltip">
+		下に移動（C を押す）
+	</string>
+	<string name="jump_tooltip">
+		ジャンプ（E を押す）
+	</string>
+	<string name="crouch_tooltip">
+		かがむ（C を押す）
+	</string>
+	<string name="walk_title">
+		歩く
+	</string>
+	<string name="run_title">
+		走る
+	</string>
+	<string name="fly_title">
+		飛ぶ
+	</string>
+	<panel name="panel_actions">
+		<button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）"/>
+		<joystick_slide name="move left btn" tool_tip="左に歩く（Shift + 左矢印か A を押す）"/>
+		<button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）"/>
+		<joystick_slide name="move right btn" tool_tip="右に歩く（Shift + 右矢印か D を押す）"/>
+		<joystick_turn name="forward btn" tool_tip="前に進む（上矢印か W を押す）"/>
+		<joystick_turn name="backward btn" tool_tip="後ろに歩く（下矢印か S を押す）"/>
+		<button label="" label_selected="" name="move up btn" tool_tip="上に移動（E を押す）"/>
+		<button label="" label_selected="" name="move down btn" tool_tip="下に移動（C を押す）"/>
+	</panel>
+	<panel name="panel_modes">
+		<button label="" name="mode_walk_btn" tool_tip="歩行モード"/>
+		<button label="" name="mode_run_btn" tool_tip="走行モード"/>
+		<button label="" name="mode_fly_btn" tool_tip="飛行モード"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index b1d14e9bcd..4cb6b50836 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="block by name" title="名前でオブジェクトをブロック">
-  <text name="message">オブジェクトをブロックします：</text>
-  <line_editor name="object_name">オブジェクト名</line_editor>
-  <text name="note">* ブロックされるのはオブジェクトの文字だけで、音はブロックされません。</text>
-  <button label="ＯＫ" name="OK" top_pad="10" />
-  <button label="キャンセル" name="Cancel" />
-</floater>
\ No newline at end of file
+	<text name="message">
+		オブジェクトをブロックします：
+	</text>
+	<line_editor name="object_name">
+		オブジェクト名
+	</line_editor>
+	<text name="note">
+		* ブロックされるのはオブジェクトの文字だけで、音はブロックされません。
+	</text>
+	<button label="ＯＫ" name="OK" top_pad="10"/>
+	<button label="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
index 44ba494b91..c9a0ecefd7 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_my_appearance" title="容姿">
-  <panel label="容姿の編集" name="main_panel" />
-</floater>
\ No newline at end of file
+	<panel label="容姿の編集" name="main_panel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
index 8ca0cf4242..b316222919 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="my_environments" title="私の環境">
-  <layout_stack name="main_layout">
-    <layout_panel name="filter_panel" label="フィルタ">
-      <icon name="icon_settingsdays" />
-      <check_box label="日間" name="chk_days" />
-      <icon name="icon_settingsskies" />
-      <check_box label="空" name="chk_skies" />
-      <icon name="icon_settingswater" />
-      <check_box label="水面" name="chk_water" />
-      <filter_editor label="環境の絞り込み" name="flt_search" />
-    </layout_panel>
-    <layout_panel name="list_panel" label="環境">
-      <panel name="pnl_inv_wrap" label="pnl_inv_wrap">
-        <asset_filtered_inv_panel name="pnl_settings" />
-      </panel>
-    </layout_panel>
-    <layout_panel name="lp_showfolders">
-      <check_box label="全てのフォルダを開く" name="chk_showfolders" />
-    </layout_panel>
-    <layout_panel name="pnl_control">
-      <panel label="ボトムパネル" name="pnl_bottom">
-        <menu_button name="btn_gear" tool_tip="その他のオプションを表示" />
-        <menu_button name="btn_newsettings" tool_tip="新しい設定を作成" />
-        <button name="btn_del" tool_tip="選択した項目を削除" />
-      </panel>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<layout_stack name="main_layout">
+		<layout_panel name="filter_panel" label="フィルタ">
+			<icon name="icon_settingsdays"/>
+			<check_box label="日間" name="chk_days"/>
+			<icon name="icon_settingsskies"/>
+			<check_box label="空" name="chk_skies"/>
+			<icon name="icon_settingswater"/>
+			<check_box label="水面" name="chk_water"/>
+			<filter_editor label="環境の絞り込み" name="flt_search"/>
+		</layout_panel>
+		<layout_panel name="list_panel" label="環境">
+			<panel name="pnl_inv_wrap" label="pnl_inv_wrap">
+				<asset_filtered_inv_panel name="pnl_settings"/>
+			</panel>
+		</layout_panel>
+		<layout_panel name="lp_showfolders">
+			<check_box label="全てのフォルダを開く" name="chk_showfolders"/>
+		</layout_panel>
+		<layout_panel name="pnl_control">
+			<panel label="ボトムパネル" name="pnl_bottom">
+				<menu_button name="btn_gear" tool_tip="その他のオプションを表示"/>
+				<menu_button name="btn_newsettings" tool_tip="新しい設定を作成"/>
+				<button name="btn_del" tool_tip="選択した項目を削除"/>
+			</panel>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
index 614b79fb35..01644e0925 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_my_inventory" title="インベントリ" />
+<floater name="floater_my_inventory" title="インベントリ"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_my_scripts.xml b/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
index 3d79996a24..fb74c34d00 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_scripts.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="myscripts" title="スクリプト" />
+<floater name="myscripts" title="スクリプト"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml
index 76b62f3d9f..cd4c1d4def 100644
--- a/indra/newview/skins/default/xui/ja/floater_notification.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notification.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notification" title="通知コンソール">
-  <text_editor name="payload">読み込んでいます…。</text_editor>
-  <combo_box label="レスポンス" name="response" />
-</floater>
\ No newline at end of file
+	<text_editor name="payload">
+		読み込んでいます…。
+	</text_editor>
+	<combo_box label="レスポンス" name="response"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
index 3bb61af89f..c9d9ea7acb 100644
--- a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notifications_console" title="通知コンソール">
-  <combo_box label="種類を選択" name="notification_types" />
-  <button label="追加" name="add_notification" />
-</floater>
\ No newline at end of file
+	<combo_box label="種類を選択" name="notification_types"/>
+	<button label="追加" name="add_notification"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
index 5d2085973e..feac052d6c 100644
--- a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
@@ -1,29 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_notifications_tabbed" title="通知">
-  <floater.string name="system_tab_title">システム ([COUNT])</floater.string>
-  <floater.string name="transactions_tab_title">取引 ([COUNT])</floater.string>
-  <floater.string name="group_invitations_tab_title">招待 ([COUNT])</floater.string>
-  <floater.string name="group_notices_tab_title">グループ ([COUNT])</floater.string>
-  <string name="title_notification_tabbed_window">通知</string>
-  <layout_stack name="TabButtonsStack">
-    <layout_panel name="TabButtonsLayoutPanel">
-      <tab_container name="notifications_tab_container">
-        <panel label="システム (0)" name="system_notification_list_tab" />
-        <panel label="取引 (0)" name="transaction_notifications_tab" />
-        <panel label="招待 (0)" name="group_invite_notifications_tab" />
-        <panel label="グループ (0)" name="group_notice_notifications_tab" />
-      </tab_container>
-      <layout_stack name="ButtonsStack">
-        <layout_panel name="CondenseAllButtonPanel">
-          <button label="全て折り畳む" name="collapse_all_button" />
-        </layout_panel>
-        <layout_panel name="GapLayoutPanel">
-          <panel label="ギャップパネル" name="GapPanel" />
-        </layout_panel>
-        <layout_panel name="DeleteAllButtonPanel">
-          <button label="全て削除" name="delete_all_button" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<floater.string name="system_tab_title">
+		システム ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		取引 ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		招待 ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		グループ ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		通知
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="システム (0)" name="system_notification_list_tab"/>
+				<panel label="取引 (0)" name="transaction_notifications_tab"/>
+				<panel label="招待 (0)" name="group_invite_notifications_tab"/>
+				<panel label="グループ (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="全て折り畳む" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="ギャップパネル" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="全て削除" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
index 77212c42db..18a6b77f8e 100644
--- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="object_weights" title="詳しい設定">
-  <floater.string name="nothing_selected" value="─" />
-  <text name="selected_text" value="選択済" />
-  <text name="objects" value="─" />
-  <text name="objects_label" value="オブジェクト" />
-  <text name="prims" value="─" />
-  <text name="prims_label" value="プリム" />
-  <text name="weights_of_selected_text" value="選択済みアイテムのウエイト" />
-  <text name="download" value="─" />
-  <text name="download_label" value="ダウンロード" />
-  <text name="physics" value="─" />
-  <text name="physics_label" value="物理効果" />
-  <text name="server" value="─" />
-  <text name="server_label" value="サーバー" />
-  <text name="display" value="─" />
-  <text name="display_label" value="ディスプレイ" />
-  <text name="land_impacts_text" value="土地の負荷" />
-  <text name="selected" value="─" />
-  <text name="selected_label" value="選択済" />
-  <text name="rezzed_on_land" value="─" />
-  <text name="rezzed_on_land_label" value="土地に Rez 済み" />
-  <text name="remaining_capacity" value="─" />
-  <text name="remaining_capacity_label" value="残りの許容数" />
-  <text name="total_capacity" value="─" />
-  <text name="total_capacity_label" value="許容合計" />
-  <text name="help_SLURL" value="[secondlife:///app/help/object_weights オブジェクトのウェイトとは？]" />
-</floater>
\ No newline at end of file
+	<floater.string name="nothing_selected" value="─"/>
+	<text name="selected_text" value="選択済"/>
+	<text name="objects" value="─"/>
+	<text name="objects_label" value="オブジェクト"/>
+	<text name="prims" value="─"/>
+	<text name="prims_label" value="プリム"/>
+	<text name="weights_of_selected_text" value="選択済みアイテムのウエイト"/>
+	<text name="download" value="─"/>
+	<text name="download_label" value="ダウンロード"/>
+	<text name="physics" value="─"/>
+	<text name="physics_label" value="物理効果"/>
+	<text name="server" value="─"/>
+	<text name="server_label" value="サーバー"/>
+	<text name="display" value="─"/>
+	<text name="display_label" value="ディスプレイ"/>
+	<text name="land_impacts_text" value="土地の負荷"/>
+	<text name="selected" value="─"/>
+	<text name="selected_label" value="選択済"/>
+	<text name="rezzed_on_land" value="─"/>
+	<text name="rezzed_on_land_label" value="土地に Rez 済み"/>
+	<text name="remaining_capacity" value="─"/>
+	<text name="remaining_capacity_label" value="残りの許容数"/>
+	<text name="total_capacity" value="─"/>
+	<text name="total_capacity_label" value="許容合計"/>
+	<text name="help_SLURL" value="[secondlife:///app/help/object_weights オブジェクトのウェイトとは？]"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
index 15d59f4adf..b3743f03b2 100644
--- a/indra/newview/skins/default/xui/ja/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="objectcontents" title="オブジェクトのコンテンツ">
-  <text name="object_name">[DESC]：</text>
-  <panel_inventory_object name="object_contents" />
-  <button label="インベントリにコピーのみ" label_selected="インベントリにコピー" name="copy_to_inventory_button" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_button" />
-</floater>
\ No newline at end of file
+	<text name="object_name">
+		[DESC]：
+	</text>
+	<panel_inventory_object name="object_contents"/>
+	<button label="インベントリにコピーのみ" label_selected="インベントリにコピー" name="copy_to_inventory_button"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_button"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
index 906e68a961..96809924c1 100644
--- a/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="outfit_photo_preview">
-  <floater.string name="Title">テスクチャ：[NAME]</floater.string>
-  <floater.string name="exceed_limits">アウトフィット画像の最大サイズは[MAX_WIDTH]✕[MAX_HEIGHT]です。他のテスクチャを選択してください。</floater.string>
-  <floater.string name="photo_confirmation">この画像を[OUTFIT]のアウトフィット画像にしますか？</floater.string>
-  <text name="dimensions">[WIDTH]px✕[HEIGHT]px</text>
-  <text name="notification" />
-  <button label="ＯＫ" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="Title">
+		テスクチャ：[NAME]
+	</floater.string>
+	<floater.string name="exceed_limits">
+		アウトフィット画像の最大サイズは[MAX_WIDTH]✕[MAX_HEIGHT]です。他のテスクチャを選択してください。
+	</floater.string>
+	<floater.string name="photo_confirmation">
+		この画像を[OUTFIT]のアウトフィット画像にしますか？
+	</floater.string>
+	<text name="dimensions">
+		[WIDTH]px✕[HEIGHT]px
+	</text>
+	<text name="notification"/>
+	<button label="ＯＫ" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
index 7e949e5c26..85d5b5e2c6 100644
--- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="アウトフィットを保存する">
-  <button label="保存" label_selected="保存" name="Save" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-  <!-- 字数制限のため「着用中のアウトフィットを名前をつけて保存：」ではない-->
-  <text name="Save item as:">名前をつけて保存：</text>
-  <!-- 名前には、非ASCII文字が使えないため翻訳しない -->
-  <line_editor name="name ed">[DESC] (NEW)</line_editor>
-</floater>
\ No newline at end of file
+	<button label="保存" label_selected="保存" name="Save"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+	<text name="Save item as:">
+		名前をつけて保存：
+	</text>
+	<line_editor name="name ed">
+		[DESC] (NEW)
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
index d9699c2661..d74b714b1a 100644
--- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
@@ -1,16 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="outgoing call" title="コール中">
-  <floater.string name="lifetime">5</floater.string>
-  <floater.string name="localchat">近隣のボイスチャット</floater.string>
-  <floater.string name="anonymous">匿名ユーザー</floater.string>
-  <floater.string name="VoiceInviteP2P">がコールしています。</floater.string>
-  <floater.string name="VoiceInviteAdHoc">が会話チャットで、ボイスチャットに参加しました。</floater.string>
-  <text name="connecting">[CALLEE_NAME]に接続中</text>
-  <text name="calling">[CALLEE_NAME]をコール中</text>
-  <text name="noanswer">繋がりませんでした。あとでもう一度お試しください。</text>
-  <text name="nearby">[VOICE_CHANNEL_NAME]への接続が切れました。[RECONNECT_NEARBY]</text>
-  <text name="nearby_P2P_by_other">コールを切りました。[RECONNECT_NEARBY]</text>
-  <text name="nearby_P2P_by_agent">コールを終了しました。[RECONNECT_NEARBY]</text>
-  <text name="leaving">[CURRENT_CHAT]を終了します。</text>
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-</floater>
\ No newline at end of file
+	<floater.string name="lifetime">
+		5
+	</floater.string>
+	<floater.string name="localchat">
+		近隣のボイスチャット
+	</floater.string>
+	<floater.string name="anonymous">
+		匿名ユーザー
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		がコールしています。
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		が会話チャットで、ボイスチャットに参加しました。
+	</floater.string>
+	<text name="connecting">
+		[CALLEE_NAME]に接続中
+	</text>
+	<text name="calling">
+		[CALLEE_NAME]をコール中
+	</text>
+	<text name="noanswer">
+		繋がりませんでした。あとでもう一度お試しください。
+	</text>
+	<text name="nearby">
+		[VOICE_CHANNEL_NAME]への接続が切れました。[RECONNECT_NEARBY]
+	</text>
+	<text name="nearby_P2P_by_other">
+		コールを切りました。[RECONNECT_NEARBY]
+	</text>
+	<text name="nearby_P2P_by_agent">
+		コールを終了しました。[RECONNECT_NEARBY]
+	</text>
+	<text name="leaving">
+		[CURRENT_CHAT]を終了します。
+	</text>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
index a4ac5ab356..00742aef23 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -1,35 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_characters" title="経路探索キャラクター">
-  <floater.string name="messaging_get_inprogress">経路探索キャラクターを照会中…</floater.string>
-  <floater.string name="messaging_get_error">経路探索キャラクターの照会中にエラーが発生しました。</floater.string>
-  <floater.string name="messaging_complete_none_found">経路探索キャラクターがありません。</floater.string>
-  <floater.string name="messaging_complete_available">[NUM_TOTAL]人のキャラクター中[NUM_SELECTED]人のキャラクターが選択されました。</floater.string>
-  <floater.string name="messaging_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
-  <floater.string name="character_cpu_time">[CPU_TIME]㎲</floater.string>
-  <floater.string name="character_owner_loading">[Loading]</floater.string>
-  <floater.string name="character_owner_unknown">[Unknown]</floater.string>
-  <floater.string name="character_owner_group">[group]</floater.string>
-  <panel name="pathfinding_chars_main">
-    <scroll_list name="objects_scroll_list">
-      <scroll_list.columns label="名前" name="name" />
-      <scroll_list.columns label="説明" name="description" />
-      <scroll_list.columns label="所有者" name="owner" />
-      <scroll_list.columns label="ＣＰＵ" name="cpu_time" />
-      <scroll_list.columns label="高度" name="altitude" />
-    </scroll_list>
-    <text name="messaging_status">キャラクター：</text>
-    <button label="リスト更新" name="refresh_objects_list" />
-    <button label="すべて選択" name="select_all_objects" />
-    <button label="何も選択しない" name="select_none_objects" />
-  </panel>
-  <panel name="pathfinding_chars_actions">
-    <text name="actions_label">選択したキャラクターに対するアクション：</text>
-    <check_box label="ビーコンを表示" name="show_beacon" />
-    <check_box label="物理効果カプセルを表示" name="show_physics_capsule" />
-    <button label="取る" name="take_objects" />
-    <button label="コピーを取る" name="take_copy_objects" />
-    <button label="その場所にテレポート" name="teleport_me_to_object" tool_tip="１つのキャラクターが選択された場合にのみ有効です。" />
-    <button label="返却" name="return_objects" />
-    <button label="削除" name="delete_objects" />
-  </panel>
-</floater>
\ No newline at end of file
+	<floater.string name="messaging_get_inprogress">
+		経路探索キャラクターを照会中…
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		経路探索キャラクターの照会中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		経路探索キャラクターがありません。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_TOTAL]人のキャラクター中[NUM_SELECTED]人のキャラクターが選択されました。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		このリージョン（地域）は経路探索に対応していません。
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME]㎲
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[group]
+	</floater.string>
+	<panel name="pathfinding_chars_main">
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名前" name="name"/>
+			<scroll_list.columns label="説明" name="description"/>
+			<scroll_list.columns label="所有者" name="owner"/>
+			<scroll_list.columns label="ＣＰＵ" name="cpu_time"/>
+			<scroll_list.columns label="高度" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			キャラクター：
+		</text>
+		<button label="リスト更新" name="refresh_objects_list"/>
+		<button label="すべて選択" name="select_all_objects"/>
+		<button label="何も選択しない" name="select_none_objects"/>
+	</panel>
+	<panel name="pathfinding_chars_actions">
+		<text name="actions_label">
+			選択したキャラクターに対するアクション：
+		</text>
+		<check_box label="ビーコンを表示" name="show_beacon"/>
+		<check_box label="物理効果カプセルを表示" name="show_physics_capsule"/>
+		<button label="取る" name="take_objects"/>
+		<button label="コピーを取る" name="take_copy_objects"/>
+		<button label="その場所にテレポート" name="teleport_me_to_object" tool_tip="１つのキャラクターが選択された場合にのみ有効です。"/>
+		<button label="返却" name="return_objects"/>
+		<button label="削除" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index 4434f44cb8..218fade27b 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -1,70 +1,131 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="経路探索の表示／テスト">
-  <floater.string name="navmesh_viewer_status_library_not_implemented">経路探索ライブラリの実装が見つかりません。</floater.string>
-  <floater.string name="navmesh_viewer_status_region_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
-  <floater.string name="navmesh_viewer_status_region_loading">リージョン（地域）の読み込みを待機しています。</floater.string>
-  <floater.string name="navmesh_viewer_status_checking_version">ナビメッシュのステータスを確認しています。</floater.string>
-  <floater.string name="navmesh_viewer_status_downloading">ナビメッシュをダウンロードしています。</floater.string>
-  <floater.string name="navmesh_viewer_status_updating">サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。</floater.string>
-  <floater.string name="navmesh_viewer_status_has_navmesh">最新のナビメッシュがダウンロードされました。
-  </floater.string>
-  <floater.string name="navmesh_viewer_status_error">ナビメッシュが正しくダウンロードできませんでした。</floater.string>
-  <floater.string name="navmesh_simulator_status_pending">ナビメッシュに保留中の変更があります。</floater.string>
-  <floater.string name="navmesh_simulator_status_building">ナビメッシュを作成しています。</floater.string>
-  <floater.string name="navmesh_simulator_status_some_pending">ナビメッシュの一部のリージョン（地域）に保留中の変更があります。</floater.string>
-  <floater.string name="navmesh_simulator_status_some_building">一部のナビメッシュのリージョン（地域）を構築しています。</floater.string>
-  <floater.string name="navmesh_simulator_status_pending_and_building">ナビメッシュの一部のリージョン（地域）に保留中の変更があり、その他のリージョンは構築中です。</floater.string>
-  <floater.string name="navmesh_simulator_status_complete">ナビメッシュは最新です。</floater.string>
-  <floater.string name="pathing_library_not_implemented">経路探索ライブラリの実装が見つかりません。</floater.string>
-  <floater.string name="pathing_region_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
-  <floater.string name="pathing_choose_start_and_end_points">開始点と終了点を選択してください。</floater.string>
-  <floater.string name="pathing_choose_start_point">開始点を選択してください。</floater.string>
-  <floater.string name="pathing_choose_end_point">終了点を選択してください。</floater.string>
-  <floater.string name="pathing_path_valid">パスはオレンジ色で表示されています。</floater.string>
-  <floater.string name="pathing_path_invalid">選択した２点間のパスが見つかりません。</floater.string>
-  <floater.string name="pathing_error">パスの生成中にエラーが発生しました。</floater.string>
-  <panel name="pathfinding_console_main">
-    <text name="viewer_status_label">ビューアのステータス</text>
-  </panel>
-  <panel name="pathfinding_console_simulator">
-    <text name="simulator_status_label">シミュレータのステータス</text>
-  </panel>
-  <tab_container name="view_test_tab_container">
-    <panel label="表示" name="view_panel">
-      <text name="show_label">表示：</text>
-      <check_box label="ワールド" name="show_world" />
-      <check_box label="可動物のみ" name="show_world_movables_only" />
-      <check_box label="ナビメッシュ" name="show_navmesh" />
-      <text name="show_walkability_label">歩行可能マップを表示：</text>
-      <combo_box name="show_heatmap_mode">
-        <combo_box.item label="表示しない" name="show_heatmap_mode_none" />
-        <combo_box.item label="キャラクタータイプＡ" name="show_heatmap_mode_a" />
-        <combo_box.item label="キャラクタータイプＢ" name="show_heatmap_mode_b" />
-        <combo_box.item label="キャラクタータイプＣ" name="show_heatmap_mode_c" />
-        <combo_box.item label="キャラクタータイプＤ" name="show_heatmap_mode_d" />
-      </combo_box>
-      <check_box label="歩行可能" name="show_walkables" />
-      <check_box label="素材ボリューム" name="show_material_volumes" />
-      <check_box label="静的障害物" name="show_static_obstacles" />
-      <check_box label="除外ボリューム" name="show_exclusion_volumes" />
-      <check_box label="水上飛行機" name="show_water_plane" />
-      <check_box label="Ｘ線表示" name="show_xray" />
-    </panel>
-    <panel label="パスをテスト" name="test_panel">
-      <text name="ctrl_click_label">Ctrlキーを押しながらクリックして、開始点を選択します。</text>
-      <text name="shift_click_label">Shiftキーを押しながらクリックして、終了点を選択します。</text>
-      <text name="character_width_label">キャラクターの幅</text>
-      <slider name="character_width" value="1" />
-      <text name="character_width_unit_label">ｍ</text>
-      <text name="character_type_label">キャラクタータイプ</text>
-      <combo_box name="path_character_type">
-        <combo_box.item label="なし" name="path_character_type_none" />
-        <combo_box.item label="Ａ" name="path_character_type_a" />
-        <combo_box.item label="Ｂ" name="path_character_type_b" />
-        <combo_box.item label="Ｃ" name="path_character_type_c" />
-        <combo_box.item label="Ｄ" name="path_character_type_d" />
-      </combo_box>
-      <button label="経路をクリア" name="clear_path" />
-    </panel>
-  </tab_container>
-</floater>
\ No newline at end of file
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		経路探索ライブラリの実装が見つかりません。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		このリージョン（地域）は経路探索に対応していません。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		リージョン（地域）の読み込みを待機しています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		ナビメッシュのステータスを確認しています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		ナビメッシュをダウンロードしています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		最新のナビメッシュがダウンロードされました。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		ナビメッシュが正しくダウンロードできませんでした。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		ナビメッシュに保留中の変更があります。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		ナビメッシュを作成しています。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		ナビメッシュの一部のリージョン（地域）に保留中の変更があります。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		一部のナビメッシュのリージョン（地域）を構築しています。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		ナビメッシュの一部のリージョン（地域）に保留中の変更があり、その他のリージョンは構築中です。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		ナビメッシュは最新です。
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		経路探索ライブラリの実装が見つかりません。
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		このリージョン（地域）は経路探索に対応していません。
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		開始点と終了点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		開始点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		終了点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		パスはオレンジ色で表示されています。
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		選択した２点間のパスが見つかりません。
+	</floater.string>
+	<floater.string name="pathing_error">
+		パスの生成中にエラーが発生しました。
+	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			ビューアのステータス
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			シミュレータのステータス
+		</text>
+	</panel>
+	<tab_container name="view_test_tab_container">
+		<panel label="表示" name="view_panel">
+			<text name="show_label">
+				表示：
+			</text>
+			<check_box label="ワールド" name="show_world"/>
+			<check_box label="可動物のみ" name="show_world_movables_only"/>
+			<check_box label="ナビメッシュ" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				歩行可能マップを表示：
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="表示しない" name="show_heatmap_mode_none"/>
+				<combo_box.item label="キャラクタータイプＡ" name="show_heatmap_mode_a"/>
+				<combo_box.item label="キャラクタータイプＢ" name="show_heatmap_mode_b"/>
+				<combo_box.item label="キャラクタータイプＣ" name="show_heatmap_mode_c"/>
+				<combo_box.item label="キャラクタータイプＤ" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="歩行可能" name="show_walkables"/>
+			<check_box label="素材ボリューム" name="show_material_volumes"/>
+			<check_box label="静的障害物" name="show_static_obstacles"/>
+			<check_box label="除外ボリューム" name="show_exclusion_volumes"/>
+			<check_box label="水上飛行機" name="show_water_plane"/>
+			<check_box label="Ｘ線表示" name="show_xray"/>
+		</panel>
+		<panel label="パスをテスト" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrlキーを押しながらクリックして、開始点を選択します。
+			</text>
+			<text name="shift_click_label">
+				Shiftキーを押しながらクリックして、終了点を選択します。
+			</text>
+			<text name="character_width_label">
+				キャラクターの幅
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				ｍ
+			</text>
+			<text name="character_type_label">
+				キャラクタータイプ
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="なし" name="path_character_type_none"/>
+				<combo_box.item label="Ａ" name="path_character_type_a"/>
+				<combo_box.item label="Ｂ" name="path_character_type_b"/>
+				<combo_box.item label="Ｃ" name="path_character_type_c"/>
+				<combo_box.item label="Ｄ" name="path_character_type_d"/>
+			</combo_box>
+			<button label="経路をクリア" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
index b28071be68..0189cbd47b 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -1,92 +1,182 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_linksets" title="リージョンオブジェクト">
-  <floater.string name="messaging_get_inprogress">経路探索リンクセットを照会中…</floater.string>
-  <floater.string name="messaging_get_error">経路探索リンクセットの照会中にエラーが発生しました。</floater.string>
-  <floater.string name="messaging_set_inprogress">選択した経路探索リンクセットを修正中…</floater.string>
-  <floater.string name="messaging_set_error">選択した経路探索リンクセットの修正中にエラーが発生しました。</floater.string>
-  <floater.string name="messaging_complete_none_found">経路探索リンクセットがありません。</floater.string>
-  <floater.string name="messaging_complete_available">[NUM_TOTAL]個中[NUM_SELECTED]個が選択されました。</floater.string>
-  <floater.string name="messaging_not_enabled">このリージョン（地域）は経路探索に対応していません。</floater.string>
-  <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
-  <floater.string name="linkset_terrain_description">－</floater.string>
-  <floater.string name="linkset_terrain_owner">－</floater.string>
-  <floater.string name="linkset_terrain_scripted">－</floater.string>
-  <floater.string name="linkset_terrain_land_impact">－</floater.string>
-  <floater.string name="linkset_terrain_dist_from_you">－</floater.string>
-  <floater.string name="linkset_owner_loading">[Loading]</floater.string>
-  <floater.string name="linkset_owner_unknown">[Unknown]</floater.string>
-  <floater.string name="linkset_owner_group">[group]</floater.string>
-  <floater.string name="linkset_is_scripted">はい</floater.string>
-  <floater.string name="linkset_is_not_scripted">いいえ</floater.string>
-  <floater.string name="linkset_is_unknown_scripted">不明</floater.string>
-  <floater.string name="linkset_use_walkable">歩行可能</floater.string>
-  <floater.string name="linkset_use_static_obstacle">静的障害物</floater.string>
-  <floater.string name="linkset_use_dynamic_obstacle">可動障害物</floater.string>
-  <floater.string name="linkset_use_material_volume">素材ボリューム</floater.string>
-  <floater.string name="linkset_use_exclusion_volume">除外ボリューム</floater.string>
-  <floater.string name="linkset_use_dynamic_phantom">可動ボリューム</floater.string>
-  <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string>
-  <floater.string name="linkset_is_restricted_state">[restricted]</floater.string>
-  <floater.string name="linkset_is_non_volume_state">[concave]</floater.string>
-  <floater.string name="linkset_is_restricted_non_volume_state">[restricted,concave]</floater.string>
-  <floater.string name="linkset_choose_use">リンクセットの用途を選択…</floater.string>
-  <panel name="pathfinding_linksets_main">
-    <text name="linksets_filter_label">フィルタ：</text>
-    <text name="linksets_name_label">名前</text>
-    <text name="linksets_desc_label">説明</text>
-    <combo_box name="filter_by_linkset_use">
-      <combo_box.item label="リンクセットの用途でフィルタ…" name="filter_by_linkset_use_none" />
-      <combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable" />
-      <combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle" />
-      <combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle" />
-      <combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume" />
-      <combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume" />
-      <combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom" />
-    </combo_box>
-    <button label="適用" name="apply_filters" />
-    <button label="クリア" name="clear_filters" />
-    <scroll_list name="objects_scroll_list">
-      <scroll_list.columns label="名前（ルートプリム）" name="name" />
-      <scroll_list.columns label="説明（ルートプリム）" name="description" />
-      <scroll_list.columns label="所有者" name="owner" />
-      <scroll_list.columns label="スクリプト" name="scripted" />
-      <scroll_list.columns label="ランドインパクト" name="land_impact" />
-      <scroll_list.columns label="距離" name="dist_from_you" />
-      <scroll_list.columns label="経路探索で使用" name="linkset_use" />
-      <scroll_list.columns label="Ａ％" name="a_percent" />
-      <scroll_list.columns label="Ｂ％" name="b_percent" />
-      <scroll_list.columns label="Ｃ％" name="c_percent" />
-      <scroll_list.columns label="Ｄ％" name="d_percent" />
-    </scroll_list>
-    <text name="messaging_status">リンクセット：</text>
-    <button label="リスト更新" name="refresh_objects_list" />
-    <button label="すべて選択" name="select_all_objects" />
-    <button label="何も選択しない" name="select_none_objects" />
-  </panel>
-  <panel name="pathfinding_linksets_actions">
-    <text name="linksets_actions_label">選択されたアクション</text>
-    <check_box label="ビーコンを表示" name="show_beacon" />
-    <button label="取る" name="take_objects" />
-    <button label="コピーを取る" name="take_copy_objects" />
-    <button label="その場所にテレポート" name="teleport_me_to_object" />
-    <button label="返却" name="return_objects" />
-    <button label="削除" name="delete_objects" />
-  </panel>
-  <panel name="pathfinding_linksets_attributes">
-    <text name="linksets_attributes_label">経路探索属性を編集する</text>
-    <text name="walkability_coefficients_label">歩行可能性：</text>
-    <text name="edit_a_label">Ａ</text>
-    <line_editor name="edit_a_value" tool_tip="タイプＡのキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。" />
-    <text name="edit_b_label">Ｂ</text>
-    <line_editor name="edit_b_value" tool_tip="タイプＢのキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。" />
-    <text name="edit_c_label">Ｃ</text>
-    <line_editor name="edit_c_value" tool_tip="タイプＣのキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。" />
-    <text name="edit_d_label">Ｄ</text>
-    <line_editor name="edit_d_value" tool_tip="タイプＤのキャラクターの歩行可能性。キャラクタータイプの例はその他です。" />
-    <button label="変更を適用" name="apply_edit_values" />
-    <text name="suggested_use_a_label">（ヒューマノイド）</text>
-    <text name="suggested_use_b_label">（クリーチャー）</text>
-    <text name="suggested_use_c_label">（メカニカル）</text>
-    <text name="suggested_use_d_label">（その他）</text>
-  </panel>
-</floater>
\ No newline at end of file
+	<floater.string name="messaging_get_inprogress">
+		経路探索リンクセットを照会中…
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		経路探索リンクセットの照会中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		選択した経路探索リンクセットを修正中…
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		選択した経路探索リンクセットの修正中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		経路探索リンクセットがありません。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_TOTAL]個中[NUM_SELECTED]個が選択されました。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		このリージョン（地域）は経路探索に対応していません。
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		－
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		－
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		－
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		－
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		－
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[group]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		はい
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		いいえ
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		不明
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		歩行可能
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		静的障害物
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		可動障害物
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		素材ボリューム
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		除外ボリューム
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		可動ボリューム
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[unmodifiable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restricted]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[concave]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restricted,concave]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		リンクセットの用途を選択…
+	</floater.string>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			フィルタ：
+		</text>
+		<text name="linksets_name_label">
+			名前
+		</text>
+		<text name="linksets_desc_label">
+			説明
+		</text>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="リンクセットの用途でフィルタ…" name="filter_by_linkset_use_none"/>
+			<combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="適用" name="apply_filters"/>
+		<button label="クリア" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名前（ルートプリム）" name="name"/>
+			<scroll_list.columns label="説明（ルートプリム）" name="description"/>
+			<scroll_list.columns label="所有者" name="owner"/>
+			<scroll_list.columns label="スクリプト" name="scripted"/>
+			<scroll_list.columns label="ランドインパクト" name="land_impact"/>
+			<scroll_list.columns label="距離" name="dist_from_you"/>
+			<scroll_list.columns label="経路探索で使用" name="linkset_use"/>
+			<scroll_list.columns label="Ａ％" name="a_percent"/>
+			<scroll_list.columns label="Ｂ％" name="b_percent"/>
+			<scroll_list.columns label="Ｃ％" name="c_percent"/>
+			<scroll_list.columns label="Ｄ％" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			リンクセット：
+		</text>
+		<button label="リスト更新" name="refresh_objects_list"/>
+		<button label="すべて選択" name="select_all_objects"/>
+		<button label="何も選択しない" name="select_none_objects"/>
+	</panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			選択されたアクション
+		</text>
+		<check_box label="ビーコンを表示" name="show_beacon"/>
+		<button label="取る" name="take_objects"/>
+		<button label="コピーを取る" name="take_copy_objects"/>
+		<button label="その場所にテレポート" name="teleport_me_to_object"/>
+		<button label="返却" name="return_objects"/>
+		<button label="削除" name="delete_objects"/>
+	</panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			経路探索属性を編集する
+		</text>
+		<text name="walkability_coefficients_label">
+			歩行可能性：
+		</text>
+		<text name="edit_a_label">
+			Ａ
+		</text>
+		<line_editor name="edit_a_value" tool_tip="タイプＡのキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。"/>
+		<text name="edit_b_label">
+			Ｂ
+		</text>
+		<line_editor name="edit_b_value" tool_tip="タイプＢのキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。"/>
+		<text name="edit_c_label">
+			Ｃ
+		</text>
+		<line_editor name="edit_c_value" tool_tip="タイプＣのキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。"/>
+		<text name="edit_d_label">
+			Ｄ
+		</text>
+		<line_editor name="edit_d_value" tool_tip="タイプＤのキャラクターの歩行可能性。キャラクタータイプの例はその他です。"/>
+		<button label="変更を適用" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			（ヒューマノイド）
+		</text>
+		<text name="suggested_use_b_label">
+			（クリーチャー）
+		</text>
+		<text name="suggested_use_c_label">
+			（メカニカル）
+		</text>
+		<text name="suggested_use_d_label">
+			（その他）
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index b4773dcd2f..bf613a8133 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,19 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="お支払い">
-  <string name="payee_group">グループに支払う</string>
-  <string name="payee_resident">住人に支払う</string>
-  <text name="paying_text">支払い先：</text>
-  <text name="payee_name">非常に長い名前が途中で切れていないかをテストして確認</text>
-  <text name="payment_message_label">説明（任意項目）：</text>
-  <panel label="検索" name="PatternsPanel">
-    <button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1" />
-    <button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5" />
-    <button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10" />
-    <button label="L$ 20 払う" label_selected="L$ 20支払う" name="fastpay 20" />
-  </panel>
-  <panel label="検索" name="InputPanel">
-    <text name="amount text">その他の金額：</text>
-    <button label="支払い" label_selected="支払い" name="pay btn" />
-    <button label="キャンセル" label_selected="支払いの取り消し" name="cancel btn" />
-  </panel>
-</floater>
\ No newline at end of file
+	<string name="payee_group">
+		グループに支払う
+	</string>
+	<string name="payee_resident">
+		住人に支払う
+	</string>
+	<text name="paying_text">
+		支払い先：
+	</text>
+	<text name="payee_name">
+		非常に長い名前が途中で切れていないかをテストして確認
+	</text>
+	<text name="payment_message_label">
+		説明（任意項目）：
+	</text>
+	<panel label="検索" name="PatternsPanel">
+		<button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1"/>
+		<button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5"/>
+		<button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10"/>
+		<button label="L$ 20 払う" label_selected="L$ 20支払う" name="fastpay 20"/>
+	</panel>
+	<panel label="検索" name="InputPanel">
+		<text name="amount text">
+			その他の金額：
+		</text>
+		<button label="支払い" label_selected="支払い" name="pay btn"/>
+		<button label="キャンセル" label_selected="支払いの取り消し" name="cancel btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 5206011675..bc3f88168e 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
@@ -1,21 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="オブジェクトにお支払い">
-  <string name="payee_group">グループに支払う</string>
-  <string name="payee_resident">住人に支払う</string>
-  <text name="paying_text">支払い先：</text>
-  <text name="payee_name">エリカシタ・モストポリゾン</text>
-  <text name="object_name_label">以下のオブジェクトを介して支払う：</text>
-  <icon name="icon_object" tool_tip="オブジェクト" />
-  <text name="object_name_text">…</text>
-  <panel label="検索" name="PatternsPanel">
-    <button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1" />
-    <button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5" />
-    <button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10" />
-    <button label="L$ 20支払う" label_selected="L$ 20支払う" name="fastpay 20" />
-  </panel>
-  <panel label="検索" name="InputPanel">
-    <text name="amount text">その他の金額:</text>
-    <button label="支払い" label_selected="オブジェクトに支払います。" name="pay btn" />
-    <button label="キャンセル" label_selected="オブジェクトへの支払いを取り消します。" name="cancel btn" />
-  </panel>
-</floater>
\ No newline at end of file
+	<string name="payee_group">
+		グループに支払う
+	</string>
+	<string name="payee_resident">
+		住人に支払う
+	</string>
+	<text name="paying_text">
+		支払い先：
+	</text>
+	<text name="payee_name">
+		エリカシタ・モストポリゾン
+	</text>
+	<text name="object_name_label">
+		以下のオブジェクトを介して支払う：
+	</text>
+	<icon name="icon_object" tool_tip="オブジェクト"/>
+	<text name="object_name_text">
+		…
+	</text>
+	<panel label="検索" name="PatternsPanel">
+		<button label="L$ 1支払う" label_selected="L$ 1支払う" name="fastpay 1"/>
+		<button label="L$ 5支払う" label_selected="L$ 5支払う" name="fastpay 5"/>
+		<button label="L$ 10支払う" label_selected="L$ 10支払う" name="fastpay 10"/>
+		<button label="L$ 20支払う" label_selected="L$ 20支払う" name="fastpay 20"/>
+	</panel>
+	<panel label="検索" name="InputPanel">
+		<text name="amount text">
+			その他の金額:
+		</text>
+		<button label="支払い" label_selected="オブジェクトに支払います。" name="pay btn"/>
+		<button label="キャンセル" label_selected="オブジェクトへの支払いを取り消します。" name="cancel btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml
index e996f0adbf..bf65bb3a70 100644
--- a/indra/newview/skins/default/xui/ja/floater_people.xml
+++ b/indra/newview/skins/default/xui/ja/floater_people.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_people" title="人物">
-  <panel_container name="main_panel">
-    <panel label="グループのプロフィール" name="panel_group_info_sidetray" />
-    <panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray" />
-  </panel_container>
+	<panel_container name="main_panel">
+		<panel label="グループのプロフィール" name="panel_group_info_sidetray"/>
+		<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
+	</panel_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_performance.xml b/indra/newview/skins/default/xui/ja/floater_performance.xml
index c3e22b0bda..e2efc152a4 100644
--- a/indra/newview/skins/default/xui/ja/floater_performance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_performance.xml
@@ -1,45 +1,73 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="performance" title="グラフィックの最適化">
-  <string name="fps_text" value="フレーム／秒" />
-  <string name="max_text" value="（最大）" />
-  <panel name="panel_top">
-    <panel name="fps_subpanel">
-      <text name="fps_value">167</text>
-      <text name="fps_lbl">フレーム／秒</text>
-      <text name="fps_desc1_lbl">変更が完全に反映されるまで</text>
-      <text name="fps_desc2_lbl">５～１０秒程度かかります。</text>
-    </panel>
-  </panel>
-  <panel name="panel_performance_main">
-    <panel name="autoadjustments_subpanel">
-      <text name="auto_adj_lbl">自動調整設定（推奨）</text>
-      <text name="auto_adj_desc">求めているフレームレートになるように自動調整します。</text>
-      <icon name="icon_arrow4" />
-    </panel>
-    <panel name="settings_subpanel">
-      <text name="settings_lbl">グラフィック設定</text>
-      <text name="settings_desc">距離、水面、照明などの設定を選択します。</text>
-      <icon name="icon_arrow3" />
-    </panel>
-    <panel name="nearby_subpanel">
-      <text name="avatars_nearby_lbl">近隣のアバター</text>
-      <text name="avatars_nearby_desc">近くにいるアバターのうち、どのタイプのアバターを完全に表示するかを管理します。</text>
-      <icon name="icon_arrow2" />
-    </panel>
-    <panel name="complexity_subpanel">
-      <text name="complexity_lbl">アバターの複雑度</text>
-      <text name="complexity_info">ＦＰＳが出ない場合は、アバターの複雑度を減らしてください。</text>
-      <icon name="icon_arrow4" />
-    </panel>
-    <panel name="huds_subpanel">
-      <text name="huds_lbl">アクティブなＨＵＤ</text>
-      <text name="huds_desc">使用していないＨＵＤを外すと、速度が向上する可能性があります。</text>
-      <icon name="icon_arrow4" />
-    </panel>
-  </panel>
-  <panel filename="panel_performance_nearby.xml" name="panel_performance_nearby" />
-  <panel filename="panel_performance_complexity.xml" name="panel_performance_complexity" />
-  <panel filename="panel_performance_preferences.xml" name="panel_performance_preferences" />
-  <panel filename="panel_performance_huds.xml" name="panel_performance_huds" />
-  <panel filename="panel_performance_autoadjustments.xml" name="panel_performance_autoadjustments" />
-</floater>
\ No newline at end of file
+	<string name="fps_text" value="フレーム／秒"/>
+	<string name="max_text" value="（最大）"/>
+	<panel name="panel_top">
+		<panel name="fps_subpanel">
+			<text name="fps_value">
+				167
+			</text>
+			<text name="fps_lbl">
+				フレーム／秒
+			</text>
+			<text name="fps_desc1_lbl">
+				変更が完全に反映されるまで
+			</text>
+			<text name="fps_desc2_lbl">
+				５～１０秒程度かかります。
+			</text>
+		</panel>
+	</panel>
+	<panel name="panel_performance_main">
+		<panel name="autoadjustments_subpanel">
+			<text name="auto_adj_lbl">
+				自動調整設定（推奨）
+			</text>
+			<text name="auto_adj_desc">
+				求めているフレームレートになるように自動調整します。
+			</text>
+			<icon name="icon_arrow4"/>
+		</panel>
+		<panel name="settings_subpanel">
+			<text name="settings_lbl">
+				グラフィック設定
+			</text>
+			<text name="settings_desc">
+				距離、水面、照明などの設定を選択します。
+			</text>
+			<icon name="icon_arrow3"/>
+		</panel>
+		<panel name="nearby_subpanel">
+			<text name="avatars_nearby_lbl">
+				近隣のアバター
+			</text>
+			<text name="avatars_nearby_desc">
+				近くにいるアバターのうち、どのタイプのアバターを完全に表示するかを管理します。
+			</text>
+			<icon name="icon_arrow2"/>
+		</panel>
+		<panel name="complexity_subpanel">
+			<text name="complexity_lbl">
+				アバターの複雑度
+			</text>
+			<text name="complexity_info">
+				ＦＰＳが出ない場合は、アバターの複雑度を減らしてください。
+			</text>
+			<icon name="icon_arrow4"/>
+		</panel>
+		<panel name="huds_subpanel">
+			<text name="huds_lbl">
+				アクティブなＨＵＤ
+			</text>
+			<text name="huds_desc">
+				使用していないＨＵＤを外すと、速度が向上する可能性があります。
+			</text>
+			<icon name="icon_arrow4"/>
+		</panel>
+	</panel>
+	<panel filename="panel_performance_nearby.xml" name="panel_performance_nearby"/>
+	<panel filename="panel_performance_complexity.xml" name="panel_performance_complexity"/>
+	<panel filename="panel_performance_preferences.xml" name="panel_performance_preferences"/>
+	<panel filename="panel_performance_huds.xml" name="panel_performance_huds"/>
+	<panel filename="panel_performance_autoadjustments.xml" name="panel_performance_autoadjustments"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_perms_default.xml b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
index 8fa98e8665..0dfeadde93 100644
--- a/indra/newview/skins/default/xui/ja/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
@@ -1,21 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="デフォルトの作成権限">
-  <panel label="デフォルト権限" name="default permissions">
-    <text name="label_1">次の所有者：</text>
-    <text name="label_2">コピー</text>
-    <text name="label_3">修正</text>
-    <text name="label_4">再販・譲渡</text>
-    <text name="label_5">グループで共同管理</text>
-    <text name="label_6">誰に対してもコピーを許可</text>
-    <text name="label_7" tool_tip="オブジェクトを作成するときに、デフォルトの権限を設定する。">オブジェクト</text>
-    <text name="label_8" tool_tip="アップロードしたアイテムに、デフォルトの権限を設定する。">アップロード</text>
-    <text name="label_9" tool_tip="スクリプトを作成するときに、デフォルトの権限を設定する。">スクリプト</text>
-    <text name="label_10" tool_tip="ノートカードを作成するときに、デフォルトの権限を設定する。">ノートカード</text>
-    <text name="label_11" tool_tip="ジェスチャーを作成するときに、デフォルトの権限を設定する。">ジェスチャー</text>
-    <text name="label_12" tool_tip="衣服装またはボディパーツを作成するときに、デフォルトの権限を設定する。">装着するもの</text>
-    <text name="label_13" tool_tip="自然環境の設定を作成するときに、デフォルトの権限を設定する。">設定</text>
-    <check_box name="env_settings_c" value="true" />
-  </panel>
-  <button label="ＯＫ" label_selected="ＯＫ" name="ok" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel" />
-</floater>
\ No newline at end of file
+	<panel label="デフォルト権限" name="default permissions">
+		<text name="label_1">
+			次の所有者：
+		</text>
+		<text name="label_2">
+			コピー
+		</text>
+		<text name="label_3">
+			修正
+		</text>
+		<text name="label_4">
+			再販・譲渡
+		</text>
+		<text name="label_5">
+			グループで共同管理
+		</text>
+		<text name="label_6">
+			誰に対してもコピーを許可
+		</text>
+		<text name="label_7" tool_tip="オブジェクトを作成するときに、デフォルトの権限を設定する。">
+			オブジェクト
+		</text>
+		<text name="label_8" tool_tip="アップロードしたアイテムに、デフォルトの権限を設定する。">
+			アップロード
+		</text>
+		<text name="label_9" tool_tip="スクリプトを作成するときに、デフォルトの権限を設定する。">
+			スクリプト
+		</text>
+		<text name="label_10" tool_tip="ノートカードを作成するときに、デフォルトの権限を設定する。">
+			ノートカード
+		</text>
+		<text name="label_11" tool_tip="ジェスチャーを作成するときに、デフォルトの権限を設定する。">
+			ジェスチャー
+		</text>
+		<text name="label_12" tool_tip="衣服装またはボディパーツを作成するときに、デフォルトの権限を設定する。">
+			装着するもの
+		</text>
+		<text name="label_13" tool_tip="自然環境の設定を作成するときに、デフォルトの権限を設定する。">
+			設定
+		</text>
+		<check_box name="env_settings_c" value="true"/>
+	</panel>
+	<button label="ＯＫ" label_selected="ＯＫ" name="ok"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pick_track.xml b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
index 24213982dd..11265e6d38 100644
--- a/indra/newview/skins/default/xui/ja/floater_pick_track.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pick_track.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="track picker" title="選択：トラック">
-  <layout_stack name="adjuster">
-    <layout_panel name="pnl_desc">
-      <text name="select_description">空のソースを選択：</text>
-    </layout_panel>
-    <layout_panel name="pnl_traks">
-      <radio_group name="track_selection">
-        <radio_item label="空４[ALT]" name="radio_sky4" value="4" />
-        <radio_item label="空３[ALT]" name="radio_sky3" value="3" />
-        <radio_item label="空２[ALT]" name="radio_sky2" value="2" />
-        <radio_item label="地面" name="radio_sky1" value="1" />
-      </radio_group>
-    </layout_panel>
-    <layout_panel name="pnl_ok_cancel">
-      <button label="ＯＫ" label_selected="ＯＫ" name="btn_select" />
-      <button label="キャンセル" label_selected="キャンセル" name="btn_cancel" />
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<layout_stack name="adjuster">
+		<layout_panel name="pnl_desc">
+			<text name="select_description">
+				空のソースを選択：
+			</text>
+		</layout_panel>
+		<layout_panel name="pnl_traks">
+			<radio_group name="track_selection">
+				<radio_item label="空４[ALT]" name="radio_sky4" value="4"/>
+				<radio_item label="空３[ALT]" name="radio_sky3" value="3"/>
+				<radio_item label="空２[ALT]" name="radio_sky2" value="2"/>
+				<radio_item label="地面" name="radio_sky1" value="1"/>
+			</radio_group>
+		</layout_panel>
+		<layout_panel name="pnl_ok_cancel">
+			<button label="ＯＫ" label_selected="ＯＫ" name="btn_select"/>
+			<button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml
index 9eefc4b054..0d167444db 100644
--- a/indra/newview/skins/default/xui/ja/floater_places.xml
+++ b/indra/newview/skins/default/xui/ja/floater_places.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_places" title="場所">
-  <panel label="場所" name="main_panel" />
-</floater>
\ No newline at end of file
+	<panel label="場所" name="main_panel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
index 94ed8ec288..91ecbb73a2 100644
--- a/indra/newview/skins/default/xui/ja/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml
@@ -1,33 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Post-Process Floater" title="ポストプロセス設定">
-  <tab_container name="Post-Process Tabs">
-    <panel label="カラー・フィルタ" name="wmiColorFilterPanel">
-      <check_box label="有効" name="wmiColorFilterToggle" />
-      <text name="wmiColorFilterBrightnessText">明度</text>
-      <text name="wmiColorFilterSaturationText">彩度</text>
-      <text name="wmiColorFilterContrastText">輝度</text>
-      <text name="wmiColorFilterBaseText">輝度の基準色</text>
-      <slider label="赤" name="wmiColorFilterBaseR" />
-      <slider label="緑" name="wmiColorFilterBaseG" />
-      <slider label="青" name="wmiColorFilterBaseB" />
-      <slider label="I" name="wmiColorFilterBaseI" />
-    </panel>
-    <panel label="暗視" name="wmiNightVisionPanel">
-      <check_box label="有効" name="wmiNightVisionToggle" />
-      <text name="wmiNightVisionBrightMultText">光の増幅（マルチ）</text>
-      <text name="wmiNightVisionNoiseSizeText">ノイズ・サイズ</text>
-      <text name="wmiNightVisionNoiseStrengthText">ノイズ強度</text>
-    </panel>
-    <panel label="ブルーム" name="wmiBloomPanel">
-      <check_box label="有効" name="wmiBloomToggle" />
-      <text name="wmiBloomExtractText">明度の抽出</text>
-      <text name="wmiBloomSizeText">ブルーム・サイズ</text>
-      <text name="wmiBloomStrengthText">ブルーム強度</text>
-    </panel>
-    <panel label="その他" name="Extras">
-      <button label="効果読み込み" label_selected="効果読み込み" name="PPLoadEffect" />
-      <button label="効果保存" label_selected="効果保存" name="PPSaveEffect" />
-      <line_editor label="効果名" name="PPEffectNameEditor" />
-    </panel>
-  </tab_container>
-</floater>
\ No newline at end of file
+	<tab_container name="Post-Process Tabs">
+		<panel label="カラー・フィルタ" name="wmiColorFilterPanel">
+			<check_box label="有効" name="wmiColorFilterToggle"/>
+			<text name="wmiColorFilterBrightnessText">
+				明度
+			</text>
+			<text name="wmiColorFilterSaturationText">
+				彩度
+			</text>
+			<text name="wmiColorFilterContrastText">
+				輝度
+			</text>
+			<text name="wmiColorFilterBaseText">
+				輝度の基準色
+			</text>
+			<slider label="赤" name="wmiColorFilterBaseR"/>
+			<slider label="緑" name="wmiColorFilterBaseG"/>
+			<slider label="青" name="wmiColorFilterBaseB"/>
+			<slider label="I" name="wmiColorFilterBaseI"/>
+		</panel>
+		<panel label="暗視" name="wmiNightVisionPanel">
+			<check_box label="有効" name="wmiNightVisionToggle"/>
+			<text name="wmiNightVisionBrightMultText">
+				光の増幅（マルチ）
+			</text>
+			<text name="wmiNightVisionNoiseSizeText">
+				ノイズ・サイズ
+			</text>
+			<text name="wmiNightVisionNoiseStrengthText">
+				ノイズ強度
+			</text>
+		</panel>
+		<panel label="ブルーム" name="wmiBloomPanel">
+			<check_box label="有効" name="wmiBloomToggle"/>
+			<text name="wmiBloomExtractText">
+				明度の抽出
+			</text>
+			<text name="wmiBloomSizeText">
+				ブルーム・サイズ
+			</text>
+			<text name="wmiBloomStrengthText">
+				ブルーム強度
+			</text>
+		</panel>
+		<panel label="その他" name="Extras">
+			<button label="効果読み込み" label_selected="効果読み込み" name="PPLoadEffect"/>
+			<button label="効果保存" label_selected="効果保存" name="PPSaveEffect"/>
+			<line_editor label="効果名" name="PPEffectNameEditor"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 56601963dc..c26bad3176 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Preferences" title="初期設定">
-  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-
-  <panel name="search_panel">
-    <search_editor label="設定を検索" name="search_prefs_edit" tool_tip="検索したい内容をここに入力してください。設定の名前またはコメントに部分的に一致する結果が表示されます。" />
-  </panel>
-
-  <tab_container name="pref core">
-    <panel label="一般" name="general" />
-    <panel label="グラフィック" name="display" />
-    <panel label="サウンドとメディア" name="audio" />
-    <panel label="チャット" name="chat" />
-    <panel label="移動と表示" name="move" />
-    <panel label="通知" name="msgs" />
-    <panel label="色" name="colors" />
-    <panel label="プライバシー" name="im" />
-    <panel label="セットアップ" name="input" />
-    <panel label="拡張" name="advanced1" />
-    <panel label="アップロード" name="uploads" />
-    <panel label="操作" name="controls" />
-  </tab_container>
-
-</floater>
\ No newline at end of file
+	<button label="ＯＫ" label_selected="ＯＫ" name="OK"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+	<panel name="search_panel">
+		<search_editor label="設定を検索" name="search_prefs_edit" tool_tip="検索したい内容をここに入力してください。設定の名前またはコメントに部分的に一致する結果が表示されます。"/>
+	</panel>
+	<tab_container name="pref core">
+		<panel label="一般" name="general"/>
+		<panel label="グラフィック" name="display"/>
+		<panel label="サウンドとメディア" name="audio"/>
+		<panel label="チャット" name="chat"/>
+		<panel label="移動と表示" name="move"/>
+		<panel label="通知" name="msgs"/>
+		<panel label="色" name="colors"/>
+		<panel label="プライバシー" name="im"/>
+		<panel label="セットアップ" name="input"/>
+		<panel label="拡張" name="advanced1"/>
+		<panel label="アップロード" name="uploads"/>
+		<panel label="操作" name="controls"/>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index 61aa90fe6a..66a416f416 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -1,133 +1,125 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="prefs_graphics_advanced" title="拡張グラフィック設定">
-
-  <!-- This block shows Advanced Settings -->
-
-  <text name="GeneralText">全般</text>
-
-  <slider label="描画距離：" name="DrawDistance" />
-  <text name="DrawDistanceMeterText2">ｍ</text>
-  <slider label="最大パーティクル数：" name="MaxParticleCount" />
-
-  <slider label="ポストプロセス品質：" name="RenderPostProcess" />
-  <text name="PostProcessText">低</text>
-
-  <check_box label="垂直同期を有効化" name="vsync" tool_tip="フレームレートをモニターのリフレッシュレートに同期させ、スムーズなパフォーマンスを実現します。" />
-
-  <text name="AvatarText">アバター</text>
-
-  <slider tool_tip="複雑なアバターがどの時点でJellyDollとして描画されるかを制御します。" label="最大複雑度：" name="IndirectMaxComplexity" />
-  <text name="IndirectMaxComplexityText">0</text>
-
-  <slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors" />
-  <text name="IndirectMaxNonImpostorsText">0</text>
-
-  <slider label="詳細：" name="AvatarMeshDetail" />
-  <text name="AvatarMeshDetailText">低</text>
-
-  <slider label="物理演算：" name="AvatarPhysicsDetail" />
-  <text name="AvatarPhysicsDetailText">低</text>
-
-  <text name="HardwareText">ハードウェア</text>
-
-  <slider label="テクスチャメモリ（㎆）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てるメモリの量を指定します。デフォルトはビデオカードの搭載メモリの値です。この値を減らすとパフォーマンスが向上する可能性がありますが、テクスチャがぼやける可能性があります。" />
-
-  <slider label="フォグの距離比率：" name="fog" />
-
-  <slider label="ガンマ：" name="gamma" />
-  <text name="(brightness, lower is brighter)">（０がデフォルトです。低い値ほど明るくなります。）</text>
-
-  <check_box label="異方的フィルタリング（有効にすると速度が低下します）" name="ani" />
-
-  <check_box control_name="RenderCompressTextures" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリ内のテクスチャを圧縮し、色の品質をある程度犠牲にして、より高解像度のテクスチャを読み込むようにします。" />
-
-  <check_box control_name="HiDPIディスプレイのサポートを有効にする（再起動後に反映）" name="高解像度の描画のためにOpenGLを有効にします。" />
-
-  <!-- 字数制限につき「アンチエイリアシング」から「アンチエイリアス」に変更 -->
-  <text name="antialiasing label">アンチエイリアス：</text>
-  <combo_box label="アンチエイリアス" name="fsaa">
-    <combo_box.item label="無効" name="FSAADisabled" value="0" />
-    <combo_box.item label="2x" name="2x" value="2" />
-    <combo_box.item label="4x" name="4x" value="4" />
-    <combo_box.item label="8x" name="8x" value="8" />
-    <combo_box.item label="16x" name="16x" value="16" />
-  </combo_box>
-  <text name="antialiasing restart">（再起動後に反映）</text>
-  <view_border name="vert_border" />
-  <text name="MeshText">メッシュ</text>
-
-  <slider label="地形のメッシュの詳細：" name="TerrainMeshDetail" />
-  <text name="TerrainMeshDetailText">低</text>
-
-  <slider label="木：" name="TreeMeshDetail" />
-  <text name="TreeMeshDetailText">低</text>
-
-  <slider label="オブジェクト：" name="ObjectMeshDetail" />
-  <text name="ObjectMeshDetailText">低</text>
-
-  <slider label="フレキシプリム：" name="FlexibleMeshDetail" />
-  <text name="FlexibleMeshDetailText">低</text>
-
-  <text name="ShadersText">シェーダー</text>
-
-  <check_box label="透明な水" name="TransparentWater" />
-
-  <check_box label="バンプマッピングと光沢" name="BumpShiny" />
-
-  <check_box label="ローカル光源" name="LocalLights" />
-
-  <slider label="地形の詳細：" name="TerrainDetail" />
-  <text name="TerrainDetailText">低</text>
-
-  <check_box label="アバターの衣類" name="AvatarCloth" />
-
-  <text name="ReflectionsText">水面の反射：</text>
-  <combo_box name="Reflections">
-    <combo_box.item label="無し；不透明" name="0" value="-2" />
-    <combo_box.item label="無し；透明" name="0" value="-1" />
-    <combo_box.item label="最小限" name="0" value="0" />
-    <combo_box.item label="地形と樹木" name="1" value="1" />
-    <combo_box.item label="すべての静止オブジェクト" name="2" value="2" />
-    <combo_box.item label="すべてのアバターとオブジェクト" name="3" value="3" />
-    <combo_box.item label="すべて" name="4" value="4" />
-  </combo_box>
-
-  <check_box label="大気（周囲）シェーダー" name="WindLightUseAtmosShaders" />
-
-  <slider label="空：" name="SkyMeshDetail"/>
-  <text name="SkyMeshDetailText">低</text>
-
-  <check_box label="高度な光源モデル" name="UseLightShaders" />
-
-  <check_box label="アンビエントオクルージョン" name="UseSSAO" />
-
-  <check_box label="被写界深度（DoF）" name="UseDoF" />
-
-  <!--
-  <check_box control_name="RenderUseAdvancedAtmospherics" label="Advanced Atmospherics" name="UseAdvancedAtmo" top_delta="16" width="240">
-    <check_box.commit_callback function="Pref.AdvancedAtmosphericsEnable" />
-  </check_box>
-  -->
-
-  <text name="RenderShadowDetailText">影：</text>
-  <combo_box name="ShadowDetail">
-    <combo_box.item label="なし" name="0" />
-    <combo_box.item label="太陽／月" name="1" />
-    <combo_box.item label="太陽／月＋プロジェクタ" name="2" />
-  </combo_box>
-
-  <!-- End of Advanced Settings block -->
-  <view_border name="horiz_border" />
-  <button label="推奨設定値にリセット" name="Defaults" />
-
-  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
-
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-
-  <!-- These two check boxes are dummies and will never be displayed.  They are here so the control
-  variables
-are saved in a preset file. -->
-  <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxComplexity" />
-
-  <check_box label="RenderAvatarMaxNonImpostors" name="RenderAvatarMaxNonImpostors" />
-</floater>
\ No newline at end of file
+	<text name="GeneralText">
+		全般
+	</text>
+	<slider label="描画距離：" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		ｍ
+	</text>
+	<slider label="最大パーティクル数：" name="MaxParticleCount"/>
+	<slider label="ポストプロセス品質：" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		低
+	</text>
+	<check_box label="垂直同期を有効化" name="vsync" tool_tip="フレームレートをモニターのリフレッシュレートに同期させ、スムーズなパフォーマンスを実現します。"/>
+	<text name="AvatarText">
+		アバター
+	</text>
+	<slider tool_tip="複雑なアバターがどの時点でJellyDollとして描画されるかを制御します。" label="最大複雑度：" name="IndirectMaxComplexity"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="詳細：" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		低
+	</text>
+	<slider label="物理演算：" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		低
+	</text>
+	<text name="HardwareText">
+		ハードウェア
+	</text>
+	<slider label="テクスチャメモリ（㎆）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てるメモリの量を指定します。デフォルトはビデオカードの搭載メモリの値です。この値を減らすとパフォーマンスが向上する可能性がありますが、テクスチャがぼやける可能性があります。"/>
+	<slider label="フォグの距離比率：" name="fog"/>
+	<slider label="ガンマ：" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		（０がデフォルトです。低い値ほど明るくなります。）
+	</text>
+	<check_box label="異方的フィルタリング（有効にすると速度が低下します）" name="ani"/>
+	<check_box control_name="RenderCompressTextures" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリ内のテクスチャを圧縮し、色の品質をある程度犠牲にして、より高解像度のテクスチャを読み込むようにします。"/>
+	<check_box control_name="HiDPIディスプレイのサポートを有効にする（再起動後に反映）" name="高解像度の描画のためにOpenGLを有効にします。"/>
+	<text name="antialiasing label">
+		アンチエイリアス：
+	</text>
+	<combo_box label="アンチエイリアス" name="fsaa">
+		<combo_box.item label="無効" name="FSAADisabled" value="0"/>
+		<combo_box.item label="2x" name="2x" value="2"/>
+		<combo_box.item label="4x" name="4x" value="4"/>
+		<combo_box.item label="8x" name="8x" value="8"/>
+		<combo_box.item label="16x" name="16x" value="16"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		（再起動後に反映）
+	</text>
+	<view_border name="vert_border"/>
+	<text name="MeshText">
+		メッシュ
+	</text>
+	<slider label="地形のメッシュの詳細：" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		低
+	</text>
+	<slider label="木：" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		低
+	</text>
+	<slider label="オブジェクト：" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		低
+	</text>
+	<slider label="フレキシプリム：" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		低
+	</text>
+	<text name="ShadersText">
+		シェーダー
+	</text>
+	<check_box label="透明な水" name="TransparentWater"/>
+	<check_box label="バンプマッピングと光沢" name="BumpShiny"/>
+	<check_box label="ローカル光源" name="LocalLights"/>
+	<slider label="地形の詳細：" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		低
+	</text>
+	<check_box label="アバターの衣類" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		水面の反射：
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="無し；不透明" name="0" value="-2"/>
+		<combo_box.item label="無し；透明" name="0" value="-1"/>
+		<combo_box.item label="最小限" name="0" value="0"/>
+		<combo_box.item label="地形と樹木" name="1" value="1"/>
+		<combo_box.item label="すべての静止オブジェクト" name="2" value="2"/>
+		<combo_box.item label="すべてのアバターとオブジェクト" name="3" value="3"/>
+		<combo_box.item label="すべて" name="4" value="4"/>
+	</combo_box>
+	<check_box label="大気（周囲）シェーダー" name="WindLightUseAtmosShaders"/>
+	<slider label="空：" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		低
+	</text>
+	<check_box label="高度な光源モデル" name="UseLightShaders"/>
+	<check_box label="アンビエントオクルージョン" name="UseSSAO"/>
+	<check_box label="被写界深度（DoF）" name="UseDoF"/>
+	<text name="RenderShadowDetailText">
+		影：
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="なし" name="0"/>
+		<combo_box.item label="太陽／月" name="1"/>
+		<combo_box.item label="太陽／月＋プロジェクタ" name="2"/>
+	</combo_box>
+	<view_border name="horiz_border"/>
+	<button label="推奨設定値にリセット" name="Defaults"/>
+	<button label="ＯＫ" label_selected="ＯＫ" name="OK"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxComplexity"/>
+	<check_box label="RenderAvatarMaxNonImpostors" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
index 7afda68409..650667ca9e 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
@@ -1,28 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Proxy Settings Floater" title="プロキシ設定">
-  <check_box initial_value="false" label="ウェブページに HTTP プロキシを使う" name="web_proxy_enabled" />
-  <text name="http_proxy_label">HTTP プロキシ：</text>
-  <line_editor name="web_proxy_editor" tool_tip="使用する HTTP プロキシの DNS 名または IP アドレス。" />
-  <spinner label="ポート番号：" name="web_proxy_port" tool_tip="使用する HTTP プロキシポート。" />
-  <check_box label="UDP トラフィックに SOCKS 5 プロキシを使う" name="socks_proxy_enabled" />
-  <text name="socks5_proxy_label">SOCKS 5 プロキシ：</text>
-  <line_editor name="socks_proxy_editor" tool_tip="使用する SOCKS 5 プロキシの DNS 名または IP アドレス。" />
-  <spinner label="ポート番号：" name="socks_proxy_port" tool_tip="使用する SOCKS 5 プロキシポート。" />
-  <text name="socks_auth_label">SOCKS 認証：</text>
-  <radio_group name="socks5_auth_type">
-    <radio_item label="認証なし" name="Socks5NoAuth" tool_tip="Socks 5 プロキシは認証の必要がありません。" value="なし" />
-    <radio_item label="ユーザー名/パスワード" name="Socks5UserPass" tool_tip="Socks5 プロキシはユーザー名/パスワードの認証が必要です。" value="UserPass" />
-  </radio_group>
-  <text name="socks5_username_label">ユーザー名：</text>
-  <text name="socks5_password_label">パスワード：</text>
-  <line_editor name="socks5_username" tool_tip="SOCKS 5 サーバーの認証に使用されたユーザー名" />
-  <line_editor name="socks5_password" tool_tip="SOCKS 5 サーバーの認証に使用されたパスワード" />
-  <text name="other_proxy_label">他の HTTP トラフィックプロキシ：</text>
-  <radio_group name="other_http_proxy_type">
-    <radio_item label="プロキシを使用しない" name="OtherNoProxy" tool_tip="ウェブ以外の HTTP トラフィックはいずれのプロキシにもルーティングされません。" value="なし" />
-    <radio_item label="HTTP プロキシを使う" name="OtherHTTPProxy" tool_tip="ウェブ以外の HTTP は設定済みウェブプロキシを通してルーティングされます。" value="Web" />
-    <radio_item label="SOCKS 5 プロキシを使う" name="OtherSocksProxy" tool_tip="ウェブ以外の HTTP トラフィックは設定済みの Socks 5 プロキシを通してルーティングされます。" value="Socks" />
-  </radio_group>
-  <button label="ＯＫ" label_selected="ＯＫ" name="OK" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-</floater>
\ No newline at end of file
+	<check_box initial_value="false" label="ウェブページに HTTP プロキシを使う" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		HTTP プロキシ：
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="使用する HTTP プロキシの DNS 名または IP アドレス。"/>
+	<spinner label="ポート番号：" name="web_proxy_port" tool_tip="使用する HTTP プロキシポート。"/>
+	<check_box label="UDP トラフィックに SOCKS 5 プロキシを使う" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		SOCKS 5 プロキシ：
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="使用する SOCKS 5 プロキシの DNS 名または IP アドレス。"/>
+	<spinner label="ポート番号：" name="socks_proxy_port" tool_tip="使用する SOCKS 5 プロキシポート。"/>
+	<text name="socks_auth_label">
+		SOCKS 認証：
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="認証なし" name="Socks5NoAuth" tool_tip="Socks 5 プロキシは認証の必要がありません。" value="なし"/>
+		<radio_item label="ユーザー名/パスワード" name="Socks5UserPass" tool_tip="Socks5 プロキシはユーザー名/パスワードの認証が必要です。" value="UserPass"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		ユーザー名：
+	</text>
+	<text name="socks5_password_label">
+		パスワード：
+	</text>
+	<line_editor name="socks5_username" tool_tip="SOCKS 5 サーバーの認証に使用されたユーザー名"/>
+	<line_editor name="socks5_password" tool_tip="SOCKS 5 サーバーの認証に使用されたパスワード"/>
+	<text name="other_proxy_label">
+		他の HTTP トラフィックプロキシ：
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="プロキシを使用しない" name="OtherNoProxy" tool_tip="ウェブ以外の HTTP トラフィックはいずれのプロキシにもルーティングされません。" value="なし"/>
+		<radio_item label="HTTP プロキシを使う" name="OtherHTTPProxy" tool_tip="ウェブ以外の HTTP は設定済みウェブプロキシを通してルーティングされます。" value="Web"/>
+		<radio_item label="SOCKS 5 プロキシを使う" name="OtherSocksProxy" tool_tip="ウェブ以外の HTTP トラフィックは設定済みの Socks 5 プロキシを通してルーティングされます。" value="Socks"/>
+	</radio_group>
+	<button label="ＯＫ" label_selected="ＯＫ" name="OK"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
index 68bd58f3db..5efbbf7e17 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterpreferencesviewadvanced" title="カメラの位置">
-  <text name="camera_offset_lbl">カメラのオフセット：</text>
-  <spinner name="camera_x" />
-  <spinner label="Ｙ" name="camera_y" />
-  <spinner label="Ｚ" name="camera_z" />
-  <text name="focus_offset_lbl">焦点のオフセット：</text>
-  <spinner name="focus_x" />
-  <spinner label="Ｙ" name="focus_y" />
-  <spinner label="Ｚ" name="focus_z" />
-  <text name="offset_scale_lbl">カメラのオフセット倍率：</text>
-  <slider name="offset_scale_sld" />
-  <spinner name="offset_scale_ctrl" />
-</floater>
\ No newline at end of file
+	<text name="camera_offset_lbl">
+		カメラのオフセット：
+	</text>
+	<spinner name="camera_x"/>
+	<spinner label="Ｙ" name="camera_y"/>
+	<spinner label="Ｚ" name="camera_z"/>
+	<text name="focus_offset_lbl">
+		焦点のオフセット：
+	</text>
+	<spinner name="focus_x"/>
+	<spinner label="Ｙ" name="focus_y"/>
+	<spinner label="Ｚ" name="focus_z"/>
+	<text name="offset_scale_lbl">
+		カメラのオフセット倍率：
+	</text>
+	<slider name="offset_scale_sld"/>
+	<spinner name="offset_scale_ctrl"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index c7295e3532..655a58a3aa 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim">
-  <floater.string name="Title">アニメーション：[NAME]</floater.string>
-  <text name="desc txt">説明：</text>
-  <button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人から見えるように再生します。" />
-  <button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生します。" />
-</floater>
\ No newline at end of file
+	<floater.string name="Title">
+		アニメーション：[NAME]
+	</floater.string>
+	<text name="desc txt">
+		説明：
+	</text>
+	<button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人から見えるように再生します。"/>
+	<button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生します。"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 10f4a61ca2..e588bba107 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -1,41 +1,73 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
-  <floater.string name="step_anim">再生するアニメーション：</floater.string>
-  <floater.string name="step_sound">再生するサウンド：</floater.string>
-  <floater.string name="step_chat">発言するチャット：</floater.string>
-  <floater.string name="step_wait">待機：</floater.string>
-  <floater.string name="stop_txt">停止</floater.string>
-  <floater.string name="preview_txt">プレビュー</floater.string>
-  <floater.string name="none_text">－なし－</floater.string>
-  <floater.string name="Title">ジェスチャー：[NAME]</floater.string>
-  <text name="desc_label">説明：</text>
-  <text name="trigger_label">トリガー：</text>
-  <text name="replace_text" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。">置換：</text>
-  <line_editor name="replace_editor" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。" />
-  <text name="key_label">ショートカット：</text>
-  <combo_box label="なし" name="modifier_combo" />
-  <combo_box label="なし" name="key_combo" />
-  <text name="library_label">ライブラリ：</text>
-  <scroll_list name="library_list">
-    <scroll_list.rows name="action_animation" value="アニメーション" />
-    <scroll_list.rows name="action_sound" value="サウンド" />
-    <scroll_list.rows name="action_chat" value="チャット" />
-    <scroll_list.rows name="action_wait" value="待機" />
-  </scroll_list>
-  <button label="追加＞＞" name="add_btn" />
-  <text name="steps_label">手順：</text>
-  <button label="上" name="up_btn" />
-  <button label="下" name="down_btn" />
-  <button label="削除" name="delete_btn" />
-  <text name="options_text">（オプション）</text>
-  <radio_group name="animation_trigger_type">
-    <radio_item label="開始" name="start" />
-    <radio_item label="停止" name="stop" />
-  </radio_group>
-  <check_box label="アニメーションが完了するまで" name="wait_anim_check" />
-  <check_box label="時間（秒）：" name="wait_time_check" />
-  <text name="help_label">待機ステップを入れていない場合、すべてのステップが同時に実行されます。</text>
-  <check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーとなる語句を入力するか、ホットキーを押すことで実行されます。通常、同じキーバインディングを使用するゼスチャーがある場合、そのゼスチャーは非アクティブになります。" />
-  <button label="プレビュー" name="preview_btn" />
-  <button label="保存" name="save_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="step_anim">
+		再生するアニメーション：
+	</floater.string>
+	<floater.string name="step_sound">
+		再生するサウンド：
+	</floater.string>
+	<floater.string name="step_chat">
+		発言するチャット：
+	</floater.string>
+	<floater.string name="step_wait">
+		待機：
+	</floater.string>
+	<floater.string name="stop_txt">
+		停止
+	</floater.string>
+	<floater.string name="preview_txt">
+		プレビュー
+	</floater.string>
+	<floater.string name="none_text">
+		－なし－
+	</floater.string>
+	<floater.string name="Title">
+		ジェスチャー：[NAME]
+	</floater.string>
+	<text name="desc_label">
+		説明：
+	</text>
+	<text name="trigger_label">
+		トリガー：
+	</text>
+	<text name="replace_text" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。">
+		置換：
+	</text>
+	<line_editor name="replace_editor" tool_tip="トリガーワードをこれらの単語に置き換えます。たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"/>
+	<text name="key_label">
+		ショートカット：
+	</text>
+	<combo_box label="なし" name="modifier_combo"/>
+	<combo_box label="なし" name="key_combo"/>
+	<text name="library_label">
+		ライブラリ：
+	</text>
+	<scroll_list name="library_list">
+		<scroll_list.rows name="action_animation" value="アニメーション"/>
+		<scroll_list.rows name="action_sound" value="サウンド"/>
+		<scroll_list.rows name="action_chat" value="チャット"/>
+		<scroll_list.rows name="action_wait" value="待機"/>
+	</scroll_list>
+	<button label="追加＞＞" name="add_btn"/>
+	<text name="steps_label">
+		手順：
+	</text>
+	<button label="上" name="up_btn"/>
+	<button label="下" name="down_btn"/>
+	<button label="削除" name="delete_btn"/>
+	<text name="options_text">
+		（オプション）
+	</text>
+	<radio_group name="animation_trigger_type">
+		<radio_item label="開始" name="start"/>
+		<radio_item label="停止" name="stop"/>
+	</radio_group>
+	<check_box label="アニメーションが完了するまで" name="wait_anim_check"/>
+	<check_box label="時間（秒）：" name="wait_time_check"/>
+	<text name="help_label">
+		待機ステップを入れていない場合、すべてのステップが同時に実行されます。
+	</text>
+	<check_box label="アクティブ" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーとなる語句を入力するか、ホットキーを押すことで実行されます。通常、同じキーバインディングを使用するゼスチャーがある場合、そのゼスチャーは非アクティブになります。"/>
+	<button label="プレビュー" name="preview_btn"/>
+	<button label="保存" name="save_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
index eb97279249..5debd63256 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="ノートカード：">
-  <floater.string name="no_object">このノートカードが含まれたオブジェクトが見つかりません。</floater.string>
-  <floater.string name="not_allowed">このノートを見る権限がありません。</floater.string>
-  <floater.string name="Title">ノートカード：[NAME]</floater.string>
-  <text name="desc txt">説明：</text>
-  <text_editor name="Notecard Editor">読み込んでいます…</text_editor>
-  <button label="編集…" label_selected="編集" name="Edit" />
-  <button label="保存" label_selected="保存" name="Save" />
-  <button label="削除" label_selected="削除" name="Delete" />
-</floater>
\ No newline at end of file
+	<floater.string name="no_object">
+		このノートカードが含まれたオブジェクトが見つかりません。
+	</floater.string>
+	<floater.string name="not_allowed">
+		このノートを見る権限がありません。
+	</floater.string>
+	<floater.string name="Title">
+		ノートカード：[NAME]
+	</floater.string>
+	<text name="desc txt">
+		説明：
+	</text>
+	<text_editor name="Notecard Editor">
+		読み込んでいます…
+	</text_editor>
+	<button label="編集…" label_selected="編集" name="Edit"/>
+	<button label="保存" label_selected="保存" name="Save"/>
+	<button label="削除" label_selected="削除" name="Delete"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index 9eef0cc5e3..eca4e482f7 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_sound">
-  <floater.string name="Title">サウンド：[NAME]</floater.string>
-  <text name="desc txt">説明：</text>
-  <button label="インワールドで再生" label_selected="インワールドで再生" name="Sound play btn" tool_tip="他人からも聞こえるように再生します。" />
-  <button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分のみ聞こえるように再生します。" />
-</floater>
\ No newline at end of file
+	<floater.string name="Title">
+		サウンド：[NAME]
+	</floater.string>
+	<text name="desc txt">
+		説明：
+	</text>
+	<button label="インワールドで再生" label_selected="インワールドで再生" name="Sound play btn" tool_tip="他人からも聞こえるように再生します。"/>
+	<button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分のみ聞こえるように再生します。"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index c9713e3d43..cc624d43d3 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_texture">
-  <floater.string name="Title">テクスチャ：[NAME]</floater.string>
-  <floater.string name="Copy">インベントリにコピー</floater.string>
-  <layout_stack name="preview_stack">
-    <layout_panel name="texture_panel">
-      <text name="desc txt">説明：</text>
-      <text name="dimensions">[WIDTH]px✕[HEIGHT]px</text>
-      <text name="aspect_ratio">縦横比のプレビュー</text>
-      <combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー" />
-    </layout_panel>
-    <layout_panel name="buttons_panel">
-      <button label="ＯＫ" name="Keep" />
-      <button label="破棄" name="Discard" />
-      <button label="名前をつけて保存" name="save_tex_btn" />
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<floater.string name="Title">
+		テクスチャ：[NAME]
+	</floater.string>
+	<floater.string name="Copy">
+		インベントリにコピー
+	</floater.string>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				説明：
+			</text>
+			<text name="dimensions">
+				[WIDTH]px✕[HEIGHT]px
+			</text>
+			<text name="aspect_ratio">
+				縦横比のプレビュー
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="ＯＫ" name="Keep"/>
+			<button label="破棄" name="Discard"/>
+			<button label="名前をつけて保存" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
index 728256b324..afb68e5944 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_preview_trash" title="ゴミ箱">
-  <inventory_panel name="inventory_trash" />
-  <layout_stack name="button_panel_ls">
-    <layout_panel name="empty_btn_lp">
-      <button label="ゴミ箱を空に" name="empty_btn"/>
-    </layout_panel>
-    <layout_panel name="share_btn_lp">
-      <button label="キャンセル" name="cancel_btn" />
-    </layout_panel>
-  </layout_stack>
+	<inventory_panel name="inventory_trash"/>
+	<layout_stack name="button_panel_ls">
+		<layout_panel name="empty_btn_lp">
+			<button label="ゴミ箱を空に" name="empty_btn"/>
+		</layout_panel>
+		<layout_panel name="share_btn_lp">
+			<button label="キャンセル" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
index 57f7946ecb..86ca80e112 100644
--- a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="price_for_listing" title="クラシファイド広告の掲載">
-  <text name="explanation_text">あなたのクラシファイド広告は、公開された日から１週間有効です。
+	<text name="explanation_text">
+		あなたのクラシファイド広告は、公開された日から１週間有効です。
 クラシファイドリストのあなたの広告の位置は、広告費をいくら支払うかで決まります。
 
-最高金額を支払った広告がリストのトップに載り、検索で上位に表示されます。</text>
-  <text name="price_text">広告掲載費：</text>
-  <text name="price_symbol">L$ </text>
-  <button label="ＯＫ" name="set_price_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+最高金額を支払った広告がリストのトップに載り、検索で上位に表示されます。
+	</text>
+	<text name="price_text">
+		広告掲載費：
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="ＯＫ" name="set_price_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_profile.xml b/indra/newview/skins/default/xui/ja/floater_profile.xml
index 303a95baac..b074d4a987 100644
--- a/indra/newview/skins/default/xui/ja/floater_profile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_profile.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarinfo" title="プロフィール">
-  <panel name="panel_profile_view">
-    <tab_container name="panel_profile_tabs">
-      <panel label="Second Life" name="panel_profile_secondlife" />
-      <panel label="Web" name="panel_profile_web" />
-      <panel label="趣味" name="panel_profile_interests" />
-      <panel label="ピック" name="panel_profile_picks" />
-      <panel label="クラシファイド広告" name="panel_profile_classifieds" />
-      <panel label="リアルライフ（現実世界）" name="panel_profile_firstlife" />
-      <panel label="メモ" name="panel_profile_notes" />
-    </tab_container>
-    <button label="ＯＫ" name="ok_btn" tool_tip="プロフィールの変更を保存して閉じる" />
-    <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-  </panel>
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="趣味" name="panel_profile_interests"/>
+			<panel label="ピック" name="panel_profile_picks"/>
+			<panel label="クラシファイド広告" name="panel_profile_classifieds"/>
+			<panel label="リアルライフ（現実世界）" name="panel_profile_firstlife"/>
+			<panel label="メモ" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="ＯＫ" name="ok_btn" tool_tip="プロフィールの変更を保存して閉じる"/>
+		<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml b/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
index 18e19cf11c..9605d46ef7 100644
--- a/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
+++ b/indra/newview/skins/default/xui/ja/floater_profile_permissions.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="profile_permissions">
-  <string name="description_string" value="エージェントの[AGENT_NAME]に許可：" />
-  <text name="perm_description" value="許可するエージェント：" />
-  <check_box name="online_check" label="自分のオンライン状況" />
-  <check_box name="map_check" label="ワールドマップ上の自分の位置" />
-  <check_box name="objects_check" label="自分の土地からの自分のオブジェクトの編集、削除、または取得" />
-  <button name="perms_btn_ok" label="ＯＫ" />
-  <button name="perms_btn_cancel" label="キャンセル" />
-</floater>
\ No newline at end of file
+	<string name="description_string" value="エージェントの[AGENT_NAME]に許可："/>
+	<text name="perm_description" value="許可するエージェント："/>
+	<check_box name="online_check" label="自分のオンライン状況"/>
+	<check_box name="map_check" label="ワールドマップ上の自分の位置"/>
+	<check_box name="objects_check" label="自分の土地からの自分のオブジェクトの編集、削除、または取得"/>
+	<button name="perms_btn_ok" label="ＯＫ"/>
+	<button name="perms_btn_cancel" label="キャンセル"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_texture.xml b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml
index 384a4ab028..d4b5efa2c7 100644
--- a/indra/newview/skins/default/xui/ja/floater_profile_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="profile_texture">
-  <layout_stack name="preview_stack">
-    <layout_panel name="texture_panel">
-      <icon name="profile_pic" />
-    </layout_panel>
-    <layout_panel name="buttons_panel">
-      <layout_stack name="buttons_stack">
-        <layout_panel name="resizer_left" />
-        <layout_panel name="close_panel">
-          <button label="閉じる" name="close_btn" />
-        </layout_panel>
-        <layout_panel name="resizer_right" />
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<icon name="profile_pic"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<layout_stack name="buttons_stack">
+				<layout_panel name="resizer_left"/>
+				<layout_panel name="close_panel">
+					<button label="閉じる" name="close_btn"/>
+				</layout_panel>
+				<layout_panel name="resizer_right"/>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
index a719124db5..bdfc497746 100644
--- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="publish_classified" title="クラシファイド広告掲載">
-  <text name="explanation_text">あなたのクラシファイド広告は、掲載された日から１週間有効です。
+	<text name="explanation_text">
+		あなたのクラシファイド広告は、掲載された日から１週間有効です。
 
-クラシファイド広告は返金できませんのでご了承ください。</text>
-  <spinner label="掲載費：L$" name="price_for_listing" tool_tip="掲載価格" value="50" />
-  <text name="l$_text" value="L$" />
-  <text name="more_info_text">詳しい情報（クラシファイドヘルプへのリンク）</text>
-  <button label="掲載する" name="publish_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+クラシファイド広告は返金できませんのでご了承ください。
+	</text>
+	<spinner label="掲載費：L$" name="price_for_listing" tool_tip="掲載価格" value="50"/>
+	<text name="l$_text" value="L$"/>
+	<text name="more_info_text">
+		詳しい情報（クラシファイドヘルプへのリンク）
+	</text>
+	<button label="掲載する" name="publish_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
index ba673208bb..bbc23408d6 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="region_debug_console" title="リージョン（地域）のデバッグ" />
+<floater name="region_debug_console" title="リージョン（地域）のデバッグ"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
index 85ae83ae66..9e07cf5363 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="リージョン（地域）／不動産" />
+<floater name="regioninfo" title="リージョン（地域）／不動産"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_region_restarting.xml b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
index 810f32ea24..27ffa95bdb 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="region_restarting" title="リージョンの再起動">
-  <string name="RegionName">現在あなたがいるリージョン「[NAME]」は、再起動しようとしています。
+	<string name="RegionName">
+		現在あなたがいるリージョン「[NAME]」は、再起動しようとしています。
 
-このまま、この場所にいるとログアウトされます。</string>
-  <string name="RestartSeconds">再起動まであと
-[SECONDS]秒</string>
-  <panel name="layout_panel_1">
-    <text name="region_name">現在あなたがいるリージョン「-最長リージョン名-」は、再起動しようとしています。
+このまま、この場所にいるとログアウトされます。
+	</string>
+	<string name="RestartSeconds">
+		再起動まであと
+[SECONDS]秒
+	</string>
+	<panel name="layout_panel_1">
+		<text name="region_name">
+			現在あなたがいるリージョン「-最長リージョン名-」は、再起動しようとしています。
 
-このまま、この場所にいるとログアウトされます。</text>
-    <text name="restart_seconds">再起動まであと
-32767秒</text>
-  </panel>
-</floater>
\ No newline at end of file
+このまま、この場所にいるとログアウトされます。
+		</text>
+		<text name="restart_seconds">
+			再起動まであと
+32767秒
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index f232dee5ab..58c7233e98 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -1,67 +1,103 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="嫌がらせの報告">
-  <floater.string name="Screenshot">スクリーンショット</floater.string>
-  <check_box label="このスクリーンショットを使用" name="screen_check" />
-  <text name="reporter_title">報告者：</text>
-  <text name="reporter_field">Loremipsum Dolorsitamut Longnamez</text>
-  <text name="sim_title">リージョン（地域）：</text>
-  <text name="sim_field">リージョン（地域）名</text>
-  <text name="pos_title">位置：</text>
-  <text name="pos_field">{128.1, 128.1, 15.4}</text>
-  <text name="select_object_label">ボタンをクリックしてから、悪意のあるオブジェクトをクリック：</text>
-  <button label="" label_selected="" name="pick_btn" tool_tip="オブジェクトピッカー - 報告対象のオブジェクトを選択してください" />
-  <text name="object_name_label">オブジェクト：</text>
-  <text name="object_name">Consetetur Sadipscing</text>
-  <text name="owner_name_label">所有者：</text>
-  <text name="owner_name">Hendrerit Vulputate Kamawashi Longname</text>
-  <combo_box name="category_combo" tool_tip="カテゴリ－この報告に最も適したカテゴリを選択してください">
-    <combo_box.item label="カテゴリを選択してください" name="Select_category" />
-    <combo_box.item label="年齢＞年齢偽証" name="Age__Age_play" />
-    <combo_box.item label="年齢＞成人の住人が Teen Second Life にいる" name="Age__Adult_resident_on_Teen_Second_Life" />
-    <combo_box.item label="年齢＞未成年の住人がTeen Second Life の外にいる" name="Age__Underage_resident_outside_of_Teen_Second_Life" />
-    <combo_box.item label="攻撃＞コンバット・サンドボックス/危険なエリア" name="Assault__Combat_sandbox___unsafe_area" />
-    <combo_box.item label="攻撃＞安全エリアで他の住人を銃撃、プッシュ、または突き飛ばす" name="Assault__Safe_area" />
-    <combo_box.item label="攻撃＞武器テスト用サンドボックス" name="Assault__Weapons_testing_sandbox" />
-    <combo_box.item label="商取引＞製品またはサービスの提供が行われない" name="Commerce__Failure_to_deliver_product_or_service" />
-    <combo_box.item label="開示＞リアルワールドの情報" name="Disclosure__Real_world_information" />
-    <combo_box.item label="開示＞離れたところからチャットをモニターしている" name="Disclosure__Remotely_monitoring chat" />
-    <combo_box.item label="開示＞Second Life の情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs" />
-    <combo_box.item label="平穏を乱す行為＞地域リソースの使用が不公平" name="Disturbing_the_peace__Unfair_use_of_region_resources" />
-    <combo_box.item label="平穏を乱す行為＞スクリプト・オブジェクトの乱用" name="Disturbing_the_peace__Excessive_scripted_objects" />
-    <combo_box.item label="平穏を乱す行為＞オブジェクトの捨て置き" name="Disturbing_the_peace__Object_littering" />
-    <combo_box.item label="平穏を乱す行為＞繰り返しスパム" name="Disturbing_the_peace__Repetitive_spam" />
-    <combo_box.item label="平穏を乱す行為＞不要な広告スパム" name="Disturbing_the_peace__Unwanted_advert_spam" />
-    <combo_box.item label="詐欺＞ L$" name="Fraud__L$" />
-    <combo_box.item label="詐欺＞土地" name="Fraud__Land" />
-    <combo_box.item label="詐欺＞マルチ商法またはチェーンメール" name="Fraud__Pyramid_scheme_or_chain_letter" />
-    <combo_box.item label="詐欺＞リンデンドルまたは米ドル" name="Fraud__US$" />
-    <combo_box.item label="嫌がらせ＞広告委託/視覚的なスパム" name="Harassment__Advert_farms___visual_spam" />
-    <combo_box.item label="嫌がらせ＞個人またはグループの中傷" name="Harassment__Defaming_individuals_or_groups" />
-    <combo_box.item label="嫌がらせ＞移動の妨害" name="Harassment__Impeding_movement" />
-    <combo_box.item label="嫌がらせ＞性的な嫌がらせ" name="Harassment__Sexual_harassment" />
-    <combo_box.item label="ハラスメント＞対象者を定めて嫌がらせを目的とした行為" name="Harassment__Solicting_inciting_others_to_violate_ToS" />
-    <combo_box.item label="嫌がらせ＞暴言" name="Harassment__Verbal_abuse" />
-    <combo_box.item label="猥褻＞著しく不快であると見なされるコンテンツまたは行為" name="Indecency__Broadly_offensive_content_or_conduct" />
-    <combo_box.item label="猥褻＞不適切なアバター名" name="Indecency__Inappropriate_avatar_name" />
-    <combo_box.item label="猥褻＞リージョン（地域）のレーティング区分に対して不適切なコンテンツまたは行為" name="Indecency__Mature_content_in_PG_region" />
-    <combo_box.item label="猥褻＞「Moderate」指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region" />
-    <combo_box.item label="知的財産の侵害＞コンテンツの撤去" name="Intellectual_property_infringement_Content_Removal" />
-    <combo_box.item label="知的財産の侵害＞コピーBot及び権限の悪用" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" />
-    <combo_box.item label="不寛容" name="Intolerance" />
-    <combo_box.item label="土地＞サンドボックスのリソースの乱用" name="Land__Abuse_of_sandbox_resources" />
-    <combo_box.item label="土地＞不法侵入＞オブジェクトまたはテクスチャ" name="Land__Encroachment__Objects_textures" />
-    <combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles" />
-    <combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants" />
-    <combo_box.item label="スキルゲーミング ポリシー違反" name="Wagering_gambling" />
-    <combo_box.item label="その他" name="Other" />
-  </combo_box>
-  <text name="abuser_name_title">迷惑ユーザーの名前：</text>
-  <button label="選択" label_selected="" name="select_abuser" tool_tip="嫌がらせをした人の名前をリストから選択してください。" />
-  <text name="abuser_name_title2">嫌がらせを受けた場所：</text>
-  <text name="sum_title">概要：</text>
-  <text name="dscr_title">詳細：</text>
-  <text name="bug_aviso">できるだけ具体的に詳しく記入してください。</text>
-  <text name="incomplete_title">* 不完全な報告は調査対象になりません。</text>
-  <button label="嫌がらせを報告する" label_selected="嫌がらせを報告する" name="send_btn" />
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="Screenshot">
+		スクリーンショット
+	</floater.string>
+	<check_box label="このスクリーンショットを使用" name="screen_check"/>
+	<text name="reporter_title">
+		報告者：
+	</text>
+	<text name="reporter_field">
+		Loremipsum Dolorsitamut Longnamez
+	</text>
+	<text name="sim_title">
+		リージョン（地域）：
+	</text>
+	<text name="sim_field">
+		リージョン（地域）名
+	</text>
+	<text name="pos_title">
+		位置：
+	</text>
+	<text name="pos_field">
+		{128.1, 128.1, 15.4}
+	</text>
+	<text name="select_object_label">
+		ボタンをクリックしてから、悪意のあるオブジェクトをクリック：
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="オブジェクトピッカー - 報告対象のオブジェクトを選択してください"/>
+	<text name="object_name_label">
+		オブジェクト：
+	</text>
+	<text name="object_name">
+		Consetetur Sadipscing
+	</text>
+	<text name="owner_name_label">
+		所有者：
+	</text>
+	<text name="owner_name">
+		Hendrerit Vulputate Kamawashi Longname
+	</text>
+	<combo_box name="category_combo" tool_tip="カテゴリ－この報告に最も適したカテゴリを選択してください">
+		<combo_box.item label="カテゴリを選択してください" name="Select_category"/>
+		<combo_box.item label="年齢＞年齢偽証" name="Age__Age_play"/>
+		<combo_box.item label="年齢＞成人の住人が Teen Second Life にいる" name="Age__Adult_resident_on_Teen_Second_Life"/>
+		<combo_box.item label="年齢＞未成年の住人がTeen Second Life の外にいる" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+		<combo_box.item label="攻撃＞コンバット・サンドボックス/危険なエリア" name="Assault__Combat_sandbox___unsafe_area"/>
+		<combo_box.item label="攻撃＞安全エリアで他の住人を銃撃、プッシュ、または突き飛ばす" name="Assault__Safe_area"/>
+		<combo_box.item label="攻撃＞武器テスト用サンドボックス" name="Assault__Weapons_testing_sandbox"/>
+		<combo_box.item label="商取引＞製品またはサービスの提供が行われない" name="Commerce__Failure_to_deliver_product_or_service"/>
+		<combo_box.item label="開示＞リアルワールドの情報" name="Disclosure__Real_world_information"/>
+		<combo_box.item label="開示＞離れたところからチャットをモニターしている" name="Disclosure__Remotely_monitoring chat"/>
+		<combo_box.item label="開示＞Second Life の情報/チャット/IM" name="Disclosure__Second_Life_information_chat_IMs"/>
+		<combo_box.item label="平穏を乱す行為＞地域リソースの使用が不公平" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
+		<combo_box.item label="平穏を乱す行為＞スクリプト・オブジェクトの乱用" name="Disturbing_the_peace__Excessive_scripted_objects"/>
+		<combo_box.item label="平穏を乱す行為＞オブジェクトの捨て置き" name="Disturbing_the_peace__Object_littering"/>
+		<combo_box.item label="平穏を乱す行為＞繰り返しスパム" name="Disturbing_the_peace__Repetitive_spam"/>
+		<combo_box.item label="平穏を乱す行為＞不要な広告スパム" name="Disturbing_the_peace__Unwanted_advert_spam"/>
+		<combo_box.item label="詐欺＞ L$" name="Fraud__L$"/>
+		<combo_box.item label="詐欺＞土地" name="Fraud__Land"/>
+		<combo_box.item label="詐欺＞マルチ商法またはチェーンメール" name="Fraud__Pyramid_scheme_or_chain_letter"/>
+		<combo_box.item label="詐欺＞リンデンドルまたは米ドル" name="Fraud__US$"/>
+		<combo_box.item label="嫌がらせ＞広告委託/視覚的なスパム" name="Harassment__Advert_farms___visual_spam"/>
+		<combo_box.item label="嫌がらせ＞個人またはグループの中傷" name="Harassment__Defaming_individuals_or_groups"/>
+		<combo_box.item label="嫌がらせ＞移動の妨害" name="Harassment__Impeding_movement"/>
+		<combo_box.item label="嫌がらせ＞性的な嫌がらせ" name="Harassment__Sexual_harassment"/>
+		<combo_box.item label="ハラスメント＞対象者を定めて嫌がらせを目的とした行為" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
+		<combo_box.item label="嫌がらせ＞暴言" name="Harassment__Verbal_abuse"/>
+		<combo_box.item label="猥褻＞著しく不快であると見なされるコンテンツまたは行為" name="Indecency__Broadly_offensive_content_or_conduct"/>
+		<combo_box.item label="猥褻＞不適切なアバター名" name="Indecency__Inappropriate_avatar_name"/>
+		<combo_box.item label="猥褻＞リージョン（地域）のレーティング区分に対して不適切なコンテンツまたは行為" name="Indecency__Mature_content_in_PG_region"/>
+		<combo_box.item label="猥褻＞「Moderate」指定の地域での不適切なコンテンツまたは行為" name="Indecency__Inappropriate_content_in_Mature_region"/>
+		<combo_box.item label="知的財産の侵害＞コンテンツの撤去" name="Intellectual_property_infringement_Content_Removal"/>
+		<combo_box.item label="知的財産の侵害＞コピーBot及び権限の悪用" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
+		<combo_box.item label="不寛容" name="Intolerance"/>
+		<combo_box.item label="土地＞サンドボックスのリソースの乱用" name="Land__Abuse_of_sandbox_resources"/>
+		<combo_box.item label="土地＞不法侵入＞オブジェクトまたはテクスチャ" name="Land__Encroachment__Objects_textures"/>
+		<combo_box.item label="土地＞不法侵入＞パーティクル" name="Land__Encroachment__Particles"/>
+		<combo_box.item label="土地＞不法侵入＞樹木/植物" name="Land__Encroachment__Trees_plants"/>
+		<combo_box.item label="スキルゲーミング ポリシー違反" name="Wagering_gambling"/>
+		<combo_box.item label="その他" name="Other"/>
+	</combo_box>
+	<text name="abuser_name_title">
+		迷惑ユーザーの名前：
+	</text>
+	<button label="選択" label_selected="" name="select_abuser" tool_tip="嫌がらせをした人の名前をリストから選択してください。"/>
+	<text name="abuser_name_title2">
+		嫌がらせを受けた場所：
+	</text>
+	<text name="sum_title">
+		概要：
+	</text>
+	<text name="dscr_title">
+		詳細：
+	</text>
+	<text name="bug_aviso">
+		できるだけ具体的に詳しく記入してください。
+	</text>
+	<text name="incomplete_title">
+		* 不完全な報告は調査対象になりません。
+	</text>
+	<button label="嫌がらせを報告する" label_selected="嫌がらせを報告する" name="send_btn"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
index aa2422e2c3..b12cf36fd3 100644
--- a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="save_camera_preset" title="カメラプリセットの保存">
-  <string name="btn_label_save">保存</string>
-  <string name="btn_label_replace">置き換え</string>
-  <radio_group name="radio_save_preset">
-    <radio_item label="新しいプリセットとして保存" name="new_preset" />
-    <radio_item label="プリセットを置き換え" name="replace_preset" />
-  </radio_group>
-  <line_editor name="preset_txt_editor" />
-  <button label="保存" name="save" />
-  <button label="キャンセル" name="cancel" />
-  <!-- *HACK to correctly draw drop-down list over the buttons-->
-  <combo_box name="preset_combo" />
-</floater>
\ No newline at end of file
+	<string name="btn_label_save">
+		保存
+	</string>
+	<string name="btn_label_replace">
+		置き換え
+	</string>
+	<radio_group name="radio_save_preset">
+		<radio_item label="新しいプリセットとして保存" name="new_preset"/>
+		<radio_item label="プリセットを置き換え" name="replace_preset"/>
+	</radio_group>
+	<line_editor name="preset_txt_editor"/>
+	<button label="保存" name="save"/>
+	<button label="キャンセル" name="cancel"/>
+	<combo_box name="preset_combo"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
index 4641ef9bf3..977fd05eef 100644
--- a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="save_pref_preset" title="グラフィックプリセットの保存">
-  <string name="title_graphic">グラフィックのプリセットを保存</string>
-  <string name="title_camera">カメラのプリセットを保存</string>
-  <text name="Preset">プリセットの名前を入力するか、既存のプリセットを選択します。</text>
-  <button label="保存" name="save" />
-  <button label="キャンセル" name="cancel" />
-</floater>
\ No newline at end of file
+	<string name="title_graphic">
+		グラフィックのプリセットを保存
+	</string>
+	<string name="title_camera">
+		カメラのプリセットを保存
+	</string>
+	<text name="Preset">
+		プリセットの名前を入力するか、既存のプリセットを選択します。
+	</text>
+	<button label="保存" name="save"/>
+	<button label="キャンセル" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
index 9ac84b9db7..43d5223ecc 100644
--- a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
@@ -1,80 +1,74 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Scene Load Statistics" title="シーン読み込みの統計情報">
-  <scroll_container name="statistics_scroll">
-    <container_view name="statistics_view">
-      <!--Basic Section-->
-      <stat_view name="basic" label="基本">
-        <stat_bar label="フレームごとのピクセル差" name="frame difference" unit_label="％" />
-        <stat_bar label="ＵＤＰデータの受信量" name="bandwidth" unit_label="kbps" />
-        <stat_bar label="パケットロス" name="packet_loss" unit_label="％" />
-      </stat_view>
-      <!--Advanced Section-->
-      <stat_view name="advanced" label="拡張">
-        <stat_view name="render" label="描画">
-          <stat_bar name="objs" label="オブジェクト合計" />
-          <stat_bar name="newobjs" label="新しいオブジェクト" unit_label="／秒" />
-          <stat_bar name="object_cache_hits" label="オブジェクトのキャッシュのヒット率" unit_label="％" />
-        </stat_view>
-        <!--Texture Stats-->
-        <stat_view name="texture" label="テクスチャ">
-          <stat_bar name="texture_cache_hits" label="キャッシュヒット率" unit_label="％" />
-          <stat_bar name="texture_cache_read_latency" label="キャッシュ読み込み遅延量" unit_label="秒" />
-          <stat_bar name="texture_decode_latency" label="キャッシュデコード遅延量" unit_label="秒" />
-          <stat_bar name="texture_decode_latency" label="キャッシュ書き込み遅延量" unit_label="秒" />
-          <stat_bar name="texture_fetch_latency" label="キャッシュ取得遅延量" unit_label="秒" />
-          <stat_bar name="texture_fetch_time" label="キャッシュ取得時間" unit_label="秒" />
-          <stat_bar name="numimagesstat" label="カウント" />
-          <stat_bar name="numrawimagesstat" label="Rawカウント" />
-        </stat_view>
-        <!--Network Stats-->
-        <stat_view name="network" label="ネットワーク">
-          <stat_bar name="packetsinstat" label="受信パケット量" unit_label="／秒" />
-          <stat_bar name="packetsoutstat" label="送信パケット量" unit_label="／秒" />
-          <stat_bar name="objectdatareceived" label="オブジェクト" unit_label="kbps" />
-          <stat_bar name="texturedatareceived" label="テスクチャ" unit_label="kbps" />
-          <stat_bar name="assetudpdatareceived" label="アセット" unit_label="kbps" />
-          <stat_bar name="layersdatareceived" label="レイヤー" unit_label="kbps" />
-          <stat_bar name="messagedatain" label="実効受信量" unit_label="kbps" />
-          <stat_bar name="messagedataout" label="実効送信量" unit_label="kbps" />
-        </stat_view>
-      </stat_view>
-      <!--Sim Stats-->
-      <stat_view name="sim" label="シミュレーター">
-        <stat_bar name="simobjects" label="オブジェクト" />
-        <stat_bar name="simactiveobjects" label="アクティブなオブジェクト" />
-        <stat_bar name="simactivescripts" label="アクティブなスクリプト" />
-        <stat_bar name="siminpps" label="受信パケット" unit_label="pps" />
-        <stat_bar name="simoutpps" label="送信パケット" unit_label="pps" />
-        <stat_bar name="simpendingdownloads" label="保留中のダウンロード" />
-        <stat_bar name="simpendinguploads" label="保留中のアップロード" />
-        <stat_bar name="simtotalunackedbytes" label="未確認バイトの合計" unit_label="㎅" />
-        <stat_view name="simperf" label="時間（㎳）">
-          <stat_bar name="simframemsec" label="合計フレーム時間" unit_label="㎳" />
-          <stat_bar name="simnetmsec" label="ネット時間" unit_label="㎳" />
-          <stat_bar name="simsimphysicsmsec" label="物理作用時間" unit_label="㎳" />
-          <stat_bar name="simsimothermsec" label="シミュレーション時間" unit_label="㎳" />
-          <stat_bar name="simagentmsec" label="エージェント時間" unit_label="㎳" />
-          <stat_bar name="simimagesmsec" label="イメージ時間" unit_label="㎳" />
-          <stat_bar name="simscriptmsec" label="スクリプト時間" unit_label="㎳" />
-          <stat_bar name="simsparemsec" label="スペア時間" unit_label="㎳" />
-          <!--2nd level time blocks under 'Details' second-->
-          <stat_view name="timedetails" label="時間詳細（㎳）">
-            <stat_bar name="simsimphysicsstepmsec" label="　物理作用単位" unit_label="㎳" />
-            <stat_bar name="simsimphysicsshapeupdatemsec" label="　物理形状更新" unit_label="㎳" />
-            <stat_bar name="simsimphysicsothermsec" label="　他の物理作用" unit_label="㎳" />
-            <stat_bar name="simsleepmsec" label="　スリープ時間" unit_label="㎳" />
-            <stat_bar name="simpumpiomsec" label="　ポンプＩ／Ｏ" unit_label="㎳" />
-          </stat_view>
-        </stat_view>
-      </stat_view>
-      <stat_view name="frame_stats" label="フレームの内訳">
-        <stat_bar name="scenery_frame_pct" label="景色" unit_label="％" />
-        <stat_bar name="avatar_frame_pct" label="アバター" unit_label="％" />
-        <stat_bar name="ui_frame_pct" label="ＵＩ" unit_label="％" />
-        <stat_bar name="huds_frame_pct" label="ＨＵＤ" unit_label="％" />
-        <stat_bar name="swap_frame_pct" label="スワップ" unit_label="％" />
-        <stat_bar name="idle_frame_pct" label="タスク" unit_label="％" />
-      </stat_view>
-    </container_view>
-  </scroll_container>
-</floater>
\ No newline at end of file
+	<scroll_container name="statistics_scroll">
+		<container_view name="statistics_view">
+			<stat_view name="basic" label="基本">
+				<stat_bar label="フレームごとのピクセル差" name="frame difference" unit_label="％"/>
+				<stat_bar label="ＵＤＰデータの受信量" name="bandwidth" unit_label="kbps"/>
+				<stat_bar label="パケットロス" name="packet_loss" unit_label="％"/>
+			</stat_view>
+			<stat_view name="advanced" label="拡張">
+				<stat_view name="render" label="描画">
+					<stat_bar name="objs" label="オブジェクト合計"/>
+					<stat_bar name="newobjs" label="新しいオブジェクト" unit_label="／秒"/>
+					<stat_bar name="object_cache_hits" label="オブジェクトのキャッシュのヒット率" unit_label="％"/>
+				</stat_view>
+				<stat_view name="texture" label="テクスチャ">
+					<stat_bar name="texture_cache_hits" label="キャッシュヒット率" unit_label="％"/>
+					<stat_bar name="texture_cache_read_latency" label="キャッシュ読み込み遅延量" unit_label="秒"/>
+					<stat_bar name="texture_decode_latency" label="キャッシュデコード遅延量" unit_label="秒"/>
+					<stat_bar name="texture_decode_latency" label="キャッシュ書き込み遅延量" unit_label="秒"/>
+					<stat_bar name="texture_fetch_latency" label="キャッシュ取得遅延量" unit_label="秒"/>
+					<stat_bar name="texture_fetch_time" label="キャッシュ取得時間" unit_label="秒"/>
+					<stat_bar name="numimagesstat" label="カウント"/>
+					<stat_bar name="numrawimagesstat" label="Rawカウント"/>
+				</stat_view>
+				<stat_view name="network" label="ネットワーク">
+					<stat_bar name="packetsinstat" label="受信パケット量" unit_label="／秒"/>
+					<stat_bar name="packetsoutstat" label="送信パケット量" unit_label="／秒"/>
+					<stat_bar name="objectdatareceived" label="オブジェクト" unit_label="kbps"/>
+					<stat_bar name="texturedatareceived" label="テスクチャ" unit_label="kbps"/>
+					<stat_bar name="assetudpdatareceived" label="アセット" unit_label="kbps"/>
+					<stat_bar name="layersdatareceived" label="レイヤー" unit_label="kbps"/>
+					<stat_bar name="messagedatain" label="実効受信量" unit_label="kbps"/>
+					<stat_bar name="messagedataout" label="実効送信量" unit_label="kbps"/>
+				</stat_view>
+			</stat_view>
+			<stat_view name="sim" label="シミュレーター">
+				<stat_bar name="simobjects" label="オブジェクト"/>
+				<stat_bar name="simactiveobjects" label="アクティブなオブジェクト"/>
+				<stat_bar name="simactivescripts" label="アクティブなスクリプト"/>
+				<stat_bar name="siminpps" label="受信パケット" unit_label="pps"/>
+				<stat_bar name="simoutpps" label="送信パケット" unit_label="pps"/>
+				<stat_bar name="simpendingdownloads" label="保留中のダウンロード"/>
+				<stat_bar name="simpendinguploads" label="保留中のアップロード"/>
+				<stat_bar name="simtotalunackedbytes" label="未確認バイトの合計" unit_label="㎅"/>
+				<stat_view name="simperf" label="時間（㎳）">
+					<stat_bar name="simframemsec" label="合計フレーム時間" unit_label="㎳"/>
+					<stat_bar name="simnetmsec" label="ネット時間" unit_label="㎳"/>
+					<stat_bar name="simsimphysicsmsec" label="物理作用時間" unit_label="㎳"/>
+					<stat_bar name="simsimothermsec" label="シミュレーション時間" unit_label="㎳"/>
+					<stat_bar name="simagentmsec" label="エージェント時間" unit_label="㎳"/>
+					<stat_bar name="simimagesmsec" label="イメージ時間" unit_label="㎳"/>
+					<stat_bar name="simscriptmsec" label="スクリプト時間" unit_label="㎳"/>
+					<stat_bar name="simsparemsec" label="スペア時間" unit_label="㎳"/>
+					<stat_view name="timedetails" label="時間詳細（㎳）">
+						<stat_bar name="simsimphysicsstepmsec" label="　物理作用単位" unit_label="㎳"/>
+						<stat_bar name="simsimphysicsshapeupdatemsec" label="　物理形状更新" unit_label="㎳"/>
+						<stat_bar name="simsimphysicsothermsec" label="　他の物理作用" unit_label="㎳"/>
+						<stat_bar name="simsleepmsec" label="　スリープ時間" unit_label="㎳"/>
+						<stat_bar name="simpumpiomsec" label="　ポンプＩ／Ｏ" unit_label="㎳"/>
+					</stat_view>
+				</stat_view>
+			</stat_view>
+			<stat_view name="frame_stats" label="フレームの内訳">
+				<stat_bar name="scenery_frame_pct" label="景色" unit_label="％"/>
+				<stat_bar name="avatar_frame_pct" label="アバター" unit_label="％"/>
+				<stat_bar name="ui_frame_pct" label="ＵＩ" unit_label="％"/>
+				<stat_bar name="huds_frame_pct" label="ＨＵＤ" unit_label="％"/>
+				<stat_bar name="swap_frame_pct" label="スワップ" unit_label="％"/>
+				<stat_bar name="idle_frame_pct" label="タスク" unit_label="％"/>
+			</stat_view>
+		</container_view>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
index a7a7e97bd3..6ed292e8fa 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="script debug floater" title="スクリプト警告／エラー">
-  <tab_container name="Preview Tabs">
-    <floater label="スクリプト" name="all_scripts" title="[ALL SCRIPTS]" />
-  </tab_container>
-</multi_floater>
\ No newline at end of file
+	<tab_container name="Preview Tabs">
+		<floater label="スクリプト" name="all_scripts" title="[ALL SCRIPTS]"/>
+	</tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
index cf859bb629..b2acebe95b 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]" />
+<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
index 69953bf07f..49ca6d8f98 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_ed_prefs.xml
@@ -1,17 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_script_colors" title="スクリプトの色">
-  <text name="color_pickers_label">希望の色を選択：</text>
-  <text name="text_label">テキスト</text>
-  <text name="cursor_label">カーソル</text>
-  <text name="background_label">背景</text>
-  <text name="datatype_label">データ型</text>
-  <text name="event_label">イベント</text>
-  <text name="string_literal_label">文字列リテラル</text>
-  <text name="constant_label">定数</text>
-  <text name="flow_control_label">フロー制御</text>
-  <text name="function_label">関数</text>
-  <text name="comment_label">コメント</text>
-  <script_editor name="Script Preview">/* サンプル スクリプト */
+	<text name="color_pickers_label">
+		希望の色を選択：
+	</text>
+	<text name="text_label">
+		テキスト
+	</text>
+	<text name="cursor_label">
+		カーソル
+	</text>
+	<text name="background_label">
+		背景
+	</text>
+	<text name="datatype_label">
+		データ型
+	</text>
+	<text name="event_label">
+		イベント
+	</text>
+	<text name="string_literal_label">
+		文字列リテラル
+	</text>
+	<text name="constant_label">
+		定数
+	</text>
+	<text name="flow_control_label">
+		フロー制御
+	</text>
+	<text name="function_label">
+		関数
+	</text>
+	<text name="comment_label">
+		コメント
+	</text>
+	<script_editor name="Script Preview">
+		/* サンプル スクリプト */
 default
 {
   state_entry()
@@ -20,5 +43,6 @@ default
     string greeting = "こんにちは";
     llSay(PUBLIC_CHANNEL, greeting);
   }
-}</script_editor>
-</floater>
\ No newline at end of file
+}
+	</script_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
index a5e161be2d..abea8bdf9b 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="scriptlimits" title="スクリプト情報" />
+<floater name="scriptlimits" title="スクリプト情報"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
index 805244c751..a1e78a7e12 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview lsl text" title="スクリプト：回転スクリプト">
-  <floater.string name="Title">スクリプト：[NAME]</floater.string>
-  <text name="desc txt">説明：</text>
-</floater>
\ No newline at end of file
+	<floater.string name="Title">
+		スクリプト：[NAME]
+	</floater.string>
+	<text name="desc txt">
+		説明：
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index ede9ad0b8c..d444015a14 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="queue" title="進行のリセット">
-  <floater.string name="Starting">[COUNT]アイテムの[START]を開始します。</floater.string>
-  <floater.string name="Done">完了。</floater.string>
-  <floater.string name="Resetting">リセット中</floater.string>
-  <floater.string name="Running">実行中</floater.string>
-  <floater.string name="NotRunning">実行されていません</floater.string>
-  <floater.string name="Timeout">タイムアウト：[OBJECT_NAME]</floater.string>
-  <floater.string name="LoadingObjInv">次のインベントリをロード中：[OBJECT_NAME]</floater.string>
-  <button label="閉じる" label_selected="閉じる" name="close" />
-</floater>
\ No newline at end of file
+	<floater.string name="Starting">
+		[COUNT]アイテムの[START]を開始します。
+	</floater.string>
+	<floater.string name="Done">
+		完了。
+	</floater.string>
+	<floater.string name="Resetting">
+		リセット中
+	</floater.string>
+	<floater.string name="Running">
+		実行中
+	</floater.string>
+	<floater.string name="NotRunning">
+		実行されていません
+	</floater.string>
+	<floater.string name="Timeout">
+		タイムアウト：[OBJECT_NAME]
+	</floater.string>
+	<floater.string name="LoadingObjInv">
+		次のインベントリをロード中：[OBJECT_NAME]
+	</floater.string>
+	<button label="閉じる" label_selected="閉じる" name="close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
index e0414706e9..bc4f48c995 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script search" title="スクリプトの検索">
-  <check_box label="大文字と小文字を区別しない" name="case_text" />
-  <button label="検索" label_selected="検索" name="search_btn" />
-  <button label="置換" label_selected="置換" name="replace_btn" />
-  <button label="すべて置換" label_selected="すべて置換" name="replace_all_btn" />
-  <text name="txt">検索</text>
-  <text name="txt2">置換</text>
-</floater>
\ No newline at end of file
+	<check_box label="大文字と小文字を区別しない" name="case_text"/>
+	<button label="検索" label_selected="検索" name="search_btn"/>
+	<button label="置換" label_selected="置換" name="replace_btn"/>
+	<button label="すべて置換" label_selected="すべて置換" name="replace_all_btn"/>
+	<text name="txt">
+		検索
+	</text>
+	<text name="txt2">
+		置換
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
index 772d3a9719..531ac77f95 100644
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_search" title="">
-  <floater.string name="loading_text">読み込んでいます…。</floater.string>
-  <floater.string name="done_text">完了</floater.string>
-  <layout_stack name="stack1">
-    <layout_panel name="browser_layout">
-      <text name="refresh_search">現在のゴッドレベルに反映させるため、検索をやり直してください。</text>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<floater.string name="loading_text">
+		読み込んでいます…。
+	</floater.string>
+	<floater.string name="done_text">
+		完了
+	</floater.string>
+	<layout_stack name="stack1">
+		<layout_panel name="browser_layout">
+			<text name="refresh_search">
+				現在のゴッドレベルに反映させるため、検索をやり直してください。
+			</text>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
index f962ad7af9..8f92384daa 100644
--- a/indra/newview/skins/default/xui/ja/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container">
-  <floater.string name="keyboard">キーボード</floater.string>
-  <floater.string name="mouse">マウスのボタン</floater.string>
-  <floater.string name="basic_description">キーを押してトリガーを設定します。
-許可される入力：[INPUT]</floater.string>
-  <floater.string name="reserved_by_menu">その組み合わせ（[KEYSTR]）は、メニューで予約されています。</floater.string>
-  <text name="description">キーを押してトリガーを設定します。
-許可される入力：[INPUT]</text>
-  <check_box label="全てに適用" name="apply_all" tool_tip="ビューアは、ワールドで何をしているかに応じて、さまざまなコントロールの組み合わせを使用します。これを設定すると、変更がすべての組み合わせに適用されます。" />
-
-  <button label="空欄にする" name="SetEmpty" />
-  <button label="デフォルト" name="Default" />
-  <button label="キャンセル" name="Cancel" />
-</floater>
\ No newline at end of file
+	<floater.string name="keyboard">
+		キーボード
+	</floater.string>
+	<floater.string name="mouse">
+		マウスのボタン
+	</floater.string>
+	<floater.string name="basic_description">
+		キーを押してトリガーを設定します。
+許可される入力：[INPUT]
+	</floater.string>
+	<floater.string name="reserved_by_menu">
+		その組み合わせ（[KEYSTR]）は、メニューで予約されています。
+	</floater.string>
+	<text name="description">
+		キーを押してトリガーを設定します。
+許可される入力：[INPUT]
+	</text>
+	<check_box label="全てに適用" name="apply_all" tool_tip="ビューアは、ワールドで何をしているかに応じて、さまざまなコントロールの組み合わせを使用します。これを設定すると、変更がすべての組み合わせに適用されます。"/>
+	<button label="空欄にする" name="SetEmpty"/>
+	<button label="デフォルト" name="Default"/>
+	<button label="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index 4a5fd8d396..be7151876d 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -1,35 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sell land" title="土地の販売">
-  <scroll_container name="profile_scroll">
-    <panel name="scroll_content_panel">
-      <text name="info_parcel_label">区画：</text>
-      <text name="info_parcel">区画名</text>
-      <text name="info_size_label">サイズ：</text>
-      <text name="info_size">[AREA]㎡</text>
-      <text name="info_action">この区画を販売：</text>
-      <text name="price_label">１．価格の設定：</text>
-      <text name="price_text">適正と思われる価格を入力してください。</text>
-      <text name="price_ld">L$ </text>
-      <line_editor name="price">0</line_editor>
-      <text name="price_per_m">（1㎡あたりL$ [PER_METER]）</text>
-      <text name="sell_to_label">２．特定の人物に販売：</text>
-      <text name="sell_to_text">販売先を特定の人物に限定するか、しないかを選択してください。</text>
-      <combo_box name="sell_to">
-        <combo_box.item label="─１つ選択─" name="--selectone--" />
-        <combo_box.item label="指定なし・誰にでも販売" name="Anyone" />
-        <combo_box.item label="特定の人物：" name="Specificuser:" />
-      </combo_box>
-      <button label="選択" name="sell_to_select_agent" />
-      <text name="sell_objects_label">３．オブジェクトと土地を一緒に販売しますか？</text>
-      <text name="sell_objects_text">区画上の土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。</text>
-      <radio_group name="sell_objects">
-        <radio_item label="いいえ、オブジェクトの所有権は保持します。" name="no" />
-        <radio_item label="はい、オブジェクトと土地を一緒に販売します。" name="yes" />
-      </radio_group>
-      <button label="オブジェクトを表示" name="show_objects" />
-      <text name="nag_message_label">注意：返品・交換はできません。</text>
-      <button label="土地を販売する" name="sell_btn" />
-      <button label="キャンセル" name="cancel_btn" />
-    </panel>
-  </scroll_container>
-</floater>
\ No newline at end of file
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="info_parcel_label">
+				区画：
+			</text>
+			<text name="info_parcel">
+				区画名
+			</text>
+			<text name="info_size_label">
+				サイズ：
+			</text>
+			<text name="info_size">
+				[AREA]㎡
+			</text>
+			<text name="info_action">
+				この区画を販売：
+			</text>
+			<text name="price_label">
+				１．価格の設定：
+			</text>
+			<text name="price_text">
+				適正と思われる価格を入力してください。
+			</text>
+			<text name="price_ld">
+				L$
+			</text>
+			<line_editor name="price">
+				0
+			</line_editor>
+			<text name="price_per_m">
+				（1㎡あたりL$ [PER_METER]）
+			</text>
+			<text name="sell_to_label">
+				２．特定の人物に販売：
+			</text>
+			<text name="sell_to_text">
+				販売先を特定の人物に限定するか、しないかを選択してください。
+			</text>
+			<combo_box name="sell_to">
+				<combo_box.item label="─１つ選択─" name="--selectone--"/>
+				<combo_box.item label="指定なし・誰にでも販売" name="Anyone"/>
+				<combo_box.item label="特定の人物：" name="Specificuser:"/>
+			</combo_box>
+			<button label="選択" name="sell_to_select_agent"/>
+			<text name="sell_objects_label">
+				３．オブジェクトと土地を一緒に販売しますか？
+			</text>
+			<text name="sell_objects_text">
+				区画上の土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。
+			</text>
+			<radio_group name="sell_objects">
+				<radio_item label="いいえ、オブジェクトの所有権は保持します。" name="no"/>
+				<radio_item label="はい、オブジェクトと土地を一緒に販売します。" name="yes"/>
+			</radio_group>
+			<button label="オブジェクトを表示" name="show_objects"/>
+			<text name="nag_message_label">
+				注意：返品・交換はできません。
+			</text>
+			<button label="土地を販売する" name="sell_btn"/>
+			<button label="キャンセル" name="cancel_btn"/>
+		</panel>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index 974f1bd0f1..f304ab9769 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="デバッグ設定">
-  <filter_editor name="filter_input" />
-  <scroll_list name="setting_list">
-    <scroll_list.columns name="changed_setting" />
-    <scroll_list.columns label="設定" name="setting" />
-  </scroll_list>
-  <text name="setting_name_txt">デバッグ設定名</text>
-  <text_editor name="comment_text" />
-  <radio_group name="boolean_combo">
-    <radio_item label="有効" name="TRUE" value="true" />
-    <radio_item label="無効" name="FALSE" value="" />
-    <commit_callback function="CommitSettings" />
-  </radio_group>
-  <line_editor name="val_text" />
-  <color_swatch label="色" name="val_color_swatch" />
-  <spinner label="Ｘ" name="val_spinner_1" />
-  <spinner label="Ｘ" name="val_spinner_2" />
-  <spinner label="Ｘ" name="val_spinner_3" />
-  <spinner label="Ｘ" name="val_spinner_4" />
-  <button label="デフォルトにリセット" name="default_btn" />
-  <check_box label="変更された設定のみ表示" name="hide_default" />
-</floater>
\ No newline at end of file
+	<filter_editor name="filter_input"/>
+	<scroll_list name="setting_list">
+		<scroll_list.columns name="changed_setting"/>
+		<scroll_list.columns label="設定" name="setting"/>
+	</scroll_list>
+	<text name="setting_name_txt">
+		デバッグ設定名
+	</text>
+	<text_editor name="comment_text"/>
+	<radio_group name="boolean_combo">
+		<radio_item label="有効" name="TRUE" value="true"/>
+		<radio_item label="無効" name="FALSE" value=""/>
+		<commit_callback function="CommitSettings"/>
+	</radio_group>
+	<line_editor name="val_text"/>
+	<color_swatch label="色" name="val_color_swatch"/>
+	<spinner label="Ｘ" name="val_spinner_1"/>
+	<spinner label="Ｘ" name="val_spinner_2"/>
+	<spinner label="Ｘ" name="val_spinner_3"/>
+	<spinner label="Ｘ" name="val_spinner_4"/>
+	<button label="デフォルトにリセット" name="default_btn"/>
+	<check_box label="変更された設定のみ表示" name="hide_default"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
index 2cb9a908d9..ffef8733cf 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml
@@ -1,18 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings picker" title="選択：設定">
-  <floater.string name="pick title">選択：</floater.string>
-  <floater.string name="pick_track">トラックを選択</floater.string>
-  <floater.string name="pick_settings">設定を選択</floater.string>
-  <floater.string name="track_water">水面</floater.string>
-  <floater.string name="track_ground">地面</floater.string>
-  <floater.string name="track_sky">空[NUM]</floater.string>
-  <layout_stack name="test_stack">
-    <layout_panel name="inv_list">
-      <filter_editor label="テクスチャをフィルタ" name="flt_inventory_search" />
-    </layout_panel>
-    <layout_panel name="temp">
-      <button label="ＯＫ" label_selected="ＯＫ" name="btn_select" />
-      <button label="キャンセル" label_selected="キャンセル" name="btn_cancel" />
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<floater.string name="pick title">
+		選択：
+	</floater.string>
+	<floater.string name="pick_track">
+		トラックを選択
+	</floater.string>
+	<floater.string name="pick_settings">
+		設定を選択
+	</floater.string>
+	<floater.string name="track_water">
+		水面
+	</floater.string>
+	<floater.string name="track_ground">
+		地面
+	</floater.string>
+	<floater.string name="track_sky">
+		空[NUM]
+	</floater.string>
+	<layout_stack name="test_stack">
+		<layout_panel name="inv_list">
+			<filter_editor label="テクスチャをフィルタ" name="flt_inventory_search"/>
+		</layout_panel>
+		<layout_panel name="temp">
+			<button label="ＯＫ" label_selected="ＯＫ" name="btn_select"/>
+			<button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
index 56ebcc9b2a..0b8030048d 100644
--- a/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="simple_outfit_snapshot" title="アウトフィットのスナップショット">
-  <ui_ctrl name="thumbnail_placeholder" />
-  <button label="画像を撮影" name="new_snapshot_btn" />
-  <button label="保存（L$ [UPLOAD_COST]）" name="save_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<ui_ctrl name="thumbnail_placeholder"/>
+	<button label="画像を撮影" name="new_snapshot_btn"/>
+	<button label="保存（L$ [UPLOAD_COST]）" name="save_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index de778e2d8b..8035e8a13f 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -1,55 +1,98 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Snapshot" title="スナップショット">
-  <floater.string name="unknown">不明</floater.string>
-  <string name="postcard_progress_str">メール送信</string>
-  <string name="profile_progress_str">プロフィールに投稿</string>
-  <string name="inventory_progress_str">インベントリに保存</string>
-  <string name="local_progress_str">コンピュータに保存</string>
-  <string name="profile_succeeded_str">画像がアップロードされました。</string>
-  <string name="postcard_succeeded_str">メールが送信されました！</string>
-  <string name="inventory_succeeded_str">インベントリに保存されました！</string>
-  <string name="local_succeeded_str">コンピュータに保存されました！</string>
-  <!-- 字数制限のため「プロフィールフィードに画像をアップロードできませんでした。」から変更 -->
-  <string name="profile_failed_str">フィードにアップできませんでした。</string>
-  <string name="postcard_failed_str">メール送信に失敗しました。</string>
-  <string name="inventory_failed_str">インベントリに保存できませんでした。</string>
-  <string name="local_failed_str">コンピュータへの保存に失敗しました。</string>
-  <button label="リフレッシュ" name="new_snapshot_btn" />
-  <panel name="advanced_options_panel">
-    <text name="layer_type_label">キャプチャーオプション：</text>
-    <combo_box label="画像レイヤー" name="layer_types">
-      <combo_box.item label="カラー" name="Colors" value="colors" />
-      <combo_box.item label="色深度" name="Depth" value="depth" />
-    </combo_box>
-    <check_box label="インターフェース" name="ui_check" />
-    <check_box label="ＨＵＤ" name="hud_check" />
-    <check_box label="フレームをフリーズ（全画面）" name="freeze_frame_check" />
-    <check_box label="自動リフレッシュ" name="auto_snapshot_check" />
-    <text name="filter_list_label">フィルタ：</text>
-    <combo_box name="filters_combobox" tool_tip="画像フィルタ">
-      <combo_box.item label="フィルタなし" name="NoFilter" value="NoFilter" />
-    </combo_box>
-  </panel>
-  <panel_container name="panel_container">
-    <panel name="panel_snapshot_options" filename="panel_snapshot_options.xml" />
-    <panel name="panel_snapshot_profile" filename="panel_snapshot_profile.xml" />
-    <panel name="panel_snapshot_postcard" filename="panel_snapshot_postcard.xml" />
-    <panel name="panel_snapshot_inventory" filename="panel_snapshot_inventory.xml" />
-    <panel name="panel_snapshot_local" filename="panel_snapshot_local.xml" />
-  </panel_container>
-  <view_border name="status_hr" />
-  <panel name="succeeded_panel">
-    <text name="succeeded_lbl">成功</text>
-  </panel>
-  <panel name="failed_panel">
-    <text name="failed_lbl">失敗</text>
-  </panel>
-  <loading_indicator name="working_indicator" />
-  <text name="working_lbl">処理中</text>
-  <text name="refresh_lbl">リフレッシュして保存</text>
-  <ui_ctrl name="thumbnail_placeholder" />
-  <view_border name="img_info_border" />
-  <text name="image_res_text">[WIDTH]px（幅）✕[HEIGHT]px（高さ）</text>
-  <text name="file_size_label">[SIZE]㎅</text>
-  <text name="360_label">３６０度Ｓショットを撮影</text>
-</floater>
\ No newline at end of file
+	<floater.string name="unknown">
+		不明
+	</floater.string>
+	<string name="postcard_progress_str">
+		メール送信
+	</string>
+	<string name="profile_progress_str">
+		プロフィールに投稿
+	</string>
+	<string name="inventory_progress_str">
+		インベントリに保存
+	</string>
+	<string name="local_progress_str">
+		コンピュータに保存
+	</string>
+	<string name="profile_succeeded_str">
+		画像がアップロードされました。
+	</string>
+	<string name="postcard_succeeded_str">
+		メールが送信されました！
+	</string>
+	<string name="inventory_succeeded_str">
+		インベントリに保存されました！
+	</string>
+	<string name="local_succeeded_str">
+		コンピュータに保存されました！
+	</string>
+	<string name="profile_failed_str">
+		フィードにアップできませんでした。
+	</string>
+	<string name="postcard_failed_str">
+		メール送信に失敗しました。
+	</string>
+	<string name="inventory_failed_str">
+		インベントリに保存できませんでした。
+	</string>
+	<string name="local_failed_str">
+		コンピュータへの保存に失敗しました。
+	</string>
+	<button label="リフレッシュ" name="new_snapshot_btn"/>
+	<panel name="advanced_options_panel">
+		<text name="layer_type_label">
+			キャプチャーオプション：
+		</text>
+		<combo_box label="画像レイヤー" name="layer_types">
+			<combo_box.item label="カラー" name="Colors" value="colors"/>
+			<combo_box.item label="色深度" name="Depth" value="depth"/>
+		</combo_box>
+		<check_box label="インターフェース" name="ui_check"/>
+		<check_box label="ＨＵＤ" name="hud_check"/>
+		<check_box label="フレームをフリーズ（全画面）" name="freeze_frame_check"/>
+		<check_box label="自動リフレッシュ" name="auto_snapshot_check"/>
+		<text name="filter_list_label">
+			フィルタ：
+		</text>
+		<combo_box name="filters_combobox" tool_tip="画像フィルタ">
+			<combo_box.item label="フィルタなし" name="NoFilter" value="NoFilter"/>
+		</combo_box>
+	</panel>
+	<panel_container name="panel_container">
+		<panel name="panel_snapshot_options" filename="panel_snapshot_options.xml"/>
+		<panel name="panel_snapshot_profile" filename="panel_snapshot_profile.xml"/>
+		<panel name="panel_snapshot_postcard" filename="panel_snapshot_postcard.xml"/>
+		<panel name="panel_snapshot_inventory" filename="panel_snapshot_inventory.xml"/>
+		<panel name="panel_snapshot_local" filename="panel_snapshot_local.xml"/>
+	</panel_container>
+	<view_border name="status_hr"/>
+	<panel name="succeeded_panel">
+		<text name="succeeded_lbl">
+			成功
+		</text>
+	</panel>
+	<panel name="failed_panel">
+		<text name="failed_lbl">
+			失敗
+		</text>
+	</panel>
+	<loading_indicator name="working_indicator"/>
+	<text name="working_lbl">
+		処理中
+	</text>
+	<text name="refresh_lbl">
+		リフレッシュして保存
+	</text>
+	<ui_ctrl name="thumbnail_placeholder"/>
+	<view_border name="img_info_border"/>
+	<text name="image_res_text">
+		[WIDTH]px（幅）✕[HEIGHT]px（高さ）
+	</text>
+	<text name="file_size_label">
+		[SIZE]㎅
+	</text>
+	<text name="360_label">
+		３６０度Ｓショットを撮影
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
index 8732e59ed6..28d2388bed 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_sound_devices" title="サウンドデバイス">
-  <text name="voice_label">ボイスチャット</text>
-  <check_box label="有効" name="enable_voice" />
-</floater>
\ No newline at end of file
+	<text name="voice_label">
+		ボイスチャット
+	</text>
+	<check_box label="有効" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index ec6cb56d40..b55a664cfa 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Sound Preview" title="SOUND.WAV">
-  <text name="name_label">名前：</text>
-  <text name="description_label">説明：</text>
-  <button label="キャンセル" label_selected="キャンセル" name="cancel_btn" />
-  <button label="アップロード（L$[AMOUNT]）" label_selected="アップロード（L$ [AMOUNT]）" name="ok_btn" />
-  <text name="text">ビットレート（kbps）：</text>
-  <radio_group name="bitrate">
-    <radio_item label="32" name="32" />
-    <radio_item label="64" name="64" />
-    <radio_item label="96" name="96" />
-    <radio_item label="128" name="128" />
-  </radio_group>
-</floater>
\ No newline at end of file
+	<text name="name_label">
+		名前：
+	</text>
+	<text name="description_label">
+		説明：
+	</text>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+	<button label="アップロード（L$[AMOUNT]）" label_selected="アップロード（L$ [AMOUNT]）" name="ok_btn"/>
+	<text name="text">
+		ビットレート（kbps）：
+	</text>
+	<radio_group name="bitrate">
+		<radio_item label="32" name="32"/>
+		<radio_item label="64" name="64"/>
+		<radio_item label="96" name="96"/>
+		<radio_item label="128" name="128"/>
+	</radio_group>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
index 0e9397d428..28e07e68c4 100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_floater" title="スペルチェッカーの設定">
-  <check_box label="スペルチェッカーを有効にする" name="spellcheck_enable" />
-  <text name="spellcheck_main">メイン辞書:</text>
-  <text label="ログ：" name="spellcheck_additional">その他の辞書：</text>
-  <text name="spellcheck_available">入手可</text>
-  <text name="spellcheck_active">有効</text>
-  <button label="削除" name="spellcheck_remove_btn" />
-  <button label="インポート…" name="spellcheck_import_btn" />
-</floater>
\ No newline at end of file
+	<check_box label="スペルチェッカーを有効にする" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		メイン辞書:
+	</text>
+	<text label="ログ：" name="spellcheck_additional">
+		その他の辞書：
+	</text>
+	<text name="spellcheck_available">
+		入手可
+	</text>
+	<text name="spellcheck_active">
+		有効
+	</text>
+	<button label="削除" name="spellcheck_remove_btn"/>
+	<button label="インポート…" name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
index 3a82e0dd4e..9000d862a6 100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="辞書をインポート">
-  <text name="import_dict">辞書：</text>
-  <button label="参照" label_selected="参照" name="dictionary_path_browse" />
-  <text name="import_name">名前：</text>
-  <text name="import_lang">言語：</text>
-  <button label="インポート" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<text name="import_dict">
+		辞書：
+	</text>
+	<button label="参照" label_selected="参照" name="dictionary_path_browse"/>
+	<text name="import_name">
+		名前：
+	</text>
+	<text name="import_lang">
+		言語：
+	</text>
+	<button label="インポート" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index b512b6202a..0c28b47351 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -1,111 +1,111 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Statistics" title="統計">
-  <scroll_container name="statistics_scroll">
-    <container_view name="statistics_view">
-      <stat_view label="基本" name="basic">
-        <stat_bar label="ＦＰＳ" name="fps" unit_label="／秒" />
-        <stat_bar name="frame_mean" label="フレーム（平均）" unit_label="㎳" />
-        <stat_bar name="frame_median" label="フレーム（中央値）" unit_label="㎳" />
-        <stat_bar name="framet_jitter" label="ジッタ" />
-        <stat_bar label="受信したＵＤＰデータ" name="bandwidth" />
-        <stat_bar label="パケットロス" name="packet_loss" />
-        <stat_bar label="シムのPing" name="ping" />
-      </stat_view>
-      <stat_view label="拡張" name="advanced">
-        <stat_view label="描画" name="render">
-          <stat_bar label="フレームあたりのKTris" name="ktrisframe" unit_label="ktris／フレーム" />
-          <stat_bar label="秒あたりのKTris" name="ktrissec" />
-          <stat_bar label="オブジェクト合計" name="totalobjs" />
-          <stat_bar label="キャッシュされたオブジェクト" name="cachedobjs" />
-          <stat_bar label="新規オブジェクト" name="newobjs" />
-          <stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits" />
-          <stat_bar label="閉鎖クエリ実行" name="occlusion_queries" />
-          <stat_bar label="閉鎖オブジェクト" name="occluded" />
-          <stat_bar label="非閉鎖オブジェクト" name="unoccluded" />
-        </stat_view>
-        <stat_view label="テクスチャ" name="texture">
-          <stat_bar label="キャッシュヒット率" name="texture_cache_hits" />
-          <stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency" />
-          <stat_bar label="カウント" name="numimagesstat" />
-          <stat_bar label="ＲＡＷカウント" name="numrawimagesstat" />
-          <stat_bar label="ＧＬメモリ" name="gltexmemstat" />
-          <stat_bar label="フォーマット済メモリ" name="formattedmemstat" />
-          <stat_bar label="ＲＡＷメモリ" name="rawmemstat" />
-          <stat_bar label="統合メモリ" name="glboundmemstat" />
-        </stat_view>
-        <stat_view label="メモリ使用量" name="memory">
-          <stat_bar label="ＬＬトレース" name="LLTrace" />
-          <stat_bar label="ＵＩ" name="LLView" />
-          <stat_bar label="フォント" name="LLFontFreetype" />
-          <stat_bar label="インベントリ" name="LLInventoryObject" />
-          <stat_bar label="ビューアオブジェクト" name="LLViewerObject" />
-          <stat_bar label="八分木グループデータ" name="LLViewerOctreeGroup" />
-          <stat_bar label="八分木データ" name="LLViewerOctreeEntry" />
-          <stat_bar label="ビューアのオブジェクトキャッシュ" name="LLVOCacheEntry" />
-          <stat_bar label="描画可能オブジェクト" name="LLDrawable" />
-          <stat_bar label="顔データ" name="LLFace" />
-          <stat_bar label="描画情報" name="LLDrawInfo" />
-          <stat_bar label="テクスチャデータ" name="LLTexture" />
-          <stat_bar label="画像データ" name="LLImage" />
-          <stat_bar label="ＧＬ画像データ" name="LLImageGL" />
-          <stat_bar label="頂点バッファ" name="LLVertexBuffer" />
-        </stat_view>
-        <stat_view label="ネットワーク" name="network">
-          <stat_bar label="パケットイン" name="packetsinstat" />
-          <stat_bar label="パケットアウト" name="packetsoutstat" />
-          <stat_bar label="オブジェクト" name="objectdatareceived" />
-          <stat_bar label="テクスチャ" name="texturedatareceived" />
-          <stat_bar label="アセット" name="assetudpdatareceived" />
-          <stat_bar label="レイヤー" name="layersdatareceived" />
-          <stat_bar label="実際の受信" name="messagedatain" />
-          <stat_bar label="実際の送信" name="messagedataout" />
-        </stat_view>
-      </stat_view>
-      <stat_view label="シミュレーター" name="sim">
-        <stat_bar label="遅延時間" name="simtimedilation" />
-        <stat_bar label="シムのＦＰＳ" name="simfps" />
-        <stat_bar label="物理作用のＦＰＳ" name="simphysicsfps" />
-        <stat_view label="物理作用の詳細" name="physicsdetail">
-          <stat_bar label="ピン留めオブジェクト" name="physicspinnedtasks" />
-          <stat_bar label="低ＬＯＤオブジェクト" name="physicslodtasks" />
-          <stat_bar label="メモリ配分" name="physicsmemoryallocated" />
-        </stat_view>
-        <stat_bar label="エージェントの更新／秒" name="simagentups" />
-        <stat_bar label="メインエージェント" name="simmainagents" />
-        <stat_bar label="チャイルドエージェント" name="simchildagents" />
-        <stat_bar label="オブジェクト" name="simobjects" />
-        <stat_bar label="アクティブなオブジェクト" name="simactiveobjects" />
-        <stat_bar label="アクティブなスクリプト" name="simactivescripts" />
-        <stat_bar label="スクリプト実行" name="simpctscriptsrun" />
-        <stat_bar label="スクリプトイベント" name="simscripteps" unit_label="eps" />
-        <stat_view label="経路探索" name="simpathfinding">
-          <stat_bar label="ＡＩステップ時間" name="simsimaistepmsec" />
-          <stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps" unit_label="／秒" />
-          <stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters" unit_label="％" />
-        </stat_view>
-        <stat_bar label="入力パケット" name="siminpps" unit_label="パケット／秒" />
-        <stat_bar label="出力パケット" name="simoutpps" unit_label="パケット／秒" />
-        <stat_bar label="保留中のダウンロード" name="simpendingdownloads" />
-        <stat_bar label="保留中のアップロード" name="simpendinguploads" />
-        <stat_bar label="未承認の合計データ" name="simtotalunackedbytes" />
-        <stat_view label="時間" name="simperf">
-          <stat_bar label="フレーム時間合計" name="simframemsec" />
-          <stat_bar label="総時間数" name="simnetmsec" />
-          <stat_bar label="物理的作用時間" name="simsimphysicsmsec" />
-          <stat_bar label="シミュレーション時間" name="simsimothermsec" />
-          <stat_bar label="エージェント時間" name="simagentmsec" />
-          <stat_bar label="イメージ時間" name="simimagesmsec" />
-          <stat_bar label="スクリプト時間" name="simscriptmsec" />
-          <stat_bar label="スペア時間" name="simsparemsec" />
-          <stat_view label="時間の詳細" name="timedetails">
-            <stat_bar label="物理効果の単位" name="simsimphysicsstepmsec" />
-            <stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec" />
-            <stat_bar label="他の物理効果" name="simsimphysicsothermsec" />
-            <stat_bar label="スリープ時間" name="simsleepmsec" />
-            <stat_bar label="ポンプ入出力" name="simpumpiomsec" />
-          </stat_view>
-        </stat_view>
-      </stat_view>
-    </container_view>
-  </scroll_container>
-</floater>
\ No newline at end of file
+	<scroll_container name="statistics_scroll">
+		<container_view name="statistics_view">
+			<stat_view label="基本" name="basic">
+				<stat_bar label="ＦＰＳ" name="fps" unit_label="／秒"/>
+				<stat_bar name="frame_mean" label="フレーム（平均）" unit_label="㎳"/>
+				<stat_bar name="frame_median" label="フレーム（中央値）" unit_label="㎳"/>
+				<stat_bar name="framet_jitter" label="ジッタ"/>
+				<stat_bar label="受信したＵＤＰデータ" name="bandwidth"/>
+				<stat_bar label="パケットロス" name="packet_loss"/>
+				<stat_bar label="シムのPing" name="ping"/>
+			</stat_view>
+			<stat_view label="拡張" name="advanced">
+				<stat_view label="描画" name="render">
+					<stat_bar label="フレームあたりのKTris" name="ktrisframe" unit_label="ktris／フレーム"/>
+					<stat_bar label="秒あたりのKTris" name="ktrissec"/>
+					<stat_bar label="オブジェクト合計" name="totalobjs"/>
+					<stat_bar label="キャッシュされたオブジェクト" name="cachedobjs"/>
+					<stat_bar label="新規オブジェクト" name="newobjs"/>
+					<stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits"/>
+					<stat_bar label="閉鎖クエリ実行" name="occlusion_queries"/>
+					<stat_bar label="閉鎖オブジェクト" name="occluded"/>
+					<stat_bar label="非閉鎖オブジェクト" name="unoccluded"/>
+				</stat_view>
+				<stat_view label="テクスチャ" name="texture">
+					<stat_bar label="キャッシュヒット率" name="texture_cache_hits"/>
+					<stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency"/>
+					<stat_bar label="カウント" name="numimagesstat"/>
+					<stat_bar label="ＲＡＷカウント" name="numrawimagesstat"/>
+					<stat_bar label="ＧＬメモリ" name="gltexmemstat"/>
+					<stat_bar label="フォーマット済メモリ" name="formattedmemstat"/>
+					<stat_bar label="ＲＡＷメモリ" name="rawmemstat"/>
+					<stat_bar label="統合メモリ" name="glboundmemstat"/>
+				</stat_view>
+				<stat_view label="メモリ使用量" name="memory">
+					<stat_bar label="ＬＬトレース" name="LLTrace"/>
+					<stat_bar label="ＵＩ" name="LLView"/>
+					<stat_bar label="フォント" name="LLFontFreetype"/>
+					<stat_bar label="インベントリ" name="LLInventoryObject"/>
+					<stat_bar label="ビューアオブジェクト" name="LLViewerObject"/>
+					<stat_bar label="八分木グループデータ" name="LLViewerOctreeGroup"/>
+					<stat_bar label="八分木データ" name="LLViewerOctreeEntry"/>
+					<stat_bar label="ビューアのオブジェクトキャッシュ" name="LLVOCacheEntry"/>
+					<stat_bar label="描画可能オブジェクト" name="LLDrawable"/>
+					<stat_bar label="顔データ" name="LLFace"/>
+					<stat_bar label="描画情報" name="LLDrawInfo"/>
+					<stat_bar label="テクスチャデータ" name="LLTexture"/>
+					<stat_bar label="画像データ" name="LLImage"/>
+					<stat_bar label="ＧＬ画像データ" name="LLImageGL"/>
+					<stat_bar label="頂点バッファ" name="LLVertexBuffer"/>
+				</stat_view>
+				<stat_view label="ネットワーク" name="network">
+					<stat_bar label="パケットイン" name="packetsinstat"/>
+					<stat_bar label="パケットアウト" name="packetsoutstat"/>
+					<stat_bar label="オブジェクト" name="objectdatareceived"/>
+					<stat_bar label="テクスチャ" name="texturedatareceived"/>
+					<stat_bar label="アセット" name="assetudpdatareceived"/>
+					<stat_bar label="レイヤー" name="layersdatareceived"/>
+					<stat_bar label="実際の受信" name="messagedatain"/>
+					<stat_bar label="実際の送信" name="messagedataout"/>
+				</stat_view>
+			</stat_view>
+			<stat_view label="シミュレーター" name="sim">
+				<stat_bar label="遅延時間" name="simtimedilation"/>
+				<stat_bar label="シムのＦＰＳ" name="simfps"/>
+				<stat_bar label="物理作用のＦＰＳ" name="simphysicsfps"/>
+				<stat_view label="物理作用の詳細" name="physicsdetail">
+					<stat_bar label="ピン留めオブジェクト" name="physicspinnedtasks"/>
+					<stat_bar label="低ＬＯＤオブジェクト" name="physicslodtasks"/>
+					<stat_bar label="メモリ配分" name="physicsmemoryallocated"/>
+				</stat_view>
+				<stat_bar label="エージェントの更新／秒" name="simagentups"/>
+				<stat_bar label="メインエージェント" name="simmainagents"/>
+				<stat_bar label="チャイルドエージェント" name="simchildagents"/>
+				<stat_bar label="オブジェクト" name="simobjects"/>
+				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
+				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
+				<stat_bar label="スクリプト実行" name="simpctscriptsrun"/>
+				<stat_bar label="スクリプトイベント" name="simscripteps" unit_label="eps"/>
+				<stat_view label="経路探索" name="simpathfinding">
+					<stat_bar label="ＡＩステップ時間" name="simsimaistepmsec"/>
+					<stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps" unit_label="／秒"/>
+					<stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters" unit_label="％"/>
+				</stat_view>
+				<stat_bar label="入力パケット" name="siminpps" unit_label="パケット／秒"/>
+				<stat_bar label="出力パケット" name="simoutpps" unit_label="パケット／秒"/>
+				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
+				<stat_bar label="保留中のアップロード" name="simpendinguploads"/>
+				<stat_bar label="未承認の合計データ" name="simtotalunackedbytes"/>
+				<stat_view label="時間" name="simperf">
+					<stat_bar label="フレーム時間合計" name="simframemsec"/>
+					<stat_bar label="総時間数" name="simnetmsec"/>
+					<stat_bar label="物理的作用時間" name="simsimphysicsmsec"/>
+					<stat_bar label="シミュレーション時間" name="simsimothermsec"/>
+					<stat_bar label="エージェント時間" name="simagentmsec"/>
+					<stat_bar label="イメージ時間" name="simimagesmsec"/>
+					<stat_bar label="スクリプト時間" name="simscriptmsec"/>
+					<stat_bar label="スペア時間" name="simsparemsec"/>
+					<stat_view label="時間の詳細" name="timedetails">
+						<stat_bar label="物理効果の単位" name="simsimphysicsstepmsec"/>
+						<stat_bar label="物理形状を更新" name="simsimphysicsshapeupdatemsec"/>
+						<stat_bar label="他の物理効果" name="simsimphysicsothermsec"/>
+						<stat_bar label="スリープ時間" name="simsleepmsec"/>
+						<stat_bar label="ポンプ入出力" name="simpumpiomsec"/>
+					</stat_view>
+				</stat_view>
+			</stat_view>
+		</container_view>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
index b57857a09c..45e97bdf5d 100644
--- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sys_well_window" title="通知">
-  <string name="title_im_well_window">会話</string>
-  <string name="title_notification_well_window">通知</string>
-</floater>
\ No newline at end of file
+	<string name="title_im_well_window">
+		会話
+	</string>
+	<string name="title_notification_well_window">
+		通知
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index 1e68e1caf3..6ca900a83f 100644
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="telehub" title="テレハブ">
-  <text name="status_text_connected">物体[OBJECT]に接続されたテレハブ</text>
-  <text name="status_text_not_connected">テレハブ未接続</text>
-  <text name="help_text_connected">「切断」をクリックして削除します。</text>
-  <text name="help_text_not_connected">物体を選択して「テレハブの接続」をクリックしてください。</text>
-  <button label="テレハブの接続" name="connect_btn" />
-  <button label="切断" name="disconnect_btn" />
-  <text name="spawn_points_text">出現地点（物体ではなく位置）</text>
-  <button label="出現位置を追加" name="add_spawn_point_btn" />
-  <button label="出現地点を削除" name="remove_spawn_point_btn" />
-  <text name="spawn_point_help">オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。そうするとそのオブジェクトを移動させたり削除できます。
-位置はテレハブセンターに関連します。リストのアイテムを選択してインワールドでハイライトさせます。</text>
-</floater>
\ No newline at end of file
+	<text name="status_text_connected">
+		物体[OBJECT]に接続されたテレハブ
+	</text>
+	<text name="status_text_not_connected">
+		テレハブ未接続
+	</text>
+	<text name="help_text_connected">
+		「切断」をクリックして削除します。
+	</text>
+	<text name="help_text_not_connected">
+		物体を選択して「テレハブの接続」をクリックしてください。
+	</text>
+	<button label="テレハブの接続" name="connect_btn"/>
+	<button label="切断" name="disconnect_btn"/>
+	<text name="spawn_points_text">
+		出現地点（物体ではなく位置）
+	</text>
+	<button label="出現位置を追加" name="add_spawn_point_btn"/>
+	<button label="出現地点を削除" name="remove_spawn_point_btn"/>
+	<text name="spawn_point_help">
+		オブジェクトを選び、「出現地点を追加」をクリックして位置を指定します。そうするとそのオブジェクトを移動させたり削除できます。
+位置はテレハブセンターに関連します。リストのアイテムを選択してインワールドでハイライトさせます。
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_button.xml b/indra/newview/skins/default/xui/ja/floater_test_button.xml
index 7d53764d85..c7427e8ecf 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_button.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_button.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_button">
-  <button label="汎用ボタン" name="generic_button" />
-  <button name="bottom_delta_button" />
-  <button name="sans_serif_small_button" />
-  <button label="自動リサイズ" name="auto_resize_button" />
-  <button label="クリックでラベル変更" label_selected="新しいラベル" name="label_selected_button" />
-  <button label="ラベルに影をつけない" name="label_shadow_button" />
-  <button label="強調色のラベル" name="label_color_button" />
-  <button label="トグル" label_selected="トグル入" name="label_color_selected_button" />
-  <button label="無効" label_selected="選択済み" name="label_color_disabled_button" />
-  <button label="ハイライト" name="highlight_color_button" />
-  <button label="ホーバーでグローさせない" name="hover_glow_amount_button" />
-  <button name="image_button" />
-  <button name="image_color_button" />
-</floater>
\ No newline at end of file
+	<button label="汎用ボタン" name="generic_button"/>
+	<button name="bottom_delta_button"/>
+	<button name="sans_serif_small_button"/>
+	<button label="自動リサイズ" name="auto_resize_button"/>
+	<button label="クリックでラベル変更" label_selected="新しいラベル" name="label_selected_button"/>
+	<button label="ラベルに影をつけない" name="label_shadow_button"/>
+	<button label="強調色のラベル" name="label_color_button"/>
+	<button label="トグル" label_selected="トグル入" name="label_color_selected_button"/>
+	<button label="無効" label_selected="選択済み" name="label_color_disabled_button"/>
+	<button label="ハイライト" name="highlight_color_button"/>
+	<button label="ホーバーでグローさせない" name="hover_glow_amount_button"/>
+	<button name="image_button"/>
+	<button name="image_color_button"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml b/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
index 6e3540d135..c4bbd74e17 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_checkbox.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_checkbox">
-  <check_box label="おおっ！これはチェックボックスのようだ！" name="show_location_checkbox" />
-  <check_box label="最小のチェックボックス" name="minimal_checkbox" />
-  <check_box label="無効状態のチェックボックス" name="disabled_checkbox" />
-  <check_box label="有効時の文字色" name="text_enabled_color_checkbox" />
-  <check_box label="無効時の文字色" name="text_disabled_color_checkbox" />
-  <check_box label="チェックボックスの初期値" name="initial_value_checkbox" />
-  <check_box label="等幅フォント" name="font_checkbox" />
-</floater>
\ No newline at end of file
+	<check_box label="おおっ！これはチェックボックスのようだ！" name="show_location_checkbox"/>
+	<check_box label="最小のチェックボックス" name="minimal_checkbox"/>
+	<check_box label="無効状態のチェックボックス" name="disabled_checkbox"/>
+	<check_box label="有効時の文字色" name="text_enabled_color_checkbox"/>
+	<check_box label="無効時の文字色" name="text_disabled_color_checkbox"/>
+	<check_box label="チェックボックスの初期値" name="initial_value_checkbox"/>
+	<check_box label="等幅フォント" name="font_checkbox"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_combobox.xml b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml
index fe6ff97098..5059a9d57a 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_combobox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml
@@ -1,30 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_combobox">
-  <text type="string" length="1" height="16" layout="topleft" left="10" top="24" width="200">現実の使い道（ログイン場所）：</text>
-  <combo_box name="start_location_combo">
-    <combo_box.item label="最後に訪れた場所" name="MyLastLocation" value="last" />
-    <combo_box.item label="自分の家" name="MyHome" value="home" />
-    <combo_box.item label="＜リージョン（地域）名を入力＞" name="Typeregionname" value="" />
-  </combo_box>
-  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">最小のコンボボックス：</text>
-  <combo_box name="minimal_combo">
-    <combo_box.item label="最初" name="item1" value="first" />
-    <combo_box.item label="２つ目" name="item2" value="second" />
-  </combo_box>
-  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">テキスト入力を許可：</text>
-  <combo_box name="text_entry_combo">
-    <combo_box.item label="最初の項目" name="item1" value="first" />
-    <combo_box.item label="２つ目の項目" name="item2" value="second" />
-  </combo_box>
-  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">テキスト入力を許可。デフォルトは２つ目の項目：</text>
-  <combo_box name="text_entry_combo2">
-    <combo_box.item label="最初の項目" name="item1" value="first" />
-    <combo_box.item label="２つ目の項目" name="item2" value="second" />
-  </combo_box>
-  <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">２文字まで入力可能：</text>
-  <combo_box name="state_combo">
-    <combo_box.item label="CA" name="item1" value="ca" />
-    <combo_box.item label="NY" name="item2" value="ny" />
-    <combo_box.item label="TX" name="item3" value="tx" />
-  </combo_box>
-</floater>
\ No newline at end of file
+	<text type="string" length="1" height="16" layout="topleft" left="10" top="24" width="200">
+		現実の使い道（ログイン場所）：
+	</text>
+	<combo_box name="start_location_combo">
+		<combo_box.item label="最後に訪れた場所" name="MyLastLocation" value="last"/>
+		<combo_box.item label="自分の家" name="MyHome" value="home"/>
+		<combo_box.item label="＜リージョン（地域）名を入力＞" name="Typeregionname" value=""/>
+	</combo_box>
+	<text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">
+		最小のコンボボックス：
+	</text>
+	<combo_box name="minimal_combo">
+		<combo_box.item label="最初" name="item1" value="first"/>
+		<combo_box.item label="２つ目" name="item2" value="second"/>
+	</combo_box>
+	<text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">
+		テキスト入力を許可：
+	</text>
+	<combo_box name="text_entry_combo">
+		<combo_box.item label="最初の項目" name="item1" value="first"/>
+		<combo_box.item label="２つ目の項目" name="item2" value="second"/>
+	</combo_box>
+	<text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">
+		テキスト入力を許可。デフォルトは２つ目の項目：
+	</text>
+	<combo_box name="text_entry_combo2">
+		<combo_box.item label="最初の項目" name="item1" value="first"/>
+		<combo_box.item label="２つ目の項目" name="item2" value="second"/>
+	</combo_box>
+	<text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200">
+		２文字まで入力可能：
+	</text>
+	<combo_box name="state_combo">
+		<combo_box.item label="CA" name="item1" value="ca"/>
+		<combo_box.item label="NY" name="item2" value="ny"/>
+		<combo_box.item label="TX" name="item3" value="tx"/>
+	</combo_box>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml b/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
index c3c1de2a2b..c107b2bf69 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_inspectors" title="インスペクタのテスト">
-  <text name="test_inspectors">クリックしてインスペクターを生成します：</text>
-  <button name="avatar_2d_btn1" label="2Dアバター" />
-  <!-- InspectorA Tester -->
-  <button name="avatar_2d_btn5" label="2Dアバター" />
-  <!-- InspectorB Tester -->
-  <button name="avatar_2d_btn2" label="2Dアバター" />
-  <!-- InspectorC Tester -->
-  <button name="avatar_2d_btn3" label=" 2Dアバター" />
-  <!-- jarvtest Bombastic 2009-10-3 -->
-  <button name="avatar_2d_btn4" label="2Dアバター" />
-  <button name="avatar_3d_btn" label="3Dアバター" />
-  <button name="object_2d_btn" label="2Dオブジェクト" />
-  <button name="object_3d_btn" label="3Dオブジェクト" />
-  <button name="group_btn" label="グループ" />
-  <button name="place_btn" label="場所" />
-  <button name="event_btn" label="イベント" />
-  <text name="slurl">secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect</text>
-  <text name="slurl_group">secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect</text>
-</floater>
\ No newline at end of file
+	<text name="test_inspectors">
+		クリックしてインスペクターを生成します：
+	</text>
+	<button name="avatar_2d_btn1" label="2Dアバター"/>
+	<button name="avatar_2d_btn5" label="2Dアバター"/>
+	<button name="avatar_2d_btn2" label="2Dアバター"/>
+	<button name="avatar_2d_btn3" label=" 2Dアバター"/>
+	<button name="avatar_2d_btn4" label="2Dアバター"/>
+	<button name="avatar_3d_btn" label="3Dアバター"/>
+	<button name="object_2d_btn" label="2Dオブジェクト"/>
+	<button name="object_3d_btn" label="3Dオブジェクト"/>
+	<button name="group_btn" label="グループ"/>
+	<button name="place_btn" label="場所"/>
+	<button name="event_btn" label="イベント"/>
+	<text name="slurl">
+		secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect
+	</text>
+	<text name="slurl_group">
+		secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
index 26c78fe384..2a9be07c80 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Test Floater" title="レイアウトスタックテスト" />
+<floater name="Test Floater" title="レイアウトスタックテスト"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml b/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
index 32204b6e88..c480c80ba5 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
@@ -1,14 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_line_editor">
-  <line_editor name="enabled_line_editor" tool_tip="有効なラインエディタ">ラインエディタを有効化</line_editor>
-  <line_editor name="ascii_line_editor" prevalidate_callback="ascii" tool_tip="asciiラインエディタ">ASCIIのみのラインエディタ</line_editor>
-  <line_editor name="disabled_line_editor" tool_tip="無効なラインエディタ">ラインエディタを無効化</line_editor>
-  <line_editor name="enabled_colored_line_editor" tool_tip="有効な色付けされたラインエディタ">赤文字ラインエディタを有効化</line_editor>
-  <line_editor name="disabled_colored_line_editor" tool_tip="無効な色付けされたラインエディタ">赤文字ラインエディタを無効化</line_editor>
-  <line_editor name="left_pad_editor">左に25pxの余白</line_editor>
-  <line_editor name="left_pad_editor">右に75pxの余白</line_editor>
-  <line_editor name="left_pad_editor">左に25px、右に75pxの余白</line_editor>
-  <!-- "search_editor" is a specialized line_editor that shows read-only
-help text until the user clicks in the widget. -->
-  <search_editor label="検索語句を入力" name="search editor" tool_tip="エディタを検索" />
+	<line_editor name="enabled_line_editor" tool_tip="有効なラインエディタ">
+		ラインエディタを有効化
+	</line_editor>
+	<line_editor name="ascii_line_editor" prevalidate_callback="ascii" tool_tip="asciiラインエディタ">
+		ASCIIのみのラインエディタ
+	</line_editor>
+	<line_editor name="disabled_line_editor" tool_tip="無効なラインエディタ">
+		ラインエディタを無効化
+	</line_editor>
+	<line_editor name="enabled_colored_line_editor" tool_tip="有効な色付けされたラインエディタ">
+		赤文字ラインエディタを有効化
+	</line_editor>
+	<line_editor name="disabled_colored_line_editor" tool_tip="無効な色付けされたラインエディタ">
+		赤文字ラインエディタを無効化
+	</line_editor>
+	<line_editor name="left_pad_editor">
+		左に25pxの余白
+	</line_editor>
+	<line_editor name="left_pad_editor">
+		右に75pxの余白
+	</line_editor>
+	<line_editor name="left_pad_editor">
+		左に25px、右に75pxの余白
+	</line_editor>
+	<search_editor label="検索語句を入力" name="search editor" tool_tip="エディタを検索"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
index f9c3275e7f..cfacc0393c 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_radiogroup.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_radiogroup">
-  <radio_group name="parcel_voice_channel">
-    <radio_item label="不動産空間チャネルを使用" name="Estate" />
-    <radio_item label="プライベート空間チャネルを使用" name="Private" />
-    <radio_item label="この区画の空間でのボイスチャットを無効化" name="Disabled" />
-  </radio_group>
-  <radio_group name="simple_radio_group">
-    <radio_item label="label属性のラベル" name="label_radio_item" />
-    <radio_item label="テキストコンテンツのラベル" name="contents_radio_item" />
-  </radio_group>
-  <radio_group name="no_border_radio_group">
-    <radio_item label="Fooにはボーダーがありません" name="foo_radio_item" />
-    <radio_item label="ボーダーのバー無し" name="bar_item" />
-  </radio_group>
-</floater>
\ No newline at end of file
+	<radio_group name="parcel_voice_channel">
+		<radio_item label="不動産空間チャネルを使用" name="Estate"/>
+		<radio_item label="プライベート空間チャネルを使用" name="Private"/>
+		<radio_item label="この区画の空間でのボイスチャットを無効化" name="Disabled"/>
+	</radio_group>
+	<radio_group name="simple_radio_group">
+		<radio_item label="label属性のラベル" name="label_radio_item"/>
+		<radio_item label="テキストコンテンツのラベル" name="contents_radio_item"/>
+	</radio_group>
+	<radio_group name="no_border_radio_group">
+		<radio_item label="Fooにはボーダーがありません" name="foo_radio_item"/>
+		<radio_item label="ボーダーのバー無し" name="bar_item"/>
+	</radio_group>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_slider.xml b/indra/newview/skins/default/xui/ja/floater_test_slider.xml
index 5b02d51b14..a3c665155b 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_slider.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_slider.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_slider">
-  <slider label="Generic Slider" name="generic_slider" />
-  <slider label="コールバックスライダー" name="callback_slider" />
-  <slider label="値スライダー" max_val="5" min_val="1" name="value_slider" />
-  <slider label="ミニスライダー１" name="mini_slider_1" />
-  <slider label="ミニスライダー２" name="mini_slider_2" />
-  <slider_ name="slider_bar_vertical" />
-  <slider_bar label="スライダーバー" name="slider_bar" />
-  <slider label="赤スライダー" name="red_slider" />
-  <slider label="赤い垂直スライダー" name="red_slider_vertical" />
-</floater>
\ No newline at end of file
+	<slider label="Generic Slider" name="generic_slider"/>
+	<slider label="コールバックスライダー" name="callback_slider"/>
+	<slider label="値スライダー" max_val="5" min_val="1" name="value_slider"/>
+	<slider label="ミニスライダー１" name="mini_slider_1"/>
+	<slider label="ミニスライダー２" name="mini_slider_2"/>
+	<slider_ name="slider_bar_vertical"/>
+	<slider_bar label="スライダーバー" name="slider_bar"/>
+	<slider label="赤スライダー" name="red_slider"/>
+	<slider label="赤い垂直スライダー" name="red_slider_vertical"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_spinner.xml b/indra/newview/skins/default/xui/ja/floater_test_spinner.xml
index 2b3ce66c7a..2cac68188e 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_spinner.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_spinner.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_spinner">
-  <spinner label="汎用スピナー" name="generic_spinner" />
-  <spinner label="コールバックスピナー" name="callback_spinner" />
-  <spinner label="カラフルなスピナー" name="colorful_spinner" />
-  <spinner label="値スピナー" name="value_spinner" />
-  <spinner label="ミニスピナー１" name="mini_spinner_1" />
-  <spinner label="ミニスピナー２" name="mini_spinner_2" />
-  <spinner label="操作スピナー" name="control_spinner" />
-  <spinner label="左に続く" name="follows_left" />
-  <spinner label="右に続く" name="follows_right" />
-</floater>
\ No newline at end of file
+	<spinner label="汎用スピナー" name="generic_spinner"/>
+	<spinner label="コールバックスピナー" name="callback_spinner"/>
+	<spinner label="カラフルなスピナー" name="colorful_spinner"/>
+	<spinner label="値スピナー" name="value_spinner"/>
+	<spinner label="ミニスピナー１" name="mini_spinner_1"/>
+	<spinner label="ミニスピナー２" name="mini_spinner_2"/>
+	<spinner label="操作スピナー" name="control_spinner"/>
+	<spinner label="左に続く" name="follows_left"/>
+	<spinner label="右に続く" name="follows_right"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml b/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
index 36c59bfc2e..0933069ae6 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
@@ -1,6 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_test_text_editor">
-  <text_editor name="test_text_editor" tool_tip="テキストエディタ">テキストエディタ</text_editor>
-  <text_editor name="test_text_editor" tool_tip="テキストエディタ">これには長いテキストが含まれており、右に水平にスクロールする必要があります。</text_editor>
-  <text_editor name="numeric_text_editor" tool_tip="数値のみ入力可能なテキストエディタ">これは数字ではないテキストなので、表示されるべきではありません。</text_editor>
-</floater>
\ No newline at end of file
+	<text_editor name="test_text_editor" tool_tip="テキストエディタ">
+		テキストエディタ
+	</text_editor>
+	<text_editor name="test_text_editor" tool_tip="テキストエディタ">
+		これには長いテキストが含まれており、右に水平にスクロールする必要があります。
+	</text_editor>
+	<text_editor name="numeric_text_editor" tool_tip="数値のみ入力可能なテキストエディタ">
+		これは数字ではないテキストなので、表示されるべきではありません。
+	</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
index 15feab05e8..4274fa5a87 100644
--- a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Test Floater" title="テスト用ウィンドウ" />
+<floater name="Test Floater" title="テスト用ウィンドウ"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 8f69c43a85..61f3b0ab54 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -1,42 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="テクスチャの選択">
-  <floater.string name="choose_picture">クリックして画像を選択</floater.string>
-  <floater.string name="pick title">ピック：</floater.string>
-  <text name="Multiple">複数のテクスチャ</text>
-  <combo_box name="mode_selection">
-    <combo_box.item label="インベントリ" name="inventory" value="0" />
-    <combo_box.item label="ローカル" name="local" value="1" />
-  </combo_box>
-  <button label="デフォルト" label_selected="デフォルト" name="Default" />
-  <button label="ブランク" label_selected="ブランク" name="Blank" />
-  <button label="なし" label_selected="なし" name="None" />
-  <button label="" label_selected="" name="Pipette" />
-  <text name="preview_disabled" value="プレビュー無効" />
-  <filter_editor label="テクスチャをフィルタ" name="inventory search editor" />
-  <check_box initial_value="false" label="フォルダを表示" name="show_folders_check" />
-  <button label="追加" label_selected="追加" name="l_add_btn" />
-  <button label="削除" label_selected="削除" name="l_rem_btn" />
-  <button label="アップロード" label_selected="アップロード" name="l_upl_btn" />
-  <scroll_list name="l_name_list">
-    <column label="名前" name="unit_name" />
-    <column label="ＩＤ" name="unit_id_HIDDEN" />
-  </scroll_list>
-  <combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択">
-    <combo_box.item label="なし" name="None" />
-    <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD" />
-    <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER" />
-    <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER" />
-    <combo_box.item label="BAKED_EYES" name="BAKED_EYES" />
-    <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT" />
-    <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR" />
-    <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM" />
-    <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG" />
-    <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1" />
-    <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2" />
-    <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3" />
-  </combo_box>
-  <check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region" />
-  <button label="ＯＫ" label_selected="ＯＫ" name="Select" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-  <check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check" />
-</floater>
\ No newline at end of file
+	<floater.string name="choose_picture">
+		クリックして画像を選択
+	</floater.string>
+	<floater.string name="pick title">
+		ピック：
+	</floater.string>
+	<text name="Multiple">
+		複数のテクスチャ
+	</text>
+	<combo_box name="mode_selection">
+		<combo_box.item label="インベントリ" name="inventory" value="0"/>
+		<combo_box.item label="ローカル" name="local" value="1"/>
+	</combo_box>
+	<button label="デフォルト" label_selected="デフォルト" name="Default"/>
+	<button label="ブランク" label_selected="ブランク" name="Blank"/>
+	<button label="なし" label_selected="なし" name="None"/>
+	<button label="" label_selected="" name="Pipette"/>
+	<text name="preview_disabled" value="プレビュー無効"/>
+	<filter_editor label="テクスチャをフィルタ" name="inventory search editor"/>
+	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
+	<button label="追加" label_selected="追加" name="l_add_btn"/>
+	<button label="削除" label_selected="削除" name="l_rem_btn"/>
+	<button label="アップロード" label_selected="アップロード" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="名前" name="unit_name"/>
+		<column label="ＩＤ" name="unit_id_HIDDEN"/>
+	</scroll_list>
+	<combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/>
+		<combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/>
+		<combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/>
+		<combo_box.item label="BAKED_EYES" name="BAKED_EYES"/>
+		<combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/>
+		<combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/>
+		<combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/>
+		<combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/>
+		<combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/>
+		<combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/>
+		<combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/>
+	</combo_box>
+	<check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region"/>
+	<button label="ＯＫ" label_selected="ＯＫ" name="Select"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
index 8cc433f08c..c22cbba0d5 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
@@ -1,39 +1,77 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="TexFetchDebugger" title="テクスチャ取得デバッガ">
-  <text name="total_num_fetched_label">１，取得したテクスチャの合計数：[NUM]</text>
-  <text name="total_num_fetching_requests_label">２，取得リクエストの合計数：[NUM]</text>
-  <text name="total_num_cache_hits_label">３，キャッシュヒットの合計数：[NUM]</text>
-  <text name="total_num_visible_tex_label">４，表示テクスチャの合計数：[NUM]</text>
-  <text name="total_num_visible_tex_fetch_req_label">５，表示テクスチャ取得リクエストの合計数：[NUM]</text>
-  <text name="total_fetched_data_label">６，取得したデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル</text>
-  <text name="total_fetched_vis_data_label">７，表示データの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅</text>
-  <text name="total_fetched_rendered_data_label">８，レンダリングされたデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル</text>
-  <text name="total_time_cache_read_label">９，キャッシュ読み取りの合計時間：[TIME]秒</text>
-  <text name="total_time_cache_write_label">１０，キャッシュ書き込みの合計時間：[TIME]秒</text>
-  <text name="total_time_decode_label">１１，デコードの合計時間：[TIME]秒</text>
-  <text name="total_time_gl_label">１２，glテクスチャ作成の合計時間：[TIME]秒</text>
-  <text name="total_time_http_label">１３，HTTP取得の合計時間：[TIME]秒</text>
-  <text name="total_time_fetch_label">１４，取得全体の合計時間：[TIME]秒</text>
-  <text name="total_time_refetch_vis_cache_label">１５，キャッシュから表示テクスチャを再取得、時間：[TIME]秒、取得：[SIZE]㎅、[PIXEL]メガピクセル</text>
-  <text name="total_time_refetch_all_cache_label">１６，キャッシュからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
-  <text name="total_time_refetch_vis_http_label">１７，HTTPから可視ファイルを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
-  <text name="total_time_refetch_all_http_label">１８，HTTPからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル</text>
-  <spinner label="19、テセル／ピクセル比：" name="texel_pixel_ratio" />
-  <text name="texture_source_label">20、テクスチャ ソース：</text>
-  <radio_group name="texture_source">
-    <radio_item label="キャッシュ + HTTP" name="0" />
-    <radio_item label="HTTP のみ" name="1" />
-  </radio_group>
-  <button label="開始" name="start_btn" />
-  <button label="リセット" name="clear_btn" />
-  <button label="閉じる" name="close_btn" />
-  <button label="キャッシュ読み取り" name="cacheread_btn" />
-  <button label="キャッシュ書き込み" name="cachewrite_btn" />
-  <button label="HTTP" name="http_btn" />
-  <button label="デコード" name="decode_btn" />
-  <button label="GLテクスチャ" name="gl_btn" />
-  <button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn" />
-  <button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn" />
-  <button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn" />
-  <button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn" />
-</floater>
\ No newline at end of file
+	<text name="total_num_fetched_label">
+		１，取得したテクスチャの合計数：[NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		２，取得リクエストの合計数：[NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		３，キャッシュヒットの合計数：[NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		４，表示テクスチャの合計数：[NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		５，表示テクスチャ取得リクエストの合計数：[NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		６，取得したデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル
+	</text>
+	<text name="total_fetched_vis_data_label">
+		７，表示データの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		８，レンダリングされたデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_cache_read_label">
+		９，キャッシュ読み取りの合計時間：[TIME]秒
+	</text>
+	<text name="total_time_cache_write_label">
+		１０，キャッシュ書き込みの合計時間：[TIME]秒
+	</text>
+	<text name="total_time_decode_label">
+		１１，デコードの合計時間：[TIME]秒
+	</text>
+	<text name="total_time_gl_label">
+		１２，glテクスチャ作成の合計時間：[TIME]秒
+	</text>
+	<text name="total_time_http_label">
+		１３，HTTP取得の合計時間：[TIME]秒
+	</text>
+	<text name="total_time_fetch_label">
+		１４，取得全体の合計時間：[TIME]秒
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		１５，キャッシュから表示テクスチャを再取得、時間：[TIME]秒、取得：[SIZE]㎅、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		１６，キャッシュからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		１７，HTTPから可視ファイルを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		１８，HTTPからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル
+	</text>
+	<spinner label="19、テセル／ピクセル比：" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20、テクスチャ ソース：
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="キャッシュ + HTTP" name="0"/>
+		<radio_item label="HTTP のみ" name="1"/>
+	</radio_group>
+	<button label="開始" name="start_btn"/>
+	<button label="リセット" name="clear_btn"/>
+	<button label="閉じる" name="close_btn"/>
+	<button label="キャッシュ読み取り" name="cacheread_btn"/>
+	<button label="キャッシュ書き込み" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="デコード" name="decode_btn"/>
+	<button label="GLテクスチャ" name="gl_btn"/>
+	<button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/>
+	<button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn"/>
+	<button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/>
+	<button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 92cbdf9382..fb95a71ce0 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -1,283 +1,447 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="toolbox floater" short_title="制作" title="制作ツール">
-  <floater.string name="grid_screen_text">画面</floater.string>
-  <floater.string name="grid_local_text">ローカル</floater.string>
-  <floater.string name="grid_world_text">ワールド</floater.string>
-  <floater.string name="grid_reference_text">リファレンス</floater.string>
-  <floater.string name="grid_attachment_text">装着物</floater.string>
-  <floater.string name="status_rotate">色の付いたバンドをドラッグしてオブジェクトを回転</floater.string>
-  <floater.string name="status_scale">選択した側をクリックし、ドラッグで引き伸ばす</floater.string>
-  <floater.string name="status_move">移動：ドラッグ、コピー：Shift＋ドラッグ</floater.string>
-  <floater.string name="status_modifyland">土地をクリックし、ボタンを押したまま入力して修正変更</floater.string>
-  <floater.string name="status_camera">クリック＋ドラッグで視界移動</floater.string>
-  <floater.string name="status_grab">ドラッグで移動、Ctrlで持ち上げ、Ctrl＋Shiftで回転</floater.string>
-  <floater.string name="status_place">インワールドでクリックして作成</floater.string>
-  <floater.string name="status_selectland">土地をクリックし、ドラッグして選択</floater.string>
-  <floater.string name="status_selectcount">選択されているオブジェクトは[OBJ_COUNT]個、土地の負荷は[LAND_IMPACT]　[secondlife:///app/openfloater/object_weights 詳細]</floater.string>
-  <floater.string name="status_remaining_capacity">残りの許容数[LAND_CAPACITY]</floater.string>
-  <button label="" label_selected="" name="button focus" tool_tip="フォーカス" />
-  <button label="" label_selected="" name="button move" tool_tip="動かす" />
-  <button label="" label_selected="" name="button edit" tool_tip="編集" />
-  <button label="" label_selected="" name="button create" tool_tip="作成" />
-  <button label="" label_selected="" name="button land" tool_tip="土地" />
-  <text name="text status">移動するにはドラッグ、コピーするにはShiftキーを押しながらドラッグ</text>
-  <radio_group name="focus_radio_group">
-    <radio_item label="ズーム" name="radio zoom" />
-    <radio_item label="旋回（Ctrl）" name="radio orbit" />
-    <radio_item label="水平・垂直移動 (Ctrl＋Shift)" name="radio pan" />
-  </radio_group>
-  <radio_group name="move_radio_group">
-    <radio_item label="移動" name="radio move" />
-    <radio_item label="持ち上げる（Ctrl）" name="radio lift" />
-    <radio_item label="回転 (Ctrl＋Shift)" name="radio spin" />
-  </radio_group>
-  <radio_group name="edit_radio_group">
-    <radio_item label="移動" name="radio position" />
-    <radio_item label="回転（Ctrl）" name="radio rotate" />
-    <radio_item label="引き延ばす (Ctrl＋Shift)" name="radio stretch" />
-    <radio_item label="面を選択" name="radio select face" />
-  </radio_group>
-  <check_box label="リンク部分を編集" name="checkbox edit linked parts" />
-  <button label="リンク" name="link_btn" />
-  <button label="リンクを外す" name="unlink_btn" />
-  <check_box label="両側を引き伸ばす" name="checkbox uniform" />
-  <check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures" />
-  <check_box initial_value="true" label="グリッドにスナップ" name="checkbox snap to grid" />
-  <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
-    <combo_box.item label="ワールド" name="World" />
-    <combo_box.item label="ローカル" name="Local" />
-    <combo_box.item label="リファレンス" name="Reference" />
-  </combo_box>
-  <button label="" label_selected="オプション…" name="Options..." tool_tip="グリッドオプションを表示します" />
-  <button label="" label_selected="" name="ToolCube" tool_tip="キューブ" />
-  <button label="" label_selected="" name="ToolPrism" tool_tip="プリズム" />
-  <button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド" />
-  <button label="" label_selected="" name="ToolTetrahedron" tool_tip="4面体" />
-  <button label="" label_selected="" name="ToolCylinder" tool_tip="シリンダー" />
-  <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="半円柱" />
-  <button label="" label_selected="" name="ToolCone" tool_tip="円錐" />
-  <button label="" label_selected="" name="ToolHemiCone" tool_tip="半円錐" />
-  <button label="" label_selected="" name="ToolSphere" tool_tip="球体" />
-  <button label="" label_selected="" name="ToolHemiSphere" tool_tip="半球" />
-  <button label="" label_selected="" name="ToolTorus" tool_tip="トーラス" />
-  <button label="" label_selected="" name="ToolTube" tool_tip="チューブ" />
-  <button label="" label_selected="" name="ToolRing" tool_tip="リング" />
-  <button label="" label_selected="" name="ToolTree" tool_tip="樹木" />
-  <button label="" label_selected="" name="ToolGrass" tool_tip="草地" />
-  <check_box label="選択したツールを維持" name="checkbox sticky" />
-  <check_box label="選択したものをコピー" name="checkbox copy selection" />
-  <check_box label="中央に位置" name="checkbox copy centers" />
-  <check_box label="回転" name="checkbox copy rotates" />
-  <radio_group name="land_radio_group">
-    <radio_item label="土地を選択" name="radio select land" />
-    <radio_item label="ならす" name="radio flatten" />
-    <radio_item label="隆起" name="radio raise" />
-    <radio_item label="低くする" name="radio lower" />
-    <radio_item label="滑らかにする" name="radio smooth" />
-    <radio_item label="凸凹にする" name="radio noise" />
-    <radio_item label="元に戻す" name="radio revert" />
-  </radio_group>
-  <text name="Bulldozer:">ブルドーザー：</text>
-  <text name="Dozer Size:">サイズ：</text>
-  <text name="Strength:">強度：</text>
-  <button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します" />
-  <text name="selection_empty">何も選択されていません。</text>
-  <text name="remaining_capacity">[CAPACITY_STRING]　[secondlife:///app/openfloater/object_weights 詳細]</text>
-  <tab_container name="Object Info Tabs">
-    <panel label="一般" name="General">
-      <panel.string name="text deed continued">譲渡</panel.string>
-      <panel.string name="text deed">譲渡</panel.string>
-      <panel.string name="text modify info 1">このオブジェクトは、修正することができます。</panel.string>
-      <panel.string name="text modify info 2">これらのオブジェクトは、修正することができます。</panel.string>
-      <panel.string name="text modify info 3">このオブジェクトは、修正することができません。</panel.string>
-      <panel.string name="text modify info 4">これらのオブジェクトは、修正することができません。</panel.string>
-      <panel.string name="text modify info 5">リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。</panel.string>
-      <panel.string name="text modify info 6">リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。</panel.string>
-      <panel.string name="text modify warning">オブジェクト全体を選択して、権限の設定を行ってください。</panel.string>
-      <panel.string name="Cost Default">価格：L$</panel.string>
-      <panel.string name="Cost Total">合計：L$</panel.string>
-      <panel.string name="Cost Per Unit">単価：L$</panel.string>
-      <panel.string name="Cost Mixed">総額</panel.string>
-      <panel.string name="Sale Mixed">販売価格</panel.string>
-      <text name="Name:">名前：</text>
-      <line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大６３文字までです。長いプリム名は短縮されます。名前に使用できる文字は、ASCII-7（非拡張）に含まれる印字可能な文字のみです（パイプ文字「|」は例外）。" />
-      <text name="Description:">説明：</text>
-      <line_editor name="Object Description" tool_tip="ビューアーの設定で「すべてのオブジェクト上でヒントを表示」が選択されている場合、オブジェクトにマウスのポインタをかざすと、そのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
-      <text name="Creator:">制作者：</text>
-      <text name="Creator Name">Mrs. Esbee Linden (esbee.linden)</text>
-      <text name="Owner:">所有者：</text>
-      <text name="Owner Name">Mrs. Erica "Moose" Linden (erica.linden)</text>
-      <text name="Group:">グループ：</text>
-      <name_box initial_value="読み込んでいます…" name="Group Name Proxy" />
-      <button label="設定…" label_selected="設定…" name="button set group" tool_tip="このオブジェクト権限を共有したいグループを選択します。" />
-      <check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員に、このオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません" />
-      <button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます" />
-      <text name="label click action">クリックで：</text>
-      <combo_box name="clickaction" tool_tip="マウスを１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリック・アクションによっては、動作要件が必要なものもあります。たとえば、「触る」や「お支払い」には、スクリプトが必要になるなどです">
-        <combo_box.item label="触る（デフォルト）" name="Touch/grab(default)" />
-        <combo_box.item label="オブジェクトに座る" name="Sitonobject" />
-        <combo_box.item label="オブジェクトを購入する" name="Buyobject" />
-        <combo_box.item label="オブジェクトに支払う" name="Payobject" />
-        <combo_box.item label="開く" name="Open" />
-        <combo_box.item label="ズームする" name="Zoom" />
-        <combo_box.item label="なし" name="None" />
-      </combo_box>
-      <check_box label="販売対象：" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
-      <spinner label="L$" name="Edit Cost" tool_tip="オブジェクトの価格" />
-      <combo_box name="sale type" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
-        <combo_box.item label="コピー" name="Copy" />
-        <combo_box.item label="中身" name="Contents" />
-        <combo_box.item label="オブジェクトそのもの" name="Original" />
-      </combo_box>
-      <check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します。" />
-      <panel name="perms_build">
-        <text name="perm_modify">あなたは、このオブジェクトを修正することができます。</text>
-        <text name="Anyone can:">全員：</text>
-        <check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。" />
-        <check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
-        <text name="Next owner can:">譲渡先の所有者：</text>
-        <check_box label="修正" name="checkbox next owner can modify" tool_tip="譲渡先の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
-        <check_box label="コピー" name="checkbox next owner can copy" tool_tip="譲渡先の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制約があります。" />
-        <check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="譲渡先の所有者は、このオブジェクトを他人に譲渡したり再販することができます。" />
-        <text name="B:">Ｂ：</text>
-        <text name="O:">Ｃ：</text>
-        <text name="G:">Ｇ：</text>
-        <text name="E:">Ｅ：</text>
-        <text name="N:">Ｎ：</text>
-        <text name="F:">Ｆ：</text>
-      </panel>
-      <panel name="pathfinding_attrs_panel">
-        <text name="pathfinding_attributes_label">経路探索属性：</text>
-      </panel>
-    </panel>
-    <panel label="形状" name="Object">
-      <check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。この機能を使うと、制作中の意図せぬ編集を防ぐことができます。" />
-      <check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にします。" />
-      <check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後１分でオブジェクトは削除されます。" />
-      <check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突、またはオブジェクトとアバターの衝突を回避します。" />
-      <text name="label position">位置（メートル）</text>
-      <spinner label="Ｘ" name="Pos X" />
-      <spinner label="Ｙ" name="Pos Y" />
-      <spinner label="Ｚ" name="Pos Z" />
-      <text name="label size">サイズ（メートル）</text>
-      <spinner label="Ｘ" name="Scale X" />
-      <spinner label="Ｙ" name="Scale Y" />
-      <spinner label="Ｚ" name="Scale Z" />
-      <text name="label rotation">回転（度）</text>
-      <spinner label="Ｘ" name="Rot X" />
-      <spinner label="Ｙ" name="Rot Y" />
-      <spinner label="Ｚ" name="Rot Z" />
-      <combo_box name="comboBaseType">
-        <combo_box.item label="ボックス" name="Box" />
-        <combo_box.item label="シリンダー" name="Cylinder" />
-        <combo_box.item label="プリズム" name="Prism" />
-        <combo_box.item label="球体" name="Sphere" />
-        <combo_box.item label="トーラス" name="Torus" />
-        <combo_box.item label="チューブ" name="Tube" />
-        <combo_box.item label="リング" name="Ring" />
-        <combo_box.item label="スカルプト" name="Sculpted" />
-      </combo_box>
-      <text name="text cut">パスカット（始点と終点）</text>
-      <spinner label="始" name="cut begin" />
-      <spinner label="終" name="cut end" />
-      <text name="text hollow">中空（空洞）</text>
-      <text name="text skew">傾斜</text>
-      <text name="Hollow Shape">中空（空洞）の形</text>
-      <combo_box name="hole">
-        <combo_box.item label="デフォルト" name="Default" />
-        <combo_box.item label="サークル" name="Circle" />
-        <combo_box.item label="正方形" name="Square" />
-        <combo_box.item label="三角形" name="Triangle" />
-      </combo_box>
-      <text name="text twist">ひねり（始点と終点）</text>
-      <spinner label="始" name="Twist Begin" />
-      <spinner label="終" name="Twist End" />
-      <text name="scale_taper">テーパー</text>
-      <text name="scale_hole">穴寸法</text>
-      <spinner label="Ｘ" name="Taper Scale X" />
-      <spinner label="Ｙ" name="Taper Scale Y" />
-      <text name="text topshear">上部層</text>
-      <spinner label="Ｘ" name="Shear X" />
-      <spinner label="Ｙ" name="Shear Y" />
-      <text name="advanced_cut">プロフィールカット（始点と終点）</text>
-      <text name="advanced_dimple">くぼみ（始点と終点）</text>
-      <text name="advanced_slice">切り取り（始点と終点）</text>
-      <spinner label="始" name="Path Limit Begin" />
-      <spinner label="終" name="Path Limit End" />
-      <text name="text taper2">テーパー</text>
-      <spinner label="Ｘ" name="Taper X" />
-      <spinner label="Ｙ" name="Taper Y" />
-      <text name="text radius delta">半径</text>
-      <text name="text revolutions">回転体</text>
-      <texture_picker label="スカルプトテクスチャ" name="sculpt texture control" tool_tip="クリックして画像を選択してください。" />
-      <check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムをＸ軸上で反転させます" />
-      <check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返します" />
-      <text name="label sculpt type">縫い目のタイプ</text>
-      <combo_box name="sculpt type control">
-        <combo_box.item label="球体" name="Sphere" />
-        <combo_box.item label="トーラス" name="Torus" />
-        <combo_box.item label="平面" name="Plane" />
-        <combo_box.item label="シリンダー" name="Cylinder" />
-      </combo_box>
-    </panel>
-    <panel label="特徴" name="Features">
-      <panel.string name="None">なし</panel.string>
-      <panel.string name="Prim">プリム</panel.string>
-      <panel.string name="Convex Hull">凸状の外殻構造</panel.string>
-      <text name="select_single">プリムを１つだけ選択して編集してください。</text>
-      <text name="edit_object">オブジェクトの特徴を編集：</text>
-      <check_box label="アニメーションメッシュ" name="Animated Mesh Checkbox Ctrl" tool_tip="リグ入りメッシュオブジェクトを、それぞれアニメーションさせることができるようになります。" />
-      <check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Ｚ軸を中心に、オブジェクトの屈曲を有効にします。（クライアント側のみ）" />
-      <spinner label="柔軟性" name="FlexNumSections" />
-      <spinner label="重力" name="FlexGravity" />
-      <spinner label="ドラッグ" name="FlexFriction" />
-      <spinner label="風" name="FlexWind" />
-      <spinner label="緊張" name="FlexTension" />
-      <spinner label="Ｘ軸方向の力" name="FlexForceX" />
-      <spinner label="Ｙ軸方向の力" name="FlexForceY" />
-      <spinner label="Ｚ軸方向の力" name="FlexForceZ" />
-      <check_box label="発光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します" />
-      <color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
-      <texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）" />
-      <spinner label="輝度" name="Light Intensity" />
-      <spinner label="ＦＯＶ" name="Light FOV" />
-      <spinner label="半径" name="Light Radius" />
-      <spinner label="焦点" name="Light Focus" />
-      <spinner label="弱まる" name="Light Falloff" />
-      <spinner label="環境" name="Light Ambiance" />
-      <text name="label physicsshapetype">実像の種類：</text>
-      <combo_box name="Physics Shape Type Combo Ctrl" tool_tip="実像の種類を選択" />
-      <combo_box name="material">
-        <combo_box.item label="石" name="Stone" />
-        <combo_box.item label="金属" name="Metal" />
-        <combo_box.item label="ガラス" name="Glass" />
-        <combo_box.item label="木" name="Wood" />
-        <combo_box.item label="肌" name="Flesh" />
-        <combo_box.item label="プラスチック" name="Plastic" />
-        <combo_box.item label="ゴム" name="Rubber" />
-      </combo_box>
-      <spinner label="重力" name="Physics Gravity" />
-      <spinner label="摩擦" name="Physics Friction" />
-      <spinner label="密度（１００㎏/㎥）" name="Physics Density" />
-      <spinner label="復元" name="Physics Restitution" />
-    </panel>
-    <panel label="材質" name="Texture" />
-    <panel label="中身" name="Contents">
-      <button label="新規スクリプト" label_selected="新規スクリプト" name="button new script" />
-      <button label="権限" name="button permissions" />
-    </panel>
-  </tab_container>
-  <panel name="land info panel">
-    <text name="label_parcel_info">区画情報</text>
-    <text name="label_area_price">価格：[AREA]㎡　L$ [PRICE]</text>
-    <text name="label_area">面積：[AREA]㎡</text>
-    <button label="土地情報" label_selected="土地情報" name="button about land" />
-    <check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけます：緑色＝あなたの土地　水色＝あなたのグループ所有地　赤色＝他人が所有する土地　黄色 = 売り出し中　紫色＝オークション　灰色＝公共領域" />
-    <text name="label_parcel_modify">区画の編集</text>
-    <button label="再分割" label_selected="再分割" name="button subdivide land" />
-    <button label="統合" label_selected="統合" name="button join land" />
-    <text name="label_parcel_trans">土地取引</text>
-    <button label="土地の購入" label_selected="土地の購入" name="button buy land" />
-    <button label="土地の放棄" label_selected="土地の放棄" name="button abandon land" />
-  </panel>
-</floater>
\ No newline at end of file
+	<floater.string name="grid_screen_text">
+		画面
+	</floater.string>
+	<floater.string name="grid_local_text">
+		ローカル
+	</floater.string>
+	<floater.string name="grid_world_text">
+		ワールド
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		リファレンス
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		装着物
+	</floater.string>
+	<floater.string name="status_rotate">
+		色の付いたバンドをドラッグしてオブジェクトを回転
+	</floater.string>
+	<floater.string name="status_scale">
+		選択した側をクリックし、ドラッグで引き伸ばす
+	</floater.string>
+	<floater.string name="status_move">
+		移動：ドラッグ、コピー：Shift＋ドラッグ
+	</floater.string>
+	<floater.string name="status_modifyland">
+		土地をクリックし、ボタンを押したまま入力して修正変更
+	</floater.string>
+	<floater.string name="status_camera">
+		クリック＋ドラッグで視界移動
+	</floater.string>
+	<floater.string name="status_grab">
+		ドラッグで移動、Ctrlで持ち上げ、Ctrl＋Shiftで回転
+	</floater.string>
+	<floater.string name="status_place">
+		インワールドでクリックして作成
+	</floater.string>
+	<floater.string name="status_selectland">
+		土地をクリックし、ドラッグして選択
+	</floater.string>
+	<floater.string name="status_selectcount">
+		選択されているオブジェクトは[OBJ_COUNT]個、土地の負荷は[LAND_IMPACT]　[secondlife:///app/openfloater/object_weights 詳細]
+	</floater.string>
+	<floater.string name="status_remaining_capacity">
+		残りの許容数[LAND_CAPACITY]
+	</floater.string>
+	<button label="" label_selected="" name="button focus" tool_tip="フォーカス"/>
+	<button label="" label_selected="" name="button move" tool_tip="動かす"/>
+	<button label="" label_selected="" name="button edit" tool_tip="編集"/>
+	<button label="" label_selected="" name="button create" tool_tip="作成"/>
+	<button label="" label_selected="" name="button land" tool_tip="土地"/>
+	<text name="text status">
+		移動するにはドラッグ、コピーするにはShiftキーを押しながらドラッグ
+	</text>
+	<radio_group name="focus_radio_group">
+		<radio_item label="ズーム" name="radio zoom"/>
+		<radio_item label="旋回（Ctrl）" name="radio orbit"/>
+		<radio_item label="水平・垂直移動 (Ctrl＋Shift)" name="radio pan"/>
+	</radio_group>
+	<radio_group name="move_radio_group">
+		<radio_item label="移動" name="radio move"/>
+		<radio_item label="持ち上げる（Ctrl）" name="radio lift"/>
+		<radio_item label="回転 (Ctrl＋Shift)" name="radio spin"/>
+	</radio_group>
+	<radio_group name="edit_radio_group">
+		<radio_item label="移動" name="radio position"/>
+		<radio_item label="回転（Ctrl）" name="radio rotate"/>
+		<radio_item label="引き延ばす (Ctrl＋Shift)" name="radio stretch"/>
+		<radio_item label="面を選択" name="radio select face"/>
+	</radio_group>
+	<check_box label="リンク部分を編集" name="checkbox edit linked parts"/>
+	<button label="リンク" name="link_btn"/>
+	<button label="リンクを外す" name="unlink_btn"/>
+	<check_box label="両側を引き伸ばす" name="checkbox uniform"/>
+	<check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/>
+	<check_box initial_value="true" label="グリッドにスナップ" name="checkbox snap to grid"/>
+	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
+		<combo_box.item label="ワールド" name="World"/>
+		<combo_box.item label="ローカル" name="Local"/>
+		<combo_box.item label="リファレンス" name="Reference"/>
+	</combo_box>
+	<button label="" label_selected="オプション…" name="Options..." tool_tip="グリッドオプションを表示します"/>
+	<button label="" label_selected="" name="ToolCube" tool_tip="キューブ"/>
+	<button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/>
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/>
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="4面体"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="シリンダー"/>
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="半円柱"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="円錐"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="半円錐"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="球体"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="半球"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="トーラス"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="チューブ"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="リング"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="樹木"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="草地"/>
+	<check_box label="選択したツールを維持" name="checkbox sticky"/>
+	<check_box label="選択したものをコピー" name="checkbox copy selection"/>
+	<check_box label="中央に位置" name="checkbox copy centers"/>
+	<check_box label="回転" name="checkbox copy rotates"/>
+	<radio_group name="land_radio_group">
+		<radio_item label="土地を選択" name="radio select land"/>
+		<radio_item label="ならす" name="radio flatten"/>
+		<radio_item label="隆起" name="radio raise"/>
+		<radio_item label="低くする" name="radio lower"/>
+		<radio_item label="滑らかにする" name="radio smooth"/>
+		<radio_item label="凸凹にする" name="radio noise"/>
+		<radio_item label="元に戻す" name="radio revert"/>
+	</radio_group>
+	<text name="Bulldozer:">
+		ブルドーザー：
+	</text>
+	<text name="Dozer Size:">
+		サイズ：
+	</text>
+	<text name="Strength:">
+		強度：
+	</text>
+	<button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します"/>
+	<text name="selection_empty">
+		何も選択されていません。
+	</text>
+	<text name="remaining_capacity">
+		[CAPACITY_STRING]　[secondlife:///app/openfloater/object_weights 詳細]
+	</text>
+	<tab_container name="Object Info Tabs">
+		<panel label="一般" name="General">
+			<panel.string name="text deed continued">
+				譲渡
+			</panel.string>
+			<panel.string name="text deed">
+				譲渡
+			</panel.string>
+			<panel.string name="text modify info 1">
+				このオブジェクトは、修正することができます。
+			</panel.string>
+			<panel.string name="text modify info 2">
+				これらのオブジェクトは、修正することができます。
+			</panel.string>
+			<panel.string name="text modify info 3">
+				このオブジェクトは、修正することができません。
+			</panel.string>
+			<panel.string name="text modify info 4">
+				これらのオブジェクトは、修正することができません。
+			</panel.string>
+			<panel.string name="text modify info 5">
+				リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。
+			</panel.string>
+			<panel.string name="text modify info 6">
+				リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。
+			</panel.string>
+			<panel.string name="text modify warning">
+				オブジェクト全体を選択して、権限の設定を行ってください。
+			</panel.string>
+			<panel.string name="Cost Default">
+				価格：L$
+			</panel.string>
+			<panel.string name="Cost Total">
+				合計：L$
+			</panel.string>
+			<panel.string name="Cost Per Unit">
+				単価：L$
+			</panel.string>
+			<panel.string name="Cost Mixed">
+				総額
+			</panel.string>
+			<panel.string name="Sale Mixed">
+				販売価格
+			</panel.string>
+			<text name="Name:">
+				名前：
+			</text>
+			<line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大６３文字までです。長いプリム名は短縮されます。名前に使用できる文字は、ASCII-7（非拡張）に含まれる印字可能な文字のみです（パイプ文字「|」は例外）。"/>
+			<text name="Description:">
+				説明：
+			</text>
+			<line_editor name="Object Description" tool_tip="ビューアーの設定で「すべてのオブジェクト上でヒントを表示」が選択されている場合、オブジェクトにマウスのポインタをかざすと、そのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大 127 バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
+			<text name="Creator:">
+				制作者：
+			</text>
+			<text name="Creator Name">
+				Mrs. Esbee Linden (esbee.linden)
+			</text>
+			<text name="Owner:">
+				所有者：
+			</text>
+			<text name="Owner Name">
+				Mrs. Erica "Moose" Linden (erica.linden)
+			</text>
+			<text name="Group:">
+				グループ：
+			</text>
+			<name_box initial_value="読み込んでいます…" name="Group Name Proxy"/>
+			<button label="設定…" label_selected="設定…" name="button set group" tool_tip="このオブジェクト権限を共有したいグループを選択します。"/>
+			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員に、このオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません"/>
+			<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます"/>
+			<text name="label click action">
+				クリックで：
+			</text>
+			<combo_box name="clickaction" tool_tip="マウスを１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリック・アクションによっては、動作要件が必要なものもあります。たとえば、「触る」や「お支払い」には、スクリプトが必要になるなどです">
+				<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
+				<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
+				<combo_box.item label="オブジェクトを購入する" name="Buyobject"/>
+				<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
+				<combo_box.item label="開く" name="Open"/>
+				<combo_box.item label="ズームする" name="Zoom"/>
+				<combo_box.item label="なし" name="None"/>
+			</combo_box>
+			<check_box label="販売対象：" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
+			<spinner label="L$" name="Edit Cost" tool_tip="オブジェクトの価格"/>
+			<combo_box name="sale type" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
+				<combo_box.item label="コピー" name="Copy"/>
+				<combo_box.item label="中身" name="Contents"/>
+				<combo_box.item label="オブジェクトそのもの" name="Original"/>
+			</combo_box>
+			<check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します。"/>
+			<panel name="perms_build">
+				<text name="perm_modify">
+					あなたは、このオブジェクトを修正することができます。
+				</text>
+				<text name="Anyone can:">
+					全員：
+				</text>
+				<check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。"/>
+				<check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
+				<text name="Next owner can:">
+					譲渡先の所有者：
+				</text>
+				<check_box label="修正" name="checkbox next owner can modify" tool_tip="譲渡先の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
+				<check_box label="コピー" name="checkbox next owner can copy" tool_tip="譲渡先の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制約があります。"/>
+				<check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="譲渡先の所有者は、このオブジェクトを他人に譲渡したり再販することができます。"/>
+				<text name="B:">
+					Ｂ：
+				</text>
+				<text name="O:">
+					Ｃ：
+				</text>
+				<text name="G:">
+					Ｇ：
+				</text>
+				<text name="E:">
+					Ｅ：
+				</text>
+				<text name="N:">
+					Ｎ：
+				</text>
+				<text name="F:">
+					Ｆ：
+				</text>
+			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					経路探索属性：
+				</text>
+			</panel>
+		</panel>
+		<panel label="形状" name="Object">
+			<check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。この機能を使うと、制作中の意図せぬ編集を防ぐことができます。"/>
+			<check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にします。"/>
+			<check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後１分でオブジェクトは削除されます。"/>
+			<check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突、またはオブジェクトとアバターの衝突を回避します。"/>
+			<text name="label position">
+				位置（メートル）
+			</text>
+			<spinner label="Ｘ" name="Pos X"/>
+			<spinner label="Ｙ" name="Pos Y"/>
+			<spinner label="Ｚ" name="Pos Z"/>
+			<text name="label size">
+				サイズ（メートル）
+			</text>
+			<spinner label="Ｘ" name="Scale X"/>
+			<spinner label="Ｙ" name="Scale Y"/>
+			<spinner label="Ｚ" name="Scale Z"/>
+			<text name="label rotation">
+				回転（度）
+			</text>
+			<spinner label="Ｘ" name="Rot X"/>
+			<spinner label="Ｙ" name="Rot Y"/>
+			<spinner label="Ｚ" name="Rot Z"/>
+			<combo_box name="comboBaseType">
+				<combo_box.item label="ボックス" name="Box"/>
+				<combo_box.item label="シリンダー" name="Cylinder"/>
+				<combo_box.item label="プリズム" name="Prism"/>
+				<combo_box.item label="球体" name="Sphere"/>
+				<combo_box.item label="トーラス" name="Torus"/>
+				<combo_box.item label="チューブ" name="Tube"/>
+				<combo_box.item label="リング" name="Ring"/>
+				<combo_box.item label="スカルプト" name="Sculpted"/>
+			</combo_box>
+			<text name="text cut">
+				パスカット（始点と終点）
+			</text>
+			<spinner label="始" name="cut begin"/>
+			<spinner label="終" name="cut end"/>
+			<text name="text hollow">
+				中空（空洞）
+			</text>
+			<text name="text skew">
+				傾斜
+			</text>
+			<text name="Hollow Shape">
+				中空（空洞）の形
+			</text>
+			<combo_box name="hole">
+				<combo_box.item label="デフォルト" name="Default"/>
+				<combo_box.item label="サークル" name="Circle"/>
+				<combo_box.item label="正方形" name="Square"/>
+				<combo_box.item label="三角形" name="Triangle"/>
+			</combo_box>
+			<text name="text twist">
+				ひねり（始点と終点）
+			</text>
+			<spinner label="始" name="Twist Begin"/>
+			<spinner label="終" name="Twist End"/>
+			<text name="scale_taper">
+				テーパー
+			</text>
+			<text name="scale_hole">
+				穴寸法
+			</text>
+			<spinner label="Ｘ" name="Taper Scale X"/>
+			<spinner label="Ｙ" name="Taper Scale Y"/>
+			<text name="text topshear">
+				上部層
+			</text>
+			<spinner label="Ｘ" name="Shear X"/>
+			<spinner label="Ｙ" name="Shear Y"/>
+			<text name="advanced_cut">
+				プロフィールカット（始点と終点）
+			</text>
+			<text name="advanced_dimple">
+				くぼみ（始点と終点）
+			</text>
+			<text name="advanced_slice">
+				切り取り（始点と終点）
+			</text>
+			<spinner label="始" name="Path Limit Begin"/>
+			<spinner label="終" name="Path Limit End"/>
+			<text name="text taper2">
+				テーパー
+			</text>
+			<spinner label="Ｘ" name="Taper X"/>
+			<spinner label="Ｙ" name="Taper Y"/>
+			<text name="text radius delta">
+				半径
+			</text>
+			<text name="text revolutions">
+				回転体
+			</text>
+			<texture_picker label="スカルプトテクスチャ" name="sculpt texture control" tool_tip="クリックして画像を選択してください。"/>
+			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムをＸ軸上で反転させます"/>
+			<check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返します"/>
+			<text name="label sculpt type">
+				縫い目のタイプ
+			</text>
+			<combo_box name="sculpt type control">
+				<combo_box.item label="球体" name="Sphere"/>
+				<combo_box.item label="トーラス" name="Torus"/>
+				<combo_box.item label="平面" name="Plane"/>
+				<combo_box.item label="シリンダー" name="Cylinder"/>
+			</combo_box>
+		</panel>
+		<panel label="特徴" name="Features">
+			<panel.string name="None">
+				なし
+			</panel.string>
+			<panel.string name="Prim">
+				プリム
+			</panel.string>
+			<panel.string name="Convex Hull">
+				凸状の外殻構造
+			</panel.string>
+			<text name="select_single">
+				プリムを１つだけ選択して編集してください。
+			</text>
+			<text name="edit_object">
+				オブジェクトの特徴を編集：
+			</text>
+			<check_box label="アニメーションメッシュ" name="Animated Mesh Checkbox Ctrl" tool_tip="リグ入りメッシュオブジェクトを、それぞれアニメーションさせることができるようになります。"/>
+			<check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Ｚ軸を中心に、オブジェクトの屈曲を有効にします。（クライアント側のみ）"/>
+			<spinner label="柔軟性" name="FlexNumSections"/>
+			<spinner label="重力" name="FlexGravity"/>
+			<spinner label="ドラッグ" name="FlexFriction"/>
+			<spinner label="風" name="FlexWind"/>
+			<spinner label="緊張" name="FlexTension"/>
+			<spinner label="Ｘ軸方向の力" name="FlexForceX"/>
+			<spinner label="Ｙ軸方向の力" name="FlexForceY"/>
+			<spinner label="Ｚ軸方向の力" name="FlexForceZ"/>
+			<check_box label="発光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します"/>
+			<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）"/>
+			<spinner label="輝度" name="Light Intensity"/>
+			<spinner label="ＦＯＶ" name="Light FOV"/>
+			<spinner label="半径" name="Light Radius"/>
+			<spinner label="焦点" name="Light Focus"/>
+			<spinner label="弱まる" name="Light Falloff"/>
+			<spinner label="環境" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				実像の種類：
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="実像の種類を選択"/>
+			<combo_box name="material">
+				<combo_box.item label="石" name="Stone"/>
+				<combo_box.item label="金属" name="Metal"/>
+				<combo_box.item label="ガラス" name="Glass"/>
+				<combo_box.item label="木" name="Wood"/>
+				<combo_box.item label="肌" name="Flesh"/>
+				<combo_box.item label="プラスチック" name="Plastic"/>
+				<combo_box.item label="ゴム" name="Rubber"/>
+			</combo_box>
+			<spinner label="重力" name="Physics Gravity"/>
+			<spinner label="摩擦" name="Physics Friction"/>
+			<spinner label="密度（１００㎏/㎥）" name="Physics Density"/>
+			<spinner label="復元" name="Physics Restitution"/>
+		</panel>
+		<panel label="材質" name="Texture"/>
+		<panel label="中身" name="Contents">
+			<button label="新規スクリプト" label_selected="新規スクリプト" name="button new script"/>
+			<button label="権限" name="button permissions"/>
+		</panel>
+	</tab_container>
+	<panel name="land info panel">
+		<text name="label_parcel_info">
+			区画情報
+		</text>
+		<text name="label_area_price">
+			価格：[AREA]㎡　L$ [PRICE]
+		</text>
+		<text name="label_area">
+			面積：[AREA]㎡
+		</text>
+		<button label="土地情報" label_selected="土地情報" name="button about land"/>
+		<check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけます：緑色＝あなたの土地　水色＝あなたのグループ所有地　赤色＝他人が所有する土地　黄色 = 売り出し中　紫色＝オークション　灰色＝公共領域"/>
+		<text name="label_parcel_modify">
+			区画の編集
+		</text>
+		<button label="再分割" label_selected="再分割" name="button subdivide land"/>
+		<button label="統合" label_selected="統合" name="button join land"/>
+		<text name="label_parcel_trans">
+			土地取引
+		</text>
+		<button label="土地の購入" label_selected="土地の購入" name="button buy land"/>
+		<button label="土地の放棄" label_selected="土地の放棄" name="button abandon land"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index 81e4a74d48..86ab64cb3e 100644
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -1,36 +1,64 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="トップオブジェクト">
-  <floater.string name="top_scripts_title">トップ・スクリプト</floater.string>
-  <floater.string name="top_scripts_text">[COUNT]個のスクリプトの実行に[TIME]分かかり、[MEMORY]㎅使用しています。</floater.string>
-  <floater.string name="scripts_score_label">時間</floater.string>
-  <floater.string name="top_colliders_title">上部コライダー</floater.string>
-  <floater.string name="top_colliders_text">上位[COUNT]個の物体は多くの衝突可能性があります。</floater.string>
-  <floater.string name="colliders_score_label">数</floater.string>
-  <floater.string name="none_descriptor">何も見つかりませんでした。</floater.string>
-  <floater.string name="URLs">ＵＲＬ</floater.string>
-  <floater.string name="memory">メモリ（㎅）</floater.string>
-  <text name="title_text">読み込んでいます…</text>
-  <scroll_list name="objects_list">
-    <scroll_list.columns label="数" name="score" />
-    <scroll_list.columns label="名前" name="name" />
-    <scroll_list.columns label="所有者" name="owner" />
-    <scroll_list.columns label="ロケーション" name="location" />
-    <scroll_list.columns label="区画" name="parcel" />
-    <scroll_list.columns label="日付" name="time" />
-    <scroll_list.columns label="URL" name="URLs" />
-    <scroll_list.columns label="メモリ（㎅）" name="memory" />
-  </scroll_list>
-  <text name="id_text">物体ＩＤ：</text>
-  <button label="標識を表示" name="show_beacon_btn" />
-  <text name="obj_name_text">オブジェクト名：</text>
-  <button label="フィルタ" name="filter_object_btn" />
-  <text name="owner_name_text">所有者：</text>
-  <button label="フィルタ" name="filter_owner_btn" />
-  <text name="parcel_name_text">区画：</text>
-  <button label="フィルタ" name="filter_parcel_btn" />
-  <button label="更新" name="refresh_btn" />
-  <button label="選択内容を返却" name="return_selected_btn" />
-  <button label="すべて返却" name="return_all_btn" />
-  <button label="選択内容を無効化" name="disable_selected_btn" />
-  <button label="すべて無効化" name="disable_all_btn" />
-</floater>
\ No newline at end of file
+	<floater.string name="top_scripts_title">
+		トップ・スクリプト
+	</floater.string>
+	<floater.string name="top_scripts_text">
+		[COUNT]個のスクリプトの実行に[TIME]分かかり、[MEMORY]㎅使用しています。
+	</floater.string>
+	<floater.string name="scripts_score_label">
+		時間
+	</floater.string>
+	<floater.string name="top_colliders_title">
+		上部コライダー
+	</floater.string>
+	<floater.string name="top_colliders_text">
+		上位[COUNT]個の物体は多くの衝突可能性があります。
+	</floater.string>
+	<floater.string name="colliders_score_label">
+		数
+	</floater.string>
+	<floater.string name="none_descriptor">
+		何も見つかりませんでした。
+	</floater.string>
+	<floater.string name="URLs">
+		ＵＲＬ
+	</floater.string>
+	<floater.string name="memory">
+		メモリ（㎅）
+	</floater.string>
+	<text name="title_text">
+		読み込んでいます…
+	</text>
+	<scroll_list name="objects_list">
+		<scroll_list.columns label="数" name="score"/>
+		<scroll_list.columns label="名前" name="name"/>
+		<scroll_list.columns label="所有者" name="owner"/>
+		<scroll_list.columns label="ロケーション" name="location"/>
+		<scroll_list.columns label="区画" name="parcel"/>
+		<scroll_list.columns label="日付" name="time"/>
+		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="メモリ（㎅）" name="memory"/>
+	</scroll_list>
+	<text name="id_text">
+		物体ＩＤ：
+	</text>
+	<button label="標識を表示" name="show_beacon_btn"/>
+	<text name="obj_name_text">
+		オブジェクト名：
+	</text>
+	<button label="フィルタ" name="filter_object_btn"/>
+	<text name="owner_name_text">
+		所有者：
+	</text>
+	<button label="フィルタ" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		区画：
+	</text>
+	<button label="フィルタ" name="filter_parcel_btn"/>
+	<button label="更新" name="refresh_btn"/>
+	<button label="選択内容を返却" name="return_selected_btn"/>
+	<button label="すべて返却" name="return_all_btn"/>
+	<button label="選択内容を無効化" name="disable_selected_btn"/>
+	<button label="すべて無効化" name="disable_all_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
index 8d55ac3112..7ec5886dca 100644
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title=" ">
-  <floater.string name="real_url">http://secondlife.com/app/tos/</floater.string>
-  <floater.string name="loading_url">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</floater.string>
-  <text name="tos_heading">次の Second Lifeの利用規約、プライバシーポリシー、およびサービス規約（仲裁の利用および紛争解決のためのいかなるクラスまたはグループの請求の放棄に関する必要条件を含む）をお読みください。
-[SECOND_LIFE]へのログインを続けるには、これらの規約に同意する必要があります。</text>
-  <text name="external_tos_required">操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。</text>
-  <check_box label="" name="agree_chk" />
-  <text name="agree_list">私は、Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）を読み、同意しました。	</text>
-  <button label="続ける" label_selected="続ける" name="Continue" />
-  <button label="キャンセル" label_selected="キャンセル" name="Cancel" />
-</floater>
\ No newline at end of file
+	<floater.string name="real_url">
+		http://secondlife.com/app/tos/
+	</floater.string>
+	<floater.string name="loading_url">
+		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
+	</floater.string>
+	<text name="tos_heading">
+		次の Second Lifeの利用規約、プライバシーポリシー、およびサービス規約（仲裁の利用および紛争解決のためのいかなるクラスまたはグループの請求の放棄に関する必要条件を含む）をお読みください。
+[SECOND_LIFE]へのログインを続けるには、これらの規約に同意する必要があります。
+	</text>
+	<text name="external_tos_required">
+		操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。
+	</text>
+	<check_box label="" name="agree_chk"/>
+	<text name="agree_list">
+		私は、Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）を読み、同意しました。
+	</text>
+	<button label="続ける" label_selected="続ける" name="Continue"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml
index 0a3b29b22f..682352ec82 100644
--- a/indra/newview/skins/default/xui/ja/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_toybox.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Toybox" title="ツールバーのボタン">
-  <text name="toybox label 1">ボタンをツールバーに追加または削除するにはボタンをドラッグします。</text>
-  <text name="toybox label 2">各ツールバーの設定に応じて、ボタンは以下のように表示されたり、アイコンのみで表示されます。</text>
-  <button label="ツールバーを全てクリア" label_selected="ツールバーを全てクリア" name="btn_clear_all" />
-  <button label="デフォルト設定を復元" label_selected="デフォルト設定を復元" name="btn_restore_defaults" />
-</floater>
\ No newline at end of file
+	<text name="toybox label 1">
+		ボタンをツールバーに追加または削除するにはボタンをドラッグします。
+	</text>
+	<text name="toybox label 2">
+		各ツールバーの設定に応じて、ボタンは以下のように表示されたり、アイコンのみで表示されます。
+	</text>
+	<button label="ツールバーを全てクリア" label_selected="ツールバーを全てクリア" name="btn_clear_all"/>
+	<button label="デフォルト設定を復元" label_selected="デフォルト設定を復元" name="btn_restore_defaults"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
index 8498e76095..8bbcbcdfed 100644
--- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
@@ -1,83 +1,98 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_translation_settings" title="チャットの翻訳設定">
-
-  <string name="azure_api_key_not_verified">Azureサービス識別子の認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。</string>
-  <string name="google_api_key_not_verified">Google APIキーの認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。</string>
-  <string name="deepl_api_key_not_verified">DeepL Authキーの認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。</string>
-
-  <string name="azure_api_key_verified">Azureサービス識別子が認証されました。</string>
-  <string name="google_api_key_verified">Google APIキーが認証されました。</string>
-  <string name="deepl_api_key_verified">DeepL APIキーが認証されました。</string>
-
-  <check_box label="チャット時の機械翻訳機能を有効にする" name="translate_chat_checkbox" />
-  <text name="translate_language_label">翻訳する言語：</text>
-  <combo_box name="translate_language_combo">
-    <combo_box.item label="システム標準" name="System Default Language" />
-    <combo_box.item label="英語" name="English" />
-    <!-- After "System Default" and "English", please keep the rest of these combo_box.items in alphabetical order by the first character in the string. -->
-    <combo_box.item label="Dansk（デンマーク語）" name="Danish" />
-    <combo_box.item label="Deutsch（ドイツ語）" name="German" />
-    <combo_box.item label="Español（スペイン語）" name="Spanish" />
-    <combo_box.item label="Français（フランス語）" name="French" />
-    <combo_box.item label="Italiano（イタリア語）" name="Italian" />
-    <combo_box.item label="Magyar（ハンガリー語）" name="Hungarian" />
-    <combo_box.item label="Nederlands（オランダ語）" name="Dutch" />
-    <combo_box.item label="Polski（ポーランド語）" name="Polish" />
-    <combo_box.item label="Português（ポルトガル語）" name="Portugese" />
-    <combo_box.item label="Русский（ロシア語）" name="Russian" />
-    <combo_box.item label="Türkçe（トルコ語）" name="Turkish" />
-    <combo_box.item label="Українська （ウクライナ語）" name="Ukrainian" />
-    <combo_box.item label="中文 (正體) （中国語）" name="Chinese" />
-    <combo_box.item label="日本語（日本語）" name="Japanese" />
-    <combo_box.item label="한국어（韓国語）" name="Korean" />
-  </combo_box>
-
-  <text name="tip">翻訳サービスを選択してください：</text>
-
-  <radio_group name="translation_service_rg">
-    <radio_item initial_value="azure" label="Azure翻訳" name="azure" />
-    <radio_item initial_value="google" label="Google翻訳" name="google" />
-    <radio_item initial_value="deepl" label="DeepL翻訳" name="deepl" />
-  </radio_group>
-
-  <text name="azure_links_text">[https://learn.microsoft.com/ja-jp/azure/cognitive-services/translator/create-translator-resource セットアップ]</text>
-
-  <text name="azure_api_endoint_label">エンドポイント：</text>
-
-  <combo_box name="azure_api_endpoint_combo" value="https://api.cognitive.microsofttranslator.com">
-    <combo_box.item label="https://api.cognitive.microsofttranslator.com" name="global" value="https://api.cognitive.microsofttranslator.com" />
-    <combo_box.item label="https://api-apc.cognitive.microsofttranslator.com" name="api-apc" value="https://api-apc.cognitive.microsofttranslator.com" />
-    <combo_box.item label="https://api-eur.cognitive.microsofttranslator.com" name="api-eur" value="https://api-eur.cognitive.microsofttranslator.com" />
-    <combo_box.item label="https://api-nam.cognitive.microsofttranslator.com" name="api-nam" value="https://api-nam.cognitive.microsofttranslator.com" />
-  </combo_box>
-
-  <text name="azure_api_key_label">Azureキー：</text>
-  <line_editor default_text="翻訳キーを入力して「確認」ボタンをクリックしてください。" name="azure_api_key" />
-  <text name="azure_api_region_label">地域：</text>
-  <line_editor default_text="グローバルサービスの場合は空のままにすることができます。" />
-  <button label="認証" name="verify_azure_api_key_btn" />
-
-  <text name="google_api_key_label">Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth APIキー]：</text>
-  <line_editor default_text="Google APIキーを入力して「確認」ボタンをクリックしてください。" name="google_api_key" />
-  <button label="認証" name="verify_google_api_key_btn" />
-
-  <text name="google_links_text">[http://code.google.com/apis/language/translate/v2/pricing.html 価格]｜[https://code.google.com/apis/console 統計]</text>
-
-  <text name="deepl_api_domain_label">エンドポイント：</text>
-
-  <combo_box name="deepl_api_domain_combo" value="https://api-free.deepl.com">
-    <combo_box.item label="DeepL無料版" name="global" value="https://api-free.deepl.com" />
-    <combo_box.item label="DeepL Pro" name="api-apc" value="https://api.deepl.com" />
-  </combo_box>
-
-  <text name="deepl_api_key_label">DeepL APIキー：</text>
-
-  <line_editor default_text="DeepL APIのキーを入力して「認証」をクリックしてください。" name="deepl_api_key" />
-
-  <button label="認証" name="verify_deepl_api_key_btn" />
-
-  <text name="deepl_links_text">[https://www.deepl.com/pro/select-country?cta=header-prices 価格]</text>
-
-  <button label=" ＯＫ" name=" ok_btn" />
-  <button label=" キャンセル" name=" cancel_btn" />
-</floater>
\ No newline at end of file
+	<string name="azure_api_key_not_verified">
+		Azureサービス識別子の認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。
+	</string>
+	<string name="google_api_key_not_verified">
+		Google APIキーの認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。
+	</string>
+	<string name="deepl_api_key_not_verified">
+		DeepL Authキーの認証ができませんでした。ステータス：[STATUS]　設定をお確かめの上、もう一度やり直してください。
+	</string>
+	<string name="azure_api_key_verified">
+		Azureサービス識別子が認証されました。
+	</string>
+	<string name="google_api_key_verified">
+		Google APIキーが認証されました。
+	</string>
+	<string name="deepl_api_key_verified">
+		DeepL APIキーが認証されました。
+	</string>
+	<check_box label="チャット時の機械翻訳機能を有効にする" name="translate_chat_checkbox"/>
+	<text name="translate_language_label">
+		翻訳する言語：
+	</text>
+	<combo_box name="translate_language_combo">
+		<combo_box.item label="システム標準" name="System Default Language"/>
+		<combo_box.item label="英語" name="English"/>
+		<combo_box.item label="Dansk（デンマーク語）" name="Danish"/>
+		<combo_box.item label="Deutsch（ドイツ語）" name="German"/>
+		<combo_box.item label="Español（スペイン語）" name="Spanish"/>
+		<combo_box.item label="Français（フランス語）" name="French"/>
+		<combo_box.item label="Italiano（イタリア語）" name="Italian"/>
+		<combo_box.item label="Magyar（ハンガリー語）" name="Hungarian"/>
+		<combo_box.item label="Nederlands（オランダ語）" name="Dutch"/>
+		<combo_box.item label="Polski（ポーランド語）" name="Polish"/>
+		<combo_box.item label="Português（ポルトガル語）" name="Portugese"/>
+		<combo_box.item label="Русский（ロシア語）" name="Russian"/>
+		<combo_box.item label="Türkçe（トルコ語）" name="Turkish"/>
+		<combo_box.item label="Українська （ウクライナ語）" name="Ukrainian"/>
+		<combo_box.item label="中文 (正體) （中国語）" name="Chinese"/>
+		<combo_box.item label="日本語（日本語）" name="Japanese"/>
+		<combo_box.item label="한국어（韓国語）" name="Korean"/>
+	</combo_box>
+	<text name="tip">
+		翻訳サービスを選択してください：
+	</text>
+	<radio_group name="translation_service_rg">
+		<radio_item initial_value="azure" label="Azure翻訳" name="azure"/>
+		<radio_item initial_value="google" label="Google翻訳" name="google"/>
+		<radio_item initial_value="deepl" label="DeepL翻訳" name="deepl"/>
+	</radio_group>
+	<text name="azure_links_text">
+		[https://learn.microsoft.com/ja-jp/azure/cognitive-services/translator/create-translator-resource セットアップ]
+	</text>
+	<text name="azure_api_endoint_label">
+		エンドポイント：
+	</text>
+	<combo_box name="azure_api_endpoint_combo" value="https://api.cognitive.microsofttranslator.com">
+		<combo_box.item label="https://api.cognitive.microsofttranslator.com" name="global" value="https://api.cognitive.microsofttranslator.com"/>
+		<combo_box.item label="https://api-apc.cognitive.microsofttranslator.com" name="api-apc" value="https://api-apc.cognitive.microsofttranslator.com"/>
+		<combo_box.item label="https://api-eur.cognitive.microsofttranslator.com" name="api-eur" value="https://api-eur.cognitive.microsofttranslator.com"/>
+		<combo_box.item label="https://api-nam.cognitive.microsofttranslator.com" name="api-nam" value="https://api-nam.cognitive.microsofttranslator.com"/>
+	</combo_box>
+	<text name="azure_api_key_label">
+		Azureキー：
+	</text>
+	<line_editor default_text="翻訳キーを入力して「確認」ボタンをクリックしてください。" name="azure_api_key"/>
+	<text name="azure_api_region_label">
+		地域：
+	</text>
+	<line_editor default_text="グローバルサービスの場合は空のままにすることができます。"/>
+	<button label="認証" name="verify_azure_api_key_btn"/>
+	<text name="google_api_key_label">
+		Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth APIキー]：
+	</text>
+	<line_editor default_text="Google APIキーを入力して「確認」ボタンをクリックしてください。" name="google_api_key"/>
+	<button label="認証" name="verify_google_api_key_btn"/>
+	<text name="google_links_text">
+		[http://code.google.com/apis/language/translate/v2/pricing.html 価格]｜[https://code.google.com/apis/console 統計]
+	</text>
+	<text name="deepl_api_domain_label">
+		エンドポイント：
+	</text>
+	<combo_box name="deepl_api_domain_combo" value="https://api-free.deepl.com">
+		<combo_box.item label="DeepL無料版" name="global" value="https://api-free.deepl.com"/>
+		<combo_box.item label="DeepL Pro" name="api-apc" value="https://api.deepl.com"/>
+	</combo_box>
+	<text name="deepl_api_key_label">
+		DeepL APIキー：
+	</text>
+	<line_editor default_text="DeepL APIのキーを入力して「認証」をクリックしてください。" name="deepl_api_key"/>
+	<button label="認証" name="verify_deepl_api_key_btn"/>
+	<text name="deepl_links_text">
+		[https://www.deepl.com/pro/select-country?cta=header-prices 価格]
+	</text>
+	<button label=" ＯＫ" name=" ok_btn"/>
+	<button label=" キャンセル" name=" cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
index ea135a149d..b907b4e8d7 100644
--- a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
@@ -1,48 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gui_preview_tool" title="ＸＵＩプレビューツール">
-  <string name="ExternalEditorNotSet">環境変数LL_XUI_EDITORまたはExternalEditor設定を設定するか、[EDITOR PATH]フィールドにそのパスを指定して、エディターを選択します。</string>
-  <panel name="main_panel">
-    <text name="select_language_label">優先言語：</text>
-    <combo_box name="language_select_combo">
-      <combo_box.item label="ja" name="item1" value="ja" />
-    </combo_box>
-    <button label="表示" label_selected="表示" name="display_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。" />
-    <button label="非表示" label_selected="非表示" name="close_displayed_floater" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。" />
-    <button label="編集…" label_selected="編集…" name="edit_floater" tool_tip="選択したＸＭＬファイルによって定義されたＸＵＩフローターを編集します。（外部エディターを開きます）ローカライズされたバージョンが存在しない場合は、enバージョンを開きます。" />
-    <button label="保存" label_selected="保存" name="save_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを保存します。" />
-    <button label="全て保存" label_selected="全て保存" name="save_all_floaters" tool_tip="選択した言語で定義されたすべてのＸＵＩフロータを保存します。" />
-    <button label="≫" label_selected="≪" name="toggle_overlap_panel" tool_tip="重なっている要素の強調表示と表示パネルを切り替えます。要素を右クリックして、この機能用に選択します。選択した要素は、赤い四角形でマークされます。" />
-    <text name="select_language_label_2">二次言語：</text>
-    <combo_box name="language_select_combo_2">
-      <combo_box.item label="en" name="item1" value="en" />
-    </combo_box>
-    <button label="表示" name="display_floater_2" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。" />
-    <button enabled="false" label="非表示" name="close_displayed_floater_2" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。" />
-    <button label="スキーマをエクスポート" name="export_schema" />
-    <check_box label="四角形を表示" name="show_rectangles" />
-    <scroll_list name="name_list">
-      <scroll_list.columns label="タイトル" name="title_column" />
-      <scroll_list.columns label="ファイル名" name="file_column" />
-      <scroll_list.columns label="トップレベルのノード" name="top_level_node_column" />
-    </scroll_list>
-    <panel name="editor_panel">
-      <text name="editor_path_label">エディタのパス：</text>
-      <line_editor name="executable_path_field" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）へのフルパス。（引用符は必要ありません）" />
-      <button follows="left|bottom" label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_executable" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）を参照します。" />
-      <text name="executable_args_label">エディタの引数：</text>
-      <line_editor name="executable_args_field" tool_tip="エディターへのコマンドライン引数。'%FILE%'を使用してターゲット ファイルを参照します。このフィールドが空の場合、「YourProgram.exe FileName.xml」が実行されます" />
-    </panel>
-    <panel name="vlt_panel">
-      <text name="diff_file_label">差分ファイル：</text>
-      <line_editor name="vlt_diff_path_field" tool_tip="Viewer Localization Toolkitによって生成されたＸＭＬのD0、D1言語差分ファイルへのフルパス" />
-      <button label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_vlt_diffs" tool_tip="VLTで生成されたD0、D1差分ファイルを参照して、変更されたファイルと要素を強調表示します。" />
-      <button label="差分をハイライト" label_selected="ハイライトを解除" name="toggle_vlt_diff_highlight" tool_tip="変更された言語データを含むファイルと要素の強調表示を切り替えます。" />
-    </panel>
-  </panel>
-  <scroll_container follows="top|right|bottom" height="600" layout="topleft" name="overlap_scroll">
-    <panel name="overlap_dummy_panel">
-      <overlap_panel label="オーバーラップパネル" ame="overlap_panel" tool_tip="このパネルには、現在選択されている要素と、それに重なっているすべての要素が水平線で区切られて表示されます。" />
-      <text name="overlap_panel_label">重なる要素：</text>
-    </panel>
-  </scroll_container>
-</floater>
\ No newline at end of file
+	<string name="ExternalEditorNotSet">
+		環境変数LL_XUI_EDITORまたはExternalEditor設定を設定するか、[EDITOR PATH]フィールドにそのパスを指定して、エディターを選択します。
+	</string>
+	<panel name="main_panel">
+		<text name="select_language_label">
+			優先言語：
+		</text>
+		<combo_box name="language_select_combo">
+			<combo_box.item label="ja" name="item1" value="ja"/>
+		</combo_box>
+		<button label="表示" label_selected="表示" name="display_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。"/>
+		<button label="非表示" label_selected="非表示" name="close_displayed_floater" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。"/>
+		<button label="編集…" label_selected="編集…" name="edit_floater" tool_tip="選択したＸＭＬファイルによって定義されたＸＵＩフローターを編集します。（外部エディターを開きます）ローカライズされたバージョンが存在しない場合は、enバージョンを開きます。"/>
+		<button label="保存" label_selected="保存" name="save_floater" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを保存します。"/>
+		<button label="全て保存" label_selected="全て保存" name="save_all_floaters" tool_tip="選択した言語で定義されたすべてのＸＵＩフロータを保存します。"/>
+		<button label="≫" label_selected="≪" name="toggle_overlap_panel" tool_tip="重なっている要素の強調表示と表示パネルを切り替えます。要素を右クリックして、この機能用に選択します。選択した要素は、赤い四角形でマークされます。"/>
+		<text name="select_language_label_2">
+			二次言語：
+		</text>
+		<combo_box name="language_select_combo_2">
+			<combo_box.item label="en" name="item1" value="en"/>
+		</combo_box>
+		<button label="表示" name="display_floater_2" tool_tip="選択したＸＭＬファイルで定義されたＸＵＩフロータを表示します。"/>
+		<button enabled="false" label="非表示" name="close_displayed_floater_2" tool_tip="現在表示されているフローターが存在する場合は、それを閉じます。"/>
+		<button label="スキーマをエクスポート" name="export_schema"/>
+		<check_box label="四角形を表示" name="show_rectangles"/>
+		<scroll_list name="name_list">
+			<scroll_list.columns label="タイトル" name="title_column"/>
+			<scroll_list.columns label="ファイル名" name="file_column"/>
+			<scroll_list.columns label="トップレベルのノード" name="top_level_node_column"/>
+		</scroll_list>
+		<panel name="editor_panel">
+			<text name="editor_path_label">
+				エディタのパス：
+			</text>
+			<line_editor name="executable_path_field" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）へのフルパス。（引用符は必要ありません）"/>
+			<button follows="left|bottom" label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_executable" tool_tip="フローターＸＭＬファイルを編集するためのエディター（実行可能ファイル）を参照します。"/>
+			<text name="executable_args_label">
+				エディタの引数：
+			</text>
+			<line_editor name="executable_args_field" tool_tip="エディターへのコマンドライン引数。'%FILE%'を使用してターゲット ファイルを参照します。このフィールドが空の場合、「YourProgram.exe FileName.xml」が実行されます"/>
+		</panel>
+		<panel name="vlt_panel">
+			<text name="diff_file_label">
+				差分ファイル：
+			</text>
+			<line_editor name="vlt_diff_path_field" tool_tip="Viewer Localization Toolkitによって生成されたＸＭＬのD0、D1言語差分ファイルへのフルパス"/>
+			<button label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_vlt_diffs" tool_tip="VLTで生成されたD0、D1差分ファイルを参照して、変更されたファイルと要素を強調表示します。"/>
+			<button label="差分をハイライト" label_selected="ハイライトを解除" name="toggle_vlt_diff_highlight" tool_tip="変更された言語データを含むファイルと要素の強調表示を切り替えます。"/>
+		</panel>
+	</panel>
+	<scroll_container follows="top|right|bottom" height="600" layout="topleft" name="overlap_scroll">
+		<panel name="overlap_dummy_panel">
+			<overlap_panel label="オーバーラップパネル" ame="overlap_panel" tool_tip="このパネルには、現在選択されている要素と、それに重なっているすべての要素が水平線で区切られて表示されます。"/>
+			<text name="overlap_panel_label">
+				重なる要素：
+			</text>
+		</panel>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 8beaa2eaef..3ff50854a5 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry">
-  <text name="media_label">メディアＵＲＬ：</text>
-  <combo_box name="media_entry" />
-  <button label="ＯＫ" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-  <button label="クリア" name="clear_btn" />
-  <text name="loading_label">読み込んでいます…	</text>
-</floater>
\ No newline at end of file
+	<text name="media_label">
+		メディアＵＲＬ：
+	</text>
+	<combo_box name="media_entry"/>
+	<button label="ＯＫ" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+	<button label="クリア" name="clear_btn"/>
+	<text name="loading_label">
+		読み込んでいます…
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
index f0ecf182e8..44e96c35ad 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_voice_volume" title="ボイスチャットの音量">
-  <slider label="ボイスチャット" name="chat_voice_volume" />
-</floater>
\ No newline at end of file
+	<slider label="ボイスチャット" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index c57db0713b..b38ea9331a 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,59 +1,159 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
-  <string name="no_voice_effect">（ボイスモーフィングなし）</string>
-  <string name="active_voice_effect">（アクティブ）</string>
-  <string name="unsubscribed_voice_effect">（取消し済み）</string>
-  <string name="new_voice_effect">（新登場！）</string>
-  <string name="effect_Arena">アリーナ</string>
-  <string name="effect_Beast">野獣</string>
-  <string name="effect_Buff">がっしり</string>
-  <string name="effect_Buzz">ブザー</string>
-  <string name="effect_Camille">カミール</string>
-  <string name="effect_Creepy">気味の悪い</string>
-  <string name="effect_CreepyBot">気味わるボット</string>
-  <string name="effect_Cyber">サイバー</string>
-  <string name="effect_DeepBot">ディープボット</string>
-  <string name="effect_Demon">デーモン</string>
-  <string name="effect_Female Elf">女性のエルフ</string>
-  <string name="effect_Flirty">気のありそうな</string>
-  <string name="effect_Foxy">魅惑的</string>
-  <string name="effect_Halloween 2010 Bonus">ハロウィン_2010_ボーナス</string>
-  <string name="effect_Helium">ヘリウム</string>
-  <string name="effect_Husky">ハスキー</string>
-  <string name="effect_Husky Whisper">スモーキーウィスパー</string>
-  <string name="effect_Intercom">インターホン</string>
-  <string name="effect_Julia">ジュリア</string>
-  <string name="effect_Lo Lilt">軽快</string>
-  <string name="effect_Macho">マッチョ</string>
-  <string name="effect_Micro">ミクロ</string>
-  <string name="effect_Mini">ミニ</string>
-  <string name="effect_Model">モデル</string>
-  <string name="effect_Nano">ナノ</string>
-  <string name="effect_Nightmare">悪夢</string>
-  <string name="effect_PopBot">ポップボット</string>
-  <string name="effect_Rachel">レイチェル</string>
-  <string name="effect_Radio">ラジオ</string>
-  <string name="effect_Robot">ロボット</string>
-  <string name="effect_Roxanne">ロクサン</string>
-  <string name="effect_Rumble">ランブル</string>
-  <string name="effect_Sabrina">サブリナ</string>
-  <string name="effect_Samantha">サマンサ</string>
-  <string name="effect_Sexy">セクシー</string>
-  <string name="effect_Shorty">チビ</string>
-  <string name="effect_Smaller">小さめ</string>
-  <string name="effect_Sneaky">コソコソ</string>
-  <string name="effect_Stallion">雄馬</string>
-  <string name="effect_Sultry">艶かしい</string>
-  <string name="effect_Thunder">サンダー</string>
-  <string name="effect_Vixen">性悪な</string>
-  <string name="effect_WhinyBot">不機嫌ボット</string>
-  <text name="preview_text">プレビュー</text>
-  <text name="status_text">声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。</text>
-  <button label="録音" name="record_btn" tool_tip="あなたの声を録音します。" />
-  <button label="停止" name="record_stop_btn" />
-  <text name="voice_morphing_link">[[URL] 今すぐ申し込む]</text>
-  <scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。">
-    <scroll_list.columns label="ボイス名" name="name" />
-    <scroll_list.columns label="有効期限" name="expires" />
-  </scroll_list>
-</floater>
\ No newline at end of file
+	<string name="no_voice_effect">
+		（ボイスモーフィングなし）
+	</string>
+	<string name="active_voice_effect">
+		（アクティブ）
+	</string>
+	<string name="unsubscribed_voice_effect">
+		（取消し済み）
+	</string>
+	<string name="new_voice_effect">
+		（新登場！）
+	</string>
+	<string name="effect_Arena">
+		アリーナ
+	</string>
+	<string name="effect_Beast">
+		野獣
+	</string>
+	<string name="effect_Buff">
+		がっしり
+	</string>
+	<string name="effect_Buzz">
+		ブザー
+	</string>
+	<string name="effect_Camille">
+		カミール
+	</string>
+	<string name="effect_Creepy">
+		気味の悪い
+	</string>
+	<string name="effect_CreepyBot">
+		気味わるボット
+	</string>
+	<string name="effect_Cyber">
+		サイバー
+	</string>
+	<string name="effect_DeepBot">
+		ディープボット
+	</string>
+	<string name="effect_Demon">
+		デーモン
+	</string>
+	<string name="effect_Female Elf">
+		女性のエルフ
+	</string>
+	<string name="effect_Flirty">
+		気のありそうな
+	</string>
+	<string name="effect_Foxy">
+		魅惑的
+	</string>
+	<string name="effect_Halloween 2010 Bonus">
+		ハロウィン_2010_ボーナス
+	</string>
+	<string name="effect_Helium">
+		ヘリウム
+	</string>
+	<string name="effect_Husky">
+		ハスキー
+	</string>
+	<string name="effect_Husky Whisper">
+		スモーキーウィスパー
+	</string>
+	<string name="effect_Intercom">
+		インターホン
+	</string>
+	<string name="effect_Julia">
+		ジュリア
+	</string>
+	<string name="effect_Lo Lilt">
+		軽快
+	</string>
+	<string name="effect_Macho">
+		マッチョ
+	</string>
+	<string name="effect_Micro">
+		ミクロ
+	</string>
+	<string name="effect_Mini">
+		ミニ
+	</string>
+	<string name="effect_Model">
+		モデル
+	</string>
+	<string name="effect_Nano">
+		ナノ
+	</string>
+	<string name="effect_Nightmare">
+		悪夢
+	</string>
+	<string name="effect_PopBot">
+		ポップボット
+	</string>
+	<string name="effect_Rachel">
+		レイチェル
+	</string>
+	<string name="effect_Radio">
+		ラジオ
+	</string>
+	<string name="effect_Robot">
+		ロボット
+	</string>
+	<string name="effect_Roxanne">
+		ロクサン
+	</string>
+	<string name="effect_Rumble">
+		ランブル
+	</string>
+	<string name="effect_Sabrina">
+		サブリナ
+	</string>
+	<string name="effect_Samantha">
+		サマンサ
+	</string>
+	<string name="effect_Sexy">
+		セクシー
+	</string>
+	<string name="effect_Shorty">
+		チビ
+	</string>
+	<string name="effect_Smaller">
+		小さめ
+	</string>
+	<string name="effect_Sneaky">
+		コソコソ
+	</string>
+	<string name="effect_Stallion">
+		雄馬
+	</string>
+	<string name="effect_Sultry">
+		艶かしい
+	</string>
+	<string name="effect_Thunder">
+		サンダー
+	</string>
+	<string name="effect_Vixen">
+		性悪な
+	</string>
+	<string name="effect_WhinyBot">
+		不機嫌ボット
+	</string>
+	<text name="preview_text">
+		プレビュー
+	</text>
+	<text name="status_text">
+		声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。
+	</text>
+	<button label="録音" name="record_btn" tool_tip="あなたの声を録音します。"/>
+	<button label="停止" name="record_stop_btn"/>
+	<text name="voice_morphing_link">
+		[[URL] 今すぐ申し込む]
+	</text>
+	<scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。">
+		<scroll_list.columns label="ボイス名" name="name"/>
+		<scroll_list.columns label="有効期限" name="expires"/>
+	</scroll_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
index 084a1ffde9..40be12ffba 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
 <floater name="floater_voice_volume" title="ボイス音量">
-  <slider name="volume_slider" tool_tip="ボイス音量" value="0.5" />
-</floater>
\ No newline at end of file
+	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
index b7b3650ed9..d57cd4e297 100644
--- a/indra/newview/skins/default/xui/ja/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_web_content" title="">
-  <layout_stack name="stack1">
-    <layout_panel name="nav_controls">
-      <button name="back" tool_tip="前へ" />
-      <button name="forward" tool_tip="次へ" />
-      <button name="stop" tool_tip="ナビゲーションを停止" />
-      <button name="reload" tool_tip="ページを更新" />
-      <combo_box name="address" tool_tip="ここに URL を入力" />
-      <icon name="media_secure_lock_flag" tool_tip="安全な閲覧" />
-      <button name="popexternal" tool_tip="この URL をブラウザで開く" />
-    </layout_panel>
-    <layout_panel name="debug_controls">
-      <button name="web_test_home_page" tool_tip="Web テストのホームページ" />
-      <button name="VLC Plugin Test" tool_tip="MPEG4 ビデオテスト" />
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button name="back" tool_tip="前へ"/>
+			<button name="forward" tool_tip="次へ"/>
+			<button name="stop" tool_tip="ナビゲーションを停止"/>
+			<button name="reload" tool_tip="ページを更新"/>
+			<combo_box name="address" tool_tip="ここに URL を入力"/>
+			<icon name="media_secure_lock_flag" tool_tip="安全な閲覧"/>
+			<button name="popexternal" tool_tip="この URL をブラウザで開く"/>
+		</layout_panel>
+		<layout_panel name="debug_controls">
+			<button name="web_test_home_page" tool_tip="Web テストのホームページ"/>
+			<button name="VLC Plugin Test" tool_tip="MPEG4 ビデオテスト"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
index fe63e1f96c..be59547bf3 100644
--- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="whitelist_entry" title="ホワイトリストの入力">
-  <text name="media_label">ＵＲＬかＵＲＬパターンを入力して、許可するドメインをリストに追加します。</text>
-  <line_editor name="whitelist_entry" tool_tip="ＵＲＬかＵＲＬパターンをホワイトリストに入力します。" />
-  <button label="ＯＫ" name="ok_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<text name="media_label">
+		ＵＲＬかＵＲＬパターンを入力して、許可するドメインをリストに追加します。
+	</text>
+	<line_editor name="whitelist_entry" tool_tip="ＵＲＬかＵＲＬパターンをホワイトリストに入力します。"/>
+	<button label="ＯＫ" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index ab7811f9aa..c3a37a92de 100644
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="window_size" title="ウィンドウサイズ">
-  <string name="resolution_format">[RES_X]x[RES_Y]</string>
-  <text name="windowsize_text">ウィンドウのサイズを設定：</text>
-  <combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
-    <combo_box.item label="1000 x 700 （デフォルト）" name="item1" />
-    <combo_box.item label="1024 x 768 （4:3 XGA）" name="item2" />
-    <combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3" />
-    <combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4" />
-    <combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5" />
-    <combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7" />
-    <combo_box.item label="1600 x 900 （16:9 HD+）" name="item8" />
-    <combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9" />
-    <combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10" />
-    <combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11" />
-    <combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12" />
-  </combo_box>
-  <button label="設定" name="set_btn" />
-  <button label="キャンセル" name="cancel_btn" />
-</floater>
\ No newline at end of file
+	<string name="resolution_format">
+		[RES_X]x[RES_Y]
+	</string>
+	<text name="windowsize_text">
+		ウィンドウのサイズを設定：
+	</text>
+	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
+		<combo_box.item label="1000 x 700 （デフォルト）" name="item1"/>
+		<combo_box.item label="1024 x 768 （4:3 XGA）" name="item2"/>
+		<combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3"/>
+		<combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4"/>
+		<combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5"/>
+		<combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7"/>
+		<combo_box.item label="1600 x 900 （16:9 HD+）" name="item8"/>
+		<combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9"/>
+		<combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10"/>
+		<combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11"/>
+		<combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12"/>
+	</combo_box>
+	<button label="設定" name="set_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index 02e8ae352a..52410882aa 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -1,96 +1,117 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="ワールドマップ">
-  <string name="collapse_icon" value="map_ui_collapse_icon.png" />
-  <string name="expand_icon" value="map_ui_expand_icon.png" />
-  <string name="collapse_tooltip" value="マップ操作パネルを隠す" />
-  <string name="expand_tooltip" value="マップ操作を表示" />
-  <layout_stack name="floater_map_stack">
-    <layout_panel name="map_lp">
-      <panel filename="panel_world_map.xml" name="objects_mapview" />
-      <panel name="expand_btn_panel" tool_tip="マップ操作パネルを隠す">
-        <icon name="expand_collapse_icon" tool_tip="マップ操作パネルを隠す" />
-      </panel>
-    </layout_panel>
-    <layout_panel name="controls_lp">
-      <panel name="layout_panel_1">
-        <text name="events_label">凡例</text>
-      </panel>
-      <panel name="layout_panel_2">
-        <button name="Show My Location" tool_tip="現在、自分のアバターがいる場所をマップの中心にする。" />
-        <text name="me_label">自分</text>
-        <check_box control_name="MapShowPeople" name="people_chk" />
-        <icon name="person" />
-        <text name="person_label">人物</text>
-        <check_box name="infohub_chk" />
-        <icon name="infohub" />
-        <text name="infohub_label">情報ハブ</text>
-        <check_box name="land_for_sale_chk" />
-        <icon name="landforsale" />
-        <text name="land_sale_label">販売中の土地</text>
-        <icon name="square2" />
-        <text name="auction_label">オークション中の土地</text>
-        <icon name="square2" />
-        <text name="by_owner_label">所有者で</text>
-
-        <button name="Go Home" tool_tip="自分のホームの場所にテレポート" />
-
-        <text name="Home_label">ホーム</text>
-        <text name="events_label">イベント：</text>
-
-        <check_box name="event_chk" />
-        <icon name="event" />
-        <text name="pg_label">General</text>
-
-        <check_box name="events_mature_chk" />
-        <icon name="events_mature_icon" />
-        <text name="events_mature_label">Moderate</text>
-
-        <check_box name="events_adult_chk" />
-        <icon name="events_adult_icon" />
-        <text name="events_adult_label">Adult</text>
-      </panel>
-
-
-      <panel name="layout_panel_3">
-        <text name="find_on_map_label">マップから探す</text>
-      </panel>
-
-      <panel name="layout_panel_4">
-        <icon name="friends_icon" />
-        <combo_box label="オンラインのフレンド" name="friend combo" tool_tip="マップにフレンドを表示する。">
-          <combo_box.item label="オンラインのフレンド" name="item1" value="None" />
-          <combo_box.commit_callback function="WMap.AvatarCombo" />
-        </combo_box>
-        <icon name="landmark_icon" />
-        <combo_box label="ランドマーク" name="landmark combo" tool_tip="マップにランドマークを表示する。">
-          <combo_box.item label="ランドマーク" name="item1" value="None" />
-          <combo_box.commit_callback function="WMap.Landmark" />
-        </combo_box>
-        <icon name="location_icon" />
-        <search_editor label="リージョン（地域）名で" tool_tip="リージョン（地域）名を入力してください" />
-        <button label="探す" name="DoSearch" tool_tip="リージョン（地域）を検索する。" />
-        <button name="Clear" tool_tip="追跡ラインをクリアしてマップをリセットする。" />
-        <scroll_list name="search_results">
-          <scroll_list.columns label="" name="icon" />
-          <scroll_list.columns label="" name="sim_name" />
-          <scroll_list.commit_callback function="WMap.SearchResult" />
-        </scroll_list>
-        <text name="events_label">場所：</text>
-        <spinner name="teleport_coordinate_x" />
-        <spinner name="teleport_coordinate_y" />
-        <spinner name="teleport_coordinate_z" />
-        <button label="テレポート" name="Teleport" tool_tip="選択した場所にテレポートする。" />
-        <button label="SLurlをコピー" layout="topleft" name="copy_slurl" tool_tip="現在の場所をWebで使えるSLurlにしてコピーする。" />
-        <button label="選択を表示" name="Show Destination" tool_tip="選択した場所をマップの中心にする。" />
-      </panel>
-      <panel name="layout_panel_5">
-        <text name="zoom_label">縮尺</text>
-      </panel>
-      <panel name="layout_panel_6">
-        <icon name="zoom_icon" />
-        <!-- NOTE: min_val for zoom slider is hardcoded for performance reasons -->
-        <slider name="zoom slider" />
-      </panel>
-    </layout_panel>
-  </layout_stack>
-</floater>
\ No newline at end of file
+	<string name="collapse_icon" value="map_ui_collapse_icon.png"/>
+	<string name="expand_icon" value="map_ui_expand_icon.png"/>
+	<string name="collapse_tooltip" value="マップ操作パネルを隠す"/>
+	<string name="expand_tooltip" value="マップ操作を表示"/>
+	<layout_stack name="floater_map_stack">
+		<layout_panel name="map_lp">
+			<panel filename="panel_world_map.xml" name="objects_mapview"/>
+			<panel name="expand_btn_panel" tool_tip="マップ操作パネルを隠す">
+				<icon name="expand_collapse_icon" tool_tip="マップ操作パネルを隠す"/>
+			</panel>
+		</layout_panel>
+		<layout_panel name="controls_lp">
+			<panel name="layout_panel_1">
+				<text name="events_label">
+					凡例
+				</text>
+			</panel>
+			<panel name="layout_panel_2">
+				<button name="Show My Location" tool_tip="現在、自分のアバターがいる場所をマップの中心にする。"/>
+				<text name="me_label">
+					自分
+				</text>
+				<check_box control_name="MapShowPeople" name="people_chk"/>
+				<icon name="person"/>
+				<text name="person_label">
+					人物
+				</text>
+				<check_box name="infohub_chk"/>
+				<icon name="infohub"/>
+				<text name="infohub_label">
+					情報ハブ
+				</text>
+				<check_box name="land_for_sale_chk"/>
+				<icon name="landforsale"/>
+				<text name="land_sale_label">
+					販売中の土地
+				</text>
+				<icon name="square2"/>
+				<text name="auction_label">
+					オークション中の土地
+				</text>
+				<icon name="square2"/>
+				<text name="by_owner_label">
+					所有者で
+				</text>
+				<button name="Go Home" tool_tip="自分のホームの場所にテレポート"/>
+				<text name="Home_label">
+					ホーム
+				</text>
+				<text name="events_label">
+					イベント：
+				</text>
+				<check_box name="event_chk"/>
+				<icon name="event"/>
+				<text name="pg_label">
+					General
+				</text>
+				<check_box name="events_mature_chk"/>
+				<icon name="events_mature_icon"/>
+				<text name="events_mature_label">
+					Moderate
+				</text>
+				<check_box name="events_adult_chk"/>
+				<icon name="events_adult_icon"/>
+				<text name="events_adult_label">
+					Adult
+				</text>
+			</panel>
+			<panel name="layout_panel_3">
+				<text name="find_on_map_label">
+					マップから探す
+				</text>
+			</panel>
+			<panel name="layout_panel_4">
+				<icon name="friends_icon"/>
+				<combo_box label="オンラインのフレンド" name="friend combo" tool_tip="マップにフレンドを表示する。">
+					<combo_box.item label="オンラインのフレンド" name="item1" value="None"/>
+					<combo_box.commit_callback function="WMap.AvatarCombo"/>
+				</combo_box>
+				<icon name="landmark_icon"/>
+				<combo_box label="ランドマーク" name="landmark combo" tool_tip="マップにランドマークを表示する。">
+					<combo_box.item label="ランドマーク" name="item1" value="None"/>
+					<combo_box.commit_callback function="WMap.Landmark"/>
+				</combo_box>
+				<icon name="location_icon"/>
+				<search_editor label="リージョン（地域）名で" tool_tip="リージョン（地域）名を入力してください"/>
+				<button label="探す" name="DoSearch" tool_tip="リージョン（地域）を検索する。"/>
+				<button name="Clear" tool_tip="追跡ラインをクリアしてマップをリセットする。"/>
+				<scroll_list name="search_results">
+					<scroll_list.columns label="" name="icon"/>
+					<scroll_list.columns label="" name="sim_name"/>
+					<scroll_list.commit_callback function="WMap.SearchResult"/>
+				</scroll_list>
+				<text name="events_label">
+					場所：
+				</text>
+				<spinner name="teleport_coordinate_x"/>
+				<spinner name="teleport_coordinate_y"/>
+				<spinner name="teleport_coordinate_z"/>
+				<button label="テレポート" name="Teleport" tool_tip="選択した場所にテレポートする。"/>
+				<button label="SLurlをコピー" layout="topleft" name="copy_slurl" tool_tip="現在の場所をWebで使えるSLurlにしてコピーする。"/>
+				<button label="選択を表示" name="Show Destination" tool_tip="選択した場所をマップの中心にする。"/>
+			</panel>
+			<panel name="layout_panel_5">
+				<text name="zoom_label">
+					縮尺
+				</text>
+			</panel>
+			<panel name="layout_panel_6">
+				<icon name="zoom_icon"/>
+				<slider name="zoom slider"/>
+			</panel>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml
index 02c81a8902..2085e916c8 100644
--- a/indra/newview/skins/default/xui/ja/fonts.xml
+++ b/indra/newview/skins/default/xui/ja/fonts.xml
@@ -1,125 +1,239 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <fonts>
-  <font name="default" comment="default font files (global fallbacks)">
-    <file>NotoSansCJKjp-Medium.otf</file>
-    <file>DejaVuSans.ttf</file>
-    <os name="Windows">
-      <file load_collection="true">YuGothM.ttc</file>
-      <file>meiryo.TTC</file>
-      <file>MSGOTHIC.TTC</file>
-      <file>gulim.ttc</file>
-      <file>simhei.ttf</file>
-      <file>ArialUni.ttf</file>
-      <file>msyh.ttc</file>
-      <file load_collection="true">Cambria.ttc</file>
-      <file>malgun.ttf</file>
-      <file>micross.ttf</file>
-    </os>
-    <os name="Mac">
-      <file>YuGothic-Medium.otf</file>
-      <file>ヒラギノ角ゴシック W3.ttc</file>
-      <file>ヒラギノ角ゴ Pro W3.otf</file>
-      <file>ヒラギノ角ゴ ProN W3.otf</file>
-      <file>AppleGothic.dfont</file>
-      <file>AppleGothic.ttf</file>
-      <file>AppleSDGothicNeo-Regular.otf</file>
-      <file>AppleSDGothicNeo.ttc</file>
-      <file>华文细黑.ttf</file>
-      <file>PingFang.ttc</file>
-      <file>STIXGeneral.otf</file>
-      <file>Thonburi.ttc</file>
-    </os>
-  </font>
-  <font name="SansSerifBold" comment="Name of bold sans-serif font">
-    <file>NotoSansCJKjp-Bold.otf</file>
-    <file>DejaVuSans-Bold.ttf</file>
-    <os name="Windows">
-      <file load_collection="true">YuGothB.ttc</file>
-      <file>arialbd.ttf</file>
-    </os>
-    <os name="Mac">
-      <file>YuGothic-Bold.otf</file>
-      <file>Helvetica.dfont</file>
-    </os>
-  </font>
-  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>NotoSansCJKjp-Bold.otf</file>
-    <file>DejaVuSans.ttf</file>
-    <os name="Windows">
-      <file>arial.ttf</file>
-    </os>
-    <os name="Mac">
-      <file>Helvetica.dfont</file>
-    </os>
-  </font>
-  <font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
-    <file>DejaVuSans-Bold.ttf</file>
-  </font>
-  <font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
-    <file>DejaVuSans-Oblique.ttf</file>
-  </font>
-  <font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
-    <file>DejaVuSans-BoldOblique.ttf</file>
-  </font>
-  <font name="Monospace" comment="Name of monospace font">
-    <file>NotoSansMonoCJKjp-Regular.otf</file>
-    <file>DejaVuSansMono.ttf</file>
-  </font>
-  <font name="DejaVu" comment="Name of DejaVu font">
-    <file>DejaVuSans.ttf</file>
-  </font>
-  <font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD">
-    <file>DejaVuSans-Bold.ttf</file>
-  </font>
-  <font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC">
-    <file>DejaVuSans-Oblique.ttf</file>
-  </font>
-  <font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC">
-    <file>DejaVuSans-BoldOblique.ttf</file>
-  </font>
-  <font name="Helvetica" comment="Name of Helvetica font">
-    <file>DejaVuSans.ttf</file>
-    <os name="Windows">
-      <file>arial.ttf</file>
-    </os>
-    <os name="Mac">
-      <file>arial.ttf</file>
-    </os>
-  </font>
-  <font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
-    <file>DejaVuSans-Bold.ttf</file>
-    <os name="Windows">
-      <file>arialbd.ttf</file>
-    </os>
-    <os name="Mac">
-      <file>arialbd.ttf</file>
-    </os>
-  </font>
-  <font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
-    <file>DejaVuSans-Oblique.ttf</file>
-    <os name="Windows">
-      <file>ariali.ttf</file>
-    </os>
-    <os name="Mac">
-      <file>ariali.ttf</file>
-    </os>
-  </font>
-  <font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
-    <file>DejaVuSans-BoldOblique.ttf</file>
-    <os name="Windows">
-      <file>arialbi.ttf</file>
-    </os>
-    <os name="Mac">
-      <file>arialbi.ttf</file>
-    </os>
-  </font>
-  <font name="OverrideTest" comment="Name of font to test overriding">
-    <file>times.ttf</file>
-    <file>DejaVuSans.ttf</file>
-  </font>
-  <font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0" />
-  <font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0" />
-  <font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="10.6" />
-  <font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="8.6" />
-  <font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="7.6" />
-</fonts>
\ No newline at end of file
+	<font name="default" comment="default font files (global fallbacks)">
+		<file>
+			NotoSansCJKjp-Medium.otf
+		</file>
+		<file>
+			DejaVuSans.ttf
+		</file>
+		<os name="Windows">
+			<file load_collection="true">
+				YuGothM.ttc
+			</file>
+			<file>
+				meiryo.TTC
+			</file>
+			<file>
+				MSGOTHIC.TTC
+			</file>
+			<file>
+				gulim.ttc
+			</file>
+			<file>
+				simhei.ttf
+			</file>
+			<file>
+				ArialUni.ttf
+			</file>
+			<file>
+				msyh.ttc
+			</file>
+			<file load_collection="true">
+				Cambria.ttc
+			</file>
+			<file>
+				malgun.ttf
+			</file>
+			<file>
+				micross.ttf
+			</file>
+		</os>
+		<os name="Mac">
+			<file>
+				YuGothic-Medium.otf
+			</file>
+			<file>
+				ヒラギノ角ゴシック W3.ttc
+			</file>
+			<file>
+				ヒラギノ角ゴ Pro W3.otf
+			</file>
+			<file>
+				ヒラギノ角ゴ ProN W3.otf
+			</file>
+			<file>
+				AppleGothic.dfont
+			</file>
+			<file>
+				AppleGothic.ttf
+			</file>
+			<file>
+				AppleSDGothicNeo-Regular.otf
+			</file>
+			<file>
+				AppleSDGothicNeo.ttc
+			</file>
+			<file>
+				华文细黑.ttf
+			</file>
+			<file>
+				PingFang.ttc
+			</file>
+			<file>
+				STIXGeneral.otf
+			</file>
+			<file>
+				Thonburi.ttc
+			</file>
+		</os>
+	</font>
+	<font name="SansSerifBold" comment="Name of bold sans-serif font">
+		<file>
+			NotoSansCJKjp-Bold.otf
+		</file>
+		<file>
+			DejaVuSans-Bold.ttf
+		</file>
+		<os name="Windows">
+			<file load_collection="true">
+				YuGothB.ttc
+			</file>
+			<file>
+				arialbd.ttf
+			</file>
+		</os>
+		<os name="Mac">
+			<file>
+				YuGothic-Bold.otf
+			</file>
+			<file>
+				Helvetica.dfont
+			</file>
+		</os>
+	</font>
+	<font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
+		<file>
+			NotoSansCJKjp-Bold.otf
+		</file>
+		<file>
+			DejaVuSans.ttf
+		</file>
+		<os name="Windows">
+			<file>
+				arial.ttf
+			</file>
+		</os>
+		<os name="Mac">
+			<file>
+				Helvetica.dfont
+			</file>
+		</os>
+	</font>
+	<font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
+		<file>
+			DejaVuSans-Bold.ttf
+		</file>
+	</font>
+	<font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
+		<file>
+			DejaVuSans-Oblique.ttf
+		</file>
+	</font>
+	<font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
+		<file>
+			DejaVuSans-BoldOblique.ttf
+		</file>
+	</font>
+	<font name="Monospace" comment="Name of monospace font">
+		<file>
+			NotoSansMonoCJKjp-Regular.otf
+		</file>
+		<file>
+			DejaVuSansMono.ttf
+		</file>
+	</font>
+	<font name="DejaVu" comment="Name of DejaVu font">
+		<file>
+			DejaVuSans.ttf
+		</file>
+	</font>
+	<font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD">
+		<file>
+			DejaVuSans-Bold.ttf
+		</file>
+	</font>
+	<font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC">
+		<file>
+			DejaVuSans-Oblique.ttf
+		</file>
+	</font>
+	<font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC">
+		<file>
+			DejaVuSans-BoldOblique.ttf
+		</file>
+	</font>
+	<font name="Helvetica" comment="Name of Helvetica font">
+		<file>
+			DejaVuSans.ttf
+		</file>
+		<os name="Windows">
+			<file>
+				arial.ttf
+			</file>
+		</os>
+		<os name="Mac">
+			<file>
+				arial.ttf
+			</file>
+		</os>
+	</font>
+	<font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
+		<file>
+			DejaVuSans-Bold.ttf
+		</file>
+		<os name="Windows">
+			<file>
+				arialbd.ttf
+			</file>
+		</os>
+		<os name="Mac">
+			<file>
+				arialbd.ttf
+			</file>
+		</os>
+	</font>
+	<font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
+		<file>
+			DejaVuSans-Oblique.ttf
+		</file>
+		<os name="Windows">
+			<file>
+				ariali.ttf
+			</file>
+		</os>
+		<os name="Mac">
+			<file>
+				ariali.ttf
+			</file>
+		</os>
+	</font>
+	<font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
+		<file>
+			DejaVuSans-BoldOblique.ttf
+		</file>
+		<os name="Windows">
+			<file>
+				arialbi.ttf
+			</file>
+		</os>
+		<os name="Mac">
+			<file>
+				arialbi.ttf
+			</file>
+		</os>
+	</font>
+	<font name="OverrideTest" comment="Name of font to test overriding">
+		<file>
+			times.ttf
+		</file>
+		<file>
+			DejaVuSans.ttf
+		</file>
+	</font>
+	<font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0"/>
+	<font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0"/>
+	<font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="10.6"/>
+	<font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="8.6"/>
+	<font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="7.6"/>
+</fonts>
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index 81844aec52..6ab235c8f3 100644
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
 <floater name="inspect_avatar">
-  <string name="Subtitle">[AGE]</string>
-  <string name="Details">[SL_PROFILE]</string>
-  <text name="user_name_small" value="長い名前のGrumpity ProductEngine" />
-  <text name="user_slid" value="james.linden" />
-  <text name="user_subtitle" value="１１ヶ月３日" />
-  <text name="user_details">これは私のSecondLifeの説明であり、本当に素晴らしいと思います。しかし、どういうわけか、私の説明は非常に長くなっています。なぜなら、私はたくさん話すのが好きだからです。</text>
-  <slider name="volume_slider" tool_tip="ボイス音量" value="0.5" />
-  <text name="avatar_profile_link" value="[[LINK] プロフィールを閲覧]" />
-  <avatar_icon name="avatar_icon" />
-</floater>
\ No newline at end of file
+	<string name="Subtitle">
+		[AGE]
+	</string>
+	<string name="Details">
+		[SL_PROFILE]
+	</string>
+	<text name="user_name_small" value="長い名前のGrumpity ProductEngine"/>
+	<text name="user_slid" value="james.linden"/>
+	<text name="user_subtitle" value="１１ヶ月３日"/>
+	<text name="user_details">
+		これは私のSecondLifeの説明であり、本当に素晴らしいと思います。しかし、どういうわけか、私の説明は非常に長くなっています。なぜなら、私はたくさん話すのが好きだからです。
+	</text>
+	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
+	<text name="avatar_profile_link" value="[[LINK] プロフィールを閲覧]"/>
+	<avatar_icon name="avatar_icon"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
index 84a2e49824..2e8e6c0db2 100644
--- a/indra/newview/skins/default/xui/ja/inspect_group.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_group.xml
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-Not can_close / no title to avoid window chrome
-Single instance - only have one at a time, recycle it each spawn
--->
 <floater name="inspect_group">
-  <string name="PrivateGroup">プライベートグループ</string>
-  <string name="FreeToJoin">参加費無料</string>
-  <string name="CostToJoin">参加費L$ [AMOUNT]</string>
-  <string name="YouAreMember">あなたはメンバーです。</string>
-  <text name="group_subtitle">123メートル</text>
-  <text name="group_details">ヘラジカがいる部屋を作る任務を負った人々のグループ。
-ヘラジカを恐れてください！恐れよ！そしてマングースも！</text>
-  <text name="group_cost">L$123 to join</text>
-  <button label="参加" name="join_btn" />
-  <button label="脱退" name="leave_btn" />
-  <button label="プロフィールの表示" name="view_profile_btn" />
-</floater>
\ No newline at end of file
+	<string name="PrivateGroup">
+		プライベートグループ
+	</string>
+	<string name="FreeToJoin">
+		参加費無料
+	</string>
+	<string name="CostToJoin">
+		参加費L$ [AMOUNT]
+	</string>
+	<string name="YouAreMember">
+		あなたはメンバーです。
+	</string>
+	<text name="group_subtitle">
+		123メートル
+	</text>
+	<text name="group_details">
+		ヘラジカがいる部屋を作る任務を負った人々のグループ。
+ヘラジカを恐れてください！恐れよ！そしてマングースも！
+	</text>
+	<text name="group_cost">
+		L$123 to join
+	</text>
+	<button label="参加" name="join_btn"/>
+	<button label="脱退" name="leave_btn"/>
+	<button label="プロフィールの表示" name="view_profile_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
index 7ac3ea0991..ec3ef5cd42 100644
--- a/indra/newview/skins/default/xui/ja/inspect_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_object.xml
@@ -1,29 +1,45 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-Not can_close / no title to avoid window chrome
-Single instance - only have one at a time, recycle it each spawn
--->
 <floater name="inspect_object">
-  <string name="Creator">制作者：[CREATOR]</string>
-  <string name="CreatorAndOwner">[CREATOR]によるチェック
-[OWNER]によるチェック</string>
-  <string name="Price">L$[AMOUNT]</string>
-  <string name="PriceFree">無料です！</string>
-  <string name="Touch">触る</string>
-  <string name="Sit">座る</string>
-  <text name="object_name" value="二行にわたる長いオブジェクト名をテスト" />
-  <text name="object_creator">by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about</text>
-  <text name="price_text">L$30,000</text>
-  <text name="object_description">これは、オブジェクトがどのようなものであるかについての非常に長い説明であり、少なくとも８０文字は含まれます。
-長さなどですが、この時点ではおそらく１２０くらいです。本当のところは、誰にも分かりません。</text>
-  <text name="object_media_url">http://www.superdupertest.com</text>
-  <button label="買う" name="buy_btn" />
-  <button label="支払う" name="pay_btn" />
-  <button label="コピーを取る" name="take_free_copy_btn" />
-  <button label="触る" name="touch_btn" />
-  <button label="座る" name="sit_btn" />
-  <button label="開く" name="open_btn" />
-  <icon name="secure_browsing" tool_tip="セキュアブラウジング" />
-  <button label="詳細" name="more_info_btn" />
-</floater>
\ No newline at end of file
+	<string name="Creator">
+		制作者：[CREATOR]
+	</string>
+	<string name="CreatorAndOwner">
+		[CREATOR]によるチェック
+[OWNER]によるチェック
+	</string>
+	<string name="Price">
+		L$[AMOUNT]
+	</string>
+	<string name="PriceFree">
+		無料です！
+	</string>
+	<string name="Touch">
+		触る
+	</string>
+	<string name="Sit">
+		座る
+	</string>
+	<text name="object_name" value="二行にわたる長いオブジェクト名をテスト"/>
+	<text name="object_creator">
+		by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+	</text>
+	<text name="price_text">
+		L$30,000
+	</text>
+	<text name="object_description">
+		これは、オブジェクトがどのようなものであるかについての非常に長い説明であり、少なくとも８０文字は含まれます。
+長さなどですが、この時点ではおそらく１２０くらいです。本当のところは、誰にも分かりません。
+	</text>
+	<text name="object_media_url">
+		http://www.superdupertest.com
+	</text>
+	<button label="買う" name="buy_btn"/>
+	<button label="支払う" name="pay_btn"/>
+	<button label="コピーを取る" name="take_free_copy_btn"/>
+	<button label="触る" name="touch_btn"/>
+	<button label="座る" name="sit_btn"/>
+	<button label="開く" name="open_btn"/>
+	<icon name="secure_browsing" tool_tip="セキュアブラウジング"/>
+	<button label="詳細" name="more_info_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
index 615ca720e9..888e24bcd5 100644
--- a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-Not can_close / no title to avoid window chrome
-Single instance - only have one at a time, recycle it each spawn
--->
 <floater name="inspect_remote_object">
-  <text name="object_name">非常に長いテスト オブジェクト名</text>
-  <text name="object_owner_label">所有者：</text>
-  <text name="object_owner">Longavatarname Johnsonlongstonnammer</text>
-  <text name="object_slurl_label">位置：</text>
-  <text name="object_slurl">http://slurl.com/Ahern/50/50/50</text>
-  <button label="マップ" name="map_btn" />
-  <button label="ブロック" name="block_btn" />
-  <button label="閉じる" name="close_btn" />
-</floater>
\ No newline at end of file
+	<text name="object_name">
+		非常に長いテスト オブジェクト名
+	</text>
+	<text name="object_owner_label">
+		所有者：
+	</text>
+	<text name="object_owner">
+		Longavatarname Johnsonlongstonnammer
+	</text>
+	<text name="object_slurl_label">
+		位置：
+	</text>
+	<text name="object_slurl">
+		http://slurl.com/Ahern/50/50/50
+	</text>
+	<button label="マップ" name="map_btn"/>
+	<button label="ブロック" name="block_btn"/>
+	<button label="閉じる" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
index 76fdca24eb..facae22acf 100644
--- a/indra/newview/skins/default/xui/ja/language_settings.xml
+++ b/indra/newview/skins/default/xui/ja/language_settings.xml
@@ -1,52 +1,87 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.-->
 <strings>
-  <!-- Locale Information -->
-  <string name="MicrosoftLocale">japanese</string>
-  <string name="MacLocale">ja_JP.UTF-8</string>
-  <string name="DarwinLocale">ja_JP.UTF-8</string>
-  <string name="LinuxLocale">ja_JP.UTF-8</string>
-  <!-- 
-	datetimeToCodes["wkday"]	= "%a";		// Thu
-	datetimeToCodes["weekday"]	= "%A";		// Thursday
-	datetimeToCodes["year4"]	= "%Y";		// 2009
-	datetimeToCodes["year"]= "%Y";		// 2009
-	datetimeToCodes["year2"]	= "%y";		// 09
-	datetimeToCodes["mth"]= "%b";		// Aug
-	datetimeToCodes["month"]	= "%B";		// August
-	datetimeToCodes["mthnum"]	= "%m";		// 08
-	datetimeToCodes["day"]= "%d";		// 31
-	datetimeToCodes["sday"]= "%-d";	// 9
-	datetimeToCodes["hour24"]	= "%H";		// 14
-	datetimeToCodes["hour"]= "%H";		// 14
-	datetimeToCodes["hour12"]	= "%I";		// 02
-	datetimeToCodes["min"]= "%M";		// 59
-	datetimeToCodes["ampm"]= "%p";		// AM
-	datetimeToCodes["second"]	= "%S";		// 59
-	datetimeToCodes["timezone"]	= "%Z";		// PST	
-	-->
-  <string name="TimeHour">hour,datetime,slt</string>
-  <string name="TimeMin">min,datetime,slt</string>
-  <string name="TimeYear">year,datetime,slt</string>
-  <string name="TimeDay">day,datetime,slt</string>
-  <string name="TimeMonth">mthnum,datetime,slt</string>
-  <string name="TimeWeek">wkday,datetime,slt</string>
-  <string name="TimeAMPM">ampm,datetime,slt</string>
-  <string name="TimeHour12">hour12,datetime,slt</string>
-  <string name="LTimeMthNum">mthnum,datetime,local</string>
-  <string name="LTimeWeek">wkday,datetime,local</string>
-  <string name="LTimeMonth">mth,datetime,local</string>
-  <string name="LTimeDay">day,datetime,local</string>
-  <string name="LTimeSec">second,datetime,local</string>
-  <string name="LTimeHour">hour,datetime,local</string>
-  <string name="LTimeMin">min,datetime,local</string>
-  <string name="LTimeYear">year,datetime,local</string>
-  <string name="UTCTimeWeek">weekday,datetime,utc</string>
-  <string name="UTCTimeDay">day,datetime,utc</string>
-  <string name="UTCTimeMth">mth,datetime,utc</string>
-  <string name="UTCTimeYr">year,datetime,utc</string>
-  <string name="UTCTimeHr">hour,datetime,utc</string>
-  <string name="UTCTimeMin">min,datetime,utc</string>
-  <string name="UTCTimeSec">second,datetime,utc</string>
-  <string name="UTCTimeTimezone">timezone,datetime,utc</string>
-</strings>
\ No newline at end of file
+	<string name="MicrosoftLocale">
+		japanese
+	</string>
+	<string name="MacLocale">
+		ja_JP.UTF-8
+	</string>
+	<string name="DarwinLocale">
+		ja_JP.UTF-8
+	</string>
+	<string name="LinuxLocale">
+		ja_JP.UTF-8
+	</string>
+	<string name="TimeHour">
+		hour,datetime,slt
+	</string>
+	<string name="TimeMin">
+		min,datetime,slt
+	</string>
+	<string name="TimeYear">
+		year,datetime,slt
+	</string>
+	<string name="TimeDay">
+		day,datetime,slt
+	</string>
+	<string name="TimeMonth">
+		mthnum,datetime,slt
+	</string>
+	<string name="TimeWeek">
+		wkday,datetime,slt
+	</string>
+	<string name="TimeAMPM">
+		ampm,datetime,slt
+	</string>
+	<string name="TimeHour12">
+		hour12,datetime,slt
+	</string>
+	<string name="LTimeMthNum">
+		mthnum,datetime,local
+	</string>
+	<string name="LTimeWeek">
+		wkday,datetime,local
+	</string>
+	<string name="LTimeMonth">
+		mth,datetime,local
+	</string>
+	<string name="LTimeDay">
+		day,datetime,local
+	</string>
+	<string name="LTimeSec">
+		second,datetime,local
+	</string>
+	<string name="LTimeHour">
+		hour,datetime,local
+	</string>
+	<string name="LTimeMin">
+		min,datetime,local
+	</string>
+	<string name="LTimeYear">
+		year,datetime,local
+	</string>
+	<string name="UTCTimeWeek">
+		weekday,datetime,utc
+	</string>
+	<string name="UTCTimeDay">
+		day,datetime,utc
+	</string>
+	<string name="UTCTimeMth">
+		mth,datetime,utc
+	</string>
+	<string name="UTCTimeYr">
+		year,datetime,utc
+	</string>
+	<string name="UTCTimeHr">
+		hour,datetime,utc
+	</string>
+	<string name="UTCTimeMin">
+		min,datetime,utc
+	</string>
+	<string name="UTCTimeSec">
+		second,datetime,utc
+	</string>
+	<string name="UTCTimeTimezone">
+		timezone,datetime,utc
+	</string>
+</strings>
diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
index c3b216ee79..1b6971418d 100644
--- a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Add Wearable Gear Menu">
-  <menu_item_check label="新しい順で並べ替え" name="sort_by_most_recent" />
-  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
-  <menu_item_check label="種別で並べ替え" name="sort_by_type" />
-</menu>
\ No newline at end of file
+	<menu_item_check label="新しい順で並べ替え" name="sort_by_most_recent"/>
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="種別で並べ替え" name="sort_by_type"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 6dd6b486a7..284449d59d 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: See also menu_avatar_other.xml -->
 <context_menu name="Avatar Pie">
-  <menu_item_call label="プロフィールを見る" name="Profile..." />
-  <menu_item_call label="フレンドに追加" name="Add Friend" />
-  <menu_item_call label="ＩＭ" name="Send IM..." />
-  <menu_item_call label="コール" name="Call" />
-  <menu_item_call label="グループに招待…" name="Invite..." />
-  <menu_item_separator />
-
-  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
-
-  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
-
-  <menu_item_separator />
-  <menu_item_call label="ブロック" name="Avatar Mute"/>
-  <menu_item_call label="報告" name="abuse"/>
-  <menu_item_call label="フリーズ" name="Freeze..."/>
-  <menu_item_call label="追放" name="Eject..."/>
-  <menu_item_call label="テクスチャのデバッグ" name="Debug..." />
-  <menu_item_call label="ＸＭＬとしてダンプ" name="Dump XML"/>
-  <menu_item_call label="ズームイン" name="Zoom In" />
-  <menu_item_call label="支払う" name="Pay..."/>
-  <menu_item_separator />
-  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
-
-  <menu_item_separator />
-  <context_menu label="アバターを描画" name="Render Avatar">
-    <menu_item_check name="常に完全描画する" label="Always full detail"/>
-    <menu_item_check name="描画しない" label="Never full detail"/>
-    <menu_item_call name="通常の描画設定" label="Remove from exceptions"/>
-    <menu_item_separator />
-    <menu_item_call label="例外…" name="RenderExceptions" />
-  </context_menu>
-  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールを見る" name="Profile..."/>
+	<menu_item_call label="フレンドに追加" name="Add Friend"/>
+	<menu_item_call label="ＩＭ" name="Send IM..."/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="グループに招待…" name="Invite..."/>
+	<menu_item_separator/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
+	<menu_item_separator/>
+	<menu_item_call label="ブロック" name="Avatar Mute"/>
+	<menu_item_call label="報告" name="abuse"/>
+	<menu_item_call label="フリーズ" name="Freeze..."/>
+	<menu_item_call label="追放" name="Eject..."/>
+	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ＸＭＬとしてダンプ" name="Dump XML"/>
+	<menu_item_call label="ズームイン" name="Zoom In"/>
+	<menu_item_call label="支払う" name="Pay..."/>
+	<menu_item_separator/>
+	<menu_item_call label="オブジェクトの調査" name="Object Inspect"/>
+	<menu_item_separator/>
+	<context_menu label="アバターを描画" name="Render Avatar">
+		<menu_item_check name="常に完全描画する" label="Always full detail"/>
+		<menu_item_check name="描画しない" label="Never full detail"/>
+		<menu_item_call name="通常の描画設定" label="Remove from exceptions"/>
+		<menu_item_separator/>
+		<menu_item_call label="例外…" name="RenderExceptions"/>
+	</context_menu>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index aae708e257..d2e46447a0 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Attachment Pie">
-  <menu_item_call label="触る" name="Attachment Object Touch" />
-  <menu_item_call label="編集…" name="Edit..." />
-  <menu_item_call label="取り外す" name="Detach" />
-  <menu_item_call label="座る" name="Sit Down Here" />
-  <menu_item_call label="立ち上がる" name="Stand Up" />
-  <menu_item_call label="アウトフィットを変更" name="Change Outfit" />
-  <menu_item_call label="アウトフィットを編集" name="Edit Outfit" />
-  <menu_item_call label="シェイプの編集" name="Edit My Shape" />
-  <menu_item_call label="ホバー高さ" name="Hover Height" />
-  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
-  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
-  <menu_item_call label="フレンド…" name="Friends..." />
-  <menu_item_call label="グループ…" name="Groups..." />
-  <menu_item_call label="プロフィール…" name="Profile..." />
-  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
-  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
-  <menu_item_call label="下に置く" name="Drop" />
-  <menu_item_call label="パーティクルの所有者をブロック" name="Mute Particle" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="触る" name="Attachment Object Touch"/>
+	<menu_item_call label="編集…" name="Edit..."/>
+	<menu_item_call label="取り外す" name="Detach"/>
+	<menu_item_call label="座る" name="Sit Down Here"/>
+	<menu_item_call label="立ち上がる" name="Stand Up"/>
+	<menu_item_call label="アウトフィットを変更" name="Change Outfit"/>
+	<menu_item_call label="アウトフィットを編集" name="Edit Outfit"/>
+	<menu_item_call label="シェイプの編集" name="Edit My Shape"/>
+	<menu_item_call label="ホバー高さ" name="Hover Height"/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
+	<menu_item_call label="フレンド…" name="Friends..."/>
+	<menu_item_call label="グループ…" name="Groups..."/>
+	<menu_item_call label="プロフィール…" name="Profile..."/>
+	<menu_item_call label="テクスチャのデバッグ…" name="Debug..."/>
+	<menu_item_call label="XMLとしてダンプ" name="Dump XML"/>
+	<menu_item_call label="下に置く" name="Drop"/>
+	<menu_item_call label="パーティクルの所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
index 8c697317a5..f032327dd9 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Avatar Icon Menu">
-  <menu_item_call label="プロフィールの表示" name="Show Profile" />
-  <menu_item_call label="IMを送信…" name="Send IM" />
-  <menu_item_call label="テレポートをリクエスト" name="Request Teleport" />
-  <menu_item_call label="フレンドを追加…" name="Add Friend" />
-  <menu_item_call label="フレンドを削除…" name="Remove Friend" />
-  <context_menu label="モデレーターのオプション" name="Moderator Options">
-    <menu_item_check label="文字チャットを許可" name="AllowTextChat" />
-    <menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected" />
-    <menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected" />
-  </context_menu>
-  <menu_item_call label="メンバーを立入禁止" name="BanMember" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールの表示" name="Show Profile"/>
+	<menu_item_call label="IMを送信…" name="Send IM"/>
+	<menu_item_call label="テレポートをリクエスト" name="Request Teleport"/>
+	<menu_item_call label="フレンドを追加…" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除…" name="Remove Friend"/>
+	<context_menu label="モデレーターのオプション" name="Moderator Options">
+		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
+		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
+	</context_menu>
+	<menu_item_call label="メンバーを立入禁止" name="BanMember"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index 237d66c54d..a7989b35c8 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -1,38 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Avatar Pie">
-  <menu_item_call label="プロフィールを見る" name="Profile..."/>
-  <menu_item_call label="フレンドに追加" name="Add Friend"/>
-  <menu_item_call label="ＩＭ" name="Send IM..."/>
-  <menu_item_call label="コール" name="Call"/>
-  <menu_item_call label="グループへ招待" name="Invite..." />
-
-  <menu_item_separator />
-
-  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
-
-  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
-
-  <menu_item_separator />
-
-  <menu_item_call label="ブロック" name="Avatar Mute"/>
-  <menu_item_call label="報告" name="abuse"/>
-  <menu_item_call label="フリーズ" name="Freeze..."/>
-  <menu_item_call label="追放" name="Eject..."/>
-  <menu_item_call label="テクスチャのデバッグ" name="Debug..." />
-  <menu_item_call label="ＸＭＬとしてダンプ" name="Dump XML"/>
-  <menu_item_call label="ズームイン" name="Zoom In" />
-  <menu_item_call label="支払う" name="Pay..."/>
-
-  <menu_item_separator />
-
-  <context_menu label="このアバターの描画" name="Render Avatar">
-    <menu_item_check name="常に完全描画する" label="Always full detail"/>
-    <menu_item_check name="描画しない" label="Never full detail"/>
-    <menu_item_call name="通常の描画設定" label="Remove from exceptions"/>
-    <menu_item_separator />
-    <menu_item_call label="例外…" name="RenderExceptions" />
-  </context_menu>
-
-  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールを見る" name="Profile..."/>
+	<menu_item_call label="フレンドに追加" name="Add Friend"/>
+	<menu_item_call label="ＩＭ" name="Send IM..."/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="グループへ招待" name="Invite..."/>
+	<menu_item_separator/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
+	<menu_item_separator/>
+	<menu_item_call label="ブロック" name="Avatar Mute"/>
+	<menu_item_call label="報告" name="abuse"/>
+	<menu_item_call label="フリーズ" name="Freeze..."/>
+	<menu_item_call label="追放" name="Eject..."/>
+	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ＸＭＬとしてダンプ" name="Dump XML"/>
+	<menu_item_call label="ズームイン" name="Zoom In"/>
+	<menu_item_call label="支払う" name="Pay..."/>
+	<menu_item_separator/>
+	<context_menu label="このアバターの描画" name="Render Avatar">
+		<menu_item_check name="常に完全描画する" label="Always full detail"/>
+		<menu_item_check name="描画しない" label="Never full detail"/>
+		<menu_item_call name="通常の描画設定" label="Remove from exceptions"/>
+		<menu_item_separator/>
+		<menu_item_call label="例外…" name="RenderExceptions"/>
+	</context_menu>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
index 0205564756..3c824840a5 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Settings">
-  <menu_item_check label="常に描画" name="always_render" />
-  <menu_item_check label="描画しない" name="never_render" />
-  <menu_item_check label="例外から削除" name="default" />
-</context_menu>
\ No newline at end of file
+	<menu_item_check label="常に描画" name="always_render"/>
+	<menu_item_check label="描画しない" name="never_render"/>
+	<menu_item_check label="例外から削除" name="default"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
index 65f7fae6bd..15021859bb 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_add.xml">
-  <!-- TODO:翻訳は正しいが整合性が取れていない -->
-  <menu_item_call label="常に詳細まで全て描画…" name="add_avatar_always_render" />
-  <menu_item_call label="詳細まで全て描画しない…" name="add_avatar_never_render" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="常に詳細まで全て描画…" name="add_avatar_always_render"/>
+	<menu_item_call label="詳細まで全て描画しない…" name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index 80ed3b19c8..f0100f6f08 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
-  <menu_item_call label="座る" name="Sit Down Here" />
-  <menu_item_call label="立ち上がる" name="Stand Up" />
-  <context_menu label="脱ぐ" name="Take Off &gt;">
-    <context_menu label="服装" name="Clothes &gt;">
-      <menu_item_call label="シャツ" name="Shirt" />
-      <menu_item_call label="ズボン" name="Pants" />
-      <menu_item_call label="スカート" name="Skirt" />
-      <menu_item_call label="靴" name="Shoes" />
-      <menu_item_call label="靴下" name="Socks" />
-      <menu_item_call label="ジャケット" name="Jacket" />
-      <menu_item_call label="手袋" name="Gloves" />
-      <menu_item_call label="下着（上半身）" name="Self Undershirt" />
-      <menu_item_call label="下着（下半身）" name="Self Underpants" />
-      <menu_item_call label="タトゥ" name="Self Tattoo" />
-      <menu_item_call label="物理作用" name="Self Physics" />
-      <menu_item_call label="アルファ" name="Self Alpha" />
-      <menu_item_call label="すべての服装" name="All Clothes" />
-    </context_menu>
-    <context_menu label="HUD" name="Object Detach HUD" />
-    <context_menu label="取り外す" name="Object Detach" />
-    <menu_item_call label="すべて取り外す" name="Detach All" />
-  </context_menu>
-  <menu_item_call label="アウトフィットを変更" name="Chenge Outfit" />
-  <menu_item_call label="アウトフィットの編集" name="Edit Outfit" />
-  <menu_item_call label="シェイプを編集" name="Edit My Shape" />
-  <menu_item_call label="ホバー高さ" name="Hover Height" />
-  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
-  <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
-  <menu_item_call label="フレンド…" name="Friends..." />
-  <menu_item_call label="グループ…" name="Groups..." />
-  <menu_item_call label="プロフィール…" name="Profile..." />
-  <menu_item_call label="テクスチャのデバッグ…" name="Debug..." />
-  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
-  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="座る" name="Sit Down Here"/>
+	<menu_item_call label="立ち上がる" name="Stand Up"/>
+	<context_menu label="脱ぐ" name="Take Off &gt;">
+		<context_menu label="服装" name="Clothes &gt;">
+			<menu_item_call label="シャツ" name="Shirt"/>
+			<menu_item_call label="ズボン" name="Pants"/>
+			<menu_item_call label="スカート" name="Skirt"/>
+			<menu_item_call label="靴" name="Shoes"/>
+			<menu_item_call label="靴下" name="Socks"/>
+			<menu_item_call label="ジャケット" name="Jacket"/>
+			<menu_item_call label="手袋" name="Gloves"/>
+			<menu_item_call label="下着（上半身）" name="Self Undershirt"/>
+			<menu_item_call label="下着（下半身）" name="Self Underpants"/>
+			<menu_item_call label="タトゥ" name="Self Tattoo"/>
+			<menu_item_call label="物理作用" name="Self Physics"/>
+			<menu_item_call label="アルファ" name="Self Alpha"/>
+			<menu_item_call label="すべての服装" name="All Clothes"/>
+		</context_menu>
+		<context_menu label="HUD" name="Object Detach HUD"/>
+		<context_menu label="取り外す" name="Object Detach"/>
+		<menu_item_call label="すべて取り外す" name="Detach All"/>
+	</context_menu>
+	<menu_item_call label="アウトフィットを変更" name="Chenge Outfit"/>
+	<menu_item_call label="アウトフィットの編集" name="Edit Outfit"/>
+	<menu_item_call label="シェイプを編集" name="Edit My Shape"/>
+	<menu_item_call label="ホバー高さ" name="Hover Height"/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+	<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
+	<menu_item_call label="フレンド…" name="Friends..."/>
+	<menu_item_call label="グループ…" name="Groups..."/>
+	<menu_item_call label="プロフィール…" name="Profile..."/>
+	<menu_item_call label="テクスチャのデバッグ…" name="Debug..."/>
+	<menu_item_call label="XMLとしてダンプ" name="Dump XML"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
index 3e4ab1f856..154db254da 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Attachment">
-  <menu_item_call label="触る" name="touch_attach" />
-  <menu_item_call label="編集" name="edit_item" />
-  <menu_item_call label="取り外す" name="detach" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="触る" name="touch_attach"/>
+	<menu_item_call label="編集" name="edit_item"/>
+	<menu_item_call label="取り外す" name="detach"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
index 8af5189f87..eb5faa2545 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Body">
-  <menu_item_call label="交換" name="replace" />
-  <menu_item_call label="編集" name="edit" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="交換" name="replace"/>
+	<menu_item_call label="編集" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
index 47d4f76e48..f94e5d393c 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="COF Clothing">
-  <menu_item_call label="脱ぐ" name="take_off" />
-  <menu_item_call label="編集" name="edit" />
-  <menu_item_call label="着替える" name="replace" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="脱ぐ" name="take_off"/>
+	<menu_item_call label="編集" name="edit"/>
+	<menu_item_call label="着替える" name="replace"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index f6ce0e6c6c..c60b27111e 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
-  <menu label="新しい服装" name="COF.Gear.New_Clothes" />
-  <menu label="新しい身体部位" name="COF.Gear.New_Body_Parts" />
-</toggleable_menu>
\ No newline at end of file
+	<menu label="新しい服装" name="COF.Gear.New_Clothes"/>
+	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
index ff6884f24d..047f5d57cf 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_conversation_participant">
-  <menu_item_call label="会話を終える" name="close_conversation" />
-  <menu_item_call label="ボイスチャットを始める" name="open_voice_conversation" />
-  <menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice" />
-  <menu_item_call label="選択した項目を閉じる" name="close_selected_conversations" />
-  <menu_item_call label="プロフィールを表示" name="view_profile" />
-  <menu_item_call label="ＩＭ" name="im" />
-  <menu_item_call label="テレポートのオファー" name="offer_teleport" />
-  <menu_item_call label="ボイスコール" name="voice_call" />
-  <menu_item_call label="チャットの履歴…" name="chat_history" />
-  <menu_item_call label="フレンド追加" name="add_friend" />
-  <menu_item_call label="フレンド削除" name="remove_friend" />
-  <menu_item_call label="フレンド削除" name="remove_friends" />
-  <menu_item_call label="グループに招待…" name="invite_to_group" />
-  <menu_item_call label="ズームイン" name="zoom_in" />
-  <menu_item_call label="マップ" name="map" />
-  <menu_item_call label="共有" name="share" />
-  <menu_item_call label="支払い" name="pay" />
-  <menu_item_call label="嫌がらせの報告" name="report_abuse" />
-  <menu_item_check label="ボイスをブロック" name="block_unblock" />
-  <menu_item_check label="テキストをブロックする" name="MuteText" />
-  <menu_item_call label="グループのプロフィール" name="group_profile" />
-  <menu_item_call label="このグループをアクティブ化" name="activate_group" />
-  <menu_item_call label="このグループから脱退する" name="leave_group" />
-  <context_menu label="モデレーターのオプション" name="Moderator Options">
-    <menu_item_check label="テキストチャットを許可" name="AllowTextChat" />
-    <menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected" />
-    <menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected" />
-    <menu_item_call label="全員のボイスをミュートする" name="ModerateVoiceMute" />
-    <menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute" />
-  </context_menu>
-  <menu_item_call label="メンバーをバンする" name="BanMember" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="会話を終える" name="close_conversation"/>
+	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
+	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
+	<menu_item_call label="選択した項目を閉じる" name="close_selected_conversations"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="テレポートのオファー" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴…" name="chat_history"/>
+	<menu_item_call label="フレンド追加" name="add_friend"/>
+	<menu_item_call label="フレンド削除" name="remove_friend"/>
+	<menu_item_call label="フレンド削除" name="remove_friends"/>
+	<menu_item_call label="グループに招待…" name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="マップ" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_call label="嫌がらせの報告" name="report_abuse"/>
+	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
+	<menu_item_check label="テキストをブロックする" name="MuteText"/>
+	<menu_item_call label="グループのプロフィール" name="group_profile"/>
+	<menu_item_call label="このグループをアクティブ化" name="activate_group"/>
+	<menu_item_call label="このグループから脱退する" name="leave_group"/>
+	<context_menu label="モデレーターのオプション" name="Moderator Options">
+		<menu_item_check label="テキストチャットを許可" name="AllowTextChat"/>
+		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="全員のボイスをミュートする" name="ModerateVoiceMute"/>
+		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
+	</context_menu>
+	<menu_item_call label="メンバーをバンする" name="BanMember"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
index 7e43b8b61f..78c46d13b4 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Conversation Context Menu">
-  <menu_item_call label="ＩＭ…" name="IM" />
-  <menu_item_call label="ボイスコール…" name="Call" />
-  <menu_item_call label="チャットの履歴を開く…" name="Chat history" />
-  <menu_item_call label="プロフィールを表示" name="View Profile" />
-  <menu_item_call label="テレポートのオファー" name="teleport" />
-  <menu_item_call label="フレンド登録" name="add_friend" />
-  <menu_item_call label="フレンドを削除" name="remove_friend" />
-  <menu_item_call label="グループに招待…." name="Invite" />
-  <menu_item_call label="マップ" name="Map" />
-  <menu_item_call label="共有" name="Share" />
-  <menu_item_call label="支払い" name="Pay" />
-  <menu_item_check label="ブロック・ブロック解除" name="Block/Unblock" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="ＩＭ…" name="IM"/>
+	<menu_item_call label="ボイスコール…" name="Call"/>
+	<menu_item_call label="チャットの履歴を開く…" name="Chat history"/>
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="テレポートのオファー" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待…." name="Invite"/>
+	<menu_item_call label="マップ" name="Map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
index c239eb9543..bcda112d2f 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_conversation_view">
-  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
-  <menu_item_check label="日付で並べ替え" name="sort_by_date" />
-  <menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends" />
-  <menu_item_call label="近隣チャットの履歴を表示…" name="view_nearby_chat_history" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
+	<menu_item_call label="近隣チャットの履歴を表示…" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
index 819b05f854..b58b08ebb2 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Copy Paste Color Menu">
-  <menu_item_call label="コピー" name="params_copy" />
-  <menu_item_call label="ペースト" name="params_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="コピー" name="params_copy"/>
+	<menu_item_call label="ペースト" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
index ac211997bf..6105fd5296 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu layout="topleft" name="Copy Paste Features Menu">
-  <menu_item_call label="コピー" name="params_copy" />
-  <menu_item_call label="ペースト" name="params_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="コピー" name="params_copy"/>
+	<menu_item_call label="ペースト" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
index 80d7eeff31..0f069dfffa 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Copy Paste Light Menu">
-  <menu_item_call label="コピー" name="params_copy" />
-  <menu_item_call label="ペースト" name="params_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="コピー" name="params_copy"/>
+	<menu_item_call label="ペースト" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
index ed1491298f..b2d3672019 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Copy Paste Object Menu">
-  <menu_item_call label="コピー" name="params_copy"/>
-  <menu_item_call label="ペースト" name="params_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="コピー" name="params_copy"/>
+	<menu_item_call label="ペースト" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
index 92e0ec74ba..3589d7bd4c 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_pos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Copy Paste Position Menu">
-  <menu_item_call label="すべてをコピー" name="psr_copy" />
-  <menu_item_call label="位置をコピー" name="pos_copy" />
-  <menu_item_call label="すべてペースト" name="psr_paste" />
-  <menu_item_call label="位置をペースト" name="pos_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="すべてをコピー" name="psr_copy"/>
+	<menu_item_call label="位置をコピー" name="pos_copy"/>
+	<menu_item_call label="すべてペースト" name="psr_paste"/>
+	<menu_item_call label="位置をペースト" name="pos_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
index 9504f39ef1..7a77a74b67 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_rot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Copy Paste Rotation Menu">
-  <menu_item_call label="すべてをコピー" name="psr_copy" />
-  <menu_item_call label="回転をコピー" name="rot_copy" />
-  <menu_item_call label="すべてをペースト" name="psr_paste" />
-  <menu_item_call label="回転をペースト" name="rot_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="すべてをコピー" name="psr_copy"/>
+	<menu_item_call label="回転をコピー" name="rot_copy"/>
+	<menu_item_call label="すべてをペースト" name="psr_paste"/>
+	<menu_item_call label="回転をペースト" name="rot_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
index 1ee1d6a914..3b813ba97f 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_size.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Copy Paste Size Menu">
-  <menu_item_call label="すべてをコピー" name="psr_copy" />
-  <menu_item_call label="サイズをコピー" name="size_copy" />
-  <menu_item_call label="すべてをペースト" name="psr_paste" />
-  <menu_item_call label="サイズをペースト" name="size_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="すべてをコピー" name="psr_copy"/>
+	<menu_item_call label="サイズをコピー" name="size_copy"/>
+	<menu_item_call label="すべてをペースト" name="psr_paste"/>
+	<menu_item_call label="サイズをペースト" name="size_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
index a596fbe103..0947a66b9a 100644
--- a/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
+++ b/indra/newview/skins/default/xui/ja/menu_copy_paste_texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Copy Paste Texture Menu">
-  <menu_item_call label="コピー" name="params_copy" />
-  <menu_item_call label="ペースト" name="params_paste" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="コピー" name="params_copy"/>
+	<menu_item_call label="ペースト" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml
index 0152675de7..121b3d699b 100644
--- a/indra/newview/skins/default/xui/ja/menu_edit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_edit.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu label="編集" name="Edit">
-  <menu_item_call label="元に戻す" name="Undo" />
-  <menu_item_call label="やり直し" name="Redo" />
-  <menu_item_call label="カット" name="Cut" />
-  <menu_item_call label="コピー" name="Copy" />
-  <menu_item_call label="ペースト" name="Paste" />
-  <menu_item_call label="削除" name="Delete" />
-  <menu_item_call label="複製" name="Duplicate" />
-  <menu_item_call label="すべて選択" name="Select All" />
-  <menu_item_call label="選択解除" name="Deselect" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="元に戻す" name="Undo"/>
+	<menu_item_call label="やり直し" name="Redo"/>
+	<menu_item_call label="カット" name="Cut"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="ペースト" name="Paste"/>
+	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="複製" name="Duplicate"/>
+	<menu_item_call label="すべて選択" name="Select All"/>
+	<menu_item_call label="選択解除" name="Deselect"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml
index 94361555fe..58347b55fb 100644
--- a/indra/newview/skins/default/xui/ja/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-  <menu_item_call label="テレポート" name="Teleport To Landmark" />
-  <menu_item_call label="ランドマークの表示／編集" name="Landmark Open" />
-  <menu_item_call label="ランドマークに移動" name="Move to Landmarks" />
-  <menu_item_call label="マップに表示" name="Show On Map" />
-  <menu_item_call label="SLurlをコピー" name="Copy slurl" />
-  <menu_item_call label="ピックを作成" name="create_pick" />
-  <menu_item_separator />
-  <menu_item_call label="コピー" name="Landmark Copy" />
-  <menu_item_call label="ペースト" name="Landmark Paste" />
-  <menu_item_call label="名前変更" name="rename" />
-  <menu_item_call label="削除" name="Delete" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="テレポート" name="Teleport To Landmark"/>
+	<menu_item_call label="ランドマークの表示／編集" name="Landmark Open"/>
+	<menu_item_call label="ランドマークに移動" name="Move to Landmarks"/>
+	<menu_item_call label="マップに表示" name="Show On Map"/>
+	<menu_item_call label="SLurlをコピー" name="Copy slurl"/>
+	<menu_item_call label="ピックを作成" name="create_pick"/>
+	<menu_item_separator/>
+	<menu_item_call label="コピー" name="Landmark Copy"/>
+	<menu_item_call label="ペースト" name="Landmark Paste"/>
+	<menu_item_call label="名前変更" name="rename"/>
+	<menu_item_call label="削除" name="Delete"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
index 2527e373f4..5540c9a234 100644
--- a/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit">
-  <menu_item_call label="着る－このアウトフィットに着替える" name="wear_replace" />
-  <menu_item_call label="着る－このアウトフィットに追加する" name="wear_add" />
-  <menu_item_call label="脱ぐ－このアウトフィットから取り外す" name="take_off" />
-  <menu_item_call label="画像をアップロード（L$ [UPLOAD_COST]）" name="upload_photo" />
-  <menu_item_call label="画像を選択" name="select_photo" />
-  <menu_item_call label="スナップショットを撮影" name="take_snapshot" />
-  <menu_item_call label="画像を削除" name="remove_photo" />
-  <menu_item_separator name="sepatator1" />
-  <menu label="新しい服装" name="New Clothes">
-    <menu_item_call label="新しいシャツ" name="New Shirt" />
-    <menu_item_call label="新しいズボン" name="New Pants" />
-    <menu_item_call label="新しい靴" name="New Shoes" />
-    <menu_item_call label="新しい靴下" name="New Socks" />
-    <menu_item_call label="新しいジャケット" name="New Jacket" />
-    <menu_item_call label="新しいスカート" name="New Skirt" />
-    <menu_item_call label="新しい手袋" name="New Gloves" />
-    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
-    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
-    <menu_item_call label="新しいアルファ" name="New Alpha" />
-    <menu_item_call label="新しい物理作用" name="New Physics" />
-    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
-  </menu>
-  <menu label="新しい身体部位" name="New Body Parts">
-    <menu_item_call label="新しいシェイプ" name="New Shape" />
-    <menu_item_call label="新しい肌" name="New Skin" />
-    <menu_item_call label="新しい髪型" name="New Hair" />
-    <menu_item_call label="新しい目" name="New Eyes" />
-  </menu>
-  <menu_item_separator name="sepatator2" />
-  <menu_item_call label="アウトフィットを編集" name="edit" />
-  <menu_item_call label="アウトフィットの名前変更" name="rename" />
-  <menu_item_call label="アウトフィットを削除" name="delete" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="着る－このアウトフィットに着替える" name="wear_replace"/>
+	<menu_item_call label="着る－このアウトフィットに追加する" name="wear_add"/>
+	<menu_item_call label="脱ぐ－このアウトフィットから取り外す" name="take_off"/>
+	<menu_item_call label="画像をアップロード（L$ [UPLOAD_COST]）" name="upload_photo"/>
+	<menu_item_call label="画像を選択" name="select_photo"/>
+	<menu_item_call label="スナップショットを撮影" name="take_snapshot"/>
+	<menu_item_call label="画像を削除" name="remove_photo"/>
+	<menu_item_separator name="sepatator1"/>
+	<menu label="新しい服装" name="New Clothes">
+		<menu_item_call label="新しいシャツ" name="New Shirt"/>
+		<menu_item_call label="新しいズボン" name="New Pants"/>
+		<menu_item_call label="新しい靴" name="New Shoes"/>
+		<menu_item_call label="新しい靴下" name="New Socks"/>
+		<menu_item_call label="新しいジャケット" name="New Jacket"/>
+		<menu_item_call label="新しいスカート" name="New Skirt"/>
+		<menu_item_call label="新しい手袋" name="New Gloves"/>
+		<menu_item_call label="新しい下着（上半身）" name="New Undershirt"/>
+		<menu_item_call label="新しい下着（下半身）" name="New Underpants"/>
+		<menu_item_call label="新しいアルファ" name="New Alpha"/>
+		<menu_item_call label="新しい物理作用" name="New Physics"/>
+		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
+	</menu>
+	<menu label="新しい身体部位" name="New Body Parts">
+		<menu_item_call label="新しいシェイプ" name="New Shape"/>
+		<menu_item_call label="新しい肌" name="New Skin"/>
+		<menu_item_call label="新しい髪型" name="New Hair"/>
+		<menu_item_call label="新しい目" name="New Eyes"/>
+	</menu>
+	<menu_item_separator name="sepatator2"/>
+	<menu_item_call label="アウトフィットを編集" name="edit"/>
+	<menu_item_call label="アウトフィットの名前変更" name="rename"/>
+	<menu_item_call label="アウトフィットを削除" name="delete"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
index 333db46380..e1f24cdb39 100644
--- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_gesture_gear">
-  <menu_item_call label="選択したジェスチャーの有効化／無効化" name="activate" />
-  <menu_item_call label="名前変更" name="rename" />
-  <menu_item_call label="コピー" name="copy_gesture" />
-  <menu_item_call label="ペースト" name="paste" />
-  <menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid" />
-  <menu_item_call label="現在のアウトフィットに保存" name="save_to_outfit" />
-  <menu_item_call label="編集" name="edit_gesture" />
-  <menu_item_call label="調べる" name="inspect" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="選択したジェスチャーの有効化／無効化" name="activate"/>
+	<menu_item_call label="名前変更" name="rename"/>
+	<menu_item_call label="コピー" name="copy_gesture"/>
+	<menu_item_call label="ペースト" name="paste"/>
+	<menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid"/>
+	<menu_item_call label="現在のアウトフィットに保存" name="save_to_outfit"/>
+	<menu_item_call label="編集" name="edit_gesture"/>
+	<menu_item_call label="調べる" name="inspect"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
index 52cc5e69e1..db403ac938 100644
--- a/indra/newview/skins/default/xui/ja/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-  <menu_item_call label="グループに参加…" name="item_join" />
-  <menu_item_call label="新しいグループ…" name="item_new" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="グループに参加…" name="item_join"/>
+	<menu_item_call label="新しいグループ…" name="item_new"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
index 3a9fb3570a..d9d6e51867 100644
--- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_navbar_menu">
-  <menu_item_check label="ナビゲーションバーとお気に入りバーを表示" name="ShowNavbarNavigationPanel" />
-  <menu_item_check label="「場所」のミニフィールドを表示" name="ShowMiniLocationPanel" />
-</menu>
\ No newline at end of file
+	<menu_item_check label="ナビゲーションバーとお気に入りバーを表示" name="ShowNavbarNavigationPanel"/>
+	<menu_item_check label="「場所」のミニフィールドを表示" name="ShowMiniLocationPanel"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
index 8899b69f1a..b3d3917965 100644
--- a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Conversation Gear Menu">
-  <menu_item_call label="プロフィールを表示" name="View Profile" />
-  <menu_item_call label="フレンド登録" name="Add Friend" />
-  <menu_item_call label="フレンドを削除" name="remove_friend" />
-  <menu_item_call label="テレポートをオファー" name="offer_teleport" />
-  <menu_item_call label="グループに招待…" name="invite_to_group" />
-  <menu_item_call label="チャットの履歴…" name="chat_history" />
-  <menu_item_call label="ズームイン" name="zoom_in" />
-  <menu_item_call label="マップ" name="map" />
-  <menu_item_call label="共有" name="Share" />
-  <menu_item_call label="支払い" name="Pay" />
-  <menu_item_call label="迷惑行為の報告" name="Report Abuse" />
-  <menu_item_check label="ボイスのブロック／解除" name="Block/Unblock" />
-  <menu_item_check label="テキストをブロックする" name="MuteText" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="テレポートをオファー" name="offer_teleport"/>
+	<menu_item_call label="グループに招待…" name="invite_to_group"/>
+	<menu_item_call label="チャットの履歴…" name="chat_history"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="マップ" name="map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_call label="迷惑行為の報告" name="Report Abuse"/>
+	<menu_item_check label="ボイスのブロック／解除" name="Block/Unblock"/>
+	<menu_item_check label="テキストをブロックする" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
index 5ef2a4152a..73e4164407 100644
--- a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_modes">
-  <menu_item_check label="簡易表示" name="compact_view" />
-  <menu_item_check label="詳細表示" name="expanded_view" />
-  <menu_item_check label="時間を表示" name="IMShowTime" />
-  <menu_item_check label="１対１の会話で名前を表示" name="IMShowNamesForP2PConv" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="簡易表示" name="compact_view"/>
+	<menu_item_check label="詳細表示" name="expanded_view"/>
+	<menu_item_check label="時間を表示" name="IMShowTime"/>
+	<menu_item_check label="１対１の会話で名前を表示" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
index 26b581b793..8cd6fa4a27 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet AdHoc Menu">
-  <menu_item_call label="セッション終了" name="End Session" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="セッション終了" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
index 7ae8765df4..e7f5cb310a 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet Group Menu">
-  <menu_item_call label="プロフィールを表示" name="Show Profile" />
-  <menu_item_call label="セッションを表示" name="Chat" />
-  <menu_item_call label="セッション終了" name="End Session" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールを表示" name="Show Profile"/>
+	<menu_item_call label="セッションを表示" name="Chat"/>
+	<menu_item_call label="セッション終了" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
index 61a9bae73c..edcc0f751a 100644
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet P2P Menu">
-  <menu_item_call label="プロフィールの表示" name="Show Profile" />
-  <menu_item_call label="フレンドに追加" name="Add Friend" />
-  <menu_item_call label="セッションを表示" name="Send IM" />
-  <menu_item_call label="セッション終了" name="End Session" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールの表示" name="Show Profile"/>
+	<menu_item_call label="フレンドに追加" name="Add Friend"/>
+	<menu_item_call label="セッションを表示" name="Send IM"/>
+	<menu_item_call label="セッション終了" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
index ec5abea6b2..55b2e8b21b 100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Menu">
-  <menu_item_call label="触る" name="touch" />
-  <menu_item_call label="座る" name="sit" />
-  <menu_item_call label="支払う" name="pay" />
-  <menu_item_call label="買う" name="buy" />
-  <menu_item_call label="取る" name="take" />
-  <menu_item_call label="コピーを取る" name="take_copy" />
-  <menu_item_call label="開く" name="open" />
-  <menu_item_call label="編集" name="edit" />
-  <menu_item_call label="装着" name="wear" />
-  <menu_item_call label="追加" name="add" />
-  <menu_item_call label="報告" name="report" />
-  <menu_item_call label="ブロック" name="block" />
-  <menu_item_call label="ブロック解除" name="unblock" />
-  <menu_item_call label="ズームイン" name="zoom_in" />
-  <menu_item_call label="削除" name="remove" />
-  <menu_item_call label="詳細" name="more_info" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="触る" name="touch"/>
+	<menu_item_call label="座る" name="sit"/>
+	<menu_item_call label="支払う" name="pay"/>
+	<menu_item_call label="買う" name="buy"/>
+	<menu_item_call label="取る" name="take"/>
+	<menu_item_call label="コピーを取る" name="take_copy"/>
+	<menu_item_call label="開く" name="open"/>
+	<menu_item_call label="編集" name="edit"/>
+	<menu_item_call label="装着" name="wear"/>
+	<menu_item_call label="追加" name="add"/>
+	<menu_item_call label="報告" name="report"/>
+	<menu_item_call label="ブロック" name="block"/>
+	<menu_item_call label="ブロック解除" name="unblock"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="削除" name="remove"/>
+	<menu_item_call label="詳細" name="more_info"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
index d9642e3c0c..9a4a8138f5 100644
--- a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="InvOfferChiclet Menu">
-  <menu_item_call label="閉じる" name="Close" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="閉じる" name="Close"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 03e02ff200..c7cba4845d 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -1,133 +1,129 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-  <menu_item_call label="リストを作成" name="Marketplace Create Listing" />
-  <menu_item_call label="リストを関連付け" name="Marketplace Associate Listing" />
-  <menu_item_call label="リストを取得 (更新)" name="Marketplace Get Listing" />
-  <menu_item_call label="エラーを確認" name="Marketplace Check Listing" />
-  <menu_item_call label="リストを編集" name="Marketplace Edit Listing" />
-  <menu_item_call label="リスト" name="Marketplace List" />
-  <menu_item_call label="リストから取り除く" name="Marketplace Unlist" />
-  <menu_item_call label="有効に" name="Marketplace Activate" />
-  <menu_item_call label="無効に" name="Marketplace Deactivate" />
-  <menu_item_separator name="Marketplace Listings Separator" />
-  <menu_item_call label="共有" name="Share" />
-  <menu_item_call label="開く" name="Task Open" />
-  <menu_item_call label="再生" name="Task Play" />
-  <menu_item_call label="プロパティ" name="Task Properties" />
-  <menu_item_call label="名前の変更" name="Task Rename" />
-  <menu_item_call label="削除" name="Task Remove" />
-  <menu_item_call label="ごみ箱を空に" name="Empty Trash" />
-  <menu_item_call label="遺失物フォルダを空に" name="Empty Lost And Found" />
-  <menu_item_call label="新しいフォルダ" name="New Folder" />
-  <menu_item_call label="新しいアウトフィット" name="New Outfit" />
-  <menu_item_call label="新しいスクリプト" name="New Script" />
-  <menu_item_call label="新しいノートカード" name="New Note" />
-  <menu_item_call label="新しいジェスチャー" name="New Gesture" />
-  <menu label="新しい服装" name="New Clothes">
-    <menu_item_call label="新しいシャツ" name="New Shirt" />
-    <menu_item_call label="新しいズボン" name="New Pants" />
-    <menu_item_call label="新しい靴" name="New Shoes" />
-    <menu_item_call label="新しい靴下" name="New Socks" />
-    <menu_item_call label="新しいジャケット" name="New Jacket" />
-    <menu_item_call label="新しいスカート" name="New Skirt" />
-    <menu_item_call label="新しい手袋" name="New Gloves" />
-    <menu_item_call label="新しい下着（上）" name="New Undershirt" />
-    <menu_item_call label="新しい下着（下）" name="New Underpants" />
-    <menu_item_call label="新しいアルファマスク" name="New Alpha Mask" />
-    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
-    <menu_item_call label="新しいユニバーサル" name="New Universal" />
-    <menu_item_call label="新規の物理作用" name="New Physics" />
-  </menu>
-  <menu label="新しい身体部位" name="New Body Parts">
-    <menu_item_call label="新しいシェイプ(体型)" name="New Shape" />
-    <menu_item_call label="新しいスキン" name="New Skin" />
-    <menu_item_call label="新しい髪" name="New Hair" />
-    <menu_item_call label="新しい眼" name="New Eyes" />
-  </menu>
-  <menu label="新しい設定" name="New Settings">
-    <menu_item_call label="新しい空" name="New Sky" />
-    <menu_item_call label="新しい水面" name="New Water" />
-    <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
-  </menu>
-  <menu label="次のデフォルトとして使用" name="upload_def">
-    <menu_item_call label="画像のアップロード" name="Image uploads" />
-    <menu_item_call label="サウンドのアップロード" name="Sound uploads" />
-    <menu_item_call label="アニメーションのアップロード" name="Animation uploads" />
-    <menu_item_call label="モデルのアップロード" name="Model uploads" />
-  </menu>
-  <menu label="種類を変更" name="Change Type">
-    <menu_item_call label="デフォルト" name="Default" />
-    <menu_item_call label="手袋" name="Gloves" />
-    <menu_item_call label="上着" name="Jacket" />
-    <menu_item_call label="ズボン" name="Pants" />
-    <menu_item_call label="シェイプ" name="Shape" />
-    <menu_item_call label="靴" name="Shoes" />
-    <menu_item_call label="シャツ" name="Shirt" />
-    <menu_item_call label="スカート" name="Skirt" />
-    <menu_item_call label="下着（上半身）" name="Underpants" />
-    <menu_item_call label="下着（下半身）" name="Undershirt" />
-  </menu>
-  <menu_item_call label="テレポート" name="Landmark Open" />
-  <menu_item_call label="開く" name="Animation Open" />
-  <menu_item_call label="開く" name="Sound Open" />
-  <menu_item_call label="着用中のアウトフィットと入れ替え" name="Replace Outfit" />
-  <menu_item_call label="着用中のアウトフィットに追加" name="Add To Outfit" />
-  <menu_item_call label="着用中のアウトフィットから取り外す" name="Remove From Outfit" />
-  <menu_item_call label="アウトフィット一覧をクリップボードにコピー" name="Copy outfit list to clipboard" />
-  <menu_item_separator name="Outfit Separator" />
-  <menu_item_call label="オリジナルを探す" name="Find Original" />
-  <menu_item_call label="アイテムを除外" name="Purge Item" />
-  <menu_item_call label="アイテムを復元" name="Restore Item" />
-  <menu_item_call label="開く" name="Open" />
-  <menu_item_call label="オリジナルを開く" name="Open Original" />
-  <menu_item_call label="プロパティ" name="Properties" />
-  <menu_item_call label="名前を変更" name="Rename" />
-  <menu_item_call label="アセットのＵＵＩＤをコピー" name="Copy Asset UUID" />
-  <menu_item_call label="メインパネルで表示" name="Show in Main Panel" />
-  <menu_item_call label="カット" name="Cut" />
-  <menu_item_call label="コピー" name="Copy" />
-  <menu_item_call label="ペースト" name="Paste" />
-  <menu_item_call label="リンクとしてペースト" name="Paste As Link" />
-  <menu_item_call label="リンクを置き換える" name="Replace Links" />
-  <menu_item_separator name="Paste Separator" />
-  <menu_item_call label="削除" name="Delete" />
-  <menu_item_call label="システムフォルダを削除" name="Delete System Folder" />
-  <menu_item_separator />
-  <menu_item_separator />
-  <menu_item_call label="会話チャットを開始" name="Conference Chat Folder" />
-  <menu_item_call label="再生" name="Sound Play" />
-  <menu_item_call label="SLurlをコピー" name="url_copy" />
-  <menu_item_call label="ランドマークの情報" name="About Landmark" />
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_separator name="Animation Separator" />
-  <menu_item_call label="インワールドで再生" name="Animation Play" />
-  <menu_item_call label="ローカルで再生" name="Animation Audition" />
-  <menu_item_call label="インスタントメッセージを送信" name="Send Instant Message" />
-  <menu_item_call label="テレポートをオファー…" name="Offer Teleport..." />
-  <menu_item_call label="テレポートをリクエスト…" name="Request Teleport..." />
-  <menu_item_call label="会話チャットを開始" name="Conference Chat" />
-  <menu_item_call label="有効化" name="Activate" />
-  <menu_item_call label="無効化" name="Deactivate" />
-  <menu_item_call label="名前をつけて保存" name="Save As" />
-  <menu_item_call label="選択を名前をつけて保存" layout="topleft" name="Save Selected As" />
-  <menu_item_separator name="Wearable And Object Separator" />
-  <!-- COMMENTED OUT for DEV-32347 -->
-  <!--
-  <menu_item_call label="最後の場所へリストア" name="Restore to Last Position" />
-  -->
-  <menu_item_call label="装着" name="Wearable And Object Wear" />
-  <menu label="装着先" name="Attach To" />
-  <menu label="HUD 装着先" name="Attach To HUD" />
-  <menu_item_call label="触る" name="Attachment Touch" />
-  <menu_item_call label="編集" name="Wearable Edit" />
-  <menu_item_call label="追加" name="Wearable Add" />
-  <menu_item_call label="取り外す" name="Detach From Yourself" />
-  <menu_item_call label="脱ぐ" name="Take Off" />
-  <menu_item_separator name="Settings Separator" />
-  <menu_item_call label="自分にのみ適用" name="Settings Apply Local" />
-  <menu_item_call label="区画に適用" name="Settings Apply Parcel" />
-  <menu_item_separator layout="topleft" />
-  <menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy" />
-  <menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move" />
-  <menu_item_call label="－オプションなし－" name="--no options--" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="リストを作成" name="Marketplace Create Listing"/>
+	<menu_item_call label="リストを関連付け" name="Marketplace Associate Listing"/>
+	<menu_item_call label="リストを取得 (更新)" name="Marketplace Get Listing"/>
+	<menu_item_call label="エラーを確認" name="Marketplace Check Listing"/>
+	<menu_item_call label="リストを編集" name="Marketplace Edit Listing"/>
+	<menu_item_call label="リスト" name="Marketplace List"/>
+	<menu_item_call label="リストから取り除く" name="Marketplace Unlist"/>
+	<menu_item_call label="有効に" name="Marketplace Activate"/>
+	<menu_item_call label="無効に" name="Marketplace Deactivate"/>
+	<menu_item_separator name="Marketplace Listings Separator"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="開く" name="Task Open"/>
+	<menu_item_call label="再生" name="Task Play"/>
+	<menu_item_call label="プロパティ" name="Task Properties"/>
+	<menu_item_call label="名前の変更" name="Task Rename"/>
+	<menu_item_call label="削除" name="Task Remove"/>
+	<menu_item_call label="ごみ箱を空に" name="Empty Trash"/>
+	<menu_item_call label="遺失物フォルダを空に" name="Empty Lost And Found"/>
+	<menu_item_call label="新しいフォルダ" name="New Folder"/>
+	<menu_item_call label="新しいアウトフィット" name="New Outfit"/>
+	<menu_item_call label="新しいスクリプト" name="New Script"/>
+	<menu_item_call label="新しいノートカード" name="New Note"/>
+	<menu_item_call label="新しいジェスチャー" name="New Gesture"/>
+	<menu label="新しい服装" name="New Clothes">
+		<menu_item_call label="新しいシャツ" name="New Shirt"/>
+		<menu_item_call label="新しいズボン" name="New Pants"/>
+		<menu_item_call label="新しい靴" name="New Shoes"/>
+		<menu_item_call label="新しい靴下" name="New Socks"/>
+		<menu_item_call label="新しいジャケット" name="New Jacket"/>
+		<menu_item_call label="新しいスカート" name="New Skirt"/>
+		<menu_item_call label="新しい手袋" name="New Gloves"/>
+		<menu_item_call label="新しい下着（上）" name="New Undershirt"/>
+		<menu_item_call label="新しい下着（下）" name="New Underpants"/>
+		<menu_item_call label="新しいアルファマスク" name="New Alpha Mask"/>
+		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
+		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
+		<menu_item_call label="新規の物理作用" name="New Physics"/>
+	</menu>
+	<menu label="新しい身体部位" name="New Body Parts">
+		<menu_item_call label="新しいシェイプ(体型)" name="New Shape"/>
+		<menu_item_call label="新しいスキン" name="New Skin"/>
+		<menu_item_call label="新しい髪" name="New Hair"/>
+		<menu_item_call label="新しい眼" name="New Eyes"/>
+	</menu>
+	<menu label="新しい設定" name="New Settings">
+		<menu_item_call label="新しい空" name="New Sky"/>
+		<menu_item_call label="新しい水面" name="New Water"/>
+		<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
+	</menu>
+	<menu label="次のデフォルトとして使用" name="upload_def">
+		<menu_item_call label="画像のアップロード" name="Image uploads"/>
+		<menu_item_call label="サウンドのアップロード" name="Sound uploads"/>
+		<menu_item_call label="アニメーションのアップロード" name="Animation uploads"/>
+		<menu_item_call label="モデルのアップロード" name="Model uploads"/>
+	</menu>
+	<menu label="種類を変更" name="Change Type">
+		<menu_item_call label="デフォルト" name="Default"/>
+		<menu_item_call label="手袋" name="Gloves"/>
+		<menu_item_call label="上着" name="Jacket"/>
+		<menu_item_call label="ズボン" name="Pants"/>
+		<menu_item_call label="シェイプ" name="Shape"/>
+		<menu_item_call label="靴" name="Shoes"/>
+		<menu_item_call label="シャツ" name="Shirt"/>
+		<menu_item_call label="スカート" name="Skirt"/>
+		<menu_item_call label="下着（上半身）" name="Underpants"/>
+		<menu_item_call label="下着（下半身）" name="Undershirt"/>
+	</menu>
+	<menu_item_call label="テレポート" name="Landmark Open"/>
+	<menu_item_call label="開く" name="Animation Open"/>
+	<menu_item_call label="開く" name="Sound Open"/>
+	<menu_item_call label="着用中のアウトフィットと入れ替え" name="Replace Outfit"/>
+	<menu_item_call label="着用中のアウトフィットに追加" name="Add To Outfit"/>
+	<menu_item_call label="着用中のアウトフィットから取り外す" name="Remove From Outfit"/>
+	<menu_item_call label="アウトフィット一覧をクリップボードにコピー" name="Copy outfit list to clipboard"/>
+	<menu_item_separator name="Outfit Separator"/>
+	<menu_item_call label="オリジナルを探す" name="Find Original"/>
+	<menu_item_call label="アイテムを除外" name="Purge Item"/>
+	<menu_item_call label="アイテムを復元" name="Restore Item"/>
+	<menu_item_call label="開く" name="Open"/>
+	<menu_item_call label="オリジナルを開く" name="Open Original"/>
+	<menu_item_call label="プロパティ" name="Properties"/>
+	<menu_item_call label="名前を変更" name="Rename"/>
+	<menu_item_call label="アセットのＵＵＩＤをコピー" name="Copy Asset UUID"/>
+	<menu_item_call label="メインパネルで表示" name="Show in Main Panel"/>
+	<menu_item_call label="カット" name="Cut"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="ペースト" name="Paste"/>
+	<menu_item_call label="リンクとしてペースト" name="Paste As Link"/>
+	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
+	<menu_item_separator name="Paste Separator"/>
+	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="システムフォルダを削除" name="Delete System Folder"/>
+	<menu_item_separator/>
+	<menu_item_separator/>
+	<menu_item_call label="会話チャットを開始" name="Conference Chat Folder"/>
+	<menu_item_call label="再生" name="Sound Play"/>
+	<menu_item_call label="SLurlをコピー" name="url_copy"/>
+	<menu_item_call label="ランドマークの情報" name="About Landmark"/>
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_separator name="Animation Separator"/>
+	<menu_item_call label="インワールドで再生" name="Animation Play"/>
+	<menu_item_call label="ローカルで再生" name="Animation Audition"/>
+	<menu_item_call label="インスタントメッセージを送信" name="Send Instant Message"/>
+	<menu_item_call label="テレポートをオファー…" name="Offer Teleport..."/>
+	<menu_item_call label="テレポートをリクエスト…" name="Request Teleport..."/>
+	<menu_item_call label="会話チャットを開始" name="Conference Chat"/>
+	<menu_item_call label="有効化" name="Activate"/>
+	<menu_item_call label="無効化" name="Deactivate"/>
+	<menu_item_call label="名前をつけて保存" name="Save As"/>
+	<menu_item_call label="選択を名前をつけて保存" layout="topleft" name="Save Selected As"/>
+	<menu_item_separator name="Wearable And Object Separator"/>
+	<menu_item_call label="装着" name="Wearable And Object Wear"/>
+	<menu label="装着先" name="Attach To"/>
+	<menu label="HUD 装着先" name="Attach To HUD"/>
+	<menu_item_call label="触る" name="Attachment Touch"/>
+	<menu_item_call label="編集" name="Wearable Edit"/>
+	<menu_item_call label="追加" name="Wearable Add"/>
+	<menu_item_call label="取り外す" name="Detach From Yourself"/>
+	<menu_item_call label="脱ぐ" name="Take Off"/>
+	<menu_item_separator name="Settings Separator"/>
+	<menu_item_call label="自分にのみ適用" name="Settings Apply Local"/>
+	<menu_item_call label="区画に適用" name="Settings Apply Parcel"/>
+	<menu_item_separator layout="topleft"/>
+	<menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy"/>
+	<menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move"/>
+	<menu_item_call label="－オプションなし－" name="--no options--"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index 8311f0859f..0de24d1c7a 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_inventory_add">
-  <menu label="アップロード" name="upload">
-    <menu_item_call label="画像 （L$ [COST]）…" name="Upload Image" />
-    <menu_item_call label="サウンド （L$ [COST]）…" name="Upload Sound" />
-    <menu_item_call label="アニメーション （L$ [COST]）…" name="Upload Animation" />
-    <menu_item_call label="モデル" name="Upload Model" />
-    <menu_item_call label="一括 （ファイルにつき L$ [COST]）…" name="Bulk Upload" />
-  </menu>
-  <menu_item_call label="新規フォルダ" name="New Folder" />
-  <menu_item_call label="新規スクリプト" name="New Script" />
-  <menu_item_call label="新しいノートカード" name="New Note" />
-  <menu_item_call label="新規ジェスチャー" name="New Gesture" />
-  <menu label="新しい服装" name="New Clothes">
-    <menu_item_call label="新しいシャツ" name="New Shirt" />
-    <menu_item_call label="新しいズボン" name="New Pants" />
-    <menu_item_call label="新しい靴" name="New Shoes" />
-    <menu_item_call label="新しい靴下" name="New Socks" />
-    <menu_item_call label="新しいジャケット" name="New Jacket" />
-    <menu_item_call label="新しいスカート" name="New Skirt" />
-    <menu_item_call label="新しい手袋" name="New Gloves" />
-    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
-    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
-    <menu_item_call label="新しいアルファ" name="New Alpha" />
-    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
-    <menu_item_call label="新しいユニバーサル" name="New Universal" />
-    <menu_item_call label="新しい物理作用" name="New Physics" />
-  </menu>
-  <menu label="新しい身体部位" name="New Body Parts">
-    <menu_item_call label="新しいシェイプ（体型）" name="New Shape" />
-    <menu_item_call label="新しいスキン" name="New Skin" />
-    <menu_item_call label="新しい髪" name="New Hair" />
-    <menu_item_call label="新しい目" name="New Eyes" />
-  </menu>
-  <menu label="新しい環境設定" name="New Settings">
-    <menu_item_call label="新しい空" name="New Sky" />
-    <menu_item_call label="新しい水面" name="New Water" />
-    <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
-  </menu>
-</menu>
\ No newline at end of file
+	<menu label="アップロード" name="upload">
+		<menu_item_call label="画像 （L$ [COST]）…" name="Upload Image"/>
+		<menu_item_call label="サウンド （L$ [COST]）…" name="Upload Sound"/>
+		<menu_item_call label="アニメーション （L$ [COST]）…" name="Upload Animation"/>
+		<menu_item_call label="モデル" name="Upload Model"/>
+		<menu_item_call label="一括 （ファイルにつき L$ [COST]）…" name="Bulk Upload"/>
+	</menu>
+	<menu_item_call label="新規フォルダ" name="New Folder"/>
+	<menu_item_call label="新規スクリプト" name="New Script"/>
+	<menu_item_call label="新しいノートカード" name="New Note"/>
+	<menu_item_call label="新規ジェスチャー" name="New Gesture"/>
+	<menu label="新しい服装" name="New Clothes">
+		<menu_item_call label="新しいシャツ" name="New Shirt"/>
+		<menu_item_call label="新しいズボン" name="New Pants"/>
+		<menu_item_call label="新しい靴" name="New Shoes"/>
+		<menu_item_call label="新しい靴下" name="New Socks"/>
+		<menu_item_call label="新しいジャケット" name="New Jacket"/>
+		<menu_item_call label="新しいスカート" name="New Skirt"/>
+		<menu_item_call label="新しい手袋" name="New Gloves"/>
+		<menu_item_call label="新しい下着（上半身）" name="New Undershirt"/>
+		<menu_item_call label="新しい下着（下半身）" name="New Underpants"/>
+		<menu_item_call label="新しいアルファ" name="New Alpha"/>
+		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
+		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
+		<menu_item_call label="新しい物理作用" name="New Physics"/>
+	</menu>
+	<menu label="新しい身体部位" name="New Body Parts">
+		<menu_item_call label="新しいシェイプ（体型）" name="New Shape"/>
+		<menu_item_call label="新しいスキン" name="New Skin"/>
+		<menu_item_call label="新しい髪" name="New Hair"/>
+		<menu_item_call label="新しい目" name="New Eyes"/>
+	</menu>
+	<menu label="新しい環境設定" name="New Settings">
+		<menu_item_call label="新しい空" name="New Sky"/>
+		<menu_item_call label="新しい水面" name="New Water"/>
+		<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
+	</menu>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
index 7a8adcb9fb..975e1b147a 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gear_default">
-  <menu_item_call label="新しいインベントリウィンドウ" name="new_window" />
-  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
-  <menu_item_check label="新しい順に並べ替え" name="sort_by_recent" />
-  <menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name" />
-  <menu_item_check label="システムフォルダを上にソートする" name="sort_system_folders_to_top" />
-  <menu_item_separator />
-  <menu_item_call label="フィルタを表示…" name="show_filters" />
-  <menu_item_call label="フィルタをリセット" name="reset_filters" />
-  <menu_item_call label="すべてのフォルダを閉じる" name="close_folders" />
-  <menu_item_separator />
-  <menu_item_call label="遺失物を空にする" name="empty_lostnfound" />
-  <menu_item_call label="別名でテクスチャを保存" name="Save Texture As" />
-  <menu_item_call label="共有" name="Share" />
-  <menu_item_call label="オリジナルを表示" name="Find Original" />
-  <menu_item_call label="すべてのリンクを表示" name="Find All Links" />
-  <menu_item_call label="リンクを置き換える" name="Replace Links" />
-  <menu_item_separator />
-  <menu_item_call label="ごみ箱を空にする" name="empty_trash" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="新しいインベントリウィンドウ" name="new_window"/>
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
+	<menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/>
+	<menu_item_check label="システムフォルダを上にソートする" name="sort_system_folders_to_top"/>
+	<menu_item_separator/>
+	<menu_item_call label="フィルタを表示…" name="show_filters"/>
+	<menu_item_call label="フィルタをリセット" name="reset_filters"/>
+	<menu_item_call label="すべてのフォルダを閉じる" name="close_folders"/>
+	<menu_item_separator/>
+	<menu_item_call label="遺失物を空にする" name="empty_lostnfound"/>
+	<menu_item_call label="別名でテクスチャを保存" name="Save Texture As"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="オリジナルを表示" name="Find Original"/>
+	<menu_item_call label="すべてのリンクを表示" name="Find All Links"/>
+	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
+	<menu_item_separator/>
+	<menu_item_call label="ごみ箱を空にする" name="empty_trash"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
index f76be9631a..2395c9e7b3 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_search_visibility">
-  <menu_item_check label="ゴミ箱を検索" name="search_trash"/>
-  <menu_item_check label="ライブラリを検索" name="search_library"/>
-  <menu_item_separator />
-  <menu_item_check label="リンクを含む" name="include_links"/>
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="ゴミ箱を検索" name="search_trash"/>
+	<menu_item_check label="ライブラリを検索" name="search_library"/>
+	<menu_item_separator/>
+	<menu_item_check label="リンクを含む" name="include_links"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
index a65504b14c..bef249d203 100644
--- a/indra/newview/skins/default/xui/ja/menu_land.xml
+++ b/indra/newview/skins/default/xui/ja/menu_land.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Land Pie">
-  <menu_item_call label="土地情報…" name="Place Information..." />
-  <!--
-  <menu_item_call label="ホームへ" name="Go Here" />
-  -->
-  <menu_item_call label="ここに座る" name="Sit Here" />
-  <menu_item_call label="この土地を購入" name="Land Buy" />
-  <menu_item_call label="入場許可を購入" name="Land Buy Pass" />
-  <menu_item_call label="作成" name="Create" />
-  <menu_item_call label="地形を編集" name="Edit Terrain" />
-  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="土地情報…" name="Place Information..."/>
+	<menu_item_call label="ここに座る" name="Sit Here"/>
+	<menu_item_call label="この土地を購入" name="Land Buy"/>
+	<menu_item_call label="入場許可を購入" name="Land Buy Pass"/>
+	<menu_item_call label="作成" name="Create"/>
+	<menu_item_call label="地形を編集" name="Edit Terrain"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
index 06345c5074..c134422955 100644
--- a/indra/newview/skins/default/xui/ja/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="landmark_overflow_menu">
-  <menu_item_call label="SLurl をコピー" name="copy" />
-  <menu_item_call label="削除" name="delete" />
-  <menu_item_call label="ピックを作成" name="pick" />
-  <menu_item_call label="お気に入りバーに追加" name="add_to_favbar" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="SLurl をコピー" name="copy"/>
+	<menu_item_call label="削除" name="delete"/>
+	<menu_item_call label="ピックを作成" name="pick"/>
+	<menu_item_call label="お気に入りバーに追加" name="add_to_favbar"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index 5ba2092648..f59b0b7e5e 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-  <menu label="私" name="File">
-    <menu_item_call label="初期設定…" name="Preferences..." />
-    <menu_item_call label="ウィンドウを閉じる" name="Close Window" />
-    <menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker" />
-    <menu_item_call label="[APP_NAME]を終了" name="Quit" />
-  </menu>
-  <menu label="ヘルプ" name="Help">
-    <menu_item_call label="ハウツー…" name="How To" />
-    <menu_item_call label="クイックスタート" name="Quickstart" />
-    <menu_item_call label="ナレッジベース" name="Knowledge Base" />
-    <menu_item_call label="Wiki" name="Wiki" />
-    <menu_item_call label="コミュニティ フォーラム" name="Community Forums" />
-    <menu_item_call label="日本語サポートページ" name="Support portal" />
-    <menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News" />
-    <menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs" />
-    <menu_item_call label="バグを報告する" name="Report Bug" />
-    <menu_item_call label="[APP_NAME]について" name="About Second Life" />
-  </menu>
-  <menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu" />
-  <menu label="デバッグ" name="Debug">
-    <menu_item_call label="デバッグ設定を表示" name="Debug Settings" />
-    <menu_item_call label="XUIプレビューツール" name="UI Preview Tool" />
-    <menu label="UI テスト" name="UI Tests" />
-    <menu_item_call label="ウィンドウのサイズを設定…" name="Set Window Size..." />
-    <menu_item_call label="利用規約を表示" name="TOS" />
-    <menu_item_call label="クリティカルメッセージを表示" name="Critical" />
-    <menu_item_call label="メディアブラウザ" name="Media Browser" />
-    <menu label="ログレベルを設定" name="Set Logging Level">
-      <menu_item_check label="デバッグ" name="Debug" />
-      <menu_item_check label="情報" name="Info" />
-      <menu_item_check label="警告" name="Warning" />
-      <menu_item_check label="エラー" name="Error" />
-      <menu_item_check label="なし" name="None" />
-    </menu>
-    <menu_item_call label="通知コンソールを表示する" name="Show Notifications Console" />
-  </menu>
-</menu_bar>
\ No newline at end of file
+	<menu label="私" name="File">
+		<menu_item_call label="初期設定…" name="Preferences..."/>
+		<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
+		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
+		<menu_item_call label="[APP_NAME]を終了" name="Quit"/>
+	</menu>
+	<menu label="ヘルプ" name="Help">
+		<menu_item_call label="ハウツー…" name="How To"/>
+		<menu_item_call label="クイックスタート" name="Quickstart"/>
+		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="コミュニティ フォーラム" name="Community Forums"/>
+		<menu_item_call label="日本語サポートページ" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs"/>
+		<menu_item_call label="バグを報告する" name="Report Bug"/>
+		<menu_item_call label="[APP_NAME]について" name="About Second Life"/>
+	</menu>
+	<menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu"/>
+	<menu label="デバッグ" name="Debug">
+		<menu_item_call label="デバッグ設定を表示" name="Debug Settings"/>
+		<menu_item_call label="XUIプレビューツール" name="UI Preview Tool"/>
+		<menu label="UI テスト" name="UI Tests"/>
+		<menu_item_call label="ウィンドウのサイズを設定…" name="Set Window Size..."/>
+		<menu_item_call label="利用規約を表示" name="TOS"/>
+		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
+		<menu_item_call label="メディアブラウザ" name="Media Browser"/>
+		<menu label="ログレベルを設定" name="Set Logging Level">
+			<menu_item_check label="デバッグ" name="Debug"/>
+			<menu_item_check label="情報" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="エラー" name="Error"/>
+			<menu_item_check label="なし" name="None"/>
+		</menu>
+		<menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
index 6c6913db5d..ad02ada4b9 100644
--- a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
-  <menu_item_check label="名前による並べ替え" name="sort_by_name" />
-  <menu_item_check label="新しい順に並べ替え" name="sort_by_recent" />
-  <menu_item_check label="在庫数順に並べ替え (低から高へ)" name="sort_by_stock_amount" />
-  <menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="名前による並べ替え" name="sort_by_name"/>
+	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
+	<menu_item_check label="在庫数順に並べ替え (低から高へ)" name="sort_by_stock_amount"/>
+	<menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
index 6f4f4938f4..3c566a87a4 100644
--- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="media ctrl context menu">
-  <menu_item_call label="カット" name="Cut" />
-  <menu_item_call label="コピー" name="Copy" />
-  <menu_item_call label="ペースト" name="Paste" />
-  <menu_item_separator name="debug_separator" />
-  <menu_item_call label="Webインスペクターを開く" name="open_webinspector" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="カット" name="Cut"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="ペースト" name="Paste"/>
+	<menu_item_separator name="debug_separator"/>
+	<menu_item_call label="Webインスペクターを開く" name="open_webinspector"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index 77a2e60cda..eee3fb7690 100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-  <menu_item_call label="ズーム（近）" name="Zoom Close" />
-  <menu_item_call label="ズーム（中）" name="Zoom Medium" />
-  <menu_item_call label="ズーム（遠）" name="Zoom Far" />
-  <menu_item_call label="ズーム（デフォルト）" name="Zoom Default" />
-  <menu_item_check label="マップを回転" name="Rotate Map" />
-  <menu_item_check label="中央へ自動移動" name="Auto Center" />
-  <menu_item_call label="追跡をやめる" name="Stop Tracking" />
-  <menu_item_call label="ワールドマップ" name="World Map" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="ズーム（近）" name="Zoom Close"/>
+	<menu_item_call label="ズーム（中）" name="Zoom Medium"/>
+	<menu_item_call label="ズーム（遠）" name="Zoom Far"/>
+	<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
+	<menu_item_check label="マップを回転" name="Rotate Map"/>
+	<menu_item_check label="中央へ自動移動" name="Auto Center"/>
+	<menu_item_call label="追跡をやめる" name="Stop Tracking"/>
+	<menu_item_call label="ワールドマップ" name="World Map"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
index f35e74afc5..9472255128 100644
--- a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="model_menu_gear_default">
-  <menu_item_check label="縁を表示" name="show_edges" />
-  <menu_item_check label="物理効果を表示" name="show_physics" />
-  <menu_item_check label="テクスチャを表示" name="show_textures" />
-  <menu_item_check label="スキンのウエイトを表示" name="show_skin_weight" />
-  <menu_item_check label="ジョイントポジションを表示" name="show_joint_positions" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="縁を表示" name="show_edges"/>
+	<menu_item_check label="物理効果を表示" name="show_physics"/>
+	<menu_item_check label="テクスチャを表示" name="show_textures"/>
+	<menu_item_check label="スキンのウエイトを表示" name="show_skin_weight"/>
+	<menu_item_check label="ジョイントポジションを表示" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
index 38b736ae9b..8befe0cf57 100644
--- a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Mute Particle Pie">
-  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
index f3e274313e..9954c17ddc 100644
--- a/indra/newview/skins/default/xui/ja/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Navbar Menu">
-  <menu_item_check label="座標を表示" name="Show Coordinates" />
-  <menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties" />
-  <menu_item_call label="ランドマーク" name="Landmark" />
-  <menu_item_call label="カット" name="Cut" />
-  <menu_item_call label="コピー" name="Copy" />
-  <menu_item_call label="ペースト" name="Paste" />
-  <menu_item_call label="削除" name="Delete" />
-  <menu_item_call label="すべて選択" name="Select All" />
-</menu>
\ No newline at end of file
+	<menu_item_check label="座標を表示" name="Show Coordinates"/>
+	<menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/>
+	<menu_item_call label="ランドマーク" name="Landmark"/>
+	<menu_item_call label="カット" name="Cut"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="ペースト" name="Paste"/>
+	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="すべて選択" name="Select All"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
index 42a6c66168..1665efe46a 100644
--- a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="NearBy Chat Menu">
-  <menu_item_call label="近隣の人物を表示する…" name="nearby_people" />
-  <menu_item_separator />
-  <menu_item_check label="ブロックされた文字を表示" name="muted_text" />
-  <menu_item_separator />
-  <menu_item_check label="バディアイコンを表示" name="show_buddy_icons" />
-  <menu_item_check label="名前を表示" name="show_names" />
-  <menu_item_check label="アイコンと名前を表示" name="show_icons_and_names" />
-  <menu_item_separator />
-  <menu_item_call label="文字の大きさ" name="font_size" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="近隣の人物を表示する…" name="nearby_people"/>
+	<menu_item_separator/>
+	<menu_item_check label="ブロックされた文字を表示" name="muted_text"/>
+	<menu_item_separator/>
+	<menu_item_check label="バディアイコンを表示" name="show_buddy_icons"/>
+	<menu_item_check label="名前を表示" name="show_names"/>
+	<menu_item_check label="アイコンと名前を表示" name="show_icons_and_names"/>
+	<menu_item_separator/>
+	<menu_item_call label="文字の大きさ" name="font_size"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
index 3852efcdd4..913bae8958 100644
--- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Notification Well Button Context Menu">
-  <menu_item_call label="すべて閉じる" name="Close All" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="すべて閉じる" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index f7e64e015a..14db32081b 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Object Pie">
-  <menu_item_call label="触る" name="Object Touch" />
-  <menu_item_call label="編集…" name="Edit..." />
-  <menu_item_call label="制作" name="Build" />
-  <menu_item_call label="開く" name="Open" />
-  <menu_item_call label="ここに座る" name="Object Sit" />
-  <menu_item_call label="立ち上がる" name="Object Stand Up" />
-  <menu_item_call label="オブジェクトの調査" name="Object Inspect" />
-  <menu_item_call label="ズームイン" name="Zoom In" />
-  <menu_item_call label="リンクセットで表示" name="show_in_linksets" />
-  <menu_item_call label="キャラクターで表示" name="show_in_characters" />
-  <menu_item_separator />
-  <context_menu label="取り付ける" name="Put On">
-    <menu_item_call label="着用" name="Wear" />
-    <menu_item_call label="追加" name="Add" />
-    <context_menu label="装着" name="Object Attach" />
-    <context_menu label="HUDに装着" name="Object Attach HUD" />
-  </context_menu>
-  <context_menu label="管理" name="Remove">
-    <menu_item_call label="嫌がらせの報告…" name="Report Abuse..." />
-    <menu_item_call label="ブロック" name="Object Mute" />
-    <menu_item_call label="ブロック解除" name="Object Unmute" />
-    <menu_item_call label="返却…" name="Return..." />
-  </context_menu>
-  <menu_item_separator />
-  <menu_item_call label="取る" name="Pie Object Take" />
-  <menu_item_call label="コピーを取る" name="Take Copy" />
-  <menu_item_call label="支払う…" name="Pay..." />
-  <menu_item_call label="購入…" name="Buy..." />
-  <menu_item_call label="削除" name="Delete" />
-  <menu_item_separator />
-  <menu_item_call label="パーティクル所有者をブロック" name="Mute Particle" />
-  <menu_item_call label="XMLとしてダンプ" name="Dump XML" />
-  <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="触る" name="Object Touch"/>
+	<menu_item_call label="編集…" name="Edit..."/>
+	<menu_item_call label="制作" name="Build"/>
+	<menu_item_call label="開く" name="Open"/>
+	<menu_item_call label="ここに座る" name="Object Sit"/>
+	<menu_item_call label="立ち上がる" name="Object Stand Up"/>
+	<menu_item_call label="オブジェクトの調査" name="Object Inspect"/>
+	<menu_item_call label="ズームイン" name="Zoom In"/>
+	<menu_item_call label="リンクセットで表示" name="show_in_linksets"/>
+	<menu_item_call label="キャラクターで表示" name="show_in_characters"/>
+	<menu_item_separator/>
+	<context_menu label="取り付ける" name="Put On">
+		<menu_item_call label="着用" name="Wear"/>
+		<menu_item_call label="追加" name="Add"/>
+		<context_menu label="装着" name="Object Attach"/>
+		<context_menu label="HUDに装着" name="Object Attach HUD"/>
+	</context_menu>
+	<context_menu label="管理" name="Remove">
+		<menu_item_call label="嫌がらせの報告…" name="Report Abuse..."/>
+		<menu_item_call label="ブロック" name="Object Mute"/>
+		<menu_item_call label="ブロック解除" name="Object Unmute"/>
+		<menu_item_call label="返却…" name="Return..."/>
+	</context_menu>
+	<menu_item_separator/>
+	<menu_item_call label="取る" name="Pie Object Take"/>
+	<menu_item_call label="コピーを取る" name="Take Copy"/>
+	<menu_item_call label="支払う…" name="Pay..."/>
+	<menu_item_call label="購入…" name="Buy..."/>
+	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_separator/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+	<menu_item_call label="XMLとしてダンプ" name="Dump XML"/>
+	<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 163c8d1779..e7cd4b40b8 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Object Icon Menu">
-  <menu_item_call label="オブジェクトのプロフィール…" name="Object Profile" />
-  <menu_item_call label="ブロック…" name="Block" />
-  <menu_item_call label="ブロック解除" name="Unblock" />
-  <menu_item_separator  />
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="オブジェクトのプロフィール…" name="Object Profile"/>
+	<menu_item_call label="ブロック…" name="Block"/>
+	<menu_item_call label="ブロック解除" name="Unblock"/>
+	<menu_item_separator/>
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 962d25bb07..b869e67923 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -1,42 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Outfit">
-  <menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear" />
-  <menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add" />
-  <menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off" />
-  <menu_item_call label="画像をアップロード（L$ 10）" name="upload_photo" />
-  <menu_item_call label="画像を選択" name="select_photo" />
-  <menu_item_call label="スナップショットを撮る" name="take_snapshot" />
-  <menu_item_call label="画像を削除" name="remove_photo" />
-  <menu_item_separator name="sepatator1" />
-  <!-- copied (with minor modifications) from menu_inventory_add.xml -->
-  <!--  *TODO: generate dynamically? -->
-  <menu label="新しい服装" name="New Clothes">
-    <menu_item_call label="新しいシャツ" name="New Shirt" />
-    <menu_item_call label="新しいズボン" name="New Pants" />
-    <menu_item_call label="新しい靴" name="New Shoes" />
-    <menu_item_call label="新しい靴下" name="New Socks" />
-    <menu_item_call label="新しい上着" name="New Jacket" />
-    <menu_item_call label="新しいスカート" name="New Skirt" />
-    <menu_item_call label="新しい手袋" name="New Gloves" />
-    <menu_item_call label="新しい下着（上半身）" name="New Undershirt" />
-    <menu_item_call label="新しい下着（下半身）" name="New Underpants" />
-    <menu_item_call label="新しいアルファ" name="New Alpha" />
-    <menu_item_call label="新しい物理作用" name="New Physics" />
-    <menu_item_call label="新しいタトゥ" name="New Tattoo" />
-    <menu_item_call label="新しいユニバーサル" name="New Universal" />
-  </menu>
-  <menu label="新しい身体部位" name="New Body Parts">
-    <menu_item_call label="新しいシェイプ" name="New Shape" />
-    <menu_item_call label="新しいスキン" name="New Skin" />
-    <menu_item_call label="新しい髪型" name="New Hair" />
-    <menu_item_call label="新しい目" name="New Eyes" />
-  </menu>
-  <!-- copied from menu_inventory_add.xml -->
-  <menu_item_separator name="sepatator2" />
-  <menu_item_call label="全てのフォルダを開く" name="expand" />
-  <menu_item_call label="全てのフォルダを閉じる" name="collapse" />
-  <menu_item_call label="アウトフィットの名前を変更" name="rename" />
-  <menu_item_call label="アウトフィットを削除" name="delete_outfit" />
-  <menu_item_separator name="sepatator3" />
-  <menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear"/>
+	<menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add"/>
+	<menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off"/>
+	<menu_item_call label="画像をアップロード（L$ 10）" name="upload_photo"/>
+	<menu_item_call label="画像を選択" name="select_photo"/>
+	<menu_item_call label="スナップショットを撮る" name="take_snapshot"/>
+	<menu_item_call label="画像を削除" name="remove_photo"/>
+	<menu_item_separator name="sepatator1"/>
+	<menu label="新しい服装" name="New Clothes">
+		<menu_item_call label="新しいシャツ" name="New Shirt"/>
+		<menu_item_call label="新しいズボン" name="New Pants"/>
+		<menu_item_call label="新しい靴" name="New Shoes"/>
+		<menu_item_call label="新しい靴下" name="New Socks"/>
+		<menu_item_call label="新しい上着" name="New Jacket"/>
+		<menu_item_call label="新しいスカート" name="New Skirt"/>
+		<menu_item_call label="新しい手袋" name="New Gloves"/>
+		<menu_item_call label="新しい下着（上半身）" name="New Undershirt"/>
+		<menu_item_call label="新しい下着（下半身）" name="New Underpants"/>
+		<menu_item_call label="新しいアルファ" name="New Alpha"/>
+		<menu_item_call label="新しい物理作用" name="New Physics"/>
+		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
+		<menu_item_call label="新しいユニバーサル" name="New Universal"/>
+	</menu>
+	<menu label="新しい身体部位" name="New Body Parts">
+		<menu_item_call label="新しいシェイプ" name="New Shape"/>
+		<menu_item_call label="新しいスキン" name="New Skin"/>
+		<menu_item_call label="新しい髪型" name="New Hair"/>
+		<menu_item_call label="新しい目" name="New Eyes"/>
+	</menu>
+	<menu_item_separator name="sepatator2"/>
+	<menu_item_call label="全てのフォルダを開く" name="expand"/>
+	<menu_item_call label="全てのフォルダを閉じる" name="collapse"/>
+	<menu_item_call label="アウトフィットの名前を変更" name="rename"/>
+	<menu_item_call label="アウトフィットを削除" name="delete_outfit"/>
+	<menu_item_separator name="sepatator3"/>
+	<menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
index 66ebb79bb9..cc04ac6dcf 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit">
-  <menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear_replace" />
-  <menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add" />
-  <menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off" />
-  <menu_item_call label="アウトフィットの編集" name="edit" />
-  <menu_item_call label="アウトフィットの名前を変更" name="rename" />
-  <menu_item_call label="アウトフィットを削除" name="delete" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="着る－現在ののアウトフィットと入れ替え" name="wear_replace"/>
+	<menu_item_call label="着る－着用中のアウトフィットに追加" name="wear_add"/>
+	<menu_item_call label="脱ぐ－着用中のアウトフィットから取り外す" name="take_off"/>
+	<menu_item_call label="アウトフィットの編集" name="edit"/>
+	<menu_item_call label="アウトフィットの名前を変更" name="rename"/>
+	<menu_item_call label="アウトフィットを削除" name="delete"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index 76b484a816..ebce5f7e6b 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Participant List Context Menu">
-  <menu_item_check label="名前で並べ替え" name="SortByName" />
-  <menu_item_check label="最近の発言者で並べ替え" name="SortByRecentSpeakers" />
-  <menu_item_call label="プロフィールの表示" name="View Profile" />
-  <menu_item_call label="フレンド登録" name="Add Friend" />
-  <menu_item_call label="ＩＭ" name="IM" />
-  <menu_item_call label="コール" name="Call" />
-  <menu_item_call label="共有" name="Share" />
-  <menu_item_call label="支払う" name="Pay" />
-  <menu_item_separator name="View Icons Separator" />
-  <menu_item_check label="人物のアイコン表示" name="View Icons" />
-  <menu_item_separator />
-  <menu_item_check label="ボイスをブロック／解除" name="Block/Unblock" />
-  <menu_item_check label="文字をブロック" name="MuteText" />
-  <menu_item_separator name="Moderator Options Separator" />
-  <context_menu label="モデレーターのオプション" name="Moderator Options">
-    <menu_item_separator name="moderate_voice_separator" />
-    <menu_item_check label="文字チャットを許可" name="AllowTextChat" />
-    <menu_item_call label="この参加者をミュート" name="ModerateVoiceMuteSelected" />
-    <menu_item_call label="この参加者のミュートを解除" name="ModerateVoiceUnMuteSelected" />
-    <menu_item_call label="全員をミュート" name="ModerateVoiceMute" />
-    <menu_item_call label="全員のミュート解除" name="ModerateVoiceUnmute" />
-  </context_menu>
-</context_menu>
\ No newline at end of file
+	<menu_item_check label="名前で並べ替え" name="SortByName"/>
+	<menu_item_check label="最近の発言者で並べ替え" name="SortByRecentSpeakers"/>
+	<menu_item_call label="プロフィールの表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="ＩＭ" name="IM"/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払う" name="Pay"/>
+	<menu_item_separator name="View Icons Separator"/>
+	<menu_item_check label="人物のアイコン表示" name="View Icons"/>
+	<menu_item_separator/>
+	<menu_item_check label="ボイスをブロック／解除" name="Block/Unblock"/>
+	<menu_item_check label="文字をブロック" name="MuteText"/>
+	<menu_item_separator name="Moderator Options Separator"/>
+	<context_menu label="モデレーターのオプション" name="Moderator Options">
+		<menu_item_separator name="moderate_voice_separator"/>
+		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
+		<menu_item_call label="この参加者をミュート" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="この参加者のミュートを解除" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="全員をミュート" name="ModerateVoiceMute"/>
+		<menu_item_call label="全員のミュート解除" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
index ef61874763..be9fffae04 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="participant_manu_view">
-  <menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type" />
-  <menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name" />
-  <menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent" />
-  <menu_item_separator />
-  <menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name" />
-  <menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent" />
-  <menu_item_separator />
-  <menu_item_call label="チャットの初期設定…" name="chat_preferences" />
-  <menu_item_call label="プライバシーの初期設定…" name="privacy_preferences" />
-  <menu_item_check label="会話ログ…" name="Conversation" />
-  <menu_item_separator />
-  <menu_item_check label="近隣のチャットを翻訳" name="Translate_chat" />
-  <menu_item_check label="翻訳の設定…" name="Translation_settings" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
+	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
+	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
+	<menu_item_separator/>
+	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
+	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
+	<menu_item_separator/>
+	<menu_item_call label="チャットの初期設定…" name="chat_preferences"/>
+	<menu_item_call label="プライバシーの初期設定…" name="privacy_preferences"/>
+	<menu_item_check label="会話ログ…" name="Conversation"/>
+	<menu_item_separator/>
+	<menu_item_check label="近隣のチャットを翻訳" name="Translate_chat"/>
+	<menu_item_check label="翻訳の設定…" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
index 8d80ddebad..ac1757cc48 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_gear">
-  <menu_item_call label="ブロック解除" name="unblock" />
-  <menu_item_check label="ボイスをブロック" name="BlockVoice" />
-  <menu_item_check label="文字をブロック" name="MuteText" />
-  <menu_item_check label="パーティクルをブロック" name="MuteParticles" />
-  <menu_item_check label="オブジェクトのサウンドをブロック" name="BlockObjectSounds" />
-  <menu_item_separator />
-  <menu_item_call label="プロフィール…" name="profile" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="ブロック解除" name="unblock"/>
+	<menu_item_check label="ボイスをブロック" name="BlockVoice"/>
+	<menu_item_check label="文字をブロック" name="MuteText"/>
+	<menu_item_check label="パーティクルをブロック" name="MuteParticles"/>
+	<menu_item_check label="オブジェクトのサウンドをブロック" name="BlockObjectSounds"/>
+	<menu_item_separator/>
+	<menu_item_call label="プロフィール…" name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
index 1d89e15f64..a87c55038f 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_plus">
-  <menu_item_call label="名前で住人をブロック…" name="block_resident_by_name" />
-  <menu_item_call label="名前でオブジェクトをブロック…" name="block_object_by_name" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="名前で住人をブロック…" name="block_resident_by_name"/>
+	<menu_item_call label="名前でオブジェクトをブロック…" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
index db586365b2..80d9d43005 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_blocked_view">
-  <menu_item_check label="名前で並べ替え" name="sort_by_name" />
-  <menu_item_check label="種類で並べ替え" name="sort_by_type" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="種類で並べ替え" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
index fee506c511..e761c506bf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-  <menu_item_check label="名前で並べ替え" name="sort_name" />
-  <menu_item_check label="オンライン状況で並べ替え" name="sort_status" />
-  <menu_item_check label="人物のアイコン表示" name="view_icons" />
-  <menu_item_check label="与えられた権限を表示" name="view_permissions" />
-  <menu_item_check label="ユーザー名を非表示" name="view_usernames" />
-  <menu_item_check label="会話ログを表示…" name="view_conversation" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
+	<menu_item_check label="人物のアイコン表示" name="view_icons"/>
+	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
+	<menu_item_check label="ユーザー名を非表示" name="view_usernames"/>
+	<menu_item_check label="会話ログを表示…" name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 91044bd283..2c0c85ba28 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-  <menu_item_call label="情報を表示" name="View Info" />
-  <menu_item_call label="チャット" name="Chat" />
-  <menu_item_call label="ボイスコール" name="Call" />
-  <menu_item_call label="アクティブ" name="Activate" />
-  <menu_item_call label="脱退" name="Leave" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="情報を表示" name="View Info"/>
+	<menu_item_call label="チャット" name="Chat"/>
+	<menu_item_call label="ボイスコール" name="Call"/>
+	<menu_item_call label="アクティブ" name="Activate"/>
+	<menu_item_call label="脱退" name="Leave"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
index 07144be420..4a9e402fa4 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-  <menu_item_check label="グループアイコンを表示" name="Display Group Icons" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index f59ebfa154..bbe842a37e 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-  <menu_item_call label="プロフィールを表示" name="view_profile" />
-  <menu_item_call label="ＩＭ" name="im" />
-  <menu_item_call label="テレポートを送る" name="offer_teleport" />
-  <menu_item_call label="ボイスコール" name="voice_call" />
-  <menu_item_call label="チャットの履歴を表示…" name="chat_history" />
-  <menu_item_call label="フレンド登録" name="add_friend" />
-  <menu_item_call label="フレンドを削除" name="remove_friend" />
-  <menu_item_call label="グループに招待…" name="invite_to_group" />
-  <menu_item_call label="ズームイン" name="zoom_in" />
-  <menu_item_call label="マップ" name="map" />
-  <menu_item_call label="共有" name="share" />
-  <menu_item_call label="支払う" name="pay" />
-  <menu_item_check label="ブロック／解除" name="block_unblock" />
-  <menu_item_call label="フリーズ" name="freeze" />
-  <menu_item_call label="追放" name="eject" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴を表示…" name="chat_history"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待…" name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="マップ" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払う" name="pay"/>
+	<menu_item_check label="ブロック／解除" name="block_unblock"/>
+	<menu_item_call label="フリーズ" name="freeze"/>
+	<menu_item_call label="追放" name="eject"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index 5c73eb5a4f..4e3dbd3279 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-  <menu_item_call label="フレンド登録" name="add_friends" />
-  <menu_item_call label="フレンドを削除" name="remove_friends" />
-  <menu_item_call label="ＩＭ" name="im" />
-  <menu_item_call label="コール" name="call" />
-  <menu_item_call label="共有" name="share" />
-  <menu_item_call label="支払い" name="pay" />
-  <menu_item_call label="テレポートをオファー" name="offer_teleport" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="フレンド登録" name="add_friends"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="コール" name="call"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_call label="テレポートをオファー" name="offer_teleport"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
index 7b56f1daf8..68e5ec88bf 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-  <menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers" />
-  <menu_item_check label="名前で並べ替え" name="sort_name" />
-  <menu_item_check label="距離で並べ替え" name="sort_distance" />
-  <menu_item_check label="到着した順に並べ替え" name="sort_arrival" />
-  <menu_item_check label="人物のアイコン表示" name="view_icons" />
-  <menu_item_check label="マップを表示" name="view_map" />
-  <menu_item_check label="ユーザー名を非表示" name="view_usernames" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
+	<menu_item_check label="到着した順に並べ替え" name="sort_arrival"/>
+	<menu_item_check label="人物のアイコン表示" name="view_icons"/>
+	<menu_item_check label="マップを表示" name="view_map"/>
+	<menu_item_check label="ユーザー名を非表示" name="view_usernames"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
index da27372963..84b24726f4 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-  <menu_item_check label="新しい順に並べ替え" name="sort_most" />
-  <menu_item_check label="名前で並べ替え" name="sort_name" />
-  <menu_item_check label="人物のアイコン表示" name="view_icons" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="人物のアイコン表示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml
index 4a5a42ad05..ef4d9bc369 100644
--- a/indra/newview/skins/default/xui/ja/menu_picks.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Picks">
-  <menu_item_call label="テレポート" name="pick_teleport"/>
-  <menu_item_call label="ピックの情報" name="pick_info" />
-  <menu_item_call label="ピックを編集" name="pick_edit" />
-  <menu_item_call label="テレポート" name="pick_teleport" />
-  <menu_item_call label="マップに表示" name="pick_map" />
-  <menu_item_separator name="pick_separator" />
-  <menu_item_call label="削除" name="pick_delete" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="テレポート" name="pick_teleport"/>
+	<menu_item_call label="ピックの情報" name="pick_info"/>
+	<menu_item_call label="ピックを編集" name="pick_edit"/>
+	<menu_item_call label="テレポート" name="pick_teleport"/>
+	<menu_item_call label="マップに表示" name="pick_map"/>
+	<menu_item_separator name="pick_separator"/>
+	<menu_item_call label="削除" name="pick_delete"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
index 62eb8327bc..84bf90fea0 100644
--- a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="picks_plus_menu">
-  <menu_item_call label="新しいピック" name="create_pick" />
-  <menu_item_call label="新しいクラシファイド広告" name="create_classified" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="新しいピック" name="create_pick"/>
+	<menu_item_call label="新しいクラシファイド広告" name="create_classified"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml
index f45f9211ed..fc1ec43c6c 100644
--- a/indra/newview/skins/default/xui/ja/menu_place.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="place_overflow_menu">
-  <menu_item_call label="ランドマークを作成" name="landmark" />
-  <menu_item_call label="ピックを作成" name="pick" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="ランドマークを作成" name="landmark"/>
+	<menu_item_call label="ピックを作成" name="pick"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
index d6a13b92ba..575b61ffa5 100644
--- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_create">
-  <menu_item_call label="現在の場所にランドマーク作成" name="add_landmark" />
-  <menu_item_call label="フォルダ作成" name="add_folder" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="現在の場所にランドマーク作成" name="add_landmark"/>
+	<menu_item_call label="フォルダ作成" name="add_folder"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
index c9fa92b6a2..9b1bd4f18b 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_folder_gear">
-  <menu_item_call label="ランドマークを追加" name="add_landmark" />
-  <menu_item_call label="フォルダを追加" name="add_folder" />
-  <menu_item_call label="アイテムを復元" name="restore_item" />
-  <menu_item_separator />
-  <menu_item_call label="カット" name="cut" />
-  <menu_item_call label="コピー" name="copy_folder" />
-  <menu_item_call label="ペースト" name="paste" />
-  <menu_item_call label="名前の変更" name="rename" />
-  <menu_item_call label="削除" name="delete" />
-  <menu_item_separator />
-  <menu_item_call label="広げる" name="expand" />
-  <menu_item_call label="閉じる" name="collapse" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
+	<menu_item_call label="フォルダを追加" name="add_folder"/>
+	<menu_item_call label="アイテムを復元" name="restore_item"/>
+	<menu_item_separator/>
+	<menu_item_call label="カット" name="cut"/>
+	<menu_item_call label="コピー" name="copy_folder"/>
+	<menu_item_call label="ペースト" name="paste"/>
+	<menu_item_call label="名前の変更" name="rename"/>
+	<menu_item_call label="削除" name="delete"/>
+	<menu_item_separator/>
+	<menu_item_call label="広げる" name="expand"/>
+	<menu_item_call label="閉じる" name="collapse"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
index 16508dde4a..594a2016b1 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
-  <menu_item_call label="テレポート" name="teleport" />
-  <menu_item_call label="共有" name="share"/>
-  <menu_item_call label="ランドマークの表示／編集" name="more_info"/>
-  <menu_item_call label="ランドマークをコピー" name="copy_landmark" />
-  <menu_item_call label="ランドマークに移動" name="Move to Landmarks"/>
-  <menu_item_call label="お気に入りに移動" name="Move to Favorites" />
-  <menu_item_call label="フォルダをすべて開く" name="expand_all" />
-  <menu_item_call label="フォルダをすべて閉じる" name="collapse_all" />
-  <menu_item_check label="日付で並べ替え" name="sort_by_date" />
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_call label="SLurlをコピー" name="copy_slurl" />
-  <menu_item_call label="ピックを作成" name="create_pick" />
-  <menu_item_call label="アイテムを復元" name="restore_item" />
-  <menu_item_separator  />
-  <menu_item_call label="カット" name="cut"/>
-  <menu_item_call label="コピー" name="copy_landmark"/>
-  <menu_item_call label="ペースト" name="paste"/>
-  <menu_item_call label="名前の変更" name="rename"/>
-  <menu_item_call label="削除" name="delete"/>
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="テレポート" name="teleport"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="ランドマークの表示／編集" name="more_info"/>
+	<menu_item_call label="ランドマークをコピー" name="copy_landmark"/>
+	<menu_item_call label="ランドマークに移動" name="Move to Landmarks"/>
+	<menu_item_call label="お気に入りに移動" name="Move to Favorites"/>
+	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_call label="SLurlをコピー" name="copy_slurl"/>
+	<menu_item_call label="ピックを作成" name="create_pick"/>
+	<menu_item_call label="アイテムを復元" name="restore_item"/>
+	<menu_item_separator/>
+	<menu_item_call label="カット" name="cut"/>
+	<menu_item_call label="コピー" name="copy_landmark"/>
+	<menu_item_call label="ペースト" name="paste"/>
+	<menu_item_call label="名前の変更" name="rename"/>
+	<menu_item_call label="削除" name="delete"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
index 197b61af30..70dd50c25d 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_sorter_gear">
-  <menu_item_call label="全てのフォルダを開く" name="expand_all" />
-  <menu_item_call label="全てのフォルダを閉じる" name="collapse_all" />
-  <menu_item_separator />
-  <menu_item_check label="日付でソート" name="sort_by_date" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="全てのフォルダを開く" name="expand_all"/>
+	<menu_item_call label="全てのフォルダを閉じる" name="collapse_all"/>
+	<menu_item_separator/>
+	<menu_item_check label="日付でソート" name="sort_by_date"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_other.xml b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
index 0ff41f91a2..0247a60803 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Avatar Profile Menu">
-  <menu_item_call label="ＩＭ" name="im" />
-  <menu_item_call label="テレポートのオファー" name="offer_teleport" />
-  <menu_item_call label="テレポートのリクエスト" name="request_teleport" />
-  <menu_item_call label="ボイスコール" name="voice_call" />
-  <menu_item_separator />
-  <menu_item_call label="チャット履歴を表示…" name="chat_history" />
-  <menu_item_separator name="separator_chat_history" />
-  <menu_item_call label="フレンド追加" name="add_friend" />
-  <menu_item_call label="フレンド削除" name="remove_friend" />
-  <menu_item_call label="グループに招待…" name="invite_to_group" />
-  <menu_item_separator name="separator_invite_to_group" />
-  <menu_item_call label="権限" name="agent_permissions" />
-  <menu_item_call label="マップ" name="map" />
-  <menu_item_call label="共有" name="share" />
-  <menu_item_call label="支払い" name="pay" />
-  <menu_item_check label="ブロック／解除" name="block_unblock" />
-  <menu_item_separator name="separator_copy_options" />
-  <menu_item_call label="表示名をコピー" name="copy_display_name" />
-  <menu_item_call label="エージェント名をコピー" name="copy_name" />
-  <menu_item_call label="エージェントＩＤをコピー" name="copy_id" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="テレポートのオファー" name="offer_teleport"/>
+	<menu_item_call label="テレポートのリクエスト" name="request_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_separator/>
+	<menu_item_call label="チャット履歴を表示…" name="chat_history"/>
+	<menu_item_separator name="separator_chat_history"/>
+	<menu_item_call label="フレンド追加" name="add_friend"/>
+	<menu_item_call label="フレンド削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待…" name="invite_to_group"/>
+	<menu_item_separator name="separator_invite_to_group"/>
+	<menu_item_call label="権限" name="agent_permissions"/>
+	<menu_item_call label="マップ" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ブロック／解除" name="block_unblock"/>
+	<menu_item_separator name="separator_copy_options"/>
+	<menu_item_call label="表示名をコピー" name="copy_display_name"/>
+	<menu_item_call label="エージェント名をコピー" name="copy_name"/>
+	<menu_item_call label="エージェントＩＤをコピー" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
index 67c481cdd6..24304689ce 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="profile_overflow_menu">
-  <menu_item_call label="マップ" name="show_on_map" />
-  <menu_item_call label="支払う" name="pay" />
-  <menu_item_call label="共有" name="share" />
-  <menu_item_call label="ブロック" name="block" />
-  <menu_item_call label="ブロック解除" name="unblock" />
-  <menu_item_call label="追放" name="kick" />
-  <menu_item_call label="フリーズ" name="freeze" />
-  <menu_item_call label="フリーズ解除" name="unfreeze" />
-  <menu_item_call label="CSR" name="csr" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="マップ" name="show_on_map"/>
+	<menu_item_call label="支払う" name="pay"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="ブロック" name="block"/>
+	<menu_item_call label="ブロック解除" name="unblock"/>
+	<menu_item_call label="追放" name="kick"/>
+	<menu_item_call label="フリーズ" name="freeze"/>
+	<menu_item_call label="フリーズ解除" name="unfreeze"/>
+	<menu_item_call label="CSR" name="csr"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_self.xml b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
index ec10d92629..7c9570378e 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Avatar Profile Menu Self">
-  <menu_item_call label="表示名を編集" name="edit_display_name" />
-  <menu_item_call label="パートナーを編集" name="edit_partner" />
-  <menu_item_call label="画像をアップロード" name="upload_photo" />
-  <menu_item_call label="画像を変更" name="change_photo" />
-  <menu_item_call label="画像を削除" name="remove_photo" />
-  <menu_item_separator name="separator_copy_options" />
-  <menu_item_call label="表示名をコピー" name="copy_display_name" />
-  <menu_item_call label="エージェント名をコピー" name="copy_name" />
-  <menu_item_call label="エージェントＩＤをコピー" name="copy_id" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="表示名を編集" name="edit_display_name"/>
+	<menu_item_call label="パートナーを編集" name="edit_partner"/>
+	<menu_item_call label="画像をアップロード" name="upload_photo"/>
+	<menu_item_call label="画像を変更" name="change_photo"/>
+	<menu_item_call label="画像を削除" name="remove_photo"/>
+	<menu_item_separator name="separator_copy_options"/>
+	<menu_item_call label="表示名をコピー" name="copy_display_name"/>
+	<menu_item_call label="エージェント名をコピー" name="copy_name"/>
+	<menu_item_call label="エージェントＩＤをコピー" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
index 6d8f2381d9..0533c8677b 100644
--- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_outfit_menu">
-  <menu_item_call label="保存" name="save_outfit" />
-  <menu_item_call label="名前をつけて保存" name="save_as_new_outfit" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="保存" name="save_outfit"/>
+	<menu_item_call label="名前をつけて保存" name="save_as_new_outfit"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_save_settings.xml b/indra/newview/skins/default/xui/ja/menu_save_settings.xml
index a8bb95a661..0e8e25955f 100644
--- a/indra/newview/skins/default/xui/ja/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_settings_menu">
-  <menu_item_check label="保存" name="save_settings" />
-  <menu_item_check label="名前をつけて保存" name="save_as_new_settings" />
-  <menu_item_check label="変更をコミット" name="commit_changes" />
-  <menu_item_check label="自分にのみ適用" name="apply_local" />
-  <menu_item_check label="区画に適用" name="apply_parcel" />
-  <menu_item_check label="リージョン（地域）に適用" name="apply_region" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_check label="保存" name="save_settings"/>
+	<menu_item_check label="名前をつけて保存" name="save_as_new_settings"/>
+	<menu_item_check label="変更をコミット" name="commit_changes"/>
+	<menu_item_check label="自分にのみ適用" name="apply_local"/>
+	<menu_item_check label="区画に適用" name="apply_parcel"/>
+	<menu_item_check label="リージョン（地域）に適用" name="apply_region"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
index c4bc424927..a89dd0bcbe 100644
--- a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="ScriptChiclet Menu">
-  <menu_item_call label="閉じる" name="Close" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="閉じる" name="Close"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_settings_add.xml
index 9e64476446..814ad9c1a6 100644
--- a/indra/newview/skins/default/xui/ja/menu_settings_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_settings_add.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_add">
-  <menu_item_call label="新しい空" name="New Sky" />
-  <menu_item_call label="新しい水" name="New Water" />
-  <menu_item_call label="新しいデイサイクル" name="New Day Cycle" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="新しい空" name="New Sky"/>
+	<menu_item_call label="新しい水" name="New Water"/>
+	<menu_item_call label="新しいデイサイクル" name="New Day Cycle"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
index a44786b414..a8ff0d3721 100644
--- a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_settings_gear">
-  <menu_item_call label="編集" name="edit_settings" />
-  <menu_item_call label="自分にのみ適用" name="Settings Apply Local" />
-  <menu_item_call label="区画に適用" name="Settings Apply Parcel" />
-  <menu_item_call label="リージョン（地域）に適用" name="Settings Apply Region" />
-  <menu_item_call label="コピー" name="copy_settings" />
-  <menu_item_call label="ペースト" name="paste_settings" />
-  <menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="編集" name="edit_settings"/>
+	<menu_item_call label="自分にのみ適用" name="Settings Apply Local"/>
+	<menu_item_call label="区画に適用" name="Settings Apply Parcel"/>
+	<menu_item_call label="リージョン（地域）に適用" name="Settings Apply Region"/>
+	<menu_item_call label="コピー" name="copy_settings"/>
+	<menu_item_call label="ペースト" name="paste_settings"/>
+	<menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 3d5ea3f616..820cc3cd53 100644
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-  <menu_item_call label="ＵＲＬについて" name="about_url" />
-  <menu_item_call label="ＵＲＬにテレポートする" name="teleport_to_url" />
-  <menu_item_call label="マップ" name="show_on_map" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="ＵＲＬについて" name="about_url"/>
+	<menu_item_call label="ＵＲＬにテレポートする" name="teleport_to_url"/>
+	<menu_item_call label="マップ" name="show_on_map"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
index fd4dffeefa..e5e5b7b1ba 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Teleport History Gear Context Menu">
-  <menu_item_separator name="Landmark Separator" />
-  <menu_item_call label="フォルダをすべて展開" name="Expand all folders" />
-  <menu_item_call label="フォルダをすべて縮小" name="Collapse all folders" />
-  <menu_item_call label="テレポートの履歴をクリア" name="Clear Teleport History" />
-</menu>
\ No newline at end of file
+	<menu_item_separator name="Landmark Separator"/>
+	<menu_item_call label="フォルダをすべて展開" name="Expand all folders"/>
+	<menu_item_call label="フォルダをすべて縮小" name="Collapse all folders"/>
+	<menu_item_call label="テレポートの履歴をクリア" name="Clear Teleport History"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
index dc34bc6463..c26b70e9e1 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Teleport History Item Menu">
-  <menu_item_call label="テレポート" name="Teleport" />
-  <menu_item_call label="より詳細な情報" name="More Information" />
-  <menu_item_call label="SLurlをコピー" name="CopyToClipboard" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="テレポート" name="Teleport"/>
+	<menu_item_call label="より詳細な情報" name="More Information"/>
+	<menu_item_call label="SLurlをコピー" name="CopyToClipboard"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
index 391be973f8..4dd44d2ec8 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Teleport History Item Context Menu">
-  <menu_item_call label="開く" name="TabOpen" />
-  <menu_item_call label="閉じる" name="TabClose" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="開く" name="TabOpen"/>
+	<menu_item_call label="閉じる" name="TabClose"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
index 48fd8ad243..3a5892bafc 100644
--- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
-  <menu_item_call label="（不明）" name="Suggestion 1" />
-  <menu_item_call label="（不明）" name="Suggestion 2" />
-  <menu_item_call label="（不明）" name="Suggestion 3" />
-  <menu_item_call label="（不明）" name="Suggestion 4" />
-  <menu_item_call label="（不明）" name="Suggestion 5" />
-  <menu_item_call label="辞書に追加" name="Add to Dictionary" />
-  <menu_item_call label="無視に追加" name="Add to Ignore" />
-  <menu_item_call label="切り取り" name="Cut" />
-  <menu_item_call label="コピー" name="Copy" />
-  <menu_item_call label="ペースト" name="Paste" />
-  <menu_item_call label="削除" name="Delete" />
-  <menu_item_call label="すべて選択" name="Select All" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="（不明）" name="Suggestion 1"/>
+	<menu_item_call label="（不明）" name="Suggestion 2"/>
+	<menu_item_call label="（不明）" name="Suggestion 3"/>
+	<menu_item_call label="（不明）" name="Suggestion 4"/>
+	<menu_item_call label="（不明）" name="Suggestion 5"/>
+	<menu_item_call label="辞書に追加" name="Add to Dictionary"/>
+	<menu_item_call label="無視に追加" name="Add to Ignore"/>
+	<menu_item_call label="切り取り" name="Cut"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="ペースト" name="Paste"/>
+	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="すべて選択" name="Select All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
index 9bb4eaf496..a54f7bdef7 100644
--- a/indra/newview/skins/default/xui/ja/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Toolbars Popup">
-  <menu_item_call label="このボタンを削除" name="Remove button" />
-  <menu_item_call label="ツールバーのボタン…" name="Choose Buttons" />
-  <menu_item_check label="アイコンとラベル" name="icons_with_text" />
-  <menu_item_check label="アイコンのみ" name="icons_only" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="このボタンを削除" name="Remove button"/>
+	<menu_item_call label="ツールバーのボタン…" name="Choose Buttons"/>
+	<menu_item_check label="アイコンとラベル" name="icons_with_text"/>
+	<menu_item_check label="アイコンのみ" name="icons_only"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
index ea1e12ab2b..326e6d232b 100644
--- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_topinfobar">
-  <menu_item_check label="座標を表示" name="Show Coordinates" />
-  <menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties" />
-  <menu_item_separator name="Separator" />
-  <!-- Label of 'Landmark' item is changing in runtime, 
-    see  AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml -->
-  <menu_item_call label="ランドマーク" name="Landmark" />
-  <menu_item_separator name="Separator" />
-  <menu_item_call label="コピー" name="Copy" />
-</menu>
\ No newline at end of file
+	<menu_item_check label="座標を表示" name="Show Coordinates"/>
+	<menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/>
+	<menu_item_separator name="Separator"/>
+	<menu_item_call label="ランドマーク" name="Landmark"/>
+	<menu_item_separator name="Separator"/>
+	<menu_item_call label="コピー" name="Copy"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index dc9a6af8fe..9ce9a070f2 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="プロフィールを表示" name="show_agent" />
-  <menu_item_call label="ＩＭを送信…" name="send_im" />
-  <menu_item_call label="フレンドを追加…" name="add_friend" />
-  <menu_item_call label="フレンドを削除…" name="remove_friend" />
-  <menu_item_call label="嫌がらせの報告" name="report_abuse" />
-  <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label" />
-  <menu_item_call label="SLurl をクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="プロフィールを表示" name="show_agent"/>
+	<menu_item_call label="ＩＭを送信…" name="send_im"/>
+	<menu_item_call label="フレンドを追加…" name="add_friend"/>
+	<menu_item_call label="フレンドを削除…" name="remove_friend"/>
+	<menu_item_call label="嫌がらせの報告" name="report_abuse"/>
+	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
+	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_email.xml b/indra/newview/skins/default/xui/ja/menu_url_email.xml
index 1ba8d6a64e..6c41d759fe 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_email.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_email.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Email Popup">
-  <menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external" />
-  <menu_item_call label="電子メールをクリップボードにコピー" name="email_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external"/>
+	<menu_item_call label="電子メールをクリップボードにコピー" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_experience.xml b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
index 83d7029527..09d4dce74d 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_experience.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_experience.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
index 9214d67dea..ebd7f25d6e 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="グループ情報を表示" name="show_group" />
-  <menu_item_separator />
-  <menu_item_call label="グループをクリップボードにコピー" name="url_copy_label" />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="グループ情報を表示" name="show_group"/>
+	<menu_item_separator/>
+	<menu_item_call label="グループをクリップボードにコピー" name="url_copy_label"/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
index ba5048094d..ae97e8bd8d 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="Web ページを開く" name="url_open" />
-  <menu_item_call label="内蔵ブラウザで開く" name="url_open_internal" />
-  <menu_item_call label="外部ブラウザで開く" name="url_open_external" />
-  <menu_item_call label="ＵＲＬをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="Web ページを開く" name="url_open"/>
+	<menu_item_call label="内蔵ブラウザで開く" name="url_open_internal"/>
+	<menu_item_call label="外部ブラウザで開く" name="url_open_external"/>
+	<menu_item_call label="ＵＲＬをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
index 7a13030b64..1805fb03bb 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="インベントリのアイテムを表示" name="show_item" />
-  <menu_item_separator />
-  <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label" />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="インベントリのアイテムを表示" name="show_item"/>
+	<menu_item_separator/>
+	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
index 75813f9017..041b30d05b 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_separator />
-  <menu_item_call label="現地にテレポート" name="teleport_to_location" />
-  <menu_item_separator />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_separator/>
+	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
+	<menu_item_separator/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index ef76e5484f..06defa7aed 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="オブジェクトのプロフィール…" name="show_object" />
-  <menu_item_call label="ブロック…" name="block_object" />
-  <menu_item_call label="ブロック解除" name="unblock_object" />
-  <menu_item_separator />
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object" />
-  <menu_item_separator />
-  <menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label" />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="オブジェクトのプロフィール…" name="show_object"/>
+	<menu_item_call label="ブロック…" name="block_object"/>
+	<menu_item_call label="ブロック解除" name="unblock_object"/>
+	<menu_item_separator/>
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
+	<menu_item_separator/>
+	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
index 0c1eab8dad..93aa1372c5 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="区画情報を表示" name="show_parcel" />
-  <menu_item_separator />
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_separator />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="区画情報を表示" name="show_parcel"/>
+	<menu_item_separator/>
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_separator/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
index 78f3997bf8..c80351bdae 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="このコマンドを実行" name="run_slapp" />
-  <menu_item_separator />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="このコマンドを実行" name="run_slapp"/>
+	<menu_item_separator/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
index e0d4427008..100dbd0f99 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="場所の情報を表示" name="show_place" />
-  <menu_item_separator />
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_call label="現地にテレポート" name="teleport_to_location" />
-  <menu_item_separator />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="場所の情報を表示" name="show_place"/>
+	<menu_item_separator/>
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
+	<menu_item_separator/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
index e6941fb8bd..a2097ec1f9 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-  <menu_item_call label="この場所にテレポート" name="teleport" />
-  <menu_item_separator />
-  <menu_item_call label="マップに表示" name="show_on_map" />
-  <menu_item_separator />
-  <menu_item_call label="SLurlをクリップボードにコピー" name="url_copy" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="この場所にテレポート" name="teleport"/>
+	<menu_item_separator/>
+	<menu_item_call label="マップに表示" name="show_on_map"/>
+	<menu_item_separator/>
+	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 5227c0d583..a1f3980df4 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,690 +1,573 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
-  <menu label="私" name="Me">
-    <menu_item_call label="プロフィール…" name="Profile" />
-    <menu_item_check label="インベントリ…" name="Inventory" />
-    <menu_item_call label="新しいインベントリウィンドウ" name="NewInventoryWindow" />
-    <menu_item_call label="場所…" name="Places" />
-    <menu_item_call label="ピック…" name="Picks" />
-    <menu_item_call label="体験…" name="Experiences" />
-    <menu_item_call label="カメラコントロール…" name="Camera Controls" />
-
-    <menu_item_separator />
-    <menu_item_check name="Away" label="一時退席中" />
-    <menu_item_check name="Do Not Disturb" label="着信拒否" />
-
-    <menu_item_separator />
-
-    <!-- L$が空白になってしまうため翻訳を変更 -->
-    <menu_item_call label="リンデンドルの購入…" name="Buy and Sell L$" />
-    <menu_item_call label="マーケットプレイスのリスト…" name="MarketplaceListings" />
-    <menu_item_call label="アカウントのダッシュボード…" name="Manage My Account" />
-    <menu_item_call label="[Membership]" name="Membership" />
-
-    <menu_item_separator />
-
-    <menu_item_call label="初期設定…" name="Preferences" />
-    <menu_item_call label="ツールバーのボタン…" name="Toolbars" />
-    <menu_item_call label="全てのコントロールを隠す" name="Hide UI" shortcut="control|shift|U" />
-    <menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H" />
-
-    <menu_item_separator />
-
-    <menu_item_call label="[APP_NAME]の終了" name="Quit" />
-  </menu>
-  <menu label="アバター" name="Avatar">
-    <menu_item_call label="着用中…" name="NowWearing" />
-    <menu_item_call label="アウトフィット…" name="ChangeOutfit" />
-    <menu_item_call label="ホバーする高さ…" name="Hover Height" />
-    <menu_item_call label="シェイプの編集…" name="Edit My Shape" />
-    <menu_item_call label="アウトフィットパーツの編集…" name="Edit Outfit" />
-    <menu label="脱ぐ" name="Take Off &gt;">
-      <menu label="服装" name="Clothes &gt;">
-        <menu_item_call label="シャツ" name="Shirt" />
-        <menu_item_call label="ズボン" name="Pants" />
-        <menu_item_call label="スカート" name="Skirt" />
-        <menu_item_call label="靴" name="Shoes" />
-        <menu_item_call label="靴下" name="Socks" />
-        <menu_item_call label="上着" name="Jacket" />
-        <menu_item_call label="手袋" name="Gloves" />
-        <menu_item_call label="下着（上半身）" name="Self Undershirt" />
-        <menu_item_call label="下着（下半身）" name="Self Underpants" />
-        <menu_item_call label="タトゥ" name="Self Tattoo" />
-        <menu_item_call label="物理作用" name="Self Physics" />
-        <menu_item_call label="アルファ" name="Self Alpha" />
-        <menu_item_separator />
-        <menu_item_call label="すべての服装" name="All Clothes" />
-      </menu>
-      <menu label="ＨＵＤ" name="Avatar Detach HUD" />
-      <menu label="取り外す" name="Avatar Detach" />
-      <menu_item_call label="全てを取り外す" name="Detach All" />
-    </menu>
-    <menu_item_separator />
-    <menu_item_call label="アバターを選択…" name="Avatar Picker" />
-    <menu_item_separator />
-
-    <menu_item_call label="座る／立つ" name="Sit stand" />
-    <menu_item_call label="飛行／歩行" name="Fly land" shortcut="HOME" />
-    <menu_item_call label="アニメーション停止" name="Stop Animating My Avatar" />
-    <menu_item_check label="歩行／走行／飛行…" name="WalkRunFly" />
-    <menu_item_check label="常時走行" name="Always Run" shortcut="control|R" />
-    <menu_item_separator />
-    <menu_item_check label="ジェスチャー…" name="Gestures" shortcut="control|G" />
-    <menu_item_separator />
-    <menu_item_call label="スケルトンをリセット" name="Reset Skeleton" />
-    <menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations" />
-    <menu_item_call label="スクリプトを装着…" name="MyScripts" />
-    <menu_item_separator />
-    <menu_item_call label="アバターに関するヘルプ…" name="Help with avatars" />
-  </menu>
-  <menu label="コミュニケーション" name="Communicate">
-    <menu_item_check label="会話…" name="Conversations" />
-    <menu_item_check label="近隣のチャット…" name="Nearby Chat" />
-    <menu_item_check label="ボイスチャット" name="Speak" />
-    <menu_item_check name="Conversation Log..." label="会話ログ…" />
-    <menu_item_separator />
-    <menu label="ボイスモーフィング" name="VoiceMorphing" />
-    <menu_item_check label="ジェスチャー…" name="Gestures" />
-    <menu_item_separator />
-    <menu_item_check label="フレンド" name="My Friends" />
-    <menu_item_check label="グループ" name="My Groups" />
-    <menu_item_check label="近くにいる人物" name="Active Speakers" />
-    <menu_item_check label="ブロックリスト" name="Block List" />
-    <menu_item_separator />
-    <menu_item_check label="着信拒否" name="Do Not Disturb" />
-
-  </menu>
-  <menu label="ワールド" name="World">
-    <menu_item_call label="現在地をランドマーク" name="Create Landmark Here" />
-    <menu_item_call label="行き先…" name="Destinations" />
-    <menu_item_check label="ワールドマップ" name="World Map" />
-    <menu_item_check label="ミニマップ" name="Mini-Map" />
-    <menu_item_call label="イベント" name="Events" />
-    <menu_item_check label="検索…" name="Search" />
-    <menu_item_separator />
-    <menu_item_call label="ホームにテレポート" name="Teleport Home" />
-    <menu_item_call label="現在地をホームに設定" name="Set Home to Here" />
-    <menu_item_separator />
-    <menu_item_call label="スナップショット" name="Take Snapshot" />
-
-    <menu_item_call label="３６０度スナップショット" name="Capture 360" />
-    <menu_item_separator />
-    <menu_item_call label="場所のプロフィール" name="Place Profile" />
-    <menu_item_call label="土地情報" name="About Land" />
-    <menu_item_call label="リージョン（地域）／不動産" name="RegionEstate" />
-    <menu_item_call label="自分のLindenホーム…" name="Linden Home" />
-    <menu_item_call label="自分の所有地…" name="My Land" />
-    <menu_item_call label="この土地を購入" name="Buy Land" />
-
-    <menu_item_separator />
-
-    <menu label="表示" name="LandShow">
-      <menu_item_check label="立入禁止ライン" name="Ban Lines" />
-      <menu_item_check label="ビーコン（標識）" name="beacons" />
-      <menu_item_check label="敷地境界線" name="Property Lines" />
-      <menu_item_check label="土地所有者" name="Land Owners" />
-      <menu_item_check label="座標" name="Coordinates" />
-      <menu_item_check label="区画のプロパティ" name="Parcel Properties" />
-      <menu_item_separator />
-      <menu_item_check label="拡張メニュー" name="Show Advanced Menu" />
-    </menu>
-    <menu_item_check label="グラフィック性能の最適化…" name="Performance" />
-    <menu_item_separator />
-    <!--
-    <menu_item_check label="ナビゲーションバーを表示" name="ShowNavbarNavigationPanel"/>
-    <menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
-    <menu_item_separator/>
-    -->
-
-    <menu label="環境" name="Environment">
-      <menu_item_check label="夜明け" name="Sunrise" />
-      <menu_item_check label="正午" name="Noon" />
-      <menu_item_check label="夕方" name="Sunset" />
-      <menu_item_check label="深夜" name="Midnight" />
-      <menu_item_check label="共有された環境を使用" name="Use Shared Environment" />
-      <menu_item_separator />
-      <menu_item_call label="自分の環境…" name="my_environs" />
-
-      <menu_item_call label="自分の光源…" name="adjustment_tool" />
-      <menu_item_separator />
-      <menu_item_check label="雲の動きを一時停止" name="pause_clouds" />
-    </menu>
-
-    <!--
-    <menu create_jump_keys="true" label="環境編集" name="Environment Editor" tear_off="true">
-      <menu_item_call label="初期設定…" name="Environment Settings"/>
-      <menu_item_separator/>
-      <menu name="Water Presets" label="水のプリセット"/>
-      <menu name="Sky Presets" label="空のプリセット">
-        <menu_item_call label="新規プリセット…" name="new_sky_preset"/>
-        <menu_item_call label="プリセット編集…" name="edit_sky_preset"/>
-      </menu>
-      <menu name="Day Presets" label="一日のプリセット">
-        <menu_item_call label="新規プリセット…" name="new_day_preset"/>
-        <menu_item_call label="プリセット編集…" name="edit_day_preset"/>
-      </menu>
-    </menu>
-    -->
-
-  </menu>
-  <menu label="制作" name="BuildTools">
-    <menu_item_check label="制作" name="Show Build Tools" />
-    <menu label="制作ツールを選択する" name="Select Tool">
-      <menu_item_call label="フォーカスツール" name="Focus" />
-      <menu_item_call label="移動ツール" name="Move" />
-      <menu_item_call label="編集ツール" name="Edit" />
-      <menu_item_call label="作成ツール" name="Create" />
-      <menu_item_call label="土地ツール" name="Land" />
-    </menu>
-    <menu_item_call label="リンク" name="Link" />
-    <menu_item_call label="リンク解除" name="Unlink" />
-    <menu_item_check label="リンクされた部分の編集" name="Edit Linked Parts" />
-    <menu label="要素を選択" name="Select Elements">
-      <menu_item_call label="次のパーツまたは面を選択" name="Select Next Part or Face" />
-      <menu_item_call label="前のパーツまたは面を選択" name="Select Previous Part or Face" />
-      <menu_item_call label="次のパーツまたは面を含める" name="Include Next Part or Face" />
-      <menu_item_call label="前のパーツまたは面を含める" name="Include Previous Part or Face" />
-    </menu>
-    <menu_item_call label="リージョン（地域）オブジェクト" name="pathfinding_linkset_menu_item" />
-    <menu_item_separator />
-
-    <menu_item_call label="選択をフォーカス" name="Focus on Selection" />
-    <menu_item_call label="選択をズーム" name="Zoom to Selection" />
-
-    <menu_item_separator />
-
-    <menu label="オブジェクト" name="Object">
-      <menu_item_call label="購入" name="Menu Object Buy" />
-      <menu_item_call label="取得" name="Menu Object Take" />
-      <menu_item_call label="コピーを取得" name="Take Copy" />
-      <menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents" />
-      <menu_item_call label="オブジェクトを返却" name="Return Object back to Owner" />
-      <menu_item_call label="複製" name="DuplicateObject" />
-    </menu>
-    <menu label="スクリプト" name="Scripts">
-      <menu_item_check label="スクリプトの警告／エラー…" name="Script debug" />
-      <menu_item_call label="スクリプトの再コンパイル（Mono）" name="Mono" />
-      <menu_item_call label="スクリプトの再コンパイル（LSL）" name="LSL" />
-      <menu_item_call label="スクリプトのリセット" name="Reset Scripts" />
-      <menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running" />
-      <menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running" />
-    </menu>
-
-    <menu label="経路探索" name="Pathfinding">
-      <menu_item_call label="リージョン（地域）のオブジェクト" name="pathfinding_linksets_menu_item" />
-      <menu_item_call label="キャラクター…" name="pathfinding_characters_menu_item" />
-      <menu_item_call label="表示／テスト…" name="pathfinding_console_menu_item" />
-      <menu_item_call label="リージョン（地域）の再構築" name="pathfinding_rebake_navmesh_item" />
-    </menu>
-
-
-    <menu_item_separator />
-
-    <menu label="オプション" name="Options">
-      <menu_item_check label="権限の詳細を表示する" name="DebugPermissions" />
-
-      <menu_item_separator />
-
-      <menu_item_check label="自分のオブジェクトだけを選択する" name="Select Only My Objects" />
-      <menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects" />
-      <menu_item_check label="範囲内を選択する" name="Select By Surrounding" />
-
-      <menu_item_separator />
-
-      <menu_item_check label="選択のアウトラインを表示" name="Show Selection Outlines" />
-      <menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection" />
-      <menu_item_check label="選択した光の効果範囲を表示する" name="Show Light Radius for Selection" />
-      <menu_item_check label="選択ビームを表示する" name="Show Selection Beam" />
-
-      <menu_item_separator />
-
-      <menu_item_check label="グリッド吸着" name="Snap to Grid" />
-      <menu_item_call label="オブジェクトのＸＹ軸をグリッドに吸着" name="Snap Object XY to Grid" />
-      <menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid" />
-      <menu_item_separator />
-      <menu_item_call label="グリッドオプション…" name="Grid Options" />
-      <menu_item_call label="デフォルトの権限設定…" name="Set default permissions" />
-    </menu>
-    <menu label="アップロード" name="Upload">
-      <menu_item_call label="画像（L$ [COST]）…" name="Upload Image" />
-      <menu_item_call label="サウンド（L$ [COST]）…" name="Upload Sound" />
-      <menu_item_call label="アニメーション（L$ [COST]）…" name="Upload Animation" />
-      <menu_item_call label="モデル…" name="Upload Model" />
-      <menu_item_call label="一括…" name="Bulk Upload" />
-    </menu>
-    <menu_item_separator />
-    <menu_item_call label="取り消し" name="Undo" />
-    <menu_item_call label="やり直し" name="Redo" />
-  </menu>
-  <menu label="ヘルプ" name="Help">
-    <menu_item_call label="ガイドブック" name="How To" />
-    <!--
-    <menu_item_call label="チュートリアル" name="Tutorial" />
-    -->
-    <menu_item_separator />
-    <menu_item_call label="ナレッジベース" name="Knowledge Base" />
-    <menu_item_call label="Wiki" name="Wiki" />
-    <menu_item_call label="コミュニティフォーラム" name="Community Forums" />
-    <menu_item_call label="サポートページ" name="Support portal" />
-    <menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News" />
-    <menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs" />
-    <menu_item_separator />
-
-    <menu_item_call label="嫌がらせを報告する" name="Report Abuse" />
-    <menu_item_call label="バグを報告する" name="Report Bug" />
-
-    <menu_item_separator />
-    <menu_item_call label="衝突・プッシュ＆打撃" name="Bumps, Pushes &amp;amp; Hits" />
-    <menu_item_call label="[APP_NAME]について" name="About Second Life" />
-  </menu>
-  <menu label="拡張" name="Advanced">
-    <menu_item_call label="テクスチャをリベークする" name="Rebake Texture" />
-    <menu_item_call label="ＵＩサイズをデフォルトにする" name="Set UI Size to Default" />
-    <menu_item_call label="ウィンドウサイズ設定…" name="Set Window Size..." />
-
-    <menu_item_separator />
-
-    <menu_item_check label="オブジェクトの選択距離の制限" name="Limit Select Distance" />
-    <menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance" />
-
-    <menu_item_separator />
-
-    <menu_item_check label="高解像度スナップショット" name="HighResSnapshot" />
-    <menu_item_check label="スナップショットをディスクに保存" name="QuietSnapshotsToDisk" />
-
-    <menu_item_separator />
-
-    <menu label="パフォーマンスツール" name="Performance Tools">
-      <menu_item_call label="遅延メーター" name="Lag Meter" />
-      <menu_item_check label="統計バー" name="Statistics Bar" />
-      <menu_item_call label="シーン負荷の統計情報" name="Scene Load Statistics" />
-      <menu_item_check label="アバターの複雑度を表示" name="Avatar Draw Info" />
-    </menu>
-    <menu label="ハイライトと表示" name="Highlighting and Visibility">
-      <menu_item_check label="ビーコンを簡素化" name="Cheesy Beacon" />
-      <menu_item_check label="パーティクルを非表示" name="Hide Particles" />
-      <menu_item_check label="選択を非表示" name="Hide Selected" />
-      <menu_item_check label="透明部分をハイライト" name="Highlight Transparent" />
-      <menu_item_check label="マウスルックのときに十字線を表示" name="ShowCrosshairs" />
-      <!-- 
-      <menu create_jump_keys="true" label="ホバーでTips表示" name="Hover Tips" tear_off="true">
-        <menu_item_check label="Tips表示" name="Show Tips" shortcut="control|shift|T"/>
-
-        <menu_item_separator />
-
-        <menu_item_check label="土地のツールチップを表示" name="Land Tips"/>
-        <menu_item_check label="すべてのオブジェクトのツールチップを表示" name="Tips On All Objects"/>
-      </menu>
-      -->
-    </menu>
-
-    <menu label="レンダリング種別" name="Rendering Types">
-      <menu_item_check label="シンプル" name="Rendering Type Simple" />
-      <menu_item_check label="アルファ" name="Rendering Type Alpha" />
-      <menu_item_check label="木" name="Rendering Type Tree" />
-      <menu_item_check label="アバター" name="Rendering Type Character" />
-      <menu_item_check label="アニメッシュ" name="Rendering Type Control Avatar" />
-      <menu_item_check label="サーフェスパッチ" name="Rendering Type Surface Patch" />
-      <menu_item_check label="空" name="Rendering Type Sky" />
-      <menu_item_check label="水面" name="Rendering Type Water" />
-      <menu_item_check label="地面" name="Rendering Type Ground" />
-      <menu_item_check label="ボリューム" name="Rendering Type Volume" />
-      <menu_item_check label="草" name="Rendering Type Grass" />
-      <menu_item_check label="雲" name="Rendering Type Clouds" />
-      <menu_item_check label="パーティクル" name="Rendering Type Particles" />
-      <menu_item_check label="衝突" name="Rendering Type Bump" />
-    </menu>
-    <menu label="レンダリング機能" name="Rendering Features">
-      <menu_item_check label="ＵＩ" name="ToggleUI" />
-      <menu_item_check label="選択済" name="Selected" />
-      <menu_item_check label="ハイライト" name="Highlighted" />
-      <menu_item_check label="動的テクスチャ" name="Dynamic Textures" />
-      <menu_item_check label="足の影" name="Foot Shadows" />
-      <menu_item_check label="フォグ" name="Fog" />
-      <menu_item_check label="FRInfoのテスト" name="Test FRInfo" />
-      <menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects" />
-    </menu>
-    <menu_item_check label="プラグイン読み取りスレッドを使用" name="Use Plugin Read Thread" />
-    <menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache" />
-    <menu_item_check label="マウスの平滑化" name="Mouse Smoothing" />
-    <menu_item_call label="リリースキー" name="Release Keys" />
-    <menu_item_separator />
-
-    <menu label="ショートカット" name="Shortcuts">
-
-      <menu_item_call label="ウィンドウを閉じる" name="Close Window" />
-      <menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows" />
-
-      <menu_item_separator />
-
-      <menu_item_call label="スナップショットをディスクに保存する" name="Snapshot to Disk" />
-
-      <menu_item_separator />
-
-      <menu_item_call label="マウスルック" name="Mouselook" />
-      <menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam" />
-      <menu_item_call label="視界をリセット" name="Reset View" />
-      <menu_item_call label="最後の発言者を見る" name="Look at Last Chatter" />
-
-      <menu_item_separator />
-
-      <menu_item_call label="ズーム・イン" name="Zoom In" />
-      <menu_item_call label="ズーム（デフォルト）" name="Zoom Default" />
-      <menu_item_call label="ズーム・アウト" name="Zoom Out" />
-    </menu>
-    <!--Shortcuts-->
-
-    <menu_item_separator />
-
-    <menu_item_call label="デバッグ設定を表示" name="Debug Settings" />
-    <menu_item_check label="開発メニューを表示" name="Debug Mode" />
-  </menu>
-  <menu label="開発" name="Develop">
-    <menu label="コンソール" name="Consoles">
-      <menu_item_check label="テクスチャのコンソール" name="Texture Console" />
-      <menu_item_check label="デバッグコンソール" name="Debug Console" />
-      <menu_item_call label="通知コンソール" name="Notifications" />
-      <menu_item_check label="リージョン（地域）デバッグコンソール" name="Region Debug Console" />
-      <menu_item_check label="ファーストタイマー" name="Fast Timers" />
-      <menu_item_check label="メモリ" name="Memory" />
-      <menu_item_check label="シーンの統計" name="Scene Statistics" />
-      <menu_item_check label="シーンの読み込みモニター" name="Scene Loading Monitor" />
-      <menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console" />
-
-      <menu_item_separator />
-
-      <menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console" />
-      <menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console" />
-      <menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console" />
-
-      <menu_item_separator />
-
-      <menu_item_check label="カメラ" name="Camera" />
-      <menu_item_check label="風" name="Wind" />
-      <menu_item_check label="ＦＯＶ" name="FOV" />
-      <menu_item_check label="バッジ" name="Badge" />
-    </menu>
-    <menu label="情報を表示" name="Display Info">
-      <menu_item_check label="時間を表示する" name="Show Time" />
-      <menu_item_check label="アップロードコストを表示" name="Show Upload Cost" />
-      <menu_item_check label="描画情報を表示する" name="Show Render Info" />
-      <menu_item_check label="アバターの描画情報を表示" name="Show Avatar Render Info" />
-      <menu_item_check label="テクスチャ情報を表示" name="Show Texture Info" />
-      <menu_item_check label="マトリックスを表示する" name="Show Matrices" />
-      <menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor" />
-      <menu_item_check label="メモリを表示" name="Show Memory" />
-
-      <menu_item_separator />
-
-      <menu_item_check label="オブジェクトの更新を表示する" name="Show Updates" />
-    </menu>
-
-    <menu_item_separator />
-
-    <menu label="エラー実行" name="Force Errors">
-      <menu_item_call label="ブレークポイント" name="Force Breakpoint" />
-      <menu_item_call label="LLErrorとクラッシュを実行する" name="Force LLError And Crash" />
-      <menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access" />
-      <menu_item_call label="コルーチン内で不正なメモリアクセスを発生させる" name="Force Bad Memory Access in Coroutine" />
-      <menu_item_call label="無限ループ" name="Force Infinite Loop" />
-      <menu_item_call label="ドライバのクラッシュを発生させる" name="Force Driver Carsh" />
-      <menu_item_call label="ソフトウェア例外エラーの発生させる" name="Force Software Exception" />
-      <menu_item_call label="コルーチン内でクラッシュを発生させる" name="Force a Crash in a Coroutine" />
-      <menu_item_call label="スレッド内でクラッシュを発生させる" name="Force a Crash in a Thread" />
-      <menu_item_call label="ビューアーの接続遮断を実行する" name="Force Disconnect Viewer" />
-      <menu_item_call label="メモリリークをシミュレートする" name="Memory Leaking Simulation" />
-    </menu>
-    <menu label="描画テスト" name="Render Tests">
-      <menu_item_check label="カメラのオフセット" name="Camera Offset" />
-      <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate" />
-      <menu_item_check label="周期的な遅いフレーム" name="Periodic Slow Frame" />
-      <menu_item_check label="フレームテスト" name="Frame Test" />
-      <menu_item_call label="フレームのプロフィール" name="Frame Profile" />
-      <menu_item_call label="ベンチマーク" name="Benchmark" />
-    </menu>
-    <menu label="メタデータの描画" name="Render Metadata">
-      <menu_item_check label="バウンディングボックス" name="Bounding Boxes" />
-      <menu_item_check label="普通" name="Normals" />
-      <menu_item_check label="八分木" name="Octree" />
-      <menu_item_check label="シャドウ円錐" name="Shadow Frusta" />
-      <menu_item_check label="実像" name="Physics Shapes" />
-      <menu_item_check label="オクルージョン" name="Occlusion" />
-      <menu_item_check label="バッチの描画" name="Render Batches" />
-      <menu_item_check label="タイプを更新" name="Update Type" />
-      <menu_item_check label="テクスチャのアニメ" name="Texture Anim" />
-      <menu_item_check label="テクスチャ優先度" name="Texture Priority" />
-      <menu_item_check label="テクスチャの範囲" name="Texture Area" />
-      <menu_item_check label="側面" name="Face Area" />
-      <menu_item_check label="ＬＯＤ情報" name="LOD Info" />
-      <menu_item_check label="三角形の数" name="Triangle Count" />
-      <menu_item_check label="制作・キュー" name="Build Queue" />
-      <menu_item_check label="光" name="Lights" />
-      <menu_item_check label="パーティクル" name="Particles" />
-      <menu_item_check label="骨組みの衝突判定" name="Collision Skeleton" />
-      <menu_item_check label="ジョイント" name="Joints" />
-      <menu_item_check label="レイキャスト" name="Raycast" />
-      <menu_item_check label="風のベクトル" name="Wind Vectors" />
-      <menu_item_check label="彫刻" name="Sculpt" />
-      <menu label="テクスチャの密度" name="Texture Density">
-        <menu_item_check label="無し" name="None" />
-        <menu_item_check label="原行" name="Current" />
-        <menu_item_check label="望ましい" name="Desired" />
-        <menu_item_check label="全て" name="Full" />
-      </menu>
-    </menu>
-    <menu label="レンダリング" name="Rendering">
-      <menu_item_check label="軸" name="Axes" />
-      <menu_item_check label="接線基準" name="Tangent Basis" />
-      <menu_item_call label="選択されたテクスチャ情報基準" name="Selected Texture Info Basis" />
-      <menu_item_call label="選択したマテリアルの情報" name="Selected Material Info" />
-      <menu_item_check label="ワイヤーフレーム" name="Wireframe" />
-      <menu_item_check label="オブジェクト間のオクルージョン" name="Object-Object Occlusion" />
-      <menu_item_separator />
-
-      <menu_item_check label="高度な光源モデル" name="Advanced Lighting Model" />
-      <menu_item_check label="　太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors" />
-      <menu_item_check label="　SSAOと影のスムージング" name="SSAO and Shadow Smoothing" />
-      <menu_item_separator />
-
-      <menu_item_check label="次回起動時にＧＬをデバッグ" name="Debug GL" />
-      <menu_item_check label="パイプラインをデバッグ" name="Debug Pipeline" />
-      <menu_item_check label="自動アルファマスク（遅延）" name="Automatic Alpha Masks (deferred)" />
-      <menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)" />
-      <menu_item_check label="アニメーションテクスチャ" name="Animation Textures" />
-      <menu_item_check label="テクスチャを無効にする" name="Disable Textures" />
-      <menu_item_check label="アンビエントを無効にする" name="Disable Ambient" />
-      <menu_item_check label="日の光を無効にする" name="Disable Sunlight" />
-      <menu_item_check label="近くの光を無効にする" name="Disable Local Lights" />
-      <menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures" />
-      <menu_item_check label="装着された光源を描画する" name="Render Attached Lights" />
-      <menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles" />
-      <menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects" />
-      <menu_item_separator />
-
-      <menu_item_call label="キャッシュを直ちにクリア" name="Cache Clear" />
-
-    </menu>
-
-    <menu label="ネットワーク" name="Network">
-      <menu_item_check label="エージェントを一時停止する" name="AgentPause" />
-
-      <menu_item_separator />
-
-      <menu_item_call label="メッセージログを有効にする" name="Enable Message Log" />
-      <menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log" />
-
-      <menu_item_separator />
-
-      <menu_item_check label="速度補間オブジェクト" name="Velocity Interpolate Objects" />
-      <menu_item_check label="速度補間オブジェクトへPing" name="Ping Interpolate Object Positions" />
-
-      <menu_item_separator />
-
-      <menu_item_call label="パケットをドロップ" name="Drop a Packet" />
-    </menu>
-    <menu label="キャッシュ" name="Cache">
-      <menu_item_call label="ディスクキャッシュをパージ" name="Purge Disk Cache" />
-    </menu>
-    <menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera" />
-    <menu label="レコーダー" name="Recorder">
-      <menu_item_call label="イベントの記録開始" name="Start event recording" />
-      <menu_item_call label="イベントの記録停止" name="Stop event recording" />
-      <menu_item_call label="イベントの記録のプレイバック" name="Playback event recording" />
-
-      <menu_item_call label="再生開始" name="Start Playback" />
-      <menu_item_call label="再生停止" name="Stop Playback" />
-      <menu_item_check label="再生をループ" name="Loop Playback" />
-      <menu_item_call label="記録開始" name="Start Record" />
-      <menu_item_call label="記録停止" name="Stop Record" />
-    </menu>
-
-    <menu label="ワールド" name="DevelopWorld">
-      <menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override" />
-      <menu_item_check label="固定された天気" name="Fixed Weather" />
-      <menu_item_call label="リージョンオブジェクトのキャッシュをダンプ" name="Dump Region Object Cache" />
-
-      <menu_item_call label="関心リスト：フルアップデート" name="Interest List: Full Update" />
-    </menu>
-    <menu label="ＵＩ" name="UI">
-      <menu_item_call label="メディアブラウザ" name="Media Browser" />
-      <menu_item_call label="インベントリの出力" name="Dump Inventory" />
-      <menu_item_call label="タイマーをダンプ" name="Dump Timers" />
-      <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder" />
-      <menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info" />
-      <menu_item_call label="エージェント情報をプリント" name="Print Agent Info" />
-      <menu_item_separator />
-
-      <menu_item_check label="SelectMgrのデバッグ" name="Debug SelectMgr" />
-      <menu_item_check label="ダブルクリック" name="Debug Clicks" />
-      <menu_item_check label="デバッグ表示" name="Debug Views" />
-      <menu_item_check label="デバッグ名ツールチップ" name="Debug Name Tooltips" />
-      <menu_item_check label="マウスイベントのデバッグ" name="Debug Mouse Events" />
-      <menu_item_check label="デバッグキー" name="Debug Keys" />
-      <menu_item_check label="WindowProcのデバッグ" name="Debug WindowProc" />
-    </menu>
-    <menu label="ＸＵＩ" name="XUI">
-      <menu_item_call label="色の設定をリロード" name="Reload Color Settings" />
-      <menu_item_call label="フォントテストを表示" name="Show Font Test" />
-      <menu_item_check label="ＸＵＩ名を表示" name="Show XUI Names" />
-      <menu_item_call label="テストＩＭを送信する" name="Send Test IMs" />
-      <menu_item_call label="名前キャッシュをフラッシュ" name="Flush Names Caches" />
-    </menu>
-    <menu label="アバター" name="Character">
-      <menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
-        <menu_item_call label="瞳" name="Grab Iris" />
-        <menu_item_call label="頭" name="Grab Head" />
-        <menu_item_call label="上半身" name="Grab Upper Body" />
-        <menu_item_call label="下半身" name="Grab Lower Body" />
-        <menu_item_call label="スカート" name="Grab Skirt" />
-      </menu>
-      <menu label="キャラクターテスト" name="Character Tests">
-        <menu_item_call label="容姿をXMLに保存する" name="Appearance To XML" />
-        <menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry" />
-        <menu_item_call label="男性アバターのテスト" name="Test Male" />
-        <menu_item_call label="女性アバターのテスト" name="Test Female" />
-        <menu_item_check label="選択アバター許可" name="Allow Select Avatar" />
-      </menu>
-      <menu label="アニメーションの速度" name="Animation Speed">
-        <menu_item_call label="すべてのアニメーションを10%速く" name="All Animations 10 Faster" />
-        <menu_item_call label="すべてのアニメーションを10%遅く" name="All Animations 10 Slower" />
-        <menu_item_call label="すべてのアニメーションの速度をリセット" name="Reset All Animation Speed" />
-        <menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations" />
-      </menu>
-      <menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default" />
-      <menu_item_check label="アニメーション情報" name="Animation Info" />
-      <menu_item_check label="見ているものを表示する" name="Show Look At" />
-      <menu_item_check label="クリックした場所を表示する" name="Show Point At" />
-      <menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates" />
-      <menu_item_check label="ＬＯＤを無効にする" name="Disable LOD" />
-      <menu_item_check label="キャラクターVisのデバッグ" name="Debug Character Vis" />
-      <menu_item_check label="スケルトンの衝突判定を表示する" name="Show Collision Skeleton" />
-      <menu_item_check label="ボーンを表示" name="Show Bones" />
-      <menu_item_check label="エージェントの目標を表示する" name="Display Agent Target" />
-      <menu_item_check label="インポスターの範囲を表示" name="Show Impostor Extents" />
-      <!-- Appears not to exist anymore
-      <menu_item_check label="回転をデバッグ" name="Debug Rotation" />
-      -->
-      <menu_item_call label="装着物のダンプ" name="Dump Attachments" />
-      <menu_item_call label="アバターのテクスチャをデバッグ" name="Debug Avatar Textures" />
-      <menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures" />
-    </menu>
-
-    <menu_item_separator />
-
-    <menu_item_check label="ＨＴＴＰテスクチャ" name="HTTP Textures" />
-    <menu_item_call label="圧縮画像" name="Compress Images" />
-    <menu_item_call label="圧縮ファイルテスト" name="Compress File Test" />
-
-    <menu_item_call label="Visual Leak Detectorを有効にする" name="Enable Visual Leak Detector" />
-
-    <menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump" />
-    <menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window" />
-    <menu label="ログレベルを設定" name="Set Logging Level">
-      <menu_item_check label="デバッグ" name="Debug" />
-      <menu_item_check label="情報" name="Info" />
-      <menu_item_check label="警告" name="Warning" />
-      <menu_item_check label="エラー" name="Error" />
-      <menu_item_check label="なし" name="None" />
-    </menu>
-
-    <menu_item_separator />
-
-    <menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options" />
-    <menu_item_call label="管理者ステータス解除" name="Leave Admin Options" />
-    <menu_item_check label="管理者メニューを表示する" name="View Admin Options" />
-  </menu>
-  <menu label="管理" name="Admin">
-    <menu label="オブジェクト" name="AdminObject">
-      <menu_item_call label="コピーを取る" name="Admin Take Copy" />
-      <menu_item_call label="自分を所有者にする" name="Force Owner To Me" />
-      <menu_item_call label="所有者権限の実行" name="Force Owner Permissive" />
-      <menu_item_call label="削除" name="Delete" />
-      <menu_item_call label="ロック" name="Lock" />
-      <menu_item_call label="アセットのＩＤを取得" name="Get Assets IDs" />
-    </menu>
-    <menu label="区画" name="Parcel">
-      <menu_item_call label="自分を所有者にする" name="Owner To Me" />
-      <menu_item_call label="Lindenのコンテンツに設定する" name="Set to Linden Content" />
-      <menu_item_call label="パブリックの土地を取得する" name="Claim Public Land" />
-    </menu>
-    <menu label="リージョン（地域）" name="Region">
-      <menu_item_call label="一時アセットデータのダンプ" name="Dump Temp Asset Data" />
-      <menu_item_call label="リージョンの状態を保存する" name="Save Region State" />
-    </menu>
-    <menu_item_call label="ゴッド・ツール" name="God Tools" />
-  </menu>
-  <menu label="管理" name="Deprecated">
-    <menu label="オブジェクトを取り付ける" name="Attach Object" />
-    <menu label="オブジェクトを取り外す" name="Detach Object" />
-    <menu label="服装を脱ぐ" name="Take Off Clothing">
-      <menu_item_call label="シャツ" name="Shirt" />
-      <menu_item_call label="ズボン" name="Pants" />
-      <menu_item_call label="靴" name="Shoes" />
-      <menu_item_call label="靴下" name="Socks" />
-      <menu_item_call label="ジャケット" name="Jacket" />
-      <menu_item_call label="手袋" name="Gloves" />
-      <menu_item_call label="下着（上半身）" name="Menu Undershirt" />
-      <menu_item_call label="下着（下半身）" name="Menu Underpants" />
-      <menu_item_call label="スカート" name="Skirt" />
-      <menu_item_call label="アルファ" name="Alpha" />
-      <menu_item_call label="タトゥ" name="Tattoo" />
-      <menu_item_call label="ユニバーサル" name="Universal" />
-      <menu_item_call label="物理作用" name="Physics" />
-      <menu_item_call label="すべての服装" name="All Clothes" />
-    </menu>
-    <menu label="ヘルプ" name="DeprecatedHelp">
-      <menu_item_call label="リンデン公式ブログ" name="Official Linden Blog" />
-      <menu_item_call label="スクリプトポータル" name="Scripting Portal" />
-      <menu label="バグ報告" name="Bug Reporting">
-        <menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker" />
-        <menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help" />
-
-        <menu_item_separator />
-
-        <menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101" />
-        <menu_item_call label="セキュリティ問題" name="Security Issues" />
-        <menu_item_call label="品質保証ポータル" name="QA Wiki" />
-      </menu>
-    </menu>
-  </menu>
-</menu_bar>
\ No newline at end of file
+	<menu label="私" name="Me">
+		<menu_item_call label="プロフィール…" name="Profile"/>
+		<menu_item_check label="インベントリ…" name="Inventory"/>
+		<menu_item_call label="新しいインベントリウィンドウ" name="NewInventoryWindow"/>
+		<menu_item_call label="場所…" name="Places"/>
+		<menu_item_call label="ピック…" name="Picks"/>
+		<menu_item_call label="体験…" name="Experiences"/>
+		<menu_item_call label="カメラコントロール…" name="Camera Controls"/>
+		<menu_item_separator/>
+		<menu_item_check name="Away" label="一時退席中"/>
+		<menu_item_check name="Do Not Disturb" label="着信拒否"/>
+		<menu_item_separator/>
+		<menu_item_call label="リンデンドルの購入…" name="Buy and Sell L$"/>
+		<menu_item_call label="マーケットプレイスのリスト…" name="MarketplaceListings"/>
+		<menu_item_call label="アカウントのダッシュボード…" name="Manage My Account"/>
+		<menu_item_call label="[Membership]" name="Membership"/>
+		<menu_item_separator/>
+		<menu_item_call label="初期設定…" name="Preferences"/>
+		<menu_item_call label="ツールバーのボタン…" name="Toolbars"/>
+		<menu_item_call label="全てのコントロールを隠す" name="Hide UI" shortcut="control|shift|U"/>
+		<menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H"/>
+		<menu_item_separator/>
+		<menu_item_call label="[APP_NAME]の終了" name="Quit"/>
+	</menu>
+	<menu label="アバター" name="Avatar">
+		<menu_item_call label="着用中…" name="NowWearing"/>
+		<menu_item_call label="アウトフィット…" name="ChangeOutfit"/>
+		<menu_item_call label="ホバーする高さ…" name="Hover Height"/>
+		<menu_item_call label="シェイプの編集…" name="Edit My Shape"/>
+		<menu_item_call label="アウトフィットパーツの編集…" name="Edit Outfit"/>
+		<menu label="脱ぐ" name="Take Off &gt;">
+			<menu label="服装" name="Clothes &gt;">
+				<menu_item_call label="シャツ" name="Shirt"/>
+				<menu_item_call label="ズボン" name="Pants"/>
+				<menu_item_call label="スカート" name="Skirt"/>
+				<menu_item_call label="靴" name="Shoes"/>
+				<menu_item_call label="靴下" name="Socks"/>
+				<menu_item_call label="上着" name="Jacket"/>
+				<menu_item_call label="手袋" name="Gloves"/>
+				<menu_item_call label="下着（上半身）" name="Self Undershirt"/>
+				<menu_item_call label="下着（下半身）" name="Self Underpants"/>
+				<menu_item_call label="タトゥ" name="Self Tattoo"/>
+				<menu_item_call label="物理作用" name="Self Physics"/>
+				<menu_item_call label="アルファ" name="Self Alpha"/>
+				<menu_item_separator/>
+				<menu_item_call label="すべての服装" name="All Clothes"/>
+			</menu>
+			<menu label="ＨＵＤ" name="Avatar Detach HUD"/>
+			<menu label="取り外す" name="Avatar Detach"/>
+			<menu_item_call label="全てを取り外す" name="Detach All"/>
+		</menu>
+		<menu_item_separator/>
+		<menu_item_call label="アバターを選択…" name="Avatar Picker"/>
+		<menu_item_separator/>
+		<menu_item_call label="座る／立つ" name="Sit stand"/>
+		<menu_item_call label="飛行／歩行" name="Fly land" shortcut="HOME"/>
+		<menu_item_call label="アニメーション停止" name="Stop Animating My Avatar"/>
+		<menu_item_check label="歩行／走行／飛行…" name="WalkRunFly"/>
+		<menu_item_check label="常時走行" name="Always Run" shortcut="control|R"/>
+		<menu_item_separator/>
+		<menu_item_check label="ジェスチャー…" name="Gestures" shortcut="control|G"/>
+		<menu_item_separator/>
+		<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+		<menu_item_call label="スケルトンとアニメーションをリセット" name="Reset Skeleton And Animations"/>
+		<menu_item_call label="スクリプトを装着…" name="MyScripts"/>
+		<menu_item_separator/>
+		<menu_item_call label="アバターに関するヘルプ…" name="Help with avatars"/>
+	</menu>
+	<menu label="コミュニケーション" name="Communicate">
+		<menu_item_check label="会話…" name="Conversations"/>
+		<menu_item_check label="近隣のチャット…" name="Nearby Chat"/>
+		<menu_item_check label="ボイスチャット" name="Speak"/>
+		<menu_item_check name="Conversation Log..." label="会話ログ…"/>
+		<menu_item_separator/>
+		<menu label="ボイスモーフィング" name="VoiceMorphing"/>
+		<menu_item_check label="ジェスチャー…" name="Gestures"/>
+		<menu_item_separator/>
+		<menu_item_check label="フレンド" name="My Friends"/>
+		<menu_item_check label="グループ" name="My Groups"/>
+		<menu_item_check label="近くにいる人物" name="Active Speakers"/>
+		<menu_item_check label="ブロックリスト" name="Block List"/>
+		<menu_item_separator/>
+		<menu_item_check label="着信拒否" name="Do Not Disturb"/>
+	</menu>
+	<menu label="ワールド" name="World">
+		<menu_item_call label="現在地をランドマーク" name="Create Landmark Here"/>
+		<menu_item_call label="行き先…" name="Destinations"/>
+		<menu_item_check label="ワールドマップ" name="World Map"/>
+		<menu_item_check label="ミニマップ" name="Mini-Map"/>
+		<menu_item_call label="イベント" name="Events"/>
+		<menu_item_check label="検索…" name="Search"/>
+		<menu_item_separator/>
+		<menu_item_call label="ホームにテレポート" name="Teleport Home"/>
+		<menu_item_call label="現在地をホームに設定" name="Set Home to Here"/>
+		<menu_item_separator/>
+		<menu_item_call label="スナップショット" name="Take Snapshot"/>
+		<menu_item_call label="３６０度スナップショット" name="Capture 360"/>
+		<menu_item_separator/>
+		<menu_item_call label="場所のプロフィール" name="Place Profile"/>
+		<menu_item_call label="土地情報" name="About Land"/>
+		<menu_item_call label="リージョン（地域）／不動産" name="RegionEstate"/>
+		<menu_item_call label="自分のLindenホーム…" name="Linden Home"/>
+		<menu_item_call label="自分の所有地…" name="My Land"/>
+		<menu_item_call label="この土地を購入" name="Buy Land"/>
+		<menu_item_separator/>
+		<menu label="表示" name="LandShow">
+			<menu_item_check label="立入禁止ライン" name="Ban Lines"/>
+			<menu_item_check label="ビーコン（標識）" name="beacons"/>
+			<menu_item_check label="敷地境界線" name="Property Lines"/>
+			<menu_item_check label="土地所有者" name="Land Owners"/>
+			<menu_item_check label="座標" name="Coordinates"/>
+			<menu_item_check label="区画のプロパティ" name="Parcel Properties"/>
+			<menu_item_separator/>
+			<menu_item_check label="拡張メニュー" name="Show Advanced Menu"/>
+		</menu>
+		<menu_item_check label="グラフィック性能の最適化…" name="Performance"/>
+		<menu_item_separator/>
+		<menu label="環境" name="Environment">
+			<menu_item_check label="夜明け" name="Sunrise"/>
+			<menu_item_check label="正午" name="Noon"/>
+			<menu_item_check label="夕方" name="Sunset"/>
+			<menu_item_check label="深夜" name="Midnight"/>
+			<menu_item_check label="共有された環境を使用" name="Use Shared Environment"/>
+			<menu_item_separator/>
+			<menu_item_call label="自分の環境…" name="my_environs"/>
+			<menu_item_call label="自分の光源…" name="adjustment_tool"/>
+			<menu_item_separator/>
+			<menu_item_check label="雲の動きを一時停止" name="pause_clouds"/>
+		</menu>
+	</menu>
+	<menu label="制作" name="BuildTools">
+		<menu_item_check label="制作" name="Show Build Tools"/>
+		<menu label="制作ツールを選択する" name="Select Tool">
+			<menu_item_call label="フォーカスツール" name="Focus"/>
+			<menu_item_call label="移動ツール" name="Move"/>
+			<menu_item_call label="編集ツール" name="Edit"/>
+			<menu_item_call label="作成ツール" name="Create"/>
+			<menu_item_call label="土地ツール" name="Land"/>
+		</menu>
+		<menu_item_call label="リンク" name="Link"/>
+		<menu_item_call label="リンク解除" name="Unlink"/>
+		<menu_item_check label="リンクされた部分の編集" name="Edit Linked Parts"/>
+		<menu label="要素を選択" name="Select Elements">
+			<menu_item_call label="次のパーツまたは面を選択" name="Select Next Part or Face"/>
+			<menu_item_call label="前のパーツまたは面を選択" name="Select Previous Part or Face"/>
+			<menu_item_call label="次のパーツまたは面を含める" name="Include Next Part or Face"/>
+			<menu_item_call label="前のパーツまたは面を含める" name="Include Previous Part or Face"/>
+		</menu>
+		<menu_item_call label="リージョン（地域）オブジェクト" name="pathfinding_linkset_menu_item"/>
+		<menu_item_separator/>
+		<menu_item_call label="選択をフォーカス" name="Focus on Selection"/>
+		<menu_item_call label="選択をズーム" name="Zoom to Selection"/>
+		<menu_item_separator/>
+		<menu label="オブジェクト" name="Object">
+			<menu_item_call label="購入" name="Menu Object Buy"/>
+			<menu_item_call label="取得" name="Menu Object Take"/>
+			<menu_item_call label="コピーを取得" name="Take Copy"/>
+			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
+			<menu_item_call label="オブジェクトを返却" name="Return Object back to Owner"/>
+			<menu_item_call label="複製" name="DuplicateObject"/>
+		</menu>
+		<menu label="スクリプト" name="Scripts">
+			<menu_item_check label="スクリプトの警告／エラー…" name="Script debug"/>
+			<menu_item_call label="スクリプトの再コンパイル（Mono）" name="Mono"/>
+			<menu_item_call label="スクリプトの再コンパイル（LSL）" name="LSL"/>
+			<menu_item_call label="スクリプトのリセット" name="Reset Scripts"/>
+			<menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running"/>
+			<menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running"/>
+		</menu>
+		<menu label="経路探索" name="Pathfinding">
+			<menu_item_call label="リージョン（地域）のオブジェクト" name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="キャラクター…" name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="表示／テスト…" name="pathfinding_console_menu_item"/>
+			<menu_item_call label="リージョン（地域）の再構築" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
+		<menu_item_separator/>
+		<menu label="オプション" name="Options">
+			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
+			<menu_item_separator/>
+			<menu_item_check label="自分のオブジェクトだけを選択する" name="Select Only My Objects"/>
+			<menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects"/>
+			<menu_item_check label="範囲内を選択する" name="Select By Surrounding"/>
+			<menu_item_separator/>
+			<menu_item_check label="選択のアウトラインを表示" name="Show Selection Outlines"/>
+			<menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection"/>
+			<menu_item_check label="選択した光の効果範囲を表示する" name="Show Light Radius for Selection"/>
+			<menu_item_check label="選択ビームを表示する" name="Show Selection Beam"/>
+			<menu_item_separator/>
+			<menu_item_check label="グリッド吸着" name="Snap to Grid"/>
+			<menu_item_call label="オブジェクトのＸＹ軸をグリッドに吸着" name="Snap Object XY to Grid"/>
+			<menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid"/>
+			<menu_item_separator/>
+			<menu_item_call label="グリッドオプション…" name="Grid Options"/>
+			<menu_item_call label="デフォルトの権限設定…" name="Set default permissions"/>
+		</menu>
+		<menu label="アップロード" name="Upload">
+			<menu_item_call label="画像（L$ [COST]）…" name="Upload Image"/>
+			<menu_item_call label="サウンド（L$ [COST]）…" name="Upload Sound"/>
+			<menu_item_call label="アニメーション（L$ [COST]）…" name="Upload Animation"/>
+			<menu_item_call label="モデル…" name="Upload Model"/>
+			<menu_item_call label="一括…" name="Bulk Upload"/>
+		</menu>
+		<menu_item_separator/>
+		<menu_item_call label="取り消し" name="Undo"/>
+		<menu_item_call label="やり直し" name="Redo"/>
+	</menu>
+	<menu label="ヘルプ" name="Help">
+		<menu_item_call label="ガイドブック" name="How To"/>
+		<menu_item_separator/>
+		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
+		<menu_item_call label="サポートページ" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE]ニュース" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE]ブログ" name="Second Life Blogs"/>
+		<menu_item_separator/>
+		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
+		<menu_item_call label="バグを報告する" name="Report Bug"/>
+		<menu_item_separator/>
+		<menu_item_call label="衝突・プッシュ＆打撃" name="Bumps, Pushes &amp;amp; Hits"/>
+		<menu_item_call label="[APP_NAME]について" name="About Second Life"/>
+	</menu>
+	<menu label="拡張" name="Advanced">
+		<menu_item_call label="テクスチャをリベークする" name="Rebake Texture"/>
+		<menu_item_call label="ＵＩサイズをデフォルトにする" name="Set UI Size to Default"/>
+		<menu_item_call label="ウィンドウサイズ設定…" name="Set Window Size..."/>
+		<menu_item_separator/>
+		<menu_item_check label="オブジェクトの選択距離の制限" name="Limit Select Distance"/>
+		<menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance"/>
+		<menu_item_separator/>
+		<menu_item_check label="高解像度スナップショット" name="HighResSnapshot"/>
+		<menu_item_check label="スナップショットをディスクに保存" name="QuietSnapshotsToDisk"/>
+		<menu_item_separator/>
+		<menu label="パフォーマンスツール" name="Performance Tools">
+			<menu_item_call label="遅延メーター" name="Lag Meter"/>
+			<menu_item_check label="統計バー" name="Statistics Bar"/>
+			<menu_item_call label="シーン負荷の統計情報" name="Scene Load Statistics"/>
+			<menu_item_check label="アバターの複雑度を表示" name="Avatar Draw Info"/>
+		</menu>
+		<menu label="ハイライトと表示" name="Highlighting and Visibility">
+			<menu_item_check label="ビーコンを簡素化" name="Cheesy Beacon"/>
+			<menu_item_check label="パーティクルを非表示" name="Hide Particles"/>
+			<menu_item_check label="選択を非表示" name="Hide Selected"/>
+			<menu_item_check label="透明部分をハイライト" name="Highlight Transparent"/>
+			<menu_item_check label="マウスルックのときに十字線を表示" name="ShowCrosshairs"/>
+		</menu>
+		<menu label="レンダリング種別" name="Rendering Types">
+			<menu_item_check label="シンプル" name="Rendering Type Simple"/>
+			<menu_item_check label="アルファ" name="Rendering Type Alpha"/>
+			<menu_item_check label="木" name="Rendering Type Tree"/>
+			<menu_item_check label="アバター" name="Rendering Type Character"/>
+			<menu_item_check label="アニメッシュ" name="Rendering Type Control Avatar"/>
+			<menu_item_check label="サーフェスパッチ" name="Rendering Type Surface Patch"/>
+			<menu_item_check label="空" name="Rendering Type Sky"/>
+			<menu_item_check label="水面" name="Rendering Type Water"/>
+			<menu_item_check label="地面" name="Rendering Type Ground"/>
+			<menu_item_check label="ボリューム" name="Rendering Type Volume"/>
+			<menu_item_check label="草" name="Rendering Type Grass"/>
+			<menu_item_check label="雲" name="Rendering Type Clouds"/>
+			<menu_item_check label="パーティクル" name="Rendering Type Particles"/>
+			<menu_item_check label="衝突" name="Rendering Type Bump"/>
+		</menu>
+		<menu label="レンダリング機能" name="Rendering Features">
+			<menu_item_check label="ＵＩ" name="ToggleUI"/>
+			<menu_item_check label="選択済" name="Selected"/>
+			<menu_item_check label="ハイライト" name="Highlighted"/>
+			<menu_item_check label="動的テクスチャ" name="Dynamic Textures"/>
+			<menu_item_check label="足の影" name="Foot Shadows"/>
+			<menu_item_check label="フォグ" name="Fog"/>
+			<menu_item_check label="FRInfoのテスト" name="Test FRInfo"/>
+			<menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects"/>
+		</menu>
+		<menu_item_check label="プラグイン読み取りスレッドを使用" name="Use Plugin Read Thread"/>
+		<menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache"/>
+		<menu_item_check label="マウスの平滑化" name="Mouse Smoothing"/>
+		<menu_item_call label="リリースキー" name="Release Keys"/>
+		<menu_item_separator/>
+		<menu label="ショートカット" name="Shortcuts">
+			<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
+			<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
+			<menu_item_separator/>
+			<menu_item_call label="スナップショットをディスクに保存する" name="Snapshot to Disk"/>
+			<menu_item_separator/>
+			<menu_item_call label="マウスルック" name="Mouselook"/>
+			<menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam"/>
+			<menu_item_call label="視界をリセット" name="Reset View"/>
+			<menu_item_call label="最後の発言者を見る" name="Look at Last Chatter"/>
+			<menu_item_separator/>
+			<menu_item_call label="ズーム・イン" name="Zoom In"/>
+			<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
+			<menu_item_call label="ズーム・アウト" name="Zoom Out"/>
+		</menu>
+		<menu_item_separator/>
+		<menu_item_call label="デバッグ設定を表示" name="Debug Settings"/>
+		<menu_item_check label="開発メニューを表示" name="Debug Mode"/>
+	</menu>
+	<menu label="開発" name="Develop">
+		<menu label="コンソール" name="Consoles">
+			<menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
+			<menu_item_check label="デバッグコンソール" name="Debug Console"/>
+			<menu_item_call label="通知コンソール" name="Notifications"/>
+			<menu_item_check label="リージョン（地域）デバッグコンソール" name="Region Debug Console"/>
+			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
+			<menu_item_check label="メモリ" name="Memory"/>
+			<menu_item_check label="シーンの統計" name="Scene Statistics"/>
+			<menu_item_check label="シーンの読み込みモニター" name="Scene Loading Monitor"/>
+			<menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console"/>
+			<menu_item_separator/>
+			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
+			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
+			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
+			<menu_item_separator/>
+			<menu_item_check label="カメラ" name="Camera"/>
+			<menu_item_check label="風" name="Wind"/>
+			<menu_item_check label="ＦＯＶ" name="FOV"/>
+			<menu_item_check label="バッジ" name="Badge"/>
+		</menu>
+		<menu label="情報を表示" name="Display Info">
+			<menu_item_check label="時間を表示する" name="Show Time"/>
+			<menu_item_check label="アップロードコストを表示" name="Show Upload Cost"/>
+			<menu_item_check label="描画情報を表示する" name="Show Render Info"/>
+			<menu_item_check label="アバターの描画情報を表示" name="Show Avatar Render Info"/>
+			<menu_item_check label="テクスチャ情報を表示" name="Show Texture Info"/>
+			<menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
+			<menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor"/>
+			<menu_item_check label="メモリを表示" name="Show Memory"/>
+			<menu_item_separator/>
+			<menu_item_check label="オブジェクトの更新を表示する" name="Show Updates"/>
+		</menu>
+		<menu_item_separator/>
+		<menu label="エラー実行" name="Force Errors">
+			<menu_item_call label="ブレークポイント" name="Force Breakpoint"/>
+			<menu_item_call label="LLErrorとクラッシュを実行する" name="Force LLError And Crash"/>
+			<menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access"/>
+			<menu_item_call label="コルーチン内で不正なメモリアクセスを発生させる" name="Force Bad Memory Access in Coroutine"/>
+			<menu_item_call label="無限ループ" name="Force Infinite Loop"/>
+			<menu_item_call label="ドライバのクラッシュを発生させる" name="Force Driver Carsh"/>
+			<menu_item_call label="ソフトウェア例外エラーの発生させる" name="Force Software Exception"/>
+			<menu_item_call label="コルーチン内でクラッシュを発生させる" name="Force a Crash in a Coroutine"/>
+			<menu_item_call label="スレッド内でクラッシュを発生させる" name="Force a Crash in a Thread"/>
+			<menu_item_call label="ビューアーの接続遮断を実行する" name="Force Disconnect Viewer"/>
+			<menu_item_call label="メモリリークをシミュレートする" name="Memory Leaking Simulation"/>
+		</menu>
+		<menu label="描画テスト" name="Render Tests">
+			<menu_item_check label="カメラのオフセット" name="Camera Offset"/>
+			<menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
+			<menu_item_check label="周期的な遅いフレーム" name="Periodic Slow Frame"/>
+			<menu_item_check label="フレームテスト" name="Frame Test"/>
+			<menu_item_call label="フレームのプロフィール" name="Frame Profile"/>
+			<menu_item_call label="ベンチマーク" name="Benchmark"/>
+		</menu>
+		<menu label="メタデータの描画" name="Render Metadata">
+			<menu_item_check label="バウンディングボックス" name="Bounding Boxes"/>
+			<menu_item_check label="普通" name="Normals"/>
+			<menu_item_check label="八分木" name="Octree"/>
+			<menu_item_check label="シャドウ円錐" name="Shadow Frusta"/>
+			<menu_item_check label="実像" name="Physics Shapes"/>
+			<menu_item_check label="オクルージョン" name="Occlusion"/>
+			<menu_item_check label="バッチの描画" name="Render Batches"/>
+			<menu_item_check label="タイプを更新" name="Update Type"/>
+			<menu_item_check label="テクスチャのアニメ" name="Texture Anim"/>
+			<menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
+			<menu_item_check label="テクスチャの範囲" name="Texture Area"/>
+			<menu_item_check label="側面" name="Face Area"/>
+			<menu_item_check label="ＬＯＤ情報" name="LOD Info"/>
+			<menu_item_check label="三角形の数" name="Triangle Count"/>
+			<menu_item_check label="制作・キュー" name="Build Queue"/>
+			<menu_item_check label="光" name="Lights"/>
+			<menu_item_check label="パーティクル" name="Particles"/>
+			<menu_item_check label="骨組みの衝突判定" name="Collision Skeleton"/>
+			<menu_item_check label="ジョイント" name="Joints"/>
+			<menu_item_check label="レイキャスト" name="Raycast"/>
+			<menu_item_check label="風のベクトル" name="Wind Vectors"/>
+			<menu_item_check label="彫刻" name="Sculpt"/>
+			<menu label="テクスチャの密度" name="Texture Density">
+				<menu_item_check label="無し" name="None"/>
+				<menu_item_check label="原行" name="Current"/>
+				<menu_item_check label="望ましい" name="Desired"/>
+				<menu_item_check label="全て" name="Full"/>
+			</menu>
+		</menu>
+		<menu label="レンダリング" name="Rendering">
+			<menu_item_check label="軸" name="Axes"/>
+			<menu_item_check label="接線基準" name="Tangent Basis"/>
+			<menu_item_call label="選択されたテクスチャ情報基準" name="Selected Texture Info Basis"/>
+			<menu_item_call label="選択したマテリアルの情報" name="Selected Material Info"/>
+			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
+			<menu_item_check label="オブジェクト間のオクルージョン" name="Object-Object Occlusion"/>
+			<menu_item_separator/>
+			<menu_item_check label="高度な光源モデル" name="Advanced Lighting Model"/>
+			<menu_item_check label="　太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
+			<menu_item_check label="　SSAOと影のスムージング" name="SSAO and Shadow Smoothing"/>
+			<menu_item_separator/>
+			<menu_item_check label="次回起動時にＧＬをデバッグ" name="Debug GL"/>
+			<menu_item_check label="パイプラインをデバッグ" name="Debug Pipeline"/>
+			<menu_item_check label="自動アルファマスク（遅延）" name="Automatic Alpha Masks (deferred)"/>
+			<menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)"/>
+			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
+			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
+			<menu_item_check label="アンビエントを無効にする" name="Disable Ambient"/>
+			<menu_item_check label="日の光を無効にする" name="Disable Sunlight"/>
+			<menu_item_check label="近くの光を無効にする" name="Disable Local Lights"/>
+			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
+			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
+			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>
+			<menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects"/>
+			<menu_item_separator/>
+			<menu_item_call label="キャッシュを直ちにクリア" name="Cache Clear"/>
+		</menu>
+		<menu label="ネットワーク" name="Network">
+			<menu_item_check label="エージェントを一時停止する" name="AgentPause"/>
+			<menu_item_separator/>
+			<menu_item_call label="メッセージログを有効にする" name="Enable Message Log"/>
+			<menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log"/>
+			<menu_item_separator/>
+			<menu_item_check label="速度補間オブジェクト" name="Velocity Interpolate Objects"/>
+			<menu_item_check label="速度補間オブジェクトへPing" name="Ping Interpolate Object Positions"/>
+			<menu_item_separator/>
+			<menu_item_call label="パケットをドロップ" name="Drop a Packet"/>
+		</menu>
+		<menu label="キャッシュ" name="Cache">
+			<menu_item_call label="ディスクキャッシュをパージ" name="Purge Disk Cache"/>
+		</menu>
+		<menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
+		<menu label="レコーダー" name="Recorder">
+			<menu_item_call label="イベントの記録開始" name="Start event recording"/>
+			<menu_item_call label="イベントの記録停止" name="Stop event recording"/>
+			<menu_item_call label="イベントの記録のプレイバック" name="Playback event recording"/>
+			<menu_item_call label="再生開始" name="Start Playback"/>
+			<menu_item_call label="再生停止" name="Stop Playback"/>
+			<menu_item_check label="再生をループ" name="Loop Playback"/>
+			<menu_item_call label="記録開始" name="Start Record"/>
+			<menu_item_call label="記録停止" name="Stop Record"/>
+		</menu>
+		<menu label="ワールド" name="DevelopWorld">
+			<menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override"/>
+			<menu_item_check label="固定された天気" name="Fixed Weather"/>
+			<menu_item_call label="リージョンオブジェクトのキャッシュをダンプ" name="Dump Region Object Cache"/>
+			<menu_item_call label="関心リスト：フルアップデート" name="Interest List: Full Update"/>
+		</menu>
+		<menu label="ＵＩ" name="UI">
+			<menu_item_call label="メディアブラウザ" name="Media Browser"/>
+			<menu_item_call label="インベントリの出力" name="Dump Inventory"/>
+			<menu_item_call label="タイマーをダンプ" name="Dump Timers"/>
+			<menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
+			<menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
+			<menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
+			<menu_item_separator/>
+			<menu_item_check label="SelectMgrのデバッグ" name="Debug SelectMgr"/>
+			<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
+			<menu_item_check label="デバッグ表示" name="Debug Views"/>
+			<menu_item_check label="デバッグ名ツールチップ" name="Debug Name Tooltips"/>
+			<menu_item_check label="マウスイベントのデバッグ" name="Debug Mouse Events"/>
+			<menu_item_check label="デバッグキー" name="Debug Keys"/>
+			<menu_item_check label="WindowProcのデバッグ" name="Debug WindowProc"/>
+		</menu>
+		<menu label="ＸＵＩ" name="XUI">
+			<menu_item_call label="色の設定をリロード" name="Reload Color Settings"/>
+			<menu_item_call label="フォントテストを表示" name="Show Font Test"/>
+			<menu_item_check label="ＸＵＩ名を表示" name="Show XUI Names"/>
+			<menu_item_call label="テストＩＭを送信する" name="Send Test IMs"/>
+			<menu_item_call label="名前キャッシュをフラッシュ" name="Flush Names Caches"/>
+		</menu>
+		<menu label="アバター" name="Character">
+			<menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
+				<menu_item_call label="瞳" name="Grab Iris"/>
+				<menu_item_call label="頭" name="Grab Head"/>
+				<menu_item_call label="上半身" name="Grab Upper Body"/>
+				<menu_item_call label="下半身" name="Grab Lower Body"/>
+				<menu_item_call label="スカート" name="Grab Skirt"/>
+			</menu>
+			<menu label="キャラクターテスト" name="Character Tests">
+				<menu_item_call label="容姿をXMLに保存する" name="Appearance To XML"/>
+				<menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
+				<menu_item_call label="男性アバターのテスト" name="Test Male"/>
+				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
+				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
+			</menu>
+			<menu label="アニメーションの速度" name="Animation Speed">
+				<menu_item_call label="すべてのアニメーションを10%速く" name="All Animations 10 Faster"/>
+				<menu_item_call label="すべてのアニメーションを10%遅く" name="All Animations 10 Slower"/>
+				<menu_item_call label="すべてのアニメーションの速度をリセット" name="Reset All Animation Speed"/>
+				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
+			</menu>
+			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
+			<menu_item_check label="アニメーション情報" name="Animation Info"/>
+			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
+			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
+			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
+			<menu_item_check label="ＬＯＤを無効にする" name="Disable LOD"/>
+			<menu_item_check label="キャラクターVisのデバッグ" name="Debug Character Vis"/>
+			<menu_item_check label="スケルトンの衝突判定を表示する" name="Show Collision Skeleton"/>
+			<menu_item_check label="ボーンを表示" name="Show Bones"/>
+			<menu_item_check label="エージェントの目標を表示する" name="Display Agent Target"/>
+			<menu_item_check label="インポスターの範囲を表示" name="Show Impostor Extents"/>
+			<menu_item_call label="装着物のダンプ" name="Dump Attachments"/>
+			<menu_item_call label="アバターのテクスチャをデバッグ" name="Debug Avatar Textures"/>
+			<menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/>
+		</menu>
+		<menu_item_separator/>
+		<menu_item_check label="ＨＴＴＰテスクチャ" name="HTTP Textures"/>
+		<menu_item_call label="圧縮画像" name="Compress Images"/>
+		<menu_item_call label="圧縮ファイルテスト" name="Compress File Test"/>
+		<menu_item_call label="Visual Leak Detectorを有効にする" name="Enable Visual Leak Detector"/>
+		<menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
+		<menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/>
+		<menu label="ログレベルを設定" name="Set Logging Level">
+			<menu_item_check label="デバッグ" name="Debug"/>
+			<menu_item_check label="情報" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="エラー" name="Error"/>
+			<menu_item_check label="なし" name="None"/>
+		</menu>
+		<menu_item_separator/>
+		<menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options"/>
+		<menu_item_call label="管理者ステータス解除" name="Leave Admin Options"/>
+		<menu_item_check label="管理者メニューを表示する" name="View Admin Options"/>
+	</menu>
+	<menu label="管理" name="Admin">
+		<menu label="オブジェクト" name="AdminObject">
+			<menu_item_call label="コピーを取る" name="Admin Take Copy"/>
+			<menu_item_call label="自分を所有者にする" name="Force Owner To Me"/>
+			<menu_item_call label="所有者権限の実行" name="Force Owner Permissive"/>
+			<menu_item_call label="削除" name="Delete"/>
+			<menu_item_call label="ロック" name="Lock"/>
+			<menu_item_call label="アセットのＩＤを取得" name="Get Assets IDs"/>
+		</menu>
+		<menu label="区画" name="Parcel">
+			<menu_item_call label="自分を所有者にする" name="Owner To Me"/>
+			<menu_item_call label="Lindenのコンテンツに設定する" name="Set to Linden Content"/>
+			<menu_item_call label="パブリックの土地を取得する" name="Claim Public Land"/>
+		</menu>
+		<menu label="リージョン（地域）" name="Region">
+			<menu_item_call label="一時アセットデータのダンプ" name="Dump Temp Asset Data"/>
+			<menu_item_call label="リージョンの状態を保存する" name="Save Region State"/>
+		</menu>
+		<menu_item_call label="ゴッド・ツール" name="God Tools"/>
+	</menu>
+	<menu label="管理" name="Deprecated">
+		<menu label="オブジェクトを取り付ける" name="Attach Object"/>
+		<menu label="オブジェクトを取り外す" name="Detach Object"/>
+		<menu label="服装を脱ぐ" name="Take Off Clothing">
+			<menu_item_call label="シャツ" name="Shirt"/>
+			<menu_item_call label="ズボン" name="Pants"/>
+			<menu_item_call label="靴" name="Shoes"/>
+			<menu_item_call label="靴下" name="Socks"/>
+			<menu_item_call label="ジャケット" name="Jacket"/>
+			<menu_item_call label="手袋" name="Gloves"/>
+			<menu_item_call label="下着（上半身）" name="Menu Undershirt"/>
+			<menu_item_call label="下着（下半身）" name="Menu Underpants"/>
+			<menu_item_call label="スカート" name="Skirt"/>
+			<menu_item_call label="アルファ" name="Alpha"/>
+			<menu_item_call label="タトゥ" name="Tattoo"/>
+			<menu_item_call label="ユニバーサル" name="Universal"/>
+			<menu_item_call label="物理作用" name="Physics"/>
+			<menu_item_call label="すべての服装" name="All Clothes"/>
+		</menu>
+		<menu label="ヘルプ" name="DeprecatedHelp">
+			<menu_item_call label="リンデン公式ブログ" name="Official Linden Blog"/>
+			<menu_item_call label="スクリプトポータル" name="Scripting Portal"/>
+			<menu label="バグ報告" name="Bug Reporting">
+				<menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker"/>
+				<menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help"/>
+				<menu_item_separator/>
+				<menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101"/>
+				<menu_item_call label="セキュリティ問題" name="Security Issues"/>
+				<menu_item_call label="品質保証ポータル" name="QA Wiki"/>
+			</menu>
+		</menu>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
index 7ea696d6ca..213a554bbd 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit Wearable Context Menu">
-  <menu_item_call label="着替える" name="wear_replace" />
-  <menu_item_call label="着る" name="wear_wear" />
-  <menu_item_call label="追加" name="wear_add" />
-  <menu_item_call label="触る" name="touch" />
-  <menu_item_call label="脱ぐ" name="take_off_or_detach" />
-  <menu_item_call label="取り外す" name="detach" />
-  <context_menu label="装着：" name="wearable_attach_to" />
-  <context_menu label="ＨＵＤに装着" name="wearable_attach_to_hud" />
-  <menu_item_call label="取り外す" name="take_off" />
-  <menu_item_call label="編集" name="edit" />
-  <menu_item_call label="アイテムのプロフィール" name="object_profile" />
-  <menu_item_call label="オリジナルを表示" name="show_original" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="着替える" name="wear_replace"/>
+	<menu_item_call label="着る" name="wear_wear"/>
+	<menu_item_call label="追加" name="wear_add"/>
+	<menu_item_call label="触る" name="touch"/>
+	<menu_item_call label="脱ぐ" name="take_off_or_detach"/>
+	<menu_item_call label="取り外す" name="detach"/>
+	<context_menu label="装着：" name="wearable_attach_to"/>
+	<context_menu label="ＨＵＤに装着" name="wearable_attach_to_hud"/>
+	<menu_item_call label="取り外す" name="take_off"/>
+	<menu_item_call label="編集" name="edit"/>
+	<menu_item_call label="アイテムのプロフィール" name="object_profile"/>
+	<menu_item_call label="オリジナルを表示" name="show_original"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
index 75fa3f69b3..54c30757ea 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Wearing">
-  <menu_item_call label="触る" name="touch" />
-  <menu_item_call label="編集" name="edit_item" />
-  <menu_item_call label="アウトフィットの編集" name="edit_outfit" />
-  <menu_item_call label="脱ぐ" name="takeoff" />
-  <menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy" />
-</toggleable_menu>
\ No newline at end of file
+	<menu_item_call label="触る" name="touch"/>
+	<menu_item_call label="編集" name="edit_item"/>
+	<menu_item_call label="アウトフィットの編集" name="edit_outfit"/>
+	<menu_item_call label="脱ぐ" name="takeoff"/>
+	<menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
index 7845ff9aad..7d305e4e34 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Wearing">
-  <menu_item_call label="触る" name="touch_attach" />
-  <menu_item_call label="脱ぐ" name="take_off" />
-  <menu_item_call label="取り外す" name="detach" />
-  <menu_item_call label="アウトフィットの編集" name="edit_outfit" />
-  <menu_item_call label="編集" name="edit_item" />
-  <menu_item_call label="オリジナルを表示" name="show_original" />
-</context_menu>
\ No newline at end of file
+	<menu_item_call label="触る" name="touch_attach"/>
+	<menu_item_call label="脱ぐ" name="take_off"/>
+	<menu_item_call label="取り外す" name="detach"/>
+	<menu_item_call label="アウトフィットの編集" name="edit_outfit"/>
+	<menu_item_call label="編集" name="edit_item"/>
+	<menu_item_call label="オリジナルを表示" name="show_original"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index 23bab3b0b2..b25d4dd0cc 100644
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
@@ -1,143 +1,251 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-  <defaultlabel>（不明）</defaultlabel>
-  <defaultwidget>なし</defaultwidget>
-  <widgetset name="web">
-    <label name="web_label">Webコンテンツ</label>
-    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
-    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
-  </widgetset>
-  <widgetset name="movie">
-    <label name="movie_label">ムービー</label>
-    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
-    <playtip name="movie_playtip">ムービーを再生する</playtip>
-  </widgetset>
-  <widgetset name="image">
-    <label name="image_label">画像</label>
-    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
-    <playtip name="image_playtip">この場所の画像を表示する</playtip>
-  </widgetset>
-  <widgetset name="audio">
-    <label name="audio_label">オーディオ</label>
-    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
-    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
-  </widgetset>
-  <widgetset name="none">
-    <label name="none_label">コンテンツなし</label>
-    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
-  </widgetset>
-  <scheme name="rtsp">
-    <label name="rtsp_label">リアルタイム・ストリーミング</label>
-  </scheme>
-  <scheme name="example">
-    <label name="example_label">例 プラグイン スキーム トリガー</label>
-  </scheme>
-  <scheme name="libvlc">
-    <label name="libvlc_label">LibVLC対応メディア</label>
-  </scheme>
-  <mimetype name="blank">
-    <label name="blank_label">─なし─</label>
-  </mimetype>
-  <mimetype name="none/none">
-    <label name="none/none_label">─なし─</label>
-  </mimetype>
-  <mimetype name="audio/*">
-    <label name="audio2_label">オーディオ</label>
-  </mimetype>
-  <mimetype name="video/*">
-    <label name="video2_label">ビデオ</label>
-  </mimetype>
-  <mimetype name="image/*">
-    <label name="image2_label">画像</label>
-  </mimetype>
-  <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
-    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
-  </mimetype>
-  <mimetype name="application/javascript">
-    <label name="application/javascript_label">JavaScript</label>
-  </mimetype>
-  <mimetype name="application/ogg">
-    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
-  </mimetype>
-  <mimetype name="application/pdf">
-    <label name="application/pdf_label">PDFドキュメント</label>
-  </mimetype>
-  <mimetype name="application/postscript">
-    <label name="application/postscript_label">PostScriptドキュメント</label>
-  </mimetype>
-  <mimetype name="application/rtf">
-    <label name="application/rtf_label">リッチ・テキスト（RTF）</label>
-  </mimetype>
-  <mimetype name="application/smil">
-    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
-  </mimetype>
-  <mimetype name="application/xhtml+xml">
-    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
-  </mimetype>
-  <mimetype name="application/x-director">
-    <label name="application/x-director_label">Macromedia Director</label>
-  </mimetype>
-  <mimetype name="application/octet-stream">
-    <label name="application/octet-stream_label">ストリーム</label>
-  </mimetype>
-  <mimetype name="audio/mid">
-    <label name="audio/mid_label">オーディオ（MIDI）</label>
-  </mimetype>
-  <mimetype name="audio/mpeg">
-    <label name="audio/mpeg_label">オーディオ（MP3）</label>
-  </mimetype>
-  <mimetype name="audio/x-aiff">
-    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
-  </mimetype>
-  <mimetype name="audio/x-wav">
-    <label name="audio/x-wav_label">オーディオ（WAV）</label>
-  </mimetype>
-  <mimetype menu="1" name="image/bmp">
-    <label name="image/bmp_label">画像（BMP）</label>
-  </mimetype>
-  <mimetype menu="1" name="image/gif">
-    <label name="image/gif_label">画像（GIF）</label>
-  </mimetype>
-  <mimetype menu="1" name="image/jpeg">
-    <label name="image/jpeg_label">画像（JPEG）</label>
-  </mimetype>
-  <mimetype menu="1" name="image/png">
-    <label name="image/png_label">画像（PNG）</label>
-  </mimetype>
-  <mimetype name="image/svg+xml">
-    <label name="image/svg+xml_label">画像（SVG）</label>
-  </mimetype>
-  <mimetype menu="1" name="image/tiff">
-    <label name="image/tiff_label">画像（TIFF）</label>
-  </mimetype>
-  <mimetype menu="1" name="text/html">
-    <label name="text/html_label">Webページ</label>
-  </mimetype>
-  <mimetype menu="1" name="text/plain">
-    <label name="text/plain_label">テキスト</label>
-  </mimetype>
-  <mimetype name="text/xml">
-    <label name="text/xml_label">XML</label>
-  </mimetype>
-  <mimetype menu="1" name="video/mpeg">
-    <label name="video/mpeg_label">ムービー（MPEG）</label>
-  </mimetype>
-  <mimetype name="video/mp4">
-    <label name="video/mp4_label">ムービー（MP4）</label>
-  </mimetype>
-  <mimetype name="application/octet-stream">
-    <label name="video/octet-stream">ムービー</label>
-  </mimetype>
-  <mimetype menu="1" name="video/quicktime">
-    <label name="video/quicktime_label">ムービー（QuickTime）</label>
-  </mimetype>
-  <mimetype name="video/x-ms-asf">
-    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
-  </mimetype>
-  <mimetype name="video/x-ms-wmv">
-    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
-  </mimetype>
-  <mimetype menu="1" name="video/x-msvideo">
-    <label name="video/x-msvideo_label">ムービー（AVI）</label>
-  </mimetype>
-</mimetypes>
\ No newline at end of file
+	<defaultlabel>
+		（不明）
+	</defaultlabel>
+	<defaultwidget>
+		なし
+	</defaultwidget>
+	<widgetset name="web">
+		<label name="web_label">
+			Webコンテンツ
+		</label>
+		<tooltip name="web_tooltip">
+			この場所には、Webコンテンツが含まれています。
+		</tooltip>
+		<playtip name="web_playtip">
+			Web コンテンツを表示する
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			ムービー
+		</label>
+		<tooltip name="movie_tooltip">
+			この場所には、ムービーがあります。
+		</tooltip>
+		<playtip name="movie_playtip">
+			ムービーを再生する
+		</playtip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			画像
+		</label>
+		<tooltip name="image_tooltip">
+			この場所には、画像があります
+		</tooltip>
+		<playtip name="image_playtip">
+			この場所の画像を表示する
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			オーディオ
+		</label>
+		<tooltip name="audio_tooltip">
+			この場所には、オーディオがあります。
+		</tooltip>
+		<playtip name="audio_playtip">
+			この場所のオーディオを再生する
+		</playtip>
+	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			コンテンツなし
+		</label>
+		<tooltip name="none_tooltip">
+			この場所には、メディアがありません。
+		</tooltip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			リアルタイム・ストリーミング
+		</label>
+	</scheme>
+	<scheme name="example">
+		<label name="example_label">
+			例 プラグイン スキーム トリガー
+		</label>
+	</scheme>
+	<scheme name="libvlc">
+		<label name="libvlc_label">
+			LibVLC対応メディア
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			─なし─
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			─なし─
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			オーディオ
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			ビデオ
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			画像
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			ムービー（QuickTime）
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			JavaScript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Oggオーディオ／ビデオ
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDFドキュメント
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			PostScriptドキュメント
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			リッチ・テキスト（RTF）
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			同期マルチメディア統合言語（SMIL）
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Webページ（XHTML）
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+	</mimetype>
+	<mimetype name="application/octet-stream">
+		<label name="application/octet-stream_label">
+			ストリーム
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			オーディオ（MIDI）
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			オーディオ（MP3）
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			オーディオ（AIFF）
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			オーディオ（WAV）
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/bmp">
+		<label name="image/bmp_label">
+			画像（BMP）
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/gif">
+		<label name="image/gif_label">
+			画像（GIF）
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/jpeg">
+		<label name="image/jpeg_label">
+			画像（JPEG）
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/png">
+		<label name="image/png_label">
+			画像（PNG）
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			画像（SVG）
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="image/tiff">
+		<label name="image/tiff_label">
+			画像（TIFF）
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="text/html">
+		<label name="text/html_label">
+			Webページ
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="text/plain">
+		<label name="text/plain_label">
+			テキスト
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="video/mpeg">
+		<label name="video/mpeg_label">
+			ムービー（MPEG）
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			ムービー（MP4）
+		</label>
+	</mimetype>
+	<mimetype name="application/octet-stream">
+		<label name="video/octet-stream">
+			ムービー
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
+			ムービー（QuickTime）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			ムービー（Windows Media ASF）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			ムービー（Windows Media WMV）
+		</label>
+	</mimetype>
+	<mimetype menu="1" name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			ムービー（AVI）
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
index 61574b74f9..3bc18c65b0 100644
--- a/indra/newview/skins/default/xui/ja/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
@@ -1,131 +1,231 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-  <defaultlabel>（不明）</defaultlabel>
-  <defaultwidget>なし</defaultwidget>
-  <widgetset name="web">
-    <label name="web_label">Webコンテンツ</label>
-    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
-    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
-  </widgetset>
-  <widgetset name="movie">
-    <label name="movie_label">ムービー</label>
-    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
-    <playtip name="movie_playtip">ムービーを再生する</playtip>
-  </widgetset>
-  <widgetset name="image">
-    <label name="image_label">画像</label>
-    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
-    <playtip name="image_playtip">この場所の画像を表示する</playtip>
-  </widgetset>
-  <widgetset name="audio">
-    <label name="audio_label">オーディオ</label>
-    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
-    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
-  </widgetset>
-  <widgetset name="none">
-    <label name="none_label">コンテンツなし</label>
-    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
-  </widgetset>
-  <scheme name="rtsp">
-    <label name="rtsp_label">リアルタイム・ストリーミング</label>
-  </scheme>
-  <mimetype name="blank">
-    <label name="blank_label">─なし─</label>
-  </mimetype>
-  <mimetype name="none/none">
-    <label name="none/none_label">─なし─</label>
-  </mimetype>
-  <mimetype name="audio/*">
-    <label name="audio2_label">オーディオ</label>
-  </mimetype>
-  <mimetype name="video/*">
-    <label name="video2_label">ビデオ</label>
-  </mimetype>
-  <mimetype name="image/*">
-    <label name="image2_label">画像</label>
-  </mimetype>
-  <mimetype name="video/vnd.secondlife.qt.legacy">
-    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
-  </mimetype>
-  <mimetype name="application/javascript">
-    <label name="application/javascript_label">JavaScript</label>
-  </mimetype>
-  <mimetype name="application/ogg">
-    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
-  </mimetype>
-  <mimetype name="application/pdf">
-    <label name="application/pdf_label">PDFドキュメント</label>
-  </mimetype>
-  <mimetype name="application/postscript">
-    <label name="application/postscript_label">PostScriptドキュメント</label>
-  </mimetype>
-  <mimetype name="application/rtf">
-    <label name="application/rtf_label">リッチテキスト（RTF）</label>
-  </mimetype>
-  <mimetype name="application/smil">
-    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
-  </mimetype>
-  <mimetype name="application/xhtml+xml">
-    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
-  </mimetype>
-  <mimetype name="application/x-director">
-    <label name="application/x-director_label">Macromedia Director</label>
-  </mimetype>
-  <mimetype name="audio/mid">
-    <label name="audio/mid_label">オーディオ（MIDI）</label>
-  </mimetype>
-  <mimetype name="audio/mpeg">
-    <label name="audio/mpeg_label">オーディオ（MP3）</label>
-  </mimetype>
-  <mimetype name="audio/x-aiff">
-    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
-  </mimetype>
-  <mimetype name="audio/x-wav">
-    <label name="audio/x-wav_label">オーディオ（WAV）</label>
-  </mimetype>
-  <mimetype name="image/bmp">
-    <label name="image/bmp_label">画像（BMP）</label>
-  </mimetype>
-  <mimetype name="image/gif">
-    <label name="image/gif_label">画像（GIF）</label>
-  </mimetype>
-  <mimetype name="image/jpeg">
-    <label name="image/jpeg_label">画像（JPEG）</label>
-  </mimetype>
-  <mimetype name="image/png">
-    <label name="image/png_label">画像（PNG）</label>
-  </mimetype>
-  <mimetype name="image/svg+xml">
-    <label name="image/svg+xml_label">画像（SVG）</label>
-  </mimetype>
-  <mimetype name="image/tiff">
-    <label name="image/tiff_label">画像（TIFF）</label>
-  </mimetype>
-  <mimetype name="text/html">
-    <label name="text/html_label">Webページ</label>
-  </mimetype>
-  <mimetype name="text/plain">
-    <label name="text/plain_label">テキスト</label>
-  </mimetype>
-  <mimetype name="text/xml">
-    <label name="text/xml_label">XML</label>
-  </mimetype>
-  <mimetype name="video/mpeg">
-    <label name="video/mpeg_label">ムービー（MPEG）</label>
-  </mimetype>
-  <mimetype name="video/mp4">
-    <label name="video/mp4_label">ムービー（MP4）</label>
-  </mimetype>
-  <mimetype name="video/quicktime">
-    <label name="video/quicktime_label">ムービー（QuickTime）</label>
-  </mimetype>
-  <mimetype name="video/x-ms-asf">
-    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
-  </mimetype>
-  <mimetype name="video/x-ms-wmv">
-    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
-  </mimetype>
-  <mimetype name="video/x-msvideo">
-    <label name="video/x-msvideo_label">ムービー（AVI）</label>
-  </mimetype>
-</mimetypes>
\ No newline at end of file
+	<defaultlabel>
+		（不明）
+	</defaultlabel>
+	<defaultwidget>
+		なし
+	</defaultwidget>
+	<widgetset name="web">
+		<label name="web_label">
+			Webコンテンツ
+		</label>
+		<tooltip name="web_tooltip">
+			この場所には、Webコンテンツが含まれています。
+		</tooltip>
+		<playtip name="web_playtip">
+			Web コンテンツを表示する
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			ムービー
+		</label>
+		<tooltip name="movie_tooltip">
+			この場所には、ムービーがあります。
+		</tooltip>
+		<playtip name="movie_playtip">
+			ムービーを再生する
+		</playtip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			画像
+		</label>
+		<tooltip name="image_tooltip">
+			この場所には、画像があります
+		</tooltip>
+		<playtip name="image_playtip">
+			この場所の画像を表示する
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			オーディオ
+		</label>
+		<tooltip name="audio_tooltip">
+			この場所には、オーディオがあります。
+		</tooltip>
+		<playtip name="audio_playtip">
+			この場所のオーディオを再生する
+		</playtip>
+	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			コンテンツなし
+		</label>
+		<tooltip name="none_tooltip">
+			この場所には、メディアがありません。
+		</tooltip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			リアルタイム・ストリーミング
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			─なし─
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			─なし─
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			オーディオ
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			ビデオ
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			画像
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			ムービー（QuickTime）
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			JavaScript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Oggオーディオ／ビデオ
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDFドキュメント
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			PostScriptドキュメント
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			リッチテキスト（RTF）
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			同期マルチメディア統合言語（SMIL）
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Webページ（XHTML）
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			オーディオ（MIDI）
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			オーディオ（MP3）
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			オーディオ（AIFF）
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			オーディオ（WAV）
+		</label>
+	</mimetype>
+	<mimetype name="image/bmp">
+		<label name="image/bmp_label">
+			画像（BMP）
+		</label>
+	</mimetype>
+	<mimetype name="image/gif">
+		<label name="image/gif_label">
+			画像（GIF）
+		</label>
+	</mimetype>
+	<mimetype name="image/jpeg">
+		<label name="image/jpeg_label">
+			画像（JPEG）
+		</label>
+	</mimetype>
+	<mimetype name="image/png">
+		<label name="image/png_label">
+			画像（PNG）
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			画像（SVG）
+		</label>
+	</mimetype>
+	<mimetype name="image/tiff">
+		<label name="image/tiff_label">
+			画像（TIFF）
+		</label>
+	</mimetype>
+	<mimetype name="text/html">
+		<label name="text/html_label">
+			Webページ
+		</label>
+	</mimetype>
+	<mimetype name="text/plain">
+		<label name="text/plain_label">
+			テキスト
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype name="video/mpeg">
+		<label name="video/mpeg_label">
+			ムービー（MPEG）
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			ムービー（MP4）
+		</label>
+	</mimetype>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">
+			ムービー（QuickTime）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			ムービー（Windows Media ASF）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			ムービー（Windows Media WMV）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			ムービー（AVI）
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
index 0bfc9aeb99..a76394703b 100644
--- a/indra/newview/skins/default/xui/ja/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
@@ -1,134 +1,236 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
-  <defaultlabel>（不明）</defaultlabel>
-  <defaultwidget>なし</defaultwidget>
-  <widgetset name="web">
-    <label name="web_label">Webコンテンツ</label>
-    <tooltip name="web_tooltip">この場所には、Webコンテンツが含まれています。</tooltip>
-    <playtip name="web_playtip">Web コンテンツを表示する</playtip>
-  </widgetset>
-  <widgetset name="movie">
-    <label name="movie_label">ムービー</label>
-    <tooltip name="movie_tooltip">この場所には、ムービーがあります。</tooltip>
-    <playtip name="movie_playtip">ムービーを再生する</playtip>
-  </widgetset>
-  <widgetset name="image">
-    <label name="image_label">画像</label>
-    <tooltip name="image_tooltip">この場所には、画像があります</tooltip>
-    <playtip name="image_playtip">この場所の画像を表示する</playtip>
-  </widgetset>
-  <widgetset name="audio">
-    <label name="audio_label">オーディオ</label>
-    <tooltip name="audio_tooltip">この場所には、オーディオがあります。</tooltip>
-    <playtip name="audio_playtip">この場所のオーディオを再生する</playtip>
-  </widgetset>
-  <widgetset name="none">
-    <label name="none_label">コンテンツなし</label>
-    <tooltip name="none_tooltip">この場所には、メディアがありません。</tooltip>
-  </widgetset>
-  <scheme name="rtsp">
-    <label name="rtsp_label">リアルタイム・ストリーミング</label>
-  </scheme>
-  <mimetype name="blank">
-    <label name="blank_label">─なし─</label>
-  </mimetype>
-  <mimetype name="none/none">
-    <label name="none/none_label">─なし─</label>
-  </mimetype>
-  <mimetype name="audio/*">
-    <label name="audio2_label">オーディオ</label>
-  </mimetype>
-  <mimetype name="video/*">
-    <label name="video2_label">ビデオ</label>
-  </mimetype>
-  <mimetype name="image/*">
-    <label name="image2_label">画像</label>
-  </mimetype>
-  <mimetype name="video/vnd.secondlife.qt.legacy">
-    <label name="vnd.secondlife.qt.legacy_label">ムービー（QuickTime）</label>
-  </mimetype>
-  <mimetype name="application/javascript">
-    <label name="application/javascript_label">JavasScript</label>
-  </mimetype>
-  <mimetype name="application/ogg">
-    <label name="application/ogg_label">Oggオーディオ／ビデオ</label>
-  </mimetype>
-  <mimetype name="application/pdf">
-    <label name="application/pdf_label">PDFドキュメント</label>
-  </mimetype>
-  <mimetype name="application/postscript">
-    <label name="application/postscript_label">PostScriptドキュメント</label>
-  </mimetype>
-  <mimetype name="application/rtf">
-    <label name="application/rtf_label">リッチテキスト（RTF）</label>
-  </mimetype>
-  <mimetype name="application/smil">
-    <label name="application/smil_label">同期マルチメディア統合言語（SMIL）</label>
-  </mimetype>
-  <mimetype name="application/xhtml+xml">
-    <label name="application/xhtml+xml_label">Webページ（XHTML）</label>
-  </mimetype>
-  <mimetype name="application/x-director">
-    <label name="application/x-director_label">Macromedia Director</label>
-  </mimetype>
-  <mimetype name="application/octet-stream">
-    <label name="application/octet-stream_label">ストリーム</label>
-  </mimetype>
-  <mimetype name="audio/mid">
-    <label name="audio/mid_label">オーディオ（MIDI）</label>
-  </mimetype>
-  <mimetype name="audio/mpeg">
-    <label name="audio/mpeg_label">オーディオ（MP3）</label>
-  </mimetype>
-  <mimetype name="audio/x-aiff">
-    <label name="audio/x-aiff_label">オーディオ（AIFF）</label>
-  </mimetype>
-  <mimetype name="audio/x-wav">
-    <label name="audio/x-wav_label">オーディオ（WAV）</label>
-  </mimetype>
-  <mimetype name="image/bmp">
-    <label name="image/bmp_label">画像（BMP）</label>
-  </mimetype>
-  <mimetype name="image/gif">
-    <label name="image/gif_label">画像（GIF）</label>
-  </mimetype>
-  <mimetype name="image/jpeg">
-    <label name="image/jpeg_label">画像（JPEG）</label>
-  </mimetype>
-  <mimetype name="image/png">
-    <label name="image/png_label">画像（PNG）</label>
-  </mimetype>
-  <mimetype name="image/svg+xml">
-    <label name="image/svg+xml_label">画像（SVG）</label>
-  </mimetype>
-  <mimetype name="image/tiff">
-    <label name="image/tiff_label">画像（TIFF）</label>
-  </mimetype>
-  <mimetype name="text/html">
-    <label name="text/html_label">Webページ</label>
-  </mimetype>
-  <mimetype name="text/plain">
-    <label name="text/plain_label">テキスト</label>
-  </mimetype>
-  <mimetype name="text/xml">
-    <label name="text/xml_label">XML</label>
-  </mimetype>
-  <mimetype name="video/mpeg">
-    <label name="video/mpeg_label">ムービー（MPEG）</label>
-  </mimetype>
-  <mimetype name="video/mp4">
-    <label name="video/mp4_label">ムービー（MP4）</label>
-  </mimetype>
-  <mimetype name="video/quicktime">
-    <label name="video/quicktime_label">ムービー（QuickTime）</label>
-  </mimetype>
-  <mimetype name="video/x-ms-asf">
-    <label name="video/x-ms-asf_label">ムービー（Windows Media ASF）</label>
-  </mimetype>
-  <mimetype name="video/x-ms-wmv">
-    <label name="video/x-ms-wmv_label">ムービー（Windows Media WMV）</label>
-  </mimetype>
-  <mimetype name="video/x-msvideo">
-    <label name="video/x-msvideo_label">ムービー（AVI）</label>
-  </mimetype>
-</mimetypes>
\ No newline at end of file
+	<defaultlabel>
+		（不明）
+	</defaultlabel>
+	<defaultwidget>
+		なし
+	</defaultwidget>
+	<widgetset name="web">
+		<label name="web_label">
+			Webコンテンツ
+		</label>
+		<tooltip name="web_tooltip">
+			この場所には、Webコンテンツが含まれています。
+		</tooltip>
+		<playtip name="web_playtip">
+			Web コンテンツを表示する
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			ムービー
+		</label>
+		<tooltip name="movie_tooltip">
+			この場所には、ムービーがあります。
+		</tooltip>
+		<playtip name="movie_playtip">
+			ムービーを再生する
+		</playtip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			画像
+		</label>
+		<tooltip name="image_tooltip">
+			この場所には、画像があります
+		</tooltip>
+		<playtip name="image_playtip">
+			この場所の画像を表示する
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			オーディオ
+		</label>
+		<tooltip name="audio_tooltip">
+			この場所には、オーディオがあります。
+		</tooltip>
+		<playtip name="audio_playtip">
+			この場所のオーディオを再生する
+		</playtip>
+	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			コンテンツなし
+		</label>
+		<tooltip name="none_tooltip">
+			この場所には、メディアがありません。
+		</tooltip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			リアルタイム・ストリーミング
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			─なし─
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			─なし─
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			オーディオ
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			ビデオ
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			画像
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			ムービー（QuickTime）
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			JavasScript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Oggオーディオ／ビデオ
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDFドキュメント
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			PostScriptドキュメント
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			リッチテキスト（RTF）
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			同期マルチメディア統合言語（SMIL）
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Webページ（XHTML）
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+	</mimetype>
+	<mimetype name="application/octet-stream">
+		<label name="application/octet-stream_label">
+			ストリーム
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			オーディオ（MIDI）
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			オーディオ（MP3）
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			オーディオ（AIFF）
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			オーディオ（WAV）
+		</label>
+	</mimetype>
+	<mimetype name="image/bmp">
+		<label name="image/bmp_label">
+			画像（BMP）
+		</label>
+	</mimetype>
+	<mimetype name="image/gif">
+		<label name="image/gif_label">
+			画像（GIF）
+		</label>
+	</mimetype>
+	<mimetype name="image/jpeg">
+		<label name="image/jpeg_label">
+			画像（JPEG）
+		</label>
+	</mimetype>
+	<mimetype name="image/png">
+		<label name="image/png_label">
+			画像（PNG）
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			画像（SVG）
+		</label>
+	</mimetype>
+	<mimetype name="image/tiff">
+		<label name="image/tiff_label">
+			画像（TIFF）
+		</label>
+	</mimetype>
+	<mimetype name="text/html">
+		<label name="text/html_label">
+			Webページ
+		</label>
+	</mimetype>
+	<mimetype name="text/plain">
+		<label name="text/plain_label">
+			テキスト
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype name="video/mpeg">
+		<label name="video/mpeg_label">
+			ムービー（MPEG）
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			ムービー（MP4）
+		</label>
+	</mimetype>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">
+			ムービー（QuickTime）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			ムービー（Windows Media ASF）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			ムービー（Windows Media WMV）
+		</label>
+	</mimetype>
+	<mimetype name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			ムービー（AVI）
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 31c54b58e8..123e95df04 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1,1639 +1,2188 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notifications>
-  <global name="skipnexttime">次回からこのメッセージを表示しない</global>
-
-  <global name="skipnexttimesessiononly">次回からこのメッセージを表示しない
-（現セッションで）</global>
-
-  <global name="alwayschoose">常にこのオプションを選択</global>
-
-  <global name="implicitclosebutton">閉じる</global>
-
-  <template name="okbutton">
-    <form>
-      <button name="OK_okbutton" text="$yestext" />
-    </form>
-  </template>
-
-  <template name="okignore">
-    <form>
-      <button name="OK_okignore" text="$yestext" />
-    </form>
-  </template>
-
-  <template name="okcancelbuttons">
-    <form>
-      <button name="OK_okcancelbuttons" text="$yestext" />
-      <button name="Cancel_okcancelbuttons" text="$notext" />
-    </form>
-  </template>
-
-  <template name="okcancelignore">
-    <form>
-      <button name="OK_okcancelignore" text="$yestext" />
-      <button name="Cancel_okcancelignore" text="$notext" />
-    </form>
-  </template>
-
-  <template name="okhelpbuttons">
-    <form>
-      <button name="OK_okhelpbuttons" text="$yestext" />
-      <button name="Help" text="$helptext" />
-    </form>
-  </template>
-
-  <template name="okhelpignore">
-    <form>
-      <button name="OK_okhelpignore" text="$yestext" />
-      <button name="Help_okhelpignore" text="$helptext" />
-    </form>
-  </template>
-
-  <template name="yesnocancelbuttons">
-    <form>
-      <button name="Yes" text="$yestext" />
-      <button name="No" text="$notext" />
-      <button name="Cancel_yesnocancelbuttons" text="$canceltext" />
-    </form>
-  </template>
-
-  <notification functor="GenericAcknowledge" label="不明な通知メッセージ" name="MissingAlert">現在使用中の[APP_NAME]のバージョンでは、受け取った通知メッセージを表示することができません。
+	<global name="skipnexttime">
+		次回からこのメッセージを表示しない
+	</global>
+	<global name="skipnexttimesessiononly">
+		次回からこのメッセージを表示しない
+（現セッションで）
+	</global>
+	<global name="alwayschoose">
+		常にこのオプションを選択
+	</global>
+	<global name="implicitclosebutton">
+		閉じる
+	</global>
+	<template name="okbutton">
+		<form>
+			<button name="OK_okbutton" text="$yestext"/>
+		</form>
+	</template>
+	<template name="okignore">
+		<form>
+			<button name="OK_okignore" text="$yestext"/>
+		</form>
+	</template>
+	<template name="okcancelbuttons">
+		<form>
+			<button name="OK_okcancelbuttons" text="$yestext"/>
+			<button name="Cancel_okcancelbuttons" text="$notext"/>
+		</form>
+	</template>
+	<template name="okcancelignore">
+		<form>
+			<button name="OK_okcancelignore" text="$yestext"/>
+			<button name="Cancel_okcancelignore" text="$notext"/>
+		</form>
+	</template>
+	<template name="okhelpbuttons">
+		<form>
+			<button name="OK_okhelpbuttons" text="$yestext"/>
+			<button name="Help" text="$helptext"/>
+		</form>
+	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
+	<template name="yesnocancelbuttons">
+		<form>
+			<button name="Yes" text="$yestext"/>
+			<button name="No" text="$notext"/>
+			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
+		</form>
+	</template>
+	<notification functor="GenericAcknowledge" label="不明な通知メッセージ" name="MissingAlert">現在使用中の[APP_NAME]のバージョンでは、受け取った通知メッセージを表示することができません。
 最新のビューアーがインストールされている事をご確認ください。
 
 エラー詳細：「 [_NAME] 」という通知メッセージは、notifications.xmlに定義されていませんでした。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="FloaterNotFound">フローターエラー：以下のコントロールが見つかりませんでした：
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="FloaterNotFound">フローターエラー：以下のコントロールが見つかりませんでした：
 
 [CONTROLS]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="TutorialNotFound">現在利用可能なチュートリアルはありません。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GenericAlert">[MESSAGE]</notification>
-
-  <notification name="GenericAlertYesCancel">[MESSAGE]
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
-  </notification>
-
-  <notification name="GenericAlertOK">[MESSAGE]
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BadInstallation">[APP_NAME]のアップデート中にエラーが発生しました。[http://get.secondlife.com 最新バージョンのビューアーをダウンロード]してください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="LoginFailedNoNetwork">[SECOND_LIFE_GRID]に接続できませんでした。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="TutorialNotFound">現在利用可能なチュートリアルはありません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GenericAlert">
+		[MESSAGE]
+	</notification>
+	<notification name="GenericAlertYesCancel">[MESSAGE]
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
+	</notification>
+	<notification name="GenericAlertOK">[MESSAGE]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BadInstallation">[APP_NAME]のアップデート中にエラーが発生しました。[http://get.secondlife.com 最新バージョンのビューアーをダウンロード]してください。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="LoginFailedNoNetwork">[SECOND_LIFE_GRID]に接続できませんでした。
 [DIAGNOSTIC]
 
 インターネット接続が正常かご確認ください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="LoginFailedToParse">ビューアがサーバーから不正な形式の応答を受け取りました。インターネット接続が正常に機能していることを確認してから、後でもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="LoginFailedToParse">ビューアがサーバーから不正な形式の応答を受け取りました。インターネット接続が正常に機能していることを確認してから、後でもう一度お試しください。
 
 これが誤りだと思われる場合は、サポートにお問い合わせください。
-    <tag>fail</tag>
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MessageTemplateNotFound">メッセージテンプレート[PATH]がありませんでした。
     <usetemplate name="okbutton" yestext="ＯＫ"/>
-  </notification>
-
-  <notification name="MessageTemplateNotFound">メッセージテンプレート[PATH]がありませんでした。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="WearableSave">現在の服装／身体部位の変更を保存しますか？
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
-  </notification>
-
-  <notification name="ConfirmNoCopyToOutbox">これらのアイテムの１つ以上を販売用の送信トレイにコピーする権限がありません。移動したり残したままにすることはできます。
-    <usetemplate name="okcancelbuttons" notext="アイテムを販売ボックスに移動できなかった" yestext="アイテムを移動" />
-  </notification>
-
-  <notification name="OutboxFolderCreated">販売ボックスの最上位に転送した各アイテムにつき、それぞれ１つの新しいフォルダが作成されました。
-    <unique />
-    <usetemplate ignoretext="販売ボックス内に新しいフォルダを作成した" name="okignore" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="OutboxImportComplete">成功しました。
+		<tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="WearableSave">現在の服装／身体部位の変更を保存しますか？
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
+	</notification>
+	<notification name="ConfirmNoCopyToOutbox">これらのアイテムの１つ以上を販売用の送信トレイにコピーする権限がありません。移動したり残したままにすることはできます。
+    <usetemplate name="okcancelbuttons" notext="アイテムを販売ボックスに移動できなかった" yestext="アイテムを移動"/>
+	</notification>
+	<notification name="OutboxFolderCreated">販売ボックスの最上位に転送した各アイテムにつき、それぞれ１つの新しいフォルダが作成されました。
+    <unique/>
+		<usetemplate ignoretext="販売ボックス内に新しいフォルダを作成した" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OutboxImportComplete">成功しました。
 
 すべてのフォルダが、マーケットプレイスに正常に送信されました。
-    <usetemplate ignoretext="マーケットプレイスへフォルダの送信に成功した" name="okignore" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="OutboxImportHadErrors">一部のフォルダは送信できていません。
+    <usetemplate ignoretext="マーケットプレイスへフォルダの送信に成功した" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OutboxImportHadErrors">一部のフォルダは送信できていません。
 
 一部のフォルダが、マーケットプレイスに送信されるときにエラーが発生しました。これらのフォルダは、販売者の送信トレイにまだ残っています。
 
 詳細につきましては、[[MARKETPLACE_IMPORTS_URL] エラーログ]をご確認ください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="OutboxImportFailed">以下のエラーで転送できませんでした：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OutboxImportFailed">以下のエラーで転送できませんでした：[ERROR_CODE]
 
 システムまたはネットワークのエラーのため、フォルダはマーケットプレイスに送信されませんでした。お手数ですが、後でもう一度やり直してください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="OutboxInitFailed">以下のエラーでマーケットプレイスを初期化できませんでした：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OutboxInitFailed">以下のエラーでマーケットプレイスを初期化できませんでした：[ERROR_CODE]
 
 システムまたはネットワークのエラーのため、マーケットプレイスの初期化に失敗しました。お手数ですが、後でもう一度やり直してください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="StockPasteFailed">在庫フォルダへのコピーまたは移動がエラーにより失敗しました：[ERROR_CODE]
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="MerchantPasteFailed">マーケットプレイスのリストへのコピーまたは移動が以下のエラーにより失敗しました：[ERROR_CODE]
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="MerchantTransactionFailed">マーケットプレイスによる取引が以下のエラーにより失敗しました：[ERROR_REASON]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="StockPasteFailed">在庫フォルダへのコピーまたは移動がエラーにより失敗しました：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MerchantPasteFailed">マーケットプレイスのリストへのコピーまたは移動が以下のエラーにより失敗しました：[ERROR_CODE]
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MerchantTransactionFailed">マーケットプレイスによる取引が以下のエラーにより失敗しました：[ERROR_REASON]
 [ERROR_DESCRIPTION]
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="MerchantUnprocessableEntity">この商品をリストに表示できないか、バージョンフォルダを有効にできません。通常、これはリスト説明フォームに情報が不足しているために起こりますが、フォルダ構造のエラーが原因の場合もあります。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MerchantUnprocessableEntity">この商品をリストに表示できないか、バージョンフォルダを有効にできません。通常、これはリスト説明フォームに情報が不足しているために起こりますが、フォルダ構造のエラーが原因の場合もあります。
 リストを編集するか、リストフォルダにエラーがないか確認してください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="MerchantListingFailed">マーケットプレイスへのリスト表示が次のエラーで失敗しました：
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MerchantListingFailed">マーケットプレイスへのリスト表示が次のエラーで失敗しました：
 '[ERROR_CODE]'
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="MerchantFolderActivationFailed">このバージョンフォルダの有効化が次のエラーにより失敗しました：
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MerchantFolderActivationFailed">このバージョンフォルダの有効化が次のエラーにより失敗しました：
 '[ERROR_CODE]'
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="MerchantForceValidateListing">リストを作成するために、リストするコンテンツの階層を固定しました。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmMerchantActiveChange">この操作により、このリストの有効な内容が変更されます。続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmMerchantMoveInventory">マーケットプレイスのリストウィンドウにドラッグしたアイテムは、元の場所からコピーされるのではなく移動となります。続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="アイテムをインベントリからマーケットプレイスに移動する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmListingCutOrDelete">リストフォルダを移動または削除すると、マーケットプレイスのリストが削除されます。マーケットプレイスのリストを維持する場合は、変更するバージョンフォルダの中身を移動または削除してください。続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="マーケットプレイスからリストを移動または削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmCopyToMarketplace">これらのアイテムの１つまたは複数をマーケットプレイスにコピーする権限がありません。移動するか、残したままにすることはできます。
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" ignoretext="マーケットプレイスへコピーする際に、コピー不可のアイテムが選択内容に含まれている場合の確認" name="yesnocancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動" />
-  </notification>
-  <notification name="ConfirmMerchantUnlist">この操作により、このリストが削除されます。続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="マーケットプレイスで有効なリストを削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmMerchantClearVersion">この操作により、現在のリストのバージョンフォルダが無効になります。続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="マーケットプレイスでリストのバージョンフォルダを無効にする前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="AlertMerchantListingNotUpdated">このリストをアップデートできませんでした。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MerchantForceValidateListing">リストを作成するために、リストするコンテンツの階層を固定しました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmMerchantActiveChange">この操作により、このリストの有効な内容が変更されます。続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmMerchantMoveInventory">マーケットプレイスのリストウィンドウにドラッグしたアイテムは、元の場所からコピーされるのではなく移動となります。続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="アイテムをインベントリからマーケットプレイスに移動する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmListingCutOrDelete">リストフォルダを移動または削除すると、マーケットプレイスのリストが削除されます。マーケットプレイスのリストを維持する場合は、変更するバージョンフォルダの中身を移動または削除してください。続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="マーケットプレイスからリストを移動または削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmCopyToMarketplace">これらのアイテムの１つまたは複数をマーケットプレイスにコピーする権限がありません。移動するか、残したままにすることはできます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" ignoretext="マーケットプレイスへコピーする際に、コピー不可のアイテムが選択内容に含まれている場合の確認" name="yesnocancelbuttons" notext="アイテムを移動しない" yestext="アイテムを移動"/>
+	</notification>
+	<notification name="ConfirmMerchantUnlist">この操作により、このリストが削除されます。続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="マーケットプレイスで有効なリストを削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmMerchantClearVersion">この操作により、現在のリストのバージョンフォルダが無効になります。続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="マーケットプレイスでリストのバージョンフォルダを無効にする前に確認する" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AlertMerchantListingNotUpdated">このリストをアップデートできませんでした。
 [[URL] ここをクリック]してマーケットプレイスで編集します。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="AlertMerchantListingCannotWear">マーケットプレイスのリストフォルダにある衣服装やボディパーツを着用できません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="AlertMerchantListingInvalidID">リストIDが無効です。
-    <tag>fail</tag>
-  </notification>
-  <notification name="AlertMerchantListingActivateRequired">このリストには複数のバージョンフォルダがあるか、バージョンフォルダがありません。後で、単独でバージョンフォルダを選択して有効にする必要があります。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="複数のバージョンフォルダのあるリストを作成するときに、バージョンフォルダの有効化に関する警告を表示" name="okignore" yestext="ＯＫ" />
-  </notification>
-  <notification name="AlertMerchantStockFolderSplit">各種の在庫品目を別々の在庫フォルダに分けたため、フォルダはリストに表示できるように配置されています。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="商品リストで在庫フォルダを分割する際に警告を表示" name="okignore" yestext="ＯＫ" />
-  </notification>
-  <notification name="AlertMerchantStockFolderEmpty">在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="商品リストで在庫フォルダが空だったときに警告を表示" name="okignore" yestext="ＯＫ" />
-  </notification>
-  <notification name="AlertMerchantVersionFolderEmpty">バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="商品リストでバージョンフォルダが空で表示されないときに警告を表示" name="okignore" yestext="ＯＫ" />
-  </notification>
-  <notification name="WriteAnimationFail">アニメーションデータの書き込みに問題があります。後でもう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="UploadAuctionSnapshotFail">以下の理由で、オークションのスナップショットのアップロード時に問題が起こりました：[REASON]
-    <tag>fail</tag>
-  </notification>
-  <notification name="UnableToViewContentsMoreThanOne">一度に複数のアイテムの中身を表示できません。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AlertMerchantListingCannotWear">マーケットプレイスのリストフォルダにある衣服装やボディパーツを着用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AlertMerchantListingInvalidID">リストIDが無効です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AlertMerchantListingActivateRequired">このリストには複数のバージョンフォルダがあるか、バージョンフォルダがありません。後で、単独でバージョンフォルダを選択して有効にする必要があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="複数のバージョンフォルダのあるリストを作成するときに、バージョンフォルダの有効化に関する警告を表示" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AlertMerchantStockFolderSplit">各種の在庫品目を別々の在庫フォルダに分けたため、フォルダはリストに表示できるように配置されています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="商品リストで在庫フォルダを分割する際に警告を表示" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AlertMerchantStockFolderEmpty">在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="商品リストで在庫フォルダが空だったときに警告を表示" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="商品リストでバージョンフォルダが空で表示されないときに警告を表示" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="WriteAnimationFail">アニメーションデータの書き込みに問題があります。後でもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UploadAuctionSnapshotFail">以下の理由で、オークションのスナップショットのアップロード時に問題が起こりました：[REASON]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToViewContentsMoreThanOne">一度に複数のアイテムの中身を表示できません。
 アイテムを１つだけ選択して、もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="SaveClothingBodyChanges">服装、身体部位に対する変更をすべて保存しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存" />
-  </notification>
-  <notification name="FriendsAndGroupsOnly">フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="FavoritesOnLogin">注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="AllowMultipleViewers">Second Lifeビューアーの多重起動はサポートされていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SaveClothingBodyChanges">服装、身体部位に対する変更をすべて保存しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存"/>
+	</notification>
+	<notification name="FriendsAndGroupsOnly">フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="FavoritesOnLogin">注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AllowMultipleViewers">Second Lifeビューアーの多重起動はサポートされていません。
 テクスチャキャッシュの競合による破損や、およびビジュアルとパフォーマンスの低下につながる恐れがあります。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="GrantModifyRights">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GrantModifyRights">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。
 [NAME]に修正権限を与えますか？
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="GrantModifyRightsMultiple">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更することができます。
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="GrantModifyRightsMultiple">他人に修正権限を与えると、権限を与えられた人はあなたが所有する、インワールドのオブジェクトを変更することができます。
 この権限を与える際には十分に注意してください。選択した住人に修正権限を与えますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="RevokeModifyRights">[NAME]の修正権限を解除しますか？ 
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="RevokeModifyRightsMultiple">選択した住人から変更権限を取り下げますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="GroupNameLengthWarning">グループ名は[MIN_LEN]～[MAX_LEN]文字である必要があります。
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="UnableToCreateGroup">グループを作成できません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="RevokeModifyRights">[NAME]の修正権限を解除しますか？ 
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="RevokeModifyRightsMultiple">選択した住人から変更権限を取り下げますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="GroupNameLengthWarning">グループ名は[MIN_LEN]～[MAX_LEN]文字である必要があります。
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="UnableToCreateGroup">グループを作成できません。
 [MESSAGE] 
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="PanelGroupApply">[NEEDS_APPLY_MESSAGE]
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PanelGroupApply">[NEEDS_APPLY_MESSAGE]
 [WANT_APPLY_MESSAGE]
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="変更を無視" yestext="変更を適用" />
-  </notification>
-  <notification name="MustSpecifyGroupNoticeSubject">グループ通知の送信には、件名の記入が必要です。
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="AddGroupOwnerWarning">あなたは、[ROLE_NAME]の役割にメンバーを与えようとしています。任命されたメンバーが自ら退任しない限り、 役柄から削除できません。
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="変更を無視" yestext="変更を適用"/>
+	</notification>
+	<notification name="MustSpecifyGroupNoticeSubject">グループ通知の送信には、件名の記入が必要です。
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AddGroupOwnerWarning">あなたは、[ROLE_NAME]の役割にメンバーを与えようとしています。任命されたメンバーが自ら退任しない限り、 役柄から削除できません。
 操作を続行しますか？
-    <usetemplate ignoretext="グループオーナーを新しく追加する前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="AssignDangerousActionWarning">あなたは[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
+    <usetemplate ignoretext="グループオーナーを新しく追加する前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="AssignDangerousActionWarning">あなたは[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
 
 *警告*
 この能力を持つ役割のメンバーは、 自分と他のメンバーに現在より強力な権限を割り当て、 自分をオーナーとほぼ同様の立場に任命することもできるようになります。
 この行為の意味をよく理解してから実行してください。
 この能力を [ROLE_NAME] に割り当てますか？
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="AssignDangerousAbilityWarning">あなたは、[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="AssignDangerousAbilityWarning">あなたは、[ROLE_NAME]に[ACTION_NAME]の能力を与えようとしています。
 
 *警告*
 この能力をもつ役割のメンバーは、自分と他のメンバーにすべての能力を割り当て、自分をオーナーとほぼ同様の立場に任命できます。
 この能力を[ROLE_NAME] に割り当てますか？
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="AssignBanAbilityWarning">役割「[ROLE_NAME]」に能力「[ACTION_NAME]」を追加しようとしています。
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="AssignBanAbilityWarning">役割「[ROLE_NAME]」に能力「[ACTION_NAME]」を追加しようとしています。
 
 *警告*
 この能力を持つ役割のメンバーにも能力「[ACTION_NAME_2]」と「[ACTION_NAME_3]」が許可されます。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="RemoveBanAbilityWarning">役割「[ROLE_NAME]」から能力「[ACTION_NAME]」を削除しようとしています。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RemoveBanAbilityWarning">役割「[ROLE_NAME]」から能力「[ACTION_NAME]」を削除しようとしています。
 
 *警告*
 この能力を削除しても能力「[ACTION_NAME_2]」と「[ACTION_NAME_3]」は削除されません。
 これらの能力をこの役割に許可しない場合は、すぐに削除してください!
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="EjectGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放" />
-  </notification>
-  <notification name="EjectGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放" />
-  </notification>
-  <notification name="BanGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止" />
-  </notification>
-  <notification name="BanGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止" />
-  </notification>
-  <notification name="GroupBanUserOnBanlist">一部の住人がグループから追放されたため、招待状が送られませんでした。</notification>
-  <notification name="AttachmentDrop">装着物を下に置こうとしています。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="EjectGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="追放"/>
+	</notification>
+	<notification name="BanGroupMemberWarning">[AVATAR_NAME]をグループから追放しようとしています。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">[COUNT]名のメンバーをグループから追放しようとしています。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="キャンセル" yestext="禁止"/>
+	</notification>
+	<notification name="GroupBanUserOnBanlist">
+		一部の住人がグループから追放されたため、招待状が送られませんでした。
+	</notification>
+	<notification name="AttachmentDrop">装着物を下に置こうとしています。
 このまま続けてもよろしいですか？
-    <usetemplate ignoretext="装着物を下に落とす前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="JoinGroupCanAfford">このグループに参加するには、L$ [COST]かかります。
+    <usetemplate ignoretext="装着物を下に落とす前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="JoinGroupCanAfford">このグループに参加するには、L$ [COST]かかります。
 このまま続けてもよろしいですか？
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <tag>group</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加" />
-  </notification>
-  <notification name="JoinGroupNoCost">「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」というグループに入ろうとしています。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<tag>
+			group
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加"/>
+	</notification>
+	<notification name="JoinGroupNoCost">「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」というグループに入ろうとしています。
 このまま続けてもよろしいですか？
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加" />
-  </notification>
-  <notification name="JoinGroupCannotAfford">このグループに加入するには、L$ [COST]必要です。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加"/>
+	</notification>
+	<notification name="JoinGroupCannotAfford">このグループに加入するには、L$ [COST]必要です。
 L$が不足しているので、このグループに参加することができません。
-    <tag>group</tag>
-    <tag>fail</tag>
-    <tag>funds</tag>
-  </notification>
-  <notification name="CreateGroupCost">このグループ作成にかかる費用：L$ [COST]
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="CreateGroupCost">このグループ作成にかかる費用：L$ [COST]
 一人ではグループにならないので、永久に削除されてしまいます。
 ４８時間以内にメンバーを勧誘し、入会してもらってください。
-    <tag>group</tag>
-    <tag>funds</tag>
-    <usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成" />
-  </notification>
-  <notification name="JoinGroupInaccessible">あなたはグループに参加することはできません。
-    <tag>group_id</tag>
-    <tag>success</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="JoinGroupError">グループ参加リクエスト中にエラーが発生しました。
-    <tag>group_id</tag>
-    <tag>success</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="JoinGroupErrorReason">以下のグループに参加できませんでした：[reason]
-    <tag>group_id</tag>
-    <tag>success</tag>
-    <tag>reason</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="JoinGroupTrialUser">申し訳ありませんが、トライアルユーザーはグループに参加できません。
-    <tag>group_id</tag>
-    <tag>success</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="JoinGroupMaxGroups">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
+    <tag>
+			group
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成"/>
+	</notification>
+	<notification name="JoinGroupInaccessible">あなたはグループに参加することはできません。
+    <tag>
+			group_id
+		</tag>
+		<tag>
+			success
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinGroupError">グループ参加リクエスト中にエラーが発生しました。
+    <tag>
+			group_id
+		</tag>
+		<tag>
+			success
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinGroupErrorReason">以下のグループに参加できませんでした：[reason]
+    <tag>
+			group_id
+		</tag>
+		<tag>
+			success
+		</tag>
+		<tag>
+			reason
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinGroupTrialUser">申し訳ありませんが、トライアルユーザーはグループに参加できません。
+    <tag>
+			group_id
+		</tag>
+		<tag>
+			success
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinGroupMaxGroups">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
 既に[group_count]個のグループのメンバーになっています。参加できるのは最大[max_groups]グループまでです。
-    <tag>success</tag>
-    <tag>group_id</tag>
-    <tag>group_name</tag>
-    <tag>group_count</tag>
-    <tag>max_groups</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="JoinGroupClosedEnrollment">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
+    <tag>
+			success
+		</tag>
+		<tag>
+			group_id
+		</tag>
+		<tag>
+			group_name
+		</tag>
+		<tag>
+			group_count
+		</tag>
+		<tag>
+			max_groups
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinGroupClosedEnrollment">「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません：
 このグループは現在、参加が制限されています。
-    <tag>group_id</tag>
-    <tag>success</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="JoinGroupSuccess">このユーザーグループに入会しました。
-    <tag>group_id</tag>
-    <tag>success</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="JoinGroupInsufficientFunds">会員料金として必要なL$ [membership_fee]を送金することができません。
-    <tag>group_id</tag>
-    <tag>success</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="LandBuyPass">この区画（[PARCEL_NAME]）は、L$ [COST]で[TIME]時間入ることができます。入場許可証を購入しますか？
-    <tag>fail</tag>
-    <tag>funds</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="SalePriceRestriction">不特定の人に売却する場合には、売却価格はL$ 0以上に設定する必要があります。
+    <tag>
+			group_id
+		</tag>
+		<tag>
+			success
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinGroupSuccess">このユーザーグループに入会しました。
+    <tag>
+			group_id
+		</tag>
+		<tag>
+			success
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinGroupInsufficientFunds">会員料金として必要なL$ [membership_fee]を送金することができません。
+    <tag>
+			group_id
+		</tag>
+		<tag>
+			success
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="LandBuyPass">この区画（[PARCEL_NAME]）は、L$ [COST]で[TIME]時間入ることができます。入場許可証を購入しますか？
+    <tag>
+			fail
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SalePriceRestriction">不特定の人に売却する場合には、売却価格はL$ 0以上に設定する必要があります。
 売却価格をL$ 0に設定する場合は、売却する個人を選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="ConfirmLandSaleChange">選択した[LAND_SIZE]㎡の土地は、売り出し中に設定されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ConfirmLandSaleChange">選択した[LAND_SIZE]㎡の土地は、売り出し中に設定されています。
 売却価格L$ [SALE_PRICE]で、[NAME]に売却を認可します。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmLandSaleToAnyoneChange">注意：「誰にでも販売」をクリックすることで、あなたの土地はこのリージョンにいる人に限らず、[SECOND_LIFE]コミュニティ全体で利用可能となります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmLandSaleToAnyoneChange">注意：「誰にでも販売」をクリックすることで、あなたの土地はこのリージョンにいる人に限らず、[SECOND_LIFE]コミュニティ全体で利用可能となります。
 選択した[LAND_SIZE]㎡の土地は、販売対象に設定されました。
 販売価格L$ [SALE_PRICE]で、[NAME]が販売対象者となります。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ReturnObjectsDeededToGroup">グループ「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」と共有するこのにある区画のすべてのオブジェクトを前のオーナーのインベントリに返却しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ReturnObjectsDeededToGroup">グループ「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」と共有するこのにある区画のすべてのオブジェクトを前のオーナーのインベントリに返却しますか？
 *警告*
 この操作をすると、グループに譲渡された譲渡禁止のオブジェクトを削除することになります。
 オブジェクト：[N]
-    <tag>confirm</tag>
-    <tag>group</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ReturnObjectsOwnedByUser">この区画で、住人[NAME]が所有する全てのオブジェクトを本人のインベントリに本当に返却してもよいですか？
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			group
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ReturnObjectsOwnedByUser">この区画で、住人[NAME]が所有する全てのオブジェクトを本人のインベントリに本当に返却してもよいですか？
 オブジェクト：[N]
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ReturnObjectsOwnedBySelf">この土地区画内にある、あなたが所有するすべてのオブジェクトを、あなたのインベントリに戻そうとしています。このまま続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ReturnObjectsOwnedBySelf">この土地区画内にある、あなたが所有するすべてのオブジェクトを、あなたのインベントリに戻そうとしています。このまま続けてもよろしいですか？
 オブジェクト：[N]
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ReturnObjectsNotOwnedBySelf">この土地区画内にある、あなた以外が所有するすべてのオブジェクトを、それぞれの所有者のインベントリに戻そうとしています。このまま操作を続行してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedBySelf">この土地区画内にある、あなた以外が所有するすべてのオブジェクトを、それぞれの所有者のインベントリに戻そうとしています。このまま操作を続行してもよろしいですか？
 グループに譲渡された「再販・譲渡可」のオブジェクトは、以前の所有者に返却されます。
 
 *警告*
 
 これにより、グループに譲渡された「再販・譲渡不可」のオブジェクトは削除されます！
 オブジェクト：[N]
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ReturnObjectsNotOwnedByUser">この土地区画内にある、[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者のインベントリに返却しようとしています。このまま操作を続行してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedByUser">この土地区画内にある、[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者のインベントリに返却しようとしています。このまま操作を続行してもよろしいですか？
 グループに譲渡された「再販・譲渡可」のオブジェクトは、以前の所有者に返却されます。
 
 *警告*
 
 これにより、グループに譲渡された「再販・譲渡不可」のオブジェクトは削除されます！ 
 オブジェクト：[N]
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ReturnAllTopObjects">リストされた全てのオブジェクトを所有者のインベントリに戻しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ReturnAllTopObjects">リストされた全てのオブジェクトを所有者のインベントリに戻しますか？
 これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります！
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="DisableAllTopObjects">このリージョン（地域）内のすべてのオブジェクトを無効にしようとしています。このまま操作を続行してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ReturnObjectsNotOwnedByGroup">グループ &lt;nolink&gt;[NAME]&lt;/nolink&gt;と共有されていない、この区画にあるオブジェクトを前のオーナーに返却しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DisableAllTopObjects">このリージョン（地域）内のすべてのオブジェクトを無効にしようとしています。このまま操作を続行してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedByGroup">グループ &lt;nolink&gt;[NAME]&lt;/nolink&gt;と共有されていない、この区画にあるオブジェクトを前のオーナーに返却しますか？
 オブジェクト：[N] 
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="UnableToDisableOutsideScripts">スクリプトを無効にできません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="UnableToDisableOutsideScripts">スクリプトを無効にできません。
 このリージョン（地域）全体が「ダメージ有効」に設定されています。
 武器を使用するには、スクリプトの実行を許可する必要があります。
-    <tag>fail</tag>
-  </notification>
-  <notification name="MultipleFacesSelected">現在複数の面が選択されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MultipleFacesSelected">現在複数の面が選択されています。
 このまま続けた場合、メディアの別々のインスタンスがオブジェクトの複数の面に設定されます。
 メディアを１つの面だけに取り付けるには、「面を選択」を選んでオブジェクトの希望する面をクリック、それから「追加」をクリックしてください。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="メディアが選択した複数の面にセットされるとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="MustBeInParcel">着地点を設定するには、この区画の内側に立ってください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="PromptRecipientEmail">受信者の有効なメールアドレスを入力してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="PromptSelfEmail">あなたのメールアドレスを入力してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="PromptMissingSubjMsg">デフォルトの件名またはメッセージを付けて、スナップショットを送信しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ErrorProcessingSnapshot">スナップショットデータの処理エラー
-    <tag>fail</tag>
-  </notification>
-  <notification name="ErrorEncodingSnapshot">スナップショットのエンコードエラー
-    <tag>fail</tag>
-  </notification>
-  <notification name="ErrorCannotAffordUpload">このアイテムをアップロードするには、L$ [COST]が必要です。
-    <tag>fail</tag>
-  </notification>
-  <notification name="ErrorPhotoCannotAfford">インベントリに写真を保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
-    <tag>fail</tag>
-  </notification>
-  <notification name="ErrorTextureCannotAfford">インベントリにテクスチャを保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
-    <tag>fail</tag>
-  </notification>
-  <notification name="ErrorUploadingPostcard">以下の理由でスナップショットの送信時に問題が起こりました：[REASON]
-    <tag>fail</tag>
-  </notification>
-  <notification name="ErrorUploadingReportScreenshot">以下の理由で、レポートのスクリーンショットのアップロード時に問題が起こりました：[REASON]
-    <tag>fail</tag>
-  </notification>
-  <notification name="MustAgreeToLogIn">[SECOND_LIFE]へのログインを続けるには、Second Lifeの利用規約、プライバシーポリシー、およびサービス規約に同意する必要があります。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CouldNotPutOnOutfit">アウトフィットを装着できません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="メディアが選択した複数の面にセットされるとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MustBeInParcel">着地点を設定するには、この区画の内側に立ってください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PromptRecipientEmail">受信者の有効なメールアドレスを入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PromptSelfEmail">あなたのメールアドレスを入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PromptMissingSubjMsg">デフォルトの件名またはメッセージを付けて、スナップショットを送信しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ErrorProcessingSnapshot">スナップショットデータの処理エラー
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorEncodingSnapshot">スナップショットのエンコードエラー
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorCannotAffordUpload">このアイテムをアップロードするには、L$ [COST]が必要です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorPhotoCannotAfford">インベントリに写真を保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorTextureCannotAfford">インベントリにテクスチャを保存するには、L$ [COST]が必要です。L$を購入するか、代わりに写真をコンピュータに保存できます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorUploadingPostcard">以下の理由でスナップショットの送信時に問題が起こりました：[REASON]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorUploadingReportScreenshot">以下の理由で、レポートのスクリーンショットのアップロード時に問題が起こりました：[REASON]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MustAgreeToLogIn">[SECOND_LIFE]へのログインを続けるには、Second Lifeの利用規約、プライバシーポリシー、およびサービス規約に同意する必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CouldNotPutOnOutfit">アウトフィットを装着できません。
 アウトフィットフォルダに服装、身体部位、装着物がありません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotWearTrash">ごみ箱にある服装や身体部位は、着用できません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="MaxAttachmentsOnOutfit">オブジェクトを装着できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotWearTrash">ごみ箱にある服装や身体部位は、着用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MaxAttachmentsOnOutfit">オブジェクトを装着できませんでした。
 最大装着数[MAX_ATTACHMENTS]個を越えています。どれか取り外してからお試しください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotWearInfoNotComplete">まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="MustEnterPasswordToLogIn">ログインするためにパスワードを入力してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="MustHaveAccountToLogIn">おっと、記入漏れがあります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotWearInfoNotComplete">まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MustEnterPasswordToLogIn">ログインするためにパスワードを入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MustHaveAccountToLogIn">おっと、記入漏れがあります。
 アバターのユーザー名を入力してください。
 
 [SECOND_LIFE]に入るにはアカウントが必要です。今すぐアカウントを作成しますか？
-    <tag>confirm</tag>
-    <url name="url">[create_account_url]</url>
-    <usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成" />
-  </notification>
-  <notification name="InvalidCredentialFormat">ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。
-    <tag>fail</tag>
-  </notification>
-  <notification name="InvalidGrid">「[GRID]」は、有効なグリッドIDではありません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="InvalidLocationSLURL">ログイン位置で有効なグリッドが指定されませんでした。
-    <tag>fail</tag>
-  </notification>
-  <notification name="DeleteClassified">クラシファイド広告『[NAME]』を削除してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<url name="url">
+			[create_account_url]
+		</url>
+		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
+	</notification>
+	<notification name="InvalidCredentialFormat">ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InvalidGrid">「[GRID]」は、有効なグリッドIDではありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InvalidLocationSLURL">ログイン位置で有効なグリッドが指定されませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DeleteClassified">クラシファイド広告『[NAME]』を削除してもよろしいですか？
 支払い済みの料金は返金されません。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="DeleteMedia">この顔に紐づけられたメディアの削除を選択しました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DeleteMedia">この顔に紐づけられたメディアの削除を選択しました。
 続行してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="オブジェクトからメディアを削除する前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="ClassifiedSave">クラシファイド広告[NAME]への変更を保存しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
-  </notification>
-  <notification name="ClassifiedInsufficientFunds">クラシファイド広告を出すには、資金が足りません。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ProfileDeleteClassified">クラシファイド広告&lt;nolink&gt;[CLASSIFIED]&lt;/nolink&gt;を削除してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ProfileDeletePick">ピック&lt;nolink&gt;[PICK]&lt;/nolink&gt;を削除してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ProfileUnpublishedClassified">未公開のクラシファイド広告があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="オブジェクトからメディアを削除する前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="ClassifiedSave">クラシファイド広告[NAME]への変更を保存しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
+	</notification>
+	<notification name="ClassifiedInsufficientFunds">クラシファイド広告を出すには、資金が足りません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ProfileDeleteClassified">クラシファイド広告&lt;nolink&gt;[CLASSIFIED]&lt;/nolink&gt;を削除してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ProfileDeletePick">ピック&lt;nolink&gt;[PICK]&lt;/nolink&gt;を削除してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ProfileUnpublishedClassified">未公開のクラシファイド広告があります。
 ウィンドウを閉じると変更が失われます。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ProfileUnsavedChanges">保存されていない変更があります。
-    <tag>confirm</tag>
-    <tag>save</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="破棄" yestext="保存" />
-  </notification>
-  <notification name="DeleteAvatarPick">「&lt;nolink&gt;[PICK]&lt;/nolink&gt;」を削除してもよろしいですか？
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="DeleteOutfits">このアウトフィットを削除してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="PromptGoToEventsPage">[SECOND_LIFE]イベントWebページに移動しますか？
-    <url name="url">https://secondlife.com/my/community/events/?lang=ja-JP</url>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="SelectProposalToView">表示する提案を選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="SelectHistoryItemToView">表示する履歴アイテムを選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <!--
-  <notification name="ResetShowNextTimeDialogs">Would you like to re-enable all these popups, which you previously indicated &apos;Don&apos;t show me again&apos;?
-    <usetemplate name="okcancelbuttons" notext="Cancel" yestext="ＯＫ"/>
-  </notification>
-  <notification name="SkipShowNextTimeDialogs">Would you like to disable all popups which can be skipped?
-    <usetemplate name="okcancelbuttons" notext="Cancel" yestext="ＯＫ"/>
-  </notification>
-  -->
-
-  <notification name="CacheWillClear">キャッシュは、[APP_NAME]再起動後にクリアされます。</notification>
-  <notification name="CacheWillBeMoved">キャッシュは、[APP_NAME]再起動後が移動されます。
-注意：キャッシュがクリアされます。</notification>
-  <notification name="ChangeConnectionPort">ポートの設定は、[APP_NAME]再起動後に反映されます。</notification>
-  <notification name="ChangeDeferredDebugSetting">デバッグ設定の変更は、[APP_NAME]再起動後に反映されます。</notification>
-  <notification name="ChangeSkin">新しいスキンは、[APP_NAME]再起動後に表示されます。</notification>
-  <notification name="ChangeLanguage">言語の変更は、[APP_NAME]再起動後に反映されます。</notification>
-  <notification name="GoToAuctionPage">[SECOND_LIFE]のWebページに移動し、入札あるいはオークションの詳細を確認しますか？
-    <tag>confirm</tag>
-    <url name="url">http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]&amp;lang=ja-JP</url>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="SaveChanges">変更を保存しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存" />
-  </notification>
-  <notification name="DeleteNotecard">このノートカードを削除してもよろしいですか？
-    <unique />
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="LoadPreviousReportScreenshot">以前のスクリーンショットをレポートに使用しますか？
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="GestureSaveFailedTooManySteps">ジェスチャーの保存に失敗しました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ProfileUnsavedChanges">保存されていない変更があります。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			save
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="破棄" yestext="保存"/>
+	</notification>
+	<notification name="DeleteAvatarPick">「&lt;nolink&gt;[PICK]&lt;/nolink&gt;」を削除してもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DeleteOutfits">このアウトフィットを削除してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PromptGoToEventsPage">[SECOND_LIFE]イベントWebページに移動しますか？
+    <url name="url">
+			https://secondlife.com/my/community/events/?lang=ja-JP
+		</url>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SelectProposalToView">表示する提案を選択してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SelectHistoryItemToView">表示する履歴アイテムを選択してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CacheWillClear">
+		キャッシュは、[APP_NAME]再起動後にクリアされます。
+	</notification>
+	<notification name="CacheWillBeMoved">
+		キャッシュは、[APP_NAME]再起動後が移動されます。
+注意：キャッシュがクリアされます。
+	</notification>
+	<notification name="ChangeConnectionPort">
+		ポートの設定は、[APP_NAME]再起動後に反映されます。
+	</notification>
+	<notification name="ChangeDeferredDebugSetting">
+		デバッグ設定の変更は、[APP_NAME]再起動後に反映されます。
+	</notification>
+	<notification name="ChangeSkin">
+		新しいスキンは、[APP_NAME]再起動後に表示されます。
+	</notification>
+	<notification name="ChangeLanguage">
+		言語の変更は、[APP_NAME]再起動後に反映されます。
+	</notification>
+	<notification name="GoToAuctionPage">[SECOND_LIFE]のWebページに移動し、入札あるいはオークションの詳細を確認しますか？
+    <tag>
+			confirm
+		</tag>
+		<url name="url">
+			http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]&amp;lang=ja-JP
+		</url>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SaveChanges">変更を保存しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
+	</notification>
+	<notification name="DeleteNotecard">このノートカードを削除してもよろしいですか？
+    <unique/>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="LoadPreviousReportScreenshot">以前のスクリーンショットをレポートに使用しますか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GestureSaveFailedTooManySteps">ジェスチャーの保存に失敗しました。
 ステップが多すぎます。
 ステップをいくつか削除してから再保存してください
-    <tag>fail</tag>
-  </notification>
-  <notification name="GestureSaveFailedTryAgain">ジェスチャーの保存に失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="GestureSaveFailedTryAgain">ジェスチャーの保存に失敗しました。
 少し待ってからもう一度試してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="GestureSaveFailedObjectNotFound">ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="GestureSaveFailedObjectNotFound">ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
 オブジェクトが範囲内に存在しないか、削除された可能性があります。
-    <tag>fail</tag>
-  </notification>
-  <notification name="GestureSaveFailedReason">以下の理由で、ジェスチャーの保存時に問題が起こりました：[REASON]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="GestureSaveFailedReason">以下の理由で、ジェスチャーの保存時に問題が起こりました：[REASON]
 お手数ですが、後でもう一度試してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="SaveNotecardFailObjectNotFound">ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SaveNotecardFailObjectNotFound">ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。
 オブジェクトが範囲内に存在しないか、削除された可能性があります。
-    <tag>fail</tag>
-  </notification>
-  <notification name="SaveNotecardFailReason">以下の理由で、ノートカードの保存時に問題が起こりました：[REASON]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SaveNotecardFailReason">以下の理由で、ノートカードの保存時に問題が起こりました：[REASON]
 お手数ですが、後でもう一度試してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="ScriptCannotUndo">あなたのスクリプトのバージョンでは、変更を元に戻すことはできませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ScriptCannotUndo">あなたのスクリプトのバージョンでは、変更を元に戻すことはできませんでした。
 サーバーの最新保存バージョンをロードしますか？
 （**警告**：この操作後元に戻すことはできません）
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="SaveScriptFailObjectNotFound">スクリプトの保存に失敗しました。スクリプトが入ったオブジェクトが見つかりません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SaveScriptFailObjectNotFound">スクリプトの保存に失敗しました。スクリプトが入ったオブジェクトが見つかりません。
 オブジェクトは範囲外か、または削除されているかもしれません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="StartRegionEmpty">ログイン位置が指定されていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="StartRegionEmpty">ログイン位置が指定されていません。
 ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「自宅（ホーム）」を選択してください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="CouldNotStartStopScript">スクリプトの起動または停止に失敗しました。スクリプトが格納されているオブジェクトが見つかりません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CouldNotStartStopScript">スクリプトの起動または停止に失敗しました。スクリプトが格納されているオブジェクトが見つかりません。
 オブジェクトが範囲内に存在しないか、または削除された可能性があります。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotDownloadFile">ファイルをダウンロードできません。
-    <tag>fail</tag>
-  </notification>
-  <notification label="" name="MediaFileDownloadUnsupported">ダウンロードをリクエストしたファイルは、[SECOND_LIFE]でサポートされていません。
-    <unique />
-    <tag>confirm</tag>
-    <usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="ＯＫ" />
-  </notification>
-  <notification name="CannotWriteFile">ファイル[[FILE]]に書き込むことができませんでした。
-    <tag>fail</tag>
-  </notification>
-  <notification name="UnsupportedHardware">お使いのコンピュータは、[APP_NAME]の最小システム要件を満たしていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDownloadFile">ファイルをダウンロードできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">ダウンロードをリクエストしたファイルは、[SECOND_LIFE]でサポートされていません。
+    <unique/>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CannotWriteFile">ファイル[[FILE]]に書き込むことができませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnsupportedHardware">お使いのコンピュータは、[APP_NAME]の最小システム要件を満たしていません。
 このためパフォーマンスが低下する場合があります。恐れ入りますが[SUPPORT_SITE]は、サポートされていないシステム構成に対する技術的サポートを提供できません。
 
 詳細について、[_URL] を確認しますか？
-    <url name="url" option="0">https://secondlife.com/system-requirements?lang=ja</url>
-    <tag>fail</tag>
-    <usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="OldGPUDriver">グラフィックスチップに最新のドライバがある可能性があります。グラフィックドライバを更新することにより、大幅にパフォーマンスが向上します。
+    <url name="url" option="0">
+			https://secondlife.com/system-requirements?lang=ja
+		</url>
+		<tag>
+			fail
+		</tag>
+		<usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="OldGPUDriver">グラフィックスチップに最新のドライバがある可能性があります。グラフィックドライバを更新することにより、大幅にパフォーマンスが向上します。
 ドライバの更新を確認するために[URL] にアクセスしますか？
-    <url name="url">[URL]</url>
-    <tag>confirm</tag>
-    <tag>fail</tag>
-    <usetemplate ignoretext="使用中のグラフィックドライバが古くなっています" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="UnknownGPU">お使いのシステムには、[APP_NAME]が認識できないグラフィックカードが搭載されています。[APP_NAME]でまだテストされていない最新ハードウェアのためだと考えられます。
+    <url name="url">
+			[URL]
+		</url>
+		<tag>
+			confirm
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate ignoretext="使用中のグラフィックドライバが古くなっています" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="UnknownGPU">お使いのシステムには、[APP_NAME]が認識できないグラフィックカードが搭載されています。[APP_NAME]でまだテストされていない最新ハードウェアのためだと考えられます。
 問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
 （「私」＞「初期設定」＞「グラフィック」）
-    <tag>fail</tag>
-    <form name="form">
-      <ignore name="ignore" text="使用中のグラフックカードが認識されないとき" />
-    </form>
-  </notification>
-  <notification name="DisplaySettingsNoShaders">グラフィックドライバを初期化中に[APP_NAME]がクラッシュしました。
+    <tag>
+			fail
+		</tag>
+		<form name="form">
+			<ignore name="ignore" text="使用中のグラフックカードが認識されないとき"/>
+		</form>
+	</notification>
+	<notification name="DisplaySettingsNoShaders">グラフィックドライバを初期化中に[APP_NAME]がクラッシュしました。
 ドライバの一般的なエラーを防ぐために、画質が低に設定されます。このため、一部のグラフィック特性に制限が出ます。
 お使いのグラフィックカードのドライバをアップデートするようおすすめします。
 画質は、「初期設定」＞「グラフィック」で設定できます。
-    <tag>fail</tag>
-  </notification>
-  <notification name="AutoFPSConfirmDisable">この設定を変更すると、「自動調整」の設定が無効になります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AutoFPSConfirmDisable">この設定を変更すると、「自動調整」の設定が無効になります。
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="続ける"/>
-  </notification>
-  <notification name="AdvancedLightingConfirm">高度な照明をオンにするには、品質をレベル4以上にする必要があります。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
-  </notification>
-  <notification name="ShadowsConfirm">影を有効にするには、品質をレベルを4以上にする必要があります。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
-  </notification>
-  <notification name="RegionNoTerraforming">[REGION]では、地形の変更ができません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="ParcelNoTerraforming">[PARCEL]区画の地形を編集する権限がありません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotCopyWarning">以下のアイテムをコピーする権限がありません：
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="続ける"/>
+	</notification>
+	<notification name="AdvancedLightingConfirm">高度な照明をオンにするには、品質をレベル4以上にする必要があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ShadowsConfirm">影を有効にするには、品質をレベルを4以上にする必要があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RegionNoTerraforming">[REGION]では、地形の変更ができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ParcelNoTerraforming">[PARCEL]区画の地形を編集する権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotCopyWarning">以下のアイテムをコピーする権限がありません：
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 他の人に譲ると、そのアイテムはあなたのインベントリから削除されます。本当にこれらのアイテムを譲ってもよろしいですか？
-    <tag>confirm</tag>
-    <tag>fail</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="CannotGiveItem">インベントリのアイテムを渡すことができません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="TransactionCancelled">取引がキャンセルされました。
-    <tag>fail</tag>
-  </notification>
-  <notification name="TooManyItems">一度に42個以上のアイテムを渡すことはできません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="NoItems">選択したアイテムを渡す権限がありません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotCopyCountItems">あなたは選択した[COUNT]個のアイテムをコピーする権限がありません。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="CannotGiveItem">インベントリのアイテムを渡すことができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TransactionCancelled">取引がキャンセルされました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TooManyItems">一度に42個以上のアイテムを渡すことはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoItems">選択したアイテムを渡す権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotCopyCountItems">あなたは選択した[COUNT]個のアイテムをコピーする権限がありません。
 これらのアイテムはあなたのインベントリから失われます。
 本当にアイテムを渡してもよろしいですか？
-    <tag>confirm</tag>
-    <tag>fail</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-  <notification name="CannotGiveCategory">選択したフォルダを渡す権限がありません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="FreezeAvatar">このアバターをフリーズしますか？
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="CannotGiveCategory">選択したフォルダを渡す権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FreezeAvatar">このアバターをフリーズしますか？
 アバターは一時的に動けなくなり、チャットを含めインワールドで何もできなくなります。
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
-  </notification>
-  <notification name="FreezeAvatarFullname">[AVATAR_NAME]をフリーズしますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/>
+	</notification>
+	<notification name="FreezeAvatarFullname">[AVATAR_NAME]をフリーズしますか？
 フリーズされた人は一時的に動けなくなり、チャットなど、この世界に対する関わりを持つことができなくなります。
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ" />
-  </notification>
-  <notification name="EjectAvatarFullname">あなたの土地から[AVATAR_NAME]を追放しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="追放しバンする" yestext="追放する" />
-  </notification>
-  <notification name="EjectAvatarNoBan">このアバターをあなたの土地から追放しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放" />
-  </notification>
-  <notification name="EjectAvatarFullnameNoBan">[AVATAR_NAME]をあなたの土地から追放しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放" />
-  </notification>
-  <notification name="EjectAvatarFromGroup">&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;から[AVATAR_NAME]を追放しました。
-    <tag>group</tag>
-  </notification>
-  <notification name="AcquireErrorTooManyObjects">取得エラー：選択したオブジェクトの数が多すぎます。
-    <tag>fail</tag>
-  </notification>
-  <notification name="AcquireErrorObjectSpan">取得エラー：オブジェクトが複数のリージョン（地域）にまたがって存在しています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/>
+	</notification>
+	<notification name="EjectAvatarFullname">あなたの土地から[AVATAR_NAME]を追放しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="追放しバンする" yestext="追放する"/>
+	</notification>
+	<notification name="EjectAvatarNoBan">このアバターをあなたの土地から追放しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
+	</notification>
+	<notification name="EjectAvatarFullnameNoBan">[AVATAR_NAME]をあなたの土地から追放しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
+	</notification>
+	<notification name="EjectAvatarFromGroup">&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;から[AVATAR_NAME]を追放しました。
+    <tag>
+			group
+		</tag>
+	</notification>
+	<notification name="AcquireErrorTooManyObjects">取得エラー：選択したオブジェクトの数が多すぎます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AcquireErrorObjectSpan">取得エラー：オブジェクトが複数のリージョン（地域）にまたがって存在しています。
 すべて同じリージョン内に移動させてから取得してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="PromptGoToCurrencyPage">[EXTRA]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PromptGoToCurrencyPage">[EXTRA]
   
 [_URL] に移動してリンデンドル購入に関する情報を確認しますか？ 
-    <url name="url">https://secondlife.com/my/lindex/?lang=ja-JP</url>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="MuteLimitReached">[MUTE_LIMIT]エントリの制限に達したため、ブロックリストに新しいエントリを追加できません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="UnableToLinkObjects">[COUNT]個のオブジェクトをリンクできませんでした。
+    <url name="url">
+			https://secondlife.com/my/lindex/?lang=ja-JP
+		</url>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MuteLimitReached">[MUTE_LIMIT]エントリの制限に達したため、ブロックリストに新しいエントリを追加できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToLinkObjects">[COUNT]個のオブジェクトをリンクできませんでした。
 リンクできるオブジェクトは最大[MAX]個です。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotLinkIncompleteSet">セットが揃っているオブジェクトのみリンクできます。複数のオブジェクトを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotLinkModify">すべてのオブジェクトの修正許可がないためリンクできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotLinkIncompleteSet">セットが揃っているオブジェクトのみリンクできます。複数のオブジェクトを選択してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotLinkModify">すべてのオブジェクトの修正許可がないためリンクできません。
 
 どのオブジェクトもロックされておらず、あなたのものであることを確認してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotLinkPermanent">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotLinkAcrossRegions">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotLinkDifferentOwners">所有者が異なるため、オブジェクトをリンクできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotLinkPermanent">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotLinkAcrossRegions">リージョン（地域）の境界を越えてオブジェクトをリンクできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotLinkDifferentOwners">所有者が異なるため、オブジェクトをリンクできません。
 自分が所有しているオブジェクトだけを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="NoFileExtension">ファイル「[FILE]」は、無効な拡張子です。
-
-このファイルの拡張子が正しいかどうかを確認してください。</notification>
-  <notification name="InvalidFileExtension">「[EXTENSION]」は、無効な拡張子です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoFileExtension">
+		ファイル「[FILE]」は、無効な拡張子です。
+
+このファイルの拡張子が正しいかどうかを確認してください。
+	</notification>
+	<notification name="InvalidFileExtension">「[EXTENSION]」は、無効な拡張子です。
 有効な拡張子：[VALIDS] 
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="CannotUploadSoundFile">読み込みのためにアップロードされたサウンドファイルを開けません：
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CannotUploadSoundFile">読み込みのためにアップロードされたサウンドファイルを開けません：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileNotRIFF">RIFF WAVEファイルとして認識されません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileNotRIFF">RIFF WAVEファイルとして認識されません：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileNotPCM">PCM WAVEオーディオファイルとして認識されません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileNotPCM">PCM WAVEオーディオファイルとして認識されません：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileInvalidChannelCount">このファイルのチャンネル数は無効です（モノラルか、ステレオである必要があります）：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileInvalidChannelCount">このファイルのチャンネル数は無効です（モノラルか、ステレオである必要があります）：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileInvalidSampleRate">このファイルのサンプリングレートはサポートされていません（44.1kである必要があります）：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileInvalidSampleRate">このファイルのサンプリングレートはサポートされていません（44.1kである必要があります）：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileInvalidWordSize">このファイルのビットサイズはサポートされていません（8bitか、16bitである必要があります）：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileInvalidWordSize">このファイルのビットサイズはサポートされていません（8bitか、16bitである必要があります）：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileInvalidHeader">WAVヘッダーにデータチャンクが見つかりません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileInvalidHeader">WAVヘッダーにデータチャンクが見つかりません：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileInvalidChunkSize">WAVファイルのチャンクサイズが間違っています：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileInvalidChunkSize">WAVファイルのチャンクサイズが間違っています：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="SoundFileInvalidTooLong">オーディオファイルが長すぎます。（最大１０秒）：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SoundFileInvalidTooLong">オーディオファイルが長すぎます。（最大１０秒）：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="ProblemWithFile">「[FILE]」に問題があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ProblemWithFile">「[FILE]」に問題があります。
 
 [ERROR]
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotOpenTemporarySoundFile">書き込み用の一時圧縮サウンドファイルを開くことができません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotOpenTemporarySoundFile">書き込み用の一時圧縮サウンドファイルを開くことができません：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="UnknownVorbisEncodeFailure">不明なVorbisのエンコードに失敗しました：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnknownVorbisEncodeFailure">不明なVorbisのエンコードに失敗しました：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotEncodeFile">次のファイルのエンコードができません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotEncodeFile">次のファイルのエンコードができません：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="CorruptedProtectedDataStore">ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="CorruptResourceFile">破損したリソースファイル：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CorruptedProtectedDataStore">ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CorruptResourceFile">破損したリソースファイル：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="UnknownResourceFileVersion">不明なLindenリソースファイルのバージョンです：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnknownResourceFileVersion">不明なLindenリソースファイルのバージョンです：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="UnableToCreateOutputFile">出力ファイルを作成できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToCreateOutputFile">出力ファイルを作成できません：
 [FILE]
-    <tag>fail</tag>
-  </notification>
-  <notification name="DoNotSupportBulkAnimationUpload">現在[APP_NAME]では、BVH形式のアニメーションファイルの一括アップロードはサポートされていません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotUploadReason">以下の理由で「[FILE]」をアップロードできませんでした：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DoNotSupportBulkAnimationUpload">現在[APP_NAME]では、BVH形式のアニメーションファイルの一括アップロードはサポートされていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotUploadReason">以下の理由で「[FILE]」をアップロードできませんでした：
 [REASON]
 
 お手数ですがもう一度やり直してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="LandmarkCreated">「[LANDMARK_NAME]」を「[FOLDER_NAME]」フォルダに追加しました。</notification>
-  <notification name="LandmarkAlreadyExists">この場所のランドマークは、既に持っています。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification label="フォルダ作成" name="CreateLandmarkFolder">
-    <unique />
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandmarkCreated">
+		「[LANDMARK_NAME]」を「[FOLDER_NAME]」フォルダに追加しました。
+	</notification>
+	<notification name="LandmarkAlreadyExists">この場所のランドマークは、既に持っています。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification label="フォルダ作成" name="CreateLandmarkFolder">
+		<unique/>
 フォルダ名を入力してください：
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" type="text">
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message" type="text">
       </input>
-      <button default="true" index="0" name="ＯＫ" text="ＯＫ"/>
-      <button index="1" name="Cancel" text="キャンセル"/>
-    </form>
-  </notification>
-  <notification name="CannotRecompileSelectObjectsNoScripts">「再コンパイル」できませんでした。
+			<button default="true" index="0" name="ＯＫ" text="ＯＫ"/>
+			<button index="1" name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="CannotRecompileSelectObjectsNoScripts">「再コンパイル」できませんでした。
 スクリプトが入ったオブジェクトを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotRecompileSelectObjectsNoPermission">「再コンパイル」できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotRecompileSelectObjectsNoPermission">「再コンパイル」できませんでした。
 修正権限のある、スクリプトが入ったオブジェクトを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotResetSelectObjectsNoScripts">「再設定」ができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotResetSelectObjectsNoScripts">「再設定」ができません。
 
 スクリプトが入ったオブジェクトを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotResetSelectObjectsNoPermission">「再設定」ができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotResetSelectObjectsNoPermission">「再設定」ができません。
 修正権限のある、スクリプトが入ったオブジェクトを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotOpenScriptObjectNoMod">修正権限のないオブジェクトのスクリプトは開くことはできません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotSetRunningSelectObjectsNoScripts">スクリプトの「実行」ができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotOpenScriptObjectNoMod">修正権限のないオブジェクトのスクリプトは開くことはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotSetRunningSelectObjectsNoScripts">スクリプトの「実行」ができません。
 スクリプトが入ったオブジェクトを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="CannotSetRunningNotSelectObjectsNoScripts">スクリプトを「実行しない」設定にできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotSetRunningNotSelectObjectsNoScripts">スクリプトを「実行しない」設定にできません。
 スクリプトが入ったオブジェクトを選択してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="NoFrontmostFloater">保存するfrontmostフロータがありません。</notification>
-  <notification name="SeachFilteredOnShortWords">指定した検索クエリは変更され、短すぎる語句は取り除かれています。
-
-検索語句：[FINALQUERY]</notification>
-  <notification name="SeachFilteredOnShortWordsEmpty">指定した検索語句が短すぎたため、検索は行われませんでした。
-    <tag>fail</tag>
-  </notification>
-  <!-- Generic Teleport failure modes - strings will be inserted from teleport_strings.xml if available. -->
-  <notification name="CouldNotTeleportReason">テレポートに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoFrontmostFloater">
+		保存するfrontmostフロータがありません。
+	</notification>
+	<notification name="SeachFilteredOnShortWords">
+		指定した検索クエリは変更され、短すぎる語句は取り除かれています。
+
+検索語句：[FINALQUERY]
+	</notification>
+	<notification name="SeachFilteredOnShortWordsEmpty">指定した検索語句が短すぎたため、検索は行われませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CouldNotTeleportReason">テレポートに失敗しました。
 [REASON]
-    <tag>fail</tag>
-  </notification>
-  <!-- Teleport failure modes not delivered via the generic mechanism
-    above (for example, delivered as an AlertMessage on
-    region-crossing :( ) - these paths should really be merged
-    in the future. -->
-  <notification name="invalid_tport">テレポートの試行は１分間に６回までと制限されています。１分待ってからもう一度テレポートしてみてください。問題が解決しない場合は、ログインし直してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。ログインし直す必要があるかもしれません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="invalid_tport">テレポートの試行は１分間に６回までと制限されています。１分待ってからもう一度テレポートしてみてください。問題が解決しない場合は、ログインし直してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="invalid_region_handoff">リージョン間の移動中に問題が発生しました。ログインし直す必要があるかもしれません。
 このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="blocked_tport">申し訳ございません。テレポートは現在ブロックされています。お手数ですが、しばらくしてから再度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="blocked_tport">申し訳ございません。テレポートは現在ブロックされています。お手数ですが、しばらくしてから再度お試しください。
 それでもテレポートできない場合は、ログアウトし、ログインし直して問題を解決してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="nolandmark_tport">申し訳ございません。ランドマークの目的地が見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-  <notification name="timeout_tport">申し訳ございません。システムによるテレポート接続が完了できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="nolandmark_tport">申し訳ございません。ランドマークの目的地が見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="timeout_tport">申し訳ございません。システムによるテレポート接続が完了できませんでした。
 しばらくしてから再度お試しください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="noaccess_tport">残念ながら、目的地へアクセスが許可されていないため、テレポートできません。
-    <tag>fail</tag>
-  </notification>
-  <notification name="missing_attach_tport">添付物がまだ届いていません。テレポートをする前にあと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="too_many_uploads_tport">このリージョンのアセットキューが現在混み合っているため、テレポートのリクエストをすぐに処理することが難しい状況です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="noaccess_tport">残念ながら、目的地へアクセスが許可されていないため、テレポートできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="missing_attach_tport">添付物がまだ届いていません。テレポートをする前にあと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="too_many_uploads_tport">このリージョンのアセットキューが現在混み合っているため、テレポートのリクエストをすぐに処理することが難しい状況です。
 数分後にやり直すか、混雑していない他のリージョンでお試しください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="expired_tport">申し訳ございません。システムはテレポートのリクエストを時間どおりに完了できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="expired_tport">申し訳ございません。システムはテレポートのリクエストを時間どおりに完了できませんでした。
 数分後にやり直してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="expired_region_handoff">申し訳ございません。システムはリージョン間の移動を時間どおりに完了できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="expired_region_handoff">申し訳ございません。システムはリージョン間の移動を時間どおりに完了できませんでした。
 数分後にやり直してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="no_host">テレポート目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="no_host">テレポート目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。
   数分後にやり直してください。
-    <tag>fail</tag>
-  </notification>
-  <notification name="no_inventory_host">インベントリシステムは現在利用できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotSetLandOwnerNothingSelected">土地所有者設定ができません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="no_inventory_host">インベントリシステムは現在利用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotSetLandOwnerNothingSelected">土地所有者設定ができません：
 区画が選定されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotSetLandOwnerMultipleRegions">複数のリージョンが選択されたため、土地の所有権を取得できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotSetLandOwnerMultipleRegions">複数のリージョンが選択されたため、土地の所有権を取得できません。
 選択する面積を小さくして、もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ForceOwnerAuctionWarning">この区画はオークションに出されています。所有権を変更するとオークションはキャンセルとなり、既にオークションに参加している住人がいればその人に迷惑をかけてしまいます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ForceOwnerAuctionWarning">この区画はオークションに出されています。所有権を変更するとオークションはキャンセルとなり、既にオークションに参加している住人がいればその人に迷惑をかけてしまいます。
 所有権を変更しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="CannotContentifyNothingSelected">コンテンツ化は不可能です：
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CannotContentifyNothingSelected">コンテンツ化は不可能です：
 区画が選定されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotContentifyNoRegion">コンテンツ化は不可能です：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotContentifyNoRegion">コンテンツ化は不可能です：
 土地が選択されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandNothingSelected">土地を破棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandNothingSelected">土地を破棄できません：
 区画が選定されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandNoRegion">土地を破棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandNoRegion">土地を破棄できません：
 リージョンが見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotBuyLandNothingSelected">土地を購入できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotBuyLandNothingSelected">土地を購入できません：
 区画が選定されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotBuyLandNoRegion">土地を購入できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotBuyLandNoRegion">土地を購入できません：
 この土地があるリージョンを見つけることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotCloseFloaterBuyLand">[APP_NAME] がこの取引価格を見積もるまでは、土地の購入ウィンドウを閉じることはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotDeedLandNothingSelected">土地を譲渡できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotCloseFloaterBuyLand">[APP_NAME] がこの取引価格を見積もるまでは、土地の購入ウィンドウを閉じることはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDeedLandNothingSelected">土地を譲渡できません：
 区画が選定されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotDeedLandNoGroup">土地を譲渡できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDeedLandNoGroup">土地を譲渡できません：
 グループが選択されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotDeedLandNoRegion">土地を譲渡できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDeedLandNoRegion">土地を譲渡できません：
 この土地があるリージョンが見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotDeedLandMultipleSelected">土地を譲渡できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDeedLandMultipleSelected">土地を譲渡できません：
 複数の区画が選択されています。
 
 区画を１つ選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotDeedLandWaitingForServer">土地を譲渡できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDeedLandWaitingForServer">土地を譲渡できません：
 サーバーからの所有権情報を待っています。
 
 お手数ですが、もう一度やり直してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotDeedLandNoTransfer">土地を譲渡できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDeedLandNoTransfer">土地を譲渡できません：
 [REGION]では、土地の譲渡が許可されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandWatingForServer">土地を破棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandWatingForServer">土地を破棄できません：
 サーバーが区画情報を更新するのを待っています。
 
 お手数ですが、もう一度やり直してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandSelected">土地を破棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandSelected">土地を破棄できません：
 あなたは、選択した区画のすべてを所有していません。
 
 区画を１つ選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandDontOwn">土地を破棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandDontOwn">土地を破棄できません：
 あなたはこの土地を手放すことを許可されていません。
 あなたの区画は緑色で表示されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandRegionNotFound">土地を放棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandRegionNotFound">土地を放棄できません：
 この土地があるリージョンが見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandNoTransfer">土地を破棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandNoTransfer">土地を破棄できません：
 [REGION]では土地の譲渡が許可されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotReleaseLandPartialSelection">土地を破棄できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotReleaseLandPartialSelection">土地を破棄できません：
 区画全体を選択して破棄する必要があります。
 
 区画全体を選択するか、まず最初に区画を分割してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ReleaseLandWarning">あなたは、[AREA]㎡の土地を破棄しようとしています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ReleaseLandWarning">あなたは、[AREA]㎡の土地を破棄しようとしています。
 この区画を破棄するとあなたの土地ではなくなりますが、L$ は返金されません。
 
 土地を破棄してもよろしいですか？
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="CannotDivideLandNothingSelected">土地を分割できません：
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CannotDivideLandNothingSelected">土地を分割できません：
 
 区画が選定されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotDivideLandPartialSelection">土地を分割できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotDivideLandPartialSelection">土地を分割できません：
 
 区画全体が選択されています。
 区画の一部を選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandDivideWarning">この土地を分割すると、２つの区画に分割され各々の設定が可能になります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandDivideWarning">この土地を分割すると、２つの区画に分割され各々の設定が可能になります。
 この操作を行うと、一部の設定がデフォルトにリセットされます。
 
 土地を分割してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="CannotDivideLandNoRegion">土地を分割できません：
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CannotDivideLandNoRegion">土地を分割できません：
 この土地があるリージョンが見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotJoinLandNoRegion">土地を結合できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotJoinLandNoRegion">土地を結合できません：
 この土地があるリージョンが見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotJoinLandNothingSelected">土地を結合できませんでした：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotJoinLandNothingSelected">土地を結合できませんでした：
 区画が選定されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotJoinLandEntireParcelSelected">土地を結合できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotJoinLandEntireParcelSelected">土地を結合できません：
 区画が１つしか選択されていません。
 
 両方の区画をまたいで土地を選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotJoinLandSelection">土地を結合できません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotJoinLandSelection">土地を結合できません：
 区画を１つ以上選択する必要があります。
 
 両方の区画をまたいで土地を選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="JoinLandWarning">この土地を結合すると、選択された長方形に交差する全ての区画を基にして、大きな区画が１つ作成されます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="JoinLandWarning">この土地を結合すると、選択された長方形に交差する全ての区画を基にして、大きな区画が１つ作成されます。
 新しい区画の名前とオプションを再設定する必要があります。
 
 土地を結合してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmNotecardSave">このアイテムをコピー、表示する前に、ノートカードの保存が必要です。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmNotecardSave">このアイテムをコピー、表示する前に、ノートカードの保存が必要です。
 保存してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmItemCopy">このアイテムをあなたのインベントリにコピーしますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="コピー" />
-  </notification>
-
-  <notification name="ResolutionSwitchFail">解像度を[RESX]✕[RESY]に変更することができませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ErrorUndefinedGrasses">エラー：未定義の植物：[SPECIES]
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ErrorUndefinedTrees">エラー：未定義の樹木：[SPECIES]
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotSaveWearableOutOfSpace">「[NAME]」を服装のファイルに保存できません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmItemCopy">このアイテムをあなたのインベントリにコピーしますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="コピー"/>
+	</notification>
+	<notification name="ResolutionSwitchFail">解像度を[RESX]✕[RESY]に変更することができませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorUndefinedGrasses">エラー：未定義の植物：[SPECIES]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorUndefinedTrees">エラー：未定義の樹木：[SPECIES]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotSaveWearableOutOfSpace">「[NAME]」を服装のファイルに保存できません。
 コンピューターのディスクスペースを少し増やしてから、もう一度保存してみてください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotSaveToAssetStore">「[NAME]」を保存できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotSaveToAssetStore">「[NAME]」を保存できません。
 通常これは一時的なエラーです。数分後にもう一度着用物をカスタマイズ・保存してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="YouHaveBeenLoggedOut">しまった、[SECOND_LIFE]からログアウトされてしまいました。[MESSAGE]
-    <usetemplate name="okcancelbuttons" notext="終了" yestext="ＩＭでチャット" />
-  </notification>
-
-  <notification name="InventoryUnusable">インベントリの読み込み中に問題が発生しました。まず、ログアウトして再度ログインし直してみてください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="YouHaveBeenLoggedOut">しまった、[SECOND_LIFE]からログアウトされてしまいました。[MESSAGE]
+    <usetemplate name="okcancelbuttons" notext="終了" yestext="ＩＭでチャット"/>
+	</notification>
+	<notification name="InventoryUnusable">インベントリの読み込み中に問題が発生しました。まず、ログアウトして再度ログインし直してみてください。
 このメッセージが再度表示される場合は、サポートに連絡して問題を解決してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="OnlyOfficerCanBuyLand">グループ用の土地の購入ができません：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="OnlyOfficerCanBuyLand">グループ用の土地の購入ができません：
 あなたにはアクティブなグループのために土地を購入する権限がありません。
-    <tag>group</tag>
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="フレンド登録" name="AddFriendWithMessage">フレンド登録すると、お互いの現在いる場所のマップへの表示許可や、オンライン状態の表示設定ができます。
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="フレンド登録" name="AddFriendWithMessage">フレンド登録すると、お互いの現在いる場所のマップへの表示許可や、オンライン状態の表示設定ができます。
 
 [NAME]にフレンドの申請を行いますか？
-    <tag>friendship</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">フレンド登録してくれますか？</input>
-      <button name="Offer" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification label="自動置換リストを追加" name="AddAutoReplaceList">新しいリストの名前：
-    <tag>addlist</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="SetName" text="ＯＫ" />
-    </form>
-  </notification>
-
-  <notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">名前「[DUPNAME]」は既に使われています。
+    <tag>
+			friendship
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				フレンド登録してくれますか？
+			</input>
+			<button name="Offer" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="自動置換リストを追加" name="AddAutoReplaceList">新しいリストの名前：
+    <tag>
+			addlist
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="SetName" text="ＯＫ"/>
+		</form>
+	</notification>
+	<notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">名前「[DUPNAME]」は既に使われています。
 一意の名前を入力してください：
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="ReplaceList" text="着用中のリストを入れ替える" />
-      <button name="SetName" text="新しい名前を使用" />
-    </form>
-  </notification>
-
-  <notification name="InvalidAutoReplaceEntry">キーワードは一語でなければならず、置換は空にできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InvalidAutoReplaceList">その置換リストは無効です。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SpellingDictImportRequired">ファイル、名前および言語を指定する必要があります。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SpellingDictIsSecondary">辞書 [DIC_NAME]に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="ReplaceList" text="着用中のリストを入れ替える"/>
+			<button name="SetName" text="新しい名前を使用"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">キーワードは一語でなければならず、置換は空にできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InvalidAutoReplaceList">その置換リストは無効です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SpellingDictImportRequired">ファイル、名前および言語を指定する必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SpellingDictIsSecondary">辞書 [DIC_NAME]に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
 この辞書は追加辞書として使用できますが、メイン辞書としては使用できません。詳細については下記をご覧ください。
 https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SpellingDictImportFailed">[FROM_NAME]から[TO_NAME]へコピーすることはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <!-- [DESC] (new)は日本語が使えないので翻訳しない。-->
-  <notification label="アウトフィットの保存" name="SaveOutfitAs">着用中のアウトフィットを新しいアウトフィットとして保存：
-    <unique />
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">[DESC] (new)</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification label="着用物の保存" name="SaveWearableAs">アイテムを別名でインベントリに保存：
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">[DESC] (new)</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification label="アウトフィットの名前変更" name="RenameOutfit">新しいアウトフィット名：
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="new_name">[NAME]</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification label="ジェスチャーの名前変更" name="RenameGesture">新しいジェスチャー名：
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="new_name">[NAME]</input>
-      <button name="ＯＫ" text="ＯＫ"/>
-      <button name="Cancel" text="キャンセル"/>
-    </form>
-  </notification>
-
-  <notification label="ランドマークの名前変更" name="RenameLandmark">[NAME]の新しい名前を入力してください。
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="new_name">[NAME]</input>
-      <button name="ＯＫ" text="ＯＫ"/>
-      <button name="Cancel" text="キャンセル"/>
-    </form>
-  </notification>
-
-  <notification name="RemoveFromFriends">フレンドリストから&lt;nolink&gt;[NAME]&lt;/nolink&gt;を削除しますか？
-    <tag>friendship</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="RemoveMultipleFromFriends">フレンドリストから複数のフレンドを削除しますか？
-    <tag>friendship</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GodDeleteAllScriptedPublicObjectsByUser">**[AVATAR_NAME]**
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SpellingDictImportFailed">[FROM_NAME]から[TO_NAME]へコピーすることはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="アウトフィットの保存" name="SaveOutfitAs">着用中のアウトフィットを新しいアウトフィットとして保存：
+    <unique/>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				[DESC] (new)
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="着用物の保存" name="SaveWearableAs">アイテムを別名でインベントリに保存：
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				[DESC] (new)
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="アウトフィットの名前変更" name="RenameOutfit">新しいアウトフィット名：
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="new_name">
+				[NAME]
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="ジェスチャーの名前変更" name="RenameGesture">新しいジェスチャー名：
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="new_name">
+				[NAME]
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="ランドマークの名前変更" name="RenameLandmark">[NAME]の新しい名前を入力してください。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="new_name">
+				[NAME]
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="RemoveFromFriends">フレンドリストから&lt;nolink&gt;[NAME]&lt;/nolink&gt;を削除しますか？
+    <tag>
+			friendship
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RemoveMultipleFromFriends">フレンドリストから複数のフレンドを削除しますか？
+    <tag>
+			friendship
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GodDeleteAllScriptedPublicObjectsByUser">**[AVATAR_NAME]**
 が所有するすべてのスクリプトオブジェクトを、このシム内の他のすべての土地から削除しようとしています。
 操作を続行しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GodDeleteAllScriptedObjectsByUser">**[AVATAR_NAME]**
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GodDeleteAllScriptedObjectsByUser">**[AVATAR_NAME]**
 が所有するすべてのスクリプトオブジェクトを、このシム内の他のすべての土地から削除しようとしています。
 操作を続行しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GodDeleteAllObjectsByUser">**[AVATAR_NAME]**
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GodDeleteAllObjectsByUser">**[AVATAR_NAME]**
 が所有するすべてのオブジェクト（スクリプトオブジェクトと非スクリプトオブジェクト）を、このシム内のすべての土地から削除しようとしています。
 操作を続行しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BlankClassifiedName">クラシファイド広告の名前を指定してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="MinClassifiedPrice">クラシファイド広告掲載料は最低L$ [MIN_PRICE]必要です。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BlankClassifiedName">クラシファイド広告の名前を指定してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MinClassifiedPrice">クラシファイド広告掲載料は最低L$ [MIN_PRICE]必要です。
 
 金額を増やしてください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ConfirmItemDeleteHasLinks">１つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ConfirmItemDeleteHasLinks">１つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。
 まず最初にリンクを削除することを強くお勧めします。
   
 これらのアイテムを削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmObjectDeleteLock">選択したアイテムのうち、少なくとも１つがロックされています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLock">選択したアイテムのうち、少なくとも１つがロックされています。
 
 本当に削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-  <notification name="ConfirmObjectDeleteNoCopy">選択したアイテムのうち、少なくとも１つがコピーできません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoCopy">選択したアイテムのうち、少なくとも１つがコピーできません。
   
 本当に削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectDeleteNoOwn">選択したアイテムの１つ以上を所有していません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoOwn">選択したアイテムの１つ以上を所有していません。
   
 これらのアイテムを削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectDeleteLockNoCopy">少なくとも１つのオブジェクトがロックされています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoCopy">少なくとも１つのオブジェクトがロックされています。
 少なくとも１つのオブジェクトがコピーできません。
 
 本当に削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectDeleteLockNoOwn">１つ以上のオブジェクトがロックされました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoOwn">１つ以上のオブジェクトがロックされました。
 １つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectDeleteNoCopyNoOwn">１つ以上のオブジェクトがコピーできません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoCopyNoOwn">１つ以上のオブジェクトがコピーできません。
 １つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectDeleteLockNoCopyNoOwn">１つ以上のオブジェクトがロックされています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">１つ以上のオブジェクトがロックされています。
 １つ以上のオブジェクトがコピーできません。
 １つ以上のオブジェクトを所有していません。
 
 これらのアイテムを削除しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectTakeLock">少なくとも１つのオブジェクトがロックされています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectTakeLock">少なくとも１つのオブジェクトがロックされています。
   
 本当にこのまま取得を続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectTakeNoOwn">取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectTakeNoOwn">取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。
 あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。そのため、将来、修正やコピーの能力が制限される可能性があります。
 
 本当にこのまま取得を続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmObjectTakeLockNoOwn">少なくとも１つのオブジェクトがロックされています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmObjectTakeLockNoOwn">少なくとも１つのオブジェクトがロックされています。
 取得しようとしているオブジェクトには、あなたの所有物ではないオブジェクトが含まれています。あなたの所有物ではないオブジェクトを取得すると、次の所有者の権限がそのオブジェクトに適用されます。
 そのため、将来、編集やコピーの能力が制限される可能性があります。
 
 この選択内容のままで続行することは可能ですが、本当にこのまま取得を続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="CantBuyLandAcrossMultipleRegions">複数のリージョンが選択されたため、土地を購入できません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CantBuyLandAcrossMultipleRegions">複数のリージョンが選択されたため、土地を購入できません。
 選択する面積を小さくしてもう一度試してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="DeedLandToGroup">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DeedLandToGroup">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
 土地の購入価格は所有者に返金されません。譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 
 この[AREA]㎡の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？ 
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="DeedLandToGroupWithContribution">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DeedLandToGroupWithContribution">この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
 譲渡には同時に [NAME]からグループへの土地の貢献が含まれます。土地の購入価格は所有者に返金されません。
 譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 
 この[AREA]㎡の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか？
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="DisplaySetToSafe">-safe オプションを指定したので、表示設定はセーフレベルに設定されています。</notification>
-
-  <notification name="DisplaySetToRecommendedGPUChange">グラフィックの変更により、画面設定は推奨レベルに設定されました。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DisplaySetToSafe">
+		-safe オプションを指定したので、表示設定はセーフレベルに設定されています。
+	</notification>
+	<notification name="DisplaySetToRecommendedGPUChange">
+		グラフィックの変更により、画面設定は推奨レベルに設定されました。
 「[LAST_GPU]」から
-「[THIS_GPU]」まで</notification>
-
-  <notification name="DisplaySetToRecommendedFeatureChange">レンダリングサブシステムの変更により、画面設定は推奨レベルに設定されました。</notification>
-
-  <notification name="ErrorMessage">
+「[THIS_GPU]」まで
+	</notification>
+	<notification name="DisplaySetToRecommendedFeatureChange">
+		レンダリングサブシステムの変更により、画面設定は推奨レベルに設定されました。
+	</notification>
+	<notification name="ErrorMessage">
 [ERROR_MESSAGE]
     <unique>
-      <context>ERROR_MESSAGE</context>
-    </unique>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="AvatarMovedDesired">目的地は現在ご利用いただけません。
+			<context>
+				ERROR_MESSAGE
+			</context>
+		</unique>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AvatarMovedDesired">目的地は現在ご利用いただけません。
 近くのリージョンに移動しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarMovedLast">リクエストされた場所は現在ご利用いただけません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarMovedLast">リクエストされた場所は現在ご利用いただけません。
 近くのリージョンに移動しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarMovedHome">ホームロケーションは現在ご利用いただけません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarMovedHome">ホームロケーションは現在ご利用いただけません。
 近くのリージョンに移動しました。
 新たにホームを設定し直す必要があるかもしれません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ClothingLoading">現在服装をダウンロード中です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ClothingLoading">現在服装をダウンロード中です。
 このまま[SECOND_LIFE]を通常通りご使用いただけます。他人からはあなたは正しく表示されます。
     <form name="form">
-      <ignore name="ignore" text="服装がダウンロードされるまで時間がかかっているとき" />
-    </form>
-  </notification>
-
-  <notification name="AgentComplexityWithVisibility">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
+			<ignore name="ignore" text="服装がダウンロードされるまで時間がかかっているとき"/>
+		</form>
+	</notification>
+	<notification name="AgentComplexityWithVisibility">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
 [OVERLIMIT_MSG]
     <unique combine="cancel_old">
-      <context>AgentComplexityNotice</context>
-    </unique>
-    <usetemplate ignoretext="アバターの複雑度が高すぎる場合の警告" name="notifyignore" />
-  </notification>
-
-  <notification name="AgentComplexity">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
+			<context>
+				AgentComplexityNotice
+			</context>
+		</unique>
+		<usetemplate ignoretext="アバターの複雑度が高すぎる場合の警告" name="notifyignore"/>
+	</notification>
+	<notification name="AgentComplexity">あなたの[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%82%A2%E3%83%90%E3%82%BF%E3%83%BC%E3%81%AE%E8%A4%87%E9%9B%91%E3%81%95%E3%81%A8%E3%81%AF-r1417/ アバター複雑度]は、[AGENT_COMPLEXITY]です。
     <unique combine="cancel_old">
-      <context>AgentComplexityNotice</context>
-    </unique>
-    <usetemplate ignoretext="アバターの複雑さの変更についての警告" name="notifyignore" />
-  </notification>
-
-  <notification name="HUDComplexityWarning">[HUD_REASON]
+			<context>
+				AgentComplexityNotice
+			</context>
+		</unique>
+		<usetemplate ignoretext="アバターの複雑さの変更についての警告" name="notifyignore"/>
+	</notification>
+	<notification name="HUDComplexityWarning">[HUD_REASON]
 このため、パフォーマンスに悪影響を与える恐れがあります。
     <unique combine="cancel_old">
-      <context>HUDComplexityWarning</context>
-    </unique>
-    <usetemplate ignoretext="ＨＵＤが複雑すぎる場合の警告" name="notifyignore" />
-  </notification>
-
-  <notification name="FirstRun">[APP_NAME]のインストールが完了しました。
+			<context>
+				HUDComplexityWarning
+			</context>
+		</unique>
+		<usetemplate ignoretext="ＨＵＤが複雑すぎる場合の警告" name="notifyignore"/>
+	</notification>
+	<notification name="FirstRun">[APP_NAME]のインストールが完了しました。
 [SECOND_LIFE]を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="続行" yestext="アカウントを作成…" />
-  </notification>
-
-  <notification name="LoginCantRemoveUsername">すでに記憶されているユーザーは「私」メニューの「初期設定」＞「拡張設定」＞「記憶されたユーザー名」から削除することができます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LoginCantRemoveCurUsername">ログインしているユーザーを忘れた場合は、ログアウトする必要があります。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Confirm and log out"/>
-  </notification>
-
-  <notification name="LoginPacketNeverReceived">接続に時間がかかっております。お使いのインターネット接続か、[SECOND_LIFE_GRID]の問題と考えられます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="続行" yestext="アカウントを作成…"/>
+	</notification>
+	<notification name="LoginCantRemoveUsername">すでに記憶されているユーザーは「私」メニューの「初期設定」＞「拡張設定」＞「記憶されたユーザー名」から削除することができます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LoginCantRemoveCurUsername">ログインしているユーザーを忘れた場合は、ログアウトする必要があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Confirm and log out"/>
+	</notification>
+	<notification name="LoginPacketNeverReceived">接続に時間がかかっております。お使いのインターネット接続か、[SECOND_LIFE_GRID]の問題と考えられます。
 
 インターネット接続を確認してから数分後に再接続するか、ヘルプをクリックして [SUPPORT_SITE]をご覧になるか、テレポートをクリックしてホームに移動してみてください。
-    <tag>fail</tag>
-    <url name="url">https://support.secondlife.com/</url>
-    <form name="form">
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Help" text="ヘルプ" />
-      <button name="Teleport" text="テレポート" />
-    </form>
-  </notification>
-
-  <notification name="WelcomeChooseSex">まもなく、あなたのアバターが表示されます。矢印キーを使用して歩きます。
+    <tag>
+			fail
+		</tag>
+		<url name="url">
+			https://support.secondlife.com/
+		</url>
+		<form name="form">
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Help" text="ヘルプ"/>
+			<button name="Teleport" text="テレポート"/>
+		</form>
+	</notification>
+	<notification name="WelcomeChooseSex">まもなく、あなたのアバターが表示されます。矢印キーを使用して歩きます。
 ヘルプが必要なときや、[SECOND_LIFE]について知りたいときは、Ｆ１キーを押してください。
 男性あるいは女性のアバターを選択してください。この設定は後で変更できます。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="女性" yestext="男性" />
-  </notification>
-  <notification name="CantTeleportToGrid">現在のグリッド（[CURRENT_GRID]）とはグリッド（[GRID]）が異なるため、[SLURL] にテレポートできませんでした。ビューアーを閉じてからもう一度お試しください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GeneralCertificateErrorShort">サーバーに接続できませんでした。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/>
+	</notification>
+	<notification name="CantTeleportToGrid">現在のグリッド（[CURRENT_GRID]）とはグリッド（[GRID]）が異なるため、[SLURL] にテレポートできませんでした。ビューアーを閉じてからもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GeneralCertificateErrorShort">サーバーに接続できませんでした。
 [REASON]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ"/>
-  </notification>
-
-  <notification name="GeneralCertificateError">サーバーに接続できませんでした。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GeneralCertificateError">サーバーに接続できませんでした。
 [REASON]
 
 サブジェクト名：[SUBJECT_NAME_STRING]
@@ -1645,11 +2194,12 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 キー使用法：[KEYUSAGE] 
 拡張キー使用法：[EXTENDEDKEYUSAGE]
 サブジェクトキー認識別子：[SUBJECTKEYIDENTIFIER]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="TrustCertificateError">このサーバーの認証機関は不明です。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="TrustCertificateError">このサーバーの認証機関は不明です。
 認証情報：
 　サブジェクト名：[SUBJECT_NAME_STRING]
 　発行元：[ISSUER_NAME_STRING]
@@ -1662,1019 +2212,1278 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 　サブジェクトキー認識別子：[SUBJECTKEYIDENTIFIER] 
 
 この認証局を信頼しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="信用する" />
-  </notification>
-
-  <notification name="NotEnoughCurrency">[NAME]は、L$ [PRICE]残高不足のため実行不可です。
-    <tag>fail</tag>
-    <tag>funds</tag>
-  </notification>
-
-  <notification name="GrantedModifyRights">[NAME]は、あなたにオブジェクトの編集権限を与えました。</notification>
-
-  <notification name="RevokedModifyRights">[NAME]は、オブジェクトを編集する権限を取り消されました。</notification>
-
-  <notification name="FlushMapVisibilityCaches">このリージョンのマップのキャッシュを消去します。デバッグ目的のみに便利な操作です。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="信用する"/>
+	</notification>
+	<notification name="NotEnoughCurrency">[NAME]は、L$ [PRICE]残高不足のため実行不可です。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="GrantedModifyRights">
+		[NAME]は、あなたにオブジェクトの編集権限を与えました。
+	</notification>
+	<notification name="RevokedModifyRights">
+		[NAME]は、オブジェクトを編集する権限を取り消されました。
+	</notification>
+	<notification name="FlushMapVisibilityCaches">このリージョンのマップのキャッシュを消去します。デバッグ目的のみに便利な操作です。
 （作成中は５分経過すると、全員のマップが再度ログイン後に更新されます）
-    <tag>fail</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BuyOneObjectOnly">一度に１つ以上のオブジェクトを買うことはできません。オブジェクトを１つだけ選んでもう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="OnlyCopyContentsOfSingleItem">一度に複数のアイテムの中身をコピーできません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BuyOneObjectOnly">一度に１つ以上のオブジェクトを買うことはできません。オブジェクトを１つだけ選んでもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="OnlyCopyContentsOfSingleItem">一度に複数のアイテムの中身をコピーできません。
 オブジェクトを１つだけ選択して、もう一度お試しください。
-    <tag>fail</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="KickUsersFromRegion">このリージョンにいる全ての住人をホームにテレポートさせますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ChangeObjectBonusFactor">リージョン（地域）のオブジェクトボーナスを下げると、制作されたオブジェクトが返却されたり、削除されます。本当にオブジェクトボーナスを変更してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="オブジェクトボーナス係数変更の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="EstateObjectReturn">[USER_NAME]が、所有しているオブジェクトを返却しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="InvalidTerrainBitDepth">地域テクスチャを設定できませんでした：
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="KickUsersFromRegion">このリージョンにいる全ての住人をホームにテレポートさせますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ChangeObjectBonusFactor">リージョン（地域）のオブジェクトボーナスを下げると、制作されたオブジェクトが返却されたり、削除されます。本当にオブジェクトボーナスを変更してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="オブジェクトボーナス係数変更の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="EstateObjectReturn">[USER_NAME]が、所有しているオブジェクトを返却しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="InvalidTerrainBitDepth">
+		地域テクスチャを設定できませんでした：
 地形テクスチャ「[TEXTURE_NUM]」は、無効なビット深度（[TEXTURE_BIT_DEPTH]ビット）です。
 
-テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。</notification>
-
-  <notification name="InvalidTerrainSize">地域テクスチャを設定できませんでした：
+テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。
+	</notification>
+	<notification name="InvalidTerrainSize">
+		地域テクスチャを設定できませんでした：
 地形テクスチャ「[TEXTURE_NUM]」は、[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] では大きすぎます。
 
-テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。</notification>
-
-  <notification name="RawUploadStarted">アップロードを開始しました。接続速度によっては、最大２分程度かかります。</notification>
-
-  <notification name="ConfirmBakeTerrain">現在の地形を構築しようとしています。この操作を行うと現在の地形が、土地の隆起と沈降の制限範囲の基準となり、「復元」ツールのデフォルトになります。操作を続行しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmTextureHeights">標高範囲に、最高値よりも大きい値を最低値にしようとしています。このまま続行してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="聞かないでください" name="yesnocancelbuttons" notext="キャンセル" yestext="Ok" />
-  </notification>
-
-  <notification name="MaxAllowedAgentOnRegion">許可できる住人は、[MAX_AGENTS]人までです。</notification>
-
-  <notification name="MaxBannedAgentsOnRegion">バンできる住人は、[MAX_BANNED]人までです。</notification>
-
-  <notification name="MaxAgentOnRegionBatch">[NUM_ADDED]人のエージェントを追加しようとして失敗しました：[MAX_AGENTS]
-[LIST_TYPE]人中[NUM_EXCESS]人超過しています。</notification>
-
-  <notification name="MaxAllowedGroupsOnRegion">許可グループは、[MAX_GROUPS]グループまでです。
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="構築する" />
-  </notification>
-
-  <notification name="MaxManagersOnRegion">不動産マネージャーは、[MAX_MANAGER]人までです。</notification>
-
-  <notification name="OwnerCanNotBeDenied">不動産所有者を不動産の「バンした住人」リストに追加することはできません。</notification>
-
-  <notification name="ProblemAddingEstateManagerBanned">「バンした住人」を不動産管理者リストに追加することはできません。</notification>
-
-  <notification name="ProblemBanningEstateManager">「バンした住民」リストに不動産マネージャー[AGENT]を追加することはできません。</notification>
-
-  <notification name="GroupIsAlreadyInList">「&lt;nolink&gt;[GROUP]&lt;/nolink&gt;」は、すでに許可されたグループのリストに追加されています。</notification>
-
-  <notification name="AgentIsAlreadyInList">[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。</notification>
-
-  <notification name="AgentsAreAlreadyInList">[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。</notification>
-
-  <notification name="AgentWasAddedToList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。</notification>
-
-  <notification name="AgentsWereAddedToList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。</notification>
-
-  <notification name="AgentWasRemovedFromList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。</notification>
-
-  <notification name="AgentsWereRemovedFromList">[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。</notification>
-
-  <notification name="CanNotChangeAppearanceUntilLoaded">服装およびシェイプが読み込まれるまでは、容姿の変更はできません。</notification>
-
-  <notification name="ClassifiedMustBeAlphanumeric">クラシファイド広告の名前は、アルファベットか数字で始めます。句読点から始めることはできません。</notification>
-
-  <notification name="CantSetBuyObject">オブジェクトが販売対象ではないため、オブジェクトの購入ができません。
-販売対象のオブジェクトを指定してもう一度試してください。</notification>
-
-  <notification name="FinishedRawDownload">未加工の地形ファイルをダウンロードしました：[DOWNLOAD_PATH]</notification>
-
-  <notification name="RequiredUpdate">ログインするには、バージョン[VERSION]が必要です。以下からダウンロードしてください。
+テクスチャは、24ビットの512✕512以下の画像を選択し、「適用」ボタンを再度クリックしてください。
+	</notification>
+	<notification name="RawUploadStarted">
+		アップロードを開始しました。接続速度によっては、最大２分程度かかります。
+	</notification>
+	<notification name="ConfirmBakeTerrain">現在の地形を構築しようとしています。この操作を行うと現在の地形が、土地の隆起と沈降の制限範囲の基準となり、「復元」ツールのデフォルトになります。操作を続行しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmTextureHeights">標高範囲に、最高値よりも大きい値を最低値にしようとしています。このまま続行してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="聞かないでください" name="yesnocancelbuttons" notext="キャンセル" yestext="Ok"/>
+	</notification>
+	<notification name="MaxAllowedAgentOnRegion">
+		許可できる住人は、[MAX_AGENTS]人までです。
+	</notification>
+	<notification name="MaxBannedAgentsOnRegion">
+		バンできる住人は、[MAX_BANNED]人までです。
+	</notification>
+	<notification name="MaxAgentOnRegionBatch">
+		[NUM_ADDED]人のエージェントを追加しようとして失敗しました：[MAX_AGENTS]
+[LIST_TYPE]人中[NUM_EXCESS]人超過しています。
+	</notification>
+	<notification name="MaxAllowedGroupsOnRegion">許可グループは、[MAX_GROUPS]グループまでです。
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="構築する"/>
+	</notification>
+	<notification name="MaxManagersOnRegion">
+		不動産マネージャーは、[MAX_MANAGER]人までです。
+	</notification>
+	<notification name="OwnerCanNotBeDenied">
+		不動産所有者を不動産の「バンした住人」リストに追加することはできません。
+	</notification>
+	<notification name="ProblemAddingEstateManagerBanned">
+		「バンした住人」を不動産管理者リストに追加することはできません。
+	</notification>
+	<notification name="ProblemBanningEstateManager">
+		「バンした住民」リストに不動産マネージャー[AGENT]を追加することはできません。
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		「&lt;nolink&gt;[GROUP]&lt;/nolink&gt;」は、すでに許可されたグループのリストに追加されています。
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT]は、すでにあなたの[LIST_TYPE]リストに追加されています。
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT]が、[ESTATE]の[LIST_TYPE]リストに追加されました。
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT]が、[ESTATE]の[LIST_TYPE]リストから削除されました。
+	</notification>
+	<notification name="CanNotChangeAppearanceUntilLoaded">
+		服装およびシェイプが読み込まれるまでは、容姿の変更はできません。
+	</notification>
+	<notification name="ClassifiedMustBeAlphanumeric">
+		クラシファイド広告の名前は、アルファベットか数字で始めます。句読点から始めることはできません。
+	</notification>
+	<notification name="CantSetBuyObject">
+		オブジェクトが販売対象ではないため、オブジェクトの購入ができません。
+販売対象のオブジェクトを指定してもう一度試してください。
+	</notification>
+	<notification name="FinishedRawDownload">
+		未加工の地形ファイルをダウンロードしました：[DOWNLOAD_PATH]
+	</notification>
+	<notification name="RequiredUpdate">ログインするには、バージョン[VERSION]が必要です。以下からダウンロードしてください。
 https://secondlife.com/support/downloads/
-    <tag>confirm</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-  <notification name="PauseForUpdate">ログインするには、バージョン[VERSION]が必要です。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PauseForUpdate">ログインするには、バージョン[VERSION]が必要です。
 リリースノート：[URL]
 
 OKをクリックして、ダウンロードとインストールを開始します。
-    <tag>confirm</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="OptionalUpdateReady">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OptionalUpdateReady">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
 リリースノート：[URL]
 
 ＯＫをクリックして、ダウンロードとインストールを開始します。
-    <tag>confirm</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PromptOptionalUpdate">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PromptOptionalUpdate">バージョン[VERSION]のダウンロードが完了し、インストールの準備ができました。
 リリースノート：[URL]
 
 このまま続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="あとで" name="yesnocancelbuttons" notext="スキップ" yestext="インストール" />
-  </notification>
-
-  <notification name="LoginFailedUnknown">申し訳ありませんが、不明な理由によってログインに失敗しました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="あとで" name="yesnocancelbuttons" notext="スキップ" yestext="インストール"/>
+	</notification>
+	<notification name="LoginFailedUnknown">申し訳ありませんが、不明な理由によってログインに失敗しました。
 このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
-    <tag>confirm</tag>
-    <usetemplate name="okbutton" yestext="終了" />
-  </notification>
-
-  <notification name="DeedObjectToGroup">このオブジェクトを譲渡するとグループは以下のことが可能です：
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okbutton" yestext="終了"/>
+	</notification>
+	<notification name="DeedObjectToGroup">このオブジェクトを譲渡するとグループは以下のことが可能です：
 ・オブジェクトに支払われたL$を受領します。
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate ignoretext="オブジェクトをグループに譲渡する前の確認" name="okcancelignore" notext="キャンセル" yestext="譲渡する" />
-  </notification>
-
-  <notification name="WebLaunchExternalTarget">Webブラウザを開いてこのコンテンツを表示しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して、Webページを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="WebLaunchJoinNow">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]ページに移動してアカウントを管理しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して、アカウントを管理するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="WebLaunchSecurityIssues">[SECOND_LIFE] Wikiで、セキュリティ問題を報告する方法をご覧ください。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して、セキュリティ問題の報告方法を確認するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="WebLaunchQAWiki">[SECOND_LIFE] QA（品質保証）Wikiをご覧ください。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して、QA Wikiを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="WebLaunchPublicIssue">[SECOND_LIFE] Public Issue Trackerにアクセスして、バグやその他の問題を報告できます。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して、Public Issue Trackerにアクセスするとき" name="okcancelignore" notext="キャンセル" yestext="ページへ行く" />
-  </notification>
-
-  <notification name="WebLaunchSupportWiki">Linden公式ブログで、最新のニュースや情報を入手してください。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して、公式ブログを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="WebLaunchLSLGuide">スクリプトガイドを開きますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して、スクリプトガイドを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="WebLaunchLSLWiki">LSLポータルでスクリプトに関する情報を確認しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動して LSL ポータルを見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動" />
-  </notification>
-  <notification name="ReturnToOwner">選択したオブジェクトを、所有者に返却しますか？「再販・譲渡可」の譲渡されたオブジェクトは、以前の所有者に返却されます。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="オブジェクトをグループに譲渡する前の確認" name="okcancelignore" notext="キャンセル" yestext="譲渡する"/>
+	</notification>
+	<notification name="WebLaunchExternalTarget">Webブラウザを開いてこのコンテンツを表示しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して、Webページを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="WebLaunchJoinNow">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]ページに移動してアカウントを管理しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して、アカウントを管理するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="WebLaunchSecurityIssues">[SECOND_LIFE] Wikiで、セキュリティ問題を報告する方法をご覧ください。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して、セキュリティ問題の報告方法を確認するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="WebLaunchQAWiki">[SECOND_LIFE] QA（品質保証）Wikiをご覧ください。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して、QA Wikiを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="WebLaunchPublicIssue">[SECOND_LIFE] Public Issue Trackerにアクセスして、バグやその他の問題を報告できます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して、Public Issue Trackerにアクセスするとき" name="okcancelignore" notext="キャンセル" yestext="ページへ行く"/>
+	</notification>
+	<notification name="WebLaunchSupportWiki">Linden公式ブログで、最新のニュースや情報を入手してください。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して、公式ブログを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="WebLaunchLSLGuide">スクリプトガイドを開きますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して、スクリプトガイドを閲覧するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="WebLaunchLSLWiki">LSLポータルでスクリプトに関する情報を確認しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動して LSL ポータルを見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動"/>
+	</notification>
+	<notification name="ReturnToOwner">選択したオブジェクトを、所有者に返却しますか？「再販・譲渡可」の譲渡されたオブジェクトは、以前の所有者に返却されます。
 
 *警告*「再販・譲渡不可」の譲渡されたオブジェクトは、削除されます！
-    <tag>confirm</tag>
-    <usetemplate ignoretext="オブジェクトを所有者に返却するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GroupLeaveConfirmMember">現在、あなたは &lt;nolink&gt;[GROUP]&lt;/nolink&gt;グループのメンバーです。グループから脱退しますか？
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GroupDepart">グループ「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」から抜けました。</notification>
-  <notification name="OwnerCannotLeaveGroup">グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GroupDepartError">グループを抜けることができません。
-    <tag>group</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmKick">本当に住人全員をグリッドから追い出してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す" />
-  </notification>
-
-  <notification name="MuteLinden">リンデンをブロックすることはできません。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="CannotStartAuctionAlreadyForSale">既に売り出し中の区画なので、オークションにかけることはできません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="オブジェクトを所有者に返却するとき" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GroupLeaveConfirmMember">現在、あなたは &lt;nolink&gt;[GROUP]&lt;/nolink&gt;グループのメンバーです。グループから脱退しますか？
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GroupDepart">
+		グループ「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」から抜けました。
+	</notification>
+	<notification name="OwnerCannotLeaveGroup">グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GroupDepartError">グループを抜けることができません。
+    <tag>
+			group
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmKick">本当に住人全員をグリッドから追い出してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/>
+	</notification>
+	<notification name="MuteLinden">リンデンをブロックすることはできません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CannotStartAuctionAlreadyForSale">既に売り出し中の区画なので、オークションにかけることはできません。
 オークションにかけたい場合は、売り出し設定を解除してから行ってください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="名前でのオブジェクトのブロックに失敗しました" name="MuteByNameFailed">この名前は既にブロック済みです。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="RemoveItemWarn">コンテンツを削除すると、許可があってもオブジェクトに損傷を与えることがあります。削除を続けてもよろしいですか？
-    <tag>fail</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="CantOfferCallingCard">現在コーリングカードを送れません。数分後にもう一度お試しください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="CantOfferFriendship">現在フレンド申請を送れません。数分後にもう一度お試しください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="DoNotDisturbModeSet">「着信拒否」がオンになっています。通信の受信は通知されません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="名前でのオブジェクトのブロックに失敗しました" name="MuteByNameFailed">この名前は既にブロック済みです。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RemoveItemWarn">コンテンツを削除すると、許可があってもオブジェクトに損傷を与えることがあります。削除を続けてもよろしいですか？
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CantOfferCallingCard">現在コーリングカードを送れません。数分後にもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CantOfferFriendship">現在フレンド申請を送れません。数分後にもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DoNotDisturbModeSet">「着信拒否」がオンになっています。通信の受信は通知されません。
   
 ・他の居住者はあなたの「着信拒否」応答を受け取ります。（「初期設定」＞「全般」で設定）
 ・音声通話は拒否されます。
-    <usetemplate ignoretext="ログイン状態を「着信拒否」モードに変更したとき" name="okignore" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="JoinedTooManyGroupsMember">グループの最大数に達しました。このグループに参加する前に別のグループから退会するか、オファーを断ってください。
+    <usetemplate ignoretext="ログイン状態を「着信拒否」モードに変更したとき" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="JoinedTooManyGroupsMember">グループの最大数に達しました。このグループに参加する前に別のグループから退会するか、オファーを断ってください。
 [NAME]さんが、あなたをグループのメンバーに参加するよう招待しました。
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okcancelbuttons" notext="辞退" yestext="参加" />
-  </notification>
-
-  <notification name="JoinedTooManyGroups">グループの最大数に達しました。新しいグループに参加、作成する前に、グループから退出してください。
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="GroupLimitInfo">ベーシック会員の住民は、最大[MAX_BASIC]個のグループまで参加することができます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード] 
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="閉じる" />
-  </notification>
-
-  <notification name="GroupLimitInfoPlus">ベーシック会員の住人は、最大[MAX_BASIC]個までグループに参加できます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。プレミアム・プラス会員は最大[MAX_PREMIUM_PLUS]個です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード]
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="閉じる" />
-  </notification>
-
-  <notification name="KickUser">どのようなメッセージを添えて、この住人を追い出しますか？
-    <tag>win</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">あなたは管理者によりログオフされました。</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="KickAllUsers">どのようなメッセージをつけて、グリッドにいる全員を追い出しますか？
-    <tag>win</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">あなたは管理者によりログオフされました。</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="FreezeUser">どのようなメッセージを添えて、この住人をフリーズしますか？
-    <tag>win</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">あなたはフリーズされています。動くこともチャットすることもできません。管理者がＩＭであなたに連絡します。</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="UnFreezeUser">どのようなメッセージを添えて、この住人のフリーズを解除しますか？
-    <tag>win</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">もうフリーズされていません。</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-  <notification name="SetDisplayNameSuccess">[DISPLAY_NAME]さん、
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="辞退" yestext="参加"/>
+	</notification>
+	<notification name="JoinedTooManyGroups">グループの最大数に達しました。新しいグループに参加、作成する前に、グループから退出してください。
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="GroupLimitInfo">ベーシック会員の住民は、最大[MAX_BASIC]個のグループまで参加することができます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード] 
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="閉じる"/>
+	</notification>
+	<notification name="GroupLimitInfoPlus">ベーシック会員の住人は、最大[MAX_BASIC]個までグループに参加できます。プレミアム会員は最大[MAX_PREMIUM]個まで参加可能です。プレミアム・プラス会員は最大[MAX_PREMIUM_PLUS]個です。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細またはアップグレード]
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="閉じる"/>
+	</notification>
+	<notification name="KickUser">どのようなメッセージを添えて、この住人を追い出しますか？
+    <tag>
+			win
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				あなたは管理者によりログオフされました。
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="KickAllUsers">どのようなメッセージをつけて、グリッドにいる全員を追い出しますか？
+    <tag>
+			win
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				あなたは管理者によりログオフされました。
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="FreezeUser">どのようなメッセージを添えて、この住人をフリーズしますか？
+    <tag>
+			win
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				あなたはフリーズされています。動くこともチャットすることもできません。管理者がＩＭであなたに連絡します。
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="UnFreezeUser">どのようなメッセージを添えて、この住人のフリーズを解除しますか？
+    <tag>
+			win
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				もうフリーズされていません。
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="SetDisplayNameSuccess">
+		[DISPLAY_NAME]さん、
 
 現実の世界と同じく、Second Lifeでも新しい名前が浸透するには時間がかかります。
-[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC%E5%90%8D%E3%81%A8%E8%A1%A8%E7%A4%BA%E5%90%8D-r1333/ ユーザー名と表示名]が、オブジェクトやスクリプト、検索結果などに更新されるまで、数日かかりますのでご了承ください。</notification>
-
-  <notification name="SetDisplayNameBlocked">申し訳ありませんが、現在表示名は変更できません。システムエラーと思われる場合は、サポートにお問い合わせください。</notification>
-
-  <notification name="SetDisplayNameFailedLength">申し訳ありませんが、その名前は長すぎます。表示名で使用できる文字数は、[LENGTH]文字までです。
-
-もう少し短い名前をお試しください。</notification>
-
-  <notification name="SetDisplayNameFailedGeneric">申し訳ありませんが、表示名を設定できませんでした。あとでもう一度お試しください。</notification>
-
-  <notification name="SetDisplayNameMismatch">入力した表示名が一致しません。もう一度入力してください。
-    <tag>fail</tag>
-  </notification>
-
-  <!-- *NOTE: This should never happen -->
-  <notification name="AgentDisplayNameUpdateThresholdExceeded">申し訳ありませんが、表示名を変更できるようになるまで、さらに長く待つ必要があります。
+[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC%E5%90%8D%E3%81%A8%E8%A1%A8%E7%A4%BA%E5%90%8D-r1333/ ユーザー名と表示名]が、オブジェクトやスクリプト、検索結果などに更新されるまで、数日かかりますのでご了承ください。
+	</notification>
+	<notification name="SetDisplayNameBlocked">
+		申し訳ありませんが、現在表示名は変更できません。システムエラーと思われる場合は、サポートにお問い合わせください。
+	</notification>
+	<notification name="SetDisplayNameFailedLength">
+		申し訳ありませんが、その名前は長すぎます。表示名で使用できる文字数は、[LENGTH]文字までです。
+
+もう少し短い名前をお試しください。
+	</notification>
+	<notification name="SetDisplayNameFailedGeneric">
+		申し訳ありませんが、表示名を設定できませんでした。あとでもう一度お試しください。
+	</notification>
+	<notification name="SetDisplayNameMismatch">入力した表示名が一致しません。もう一度入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AgentDisplayNameUpdateThresholdExceeded">申し訳ありませんが、表示名を変更できるようになるまで、さらに長く待つ必要があります。
 
 https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC%E5%90%8D%E3%81%A8%E8%A1%A8%E7%A4%BA%E5%90%8D-r1333/ を参照してください。
 
 あとでもう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AgentDisplayNameSetBlocked">申し訳ありませんが、要求された名前には禁止ワードが含まれているため、設定できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AgentDisplayNameSetBlocked">申し訳ありませんが、要求された名前には禁止ワードが含まれているため、設定できませんでした。
 
 別の名前をお試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AgentDisplayNameSetInvalidUnicode">設定しようとしている表示名に、使用できない文字が含まれます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AgentDisplayNameSetOnlyPunctuation">設定しようとしている表示名には、句読点以外の文字を含む必要があります。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="DisplayNameUpdate">[OLD_NAME] ([SLID]) は、[NEW_NAME]に変更されました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="OfferTeleport">次のメッセージを使用して、あなたのいる場所へのテレポートのオファーしますか？
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">[REGION]に来てみませんか？</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="TooManyTeleportOffers">[OFFERS]回にわたってテレポートを送ろうとしましたが、限度数[LIMIT]を超えてしましました。
-    <tag>group</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="OfferTeleportFromGod">現在地に住人をゴッド・サモンしますか？
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">[REGION]に来てみませんか？</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="TeleportFromLandmark">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ランドマークに指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
-  </notification>
-
-  <notification name="TeleportViaSLAPP">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="SLAPPからテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
-  </notification>
-
-  <notification name="TeleportToPick">[PICK]にテレポートしますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ピックに指定されてる場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
-  </notification>
-
-  <notification name="TeleportToClassified">[CLASSIFIED]にテレポートしますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="クラシファイド広告で指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
-  </notification>
-
-  <notification name="TeleportToHistoryEntry">[HISTORY_ENTRY]にテレポートしますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="履歴の場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート" />
-  </notification>
-
-  <notification label="あなたの不動産にいる全員に送信するメッセージ" name="MessageEstate">今あなたの不動産にいる人全員に送る、短いメッセージを入力してください。
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" />
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification label="Lindenの不動産を変更" name="ChangeLindenEstate">リンデンが所有する不動産（メインランド、ティーングリッド、オリエンテーションなど）を変更しようとしています。住人の体験に根本的に影響を与えるため、非常に危険な行為です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AgentDisplayNameSetInvalidUnicode">設定しようとしている表示名に、使用できない文字が含まれます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AgentDisplayNameSetOnlyPunctuation">設定しようとしている表示名には、句読点以外の文字を含む必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DisplayNameUpdate">[OLD_NAME] ([SLID]) は、[NEW_NAME]に変更されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="OfferTeleport">次のメッセージを使用して、あなたのいる場所へのテレポートのオファーしますか？
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				[REGION]に来てみませんか？
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="TooManyTeleportOffers">[OFFERS]回にわたってテレポートを送ろうとしましたが、限度数[LIMIT]を超えてしましました。
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OfferTeleportFromGod">現在地に住人をゴッド・サモンしますか？
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				[REGION]に来てみませんか？
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="TeleportFromLandmark">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ランドマークに指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+	</notification>
+	<notification name="TeleportViaSLAPP">&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;にテレポートしてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="SLAPPからテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+	</notification>
+	<notification name="TeleportToPick">[PICK]にテレポートしますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ピックに指定されてる場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+	</notification>
+	<notification name="TeleportToClassified">[CLASSIFIED]にテレポートしますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="クラシファイド広告で指定されている場所へテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+	</notification>
+	<notification name="TeleportToHistoryEntry">[HISTORY_ENTRY]にテレポートしますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="履歴の場所にテレポートする前の確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+	</notification>
+	<notification label="あなたの不動産にいる全員に送信するメッセージ" name="MessageEstate">今あなたの不動産にいる人全員に送る、短いメッセージを入力してください。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message"/>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="Lindenの不動産を変更" name="ChangeLindenEstate">リンデンが所有する不動産（メインランド、ティーングリッド、オリエンテーションなど）を変更しようとしています。住人の体験に根本的に影響を与えるため、非常に危険な行為です。
 
 メインランドでは、何千というリージョンが変更による影響を受け、そのためスペースサーバーに負担をかけることになります。
 
 それでも続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess">あなたはリンデン所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）へのアクセスリストを変更しようとしています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess">あなたはリンデン所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）へのアクセスリストを変更しようとしています。
 
 この行為は「危険」であり、グリッドからオブジェクトやお金の転送をもたらすハッキングを引き起こす可能性があるため、完全にそれを意図した場合のみ行うべきものです。
 
 これにより多数のリージョン（地域）が変更され、スペースサーバーに悪影響が生じます。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateAllowedAgentAdd">この不動産限定の許可リストに追加しますか？それとも、[ALL_ESTATES]の許可リストに追加しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateAllowedAgentRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES]から削除しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateAllowedGroupAdd">この不動産限定のグループ許可リストに追加しますか？それとも、[ALL_ESTATES]のグループ許可リストに追加しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateAllowedGroupRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES] から削除しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateBannedAgentAdd">この不動産限定でアクセスを拒否しますか？それとも、[ALL_ESTATE]へのアクセスを拒否しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateBannedAgentRemove">この住人をこの不動産のバンリストからのみ削除しますか？それとも、[ALL_ESTATES]のバンリストから削除しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateManagerAdd">この不動産限定、または[ALL_ESTATES]の不動産マネージャーを追加しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateManagerRemove">不動産マネージャーをこの不動産限定、または[ALL_ESTATES]から削除しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateAllowedExperienceAdd">この不動産の許可リストにのみ追加しますか、それとも[ALL_ESTATES]の許可リストに追加しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateAllowedExperienceRemove">この不動産の許可リストからのみ削除しますか、それとも[ALL_ESTATES]の許可リストから削除しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateBlockedExperienceAdd">この不動産のブロックされたリストにのみ追加しますか、それとも[ALL_ESTATES]のブロックされたリストに追加しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateBlockedExperienceRemove">この不動産のブロックされたリストからのみ削除しますか、それとも[ALL_ESTATES]のブロックされたリストから削除しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateTrustedExperienceAdd">この不動産のキー リストにのみ追加しますか、それとも[ALL_ESTATES]のキーリストに追加しますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="不動産を選択" name="EstateTrustedExperienceRemove">この不動産のキーリストからのみ削除しますか、それとも[ALL_ESTATES]のキーリストから削除しますか？
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産" />
-  </notification>
-
-  <notification label="バンの確認" name="EstateKickUser">この不動産から[EVIL_USER]を追い出しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="EstateChangeCovenant">不動産約款を変更しようとしています。続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="EstateParcelAccessOverride">このオプションのチェックを外すと、グリーティングの防止、プライバシーの維持、成人向けコンテンツから未成年の居住者を保護するために区画所有者が追加した制限が削除される場合があります。必要に応じて土地所有者と相談してください。
-    <tag>confirm</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="EstateParcelEnvironmentOverride">（不動産全体の変更：[ESTATENAME]）このオプションのチェックを外すと、区画所有者が区画に追加したカスタム環境がすべて削除されます。必要に応じて土地所有者と相談してください。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateAllowedAgentAdd">この不動産限定の許可リストに追加しますか？それとも、[ALL_ESTATES]の許可リストに追加しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateAllowedAgentRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES]から削除しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateAllowedGroupAdd">この不動産限定のグループ許可リストに追加しますか？それとも、[ALL_ESTATES]のグループ許可リストに追加しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateAllowedGroupRemove">この不動産限定の許可リストから削除しますか？それとも、[ALL_ESTATES] から削除しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateBannedAgentAdd">この不動産限定でアクセスを拒否しますか？それとも、[ALL_ESTATE]へのアクセスを拒否しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateBannedAgentRemove">この住人をこの不動産のバンリストからのみ削除しますか？それとも、[ALL_ESTATES]のバンリストから削除しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateManagerAdd">この不動産限定、または[ALL_ESTATES]の不動産マネージャーを追加しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateManagerRemove">不動産マネージャーをこの不動産限定、または[ALL_ESTATES]から削除しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateAllowedExperienceAdd">この不動産の許可リストにのみ追加しますか、それとも[ALL_ESTATES]の許可リストに追加しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateAllowedExperienceRemove">この不動産の許可リストからのみ削除しますか、それとも[ALL_ESTATES]の許可リストから削除しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateBlockedExperienceAdd">この不動産のブロックされたリストにのみ追加しますか、それとも[ALL_ESTATES]のブロックされたリストに追加しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateBlockedExperienceRemove">この不動産のブロックされたリストからのみ削除しますか、それとも[ALL_ESTATES]のブロックされたリストから削除しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateTrustedExperienceAdd">この不動産のキー リストにのみ追加しますか、それとも[ALL_ESTATES]のキーリストに追加しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="不動産を選択" name="EstateTrustedExperienceRemove">この不動産のキーリストからのみ削除しますか、それとも[ALL_ESTATES]のキーリストから削除しますか？
+    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
+	</notification>
+	<notification label="バンの確認" name="EstateKickUser">この不動産から[EVIL_USER]を追い出しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="EstateChangeCovenant">不動産約款を変更しようとしています。続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="EstateParcelAccessOverride">このオプションのチェックを外すと、グリーティングの防止、プライバシーの維持、成人向けコンテンツから未成年の居住者を保護するために区画所有者が追加した制限が削除される場合があります。必要に応じて土地所有者と相談してください。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="EstateParcelEnvironmentOverride">（不動産全体の変更：[ESTATENAME]）このオプションのチェックを外すと、区画所有者が区画に追加したカスタム環境がすべて削除されます。必要に応じて土地所有者と相談してください。
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="RegionEntryAccessBlocked">訪問しようとしているリージョン（地域）には、現在の初期設定を超えるレーティングのコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked">訪問しようとしているリージョン（地域）には、現在の初期設定を超えるレーティングのコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
 
 レーティング制限に関する詳細情報は、[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/ こちら]をご覧になってください。
-    <tag>confirm</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="RegionEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
-    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
-    <tag>fail</tag>
-    <usetemplate ignoretext="リージョン（地域）の横断：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
-  </notification>
-
-  <notification name="SLM_UPDATE_FOLDER">[MESSAGE]</notification>
-
-  <notification name="RegionEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツ除外するように設定されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY] コンテンツが含まれています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RegionEntryAccessBlocked_Change">訪問しようとしているリ－ジョン（地域）は、[REGIONMATURITY]コンテンツが含まれていますが、現在の設定では[REGIONMATURITY]コンテンツを除外するように設定されています。ご希望を変更することも、キャンセルすることもできます。この設定を変更すると、そのリージョンに入ることができるようになります。
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="ＯＫ" text="初期設定の変更" />
-      <button default="true" name="Cancel" text="キャンセル" />
-      <ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしているリージョン（地域）には現在の初期設定により除外されたコンテンツが含まれています。" />
-    </form>
-  </notification>
-
-  <notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="TeleportEntryAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <url name="url">
+			https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/
+		</url>
+		<tag>
+			fail
+		</tag>
+		<usetemplate ignoretext="リージョン（地域）の横断：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+	</notification>
+	<notification name="SLM_UPDATE_FOLDER">
+		[MESSAGE]
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツ除外するように設定されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY] コンテンツが含まれています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Change">訪問しようとしているリ－ジョン（地域）は、[REGIONMATURITY]コンテンツが含まれていますが、現在の設定では[REGIONMATURITY]コンテンツを除外するように設定されています。ご希望を変更することも、キャンセルすることもできます。この設定を変更すると、そのリージョンに入ることができるようになります。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="ＯＫ" text="初期設定の変更"/>
+			<button default="true" name="Cancel" text="キャンセル"/>
+			<ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしているリージョン（地域）には現在の初期設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
     <unique>
-      <context>REGIONMATURITY</context>
-    </unique>
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
-    <usetemplate ignoretext="テレポート：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
-  </notification>
-
-  <notification name="TeleportEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+			<context>
+				REGIONMATURITY
+			</context>
+		</unique>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<url name="url">
+			https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/
+		</url>
+		<usetemplate ignoretext="テレポート：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
     <unique>
-      <context>REGIONMATURITY</context>
-    </unique>
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+			<context>
+				REGIONMATURITY
+			</context>
+		</unique>
+		<tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">訪問しようとしているリージョン（地域）には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
     <unique>
-      <context>REGIONMATURITY</context>
-    </unique>
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+			<context>
+				REGIONMATURITY
+			</context>
+		</unique>
+		<tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">訪問しようとしているリージョン（地域）には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
 初期設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
     <unique>
-      <context>REGIONMATURITY</context>
-    </unique>
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="ＯＫ" text="変更して続ける" />
-      <button name="Cancel" text="キャンセル" />
-      <ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。" />
-    </form>
-  </notification>
-
-  <notification name="TeleportEntryAccessBlocked_Change">訪問しようとしているリージョン（地域）には、 [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
+			<context>
+				REGIONMATURITY
+			</context>
+		</unique>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="ＯＫ" text="変更して続ける"/>
+			<button name="Cancel" text="キャンセル"/>
+			<ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">訪問しようとしているリージョン（地域）には、 [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は[REGIONMATURITY]コンテンツを除外するように設定されています。
 初期設定を変更するか、テレポートを取り消すことができます。初期設定を変更した後、もう一度テレポートを実行する必要があります。
     <unique>
-      <context>REGIONMATURITY</context>
-    </unique>
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="ＯＫ" text="初期設定の変更" />
-      <button name="Cancel" text="キャンセル" />
-      <ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。" />
-    </form>
-  </notification>
-
-  <notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="RegionTPSpecialUsageBlocked">リージョン（地域）に入ることができません。「[REGION_NAME]」は、スキルゲーミングリージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。
+			<context>
+				REGIONMATURITY
+			</context>
+		</unique>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="ＯＫ" text="初期設定の変更"/>
+			<button name="Cancel" text="キャンセル"/>
+			<ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしているリージョン（地域）には、現在の初期設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">あなたの初期設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RegionTPSpecialUsageBlocked">リージョン（地域）に入ることができません。「[REGION_NAME]」は、スキルゲーミングリージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。
 詳しくは、[https://wiki.secondlife.com/wiki/Linden_Lab_Official:Second_Life_Skill_Gaming_FAQ スキルゲーミングのよくある質問]を参照してください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PreferredMaturityChanged">今後、[RATING]コンテンツ付きのリージョン（地域）を訪問しようとしているという通知を受け取りません。後でメニューバーの「私」＞「初期設定」＞「一般」を使用して、コンテンツの初期設定を変更できます。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="MaturityChangeError">現在、[PREFERRED_MATURITY]コンテンツを表示するように初期設定を変更できませんでした。あなたの初期設定は、[ACTUAL_MATURITY]コンテンツを表示するようにリセットされました。メニューバーの「私」＞「初期設定」＞「一般」を使用して、もう一度初期設定を変更できます。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="LandClaimAccessBlocked">取得しようとしている土地には現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="LandClaimAccessBlocked_AdultsOnlyContent">この土地を購入できるのは、成人だけです。   
-    <tag>fail</tag>
-    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
-    <usetemplate ignoretext="土地を購入：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
-  </notification>
-
-  <notification name="LandClaimAccessBlocked_Notify">取得しようとしている土地には。[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandClaimAccessBlocked_NotifyAdultsOnly">取得しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandClaimAccessBlocked_Change">取得しようとしている土地には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の取得を試みることができます。
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="ＯＫ" text="初期設定の変更" />
-      <button name="Cancel" text="キャンセル" />
-      <ignore name="ignore" text="取得しようとしている土地には、現在の初期設定により除外されたコンテンツが含まれています。" />
-    </form>
-  </notification>
-
-  <notification name="LandBuyAccessBlocked">購入しようとしている土地には、現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」から設定を変更できます。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="LandBuyAccessBlocked_AdultsOnlyContent">この土地を取得できるのは、成人だけです。
-    <tag>confirm</tag>
-    <tag>fail</tag>
-    <url name="url">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/</url>
-    <usetemplate ignoretext="土地の取得：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く" />
-  </notification>
-
-  <notification name="LandBuyAccessBlocked_Notify">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandBuyAccessBlocked_NotifyAdultsOnly">購入しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandBuyAccessBlocked_Change">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の購入を試みることができます。
-    <tag>confirm</tag>
-    <tag>fail</tag>
-    <form name="form">
-      <button name="ＯＫ" text="初期設定の変更" />
-      <button name="Cancel" text="キャンセル" />
-      <ignore name="ignore" text="購入しようとしている土地には現在の初期設定により除外されたコンテンツが含まれています。" />
-    </form>
-  </notification>
-
-  <notification name="TooManyPrimsSelected">選択したプリムが多すぎます：[MAX_PRIM_COUNT]
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PreferredMaturityChanged">今後、[RATING]コンテンツ付きのリージョン（地域）を訪問しようとしているという通知を受け取りません。後でメニューバーの「私」＞「初期設定」＞「一般」を使用して、コンテンツの初期設定を変更できます。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MaturityChangeError">現在、[PREFERRED_MATURITY]コンテンツを表示するように初期設定を変更できませんでした。あなたの初期設定は、[ACTUAL_MATURITY]コンテンツを表示するようにリセットされました。メニューバーの「私」＞「初期設定」＞「一般」を使用して、もう一度初期設定を変更できます。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked">取得しようとしている土地には現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">この土地を購入できるのは、成人だけです。   
+    <tag>
+			fail
+		</tag>
+		<url name="url">
+			https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/
+		</url>
+		<usetemplate ignoretext="土地を購入：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_Notify">取得しようとしている土地には。[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">取得しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandClaimAccessBlocked_Change">取得しようとしている土地には、[REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の取得を試みることができます。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="ＯＫ" text="初期設定の変更"/>
+			<button name="Cancel" text="キャンセル"/>
+			<ignore name="ignore" text="取得しようとしている土地には、現在の初期設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="LandBuyAccessBlocked">購入しようとしている土地には、現在の初期設定を超えるレーティング区分が含まれています。「私」＞「初期設定」＞「一般」から設定を変更できます。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">この土地を取得できるのは、成人だけです。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<url name="url">
+			https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AC%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%8C%BA%E5%88%86-r323/
+		</url>
+		<usetemplate ignoretext="土地の取得：成人のみアクセスできるコンテンツが含まれているときの警告" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_Notify">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">購入しようとしている土地には、成人のみアクセスできる[REGIONMATURITY]コンテンツが含まれています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandBuyAccessBlocked_Change">購入しようとしている土地には [REGIONMATURITY]コンテンツが含まれていますが、現在の初期設定は、[REGIONMATURITY]コンテンツを除外するように設定されています。初期設定を変更して、もう一度土地の購入を試みることができます。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<form name="form">
+			<button name="ＯＫ" text="初期設定の変更"/>
+			<button name="Cancel" text="キャンセル"/>
+			<ignore name="ignore" text="購入しようとしている土地には現在の初期設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="TooManyPrimsSelected">選択したプリムが多すぎます：[MAX_PRIM_COUNT]
 個選択するか、プリム数を減らしてもう一度お試しください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="TooManyScriptsSelected">
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="TooManyScriptsSelected">
 スクリプト内で選択されたオブジェクトが多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ProblemImportingEstateCovenant">不動産約款のインポート時に問題が発生しました。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ProblemAddingEstateManager">新しい不動産マネージャーの追加に関する問題：
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ProblemImportingEstateCovenant">不動産約款のインポート時に問題が発生しました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ProblemAddingEstateManager">新しい不動産マネージャーの追加に関する問題：
 いずれかの不動産のマネージャーリストが満杯になっています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ProblemAddingEstateBanManager">不動産所有者または管理者を禁止リストに追加できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ProblemAddingEstateGeneric">不動産リストの追加に関する問題：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ProblemAddingEstateBanManager">不動産所有者または管理者を禁止リストに追加できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ProblemAddingEstateGeneric">不動産リストの追加に関する問題：
 いずれかの不動産のリストが満杯になっています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToLoadNotecardAsset">現在ノートカードのアセットＩＤを読み込むことができません。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="NotAllowedToViewNotecard">要求したアセットＩＤに関するノートカードを閲覧するには、権限が不十分です。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="MissingNotecardAssetID">ノートカード用のアセットＩＤがデータベースに登録されていません。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PublishClassified">注意：クラシファイド広告の掲載料金の払い戻しはできません。L$ [AMOUNT]で、このクラシファイド広告を今すぐ公開しますか？
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SetClassifiedMature">この広告に「Moderate」コンテンツは含まれていますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="SetGroupMature">このグループに「Moderate」コンテンツが含まれていますか？
-    <tag>confirm</tag>
-    <usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification label="再起動を確認" name="ConfirmRestart">このリージョンを２分後に再起動しようとしています。このまま続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification label="このリージョンにメッセージを送信" name="MessageRegion">このリージョン（地域）にいる人全員に送る、短いメッセージを入力してください。
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" />
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification label="地域のレーティング区分指定変更しました" name="RegionMaturityChange">このリージョン（地域）のレーティング区分が変更されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToLoadNotecardAsset">現在ノートカードのアセットＩＤを読み込むことができません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="NotAllowedToViewNotecard">要求したアセットＩＤに関するノートカードを閲覧するには、権限が不十分です。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MissingNotecardAssetID">ノートカード用のアセットＩＤがデータベースに登録されていません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PublishClassified">注意：クラシファイド広告の掲載料金の払い戻しはできません。L$ [AMOUNT]で、このクラシファイド広告を今すぐ公開しますか？
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SetClassifiedMature">この広告に「Moderate」コンテンツは含まれていますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="SetGroupMature">このグループに「Moderate」コンテンツが含まれていますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification label="再起動を確認" name="ConfirmRestart">このリージョンを２分後に再起動しようとしています。このまま続けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification label="このリージョンにメッセージを送信" name="MessageRegion">このリージョン（地域）にいる人全員に送る、短いメッセージを入力してください。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message"/>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="地域のレーティング区分指定変更しました" name="RegionMaturityChange">このリージョン（地域）のレーティング区分が変更されました。
 マップにこの変更が反映するには数分かかることがあります。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">[APP_NAME]のこのバージョンは、このリージョン（地域）におけるボイスチャットの互換性がありません。ボイスチャットを正常に行うためには、[APP_NAME]のアップデートが必要です。
-    <tag>fail</tag>
-    <tag>voice</tag>
-  </notification>
-
-  <notification label="オブジェクトを購入できません" name="BuyObjectOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">[APP_NAME]のこのバージョンは、このリージョン（地域）におけるボイスチャットの互換性がありません。ボイスチャットを正常に行うためには、[APP_NAME]のアップデートが必要です。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+	</notification>
+	<notification label="オブジェクトを購入できません" name="BuyObjectOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
 単一のオブジェクトを選択し、もう一度試してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="コンテンツを購入できません" name="BuyContentsOneOnly">一度に複数のオブジェクトのコンテンツは購入できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="コンテンツを購入できません" name="BuyContentsOneOnly">一度に複数のオブジェクトのコンテンツは購入できません。
 選択するオブジェクトを一つだけにして、もう一度試してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="コンテンツを購入できません" name="BuyContentsOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="コンテンツを購入できません" name="BuyContentsOneOwner">複数の所有者から同時にオブジェクトを購入することはできません。
 単一のオブジェクトを選択し、もう一度試してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="BuyOriginal">オリジナルのオブジェクトを[OWNER]からL$ [PRICE]で購入しますか？
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="BuyOriginal">オリジナルのオブジェクトを[OWNER]からL$ [PRICE]で購入しますか？
 購入すると、あなたがオブジェクトの所有者となり、以下の操作が可能になります。
 修正：[MODIFYPERM]
 コピー：[COPYPERM]
 再販・譲渡：[RESELLPERM]
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BuyOriginalNoOwner">L$ [PRICE]でオリジナルのオブジェクトを購入しますか？
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BuyOriginalNoOwner">L$ [PRICE]でオリジナルのオブジェクトを購入しますか？
 購入すると、あなたがオブジェクトの所有者となり、以下の操作が可能になります。
 修正：[MODIFYPERM]
 コピー：[COPYPERM]
 再販・譲渡：[RESELLPERM]
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BuyCopy">コピーを[OWNER]からL$ [PRICE]で購入しますか？
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BuyCopy">コピーを[OWNER]からL$ [PRICE]で購入しますか？
 購入したオブジェクトは、あなたのインベントリにコピーされ、以下の操作が可能になります。
 修正：[MODIFYPERM]
 コピー：[COPYPERM]
 再販・譲渡：[RESELLPERM]
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BuyCopyNoOwner">L$ [PRICE]でコピーを購入しますか？
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BuyCopyNoOwner">L$ [PRICE]でコピーを購入しますか？
 購入したオブジェクトは、あなたのインベントリにコピーされ、以下の操作が可能になります。
 修正：[MODIFYPERM]
 コピー：[COPYPERM]
 再販・譲渡：[RESELLPERM]
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BuyContents">中身を[OWNER]からL$ [PRICE]で購入しますか？購入した中身は、あなたのインベントリにコピーされます。
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BuyContentsNoOwner">L$ [PRICE]で中身を購入しますか？ 購入した中身は、あなたのインベントリにコピーされます。
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmPurchase">この取引は以下のとおり行われます：
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BuyContents">中身を[OWNER]からL$ [PRICE]で購入しますか？購入した中身は、あなたのインベントリにコピーされます。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BuyContentsNoOwner">L$ [PRICE]で中身を購入しますか？ 購入した中身は、あなたのインベントリにコピーされます。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmPurchase">この取引は以下のとおり行われます：
 [ACTION]
 
 このまま購入を続けてもよろしいですか？
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmPurchasePassword">この取引は以下のとおり行われます：
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmPurchasePassword">この取引は以下のとおり行われます：
 [ACTION]
 
 このまま購入を続けてもよろしいですか？
 パスワードを再入力し、「ＯＫ」をクリックしてください。
-    <tag>confirm</tag>
-    <tag>funds</tag>
-    <form name="form">
-      <input name="message" />
-      <button name="ConfirmPurchase" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="SetPickLocation">メモ：
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			funds
+		</tag>
+		<form name="form">
+			<input name="message"/>
+			<button name="ConfirmPurchase" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="SetPickLocation">メモ：
 本ピックの位置を更新しましたが、 他の詳細は元の値のままになります。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="MoveInventoryFromObject">「コピー不可」のインベントリアイテムを選択しました。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MoveInventoryFromObject">「コピー不可」のインベントリアイテムを選択しました。
 これらのアイテムはコピーされないまま、あなたのインベントリに移動されます。
 
 このままインベントリにアイテムを移動しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="「コピー不可」のアイテムをオブジェクトから動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="MoveInventoryFromScriptedObject">「コピー不可」のインベントリアイテムを選択しました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="「コピー不可」のアイテムをオブジェクトから動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="MoveInventoryFromScriptedObject">「コピー不可」のインベントリアイテムを選択しました。
 これらのアイテムはコピーされずに、あなたのインベントリに移動されます。このオブジェクトはスクリプト付きなので、インベントリに移動させると、スクリプトに誤動作が起きる可能性があります。
 
 このままインベントリにアイテムを移動しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="スクリプト入りのオブジェクトを壊す恐れのある「コピー不可」のアイテムを動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ClickActionNotPayable">警告：クリックで「オブジェクトに支払う」設定をしました。スクリプトにmoney()イベントが追加されると動作します。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="スクリプト入りのオブジェクトを壊す恐れのある「コピー不可」のアイテムを動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ClickActionNotPayable">警告：クリックで「オブジェクトに支払う」設定をしました。スクリプトにmoney()イベントが追加されると動作します。
     <form name="form">
-      <ignore name="ignore" text="オブジェクトを作成中に、money() スクリプトを入れずに「オブジェクトに支払う」アクションを設定したとき" />
-    </form>
-  </notification>
-
-  <notification name="PayConfirmation">[TARGET]にL$ [AMOUNT]を支払うことを確認してください。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="支払い前に確認 (合計金額がL$ 200を超える場合)" name="okcancelignore" notext="キャンセル" yestext="支払い" />
-  </notification>
-
-  <notification name="PayObjectFailed">支払いが失敗しました：オブジェクトが見つかりませんでした。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PaymentBlockedButtonMismatch">支払いが停止されました：
+			<ignore name="ignore" text="オブジェクトを作成中に、money() スクリプトを入れずに「オブジェクトに支払う」アクションを設定したとき"/>
+		</form>
+	</notification>
+	<notification name="PayConfirmation">[TARGET]にL$ [AMOUNT]を支払うことを確認してください。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="支払い前に確認 (合計金額がL$ 200を超える場合)" name="okcancelignore" notext="キャンセル" yestext="支払い"/>
+	</notification>
+	<notification name="PayObjectFailed">支払いが失敗しました：オブジェクトが見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PaymentBlockedButtonMismatch">支払いが停止されました：
 支払われた価格が、このオブジェクトに設定された支払いボタンのどれとも一致しません。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="OpenObjectCannotCopy">このオブジェクトには、あなたがコピーできるアイテムはありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="WebLaunchAccountHistory">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OpenObjectCannotCopy">このオブジェクトには、あなたがコピーできるアイテムはありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="WebLaunchAccountHistory">[https://secondlife.com/my/account/?lang=ja-JP マイアカウント]
 ページに移動してアカウント履歴を確認しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動" />
-  </notification>
-
-  <notification name="ConfirmAddingChatParticipants">既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="会話へ参加者を追加する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmQuit">終了してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification name="ConfirmRestoreToybox">この操作を実行すると、デフォルト設定のボタンとツールバーが復元されます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="キャンセル" yestext="ページに移動"/>
+	</notification>
+	<notification name="ConfirmAddingChatParticipants">既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="会話へ参加者を追加する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmQuit">終了してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification name="ConfirmRestoreToybox">この操作を実行すると、デフォルト設定のボタンとツールバーが復元されます。
 
 この操作は元に戻せません。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmClearAllToybox">この操作により、全てのボタンはツールボックスに戻り、ツールバーは空になります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmClearAllToybox">この操作により、全てのボタンはツールボックスに戻り、ツールバーは空になります。
 
 この操作は元に戻せません。
-    <unique />
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="DeleteItems">[QUESTION]
-    <tag>confirm</tag>
-    <form name="form">
-      <ignore name="ignore" text="アイテムを削除する前の確認" />
-      <button name="Yes" text="ＯＫ" />
-      <button name="No" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="DeleteFilteredItems">あなたのインベントリには現在フィルタがかけられているため、削除しようとしているアイテムによっては表示されないことがあります。
+    <unique/>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DeleteItems">[QUESTION]
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<ignore name="ignore" text="アイテムを削除する前の確認"/>
+			<button name="Yes" text="ＯＫ"/>
+			<button name="No" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="DeleteFilteredItems">あなたのインベントリには現在フィルタがかけられているため、削除しようとしているアイテムによっては表示されないことがあります。
   
 これらのアイテムを削除しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="フィルリングされたアイテムを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmUnlink">これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="フィルリングされたアイテムを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmUnlink">これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。
 そのような場合に備えて、リンクセットを自分のインベントリにコピーできます。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リンクセットのリンクを解除する前の確認" name="okcancelignore" notext="キャンセル" yestext="リンクを外す" />
-  </notification>
-
-  <notification name="HelpReportAbuseConfirm">この問題のご報告にお時間を割いていただきありがとうございます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リンクセットのリンクを解除する前の確認" name="okcancelignore" notext="キャンセル" yestext="リンクを外す"/>
+	</notification>
+	<notification name="HelpReportAbuseConfirm">この問題のご報告にお時間を割いていただきありがとうございます。
 お知らせいただいた内容について違反がないか確認し、適切に 対処いたします。
-    <unique />
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="HelpReportAbuseSelectCategory">嫌がらせ報告のカテゴリを選択してください。
+    <unique/>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="HelpReportAbuseSelectCategory">嫌がらせ報告のカテゴリを選択してください。
 カテゴリを選択することにより、嫌がらせ報告の処理や保管に大変役立ちます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="HelpReportAbuseAbuserNameEmpty">嫌がらせ行為をした人の名前を入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="HelpReportAbuseAbuserNameEmpty">嫌がらせ行為をした人の名前を入力してください。
 正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="HelpReportAbuseAbuserLocationEmpty">嫌がらせがあった場所を入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="HelpReportAbuseAbuserLocationEmpty">嫌がらせがあった場所を入力してください。
 正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="HelpReportAbuseSummaryEmpty">嫌がらせの概要を入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="HelpReportAbuseSummaryEmpty">嫌がらせの概要を入力してください。
 正確な概要の入力により、
 嫌がらせ報告の処理や保管に大変役立ちます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="HelpReportAbuseDetailsEmpty">嫌がらせの詳細な説明を入力してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="HelpReportAbuseDetailsEmpty">嫌がらせの詳細な説明を入力してください。
 名前や嫌がらせの詳細を、できるだけ具体的に入力してください。
 
 正確な説明の入力により、
 嫌がらせ報告の処理や保管に大変役立ちます。
-    <tag>fail</tag>
-  </notification>
-  <notification name="HelpReportAbuseContainsCopyright">親愛なる居住者様
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="HelpReportAbuseContainsCopyright">
+		親愛なる居住者様
 
 知的財産権の侵害を報告しているようです。正しく報告していることを確認してください。
 
@@ -2686,1206 +3495,1448 @@ https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83
 
 ご協力ありがとうございます。
 
-Linden Lab</notification>
-
-  <notification name="FailedRequirementsCheck">以下の必要なコンポーネントが、[FLOATER]から抜け落ちています
+Linden Lab
+	</notification>
+	<notification name="FailedRequirementsCheck">以下の必要なコンポーネントが、[FLOATER]から抜け落ちています
 [COMPONENTS]
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="既存の付属品を置換" name="ReplaceAttachment">体のこの部位には既にオブジェクトが装着されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="既存の付属品を置換" name="ReplaceAttachment">体のこの部位には既にオブジェクトが装着されています。
 選択されたオブジェクトと置き換えますか？
-    <tag>confirm</tag>
-    <form name="form">
-      <ignore name="ignore" save_option="true" text="装着しているアイテムと選択したアイテムを入れ替える" />
-      <button ignore="自動的に交換" name="Yes" text="ＯＫ" />
-      <button ignore="交換しない" name="No" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="TooManyWearables">[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="「着信拒否」モードの警告" name="DoNotDisturbModePay">「着信拒否」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<ignore name="ignore" save_option="true" text="装着しているアイテムと選択したアイテムを入れ替える"/>
+			<button ignore="自動的に交換" name="Yes" text="ＯＫ"/>
+			<button ignore="交換しない" name="No" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="TooManyWearables">[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="「着信拒否」モードの警告" name="DoNotDisturbModePay">「着信拒否」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
 このトランザクションを完了するために、「着信拒否」をオフにしてもよろしいですか。
-    <tag>confirm</tag>
-    <form name="form">
-      <ignore name="ignore" text="「着信拒否」モード時に、人や物を支払う予定です。" />
-      <button ignore="「着信拒否」モードを解除する" name="Yes" text="ＯＫ" />
-      <button ignore="「着信拒否」モードを維持する" name="No" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="ConfirmDeleteProtectedCategory">「[FOLDERNAME]」は、システムフォルダです。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<ignore name="ignore" text="「着信拒否」モード時に、人や物を支払う予定です。"/>
+			<button ignore="「着信拒否」モードを解除する" name="Yes" text="ＯＫ"/>
+			<button ignore="「着信拒否」モードを維持する" name="No" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="ConfirmDeleteProtectedCategory">「[FOLDERNAME]」は、システムフォルダです。
 システムフォルダを削除すると不安定になることがあります。このまま続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="システムフォルダを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PurgeSelectedItems">[COUNT]個のアイテムが完全に削除されます。ごみ箱内の選択した項目を削除してもよろしいですか？ 
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmEmptyTrash">[COUNT]個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="TrashIsFull">ゴミ箱があふれています。これはログイン時に問題を引き起こします。
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する" />
-  </notification>
-
-  <notification name="InventoryLimitReachedAIS">インベントリに問題が発生しています。お手数ですが、サポートにお問い合わせください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ConfirmClearBrowserCache">トラベル、Web、検索の履歴をすべて削除しますか？ 
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmClearCache">ビューアーのキャッシュをクリアしますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ConfirmClearCookies">本当にクッキーをクリアしますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
-  </notification>
-
-  <notification name="ConfirmClearMediaUrlList">保存されたＵＲＬのリストを消去します。このまま、リストを消去してもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい" />
-  </notification>
-
-  <notification name="ConfirmEmptyLostAndFound">紛失物の中身をすべて削除しますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="紛失物フォルダを空にする前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="CopySLURL">次のSLurlがクリップボードにコピーされました：
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="システムフォルダを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PurgeSelectedItems">[COUNT]個のアイテムが完全に削除されます。ごみ箱内の選択した項目を削除してもよろしいですか？ 
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmEmptyTrash">[COUNT]個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="TrashIsFull">ゴミ箱があふれています。これはログイン時に問題を引き起こします。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する"/>
+	</notification>
+	<notification name="InventoryLimitReachedAIS">インベントリに問題が発生しています。お手数ですが、サポートにお問い合わせください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ConfirmClearBrowserCache">トラベル、Web、検索の履歴をすべて削除しますか？ 
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmClearCache">ビューアーのキャッシュをクリアしますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmClearCookies">本当にクッキーをクリアしますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
+	</notification>
+	<notification name="ConfirmClearMediaUrlList">保存されたＵＲＬのリストを消去します。このまま、リストを消去してもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
+	</notification>
+	<notification name="ConfirmEmptyLostAndFound">紛失物の中身をすべて削除しますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="紛失物フォルダを空にする前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="CopySLURL">次のSLurlがクリップボードにコピーされました：
 [SLURL]
   
 Webページにリンクすると、他人がこの場所に簡単にアクセスできます。Webブラウザのアドレスバーに貼り付けて試してみてください。
     <form name="form">
-      <ignore name="ignore" text="クリップボードにSLurlをコピーする" />
-    </form>
-  </notification>
-
-  <notification name="WLSavePresetAlert">保存されたプリセットを上書きしてもよろしいですか？
-    <unique />
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="WLNoEditDefault">デフォルトの設定を編集したり削除したりすることはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="WLMissingSky">このデイサイクルのファイルは、以下の存在しない「空」ファイルを参照しています：[SKY]
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="WLRegionApplyFail">申し訳ございませんが、設定をリージョンに適用できませんでした。理由：[FAIL_REASON]</notification>
-
-  <notification name="WLLocalTextureDayBlock">ローカルテクスチャは、フィールド[FIELD]内のトラック[TRACK]、フレーム＃[FRAMENO] ([FRAME]％) で使用されています。
-ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
-
-  <notification name="WLLocalTextureFixedBlock">ローカルテクスチャは、フィールド[FIELD]で使用されています。
-ローカルテクスチャを使った設定は保存されない可能性があります。</notification>
-
-  <notification name="EnvCannotDeleteLastDayCycleKey">デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。
+			<ignore name="ignore" text="クリップボードにSLurlをコピーする"/>
+		</form>
+	</notification>
+	<notification name="WLSavePresetAlert">保存されたプリセットを上書きしてもよろしいですか？
+    <unique/>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="WLNoEditDefault">デフォルトの設定を編集したり削除したりすることはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="WLMissingSky">このデイサイクルのファイルは、以下の存在しない「空」ファイルを参照しています：[SKY]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="WLRegionApplyFail">
+		申し訳ございませんが、設定をリージョンに適用できませんでした。理由：[FAIL_REASON]
+	</notification>
+	<notification name="WLLocalTextureDayBlock">
+		ローカルテクスチャは、フィールド[FIELD]内のトラック[TRACK]、フレーム＃[FRAMENO] ([FRAME]％) で使用されています。
+ローカルテクスチャを使った設定は保存されない可能性があります。
+	</notification>
+	<notification name="WLLocalTextureFixedBlock">
+		ローカルテクスチャは、フィールド[FIELD]で使用されています。
+ローカルテクスチャを使った設定は保存されない可能性があります。
+	</notification>
+	<notification name="EnvCannotDeleteLastDayCycleKey">デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。
 最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="DayCycleTooManyKeyframes">このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE]の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="EnvUpdateRate">リージョンの自然環境の設定は、[WAIT]秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PPSaveEffectAlert">ポストプロセス効果が存在します。上書きしますか？
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="ChatterBoxSessionStartError">[RECIPIENT]と新しいチャットを開始することができません。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DayCycleTooManyKeyframes">このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE]の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="EnvUpdateRate">リージョンの自然環境の設定は、[WAIT]秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PPSaveEffectAlert">ポストプロセス効果が存在します。上書きしますか？
+    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="ChatterBoxSessionStartError">[RECIPIENT]と新しいチャットを開始することができません。
 [REASON]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ChatterBoxSessionEventError">[EVENT]
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ChatterBoxSessionEventError">[EVENT]
 [REASON]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ForceCloseChatterBoxSession">[NAME]とのチャットセッションを閉じます。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ForceCloseChatterBoxSession">[NAME]とのチャットセッションを閉じます。
 [REASON]
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="Cannot_Purchase_an_Attachment">オブジェクトが取り付けられているままでは購入できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="引き出し許可のリクエストについて" name="DebitPermissionDetails">このリクエストを許可すると、スクリプトであなたのアカウントからリンデンドルを引き出せるようになります。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="Cannot_Purchase_an_Attachment">オブジェクトが取り付けられているままでは購入できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="引き出し許可のリクエストについて" name="DebitPermissionDetails">このリクエストを許可すると、スクリプトであなたのアカウントからリンデンドルを引き出せるようになります。
 この許可を取り消すには、オブジェクトの所有者がオブジェクトを削除するか、オブジェクトのスクリプトをリセットしなければなりません。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="AutoWearNewClothing">作成する服装を自動的に装着しますか？
-    <usetemplate ignoretext="「容姿」を編集中に、作成する服装を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="NotAgeVerified">訪問しようとしている場所は、１８歳以上の住人に制限されています。
-    <usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="NotAgeVerified_Notify">この場所への入場は、１８歳以上に制限されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="Cannot enter parcel: no payment info on file">支払情報が登録されていないため、このエリアを訪れることができません。[SECOND_LIFE]サイトで登録を行いますか？
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AutoWearNewClothing">作成する服装を自動的に装着しますか？
+    <usetemplate ignoretext="「容姿」を編集中に、作成する服装を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="NotAgeVerified">訪問しようとしている場所は、１８歳以上の住人に制限されています。
+    <usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">この場所への入場は、１８歳以上に制限されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="Cannot enter parcel: no payment info on file">支払情報が登録されていないため、このエリアを訪れることができません。[SECOND_LIFE]サイトで登録を行いますか？
   
 [_URL]
-    <tag>confirm</tag>
-    <url name="url" option="0">https://secondlife.com/account/index.php?lang=ja</url>
-    <usetemplate ignoretext="支払情報が登録されていません" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="MissingString">文字列[STRING_NAME]がstrings.xmlに含まれていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SystemMessageTip">[MESSAGE]</notification>
-
-  <notification name="IMSystemMessageTip">[MESSAGE]</notification>
-
-  <notification name="Cancelled">取り消されました。</notification>
-
-  <notification name="CancelledAttach">添付が取り消されました。</notification>
-
-  <notification name="ReplacedMissingWearable">欠落している服装や身体部位をデフォルトに置き換えます。</notification>
-
-  <notification name="GroupNotice">件名：[SUBJECT]　メッセージ：[MESSAGE]
-    <tag>group</tag>
-  </notification>
-
-  <notification name="FriendOnlineOffline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、[STATUS]です。
-    <tag>friendship</tag>
-  </notification>
-
-  <notification name="AddSelfFriend">残念ながら自分自身をフレンド登録することはできません。</notification>
-
-  <notification name="AddSelfRenderExceptions">あなた自身をレンダリングの例外リストに加えることはできません。</notification>
-
-  <notification name="UploadingAuctionSnapshot">インワールドとWebサイトのスナップショットをアップロード中です…
-（所要時間：約５分）</notification>
-  <notification name="UploadPayment">アップロードにL$ [AMOUNT]支払いました。
-    <tag>funds</tag>
-  </notification>
-
-  <notification name="UploadWebSnapshotDone">Webサイトのスナップショットにアップロードされました。</notification>
-
-  <notification name="UploadSnapshotDone">インワールドでのスナップショットのアップロードが完了しました。</notification>
-
-  <notification name="TerrainDownloaded">Terrain.rawがダウンロードされました。</notification>
-
-  <notification name="GestureMissing">ジェスチャー「[NAME]」がデータベースに見つかりません。</notification>
-
-  <notification name="UnableToLoadGesture">ジェスチャー「[NAME]」を読み込むことができませんでした。</notification>
-
-  <notification name="LandmarkMissing">データベースにランドマークがありません。</notification>
-
-  <notification name="UnableToLoadLandmark">ランドマークを読み込めませんでした。もう一度お試しください。</notification>
-
-  <notification name="CapsKeyOn">CapsLockキーが有効になっています。
-パスワードに影響するかもしれません。</notification>
-
-  <notification name="NotecardMissing">ノートカードがデータベースにありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NotecardNoPermissions">このノートカードを見る権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RezItemNoPermissions">オブジェクトをRezするには権限が不足しています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="IMAcrossParentEstates">親不動産間では、ＩＭを送信できません。</notification>
-
-  <notification name="TransferInventoryAcrossParentEstates">親不動産間でインベントリを移動することはできません。</notification>
-
-  <notification name="UnableToLoadNotecard">ノートカードを読み込めません。
+    <tag>
+			confirm
+		</tag>
+		<url name="url" option="0">
+			https://secondlife.com/account/index.php?lang=ja
+		</url>
+		<usetemplate ignoretext="支払情報が登録されていません" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="MissingString">文字列[STRING_NAME]がstrings.xmlに含まれていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="IMSystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="Cancelled">
+		取り消されました。
+	</notification>
+	<notification name="CancelledAttach">
+		添付が取り消されました。
+	</notification>
+	<notification name="ReplacedMissingWearable">
+		欠落している服装や身体部位をデフォルトに置き換えます。
+	</notification>
+	<notification name="GroupNotice">件名：[SUBJECT]　メッセージ：[MESSAGE]
+    <tag>
+			group
+		</tag>
+	</notification>
+	<notification name="FriendOnlineOffline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、[STATUS]です。
+    <tag>
+			friendship
+		</tag>
+	</notification>
+	<notification name="AddSelfFriend">
+		残念ながら自分自身をフレンド登録することはできません。
+	</notification>
+	<notification name="AddSelfRenderExceptions">
+		あなた自身をレンダリングの例外リストに加えることはできません。
+	</notification>
+	<notification name="UploadingAuctionSnapshot">
+		インワールドとWebサイトのスナップショットをアップロード中です…
+（所要時間：約５分）
+	</notification>
+	<notification name="UploadPayment">アップロードにL$ [AMOUNT]支払いました。
+    <tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="UploadWebSnapshotDone">
+		Webサイトのスナップショットにアップロードされました。
+	</notification>
+	<notification name="UploadSnapshotDone">
+		インワールドでのスナップショットのアップロードが完了しました。
+	</notification>
+	<notification name="TerrainDownloaded">
+		Terrain.rawがダウンロードされました。
+	</notification>
+	<notification name="GestureMissing">
+		ジェスチャー「[NAME]」がデータベースに見つかりません。
+	</notification>
+	<notification name="UnableToLoadGesture">
+		ジェスチャー「[NAME]」を読み込むことができませんでした。
+	</notification>
+	<notification name="LandmarkMissing">
+		データベースにランドマークがありません。
+	</notification>
+	<notification name="UnableToLoadLandmark">
+		ランドマークを読み込めませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CapsKeyOn">
+		CapsLockキーが有効になっています。
+パスワードに影響するかもしれません。
+	</notification>
+	<notification name="NotecardMissing">ノートカードがデータベースにありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NotecardNoPermissions">このノートカードを見る権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RezItemNoPermissions">オブジェクトをRezするには権限が不足しています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="IMAcrossParentEstates">
+		親不動産間では、ＩＭを送信できません。
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		親不動産間でインベントリを移動することはできません。
+	</notification>
+	<notification name="UnableToLoadNotecard">ノートカードを読み込めません。
 あとで再度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ScriptMissing">データベースにスクリプトがありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ScriptNoPermissions">スクリプトを閲覧するには権限が不十分です。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToLoadScript">スクリプトをロードできません。もう一度試してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="IncompleteInventory">あなたの提供するコンテンツは、ローカルではまだ全部揃っていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ScriptMissing">データベースにスクリプトがありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ScriptNoPermissions">スクリプトを閲覧するには権限が不十分です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToLoadScript">スクリプトをロードできません。もう一度試してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="IncompleteInventory">あなたの提供するコンテンツは、ローカルではまだ全部揃っていません。
 しばらくしてからもう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotModifyProtectedCategories">保護されたカテゴリは修正できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotRemoveProtectedCategories">保護されたカテゴリは削除できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToBuyWhileDownloading">オブジェクトデータのダウンロード中は購入できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotModifyProtectedCategories">保護されたカテゴリは修正できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotRemoveProtectedCategories">保護されたカテゴリは削除できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToBuyWhileDownloading">オブジェクトデータのダウンロード中は購入できません。
 もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToLinkWhileDownloading">オブジェクトデータのウンロード中はリンクできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToLinkWhileDownloading">オブジェクトデータのウンロード中はリンクできません。
 もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CannotBuyObjectsFromDifferentOwners">オブジェクトは一度に一人の所有者から購入できます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CannotBuyObjectsFromDifferentOwners">オブジェクトは一度に一人の所有者から購入できます。
 オブジェクトを１つだけ選んでください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ObjectNotForSale">このオブジェクトは販売対象ではありません。</notification>
-
-  <notification name="EnteringGodMode">レベル[LEVEL]のゴッドモードに入ります。</notification>
-
-  <notification name="LeavingGodMode">レベル[LEVEL]のゴッドモードを解除します。</notification>
-
-  <notification name="CopyFailed">これをコピーする権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InventoryAccepted">[NAME]は、あなたが渡したアイテムを受け取りました。</notification>
-
-  <notification name="InventoryDeclined">[NAME]は、インベントリの提供を断りました。</notification>
-
-  <notification name="ObjectMessage">[NAME]：[MESSAGE]</notification>
-
-  <notification name="CallingCardAccepted">コーリングカードが受理されました。</notification>
-
-  <notification name="CallingCardDeclined">コーリングカードが拒否されました。</notification>
-
-  <notification name="TeleportToLandmark">[NAME]などの場所にテレポートするには、「場所」ボタンをクリックしてから、
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ObjectNotForSale">
+		このオブジェクトは販売対象ではありません。
+	</notification>
+	<notification name="EnteringGodMode">
+		レベル[LEVEL]のゴッドモードに入ります。
+	</notification>
+	<notification name="LeavingGodMode">
+		レベル[LEVEL]のゴッドモードを解除します。
+	</notification>
+	<notification name="CopyFailed">これをコピーする権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InventoryAccepted">
+		[NAME]は、あなたが渡したアイテムを受け取りました。
+	</notification>
+	<notification name="InventoryDeclined">
+		[NAME]は、インベントリの提供を断りました。
+	</notification>
+	<notification name="ObjectMessage">
+		[NAME]：[MESSAGE]
+	</notification>
+	<notification name="CallingCardAccepted">
+		コーリングカードが受理されました。
+	</notification>
+	<notification name="CallingCardDeclined">
+		コーリングカードが拒否されました。
+	</notification>
+	<notification name="TeleportToLandmark">
+		[NAME]などの場所にテレポートするには、「場所」ボタンをクリックしてから、
 表示されたウィンドウで「ランドマーク」タブを選択します。
 ランドマークをいずれか１つ選択してから、ウィンドウ下部にある「テレポート」をクリックします。
-（この操作は、ランドマークをダブルクリックするか、右クリックして「テレポート」を選択して実行することもできます。）</notification>
-
-  <notification name="TeleportToPerson">誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「ＩＭ」を選択します。</notification>
-
-  <notification name="CantSelectLandFromMultipleRegions">サーバーの境界を越えて土地を選択することできません。
+（この操作は、ランドマークをダブルクリックするか、右クリックして「テレポート」を選択して実行することもできます。）
+	</notification>
+	<notification name="TeleportToPerson">
+		誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「ＩＭ」を選択します。
+	</notification>
+	<notification name="CantSelectLandFromMultipleRegions">サーバーの境界を越えて土地を選択することできません。
 もっと小さな土地を選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SearchWordBanned">コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoContentToSearch">少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SystemMessage">[MESSAGE]
-    <tag>funds</tag>
-  </notification>
-
-  <notification name="PaymentReceived">[MESSAGE]
-    <tag>funds</tag>
-  </notification>
-
-  <notification name="PaymentSent">[MESSAGE]
-    <tag>funds</tag>
-  </notification>
-
-  <notification name="PaymentFailure">[MESSAGE]
-    <tag>funds</tag>
-  </notification>
-
-  <!-- EventNotification couldn't be persist since server decide is it necessary to notify user about subscribed event via LLEventNotifier-->
-  <notification name="EventNotification">イベント通知：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SearchWordBanned">コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoContentToSearch">少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SystemMessage">[MESSAGE]
+    <tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="PaymentReceived">[MESSAGE]
+    <tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="PaymentSent">[MESSAGE]
+    <tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="PaymentFailure">[MESSAGE]
+    <tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="EventNotification">イベント通知：
 
 [NAME]
 [DATE]
     <form name="form">
-      <button name="Details" text="詳細" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="TransferObjectsHighlighted">この区画の購入者に受け渡されるオブジェクトは、すべて区画上で強調表示されています。
+			<button name="Details" text="詳細"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="TransferObjectsHighlighted">この区画の購入者に受け渡されるオブジェクトは、すべて区画上で強調表示されています。
 
 ・受け渡される樹木や植物は、強調表示されていません。
     <form name="form">
-      <button name="Done" text="完了" />
-    </form>
-  </notification>
-
-  <notification name="DeactivatedGesturesTrigger">同じトリガーでアクティブにしないジェスチャー：
-[NAMES]</notification>
-
-  <notification name="NoQuickTime">Apple の QuickTime ソフトウェアがお使いのシステムにインストールされていないようです。
+			<button name="Done" text="完了"/>
+		</form>
+	</notification>
+	<notification name="DeactivatedGesturesTrigger">
+		同じトリガーでアクティブにしないジェスチャー：
+[NAMES]
+	</notification>
+	<notification name="NoQuickTime">Apple の QuickTime ソフトウェアがお使いのシステムにインストールされていないようです。
 ストリーミングメディアをサポートする区画で見たい場合は、[http://www.apple.com/jp/quicktime QuickTimeサイト] から QuickTimeプレイヤーをインストールしてください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPlugin">「[MIME_TYPE]」のmimeタイプを扱うメディアプラグインが見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPlugin">「[MIME_TYPE]」のmimeタイプを扱うメディアプラグインが見つかりませんでした。
 このタイプのメディアはご利用いただけません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="MediaPluginFailed">次のメディアプラグインが実行できませんでした：[PLUGIN]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MediaPluginFailed">次のメディアプラグインが実行できませんでした：[PLUGIN]
 プラグインをインストールしなおすか、問題が解決しない場合はメーカーにお問い合わせください。
-    <tag>fail</tag>
-    <form name="form">
-      <ignore name="ignore" text="メディアプラグインの実行に失敗したとき" />
-    </form>
-  </notification>
-
-  <notification name="OwnedObjectsReturned">選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたのインベントリに返却されました。</notification>
-
-  <notification name="OtherObjectsReturned">[NAME]が所有する、選択した区画にあるオブジェクトは、所有者のインベントリに返却されました。</notification>
-
-  <notification name="OtherObjectsReturned2">「[NAME]」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。</notification>
-
-  <notification name="GroupObjectsReturned">グループ&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;と共有する、選択した区画にあるオブジェクトは、オブジェクトのオーナーのインベントリに返却されました。
+    <tag>
+			fail
+		</tag>
+		<form name="form">
+			<ignore name="ignore" text="メディアプラグインの実行に失敗したとき"/>
+		</form>
+	</notification>
+	<notification name="OwnedObjectsReturned">
+		選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたのインベントリに返却されました。
+	</notification>
+	<notification name="OtherObjectsReturned">
+		[NAME]が所有する、選択した区画にあるオブジェクトは、所有者のインベントリに返却されました。
+	</notification>
+	<notification name="OtherObjectsReturned2">
+		「[NAME]」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。
+	</notification>
+	<notification name="GroupObjectsReturned">グループ&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;と共有する、選択した区画にあるオブジェクトは、オブジェクトのオーナーのインベントリに返却されました。
 譲渡済みの譲渡可能なオブジェクトが前のオーナーに返却されました。
 グループに譲渡された譲渡禁止のオブジェクトは削除されました。
-    <tag>group</tag>
-  </notification>
-
-  <notification name="UnOwnedObjectsReturned">選択した土地の区画上の、あなたの所有物では「なかった」オブジェクトは、本来の所有者に返却されました。</notification>
-
-  <notification name="ServerObjectMessage">[NAME]からのメッセージ：
-&lt;nolink&gt;[MSG]&lt;/nolink&gt;</notification>
-
-  <notification name="NotSafe">この土地ではダメージが有効になっています。ケガをするかもしれません。
-死んでしまった場合は「ホーム」にテレポートされます。</notification>
-
-  <notification name="NoFly">このエリアでの飛行は禁止されています。
-ここでは飛べません。</notification>
-
-  <notification name="PushRestricted">このエリアでのプッシュは禁止されています。
-土地所有者以外は他人をプッシュすることはできません。</notification>
-
-  <notification name="NoVoice">このエリアでのボイスチャットは無効になっています。
+    <tag>
+			group
+		</tag>
+	</notification>
+	<notification name="UnOwnedObjectsReturned">
+		選択した土地の区画上の、あなたの所有物では「なかった」オブジェクトは、本来の所有者に返却されました。
+	</notification>
+	<notification name="ServerObjectMessage">
+		[NAME]からのメッセージ：
+&lt;nolink&gt;[MSG]&lt;/nolink&gt;
+	</notification>
+	<notification name="NotSafe">
+		この土地ではダメージが有効になっています。ケガをするかもしれません。
+死んでしまった場合は「ホーム」にテレポートされます。
+	</notification>
+	<notification name="NoFly">
+		このエリアでの飛行は禁止されています。
+ここでは飛べません。
+	</notification>
+	<notification name="PushRestricted">
+		このエリアでのプッシュは禁止されています。
+土地所有者以外は他人をプッシュすることはできません。
+	</notification>
+	<notification name="NoVoice">このエリアでのボイスチャットは無効になっています。
 音声で誰かと話ことはできません。
-    <tag>voice</tag>
-  </notification>
-
-  <notification name="NoBuild">このエリアでの制作は禁止されています。オブジェクトを制作したりRezすることはできません。</notification>
-
-  <notification name="PathfindingDirty">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
-    <unique />
-  </notification>
-
-  <notification name="PathfindingDirtyRebake">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
-    <unique />
-    <usetemplate name="okbutton" yestext="リージョンの再構築" />
-  </notification>
-
-  <notification name="DynamicPathfindingDisabled">このリージョン（地域）において、動的経路探索が有効になっていません。経路探索ＬＳＬ呼び出しを使用するスクリプトの入ったオブジェクトは、このリージョンで期待どおりに動作しない可能性があります。
-    <unique />
-  </notification>
-
-  <notification name="PathfindingCannotRebakeNavmesh">エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作する権限がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
-    <unique />
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SeeAvatars">この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル０での通常の文字チャットもブロックされます。
-    <unique />
-  </notification>
-
-  <notification name="ScriptsStopped">管理者が、このリージョンのスクリプトを一時停止しました。</notification>
-
-  <notification name="ScriptsNotRunning">このリージョンでは、スクリプトの使用が禁止されています。</notification>
-
-  <notification name="NoOutsideScripts">この土地では、外部スクリプトの実行が無効になっています。
+    <tag>
+			voice
+		</tag>
+	</notification>
+	<notification name="NoBuild">
+		このエリアでの制作は禁止されています。オブジェクトを制作したりRezすることはできません。
+	</notification>
+	<notification name="PathfindingDirty">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
+    <unique/>
+	</notification>
+	<notification name="PathfindingDirtyRebake">このリージョン（地域）において、保留中の経路探索の変更があります。制作できる権限がある場合は、「リージョンの再構築」ボタンをクリックして、リージョンを再構築できます。
+    <unique/>
+		<usetemplate name="okbutton" yestext="リージョンの再構築"/>
+	</notification>
+	<notification name="DynamicPathfindingDisabled">このリージョン（地域）において、動的経路探索が有効になっていません。経路探索ＬＳＬ呼び出しを使用するスクリプトの入ったオブジェクトは、このリージョンで期待どおりに動作しない可能性があります。
+    <unique/>
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作する権限がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
+    <unique/>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SeeAvatars">この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル０での通常の文字チャットもブロックされます。
+    <unique/>
+	</notification>
+	<notification name="ScriptsStopped">
+		管理者が、このリージョンのスクリプトを一時停止しました。
+	</notification>
+	<notification name="ScriptsNotRunning">
+		このリージョンでは、スクリプトの使用が禁止されています。
+	</notification>
+	<notification name="NoOutsideScripts">この土地では、外部スクリプトの実行が無効になっています。
 
 ここでは、土地所有者に属するスクリプト以外のスクリプトは機能しません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ClaimPublicLand">あなたが所有できるのは、自分がいるリージョン（地域）の公有地のみです。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RegionTPAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="URBannedFromRegion">あなたは、このリージョン（地域）への立ち入りが禁止されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoTeenGridAccess">お使いのアカウントは、ティーングリッドに接続できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ImproperPaymentStatus">このリージョン（地域）に入るための適切な支払い状況がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="MustGetAgeRegion">このリージョン（地域）に入るには、１８歳以上である必要があります。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="MustGetAgeParcel">この区画に入るには、１８歳以上である必要があります。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoDestRegion">目的地のリージョン（地域）が見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NotAllowedInDest">目的地に入る許可がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RegionParcelBan">立入禁止された区画を横断することはできません。別の方法をお試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TelehubRedirect">テレハブに転送されました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CouldntTPCloser">これ以上目的地に近い場所にテレポートができませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TPCancelled">テレポートがキャンセルされました。</notification>
-
-  <notification name="FullRegionTryAgain">入ろうとしているリージョンは現在満員です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ClaimPublicLand">あなたが所有できるのは、自分がいるリージョン（地域）の公有地のみです。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RegionTPAccessBlocked">訪問しようとしているリージョン（地域）には現在の初期設定を超えるコンテンツが含まれています。「私」＞「初期設定」＞「一般」を選択して、初期設定を変更できます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="URBannedFromRegion">あなたは、このリージョン（地域）への立ち入りが禁止されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoTeenGridAccess">お使いのアカウントは、ティーングリッドに接続できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ImproperPaymentStatus">このリージョン（地域）に入るための適切な支払い状況がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MustGetAgeRegion">このリージョン（地域）に入るには、１８歳以上である必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="MustGetAgeParcel">この区画に入るには、１８歳以上である必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoDestRegion">目的地のリージョン（地域）が見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NotAllowedInDest">目的地に入る許可がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RegionParcelBan">立入禁止された区画を横断することはできません。別の方法をお試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TelehubRedirect">テレハブに転送されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CouldntTPCloser">これ以上目的地に近い場所にテレポートができませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TPCancelled">
+		テレポートがキャンセルされました。
+	</notification>
+	<notification name="FullRegionTryAgain">入ろうとしているリージョンは現在満員です。
 しばらくしてから再度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="GeneralFailure">よくある失敗
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RoutedWrongRegion">異なるリージョンに迂回されました。もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoValidAgentID">無効なエージェントIDです。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoValidSession">無効なセッションIDです。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoValidCircuit">無効な回路コードです。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPendingConnection">接続を生成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InternalUsherError">エージェント案内に接続時に、内部エラーが発生しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoGoodTPDestination">このリージョン（地域）では、適切なテレポート目的地が見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InternalErrorRegionResolver">リージョンリゾルバーを有効化しようとしたときに内部エラーが発生しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoValidLanding">有効な着地点が見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoValidParcel">有効な区画が見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ObjectGiveItem">[NAME_SLURL] が所有する&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;という名前のオブジェクトが、あなたに[OBJECTTYPE]を渡しました：
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="GeneralFailure">よくある失敗
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RoutedWrongRegion">異なるリージョンに迂回されました。もう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoValidAgentID">無効なエージェントIDです。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoValidSession">無効なセッションIDです。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoValidCircuit">無効な回路コードです。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPendingConnection">接続を生成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InternalUsherError">エージェント案内に接続時に、内部エラーが発生しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoGoodTPDestination">このリージョン（地域）では、適切なテレポート目的地が見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InternalErrorRegionResolver">リージョンリゾルバーを有効化しようとしたときに内部エラーが発生しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoValidLanding">有効な着地点が見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoValidParcel">有効な区画が見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ObjectGiveItem">[NAME_SLURL] が所有する&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;という名前のオブジェクトが、あなたに[OBJECTTYPE]を渡しました：
 &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
     <form name="form">
-      <button name="Keep" text="受け取る" />
-      <button name="Discard" text="破棄" />
-      <button name="Mute" text="所有者をブロック" />
-    </form>
-  </notification>
-
-  <notification name="OwnObjectGiveItem">オブジェクト「&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;」が、あなたに[OBJECTTYPE]を渡しました：
+			<button name="Keep" text="受け取る"/>
+			<button name="Discard" text="破棄"/>
+			<button name="Mute" text="所有者をブロック"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">オブジェクト「&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;」が、あなたに[OBJECTTYPE]を渡しました：
 
 &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
     <form name="form">
-      <button name="Keep" text="キープ" />
-      <button name="Discard" text="処分する" />
-    </form>
-  </notification>
-
-  <notification name="UserGiveItem">[NAME_SLURL] が、あなたに[OBJECTTYPE]を渡しました：
+			<button name="Keep" text="キープ"/>
+			<button name="Discard" text="処分する"/>
+		</form>
+	</notification>
+	<notification name="UserGiveItem">[NAME_SLURL] が、あなたに[OBJECTTYPE]を渡しました：
 [ITEM_SLURL]
     <form name="form">
-      <button name="Show" text="表示" />
-      <button name="Discard" text="破棄" />
-      <button name="Mute" text="ブロック" />
-    </form>
-  </notification>
-
-  <notification name="GodMessage">[NAME]
-
-[MESSAGE]</notification>
-
-  <notification name="JoinGroup">[MESSAGE]
-    <tag>group</tag>
-    <form name="form">
-      <button name="Join" text="参加" />
-      <button name="Decline" text="辞退" />
-      <button name="Info" text="情報" />
-    </form>
-  </notification>
+			<button name="Show" text="表示"/>
+			<button name="Discard" text="破棄"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
+	<notification name="GodMessage">
+		[NAME]
 
-  <notification name="TeleportOffered">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+[MESSAGE]
+	</notification>
+	<notification name="JoinGroup">[MESSAGE]
+    <tag>
+			group
+		</tag>
+		<form name="form">
+			<button name="Join" text="参加"/>
+			<button name="Decline" text="辞退"/>
+			<button name="Info" text="情報"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered">[NAME_SLURL] は、テレポートであなたを呼んでいます。
 [MESSAGE]
 
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="Teleport" text="テレポート" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="TeleportOffered_MaturityExceeded">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="Teleport" text="テレポート"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">[NAME_SLURL] は、テレポートであなたを呼んでいます。
 [MESSAGE]
 
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
 
 このリージョン（地域）には[REGION_CONTENT_MATURITY]コンテンツが含まれていますが、現在の初期設定は[REGION_CONTENT_MATURITY]コンテンツを除外するように設定されています。初期設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="Teleport" text="変更して続ける" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-  <notification name="TeleportOffered_MaturityBlocked">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="Teleport" text="変更して続ける"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">[NAME_SLURL] は、テレポートであなたを呼んでいます。
 [MESSAGE]
 
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;－[MATURITY_STR]
 
 ただし、このリージョン（地域）には成人のみアクセスできるコンテンツが含まれています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TeleportOfferSent">[TO_NAME]にテレポートのオファーを送りました。</notification>
-
-  <notification name="TeleportRequest">[NAME_SLURL] は、テレポートであなたを呼んでいます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TeleportOfferSent">
+		[TO_NAME]にテレポートのオファーを送りました。
+	</notification>
+	<notification name="TeleportRequest">[NAME_SLURL] は、テレポートであなたを呼んでいます。
 [MESSAGE]
 
 テレポートのオファーを受けますか？
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="Yes" text="はい"/>
-      <button name="No" text="いいえ"/>
-    </form>
-  </notification>
-
-  <notification name="GotoURL">
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="Yes" text="はい"/>
+			<button name="No" text="いいえ"/>
+		</form>
+	</notification>
+	<notification name="GotoURL">
 [MESSAGE]
 [URL]
     <form name="form">
-      <button name="Later" text="あとで" />
-      <button name="GoNow..." text="今すぐ行く…" />
-    </form>
-  </notification>
-
-  <notification name="OfferFriendship">[NAME_SLURL] は、あなたにフレンド登録を申し込んでいます。
+			<button name="Later" text="あとで"/>
+			<button name="GoNow..." text="今すぐ行く…"/>
+		</form>
+	</notification>
+	<notification name="OfferFriendship">[NAME_SLURL] は、あなたにフレンド登録を申し込んでいます。
 
 [MESSAGE]
 
 （デフォルトの設定では、お互いのオンライン状態を知ることができます。）
-    <tag>friendship</tag>
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="Accept" text="受け入れる" />
-      <button name="Decline" text="断る" />
-    </form>
-  </notification>
-
-  <notification name="FriendshipOffered">[TO_NAME]にフレンド登録依頼を送りました。
-    <tag>friendship</tag>
-  </notification>
-
-  <notification name="OfferFriendshipNoMessage">[NAME_SLURL] は、フレンド登録を申し込んでいます。（デフォルト設定だとお互いのオンライン状態を見ることができます）
-    <tag>friendship</tag>
-    <form name="form">
-      <button name="Accept" text="受け入れる" />
-      <button name="Decline" text="断る" />
-    </form>
-  </notification>
-
-  <notification name="FriendshipAccepted">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を受け入れました。
-    <tag>friendship</tag>
-  </notification>
-
-  <notification name="FriendshipDeclined">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を断りました。
-    <tag>friendship</tag>
-  </notification>
-
-  <notification name="FriendshipAcceptedByMe">フレンドの登録依頼を受け入れました。
-    <tag>friendship</tag>
-  </notification>
-
-  <notification name="FriendshipDeclinedByMe">フレンドの登録依頼を断りました。
-    <tag>friendship</tag>
-  </notification>
-
-  <notification name="OfferCallingCard">[NAME]が、コーリングカードを渡そうとしています。
+    <tag>
+			friendship
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="Accept" text="受け入れる"/>
+			<button name="Decline" text="断る"/>
+		</form>
+	</notification>
+	<notification name="FriendshipOffered">[TO_NAME]にフレンド登録依頼を送りました。
+    <tag>
+			friendship
+		</tag>
+	</notification>
+	<notification name="OfferFriendshipNoMessage">[NAME_SLURL] は、フレンド登録を申し込んでいます。（デフォルト設定だとお互いのオンライン状態を見ることができます）
+    <tag>
+			friendship
+		</tag>
+		<form name="form">
+			<button name="Accept" text="受け入れる"/>
+			<button name="Decline" text="断る"/>
+		</form>
+	</notification>
+	<notification name="FriendshipAccepted">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を受け入れました。
+    <tag>
+			friendship
+		</tag>
+	</notification>
+	<notification name="FriendshipDeclined">&lt;nolink&gt;[NAME]&lt;/nolink&gt;は、あなたからのフレンド登録依頼を断りました。
+    <tag>
+			friendship
+		</tag>
+	</notification>
+	<notification name="FriendshipAcceptedByMe">フレンドの登録依頼を受け入れました。
+    <tag>
+			friendship
+		</tag>
+	</notification>
+	<notification name="FriendshipDeclinedByMe">フレンドの登録依頼を断りました。
+    <tag>
+			friendship
+		</tag>
+	</notification>
+	<notification name="OfferCallingCard">[NAME]が、コーリングカードを渡そうとしています。
 あなたのインベントリにブックマークが追加され、この住人に素早くＩＭを送ることができます。
-    <tag>friendship</tag>
-    <form name="form">
-      <button name="Accept" text="受け入れる" />
-      <button name="Decline" text="辞退" />
-    </form>
-  </notification>
-
-  <notification name="RegionRestartMinutes">このリージョン「[NAME]」は、[SECONDS]分後に再起動されます。
-このまま、このリージョンに留まっているとログアウトされます。</notification>
-
-  <notification name="RegionRestartSeconds">このリージョン「[NAME]」は、[SECONDS]秒後に再起動されます。
-このまま、このリージョンに留まっているとログアウトされます。</notification>
-
-  <notification name="LoadWebPage">のWebページ[URL] を開きますか？
+    <tag>
+			friendship
+		</tag>
+		<form name="form">
+			<button name="Accept" text="受け入れる"/>
+			<button name="Decline" text="辞退"/>
+		</form>
+	</notification>
+	<notification name="RegionRestartMinutes">
+		このリージョン「[NAME]」は、[SECONDS]分後に再起動されます。
+このまま、このリージョンに留まっているとログアウトされます。
+	</notification>
+	<notification name="RegionRestartSeconds">
+		このリージョン「[NAME]」は、[SECONDS]秒後に再起動されます。
+このまま、このリージョンに留まっているとログアウトされます。
+	</notification>
+	<notification name="LoadWebPage">のWebページ[URL] を開きますか？
 
 [MESSAGE]
 
 送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;　所有者：[NAME_SLURL]
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="Gotopage" text="ページに移動" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="FailedToFindWearableUnnamed">データベースに[TYPE]は見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="FailedToFindWearable">データベースに[DESC]という名前の[TYPE]は見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InvalidWearable">着用しようとしているアイテムはあなたのビューアーでは読み込むことができません。[APP_NAME]のバージョンをアップグレードしてからこのアイテムを着用してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ScriptQuestion">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、次のことをしようとしています：
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="Gotopage" text="ページに移動"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="FailedToFindWearableUnnamed">データベースに[TYPE]は見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FailedToFindWearable">データベースに[DESC]という名前の[TYPE]は見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InvalidWearable">着用しようとしているアイテムはあなたのビューアーでは読み込むことができません。[APP_NAME]のバージョンをアップグレードしてからこのアイテムを着用してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ScriptQuestion">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、次のことをしようとしています：
 
 [QUESTIONS]
 よろしいですか？ 
-    <tag>fail</tag>
-    <form name="form">
-      <button name="Yes" text="はい" />
-      <button name="No" text="いいえ" />
-      <button name="Mute" text="ブロック" />
-    </form>
-  </notification>
-
-  <notification name="ExperienceAcquireFailed">新しい体験を取得できません：
+    <tag>
+			fail
+		</tag>
+		<form name="form">
+			<button name="Yes" text="はい"/>
+			<button name="No" text="いいえ"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
+	<notification name="ExperienceAcquireFailed">新しい体験を取得できません：
 [ERROR_MESSAGE]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="NotInGroupExperienceProfileMessage">所有者が選択されたグループのメンバーでないため、体験グループへの変更が無視されました。</notification>
-
-  <notification name="UneditableExperienceProfileMessage">体験プロフィールを更新するときに、編集不可の「[field]」フィールドが無視されました。</notification>
-
-  <notification name="RestrictedToOwnerExperienceProfileMessage">体験の所有者のみが設定できる「[field]」フィールドへの変更を無視しました。</notification>
-
-  <notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">所有者のレーティング区分より高いレーティング区分の体験を設定できません。</notification>
-
-  <notification name="RestrictedTermExperienceProfileMessage">次の条件により、体験プロフィール名および説明の更新ができませんでした：[extra_info]</notification>
-
-  <notification name="TeleportedHomeExperienceRemoved">体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name]リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="NotInGroupExperienceProfileMessage">
+		所有者が選択されたグループのメンバーでないため、体験グループへの変更が無視されました。
+	</notification>
+	<notification name="UneditableExperienceProfileMessage">
+		体験プロフィールを更新するときに、編集不可の「[field]」フィールドが無視されました。
+	</notification>
+	<notification name="RestrictedToOwnerExperienceProfileMessage">
+		体験の所有者のみが設定できる「[field]」フィールドへの変更を無視しました。
+	</notification>
+	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
+		所有者のレーティング区分より高いレーティング区分の体験を設定できません。
+	</notification>
+	<notification name="RestrictedTermExperienceProfileMessage">
+		次の条件により、体験プロフィール名および説明の更新ができませんでした：[extra_info]
+	</notification>
+	<notification name="TeleportedHomeExperienceRemoved">体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name]リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
     <form name="form">
-      <ignore name="ignore" text="体験を削除するために、リージョンから追放されました" />
-    </form>
-  </notification>
-
-  <notification name="TrustedExperienceEntry">キー体験 secondlife:///app/experience/[public_id]/profile に参加することにより、[region_name]リージョンに入ることを許可されました。
+			<ignore name="ignore" text="体験を削除するために、リージョンから追放されました"/>
+		</form>
+	</notification>
+	<notification name="TrustedExperienceEntry">キー体験 secondlife:///app/experience/[public_id]/profile に参加することにより、[region_name]リージョンに入ることを許可されました。
 この体験を削除すると、このリージョンから追放される可能性があります。
     <form name="form">
-      <ignore name="ignore" text="体験によりリージョンに入ることを許可されました" />
-    </form>
-  </notification>
-
-  <notification name="TrustedExperiencesAvailable">この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます：
+			<ignore name="ignore" text="体験によりリージョンに入ることを許可されました"/>
+		</form>
+	</notification>
+	<notification name="TrustedExperiencesAvailable">
+		この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます：
 [EXPERIENCE_LIST]
 
-その他のキー体験を利用できます。</notification>
-
-  <notification name="ExperienceEvent">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション（[EventType]）を実行することが許可されました。
+その他のキー体験を利用できます。
+	</notification>
+	<notification name="ExperienceEvent">
+		[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション（[EventType]）を実行することが許可されました。
 所有者：secondlife:///app/agent/[OwnerID]/inspect
 オブジェクト名：[ObjectName]
-区画名：[ParcelName]</notification>
-
-  <notification name="ExperienceEventAttachment">[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、添付ファイルでアクション（[EventType]）を実行することが許可されました。
-所有者：secondlife:///app/agent/[OwnerID]/inspect</notification>
-
-  <notification name="ScriptQuestionExperience">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、[GRID_WIDE]体験への参加を要求しています：
+区画名：[ParcelName]
+	</notification>
+	<notification name="ExperienceEventAttachment">
+		[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、添付ファイルでアクション（[EventType]）を実行することが許可されました。
+所有者：secondlife:///app/agent/[OwnerID]/inspect
+	</notification>
+	<notification name="ScriptQuestionExperience">[NAME]が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」というオブジェクトが、[GRID_WIDE]体験への参加を要求しています：
 [EXPERIENCE]権限が許可されると、体験プロフィールから呼び出さない限り、この体験にこのメッセージが再び表示されることはありません。
 この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます：
 [QUESTIONS]
 よろしいですか？
     <unique combine="combine_with_new">
-      <context>experience</context>
-    </unique>
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="BlockExperience" text="体験をブロック" />
-      <button name="Mute" text="オブジェクトをブロックする" />
-      <button name="Yes" text="はい" />
-      <button name="No" text="いいえ" />
-    </form>
-  </notification>
-
-  <notification name="ScriptQuestionCaution">警告：オブジェクト「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」は、あなたのリンデンドルアカウントへの完全なアクセスを求めています。アクセスを許可すると、追加の警告なしで、いつでもアカウントから資金が削除されたり、アカウントが完全に空になったりする可能性があります。
+			<context>
+				experience
+			</context>
+		</unique>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="BlockExperience" text="体験をブロック"/>
+			<button name="Mute" text="オブジェクトをブロックする"/>
+			<button name="Yes" text="はい"/>
+			<button name="No" text="いいえ"/>
+		</form>
+	</notification>
+	<notification name="ScriptQuestionCaution">警告：オブジェクト「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」は、あなたのリンデンドルアカウントへの完全なアクセスを求めています。アクセスを許可すると、追加の警告なしで、いつでもアカウントから資金が削除されたり、アカウントが完全に空になったりする可能性があります。
   
 アカウントへのアクセスが必要な理由が十分に理解できない場合は、アクセスを許可しないでください。
 
-    <tag>confirm</tag>
-    <form name="form">
-      <button name="Grant" text="トータルアクセスを許可" />
-      <button name="Deny" text="拒否" />
-    </form>
-    <footer>[FOOTERTEXT]</footer>
-  </notification>
-
-  <notification name="ScriptDialog">[NAME]の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<button name="Grant" text="トータルアクセスを許可"/>
+			<button name="Deny" text="拒否"/>
+		</form>
+		<footer>
+			[FOOTERTEXT]
+		</footer>
+	</notification>
+	<notification name="ScriptDialog">[NAME]の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
 [MESSAGE]
     <form name="form">
-      <button name="Client_Side_Mute" text="ブロック" />
-      <button name="Client_Side_Ignore" text="無視" />
-    </form>
-  </notification>
-
-  <notification name="ScriptDialogGroup">&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
+			<button name="Client_Side_Mute" text="ブロック"/>
+			<button name="Client_Side_Ignore" text="無視"/>
+		</form>
+	</notification>
+	<notification name="ScriptDialogGroup">&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
 [MESSAGE] 
-    <tag>group</tag>
-    <form name="form">
-      <button name="Client_Side_Mute" text="ブロック" />
-      <button name="Client_Side_Ignore" text="無視" />
-    </form>
-  </notification>
-
-  <!--
-  <notification name="FirstBalanceIncrease"">
-   <tag>win</tag>
-You just received L$[AMOUNT].
-Your L$ balance is shown in the upper-right.
-  </notification>
-
-  <notification name="FirstBalanceDecrease">
-You just paid L$[AMOUNT].
-Your L$ balance is shown in the upper-right.
-  </notification>
--->
-
-  <notification name="BuyLindenDollarSuccess">お支払ありがとうございます。
+    <tag>
+			group
+		</tag>
+		<form name="form">
+			<button name="Client_Side_Mute" text="ブロック"/>
+			<button name="Client_Side_Ignore" text="無視"/>
+		</form>
+	</notification>
+	<notification name="BuyLindenDollarSuccess">お支払ありがとうございます。
 
 あなたのL$残高は、処理が完了するとアップデートされます。処理に２０分以上かかった場合、お取り引きがキャンセルされることがあります。その場合は、購入金額はあなたの US$残高に追加されます。 [https://secondlife.com/my/account/?lang=ja-JP マイアカウント]の取引履歴ページで、支払状況を確認できます。
-    <tag>funds</tag>
-  </notification>
-
-  <notification name="FirstOverrideKeys">あなたの移動キーをオブジェクトが操作しています。
+    <tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="FirstOverrideKeys">
+		あなたの移動キーをオブジェクトが操作しています。
 矢印かAWSDのキーで動作を確認してください。
 銃などのオブジェクトだと、一人称視点に変更する必要があります。
-「M」キーを押して変更します。</notification>
-
-  <notification name="FirstSandbox">ここはサンドボックスエリアです。住人が制作を学ぶことができます。
-ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、インベントリに入れてお持ち帰りするのをお忘れなく。</notification>
-
-  <notification name="MaxListSelectMessage">このリストから[MAX_SELECT]個までのアイテムを選択できます。</notification>
-
-  <notification name="VoiceInviteP2P">[NAME]があなたをボイスチャットコールに招待しています。
+「M」キーを押して変更します。
+	</notification>
+	<notification name="FirstSandbox">
+		ここはサンドボックスエリアです。住人が制作を学ぶことができます。
+ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、インベントリに入れてお持ち帰りするのをお忘れなく。
+	</notification>
+	<notification name="MaxListSelectMessage">
+		このリストから[MAX_SELECT]個までのアイテムを選択できます。
+	</notification>
+	<notification name="VoiceInviteP2P">[NAME]があなたをボイスチャットコールに招待しています。
 受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
-    <tag>confirm</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>NAME</context>
-    </unique>
-    <form name="form">
-      <button name="Accept" text="受け入れる" />
-      <button name="Decline" text="拒否" />
-      <button name="Mute" text="ブロック" />
-    </form>
-  </notification>
-
-  <notification name="AutoUnmuteByIM">[NAME]はインスタントメッセージを受け取り、自動的にブロックが解除されました。</notification>
-
-  <notification name="AutoUnmuteByMoney">[NAME]はお金を受け取り、自動的にブロックが解除されました。</notification>
-
-  <notification name="AutoUnmuteByInventory">[NAME]はインベントリを受け取り、自動的にブロックが解除されました。</notification>
-
-  <notification name="VoiceInviteGroup">[NAME]は &lt;nolink&gt;[GROUP]&lt;/nolink&gt;のボイスチャットコールに参加しました。
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				NAME
+			</context>
+		</unique>
+		<form name="form">
+			<button name="Accept" text="受け入れる"/>
+			<button name="Decline" text="拒否"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
+	<notification name="AutoUnmuteByIM">
+		[NAME]はインスタントメッセージを受け取り、自動的にブロックが解除されました。
+	</notification>
+	<notification name="AutoUnmuteByMoney">
+		[NAME]はお金を受け取り、自動的にブロックが解除されました。
+	</notification>
+	<notification name="AutoUnmuteByInventory">
+		[NAME]はインベントリを受け取り、自動的にブロックが解除されました。
+	</notification>
+	<notification name="VoiceInviteGroup">[NAME]は &lt;nolink&gt;[GROUP]&lt;/nolink&gt;のボイスチャットコールに参加しました。
 受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>NAME</context>
-      <context>GROUP</context>
-    </unique>
-    <form name="form">
-      <button name="Accept" text="受け入れる" />
-      <button name="Decline" text="拒否" />
-      <button name="Mute" text="ブロック" />
-    </form>
-  </notification>
-
-  <notification name="VoiceInviteAdHoc">[NAME]は、会話チャットでボイスチャットコールに参加しました。
+    <tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				NAME
+			</context>
+			<context>
+				GROUP
+			</context>
+		</unique>
+		<form name="form">
+			<button name="Accept" text="受け入れる"/>
+			<button name="Decline" text="拒否"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
+	<notification name="VoiceInviteAdHoc">[NAME]は、会話チャットでボイスチャットコールに参加しました。
 受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
     <form name="form">
-      <button name="Accept" text="受け入れる" />
-      <button name="Decline" text="拒否" />
-      <button name="Mute" text="ブロック" />
-    </form>
-  </notification>
-
-  <notification name="InviteAdHoc">[NAME]があなたを会話チャットに招待しています。
+			<button name="Accept" text="受け入れる"/>
+			<button name="Decline" text="拒否"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
+	<notification name="InviteAdHoc">[NAME]があなたを会話チャットに招待しています。
 受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
-    <tag>confirm</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>NAME</context>
-    </unique>
-    <form name="form">
-      <button name="Accept" text="受け入れる" />
-      <button name="Decline" text="拒否" />
-      <button name="Mute" text="ブロック" />
-    </form>
-  </notification>
-
-  <notification name="VoiceChannelFull">あなたが参加しようとしているボイスコール[VOICE_CHANNEL_NAME]は、参加者が最大限に達しました。後でもう一度お試しください。
-    <tag>fail</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="ProximalVoiceChannelFull">
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				NAME
+			</context>
+		</unique>
+		<form name="form">
+			<button name="Accept" text="受け入れる"/>
+			<button name="Decline" text="拒否"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
+	<notification name="VoiceChannelFull">あなたが参加しようとしているボイスコール[VOICE_CHANNEL_NAME]は、参加者が最大限に達しました。後でもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="ProximalVoiceChannelFull">
 このエリアのボイスチャットは、混雑のため容量を超えてしまっています。申し訳ありませんが、他のエリアでボイスチャットをお試しください。
-    <tag>fail</tag>
-    <tag>voice</tag>
-  </notification>
-
-  <notification name="VoiceChannelDisconnected">[VOICE_CHANNEL_NAME]への接続が切れました。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+	</notification>
+	<notification name="VoiceChannelDisconnected">[VOICE_CHANNEL_NAME]への接続が切れました。
 「近隣のボイスチャット」に再接続されます。
-    <tag>voice</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="VoiceChannelDisconnectedP2P">[VOICE_CHANNEL_NAME]がコールを終了しました。
+    <tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="VoiceChannelDisconnectedP2P">[VOICE_CHANNEL_NAME]がコールを終了しました。
 「近隣のボイスチャット」に再接続されます。
-    <tag>voice</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="P2PCallDeclined">[VOICE_CHANNEL_NAME]があなたのコールを拒否しました。
+    <tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="P2PCallDeclined">[VOICE_CHANNEL_NAME]があなたのコールを拒否しました。
 「近隣のボイスチャット」に再接続されます。
-    <tag>voice</tag>
-    <tag>fail</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="P2PCallNoAnswer">[VOICE_CHANNEL_NAME]はあなたのコールを受けることができません。
+    <tag>
+			voice
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="P2PCallNoAnswer">[VOICE_CHANNEL_NAME]はあなたのコールを受けることができません。
 「近隣のボイスチャット」に再接続されます。
-    <tag>fail</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="VoiceChannelJoinFailed">[VOICE_CHANNEL_NAME]への接続に失敗しました。あとで再度お試しください。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="VoiceChannelJoinFailed">[VOICE_CHANNEL_NAME]への接続に失敗しました。あとで再度お試しください。
 「近隣のボイスチャット」に再接続されます。
-    <tag>fail</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="VoiceEffectsExpired">ボイスモーフィング効果の１つ、または複数の有効期限が終了しました。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="VoiceEffectsExpired">ボイスモーフィング効果の１つ、または複数の有効期限が終了しました。
 期限を延長・更新するには[[URL] ここ]をクリックしてください。
 
 プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
-    <tag>fail</tag>
-    <tag>voice</tag>
-  </notification>
-
-  <notification name="VoiceEffectsExpiredInUse">ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+	</notification>
+	<notification name="VoiceEffectsExpiredInUse">ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
 期限を延長・更新するには[[URL] ここ]をクリックしてください。
 
 プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
-    <tag>fail</tag>
-    <tag>voice</tag>
-  </notification>
-
-  <notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の１つ、または複数の有効期限が[INTERVAL]日以内に終了します。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+	</notification>
+	<notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の１つ、または複数の有効期限が[INTERVAL]日以内に終了します。
 期限を延長・更新するには[[URL] ここ]をクリックしてください。
 
 プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
-    <tag>fail</tag>
-    <tag>voice</tag>
-  </notification>
-
-  <notification name="VoiceEffectsNew">新しいボイスモーフィング効果が登場！
-    <tag>voice</tag>
-  </notification>
-
-  <notification name="Cannot enter parcel: not a group member">特定のグループメンバーのみこのエリアを訪問することができます。
-    <tag>fail</tag>
-    <tag>group</tag>
-  </notification>
-
-  <notification name="Cannot enter parcel: banned">立入禁止されているため、この区画に入ることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="Cannot enter parcel: not on access list">アクセスリストに含まれていないため、この区画に入ることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="VoiceNotAllowed">あなたには[VOICE_CHANNEL_NAME]のボイスチャットに接続する権限がありません。
-    <tag>fail</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="VoiceCallGenericError">[VOICE_CHANNEL_NAME]のボイスチャットに接続中に、エラーが発生しました。後でもう一度お試しください。
-    <tag>fail</tag>
-    <tag>voice</tag>
-    <unique>
-      <context>VOICE_CHANNEL_NAME</context>
-    </unique>
-  </notification>
-
-  <notification name="UnsupportedCommandSLURL">クリックしたSLurlはサポートされていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="BlockedSLURL">信用できないブラウザからSLurlが送られてきたので、セキュリティのためブロックされました。
-    <tag>security</tag>
-  </notification>
-
-  <notification name="ThrottledSLURL">短期間のあいだに、信用できないブラウザから複数のSLurlが送られてきました。
-安全のために数秒間ブロックされます。</notification>
-  <notification name="IMToast">[MESSAGE]
-    <tag>security</tag>
-    <form name="form">
-      <button name="respondbutton" text="返答" />
-    </form>
-  </notification>
-
-  <notification name="ConfirmCloseAll">すべてのＩＭを閉じますか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="すべてのＩＭを閉じる前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="AttachmentSaved">装着物が保存されました。</notification>
-
-  <notification name="AppearanceToXMLSaved">外観がXML[PATH]に保存されました</notification>
-
-  <notification name="AppearanceToXMLFailed">外観をXMLに保存できませんでした。</notification>
-
-  <notification name="SnapshotToComputerFailed">スナップショットを[PATH]に保存できませんでした：ディスクの空き容量が不足しています。
-[NEED_MEMORY]㎅が必要ですが、[FREE_MEMORY]㎅しかありません。</notification>
-
-  <notification name="SnapshotToLocalDirNotExist">スナップショットを[PATH]に保存できませんでした：ディレクトリは存在しません。</notification>
-
-  <notification name="PresetNotSaved">プリセット[NAME]の保存時にエラーが発生しました。</notification>
-
-  <notification name="DefaultPresetNotSaved">デフォルトのプリセットを上書きすることはできません。</notification>
-
-  <notification name="PresetAlreadyExists">「[NAME]」は使用中です。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+	</notification>
+	<notification name="VoiceEffectsNew">新しいボイスモーフィング効果が登場！
+    <tag>
+			voice
+		</tag>
+	</notification>
+	<notification name="Cannot enter parcel: not a group member">特定のグループメンバーのみこのエリアを訪問することができます。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			group
+		</tag>
+	</notification>
+	<notification name="Cannot enter parcel: banned">立入禁止されているため、この区画に入ることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="Cannot enter parcel: not on access list">アクセスリストに含まれていないため、この区画に入ることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="VoiceNotAllowed">あなたには[VOICE_CHANNEL_NAME]のボイスチャットに接続する権限がありません。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="VoiceCallGenericError">[VOICE_CHANNEL_NAME]のボイスチャットに接続中に、エラーが発生しました。後でもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<unique>
+			<context>
+				VOICE_CHANNEL_NAME
+			</context>
+		</unique>
+	</notification>
+	<notification name="UnsupportedCommandSLURL">クリックしたSLurlはサポートされていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="BlockedSLURL">信用できないブラウザからSLurlが送られてきたので、セキュリティのためブロックされました。
+    <tag>
+			security
+		</tag>
+	</notification>
+	<notification name="ThrottledSLURL">
+		短期間のあいだに、信用できないブラウザから複数のSLurlが送られてきました。
+安全のために数秒間ブロックされます。
+	</notification>
+	<notification name="IMToast">[MESSAGE]
+    <tag>
+			security
+		</tag>
+		<form name="form">
+			<button name="respondbutton" text="返答"/>
+		</form>
+	</notification>
+	<notification name="ConfirmCloseAll">すべてのＩＭを閉じますか？
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="すべてのＩＭを閉じる前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AttachmentSaved">
+		装着物が保存されました。
+	</notification>
+	<notification name="AppearanceToXMLSaved">
+		外観がXML[PATH]に保存されました
+	</notification>
+	<notification name="AppearanceToXMLFailed">
+		外観をXMLに保存できませんでした。
+	</notification>
+	<notification name="SnapshotToComputerFailed">
+		スナップショットを[PATH]に保存できませんでした：ディスクの空き容量が不足しています。
+[NEED_MEMORY]㎅が必要ですが、[FREE_MEMORY]㎅しかありません。
+	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		スナップショットを[PATH]に保存できませんでした：ディレクトリは存在しません。
+	</notification>
+	<notification name="PresetNotSaved">
+		プリセット[NAME]の保存時にエラーが発生しました。
+	</notification>
+	<notification name="DefaultPresetNotSaved">
+		デフォルトのプリセットを上書きすることはできません。
+	</notification>
+	<notification name="PresetAlreadyExists">「[NAME]」は使用中です。
 このプリセットを置き換えるか、別の名前を選択することができます。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ"/>
-  </notification>
-
-  <notification name="PresetNotDeleted">プリセット[NAME]の削除時にエラーが発生しました。</notification>
-
-  <notification name="UnableToFindHelpTopic">ヘルプトピックが見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ObjectMediaFailure">サーバーエラー：メディアの更新に失敗しました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PresetNotDeleted">
+		プリセット[NAME]の削除時にエラーが発生しました。
+	</notification>
+	<notification name="UnableToFindHelpTopic">ヘルプトピックが見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ObjectMediaFailure">サーバーエラー：メディアの更新に失敗しました。
 [ERROR]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="TextChatIsMutedByModerator">モデレーターがあなたの文字チャットをミュートしました。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="VoiceIsMutedByModerator">モデレーターがあなたのボイスをミュートしました。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="FailedToGetBenefits">残念ながら、このセッションで特典情報を得ることができませんでした。これは通常の本番環境で起こるものではありません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="TextChatIsMutedByModerator">モデレーターがあなたの文字チャットをミュートしました。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="VoiceIsMutedByModerator">モデレーターがあなたのボイスをミュートしました。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="FailedToGetBenefits">残念ながら、このセッションで特典情報を得ることができませんでした。これは通常の本番環境で起こるものではありません。
 恐れ入りますがサポートまでご連絡ください。このセッションが通常通り作動することはありません。再起動することをお勧めします。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BulkUploadCostConfirmation">[COUNT]個アイテムを一括アップロードします。総費用はL$ [COST]です。アップロードを続けてもよろしいですか？
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード" />
-  </notification>
-
-  <notification name="BulkUploadNoCompatibleFiles">選択されたファイルは一括アップロードできません。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BulkUploadIncompatibleFiles">選択されたファイルのいくつかは一括アップロードできません。
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="UploadCostConfirmation">このアップロードは L$ [PRICE]の費用がかかります。このままアップロードを続けてもよろしいですか？
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード" />
-  </notification>
-
-  <notification name="ConfirmClearTeleportHistory">テレポート履歴を削除しますか？
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="BottomTrayButtonCanNotBeShown">選択したボタンを現在表示することができません。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BulkUploadCostConfirmation">[COUNT]個アイテムを一括アップロードします。総費用はL$ [COST]です。アップロードを続けてもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード"/>
+	</notification>
+	<notification name="BulkUploadNoCompatibleFiles">選択されたファイルは一括アップロードできません。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BulkUploadIncompatibleFiles">選択されたファイルのいくつかは一括アップロードできません。
+    <usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="UploadCostConfirmation">このアップロードは L$ [PRICE]の費用がかかります。このままアップロードを続けてもよろしいですか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="アップロード"/>
+	</notification>
+	<notification name="ConfirmClearTeleportHistory">テレポート履歴を削除しますか？
+    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="BottomTrayButtonCanNotBeShown">選択したボタンを現在表示することができません。
 十分なスペースができればボタンは表示されます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ShareNotification">共有する住人を選択します。</notification>
-
-  <notification name="MeshUploadErrorDetails">[LABEL]をアップロードできませんでした：[MESSAGE]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ShareNotification">
+		共有する住人を選択します。
+	</notification>
+	<notification name="MeshUploadErrorDetails">
+		[LABEL]をアップロードできませんでした：[MESSAGE]
 [DETAILS]
-詳しくは、SecondLife.logをご覧ください。</notification>
-
-  <notification name="MeshUploadError">[LABEL]をアップロードできませんでした：[MESSAGE]
-
-詳しくは、SecondLife.logをご覧ください</notification>
-
-  <notification name="MeshUploadPermError">メッシュのアップロード許可をリクエスト中にエラーが発生しました。</notification>
-
-  <notification name="RegionCapabilityRequestError">リージョンの「[CAPABILITY]」という機能を取得できませんでした。</notification>
-
-  <notification name="ShareItemsConfirmation">次のアイテムを共有しますか？
+詳しくは、SecondLife.logをご覧ください。
+	</notification>
+	<notification name="MeshUploadError">
+		[LABEL]をアップロードできませんでした：[MESSAGE]
+
+詳しくは、SecondLife.logをご覧ください
+	</notification>
+	<notification name="MeshUploadPermError">
+		メッシュのアップロード許可をリクエスト中にエラーが発生しました。
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		リージョンの「[CAPABILITY]」という機能を取得できませんでした。
+	</notification>
+	<notification name="ShareItemsConfirmation">次のアイテムを共有しますか？
 
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 
 次の住人と共有：&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ShareFolderConfirmation">フォルダは一度に１つしか共有できません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ShareFolderConfirmation">フォルダは一度に１つしか共有できません。
   
 次のアイテムを共有しますか？
 
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 
 次の住人と共有：&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Ok" />
-  </notification>
-
-  <notification name="ItemsShared">アイテムが共有されました。</notification>
-  <notification name="DeedToGroupFail">グループへの譲渡に失敗しました。
-    <tag>group</tag>
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ReleaseLandThrottled">区画「[PARCEL_NAME]」は現在放棄できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ReleasedLandWithReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="Ok"/>
+	</notification>
+	<notification name="ItemsShared">
+		アイテムが共有されました。
+	</notification>
+	<notification name="DeedToGroupFail">グループへの譲渡に失敗しました。
+    <tag>
+			group
+		</tag>
+		<tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ReleaseLandThrottled">区画「[PARCEL_NAME]」は現在放棄できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ReleasedLandWithReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
 
 同区画が他の住人に売り出される前の[RECLAIM_PERIOD]時間内であれば、無償で土地を取り戻すことができます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ReleasedLandNoReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ReleasedLandNoReclaim">[AREA]m²の区画「[PARCEL_NAME]」が公開されました。
 一般に公開されたので、今なら誰でも購入可能です。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarRezNotification">（作成後[EXISTENCE]秒経過）
-「[NAME]」というアバターは、[TIME]秒後に姿を現わします。</notification>
-
-  <notification name="AvatarRezSelfBakedDoneNotification">（作成後[EXISTENCE]秒経過）
-アウトフィットのベークは、[TIME]秒後に完了します。</notification>
-
-  <notification name="AvatarRezSelfBakedUpdateNotification">（作成後[EXISTENCE]秒経過）
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarRezNotification">
+		（作成後[EXISTENCE]秒経過）
+「[NAME]」というアバターは、[TIME]秒後に姿を現わします。
+	</notification>
+	<notification name="AvatarRezSelfBakedDoneNotification">
+		（作成後[EXISTENCE]秒経過）
+アウトフィットのベークは、[TIME]秒後に完了します。
+	</notification>
+	<notification name="AvatarRezSelfBakedUpdateNotification">
+		（作成後[EXISTENCE]秒経過）
 容姿の更新は、[TIME]秒後に送信されます。
-[STATUS]</notification>
-  <notification name="AvatarRezCloudNotification">（[EXISTENCE]秒）
-アバター「[NAME]」が、クラウドになります。</notification>
-
-  <notification name="AvatarRezArrivedNotification">（[EXISTENCE]秒）
-アバター「[NAME]」が、現れます。</notification>
-
-  <notification name="AvatarRezLeftCloudNotification">（[EXISTENCE]秒）
-アバター「[NAME]」は、[TIME]秒でクラウド状態から出現します。</notification>
-
-  <notification name="AvatarRezEnteredAppearanceNotification">（[EXISTENCE]秒）
-アバター「[NAME]」が、容姿編集モードに入りました。</notification>
-
-  <notification name="AvatarRezLeftAppearanceNotification">（[EXISTENCE]秒）
-アバター「[NAME]」が、容姿編集モードを解除しました。</notification>
-
-  <notification name="NoConnect">[PROTOCOL] [HOSTID]を使って接続できません。
+[STATUS]
+	</notification>
+	<notification name="AvatarRezCloudNotification">
+		（[EXISTENCE]秒）
+アバター「[NAME]」が、クラウドになります。
+	</notification>
+	<notification name="AvatarRezArrivedNotification">
+		（[EXISTENCE]秒）
+アバター「[NAME]」が、現れます。
+	</notification>
+	<notification name="AvatarRezLeftCloudNotification">
+		（[EXISTENCE]秒）
+アバター「[NAME]」は、[TIME]秒でクラウド状態から出現します。
+	</notification>
+	<notification name="AvatarRezEnteredAppearanceNotification">
+		（[EXISTENCE]秒）
+アバター「[NAME]」が、容姿編集モードに入りました。
+	</notification>
+	<notification name="AvatarRezLeftAppearanceNotification">
+		（[EXISTENCE]秒）
+アバター「[NAME]」が、容姿編集モードを解除しました。
+	</notification>
+	<notification name="NoConnect">[PROTOCOL] [HOSTID]を使って接続できません。
 お使いのネットワークやファイアウォールの設定を確認してください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="NoVoiceConnect">ボイスサーバーに接続できません：
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="NoVoiceConnect">ボイスサーバーに接続できません：
 
 [ホストID]
 
@@ -3897,1423 +4948,1748 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
 ルーターの SIP ALG 機能を無効にします。
 
 音声通話は利用できなくなります。
-    <tag>voice</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="NoVoiceConnect-GIAB">ボイスサーバーに接続できません。
+    <tag>
+			voice
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="NoVoiceConnect-GIAB">ボイスサーバーに接続できません。
   
 ボイスチャットによるコミュニケーションが利用できません。
 お使いのネットワークやファイアウォールの設定を確認してください。
-    <tag>voice</tag>
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="AvatarRezLeftNotification">（[EXISTENCE]秒経過）
-アバター「[NAME]」は、完全に読み込まれています。</notification>
-
-  <notification name="AvatarRezSelfBakedTextureUploadNotification">（[EXISTENCE]秒経過）
-[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、アップロードされます。</notification>
-
-  <notification name="AvatarRezSelfBakedTextureUpdateNotification">（[EXISTENCE]秒経過）
-[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、ローカル反映されます。</notification>
-
-  <notification name="CannotUploadTexture">テクスチャをアップロードできません。
+    <tag>
+			voice
+		</tag>
+		<tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AvatarRezLeftNotification">
+		（[EXISTENCE]秒経過）
+アバター「[NAME]」は、完全に読み込まれています。
+	</notification>
+	<notification name="AvatarRezSelfBakedTextureUploadNotification">
+		（[EXISTENCE]秒経過）
+[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、アップロードされます。
+	</notification>
+	<notification name="AvatarRezSelfBakedTextureUpdateNotification">
+		（[EXISTENCE]秒経過）
+[TIME]秒後に「[BODYREGION]」の[RESOLUTION]のベークドテクスチャは、ローカル反映されます。
+	</notification>
+	<notification name="CannotUploadTexture">テクスチャをアップロードできません。
 [REASON]
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LivePreviewUnavailable">コピー不可／転送不可のため、このテクスチャを表示できません。
-    <usetemplate ignoretext="コピー不可／転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="FacePasteFailed">ペーストに失敗しました：[REASON]
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LivePreviewUnavailable">コピー不可／転送不可のため、このテクスチャを表示できません。
+    <usetemplate ignoretext="コピー不可／転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="FacePasteFailed">ペーストに失敗しました：[REASON]
     <usetemplate name="okbutton" yestext="ＯＫ"/>
-  </notification>
-
-  <notification name="FacePasteTexturePermissions">アクセス許可が制限されたテクスチャを適用したため、オブジェクトはテクスチャの持つアクセス制限を継承します。
+	</notification>
+	<notification name="FacePasteTexturePermissions">アクセス許可が制限されたテクスチャを適用したため、オブジェクトはテクスチャの持つアクセス制限を継承します。
     <usetemplate ignoretext="ペースト：権限が制限されているテクスチャを適用した。" name="notifyignore"/>
-    <usetemplate name="okbutton" yestext="ＯＫ"/>
-  </notification>
-
-  <notification name="ConfirmLeaveCall">このコールから抜けてもよろしいですか？
-    <tag>confirm</tag>
-    <tag>voice</tag>
-    <usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="ConfirmMuteAll">グループコールの参加者全員をミュートしました。
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ConfirmLeaveCall">このコールから抜けてもよろしいですか？
+    <tag>
+			confirm
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="ConfirmMuteAll">グループコールの参加者全員をミュートしました。
 あとからこのコールに参加する住人もミュートされます。
 あなたがコールを終了しても他の参加者のミュート状態が続きます。
 
 全員をミュートしますか？
-    <unique />
-    <tag>group</tag>
-    <tag>confirm</tag>
-    <tag>voice</tag>
-    <usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification label="チャット" name="HintChat">チャットに参加するには、画面下のチャットフィールドにテキストを入力します。
-    <unique />
-  </notification>
-
-  <notification label="立ち上がる" name="HintSit">座る姿勢から立ち上がるには、「立ち上がる」ボタンをクリックします。
-    <unique />
-  </notification>
-
-  <notification label="話す" name="HintSpeak">「スピーカー」ボタンをクリックすると、マイクのオン・オフが切り替わります。
+    <unique/>
+		<tag>
+			group
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<tag>
+			voice
+		</tag>
+		<usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification label="チャット" name="HintChat">チャットに参加するには、画面下のチャットフィールドにテキストを入力します。
+    <unique/>
+	</notification>
+	<notification label="立ち上がる" name="HintSit">座る姿勢から立ち上がるには、「立ち上がる」ボタンをクリックします。
+    <unique/>
+	</notification>
+	<notification label="話す" name="HintSpeak">「スピーカー」ボタンをクリックすると、マイクのオン・オフが切り替わります。
 
 上矢印をクリックすると、ボイスコントロールパネルが表示されます。
 
 「スピーカー」ボタンを非表示にすると、ボイス機能も無効になります。
-    <unique />
-  </notification>
-
-  <notification label="世界を探検" name="HintDestinationGuide">行き先ガイドには数多くの探索場所が含まれます。どこか行きたい場所をみつけたら、テレポートして探索に出かけましょう。
-    <unique />
-  </notification>
-
-  <notification label="サイドパネル" name="HintSidePanel">サイドパネルから、インベントリや服装、プロフィールなどに素早くアクセスできます。
-    <unique />
-  </notification>
-
-  <notification label="移動" name="HintMove">歩行や走行は、「移動」パネルを開き、矢印コントロールによって操作します。この操作はキーボードの矢印キーで実行することも可能です。
-    <unique />
-  </notification>
-
-  <notification label="" name="HintMoveClick">１，クリックで移動
+    <unique/>
+	</notification>
+	<notification label="世界を探検" name="HintDestinationGuide">行き先ガイドには数多くの探索場所が含まれます。どこか行きたい場所をみつけたら、テレポートして探索に出かけましょう。
+    <unique/>
+	</notification>
+	<notification label="サイドパネル" name="HintSidePanel">サイドパネルから、インベントリや服装、プロフィールなどに素早くアクセスできます。
+    <unique/>
+	</notification>
+	<notification label="移動" name="HintMove">歩行や走行は、「移動」パネルを開き、矢印コントロールによって操作します。この操作はキーボードの矢印キーで実行することも可能です。
+    <unique/>
+	</notification>
+	<notification label="" name="HintMoveClick">１，クリックで移動
 地面をクリックすると、その場所まで歩きます。
 
 ２，クリック・ドラッグで視界を回転
 任意の場所をクリックしてドラッグすると視界を回転させることができます。
-    <tag>custom_skin</tag>
-  </notification>
-
-  <notification label="表示名" name="HintDisplayName">表示名（カスタマイズ可能）を設定します。ユーザー名は固有で変更できませんが、ここで追加する表示名は変更可能です。他の住人の名前の表示方法は初期設定で変更してください。
-    <unique />
-  </notification>
-
-  <notification label="表示" name="HintView">カメラの視点を変更するには、水平・垂直コントロールを使います。Escキーを押すか、移動キーを押すると、視点がリセットされます。
-    <unique />
-    <tag>custom_skin</tag>
-  </notification>
-
-  <notification label="インベントリ" name="HintInventory">インベントリには、あなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。
-    <unique />
-  </notification>
-
-  <notification label="あなたのリンデンドル" name="HintLindenDollar">これがあなたのL$残高です。リンデンドルを購入するには「L$の購入」をクリックします。
-    <unique />
-    <tag>funds</tag>
-  </notification>
-
-  <notification name="LowMemory">メモリプール残量が少なくなっています。クラッシュを避けるため[APP_NAME]の機能の一部は無効になりました。他のアプリケーションを終了し、状況が継続または再発する場合にはSecond Lifeを再起動してください。</notification>
-
-  <notification name="ForceQuitDueToLowMemory">メモリ不足のため３０秒以内に[APP_NAME]は終了します。</notification>
-
-  <notification name="SOCKS_NOT_PERMITTED">ルールセットによって許可されていないため、SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;が接続を拒絶しました。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_CONNECT_ERROR">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot; が接続を拒絶したため、TCPチャンネルを開くことができませんでした。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_NOT_ACCEPTABLE">OCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、選択された認証システムを拒絶しました。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_AUTH_FAIL">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、あなたの資格が無効だと報告しました。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_UDP_FWD_NOT_GRANTED">SOCKS 5プロキシ&quot;[HOST]:[PORT]&quot;は、UDPアソシエートのリクエストを拒絶しました。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_HOST_CONNECT_FAILED">SOCKS 5プロキシサーバー&quot;[HOST]:[PORT]&quot;に接続できませんでした。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_UNKNOWN_STATUS">不明のプロキシエラーがサーバー&quot;[HOST]:[PORT]&quot;で発生しました。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_INVALID_HOST">SOCKS 5プロキシのアドレスまたはポート&quot;[HOST]:[PORT]&quot;が無効です。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="SOCKS_BAD_CREDS">SOCKS 5 のユーザー名またはパスワードが正しくありません。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PROXY_INVALID_HTTP_HOST">HTTP プロキシのアドレス、またはポート &quot;[HOST]:[PORT]&quot;が無効です。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PROXY_INVALID_SOCKS_HOST">SOCKS プロキシのアドレス、またはポート&quot;[HOST]:[PORT]&quot;が無効です。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ChangeProxySettings">プロキシの設定は[APP_NAME]を再起動後に反映されます。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="AuthRequest">「[REALM]」にある「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;」のサイトには、ユーザー名とパスワードが必要です。
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="username" text="ユーザー名" />
-      <input name="password" text="パスワード" />
-      <button name="ok" text="送信" />
-      <button name="cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification label="" name="NoClassifieds">クラシファイド広告の作成と編集は、拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoGroupInfo">グループの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoPlaceInfo">場所のプロフィールの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoPicks">ピックの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoWorldMap">ワールドマップの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoVoiceCall">ボイスコールは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoAvatarShare">共有は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoAvatarPay">他の住人への支払いは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoInventory">インベントリの表示は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoAppearance">容姿エディターは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="NoSearch">検索は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
-    <unique />
-    <tag>fail</tag>
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了" />
-  </notification>
-
-  <notification label="" name="ConfirmHideUI">この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには、[SHORTCUT]をもう一度クリックしてください。
-    <unique />
-    <tag>confirm</tag>
-    <usetemplate ignoretext="ＵＩを非表示前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_WarnOnPhantom">選択された一部のリンクセットはファントムフラグが切り替えられます。
+    <tag>
+			custom_skin
+		</tag>
+	</notification>
+	<notification label="表示名" name="HintDisplayName">表示名（カスタマイズ可能）を設定します。ユーザー名は固有で変更できませんが、ここで追加する表示名は変更可能です。他の住人の名前の表示方法は初期設定で変更してください。
+    <unique/>
+	</notification>
+	<notification label="表示" name="HintView">カメラの視点を変更するには、水平・垂直コントロールを使います。Escキーを押すか、移動キーを押すると、視点がリセットされます。
+    <unique/>
+		<tag>
+			custom_skin
+		</tag>
+	</notification>
+	<notification label="インベントリ" name="HintInventory">インベントリには、あなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。
+    <unique/>
+	</notification>
+	<notification label="あなたのリンデンドル" name="HintLindenDollar">これがあなたのL$残高です。リンデンドルを購入するには「L$の購入」をクリックします。
+    <unique/>
+		<tag>
+			funds
+		</tag>
+	</notification>
+	<notification name="LowMemory">
+		メモリプール残量が少なくなっています。クラッシュを避けるため[APP_NAME]の機能の一部は無効になりました。他のアプリケーションを終了し、状況が継続または再発する場合にはSecond Lifeを再起動してください。
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		メモリ不足のため３０秒以内に[APP_NAME]は終了します。
+	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">ルールセットによって許可されていないため、SOCKS 5プロキシ"[HOST]:[PORT]"が接続を拒絶しました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">SOCKS 5プロキシ"[HOST]:[PORT]" が接続を拒絶したため、TCPチャンネルを開くことができませんでした。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">OCKS 5プロキシ"[HOST]:[PORT]"は、選択された認証システムを拒絶しました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">SOCKS 5プロキシ"[HOST]:[PORT]"は、あなたの資格が無効だと報告しました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">SOCKS 5プロキシ"[HOST]:[PORT]"は、UDPアソシエートのリクエストを拒絶しました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">SOCKS 5プロキシサーバー"[HOST]:[PORT]"に接続できませんでした。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">不明のプロキシエラーがサーバー"[HOST]:[PORT]"で発生しました。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">SOCKS 5プロキシのアドレスまたはポート"[HOST]:[PORT]"が無効です。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">SOCKS 5 のユーザー名またはパスワードが正しくありません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">HTTP プロキシのアドレス、またはポート "[HOST]:[PORT]"が無効です。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">SOCKS プロキシのアドレス、またはポート"[HOST]:[PORT]"が無効です。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ChangeProxySettings">プロキシの設定は[APP_NAME]を再起動後に反映されます。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="AuthRequest">「[REALM]」にある「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;」のサイトには、ユーザー名とパスワードが必要です。
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="username" text="ユーザー名"/>
+			<input name="password" text="パスワード"/>
+			<button name="ok" text="送信"/>
+			<button name="cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="" name="NoClassifieds">クラシファイド広告の作成と編集は、拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoGroupInfo">グループの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoPlaceInfo">場所のプロフィールの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoPicks">ピックの作成と編集は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoWorldMap">ワールドマップの表示は拡張モードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoVoiceCall">ボイスコールは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoAvatarShare">共有は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoAvatarPay">他の住人への支払いは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoInventory">インベントリの表示は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoAppearance">容姿エディターは拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoSearch">検索は拡張モードでのみ利用できます。ログアウトしてモードを変更しますか？
+    <unique/>
+		<tag>
+			fail
+		</tag>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="ConfirmHideUI">この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには、[SHORTCUT]をもう一度クリックしてください。
+    <unique/>
+		<tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="ＵＩを非表示前の確認" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">選択された一部のリンクセットはファントムフラグが切り替えられます。
   
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リンクセットのファントムフラグの切替えができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_MismatchOnRestricted">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」 に設定されます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リンクセットのファントムフラグの切替えができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」 に設定されます。
   
 続けてもよろしいですか？
-    <tag>confirm</tag>？
-    <usetemplate ignoretext="リンクセットの権限制限のため変更ができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_MismatchOnVolume">選択された一部のリンクセットは、形状が凸状でないため「[REQUESTED_TYPE]」に設定できません。
+    <tag>
+			confirm
+		</tag>？
+    <usetemplate ignoretext="リンクセットの権限制限のため変更ができなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">選択された一部のリンクセットは、形状が凸状でないため「[REQUESTED_TYPE]」に設定できません。
   
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リンクセットの形状が凸状でないため変更できなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">選択された一部のリンクセットはファントムフラグが切り替えられます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リンクセットの形状が凸状でないため変更できなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">選択された一部のリンクセットはファントムフラグが切り替えられます。
   
 一部の選択されたリンクセットは、リンクセットへの権限が制限されているため「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。
 
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リンクセットの一部のファントムフラグの設定ができたが、権限設定できなかったものがあった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リンクセットの一部のファントムフラグの設定ができたが、権限設定できなかったものがあった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
   
 選択された一部のリンクセットは、形状が凸状でないため「[REQUESTED_TYPE]」に設定できません。
 
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リンクセットの一部のファントムフラグは切り替えられたが、他のリンクセットは形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため「[REQUESTED_TYPE]」に設定できません。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リンクセットの一部のファントムフラグは切り替えられたが、他のリンクセットは形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">一部の選択されたリンクセットは、リンクセットへの権限が制限されているため「[REQUESTED_TYPE]」に設定できません。
 
 これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。選択された一部のリンクセットは、形状が凸状でないため、「[REQUESTED_TYPE]」に設定できません。
 
 これらのリンクセットの用途タイプは変わりません。
 
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リンクセットの一部の権限が制限されており、また形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リンクセットの一部の権限が制限されており、また形状が凸状でなかった時" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">選択された一部のリンクセットはファントムフラグが切り替えられます。
 
 一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットは代わりに「[RESTRICTED_TYPE]」に設定されます。
 
 選択された一部のリンクセットは、形状が凸状でないため、「[REQUESTED_TYPE]」に設定できません。これらのリンクセットの用途タイプは変わりません。
 
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リンクセットの一部のファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限され、また形状が凸状でないため設定できません。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PathfindingLinksets_ChangeToFlexiblePath">選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <global name="UnsupportedGLRequirements">[APP_NAME]の動作に必要なハードウェア要件を満たしていないようです。[APP_NAME]にはマルチテクスチャをサポートするOpenGLグラフィックカードが必要です。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リンクセットの一部のファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限され、また形状が凸状でないため設定できません。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<global name="UnsupportedGLRequirements">
+		[APP_NAME]の動作に必要なハードウェア要件を満たしていないようです。[APP_NAME]にはマルチテクスチャをサポートするOpenGLグラフィックカードが必要です。
 お使いのグラフィックカードの最新ドライバがインストールされているか、もしくは、オペレーティングシステムに最新のサービスパックやパッチが当たっているかをご確認ください。
 
-この問題が何度も起きる場合は、[SUPPORT_SITE]をご確認ください。</global>
-  <global name="UnsupportedCPUAmount">796</global>
-
-  <global name="UnsupportedRAMAmount">510</global>
-
-  <global name="UnsupportedGPU">－あなたのグラフィックカードは、必須動作環境の条件を満たしていません。</global>
-
-  <global name="UnsupportedRAM">－あなたのシステムメモリは、必須動作環境の条件を満たしていません。</global>
-
-  <global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">自分の土地を持っている場合、そこを「ホーム」に設定できます。持っていない場合は、マップから「情報ハブ」をお探しください。</global>
-
-  <global name="You died and have been teleported to your home location">死んでしまったので、ホームにテレポートされました。</global>
-
-  <notification name="LocalBitmapsUpdateFileNotFound">[FNAME]が見つからなかったため、更新できませんでした。
-このファイルに対する今後の更新を無効にします。</notification>
-
-  <notification name="LocalBitmapsUpdateFailedFinal">[FNAME]は、[NRETRIES]回の試行で開くこともデコードすることもできなかったため、壊れているとみなしました。
-このファイルに対する今後の更新を無効にします。</notification>
-
-  <notification name="LocalBitmapsVerifyFail">開いたりデコードすることができない、無効である、もしくは読み取り不能な画像ファイル「[FNAME]」を追加しようとしました。
-この試行はキャンセルされました。</notification>
-
-  <notification name="PathfindingReturnMultipleItems">[NUM_ITEMS]個のアイテムを返却中しようとしています。
+この問題が何度も起きる場合は、[SUPPORT_SITE]をご確認ください。
+	</global>
+	<global name="UnsupportedCPUAmount">
+		796
+	</global>
+	<global name="UnsupportedRAMAmount">
+		510
+	</global>
+	<global name="UnsupportedGPU">
+		－あなたのグラフィックカードは、必須動作環境の条件を満たしていません。
+	</global>
+	<global name="UnsupportedRAM">
+		－あなたのシステムメモリは、必須動作環境の条件を満たしていません。
+	</global>
+	<global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
+		自分の土地を持っている場合、そこを「ホーム」に設定できます。持っていない場合は、マップから「情報ハブ」をお探しください。
+	</global>
+	<global name="You died and have been teleported to your home location">
+		死んでしまったので、ホームにテレポートされました。
+	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME]が見つからなかったため、更新できませんでした。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME]は、[NRETRIES]回の試行で開くこともデコードすることもできなかったため、壊れているとみなしました。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		開いたりデコードすることができない、無効である、もしくは読み取り不能な画像ファイル「[FNAME]」を追加しようとしました。
+この試行はキャンセルされました。
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">[NUM_ITEMS]個のアイテムを返却中しようとしています。
 このまま続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="PathfindingDeleteMultipleItems">[NUM_ITEMS]個のアイテムを削除しようとしています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">[NUM_ITEMS]個のアイテムを削除しようとしています。
 このまま続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-
-  <notification name="AvatarFrozen">[AV_FREEZER]によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarFrozenDuration">[AV_FREEZER]によって、あなたは[AV_FREEZE_TIME]秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="YouFrozeAvatar">アバターがフリーズされています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarHasUnFrozenYou">[AV_FREEZER]によってフリーズが解除されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarUnFrozen">アバターのフリーズが解除されました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarFreezeFailure">その区画の管理権限を持っていないため、フリーズに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarFreezeThaw">フリーズ期間が切れました。仕事に戻ってください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarCantFreeze">残念ながら、そのユーザーをフリーズできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NowOwnObject">これで、オブジェクト[OBJECT_NAME]の所有者になりました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantRezOnLand">この土地の所有者が許可していないため、[OBJECT_POS]でオブジェクトをRezすることができません。土地ツールを使用して、土地の所有を確認してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RezFailTooManyRequests">リクエストが多すぎて、オブジェクトをRezすることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SitFailCantMove">今回移動できなかったため、座ることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SitFailNotAllowedOnLand">その土地に対して許可を受けていないため、座ることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SitFailNotSameRegion">移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoNewObjectRegionFull">新しいオブジェクトを作成できません。リージョンが埋まっています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="FailedToPlaceObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoOwnNoGardening">所有していない土地に木や草を植えることはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoCopyPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、コピーに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoTransPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を譲渡する権限がないため、コピーに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AddToNavMeshNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt; は、ナビメッシュに関連付けがあるため、コピーに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="DupeWithNoRootsSelected">ルートオブジェクトを選択せずに複製します。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDupeCuzRegionIsFull">リージョン（地域）が埋まっているため、オブジェクトのコピーを作成することができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDupeCuzParcelNotFound">オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateCuzParcelFull">区画がいっぱいのため、オブジェクトを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RezAttemptFailed">オブジェクトのRezに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ToxicInvRezAttemptFailed">このリージョン（地域）で問題を引き起こすアイテムは作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InvItemIsBlacklisted">そのインベントリアイテムは、ブラックリストに登録されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoCanRezObjects">現在あなたには、オブジェクトを作成する権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandSearchBlocked">土地の検索がブロックされました。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="AvatarFrozen">[AV_FREEZER]によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarFrozenDuration">[AV_FREEZER]によって、あなたは[AV_FREEZE_TIME]秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="YouFrozeAvatar">アバターがフリーズされています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">[AV_FREEZER]によってフリーズが解除されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarUnFrozen">アバターのフリーズが解除されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarFreezeFailure">その区画の管理権限を持っていないため、フリーズに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarFreezeThaw">フリーズ期間が切れました。仕事に戻ってください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarCantFreeze">残念ながら、そのユーザーをフリーズできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NowOwnObject">これで、オブジェクト[OBJECT_NAME]の所有者になりました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantRezOnLand">この土地の所有者が許可していないため、[OBJECT_POS]でオブジェクトをRezすることができません。土地ツールを使用して、土地の所有を確認してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RezFailTooManyRequests">リクエストが多すぎて、オブジェクトをRezすることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SitFailCantMove">今回移動できなかったため、座ることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">その土地に対して許可を受けていないため、座ることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SitFailNotSameRegion">移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoNewObjectRegionFull">新しいオブジェクトを作成できません。リージョンが埋まっています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FailedToPlaceObject">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoOwnNoGardening">所有していない土地に木や草を植えることはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoCopyPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、コピーに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoTransPermsNoObject">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を譲渡する権限がないため、コピーに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AddToNavMeshNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt; は、ナビメッシュに関連付けがあるため、コピーに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DupeWithNoRootsSelected">ルートオブジェクトを選択せずに複製します。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">リージョン（地域）が埋まっているため、オブジェクトのコピーを作成することができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateCuzParcelFull">区画がいっぱいのため、オブジェクトを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RezAttemptFailed">オブジェクトのRezに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">このリージョン（地域）で問題を引き起こすアイテムは作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InvItemIsBlacklisted">そのインベントリアイテムは、ブラックリストに登録されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoCanRezObjects">現在あなたには、オブジェクトを作成する権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandSearchBlocked">土地の検索がブロックされました。
 短期間に多くの土地を検索したためです。
 
 お手数ですが、しばらくしてからもう一度やり直してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NotEnoughResourcesToAttach">オブジェクトの着用に使用できるスクリプトのリソースが足りません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="YouDiedAndGotTPHome">死んでしまったので、ホームにテレポートされました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="EjectComingSoon">ここへの入場が許可されていないため、[EJECT_TIME]秒後に追放されます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoEnterRegionMaybeFull">このリージョン（地域）「[NAME]」へ入場することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">オブジェクトの着用に使用できるスクリプトのリソースが足りません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="YouDiedAndGotTPHome">死んでしまったので、ホームにテレポートされました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="EjectComingSoon">ここへの入場が許可されていないため、[EJECT_TIME]秒後に追放されます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoEnterRegionMaybeFull">このリージョン（地域）「[NAME]」へ入場することはできません。
 いっぱいになるか、すぐに再起動される可能性があります。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SaveBackToInvDisabled">「インベントリに保存」が無効になっています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoExistNoSaveToContents">「存在しません」からrezされたため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoModNoSaveToContents">あなたには、オブジェクト &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt;を修正する権限がないため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoSaveBackToInvDisabled">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をインベントリに保存できません。この操作は無効になりました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoCopyNoSelCopy">あなたには、オブジェクト &lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、選択内容をコピーできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoTransNoSelCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoTransNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermsNoRemoval">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をシミュレーターから削除することは、権限のシステムにより許可されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoModNoSaveSelection">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を保存できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoCopyNoSaveSelection">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;はコピー不可なため、選択内容を保存できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoModNoTaking">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を選ぶことはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RezDestInternalError">内部エラー：不明な宛先タイプ。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="DeleteFailObjNotFound">そのオブジェクトは、見つからないため削除できませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SorryCantEjectUser">残念ながら、そのユーザーを追放することはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RegionSezNotAHome">このリージョンでは、ここにホームの位置を設定できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="HomeLocationLimits">ホームの場所を設定できるのは、自分の土地か、またはメインランドの情報ハブでのみです。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="HomePositionSet">家の配置の設定。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarEjected">アバターが追放されました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AvatarEjectFailed">その区画の管理権限がないため、追放できませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CMOParcelFull">区画がいっぱいなので、オブジェクト「[O]」を
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SaveBackToInvDisabled">「インベントリに保存」が無効になっています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoExistNoSaveToContents">「存在しません」からrezされたため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoModNoSaveToContents">あなたには、オブジェクト &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt;を修正する権限がないため、&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をオブジェクトの中身に保存できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をインベントリに保存できません。この操作は無効になりました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoCopyNoSelCopy">あなたには、オブジェクト &lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をコピーする権限がないため、選択内容をコピーできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoTransNoSelCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoTransNoCopy">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;は譲渡できないため、選択内容をコピーできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermsNoRemoval">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;をシミュレーターから削除することは、権限のシステムにより許可されていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoModNoSaveSelection">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を保存できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoCopyNoSaveSelection">オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;はコピー不可なため、選択内容を保存できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoModNoTaking">あなたには、オブジェクト&lt;nolink&gt;「[OBJ_NAME]」&lt;/nolink&gt;を修正する権限がないため、選択内容を選ぶことはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RezDestInternalError">内部エラー：不明な宛先タイプ。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DeleteFailObjNotFound">そのオブジェクトは、見つからないため削除できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SorryCantEjectUser">残念ながら、そのユーザーを追放することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RegionSezNotAHome">このリージョンでは、ここにホームの位置を設定できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="HomeLocationLimits">ホームの場所を設定できるのは、自分の土地か、またはメインランドの情報ハブでのみです。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="HomePositionSet">家の配置の設定。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarEjected">アバターが追放されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AvatarEjectFailed">その区画の管理権限がないため、追放できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CMOParcelFull">区画がいっぱいなので、オブジェクト「[O]」を
 リージョン（地域）[R]の[P]に移動できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CMOParcelPerms">ご使用のオブジェクトは、この区画で使用が許可されていないため、
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CMOParcelPerms">ご使用のオブジェクトは、この区画で使用が許可されていないため、
 オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CMOParcelResources">この区画にこのオブジェクトのリソースが不足しているため、
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CMOParcelResources">この区画にこのオブジェクトのリソースが不足しているため、
 オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoParcelPermsNoObject">その区画へのアクセス権がないため、コピーが失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CMORegionVersion">オブジェクトの受け取りに対応していない、旧バージョンを実行しているため、
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoParcelPermsNoObject">その区画へのアクセス権がないため、コピーが失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CMORegionVersion">オブジェクトの受け取りに対応していない、旧バージョンを実行しているため、
 他のリージョン（地域）でリージョンをまたがる
 オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CMONavMesh">リージョンの境界にわたって、ナビメッシュを変更できないため、
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CMONavMesh">リージョンの境界にわたって、ナビメッシュを変更できないため、
 オブジェクト「[O]」をリージョン（地域）[R]の[P]に移動できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CMOWTF">不明な理由により、オブジェクト「[O]」を
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CMOWTF">不明な理由により、オブジェクト「[O]」を
 リージョン（地域）[R]の[P]に移動できません。（[F]）
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermModifyObject">そのオブジェクトを変更する権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TooMuchObjectInventorySelected">大きなインベントリを持つオブジェクトの選択が多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="CantEnablePhysObjContributesToNav">ナビメッシュに貢献するオブジェクトに対して物理作用を有効にできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantEnablePhysKeyframedObj">キーフレームオブジェクトのために物理作用を有効にできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantEnablePhysNotEnoughLandResources">土地のリソースが足りないため、オブジェクトの物理作用を有効にできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantEnablePhysCostTooGreat">[MAX_OBJECTS]より大きい物理リソースコストを持つオブジェクトでは、物理作用を有効にできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="PhantomWithConcavePiece">このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableAddItem">アイテムを追加できません！
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableEditItem">これは編集できません！
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermToEdit">これを編集する許可がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermToCopyInventory">そのインベントリをコピーすることは許可されません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSaveItemDoesntExist">オブジェクトのコンテンツに保存できません。アイテムが存在していません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSaveItemAlreadyExists">オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSaveModifyAttachment">オブジェクトのコンテンツに保存できません。このため、装着物の権限が変更されます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AttachmentHasTooMuchInventory">ご使用の装着物に含まれるインベントリが多すぎるため、インベントリを追加できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="IllegalAttachment">添付ファイルはアバターの存在しない点を要求しました。代わりに胸に添付されていました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TooManyScripts">スクリプトが多すぎます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableAddScript">テキストを追加できません！
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AssetServerTimeoutObjReturn">アセットサーバーが適時に応答しませんでした。オブジェクトが地域に返されました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RegionDisablePhysicsShapes">このリージョンでは、物理的シェイプが有効にされていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoModNavmeshAcrossRegions">リージョンの境界をまたぐナビメッシュは変更できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoSetPhysicsPropertiesOnObjectType">そのオブジェクトタイプの物理的プロパティを設定できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoSetRootPrimWithNoShape">ルートプリムを設定できないため、シェイプがありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoRegionSupportPhysMats">このリージョンでは、物理的素材が有効にされていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="OnlyRootPrimPhysMats">物理的素材を調整できるのは、ルートプリムだけです。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoSupportCharacterPhysMats">キャラクターへの物理的素材の設定はまだサポートされていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InvalidPhysMatProperty">指定した物理的素材のプロパティが１つ以上無効です。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermsAlterStitchingMeshObj">メッシュオブジェクトのメッシュ種別を変更することはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermsAlterShapeMeshObj">メッシュオブジェクトの形状を変更することはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="FullRegionCantEnter">リージョンが埋まっているため、このリージョンに入場できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedOwnersDiffer">リンクエラー－所有者が違います。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedNoModNavmeshAcrossRegions">リンクエラー－リージョンの境界をまたぐナビメッシュは変更できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedNoPermToEdit">リンクエラー－編集権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedTooManyPrims">リンクエラー－プリミティブが多すぎます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedCantLinkNoCopyNoTrans">リンクエラー－コピーなしと転送なしをリンクできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedNothingLinkable">リンクエラー－リンクできるものがありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedTooManyPathfindingChars">リンクエラー－経路探索の文字数が多すぎます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedInsufficientLand">リンクエラー－土地のリソースが足りません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LinkFailedTooMuchPhysics">オブジェクトが使用する物理リソースが多すぎます－そのダイナミクスが無効になっています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="EstateManagerFailedllTeleportHome">[SLURL] のオブジェクト「[OBJECT_NAME]」で不動産マネージャーのホームをテレポートできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TeleportedHomeByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはホームにテレポートされました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TeleportedHomeByObject">​オブジェクト​「[OBJECT_NAME]」によって、あなたはホームへテレポートされています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TeleportedByAttachment">[ITEM_ID]への装着物によって、あなたはテレポートされています。
-    <tag>fail</tag>
-    <usetemplate ignoretext="テレポート：装着物によりテレポートされました" name="notifyignore" />
-  </notification>
-
-  <notification name="TeleportedByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
-    <tag>fail</tag>
-    <usetemplate ignoretext="テレポート：区画上のオブジェクトによりテレポートされました" name="notifyignore" />
-  </notification>
-
-  <notification name="TeleportedByObjectOwnedBy">[OWNER_ID]が所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TeleportedByObjectUnknownUser">不明なユーザーが所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="StandDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが立つことを許可しません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ResitDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが席を変更することを許可しません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateObjectRegionFull">リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateAnimatedObjectTooLarge">リグ入三角形の限度数を超えるため、リクエストされたアニメーションオブジェクトを作成することができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantAttackMultipleObjOneSpot">１つの箇所に複数のオブジェクトを着用することはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateMultipleObjAtLoc">ここでは、複数のオブジェクトを作成することはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToCreateObjTimeOut">リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToCreateObjUnknown">リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToCreateObjMissingFromDB">要求されたオブジェクトを作成できません。もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RezFailureTookTooLong">リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rezに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="FailedToPlaceObjAtLoc">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreatePlantsOnLand">この土地に木を植えることはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantRestoreObjectNoWorldPos">オブジェクトをリストアできません。ワールドの位置が見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantRezObjectInvalidMeshData">メッシュデータが無効なため、オブジェクトをRezすることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantRezObjectTooManyScripts">このリージョンに既に多くのスクリプトが存在するため、オブジェクトをRezすることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateObjectNoAccess">現在のアクセス権限では、そこにオブジェクトを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateObject">現在あなたにはオブジェクト作成する権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InvalidObjectParams">無効なオブジェクトパラメーター
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDuplicateObjectNoAcess">現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantChangeShape">あなたにはこのシェイプを変更する権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermsTooManyAttachedAnimatedObjects">この操作を行うと、装着されたアニメーションオブジェクトが限度数を超えます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermsLinkAnimatedObjectTooLarge">結果として、アニメーションオブジェクトがリグ入り三角形の限度数を超えるため、これらのオブジェクトを結合できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPermsSetFlagAnimatedObjectTooLarge">リグ入り三角形の限度数を超えるため、このオブジェクトをアニメーションオブジェクトにすることはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantChangeAnimatedObjectStateInsufficientLand">このオブジェクトをアニメーションオブジェクトの状態に変えると、区画の限度数を超えるため変更できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ErrorNoMeshData">サーバーエラー：メッシュデータが読み込まれていないため、この操作を完了できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoAccessToClaimObjects">現在のアクセス権限では、ここにオブジェクトを取得できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="DeedFailedNoPermToDeedForGroup">あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoPrivsToBuyObject">現在のアクセス権限では、ここでオブジェクトを購入できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantAttachObjectAvatarSittingOnIt">アバターがオブジェクトに存在するため、オブジェクトを着用できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="WhyAreYouTryingToWearShrubbery">木や草を装着物として着用できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantAttachGroupOwnedObjs">グループが所有しているオブジェクトは着用できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantAttachObjectsNotOwned">所有していないオブジェクトは着用できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantAttachNavmeshObjects">ナビメッシュに貢献しているオブジェクトは着用できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantAttachObjectNoMovePermissions">あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantAttachNotEnoughScriptResources">オブジェクトの着用に使用できるスクリプトリソースが足りません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDropItemTrialUser">オブジェクトを下に置く事はできません。フリートライアル領域をお試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDropMeshAttachment">メッシュ装着物を下に置く事はできません。インベントリから切り離して、ワールドでRezしてください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDropAttachmentNoPermission">装着物を下に置く事に失敗しました。そこへ置ける権限がありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDropAttachmentInsufficientLandResources">装着物のドロップに失敗しました。利用できる土地リソースの数が足りません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDropAttachmentInsufficientResources">利用できるリソースが足りないため、装着物のドロップに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDropObjectFullParcel">ここにオブジェクトをドロップできません。区画が埋まっています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantTouchObjectBannedFromParcel">この土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="PlzNarrowDeleteParams">削除パラメーターを絞ってください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UnableToUploadAsset">アセットをアップロードできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantTeleportCouldNotFindUser">ホームをテレポートするユーザーが見つかりませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="GodlikeRequestFailed">過剰なリクエストで失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="GenericRequestFailed">一般的なリクエストに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantUploadPostcard">ポストカードをアップロードできません。後でもう一度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantFetchInventoryForGroupNotice">グループ通知のインベントリの詳細を取得できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSendGroupNoticeNotPermitted">グループ通知の送信が許可されないため、送信できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。インベントリを作成することもできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantParceInventoryInNotice">通知内のインベントリを検出できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TerrainUploadFailed">地形のアップロードに失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TerrainFileWritten">地形ファイルが書き込まれました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TerrainFileWrittenStartingDownload">地形ファイルを書き出し、ダウンロードを開始しています…
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TerrainBaked">地形がベークされました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TenObjectsDisabledPlzRefresh">選択された最初の１０個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UpdateViewerBuyParcel">この区画を購入するには、ビューアーを更新する必要があります。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantBuyParcelNotForSale">購入することができません。この区画は販売対象ではありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantBuySalePriceOrLandAreaChanged">販売価格または土地の面積が変わったため、購入できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantBuyParcelNotAuthorized">あなたは、この区画の委任された購入者ではありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantBuyParcelAwaitingPurchaseAuth">すでに購入の認証を待機しているため、この区画を購入できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantBuildOverflowParcel">区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SelectedMultipleOwnedLand">所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantJoinTooFewLeasedParcels">選択範囲のリース区画の数が少ないため、参加できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDivideLandMultipleParcelsSelected">土地を分割できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermModifyObject">そのオブジェクトを変更する権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TooMuchObjectInventorySelected">大きなインベントリを持つオブジェクトの選択が多すぎます。選択するオブジェクトを減らして、もう一度やり直してください。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">ナビメッシュに貢献するオブジェクトに対して物理作用を有効にできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">キーフレームオブジェクトのために物理作用を有効にできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">土地のリソースが足りないため、オブジェクトの物理作用を有効にできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">[MAX_OBJECTS]より大きい物理リソースコストを持つオブジェクトでは、物理作用を有効にできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PhantomWithConcavePiece">このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableAddItem">アイテムを追加できません！
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableEditItem">これは編集できません！
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermToEdit">これを編集する許可がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermToCopyInventory">そのインベントリをコピーすることは許可されません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSaveItemDoesntExist">オブジェクトのコンテンツに保存できません。アイテムが存在していません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSaveModifyAttachment">オブジェクトのコンテンツに保存できません。このため、装着物の権限が変更されます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AttachmentHasTooMuchInventory">ご使用の装着物に含まれるインベントリが多すぎるため、インベントリを追加できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="IllegalAttachment">添付ファイルはアバターの存在しない点を要求しました。代わりに胸に添付されていました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TooManyScripts">スクリプトが多すぎます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableAddScript">テキストを追加できません！
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">アセットサーバーが適時に応答しませんでした。オブジェクトが地域に返されました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">このリージョンでは、物理的シェイプが有効にされていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">リージョンの境界をまたぐナビメッシュは変更できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">そのオブジェクトタイプの物理的プロパティを設定できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">ルートプリムを設定できないため、シェイプがありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoRegionSupportPhysMats">このリージョンでは、物理的素材が有効にされていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">物理的素材を調整できるのは、ルートプリムだけです。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">キャラクターへの物理的素材の設定はまだサポートされていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InvalidPhysMatProperty">指定した物理的素材のプロパティが１つ以上無効です。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">メッシュオブジェクトのメッシュ種別を変更することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">メッシュオブジェクトの形状を変更することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FullRegionCantEnter">リージョンが埋まっているため、このリージョンに入場できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">リンクエラー－所有者が違います。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">リンクエラー－リージョンの境界をまたぐナビメッシュは変更できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">リンクエラー－編集権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedTooManyPrims">リンクエラー－プリミティブが多すぎます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">リンクエラー－コピーなしと転送なしをリンクできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedNothingLinkable">リンクエラー－リンクできるものがありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">リンクエラー－経路探索の文字数が多すぎます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedInsufficientLand">リンクエラー－土地のリソースが足りません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">オブジェクトが使用する物理リソースが多すぎます－そのダイナミクスが無効になっています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="EstateManagerFailedllTeleportHome">[SLURL] のオブジェクト「[OBJECT_NAME]」で不動産マネージャーのホームをテレポートできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはホームにテレポートされました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TeleportedHomeByObject">​オブジェクト​「[OBJECT_NAME]」によって、あなたはホームへテレポートされています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TeleportedByAttachment">[ITEM_ID]への装着物によって、あなたはテレポートされています。
+    <tag>
+			fail
+		</tag>
+		<usetemplate ignoretext="テレポート：装着物によりテレポートされました" name="notifyignore"/>
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">区画「[PARCEL_NAME]」のオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>
+			fail
+		</tag>
+		<usetemplate ignoretext="テレポート：区画上のオブジェクトによりテレポートされました" name="notifyignore"/>
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">[OWNER_ID]が所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">不明なユーザーが所有しているオブジェクト「[OBJECT_NAME]」によって、あなたはテレポートされています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="StandDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが立つことを許可しません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ResitDeniedByObject">「[OBJECT_NAME]」は、この時点であなたが席を変更することを許可しません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateObjectRegionFull">リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateAnimatedObjectTooLarge">リグ入三角形の限度数を超えるため、リクエストされたアニメーションオブジェクトを作成することができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">１つの箇所に複数のオブジェクトを着用することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">ここでは、複数のオブジェクトを作成することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToCreateObjUnknown">リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">要求されたオブジェクトを作成できません。もう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RezFailureTookTooLong">リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rezに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreatePlantsOnLand">この土地に木を植えることはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">オブジェクトをリストアできません。ワールドの位置が見つかりません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">メッシュデータが無効なため、オブジェクトをRezすることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">このリージョンに既に多くのスクリプトが存在するため、オブジェクトをRezすることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateObjectNoAccess">現在のアクセス権限では、そこにオブジェクトを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateObject">現在あなたにはオブジェクト作成する権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InvalidObjectParams">無効なオブジェクトパラメーター
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantChangeShape">あなたにはこのシェイプを変更する権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermsTooManyAttachedAnimatedObjects">この操作を行うと、装着されたアニメーションオブジェクトが限度数を超えます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermsLinkAnimatedObjectTooLarge">結果として、アニメーションオブジェクトがリグ入り三角形の限度数を超えるため、これらのオブジェクトを結合できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPermsSetFlagAnimatedObjectTooLarge">リグ入り三角形の限度数を超えるため、このオブジェクトをアニメーションオブジェクトにすることはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantChangeAnimatedObjectStateInsufficientLand">このオブジェクトをアニメーションオブジェクトの状態に変えると、区画の限度数を超えるため変更できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ErrorNoMeshData">サーバーエラー：メッシュデータが読み込まれていないため、この操作を完了できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoAccessToClaimObjects">現在のアクセス権限では、ここにオブジェクトを取得できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoPrivsToBuyObject">現在のアクセス権限では、ここでオブジェクトを購入できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">アバターがオブジェクトに存在するため、オブジェクトを着用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">木や草を装着物として着用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">グループが所有しているオブジェクトは着用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">所有していないオブジェクトは着用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantAttachNavmeshObjects">ナビメッシュに貢献しているオブジェクトは着用できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">オブジェクトの着用に使用できるスクリプトリソースが足りません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDropItemTrialUser">オブジェクトを下に置く事はできません。フリートライアル領域をお試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDropMeshAttachment">メッシュ装着物を下に置く事はできません。インベントリから切り離して、ワールドでRezしてください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">装着物を下に置く事に失敗しました。そこへ置ける権限がありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">装着物のドロップに失敗しました。利用できる土地リソースの数が足りません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">利用できるリソースが足りないため、装着物のドロップに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDropObjectFullParcel">ここにオブジェクトをドロップできません。区画が埋まっています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">この土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PlzNarrowDeleteParams">削除パラメーターを絞ってください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UnableToUploadAsset">アセットをアップロードできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">ホームをテレポートするユーザーが見つかりませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="GodlikeRequestFailed">過剰なリクエストで失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="GenericRequestFailed">一般的なリクエストに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantUploadPostcard">ポストカードをアップロードできません。後でもう一度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">グループ通知のインベントリの詳細を取得できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">グループ通知の送信が許可されないため、送信できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">グループ通知を送信できません。インベントリを作成することもできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantParceInventoryInNotice">通知内のインベントリを検出できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TerrainUploadFailed">地形のアップロードに失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TerrainFileWritten">地形ファイルが書き込まれました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">地形ファイルを書き出し、ダウンロードを開始しています…
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TerrainBaked">地形がベークされました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">選択された最初の１０個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UpdateViewerBuyParcel">この区画を購入するには、ビューアーを更新する必要があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantBuyParcelNotForSale">購入することができません。この区画は販売対象ではありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">販売価格または土地の面積が変わったため、購入できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">あなたは、この区画の委任された購入者ではありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">すでに購入の認証を待機しているため、この区画を購入できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantBuildOverflowParcel">区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">選択範囲のリース区画の数が少ないため、参加できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">土地を分割できません。
 複数の区画が選択されました。
 小さい区画を選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDivideLandCantFindParcel">土地を分割できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">土地を分割できません。
 区画が見つかりません。
 「ヘルプ」→「バグの報告」で報告してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDivideLandWholeParcelSelected">土地を分割できません。区画全体が選択されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">土地を分割できません。区画全体が選択されています。
 小さい区画を選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandHasBeenDivided">土地が分割されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="PassPurchased">入場許可を購入しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RegionDisallowsClassifieds">このリージョン（地域）では、クラシファイド広告の掲載が許可されていません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LandPassExpireSoon">この土地への入場許可は、まもなく期限が切れます。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSitNoSuitableSurface">配置に適した表面がありません。別の場所を試してみたください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSitNoRoom">ここには座れる場所がありません。他の場所を試してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ClaimObjectFailedNoPermission">権限がないため、オブジェクトを取得できませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ClaimObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの取得に失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDeedGroupLand">グループ所有の土地は、譲渡できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="BuyObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの購入に失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="BuyInventoryFailedNoMoney">リンデンドルが不足しているため、インベントリを購入できませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="BuyPassFailedNoMoney">リンデンドルが足りないため、この土地への入場許可を購入できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantBuyPassTryAgain">今すぐには入場許可を購入できません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateObjectParcelFull">区画が埋まっているため、オブジェクトを作成することができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="FailedPlacingObject">指定した場所にオブジェクトを配置できませんでした。お手数ですが、もう一度やりなおしてください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateLandmarkForEvent">イベントのためのランドマークを作成することができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="GodBeatsFreeze">強力な力でフリーズを解除します。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SpecialPowersRequestFailedLogged">特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ExpireExplanation">システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="DieExplanation">システムは、あなたのリクエストを処理できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="AddPrimitiveFailure">プリミティブ広告を出すには、資金が足りません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="RezObjectFailure">資金が足りないため、オブジェクトを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ResetHomePositionNotLegal">ホームが不正なため、ホームの位置をリセットします。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantInviteRegionFull">リージョンが埋まっているため、現在の場所に誰かを招待することはできません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantSetHomeAtRegion">このリージョンでは、この位置にホームを設定できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="ListValidHomeLocations">ホームの場所を設定できるのは、自分の土地かメインランドの情報ハブのみです。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SetHomePosition">家の配置の設定。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDerezInventoryError">インベントリエラーのため、オブジェクトのRezの解除ができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateRequestedInv">リクエストされたインベントリを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateRequestedInvFolder">リクエストされたインベントリフォルダーを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateInventory">そのインベントリを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateLandmark">ランドマークを作成できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantCreateOutfit">アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InventoryNotForSale">インベントリは販売対象ではありません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantFindInvItem">インベントリアイテムを見つけることができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantFindObject">オブジェクトが見つかりません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantTransfterMoneyRegionDisabled">オブジェクトへの送金は、このリージョンでは現在無効にされています。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="DroppedMoneyTransferRequest">システムロードにより、支払いを実行できません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantPayNoAgent">支払いの相手を把握できませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CantDonateToPublicObjects">パブリックオブジェクトにリンデンドルを与えることはできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="InventoryCreationInWorldObjectFailed">インワールドオブジェクトでのインベントリ作成に失敗しました。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="UserBalanceOrLandUsageError">内部エラーが発生したため、ビューアーを正しく更新できませんでした。ビューアーに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="LargePrimAgentIntersect">他の住民と交差する大きなプリムを作成することはできません。他の住民が移動した場合は再度お試しください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="PreferenceChatClearLog">これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PreferenceChatDeleteTranscripts">これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandHasBeenDivided">土地が分割されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PassPurchased">入場許可を購入しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RegionDisallowsClassifieds">このリージョン（地域）では、クラシファイド広告の掲載が許可されていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LandPassExpireSoon">この土地への入場許可は、まもなく期限が切れます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSitNoSuitableSurface">配置に適した表面がありません。別の場所を試してみたください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSitNoRoom">ここには座れる場所がありません。他の場所を試してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">権限がないため、オブジェクトを取得できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの取得に失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDeedGroupLand">グループ所有の土地は、譲渡できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">リンデンドルが足りないため、オブジェクトの購入に失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">リンデンドルが不足しているため、インベントリを購入できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="BuyPassFailedNoMoney">リンデンドルが足りないため、この土地への入場許可を購入できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantBuyPassTryAgain">今すぐには入場許可を購入できません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateObjectParcelFull">区画が埋まっているため、オブジェクトを作成することができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FailedPlacingObject">指定した場所にオブジェクトを配置できませんでした。お手数ですが、もう一度やりなおしてください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">イベントのためのランドマークを作成することができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="GodBeatsFreeze">強力な力でフリーズを解除します。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ExpireExplanation">システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DieExplanation">システムは、あなたのリクエストを処理できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="AddPrimitiveFailure">プリミティブ広告を出すには、資金が足りません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="RezObjectFailure">資金が足りないため、オブジェクトを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ResetHomePositionNotLegal">ホームが不正なため、ホームの位置をリセットします。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantInviteRegionFull">リージョンが埋まっているため、現在の場所に誰かを招待することはできません。お手数ですが、しばらく経ってからもう一度やりなおしてください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantSetHomeAtRegion">このリージョンでは、この位置にホームを設定できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="ListValidHomeLocations">ホームの場所を設定できるのは、自分の土地かメインランドの情報ハブのみです。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SetHomePosition">家の配置の設定。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDerezInventoryError">インベントリエラーのため、オブジェクトのRezの解除ができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateRequestedInv">リクエストされたインベントリを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">リクエストされたインベントリフォルダーを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateInventory">そのインベントリを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateLandmark">ランドマークを作成できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantCreateOutfit">アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InventoryNotForSale">インベントリは販売対象ではありません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantFindInvItem">インベントリアイテムを見つけることができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantFindObject">オブジェクトが見つかりません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">オブジェクトへの送金は、このリージョンでは現在無効にされています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="DroppedMoneyTransferRequest">システムロードにより、支払いを実行できません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantPayNoAgent">支払いの相手を把握できませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CantDonateToPublicObjects">パブリックオブジェクトにリンデンドルを与えることはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">インワールドオブジェクトでのインベントリ作成に失敗しました。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">内部エラーが発生したため、ビューアーを正しく更新できませんでした。ビューアーに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="LargePrimAgentIntersect">他の住民と交差する大きなプリムを作成することはできません。他の住民が移動した場合は再度お試しください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="PreferenceChatClearLog">これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。
 .txtおよびtxt.backupの拡張子が付いたすべてのファイルが[FOLDER]フォルダから削除されます。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="PreferenceChatPathChanged">ファイルを移動できません。以前のパスがリストアされました。
-    <usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="DefaultObjectPermissions">デフォルトのオブジェクト権限を保存するときに問題が発生しました：[REASON]
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">ファイルを移動できません。以前のパスがリストアされました。
+    <usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="DefaultObjectPermissions">デフォルトのオブジェクト権限を保存するときに問題が発生しました：[REASON]
 後でデフォルトの権限を設定してください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="ChatHistoryIsBusyAlert">チャット履歴ファイルが前の操作でビジーです。２、３分経ってからもう一度試すか、別の人とのチャットを選択してください。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="OutfitPhotoLoadError">[REASON]
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ" />
-  </notification>
-
-  <notification name="FailedToFindSettings">データベースから「[NAME]」の設定の読み込みができませんでした。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="FailedToLoadSettingsApply">環境にこれらの設定を適用することができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="FailedToBuildSettingsDay">環境にこれらの設定を適用することができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="NoEnvironmentSettings">このリージョン（地域）は初期設定をサポートしていません。
-    <tag>fail</tag>
-  </notification>
-
-  <!-- messageには日本語が使えないため翻訳しない -->
-  <notification label="アウトフィットを保存する" name="SaveSettingAs">現在の設定を次の内容で保存する：
-    <unique />
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">[DESC] (New)</input>
-      <button name="ＯＫ" text="ＯＫ" />
-      <button name="Cancel" text="キャンセル" />
-    </form>
-  </notification>
-
-  <notification name="WLImportFail">[FILE]から過去のウインドライトの設定「[NAME]」をインポートできません。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="ChatHistoryIsBusyAlert">チャット履歴ファイルが前の操作でビジーです。２、３分経ってからもう一度試すか、別の人とのチャットを選択してください。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="OutfitPhotoLoadError">[REASON]
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="FailedToFindSettings">データベースから「[NAME]」の設定の読み込みができませんでした。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FailedToLoadSettingsApply">環境にこれらの設定を適用することができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="FailedToBuildSettingsDay">環境にこれらの設定を適用することができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="NoEnvironmentSettings">このリージョン（地域）は初期設定をサポートしていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="アウトフィットを保存する" name="SaveSettingAs">現在の設定を次の内容で保存する：
+    <unique/>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				[DESC] (New)
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="WLImportFail">[FILE]から過去のウインドライトの設定「[NAME]」をインポートできません。
 
 [REASONS]
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="WLParcelApplyFail">この区画で環境を設定することはできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="WLParcelApplyFail">この区画で環境を設定することはできません。
 変更する権限のある区画を入力または選択してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SettingsUnsuported">このリージョン（地域）では設定をサポートしていません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SettingsUnsuported">このリージョン（地域）では設定をサポートしていません。
 設定に対応しているリージョンに移動し、アクションを再試行してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="SettingsConfirmLoss">「[NAME]」と名付けられたこの[TYPE]に加えられた変更が失われます。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="SettingsConfirmLoss">「[NAME]」と名付けられたこの[TYPE]に加えられた変更が失われます。
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="変更を失いますがよろしいですか？" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="SettingsConfirmReset">適用されたすべての設定を削除しようとしています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="変更を失いますがよろしいですか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="SettingsConfirmReset">適用されたすべての設定を削除しようとしています。
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="PersonalSettingsConfirmReset">適用されたすべての個人的な照明の設定を削除しようとしています。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="PersonalSettingsConfirmReset">適用されたすべての個人的な照明の設定を削除しようとしています。
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="SettingsMakeNoTrans">このデイサイクルに移行不可の設定をインポートしようとしています。このまま続けると、編集中の設定も移行不可になります。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="SettingsMakeNoTrans">このデイサイクルに移行不可の設定をインポートしようとしています。このまま続けると、編集中の設定も移行不可になります。
 
 この変更は元に戻すことができません。
 
 続けてもよろしいですか？
-    <tag>confirm</tag>
-    <usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい" />
-  </notification>
-
-  <notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。自分のインベントリからコピーしてやり直してください。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="EnvironmentApplyFailed">この設定で問題が発生しました。この設定は現在保存または適用ができません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TrackLoadFailed">トラックを[TRACK]にロードできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="TrackLoadMismatch">トラックを[TRACK1]から[TRACK2]にロードできません。
-    <tag>fail</tag>
-  </notification>
-
-  <notification name="CompressionTestResults">サイズ[SIZE]㎅のファイル[FILE]をgzipのレベル６で圧縮したテスト結果：
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="NoEditFromLibrary">ライブラリから直接設定を変更することはできません。自分のインベントリからコピーしてやり直してください。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="EnvironmentApplyFailed">この設定で問題が発生しました。この設定は現在保存または適用ができません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TrackLoadFailed">トラックを[TRACK]にロードできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="TrackLoadMismatch">トラックを[TRACK1]から[TRACK2]にロードできません。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification name="CompressionTestResults">サイズ[SIZE]㎅のファイル[FILE]をgzipのレベル６で圧縮したテスト結果：
 圧縮：[PACK_TIME]秒　[PSIZE]㎅
 解凍：[UNPACK_TIME]秒　[USIZE]㎅
-    <tag>fail</tag>
-  </notification>
-
-  <notification label="二段階認証トークンプロンプト" name="PromptMFAToken">[MESSAGE]
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="token" />
-      <button name="continue" text="確認"/>
-      <button name="cancel" text="キャンセル"/>
-    </form>
-  </notification>
-
-  <notification label="サブフォルダの作成" name="CreateSubfolder">新しいフォルダーに名前を付けます：
-    <unique />
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message">[DESC]</input>
-      <button name="ＯＫ" text="ＯＫ"/>
-      <button name="Cancel" text="キャンセル"/>
-    </form>
-  </notification>
-
-  <notification name="SameFolderRequired">選択したアイテムは、同じフォルダー内に存在する必要があります。
-    <tag>fail</tag>
-    <usetemplate name="okbutton" yestext="ＯＫ"/>
-  </notification>
-
-  <notification name="RiggedMeshAttachedToHUD">ＨＵＤポイント「[POINT]」にアタッチされたオブジェクト「[NAME]」にはリグメッシュが含まれています。
+    <tag>
+			fail
+		</tag>
+	</notification>
+	<notification label="二段階認証トークンプロンプト" name="PromptMFAToken">[MESSAGE]
+    <tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="token"/>
+			<button name="continue" text="確認"/>
+			<button name="cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification label="サブフォルダの作成" name="CreateSubfolder">新しいフォルダーに名前を付けます：
+    <unique/>
+		<tag>
+			confirm
+		</tag>
+		<form name="form">
+			<input name="message">
+				[DESC]
+			</input>
+			<button name="ＯＫ" text="ＯＫ"/>
+			<button name="Cancel" text="キャンセル"/>
+		</form>
+	</notification>
+	<notification name="SameFolderRequired">選択したアイテムは、同じフォルダー内に存在する必要があります。
+    <tag>
+			fail
+		</tag>
+		<usetemplate name="okbutton" yestext="ＯＫ"/>
+	</notification>
+	<notification name="RiggedMeshAttachedToHUD">ＨＵＤポイント「[POINT]」にアタッチされたオブジェクト「[NAME]」にはリグメッシュが含まれています。
 
 リグメッシュオブジェクトは、アバターに取り付けるように設計されています。あなたにはこのオブジェクトが表示されますが、他の人には表示されません。
 
 他の人にこのオブジェクトを見てもらいたい場合は、オブジェクトを削除して、アバターのアタッチメントポイントに再度アタッチします。
-    <tag>confirm</tag>
-    <usetemplate ignoretext="リグメッシュがＨＵＤポイントにアタッチされている場合に警告します。" name="okignore" yestext="ＯＫ"/>
-  </notification>
-
-  <notification name="EnableAutoFPSWarning" type="alertmodal">自動ＦＰＳを有効にしようとしています。保存されていないグラフィック設定はすべて失われます。
+    <tag>
+			confirm
+		</tag>
+		<usetemplate ignoretext="リグメッシュがＨＵＤポイントにアタッチされている場合に警告します。" name="okignore" yestext="ＯＫ"/>
+	</notification>
+	<notification name="EnableAutoFPSWarning" type="alertmodal">自動ＦＰＳを有効にしようとしています。保存されていないグラフィック設定はすべて失われます。
 
 まずそれらを保存しますか？
-    <tag>confirm</tag>
-    <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-  </notification>
-</notifications>
\ No newline at end of file
+    <tag>
+			confirm
+		</tag>
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	</notification>
+</notifications>
diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
index 4587679b70..a89eca6d9a 100644
--- a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
-<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume-->
-<accordion_tab name="Mockup Tab" title="モックアップタブ" />
+<accordion_tab name="Mockup Tab" title="モックアップタブ"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
index 393ca8fb65..97a74a0a9d 100644
--- a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_activeim_row">
-  <chiclet_script name="object_chiclet" />
-  <chiclet_offer name="inv_offer_chiclet" />
-  <text name="object_name">無名のオブジェクト</text>
-  <button name="hide_btn" label="" />
-</panel>
\ No newline at end of file
+	<chiclet_script name="object_chiclet"/>
+	<chiclet_offer name="inv_offer_chiclet"/>
+	<text name="object_name">
+		無名のオブジェクト
+	</text>
+	<button name="hide_btn" label=""/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 84ceeb4be5..b920a0a8f7 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -1,30 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_list_item">
-  <!-- 
-    Strings used to localize last interaction time.
-    See last_interaction textbox below.
-    -->
-  <string name="FormatSeconds">[COUNT]秒</string>
-  <string name="FormatMinutes">[COUNT]分</string>
-  <string name="FormatHours">[COUNT]時間</string>
-  <string name="FormatDays">[COUNT]日</string>
-  <string name="FormatWeeks">[COUNT]週間</string>
-  <string name="FormatMonths">[COUNT]ヶ月</string>
-  <string name="FormatYears">[COUNT]年</string>
-  <!-- *NOTE: 
-    llavatarlistitem.cpp lays these controls out depending on which
-    ones are visible. Trying to change their order here will break it
-    ... which kinda sucks.
-  -->
-  <icon name="hovered_icon"/>
-  <icon name="selected_icon" />
-  <text name="avatar_name" value="（読み込んでいます）" />
-  <text name="last_interaction" value="０秒" />
-  <icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することができます。" />
-  <icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます。" />
-  <icon tool_tip="このフレンドはマップ上であなたの位置を表示できます。" name="permission_map_icon" />
-  <icon name="permission_online_icon" tool_tip="このフレンドは、あなたのオンライン状況を確認できます。" />
-  <button name="info_btn" tool_tip="詳細" />
-  <button name="profile_btn" tool_tip="プロフィールの閲覧" />
-  <output_monitor name="speaking_indicator" tool_tip="ボイスのボリューム" />
-</panel>
\ No newline at end of file
+	<string name="FormatSeconds">
+		[COUNT]秒
+	</string>
+	<string name="FormatMinutes">
+		[COUNT]分
+	</string>
+	<string name="FormatHours">
+		[COUNT]時間
+	</string>
+	<string name="FormatDays">
+		[COUNT]日
+	</string>
+	<string name="FormatWeeks">
+		[COUNT]週間
+	</string>
+	<string name="FormatMonths">
+		[COUNT]ヶ月
+	</string>
+	<string name="FormatYears">
+		[COUNT]年
+	</string>
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<text name="avatar_name" value="（読み込んでいます）"/>
+	<text name="last_interaction" value="０秒"/>
+	<icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することができます。"/>
+	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます。"/>
+	<icon tool_tip="このフレンドはマップ上であなたの位置を表示できます。" name="permission_map_icon"/>
+	<icon name="permission_online_icon" tool_tip="このフレンドは、あなたのオンライン状況を確認できます。"/>
+	<button name="info_btn" tool_tip="詳細"/>
+	<button name="profile_btn" tool_tip="プロフィールの閲覧"/>
+	<output_monitor name="speaking_indicator" tool_tip="ボイスのボリューム"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
index 0c6c7bdd4c..30f0068d3d 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_tag_notification">
-  <panel name="msg_caption">
-    <text name="sender_tag_name">Angela Tester</text>
-    <text name="tag_time" value="23：30" />
-  </panel>
-  <text_editor name="msg_text">いろはにほへと　ちりぬるを　わかよたれそ　つねならむ　うゐのおくやま　けふこえて　あさきゆめみし　ゑひもせす</text_editor>
-</panel>
\ No newline at end of file
+	<panel name="msg_caption">
+		<text name="sender_tag_name">
+			Angela Tester
+		</text>
+		<text name="tag_time" value="23：30"/>
+	</panel>
+	<text_editor name="msg_text">
+		いろはにほへと　ちりぬるを　わかよたれそ　つねならむ　うゐのおくやま　けふこえて　あさきゆめみし　ゑひもせす
+	</text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 97c392e807..e32a54cec5 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-  <panel label="bottom_panel" name="blocked_buttons_panel">
-    <filter_editor label="フィルタ" name="blocked_filter_input" />
-    <menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション" />
-    <menu_button name="view_btn" tool_tip="オプションを並べ替える" />
-    <menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択" />
-    <button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除" />
-  </panel>
-  <text name="block_limit">[COUNT]件のエントリーが、ブロックリストにあり、制限は[LIMIT]です。</text>
-  <block_list name="blocked" tool_tip="現在ブロックされている住人一覧" />
-</panel>
\ No newline at end of file
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="フィルタ" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
+		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
+		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
+		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	</panel>
+	<text name="block_limit">
+		[COUNT]件のエントリーが、ブロックリストにあり、制限は[LIMIT]です。
+	</text>
+	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
index 37108794d9..e4faad9384 100644
--- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <icon name="item_icon" />
-  <text name="item_name" value="…" />
-  <panel name="btn_lock" tool_tip="これを編集する権限がありません。">
-    <icon name="btn_lock1" />
-  </panel>
-  <panel name="btn_edit_panel">
-    <button name="btn_edit" tool_tip="このシェイプを編集" />
-  </panel>
-  <icon name="wearable_type_separator_icon" />
-</panel>
\ No newline at end of file
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<icon name="item_icon"/>
+	<text name="item_name" value="…"/>
+	<panel name="btn_lock" tool_tip="これを編集する権限がありません。">
+		<icon name="btn_lock1"/>
+	</panel>
+	<panel name="btn_edit_panel">
+		<button name="btn_edit" tool_tip="このシェイプを編集"/>
+	</panel>
+	<icon name="wearable_type_separator_icon"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
index 79c5d81af6..ace9dedad7 100644
--- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-  <button label="切り替え" name="switch_btn" />
-  <button name="bodyparts_shop_btn" />
-</panel>
\ No newline at end of file
+	<button label="切り替え" name="switch_btn"/>
+	<button name="bodyparts_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
index 153aebabc6..57876299fe 100644
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray_lite">
-  <layout_stack name="toolbar_stack_lite">
-    <layout_panel />
-    <layout_panel>
-      <panel name="nearby_chat" />
-    </layout_panel>
-    <layout_panel name="gesture_panel">
-      <gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示／非表示" />
-    </layout_panel>
-    <layout_panel name="after_gesture_panel" />
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<layout_stack name="toolbar_stack_lite">
+		<layout_panel/>
+		<layout_panel>
+			<panel name="nearby_chat"/>
+		</layout_panel>
+		<layout_panel name="gesture_panel">
+			<gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示／非表示"/>
+		</layout_panel>
+		<layout_panel name="after_gesture_panel"/>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml b/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
index d5c2ed01e3..5990c83943 100644
--- a/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="camera_preset_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <text name="preset_name" value="デフォルト" />
-  <button name="delete_btn" tool_tip="プリセットを削除"/>
-  <button name="reset_btn" tool_tip="デフォルトのプリセットにリセットします。" />
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<text name="preset_name" value="デフォルト"/>
+	<button name="delete_btn" tool_tip="プリセットを削除"/>
+	<button name="reset_btn" tool_tip="デフォルトのプリセットにリセットします。"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
index d80caaf8e1..98a4e60b9b 100644
--- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="im_header" name="im_header">
-  <avatar_icon name="avatar_icon" />
-  <text name="user_name" value="テスト文字列　無視してください" />
-  <text name="time_box" value="23：30" />
-</panel>
\ No newline at end of file
+	<avatar_icon name="avatar_icon"/>
+	<text name="user_name" value="テスト文字列　無視してください"/>
+	<text name="time_box" value="23：30"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
index 58387d54fc..6717ba9ba3 100644
--- a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chiclet_bar">
-  <layout_stack name="toolbar_stack">
-    <layout_panel name="im_well_panel">
-      <chiclet_im_well name="im_well">
-        <button name="Unread IM messages" tool_tip="会話" />
-      </chiclet_im_well>
-    </layout_panel>
-    <layout_panel name="notification_well_panel">
-      <chiclet_notification name="notification_well">
-        <button name="Unread" tool_tip="通知" />
-      </chiclet_notification>
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<layout_stack name="toolbar_stack">
+		<layout_panel name="im_well_panel">
+			<chiclet_im_well name="im_well">
+				<button name="Unread IM messages" tool_tip="会話"/>
+			</chiclet_im_well>
+		</layout_panel>
+		<layout_panel name="notification_well_panel">
+			<chiclet_notification name="notification_well">
+				<button name="Unread" tool_tip="通知"/>
+			</chiclet_notification>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
index 9851ca70b3..73d7830697 100644
--- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
@@ -1,53 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
-  <panel.string name="type_mature">Moderate</panel.string>
-  <panel.string name="type_pg">「General」コンテンツ</panel.string>
-  <panel.string name="l$_price">L$ [PRICE]</panel.string>
-  <panel.string name="click_through_text_fmt">[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</panel.string>
-  <panel.string name="date_fmt">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</panel.string>
-  <panel.string name="auto_renew_on">有効</panel.string>
-  <panel.string name="auto_renew_off">無効</panel.string>
-  <text name="title" value="クラシファイド広告情報" />
-  <scroll_container name="profile_scroll">
-    <panel name="scroll_content_panel">
-      <text_editor name="classified_name" value="[name]" />
-      <text name="classified_location_label" value="場所：" />
-      <text_editor name="classified_location" value="[loading...]" />
-      <text name="content_type_label" value="内容の種類：" />
-      <text_editor name="content_type" value="[content type]" />
-      <text name="category_label" value="カテゴリ：" />
-      <text_editor name="category" value="[category]" />
-      <text name="creation_date_label" value="制作日：" />
-      <text_editor name="creation_date" tool_tip="制作日" value="[date]" />
-      <text name="price_for_listing_label" value="掲載価格：" />
-      <text_editor name="price_for_listing" tool_tip="掲載価格" value="[price]" />
-      <layout_stack name="descr_stack">
-        <layout_panel name="clickthrough_layout_panel">
-          <text name="click_through_label" value="クリック数：" />
-          <text_editor name="click_through_text" tool_tip="クリックされた回数" value="[clicks]" />
-        </layout_panel>
-        <layout_panel name="price_layout_panel">
-          <text name="auto_renew_label" value="自動更新：" />
-          <text name="auto_renew" value="有効" />
-        </layout_panel>
-        <layout_panel name="descr_layout_panel">
-          <text name="classified_desc_label" value="説明：" />
-          <text_editor name="classified_desc" value="[description]" />
-        </layout_panel>
-      </layout_stack>
-    </panel>
-  </scroll_container>
-  <panel name="buttons">
-    <layout_stack name="layout_stack1">
-      <layout_panel name="layout_panel1">
-        <button label="テレポート" name="teleport_btn" />
-      </layout_panel>
-      <layout_panel name="show_on_map_btn_lp">
-        <button label="マップ" name="show_on_map_btn" />
-      </layout_panel>
-      <layout_panel name="edit_btn_lp">
-        <button label="編集" name="edit_btn" />
-      </layout_panel>
-    </layout_stack>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel.string name="type_mature">
+		Moderate
+	</panel.string>
+	<panel.string name="type_pg">
+		「General」コンテンツ
+	</panel.string>
+	<panel.string name="l$_price">
+		L$ [PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール
+	</panel.string>
+	<panel.string name="date_fmt">
+		[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日
+	</panel.string>
+	<panel.string name="auto_renew_on">
+		有効
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		無効
+	</panel.string>
+	<text name="title" value="クラシファイド広告情報"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text_editor name="classified_name" value="[name]"/>
+			<text name="classified_location_label" value="場所："/>
+			<text_editor name="classified_location" value="[loading...]"/>
+			<text name="content_type_label" value="内容の種類："/>
+			<text_editor name="content_type" value="[content type]"/>
+			<text name="category_label" value="カテゴリ："/>
+			<text_editor name="category" value="[category]"/>
+			<text name="creation_date_label" value="制作日："/>
+			<text_editor name="creation_date" tool_tip="制作日" value="[date]"/>
+			<text name="price_for_listing_label" value="掲載価格："/>
+			<text_editor name="price_for_listing" tool_tip="掲載価格" value="[price]"/>
+			<layout_stack name="descr_stack">
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="クリック数："/>
+					<text_editor name="click_through_text" tool_tip="クリックされた回数" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="price_layout_panel">
+					<text name="auto_renew_label" value="自動更新："/>
+					<text name="auto_renew" value="有効"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="説明："/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+		</panel>
+	</scroll_container>
+	<panel name="buttons">
+		<layout_stack name="layout_stack1">
+			<layout_panel name="layout_panel1">
+				<button label="テレポート" name="teleport_btn"/>
+			</layout_panel>
+			<layout_panel name="show_on_map_btn_lp">
+				<button label="マップ" name="show_on_map_btn"/>
+			</layout_panel>
+			<layout_panel name="edit_btn_lp">
+				<button label="編集" name="edit_btn"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
index c1102ad318..156f475fc6 100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-  <button label="追加＋" name="add_btn" />
-  <button name="clothing_shop_btn" />
-</panel>
\ No newline at end of file
+	<button label="追加＋" name="add_btn"/>
+	<button name="clothing_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
index 0fee393d95..8694637020 100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <button name="btn_delete" tool_tip="アウトフィットから削除" />
-  <icon name="item_icon" />
-  <text name="item_name" value="…" />
-  <button name="btn_move_up" />
-  <button name="btn_move_down" />
-  <panel name="btn_lock" tool_tip="これを編集する権限がありません">
-    <icon name="btn_lock1" />
-  </panel>
-  <panel name="btn_edit_panel">
-    <button name="btn_edit" tool_tip="この着用物を編集" />
-  </panel>
-  <icon name="wearable_type_separator_icon" />
-</panel>
\ No newline at end of file
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<button name="btn_delete" tool_tip="アウトフィットから削除"/>
+	<icon name="item_icon"/>
+	<text name="item_name" value="…"/>
+	<button name="btn_move_up"/>
+	<button name="btn_move_down"/>
+	<panel name="btn_lock" tool_tip="これを編集する権限がありません">
+		<icon name="btn_lock1"/>
+	</panel>
+	<panel name="btn_edit_panel">
+		<button name="btn_edit" tool_tip="この着用物を編集"/>
+	</panel>
+	<icon name="wearable_type_separator_icon"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
index d483d781e0..dfa9ed058a 100644
--- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="cof_wearables">
-  <accordion name="cof_wearables_accordion">
-    <accordion_tab name="tab_clothing" title="服装" />
-    <!-- The Attachments title is overwritten by the definition of "Attachments remain" in strings.xml -->
-    <accordion_tab name="tab_attachments" title="装着物" />
-    <accordion_tab name="tab_body_parts" title="身体部位" />
-  </accordion>
-</panel>
\ No newline at end of file
+	<accordion name="cof_wearables_accordion">
+		<accordion_tab name="tab_clothing" title="服装"/>
+		<accordion_tab name="tab_attachments" title="装着物"/>
+		<accordion_tab name="tab_body_parts" title="身体部位"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
index f4c46f1b0c..89e7150aa2 100644
--- a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="conversation_list_item">
-  <icon name="nearby_chat_icon" />
-  <layout_stack name="conversation_item_stack">
-    <layout_panel name="call_icon_panel">
-      <icon name="selected_icon" />
-    </layout_panel>
-    <layout_panel name="conversation_title_panel">
-      <text name="conversation_title" value="（読み込み中）" />
-      <output_monitor name="speaking_indicator" />
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<icon name="nearby_chat_icon"/>
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="call_icon_panel">
+			<icon name="selected_icon"/>
+		</layout_panel>
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（読み込み中）"/>
+			<output_monitor name="speaking_indicator"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
index 1432509bcc..070040dc6d 100644
--- a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="conversation_log_list_item">
-  <icon name="selected_icon" />
-  <icon name="hovered_icon" />
-  <icon name="voice_session_icon" tool_tip="ボイスチャット" />
-  <icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ" />
-  <text name="conversation_name" />
-  <text name="date_time"/>
-  <button name="delete_btn" tool_tip="このエントリーを削除" />
-</panel>
\ No newline at end of file
+	<icon name="selected_icon"/>
+	<icon name="hovered_icon"/>
+	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
+	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
+	<text name="conversation_name"/>
+	<text name="date_time"/>
+	<button name="delete_btn" tool_tip="このエントリーを削除"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
index 9190d55cc6..7d98a130fc 100644
--- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="deletable_wearable_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <button name="btn_delete" tool_tip="アウトフィットから削除" />
-  <icon name="item_icon" />
-  <text name="item_name" value="…" />
-  <icon name="wearable_type_separator_icon" />
-</panel>
\ No newline at end of file
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<button name="btn_delete" tool_tip="アウトフィットから削除"/>
+	<icon name="item_icon"/>
+	<text name="item_name" value="…"/>
+	<icon name="wearable_type_separator_icon"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
index 7a80c51027..f38f1f5b5c 100644
--- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="dummy_clothing_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <icon name="item_icon" />
-  <text name="item_name" value="…" />
-  <panel name="btn_add_panel">
-    <button name="btn_add" tool_tip="この種類のアイテムを追加する。" />
-  </panel>
-  <icon name="wearable_type_separator_icon" />
-  <text name="item_name" />
-
-</panel>
\ No newline at end of file
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<icon name="item_icon"/>
+	<text name="item_name" value="…"/>
+	<panel name="btn_add_panel">
+		<button name="btn_add" tool_tip="この種類のアイテムを追加する。"/>
+	</panel>
+	<icon name="wearable_type_separator_icon"/>
+	<text name="item_name"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
index 97186070c3..57b32172ac 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_alpha_panel">
-  <scroll_container name="avatar_alpha_color_panel_scroll">
-    <panel name="avatar_alpha_color_panel">
-      <check_box name="lower alpha texture invisible" />
-      <texture_picker label="アルファ（下半身）" name="Lower Alpha" tool_tip="クリックで画像を選択できます。" />
-      <check_box name="upper alpha texture invisible" />
-      <texture_picker label="アルファ（上半身）" name="Upper Alpha" tool_tip="クリックで画像を選択できます。" />
-      <check_box name="head alpha texture invisible" />
-      <texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックで画像を選択できます。" />
-      <check_box name="eye alpha texture invisible" />
-      <texture_picker label="瞳のアルファ" name="Eye Alpha" tool_tip="クリックで画像を選択できます。" />
-      <check_box name="hair alpha texture invisible" />
-      <texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックで画像を選択できます。" />
-    </panel>
-  </scroll_container>
-</panel>
\ No newline at end of file
+	<scroll_container name="avatar_alpha_color_panel_scroll">
+		<panel name="avatar_alpha_color_panel">
+			<check_box name="lower alpha texture invisible"/>
+			<texture_picker label="アルファ（下半身）" name="Lower Alpha" tool_tip="クリックで画像を選択できます。"/>
+			<check_box name="upper alpha texture invisible"/>
+			<texture_picker label="アルファ（上半身）" name="Upper Alpha" tool_tip="クリックで画像を選択できます。"/>
+			<check_box name="head alpha texture invisible"/>
+			<texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックで画像を選択できます。"/>
+			<check_box name="eye alpha texture invisible"/>
+			<texture_picker label="瞳のアルファ" name="Eye Alpha" tool_tip="クリックで画像を選択できます。"/>
+			<check_box name="hair alpha texture invisible"/>
+			<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックで画像を選択できます。"/>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
index a4a289d783..773e9ed5c5 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_eyes_panel">
-  <panel name="avatar_eye_color_panel">
-    <texture_picker label="瞳" name="Iris" tool_tip="クリックして画像を選択します" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="eyes_main_tab" title="目" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_eye_color_panel">
+		<texture_picker label="瞳" name="Iris" tool_tip="クリックして画像を選択します"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="eyes_main_tab" title="目"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
index 6905c83daa..41e28d9095 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
-  <panel name="avatar_gloves_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="gloves_main_tab" title="手袋" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_gloves_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="gloves_main_tab" title="手袋"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
index 53c03ba94b..4254ea9ca5 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_hair_panel">
-  <panel name="avatar_hair_color_panel">
-    <texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして画像を選択" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="hair_color_tab" title="色" />
-      <accordion_tab name="hair_style_tab" title="スタイル" />
-      <accordion_tab name="hair_eyebrows_tab" title="眉毛" />
-      <accordion_tab name="hair_facial_tab" title="フェイシャル" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_hair_color_panel">
+		<texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして画像を選択"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="hair_color_tab" title="色"/>
+			<accordion_tab name="hair_style_tab" title="スタイル"/>
+			<accordion_tab name="hair_eyebrows_tab" title="眉毛"/>
+			<accordion_tab name="hair_facial_tab" title="フェイシャル"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
index 6b8a43676f..8ba5ae1cb6 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
-  <panel name="avatar_jacket_color_panel">
-    <!-- 字数制限のためUpperを上部と翻訳 -->
-    <texture_picker label="上部テクスチャ" name="Upper Fabric" tool_tip="クリックして画像を選択します。" />
-    <texture_picker label="下部テクスチャ" name="Lower Fabric" tool_tip="クリックして画像を選択します。" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます。" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="jacket_main_tab" title="ジャケット">
-        <scrolling_panel_list name="jacket_main_param_list" />
-      </accordion_tab>
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_jacket_color_panel">
+		<texture_picker label="上部テクスチャ" name="Upper Fabric" tool_tip="クリックして画像を選択します。"/>
+		<texture_picker label="下部テクスチャ" name="Lower Fabric" tool_tip="クリックして画像を選択します。"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます。"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="jacket_main_tab" title="ジャケット">
+				<scrolling_panel_list name="jacket_main_param_list"/>
+			</accordion_tab>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
index be136e882e..cdefed7865 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
-  <panel name="avatar_pants_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="pants_main_tab" title="ズボン">
-        <scrolling_panel_list name="pants_main_param_list" />
-      </accordion_tab>
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_pants_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="pants_main_tab" title="ズボン">
+				<scrolling_panel_list name="pants_main_param_list"/>
+			</accordion_tab>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
index c929b4001a..54ad79568f 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_physics_panel">
-  <panel label="" name="accordion_panel">
-    <accordion name="physics_accordion">
-      <accordion_tab name="physics_breasts_updown_tab" title="胸の弾み">
-        <scrolling_panel_list name="physics_breasts_updown_param_list" />
-      </accordion_tab>
-      <accordion_tab name="physics_breasts_inout_tab" title="胸の谷間">
-        <scrolling_panel_list name="physics_breasts_inout_param_list" />
-      </accordion_tab>
-      <accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ">
-        <scrolling_panel_list name="physics_breasts_leftright_param_list" />
-      </accordion_tab>
-      <accordion_tab name="physics_belly_tab" title="お腹の弾み">
-        <scrolling_panel_list name="physics_belly_updown_param_list" />
-      </accordion_tab>
-      <accordion_tab name="physics_butt_tab" title="お尻の弾み">
-        <scrolling_panel_list name="physics_butt_updown_param_list" />
-      </accordion_tab>
-      <accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ">
-        <scrolling_panel_list name="physics_butt_leftright_param_list" />
-      </accordion_tab>
-      <accordion_tab name="physics_advanced_tab" title="高度なパラメーター">
-        <scrolling_panel_list name="physics_advanced_param_list" />
-      </accordion_tab>
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel label="" name="accordion_panel">
+		<accordion name="physics_accordion">
+			<accordion_tab name="physics_breasts_updown_tab" title="胸の弾み">
+				<scrolling_panel_list name="physics_breasts_updown_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="physics_breasts_inout_tab" title="胸の谷間">
+				<scrolling_panel_list name="physics_breasts_inout_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ">
+				<scrolling_panel_list name="physics_breasts_leftright_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="physics_belly_tab" title="お腹の弾み">
+				<scrolling_panel_list name="physics_belly_updown_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="physics_butt_tab" title="お尻の弾み">
+				<scrolling_panel_list name="physics_butt_updown_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ">
+				<scrolling_panel_list name="physics_butt_leftright_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="physics_advanced_tab" title="高度なパラメーター">
+				<scrolling_panel_list name="physics_advanced_param_list"/>
+			</accordion_tab>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
index fe4d8c912b..a711cd78c6 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
@@ -1,38 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
-  <string name="meters">メートル</string>
-  <string name="feet">フィート</string>
-  <string name="height">高さ：</string>
-  <text name="avatar_height" />
-  <panel label="シャツ" name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="shape_body_tab" title="身体">
-        <scrolling_panel_list name="shape_body_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_head_tab" title="頭">
-        <scrolling_panel_list name="shape_head_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_eyes_tab" title="目">
-        <scrolling_panel_list name="shape_eyes_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_ears_tab" title="耳">
-        <scrolling_panel_list name="shape_ears_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_nose_tab" title="鼻">
-        <scrolling_panel_list name="shape_nose_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_mouth_tab" title="口">
-        <scrolling_panel_list name="shape_mouth_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_chin_tab" title="あご">
-        <scrolling_panel_list name="shape_chin_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_torso_tab" title="上半身">
-        <scrolling_panel_list name="shape_torso_param_list" />
-      </accordion_tab>
-      <accordion_tab name="shape_legs_tab" title="脚">
-        <scrolling_panel_list name="shape_legs_param_list" />
-      </accordion_tab>
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<string name="meters">
+		メートル
+	</string>
+	<string name="feet">
+		フィート
+	</string>
+	<string name="height">
+		高さ：
+	</string>
+	<text name="avatar_height"/>
+	<panel label="シャツ" name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="shape_body_tab" title="身体">
+				<scrolling_panel_list name="shape_body_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_head_tab" title="頭">
+				<scrolling_panel_list name="shape_head_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_eyes_tab" title="目">
+				<scrolling_panel_list name="shape_eyes_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_ears_tab" title="耳">
+				<scrolling_panel_list name="shape_ears_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_nose_tab" title="鼻">
+				<scrolling_panel_list name="shape_nose_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_mouth_tab" title="口">
+				<scrolling_panel_list name="shape_mouth_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_chin_tab" title="あご">
+				<scrolling_panel_list name="shape_chin_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_torso_tab" title="上半身">
+				<scrolling_panel_list name="shape_torso_param_list"/>
+			</accordion_tab>
+			<accordion_tab name="shape_legs_tab" title="脚">
+				<scrolling_panel_list name="shape_legs_param_list"/>
+			</accordion_tab>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
index 4d14f57947..b75def6a64 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
-  <panel name="avatar_shirt_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きで色を選択" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="shirt_main_tab" title="シャツ">
-        <scrolling_panel_list name="shirt_main_param_list" />
-      </accordion_tab>
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_shirt_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きで色を選択"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="shirt_main_tab" title="シャツ">
+				<scrolling_panel_list name="shirt_main_param_list"/>
+			</accordion_tab>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
index 1b214834db..bac634ba20 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
-  <panel name="avatar_shoes_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="shoes_main_tab" title="靴">
-        <scrolling_panel_list name="shoes_main_param_list" />
-      </accordion_tab>
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_shoes_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="shoes_main_tab" title="靴">
+				<scrolling_panel_list name="shoes_main_param_list"/>
+			</accordion_tab>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
index 61068850ab..db0cb1e97a 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skin_panel">
-  <panel name="avatar_skin_color_panel">
-    <texture_picker label="頭" name="Head" tool_tip="クリックして画像を選択します" />
-    <texture_picker label="上半身" name="Upper Body" tool_tip="クリックして画像を選択します" />
-    <texture_picker label="下半身" name="Lower Body" tool_tip="クリックして画像を選択します" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="skin_color_tab" title="肌の色" />
-      <accordion_tab name="skin_face_tab" title="顔の詳細" />
-      <accordion_tab name="skin_makeup_tab" title="メイクアップ" />
-      <accordion_tab name="skin_body_tab" title="身体の詳細" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_skin_color_panel">
+		<texture_picker label="頭" name="Head" tool_tip="クリックして画像を選択します"/>
+		<texture_picker label="上半身" name="Upper Body" tool_tip="クリックして画像を選択します"/>
+		<texture_picker label="下半身" name="Lower Body" tool_tip="クリックして画像を選択します"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="skin_color_tab" title="肌の色"/>
+			<accordion_tab name="skin_face_tab" title="顔の詳細"/>
+			<accordion_tab name="skin_makeup_tab" title="メイクアップ"/>
+			<accordion_tab name="skin_body_tab" title="身体の詳細"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
index 12de7aa4a1..01658bf0fd 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
-  <panel name="avatar_skirt_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="skirt_main_tab" title="スカート" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_skirt_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="skirt_main_tab" title="スカート"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
index 80540e52bc..bfb04cbe49 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
-  <panel name="avatar_socks_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="socks_main_tab" title="靴下" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_socks_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="socks_main_tab" title="靴下"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
index b5962e1843..f5e3dd348d 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
-  <scroll_container name="avatar_tattoo_scroll">
-    <panel name="avatar_tattoo_color_panel">
-      <texture_picker label="頭部のタトゥ" name="Head Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="上半身のタトゥ" name="Upper Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="下半身のタトゥ" name="Lower Tattoo" tool_tip="クリックして画像を選択する" />
-      <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-    </panel>
-  </scroll_container>
-</panel>
\ No newline at end of file
+	<scroll_container name="avatar_tattoo_scroll">
+		<panel name="avatar_tattoo_color_panel">
+			<texture_picker label="頭部のタトゥ" name="Head Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="上半身のタトゥ" name="Upper Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="下半身のタトゥ" name="Lower Tattoo" tool_tip="クリックして画像を選択する"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
index 2d8aaf9fb4..a269fec582 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
-  <panel name="avatar_underpants_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="underpants_main_tab" title="下着（下半身）" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_underpants_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="underpants_main_tab" title="下着（下半身）"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
index 834f7f18e0..e11bc45541 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
-  <panel name="avatar_undershirt_color_panel">
-    <texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します" />
-    <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-  </panel>
-  <panel name="accordion_panel">
-    <accordion name="wearable_accordion">
-      <accordion_tab name="undershirt_main_tab" title="下着（上半身）" />
-    </accordion>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="avatar_undershirt_color_panel">
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして画像を選択します"/>
+		<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<panel name="accordion_panel">
+		<accordion name="wearable_accordion">
+			<accordion_tab name="undershirt_main_tab" title="下着（上半身）"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
index 530e4d1406..fd5fe80848 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_universal_panel">
-  <scroll_container name="avatar_universal_scroll">
-    <panel name="avatar_universal_color_panel">
-      <texture_picker label="頭部のタトゥ" name="Head Universal Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="上部のタトゥ" name="Upper Universal Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="下部のタトゥ" name="Lower Universal Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="スカートのタトゥ" name="Skirt Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="髪の毛のタトゥ" name="Hair Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="目のタトゥ" name="Eyes Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="左腕のタトゥ" name="Left Arm Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="左脚のタトゥ" name="Left Leg Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="予備１のタトゥ" name="Aux1 Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="予備２のタトゥ" name="Aux2 Tattoo" tool_tip="クリックして画像を選択する" />
-      <texture_picker label="予備３のタトゥ" name="Aux3 Tattoo" tool_tip="クリックして画像を選択する" />
-      <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
-    </panel>
-  </scroll_container>
-</panel>
\ No newline at end of file
+	<scroll_container name="avatar_universal_scroll">
+		<panel name="avatar_universal_color_panel">
+			<texture_picker label="頭部のタトゥ" name="Head Universal Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="上部のタトゥ" name="Upper Universal Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="下部のタトゥ" name="Lower Universal Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="スカートのタトゥ" name="Skirt Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="髪の毛のタトゥ" name="Hair Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="目のタトゥ" name="Eyes Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="左腕のタトゥ" name="Left Arm Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="左脚のタトゥ" name="Left Leg Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="予備１のタトゥ" name="Aux1 Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="予備２のタトゥ" name="Aux2 Tattoo" tool_tip="クリックして画像を選択する"/>
+			<texture_picker label="予備３のタトゥ" name="Aux3 Tattoo" tool_tip="クリックして画像を選択する"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
index 0e29cc6987..2533c976da 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
@@ -1,58 +1,126 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="着用可能なもの" name="panel_edit_wearable">
-  <string name="edit_shape_title">シェイプを編集中</string>
-  <string name="edit_skin_title">スキンを編集中</string>
-  <string name="edit_hair_title">髪を編集中</string>
-  <string name="edit_eyes_title">目を編集中</string>
-  <string name="edit_shirt_title">シャツを編集中</string>
-  <string name="edit_pants_title">パンツを編集中</string>
-  <string name="edit_shoes_title">靴を編集中</string>
-  <string name="edit_socks_title">靴下を編集中</string>
-  <string name="edit_jacket_title">ジャケットを編集中</string>
-  <string name="edit_skirt_title">スカートを編集中</string>
-  <string name="edit_gloves_title">手袋を編集中</string>
-  <string name="edit_undershirt_title">下着（上半身）を編集中</string>
-  <string name="edit_underpants_title">下着（下半身）を編集中</string>
-  <string name="edit_alpha_title">アルファマスクを編集中</string>
-  <string name="edit_tattoo_title">タトゥを編集中</string>
-  <string name="edit_universal_title">全般を編集中</string>
-  <string name="edit_physics_title">物理作用の編集中</string>
-  <string name="shape_desc_text">シェイプ：</string>
-  <string name="skin_desc_text">スキン：</string>
-  <string name="hair_desc_text">髪：</string>
-  <string name="eyes_desc_text">目：</string>
-  <string name="shirt_desc_text">シャツ：</string>
-  <string name="pants_desc_text">ズボン：</string>
-  <string name="shoes_desc_text">靴：</string>
-  <string name="socks_desc_text">靴下：</string>
-  <string name="jacket_desc_text">ジャケット：</string>
-  <string name="skirt_desc_text">スカート：</string>
-  <string name="gloves_desc_text">手袋：</string>
-  <string name="undershirt_desc_text">下着（上半身）：</string>
-  <string name="underpants_desc_text">下着（下半身）：</string>
-  <string name="alpha_desc_text">アルファマスク：</string>
-  <string name="tattoo_desc_text">タトゥ：</string>
-  <string name="universal_desc_text">全般：</string>
-  <string name="physics_desc_text">物理作用：</string>
-  <labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る" />
-  <text name="edit_wearable_title" value="シェイプを編集中" />
-  <panel label="シャツ" name="wearable_type_panel">
-    <text name="description_text" value="シェイプ：" />
-    <radio_group name="sex_radio">
-      <radio_item label="" name="sex_male" tool_tip="男性" value="1" />
-      <radio_item label="" name="sex_female" tool_tip="女性" value="0" />
-    </radio_group>
-    <icon name="male_icon" tool_tip="男性" />
-    <icon name="female_icon" tool_tip="女性" />
-  </panel>
-  <panel name="button_panel">
-    <layout_stack name="button_panel_ls">
-      <layout_panel name="save_as_btn_lp">
-        <button label="名前をつけて保存" name="save_as_button" />
-      </layout_panel>
-      <layout_panel name="revert_btn_lp">
-        <button label="変更を元に戻す" name="revert_button" />
-      </layout_panel>
-    </layout_stack>
-  </panel>
-</panel>
\ No newline at end of file
+	<string name="edit_shape_title">
+		シェイプを編集中
+	</string>
+	<string name="edit_skin_title">
+		スキンを編集中
+	</string>
+	<string name="edit_hair_title">
+		髪を編集中
+	</string>
+	<string name="edit_eyes_title">
+		目を編集中
+	</string>
+	<string name="edit_shirt_title">
+		シャツを編集中
+	</string>
+	<string name="edit_pants_title">
+		パンツを編集中
+	</string>
+	<string name="edit_shoes_title">
+		靴を編集中
+	</string>
+	<string name="edit_socks_title">
+		靴下を編集中
+	</string>
+	<string name="edit_jacket_title">
+		ジャケットを編集中
+	</string>
+	<string name="edit_skirt_title">
+		スカートを編集中
+	</string>
+	<string name="edit_gloves_title">
+		手袋を編集中
+	</string>
+	<string name="edit_undershirt_title">
+		下着（上半身）を編集中
+	</string>
+	<string name="edit_underpants_title">
+		下着（下半身）を編集中
+	</string>
+	<string name="edit_alpha_title">
+		アルファマスクを編集中
+	</string>
+	<string name="edit_tattoo_title">
+		タトゥを編集中
+	</string>
+	<string name="edit_universal_title">
+		全般を編集中
+	</string>
+	<string name="edit_physics_title">
+		物理作用の編集中
+	</string>
+	<string name="shape_desc_text">
+		シェイプ：
+	</string>
+	<string name="skin_desc_text">
+		スキン：
+	</string>
+	<string name="hair_desc_text">
+		髪：
+	</string>
+	<string name="eyes_desc_text">
+		目：
+	</string>
+	<string name="shirt_desc_text">
+		シャツ：
+	</string>
+	<string name="pants_desc_text">
+		ズボン：
+	</string>
+	<string name="shoes_desc_text">
+		靴：
+	</string>
+	<string name="socks_desc_text">
+		靴下：
+	</string>
+	<string name="jacket_desc_text">
+		ジャケット：
+	</string>
+	<string name="skirt_desc_text">
+		スカート：
+	</string>
+	<string name="gloves_desc_text">
+		手袋：
+	</string>
+	<string name="undershirt_desc_text">
+		下着（上半身）：
+	</string>
+	<string name="underpants_desc_text">
+		下着（下半身）：
+	</string>
+	<string name="alpha_desc_text">
+		アルファマスク：
+	</string>
+	<string name="tattoo_desc_text">
+		タトゥ：
+	</string>
+	<string name="universal_desc_text">
+		全般：
+	</string>
+	<string name="physics_desc_text">
+		物理作用：
+	</string>
+	<labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る"/>
+	<text name="edit_wearable_title" value="シェイプを編集中"/>
+	<panel label="シャツ" name="wearable_type_panel">
+		<text name="description_text" value="シェイプ："/>
+		<radio_group name="sex_radio">
+			<radio_item label="" name="sex_male" tool_tip="男性" value="1"/>
+			<radio_item label="" name="sex_female" tool_tip="女性" value="0"/>
+		</radio_group>
+		<icon name="male_icon" tool_tip="男性"/>
+		<icon name="female_icon" tool_tip="女性"/>
+	</panel>
+	<panel name="button_panel">
+		<layout_stack name="button_panel_ls">
+			<layout_panel name="save_as_btn_lp">
+				<button label="名前をつけて保存" name="save_as_button"/>
+			</layout_panel>
+			<layout_panel name="revert_btn_lp">
+				<button label="変更を元に戻す" name="revert_button"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_info.xml b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
index 3e4ac72756..ee37bf971e 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_info.xml
@@ -1,59 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experience_info">
-  <text name="title" value="体験のプロフィール" />
-  <scroll_container name="xp_scroll">
-    <panel name="scrolling_panel">
-      <layout_stack name="ls1">
-        <layout_panel name="image_panel">
-          <texture_picker name="logo" />
-        </layout_panel>
-        <layout_panel name="title panel">
-          <text name="experience_title" value="カイルのスーパーヒーローRPG" />
-        </layout_panel>
-        <layout_panel name="description panel">
-          <expandable_text name="experience_description" />
-        </layout_panel>
-        <layout_panel name="location panel">
-          <text name="Location">場所：</text>
-          <text name="LocationTextText">どこか</text>
-          <button label="テレポート" name="teleport_btn" />
-          <button label="マップ" name="map_btn" />
-        </layout_panel>
-        <layout_panel name="marketplace panel">
-          <text name="Location">マーケットプレイスストア：</text>
-          <text name="LocationTextText">どこか</text>
-        </layout_panel>
-        <layout_panel name="details panel">
-          <text name="ContentRating">レーティング：</text>
-          <text name="ContentRatingText">Adult</text>
-          <text name="Owner">所有者：</text>
-          <text name="OwnerText">カイル</text>
-          <button label="編集" name="edit_btn" />
-
-
-          <!--
-          <expandable_text name="pick_name" value="これは体験です。" />
-
-          <text follows="left|top" height="16" layout="topleft" left="10" top_pad="10" value="Maturity
-          level:" width="130" />
-          <icon name="maturity_icon" />
-          <text name="maturity_value" value="不明" />
-          <panel name="location_panel">
-            <text follows="left|top|right" height="16" layout="topleft" left="00" top="0" value="場所：" width="280" />
-
-            <text follows="left|top|right" height="16" layout="topleft" left="0" top_pad="10" value="場所：" width="280" />
-          </panel>
-
-          <panel name="location_panel">
-            <text follows="left|top|right" height="16" layout="topleft" left="00" top="0" value="場所：" width="280" />
-
-            <text follows="left|top|right" height="16" layout="topleft" left="0" top_pad="10" value="場所：" width="280" />
-          </panel>
-          -->
-
-        </layout_panel>
-      </layout_stack>
-    </panel>
-  </scroll_container>
-
-</panel>
\ No newline at end of file
+	<text name="title" value="体験のプロフィール"/>
+	<scroll_container name="xp_scroll">
+		<panel name="scrolling_panel">
+			<layout_stack name="ls1">
+				<layout_panel name="image_panel">
+					<texture_picker name="logo"/>
+				</layout_panel>
+				<layout_panel name="title panel">
+					<text name="experience_title" value="カイルのスーパーヒーローRPG"/>
+				</layout_panel>
+				<layout_panel name="description panel">
+					<expandable_text name="experience_description"/>
+				</layout_panel>
+				<layout_panel name="location panel">
+					<text name="Location">
+						場所：
+					</text>
+					<text name="LocationTextText">
+						どこか
+					</text>
+					<button label="テレポート" name="teleport_btn"/>
+					<button label="マップ" name="map_btn"/>
+				</layout_panel>
+				<layout_panel name="marketplace panel">
+					<text name="Location">
+						マーケットプレイスストア：
+					</text>
+					<text name="LocationTextText">
+						どこか
+					</text>
+				</layout_panel>
+				<layout_panel name="details panel">
+					<text name="ContentRating">
+						レーティング：
+					</text>
+					<text name="ContentRatingText">
+						Adult
+					</text>
+					<text name="Owner">
+						所有者：
+					</text>
+					<text name="OwnerText">
+						カイル
+					</text>
+					<button label="編集" name="edit_btn"/>
+				</layout_panel>
+			</layout_stack>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
index abeefdf9a0..2419849800 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
@@ -1,15 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="experince_list_editor">
-  <panel.string name="loading">読み込んでいます…</panel.string>
-  <panel.string name="panel_allowed">許可された体験：</panel.string>
-  <panel.string name="panel_blocked">ブロックされた体験：</panel.string>
-  <panel.string name="panel_trusted">キー体験：</panel.string>
-  <panel.string name="no_results">（空）</panel.string>
-  <text name="text_name">体験リスト</text>
-  <scroll_list name="experience_list">
-    <columns label="名前" name="experience_name" />
-  </scroll_list>
-  <button label="追加…" name="btn_add" />
-  <button label="削除" name="btn_remove" />
-  <button label="プロフィール…" name="btn_profile" />
-</panel>
\ No newline at end of file
+	<panel.string name="loading">
+		読み込んでいます…
+	</panel.string>
+	<panel.string name="panel_allowed">
+		許可された体験：
+	</panel.string>
+	<panel.string name="panel_blocked">
+		ブロックされた体験：
+	</panel.string>
+	<panel.string name="panel_trusted">
+		キー体験：
+	</panel.string>
+	<panel.string name="no_results">
+		（空）
+	</panel.string>
+	<text name="text_name">
+		体験リスト
+	</text>
+	<scroll_list name="experience_list">
+		<columns label="名前" name="experience_name"/>
+	</scroll_list>
+	<button label="追加…" name="btn_add"/>
+	<button label="削除" name="btn_remove"/>
+	<button label="プロフィール…" name="btn_profile"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
index a3acb55cb4..922404dab4 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experience_list_item" label="体験一覧">
-  <text name="experience_name">ダミー名</text>
-</panel>
\ No newline at end of file
+	<text name="experience_name">
+		ダミー名
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
index 932563d6d2..541a1e34cf 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experience_log" label="イベント">
-  <string name="no_events" value="イベントはありません。" />
-  <string name="loading" value="読み込んでいます…。" />
-  <layout_stack name="ls1">
-    <layout_panel name="list panel">
-      <scroll_list name="experience_log_list">
-        <columns name="time" label="時間" />
-        <columns name="event" label="イベント" />
-        <columns name="experience_name" label="体験" />
-        <columns name="object_name" label="オブジェクト" />
-      </scroll_list>
-
-      <button name="btn_notify" label="通知" />
-
-      <button name="btn_profile_xp" label="プロフィール" />
-
-      <button name="btn_report_xp" label="報告" />
-    </layout_panel>
-    <layout_panel name="button_panel">
-      <check_box label="すべてのイベント日数を通知" name="notify_all" />
-
-      <spinner name="logsizespinner" />
-      <button name="btn_clear" label="クリア" />
-      <button name="btn_prev" label="⇦" />
-      <button name="btn_next" label="⇨" />
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<string name="no_events" value="イベントはありません。"/>
+	<string name="loading" value="読み込んでいます…。"/>
+	<layout_stack name="ls1">
+		<layout_panel name="list panel">
+			<scroll_list name="experience_log_list">
+				<columns name="time" label="時間"/>
+				<columns name="event" label="イベント"/>
+				<columns name="experience_name" label="体験"/>
+				<columns name="object_name" label="オブジェクト"/>
+			</scroll_list>
+			<button name="btn_notify" label="通知"/>
+			<button name="btn_profile_xp" label="プロフィール"/>
+			<button name="btn_report_xp" label="報告"/>
+		</layout_panel>
+		<layout_panel name="button_panel">
+			<check_box label="すべてのイベント日数を通知" name="notify_all"/>
+			<spinner name="logsizespinner"/>
+			<button name="btn_clear" label="クリア"/>
+			<button name="btn_prev" label="⇦"/>
+			<button name="btn_next" label="⇨"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_search.xml b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
index 5530168dc0..da8d09f1ae 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_search.xml
@@ -1,34 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experience_search" label="検索">
-  <string name="not_found">「[TEXT]」は見つかりませんでした。</string>
-  <string name="no_results">検索結果：なし</string>
-  <string name="searching">検索しています…。</string>
-  <string name="loading">読み込みんでいます…。</string>
-  <string name="maturity_icon_general">"Parcel_PG_Light"</string>
-  <string name="maturity_icon_moderate">"Parcel_M_Light"</string>
-  <string name="maturity_icon_adult">"Parcel_R_Light"</string>
-  <panel name="search_panel">
-    <text name="lbl name part">名前の一部を入力してください：</text>
-    <line_editor name="edit" />
-    <button label="進む" name="find" />
-    <text name="lbl max content rating">コンテンツの最大レーティング：</text>
-    <icons_combo_box label="Moderate" name="maturity">
-      <icons_combo_box.drop_down_button  />
-      <icons_combo_box.item label="Adult" name="Adult" value="42" />
-      <icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-      <icons_combo_box.item label="General" name="PG" value="13"/>
-    </icons_combo_box>
-    <scroll_list name="search_results">
-      <columns name="maturity" label="" />
-      <columns name="experience_name" label="名前" />
-      <columns name="owner" label="所有者" />
-    </scroll_list>
-
-    <button label="ＯＫ" label_selected="ＯＫ" name="ok_btn" />
-    <button label="キャンセル" name="cancel_btn" />
-    <button label="プロフィール表示" name="profile_btn" />
-    <button label="⇦" name="left_btn" />
-    <button label="⇨" name="right_btn" />
-
-  </panel>
-</panel>
\ No newline at end of file
+	<string name="not_found">
+		「[TEXT]」は見つかりませんでした。
+	</string>
+	<string name="no_results">
+		検索結果：なし
+	</string>
+	<string name="searching">
+		検索しています…。
+	</string>
+	<string name="loading">
+		読み込みんでいます…。
+	</string>
+	<string name="maturity_icon_general">
+		"Parcel_PG_Light"
+	</string>
+	<string name="maturity_icon_moderate">
+		"Parcel_M_Light"
+	</string>
+	<string name="maturity_icon_adult">
+		"Parcel_R_Light"
+	</string>
+	<panel name="search_panel">
+		<text name="lbl name part">
+			名前の一部を入力してください：
+		</text>
+		<line_editor name="edit"/>
+		<button label="進む" name="find"/>
+		<text name="lbl max content rating">
+			コンテンツの最大レーティング：
+		</text>
+		<icons_combo_box label="Moderate" name="maturity">
+			<icons_combo_box.drop_down_button/>
+			<icons_combo_box.item label="Adult" name="Adult" value="42"/>
+			<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
+			<icons_combo_box.item label="General" name="PG" value="13"/>
+		</icons_combo_box>
+		<scroll_list name="search_results">
+			<columns name="maturity" label=""/>
+			<columns name="experience_name" label="名前"/>
+			<columns name="owner" label="所有者"/>
+		</scroll_list>
+		<button label="ＯＫ" label_selected="ＯＫ" name="ok_btn"/>
+		<button label="キャンセル" name="cancel_btn"/>
+		<button label="プロフィール表示" name="profile_btn"/>
+		<button label="⇦" name="left_btn"/>
+		<button label="⇨" name="right_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_experiences.xml b/indra/newview/skins/default/xui/ja/panel_experiences.xml
index 9bbe43f40d..11bbf784b3 100644
--- a/indra/newview/skins/default/xui/ja/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experiences.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experiences" label="体験">
-  <string name="loading_experiences" value="体験を読み込んでいます…" />
-  <string name="no_experiences" value="体験はありません。" />
-  <string name="acquire" value="体験する" />
-  <layout_stack>
-    <layout_panel>
-      <flat_list_view name="experiences_list" />
-    </layout_panel>
-    <layout_panel name="button_panel">
-      <button name="btn_action" />
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<string name="loading_experiences" value="体験を読み込んでいます…"/>
+	<string name="no_experiences" value="体験はありません。"/>
+	<string name="acquire" value="体験する"/>
+	<layout_stack>
+		<layout_panel>
+			<flat_list_view name="experiences_list"/>
+		</layout_panel>
+		<layout_panel name="button_panel">
+			<button name="btn_action"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
index ea03979c92..962d69c67c 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
@@ -1,19 +1,41 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="住人をバン" name="bulk_ban_panel">
-  <panel.string name="loading">（読み込んでいます…）</panel.string>
-  <panel.string name="ban_selection_too_large">グループのバンが送信されていません：選択した住人が多すぎます。グループへの立入禁止の数は１リクエスト当たり１００人に制限されています。</panel.string>
-  <panel.string name="ban_not_permitted">グループのバンが送信されていません：「立入禁止リストの管理」の能力がありません。</panel.string>
-  <panel.string name="ban_limit_fail">グループのバンが送信されていません：グループへの立入禁止の登録許容数に達しました。</panel.string>
-  <panel.string name="partial_ban">グループのバンが送信されていません：[REASONS]</panel.string>
-  <panel.string name="ban_failed">グループのバンが送信されていません：[REASONS]</panel.string>
-  <panel.string name="residents_already_banned">・次の住民は既にバンされています：[RESIDENTS]</panel.string>
-  <panel.string name="ban_limit_reached">・バンの上限人数に達しました。次のエージェントは立入禁止にされません：[RESIDENTS]</panel.string>
-  <panel.string name="cant_ban_yourself">・グループから自分自身をバンにすることはできません。</panel.string>
-  <text name="help_text">グループから複数の住人を一括でバンすることができます。「リストから住人を選択」をクリックしてください。</text>
-  <button label="リストから住人を選択" name="add_button" />
-  <name_list name="banned_agent_list" tool_tip="Ctrlキーを押しながらクリックすることで複数の住人を選択できます。" />
-  <button label="選択した住人をリストから削除" name="remove_button" tool_tip="バンリストから、選択した住人を削除します。" />
-  <button label="住人をバン" name="ban_button" />
-  <button label="キャンセル" name="cancel_button" />
-  <string name="GroupBulkBan">グループから一括バン</string>
-</panel>
\ No newline at end of file
+	<panel.string name="loading">
+		（読み込んでいます…）
+	</panel.string>
+	<panel.string name="ban_selection_too_large">
+		グループのバンが送信されていません：選択した住人が多すぎます。グループへの立入禁止の数は１リクエスト当たり１００人に制限されています。
+	</panel.string>
+	<panel.string name="ban_not_permitted">
+		グループのバンが送信されていません：「立入禁止リストの管理」の能力がありません。
+	</panel.string>
+	<panel.string name="ban_limit_fail">
+		グループのバンが送信されていません：グループへの立入禁止の登録許容数に達しました。
+	</panel.string>
+	<panel.string name="partial_ban">
+		グループのバンが送信されていません：[REASONS]
+	</panel.string>
+	<panel.string name="ban_failed">
+		グループのバンが送信されていません：[REASONS]
+	</panel.string>
+	<panel.string name="residents_already_banned">
+		・次の住民は既にバンされています：[RESIDENTS]
+	</panel.string>
+	<panel.string name="ban_limit_reached">
+		・バンの上限人数に達しました。次のエージェントは立入禁止にされません：[RESIDENTS]
+	</panel.string>
+	<panel.string name="cant_ban_yourself">
+		・グループから自分自身をバンにすることはできません。
+	</panel.string>
+	<text name="help_text">
+		グループから複数の住人を一括でバンすることができます。「リストから住人を選択」をクリックしてください。
+	</text>
+	<button label="リストから住人を選択" name="add_button"/>
+	<name_list name="banned_agent_list" tool_tip="Ctrlキーを押しながらクリックすることで複数の住人を選択できます。"/>
+	<button label="選択した住人をリストから削除" name="remove_button" tool_tip="バンリストから、選択した住人を削除します。"/>
+	<button label="住人をバン" name="ban_button"/>
+	<button label="キャンセル" name="cancel_button"/>
+	<string name="GroupBulkBan">
+		グループから一括バン
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
index 51c016657d..42e3b0050e 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
@@ -1,51 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="グループ作成" name="GroupCreation">
-  <panel.string name="current_membership">（あなたのメンバーシップ）</panel.string>
-  <panel name="group_info_top">
-    <line_editor label="グループ名をここに入力してください。" name="group_name_editor" />
-  </panel>
-  <layout_stack name="layout">
-    <layout_panel name="group_info">
-      <panel name="group_info_top">
-        <texture_picker name="insignia" tool_tip="クリックして写真を選択" />
-        <text_editor name="charter">グループ憲章</text_editor>
-      </panel>
-      <panel name="preferences_container">
-        <check_box label="誰でも加入可能" name="open_enrollement" tool_tip="このグループが招待なしで、新しいメンバーに参加できるようにするかどうかを設定します。" />
-        <check_box label="入会費" name="check_enrollment_fee" tool_tip="グループへへの加入に入会費が必要かどうかを設定します。" />
-        <spinner name="spin_enrollment_fee" tool_tip="登録料がチェックされている場合、新しいメンバーはグループに参加するためにこの料金を支払う必要があります。" />
-        <combo_box name="group_mature_check" tool_tip="レーティングは、グループで許可されるコンテンツと行動のタイプを指定します。">
-          <combo_item name="select_mature" value="Select">－レーティングの選択－</combo_item>
-          <combo_box.item label="Moderateコンテンツ" name="mature" value="Mature" />
-          <combo_box.item label="Generalコンテンツ" name="pg" value="Not Mature" />
-        </combo_box>
-      </panel>
-    </layout_panel>
-    <layout_panel name="create_info">
-      <text name="fee_information">グループを作成するための料金は、メンバーシップレベルに基づいています。[https://secondlife.com/my/account/membership.php 詳細]</text>
-      <scroll_list name="membership_list">
-        <scroll_list.columns name="clmn_name" />
-        <scroll_list.columns name="clmn_price" />
-        <scroll_list.rows name="basic" value="基本（プレースホルダ）" />
-        <scroll_list.rows name="plc2" value="" />
-        <scroll_list.rows name="premium" value="プレミアム（プレースホルダ）" />
-      </scroll_list>
-    </layout_panel>
-    <layout_panel name="create_actions">
-
-      <layout_stack name="button_row_ls">
-        <layout_panel name="layout_crt">
-          <!-- placeholder to autoadjust buttons (since they are of different sizes)-->
+	<panel.string name="current_membership">
+		（あなたのメンバーシップ）
+	</panel.string>
+	<panel name="group_info_top">
+		<line_editor label="グループ名をここに入力してください。" name="group_name_editor"/>
+	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="group_info">
+			<panel name="group_info_top">
+				<texture_picker name="insignia" tool_tip="クリックして写真を選択"/>
+				<text_editor name="charter">
+					グループ憲章
+				</text_editor>
+			</panel>
+			<panel name="preferences_container">
+				<check_box label="誰でも加入可能" name="open_enrollement" tool_tip="このグループが招待なしで、新しいメンバーに参加できるようにするかどうかを設定します。"/>
+				<check_box label="入会費" name="check_enrollment_fee" tool_tip="グループへへの加入に入会費が必要かどうかを設定します。"/>
+				<spinner name="spin_enrollment_fee" tool_tip="登録料がチェックされている場合、新しいメンバーはグループに参加するためにこの料金を支払う必要があります。"/>
+				<combo_box name="group_mature_check" tool_tip="レーティングは、グループで許可されるコンテンツと行動のタイプを指定します。">
+					<combo_item name="select_mature" value="Select">
+						－レーティングの選択－
+					</combo_item>
+					<combo_box.item label="Moderateコンテンツ" name="mature" value="Mature"/>
+					<combo_box.item label="Generalコンテンツ" name="pg" value="Not Mature"/>
+				</combo_box>
+			</panel>
+		</layout_panel>
+		<layout_panel name="create_info">
+			<text name="fee_information">
+				グループを作成するための料金は、メンバーシップレベルに基づいています。[https://secondlife.com/my/account/membership.php 詳細]
+			</text>
+			<scroll_list name="membership_list">
+				<scroll_list.columns name="clmn_name"/>
+				<scroll_list.columns name="clmn_price"/>
+				<scroll_list.rows name="basic" value="基本（プレースホルダ）"/>
+				<scroll_list.rows name="plc2" value=""/>
+				<scroll_list.rows name="premium" value="プレミアム（プレースホルダ）"/>
+			</scroll_list>
+		</layout_panel>
+		<layout_panel name="create_actions">
+			<layout_stack name="button_row_ls">
+				<layout_panel name="layout_crt">
+          
         </layout_panel>
-        <layout_panel name="layout_crt">
-          <button label="グループ作成：L$[COST]" name="btn_create" tool_tip="新しいグループを作成" />
-          <button name="back" label="キャンセル" tool_tip="グループ一覧に戻ります。" />
+				<layout_panel name="layout_crt">
+					<button label="グループ作成：L$[COST]" name="btn_create" tool_tip="新しいグループを作成"/>
+					<button name="back" label="キャンセル" tool_tip="グループ一覧に戻ります。"/>
+				</layout_panel>
+				<layout_panel name="layout_crt">
+          
         </layout_panel>
-        <layout_panel name="layout_crt">
-          <!-- placeholder to autoadjust buttons-->
-        </layout_panel>
-      </layout_stack>
-      <text name="info_deletion">注：４８時間メンバーが２人未満のグループは、自動的に解散されます。</text>
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+			</layout_stack>
+			<text name="info_deletion">
+				注：４８時間メンバーが２人未満のグループは、自動的に解散されます。
+			</text>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index f2a11becf3..2d3d59ed85 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -1,38 +1,58 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_tab">
-  <panel.string name="help_text">「一般」タブには、メンバー一覧、設定、メンバーのオプションなど、このグループに関する一般的な情報が記されています。
+	<panel.string name="help_text">
+		「一般」タブには、メンバー一覧、設定、メンバーのオプションなど、このグループに関する一般的な情報が記されています。
 
-オプションにマウスカーソルを当てると詳しい説明が表示されます。</panel.string>
-  <panel.string name="group_info_unchanged">一般的なグループ情報が変更されました。</panel.string>
-  <panel.string name="incomplete_member_data_str">メンバーのデータを検索</panel.string>
-  <panel name="group_info_top">
-    <texture_picker label="" name="insignia" tool_tip="クリックして画像を選択します" />
-    <text name="prepend_founded_by">創設者：</text>
-    <name_box initial_value="（取得中）" name="founder_name" />
-    <text name="join_cost_text">無料</text>
-    <button label="参加します！" name="btn_join" />
-  </panel>
-  <text_editor name="charter">グループの理念、指針を記入してください。</text_editor>
-  <name_list name="visible_members">
-    <name_list.columns label="メンバー" name="name" />
-    <name_list.columns label="タイトル" name="title" />
-    <name_list.columns label="ログイン" name="status" />
-  </name_list>
-  <text name="my_group_settngs_label">自分の設定</text>
-  <text name="active_title_label">タイトル：</text>
-  <combo_box name="active_title" tool_tip="このグループをアクティブにしたときに、アバター名の上に表示されるタイトルを設定します。" />
-  <check_box label="グループ通知を受信" name="receive_notices" tool_tip="このグループからの通知を受信するかどうかの設定を行います。グループからスパムが送られてくる場合は、このボックスのチェックを外してください。" />
-  <check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="あなたのプロフィールにこのグループを表示するかどうかの設定を行います。" />
-  <panel name="preferences_container">
-    <text name="group_settngs_label">グループの設定</text>
-    <check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。" />
-    <check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。" />
-    <spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。" />
-    <combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです。">
-      <combo_item name="select_mature">─レーティング区分を指定─</combo_item>
-      <combo_box.item label="「Moderate」コンテンツ" name="mature" />
-      <combo_box.item label="「General」コンテンツ" name="pg" />
-    </combo_box>
-    <check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます。" />
-  </panel>
-</panel>
\ No newline at end of file
+オプションにマウスカーソルを当てると詳しい説明が表示されます。
+	</panel.string>
+	<panel.string name="group_info_unchanged">
+		一般的なグループ情報が変更されました。
+	</panel.string>
+	<panel.string name="incomplete_member_data_str">
+		メンバーのデータを検索
+	</panel.string>
+	<panel name="group_info_top">
+		<texture_picker label="" name="insignia" tool_tip="クリックして画像を選択します"/>
+		<text name="prepend_founded_by">
+			創設者：
+		</text>
+		<name_box initial_value="（取得中）" name="founder_name"/>
+		<text name="join_cost_text">
+			無料
+		</text>
+		<button label="参加します！" name="btn_join"/>
+	</panel>
+	<text_editor name="charter">
+		グループの理念、指針を記入してください。
+	</text_editor>
+	<name_list name="visible_members">
+		<name_list.columns label="メンバー" name="name"/>
+		<name_list.columns label="タイトル" name="title"/>
+		<name_list.columns label="ログイン" name="status"/>
+	</name_list>
+	<text name="my_group_settngs_label">
+		自分の設定
+	</text>
+	<text name="active_title_label">
+		タイトル：
+	</text>
+	<combo_box name="active_title" tool_tip="このグループをアクティブにしたときに、アバター名の上に表示されるタイトルを設定します。"/>
+	<check_box label="グループ通知を受信" name="receive_notices" tool_tip="このグループからの通知を受信するかどうかの設定を行います。グループからスパムが送られてくる場合は、このボックスのチェックを外してください。"/>
+	<check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="あなたのプロフィールにこのグループを表示するかどうかの設定を行います。"/>
+	<panel name="preferences_container">
+		<text name="group_settngs_label">
+			グループの設定
+		</text>
+		<check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。"/>
+		<check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。"/>
+		<spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。"/>
+		<combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです。">
+			<combo_item name="select_mature">
+				─レーティング区分を指定─
+			</combo_item>
+			<combo_box.item label="「Moderate」コンテンツ" name="mature"/>
+			<combo_box.item label="「General」コンテンツ" name="pg"/>
+		</combo_box>
+		<check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます。"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
index d405ba2ab5..70670d3cac 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
@@ -1,34 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="グループインベントリ" name="GroupInfo">
-  <panel.string name="default_needs_apply_text">保存していない変更があります。</panel.string>
-  <panel.string name="want_apply_text">変更を保存しますか？</panel.string>
-  <panel.string name="group_join_btn">入会費（L$ [AMOUNT]）</panel.string>
-  <panel.string name="group_join_free">無料</panel.string>
-  <panel name="group_info_top">
-    <text_editor name="group_name" value="（読み込んでいます…）" />
-    <line_editor label="新しいグループの名前を入力してください" name="group_name_editor" />
-  </panel>
-  <layout_stack name="layout">
-    <layout_panel name="group_accordions">
-      <accordion name="groups_accordion">
-        <accordion_tab name="group_general_tab" title="一般" />
-        <accordion_tab name="group_roles_tab" title="役割とメンバー" />
-        <accordion_tab name="group_notices_tab" title="通知" />
-        <accordion_tab name="group_land_tab" title="土地・資産" />
-        <accordion_tab name="group_experiences_tab" title="体験" />
-      </accordion>
-    </layout_panel>
-  </layout_stack>
-  <layout_stack name="button_row_ls">
-    <layout_panel name="btn_chat_lp">
-      <button label="チャット" name="btn_chat" />
-    </layout_panel>
-    <layout_panel name="call_btn_lp">
-      <button label="グループコール" name="btn_call" tool_tip="このグループにコールする" />
-    </layout_panel>
-    <layout_panel name="btn_apply_lp">
-      <button label="保存" label_selected="保存" name="btn_apply" />
-      <button label="グループを作成" name="btn_create" tool_tip="新しいグループを作成" />
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<panel.string name="default_needs_apply_text">
+		保存していない変更があります。
+	</panel.string>
+	<panel.string name="want_apply_text">
+		変更を保存しますか？
+	</panel.string>
+	<panel.string name="group_join_btn">
+		入会費（L$ [AMOUNT]）
+	</panel.string>
+	<panel.string name="group_join_free">
+		無料
+	</panel.string>
+	<panel name="group_info_top">
+		<text_editor name="group_name" value="（読み込んでいます…）"/>
+		<line_editor label="新しいグループの名前を入力してください" name="group_name_editor"/>
+	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="group_accordions">
+			<accordion name="groups_accordion">
+				<accordion_tab name="group_general_tab" title="一般"/>
+				<accordion_tab name="group_roles_tab" title="役割とメンバー"/>
+				<accordion_tab name="group_notices_tab" title="通知"/>
+				<accordion_tab name="group_land_tab" title="土地・資産"/>
+				<accordion_tab name="group_experiences_tab" title="体験"/>
+			</accordion>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="button_row_ls">
+		<layout_panel name="btn_chat_lp">
+			<button label="チャット" name="btn_chat"/>
+		</layout_panel>
+		<layout_panel name="call_btn_lp">
+			<button label="グループコール" name="btn_call" tool_tip="このグループにコールする"/>
+		</layout_panel>
+		<layout_panel name="btn_apply_lp">
+			<button label="保存" label_selected="保存" name="btn_apply"/>
+			<button label="グループを作成" name="btn_create" tool_tip="新しいグループを作成"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index 1cc01009e4..85f0cba760 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -1,17 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーを招待" name="invite_panel">
-  <panel.string name="confirm_invite_owner_str">本当に新しい所有者を招待しますか？この操作は取り消しできません。</panel.string>
-  <panel.string name="loading">（読み込んでいます…）</panel.string>
-  <panel.string name="already_in_group">選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。</panel.string>
-  <panel.string name="invite_selection_too_large">グループへの招待が送信されていません：選択された住人が多すぎます。
-グループへの招待は１回のリクエストあたり１００人に制限されています。</panel.string>
-  <text name="help_text">グループには一度に複数の住人を招待することができます。「リストから住人を選択」をクリックしてください。</text>
-  <button label="リストから住人を選択" name="add_button" tool_tip="" />
-  <name_list name="invitee_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます" />
-  <button label="リストから選択したものを削除" name="remove_button" tool_tip="招待リストから上で選択した住人を削除します" />
-  <text name="role_text">割り当て先の役割を選択：</text>
-  <combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください" />
-  <button label="招待状を送信" name="invite_button" />
-  <button label="キャンセル" name="cancel_button" />
-  <string name="GroupInvitation">グループへの招待</string>
-</panel>
\ No newline at end of file
+	<panel.string name="confirm_invite_owner_str">
+		本当に新しい所有者を招待しますか？この操作は取り消しできません。
+	</panel.string>
+	<panel.string name="loading">
+		（読み込んでいます…）
+	</panel.string>
+	<panel.string name="already_in_group">
+		選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。
+	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		グループへの招待が送信されていません：選択された住人が多すぎます。
+グループへの招待は１回のリクエストあたり１００人に制限されています。
+	</panel.string>
+	<text name="help_text">
+		グループには一度に複数の住人を招待することができます。「リストから住人を選択」をクリックしてください。
+	</text>
+	<button label="リストから住人を選択" name="add_button" tool_tip=""/>
+	<name_list name="invitee_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます"/>
+	<button label="リストから選択したものを削除" name="remove_button" tool_tip="招待リストから上で選択した住人を削除します"/>
+	<text name="role_text">
+		割り当て先の役割を選択：
+	</text>
+	<combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください"/>
+	<button label="招待状を送信" name="invite_button"/>
+	<button label="キャンセル" name="cancel_button"/>
+	<string name="GroupInvitation">
+		グループへの招待
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index f5ab70b68e..d4777081f8 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -1,48 +1,83 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="土地とL$" name="land_money_tab">
-  <panel.string name="help_text">「土地の総利用量」が「総貢献額」以下、または同じになるまで警告が表示されます。</panel.string>
-  <panel.string name="cant_view_group_land_text">グループ所有地を確認する権限がありません。</panel.string>
-  <panel.string name="epmty_view_group_land_text">なし</panel.string>
-  <panel.string name="cant_view_group_accounting_text">グループの会計情報を確認する権限がありません。</panel.string>
-  <panel.string name="loading_txt">読み込んでいます…</panel.string>
-  <panel.string name="land_contrib_error">土地の貢献を設定することができません。</panel.string>
-  <!--
-  <text name="group_land_heading">グループ所有の土地</text>
-  -->
-  <panel name="layout_panel_landmoney">
-    <scroll_list name="group_parcel_list">
-      <scroll_list.columns label="区画" name="name" />
-      <scroll_list.columns label="リージョン（地域）" name="location" />
-      <scroll_list.columns label="種別" name="type" />
-      <scroll_list.columns label="エリア" name="area" />
-      <scroll_list.columns label="非表示" name="hidden" />
-    </scroll_list>
-    <text name="total_contributed_land_label">総貢献額：</text>
-    <text name="total_contributed_land_value">[AREA]㎡</text>
-    <button label="マップ" name="map_button" />
-    <text name="total_land_in_use_label">土地の総利用量：</text>
-    <text name="land_available_label">利用可能な土地：</text>
-    <text name="land_available_value">[AREA]㎡</text>
-    <text name="your_contribution_label">あなたの貢献：</text>
-    <line_editor name="your_contribution_line_editor" />
-    <text name="your_contribution_units">㎡</text>
-    <text name="your_contribution_max_value">（最大[AMOUNT]）</text>
-    <text name="group_over_limit_text">使用中の土地をサポートするには、より多くの土地クレジットが必要です。</text>
-    <text name="group_money_heading">グループのL$</text>
-  </panel>
-  <tab_container name="group_money_tab_container">
-    <panel label="計画中" name="group_money_planning_tab">
-      <text_editor name="group_money_planning_text">読み込んでいます…</text_editor>
-    </panel>
-    <panel label="詳細情報" name="group_money_details_tab">
-      <text_editor name="group_money_details_text">読み込んでいます…</text_editor>
-      <button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週" />
-      <button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週" />
-    </panel>
-    <panel label="販売中" name="group_money_sales_tab">
-      <text_editor name="group_money_sales_text">読み込んでいます…</text_editor>
-      <button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週" />
-      <button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週" />
-    </panel>
-  </tab_container>
-</panel>
\ No newline at end of file
+	<panel.string name="help_text">
+		「土地の総利用量」が「総貢献額」以下、または同じになるまで警告が表示されます。
+	</panel.string>
+	<panel.string name="cant_view_group_land_text">
+		グループ所有地を確認する権限がありません。
+	</panel.string>
+	<panel.string name="epmty_view_group_land_text">
+		なし
+	</panel.string>
+	<panel.string name="cant_view_group_accounting_text">
+		グループの会計情報を確認する権限がありません。
+	</panel.string>
+	<panel.string name="loading_txt">
+		読み込んでいます…
+	</panel.string>
+	<panel.string name="land_contrib_error">
+		土地の貢献を設定することができません。
+	</panel.string>
+	<panel name="layout_panel_landmoney">
+		<scroll_list name="group_parcel_list">
+			<scroll_list.columns label="区画" name="name"/>
+			<scroll_list.columns label="リージョン（地域）" name="location"/>
+			<scroll_list.columns label="種別" name="type"/>
+			<scroll_list.columns label="エリア" name="area"/>
+			<scroll_list.columns label="非表示" name="hidden"/>
+		</scroll_list>
+		<text name="total_contributed_land_label">
+			総貢献額：
+		</text>
+		<text name="total_contributed_land_value">
+			[AREA]㎡
+		</text>
+		<button label="マップ" name="map_button"/>
+		<text name="total_land_in_use_label">
+			土地の総利用量：
+		</text>
+		<text name="land_available_label">
+			利用可能な土地：
+		</text>
+		<text name="land_available_value">
+			[AREA]㎡
+		</text>
+		<text name="your_contribution_label">
+			あなたの貢献：
+		</text>
+		<line_editor name="your_contribution_line_editor"/>
+		<text name="your_contribution_units">
+			㎡
+		</text>
+		<text name="your_contribution_max_value">
+			（最大[AMOUNT]）
+		</text>
+		<text name="group_over_limit_text">
+			使用中の土地をサポートするには、より多くの土地クレジットが必要です。
+		</text>
+		<text name="group_money_heading">
+			グループのL$
+		</text>
+	</panel>
+	<tab_container name="group_money_tab_container">
+		<panel label="計画中" name="group_money_planning_tab">
+			<text_editor name="group_money_planning_text">
+				読み込んでいます…
+			</text_editor>
+		</panel>
+		<panel label="詳細情報" name="group_money_details_tab">
+			<text_editor name="group_money_details_text">
+				読み込んでいます…
+			</text_editor>
+			<button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週"/>
+			<button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週"/>
+		</panel>
+		<panel label="販売中" name="group_money_sales_tab">
+			<text_editor name="group_money_sales_text">
+				読み込んでいます…
+			</text_editor>
+			<button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週"/>
+			<button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index e5eee591bf..c0da7a9dfc 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <group_icon name="group_icon" />
-  <text name="group_name" value="不明" />
-  <button name="info_btn" tool_tip="詳細詳細" />
-  <!--*TODO: Should only appear on rollover-->
-  <button name="profile_btn" tool_tip="プロフィールの表示" />
-
-</panel>
\ No newline at end of file
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<group_icon name="group_icon"/>
+	<text name="group_name" value="不明"/>
+	<button name="info_btn" tool_tip="詳細詳細"/>
+	<button name="profile_btn" tool_tip="プロフィールの表示"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
index 49f9c85545..cca8816f6e 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <group_icon name="group_icon" />
-  <text name="group_name" value="不明" />
-  <button name="visibility_hide_btn" tool_tip="プロフィールでグループを非表示にする" />
-  <button name="visibility_show_btn" tool_tip="プロフィールでグループを表示する" />
-  <button name="info_btn" tool_tip="詳細情報" />
-  <!--*TODO: Should only appear on rollover-->
-  <button name="profile_btn" tool_tip="プロフィールの表示" />
-</panel>
\ No newline at end of file
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<group_icon name="group_icon"/>
+	<text name="group_name" value="不明"/>
+	<button name="visibility_hide_btn" tool_tip="プロフィールでグループを非表示にする"/>
+	<button name="visibility_show_btn" tool_tip="プロフィールでグループを表示する"/>
+	<button name="info_btn" tool_tip="詳細情報"/>
+	<button name="profile_btn" tool_tip="プロフィールの表示"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index 0fbdc693f8..ebde7f9944 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
@@ -1,36 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="通知" name="notices_tab">
-  <panel.string name="help_text">通知でメッセージを送ることができ、アイテムを添付することができます。
+	<panel.string name="help_text">
+		通知でメッセージを送ることができ、アイテムを添付することができます。
 通知を受け取ることができる「役割」にあるメンバーだけに送信されます。
-「一般」タブで通知の受信をオフにすることができます。</panel.string>
-  <panel.string name="no_notices_text">過去の通知はありません</panel.string>
-  <text name="lbl2">通知は１４日間保存されます。
-１日の制限数は２００通です。</text>
-  <scroll_list name="notice_list">
-    <scroll_list.columns label="" name="icon" />
-    <scroll_list.columns label="件名" name="subject" />
-    <scroll_list.columns label="送信者" name="from" />
-    <scroll_list.columns label="日付" name="date" />
-  </scroll_list>
-  <text name="notice_list_none_found">見つかりませんでした</text>
-  <button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します" />
-  <button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します" />
-  <panel label="新しい通知を作成" name="panel_create_new_notice">
-    <text name="lbl">通知の作成</text>
-    <text name="lbl3">件名：</text>
-    <text name="lbl4">内容：</text>
-    <text name="lbl5">添付：</text>
-    <text name="string">ここにアイテムをドラッグ＆ドロップして添付してください：</text>
-    <button label="インベントリ" name="open_inventory" tool_tip="インベントリを開きます" />
-    <button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します" />
-    <button label="送信" label_selected="送信" name="send_notice" />
-    <group_drop_target name="drop_target" tool_tip="インベントリのアイテムをこのボックスにドラッグして、通知と一緒に送ります。添付するには、そのアイテムのコピーと再販・譲渡の権限があなたにある必要があります。" />
-  </panel>
-  <panel label="過去の通知を表示" name="panel_view_past_notice">
-    <text name="lbl">アーカイブ通知</text>
-    <text name="lbl2">新しい通知を送信するには、＋ボタンを押してください</text>
-    <text name="lbl3">件名：</text>
-    <text name="lbl4">内容：</text>
-    <button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment" />
-  </panel>
-</panel>
\ No newline at end of file
+「一般」タブで通知の受信をオフにすることができます。
+	</panel.string>
+	<panel.string name="no_notices_text">
+		過去の通知はありません
+	</panel.string>
+	<text name="lbl2">
+		通知は１４日間保存されます。
+１日の制限数は２００通です。
+	</text>
+	<scroll_list name="notice_list">
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="件名" name="subject"/>
+		<scroll_list.columns label="送信者" name="from"/>
+		<scroll_list.columns label="日付" name="date"/>
+	</scroll_list>
+	<text name="notice_list_none_found">
+		見つかりませんでした
+	</text>
+	<button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します"/>
+	<button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します"/>
+	<panel label="新しい通知を作成" name="panel_create_new_notice">
+		<text name="lbl">
+			通知の作成
+		</text>
+		<text name="lbl3">
+			件名：
+		</text>
+		<text name="lbl4">
+			内容：
+		</text>
+		<text name="lbl5">
+			添付：
+		</text>
+		<text name="string">
+			ここにアイテムをドラッグ＆ドロップして添付してください：
+		</text>
+		<button label="インベントリ" name="open_inventory" tool_tip="インベントリを開きます"/>
+		<button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します"/>
+		<button label="送信" label_selected="送信" name="send_notice"/>
+		<group_drop_target name="drop_target" tool_tip="インベントリのアイテムをこのボックスにドラッグして、通知と一緒に送ります。添付するには、そのアイテムのコピーと再販・譲渡の権限があなたにある必要があります。"/>
+	</panel>
+	<panel label="過去の通知を表示" name="panel_view_past_notice">
+		<text name="lbl">
+			アーカイブ通知
+		</text>
+		<text name="lbl2">
+			新しい通知を送信するには、＋ボタンを押してください
+		</text>
+		<text name="lbl3">
+			件名：
+		</text>
+		<text name="lbl4">
+			内容：
+		</text>
+		<button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
index a30a906bc7..2d8416f74c 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="インスタントメッセージ" name="panel_group_notify">
-  <string name="message_max_lines_count" value="7" />
-  <string name="subject_font" value="サンセリフ大" />
-  <string name="date_font" value="サンセリフ" />
-  <panel label="header" name="header">
-    <group_icon name="group_icon" />
-    <text name="title" value="送信者の名前／グループ名" />
-  </panel>
-  <text_editor name="message" value="メッセージ" />
-  <icon name="attachment_icon" />
-  <text name="attachment" value="添付アイテム" />
-  <button label="ＯＫ" name="btn_ok" />
-</panel>
\ No newline at end of file
+	<string name="message_max_lines_count" value="7"/>
+	<string name="subject_font" value="サンセリフ大"/>
+	<string name="date_font" value="サンセリフ"/>
+	<panel label="header" name="header">
+		<group_icon name="group_icon"/>
+		<text name="title" value="送信者の名前／グループ名"/>
+	</panel>
+	<text_editor name="message" value="メッセージ"/>
+	<icon name="attachment_icon"/>
+	<text name="attachment" value="添付アイテム"/>
+	<button label="ＯＫ" name="btn_ok"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index 2487264d87..bd16e3e986 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
@@ -1,110 +1,162 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーと役割" name="roles_tab">
-  <panel.string name="default_needs_apply_text">保存していない変更があります。</panel.string>
-  <panel.string name="want_apply_text">変更を保存しますか？</panel.string>
-  <tab_container name="roles_tab_container">
-    <panel label="メンバー" name="members_sub_tab" tool_tip="メンバー">
-      <panel.string name="help_text">ここからメンバーに役割を付与したり、削除することができます。
-Ctrlキーを押しながら、メンバー名をクリックすることで複数の人を選択できます。</panel.string>
-      <panel.string name="donation_area">[AREA]㎡</panel.string>
-      <filter_editor label="メンバーをフィルタ" name="filter_input" />
-      <name_list name="member_list">
-        <name_list.columns label="メンバー" name="name" />
-        <name_list.columns label="寄付" name="donated" />
-        <name_list.columns label="ステータス" name="online" />
-        <name_list.columns label="タイトル" name="title" />
-      </name_list>
-      <button label="招待" name="member_invite" />
-      <button label="追放" name="member_eject" />
-      <button label="メンバーの立入禁止" name="member_ban" />
-    </panel>
-    <panel label="役割" name="roles_sub_tab">
-      <!-- <button label="すべてを表示" name="show_all_button" />-->
-      <panel.string name="help_text">役割には、タイトルと許可された能力が割り当てられています。
+	<panel.string name="default_needs_apply_text">
+		保存していない変更があります。
+	</panel.string>
+	<panel.string name="want_apply_text">
+		変更を保存しますか？
+	</panel.string>
+	<tab_container name="roles_tab_container">
+		<panel label="メンバー" name="members_sub_tab" tool_tip="メンバー">
+			<panel.string name="help_text">
+				ここからメンバーに役割を付与したり、削除することができます。
+Ctrlキーを押しながら、メンバー名をクリックすることで複数の人を選択できます。
+			</panel.string>
+			<panel.string name="donation_area">
+				[AREA]㎡
+			</panel.string>
+			<filter_editor label="メンバーをフィルタ" name="filter_input"/>
+			<name_list name="member_list">
+				<name_list.columns label="メンバー" name="name"/>
+				<name_list.columns label="寄付" name="donated"/>
+				<name_list.columns label="ステータス" name="online"/>
+				<name_list.columns label="タイトル" name="title"/>
+			</name_list>
+			<button label="招待" name="member_invite"/>
+			<button label="追放" name="member_eject"/>
+			<button label="メンバーの立入禁止" name="member_ban"/>
+		</panel>
+		<panel label="役割" name="roles_sub_tab">
+			<panel.string name="help_text">
+				役割には、タイトルと許可された能力が割り当てられています。
 メンバーは１つ以上の役割を持つことができます。
-グループで使える役割は１０個までで、「全員（Everyone）」と「所有者（Owner）」がそれに含まれています。</panel.string>
-      <panel.string name="cant_delete_role">「全員（Everyone）」と「所有者（Owner）」の役割は削除することができません。</panel.string>
-      <panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
-      <panel.string name="power_all_have_icon">Checkbox_On</panel.string>
-      <panel.string name="power_partial_icon">Checkbox_Off</panel.string>
-      <filter_editor label="役割をフィルタ" name="filter_input" />
-      <scroll_list name="role_list">
-        <scroll_list.columns label="役割" name="name" />
-        <scroll_list.columns label="タイトル" name="title" />
-        <scroll_list.columns label="＃" name="members" />
-      </scroll_list>
-      <button label="新しい役割" name="role_create" />
-      <button label="役割をコピー" name="role_copy" />
-      <button label="役割を削除" name="role_delete" />
-    </panel>
-    <panel label="能力" name="actions_sub_tab" tool_tip="能力の説明と、その能力を実行できるロールとメンバーを表示できます。">
-      <panel.string name="help_text">能力は、ロール内のメンバーはこのグループ内で特定のことを行うことができます。
-多種多様な能力が指定可能です。</panel.string>
-      <panel.string name="power_folder_icon">Inv_FolderClosed</panel.string>
-      <panel.string name="power_all_have_icon">Checkbox_On</panel.string>
-      <panel.string name="power_partial_icon">Checkbox_Off</panel.string>
-      <filter_editor label="能力でフィルタ" name="filter_input" />
-      <scroll_list name="action_list" tool_tip="詳細を見るには、能力を選んでください。">
-        <scroll_list.columns label="" name="icon" />
-        <scroll_list.columns label="" name="checkbox" />
-        <scroll_list.columns label="" name="action" />
-      </scroll_list>
-    </panel>
-    <panel label="バンされた住民" name="banlist_sub_tab" tool_tip="このグループからバンされた住人を表示します。">
-      <panel.string name="help_text">バンリストに登録された住人は、グループに参加できません。</panel.string>
-      <panel.string name="ban_count_template">バンされた人数：[LIMIT]人中[COUNT]人</panel.string>
-      <name_list name="ban_list">
-        <name_list.columns label="住人" name="name" />
-        <name_list.columns label="バンした日付" name="ban_date" />
-      </name_list>
-      <button label="住人をバンする" name="ban_create" tool_tip="グループから住人をバンします。" />
-      <button label="バンの解除" name="ban_delete" tool_tip="選択した住人のバンを解除します。" />
-      <button label="リフレッシュ" name="ban_refresh" tool_tip="バンリストをリフレッシュします。" />
-      <text name="ban_count" width="100" />
-    </panel>
-  </tab_container>
-  <panel name="members_footer">
-    <text name="static">割当られた役割</text>
-    <scroll_list name="member_assigned_roles">
-      <scroll_list.columns label="" name="checkbox" />
-      <scroll_list.columns label="" name="role" />
-    </scroll_list>
-    <text name="static2">許可されたアクション</text>
-    <scroll_list name="member_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
-      <scroll_list.columns label="" name="icon" />
-      <scroll_list.columns label="" name="checkbox" />
-      <scroll_list.columns label="" name="action" />
-    </scroll_list>
-  </panel>
-  <panel name="members_header">
-    <text_editor name="member_action_description">
-      これは「このグループからメンバーを追放」する能力です。「所有者」のみが他の「所有者」を追放できます。</text_editor>
-  </panel>
-  <panel name="roles_footer">
-    <text name="static">役割名</text>
-    <line_editor name="role_name" />
-    <text name="static3">役割タイトル</text>
-    <line_editor name="role_title" />
-    <text name="static2">説明</text>
-    <text_editor name="role_description" />
-    <text name="static4">割当られたメンバー</text>
-    <check_box label="Reveal members" name="role_visible_in_list" tool_tip="グループ外の人が一般タブを見たときに、この役割のメンバーが表示されるかどうかを設定します。" />
-    <text name="static5" tool_tip="現在選択されている役割で実行できる能力のリスト">許可された能力</text>
-    <scroll_list name="role_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
-      <scroll_list.columns label="" name="icon" />
-      <scroll_list.columns label="" name="checkbox" />
-      <scroll_list.columns label="" name="action" />
-    </scroll_list>
-  </panel>
-  <panel name="roles_header">
-    <text_editor name="role_action_description">これは「このグループからメンバーを追放」する能力です。
-「所有者」のみが他の「所有者」を追放できます。</text_editor>
-  </panel>
-  <panel name="actions_footer">
-    <text_editor name="action_description">これは「グループからメンバーを追放する」能力です。
-「所有者」を追放できるのは、別の「所有者」だけです。</text_editor>
-    <text name="static2">この能力を持つ役割</text>
-    <text name="static3">この能力を持つメンバー</text>
-    <name_list name="action_members" />
-  </panel>
-</panel>
\ No newline at end of file
+グループで使える役割は１０個までで、「全員（Everyone）」と「所有者（Owner）」がそれに含まれています。
+			</panel.string>
+			<panel.string name="cant_delete_role">
+				「全員（Everyone）」と「所有者（Owner）」の役割は削除することができません。
+			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<panel.string name="power_all_have_icon">
+				Checkbox_On
+			</panel.string>
+			<panel.string name="power_partial_icon">
+				Checkbox_Off
+			</panel.string>
+			<filter_editor label="役割をフィルタ" name="filter_input"/>
+			<scroll_list name="role_list">
+				<scroll_list.columns label="役割" name="name"/>
+				<scroll_list.columns label="タイトル" name="title"/>
+				<scroll_list.columns label="＃" name="members"/>
+			</scroll_list>
+			<button label="新しい役割" name="role_create"/>
+			<button label="役割をコピー" name="role_copy"/>
+			<button label="役割を削除" name="role_delete"/>
+		</panel>
+		<panel label="能力" name="actions_sub_tab" tool_tip="能力の説明と、その能力を実行できるロールとメンバーを表示できます。">
+			<panel.string name="help_text">
+				能力は、ロール内のメンバーはこのグループ内で特定のことを行うことができます。
+多種多様な能力が指定可能です。
+			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<panel.string name="power_all_have_icon">
+				Checkbox_On
+			</panel.string>
+			<panel.string name="power_partial_icon">
+				Checkbox_Off
+			</panel.string>
+			<filter_editor label="能力でフィルタ" name="filter_input"/>
+			<scroll_list name="action_list" tool_tip="詳細を見るには、能力を選んでください。">
+				<scroll_list.columns label="" name="icon"/>
+				<scroll_list.columns label="" name="checkbox"/>
+				<scroll_list.columns label="" name="action"/>
+			</scroll_list>
+		</panel>
+		<panel label="バンされた住民" name="banlist_sub_tab" tool_tip="このグループからバンされた住人を表示します。">
+			<panel.string name="help_text">
+				バンリストに登録された住人は、グループに参加できません。
+			</panel.string>
+			<panel.string name="ban_count_template">
+				バンされた人数：[LIMIT]人中[COUNT]人
+			</panel.string>
+			<name_list name="ban_list">
+				<name_list.columns label="住人" name="name"/>
+				<name_list.columns label="バンした日付" name="ban_date"/>
+			</name_list>
+			<button label="住人をバンする" name="ban_create" tool_tip="グループから住人をバンします。"/>
+			<button label="バンの解除" name="ban_delete" tool_tip="選択した住人のバンを解除します。"/>
+			<button label="リフレッシュ" name="ban_refresh" tool_tip="バンリストをリフレッシュします。"/>
+			<text name="ban_count" width="100"/>
+		</panel>
+	</tab_container>
+	<panel name="members_footer">
+		<text name="static">
+			割当られた役割
+		</text>
+		<scroll_list name="member_assigned_roles">
+			<scroll_list.columns label="" name="checkbox"/>
+			<scroll_list.columns label="" name="role"/>
+		</scroll_list>
+		<text name="static2">
+			許可されたアクション
+		</text>
+		<scroll_list name="member_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
+			<scroll_list.columns label="" name="icon"/>
+			<scroll_list.columns label="" name="checkbox"/>
+			<scroll_list.columns label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="members_header">
+		<text_editor name="member_action_description">
+			これは「このグループからメンバーを追放」する能力です。「所有者」のみが他の「所有者」を追放できます。
+		</text_editor>
+	</panel>
+	<panel name="roles_footer">
+		<text name="static">
+			役割名
+		</text>
+		<line_editor name="role_name"/>
+		<text name="static3">
+			役割タイトル
+		</text>
+		<line_editor name="role_title"/>
+		<text name="static2">
+			説明
+		</text>
+		<text_editor name="role_description"/>
+		<text name="static4">
+			割当られたメンバー
+		</text>
+		<check_box label="Reveal members" name="role_visible_in_list" tool_tip="グループ外の人が一般タブを見たときに、この役割のメンバーが表示されるかどうかを設定します。"/>
+		<text name="static5" tool_tip="現在選択されている役割で実行できる能力のリスト">
+			許可された能力
+		</text>
+		<scroll_list name="role_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
+			<scroll_list.columns label="" name="icon"/>
+			<scroll_list.columns label="" name="checkbox"/>
+			<scroll_list.columns label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="roles_header">
+		<text_editor name="role_action_description">
+			これは「このグループからメンバーを追放」する能力です。
+「所有者」のみが他の「所有者」を追放できます。
+		</text_editor>
+	</panel>
+	<panel name="actions_footer">
+		<text_editor name="action_description">
+			これは「グループからメンバーを追放する」能力です。
+「所有者」を追放できるのは、別の「所有者」だけです。
+		</text_editor>
+		<text name="static2">
+			この能力を持つ役割
+		</text>
+		<text name="static3">
+			この能力を持つメンバー
+		</text>
+		<name_list name="action_members"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml b/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
index e815842746..45faf331d7 100644
--- a/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
+++ b/indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_hide_beacon">
-  <button label="ビーコンを隠す" name="hide_beacon_btn" tool_tip="トラッキングを停止してビーコンを隠す。" />
+	<button label="ビーコンを隠す" name="hide_beacon_btn" tool_tip="トラッキングを停止してビーコンを隠す。"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
index e99e71b975..c11266eae9 100644
--- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="im_panel" name="im_panel">
-  <string name="message_max_lines_count">6</string>
-  <panel label="IMのヘッダ" name="im_header">
-    <avatar_icon name="avatar_icon" />
-    <group_icon name="group_icon" />
-    <avatar_icon name="adhoc_icon" />
-    <text name="user_name" value="テスト文字列　無視してください" />
-    <!-- TIME STAMP -->
-    <text name="time_box" value="23：30" />
-  </panel>
-  <text name="message" />
-</panel>
\ No newline at end of file
+	<string name="message_max_lines_count">
+		6
+	</string>
+	<panel label="IMのヘッダ" name="im_header">
+		<avatar_icon name="avatar_icon"/>
+		<group_icon name="group_icon"/>
+		<avatar_icon name="adhoc_icon"/>
+		<text name="user_name" value="テスト文字列　無視してください"/>
+		<text name="time_box" value="23：30"/>
+	</panel>
+	<text name="message"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
index a22574c9fb..70b741b0f8 100644
--- a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="inventory_item">
-  <icon name="hovered_icon" />
-  <icon name="selected_icon" />
-  <icon name="item_icon" />
-  <text name="item_name" value="…" />
-</panel>
\ No newline at end of file
+	<icon name="hovered_icon"/>
+	<icon name="selected_icon"/>
+	<icon name="item_icon"/>
+	<text name="item_name" value="…"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index 7681a423d8..c95320e53a 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
@@ -1,51 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="landmark_info">
-  <string name="title_create_landmark" value="ランドマークを作成" />
-  <string name="title_edit_landmark" value="ランドマークを編集" />
-  <string name="title_landmark" value="ランドマーク" />
-  <string name="not_available" value="（該当なし）" />
-  <string name="unknown" value="（不明）" />
-  <string name="public" value="（公開）" />
-  <string name="server_update_text">場所の情報はサーバーがアップデートされるまでご利用いただけません。</string>
-  <string name="server_error_text">この位置の情報は現在ご利用いただけません。あとでもう一度お試しください。</string>
-  <string name="server_forbidden_text">この位置の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。</string>
-  <string name="acquired_date">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日（[wkday,datetime,local]）　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</string>
-  <string name="icon_PG" value="Parcel_PG_Dark" />
-  <string name="icon_M" value="Parcel_M_Dark" />
-  <string name="icon_R" value="Parcel_R_Dark" />
-  <button name="back_btn" tool_tip="戻る" />
-  <text name="title" value="場所のプロフィール" />
-  <scroll_container name="place_scroll">
-    <panel name="scrolling_panel">
-      <texture_picker name="logo" />
-      <!-- texture picker has an empty label section, compensate for it with negative top_pad-->
-      <text name="parcel_title" value="SampleParcel, Name Long" />
-      <text name="region_title">リージョン（地域）：[REGIONAMEPOS]</text>
-      <text name="parcel_owner_label" value="所有者：" />
-      <text name="parcel_owner" value="一時的な所有者" />
-      <expandable_text name="description" value="Du waltz die spritz" />
-      <icon name="maturity_icon" />
-      <text name="maturity_value" value="不明" />
-      <panel name="landmark_info_panel">
-        <view_border name="lod_tab_border" />
-        <text name="this_landmark">ランドマーク：</text>
-        <text name="owner_label" value="所有者：" />
-        <text name="owner" />
-        <text name="creator_label" value="作成者：" />
-        <text name="creator" />
-        <text name="created_label" value="作成日：" />
-        <text name="created" />
-      </panel>
-      <panel name="landmark_edit_panel">
-        <text value="タイトル：" />
-        <line_editor name="title_value" />
-        <button name="edit_btn" tool_tip="ランドマーク情報を編集" />
-        <line_editor name="title_editor"/>
-        <text name="notes_label" value="ノート：" />
-        <text_editor name="notes_editor" />
-        <text name="folder_label" value="ランドマークの場所：" />
-        <combo_box name="folder_combo" />
-      </panel>
-    </panel>
-  </scroll_container>
-</panel>
\ No newline at end of file
+	<string name="title_create_landmark" value="ランドマークを作成"/>
+	<string name="title_edit_landmark" value="ランドマークを編集"/>
+	<string name="title_landmark" value="ランドマーク"/>
+	<string name="not_available" value="（該当なし）"/>
+	<string name="unknown" value="（不明）"/>
+	<string name="public" value="（公開）"/>
+	<string name="server_update_text">
+		場所の情報はサーバーがアップデートされるまでご利用いただけません。
+	</string>
+	<string name="server_error_text">
+		この位置の情報は現在ご利用いただけません。あとでもう一度お試しください。
+	</string>
+	<string name="server_forbidden_text">
+		この位置の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。
+	</string>
+	<string name="acquired_date">
+		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日（[wkday,datetime,local]）　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+	</string>
+	<string name="icon_PG" value="Parcel_PG_Dark"/>
+	<string name="icon_M" value="Parcel_M_Dark"/>
+	<string name="icon_R" value="Parcel_R_Dark"/>
+	<button name="back_btn" tool_tip="戻る"/>
+	<text name="title" value="場所のプロフィール"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<texture_picker name="logo"/>
+			<text name="parcel_title" value="SampleParcel, Name Long"/>
+			<text name="region_title">
+				リージョン（地域）：[REGIONAMEPOS]
+			</text>
+			<text name="parcel_owner_label" value="所有者："/>
+			<text name="parcel_owner" value="一時的な所有者"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<icon name="maturity_icon"/>
+			<text name="maturity_value" value="不明"/>
+			<panel name="landmark_info_panel">
+				<view_border name="lod_tab_border"/>
+				<text name="this_landmark">
+					ランドマーク：
+				</text>
+				<text name="owner_label" value="所有者："/>
+				<text name="owner"/>
+				<text name="creator_label" value="作成者："/>
+				<text name="creator"/>
+				<text name="created_label" value="作成日："/>
+				<text name="created"/>
+			</panel>
+			<panel name="landmark_edit_panel">
+				<text value="タイトル："/>
+				<line_editor name="title_value"/>
+				<button name="edit_btn" tool_tip="ランドマーク情報を編集"/>
+				<line_editor name="title_editor"/>
+				<text name="notes_label" value="ノート："/>
+				<text_editor name="notes_editor"/>
+				<text name="folder_label" value="ランドマークの場所："/>
+				<combo_box name="folder_combo"/>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
index b33813f017..3e359e4e4c 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Landmarks">
-  <accordion name="landmarks_accordion">
-    <accordion_tab name="tab_favorites" title="お気に入りバー" />
-    <accordion_tab name="tab_landmarks" title="ランドマーク" />
-    <accordion_tab name="tab_inventory" title="インベントリ" />
-    <accordion_tab name="tab_library" title="ライブラリ" />
-  </accordion>
-  <panel name="bottom_panel">
-    <layout_stack name="bottom_panel">
-      <layout_panel name="options_gear_btn_panel">
-        <button name="options_gear_btn" tool_tip="オプションを表示します" />
-      </layout_panel>
-      <layout_panel name="add_btn_panel">
-        <button name="add_btn" tool_tip="新しいランドマークを追加" />
-      </layout_panel>
-      <layout_panel name="trash_btn_panel">
-        <dnd_button name="trash_btn" tool_tip="選択したランドマークを削除します" />
-      </layout_panel>
-    </layout_stack>
-  </panel>
-</panel>
\ No newline at end of file
+	<accordion name="landmarks_accordion">
+		<accordion_tab name="tab_favorites" title="お気に入りバー"/>
+		<accordion_tab name="tab_landmarks" title="ランドマーク"/>
+		<accordion_tab name="tab_inventory" title="インベントリ"/>
+		<accordion_tab name="tab_library" title="ライブラリ"/>
+	</accordion>
+	<panel name="bottom_panel">
+		<layout_stack name="bottom_panel">
+			<layout_panel name="options_gear_btn_panel">
+				<button name="options_gear_btn" tool_tip="オプションを表示します"/>
+			</layout_panel>
+			<layout_panel name="add_btn_panel">
+				<button name="add_btn" tool_tip="新しいランドマークを追加"/>
+			</layout_panel>
+			<layout_panel name="trash_btn_panel">
+				<dnd_button name="trash_btn" tool_tip="選択したランドマークを削除します"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index a1af2cbf85..ebb79dd835 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,28 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login" focus_root="true">
-  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
-  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
-  <layout_stack name="ui_stack">
-    <layout_panel name="ui_elastic_pad_left" />
-    <layout_panel name="ui_container">
-      <icon name="sl_logo_small" />
-      <combo_box label="Username" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
-        <combo_box.combo_editor />
-      </combo_box>
-      <line_editor name="password_edit" label="パスワード" />
-      <combo_box label="お気に入りの場所" name="start_location_combo">
-        <combo_box.combo_editor />
-        <combo_box.item label="最後にいた場所" name="MyLastLocation" value="last" />
-        <combo_box.item label="ホーム" name="MyHome" value="home" />
-      </combo_box>
-      <button label="ログイン" name="connect_btn" />
-      <text name="sign_up_text">サインアップ</text>
-      <check_box label="名前を記録" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。" />
-      <check_box label="パスワードを記録" name="remember_password" />
-      <combo_box label="Select grid" name="server_combo" />
-      <text name="forgot_password_text">パスワードに関するヘルプ</text>
-    </layout_panel>
-    <layout_panel name="ui_elastic_pad_right" />
-  </layout_stack>
-  <web_browser name="login_html" />
-</panel>
\ No newline at end of file
+	<panel.string name="forgot_password_url">
+		https://secondlife.com/my/account/request.php?lang=ja-JP
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/?lang=ja
+	</panel.string>
+	<layout_stack name="ui_stack">
+		<layout_panel name="ui_elastic_pad_left"/>
+		<layout_panel name="ui_container">
+			<icon name="sl_logo_small"/>
+			<combo_box label="Username" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
+				<combo_box.combo_editor/>
+			</combo_box>
+			<line_editor name="password_edit" label="パスワード"/>
+			<combo_box label="お気に入りの場所" name="start_location_combo">
+				<combo_box.combo_editor/>
+				<combo_box.item label="最後にいた場所" name="MyLastLocation" value="last"/>
+				<combo_box.item label="ホーム" name="MyHome" value="home"/>
+			</combo_box>
+			<button label="ログイン" name="connect_btn"/>
+			<text name="sign_up_text">
+				サインアップ
+			</text>
+			<check_box label="名前を記録" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。"/>
+			<check_box label="パスワードを記録" name="remember_password"/>
+			<combo_box label="Select grid" name="server_combo"/>
+			<text name="forgot_password_text">
+				パスワードに関するヘルプ
+			</text>
+		</layout_panel>
+		<layout_panel name="ui_elastic_pad_right"/>
+	</layout_stack>
+	<web_browser name="login_html"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_login_first.xml b/indra/newview/skins/default/xui/ja/panel_login_first.xml
index e878b2524a..0f987fc816 100644
--- a/indra/newview/skins/default/xui/ja/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login_first.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-  <panel.string name="forgot_password_url">https://secondlife.com/my/account/request.php?lang=ja-JP</panel.string>
-  <panel.string name="sign_up_url">https://join.secondlife.com/?lang=ja</panel.string>
-  <layout_stack name="logo_stack">
-    <layout_panel name="page_top" />
-    <!-- start of logo stack -->
-    <layout_panel name="parent_panel">
-      <layout_stack name="logo_stack">
-        <layout_panel name="logo_left" />
-        <layout_panel name="logo_container">
-          <icon name="sl_logo" />
-        </layout_panel>
-        <layout_panel auto_resize="true" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of logo stack -->
-    <!-- start of widget stack -->
-    <layout_panel name="parent_panel2">
-      <layout_stack name="widget_stack">
-        <layout_panel name="widget_left" />
-        <layout_panel name="widget_container">
-          <combo_box label="ユーザ名" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
-            <combo_box.combo_editor />
-            <combo_box.combo_button />
-            <combo_box.drop_down_button />
-          </combo_box>
-          <line_editor name="password_edit" label="パスワード" />
-          <button label="ログイン" name="connect_btn" />
-          <text name="sign_up_text" valign="center">サインアップ</text>
-          <check_box label="ユーザ名を記憶" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。" />
-          <check_box label="パスワード記憶" name="remember_password" />
-          <text name="forgot_password_text">
-            パスワードを忘れましたか？
-          </text>
-        </layout_panel>
-        <layout_panel name="widget_right" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of widget stack -->
-    <!-- start of images stack -->
-    <layout_panel name="parent_panel3">
-      <layout_stack name="images_stack">
-        <layout_panel name="images_left" />
-        <layout_panel name="images_container">
-          <icon name="image_left" />
-        </layout_panel>
-        <layout_panel name="images_right" />
-      </layout_stack>
-    </layout_panel>
-    <!-- end of images stack -->
-    <layout_panel name="page_bottom" />
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<panel.string name="forgot_password_url">
+		https://secondlife.com/my/account/request.php?lang=ja-JP
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/?lang=ja
+	</panel.string>
+	<layout_stack name="logo_stack">
+		<layout_panel name="page_top"/>
+		<layout_panel name="parent_panel">
+			<layout_stack name="logo_stack">
+				<layout_panel name="logo_left"/>
+				<layout_panel name="logo_container">
+					<icon name="sl_logo"/>
+				</layout_panel>
+				<layout_panel auto_resize="true"/>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="parent_panel2">
+			<layout_stack name="widget_stack">
+				<layout_panel name="widget_left"/>
+				<layout_panel name="widget_container">
+					<combo_box label="ユーザ名" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo">
+						<combo_box.combo_editor/>
+						<combo_box.combo_button/>
+						<combo_box.drop_down_button/>
+					</combo_box>
+					<line_editor name="password_edit" label="パスワード"/>
+					<button label="ログイン" name="connect_btn"/>
+					<text name="sign_up_text" valign="center">
+						サインアップ
+					</text>
+					<check_box label="ユーザ名を記憶" name="remember_name" tool_tip="すでに記憶されているユーザーは、「私」＞「初期設定」＞「詳細設定」＞「記憶されたユーザー名」から削除できます。"/>
+					<check_box label="パスワード記憶" name="remember_password"/>
+					<text name="forgot_password_text">
+						パスワードを忘れましたか？
+					</text>
+				</layout_panel>
+				<layout_panel name="widget_right"/>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="parent_panel3">
+			<layout_stack name="images_stack">
+				<layout_panel name="images_left"/>
+				<layout_panel name="images_container">
+					<icon name="image_left"/>
+				</layout_panel>
+				<layout_panel name="images_right"/>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="page_bottom"/>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 26e6967c00..9d78beb9da 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -1,32 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="もの" name="main inventory panel">
-  <panel.string name="ItemcountFetching">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得中です…。[FILTER]</panel.string>
-  <panel.string name="ItemcountCompleted">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーの取得が完了しました。[FILTER]</panel.string>
-  <panel.string name="ItemcountUnknown">[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得しました。[FILTER]</panel.string>
-  <text name="ItemcountText">アイテム：</text>
-  <filter_editor label="検索用語を入力する" name="inventory search editor" />
-  <combo_box name="search_type">
-    <item label="名前" name="Name" value="search_by_name" />
-    <item label="制作者" name="Creator" value="search_by_creator" />
-    <item label="説明" name="Description" value="search_by_description" />
-    <item label="ＵＵＩＤ" name="UUID" value="search_by_UUID" />
-  </combo_box>
-  <menu_button tool_tip="検索表示オプションを表示" name="options_visibility_btn" />
-  <filter_editor label="検索語句を入力" name="inventory search editor" />
-  <tab_container name="inventory filter tabs">
-    <inventory_panel label="インベントリ" name="All Items" />
-    <recent_inventory_panel label="最新" name="Recent Items" />
-    <inventory_panel label="着用中" name="Worn Items" />
-  </tab_container>
-  <layout_stack name="bottom_panel">
-    <layout_panel name="options_gear_btn_panel">
-      <menu_button name="options_gear_btn" tool_tip="オプションを表示します。" />
-    </layout_panel>
-    <layout_panel name="add_btn_panel">
-      <button name="add_btn" tool_tip="新しいアイテムを追加します。" />
-    </layout_panel>
-    <layout_panel name="trash_btn_panel">
-      <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します。" />
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<panel.string name="ItemcountFetching">
+		[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得中です…。[FILTER]
+	</panel.string>
+	<panel.string name="ItemcountCompleted">
+		[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーの取得が完了しました。[FILTER]
+	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得しました。[FILTER]
+	</panel.string>
+	<text name="ItemcountText">
+		アイテム：
+	</text>
+	<filter_editor label="検索用語を入力する" name="inventory search editor"/>
+	<combo_box name="search_type">
+		<item label="名前" name="Name" value="search_by_name"/>
+		<item label="制作者" name="Creator" value="search_by_creator"/>
+		<item label="説明" name="Description" value="search_by_description"/>
+		<item label="ＵＵＩＤ" name="UUID" value="search_by_UUID"/>
+	</combo_box>
+	<menu_button tool_tip="検索表示オプションを表示" name="options_visibility_btn"/>
+	<filter_editor label="検索語句を入力" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="インベントリ" name="All Items"/>
+		<recent_inventory_panel label="最新" name="Recent Items"/>
+		<inventory_panel label="着用中" name="Worn Items"/>
+	</tab_container>
+	<layout_stack name="bottom_panel">
+		<layout_panel name="options_gear_btn_panel">
+			<menu_button name="options_gear_btn" tool_tip="オプションを表示します。"/>
+		</layout_panel>
+		<layout_panel name="add_btn_panel">
+			<button name="add_btn" tool_tip="新しいアイテムを追加します。"/>
+		</layout_panel>
+		<layout_panel name="trash_btn_panel">
+			<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します。"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
index 4cfc74bf3b..ef191a9079 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="マーケットプレイス" name="Marketplace Panel">
-  <panel name="tool_panel">
-    <menu_button name="sort_btn" tool_tip="表示／並べ替えオプション" />
-    <button name="add_btn" tool_tip="新規リストフォルダの作成" />
-    <button label="エラーを確認" name="audit_btn" tool_tip="マーケットプレイスのリストを確認" />
-  </panel>
-  <panel name="tab_container_panel">
-    <filter_editor label="マーケットプレイスのリストをフィルタ" name="filter_editor" />
-  </panel>
-  <panel name="marketplace_drop_zone">
-    <text>ここにフォルダをドロップして新しいリストを作成</text>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel name="tool_panel">
+		<menu_button name="sort_btn" tool_tip="表示／並べ替えオプション"/>
+		<button name="add_btn" tool_tip="新規リストフォルダの作成"/>
+		<button label="エラーを確認" name="audit_btn" tool_tip="マーケットプレイスのリストを確認"/>
+	</panel>
+	<panel name="tab_container_panel">
+		<filter_editor label="マーケットプレイスのリストをフィルタ" name="filter_editor"/>
+	</panel>
+	<panel name="marketplace_drop_zone">
+		<text>
+			ここにフォルダをドロップして新しいリストを作成
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
index 6d447509b6..13718060bf 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="すべて" name="All Items" tool_tip="ここにアイテムをドラッグ＆ドロップしてリストに表示します。" />
+<inventory_panel label="すべて" name="All Items" tool_tip="ここにアイテムをドラッグ＆ドロップしてリストに表示します。"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
index 41ca08fe4b..e01d9faa5a 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="リストに掲載" name="Active Items" />
+<inventory_panel label="リストに掲載" name="Active Items"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
index 410661a3e5..341715d2d7 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="関連付けされていない" name="Unassociated Items" />
+<inventory_panel label="関連付けされていない" name="Unassociated Items"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
index e29bbc62e3..9fc0eec184 100644
--- a/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<inventory_panel label="リストから削除済み" name="Inactive Items" />
+<inventory_panel label="リストから削除済み" name="Inactive Items"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
index 852101bb16..5d984cb58c 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="Media Settings General">
-  <text name="home_label">ホームページ：</text>
-  <text name="home_fails_whitelist_label">（このページは指定したホワイトリストをパスしません）</text>
-  <line_editor name="home_url" tool_tip="このメディアソースのホームページ" />
-
-  <web_browser name="preview_media" />
-
-  <text name="preview_label">プレビュー</text>
-
-  <text name="current_url_label">現在のページ：</text>
-  <text name="current_url" tool_tip="メディアソースの現在のページ" value="" />
-  <button label="リセット" name="current_url_reset_btn" />
-  <check_box label="ループ再生" name="auto_loop" />
-  <check_box label="最初にクリックしたときの動作" name="first_click_interact" />
-
-  <check_box label="自動ズーム" name="auto_zoom" />
-
-  <check_box label="自動メディア再生" name="auto_play" />
-
-  <text name="media_setting_note">注意： 住人はこの設定を無視できます</text>
-
-  <check_box label="オブジェクトの表面サイズに合わせて自動調整" name="auto_scale" />
-
-  <text name="size_label">サイズ：</text>
-  <text name="X_label">Ｘ</text>
-  <spinner label="" name="height_pixels" />
-</panel>
\ No newline at end of file
+	<text name="home_label">
+		ホームページ：
+	</text>
+	<text name="home_fails_whitelist_label">
+		（このページは指定したホワイトリストをパスしません）
+	</text>
+	<line_editor name="home_url" tool_tip="このメディアソースのホームページ"/>
+	<web_browser name="preview_media"/>
+	<text name="preview_label">
+		プレビュー
+	</text>
+	<text name="current_url_label">
+		現在のページ：
+	</text>
+	<text name="current_url" tool_tip="メディアソースの現在のページ" value=""/>
+	<button label="リセット" name="current_url_reset_btn"/>
+	<check_box label="ループ再生" name="auto_loop"/>
+	<check_box label="最初にクリックしたときの動作" name="first_click_interact"/>
+	<check_box label="自動ズーム" name="auto_zoom"/>
+	<check_box label="自動メディア再生" name="auto_play"/>
+	<text name="media_setting_note">
+		注意： 住人はこの設定を無視できます
+	</text>
+	<check_box label="オブジェクトの表面サイズに合わせて自動調整" name="auto_scale"/>
+	<text name="size_label">
+		サイズ：
+	</text>
+	<text name="X_label">
+		Ｘ
+	</text>
+	<spinner label="" name="height_pixels"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
index 509885d11d..e86f46b027 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="カスタマイズ" name="Media settings for controls">
-  <text name="controls_label">コントロール：</text>
-  <combo_box name="controls">
-    <combo_item name="Standard">標準</combo_item>
-    <combo_item name="Mini">ミニ</combo_item>
-  </combo_box>
-  <text name="owner_label">所有者</text>
-  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_owner_interact" />
-  <check_box label="コントロールバーを表示する" name="perms_owner_control" />
-  <text name="group_label">グループ：</text>
-  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_group_interact" />
-  <check_box label="コントロールバーを表示する" name="perms_group_control" />
-  <text name="anyone_label">全員</text>
-  <check_box label="ナビゲーションと相互作用力を有効にする" name="perms_anyone_interact" />
-  <check_box label="コントロールバーを表示する" name="perms_anyone_control" />
-</panel>
\ No newline at end of file
+	<text name="controls_label">
+		コントロール：
+	</text>
+	<combo_box name="controls">
+		<combo_item name="Standard">
+			標準
+		</combo_item>
+		<combo_item name="Mini">
+			ミニ
+		</combo_item>
+	</combo_box>
+	<text name="owner_label">
+		所有者
+	</text>
+	<check_box label="ナビゲーションと相互作用力を有効にする" name="perms_owner_interact"/>
+	<check_box label="コントロールバーを表示する" name="perms_owner_control"/>
+	<text name="group_label">
+		グループ：
+	</text>
+	<check_box label="ナビゲーションと相互作用力を有効にする" name="perms_group_interact"/>
+	<check_box label="コントロールバーを表示する" name="perms_group_control"/>
+	<text name="anyone_label">
+		全員
+	</text>
+	<check_box label="ナビゲーションと相互作用力を有効にする" name="perms_anyone_interact"/>
+	<check_box label="コントロールバーを表示する" name="perms_anyone_control"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
index 12bb265af2..a6224302d1 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セキュリティ" name="Media Settings Security">
-  <check_box label="指定したURLパターンから始まる接続を許可する。" name="whitelist_enable" />
-  <text name="home_url_fails_some_items_in_whitelist">ホームページに失敗したエントリーがありました：</text>
-  <button label="追加" name="whitelist_add" />
-  <button label="削除" name="whitelist_del" />
-  <text name="home_url_fails_whitelist">警告：「一般」タブで指定されたホームページは、ホワイトリストに掲載されていません。正しい機能が設定されるまで、この機能は一時停止します。</text>
-</panel>
\ No newline at end of file
+	<check_box label="指定したURLパターンから始まる接続を許可する。" name="whitelist_enable"/>
+	<text name="home_url_fails_some_items_in_whitelist">
+		ホームページに失敗したエントリーがありました：
+	</text>
+	<button label="追加" name="whitelist_add"/>
+	<button label="削除" name="whitelist_del"/>
+	<text name="home_url_fails_whitelist">
+		警告：「一般」タブで指定されたホームページは、ホワイトリストに掲載されていません。正しい機能が設定されるまで、この機能は一時停止します。
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
index 6a2e272a38..51402b2e00 100644
--- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
-  <layout_stack name="nvp_stack">
-    <layout_panel name="navigation_layout_panel">
-      <panel name="navigation_panel">
-        <pull_button name="back_btn" tool_tip="前の場所" />
-        <pull_button name="forward_btn" tool_tip="次の場所" />
-        <button name="home_btn" tool_tip="「ホーム」にテレポートします" />
-        <location_input label="所在地" name="location_combo" />
-      </panel>
-    </layout_panel>
-    <layout_panel name="favorites_layout_panel">
-      <favorites_bar name="favorite" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
-        <label name="favorites_bar_label" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">お気に入りバー</label>
-        <more_button name="&gt;&gt;" tool_tip="お気に入りをもっと表示">詳細 ▼</more_button>
-      </favorites_bar>
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<layout_stack name="nvp_stack">
+		<layout_panel name="navigation_layout_panel">
+			<panel name="navigation_panel">
+				<pull_button name="back_btn" tool_tip="前の場所"/>
+				<pull_button name="forward_btn" tool_tip="次の場所"/>
+				<button name="home_btn" tool_tip="「ホーム」にテレポートします"/>
+				<location_input label="所在地" name="location_combo"/>
+			</panel>
+		</layout_panel>
+		<layout_panel name="favorites_layout_panel">
+			<favorites_bar name="favorite" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
+				<label name="favorites_bar_label" tool_tip="ランドマークをここにドラッグして、Second Lifeのお気に入りの場所に素早くアクセス！">
+					お気に入りバー
+				</label>
+				<more_button name="&gt;&gt;" tool_tip="お気に入りをもっと表示">
+					詳細 ▼
+				</more_button>
+			</favorites_bar>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
index a4bd7963fb..4048b48d3a 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_chat">
-  <layout_stack name="stack">
-    <layout_panel name="translate_chat_checkbox_lp">
-      <check_box label="チャットを翻訳" name="translate_chat_checkbox" />
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<layout_stack name="stack">
+		<layout_panel name="translate_chat_checkbox_lp">
+			<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index b47a924f8e..08edb447cb 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_chat">
-  <line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enterキーで発言し、Ctrl＋Enterキーでシャウトします。" />
-  <button name="show_nearby_chat" tool_tip="近隣チャットログを表示／非表示" />
-</panel>
\ No newline at end of file
+	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enterキーで発言し、Ctrl＋Enterキーでシャウトします。"/>
+	<button name="show_nearby_chat" tool_tip="近隣チャットログを表示／非表示"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index 8ab941fe3a..1093624cda 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -1,57 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-  <string name="media_item_count_format">（メディアアイテム %ld ）</string>
-  <string name="empty_item_text">&lt;空&gt;</string>
-  <string name="parcel_media_name">区画ストリーミングメディア</string>
-  <string name="parcel_audio_name">区画ストリーミングオーディオ</string>
-  <string name="playing_suffix">（再生中）</string>
-  <panel name="minimized_controls">
-    <button label="すべて停止" name="all_nearby_media_disable_btn" tool_tip="近隣のメディアをすべてオフにします" />
-    <button label="すべて開始" name="all_nearby_media_enable_btn" tool_tip="近隣のメディアをすべてオンにします" />
-    <button name="open_prefs_btn" tool_tip="メディアの設定を開きます" />
-    <button label="詳細　≫" label_selected="≪　簡易" name="more_btn" tool_tip="拡張コントロール" />
-    <button label="詳細　≫" label_selected="≪　簡易" name="less_btn" tool_tip="拡張コントロール" />
-  </panel>
-  <panel name="nearby_media_panel">
-    <text name="nearby_media_title">近隣のメディア</text>
-    <text name="show_text">表示：</text>
-    <combo_box name="show_combo">
-      <combo_box.item label="すべて" name="All" />
-      <combo_box.item label="この区画内" name="WithinParcel" />
-      <combo_box.item label="この区画外" name="OutsideParcel" />
-      <combo_box.item label="他のアバター" name="OnOthers" />
-    </combo_box>
-    <scroll_list name="media_list">
-      <scroll_list.columns label="近接" name="media_proximity" />
-      <scroll_list.columns label="表示" name="media_visibility" />
-      <scroll_list.columns label="クラス" name="media_class" />
-      <scroll_list.columns label="名前" name="media_name" />
-      <scroll_list.columns label="デバッグ" name="media_debug" />
-    </scroll_list>
-    <panel name="media_controls_panel">
-      <layout_stack name="media_controls">
-        <layout_panel name="stop">
-          <button name="stop_btn" tool_tip="選択したメディアを停止" />
-        </layout_panel>
-        <layout_panel name="play">
-          <button name="play_btn" tool_tip="選択したメディアを再生" />
-        </layout_panel>
-        <layout_panel name="pause">
-          <button name="pause_btn" tool_tip="選択したメディアを一時停止" />
-        </layout_panel>
-        <layout_panel name="volume_slider_ctrl">
-          <slider_bar name="volume_slider" tool_tip="選択したメディアの音量" />
-        </layout_panel>
-        <layout_panel name="mute">
-          <button name="mute_btn" tool_tip="選択したメディアの音をミュート" />
-        </layout_panel>
-        <layout_panel name="zoom">
-          <button name="zoom_btn" tool_tip="選択したメディアにズーム" />
-        </layout_panel>
-        <layout_panel name="unzoom">
-          <button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる" />
-        </layout_panel>
-      </layout_stack>
-    </panel>
-  </panel>
-</panel>
\ No newline at end of file
+	<string name="media_item_count_format">
+		（メディアアイテム %ld ）
+	</string>
+	<string name="empty_item_text">
+		&lt;空&gt;
+	</string>
+	<string name="parcel_media_name">
+		区画ストリーミングメディア
+	</string>
+	<string name="parcel_audio_name">
+		区画ストリーミングオーディオ
+	</string>
+	<string name="playing_suffix">
+		（再生中）
+	</string>
+	<panel name="minimized_controls">
+		<button label="すべて停止" name="all_nearby_media_disable_btn" tool_tip="近隣のメディアをすべてオフにします"/>
+		<button label="すべて開始" name="all_nearby_media_enable_btn" tool_tip="近隣のメディアをすべてオンにします"/>
+		<button name="open_prefs_btn" tool_tip="メディアの設定を開きます"/>
+		<button label="詳細　≫" label_selected="≪　簡易" name="more_btn" tool_tip="拡張コントロール"/>
+		<button label="詳細　≫" label_selected="≪　簡易" name="less_btn" tool_tip="拡張コントロール"/>
+	</panel>
+	<panel name="nearby_media_panel">
+		<text name="nearby_media_title">
+			近隣のメディア
+		</text>
+		<text name="show_text">
+			表示：
+		</text>
+		<combo_box name="show_combo">
+			<combo_box.item label="すべて" name="All"/>
+			<combo_box.item label="この区画内" name="WithinParcel"/>
+			<combo_box.item label="この区画外" name="OutsideParcel"/>
+			<combo_box.item label="他のアバター" name="OnOthers"/>
+		</combo_box>
+		<scroll_list name="media_list">
+			<scroll_list.columns label="近接" name="media_proximity"/>
+			<scroll_list.columns label="表示" name="media_visibility"/>
+			<scroll_list.columns label="クラス" name="media_class"/>
+			<scroll_list.columns label="名前" name="media_name"/>
+			<scroll_list.columns label="デバッグ" name="media_debug"/>
+		</scroll_list>
+		<panel name="media_controls_panel">
+			<layout_stack name="media_controls">
+				<layout_panel name="stop">
+					<button name="stop_btn" tool_tip="選択したメディアを停止"/>
+				</layout_panel>
+				<layout_panel name="play">
+					<button name="play_btn" tool_tip="選択したメディアを再生"/>
+				</layout_panel>
+				<layout_panel name="pause">
+					<button name="pause_btn" tool_tip="選択したメディアを一時停止"/>
+				</layout_panel>
+				<layout_panel name="volume_slider_ctrl">
+					<slider_bar name="volume_slider" tool_tip="選択したメディアの音量"/>
+				</layout_panel>
+				<layout_panel name="mute">
+					<button name="mute_btn" tool_tip="選択したメディアの音をミュート"/>
+				</layout_panel>
+				<layout_panel name="zoom">
+					<button name="zoom_btn" tool_tip="選択したメディアにズーム"/>
+				</layout_panel>
+				<layout_panel name="unzoom">
+					<button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる"/>
+				</layout_panel>
+			</layout_stack>
+		</panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_notification.xml b/indra/newview/skins/default/xui/ja/panel_notification.xml
index ec3bc6a2b4..351edf6d50 100644
--- a/indra/newview/skins/default/xui/ja/panel_notification.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notification.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="通知パネル" name="notification_panel">
-  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
-  <panel label="情報パネル" name="info_panel">
-    <text name="text_box" />
-    <text name="caution_text_box" />
-    <text_editor name="text_editor_box" />
+	<panel label="情報パネル" name="info_panel">
+		<text name="text_box"/>
+		<text name="caution_text_box"/>
+		<text_editor name="text_editor_box"/>
+	</panel>
+	<panel label="コントロールパネル" name="control_panel">
+    
   </panel>
-  <panel label="コントロールパネル" name="control_panel">
-    <!-- 
-    Notes:
-    This panel holds buttons of notification. Change of its size can affect the layout of buttons. 
-    -->
-  </panel>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
index 2ae07c1034..00733bf79d 100644
--- a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
@@ -1,88 +1,109 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
 <panel name="main_panel" title="panel_notification_list_item">
-  <!-- background_opaque="false" -->
-  <!-- background_visible="true"> -->
-  <!-- bg_alpha_color="PanelNotificationListItem"> -->
-  <panel.string name="sender_resident_text">送信者："[SENDER_RESIDENT]"</panel.string>
-  <panel.string name="group_name_text">グループ："[GROUP_NAME]"</panel.string>
-  <panel.string name="group_fee_text">費用：[GROUP_FEE]</panel.string>
-  <panel.string name="item_condensed_height">50</panel.string>
-  <panel.string name="item_expanded_height">87</panel.string>
-  <panel.string name="expanded_height_resize_for_attachment">27</panel.string>
-
-  <panel name="panel_total_view">
-    <layout_stack name="item_vertical_stack">
-      <layout_panel name="layout_panel_condensed_view">
-        <panel name="panel_condensed_view">
-          <layout_stack name="horizontal_stack">
-            <layout_panel name="layout_panel_right">
-              <group_icon name="group_icon" tool_tip="グループ" />
-              <avatar_icon name="avatar_icon" tool_tip="アバター" />
-              <icon name="system_notification_icon" tool_tip="アイコン" />
-            </layout_panel>
-            <layout_panel name="layout_panel_middle">
-              <panel name="main_info_panel">
-                <panel name="notification_title_panel">
-                  <text name="notification_title">グループ名：通知件名 通知件名 通知件名 通知件名 通知件名</text>
-                  <icon name="attachment_icon" tool_tip="装着物" />
-                </panel>
-                <panel name="sender_time_panel">
-                  <text name="sender_or_fee_box">送信者：住民 じゅうみん</text>
-                  <text name="notification_time" value="2014年12月24日　23：30" />
-                </panel>
-              </panel>
-            </layout_panel>
-            <layout_panel name="layout_panel_right">
-              <panel name="close_expand_panel">
-                <button name="close_btn" />
-                <button name="expand_btn" />
-              </panel>
-            </layout_panel>
-          </layout_stack>
-        </panel>
-      </layout_panel>
-      <layout_panel name="layout_panel_expanded_view">
-        <panel name="panel_expanded_view">
-          <layout_stack name="horizontal_stack">
-            <layout_panel name="layout_panel_right_exp">
-              <group_icon name="group_icon_exp" tool_tip="グループ" />
-              <avatar_icon name="avatar_icon_exp" tool_tip="アバター" />
-              <icon name="system_notification_icon_exp" tool_tip="アイコン" />
-              <icon name="attachment_icon_exp" tool_tip="添付" />
-            </layout_panel>
-            <layout_panel name="layout_panel_middle_exp">
-              <panel name="main_info_panel_expanded">
-                <panel name="notification_title_panel_exp">
-                  <text name="notification_title_exp">通知件名 通知件名 通知件名 通知件名</text>
-                  <text name="group_name_exp">グループ名 グループ名 グループ名</text>
-                </panel>
-                <panel name="sender_time_panel_exp">
-                  <text name="sender_or_fee_box_exp">送信者：住民 じゅうみん</text>
-                  <text name="notification_time_exp" value="2014年12月24日　23：30" />
-                </panel>
-                <panel name="notification_text_panel_exp">
-                  <chat_editor name="notification_text_exp">通知件名がここに入る。あーだこーだ</chat_editor>
-                </panel>
-                <panel name="attachment_panel">
-                  <text name="attachment_text">装着物がここに入る。あーだこーだ</text>
-                </panel>
-                <panel name="button_panel">
-                  <button name="join_btn" label="参加" />
-                  <button name="decline_btn" label="却下" />
-                  <button name="info_btn" label="情報" />
-                </panel>
-              </panel>
-            </layout_panel>
-            <layout_panel name="layout_panel_left_exp">
-              <panel name="close_expand_panel_exp">
-                <button name="close_expanded_btn" />
-                <button name="condense_btn" />
-              </panel>
-            </layout_panel>
-          </layout_stack>
-        </panel>
-      </layout_panel>
-    </layout_stack>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel.string name="sender_resident_text">
+		送信者："[SENDER_RESIDENT]"
+	</panel.string>
+	<panel.string name="group_name_text">
+		グループ："[GROUP_NAME]"
+	</panel.string>
+	<panel.string name="group_fee_text">
+		費用：[GROUP_FEE]
+	</panel.string>
+	<panel.string name="item_condensed_height">
+		50
+	</panel.string>
+	<panel.string name="item_expanded_height">
+		87
+	</panel.string>
+	<panel.string name="expanded_height_resize_for_attachment">
+		27
+	</panel.string>
+	<panel name="panel_total_view">
+		<layout_stack name="item_vertical_stack">
+			<layout_panel name="layout_panel_condensed_view">
+				<panel name="panel_condensed_view">
+					<layout_stack name="horizontal_stack">
+						<layout_panel name="layout_panel_right">
+							<group_icon name="group_icon" tool_tip="グループ"/>
+							<avatar_icon name="avatar_icon" tool_tip="アバター"/>
+							<icon name="system_notification_icon" tool_tip="アイコン"/>
+						</layout_panel>
+						<layout_panel name="layout_panel_middle">
+							<panel name="main_info_panel">
+								<panel name="notification_title_panel">
+									<text name="notification_title">
+										グループ名：通知件名 通知件名 通知件名 通知件名 通知件名
+									</text>
+									<icon name="attachment_icon" tool_tip="装着物"/>
+								</panel>
+								<panel name="sender_time_panel">
+									<text name="sender_or_fee_box">
+										送信者：住民 じゅうみん
+									</text>
+									<text name="notification_time" value="2014年12月24日　23：30"/>
+								</panel>
+							</panel>
+						</layout_panel>
+						<layout_panel name="layout_panel_right">
+							<panel name="close_expand_panel">
+								<button name="close_btn"/>
+								<button name="expand_btn"/>
+							</panel>
+						</layout_panel>
+					</layout_stack>
+				</panel>
+			</layout_panel>
+			<layout_panel name="layout_panel_expanded_view">
+				<panel name="panel_expanded_view">
+					<layout_stack name="horizontal_stack">
+						<layout_panel name="layout_panel_right_exp">
+							<group_icon name="group_icon_exp" tool_tip="グループ"/>
+							<avatar_icon name="avatar_icon_exp" tool_tip="アバター"/>
+							<icon name="system_notification_icon_exp" tool_tip="アイコン"/>
+							<icon name="attachment_icon_exp" tool_tip="添付"/>
+						</layout_panel>
+						<layout_panel name="layout_panel_middle_exp">
+							<panel name="main_info_panel_expanded">
+								<panel name="notification_title_panel_exp">
+									<text name="notification_title_exp">
+										通知件名 通知件名 通知件名 通知件名
+									</text>
+									<text name="group_name_exp">
+										グループ名 グループ名 グループ名
+									</text>
+								</panel>
+								<panel name="sender_time_panel_exp">
+									<text name="sender_or_fee_box_exp">
+										送信者：住民 じゅうみん
+									</text>
+									<text name="notification_time_exp" value="2014年12月24日　23：30"/>
+								</panel>
+								<panel name="notification_text_panel_exp">
+									<chat_editor name="notification_text_exp">
+										通知件名がここに入る。あーだこーだ
+									</chat_editor>
+								</panel>
+								<panel name="attachment_panel">
+									<text name="attachment_text">
+										装着物がここに入る。あーだこーだ
+									</text>
+								</panel>
+								<panel name="button_panel">
+									<button name="join_btn" label="参加"/>
+									<button name="decline_btn" label="却下"/>
+									<button name="info_btn" label="情報"/>
+								</panel>
+							</panel>
+						</layout_panel>
+						<layout_panel name="layout_panel_left_exp">
+							<panel name="close_expand_panel_exp">
+								<button name="close_expanded_btn"/>
+								<button name="condense_btn"/>
+							</panel>
+						</layout_panel>
+					</layout_stack>
+				</panel>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
index 3d08e0731f..aff427ed49 100644
--- a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="notifications_panel">
-  <layout_stack name="stack1">
-    <layout_panel name="notifications_list_panel">
-      <scroll_list name="notifications_list">
-        <column label="名前" name="name" />
-        <column label="コンテンツ" name="content" />
-        <column label="日付" name="date" />
-      </scroll_list>
-    </layout_panel>
-    <layout_panel name="rejects_list_panel">
-      <scroll_list name="notification_rejects_list">
-        <column label="名前" name="name" />
-        <column label="コンテンツ" name="content" />
-        <column label="日付" name="date" />
-      </scroll_list>
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<layout_stack name="stack1">
+		<layout_panel name="notifications_list_panel">
+			<scroll_list name="notifications_list">
+				<column label="名前" name="name"/>
+				<column label="コンテンツ" name="content"/>
+				<column label="日付" name="date"/>
+			</scroll_list>
+		</layout_panel>
+		<layout_panel name="rejects_list_panel">
+			<scroll_list name="notification_rejects_list">
+				<column label="名前" name="name"/>
+				<column label="コンテンツ" name="content"/>
+				<column label="日付" name="date"/>
+			</scroll_list>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
index dd0dc42614..5a8ff858df 100644
--- a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="instant_message" name="panel_notify_textbox">
-  <string name="message_max_lines_count" value="14" />
-  <panel label="info_panel" name="info_panel" />
-  <panel label="info_panel" name="textbox_panel">
-    <text_editor name="message" value="メッセージ" />
-  </panel>
-  <panel label="control_panel" name="control_panel">
-    <button label="送信" name="btn_submit" />
-    <button label="無視" name="ignore_btn" />
-  </panel>
-</panel>
\ No newline at end of file
+	<string name="message_max_lines_count" value="14"/>
+	<panel label="info_panel" name="info_panel"/>
+	<panel label="info_panel" name="textbox_panel">
+		<text_editor name="message" value="メッセージ"/>
+	</panel>
+	<panel label="control_panel" name="control_panel">
+		<button label="送信" name="btn_submit"/>
+		<button label="無視" name="ignore_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
index 7e4568e1ca..3a7eeb29c8 100644
--- a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="フレンドのオンライン状況" name="friend_online_status" />
+<panel label="フレンドのオンライン状況" name="friend_online_status"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
index 95b315db40..fbc64335aa 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
@@ -1,91 +1,81 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray Outfit Edit panel -->
 <panel name="outfit_edit">
-  <string name="No Outfit" value="アウトフィットなし" />
-  <string name="unsaved_changes" value="保存されていない変更" />
-  <string name="now_editing" value="編集中" />
-  <string name="folder_view_off" value="Hierarchy_View_Disabled" translate="false" />
-  <string name="folder_view_on" value="Hierarchy_View_On" translate="false" />
-  <string name="list_view_off" value="List_View_Disabled" translate="false" />
-  <string name="list_view_on" value="List_View_On" translate="false" />
-  <panel.string name="not_available">（無し）</panel.string>
-  <panel.string name="unknown">（不明）</panel.string>
-  <!-- Wearables filtering strings -->
-  <string name="Filter.All" value="全て" />
-  <string name="Filter.Clothes/Body" value="服装／身体" />
-  <string name="Filter.Objects" value="オブジェクト" />
-  <string name="Filter.Clothing" value="服装" />
-  <string name="Filter.Bodyparts" value="身体部位" />
-  <string name="replace_body_part" value="クリックして既存のシェイプと置き換える" />
-  <button name="back_btn" />
-  <text name="title" value="アウトフィットのパーツを編集" />
-  <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
-  <panel name="header_panel">
-    <icon name="outfit_icon" top="2" />
-    <panel name="outfit_name_and_status">
-      <text name="status" value="編集中…" />
-      <text name="curr_outfit_name" value="[現在のアウトフィット]" />
-      <loading_indicator name="edit_outfit_loading_indicator" />
-    </panel>
-  </panel>
-  <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
-  <!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height.
-Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px.
-It is calculated as border_size + 2*UIResizeBarOverlap
--->
-  <layout_stack name="im_panels">
-    <layout_panel lname="outfit_wearables_panel">
-      <layout_stack name="filter_panels">
-        <layout_panel name="add_button_and_combobox">
-          <!-- List containing items from the COF and Base outfit -->
-          <panel name="cof_wearables_list" />
-          <button name="show_add_wearables_btn" label="更に追加…" tool_tip="開く／閉じる" />
-          <combo_box name="list_view_filter_combobox" />
-          <combo_box name="folder_view_filter_combobox" />
-          <button name="filter_button" />
-        </layout_panel>
-        <layout_panel name="filter_panel">
-          <filter_editor label="インベントリを着用可能物でフィルタ" name="look_item_filter" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-    <layout_panel name="add_wearables_panel">
-      <!-- this icon represent dragbar between layout panels.
-      This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) -->
-      <icon follows="left|top|right" height="10" image_name="Dragbar" left="0" top_pad="-9" width="313" />
-      <inventory_panel name="folder_view" />
-      <panel name="filtered_wearables_panel">
-        <wearable_items_list name="list_view" />
-      </panel>
-      <button label="アイテムを着用" name="plus_btn" />
-    </layout_panel>
-  </layout_stack>
-  <!-- BUTTON BAR -->
-  <panel name="no_add_wearables_button_bar">
-    <menu_button name="gear_menu_btn" />
-    <icon name="dummy_right_icon" />
-    <button name="shop_btn_1" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。" />
-  </panel>
-  <!-- BUTTON BAR - WEARABLES ADDING MODE -->
-  <panel name="add_wearables_button_bar">
-    <menu_button name="wearables_gear_menu_btn" />
-    <button name="folder_view_btn" />
-    <button name="list_view_btn" />
-    <icon name="dummy_right_icon" />
-    <button name="shop_btn_2" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。" />
-  </panel>
-  <!-- SAVE AND REVERT BUTTONS -->
-  <panel name="save_revert_button_bar">
-    <layout_stack name="button_bar_ls">
-      <layout_panel name="save_btn_lp">
-        <button label="変更を保存" name="save_btn" />
-      </layout_panel>
-      <layout_panel name="save_as_btn_lp">
-        <button label="別名で保存…" name="save_as_btn" />
-      </layout_panel>
-      <layout_panel name="revert_btn_lp">
-        <button label="変更を元に戻す" name="revert_btn" tool_tip="最後に保存されたバージョンに復元します。" />
-      </layout_panel>
-    </layout_stack>
-  </panel>
-</panel>
\ No newline at end of file
+	<string name="No Outfit" value="アウトフィットなし"/>
+	<string name="unsaved_changes" value="保存されていない変更"/>
+	<string name="now_editing" value="編集中"/>
+	<string name="folder_view_off" value="Hierarchy_View_Disabled" translate="false"/>
+	<string name="folder_view_on" value="Hierarchy_View_On" translate="false"/>
+	<string name="list_view_off" value="List_View_Disabled" translate="false"/>
+	<string name="list_view_on" value="List_View_On" translate="false"/>
+	<panel.string name="not_available">
+		（無し）
+	</panel.string>
+	<panel.string name="unknown">
+		（不明）
+	</panel.string>
+	<string name="Filter.All" value="全て"/>
+	<string name="Filter.Clothes/Body" value="服装／身体"/>
+	<string name="Filter.Objects" value="オブジェクト"/>
+	<string name="Filter.Clothing" value="服装"/>
+	<string name="Filter.Bodyparts" value="身体部位"/>
+	<string name="replace_body_part" value="クリックして既存のシェイプと置き換える"/>
+	<button name="back_btn"/>
+	<text name="title" value="アウトフィットのパーツを編集"/>
+	<panel name="header_panel">
+		<icon name="outfit_icon" top="2"/>
+		<panel name="outfit_name_and_status">
+			<text name="status" value="編集中…"/>
+			<text name="curr_outfit_name" value="[現在のアウトフィット]"/>
+			<loading_indicator name="edit_outfit_loading_indicator"/>
+		</panel>
+	</panel>
+	<layout_stack name="im_panels">
+		<layout_panel lname="outfit_wearables_panel">
+			<layout_stack name="filter_panels">
+				<layout_panel name="add_button_and_combobox">
+					<panel name="cof_wearables_list"/>
+					<button name="show_add_wearables_btn" label="更に追加…" tool_tip="開く／閉じる"/>
+					<combo_box name="list_view_filter_combobox"/>
+					<combo_box name="folder_view_filter_combobox"/>
+					<button name="filter_button"/>
+				</layout_panel>
+				<layout_panel name="filter_panel">
+					<filter_editor label="インベントリを着用可能物でフィルタ" name="look_item_filter"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="add_wearables_panel">
+			<icon follows="left|top|right" height="10" image_name="Dragbar" left="0" top_pad="-9" width="313"/>
+			<inventory_panel name="folder_view"/>
+			<panel name="filtered_wearables_panel">
+				<wearable_items_list name="list_view"/>
+			</panel>
+			<button label="アイテムを着用" name="plus_btn"/>
+		</layout_panel>
+	</layout_stack>
+	<panel name="no_add_wearables_button_bar">
+		<menu_button name="gear_menu_btn"/>
+		<icon name="dummy_right_icon"/>
+		<button name="shop_btn_1" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
+	</panel>
+	<panel name="add_wearables_button_bar">
+		<menu_button name="wearables_gear_menu_btn"/>
+		<button name="folder_view_btn"/>
+		<button name="list_view_btn"/>
+		<icon name="dummy_right_icon"/>
+		<button name="shop_btn_2" tool_tip="SLマーケットプレイスをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
+	</panel>
+	<panel name="save_revert_button_bar">
+		<layout_stack name="button_bar_ls">
+			<layout_panel name="save_btn_lp">
+				<button label="変更を保存" name="save_btn"/>
+			</layout_panel>
+			<layout_panel name="save_as_btn_lp">
+				<button label="別名で保存…" name="save_as_btn"/>
+			</layout_panel>
+			<layout_panel name="revert_btn_lp">
+				<button label="変更を元に戻す" name="revert_btn" tool_tip="最後に保存されたバージョンに復元します。"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
index 3dc17eca6a..b469fa6869 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
@@ -1,52 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfit Gallery">
-  <string name="outfit_photo_string">"[OUTFIT_NAME]"のアウトフィットの画像</string>
-  <string name="no_outfits_msg">あなたは、まだアウトフィットを持っていません。[secondlife:///app/search/all/ 検索]してみてください。</string>
-  <string name="no_matched_outfits_msg">お探しのものが見つかりませんでしたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]してみてください。</string>
-  <text name="no_outfits_txt">検索中…</text>
-  <scroll_container name="gallery_scroll_panel">
-    <!--outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/-->
-    <!--layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="0" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="190" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="380" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack-->
-    <!--</panel>-->
+	<string name="outfit_photo_string">
+		"[OUTFIT_NAME]"のアウトフィットの画像
+	</string>
+	<string name="no_outfits_msg">
+		あなたは、まだアウトフィットを持っていません。[secondlife:///app/search/all/ 検索]してみてください。
+	</string>
+	<string name="no_matched_outfits_msg">
+		お探しのものが見つかりませんでしたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]してみてください。
+	</string>
+	<text name="no_outfits_txt">
+		検索中…
+	</text>
+	<scroll_container name="gallery_scroll_panel">
+    
+    
+    
   </scroll_container>
-  <panel name="bottom_panel">
-    <menu_button tool_tip="追加オプションを表示" name="options_gear_btn" />
-    <icon name="dummy_icon" />
-    <!-- 字数制限のため「[COUNT]個のアウトフィット」にしない。-->
-    <text name="OutfitcountText">[COUNT]個</text>
-    <text name="avatar_complexity_label">複雑度：[WEIGHT]</text>
-    <button name="trash_btn" tool_tip="選択されたアウトフィットを削除" />
-  </panel>
+	<panel name="bottom_panel">
+		<menu_button tool_tip="追加オプションを表示" name="options_gear_btn"/>
+		<icon name="dummy_icon"/>
+		<text name="OutfitcountText">
+			[COUNT]個
+		</text>
+		<text name="avatar_complexity_label">
+			複雑度：[WEIGHT]
+		</text>
+		<button name="trash_btn" tool_tip="選択されたアウトフィットを削除"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml b/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
index 7d6e84bfc6..7bcb99fea2 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="gallery_item_panel">
-  <string name="worn_string">（着用中）</string>
-  <icon name="preview_outfit" />
-  <panel name="text_bg_panel">
-    <text name="outfit_name">夏のヒップスター、ピアス、ピアス、ピアス、ピアス</text>
-    <text name="outfit_worn_text">（着用中）</text>
-  </panel>
+	<string name="worn_string">
+		（着用中）
+	</string>
+	<icon name="preview_outfit"/>
+	<panel name="text_bg_panel">
+		<text name="outfit_name">
+			夏のヒップスター、ピアス、ピアス、ピアス、ピアス
+		</text>
+		<text name="outfit_worn_text">
+			（着用中）
+		</text>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
index 29bf11cdd6..64ee963ad8 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_outfit_snapshot_inventory">
-  <icon name="title_icon" />
-  <text name="title">インベントリ</text>
-  <view_border name="hr" />
-  <text name="hint_lbl">インベントリ画像をアップロードするには、L$[UPLOAD_COST]かかります。
-金額はサブスクリプションレベルによって異なります。高いレベルでは減額されます。</text>
-  <button label="キャンセル" name="cancel_btn" />
-  <button label="アップロード（L$ [UPLOAD_COST]）" name="save_btn" />
-</panel>
\ No newline at end of file
+	<icon name="title_icon"/>
+	<text name="title">
+		インベントリ
+	</text>
+	<view_border name="hr"/>
+	<text name="hint_lbl">
+		インベントリ画像をアップロードするには、L$[UPLOAD_COST]かかります。
+金額はサブスクリプションレベルによって異なります。高いレベルでは減額されます。
+	</text>
+	<button label="キャンセル" name="cancel_btn"/>
+	<button label="アップロード（L$ [UPLOAD_COST]）" name="save_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index 5a47c4e4de..3097482da6 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits" label="モノ">
-  <panel.string name="wear_outfit_tooltip">選択したアウトフィットに着替える</panel.string>
-  <panel.string name="wear_items_tooltip">選択したアイテムを着用</panel.string>
-  <tab_container name="appearance_tabs">
-    <panel name="outfit_gallery_tab" label="アウトフィットギャラリー" />
-    <panel name="outfitslist_tab" label="自分のアウトフィット" />
-    <panel name="cof_tab" label="着用中" />
-  </tab_container>
-
-  <panel name="bottom_panel">
-    <layout_stack name="bottom_panel_ls">
-      <layout_panel name="save_btn_lp">
-        <button label="変更を保存" name="save_btn" />
-      </layout_panel>
-      <layout_panel name="save_as_btn_lp">
-        <button label="名前をつけて保存…" name="save_as_btn" />
-      </layout_panel>
-      <layout_panel name="wear_btn_lp">
-        <button label="着用" name="wear_btn" />
-      </layout_panel>
-    </layout_stack>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel.string name="wear_outfit_tooltip">
+		選択したアウトフィットに着替える
+	</panel.string>
+	<panel.string name="wear_items_tooltip">
+		選択したアイテムを着用
+	</panel.string>
+	<tab_container name="appearance_tabs">
+		<panel name="outfit_gallery_tab" label="アウトフィットギャラリー"/>
+		<panel name="outfitslist_tab" label="自分のアウトフィット"/>
+		<panel name="cof_tab" label="着用中"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<layout_stack name="bottom_panel_ls">
+			<layout_panel name="save_btn_lp">
+				<button label="変更を保存" name="save_btn"/>
+			</layout_panel>
+			<layout_panel name="save_as_btn_lp">
+				<button label="名前をつけて保存…" name="save_as_btn"/>
+			</layout_panel>
+			<layout_panel name="wear_btn_lp">
+				<button label="着用" name="wear_btn"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
index 21cf7898f1..9b8695bd4f 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_gear_default">
-  <menu_item_call label="このアウトフィットに着替える" name="wear" />
-  <menu_item_call label="このアウトフィットから取り除く" name="remove" />
-  <menu_item_separator name="Outfits Gear Separator" />
-  <menu_item_call label="名前変更" name="rename" />
-  <menu_item_call label="リンクを外す" name="remove_link" />
-  <menu_item_call label="アウトフィットを削除する" name="delete" />
-</menu>
\ No newline at end of file
+	<menu_item_call label="このアウトフィットに着替える" name="wear"/>
+	<menu_item_call label="このアウトフィットから取り除く" name="remove"/>
+	<menu_item_separator name="Outfits Gear Separator"/>
+	<menu_item_call label="名前変更" name="rename"/>
+	<menu_item_call label="リンクを外す" name="remove_link"/>
+	<menu_item_call label="アウトフィットを削除する" name="delete"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
index 098128bb6d..94766ee8fa 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
-  <accordion name="outfits_accordion">
-    <no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。" />
-    <no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索]をお試しください。" />
-  </accordion>
-  <panel name="bottom_panel">
-    <menu_button tool_tip="追加オプションを表示" name="options_gear_btn" />
-    <icon name="dummy_icon" />
-    <button name="trash_btn" tool_tip="選択されたアウトフィットを削除する。" />
-  </panel>
-</panel>
\ No newline at end of file
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。"/>
+		<no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索]をお試しください。"/>
+	</accordion>
+	<panel name="bottom_panel">
+		<menu_button tool_tip="追加オプションを表示" name="options_gear_btn"/>
+		<icon name="dummy_icon"/>
+		<button name="trash_btn" tool_tip="選択されたアウトフィットを削除する。"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
index b5ac432826..65bcdf8d5d 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Wearing">
-  <panel.string name="no_attachments">着用している装着物はありません。</panel.string>
-  <accordion name="wearables_accordion">
-    <accordion_tab name="tab_wearables" title="着用物"/>
-    <accordion_tab name="cof_items_list" title="一時的な装着物">
-      <scroll_list name="temp_attachments_list">
-        <scroll_list.columns name="icon" />
-        <scroll_list.columns name="text" />
-      </scroll_list>
-    </accordion_tab>
-  </accordion>
-  <panel name="bottom_panel">
-    <menu_button name="options_gear_btn" tool_tip="オプションを表示します。" />
-    <icon name="dummy_icon" />
-  </panel>
-</panel>
\ No newline at end of file
+	<panel.string name="no_attachments">
+		着用している装着物はありません。
+	</panel.string>
+	<accordion name="wearables_accordion">
+		<accordion_tab name="tab_wearables" title="着用物"/>
+		<accordion_tab name="cof_items_list" title="一時的な装着物">
+			<scroll_list name="temp_attachments_list">
+				<scroll_list.columns name="icon"/>
+				<scroll_list.columns name="text"/>
+			</scroll_list>
+		</accordion_tab>
+	</accordion>
+	<panel name="bottom_panel">
+		<menu_button name="options_gear_btn" tool_tip="オプションを表示します。"/>
+		<icon name="dummy_icon"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 90bac4b044..516ee3c7d2 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,65 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray panel -->
 <panel label="人物" name="people_panel">
-  <string name="no_recent_people" value="最近交流があった人物はいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。" />
-  <string name="no_filtered_recent_people" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。" />
-  <string name="no_one_near" value="近くに誰もいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。" />
-  <string name="no_one_filtered_near" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。" />
-  <string name="no_friends_online" value="オンラインのフレンドはいません" />
-  <string name="no_friends" value="フレンドはいません" />
-  <string name="no_friends_msg">フレンドを見つけるには、[secondlife:///app/search/people 検索]をするか、人物を右クリックしてフレンド登録してください。
-一緒に何かするフレンドをお探しですか？[secondlife:///app/worldmap ワールドマップ]をお試しください。</string>
-  <string name="no_filtered_friends_msg">お探しのフレンドは見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。</string>
-  <string name="no_filtered_groups_msg" value="お探しのフレンドは見つかりましたか？[secondlife:///app/search/groups/[SEARCH_TERM] 検索]をお試しください。" />
-  <string name="no_groups_msg" value="グループをお探しですか？[secondlife:///app/search/groups 検索]をお試しください。" />
-  <string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックでマップを開く。Shift‐ドラッグで水平・垂直移動）" />
-  <string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）" />
-  <string name="GroupCountWithInfo" value="あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。[secondlife:/// 上限を増やす]" />
-  <tab_container name="tabs">
-    <panel label="近隣" name="nearby_panel">
-      <panel label="bottom_panel" name="nearby_buttons_panel">
-        <filter_editor label="人物をフィルタ" name="nearby_filter_input" />
-        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
-        <menu_button name="nearby_view_btn" tool_tip="表示／並べ替えのオプション" />
-        <button name="add_friend_btn" tool_tip="フレンド登録を申し込みます" />
-        <dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人物を削除" />
-      </panel>
-    </panel>
-    <panel label="フレンド" name="friends_panel">
-      <panel label="bottom_panel" name="friends_buttons_panel">
-        <filter_editor label="人物をフィルタ" name="friends_filter_input" />
-        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
-        <menu_button name="friends_view_btn" tool_tip="表示／並べ替えのオプション" />
-        <button name="friends_add_btn" tool_tip="フレンド登録を申し込みます" />
-        <dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人物を削除" />
-      </panel>
-      <accordion name="friends_accordion">
-        <accordion_tab name="tab_online" title="オンライン" />
-        <accordion_tab name="tab_all" title="全員" />
-        <accordion_tab name="tab_suggested_friends" title="友だちになりたくない人物" />
-      </accordion>
-    </panel>
-    <panel label="グループ" name="groups_panel">
-      <panel label="bottom_panel" name="groups_buttons_panel">
-        <filter_editor label="グループをフィルタ" name="groups_filter_input" />
-        <menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション" />
-        <menu_button name="groups_view_btn" tool_tip="表示／並べ替えのオプション" />
-        <menu_button name="plus_btn" tool_tip="グループに参加／新規グループを作成します" />
-        <dnd_button name="minus_btn" tool_tip="選択したグループから脱退" />
-      </panel>
-      <text name="groupcount">あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。</text>
-    </panel>
-    <panel label="最新" name="recent_panel">
-      <panel label="bottom_panel" name="recent_buttons_panel">
-        <filter_editor label="人物をフィルタ" name="recent_filter_input" />
-        <button name="gear_btn" tool_tip="選択した人物に対するアクション" />
-        <menu_button name="recent_view_btn" tool_tip="表示／並べ替えのオプション" />
-        <button name="add_friend_btn" tool_tip="フレンド登録を申し込みます。" />
-        <dnd_button name="recent_del_btn" tool_tip="選択されているフレンドを削除" />
-      </panel>
-    </panel>
-    <panel label="ブロック" name="blocked_panel">
-      <panel label="ブロックされた人物とオブジェクト" name="panel_block_list_sidetray" />
-    </panel>
-  </tab_container>
-</panel>
\ No newline at end of file
+	<string name="no_recent_people" value="最近交流があった人物はいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。"/>
+	<string name="no_filtered_recent_people" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。"/>
+	<string name="no_one_near" value="近くに誰もいません。一緒に何かする仲間をお探しですか？[secondlife:///app/search/people 検索]か[secondlife:///app/worldmap ワールドマップ]をお試しください。"/>
+	<string name="no_one_filtered_near" value="お探しの人物は見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。"/>
+	<string name="no_friends_online" value="オンラインのフレンドはいません"/>
+	<string name="no_friends" value="フレンドはいません"/>
+	<string name="no_friends_msg">
+		フレンドを見つけるには、[secondlife:///app/search/people 検索]をするか、人物を右クリックしてフレンド登録してください。
+一緒に何かするフレンドをお探しですか？[secondlife:///app/worldmap ワールドマップ]をお試しください。
+	</string>
+	<string name="no_filtered_friends_msg">
+		お探しのフレンドは見つかりましたか？[secondlife:///app/search/people/[SEARCH_TERM] 検索]をお試しください。
+	</string>
+	<string name="no_filtered_groups_msg" value="お探しのフレンドは見つかりましたか？[secondlife:///app/search/groups/[SEARCH_TERM] 検索]をお試しください。"/>
+	<string name="no_groups_msg" value="グループをお探しですか？[secondlife:///app/search/groups 検索]をお試しください。"/>
+	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックでマップを開く。Shift‐ドラッグで水平・垂直移動）"/>
+	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
+	<string name="GroupCountWithInfo" value="あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。[secondlife:/// 上限を増やす]"/>
+	<tab_container name="tabs">
+		<panel label="近隣" name="nearby_panel">
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人物をフィルタ" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人物に対するアクション"/>
+				<menu_button name="nearby_view_btn" tool_tip="表示／並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し込みます"/>
+				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人物を削除"/>
+			</panel>
+		</panel>
+		<panel label="フレンド" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人物をフィルタ" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人物に対するアクション"/>
+				<menu_button name="friends_view_btn" tool_tip="表示／並べ替えのオプション"/>
+				<button name="friends_add_btn" tool_tip="フレンド登録を申し込みます"/>
+				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人物を削除"/>
+			</panel>
+			<accordion name="friends_accordion">
+				<accordion_tab name="tab_online" title="オンライン"/>
+				<accordion_tab name="tab_all" title="全員"/>
+				<accordion_tab name="tab_suggested_friends" title="友だちになりたくない人物"/>
+			</accordion>
+		</panel>
+		<panel label="グループ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="グループをフィルタ" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
+				<menu_button name="groups_view_btn" tool_tip="表示／並べ替えのオプション"/>
+				<menu_button name="plus_btn" tool_tip="グループに参加／新規グループを作成します"/>
+				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
+			</panel>
+			<text name="groupcount">
+				あなたは現在、[COUNT]グループに属しています。あと[REMAINING]グループに参加することができます。
+			</text>
+		</panel>
+		<panel label="最新" name="recent_panel">
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人物をフィルタ" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人物に対するアクション"/>
+				<menu_button name="recent_view_btn" tool_tip="表示／並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し込みます。"/>
+				<dnd_button name="recent_del_btn" tool_tip="選択されているフレンドを削除"/>
+			</panel>
+		</panel>
+		<panel label="ブロック" name="blocked_panel">
+			<panel label="ブロックされた人物とオブジェクト" name="panel_block_list_sidetray"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
index bdafc69cf8..3a0eeae6d5 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
@@ -1,41 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_performance_autoadjustments">
-  <button name="back_btn" />
-  <text name="back_lbl">戻る</text>
-  <text name="settings_title">設定を自動調整</text>
-  <button label="推奨設定にリセット" name="defaults_btn" />
-  <view_border name="border0" />
-  <text name="targetfps_desc">目標フレームレート</text>
-  <spinner name="target_fps" tool_tip="ビューアーは、グラフィック設定を調整することでこれを実現しようとします。" />
-  <text name="display_desc">お使いのディスプレイは、最大[FPS_LIMIT]fpsをサポートしています。</text>
-  <text name="settings_desc">影響する設定</text>
-  <combo_box name="TuningFPSStrategy">
-    <combo_box.item label="アバターのみ" name="av_only" value="0" />
-    <combo_box.item label="アバターとワールド" name="av_and_scene" value="1" />
-    <combo_box.item label="ワールドのみ" name="scene_only" value="2" />
-  </combo_box>
-  <button label="今すぐ自動調整" name="start_autotune" tool_tip="ビューアーは、目標ＦＰＳを満たすように設定が調整されるまで停止します。" />
-  <button label="キャンセル" name="stop_autotune" tool_tip="自動調整を中断します。" />
-  <text name="wip_desc">調整中です…</text>
-  <check_box label="継続的に調整する" name="AutoTuneContinuous" tool_tip="ビューアーは、このフローターが閉じていても停止するまで、目標ＦＰＳを満たすように設定を継続的に調整します。">
+	<button name="back_btn"/>
+	<text name="back_lbl">
+		戻る
+	</text>
+	<text name="settings_title">
+		設定を自動調整
+	</text>
+	<button label="推奨設定にリセット" name="defaults_btn"/>
+	<view_border name="border0"/>
+	<text name="targetfps_desc">
+		目標フレームレート
+	</text>
+	<spinner name="target_fps" tool_tip="ビューアーは、グラフィック設定を調整することでこれを実現しようとします。"/>
+	<text name="display_desc">
+		お使いのディスプレイは、最大[FPS_LIMIT]fpsをサポートしています。
+	</text>
+	<text name="settings_desc">
+		影響する設定
+	</text>
+	<combo_box name="TuningFPSStrategy">
+		<combo_box.item label="アバターのみ" name="av_only" value="0"/>
+		<combo_box.item label="アバターとワールド" name="av_and_scene" value="1"/>
+		<combo_box.item label="ワールドのみ" name="scene_only" value="2"/>
+	</combo_box>
+	<button label="今すぐ自動調整" name="start_autotune" tool_tip="ビューアーは、目標ＦＰＳを満たすように設定が調整されるまで停止します。"/>
+	<button label="キャンセル" name="stop_autotune" tool_tip="自動調整を中断します。"/>
+	<text name="wip_desc">
+		調整中です…
+	</text>
+	<check_box label="継続的に調整する" name="AutoTuneContinuous" tool_tip="ビューアーは、このフローターが閉じていても停止するまで、目標ＦＰＳを満たすように設定を継続的に調整します。">
   </check_box>
-  <radio_group name="autotune_lock_type">
-    <radio_item label="このログインセッションのみ" name="one_session_lock" value="0" />
-    <radio_item label="今後のログインセッションから" name="next_session_lock" value="1" />
-  </radio_group>
-  <view_border name="border_vsync" />
-  <check_box label="VSyncを有効化" tool_tip="垂直同期を有効にして、画面のティアリングや途切れを軽減します。" />
-  <text name="vsync_desc">モニターのリフレッシュレートをフレームレートと同期させます。</text>
-  <text name="vsync_desc_limit">注意：VSyncをオンにすると、フレームレートが[FPS_LIMIT]fpsに制限されます。</text>
-  <view_border name="border1" />
-  <text name="simplify_dist_desc">遠くにあるアバターの表示の詳細度を減らすと、グラフィックスの速度が向上します。</text>
-  <check_box label="アバターをさらに簡素化" name="AutoTuneImpostorByDistEnabled" tool_tip="有効にするとビューアは、MaxNonImpostorsの設定を調整して、完全にレンダリングされるアバターを指定された半径内のアバターに限定します。" />
-  <spinner name="ffa_autotune"/>
-  <text name="dist_meters">メートル</text>
-  <view_border name="border2" />
-  <text name="dist_limits_desc">自動設定が影響を及ぼす距離範囲を選択します。</text>
-  <text name="min_dist_lbl">最小距離</text>
-  <spinner name="min_dd_autotune" />
-  <text name="pref_dist_lbl">最大距離</text>
-  <spinner name="pref_dd_autotune" />
-</panel>
\ No newline at end of file
+	<radio_group name="autotune_lock_type">
+		<radio_item label="このログインセッションのみ" name="one_session_lock" value="0"/>
+		<radio_item label="今後のログインセッションから" name="next_session_lock" value="1"/>
+	</radio_group>
+	<view_border name="border_vsync"/>
+	<check_box label="VSyncを有効化" tool_tip="垂直同期を有効にして、画面のティアリングや途切れを軽減します。"/>
+	<text name="vsync_desc">
+		モニターのリフレッシュレートをフレームレートと同期させます。
+	</text>
+	<text name="vsync_desc_limit">
+		注意：VSyncをオンにすると、フレームレートが[FPS_LIMIT]fpsに制限されます。
+	</text>
+	<view_border name="border1"/>
+	<text name="simplify_dist_desc">
+		遠くにあるアバターの表示の詳細度を減らすと、グラフィックスの速度が向上します。
+	</text>
+	<check_box label="アバターをさらに簡素化" name="AutoTuneImpostorByDistEnabled" tool_tip="有効にするとビューアは、MaxNonImpostorsの設定を調整して、完全にレンダリングされるアバターを指定された半径内のアバターに限定します。"/>
+	<spinner name="ffa_autotune"/>
+	<text name="dist_meters">
+		メートル
+	</text>
+	<view_border name="border2"/>
+	<text name="dist_limits_desc">
+		自動設定が影響を及ぼす距離範囲を選択します。
+	</text>
+	<text name="min_dist_lbl">
+		最小距離
+	</text>
+	<spinner name="min_dd_autotune"/>
+	<text name="pref_dist_lbl">
+		最大距離
+	</text>
+	<spinner name="pref_dd_autotune"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_complexity.xml b/indra/newview/skins/default/xui/ja/panel_performance_complexity.xml
index f4e01f152d..65438ab45d 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_complexity.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_complexity.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_performance_complexity">
-  <button name="back_btn"/>
-  <text name="back_lbl">戻る</text>
-  <text name="attachments_title">現在のアバターの複雑度</text>
-  <text name="attachments_desc1">装着物を付けるとアバターがより複雑になります。アバターの複雑度が高い場合、</text>
-  <text name="attachments_desc2">他の人からあなたの詳細が見えず、グラフィック速度が低下する可能性があります。</text>
-  <text name="attachments_desc3">不要な重い装着物を削除すると解決することがあります。</text>
-  <name_list name="obj_list">
-    <name_list.columns label="" name="complex_visual" />
-    <name_list.columns label="" name="complex_value" />
-    <name_list.columns label="" name="name" />
-  </name_list>
-</panel>
\ No newline at end of file
+	<button name="back_btn"/>
+	<text name="back_lbl">
+		戻る
+	</text>
+	<text name="attachments_title">
+		現在のアバターの複雑度
+	</text>
+	<text name="attachments_desc1">
+		装着物を付けるとアバターがより複雑になります。アバターの複雑度が高い場合、
+	</text>
+	<text name="attachments_desc2">
+		他の人からあなたの詳細が見えず、グラフィック速度が低下する可能性があります。
+	</text>
+	<text name="attachments_desc3">
+		不要な重い装着物を削除すると解決することがあります。
+	</text>
+	<name_list name="obj_list">
+		<name_list.columns label="" name="complex_visual"/>
+		<name_list.columns label="" name="complex_value"/>
+		<name_list.columns label="" name="name"/>
+	</name_list>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_huds.xml b/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
index 63ec6c20ad..51d9e73540 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_performance_huds">
-  <button name="back_btn" />
-  <text name="back_lbl">戻る</text>
-  <text name="huds_title">アクティブなＨＵＤ</text>
-  <text name="huds_desc1">使用していないＨＵＤを取り外すとメモリが節約され、Second Lifeの処理が高速化されます。</text>
-  <text name="huds_desc2">注意：ＨＵＤの最小化ボタンを使用しても、ＨＵＤを取り外したことにはなりません。</text>
-  <name_list name="hud_list">
-    <name_list.columns label="" name="complex_visual" />
-    <name_list.columns label="" name="complex_value" />
-    <name_list.columns label="" name="name" />
-  </name_list>
-</panel>
\ No newline at end of file
+	<button name="back_btn"/>
+	<text name="back_lbl">
+		戻る
+	</text>
+	<text name="huds_title">
+		アクティブなＨＵＤ
+	</text>
+	<text name="huds_desc1">
+		使用していないＨＵＤを取り外すとメモリが節約され、Second Lifeの処理が高速化されます。
+	</text>
+	<text name="huds_desc2">
+		注意：ＨＵＤの最小化ボタンを使用しても、ＨＵＤを取り外したことにはなりません。
+	</text>
+	<name_list name="hud_list">
+		<name_list.columns label="" name="complex_visual"/>
+		<name_list.columns label="" name="complex_value"/>
+		<name_list.columns label="" name="name"/>
+	</name_list>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_nearby.xml b/indra/newview/skins/default/xui/ja/panel_performance_nearby.xml
index 073965031f..1695c6e556 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_nearby.xml
@@ -1,28 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_performance_nearby">
-  <button name="back_btn" />
-  <text name="back_lbl">戻る</text>
-  <text name="av_nearby_title">近くのアバター</text>
-  <text name="av_nearby_desc">複雑度の高いアバターの表示を省略して速度を上げることができます。</text>
-  <slider tool_tip="複雑度が高いアバターをレンダリングする際に時間がかかるとみなすタイミングを制御します。（単位：マイクロ秒）" name="RenderAvatarMaxART">
+	<button name="back_btn"/>
+	<text name="back_lbl">
+		戻る
+	</text>
+	<text name="av_nearby_title">
+		近くのアバター
+	</text>
+	<text name="av_nearby_desc">
+		複雑度の高いアバターの表示を省略して速度を上げることができます。
+	</text>
+	<slider tool_tip="複雑度が高いアバターをレンダリングする際に時間がかかるとみなすタイミングを制御します。（単位：マイクロ秒）" name="RenderAvatarMaxART">
   </slider>
-  <text name="RenderAvatarMaxARTText">制限なし</text>
-  <name_list name="nearby_list">
-    <name_list.columns label="" name="complex_visual" />
-    <name_list.columns label="" name="complex_value" />
-    <name_list.columns label="" name="name" />
-  </name_list>
-  <text name="av_nearby_desc2">インワールド内のアバターを右クリックして表示を制御することもできます。</text>
-  <button label="例外…" name="exceptions_btn">
+	<text name="RenderAvatarMaxARTText">
+		制限なし
+	</text>
+	<name_list name="nearby_list">
+		<name_list.columns label="" name="complex_visual"/>
+		<name_list.columns label="" name="complex_value"/>
+		<name_list.columns label="" name="name"/>
+	</name_list>
+	<text name="av_nearby_desc2">
+		インワールド内のアバターを右クリックして表示を制御することもできます。
+	</text>
+	<button label="例外…" name="exceptions_btn">
   </button>
-  <check_box label="フレンドは常に詳細表示する" name="display_friends" />
-  <view_border name="border" />
-  <check_box label="アバターを完全に非表示にする（風景写真に適しています）" name="hide_avatars" />
-  <text name="name_tags_textbox">名前タグ：</text>
-  <radio_group name="name_tag_mode">
-    <radio_item label="オフ" name="radio" />
-    <radio_item label="オン" name="radio2" />
-    <radio_item label="簡略表示" name="radio3" />
-  </radio_group>
-
-</panel>
\ No newline at end of file
+	<check_box label="フレンドは常に詳細表示する" name="display_friends"/>
+	<view_border name="border"/>
+	<check_box label="アバターを完全に非表示にする（風景写真に適しています）" name="hide_avatars"/>
+	<text name="name_tags_textbox">
+		名前タグ：
+	</text>
+	<radio_group name="name_tag_mode">
+		<radio_item label="オフ" name="radio"/>
+		<radio_item label="オン" name="radio2"/>
+		<radio_item label="簡略表示" name="radio3"/>
+	</radio_group>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
index f5f1bc1b03..a031cd7176 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
@@ -1,66 +1,120 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_performance_preferences">
-  <button name="back_btn" />
-  <text name="back_lbl">戻る</text>
-  <text name="settings_title">グラフィック設定</text>
-  <button label="拡張設定を開く" name="advanced_btn" />
-  <button label="推奨設定にリセット" name="defaults_btn" />
-  <view_border name="border0" />
-  <text name="quality_lbl">品質と速度</text>
-  <text name="fastest_lbl">距離と速度</text>
-  <radio_group name="graphics_quality">
-    <radio_item name="0" />
-    <radio_item name="1" />
-    <radio_item name="2" />
-    <radio_item name="3" />
-    <radio_item name="4" />
-    <radio_item name="5" />
-    <radio_item name="6" />
-  </radio_group>
-  <text name="quality_lbl">最高品位</text>
-  <text name="quality_desc">ショートカットを選択すると、手動で行った変更がすべてリセットされます。</text>
-  <view_border name="border2" />
-  <text name="distance_lbl">距離</text>
-  <text name="faster_lbl">速度</text>
-  <slider name="draw_distance" />
-  <text name="draw_distance_m">ｍ</text>
-  <text name="farther_lbl">遠景</text>
-  <text name="distance_desc1">ズームアウト時に遠くまで見たい場合は、距離を長く設定してください。</text>
-  <view_border name="border3" />
-  <text name="environment_lbl">環境</text>
-  <text name="enhancements_desc">この設定によりリアリズムは向上しますが、速度が低下する可能性があります。</text>
-  <check_box label="大気（周辺）シェーダー" name="atmospheric_shaders" />
-  <check_box label="高度な光源モデル" name="advanced_lighting_model" />
-  <text name="RenderShadowDetailText">影：</text>
-  <combo_box name="ShadowDetail">
-    <combo_box.item label="なし" name="0" value="0" />
-    <combo_box.item label="太陽／月" name="1" value="1" />
-    <combo_box.item label="太陽／月＋プロジェクター" name="2" value="2" />
-  </combo_box>
-  <view_border name="border3" />
-  <text name="water_lbl">水面</text>
-  <text name="water_desc">水面の効果を簡素化するかオフにすると、フレームレートが大幅に向上します。</text>
-  <check_box label="透明な水" name="TransparentWater" />
-  <text name="ReflectionsText">水面の反射：</text>
-  <combo_box name="Reflections">
-    <combo_box.item label="なし；不透明" name="0" value="-2" />
-    <combo_box.item label="なし；透明" name="0" value="-1" />
-    <combo_box.item label="最小限" name="0" value="0" />
-    <combo_box.item label="地形と樹木" name="1" value="1" />
-    <combo_box.item label="全ての静的なオブジェクト" name="2" value="2" />
-    <combo_box.item label="全てのアバターとオブジェクト" name="3" value="3" />
-    <combo_box.item label="全て" name="4" value="4" />
-  </combo_box>
-  <view_border name="border4" />
-  <text name="photo_lbl">写真</text>
-  <text name="photo_desc">詳細度を最大にすると撮影に適した画像になりますが、フレームレートが下がります。</text>
-  <spinner label="距離の詳細：" name="render_volume_lod" />
-  <text name="photo_desc">（0.0～4.0の値を入れてください）</text>
-  <text name="1_lbl">1</text>
-  <text name="2_lbl">2</text>
-  <text name="3_lbl">3</text>
-  <text name="4_lbl">4</text>
-  <text name="5_lbl">5</text>
-  <text name="6_lbl">6</text>
-  <text name="7_lbl">7</text>
-</panel>
\ No newline at end of file
+	<button name="back_btn"/>
+	<text name="back_lbl">
+		戻る
+	</text>
+	<text name="settings_title">
+		グラフィック設定
+	</text>
+	<button label="拡張設定を開く" name="advanced_btn"/>
+	<button label="推奨設定にリセット" name="defaults_btn"/>
+	<view_border name="border0"/>
+	<text name="quality_lbl">
+		品質と速度
+	</text>
+	<text name="fastest_lbl">
+		距離と速度
+	</text>
+	<radio_group name="graphics_quality">
+		<radio_item name="0"/>
+		<radio_item name="1"/>
+		<radio_item name="2"/>
+		<radio_item name="3"/>
+		<radio_item name="4"/>
+		<radio_item name="5"/>
+		<radio_item name="6"/>
+	</radio_group>
+	<text name="quality_lbl">
+		最高品位
+	</text>
+	<text name="quality_desc">
+		ショートカットを選択すると、手動で行った変更がすべてリセットされます。
+	</text>
+	<view_border name="border2"/>
+	<text name="distance_lbl">
+		距離
+	</text>
+	<text name="faster_lbl">
+		速度
+	</text>
+	<slider name="draw_distance"/>
+	<text name="draw_distance_m">
+		ｍ
+	</text>
+	<text name="farther_lbl">
+		遠景
+	</text>
+	<text name="distance_desc1">
+		ズームアウト時に遠くまで見たい場合は、距離を長く設定してください。
+	</text>
+	<view_border name="border3"/>
+	<text name="environment_lbl">
+		環境
+	</text>
+	<text name="enhancements_desc">
+		この設定によりリアリズムは向上しますが、速度が低下する可能性があります。
+	</text>
+	<check_box label="大気（周辺）シェーダー" name="atmospheric_shaders"/>
+	<check_box label="高度な光源モデル" name="advanced_lighting_model"/>
+	<text name="RenderShadowDetailText">
+		影：
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="なし" name="0" value="0"/>
+		<combo_box.item label="太陽／月" name="1" value="1"/>
+		<combo_box.item label="太陽／月＋プロジェクター" name="2" value="2"/>
+	</combo_box>
+	<view_border name="border3"/>
+	<text name="water_lbl">
+		水面
+	</text>
+	<text name="water_desc">
+		水面の効果を簡素化するかオフにすると、フレームレートが大幅に向上します。
+	</text>
+	<check_box label="透明な水" name="TransparentWater"/>
+	<text name="ReflectionsText">
+		水面の反射：
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="なし；不透明" name="0" value="-2"/>
+		<combo_box.item label="なし；透明" name="0" value="-1"/>
+		<combo_box.item label="最小限" name="0" value="0"/>
+		<combo_box.item label="地形と樹木" name="1" value="1"/>
+		<combo_box.item label="全ての静的なオブジェクト" name="2" value="2"/>
+		<combo_box.item label="全てのアバターとオブジェクト" name="3" value="3"/>
+		<combo_box.item label="全て" name="4" value="4"/>
+	</combo_box>
+	<view_border name="border4"/>
+	<text name="photo_lbl">
+		写真
+	</text>
+	<text name="photo_desc">
+		詳細度を最大にすると撮影に適した画像になりますが、フレームレートが下がります。
+	</text>
+	<spinner label="距離の詳細：" name="render_volume_lod"/>
+	<text name="photo_desc">
+		（0.0～4.0の値を入れてください）
+	</text>
+	<text name="1_lbl">
+		1
+	</text>
+	<text name="2_lbl">
+		2
+	</text>
+	<text name="3_lbl">
+		3
+	</text>
+	<text name="4_lbl">
+		4
+	</text>
+	<text name="5_lbl">
+		5
+	</text>
+	<text name="6_lbl">
+		6
+	</text>
+	<text name="7_lbl">
+		7
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 59136a27a0..21843e4420 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -1,100 +1,118 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="place_profile">
-  <string name="on" value="オン" />
-  <string name="off" value="オフ" />
-  <string name="anyone" value="全員" />
-  <string name="available" value="利用可" />
-  <string name="allocated" value="割り当て済" />
-  <string name="title_place" value="場所のプロフィール" />
-  <string name="title_teleport_history" value="テレポートの履歴" />
-  <string name="not_available" value="（該当なし）" />
-  <string name="unknown" value="（不明）" />
-  <string name="public" value="（公開）" />
-  <string name="none_text" value="（なし）" />
-  <string name="sale_pending_text" value="（販売処理中）" />
-  <string name="group_owned_text" value="（グループ所有）" />
-  <string name="price_text" value="L$" />
-  <string name="area_text" value="㎡" />
-  <string name="all_residents_text" value="すべての住人" />
-  <string name="group_text" value="グループ" />
-  <string name="can_resell">このリージョンで購入した土地は、再販することができます。</string>
-  <string name="can_not_resell">このリージョンで購入した土地は、再販できません。</string>
-  <string name="can_change">このリージョンで購入した土地は、統合・分割することができます。</string>
-  <string name="can_not_change">このリージョンで購入した土地は、統合・分割できません。</string>
-  <string name="server_update_text">場所の情報は、サーバーがアップデートされるまでご利用いただけません。</string>
-  <string name="server_error_text">この場所の情報は現在ご利用いただけません。あとでもう一度お試しください。</string>
-  <string name="server_forbidden_text">この場所の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。</string>
-  <string name="acquired_date">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</string>
-  <button name="back_btn" tool_tip="戻る" />
-  <text name="title" value="場所のプロフィール" />
-  <scroll_container name="place_scroll">
-    <panel name="scrolling_panel">
-      <text name="region_title" value="SampleRegion" />
-      <text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)" />
-      <expandable_text name="description" value="Du waltz die spritz" />
-      <text name="owner_label" value="所有者：" />
-      <text name="owner_value" value="Alex Superduperlongenamenton" />
-      <text name="maturity_value" value="不明" />
-      <accordion name="advanced_info_accordion">
-        <accordion_tab name="parcel_characteristics_tab" title="区画">
-          <panel name="parcel_characteristics_panel">
-            <text name="rating_label" value="レーティング：" />
-            <text name="rating_value" value="不明" />
-            <text name="voice_label" value="ボイス：" />
-            <text name="voice_value" value="オン" />
-            <text name="fly_label" value="飛行：" />
-            <text name="fly_value" value="オン" />
-            <text name="push_label" value="プッシュ：" />
-            <text name="push_value" value="オフ" />
-            <text name="build_label" value="制作：" />
-            <text name="build_value" value="オン" />
-            <text name="scripts_label" value="スクリプト：" />
-            <text name="scripts_value" value="オン" />
-            <text name="damage_label" value="ダメージ：" />
-            <text name="damage_value" value="オフ" />
-            <text name="see_avatars_label" value="アバターを表示：" />
-            <text name="see_avatars_value" value="オフ" />
-            <button label="土地情報" name="about_land_btn" />
-          </panel>
-        </accordion_tab>
-        <accordion_tab name="region_information_tab" title="リージョン（地域）">
-          <panel name="region_information_panel">
-            <text name="region_name_label" value="リージョン:" />
-            <text name="region_name" value="Mooseland" />
-            <text name="region_type_label" value="種類：" />
-            <text name="region_type" value="Moose" />
-            <text name="region_rating_label" value="レーティング：" />
-            <text name="region_rating" value="Adult" />
-            <text name="region_owner_label" value="所有者：" />
-            <text name="region_owner" value="moose Van Moose extra long name moose" />
-            <text name="region_group_label" value="グループ：" />
-            <text name="region_group">The Mighty Moose of mooseville soundvillemoose</text>
-            <button label="リージョン（地域）／不動産" name="region_info_btn" />
-          </panel>
-        </accordion_tab>
-        <accordion_tab name="estate_information_tab" title="不動産（不動産）">
-          <panel name="estate_information_panel">
-            <text name="estate_name_label" value="不動産：" />
-            <text name="estate_rating_label" value="レーティング：" />
-            <text name="estate_owner_label" value="所有者：" />
-            <text name="estate_owner" value="長い所有者の名前をテスト" />
-            <text name="covenant_label" value="約款：" />
-          </panel>
-        </accordion_tab>
-        <accordion_tab name="sales_tab" title="販売中">
-          <panel name="sales_panel">
-            <text name="sales_price_label" value="価格：" />
-            <text name="area_label" value="面積：" />
-            <text name="traffic_label" value="トラフィック：" />
-            <text name="primitives_label" value="プリム：" />
-            <text name="parcel_scripts_label" value="スクリプト：" />
-            <text name="terraform_limits_label" value="地形編集制限：" />
-            <text name="subdivide_label" value="分割・統合許可：" />
-            <text name="resale_label" value="再版許可：" />
-            <text name="sale_to_label" value="販売先：" />
-          </panel>
-        </accordion_tab>
-      </accordion>
-    </panel>
-  </scroll_container>
-</panel>
\ No newline at end of file
+	<string name="on" value="オン"/>
+	<string name="off" value="オフ"/>
+	<string name="anyone" value="全員"/>
+	<string name="available" value="利用可"/>
+	<string name="allocated" value="割り当て済"/>
+	<string name="title_place" value="場所のプロフィール"/>
+	<string name="title_teleport_history" value="テレポートの履歴"/>
+	<string name="not_available" value="（該当なし）"/>
+	<string name="unknown" value="（不明）"/>
+	<string name="public" value="（公開）"/>
+	<string name="none_text" value="（なし）"/>
+	<string name="sale_pending_text" value="（販売処理中）"/>
+	<string name="group_owned_text" value="（グループ所有）"/>
+	<string name="price_text" value="L$"/>
+	<string name="area_text" value="㎡"/>
+	<string name="all_residents_text" value="すべての住人"/>
+	<string name="group_text" value="グループ"/>
+	<string name="can_resell">
+		このリージョンで購入した土地は、再販することができます。
+	</string>
+	<string name="can_not_resell">
+		このリージョンで購入した土地は、再販できません。
+	</string>
+	<string name="can_change">
+		このリージョンで購入した土地は、統合・分割することができます。
+	</string>
+	<string name="can_not_change">
+		このリージョンで購入した土地は、統合・分割できません。
+	</string>
+	<string name="server_update_text">
+		場所の情報は、サーバーがアップデートされるまでご利用いただけません。
+	</string>
+	<string name="server_error_text">
+		この場所の情報は現在ご利用いただけません。あとでもう一度お試しください。
+	</string>
+	<string name="server_forbidden_text">
+		この場所の情報は、アクセス制限のためご利用いただけません。許可については区画所有者にお問い合わせください。
+	</string>
+	<string name="acquired_date">
+		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+	</string>
+	<button name="back_btn" tool_tip="戻る"/>
+	<text name="title" value="場所のプロフィール"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="region_title" value="SampleRegion"/>
+			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<text name="owner_label" value="所有者："/>
+			<text name="owner_value" value="Alex Superduperlongenamenton"/>
+			<text name="maturity_value" value="不明"/>
+			<accordion name="advanced_info_accordion">
+				<accordion_tab name="parcel_characteristics_tab" title="区画">
+					<panel name="parcel_characteristics_panel">
+						<text name="rating_label" value="レーティング："/>
+						<text name="rating_value" value="不明"/>
+						<text name="voice_label" value="ボイス："/>
+						<text name="voice_value" value="オン"/>
+						<text name="fly_label" value="飛行："/>
+						<text name="fly_value" value="オン"/>
+						<text name="push_label" value="プッシュ："/>
+						<text name="push_value" value="オフ"/>
+						<text name="build_label" value="制作："/>
+						<text name="build_value" value="オン"/>
+						<text name="scripts_label" value="スクリプト："/>
+						<text name="scripts_value" value="オン"/>
+						<text name="damage_label" value="ダメージ："/>
+						<text name="damage_value" value="オフ"/>
+						<text name="see_avatars_label" value="アバターを表示："/>
+						<text name="see_avatars_value" value="オフ"/>
+						<button label="土地情報" name="about_land_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="region_information_tab" title="リージョン（地域）">
+					<panel name="region_information_panel">
+						<text name="region_name_label" value="リージョン:"/>
+						<text name="region_name" value="Mooseland"/>
+						<text name="region_type_label" value="種類："/>
+						<text name="region_type" value="Moose"/>
+						<text name="region_rating_label" value="レーティング："/>
+						<text name="region_rating" value="Adult"/>
+						<text name="region_owner_label" value="所有者："/>
+						<text name="region_owner" value="moose Van Moose extra long name moose"/>
+						<text name="region_group_label" value="グループ："/>
+						<text name="region_group">
+							The Mighty Moose of mooseville soundvillemoose
+						</text>
+						<button label="リージョン（地域）／不動産" name="region_info_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="estate_information_tab" title="不動産（不動産）">
+					<panel name="estate_information_panel">
+						<text name="estate_name_label" value="不動産："/>
+						<text name="estate_rating_label" value="レーティング："/>
+						<text name="estate_owner_label" value="所有者："/>
+						<text name="estate_owner" value="長い所有者の名前をテスト"/>
+						<text name="covenant_label" value="約款："/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="sales_tab" title="販売中">
+					<panel name="sales_panel">
+						<text name="sales_price_label" value="価格："/>
+						<text name="area_label" value="面積："/>
+						<text name="traffic_label" value="トラフィック："/>
+						<text name="primitives_label" value="プリム："/>
+						<text name="parcel_scripts_label" value="スクリプト："/>
+						<text name="terraform_limits_label" value="地形編集制限："/>
+						<text name="subdivide_label" value="分割・統合許可："/>
+						<text name="resale_label" value="再版許可："/>
+						<text name="sale_to_label" value="販売先："/>
+					</panel>
+				</accordion_tab>
+			</accordion>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index 0f3c6b44ff..33699fe37f 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -1,71 +1,66 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="場所" name="places panel">
-  <string name="landmarks_tab_title" value="ランドマーク" />
-  <string name="teleport_history_tab_title" value="訪問した場所" />
-  <string name="favorites_tab_title" value="お気に入り" />
-  <string name="tooltip_trash_items" value="選択されたランドマークかフォルダを削除" />
-  <string name="tooltip_trash_history" value="訪問した場所一覧を削除" />
-  <layout_stack name="places_layout_panel">
-    <layout_panel name="main_panel">
-      <layout_stack name="top_menu_panel">
-        <layout_panel name="filter_panel">
-          <filter_editor label="場所をフィルタ" name="Filter" />
-        </layout_panel>
-        <layout_panel name="options_gear_btn_panel">
-          <menu_button tool_tip="オプションを表示" name="options_gear_btn" />
-        </layout_panel>
-        <layout_panel name="options_sort_btn_panel">
-          <menu_button tool_tip="ソートオプションを表示" name="sorting_menu_btn" />
-        </layout_panel>
-        <layout_panel name="add_btn_panel">
-          <menu_button name="add_menu_btn" tool_tip="新しいランドマークかフォルダを追加" />
-        </layout_panel>
-        <layout_panel name="trash_btn_panel">
-          <dnd_button name="trash_btn"/>
-        </layout_panel>
-      </layout_stack>
-      <tab_container name="Places Tabs" />
-      <panel name="panel_place_profile" />
-      <panel name="panel_landmark_info" />
-    </layout_panel>
-    <!--*********************** Button wrappers ***********************-->
-    <layout_panel auto_resize="false" layout="topleft" height="25" name="button_layout_panel">
-      <panel name="button_panel">
-        <layout_stack name="bottom_bar_ls0">
-          <layout_panel name="lp1">
-            <!--*********************** Teleport, Map buttons ***********************-->
-            <layout_stack name="bottom_bar_ls1">
-              <layout_panel name="teleport_btn_lp">
-                <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする" />
-              </layout_panel>
-              <layout_panel name="chat_btn_lp">
-                <button label="マップ" name="map_btn" tool_tip="ワールドマップに該当するエリアを表示" />
-              </layout_panel>
-            </layout_stack>
-          </layout_panel>
-          <!--*********************** Options button ***********************-->
-          <layout_panel name="lp_options">
-            <menu_button name="overflow_btn" tool_tip="追加オプションを表示" />
-          </layout_panel>
-          <layout_panel name="lp2">
-            <!--*********************** Close button ***********************-->
-            <layout_stack name="bottom_bar_close_ls3">
-              <layout_panel name="close_btn_lp">
-                <button label="閉じる" name="close_btn" />
-              </layout_panel>
-            </layout_stack>
-          </layout_panel>
-        </layout_stack>
-        <!--*********************** Save, Cancel buttons ***********************-->
-        <layout_stack name="bottom_bar_ls2">
-          <layout_panel name="save_btn_lp">
-            <button label="保存" name="save_btn" />
-          </layout_panel>
-          <layout_panel name="cancel_btn_lp">
-            <button label="キャンセル" name="cancel_btn" />
-          </layout_panel>
-        </layout_stack>
-      </panel>
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<string name="landmarks_tab_title" value="ランドマーク"/>
+	<string name="teleport_history_tab_title" value="訪問した場所"/>
+	<string name="favorites_tab_title" value="お気に入り"/>
+	<string name="tooltip_trash_items" value="選択されたランドマークかフォルダを削除"/>
+	<string name="tooltip_trash_history" value="訪問した場所一覧を削除"/>
+	<layout_stack name="places_layout_panel">
+		<layout_panel name="main_panel">
+			<layout_stack name="top_menu_panel">
+				<layout_panel name="filter_panel">
+					<filter_editor label="場所をフィルタ" name="Filter"/>
+				</layout_panel>
+				<layout_panel name="options_gear_btn_panel">
+					<menu_button tool_tip="オプションを表示" name="options_gear_btn"/>
+				</layout_panel>
+				<layout_panel name="options_sort_btn_panel">
+					<menu_button tool_tip="ソートオプションを表示" name="sorting_menu_btn"/>
+				</layout_panel>
+				<layout_panel name="add_btn_panel">
+					<menu_button name="add_menu_btn" tool_tip="新しいランドマークかフォルダを追加"/>
+				</layout_panel>
+				<layout_panel name="trash_btn_panel">
+					<dnd_button name="trash_btn"/>
+				</layout_panel>
+			</layout_stack>
+			<tab_container name="Places Tabs"/>
+			<panel name="panel_place_profile"/>
+			<panel name="panel_landmark_info"/>
+		</layout_panel>
+		<layout_panel auto_resize="false" layout="topleft" height="25" name="button_layout_panel">
+			<panel name="button_panel">
+				<layout_stack name="bottom_bar_ls0">
+					<layout_panel name="lp1">
+						<layout_stack name="bottom_bar_ls1">
+							<layout_panel name="teleport_btn_lp">
+								<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/>
+							</layout_panel>
+							<layout_panel name="chat_btn_lp">
+								<button label="マップ" name="map_btn" tool_tip="ワールドマップに該当するエリアを表示"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+					<layout_panel name="lp_options">
+						<menu_button name="overflow_btn" tool_tip="追加オプションを表示"/>
+					</layout_panel>
+					<layout_panel name="lp2">
+						<layout_stack name="bottom_bar_close_ls3">
+							<layout_panel name="close_btn_lp">
+								<button label="閉じる" name="close_btn"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+				<layout_stack name="bottom_bar_ls2">
+					<layout_panel name="save_btn_lp">
+						<button label="保存" name="save_btn"/>
+					</layout_panel>
+					<layout_panel name="cancel_btn_lp">
+						<button label="キャンセル" name="cancel_btn"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
index 0899e4ce25..65f6046003 100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_postcard_message">
-  <text name="to_label">宛先：</text>
-  <text name="name_label">名前：</text>
-  <text name="subject_label">件名：</text>
-  <line_editor label="件名をここに入力してください。" name="subject_form" />
-  <text name="msg_label">メッセージ：</text>
-  <text_editor name="msg_form">メッセージをここに入力してください。</text_editor>
-  <button label="キャンセル" name="cancel_btn" />
-  <button label="送信" name="send_btn" />
-</panel>
\ No newline at end of file
+	<text name="to_label">
+		宛先：
+	</text>
+	<text name="name_label">
+		名前：
+	</text>
+	<text name="subject_label">
+		件名：
+	</text>
+	<line_editor label="件名をここに入力してください。" name="subject_form"/>
+	<text name="msg_label">
+		メッセージ：
+	</text>
+	<text_editor name="msg_form">
+		メッセージをここに入力してください。
+	</text_editor>
+	<button label="キャンセル" name="cancel_btn"/>
+	<button label="送信" name="send_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
index 2556cd4c3c..6373eadabc 100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_postcard_settings">
-  <combo_box label="解像度" name="postcard_size_combo">
-    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
-    <combo_box.item label="６４０✕４８０" name="640x480" />
-    <combo_box.item label="８００✕６００" name="800x600" />
-    <combo_box.item label="１０２４✕７６８" name="1024x768" />
-    <combo_box.item label="カスタム" name="Custom" />
-  </combo_box>
-  <spinner label="横幅✕高さ" name="postcard_snapshot_width" />
-  <check_box label="縦横比の固定" name="postcard_keep_aspect_check" />
-  <slider label="品質：" name="image_quality_slider" />
-</panel>
\ No newline at end of file
+	<combo_box label="解像度" name="postcard_size_combo">
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
+		<combo_box.item label="６４０✕４８０" name="640x480"/>
+		<combo_box.item label="８００✕６００" name="800x600"/>
+		<combo_box.item label="１０２４✕７６８" name="1024x768"/>
+		<combo_box.item label="カスタム" name="Custom"/>
+	</combo_box>
+	<spinner label="横幅✕高さ" name="postcard_snapshot_width"/>
+	<check_box label="縦横比の固定" name="postcard_keep_aspect_check"/>
+	<slider label="品質：" name="image_quality_slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 888140630f..40998f8035 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -1,24 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="拡張" name="advanced">
-  <panel.string name="aspect_ratio_text">[NUM]：[DEN]</panel.string>
-  <text name="Cache:">キャッシュ：</text>
-  <spinner label="キャッシュ容量（256～9984㎆）" name="cachesizespinner" />
-  <text name="text_box5">㎆</text>
-  <button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache" />
-  <text name="Cache location">キャッシュ保存先：</text>
-  <button label="参照" label_selected="参照" name="set_cache" />
-  <button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location" />
-  <text name="UI Size:">ＵＩのサイズ：</text>
-  <text name="HUD Size:">ＨＵＤのスケール：</text>
-  <check_box label="スクリプトのエラーを表示：" name="show_script_errors" />
-  <radio_group name="show_location">
-    <radio_item label="近隣チャット" name="0" />
-    <radio_item label="別々のウィンドウ" name="1" />
-  </radio_group>
-  <check_box label="複数のビューアを許可" name="allow_multiple_viewer_check" />
-  <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" />
-  <check_box label="拡張メニューを表示" name="show_advanced_menu_check" />
-  <check_box label="開発メニューを表示" name="show_develop_menu_check" />
-  <button label="記録済みのユーザ名" name="remembered_usernames" />
-  <button label="デフォルトの作成権限" name="default_creation_permissions" />
-</panel>
\ No newline at end of file
+	<panel.string name="aspect_ratio_text">
+		[NUM]：[DEN]
+	</panel.string>
+	<text name="Cache:">
+		キャッシュ：
+	</text>
+	<spinner label="キャッシュ容量（256～9984㎆）" name="cachesizespinner"/>
+	<text name="text_box5">
+		㎆
+	</text>
+	<button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache"/>
+	<text name="Cache location">
+		キャッシュ保存先：
+	</text>
+	<button label="参照" label_selected="参照" name="set_cache"/>
+	<button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location"/>
+	<text name="UI Size:">
+		ＵＩのサイズ：
+	</text>
+	<text name="HUD Size:">
+		ＨＵＤのスケール：
+	</text>
+	<check_box label="スクリプトのエラーを表示：" name="show_script_errors"/>
+	<radio_group name="show_location">
+		<radio_item label="近隣チャット" name="0"/>
+		<radio_item label="別々のウィンドウ" name="1"/>
+	</radio_group>
+	<check_box label="複数のビューアを許可" name="allow_multiple_viewer_check"/>
+	<check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check"/>
+	<check_box label="拡張メニューを表示" name="show_advanced_menu_check"/>
+	<check_box label="開発メニューを表示" name="show_develop_menu_check"/>
+	<button label="記録済みのユーザ名" name="remembered_usernames"/>
+	<button label="デフォルトの作成権限" name="default_creation_permissions"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 49a7aaee90..1137907fec 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ポップアップ" name="popups" title="ポップアップ">
-  <text name="tell_me_label">知らせる：</text>
-  <check_box label="L$の使用時" name="notify_money_spend_checkbox" />
-  <check_box label="フレンドのログイン状態変化時" name="friends_online_notify_checkbox" />
-  <check_box label="L$の入手時" name="notify_money_received_checkbox" />
-  <text name="show_label">常に表示するメッセージ：</text>
-  <text name="dont_show_label">表示しないメッセージ：</text>
-</panel>
\ No newline at end of file
+	<text name="tell_me_label">
+		知らせる：
+	</text>
+	<check_box label="L$の使用時" name="notify_money_spend_checkbox"/>
+	<check_box label="フレンドのログイン状態変化時" name="friends_online_notify_checkbox"/>
+	<check_box label="L$の入手時" name="notify_money_received_checkbox"/>
+	<text name="show_label">
+		常に表示するメッセージ：
+	</text>
+	<text name="dont_show_label">
+		表示しないメッセージ：
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 63fed75b7d..dd11296729 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,91 +1,114 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-  <check_box initial_value="true" label="近隣チャットでジェスチャーを自動補完する" name="auto_complete_gestures" />
-  <panel name="general_chat_settings">
-    <check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation" />
-    <check_box label="オフライン時に受け取ったＩＭはメールで受信する" name="send_im_to_email" />
-    <check_box label="フレンドとグループ以外からのコールとＩＭは受信しない" name="voice_call_friends_only_check" />
-    <text name="email_settings">[https://accounts.secondlife.com/change_email?lang=ja オフライン時のＩＭのメール送信先の設定]</text>
-    <text name="font_size">文字の大きさ：</text>
-    <combo_box name="chat_font_size">
-      <item label="小" name="Small" value="0" />
-      <item label="中" name="Medium" value="1" />
-      <item label="大" name="Large" value="2" />
-    </combo_box>
-    <check_box label="吹き出しチャット" name="bubble_text_chat" />
-  </panel>
-  <panel name="im_notification_settings">
-    <text name="friend_ims">フレンドＩＭ：</text>
-    <combo_box name="FriendIMOptions">
-      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
-      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
-      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
-      <item label="動作なし" name="NoAction" value="noaction" />
-    </combo_box>
-    <check_box label="サウンドを再生" name="play_sound_friend_im" />
-    <text name="non_friend_ims">フレンドのいないＩＭ：</text>
-    <combo_box name="NonFriendIMOptions">
-      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
-      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
-      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
-      <item label="動作なし" name="NoAction" value="noaction" />
-    </combo_box>
-    <check_box label="サウンドを再生" name="play_sound_non_friend_im" />
-    <text name="conference_ims">会話ＩＭ：</text>
-    <combo_box name="ConferenceIMOptions">
-      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
-      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
-      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
-      <item label="動作なし" name="NoAction" value="noaction" />
-    </combo_box>
-    <check_box label="サウンドを再生" name="play_sound_conference_im" />
-    <text name="group_chat">グループチャット：</text>
-    <combo_box name="GroupChatOptions">
-      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
-      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
-      <item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ" />
-      <item label="動作なし" name="NoAction" value="noaction" />
-    </combo_box>
-    <check_box label="サウンドを再生" name="play_sound_group_chat_im" />
-    <text name="nearby_chat">近隣チャット：</text>
-    <combo_box name="NearbyChatOptions">
-      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
-      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
-      <item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ" />
-      <item label="動作なし" name="NoAction" value="noaction" />
-    </combo_box>
-    <check_box label="サウンドを再生" name="play_sound_nearby_chat_im" />
-    <text name="object_ims">オブジェクトによるＩＭ：</text>
-    <combo_box name="ObjectIMOptions">
-      <item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations" />
-      <item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト" />
-      <item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ" />
-      <item label="動作なし" name="NoAction" value="noaction" />
-    </combo_box>
-    <check_box label="サウンドを再生" name="play_sound_object_im" />
-    <text name="notifications_alert">一時的にすべての通知を停止するには、「コミュニケーション」＞「着信拒否」を使用します。</text>
-  </panel>
-  <panel name="play_sound_settings">
-    <text name="play_sound">サウンドを再生：</text>
-    <check_box label="新しい会話" name="new_conversation" />
-    <check_box label="受信音声コール" name="incoming_voice_call" />
-    <check_box label="テレポートを送る" name="teleport_offer" />
-    <check_box label="インベントリを送る" name="inventory_offer" />
-  </panel>
-  <panel name="log_settings">
-    <text name="logging_label">保存：</text>
-    <combo_box name="conversation_log_combo">
-      <!-- TODO: Transscript翻訳が疑わしい -->
-      <item label="ログとテキストチャット" name="log_and_transcripts" value="2" />
-      <item label="ログのみ" name="log_only" value="1" />
-      <item label="ログかテキストチャットなし" name="no_log_or_transcript" value="0" />
-    </combo_box>
-    <button label="ログを消去…" name="clear_log" />
-    <button label="テキストチャットを削除…" name="delete_transcripts" />
-    <text name="log_location_label">場所：</text>
-    <button label="参照…" label_selected="参照" name="log_path_button" />
-  </panel>
-  <button label="他の言語…" name="ok_btn" />
-  <button label="自動置換…" name="autoreplace_showgui" />
-  <button label="スペルチェック…" name="spellcheck_showgui" />
-</panel>
\ No newline at end of file
+	<check_box initial_value="true" label="近隣チャットでジェスチャーを自動補完する" name="auto_complete_gestures"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+		<check_box label="オフライン時に受け取ったＩＭはメールで受信する" name="send_im_to_email"/>
+		<check_box label="フレンドとグループ以外からのコールとＩＭは受信しない" name="voice_call_friends_only_check"/>
+		<text name="email_settings">
+			[https://accounts.secondlife.com/change_email?lang=ja オフライン時のＩＭのメール送信先の設定]
+		</text>
+		<text name="font_size">
+			文字の大きさ：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			フレンドＩＭ：
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			フレンドのいないＩＭ：
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			会話ＩＭ：
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			グループチャット：
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			近隣チャット：
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			オブジェクトによるＩＭ：
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			一時的にすべての通知を停止するには、「コミュニケーション」＞「着信拒否」を使用します。
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			サウンドを再生：
+		</text>
+		<check_box label="新しい会話" name="new_conversation"/>
+		<check_box label="受信音声コール" name="incoming_voice_call"/>
+		<check_box label="テレポートを送る" name="teleport_offer"/>
+		<check_box label="インベントリを送る" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<text name="logging_label">
+			保存：
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="ログとテキストチャット" name="log_and_transcripts" value="2"/>
+			<item label="ログのみ" name="log_only" value="1"/>
+			<item label="ログかテキストチャットなし" name="no_log_or_transcript" value="0"/>
+		</combo_box>
+		<button label="ログを消去…" name="clear_log"/>
+		<button label="テキストチャットを削除…" name="delete_transcripts"/>
+		<text name="log_location_label">
+			場所：
+		</text>
+		<button label="参照…" label_selected="参照" name="log_path_button"/>
+	</panel>
+	<button label="他の言語…" name="ok_btn"/>
+	<button label="自動置換…" name="autoreplace_showgui"/>
+	<button label="スペルチェック…" name="spellcheck_showgui"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index 2ed930c9ca..b740f85806 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
@@ -1,20 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="色" name="colors_panel">
-  <text name="effects_color_textbox">自分のエフェクト（選択ビーム）：</text>
-  <color_swatch name="effect_color_swatch" tool_tip="クリックしてカラーピッカーを開きます" />
-  <text name="font_colors">チャットの文字の色</text>
-  <text name="text_box1">自分</text>
-  <text name="text_box2">他人</text>
-  <text name="text_box3">オブジェクト</text>
-  <text name="text_box4">システム</text>
-  <text name="text_box5">エラー</text>
-  <text name="text_box10">ダイレクト</text>
-  <text name="text_box7">所有者</text>
-  <text name="text_box9">ＵＲＬ</text>
-  <text name="bubble_chat">名前の表示の背景色（吹き出しチャットにも適用）：</text>
-  <color_swatch name="background" tool_tip="名前の表示色を選択" />
-  <slider label="不透明度：" name="bubble_chat_opacity" tool_tip="名前の表示の不透明度を選択" />
-  <text name="floater_opacity">フローターの透過度：</text>
-  <slider label="アクティブなフローター：" name="active" />
-  <slider label="非アクティブなフローター：" name="inactive" />
-</panel>
\ No newline at end of file
+	<text name="effects_color_textbox">
+		自分のエフェクト（選択ビーム）：
+	</text>
+	<color_swatch name="effect_color_swatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="font_colors">
+		チャットの文字の色
+	</text>
+	<text name="text_box1">
+		自分
+	</text>
+	<text name="text_box2">
+		他人
+	</text>
+	<text name="text_box3">
+		オブジェクト
+	</text>
+	<text name="text_box4">
+		システム
+	</text>
+	<text name="text_box5">
+		エラー
+	</text>
+	<text name="text_box10">
+		ダイレクト
+	</text>
+	<text name="text_box7">
+		所有者
+	</text>
+	<text name="text_box9">
+		ＵＲＬ
+	</text>
+	<text name="bubble_chat">
+		名前の表示の背景色（吹き出しチャットにも適用）：
+	</text>
+	<color_swatch name="background" tool_tip="名前の表示色を選択"/>
+	<slider label="不透明度：" name="bubble_chat_opacity" tool_tip="名前の表示の不透明度を選択"/>
+	<text name="floater_opacity">
+		フローターの透過度：
+	</text>
+	<slider label="アクティブなフローター：" name="active"/>
+	<slider label="非アクティブなフローター：" name="inactive"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml b/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
index 9e4122af4b..03c9b83fce 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="操作設定" name="controls">
-  <combo_box name="key_mode">
-    <combo_box.item label="三人称視点のとき" name="third_person" value="1" />
-    <combo_box.item label="一人称視点のとき（マウスルック）" name="first_person" value="0" />
-    <combo_box.item label="アバター編集時" name="edit_avatar" value="2" />
-    <combo_box.item label="着席時" name="sitting" value="3" />
-  </combo_box>
-  <button label="デフォルトに戻す" tool_tip="すべての操作設定をデフォルト値に戻します。" name="restore_defaults" />
-  <scroll_list name="controls_list" />
-</panel>
\ No newline at end of file
+	<combo_box name="key_mode">
+		<combo_box.item label="三人称視点のとき" name="third_person" value="1"/>
+		<combo_box.item label="一人称視点のとき（マウスルック）" name="first_person" value="0"/>
+		<combo_box.item label="アバター編集時" name="edit_avatar" value="2"/>
+		<combo_box.item label="着席時" name="sitting" value="3"/>
+	</combo_box>
+	<button label="デフォルトに戻す" tool_tip="すべての操作設定をデフォルト値に戻します。" name="restore_defaults"/>
+	<scroll_list name="controls_list"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 9b8b4d352a..9309dda5af 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -1,56 +1,72 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_panel">
-  <text name="language_textbox">言語：</text>
-  <combo_box name="language_combobox">
-    <combo_box.item label="English （英語）" name="English" />
-    <combo_box.item label="Dansk（デンマーク語）－ベータ" name="Danish" />
-    <combo_box.item label="Deutsch（ドイツ語）－ベータ" name="Deutsch(German)" />
-    <combo_box.item label="Español（スペイン語）－ベータ" name="Spanish" />
-    <combo_box.item label="Français（フランス語）－ベータ" name="French" />
-    <combo_box.item label="Italiano（イタリア語）－ベータ" name="Italian" />
-    <combo_box.item label="Polski（ポーランド語）－ベータ" name="Polish" />
-    <combo_box.item label="Português（ポルトガル語）－ベータ" name="Portugese" />
-    <combo_box.item label="Русский（ロシア語）－ベータ" name="Russian" />
-    <combo_box.item label="Türkçe（トルコ語）－ベータ" name="Turkish" />
-    <combo_box.item label="日本語－ベータ" name="(Japanese)" />
-    <combo_box.item label="正體中文（簡体字中国語）－ベータ版" name="Traditional Chinese" />
-  </combo_box>
-  <text name="language_textbox2">（再起動後に反映）</text>
-  <text name="maturity_desired_prompt">アクセスしたいコンテンツ：</text>
-  <text name="maturity_desired_textbox" />
-  <combo_box name="maturity_desired_combobox">
-    <combo_box.item label="General、Moderate、Adult" name="Desired_Adult" />
-    <combo_box.item label="GeneralとModerate" name="Desired_Mature" />
-    <combo_box.item label="General" name="Desired_PG" />
-  </combo_box>
-  <check_box label="ログイン画面にお気に入りの場所を表示" name="favorites_on_login_check" />
-  <text name="favorites_check_extra_text">（このコンピュータを使用する他の人にも表示されます）</text>
-  <text name="name_tags_textbox">名前の表示：</text>
-  <radio_group name="Name_Tag_Preference">
-    <radio_item label="オフ" name="radio" value="0" />
-    <radio_item label="オン" name="radio2" value="1" />
-    <radio_item label="一時的に表示" name="radio3" value="2" />
-  </radio_group>
-  <check_box label="マイネーム" name="show_my_name_checkbox1" />
-  <check_box label="ユーザー名" name="show_slids" tool_tip="bobsmith123 などユーザー名を表示" />
-  <check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサーまたはメンバーなど、グループタイトルを表示" />
-  <check_box label="フレンドをハイライト表示" name="show_friends" tool_tip="フレンドの名前をハイライト表示" />
-  <check_box label="表示名を表示" name="display_names_check" tool_tip="これを選択すると、チャット、ＩＭなどで表示名が表示されます。" />
-
-  <text name="inworld_typing_rg_label">特定キーを押したときの動作：</text>
-  <radio_group name="inworld_typing_preference">
-    <radio_item label="チャットを始める" name="radio_start_chat" value="1" />
-    <radio_item label="移動する（WSADなど）" name="radio_move" value="0" />
-  </radio_group>
-
-  <text name="title_afk_text">「離席」とするまでの時間：</text>
-  <combo_box label="「離席」とするまでの時間：" name="afk">
-    <combo_box.item label="２分" name="item0" />
-    <combo_box.item label="５分" name="item1" />
-    <combo_box.item label="１０分" name="item2" />
-    <combo_box.item label="３０分" name="item3" />
-    <combo_box.item label="離席設定なし" name="item4" />
-  </combo_box>
-  <text name="text_box3">「着信拒否」時の応答：</text>
-  <text_editor name="do_not_disturb_response">log_in_to_change</text_editor>
-</panel>
\ No newline at end of file
+	<text name="language_textbox">
+		言語：
+	</text>
+	<combo_box name="language_combobox">
+		<combo_box.item label="English （英語）" name="English"/>
+		<combo_box.item label="Dansk（デンマーク語）－ベータ" name="Danish"/>
+		<combo_box.item label="Deutsch（ドイツ語）－ベータ" name="Deutsch(German)"/>
+		<combo_box.item label="Español（スペイン語）－ベータ" name="Spanish"/>
+		<combo_box.item label="Français（フランス語）－ベータ" name="French"/>
+		<combo_box.item label="Italiano（イタリア語）－ベータ" name="Italian"/>
+		<combo_box.item label="Polski（ポーランド語）－ベータ" name="Polish"/>
+		<combo_box.item label="Português（ポルトガル語）－ベータ" name="Portugese"/>
+		<combo_box.item label="Русский（ロシア語）－ベータ" name="Russian"/>
+		<combo_box.item label="Türkçe（トルコ語）－ベータ" name="Turkish"/>
+		<combo_box.item label="日本語－ベータ" name="(Japanese)"/>
+		<combo_box.item label="正體中文（簡体字中国語）－ベータ版" name="Traditional Chinese"/>
+	</combo_box>
+	<text name="language_textbox2">
+		（再起動後に反映）
+	</text>
+	<text name="maturity_desired_prompt">
+		アクセスしたいコンテンツ：
+	</text>
+	<text name="maturity_desired_textbox"/>
+	<combo_box name="maturity_desired_combobox">
+		<combo_box.item label="General、Moderate、Adult" name="Desired_Adult"/>
+		<combo_box.item label="GeneralとModerate" name="Desired_Mature"/>
+		<combo_box.item label="General" name="Desired_PG"/>
+	</combo_box>
+	<check_box label="ログイン画面にお気に入りの場所を表示" name="favorites_on_login_check"/>
+	<text name="favorites_check_extra_text">
+		（このコンピュータを使用する他の人にも表示されます）
+	</text>
+	<text name="name_tags_textbox">
+		名前の表示：
+	</text>
+	<radio_group name="Name_Tag_Preference">
+		<radio_item label="オフ" name="radio" value="0"/>
+		<radio_item label="オン" name="radio2" value="1"/>
+		<radio_item label="一時的に表示" name="radio3" value="2"/>
+	</radio_group>
+	<check_box label="マイネーム" name="show_my_name_checkbox1"/>
+	<check_box label="ユーザー名" name="show_slids" tool_tip="bobsmith123 などユーザー名を表示"/>
+	<check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサーまたはメンバーなど、グループタイトルを表示"/>
+	<check_box label="フレンドをハイライト表示" name="show_friends" tool_tip="フレンドの名前をハイライト表示"/>
+	<check_box label="表示名を表示" name="display_names_check" tool_tip="これを選択すると、チャット、ＩＭなどで表示名が表示されます。"/>
+	<text name="inworld_typing_rg_label">
+		特定キーを押したときの動作：
+	</text>
+	<radio_group name="inworld_typing_preference">
+		<radio_item label="チャットを始める" name="radio_start_chat" value="1"/>
+		<radio_item label="移動する（WSADなど）" name="radio_move" value="0"/>
+	</radio_group>
+	<text name="title_afk_text">
+		「離席」とするまでの時間：
+	</text>
+	<combo_box label="「離席」とするまでの時間：" name="afk">
+		<combo_box.item label="２分" name="item0"/>
+		<combo_box.item label="５分" name="item1"/>
+		<combo_box.item label="１０分" name="item2"/>
+		<combo_box.item label="３０分" name="item3"/>
+		<combo_box.item label="離席設定なし" name="item4"/>
+	</combo_box>
+	<text name="text_box3">
+		「着信拒否」時の応答：
+	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 0f36d31d79..79a4689526 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,56 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="グラフィック" name="Display panel">
-  <text follows="top|left|right" height="16" layout="topleft" left="5" top="5" width="100">使用中のプリセット：</text>
-
-  <text name="preset_text">（なし）</text>
-
-  <text name="QualitySpeed">品質と速度：</text>
-  <text name="ShadersPrefText">低</text>
-  <text name="ShadersPrefText2">中</text>
-  <text name="ShadersPrefText3">高</text>
-  <text name="ShadersPrefText4">最高</text>
-  <text name="FasterText">速度優先</text>
-  <text name="BetterText">品質優先</text>
-  <icon name="LowGraphicsDivet" />
-  <icon name="LowMidGraphicsDivet" />
-  <icon name="MidGraphicsDivet" />
-  <icon name="MidHighGraphicsDivet" />
-  <icon name="HighGraphicsDivet" />
-  <icon name="HighUltraGraphicsDivet" />
-  <icon name="UltraGraphicsDivet" />
-  <slider name="QualityPerformanceSelection" />
-
-  <!-- This block shows Basic Settings -->
-
-  <slider control_name="RenderFarClip" label="描画距離：" name="DrawDistance" />
-  <text name="DrawDistanceMeterText2">ｍ</text>
-
-  <check_box initial_value="true" label="大気（周辺）シェーダー" name="WindLightUseAtmosShaders" />
-
-  <check_box initial_value="true" label="高度な光源モデル" name="UseLightShaders" />
-
-  <button label="自動調整" name="AutoAdjustmentsButton" />
-
-  <slider label="アバターの最大複雑度：" name="IndirectMaxComplexity" tool_tip="どの程度の複雑度で他のアバターをJellyDollとして描画するを設定します。" />
-  <text name="IndirectMaxComplexityText">0</text>
-  <text name="IndirectMaxComplexityLink">[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 これはなんですか？]</text>
-
-
-  <check_box label="フレンドは常に描画" name="AlwaysRenderFriends" />
-  <button label="例外…" name="RenderExceptionsButton" />
-
-  <!-- End of Basic Settings block -->
-
-  <button label="設定をプリセットとして保存…" name="PrefSaveButton" />
-
-  <button label="プリセットを読み込む…" name="PrefLoadButton" />
-
-  <button label="プリセットを削除…" name="PrefDeleteButton" />
-
-  <button label="プリセットを削除…" name="PrefDeleteButton" />
-
-  <button label="推奨設定にリセット" name="Defaults" />
-
-  <button label="拡張設定…" name="AdvancedSettings" />
-
-</panel>
\ No newline at end of file
+	<text follows="top|left|right" height="16" layout="topleft" left="5" top="5" width="100">
+		使用中のプリセット：
+	</text>
+	<text name="preset_text">
+		（なし）
+	</text>
+	<text name="QualitySpeed">
+		品質と速度：
+	</text>
+	<text name="ShadersPrefText">
+		低
+	</text>
+	<text name="ShadersPrefText2">
+		中
+	</text>
+	<text name="ShadersPrefText3">
+		高
+	</text>
+	<text name="ShadersPrefText4">
+		最高
+	</text>
+	<text name="FasterText">
+		速度優先
+	</text>
+	<text name="BetterText">
+		品質優先
+	</text>
+	<icon name="LowGraphicsDivet"/>
+	<icon name="LowMidGraphicsDivet"/>
+	<icon name="MidGraphicsDivet"/>
+	<icon name="MidHighGraphicsDivet"/>
+	<icon name="HighGraphicsDivet"/>
+	<icon name="HighUltraGraphicsDivet"/>
+	<icon name="UltraGraphicsDivet"/>
+	<slider name="QualityPerformanceSelection"/>
+	<slider control_name="RenderFarClip" label="描画距離：" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		ｍ
+	</text>
+	<check_box initial_value="true" label="大気（周辺）シェーダー" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="高度な光源モデル" name="UseLightShaders"/>
+	<button label="自動調整" name="AutoAdjustmentsButton"/>
+	<slider label="アバターの最大複雑度：" name="IndirectMaxComplexity" tool_tip="どの程度の複雑度で他のアバターをJellyDollとして描画するを設定します。"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<text name="IndirectMaxComplexityLink">
+		[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 これはなんですか？]
+	</text>
+	<check_box label="フレンドは常に描画" name="AlwaysRenderFriends"/>
+	<button label="例外…" name="RenderExceptionsButton"/>
+	<button label="設定をプリセットとして保存…" name="PrefSaveButton"/>
+	<button label="プリセットを読み込む…" name="PrefLoadButton"/>
+	<button label="プリセットを削除…" name="PrefDeleteButton"/>
+	<button label="プリセットを削除…" name="PrefDeleteButton"/>
+	<button label="推奨設定にリセット" name="Defaults"/>
+	<button label="拡張設定…" name="AdvancedSettings"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml b/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
index 8173e57205..18aca0dafc 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="グリッド" name="grids">
-  <text name="add_grid_text">新しいグリッドを追加：</text>
-  <line_editor name="add_grid" label="ログインURIを入力" />
-  <button label="追加" name="add_grid_commit" />
-  <text name="manage_grid_text">グリッド管理：</text>
-  <scroll_list name="grid_list">
-    <scroll_list.columns label="グリッド名" name="grid_label" />
-    <scroll_list.columns label="ログインURI" name="login_uri" />
-    <scroll_list.commit_callback function="Pref.SelectGrid" />
-  </scroll_list>
-  <button label="有効化" name="activate_grid" />
-  <button label="リフレッシュ" name="refresh_grid" />
-  <button label="削除" name="remove_grid" />
-  <button label="デバッグ" name="debug_grid" />
-  <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" tool_tip="ログイン画面にグリッド選択を表示して、他のワールドにログインします。" />
-</panel>
\ No newline at end of file
+	<text name="add_grid_text">
+		新しいグリッドを追加：
+	</text>
+	<line_editor name="add_grid" label="ログインURIを入力"/>
+	<button label="追加" name="add_grid_commit"/>
+	<text name="manage_grid_text">
+		グリッド管理：
+	</text>
+	<scroll_list name="grid_list">
+		<scroll_list.columns label="グリッド名" name="grid_label"/>
+		<scroll_list.columns label="ログインURI" name="login_uri"/>
+		<scroll_list.commit_callback function="Pref.SelectGrid"/>
+	</scroll_list>
+	<button label="有効化" name="activate_grid"/>
+	<button label="リフレッシュ" name="refresh_grid"/>
+	<button label="削除" name="remove_grid"/>
+	<button label="デバッグ" name="debug_grid"/>
+	<check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" tool_tip="ログイン画面にグリッド選択を表示して、他のワールドにログインします。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
index bb1e62e505..57bcce66a5 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
@@ -1,31 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="移動" name="move_panel">
-  <icon name="camera_icon"/>
-  <slider label="視界角" name="camera_fov" />
-  <slider label="距離" name="camera_offset_scale" />
-  <text name="heading2">自動ポジション：</text>
-  <check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います" />
-  <check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います" />
-  <icon name="avatar_icon" />
-  <text name="keyboard_lbl">キーボード：</text>
-  <check_box label="方向キー押下時は、常に移動するようにする" name="arrow_keys_move_avatar_check" />
-  <check_box label="移動キー２度押し＋長押しで走る" name="tap_tap_hold_to_run" />
-  <check_box label="ジャンプまたはしゃがみキーを押し続けると、飛行を開始または停止します。" name="automatic_fly" />
-  <text name="mouse_lbl">マウス：</text>
-  <check_box label="一人称視点で表示する" name="first_person_avatar_visible" />
-  <text name=" Mouse Sensitivity">一人称視点時のマウスの感度：</text>
-  <check_box label="切り替え" name="invert_mouse" />
-  <text name="single_click_action_lbl">土地をシングルクリック：</text>
-  <combo_box name="single_click_action_combo">
-    <combo_box.item label="動作なし" name="0" value="0" />
-    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
-  </combo_box>
-  <text name="double_click_action_lbl">土地をダブルクリック：</text>
-  <combo_box name="double_click_action_combo">
-    <combo_box.item label="動作なし" name="0" value="0" />
-    <combo_box.item label="クリックされた地点に移動" name="1" value="1" />
-    <combo_box.item label="クリックされた地点にテレポート" name="2" value="2" />
-  </combo_box>
-  <check_box control_name="EnableCollisionSounds" label="ぶつかったときにサウンドを鳴らす" name="sound_on_collisions" />
-  <button label="その他のデバイス" name="joystick_setup_button" />
-</panel>
\ No newline at end of file
+	<icon name="camera_icon"/>
+	<slider label="視界角" name="camera_fov"/>
+	<slider label="距離" name="camera_offset_scale"/>
+	<text name="heading2">
+		自動ポジション：
+	</text>
+	<check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います"/>
+	<check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います"/>
+	<icon name="avatar_icon"/>
+	<text name="keyboard_lbl">
+		キーボード：
+	</text>
+	<check_box label="方向キー押下時は、常に移動するようにする" name="arrow_keys_move_avatar_check"/>
+	<check_box label="移動キー２度押し＋長押しで走る" name="tap_tap_hold_to_run"/>
+	<check_box label="ジャンプまたはしゃがみキーを押し続けると、飛行を開始または停止します。" name="automatic_fly"/>
+	<text name="mouse_lbl">
+		マウス：
+	</text>
+	<check_box label="一人称視点で表示する" name="first_person_avatar_visible"/>
+	<text name=" Mouse Sensitivity">
+		一人称視点時のマウスの感度：
+	</text>
+	<check_box label="切り替え" name="invert_mouse"/>
+	<text name="single_click_action_lbl">
+		土地をシングルクリック：
+	</text>
+	<combo_box name="single_click_action_combo">
+		<combo_box.item label="動作なし" name="0" value="0"/>
+		<combo_box.item label="クリックされた地点に移動" name="1" value="1"/>
+	</combo_box>
+	<text name="double_click_action_lbl">
+		土地をダブルクリック：
+	</text>
+	<combo_box name="double_click_action_combo">
+		<combo_box.item label="動作なし" name="0" value="0"/>
+		<combo_box.item label="クリックされた地点に移動" name="1" value="1"/>
+		<combo_box.item label="クリックされた地点にテレポート" name="2" value="2"/>
+	</combo_box>
+	<check_box control_name="EnableCollisionSounds" label="ぶつかったときにサウンドを鳴らす" name="sound_on_collisions"/>
+	<button label="その他のデバイス" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index d5aeeb81b3..7a857a2254 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -1,20 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット設定" name="im">
-  <panel.string name="log_in_to_change">ログインして変更</panel.string>
-  <button label="履歴を消去" name="clear_cache" tool_tip="ログイン画像、最後にいた場所、テレポート履歴、Web、テクスチャキャッシュを削除します" />
-  <text name="cache_size_label_l">（位置、画像、Web、検索履歴）</text>
-  <check_box label="プロフィールを検索結果に表示する" name="online_searchresults" />
-  <check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility" />
-  <check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check" />
-  <check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check" />
-  <check_box label="ログイン時にお気に入りのランドマークを表示（「開始地点」ドロップダウンメニュー経由）" name="favorites_on_login_check" />
-  <text name="Logs:">チャットログ：</text>
-  <check_box label="近隣チャットログをコンピューターに保存する" name="log_nearby_chat" />
-  <check_box label="ＩＭログをコンピューターに保存する" name="log_instant_messages" />
-  <check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im" />
-  <check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp" />
-  <text name="log_path_desc">ログの保存場所：</text>
-  <button label="参照" label_selected="参照" name="log_path_button" />
-  <button label="ブロックリスト" name="block_list" />
-  <text name="block_list_label">（あなたがブロックした住人／オブジェクト）</text>
-</panel>
\ No newline at end of file
+	<panel.string name="log_in_to_change">
+		ログインして変更
+	</panel.string>
+	<button label="履歴を消去" name="clear_cache" tool_tip="ログイン画像、最後にいた場所、テレポート履歴、Web、テクスチャキャッシュを削除します"/>
+	<text name="cache_size_label_l">
+		（位置、画像、Web、検索履歴）
+	</text>
+	<check_box label="プロフィールを検索結果に表示する" name="online_searchresults"/>
+	<check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility"/>
+	<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
+	<check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check"/>
+	<check_box label="ログイン時にお気に入りのランドマークを表示（「開始地点」ドロップダウンメニュー経由）" name="favorites_on_login_check"/>
+	<text name="Logs:">
+		チャットログ：
+	</text>
+	<check_box label="近隣チャットログをコンピューターに保存する" name="log_nearby_chat"/>
+	<check_box label="ＩＭログをコンピューターに保存する" name="log_instant_messages"/>
+	<check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im"/>
+	<check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp"/>
+	<text name="log_path_desc">
+		ログの保存場所：
+	</text>
+	<button label="参照" label_selected="参照" name="log_path_button"/>
+	<button label="ブロックリスト" name="block_list"/>
+	<text name="block_list_label">
+		（あなたがブロックした住人／オブジェクト）
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 3c485e46ac..f487bc32a9 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -1,27 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セットアップ" name="Input panel">
-  <text name="Network:">ネットワーク：</text>
-  <text name="Maximum bandwidth">最大帯域幅</text>
-  <text name="text_box2">kbps</text>
-  <check_box label="カスタムポート" name="connection_port_enabled" />
-  <spinner label="ポート番号：" name="connection_port" />
-  <text name="Web:">Web：</text>
-  <radio_group name="preferred_browser_behavior">
-    <radio_item label="すべてのリンクにデフォルトシステムのブラウザを使用します" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0" />
-    <radio_item label="Second Life リンクにのみ内蔵ブラウザを使用します" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します内蔵ブラウザは LindenLab/Second Life リンクにのみ使用されます。" value="1" />
-    <radio_item label="すべてのリンクに内蔵ブラウザを使用します" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME]内に新しいウィンドウでこのブラウザが開きます。" value="2" />
-  </radio_group>
-  <check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled" />
-  <check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled" />
-  <check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled" />
-  <text name="Software updates:">ソフトウェアの更新：</text>
-  <combo_box name="updater_service_combobox">
-    <combo_box.item label="各アップデートを自動的にインストールする" name="Install_automatically" />
-    <combo_box.item label="オプションのアップデートのインストール準備ができたら通知する" name="Install_ask" />
-    <combo_box.item label="必須アップデートのみインストールする" name="Install_manual" />
-  </combo_box>
-  <check_box label="release candidate にアップグレードします" name="update_willing_to_test" />
-  <check_box label="更新後にリリースノートを表示する" name="update_show_release_notes" />
-  <text name="Proxy Settings:">プロキシ設定：</text>
-  <button label="プロキシ設定を調整" label_selected="参照" name="set_proxy" />
-</panel>
\ No newline at end of file
+	<text name="Network:">
+		ネットワーク：
+	</text>
+	<text name="Maximum bandwidth">
+		最大帯域幅
+	</text>
+	<text name="text_box2">
+		kbps
+	</text>
+	<check_box label="カスタムポート" name="connection_port_enabled"/>
+	<spinner label="ポート番号：" name="connection_port"/>
+	<text name="Web:">
+		Web：
+	</text>
+	<radio_group name="preferred_browser_behavior">
+		<radio_item label="すべてのリンクにデフォルトシステムのブラウザを使用します" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0"/>
+		<radio_item label="Second Life リンクにのみ内蔵ブラウザを使用します" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します内蔵ブラウザは LindenLab/Second Life リンクにのみ使用されます。" value="1"/>
+		<radio_item label="すべてのリンクに内蔵ブラウザを使用します" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME]内に新しいウィンドウでこのブラウザが開きます。" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled"/>
+	<check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled"/>
+	<check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled"/>
+	<text name="Software updates:">
+		ソフトウェアの更新：
+	</text>
+	<combo_box name="updater_service_combobox">
+		<combo_box.item label="各アップデートを自動的にインストールする" name="Install_automatically"/>
+		<combo_box.item label="オプションのアップデートのインストール準備ができたら通知する" name="Install_ask"/>
+		<combo_box.item label="必須アップデートのみインストールする" name="Install_manual"/>
+	</combo_box>
+	<check_box label="release candidate にアップグレードします" name="update_willing_to_test"/>
+	<check_box label="更新後にリリースノートを表示する" name="update_show_release_notes"/>
+	<text name="Proxy Settings:">
+		プロキシ設定：
+	</text>
+	<button label="プロキシ設定を調整" label_selected="参照" name="set_proxy"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 2d9a01d2d7..3956e07bf8 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -1,53 +1,61 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="サウンド" name="Preference Media panel">
-  <panel.string name="middle_mouse">中央のボタン</panel.string>
-  <panel.string name="button4_mouse">４ボタン</panel.string>
-  <panel.string name="button5_mouse">５ボタン</panel.string>
-  <slider label="全体のボリューム" name="System Volume" />
-  <button name="mute_audio" />
-  <check_box name="mute_when_minimized" />
-  <!-- *HACK 
-  After storm-1109 will be fixed: instead of using this text_box, word_wrap should be applied for
-  "mute_when_minimized" check_box's label.-->
-  <text name="mute_chb_label">最小化時にミュート</text>
-  <slider label="ボタン" name="UI Volume" />
-
-  <button name="mute_audio" />
-  <slider label="環境音" name="Wind Volume" />
-  <button name="mute_audio" />
-  <slider label="効果音" name="SFX Volume" />
-  <button name="mute_audio" />
-  <slider label="ストリーミング音楽" name="Music Volume" />
-
-  <button name="mute_audio" />
-  <check_box label="有効" name="enable_music" />
-  <slider label="メディア" name="Media Volume" />
-  <button name="mute_audio" />
-  <check_box label="有効" name="enable_media" />
-  <slider label="ボイスチャット" name="Voice Volume" />
-  <button name="mute_audio" />
-  <check_box label="有効" name="enable_voice_check" />
-  <!-- -->
-  <text name="Listen media from">メディアとサウンドの聞き取り位置：</text>
-  <radio_group name="media_ear_location">
-    <radio_item label="カメラの位置" name="0" />
-    <radio_item label="アバターの位置" name="1" />
-  </radio_group>
-  <check_box name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします。" label="他のアバターに取り付けられたメディアを再生する" />
-  <text name="media_autoplay_label">メディアの自動再生</text>
-  <combo_box name="media_auto_play_combo">
-    <item label="再生しない" name="autoplay_disabled" value="0" />
-    <item label="常に再生" name="autoplay_enabled" value="1" />
-    <item label="その都度確認" name="autoplay_ask" value="2" />
-  </combo_box>
-  <text name="Listen from">ボイスの聞き取り位置：</text>
-  <radio_group name="ear_location">
-    <radio_item label="カメラの位置" name="0" />
-    <radio_item label="アバターの位置" name="1" />
-  </radio_group>
-  <check_box label="喋るときにアバターの口を動かす" name="enable_lip_sync" />
-  <check_box label="ボイスチャットをトグルモードにする" name="push_to_talk_toggle_check" tool_tip="トグルモードでは、トリガーキーを押すことでマイクのオン／オフを切り替えます。そうでない場合は、トリガーキーを押している間だけマイクがオンになります。" />
-  <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーからのサウンドを聞くにはこれを選択" label="ゼスチャーのサウンドを再生" />
-  <button label=入出力機器の設定" name="device_settings_btn" />
-  <panel name="device_settings_panel" />
-</panel>
\ No newline at end of file
+	<panel.string name="middle_mouse">
+		中央のボタン
+	</panel.string>
+	<panel.string name="button4_mouse">
+		４ボタン
+	</panel.string>
+	<panel.string name="button5_mouse">
+		５ボタン
+	</panel.string>
+	<slider label="全体のボリューム" name="System Volume"/>
+	<button name="mute_audio"/>
+	<check_box name="mute_when_minimized"/>
+	<text name="mute_chb_label">
+		最小化時にミュート
+	</text>
+	<slider label="ボタン" name="UI Volume"/>
+	<button name="mute_audio"/>
+	<slider label="環境音" name="Wind Volume"/>
+	<button name="mute_audio"/>
+	<slider label="効果音" name="SFX Volume"/>
+	<button name="mute_audio"/>
+	<slider label="ストリーミング音楽" name="Music Volume"/>
+	<button name="mute_audio"/>
+	<check_box label="有効" name="enable_music"/>
+	<slider label="メディア" name="Media Volume"/>
+	<button name="mute_audio"/>
+	<check_box label="有効" name="enable_media"/>
+	<slider label="ボイスチャット" name="Voice Volume"/>
+	<button name="mute_audio"/>
+	<check_box label="有効" name="enable_voice_check"/>
+	<text name="Listen media from">
+		メディアとサウンドの聞き取り位置：
+	</text>
+	<radio_group name="media_ear_location">
+		<radio_item label="カメラの位置" name="0"/>
+		<radio_item label="アバターの位置" name="1"/>
+	</radio_group>
+	<check_box name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします。" label="他のアバターに取り付けられたメディアを再生する"/>
+	<text name="media_autoplay_label">
+		メディアの自動再生
+	</text>
+	<combo_box name="media_auto_play_combo">
+		<item label="再生しない" name="autoplay_disabled" value="0"/>
+		<item label="常に再生" name="autoplay_enabled" value="1"/>
+		<item label="その都度確認" name="autoplay_ask" value="2"/>
+	</combo_box>
+	<text name="Listen from">
+		ボイスの聞き取り位置：
+	</text>
+	<radio_group name="ear_location">
+		<radio_item label="カメラの位置" name="0"/>
+		<radio_item label="アバターの位置" name="1"/>
+	</radio_group>
+	<check_box label="喋るときにアバターの口を動かす" name="enable_lip_sync"/>
+	<check_box label="ボイスチャットをトグルモードにする" name="push_to_talk_toggle_check" tool_tip="トグルモードでは、トリガーキーを押すことでマイクのオン／オフを切り替えます。そうでない場合は、トリガーキーを押している間だけマイクがオンになります。"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーからのサウンドを聞くにはこれを選択" label="ゼスチャーのサウンドを再生"/>
+	<button label="入出力機器の設定" name="device_settings_btn"/>
+	<panel name="device_settings_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
index 2abebfffd3..198b836610 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アップロード" name="uploads">
-  <text name="title">アップロード先のフォルダ</text>
-  <text name="title_models">画像</text>
-  <text name="title_sounds">サウンド</text>
-  <text name="title_animation">アニメーション</text>
-  <text name="title_model">モデル</text>
-  <text name="upload_help">宛先フォルダを変更するには、インベントリでそのフォルダを右クリックして、
-「デフォルトとして使用」を選択します。</text>
-</panel>
\ No newline at end of file
+	<text name="title">
+		アップロード先のフォルダ
+	</text>
+	<text name="title_models">
+		画像
+	</text>
+	<text name="title_sounds">
+		サウンド
+	</text>
+	<text name="title_animation">
+		アニメーション
+	</text>
+	<text name="title_model">
+		モデル
+	</text>
+	<text name="upload_help">
+		宛先フォルダを変更するには、インベントリでそのフォルダを右クリックして、
+「デフォルトとして使用」を選択します。
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
index f2d3494fd8..8ef0da18a0 100644
--- a/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="presets_camera_pulldown">
-  <text name="Camera Presets">カメラのプリセット</text>
-  <scroll_list name="preset_camera_list" />
-  <view_border name="horiz_separator" />
-  <button name="open_prefs_btn" label="カメラのフローターを表示" tool_tip="カメラのフローターを起動する" />
-</panel>
\ No newline at end of file
+	<text name="Camera Presets">
+		カメラのプリセット
+	</text>
+	<scroll_list name="preset_camera_list"/>
+	<view_border name="horiz_separator"/>
+	<button name="open_prefs_btn" label="カメラのフローターを表示" tool_tip="カメラのフローターを起動する"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
index 06ee4f1b3a..b4504dd39a 100644
--- a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="presets_pulldown">
-  <text name="Graphic Presets">グラフィックのプリセット</text>
-  <scroll_list name="preset_list"/>
-  <view_border name="horiz_separator" />
-  <button name="open_prefs_btn" label="グラフィック初期設定" tool_tip="グラフィック設定を呼び出します。"/>
-  <button name="open_autofps_btn" label="自動ＦＰＳ設定" tool_tip="自動調整設定を呼び出します。" />
-</panel>
\ No newline at end of file
+	<text name="Graphic Presets">
+		グラフィックのプリセット
+	</text>
+	<scroll_list name="preset_list"/>
+	<view_border name="horiz_separator"/>
+	<button name="open_prefs_btn" label="グラフィック初期設定" tool_tip="グラフィック設定を呼び出します。"/>
+	<button name="open_autofps_btn" label="自動ＦＰＳ設定" tool_tip="自動調整設定を呼び出します。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 8aed758d1e..6c33bda5cd 100644
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -1,67 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="MediaControls">
-  <string name="control_background_image_name">Inspector_Background</string>
-  <string name="skip_step">0.2</string>
-  <layout_stack name="progress_indicator_area">
-    <layout_panel name="media_progress_indicator">
-      <progress_bar name="media_progress_bar" tool_tip="読み込んでいます…" />
-    </layout_panel>
-  </layout_stack>
-  <layout_stack name="media_controls">
-    <layout_panel name="back">
-      <button name="back_btn" tool_tip="前へ" />
-    </layout_panel>
-    <layout_panel name="fwd">
-      <button name="fwd_btn" tool_tip="次へ" />
-    </layout_panel>
-    <layout_panel name="home">
-      <button name="home_btn" tool_tip="ホームページ" />
-    </layout_panel>
-    <layout_panel name="media_stop">
-      <button name="media_stop_btn" tool_tip="メディアを停止" />
-    </layout_panel>
-    <layout_panel name="reload">
-      <button name="reload_btn" tool_tip="更新" />
-    </layout_panel>
-    <layout_panel name="stop">
-      <button name="stop_btn" tool_tip="読み込み停止" />
-    </layout_panel>
-    <layout_panel name="play">
-      <button name="play_btn" tool_tip="メディアを再生" />
-    </layout_panel>
-    <layout_panel name="pause">
-      <button name="pause_btn" tool_tip="メディアを一時停止" />
-    </layout_panel>
-    <layout_panel name="media_address">
-      <line_editor name="media_address_url" tool_tip="メディア URL" />
-      <layout_stack name="media_address_url_icons">
-        <layout_panel name="media_address_url_icons_wl">
-          <icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-    <layout_panel name="media_play_position">
-      <slider_bar name="media_play_slider" tool_tip="ムービー再生進行" />
-    </layout_panel>
-    <layout_panel name="skip_back">
-      <button name="skip_back_btn" tool_tip="前にステップ" />
-    </layout_panel>
-    <layout_panel name="skip_forward">
-      <button name="skip_forward_btn" tool_tip="次にステップ" />
-    </layout_panel>
-    <layout_panel name="media_volume">
-      <button name="media_mute_button" tool_tip="ミュート" />
-      <slider name="volume_slider" tool_tip="メディアの音量" />
-    </layout_panel>
-    <layout_panel name="zoom_frame">
-      <button name="zoom_frame_btn" tool_tip="メディアにズームイン" />
-    </layout_panel>
-    <layout_panel name="close">
-      <button name="close_btn" tool_tip="ズームバック" />
-    </layout_panel>
-    <layout_panel name="new_window">
-      <button name="new_window_btn" tool_tip="ＵＲＬをブラウザで開く" />
-    </layout_panel>
-  </layout_stack>
-  <icon name="media_secure_lock_flag" tool_tip="安全なブラウジング" />
-</panel>
\ No newline at end of file
+	<string name="control_background_image_name">
+		Inspector_Background
+	</string>
+	<string name="skip_step">
+		0.2
+	</string>
+	<layout_stack name="progress_indicator_area">
+		<layout_panel name="media_progress_indicator">
+			<progress_bar name="media_progress_bar" tool_tip="読み込んでいます…"/>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="media_controls">
+		<layout_panel name="back">
+			<button name="back_btn" tool_tip="前へ"/>
+		</layout_panel>
+		<layout_panel name="fwd">
+			<button name="fwd_btn" tool_tip="次へ"/>
+		</layout_panel>
+		<layout_panel name="home">
+			<button name="home_btn" tool_tip="ホームページ"/>
+		</layout_panel>
+		<layout_panel name="media_stop">
+			<button name="media_stop_btn" tool_tip="メディアを停止"/>
+		</layout_panel>
+		<layout_panel name="reload">
+			<button name="reload_btn" tool_tip="更新"/>
+		</layout_panel>
+		<layout_panel name="stop">
+			<button name="stop_btn" tool_tip="読み込み停止"/>
+		</layout_panel>
+		<layout_panel name="play">
+			<button name="play_btn" tool_tip="メディアを再生"/>
+		</layout_panel>
+		<layout_panel name="pause">
+			<button name="pause_btn" tool_tip="メディアを一時停止"/>
+		</layout_panel>
+		<layout_panel name="media_address">
+			<line_editor name="media_address_url" tool_tip="メディア URL"/>
+			<layout_stack name="media_address_url_icons">
+				<layout_panel name="media_address_url_icons_wl">
+					<icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="media_play_position">
+			<slider_bar name="media_play_slider" tool_tip="ムービー再生進行"/>
+		</layout_panel>
+		<layout_panel name="skip_back">
+			<button name="skip_back_btn" tool_tip="前にステップ"/>
+		</layout_panel>
+		<layout_panel name="skip_forward">
+			<button name="skip_forward_btn" tool_tip="次にステップ"/>
+		</layout_panel>
+		<layout_panel name="media_volume">
+			<button name="media_mute_button" tool_tip="ミュート"/>
+			<slider name="volume_slider" tool_tip="メディアの音量"/>
+		</layout_panel>
+		<layout_panel name="zoom_frame">
+			<button name="zoom_frame_btn" tool_tip="メディアにズームイン"/>
+		</layout_panel>
+		<layout_panel name="close">
+			<button name="close_btn" tool_tip="ズームバック"/>
+		</layout_panel>
+		<layout_panel name="new_window">
+			<button name="new_window_btn" tool_tip="ＵＲＬをブラウザで開く"/>
+		</layout_panel>
+	</layout_stack>
+	<icon name="media_secure_lock_flag" tool_tip="安全なブラウジング"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classified.xml b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
index 9129349310..6213c5deea 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
@@ -1,78 +1,110 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_profile_classified">
-  <panel.string name="type_mature">Moderate</panel.string>
-  <panel.string name="type_pg">General コンテンツ</panel.string>
-  <panel.string name="l$_price">L$[PRICE]</panel.string>
-  <panel.string name="click_through_text_fmt">[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</panel.string>
-  <panel.string name="date_fmt">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</panel.string>
-  <panel.string name="auto_renew_on">有効</panel.string>
-  <panel.string name="auto_renew_off">無効</panel.string>
-  <panel.string name="location_notice">（掲載後更新）</panel.string>
-  <string name="publish_label">掲載</string>
-  <string name="save_label">保存</string>
-  <scroll_container name="profile_scroll">
-    <panel name="info_scroll_content_panel">
-      <icon label="" name="edit_icon" tool_tip="クリックして画像を選択" />
-      <layout_stack name="info_panel">
-        <layout_panel name="main_info_panel">
-          <text_editor name="classified_name">[name]</text_editor>
-          <text name="classified_location_label" value="場所：" />
-          <text_editor name="classified_location" value="[loading...]" />
-          <text name="content_type_label" value="コンテンツの種類：" />
-          <text_editor name="content_type" value="[content type]" />
-          <text name="category_label" value="カテゴリ：" />
-          <text_editor name="category" value="[category]" />
-          <text name="creation_date_label" value="制作日：" />
-          <text_editor name="creation_date" tool_tip="制作日" value="[date]" />
-          <text name="price_for_listing_label" value="掲載価格：" />
-          <text_editor name="price_for_listing" tool_tip="掲載価格">[PRICE]</text_editor>
-        </layout_panel>
-        <layout_panel name="clickthrough_layout_panel">
-          <text name="click_through_label" value="クリック数：" />
-          <text_editor name="click_through_text" tool_tip="クリックスルーデータ" value="[clicks]" />
-        </layout_panel>
-        <layout_panel name="auto_renew_layout_panel">
-          <text name="auto_renew_label" value="自動更新：" />
-          <text name="auto_renew" value="有効" />
-        </layout_panel>
-        <layout_panel name="descr_layout_panel">
-          <text name="classified_desc_label" value="説明：" />
-          <text_editor name="classified_desc" value="[description]" />
-        </layout_panel>
-      </layout_stack>
-      <panel name="edit_panel">
-        <text name="Name:">タイトル：</text>
-        <text name="description_label">説明：</text>
-        <text name="location_label">場所：</text>
-        <text name="classified_location_edit">読み込んでいます…</text>
-        <button label="現在地に設定" name="set_to_curr_location_btn" />
-        <text name="category_label" value="カテゴリ：" />
-        <text name="content_type_label" value="コンテンツの種類：" />
-        <icons_combo_box label="General コンテンツ" name="content_type_edit">
-          <icons_combo_box.item label="Moderate コンテンツ" name="mature_ci" value="Mature" />
-          <icons_combo_box.item label="General コンテンツ" name="pg_ci" value="PG" />
-        </icons_combo_box>
-        <check_box label="毎週自動更新" name="auto_renew_edit" />
-        <text name="price_for_listing_edit_label" value="掲載価格：" />
-        <spinner label="L$" name="price_for_listing_edit" tool_tip="掲載価格。" value="50" />
-      </panel>
-    </panel>
-  </scroll_container>
-  <layout_stack name="edit_btns_pnl">
-    <layout_panel name="teleport_btn_lp">
-      <button label="テレポート" name="teleport_btn" />
-    </layout_panel>
-    <layout_panel name="map_btn_lp">
-      <button label="マップ" name="show_on_map_btn" />
-    </layout_panel>
-    <layout_panel name="edit_btn_lp">
-      <button label="編集" name="edit_btn" />
-    </layout_panel>
-    <layout_panel name="save_btn_lp">
-      <button label="[LABEL]" name="save_changes_btn" />
-    </layout_panel>
-    <layout_panel name="cancel_btn_lp">
-      <button label="キャンセル" name="cancel_btn" />
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<panel.string name="type_mature">
+		Moderate
+	</panel.string>
+	<panel.string name="type_pg">
+		General コンテンツ
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール
+	</panel.string>
+	<panel.string name="date_fmt">
+		[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日
+	</panel.string>
+	<panel.string name="auto_renew_on">
+		有効
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		無効
+	</panel.string>
+	<panel.string name="location_notice">
+		（掲載後更新）
+	</panel.string>
+	<string name="publish_label">
+		掲載
+	</string>
+	<string name="save_label">
+		保存
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="クリックして画像を選択"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="場所："/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="コンテンツの種類："/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="カテゴリ："/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="制作日："/>
+					<text_editor name="creation_date" tool_tip="制作日" value="[date]"/>
+					<text name="price_for_listing_label" value="掲載価格："/>
+					<text_editor name="price_for_listing" tool_tip="掲載価格">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="クリック数："/>
+					<text_editor name="click_through_text" tool_tip="クリックスルーデータ" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="自動更新："/>
+					<text name="auto_renew" value="有効"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="説明："/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					タイトル：
+				</text>
+				<text name="description_label">
+					説明：
+				</text>
+				<text name="location_label">
+					場所：
+				</text>
+				<text name="classified_location_edit">
+					読み込んでいます…
+				</text>
+				<button label="現在地に設定" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="カテゴリ："/>
+				<text name="content_type_label" value="コンテンツの種類："/>
+				<icons_combo_box label="General コンテンツ" name="content_type_edit">
+					<icons_combo_box.item label="Moderate コンテンツ" name="mature_ci" value="Mature"/>
+					<icons_combo_box.item label="General コンテンツ" name="pg_ci" value="PG"/>
+				</icons_combo_box>
+				<check_box label="毎週自動更新" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="掲載価格："/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="掲載価格。" value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="テレポート" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="マップ" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="編集" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="キャンセル" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
index fdb327625f..b6609a5b69 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="クラシファイド広告" name="panel_profile_classifieds">
-  <string name="no_classifieds" value="クラシファイド広告なし" />
-  <button label="新規…" name="new_btn" />
-  <button label="削除…" name="delete_btn" />
-  <text name="classifieds_panel_text">読み込んでいます…</text>
-</panel>
\ No newline at end of file
+	<string name="no_classifieds" value="クラシファイド広告なし"/>
+	<button label="新規…" name="new_btn"/>
+	<button label="削除…" name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		読み込んでいます…
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
index 22a0e619f6..4fc2c976e6 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="プロフィール" name="panel_profile_firstlife" />
+<panel label="プロフィール" name="panel_profile_firstlife"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_notes.xml b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
index 3408aafabe..7099555e37 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メモとプライバシー" name="panel_notes">
-  <text name="status_message" value="このアバターのプライベートメモ：" />
-  <text name="status_message2" value="このアバターに次の許可を与える：" />
-  <check_box label="自分のオンラインステータスを表示する" name="status_check" />
-  <check_box label="ワールドマップで自分を探せるようにする" name="map_check" />
-  <check_box label="自分のオブジェクトを編集・削除・取得できるようにする" name="objects_check" />
-</panel>
\ No newline at end of file
+	<text name="status_message" value="このアバターのプライベートメモ："/>
+	<text name="status_message2" value="このアバターに次の許可を与える："/>
+	<check_box label="自分のオンラインステータスを表示する" name="status_check"/>
+	<check_box label="ワールドマップで自分を探せるようにする" name="map_check"/>
+	<check_box label="自分のオブジェクトを編集・削除・取得できるようにする" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
index 6d9303e64d..3b952458d3 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_pick_info">
-  <panel.string name="location_notice">（掲載後更新）</panel.string>
-  <line_editor name="pick_location">（読み込んでいます…）</line_editor>
-  <button label="テレポート" name="teleport_btn" />
-  <button label="マップに表示" name="show_on_map_btn" />
-  <button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定" />
-  <button label="ピックを保存" name="save_changes_btn" />
-</panel>
\ No newline at end of file
+	<panel.string name="location_notice">
+		（掲載後更新）
+	</panel.string>
+	<line_editor name="pick_location">
+		（読み込んでいます…）
+	</line_editor>
+	<button label="テレポート" name="teleport_btn"/>
+	<button label="マップに表示" name="show_on_map_btn"/>
+	<button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定"/>
+	<button label="ピックを保存" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_picks.xml b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
index 4f2950f6b4..05d5225581 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ピック" name="panel_picks">
-  <string name="no_picks" value="ピックなし" />
-  <text name="Tell everyone about your favorite places in Second Life.">Second Lifeのお気に入りの場所を紹介しましょう。</text>
-  <button label="新規…" name="new_btn" />
-  <button label="削除…" name="delete_btn" />
-  <text name="picks_panel_text">読み込んでいます…</text>
-</panel>
\ No newline at end of file
+	<string name="no_picks" value="ピックなし"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Second Lifeのお気に入りの場所を紹介しましょう。
+	</text>
+	<button label="新規…" name="new_btn"/>
+	<button label="削除…" name="delete_btn"/>
+	<text name="picks_panel_text">
+		読み込んでいます…
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
index e278bfd4eb..71e223b90b 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
@@ -1,111 +1,85 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_profile" label="プロフィール">
-  <!--
-  Date from server comes already converted to stl timezone,
-  so display it as an UTC+0
-  -->
-  <string name="date_format" value="ＳＬでの誕生日：[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日" />
-  <string name="age_format" value="[AGE]経過" />
-  <string name="partner_text" value="パートナー：[LINK]" />
-  <string name="CaptionTextAcctInfo">アカウント：[ACCTTYPE]
-[PAYMENTINFO]</string>
-
-  <!--Badges-->
-  <string name="BadgeBeta" value="オリジナルβテスター" />
-  <string name="BadgeBetaLifetime" value="β会員" />
-  <string name="BadgeLifetime" value="会員" />
-  <string name="BadgeLinden" value="Linden Lab社員" />
-  <string name="BadgePremiumLifetime" value="プレミアム会員" />
-  <string name="BadgePremiumPlusLifetime" value="プレミアム・プラス会員" />
-
-  <layout_stack name="image_stack">
-    <layout_panel name="image_panel">
-
-      <icon name="2nd_life_pic" />
-
-      <loading_indicator name="image_upload_indicator" />
-    </layout_panel>
-
-    <layout_panel name="basics_panel">
-      <line_editor name="user_name" value="（読み込んでいます…）" />
-
-      <line_editor name="sl_birth_date" value="（読み込んでいます…）" />
-
-      <line_editor name="user_age" value="（読み込んでいます…）" />
-    </layout_panel>
-    <layout_panel name="partner_layout">
-      <text name="partner_link" value="パートナー：（読み込んでいます…）" />
-    </layout_panel>
-
-    <layout_panel name="partner_spacer_layout" />
-
-    <layout_panel name="badge_layout">
-      <icon name="badge_icon" />
-      <text name="badge_text" value="バッチのテスト" />
-    </layout_panel>
-
-    <layout_panel name="friend_layout">
-      <text name="friend_text" value="あなたはフレンドです。" />
-    </layout_panel>
-    <layout_panel name="online_layout">
-      <icon name="online_icon" />
-      <text name="online_text" value="オンライン" />
-    </layout_panel>
-    <layout_panel name="offline_layout">
-      <icon name="offline_icon" />
-      <text name="offline_text" value="オフライン" />
-    </layout_panel>
-    <layout_panel name="account_layout">
-      <text name="account_info" value="アカウント：（読み込んでいます…）" />
-    </layout_panel>
-    <layout_panel name="indicator_stack">
-      <loading_indicator name="progress_indicator" />
-    </layout_panel>
-    <layout_panel name="settings_panel">
-      <!-- only for self -->
-      <text name="search_label" value="自分のプロフィールを検索結果に反映：" />
-      <combo_box name="show_in_search" tool_tip="検索結果から、あなたを見つけてもらいましょう。">
-        <combo_box.item name="Hide" label="表示しない" value="0" />
-        <combo_box.item name="Show" label="表示する" value="1" />
-      </combo_box>
-    </layout_panel>
-
-    <layout_panel name="menu_panel">
-      <menu_button label="アクション" name="agent_actions_menu" />
-    </layout_panel>
-  </layout_stack>
-
-  <layout_stack name="main_stack">
-    <layout_panel name="display_name_panel">
-      <line_editor name="display_name" value="（読み込んでいます…）" />
-
-      <icon tool_tip="フレンドは、自分のオンライン状況を見ることができます。" name="can_see_online" />
-
-      <icon tool_tip="フレンドは、自分のオンライン状況を見ることができません。" name="cant_see_online" />
-
-      <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができます。" name="can_see_on_map" />
-
-      <icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができません。" name="cant_see_on_map" />
-
-      <icon tool_tip="フレンドは、自分のオブジェクトを編集できます。" name="can_edit_objects" />
-
-      <icon tool_tip="フレンドは、自分のオブジェクトを編集できません。" name="cant_edit_objects" />
-
-    </layout_panel>
-
-    <layout_panel name="about_panel">
-      <text_editor name="sl_description_edit" />
-    </layout_panel>
-    <layout_panel name="about_buttons_panel">
-      <button name="save_description_changes" label="保存" />
-      <button name="discard_description_changes" label="破棄" />
-      <view_border name="cost_text_border" />
-    </layout_panel>
-
-    <layout_panel name="groups_panel">
-      <text name="group_label" value="グループのメンバーシップ" />
-      <group_list name="group_list" />
-
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<string name="date_format" value="ＳＬでの誕生日：[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日"/>
+	<string name="age_format" value="[AGE]経過"/>
+	<string name="partner_text" value="パートナー：[LINK]"/>
+	<string name="CaptionTextAcctInfo">
+		アカウント：[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="BadgeBeta" value="オリジナルβテスター"/>
+	<string name="BadgeBetaLifetime" value="β会員"/>
+	<string name="BadgeLifetime" value="会員"/>
+	<string name="BadgeLinden" value="Linden Lab社員"/>
+	<string name="BadgePremiumLifetime" value="プレミアム会員"/>
+	<string name="BadgePremiumPlusLifetime" value="プレミアム・プラス会員"/>
+	<layout_stack name="image_stack">
+		<layout_panel name="image_panel">
+			<icon name="2nd_life_pic"/>
+			<loading_indicator name="image_upload_indicator"/>
+		</layout_panel>
+		<layout_panel name="basics_panel">
+			<line_editor name="user_name" value="（読み込んでいます…）"/>
+			<line_editor name="sl_birth_date" value="（読み込んでいます…）"/>
+			<line_editor name="user_age" value="（読み込んでいます…）"/>
+		</layout_panel>
+		<layout_panel name="partner_layout">
+			<text name="partner_link" value="パートナー：（読み込んでいます…）"/>
+		</layout_panel>
+		<layout_panel name="partner_spacer_layout"/>
+		<layout_panel name="badge_layout">
+			<icon name="badge_icon"/>
+			<text name="badge_text" value="バッチのテスト"/>
+		</layout_panel>
+		<layout_panel name="friend_layout">
+			<text name="friend_text" value="あなたはフレンドです。"/>
+		</layout_panel>
+		<layout_panel name="online_layout">
+			<icon name="online_icon"/>
+			<text name="online_text" value="オンライン"/>
+		</layout_panel>
+		<layout_panel name="offline_layout">
+			<icon name="offline_icon"/>
+			<text name="offline_text" value="オフライン"/>
+		</layout_panel>
+		<layout_panel name="account_layout">
+			<text name="account_info" value="アカウント：（読み込んでいます…）"/>
+		</layout_panel>
+		<layout_panel name="indicator_stack">
+			<loading_indicator name="progress_indicator"/>
+		</layout_panel>
+		<layout_panel name="settings_panel">
+			<text name="search_label" value="自分のプロフィールを検索結果に反映："/>
+			<combo_box name="show_in_search" tool_tip="検索結果から、あなたを見つけてもらいましょう。">
+				<combo_box.item name="Hide" label="表示しない" value="0"/>
+				<combo_box.item name="Show" label="表示する" value="1"/>
+			</combo_box>
+		</layout_panel>
+		<layout_panel name="menu_panel">
+			<menu_button label="アクション" name="agent_actions_menu"/>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="main_stack">
+		<layout_panel name="display_name_panel">
+			<line_editor name="display_name" value="（読み込んでいます…）"/>
+			<icon tool_tip="フレンドは、自分のオンライン状況を見ることができます。" name="can_see_online"/>
+			<icon tool_tip="フレンドは、自分のオンライン状況を見ることができません。" name="cant_see_online"/>
+			<icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができます。" name="can_see_on_map"/>
+			<icon tool_tip="フレンドは、自分がマップのどこにいるかを知ることができません。" name="cant_see_on_map"/>
+			<icon tool_tip="フレンドは、自分のオブジェクトを編集できます。" name="can_edit_objects"/>
+			<icon tool_tip="フレンドは、自分のオブジェクトを編集できません。" name="cant_edit_objects"/>
+		</layout_panel>
+		<layout_panel name="about_panel">
+			<text_editor name="sl_description_edit"/>
+		</layout_panel>
+		<layout_panel name="about_buttons_panel">
+			<button name="save_description_changes" label="保存"/>
+			<button name="discard_description_changes" label="破棄"/>
+			<view_border name="cost_text_border"/>
+		</layout_panel>
+		<layout_panel name="groups_panel">
+			<text name="group_label" value="グループのメンバーシップ"/>
+			<group_list name="group_list"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_web.xml b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
index 0fadec65d8..4091d4826c 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Web" name="panel_profile_web">
-  <panel.string name="LoadTime" value="ロード時間：[TIME]秒" />
-  <line_editor name="url_edit">（読み込んでいます…）</line_editor>
-  <flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。">
-    <flyout_button.item label="ビューア内のブラウザを開く" name="open_item" />
-    <flyout_button.item label="外部ブラウザを開く" name="home_item" />
-  </flyout_button>
-  <button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト" />
-</panel>
\ No newline at end of file
+	<panel.string name="LoadTime" value="ロード時間：[TIME]秒"/>
+	<line_editor name="url_edit">
+		（読み込んでいます…）
+	</line_editor>
+	<flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。">
+		<flyout_button.item label="ビューア内のブラウザを開く" name="open_item"/>
+		<flyout_button.item label="外部ブラウザを開く" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_progress.xml b/indra/newview/skins/default/xui/ja/panel_progress.xml
index 400a4a6bf2..7fd7d5ab5c 100644
--- a/indra/newview/skins/default/xui/ja/panel_progress.xml
+++ b/indra/newview/skins/default/xui/ja/panel_progress.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="login_progress_panel">
-  <layout_panel name="panel_icons"/>
-  <layout_stack name="vertical_centering"/>
-  <layout_panel name="panel4"/>
-  <layout_panel name="center"/>
-  <layout_stack name="horizontal_centering">
-    <text name="logos_lbl">セカンドライフ使用</text>
-  </layout_stack>
+	<layout_panel name="panel_icons"/>
+	<layout_stack name="vertical_centering"/>
+	<layout_panel name="panel4"/>
+	<layout_panel name="center"/>
+	<layout_stack name="horizontal_centering">
+		<text name="logos_lbl">
+			セカンドライフ使用
+		</text>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_access.xml b/indra/newview/skins/default/xui/ja/panel_region_access.xml
index b827cc0553..a8ff9cfe4e 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_access.xml
@@ -1,52 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アクセス" name="Access">
-  <tab_container name="tabs">
-    <panel label="不動産マネージャー" name="estate_managers_panel">
-      <text name="estate_manager_label">不動産マネージャー：</text>
-      <name_list name="estate_manager_name_list">
-        <columns label="名前" name="name" />
-      </name_list>
-      <button label="追加…" name="add_estate_manager_btn" />
-      <button label="削除…" name="remove_estate_manager_btn" />
-    </panel>
-    <panel label="許可" name="allowed_panel">
-      <panel label="top_panel" name="allowed_search_panel">
-        <filter_editor label="許可されたエージェントを検索" name="allowed_search_input" />
-        <button label="コピー" name="copy_allowed_list_btn" />
-      </panel>
-      <text name="allow_resident_label">常に許可：</text>
-      <name_list name="allowed_avatar_name_list">
-        <columns label="名前" name="name" />
-      </name_list>
-      <button label="追加…" name="add_allowed_avatar_btn" />
-      <button label="削除…" name="remove_allowed_avatar_btn" />
-    </panel>
-    <panel label="許可されたグループ" name="allowed_groups_panel">
-      <panel label="top_panel" name="allowed_group_search_panel">
-        <filter_editor label="許可されたグループを検索" name="allowed_group_search_input" />
-        <button label="コピー" name="copy_allowed_group_list_btn" />
-      </panel>
-      <text name="allow_group_label">常に許可されたグループ：</text>
-      <name_list name="allowed_group_name_list">
-        <columns label="名前" name="name" />
-      </name_list>
-      <button label="追加…" name="add_allowed_group_btn" />
-      <button label="削除…" name="remove_allowed_group_btn" />
-    </panel>
-    <panel label="禁止" name="banned_panel">
-      <panel label="top_panel" name="banned_search_panel">
-        <filter_editor label="禁止されたエージェントを検索" name="banned_search_input" />
-        <button label="コピー" name="copy_banned_list_btn" />
-      </panel>
-      <text name="ban_resident_label">常にバン：</text>
-      <name_list name="banned_avatar_name_list">
-        <columns label="名前" name="name" />
-        <columns label="最後にログインした日" name="last_login_date" />
-        <columns label="バンされた日付" name="ban_date" />
-        <columns label="バンした人：" name="bannedby" />
-      </name_list>
-      <button label="追加…" name="add_banned_avatar_btn" />
-      <button label="削除…" name="remove_banned_avatar_btn" />
-    </panel>
-  </tab_container>
-</panel>
\ No newline at end of file
+	<tab_container name="tabs">
+		<panel label="不動産マネージャー" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				不動産マネージャー：
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="名前" name="name"/>
+			</name_list>
+			<button label="追加…" name="add_estate_manager_btn"/>
+			<button label="削除…" name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="許可" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="許可されたエージェントを検索" name="allowed_search_input"/>
+				<button label="コピー" name="copy_allowed_list_btn"/>
+			</panel>
+			<text name="allow_resident_label">
+				常に許可：
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="名前" name="name"/>
+			</name_list>
+			<button label="追加…" name="add_allowed_avatar_btn"/>
+			<button label="削除…" name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="許可されたグループ" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="許可されたグループを検索" name="allowed_group_search_input"/>
+				<button label="コピー" name="copy_allowed_group_list_btn"/>
+			</panel>
+			<text name="allow_group_label">
+				常に許可されたグループ：
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="名前" name="name"/>
+			</name_list>
+			<button label="追加…" name="add_allowed_group_btn"/>
+			<button label="削除…" name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="禁止" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="禁止されたエージェントを検索" name="banned_search_input"/>
+				<button label="コピー" name="copy_banned_list_btn"/>
+			</panel>
+			<text name="ban_resident_label">
+				常にバン：
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="名前" name="name"/>
+				<columns label="最後にログインした日" name="last_login_date"/>
+				<columns label="バンされた日付" name="ban_date"/>
+				<columns label="バンした人：" name="bannedby"/>
+			</name_list>
+			<button label="追加…" name="add_banned_avatar_btn"/>
+			<button label="削除…" name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index b213f11d43..9b2239e0bb 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -1,30 +1,80 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="約款" name="Covenant">
-  <text font="SansSerifLarge" name="estate_section_lbl">不動産</text>
-  <text name="estate_name_lbl">名前：</text>
-  <text name="estate_name_text">メインランド</text>
-  <text name="estate_owner_lbl">所有者：</text>
-  <text name="estate_owner_text">（無）</text>
-  <text name="estate_cov_lbl">約款：</text>
-  <text name="covenant_timestamp_text">最終更新日：1969年12月31日（水）16:00:00</text>
-  <button label="?" name="covenant_help" />
-  <text_editor bottom="-263" height="178" name="covenant_editor">この不動産には約款がありません。</text_editor>
-  <button label="リセット" name="reset_covenant" />
-  <text name="covenant_help_text">約款の変更は不動産全区画に適用となります。</text>
-  <text name="covenant_instructions">この不動産約款を変更する際は、ノートカードをドラッグ＆ドロップしてください。</text>
-  <text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl">リージョン</text>
-  <text name="region_name_lbl">名前：</text>
-  <text name="region_name_text">エリカ</text>
-  <text name="region_landtype_lbl">種類：</text>
-  <text name="region_landtype_text">メインランド／入植地</text>
-  <text name="region_maturity_lbl">区分：</text>
-  <text name="region_maturity_text">アダルト</text>
-  <text name="resellable_lbl">再販：</text>
-  <text name="resellable_clause">このリージョン（地域）にある土地は再販できません。</text>
-  <text name="changeable_lbl">再分割：</text>
-  <text name="changeable_clause">このリージョン（地域）にある土地は統合または分割ができません。</text>
-  <string name="can_resell">このリージョン（地域）で購入した土地は、再販できます。</string>
-  <string name="can_not_resell">このリージョン（地域）の購入地は再販できないことがあります。</string>
-  <string name="can_change">このリージョン（地域）の購入地は統合または再分割できます。</string>
-  <string name="can_not_change">このリージョン（地域）の購入地は統合／再分割できないことがあります。</string>
-</panel>
\ No newline at end of file
+	<text font="SansSerifLarge" name="estate_section_lbl">
+		不動産
+	</text>
+	<text name="estate_name_lbl">
+		名前：
+	</text>
+	<text name="estate_name_text">
+		メインランド
+	</text>
+	<text name="estate_owner_lbl">
+		所有者：
+	</text>
+	<text name="estate_owner_text">
+		（無）
+	</text>
+	<text name="estate_cov_lbl">
+		約款：
+	</text>
+	<text name="covenant_timestamp_text">
+		最終更新日：1969年12月31日（水）16:00:00
+	</text>
+	<button label="?" name="covenant_help"/>
+	<text_editor bottom="-263" height="178" name="covenant_editor">
+		この不動産には約款がありません。
+	</text_editor>
+	<button label="リセット" name="reset_covenant"/>
+	<text name="covenant_help_text">
+		約款の変更は不動産全区画に適用となります。
+	</text>
+	<text name="covenant_instructions">
+		この不動産約款を変更する際は、ノートカードをドラッグ＆ドロップしてください。
+	</text>
+	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl">
+		リージョン
+	</text>
+	<text name="region_name_lbl">
+		名前：
+	</text>
+	<text name="region_name_text">
+		エリカ
+	</text>
+	<text name="region_landtype_lbl">
+		種類：
+	</text>
+	<text name="region_landtype_text">
+		メインランド／入植地
+	</text>
+	<text name="region_maturity_lbl">
+		区分：
+	</text>
+	<text name="region_maturity_text">
+		アダルト
+	</text>
+	<text name="resellable_lbl">
+		再販：
+	</text>
+	<text name="resellable_clause">
+		このリージョン（地域）にある土地は再販できません。
+	</text>
+	<text name="changeable_lbl">
+		再分割：
+	</text>
+	<text name="changeable_clause">
+		このリージョン（地域）にある土地は統合または分割ができません。
+	</text>
+	<string name="can_resell">
+		このリージョン（地域）で購入した土地は、再販できます。
+	</string>
+	<string name="can_not_resell">
+		このリージョン（地域）の購入地は再販できないことがあります。
+	</string>
+	<string name="can_change">
+		このリージョン（地域）の購入地は統合または再分割できます。
+	</string>
+	<string name="can_not_change">
+		このリージョン（地域）の購入地は統合／再分割できないことがあります。
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 907059550a..d2cf3739bf 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="デバッグ" name="Debug">
-  <text name="region_text_lbl">リージョン（地域）：</text>
-  <text name="region_text">未知</text>
-  <check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="このリージョン（地域）のスクリプトをすべて無効にします" />
-  <check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="このリージョン（地域）の非アバター衝突を無効にします" />
-  <check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="このリージョン（地域）の物理作用をすべて無効にします" />
-  <button label="適用" name="apply_btn" />
-  <text name="objret_text_lbl">オブジェクトの返却</text>
-  <text name="resident_text_lbl">住人：</text>
-  <line_editor name="target_avatar_name">（なし）</line_editor>
-  <button label="選択" name="choose_avatar_btn" />
-  <text name="options_text_lbl">オプション：</text>
-  <check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します" />
-  <check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却します" />
-  <check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべてのリージョン（地域）のオブジェクトを返却します" />
-  <button label="返却" name="return_btn" />
-  <button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト" />
-  <button label="リージョン（地域）再起動" name="restart_btn" tool_tip="２分間のカウントダウン後、リージョン（地域）を再起動します" />
-  <button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト" />
-  <button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="リージョンの再起動をキャンセル" />
-  <button label="リージョン（地域）デバッグコンソール" name="region_debug_console_btn" tool_tip="リージョン（地域）デバッグコンソールを開く" />
-</panel>
\ No newline at end of file
+	<text name="region_text_lbl">
+		リージョン（地域）：
+	</text>
+	<text name="region_text">
+		未知
+	</text>
+	<check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="このリージョン（地域）のスクリプトをすべて無効にします"/>
+	<check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="このリージョン（地域）の非アバター衝突を無効にします"/>
+	<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="このリージョン（地域）の物理作用をすべて無効にします"/>
+	<button label="適用" name="apply_btn"/>
+	<text name="objret_text_lbl">
+		オブジェクトの返却
+	</text>
+	<text name="resident_text_lbl">
+		住人：
+	</text>
+	<line_editor name="target_avatar_name">
+		（なし）
+	</line_editor>
+	<button label="選択" name="choose_avatar_btn"/>
+	<text name="options_text_lbl">
+		オプション：
+	</text>
+	<check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します"/>
+	<check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却します"/>
+	<check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべてのリージョン（地域）のオブジェクトを返却します"/>
+	<button label="返却" name="return_btn"/>
+	<button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト"/>
+	<button label="リージョン（地域）再起動" name="restart_btn" tool_tip="２分間のカウントダウン後、リージョン（地域）を再起動します"/>
+	<button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト"/>
+	<button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="リージョンの再起動をキャンセル"/>
+	<button label="リージョン（地域）デバッグコンソール" name="region_debug_console_btn" tool_tip="リージョン（地域）デバッグコンソールを開く"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index de2c777612..48aa2a0adb 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
@@ -1,73 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="環境" name="panel_env_info">
-  <string name="str_label_use_default">既定の設定を使用</string>
-  <string name="str_label_use_region">リージョン（地域）の設定を使用</string>
-  <string name="str_altitude_desription">空 [INDEX]（[ALTITUDE]ｍ）</string>
-  <string name="str_no_parcel">区画が選択されていません。環境の設定は無効になっています。</string>
-  <string name="str_cross_region">リージョン（地域）の境界では環境の設定ができません。</string>
-  <string name="str_legacy">このリージョン（地域）で環境の設定ができません。</string>
-  <string name="str_disallowed">このリージョン（地域）の不動産マネージャーは、区画ごとの環境の変更を許可していません。</string>
-  <string name="str_too_small">環境を変更するには、最低でも128㎡の区画が必要です。</string>
-  <string name="str_empty">（空）</string>
-  <string name="str_region_env">（リージョンの環境）</string>
-  <layout_stack>
-    <layout_panel name="pnl_environment_disabled">
-      <text name="txt_environment_disabled">…</text>
-    </layout_panel>
-    <layout_panel name="pnl_environment_config">
-      <layout_stack>
-        <layout_panel name="pnl_environment_config">
-          <layout_stack>
-            <layout_panel name="pnl_environment_current">
-              <button label="[USEDEFAULT]" name="btn_usedefault" />
-              <button label="インベントリを使う" name="btn_select_inventory" />
-              <button label="カスタマイズ" name="btn_edit" />
-              <check_box label="区画所有者による環境を上書きを許可" name="chk_allow_override" />
-            </layout_panel>
-            <layout_panel name="pnl_environment_length">
-              <text name="lbl_apparent_time">[AP]　[HH]：[MM]（[PRC]％）</text>
-            </layout_panel>
-            <layout_panel name="pnl_environment_buttons" />
-          </layout_stack>
-        </layout_panel>
-        <layout_panel name="pnl_environment_altitudes">
-          <panel name="pnl_alt1">
-            <text name="txt_alt1">空[INDEX]　[ALTITUDE]ｍ</text>
-            <line_editor name="edt_invname_alt1">不明</line_editor>
-            <settings_drop_target name="sdt_alt1" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。" />
-          </panel>
-          <panel name="pnl_alt2">
-            <text name="txt_alt2">空[INDEX]　[ALTITUDE]ｍ</text>
-            <line_editor name="edt_invname_alt2">不明</line_editor>
-            <settings_drop_target name="sdt_alt2" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。" />
-          </panel>
-          <panel name="pnl_alt3">
-            <text name="txt_alt3">空[INDEX]　[ALTITUDE]ｍ</text>
-            <line_editor name="edt_invname_alt3">不明</line_editor>
-            <settings_drop_target name="sdt_alt3" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。" />
-          </panel>
-          <multi_slider initial_value="0" name="sld_altitudes">
-            <slider name="sld1" value="1000" />
-            <slider name="sld2" value="2000" />
-            <slider name="sld3" value="3000" />
-          </multi_slider>
-          <panel name="pnl_ground">
-            <text name="txt_ground">地面</text>
-            <line_editor name="edt_invname_ground">不明</line_editor>
-            <settings_drop_target name="sdt_ground" tool_tip="インベントリからターゲットボックスに設定をドラッグし、地面レベルの空として選択します。" />
-          </panel>
-          <panel name="pnl_water">
-            <text name="txt_water">水面</text>
-            <line_editor name="edt_invname_water">不明</line_editor>
-            <settings_drop_target name="sdt_water" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の水面として選択する" />
-          </panel>
-          <button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-  <layout_panel name="pnl_environment_region_msg">
-    <text name="region_text_lbl">リージョン（地域）：</text>
-    <text name="region_text">不明</text>
-  </layout_panel>
-</panel>
\ No newline at end of file
+	<string name="str_label_use_default">
+		既定の設定を使用
+	</string>
+	<string name="str_label_use_region">
+		リージョン（地域）の設定を使用
+	</string>
+	<string name="str_altitude_desription">
+		空 [INDEX]（[ALTITUDE]ｍ）
+	</string>
+	<string name="str_no_parcel">
+		区画が選択されていません。環境の設定は無効になっています。
+	</string>
+	<string name="str_cross_region">
+		リージョン（地域）の境界では環境の設定ができません。
+	</string>
+	<string name="str_legacy">
+		このリージョン（地域）で環境の設定ができません。
+	</string>
+	<string name="str_disallowed">
+		このリージョン（地域）の不動産マネージャーは、区画ごとの環境の変更を許可していません。
+	</string>
+	<string name="str_too_small">
+		環境を変更するには、最低でも128㎡の区画が必要です。
+	</string>
+	<string name="str_empty">
+		（空）
+	</string>
+	<string name="str_region_env">
+		（リージョンの環境）
+	</string>
+	<layout_stack>
+		<layout_panel name="pnl_environment_disabled">
+			<text name="txt_environment_disabled">
+				…
+			</text>
+		</layout_panel>
+		<layout_panel name="pnl_environment_config">
+			<layout_stack>
+				<layout_panel name="pnl_environment_config">
+					<layout_stack>
+						<layout_panel name="pnl_environment_current">
+							<button label="[USEDEFAULT]" name="btn_usedefault"/>
+							<button label="インベントリを使う" name="btn_select_inventory"/>
+							<button label="カスタマイズ" name="btn_edit"/>
+							<check_box label="区画所有者による環境を上書きを許可" name="chk_allow_override"/>
+						</layout_panel>
+						<layout_panel name="pnl_environment_length">
+							<text name="lbl_apparent_time">
+								[AP]　[HH]：[MM]（[PRC]％）
+							</text>
+						</layout_panel>
+						<layout_panel name="pnl_environment_buttons"/>
+					</layout_stack>
+				</layout_panel>
+				<layout_panel name="pnl_environment_altitudes">
+					<panel name="pnl_alt1">
+						<text name="txt_alt1">
+							空[INDEX]　[ALTITUDE]ｍ
+						</text>
+						<line_editor name="edt_invname_alt1">
+							不明
+						</line_editor>
+						<settings_drop_target name="sdt_alt1" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。"/>
+					</panel>
+					<panel name="pnl_alt2">
+						<text name="txt_alt2">
+							空[INDEX]　[ALTITUDE]ｍ
+						</text>
+						<line_editor name="edt_invname_alt2">
+							不明
+						</line_editor>
+						<settings_drop_target name="sdt_alt2" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。"/>
+					</panel>
+					<panel name="pnl_alt3">
+						<text name="txt_alt3">
+							空[INDEX]　[ALTITUDE]ｍ
+						</text>
+						<line_editor name="edt_invname_alt3">
+							不明
+						</line_editor>
+						<settings_drop_target name="sdt_alt3" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の空として選択します。"/>
+					</panel>
+					<multi_slider initial_value="0" name="sld_altitudes">
+						<slider name="sld1" value="1000"/>
+						<slider name="sld2" value="2000"/>
+						<slider name="sld3" value="3000"/>
+					</multi_slider>
+					<panel name="pnl_ground">
+						<text name="txt_ground">
+							地面
+						</text>
+						<line_editor name="edt_invname_ground">
+							不明
+						</line_editor>
+						<settings_drop_target name="sdt_ground" tool_tip="インベントリからターゲットボックスに設定をドラッグし、地面レベルの空として選択します。"/>
+					</panel>
+					<panel name="pnl_water">
+						<text name="txt_water">
+							水面
+						</text>
+						<line_editor name="edt_invname_water">
+							不明
+						</line_editor>
+						<settings_drop_target name="sdt_water" tool_tip="インベントリからターゲットボックスに設定をドラッグし、現在の水面として選択する"/>
+					</panel>
+					<button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+	<layout_panel name="pnl_environment_region_msg">
+		<text name="region_text_lbl">
+			リージョン（地域）：
+		</text>
+		<text name="region_text">
+			不明
+		</text>
+	</layout_panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 017677bfe7..df790376ec 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,32 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="不動産" name="Estate">
-  <text name="estate_help_text">このタブ内の設定変更は、不動産内のすべてのリージョン（地域）に影響します。</text>
-  <text name="estate_text">不動産：</text>
-  <text name="estate_name">（不明）</text>
-  <text name="owner_text">所有者：</text>
-  <text name="estate_owner">（不明）</text>
-  <radio_group name="externally_visible_radio">
-    <radio_item label="アクセスタブに記載された住人とグループのみ許可する" name="estate_restricted_access" />
-    <radio_item label="誰でも訪問可" name="estate_public_access" />
-  </radio_group>
-  <check_box label="１８歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産（不動産）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE]をご覧ください。" />
-  <check_box label="支払情報が登録されている必要があります" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE]をご覧ください。" />
-  <check_box label="区画所有者" name="parcel_access_override" />
-  <check_box label="ボイスチャットを許可" name="voice_chat_check" />
-  <check_box label="直接テレポートを許可" name="allow_direct_teleport" />
-  <button label="適用" name="apply_btn" />
-  <text name="estate_manager_label">不動産マネージャー：</text>
-  <text name="allow_resident_label">常に許可：</text>
-  <button label="追加…" name="add_estate_manager_btn" />
-  <button label="削除…" name="remove_estate_manager_btn" />
-  <button label="追加…" name="add_allowed_avatar_btn" />
-  <button label="削除…" name="remove_allowed_avatar_btn" />
-  <text name="allow_group_label">グループを常に許可：</text>
-  <text name="ban_resident_label">常に禁止：</text>
-  <button label="追加…" name="add_allowed_group_btn" />
-  <button label="削除…" name="remove_allowed_group_btn" />
-  <button label="追加…" name="add_banned_avatar_btn" />
-  <button label="削除…" name="remove_banned_avatar_btn" />
-  <button label="メッセージを不動産に送信…" name="message_estate_btn" />
-  <button label="不動産から住人を追い出す…" name="kick_user_from_estate_btn" />
-</panel>
\ No newline at end of file
+	<text name="estate_help_text">
+		このタブ内の設定変更は、不動産内のすべてのリージョン（地域）に影響します。
+	</text>
+	<text name="estate_text">
+		不動産：
+	</text>
+	<text name="estate_name">
+		（不明）
+	</text>
+	<text name="owner_text">
+		所有者：
+	</text>
+	<text name="estate_owner">
+		（不明）
+	</text>
+	<radio_group name="externally_visible_radio">
+		<radio_item label="アクセスタブに記載された住人とグループのみ許可する" name="estate_restricted_access"/>
+		<radio_item label="誰でも訪問可" name="estate_public_access"/>
+	</radio_group>
+	<check_box label="１８歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産（不動産）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE]をご覧ください。"/>
+	<check_box label="支払情報が登録されている必要があります" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE]をご覧ください。"/>
+	<check_box label="区画所有者" name="parcel_access_override"/>
+	<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
+	<check_box label="直接テレポートを許可" name="allow_direct_teleport"/>
+	<button label="適用" name="apply_btn"/>
+	<text name="estate_manager_label">
+		不動産マネージャー：
+	</text>
+	<text name="allow_resident_label">
+		常に許可：
+	</text>
+	<button label="追加…" name="add_estate_manager_btn"/>
+	<button label="削除…" name="remove_estate_manager_btn"/>
+	<button label="追加…" name="add_allowed_avatar_btn"/>
+	<button label="削除…" name="remove_allowed_avatar_btn"/>
+	<text name="allow_group_label">
+		グループを常に許可：
+	</text>
+	<text name="ban_resident_label">
+		常に禁止：
+	</text>
+	<button label="追加…" name="add_allowed_group_btn"/>
+	<button label="削除…" name="remove_allowed_group_btn"/>
+	<button label="追加…" name="add_banned_avatar_btn"/>
+	<button label="削除…" name="remove_banned_avatar_btn"/>
+	<button label="メッセージを不動産に送信…" name="message_estate_btn"/>
+	<button label="不動産から住人を追い出す…" name="kick_user_from_estate_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
index f2551a7853..eca22cfa31 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="体験" name="Experiences">
-	<panel.string name="trusted_estate_text">どんな体験でもキーになる可能性があります。
+	<panel.string name="trusted_estate_text">
+		どんな体験でもキーになる可能性があります。
 
 キー体験には、この不動産で実行する権限があります。
 
-さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。</panel.string>
-	<panel.string name="allowed_estate_text">ランドスコープとなる体験のみ許可されます。
+さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。
+	</panel.string>
+	<panel.string name="allowed_estate_text">
+		ランドスコープとなる体験のみ許可されます。
 
-許可される体験には、この不動産で実行する権限があります。</panel.string>
-	<panel.string name="blocked_estate_text">グリッドスコープ体験のみブロックできます。
+許可される体験には、この不動産で実行する権限があります。
+	</panel.string>
+	<panel.string name="blocked_estate_text">
+		グリッドスコープ体験のみブロックできます。
 
-ブロックされた体験は、この不動産では実行できません。</panel.string>
-	<panel.string name="estate_caption">このタブの設定への変更は、不動産内のすべての地域に影響されます。
+ブロックされた体験は、この不動産では実行できません。
+	</panel.string>
+	<panel.string name="estate_caption">
+		このタブの設定への変更は、不動産内のすべての地域に影響されます。
 	</panel.string>
-	<panel.string name="allowed_parcel_text">ランドスコープとなる体験のみ許可されます。
+	<panel.string name="allowed_parcel_text">
+		ランドスコープとなる体験のみ許可されます。
 
-許可された体験には、この不動産でブロックされていない場合、この区画で実行する権限があります。</panel.string>
-	<panel.string name="blocked_parcel_text">住人の体験をブロックできます。
+許可された体験には、この不動産でブロックされていない場合、この区画で実行する権限があります。
+	</panel.string>
+	<panel.string name="blocked_parcel_text">
+		住人の体験をブロックできます。
 
-ブロックされた体験は、この区画では実行できません。</panel.string>
-</panel>
\ No newline at end of file
+ブロックされた体験は、この区画では実行できません。
+	</panel.string>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 1109715ca6..2e4ee72b28 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -1,31 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="リージョン（地域）" name="General">
-  <text name="region_text_lbl">リージョン（地域）：</text>
-  <text left_delta="70" name="region_text">未知</text>
-  <text name="version_channel_text_lbl">バージョン：</text>
-  <text left_delta="70" name="version_channel_text">不明</text>
-  <text name="region_type_lbl">種類：</text>
-  <text left_delta="70" name="region_type">不明
-  </text>
-  <check_box label="地形編集をブロック" name="block_terraform_check" />
-  <check_box label="飛行をブロック" name="block_fly_check" />
-  <check_box label="区画の飛行をブロック" name="block_fly_over_check" tool_tip="アクセス チェックを上方向に拡大し、区画を超える飛行を防ぎます" />
-  <check_box label="ダメージを許可" name="allow_damage_check" />
-  <check_box label="プッシュを制限" name="restrict_pushobject" />
-  <check_box label="土地の再販を許可" name="allow_land_resell_check" />
-  <check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check" />
-  <check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です" />
-  <spinner label="アバター数上限" name="agent_limit_spin" />
-  <spinner label="物体ボーナス" name="object_bonus_spin" />
-  <text label="成人指定" name="access_text">区分：</text>
-  <icons_combo_box label="Moderate" name="access_combo">
-    <icons_combo_box.item label="Adult" name="Adult" value="42" />
-    <icons_combo_box.item label="Moderate" name="Mature" value="21" />
-    <icons_combo_box.item label="General" name="PG" value="13" />
-  </icons_combo_box>
-  <button label="適用" name="apply_btn" />
-  <button label="住人 1 名をホームにテレポート…" name="kick_btn" />
-  <button label="住人全員をホームにテレポート…" name="kick_all_btn" />
-  <button label="メッセージを地域に送信…" name="im_btn" />
-  <button label="テレハブの管理…" name="manage_telehub_btn" />
-</panel>
\ No newline at end of file
+	<text name="region_text_lbl">
+		リージョン（地域）：
+	</text>
+	<text left_delta="70" name="region_text">
+		未知
+	</text>
+	<text name="version_channel_text_lbl">
+		バージョン：
+	</text>
+	<text left_delta="70" name="version_channel_text">
+		不明
+	</text>
+	<text name="region_type_lbl">
+		種類：
+	</text>
+	<text left_delta="70" name="region_type">
+		不明
+	</text>
+	<check_box label="地形編集をブロック" name="block_terraform_check"/>
+	<check_box label="飛行をブロック" name="block_fly_check"/>
+	<check_box label="区画の飛行をブロック" name="block_fly_over_check" tool_tip="アクセス チェックを上方向に拡大し、区画を超える飛行を防ぎます"/>
+	<check_box label="ダメージを許可" name="allow_damage_check"/>
+	<check_box label="プッシュを制限" name="restrict_pushobject"/>
+	<check_box label="土地の再販を許可" name="allow_land_resell_check"/>
+	<check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check"/>
+	<check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です"/>
+	<spinner label="アバター数上限" name="agent_limit_spin"/>
+	<spinner label="物体ボーナス" name="object_bonus_spin"/>
+	<text label="成人指定" name="access_text">
+		区分：
+	</text>
+	<icons_combo_box label="Moderate" name="access_combo">
+		<icons_combo_box.item label="Adult" name="Adult" value="42"/>
+		<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
+		<icons_combo_box.item label="General" name="PG" value="13"/>
+	</icons_combo_box>
+	<button label="適用" name="apply_btn"/>
+	<button label="住人 1 名をホームにテレポート…" name="kick_btn"/>
+	<button label="住人全員をホームにテレポート…" name="kick_all_btn"/>
+	<button label="メッセージを地域に送信…" name="im_btn"/>
+	<button label="テレハブの管理…" name="manage_telehub_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index 7a7b0be080..5470bd6e3b 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -1,32 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="地形" name="Terrain">
-  <text name="region_text_lbl">地域：</text>
-  <text name="region_text">未知</text>
-  <spinner label="水面の高さ" name="water_height_spin" />
-  <spinner label="地形の上昇限度" name="terrain_raise_spin" />
-  <spinner label="地形の下降限度" name="terrain_lower_spin" />
-  <text name="detail_texture_text">地形テクスチャ（1024✕1024 の 24 bit .tga ファイル）</text>
-  <text name="height_text_lbl">１（低）</text>
-  <text name="height_text_lbl2">２</text>
-  <text name="height_text_lbl3">３</text>
-  <text name="height_text_lbl4">４（高）</text>
-  <text name="height_text_lbl5">地形の隆起範囲</text>
-  <text name="height_text_lbl10">数値は上のテクスチャのブレンド範囲を示します。</text>
-  <text name="height_text_lbl11">計測単位はメートルで、「低」の値は、１番のテクスチャの高さの「最大値」です。「高」の値は、４番のテクスチャの高さの「最低値」です。</text>
-  <text name="height_text_lbl6">北西</text>
-  <text name="height_text_lbl7">北東</text>
-  <spinner label="低" name="height_start_spin_1" />
-  <spinner label="低" name="height_start_spin_3" />
-  <spinner label="高" name="height_range_spin_1" />
-  <spinner label="高" name="height_range_spin_3" />
-  <text name="height_text_lbl8">南西</text>
-  <text name="height_text_lbl9">南東</text>
-  <spinner label="低" name="height_start_spin_0" />
-  <spinner label="低" name="height_start_spin_2" />
-  <spinner label="高" name="height_range_spin_0" />
-  <spinner label="高" name="height_range_spin_2" />
-  <button label="RAW 地形ダウンロード…" name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
-  <button label="RAW 地形アップロード…" name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
-  <button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します" />
-  <button label="適用" name="apply_btn" />
-</panel>
\ No newline at end of file
+	<text name="region_text_lbl">
+		地域：
+	</text>
+	<text name="region_text">
+		未知
+	</text>
+	<spinner label="水面の高さ" name="water_height_spin"/>
+	<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
+	<spinner label="地形の下降限度" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		地形テクスチャ（1024✕1024 の 24 bit .tga ファイル）
+	</text>
+	<text name="height_text_lbl">
+		１（低）
+	</text>
+	<text name="height_text_lbl2">
+		２
+	</text>
+	<text name="height_text_lbl3">
+		３
+	</text>
+	<text name="height_text_lbl4">
+		４（高）
+	</text>
+	<text name="height_text_lbl5">
+		地形の隆起範囲
+	</text>
+	<text name="height_text_lbl10">
+		数値は上のテクスチャのブレンド範囲を示します。
+	</text>
+	<text name="height_text_lbl11">
+		計測単位はメートルで、「低」の値は、１番のテクスチャの高さの「最大値」です。「高」の値は、４番のテクスチャの高さの「最低値」です。
+	</text>
+	<text name="height_text_lbl6">
+		北西
+	</text>
+	<text name="height_text_lbl7">
+		北東
+	</text>
+	<spinner label="低" name="height_start_spin_1"/>
+	<spinner label="低" name="height_start_spin_3"/>
+	<spinner label="高" name="height_range_spin_1"/>
+	<spinner label="高" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		南西
+	</text>
+	<text name="height_text_lbl9">
+		南東
+	</text>
+	<spinner label="低" name="height_start_spin_0"/>
+	<spinner label="低" name="height_start_spin_2"/>
+	<spinner label="高" name="height_range_spin_0"/>
+	<spinner label="高" name="height_range_spin_2"/>
+	<button label="RAW 地形ダウンロード…" name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
+	<button label="RAW 地形アップロード…" name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
+	<button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します"/>
+	<button label="適用" name="apply_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index c2fd022564..0861b5caf1 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
@@ -1,37 +1,51 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="script panel">
-  <panel.string name="loading">読み込んでいます…</panel.string>
-  <panel.string name="can_not_view">このスクリプトは「コピー不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。</panel.string>
-  <panel.string name="public_objects_can_not_run">公共オブジェクトで、スクリプトを実行することはできません。</panel.string>
-  <panel.string name="script_running">実行中</panel.string>
-  <panel.string name="Title">スクリプト：[NAME]</panel.string>
-  <panel.string name="external_editor_not_set">環境変数 LL_SCRIPT_EDITOR か、外部のエディタを指定して、編集に使うアプリケーションを選択します。</panel.string>
-  <menu_bar name="script_menu">
-    <menu label="ファイル" name="File">
-      <menu_item_call label="保存" name="Save" />
-      <menu_item_call label="復帰" name="Revert All Changes" />
-      <menu_item_call label="ファイルを開く…" name="LoadFromFile" />
-      <menu_item_call label="ファイルへ保存…" name="SaveToFile" />
-      <menu_item_call label="色…" name="Colors" />
-    </menu>
-    <menu label="編集" name="Edit">
-      <menu_item_call label="取り消し" name="Undo" />
-      <menu_item_call label="やり直し" name="Redo" />
-      <menu_item_call label="カット" name="Cut" />
-      <menu_item_call label="コピー" name="Copy" />
-      <menu_item_call label="ペースト" name="Paste" />
-      <menu_item_call label="すべて選択" name="Select All" />
-      <menu_item_call label="選択解除" name="Deselect" />
-      <menu_item_call label="検索／再配置…" name="Search / Replace..." />
-      <menu_item_call label="行に移動…" name="Go to line..." />
-    </menu>
-    <menu label="ヘルプ" name="Help">
-      <menu_item_call label="ヘルプ…" name="Help..." />
-      <menu_item_call label="キーワードヘルプ…" name="Keyword Help..." />
-    </menu>
-  </menu_bar>
-  <script_editor name="Script Editor">読み込んでいます…</script_editor>
-  <combo_box label="挿入…" name="Insert..." />
-  <button label="保存" label_selected="保存" name="Save_btn" />
-  <button label="編集…" name="Edit_btn" />
-</panel>
\ No newline at end of file
+	<panel.string name="loading">
+		読み込んでいます…
+	</panel.string>
+	<panel.string name="can_not_view">
+		このスクリプトは「コピー不可」のため、表示・編集することができません。オブジェクト内のスクリプトの表示・編集には、全権限が必要です。
+	</panel.string>
+	<panel.string name="public_objects_can_not_run">
+		公共オブジェクトで、スクリプトを実行することはできません。
+	</panel.string>
+	<panel.string name="script_running">
+		実行中
+	</panel.string>
+	<panel.string name="Title">
+		スクリプト：[NAME]
+	</panel.string>
+	<panel.string name="external_editor_not_set">
+		環境変数 LL_SCRIPT_EDITOR か、外部のエディタを指定して、編集に使うアプリケーションを選択します。
+	</panel.string>
+	<menu_bar name="script_menu">
+		<menu label="ファイル" name="File">
+			<menu_item_call label="保存" name="Save"/>
+			<menu_item_call label="復帰" name="Revert All Changes"/>
+			<menu_item_call label="ファイルを開く…" name="LoadFromFile"/>
+			<menu_item_call label="ファイルへ保存…" name="SaveToFile"/>
+			<menu_item_call label="色…" name="Colors"/>
+		</menu>
+		<menu label="編集" name="Edit">
+			<menu_item_call label="取り消し" name="Undo"/>
+			<menu_item_call label="やり直し" name="Redo"/>
+			<menu_item_call label="カット" name="Cut"/>
+			<menu_item_call label="コピー" name="Copy"/>
+			<menu_item_call label="ペースト" name="Paste"/>
+			<menu_item_call label="すべて選択" name="Select All"/>
+			<menu_item_call label="選択解除" name="Deselect"/>
+			<menu_item_call label="検索／再配置…" name="Search / Replace..."/>
+			<menu_item_call label="行に移動…" name="Go to line..."/>
+		</menu>
+		<menu label="ヘルプ" name="Help">
+			<menu_item_call label="ヘルプ…" name="Help..."/>
+			<menu_item_call label="キーワードヘルプ…" name="Keyword Help..."/>
+		</menu>
+	</menu_bar>
+	<script_editor name="Script Editor">
+		読み込んでいます…
+	</script_editor>
+	<combo_box label="挿入…" name="Insert..."/>
+	<button label="保存" label_selected="保存" name="Save_btn"/>
+	<button label="編集…" name="Edit_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_experience.xml b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
index 5b89d3280c..f062aba572 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="script_experience" title="体験">
-  <button label="体験" name="Expand Experience" />
-  <check_box label="体験を使用" name="enable_xp" />
-  <layout_stack name="xp_details">
-    <layout_panel>
-      <combo_box label="体験を選択…" name="Experiences..." />
-    </layout_panel>
-  </layout_stack>
-  <text name="No Experiences">体験の貢献者ではありません。</text>
-</panel>
\ No newline at end of file
+	<button label="体験" name="Expand Experience"/>
+	<check_box label="体験を使用" name="enable_xp"/>
+	<layout_stack name="xp_details">
+		<layout_panel>
+			<combo_box label="体験を選択…" name="Experiences..."/>
+		</layout_panel>
+	</layout_stack>
+	<text name="No Experiences">
+		体験の貢献者ではありません。
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
index 00d2f6531b..c717b71194 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="自分のアバター" name="script_limits_my_avatar_panel">
-  <text name="script_memory">アバターのスクリプト使用</text>
-  <text name="loading_text">読み込んでいます…</text>
-  <scroll_list name="scripts_list">
-    <scroll_list.columns label="サイズ （㎅）" name="size" />
-    <scroll_list.columns label="ＵＲＬ" name="urls" />
-    <scroll_list.columns label="オブジェクト名" name="name" />
-    <scroll_list.columns label="場所" name="location" />
-  </scroll_list>
-  <button label="リスト更新" name="refresh_list_btn" />
-</panel>
\ No newline at end of file
+	<text name="script_memory">
+		アバターのスクリプト使用
+	</text>
+	<text name="loading_text">
+		読み込んでいます…
+	</text>
+	<scroll_list name="scripts_list">
+		<scroll_list.columns label="サイズ （㎅）" name="size"/>
+		<scroll_list.columns label="ＵＲＬ" name="urls"/>
+		<scroll_list.columns label="オブジェクト名" name="name"/>
+		<scroll_list.columns label="場所" name="location"/>
+	</scroll_list>
+	<button label="リスト更新" name="refresh_list_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
index 288a03d346..71dedb55a6 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="リージョンメモリ" name="script_limits_region_memory_panel">
-  <text name="script_memory">区画スクリプトメモリ</text>
-  <text name="parcels_listed" />
-  <text name="memory_used" />
-  <text name="loading_text">読み込んでいます…</text>
-  <scroll_list name="scripts_list">
-    <scroll_list.columns label="サイズ （㎅）" name="size"/>
-    <scroll_list.columns label="ＵＲＬ" name="urls" />
-    <scroll_list.columns label="オブジェクト名" name="name" />
-    <scroll_list.columns label="オブジェクトの所有者" name="owner" />
-    <scroll_list.columns label="区画" name="parcel" />
-    <scroll_list.columns label="場所" name="location" />
-  </scroll_list>
-  <button label="リスト更新" name="refresh_list_btn" />
-  <button label="ハイライト" name="highlight_btn" />
-  <button label="返却" name="return_btn" />
-</panel>
\ No newline at end of file
+	<text name="script_memory">
+		区画スクリプトメモリ
+	</text>
+	<text name="parcels_listed"/>
+	<text name="memory_used"/>
+	<text name="loading_text">
+		読み込んでいます…
+	</text>
+	<scroll_list name="scripts_list">
+		<scroll_list.columns label="サイズ （㎅）" name="size"/>
+		<scroll_list.columns label="ＵＲＬ" name="urls"/>
+		<scroll_list.columns label="オブジェクト名" name="name"/>
+		<scroll_list.columns label="オブジェクトの所有者" name="owner"/>
+		<scroll_list.columns label="区画" name="parcel"/>
+		<scroll_list.columns label="場所" name="location"/>
+	</scroll_list>
+	<button label="リスト更新" name="refresh_list_btn"/>
+	<button label="ハイライト" name="highlight_btn"/>
+	<button label="返却" name="return_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
index 2e0e28a607..b38b4bdbfb 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="script_question_panel" name="panel_script_question_toast">
-  <panel label="buttons_panel" name="buttons_panel" />
-</panel>
\ No newline at end of file
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
index 234e55616d..d67b168cc1 100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="LLScrollingPanelParam">
-  <text name="Loading...">読み込んでいます…</text>
-  <text name="Loading...2">読み込んでいます…</text>
-  <button label="" label_selected="" name="less" />
-  <button label="" label_selected="" name="more" />
-  <slider label="[DESC]" name="param slider" />
-</panel>
\ No newline at end of file
+	<text name="Loading...">
+		読み込んでいます…
+	</text>
+	<text name="Loading...2">
+		読み込んでいます…
+	</text>
+	<button label="" label_selected="" name="less"/>
+	<button label="" label_selected="" name="more"/>
+	<slider label="[DESC]" name="param slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
index f4486fa412..fa659040ea 100644
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="LLScrollingPanelParamBase">
-  <slider label="[DESC]" name="param slider" />
-</panel>
\ No newline at end of file
+	<slider label="[DESC]" name="param slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
index 2ee9031359..1fa87eb5f7 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
@@ -1,40 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="大気と雷" name="panel_settings_sky_atmos">
-  <layout_stack follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
-    <layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="75">
-
-      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">アンビエントカラー：</text>
-      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="ambient_light" top_pad="5" width="60" />
-      <text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">青のホライズン：</text>
-      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_horizon" top_pad="5" width="60" />
-      <text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">青の濃度：</text>
-      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_density" top_pad="5" width="60" />
-    </layout_panel>
-    <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true">
-      <layout_stack name="atmosphere1" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="hoizontal">
-        <layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
-          <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">霞の地平線：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_delta="20" width="207" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">霞の密度:</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_delta="20" width="207" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">水分レベル：</text>
-          <slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="moisture_level" width="207" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">液滴半径：</text>
-          <slider decimal_digits="2" follows="left|top" height="14" increment="0.01" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="5.0" max_val="1000.0" name="droplet_radius" width="207" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">氷のレベル：</text>
-          <slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="ice_level" width="207" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">シーンのガンマ値：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_delta="20" width="207" can_edit_text="true" />
-        </layout_panel>
-        <layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
-          <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">密度乗数：</text>
-          <slider decimal_digits="4" follows="left|top" height="16" increment="0.0001" initial_value="0" layout="topleft" left_delta="5" min_val="0.0001" max_val="2" name="density_multip" top_delta="20" width="219" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">距離乗数：</text>
-          <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.8" layout="topleft" left_delta="5" min_val="0.05" max_val="1000" name="distance_multip" top_delta="20" width="219" can_edit_text="true" />
-          <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">最大高度：</text>
-          <slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="10000" name="max_alt" top_delta="20" width="219" can_edit_text="true" />
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-</panel>
\ No newline at end of file
+	<layout_stack follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
+		<layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="75">
+			<text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">
+				アンビエントカラー：
+			</text>
+			<color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="ambient_light" top_pad="5" width="60"/>
+			<text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">
+				青のホライズン：
+			</text>
+			<color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_horizon" top_pad="5" width="60"/>
+			<text follows="left" height="10" layout="topleft" left_delta="90" top_delta="-15" width="80">
+				青の濃度：
+			</text>
+			<color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="blue_density" top_pad="5" width="60"/>
+		</layout_panel>
+		<layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true">
+			<layout_stack name="atmosphere1" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="hoizontal">
+				<layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
+					<text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">
+						霞の地平線：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_horizon" top_delta="20" width="207" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">
+						霞の密度:
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="5" name="haze_density" top_delta="20" width="207" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">
+						水分レベル：
+					</text>
+					<slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="moisture_level" width="207" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">
+						液滴半径：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="14" increment="0.01" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="5.0" max_val="1000.0" name="droplet_radius" width="207" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">
+						氷のレベル：
+					</text>
+					<slider decimal_digits="3" follows="left|top" height="14" increment="0.001" initial_value="0" left_delta="5" top_delta="20" layout="topleft" min_val="0" max_val="1" name="ice_level" width="207" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="80">
+						シーンのガンマ値：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" max_val="20" name="scene_gamma" top_delta="20" width="207" can_edit_text="true"/>
+				</layout_panel>
+				<layout_panel border="false" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="225">
+					<text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">
+						密度乗数：
+					</text>
+					<slider decimal_digits="4" follows="left|top" height="16" increment="0.0001" initial_value="0" layout="topleft" left_delta="5" min_val="0.0001" max_val="2" name="density_multip" top_delta="20" width="219" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">
+						距離乗数：
+					</text>
+					<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.8" layout="topleft" left_delta="5" min_val="0.05" max_val="1000" name="distance_multip" top_delta="20" width="219" can_edit_text="true"/>
+					<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">
+						最大高度：
+					</text>
+					<slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="10000" name="max_alt" top_delta="20" width="219" can_edit_text="true"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
index c1c54d2c9c..6de6796c5f 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
@@ -1,30 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="雲" name="panel_settings_sky_clouds">
-  <layout_stack >
-    <layout_panel>
-      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">雲の色：</text>
-      <color_swatch name="cloud_color" />
-      <text follows="left|top" height="10" layout="topleft" left_delta="0" top_delta="47" width="200">雲の量：</text>
-      <slider name="cloud_coverage" />
-      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲のスケール：</text>
-      <slider name="cloud_scale" />
-      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲の分散：</text>
-      <slider name="cloud_variance" />
-      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">雲の移動：</text>
-      <xy_vector name="cloud_scroll_xy" />
-
-      <text follows="left|top" height="10" layout="topleft" left_delta="160" top_delta="-20" width="200">雲の画像：</text>
-      <texture_picker name="cloud_map" />
-    </layout_panel>
-    <layout_panel>
-      <text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">雲の密度：</text>
-      <slider label="Ｘ" name="cloud_density_x"/>
-      <slider label="Ｙ" name="cloud_density_y" />
-      <slider label="密度" name="cloud_density_d" />
-      <text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="35" width="200">雲の詳細：</text>
-      <slider label="Ｘ" name="cloud_detail_x" />
-      <slider label="Ｙ" name="cloud_detail_y" />
-      <slider label="密度" name="cloud_detail_d" />
-    </layout_panel>
-  </layout_stack>
-</panel>                
+	<layout_stack>
+		<layout_panel>
+			<text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="80">
+				雲の色：
+			</text>
+			<color_swatch name="cloud_color"/>
+			<text follows="left|top" height="10" layout="topleft" left_delta="0" top_delta="47" width="200">
+				雲の量：
+			</text>
+			<slider name="cloud_coverage"/>
+			<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">
+				雲のスケール：
+			</text>
+			<slider name="cloud_scale"/>
+			<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">
+				雲の分散：
+			</text>
+			<slider name="cloud_variance"/>
+			<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="25" width="200">
+				雲の移動：
+			</text>
+			<xy_vector name="cloud_scroll_xy"/>
+			<text follows="left|top" height="10" layout="topleft" left_delta="160" top_delta="-20" width="200">
+				雲の画像：
+			</text>
+			<texture_picker name="cloud_map"/>
+		</layout_panel>
+		<layout_panel>
+			<text follows="left|top" height="10" layout="topleft" left_delta="15" top_pad="15" width="200">
+				雲の密度：
+			</text>
+			<slider label="Ｘ" name="cloud_density_x"/>
+			<slider label="Ｙ" name="cloud_density_y"/>
+			<slider label="密度" name="cloud_density_d"/>
+			<text follows="left|top" height="10" layout="topleft" left_delta="-5" top_delta="35" width="200">
+				雲の詳細：
+			</text>
+			<slider label="Ｘ" name="cloud_detail_x"/>
+			<slider label="Ｙ" name="cloud_detail_y"/>
+			<slider label="密度" name="cloud_detail_d"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
index 5c646f18bd..a17d27757b 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="空中の光の散乱密度" name="panel_settings_sky_density">
-  <layout_stack>
-    <layout_panel>
-      <slider name="rayleigh_exponential" label="レイリー散乱の指数：" />
-      <slider name="rayleigh_exponential_scale" label="レイリー散乱の指数係数：" />
-      <slider name="rayleigh_linear" label="レイリー散乱の線形項：" />
-      <slider name="rayleigh_constant" label="レイリー散乱の定数：" />
-      <slider name="rayleigh_max_altitude" label="レイリー散乱の最大高度：" />
-    </layout_panel>
-    <layout_panel>
-      <slider name="mie_exponential" label="ミー散乱の指数：" />
-      <slider name="mie_exponential_scale" label="ミー散乱の指数係数：" />
-      <slider name="mie_linear" label="ミー散乱の線形項：" />
-      <slider name="mie_constant" label="ミー散乱の定数" />
-      <slider name="mie_aniso_factor" label="ミー散乱の異方性因子：" />
-      <slider name="mie_max_altitude" label="ミー散乱の最高高度：" />
-    </layout_panel>
-    <layout_panel>
-      <slider name="absorption_exponential" label="光の吸収の指数：" />
-      <slider name="absorption_exponential_scale" label="光の吸収の指数係数：" />
-      <slider name="absorption_linear" label="光の吸収の線形項：" />
-      <slider name="absorption_constant" label="光の吸収の定数：" />
-      <slider name="absorption_max_altitude" label="光の吸収の最大高度：" />
-    </layout_panel>
-  </layout_stack>
-</panel> 
\ No newline at end of file
+	<layout_stack>
+		<layout_panel>
+			<slider name="rayleigh_exponential" label="レイリー散乱の指数："/>
+			<slider name="rayleigh_exponential_scale" label="レイリー散乱の指数係数："/>
+			<slider name="rayleigh_linear" label="レイリー散乱の線形項："/>
+			<slider name="rayleigh_constant" label="レイリー散乱の定数："/>
+			<slider name="rayleigh_max_altitude" label="レイリー散乱の最大高度："/>
+		</layout_panel>
+		<layout_panel>
+			<slider name="mie_exponential" label="ミー散乱の指数："/>
+			<slider name="mie_exponential_scale" label="ミー散乱の指数係数："/>
+			<slider name="mie_linear" label="ミー散乱の線形項："/>
+			<slider name="mie_constant" label="ミー散乱の定数"/>
+			<slider name="mie_aniso_factor" label="ミー散乱の異方性因子："/>
+			<slider name="mie_max_altitude" label="ミー散乱の最高高度："/>
+		</layout_panel>
+		<layout_panel>
+			<slider name="absorption_exponential" label="光の吸収の指数："/>
+			<slider name="absorption_exponential_scale" label="光の吸収の指数係数："/>
+			<slider name="absorption_linear" label="光の吸収の線形項："/>
+			<slider name="absorption_constant" label="光の吸収の定数："/>
+			<slider name="absorption_max_altitude" label="光の吸収の最大高度："/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
index addcb378ae..f8837c40a7 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
@@ -1,50 +1,81 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_settings_sky_hbodies">
-  <layout_stack name="main_ls">
-    <layout_panel name="sun_layout">
-      <text name="sun_stars_label">太陽＆星</text>
-      <text name="position_label">位置：</text>
-      <sun_moon_trackball name="sun_rotation" />
-      <text name="image_label">画像：</text>
-      <texture_picker name="sun_image" />
-      <text name="scale_label">スケール：</text>
-      <slider name="sun_scale" />
-      <text name="color_label">色：</text>
-      <color_swatch name="sun_moon_color" />
-      <text name="sun_azimuth_label">方位角：</text>
-      <slider name="sun_azimuth" />
-      <text name="sun_elevation_label">標高：</text>
-      <slider name="sun_elevation" />
-      <text name="glow_focus_label">グローフォーカス：</text>
-      <slider name="glow_focus" />
-      <text name="glow_size_label">グローサイズ：</text>
-      <slider name="glow_size" />
-      <text name="star_brightness_label">星の輝度：</text>
-      <slider name="star_brightness" />
-
-      <check_box label="ビーコンを表示" name="sunbeacon" />
-
-    </layout_panel>
-    <layout_panel name="moon_layout">
-      <layout_stack name="moon_stack">
-        <layout_panel name="moon_layout">
-          <text name="moon_label">月</text>
-          <text name="position_label">位置：</text>
-          <sun_moon_trackball name="moon_rotation" />
-          <text name="moon_image_label">画像：</text>
-          <texture_picker name="moon_image" />
-          <text name="scale_label">スケール：</text>
-          <slider name="moon_scale" />
-          <text name="moon_azimuth_label">方位角：</text>
-          <slider name="moon_azimuth" />
-          <text name="moon_elevation_label">標高：</text>
-          <slider name="moon_elevation" />
-          <text name="brightness_label">輝度：</text>
-          <slider name="moon_brightness" />
-          <check_box label="ビーコンを表示" name="moonbeacon" />
-
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-</panel>                
\ No newline at end of file
+	<layout_stack name="main_ls">
+		<layout_panel name="sun_layout">
+			<text name="sun_stars_label">
+				太陽＆星
+			</text>
+			<text name="position_label">
+				位置：
+			</text>
+			<sun_moon_trackball name="sun_rotation"/>
+			<text name="image_label">
+				画像：
+			</text>
+			<texture_picker name="sun_image"/>
+			<text name="scale_label">
+				スケール：
+			</text>
+			<slider name="sun_scale"/>
+			<text name="color_label">
+				色：
+			</text>
+			<color_swatch name="sun_moon_color"/>
+			<text name="sun_azimuth_label">
+				方位角：
+			</text>
+			<slider name="sun_azimuth"/>
+			<text name="sun_elevation_label">
+				標高：
+			</text>
+			<slider name="sun_elevation"/>
+			<text name="glow_focus_label">
+				グローフォーカス：
+			</text>
+			<slider name="glow_focus"/>
+			<text name="glow_size_label">
+				グローサイズ：
+			</text>
+			<slider name="glow_size"/>
+			<text name="star_brightness_label">
+				星の輝度：
+			</text>
+			<slider name="star_brightness"/>
+			<check_box label="ビーコンを表示" name="sunbeacon"/>
+		</layout_panel>
+		<layout_panel name="moon_layout">
+			<layout_stack name="moon_stack">
+				<layout_panel name="moon_layout">
+					<text name="moon_label">
+						月
+					</text>
+					<text name="position_label">
+						位置：
+					</text>
+					<sun_moon_trackball name="moon_rotation"/>
+					<text name="moon_image_label">
+						画像：
+					</text>
+					<texture_picker name="moon_image"/>
+					<text name="scale_label">
+						スケール：
+					</text>
+					<slider name="moon_scale"/>
+					<text name="moon_azimuth_label">
+						方位角：
+					</text>
+					<slider name="moon_azimuth"/>
+					<text name="moon_elevation_label">
+						標高：
+					</text>
+					<slider name="moon_elevation"/>
+					<text name="brightness_label">
+						輝度：
+					</text>
+					<slider name="moon_brightness"/>
+					<check_box label="ビーコンを表示" name="moonbeacon"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_water.xml b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
index 21b434d11a..ead1ca9b2f 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
@@ -1,49 +1,71 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="水" name="panel_settings_water">
-  <layout_stack name="water_stack1" follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
-    <layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="105">
-      <text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">水中のフォグ：</text>
-      <text follows="left|top" height="10" layout="left|top" left_delta="15" top_delta="0" width="60">色：</text>
-      <color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="water_fog_color" top_pad="5" width="60" />
-      <text follows="left|top" height="10" top_delta="-15" left_delta="80" width="150">密度指数：</text>
-      <slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="-10" max_val="10" name="water_fog_density" top_delta="5" width="150" can_edit_text="true"/>
-      <text follows="left|top" height="10" top_delta="25" left_delta="-15" width="150">水中の修飾子：</text>
-      <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="0.0" max_val="20.0" name="water_underwater_mod" top_delta="20" width="150" can_edit_text="true"/>
-
-      <text follows="left|top|right" height="10" layout="topleft" left_delta="165" top_delta="-53" width="150">フレネル係数：</text>
-      <slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.7" layout="topleft" left_delta="5" name="water_fresnel_scale" top_delta="15" width="150" can_edit_text="true"/>
-      <text follows="left|top|right" layout="topleft" left_delta="-5" name="FresnelOffsetText" top_delta="25" width="150">フレネルオフセット：</text>
-      <slider decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" left_delta="5" name="water_fresnel_offset" top_pad="5" width="150" can_edit_text="true"/>
-
-    </layout_panel>
-    <layout_panel auto_resize="true" user_resize="false" visible="true">
-      <layout_stack name="water_stack2" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="horizontal">
-        <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="460" width="50">
-          <text follows="left|top|right" height="16" layout="topleft" left="15" top="5" width="215">ノーマルマップ</text>
-          <texture_picker height="84" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="61"/>
-
-          <text follows="left|top" height="16" width="120" layout="topleft" top_delta="-20" left_delta="175">大波の速度</text>
-          <xy_vector follows="top|left" name="water_wave1_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" increment_x="0.01f" min_val_y="-20" max_val_y="20" increment_y="0.01f" arrow_color="white"/>
-
-          <text follows="left|top" height="16" layout="topleft" top_delta="-20" left_delta="140">小波の速度</text>
-          <xy_vector follows="top|left" name="water_wave2_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" min_val_y="-20" max_val_y="20" increment_x="0.01f" increment_y="0.01f" arrow_color="white"/>
-
-          <text follows="left|top|right" height="16" layout="topleft" left="10" top="90" width="215">さざ波の反射係数</text>
-          <slider decimal_digits="1" follows="left|top" increment="0.01" height="16" initial_value="0.7" layout="topleft" label="Ｘ：" left_delta="10" max_val="10" name="water_normal_scale_x" top_pad="5" width="150" can_edit_text="true"/>
-          <slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_y" top_pad="6" label="Ｙ：" width="150" can_edit_text="true"/>
-          <slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_z" top_pad="6" label="Ｚ：" width="150" can_edit_text="true"/>
-
-        </layout_panel>
-        <layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" width="50" visible="true">
-          <text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">反射とブラー：</text>
-          <text follows="left|top|right" height="16" layout="topleft" top_delta="25" left_delta="5" width="215">反射係数（上）</text>
-          <slider control_name="water_scale_above" decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.1" height="16" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_above" top_pad="5" width="200" can_edit_text="true" />
-          <text type="string" length="1" follows="left|top|right" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">反射係数（下）</text>
-          <slider control_name="water_scale_below" decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_below" top_pad="5" width="200" can_edit_text="true"/>
-          <text follows="left|top|right" font="SansSerif" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">ブラー乗数</text>
-          <slider control_name="water_blur_multip" follows="left|top" height="16" increment="0.001" initial_value="0" layout="topleft" left_delta="5" min_val="-0.5" max_val="0.5" name="water_blur_multip" top_pad="5" width="200" can_edit_text="true"/>
-        </layout_panel>
-      </layout_stack>
-    </layout_panel>
-  </layout_stack>
-</panel>     
+	<layout_stack name="water_stack1" follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
+		<layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="105">
+			<text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">
+				水中のフォグ：
+			</text>
+			<text follows="left|top" height="10" layout="left|top" left_delta="15" top_delta="0" width="60">
+				色：
+			</text>
+			<color_swatch can_apply_immediately="true" follows="left|top" height="37" label_height="0" layout="topleft" left_delta="0" name="water_fog_color" top_pad="5" width="60"/>
+			<text follows="left|top" height="10" top_delta="-15" left_delta="80" width="150">
+				密度指数：
+			</text>
+			<slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="-10" max_val="10" name="water_fog_density" top_delta="5" width="150" can_edit_text="true"/>
+			<text follows="left|top" height="10" top_delta="25" left_delta="-15" width="150">
+				水中の修飾子：
+			</text>
+			<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="0.0" max_val="20.0" name="water_underwater_mod" top_delta="20" width="150" can_edit_text="true"/>
+			<text follows="left|top|right" height="10" layout="topleft" left_delta="165" top_delta="-53" width="150">
+				フレネル係数：
+			</text>
+			<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.7" layout="topleft" left_delta="5" name="water_fresnel_scale" top_delta="15" width="150" can_edit_text="true"/>
+			<text follows="left|top|right" layout="topleft" left_delta="-5" name="FresnelOffsetText" top_delta="25" width="150">
+				フレネルオフセット：
+			</text>
+			<slider decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" left_delta="5" name="water_fresnel_offset" top_pad="5" width="150" can_edit_text="true"/>
+		</layout_panel>
+		<layout_panel auto_resize="true" user_resize="false" visible="true">
+			<layout_stack name="water_stack2" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="horizontal">
+				<layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="460" width="50">
+					<text follows="left|top|right" height="16" layout="topleft" left="15" top="5" width="215">
+						ノーマルマップ
+					</text>
+					<texture_picker height="84" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="61"/>
+					<text follows="left|top" height="16" width="120" layout="topleft" top_delta="-20" left_delta="175">
+						大波の速度
+					</text>
+					<xy_vector follows="top|left" name="water_wave1_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" increment_x="0.01f" min_val_y="-20" max_val_y="20" increment_y="0.01f" arrow_color="white"/>
+					<text follows="left|top" height="16" layout="topleft" top_delta="-20" left_delta="140">
+						小波の速度
+					</text>
+					<xy_vector follows="top|left" name="water_wave2_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" min_val_y="-20" max_val_y="20" increment_x="0.01f" increment_y="0.01f" arrow_color="white"/>
+					<text follows="left|top|right" height="16" layout="topleft" left="10" top="90" width="215">
+						さざ波の反射係数
+					</text>
+					<slider decimal_digits="1" follows="left|top" increment="0.01" height="16" initial_value="0.7" layout="topleft" label="Ｘ：" left_delta="10" max_val="10" name="water_normal_scale_x" top_pad="5" width="150" can_edit_text="true"/>
+					<slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_y" top_pad="6" label="Ｙ：" width="150" can_edit_text="true"/>
+					<slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_z" top_pad="6" label="Ｚ：" width="150" can_edit_text="true"/>
+				</layout_panel>
+				<layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" width="50" visible="true">
+					<text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">
+						反射とブラー：
+					</text>
+					<text follows="left|top|right" height="16" layout="topleft" top_delta="25" left_delta="5" width="215">
+						反射係数（上）
+					</text>
+					<slider control_name="water_scale_above" decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.1" height="16" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_above" top_pad="5" width="200" can_edit_text="true"/>
+					<text type="string" length="1" follows="left|top|right" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">
+						反射係数（下）
+					</text>
+					<slider control_name="water_scale_below" decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_below" top_pad="5" width="200" can_edit_text="true"/>
+					<text follows="left|top|right" font="SansSerif" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">
+						ブラー乗数
+					</text>
+					<slider control_name="water_blur_multip" follows="left|top" height="16" increment="0.001" initial_value="0" layout="topleft" left_delta="5" min_val="-0.5" max_val="0.5" name="water_blur_multip" top_pad="5" width="200" can_edit_text="true"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
index 4bc7411e35..d06db8ccb1 100644
--- a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="sidetray_tab_panel">
-  <text name="sidetray_tab_title" value="サイドパネル" />
-  <button name="undock" tool_tip="切り離す" />
-  <button name="dock" tool_tip="ドッキング" />
-  <button name="show_help" tool_tip="ヘルプを表示" />
-</panel>
\ No newline at end of file
+	<text name="sidetray_tab_title" value="サイドパネル"/>
+	<button name="undock" tool_tip="切り離す"/>
+	<button name="dock" tool_tip="ドッキング"/>
+	<button name="show_help" tool_tip="ヘルプを表示"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index 7e358185b9..bbece3c340 100644
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
@@ -1,28 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Part of side tray, see that XML file for panel config -->
 <panel label="home_tab" name="home_tab">
-  <scroll_container name="profile_scroll">
-    <panel name="profile_scroll_panel">
-      <panel name="sidebar_people">
-        <text name="tab_name" value="人物" />
-        <text name="tab_description">あなたのフレンド、グループ、連絡先、近隣の人物を探します。</text>
-      </panel>
-      <panel name="sidebar_places">
-        <text name="tab_name" value="場所" />
-        <text name="tab_description">行きたい場所、行ったことのある場所を探します。</text>
-      </panel>
-      <panel name="sidebar_me">
-        <text name="tab_name" value="プロフィール" />
-        <text name="tab_description">公開プロフィールを編集します。</text>
-      </panel>
-      <panel name="sidebar_appearance">
-        <text name="tab_name" value="容姿" />
-        <text name="tab_description">現在の見た目を変更します。</text>
-      </panel>
-      <panel name="sidebar_inventory">
-        <text name="tab_name" value="インベントリ" />
-        <text name="tab_description">現在のインベントリを確認します。</text>
-      </panel>
-    </panel>
-  </scroll_container>
-</panel>
\ No newline at end of file
+	<scroll_container name="profile_scroll">
+		<panel name="profile_scroll_panel">
+			<panel name="sidebar_people">
+				<text name="tab_name" value="人物"/>
+				<text name="tab_description">
+					あなたのフレンド、グループ、連絡先、近隣の人物を探します。
+				</text>
+			</panel>
+			<panel name="sidebar_places">
+				<text name="tab_name" value="場所"/>
+				<text name="tab_description">
+					行きたい場所、行ったことのある場所を探します。
+				</text>
+			</panel>
+			<panel name="sidebar_me">
+				<text name="tab_name" value="プロフィール"/>
+				<text name="tab_description">
+					公開プロフィールを編集します。
+				</text>
+			</panel>
+			<panel name="sidebar_appearance">
+				<text name="tab_name" value="容姿"/>
+				<text name="tab_description">
+					現在の見た目を変更します。
+				</text>
+			</panel>
+			<panel name="sidebar_inventory">
+				<text name="tab_name" value="インベントリ"/>
+				<text name="tab_description">
+					現在のインベントリを確認します。
+				</text>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index 78410fb88c..c55c11e928 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_inventory">
-  <icon name="title_icon" />
-  <text name="title">インベントリに保存</text>
-  <view_border name="hr" />
-  <combo_box label="解像度" name="texture_size_combo">
-    <combo_box.item label="現在のウィンドウ (512✕512)" name="CurrentWindow" />
-    <combo_box.item label="小（128✕128）" name="Small(128x128)" />
-    <combo_box.item label="中（256✕256）" name="Medium(256x256)" />
-    <combo_box.item label="大（512✕512）" name="Large(512x512)" />
-    <combo_box.item label="カスタム" name="Custom" />
-  </combo_box>
-  <spinner label="横幅✕高さ" name="inventory_snapshot_width" />
-  <spinner label="" name="inventory_snapshot_height" />
-  <check_box label="縦横比の固定" name="inventory_keep_aspect_check" />
-  <text name="hint_lbl">画像をテクスチャとして保存する場合は、いずれかの正方形を選択してください。</text>
-  <button label="キャンセル" name="cancel_btn" />
-  <button label="保存" name="save_btn" />
-</panel>
\ No newline at end of file
+	<icon name="title_icon"/>
+	<text name="title">
+		インベントリに保存
+	</text>
+	<view_border name="hr"/>
+	<combo_box label="解像度" name="texture_size_combo">
+		<combo_box.item label="現在のウィンドウ (512✕512)" name="CurrentWindow"/>
+		<combo_box.item label="小（128✕128）" name="Small(128x128)"/>
+		<combo_box.item label="中（256✕256）" name="Medium(256x256)"/>
+		<combo_box.item label="大（512✕512）" name="Large(512x512)"/>
+		<combo_box.item label="カスタム" name="Custom"/>
+	</combo_box>
+	<spinner label="横幅✕高さ" name="inventory_snapshot_width"/>
+	<spinner label="" name="inventory_snapshot_height"/>
+	<check_box label="縦横比の固定" name="inventory_keep_aspect_check"/>
+	<text name="hint_lbl">
+		画像をテクスチャとして保存する場合は、いずれかの正方形を選択してください。
+	</text>
+	<button label="キャンセル" name="cancel_btn"/>
+	<button label="保存" name="save_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
index f6d9025f10..46bf6e15bf 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_local">
-  <text name="title">ディスクに保存</text>
-  <combo_box label="解像度" name="local_size_combo">
-    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
-    <combo_box.item label="320✕240" name="320x240" />
-    <combo_box.item label="640✕480" name="640x480" />
-    <combo_box.item label="800✕600" name="800x600" />
-    <combo_box.item label="1024✕768" name="1024x768" />
-    <combo_box.item label="1280✕1024" name="1280x1024" />
-    <combo_box.item label="1600✕1200" name="1600x1200" />
-    <combo_box.item label="カスタム" name="Custom" />
-  </combo_box>
-  <spinner label="横幅✕高さ" name="local_snapshot_width" />
-  <check_box label="縦横比の固定" name="local_keep_aspect_check" />
-  <text name="local_format_label">形式：</text>
-  <combo_box label="ファイル形式" name="local_format_combo">
-    <combo_box.item label="PNG（可逆圧縮）" name="PNG" />
-    <combo_box.item label="JPEG" name="JPEG" />
-    <combo_box.item label="BMP（可逆圧縮）" name="BMP" />
-  </combo_box>
-  <slider label="品質：" name="image_quality_slider" />
-  <button label="キャンセル" name="cancel_btn" />
-  <flyout_button label="保存" name="save_btn" tool_tip="画像をファイルとして保存">
-    <flyout_button.item label="保存" name="save_item" />
-    <flyout_button.item label="名前をつけて保存…" name="saveas_item" />
-  </flyout_button>
-</panel>
\ No newline at end of file
+	<text name="title">
+		ディスクに保存
+	</text>
+	<combo_box label="解像度" name="local_size_combo">
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
+		<combo_box.item label="320✕240" name="320x240"/>
+		<combo_box.item label="640✕480" name="640x480"/>
+		<combo_box.item label="800✕600" name="800x600"/>
+		<combo_box.item label="1024✕768" name="1024x768"/>
+		<combo_box.item label="1280✕1024" name="1280x1024"/>
+		<combo_box.item label="1600✕1200" name="1600x1200"/>
+		<combo_box.item label="カスタム" name="Custom"/>
+	</combo_box>
+	<spinner label="横幅✕高さ" name="local_snapshot_width"/>
+	<check_box label="縦横比の固定" name="local_keep_aspect_check"/>
+	<text name="local_format_label">
+		形式：
+	</text>
+	<combo_box label="ファイル形式" name="local_format_combo">
+		<combo_box.item label="PNG（可逆圧縮）" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP（可逆圧縮）" name="BMP"/>
+	</combo_box>
+	<slider label="品質：" name="image_quality_slider"/>
+	<button label="キャンセル" name="cancel_btn"/>
+	<flyout_button label="保存" name="save_btn" tool_tip="画像をファイルとして保存">
+		<flyout_button.item label="保存" name="save_item"/>
+		<flyout_button.item label="名前をつけて保存…" name="saveas_item"/>
+	</flyout_button>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index df00d0610f..7a1aa280ec 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
-  <button label="ディスクに保存" name="save_to_computer_btn" />
-  <button label="インベントリに保存（L$ [AMOUNT]）" name="save_to_inventory_btn" />
-  <button label="プロフィールフィードで共有する" name="save_to_profile_btn" />
-  <button label="メールで送信" name="save_to_email_btn" />
-  <text name="fee_hint_lbl">料金はサブスクリプションレベルに基づきます。レベルが高くなるほど、料金は安くなります。</text>
-</panel>
\ No newline at end of file
+	<button label="ディスクに保存" name="save_to_computer_btn"/>
+	<button label="インベントリに保存（L$ [AMOUNT]）" name="save_to_inventory_btn"/>
+	<button label="プロフィールフィードで共有する" name="save_to_profile_btn"/>
+	<button label="メールで送信" name="save_to_email_btn"/>
+	<text name="fee_hint_lbl">
+		料金はサブスクリプションレベルに基づきます。レベルが高くなるほど、料金は安くなります。
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
index 0b05219433..9cb0b8f116 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_postcard">
-  <string name="default_subject">[SECOND_LIFE]からのポストカードです。</string>
-  <string name="default_message">ぜひご覧ください！</string>
-  <string name="upload_message">送信中…</string>
-  <text name="title">Ｅメール</text>
-  <tab_container name="postcard_tabs">
-    <panel label="メッセージ" name="panel_postcard_message" />
-    <panel label="設定" name="panel_postcard_settings" />
-  </tab_container>
-  <button label="キャンセル" name="cancel_btn" />
-  <button label="送信" name="send_btn" />
-</panel>
\ No newline at end of file
+	<string name="default_subject">
+		[SECOND_LIFE]からのポストカードです。
+	</string>
+	<string name="default_message">
+		ぜひご覧ください！
+	</string>
+	<string name="upload_message">
+		送信中…
+	</string>
+	<text name="title">
+		Ｅメール
+	</text>
+	<tab_container name="postcard_tabs">
+		<panel label="メッセージ" name="panel_postcard_message"/>
+		<panel label="設定" name="panel_postcard_settings"/>
+	</tab_container>
+	<button label="キャンセル" name="cancel_btn"/>
+	<button label="送信" name="send_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
index a7dd3649ec..571d818375 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_profile">
-  <text name="title">プロフィール</text>
-  <combo_box label="解像度" name="profile_size_combo">
-    <combo_box.item label="現在のウィンドウ" name="CurrentWindow" />
-    <combo_box.item label="640✕480" name="640x480" />
-    <combo_box.item label="800✕600" name="800x600" />
-    <combo_box.item label="1024✕768" name="1024x768" />
-    <combo_box.item label="カスタム" name="Custom" />
-  </combo_box>
-  <spinner label="横幅✕高さ" name="profile_snapshot_width" />
-  <check_box label="縦横比の固定" name="profile_keep_aspect_check" />
-  <text name="caption_label">キャプション：</text>
-  <check_box label="場所を含む" name="add_location_cb" />
-  <button label="キャンセル" name="cancel_btn" />
-  <button label="投稿" name="post_btn" />
-</panel>
\ No newline at end of file
+	<text name="title">
+		プロフィール
+	</text>
+	<combo_box label="解像度" name="profile_size_combo">
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
+		<combo_box.item label="640✕480" name="640x480"/>
+		<combo_box.item label="800✕600" name="800x600"/>
+		<combo_box.item label="1024✕768" name="1024x768"/>
+		<combo_box.item label="カスタム" name="Custom"/>
+	</combo_box>
+	<spinner label="横幅✕高さ" name="profile_snapshot_width"/>
+	<check_box label="縦横比の固定" name="profile_keep_aspect_check"/>
+	<text name="caption_label">
+		キャプション：
+	</text>
+	<check_box label="場所を含む" name="add_location_cb"/>
+	<button label="キャンセル" name="cancel_btn"/>
+	<button label="投稿" name="post_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index 92d5215988..ecd8c1caa6 100644
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
@@ -1,11 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="機器の設定" name="device_settings_panel">
-  <panel.string name="default_text">デフォルト</panel.string>
-  <string name="name_no_device">機器が設定されていません。</string>
-  <string name="name_default_system_device">デフォルトのシステム機器</string>
-  <text name="Input">入力</text>
-  <text name="Output">出力</text>
-  <text name="My volume label">マイク音量：</text>
-  <slider_bar name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します。" />
-  <text name="wait_text">しばらくお待ちください。</text>
-</panel>
\ No newline at end of file
+	<panel.string name="default_text">
+		デフォルト
+	</panel.string>
+	<string name="name_no_device">
+		機器が設定されていません。
+	</string>
+	<string name="name_default_system_device">
+		デフォルトのシステム機器
+	</string>
+	<text name="Input">
+		入力
+	</text>
+	<text name="Output">
+		出力
+	</text>
+	<text name="My volume label">
+		マイク音量：
+	</text>
+	<slider_bar name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します。"/>
+	<text name="wait_text">
+		しばらくお待ちください。
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
index 68e559a0aa..892bcf54df 100644
--- a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Width and height of this panel should be synchronized with "panel_modes" in the
-floater_moveview.xml-->
 <panel name="panel_stand_stop_flying">
-  <button label="立ち上がる" name="stand_btn" tool_tip="ここをクリックして立ち上がります。" />
-  <button label="飛行停止" name="stop_fly_btn" tool_tip="飛行停止" />
-</panel>
\ No newline at end of file
+	<button label="立ち上がる" name="stand_btn" tool_tip="ここをクリックして立ち上がります。"/>
+	<button label="飛行停止" name="stop_fly_btn" tool_tip="飛行停止"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index b4e129ab03..9feae80624 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status" title="ステータスバー">
-  <panel.string name="packet_loss_tooltip">パケット損失</panel.string>
-  <panel.string name="bandwidth_tooltip">帯域幅</panel.string>
-  <panel.string name="time">[ampm, datetime, slt]　[hour12, datetime, slt]：[min, datetime, slt]　[timezone,datetime, slt]</panel.string>
-  <panel.string name="timeTooltip">[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日（[weekday, datetime, slt]）</panel.string>
-  <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
-  <panel name="menu_search_panel">
-    <search_editor label="メニューの検索" name="search_menu_edit" tool_tip="検索したい内容をここに入力してください。メニューに部分的に一致する結果が表示されます。" />
-  </panel>
-  <panel name="balance_bg">
-    <text tool_tip="クリックしてL$残高を更新" value="L$ ??" />
-    <!-- 以下２行のWidthは消さないこと -->
-    <button label="L$を購入" name="buyL" tool_tip="クリックしてL$を購入します" width="60" />
-    <button label="ショップ" name="goShop" tool_tip="Second Lifeのマーケットプレイスを開きます。" width="70" />
-  </panel>
-  <text name="TimeText" tool_tip="現在時刻（太平洋）">午前　24：00 PST</text>
-  <icon image_name="Cam_FreeCam_Off" name="presets_icon_camera" tool_tip="カメラ" />
-  <icon image_name="Presets_Icon" name="presets_icon_graphic" tool_tip="グラフィックのプリセット" />
-  <button name="media_toggle_btn" tool_tip="すべてのメディアを開始・停止（音楽、ビデオ、Webページ）" />
-  <button name="volume_btn" tool_tip="ボリューム" />
-</panel>
\ No newline at end of file
+	<panel.string name="packet_loss_tooltip">
+		パケット損失
+	</panel.string>
+	<panel.string name="bandwidth_tooltip">
+		帯域幅
+	</panel.string>
+	<panel.string name="time">
+		[ampm, datetime, slt]　[hour12, datetime, slt]：[min, datetime, slt]　[timezone,datetime, slt]
+	</panel.string>
+	<panel.string name="timeTooltip">
+		[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日（[weekday, datetime, slt]）
+	</panel.string>
+	<panel.string name="buycurrencylabel">
+		L$ [AMT]
+	</panel.string>
+	<panel name="menu_search_panel">
+		<search_editor label="メニューの検索" name="search_menu_edit" tool_tip="検索したい内容をここに入力してください。メニューに部分的に一致する結果が表示されます。"/>
+	</panel>
+	<panel name="balance_bg">
+		<text tool_tip="クリックしてL$残高を更新" value="L$ ??"/>
+		<button label="L$を購入" name="buyL" tool_tip="クリックしてL$を購入します" width="60"/>
+		<button label="ショップ" name="goShop" tool_tip="Second Lifeのマーケットプレイスを開きます。" width="70"/>
+	</panel>
+	<text name="TimeText" tool_tip="現在時刻（太平洋）">
+		午前　24：00 PST
+	</text>
+	<icon image_name="Cam_FreeCam_Off" name="presets_icon_camera" tool_tip="カメラ"/>
+	<icon image_name="Presets_Icon" name="presets_icon_graphic" tool_tip="グラフィックのプリセット"/>
+	<button name="media_toggle_btn" tool_tip="すべてのメディアを開始・停止（音楽、ビデオ、Webページ）"/>
+	<button name="volume_btn" tool_tip="ボリューム"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
index e920086c1e..6553307e32 100644
--- a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
 <panel name="sys_well_item" title="sys_well_item">
-  <text name="title">鱒にご用心！鱒！に！ご用心！</text>
-</panel>
\ No newline at end of file
+	<text name="title">
+		鱒にご用心！鱒！に！ご用心！
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
index 82c81bcef3..8ccaa52de3 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Teleport History">
-  <accordion name="history_accordion">
-    <no_matched_tabs_text name="no_matched_teleports_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。" />
-    <no_visible_tabs_text name="no_teleports_msg" value="テレポートの履歴には何も情報がありません。[secondlife:///app/search/places/ 検索]をお試しください。" />
-    <accordion_tab name="today" title="今日" />
-    <accordion_tab name="yesterday" title="昨日" />
-    <accordion_tab name="2_days_ago" title="一昨日" />
-    <accordion_tab name="3_days_ago" title="３日前" />
-    <accordion_tab name="4_days_ago" title="４日前" />
-    <accordion_tab name="5_days_ago" title="５日前" />
-    <accordion_tab name="6_days_and_older" title="６日以上前" />
-    <accordion_tab name="1_month_and_older" title="１ヶ月以上前" />
-    <accordion_tab name="6_months_and_older" title="半年以上前" />
-  </accordion>
-  <panel label="bottom_panel" name="bottom_panel">
-    <button name="gear_btn" tool_tip="オプションを表示します" />
-  </panel>
-</panel>
\ No newline at end of file
+	<accordion name="history_accordion">
+		<no_matched_tabs_text name="no_matched_teleports_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。"/>
+		<no_visible_tabs_text name="no_teleports_msg" value="テレポートの履歴には何も情報がありません。[secondlife:///app/search/places/ 検索]をお試しください。"/>
+		<accordion_tab name="today" title="今日"/>
+		<accordion_tab name="yesterday" title="昨日"/>
+		<accordion_tab name="2_days_ago" title="一昨日"/>
+		<accordion_tab name="3_days_ago" title="３日前"/>
+		<accordion_tab name="4_days_ago" title="４日前"/>
+		<accordion_tab name="5_days_ago" title="５日前"/>
+		<accordion_tab name="6_days_and_older" title="６日以上前"/>
+		<accordion_tab name="1_month_and_older" title="１ヶ月以上前"/>
+		<accordion_tab name="6_months_and_older" title="半年以上前"/>
+	</accordion>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button name="gear_btn" tool_tip="オプションを表示します"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
index 9b6207c18e..01be31ede1 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="teleport_history_item">
-  <text name="region" value="…" />
-  <text name="timestamp" value="…" />
-  <button name="profile_btn" tool_tip="アイテム情報を表示" />
-</panel>
\ No newline at end of file
+	<text name="region" value="…"/>
+	<text name="timestamp" value="…"/>
+	<button name="profile_btn" tool_tip="アイテム情報を表示"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
index fba2427895..49efc529e4 100644
--- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -1,88 +1,112 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="テクスチャ" name="Texture">
-  <text name="color label">色</text>
-  <color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
-  <text name="color trans">透過度％</text>
-  <text name="glow label">グロー</text>
-  <check_box label="明るさ全開" name="checkbox fullbright" />
-  <combo_box name="combobox matmedia">
-    <combo_box.item label="材質" name="Materials" />
-    <combo_box.item label="メディア" name="Media" />
-  </combo_box>
-  <radio_group name="radio_material_type">
-    <radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0" />
-    <radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1" />
-    <radio_item label="輝き (反射)" name="Shininess (specular)" value="2" />
-  </radio_group>
-  <check_box initial_value="false" label="繰り返しをロックする" name="checkbox_sync_settings" tool_tip="すべてのマップの繰り返しを調整する" />
-  <texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして画像を選択します" />
-  <text name="label alphamode">アルファモード</text>
-  <combo_box name="combobox alphamode">
-    <combo_box.item label="なし" name="None" />
-    <combo_box.item label="アルファブレンディング" name="Alpha blending" />
-    <combo_box.item label="アルファマスキング" name="Alpha masking" />
-    <combo_box.item label="放射状マスク" name="Emissive mask" />
-  </combo_box>
-  <text name="label maskcutoff">マスクカットオフ</text>
-  <texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして画像を選択します" />
-  <text name="label bumpiness">凹凸</text>
-  <combo_box name="combobox bumpiness">
-    <combo_box.item label="なし" name="None" />
-    <combo_box.item label="明るさ" name="Brightness" />
-    <combo_box.item label="暗い" name="Darkness" />
-    <combo_box.item label="木目調" name="woodgrain" />
-    <combo_box.item label="樹皮" name="bark" />
-    <combo_box.item label="レンガ" name="bricks" />
-    <combo_box.item label="市松模様" name="checker" />
-    <combo_box.item label="コンクリート" name="concrete" />
-    <combo_box.item label="堅いタイル" name="crustytile" />
-    <combo_box.item label="カットストーン" name="cutstone" />
-    <combo_box.item label="円板" name="discs" />
-    <combo_box.item label="小石" name="gravel" />
-    <combo_box.item label="ペトリ皿" name="petridish" />
-    <combo_box.item label="側線" name="siding" />
-    <combo_box.item label="ストーンタイル" name="stonetile" />
-    <combo_box.item label="化粧しっくい" name="stucco" />
-    <combo_box.item label="吸盤" name="suction" />
-    <combo_box.item label="織物" name="weave" />
-  </combo_box>
-  <texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして画像を選択します" />
-  <text name="label shininess">輝き</text>
-  <combo_box name="combobox shininess">
-    <combo_box.item label="なし" name="None" />
-    <combo_box.item label="低" name="Low" />
-    <combo_box.item label="中" name="Medium" />
-    <combo_box.item label="高" name="High" />
-  </combo_box>
-  <text name="label glossiness">光沢度</text>
-  <text name="label environment">環境</text>
-  <text name="label shinycolor">色</text>
-  <color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます" />
-  <text name="media_info">選択したメディアのＵＲＬがもしあれば、ここに入ります。</text>
-  <button label="選択…" name="add_media" tool_tip="メディアを追加します" />
-  <button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します" />
-  <button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）" />
-  <text name="tex gen">マッピング</text>
-  <combo_box name="combobox texgen">
-    <combo_box.item label="デフォルト" name="Default" />
-    <combo_box.item label="平面" name="Planar" />
-  </combo_box>
-  <spinner label="水平スケール" name="TexScaleU" />
-  <spinner label="垂直スケール" name="TexScaleV" />
-  <spinner label="メーターごとに繰り返す" name="rptctrl" />
-  <spinner label="回転度" name="TexRot" />
-  <spinner label="水平オフセット" name="TexOffsetU" />
-  <spinner label="垂直オフセット" name="TexOffsetV" />
-  <spinner label="水平スケール" name="bumpyScaleU" />
-  <spinner label="垂直スケール" name="bumpyScaleV" />
-  <spinner label="回転度" name="bumpyRot" />
-  <spinner label="水平オフセット" name="bumpyOffsetU" />
-  <spinner label="垂直オフセット" name="bumpyOffsetV" />
-  <spinner label="水平スケール" name="shinyScaleU" />
-  <spinner label="垂直スケール" name="shinyScaleV" />
-  <spinner label="回転度" name="shinyRot" />
-  <spinner label="水平オフセット" name="shinyOffsetU" />
-  <spinner label="垂直オフセット" name="shinyOffsetV" />
-  <check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。" />
-  <button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える" />
-</panel>
\ No newline at end of file
+	<text name="color label">
+		色
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="color trans">
+		透過度％
+	</text>
+	<text name="glow label">
+		グロー
+	</text>
+	<check_box label="明るさ全開" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="材質" name="Materials"/>
+		<combo_box.item label="メディア" name="Media"/>
+	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="輝き (反射)" name="Shininess (specular)" value="2"/>
+	</radio_group>
+	<check_box initial_value="false" label="繰り返しをロックする" name="checkbox_sync_settings" tool_tip="すべてのマップの繰り返しを調整する"/>
+	<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして画像を選択します"/>
+	<text name="label alphamode">
+		アルファモード
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="アルファブレンディング" name="Alpha blending"/>
+		<combo_box.item label="アルファマスキング" name="Alpha masking"/>
+		<combo_box.item label="放射状マスク" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		マスクカットオフ
+	</text>
+	<texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして画像を選択します"/>
+	<text name="label bumpiness">
+		凹凸
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="明るさ" name="Brightness"/>
+		<combo_box.item label="暗い" name="Darkness"/>
+		<combo_box.item label="木目調" name="woodgrain"/>
+		<combo_box.item label="樹皮" name="bark"/>
+		<combo_box.item label="レンガ" name="bricks"/>
+		<combo_box.item label="市松模様" name="checker"/>
+		<combo_box.item label="コンクリート" name="concrete"/>
+		<combo_box.item label="堅いタイル" name="crustytile"/>
+		<combo_box.item label="カットストーン" name="cutstone"/>
+		<combo_box.item label="円板" name="discs"/>
+		<combo_box.item label="小石" name="gravel"/>
+		<combo_box.item label="ペトリ皿" name="petridish"/>
+		<combo_box.item label="側線" name="siding"/>
+		<combo_box.item label="ストーンタイル" name="stonetile"/>
+		<combo_box.item label="化粧しっくい" name="stucco"/>
+		<combo_box.item label="吸盤" name="suction"/>
+		<combo_box.item label="織物" name="weave"/>
+	</combo_box>
+	<texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして画像を選択します"/>
+	<text name="label shininess">
+		輝き
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="低" name="Low"/>
+		<combo_box.item label="中" name="Medium"/>
+		<combo_box.item label="高" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		光沢度
+	</text>
+	<text name="label environment">
+		環境
+	</text>
+	<text name="label shinycolor">
+		色
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="media_info">
+		選択したメディアのＵＲＬがもしあれば、ここに入ります。
+	</text>
+	<button label="選択…" name="add_media" tool_tip="メディアを追加します"/>
+	<button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します"/>
+	<button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）"/>
+	<text name="tex gen">
+		マッピング
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="デフォルト" name="Default"/>
+		<combo_box.item label="平面" name="Planar"/>
+	</combo_box>
+	<spinner label="水平スケール" name="TexScaleU"/>
+	<spinner label="垂直スケール" name="TexScaleV"/>
+	<spinner label="メーターごとに繰り返す" name="rptctrl"/>
+	<spinner label="回転度" name="TexRot"/>
+	<spinner label="水平オフセット" name="TexOffsetU"/>
+	<spinner label="垂直オフセット" name="TexOffsetV"/>
+	<spinner label="水平スケール" name="bumpyScaleU"/>
+	<spinner label="垂直スケール" name="bumpyScaleV"/>
+	<spinner label="回転度" name="bumpyRot"/>
+	<spinner label="水平オフセット" name="bumpyOffsetU"/>
+	<spinner label="垂直オフセット" name="bumpyOffsetV"/>
+	<spinner label="水平スケール" name="shinyScaleU"/>
+	<spinner label="垂直スケール" name="shinyScaleV"/>
+	<spinner label="回転度" name="shinyRot"/>
+	<spinner label="水平オフセット" name="shinyOffsetU"/>
+	<spinner label="垂直オフセット" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。"/>
+	<button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
index 4a8f974719..57a1bb7838 100644
--- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_voice_effect">
-  <string name="no_voice_effect">ボイスモーフィングなし</string>
-  <string name="preview_voice_effects">ボイスモーフィングをプレビュー</string>
-  <string name="get_voice_effects">ボイスモーフィングを取得</string>
-  <combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択してボイスを変更">
-    <combo_box.item label="ボイスモーフィングなし" name="no_voice_effect" />
-  </combo_box>
-</panel>
\ No newline at end of file
+	<string name="no_voice_effect">
+		ボイスモーフィングなし
+	</string>
+	<string name="preview_voice_effects">
+		ボイスモーフィングをプレビュー
+	</string>
+	<string name="get_voice_effects">
+		ボイスモーフィングを取得
+	</string>
+	<combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択してボイスを変更">
+		<combo_box.item label="ボイスモーフィングなし" name="no_voice_effect"/>
+	</combo_box>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
index 5165fa8639..849a65d0c1 100644
--- a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="volumepulldown_floater">
-  <slider label="マスター" name="System Volume" />
-  <slider label="ボタン" name="UI Volume" />
-  <slider label="環境音" name="Wind Volume" />
-  <slider label="サウンド" name="SFX Volume" />
-  <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする。" />
-  <slider label="音楽" name="Music Volume" />
-  <check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする。" />
-  <slider label="メディア" name="Media Volume" />
-  <check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする。" />
-  <slider label="ボイス" name="Voice Volume" />
-  <check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする。" />
-</panel>
\ No newline at end of file
+	<slider label="マスター" name="System Volume"/>
+	<slider label="ボタン" name="UI Volume"/>
+	<slider label="環境音" name="Wind Volume"/>
+	<slider label="サウンド" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする。"/>
+	<slider label="音楽" name="Music Volume"/>
+	<check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする。"/>
+	<slider label="メディア" name="Media Volume"/>
+	<check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする。"/>
+	<slider label="ボイス" name="Voice Volume"/>
+	<check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml
index 3811c1e624..b7c787b4c8 100644
--- a/indra/newview/skins/default/xui/ja/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml
@@ -1,23 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="world_map">
-	<panel.string name="Loading">読み込んでいます…</panel.string>
-	<panel.string name="InvalidLocation">無効な位置</panel.string>
-	<panel.string name="world_map_north">北</panel.string>
-	<panel.string name="world_map_east">東</panel.string>
-	<panel.string name="world_map_west">西</panel.string>
-	<panel.string name="world_map_south">南</panel.string>
-	<panel.string name="world_map_southeast">南東</panel.string>
-	<panel.string name="world_map_northeast">北東</panel.string>
-	<panel.string name="world_map_southwest">南西</panel.string>
-	<panel.string name="world_map_northwest">北西</panel.string>
-	<panel.string name="world_map_person">1人</panel.string>
-	<panel.string name="world_map_people">[NUMBER]人</panel.string>
-	<text label="北" name="floater_map_north" text="北">北</text>
-	<text label="東" name="floater_map_east" text="東">東</text>
-	<text label="西" name="floater_map_west" text="西">西</text>
-	<text label="南" name="floater_map_south" text="南">南</text>
-	<text label="南東" name="floater_map_southeast" text="南東">南東</text>
-	<text label="北東" name="floater_map_northeast" text="北東">北東</text>
-	<text label="南西" name="floater_map_southwest" text="南西">南西</text>
-	<text label="北西" name="floater_map_northwest" text="北西">北西</text>
-</panel>
\ No newline at end of file
+	<panel.string name="Loading">
+		読み込んでいます…
+	</panel.string>
+	<panel.string name="InvalidLocation">
+		無効な位置
+	</panel.string>
+	<panel.string name="world_map_north">
+		北
+	</panel.string>
+	<panel.string name="world_map_east">
+		東
+	</panel.string>
+	<panel.string name="world_map_west">
+		西
+	</panel.string>
+	<panel.string name="world_map_south">
+		南
+	</panel.string>
+	<panel.string name="world_map_southeast">
+		南東
+	</panel.string>
+	<panel.string name="world_map_northeast">
+		北東
+	</panel.string>
+	<panel.string name="world_map_southwest">
+		南西
+	</panel.string>
+	<panel.string name="world_map_northwest">
+		北西
+	</panel.string>
+	<panel.string name="world_map_person">
+		1人
+	</panel.string>
+	<panel.string name="world_map_people">
+		[NUMBER]人
+	</panel.string>
+	<text label="北" name="floater_map_north" text="北">
+		北
+	</text>
+	<text label="東" name="floater_map_east" text="東">
+		東
+	</text>
+	<text label="西" name="floater_map_west" text="西">
+		西
+	</text>
+	<text label="南" name="floater_map_south" text="南">
+		南
+	</text>
+	<text label="南東" name="floater_map_southeast" text="南東">
+		南東
+	</text>
+	<text label="北東" name="floater_map_northeast" text="北東">
+		北東
+	</text>
+	<text label="南西" name="floater_map_southwest" text="南西">
+		南西
+	</text>
+	<text label="北西" name="floater_map_northwest" text="北西">
+		北西
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index 73b6681772..a929cb6ac6 100644
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
-  <action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
-    <action description="このグループに人を招待" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1" />
-    <action description="このグループから「全員（Everyone）」の役割に属するメンバーを追放します" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「追放」ボタンを押して、このグループからメンバーを追放します。「オーナー」は、他の「オーナー」以外は誰でも追放できます。「オーナー」ではない人が「全員（Everyone）」にしか役割がない場合、メンバーはグループから追放されることがあります。「役割」からメンバーを削除するには、「役割からメンバーを削除」の能力が与えられている必要があります。" name="member eject" value="2" />
-    <action description="立入禁止リストの管理" longdescription="グループのメンバーに、このグループから住人を立入禁止/立入禁止解除できるようにします。" name="allow ban" value="51" />
-    <action description="「自由参加」と「入会費」の切り替え" longdescription="「自由参加」に切り替えると、招待されなくても新しいメンバーが入会できます。「入会費」は「一般」セクションで変更します。" name="member options" value="3" />
-  </action_set>
-  <action_set description="これらの能力には、グループ内の役割を追加、削除、変更し、役割にメンバーを追加、削除し、さらに役割へ能力を割り当てる権限が含まれます。" name="Roles">
-    <action description="新しい役割を作成" longdescription="新しい「役割」は、「役割とメンバー」セクション＞「役割」タブで作成します。" name="role create" value="4" />
-    <action description="役割を削除" longdescription="「役割」は、「役割とメンバー」セクション＞「役割」タブで削除します。" name="role delete" value="5" />
-    <action description="「役割」の名前、タイトル、説明、メンバー公開の有無を変更" longdescription="「役割」の名前、肩書き、説明、メンバー公開の有無を変更します。「役割」を選択後に、「役割とメンバー」セクション＞「役割」タブ の下で設定できます。" name="role properties" value="6" />
-    <action description="メンバーを割り当て人の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」に割り当てます。この能力があるメンバーは、割り当てる人が既に所属する「役割」にのみメンバーを追加できます。" name="role assign member limited" value="7" />
-    <action description="メンバーを任意の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「いずれかの役割」に割り当てます。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーを現在以上の権限のある「役割」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い力を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role assign member" value="8" />
-    <action description="役割からメンバーを解除" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」から削除します。「オーナー」は削除できません。" name="role remove member" value="9" />
-    <action description="役割の能力の割り当てと解除" longdescription="「許可された能力」（「役割とメンバー」セクション＞「役割」タブ）のリストで、各「役割」に対する「能力」を割り当てたり削除したりします。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーをすべての「能力」」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い権限を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role change actions" value="10" />
-  </action_set>
-  <action_set description="これらの能力には、グループの公開性や理念、記章の変更といった、グループのアイデンティティを修正する権限が含まれます。" name="Group Identity">
-    <action description="理念、記章、「Web 上で公開」、およびグループ情報内で公開のメンバーを変更。" longdescription="理念、記章、「検索に表示」の変更をします。「一般」セクションで行えます。" name="group change identity" value="11" />
-  </action_set>
-  <action_set description="これらの「能力」には、このグループの所有地の譲渡、修正、販売をする権限があります。「土地情報」ウィンドウを見るには、地面を右クリックして「土地情報」を選ぶか、ナビゲーションバーの「i」アイコンをクリックします。" name="Parcel Management">
-    <action description="グループ用の土地の譲渡と購入" longdescription="グループ用の土地の譲渡と購入を行います。この操作には、「土地情報」＞「一般」タブを使います。" name="land deed" value="12" />
-    <action description="リンデン総督に土地を明け渡す" longdescription="リンデン総督に土地を明け渡します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」でグループ所有の土地を放棄して、売り上げなしでリンデン総督に明け渡すことができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land release" value="13" />
-    <action description="売り地情報の設定" longdescription="売り地情報を設定します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」タブでグループ所有の土地を自分の思いどおりに販売することができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land set sale info" value="14" />
-    <action description="区画の再分割と統合" longdescription="区画を再分割、統合します。地面を右クリックして「地形を編集」を選び、マウスを土地の上でドラッグして範囲を選択します。再分割するには、分割対象を選んで「再分割」をクリックします。統合するには、2つ以上の隣接する区画を選んで「統合」をクリックします。" name="land divide join" value="15" />
-  </action_set>
-  <action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびにTPルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
-    <action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」＞「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17" />
-    <action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderateコンテンツ」設定を変更します。「土地情報」＞「オプション」タブで行います。" name="land change identity" value="18" />
-    <action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19" />
-  </action_set>
-  <action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
-    <action description="音楽とメディアの設定を変更" longdescription="ストリーミングミュージックと動画の設定を変更するには、「土地情報」＞「メディア」タブを使います。" name="land change media" value="20" />
-    <action description="「地形を編集」に切り替え" longdescription="「地形を編集」に切り替えます.*警告* 「土地情報」＞「オプション」＞「地形を編集」の順で進むと、誰でもあなたの土地の形の整備や、リンデン製の樹木の設置、移動ができます。この能力を割り振る前に、このことをよく理解しておいてください。「土地情報」＞「オプション」タブから「地形を編集」に切り替えられます。" name="land edit" value="21" />
-    <action description="「土地情報」＞「オプション」タブ内のさまざまな設定を切り替え" longdescription="「安全（ダメージなし）」、「飛行」を切り替え、住人に以下を許可します： グループ所有地の「土地情報」＞「オプション」タブ内の、「地形を編集」、「制作」、「ランドマークの作成」、「スクリプトの実行」。" name="land options" value="22" />
-    <action description="自然環境の設定とデイサイクルを修正する。" longdescription="「土地について」＞「環境」タブから自然環境の設定とデイサイクルを変更する。" name="land change environment" value="46" />
-  </action_set>
-  <action_set description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。" name="Parcel Powers">
-    <action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23" />
-    <action description="常に「飛行」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、飛行が可能です。" name="land allow fly" value="24" />
-    <action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25" />
-    <action description="着地点を無視する" longdescription="この能力を持つ役割のメンバーは、。「土地情報」＞「オプション」タブで着地点が設定されている場合でもグループ所有の区画に直接テレポートできます。" name="land allow direct teleport" value="26" />
-    <action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「ワールド」＞「ランドマーク」＞「現在地をホームに設定」を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28" />
-    <action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41" />
-  </action_set>
-  <action_set description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。" name="Parcel Access">
-    <action description="区画アクセスリストの管理" longdescription="区画アクセス・リストの管理は、「土地情報」＞「アクセス」タブで行います。" name="land manage allowed" value="29" />
-    <action description="区画禁止リストの管理" longdescription="「土地情報」＞「アクセス」タブの、区画の禁止リストの管理ができます。" name="land manage banned" value="30" />
-    <action description="「入場許可を販売」の設定を変更" longdescription="「土地情報」＞「アクセス」タブで、区画の「入場許可を販売」の設定を変更します。" name="land manage passes" value="31" />
-    <action description="区画上の住人の追放とフリーズ" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有地にいて欲しくない住人を右クリックし、「追放」や「フリーズ」を選んで対応できます。" name="land admin" value="32" />
-  </action_set>
-  <action_set description="これらの能力には、オブジェクトの返却、リンデンプラントの設置や移動を、メンバーに許可する権限が含まれます。これはメンバーがゴミ処理や景観作成をする際に便利ですが、返却したオブジェクトは元に戻せないので、注意して行いましょう。" name="Parcel Content">
-    <action description="グループ所有オブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group owned" value="48" />
-    <action description="グループに設定されているオブジェクトを返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group set" value="33" />
-    <action description="非グループオブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return non group" value="34" />
-    <action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。これらの植物はあなたのインベントリ内の「ライブラリ」＞「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35" />
-  </action_set>
-  <action_set description="これらの「能力」には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。変更は「制作ツール」＞「一般」タブで行います。オブジェクトを右クリックして「編集」を開くと設定内容を確認できます。" name="Object Management">
-    <action description="グループにオブジェクトを譲渡" longdescription="「制作ツール」＞「一般」タブで、オブジェクトをグループに譲渡します。" name="object deed" value="36" />
-    <action description="グループ所有オブジェクトの操作（移動、コピー、修正）" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを操作（移動、コピー、修正）します。" name="object manipulate" value="38" />
-    <action description="グループ所有オブジェクトを販売可能に設定" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを販売対象に設定します。" name="object set sale" value="39" />
-  </action_set>
-  <action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting">
-    <action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40" />
-  </action_set>
-  <action_set description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。" name="Notices">
-    <action description="通知を送信" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションから通知を送信できます。" name="notices send" value="42" />
-    <action description="通知の受信と過去の通知の閲覧" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションで通知を受信したり過去の通知を見ることができます。" name="notices receive" value="43" />
-  </action_set>
-  <action_set description="これらの能力には、グループチャットセッションやグループボイスチャットへのアクセスの許可や制限の権限が含まれます。" name="Chat">
-    <action description="グループチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。" name="join group chat" value="16" />
-    <action description="グループボイスチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。注：ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。" name="join voice chat" value="27" />
-    <action description="グループチャットを管理する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。" name="moderate group chat" value="37" />
-  </action_set>
-  <action_set description="これらの機能には、このグループにより所有される体験を変更する機能が含まれます。" name="experience_tools_experience">
-    <action description="体験管理者" longdescription="この機能を持つ役割のメンバーは、体験のメタデータを編集できます。" name="experience admin" value="49" />
-    <action description="体験貢献者" longdescription="この機能を持つ役割のメンバーは、体験のスクリプトを提供できます。" name="experience contributor" value="50" />
-  </action_set>
-</role_actions>
\ No newline at end of file
+	<action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
+		<action description="このグループに人を招待" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1"/>
+		<action description="このグループから「全員（Everyone）」の役割に属するメンバーを追放します" longdescription="「役割とメンバー」セクションの「メンバー」タブ内にある「追放」ボタンを押して、このグループからメンバーを追放します。「オーナー」は、他の「オーナー」以外は誰でも追放できます。「オーナー」ではない人が「全員（Everyone）」にしか役割がない場合、メンバーはグループから追放されることがあります。「役割」からメンバーを削除するには、「役割からメンバーを削除」の能力が与えられている必要があります。" name="member eject" value="2"/>
+		<action description="立入禁止リストの管理" longdescription="グループのメンバーに、このグループから住人を立入禁止/立入禁止解除できるようにします。" name="allow ban" value="51"/>
+		<action description="「自由参加」と「入会費」の切り替え" longdescription="「自由参加」に切り替えると、招待されなくても新しいメンバーが入会できます。「入会費」は「一般」セクションで変更します。" name="member options" value="3"/>
+	</action_set>
+	<action_set description="これらの能力には、グループ内の役割を追加、削除、変更し、役割にメンバーを追加、削除し、さらに役割へ能力を割り当てる権限が含まれます。" name="Roles">
+		<action description="新しい役割を作成" longdescription="新しい「役割」は、「役割とメンバー」セクション＞「役割」タブで作成します。" name="role create" value="4"/>
+		<action description="役割を削除" longdescription="「役割」は、「役割とメンバー」セクション＞「役割」タブで削除します。" name="role delete" value="5"/>
+		<action description="「役割」の名前、タイトル、説明、メンバー公開の有無を変更" longdescription="「役割」の名前、肩書き、説明、メンバー公開の有無を変更します。「役割」を選択後に、「役割とメンバー」セクション＞「役割」タブ の下で設定できます。" name="role properties" value="6"/>
+		<action description="メンバーを割り当て人の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」に割り当てます。この能力があるメンバーは、割り当てる人が既に所属する「役割」にのみメンバーを追加できます。" name="role assign member limited" value="7"/>
+		<action description="メンバーを任意の役割に割り当てる" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「いずれかの役割」に割り当てます。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーを現在以上の権限のある「役割」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い力を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role assign member" value="8"/>
+		<action description="役割からメンバーを解除" longdescription="「割り当てられた役割」（「役割とメンバー」セクション＞「メンバー」タブ）のリストで、メンバーを「役割」から削除します。「オーナー」は削除できません。" name="role remove member" value="9"/>
+		<action description="役割の能力の割り当てと解除" longdescription="「許可された能力」（「役割とメンバー」セクション＞「役割」タブ）のリストで、各「役割」に対する「能力」を割り当てたり削除したりします。*警告* この「能力」がある「役割」を持つメンバーなら誰でも自分自身と、他の「オーナー」以外のメンバーをすべての「能力」」に割り当てることができます。つまり、「オーナー」以外の人が「オーナー」に近い権限を持つよう設定できることになります。この「能力」を割り当てる前に、自分がしようとしていることをよく把握してください。" name="role change actions" value="10"/>
+	</action_set>
+	<action_set description="これらの能力には、グループの公開性や理念、記章の変更といった、グループのアイデンティティを修正する権限が含まれます。" name="Group Identity">
+		<action description="理念、記章、「Web 上で公開」、およびグループ情報内で公開のメンバーを変更。" longdescription="理念、記章、「検索に表示」の変更をします。「一般」セクションで行えます。" name="group change identity" value="11"/>
+	</action_set>
+	<action_set description="これらの「能力」には、このグループの所有地の譲渡、修正、販売をする権限があります。「土地情報」ウィンドウを見るには、地面を右クリックして「土地情報」を選ぶか、ナビゲーションバーの「i」アイコンをクリックします。" name="Parcel Management">
+		<action description="グループ用の土地の譲渡と購入" longdescription="グループ用の土地の譲渡と購入を行います。この操作には、「土地情報」＞「一般」タブを使います。" name="land deed" value="12"/>
+		<action description="リンデン総督に土地を明け渡す" longdescription="リンデン総督に土地を明け渡します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」でグループ所有の土地を放棄して、売り上げなしでリンデン総督に明け渡すことができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land release" value="13"/>
+		<action description="売り地情報の設定" longdescription="売り地情報を設定します。*警告* この能力を持つ役割のメンバーは、「土地情報」＞「一般」タブでグループ所有の土地を自分の思いどおりに販売することができます。この能力の割り当ては、そのことを理解した上で行ってください。" name="land set sale info" value="14"/>
+		<action description="区画の再分割と統合" longdescription="区画を再分割、統合します。地面を右クリックして「地形を編集」を選び、マウスを土地の上でドラッグして範囲を選択します。再分割するには、分割対象を選んで「再分割」をクリックします。統合するには、2つ以上の隣接する区画を選んで「統合」をクリックします。" name="land divide join" value="15"/>
+	</action_set>
+	<action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびにTPルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
+		<action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」＞「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17"/>
+		<action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderateコンテンツ」設定を変更します。「土地情報」＞「オプション」タブで行います。" name="land change identity" value="18"/>
+		<action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19"/>
+	</action_set>
+	<action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
+		<action description="音楽とメディアの設定を変更" longdescription="ストリーミングミュージックと動画の設定を変更するには、「土地情報」＞「メディア」タブを使います。" name="land change media" value="20"/>
+		<action description="「地形を編集」に切り替え" longdescription="「地形を編集」に切り替えます.*警告* 「土地情報」＞「オプション」＞「地形を編集」の順で進むと、誰でもあなたの土地の形の整備や、リンデン製の樹木の設置、移動ができます。この能力を割り振る前に、このことをよく理解しておいてください。「土地情報」＞「オプション」タブから「地形を編集」に切り替えられます。" name="land edit" value="21"/>
+		<action description="「土地情報」＞「オプション」タブ内のさまざまな設定を切り替え" longdescription="「安全（ダメージなし）」、「飛行」を切り替え、住人に以下を許可します： グループ所有地の「土地情報」＞「オプション」タブ内の、「地形を編集」、「制作」、「ランドマークの作成」、「スクリプトの実行」。" name="land options" value="22"/>
+		<action description="自然環境の設定とデイサイクルを修正する。" longdescription="「土地について」＞「環境」タブから自然環境の設定とデイサイクルを変更する。" name="land change environment" value="46"/>
+	</action_set>
+	<action_set description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。" name="Parcel Powers">
+		<action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23"/>
+		<action description="常に「飛行」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、飛行が可能です。" name="land allow fly" value="24"/>
+		<action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25"/>
+		<action description="着地点を無視する" longdescription="この能力を持つ役割のメンバーは、。「土地情報」＞「オプション」タブで着地点が設定されている場合でもグループ所有の区画に直接テレポートできます。" name="land allow direct teleport" value="26"/>
+		<action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「ワールド」＞「ランドマーク」＞「現在地をホームに設定」を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28"/>
+		<action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41"/>
+	</action_set>
+	<action_set description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。" name="Parcel Access">
+		<action description="区画アクセスリストの管理" longdescription="区画アクセス・リストの管理は、「土地情報」＞「アクセス」タブで行います。" name="land manage allowed" value="29"/>
+		<action description="区画禁止リストの管理" longdescription="「土地情報」＞「アクセス」タブの、区画の禁止リストの管理ができます。" name="land manage banned" value="30"/>
+		<action description="「入場許可を販売」の設定を変更" longdescription="「土地情報」＞「アクセス」タブで、区画の「入場許可を販売」の設定を変更します。" name="land manage passes" value="31"/>
+		<action description="区画上の住人の追放とフリーズ" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有地にいて欲しくない住人を右クリックし、「追放」や「フリーズ」を選んで対応できます。" name="land admin" value="32"/>
+	</action_set>
+	<action_set description="これらの能力には、オブジェクトの返却、リンデンプラントの設置や移動を、メンバーに許可する権限が含まれます。これはメンバーがゴミ処理や景観作成をする際に便利ですが、返却したオブジェクトは元に戻せないので、注意して行いましょう。" name="Parcel Content">
+		<action description="グループ所有オブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group owned" value="48"/>
+		<action description="グループに設定されているオブジェクトを返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group set" value="33"/>
+		<action description="非グループオブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return non group" value="34"/>
+		<action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。これらの植物はあなたのインベントリ内の「ライブラリ」＞「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35"/>
+	</action_set>
+	<action_set description="これらの「能力」には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。変更は「制作ツール」＞「一般」タブで行います。オブジェクトを右クリックして「編集」を開くと設定内容を確認できます。" name="Object Management">
+		<action description="グループにオブジェクトを譲渡" longdescription="「制作ツール」＞「一般」タブで、オブジェクトをグループに譲渡します。" name="object deed" value="36"/>
+		<action description="グループ所有オブジェクトの操作（移動、コピー、修正）" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを操作（移動、コピー、修正）します。" name="object manipulate" value="38"/>
+		<action description="グループ所有オブジェクトを販売可能に設定" longdescription="「制作ツール」＞「一般」タブで、グループ所有のオブジェクトを販売対象に設定します。" name="object set sale" value="39"/>
+	</action_set>
+	<action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting">
+		<action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40"/>
+	</action_set>
+	<action_set description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。" name="Notices">
+		<action description="通知を送信" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションから通知を送信できます。" name="notices send" value="42"/>
+		<action description="通知の受信と過去の通知の閲覧" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」＞「通知」セクションで通知を受信したり過去の通知を見ることができます。" name="notices receive" value="43"/>
+	</action_set>
+	<action_set description="これらの能力には、グループチャットセッションやグループボイスチャットへのアクセスの許可や制限の権限が含まれます。" name="Chat">
+		<action description="グループチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。" name="join group chat" value="16"/>
+		<action description="グループボイスチャットに参加する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。注：ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。" name="join voice chat" value="27"/>
+		<action description="グループチャットを管理する" longdescription="この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。" name="moderate group chat" value="37"/>
+	</action_set>
+	<action_set description="これらの機能には、このグループにより所有される体験を変更する機能が含まれます。" name="experience_tools_experience">
+		<action description="体験管理者" longdescription="この機能を持つ役割のメンバーは、体験のメタデータを編集できます。" name="experience admin" value="49"/>
+		<action description="体験貢献者" longdescription="この機能を持つ役割のメンバーは、体験のスクリプトを提供できます。" name="experience contributor" value="50"/>
+	</action_set>
+</role_actions>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
index fa90ec7b8c..3919ed0bc8 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="アウトフィット" name="appearance panel">
-  <string name="No Outfit" value="アウトフィットなし" />
-  <string name="Unsaved Changes" value="保存されていない変更" />
-  <string name="Now Wearing" value="着用しています…" />
-  <string name="Changing outfits" value="アウトフィットの変更" />
-  <panel name="panel_currentlook">
-    <button label="E" name="editappearance_btn" />
-    <button label="O" name="openoutfit_btn" />
-    <text name="currentlook_status">（状態）</text>
-    <text name="currentlook_name">MOOSEみたいな長い名前の私のアウトフィット</text>
-    <button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集" />
-  </panel>
-  <filter_editor label="アウトフィットをフィルタ" name="Filter" />
-</panel>
\ No newline at end of file
+	<string name="No Outfit" value="アウトフィットなし"/>
+	<string name="Unsaved Changes" value="保存されていない変更"/>
+	<string name="Now Wearing" value="着用しています…"/>
+	<string name="Changing outfits" value="アウトフィットの変更"/>
+	<panel name="panel_currentlook">
+		<button label="E" name="editappearance_btn"/>
+		<button label="O" name="openoutfit_btn"/>
+		<text name="currentlook_status">
+			（状態）
+		</text>
+		<text name="currentlook_name">
+			MOOSEみたいな長い名前の私のアウトフィット
+		</text>
+		<button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集"/>
+	</panel>
+	<filter_editor label="アウトフィットをフィルタ" name="Filter"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 939e530a55..675d3ee1a6 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -1,34 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="オブジェクト" name="objects panel">
-  <panel label="" name="sidepanel_inventory_panel">
-    <layout_stack name="inventory_layout_stack">
-      <layout_panel name="inbox_layout_panel">
-        <panel label="" name="marketplace_inbox">
-          <string name="InboxLabelWithArg">受け取ったアイテム（[NUM]個）</string>
-          <string name="InboxLabelNoArg">受け取ったアイテム</string>
-          <button label="受け取ったアイテム" name="inbox_btn" />
-          <text name="inbox_fresh_new_count">[NUM]個の新アイテム</text>
-          <panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
-            <text name="inbox_inventory_placeholder">マーケットプレイスから購入した商品はここに配達されます。</text>
-          </panel>
-        </panel>
-      </layout_panel>
-    </layout_stack>
-    <panel name="button_panel">
-      <layout_stack name="button_panel_ls">
-        <layout_panel name="info_btn_lp">
-          <button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する" />
-        </layout_panel>
-        <layout_panel name="share_btn_lp">
-          <button label="共有" name="share_btn" tool_tip="インベントリ内のアイテムを共有する。" />
-        </layout_panel>
-        <layout_panel name="shop_btn_lp">
-          <button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く" />
-          <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用す。る" />
-          <button label="再生" name="play_btn" />
-          <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする。" />
-        </layout_panel>
-      </layout_stack>
-    </panel>
-  </panel>
-</panel>
\ No newline at end of file
+	<panel label="" name="sidepanel_inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						受け取ったアイテム（[NUM]個）
+					</string>
+					<string name="InboxLabelNoArg">
+						受け取ったアイテム
+					</string>
+					<button label="受け取ったアイテム" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM]個の新アイテム
+					</text>
+					<panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
+						<text name="inbox_inventory_placeholder">
+							マーケットプレイスから購入した商品はここに配達されます。
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
+		<panel name="button_panel">
+			<layout_stack name="button_panel_ls">
+				<layout_panel name="info_btn_lp">
+					<button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する"/>
+				</layout_panel>
+				<layout_panel name="share_btn_lp">
+					<button label="共有" name="share_btn" tool_tip="インベントリ内のアイテムを共有する。"/>
+				</layout_panel>
+				<layout_panel name="shop_btn_lp">
+					<button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く"/>
+					<button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用す。る"/>
+					<button label="再生" name="play_btn"/>
+					<button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする。"/>
+				</layout_panel>
+			</layout_stack>
+		</panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index d7b62da03f..fe9998b4ce 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,50 +1,88 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="item properties" title="アイテムのプロフィール">
-  <panel.string name="loading_experience">（読み込んでいます…）</panel.string>
-  <panel.string name="unknown">（不明）</panel.string>
-  <panel.string name="unknown_multiple">（不明／複数）</panel.string>
-  <panel.string name="public">（公開）</panel.string>
-  <panel.string name="you_can">あなたができること：</panel.string>
-  <panel.string name="owner_can">所有者ができること：</panel.string>
-  <panel.string name="acquiredDate">[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]</panel.string>
-  <panel.string name="origin_inventory">（インベントリ）</panel.string>
-  <panel.string name="origin_inworld">（インワールド）</panel.string>
-  <text name="title" value="アイテムのプロフィール" />
-  <text name="origin" value="（インベントリ）" />
-  <scroll_container name="item_profile_scroll">
-    <panel label="" name="item_profile">
-      <text name="LabelItemNameTitle">名前：</text>
-      <line_editor name="LabelItemName" tool_tip="使用できる名前の文字数は最大63文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7（非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。" />
-      <text name="LabelItemDescTitle">説明：</text>
-      <line_editor name="LabelItemDesc" tool_tip="ビューアの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
-      <text name="LabelCreatorTitle">制作者：</text>
-      <text name="LabelOwnerTitle">所有者：</text>
-      <text name="LabelAcquiredTitle">取得：</text>
-      <text name="LabelItemExperienceTitle">体験：</text>
-      <panel name="perms_inv">
-        <text name="perm_modify">あなたができること：</text>
-        <check_box label="修正" name="CheckOwnerModify" />
-        <check_box label="コピー" name="CheckOwnerCopy" />
-        <check_box label="再販・譲渡" name="CheckOwnerTransfer" />
-        <text name="AnyoneLabel">全員：</text>
-        <check_box label="コピー" name="CheckEveryoneCopy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
-        <text name="GroupLabel">グループ：</text>
-        <check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
-        <text name="NextOwnerLabel">次の所有者：</text>
-        <check_box label="修正" name="CheckNextOwnerModify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
-        <check_box label="コピー" name="CheckNextOwnerCopy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
-        <check_box label="再販・譲渡" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。" />
-      </panel>
-      <check_box label="販売品" name="CheckPurchase" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
-      <combo_box name="ComboBoxSaleType" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
-        <combo_box.item label="コピー" name="Copy" />
-        <combo_box.item label="コンテンツ" name="Contents" />
-        <combo_box.item label="オリジナル" name="Original" />
-      </combo_box>
-      <spinner label="価格：L$" name="Edit Cost" tool_tip="オブジェクトの価格" />
-    </panel>
-  </scroll_container>
-  <panel name="button_panel">
-    <button label="キャンセル" name="cancel_btn" />
-  </panel>
-</panel>
\ No newline at end of file
+	<panel.string name="loading_experience">
+		（読み込んでいます…）
+	</panel.string>
+	<panel.string name="unknown">
+		（不明）
+	</panel.string>
+	<panel.string name="unknown_multiple">
+		（不明／複数）
+	</panel.string>
+	<panel.string name="public">
+		（公開）
+	</panel.string>
+	<panel.string name="you_can">
+		あなたができること：
+	</panel.string>
+	<panel.string name="owner_can">
+		所有者ができること：
+	</panel.string>
+	<panel.string name="acquiredDate">
+		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+	</panel.string>
+	<panel.string name="origin_inventory">
+		（インベントリ）
+	</panel.string>
+	<panel.string name="origin_inworld">
+		（インワールド）
+	</panel.string>
+	<text name="title" value="アイテムのプロフィール"/>
+	<text name="origin" value="（インベントリ）"/>
+	<scroll_container name="item_profile_scroll">
+		<panel label="" name="item_profile">
+			<text name="LabelItemNameTitle">
+				名前：
+			</text>
+			<line_editor name="LabelItemName" tool_tip="使用できる名前の文字数は最大63文字までです。長いプリム名は短縮されます。名前に使用できる文字は ASCII-7（非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
+			<text name="LabelItemDescTitle">
+				説明：
+			</text>
+			<line_editor name="LabelItemDesc" tool_tip="ビューアの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
+			<text name="LabelCreatorTitle">
+				制作者：
+			</text>
+			<text name="LabelOwnerTitle">
+				所有者：
+			</text>
+			<text name="LabelAcquiredTitle">
+				取得：
+			</text>
+			<text name="LabelItemExperienceTitle">
+				体験：
+			</text>
+			<panel name="perms_inv">
+				<text name="perm_modify">
+					あなたができること：
+				</text>
+				<check_box label="修正" name="CheckOwnerModify"/>
+				<check_box label="コピー" name="CheckOwnerCopy"/>
+				<check_box label="再販・譲渡" name="CheckOwnerTransfer"/>
+				<text name="AnyoneLabel">
+					全員：
+				</text>
+				<check_box label="コピー" name="CheckEveryoneCopy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
+				<text name="GroupLabel">
+					グループ：
+				</text>
+				<check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。"/>
+				<text name="NextOwnerLabel">
+					次の所有者：
+				</text>
+				<check_box label="修正" name="CheckNextOwnerModify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
+				<check_box label="コピー" name="CheckNextOwnerCopy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
+				<check_box label="再販・譲渡" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます。"/>
+			</panel>
+			<check_box label="販売品" name="CheckPurchase" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
+			<combo_box name="ComboBoxSaleType" tool_tip="購入者がコピー、コピーの中身、またはアイテム自体を受け取るのか選択してください。">
+				<combo_box.item label="コピー" name="Copy"/>
+				<combo_box.item label="コンテンツ" name="Contents"/>
+				<combo_box.item label="オリジナル" name="Original"/>
+			</combo_box>
+			<spinner label="価格：L$" name="Edit Cost" tool_tip="オブジェクトの価格"/>
+		</panel>
+	</scroll_container>
+	<panel name="button_panel">
+		<button label="キャンセル" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index 902961d931..8ff543bf92 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -1,74 +1,136 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="オブジェクトのプロフィール">
-  <panel.string name="text deed continued">再譲渡</panel.string>
-  <panel.string name="text deed">譲渡</panel.string>
-  <panel.string name="text modify info 1">このオブジェクトは、修正することができます。</panel.string>
-  <panel.string name="text modify info 2">これらのオブジェクトは、修正することができます。</panel.string>
-  <panel.string name="text modify info 3">このオブジェクトは、修正することができません。</panel.string>
-  <panel.string name="text modify info 4">これらのオブジェクトは、修正することができません。</panel.string>
-  <panel.string name="text modify info 5">リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。</panel.string>
-  <panel.string name="text modify info 6">リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。</panel.string>
-  <panel.string name="text modify warning">このオブジェクトには、パーツがリンクされています。</panel.string>
-  <panel.string name="Cost Default">価格：L$</panel.string>
-  <panel.string name="Cost Total">合計価格：L$</panel.string>
-  <panel.string name="Cost Per Unit">単価：L$</panel.string>
-  <panel.string name="Cost Mixed">総額</panel.string>
-  <panel.string name="Sale Mixed">販売額</panel.string>
-  <text name="title" value="オブジェクトのプロフィール" />
-  <text name="where" value="（インワールド）" />
-  <panel label="" name="properties_panel">
-    <text name="Name:">名前：</text>
-    <line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大６３文字までです。長いプリム名は短縮されます。名前に使用できる文字はASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。" />
-    <text name="Description:">説明：</text>
-    <line_editor name="Object Description" tool_tip="ビューアの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。" />
-    <text name="CreatorNameLabel">制作者：</text>
-    <text name="Owner:">所有者：</text>
-    <text name="Group_label">グループ：</text>
-    <button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します" />
-    <name_box initial_value="読み込んでいます…" name="Group Name Proxy" />
-    <button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます。" />
-    <text name="label click action">クリックで：</text>
-    <combo_box name="clickaction" tool_tip="マウスで１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。例えば、「触る」や「支払い」にはスクリプトが必要になります。">
-      <combo_box.item label="触る（デフォルト）" name="Touch/grab(default)" />
-      <combo_box.item label="オブジェクトに座る" name="Sitonobject" />
-      <combo_box.item label="オブジェクトを買う" name="Buyobject" />
-      <combo_box.item label="オブジェクトに支払う" name="Payobject" />
-      <combo_box.item label="開く" name="Open" />
-      <combo_box.item label="ズーム" name="Zoom" />
-      <combo_box.item label="なし" name="None" />
-    </combo_box>
-    <panel name="perms_inv">
-      <text name="perm_modify">このオブジェクトは以下の条件で修正することができます。</text>
-      <text name="Anyone can:">全員：</text>
-      <check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。" />
-      <check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。" />
-      <text name="GroupLabel">グループ：</text>
-      <check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。" />
-      <text name="NextOwnerLabel">次の所有者：</text>
-      <check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。" />
-      <check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。" />
-      <check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="次の所有者は、このオブジェクトを他人に譲渡したり再販できます" />
-    </panel>
-    <check_box label="販売" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。" />
-    <combo_box name="sale type" tool_tip="購入者がコピーを受け取るのか、コピーの中身を受け取るのか、またはアイテム自体を受け取るのかを選択してください。">
-      <combo_box.item label="コピー" name="Copy" />
-      <combo_box.item label="中身" name="Contents" />
-      <combo_box.item label="オリジナル" name="Original" />
-    </combo_box>
-    <spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。" />
-    <check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します" />
-    <text name="pathfinding_attributes_label">経路探索属性：</text>
-    <text name="B:">B：</text>
-    <text name="O:">O：</text>
-    <text name="G:">G：</text>
-    <text name="E:">E：</text>
-    <text name="N:">N：</text>
-    <text name="F:">F：</text>
-  </panel>
-  <panel name="button_panel">
-    <button label="開く" name="open_btn" tool_tip="「オブジェクトの中身」を開いて確認します。" />
-    <button label="支払う" name="pay_btn" tool_tip="「支払い」ウィンドウを開きます。オブジェクトでこの動作を実行するには、支払い用のスクリプトが必要です。" />
-    <button label="買う" name="buy_btn" tool_tip="「購入」ウィンドウを開きます。オブジェクトは販売用に設定する必要があります。" />
-    <button label="詳細" name="details_btn" tool_tip="「オブジェクトを調べる」ウィンドウを開きます。" />
-  </panel>
-</panel>
\ No newline at end of file
+	<panel.string name="text deed continued">
+		再譲渡
+	</panel.string>
+	<panel.string name="text deed">
+		譲渡
+	</panel.string>
+	<panel.string name="text modify info 1">
+		このオブジェクトは、修正することができます。
+	</panel.string>
+	<panel.string name="text modify info 2">
+		これらのオブジェクトは、修正することができます。
+	</panel.string>
+	<panel.string name="text modify info 3">
+		このオブジェクトは、修正することができません。
+	</panel.string>
+	<panel.string name="text modify info 4">
+		これらのオブジェクトは、修正することができません。
+	</panel.string>
+	<panel.string name="text modify info 5">
+		リージョン（地域）の境界を越えて、このオブジェクトを修正することはできません。
+	</panel.string>
+	<panel.string name="text modify info 6">
+		リージョン（地域）の境界を越えて、これらのオブジェクトを修正することはできません。
+	</panel.string>
+	<panel.string name="text modify warning">
+		このオブジェクトには、パーツがリンクされています。
+	</panel.string>
+	<panel.string name="Cost Default">
+		価格：L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		合計価格：L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		単価：L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		総額
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		販売額
+	</panel.string>
+	<text name="title" value="オブジェクトのプロフィール"/>
+	<text name="where" value="（インワールド）"/>
+	<panel label="" name="properties_panel">
+		<text name="Name:">
+			名前：
+		</text>
+		<line_editor name="Object Name" tool_tip="使用できる名前の文字数は最大６３文字までです。長いプリム名は短縮されます。名前に使用できる文字はASCII-7 （非拡張）に含まれる印字可能な文字のみです（縦線「|」は例外）。"/>
+		<text name="Description:">
+			説明：
+		</text>
+		<line_editor name="Object Description" tool_tip="ビューアの設定で[すべてのオブジェクト上でヒントを表示]が選択されている場合、オブジェクトにマウスのポインタをかざすとそのオブジェクトの説明がポップアップ表示されます。プリムの説明は最大127バイトまでに制限されているため、それよりも長い文字列は切り捨てられます。"/>
+		<text name="CreatorNameLabel">
+			制作者：
+		</text>
+		<text name="Owner:">
+			所有者：
+		</text>
+		<text name="Group_label">
+			グループ：
+		</text>
+		<button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します"/>
+		<name_box initial_value="読み込んでいます…" name="Group Name Proxy"/>
+		<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。グループ共有オブジェクトは、グループのオフィサーが譲渡できます。"/>
+		<text name="label click action">
+			クリックで：
+		</text>
+		<combo_box name="clickaction" tool_tip="マウスで１回左クリックすると、オブジェクトに対してアクションを起こせるようになります。各クリックアクションには、何ができるかを示す特別なカーソルがあります。クリックアクションによっては、動作要件が必要なものもあります。例えば、「触る」や「支払い」にはスクリプトが必要になります。">
+			<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
+			<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
+			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
+			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
+			<combo_box.item label="開く" name="Open"/>
+			<combo_box.item label="ズーム" name="Zoom"/>
+			<combo_box.item label="なし" name="None"/>
+		</combo_box>
+		<panel name="perms_inv">
+			<text name="perm_modify">
+				このオブジェクトは以下の条件で修正することができます。
+			</text>
+			<text name="Anyone can:">
+				全員：
+			</text>
+			<check_box label="コピー" name="checkbox allow everyone copy" tool_tip="オブジェクトのコピーは誰でも受け取ることができます。オブジェクトとそのオブジェクトの中身はすべて、コピーまたは譲渡できるように設定する必要があります。"/>
+			<check_box label="移動" name="checkbox allow everyone move" tool_tip="オブジェクトは誰でも動かすことができます。"/>
+			<text name="GroupLabel">
+				グループ：
+			</text>
+			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。"/>
+			<text name="NextOwnerLabel">
+				次の所有者：
+			</text>
+			<check_box label="修正" name="checkbox next owner can modify" tool_tip="次の所有者は、アイテム名などのプロパティ内容を編集したり、このオブジェクトのサイズを変更することができます。"/>
+			<check_box label="コピー" name="checkbox next owner can copy" tool_tip="次の所有者は、このオブジェクトを無制限にコピーできます。コピーには制作者の情報が含まれ、コピー元のアイテムと違って許可などに関し制限があります。"/>
+			<check_box label="再販・譲渡" name="checkbox next owner can transfer" tool_tip="次の所有者は、このオブジェクトを他人に譲渡したり再販できます"/>
+		</panel>
+		<check_box label="販売" name="checkbox for sale" tool_tip="このオブジェクトやオブジェクトの中身が購入できるようになるか、指定価格でインワールドにコピーできるようになります。"/>
+		<combo_box name="sale type" tool_tip="購入者がコピーを受け取るのか、コピーの中身を受け取るのか、またはアイテム自体を受け取るのかを選択してください。">
+			<combo_box.item label="コピー" name="Copy"/>
+			<combo_box.item label="中身" name="Contents"/>
+			<combo_box.item label="オリジナル" name="Original"/>
+		</combo_box>
+		<spinner label="価格： L$" name="Edit Cost" tool_tip="オブジェクトの価格。"/>
+		<check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します"/>
+		<text name="pathfinding_attributes_label">
+			経路探索属性：
+		</text>
+		<text name="B:">
+			B：
+		</text>
+		<text name="O:">
+			O：
+		</text>
+		<text name="G:">
+			G：
+		</text>
+		<text name="E:">
+			E：
+		</text>
+		<text name="N:">
+			N：
+		</text>
+		<text name="F:">
+			F：
+		</text>
+	</panel>
+	<panel name="button_panel">
+		<button label="開く" name="open_btn" tool_tip="「オブジェクトの中身」を開いて確認します。"/>
+		<button label="支払う" name="pay_btn" tool_tip="「支払い」ウィンドウを開きます。オブジェクトでこの動作を実行するには、支払い用のスクリプトが必要です。"/>
+		<button label="買う" name="buy_btn" tool_tip="「購入」ウィンドウを開きます。オブジェクトは販売用に設定する必要があります。"/>
+		<button label="詳細" name="details_btn" tool_tip="「オブジェクトを調べる」ウィンドウを開きます。"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 3d2c592ffb..fa6c329fe7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1,47 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- 
-This file contains strings that used to be hardcoded in the source.
-It is only for those strings which do not belong in a floater.
-For example, the strings used in avatar chat bubbles, and strings
-that are returned from one component and may appear in many places
--->
 <strings>
-
-  <!-- Default Args - these arguments will be replaced in all strings -->
-  <string name="SECOND_LIFE">Second Life</string>
-  <string name="APP_NAME">Second Life</string>
-  <string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
-  <string name="SECOND_LIFE_GRID">Second Lifeグリッド</string>
-  <string name="SUPPORT_SITE">Second Lifeサポートポータル</string>
-  <!-- starting up -->
-  <string name="StartupDetectingHardware">ハードウェアの検出中です…</string>
-  <string name="StartupLoading">[APP_NAME]をインストール中です…</string>
-  <string name="StartupClearingCache">キャッシュをクリア中です…</string>
-  <string name="StartupInitializingTextureCache">テクスチャキャッシュを初期化中です…</string>
-  <string name="StartupRequireDriverUpdate">グラフィックを初期化できませんでした。グラフィックドライバを更新してください。</string>
-
-  <!-- about dialog/support string-->
-  <string name="AboutHeader">[CHANNEL]　[VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3]（[ADDRESS_SIZE]bit）
-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
-  <string name="BuildConfig">ビルド構成：[BUILD_CONFIG]</string>
-
-  <string name="AboutPosition">あなたは、現在[REGION]の[POSITION_LOCAL_0,number,1]，[POSITION_LOCAL_1,number,1]，[POSITION_LOCAL_2,number,1]にいます。
+	<string name="SECOND_LIFE">
+		Second Life
+	</string>
+	<string name="APP_NAME">
+		Second Life
+	</string>
+	<string name="CAPITALIZED_APP_NAME">
+		SECOND LIFE
+	</string>
+	<string name="SECOND_LIFE_GRID">
+		Second Lifeグリッド
+	</string>
+	<string name="SUPPORT_SITE">
+		Second Lifeサポートポータル
+	</string>
+	<string name="StartupDetectingHardware">
+		ハードウェアの検出中です…
+	</string>
+	<string name="StartupLoading">
+		[APP_NAME]をインストール中です…
+	</string>
+	<string name="StartupClearingCache">
+		キャッシュをクリア中です…
+	</string>
+	<string name="StartupInitializingTextureCache">
+		テクスチャキャッシュを初期化中です…
+	</string>
+	<string name="StartupRequireDriverUpdate">
+		グラフィックを初期化できませんでした。グラフィックドライバを更新してください。
+	</string>
+	<string name="AboutHeader">
+		[CHANNEL]　[VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3]（[ADDRESS_SIZE]bit）
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</string>
+	<string name="BuildConfig">
+		ビルド構成：[BUILD_CONFIG]
+	</string>
+	<string name="AboutPosition">
+		あなたは、現在[REGION]の[POSITION_LOCAL_0,number,1]，[POSITION_LOCAL_1,number,1]，[POSITION_LOCAL_2,number,1]にいます。
 位置は、&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;です。（[HOSTIP]）
 SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 （グローバル座標は、[POSITION_0,number,1]，[POSITION_1,number,1]，[POSITION_2,number,1]です。）
 [SERVER_VERSION]
-[SERVER_RELEASE_NOTES_URL]</string>
-  <!-- *NOTE: Do not translate text like GPU, Graphics Card, etc -
-       Most PC users who know what these mean will be used to the English versions,
-       and this info sometimes gets sent to support. -->
-  <string name="AboutSystem">ＣＰＵ：[CPU]
+[SERVER_RELEASE_NOTES_URL]
+	</string>
+	<string name="AboutSystem">
+		ＣＰＵ：[CPU]
 メモリ：[MEMORY_MB]㎆
 ＯＳのバージョン：[OS_VERSION]
 グラフィックカード製造元：[GRAPHICS_CARD_VENDOR]
-グラフィックカード:[GRAPHICS_CARD]</string>
-  <string name="AboutDriver">Windowsグラフィックドライババージョン：[GRAPHICS_DRIVER_VERSION]</string>
-  <string name="AboutOGL">OpenGLバージョン：[OPENGL_VERSION]</string>
-  <string name="AboutSettings">ウィンドウサイズ:[WINDOW_WIDTH]x[WINDOW_HEIGHT]
+グラフィックカード:[GRAPHICS_CARD]
+	</string>
+	<string name="AboutDriver">
+		Windowsグラフィックドライババージョン：[GRAPHICS_DRIVER_VERSION]
+	</string>
+	<string name="AboutOGL">
+		OpenGLバージョン：[OPENGL_VERSION]
+	</string>
+	<string name="AboutSettings">
+		ウィンドウサイズ:[WINDOW_WIDTH]x[WINDOW_HEIGHT]
 フォントサイズ調整：[FONT_SIZE_ADJUSTMENT]pt
 ＵＩスケーリング：[UI_SCALE]
 描画距離：[DRAW_DISTANCE]ｍ
@@ -49,4067 +67,7438 @@ SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 ＬＯＤ係数：[LOD_FACTOR]
 描画の質：[RENDER_QUALITY]
 高度な光源モデル：[GPU_SHADERS]
-テクスチャメモリ：[TEXTURE_MEMORY]㎆</string>
-  <string name="AboutOSXHiDPI">高ＤＰＩ表示モード：[HIDPI]</string>
-  <string name="AboutLibs">J2Cデコーダバージョン：[J2C_VERSION]
+テクスチャメモリ：[TEXTURE_MEMORY]㎆
+	</string>
+	<string name="AboutOSXHiDPI">
+		高ＤＰＩ表示モード：[HIDPI]
+	</string>
+	<string name="AboutLibs">
+		J2Cデコーダバージョン：[J2C_VERSION]
 オーディオドライババージョン：[AUDIO_DRIVER_VERSION]
 LibCEFバージョン：[LIBCEF_VERSION]
 LibVLCバージョン：[LIBVLC_VERSION]
-ボイスサーバーバージョン：[VOICE_VERSION]</string>
-  <string name="AboutTraffic">パケット損失：[PACKETS_LOST,number,0]／[PACKETS_IN,number,0]（[PACKETS_PCT,number,1]％）</string>
-  <string name="AboutTime">[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日　[hour, datetime, slt]：[min,datetime, slt]：[second,datetime,slt]</string>
-  <string name="ErrorFetchingServerReleaseNotesURL">サーバーのリリースノートのＵＲＬ取得時にエラーが発生しました。</string>
-  <string name="BuildConfiguration">ビルド構成</string>
-
-  <!--  progress -->
-  <string name="ProgressRestoring">修復しています…</string>
-  <string name="ProgressChangingResolution">解像度を変更しています…</string>
-
-  <!-- Legacy strings, almost never used -->
-  <string name="Fullbright">明るさ全開（レガシー）</string>  <!-- used in the Build > materials dropdown-->
-
-  <!-- Login -->
-  <string name="LoginInProgress">ログイン中です。[APP_NAME]の表示がフリーズする場合があります。しばらくお待ちください。</string>
-  <string name="LoginInProgressNoFrozen">ログイン中です…</string>
-  <string name="LoginAuthenticating">認証しています…</string>
-  <string name="LoginMaintenance">アカウントのメンテナンスを実行しています…</string>
-  <string name="LoginAttempt">前回のログインに失敗しました。ログイン中です（[NUMBER]回目）</string>
-  <string name="LoginPrecaching">ワールドを読み込んでいます…</string>
-  <string name="LoginInitializingBrowser">内蔵Webブラウザを初期化しています…</string>
-  <string name="LoginInitializingMultimedia">マルチメディアを初期化しています…</string>
-  <string name="LoginInitializingFonts">フォントを読み込んでいます…</string>
-  <string name="LoginVerifyingCache">キャッシュファイルを検証しています（所要時間は60～90秒）…</string>
-  <string name="LoginProcessingResponse">レスポンスを処理しています…</string>
-  <string name="LoginInitializingWorld">ワールドを初期化しています…</string>
-  <string name="LoginDecodingImages">画像をデコードしています…</string>
-  <string name="LoginInitializingQuicktime">QuickTimeを初期化しています…</string>
-  <string name="LoginQuicktimeNotFound">QuickTimeが見つかりません。初期化に失敗しました。</string>
-  <string name="LoginQuicktimeOK">QuickTimeが正常に初期化されました。</string>
-  <string name="LoginRequestSeedCapGrant">リージョン（地域）の機能をリクエストしています…</string>
-  <string name="LoginRetrySeedCapGrant">リージョン（地域）の機能をリクエストしています…（試行[NUMBER]回目）</string>
-  <string name="LoginWaitingForRegionHandshake">リージョン（地域）のハンドシェイクを待っています…</string>
-  <string name="LoginConnectingToRegion">リージョン（地域）に接続しています…</string>
-  <string name="LoginDownloadingClothing">服装をダウンロードしています…</string>
-  <string name="InvalidCertificate">証明書が無効であるか、壊れています。グリッド管理者にご連絡ください。</string>
-  <string name="CertInvalidHostname">無効なホストネームがサーバーにアクセスしようとしています。SLURLかグリッドのホストネームをご確認ください。</string>
-  <string name="CertExpired">グリッドが返した証明書は、有効期限が過ぎていると考えられます。お使いのシステムクロックを確認するか、グリッドの管理者にお問い合わせください。</string>
-  <string name="CertKeyUsage">SSL証明書のエラーが発生しました。グリッド管理者にご連絡ください。</string>
-  <string name="CertBasicConstraints">サーバーの証明書チェーンに証明書が多すぎます。グリッド管理者にご連絡ください。</string>
-  <string name="CertInvalid">証明書が読み込めませんでした。グリッド管理者に連絡してください。</string>
-  <string name="CertInvalidSignature">グリッドが返したサーバー証明書の署名を認証できませんでした。グリッドの管理者にお問い合わせください。</string>
-  <string name="CertAllocationFailure">証明書にOpenSSLメモリを割り当てることができませんでした。</string>
-
-  <string name="LoginFailedNoNetwork">ネットワークエラー：接続を確立できませんでした。お使いのネットワーク接続をご確認ください。</string>
-  <string name="LoginFailedHeader">ログインに失敗しました。</string>
-  <string name="Quit">終了</string>
-  <string name="create_account_url">https://join.secondlife.com/?lang=ja&amp;sourceid=[sourceid]</string>
-
-  <string name="AgniGridLabel">Second Lifeメイングリッド (Agni)</string>
-  <string name="AditiGridLabel">Second Lifeベータテストグリッド (Aditi)</string>
-
-  <string name="ViewerDownloadURL">https://secondlife.com/support/downloads/?lang=ja</string>
-  <string name="LoginFailedViewerNotPermitted">お使いの古いビューアでは、Second Lifeにアクセスできません。以下のページから新しいビューアをダウンロードしてください： https://secondlife.com/support/downloads/?lang=ja
+ボイスサーバーバージョン：[VOICE_VERSION]
+	</string>
+	<string name="AboutTraffic">
+		パケット損失：[PACKETS_LOST,number,0]／[PACKETS_IN,number,0]（[PACKETS_PCT,number,1]％）
+	</string>
+	<string name="AboutTime">
+		[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日　[hour, datetime, slt]：[min,datetime, slt]：[second,datetime,slt]
+	</string>
+	<string name="ErrorFetchingServerReleaseNotesURL">
+		サーバーのリリースノートのＵＲＬ取得時にエラーが発生しました。
+	</string>
+	<string name="BuildConfiguration">
+		ビルド構成
+	</string>
+	<string name="ProgressRestoring">
+		修復しています…
+	</string>
+	<string name="ProgressChangingResolution">
+		解像度を変更しています…
+	</string>
+	<string name="Fullbright">
+		明るさ全開（レガシー）
+	</string>
+	<string name="LoginInProgress">
+		ログイン中です。[APP_NAME]の表示がフリーズする場合があります。しばらくお待ちください。
+	</string>
+	<string name="LoginInProgressNoFrozen">
+		ログイン中です…
+	</string>
+	<string name="LoginAuthenticating">
+		認証しています…
+	</string>
+	<string name="LoginMaintenance">
+		アカウントのメンテナンスを実行しています…
+	</string>
+	<string name="LoginAttempt">
+		前回のログインに失敗しました。ログイン中です（[NUMBER]回目）
+	</string>
+	<string name="LoginPrecaching">
+		ワールドを読み込んでいます…
+	</string>
+	<string name="LoginInitializingBrowser">
+		内蔵Webブラウザを初期化しています…
+	</string>
+	<string name="LoginInitializingMultimedia">
+		マルチメディアを初期化しています…
+	</string>
+	<string name="LoginInitializingFonts">
+		フォントを読み込んでいます…
+	</string>
+	<string name="LoginVerifyingCache">
+		キャッシュファイルを検証しています（所要時間は60～90秒）…
+	</string>
+	<string name="LoginProcessingResponse">
+		レスポンスを処理しています…
+	</string>
+	<string name="LoginInitializingWorld">
+		ワールドを初期化しています…
+	</string>
+	<string name="LoginDecodingImages">
+		画像をデコードしています…
+	</string>
+	<string name="LoginInitializingQuicktime">
+		QuickTimeを初期化しています…
+	</string>
+	<string name="LoginQuicktimeNotFound">
+		QuickTimeが見つかりません。初期化に失敗しました。
+	</string>
+	<string name="LoginQuicktimeOK">
+		QuickTimeが正常に初期化されました。
+	</string>
+	<string name="LoginRequestSeedCapGrant">
+		リージョン（地域）の機能をリクエストしています…
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		リージョン（地域）の機能をリクエストしています…（試行[NUMBER]回目）
+	</string>
+	<string name="LoginWaitingForRegionHandshake">
+		リージョン（地域）のハンドシェイクを待っています…
+	</string>
+	<string name="LoginConnectingToRegion">
+		リージョン（地域）に接続しています…
+	</string>
+	<string name="LoginDownloadingClothing">
+		服装をダウンロードしています…
+	</string>
+	<string name="InvalidCertificate">
+		証明書が無効であるか、壊れています。グリッド管理者にご連絡ください。
+	</string>
+	<string name="CertInvalidHostname">
+		無効なホストネームがサーバーにアクセスしようとしています。SLURLかグリッドのホストネームをご確認ください。
+	</string>
+	<string name="CertExpired">
+		グリッドが返した証明書は、有効期限が過ぎていると考えられます。お使いのシステムクロックを確認するか、グリッドの管理者にお問い合わせください。
+	</string>
+	<string name="CertKeyUsage">
+		SSL証明書のエラーが発生しました。グリッド管理者にご連絡ください。
+	</string>
+	<string name="CertBasicConstraints">
+		サーバーの証明書チェーンに証明書が多すぎます。グリッド管理者にご連絡ください。
+	</string>
+	<string name="CertInvalid">
+		証明書が読み込めませんでした。グリッド管理者に連絡してください。
+	</string>
+	<string name="CertInvalidSignature">
+		グリッドが返したサーバー証明書の署名を認証できませんでした。グリッドの管理者にお問い合わせください。
+	</string>
+	<string name="CertAllocationFailure">
+		証明書にOpenSSLメモリを割り当てることができませんでした。
+	</string>
+	<string name="LoginFailedNoNetwork">
+		ネットワークエラー：接続を確立できませんでした。お使いのネットワーク接続をご確認ください。
+	</string>
+	<string name="LoginFailedHeader">
+		ログインに失敗しました。
+	</string>
+	<string name="Quit">
+		終了
+	</string>
+	<string name="create_account_url">
+		https://join.secondlife.com/?lang=ja&amp;sourceid=[sourceid]
+	</string>
+	<string name="AgniGridLabel">
+		Second Lifeメイングリッド (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Second Lifeベータテストグリッド (Aditi)
+	</string>
+	<string name="ViewerDownloadURL">
+		https://secondlife.com/support/downloads/?lang=ja
+	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		お使いの古いビューアでは、Second Lifeにアクセスできません。以下のページから新しいビューアをダウンロードしてください： https://secondlife.com/support/downloads/?lang=ja
 
 詳細については、FAQ を参照してください：
-https://secondlife.com/viewer-access-faq</string>
-  <string name="LoginIntermediateOptionalUpdateAvailable">ビューアの更新（オプション）があります：[VERSION]</string>
-  <string name="LoginFailedRequiredUpdate">ビューアの更新（必須）：[VERSION]</string>
-  <string name="LoginFailedAlreadyLoggedIn">このエージェントは既にログインしています。</string>
-  <string name="LoginFailedAuthenticationFailed">申し訳ありませんが、ログインできませんでした。
+https://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		ビューアの更新（オプション）があります：[VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		ビューアの更新（必須）：[VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		このエージェントは既にログインしています。
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		申し訳ありませんが、ログインできませんでした。
 以下の情報が正しく入力されたことを確認してください：
 ・ユーザー名（bobsmith12 または steller.sunshine など）
 ・パスワード
 ・２段階認証（使用している場合）
-また、Caps Lockが入っていないこともご確認ください。</string>
-  <string name="LoginFailedPasswordChanged">セキュリティ上の理由により、あなたのパスワードは変更されました。 アカウントページ（https://secondlife.com/my/account/request.php?lang=ja-JP）へ移動し、
+また、Caps Lockが入っていないこともご確認ください。
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		セキュリティ上の理由により、あなたのパスワードは変更されました。 アカウントページ（https://secondlife.com/my/account/request.php?lang=ja-JP）へ移動し、
 秘密の質問に答えて、パスワードをリセットしてください。
-ご迷惑をおかけして申し訳ございません。</string>
-  <string name="LoginFailedPasswordReset">弊社はシステムを若干変更しました。お手数ですが、パスワードのリセットをお願いします。アカウントページ（ https://secondlife.com/my/account/request.php?lang=ja-JP ）に移動し、
+ご迷惑をおかけして申し訳ございません。
+	</string>
+	<string name="LoginFailedPasswordReset">
+		弊社はシステムを若干変更しました。お手数ですが、パスワードのリセットをお願いします。アカウントページ（ https://secondlife.com/my/account/request.php?lang=ja-JP ）に移動し、
 秘密の質問に答えて、パスワードをリセットしてください。
-ご迷惑をおかけして申し訳ございません。</string>
-  <string name="LoginFailedEmployeesOnly">Second Lifeは、メンテナンス中につき一時的にご利用いただけません。
+ご迷惑をおかけして申し訳ございません。
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		Second Lifeは、メンテナンス中につき一時的にご利用いただけません。
 従業員以外にはログインをご遠慮いただいています。
-最新の状況については www.secondlife.com/status でお確かめください。</string>
-  <string name="LoginFailedPremiumOnly">既にログインしているユーザーに最上のインワールド体験を提供するため、Second Lifeへのログインは一時的に制限されています。
-申し訳ございませんが、有料アカウントのユーザーを優先するため、現在のところ無料アカウントのユーザーには Second Lifeへのアクセスをご遠慮いただいています。</string>
-
-  <string name="LoginFailedComputerProhibited">お使いのパソコンからは、Second Lifeにアクセスできません。
-システムエラーだと思われる場合は、 support@secondlife.com にお問い合わせください。</string>
-  <string name="LoginFailedAcountSuspended">あなたのアカウントは、太平洋時間の[TIME]までご利用いただけません。</string>
-  <string name="LoginFailedAccountDisabled">現在リクエストを完了することができません。
-Second Life のサポート（ https://support.secondlife.com/ ）にお問い合わせください。</string>
-  <string name="LoginFailedTransformError">ログイン時にデータの不一致が見つかりました。
-support@secondlife.com にお問い合わせください。</string>
-  <!--'Pacific time' placeholder for [TIME] in case time from server can't be decoded-->
-  <string name="PacificTime">太平洋時間</string>
-  <string name="LoginFailedAccountMaintenance">現在アカウントのメンテナンスが行われています。
+最新の状況については www.secondlife.com/status でお確かめください。
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		既にログインしているユーザーに最上のインワールド体験を提供するため、Second Lifeへのログインは一時的に制限されています。
+申し訳ございませんが、有料アカウントのユーザーを優先するため、現在のところ無料アカウントのユーザーには Second Lifeへのアクセスをご遠慮いただいています。
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		お使いのパソコンからは、Second Lifeにアクセスできません。
+システムエラーだと思われる場合は、 support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		あなたのアカウントは、太平洋時間の[TIME]までご利用いただけません。
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		現在リクエストを完了することができません。
+Second Life のサポート（ https://support.secondlife.com/ ）にお問い合わせください。
+	</string>
+	<string name="LoginFailedTransformError">
+		ログイン時にデータの不一致が見つかりました。
+support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="PacificTime">
+		太平洋時間
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		現在アカウントのメンテナンスが行われています。
 あなたのアカウントは、
 太平洋時間の[TIME]までご利用いただけません。
-システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-  <string name="LoginFailedPendingLogoutFault">ログアウトのリスクエスト時に、シミュレーターから「fault」が返されました。</string>
-  <string name="LoginFailedPendingLogout">システムによるログアウトが実行されました。
-しばらくしてから再度お試しください。</string>
-  <string name="LoginFailedUnableToCreateSession">有効なセッションを生成できませんでした。</string>
-  <string name="LoginFailedUnableToConnectToSimulator">シミュレーターに接続できませんでした。</string>
-  <string name="LoginFailedRestrictedHours">あなたのSecond Lifeアカウントにアクセスできるのは、
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		ログアウトのリスクエスト時に、シミュレーターから「fault」が返されました。
+	</string>
+	<string name="LoginFailedPendingLogout">
+		システムによるログアウトが実行されました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		有効なセッションを生成できませんでした。
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		シミュレーターに接続できませんでした。
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		あなたのSecond Lifeアカウントにアクセスできるのは、
 太平洋時間の[START]～[END]の間に限られます。
 有効な時間帯に再度お試しください。
-システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-  <string name="LoginFailedIncorrectParameters">パラメーターが正しくありません。
-システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-  <string name="LoginFailedFirstNameNotAlphanumeric">ファーストネームのパラメーターは英数字です。
-システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-  <string name="LoginFailedLastNameNotAlphanumeric">ラストネームのパラメーターは英数字です。
-システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。</string>
-  <string name="LogoutFailedRegionGoingOffline">リージョンは、オフライン中です。
-しばらくしてから再度お試しください。</string>
-  <string name="LogoutFailedPendingLogin">このリージョンでは、別のセッションでログインされていました。
-しばらくしてから再度お試しください。</string>
-  <string name="LogoutFailedLoggingOut">このリージョンでは前のセッションがログアウトされました。
-しばらくしてから再度お試しください。</string>
-  <string name="LogoutFailedStillLoggingOut">このリージョンでは現在も前のセッションのログアウトが処理されています。
-しばらくしてから再度お試しください。</string>
-  <string name="LogoutSucceeded">リージョンでは、前のセッションがログアウトされました。
-しばらくしてから再度お試しください。</string>
-  <string name="LogoutFailedLogoutBegun">このリージョンで、ログアウトプロセスが開始されました。
-しばらくしてから再度お試しください。</string>
-  <string name="LoginFailedLoggingOutSession">あなたの前のセッションはシステムによってログアウトされています。
-しばらくしてから再度お試しください。</string>
-
-  <!-- Disconnection -->
-  <string name="AgentLostConnection">このリージョンに不都合が発生している可能性があります。ご使用のインターネット接続をご確認ください。</string>
-  <string name="SavingSettings">設定を保存中です…</string>
-  <string name="LoggingOut">ログアウト中です…</string>
-  <string name="ShuttingDown">シャットダウン中です…</string>
-  <string name="YouHaveBeenDisconnected">あなたがいたリージョンへの接続が切れました。</string>
-  <string name="SentToInvalidRegion">無効なリージョンにテレポートされました。</string>
-  <string name="TestingDisconnect">ビューアの接続を切るテスト中</string>
-
-  <!-- SLShare: User Friendly Filter Names Translation -->
-  <string name="BlackAndWhite">白黒</string>
-  <string name="Colors1970">１９７０年代のカラー</string>
-  <string name="Intense">強調</string>
-  <string name="Newspaper">新聞紙</string>
-  <string name="Sepia">セピア</string>
-  <string name="Spotlight">スポットライト</string>
-  <string name="Video">ビデオ</string>
-  <string name="Autocontrast">オートコントラスト</string>
-  <string name="LensFlare">レンズフレア</string>
-  <string name="Miniature">ミニチュア</string>
-  <string name="Toycamera">トイカメラ</string>
-
-  <!-- Tooltip -->
-  <string name="TooltipPerson">人</string>
-  <string name="TooltipNoName">（名前なし）</string>
-  <string name="TooltipOwner">所有者：</string>
-  <string name="TooltipPublic">公共</string>
-  <string name="TooltipIsGroup">（グループ）</string>
-  <string name="TooltipForSaleL$">売り出し中：L$[AMOUNT]</string>
-  <string name="TooltipFlagGroupBuild">グループ作成</string>
-  <string name="TooltipFlagNoBuild">作成禁止</string>
-  <string name="TooltipFlagNoEdit">グループ作成</string>
-  <string name="TooltipFlagNotSafe">危険</string>
-  <string name="TooltipFlagNoFly">飛行禁止</string>
-  <string name="TooltipFlagGroupScripts">グループスクリプト</string>
-  <string name="TooltipFlagNoScripts">スクリプトなし</string>
-  <string name="TooltipLand">土地：</string>
-  <string name="TooltipMustSingleDrop">アイテムは１つだけここにドラッグできます。</string>
-  <string name="TooltipTooManyWearables">[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。</string>
-  <string name="TooltipPrice" value="L$ [AMOUNT]：" />
-  <string name="TooltipSLIcon">これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。</string>
-
-  <string name="TooltipOutboxDragToWorld">マーケットプレイスのリストフォルダから、直接アイテムをRezすることはできません</string>
-  <string name="TooltipOutboxWorn">着用しているアイテムをマーケットプレイスのリストフォルダに置くことはできません。</string>
-  <string name="TooltipOutboxFolderLevels">フォルダの階層の深さが、[AMOUNT]階層を超えています。必要に応じてアイテムをボックスに入れるなどをして、フォルダの階層数を減らしてください。</string>
-  <string name="TooltipOutboxTooManyFolders">サブフォルダの数が、[AMOUNT]個を超えています。必要に応じてアイテムをボックスに入れ、リストのフォルダ階層を減らしてください。</string>
-  <string name="TooltipOutboxTooManyObjects">アイテムの数が、[AMOUNT]個を超えています。１つのリスト内で[AMOUNT]個を超えるアイテムを販売するためには、いくつかのアイテムをボックスに入れる必要があります。</string>
-  <string name="TooltipOutboxTooManyStockItems">在庫アイテム数が[AMOUNT]個を超えています。</string>
-  <string name="TooltipOutboxCannotDropOnRoot">アイテムまたはフォルダは、「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。</string>
-  <string name="TooltipOutboxNoTransfer">これらのオブジェクトは、再販したり譲渡することができません。</string>
-  <string name="TooltipOutboxNotInInventory">アイテムは、インベントリからマーケットプレイスへの移動のみできます。</string>
-  <string name="TooltipOutboxLinked">リンクされた相手またはフォルダは、マーケットプレイスに置くことはできません。</string>
-  <string name="TooltipOutboxCallingCard">コーリングカードは、マーケットプレイスに置くことはできません。</string>
-  <string name="TooltipOutboxDragActive">表示されているリストを移動できません。</string>
-  <string name="TooltipOutboxCannotMoveRoot">ルートフォルダをリストに表示するマーケットプレイスを移動できません。</string>
-  <string name="TooltipOutboxMixedStock">在庫フォルダ内のアイテムは、すべて同じ種類と権限でなければなりません。</string>
-
-  <string name="TooltipDragOntoOwnChild">フォルダをその子フォルダに移動することはできません。</string>
-  <string name="TooltipDragOntoSelf">フォルダをそのフォルダ自身に移動することはできません。</string>
-
-  <!-- tooltips for Urls -->
-  <string name="TooltipHttpUrl">クリックしてこのWebページを開きます。</string>
-  <string name="TooltipSLURL">クリックしてこの場所の情報を閲覧します。</string>
-  <string name="TooltipAgentUrl">クリックしてこの住人のプロフィールを閲覧します。</string>
-  <string name="TooltipAgentInspect">この住人の詳細を参照</string>
-  <string name="TooltipAgentMute">クリックしてこの住人に対して無視設定をします。</string>
-  <string name="TooltipAgentUnmute">クリックしてこの住人に対する無視設定を解除します。</string>
-  <string name="TooltipAgentIM">クリックしてこの住人に IM を送ります。</string>
-  <string name="TooltipAgentPay">クリックしてこの住人に支払います。</string>
-  <string name="TooltipAgentOfferTeleport">クリックしてこの住人にテレポートのオファーを送ります。</string>
-  <string name="TooltipAgentRequestFriend">クリックしてこの住人にフレンド登録リクエストを送ります。</string>
-  <string name="TooltipGroupUrl">クリックしてこのグループの説明文を閲覧します。</string>
-  <string name="TooltipEventUrl">クリックしてこのグループの説明文を閲覧します。</string>
-  <string name="TooltipClassifiedUrl">クリックしてこのクラシファイド広告を見ます。</string>
-  <string name="TooltipParcelUrl">クリックしてこの区画の説明文を見ます。</string>
-  <string name="TooltipTeleportUrl">クリックしてこの場所にテレポートします。</string>
-  <string name="TooltipObjectIMUrl">クリックしてこのオブジェクトの説明文を見ます。</string>
-  <string name="TooltipMapUrl">クリックしてこの場所をマップに表示します。</string>
-  <string name="TooltipSLAPP">クリックして secondlife:// コマンドを出します。</string>
-  <string name="CurrentURL" value="現在のＵＲＬ：[CurrentURL]" />
-  <string name="TooltipEmail">クリックして電子メールを作成します。</string>
-
-  <!-- text for SLURL labels -->
-  <string name="SLurlLabelTeleport">テレポート</string>
-  <string name="SLurlLabelShowOnMap">マップに表示</string>
-
-  <!-- label strings for secondlife:///app/agent SLapps -->
-  <string name="SLappAgentMute">無視</string>
-  <string name="SLappAgentUnmute">ミュート解除</string>
-  <string name="SLappAgentIM">ＩＭ</string>
-  <string name="SLappAgentPay">支払い</string>
-  <string name="SLappAgentOfferTeleport">次の場所へのテレポートのオファーを送ります：</string>
-  <string name="SLappAgentRequestFriend">フレンド登録リクエスト</string>
-  <string name="SLappAgentRemoveFriend">フレンドの削除</string>
-
-  <!-- ButtonToolTips, llfloater.cpp -->
-  <string name="BUTTON_CLOSE_DARWIN">閉じる（⌘W）</string>
-  <string name="BUTTON_CLOSE_WIN">閉じる（Ctrl＋W）</string>
-  <string name="BUTTON_CLOSE_CHROME">閉じる</string>
-  <string name="BUTTON_RESTORE">復帰</string>
-  <string name="BUTTON_MINIMIZE">元に戻す（縮小）</string>
-  <string name="BUTTON_TEAR_OFF">別ウィンドウで開く</string>
-  <string name="BUTTON_DOCK">ドッキング</string>
-  <string name="BUTTON_HELP">ヘルプを表示</string>
-
-  <!-- ToolTips for notecards -->
-  <string name="TooltipNotecardNotAllowedTypeDrop">このタイプのアイテムは、このリージョン（地域）のノートカードに添付することができません。</string>
-  <string name="TooltipNotecardOwnerRestrictedDrop">制限のない「次の所有者」の
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		パラメーターが正しくありません。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		ファーストネームのパラメーターは英数字です。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		ラストネームのパラメーターは英数字です。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		リージョンは、オフライン中です。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		このリージョンでは、別のセッションでログインされていました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		このリージョンでは前のセッションがログアウトされました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		このリージョンでは現在も前のセッションのログアウトが処理されています。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutSucceeded">
+		リージョンでは、前のセッションがログアウトされました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		このリージョンで、ログアウトプロセスが開始されました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		あなたの前のセッションはシステムによってログアウトされています。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="AgentLostConnection">
+		このリージョンに不都合が発生している可能性があります。ご使用のインターネット接続をご確認ください。
+	</string>
+	<string name="SavingSettings">
+		設定を保存中です…
+	</string>
+	<string name="LoggingOut">
+		ログアウト中です…
+	</string>
+	<string name="ShuttingDown">
+		シャットダウン中です…
+	</string>
+	<string name="YouHaveBeenDisconnected">
+		あなたがいたリージョンへの接続が切れました。
+	</string>
+	<string name="SentToInvalidRegion">
+		無効なリージョンにテレポートされました。
+	</string>
+	<string name="TestingDisconnect">
+		ビューアの接続を切るテスト中
+	</string>
+	<string name="BlackAndWhite">
+		白黒
+	</string>
+	<string name="Colors1970">
+		１９７０年代のカラー
+	</string>
+	<string name="Intense">
+		強調
+	</string>
+	<string name="Newspaper">
+		新聞紙
+	</string>
+	<string name="Sepia">
+		セピア
+	</string>
+	<string name="Spotlight">
+		スポットライト
+	</string>
+	<string name="Video">
+		ビデオ
+	</string>
+	<string name="Autocontrast">
+		オートコントラスト
+	</string>
+	<string name="LensFlare">
+		レンズフレア
+	</string>
+	<string name="Miniature">
+		ミニチュア
+	</string>
+	<string name="Toycamera">
+		トイカメラ
+	</string>
+	<string name="TooltipPerson">
+		人
+	</string>
+	<string name="TooltipNoName">
+		（名前なし）
+	</string>
+	<string name="TooltipOwner">
+		所有者：
+	</string>
+	<string name="TooltipPublic">
+		公共
+	</string>
+	<string name="TooltipIsGroup">
+		（グループ）
+	</string>
+	<string name="TooltipForSaleL$">
+		売り出し中：L$[AMOUNT]
+	</string>
+	<string name="TooltipFlagGroupBuild">
+		グループ作成
+	</string>
+	<string name="TooltipFlagNoBuild">
+		作成禁止
+	</string>
+	<string name="TooltipFlagNoEdit">
+		グループ作成
+	</string>
+	<string name="TooltipFlagNotSafe">
+		危険
+	</string>
+	<string name="TooltipFlagNoFly">
+		飛行禁止
+	</string>
+	<string name="TooltipFlagGroupScripts">
+		グループスクリプト
+	</string>
+	<string name="TooltipFlagNoScripts">
+		スクリプトなし
+	</string>
+	<string name="TooltipLand">
+		土地：
+	</string>
+	<string name="TooltipMustSingleDrop">
+		アイテムは１つだけここにドラッグできます。
+	</string>
+	<string name="TooltipTooManyWearables">
+		[AMOUNT]個以上のアイテムを含むフォルダを装着できません。「詳細設定」＞「デバッグ設定を表示」＞「WearFolderLimit」でこの制限を変更できます。
+	</string>
+	<string name="TooltipPrice" value="L$ [AMOUNT]："/>
+	<string name="TooltipSLIcon">
+		これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。
+	</string>
+	<string name="TooltipOutboxDragToWorld">
+		マーケットプレイスのリストフォルダから、直接アイテムをRezすることはできません
+	</string>
+	<string name="TooltipOutboxWorn">
+		着用しているアイテムをマーケットプレイスのリストフォルダに置くことはできません。
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		フォルダの階層の深さが、[AMOUNT]階層を超えています。必要に応じてアイテムをボックスに入れるなどをして、フォルダの階層数を減らしてください。
+	</string>
+	<string name="TooltipOutboxTooManyFolders">
+		サブフォルダの数が、[AMOUNT]個を超えています。必要に応じてアイテムをボックスに入れ、リストのフォルダ階層を減らしてください。
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		アイテムの数が、[AMOUNT]個を超えています。１つのリスト内で[AMOUNT]個を超えるアイテムを販売するためには、いくつかのアイテムをボックスに入れる必要があります。
+	</string>
+	<string name="TooltipOutboxTooManyStockItems">
+		在庫アイテム数が[AMOUNT]個を超えています。
+	</string>
+	<string name="TooltipOutboxCannotDropOnRoot">
+		アイテムまたはフォルダは、「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。
+	</string>
+	<string name="TooltipOutboxNoTransfer">
+		これらのオブジェクトは、再販したり譲渡することができません。
+	</string>
+	<string name="TooltipOutboxNotInInventory">
+		アイテムは、インベントリからマーケットプレイスへの移動のみできます。
+	</string>
+	<string name="TooltipOutboxLinked">
+		リンクされた相手またはフォルダは、マーケットプレイスに置くことはできません。
+	</string>
+	<string name="TooltipOutboxCallingCard">
+		コーリングカードは、マーケットプレイスに置くことはできません。
+	</string>
+	<string name="TooltipOutboxDragActive">
+		表示されているリストを移動できません。
+	</string>
+	<string name="TooltipOutboxCannotMoveRoot">
+		ルートフォルダをリストに表示するマーケットプレイスを移動できません。
+	</string>
+	<string name="TooltipOutboxMixedStock">
+		在庫フォルダ内のアイテムは、すべて同じ種類と権限でなければなりません。
+	</string>
+	<string name="TooltipDragOntoOwnChild">
+		フォルダをその子フォルダに移動することはできません。
+	</string>
+	<string name="TooltipDragOntoSelf">
+		フォルダをそのフォルダ自身に移動することはできません。
+	</string>
+	<string name="TooltipHttpUrl">
+		クリックしてこのWebページを開きます。
+	</string>
+	<string name="TooltipSLURL">
+		クリックしてこの場所の情報を閲覧します。
+	</string>
+	<string name="TooltipAgentUrl">
+		クリックしてこの住人のプロフィールを閲覧します。
+	</string>
+	<string name="TooltipAgentInspect">
+		この住人の詳細を参照
+	</string>
+	<string name="TooltipAgentMute">
+		クリックしてこの住人に対して無視設定をします。
+	</string>
+	<string name="TooltipAgentUnmute">
+		クリックしてこの住人に対する無視設定を解除します。
+	</string>
+	<string name="TooltipAgentIM">
+		クリックしてこの住人に IM を送ります。
+	</string>
+	<string name="TooltipAgentPay">
+		クリックしてこの住人に支払います。
+	</string>
+	<string name="TooltipAgentOfferTeleport">
+		クリックしてこの住人にテレポートのオファーを送ります。
+	</string>
+	<string name="TooltipAgentRequestFriend">
+		クリックしてこの住人にフレンド登録リクエストを送ります。
+	</string>
+	<string name="TooltipGroupUrl">
+		クリックしてこのグループの説明文を閲覧します。
+	</string>
+	<string name="TooltipEventUrl">
+		クリックしてこのグループの説明文を閲覧します。
+	</string>
+	<string name="TooltipClassifiedUrl">
+		クリックしてこのクラシファイド広告を見ます。
+	</string>
+	<string name="TooltipParcelUrl">
+		クリックしてこの区画の説明文を見ます。
+	</string>
+	<string name="TooltipTeleportUrl">
+		クリックしてこの場所にテレポートします。
+	</string>
+	<string name="TooltipObjectIMUrl">
+		クリックしてこのオブジェクトの説明文を見ます。
+	</string>
+	<string name="TooltipMapUrl">
+		クリックしてこの場所をマップに表示します。
+	</string>
+	<string name="TooltipSLAPP">
+		クリックして secondlife:// コマンドを出します。
+	</string>
+	<string name="CurrentURL" value="現在のＵＲＬ：[CurrentURL]"/>
+	<string name="TooltipEmail">
+		クリックして電子メールを作成します。
+	</string>
+	<string name="SLurlLabelTeleport">
+		テレポート
+	</string>
+	<string name="SLurlLabelShowOnMap">
+		マップに表示
+	</string>
+	<string name="SLappAgentMute">
+		無視
+	</string>
+	<string name="SLappAgentUnmute">
+		ミュート解除
+	</string>
+	<string name="SLappAgentIM">
+		ＩＭ
+	</string>
+	<string name="SLappAgentPay">
+		支払い
+	</string>
+	<string name="SLappAgentOfferTeleport">
+		次の場所へのテレポートのオファーを送ります：
+	</string>
+	<string name="SLappAgentRequestFriend">
+		フレンド登録リクエスト
+	</string>
+	<string name="SLappAgentRemoveFriend">
+		フレンドの削除
+	</string>
+	<string name="BUTTON_CLOSE_DARWIN">
+		閉じる（⌘W）
+	</string>
+	<string name="BUTTON_CLOSE_WIN">
+		閉じる（Ctrl＋W）
+	</string>
+	<string name="BUTTON_CLOSE_CHROME">
+		閉じる
+	</string>
+	<string name="BUTTON_RESTORE">
+		復帰
+	</string>
+	<string name="BUTTON_MINIMIZE">
+		元に戻す（縮小）
+	</string>
+	<string name="BUTTON_TEAR_OFF">
+		別ウィンドウで開く
+	</string>
+	<string name="BUTTON_DOCK">
+		ドッキング
+	</string>
+	<string name="BUTTON_HELP">
+		ヘルプを表示
+	</string>
+	<string name="TooltipNotecardNotAllowedTypeDrop">
+		このタイプのアイテムは、このリージョン（地域）のノートカードに添付することができません。
+	</string>
+	<string name="TooltipNotecardOwnerRestrictedDrop">
+		制限のない「次の所有者」の
 許可のみノートカードに
-添付できます。</string>
-
-  <!-- searching - generic -->
-  <string name="Searching">検索中…</string>
-  <string name="NoneFound">見つかりませんでした。</string>
-
-  <!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
-  <string name="RetrievingData">取得中…</string>
-
-  <string name="ReleaseNotes">リリースノート</string>
-  <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
-  <string name="RELEASE_NOTES_BASE_URL" translate="false">https://releasenotes.secondlife.com/viewer/</string>
-
-  <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
-  <string name="LoadingData">読み込んでいます…</string>
-
-  <!-- namecache -->
-  <!-- Avatar name: text shown for LLUUID::null -->
-  <string name="AvatarNameNobody">（なし）</string>
-
-  <!-- Avatar name: text shown while fetching name -->
-  <string name="AvatarNameWaiting">（待機中）</string>
-
-  <!-- Avatar name: More than one avatar is selected/used here -->
-  <string name="AvatarNameMultiple">（複数）</string>
-
-  <!-- Group name: text shown for LLUUID::null -->
-  <string name="GroupNameNone">（なし）</string>
-
-  <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
-  <string name="AssetErrorNone">エラーなし</string>
-  <string name="AssetErrorRequestFailed">アセットリクエスト：失敗</string>
-  <string name="AssetErrorNonexistentFile">アセットリクエスト：存在しないファイル</string>
-  <string name="AssetErrorNotInDatabase">アセットリクエスト：データベースに見つかりませんでした。</string>
-  <string name="AssetErrorEOF">終了</string>
-  <string name="AssetErrorCannotOpenFile">ファイルを開けません</string>
-  <string name="AssetErrorFileNotFound">ファイルが見つかりません</string>
-  <string name="AssetErrorTCPTimeout">ファイルの転送タイムアウト</string>
-  <string name="AssetErrorCircuitGone">サーキットエラー</string>
-  <string name="AssetErrorPriceMismatch">ビューアとサーバー上の値段が一致していません。</string>
-  <string name="AssetErrorUnknownStatus">不明のステータス</string>
-
-  <!-- Asset upload errors. -->
-  <string name="AssetUploadServerUnreacheble">現在、サービスをご利用いただけません。</string>
-  <string name="AssetUploadServerDifficulties">サーバーで予期せぬ問題が発生しました。</string>
-  <string name="AssetUploadServerUnavaliable">サービスがご利用いただけないか、アップロードがタイムアウトしました。</string>
-  <string name="AssetUploadRequestInvalid">アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート
-（ https://support.secondlife.com/ ）にお問い合わせください。</string>
-
-  <!-- Settings errors -->
-  <string name="SettingValidationError">インポートする設定[NAME]の検証に失敗しました。</string>
-  <string name="SettingImportFileError">ファイル[FILE]を開くことができません。</string>
-  <string name="SettingParseFileError">ファイル[FILE]を開くことができません。</string>
-  <string name="SettingTranslateError">過去のウインドライト[NAME]を変換できません。</string>
-  <!-- Asset Type human readable names:  these will replace variable [TYPE] in notification FailedToFindWearable* -->
-  <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
-  <string name="texture">テクスチャ</string>
-  <string name="sound">サウンド</string>
-  <string name="calling card">コーリングカード</string>
-  <string name="landmark">ランドマーク</string>
-  <string name="legacy script">レガシースクリプト</string>
-  <string name="clothing">服装</string>
-  <string name="object">オブジェクト</string>
-  <string name="note card">ノートカード</string>
-  <string name="folder">フォルダ</string>
-  <string name="root">ルート</string>
-  <string name="lsl2 script">LSL2スクリプト</string>
-  <string name="lsl bytecode">LSLバイトコード</string>
-  <string name="tga texture">tgaテクスチャ</string>
-  <string name="body part">身体部位</string>
-  <string name="snapshot">スナップショット</string>
-  <string name="lost and found">遺失物</string>
-  <string name="targa image">targa画像</string>
-  <string name="trash">ごみ箱</string>
-  <string name="jpeg image">jpeg画像</string>
-  <string name="animation">アニメーション</string>
-  <string name="gesture">ジェスチャー</string>
-  <string name="simstate">統計</string>
-  <string name="favorite">お気に入り</string>
-  <string name="symbolic link">リンク</string>
-  <string name="symbolic folder link">フォルダのリンク</string>
-  <string name="settings blob">設定</string>
-  <string name="mesh">メッシュ</string>
-
-  <!-- llvoavatar. Displayed in the avatar chat bubble -->
-  <string name="AvatarEditingAppearance">（容姿の編集中）</string>
-  <string name="AvatarAway">一時退席中</string>
-  <string name="AvatarDoNotDisturb">着信拒否</string>
-  <string name="AvatarMuted">ブロック中</string>
-
-  <!-- animations -->
-  <string name="anim_express_afraid">怖れ</string>
-  <string name="anim_express_anger">怒り</string>
-  <string name="anim_away">退席中</string>
-  <string name="anim_backflip">後ろ宙返り</string>
-  <string name="anim_express_laugh">大笑い</string>
-  <string name="anim_express_toothsmile">満面の笑顔</string>
-  <string name="anim_blowkiss">投げキッス</string>
-  <string name="anim_express_bored">退屈</string>
-  <string name="anim_bow">おじぎ</string>
-  <string name="anim_clap">拍手</string>
-  <string name="anim_courtbow">深いおじぎ</string>
-  <string name="anim_express_cry">泣く</string>
-  <string name="anim_dance1">ダンス１</string>
-  <string name="anim_dance2">ダンス２</string>
-  <string name="anim_dance3">ダンス３</string>
-  <string name="anim_dance4">ダンス４</string>
-  <string name="anim_dance5">ダンス５</string>
-  <string name="anim_dance6">ダンス６</string>
-  <string name="anim_dance7">ダンス７</string>
-  <string name="anim_dance8">ダンス８</string>
-  <string name="anim_express_disdain">侮蔑</string>
-  <string name="anim_drink">酔っぱらう</string>
-  <string name="anim_express_embarrased">困惑</string>
-  <string name="anim_angry_fingerwag">指を振る</string>
-  <string name="anim_fist_pump">ガッツポーズ</string>
-  <string name="anim_yoga_float">ヨガ浮遊</string>
-  <string name="anim_express_frown">しかめっ面</string>
-  <string name="anim_impatient">いらいらする</string>
-  <string name="anim_jumpforjoy">飛び上がって喜ぶ</string>
-  <string name="anim_kissmybutt">挑発ポーズ</string>
-  <string name="anim_express_kiss">キス</string>
-  <string name="anim_laugh_short">笑う</string>
-  <string name="anim_musclebeach">力こぶを見せる</string>
-  <string name="anim_no_unhappy">不満げに否定する</string>
-  <string name="anim_no_head">否定する</string>
-  <string name="anim_nyanya">冷やかす</string>
-  <string name="anim_punch_onetwo">ワンツー・パンチ</string>
-  <string name="anim_express_open_mouth">口を開けて驚く</string>
-  <string name="anim_peace">ピース・サイン</string>
-  <string name="anim_point_you">他人を指差す</string>
-  <string name="anim_point_me">自分を指差す</string>
-  <string name="anim_punch_l">左パンチ</string>
-  <string name="anim_punch_r">右パンチ</string>
-  <string name="anim_rps_countdown">じゃんけんポーズ</string>
-  <string name="anim_rps_paper">パー</string>
-  <string name="anim_rps_rock">グー</string>
-  <string name="anim_rps_scissors">チョキ</string>
-  <string name="anim_express_repulsed">嫌悪感</string>
-  <string name="anim_kick_roundhouse_r">まわし蹴り</string>
-  <string name="anim_express_sad">悲しむ</string>
-  <string name="anim_salute">敬礼する</string>
-  <string name="anim_shout">叫ぶ</string>
-  <string name="anim_express_shrug">肩をすくめる</string>
-  <string name="anim_express_smile">微笑む</string>
-  <string name="anim_smoke_idle">たばこをくゆらす</string>
-  <string name="anim_smoke_inhale">たばこを吸う</string>
-  <string name="anim_smoke_throw_down">たばこを捨てる</string>
-  <string name="anim_express_surprise">驚く</string>
-  <string name="anim_sword_strike_r">剣で斬りつける</string>
-  <string name="anim_angry_tantrum">じだんだを踏む</string>
-  <string name="anim_express_tongue_out">舌を出す</string>
-  <string name="anim_hello">手を振る</string>
-  <string name="anim_whisper">小声で話す</string>
-  <string name="anim_whistle">口笛を吹く</string>
-  <string name="anim_express_wink">ウィンク</string>
-  <string name="anim_wink_hollywood">ウィンク（ハリウッド）</string>
-  <string name="anim_express_worry">心配する</string>
-  <string name="anim_yes_happy">笑顔で頷く</string>
-  <string name="anim_yes_head">頷く</string>
-
-  <!-- build floater -->
-  <string name="multiple_textures">複数</string>
-
-  <string name="use_texture">テクスチャを使用</string>
-  <string name="manip_hint1">マウスカーソルをルーラに合わせて</string>
-  <string name="manip_hint2">グリッドにスナップ</string>
-
-  <!-- world map -->
-  <string name="texture_loading">読み込んでいます…</string>
-  <string name="worldmap_offline">オフライン</string>
-  <string name="worldmap_item_tooltip_format">[AREA]㎡　L$ [PRICE]（[SQMPRICE] L$／㎡）</string>
-  <string name="worldmap_results_none_found">何も見つかりませんでした。</string>
-
-  <!-- animations uploading status codes -->
-  <string name="Ok">OK</string>
-  <string name="Premature end of file">不完全なファイル</string>
-  <string name="ST_NO_JOINT">ROOT または JOINT が見つかりません</string>
-
-  <!-- Chat -->
-  <string name="NearbyChatTitle">近隣チャット</string>
-  <string name="NearbyChatLabel">（近隣のチャット）</string>
-  <string name="whisper">のささやき：</string>
-  <string name="shout">のシャウト：</string>
-  <string name="ringing">インワールドボイスチャットに接続中…</string>
-  <string name="connected">接続しました</string>
-  <string name="unavailable">現在地では、ボイスを利用できません。</string>
-  <string name="hang_up">インワールドボイスチャットの通話が切断されました。</string>
-  <string name="reconnect_nearby">「近隣ボイスチャット」に再接続されます。</string>
-  <string name="ScriptQuestionCautionChatGranted">リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を許可しました：[PERMISSIONS]</string>
-  <string name="ScriptQuestionCautionChatDenied">リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を拒否しました：[PERMISSIONS]</string>
-  <string name="AdditionalPermissionsRequestHeader">あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：</string>
-  <string name="ScriptTakeMoney">リンデンドル（L$）のお支払い</string>
-  <string name="ActOnControlInputs">制御入力に基づいて行動</string>
-  <string name="RemapControlInputs">制御入力のリマップ</string>
-  <string name="AnimateYourAvatar">アバターへのアニメーション動作</string>
-  <string name="AttachToYourAvatar">アバターに装着</string>
-  <string name="ReleaseOwnership">所有権を解放し公共物とする</string>
-  <string name="LinkAndDelink">他のオブジェクトのリンクとリンク解除</string>
-  <string name="AddAndRemoveJoints">他のオブジェクトとのジョイントの追加と削除</string>
-  <string name="ChangePermissions">権限の変更</string>
-  <string name="TrackYourCamera">カメラ追従</string>
-  <string name="ControlYourCamera">カメラ操作</string>
-  <string name="TeleportYourAgent">あなたをテレポート</string>
-  <string name="ForceSitAvatar">アバターを強制的に座らせる</string>
-  <string name="ChangeEnvSettings">自然環境の設定を変更する</string>
-
-  <string name="NotConnected">接続されていません</string>
-  <!-- Substitution for agent name -->
-  <string name="AgentNameSubst">（あなた）</string>
-  <!-- intentionally blank -->
-  <string name="JoinAnExperience">体験に参加</string>
-  <string name="SilentlyManageEstateAccess">土地のアクセスリストを管理するときにアラートを表示しない</string>
-  <string name="OverrideYourAnimations">デフォルトのアニメーションを置き換え</string>
-  <string name="ScriptReturnObjects">あなたの代わりにオブジェクトを返却</string>
-  <string name="UnknownScriptPermission">（不明）！</string>
-
-  <!-- Sim Access labels -->
-  <string name="SIM_ACCESS_PG">General</string>
-  <string name="SIM_ACCESS_MATURE">Moderate</string>
-  <string name="SIM_ACCESS_ADULT">Adult</string>
-  <string name="SIM_ACCESS_DOWN">オフライン</string>
-  <string name="SIM_ACCESS_MIN">不明</string>
-
-  <!-- For use when we do not have land type back from the server -->
-  <string name="land_type_unknown">（不明）</string>
-
-  <!-- For land type back from the simulator -->
-  <string name="Estate / Full Region">不動産／フルリージョン</string>
-  <string name="Estate / Homestead">不動産／入植地</string>
-  <string name="Mainland / Homestead">メインランド／入植地</string>
-  <string name="Mainland / Full Region">メインランド／フルリージョン</string>
-
-  <!-- File load/save dialogs -->
-  <string name="all_files">全てのファイル</string>
-  <string name="sound_files">サウンド</string>
-  <string name="animation_files">アニメーション</string>
-  <string name="image_files">画像</string>
-  <string name="save_file_verb">保存</string>
-  <string name="load_file_verb">ロード</string>
-  <string name="targa_image_files">Targa画像</string>
-  <string name="bitmap_image_files">ビットマップ画像</string>
-  <string name="png_image_files">PNG画像</string>
-  <string name="save_texture_image_files">TargaまたはPNG画像</string>
-  <string name="avi_movie_file">AVIムービーファイル</string>
-  <string name="xaf_animation_file">XAFアニメーションファイル</string>
-  <string name="xml_file">XMLファイル</string>
-  <string name="raw_file">RAWファイル</string>
-  <string name="compressed_image_files">圧縮画像</string>
-  <string name="load_files">ファイルのロード</string>
-  <string name="choose_the_directory">参照</string>
-  <string name="script_files">スクリプト</string>
-  <string name="dictionary_files">辞書</string>
-
-  <!-- LSL Usage Hover Tips -->
-  <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window).
-This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings.  -->
-  <string name="LSLTipSleepTime" translate="false">
-Sleeps script for [SLEEP_TIME] seconds.
-  </string>
-
-  <string name="LSLTipText_llSin" translate="false">
-float llSin(float theta)
+添付できます。
+	</string>
+	<string name="Searching">
+		検索中…
+	</string>
+	<string name="NoneFound">
+		見つかりませんでした。
+	</string>
+	<string name="RetrievingData">
+		取得中…
+	</string>
+	<string name="ReleaseNotes">
+		リリースノート
+	</string>
+	<string name="RELEASE_NOTES_BASE_URL" translate="false">
+		https://releasenotes.secondlife.com/viewer/
+	</string>
+	<string name="LoadingData">
+		読み込んでいます…
+	</string>
+	<string name="AvatarNameNobody">
+		（なし）
+	</string>
+	<string name="AvatarNameWaiting">
+		（待機中）
+	</string>
+	<string name="AvatarNameMultiple">
+		（複数）
+	</string>
+	<string name="GroupNameNone">
+		（なし）
+	</string>
+	<string name="AssetErrorNone">
+		エラーなし
+	</string>
+	<string name="AssetErrorRequestFailed">
+		アセットリクエスト：失敗
+	</string>
+	<string name="AssetErrorNonexistentFile">
+		アセットリクエスト：存在しないファイル
+	</string>
+	<string name="AssetErrorNotInDatabase">
+		アセットリクエスト：データベースに見つかりませんでした。
+	</string>
+	<string name="AssetErrorEOF">
+		終了
+	</string>
+	<string name="AssetErrorCannotOpenFile">
+		ファイルを開けません
+	</string>
+	<string name="AssetErrorFileNotFound">
+		ファイルが見つかりません
+	</string>
+	<string name="AssetErrorTCPTimeout">
+		ファイルの転送タイムアウト
+	</string>
+	<string name="AssetErrorCircuitGone">
+		サーキットエラー
+	</string>
+	<string name="AssetErrorPriceMismatch">
+		ビューアとサーバー上の値段が一致していません。
+	</string>
+	<string name="AssetErrorUnknownStatus">
+		不明のステータス
+	</string>
+	<string name="AssetUploadServerUnreacheble">
+		現在、サービスをご利用いただけません。
+	</string>
+	<string name="AssetUploadServerDifficulties">
+		サーバーで予期せぬ問題が発生しました。
+	</string>
+	<string name="AssetUploadServerUnavaliable">
+		サービスがご利用いただけないか、アップロードがタイムアウトしました。
+	</string>
+	<string name="AssetUploadRequestInvalid">
+		アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート
+（ https://support.secondlife.com/ ）にお問い合わせください。
+	</string>
+	<string name="SettingValidationError">
+		インポートする設定[NAME]の検証に失敗しました。
+	</string>
+	<string name="SettingImportFileError">
+		ファイル[FILE]を開くことができません。
+	</string>
+	<string name="SettingParseFileError">
+		ファイル[FILE]を開くことができません。
+	</string>
+	<string name="SettingTranslateError">
+		過去のウインドライト[NAME]を変換できません。
+	</string>
+	<string name="texture">
+		テクスチャ
+	</string>
+	<string name="sound">
+		サウンド
+	</string>
+	<string name="calling card">
+		コーリングカード
+	</string>
+	<string name="landmark">
+		ランドマーク
+	</string>
+	<string name="legacy script">
+		レガシースクリプト
+	</string>
+	<string name="clothing">
+		服装
+	</string>
+	<string name="object">
+		オブジェクト
+	</string>
+	<string name="note card">
+		ノートカード
+	</string>
+	<string name="folder">
+		フォルダ
+	</string>
+	<string name="root">
+		ルート
+	</string>
+	<string name="lsl2 script">
+		LSL2スクリプト
+	</string>
+	<string name="lsl bytecode">
+		LSLバイトコード
+	</string>
+	<string name="tga texture">
+		tgaテクスチャ
+	</string>
+	<string name="body part">
+		身体部位
+	</string>
+	<string name="snapshot">
+		スナップショット
+	</string>
+	<string name="lost and found">
+		遺失物
+	</string>
+	<string name="targa image">
+		targa画像
+	</string>
+	<string name="trash">
+		ごみ箱
+	</string>
+	<string name="jpeg image">
+		jpeg画像
+	</string>
+	<string name="animation">
+		アニメーション
+	</string>
+	<string name="gesture">
+		ジェスチャー
+	</string>
+	<string name="simstate">
+		統計
+	</string>
+	<string name="favorite">
+		お気に入り
+	</string>
+	<string name="symbolic link">
+		リンク
+	</string>
+	<string name="symbolic folder link">
+		フォルダのリンク
+	</string>
+	<string name="settings blob">
+		設定
+	</string>
+	<string name="mesh">
+		メッシュ
+	</string>
+	<string name="AvatarEditingAppearance">
+		（容姿の編集中）
+	</string>
+	<string name="AvatarAway">
+		一時退席中
+	</string>
+	<string name="AvatarDoNotDisturb">
+		着信拒否
+	</string>
+	<string name="AvatarMuted">
+		ブロック中
+	</string>
+	<string name="anim_express_afraid">
+		怖れ
+	</string>
+	<string name="anim_express_anger">
+		怒り
+	</string>
+	<string name="anim_away">
+		退席中
+	</string>
+	<string name="anim_backflip">
+		後ろ宙返り
+	</string>
+	<string name="anim_express_laugh">
+		大笑い
+	</string>
+	<string name="anim_express_toothsmile">
+		満面の笑顔
+	</string>
+	<string name="anim_blowkiss">
+		投げキッス
+	</string>
+	<string name="anim_express_bored">
+		退屈
+	</string>
+	<string name="anim_bow">
+		おじぎ
+	</string>
+	<string name="anim_clap">
+		拍手
+	</string>
+	<string name="anim_courtbow">
+		深いおじぎ
+	</string>
+	<string name="anim_express_cry">
+		泣く
+	</string>
+	<string name="anim_dance1">
+		ダンス１
+	</string>
+	<string name="anim_dance2">
+		ダンス２
+	</string>
+	<string name="anim_dance3">
+		ダンス３
+	</string>
+	<string name="anim_dance4">
+		ダンス４
+	</string>
+	<string name="anim_dance5">
+		ダンス５
+	</string>
+	<string name="anim_dance6">
+		ダンス６
+	</string>
+	<string name="anim_dance7">
+		ダンス７
+	</string>
+	<string name="anim_dance8">
+		ダンス８
+	</string>
+	<string name="anim_express_disdain">
+		侮蔑
+	</string>
+	<string name="anim_drink">
+		酔っぱらう
+	</string>
+	<string name="anim_express_embarrased">
+		困惑
+	</string>
+	<string name="anim_angry_fingerwag">
+		指を振る
+	</string>
+	<string name="anim_fist_pump">
+		ガッツポーズ
+	</string>
+	<string name="anim_yoga_float">
+		ヨガ浮遊
+	</string>
+	<string name="anim_express_frown">
+		しかめっ面
+	</string>
+	<string name="anim_impatient">
+		いらいらする
+	</string>
+	<string name="anim_jumpforjoy">
+		飛び上がって喜ぶ
+	</string>
+	<string name="anim_kissmybutt">
+		挑発ポーズ
+	</string>
+	<string name="anim_express_kiss">
+		キス
+	</string>
+	<string name="anim_laugh_short">
+		笑う
+	</string>
+	<string name="anim_musclebeach">
+		力こぶを見せる
+	</string>
+	<string name="anim_no_unhappy">
+		不満げに否定する
+	</string>
+	<string name="anim_no_head">
+		否定する
+	</string>
+	<string name="anim_nyanya">
+		冷やかす
+	</string>
+	<string name="anim_punch_onetwo">
+		ワンツー・パンチ
+	</string>
+	<string name="anim_express_open_mouth">
+		口を開けて驚く
+	</string>
+	<string name="anim_peace">
+		ピース・サイン
+	</string>
+	<string name="anim_point_you">
+		他人を指差す
+	</string>
+	<string name="anim_point_me">
+		自分を指差す
+	</string>
+	<string name="anim_punch_l">
+		左パンチ
+	</string>
+	<string name="anim_punch_r">
+		右パンチ
+	</string>
+	<string name="anim_rps_countdown">
+		じゃんけんポーズ
+	</string>
+	<string name="anim_rps_paper">
+		パー
+	</string>
+	<string name="anim_rps_rock">
+		グー
+	</string>
+	<string name="anim_rps_scissors">
+		チョキ
+	</string>
+	<string name="anim_express_repulsed">
+		嫌悪感
+	</string>
+	<string name="anim_kick_roundhouse_r">
+		まわし蹴り
+	</string>
+	<string name="anim_express_sad">
+		悲しむ
+	</string>
+	<string name="anim_salute">
+		敬礼する
+	</string>
+	<string name="anim_shout">
+		叫ぶ
+	</string>
+	<string name="anim_express_shrug">
+		肩をすくめる
+	</string>
+	<string name="anim_express_smile">
+		微笑む
+	</string>
+	<string name="anim_smoke_idle">
+		たばこをくゆらす
+	</string>
+	<string name="anim_smoke_inhale">
+		たばこを吸う
+	</string>
+	<string name="anim_smoke_throw_down">
+		たばこを捨てる
+	</string>
+	<string name="anim_express_surprise">
+		驚く
+	</string>
+	<string name="anim_sword_strike_r">
+		剣で斬りつける
+	</string>
+	<string name="anim_angry_tantrum">
+		じだんだを踏む
+	</string>
+	<string name="anim_express_tongue_out">
+		舌を出す
+	</string>
+	<string name="anim_hello">
+		手を振る
+	</string>
+	<string name="anim_whisper">
+		小声で話す
+	</string>
+	<string name="anim_whistle">
+		口笛を吹く
+	</string>
+	<string name="anim_express_wink">
+		ウィンク
+	</string>
+	<string name="anim_wink_hollywood">
+		ウィンク（ハリウッド）
+	</string>
+	<string name="anim_express_worry">
+		心配する
+	</string>
+	<string name="anim_yes_happy">
+		笑顔で頷く
+	</string>
+	<string name="anim_yes_head">
+		頷く
+	</string>
+	<string name="multiple_textures">
+		複数
+	</string>
+	<string name="use_texture">
+		テクスチャを使用
+	</string>
+	<string name="manip_hint1">
+		マウスカーソルをルーラに合わせて
+	</string>
+	<string name="manip_hint2">
+		グリッドにスナップ
+	</string>
+	<string name="texture_loading">
+		読み込んでいます…
+	</string>
+	<string name="worldmap_offline">
+		オフライン
+	</string>
+	<string name="worldmap_item_tooltip_format">
+		[AREA]㎡　L$ [PRICE]（[SQMPRICE] L$／㎡）
+	</string>
+	<string name="worldmap_results_none_found">
+		何も見つかりませんでした。
+	</string>
+	<string name="Ok">
+		OK
+	</string>
+	<string name="Premature end of file">
+		不完全なファイル
+	</string>
+	<string name="ST_NO_JOINT">
+		ROOT または JOINT が見つかりません
+	</string>
+	<string name="NearbyChatTitle">
+		近隣チャット
+	</string>
+	<string name="NearbyChatLabel">
+		（近隣のチャット）
+	</string>
+	<string name="whisper">
+		のささやき：
+	</string>
+	<string name="shout">
+		のシャウト：
+	</string>
+	<string name="ringing">
+		インワールドボイスチャットに接続中…
+	</string>
+	<string name="connected">
+		接続しました
+	</string>
+	<string name="unavailable">
+		現在地では、ボイスを利用できません。
+	</string>
+	<string name="hang_up">
+		インワールドボイスチャットの通話が切断されました。
+	</string>
+	<string name="reconnect_nearby">
+		「近隣ボイスチャット」に再接続されます。
+	</string>
+	<string name="ScriptQuestionCautionChatGranted">
+		リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を許可しました：[PERMISSIONS]
+	</string>
+	<string name="ScriptQuestionCautionChatDenied">
+		リージョン（地域）「[REGIONNAME]」の「[REGIONPOS]」という場所にある、「[OWNERNAME]」が所有する「[OBJECTNAME]」というオブジェクトは、以下の権限を拒否しました：[PERMISSIONS]
+	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：
+	</string>
+	<string name="ScriptTakeMoney">
+		リンデンドル（L$）のお支払い
+	</string>
+	<string name="ActOnControlInputs">
+		制御入力に基づいて行動
+	</string>
+	<string name="RemapControlInputs">
+		制御入力のリマップ
+	</string>
+	<string name="AnimateYourAvatar">
+		アバターへのアニメーション動作
+	</string>
+	<string name="AttachToYourAvatar">
+		アバターに装着
+	</string>
+	<string name="ReleaseOwnership">
+		所有権を解放し公共物とする
+	</string>
+	<string name="LinkAndDelink">
+		他のオブジェクトのリンクとリンク解除
+	</string>
+	<string name="AddAndRemoveJoints">
+		他のオブジェクトとのジョイントの追加と削除
+	</string>
+	<string name="ChangePermissions">
+		権限の変更
+	</string>
+	<string name="TrackYourCamera">
+		カメラ追従
+	</string>
+	<string name="ControlYourCamera">
+		カメラ操作
+	</string>
+	<string name="TeleportYourAgent">
+		あなたをテレポート
+	</string>
+	<string name="ForceSitAvatar">
+		アバターを強制的に座らせる
+	</string>
+	<string name="ChangeEnvSettings">
+		自然環境の設定を変更する
+	</string>
+	<string name="NotConnected">
+		接続されていません
+	</string>
+	<string name="AgentNameSubst">
+		（あなた）
+	</string>
+	<string name="JoinAnExperience">
+		体験に参加
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		土地のアクセスリストを管理するときにアラートを表示しない
+	</string>
+	<string name="OverrideYourAnimations">
+		デフォルトのアニメーションを置き換え
+	</string>
+	<string name="ScriptReturnObjects">
+		あなたの代わりにオブジェクトを返却
+	</string>
+	<string name="UnknownScriptPermission">
+		（不明）！
+	</string>
+	<string name="SIM_ACCESS_PG">
+		General
+	</string>
+	<string name="SIM_ACCESS_MATURE">
+		Moderate
+	</string>
+	<string name="SIM_ACCESS_ADULT">
+		Adult
+	</string>
+	<string name="SIM_ACCESS_DOWN">
+		オフライン
+	</string>
+	<string name="SIM_ACCESS_MIN">
+		不明
+	</string>
+	<string name="land_type_unknown">
+		（不明）
+	</string>
+	<string name="Estate / Full Region">
+		不動産／フルリージョン
+	</string>
+	<string name="Estate / Homestead">
+		不動産／入植地
+	</string>
+	<string name="Mainland / Homestead">
+		メインランド／入植地
+	</string>
+	<string name="Mainland / Full Region">
+		メインランド／フルリージョン
+	</string>
+	<string name="all_files">
+		全てのファイル
+	</string>
+	<string name="sound_files">
+		サウンド
+	</string>
+	<string name="animation_files">
+		アニメーション
+	</string>
+	<string name="image_files">
+		画像
+	</string>
+	<string name="save_file_verb">
+		保存
+	</string>
+	<string name="load_file_verb">
+		ロード
+	</string>
+	<string name="targa_image_files">
+		Targa画像
+	</string>
+	<string name="bitmap_image_files">
+		ビットマップ画像
+	</string>
+	<string name="png_image_files">
+		PNG画像
+	</string>
+	<string name="save_texture_image_files">
+		TargaまたはPNG画像
+	</string>
+	<string name="avi_movie_file">
+		AVIムービーファイル
+	</string>
+	<string name="xaf_animation_file">
+		XAFアニメーションファイル
+	</string>
+	<string name="xml_file">
+		XMLファイル
+	</string>
+	<string name="raw_file">
+		RAWファイル
+	</string>
+	<string name="compressed_image_files">
+		圧縮画像
+	</string>
+	<string name="load_files">
+		ファイルのロード
+	</string>
+	<string name="choose_the_directory">
+		参照
+	</string>
+	<string name="script_files">
+		スクリプト
+	</string>
+	<string name="dictionary_files">
+		辞書
+	</string>
+	<string name="LSLTipSleepTime" translate="false">
+		Sleeps script for [SLEEP_TIME] seconds.
+	</string>
+	<string name="LSLTipText_llSin" translate="false">
+		float llSin(float theta)
 Returns the sine of theta (theta in radians)
-  </string>
-  <string name="LSLTipText_llCos" translate="false">
-float llCos(float theta)
+	</string>
+	<string name="LSLTipText_llCos" translate="false">
+		float llCos(float theta)
 Returns the cosine of theta (theta in radians)
-  </string>
-  <string name="LSLTipText_llTan" translate="false">
-float llTan(float theta)
+	</string>
+	<string name="LSLTipText_llTan" translate="false">
+		float llTan(float theta)
 Returns the tangent of theta (theta in radians)
-  </string>
-  <string name="LSLTipText_llAtan2" translate="false">
-float llAtan2(float y, float x)
+	</string>
+	<string name="LSLTipText_llAtan2" translate="false">
+		float llAtan2(float y, float x)
 Returns the arctangent2 of y, x
-  </string>
-  <string name="LSLTipText_llSqrt" translate="false">
-float llSqrt(float val)
+	</string>
+	<string name="LSLTipText_llSqrt" translate="false">
+		float llSqrt(float val)
 Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results
-  </string>
-  <string name="LSLTipText_llPow" translate="false">
-float llPow(float base, float exponent)
+	</string>
+	<string name="LSLTipText_llPow" translate="false">
+		float llPow(float base, float exponent)
 Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results
-  </string>
-  <string name="LSLTipText_llAbs" translate="false">
-integer llAbs(integer val)
+	</string>
+	<string name="LSLTipText_llAbs" translate="false">
+		integer llAbs(integer val)
 Returns the positive version of val
-  </string>
-  <string name="LSLTipText_llFabs" translate="false">
-float llFabs(float val)
+	</string>
+	<string name="LSLTipText_llFabs" translate="false">
+		float llFabs(float val)
 Returns the positive version of val
-  </string>
-  <string name="LSLTipText_llFrand" translate="false">
-float llFrand(float mag)
+	</string>
+	<string name="LSLTipText_llFrand" translate="false">
+		float llFrand(float mag)
 Returns a pseudo random number in the range [0,mag) or (mag,0]
-  </string>
-  <string name="LSLTipText_llFloor" translate="false">
-integer llFloor(float val)
+	</string>
+	<string name="LSLTipText_llFloor" translate="false">
+		integer llFloor(float val)
 Returns largest integer value &lt;= val
-  </string>
-  <string name="LSLTipText_llCeil" translate="false">
-integer llCeil(float val)
+	</string>
+	<string name="LSLTipText_llCeil" translate="false">
+		integer llCeil(float val)
 Returns smallest integer value &gt;= val
-  </string>
-  <string name="LSLTipText_llRound" translate="false">
-integer llRound(float val)
+	</string>
+	<string name="LSLTipText_llRound" translate="false">
+		integer llRound(float val)
 Returns val rounded to the nearest integer
-  </string>
-  <string name="LSLTipText_llVecMag" translate="false">
-float llVecMag(vector v)
+	</string>
+	<string name="LSLTipText_llVecMag" translate="false">
+		float llVecMag(vector v)
 Returns the magnitude of v
-  </string>
-  <string name="LSLTipText_llVecNorm" translate="false">
-vector llVecNorm(vector v)
+	</string>
+	<string name="LSLTipText_llVecNorm" translate="false">
+		vector llVecNorm(vector v)
 Returns the v normalized
-  </string>
-  <string name="LSLTipText_llVecDist" translate="false">
-float llVecDist(vector v1, vector v2)
+	</string>
+	<string name="LSLTipText_llVecDist" translate="false">
+		float llVecDist(vector v1, vector v2)
 Returns the 3D distance between v1 and v2
-  </string>
-  <string name="LSLTipText_llRot2Euler" translate="false">
-vector llRot2Euler(rotation q)
+	</string>
+	<string name="LSLTipText_llRot2Euler" translate="false">
+		vector llRot2Euler(rotation q)
 Returns the Euler representation (roll, pitch, yaw) of q
-  </string>
-  <string name="LSLTipText_llEuler2Rot" translate="false">
-rotation llEuler2Rot(vector v)
+	</string>
+	<string name="LSLTipText_llEuler2Rot" translate="false">
+		rotation llEuler2Rot(vector v)
 Returns the rotation representation of Euler Angles v
-  </string>
-  <string name="LSLTipText_llAxes2Rot" translate="false">
-rotation llAxes2Rot(vector fwd, vector left, vector up)
+	</string>
+	<string name="LSLTipText_llAxes2Rot" translate="false">
+		rotation llAxes2Rot(vector fwd, vector left, vector up)
 Returns the rotation defined by the coordinate axes
-  </string>
-  <string name="LSLTipText_llRot2Fwd" translate="false">
-vector llRot2Fwd(rotation q)
+	</string>
+	<string name="LSLTipText_llRot2Fwd" translate="false">
+		vector llRot2Fwd(rotation q)
 Returns the forward vector defined by q
-  </string>
-  <string name="LSLTipText_llRot2Left" translate="false">
-vector llRot2Left(rotation q)
+	</string>
+	<string name="LSLTipText_llRot2Left" translate="false">
+		vector llRot2Left(rotation q)
 Returns the left vector defined by q
-  </string>
-  <string name="LSLTipText_llRot2Up" translate="false">
-vector llRot2Up(rotation q)
+	</string>
+	<string name="LSLTipText_llRot2Up" translate="false">
+		vector llRot2Up(rotation q)
 Returns the up vector defined by q
-  </string>
-  <string name="LSLTipText_llRotBetween" translate="false">
-rotation llRotBetween(vector v1, vector v2)
+	</string>
+	<string name="LSLTipText_llRotBetween" translate="false">
+		rotation llRotBetween(vector v1, vector v2)
 Returns the rotation to rotate v1 to v2
-  </string>
-  <string name="LSLTipText_llWhisper" translate="false">
-llWhisper(integer channel, string msg)
+	</string>
+	<string name="LSLTipText_llWhisper" translate="false">
+		llWhisper(integer channel, string msg)
 Whispers the text of msg on channel
-  </string>
-  <string name="LSLTipText_llSay" translate="false">
-llSay(integer channel, string msg)
+	</string>
+	<string name="LSLTipText_llSay" translate="false">
+		llSay(integer channel, string msg)
 Says the text of msg on channel
-  </string>
-  <string name="LSLTipText_llShout" translate="false">
-llShout(integer channel, string msg)
+	</string>
+	<string name="LSLTipText_llShout" translate="false">
+		llShout(integer channel, string msg)
 Shouts the text of msg on channel
-  </string>
-  <string name="LSLTipText_llListen" translate="false">
-integer llListen(integer channel, string name, key id, string msg)
+	</string>
+	<string name="LSLTipText_llListen" translate="false">
+		integer llListen(integer channel, string name, key id, string msg)
 Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen
-  </string>
-  <string name="LSLTipText_llListenControl" translate="false">
-llListenControl(integer number, integer active)
+	</string>
+	<string name="LSLTipText_llListenControl" translate="false">
+		llListenControl(integer number, integer active)
 Makes a listen event callback active or inactive
-  </string>
-  <string name="LSLTipText_llListenRemove" translate="false">
-llListenRemove(integer number)
+	</string>
+	<string name="LSLTipText_llListenRemove" translate="false">
+		llListenRemove(integer number)
 Removes listen event callback number
-  </string>
-  <string name="LSLTipText_llSensor" translate="false">
-llSensor(string name, key id, integer type, float range, float arc)
+	</string>
+	<string name="LSLTipText_llSensor" translate="false">
+		llSensor(string name, key id, integer type, float range, float arc)
 Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)
-  </string>
-  <string name="LSLTipText_llSensorRepeat" translate="false">
-llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
+	</string>
+	<string name="LSLTipText_llSensorRepeat" translate="false">
+		llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
 Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds
-  </string>
-  <string name="LSLTipText_llSensorRemove" translate="false">
-llSensorRemove()
+	</string>
+	<string name="LSLTipText_llSensorRemove" translate="false">
+		llSensorRemove()
 Removes the sensor setup by llSensorRepeat
-  </string>
-  <string name="LSLTipText_llDetectedName" translate="false">
-string llDetectedName(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedName" translate="false">
+		string llDetectedName(integer number)
 Returns the name of detected object number (returns empty string if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedKey" translate="false">
-key llDetectedKey(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedKey" translate="false">
+		key llDetectedKey(integer number)
 Returns the key of detected object number (returns empty key if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedOwner" translate="false">
-key llDetectedOwner(integer number)
-Returns the key of detected object&apos;s owner (returns empty key if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedType" translate="false">
-integer llDetectedType(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedOwner" translate="false">
+		key llDetectedOwner(integer number)
+Returns the key of detected object's owner (returns empty key if number is not a valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedType" translate="false">
+		integer llDetectedType(integer number)
 Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedPos" translate="false">
-vector llDetectedPos(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedPos" translate="false">
+		vector llDetectedPos(integer number)
 Returns the position of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedVel" translate="false">
-vector llDetectedVel(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedVel" translate="false">
+		vector llDetectedVel(integer number)
 Returns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedGrab" translate="false">
-vector llDetectedGrab(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedGrab" translate="false">
+		vector llDetectedGrab(integer number)
 Returns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedRot" translate="false">
-rotation llDetectedRot(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedRot" translate="false">
+		rotation llDetectedRot(integer number)
 Returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedGroup" translate="false">
-integer llDetectedGroup(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedGroup" translate="false">
+		integer llDetectedGroup(integer number)
 Returns TRUE if detected object is part of same group as owner
-  </string>
-  <string name="LSLTipText_llDetectedLinkNumber" translate="false">
-integer llDetectedLinkNumber(integer number)
+	</string>
+	<string name="LSLTipText_llDetectedLinkNumber" translate="false">
+		integer llDetectedLinkNumber(integer number)
 Returns the link position of the triggered event for touches and collisions only
-  </string>
-  <string name="LSLTipText_llDie" translate="false">
-llDie()
+	</string>
+	<string name="LSLTipText_llDie" translate="false">
+		llDie()
 Deletes the object
-  </string>
-  <string name="LSLTipText_llGround" translate="false">
-float llGround(vector offset)
+	</string>
+	<string name="LSLTipText_llGround" translate="false">
+		float llGround(vector offset)
 Returns the ground height below the object position + offset
-  </string>
-  <string name="LSLTipText_llCloud" translate="false">
-float llCloud(vector offset)
+	</string>
+	<string name="LSLTipText_llCloud" translate="false">
+		float llCloud(vector offset)
 Returns the cloud density at the object position + offset
-  </string>
-  <string name="LSLTipText_llWind" translate="false">
-vector llWind(vector offset)
+	</string>
+	<string name="LSLTipText_llWind" translate="false">
+		vector llWind(vector offset)
 Returns the wind velocity at the object position + offset
-  </string>
-  <string name="LSLTipText_llSetStatus" translate="false">
-llSetStatus(integer status, integer value)
+	</string>
+	<string name="LSLTipText_llSetStatus" translate="false">
+		llSetStatus(integer status, integer value)
 Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
-  </string>
-  <string name="LSLTipText_llGetStatus" translate="false">
-integer llGetStatus(integer status)
+	</string>
+	<string name="LSLTipText_llGetStatus" translate="false">
+		integer llGetStatus(integer status)
 Returns the boolean value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, or STATUS_ROTATE_Z)
-  </string>
-  <string name="LSLTipText_llSetScale" translate="false">
-llSetScale(vector scale)
+	</string>
+	<string name="LSLTipText_llSetScale" translate="false">
+		llSetScale(vector scale)
 Sets the scale of the prim
-  </string>
-  <string name="LSLTipText_llGetScale" translate="false">
-vector llGetScale()
+	</string>
+	<string name="LSLTipText_llGetScale" translate="false">
+		vector llGetScale()
 Returns the scale of the prim
-  </string>
-  <string name="LSLTipText_llSetColor" translate="false">
-llSetColor(vector color, integer face)
+	</string>
+	<string name="LSLTipText_llSetColor" translate="false">
+		llSetColor(vector color, integer face)
 Sets the color on face of the prim
-  </string>
-  <string name="LSLTipText_llGetAlpha" translate="false">
-float llGetAlpha(integer face)
+	</string>
+	<string name="LSLTipText_llGetAlpha" translate="false">
+		float llGetAlpha(integer face)
 Returns the alpha of face
-  </string>
-  <string name="LSLTipText_llSetAlpha" translate="false">
-llSetAlpha(float alpha, integer face)
+	</string>
+	<string name="LSLTipText_llSetAlpha" translate="false">
+		llSetAlpha(float alpha, integer face)
 Sets the alpha on face
-  </string>
-  <string name="LSLTipText_llGetColor" translate="false">
-vector llGetColor(integer face)
+	</string>
+	<string name="LSLTipText_llGetColor" translate="false">
+		vector llGetColor(integer face)
 Returns the color on face
-  </string>
-  <string name="LSLTipText_llSetTexture" translate="false">
-llSetTexture(string texture, integer face)
+	</string>
+	<string name="LSLTipText_llSetTexture" translate="false">
+		llSetTexture(string texture, integer face)
 Sets the texture of face or ALL_SIDES
-  </string>
-  <string name="LSLTipText_llScaleTexture" translate="false">
-llScaleTexture(float u, float v, integer face)
+	</string>
+	<string name="LSLTipText_llScaleTexture" translate="false">
+		llScaleTexture(float u, float v, integer face)
 Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
-  </string>
-  <string name="LSLTipText_llOffsetTexture" translate="false">
-llOffsetTexture(float u, float v, integer face)
+	</string>
+	<string name="LSLTipText_llOffsetTexture" translate="false">
+		llOffsetTexture(float u, float v, integer face)
 Sets the texture u  &amp; v offsets for the chosen face or ALL_SIDES
-  </string>
-  <string name="LSLTipText_llRotateTexture" translate="false">
-llRotateTexture(float rotation, integer face)
+	</string>
+	<string name="LSLTipText_llRotateTexture" translate="false">
+		llRotateTexture(float rotation, integer face)
 Sets the texture rotation for the chosen face
-  </string>
-  <string name="LSLTipText_llGetTexture" translate="false">
-string llGetTexture(integer face)
-Returns a string that is the texture on face (the inventory name if it is a texture in the prim&apos;s inventory, otherwise the key)
-  </string>
-  <string name="LSLTipText_llSetPos" translate="false">
-llSetPos(vector pos)
-Moves the object or prim towards pos without using physics (if the script isn&apos;t physical)
-  </string>
-  <string name="LSLTipText_llGetPos" translate="false">
-vector llGetPos()
+	</string>
+	<string name="LSLTipText_llGetTexture" translate="false">
+		string llGetTexture(integer face)
+Returns a string that is the texture on face (the inventory name if it is a texture in the prim's inventory, otherwise the key)
+	</string>
+	<string name="LSLTipText_llSetPos" translate="false">
+		llSetPos(vector pos)
+Moves the object or prim towards pos without using physics (if the script isn't physical)
+	</string>
+	<string name="LSLTipText_llGetPos" translate="false">
+		vector llGetPos()
 Returns the position of the task in region coordinates
-  </string>
-  <string name="LSLTipText_llGetLocalPos" translate="false">
-vector llGetLocalPos()
+	</string>
+	<string name="LSLTipText_llGetLocalPos" translate="false">
+		vector llGetLocalPos()
 Returns the position relative to the root
-  </string>
-  <string name="LSLTipText_llSetRot" translate="false">
-llSetRot(rotation rot)
+	</string>
+	<string name="LSLTipText_llSetRot" translate="false">
+		llSetRot(rotation rot)
 Sets the rotation
-  </string>
-  <string name="LSLTipText_llGetRot" translate="false">
-rotation llGetRot()
-Returns the rotation relative to the region&apos;s axes
-  </string>
-  <string name="LSLTipText_llGetLocalRot" translate="false">
-rotation llGetLocalRot()
+	</string>
+	<string name="LSLTipText_llGetRot" translate="false">
+		rotation llGetRot()
+Returns the rotation relative to the region's axes
+	</string>
+	<string name="LSLTipText_llGetLocalRot" translate="false">
+		rotation llGetLocalRot()
 Returns the rotation local to the root
-  </string>
-  <string name="LSLTipText_llSetForce" translate="false">
-llSetForce(vector force, integer local)
+	</string>
+	<string name="LSLTipText_llSetForce" translate="false">
+		llSetForce(vector force, integer local)
 Applies force to the object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llGetForce" translate="false">
-vector llGetForce()
+	</string>
+	<string name="LSLTipText_llGetForce" translate="false">
+		vector llGetForce()
 Returns the force (if the script is physical)
-  </string>
-  <string name="LSLTipText_llTarget" translate="false">
-integer llTarget(vector position, float range)
+	</string>
+	<string name="LSLTipText_llTarget" translate="false">
+		integer llTarget(vector position, float range)
 Sets positions within range of position as a target and return an ID for the target
-  </string>
-  <string name="LSLTipText_llTargetRemove" translate="false">
-llTargetRemove(integer number)
+	</string>
+	<string name="LSLTipText_llTargetRemove" translate="false">
+		llTargetRemove(integer number)
 Removes positional target number registered with llTarget
-  </string>
-  <string name="LSLTipText_llRotTarget" translate="false">
-integer llRotTarget(rotation rot, float error)
+	</string>
+	<string name="LSLTipText_llRotTarget" translate="false">
+		integer llRotTarget(rotation rot, float error)
 Set rotations with error of rot as a rotational target and return an ID for the rotational target
-  </string>
-  <string name="LSLTipText_llRotTargetRemove" translate="false">
-llRotTargetRemove(integer number)
+	</string>
+	<string name="LSLTipText_llRotTargetRemove" translate="false">
+		llRotTargetRemove(integer number)
 Removes rotational target number registered with llRotTarget
-  </string>
-  <string name="LSLTipText_llMoveToTarget" translate="false">
-llMoveToTarget(vector target, float tau)
+	</string>
+	<string name="LSLTipText_llMoveToTarget" translate="false">
+		llMoveToTarget(vector target, float tau)
 Critically damps to target in tau seconds (if the script is physical)
-  </string>
-  <string name="LSLTipText_llStopMoveToTarget" translate="false">
-llStopMoveToTarget()
+	</string>
+	<string name="LSLTipText_llStopMoveToTarget" translate="false">
+		llStopMoveToTarget()
 Stops critically damped motion
-  </string>
-  <string name="LSLTipText_llApplyImpulse" translate="false">
-llApplyImpulse(vector force, integer local)
+	</string>
+	<string name="LSLTipText_llApplyImpulse" translate="false">
+		llApplyImpulse(vector force, integer local)
 Applies impulse to object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llApplyRotationalImpulse" translate="false">
-llApplyRotationalImpulse(vector force, integer local)
+	</string>
+	<string name="LSLTipText_llApplyRotationalImpulse" translate="false">
+		llApplyRotationalImpulse(vector force, integer local)
 Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llSetTorque" translate="false">
-llSetTorque(vector torque, integer local)
+	</string>
+	<string name="LSLTipText_llSetTorque" translate="false">
+		llSetTorque(vector torque, integer local)
 Sets the torque of object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llGetTorque" translate="false">
-vector llGetTorque()
+	</string>
+	<string name="LSLTipText_llGetTorque" translate="false">
+		vector llGetTorque()
 Returns the torque (if the script is physical)
-  </string>
-  <string name="LSLTipText_llSetForceAndTorque" translate="false">
-llSetForceAndTorque(vector force, vector torque, integer local)
+	</string>
+	<string name="LSLTipText_llSetForceAndTorque" translate="false">
+		llSetForceAndTorque(vector force, vector torque, integer local)
 Sets the force and torque of object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llGetVel" translate="false">
-vector llGetVel()
+	</string>
+	<string name="LSLTipText_llGetVel" translate="false">
+		vector llGetVel()
 Returns the velocity of the object
-  </string>
-  <string name="LSLTipText_llGetAccel" translate="false">
-vector llGetAccel()
-Returns the acceleration of the object relative to the region&apos;s axes
-  </string>
-  <string name="LSLTipText_llGetOmega" translate="false">
-vector llGetOmega()
+	</string>
+	<string name="LSLTipText_llGetAccel" translate="false">
+		vector llGetAccel()
+Returns the acceleration of the object relative to the region's axes
+	</string>
+	<string name="LSLTipText_llGetOmega" translate="false">
+		vector llGetOmega()
 Returns the rotation velocity in radians per second
-  </string>
-  <string name="LSLTipText_llGetTimeOfDay" translate="false">
-float llGetTimeOfDay()
+	</string>
+	<string name="LSLTipText_llGetTimeOfDay" translate="false">
+		float llGetTimeOfDay()
 Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
-  </string>
-  <string name="LSLTipText_llGetWallclock" translate="false">
-float llGetWallclock()
+	</string>
+	<string name="LSLTipText_llGetWallclock" translate="false">
+		float llGetWallclock()
 Returns the time in seconds since midnight California Pacific time (PST/PDT)
-  </string>
-  <string name="LSLTipText_llGetTime" translate="false">
-float llGetTime()
+	</string>
+	<string name="LSLTipText_llGetTime" translate="false">
+		float llGetTime()
 Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime
-  </string>
-  <string name="LSLTipText_llResetTime" translate="false">
-llResetTime()
+	</string>
+	<string name="LSLTipText_llResetTime" translate="false">
+		llResetTime()
 Sets the script timer to zero
-  </string>
-  <string name="LSLTipText_llGetAndResetTime" translate="false">
-float llGetAndResetTime()
+	</string>
+	<string name="LSLTipText_llGetAndResetTime" translate="false">
+		float llGetAndResetTime()
 Returns the script time in seconds and then resets the script timer to zero
-  </string>
-  <string name="LSLTipText_llSound" translate="false">
-llSound(string sound, float volume, integer queue, integer loop)
+	</string>
+	<string name="LSLTipText_llSound" translate="false">
+		llSound(string sound, float volume, integer queue, integer loop)
 Plays sound at volume and whether it should loop or not.
-  </string>
-  <string name="LSLTipText_llPlaySound" translate="false">
-llPlaySound(string sound, float volume)
+	</string>
+	<string name="LSLTipText_llPlaySound" translate="false">
+		llPlaySound(string sound, float volume)
 Plays attached sound once at volume (0.0 - 1.0)
-  </string>
-  <string name="LSLTipText_llLoopSound" translate="false">
-llLoopSound(string sound, float volume)
+	</string>
+	<string name="LSLTipText_llLoopSound" translate="false">
+		llLoopSound(string sound, float volume)
 Plays attached sound looping indefinitely at volume (0.0 - 1.0)
-  </string>
-  <string name="LSLTipText_llLoopSoundMaster" translate="false">
-llLoopSoundMaster(string sound, float volume)
+	</string>
+	<string name="LSLTipText_llLoopSoundMaster" translate="false">
+		llLoopSoundMaster(string sound, float volume)
 Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master
-  </string>
-  <string name="LSLTipText_llLoopSoundSlave" translate="false">
-llLoopSoundSlave(string sound, float volume)
+	</string>
+	<string name="LSLTipText_llLoopSoundSlave" translate="false">
+		llLoopSoundSlave(string sound, float volume)
 Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master
-  </string>
-  <string name="LSLTipText_llPlaySoundSlave" translate="false">
-llPlaySoundSlave(string sound, float volume)
+	</string>
+	<string name="LSLTipText_llPlaySoundSlave" translate="false">
+		llPlaySoundSlave(string sound, float volume)
 Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master
-  </string>
-  <string name="LSLTipText_llTriggerSound" translate="false">
-llTriggerSound(string sound, float volume)
+	</string>
+	<string name="LSLTipText_llTriggerSound" translate="false">
+		llTriggerSound(string sound, float volume)
 Plays sound at volume (0.0 - 1.0), centered at but not attached to object
-  </string>
-  <string name="LSLTipText_llStopSound" translate="false">
-llStopSound()
+	</string>
+	<string name="LSLTipText_llStopSound" translate="false">
+		llStopSound()
 Stops currently attached sound
-  </string>
-  <string name="LSLTipText_llPreloadSound" translate="false">
-llPreloadSound(string sound)
+	</string>
+	<string name="LSLTipText_llPreloadSound" translate="false">
+		llPreloadSound(string sound)
 Preloads a sound on viewers within range
-  </string>
-  <string name="LSLTipText_llGetSubString" translate="false">
-string llGetSubString(string src, integer start, integer end)
+	</string>
+	<string name="LSLTipText_llGetSubString" translate="false">
+		string llGetSubString(string src, integer start, integer end)
 Returns the indicated substring
-  </string>
-  <string name="LSLTipText_llDeleteSubString" translate="false">
-string llDeleteSubString(string src, integer start, integer end)
+	</string>
+	<string name="LSLTipText_llDeleteSubString" translate="false">
+		string llDeleteSubString(string src, integer start, integer end)
 Removes the indicated substring and returns the result
-  </string>
-  <string name="LSLTipText_llInsertString" translate="false">
-string llInsertString(string dst, integer position, string src)
+	</string>
+	<string name="LSLTipText_llInsertString" translate="false">
+		string llInsertString(string dst, integer position, string src)
 Returns a destination string dst with the string src inserted starting at position pos
-  </string>
-  <string name="LSLTipText_llToUpper" translate="false">
-string llToUpper(string src)
+	</string>
+	<string name="LSLTipText_llToUpper" translate="false">
+		string llToUpper(string src)
 Returns a string that is src with all upper-case characters
-  </string>
-  <string name="LSLTipText_llToLower" translate="false">
-string llToLower(string src)
+	</string>
+	<string name="LSLTipText_llToLower" translate="false">
+		string llToLower(string src)
 Returns a string that is src with all lower-case characters
-  </string>
-  <string name="LSLTipText_llGiveMoney" translate="false">
-llGiveMoney(key destination, integer amount)
+	</string>
+	<string name="LSLTipText_llGiveMoney" translate="false">
+		llGiveMoney(key destination, integer amount)
 Transfers amount of L$ from script owner to destination
-  </string>
-  <string name="LSLTipText_llMakeExplosion" translate="false">
-llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+	</string>
+	<string name="LSLTipText_llMakeExplosion" translate="false">
+		llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
 Makes a round explosion of particles
-  </string>
-  <string name="LSLTipText_llMakeFountain" translate="false">
-llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
+	</string>
+	<string name="LSLTipText_llMakeFountain" translate="false">
+		llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
 Makes a fountain of particles
-  </string>
-  <string name="LSLTipText_llMakeSmoke" translate="false">
-llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+	</string>
+	<string name="LSLTipText_llMakeSmoke" translate="false">
+		llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
 Makes smoke like particles
-  </string>
-  <string name="LSLTipText_llMakeFire" translate="false">
-llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+	</string>
+	<string name="LSLTipText_llMakeFire" translate="false">
+		llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
 Makes fire like particles
-  </string>
-  <string name="LSLTipText_llRezObject" translate="false">
-llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
-Instantiates owner&apos;s inventory object at pos with velocity vel and rotation rot with start parameter param
-  </string>
-  <string name="LSLTipText_llLookAt" translate="false">
-llLookAt(vector target, float strength, float damping)
+	</string>
+	<string name="LSLTipText_llRezObject" translate="false">
+		llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner's inventory object at pos with velocity vel and rotation rot with start parameter param
+	</string>
+	<string name="LSLTipText_llLookAt" translate="false">
+		llLookAt(vector target, float strength, float damping)
 Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon
-  </string>
-  <string name="LSLTipText_llStopLookAt" translate="false">
-llStopLookAt()
+	</string>
+	<string name="LSLTipText_llStopLookAt" translate="false">
+		llStopLookAt()
 Stops causing object to point at a target
-  </string>
-  <string name="LSLTipText_llSetTimerEvent" translate="false">
-llSetTimerEvent(float sec)
+	</string>
+	<string name="LSLTipText_llSetTimerEvent" translate="false">
+		llSetTimerEvent(float sec)
 Causes the timer event to be triggered a maximum of once every sec seconds
-  </string>
-  <string name="LSLTipText_llSleep" translate="false">
-llSleep(float sec)
+	</string>
+	<string name="LSLTipText_llSleep" translate="false">
+		llSleep(float sec)
 Puts the script to sleep for sec seconds
-  </string>
-  <string name="LSLTipText_llGetMass" translate="false">
-float llGetMass()
+	</string>
+	<string name="LSLTipText_llGetMass" translate="false">
+		float llGetMass()
 Returns the mass of object that the script is attached to
-  </string>
-  <string name="LSLTipText_llCollisionFilter" translate="false">
-llCollisionFilter(string name, key id, integer accept)
+	</string>
+	<string name="LSLTipText_llCollisionFilter" translate="false">
+		llCollisionFilter(string name, key id, integer accept)
 Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id
-  </string>
-  <string name="LSLTipText_llTakeControls" translate="false">
-llTakeControls(integer controls, integer accept, integer pass_on)
+	</string>
+	<string name="LSLTipText_llTakeControls" translate="false">
+		llTakeControls(integer controls, integer accept, integer pass_on)
 Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for
-  </string>
-  <string name="LSLTipText_llReleaseControls" translate="false">
-llReleaseControls()
+	</string>
+	<string name="LSLTipText_llReleaseControls" translate="false">
+		llReleaseControls()
 Stops taking inputs that were taken with llTakeControls
-  </string>
-  <string name="LSLTipText_llAttachToAvatar" translate="false">
-llAttachToAvatar(integer attach_point)
+	</string>
+	<string name="LSLTipText_llAttachToAvatar" translate="false">
+		llAttachToAvatar(integer attach_point)
 Attaches the object to the avatar who has granted permission to the script
-  </string>
-  <string name="LSLTipText_llDetachFromAvatar" translate="false">
-llDetachFromAvatar()
+	</string>
+	<string name="LSLTipText_llDetachFromAvatar" translate="false">
+		llDetachFromAvatar()
 Detaches object from avatar
-  </string>
-  <string name="LSLTipText_llTakeCamera" translate="false">
-llTakeCamera(key avatar)
-Moves avatar&apos;s viewpoint to task
-  </string>
-  <string name="LSLTipText_llReleaseCamera" translate="false">
-llReleaseCamera(key avatar)
+	</string>
+	<string name="LSLTipText_llTakeCamera" translate="false">
+		llTakeCamera(key avatar)
+Moves avatar's viewpoint to task
+	</string>
+	<string name="LSLTipText_llReleaseCamera" translate="false">
+		llReleaseCamera(key avatar)
 Returns camera to agent avatar
-  </string>
-  <string name="LSLTipText_llGetOwner" translate="false">
-key llGetOwner()
-Returns the object owner&apos;s UUID
-  </string>
-  <string name="LSLTipText_llInstantMessage" translate="false">
-llInstantMessage(key user, string message)
+	</string>
+	<string name="LSLTipText_llGetOwner" translate="false">
+		key llGetOwner()
+Returns the object owner's UUID
+	</string>
+	<string name="LSLTipText_llInstantMessage" translate="false">
+		llInstantMessage(key user, string message)
 Sends the specified string as an Instant Message to the user
-  </string>
-  <string name="LSLTipText_llEmail" translate="false">
-llEmail(string address, string subject, string message)
+	</string>
+	<string name="LSLTipText_llEmail" translate="false">
+		llEmail(string address, string subject, string message)
 Sends an email to address with the subject and message
-  </string>
-  <string name="LSLTipText_llGetNextEmail" translate="false">
-llGetNextEmail(string address, string subject)
+	</string>
+	<string name="LSLTipText_llGetNextEmail" translate="false">
+		llGetNextEmail(string address, string subject)
 Gets the next waiting email that comes from address, with specified subject
-  </string>
-  <string name="LSLTipText_llGetKey" translate="false">
-key llGetKey()
+	</string>
+	<string name="LSLTipText_llGetKey" translate="false">
+		key llGetKey()
 Returns the key of the prim the script is attached to
-  </string>
-  <string name="LSLTipText_llSetBuoyancy" translate="false">
-llSetBuoyancy(float buoyancy)
+	</string>
+	<string name="LSLTipText_llSetBuoyancy" translate="false">
+		llSetBuoyancy(float buoyancy)
 Sets the buoyancy of the task or object (0 is disabled, &lt; 1.0 sinks, 1.0 floats, &gt; 1.0 rises)
-  </string>
-  <string name="LSLTipText_llSetHoverHeight" translate="false">
-llSetHoverHeight(float height, integer water, float tau)
+	</string>
+	<string name="LSLTipText_llSetHoverHeight" translate="false">
+		llSetHoverHeight(float height, integer water, float tau)
 Critically damps to a height above the ground (or water) in tau seconds
-  </string>
-  <string name="LSLTipText_llStopHover" translate="false">
-llStopHover()
+	</string>
+	<string name="LSLTipText_llStopHover" translate="false">
+		llStopHover()
 Stops hovering to a height
-  </string>
-  <string name="LSLTipText_llMinEventDelay" translate="false">
-llMinEventDelay(float delay)
+	</string>
+	<string name="LSLTipText_llMinEventDelay" translate="false">
+		llMinEventDelay(float delay)
 Sets the minimum time between events being handled
-  </string>
-  <string name="LSLTipText_llSoundPreload" translate="false">
-llSoundPreload(string sound)
+	</string>
+	<string name="LSLTipText_llSoundPreload" translate="false">
+		llSoundPreload(string sound)
 Preloads a sound on viewers within range
-  </string>
-  <string name="LSLTipText_llRotLookAt" translate="false">
-llRotLookAt(rotation target, float strength, float damping)
+	</string>
+	<string name="LSLTipText_llRotLookAt" translate="false">
+		llRotLookAt(rotation target, float strength, float damping)
 Causes object to point its forward axis towards target
-  </string>
-  <string name="LSLTipText_llStringLength" translate="false">
-integer llStringLength(string str)
+	</string>
+	<string name="LSLTipText_llStringLength" translate="false">
+		integer llStringLength(string str)
 Returns the length of string
-  </string>
-  <string name="LSLTipText_llStartAnimation" translate="false">
-llStartAnimation(string anim)
+	</string>
+	<string name="LSLTipText_llStartAnimation" translate="false">
+		llStartAnimation(string anim)
 Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked
-  </string>
-  <string name="LSLTipText_llStopAnimation" translate="false">
-llStopAnimation(string anim)
+	</string>
+	<string name="LSLTipText_llStopAnimation" translate="false">
+		llStopAnimation(string anim)
 Stops animation anim for agent that granted permission
-  </string>
-  <string name="LSLTipText_llPointAt" translate="false">
-llPointAt(vector pos)
+	</string>
+	<string name="LSLTipText_llPointAt" translate="false">
+		llPointAt(vector pos)
 Makes agent that owns object point at pos
-  </string>
-  <string name="LSLTipText_llStopPointAt" translate="false">
-llStopPointAt()
+	</string>
+	<string name="LSLTipText_llStopPointAt" translate="false">
+		llStopPointAt()
 Stops pointing agent that owns object
-  </string>
-  <string name="LSLTipText_llTargetOmega" translate="false">
-llTargetOmega(vector axis, float spinrate, float gain)
+	</string>
+	<string name="LSLTipText_llTargetOmega" translate="false">
+		llTargetOmega(vector axis, float spinrate, float gain)
 Rotates the object around axis at spinrate with strength gain
-  </string>
-  <string name="LSLTipText_llGetStartParameter" translate="false">
-integer llGetStartParameter()
+	</string>
+	<string name="LSLTipText_llGetStartParameter" translate="false">
+		integer llGetStartParameter()
 Returns an integer that is the script start/rez parameter
-  </string>
-  <string name="LSLTipText_llGodLikeRezObject" translate="false">
-llGodLikeRezObject(key inventory, vector pos)
+	</string>
+	<string name="LSLTipText_llGodLikeRezObject" translate="false">
+		llGodLikeRezObject(key inventory, vector pos)
 Rezzes directly off of UUID if owner is in God Mode
-  </string>
-  <string name="LSLTipText_llRequestPermissions" translate="false">
-llRequestPermissions(key agent, integer perm)
+	</string>
+	<string name="LSLTipText_llRequestPermissions" translate="false">
+		llRequestPermissions(key agent, integer perm)
 Asks the agent for permission to run certain classes of functions
-  </string>
-  <string name="LSLTipText_llGetPermissionsKey" translate="false">
-key llGetPermissionsKey()
+	</string>
+	<string name="LSLTipText_llGetPermissionsKey" translate="false">
+		key llGetPermissionsKey()
 Returns the key of the avatar that last granted permissions to the script
-  </string>
-  <string name="LSLTipText_llGetPermissions" translate="false">
-integer llGetPermissions()
+	</string>
+	<string name="LSLTipText_llGetPermissions" translate="false">
+		integer llGetPermissions()
 Returns an integer bitfield with the permissions that have been granted
-  </string>
-  <string name="LSLTipText_llGetLinkNumber" translate="false">
-integer llGetLinkNumber()
+	</string>
+	<string name="LSLTipText_llGetLinkNumber" translate="false">
+		integer llGetLinkNumber()
 Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc)
-  </string>
-  <string name="LSLTipText_llSetLinkColor" translate="false">
-llSetLinkColor(integer linknumber, vector color, integer face)
+	</string>
+	<string name="LSLTipText_llSetLinkColor" translate="false">
+		llSetLinkColor(integer linknumber, vector color, integer face)
 Sets face to color if a task exists in the link chain at linknumber
-  </string>
-  <string name="LSLTipText_llCreateLink" translate="false">
-llCreateLink(key target, integer parent)
-Attempts to link the script&apos;s object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script&apos;s object becomes the root
-  </string>
-  <string name="LSLTipText_llBreakLink" translate="false">
-llBreakLink(integer linknum)
+	</string>
+	<string name="LSLTipText_llCreateLink" translate="false">
+		llCreateLink(key target, integer parent)
+Attempts to link the script's object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script's object becomes the root
+	</string>
+	<string name="LSLTipText_llBreakLink" translate="false">
+		llBreakLink(integer linknum)
 Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted)
-  </string>
-  <string name="LSLTipText_llBreakAllLinks" translate="false">
-llBreakAllLinks()
+	</string>
+	<string name="LSLTipText_llBreakAllLinks" translate="false">
+		llBreakAllLinks()
 Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted)
-  </string>
-  <string name="LSLTipText_llGetLinkKey" translate="false">
-key llGetLinkKey(integer linknumber)
+	</string>
+	<string name="LSLTipText_llGetLinkKey" translate="false">
+		key llGetLinkKey(integer linknumber)
 Returns the key of the linked prim linknumber
-  </string>
-  <string name="LSLTipText_llGetLinkName" translate="false">
-string llGetLinkName(integer linknumber)
+	</string>
+	<string name="LSLTipText_llGetLinkName" translate="false">
+		string llGetLinkName(integer linknumber)
 Returns the name of linknumber in a link set
-  </string>
-  <string name="LSLTipText_llGetInventoryNumber" translate="false">
-integer llGetInventoryNumber(integer type)
-Returns the number of items of a given type (INVENTORY_* flag) in the prim&apos;s inventory
-  </string>
-  <string name="LSLTipText_llGetInventoryName" translate="false">
-string llGetInventoryName(integer type, integer number)
+	</string>
+	<string name="LSLTipText_llGetInventoryNumber" translate="false">
+		integer llGetInventoryNumber(integer type)
+Returns the number of items of a given type (INVENTORY_* flag) in the prim's inventory
+	</string>
+	<string name="LSLTipText_llGetInventoryName" translate="false">
+		string llGetInventoryName(integer type, integer number)
 Returns the name of the inventory item number of a given type
-  </string>
-  <string name="LSLTipText_llSetScriptState" translate="false">
-llSetScriptState(string name, integer run)
+	</string>
+	<string name="LSLTipText_llSetScriptState" translate="false">
+		llSetScriptState(string name, integer run)
 Sets the running state of the specified script
-  </string>
-  <string name="LSLTipText_llGetEnergy" translate="false">
-float llGetEnergy()
+	</string>
+	<string name="LSLTipText_llGetEnergy" translate="false">
+		float llGetEnergy()
 Returns how much energy is in the object as a percentage of maximum
-  </string>
-  <string name="LSLTipText_llGiveInventory" translate="false">
-llGiveInventory(key destination, string inventory)
+	</string>
+	<string name="LSLTipText_llGiveInventory" translate="false">
+		llGiveInventory(key destination, string inventory)
 Gives inventory to destination
-  </string>
-  <string name="LSLTipText_llRemoveInventory" translate="false">
-llRemoveInventory(string item)
+	</string>
+	<string name="LSLTipText_llRemoveInventory" translate="false">
+		llRemoveInventory(string item)
 Removes the named inventory item
-  </string>
-  <string name="LSLTipText_llSetText" translate="false">
-llSetText(string text, vector color, float alpha)
+	</string>
+	<string name="LSLTipText_llSetText" translate="false">
+		llSetText(string text, vector color, float alpha)
 Displays text that hovers over the prim with specific color and translucency specified with alpha
-  </string>
-  <string name="LSLTipText_llWater" translate="false">
-float llWater(vector offset)
+	</string>
+	<string name="LSLTipText_llWater" translate="false">
+		float llWater(vector offset)
 Returns the water height below the object position + offset
-  </string>
-  <string name="LSLTipText_llPassTouches" translate="false">
-llPassTouches(integer pass)
+	</string>
+	<string name="LSLTipText_llPassTouches" translate="false">
+		llPassTouches(integer pass)
 If pass == TRUE, touches are passed from children on to parents
-  </string>
-  <string name="LSLTipText_llRequestAgentData" translate="false">
-key llRequestAgentData(key id, integer data)
+	</string>
+	<string name="LSLTipText_llRequestAgentData" translate="false">
+		key llRequestAgentData(key id, integer data)
 Requests data about agent id. When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llRequestInventoryData" translate="false">
-key llRequestInventoryData(string name)
-Requests data from object&apos;s inventory object. When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llSetDamage" translate="false">
-llSetDamage(float damage)
+	</string>
+	<string name="LSLTipText_llRequestInventoryData" translate="false">
+		key llRequestInventoryData(string name)
+Requests data from object's inventory object. When data is available the dataserver event will be raised.
+	</string>
+	<string name="LSLTipText_llSetDamage" translate="false">
+		llSetDamage(float damage)
 Sets the amount of damage that will be done when this object hits an avatar.
-  </string>
-  <string name="LSLTipText_llTeleportAgentHome" translate="false">
-llTeleportAgentHome(key id)
-Teleports avatar on the owner&apos;s land to their home location without any warning
-  </string>
-  <string name="LSLTipText_llModifyLand" translate="false">
-llModifyLand(integer action, integer brush)
+	</string>
+	<string name="LSLTipText_llTeleportAgentHome" translate="false">
+		llTeleportAgentHome(key id)
+Teleports avatar on the owner's land to their home location without any warning
+	</string>
+	<string name="LSLTipText_llModifyLand" translate="false">
+		llModifyLand(integer action, integer brush)
 Modifies land using the specified action on the specified brush size of land
-  </string>
-  <string name="LSLTipText_llCollisionSound" translate="false">
-llCollisionSound(string impact_sound, float impact_volume)
+	</string>
+	<string name="LSLTipText_llCollisionSound" translate="false">
+		llCollisionSound(string impact_sound, float impact_volume)
 Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume
-  </string>
-  <string name="LSLTipText_llCollisionSprite" translate="false">
-llCollisionSprite(string impact_sprite)
+	</string>
+	<string name="LSLTipText_llCollisionSprite" translate="false">
+		llCollisionSprite(string impact_sprite)
 Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress)
-  </string>
-  <string name="LSLTipText_llGetAnimation" translate="false">
-string llGetAnimation(key id)
+	</string>
+	<string name="LSLTipText_llGetAnimation" translate="false">
+		string llGetAnimation(key id)
 Returns the name of the currently playing locomotion animation for avatar id
-  </string>
-  <string name="LSLTipText_llResetScript" translate="false">
-llResetScript()
+	</string>
+	<string name="LSLTipText_llResetScript" translate="false">
+		llResetScript()
 Resets the script
-  </string>
-  <string name="LSLTipText_llMessageLinked" translate="false">
-llMessageLinked(integer linknum, integer num, string str, key id)
+	</string>
+	<string name="LSLTipText_llMessageLinked" translate="false">
+		llMessageLinked(integer linknum, integer num, string str, key id)
 Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum.
-  </string>
-  <string name="LSLTipText_llPushObject" translate="false">
-llPushObject(key id, vector impulse, vector ang_impulse, integer local)
+	</string>
+	<string name="LSLTipText_llPushObject" translate="false">
+		llPushObject(key id, vector impulse, vector ang_impulse, integer local)
 Applies impulse and ang_impulse to object id
-  </string>
-  <string name="LSLTipText_llPassCollisions" translate="false">
-llPassCollisions(integer pass)
+	</string>
+	<string name="LSLTipText_llPassCollisions" translate="false">
+		llPassCollisions(integer pass)
 If pass == TRUE, collisions are passed from children on to parents (default is FALSE)
-  </string>
-  <string name="LSLTipText_llGetScriptName" translate="false">
-string llGetScriptName()
+	</string>
+	<string name="LSLTipText_llGetScriptName" translate="false">
+		string llGetScriptName()
 Returns the name of the script that this function is used in
-  </string>
-  <string name="LSLTipText_llGetNumberOfSides" translate="false">
-integer llGetNumberOfSides()
+	</string>
+	<string name="LSLTipText_llGetNumberOfSides" translate="false">
+		integer llGetNumberOfSides()
 Returns the number of faces (or sides) of the prim
-  </string>
-  <string name="LSLTipText_llAxisAngle2Rot" translate="false">
-rotation llAxisAngle2Rot(vector axis, float angle)
+	</string>
+	<string name="LSLTipText_llAxisAngle2Rot" translate="false">
+		rotation llAxisAngle2Rot(vector axis, float angle)
 Returns the rotation that is a generated angle about axis
-  </string>
-  <string name="LSLTipText_llRot2Axis" translate="false">
-vector llRot2Axis(rotation rot)
+	</string>
+	<string name="LSLTipText_llRot2Axis" translate="false">
+		vector llRot2Axis(rotation rot)
 Returns the rotation axis represented by rot
-  </string>
-  <string name="LSLTipText_llRot2Angle" translate="false">
-float llRot2Angle(rotation rot)
+	</string>
+	<string name="LSLTipText_llRot2Angle" translate="false">
+		float llRot2Angle(rotation rot)
 Returns the rotation angle represented by rot
-  </string>
-  <string name="LSLTipText_llAcos" translate="false">
-float llAcos(float val)
+	</string>
+	<string name="LSLTipText_llAcos" translate="false">
+		float llAcos(float val)
 Returns the arccosine in radians of val
-  </string>
-  <string name="LSLTipText_llAsin" translate="false">
-float llAsin(float val)
+	</string>
+	<string name="LSLTipText_llAsin" translate="false">
+		float llAsin(float val)
 Returns the arcsine in radians of val
-  </string>
-  <string name="LSLTipText_llAngleBetween" translate="false">
-float llAngleBetween(rotation a, rotation b)
+	</string>
+	<string name="LSLTipText_llAngleBetween" translate="false">
+		float llAngleBetween(rotation a, rotation b)
 Returns angle between rotation a and b
-  </string>
-  <string name="LSLTipText_llGetInventoryKey" translate="false">
-key llGetInventoryKey(string name)
+	</string>
+	<string name="LSLTipText_llGetInventoryKey" translate="false">
+		key llGetInventoryKey(string name)
 Returns the key that is the UUID of the inventory name
-  </string>
-  <string name="LSLTipText_llAllowInventoryDrop" translate="false">
-llAllowInventoryDrop(integer add)
+	</string>
+	<string name="LSLTipText_llAllowInventoryDrop" translate="false">
+		llAllowInventoryDrop(integer add)
 If add == TRUE, users without modify permissions can still drop inventory items onto a prim
-  </string>
-  <string name="LSLTipText_llGetSunDirection" translate="false">
-vector llGetSunDirection()
+	</string>
+	<string name="LSLTipText_llGetSunDirection" translate="false">
+		vector llGetSunDirection()
 Returns a normalized vector of the direction of the sun in the region
-  </string>
-  <string name="LSLTipText_llGetTextureOffset" translate="false">
-vector llGetTextureOffset(integer face)
+	</string>
+	<string name="LSLTipText_llGetTextureOffset" translate="false">
+		vector llGetTextureOffset(integer face)
 Returns the texture offset of face in the x and y components of a vector
-  </string>
-  <string name="LSLTipText_llGetTextureScale" translate="false">
-vector llGetTextureScale(integer side)
+	</string>
+	<string name="LSLTipText_llGetTextureScale" translate="false">
+		vector llGetTextureScale(integer side)
 Returns the texture scale of side in the x and y components of a vector
-  </string>
-  <string name="LSLTipText_llGetTextureRot" translate="false">
-float llGetTextureRot(integer side)
+	</string>
+	<string name="LSLTipText_llGetTextureRot" translate="false">
+		float llGetTextureRot(integer side)
 Returns the texture rotation of side
-  </string>
-  <string name="LSLTipText_llSubStringIndex" translate="false">
-integer llSubStringIndex(string source, string pattern)
+	</string>
+	<string name="LSLTipText_llSubStringIndex" translate="false">
+		integer llSubStringIndex(string source, string pattern)
 Returns an integer that is the index in source where pattern first appears.
 (Returns -1 if not found)
-  </string>
-  <string name="LSLTipText_llGetOwnerKey" translate="false">
-key llGetOwnerKey(key id)
+	</string>
+	<string name="LSLTipText_llGetOwnerKey" translate="false">
+		key llGetOwnerKey(key id)
 Returns the owner of object id
-  </string>
-  <string name="LSLTipText_llGetCenterOfMass" translate="false">
-vector llGetCenterOfMass()
-Returns the prim&apos;s center of mass (unless called from the root prim, where it returns the object&apos;s center of mass)
-  </string>
-  <string name="LSLTipText_llListSort" translate="false">
-list llListSort(list src, integer stride, integer ascending)
+	</string>
+	<string name="LSLTipText_llGetCenterOfMass" translate="false">
+		vector llGetCenterOfMass()
+Returns the prim's center of mass (unless called from the root prim, where it returns the object's center of mass)
+	</string>
+	<string name="LSLTipText_llListSort" translate="false">
+		list llListSort(list src, integer stride, integer ascending)
 Sorts the list into blocks of stride, in ascending order if ascending == TRUE.
 The sort order is affected by type.
-  </string>
-  <string name="LSLTipText_llGetListLength" translate="false">
-integer llGetListLength(list src)
+	</string>
+	<string name="LSLTipText_llGetListLength" translate="false">
+		integer llGetListLength(list src)
 Returns the number of elements in the list
-  </string>
-  <string name="LSLTipText_llList2Integer" translate="false">
-integer llList2Integer(list src, integer index)
+	</string>
+	<string name="LSLTipText_llList2Integer" translate="false">
+		integer llList2Integer(list src, integer index)
 Copies the integer at index in the list
-  </string>
-  <string name="LSLTipText_llList2Float" translate="false">
-float llList2Float(list src, integer index)
+	</string>
+	<string name="LSLTipText_llList2Float" translate="false">
+		float llList2Float(list src, integer index)
 Copies the float at index in the list
-  </string>
-  <string name="LSLTipText_llList2String" translate="false">
-string llList2String(list src, integer index)
+	</string>
+	<string name="LSLTipText_llList2String" translate="false">
+		string llList2String(list src, integer index)
 Copies the string at index in the list
-  </string>
-  <string name="LSLTipText_llList2Key" translate="false">
-key llList2Key(list src, integer index)
+	</string>
+	<string name="LSLTipText_llList2Key" translate="false">
+		key llList2Key(list src, integer index)
 Copies the key at index in the list
-  </string>
-  <string name="LSLTipText_llList2Vector" translate="false">
-vector llList2Vector(list src, integer index)
+	</string>
+	<string name="LSLTipText_llList2Vector" translate="false">
+		vector llList2Vector(list src, integer index)
 Copies the vector at index in the list
-  </string>
-  <string name="LSLTipText_llList2Rot" translate="false">
-rotation llList2Rot(list src, integer index)
+	</string>
+	<string name="LSLTipText_llList2Rot" translate="false">
+		rotation llList2Rot(list src, integer index)
 Copies the rotation at index in the list
-  </string>
-  <string name="LSLTipText_llList2List" translate="false">
-list llList2List(list src, integer start, integer end)
+	</string>
+	<string name="LSLTipText_llList2List" translate="false">
+		list llList2List(list src, integer start, integer end)
 Copies the slice of the list from start to end
-  </string>
-  <string name="LSLTipText_llDeleteSubList" translate="false">
-list llDeleteSubList(list src, integer start, integer end)
+	</string>
+	<string name="LSLTipText_llDeleteSubList" translate="false">
+		list llDeleteSubList(list src, integer start, integer end)
 Removes the slice from start to end and returns the remainder of the list
-  </string>
-  <string name="LSLTipText_llGetListEntryType" translate="false">
-integer llGetListEntryType(list src, integer index)
+	</string>
+	<string name="LSLTipText_llGetListEntryType" translate="false">
+		integer llGetListEntryType(list src, integer index)
 Returns the type of the index entry in the list
 (TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)
-  </string>
-  <string name="LSLTipText_llList2CSV" translate="false">
-string llList2CSV(list src)
+	</string>
+	<string name="LSLTipText_llList2CSV" translate="false">
+		string llList2CSV(list src)
 Creates a string of comma separated values from list
-  </string>
-  <string name="LSLTipText_llCSV2List" translate="false">
-list llCSV2List(string src)
+	</string>
+	<string name="LSLTipText_llCSV2List" translate="false">
+		list llCSV2List(string src)
 Creates a list from a string of comma separated values
-  </string>
-  <string name="LSLTipText_llListRandomize" translate="false">
-list llListRandomize(list src, integer stride)
+	</string>
+	<string name="LSLTipText_llListRandomize" translate="false">
+		list llListRandomize(list src, integer stride)
 Returns a randomized list of blocks of size stride
-  </string>
-  <string name="LSLTipText_llList2ListStrided" translate="false">
-list llList2ListStrided(list src, integer start, integer end, integer stride)
+	</string>
+	<string name="LSLTipText_llList2ListStrided" translate="false">
+		list llList2ListStrided(list src, integer start, integer end, integer stride)
 Copies the strided slice of the list from start to end
-  </string>
-  <string name="LSLTipText_llGetRegionCorner" translate="false">
-vector llGetRegionCorner()
+	</string>
+	<string name="LSLTipText_llGetRegionCorner" translate="false">
+		vector llGetRegionCorner()
 Returns a vector in meters that is the global location of the south-west corner of the region which the object is in
-  </string>
-  <string name="LSLTipText_llListInsertList" translate="false">
-list llListInsertList(list dest, list src, integer start)
+	</string>
+	<string name="LSLTipText_llListInsertList" translate="false">
+		list llListInsertList(list dest, list src, integer start)
 Returns a list that contains all the elements from dest but with the elements from src inserted at position start
-  </string>
-  <string name="LSLTipText_llListFindList" translate="false">
-integer llListFindList(list src, list test)
+	</string>
+	<string name="LSLTipText_llListFindList" translate="false">
+		integer llListFindList(list src, list test)
 Returns the index of the first instance of test in src.
 (Returns -1 if not found)
-  </string>
-  <string name="LSLTipText_llGetObjectName" translate="false">
-string llGetObjectName()
+	</string>
+	<string name="LSLTipText_llGetObjectName" translate="false">
+		string llGetObjectName()
 Returns the name of the prim which the script is attached to
-  </string>
-  <string name="LSLTipText_llSetObjectName" translate="false">
-llSetObjectName(string name)
-Sets the prim&apos;s name to the name parameter
-  </string>
-  <string name="LSLTipText_llGetDate" translate="false">
-string llGetDate()
+	</string>
+	<string name="LSLTipText_llSetObjectName" translate="false">
+		llSetObjectName(string name)
+Sets the prim's name to the name parameter
+	</string>
+	<string name="LSLTipText_llGetDate" translate="false">
+		string llGetDate()
 Returns the current date in the UTC time zone in the format YYYY-MM-DD
-  </string>
-  <string name="LSLTipText_llEdgeOfWorld" translate="false">
-integer llEdgeOfWorld(vector pos, vector dir)
+	</string>
+	<string name="LSLTipText_llEdgeOfWorld" translate="false">
+		integer llEdgeOfWorld(vector pos, vector dir)
 Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region)
-  </string>
-  <string name="LSLTipText_llGetAgentInfo" translate="false">
-integer llGetAgentInfo(key id)
+	</string>
+	<string name="LSLTipText_llGetAgentInfo" translate="false">
+		integer llGetAgentInfo(key id)
 Returns an integer bitfield containing the agent information about id.
 Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.
-  </string>
-  <string name="LSLTipText_llAdjustSoundVolume" translate="false">
-llAdjustSoundVolume(float volume)
+	</string>
+	<string name="LSLTipText_llAdjustSoundVolume" translate="false">
+		llAdjustSoundVolume(float volume)
 Adjusts volume of attached sound (0.0 - 1.0)
-  </string>
-  <string name="LSLTipText_llSetSoundQueueing" translate="false">
-llSetSoundQueueing(integer queue)
+	</string>
+	<string name="LSLTipText_llSetSoundQueueing" translate="false">
+		llSetSoundQueueing(integer queue)
 Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default])
-  </string>
-  <string name="LSLTipText_llSetSoundRadius" translate="false">
-llSetSoundRadius(float radius)
+	</string>
+	<string name="LSLTipText_llSetSoundRadius" translate="false">
+		llSetSoundRadius(float radius)
 Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)
-  </string>
-  <string name="LSLTipText_llKey2Name" translate="false">
-string llKey2Name(key id)
+	</string>
+	<string name="LSLTipText_llKey2Name" translate="false">
+		string llKey2Name(key id)
 Returns the name of the prim or avatar specified by id.
 (The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.)
-  </string>
-  <string name="LSLTipText_llSetTextureAnim" translate="false">
-llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+	</string>
+	<string name="LSLTipText_llSetTextureAnim" translate="false">
+		llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
 Animates the texture on the specified face/faces
-  </string>
-  <string name="LSLTipText_llTriggerSoundLimited" translate="false">
-llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west)
+	</string>
+	<string name="LSLTipText_llTriggerSoundLimited" translate="false">
+		llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west)
 Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west
-  </string>
-  <string name="LSLTipText_llEjectFromLand" translate="false">
-llEjectFromLand(key avatar)
+	</string>
+	<string name="LSLTipText_llEjectFromLand" translate="false">
+		llEjectFromLand(key avatar)
 Ejects avatar from the parcel
-  </string>
-  <string name="LSLTipText_llParseString2List" translate="false">
-list llParseString2List(string src, list separators, list spacers)
+	</string>
+	<string name="LSLTipText_llParseString2List" translate="false">
+		list llParseString2List(string src, list separators, list spacers)
 Breaks src into a list, discarding separators, keeping spacers
 (separators and spacers must be lists of strings, maximum of 8 each)
-  </string>
-  <string name="LSLTipText_llOverMyLand" translate="false">
-integer llOverMyLand(key id)
+	</string>
+	<string name="LSLTipText_llOverMyLand" translate="false">
+		integer llOverMyLand(key id)
 Returns TRUE if id is over land owned by the script owner, otherwise FALSE
-  </string>
-  <string name="LSLTipText_llGetLandOwnerAt" translate="false">
-key llGetLandOwnerAt(vector pos)
+	</string>
+	<string name="LSLTipText_llGetLandOwnerAt" translate="false">
+		key llGetLandOwnerAt(vector pos)
 Returns the key of the land owner, returns NULL_KEY if public
-  </string>
-  <string name="LSLTipText_llGetNotecardLine" translate="false">
-key llGetNotecardLine(string name, integer line)
+	</string>
+	<string name="LSLTipText_llGetNotecardLine" translate="false">
+		key llGetNotecardLine(string name, integer line)
 Returns line line of notecard name via the dataserver event
-  </string>
-  <string name="LSLTipText_llGetAgentSize" translate="false">
-vector llGetAgentSize(key id)
+	</string>
+	<string name="LSLTipText_llGetAgentSize" translate="false">
+		vector llGetAgentSize(key id)
 If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR
-  </string>
-  <string name="LSLTipText_llSameGroup" translate="false">
-integer llSameGroup(key id)
+	</string>
+	<string name="LSLTipText_llSameGroup" translate="false">
+		integer llSameGroup(key id)
 Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE
-  </string>
-  <string name="LSLTipText_llUnSit" translate="false">
-key llUnSit(key id)
-If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object&apos;s owner, the avatar is forced to stand up
-  </string>
-  <string name="LSLTipText_llGroundSlope" translate="false">
-vector llGroundSlope(vector offset)
+	</string>
+	<string name="LSLTipText_llUnSit" translate="false">
+		key llUnSit(key id)
+If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object's owner, the avatar is forced to stand up
+	</string>
+	<string name="LSLTipText_llGroundSlope" translate="false">
+		vector llGroundSlope(vector offset)
 Returns the ground slope below the object position + offset
-  </string>
-  <string name="LSLTipText_llGroundNormal" translate="false">
-vector llGroundNormal(vector offset)
+	</string>
+	<string name="LSLTipText_llGroundNormal" translate="false">
+		vector llGroundNormal(vector offset)
 Returns the ground normal below the object position + offset
-  </string>
-  <string name="LSLTipText_llGroundContour" translate="false">
-vector llGroundCountour(vector offset)
+	</string>
+	<string name="LSLTipText_llGroundContour" translate="false">
+		vector llGroundCountour(vector offset)
 Returns the ground contour direction below the object position + offset
-  </string>
-  <string name="LSLTipText_llGetAttached" translate="false">
-integer llGetAttached()
-Returns the object&apos;s attachment point, or 0 if not attached
-  </string>
-  <string name="LSLTipText_llGetFreeMemory" translate="false">
-integer llGetFreeMemory()
+	</string>
+	<string name="LSLTipText_llGetAttached" translate="false">
+		integer llGetAttached()
+Returns the object's attachment point, or 0 if not attached
+	</string>
+	<string name="LSLTipText_llGetFreeMemory" translate="false">
+		integer llGetFreeMemory()
 Returns the number of free bytes of memory the script can use
-  </string>
-  <string name="LSLTipText_llGetRegionName" translate="false">
-string llGetRegionName()
+	</string>
+	<string name="LSLTipText_llGetRegionName" translate="false">
+		string llGetRegionName()
 Returns the current region name
-  </string>
-  <string name="LSLTipText_llGetRegionTimeDilation" translate="false">
-float llGetRegionTimeDilation()
+	</string>
+	<string name="LSLTipText_llGetRegionTimeDilation" translate="false">
+		float llGetRegionTimeDilation()
 Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation)
-  </string>
-  <string name="LSLTipText_llGetRegionFPS" translate="false">
-float llGetRegionFPS()
+	</string>
+	<string name="LSLTipText_llGetRegionFPS" translate="false">
+		float llGetRegionFPS()
 Returns the mean region frames per second
-  </string>
-  <string name="LSLTipText_llParticleSystem" translate="false">
-llParticleSystem(list rules)
+	</string>
+	<string name="LSLTipText_llParticleSystem" translate="false">
+		llParticleSystem(list rules)
 Creates a particle system based on rules.  An empty list removes the particle system.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
-  </string>
-  <string name="LSLTipText_llGroundRepel" translate="false">
-llGroundRepel(float height, integer water, float tau)
+	</string>
+	<string name="LSLTipText_llGroundRepel" translate="false">
+		llGroundRepel(float height, integer water, float tau)
 Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE)
-  </string>
-  <string name="LSLTipText_llGiveInventoryList" translate="false">
-llGiveInventoryList(key target, string folder, list inventory)
+	</string>
+	<string name="LSLTipText_llGiveInventoryList" translate="false">
+		llGiveInventoryList(key target, string folder, list inventory)
 Gives inventory items to target, creating a new folder to put them in
-  </string>
-  <string name="LSLTipText_llSetVehicleType" translate="false">
-llSetVehicleType(integer type)
+	</string>
+	<string name="LSLTipText_llSetVehicleType" translate="false">
+		llSetVehicleType(integer type)
 Sets the vehicle to one of the default types
-  </string>
-  <string name="LSLTipText_llSetVehicleFloatParam" translate="false">
-llSetVehicleFloatParam(integer param, float value)
+	</string>
+	<string name="LSLTipText_llSetVehicleFloatParam" translate="false">
+		llSetVehicleFloatParam(integer param, float value)
 Sets the specified vehicle float parameter
-  </string>
-  <string name="LSLTipText_llSetVehicleVectorParam" translate="false">
-llSetVehicleVectorParam(integer param, vector vec)
+	</string>
+	<string name="LSLTipText_llSetVehicleVectorParam" translate="false">
+		llSetVehicleVectorParam(integer param, vector vec)
 Sets the specified vehicle vector parameter
-  </string>
-  <string name="LSLTipText_llSetVehicleRotationParam" translate="false">
-llSetVehicleVectorParam(integer param, rotation rot)
+	</string>
+	<string name="LSLTipText_llSetVehicleRotationParam" translate="false">
+		llSetVehicleVectorParam(integer param, rotation rot)
 Sets the specified vehicle rotation parameter
-  </string>
-  <string name="LSLTipText_llSetVehicleFlags" translate="false">
-llSetVehicleFlags(integer flags)
-Sets the enabled bits in &apos;flags&apos;
-  </string>
-  <string name="LSLTipText_llRemoveVehicleFlags" translate="false">
-llRemoveVehicleFlags(integer flags)
-Removes the enabled bits in &apos;flags&apos;
-  </string>
-  <string name="LSLTipText_llSitTarget" translate="false">
-llSitTarget(vector offset, rotation rot)
+	</string>
+	<string name="LSLTipText_llSetVehicleFlags" translate="false">
+		llSetVehicleFlags(integer flags)
+Sets the enabled bits in 'flags'
+	</string>
+	<string name="LSLTipText_llRemoveVehicleFlags" translate="false">
+		llRemoveVehicleFlags(integer flags)
+Removes the enabled bits in 'flags'
+	</string>
+	<string name="LSLTipText_llSitTarget" translate="false">
+		llSitTarget(vector offset, rotation rot)
 Sets the sit location for the prim.  If offset == &lt;0,0,0&gt; then the sit target is removed.
-  </string>
-  <string name="LSLTipText_llAvatarOnSitTarget" translate="false">
-key llAvatarOnSitTarget()
-If an avatar is seated on the sit target, returns the avatar&apos;s key, otherwise NULL_KEY
-  </string>
-  <string name="LSLTipText_llAddToLandPassList" translate="false">
-llAddToLandPassList(key avatar, float hours)
+	</string>
+	<string name="LSLTipText_llAvatarOnSitTarget" translate="false">
+		key llAvatarOnSitTarget()
+If an avatar is seated on the sit target, returns the avatar's key, otherwise NULL_KEY
+	</string>
+	<string name="LSLTipText_llAddToLandPassList" translate="false">
+		llAddToLandPassList(key avatar, float hours)
 Adds avatar to the land pass list for hours, or indefinitely if hours is 0
-  </string>
-  <string name="LSLTipText_llSetTouchText" translate="false">
-llSetTouchText(string text)
-Displays text rather than the default &apos;Touch&apos; in the pie menu
-  </string>
-  <string name="LSLTipText_llSetSitText" translate="false">
-llSetSitText(string text)
-Displays text rather than the default &apos;Sit Here&apos; in the pie menu
-  </string>
-  <string name="LSLTipText_llSetCameraEyeOffset" translate="false">
-llSetCameraEyeOffset(vector offset)
+	</string>
+	<string name="LSLTipText_llSetTouchText" translate="false">
+		llSetTouchText(string text)
+Displays text rather than the default 'Touch' in the pie menu
+	</string>
+	<string name="LSLTipText_llSetSitText" translate="false">
+		llSetSitText(string text)
+Displays text rather than the default 'Sit Here' in the pie menu
+	</string>
+	<string name="LSLTipText_llSetCameraEyeOffset" translate="false">
+		llSetCameraEyeOffset(vector offset)
 Sets the camera eye offset for avatars that sit on the object
-  </string>
-  <string name="LSLTipText_llSetCameraAtOffset" translate="false">
-llSetCameraAtOffset(vector offset)
+	</string>
+	<string name="LSLTipText_llSetCameraAtOffset" translate="false">
+		llSetCameraAtOffset(vector offset)
 Sets the point the camera is looking at to offset for avatars that sit on the object
-  </string>
-  <string name="LSLTipText_llDumpList2String" translate="false">
-string llDumpList2String(list src, string separator)
+	</string>
+	<string name="LSLTipText_llDumpList2String" translate="false">
+		string llDumpList2String(list src, string separator)
 Returns the list in a single string, using separator between the entries
-  </string>
-  <string name="LSLTipText_llScriptDanger" translate="false">
-integer llScriptDanger(vector pos)
-Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
-  </string>
-  <string name="LSLTipText_llDialog" translate="false">
-llDialog(key avatar, string message, list buttons, integer chat_channel)
-Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
+	</string>
+	<string name="LSLTipText_llScriptDanger" translate="false">
+		integer llScriptDanger(vector pos)
+Returns TRUE if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts
+	</string>
+	<string name="LSLTipText_llDialog" translate="false">
+		llDialog(key avatar, string message, list buttons, integer chat_channel)
+Shows a dialog box on the avatar's screen with a message and up to 12 buttons.
 If a button is pressed, the avatar says the text of the button label on chat_channel.
-  </string>
-  <string name="LSLTipText_llVolumeDetect" translate="false">
-llVolumeDetect(integer detect)
+	</string>
+	<string name="LSLTipText_llVolumeDetect" translate="false">
+		llVolumeDetect(integer detect)
 If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating.
 Must be applied to the root prim.
-  </string>
-  <string name="LSLTipText_llResetOtherScript" translate="false">
-llResetOtherScript(string name)
+	</string>
+	<string name="LSLTipText_llResetOtherScript" translate="false">
+		llResetOtherScript(string name)
 Resets script name
-  </string>
-  <string name="LSLTipText_llGetScriptState" translate="false">
-integer llGetScriptState(string name)
+	</string>
+	<string name="LSLTipText_llGetScriptState" translate="false">
+		integer llGetScriptState(string name)
 Returns TRUE if the script name is running
-  </string>
-  <string name="LSLTipText_llRemoteLoadScript" translate="false">
-DEPRECATED!  Please use llRemoteLoadScriptPin instead.
-  </string>
-  <string name="LSLTipText_llSetRemoteScriptAccessPin" translate="false">
-llSetRemoteScriptAccessPin(integer pin)
+	</string>
+	<string name="LSLTipText_llRemoteLoadScript" translate="false">
+		DEPRECATED!  Please use llRemoteLoadScriptPin instead.
+	</string>
+	<string name="LSLTipText_llSetRemoteScriptAccessPin" translate="false">
+		llSetRemoteScriptAccessPin(integer pin)
 If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored.
-  </string>
-  <string name="LSLTipText_llRemoteLoadScriptPin" translate="false">
-llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
+	</string>
+	<string name="LSLTipText_llRemoteLoadScriptPin" translate="false">
+		llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
 Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used.
 If running == TRUE, starts the script with start_param
-  </string>
-  <string name="LSLTipText_llOpenRemoteDataChannel" translate="false">
-llOpenRemoteDataChannel()
+	</string>
+	<string name="LSLTipText_llOpenRemoteDataChannel" translate="false">
+		llOpenRemoteDataChannel()
 Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available
-  </string>
-  <string name="LSLTipText_llSendRemoteData" translate="false">
-key llSendRemoteData(key channel, string dest, integer idata, string sdata)
+	</string>
+	<string name="LSLTipText_llSendRemoteData" translate="false">
+		key llSendRemoteData(key channel, string dest, integer idata, string sdata)
 Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.
 Returns a key that is the message_id for the resulting remote_data events.
-  </string>
-  <string name="LSLTipText_llRemoteDataReply" translate="false">
-llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
+	</string>
+	<string name="LSLTipText_llRemoteDataReply" translate="false">
+		llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
 Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata
-  </string>
-  <string name="LSLTipText_llCloseRemoteDataChannel" translate="false">
-llCloseRemoteDataChannel(key channel)
+	</string>
+	<string name="LSLTipText_llCloseRemoteDataChannel" translate="false">
+		llCloseRemoteDataChannel(key channel)
 Closes XML-RPC channel
-  </string>
-  <string name="LSLTipText_llMD5String" translate="false">
-string llMD5String(string src, integer nonce)
+	</string>
+	<string name="LSLTipText_llMD5String" translate="false">
+		string llMD5String(string src, integer nonce)
 Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce
-  </string>
-  <string name="LSLTipText_llSetPrimitiveParams" translate="false">
-llSetPrimitiveParams(list rules)
-Sets the prim&apos;s parameters according to rules
-  </string>
-  <string name="LSLTipText_llStringToBase64" translate="false">
-string llStringToBase64(string str)
+	</string>
+	<string name="LSLTipText_llSetPrimitiveParams" translate="false">
+		llSetPrimitiveParams(list rules)
+Sets the prim's parameters according to rules
+	</string>
+	<string name="LSLTipText_llStringToBase64" translate="false">
+		string llStringToBase64(string str)
 Converts a string to the Base64 representation of the string
-  </string>
-  <string name="LSLTipText_llBase64ToString" translate="false">
-string llBase64ToString(string str)
+	</string>
+	<string name="LSLTipText_llBase64ToString" translate="false">
+		string llBase64ToString(string str)
 Converts a Base64 string to a conventional string.
 If the conversion creates any unprintable characters, they are converted to spaces.
-  </string>
-  <string name="LSLTipText_llXorBase64Strings" translate="false">
-string llXorBase64Strings(string s1, string s2)
+	</string>
+	<string name="LSLTipText_llXorBase64Strings" translate="false">
+		string llXorBase64Strings(string s1, string s2)
 DEPRECATED!  Please use llXorBase64StringsCorrect instead.
 Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string.  s2 repeats if it is shorter than s1.  Retained for backwards compatability.
-  </string>
-  <string name="LSLTipText_llRemoteDataSetRegion" translate="false">
-llRemoteDataSetRegion()
+	</string>
+	<string name="LSLTipText_llRemoteDataSetRegion" translate="false">
+		llRemoteDataSetRegion()
 DEPRECATED!  Please use llOpenRemoteDataChannel instead.
 If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions.
-  </string>
-  <string name="LSLTipText_llLog10" translate="false">
-float llLog10(float val)
+	</string>
+	<string name="LSLTipText_llLog10" translate="false">
+		float llLog10(float val)
 Returns the base 10 logarithm of val.  Returns zero if val &lt;= 0.
-  </string>
-  <string name="LSLTipText_llLog" translate="false">
-float llLog(float val)
+	</string>
+	<string name="LSLTipText_llLog" translate="false">
+		float llLog(float val)
 Returns the natural logarithm of val.  Returns zero if val &lt;= 0.
-  </string>
-  <string name="LSLTipText_llGetAnimationList" translate="false">
-list llGetAnimationList(key id)
+	</string>
+	<string name="LSLTipText_llGetAnimationList" translate="false">
+		list llGetAnimationList(key id)
 Returns a list of keys of playing animations for avatar described by id
-  </string>
-  <string name="LSLTipText_llSetParcelMusicURL" translate="false">
-llSetParcelMusicURL(string url)
+	</string>
+	<string name="LSLTipText_llSetParcelMusicURL" translate="false">
+		llSetParcelMusicURL(string url)
 Sets the streaming audio URL for the parcel which the object is on
-  </string>
-  <string name="LSLTipText_llGetRootPosition" translate="false">
-vector llGetRootPosition()
+	</string>
+	<string name="LSLTipText_llGetRootPosition" translate="false">
+		vector llGetRootPosition()
 Returns the position (in region coordinates) of the root prim of the object which the script is attached to
-  </string>
-  <string name="LSLTipText_llGetRootRotation" translate="false">
-rotation llGetRootRotation()
+	</string>
+	<string name="LSLTipText_llGetRootRotation" translate="false">
+		rotation llGetRootRotation()
 Returns the rotation (relative to the region) of the root prim of the object which the script is attached to
-  </string>
-  <string name="LSLTipText_llGetObjectDesc" translate="false">
-string llGetObjectDesc()
+	</string>
+	<string name="LSLTipText_llGetObjectDesc" translate="false">
+		string llGetObjectDesc()
 Returns the description of the prim the script is attached to
-  </string>
-  <string name="LSLTipText_llSetObjectDesc" translate="false">
-llSetObjectDesc(string name)
-Sets the prim&apos;s description
-  </string>
-  <string name="LSLTipText_llGetCreator" translate="false">
-key llGetCreator()
+	</string>
+	<string name="LSLTipText_llSetObjectDesc" translate="false">
+		llSetObjectDesc(string name)
+Sets the prim's description
+	</string>
+	<string name="LSLTipText_llGetCreator" translate="false">
+		key llGetCreator()
 Returns a key for the creator of the prim
-  </string>
-  <string name="LSLTipText_llGetTimestamp" translate="false">
-string llGetTimestamp()
+	</string>
+	<string name="LSLTipText_llGetTimestamp" translate="false">
+		string llGetTimestamp()
 Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ
-  </string>
-  <string name="LSLTipText_llSetLinkAlpha" translate="false">
-llSetLinkAlpha(integer linknumber, float alpha, integer face)
+	</string>
+	<string name="LSLTipText_llSetLinkAlpha" translate="false">
+		llSetLinkAlpha(integer linknumber, float alpha, integer face)
 If a prim exists in the link chain at linknumber, sets face to alpha
-  </string>
-  <string name="LSLTipText_llGetNumberOfPrims" translate="false">
-integer llGetNumberOfPrims()
+	</string>
+	<string name="LSLTipText_llGetNumberOfPrims" translate="false">
+		integer llGetNumberOfPrims()
 Returns the number of prims in a link set the script is attached to
-  </string>
-  <string name="LSLTipText_llGetNumberOfNotecardLines" translate="false">
-key llGetNumberOfNotecardLines(string name)
+	</string>
+	<string name="LSLTipText_llGetNumberOfNotecardLines" translate="false">
+		key llGetNumberOfNotecardLines(string name)
 Returns number of lines in notecard name via the dataserver event (cast return value to integer)
-  </string>
-  <string name="LSLTipText_llGetBoundingBox" translate="false">
-list llGetBoundingBox(key object)
+	</string>
+	<string name="LSLTipText_llGetBoundingBox" translate="false">
+		list llGetBoundingBox(key object)
 Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ]
-  </string>
-  <string name="LSLTipText_llGetGeometricCenter" translate="false">
-vector llGetGeometricCenter()
+	</string>
+	<string name="LSLTipText_llGetGeometricCenter" translate="false">
+		vector llGetGeometricCenter()
 Returns the geometric center of the linked set the script is attached to.
-  </string>
-  <string name="LSLTipText_llGetPrimitiveParams" translate="false">
-list llGetPrimitiveParams(list params)
+	</string>
+	<string name="LSLTipText_llGetPrimitiveParams" translate="false">
+		list llGetPrimitiveParams(list params)
 Returns the primitive parameters specified in the params list.
-  </string>
-  <string name="LSLTipText_llIntegerToBase64" translate="false">
-string llIntegerToBase64(integer number)
+	</string>
+	<string name="LSLTipText_llIntegerToBase64" translate="false">
+		string llIntegerToBase64(integer number)
 Returns a string that is a Base64 big endian encode of number
-  </string>
-  <string name="LSLTipText_llBase64ToInteger" translate="false">
-integer llBase64ToInteger(string str)
+	</string>
+	<string name="LSLTipText_llBase64ToInteger" translate="false">
+		integer llBase64ToInteger(string str)
 Returns an integer that is the str Base64 decoded as a big endian integer
-  </string>
-  <string name="LSLTipText_llGetGMTclock" translate="false">
-float llGetGMTclock()
+	</string>
+	<string name="LSLTipText_llGetGMTclock" translate="false">
+		float llGetGMTclock()
 Returns the time in seconds since midnight GMT
-  </string>
-  <string name="LSLTipText_llGetSimulatorHostname" translate="false">
-string llGetSimulatorHostname()
+	</string>
+	<string name="LSLTipText_llGetSimulatorHostname" translate="false">
+		string llGetSimulatorHostname()
 Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog)
-  </string>
-  <string name="LSLTipText_llSetLocalRot" translate="false">
-llSetLocalRot(rotation rot)
+	</string>
+	<string name="LSLTipText_llSetLocalRot" translate="false">
+		llSetLocalRot(rotation rot)
 Sets the rotation of a child prim relative to the root prim
-  </string>
-  <string name="LSLTipText_llParseStringKeepNulls" translate="false">
-list llParseStringKeepNulls(string src, list separators, list spacers)
+	</string>
+	<string name="LSLTipText_llParseStringKeepNulls" translate="false">
+		list llParseStringKeepNulls(string src, list separators, list spacers)
 Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated.
 (separators and spacers must be lists of strings, maximum of 8 each)
-  </string>
-  <string name="LSLTipText_llRezAtRoot" translate="false">
-llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
-Instantiates owner&apos;s inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter
-  </string>
-  <string name="LSLTipText_llGetObjectPermMask" translate="false">
-integer llGetObjectPermMask(integer mask)
+	</string>
+	<string name="LSLTipText_llRezAtRoot" translate="false">
+		llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner's inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter
+	</string>
+	<string name="LSLTipText_llGetObjectPermMask" translate="false">
+		integer llGetObjectPermMask(integer mask)
 Returns the requested permission mask for the root object the task is attached to
-  </string>
-  <string name="LSLTipText_llSetObjectPermMask" translate="false">
-llSetObjectPermMask(integer mask, integer value)
+	</string>
+	<string name="LSLTipText_llSetObjectPermMask" translate="false">
+		llSetObjectPermMask(integer mask, integer value)
 Sets the given permission mask to the new value on the root object the task is attached to (requires God Mode)
-  </string>
-  <string name="LSLTipText_llGetInventoryPermMask" translate="false">
-integer llGetInventoryPermMask(string item, integer mask)
+	</string>
+	<string name="LSLTipText_llGetInventoryPermMask" translate="false">
+		integer llGetInventoryPermMask(string item, integer mask)
 Returns the requested permission mask for the inventory item
-  </string>
-  <string name="LSLTipText_llSetInventoryPermMask" translate="false">
-llSetInventoryPermMask(string item, integer mask, integer value)
+	</string>
+	<string name="LSLTipText_llSetInventoryPermMask" translate="false">
+		llSetInventoryPermMask(string item, integer mask, integer value)
 Sets the given permission mask to the new value on the inventory item (requires God Mode)
-  </string>
-  <string name="LSLTipText_llGetInventoryCreator" translate="false">
-key llGetInventoryCreator(string item)
+	</string>
+	<string name="LSLTipText_llGetInventoryCreator" translate="false">
+		key llGetInventoryCreator(string item)
 Returns a key for the creator of the inventory item
-  </string>
-  <string name="LSLTipText_llOwnerSay" translate="false">
-llOwnerSay(string msg)
+	</string>
+	<string name="LSLTipText_llOwnerSay" translate="false">
+		llOwnerSay(string msg)
 Says msg to owner only.  (Owner must be in the same region.)
-  </string>
-  <string name="LSLTipText_llRequestSimulatorData" translate="false">
-key llRequestSimulatorData(string simulator, integer data)
+	</string>
+	<string name="LSLTipText_llRequestSimulatorData" translate="false">
+		key llRequestSimulatorData(string simulator, integer data)
 Requests data about simulator.  When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llForceMouselook" translate="false">
-llForceMouselook(integer mouselook)
+	</string>
+	<string name="LSLTipText_llForceMouselook" translate="false">
+		llForceMouselook(integer mouselook)
 If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode
-  </string>
-  <string name="LSLTipText_llGetObjectMass" translate="false">
-float llGetObjectMass(key id)
+	</string>
+	<string name="LSLTipText_llGetObjectMass" translate="false">
+		float llGetObjectMass(key id)
 Returns the mass of the avatar or object in the region
-  </string>
-  <string name="LSLTipText_llListReplaceList" translate="false">
-list llListReplaceList(list dest, list src, integer start, integer end)
+	</string>
+	<string name="LSLTipText_llListReplaceList" translate="false">
+		list llListReplaceList(list dest, list src, integer start, integer end)
 Returns a list that is dest with start through end removed and src inserted at start
-  </string>
-  <string name="LSLTipText_llLoadURL" translate="false">
-llLoadURL(key avatar, string message, string url)
+	</string>
+	<string name="LSLTipText_llLoadURL" translate="false">
+		llLoadURL(key avatar, string message, string url)
 Shows a dialog to avatar offering to load the web page at url with a message.
 If user clicks yes, launches the page in their web browser.
-  </string>
-  <string name="LSLTipText_llParcelMediaCommandList" translate="false">
-llParcelMediaCommandList(list command)
+	</string>
+	<string name="LSLTipText_llParcelMediaCommandList" translate="false">
+		llParcelMediaCommandList(list command)
 Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media
-  </string>
-  <string name="LSLTipText_llParcelMediaQuery" translate="false">
-list llParcelMediaQuery(list query)
+	</string>
+	<string name="LSLTipText_llParcelMediaQuery" translate="false">
+		list llParcelMediaQuery(list query)
 Returns a list containing results of the sent query
-  </string>
-  <string name="LSLTipText_llModPow" translate="false">
-integer llModPow(integer a, integer b, integer c)
+	</string>
+	<string name="LSLTipText_llModPow" translate="false">
+		integer llModPow(integer a, integer b, integer c)
 Returns a raised to the b power, mod c. ( (a**b)%c )
 b is capped at 0xFFFF (16 bits).
-  </string>
-  <string name="LSLTipText_llGetInventoryType" translate="false">
-integer llGetInventoryType(string name)
+	</string>
+	<string name="LSLTipText_llGetInventoryType" translate="false">
+		integer llGetInventoryType(string name)
 Returns the type of the inventory item name
-  </string>
-  <string name="LSLTipText_llSetPayPrice" translate="false">
-llSetPayPrice(integer price, list quick_pay_buttons)
+	</string>
+	<string name="LSLTipText_llSetPayPrice" translate="false">
+		llSetPayPrice(integer price, list quick_pay_buttons)
 Sets the default amount on the dialog that appears when someone chooses to pay this prim
-  </string>
-  <string name="LSLTipText_llGetCameraPos" translate="false">
-vector llGetCameraPos()
+	</string>
+	<string name="LSLTipText_llGetCameraPos" translate="false">
+		vector llGetCameraPos()
 Returns the current camera position for the agent the task has permissions for
-  </string>
-  <string name="LSLTipText_llGetCameraRot" translate="false">
-rotation llGetCameraRot()
+	</string>
+	<string name="LSLTipText_llGetCameraRot" translate="false">
+		rotation llGetCameraRot()
 Returns the current camera orientation for the agent the task has permissions for
-  </string>
-  <string name="LSLTipText_llSetPrimURL" translate="false">
-llSetPrimURL(string url)
+	</string>
+	<string name="LSLTipText_llSetPrimURL" translate="false">
+		llSetPrimURL(string url)
 Updates the URL for the web page shown on the sides of the object
-  </string>
-  <string name="LSLTipText_llRefreshPrimURL" translate="false">
-llRefreshPrimURL()
+	</string>
+	<string name="LSLTipText_llRefreshPrimURL" translate="false">
+		llRefreshPrimURL()
 Reloads the web page shown on the sides of the object
-  </string>
-  <string name="LSLTipText_llEscapeURL" translate="false">
-string llEscapeURL(string url)
+	</string>
+	<string name="LSLTipText_llEscapeURL" translate="false">
+		string llEscapeURL(string url)
 Returns an escaped/encoded version of url, replacing spaces with %20 etc.
-  </string>
-  <string name="LSLTipText_llUnescapeURL" translate="false">
-string llUnescapeURL(string url)
+	</string>
+	<string name="LSLTipText_llUnescapeURL" translate="false">
+		string llUnescapeURL(string url)
 Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc.
-  </string>
-  <string name="LSLTipText_llMapDestination" translate="false">
-llMapDestination(string simname, vector pos, vector look_at)
+	</string>
+	<string name="LSLTipText_llMapDestination" translate="false">
+		llMapDestination(string simname, vector pos, vector look_at)
 Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.)
 Only works for scripts attached to avatar, or during touch events.
-  </string>
-  <string name="LSLTipText_llAddToLandBanList" translate="false">
-llAddToLandBanList(key avatar, float hours)
+	</string>
+	<string name="LSLTipText_llAddToLandBanList" translate="false">
+		llAddToLandBanList(key avatar, float hours)
 Adds avatar to the land ban list for hours, or indefinitely if hours is 0
-  </string>
-  <string name="LSLTipText_llRemoveFromLandPassList" translate="false">
-llRemoveFromLandPassList(key avatar)
+	</string>
+	<string name="LSLTipText_llRemoveFromLandPassList" translate="false">
+		llRemoveFromLandPassList(key avatar)
 Removes avatar from the land pass list
-  </string>
-  <string name="LSLTipText_llRemoveFromLandBanList" translate="false">
-llRemoveFromLandBanList(key avatar)
+	</string>
+	<string name="LSLTipText_llRemoveFromLandBanList" translate="false">
+		llRemoveFromLandBanList(key avatar)
 Removes avatar from the land ban list
-  </string>
-  <string name="LSLTipText_llSetCameraParams" translate="false">
-llSetCameraParams(list rules)
+	</string>
+	<string name="LSLTipText_llSetCameraParams" translate="false">
+		llSetCameraParams(list rules)
 Sets multiple camera parameters at once.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
-  </string>
-  <string name="LSLTipText_llClearCameraParams" translate="false">
-llClearCameraParams()
+	</string>
+	<string name="LSLTipText_llClearCameraParams" translate="false">
+		llClearCameraParams()
 Resets all camera parameters to default values and turns off scripted camera control
-  </string>
-  <string name="LSLTipText_llListStatistics" translate="false">
-float llListStatistics(integer operation, list src)
+	</string>
+	<string name="LSLTipText_llListStatistics" translate="false">
+		float llListStatistics(integer operation, list src)
 Performs statistical aggregate functions on list src using LIST_STAT_* operations
-  </string>
-  <string name="LSLTipText_llGetUnixTime" translate="false">
-integer llGetUnixTime()
+	</string>
+	<string name="LSLTipText_llGetUnixTime" translate="false">
+		integer llGetUnixTime()
 Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock
-  </string>
-  <string name="LSLTipText_llGetParcelFlags" translate="false">
-integer llGetParcelFlags(vector pos)
+	</string>
+	<string name="LSLTipText_llGetParcelFlags" translate="false">
+		integer llGetParcelFlags(vector pos)
 Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos
-  </string>
-  <string name="LSLTipText_llGetRegionFlags" translate="false">
-integer llGetRegionFlags()
+	</string>
+	<string name="LSLTipText_llGetRegionFlags" translate="false">
+		integer llGetRegionFlags()
 Returns the region flags (REGION_FLAG_*) for the region the object is in
-  </string>
-  <string name="LSLTipText_llXorBase64StringsCorrect" translate="false">
-string llXorBase64StringsCorrect(string s1, string s2)
+	</string>
+	<string name="LSLTipText_llXorBase64StringsCorrect" translate="false">
+		string llXorBase64StringsCorrect(string s1, string s2)
 Correctly performs an exclusive or on two Base64 strings and returns a Base64 string.
 s2 repeats if it is shorter than s1.
-  </string>
-  <string name="LSLTipText_llHTTPRequest" translate="false">
-llHTTPRequest(string url, list parameters, string body)
+	</string>
+	<string name="LSLTipText_llHTTPRequest" translate="false">
+		llHTTPRequest(string url, list parameters, string body)
 Sends an HTTP request to the specified url with the body of the request and parameters
-  </string>
-  <string name="LSLTipText_llResetLandBanList" translate="false">
-llResetLandBanList()
+	</string>
+	<string name="LSLTipText_llResetLandBanList" translate="false">
+		llResetLandBanList()
 Removes all Residents from the land ban list
-  </string>
-  <string name="LSLTipText_llResetLandPassList" translate="false">
-llResetLandPassList()
+	</string>
+	<string name="LSLTipText_llResetLandPassList" translate="false">
+		llResetLandPassList()
 Removes all Residents from the land access/pass list
-  </string>
-  <string name="LSLTipText_llGetObjectPrimCount" translate="false">
-integer llGetObjectPrimCount(key object_id)
+	</string>
+	<string name="LSLTipText_llGetObjectPrimCount" translate="false">
+		integer llGetObjectPrimCount(key object_id)
 Returns the total number of prims for an object in the region
-  </string>
-  <string name="LSLTipText_llGetParcelPrimOwners" translate="false">
-list llGetParcelPrimOwners(vector pos)
+	</string>
+	<string name="LSLTipText_llGetParcelPrimOwners" translate="false">
+		list llGetParcelPrimOwners(vector pos)
 Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts.
 Requires owner-like permissions for the parcel.
-  </string>
-  <string name="LSLTipText_llGetParcelPrimCount" translate="false">
-integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
+	</string>
+	<string name="LSLTipText_llGetParcelPrimCount" translate="false">
+		integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
 Returns the number of prims on the parcel at pos of the given category.
 Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP
-  </string>
-  <string name="LSLTipText_llGetParcelMaxPrims" translate="false">
-integer llGetParcelMaxPrims(vector pos, integer sim_wide)
+	</string>
+	<string name="LSLTipText_llGetParcelMaxPrims" translate="false">
+		integer llGetParcelMaxPrims(vector pos, integer sim_wide)
 Returns the maximum number of prims allowed on the parcel at pos
-  </string>
-  <string name="LSLTipText_llGetParcelDetails" translate="false">
-list llGetParcelDetails(vector pos, list params)
+	</string>
+	<string name="LSLTipText_llGetParcelDetails" translate="false">
+		list llGetParcelDetails(vector pos, list params)
 Returns the parcel details specified in params for the parcel at pos.
 Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
-  </string>
-  <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
-llSetLinkPrimitiveParams(integer linknumber, list rules)
+	</string>
+	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
+		llSetLinkPrimitiveParams(integer linknumber, list rules)
 Sets primitive parameters for linknumber based on rules
-  </string>
-  <string name="LSLTipText_llSetLinkTexture" translate="false">
-llSetLinkTexture(integer linknumber, string texture, integer face)
+	</string>
+	<string name="LSLTipText_llSetLinkTexture" translate="false">
+		llSetLinkTexture(integer linknumber, string texture, integer face)
 Sets the texture of face for a task that exists in the link chain at linknumber
-  </string>
-  <string name="LSLTipText_llStringTrim" translate="false">
-string llStringTrim(string src, integer trim_type)
+	</string>
+	<string name="LSLTipText_llStringTrim" translate="false">
+		string llStringTrim(string src, integer trim_type)
 Trims the leading and/or trailing white spaces from a string.
 trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.
-  </string>
-  <string name="LSLTipText_llRegionSay" translate="false">
-llRegionSay(integer channel, string msg)
+	</string>
+	<string name="LSLTipText_llRegionSay" translate="false">
+		llRegionSay(integer channel, string msg)
 Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel
-  </string>
-  <string name="LSLTipText_llGetObjectDetails" translate="false">
-list llGetObjectDetails(key id, list params)
+	</string>
+	<string name="LSLTipText_llGetObjectDetails" translate="false">
+		list llGetObjectDetails(key id, list params)
 Returns the object details specified in params for the object with key id.
 Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR
-  </string>
-  <string name="LSLTipText_llSetClickAction" translate="false">
-llSetClickAction(integer action)
+	</string>
+	<string name="LSLTipText_llSetClickAction" translate="false">
+		llSetClickAction(integer action)
 Sets the action performed when a prim is clicked upon
-  </string>
-  <string name="LSLTipText_llGetRegionAgentCount" translate="false">
-integer llGetRegionAgentCount()
+	</string>
+	<string name="LSLTipText_llGetRegionAgentCount" translate="false">
+		integer llGetRegionAgentCount()
 Returns the number of avatars in the region
-  </string>
-  <string name="LSLTipText_llTextBox" translate="false">
-llTextBox(key avatar, string message, integer chat_channel)
-Shows a window on the avatar&apos;s screen with the message.
+	</string>
+	<string name="LSLTipText_llTextBox" translate="false">
+		llTextBox(key avatar, string message, integer chat_channel)
+Shows a window on the avatar's screen with the message.
 It contains a text box for input, and if entered that text is chatted on chat_channel.
-  </string>
-  <string name="LSLTipText_llGetAgentLanguage" translate="false">
-string llGetAgentLanguage(key avatar)
+	</string>
+	<string name="LSLTipText_llGetAgentLanguage" translate="false">
+		string llGetAgentLanguage(key avatar)
 Returns the language code of the preferred interface language of the avatar
-  </string>
-  <string name="LSLTipText_llDetectedTouchUV" translate="false">
-vector llDetectedTouchUV(integer index)
+	</string>
+	<string name="LSLTipText_llDetectedTouchUV" translate="false">
+		vector llDetectedTouchUV(integer index)
 Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchFace" translate="false">
-integer llDetectedTouchFace(integer index)
+	</string>
+	<string name="LSLTipText_llDetectedTouchFace" translate="false">
+		integer llDetectedTouchFace(integer index)
 Returns the index of the face where the avatar clicked in a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchPos" translate="false">
-vector llDetectedTouchPos(integer index)
+	</string>
+	<string name="LSLTipText_llDetectedTouchPos" translate="false">
+		vector llDetectedTouchPos(integer index)
 Returns the position where the object was touched in a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchNormal" translate="false">
-vector llDetectedTouchNormal(integer index)
+	</string>
+	<string name="LSLTipText_llDetectedTouchNormal" translate="false">
+		vector llDetectedTouchNormal(integer index)
 Returns the surface normal for a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchBinormal" translate="false">
-vector llDetectedTouchBinormal(integer index)
+	</string>
+	<string name="LSLTipText_llDetectedTouchBinormal" translate="false">
+		vector llDetectedTouchBinormal(integer index)
 Returns the surface binormal for a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchST" translate="false">
-vector llDetectedTouchST(integer index)
+	</string>
+	<string name="LSLTipText_llDetectedTouchST" translate="false">
+		vector llDetectedTouchST(integer index)
 Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event
-  </string>
-  <string name="LSLTipText_llSHA1String" translate="false">
-string llSHA1String(string src)
+	</string>
+	<string name="LSLTipText_llSHA1String" translate="false">
+		string llSHA1String(string src)
 Returns a string of 40 hex characters that is the SHA1 security Hash of src
-  </string>
-  <string name="LSLTipText_llGetFreeURLs" translate="false">
-integer llGetFreeURLs()
+	</string>
+	<string name="LSLTipText_llGetFreeURLs" translate="false">
+		integer llGetFreeURLs()
 Returns the number of available URLs for the current script
-  </string>
-  <string name="LSLTipText_llRequestURL" translate="false">
-key llRequestURL()
+	</string>
+	<string name="LSLTipText_llRequestURL" translate="false">
+		key llRequestURL()
 Requests one HTTP:// url for use by this object.
 An http_request event is triggered with the results.
-  </string>
-  <string name="LSLTipText_llRequestSecureURL" translate="false">
-key llRequestSecureURL()
+	</string>
+	<string name="LSLTipText_llRequestSecureURL" translate="false">
+		key llRequestSecureURL()
 Requests one HTTPS:// (SSL) url for use by this object.
 An http_request event is triggered with the results.
-  </string>
-  <string name="LSLTipText_llReleaseURL" translate="false">
-llReleaseURL(string url)
+	</string>
+	<string name="LSLTipText_llReleaseURL" translate="false">
+		llReleaseURL(string url)
 Releases the specified URL, it will no longer be usable
-  </string>
-  <string name="LSLTipText_llHTTPResponse" translate="false">
-llHTTPResponse(key request_id, integer status, string body)
+	</string>
+	<string name="LSLTipText_llHTTPResponse" translate="false">
+		llHTTPResponse(key request_id, integer status, string body)
 Responds to request_id with status and body
-  </string>
-  <string name="LSLTipText_llGetHTTPHeader" translate="false">
-string llGetHTTPHeader(key request_id, string header)
+	</string>
+	<string name="LSLTipText_llGetHTTPHeader" translate="false">
+		string llGetHTTPHeader(key request_id, string header)
 Returns the value for header for request_id
-  </string>
-  <string name="LSLTipText_llSetPrimMediaParams" translate="false">
-llSetPrimMediaParams(integer face, list params)
+	</string>
+	<string name="LSLTipText_llSetPrimMediaParams" translate="false">
+		llSetPrimMediaParams(integer face, list params)
 Sets the media params for a particular face on an object. If media is not already on this object, add it.
 List is a set of name/value pairs in no particular order.  Params not specified are unchanged, or if new media is added then set to the default specified.
 The possible names are below, along with the types of values and what they mean.
-  </string>
-  <string name="LSLTipText_llGetPrimMediaParams" translate="false">
-list llGetPrimMediaParams(integer face, list params)
+	</string>
+	<string name="LSLTipText_llGetPrimMediaParams" translate="false">
+		list llGetPrimMediaParams(integer face, list params)
 Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
 (Returns an empty list if no media exists on the face.)
-  </string>
-  <string name="LSLTipText_llClearPrimMedia" translate="false">
-llClearPrimMedia(integer face)
+	</string>
+	<string name="LSLTipText_llClearPrimMedia" translate="false">
+		llClearPrimMedia(integer face)
 Clears (deletes) the media and all params from the given face.
-  </string>
-  <string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
-llSetLinkPrimitiveParamsFast(integer linknumber,list rules)
+	</string>
+	<string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
+		llSetLinkPrimitiveParamsFast(integer linknumber,list rules)
 Set primitive parameters for linknumber based on rules.
-  </string>
-  <string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
-llGetLinkPrimitiveParams(integer linknumber,list rules)
+	</string>
+	<string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
+		llGetLinkPrimitiveParams(integer linknumber,list rules)
 Get primitive parameters for linknumber based on rules.
-  </string>
-  <string name="LSLTipText_llLinkParticleSystem" translate="false">
-llLinkParticleSystem(integer linknumber,list rules)
+	</string>
+	<string name="LSLTipText_llLinkParticleSystem" translate="false">
+		llLinkParticleSystem(integer linknumber,list rules)
 Creates a particle system based on rules.  Empty list removes particle system from object.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
-  </string>
-  <string name="LSLTipText_llSetLinkTextureAnim" translate="false">
-llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
-Animate the texture on the specified prim&apos;s face/faces.
-  </string>
-  <string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
-integer llGetLinkNumberOfSides(integer link)
+	</string>
+	<string name="LSLTipText_llSetLinkTextureAnim" translate="false">
+		llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animate the texture on the specified prim's face/faces.
+	</string>
+	<string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
+		integer llGetLinkNumberOfSides(integer link)
 Returns the number of sides of the specified linked prim.
-  </string>
-  <string name="LSLTipText_llGetUsername" translate="false">
-string llGetUsername(key id)
+	</string>
+	<string name="LSLTipText_llGetUsername" translate="false">
+		string llGetUsername(key id)
 Returns the single-word username of an avatar, iff the avatar is in the current region, otherwise the empty string.
-  </string>
-  <string name="LSLTipText_llRequestUsername" translate="false">
-key llRequestUsername(key id)
+	</string>
+	<string name="LSLTipText_llRequestUsername" translate="false">
+		key llRequestUsername(key id)
 Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llGetDisplayName" translate="false">
-string llGetDisplayName(key id)
+	</string>
+	<string name="LSLTipText_llGetDisplayName" translate="false">
+		string llGetDisplayName(key id)
 Returns the name of an avatar, iff the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername.  Use llRequestDisplayName if you absolutely must have the display name.
-  </string>
-  <string name="LSLTipText_llRequestDisplayName" translate="false">
-key llRequestDisplayName(key id)
+	</string>
+	<string name="LSLTipText_llRequestDisplayName" translate="false">
+		key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llGetEnv" translate="false">
-llGetEnv(string name)
+	</string>
+	<string name="LSLTipText_llGetEnv" translate="false">
+		llGetEnv(string name)
 Returns a string with the requested data about the region
-  </string>
-  <string name="LSLTipText_llCastRay" translate="false">
-llCastRay(vector start, vector end, list params)
-Casts a ray into the physics world from &apos;start&apos; to &apos;end&apos; and returns data according to details in params.
-  </string>
-  <string name="LSLTipText_llRegionSayTo" translate="false">
-llRegionSayTo(key target, integer channel, string msg)
+	</string>
+	<string name="LSLTipText_llCastRay" translate="false">
+		llCastRay(vector start, vector end, list params)
+Casts a ray into the physics world from 'start' to 'end' and returns data according to details in params.
+	</string>
+	<string name="LSLTipText_llRegionSayTo" translate="false">
+		llRegionSayTo(key target, integer channel, string msg)
 Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
-  </string>
-  <string name="LSLTipText_llGetSPMaxMemory" translate="false">
-integer llGetSPMaxMemory()
+	</string>
+	<string name="LSLTipText_llGetSPMaxMemory" translate="false">
+		integer llGetSPMaxMemory()
 Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
-  </string>
-  <string name="LSLTipText_llGetUsedMemory" translate="false">
-integer llGetUsedMemory()
+	</string>
+	<string name="LSLTipText_llGetUsedMemory" translate="false">
+		integer llGetUsedMemory()
 Returns the current used memory for the current script. Non-mono scripts always use 16k.
-  </string>
-  <string name="LSLTipText_llScriptProfiler" translate="false">
-llScriptProfiler(integer flags)
+	</string>
+	<string name="LSLTipText_llScriptProfiler" translate="false">
+		llScriptProfiler(integer flags)
 Enabled or disables script profiling options. Currently only supports PROFILE_SCRIPT_MEMORY (mono only) and PROFILE_NONE.
 MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
-  </string>
-  <string name="LSLTipText_llSetMemoryLimit" translate="false">
-integer llSetMemoryLimit(integer mem)
-  </string>
-  <string name="LSLTipText_llGetMemoryLimit" translate="false">
-integer llGetMemoryLimit()
-  </string>
-  <string name="LSLTipText_llSetLinkMedia" translate="false">
-llSetLinkMedia(integer link, integer face, list params)
+	</string>
+	<string name="LSLTipText_llSetMemoryLimit" translate="false">
+		integer llSetMemoryLimit(integer mem)
+	</string>
+	<string name="LSLTipText_llGetMemoryLimit" translate="false">
+		integer llGetMemoryLimit()
+	</string>
+	<string name="LSLTipText_llSetLinkMedia" translate="false">
+		llSetLinkMedia(integer link, integer face, list params)
 Set the media params for a particular face on linked prim.  List is a set of name/value pairs (in no particular order). The possible names are below, along with the types of values and what they mean.  If media is not already on this object, add it. Params not specified are unchanged, or if new media is added set to the default specified.
-  </string>
-  <string name="LSLTipText_llGetLinkMedia" translate="false">
-list llGetLinkMedia(integer link, integer face, list params)
+	</string>
+	<string name="LSLTipText_llGetLinkMedia" translate="false">
+		list llGetLinkMedia(integer link, integer face, list params)
 Get the media params for a particular face on linked prim, given the desired list of names. Returns a list of values in the order requested.  Returns an empty list if no media exists on the face.
-  </string>
-  <string name="LSLTipText_llClearLinkMedia" translate="false">
-llClearLinkMedia(integer link, integer face)
+	</string>
+	<string name="LSLTipText_llClearLinkMedia" translate="false">
+		llClearLinkMedia(integer link, integer face)
 Clears (deletes) the media and all params from the given face on linked prim.
-  </string>
-  <string name="LSLTipText_llSetContentType" translate="false">
-llSetContentType(key id, integer content_type)
-  </string>
-  <string name="LSLTipText_llLinkSitTarget" translate="false">
-llLinkSitTarget(integer link, vector offset, rotation rot)
+	</string>
+	<string name="LSLTipText_llSetContentType" translate="false">
+		llSetContentType(key id, integer content_type)
+	</string>
+	<string name="LSLTipText_llLinkSitTarget" translate="false">
+		llLinkSitTarget(integer link, vector offset, rotation rot)
 Set the sit location for this object (if offset == &lt;0,0,0&gt; clear it)
-  </string>
-  <string name="LSLTipText_llAvatarOnLinkSitTarget" translate="false">
-key llAvatarOnLinkSitTarget(integer link)
-If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KEY otherwise
-  </string>
-  <string name="LSLTipText_llSetLinkCamera" translate="false">
-llSetLinkCamera(integer link, vector eye, vector at)
-  </string>
-  <string name="LSLTipText_llSetVelocity" translate="false">
-llSetVelocity(vector velocity, integer local)
+	</string>
+	<string name="LSLTipText_llAvatarOnLinkSitTarget" translate="false">
+		key llAvatarOnLinkSitTarget(integer link)
+If an avatar is sitting on the sit target, return the avatar's key, NULL_KEY otherwise
+	</string>
+	<string name="LSLTipText_llSetLinkCamera" translate="false">
+		llSetLinkCamera(integer link, vector eye, vector at)
+	</string>
+	<string name="LSLTipText_llSetVelocity" translate="false">
+		llSetVelocity(vector velocity, integer local)
 Sets an objects velocity, in local coords if local == TRUE (if the script is physical)
-  </string>
-  <string name="LSLTipText_llSetAngularVelocity" translate="false">
-llSetAngularVelocity(vector angular_velocity, integer local)
+	</string>
+	<string name="LSLTipText_llSetAngularVelocity" translate="false">
+		llSetAngularVelocity(vector angular_velocity, integer local)
 Sets an objects angular velocity, in local coords if local == TRUE (if the script is physical)
-  </string>
-  <string name="LSLTipText_llSetPhysicsMaterial" translate="false">
-llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
-Sets the requested attributes of the root object&apos;s physics material.
-  </string>
-  <string name="LSLTipText_llGetPhysicsMaterial" translate="false">
-llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
-  </string>
-  <string name="LSLTipText_llGetMassMKS" translate="false">
-llGetMassMKS() returns the mass of the linkset in kilograms.
-  </string>
-  <string name="LSLTipText_llGenerateKey" translate="false">
-llGenerateKey()
+	</string>
+	<string name="LSLTipText_llSetPhysicsMaterial" translate="false">
+		llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
+Sets the requested attributes of the root object's physics material.
+	</string>
+	<string name="LSLTipText_llGetPhysicsMaterial" translate="false">
+		llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
+	</string>
+	<string name="LSLTipText_llGetMassMKS" translate="false">
+		llGetMassMKS() returns the mass of the linkset in kilograms.
+	</string>
+	<string name="LSLTipText_llGenerateKey" translate="false">
+		llGenerateKey()
 Retun a unique generated key
-  </string>
-  <string name="LSLTipText_llSetKeyframedMotion" translate="false">
-llSetKeyframedMotion(list keyframes, list options)
+	</string>
+	<string name="LSLTipText_llSetKeyframedMotion" translate="false">
+		llSetKeyframedMotion(list keyframes, list options)
 Requests that a nonphysical object be keyframed according to keyframe list.
-  </string>
-  <string name="LSLTipText_llTransferLindenDollars" translate="false">
-key llTransferLindenDollars(key destination, integer amount)
+	</string>
+	<string name="LSLTipText_llTransferLindenDollars" translate="false">
+		key llTransferLindenDollars(key destination, integer amount)
 Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
-  </string>
-  <string name="LSLTipText_llGetParcelMusicURL" translate="false">
-string llGetParcelMusicURL()
+	</string>
+	<string name="LSLTipText_llGetParcelMusicURL" translate="false">
+		string llGetParcelMusicURL()
 Gets the streaming audio URL for the parcel of land on which the object is located.
-  </string>
-  <string name="LSLTipText_llSetRegionPos" translate="false">
-integer llSetRegionPos(vector pos)
-Sets the position anywhere within the region (if the object isn&apos;t physical)
-  </string>
-  <string name="LSLTipText_llNavigateTo" translate="false">
-llNavigateTo(vector point, list options)
+	</string>
+	<string name="LSLTipText_llSetRegionPos" translate="false">
+		integer llSetRegionPos(vector pos)
+Sets the position anywhere within the region (if the object isn't physical)
+	</string>
+	<string name="LSLTipText_llNavigateTo" translate="false">
+		llNavigateTo(vector point, list options)
 For AI Character: Navigate to destination.
-  </string>
-  <string name="LSLTipText_llCreateCharacter" translate="false">
-llCreateCharacter(list options)
+	</string>
+	<string name="LSLTipText_llCreateCharacter" translate="false">
+		llCreateCharacter(list options)
 Convert linkset to AI Character which can navigate the world.
-  </string>
-  <string name="LSLTipText_llPursue" translate="false">
-llPursue(key target, list options)
+	</string>
+	<string name="LSLTipText_llPursue" translate="false">
+		llPursue(key target, list options)
 For AI Character: Chase after a target.
-  </string>
-  <string name="LSLTipText_llWanderWithin" translate="false">
-llWanderWithin(vector center, float radius, list options)
+	</string>
+	<string name="LSLTipText_llWanderWithin" translate="false">
+		llWanderWithin(vector center, float radius, list options)
 For AI Character: Wander within a specified volume.
-  </string>
-  <string name="LSLTipText_llFleeFrom" translate="false">
-llFleeFrom(vector source, float radius, list options)
+	</string>
+	<string name="LSLTipText_llFleeFrom" translate="false">
+		llFleeFrom(vector source, float radius, list options)
 For AI Character: Flee from a point.
-  </string>
-  <string name="LSLTipText_llPatrolPoints" translate="false">
-llPatrolPoints(list points, list options)
+	</string>
+	<string name="LSLTipText_llPatrolPoints" translate="false">
+		llPatrolPoints(list points, list options)
 For AI Character: Patrol a list of points.
-  </string>
-  <string name="LSLTipText_llExecCharacterCmd" translate="false">
-llExecCharacterCmd(integer cmd, list options)
+	</string>
+	<string name="LSLTipText_llExecCharacterCmd" translate="false">
+		llExecCharacterCmd(integer cmd, list options)
 For AI Character: Execute a character command.
-  </string>
-  <string name="LSLTipText_llDeleteCharacter" translate="false">
-llDeleteCharacter()
+	</string>
+	<string name="LSLTipText_llDeleteCharacter" translate="false">
+		llDeleteCharacter()
 Convert linkset from AI Character to Physics object.
-  </string>
-  <string name="LSLTipText_llUpdateCharacter" translate="false">
-llUpdateCharacter(list options)
-Change the AI Character&apos;s settings.
-  </string>
-  <string name="LSLTipText_llEvade" translate="false">
-llEvade(key target, list options)
+	</string>
+	<string name="LSLTipText_llUpdateCharacter" translate="false">
+		llUpdateCharacter(list options)
+Change the AI Character's settings.
+	</string>
+	<string name="LSLTipText_llEvade" translate="false">
+		llEvade(key target, list options)
 For AI Character: Evade a specified target.
-  </string>
-  <string name="LSLTipText_llGetClosestNavPoint" translate="false">
-list llGetClosestNavPoint(vector point, list options)
+	</string>
+	<string name="LSLTipText_llGetClosestNavPoint" translate="false">
+		list llGetClosestNavPoint(vector point, list options)
 For AI Character: Get the closest navigable point to the point provided.
-  </string>
-
-
-  <!-- Wearable Types -->
-  <string name="shape">シェイプ</string>
-  <string name="skin">スキン</string>
-  <string name="hair">髪</string>
-  <string name="eyes">目</string>
-  <string name="shirt">シャツ</string>
-  <string name="pants">ズボン</string>
-  <string name="shoes">靴</string>
-  <string name="socks">靴下</string>
-  <string name="jacket">ジャケット</string>
-  <string name="gloves">手袋</string>
-  <string name="undershirt">下着（上半身）</string>
-  <string name="underpants">下着（下半身）</string>
-  <string name="skirt">スカート</string>
-  <string name="alpha">アルファ</string>
-  <string name="tattoo">タトゥ</string>
-  <string name="universal">ユニバーサル</string>
-  <string name="physics">物理作用</string>
-  <string name="invalid">無効</string>
-  <string name="none">なし</string>
-  <string name="shirt_not_worn">シャツ未着用</string>
-  <string name="pants_not_worn">ズボン未着用</string>
-  <string name="shoes_not_worn">靴未着用</string>
-  <string name="socks_not_worn">靴下未着用</string>
-  <string name="jacket_not_worn">ジャケット未着用</string>
-  <string name="gloves_not_worn">手袋未着用</string>
-  <string name="undershirt_not_worn">下着（上半身）未着用</string>
-  <string name="underpants_not_worn">下着（下半身）未着用</string>
-
-  <!-- Not Worn Wearable Types -->
-  <string name="skirt_not_worn">スカート未着用</string>
-  <string name="alpha_not_worn">アルファ未着用</string>
-  <string name="tattoo_not_worn">タトゥ未着用</string>
-  <string name="universal_not_worn">ユニバーサルなし</string>
-  <string name="physics_not_worn">物理作用なし</string>
-  <string name="invalid_not_worn">無効</string>
-
-  <!-- Create new wearable of the specified type -->
-  <string name="create_new_shape">新しいシェイプを作成</string>
-  <string name="create_new_skin">新しいスキンを作成</string>
-  <string name="create_new_hair">新しい髪を作成</string>
-  <string name="create_new_eyes">新しい目を作成</string>
-  <string name="create_new_shirt">新しいシャツを作成</string>
-  <string name="create_new_pants">新しいズボンを作成</string>
-  <string name="create_new_shoes">新しい靴を作成</string>
-  <string name="create_new_socks">新しい靴下を作成</string>
-  <string name="create_new_jacket">新しい上着を作成</string>
-  <string name="create_new_gloves">新しい手袋を作成</string>
-  <string name="create_new_undershirt">新しい下着（上半身）を作成</string>
-  <string name="create_new_underpants">新しい下着（下半身）を作成</string>
-  <string name="create_new_skirt">新しいスカートを作成</string>
-  <string name="create_new_alpha">新しいアルファを作成</string>
-  <string name="create_new_tattoo">新しいタトゥを作成</string>
-  <string name="create_new_universal">新しいユニバーサルを作成</string>
-  <string name="create_new_physics">新しい物理作用を作成</string>
-  <string name="create_new_invalid">無効</string>
-
-  <!-- Wearable List-->
-  <string name="NewWearable">新しい[WEARABLE_ITEM]</string>
-
-  <!-- LLGroupNotify -->
-  <!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
-  <string name="next">次へ</string>
-  <string name="ok">OK</string>
-  <string name="GroupNotifyGroupNotice">グループ通知</string>
-  <string name="GroupNotifyGroupNotices">グループ通知</string>
-  <string name="GroupNotifySentBy">送信者</string>
-  <string name="GroupNotifyAttached">添付：</string>
-  <string name="GroupNotifyViewPastNotices">ここで過去の通知を表示するか、メッセージを受け取らない設定をします。</string>
-  <string name="GroupNotifyOpenAttachment">添付アイテムを開く</string>
-  <string name="GroupNotifySaveAttachment">添付アイテムを保存</string>
-
-  <string name="TeleportOffer">テレポートを送る</string>
-  <!-- start-up toast's string-->
-  <string name="StartUpNotifications">不在中に新しい通知が届きました。</string>
-  <!-- overflow toast's string-->
-  <string name="OverflowInfoChannelString">あなたにはさらに%d件の通知があります</string>
-
-
-  <!-- body parts -->
-  <string name="BodyPartsRightArm">右腕</string>
-  <string name="BodyPartsHead">頭</string>
-  <string name="BodyPartsLeftArm">左腕</string>
-  <string name="BodyPartsLeftLeg">左脚</string>
-  <string name="BodyPartsTorso">上半身</string>
-  <string name="BodyPartsRightLeg">右脚</string>
-  <string name="BodyPartsEnhancedSkeleton">拡張スケルトン</string>
-
-  <!-- slider -->
-  <string name="GraphicsQualityLow">低</string>
-  <string name="GraphicsQualityMid">中</string>
-  <string name="GraphicsQualityHigh">高</string>
-
-  <!-- mouselook -->
-  <string name="LeaveMouselook">ESCキーを押してワールドビューに戻ります</string>
-
-  <!-- inventory -->
-  <string name="InventoryNoMatchingItems">お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。</string>
-  <string name="InventoryNoMatchingRecentItems">お探しのものは見つかりましたか？[secondlife:///app/inventory/filters フィルタを表示]をお試しください。</string>
-  <string name="PlacesNoMatchingItems">お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。</string>
-  <string name="FavoritesNoMatchingItems">ここにランドマークをドラッグしてお気に入りに追加します。</string>
-  <string name="MarketplaceNoMatchingItems">アイテムが見つかりませんでした。検索文字列のスペルを確認して、もう一度やり直してください。</string>
-  <string name="InventoryNoTexture">インベントリ内にこのテクスチャのコピーがありません</string>
-  <string name="InventoryInboxNoItems">マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。</string>
-  <string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/?lang=ja-JP</string>
-  <string name="MarketplaceURL_CreateStore">https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%9E%E3%83%BC%E3%82%B1%E3%83%83%E3%83%88%E3%83%97%E3%83%AC%E3%82%A4%E3%82%B9%E3%81%A7%E8%B2%A9%E5%A3%B2%E3%81%99%E3%82%8B-r769/</string>
-  <string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard?lang=ja-JP</string>
-  <string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports?lang=ja-JP</string>
-  <string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more?lang=ja-JP</string>
-  <string name="InventoryPlayAnimationTooltip">[再生]オプションでウィンドウを開ける。</string>
-  <string name="InventoryPlayGestureTooltip">インワールドで選択済みのジェスチャーを実行する。</string>
-  <string name="InventoryPlaySoundTooltip">[再生]オプションでウィンドウを開ける。</string>
-  <string name="InventoryOutboxNotMerchantTitle">マーケットプレイスでは誰でもアイテムを売ることができます。</string>
-  <string name="InventoryOutboxNotMerchantTooltip" />
-  <string name="InventoryOutboxNotMerchant">販売者になりたい方は、[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストアを作成]する必要があります。</string>
-  <string name="InventoryOutboxNoItemsTitle">アウトボックスは空です。</string>
-  <string name="InventoryOutboxNoItemsTooltip" />
-  <string name="InventoryOutboxNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグし、「マーケットプレイスに送信」をクリックします。</string>
-  <string name="InventoryOutboxInitializingTitle">マーケットプレイスの初期化。</string>
-  <string name="InventoryOutboxInitializing">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア]のアカウントにアクセスしています。</string>
-  <string name="InventoryOutboxErrorTitle">マーケットプレイス エラー</string>
-  <string name="InventoryOutboxError">[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストア]がエラーを返しています。</string>
-  <string name="InventoryMarketplaceError">マーケットプレイスのリストを開くときにエラーが発生しました。引き続きこのメッセージを受信するには、Second Lifeのサポート（http://support.secondlife.com）にお問い合わせください</string>
-  <string name="InventoryMarketplaceListingsNoItemsTitle">マーケットプレイスのリストフォルダが空です。</string>
-  <string name="InventoryMarketplaceListingsNoItems">[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。</string>
-  <string name="InventoryItemsCount">（[ITEMS_COUNT]個のアイテム）</string>
-  <string name="Marketplace Validation Warning Stock">バージョンフォルダには、在庫フォルダが含まれなければなりません。</string>
-  <string name="Marketplace Validation Error Mixed Stock">エラー：在庫フォルダ内のすべてのアイテムは、コピー不可で同じ種類でなければなりません。</string>
-  <string name="Marketplace Validation Error Subfolder In Stock">エラー：在庫フォルダにサブフォルダを含めることはできません。</string>
-  <string name="Marketplace Validation Warning Empty">警告：フォルダにアイテムが含まれていません。</string>
-  <string name="Marketplace Validation Warning Create Stock">警告：在庫フォルダを作成しています。</string>
-  <string name="Marketplace Validation Warning Create Version">警告：バージョンフォルダを作成しています。</string>
-  <string name="Marketplace Validation Warning Move">: 警告：アイテムを移動しています。</string>
-  <string name="Marketplace Validation Warning Delete">: 警告：フォルダの中身が在庫フォルダに移されました。空のフォルダを削除します。</string>
-  <string name="Marketplace Validation Error Stock Item">: エラー：在庫フォルダには、コピー不可アイテムを含める必要があります。</string>
-  <string name="Marketplace Validation Warning Unwrapped Item">: 警告：バージョンフォルダには、アイテムが含まれていなければなりません。</string>
-  <string name="Marketplace Validation Error">エラー：</string>
-  <string name="Marketplace Validation Warning">警告：</string>
-  <string name="Marketplace Validation Error Empty Version">警告：バージョンフォルダには、最低１アイテムが含まれなければなりません</string>
-  <string name="Marketplace Validation Error Empty Stock">警告：在庫フォルダには、最低１アイテムが含まれていなければなりません</string>
-
-  <string name="Marketplace Validation No Error">報告するエラーまたは警告はありません</string>
-  <string name="Marketplace Error None">エラーなし</string>
-  <string name="Marketplace Error Prefix">エラー：</string>
-  <string name="Marketplace Error Not Merchant">マーケットプレイスに商品を送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。</string>
-  <string name="Marketplace Error Not Accepted">アイテムをそのフォルダに移動できません。</string>
-  <string name="Marketplace Error Unsellable Item">このアイテムをマーケットプレイスで販売することはできません。</string>
-
-  <string name="MarketplaceNoID">Mkt ID なし</string>
-  <string name="MarketplaceLive">リスト掲載済み</string>
-  <string name="MarketplaceActive">有効</string>
-  <string name="MarketplaceMax">最大</string>
-  <string name="MarketplaceStock">在庫</string>
-  <string name="MarketplaceNoStock">在庫なし</string>
-  <string name="MarketplaceUpdating">アップデート中…</string>
-
-  <string name="UploadFeeInfo">料金はサブスクリプションのレベルにより異なります。レベルが高いほど、料金が下がります。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細]</string>
-
-  <string name="Open landmarks">オープン ランドマーク</string>
-  <string name="Unconstrained">アンコンストレインド（制約なし）</string>
-
-  <!-- use value="" because they have preceding spaces -->
-  <string name="no_transfer" value=" （再販・譲渡不可）" />
-  <string name="no_modify" value=" （編集不可）" />
-  <string name="no_copy" value=" （コピー不可）" />
-  <string name="worn" value=" （着用中）" />
-  <string name="link" value=" （リンク）" />
-  <string name="broken_link" value=" （壊れたリンク）" />
-  <string name="LoadingContents">コンテンツをロード中です…</string>
-  <string name="NoContents">コンテンツなし</string>
-  <string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT]に装着中）" />
-  <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])" />
-  <string name="ActiveGesture" value="[GESLABEL]（アクティブ）" />
-  <!-- Inventory permissions -->
-  <string name="PermYes">はい</string>
-  <string name="PermNo">いいえ</string>
-
-  <!-- Gestures labels -->
-  <!-- use value="" because they have preceding spaces -->
-  <string name="Chat Message" value="チャット：" />
-  <string name="Sound" value=" サウンド：" />
-  <string name="Wait" value=" --- 待機：:" />
-  <string name="AnimFlagStop" value=" アニメーションを停止：" />
-  <string name="AnimFlagStart" value=" アニメーションを開始：" />
-  <string name="Wave" value=" 手を振る" />
-  <string name="GestureActionNone" value="なし" />
-  <string name="HelloAvatar" value=" やあ、アバター！" />
-  <string name="ViewAllGestures" value="すべて表示 &gt;&gt;" />
-  <string name="GetMoreGestures" value="ショッピング &gt;&gt;" />
-  <string name="Animations" value="アニメーション、" />
-  <string name="Calling Cards" value="コーリングカード、" />
-  <string name="Clothing" value="服装、" />
-  <string name="Gestures" value="ジェスチャー、" />
-  <string name="Landmarks" value="ランドマーク、" />
-  <string name="Notecards" value="ノートカード、" />
-  <string name="Objects" value="オブジェクト、" />
-  <string name="Scripts" value="スクリプト、" />
-  <string name="Sounds" value="サウンド、" />
-  <string name="Textures" value="テクスチャ、" />
-  <string name="Snapshots" value="スナップショット、" />
-  <string name="No Filters" value="いいえ" />
-  <string name="Since Logoff" value="–ログオフ以来" />
-
-  <!-- inventory folder -->
-  <string name="InvFolder My Inventory">インベントリ</string>
-  <string name="InvFolder Library">ライブラリ</string>
-  <string name="InvFolder Textures">テクスチャ</string>
-  <string name="InvFolder Sounds">サウンド</string>
-  <string name="InvFolder Calling Cards">コーリングカード</string>
-  <string name="InvFolder Landmarks">ランドマーク</string>
-  <string name="InvFolder Scripts">スクリプト</string>
-  <string name="InvFolder Clothing">服装</string>
-  <string name="InvFolder Objects">オブジェクト</string>
-  <string name="InvFolder Notecards">ノートカード</string>
-  <string name="InvFolder New Folder">新規フォルダ</string>
-  <string name="InvFolder Inventory">インベントリ</string>
-  <string name="InvFolder Uncompressed Images">圧縮されていない画像</string>
-  <string name="InvFolder Body Parts">身体部位</string>
-  <string name="InvFolder Trash">ごみ箱</string>
-  <string name="InvFolder Photo Album">フォトアルバム</string>
-  <string name="InvFolder Lost And Found">遺失物</string>
-  <string name="InvFolder Uncompressed Sounds">圧縮されていないサウンド</string>
-  <string name="InvFolder Animations">アニメーション</string>
-  <string name="InvFolder Gestures">ジェスチャー</string>
-  <string name="InvFolder Favorite">お気に入り</string>
-  <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
-      Also, it can be written as "Favorite" or "Favorites".
-  We should localize all variants of them with the same value -->
-  <string name="InvFolder favorite">お気に入り</string>
-  <string name="InvFolder Favorites">お気に入り</string>
-  <string name="InvFolder favorites">お気に入り</string>
-  <string name="InvFolder Current Outfit">着用中のアウトフィット</string>
-  <string name="InvFolder Initial Outfits">最初のアウトフィット</string>
-  <string name="InvFolder My Outfits">アウトフィット</string>
-  <string name="InvFolder Accessories">アクセサリ</string>
-  <string name="InvFolder Meshes">メッシュ</string>
-  <string name="InvFolder Received Items">受け取った商品</string>
-  <string name="InvFolder Merchant Outbox">販売品ボックス</string>
-
-  <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
-  <string name="InvFolder Friends">フレンド</string>
-  <string name="InvFolder All">全員</string>
-
-  <string name="no_attachments">着用している装着物はありません</string>
-  <string name="Attachments remain">装着物（残りのスロット数：[COUNT]）</string>
-
-  <!-- inventory FVBridge -->
-  <!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
-  <string name="Buy">購入</string>
-  <string name="BuyforL$">L$ で購入</string>
-
-  <string name="Stone">石</string>
-  <string name="Metal">金属</string>
-  <string name="Glass">ガラス</string>
-  <string name="Wood">木</string>
-  <string name="Flesh">肌</string>
-  <string name="Plastic">プラスチック</string>
-  <string name="Rubber">ゴム</string>
-  <string name="Light">ライト</string>
-
-  <!-- keyboard -->
-  <string name="KBShift">Shift</string>
-  <string name="KBCtrl">Ctrl</string>
-
-  <!-- Avatar Skeleton -->
-  <string name="Chest">胸部</string>
-  <string name="Skull">頭蓋</string>
-  <string name="Left Shoulder">左肩</string>
-  <string name="Right Shoulder">右肩</string>
-  <string name="Left Hand">左手</string>
-  <string name="Right Hand">右手</string>
-  <string name="Left Foot">左足</string>
-  <string name="Right Foot">右足</string>
-  <string name="Spine">背骨</string>
-  <string name="Pelvis">骨盤</string>
-  <string name="Mouth">口</string>
-  <string name="Chin">あご</string>
-  <string name="Left Ear">左耳</string>
-  <string name="Right Ear">右耳</string>
-  <string name="Left Eyeball">左目眼球</string>
-  <string name="Right Eyeball">右目眼球</string>
-  <string name="Nose">鼻</string>
-  <string name="R Upper Arm">右上腕</string>
-  <string name="R Forearm">右前腕</string>
-  <string name="L Upper Arm">左上腕</string>
-  <string name="L Forearm">左前腕</string>
-  <string name="Right Hip">右腰</string>
-  <string name="R Upper Leg">右上脚</string>
-  <string name="R Lower Leg">右下脚</string>
-  <string name="Left Hip">左腰</string>
-  <string name="L Upper Leg">左上脚</string>
-  <string name="L Lower Leg">左下脚</string>
-  <string name="Stomach">腹</string>
-  <string name="Left Pec">左胸筋</string>
-  <string name="Right Pec">右胸筋</string>
-  <string name="Neck">首</string>
-  <string name="Avatar Center">アバターの中央</string>
-  <string name="Left Ring Finger">左薬指</string>
-  <string name="Right Ring Finger">右薬指</string>
-  <string name="Tail Base">しっぽのベース</string>
-  <string name="Tail Tip">しっぽの先</string>
-  <string name="Left Wing">左の翼</string>
-  <string name="Right Wing">右の翼</string>
-  <string name="Jaw">顎</string>
-  <string name="Alt Left Ear">代わりの左耳</string>
-  <string name="Alt Right Ear">代わりの右耳</string>
-  <string name="Alt Left Eye">代わりの左目</string>
-  <string name="Alt Right Eye">代わりの右目</string>
-  <string name="Tongue">舌</string>
-  <string name="Groin">脚の付け根</string>
-  <string name="Left Hind Foot">左後足</string>
-  <string name="Right Hind Foot">右後足</string>
-  <string name="Invalid Attachment">装着先が正しくありません</string>
-  <string name="ATTACHMENT_MISSING_ITEM">エラー：アイテムが見つかりません。</string>
-  <string name="ATTACHMENT_MISSING_BASE_ITEM">エラー：ベースアイテムが見つかりません。</string>
-  <string name="ATTACHMENT_NOT_ATTACHED">エラー：オブジェクトは現在のアウトフィットにありますが、添付されていません。</string>
-
-  <!-- Avatar age computation, see LLDateUtil::ageFromDate -->
-  <string name="YearsMonthsOld">[AGEYEARS][AGEMONTHS]</string>
-  <string name="YearsOld">[AGEYEARS]</string>
-  <string name="MonthsOld">[AGEMONTHS]</string>
-  <string name="WeeksOld">[AGEWEEKS]</string>
-  <string name="DaysOld">[AGEDAYS]</string>
-  <string name="TodayOld">本日参加</string>
-
-  <!-- Avatar complexity rendering messages, see llavatarrendernotifier. -->
-  <string name="av_render_everyone_now">あなたは、全員から見えるようになりました。</string>
-  <string name="av_render_not_everyone">あなたは、周囲にいる一部の人から、見えない可能性があります。</string>
-  <string name="av_render_over_half">あなたは、周囲にいる半分以上の人から、見えない可能性があります。</string>
-  <string name="av_render_most_of">あなたは、周囲にいるほとんどの人から、見えない可能性があります。</string>
-  <string name="av_render_anyone">あなたは、周囲の誰からも見えていない可能性があります。</string>
-
-  <!-- HUD complexity rendering messages, see llavatarrendernotifier. -->
-  <string name="hud_description_total">利用中のＨＵＤ</string>
-  <string name="hud_name_with_joint">[OBJ_NAME]（[JNT_NAME]に装着中）</string>
-  <string name="hud_render_memory_warning">[HUD_DETAILS]は、大量のテクスチャメモリを使用しています。</string>
-  <string name="hud_render_cost_warning">[HUD_DETAILS]は、計算コストが高いオブジェクトやテクスチャがたくさん含まれています。</string>
-  <string name="hud_render_heavy_textures_warning">[HUD_DETAILS]には、容量が多いテクスチャが使用されています。</string>
-  <string name="hud_render_cramped_warning">[HUD_DETAILS]は、使用されているオブジェクトが多すぎます。</string>
-  <string name="hud_render_textures_warning">[HUD_DETAILS]は、使用されているテクスチャが多すぎます。</string>
-
-  <!-- AgeYearsA = singular,
-       AgeYearsB = plural,
-       AgeYearsC = plural for non-English languages like Russian
-       For example, LLTrans::getCountString("AgeYears", 3) is plural form B
-       in English and form C in Russian -->
-  <string name="AgeYearsA">[COUNT]年</string>
-  <string name="AgeYearsB">[COUNT]年</string>
-  <string name="AgeYearsC">[COUNT]年</string>
-  <string name="AgeMonthsA">[COUNT]ヶ月</string>
-  <string name="AgeMonthsB">[COUNT]ヶ月</string>
-  <string name="AgeMonthsC">[COUNT]ヶ月</string>
-  <string name="AgeWeeksA">[COUNT]週間</string>
-  <string name="AgeWeeksB">[COUNT]週間</string>
-  <string name="AgeWeeksC">[COUNT]週間</string>
-  <string name="AgeDaysA">[COUNT]日間</string>
-  <string name="AgeDaysB">[COUNT]日間</string>
-  <string name="AgeDaysC">[COUNT]日間</string>
-  <!-- Group member counts -->
-  <string name="GroupMembersA">[COUNT]人</string>
-  <string name="GroupMembersB">[COUNT]人</string>
-  <string name="GroupMembersC">[COUNT]人</string>
-
-  <!-- Account types, see LLAvatarPropertiesProcessor -->
-  <string name="AcctTypeResident">住人</string>
-  <string name="AcctTypeTrial">トライアル</string>
-  <string name="AcctTypeCharterMember">創立メンバー</string>
-  <string name="AcctTypeEmployee">Linden Lab従業員</string>
-  <string name="PaymentInfoUsed">支払情報使用履歴あり</string>
-  <string name="PaymentInfoOnFile">支払情報登録済</string>
-  <string name="NoPaymentInfoOnFile">支払情報未登録</string>
-  <string name="AgeVerified">年齢確認済</string>
-  <string name="NotAgeVerified">年齢未確認</string>
-
-  <!-- HUD Position -->
-  <string name="Center 2">中央２</string>
-  <string name="Top Right">右上</string>
-  <string name="Top">上部</string>
-  <string name="Top Left">左上</string>
-  <string name="Center">中央</string>
-  <string name="Bottom Left">左下</string>
-  <string name="Bottom">下部</string>
-  <string name="Bottom Right">右下</string>
-
-  <!-- compile queue-->
-  <string name="CompileQueueDownloadedCompiling">ダウンロードが完了しました。コンパイルしています。</string>
-  <string name="CompileQueueServiceUnavailable">スクリプトのコンパイルサービスを利用できません</string>
-  <string name="CompileQueueScriptNotFound">サーバー上にスクリプトが見つかりません。</string>
-  <string name="CompileQueueProblemDownloading">ダウンロードに問題があります</string>
-  <string name="CompileQueueInsufficientPermDownload">権限不足のためスクリプトをダウンロードできません。</string>
-  <string name="CompileQueueInsufficientPermFor">権限不足：</string>
-  <string name="CompileQueueUnknownFailure">原因不明の失敗によりダウンロードができません</string>
-  <string name="CompileNoExperiencePerm">[EXPERIENCE]体験による[SCRIPT]スクリプトのスキップ。</string>
-  <string name="CompileQueueTitle">再コンパイル進行</string>
-  <string name="CompileQueueStart">再コンパイル</string>
-  <string name="ResetQueueTitle">進行をリセット</string>
-  <string name="ResetQueueStart">リセット</string>
-  <string name="RunQueueTitle">実行を続けるよう設定</string>
-  <string name="RunQueueStart">実行中に設定</string>
-  <string name="NotRunQueueTitle">実行を停止するよう設定</string>
-  <string name="NotRunQueueStart">実行停止に設定</string>
-
-  <!-- compile comment text-->
-  <string name="CompileSuccessful">コンパイルが完了しました！</string>
-  <string name="CompileSuccessfulSaving">コンパイル完了、保存しています…</string>
-  <string name="SaveComplete">保存完了。</string>
-  <string name="UploadFailed">ファイルのアップロードが失敗しました:</string>
-  <string name="ObjectOutOfRange">スクリプト（オブジェクトが範囲外にあります）</string>
-  <string name="ScriptWasDeleted">スクリプト（インベントリから削除済み）</string>
-
-  <!-- god tools -->
-  <string name="GodToolsObjectOwnedBy">[OWNER]が所有している「[OBJECT]」というオブジェクト</string>
-
-  <!-- groups -->
-  <string name="GroupsNone">なし</string>
-  <string name="Group" value="（グループ）" />
-  <string name="Unknown">（不明）</string>
-  <string name="SummaryForTheWeek" value="今週のまとめ。開始日は" />
-  <string name="NextStipendDay" value="です。次回のお小遣い支給日：" />
-  <string name="GroupPlanningDate">[year,datetime,utc]年[mthnum,datetime,utc]月[day,datetime,utc]日</string>
-  <string name="GroupIndividualShare" value="グループ 個人の割り当て" />
-  <string name="GroupColumn" value="グループの設定" />
-  <string name="Balance">残高</string>
-  <string name="Credits">収入</string>
-  <string name="Debits">支出</string>
-  <string name="Total">合計</string>
-  <string name="NoGroupDataFound">グループのデータが見つかりませんでした。</string>
-
-  <!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar.
-       This is to help Lindens when answering questions. -->
-  <string name="IMParentEstate">親の不動産</string>
-  <string name="IMMainland">メインランド</string>
-  <string name="IMTeen">ティーン</string>
-
-  <!-- floater about land -->
-  <string name="Anyone">全員</string>
-
-  <!-- floater region info -->
-  <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
-  <string name="RegionInfoError">エラー</string>
-  <string name="RegionInfoAllEstatesOwnedBy">[OWNER]が所有するすべての不動産</string>
-  <string name="RegionInfoAllEstatesYouOwn">あなたが所有するすべての不動産</string>
-  <string name="RegionInfoAllEstatesYouManage">あなたが[OWNER]のために管理するすべての不動産</string>
-  <string name="RegionInfoAllowedResidents">常に許可：（[ALLOWEDAGENTS]人、最大[MAXACCESS]人）</string>
-  <string name="RegionInfoAllowedGroups">グループを常に許可：（[ALLOWEDGROUPS]、最大[MAXACCESS]）</string>
-  <string name="RegionInfoBannedResidents">常に禁止：（[BANNEDAGENTS]人、最大[MAXBANNED]人）</string>
-  <string name="RegionInfoListTypeAllowedAgents">常に許可</string>
-  <string name="RegionInfoListTypeBannedAgents">常に禁止</string>
-  <string name="RegionInfoAllEstates">すべての不動産</string>
-  <string name="RegionInfoManagedEstates">管理されている不動産</string>
-  <string name="RegionInfoThisEstate">この不動産</string>
-  <string name="AndNMore">および[EXTRA_COUNT]つの不動産</string>
-
-  <!-- script limits floater -->
-  <string name="ScriptLimitsParcelScriptMemory">区画スクリプトメモリ</string>
-  <string name="ScriptLimitsParcelsOwned">区画一覧：[PARCELS]個</string>
-  <string name="ScriptLimitsMemoryUsed">使用されたメモリ：[MAX]㎅中[COUNT]㎅　[AVAILABLE]㎅利用可</string>
-  <string name="ScriptLimitsMemoryUsedSimple">使用されたメモリ：[COUNT]㎅</string>
-  <string name="ScriptLimitsParcelScriptURLs">区画のスクリプトＵＲＬ</string>
-  <string name="ScriptLimitsURLsUsed">使用されたＵＲＬ：[MAX]件中[COUNT]件　[AVAILABLE]件利用可</string>
-  <string name="ScriptLimitsURLsUsedSimple">使用されたＵＲＬ：[COUNT]件</string>
-  <string name="ScriptLimitsRequestError">情報のリクエスト中にエラーが発生しました</string>
-  <string name="ScriptLimitsRequestNoParcelSelected">区画が選択されていません。</string>
-  <string name="ScriptLimitsRequestWrongRegion">エラー：スクリプト情報は現在地のみ取得できます</string>
-  <string name="ScriptLimitsRequestWaiting">情報を取得中…</string>
-  <string name="ScriptLimitsRequestDontOwnParcel">この区画を調査する権限がありません。</string>
-
-  <string name="SITTING_ON">着席中</string>
-  <string name="ATTACH_CHEST">胸部</string>
-  <string name="ATTACH_HEAD">頭頂部</string>
-  <string name="ATTACH_LSHOULDER">左肩</string>
-  <string name="ATTACH_RSHOULDER">右肩</string>
-  <string name="ATTACH_LHAND">左手</string>
-  <string name="ATTACH_RHAND">右手</string>
-  <string name="ATTACH_LFOOT">左足</string>
-  <string name="ATTACH_RFOOT">右足</string>
-  <string name="ATTACH_BACK">背骨</string>
-  <string name="ATTACH_PELVIS">骨盤</string>
-  <string name="ATTACH_MOUTH">口</string>
-  <string name="ATTACH_CHIN">あご</string>
-  <string name="ATTACH_LEAR">左耳</string>
-  <string name="ATTACH_REAR">右耳</string>
-  <string name="ATTACH_LEYE">左目</string>
-  <string name="ATTACH_REYE">右目</string>
-  <string name="ATTACH_NOSE">鼻</string>
-  <string name="ATTACH_RUARM">右上腕</string>
-  <string name="ATTACH_RLARM">右前腕</string>
-  <string name="ATTACH_LUARM">左上腕</string>
-  <string name="ATTACH_LLARM">左前腕</string>
-  <string name="ATTACH_RHIP">右腰</string>
-  <string name="ATTACH_RULEG">右脚（上）</string>
-  <string name="ATTACH_RLLEG">右脚（下）</string>
-  <string name="ATTACH_LHIP">左腰</string>
-  <string name="ATTACH_LULEG">左脚（上）</string>
-  <string name="ATTACH_LLLEG">左脚（下）</string>
-  <string name="ATTACH_BELLY">腹</string>
-  <string name="ATTACH_LEFT_PEC">左胸筋</string>
-  <string name="ATTACH_RIGHT_PEC">右胸筋</string>
-  <string name="ATTACH_HUD_CENTER_2">ＨＵＤ（中央 2）</string>
-  <string name="ATTACH_HUD_TOP_RIGHT">ＨＵＤ（右上）</string>
-  <string name="ATTACH_HUD_TOP_CENTER">ＨＵＤ（上・中央）</string>
-  <string name="ATTACH_HUD_TOP_LEFT">ＨＵＤ（左上）</string>
-  <string name="ATTACH_HUD_CENTER_1">ＨＵＤ（中央 1）</string>
-  <string name="ATTACH_HUD_BOTTOM_LEFT">ＨＵＤ（左下）</string>
-  <string name="ATTACH_HUD_BOTTOM">ＨＵＤ（下）</string>
-  <string name="ATTACH_HUD_BOTTOM_RIGHT">ＨＵＤ（右下）</string>
-  <string name="ATTACH_NECK">首</string>
-  <string name="ATTACH_AVATAR_CENTER">アバターの中央</string>
-  <string name="ATTACH_LHAND_RING1">左薬指</string>
-  <string name="ATTACH_RHAND_RING1">右薬指</string>
-  <string name="ATTACH_TAIL_BASE">しっぽのベース</string>
-  <string name="ATTACH_TAIL_TIP">しっぽの先</string>
-  <string name="ATTACH_LWING">左の翼</string>
-  <string name="ATTACH_RWING">右の翼</string>
-  <string name="ATTACH_FACE_JAW">顎</string>
-  <string name="ATTACH_FACE_LEAR">代わりの左耳</string>
-  <string name="ATTACH_FACE_REAR">代わりの右耳</string>
-  <string name="ATTACH_FACE_LEYE">代わりの左目</string>
-  <string name="ATTACH_FACE_REYE">代わりの右目</string>
-  <string name="ATTACH_FACE_TONGUE">舌</string>
-  <string name="ATTACH_GROIN">脚の付け根</string>
-  <string name="ATTACH_HIND_LFOOT">左後足</string>
-  <string name="ATTACH_HIND_RFOOT">右後足</string>
-
-  <!-- script editor -->
-  <string name="CursorPos">[LINE]行目、[COLUMN]列目</string>
-
-  <!-- panel dir browser -->
-  <string name="PanelDirCountFound">[COUNT]件見つかりました</string>
-  <string name="PanelDirTimeStr">[ampm,datetime,utc]　[hour12,datetime,utc]：[min,datetime,utc]</string>
-
-  <!-- panel dir events -->
-  <string name="PanelDirEventsDateText">[mthnum,datetime,slt]／[day,datetime,slt]</string>
-
-  <!-- panel contents -->
-  <string name="PanelContentsTooltip">オブジェクトの中身</string>
-  <string name="PanelContentsNewScript">新規スクリプト</string>
-
-  <!-- panel preferences general -->
-  <string name="DoNotDisturbModeResponseDefault">この住民が「着信拒否」をオンにすると、あなたのメッセージが後で表示されるようになります。</string>
-
-  <!-- Mute -->
-  <string name="MuteByName">（名前で）</string>
-  <string name="MuteAgent">（住人）</string>
-  <string name="MuteObject">（オブジェクト）</string>
-  <string name="MuteGroup">（グループ）</string>
-  <string name="MuteExternal">（外部）</string>
-
-  <!-- Region/Estate Covenant -->
-  <string name="RegionNoCovenant">この不動産には約款がありません。</string>
-  <string name="RegionNoCovenantOtherOwner">この不動産には約款がありません。この不動産上の土地は不動産所有者により販売され、Linden Labは販売しません。販売に関するお問い合わせは、不動産所有者までお願い致します。</string>
-  <!-- use value="" to keep the trailing space -->
-  <string name="covenant_last_modified" value="最終更新日：" />
-  <string name="none_text" value="（なし）" />
-  <string name="never_text" value="（無）" />
-
-  <!--Region Details-->
-  <string name="GroupOwned">グループ所有</string>
-  <string name="Public">公共</string>
-
-  <!-- Environment settings -->
-  <string name="LocalSettings">ローカル設定</string>
-  <string name="RegionSettings">リージョン（地域）の設定</string>
-
-  <string name="NoEnvironmentSettings">このリージョンは環境設定をサポートしていません。</string>
-  <string name="EnvironmentSun">太陽</string>
-  <string name="EnvironmentMoon">月</string>
-  <string name="EnvironmentBloom">花</string>
-  <string name="EnvironmentCloudNoise">雲の音</string>
-  <string name="EnvironmentNormalMap">ノーマル・マップ</string>
-  <string name="EnvironmentTransparent">透過</string>
-
-  <!-- panel classified -->
-  <string name="ClassifiedClicksTxt">クリック数：[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール</string>
-  <string name="ClassifiedUpdateAfterPublish">（掲載後更新）</string>
-
-  <!-- panel picks -->
-  <string name="NoPicksClassifiedsText">ピックやクラシファイド広告を作成していません。作成するには、下にある「＋」ボタンをクリックします。</string>
-  <string name="NoPicksText">ピックを作成していません。「新規」ボタンをクリックしてピックを作成する。</string>
-  <string name="NoClassifiedsText">クラシファイド広告を作成していません。「新規」ボタンをクリックしてクラシファイド広告を作成する。</string>
-  <string name="NoAvatarPicksClassifiedsText">ピック、またはクラシファイド広告がありません</string>
-  <string name="NoAvatarPicksText">ピックがありません</string>
-  <string name="NoAvatarClassifiedsText">クラシファイド広告がありません</string>
-  <string name="PicksClassifiedsLoadingText">読み込んでいます…</string>
-
-  <!-- Multi Preview Floater -->
-  <string name="MultiPreviewTitle">プレビュー</string>
-  <string name="MultiPropertiesTitle">プロパティ</string>
-
-  <!-- inventory offer -->
-  <string name="InvOfferAnObjectNamed">オブジェクト名</string>
-  <string name="InvOfferOwnedByGroup">グループが所有している</string>
-  <string name="InvOfferOwnedByUnknownGroup">不明なグループが所有している</string>
-  <string name="InvOfferOwnedBy">が所有している</string>
-  <string name="InvOfferOwnedByUnknownUser">不明なユーザーが所有している</string>
-  <string name="InvOfferGaveYou">を渡してきました。</string>
-  <string name="InvOfferDecline">&lt;nolink&gt;[NAME]&lt;/nolink&gt;からの[DESC]を拒否しました。</string>
-
-  <!-- group money -->
-  <string name="GroupMoneyTotal">合計</string>
-  <string name="GroupMoneyBought">購入：</string>
-  <string name="GroupMoneyPaidYou">あなたに支払い：</string>
-  <string name="GroupMoneyPaidInto">支払情報</string>
-  <string name="GroupMoneyBoughtPassTo">入場許可を購入：</string>
-  <string name="GroupMoneyPaidFeeForEvent">が、イベントの費用を支払いました。</string>
-  <string name="GroupMoneyPaidPrizeForEvent">が、イベントの賞金を支払いました。</string>
-  <string name="GroupMoneyBalance">残高</string>
-  <string name="GroupMoneyCredits">収入</string>
-  <string name="GroupMoneyDebits">支出</string>
-  <string name="GroupMoneyDate">[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日　[weekday,datetime,utc]</string>
-
-  <!-- Viewer menu -->
-  <string name="AcquiredItems">取得アイテム</string>
-  <string name="Cancel">キャンセル</string>
-  <string name="UploadingCosts">[NAME]のアップロード料金は L$ [AMOUNT]です。</string>
-  <string name="BuyingCosts">これをL$ [AMOUNT]で購入します。</string>
-  <string name="UnknownFileExtension">不明な拡張子：%s
-使用可能な拡張子：.wav，.tga，.bmp，.jpg，.jpeg，.bvh</string>
-  <string name="MuteObject2">オブジェクトのブロック</string>
-  <string name="MuteAvatar">アバターのブロック</string>
-  <string name="UnmuteObject">オブジェクトのブロック解除</string>
-  <string name="UnmuteAvatar">アバターのブロック解除</string>
-  <string name="AddLandmarkNavBarMenu">ランドマークに追加…</string>
-  <string name="EditLandmarkNavBarMenu">ランドマークを編集…</string>
-  <!-- menu accelerators -->
-  <string name="accel-mac-control">⌃</string>
-  <string name="accel-mac-command">⌘</string>
-  <string name="accel-mac-option">⌥</string>
-  <string name="accel-mac-shift">⇧</string>
-  <string name="accel-win-control">Ctrl＋</string>
-  <string name="accel-win-alt">Alt＋</string>
-  <string name="accel-win-shift">Shift＋</string>
-
-  <!-- Previews -->
-  <string name="FileSaved">ファイルが保存されました。</string>
-  <string name="Receiving">取得中</string>
-
-  <!-- status bar , Time -->
-  <string name="AM">午前</string>
-  <string name="PM">午後</string>
-  <string name="PST">太平洋標準時</string>
-  <string name="PDT">太平洋夏時間</string>
-
-  <!-- Directions, HUD -->
-  <string name="Direction_Forward">前</string>
-  <string name="Direction_Left">左</string>
-  <string name="Direction_Right">右</string>
-  <string name="Direction_Back">後</string>
-  <string name="Direction_North">北</string>
-  <string name="Direction_South">南</string>
-  <string name="Direction_West">西</string>
-  <string name="Direction_East">東</string>
-  <string name="Direction_Up">上</string>
-  <string name="Direction_Down">下</string>
-
-  <!-- Search Category Strings -->
-  <string name="Any Category">全カテゴリ</string>
-  <string name="Shopping">ショッピング</string>
-  <string name="Land Rental">土地のレンタル</string>
-  <string name="Property Rental">プロパティのレンタル</string>
-  <string name="Special Attraction">特別なアトラクション</string>
-  <string name="New Products">新製品</string>
-  <string name="Employment">雇用</string>
-  <string name="Wanted">求む</string>
-  <string name="Service">サービス</string>
-  <string name="Personal">パーソナル</string>
-
-  <!-- PARCEL_CATEGORY_UI_STRING -->
-  <string name="None">なし</string>
-  <string name="Linden Location">Linden 所在地</string>
-  <string name="Adult">成人向け</string>
-  <string name="Arts&amp;Culture">芸術と文化</string>
-  <string name="Business">ビジネス</string>
-  <string name="Educational">教育</string>
-  <string name="Gaming">ゲーム</string>
-  <string name="Hangout">たまり場</string>
-  <string name="Newcomer Friendly">新規住民歓迎</string>
-  <string name="Parks&amp;Nature">公園と自然</string>
-  <string name="Residential">住宅用</string>
-  <!--<string name="Shopping">Shopping</string>	-->
-  <string name="Stage">ステージ</string>
-  <string name="Other">その他</string>
-  <string name="Rental">レンタル</string>
-  <string name="Any">全員</string>
-  <string name="You">あなた</string>
-
-  <!-- punctuations -->
-  <string name=":">：</string>
-  <string name=",">、</string>
-  <string name="...">…</string>
-  <string name="***">***</string>
-  <string name="(">（</string>
-  <string name=")">）</string>
-  <string name=".">。</string>
-  <string name="'">'</string>
-  <string name="---">─</string>
-
-  <!-- media -->
-  <string name="Multiple Media">複数のメディア</string>
-  <string name="Play Media">メディアの再生／一時停止</string>
-
-  <!-- Drivers support/update pages -->
-  <string name="IntelDriverPage">https://www.intel.co.jp/content/www/jp/ja/support/detect.html</string>
-  <string name="NvidiaDriverPage">https://www.nvidia.com/Download/index.aspx?lang=ja-jp</string>
-  <string name="AMDDriverPage">https://www.amd.com/ja/support</string>
-
-  <!-- OSMessageBox messages -->
-  <string name="MBCmdLineError">コマンドラインにエラーが見つかりました。
+	</string>
+	<string name="shape">
+		シェイプ
+	</string>
+	<string name="skin">
+		スキン
+	</string>
+	<string name="hair">
+		髪
+	</string>
+	<string name="eyes">
+		目
+	</string>
+	<string name="shirt">
+		シャツ
+	</string>
+	<string name="pants">
+		ズボン
+	</string>
+	<string name="shoes">
+		靴
+	</string>
+	<string name="socks">
+		靴下
+	</string>
+	<string name="jacket">
+		ジャケット
+	</string>
+	<string name="gloves">
+		手袋
+	</string>
+	<string name="undershirt">
+		下着（上半身）
+	</string>
+	<string name="underpants">
+		下着（下半身）
+	</string>
+	<string name="skirt">
+		スカート
+	</string>
+	<string name="alpha">
+		アルファ
+	</string>
+	<string name="tattoo">
+		タトゥ
+	</string>
+	<string name="universal">
+		ユニバーサル
+	</string>
+	<string name="physics">
+		物理作用
+	</string>
+	<string name="invalid">
+		無効
+	</string>
+	<string name="none">
+		なし
+	</string>
+	<string name="shirt_not_worn">
+		シャツ未着用
+	</string>
+	<string name="pants_not_worn">
+		ズボン未着用
+	</string>
+	<string name="shoes_not_worn">
+		靴未着用
+	</string>
+	<string name="socks_not_worn">
+		靴下未着用
+	</string>
+	<string name="jacket_not_worn">
+		ジャケット未着用
+	</string>
+	<string name="gloves_not_worn">
+		手袋未着用
+	</string>
+	<string name="undershirt_not_worn">
+		下着（上半身）未着用
+	</string>
+	<string name="underpants_not_worn">
+		下着（下半身）未着用
+	</string>
+	<string name="skirt_not_worn">
+		スカート未着用
+	</string>
+	<string name="alpha_not_worn">
+		アルファ未着用
+	</string>
+	<string name="tattoo_not_worn">
+		タトゥ未着用
+	</string>
+	<string name="universal_not_worn">
+		ユニバーサルなし
+	</string>
+	<string name="physics_not_worn">
+		物理作用なし
+	</string>
+	<string name="invalid_not_worn">
+		無効
+	</string>
+	<string name="create_new_shape">
+		新しいシェイプを作成
+	</string>
+	<string name="create_new_skin">
+		新しいスキンを作成
+	</string>
+	<string name="create_new_hair">
+		新しい髪を作成
+	</string>
+	<string name="create_new_eyes">
+		新しい目を作成
+	</string>
+	<string name="create_new_shirt">
+		新しいシャツを作成
+	</string>
+	<string name="create_new_pants">
+		新しいズボンを作成
+	</string>
+	<string name="create_new_shoes">
+		新しい靴を作成
+	</string>
+	<string name="create_new_socks">
+		新しい靴下を作成
+	</string>
+	<string name="create_new_jacket">
+		新しい上着を作成
+	</string>
+	<string name="create_new_gloves">
+		新しい手袋を作成
+	</string>
+	<string name="create_new_undershirt">
+		新しい下着（上半身）を作成
+	</string>
+	<string name="create_new_underpants">
+		新しい下着（下半身）を作成
+	</string>
+	<string name="create_new_skirt">
+		新しいスカートを作成
+	</string>
+	<string name="create_new_alpha">
+		新しいアルファを作成
+	</string>
+	<string name="create_new_tattoo">
+		新しいタトゥを作成
+	</string>
+	<string name="create_new_universal">
+		新しいユニバーサルを作成
+	</string>
+	<string name="create_new_physics">
+		新しい物理作用を作成
+	</string>
+	<string name="create_new_invalid">
+		無効
+	</string>
+	<string name="NewWearable">
+		新しい[WEARABLE_ITEM]
+	</string>
+	<string name="next">
+		次へ
+	</string>
+	<string name="ok">
+		OK
+	</string>
+	<string name="GroupNotifyGroupNotice">
+		グループ通知
+	</string>
+	<string name="GroupNotifyGroupNotices">
+		グループ通知
+	</string>
+	<string name="GroupNotifySentBy">
+		送信者
+	</string>
+	<string name="GroupNotifyAttached">
+		添付：
+	</string>
+	<string name="GroupNotifyViewPastNotices">
+		ここで過去の通知を表示するか、メッセージを受け取らない設定をします。
+	</string>
+	<string name="GroupNotifyOpenAttachment">
+		添付アイテムを開く
+	</string>
+	<string name="GroupNotifySaveAttachment">
+		添付アイテムを保存
+	</string>
+	<string name="TeleportOffer">
+		テレポートを送る
+	</string>
+	<string name="StartUpNotifications">
+		不在中に新しい通知が届きました。
+	</string>
+	<string name="OverflowInfoChannelString">
+		あなたにはさらに%d件の通知があります
+	</string>
+	<string name="BodyPartsRightArm">
+		右腕
+	</string>
+	<string name="BodyPartsHead">
+		頭
+	</string>
+	<string name="BodyPartsLeftArm">
+		左腕
+	</string>
+	<string name="BodyPartsLeftLeg">
+		左脚
+	</string>
+	<string name="BodyPartsTorso">
+		上半身
+	</string>
+	<string name="BodyPartsRightLeg">
+		右脚
+	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		拡張スケルトン
+	</string>
+	<string name="GraphicsQualityLow">
+		低
+	</string>
+	<string name="GraphicsQualityMid">
+		中
+	</string>
+	<string name="GraphicsQualityHigh">
+		高
+	</string>
+	<string name="LeaveMouselook">
+		ESCキーを押してワールドビューに戻ります
+	</string>
+	<string name="InventoryNoMatchingItems">
+		お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索]をお試しください。
+	</string>
+	<string name="InventoryNoMatchingRecentItems">
+		お探しのものは見つかりましたか？[secondlife:///app/inventory/filters フィルタを表示]をお試しください。
+	</string>
+	<string name="PlacesNoMatchingItems">
+		お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM] 検索]をお試しください。
+	</string>
+	<string name="FavoritesNoMatchingItems">
+		ここにランドマークをドラッグしてお気に入りに追加します。
+	</string>
+	<string name="MarketplaceNoMatchingItems">
+		アイテムが見つかりませんでした。検索文字列のスペルを確認して、もう一度やり直してください。
+	</string>
+	<string name="InventoryNoTexture">
+		インベントリ内にこのテクスチャのコピーがありません
+	</string>
+	<string name="InventoryInboxNoItems">
+		マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。
+	</string>
+	<string name="MarketplaceURL">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/?lang=ja-JP
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%9E%E3%83%BC%E3%82%B1%E3%83%83%E3%83%88%E3%83%97%E3%83%AC%E3%82%A4%E3%82%B9%E3%81%A7%E8%B2%A9%E5%A3%B2%E3%81%99%E3%82%8B-r769/
+	</string>
+	<string name="MarketplaceURL_Dashboard">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard?lang=ja-JP
+	</string>
+	<string name="MarketplaceURL_Imports">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports?lang=ja-JP
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more?lang=ja-JP
+	</string>
+	<string name="InventoryPlayAnimationTooltip">
+		[再生]オプションでウィンドウを開ける。
+	</string>
+	<string name="InventoryPlayGestureTooltip">
+		インワールドで選択済みのジェスチャーを実行する。
+	</string>
+	<string name="InventoryPlaySoundTooltip">
+		[再生]オプションでウィンドウを開ける。
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		マーケットプレイスでは誰でもアイテムを売ることができます。
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip"/>
+	<string name="InventoryOutboxNotMerchant">
+		販売者になりたい方は、[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストアを作成]する必要があります。
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		アウトボックスは空です。
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip"/>
+	<string name="InventoryOutboxNoItems">
+		[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグし、「マーケットプレイスに送信」をクリックします。
+	</string>
+	<string name="InventoryOutboxInitializingTitle">
+		マーケットプレイスの初期化。
+	</string>
+	<string name="InventoryOutboxInitializing">
+		[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア]のアカウントにアクセスしています。
+	</string>
+	<string name="InventoryOutboxErrorTitle">
+		マーケットプレイス エラー
+	</string>
+	<string name="InventoryOutboxError">
+		[[MARKETPLACE_CREATE_STORE_URL] マーケットプレイスストア]がエラーを返しています。
+	</string>
+	<string name="InventoryMarketplaceError">
+		マーケットプレイスのリストを開くときにエラーが発生しました。引き続きこのメッセージを受信するには、Second Lifeのサポート（http://support.secondlife.com）にお問い合わせください
+	</string>
+	<string name="InventoryMarketplaceListingsNoItemsTitle">
+		マーケットプレイスのリストフォルダが空です。
+	</string>
+	<string name="InventoryMarketplaceListingsNoItems">
+		[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。
+	</string>
+	<string name="InventoryItemsCount">
+		（[ITEMS_COUNT]個のアイテム）
+	</string>
+	<string name="Marketplace Validation Warning Stock">
+		バージョンフォルダには、在庫フォルダが含まれなければなりません。
+	</string>
+	<string name="Marketplace Validation Error Mixed Stock">
+		エラー：在庫フォルダ内のすべてのアイテムは、コピー不可で同じ種類でなければなりません。
+	</string>
+	<string name="Marketplace Validation Error Subfolder In Stock">
+		エラー：在庫フォルダにサブフォルダを含めることはできません。
+	</string>
+	<string name="Marketplace Validation Warning Empty">
+		警告：フォルダにアイテムが含まれていません。
+	</string>
+	<string name="Marketplace Validation Warning Create Stock">
+		警告：在庫フォルダを作成しています。
+	</string>
+	<string name="Marketplace Validation Warning Create Version">
+		警告：バージョンフォルダを作成しています。
+	</string>
+	<string name="Marketplace Validation Warning Move">
+		: 警告：アイテムを移動しています。
+	</string>
+	<string name="Marketplace Validation Warning Delete">
+		: 警告：フォルダの中身が在庫フォルダに移されました。空のフォルダを削除します。
+	</string>
+	<string name="Marketplace Validation Error Stock Item">
+		: エラー：在庫フォルダには、コピー不可アイテムを含める必要があります。
+	</string>
+	<string name="Marketplace Validation Warning Unwrapped Item">
+		: 警告：バージョンフォルダには、アイテムが含まれていなければなりません。
+	</string>
+	<string name="Marketplace Validation Error">
+		エラー：
+	</string>
+	<string name="Marketplace Validation Warning">
+		警告：
+	</string>
+	<string name="Marketplace Validation Error Empty Version">
+		警告：バージョンフォルダには、最低１アイテムが含まれなければなりません
+	</string>
+	<string name="Marketplace Validation Error Empty Stock">
+		警告：在庫フォルダには、最低１アイテムが含まれていなければなりません
+	</string>
+	<string name="Marketplace Validation No Error">
+		報告するエラーまたは警告はありません
+	</string>
+	<string name="Marketplace Error None">
+		エラーなし
+	</string>
+	<string name="Marketplace Error Prefix">
+		エラー：
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		マーケットプレイスに商品を送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。
+	</string>
+	<string name="Marketplace Error Not Accepted">
+		アイテムをそのフォルダに移動できません。
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		このアイテムをマーケットプレイスで販売することはできません。
+	</string>
+	<string name="MarketplaceNoID">
+		Mkt ID なし
+	</string>
+	<string name="MarketplaceLive">
+		リスト掲載済み
+	</string>
+	<string name="MarketplaceActive">
+		有効
+	</string>
+	<string name="MarketplaceMax">
+		最大
+	</string>
+	<string name="MarketplaceStock">
+		在庫
+	</string>
+	<string name="MarketplaceNoStock">
+		在庫なし
+	</string>
+	<string name="MarketplaceUpdating">
+		アップデート中…
+	</string>
+	<string name="UploadFeeInfo">
+		料金はサブスクリプションのレベルにより異なります。レベルが高いほど、料金が下がります。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細]
+	</string>
+	<string name="Open landmarks">
+		オープン ランドマーク
+	</string>
+	<string name="Unconstrained">
+		アンコンストレインド（制約なし）
+	</string>
+	<string name="no_transfer" value=" （再販・譲渡不可）"/>
+	<string name="no_modify" value=" （編集不可）"/>
+	<string name="no_copy" value=" （コピー不可）"/>
+	<string name="worn" value=" （着用中）"/>
+	<string name="link" value=" （リンク）"/>
+	<string name="broken_link" value=" （壊れたリンク）"/>
+	<string name="LoadingContents">
+		コンテンツをロード中です…
+	</string>
+	<string name="NoContents">
+		コンテンツなし
+	</string>
+	<string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT]に装着中）"/>
+	<string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
+	<string name="ActiveGesture" value="[GESLABEL]（アクティブ）"/>
+	<string name="PermYes">
+		はい
+	</string>
+	<string name="PermNo">
+		いいえ
+	</string>
+	<string name="Chat Message" value="チャット："/>
+	<string name="Sound" value=" サウンド："/>
+	<string name="Wait" value=" --- 待機：:"/>
+	<string name="AnimFlagStop" value=" アニメーションを停止："/>
+	<string name="AnimFlagStart" value=" アニメーションを開始："/>
+	<string name="Wave" value=" 手を振る"/>
+	<string name="GestureActionNone" value="なし"/>
+	<string name="HelloAvatar" value=" やあ、アバター！"/>
+	<string name="ViewAllGestures" value="すべて表示 &gt;&gt;"/>
+	<string name="GetMoreGestures" value="ショッピング &gt;&gt;"/>
+	<string name="Animations" value="アニメーション、"/>
+	<string name="Calling Cards" value="コーリングカード、"/>
+	<string name="Clothing" value="服装、"/>
+	<string name="Gestures" value="ジェスチャー、"/>
+	<string name="Landmarks" value="ランドマーク、"/>
+	<string name="Notecards" value="ノートカード、"/>
+	<string name="Objects" value="オブジェクト、"/>
+	<string name="Scripts" value="スクリプト、"/>
+	<string name="Sounds" value="サウンド、"/>
+	<string name="Textures" value="テクスチャ、"/>
+	<string name="Snapshots" value="スナップショット、"/>
+	<string name="No Filters" value="いいえ"/>
+	<string name="Since Logoff" value="–ログオフ以来"/>
+	<string name="InvFolder My Inventory">
+		インベントリ
+	</string>
+	<string name="InvFolder Library">
+		ライブラリ
+	</string>
+	<string name="InvFolder Textures">
+		テクスチャ
+	</string>
+	<string name="InvFolder Sounds">
+		サウンド
+	</string>
+	<string name="InvFolder Calling Cards">
+		コーリングカード
+	</string>
+	<string name="InvFolder Landmarks">
+		ランドマーク
+	</string>
+	<string name="InvFolder Scripts">
+		スクリプト
+	</string>
+	<string name="InvFolder Clothing">
+		服装
+	</string>
+	<string name="InvFolder Objects">
+		オブジェクト
+	</string>
+	<string name="InvFolder Notecards">
+		ノートカード
+	</string>
+	<string name="InvFolder New Folder">
+		新規フォルダ
+	</string>
+	<string name="InvFolder Inventory">
+		インベントリ
+	</string>
+	<string name="InvFolder Uncompressed Images">
+		圧縮されていない画像
+	</string>
+	<string name="InvFolder Body Parts">
+		身体部位
+	</string>
+	<string name="InvFolder Trash">
+		ごみ箱
+	</string>
+	<string name="InvFolder Photo Album">
+		フォトアルバム
+	</string>
+	<string name="InvFolder Lost And Found">
+		遺失物
+	</string>
+	<string name="InvFolder Uncompressed Sounds">
+		圧縮されていないサウンド
+	</string>
+	<string name="InvFolder Animations">
+		アニメーション
+	</string>
+	<string name="InvFolder Gestures">
+		ジェスチャー
+	</string>
+	<string name="InvFolder Favorite">
+		お気に入り
+	</string>
+	<string name="InvFolder favorite">
+		お気に入り
+	</string>
+	<string name="InvFolder Favorites">
+		お気に入り
+	</string>
+	<string name="InvFolder favorites">
+		お気に入り
+	</string>
+	<string name="InvFolder Current Outfit">
+		着用中のアウトフィット
+	</string>
+	<string name="InvFolder Initial Outfits">
+		最初のアウトフィット
+	</string>
+	<string name="InvFolder My Outfits">
+		アウトフィット
+	</string>
+	<string name="InvFolder Accessories">
+		アクセサリ
+	</string>
+	<string name="InvFolder Meshes">
+		メッシュ
+	</string>
+	<string name="InvFolder Received Items">
+		受け取った商品
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		販売品ボックス
+	</string>
+	<string name="InvFolder Friends">
+		フレンド
+	</string>
+	<string name="InvFolder All">
+		全員
+	</string>
+	<string name="no_attachments">
+		着用している装着物はありません
+	</string>
+	<string name="Attachments remain">
+		装着物（残りのスロット数：[COUNT]）
+	</string>
+	<string name="Buy">
+		購入
+	</string>
+	<string name="BuyforL$">
+		L$ で購入
+	</string>
+	<string name="Stone">
+		石
+	</string>
+	<string name="Metal">
+		金属
+	</string>
+	<string name="Glass">
+		ガラス
+	</string>
+	<string name="Wood">
+		木
+	</string>
+	<string name="Flesh">
+		肌
+	</string>
+	<string name="Plastic">
+		プラスチック
+	</string>
+	<string name="Rubber">
+		ゴム
+	</string>
+	<string name="Light">
+		ライト
+	</string>
+	<string name="KBShift">
+		Shift
+	</string>
+	<string name="KBCtrl">
+		Ctrl
+	</string>
+	<string name="Chest">
+		胸部
+	</string>
+	<string name="Skull">
+		頭蓋
+	</string>
+	<string name="Left Shoulder">
+		左肩
+	</string>
+	<string name="Right Shoulder">
+		右肩
+	</string>
+	<string name="Left Hand">
+		左手
+	</string>
+	<string name="Right Hand">
+		右手
+	</string>
+	<string name="Left Foot">
+		左足
+	</string>
+	<string name="Right Foot">
+		右足
+	</string>
+	<string name="Spine">
+		背骨
+	</string>
+	<string name="Pelvis">
+		骨盤
+	</string>
+	<string name="Mouth">
+		口
+	</string>
+	<string name="Chin">
+		あご
+	</string>
+	<string name="Left Ear">
+		左耳
+	</string>
+	<string name="Right Ear">
+		右耳
+	</string>
+	<string name="Left Eyeball">
+		左目眼球
+	</string>
+	<string name="Right Eyeball">
+		右目眼球
+	</string>
+	<string name="Nose">
+		鼻
+	</string>
+	<string name="R Upper Arm">
+		右上腕
+	</string>
+	<string name="R Forearm">
+		右前腕
+	</string>
+	<string name="L Upper Arm">
+		左上腕
+	</string>
+	<string name="L Forearm">
+		左前腕
+	</string>
+	<string name="Right Hip">
+		右腰
+	</string>
+	<string name="R Upper Leg">
+		右上脚
+	</string>
+	<string name="R Lower Leg">
+		右下脚
+	</string>
+	<string name="Left Hip">
+		左腰
+	</string>
+	<string name="L Upper Leg">
+		左上脚
+	</string>
+	<string name="L Lower Leg">
+		左下脚
+	</string>
+	<string name="Stomach">
+		腹
+	</string>
+	<string name="Left Pec">
+		左胸筋
+	</string>
+	<string name="Right Pec">
+		右胸筋
+	</string>
+	<string name="Neck">
+		首
+	</string>
+	<string name="Avatar Center">
+		アバターの中央
+	</string>
+	<string name="Left Ring Finger">
+		左薬指
+	</string>
+	<string name="Right Ring Finger">
+		右薬指
+	</string>
+	<string name="Tail Base">
+		しっぽのベース
+	</string>
+	<string name="Tail Tip">
+		しっぽの先
+	</string>
+	<string name="Left Wing">
+		左の翼
+	</string>
+	<string name="Right Wing">
+		右の翼
+	</string>
+	<string name="Jaw">
+		顎
+	</string>
+	<string name="Alt Left Ear">
+		代わりの左耳
+	</string>
+	<string name="Alt Right Ear">
+		代わりの右耳
+	</string>
+	<string name="Alt Left Eye">
+		代わりの左目
+	</string>
+	<string name="Alt Right Eye">
+		代わりの右目
+	</string>
+	<string name="Tongue">
+		舌
+	</string>
+	<string name="Groin">
+		脚の付け根
+	</string>
+	<string name="Left Hind Foot">
+		左後足
+	</string>
+	<string name="Right Hind Foot">
+		右後足
+	</string>
+	<string name="Invalid Attachment">
+		装着先が正しくありません
+	</string>
+	<string name="ATTACHMENT_MISSING_ITEM">
+		エラー：アイテムが見つかりません。
+	</string>
+	<string name="ATTACHMENT_MISSING_BASE_ITEM">
+		エラー：ベースアイテムが見つかりません。
+	</string>
+	<string name="ATTACHMENT_NOT_ATTACHED">
+		エラー：オブジェクトは現在のアウトフィットにありますが、添付されていません。
+	</string>
+	<string name="YearsMonthsOld">
+		[AGEYEARS][AGEMONTHS]
+	</string>
+	<string name="YearsOld">
+		[AGEYEARS]
+	</string>
+	<string name="MonthsOld">
+		[AGEMONTHS]
+	</string>
+	<string name="WeeksOld">
+		[AGEWEEKS]
+	</string>
+	<string name="DaysOld">
+		[AGEDAYS]
+	</string>
+	<string name="TodayOld">
+		本日参加
+	</string>
+	<string name="av_render_everyone_now">
+		あなたは、全員から見えるようになりました。
+	</string>
+	<string name="av_render_not_everyone">
+		あなたは、周囲にいる一部の人から、見えない可能性があります。
+	</string>
+	<string name="av_render_over_half">
+		あなたは、周囲にいる半分以上の人から、見えない可能性があります。
+	</string>
+	<string name="av_render_most_of">
+		あなたは、周囲にいるほとんどの人から、見えない可能性があります。
+	</string>
+	<string name="av_render_anyone">
+		あなたは、周囲の誰からも見えていない可能性があります。
+	</string>
+	<string name="hud_description_total">
+		利用中のＨＵＤ
+	</string>
+	<string name="hud_name_with_joint">
+		[OBJ_NAME]（[JNT_NAME]に装着中）
+	</string>
+	<string name="hud_render_memory_warning">
+		[HUD_DETAILS]は、大量のテクスチャメモリを使用しています。
+	</string>
+	<string name="hud_render_cost_warning">
+		[HUD_DETAILS]は、計算コストが高いオブジェクトやテクスチャがたくさん含まれています。
+	</string>
+	<string name="hud_render_heavy_textures_warning">
+		[HUD_DETAILS]には、容量が多いテクスチャが使用されています。
+	</string>
+	<string name="hud_render_cramped_warning">
+		[HUD_DETAILS]は、使用されているオブジェクトが多すぎます。
+	</string>
+	<string name="hud_render_textures_warning">
+		[HUD_DETAILS]は、使用されているテクスチャが多すぎます。
+	</string>
+	<string name="AgeYearsA">
+		[COUNT]年
+	</string>
+	<string name="AgeYearsB">
+		[COUNT]年
+	</string>
+	<string name="AgeYearsC">
+		[COUNT]年
+	</string>
+	<string name="AgeMonthsA">
+		[COUNT]ヶ月
+	</string>
+	<string name="AgeMonthsB">
+		[COUNT]ヶ月
+	</string>
+	<string name="AgeMonthsC">
+		[COUNT]ヶ月
+	</string>
+	<string name="AgeWeeksA">
+		[COUNT]週間
+	</string>
+	<string name="AgeWeeksB">
+		[COUNT]週間
+	</string>
+	<string name="AgeWeeksC">
+		[COUNT]週間
+	</string>
+	<string name="AgeDaysA">
+		[COUNT]日間
+	</string>
+	<string name="AgeDaysB">
+		[COUNT]日間
+	</string>
+	<string name="AgeDaysC">
+		[COUNT]日間
+	</string>
+	<string name="GroupMembersA">
+		[COUNT]人
+	</string>
+	<string name="GroupMembersB">
+		[COUNT]人
+	</string>
+	<string name="GroupMembersC">
+		[COUNT]人
+	</string>
+	<string name="AcctTypeResident">
+		住人
+	</string>
+	<string name="AcctTypeTrial">
+		トライアル
+	</string>
+	<string name="AcctTypeCharterMember">
+		創立メンバー
+	</string>
+	<string name="AcctTypeEmployee">
+		Linden Lab従業員
+	</string>
+	<string name="PaymentInfoUsed">
+		支払情報使用履歴あり
+	</string>
+	<string name="PaymentInfoOnFile">
+		支払情報登録済
+	</string>
+	<string name="NoPaymentInfoOnFile">
+		支払情報未登録
+	</string>
+	<string name="AgeVerified">
+		年齢確認済
+	</string>
+	<string name="NotAgeVerified">
+		年齢未確認
+	</string>
+	<string name="Center 2">
+		中央２
+	</string>
+	<string name="Top Right">
+		右上
+	</string>
+	<string name="Top">
+		上部
+	</string>
+	<string name="Top Left">
+		左上
+	</string>
+	<string name="Center">
+		中央
+	</string>
+	<string name="Bottom Left">
+		左下
+	</string>
+	<string name="Bottom">
+		下部
+	</string>
+	<string name="Bottom Right">
+		右下
+	</string>
+	<string name="CompileQueueDownloadedCompiling">
+		ダウンロードが完了しました。コンパイルしています。
+	</string>
+	<string name="CompileQueueServiceUnavailable">
+		スクリプトのコンパイルサービスを利用できません
+	</string>
+	<string name="CompileQueueScriptNotFound">
+		サーバー上にスクリプトが見つかりません。
+	</string>
+	<string name="CompileQueueProblemDownloading">
+		ダウンロードに問題があります
+	</string>
+	<string name="CompileQueueInsufficientPermDownload">
+		権限不足のためスクリプトをダウンロードできません。
+	</string>
+	<string name="CompileQueueInsufficientPermFor">
+		権限不足：
+	</string>
+	<string name="CompileQueueUnknownFailure">
+		原因不明の失敗によりダウンロードができません
+	</string>
+	<string name="CompileNoExperiencePerm">
+		[EXPERIENCE]体験による[SCRIPT]スクリプトのスキップ。
+	</string>
+	<string name="CompileQueueTitle">
+		再コンパイル進行
+	</string>
+	<string name="CompileQueueStart">
+		再コンパイル
+	</string>
+	<string name="ResetQueueTitle">
+		進行をリセット
+	</string>
+	<string name="ResetQueueStart">
+		リセット
+	</string>
+	<string name="RunQueueTitle">
+		実行を続けるよう設定
+	</string>
+	<string name="RunQueueStart">
+		実行中に設定
+	</string>
+	<string name="NotRunQueueTitle">
+		実行を停止するよう設定
+	</string>
+	<string name="NotRunQueueStart">
+		実行停止に設定
+	</string>
+	<string name="CompileSuccessful">
+		コンパイルが完了しました！
+	</string>
+	<string name="CompileSuccessfulSaving">
+		コンパイル完了、保存しています…
+	</string>
+	<string name="SaveComplete">
+		保存完了。
+	</string>
+	<string name="UploadFailed">
+		ファイルのアップロードが失敗しました:
+	</string>
+	<string name="ObjectOutOfRange">
+		スクリプト（オブジェクトが範囲外にあります）
+	</string>
+	<string name="ScriptWasDeleted">
+		スクリプト（インベントリから削除済み）
+	</string>
+	<string name="GodToolsObjectOwnedBy">
+		[OWNER]が所有している「[OBJECT]」というオブジェクト
+	</string>
+	<string name="GroupsNone">
+		なし
+	</string>
+	<string name="Group" value="（グループ）"/>
+	<string name="Unknown">
+		（不明）
+	</string>
+	<string name="SummaryForTheWeek" value="今週のまとめ。開始日は"/>
+	<string name="NextStipendDay" value="です。次回のお小遣い支給日："/>
+	<string name="GroupPlanningDate">
+		[year,datetime,utc]年[mthnum,datetime,utc]月[day,datetime,utc]日
+	</string>
+	<string name="GroupIndividualShare" value="グループ 個人の割り当て"/>
+	<string name="GroupColumn" value="グループの設定"/>
+	<string name="Balance">
+		残高
+	</string>
+	<string name="Credits">
+		収入
+	</string>
+	<string name="Debits">
+		支出
+	</string>
+	<string name="Total">
+		合計
+	</string>
+	<string name="NoGroupDataFound">
+		グループのデータが見つかりませんでした。
+	</string>
+	<string name="IMParentEstate">
+		親の不動産
+	</string>
+	<string name="IMMainland">
+		メインランド
+	</string>
+	<string name="IMTeen">
+		ティーン
+	</string>
+	<string name="Anyone">
+		全員
+	</string>
+	<string name="RegionInfoError">
+		エラー
+	</string>
+	<string name="RegionInfoAllEstatesOwnedBy">
+		[OWNER]が所有するすべての不動産
+	</string>
+	<string name="RegionInfoAllEstatesYouOwn">
+		あなたが所有するすべての不動産
+	</string>
+	<string name="RegionInfoAllEstatesYouManage">
+		あなたが[OWNER]のために管理するすべての不動産
+	</string>
+	<string name="RegionInfoAllowedResidents">
+		常に許可：（[ALLOWEDAGENTS]人、最大[MAXACCESS]人）
+	</string>
+	<string name="RegionInfoAllowedGroups">
+		グループを常に許可：（[ALLOWEDGROUPS]、最大[MAXACCESS]）
+	</string>
+	<string name="RegionInfoBannedResidents">
+		常に禁止：（[BANNEDAGENTS]人、最大[MAXBANNED]人）
+	</string>
+	<string name="RegionInfoListTypeAllowedAgents">
+		常に許可
+	</string>
+	<string name="RegionInfoListTypeBannedAgents">
+		常に禁止
+	</string>
+	<string name="RegionInfoAllEstates">
+		すべての不動産
+	</string>
+	<string name="RegionInfoManagedEstates">
+		管理されている不動産
+	</string>
+	<string name="RegionInfoThisEstate">
+		この不動産
+	</string>
+	<string name="AndNMore">
+		および[EXTRA_COUNT]つの不動産
+	</string>
+	<string name="ScriptLimitsParcelScriptMemory">
+		区画スクリプトメモリ
+	</string>
+	<string name="ScriptLimitsParcelsOwned">
+		区画一覧：[PARCELS]個
+	</string>
+	<string name="ScriptLimitsMemoryUsed">
+		使用されたメモリ：[MAX]㎅中[COUNT]㎅　[AVAILABLE]㎅利用可
+	</string>
+	<string name="ScriptLimitsMemoryUsedSimple">
+		使用されたメモリ：[COUNT]㎅
+	</string>
+	<string name="ScriptLimitsParcelScriptURLs">
+		区画のスクリプトＵＲＬ
+	</string>
+	<string name="ScriptLimitsURLsUsed">
+		使用されたＵＲＬ：[MAX]件中[COUNT]件　[AVAILABLE]件利用可
+	</string>
+	<string name="ScriptLimitsURLsUsedSimple">
+		使用されたＵＲＬ：[COUNT]件
+	</string>
+	<string name="ScriptLimitsRequestError">
+		情報のリクエスト中にエラーが発生しました
+	</string>
+	<string name="ScriptLimitsRequestNoParcelSelected">
+		区画が選択されていません。
+	</string>
+	<string name="ScriptLimitsRequestWrongRegion">
+		エラー：スクリプト情報は現在地のみ取得できます
+	</string>
+	<string name="ScriptLimitsRequestWaiting">
+		情報を取得中…
+	</string>
+	<string name="ScriptLimitsRequestDontOwnParcel">
+		この区画を調査する権限がありません。
+	</string>
+	<string name="SITTING_ON">
+		着席中
+	</string>
+	<string name="ATTACH_CHEST">
+		胸部
+	</string>
+	<string name="ATTACH_HEAD">
+		頭頂部
+	</string>
+	<string name="ATTACH_LSHOULDER">
+		左肩
+	</string>
+	<string name="ATTACH_RSHOULDER">
+		右肩
+	</string>
+	<string name="ATTACH_LHAND">
+		左手
+	</string>
+	<string name="ATTACH_RHAND">
+		右手
+	</string>
+	<string name="ATTACH_LFOOT">
+		左足
+	</string>
+	<string name="ATTACH_RFOOT">
+		右足
+	</string>
+	<string name="ATTACH_BACK">
+		背骨
+	</string>
+	<string name="ATTACH_PELVIS">
+		骨盤
+	</string>
+	<string name="ATTACH_MOUTH">
+		口
+	</string>
+	<string name="ATTACH_CHIN">
+		あご
+	</string>
+	<string name="ATTACH_LEAR">
+		左耳
+	</string>
+	<string name="ATTACH_REAR">
+		右耳
+	</string>
+	<string name="ATTACH_LEYE">
+		左目
+	</string>
+	<string name="ATTACH_REYE">
+		右目
+	</string>
+	<string name="ATTACH_NOSE">
+		鼻
+	</string>
+	<string name="ATTACH_RUARM">
+		右上腕
+	</string>
+	<string name="ATTACH_RLARM">
+		右前腕
+	</string>
+	<string name="ATTACH_LUARM">
+		左上腕
+	</string>
+	<string name="ATTACH_LLARM">
+		左前腕
+	</string>
+	<string name="ATTACH_RHIP">
+		右腰
+	</string>
+	<string name="ATTACH_RULEG">
+		右脚（上）
+	</string>
+	<string name="ATTACH_RLLEG">
+		右脚（下）
+	</string>
+	<string name="ATTACH_LHIP">
+		左腰
+	</string>
+	<string name="ATTACH_LULEG">
+		左脚（上）
+	</string>
+	<string name="ATTACH_LLLEG">
+		左脚（下）
+	</string>
+	<string name="ATTACH_BELLY">
+		腹
+	</string>
+	<string name="ATTACH_LEFT_PEC">
+		左胸筋
+	</string>
+	<string name="ATTACH_RIGHT_PEC">
+		右胸筋
+	</string>
+	<string name="ATTACH_HUD_CENTER_2">
+		ＨＵＤ（中央 2）
+	</string>
+	<string name="ATTACH_HUD_TOP_RIGHT">
+		ＨＵＤ（右上）
+	</string>
+	<string name="ATTACH_HUD_TOP_CENTER">
+		ＨＵＤ（上・中央）
+	</string>
+	<string name="ATTACH_HUD_TOP_LEFT">
+		ＨＵＤ（左上）
+	</string>
+	<string name="ATTACH_HUD_CENTER_1">
+		ＨＵＤ（中央 1）
+	</string>
+	<string name="ATTACH_HUD_BOTTOM_LEFT">
+		ＨＵＤ（左下）
+	</string>
+	<string name="ATTACH_HUD_BOTTOM">
+		ＨＵＤ（下）
+	</string>
+	<string name="ATTACH_HUD_BOTTOM_RIGHT">
+		ＨＵＤ（右下）
+	</string>
+	<string name="ATTACH_NECK">
+		首
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		アバターの中央
+	</string>
+	<string name="ATTACH_LHAND_RING1">
+		左薬指
+	</string>
+	<string name="ATTACH_RHAND_RING1">
+		右薬指
+	</string>
+	<string name="ATTACH_TAIL_BASE">
+		しっぽのベース
+	</string>
+	<string name="ATTACH_TAIL_TIP">
+		しっぽの先
+	</string>
+	<string name="ATTACH_LWING">
+		左の翼
+	</string>
+	<string name="ATTACH_RWING">
+		右の翼
+	</string>
+	<string name="ATTACH_FACE_JAW">
+		顎
+	</string>
+	<string name="ATTACH_FACE_LEAR">
+		代わりの左耳
+	</string>
+	<string name="ATTACH_FACE_REAR">
+		代わりの右耳
+	</string>
+	<string name="ATTACH_FACE_LEYE">
+		代わりの左目
+	</string>
+	<string name="ATTACH_FACE_REYE">
+		代わりの右目
+	</string>
+	<string name="ATTACH_FACE_TONGUE">
+		舌
+	</string>
+	<string name="ATTACH_GROIN">
+		脚の付け根
+	</string>
+	<string name="ATTACH_HIND_LFOOT">
+		左後足
+	</string>
+	<string name="ATTACH_HIND_RFOOT">
+		右後足
+	</string>
+	<string name="CursorPos">
+		[LINE]行目、[COLUMN]列目
+	</string>
+	<string name="PanelDirCountFound">
+		[COUNT]件見つかりました
+	</string>
+	<string name="PanelDirTimeStr">
+		[ampm,datetime,utc]　[hour12,datetime,utc]：[min,datetime,utc]
+	</string>
+	<string name="PanelDirEventsDateText">
+		[mthnum,datetime,slt]／[day,datetime,slt]
+	</string>
+	<string name="PanelContentsTooltip">
+		オブジェクトの中身
+	</string>
+	<string name="PanelContentsNewScript">
+		新規スクリプト
+	</string>
+	<string name="DoNotDisturbModeResponseDefault">
+		この住民が「着信拒否」をオンにすると、あなたのメッセージが後で表示されるようになります。
+	</string>
+	<string name="MuteByName">
+		（名前で）
+	</string>
+	<string name="MuteAgent">
+		（住人）
+	</string>
+	<string name="MuteObject">
+		（オブジェクト）
+	</string>
+	<string name="MuteGroup">
+		（グループ）
+	</string>
+	<string name="MuteExternal">
+		（外部）
+	</string>
+	<string name="RegionNoCovenant">
+		この不動産には約款がありません。
+	</string>
+	<string name="RegionNoCovenantOtherOwner">
+		この不動産には約款がありません。この不動産上の土地は不動産所有者により販売され、Linden Labは販売しません。販売に関するお問い合わせは、不動産所有者までお願い致します。
+	</string>
+	<string name="covenant_last_modified" value="最終更新日："/>
+	<string name="none_text" value="（なし）"/>
+	<string name="never_text" value="（無）"/>
+	<string name="GroupOwned">
+		グループ所有
+	</string>
+	<string name="Public">
+		公共
+	</string>
+	<string name="LocalSettings">
+		ローカル設定
+	</string>
+	<string name="RegionSettings">
+		リージョン（地域）の設定
+	</string>
+	<string name="NoEnvironmentSettings">
+		このリージョンは環境設定をサポートしていません。
+	</string>
+	<string name="EnvironmentSun">
+		太陽
+	</string>
+	<string name="EnvironmentMoon">
+		月
+	</string>
+	<string name="EnvironmentBloom">
+		花
+	</string>
+	<string name="EnvironmentCloudNoise">
+		雲の音
+	</string>
+	<string name="EnvironmentNormalMap">
+		ノーマル・マップ
+	</string>
+	<string name="EnvironmentTransparent">
+		透過
+	</string>
+	<string name="ClassifiedClicksTxt">
+		クリック数：[TELEPORT]テレポート、[MAP]マップ、[PROFILE]プロフィール
+	</string>
+	<string name="ClassifiedUpdateAfterPublish">
+		（掲載後更新）
+	</string>
+	<string name="NoPicksClassifiedsText">
+		ピックやクラシファイド広告を作成していません。作成するには、下にある「＋」ボタンをクリックします。
+	</string>
+	<string name="NoPicksText">
+		ピックを作成していません。「新規」ボタンをクリックしてピックを作成する。
+	</string>
+	<string name="NoClassifiedsText">
+		クラシファイド広告を作成していません。「新規」ボタンをクリックしてクラシファイド広告を作成する。
+	</string>
+	<string name="NoAvatarPicksClassifiedsText">
+		ピック、またはクラシファイド広告がありません
+	</string>
+	<string name="NoAvatarPicksText">
+		ピックがありません
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		クラシファイド広告がありません
+	</string>
+	<string name="PicksClassifiedsLoadingText">
+		読み込んでいます…
+	</string>
+	<string name="MultiPreviewTitle">
+		プレビュー
+	</string>
+	<string name="MultiPropertiesTitle">
+		プロパティ
+	</string>
+	<string name="InvOfferAnObjectNamed">
+		オブジェクト名
+	</string>
+	<string name="InvOfferOwnedByGroup">
+		グループが所有している
+	</string>
+	<string name="InvOfferOwnedByUnknownGroup">
+		不明なグループが所有している
+	</string>
+	<string name="InvOfferOwnedBy">
+		が所有している
+	</string>
+	<string name="InvOfferOwnedByUnknownUser">
+		不明なユーザーが所有している
+	</string>
+	<string name="InvOfferGaveYou">
+		を渡してきました。
+	</string>
+	<string name="InvOfferDecline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt;からの[DESC]を拒否しました。
+	</string>
+	<string name="GroupMoneyTotal">
+		合計
+	</string>
+	<string name="GroupMoneyBought">
+		購入：
+	</string>
+	<string name="GroupMoneyPaidYou">
+		あなたに支払い：
+	</string>
+	<string name="GroupMoneyPaidInto">
+		支払情報
+	</string>
+	<string name="GroupMoneyBoughtPassTo">
+		入場許可を購入：
+	</string>
+	<string name="GroupMoneyPaidFeeForEvent">
+		が、イベントの費用を支払いました。
+	</string>
+	<string name="GroupMoneyPaidPrizeForEvent">
+		が、イベントの賞金を支払いました。
+	</string>
+	<string name="GroupMoneyBalance">
+		残高
+	</string>
+	<string name="GroupMoneyCredits">
+		収入
+	</string>
+	<string name="GroupMoneyDebits">
+		支出
+	</string>
+	<string name="GroupMoneyDate">
+		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日　[weekday,datetime,utc]
+	</string>
+	<string name="AcquiredItems">
+		取得アイテム
+	</string>
+	<string name="Cancel">
+		キャンセル
+	</string>
+	<string name="UploadingCosts">
+		[NAME]のアップロード料金は L$ [AMOUNT]です。
+	</string>
+	<string name="BuyingCosts">
+		これをL$ [AMOUNT]で購入します。
+	</string>
+	<string name="UnknownFileExtension">
+		不明な拡張子：%s
+使用可能な拡張子：.wav，.tga，.bmp，.jpg，.jpeg，.bvh
+	</string>
+	<string name="MuteObject2">
+		オブジェクトのブロック
+	</string>
+	<string name="MuteAvatar">
+		アバターのブロック
+	</string>
+	<string name="UnmuteObject">
+		オブジェクトのブロック解除
+	</string>
+	<string name="UnmuteAvatar">
+		アバターのブロック解除
+	</string>
+	<string name="AddLandmarkNavBarMenu">
+		ランドマークに追加…
+	</string>
+	<string name="EditLandmarkNavBarMenu">
+		ランドマークを編集…
+	</string>
+	<string name="accel-mac-control">
+		⌃
+	</string>
+	<string name="accel-mac-command">
+		⌘
+	</string>
+	<string name="accel-mac-option">
+		⌥
+	</string>
+	<string name="accel-mac-shift">
+		⇧
+	</string>
+	<string name="accel-win-control">
+		Ctrl＋
+	</string>
+	<string name="accel-win-alt">
+		Alt＋
+	</string>
+	<string name="accel-win-shift">
+		Shift＋
+	</string>
+	<string name="FileSaved">
+		ファイルが保存されました。
+	</string>
+	<string name="Receiving">
+		取得中
+	</string>
+	<string name="AM">
+		午前
+	</string>
+	<string name="PM">
+		午後
+	</string>
+	<string name="PST">
+		太平洋標準時
+	</string>
+	<string name="PDT">
+		太平洋夏時間
+	</string>
+	<string name="Direction_Forward">
+		前
+	</string>
+	<string name="Direction_Left">
+		左
+	</string>
+	<string name="Direction_Right">
+		右
+	</string>
+	<string name="Direction_Back">
+		後
+	</string>
+	<string name="Direction_North">
+		北
+	</string>
+	<string name="Direction_South">
+		南
+	</string>
+	<string name="Direction_West">
+		西
+	</string>
+	<string name="Direction_East">
+		東
+	</string>
+	<string name="Direction_Up">
+		上
+	</string>
+	<string name="Direction_Down">
+		下
+	</string>
+	<string name="Any Category">
+		全カテゴリ
+	</string>
+	<string name="Shopping">
+		ショッピング
+	</string>
+	<string name="Land Rental">
+		土地のレンタル
+	</string>
+	<string name="Property Rental">
+		プロパティのレンタル
+	</string>
+	<string name="Special Attraction">
+		特別なアトラクション
+	</string>
+	<string name="New Products">
+		新製品
+	</string>
+	<string name="Employment">
+		雇用
+	</string>
+	<string name="Wanted">
+		求む
+	</string>
+	<string name="Service">
+		サービス
+	</string>
+	<string name="Personal">
+		パーソナル
+	</string>
+	<string name="None">
+		なし
+	</string>
+	<string name="Linden Location">
+		Linden 所在地
+	</string>
+	<string name="Adult">
+		成人向け
+	</string>
+	<string name="Arts&amp;Culture">
+		芸術と文化
+	</string>
+	<string name="Business">
+		ビジネス
+	</string>
+	<string name="Educational">
+		教育
+	</string>
+	<string name="Gaming">
+		ゲーム
+	</string>
+	<string name="Hangout">
+		たまり場
+	</string>
+	<string name="Newcomer Friendly">
+		新規住民歓迎
+	</string>
+	<string name="Parks&amp;Nature">
+		公園と自然
+	</string>
+	<string name="Residential">
+		住宅用
+	</string>
+	<string name="Stage">
+		ステージ
+	</string>
+	<string name="Other">
+		その他
+	</string>
+	<string name="Rental">
+		レンタル
+	</string>
+	<string name="Any">
+		全員
+	</string>
+	<string name="You">
+		あなた
+	</string>
+	<string name=":">
+		：
+	</string>
+	<string name=",">
+		、
+	</string>
+	<string name="...">
+		…
+	</string>
+	<string name="***">
+		***
+	</string>
+	<string name="(">
+		（
+	</string>
+	<string name=")">
+		）
+	</string>
+	<string name=".">
+		。
+	</string>
+	<string name="'">
+		'
+	</string>
+	<string name="---">
+		─
+	</string>
+	<string name="Multiple Media">
+		複数のメディア
+	</string>
+	<string name="Play Media">
+		メディアの再生／一時停止
+	</string>
+	<string name="IntelDriverPage">
+		https://www.intel.co.jp/content/www/jp/ja/support/detect.html
+	</string>
+	<string name="NvidiaDriverPage">
+		https://www.nvidia.com/Download/index.aspx?lang=ja-jp
+	</string>
+	<string name="AMDDriverPage">
+		https://www.amd.com/ja/support
+	</string>
+	<string name="MBCmdLineError">
+		コマンドラインにエラーが見つかりました。
 リンク先を参照してください：https://wiki.secondlife.com/wiki/%E3%83%93%E3%83%A5%E3%83%BC%E3%83%AF%E5%BC%95%E6%95%B0
-エラー：</string>
-  <string name="MBCmdLineUsg">[APP_NAME]コマンドライン使用：</string>
-  <string name="MBUnableToAccessFile">[APP_NAME]は必要なファイルにアクセスできません。
+エラー：
+	</string>
+	<string name="MBCmdLineUsg">
+		[APP_NAME]コマンドライン使用：
+	</string>
+	<string name="MBUnableToAccessFile">
+		[APP_NAME]は必要なファイルにアクセスできません。
 
 複数のコピーを実行中か、ファイルが既に開いているとあなたのシステムが誤認識している可能性があります。
 このメッセージが何度も出る場合は、コンピューターを再起動してもう一度お試しください。
-それでも問題が続く場合、[APP_NAME]を完全にアンインストールして、再インストールをしてください。</string>
-  <string name="MBFatalError">致命的なエラー</string>
-  <string name="MBRequiresAltiVec">[APP_NAME]は、AltiVec搭載のプロセッサが必要です。（G4 以降）</string>
-  <string name="MBAlreadyRunning">[APP_NAME]はすでに実行中です。
+それでも問題が続く場合、[APP_NAME]を完全にアンインストールして、再インストールをしてください。
+	</string>
+	<string name="MBFatalError">
+		致命的なエラー
+	</string>
+	<string name="MBRequiresAltiVec">
+		[APP_NAME]は、AltiVec搭載のプロセッサが必要です。（G4 以降）
+	</string>
+	<string name="MBAlreadyRunning">
+		[APP_NAME]はすでに実行中です。
 最小化されたプログラムのコピーをタスクバーで確認してください。
-このメッセージが何度も出る場合はコンピューターを再起動してください。</string>
-  <string name="MBFrozenCrashed">[APP_NAME]は前回の実行時にフリーズしています。
-クラッシュ報告を送信しますか？</string>
-  <string name="MBAlert">通知</string>
-  <string name="MBNoDirectX">[APP_NAME]は、DirectX 9.0b及びそれ以降のバージョンを検出することができませんでした。
+このメッセージが何度も出る場合はコンピューターを再起動してください。
+	</string>
+	<string name="MBFrozenCrashed">
+		[APP_NAME]は前回の実行時にフリーズしています。
+クラッシュ報告を送信しますか？
+	</string>
+	<string name="MBAlert">
+		通知
+	</string>
+	<string name="MBNoDirectX">
+		[APP_NAME]は、DirectX 9.0b及びそれ以降のバージョンを検出することができませんでした。
 [APP_NAME]は DirectX を使用して安定性の問題、低パフォーマンス、クラッシュ等悪影響を与えるハードウェアや古いドライバを検出します。DirectX 9.0b がなくても
 [APP_NAME]を実行できますが、DirectX 9.0bとのご使用を強く推奨します。
 
-続けますか？</string>
-  <string name="MBWarning">警告</string>
-  <string name="MBNoAutoUpdate">自動更新は現在 Linux には対応していません。
-www.secondlife.com から最新バージョンをダウンロードしてください。</string>
-  <string name="MBRegClassFailed">RegisterClass 失敗</string>
-  <string name="MBError">エラー</string>
-  <string name="MBFullScreenErr">[WIDTH]✕[HEIGHT]では全画面で実行することができません。
-ウィンドウモードで実行中です。</string>
-  <string name="MBDestroyWinFailed">シャットダウンエラー（DestroyWindow() 失敗）</string>
-  <string name="MBShutdownErr">シャットダウンエラー</string>
-  <string name="MBDevContextErr">GL ディバイスコンテキストが作れません</string>
-  <string name="MBPixelFmtErr">適切なピクセル形式が見つかりません</string>
-  <string name="MBPixelFmtDescErr">ピクセル形式情報が見つかりません</string>
-  <string name="MBTrueColorWindow">[APP_NAME]を実行するには、True Color（３２ビット）が必要です。
-お使いのコンピューターの「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （３２ビット）」に設定してください。</string>
-  <string name="MBAlpha">[APP_NAME]は８ビットのアルファチャンネルを取得できないため実行できません。通常ビデオカードのドライバの問題で起こります。
+続けますか？
+	</string>
+	<string name="MBWarning">
+		警告
+	</string>
+	<string name="MBNoAutoUpdate">
+		自動更新は現在 Linux には対応していません。
+www.secondlife.com から最新バージョンをダウンロードしてください。
+	</string>
+	<string name="MBRegClassFailed">
+		RegisterClass 失敗
+	</string>
+	<string name="MBError">
+		エラー
+	</string>
+	<string name="MBFullScreenErr">
+		[WIDTH]✕[HEIGHT]では全画面で実行することができません。
+ウィンドウモードで実行中です。
+	</string>
+	<string name="MBDestroyWinFailed">
+		シャットダウンエラー（DestroyWindow() 失敗）
+	</string>
+	<string name="MBShutdownErr">
+		シャットダウンエラー
+	</string>
+	<string name="MBDevContextErr">
+		GL ディバイスコンテキストが作れません
+	</string>
+	<string name="MBPixelFmtErr">
+		適切なピクセル形式が見つかりません
+	</string>
+	<string name="MBPixelFmtDescErr">
+		ピクセル形式情報が見つかりません
+	</string>
+	<string name="MBTrueColorWindow">
+		[APP_NAME]を実行するには、True Color（３２ビット）が必要です。
+お使いのコンピューターの「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （３２ビット）」に設定してください。
+	</string>
+	<string name="MBAlpha">
+		[APP_NAME]は８ビットのアルファチャンネルを取得できないため実行できません。通常ビデオカードのドライバの問題で起こります。
 お使いのコンピューターに最新のビデオカードドライバがインストールされているかご確認ください。
 また、「コントロールパネル」＞「画面」＞「設定」内で、モニターが「最高 （３２ビット）」に設定されていることもご確認ください。
-このメッセージが何度も出る場合は、 [SUPPORT_SITE] へご連絡ください。</string>
-  <string name="MBPixelFmtSetErr">ピクセル形式が設定できません。</string>
-  <string name="MBGLContextErr">ＧＬレンダーコンテキストが作れません</string>
-  <string name="MBGLContextActErr">ＧＬレンダーコンテキストを有効化できません。</string>
-  <string name="MBVideoDrvErr">お使いのコンピューターのビデオカードのドライバが正常にインストールされていないか、古いまたはサポート対象外のため、[APP_NAME]を実行することができませんでした。
+このメッセージが何度も出る場合は、 [SUPPORT_SITE] へご連絡ください。
+	</string>
+	<string name="MBPixelFmtSetErr">
+		ピクセル形式が設定できません。
+	</string>
+	<string name="MBGLContextErr">
+		ＧＬレンダーコンテキストが作れません
+	</string>
+	<string name="MBGLContextActErr">
+		ＧＬレンダーコンテキストを有効化できません。
+	</string>
+	<string name="MBVideoDrvErr">
+		お使いのコンピューターのビデオカードのドライバが正常にインストールされていないか、古いまたはサポート対象外のため、[APP_NAME]を実行することができませんでした。
 最新のビデオカードドライバがインストールされているのを確認し、されている場合は再インストールをお試しください。
 
-このメッセージが何度も出る場合は、[SUPPORT_SITE]へご連絡ください。</string>
-
-  <!-- Avatar Shape Information -->
-  <string name="5 O'Clock Shadow">うっすらとしたヒゲ</string>
-
-  <string name="All White">真っ白</string>
-  <string name="Anime Eyes">アニメ風の目</string>
-  <string name="Arced">アーチ</string>
-  <string name="Arm Length">腕の長さ</string>
-  <string name="Attached">小</string>
-  <string name="Attached Earlobes">耳たぶ</string>
-
-
-  <string name="Back Fringe">後ろ髪の毛先</string>
-
-  <string name="Baggy">たるんだ下まぶた</string>
-  <string name="Bangs">前髪</string>
-
-  <string name="Beady Eyes">ビーズのような目</string>
-  <string name="Belly Size">お腹の大きさ</string>
-  <string name="Big">大</string>
-  <string name="Big Butt">大</string>
-
-  <string name="Big Hair Back">髪の大部分：後ろ</string>
-  <string name="Big Hair Front">髪の大部分：前</string>
-  <string name="Big Hair Top">髪の大部分：上部</string>
-  <string name="Big Head">大</string>
-  <string name="Big Pectorals">大</string>
-  <string name="Big Spikes">とげあり</string>
-  <string name="Black">黒</string>
-  <string name="Blonde">ブロンド</string>
-  <string name="Blonde Hair">ブロンドの髪</string>
-  <string name="Blush">チーク</string>
-  <string name="Blush Color">チークカラー</string>
-  <string name="Blush Opacity">チークの濃さ</string>
-  <string name="Body Definition">体の精細度</string>
-  <string name="Body Fat">体脂肪</string>
-  <string name="Body Freckles">体のしみ・そばかす</string>
-  <string name="Body Thick">骨太</string>
-  <string name="Body Thickness">体の厚み</string>
-  <string name="Body Thin">細め</string>
-
-  <string name="Bow Legged">股</string>
-  <string name="Breast Buoyancy">胸の重力</string>
-  <string name="Breast Cleavage">胸の谷間</string>
-  <string name="Breast Size">胸の大きさ</string>
-  <string name="Bridge Width">両目の間の幅</string>
-  <string name="Broad">広</string>
-  <string name="Brow Size">眉毛上の隆起</string>
-  <string name="Bug Eyes">Bug Eyes</string>
-  <string name="Bugged Eyes">突き出た目</string>
-  <string name="Bulbous">だんご</string>
-  <string name="Bulbous Nose">だんご鼻</string>
-
-  <string name="Breast Physics Mass">胸の豊かさ</string>
-  <string name="Breast Physics Smoothing">胸の平滑化</string>
-  <string name="Breast Physics Gravity">胸の垂れ具合</string>
-  <string name="Breast Physics Drag">胸の空気抵抗</string>
-
-  <string name="Breast Physics InOut Max Effect">最大エフェクト数</string>
-  <string name="Breast Physics InOut Spring">振動速度</string>
-  <string name="Breast Physics InOut Gain">増加率</string>
-  <string name="Breast Physics InOut Damping">減衰</string>
-
-  <string name="Breast Physics UpDown Max Effect">最大エフェクト数</string>
-  <string name="Breast Physics UpDown Spring">振動速度</string>
-  <string name="Breast Physics UpDown Gain">増加率</string>
-  <string name="Breast Physics UpDown Damping">減衰</string>
-
-  <string name="Breast Physics LeftRight Max Effect">最大エフェクト数</string>
-  <string name="Breast Physics LeftRight Spring">振動速度</string>
-  <string name="Breast Physics LeftRight Gain">増加率</string>
-  <string name="Breast Physics LeftRight Damping">減衰</string>
-
-  <string name="Belly Physics Mass">お腹の豊かさ</string>
-  <string name="Belly Physics Smoothing">お腹の平滑化</string>
-  <string name="Belly Physics Gravity">お腹の垂れ具合</string>
-  <string name="Belly Physics Drag">お腹の空気抵抗</string>
-
-  <string name="Belly Physics UpDown Max Effect">最大エフェクト数</string>
-  <string name="Belly Physics UpDown Spring">振動速度</string>
-  <string name="Belly Physics UpDown Gain">増加率</string>
-  <string name="Belly Physics UpDown Damping">減衰</string>
-
-  <string name="Butt Physics Mass">お尻の豊かさ</string>
-  <string name="Butt Physics Smoothing">お尻の平滑化</string>
-  <string name="Butt Physics Gravity">お尻の垂れ具合</string>
-  <string name="Butt Physics Drag">お尻の空気抵抗</string>
-
-  <string name="Butt Physics UpDown Max Effect">最大エフェクト数</string>
-  <string name="Butt Physics UpDown Spring">振動速度</string>
-  <string name="Butt Physics UpDown Gain">増加率</string>
-  <string name="Butt Physics UpDown Damping">減衰</string>
-
-  <string name="Butt Physics LeftRight Max Effect">最大エフェクト数</string>
-  <string name="Butt Physics LeftRight Spring">振動速度</string>
-  <string name="Butt Physics LeftRight Gain">増加率</string>
-  <string name="Butt Physics LeftRight Damping">減衰</string>
-
-  <string name="Bushy Eyebrows">太</string>
-  <string name="Bushy Hair">ぼさぼさヘア</string>
-  <string name="Butt Size">お尻の大きさ</string>
-  <string name="Butt Gravity">お尻の垂れ具合</string>
-  <string name="bustle skirt">後ろの膨らみ</string>
-  <string name="no bustle">膨らみなし</string>
-  <string name="more bustle">膨らみ大</string>
-
-  <string name="Chaplin">チャップリン</string>
-  <string name="Cheek Bones">ほお骨</string>
-  <string name="Chest Size">胸部の大きさ</string>
-  <string name="Chin Angle">あごの角度</string>
-  <string name="Chin Cleft">あごの先の割れ</string>
-  <string name="Chin Curtains">あごに沿ったひげ</string>
-
-  <string name="Chin Depth">あごの長さ</string>
-  <string name="Chin Heavy">あごを強調</string>
-  <string name="Chin In">ひいたあご</string>
-  <string name="Chin Out">突き出たあご</string>
-  <string name="Chin-Neck">あごと首</string>
-  <string name="Clear">クリア</string>
-  <string name="Cleft">割れた</string>
-  <string name="Close Set Eyes">顔の中心寄りの目</string>
-  <string name="Closed">クローズ</string>
-  <string name="Closed Back">後ろとじ</string>
-  <string name="Closed Front">前とじ</string>
-  <string name="Closed Left">左とじ</string>
-  <string name="Closed Right">右とじ</string>
-  <string name="Coin Purse">コイン入れ</string>
-  <string name="Collar Back">後ろえり</string>
-
-
-
-  <string name="Collar Front">前えり</string>
-
-
-
-  <string name="Corner Down">ダウン</string>
-
-  <string name="Corner Up">アップ</string>
-  <string name="Creased">重いまぶた</string>
-  <string name="Crooked Nose">曲がった鼻</string>
-
-  <string name="Cuff Flare">袖口のフレア</string>
-  <string name="Dark">ダーク</string>
-  <string name="Dark Green">ダークグリーン</string>
-  <string name="Darker">ダーク</string>
-  <string name="Deep">尖った</string>
-  <string name="Default Heels">デフォルトのかかと</string>
-
-  <string name="Dense">濃</string>
-
-  <string name="Double Chin">二重あご</string>
-  <string name="Downturned">下向き</string>
-  <string name="Duffle Bag">ダッフルバッグ</string>
-  <string name="Ear Angle">耳の角度</string>
-  <string name="Ear Size">耳の大きさ</string>
-  <string name="Ear Tips">耳の先</string>
-  <string name="Egg Head">たまご頭</string>
-  <string name="Eye Bags">下まぶた</string>
-  <string name="Eye Color">瞳の色</string>
-  <string name="Eye Depth">目のくぼみ</string>
-  <string name="Eye Lightness">瞳の明るさ</string>
-  <string name="Eye Opening">見開き具合</string>
-  <string name="Eye Pop">両目の大きさの対称</string>
-  <string name="Eye Size">目の大きさ</string>
-  <string name="Eye Spacing">目と目のあいだの幅</string>
-
-  <string name="Eyebrow Arc">眉毛のアーチ</string>
-  <string name="Eyebrow Density">眉毛の密集度</string>
-
-  <string name="Eyebrow Height">眉毛の高さ</string>
-  <string name="Eyebrow Points">眉毛の角</string>
-  <string name="Eyebrow Size">眉毛の大きさ</string>
-
-  <string name="Eyelash Length">まつげの長さ</string>
-  <string name="Eyeliner">アイライナー</string>
-  <string name="Eyeliner Color">アイライナーの色</string>
-
-  <string name="Eyes Bugged">下まぶたがたるんだ目</string>
-
-
-
-
-
-
-
-
-  <string name="Face Shear">顔のゆがみ</string>
-  <string name="Facial Definition">顔の精細度</string>
-  <string name="Far Set Eyes">離れた目</string>
-
-  <string name="Fat Lips">大</string>
-
-  <string name="Female">女性</string>
-  <string name="Fingerless">指なし</string>
-  <string name="Fingers">指あり</string>
-  <string name="Flared Cuffs">広がった袖口</string>
-  <string name="Flat">平ら</string>
-  <string name="Flat Butt">小</string>
-  <string name="Flat Head">絶壁頭</string>
-  <string name="Flat Toe">フラット</string>
-  <string name="Foot Size">足の大きさ</string>
-  <string name="Forehead Angle">ひたいの角度</string>
-  <string name="Forehead Heavy">ひたいを強調</string>
-  <string name="Freckles">しみ・そばかす</string>
-
-  <string name="Front Fringe">前髪の毛先</string>
-
-  <string name="Full Back">刈られていない髪</string>
-  <string name="Full Eyeliner">あり</string>
-  <string name="Full Front">刈られていない髪</string>
-  <string name="Full Hair Sides">サイドの髪</string>
-  <string name="Full Sides">生え揃ったサイド</string>
-  <string name="Glossy">あり</string>
-  <string name="Glove Fingers">手袋の指</string>
-
-  <string name="Glove Length">手袋の長さ</string>
-
-
-  <string name="Hair">髪</string>
-  <string name="Hair Back">髪：後ろ</string>
-  <string name="Hair Front">髪：前</string>
-  <string name="Hair Sides">髪：サイド</string>
-  <string name="Hair Sweep">流す</string>
-  <string name="Hair Thickess">髪の量</string>
-  <string name="Hair Thickness">髪の量</string>
-  <string name="Hair Tilt">髪の向き</string>
-  <string name="Hair Tilted Left">左向き</string>
-  <string name="Hair Tilted Right">右向き</string>
-  <string name="Hair Volume">髪：ボリューム</string>
-  <string name="Hand Size">手の大きさ</string>
-  <string name="Handlebars">ハンドルバー</string>
-  <string name="Head Length">頭の長さ</string>
-  <string name="Head Shape">頭の形</string>
-  <string name="Head Size">頭の大きさ</string>
-  <string name="Head Stretch">縦横の長さ</string>
-  <string name="Heel Height">ヒールの高さ</string>
-  <string name="Heel Shape">ヒールの形</string>
-  <string name="Height">身長</string>
-  <string name="High">高</string>
-  <string name="High Heels">ハイヒール</string>
-  <string name="High Jaw">高</string>
-  <string name="High Platforms">厚底</string>
-  <string name="High and Tight">高めでタイト</string>
-  <string name="Higher">高</string>
-  <string name="Hip Length">腰の長さ</string>
-  <string name="Hip Width">腰の幅</string>
-  <string name="Hover">ホバー</string>
-  <string name="In">内向き</string>
-  <string name="In Shdw Color">内側のシャドウカラー</string>
-  <string name="In Shdw Opacity">内側のシャドウの濃さ</string>
-  <string name="Inner Eye Corner">目頭</string>
-  <string name="Inner Eye Shadow">内側のアイシャドウ</string>
-  <string name="Inner Shadow">内側のシャドウ</string>
-
-
-  <string name="Jacket Length">ジャケット丈</string>
-  <string name="Jacket Wrinkles">ジャケットのしわ</string>
-  <string name="Jaw Angle">あごの角度</string>
-  <string name="Jaw Jut">あごの突出</string>
-  <string name="Jaw Shape">あごの形</string>
-  <string name="Join">寄せた胸</string>
-  <string name="Jowls">えら</string>
-  <string name="Knee Angle">膝の角度</string>
-  <string name="Knock Kneed">内股</string>
-
-  <string name="Large">大</string>
-  <string name="Large Hands">大</string>
-  <string name="Left Part">左分け</string>
-  <string name="Leg Length">脚の長さ</string>
-  <string name="Leg Muscles">脚の筋肉</string>
-  <string name="Less">小</string>
-  <string name="Less Body Fat">少なめ</string>
-  <string name="Less Curtains">少なめ</string>
-  <string name="Less Freckles">少なめ</string>
-  <string name="Less Full">薄い</string>
-  <string name="Less Gravity">少</string>
-  <string name="Less Love">少</string>
-  <string name="Less Muscles">少なめ</string>
-  <string name="Less Muscular">少なめ</string>
-  <string name="Less Rosy">少な目</string>
-  <string name="Less Round">丸み少な目</string>
-  <string name="Less Saddle">小</string>
-  <string name="Less Square">小</string>
-  <string name="Less Volume">ボリューム少な目</string>
-  <string name="Less soul">小</string>
-  <string name="Lighter">ライト</string>
-  <string name="Lip Cleft">唇の山</string>
-  <string name="Lip Cleft Depth">唇の山の高さ</string>
-  <string name="Lip Fullness">唇の厚み</string>
-  <string name="Lip Pinkness">唇の赤み</string>
-  <string name="Lip Ratio">上下唇の大きさ</string>
-  <string name="Lip Thickness">唇の前後幅</string>
-  <string name="Lip Width">口の大きさ</string>
-  <string name="Lipgloss">リップグロス</string>
-  <string name="Lipstick">口紅</string>
-  <string name="Lipstick Color">口紅の色</string>
-  <string name="Long">ロング</string>
-  <string name="Long Head">前後幅が広い頭</string>
-  <string name="Long Hips">長</string>
-  <string name="Long Legs">長</string>
-  <string name="Long Neck">長</string>
-  <string name="Long Pigtails">長</string>
-  <string name="Long Ponytail">長</string>
-  <string name="Long Torso">長</string>
-  <string name="Long arms">長</string>
-
-
-  <string name="Loose Pants">ゆったり</string>
-  <string name="Loose Shirt">ゆるめ</string>
-  <string name="Loose Sleeves">ゆるめ</string>
-
-  <string name="Love Handles">ウエスト周り</string>
-  <string name="Low">低</string>
-  <string name="Low Heels">ローヒール</string>
-  <string name="Low Jaw">低</string>
-  <string name="Low Platforms">低め</string>
-  <string name="Low and Loose">低めでゆったり</string>
-  <string name="Lower">低</string>
-  <string name="Lower Bridge">鼻筋</string>
-  <string name="Lower Cheeks">ほおの下部</string>
-
-  <string name="Male">男性</string>
-  <string name="Middle Part">真ん中分け</string>
-  <string name="More">大</string>
-  <string name="More Blush">きつめ</string>
-  <string name="More Body Fat">多め</string>
-  <string name="More Curtains">多め</string>
-  <string name="More Eyeshadow">あり</string>
-  <string name="More Freckles">多め</string>
-  <string name="More Full">厚い</string>
-  <string name="More Gravity">大</string>
-  <string name="More Lipstick">あり</string>
-  <string name="More Love">大</string>
-  <string name="More Lower Lip">大</string>
-  <string name="More Muscles">多め</string>
-  <string name="More Muscular">筋骨隆々</string>
-  <string name="More Rosy">多め</string>
-  <string name="More Round">まる</string>
-  <string name="More Saddle">大</string>
-  <string name="More Sloped">なだらか</string>
-  <string name="More Square">四角</string>
-  <string name="More Upper Lip">大</string>
-  <string name="More Vertical">垂直</string>
-  <string name="More Volume">大</string>
-  <string name="More soul">大</string>
-  <string name="Moustache">口ひげ</string>
-
-  <string name="Mouth Corner">口角</string>
-  <string name="Mouth Position">口の位置</string>
-  <string name="Mowhawk">モヒカン</string>
-  <string name="Muscular">筋骨隆々</string>
-  <string name="Mutton Chops">マトンチョップス</string>
-
-  <string name="Nail Polish">マニキュア</string>
-  <string name="Nail Polish Color">マニキュアの色</string>
-  <string name="Narrow">狭</string>
-  <string name="Narrow Back">狭</string>
-  <string name="Narrow Front">狭</string>
-  <string name="Narrow Lips">おちょぼ口</string>
-  <string name="Natural">ナチュラル</string>
-  <string name="Neck Length">首の長さ</string>
-  <string name="Neck Thickness">首の太さ</string>
-  <string name="No Blush">なし</string>
-  <string name="No Eyeliner">なし</string>
-  <string name="No Eyeshadow">なし</string>
-
-  <string name="No Lipgloss">なし</string>
-  <string name="No Lipstick">なし</string>
-  <string name="No Part">なし</string>
-  <string name="No Polish">なし</string>
-  <string name="No Red">なし</string>
-  <string name="No Spikes">なし</string>
-  <string name="No White">なし</string>
-  <string name="No Wrinkles">なし</string>
-  <string name="Normal Lower">下</string>
-  <string name="Normal Upper">上</string>
-  <string name="Nose Left">左曲がり</string>
-  <string name="Nose Right">右曲がり</string>
-  <string name="Nose Size">鼻の大きさ</string>
-  <string name="Nose Thickness">鼻の厚み</string>
-  <string name="Nose Tip Angle">鼻先の角度</string>
-  <string name="Nose Tip Shape">鼻先の形</string>
-  <string name="Nose Width">鼻の幅</string>
-  <string name="Nostril Division">鼻の穴の高さ</string>
-  <string name="Nostril Width">鼻の穴の幅</string>
-
-
-  <string name="Opaque">濃いめ</string>
-  <string name="Open">オープン</string>
-  <string name="Open Back">後ろあき</string>
-  <string name="Open Front">前あき</string>
-  <string name="Open Left">左あき</string>
-  <string name="Open Right">右あき</string>
-  <string name="Orange">オレンジ</string>
-  <string name="Out">外向き</string>
-  <string name="Out Shdw Color">外側のシャドウカラー</string>
-  <string name="Out Shdw Opacity">外側のシャドウの濃さ</string>
-  <string name="Outer Eye Corner">目尻</string>
-  <string name="Outer Eye Shadow">外側のアイシャドウ</string>
-  <string name="Outer Shadow">外側のシャドウ</string>
-  <string name="Overbite">出っ歯</string>
-
-  <string name="Package">パッケージ</string>
-  <string name="Painted Nails">あり</string>
-  <string name="Pale">悪い</string>
-  <string name="Pants Crotch">ズボンの股</string>
-  <string name="Pants Fit">ズボンのフィット感</string>
-  <string name="Pants Length">ズボン丈</string>
-
-
-  <string name="Pants Waist">ウエスト</string>
-  <string name="Pants Wrinkles">ズボンのしわ</string>
-  <string name="Part">あり</string>
-  <string name="Part Bangs">分けた前髪</string>
-  <string name="Pectorals">胸筋</string>
-  <string name="Pigment">色素</string>
-  <string name="Pigtails">下げ髪</string>
-  <string name="Pink">ピンク</string>
-  <string name="Pinker">ピンク</string>
-  <string name="Platform Height">靴底の高さ</string>
-  <string name="Platform Width">靴底の幅</string>
-  <string name="Pointy">尖った</string>
-  <string name="Pointy Heels">幅狭</string>
-
-  <string name="Ponytail">ポニーテール</string>
-  <string name="Poofy Skirt">ふんわり</string>
-  <string name="Pop Left Eye">左目を大きく</string>
-  <string name="Pop Right Eye">右目を大きく</string>
-  <string name="Puffy">ふっくら</string>
-  <string name="Puffy Eyelids">目の周りの膨らみ</string>
-  <string name="Rainbow Color">虹色</string>
-  <string name="Red Hair">赤毛</string>
-
-  <string name="Regular">均整のとれた</string>
-
-  <string name="Right Part">右分け</string>
-  <string name="Rosy Complexion">頬紅</string>
-  <string name="Round">まるっこい</string>
-
-  <string name="Ruddiness">血色</string>
-  <string name="Ruddy">良い</string>
-  <string name="Rumpled Hair">くしゃくしゃヘア</string>
-  <string name="Saddle Bags">腰回りの肉付き</string>
-
-
-  <string name="Scrawny Leg">骨張った脚</string>
-  <string name="Separate">離れた胸</string>
-  <string name="Shallow">なだらか</string>
-  <string name="Shear Back">後方を刈る</string>
-  <string name="Shear Face">顔のゆがみ</string>
-  <string name="Shear Front">前方を刈る</string>
-
-  <string name="Shear Left Up">左半分を上に</string>
-
-  <string name="Shear Right Up">右半分を上に</string>
-  <string name="Sheared Back">後ろを刈られた髪</string>
-  <string name="Sheared Front">前を刈られた髪</string>
-  <string name="Shift Left">左向き</string>
-  <string name="Shift Mouth">口の向き</string>
-  <string name="Shift Right">右向き</string>
-  <string name="Shirt Bottom">シャツの裾</string>
-
-  <string name="Shirt Fit">シャツのフィット感</string>
-
-  <string name="Shirt Wrinkles">シャツのしわ</string>
-  <string name="Shoe Height">靴の長さ</string>
-
-  <string name="Short">ショート</string>
-  <string name="Short Arms">短</string>
-  <string name="Short Legs">短</string>
-  <string name="Short Neck">短</string>
-  <string name="Short Pigtails">短</string>
-  <string name="Short Ponytail">短</string>
-  <string name="Short Sideburns">短め</string>
-  <string name="Short Torso">短</string>
-  <string name="Short hips">短</string>
-  <string name="Shoulders">肩</string>
-
-  <string name="Side Fringe">サイドの毛先</string>
-  <string name="Sideburns">もみあげ</string>
-
-  <string name="Sides Hair">サイドの髪</string>
-  <string name="Sides Hair Down">ダウン</string>
-  <string name="Sides Hair Up">アップ</string>
-
-  <string name="Skinny Neck">細</string>
-  <string name="Skirt Fit">スカートのフィット感</string>
-  <string name="Skirt Length">スカート丈</string>
-  <string name="Slanted Forehead">傾斜した額</string>
-  <string name="Sleeve Length">袖丈</string>
-
-
-
-  <string name="Sleeve Looseness">袖のフィット感</string>
-  <string name="Slit Back">スリット：後ろ</string>
-  <string name="Slit Front">スリット：前</string>
-  <string name="Slit Left">スリット：左</string>
-  <string name="Slit Right">スリット：右</string>
-  <string name="Small">小</string>
-  <string name="Small Hands">小</string>
-  <string name="Small Head">小</string>
-  <string name="Smooth">滑らか</string>
-  <string name="Smooth Hair">スムーズ</string>
-  <string name="Socks Length">靴下丈</string>
-
-
-  <string name="Soulpatch">ソウルパッチ</string>
-
-  <string name="Sparse">薄</string>
-  <string name="Spiked Hair">とげとげヘア</string>
-  <string name="Square">角張った</string>
-  <string name="Square Toe">スクエアトゥ</string>
-  <string name="Squash Head">カボチャ型</string>
-
-  <string name="Stretch Head">縦長</string>
-  <string name="Sunken">こけたほお</string>
-  <string name="Sunken Chest">小</string>
-  <string name="Sunken Eyes">くぼんだ目</string>
-  <string name="Sweep Back">後ろへ</string>
-  <string name="Sweep Forward">前へ</string>
-
-  <string name="Tall">トール</string>
-  <string name="Taper Back">後ろに先細</string>
-  <string name="Taper Front">前に先細</string>
-  <string name="Thick Heels">幅広</string>
-  <string name="Thick Neck">太</string>
-  <string name="Thick Toe">厚め</string>
-
-  <string name="Thin">薄い</string>
-  <string name="Thin Eyebrows">細</string>
-  <string name="Thin Lips">小</string>
-  <string name="Thin Nose">細い鼻</string>
-  <string name="Tight Chin">ひきしまったあご</string>
-  <string name="Tight Cuffs">タイト</string>
-  <string name="Tight Pants">タイト</string>
-  <string name="Tight Shirt">タイト</string>
-  <string name="Tight Skirt">タイト</string>
-  <string name="Tight Sleeves">タイト</string>
-
-  <string name="Toe Shape">つま先の形</string>
-  <string name="Toe Thickness">つま先の厚み</string>
-  <string name="Torso Length">上半身の長さ</string>
-  <string name="Torso Muscles">上半身の筋肉</string>
-  <string name="Torso Scrawny">上半身の骨張り</string>
-  <string name="Unattached">大</string>
-  <string name="Uncreased">軽いまぶた</string>
-  <string name="Underbite">受け口</string>
-  <string name="Unnatural">ユニーク</string>
-  <string name="Upper Bridge">両目のあいだ</string>
-  <string name="Upper Cheeks">ほおの上部</string>
-  <string name="Upper Chin Cleft">あご上部の割れ</string>
-
-  <string name="Upper Eyelid Fold">二重の幅</string>
-  <string name="Upturned">上向き</string>
-  <string name="Very Red">真っ赤</string>
-  <string name="Waist Height">ウエストの高さ</string>
-
-
-  <string name="Well-Fed">つまったほお</string>
-  <string name="White Hair">白髪</string>
-  <string name="Wide">広</string>
-  <string name="Wide Back">広</string>
-  <string name="Wide Front">広</string>
-  <string name="Wide Lips">大きい口</string>
-  <string name="Wild">ワイルド</string>
-  <string name="Wrinkles">しわ</string>
-
-  <!-- Navigation bar location input control.
-       Strings are here because widget xml is not localizable -->
-  <string name="LocationCtrlAddLandmarkTooltip">ランドマークに追加</string>
-  <string name="LocationCtrlEditLandmarkTooltip">ランドマークを編集</string>
-  <string name="LocationCtrlInfoBtnTooltip">現在地の詳細を見る</string>
-  <string name="LocationCtrlComboBtnTooltip">ロケーション履歴</string>
-  <string name="LocationCtrlForSaleTooltip">この土地を購入</string>
-  <string name="LocationCtrlVoiceTooltip">ここではボイスを利用できません。</string>
-  <string name="LocationCtrlFlyTooltip">飛行は禁止されています。</string>
-  <string name="LocationCtrlPushTooltip">プッシュ禁止</string>
-  <string name="LocationCtrlBuildTooltip">オブジェクトの制作や落とす事は禁止されています。</string>
-  <string name="LocationCtrlScriptsTooltip">スクリプト不可</string>
-  <string name="LocationCtrlDamageTooltip">体力</string>
-  <string name="LocationCtrlAdultIconTooltip">Adultリージョン</string>
-  <string name="LocationCtrlModerateIconTooltip">Moderateリージョン</string>
-  <string name="LocationCtrlGeneralIconTooltip">Generalリージョン</string>
-  <string name="LocationCtrlSeeAVsTooltip">この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。</string>
-  <string name="LocationCtrlPathfindingDirtyTooltip">リージョン（地域）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。</string>
-  <string name="LocationCtrlPathfindingDisabledTooltip">このリージョン（地域）では、動的経路探索が有効になっていません。</string>
-  <!-- Strings used by the (currently Linux) auto-updater app -->
-  <string name="UpdaterWindowTitle">[APP_NAME]の更新</string>
-  <string name="UpdaterNowUpdating">只今[APP_NAME]を更新中です…</string>
-  <string name="UpdaterNowInstalling">[APP_NAME]をインストール中です…</string>
-  <string name="UpdaterUpdatingDescriptive">お使いの[APP_NAME]ビューアを最新バージョンに更新しています。数分かかることがありますのでしばらくお待ちください。</string>
-  <string name="UpdaterProgressBarTextWithEllipses">アップデートをダウンロード中です…</string>
-  <string name="UpdaterProgressBarText">更新をダウンロード中…</string>
-  <string name="UpdaterFailDownloadTitle">更新のダウンロードに失敗しました。</string>
-  <string name="UpdaterFailUpdateDescriptive">[APP_NAME]の更新中にエラーが発生しました。www.secondlife.com から最新バージョンをダウンロードしてください。</string>
-  <string name="UpdaterFailInstallTitle">更新のインストールに失敗しました。</string>
-  <string name="UpdaterFailStartTitle">ビューアの起動に失敗しました。</string>
-
-  <!-- System Messages -->
-  <string name="ItemsComingInTooFastFrom">[APP_NAME]：アイテムが[FROM_NAME]から同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。</string>
-  <string name="ItemsComingInTooFast">[APP_NAME]：アイテムが同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。</string>
-
-  <!-- IM system messages -->
-  <string name="IM_logging_string">－インスタントメッセージの保存開始－</string>
-  <string name="IM_typing_start_string">[NAME]は入力中です…</string>
-  <string name="Unnamed">（名前なし）</string>
-  <string name="IM_moderated_chat_label">（モデレート：デフォルトでボイスはオフ）</string>
-  <string name="IM_unavailable_text_label">このコールでは文字チャットが利用できません。</string>
-  <string name="IM_muted_text_label">グループのモデレータが、あなたの文字チャットを使用禁止にしました。</string>
-  <string name="IM_default_text_label">ここをクリックしてインスタントメッセージを開始。</string>
-  <string name="IM_to_label">宛先</string>
-  <string name="IM_moderator_label">（モデレータ）</string>
-  <!-- TODO: [LOGN_TIMESTAMP]の時刻表記が日本で標準的な書式でない -->
-  <string name="Saved_message">（保存日時：[LONG_TIMESTAMP]）</string>
-  <string name="IM_unblock_only_groups_friends">このメッセージを表示するには、「初期設定」の「プライバシー」で「フレンドとグループ以外からはコールとIMを受信しない」チェックボックスをオフにします。</string>
-  <string name="OnlineStatus">オンライン</string>
-  <string name="OfflineStatus">オフライン</string>
-  <string name="not_online_msg">ユーザーがオンラインでありません－メッセージは保存され、後で配信されます。</string>
-  <string name="not_online_inventory">ユーザーがオンラインでありません–インベントリに保存されました。</string>
-
-  <!-- voice calls -->
-  <string name="answered_call">相手がコールを受けました。</string>
-  <string name="you_started_call">ボイスコールを開始します。</string>
-  <string name="you_joined_call">ボイスコールに参加しました。</string>
-  <string name="you_auto_rejected_call-im">「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。</string>
-  <string name="name_started_call">[NAME]はボイスコールを開始します</string>
-
-  <string name="ringing-im">ボイスコールに参加…</string>
-  <string name="connected-im">接続しました。「通話終了」をクリックして切断します。</string>
-  <string name="hang_up-im">ボイスコールから退席しました</string>
-  <string name="answering-im">接続中…</string>
-  <string name="conference-title">複数人チャット</string>
-  <string name="conference-title-incoming">[AGENT_NAME]と会話する</string>
-  <string name="inventory_item_offered-im">アイテム「[ITEM_NAME]」がインベントリに送られてきました。</string>
-  <string name="inventory_folder_offered-im">フォルダ「[ITEM_NAME]」がインベントリに送られてきました。</string>
-  <string name="share_alert">インベントリからここにアイテムをドラッグします。</string>
-
-  <string name="no_session_message">（ＩＭセッションが存在しません）</string>
-  <string name="only_user_message">このセッションにいるユーザーはあなただけです。</string>
-  <string name="offline_message">[NAME]はオフライン中です。</string>
-  <string name="invite_message">このボイスチャットに応答・接続する場合は、[BUTTON NAME]をクリックしてください。</string>
-  <string name="muted_message">この住人をブロックしています。メッセージを送ると、ブロックが自動的に解除されます。</string>
-  <!--Some times string name is getting from the body of server response.
-  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
-  In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
-  Also there are some other places where "generic" is used.
-  So, let add string with name="generic" with the same value as "generic_request_error" -->
-  <string name="generic">リクエスト中にエラーが発生しました。お手数ですが、もう一度やり直してください。</string>
-  <string name="generic_request_error">要求中にエラーが発生しました。お手数ですが、もう一度やり直してください。</string>
-  <string name="insufficient_perms_error">あなたには充分な権限がありません。</string>
-  <string name="session_does_not_exist_error">このセッションは既に切断されています。</string>
-  <string name="no_ability_error">あなたにはその能力がありません。</string>
-  <string name="no_ability">あなたにはその能力がありません。</string>
-  <string name="not_a_mod_error">あなたは、セッションモデレータではありません。</string>
-  <!--Some times string name is getting from the body of server response.
-  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
-  In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name.
-  So, let add string with name="muted" with the same value as "muted_error" -->
-  <string name="muted">グループのモデレーターが、あなたのテキストチャットを禁止しました。</string>
-  <string name="muted_error">グループモデレータが、あなたのテキストチャットを無効化しました。</string>
-  <string name="add_session_event">[RECIPIENT]とのチャットセッションにユーザーを追加することができません。</string>
-  <!--Some times string name is getting from the body of server response.
-  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
-  In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name.
-  So, let add string with name="message" with the same value as "message_session_event" -->
-  <string name="message">[RECIPIENT]とのチャットセッションに、メッセージを送信することができません。</string>
-  <string name="message_session_event">[RECIPIENT]とのチャットセッションにメッセージを送ることができません。</string>
-  <string name="mute">モデレート中にエラーが発生しました。</string>
-  <!--Some times string name is getting from the body of server response.
-  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
-  In case of the EXT-3459 issue 'removed' is passed into the gIMMgr::showSessionStartError as a string name.
-  So, let add string with name="removed" with the same value as "removed_from_group" -->
-  <string name="removed">グループから脱退しました。</string>
-  <string name="removed_from_group">あなたは、グループから削除されました。</string>
-  <string name="close_on_no_ability">このチャットセッションを継続することはできません。</string>
-  <string name="unread_chat_single">[SOURCES]は、何か新しいことを言いました。</string>
-  <string name="unread_chat_multiple">[SOURCES]は、何か新しいことを言いました。</string>
-  <string name="session_initialization_timed_out_error">セッションの初期化がタイムアウトしました。</string>
-
-  <string name="Home position set.">家の配置の設定。</string>
-
-  <string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
-  <string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
-
-  <string name="lindenhomes_get_home_url">https://secondlife.com/land/lindenhomes/member.php?lang=ja-JP</string>
-  <string name="lindenhomes_my_home_url">https://land.secondlife.com/ja-JP/lindenhomes/my-home.php</string>
-  <string name="membership_url">https://accounts.secondlife.com/change_membership/?lang=ja-JP</string>
-
-  <!-- Financial operations strings -->
-  <string name="paid_you_ldollars">[NAME]は、[REASON]費用のL$ [AMOUNT]を支払いました。</string>
-  <string name="paid_you_ldollars_gift">[NAME]は、[REASON]費用のL$ [AMOUNT]支払いました。</string>
-  <string name="paid_you_ldollars_no_reason">[NAME]は、L$ [AMOUNT]を支払いました。</string>
-  <string name="you_paid_ldollars">[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。</string>
-  <string name="you_paid_ldollars_gift">[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。</string>
-  <string name="you_paid_ldollars_no_info">L$ [AMOUNT]を支払いました。</string>
-  <string name="you_paid_ldollars_no_reason">[NAME]にL$ [AMOUNT]を支払いました。</string>
-  <string name="you_paid_ldollars_no_name">[REASON]費用のL$ [AMOUNT]を支払いました。</string>
-  <string name="you_paid_failure_ldollars">[NAME]に[REASON]費用L$ [AMOUNT]を支払えませんでした。</string>
-  <string name="you_paid_failure_ldollars_gift">[NAME]に[REASON]費用のL$ [AMOUNT]を支払えませんでした。</string>
-  <string name="you_paid_failure_ldollars_no_info">L$ [AMOUNT]を支払えませんでした。</string>
-  <string name="you_paid_failure_ldollars_no_reason">[NAME]にL$ [AMOUNT]を支払えませんでした。</string>
-  <string name="you_paid_failure_ldollars_no_name">[REASON]費用L$ [AMOUNT]を支払えませんでした。</string>
-  <string name="for item">[ITEM]</string>
-  <string name="for a parcel of land">土地区画</string>
-  <string name="for a land access pass">土地への入場許可</string>
-  <string name="for deeding land">土地を譲渡</string>
-  <string name="to create a group">グループ作成</string>
-  <string name="to join a group">グループ参加</string>
-  <string name="to upload">アップロード</string>
-  <string name="to publish a classified ad">クラシファイド広告掲載</string>
-
-  <string name="uploading_costs">アップロード費用はL$ [AMOUNT]です。</string>
-  <string name="this_costs">費用はL$ [AMOUNT]です。</string>
-
-  <string name="buying_selected_land">選択した土地をL$ [AMOUNT]で購入します。</string>
-  <string name="this_object_costs">このオブジェクトの費用は、L$ [AMOUNT]です。</string>
-  <string name="giving">L$ [AMOUNT]を渡します。</string>
-
-  <string name="group_role_everyone">全員</string>
-  <string name="group_role_officers">オフィサー</string>
-  <string name="group_role_owners">所有者</string>
-  <string name="group_member_status_online">オンライン</string>
-
-  <string name="uploading_abuse_report">アップロード中…
-
-嫌がらせの報告</string>
-
-  <!-- names for new inventory items-->
-  <string name="New Shape">新しいシェイプ</string>
-  <string name="New Skin">新しいスキン</string>
-  <string name="New Hair">新しい髪</string>
-  <string name="New Eyes">新しい目</string>
-  <string name="New Shirt">新しいシャツ</string>
-  <string name="New Pants">新しいズボン</string>
-  <string name="New Shoes">新しい靴</string>
-  <string name="New Socks">新しい靴下</string>
-  <string name="New Jacket">新しいジャケット</string>
-  <string name="New Gloves">新しい手袋</string>
-  <string name="New Undershirt">新しい下着（上半身）</string>
-  <string name="New Underpants">新しい下着（下半身）</string>
-  <string name="New Skirt">新しいスカート</string>
-  <string name="New Alpha">新しいアルファ</string>
-  <string name="New Tattoo">新しいタトゥ</string>
-  <string name="New Universal">新しいユニバーサル</string>
-  <string name="New Physics">新規の物理作用</string>
-  <string name="Invalid Wearable">無効な着用物</string>
-  <string name="New Gesture">ジェスチャー</string>
-  <string name="New Script">新規スクリプト</string>
-  <string name="New Note">ノート</string>
-  <string name="New Folder">新規フォルダ</string>
-  <string name="Contents">コンテンツ</string>
-  <string name="Gesture">ジェスチャー</string>
-  <string name="Male Gestures">男性用ジェスチャー</string>
-  <string name="Female Gestures">女性用ジェスチャー</string>
-  <string name="Other Gestures">その他のジェスチャー</string>
-  <string name="Speech Gestures">会話ジェスチャー</string>
-  <string name="Common Gestures">一般的ジェスチャー</string>
-  <!-- gestures -->
-  <string name="Male - Excuse me">男性－すみません</string>
-  <string name="Male - Get lost">男性－あっち行けよ</string>
-  <string name="Male - Blow kiss">男性－投げキッス</string>
-  <string name="Male - Boo">男性－ぶー</string>
-  <string name="Male - Bored">男性－退屈</string>
-  <string name="Male - Hey">男性－–やぁ</string>
-  <string name="Male - Laugh">男性－笑う</string>
-  <string name="Male - Repulsed">男性－拒絶</string>
-  <string name="Male - Shrug">男性－肩をすくめる</string>
-  <string name="Male - Stick tougue out">男性－舌を出す</string>
-  <string name="Male - Wow">男性－わぁ</string>
-
-  <string name="Female - Chuckle">女性－クスクス</string>
-  <string name="Female - Cry">女性－泣く</string>
-  <string name="Female - Embarrassed">女性－恥ずかしい</string>
-  <string name="Female - Excuse me">女性－すみません</string>
-  <string name="Female - Get lost">女性－あっち行ってよ</string>
-  <string name="Female - Blow kiss">女性–投げキッス</string>
-  <string name="Female - Boo">女性－ぶー</string>
-  <string name="Female - Bored">女性－退屈</string>
-  <string name="Female - Hey">女性－やぁ</string>
-  <string name="Female - Hey baby">女性－ヘイ、ベィビー！</string>
-  <string name="Female - Laugh">女性－笑う</string>
-  <string name="Female - Looking good">女性－いい感じ</string>
-  <string name="Female - Over here">女性－こっちよ</string>
-  <string name="Female - Please">女性－プリーズ</string>
-  <string name="Female - Repulsed">女性－拒絶</string>
-  <string name="Female - Shrug">女性－肩をすくめる</string>
-  <string name="Female - Stick tougue out">女性－舌を出す</string>
-  <string name="Female - Wow">女性－わぁ</string>
-
-  <!-- settings -->
-  <string name="New Daycycle">新しいデイサイクル</string>
-  <string name="New Water">新しい水面</string>
-  <string name="New Sky">新しい空</string>
-
-
-  <string name="/bow">/おじぎする</string>
-  <string name="/clap">/拍手</string>
-  <string name="/count">/数える</string>
-  <string name="/extinguish">/消す</string>
-  <string name="/kmb">/くそくらえ</string>
-  <string name="/muscle">/筋肉もりもり</string>
-  <string name="/no">/いいえ</string>
-  <string name="/no!">/だめ！</string>
-  <string name="/paper">/パー</string>
-  <string name="/pointme">/自分を指差す</string>
-  <string name="/pointyou">/相手を指差す</string>
-  <string name="/rock">/グー</string>
-  <string name="/scissor">/チョキ</string>
-  <string name="/smoke">/タバコを吸う</string>
-  <string name="/stretch">/伸びをする</string>
-  <string name="/whistle">/口笛を吹く</string>
-  <string name="/yes">/はい</string>
-  <string name="/yes!">/イエス！</string>
-  <string name="afk">一時退席中</string>
-  <string name="dance1">ダンス１</string>
-  <string name="dance2">ダンス２</string>
-  <string name="dance3">ダンス３</string>
-  <string name="dance4">ダンス４</string>
-  <string name="dance5">ダンス５</string>
-  <string name="dance6">ダンス６</string>
-  <string name="dance7">ダンス７</string>
-  <string name="dance8">ダンス８</string>
-
-  <!-- birth date format shared by avatar inspector and profile panels -->
-  <string name="AvatarBirthDateFormat">[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日</string>
-  <string name="DefaultMimeType">none/none</string>
-
-  <string name="texture_load_dimensions_error">[WIDTH]✕[HEIGHT]以上の画像は読み込めません。</string>
-  <string name="outfit_photo_load_dimensions_error">アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。画像のサイズを調整するか、別の画像を使用してください。</string>
-  <string name="outfit_photo_select_dimensions_error">アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。別のテクスチャを選択してください。</string>
-  <string name="outfit_photo_verify_dimensions_error">画像の寸法を確認できません。画像サイズがピッカーに表示されるまでお待ちください。</string>
-  <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
-  <string name="sentences_separator" value="　"></string>
-  <string name="words_separator" value="、"/>
-
-  <string name="server_is_down">
-大変申し訳ございませんが、予期しない問題が発生しました。サービスに関する既知の問題については、 https://status.secondlifegrid.net/?lang=ja-JP をご覧ください。
-問題が引き続き発生する場合は、お使いのネットワークやファイヤーウォールの設定を調べてください。</string>
-  <string name="dateTimeWeekdaysNames">日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日</string>
-  <string name="dateTimeWeekdaysShortNames">日:月:火:水:木:金:土</string>
-
-  <!-- overriding datetime formating.
-	didn't translate if this is not needed for current localization
-  -->
-  <string name="dateTimeMonthNames">１月:２月:３月:４月:５月:６月:７月:８月:９月:１０月:１１月:１２月</string>
-  <string name="dateTimeMonthShortNames">㋀:㋁:㋂:㋃:㋄:㋅:㋆:㋇:㋈:㋉:㋊:㋋</string>
-  <string name="dateTimeDayFormat">[MDAY]</string>
-  <string name="dateTimeAM">午前</string>
-  <string name="dateTimePM">午後</string>
-
-  <!--  currency formatting -->
-  <string name="LocalEstimateUSD">[AMOUNT]米ドル</string>
-
-  <!-- Group Profile roles and powers -->
-  <string name="Group Ban">グループからバン</string>
-  <string name="Membership">会員</string>
-  <string name="Roles">役割</string>
-  <string name="Group Identity">グループの識別情報</string>
-  <string name="Parcel Management">区画の管理</string>
-  <string name="Parcel Identity">区画の識別情報</string>
-  <string name="Parcel Settings">区画の設定</string>
-  <string name="Parcel Powers">区画の権限</string>
-  <string name="Parcel Access">区画へのアクセス</string>
-  <string name="Parcel Content">区画のコンテンツ</string>
-  <string name="Object Management">オブジェクトの管理</string>
-  <string name="Accounting">会計</string>
-  <string name="Notices">通知</string>
-
-  <!-- SL Membership -->
-  <string name="Chat" value="チャット：">チャット</string>
-  <string name="BaseMembership">ベース</string>
-  <string name="PremiumMembership">プレミアム</string>
-  <string name="Premium_PlusMembership">プレミアムプラス</string>
-  <!-- No need to translate -->
-  <string name="InternalMembership">Internal</string>
-
-  <string name="MembershipUpgradeText">メンバーシッププランの変更…</string>
-  <string name="MembershipPremiumText">プレミアムメンバーシップ</string>
-
-  <!-- Question strings for delete items notifications -->
-  <string name="DeleteItems">選択したアイテムを削除しますか？</string>
-  <string name="DeleteItem">選択したアイテムを削除しますか？</string>
-
-  <string name="EmptyOutfitText">このアウトフィットにはアイテムがありません。</string>
-
-  <!-- External editor status codes -->
-  <string name="ExternalEditorNotSet">ExternalEditor 設定を使ってエディターを選択します。</string>
-  <string name="ExternalEditorNotFound">指定された外部エディターが見つかりません。
-エディターへのパスを二重引用符で囲んでみてください。（例："/path to my/editor" "%s"）</string>
-  <string name="ExternalEditorCommandParseError">外部エディターのコマンドの解析中にエラーが見つかりました。</string>
-  <string name="ExternalEditorFailedToRun">外部エディターを実行できませんでした。</string>
-
-  <!--  Machine translation of chat messahes -->
-  <string name="TranslationFailed">翻訳できませんでした：[REASON]</string>
-  <string name="TranslationResponseParseError">翻訳の応答にエラーが発生しました。</string>
-
-  <!-- Key names begin -->
-  <string name="Esc">Esc</string>
-  <string name="Space">Space</string>
-  <string name="Enter">Enter</string>
-  <string name="Tab">Tab</string>
-  <string name="Ins">Ins</string>
-  <string name="Del">Del</string>
-  <string name="Backsp">BackSp</string>
-  <string name="Shift">Shift</string>
-  <string name="Ctrl">Ctrl</string>
-  <string name="Alt">Alt</string>
-  <string name="CapsLock">CapsLock</string>
-  <string name="Left">←</string>
-  <string name="Right">→</string>
-  <string name="Up">↑</string>
-  <string name="Down">↓</string>
-  <string name="Home">Home</string>
-  <string name="End">End</string>
-  <string name="PgUp">PgUp</string>
-  <string name="PgDn">PgDn</string>
-
-  <string name="F1">F1</string>
-  <string name="F2">F2</string>
-  <string name="F3">F3</string>
-  <string name="F4">F4</string>
-  <string name="F5">F5</string>
-  <string name="F6">F6</string>
-  <string name="F7">F7</string>
-  <string name="F8">F8</string>
-  <string name="F9">F9</string>
-  <string name="F10">F10</string>
-  <string name="F11">F11</string>
-  <string name="F12">F12</string>
-
-  <string name="Add">追加</string>
-  <string name="Subtract">減算</string>
-  <string name="Multiply">乗算</string>
-  <string name="Divide">除算</string>
-  <string name="PAD_DIVIDE">PAD_DIVIDE</string>
-  <string name="PAD_LEFT">PAD_LEFT</string>
-  <string name="PAD_RIGHT">PAD_RIGHT</string>
-  <string name="PAD_DOWN">PAD_DOWN</string>
-  <string name="PAD_UP">PAD_UP</string>
-  <string name="PAD_HOME">PAD_HOME</string>
-  <string name="PAD_END">PAD_END</string>
-  <string name="PAD_PGUP">PAD_PGUP</string>
-  <string name="PAD_PGDN">PAD_PGDN</string>
-  <string name="PAD_CENTER">PAD_CENTER</string>
-  <string name="PAD_INS">PAD_INS</string>
-  <string name="PAD_DEL">PAD_DEL</string>
-  <string name="PAD_Enter">PAD_Enter</string>
-  <string name="PAD_BUTTON0">PAD_BUTTON0</string>
-  <string name="PAD_BUTTON1">PAD_BUTTON1</string>
-  <string name="PAD_BUTTON2">PAD_BUTTON2</string>
-  <string name="PAD_BUTTON3">PAD_BUTTON3</string>
-  <string name="PAD_BUTTON4">PAD_BUTTON4</string>
-  <string name="PAD_BUTTON5">PAD_BUTTON5</string>
-  <string name="PAD_BUTTON6">PAD_BUTTON6</string>
-  <string name="PAD_BUTTON7">PAD_BUTTON7</string>
-  <string name="PAD_BUTTON8">PAD_BUTTON8</string>
-  <string name="PAD_BUTTON9">PAD_BUTTON9</string>
-  <string name="PAD_BUTTON10">PAD_BUTTON10</string>
-  <string name="PAD_BUTTON11">PAD_BUTTON11</string>
-  <string name="PAD_BUTTON12">PAD_BUTTON12</string>
-  <string name="PAD_BUTTON13">PAD_BUTTON13</string>
-  <string name="PAD_BUTTON14">PAD_BUTTON14</string>
-  <string name="PAD_BUTTON15">PAD_BUTTON15</string>
-
-  <string name="-">-</string>
-  <string name="=">=</string>
-  <string name="`">`</string>
-  <string name=";">;</string>
-  <string name="[">[</string>
-  <string name="]">]</string>
-  <string name="\">\</string>
-
-  <string name="0">0</string>
-  <string name="1">1</string>
-  <string name="2">2</string>
-  <string name="3">3</string>
-  <string name="4">4</string>
-  <string name="5">5</string>
-  <string name="6">6</string>
-  <string name="7">7</string>
-  <string name="8">8</string>
-  <string name="9">9</string>
-
-  <string name="A">A</string>
-  <string name="B">B</string>
-  <string name="C">C</string>
-  <string name="D">D</string>
-  <string name="E">E</string>
-  <string name="F">F</string>
-  <string name="G">G</string>
-  <string name="H">H</string>
-  <string name="I">I</string>
-  <string name="J">J</string>
-  <string name="K">K</string>
-  <string name="L">L</string>
-  <string name="M">M</string>
-  <string name="N">N</string>
-  <string name="O">O</string>
-  <string name="P">P</string>
-  <string name="Q">Q</string>
-  <string name="R">R</string>
-  <string name="S">S</string>
-  <string name="T">T</string>
-  <string name="U">U</string>
-  <string name="V">V</string>
-  <string name="W">W</string>
-  <string name="X">X</string>
-  <string name="Y">Y</string>
-  <string name="Z">Z</string>
-  <!-- Key names end -->
-
-  <!-- Mouse button names (short) begin -->
-  <string name="LMB">左クリック</string>
-  <string name="MMB">ホイールクリック</string>
-  <string name="RMB">右クリック</string>
-  <string name="MB4">進むボタン</string>
-  <string name="MB5">戻るボタン</string>
-  <string name="Double LMB">左ダブルクリック</string>
-  <!-- Mouse button names end -->
-
-  <!-- llviewerwindow -->
-  <string name="BeaconParticle">パーティクル源ビーコン（青）を表示中</string>
-  <string name="BeaconPhysical">物理的オブジェクトのビーコン（緑）を表示中</string>
-  <string name="BeaconScripted">スクリプトのオブジェクトのビーコン（赤）を表示中</string>
-  <string name="BeaconScriptedTouch">タッチ機能のビーコンが付いたスクリプトのオブジェクト（赤）を表示中</string>
-  <string name="BeaconSound">サウンドビーコン（黄）を表示中</string>
-  <string name="BeaconMedia">メディアビーコン（白）を表示中</string>
-  <string name="BeaconSun">太陽の方角ビーコン（オレンジ）を表示中</string>
-  <string name="BeaconMoon">月の方角ビーコン（紫）を表示中</string>
-  <string name="ParticleHiding">パーティクルを非表示</string>
-
-  <!-- commands -->
-  <!-- 「360度スナップショット」だと文字が切れてしまうため -->
-  <string name="Command_360_Capture_Label">３６０度Ｓショット</string>
-  <string name="Command_AboutLand_Label">土地情報</string>
-  <string name="Command_Appearance_Label">アウトフィット</string>
-  <string name="Command_Avatar_Label">アバター一式</string>
-  <string name="Command_Build_Label">制作</string>
-  <string name="Command_Chat_Label">チャット</string>
-  <string name="Command_Conversations_Label">会話</string>
-  <string name="Command_Compass_Label">コンパス</string>
-  <string name="Command_Destinations_Label">行き先</string>
-  <string name="Command_Environments_Label">環境</string>
-  <string name="Command_Gestures_Label">ジェスチャー</string>
-  <string name="Command_Grid_Status_Label">グリッド状況</string>
-  <string name="Command_HowTo_Label">ハウツー</string>
-  <string name="Command_Inventory_Label">インベントリ</string>
-  <string name="Command_Map_Label">マップ</string>
-  <string name="Command_Marketplace_Label">マーケットプレイス</string>
-  <string name="Command_MarketplaceListings_Label">マーケットプレイス</string>
-  <string name="Command_MiniMap_Label">ミニマップ</string>
-  <string name="Command_Move_Label">歩行／走行／飛行</string>
-  <string name="Command_People_Label">人物</string>
-  <string name="Command_Picks_Label">ピック</string>
-  <string name="Command_Places_Label">場所</string>
-  <string name="Command_Preferences_Label">初期設定</string>
-  <string name="Command_Profile_Label">プロフィール</string>
-  <string name="Command_Report_Abuse_Label">嫌がらせの報告</string>
-  <string name="Command_Search_Label">検索</string>
-  <string name="Command_Snapshot_Label">スナップショット</string>
-  <string name="Command_Speak_Label">ボイスチャット</string>
-  <string name="Command_View_Label">カメラ操作</string>
-  <string name="Command_Voice_Label">ボイス設定</string>
-
-  <string name="Command_360_Capture_Tooltip">３６０度の正距円筒図法のスナップショット画像を撮影します。</string>
-  <string name="Command_AboutLand_Tooltip">訪問先に関する情報を表示します。</string>
-  <string name="Command_Appearance_Tooltip">アバターの外観を変更します。</string>
-  <string name="Command_Avatar_Tooltip">アバター一式を選択します。</string>
-  <string name="Command_Build_Tooltip">オブジェクトの制作や地形の変形をします。</string>
-  <string name="Command_Chat_Tooltip">近くにいる人物とテキストチャットします。</string>
-  <string name="Command_Conversations_Tooltip">全員との会話を表示します。</string>
-  <string name="Command_Compass_Tooltip">コンパスを表示します。</string>
-  <string name="Command_Destinations_Tooltip">行ってみたい場所を表示します。</string>
-  <string name="Command_Environments_Tooltip">自分の環境を表示します。</string>
-  <string name="Command_Gestures_Tooltip">アバターのジェスチャーを表示します。</string>
-  <string name="Command_Grid_Status_Tooltip">現在のグリッドステータスを表示します。</string>
-  <string name="Command_HowTo_Tooltip">一般的タスクの実行方法を表示します。</string>
-  <string name="Command_Inventory_Tooltip">インベントリの内容を表示したり使用したりします。</string>
-  <string name="Command_Map_Tooltip">ワールドマップを表示します。</string>
-  <string name="Command_Marketplace_Tooltip">ショッピングに出掛ける</string>
-  <string name="Command_MarketplaceListings_Tooltip">創作アイテムを販売します。</string>
-  <string name="Command_MiniMap_Tooltip">近隣の人を表示します。</string>
-  <string name="Command_Move_Tooltip">アバターの移動操作をします。</string>
-  <string name="Command_People_Tooltip">フレンド、グループ、近隣の人物を表示します。</string>
-  <string name="Command_Picks_Tooltip">プロフィールで紹介しているお気に入りの場所を表示します。</string>
-  <string name="Command_Places_Tooltip">保存済みの場所を表示します。</string>
-  <string name="Command_Preferences_Tooltip">初期設定を表示します。</string>
-  <string name="Command_Profile_Tooltip">自分のプロフィールの表示や編集を行います。</string>
-  <string name="Command_Report_Abuse_Tooltip">嫌がらせを報告します。</string>
-  <string name="Command_Search_Tooltip">場所、イベント、人物を検索します。</string>
-  <string name="Command_Snapshot_Tooltip">スナップショット画像を撮ります。</string>
-  <string name="Command_Speak_Tooltip">マイクを使って近くの人と話します。</string>
-  <string name="Command_View_Tooltip">カメラアングルの変更を表示します。</string>
-  <string name="Command_Voice_Tooltip">インワールドでのコールや近くにいる人物の音量調整します。</string>
-
-  <string name="Toolbar_Bottom_Tooltip">現在、下のツールバーにあります。</string>
-  <string name="Toolbar_Left_Tooltip">現在、左のツールバーにあります。</string>
-  <string name="Toolbar_Right_Tooltip">現在、右のツールバーにあります。</string>
-
-  <!-- Mesh UI terms -->
-  <string name="Retain%">維持率</string>
-  <string name="Detail">詳細</string>
-  <string name="Better Detail">より詳細</string>
-  <string name="Surface">表面</string>
-  <string name="Solid">ソリッド</string>
-  <string name="Wrap">ラップ</string>
-  <string name="Preview">プレビュー</string>
-  <string name="Normal">通常</string>
-
-  <!-- Pathfinding -->
-  <string name="Pathfinding_Wiki_URL">https://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-  <string name="Pathfinding_Object_Attr_None">なし</string>
-  <string name="Pathfinding_Object_Attr_Permanent">ナビメッシュに影響を与える</string>
-  <string name="Pathfinding_Object_Attr_Character">キャラクター</string>
-  <string name="Pathfinding_Object_Attr_MultiSelect">（複数）</string>
-
-  <!-- Snapshot image quality levels -->
-  <string name="snapshot_quality_very_low">最低</string>
-  <string name="snapshot_quality_low">低</string>
-  <string name="snapshot_quality_medium">中</string>
-  <string name="snapshot_quality_high">高</string>
-  <string name="snapshot_quality_very_high">最高</string>
-
-  <string name="TeleportMaturityExceeded">住人はこのリージョン（地域）を訪問できません。</string>
-
-  <!-- Spell check settings floater -->
-  <string name="UserDictionary">[User]</string>
-  <string name="experience_tools_experience">体験</string>
-  <string name="ExperienceNameNull">（体験なし）</string>
-  <string name="ExperienceNameUntitled">（タイトルのない体験）</string>
-  <string name="Land-Scope">ランドスコープ</string>
-  <string name="Grid-Scope">グリッドスコープ</string>
-  <string name="Allowed_Experiences_Tab">許可</string>
-  <string name="Blocked_Experiences_Tab">停止</string>
-  <string name="Contrib_Experiences_Tab">貢献者</string>
-  <string name="Admin_Experiences_Tab">管理</string>
-  <string name="Recent_Experiences_Tab">最新</string>
-  <string name="Owned_Experiences_Tab">所有</string>
-  <string name="ExperiencesCounter">（[EXPERIENCES]、最大[MAXEXPERIENCES]）</string>
-  <string name="ExperiencePermission1">コントロールを引き継ぐ</string>
-  <string name="ExperiencePermission3">アバターでアニメーションをトリガー</string>
-  <string name="ExperiencePermission4">アバターに装着</string>
-  <string name="ExperiencePermission9">カメラ追従</string>
-  <string name="ExperiencePermission10">カメラのコントロール</string>
-  <string name="ExperiencePermission11">あなたをテレポート</string>
-  <string name="ExperiencePermission12">体験の権限を自動的に承諾</string>
-  <string name="ExperiencePermission16">あなたのアバターを強制的に座らせる</string>
-  <string name="ExperiencePermission17">自然環境の設定を変更する</string>
-  <string name="ExperiencePermissionShortUnknown">が、不明な操作を実行しました：[Permission]</string>
-  <string name="ExperiencePermissionShort1">コントロールする</string>
-  <string name="ExperiencePermissionShort3">アニメーションをトリガー</string>
-  <string name="ExperiencePermissionShort4">取り付ける</string>
-  <string name="ExperiencePermissionShort9">カメラを追跡</string>
-  <string name="ExperiencePermissionShort10">カメラを制御</string>
-  <string name="ExperiencePermissionShort11">テレポート</string>
-  <string name="ExperiencePermissionShort12">権限</string>
-  <string name="ExperiencePermissionShort16">座る</string>
-  <string name="ExperiencePermissionShort17">環境</string>
-
-  <!-- Conversation log messages -->
-  <string name="logging_calls_disabled_log_empty">会話はログに記録されていません。ログの記録を開始するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。</string>
-  <string name="logging_calls_disabled_log_not_empty">これ以上の会話は記録されません。ログの記録を再開するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。</string>
-  <string name="logging_calls_enabled_log_empty">ログイン時の会話はありません。誰かと話した後や、誰かがあなたに話しかけた後に、そのときのログがここに記載されます。</string>
-  <string name="loading_chat_logs">読み込み中…</string>
-
-  <!-- Statistics -->
-  <string name="na">該当なし</string>
-
-  <!-- Presets graphic/camera -->
-  <string name="preset_combo_label">－空のリスト－</string>
-  <string name="Default">デフォルト</string>
-  <string name="none_paren_cap">（なし）</string>
-  <string name="no_limit">無制限</string>
-
-  <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。</string>
-  <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">物理形状に不正な確認データがあります。物理モデルを修正してください。</string>
-  <!-- MAV_BLOCK_MISSING means server didn't get and couldn't substitute physics_convex, high_lod or BoundingVerts-->
-  <string name="Mav_Details_MAV_BLOCK_MISSING">データがありません。高ＬＯＤが存在し、有効であることを確認してください。設定されていない場合は、物理モデルを設定します。</string>
-  <string name="Mav_Details_MAV_UNKNOWN_VERSION">物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。</string>
-
-  <!-- CURL error messages -->
-  <string name="couldnt_resolve_host">DNSがホスト名 ([HOSTNAME]) を解決できませんでした。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]へご連絡ください。
+	</string>
+	<string name="5 O'Clock Shadow">
+		うっすらとしたヒゲ
+	</string>
+	<string name="All White">
+		真っ白
+	</string>
+	<string name="Anime Eyes">
+		アニメ風の目
+	</string>
+	<string name="Arced">
+		アーチ
+	</string>
+	<string name="Arm Length">
+		腕の長さ
+	</string>
+	<string name="Attached">
+		小
+	</string>
+	<string name="Attached Earlobes">
+		耳たぶ
+	</string>
+	<string name="Back Fringe">
+		後ろ髪の毛先
+	</string>
+	<string name="Baggy">
+		たるんだ下まぶた
+	</string>
+	<string name="Bangs">
+		前髪
+	</string>
+	<string name="Beady Eyes">
+		ビーズのような目
+	</string>
+	<string name="Belly Size">
+		お腹の大きさ
+	</string>
+	<string name="Big">
+		大
+	</string>
+	<string name="Big Butt">
+		大
+	</string>
+	<string name="Big Hair Back">
+		髪の大部分：後ろ
+	</string>
+	<string name="Big Hair Front">
+		髪の大部分：前
+	</string>
+	<string name="Big Hair Top">
+		髪の大部分：上部
+	</string>
+	<string name="Big Head">
+		大
+	</string>
+	<string name="Big Pectorals">
+		大
+	</string>
+	<string name="Big Spikes">
+		とげあり
+	</string>
+	<string name="Black">
+		黒
+	</string>
+	<string name="Blonde">
+		ブロンド
+	</string>
+	<string name="Blonde Hair">
+		ブロンドの髪
+	</string>
+	<string name="Blush">
+		チーク
+	</string>
+	<string name="Blush Color">
+		チークカラー
+	</string>
+	<string name="Blush Opacity">
+		チークの濃さ
+	</string>
+	<string name="Body Definition">
+		体の精細度
+	</string>
+	<string name="Body Fat">
+		体脂肪
+	</string>
+	<string name="Body Freckles">
+		体のしみ・そばかす
+	</string>
+	<string name="Body Thick">
+		骨太
+	</string>
+	<string name="Body Thickness">
+		体の厚み
+	</string>
+	<string name="Body Thin">
+		細め
+	</string>
+	<string name="Bow Legged">
+		股
+	</string>
+	<string name="Breast Buoyancy">
+		胸の重力
+	</string>
+	<string name="Breast Cleavage">
+		胸の谷間
+	</string>
+	<string name="Breast Size">
+		胸の大きさ
+	</string>
+	<string name="Bridge Width">
+		両目の間の幅
+	</string>
+	<string name="Broad">
+		広
+	</string>
+	<string name="Brow Size">
+		眉毛上の隆起
+	</string>
+	<string name="Bug Eyes">
+		Bug Eyes
+	</string>
+	<string name="Bugged Eyes">
+		突き出た目
+	</string>
+	<string name="Bulbous">
+		だんご
+	</string>
+	<string name="Bulbous Nose">
+		だんご鼻
+	</string>
+	<string name="Breast Physics Mass">
+		胸の豊かさ
+	</string>
+	<string name="Breast Physics Smoothing">
+		胸の平滑化
+	</string>
+	<string name="Breast Physics Gravity">
+		胸の垂れ具合
+	</string>
+	<string name="Breast Physics Drag">
+		胸の空気抵抗
+	</string>
+	<string name="Breast Physics InOut Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Breast Physics InOut Spring">
+		振動速度
+	</string>
+	<string name="Breast Physics InOut Gain">
+		増加率
+	</string>
+	<string name="Breast Physics InOut Damping">
+		減衰
+	</string>
+	<string name="Breast Physics UpDown Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Breast Physics UpDown Spring">
+		振動速度
+	</string>
+	<string name="Breast Physics UpDown Gain">
+		増加率
+	</string>
+	<string name="Breast Physics UpDown Damping">
+		減衰
+	</string>
+	<string name="Breast Physics LeftRight Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Breast Physics LeftRight Spring">
+		振動速度
+	</string>
+	<string name="Breast Physics LeftRight Gain">
+		増加率
+	</string>
+	<string name="Breast Physics LeftRight Damping">
+		減衰
+	</string>
+	<string name="Belly Physics Mass">
+		お腹の豊かさ
+	</string>
+	<string name="Belly Physics Smoothing">
+		お腹の平滑化
+	</string>
+	<string name="Belly Physics Gravity">
+		お腹の垂れ具合
+	</string>
+	<string name="Belly Physics Drag">
+		お腹の空気抵抗
+	</string>
+	<string name="Belly Physics UpDown Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Belly Physics UpDown Spring">
+		振動速度
+	</string>
+	<string name="Belly Physics UpDown Gain">
+		増加率
+	</string>
+	<string name="Belly Physics UpDown Damping">
+		減衰
+	</string>
+	<string name="Butt Physics Mass">
+		お尻の豊かさ
+	</string>
+	<string name="Butt Physics Smoothing">
+		お尻の平滑化
+	</string>
+	<string name="Butt Physics Gravity">
+		お尻の垂れ具合
+	</string>
+	<string name="Butt Physics Drag">
+		お尻の空気抵抗
+	</string>
+	<string name="Butt Physics UpDown Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Butt Physics UpDown Spring">
+		振動速度
+	</string>
+	<string name="Butt Physics UpDown Gain">
+		増加率
+	</string>
+	<string name="Butt Physics UpDown Damping">
+		減衰
+	</string>
+	<string name="Butt Physics LeftRight Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Butt Physics LeftRight Spring">
+		振動速度
+	</string>
+	<string name="Butt Physics LeftRight Gain">
+		増加率
+	</string>
+	<string name="Butt Physics LeftRight Damping">
+		減衰
+	</string>
+	<string name="Bushy Eyebrows">
+		太
+	</string>
+	<string name="Bushy Hair">
+		ぼさぼさヘア
+	</string>
+	<string name="Butt Size">
+		お尻の大きさ
+	</string>
+	<string name="Butt Gravity">
+		お尻の垂れ具合
+	</string>
+	<string name="bustle skirt">
+		後ろの膨らみ
+	</string>
+	<string name="no bustle">
+		膨らみなし
+	</string>
+	<string name="more bustle">
+		膨らみ大
+	</string>
+	<string name="Chaplin">
+		チャップリン
+	</string>
+	<string name="Cheek Bones">
+		ほお骨
+	</string>
+	<string name="Chest Size">
+		胸部の大きさ
+	</string>
+	<string name="Chin Angle">
+		あごの角度
+	</string>
+	<string name="Chin Cleft">
+		あごの先の割れ
+	</string>
+	<string name="Chin Curtains">
+		あごに沿ったひげ
+	</string>
+	<string name="Chin Depth">
+		あごの長さ
+	</string>
+	<string name="Chin Heavy">
+		あごを強調
+	</string>
+	<string name="Chin In">
+		ひいたあご
+	</string>
+	<string name="Chin Out">
+		突き出たあご
+	</string>
+	<string name="Chin-Neck">
+		あごと首
+	</string>
+	<string name="Clear">
+		クリア
+	</string>
+	<string name="Cleft">
+		割れた
+	</string>
+	<string name="Close Set Eyes">
+		顔の中心寄りの目
+	</string>
+	<string name="Closed">
+		クローズ
+	</string>
+	<string name="Closed Back">
+		後ろとじ
+	</string>
+	<string name="Closed Front">
+		前とじ
+	</string>
+	<string name="Closed Left">
+		左とじ
+	</string>
+	<string name="Closed Right">
+		右とじ
+	</string>
+	<string name="Coin Purse">
+		コイン入れ
+	</string>
+	<string name="Collar Back">
+		後ろえり
+	</string>
+	<string name="Collar Front">
+		前えり
+	</string>
+	<string name="Corner Down">
+		ダウン
+	</string>
+	<string name="Corner Up">
+		アップ
+	</string>
+	<string name="Creased">
+		重いまぶた
+	</string>
+	<string name="Crooked Nose">
+		曲がった鼻
+	</string>
+	<string name="Cuff Flare">
+		袖口のフレア
+	</string>
+	<string name="Dark">
+		ダーク
+	</string>
+	<string name="Dark Green">
+		ダークグリーン
+	</string>
+	<string name="Darker">
+		ダーク
+	</string>
+	<string name="Deep">
+		尖った
+	</string>
+	<string name="Default Heels">
+		デフォルトのかかと
+	</string>
+	<string name="Dense">
+		濃
+	</string>
+	<string name="Double Chin">
+		二重あご
+	</string>
+	<string name="Downturned">
+		下向き
+	</string>
+	<string name="Duffle Bag">
+		ダッフルバッグ
+	</string>
+	<string name="Ear Angle">
+		耳の角度
+	</string>
+	<string name="Ear Size">
+		耳の大きさ
+	</string>
+	<string name="Ear Tips">
+		耳の先
+	</string>
+	<string name="Egg Head">
+		たまご頭
+	</string>
+	<string name="Eye Bags">
+		下まぶた
+	</string>
+	<string name="Eye Color">
+		瞳の色
+	</string>
+	<string name="Eye Depth">
+		目のくぼみ
+	</string>
+	<string name="Eye Lightness">
+		瞳の明るさ
+	</string>
+	<string name="Eye Opening">
+		見開き具合
+	</string>
+	<string name="Eye Pop">
+		両目の大きさの対称
+	</string>
+	<string name="Eye Size">
+		目の大きさ
+	</string>
+	<string name="Eye Spacing">
+		目と目のあいだの幅
+	</string>
+	<string name="Eyebrow Arc">
+		眉毛のアーチ
+	</string>
+	<string name="Eyebrow Density">
+		眉毛の密集度
+	</string>
+	<string name="Eyebrow Height">
+		眉毛の高さ
+	</string>
+	<string name="Eyebrow Points">
+		眉毛の角
+	</string>
+	<string name="Eyebrow Size">
+		眉毛の大きさ
+	</string>
+	<string name="Eyelash Length">
+		まつげの長さ
+	</string>
+	<string name="Eyeliner">
+		アイライナー
+	</string>
+	<string name="Eyeliner Color">
+		アイライナーの色
+	</string>
+	<string name="Eyes Bugged">
+		下まぶたがたるんだ目
+	</string>
+	<string name="Face Shear">
+		顔のゆがみ
+	</string>
+	<string name="Facial Definition">
+		顔の精細度
+	</string>
+	<string name="Far Set Eyes">
+		離れた目
+	</string>
+	<string name="Fat Lips">
+		大
+	</string>
+	<string name="Female">
+		女性
+	</string>
+	<string name="Fingerless">
+		指なし
+	</string>
+	<string name="Fingers">
+		指あり
+	</string>
+	<string name="Flared Cuffs">
+		広がった袖口
+	</string>
+	<string name="Flat">
+		平ら
+	</string>
+	<string name="Flat Butt">
+		小
+	</string>
+	<string name="Flat Head">
+		絶壁頭
+	</string>
+	<string name="Flat Toe">
+		フラット
+	</string>
+	<string name="Foot Size">
+		足の大きさ
+	</string>
+	<string name="Forehead Angle">
+		ひたいの角度
+	</string>
+	<string name="Forehead Heavy">
+		ひたいを強調
+	</string>
+	<string name="Freckles">
+		しみ・そばかす
+	</string>
+	<string name="Front Fringe">
+		前髪の毛先
+	</string>
+	<string name="Full Back">
+		刈られていない髪
+	</string>
+	<string name="Full Eyeliner">
+		あり
+	</string>
+	<string name="Full Front">
+		刈られていない髪
+	</string>
+	<string name="Full Hair Sides">
+		サイドの髪
+	</string>
+	<string name="Full Sides">
+		生え揃ったサイド
+	</string>
+	<string name="Glossy">
+		あり
+	</string>
+	<string name="Glove Fingers">
+		手袋の指
+	</string>
+	<string name="Glove Length">
+		手袋の長さ
+	</string>
+	<string name="Hair">
+		髪
+	</string>
+	<string name="Hair Back">
+		髪：後ろ
+	</string>
+	<string name="Hair Front">
+		髪：前
+	</string>
+	<string name="Hair Sides">
+		髪：サイド
+	</string>
+	<string name="Hair Sweep">
+		流す
+	</string>
+	<string name="Hair Thickess">
+		髪の量
+	</string>
+	<string name="Hair Thickness">
+		髪の量
+	</string>
+	<string name="Hair Tilt">
+		髪の向き
+	</string>
+	<string name="Hair Tilted Left">
+		左向き
+	</string>
+	<string name="Hair Tilted Right">
+		右向き
+	</string>
+	<string name="Hair Volume">
+		髪：ボリューム
+	</string>
+	<string name="Hand Size">
+		手の大きさ
+	</string>
+	<string name="Handlebars">
+		ハンドルバー
+	</string>
+	<string name="Head Length">
+		頭の長さ
+	</string>
+	<string name="Head Shape">
+		頭の形
+	</string>
+	<string name="Head Size">
+		頭の大きさ
+	</string>
+	<string name="Head Stretch">
+		縦横の長さ
+	</string>
+	<string name="Heel Height">
+		ヒールの高さ
+	</string>
+	<string name="Heel Shape">
+		ヒールの形
+	</string>
+	<string name="Height">
+		身長
+	</string>
+	<string name="High">
+		高
+	</string>
+	<string name="High Heels">
+		ハイヒール
+	</string>
+	<string name="High Jaw">
+		高
+	</string>
+	<string name="High Platforms">
+		厚底
+	</string>
+	<string name="High and Tight">
+		高めでタイト
+	</string>
+	<string name="Higher">
+		高
+	</string>
+	<string name="Hip Length">
+		腰の長さ
+	</string>
+	<string name="Hip Width">
+		腰の幅
+	</string>
+	<string name="Hover">
+		ホバー
+	</string>
+	<string name="In">
+		内向き
+	</string>
+	<string name="In Shdw Color">
+		内側のシャドウカラー
+	</string>
+	<string name="In Shdw Opacity">
+		内側のシャドウの濃さ
+	</string>
+	<string name="Inner Eye Corner">
+		目頭
+	</string>
+	<string name="Inner Eye Shadow">
+		内側のアイシャドウ
+	</string>
+	<string name="Inner Shadow">
+		内側のシャドウ
+	</string>
+	<string name="Jacket Length">
+		ジャケット丈
+	</string>
+	<string name="Jacket Wrinkles">
+		ジャケットのしわ
+	</string>
+	<string name="Jaw Angle">
+		あごの角度
+	</string>
+	<string name="Jaw Jut">
+		あごの突出
+	</string>
+	<string name="Jaw Shape">
+		あごの形
+	</string>
+	<string name="Join">
+		寄せた胸
+	</string>
+	<string name="Jowls">
+		えら
+	</string>
+	<string name="Knee Angle">
+		膝の角度
+	</string>
+	<string name="Knock Kneed">
+		内股
+	</string>
+	<string name="Large">
+		大
+	</string>
+	<string name="Large Hands">
+		大
+	</string>
+	<string name="Left Part">
+		左分け
+	</string>
+	<string name="Leg Length">
+		脚の長さ
+	</string>
+	<string name="Leg Muscles">
+		脚の筋肉
+	</string>
+	<string name="Less">
+		小
+	</string>
+	<string name="Less Body Fat">
+		少なめ
+	</string>
+	<string name="Less Curtains">
+		少なめ
+	</string>
+	<string name="Less Freckles">
+		少なめ
+	</string>
+	<string name="Less Full">
+		薄い
+	</string>
+	<string name="Less Gravity">
+		少
+	</string>
+	<string name="Less Love">
+		少
+	</string>
+	<string name="Less Muscles">
+		少なめ
+	</string>
+	<string name="Less Muscular">
+		少なめ
+	</string>
+	<string name="Less Rosy">
+		少な目
+	</string>
+	<string name="Less Round">
+		丸み少な目
+	</string>
+	<string name="Less Saddle">
+		小
+	</string>
+	<string name="Less Square">
+		小
+	</string>
+	<string name="Less Volume">
+		ボリューム少な目
+	</string>
+	<string name="Less soul">
+		小
+	</string>
+	<string name="Lighter">
+		ライト
+	</string>
+	<string name="Lip Cleft">
+		唇の山
+	</string>
+	<string name="Lip Cleft Depth">
+		唇の山の高さ
+	</string>
+	<string name="Lip Fullness">
+		唇の厚み
+	</string>
+	<string name="Lip Pinkness">
+		唇の赤み
+	</string>
+	<string name="Lip Ratio">
+		上下唇の大きさ
+	</string>
+	<string name="Lip Thickness">
+		唇の前後幅
+	</string>
+	<string name="Lip Width">
+		口の大きさ
+	</string>
+	<string name="Lipgloss">
+		リップグロス
+	</string>
+	<string name="Lipstick">
+		口紅
+	</string>
+	<string name="Lipstick Color">
+		口紅の色
+	</string>
+	<string name="Long">
+		ロング
+	</string>
+	<string name="Long Head">
+		前後幅が広い頭
+	</string>
+	<string name="Long Hips">
+		長
+	</string>
+	<string name="Long Legs">
+		長
+	</string>
+	<string name="Long Neck">
+		長
+	</string>
+	<string name="Long Pigtails">
+		長
+	</string>
+	<string name="Long Ponytail">
+		長
+	</string>
+	<string name="Long Torso">
+		長
+	</string>
+	<string name="Long arms">
+		長
+	</string>
+	<string name="Loose Pants">
+		ゆったり
+	</string>
+	<string name="Loose Shirt">
+		ゆるめ
+	</string>
+	<string name="Loose Sleeves">
+		ゆるめ
+	</string>
+	<string name="Love Handles">
+		ウエスト周り
+	</string>
+	<string name="Low">
+		低
+	</string>
+	<string name="Low Heels">
+		ローヒール
+	</string>
+	<string name="Low Jaw">
+		低
+	</string>
+	<string name="Low Platforms">
+		低め
+	</string>
+	<string name="Low and Loose">
+		低めでゆったり
+	</string>
+	<string name="Lower">
+		低
+	</string>
+	<string name="Lower Bridge">
+		鼻筋
+	</string>
+	<string name="Lower Cheeks">
+		ほおの下部
+	</string>
+	<string name="Male">
+		男性
+	</string>
+	<string name="Middle Part">
+		真ん中分け
+	</string>
+	<string name="More">
+		大
+	</string>
+	<string name="More Blush">
+		きつめ
+	</string>
+	<string name="More Body Fat">
+		多め
+	</string>
+	<string name="More Curtains">
+		多め
+	</string>
+	<string name="More Eyeshadow">
+		あり
+	</string>
+	<string name="More Freckles">
+		多め
+	</string>
+	<string name="More Full">
+		厚い
+	</string>
+	<string name="More Gravity">
+		大
+	</string>
+	<string name="More Lipstick">
+		あり
+	</string>
+	<string name="More Love">
+		大
+	</string>
+	<string name="More Lower Lip">
+		大
+	</string>
+	<string name="More Muscles">
+		多め
+	</string>
+	<string name="More Muscular">
+		筋骨隆々
+	</string>
+	<string name="More Rosy">
+		多め
+	</string>
+	<string name="More Round">
+		まる
+	</string>
+	<string name="More Saddle">
+		大
+	</string>
+	<string name="More Sloped">
+		なだらか
+	</string>
+	<string name="More Square">
+		四角
+	</string>
+	<string name="More Upper Lip">
+		大
+	</string>
+	<string name="More Vertical">
+		垂直
+	</string>
+	<string name="More Volume">
+		大
+	</string>
+	<string name="More soul">
+		大
+	</string>
+	<string name="Moustache">
+		口ひげ
+	</string>
+	<string name="Mouth Corner">
+		口角
+	</string>
+	<string name="Mouth Position">
+		口の位置
+	</string>
+	<string name="Mowhawk">
+		モヒカン
+	</string>
+	<string name="Muscular">
+		筋骨隆々
+	</string>
+	<string name="Mutton Chops">
+		マトンチョップス
+	</string>
+	<string name="Nail Polish">
+		マニキュア
+	</string>
+	<string name="Nail Polish Color">
+		マニキュアの色
+	</string>
+	<string name="Narrow">
+		狭
+	</string>
+	<string name="Narrow Back">
+		狭
+	</string>
+	<string name="Narrow Front">
+		狭
+	</string>
+	<string name="Narrow Lips">
+		おちょぼ口
+	</string>
+	<string name="Natural">
+		ナチュラル
+	</string>
+	<string name="Neck Length">
+		首の長さ
+	</string>
+	<string name="Neck Thickness">
+		首の太さ
+	</string>
+	<string name="No Blush">
+		なし
+	</string>
+	<string name="No Eyeliner">
+		なし
+	</string>
+	<string name="No Eyeshadow">
+		なし
+	</string>
+	<string name="No Lipgloss">
+		なし
+	</string>
+	<string name="No Lipstick">
+		なし
+	</string>
+	<string name="No Part">
+		なし
+	</string>
+	<string name="No Polish">
+		なし
+	</string>
+	<string name="No Red">
+		なし
+	</string>
+	<string name="No Spikes">
+		なし
+	</string>
+	<string name="No White">
+		なし
+	</string>
+	<string name="No Wrinkles">
+		なし
+	</string>
+	<string name="Normal Lower">
+		下
+	</string>
+	<string name="Normal Upper">
+		上
+	</string>
+	<string name="Nose Left">
+		左曲がり
+	</string>
+	<string name="Nose Right">
+		右曲がり
+	</string>
+	<string name="Nose Size">
+		鼻の大きさ
+	</string>
+	<string name="Nose Thickness">
+		鼻の厚み
+	</string>
+	<string name="Nose Tip Angle">
+		鼻先の角度
+	</string>
+	<string name="Nose Tip Shape">
+		鼻先の形
+	</string>
+	<string name="Nose Width">
+		鼻の幅
+	</string>
+	<string name="Nostril Division">
+		鼻の穴の高さ
+	</string>
+	<string name="Nostril Width">
+		鼻の穴の幅
+	</string>
+	<string name="Opaque">
+		濃いめ
+	</string>
+	<string name="Open">
+		オープン
+	</string>
+	<string name="Open Back">
+		後ろあき
+	</string>
+	<string name="Open Front">
+		前あき
+	</string>
+	<string name="Open Left">
+		左あき
+	</string>
+	<string name="Open Right">
+		右あき
+	</string>
+	<string name="Orange">
+		オレンジ
+	</string>
+	<string name="Out">
+		外向き
+	</string>
+	<string name="Out Shdw Color">
+		外側のシャドウカラー
+	</string>
+	<string name="Out Shdw Opacity">
+		外側のシャドウの濃さ
+	</string>
+	<string name="Outer Eye Corner">
+		目尻
+	</string>
+	<string name="Outer Eye Shadow">
+		外側のアイシャドウ
+	</string>
+	<string name="Outer Shadow">
+		外側のシャドウ
+	</string>
+	<string name="Overbite">
+		出っ歯
+	</string>
+	<string name="Package">
+		パッケージ
+	</string>
+	<string name="Painted Nails">
+		あり
+	</string>
+	<string name="Pale">
+		悪い
+	</string>
+	<string name="Pants Crotch">
+		ズボンの股
+	</string>
+	<string name="Pants Fit">
+		ズボンのフィット感
+	</string>
+	<string name="Pants Length">
+		ズボン丈
+	</string>
+	<string name="Pants Waist">
+		ウエスト
+	</string>
+	<string name="Pants Wrinkles">
+		ズボンのしわ
+	</string>
+	<string name="Part">
+		あり
+	</string>
+	<string name="Part Bangs">
+		分けた前髪
+	</string>
+	<string name="Pectorals">
+		胸筋
+	</string>
+	<string name="Pigment">
+		色素
+	</string>
+	<string name="Pigtails">
+		下げ髪
+	</string>
+	<string name="Pink">
+		ピンク
+	</string>
+	<string name="Pinker">
+		ピンク
+	</string>
+	<string name="Platform Height">
+		靴底の高さ
+	</string>
+	<string name="Platform Width">
+		靴底の幅
+	</string>
+	<string name="Pointy">
+		尖った
+	</string>
+	<string name="Pointy Heels">
+		幅狭
+	</string>
+	<string name="Ponytail">
+		ポニーテール
+	</string>
+	<string name="Poofy Skirt">
+		ふんわり
+	</string>
+	<string name="Pop Left Eye">
+		左目を大きく
+	</string>
+	<string name="Pop Right Eye">
+		右目を大きく
+	</string>
+	<string name="Puffy">
+		ふっくら
+	</string>
+	<string name="Puffy Eyelids">
+		目の周りの膨らみ
+	</string>
+	<string name="Rainbow Color">
+		虹色
+	</string>
+	<string name="Red Hair">
+		赤毛
+	</string>
+	<string name="Regular">
+		均整のとれた
+	</string>
+	<string name="Right Part">
+		右分け
+	</string>
+	<string name="Rosy Complexion">
+		頬紅
+	</string>
+	<string name="Round">
+		まるっこい
+	</string>
+	<string name="Ruddiness">
+		血色
+	</string>
+	<string name="Ruddy">
+		良い
+	</string>
+	<string name="Rumpled Hair">
+		くしゃくしゃヘア
+	</string>
+	<string name="Saddle Bags">
+		腰回りの肉付き
+	</string>
+	<string name="Scrawny Leg">
+		骨張った脚
+	</string>
+	<string name="Separate">
+		離れた胸
+	</string>
+	<string name="Shallow">
+		なだらか
+	</string>
+	<string name="Shear Back">
+		後方を刈る
+	</string>
+	<string name="Shear Face">
+		顔のゆがみ
+	</string>
+	<string name="Shear Front">
+		前方を刈る
+	</string>
+	<string name="Shear Left Up">
+		左半分を上に
+	</string>
+	<string name="Shear Right Up">
+		右半分を上に
+	</string>
+	<string name="Sheared Back">
+		後ろを刈られた髪
+	</string>
+	<string name="Sheared Front">
+		前を刈られた髪
+	</string>
+	<string name="Shift Left">
+		左向き
+	</string>
+	<string name="Shift Mouth">
+		口の向き
+	</string>
+	<string name="Shift Right">
+		右向き
+	</string>
+	<string name="Shirt Bottom">
+		シャツの裾
+	</string>
+	<string name="Shirt Fit">
+		シャツのフィット感
+	</string>
+	<string name="Shirt Wrinkles">
+		シャツのしわ
+	</string>
+	<string name="Shoe Height">
+		靴の長さ
+	</string>
+	<string name="Short">
+		ショート
+	</string>
+	<string name="Short Arms">
+		短
+	</string>
+	<string name="Short Legs">
+		短
+	</string>
+	<string name="Short Neck">
+		短
+	</string>
+	<string name="Short Pigtails">
+		短
+	</string>
+	<string name="Short Ponytail">
+		短
+	</string>
+	<string name="Short Sideburns">
+		短め
+	</string>
+	<string name="Short Torso">
+		短
+	</string>
+	<string name="Short hips">
+		短
+	</string>
+	<string name="Shoulders">
+		肩
+	</string>
+	<string name="Side Fringe">
+		サイドの毛先
+	</string>
+	<string name="Sideburns">
+		もみあげ
+	</string>
+	<string name="Sides Hair">
+		サイドの髪
+	</string>
+	<string name="Sides Hair Down">
+		ダウン
+	</string>
+	<string name="Sides Hair Up">
+		アップ
+	</string>
+	<string name="Skinny Neck">
+		細
+	</string>
+	<string name="Skirt Fit">
+		スカートのフィット感
+	</string>
+	<string name="Skirt Length">
+		スカート丈
+	</string>
+	<string name="Slanted Forehead">
+		傾斜した額
+	</string>
+	<string name="Sleeve Length">
+		袖丈
+	</string>
+	<string name="Sleeve Looseness">
+		袖のフィット感
+	</string>
+	<string name="Slit Back">
+		スリット：後ろ
+	</string>
+	<string name="Slit Front">
+		スリット：前
+	</string>
+	<string name="Slit Left">
+		スリット：左
+	</string>
+	<string name="Slit Right">
+		スリット：右
+	</string>
+	<string name="Small">
+		小
+	</string>
+	<string name="Small Hands">
+		小
+	</string>
+	<string name="Small Head">
+		小
+	</string>
+	<string name="Smooth">
+		滑らか
+	</string>
+	<string name="Smooth Hair">
+		スムーズ
+	</string>
+	<string name="Socks Length">
+		靴下丈
+	</string>
+	<string name="Soulpatch">
+		ソウルパッチ
+	</string>
+	<string name="Sparse">
+		薄
+	</string>
+	<string name="Spiked Hair">
+		とげとげヘア
+	</string>
+	<string name="Square">
+		角張った
+	</string>
+	<string name="Square Toe">
+		スクエアトゥ
+	</string>
+	<string name="Squash Head">
+		カボチャ型
+	</string>
+	<string name="Stretch Head">
+		縦長
+	</string>
+	<string name="Sunken">
+		こけたほお
+	</string>
+	<string name="Sunken Chest">
+		小
+	</string>
+	<string name="Sunken Eyes">
+		くぼんだ目
+	</string>
+	<string name="Sweep Back">
+		後ろへ
+	</string>
+	<string name="Sweep Forward">
+		前へ
+	</string>
+	<string name="Tall">
+		トール
+	</string>
+	<string name="Taper Back">
+		後ろに先細
+	</string>
+	<string name="Taper Front">
+		前に先細
+	</string>
+	<string name="Thick Heels">
+		幅広
+	</string>
+	<string name="Thick Neck">
+		太
+	</string>
+	<string name="Thick Toe">
+		厚め
+	</string>
+	<string name="Thin">
+		薄い
+	</string>
+	<string name="Thin Eyebrows">
+		細
+	</string>
+	<string name="Thin Lips">
+		小
+	</string>
+	<string name="Thin Nose">
+		細い鼻
+	</string>
+	<string name="Tight Chin">
+		ひきしまったあご
+	</string>
+	<string name="Tight Cuffs">
+		タイト
+	</string>
+	<string name="Tight Pants">
+		タイト
+	</string>
+	<string name="Tight Shirt">
+		タイト
+	</string>
+	<string name="Tight Skirt">
+		タイト
+	</string>
+	<string name="Tight Sleeves">
+		タイト
+	</string>
+	<string name="Toe Shape">
+		つま先の形
+	</string>
+	<string name="Toe Thickness">
+		つま先の厚み
+	</string>
+	<string name="Torso Length">
+		上半身の長さ
+	</string>
+	<string name="Torso Muscles">
+		上半身の筋肉
+	</string>
+	<string name="Torso Scrawny">
+		上半身の骨張り
+	</string>
+	<string name="Unattached">
+		大
+	</string>
+	<string name="Uncreased">
+		軽いまぶた
+	</string>
+	<string name="Underbite">
+		受け口
+	</string>
+	<string name="Unnatural">
+		ユニーク
+	</string>
+	<string name="Upper Bridge">
+		両目のあいだ
+	</string>
+	<string name="Upper Cheeks">
+		ほおの上部
+	</string>
+	<string name="Upper Chin Cleft">
+		あご上部の割れ
+	</string>
+	<string name="Upper Eyelid Fold">
+		二重の幅
+	</string>
+	<string name="Upturned">
+		上向き
+	</string>
+	<string name="Very Red">
+		真っ赤
+	</string>
+	<string name="Waist Height">
+		ウエストの高さ
+	</string>
+	<string name="Well-Fed">
+		つまったほお
+	</string>
+	<string name="White Hair">
+		白髪
+	</string>
+	<string name="Wide">
+		広
+	</string>
+	<string name="Wide Back">
+		広
+	</string>
+	<string name="Wide Front">
+		広
+	</string>
+	<string name="Wide Lips">
+		大きい口
+	</string>
+	<string name="Wild">
+		ワイルド
+	</string>
+	<string name="Wrinkles">
+		しわ
+	</string>
+	<string name="LocationCtrlAddLandmarkTooltip">
+		ランドマークに追加
+	</string>
+	<string name="LocationCtrlEditLandmarkTooltip">
+		ランドマークを編集
+	</string>
+	<string name="LocationCtrlInfoBtnTooltip">
+		現在地の詳細を見る
+	</string>
+	<string name="LocationCtrlComboBtnTooltip">
+		ロケーション履歴
+	</string>
+	<string name="LocationCtrlForSaleTooltip">
+		この土地を購入
+	</string>
+	<string name="LocationCtrlVoiceTooltip">
+		ここではボイスを利用できません。
+	</string>
+	<string name="LocationCtrlFlyTooltip">
+		飛行は禁止されています。
+	</string>
+	<string name="LocationCtrlPushTooltip">
+		プッシュ禁止
+	</string>
+	<string name="LocationCtrlBuildTooltip">
+		オブジェクトの制作や落とす事は禁止されています。
+	</string>
+	<string name="LocationCtrlScriptsTooltip">
+		スクリプト不可
+	</string>
+	<string name="LocationCtrlDamageTooltip">
+		体力
+	</string>
+	<string name="LocationCtrlAdultIconTooltip">
+		Adultリージョン
+	</string>
+	<string name="LocationCtrlModerateIconTooltip">
+		Moderateリージョン
+	</string>
+	<string name="LocationCtrlGeneralIconTooltip">
+		Generalリージョン
+	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		リージョン（地域）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		このリージョン（地域）では、動的経路探索が有効になっていません。
+	</string>
+	<string name="UpdaterWindowTitle">
+		[APP_NAME]の更新
+	</string>
+	<string name="UpdaterNowUpdating">
+		只今[APP_NAME]を更新中です…
+	</string>
+	<string name="UpdaterNowInstalling">
+		[APP_NAME]をインストール中です…
+	</string>
+	<string name="UpdaterUpdatingDescriptive">
+		お使いの[APP_NAME]ビューアを最新バージョンに更新しています。数分かかることがありますのでしばらくお待ちください。
+	</string>
+	<string name="UpdaterProgressBarTextWithEllipses">
+		アップデートをダウンロード中です…
+	</string>
+	<string name="UpdaterProgressBarText">
+		更新をダウンロード中…
+	</string>
+	<string name="UpdaterFailDownloadTitle">
+		更新のダウンロードに失敗しました。
+	</string>
+	<string name="UpdaterFailUpdateDescriptive">
+		[APP_NAME]の更新中にエラーが発生しました。www.secondlife.com から最新バージョンをダウンロードしてください。
+	</string>
+	<string name="UpdaterFailInstallTitle">
+		更新のインストールに失敗しました。
+	</string>
+	<string name="UpdaterFailStartTitle">
+		ビューアの起動に失敗しました。
+	</string>
+	<string name="ItemsComingInTooFastFrom">
+		[APP_NAME]：アイテムが[FROM_NAME]から同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。
+	</string>
+	<string name="ItemsComingInTooFast">
+		[APP_NAME]：アイテムが同時にたくさん読み込まれているため、自動プレビューが[TIME]秒間無効となります。
+	</string>
+	<string name="IM_logging_string">
+		－インスタントメッセージの保存開始－
+	</string>
+	<string name="IM_typing_start_string">
+		[NAME]は入力中です…
+	</string>
+	<string name="Unnamed">
+		（名前なし）
+	</string>
+	<string name="IM_moderated_chat_label">
+		（モデレート：デフォルトでボイスはオフ）
+	</string>
+	<string name="IM_unavailable_text_label">
+		このコールでは文字チャットが利用できません。
+	</string>
+	<string name="IM_muted_text_label">
+		グループのモデレータが、あなたの文字チャットを使用禁止にしました。
+	</string>
+	<string name="IM_default_text_label">
+		ここをクリックしてインスタントメッセージを開始。
+	</string>
+	<string name="IM_to_label">
+		宛先
+	</string>
+	<string name="IM_moderator_label">
+		（モデレータ）
+	</string>
+	<string name="Saved_message">
+		（保存日時：[LONG_TIMESTAMP]）
+	</string>
+	<string name="IM_unblock_only_groups_friends">
+		このメッセージを表示するには、「初期設定」の「プライバシー」で「フレンドとグループ以外からはコールとIMを受信しない」チェックボックスをオフにします。
+	</string>
+	<string name="OnlineStatus">
+		オンライン
+	</string>
+	<string name="OfflineStatus">
+		オフライン
+	</string>
+	<string name="not_online_msg">
+		ユーザーがオンラインでありません－メッセージは保存され、後で配信されます。
+	</string>
+	<string name="not_online_inventory">
+		ユーザーがオンラインでありません–インベントリに保存されました。
+	</string>
+	<string name="answered_call">
+		相手がコールを受けました。
+	</string>
+	<string name="you_started_call">
+		ボイスコールを開始します。
+	</string>
+	<string name="you_joined_call">
+		ボイスコールに参加しました。
+	</string>
+	<string name="you_auto_rejected_call-im">
+		「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。
+	</string>
+	<string name="name_started_call">
+		[NAME]はボイスコールを開始します
+	</string>
+	<string name="ringing-im">
+		ボイスコールに参加…
+	</string>
+	<string name="connected-im">
+		接続しました。「通話終了」をクリックして切断します。
+	</string>
+	<string name="hang_up-im">
+		ボイスコールから退席しました
+	</string>
+	<string name="answering-im">
+		接続中…
+	</string>
+	<string name="conference-title">
+		複数人チャット
+	</string>
+	<string name="conference-title-incoming">
+		[AGENT_NAME]と会話する
+	</string>
+	<string name="inventory_item_offered-im">
+		アイテム「[ITEM_NAME]」がインベントリに送られてきました。
+	</string>
+	<string name="inventory_folder_offered-im">
+		フォルダ「[ITEM_NAME]」がインベントリに送られてきました。
+	</string>
+	<string name="share_alert">
+		インベントリからここにアイテムをドラッグします。
+	</string>
+	<string name="no_session_message">
+		（ＩＭセッションが存在しません）
+	</string>
+	<string name="only_user_message">
+		このセッションにいるユーザーはあなただけです。
+	</string>
+	<string name="offline_message">
+		[NAME]はオフライン中です。
+	</string>
+	<string name="invite_message">
+		このボイスチャットに応答・接続する場合は、[BUTTON NAME]をクリックしてください。
+	</string>
+	<string name="muted_message">
+		この住人をブロックしています。メッセージを送ると、ブロックが自動的に解除されます。
+	</string>
+	<string name="generic">
+		リクエスト中にエラーが発生しました。お手数ですが、もう一度やり直してください。
+	</string>
+	<string name="generic_request_error">
+		要求中にエラーが発生しました。お手数ですが、もう一度やり直してください。
+	</string>
+	<string name="insufficient_perms_error">
+		あなたには充分な権限がありません。
+	</string>
+	<string name="session_does_not_exist_error">
+		このセッションは既に切断されています。
+	</string>
+	<string name="no_ability_error">
+		あなたにはその能力がありません。
+	</string>
+	<string name="no_ability">
+		あなたにはその能力がありません。
+	</string>
+	<string name="not_a_mod_error">
+		あなたは、セッションモデレータではありません。
+	</string>
+	<string name="muted">
+		グループのモデレーターが、あなたのテキストチャットを禁止しました。
+	</string>
+	<string name="muted_error">
+		グループモデレータが、あなたのテキストチャットを無効化しました。
+	</string>
+	<string name="add_session_event">
+		[RECIPIENT]とのチャットセッションにユーザーを追加することができません。
+	</string>
+	<string name="message">
+		[RECIPIENT]とのチャットセッションに、メッセージを送信することができません。
+	</string>
+	<string name="message_session_event">
+		[RECIPIENT]とのチャットセッションにメッセージを送ることができません。
+	</string>
+	<string name="mute">
+		モデレート中にエラーが発生しました。
+	</string>
+	<string name="removed">
+		グループから脱退しました。
+	</string>
+	<string name="removed_from_group">
+		あなたは、グループから削除されました。
+	</string>
+	<string name="close_on_no_ability">
+		このチャットセッションを継続することはできません。
+	</string>
+	<string name="unread_chat_single">
+		[SOURCES]は、何か新しいことを言いました。
+	</string>
+	<string name="unread_chat_multiple">
+		[SOURCES]は、何か新しいことを言いました。
+	</string>
+	<string name="session_initialization_timed_out_error">
+		セッションの初期化がタイムアウトしました。
+	</string>
+	<string name="Home position set.">
+		家の配置の設定。
+	</string>
+	<string name="voice_morphing_url">
+		https://secondlife.com/destination/voice-island
+	</string>
+	<string name="premium_voice_morphing_url">
+		https://secondlife.com/destination/voice-morphing-premium
+	</string>
+	<string name="lindenhomes_get_home_url">
+		https://secondlife.com/land/lindenhomes/member.php?lang=ja-JP
+	</string>
+	<string name="lindenhomes_my_home_url">
+		https://land.secondlife.com/ja-JP/lindenhomes/my-home.php
+	</string>
+	<string name="membership_url">
+		https://accounts.secondlife.com/change_membership/?lang=ja-JP
+	</string>
+	<string name="paid_you_ldollars">
+		[NAME]は、[REASON]費用のL$ [AMOUNT]を支払いました。
+	</string>
+	<string name="paid_you_ldollars_gift">
+		[NAME]は、[REASON]費用のL$ [AMOUNT]支払いました。
+	</string>
+	<string name="paid_you_ldollars_no_reason">
+		[NAME]は、L$ [AMOUNT]を支払いました。
+	</string>
+	<string name="you_paid_ldollars">
+		[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。
+	</string>
+	<string name="you_paid_ldollars_gift">
+		[NAME]に[REASON]費用のL$ [AMOUNT]を支払いました。
+	</string>
+	<string name="you_paid_ldollars_no_info">
+		L$ [AMOUNT]を支払いました。
+	</string>
+	<string name="you_paid_ldollars_no_reason">
+		[NAME]にL$ [AMOUNT]を支払いました。
+	</string>
+	<string name="you_paid_ldollars_no_name">
+		[REASON]費用のL$ [AMOUNT]を支払いました。
+	</string>
+	<string name="you_paid_failure_ldollars">
+		[NAME]に[REASON]費用L$ [AMOUNT]を支払えませんでした。
+	</string>
+	<string name="you_paid_failure_ldollars_gift">
+		[NAME]に[REASON]費用のL$ [AMOUNT]を支払えませんでした。
+	</string>
+	<string name="you_paid_failure_ldollars_no_info">
+		L$ [AMOUNT]を支払えませんでした。
+	</string>
+	<string name="you_paid_failure_ldollars_no_reason">
+		[NAME]にL$ [AMOUNT]を支払えませんでした。
+	</string>
+	<string name="you_paid_failure_ldollars_no_name">
+		[REASON]費用L$ [AMOUNT]を支払えませんでした。
+	</string>
+	<string name="for item">
+		[ITEM]
+	</string>
+	<string name="for a parcel of land">
+		土地区画
+	</string>
+	<string name="for a land access pass">
+		土地への入場許可
+	</string>
+	<string name="for deeding land">
+		土地を譲渡
+	</string>
+	<string name="to create a group">
+		グループ作成
+	</string>
+	<string name="to join a group">
+		グループ参加
+	</string>
+	<string name="to upload">
+		アップロード
+	</string>
+	<string name="to publish a classified ad">
+		クラシファイド広告掲載
+	</string>
+	<string name="uploading_costs">
+		アップロード費用はL$ [AMOUNT]です。
+	</string>
+	<string name="this_costs">
+		費用はL$ [AMOUNT]です。
+	</string>
+	<string name="buying_selected_land">
+		選択した土地をL$ [AMOUNT]で購入します。
+	</string>
+	<string name="this_object_costs">
+		このオブジェクトの費用は、L$ [AMOUNT]です。
+	</string>
+	<string name="giving">
+		L$ [AMOUNT]を渡します。
+	</string>
+	<string name="group_role_everyone">
+		全員
+	</string>
+	<string name="group_role_officers">
+		オフィサー
+	</string>
+	<string name="group_role_owners">
+		所有者
+	</string>
+	<string name="group_member_status_online">
+		オンライン
+	</string>
+	<string name="uploading_abuse_report">
+		アップロード中…
+
+嫌がらせの報告
+	</string>
+	<string name="New Shape">
+		新しいシェイプ
+	</string>
+	<string name="New Skin">
+		新しいスキン
+	</string>
+	<string name="New Hair">
+		新しい髪
+	</string>
+	<string name="New Eyes">
+		新しい目
+	</string>
+	<string name="New Shirt">
+		新しいシャツ
+	</string>
+	<string name="New Pants">
+		新しいズボン
+	</string>
+	<string name="New Shoes">
+		新しい靴
+	</string>
+	<string name="New Socks">
+		新しい靴下
+	</string>
+	<string name="New Jacket">
+		新しいジャケット
+	</string>
+	<string name="New Gloves">
+		新しい手袋
+	</string>
+	<string name="New Undershirt">
+		新しい下着（上半身）
+	</string>
+	<string name="New Underpants">
+		新しい下着（下半身）
+	</string>
+	<string name="New Skirt">
+		新しいスカート
+	</string>
+	<string name="New Alpha">
+		新しいアルファ
+	</string>
+	<string name="New Tattoo">
+		新しいタトゥ
+	</string>
+	<string name="New Universal">
+		新しいユニバーサル
+	</string>
+	<string name="New Physics">
+		新規の物理作用
+	</string>
+	<string name="Invalid Wearable">
+		無効な着用物
+	</string>
+	<string name="New Gesture">
+		ジェスチャー
+	</string>
+	<string name="New Script">
+		新規スクリプト
+	</string>
+	<string name="New Note">
+		ノート
+	</string>
+	<string name="New Folder">
+		新規フォルダ
+	</string>
+	<string name="Contents">
+		コンテンツ
+	</string>
+	<string name="Gesture">
+		ジェスチャー
+	</string>
+	<string name="Male Gestures">
+		男性用ジェスチャー
+	</string>
+	<string name="Female Gestures">
+		女性用ジェスチャー
+	</string>
+	<string name="Other Gestures">
+		その他のジェスチャー
+	</string>
+	<string name="Speech Gestures">
+		会話ジェスチャー
+	</string>
+	<string name="Common Gestures">
+		一般的ジェスチャー
+	</string>
+	<string name="Male - Excuse me">
+		男性－すみません
+	</string>
+	<string name="Male - Get lost">
+		男性－あっち行けよ
+	</string>
+	<string name="Male - Blow kiss">
+		男性－投げキッス
+	</string>
+	<string name="Male - Boo">
+		男性－ぶー
+	</string>
+	<string name="Male - Bored">
+		男性－退屈
+	</string>
+	<string name="Male - Hey">
+		男性－–やぁ
+	</string>
+	<string name="Male - Laugh">
+		男性－笑う
+	</string>
+	<string name="Male - Repulsed">
+		男性－拒絶
+	</string>
+	<string name="Male - Shrug">
+		男性－肩をすくめる
+	</string>
+	<string name="Male - Stick tougue out">
+		男性－舌を出す
+	</string>
+	<string name="Male - Wow">
+		男性－わぁ
+	</string>
+	<string name="Female - Chuckle">
+		女性－クスクス
+	</string>
+	<string name="Female - Cry">
+		女性－泣く
+	</string>
+	<string name="Female - Embarrassed">
+		女性－恥ずかしい
+	</string>
+	<string name="Female - Excuse me">
+		女性－すみません
+	</string>
+	<string name="Female - Get lost">
+		女性－あっち行ってよ
+	</string>
+	<string name="Female - Blow kiss">
+		女性–投げキッス
+	</string>
+	<string name="Female - Boo">
+		女性－ぶー
+	</string>
+	<string name="Female - Bored">
+		女性－退屈
+	</string>
+	<string name="Female - Hey">
+		女性－やぁ
+	</string>
+	<string name="Female - Hey baby">
+		女性－ヘイ、ベィビー！
+	</string>
+	<string name="Female - Laugh">
+		女性－笑う
+	</string>
+	<string name="Female - Looking good">
+		女性－いい感じ
+	</string>
+	<string name="Female - Over here">
+		女性－こっちよ
+	</string>
+	<string name="Female - Please">
+		女性－プリーズ
+	</string>
+	<string name="Female - Repulsed">
+		女性－拒絶
+	</string>
+	<string name="Female - Shrug">
+		女性－肩をすくめる
+	</string>
+	<string name="Female - Stick tougue out">
+		女性－舌を出す
+	</string>
+	<string name="Female - Wow">
+		女性－わぁ
+	</string>
+	<string name="New Daycycle">
+		新しいデイサイクル
+	</string>
+	<string name="New Water">
+		新しい水面
+	</string>
+	<string name="New Sky">
+		新しい空
+	</string>
+	<string name="/bow">
+		/おじぎする
+	</string>
+	<string name="/clap">
+		/拍手
+	</string>
+	<string name="/count">
+		/数える
+	</string>
+	<string name="/extinguish">
+		/消す
+	</string>
+	<string name="/kmb">
+		/くそくらえ
+	</string>
+	<string name="/muscle">
+		/筋肉もりもり
+	</string>
+	<string name="/no">
+		/いいえ
+	</string>
+	<string name="/no!">
+		/だめ！
+	</string>
+	<string name="/paper">
+		/パー
+	</string>
+	<string name="/pointme">
+		/自分を指差す
+	</string>
+	<string name="/pointyou">
+		/相手を指差す
+	</string>
+	<string name="/rock">
+		/グー
+	</string>
+	<string name="/scissor">
+		/チョキ
+	</string>
+	<string name="/smoke">
+		/タバコを吸う
+	</string>
+	<string name="/stretch">
+		/伸びをする
+	</string>
+	<string name="/whistle">
+		/口笛を吹く
+	</string>
+	<string name="/yes">
+		/はい
+	</string>
+	<string name="/yes!">
+		/イエス！
+	</string>
+	<string name="afk">
+		一時退席中
+	</string>
+	<string name="dance1">
+		ダンス１
+	</string>
+	<string name="dance2">
+		ダンス２
+	</string>
+	<string name="dance3">
+		ダンス３
+	</string>
+	<string name="dance4">
+		ダンス４
+	</string>
+	<string name="dance5">
+		ダンス５
+	</string>
+	<string name="dance6">
+		ダンス６
+	</string>
+	<string name="dance7">
+		ダンス７
+	</string>
+	<string name="dance8">
+		ダンス８
+	</string>
+	<string name="AvatarBirthDateFormat">
+		[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日
+	</string>
+	<string name="DefaultMimeType">
+		none/none
+	</string>
+	<string name="texture_load_dimensions_error">
+		[WIDTH]✕[HEIGHT]以上の画像は読み込めません。
+	</string>
+	<string name="outfit_photo_load_dimensions_error">
+		アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。画像のサイズを調整するか、別の画像を使用してください。
+	</string>
+	<string name="outfit_photo_select_dimensions_error">
+		アウトフィット画像の最大サイズは、[WIDTH]✕[HEIGHT]です。別のテクスチャを選択してください。
+	</string>
+	<string name="outfit_photo_verify_dimensions_error">
+		画像の寸法を確認できません。画像サイズがピッカーに表示されるまでお待ちください。
+	</string>
+	<string name="sentences_separator" value="　"/>
+	<string name="words_separator" value="、"/>
+	<string name="server_is_down">
+		大変申し訳ございませんが、予期しない問題が発生しました。サービスに関する既知の問題については、 https://status.secondlifegrid.net/?lang=ja-JP をご覧ください。
+問題が引き続き発生する場合は、お使いのネットワークやファイヤーウォールの設定を調べてください。
+	</string>
+	<string name="dateTimeWeekdaysNames">
+		日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日
+	</string>
+	<string name="dateTimeWeekdaysShortNames">
+		日:月:火:水:木:金:土
+	</string>
+	<string name="dateTimeMonthNames">
+		１月:２月:３月:４月:５月:６月:７月:８月:９月:１０月:１１月:１２月
+	</string>
+	<string name="dateTimeMonthShortNames">
+		㋀:㋁:㋂:㋃:㋄:㋅:㋆:㋇:㋈:㋉:㋊:㋋
+	</string>
+	<string name="dateTimeDayFormat">
+		[MDAY]
+	</string>
+	<string name="dateTimeAM">
+		午前
+	</string>
+	<string name="dateTimePM">
+		午後
+	</string>
+	<string name="LocalEstimateUSD">
+		[AMOUNT]米ドル
+	</string>
+	<string name="Group Ban">
+		グループからバン
+	</string>
+	<string name="Membership">
+		会員
+	</string>
+	<string name="Roles">
+		役割
+	</string>
+	<string name="Group Identity">
+		グループの識別情報
+	</string>
+	<string name="Parcel Management">
+		区画の管理
+	</string>
+	<string name="Parcel Identity">
+		区画の識別情報
+	</string>
+	<string name="Parcel Settings">
+		区画の設定
+	</string>
+	<string name="Parcel Powers">
+		区画の権限
+	</string>
+	<string name="Parcel Access">
+		区画へのアクセス
+	</string>
+	<string name="Parcel Content">
+		区画のコンテンツ
+	</string>
+	<string name="Object Management">
+		オブジェクトの管理
+	</string>
+	<string name="Accounting">
+		会計
+	</string>
+	<string name="Notices">
+		通知
+	</string>
+	<string name="Chat" value="チャット：">
+		チャット
+	</string>
+	<string name="BaseMembership">
+		ベース
+	</string>
+	<string name="PremiumMembership">
+		プレミアム
+	</string>
+	<string name="Premium_PlusMembership">
+		プレミアムプラス
+	</string>
+	<string name="InternalMembership">
+		Internal
+	</string>
+	<string name="MembershipUpgradeText">
+		メンバーシッププランの変更…
+	</string>
+	<string name="MembershipPremiumText">
+		プレミアムメンバーシップ
+	</string>
+	<string name="DeleteItems">
+		選択したアイテムを削除しますか？
+	</string>
+	<string name="DeleteItem">
+		選択したアイテムを削除しますか？
+	</string>
+	<string name="EmptyOutfitText">
+		このアウトフィットにはアイテムがありません。
+	</string>
+	<string name="ExternalEditorNotSet">
+		ExternalEditor 設定を使ってエディターを選択します。
+	</string>
+	<string name="ExternalEditorNotFound">
+		指定された外部エディターが見つかりません。
+エディターへのパスを二重引用符で囲んでみてください。（例："/path to my/editor" "%s"）
+	</string>
+	<string name="ExternalEditorCommandParseError">
+		外部エディターのコマンドの解析中にエラーが見つかりました。
+	</string>
+	<string name="ExternalEditorFailedToRun">
+		外部エディターを実行できませんでした。
+	</string>
+	<string name="TranslationFailed">
+		翻訳できませんでした：[REASON]
+	</string>
+	<string name="TranslationResponseParseError">
+		翻訳の応答にエラーが発生しました。
+	</string>
+	<string name="Esc">
+		Esc
+	</string>
+	<string name="Space">
+		Space
+	</string>
+	<string name="Enter">
+		Enter
+	</string>
+	<string name="Tab">
+		Tab
+	</string>
+	<string name="Ins">
+		Ins
+	</string>
+	<string name="Del">
+		Del
+	</string>
+	<string name="Backsp">
+		BackSp
+	</string>
+	<string name="Shift">
+		Shift
+	</string>
+	<string name="Ctrl">
+		Ctrl
+	</string>
+	<string name="Alt">
+		Alt
+	</string>
+	<string name="CapsLock">
+		CapsLock
+	</string>
+	<string name="Left">
+		←
+	</string>
+	<string name="Right">
+		→
+	</string>
+	<string name="Up">
+		↑
+	</string>
+	<string name="Down">
+		↓
+	</string>
+	<string name="Home">
+		Home
+	</string>
+	<string name="End">
+		End
+	</string>
+	<string name="PgUp">
+		PgUp
+	</string>
+	<string name="PgDn">
+		PgDn
+	</string>
+	<string name="F1">
+		F1
+	</string>
+	<string name="F2">
+		F2
+	</string>
+	<string name="F3">
+		F3
+	</string>
+	<string name="F4">
+		F4
+	</string>
+	<string name="F5">
+		F5
+	</string>
+	<string name="F6">
+		F6
+	</string>
+	<string name="F7">
+		F7
+	</string>
+	<string name="F8">
+		F8
+	</string>
+	<string name="F9">
+		F9
+	</string>
+	<string name="F10">
+		F10
+	</string>
+	<string name="F11">
+		F11
+	</string>
+	<string name="F12">
+		F12
+	</string>
+	<string name="Add">
+		追加
+	</string>
+	<string name="Subtract">
+		減算
+	</string>
+	<string name="Multiply">
+		乗算
+	</string>
+	<string name="Divide">
+		除算
+	</string>
+	<string name="PAD_DIVIDE">
+		PAD_DIVIDE
+	</string>
+	<string name="PAD_LEFT">
+		PAD_LEFT
+	</string>
+	<string name="PAD_RIGHT">
+		PAD_RIGHT
+	</string>
+	<string name="PAD_DOWN">
+		PAD_DOWN
+	</string>
+	<string name="PAD_UP">
+		PAD_UP
+	</string>
+	<string name="PAD_HOME">
+		PAD_HOME
+	</string>
+	<string name="PAD_END">
+		PAD_END
+	</string>
+	<string name="PAD_PGUP">
+		PAD_PGUP
+	</string>
+	<string name="PAD_PGDN">
+		PAD_PGDN
+	</string>
+	<string name="PAD_CENTER">
+		PAD_CENTER
+	</string>
+	<string name="PAD_INS">
+		PAD_INS
+	</string>
+	<string name="PAD_DEL">
+		PAD_DEL
+	</string>
+	<string name="PAD_Enter">
+		PAD_Enter
+	</string>
+	<string name="PAD_BUTTON0">
+		PAD_BUTTON0
+	</string>
+	<string name="PAD_BUTTON1">
+		PAD_BUTTON1
+	</string>
+	<string name="PAD_BUTTON2">
+		PAD_BUTTON2
+	</string>
+	<string name="PAD_BUTTON3">
+		PAD_BUTTON3
+	</string>
+	<string name="PAD_BUTTON4">
+		PAD_BUTTON4
+	</string>
+	<string name="PAD_BUTTON5">
+		PAD_BUTTON5
+	</string>
+	<string name="PAD_BUTTON6">
+		PAD_BUTTON6
+	</string>
+	<string name="PAD_BUTTON7">
+		PAD_BUTTON7
+	</string>
+	<string name="PAD_BUTTON8">
+		PAD_BUTTON8
+	</string>
+	<string name="PAD_BUTTON9">
+		PAD_BUTTON9
+	</string>
+	<string name="PAD_BUTTON10">
+		PAD_BUTTON10
+	</string>
+	<string name="PAD_BUTTON11">
+		PAD_BUTTON11
+	</string>
+	<string name="PAD_BUTTON12">
+		PAD_BUTTON12
+	</string>
+	<string name="PAD_BUTTON13">
+		PAD_BUTTON13
+	</string>
+	<string name="PAD_BUTTON14">
+		PAD_BUTTON14
+	</string>
+	<string name="PAD_BUTTON15">
+		PAD_BUTTON15
+	</string>
+	<string name="-">
+		-
+	</string>
+	<string name="=">
+		=
+	</string>
+	<string name="`">
+		`
+	</string>
+	<string name=";">
+		;
+	</string>
+	<string name="[">
+		[
+	</string>
+	<string name="]">
+		]
+	</string>
+	<string name="\">
+		\
+	</string>
+	<string name="0">
+		0
+	</string>
+	<string name="1">
+		1
+	</string>
+	<string name="2">
+		2
+	</string>
+	<string name="3">
+		3
+	</string>
+	<string name="4">
+		4
+	</string>
+	<string name="5">
+		5
+	</string>
+	<string name="6">
+		6
+	</string>
+	<string name="7">
+		7
+	</string>
+	<string name="8">
+		8
+	</string>
+	<string name="9">
+		9
+	</string>
+	<string name="A">
+		A
+	</string>
+	<string name="B">
+		B
+	</string>
+	<string name="C">
+		C
+	</string>
+	<string name="D">
+		D
+	</string>
+	<string name="E">
+		E
+	</string>
+	<string name="F">
+		F
+	</string>
+	<string name="G">
+		G
+	</string>
+	<string name="H">
+		H
+	</string>
+	<string name="I">
+		I
+	</string>
+	<string name="J">
+		J
+	</string>
+	<string name="K">
+		K
+	</string>
+	<string name="L">
+		L
+	</string>
+	<string name="M">
+		M
+	</string>
+	<string name="N">
+		N
+	</string>
+	<string name="O">
+		O
+	</string>
+	<string name="P">
+		P
+	</string>
+	<string name="Q">
+		Q
+	</string>
+	<string name="R">
+		R
+	</string>
+	<string name="S">
+		S
+	</string>
+	<string name="T">
+		T
+	</string>
+	<string name="U">
+		U
+	</string>
+	<string name="V">
+		V
+	</string>
+	<string name="W">
+		W
+	</string>
+	<string name="X">
+		X
+	</string>
+	<string name="Y">
+		Y
+	</string>
+	<string name="Z">
+		Z
+	</string>
+	<string name="LMB">
+		左クリック
+	</string>
+	<string name="MMB">
+		ホイールクリック
+	</string>
+	<string name="RMB">
+		右クリック
+	</string>
+	<string name="MB4">
+		進むボタン
+	</string>
+	<string name="MB5">
+		戻るボタン
+	</string>
+	<string name="Double LMB">
+		左ダブルクリック
+	</string>
+	<string name="BeaconParticle">
+		パーティクル源ビーコン（青）を表示中
+	</string>
+	<string name="BeaconPhysical">
+		物理的オブジェクトのビーコン（緑）を表示中
+	</string>
+	<string name="BeaconScripted">
+		スクリプトのオブジェクトのビーコン（赤）を表示中
+	</string>
+	<string name="BeaconScriptedTouch">
+		タッチ機能のビーコンが付いたスクリプトのオブジェクト（赤）を表示中
+	</string>
+	<string name="BeaconSound">
+		サウンドビーコン（黄）を表示中
+	</string>
+	<string name="BeaconMedia">
+		メディアビーコン（白）を表示中
+	</string>
+	<string name="BeaconSun">
+		太陽の方角ビーコン（オレンジ）を表示中
+	</string>
+	<string name="BeaconMoon">
+		月の方角ビーコン（紫）を表示中
+	</string>
+	<string name="ParticleHiding">
+		パーティクルを非表示
+	</string>
+	<string name="Command_360_Capture_Label">
+		３６０度Ｓショット
+	</string>
+	<string name="Command_AboutLand_Label">
+		土地情報
+	</string>
+	<string name="Command_Appearance_Label">
+		アウトフィット
+	</string>
+	<string name="Command_Avatar_Label">
+		アバター一式
+	</string>
+	<string name="Command_Build_Label">
+		制作
+	</string>
+	<string name="Command_Chat_Label">
+		チャット
+	</string>
+	<string name="Command_Conversations_Label">
+		会話
+	</string>
+	<string name="Command_Compass_Label">
+		コンパス
+	</string>
+	<string name="Command_Destinations_Label">
+		行き先
+	</string>
+	<string name="Command_Environments_Label">
+		環境
+	</string>
+	<string name="Command_Gestures_Label">
+		ジェスチャー
+	</string>
+	<string name="Command_Grid_Status_Label">
+		グリッド状況
+	</string>
+	<string name="Command_HowTo_Label">
+		ハウツー
+	</string>
+	<string name="Command_Inventory_Label">
+		インベントリ
+	</string>
+	<string name="Command_Map_Label">
+		マップ
+	</string>
+	<string name="Command_Marketplace_Label">
+		マーケットプレイス
+	</string>
+	<string name="Command_MarketplaceListings_Label">
+		マーケットプレイス
+	</string>
+	<string name="Command_MiniMap_Label">
+		ミニマップ
+	</string>
+	<string name="Command_Move_Label">
+		歩行／走行／飛行
+	</string>
+	<string name="Command_People_Label">
+		人物
+	</string>
+	<string name="Command_Picks_Label">
+		ピック
+	</string>
+	<string name="Command_Places_Label">
+		場所
+	</string>
+	<string name="Command_Preferences_Label">
+		初期設定
+	</string>
+	<string name="Command_Profile_Label">
+		プロフィール
+	</string>
+	<string name="Command_Report_Abuse_Label">
+		嫌がらせの報告
+	</string>
+	<string name="Command_Search_Label">
+		検索
+	</string>
+	<string name="Command_Snapshot_Label">
+		スナップショット
+	</string>
+	<string name="Command_Speak_Label">
+		ボイスチャット
+	</string>
+	<string name="Command_View_Label">
+		カメラ操作
+	</string>
+	<string name="Command_Voice_Label">
+		ボイス設定
+	</string>
+	<string name="Command_360_Capture_Tooltip">
+		３６０度の正距円筒図法のスナップショット画像を撮影します。
+	</string>
+	<string name="Command_AboutLand_Tooltip">
+		訪問先に関する情報を表示します。
+	</string>
+	<string name="Command_Appearance_Tooltip">
+		アバターの外観を変更します。
+	</string>
+	<string name="Command_Avatar_Tooltip">
+		アバター一式を選択します。
+	</string>
+	<string name="Command_Build_Tooltip">
+		オブジェクトの制作や地形の変形をします。
+	</string>
+	<string name="Command_Chat_Tooltip">
+		近くにいる人物とテキストチャットします。
+	</string>
+	<string name="Command_Conversations_Tooltip">
+		全員との会話を表示します。
+	</string>
+	<string name="Command_Compass_Tooltip">
+		コンパスを表示します。
+	</string>
+	<string name="Command_Destinations_Tooltip">
+		行ってみたい場所を表示します。
+	</string>
+	<string name="Command_Environments_Tooltip">
+		自分の環境を表示します。
+	</string>
+	<string name="Command_Gestures_Tooltip">
+		アバターのジェスチャーを表示します。
+	</string>
+	<string name="Command_Grid_Status_Tooltip">
+		現在のグリッドステータスを表示します。
+	</string>
+	<string name="Command_HowTo_Tooltip">
+		一般的タスクの実行方法を表示します。
+	</string>
+	<string name="Command_Inventory_Tooltip">
+		インベントリの内容を表示したり使用したりします。
+	</string>
+	<string name="Command_Map_Tooltip">
+		ワールドマップを表示します。
+	</string>
+	<string name="Command_Marketplace_Tooltip">
+		ショッピングに出掛ける
+	</string>
+	<string name="Command_MarketplaceListings_Tooltip">
+		創作アイテムを販売します。
+	</string>
+	<string name="Command_MiniMap_Tooltip">
+		近隣の人を表示します。
+	</string>
+	<string name="Command_Move_Tooltip">
+		アバターの移動操作をします。
+	</string>
+	<string name="Command_People_Tooltip">
+		フレンド、グループ、近隣の人物を表示します。
+	</string>
+	<string name="Command_Picks_Tooltip">
+		プロフィールで紹介しているお気に入りの場所を表示します。
+	</string>
+	<string name="Command_Places_Tooltip">
+		保存済みの場所を表示します。
+	</string>
+	<string name="Command_Preferences_Tooltip">
+		初期設定を表示します。
+	</string>
+	<string name="Command_Profile_Tooltip">
+		自分のプロフィールの表示や編集を行います。
+	</string>
+	<string name="Command_Report_Abuse_Tooltip">
+		嫌がらせを報告します。
+	</string>
+	<string name="Command_Search_Tooltip">
+		場所、イベント、人物を検索します。
+	</string>
+	<string name="Command_Snapshot_Tooltip">
+		スナップショット画像を撮ります。
+	</string>
+	<string name="Command_Speak_Tooltip">
+		マイクを使って近くの人と話します。
+	</string>
+	<string name="Command_View_Tooltip">
+		カメラアングルの変更を表示します。
+	</string>
+	<string name="Command_Voice_Tooltip">
+		インワールドでのコールや近くにいる人物の音量調整します。
+	</string>
+	<string name="Toolbar_Bottom_Tooltip">
+		現在、下のツールバーにあります。
+	</string>
+	<string name="Toolbar_Left_Tooltip">
+		現在、左のツールバーにあります。
+	</string>
+	<string name="Toolbar_Right_Tooltip">
+		現在、右のツールバーにあります。
+	</string>
+	<string name="Retain%">
+		維持率
+	</string>
+	<string name="Detail">
+		詳細
+	</string>
+	<string name="Better Detail">
+		より詳細
+	</string>
+	<string name="Surface">
+		表面
+	</string>
+	<string name="Solid">
+		ソリッド
+	</string>
+	<string name="Wrap">
+		ラップ
+	</string>
+	<string name="Preview">
+		プレビュー
+	</string>
+	<string name="Normal">
+		通常
+	</string>
+	<string name="Pathfinding_Wiki_URL">
+		https://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		なし
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		ナビメッシュに影響を与える
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		キャラクター
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		（複数）
+	</string>
+	<string name="snapshot_quality_very_low">
+		最低
+	</string>
+	<string name="snapshot_quality_low">
+		低
+	</string>
+	<string name="snapshot_quality_medium">
+		中
+	</string>
+	<string name="snapshot_quality_high">
+		高
+	</string>
+	<string name="snapshot_quality_very_high">
+		最高
+	</string>
+	<string name="TeleportMaturityExceeded">
+		住人はこのリージョン（地域）を訪問できません。
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
+	<string name="experience_tools_experience">
+		体験
+	</string>
+	<string name="ExperienceNameNull">
+		（体験なし）
+	</string>
+	<string name="ExperienceNameUntitled">
+		（タイトルのない体験）
+	</string>
+	<string name="Land-Scope">
+		ランドスコープ
+	</string>
+	<string name="Grid-Scope">
+		グリッドスコープ
+	</string>
+	<string name="Allowed_Experiences_Tab">
+		許可
+	</string>
+	<string name="Blocked_Experiences_Tab">
+		停止
+	</string>
+	<string name="Contrib_Experiences_Tab">
+		貢献者
+	</string>
+	<string name="Admin_Experiences_Tab">
+		管理
+	</string>
+	<string name="Recent_Experiences_Tab">
+		最新
+	</string>
+	<string name="Owned_Experiences_Tab">
+		所有
+	</string>
+	<string name="ExperiencesCounter">
+		（[EXPERIENCES]、最大[MAXEXPERIENCES]）
+	</string>
+	<string name="ExperiencePermission1">
+		コントロールを引き継ぐ
+	</string>
+	<string name="ExperiencePermission3">
+		アバターでアニメーションをトリガー
+	</string>
+	<string name="ExperiencePermission4">
+		アバターに装着
+	</string>
+	<string name="ExperiencePermission9">
+		カメラ追従
+	</string>
+	<string name="ExperiencePermission10">
+		カメラのコントロール
+	</string>
+	<string name="ExperiencePermission11">
+		あなたをテレポート
+	</string>
+	<string name="ExperiencePermission12">
+		体験の権限を自動的に承諾
+	</string>
+	<string name="ExperiencePermission16">
+		あなたのアバターを強制的に座らせる
+	</string>
+	<string name="ExperiencePermission17">
+		自然環境の設定を変更する
+	</string>
+	<string name="ExperiencePermissionShortUnknown">
+		が、不明な操作を実行しました：[Permission]
+	</string>
+	<string name="ExperiencePermissionShort1">
+		コントロールする
+	</string>
+	<string name="ExperiencePermissionShort3">
+		アニメーションをトリガー
+	</string>
+	<string name="ExperiencePermissionShort4">
+		取り付ける
+	</string>
+	<string name="ExperiencePermissionShort9">
+		カメラを追跡
+	</string>
+	<string name="ExperiencePermissionShort10">
+		カメラを制御
+	</string>
+	<string name="ExperiencePermissionShort11">
+		テレポート
+	</string>
+	<string name="ExperiencePermissionShort12">
+		権限
+	</string>
+	<string name="ExperiencePermissionShort16">
+		座る
+	</string>
+	<string name="ExperiencePermissionShort17">
+		環境
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		会話はログに記録されていません。ログの記録を開始するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		これ以上の会話は記録されません。ログの記録を再開するには、「初期設定」＞「チャット」で「保存：ログのみ」または「保存：ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		ログイン時の会話はありません。誰かと話した後や、誰かがあなたに話しかけた後に、そのときのログがここに記載されます。
+	</string>
+	<string name="loading_chat_logs">
+		読み込み中…
+	</string>
+	<string name="na">
+		該当なし
+	</string>
+	<string name="preset_combo_label">
+		－空のリスト－
+	</string>
+	<string name="Default">
+		デフォルト
+	</string>
+	<string name="none_paren_cap">
+		（なし）
+	</string>
+	<string name="no_limit">
+		無制限
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		物理形状に不正な確認データがあります。物理モデルを修正してください。
+	</string>
+	<string name="Mav_Details_MAV_BLOCK_MISSING">
+		データがありません。高ＬＯＤが存在し、有効であることを確認してください。設定されていない場合は、物理モデルを設定します。
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。
+	</string>
+	<string name="couldnt_resolve_host">
+		DNSがホスト名 ([HOSTNAME]) を解決できませんでした。
 www.secondlife.com のウェブサイトに接続できるかご確認ください。
-接続できても、このエラーが継続的に起こる場合は、サポートセクションから問題を報告してください。</string>
-  <string name="ssl_peer_certificate">ログインサーバーがＳＳＬ経由で確認できませんでした。
-このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。</string>
-  <string name="ssl_connect_error">この問題の多くは、お使いのコンピュータの時計が正しく設定されていないために起こります。
+接続できても、このエラーが継続的に起こる場合は、サポートセクションから問題を報告してください。
+	</string>
+	<string name="ssl_peer_certificate">
+		ログインサーバーがＳＳＬ経由で確認できませんでした。
+このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。
+	</string>
+	<string name="ssl_connect_error">
+		この問題の多くは、お使いのコンピュータの時計が正しく設定されていないために起こります。
 コントロールパネルから、時刻と日付が正しく設定されている事をご確認してください。
 また、お使いのネットワークとファイアウォールが正しく設定されている事もお確かめください。
 このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから問題を報告してください。
-[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AD%E3%82%B0%E3%82%A4%E3%83%B3%E3%82%A8%E3%83%A9%E3%83%BC-r1283/ ナレッジベース]</string>
-</strings>
\ No newline at end of file
+[https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%8A%E3%83%AC%E3%83%83%E3%82%B8%E3%83%99%E3%83%BC%E3%82%B9/%E3%83%AD%E3%82%B0%E3%82%A4%E3%83%B3%E3%82%A8%E3%83%A9%E3%83%BC-r1283/ ナレッジベース]
+	</string>
+</strings>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index f771678c8f..c1be98bef9 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -1,42 +1,96 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
-  <message_set name="errors">
-    <message name="invalid_tport">テレポート処理中に問題が発生しました。ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。</message>
-    <message name="invalid_region_handoff">リージョン横断の処理中に問題が発生しました。リージョン（地域）を越える前に、再度ログインする必要がある場合があります。
-このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。</message>
-    <message name="blocked_tport">申し訳ありませんが、テレポートは現在ブロックされています。しばらくしてから、もう一度やりなおしてください。
-やり直してもテレポートできない場合は、いったんログアウトし、再度ログインして問題を解決してください。</message>
-    <message name="nolandmark_tport">残念ながら、システムはランドマークの目的地を探せませんでした。</message>
-    <message name="timeout_tport">申し訳ございませんが、システムはテレポートの接続を完了できませんでした。しばらくしてから、もう一度やりなおしてください。</message>
-    <message name="NoHelpIslandTP">ウェルカムアイランドにテレポートで戻ることはできません。
-「Welcome Island Public」に行き再度チュートリアルを行ってください。</message>
-    <message name="noaccess_tport">残念ながら、そのテレポート目的地へのアクセスがありません。</message>
-    <message name="missing_attach_tport">添付物は、まだ到着していません。あと数秒間お待ちいただくか、いったんログアウトしてから再度ログインし、テレポートし直してださい。</message>
-    <message name="too_many_uploads_tport">このリージョン（地域）のアセットのキューが現在混み合っているため、要求されたテレポートを処理することが難しい状況です。
-数分後にやり直すか、混雑していない他のリージョンをお試しください。</message>
-    <message name="expired_tport">申し訳ございませんが、システムは要求されたテレポートを完了できませんでした。お手数ですが、数分程度時間をおいてからやり直してください。</message>
-    <message name="expired_region_handoff">申し訳ございませんが、システムは地域間の移動を時間どおりに完了できませんでした。
-お手数ですが、数分程度時間をおいてからやり直してください。</message>
-    <message name="no_host">テレポートの目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。お手数ですが、数分程度時間をおいてからやり直してください。</message>
-    <message name="no_inventory_host">インベントリシステムは現在利用できません。</message>
-    <message name="MustGetAgeRegion">このリージョン（地域）に入るには、１８歳以上である必要があります。</message>
-    <message name="RegionTPSpecialUsageBlocked">リージョンに入ることができません。
+	<message_set name="errors">
+		<message name="invalid_tport">
+			テレポート処理中に問題が発生しました。ログインし直す必要があるかもしれません。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。
+		</message>
+		<message name="invalid_region_handoff">
+			リージョン横断の処理中に問題が発生しました。リージョン（地域）を越える前に、再度ログインする必要がある場合があります。
+このメッセージが何度も出る場合は、[SUPPORT_SITE]をご確認ください。
+		</message>
+		<message name="blocked_tport">
+			申し訳ありませんが、テレポートは現在ブロックされています。しばらくしてから、もう一度やりなおしてください。
+やり直してもテレポートできない場合は、いったんログアウトし、再度ログインして問題を解決してください。
+		</message>
+		<message name="nolandmark_tport">
+			残念ながら、システムはランドマークの目的地を探せませんでした。
+		</message>
+		<message name="timeout_tport">
+			申し訳ございませんが、システムはテレポートの接続を完了できませんでした。しばらくしてから、もう一度やりなおしてください。
+		</message>
+		<message name="NoHelpIslandTP">
+			ウェルカムアイランドにテレポートで戻ることはできません。
+「Welcome Island Public」に行き再度チュートリアルを行ってください。
+		</message>
+		<message name="noaccess_tport">
+			残念ながら、そのテレポート目的地へのアクセスがありません。
+		</message>
+		<message name="missing_attach_tport">
+			添付物は、まだ到着していません。あと数秒間お待ちいただくか、いったんログアウトしてから再度ログインし、テレポートし直してださい。
+		</message>
+		<message name="too_many_uploads_tport">
+			このリージョン（地域）のアセットのキューが現在混み合っているため、要求されたテレポートを処理することが難しい状況です。
+数分後にやり直すか、混雑していない他のリージョンをお試しください。
+		</message>
+		<message name="expired_tport">
+			申し訳ございませんが、システムは要求されたテレポートを完了できませんでした。お手数ですが、数分程度時間をおいてからやり直してください。
+		</message>
+		<message name="expired_region_handoff">
+			申し訳ございませんが、システムは地域間の移動を時間どおりに完了できませんでした。
+お手数ですが、数分程度時間をおいてからやり直してください。
+		</message>
+		<message name="no_host">
+			テレポートの目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。お手数ですが、数分程度時間をおいてからやり直してください。
+		</message>
+		<message name="no_inventory_host">
+			インベントリシステムは現在利用できません。
+		</message>
+		<message name="MustGetAgeRegion">
+			このリージョン（地域）に入るには、１８歳以上である必要があります。
+		</message>
+		<message name="RegionTPSpecialUsageBlocked">
+			リージョンに入ることができません。
 「[REGION_NAME]」はスキルゲーミングリージョンであり、あなたはこのリージョンに入るための特定の基準を満たす必要があります。
-詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキルゲーミングのよくある質問]を参照してください。</message>
-  </message_set>
-  <message_set name="progress">
-    <message name="sending_dest">目的地に送信しています。</message>
-    <message name="redirecting">別の目的地にリダイレクトしています。</message>
-    <message name="relaying">目的地に中継しています。</message>
-    <message name="sending_home">ホーム位置のリクエストを送信しています。</message>
-    <message name="sending_landmark">ランドマーク位置のリクエストを送信しています。</message>
-    <message name="completing">テレポートを完了します。</message>
-    <message name="completed_from">[T_SLURL] からのテレポートが完了しました。</message>
-    <message name="resolving">目的地を解決しています。</message>
-    <message name="contacting">新しい地域にコンタクトしています。</message>
-    <message name="arriving">到着中…</message>
-    <message name="requesting">テレポートをリクエスト…</message>
-    <message name="pending">テレポートを保留中…</message>
-  </message_set>
-</teleport_messages>
\ No newline at end of file
+詳しくは、[http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life スキルゲーミングのよくある質問]を参照してください。
+		</message>
+	</message_set>
+	<message_set name="progress">
+		<message name="sending_dest">
+			目的地に送信しています。
+		</message>
+		<message name="redirecting">
+			別の目的地にリダイレクトしています。
+		</message>
+		<message name="relaying">
+			目的地に中継しています。
+		</message>
+		<message name="sending_home">
+			ホーム位置のリクエストを送信しています。
+		</message>
+		<message name="sending_landmark">
+			ランドマーク位置のリクエストを送信しています。
+		</message>
+		<message name="completing">
+			テレポートを完了します。
+		</message>
+		<message name="completed_from">
+			[T_SLURL] からのテレポートが完了しました。
+		</message>
+		<message name="resolving">
+			目的地を解決しています。
+		</message>
+		<message name="contacting">
+			新しい地域にコンタクトしています。
+		</message>
+		<message name="arriving">
+			到着中…
+		</message>
+		<message name="requesting">
+			テレポートをリクエスト…
+		</message>
+		<message name="pending">
+			テレポートを保留中…
+		</message>
+	</message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
index e43f975d8f..c811d94a35 100644
--- a/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <bodyparts_list_item name="wearable_item">
-  <item_icon name="item_icon" />
-  <item_name name="item_name" value="…" />
-  <lock_panel name="btn_lock" tool_tip="編集権限がありません。" />
-  <lock_icon name="btn_lock1" />
-  <edit_panel name="btn_edit_panel" />
-  <edit_btn name="btn_edit" tool_tip="このシェイプを編集" />
-</bodyparts_list_item>
\ No newline at end of file
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<lock_panel name="btn_lock" tool_tip="編集権限がありません。"/>
+	<lock_icon name="btn_lock1"/>
+	<edit_panel name="btn_edit_panel"/>
+	<edit_btn name="btn_edit" tool_tip="このシェイプを編集"/>
+</bodyparts_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
index b6cad64188..e952186632 100644
--- a/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <clothing_list_item name="wearable_item">
-  <lock_icon name="item_icon" />
-  <item_name name="item_name" value="…" />
-  <up_btn name="btn_move_up" />
-  <down_btn name="btn_move_down" />
-  <lock_panel name="btn_lock" tool_tip="編集権限がありません。" />
-  <lock_icon name="btn_lock1" />
-  <edit_panel name="btn_edit_panel" />
-  <edit_btn name="btn_edit" tool_tip="この衣装を編集" />
-</clothing_list_item>
\ No newline at end of file
+	<lock_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<up_btn name="btn_move_up"/>
+	<down_btn name="btn_move_down"/>
+	<lock_panel name="btn_lock" tool_tip="編集権限がありません。"/>
+	<lock_icon name="btn_lock1"/>
+	<edit_panel name="btn_edit_panel"/>
+	<edit_btn name="btn_edit" tool_tip="この衣装を編集"/>
+</clothing_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
index 418c1d47f0..741d854813 100644
--- a/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <deletable_wearable_list_item name="deletable_wearable_item">
-  <delete_btn name="btn_delete" tool_tip="アウトフィットから削除"/>
-  <item_icon name="item_icon" />
-  <item_name name="item_name" value="…" />
-</deletable_wearable_list_item>
\ No newline at end of file
+	<delete_btn name="btn_delete" tool_tip="アウトフィットから削除"/>
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+</deletable_wearable_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
index 9c14c98f96..6526b2be67 100644
--- a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <densityctrl abel="密度" name="density_ctrl">
-  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">指数項</text>
-  <slider dname="level_exponential" />
-
-  <view left_pad="15" top="15" name="preview_image" height="140" width="140" follows="left|top" />
-  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">指数尺度係数</text>
-  <slider dname="exponential_scale" />
-
-  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">線形項</text>
-  <slider dname="level_linear" />
-
-  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">定数項</text>
-  <slider dname="level_constant" />
-
-  <text follows="left|top" height="11" layout="topleft" left="15" top_pad="15" width="80">最大高度</text>
-  <slider name="max_altitude" />
-
-  <text follows="left|top" height="11" layout="topleft" name="aniso_factor_label" left="15" top_pad="15" width="80">異方性係数</text>
-  <slider name="aniso_factor" />
-</densityctrl>
\ No newline at end of file
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		指数項
+	</text>
+	<slider dname="level_exponential"/>
+	<view left_pad="15" top="15" name="preview_image" height="140" width="140" follows="left|top"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		指数尺度係数
+	</text>
+	<slider dname="exponential_scale"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		線形項
+	</text>
+	<slider dname="level_linear"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120">
+		定数項
+	</text>
+	<slider dname="level_constant"/>
+	<text follows="left|top" height="11" layout="topleft" left="15" top_pad="15" width="80">
+		最大高度
+	</text>
+	<slider name="max_altitude"/>
+	<text follows="left|top" height="11" layout="topleft" name="aniso_factor_label" left="15" top_pad="15" width="80">
+		異方性係数
+	</text>
+	<slider name="aniso_factor"/>
+</densityctrl>
diff --git a/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
index 4e06928c7c..fdf21253cf 100644
--- a/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <dummy_clothing_list_item name="dummy_clothing_item">
-  <item_icon name="item_icon" />
-  <item_name name="item_name" value="…" />
-  <add_panel name="btn_add_panel" />
-  <add_btn name="btn_add" tool_tip="この種類のアイテムを更に追加します。" />
-</dummy_clothing_list_item>
\ No newline at end of file
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<add_panel name="btn_add_panel"/>
+	<add_btn name="btn_add" tool_tip="この種類のアイテムを更に追加します。"/>
+</dummy_clothing_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
index 1a2e7e6b31..b08dc59fc5 100644
--- a/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <flat_list_view>
-  <flat_list_view.no_items_text name="no_items_msg" value="一致するものが見つかりませんでした。" />
-</flat_list_view>
\ No newline at end of file
+	<flat_list_view.no_items_text name="no_items_msg" value="一致するものが見つかりませんでした。"/>
+</flat_list_view>
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
index 12f5a53a8a..1dd00355fd 100644
--- a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_folder folder_arrow_image="Folder_Arrow" folder_indentation="8" item_height="20" item_top_pad="4" selection_image="Rounded_Square" left_pad="5" icon_pad="2" icon_width="16" text_pad="1" text_pad_right="4" arrow_size="12" max_folder_item_overlap="2">
-  <new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black" />
+	<new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black"/>
 </inbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
index 1034e63fe8..ae652617ef 100644
--- a/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_item item_height="20" item_top_pad="4" selection_image="Rounded_Square">
-  <new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black" />
+	<new_badge label="新規" label_offset_horiz="-1" location="right" padding_horiz="12.5" padding_vert="2" location_offset_hcenter="-23" border_image="New_Tag_Border" border_color="DkGray2" image="New_Tag_Background" image_color="Black"/>
 </inbox_folder_view_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
index b0fdbf31da..3d51153411 100644
--- a/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu_item_separator name="separator" label="─────" />
+<menu_item_separator name="separator" label="─────"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
index 418cbd1d9e..badf65a18d 100644
--- a/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Use "disabled color" to make it look like menu separators -->
-<menu_item_tear_off name="tear_off" label="〰〰〰〰〰" />
+<menu_item_tear_off name="tear_off" label="〰〰〰〰〰"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/name_editor.xml b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
index 3de33594dc..98c4373050 100644
--- a/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/name_editor.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<name_editor default_text="（取得しています）"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<name_editor default_text="（取得しています）"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
index 0db8e89b3b..1ec542e423 100644
--- a/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel_camera_item>
-  <panel_camera_item.icon_over name="hovered_icon" />
-  <panel_camera_item.icon_selected name="selected_icon" />
-  <panel_camera_item.picture name="picture" />
-  <panel_camera_item.selected_picture fname="selected_picture" />
-  <panel_camera_item.text name="picture_name">テキスト</panel_camera_item.text>
-</panel_camera_item>
\ No newline at end of file
+	<panel_camera_item.icon_over name="hovered_icon"/>
+	<panel_camera_item.icon_selected name="selected_icon"/>
+	<panel_camera_item.picture name="picture"/>
+	<panel_camera_item.selected_picture fname="selected_picture"/>
+	<panel_camera_item.text name="picture_name">
+		テキスト
+	</panel_camera_item.text>
+</panel_camera_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/person_view.xml b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
index bdf1d67c2f..6d1040d6f6 100644
--- a/indra/newview/skins/default/xui/ja/widgets/person_view.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/person_view.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <person_view>
-  <avatar_icon />
-  <last_interaction_time_textbox name="last_interaction_time_textbox" />
-  <permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することはできません。" />
-  <permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトの編集や、削除、取得することができます。" />
-  <permission_map_icon tool_tip="このフレンドは、マップ上であなたのいる場所を探すことができます。" name="permission_map_icon" />
-  <permission_online_icon name="permission_online_icon" tool_tip="このフレンドは、あなたがオンラインになったことがわかります。" />
-  <info_btn name="info_btn" tool_tip="詳細情報" />
-  <profile_btn name="profile_btn" tool_tip="プロフィールを見る" />
-  <output_monitor name="speaking_indicator" />
-</person_view>
\ No newline at end of file
+	<avatar_icon/>
+	<last_interaction_time_textbox name="last_interaction_time_textbox"/>
+	<permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することはできません。"/>
+	<permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトの編集や、削除、取得することができます。"/>
+	<permission_map_icon tool_tip="このフレンドは、マップ上であなたのいる場所を探すことができます。" name="permission_map_icon"/>
+	<permission_online_icon name="permission_online_icon" tool_tip="このフレンドは、あなたがオンラインになったことがわかります。"/>
+	<info_btn name="info_btn" tool_tip="詳細情報"/>
+	<profile_btn name="profile_btn" tool_tip="プロフィールを見る"/>
+	<output_monitor name="speaking_indicator"/>
+</person_view>
diff --git a/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
index 7a25a6cc13..b6f27ad148 100644
--- a/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <sun_moon_trackball name="virtualtrackball">
-
-  <sun_moon_trackball.border  />
-
-  <sun_moon_trackball.labelN name="labelN" label="北" />
-  <sun_moon_trackball.labelS name="labelS" label="南" />
-  <sun_moon_trackball.labelW name="labelW" label="西" />
-  <sun_moon_trackball.labelE name="labelE" label="東" />
-
-  <sun_moon_trackball.button_rotate_top name="btn_rotate_top" />
-
-  <sun_moon_trackball.button_rotate_bottom name="btn_rotate_bottom" />
-
-  <sun_moon_trackball.button_rotate_left name="btn_rotate_left" />
-
-  <sun_moon_trackball.button_rotate_right name="btn_rotate_right" />
-
-</sun_moon_trackball>
\ No newline at end of file
+	<sun_moon_trackball.border/>
+	<sun_moon_trackball.labelN name="labelN" label="北"/>
+	<sun_moon_trackball.labelS name="labelS" label="南"/>
+	<sun_moon_trackball.labelW name="labelW" label="西"/>
+	<sun_moon_trackball.labelE name="labelE" label="東"/>
+	<sun_moon_trackball.button_rotate_top name="btn_rotate_top"/>
+	<sun_moon_trackball.button_rotate_bottom name="btn_rotate_bottom"/>
+	<sun_moon_trackball.button_rotate_left name="btn_rotate_left"/>
+	<sun_moon_trackball.button_rotate_right name="btn_rotate_right"/>
+</sun_moon_trackball>
diff --git a/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
index e34ca44481..e75cab14c8 100644
--- a/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_list_item>
-  <!-- DEFAULT style for inventory list item -->
-  <default_style />
-
-  <!-- style for inventory list item WORN on avatar -->
-  <worn_style />
-  <item_icon name="item_icon" />
-  <item_name name="item_name" value="…" />
-  <add_btn name="add_wearable" />
-  <remove_btn name="remove_wearable" />
-</inventory_list_item>
\ No newline at end of file
+	<default_style/>
+	<worn_style/>
+	<item_icon name="item_icon"/>
+	<item_name name="item_name" value="…"/>
+	<add_btn name="add_wearable"/>
+	<remove_btn name="remove_wearable"/>
+</inventory_list_item>
diff --git a/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
index c829604f9a..dcb1966c92 100644
--- a/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
+++ b/indra/newview/skins/default/xui/ja/widgets/xy_vector.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <xy_vector name="xyvector">
-
-  <xy_vector.border visible="true" />
-
-  <xy_vector.x_entry name="XEntry" tab_stop="true" label="Ｘ軸：" />
-  <xy_vector.y_entry name="YEntry" tab_stop="true" label="Ｙ軸：" />
-
-  <xy_vector.touch_area name="TouchArea" />
-
-</xy_vector>
\ No newline at end of file
+	<xy_vector.border visible="true"/>
+	<xy_vector.x_entry name="XEntry" tab_stop="true" label="Ｘ軸："/>
+	<xy_vector.y_entry name="YEntry" tab_stop="true" label="Ｙ軸："/>
+	<xy_vector.touch_area name="TouchArea"/>
+</xy_vector>
diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml
index 98a3b2e6c4..da435bbd04 100644
--- a/indra/newview/skins/default/xui/ja/xui_version.xml
+++ b/indra/newview/skins/default/xui/ja/xui_version.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<xui_version>1.0</xui_version>
\ No newline at end of file
+<xui_version>
+	1.0
+</xui_version>
\ No newline at end of file
-- 
cgit v1.2.3


From 2281377c347233b79f76249143e6197142efcfbb Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 6 Jun 2023 12:09:40 +0300
Subject: SL-19813 Disable switch view on Worn and Recent Inventory tabs

---
 indra/newview/llpanelmaininventory.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index afb69d9b6d..0ad4e69942 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1511,6 +1511,7 @@ void LLPanelMainInventory::setActivePanel()
     {
         mActivePanel = (LLInventoryPanel*)getChild<LLTabContainer>("inventory filter tabs")->getCurrentPanel();
     }
+    mViewModeBtn->setEnabled(mSingleFolderMode || (getAllItemsPanel() == getActivePanel()));
 }
 
 void LLPanelMainInventory::toggleViewMode()
@@ -2307,7 +2308,7 @@ void LLPanelMainInventory::updatePanelVisibility()
     mCombinationViewPanel->setVisible(mSingleFolderMode);
     mNavigationBtnsPanel->setVisible(mSingleFolderMode);
     mViewModeBtn->setImageOverlay(mSingleFolderMode ? getString("default_mode_btn") : getString("single_folder_mode_btn"));
-
+    mViewModeBtn->setEnabled(mSingleFolderMode || (getAllItemsPanel() == getActivePanel()));
     if (mSingleFolderMode)
     {
         if (isCombinationViewMode())
-- 
cgit v1.2.3


From d5c1d6c24559ce44c7ab6e1249c50bcb04105e5f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 6 Jun 2023 21:44:46 +0300
Subject: SL-19823 Edit not always active when adding items and folders in
 single folder view

---
 indra/newview/llpanelmaininventory.cpp | 26 +++++++++++++++++++-------
 indra/newview/llpanelmaininventory.h   |  1 +
 2 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 0ad4e69942..9892360a1b 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -515,16 +515,15 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                     mForceShowInvLayout = true;
                 }
 
-                LLHandle<LLPanel> handle = mCombinationInventoryPanel->getHandle();
+                LLHandle<LLPanel> handle = getHandle();
                 std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID& new_category_id)
                 {
                     gInventory.notifyObservers(); // not really needed, should have been already done
-                    LLInventorySingleFolderPanel* panel = (LLInventorySingleFolderPanel*)handle.get();
+                    LLPanelMainInventory* panel = (LLPanelMainInventory*)handle.get();
                     if (new_category_id.notNull() && panel)
                     {
-                        panel->setSelectionByID(new_category_id, TRUE);
-                        panel->getRootFolder()->scrollToShowSelection();
-                        panel->getRootFolder()->setNeedsAutoRename(TRUE);
+                        // might need to refresh visibility, delay rename
+                        panel->mCombInvUUIDNeedsRename = new_category_id;
                     }
                 };
                 menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
@@ -532,12 +531,17 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
         }
         else
         {
-            std::function<void(const LLUUID&)> callback_cat_created = [this](const LLUUID &new_category_id)
+            LLHandle<LLPanel> handle = getHandle();
+            std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID &new_category_id)
             {
                 gInventory.notifyObservers(); // not really needed, should have been already done
                 if (new_category_id.notNull())
                 {
-                    setGallerySelection(new_category_id);
+                    LLPanelMainInventory* panel = (LLPanelMainInventory*)handle.get();
+                    if (panel)
+                    {
+                        panel->setGallerySelection(new_category_id);
+                    }
                 }
             };
             menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
@@ -2414,6 +2418,14 @@ void LLPanelMainInventory::updateCombinationVisibility()
                 mCombinationListLayoutPanel->setShape(list_latout, true /*tell stack to account for new shape*/);
             }
         }
+
+        if (mCombInvUUIDNeedsRename.notNull() && !mReshapeInvLayout)
+        {
+            mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE);
+            mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
+            mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
+            mCombInvUUIDNeedsRename.setNull();
+        }
     }
 }
 
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index ae2e07da11..6d749f269c 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -250,6 +250,7 @@ private:
 
     bool                        mForceShowInvLayout;
     bool                        mReshapeInvLayout;
+    LLUUID                      mCombInvUUIDNeedsRename;
 	// List Commands                                                              //
 	////////////////////////////////////////////////////////////////////////////////
 };
-- 
cgit v1.2.3


From 9ac73955faed007e98edf028b4843adcfee0fded Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 6 Jun 2023 22:56:08 +0300
Subject: SL-19823 Edit not always active #2

---
 indra/newview/llpanelmaininventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 9892360a1b..a6a68141e3 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2419,7 +2419,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
             }
         }
 
-        if (mCombInvUUIDNeedsRename.notNull() && !mReshapeInvLayout)
+        if (mCombInvUUIDNeedsRename.notNull())
         {
             mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE);
             mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
-- 
cgit v1.2.3


From 0b16cd0da40e8064b4ebf6b7fc679c0d710a7346 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Jun 2023 00:13:59 +0300
Subject: SL-19823 Edit not active for items

---
 indra/newview/llagentwearables.cpp     |  8 +++++--
 indra/newview/llagentwearables.h       |  2 +-
 indra/newview/llpanelmaininventory.cpp | 16 ++++++-------
 indra/newview/llsettingsvo.cpp         |  9 ++++++++
 indra/newview/llsettingsvo.h           |  1 +
 indra/newview/llviewerinventory.cpp    | 42 ++++++++++++++++++++++------------
 indra/newview/llviewerinventory.h      | 21 +++++++++++++----
 7 files changed, 69 insertions(+), 30 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 24c6d82b0d..0d63b91882 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1528,7 +1528,7 @@ bool LLAgentWearables::moveWearable(const LLViewerInventoryItem* item, bool clos
 }
 
 // static
-void LLAgentWearables::createWearable(LLWearableType::EType type, bool wear, const LLUUID& parent_id)
+void LLAgentWearables::createWearable(LLWearableType::EType type, bool wear, const LLUUID& parent_id, std::function<void(const LLUUID&)> created_cb)
 {
 	if (type == LLWearableType::WT_INVALID || type == LLWearableType::WT_NONE) return;
 
@@ -1540,7 +1540,7 @@ void LLAgentWearables::createWearable(LLWearableType::EType type, bool wear, con
 
 	LLViewerWearable* wearable = LLWearableList::instance().createNewWearable(type, gAgentAvatarp);
 	LLAssetType::EType asset_type = wearable->getAssetType();
-	LLPointer<LLInventoryCallback> cb;
+	LLPointer<LLBoostFuncInventoryCallback> cb;
 	if(wear)
 	{
 		cb = new LLBoostFuncInventoryCallback(wear_and_edit_cb);
@@ -1549,6 +1549,10 @@ void LLAgentWearables::createWearable(LLWearableType::EType type, bool wear, con
 	{
 		cb = new LLBoostFuncInventoryCallback(wear_cb);
 	}
+    if (created_cb != NULL)
+    {
+        cb->addOnFireFunc(created_cb);
+    }
 
 	LLUUID folder_id;
 
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index 2710262910..e20f5df7fa 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -129,7 +129,7 @@ protected:
 	//--------------------------------------------------------------------
 
 public:
-	static void		createWearable(LLWearableType::EType type, bool wear = false, const LLUUID& parent_id = LLUUID::null);
+	static void		createWearable(LLWearableType::EType type, bool wear = false, const LLUUID& parent_id = LLUUID::null, std::function<void(const LLUUID&)> created_cb = NULL);
 	static void		editWearable(const LLUUID& item_id);
 	bool			moveWearable(const LLViewerInventoryItem* item, bool closer_to_body);
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a6a68141e3..a28bc33f15 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -516,35 +516,35 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                 }
 
                 LLHandle<LLPanel> handle = getHandle();
-                std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID& new_category_id)
+                std::function<void(const LLUUID&)> callback_created = [handle](const LLUUID& new_id)
                 {
                     gInventory.notifyObservers(); // not really needed, should have been already done
                     LLPanelMainInventory* panel = (LLPanelMainInventory*)handle.get();
-                    if (new_category_id.notNull() && panel)
+                    if (new_id.notNull() && panel)
                     {
                         // might need to refresh visibility, delay rename
-                        panel->mCombInvUUIDNeedsRename = new_category_id;
+                        panel->mCombInvUUIDNeedsRename = new_id;
                     }
                 };
-                menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
+                menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_created);
             }
         }
         else
         {
             LLHandle<LLPanel> handle = getHandle();
-            std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID &new_category_id)
+            std::function<void(const LLUUID&)> callback_created = [handle](const LLUUID &new_id)
             {
                 gInventory.notifyObservers(); // not really needed, should have been already done
-                if (new_category_id.notNull())
+                if (new_id.notNull())
                 {
                     LLPanelMainInventory* panel = (LLPanelMainInventory*)handle.get();
                     if (panel)
                     {
-                        panel->setGallerySelection(new_category_id);
+                        panel->setGallerySelection(new_id);
                     }
                 }
             };
-            menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
+            menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_created);
         }
     }
     else
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index b1eed81476..4cfa6f2f85 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -95,6 +95,15 @@ namespace
 
 
 //=========================================================================
+void LLSettingsVOBase::createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID& parent_id, std::function<void(const LLUUID&)> created_cb)
+{
+    inventory_result_fn cb = [created_cb](LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results)
+    {
+        created_cb(inventory_id);
+    };
+    createNewInventoryItem(stype, parent_id, cb);
+}
+
 void LLSettingsVOBase::createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID &parent_id, inventory_result_fn callback)
 {
     LLTransactionID tid;
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h
index 05ec0e9275..4f410ab7d9 100644
--- a/indra/newview/llsettingsvo.h
+++ b/indra/newview/llsettingsvo.h
@@ -49,6 +49,7 @@ public:
     typedef std::function<void(LLInventoryItem *inv_item, LLSettingsBase::ptr_t settings, S32 status, LLExtStat extstat)> inventory_download_fn;
     typedef std::function<void(LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results)>           inventory_result_fn;
 
+    static void     createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID& parent_id, std::function<void(const LLUUID&)> created_cb);
     static void     createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID &parent_id, inventory_result_fn callback = inventory_result_fn());
     static void     createInventoryItem(const LLSettingsBase::ptr_t &settings, const LLUUID &parent_id, std::string settings_name, inventory_result_fn callback = inventory_result_fn());
     static void     createInventoryItem(const LLSettingsBase::ptr_t &settings, U32 next_owner_perm, const LLUUID &parent_id, std::string settings_name, inventory_result_fn callback = inventory_result_fn());
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 80e4f5f6d5..117cdc5367 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1644,13 +1644,14 @@ void create_new_item(const std::string& name,
 				   const LLUUID& parent_id,
 				   LLAssetType::EType asset_type,
 				   LLInventoryType::EType inv_type,
-				   U32 next_owner_perm)
+				   U32 next_owner_perm,
+                   std::function<void(const LLUUID&)> created_cb = NULL)
 {
 	std::string desc;
 	LLViewerAssetType::generateDescriptionFor(asset_type, desc);
 	next_owner_perm = (next_owner_perm) ? next_owner_perm : PERM_MOVE | PERM_TRANSFER;
 
-	LLPointer<LLInventoryCallback> cb = NULL;
+	LLPointer<LLBoostFuncInventoryCallback> cb = NULL;
 
 	switch (inv_type)
 	{
@@ -1674,9 +1675,17 @@ void create_new_item(const std::string& name,
 			next_owner_perm = LLFloaterPerms::getNextOwnerPerms("Notecards");
 			break;
 		}
-		default:
-			break;
-	}
+
+        default:
+        {
+            cb = new LLBoostFuncInventoryCallback();
+            break;
+        }
+    }
+    if (created_cb != NULL)
+    {
+        cb->addOnFireFunc(created_cb);
+    }
 
 	create_inventory_item(gAgent.getID(),
 						  gAgent.getSessionID(),
@@ -1731,7 +1740,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge,
     menu_create_inventory_item(panel, bridge ? bridge->getUUID() : LLUUID::null, userdata, default_parent_uuid);
 }
 
-void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid, std::function<void(const LLUUID&)> folder_created_cb)
+void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const LLSD& userdata, const LLUUID& default_parent_uuid, std::function<void(const LLUUID&)> created_cb)
 {
     std::string type_name = userdata.asString();
     
@@ -1754,10 +1763,10 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
         }
 
         std::function<void(const LLUUID&)> callback_cat_created = NULL;
-        if(panel)
+        if (panel)
         {
             LLHandle<LLPanel> handle = panel->getHandle();
-            std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID &new_category_id)
+            std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID& new_category_id)
             {
                 gInventory.notifyObservers();
                 LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(handle.get());
@@ -1767,9 +1776,9 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
                 }
             };
         }
-        else if(folder_created_cb != NULL)
+        else if (created_cb != NULL)
         {
-            callback_cat_created = folder_created_cb;
+            callback_cat_created = created_cb;
         }
         gInventory.createNewCategory(
             parent_id,
@@ -1784,7 +1793,8 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
                       parent_id,
                       LLAssetType::AT_LSL_TEXT,
                       LLInventoryType::IT_LSL,
-                      PERM_MOVE | PERM_TRANSFER);    // overridden in create_new_item
+                      PERM_MOVE | PERM_TRANSFER,
+                      created_cb);    // overridden in create_new_item
     }
     else if ("notecard" == type_name)
     {
@@ -1793,7 +1803,8 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
                       parent_id,
                       LLAssetType::AT_NOTECARD,
                       LLInventoryType::IT_NOTECARD,
-                      PERM_ALL);    // overridden in create_new_item
+                      PERM_ALL,
+                      created_cb);    // overridden in create_new_item
     }
     else if ("gesture" == type_name)
     {
@@ -1802,7 +1813,8 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
                       parent_id,
                       LLAssetType::AT_GESTURE,
                       LLInventoryType::IT_GESTURE,
-                      PERM_ALL);    // overridden in create_new_item
+                      PERM_ALL,
+                      created_cb);    // overridden in create_new_item
     }
     else if (("sky" == type_name) || ("water" == type_name) || ("daycycle" == type_name))
     {
@@ -1828,7 +1840,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
 
         LLUUID parent_id = dest_id.notNull() ? dest_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS);
 
-        LLSettingsVOBase::createNewInventoryItem(stype, parent_id);
+        LLSettingsVOBase::createNewInventoryItem(stype, parent_id, created_cb);
     }
     else
     {
@@ -1837,7 +1849,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
         if (wearable_type >= LLWearableType::WT_SHAPE && wearable_type < LLWearableType::WT_COUNT)
         {
             const LLUUID parent_id = dest_id;
-            LLAgentWearables::createWearable(wearable_type, false, parent_id);
+            LLAgentWearables::createWearable(wearable_type, false, parent_id, created_cb);
         }
         else
         {
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index d788f23d0c..6d3676ba2e 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -256,6 +256,7 @@ protected:
 class LLInventoryCallback : public LLRefCount
 {
 public:
+    virtual ~LLInventoryCallback() {}
 	virtual void fire(const LLUUID& inv_item) = 0;
 };
 
@@ -294,17 +295,29 @@ class LLBoostFuncInventoryCallback: public LLInventoryCallback
 {
 public:
 
-	LLBoostFuncInventoryCallback(inventory_func_type fire_func = no_op_inventory_func,
+	LLBoostFuncInventoryCallback(inventory_func_type fire_func,
 								 nullary_func_type destroy_func = no_op):
-		mFireFunc(fire_func),
 		mDestroyFunc(destroy_func)
 	{
+        mFireFuncs.push_back(fire_func);
 	}
 
+    LLBoostFuncInventoryCallback()
+    {
+    }
+
+    void addOnFireFunc(inventory_func_type fire_func)
+    {
+        mFireFuncs.push_back(fire_func);
+    }
+
 	// virtual
 	void fire(const LLUUID& item_id)
     {
-		mFireFunc(item_id);
+        for (inventory_func_type &func: mFireFuncs)
+        {
+            func(item_id);
+        }
 	}
 
 	// virtual
@@ -315,7 +328,7 @@ public:
 	
 
 private:
-	inventory_func_type mFireFunc;
+	std::list<inventory_func_type> mFireFuncs;
 	nullary_func_type mDestroyFunc;
 };
 
-- 
cgit v1.2.3


From 45a54ba544b12ce4b27c52dd014c9b14bcb0d2c7 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 6 Jun 2023 21:43:23 +0200
Subject: SL-18328 Fix opening the right profile on click Callingcard embedded
 to a Notecard

---
 indra/newview/llviewertexteditor.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 7abb42dd8a..d2701f0aff 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -1194,7 +1194,11 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLPointer<LLInventoryItem> item_p
 
 void LLViewerTextEditor::openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc )
 {
-	if(item && !item->getCreatorUUID().isNull())
+	if (item && !item->getDescription().empty())
+	{
+		LLAvatarActions::showProfile(LLUUID(item->getDescription()));
+	}
+	else if (item && !item->getCreatorUUID().isNull())
 	{
 		LLAvatarActions::showProfile(item->getCreatorUUID());
 	}
-- 
cgit v1.2.3


From 480aa58d159f7874bf3b388b7ea836debc23ceb1 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 7 Jun 2023 19:25:09 +0300
Subject: SL-19686 don't build inventory root views on init by default

---
 indra/newview/llinventorypanel.cpp     | 179 +++++++++++++++++++--------------
 indra/newview/llinventorypanel.h       |   4 +
 indra/newview/llpanelmaininventory.cpp |   8 +-
 indra/newview/llpanelmaininventory.h   |   1 +
 4 files changed, 113 insertions(+), 79 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index a76769d25a..80f6ed7e32 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -251,52 +251,72 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
 {
 	// save off copy of params
 	mParams = params;
-	// Clear up the root view
-	// Note: This needs to be done *before* we build the new folder view 
-	LLUUID root_id = getRootFolderID();
-	if (mFolderRoot.get())
-	{
-		removeItemID(root_id);
-		mFolderRoot.get()->destroyView();
-	}
 
-	mCommitCallbackRegistrar.pushScope(); // registered as a widget; need to push callback scope ourselves
-	{
-		// Determine the root folder in case specified, and
-		// build the views starting with that folder.
+    initFolderRoot();
+
+	// Initialize base class params.
+	LLPanel::initFromParams(mParams);
+}
+
+LLInventoryPanel::~LLInventoryPanel()
+{
+	U32 sort_order = getFolderViewModel()->getSorter().getSortOrder();
+    if (mSortOrderSetting != INHERIT_SORT_ORDER)
+    {
+        gSavedSettings.setU32(mSortOrderSetting, sort_order);
+    }
+    
+    clearFolderRoot();
+}
+
+void LLInventoryPanel::initFolderRoot()
+{
+    // Clear up the root view
+    // Note: This needs to be done *before* we build the new folder view
+    LLUUID root_id = getRootFolderID();
+    if (mFolderRoot.get())
+    {
+        removeItemID(root_id);
+        mFolderRoot.get()->destroyView();
+    }
+
+    mCommitCallbackRegistrar.pushScope(); // registered as a widget; need to push callback scope ourselves
+    {
+        // Determine the root folder in case specified, and
+        // build the views starting with that folder.
         LLFolderView* folder_view = createFolderRoot(root_id);
-		mFolderRoot = folder_view->getHandle();
-	
-		addItemID(root_id, mFolderRoot.get());
-	}
-	mCommitCallbackRegistrar.popScope();
-	mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
-	mFolderRoot.get()->setEnableRegistrar(&mEnableCallbackRegistrar);
-	
-	// Scroller
-		LLRect scroller_view_rect = getRect();
-		scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
-	LLScrollContainer::Params scroller_params(mParams.scroll());
-		scroller_params.rect(scroller_view_rect);
-		mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
-		addChild(mScroller);
-		mScroller->addChild(mFolderRoot.get());
-		mFolderRoot.get()->setScrollContainer(mScroller);
-		mFolderRoot.get()->setFollowsAll();
-		mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
-
-	// Set up the callbacks from the inventory we're viewing, and then build everything.
-	mInventoryObserver = new LLInventoryPanelObserver(this);
-	mInventory->addObserver(mInventoryObserver);
-
-	mCompletionObserver = new LLInvPanelComplObserver(boost::bind(&LLInventoryPanel::onItemsCompletion, this));
-	mInventory->addObserver(mCompletionObserver);
+        mFolderRoot = folder_view->getHandle();
+    
+        addItemID(root_id, mFolderRoot.get());
+    }
+    mCommitCallbackRegistrar.popScope();
+    mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
+    mFolderRoot.get()->setEnableRegistrar(&mEnableCallbackRegistrar);
+    
+    // Scroller
+        LLRect scroller_view_rect = getRect();
+        scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
+    LLScrollContainer::Params scroller_params(mParams.scroll());
+        scroller_params.rect(scroller_view_rect);
+        mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
+        addChild(mScroller);
+        mScroller->addChild(mFolderRoot.get());
+        mFolderRoot.get()->setScrollContainer(mScroller);
+        mFolderRoot.get()->setFollowsAll();
+        mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
+
+    // Set up the callbacks from the inventory we're viewing, and then build everything.
+    mInventoryObserver = new LLInventoryPanelObserver(this);
+    mInventory->addObserver(mInventoryObserver);
+
+    mCompletionObserver = new LLInvPanelComplObserver(boost::bind(&LLInventoryPanel::onItemsCompletion, this));
+    mInventory->addObserver(mCompletionObserver);
 
     if (mBuildViewsOnInit && mViewsInitialized == VIEWS_UNINITIALIZED)
     {
         // Build view of inventory if we need default full hierarchy and inventory is ready, otherwise do in onIdle.
         // Initializing views takes a while so always do it onIdle if viewer already loaded.
-        if (mInventory->isInventoryUsable()            
+        if (mInventory->isInventoryUsable()
             && LLStartUp::getStartupState() <= STATE_WEARABLES_WAIT)
         {
             // Usually this happens on login, so we have less time constraits, but too long and we can cause a disconnect
@@ -310,48 +330,34 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
         }
     }
 
-	if (mSortOrderSetting != INHERIT_SORT_ORDER)
-	{
-		setSortOrder(gSavedSettings.getU32(mSortOrderSetting));
-	}
-	else
-	{
-		setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER));
-	}
+    if (mSortOrderSetting != INHERIT_SORT_ORDER)
+    {
+        setSortOrder(gSavedSettings.getU32(mSortOrderSetting));
+    }
+    else
+    {
+        setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER));
+    }
 
-	// hide inbox
-	if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible"))
-	{
-		getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
-	}
+    // hide inbox
+    if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible"))
+    {
+        getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
+    }
     // hide marketplace listing box, unless we are a marketplace panel
-	if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible") && !mParams.use_marketplace_folders)
-	{
-		getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS));
+    if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible") && !mParams.use_marketplace_folders)
+    {
+        getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS));
     }
     
-	// set the filter for the empty folder if the debug setting is on
-	if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders"))
-	{
-		getFilter().setFilterEmptySystemFolders();
-	}
-	
-	// keep track of the clipboard state so that we avoid filtering too much
-	mClipboardState = LLClipboard::instance().getGeneration();
-	
-	// Initialize base class params.
-	LLPanel::initFromParams(mParams);
-}
-
-LLInventoryPanel::~LLInventoryPanel()
-{
-	U32 sort_order = getFolderViewModel()->getSorter().getSortOrder();
-    if (mSortOrderSetting != INHERIT_SORT_ORDER)
+    // set the filter for the empty folder if the debug setting is on
+    if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders"))
     {
-        gSavedSettings.setU32(mSortOrderSetting, sort_order);
+        getFilter().setFilterEmptySystemFolders();
     }
     
-    clearFolderRoot();
+    // keep track of the clipboard state so that we avoid filtering too much
+    mClipboardState = LLClipboard::instance().getGeneration();
 }
 
 /*virtual*/
@@ -1889,6 +1895,7 @@ void LLInventoryPanel::setSFViewAndOpenFolder(const LLInventoryPanel* panel, con
         LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
         if (main_inventory && panel->hasAncestor(main_inventory) && !main_inventory->isSingleFolderMode())
         {
+            main_inventory->initSingleFolderRoot(folder_id);
             main_inventory->toggleViewMode();
             main_inventory->setSingleFolderViewRoot(folder_id, false);
         }
@@ -2109,6 +2116,7 @@ LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     : LLInventoryPanel(params)
 {
     mBuildChildrenViews = false;
+    mRootInited = false;
     getFilter().setSingleFolderMode(true);
     getFilter().setEmptyLookupMessage("InventorySingleFolderNoMatches");
     getFilter().setDefaultEmptyLookupMessage("InventorySingleFolderEmpty");
@@ -2134,10 +2142,25 @@ void LLInventorySingleFolderPanel::setSelectCallback(const boost::function<void(
 void LLInventorySingleFolderPanel::initFromParams(const Params& p)
 {
     mFolderID = gInventory.getRootFolderID();
-    Params pane_params(p);
-    pane_params.open_first_folder = false;
-    pane_params.start_folder.id = mFolderID;
-    LLInventoryPanel::initFromParams(pane_params);
+
+    mParams = p;
+    LLPanel::initFromParams(mParams);
+}
+
+void LLInventorySingleFolderPanel::initFolderRoot(const LLUUID& start_folder_id)
+{
+    if(mRootInited) return;
+
+    mRootInited = true;
+    if(start_folder_id.notNull())
+    {
+        mFolderID = start_folder_id;
+    }
+
+    mParams.open_first_folder = false;
+    mParams.start_folder.id = mFolderID;
+
+    LLInventoryPanel::initFolderRoot();
     mFolderRoot.get()->setSingleFolderMode(true);
 }
 
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 54ecdc8322..f4f6940743 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -268,6 +268,7 @@ public:
     static void callbackPurgeSelectedItems(const LLSD& notification, const LLSD& response, const std::vector<LLUUID> inventory_selected);
 
     void changeFolderRoot(const LLUUID& new_id) {};
+    void initFolderRoot();
 
 protected:
 	void openStartFolderOrMyInventory(); // open the first level of inventory
@@ -306,6 +307,7 @@ protected:
 	const LLInventoryFolderViewModelBuilder* mInvFVBridgeBuilder;
 
     bool mBuildChildrenViews;
+    bool mRootInited;
 
 
 	//--------------------------------------------------------------------
@@ -401,6 +403,8 @@ public:
     void initFromParams(const Params& p);
     bool isSelectionRemovable() { return false; }
 
+    void initFolderRoot(const LLUUID& start_folder_id = LLUUID::null);
+
     void openInCurrentWindow(const LLSD& userdata);
     void changeFolderRoot(const LLUUID& new_id);
     void onForwardFolder();
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a28bc33f15..de777fdc1a 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -484,10 +484,10 @@ void LLPanelMainInventory::newFolderWindow(LLUUID folder_id, LLUUID item_to_sele
             LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
             if (main_inventory)
             {
+                main_inventory->initSingleFolderRoot(folder_id);
                 main_inventory->toggleViewMode();
                 if(folder_id.notNull())
                 {
-                    main_inventory->setSingleFolderViewRoot(folder_id);
                     if(item_to_select.notNull())
                     {
                         main_inventory->setGallerySelection(item_to_select, true);
@@ -1518,6 +1518,11 @@ void LLPanelMainInventory::setActivePanel()
     mViewModeBtn->setEnabled(mSingleFolderMode || (getAllItemsPanel() == getActivePanel()));
 }
 
+void LLPanelMainInventory::initSingleFolderRoot(const LLUUID& start_folder_id)
+{
+    mCombinationInventoryPanel->initFolderRoot(start_folder_id);
+}
+
 void LLPanelMainInventory::toggleViewMode()
 {
     if(mSingleFolderMode && isCombinationViewMode())
@@ -1586,6 +1591,7 @@ void LLPanelMainInventory::onViewModeClick()
                 }
             }
         }
+        mCombinationInventoryPanel->initFolderRoot(new_root_folder);
     }
 
     toggleViewMode();
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 6d749f269c..ee314d1cf3 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -115,6 +115,7 @@ public:
 
     void onViewModeClick();
     void toggleViewMode();
+    void initSingleFolderRoot(const LLUUID& start_folder_id = LLUUID::null);
     void onUpFolderClicked();
     void onBackFolderClicked();
     void onForwardFolderClicked();
-- 
cgit v1.2.3


From 247f6ae06f506bbafd1cb52d35bfc894f5d18180 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 7 Jun 2023 18:52:22 +0200
Subject: SL-19286 Avatar is upside down when viewed from below

---
 indra/newview/llagent.cpp | 26 ++++++++++++--------------
 indra/newview/llagent.h   |  1 -
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 06c7cc7089..f87fa5b281 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1371,26 +1371,21 @@ LLVector3 LLAgent::getReferenceUpVector()
 void LLAgent::pitch(F32 angle)
 {
 	// don't let user pitch if pointed almost all the way down or up
-	mFrameAgent.pitch(clampPitchToLimits(angle));
-}
-
 
-// Radians, positive is forward into ground
-//-----------------------------------------------------------------------------
-// clampPitchToLimits()
-//-----------------------------------------------------------------------------
-F32 LLAgent::clampPitchToLimits(F32 angle)
-{
 	// A dot B = mag(A) * mag(B) * cos(angle between A and B)
 	// so... cos(angle between A and B) = A dot B / mag(A) / mag(B)
 	//                                  = A dot B for unit vectors
 
 	LLVector3 skyward = getReferenceUpVector();
 
-	const F32 look_down_limit = 179.f * DEG_TO_RAD;;
-	const F32 look_up_limit   =   1.f * DEG_TO_RAD;
+	// SL-19286 Avatar is upside down when viewed from below
+	// after left-clicking the mouse on the avatar and dragging down
+	//
+	// The issue is observed on angle below 10 degrees
+	const F32 look_down_limit = 179.f * DEG_TO_RAD;
+	const F32 look_up_limit   =  10.f * DEG_TO_RAD;
 
-	F32 angle_from_skyward = acos( mFrameAgent.getAtAxis() * skyward );
+	F32 angle_from_skyward = acos(mFrameAgent.getAtAxis() * skyward);
 
 	// clamp pitch to limits
 	if ((angle >= 0.f) && (angle_from_skyward + angle > look_down_limit))
@@ -1401,8 +1396,11 @@ F32 LLAgent::clampPitchToLimits(F32 angle)
 	{
 		angle = look_up_limit - angle_from_skyward;
 	}
-   
-    return angle;
+
+	if (fabs(angle) > 1e-4)
+	{
+		mFrameAgent.pitch(angle);
+	}
 }
 
 
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index b8ac47827a..ea91d2b720 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -554,7 +554,6 @@ public:
 	void			roll(F32 angle);
 	void			yaw(F32 angle);
 	LLVector3		getReferenceUpVector();
-    F32             clampPitchToLimits(F32 angle);
 
 	//--------------------------------------------------------------------
 	// Autopilot
-- 
cgit v1.2.3


From 662370ddea5ad24af00b151ef9e42f19232f9260 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Jun 2023 21:00:49 +0300
Subject: SL-19823 Edit not active for items #4

---
 indra/newview/llinventorypanel.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 80f6ed7e32..c29638ee78 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1871,7 +1871,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
 				inventory_panel->setSelection(obj_id, take_keyboard_focus);
 			}
 		}
-		else
+		else if (auto_open)
 		{
 			LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
 			if (floater_inventory)
@@ -1880,6 +1880,11 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
 			}
 			active_panel->setSelection(obj_id, take_keyboard_focus);
 		}
+        else
+        {
+            // Created items are going to receive proper focus from callbacks
+            active_panel->setSelection(obj_id, take_keyboard_focus);
+        }
 	}
 }
 
-- 
cgit v1.2.3


From c5979e11b6b18e893cc96b31498eb7a3a30e3780 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Jun 2023 21:56:32 +0300
Subject: SL-19686 Fix selection callback

---
 indra/newview/llinventorypanel.cpp | 15 ++++++---------
 indra/newview/llinventorypanel.h   |  5 ++---
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index c29638ee78..3b8aa3f296 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -305,6 +305,11 @@ void LLInventoryPanel::initFolderRoot()
         mFolderRoot.get()->setFollowsAll();
         mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
 
+    if (mSelectionCallback)
+    {
+        mFolderRoot.get()->setSelectCallback(mSelectionCallback);
+    }
+
     // Set up the callbacks from the inventory we're viewing, and then build everything.
     mInventoryObserver = new LLInventoryPanelObserver(this);
     mInventory->addObserver(mInventoryObserver);
@@ -1433,6 +1438,7 @@ void LLInventoryPanel::setSelectCallback(const boost::function<void (const std::
 	{
 		mFolderRoot.get()->setSelectCallback(cb);
 	}
+    mSelectionCallback = cb;
 }
 
 void LLInventoryPanel::clearSelection()
@@ -2135,15 +2141,6 @@ LLInventorySingleFolderPanel::~LLInventorySingleFolderPanel()
 {
 }
 
-void LLInventorySingleFolderPanel::setSelectCallback(const boost::function<void(const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb)
-{
-    if (mFolderRoot.get())
-    {
-        mFolderRoot.get()->setSelectCallback(cb);
-        mSelectionCallback = cb;
-    }
-}
-
 void LLInventorySingleFolderPanel::initFromParams(const Params& p)
 {
     mFolderID = gInventory.getRootFolderID();
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index f4f6940743..8d05fcb8b9 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -368,6 +368,8 @@ protected:
     virtual LLFolderView * createFolderRoot(LLUUID root_id );
 	virtual LLFolderViewFolder*	createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop);
 	virtual LLFolderViewItem*	createFolderViewItem(LLInvFVBridge * bridge);
+
+    boost::function<void(const std::deque<LLFolderViewItem*>& items, BOOL user_action)> mSelectionCallback;
 private:
     // buildViewsTree does not include some checks and is meant
     // for recursive use, use buildNewViews() for first call
@@ -425,8 +427,6 @@ public:
     std::list<LLUUID> getNavBackwardList() { return mBackwardFolders; }
     std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
 
-    void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
-
     typedef boost::function<void()> root_changed_callback_t;
     boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
 
@@ -435,7 +435,6 @@ protected:
     ~LLInventorySingleFolderPanel();
     void updateSingleFolderRoot();
 
-    boost::function<void(const std::deque<LLFolderViewItem*>& items, BOOL user_action)> mSelectionCallback;
     friend class LLUICtrlFactory;
     
     LLUUID mFolderID;
-- 
cgit v1.2.3


From 73afbd1a7788ba033e071fbf00b0758e6c883745 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Jun 2023 22:53:50 +0300
Subject: SL-19815 Properly implement up and down keys

---
 indra/newview/llinventorygallery.cpp | 84 +++++++++++++++++++++++++++++++++++-
 indra/newview/llinventorygallery.h   |  3 ++
 2 files changed, 85 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index a6cadea712..1610ef7f34 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -970,11 +970,11 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
                 {
                     // Might be better to get item from panel
                     S32 n = mItemIndexMap[item];
-                    if (n == 0)
+                    n--;
+                    if (n < 0)
                     {
                         n = mItemsAddedCount - 1;
                     }
-                    n--;
                     item = mIndexToItemMap[n];
                     LLUUID item_id = item->getUUID();
                     changeItemSelection(item_id, true);
@@ -1008,6 +1008,16 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
             handled = TRUE;
             break;
 
+        case KEY_UP:
+            scrollUp();
+            handled = TRUE;
+            break;
+
+        case KEY_DOWN:
+            scrollDown();
+            handled = TRUE;
+            break;
+
         default:
             break;
     }
@@ -1020,6 +1030,50 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
     return handled;
 }
 
+void LLInventoryGallery::scrollUp()
+{
+    mFilterSubString.clear();
+
+    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    {
+        LLInventoryGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            S32 n = mItemIndexMap[item];
+            n -= mItemsInRow;
+            if (n >= 0)
+            {
+                item = mIndexToItemMap[n];
+                LLUUID item_id = item->getUUID();
+                changeItemSelection(item_id, true);
+                item->setFocus(TRUE);
+            }
+        }
+    }
+}
+
+void LLInventoryGallery::scrollDown()
+{
+    mFilterSubString.clear();
+
+    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    {
+        LLInventoryGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            S32 n = mItemIndexMap[item];
+            n += mItemsInRow;
+            if (n < mItemsAddedCount)
+            {
+                item = mIndexToItemMap[n];
+                LLUUID item_id = item->getUUID();
+                changeItemSelection(item_id, true);
+                item->setFocus(TRUE);
+            }
+        }
+    }
+}
+
 void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
 {
     if (mInventoryGalleryMenu && item_id.notNull())
@@ -1690,6 +1744,32 @@ BOOL LLInventoryGalleryItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL dro
     return baseHandleDragAndDrop(mUUID, drop, cargo_type, cargo_data, accept, tooltip_msg);
 }
 
+BOOL LLInventoryGalleryItem::handleKeyHere(KEY key, MASK mask)
+{
+    if (!mGallery)
+    {
+        return FALSE;
+    }
+
+    BOOL handled = FALSE;
+    switch (key)
+    {
+        case KEY_UP:
+            mGallery->scrollUp();
+            handled = true;
+            break;
+
+        case KEY_DOWN:
+            mGallery->scrollDown();
+            handled = true;
+            break;
+
+        default:
+            break;
+    }
+    return handled;
+}
+
 void LLInventoryGalleryItem::setWorn(bool value)
 {
     mWorn = value;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 7d4431dbfb..7ff471b67b 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -80,6 +80,8 @@ public:
                            void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) override;
     BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
     BOOL handleKeyHere(KEY key, MASK mask) override;
+    void scrollUp();
+    void scrollDown();
 
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
@@ -250,6 +252,7 @@ public:
                                    void* cargo_data,
                                    EAcceptance* accept,
                                    std::string& tooltip_msg);
+    BOOL handleKeyHere(KEY key, MASK mask);
 
     LLFontGL* getTextFont();
 
-- 
cgit v1.2.3


From 2f8227473514b864f7806af031d3c1168b3279aa Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Jun 2023 23:26:29 +0300
Subject: SL-19815 Small handling rearrangement

---
 indra/newview/llinventorygallery.cpp | 112 +++++++++++++++++++++--------------
 indra/newview/llinventorygallery.h   |   6 +-
 2 files changed, 70 insertions(+), 48 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 1610ef7f34..63a706a9d6 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -961,60 +961,22 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
             break;
 
         case KEY_LEFT:
-            mFilterSubString.clear();
-
-            if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
-            {
-                LLInventoryGalleryItem* item = getSelectedItem();
-                if (item)
-                {
-                    // Might be better to get item from panel
-                    S32 n = mItemIndexMap[item];
-                    n--;
-                    if (n < 0)
-                    {
-                        n = mItemsAddedCount - 1;
-                    }
-                    item = mIndexToItemMap[n];
-                    LLUUID item_id = item->getUUID();
-                    changeItemSelection(item_id, true);
-                    item->setFocus(TRUE);
-
-                }
-            }
+            moveLeft();
             handled = TRUE;
             break;
 
         case KEY_RIGHT:
-            mFilterSubString.clear();
-
-            if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
-            {
-                LLInventoryGalleryItem* item = getSelectedItem();
-                if (item)
-                {
-                    S32 n = mItemIndexMap[item];
-                    n++;
-                    if (n == mItemsAddedCount)
-                    {
-                        n = 0;
-                    }
-                    item = mIndexToItemMap[n];
-                    LLUUID item_id = item->getUUID();
-                    changeItemSelection(item_id, true);
-                    item->setFocus(TRUE);
-                }
-            }
+            moveRight();
             handled = TRUE;
             break;
 
         case KEY_UP:
-            scrollUp();
+            moveUp();
             handled = TRUE;
             break;
 
         case KEY_DOWN:
-            scrollDown();
+            moveDown();
             handled = TRUE;
             break;
 
@@ -1030,7 +992,7 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
     return handled;
 }
 
-void LLInventoryGallery::scrollUp()
+void LLInventoryGallery::moveUp()
 {
     mFilterSubString.clear();
 
@@ -1052,7 +1014,7 @@ void LLInventoryGallery::scrollUp()
     }
 }
 
-void LLInventoryGallery::scrollDown()
+void LLInventoryGallery::moveDown()
 {
     mFilterSubString.clear();
 
@@ -1074,6 +1036,53 @@ void LLInventoryGallery::scrollDown()
     }
 }
 
+void LLInventoryGallery::moveLeft()
+{
+    mFilterSubString.clear();
+
+    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    {
+        LLInventoryGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            // Might be better to get item from panel
+            S32 n = mItemIndexMap[item];
+            n--;
+            if (n < 0)
+            {
+                n = mItemsAddedCount - 1;
+            }
+            item = mIndexToItemMap[n];
+            LLUUID item_id = item->getUUID();
+            changeItemSelection(item_id, true);
+            item->setFocus(TRUE);
+        }
+    }
+}
+
+void LLInventoryGallery::moveRight()
+{
+    mFilterSubString.clear();
+
+    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    {
+        LLInventoryGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            S32 n = mItemIndexMap[item];
+            n++;
+            if (n == mItemsAddedCount)
+            {
+                n = 0;
+            }
+            item = mIndexToItemMap[n];
+            LLUUID item_id = item->getUUID();
+            changeItemSelection(item_id, true);
+            item->setFocus(TRUE);
+        }
+    }
+}
+
 void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
 {
     if (mInventoryGalleryMenu && item_id.notNull())
@@ -1754,13 +1763,24 @@ BOOL LLInventoryGalleryItem::handleKeyHere(KEY key, MASK mask)
     BOOL handled = FALSE;
     switch (key)
     {
+
+        case KEY_LEFT:
+            mGallery->moveLeft();
+            handled = true;
+            break;
+
+        case KEY_RIGHT:
+            mGallery->moveRight();
+            handled = true;
+            break;
+
         case KEY_UP:
-            mGallery->scrollUp();
+            mGallery->moveUp();
             handled = true;
             break;
 
         case KEY_DOWN:
-            mGallery->scrollDown();
+            mGallery->moveDown();
             handled = true;
             break;
 
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 7ff471b67b..e2d9786296 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -80,8 +80,10 @@ public:
                            void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) override;
     BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
     BOOL handleKeyHere(KEY key, MASK mask) override;
-    void scrollUp();
-    void scrollDown();
+    void moveUp();
+    void moveDown();
+    void moveLeft();
+    void moveRight();
 
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
-- 
cgit v1.2.3


From 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Wed, 7 Jun 2023 16:16:06 -0700
Subject: Fixes for compatibility with new xcode 15 beta for any viewer branch
 after DRTVWR-577 (#232)

---
 indra/cmake/00-Common.cmake        | 4 ++++
 indra/newview/llviewerthrottle.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index c848d00710..5ce49bc6b0 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -171,6 +171,10 @@ if (DARWIN)
 ## Really?? On developer machines too?
 ##set(ENABLE_SIGNING TRUE)
 ##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
+
+  # required for clang-15/xcode-15 since our boost package still uses deprecated std::unary_function/binary_function
+  # see https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#C++-Standard-Library
+  add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
 endif (DARWIN)
 
 if (LINUX OR DARWIN)
diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp
index 2729253d18..20390a316a 100644
--- a/indra/newview/llviewerthrottle.cpp
+++ b/indra/newview/llviewerthrottle.cpp
@@ -84,7 +84,7 @@ LLViewerThrottleGroup::LLViewerThrottleGroup()
 }
 
 
-LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[])
+LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[TC_EOF])
 {
 	mThrottleTotal = 0.f;
 	S32 i;
-- 
cgit v1.2.3


From 29f52ad1a7c4f0d023c4b6a7dd0d43ea105e8fdb Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 8 Jun 2023 12:44:35 +0300
Subject: SL-19845 Show confirmation before deleting an item in Gallery view

---
 indra/newview/llinventorygallerymenu.cpp | 45 ++++++++++++++++++++++----------
 indra/newview/llinventorygallerymenu.h   |  1 +
 2 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 6dc749fab6..e7f8b10cca 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -39,6 +39,7 @@
 #include "llmarketplacefunctions.h"
 #include "llmenugl.h"
 #include "llnotificationsutil.h"
+#include "lltrans.h"
 #include "llviewerfoldertype.h"
 #include "llviewerwindow.h"
 #include "llvoavatarself.h"
@@ -220,20 +221,9 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("delete" == action)
     {
-        if (is_folder)
-        {
-            if(get_is_category_removable(&gInventory, selected_id))
-            {
-                gInventory.removeCategory(selected_id);
-            }
-        }
-        else
-        {
-            if(get_is_item_removable(&gInventory, selected_id))
-            {
-                gInventory.removeItem(selected_id);
-            }
-        }
+        LLSD args;
+        args["QUESTION"] = LLTrans::getString("DeleteItem");
+        LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGalleryContextMenu::onDelete, _1, _2, selected_id));
     }
     else if ("copy" == action)
     {
@@ -342,6 +332,33 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
 }
 
+void LLInventoryGalleryContextMenu::onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (option == 0)
+    {
+        LLInventoryObject* obj = gInventory.getObject(selected_id);
+        if (!obj)
+        {
+            return;
+        }
+        if (obj->getType() == LLAssetType::AT_CATEGORY)
+        {
+            if(get_is_category_removable(&gInventory, selected_id))
+            {
+                gInventory.removeCategory(selected_id);
+            }
+        }
+        else
+        {
+            if(get_is_item_removable(&gInventory, selected_id))
+            {
+                gInventory.removeItem(selected_id);
+            }
+        }
+    }
+}
+
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
diff --git a/indra/newview/llinventorygallerymenu.h b/indra/newview/llinventorygallerymenu.h
index 67cf9a569a..1c56266310 100644
--- a/indra/newview/llinventorygallerymenu.h
+++ b/indra/newview/llinventorygallerymenu.h
@@ -47,6 +47,7 @@ protected:
 
     void fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id);
 
+    static void onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id);
     static void onRename(const LLSD& notification, const LLSD& response);
 
 private:
-- 
cgit v1.2.3


From 53fc42fe032c2aef453f420645b0e46dea4c23db Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 8 Jun 2023 22:50:12 +0300
Subject: SL-19832 Inventory gallery should support CTRL+X, C and V

---
 indra/newview/llinventorygallery.cpp     | 235 ++++++++++++++++++++++++++++++-
 indra/newview/llinventorygallery.h       |  15 +-
 indra/newview/llinventorygallerymenu.cpp |  32 +----
 3 files changed, 254 insertions(+), 28 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 63a706a9d6..eff43e33ca 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -29,6 +29,7 @@
 #include "llinventorygallery.h"
 #include "llinventorygallerymenu.h"
 
+#include "llclipboard.h"
 #include "llcommonutils.h"
 #include "lliconctrl.h"
 #include "llinventorybridge.h"
@@ -133,6 +134,11 @@ BOOL LLInventoryGallery::postBuild()
 
 LLInventoryGallery::~LLInventoryGallery()
 {
+    if (gEditMenuHandler == this)
+    {
+        gEditMenuHandler = NULL;
+    }
+
     delete mInventoryGalleryMenu;
     delete mRootGalleryMenu;
     delete mFilter;
@@ -1009,6 +1015,7 @@ void LLInventoryGallery::moveUp()
                 LLUUID item_id = item->getUUID();
                 changeItemSelection(item_id, true);
                 item->setFocus(TRUE);
+                claimEditHandler();
             }
         }
     }
@@ -1031,6 +1038,7 @@ void LLInventoryGallery::moveDown()
                 LLUUID item_id = item->getUUID();
                 changeItemSelection(item_id, true);
                 item->setFocus(TRUE);
+                claimEditHandler();
             }
         }
     }
@@ -1056,6 +1064,7 @@ void LLInventoryGallery::moveLeft()
             LLUUID item_id = item->getUUID();
             changeItemSelection(item_id, true);
             item->setFocus(TRUE);
+            claimEditHandler();
         }
     }
 }
@@ -1079,6 +1088,7 @@ void LLInventoryGallery::moveRight()
             LLUUID item_id = item->getUUID();
             changeItemSelection(item_id, true);
             item->setFocus(TRUE);
+            claimEditHandler();
         }
     }
 }
@@ -1154,6 +1164,227 @@ LLInventoryGalleryItem* LLInventoryGallery::getSelectedItem()
     return mItemMap[mSelectedItemID];
 }
 
+void LLInventoryGallery::copy()
+{
+    LLClipboard::instance().reset();
+    if (getVisible() && getEnabled() && mSelectedItemID.notNull())
+    {
+        LLClipboard::instance().addToClipboard(mSelectedItemID);
+    }
+    mFilterSubString.clear();
+}
+
+BOOL LLInventoryGallery::canCopy() const
+{
+    if (!getVisible() || !getEnabled() || mSelectedItemID.isNull())
+    {
+        return FALSE;
+    }
+
+    if (!isItemCopyable(mSelectedItemID))
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+void LLInventoryGallery::cut()
+{
+    // clear the inventory clipboard
+    LLClipboard::instance().reset();
+    if (getVisible() && getEnabled() && mSelectedItemID.notNull())
+    {
+        // todo: fade out selected item
+        LLClipboard::instance().setCutMode(true);
+        LLClipboard::instance().addToClipboard(mSelectedItemID);
+    }
+    mFilterSubString.clear();
+}
+
+BOOL LLInventoryGallery::canCut() const
+{
+    if (!getVisible() || !getEnabled() || mSelectedItemID.isNull())
+    {
+        return FALSE;
+    }
+
+    LLViewerInventoryCategory* cat = gInventory.getCategory(mSelectedItemID);
+    if (cat)
+    {
+        if (!get_is_category_removable(&gInventory, mSelectedItemID))
+        {
+            return FALSE;
+        }
+    }
+    else if (!get_is_item_removable(&gInventory, mSelectedItemID))
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+void LLInventoryGallery::paste()
+{
+    const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+    if (gInventory.isObjectDescendentOf(mSelectedItemID, marketplacelistings_id))
+    {
+        return;
+    }
+
+    LLInventoryObject* obj = gInventory.getObject(mSelectedItemID);
+    bool is_folder = obj && (obj->getType() == LLAssetType::AT_CATEGORY);
+    LLUUID dest = is_folder ? mSelectedItemID : mFolderID;
+    bool is_cut_mode = LLClipboard::instance().isCutMode();
+
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+    for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
+    {
+        const LLUUID& item_id = (*iter);
+        if (gInventory.isObjectDescendentOf(item_id, marketplacelistings_id) && (LLMarketplaceData::instance().isInActiveFolder(item_id) ||
+                                                                                 LLMarketplaceData::instance().isListedAndActive(item_id)))
+        {
+            return;
+        }
+        LLViewerInventoryCategory* cat = gInventory.getCategory(item_id);
+        if (cat)
+        {
+            if (is_cut_mode)
+            {
+                gInventory.changeCategoryParent(cat, dest, false);
+            }
+            else
+            {
+                copy_inventory_category(&gInventory, cat, dest);
+            }
+        }
+        else
+        {
+            LLViewerInventoryItem* item = gInventory.getItem(item_id);
+            if (item)
+            {
+                if (is_cut_mode)
+                {
+                    gInventory.changeItemParent(item, dest, false);
+                }
+                else
+                {
+                    if (item->getIsLinkType())
+                    {
+                        link_inventory_object(dest, item_id,
+                                              LLPointer<LLInventoryCallback>(NULL));
+                    }
+                    else
+                    {
+                        copy_inventory_item(
+                            gAgent.getID(),
+                            item->getPermissions().getOwner(),
+                            item->getUUID(),
+                            dest,
+                            std::string(),
+                            LLPointer<LLInventoryCallback>(NULL));
+                    }
+                }
+            }
+        }
+    }
+    // todo: scroll to item on arrival
+    LLClipboard::instance().setCutMode(false);
+}
+
+BOOL LLInventoryGallery::canPaste() const
+{
+    // Return FALSE on degenerated cases: empty clipboard, no inventory, no agent
+    if (!LLClipboard::instance().hasContents())
+    {
+        return FALSE;
+    }
+
+    // In cut mode, whatever is on the clipboard is always pastable
+    if (LLClipboard::instance().isCutMode())
+    {
+        return TRUE;
+    }
+
+    // In normal mode, we need to check each element of the clipboard to know if we can paste or not
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+    S32 count = objects.size();
+    for (S32 i = 0; i < count; i++)
+    {
+        const LLUUID& item_id = objects.at(i);
+
+        // Each item must be copyable to be pastable
+        if (!isItemCopyable(item_id))
+        {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+void LLInventoryGallery::claimEditHandler()
+{
+    gEditMenuHandler = this;
+}
+
+bool LLInventoryGallery::isItemCopyable(const LLUUID & item_id)
+{
+    const LLInventoryCategory* cat = gInventory.getCategory(item_id);
+    if (cat)
+    {
+        // Folders are copyable if items in them are, recursively, copyable.
+        // Get the content of the folder
+        LLInventoryModel::cat_array_t* cat_array;
+        LLInventoryModel::item_array_t* item_array;
+        gInventory.getDirectDescendentsOf(item_id, cat_array, item_array);
+
+        // Check the items
+        LLInventoryModel::item_array_t item_array_copy = *item_array;
+        for (LLInventoryModel::item_array_t::iterator iter = item_array_copy.begin(); iter != item_array_copy.end(); iter++)
+        {
+            LLInventoryItem* item = *iter;
+            if (!isItemCopyable(item->getUUID()))
+            {
+                return false;
+            }
+        }
+
+        // Check the folders
+        LLInventoryModel::cat_array_t cat_array_copy = *cat_array;
+        for (LLInventoryModel::cat_array_t::iterator iter = cat_array_copy.begin(); iter != cat_array_copy.end(); iter++)
+        {
+            LLViewerInventoryCategory* category = *iter;
+            if (!isItemCopyable(category->getUUID()))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    LLViewerInventoryItem* item = gInventory.getItem(item_id);
+    if (item)
+    {
+        // Can't copy worn objects.
+        // Worn objects are tied to their inworld conterparts
+        // Copy of modified worn object will return object with obsolete asset and inventory
+        if (get_is_item_worn(item_id))
+        {
+            return false;
+        }
+
+        static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryLinking", true);
+        return (item->getIsLinkType() && inventory_linking)
+            || item->getPermissions().allowCopyBy(gAgent.getID());
+    }
+
+    return false;
+}
+
 void LLInventoryGallery::updateMessageVisibility()
 {
 
@@ -1666,6 +1897,7 @@ void LLInventoryGalleryItem::setSelected(bool value)
 BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
 {
     setFocus(TRUE);
+    mGallery->claimEditHandler();
 
     gFocusMgr.setMouseCapture(this);
     S32 screen_x;
@@ -1678,6 +1910,8 @@ BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
 BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
     setFocus(TRUE);
+    mGallery->claimEditHandler();
+
     return LLUICtrl::handleRightMouseDown(x, y, mask);
 }
 
@@ -1763,7 +1997,6 @@ BOOL LLInventoryGalleryItem::handleKeyHere(KEY key, MASK mask)
     BOOL handled = FALSE;
     switch (key)
     {
-
         case KEY_LEFT:
             mGallery->moveLeft();
             handled = true;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index e2d9786296..ac4811adec 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -45,7 +45,7 @@ class LLInventoryGalleryContextMenu;
 
 typedef boost::function<void()> callback_t;
 
-class LLInventoryGallery : public LLPanel
+class LLInventoryGallery : public LLPanel, public LLEditMenuHandler
 {
 public:
 
@@ -139,6 +139,19 @@ public:
     LLScrollContainer* getScrollableContainer() { return mScrollPanel; }
     LLInventoryGalleryItem* getSelectedItem();
 
+    // Copy & paste (LLEditMenuHandler)
+    void	copy() override;
+    BOOL	canCopy() const override;
+
+    void	cut() override;
+    BOOL	canCut() const override;
+
+    void paste() override;
+    BOOL canPaste() const override;
+
+    void claimEditHandler();
+    static bool isItemCopyable(const LLUUID & item_id);
+
 protected:
 
     void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index e7f8b10cca..bc4b28b584 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -134,20 +134,10 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("cut" == action)
     {
-            bool allow = false;
-            if(is_folder)
-            {
-                allow = get_is_category_removable(&gInventory, selected_id);
-            }
-            else
-            {
-                allow = get_is_item_removable(&gInventory, selected_id);
-            }
-            if(allow)
-            {
-                LLClipboard::instance().setCutMode(true);
-                LLClipboard::instance().addToClipboard(selected_id);
-            }
+        if (mGallery->canCut())
+        {
+            mGallery->cut();
+        }
     }
     else if ("paste" == action)
     {
@@ -227,19 +217,9 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("copy" == action)
     {
-        if(is_folder)
+        if (mGallery->canCopy())
         {
-            LLClipboard::instance().reset();
-            LLClipboard::instance().addToClipboard(selected_id);
-        }
-        else
-        {
-            LLViewerInventoryItem* inv_item = gInventory.getItem(selected_id);
-            if (inv_item && inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()) && !get_is_item_worn(selected_id))
-            {
-                LLClipboard::instance().reset();
-                LLClipboard::instance().addToClipboard(selected_id);
-            }
+            mGallery->copy();
         }
     }
     else if ("paste_link" == action)
-- 
cgit v1.2.3


From f8823a426383949fb1609fa82b5ebb98ef2c295b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 8 Jun 2023 23:25:12 +0300
Subject: SL-19845 show delete confirmation at least once per session

---
 indra/newview/llinventoryfunctions.cpp   | 6 +++---
 indra/newview/llinventoryfunctions.h     | 2 +-
 indra/newview/llinventorygallerymenu.cpp | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index a259dad08a..0b024536ae 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -96,6 +96,7 @@
 BOOL LLInventoryState::sWearNewClothing = FALSE;
 LLUUID LLInventoryState::sWearNewClothingTransactionID;
 std::list<LLUUID> LLInventoryAction::sMarketplaceFolders;
+bool LLInventoryAction::sDeleteConfirmationDisplayed = false;
 
 // Helper function : callback to update a folder after inventory action happened in the background
 void update_folder_cb(const LLUUID& dest_folder)
@@ -2940,7 +2941,6 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
     
 	if ("delete" == action)
 	{
-		static bool sDisplayedAtSession = false;
 		const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
 		bool marketplacelistings_item = false;
 		LLAllDescendentsPassedFilter f;
@@ -2964,10 +2964,10 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 		}
 		else
 		{
-			if (!sDisplayedAtSession) // ask for the confirmation at least once per session
+			if (!sDeleteConfirmationDisplayed) // ask for the confirmation at least once per session
 			{
 				LLNotifications::instance().setIgnored("DeleteItems", false);
-				sDisplayedAtSession = true;
+				sDeleteConfirmationDisplayed = true;
 			}
 
 			LLSD args;
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 1b0f598bf5..914d9da620 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -551,7 +551,7 @@ struct LLInventoryAction
 
     static void saveMultipleTextures(const std::vector<std::string>& filenames, std::set<LLFolderViewItem*> selected_items, LLInventoryModel* model);
 
-	static const int sConfirmOnDeleteItemsNumber;
+    static bool sDeleteConfirmationDisplayed;
 
 private:
 	static void buildMarketplaceFolders(LLFolderView* root);
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index bc4b28b584..b090434528 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -211,6 +211,12 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("delete" == action)
     {
+        if (!LLInventoryAction::sDeleteConfirmationDisplayed) // ask for the confirmation at least once per session
+        {
+            LLNotifications::instance().setIgnored("DeleteItems", false);
+            LLInventoryAction::sDeleteConfirmationDisplayed = true;
+        }
+
         LLSD args;
         args["QUESTION"] = LLTrans::getString("DeleteItem");
         LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGalleryContextMenu::onDelete, _1, _2, selected_id));
-- 
cgit v1.2.3


From a358acf86ddf19aab96ad26a8f4db9cf609bdce7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 9 Jun 2023 00:34:03 +0300
Subject: SL-19845 Show delete confirmation for 'delete' key

---
 indra/newview/llinventorygallery.cpp     | 59 +++++++++++++++++++++++---------
 indra/newview/llinventorygallery.h       |  3 ++
 indra/newview/llinventorygallerymenu.cpp | 37 +-------------------
 indra/newview/llinventorygallerymenu.h   |  1 -
 4 files changed, 46 insertions(+), 54 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index eff43e33ca..189fb33334 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -46,6 +46,7 @@
 #include "llfriendcard.h"
 #include "llgesturemgr.h"
 #include "llmarketplacefunctions.h"
+#include "llnotificationsutil.h"
 #include "lloutfitobserver.h"
 #include "lltrans.h"
 #include "llviewerassettype.h"
@@ -901,23 +902,7 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
             // Note: on Mac laptop keyboards, backspace and delete are one and the same
             if (mSelectedItemID.notNull())
             {
-                LLViewerInventoryCategory* category = gInventory.getCategory(mSelectedItemID);
-                if (category)
-                {
-                    if (get_is_category_removable(&gInventory, mSelectedItemID))
-                    {
-                        gInventory.removeCategory(mSelectedItemID);
-                        handled = TRUE;
-                    }
-                }
-                else
-                {
-                    if (get_is_item_removable(&gInventory, mSelectedItemID))
-                    {
-                        gInventory.removeItem(mSelectedItemID);
-                        handled = TRUE;
-                    }
-                }
+                deleteSelection();
             }
             break;
 
@@ -1325,6 +1310,46 @@ BOOL LLInventoryGallery::canPaste() const
     return TRUE;
 }
 
+void LLInventoryGallery::onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (option == 0)
+    {
+        LLInventoryObject* obj = gInventory.getObject(selected_id);
+        if (!obj)
+        {
+            return;
+        }
+        if (obj->getType() == LLAssetType::AT_CATEGORY)
+        {
+            if (get_is_category_removable(&gInventory, selected_id))
+            {
+                gInventory.removeCategory(selected_id);
+            }
+        }
+        else
+        {
+            if (get_is_item_removable(&gInventory, selected_id))
+            {
+                gInventory.removeItem(selected_id);
+            }
+        }
+    }
+}
+
+void LLInventoryGallery::deleteSelection()
+{
+    if (!LLInventoryAction::sDeleteConfirmationDisplayed) // ask for the confirmation at least once per session
+    {
+        LLNotifications::instance().setIgnored("DeleteItems", false);
+        LLInventoryAction::sDeleteConfirmationDisplayed = true;
+    }
+
+    LLSD args;
+    args["QUESTION"] = LLTrans::getString("DeleteItem");
+    LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGallery::onDelete, _1, _2, mSelectedItemID));
+}
+
 void LLInventoryGallery::claimEditHandler()
 {
     gEditMenuHandler = this;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index ac4811adec..54588a3907 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -149,6 +149,9 @@ public:
     void paste() override;
     BOOL canPaste() const override;
 
+    static void onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id);
+    void deleteSelection();
+
     void claimEditHandler();
     static bool isItemCopyable(const LLUUID & item_id);
 
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index b090434528..54b9294ce1 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -211,15 +211,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("delete" == action)
     {
-        if (!LLInventoryAction::sDeleteConfirmationDisplayed) // ask for the confirmation at least once per session
-        {
-            LLNotifications::instance().setIgnored("DeleteItems", false);
-            LLInventoryAction::sDeleteConfirmationDisplayed = true;
-        }
-
-        LLSD args;
-        args["QUESTION"] = LLTrans::getString("DeleteItem");
-        LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGalleryContextMenu::onDelete, _1, _2, selected_id));
+        mGallery->deleteSelection();
     }
     else if ("copy" == action)
     {
@@ -318,33 +310,6 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
 }
 
-void LLInventoryGalleryContextMenu::onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id)
-{
-    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    if (option == 0)
-    {
-        LLInventoryObject* obj = gInventory.getObject(selected_id);
-        if (!obj)
-        {
-            return;
-        }
-        if (obj->getType() == LLAssetType::AT_CATEGORY)
-        {
-            if(get_is_category_removable(&gInventory, selected_id))
-            {
-                gInventory.removeCategory(selected_id);
-            }
-        }
-        else
-        {
-            if(get_is_item_removable(&gInventory, selected_id))
-            {
-                gInventory.removeItem(selected_id);
-            }
-        }
-    }
-}
-
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
diff --git a/indra/newview/llinventorygallerymenu.h b/indra/newview/llinventorygallerymenu.h
index 1c56266310..67cf9a569a 100644
--- a/indra/newview/llinventorygallerymenu.h
+++ b/indra/newview/llinventorygallerymenu.h
@@ -47,7 +47,6 @@ protected:
 
     void fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id);
 
-    static void onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id);
     static void onRename(const LLSD& notification, const LLSD& response);
 
 private:
-- 
cgit v1.2.3


From eb95bf5da2996b54b65552bfa84f49bfc157520f Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 9 Jun 2023 13:12:45 +0200
Subject: SL-18977 Borders of inventory view in inventory floater seem to be
 cut a bit

---
 indra/llui/llscrollcontainer.cpp                      |  1 +
 indra/newview/llinventorypanel.cpp                    | 19 ++++++++++---------
 .../skins/default/xui/en/panel_outfits_wearing.xml    |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index 3db38bbfac..c4cb739f0a 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -126,6 +126,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	
 	LLRect horizontal_scroll_rect = mInnerRect;
 	horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + scrollbar_size;
+	horizontal_scroll_rect.mLeft += 3;
 	sbparams.name("scrollable horizontal");
 	sbparams.rect(horizontal_scroll_rect);
 	sbparams.orientation(LLScrollbar::HORIZONTAL);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 3b8aa3f296..53753b6c6b 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -294,16 +294,17 @@ void LLInventoryPanel::initFolderRoot()
     mFolderRoot.get()->setEnableRegistrar(&mEnableCallbackRegistrar);
     
     // Scroller
-        LLRect scroller_view_rect = getRect();
-        scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
+    LLRect scroller_view_rect = getRect();
+    scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
+	scroller_view_rect.mTop -= 3;
     LLScrollContainer::Params scroller_params(mParams.scroll());
-        scroller_params.rect(scroller_view_rect);
-        mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
-        addChild(mScroller);
-        mScroller->addChild(mFolderRoot.get());
-        mFolderRoot.get()->setScrollContainer(mScroller);
-        mFolderRoot.get()->setFollowsAll();
-        mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
+    scroller_params.rect(scroller_view_rect);
+    mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
+    addChild(mScroller);
+    mScroller->addChild(mFolderRoot.get());
+    mFolderRoot.get()->setScrollContainer(mScroller);
+    mFolderRoot.get()->setFollowsAll();
+    mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);
 
     if (mSelectionCallback)
     {
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
index b2dc975c6e..ceaff0ea69 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -18,7 +18,7 @@
      follows="all"
      height="400"
      layout="topleft"
-     left="0"
+     left="3"
      single_expansion="true"
      top="0"
      name="wearables_accordion"
-- 
cgit v1.2.3


From 1e72b8a46c6c603eac6137d95d8ac7f7a27fe967 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 9 Jun 2023 17:06:57 +0200
Subject: SL-19844 People floater - Remove the 'Remove friend' menu item

---
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index c1500d4e7c..425de6cab8 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -75,7 +75,7 @@
      name="remove_friend">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
-        <menu_item_call.on_enable
+        <menu_item_call.on_visible
          function="Avatar.EnableItem"
          parameter="can_delete" />
     </menu_item_call>
-- 
cgit v1.2.3


From aede902040625b145d36812a3ef29e7677cb1154 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 9 Jun 2023 20:10:46 +0300
Subject: SL-19826 WIP Pasting folders in Single folder view does not give
 feedback of where the folder is pasted

Should resort freshly inserted or dropped folders, does not cover pasting yet
---
 indra/newview/llinventorygallery.cpp | 64 +++++++++++++++++++++++++++++++-----
 indra/newview/llinventorygallery.h   |  6 ++++
 2 files changed, 61 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 189fb33334..358b4e457a 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -59,8 +59,6 @@ static LLPanelInjector<LLInventoryGallery> t_inventory_gallery("inventory_galler
 const S32 GALLERY_ITEMS_PER_ROW_MIN = 2;
 
 // Helper dnd functions
-BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop, EDragAndDropType cargo_type,
-                           void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
 BOOL dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat, BOOL drop, std::string& tooltip_msg, BOOL is_link);
 BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg, BOOL user_confirm);
 void dropToMyOutfits(LLInventoryCategory* inv_cat);
@@ -87,6 +85,7 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mRowPanWidthFactor(p.row_panel_width_factor),
       mGalleryWidthFactor(p.gallery_width_factor),
       mIsInitialized(false),
+      mNeedsArrange(false),
       mSearchType(LLInventoryFilter::SEARCHTYPE_NAME)
 {
     updateGalleryWidth();
@@ -143,6 +142,8 @@ LLInventoryGallery::~LLInventoryGallery()
     delete mInventoryGalleryMenu;
     delete mRootGalleryMenu;
     delete mFilter;
+    
+    gIdleCallbacks.deleteFunction(onIdle, this);
 
     while (!mUnusedRowPanels.empty())
     {
@@ -175,6 +176,8 @@ LLInventoryGallery::~LLInventoryGallery()
 
 void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
 {
+    gIdleCallbacks.deleteFunction(onIdle, this);
+
     LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
     if(!category || (mFolderID == cat_id))
     {
@@ -688,6 +691,33 @@ bool LLInventoryGallery::checkAgainstFilters(LLInventoryGalleryItem* item, const
     return !hidden;
 }
 
+void LLInventoryGallery::onIdle(void* userdata)
+{
+    LLInventoryGallery* self = (LLInventoryGallery*)userdata;
+
+    if (!self->mIsInitialized || !self->mGalleryCreated)
+    {
+        self->mNeedsArrange = false;
+        return;
+    }
+
+    if (self->mNeedsArrange)
+    {
+        self->mNeedsArrange = false;
+        self->reArrangeRows();
+    }
+
+    if (self->mItemToSelect.notNull())
+    {
+        self->changeItemSelection(self->mItemToSelect, true);
+    }
+
+    if (self->mItemToSelect.isNull())
+    {
+        gIdleCallbacks.deleteFunction(onIdle, (void*)self);
+    }
+}
+
 void LLInventoryGallery::setSearchType(LLInventoryFilter::ESearchType type)
 {
     if(mSearchType != type)
@@ -1090,14 +1120,13 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
 
 void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_to_selection)
 {
-    if ((mItemMap.count(item_id) == 0))
+    if ((mItemMap.count(item_id) == 0) || mNeedsArrange)
     {
         mItemToSelect = item_id;
         return;
     }
     if (mSelectedItemID != item_id)
     {
-        
         if (mItemMap[mSelectedItemID])
         {
             mItemMap[mSelectedItemID]->setSelected(FALSE);
@@ -1441,6 +1470,7 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id)
     {
         const LLUUID cat_id = (*iter);
         updateAddedItem(cat_id);
+        mNeedsArrange = true;
     }
 
     // Handle removed tabs.
@@ -1462,11 +1492,14 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id)
         }
 
         updateChangedItemName(*items_iter, obj->getName());
+        mNeedsArrange = true;
     }
 
-    if(mItemToSelect.notNull())
+    if(mNeedsArrange || mItemToSelect.notNull())
     {
-        changeItemSelection(mItemToSelect, true);
+        // Don't scroll to target/arrange immediately
+        // since more updates might be pending
+        gIdleCallbacks.addFunction(onIdle, (void*)this);
     }
     updateMessageVisibility();
 }
@@ -2009,7 +2042,7 @@ BOOL LLInventoryGalleryItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL dro
     {
         return FALSE;
     }
-    return baseHandleDragAndDrop(mUUID, drop, cargo_type, cargo_data, accept, tooltip_msg);
+    return mGallery->baseHandleDragAndDrop(mUUID, drop, cargo_type, cargo_data, accept, tooltip_msg);
 }
 
 BOOL LLInventoryGalleryItem::handleKeyHere(KEY key, MASK mask)
@@ -2178,7 +2211,7 @@ void LLThumbnailsObserver::removeSkippedItem(const LLUUID& obj_id)
 // Helper drag&drop functions
 //-----------------------------
 
-BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
+BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
                        EDragAndDropType cargo_type,
                        void* cargo_data,
                        EAcceptance* accept,
@@ -2203,6 +2236,10 @@ BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
         case DAD_MESH:
         case DAD_SETTINGS:
             accepted = dragItemIntoFolder(dest_id, inv_item, drop, tooltip_msg, true);
+            if (accepted && drop)
+            {
+                mItemToSelect = inv_item->getUUID();
+            }
             break;
         case DAD_LINK:
             // DAD_LINK type might mean one of two asset types: AT_LINK or AT_LINK_FOLDER.
@@ -2220,6 +2257,10 @@ BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             {
                 accepted = dragItemIntoFolder(dest_id, inv_item, drop, tooltip_msg, TRUE);
             }
+            if (accepted && drop)
+            {
+                mItemToSelect = inv_item->getUUID();
+            }
             break;
         case DAD_CATEGORY:
             if (LLFriendCardsManager::instance().isAnyFriendCategory(dest_id))
@@ -2228,7 +2269,12 @@ BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             }
             else
             {
-                accepted = dragCategoryIntoFolder(dest_id, (LLInventoryCategory*)cargo_data, drop, tooltip_msg, FALSE);
+                LLInventoryCategory* cat_ptr = (LLInventoryCategory*)cargo_data;
+                accepted = dragCategoryIntoFolder(dest_id, cat_ptr, drop, tooltip_msg, FALSE);
+                if (accepted && drop)
+                {
+                    mItemToSelect = cat_ptr->getUUID();
+                }
             }
             break;
         case DAD_ROOT_CATEGORY:
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 54588a3907..3797b9bc61 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -155,16 +155,21 @@ public:
     void claimEditHandler();
     static bool isItemCopyable(const LLUUID & item_id);
 
+    BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop, EDragAndDropType cargo_type,
+                               void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
+
 protected:
 
     void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
 
     void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
     bool checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring);
+    static void onIdle(void* userdata);
 
     LLInventoryCategoriesObserver*     mCategoriesObserver;
     LLThumbnailsObserver*              mThumbnailsObserver;
     LLGalleryGestureObserver*          mGestureObserver;
+    LLInventoryObserver*               mInventoryObserver;
     LLUUID                             mSelectedItemID;
     LLUUID                             mItemToSelect;
     bool                               mIsInitialized;
@@ -211,6 +216,7 @@ private:
     int mRowCount;
     int mItemsAddedCount;
     bool mGalleryCreated;
+    bool mNeedsArrange;
 
     /* Params */
     int mRowPanelHeight;
-- 
cgit v1.2.3


From 5c6a2779c498e69e36276700283ccfb4bdbfd438 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 9 Jun 2023 22:04:52 +0300
Subject: SL-19826 Pasting folders in Single folder should highlight pasted
 folder

---
 indra/newview/llinventoryfunctions.cpp   |  30 +++++--
 indra/newview/llinventoryfunctions.h     |   1 +
 indra/newview/llinventorygallery.cpp     | 150 +++++++++++++++++++++++++------
 indra/newview/llinventorygallery.h       |   2 +
 indra/newview/llinventorygallerymenu.cpp |  97 +-------------------
 5 files changed, 152 insertions(+), 128 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 0b024536ae..034488c011 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -401,14 +401,32 @@ void rename_category(LLInventoryModel* model, const LLUUID& cat_id, const std::s
 }
 
 void copy_inventory_category(LLInventoryModel* model,
-							 LLViewerInventoryCategory* cat,
-							 const LLUUID& parent_id,
-							 const LLUUID& root_copy_id,
-							 bool move_no_copy_items )
+                             LLViewerInventoryCategory* cat,
+                             const LLUUID& parent_id,
+                             const LLUUID& root_copy_id,
+                             bool move_no_copy_items)
+{
+    // Create the initial folder
+    inventory_func_type func = [model, cat, root_copy_id, move_no_copy_items](const LLUUID& new_id)
+    {
+        copy_inventory_category_content(new_id, model, cat, root_copy_id, move_no_copy_items);
+    };
+    gInventory.createNewCategory(parent_id, LLFolderType::FT_NONE, cat->getName(), func, cat->getThumbnailUUID());
+}
+
+void copy_inventory_category(LLInventoryModel* model,
+                             LLViewerInventoryCategory* cat,
+                             const LLUUID& parent_id,
+                             const LLUUID& root_copy_id,
+                             bool move_no_copy_items,
+                             inventory_func_type callback)
 {
 	// Create the initial folder
-	// D567 needs to handle new fields
-	inventory_func_type func = boost::bind(&copy_inventory_category_content, _1, model, cat, root_copy_id, move_no_copy_items);
+    inventory_func_type func = [model, cat, root_copy_id, move_no_copy_items, callback](const LLUUID &new_id)
+    {
+        copy_inventory_category_content(new_id, model, cat, root_copy_id, move_no_copy_items);
+        callback(new_id);
+    };
 	gInventory.createNewCategory(parent_id, LLFolderType::FT_NONE, cat->getName(), func, cat->getThumbnailUUID());
 }
 
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 914d9da620..f19cadaded 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -75,6 +75,7 @@ void update_all_marketplace_count();
 void rename_category(LLInventoryModel* model, const LLUUID& cat_id, const std::string& new_name);
 
 void copy_inventory_category(LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& parent_id, const LLUUID& root_copy_id = LLUUID::null, bool move_no_copy_items = false);
+void copy_inventory_category(LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& parent_id, const LLUUID& root_copy_id, bool move_no_copy_items, inventory_func_type callback);
 
 void copy_inventory_category_content(const LLUUID& new_cat_uuid, LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& root_copy_id, bool move_no_copy_items);
 
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 358b4e457a..412e9e9c0b 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -709,7 +709,9 @@ void LLInventoryGallery::onIdle(void* userdata)
 
     if (self->mItemToSelect.notNull())
     {
-        self->changeItemSelection(self->mItemToSelect, true);
+        LLUUID item_to_select = self->mItemToSelect;
+        self->mItemToSelect = LLUUID::null;
+        self->changeItemSelection(item_to_select, true);
     }
 
     if (self->mItemToSelect.isNull())
@@ -879,12 +881,14 @@ void LLInventoryGallery::onThumbnailAdded(LLUUID item_id)
 
 BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-    if(mItemMap[mSelectedItemID])
+    LLUUID old_selection = mSelectedItemID;
+    BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
+    if (!res)
     {
-        mItemMap[mSelectedItemID]->setFocus(false);
+        clearSelection();
+        mItemMap[old_selection]->setFocus(false);
     }
-    clearSelection();
-    BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
+
     if (mSelectedItemID.isNull())
     {
         if (mInventoryGalleryMenu && mFolderID.notNull())
@@ -1125,24 +1129,30 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
         mItemToSelect = item_id;
         return;
     }
-    if (mSelectedItemID != item_id)
+    if (mSelectedItemID == item_id)
     {
-        if (mItemMap[mSelectedItemID])
-        {
-            mItemMap[mSelectedItemID]->setSelected(FALSE);
-        }
-        if (mItemMap[item_id])
-        {
-            mItemMap[item_id]->setSelected(TRUE);
-        }
-        mSelectedItemID = item_id;
-        signalSelectionItemID(item_id);
+        return;
+    }
+    if (mNeedsArrange && item_id.notNull() && scroll_to_selection)
+    {
+        mItemToSelect = item_id;
+        return;
+    }
 
-        mItemToSelect = LLUUID::null;
-        if(scroll_to_selection)
-        {
-            scrollToShowItem(mSelectedItemID);
-        }
+    if (mItemMap[mSelectedItemID])
+    {
+        mItemMap[mSelectedItemID]->setSelected(FALSE);
+    }
+    if (mItemMap[item_id])
+    {
+        mItemMap[item_id]->setSelected(TRUE);
+    }
+    mSelectedItemID = item_id;
+    signalSelectionItemID(item_id);
+
+    if (scroll_to_selection)
+    {
+        scrollToShowItem(mSelectedItemID);
     }
 }
 
@@ -1241,6 +1251,11 @@ BOOL LLInventoryGallery::canCut() const
 
 void LLInventoryGallery::paste()
 {
+    if (!LLClipboard::instance().hasContents())
+    {
+        return;
+    }
+
     const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     if (gInventory.isObjectDescendentOf(mSelectedItemID, marketplacelistings_id))
     {
@@ -1254,6 +1269,20 @@ void LLInventoryGallery::paste()
 
     std::vector<LLUUID> objects;
     LLClipboard::instance().pasteFromClipboard(objects);
+
+    LLHandle<LLPanel> handle = getHandle();
+    std::function <void(const LLUUID)> on_copy_callback = [handle](const LLUUID& inv_item)
+    {
+        LLInventoryGallery* panel = (LLInventoryGallery*)handle.get();
+        if (panel)
+        {
+            // Scroll to pasted item and highlight it
+            // Should it only highlight the last one?
+            panel->changeItemSelection(inv_item, true);
+        }
+    };
+    LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(on_copy_callback);
+
     for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
     {
         const LLUUID& item_id = (*iter);
@@ -1268,10 +1297,12 @@ void LLInventoryGallery::paste()
             if (is_cut_mode)
             {
                 gInventory.changeCategoryParent(cat, dest, false);
+                // Don't select immediately, wait for item to arrive
+                mItemToSelect = item_id;
             }
             else
             {
-                copy_inventory_category(&gInventory, cat, dest);
+                copy_inventory_category(&gInventory, cat, dest, LLUUID::null, false, on_copy_callback);
             }
         }
         else
@@ -1282,13 +1313,14 @@ void LLInventoryGallery::paste()
                 if (is_cut_mode)
                 {
                     gInventory.changeItemParent(item, dest, false);
+                    // Don't select immediately, wait for item to arrive
+                    mItemToSelect = item_id;
                 }
                 else
                 {
                     if (item->getIsLinkType())
                     {
-                        link_inventory_object(dest, item_id,
-                                              LLPointer<LLInventoryCallback>(NULL));
+                        link_inventory_object(dest, item_id, cb);
                     }
                     else
                     {
@@ -1298,13 +1330,13 @@ void LLInventoryGallery::paste()
                             item->getUUID(),
                             dest,
                             std::string(),
-                            LLPointer<LLInventoryCallback>(NULL));
+                            cb);
                     }
                 }
             }
         }
     }
-    // todo: scroll to item on arrival
+
     LLClipboard::instance().setCutMode(false);
 }
 
@@ -1379,6 +1411,66 @@ void LLInventoryGallery::deleteSelection()
     LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGallery::onDelete, _1, _2, mSelectedItemID));
 }
 
+void LLInventoryGallery::pasteAsLink()
+{
+    if (!LLClipboard::instance().hasContents())
+    {
+        return;
+    }
+
+    const LLUUID& current_outfit_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+    const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+    const LLUUID& my_outifts_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+
+    LLUUID dest;
+    LLInventoryObject* obj = gInventory.getObject(mSelectedItemID);
+    if (obj && obj->getType() == LLAssetType::AT_CATEGORY)
+    {
+        dest = mSelectedItemID;
+    }
+    else
+    {
+        dest = mFolderID;
+    }
+
+    const BOOL move_is_into_current_outfit = (dest == current_outfit_id);
+    const BOOL move_is_into_my_outfits = (dest == my_outifts_id) || gInventory.isObjectDescendentOf(dest, my_outifts_id);
+    const BOOL move_is_into_marketplacelistings = gInventory.isObjectDescendentOf(dest, marketplacelistings_id);
+
+    if (move_is_into_marketplacelistings || move_is_into_current_outfit || move_is_into_my_outfits)
+    {
+        return;
+    }
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+
+    LLHandle<LLPanel> handle = getHandle();
+    std::function <void(const LLUUID)> on_link_callback = [handle](const LLUUID& inv_item)
+    {
+        LLInventoryGallery *panel = (LLInventoryGallery*)handle.get();
+        if (panel)
+        {
+            // Scroll to pasted item and highlight it
+            // Should it only highlight the last one?
+            panel->changeItemSelection(inv_item, true);
+        }
+    };
+    LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(on_link_callback);
+
+    for (std::vector<LLUUID>::const_iterator iter = objects.begin();
+         iter != objects.end();
+         ++iter)
+    {
+        const LLUUID& object_id = (*iter);
+        if (LLConstPointer<LLInventoryObject> link_obj = gInventory.getObject(object_id))
+        {
+            link_inventory_object(dest, link_obj, cb);
+        }
+    }
+
+    LLClipboard::instance().setCutMode(false);
+}
+
 void LLInventoryGallery::claimEditHandler()
 {
     gEditMenuHandler = this;
@@ -1970,7 +2062,8 @@ BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
     setFocus(TRUE);
     mGallery->claimEditHandler();
 
-    return LLUICtrl::handleRightMouseDown(x, y, mask);
+    LLUICtrl::handleRightMouseDown(x, y, mask);
+    return TRUE;
 }
 
 BOOL LLInventoryGalleryItem::handleMouseUp(S32 x, S32 y, MASK mask)
@@ -2238,6 +2331,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             accepted = dragItemIntoFolder(dest_id, inv_item, drop, tooltip_msg, true);
             if (accepted && drop)
             {
+                // Don't select immediately, wait for item to arrive
                 mItemToSelect = inv_item->getUUID();
             }
             break;
@@ -2257,7 +2351,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             {
                 accepted = dragItemIntoFolder(dest_id, inv_item, drop, tooltip_msg, TRUE);
             }
-            if (accepted && drop)
+            if (accepted && drop && inv_item)
             {
                 mItemToSelect = inv_item->getUUID();
             }
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 3797b9bc61..e71e2eddcd 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -149,8 +149,10 @@ public:
     void paste() override;
     BOOL canPaste() const override;
 
+    // Copy & paste & delete
     static void onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id);
     void deleteSelection();
+    void pasteAsLink();
 
     void claimEditHandler();
     static bool isItemCopyable(const LLUUID & item_id);
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 54b9294ce1..68ead64839 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -71,8 +71,6 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     LLInventoryObject* obj = gInventory.getObject(selected_id);
     if(!obj) return;
 
-    bool is_folder = (obj->getType() == LLAssetType::AT_CATEGORY);
-
     if ("open_selected_folder" == action)
     {
         mGallery->setRootFolder(selected_id);
@@ -141,72 +139,9 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("paste" == action)
     {
+        if (mGallery->canPaste())
         {
-            const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
-            if(gInventory.isObjectDescendentOf(selected_id, marketplacelistings_id))
-            {
-                return;
-            }
-
-            bool is_cut_mode = (LLClipboard::instance().isCutMode());
-            {
-                LLUUID dest = is_folder ?  selected_id : obj->getParentUUID();
-                
-                std::vector<LLUUID> objects;
-                LLClipboard::instance().pasteFromClipboard(objects);
-                for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
-                {
-                    const LLUUID& item_id = (*iter);
-                    if(gInventory.isObjectDescendentOf(item_id, marketplacelistings_id) && (LLMarketplaceData::instance().isInActiveFolder(item_id) ||
-                        LLMarketplaceData::instance().isListedAndActive(item_id)))
-                    {
-                        return;
-                    }
-                    LLViewerInventoryCategory* cat = gInventory.getCategory(item_id);
-                    if (cat)
-                    {
-                        if(is_cut_mode)
-                        {
-                            gInventory.changeCategoryParent(cat, dest, false);
-                        }
-                        else
-                        {
-                            copy_inventory_category(&gInventory, cat, dest);
-                        }
-                    }
-                    else
-                    {
-                        LLViewerInventoryItem* item = gInventory.getItem(item_id);
-                        if (item)
-                        {
-                            if(is_cut_mode)
-                            {
-                                gInventory.changeItemParent(item, dest, false);
-                            }
-                            else
-                            {
-                                if (item->getIsLinkType())
-                                {
-                                    link_inventory_object(dest, item_id,
-                                        LLPointer<LLInventoryCallback>(NULL));
-                                }
-                                else
-                                {
-                                    copy_inventory_item(
-                                                        gAgent.getID(),
-                                                        item->getPermissions().getOwner(),
-                                                        item->getUUID(),
-                                                        dest,
-                                                        std::string(),
-                                                        LLPointer<LLInventoryCallback>(NULL));
-                                }
-                            }
-                        }
-                    }
-                }
-                LLClipboard::instance().setCutMode(false);
-            }
-            
+            mGallery->paste();
         }
     }
     else if ("delete" == action)
@@ -222,33 +157,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("paste_link" == action)
     {
-        const LLUUID &current_outfit_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
-        const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
-        const LLUUID &my_outifts_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
-
-        const BOOL move_is_into_current_outfit = (selected_id == current_outfit_id);
-        const BOOL move_is_into_my_outfits = (selected_id == my_outifts_id) || gInventory.isObjectDescendentOf(selected_id, my_outifts_id);
-        const BOOL move_is_into_marketplacelistings = gInventory.isObjectDescendentOf(selected_id, marketplacelistings_id);
-
-        if (move_is_into_marketplacelistings || move_is_into_current_outfit || move_is_into_my_outfits)
-        {
-            return;
-        }
-        LLUUID dest = is_folder ?  selected_id : obj->getParentUUID();
-        std::vector<LLUUID> objects;
-        LLClipboard::instance().pasteFromClipboard(objects);
-        for (std::vector<LLUUID>::const_iterator iter = objects.begin();
-             iter != objects.end();
-             ++iter)
-        {
-            const LLUUID &object_id = (*iter);
-            if (LLConstPointer<LLInventoryObject> link_obj = gInventory.getObject(object_id))
-            {
-                link_inventory_object(dest, link_obj, LLPointer<LLInventoryCallback>(NULL));
-            }
-        }
-
-        LLClipboard::instance().setCutMode(false);
+        mGallery->pasteAsLink();
     }
     else if ("rename" == action)
     {
-- 
cgit v1.2.3


From 417dbeb68ef842a8eee22ebab35c89ddee653619 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 10 Jun 2023 01:33:43 +0300
Subject: SL-19823 Edit not always active #5

---
 indra/llui/llfolderview.cpp            | 46 +++++++++++++++++++++-------------
 indra/newview/llinventorygallery.cpp   |  2 +-
 indra/newview/llpanelmaininventory.cpp |  2 +-
 3 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 19855c9c76..8660048058 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -695,19 +695,14 @@ void LLFolderView::draw()
 		}
 	}
 
-	if (mRenameItem
+    if (mRenameItem
         && mRenamer
         && mRenamer->getVisible()
-        )
-	{
-        LLRect renamer_rect;
-        localRectToOtherView(mRenamer->getRect(), &renamer_rect, mScrollContainer);
-        if (!mScrollContainer->getRect().overlaps(renamer_rect))
-        {
-            // renamer is not connected to the item we are renaming in any form so manage it manually
-            // TODO: consider stopping on any scroll action instead of when out of visible area
-            finishRenamingItem();
-        }
+        && !getVisibleRect().overlaps(mRenamer->getRect()))
+    {
+        // renamer is not connected to the item we are renaming in any form so manage it manually
+        // TODO: consider stopping on any scroll action instead of when out of visible area
+        finishRenamingItem();
     }
 
 	// skip over LLFolderViewFolder::draw since we don't want the folder icon, label, 
@@ -1851,13 +1846,28 @@ void LLFolderView::update()
         }
 	}
 
-	if (mSignalSelectCallback)
-	{
-		//RN: we use keyboard focus as a proxy for user-explicit actions
-		BOOL take_keyboard_focus = (mSignalSelectCallback == SIGNAL_KEYBOARD_FOCUS);
-		mSelectSignal(mSelectedItems, take_keyboard_focus);
-	}
-	mSignalSelectCallback = FALSE;
+    if (mSelectedItems.size())
+    {
+        LLFolderViewItem* item = mSelectedItems.back();
+        // If the goal is to show renamer, don't callback untill
+        // item is visible or is no longer being scrolled to.
+        // Otherwise renamer will be instantly closed
+        // Todo: consider moving renamer out of selection callback
+        if (!mNeedsAutoRename || !mNeedsScroll || item->getVisible())
+        {
+            if (mSignalSelectCallback)
+            {
+                //RN: we use keyboard focus as a proxy for user-explicit actions
+                BOOL take_keyboard_focus = (mSignalSelectCallback == SIGNAL_KEYBOARD_FOCUS);
+                mSelectSignal(mSelectedItems, take_keyboard_focus);
+            }
+            mSignalSelectCallback = FALSE;
+        }
+    }
+    else
+    {
+        mSignalSelectCallback = FALSE;
+    }
 }
 
 void LLFolderView::dumpSelectionInformation()
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 412e9e9c0b..898bcba494 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1133,7 +1133,7 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
     {
         return;
     }
-    if (mNeedsArrange && item_id.notNull() && scroll_to_selection)
+    if (mNeedsArrange && item_id.notNull())
     {
         mItemToSelect = item_id;
         return;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index de777fdc1a..e133bd37a1 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2425,7 +2425,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
             }
         }
 
-        if (mCombInvUUIDNeedsRename.notNull())
+        if (mCombInvUUIDNeedsRename.notNull() && mCombinationInventoryPanel->areViewsInitialized())
         {
             mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE);
             mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
-- 
cgit v1.2.3


From 14aa4dcdc23feafc537f06e49c48e9d693300103 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 10 Jun 2023 02:28:48 +0300
Subject: SL-19847 Delete key should not allow system folders

---
 indra/newview/llinventorygallery.cpp | 26 +++++++++++++++++++++++++-
 indra/newview/llinventorygallery.h   |  1 +
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 898bcba494..5edcb3148c 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -934,7 +934,7 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
 #endif
             // Delete selected items if delete or backspace key hit on the inventory panel
             // Note: on Mac laptop keyboards, backspace and delete are one and the same
-            if (mSelectedItemID.notNull())
+            if (canDeleteSelection())
             {
                 deleteSelection();
             }
@@ -1411,6 +1411,30 @@ void LLInventoryGallery::deleteSelection()
     LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGallery::onDelete, _1, _2, mSelectedItemID));
 }
 
+bool LLInventoryGallery::canDeleteSelection()
+{
+    if (mSelectedItemID.isNull())
+    {
+        return false;
+    }
+
+    LLViewerInventoryCategory* cat = gInventory.getCategory(mSelectedItemID);
+    if (cat)
+    {
+        if (!get_is_category_removable(&gInventory, mSelectedItemID))
+        {
+            return false;
+        }
+    }
+    else if (!get_is_item_removable(&gInventory, mSelectedItemID))
+    {
+        return false;
+    }
+
+    const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+    return !gInventory.isObjectDescendentOf(mSelectedItemID, trash_id);
+}
+
 void LLInventoryGallery::pasteAsLink()
 {
     if (!LLClipboard::instance().hasContents())
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index e71e2eddcd..6fbd1556e5 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -152,6 +152,7 @@ public:
     // Copy & paste & delete
     static void onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id);
     void deleteSelection();
+    bool canDeleteSelection();
     void pasteAsLink();
 
     void claimEditHandler();
-- 
cgit v1.2.3


From 929f9d8d5f2e7895016648557fa60c9d4a84baf6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 12 Jun 2023 16:10:28 +0300
Subject: SL-19825 clear selection when right-clicking outside of selected
 items

---
 indra/llui/llfolderview.cpp        | 10 ++++++++++
 indra/newview/llavataractions.cpp  | 25 +++++++++++++++++++++----
 indra/newview/llinventorypanel.cpp | 10 +---------
 3 files changed, 32 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 8660048058..7e5a9efb37 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1471,6 +1471,16 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 			mCallbackRegistrar->popScope();
 		}
 	}
+
+    bool item_clicked = false;
+    for (selected_items_t::iterator item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
+    {
+        item_clicked |= (*item_it)->getRect().pointInRect(x, y);
+    }
+    if(!item_clicked && mSingleFolderMode)
+    {
+        clearSelection();
+    }
 	bool hide_folder_menu = mSuppressFolderMenu && isFolderSelected();
 	if (menu && (mSingleFolderMode || (handled
 		&& ( count > 0 && (hasVisibleChildren()) ))) && // show menu only if selected items are visible
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 6bd2b8bbee..313339f131 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -765,8 +765,18 @@ namespace action_give_inventory
 	static bool is_give_inventory_acceptable(LLInventoryPanel* panel = NULL)
 	{
 		// check selection in the panel
-		const std::set<LLUUID> inventory_selected_uuids = LLAvatarActions::getInventorySelectedUUIDs(panel);
-		if (inventory_selected_uuids.empty()) return false; // nothing selected
+        std::set<LLUUID> inventory_selected_uuids = LLAvatarActions::getInventorySelectedUUIDs(panel);
+		if (inventory_selected_uuids.empty())
+        {
+            if(panel && panel->getRootFolder() && panel->getRootFolder()->isSingleFolderMode())
+            {
+                inventory_selected_uuids.insert(panel->getRootFolderID());
+            }
+            else
+            {
+                return false; // nothing selected
+            }
+        }
 
         return is_give_inventory_acceptable_ids(inventory_selected_uuids);
 	}
@@ -940,11 +950,18 @@ namespace action_give_inventory
     static void give_inventory(const uuid_vec_t& avatar_uuids, const std::vector<LLAvatarName> avatar_names, LLInventoryPanel* panel = NULL)
     {
         llassert(avatar_names.size() == avatar_uuids.size());
+        std::set<LLUUID> inventory_selected_uuids = LLAvatarActions::getInventorySelectedUUIDs(panel);;
 
-        const std::set<LLUUID> inventory_selected_uuids = LLAvatarActions::getInventorySelectedUUIDs(panel);
         if (inventory_selected_uuids.empty())
         {
-            return;
+            if(panel && panel->getRootFolder() && panel->getRootFolder()->isSingleFolderMode())
+            {
+                inventory_selected_uuids.insert(panel->getRootFolderID());
+            }
+            else
+            {
+                return;
+            }
         }
         give_inventory_ids(avatar_uuids, avatar_names, inventory_selected_uuids);
     }
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 53753b6c6b..067758b99c 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2304,15 +2304,7 @@ void LLInventorySingleFolderPanel::doCreate(const LLSD& userdata)
 
 void LLInventorySingleFolderPanel::doShare()
 {
-    if(mFolderRoot.get()->getCurSelectedItem() == NULL)
-    {
-        std::set<LLUUID> uuids{mFolderID};
-        LLAvatarActions::shareWithAvatars(uuids, gFloaterView->getParentFloater(this));
-    }
-    else
-    {
-        LLAvatarActions::shareWithAvatars(this);
-    }
+    LLAvatarActions::shareWithAvatars(this);
 }
 /************************************************************************/
 /* Asset Pre-Filtered Inventory Panel related class                     */
-- 
cgit v1.2.3


From 9eabffe430cd0c7b64f2cb796997dfd74a0cab82 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 12 Jun 2023 19:44:29 +0300
Subject: SL-19825 do not mix bool and BOOL types

---
 indra/llui/llfolderview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 7e5a9efb37..fa5ff76a2e 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1472,7 +1472,7 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 		}
 	}
 
-    bool item_clicked = false;
+    BOOL item_clicked = FALSE;
     for (selected_items_t::iterator item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
     {
         item_clicked |= (*item_it)->getRect().pointInRect(x, y);
-- 
cgit v1.2.3


From bc67a7445cf8113708d94c5759a3509361a23e78 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 12 Jun 2023 23:00:34 +0300
Subject: SL-19823 Fix active panel not existing

---
 indra/newview/llinventorybridge.cpp    | 4 ++--
 indra/newview/llpanelmaininventory.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 3c1e58205a..8b439449c5 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -925,7 +925,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
         addDeleteContextMenuOptions(items, disabled_items);
     }
 
-	if (!isPanelActive("All Items") && !isPanelActive("single_folder_inv") && !isPanelActive("comb_single_folder_inv"))
+	if (!isPanelActive("All Items") && !isPanelActive("comb_single_folder_inv"))
 	{
 		items.push_back(std::string("Show in Main Panel"));
 	}
@@ -4419,7 +4419,7 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
     {
         items.push_back(std::string("open_in_new_window"));
         items.push_back(std::string("Open Folder Separator"));
-        if(isPanelActive("single_folder_inv"))
+        if(isPanelActive("comb_single_folder_inv"))
         {
             items.push_back(std::string("open_in_current_window"));
         }
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index e133bd37a1..7259ecf788 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1503,9 +1503,10 @@ void LLPanelMainInventory::onAddButtonClick()
 
 void LLPanelMainInventory::setActivePanel()
 {
+    // Todo: should cover gallery mode in some way
     if(mSingleFolderMode && isListViewMode())
     {
-        mActivePanel = getChild<LLInventoryPanel>("single_folder_inv");
+        mActivePanel = getChild<LLInventoryPanel>("comb_single_folder_inv");
     }
     else if(mSingleFolderMode && isCombinationViewMode())
     {
-- 
cgit v1.2.3


From 546c6a09d8ddcd8a327dd9dc76e122f6d98effb9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 12 Jun 2023 23:08:12 +0300
Subject: SL-19823 Fix list view not focusing properly

---
 indra/newview/llpanelmaininventory.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 7259ecf788..713ae21198 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2425,14 +2425,17 @@ void LLPanelMainInventory::updateCombinationVisibility()
                 mCombinationListLayoutPanel->setShape(list_latout, true /*tell stack to account for new shape*/);
             }
         }
+    }
 
-        if (mCombInvUUIDNeedsRename.notNull() && mCombinationInventoryPanel->areViewsInitialized())
-        {
-            mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE);
-            mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
-            mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
-            mCombInvUUIDNeedsRename.setNull();
-        }
+    if (mSingleFolderMode
+        && !isGalleryViewMode()
+        && mCombInvUUIDNeedsRename.notNull()
+        && mCombinationInventoryPanel->areViewsInitialized())
+    {
+        mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE);
+        mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
+        mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
+        mCombInvUUIDNeedsRename.setNull();
     }
 }
 
-- 
cgit v1.2.3


From 7f6ad82a2a76ed1f96bf1ca61cacc51151fe74bf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 12 Jun 2023 23:19:02 +0300
Subject: SL-19823 Additional logging

---
 indra/llui/llfolderview.cpp            |  3 +++
 indra/newview/llinventorypanel.cpp     |  8 +++++++-
 indra/newview/llpanelmaininventory.cpp | 12 +++++++++---
 indra/newview/llviewerinventory.cpp    |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index fa5ff76a2e..630d93cde0 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -702,6 +702,7 @@ void LLFolderView::draw()
     {
         // renamer is not connected to the item we are renaming in any form so manage it manually
         // TODO: consider stopping on any scroll action instead of when out of visible area
+        LL_DEBUGS("Inventory") << "Renamer out of bounds, hiding" << LL_ENDL;
         finishRenamingItem();
     }
 
@@ -1046,6 +1047,8 @@ void LLFolderView::paste()
 // public rename functionality - can only start the process
 void LLFolderView::startRenamingSelectedItem( void )
 {
+    LL_DEBUGS("Inventory") << "Starting inventory renamer" << LL_ENDL;
+
 	// make sure selection is visible
 	scrollToShowSelection();
 
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 067758b99c..8f38141e87 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1486,6 +1486,10 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
 		{
 			fv->startRenamingSelectedItem();
 		}
+        else
+        {
+            LL_DEBUGS("Inventory") << "Failed to start renemr, no items selected" << LL_ENDL;
+        }
 	}
 
 	std::set<LLFolderViewItem*> selected_items = mFolderRoot.get()->getSelectionList();
@@ -1838,6 +1842,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
         LLPanelMainInventory* main_panel = inventory_panel->getMainInventoryPanel();
         if(main_panel->isSingleFolderMode() && main_panel->isGalleryViewMode())
         {
+            LL_DEBUGS("Inventory") << "Opening gallery panel for item" << obj_id << LL_ENDL;
             main_panel->setGallerySelection(obj_id);
             return;
         }
@@ -1850,6 +1855,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
         const LLInventoryObject *obj = gInventory.getObject(obj_id);
         if (obj)
         {
+            LL_DEBUGS("Inventory") << "Opening main inventory panel for item" << obj_id << LL_ENDL;
             main_inventory->setSingleFolderViewRoot(obj->getParentUUID(), false);
             main_inventory->setGallerySelection(obj_id);
             return;
@@ -1859,7 +1865,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
 
 	if (active_panel)
 	{
-		LL_DEBUGS("Messaging") << "Highlighting" << obj_id  << LL_ENDL;
+		LL_DEBUGS("Messaging", "Inventory") << "Highlighting" << obj_id  << LL_ENDL;
 
 		if (reset_filter)
 		{
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 713ae21198..05816f5f37 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -199,7 +199,7 @@ BOOL LLPanelMainInventory::postBuild()
 	}
 	// Now load the stored settings from disk, if available.
 	std::string filterSaveName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, FILTERS_FILENAME));
-	LL_INFOS() << "LLPanelMainInventory::init: reading from " << filterSaveName << LL_ENDL;
+	LL_INFOS("Inventory") << "LLPanelMainInventory::init: reading from " << filterSaveName << LL_ENDL;
 	llifstream file(filterSaveName.c_str());
 	LLSD savedFilterState;
 	if (file.is_open())
@@ -510,8 +510,6 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
             {
                 if(isCombinationViewMode())
                 {
-                    //show layout and inventory panel before adding the item
-                    //to avoid wrong position of the 'renamer'
                     mForceShowInvLayout = true;
                 }
 
@@ -524,6 +522,13 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                     {
                         // might need to refresh visibility, delay rename
                         panel->mCombInvUUIDNeedsRename = new_id;
+
+                        if (panel->isCombinationViewMode())
+                        {
+                            panel->mForceShowInvLayout = true;
+                        }
+
+                        LL_DEBUGS("Inventory") << "Done creating inventory: " << new_id << LL_ENDL;
                     }
                 };
                 menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_created);
@@ -541,6 +546,7 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                     if (panel)
                     {
                         panel->setGallerySelection(new_id);
+                        LL_DEBUGS("Inventory") << "Done creating inventory: " << new_id << LL_ENDL;
                     }
                 }
             };
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 117cdc5367..68619cb1a8 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1774,6 +1774,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
                 {
                     panel->setSelectionByID(new_category_id, TRUE);
                 }
+                LL_DEBUGS(LOG_INV) << "Done creating inventory: " << new_category_id << LL_ENDL;
             };
         }
         else if (created_cb != NULL)
-- 
cgit v1.2.3


From 19ed999be0d0cb2460e8962824478a6658e026c9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 13 Jun 2023 16:23:19 +0300
Subject: SL-19858 FIXED Viewer crash when creating a new Setting in inventory

---
 indra/newview/llsettingsvo.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 4cfa6f2f85..0cfdf67ed5 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -97,10 +97,15 @@ namespace
 //=========================================================================
 void LLSettingsVOBase::createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID& parent_id, std::function<void(const LLUUID&)> created_cb)
 {
-    inventory_result_fn cb = [created_cb](LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results)
+    inventory_result_fn cb = NULL;
+
+    if (created_cb != NULL)
     {
-        created_cb(inventory_id);
-    };
+        cb = [created_cb](LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results)
+        {
+            created_cb(inventory_id);
+        };
+    }
     createNewInventoryItem(stype, parent_id, cb);
 }
 
-- 
cgit v1.2.3


From 14eadadf993eb4f89188aa4cd8ea0859a86374d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 13 Jun 2023 22:41:49 +0300
Subject: SL-19857 Exception at category creation

---
 indra/newview/llinventorymodel.cpp  | 5 +++--
 indra/newview/llviewerinventory.cpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 59b34cc95c..ed375661b8 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1031,13 +1031,14 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
         {
             if (new_category.isNull())
             {
-                if (callback)
+                if (callback && !callback.empty())
                 {
                     callback(new_category);
                 }
                 return;
             }
 
+            // todo: not needed since AIS does the accounting?
             LLViewerInventoryCategory* folderp = gInventory.getCategory(new_category);
             if (!folderp)
             {
@@ -1057,7 +1058,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                 updateCategory(cat);
             }
 
-            if (callback)
+            if (callback && !callback.empty())
             {
                 callback(new_category);
             }
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 68619cb1a8..94390b899d 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1766,7 +1766,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
         if (panel)
         {
             LLHandle<LLPanel> handle = panel->getHandle();
-            std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID& new_category_id)
+            callback_cat_created = [handle](const LLUUID& new_category_id)
             {
                 gInventory.notifyObservers();
                 LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(handle.get());
-- 
cgit v1.2.3


From 71534d8fa7083355271eba69a7b6045f0c34463f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 14 Jun 2023 02:03:38 +0300
Subject: SL-19686 WIP Switching single folder view for large inventories
 causes stalls

---
 indra/newview/llinventorypanel.cpp                 | 54 ++++++++++++++--------
 indra/newview/llinventorypanel.h                   |  3 +-
 indra/newview/llpanelmaininventory.cpp             | 10 ++++
 indra/newview/llpanelmaininventory.h               |  1 +
 indra/newview/llsidepanelinventory.cpp             | 13 ++++++
 indra/newview/llsidepanelinventory.h               |  1 +
 .../skins/default/xui/en/panel_main_inventory.xml  |  3 ++
 7 files changed, 64 insertions(+), 21 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 8f38141e87..ac156b9e72 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -162,7 +162,8 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	mInventoryViewModel(p.name),
 	mGroupedItemBridge(new LLFolderViewGroupedItemBridge),
 	mFocusSelection(false),
-    mBuildChildrenViews(true)
+    mBuildChildrenViews(true),
+    mRootInited(false)
 {
 	mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER;
 
@@ -286,6 +287,7 @@ void LLInventoryPanel::initFolderRoot()
         // build the views starting with that folder.
         LLFolderView* folder_view = createFolderRoot(root_id);
         mFolderRoot = folder_view->getHandle();
+        mRootInited = true;
     
         addItemID(root_id, mFolderRoot.get());
     }
@@ -318,22 +320,9 @@ void LLInventoryPanel::initFolderRoot()
     mCompletionObserver = new LLInvPanelComplObserver(boost::bind(&LLInventoryPanel::onItemsCompletion, this));
     mInventory->addObserver(mCompletionObserver);
 
-    if (mBuildViewsOnInit && mViewsInitialized == VIEWS_UNINITIALIZED)
+    if (mBuildViewsOnInit)
     {
-        // Build view of inventory if we need default full hierarchy and inventory is ready, otherwise do in onIdle.
-        // Initializing views takes a while so always do it onIdle if viewer already loaded.
-        if (mInventory->isInventoryUsable()
-            && LLStartUp::getStartupState() <= STATE_WEARABLES_WAIT)
-        {
-            // Usually this happens on login, so we have less time constraits, but too long and we can cause a disconnect
-            const F64 max_time = 20.f;
-            initializeViews(max_time);
-        }
-        else
-        {
-            mViewsInitialized = VIEWS_INITIALIZING;
-            gIdleCallbacks.addFunction(onIdle, (void*)this);
-        }
+        initializeViewBuilding();
     }
 
     if (mSortOrderSetting != INHERIT_SORT_ORDER)
@@ -366,13 +355,38 @@ void LLInventoryPanel::initFolderRoot()
     mClipboardState = LLClipboard::instance().getGeneration();
 }
 
+void LLInventoryPanel::initializeViewBuilding()
+{
+    if (mViewsInitialized == VIEWS_UNINITIALIZED)
+    {
+        LL_DEBUGS("Inventory") << "Setting views for " << getName() << " to initialize" << LL_ENDL;
+        // Build view of inventory if we need default full hierarchy and inventory is ready, otherwise do in onIdle.
+        // Initializing views takes a while so always do it onIdle if viewer already loaded.
+        if (mInventory->isInventoryUsable()
+            && LLStartUp::getStartupState() <= STATE_WEARABLES_WAIT)
+        {
+            // Usually this happens on login, so we have less time constraits, but too long and we can cause a disconnect
+            const F64 max_time = 20.f;
+            initializeViews(max_time);
+        }
+        else
+        {
+            mViewsInitialized = VIEWS_INITIALIZING;
+            gIdleCallbacks.addFunction(onIdle, (void*)this);
+        }
+    }
+}
+
 /*virtual*/
 void LLInventoryPanel::onVisibilityChange(BOOL new_visibility)
 {
     if (new_visibility && mViewsInitialized == VIEWS_UNINITIALIZED)
     {
-        mViewsInitialized = VIEWS_INITIALIZING;
-        gIdleCallbacks.addFunction(onIdle, (void*)this);
+        // first call can be from tab initialization
+        if (gFloaterView->getParentFloater(this) != NULL)
+        {
+            initializeViewBuilding();
+        }
     }
     LLPanel::onVisibilityChange(new_visibility);
 }
@@ -893,6 +907,7 @@ void LLInventoryPanel::idle(void* user_data)
 void LLInventoryPanel::initializeViews(F64 max_time)
 {
 	if (!gInventory.isInventoryUsable()) return;
+    if (!mRootInited) return;
 
     mViewsInitialized = VIEWS_BUILDING;
 
@@ -1063,7 +1078,7 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
 			if (objectp->getType() >= LLAssetType::AT_COUNT)
   			{
 				// Example: Happens when we add assets of new, not yet supported type to library
-				LL_DEBUGS() << "LLInventoryPanel::buildViewsTree called with unknown objectp->mType : "
+				LL_DEBUGS("Inventory") << "LLInventoryPanel::buildViewsTree called with unknown objectp->mType : "
 				<< ((S32) objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
 				<< LL_ENDL;
 
@@ -2134,7 +2149,6 @@ LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     : LLInventoryPanel(params)
 {
     mBuildChildrenViews = false;
-    mRootInited = false;
     getFilter().setSingleFolderMode(true);
     getFilter().setEmptyLookupMessage("InventorySingleFolderNoMatches");
     getFilter().setDefaultEmptyLookupMessage("InventorySingleFolderEmpty");
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 8d05fcb8b9..20c9584015 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -269,6 +269,7 @@ public:
 
     void changeFolderRoot(const LLUUID& new_id) {};
     void initFolderRoot();
+    void initializeViewBuilding();
 
 protected:
 	void openStartFolderOrMyInventory(); // open the first level of inventory
@@ -306,7 +307,7 @@ protected:
 	 */
 	const LLInventoryFolderViewModelBuilder* mInvFVBridgeBuilder;
 
-    bool mBuildChildrenViews;
+    bool mBuildChildrenViews; // build root and children
     bool mRootInited;
 
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 05816f5f37..eb0ed52317 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1530,6 +1530,16 @@ void LLPanelMainInventory::initSingleFolderRoot(const LLUUID& start_folder_id)
     mCombinationInventoryPanel->initFolderRoot(start_folder_id);
 }
 
+void LLPanelMainInventory::initInventoryViews()
+{
+    LLInventoryPanel* all_item = getChild<LLInventoryPanel>(ALL_ITEMS);
+    all_item->initializeViewBuilding();
+    LLInventoryPanel* recent_item = getChild<LLInventoryPanel>(RECENT_ITEMS);
+    recent_item->initializeViewBuilding();
+    LLInventoryPanel* worn_item = getChild<LLInventoryPanel>(WORN_ITEMS);
+    worn_item->initializeViewBuilding();
+}
+
 void LLPanelMainInventory::toggleViewMode()
 {
     if(mSingleFolderMode && isCombinationViewMode())
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index ee314d1cf3..bdc62fd8f7 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -116,6 +116,7 @@ public:
     void onViewModeClick();
     void toggleViewMode();
     void initSingleFolderRoot(const LLUUID& start_folder_id = LLUUID::null);
+    void initInventoryViews();
     void onUpFolderClicked();
     void onBackFolderClicked();
     void onForwardFolderClicked();
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index bd6f846268..5f30ef3219 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -212,6 +212,14 @@ BOOL LLSidepanelInventory::postBuild()
 
 	gSavedSettings.getControl("InventoryDisplayInbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayInboxChanged));
 
+    LLFloater *floater = dynamic_cast<LLFloater*>(getParent());
+    if (floater && floater->getKey().isUndefined() && !sLoginCompleted)
+    {
+        // see get_instance_num();
+        // Primary inventory floater will have undefined key
+        initInventoryViews();
+    }
+
 	return TRUE;
 }
 
@@ -425,6 +433,11 @@ void LLSidepanelInventory::showInventoryPanel()
 	mInventoryPanel->setVisible(TRUE);
 }
 
+void LLSidepanelInventory::initInventoryViews()
+{
+    mPanelMainInventory->initInventoryViews();
+}
+
 bool LLSidepanelInventory::canShare()
 {
 	LLInventoryPanel* inbox = mInventoryPanelInbox.get();
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
index 3a252a87c6..08989bb6af 100644
--- a/indra/newview/llsidepanelinventory.h
+++ b/indra/newview/llsidepanelinventory.h
@@ -67,6 +67,7 @@ public:
     std::set<LLFolderViewItem*> getInboxSelectionList();
 
 	void showInventoryPanel();
+    void initInventoryViews();
 
 	// checks can share selected item(s)
 	bool canShare();
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 3391c1d00c..64b885c222 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -234,6 +234,7 @@
          name="All Items"
          sort_order_setting="InventorySortOrder"
          show_item_link_overlays="true"
+         preinitialize_views="false"
          top="16"
          width="288">
             <folder double_click_override="true"/>
@@ -252,6 +253,7 @@
          left_delta="0"
          name="Recent Items"
          show_item_link_overlays="true"
+         preinitialize_views="false"
          width="290">
             <folder double_click_override="true"/>
         </recent_inventory_panel>
@@ -265,6 +267,7 @@
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
          background_visible="true"
+         preinitialize_views="false"
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
-- 
cgit v1.2.3


From 3a359224565aabec518a097ae502735a0d8244b0 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 14 Jun 2023 16:24:56 +0300
Subject: SL-19867 'Open in new window' option is missing for 'Trash' and
 'Current Outfit' folders

---
 indra/newview/llinventorybridge.cpp | 34 ++++++++++++++++++++++------------
 indra/newview/llinventorybridge.h   |  1 +
 2 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 8b439449c5..02a29f2ac9 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4268,6 +4268,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 		if (model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT) == mUUID)
 		{
 			items.push_back(std::string("Copy outfit list to clipboard"));
+            addOpenFolderMenuOptions(flags, items);
 		}
 
 		//Added by aura to force inventory pull on right-click to display folder options correctly. 07-17-06
@@ -4374,9 +4375,12 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
 	if(!category) return;
 
 	const LLUUID trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
-	if (trash_id == mUUID) return;
-	if (isItemInTrash()) return;
-    
+	if ((trash_id == mUUID) || isItemInTrash())
+    {
+        addOpenFolderMenuOptions(flags, items);
+        return;
+    }
+
 	if (!isItemRemovable())
 	{
 		disabled_items.push_back(std::string("Delete"));
@@ -4415,15 +4419,7 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
         return;
     }
 
-    if ((flags & ITEM_IN_MULTI_SELECTION) == 0)
-    {
-        items.push_back(std::string("open_in_new_window"));
-        items.push_back(std::string("Open Folder Separator"));
-        if(isPanelActive("comb_single_folder_inv"))
-        {
-            items.push_back(std::string("open_in_current_window"));
-        }
-    }
+    addOpenFolderMenuOptions(flags, items);
 
 #ifndef LL_RELEASE_FOR_DOWNLOAD
 	if (LLFolderType::lookupIsProtectedType(type) && is_agent_inventory)
@@ -4502,6 +4498,20 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	menu.arrangeAndClear();
 }
 
+void LLFolderBridge::addOpenFolderMenuOptions(U32 flags, menuentry_vec_t& items)
+{
+    if ((flags & ITEM_IN_MULTI_SELECTION) == 0)
+    {
+        items.push_back(std::string("open_in_new_window"));
+        items.push_back(std::string("Open Folder Separator"));
+        items.push_back(std::string("Copy Separator"));
+        if(isPanelActive("comb_single_folder_inv"))
+        {
+            items.push_back(std::string("open_in_current_window"));
+        }
+    }
+}
+
 bool LLFolderBridge::hasChildren() const
 {
 	LLInventoryModel* model = getInventoryModel();
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index eaa7166631..30a9bbe372 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -339,6 +339,7 @@ public:
 protected:
 	void buildContextMenuOptions(U32 flags, menuentry_vec_t& items,   menuentry_vec_t& disabled_items);
 	void buildContextMenuFolderOptions(U32 flags, menuentry_vec_t& items,   menuentry_vec_t& disabled_items);
+    void addOpenFolderMenuOptions(U32 flags, menuentry_vec_t& items);
 
 	//--------------------------------------------------------------------
 	// Menu callbacks
-- 
cgit v1.2.3


From 143e103bcf2b9be2b249ce96e7f84a52469174c7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 14 Jun 2023 23:59:43 +0300
Subject: SL-19686 WIP Switching single folder view for large inventories
 causes stalls #2

---
 indra/newview/llinventorygallery.cpp   | 34 ++++++++++++++++++++++---
 indra/newview/llinventorygallery.h     |  4 +++
 indra/newview/llinventorypanel.cpp     | 45 +++++++++++++++++++++++++++++++++-
 indra/newview/llpanelmaininventory.cpp |  4 +++
 indra/newview/llsidepanelinventory.cpp |  3 +++
 5 files changed, 85 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 5edcb3148c..421949d9aa 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -85,6 +85,7 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mRowPanWidthFactor(p.row_panel_width_factor),
       mGalleryWidthFactor(p.gallery_width_factor),
       mIsInitialized(false),
+      mRootDirty(false),
       mNeedsArrange(false),
       mSearchType(LLInventoryFilter::SEARCHTYPE_NAME)
 {
@@ -188,7 +189,19 @@ void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
         mBackwardFolders.push_back(mFolderID);
     }
     mFolderID = cat_id;
-    updateRootFolder();
+    dirtyRootFolder();
+}
+
+void LLInventoryGallery::dirtyRootFolder()
+{
+    if (getVisible())
+    {
+        updateRootFolder();
+    }
+    else
+    {
+        mRootDirty = true;
+    }
 }
 
 void LLInventoryGallery::updateRootFolder()
@@ -260,6 +273,7 @@ void LLInventoryGallery::updateRootFolder()
         }
         reArrangeRows();
         mIsInitialized = true;
+        mRootDirty = false;
 
         if (mScrollPanel)
         {
@@ -305,6 +319,15 @@ void LLInventoryGallery::draw()
     }
 }
 
+void LLInventoryGallery::onVisibilityChange(BOOL new_visibility)
+{
+    if (new_visibility && mRootDirty)
+    {
+        updateRootFolder();
+    }
+    LLPanel::onVisibilityChange(new_visibility);
+}
+
 bool LLInventoryGallery::updateRowsIfNeeded()
 {
     if(((getRect().getWidth() - mRowPanelWidth) > mItemWidth) && mRowCount > 1)
@@ -542,6 +565,7 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
 void LLInventoryGallery::buildGalleryPanel(int row_count)
 {
     LLPanel::Params params;
+    params.use_bounding_rect = false;
     mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
     reshapeGalleryPanel(row_count);
 }
@@ -561,11 +585,12 @@ void LLInventoryGallery::reshapeGalleryPanel(int row_count)
 
 LLPanel* LLInventoryGallery::buildItemPanel(int left)
 {
-    LLPanel::Params lpparams;
     int top = 0;
     LLPanel* lpanel = NULL;
     if(mUnusedItemPanels.empty())
     {
+        LLPanel::Params lpparams;
+        lpparams.use_bounding_rect = false;
         lpanel = LLUICtrlFactory::create<LLPanel>(lpparams);
     }
     else
@@ -585,6 +610,7 @@ LLPanel* LLInventoryGallery::buildItemPanel(int left)
 LLPanel* LLInventoryGallery::buildRowPanel(int left, int bottom)
 {
     LLPanel::Params sparams;
+    sparams.use_bounding_rect = false;
     LLPanel* stack = NULL;
     if(mUnusedRowPanels.empty())
     {
@@ -1787,7 +1813,7 @@ void LLInventoryGallery::onForwardFolder()
         mBackwardFolders.push_back(mFolderID);
         mFolderID = mForwardFolders.back();
         mForwardFolders.pop_back();
-        updateRootFolder();
+        dirtyRootFolder();
     }
 }
 
@@ -1798,7 +1824,7 @@ void LLInventoryGallery::onBackwardFolder()
         mForwardFolders.push_back(mFolderID);
         mFolderID = mBackwardFolders.back();
         mBackwardFolders.pop_back();
-        updateRootFolder();
+        dirtyRootFolder();
     }
 }
 
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 6fbd1556e5..8519ee0731 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -76,6 +76,7 @@ public:
     BOOL postBuild() override;
     void initGallery();
     void draw() override;
+    void onVisibilityChange(BOOL new_visibility) override;
     BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type,
                            void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) override;
     BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
@@ -103,6 +104,7 @@ public:
     void setRootFolder(const LLUUID cat_id);
     void updateRootFolder();
     LLUUID getRootFolder() { return mFolderID; }
+    bool isRootDirty() { return mRootDirty; }
     boost::signals2::connection setRootChangedCallback(callback_t cb);
     void onForwardFolder();
     void onBackwardFolder();
@@ -168,6 +170,7 @@ protected:
     void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
     bool checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring);
     static void onIdle(void* userdata);
+    void dirtyRootFolder();
 
     LLInventoryCategoriesObserver*     mCategoriesObserver;
     LLThumbnailsObserver*              mThumbnailsObserver;
@@ -176,6 +179,7 @@ protected:
     LLUUID                             mSelectedItemID;
     LLUUID                             mItemToSelect;
     bool                               mIsInitialized;
+    bool                               mRootDirty;
 
     selection_change_signal_t        mSelectionChangeSignal;
     boost::signals2::signal<void()>  mRootChangedSignal;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index ac156b9e72..f7a24a09c0 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1177,7 +1177,7 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                 else
                 {
                     create_children = true;
-                    folder_view_item->setChildrenInited(true);
+                    folder_view_item->setChildrenInited(mBuildChildrenViews);
                 }
                 break;
             }
@@ -1218,6 +1218,11 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
 		LLViewerInventoryItem::item_array_t* items;
 		mInventory->lockDirectDescendentArrays(id, categories, items);
 
+        // Make sure panel won't lock in a loop over existing items if
+        // folder is enormous and at least some work gets done
+        const S32 MIN_ITEMS_PER_CALL = 500;
+        const S32 starting_item_count = mItemMap.size();
+
         LLFolderViewFolder *parentp = dynamic_cast<LLFolderViewFolder*>(folder_view_item);
 
 		if(categories)
@@ -1243,6 +1248,22 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                         buildViewsTree(cat->getUUID(), id, cat, NULL, parentp, (mode == BUILD_ONE_FOLDER ? BUILD_NO_CHILDREN : mode), depth);
                     }
                 }
+
+                if (!mBuildChildrenViews
+                    && mode == BUILD_TIMELIMIT
+                    && MIN_ITEMS_PER_CALL + starting_item_count < mItemMap.size())
+                {
+                    // Single folder view, check if we still have time
+                    // 
+                    // Todo: make sure this causes no dupplciates, breaks nothing,
+                    // especially filters and arrange
+                    F64 curent_time = LLTimer::getTotalSeconds();
+                    if (mBuildViewsEndTime < curent_time)
+                    {
+                        mBuildViewsQueue.push_back(id);
+                        break;
+                    }
+                }
 			}
 		}
 		
@@ -1262,8 +1283,30 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                     LLFolderViewItem* view_itemp = getItemByID(item->getUUID());
                     buildViewsTree(item->getUUID(), id, item, view_itemp, parentp, mode, depth);
                 }
+
+                if (!mBuildChildrenViews
+                    && mode == BUILD_TIMELIMIT
+                    && MIN_ITEMS_PER_CALL + starting_item_count < mItemMap.size())
+                {
+                    // Single folder view, check if we still have time
+                    // 
+                    // Todo: make sure this causes no dupplciates, breaks nothing,
+                    // especially filters and arrange
+                    F64 curent_time = LLTimer::getTotalSeconds();
+                    if (mBuildViewsEndTime < curent_time)
+                    {
+                        mBuildViewsQueue.push_back(id);
+                        break;
+                    }
+                }
 			}
 		}
+
+        if (!mBuildChildrenViews)
+        {
+            // flat list is done initializing folder
+            folder_view_item->setChildrenInited(true);
+        }
 		mInventory->unlockDirectDescendentArrays(id);
 	}
 	
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index eb0ed52317..a785d5adb7 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2350,6 +2350,7 @@ void LLPanelMainInventory::updatePanelVisibility()
 
             // visibility will be controled by updateCombinationVisibility()
             mCombinationGalleryLayoutPanel->setVisible(true);
+            mCombinationGalleryPanel->setVisible(true);
             mCombinationListLayoutPanel->setVisible(true);
         }
         else
@@ -2363,12 +2364,14 @@ void LLPanelMainInventory::updatePanelVisibility()
             comb_gallery_filter.markDefault();
 
             mCombinationGalleryLayoutPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
+            mCombinationGalleryPanel->setVisible(mSingleFolderMode && isGalleryViewMode()); // to prevent or process updates
             mCombinationListLayoutPanel->setVisible(mSingleFolderMode && isListViewMode());
         }
     }
     else
     {
         mCombinationGalleryLayoutPanel->setVisible(false);
+        mCombinationGalleryPanel->setVisible(false); // to prevent updates
         mCombinationListLayoutPanel->setVisible(false);
     }
 }
@@ -2380,6 +2383,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
         bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
         mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty);
+        mCombinationGalleryPanel->setVisible(true); // to make sure root updates are getting processed
         mCombinationListLayoutPanel->setVisible(show_inv_pane);
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
         if(mCombinationInventoryPanel->hasVisibleItems())
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 5f30ef3219..5eb853f44c 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -215,6 +215,9 @@ BOOL LLSidepanelInventory::postBuild()
     LLFloater *floater = dynamic_cast<LLFloater*>(getParent());
     if (floater && floater->getKey().isUndefined() && !sLoginCompleted)
     {
+        // Prefill inventory for primary inventory floater
+        // Other floaters should fill on visibility change
+        // 
         // see get_instance_num();
         // Primary inventory floater will have undefined key
         initInventoryViews();
-- 
cgit v1.2.3


From 275fa896c0cc35acee24d7fc4e952ab73428b7f8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 00:27:11 +0300
Subject: SL-19686 WIP Switching single folder view for large inventories
 causes stalls #3

---
 indra/newview/llinventorygallery.cpp | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 421949d9aa..fe9605daa8 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -545,12 +545,11 @@ void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
 LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link, bool is_worn)
 {
     LLInventoryGalleryItem::Params giparams;
+    giparams.visible = true;
+    giparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
+    giparams.rect(LLRect(0,mItemHeight, mItemWidth, 0));
+    giparams.name = name;
     LLInventoryGalleryItem* gitem = LLUICtrlFactory::create<LLInventoryGalleryItem>(giparams);
-    gitem->reshape(mItemWidth, mItemHeight);
-    gitem->setVisible(true);
-    gitem->setFollowsLeft();
-    gitem->setFollowsTop();
-    gitem->setName(name);
     gitem->setUUID(item_id);
     gitem->setGallery(this);
     gitem->setType(type, inventory_type, flags, is_link);
@@ -565,6 +564,8 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
 void LLInventoryGallery::buildGalleryPanel(int row_count)
 {
     LLPanel::Params params;
+    params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
+    params.visible = true;
     params.use_bounding_rect = false;
     mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
     reshapeGalleryPanel(row_count);
@@ -578,9 +579,6 @@ void LLInventoryGallery::reshapeGalleryPanel(int row_count)
     LLRect rect = LLRect(left, bottom + height, left + mGalleryWidth, bottom);
     mGalleryPanel->setRect(rect);
     mGalleryPanel->reshape(mGalleryWidth, height);
-    mGalleryPanel->setVisible(true);
-    mGalleryPanel->setFollowsLeft();
-    mGalleryPanel->setFollowsTop();
 }
 
 LLPanel* LLInventoryGallery::buildItemPanel(int left)
@@ -590,6 +588,9 @@ LLPanel* LLInventoryGallery::buildItemPanel(int left)
     if(mUnusedItemPanels.empty())
     {
         LLPanel::Params lpparams;
+        lpparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
+        lpparams.visible = true;
+        lpparams.rect(LLRect(left, top + mItemHeight, left + mItemWidth + mItemHorizontalGap, top));
         lpparams.use_bounding_rect = false;
         lpanel = LLUICtrlFactory::create<LLPanel>(lpparams);
     }
@@ -597,23 +598,22 @@ LLPanel* LLInventoryGallery::buildItemPanel(int left)
     {
         lpanel = mUnusedItemPanels.back();
         mUnusedItemPanels.pop_back();
+
+        LLRect rect = LLRect(left, top + mItemHeight, left + mItemWidth + mItemHorizontalGap, top);
+        lpanel->setShape(rect, false);
     }
-    LLRect rect = LLRect(left, top + mItemHeight, left + mItemWidth + mItemHorizontalGap, top);
-    lpanel->setRect(rect);
-    lpanel->reshape(mItemWidth + mItemHorizontalGap, mItemHeight);
-    lpanel->setVisible(true);
-    lpanel->setFollowsLeft();
-    lpanel->setFollowsTop();
     return lpanel;
 }
 
 LLPanel* LLInventoryGallery::buildRowPanel(int left, int bottom)
 {
-    LLPanel::Params sparams;
-    sparams.use_bounding_rect = false;
     LLPanel* stack = NULL;
     if(mUnusedRowPanels.empty())
     {
+        LLPanel::Params sparams;
+        sparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
+        sparams.use_bounding_rect = false;
+        sparams.visible = true;
         stack = LLUICtrlFactory::create<LLPanel>(sparams);
     }
     else
@@ -630,9 +630,6 @@ void LLInventoryGallery::moveRowPanel(LLPanel* stack, int left, int bottom)
     LLRect rect = LLRect(left, bottom + mRowPanelHeight, left + mRowPanelWidth, bottom);
     stack->setRect(rect);
     stack->reshape(mRowPanelWidth, mRowPanelHeight);
-    stack->setVisible(true);
-    stack->setFollowsLeft();
-    stack->setFollowsTop();
 }
 
 void LLInventoryGallery::setFilterSubString(const std::string& string)
-- 
cgit v1.2.3


From 7ac094e92105122b22b4693dafae7f0cee72d9a0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 13 Jun 2023 08:45:13 +0200
Subject: SL-18977 Borders of inventory view in inventory floater seem to be
 cut a bit

---
 indra/llui/llscrollcontainer.cpp                   |   8 +-
 indra/llui/lltabcontainer.cpp                      |   8 +-
 indra/newview/llinventorypanel.cpp                 |   1 -
 .../skins/default/xui/en/floater_my_inventory.xml  |  26 +-
 .../skins/default/xui/en/panel_main_inventory.xml  | 473 ++++++++++-----------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 244 +++++------
 6 files changed, 359 insertions(+), 401 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index c4cb739f0a..5872b79bb0 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -124,9 +124,9 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	mScrollbar[VERTICAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[VERTICAL] );
 	
-	LLRect horizontal_scroll_rect = mInnerRect;
-	horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + scrollbar_size;
-	horizontal_scroll_rect.mLeft += 3;
+	LLRect horizontal_scroll_rect;
+	horizontal_scroll_rect.mRight = mInnerRect.getWidth();
+	horizontal_scroll_rect.mTop = scrollbar_size;
 	sbparams.name("scrollable horizontal");
 	sbparams.rect(horizontal_scroll_rect);
 	sbparams.orientation(LLScrollbar::HORIZONTAL);
@@ -135,7 +135,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	sbparams.page_size(mInnerRect.getWidth());
 	sbparams.step_size(VERTICAL_MULTIPLE);
 	sbparams.visible(false);
-	sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT);
+	sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
 	sbparams.change_callback(p.scroll_callback);
 	mScrollbar[HORIZONTAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[HORIZONTAL] );
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 8c841540a5..d5d337848c 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -986,7 +986,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	// Tab panel
 	S32 tab_panel_top;
 	S32 tab_panel_bottom;
-	if (!getTabsHidden()) 
+	if (!getTabsHidden())
 	{
 		if( getTabPosition() == LLTabContainer::TOP )
 		{
@@ -1002,7 +1002,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	}
 	else
 	{
-		//Scip tab button space if they are invisible(EXT - 576)
+		// Skip tab button space if tabs are invisible (EXT-576)
 		tab_panel_top = getRect().getHeight();
 		tab_panel_bottom = LLPANEL_BORDER_WIDTH;
 	}
@@ -1017,9 +1017,9 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	}
 	else
 	{
-		tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH, 
+		tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH * 2,
 								tab_panel_top,
-								getRect().getWidth()-LLPANEL_BORDER_WIDTH,
+								getRect().getWidth(),
 								tab_panel_bottom );
 	}
 	child->setFollowsAll();
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index f7a24a09c0..2fefacf90b 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -298,7 +298,6 @@ void LLInventoryPanel::initFolderRoot()
     // Scroller
     LLRect scroller_view_rect = getRect();
     scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
-	scroller_view_rect.mTop -= 3;
     LLScrollContainer::Params scroller_params(mParams.scroll());
     scroller_params.rect(scroller_view_rect);
     mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index a9900f05b7..b75744d432 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater
+ name="floater_my_inventory"
+ title="INVENTORY"
+ help_topic="sidebar_inventory"
  positioning="cascading"
- can_close="true"
- can_resize="true"
+ width="363"
  height="570"
- help_topic="sidebar_inventory"
  min_width="363"
  min_height="270"
- name="floater_my_inventory"
+ can_close="true"
+ can_resize="true"
  save_rect="true"
  save_visibility="true"
- reuse_instance="true"
- title="INVENTORY"
- width="363" >
-   <panel
-    class="sidepanel_inventory"
-    name="main_panel"
-    filename="sidepanel_inventory.xml"
-    follows="all"
-    top="0"/>
+ reuse_instance="true" >
+  <panel
+   name="main_panel"
+   class="sidepanel_inventory"
+   filename="sidepanel_inventory.xml"
+   follows="all"
+   top="0" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 64b885c222..b170885178 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+ name="main inventory panel"
  follows="all"
  height="423"
  label="Things"
  layout="topleft"
  min_height="300"
- min_width="240"
- name="main inventory panel"
- width="355">
+ min_width="240" >
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -27,18 +26,18 @@
   <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
   <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
-		     type="string"
-		     length="1"
-		     follows="left|top|right"
-		     height="13"
-		     layout="topleft"
-    		 left="12"
-		     name="ItemcountText"
-		     font="SansSerifMedium"
-		     text_color="InventoryItemLinkColor"
-		     use_ellipses="true"
-		     top_pad="0"
-		     width="300">
+   name="ItemcountText"
+   type="string"
+   length="1"
+   follows="left|top|right"
+   layout="topleft"
+   height="13"
+   left="10"
+   right="-10"
+   font="SansSerifMedium"
+   text_color="InventoryItemLinkColor"
+   use_ellipses="true"
+   top_pad="0">
     Items:
   </text>
   <layout_stack
@@ -46,298 +45,282 @@
    height="25"
    animate="false"
    top_pad="10"
-   left="2"
+   left="8"
    orientation="horizontal">
     <layout_panel
+     name="nav_buttons"
+     width="65"
+     height="25"
      border="false"
      bevel_style="in"
      user_resize="false"
      auto_resize="false"
-     height="25"
-     width="65"
-     name="nav_buttons"
      visible="false">
-     <button
-      follows="top|left"
-      height="23"
-      image_selected="Single_Folder_Back"
-      image_pressed="Single_Folder_Back"
-      image_unselected="Single_Folder_Back"
-      scale_image="false"
-      layout="topleft"
-      left="3"
-      top="2"
-      name="back_btn"
-      tool_tip="Back"
-      width="20" />
-     <button
-      follows="top|left"
-      height="23"
-      image_selected="Single_Folder_Forward"
-      image_pressed="Single_Folder_Forward"
-      image_unselected="Single_Folder_Forward"
-      scale_image="false"
-      layout="topleft"
-      left_pad="1"
-      name="forward_btn"
-      tool_tip="Forward"
-      width="20" />
-     <button
-      follows="top|left"
-      height="23"
-      image_selected="Single_Folder_Up"
-      image_pressed="Single_Folder_Up"
-      image_unselected="Single_Folder_Up"
-      scale_image="false"
-      layout="topleft"
-      left_pad="1"
-      name="up_btn"
-      tool_tip="Go up one level"
-      width="20" />
+      <button
+       name="back_btn"
+       follows="top|left"
+       image_selected="Single_Folder_Back"
+       image_pressed="Single_Folder_Back"
+       image_unselected="Single_Folder_Back"
+       scale_image="false"
+       layout="topleft"
+       top="2"
+       left="3"
+       width="20"
+       height="23"
+       tool_tip="Back" />
+      <button
+       name="forward_btn"
+       follows="top|left"
+       image_selected="Single_Folder_Forward"
+       image_pressed="Single_Folder_Forward"
+       image_unselected="Single_Folder_Forward"
+       scale_image="false"
+       layout="topleft"
+       width="20"
+       height="23"
+       left_pad="1"
+       tool_tip="Forward" />
+      <button
+       name="up_btn"
+       follows="top|left"
+       image_selected="Single_Folder_Up"
+       image_pressed="Single_Folder_Up"
+       image_unselected="Single_Folder_Up"
+       scale_image="false"
+       layout="topleft"
+       width="20"
+       height="23"
+       left_pad="1"
+       tool_tip="Go up one level" />
     </layout_panel>
     <layout_panel
-      border="false"
-      bevel_style="in"
-      user_resize="false"
-      height="25"
-      width="375"
-      visible="true">
+     width="381"
+     height="25"
+     border="false"
+     bevel_style="in"
+     user_resize="false">
       <combo_box
-       height="23"
-       layout="topleft"
-       left="2"
-       top="0"
        name="search_type"
-       tool_tip="Search by"
        follows="top|left"
-       width="67">
-       <item
-        label="Name"
-        name="Name"
-        value="search_by_name"/>
-       <item
-        label="Creator"
-        name="Creator"
-        value="search_by_creator"/>
-       <item
-        label="Description"
-        name="Description"
-        value="search_by_description"/>
-       <item
-        label="UUID"
-        name="UUID"
-        value="search_by_UUID"/>
+       layout="topleft"
+       left="2"
+       width="67"
+       height="23"
+       tool_tip="Search by" >
+        <item
+         name="Name"
+         label="Name"
+         value="search_by_name"/>
+        <item
+         name="Creator"
+         label="Creator"
+         value="search_by_creator"/>
+        <item
+         name="Description"
+         label="Description"
+         value="search_by_description"/>
+        <item
+         name="UUID"
+         label="UUID"
+         value="search_by_UUID"/>
       </combo_box>
       <menu_button
+       name="options_visibility_btn"
        follows="top|left"
-       tool_tip="Search visibility options"
-       height="23"
-       image_overlay="Inv_Toolbar_SearchVisibility"
        layout="topleft"
+       width="31"
+       height="23"
        left_pad="1"
-       name="options_visibility_btn"
-       width="31" />
+       tool_tip="Search visibility options"
+       image_overlay="Inv_Toolbar_SearchVisibility" />
       <filter_editor
+       name="inventory search editor"
+       label="Enter search text"
        text_pad_left="10"
        follows="left|top|right"
-       height="23"
-       label="Enter search text"
        layout="topleft"
+       width="150"
+       height="23"
        left_pad="1"
        max_length_chars="300"
-       highlight_text_field="true"
-       name="inventory search editor"
-       width="150" />
+       highlight_text_field="true" />
       <menu_button
+       name="options_gear_btn"
        follows="top|right"
-       tool_tip="Actions"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="Actions"
        image_overlay="OptionsMenu_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="options_gear_btn"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
       <menu_button
+       name="view_btn"
        follows="top|right"
-       tool_tip="View &amp; sort options"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="View &amp; sort options"
        image_overlay="Conv_toolbar_sort"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="view_btn"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
       <button
+       name="add_btn"
        follows="top|right"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="Create new item"
        image_overlay="AddItem_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="add_btn"
-       tool_tip="Create new item"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
       <button
+       name="view_mode_btn"
        follows="top|right"
-       tool_tip="Switch between views"
+       layout="topleft"
+       width="31"
        height="23"
-       image_hover_unselected="Toolbar_Middle_Over"
+       left_pad="1"
+       tool_tip="Switch between views"
        image_overlay="Single_Folder_Mode"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="view_mode_btn"
-       width="31" />
+       image_hover_unselected="Toolbar_Middle_Over" />
     </layout_panel>
-    </layout_stack>
-    <panel
+  </layout_stack>
+  <panel
+   name="default_inventory_panel"
+   layout="topleft"
+   follows="all"
+   height="372"
+   top_pad="10"
+   halign="center">
+    <tab_container
+     name="inventory filter tabs"
      follows="all"
-     halign="center"
-     height="372"
      layout="topleft"
-     left="7"
-     name="default_inventory_panel"
-     top_pad="10"
-     width="312">
-      <tab_container
+     top="0"
+     bottom="-1"
+     tab_height="30"
+     tab_position="top"
+     tab_min_width="100"
+     halign="center">
+      <inventory_panel
+       name="All Items"
+       label="MY INVENTORY"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       layout="topleft"
        follows="all"
-       halign="center"
-       height="372"
+       help_topic="my_inventory_tab"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       sort_order_setting="InventorySortOrder"
+       scroll.reserve_scroll_corner="false">
+        <folder double_click_override="true"/>
+      </inventory_panel>
+      <recent_inventory_panel
+       name="Recent Items"
+       label="RECENT"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
        layout="topleft"
-       left="0"
-       name="inventory filter tabs"
-       tab_height="30"
-       tab_position="top"
-       tab_min_width="100"
-       top="0"
-       width="312">
-        <inventory_panel
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         border="false"
-         bevel_style="none"
-         follows="all"
-         height="338"
-         label="MY INVENTORY"
-         help_topic="my_inventory_tab"
-         layout="topleft"
-         left="0"
-         name="All Items"
-         sort_order_setting="InventorySortOrder"
-         show_item_link_overlays="true"
-         preinitialize_views="false"
-         top="16"
-         width="288">
-            <folder double_click_override="true"/>
-        </inventory_panel>
-        <recent_inventory_panel
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         border="false"
-         bevel_style="none"
-         follows="all"
-         height="338"
-         label="RECENT"
-         help_topic="recent_inventory_tab"
-         layout="topleft"
-         left_delta="0"
-         name="Recent Items"
-         show_item_link_overlays="true"
-         preinitialize_views="false"
-         width="290">
-            <folder double_click_override="true"/>
-        </recent_inventory_panel>
-        <inventory_panel
-         name="Worn Items"
-         label="WORN"
-         show_empty_message="false"
-         follows="all"
-         layout="topleft"
-         width="290"
-         bg_opaque_color="DkGray2"
-         bg_alpha_color="DkGray2"
-         background_visible="true"
-         preinitialize_views="false"
-         border="false"
-         bevel_style="none"
-         scroll.reserve_scroll_corner="false">
-            <folder double_click_override="true"/>
-        </inventory_panel>
-      </tab_container>
-    </panel>
-    <panel
+       follows="all"
+       left_pad="10"
+       help_topic="recent_inventory_tab"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       scroll.reserve_scroll_corner="false">
+        <folder double_click_override="true"/>
+      </recent_inventory_panel>
+      <inventory_panel
+       name="Worn Items"
+       label="WORN"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       layout="topleft"
+       follows="all"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       show_empty_message="false"
+       scroll.reserve_scroll_corner="false">
+        <folder double_click_override="true"/>
+      </inventory_panel>
+    </tab_container>
+  </panel>
+  <panel
+   follows="all"
+   halign="center"
+   height="372"
+   layout="topleft"
+   left="7"
+   name="combination_view_inventory"
+   top_delta="0"
+   visible="false"
+   xwidth="306">
+    <layout_stack
      follows="all"
-     halign="center"
-     height="372"
      layout="topleft"
-     left="7"
-     name="combination_view_inventory"
-     top_delta="0"
-     visible="false"
-     width="312">
-     <layout_stack
-      follows="all"
-      layout="topleft"
-      height="372"
-      width="312"
-      animate="false"
-      drag_handle_gap="13"
-      drag_handle_thickness="6"
-      drag_handle_first_indent="18"
-      drag_handle_second_indent="18"
-      drag_handle_shift="5"
-      show_drag_handle="true"
-      top="0"
-      left="0"
-      orientation="vertical">
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="246"
-        width="312"
-        min_width="150"
-        name="comb_gallery_layout">
+     height="372"
+     xwidth="306"
+     animate="false"
+     drag_handle_gap="13"
+     drag_handle_thickness="6"
+     drag_handle_first_indent="18"
+     drag_handle_second_indent="18"
+     drag_handle_shift="5"
+     show_drag_handle="true"
+     top="0"
+     left="0"
+     orientation="vertical">
+      <layout_panel
+       border="false"
+       bevel_style="in"
+       user_resize="true"
+       auto_resize="true"
+       height="246"
+       xwidth="306"
+       min_width="150"
+       name="comb_gallery_layout">
         <panel
          class="inventory_gallery"
          filename="panel_inventory_gallery.xml"
          left="0"
          top="1"
          height="246"
-         width="312"
+         xwidth="304"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
          layout="topleft">
         </panel>
-       </layout_panel>
-       <layout_panel
-        border="false"
-        bevel_style="in"
-        user_resize="true"
-        auto_resize="true"
-        height="126"
-        width="312"
-        min_height="100"
-        name="comb_inventory_layout">
+      </layout_panel>
+      <layout_panel
+       border="false"
+       bevel_style="in"
+       user_resize="true"
+       auto_resize="true"
+       height="126"
+       xwidth="306"
+       min_height="100"
+       name="comb_inventory_layout">
         <single_folder_inventory_panel
          name="comb_single_folder_inv"
          follows="all"
          left="0"
          top="1"
          height="126"
-         width="312"
+         xwidth="304"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
@@ -346,14 +329,14 @@
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
-         <item
-          single_folder_mode="true"
-          folder_indentation="-8"/>
-         <folder
-          single_folder_mode="true"
-          folder_indentation="-8"/>
+          <item
+           single_folder_mode="true"
+           folder_indentation="-8"/>
+          <folder
+           single_folder_mode="true"
+           folder_indentation="-8"/>
         </single_folder_inventory_panel>
-       </layout_panel>
-     </layout_stack>
-    </panel>
+      </layout_panel>
+    </layout_stack>
+  </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index dfd3e3bf9d..c1c534f734 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -1,137 +1,113 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	  follows="all"
-	  height="570"
-	  label="Things"
-	  layout="topleft"
-	  min_height="350"
-	  min_width="240"
-	  name="objects panel"
-	  width="358">
-    <panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 name="sidepanel_inventory_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="true"
-		 default_tab_group="1"
-		 width="395">
-      <layout_stack
-              follows="left|right|top|bottom"
-              layout="topleft"
-              left="0"
-              top="0"
-							tab_group="1"
-              orientation="vertical"
-              name="inventory_layout_stack"
-              height="565"
-              width="395">
-             <layout_panel
-                 name="main_inventory_layout_panel"
-                 layout="topleft"
-                 auto_resize="true"
-                 user_resize="true"
-                 min_dim="150"
-                 width="395"
-                 follows="bottom|left|right"
-                 height="300">
-                 <panel
-                      class="panel_main_inventory"
-                      filename="panel_main_inventory.xml"
-                      follows="all"
-                      layout="topleft"
-                      left="0"
-                      name="panel_main_inventory"
-                      top="0"
-                      label=""
-                      height="300"
-                      width="395" />
-             </layout_panel>
-			    <layout_panel
-                 width="355"
-                 layout="topleft"
-                 auto_resize="false"
-                 user_resize="true"
-                 follows="left|right|top"
-                 name="inbox_layout_panel"
-                 visible="true"
-                 min_dim="35"
-                 expanded_min_dim="90"
-                 height="235">
-                 <panel
-                      follows="all"
-                      layout="topleft"
-                      left="0"
-                      name="marketplace_inbox"
-                      class="panel_marketplace_inbox"
-                      top="0"
-                      label=""
-                      height="235"
-                      width="330">
-                     <string name="InboxLabelWithArg">Received items ([NUM])</string>
-                     <string name="InboxLabelNoArg">Received items</string>
-                     <button
-                        control_name="InventoryInboxToggleState"
-                        label="Received items"
-												font="SansSerifMedium"
-                        name="inbox_btn"
-                        height="35"
-                        width="308"
-                        image_unselected="MarketplaceBtn_Off"
-                        image_selected="MarketplaceBtn_Selected"
-                        halign="left"
-                        handle_right_mouse="false"
-                        follows="top|left|right"
-                        is_toggle="true"
-                        tab_stop="false"
-                        pad_left="35"
-                        top="0"
-                        left="10" />
-                     <text
-                        type="string"
-                        length="1"
-                        follows="right|top"
-                        layout="topleft"
-                        height="13"
-                        top="10"
-                        right="-20"
-                        name="inbox_fresh_new_count"
-                        font="SansSerifMedium"
-                        halign="right"
-                        top_pad="0"
-                        width="300">
-                        [NUM] new
-                     </text>
-                     <panel
-                        name="inbox_inventory_placeholder_panel"
-                        follows="all"
-                        left="10"
-                        bottom="235"
-                        width="308"
-                        top="35"
-                        bg_opaque_color="InventoryBackgroundColor"
-                        background_visible="true"
-                        background_opaque="true"
-                        tool_tip="Drag and drop items to your inventory to use them"
-                        >
-                        <text name="inbox_inventory_placeholder"
-															type="string"
-															follows="all"
-															layout="topleft"
-															top="0"
-															left="0"
-															width="308"
-															height="200"
-															wrap="true"
-															halign="center">
-Purchases from the marketplace will be delivered here.
-												</text>
-                    </panel>
-                 </panel>
-             </layout_panel>
-         </layout_stack>
-	</panel>
+ name="objects panel"
+ label="Things"
+ layout="topleft"
+ follows="all"
+ height="570"
+ min_height="350"
+ min_width="240">
+  <panel
+   name="sidepanel_inventory_panel"
+   layout="topleft"
+   follows="all"
+   top="0"
+   height="570"
+   default_tab_group="1">
+    <layout_stack
+     name="inventory_layout_stack"
+     layout="topleft"
+     follows="all"
+     top="0"
+     height="560"
+     tab_group="1"
+     orientation="vertical">
+      <layout_panel
+       name="main_inventory_layout_panel"
+       layout="topleft"
+       follows="bottom|left|right"
+       height="300"
+       auto_resize="true"
+       user_resize="true"
+       min_dim="150">
+        <panel
+         name="panel_main_inventory"
+         class="panel_main_inventory"
+         filename="panel_main_inventory.xml"
+         layout="topleft"
+         follows="all"
+         top="0"
+         height="300" />
+      </layout_panel>
+      <layout_panel
+       name="inbox_layout_panel"
+       follows="left|right|top"
+       layout="topleft"
+       min_dim="35"
+       expanded_min_dim="90"
+       auto_resize="false"
+       user_resize="true" >
+        <panel
+         name="marketplace_inbox"
+         class="panel_marketplace_inbox"
+         layout="topleft"
+         follows="all" >
+          <string name="InboxLabelWithArg">Received items ([NUM])</string>
+          <string name="InboxLabelNoArg">Received items</string>
+          <button
+           name="inbox_btn"
+           control_name="InventoryInboxToggleState"
+           label="Received items"
+           font="SansSerifMedium"
+           follows="top|left|right"
+           height="35"
+           image_unselected="MarketplaceBtn_Off"
+           image_selected="MarketplaceBtn_Selected"
+           pad_left="35"
+           left="10"
+           right="-10"
+           halign="left"
+           is_toggle="true"
+           tab_stop="false"
+           handle_right_mouse="false" />
+          <text
+           name="inbox_fresh_new_count"
+           font="SansSerifMedium"
+           type="string"
+           length="1"
+           follows="right|top"
+           layout="topleft"
+           height="13"
+           top_pad="0"
+           top="10"
+           right="-20"
+           halign="right">
+            [NUM] new
+          </text>
+          <panel
+           name="inbox_inventory_placeholder_panel"
+           bg_opaque_color="InventoryBackgroundColor"
+           background_visible="true"
+           background_opaque="true"
+           follows="all"
+           top="36"
+           right="-10"
+           bottom="10"
+           tool_tip="Drag and drop items to your inventory to use them" >
+            <text
+             name="inbox_inventory_placeholder"
+             type="string"
+             follows="all"
+             layout="topleft"
+             top="1"
+             bottom="-1"
+             wrap="true"
+             halign="center">
+              Purchases from the marketplace will be delivered here.
+            </text>
+          </panel>
+        </panel>
+      </layout_panel>
+    </layout_stack>
+  </panel>
 </panel>
-- 
cgit v1.2.3


From 94fd5bcca5723f9779bf1c719e8b2ec6016dc0e8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 13:33:47 +0200
Subject: SL-19404 Navigation bar coordinates slightly off

---
 indra/newview/llagentui.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index c19ad2ae6f..acb1a37ff5 100644
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -82,9 +82,9 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
 
 	if (!region || !parcel) return FALSE;
 
-	S32 pos_x = S32(agent_pos_region.mV[VX]);
-	S32 pos_y = S32(agent_pos_region.mV[VY]);
-	S32 pos_z = S32(agent_pos_region.mV[VZ]);
+	S32 pos_x = S32(agent_pos_region.mV[VX] + 0.5f);
+	S32 pos_y = S32(agent_pos_region.mV[VY] + 0.5f);
+	S32 pos_z = S32(agent_pos_region.mV[VZ] + 0.5f);
 
 	// Round the numbers based on the velocity
 	F32 velocity_mag_sq = gAgent.getVelocity().magVecSquared();
-- 
cgit v1.2.3


From ff005a0c2a6ff1d40a3823f506e0bcff963e0aa8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 13:33:47 +0200
Subject: SL-19404 Navigation bar coordinates slightly off

---
 indra/newview/llagentui.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index c19ad2ae6f..acb1a37ff5 100644
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -82,9 +82,9 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
 
 	if (!region || !parcel) return FALSE;
 
-	S32 pos_x = S32(agent_pos_region.mV[VX]);
-	S32 pos_y = S32(agent_pos_region.mV[VY]);
-	S32 pos_z = S32(agent_pos_region.mV[VZ]);
+	S32 pos_x = S32(agent_pos_region.mV[VX] + 0.5f);
+	S32 pos_y = S32(agent_pos_region.mV[VY] + 0.5f);
+	S32 pos_z = S32(agent_pos_region.mV[VZ] + 0.5f);
 
 	// Round the numbers based on the velocity
 	F32 velocity_mag_sq = gAgent.getVelocity().magVecSquared();
-- 
cgit v1.2.3


From b848e6d6b71976f1d9a5d28bcceb680b9b8f1779 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 15:46:54 +0300
Subject: SL-19863 remove unused menu items to get rid of callback warnings

---
 .../default/xui/en/menu_gallery_inventory.xml      | 24 ----------------------
 1 file changed, 24 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index 15466e8f32..46afa3821b 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -23,22 +23,6 @@
         <menu_item_call.on_click
          function="Inventory.EmptyLostAndFound"/>
     </menu_item_call>
-    <menu_item_call
-     label="New Folder"
-     layout="topleft"
-     name="New Folder">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="category" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Outfit"
-     layout="topleft"
-     name="New Outfit">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="outfit" />
-    </menu_item_call>
     <menu_item_call
      label="Teleport"
      layout="topleft"
@@ -323,14 +307,6 @@
         function="Inventory.DoToSelected"
         parameter="request_lure" />
     </menu_item_call>
-    <menu_item_call
-     label="Start Conference Chat"
-     layout="topleft"
-     name="Conference Chat">
-        <menu_item_call.on_click
-         function="Inventory.BeginIMSession"
-         parameter="selected" />
-    </menu_item_call>
     <menu_item_separator
      layout="topleft" 
      name="Gesture Separator" />
-- 
cgit v1.2.3


From 872e23e305c9b5bf1343ea52d801fa662737ceb8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 17:09:35 +0300
Subject: SL-19686 WIP Fix new inventory window not initing

---
 indra/newview/llpanelmaininventory.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a785d5adb7..3226cb51a4 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -441,7 +441,10 @@ LLFloaterSidePanelContainer* LLPanelMainInventory::newWindow()
 
 	if (!gAgentCamera.cameraMouselook())
 	{
-		return LLFloaterReg::showTypedInstance<LLFloaterSidePanelContainer>("inventory", LLSD(instance_num));
+        LLFloaterSidePanelContainer* floater = LLFloaterReg::showTypedInstance<LLFloaterSidePanelContainer>("inventory", LLSD(instance_num));
+        LLSidepanelInventory* sidepanel_inventory = floater->findChild<LLSidepanelInventory>("main_panel");
+        sidepanel_inventory->initInventoryViews();
+		return floater;
 	}
     return NULL;
 }
-- 
cgit v1.2.3


From 451a89d75b78ccf0313f5dadbe6f380136500fda Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 22:23:29 +0300
Subject: SL-19686 WIP Split gallery initiation over frames

---
 indra/newview/llinventorygallery.cpp | 52 ++++++++++++++++++++++++------------
 indra/newview/llinventorygallery.h   |  6 ++---
 2 files changed, 38 insertions(+), 20 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index fe9605daa8..083dfdc65e 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -219,6 +219,7 @@ void LLInventoryGallery::updateRootFolder()
         {
             updateRemovedItem(mHiddenItems[i]->getUUID());
         }
+        mItemBuildQuery.clear();
         
         if (gInventory.containsObserver(mCategoriesObserver))
         {
@@ -262,16 +263,15 @@ void LLInventoryGallery::updateRootFolder()
             iter != cat_array->end();
             iter++)
         {
-            updateAddedItem((*iter)->getUUID());
+            mItemBuildQuery.insert((*iter)->getUUID());
         }
         
         for (LLInventoryModel::item_array_t::const_iterator iter = item_array->begin();
             iter != item_array->end();
             iter++)
         {
-            updateAddedItem((*iter)->getUUID());
+            mItemBuildQuery.insert((*iter)->getUUID());
         }
-        reArrangeRows();
         mIsInitialized = true;
         mRootDirty = false;
 
@@ -287,6 +287,11 @@ void LLInventoryGallery::updateRootFolder()
     {
         initGallery();
     }
+
+    if (!mItemBuildQuery.empty())
+    {
+        gIdleCallbacks.addFunction(onIdle, (void*)this);
+    }
 }
 
 void LLInventoryGallery::initGallery()
@@ -640,12 +645,14 @@ void LLInventoryGallery::setFilterSubString(const std::string& string)
     //reArrangeRows();
 }
 
-void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring)
+bool LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring)
 {
     if(item)
     {
         item->setHidden(!checkAgainstFilters(item, filter_substring));
+        return false;
     }
+    return true;
 }
 
 bool LLInventoryGallery::checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring)
@@ -724,6 +731,21 @@ void LLInventoryGallery::onIdle(void* userdata)
         return;
     }
 
+    const F64 MAX_TIME_VISIBLE = 0.020f;
+    const F64 MAX_TIME_HIDDEN = 0.001f; // take it slow
+    const F64 max_time = self->getVisible() ? MAX_TIME_VISIBLE : MAX_TIME_HIDDEN;
+    F64 curent_time = LLTimer::getTotalSeconds();
+    const F64 end_time = curent_time + max_time;
+
+    while (!self->mItemBuildQuery.empty() && end_time > curent_time)
+    {
+        uuid_set_t::iterator iter = self->mItemBuildQuery.begin();
+        LLUUID item_id = *iter;
+        self->mNeedsArrange |= self->updateAddedItem(item_id);
+        self->mItemBuildQuery.erase(iter);
+        curent_time = LLTimer::getTotalSeconds();
+    }
+
     if (self->mNeedsArrange)
     {
         self->mNeedsArrange = false;
@@ -737,7 +759,7 @@ void LLInventoryGallery::onIdle(void* userdata)
         self->changeItemSelection(item_to_select, true);
     }
 
-    if (self->mItemToSelect.isNull())
+    if (self->mItemToSelect.isNull() && self->mItemBuildQuery.empty())
     {
         gIdleCallbacks.deleteFunction(onIdle, (void*)self);
     }
@@ -768,13 +790,13 @@ void LLInventoryGallery::getCurrentCategories(uuid_vec_t& vcur)
     }
 }
 
-void LLInventoryGallery::updateAddedItem(LLUUID item_id)
+bool LLInventoryGallery::updateAddedItem(LLUUID item_id)
 {
     LLInventoryObject* obj = gInventory.getObject(item_id);
     if (!obj)
     {
         LL_WARNS("InventoryGallery") << "Failed to find item: " << item_id << LL_ENDL;
-        return;
+        return false;
     }
 
     std::string name = obj->getName();
@@ -805,18 +827,20 @@ void LLInventoryGallery::updateAddedItem(LLUUID item_id)
         }
     }
 
+    bool res = false;
     LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id, false));
     if (mGalleryCreated)
     {
-        applyFilter(item, mFilterSubString);
+        res = applyFilter(item, mFilterSubString);
         addToGallery(item);
     }
 
     mThumbnailsObserver->addItem(item_id,
         boost::bind(&LLInventoryGallery::updateItemThumbnail, this, item_id));
+    return res;
 }
 
 void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
@@ -838,6 +862,8 @@ void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
             item->die();
         }
     }
+
+    mItemBuildQuery.erase(item_id);
 }
 
 void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
@@ -893,15 +919,6 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
     }
 }
 
-void LLInventoryGallery::onThumbnailAdded(LLUUID item_id)
-{
-    if((mItemMap.count(item_id) == 0) && mFilter->checkAgainstFilterThumbnails(item_id))
-    {
-        updateAddedItem(item_id);
-        reArrangeRows();
-    }
-}
-
 BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
     LLUUID old_selection = mSelectedItemID;
@@ -1666,6 +1683,7 @@ void LLInventoryGallery::computeDifference(
 
     uuid_vec_t vcur;
     getCurrentCategories(vcur);
+    std::copy(mItemBuildQuery.begin(), mItemBuildQuery.end(), std::back_inserter(vcur));
 
     LLCommonUtils::computeDifference(vnew, vcur, vadded, vremoved);
 }
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 8519ee0731..66cffccebc 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -92,11 +92,10 @@ public:
     bool checkAgainstFilterType(const LLUUID& object_id);
 
     void getCurrentCategories(uuid_vec_t& vcur);
-    void updateAddedItem(LLUUID item_id);
+    bool updateAddedItem(LLUUID item_id); // returns true if added item is visible
     void updateRemovedItem(LLUUID item_id);
     void updateChangedItemName(LLUUID item_id, std::string name);
     void updateItemThumbnail(LLUUID item_id);
-    void onThumbnailAdded(LLUUID item_id);
     void updateWornItem(LLUUID item_id, bool is_worn);
 
     void updateMessageVisibility();
@@ -167,7 +166,7 @@ protected:
 
     void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
 
-    void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
+    bool applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
     bool checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring);
     static void onIdle(void* userdata);
     void dirtyRootFolder();
@@ -247,6 +246,7 @@ private:
     gallery_item_map_t mItemMap;
     uuid_vec_t mCOFLinkedItems;
     uuid_vec_t mActiveGestures;
+    uuid_set_t mItemBuildQuery;
     std::map<LLInventoryGalleryItem*, S32> mItemIndexMap;
     std::map<S32, LLInventoryGalleryItem*> mIndexToItemMap;
 
-- 
cgit v1.2.3


From d077558ed7fac01aae8d5a1670f4d0764ec6fbcb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 22:50:41 +0300
Subject: SL-19686 Fix memory leak

---
 indra/newview/llinventorygallery.cpp   | 15 +++++++++++++++
 indra/newview/llinventorygallery.h     |  1 +
 indra/newview/llpanelmaininventory.cpp |  3 +--
 3 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 083dfdc65e..caf93b924c 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -158,6 +158,13 @@ LLInventoryGallery::~LLInventoryGallery()
         mUnusedItemPanels.pop_back();
         panelp->die();
     }
+    while (!mHiddenItems.empty())
+    {
+        LLPanel* panelp = mHiddenItems.back();
+        mHiddenItems.pop_back();
+        panelp->die();
+    }
+    
 
     if (gInventory.containsObserver(mCategoriesObserver))
     {
@@ -490,6 +497,7 @@ void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item)
     if(item->isHidden())
     {
         mHiddenItems.pop_back();
+        // Note: item still exists!!!
         return;
     }
     int n_prev = mItemsAddedCount;
@@ -519,6 +527,7 @@ void LLInventoryGallery::removeFromGalleryMiddle(LLInventoryGalleryItem* item)
     if(item->isHidden())
     {
         mHiddenItems.erase(std::remove(mHiddenItems.begin(), mHiddenItems.end(), item), mHiddenItems.end());
+        // item still exists and needs to be deleted or used!!!
         return;
     }
     int n = mItemIndexMap[item];
@@ -859,6 +868,7 @@ void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
         // kill removed item
         if (item != NULL)
         {
+            // Todo: instead of deleting, store somewhere to reuse later
             item->die();
         }
     }
@@ -1876,6 +1886,11 @@ BOOL LLInventoryGallery::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
     return handled;
 }
 
+bool LLInventoryGallery::areViewsInitialized()
+{
+    return mGalleryCreated && mItemBuildQuery.empty();
+}
+
 bool LLInventoryGallery::hasDescendents(const LLUUID& cat_id)
 {
     LLInventoryModel::cat_array_t* cats;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 66cffccebc..d82d466aaf 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -134,6 +134,7 @@ public:
     void setSearchType(LLInventoryFilter::ESearchType type);
     LLInventoryFilter::ESearchType getSearchType() { return mSearchType; }
 
+    bool areViewsInitialized();
     bool hasDescendents(const LLUUID& cat_id);
     bool hasVisibleItems();
     void handleModifiedFilter();
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 3226cb51a4..107a00f35a 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2386,7 +2386,6 @@ void LLPanelMainInventory::updateCombinationVisibility()
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
         bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
         mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty);
-        mCombinationGalleryPanel->setVisible(true); // to make sure root updates are getting processed
         mCombinationListLayoutPanel->setVisible(show_inv_pane);
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
         if(mCombinationInventoryPanel->hasVisibleItems())
@@ -2402,7 +2401,7 @@ void LLPanelMainInventory::updateCombinationVisibility()
 
         if (mReshapeInvLayout
             && show_inv_pane
-            && mCombinationGalleryPanel->hasVisibleItems()
+            && (mCombinationGalleryPanel->hasVisibleItems() || mCombinationGalleryPanel->areViewsInitialized())
             && mCombinationInventoryPanel->areViewsInitialized())
         {
             mReshapeInvLayout = false;
-- 
cgit v1.2.3


From 4de5576fb4bea538f3381f581d3caf54ee03fb05 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 22:26:04 +0300
Subject: SL-19686 Remove gallery 'skipped' items

Probably whole observer is not nessesary, instead we need a general observer to track a variety of changes.
---
 indra/newview/llinventorygallery.cpp | 41 ------------------------------------
 indra/newview/llinventorygallery.h   |  3 ---
 2 files changed, 44 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index caf93b924c..a7dfbb5938 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2294,33 +2294,6 @@ void LLInventoryGalleryItem::updateNameText()
 void LLThumbnailsObserver::changed(U32 mask)
 {
     std::vector<LLUUID> deleted_ids;
-    for (item_map_t::iterator iter = mSkippedItems.begin();
-         iter != mSkippedItems.end();
-         ++iter)
-    {
-        const LLUUID& obj_id = (*iter).first;
-        LLItemData& data = (*iter).second;
-        
-        LLInventoryObject* obj = gInventory.getObject(obj_id);
-        if (!obj)
-        {
-            deleted_ids.push_back(obj_id);
-            continue;
-        }
-
-        const LLUUID thumbnail_id = obj->getThumbnailUUID();
-        if (data.mThumbnailID != thumbnail_id)
-        {
-            data.mThumbnailID = thumbnail_id;
-            data.mCallback();
-        }
-    }
-    for (std::vector<LLUUID>::iterator deleted_id = deleted_ids.begin(); deleted_id != deleted_ids.end(); ++deleted_id)
-    {
-        removeSkippedItem(*deleted_id);
-    }
-    deleted_ids.clear();
-
     for (item_map_t::iterator iter = mItemMap.begin();
          iter != mItemMap.end();
          ++iter)
@@ -2361,25 +2334,11 @@ bool LLThumbnailsObserver::addItem(const LLUUID& obj_id, callback_t cb)
     return false;
 }
 
-void LLThumbnailsObserver::addSkippedItem(const LLUUID& obj_id, callback_t cb)
-{
-    LLInventoryObject* obj = gInventory.getObject(obj_id);
-    if (obj)
-    {
-        mSkippedItems.insert(item_map_value_t(obj_id, LLItemData(obj_id, obj->getThumbnailUUID(), cb)));
-    }
-}
-
 void LLThumbnailsObserver::removeItem(const LLUUID& obj_id)
 {
     mItemMap.erase(obj_id);
 }
 
-void LLThumbnailsObserver::removeSkippedItem(const LLUUID& obj_id)
-{
-    mSkippedItems.erase(obj_id);
-}
-
 //-----------------------------
 // Helper drag&drop functions
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index d82d466aaf..e314281a07 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -348,9 +348,7 @@ public:
 
     virtual void changed(U32 mask);
     bool addItem(const LLUUID& obj_id, callback_t cb);
-    void addSkippedItem(const LLUUID& obj_id, callback_t cb);
     void removeItem(const LLUUID& obj_id);
-    void removeSkippedItem(const LLUUID& obj_id);
 
 protected:
 
@@ -370,7 +368,6 @@ protected:
     typedef std::map<LLUUID, LLItemData> item_map_t;
     typedef item_map_t::value_type item_map_value_t;
     item_map_t mItemMap;
-    item_map_t mSkippedItems;
 };
 
 class LLGalleryGestureObserver : public LLGestureManagerObserver
-- 
cgit v1.2.3


From 44e746c2068aa983c15336277fc8f988fcb94303 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Jun 2023 23:10:56 +0300
Subject: Revert "SL-18977 Borders of inventory view in inventory floater seem
 to be cut a bit"

This reverts commit 7ac094e92105122b22b4693dafae7f0cee72d9a0.
Commit breaks gallery panel, it is not ready.
---
 indra/llui/llscrollcontainer.cpp                   |   8 +-
 indra/llui/lltabcontainer.cpp                      |   8 +-
 indra/newview/llinventorypanel.cpp                 |   1 +
 .../skins/default/xui/en/floater_my_inventory.xml  |  26 +-
 .../skins/default/xui/en/panel_main_inventory.xml  | 473 +++++++++++----------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 244 ++++++-----
 6 files changed, 401 insertions(+), 359 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index 5872b79bb0..c4cb739f0a 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -124,9 +124,9 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	mScrollbar[VERTICAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[VERTICAL] );
 	
-	LLRect horizontal_scroll_rect;
-	horizontal_scroll_rect.mRight = mInnerRect.getWidth();
-	horizontal_scroll_rect.mTop = scrollbar_size;
+	LLRect horizontal_scroll_rect = mInnerRect;
+	horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + scrollbar_size;
+	horizontal_scroll_rect.mLeft += 3;
 	sbparams.name("scrollable horizontal");
 	sbparams.rect(horizontal_scroll_rect);
 	sbparams.orientation(LLScrollbar::HORIZONTAL);
@@ -135,7 +135,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	sbparams.page_size(mInnerRect.getWidth());
 	sbparams.step_size(VERTICAL_MULTIPLE);
 	sbparams.visible(false);
-	sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
+	sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT);
 	sbparams.change_callback(p.scroll_callback);
 	mScrollbar[HORIZONTAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[HORIZONTAL] );
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index d5d337848c..8c841540a5 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -986,7 +986,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	// Tab panel
 	S32 tab_panel_top;
 	S32 tab_panel_bottom;
-	if (!getTabsHidden())
+	if (!getTabsHidden()) 
 	{
 		if( getTabPosition() == LLTabContainer::TOP )
 		{
@@ -1002,7 +1002,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	}
 	else
 	{
-		// Skip tab button space if tabs are invisible (EXT-576)
+		//Scip tab button space if they are invisible(EXT - 576)
 		tab_panel_top = getRect().getHeight();
 		tab_panel_bottom = LLPANEL_BORDER_WIDTH;
 	}
@@ -1017,9 +1017,9 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	}
 	else
 	{
-		tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH * 2,
+		tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH, 
 								tab_panel_top,
-								getRect().getWidth(),
+								getRect().getWidth()-LLPANEL_BORDER_WIDTH,
 								tab_panel_bottom );
 	}
 	child->setFollowsAll();
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 2fefacf90b..f7a24a09c0 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -298,6 +298,7 @@ void LLInventoryPanel::initFolderRoot()
     // Scroller
     LLRect scroller_view_rect = getRect();
     scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
+	scroller_view_rect.mTop -= 3;
     LLScrollContainer::Params scroller_params(mParams.scroll());
     scroller_params.rect(scroller_view_rect);
     mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index b75744d432..a9900f05b7 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater
- name="floater_my_inventory"
- title="INVENTORY"
- help_topic="sidebar_inventory"
  positioning="cascading"
- width="363"
+ can_close="true"
+ can_resize="true"
  height="570"
+ help_topic="sidebar_inventory"
  min_width="363"
  min_height="270"
- can_close="true"
- can_resize="true"
+ name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
- reuse_instance="true" >
-  <panel
-   name="main_panel"
-   class="sidepanel_inventory"
-   filename="sidepanel_inventory.xml"
-   follows="all"
-   top="0" />
+ reuse_instance="true"
+ title="INVENTORY"
+ width="363" >
+   <panel
+    class="sidepanel_inventory"
+    name="main_panel"
+    filename="sidepanel_inventory.xml"
+    follows="all"
+    top="0"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index b170885178..64b885c222 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="main inventory panel"
  follows="all"
  height="423"
  label="Things"
  layout="topleft"
  min_height="300"
- min_width="240" >
+ min_width="240"
+ name="main inventory panel"
+ width="355">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -26,18 +27,18 @@
   <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
   <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
-   name="ItemcountText"
-   type="string"
-   length="1"
-   follows="left|top|right"
-   layout="topleft"
-   height="13"
-   left="10"
-   right="-10"
-   font="SansSerifMedium"
-   text_color="InventoryItemLinkColor"
-   use_ellipses="true"
-   top_pad="0">
+		     type="string"
+		     length="1"
+		     follows="left|top|right"
+		     height="13"
+		     layout="topleft"
+    		 left="12"
+		     name="ItemcountText"
+		     font="SansSerifMedium"
+		     text_color="InventoryItemLinkColor"
+		     use_ellipses="true"
+		     top_pad="0"
+		     width="300">
     Items:
   </text>
   <layout_stack
@@ -45,282 +46,298 @@
    height="25"
    animate="false"
    top_pad="10"
-   left="8"
+   left="2"
    orientation="horizontal">
     <layout_panel
-     name="nav_buttons"
-     width="65"
-     height="25"
      border="false"
      bevel_style="in"
      user_resize="false"
      auto_resize="false"
+     height="25"
+     width="65"
+     name="nav_buttons"
      visible="false">
-      <button
-       name="back_btn"
-       follows="top|left"
-       image_selected="Single_Folder_Back"
-       image_pressed="Single_Folder_Back"
-       image_unselected="Single_Folder_Back"
-       scale_image="false"
-       layout="topleft"
-       top="2"
-       left="3"
-       width="20"
-       height="23"
-       tool_tip="Back" />
-      <button
-       name="forward_btn"
-       follows="top|left"
-       image_selected="Single_Folder_Forward"
-       image_pressed="Single_Folder_Forward"
-       image_unselected="Single_Folder_Forward"
-       scale_image="false"
-       layout="topleft"
-       width="20"
-       height="23"
-       left_pad="1"
-       tool_tip="Forward" />
-      <button
-       name="up_btn"
-       follows="top|left"
-       image_selected="Single_Folder_Up"
-       image_pressed="Single_Folder_Up"
-       image_unselected="Single_Folder_Up"
-       scale_image="false"
-       layout="topleft"
-       width="20"
-       height="23"
-       left_pad="1"
-       tool_tip="Go up one level" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Back"
+      image_pressed="Single_Folder_Back"
+      image_unselected="Single_Folder_Back"
+      scale_image="false"
+      layout="topleft"
+      left="3"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Forward"
+      image_pressed="Single_Folder_Forward"
+      image_unselected="Single_Folder_Forward"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Up"
+      image_pressed="Single_Folder_Up"
+      image_unselected="Single_Folder_Up"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
     </layout_panel>
     <layout_panel
-     width="381"
-     height="25"
-     border="false"
-     bevel_style="in"
-     user_resize="false">
+      border="false"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="375"
+      visible="true">
       <combo_box
-       name="search_type"
-       follows="top|left"
+       height="23"
        layout="topleft"
        left="2"
-       width="67"
-       height="23"
-       tool_tip="Search by" >
-        <item
-         name="Name"
-         label="Name"
-         value="search_by_name"/>
-        <item
-         name="Creator"
-         label="Creator"
-         value="search_by_creator"/>
-        <item
-         name="Description"
-         label="Description"
-         value="search_by_description"/>
-        <item
-         name="UUID"
-         label="UUID"
-         value="search_by_UUID"/>
+       top="0"
+       name="search_type"
+       tool_tip="Search by"
+       follows="top|left"
+       width="67">
+       <item
+        label="Name"
+        name="Name"
+        value="search_by_name"/>
+       <item
+        label="Creator"
+        name="Creator"
+        value="search_by_creator"/>
+       <item
+        label="Description"
+        name="Description"
+        value="search_by_description"/>
+       <item
+        label="UUID"
+        name="UUID"
+        value="search_by_UUID"/>
       </combo_box>
       <menu_button
-       name="options_visibility_btn"
        follows="top|left"
-       layout="topleft"
-       width="31"
+       tool_tip="Search visibility options"
        height="23"
+       image_overlay="Inv_Toolbar_SearchVisibility"
+       layout="topleft"
        left_pad="1"
-       tool_tip="Search visibility options"
-       image_overlay="Inv_Toolbar_SearchVisibility" />
+       name="options_visibility_btn"
+       width="31" />
       <filter_editor
-       name="inventory search editor"
-       label="Enter search text"
        text_pad_left="10"
        follows="left|top|right"
-       layout="topleft"
-       width="150"
        height="23"
+       label="Enter search text"
+       layout="topleft"
        left_pad="1"
        max_length_chars="300"
-       highlight_text_field="true" />
+       highlight_text_field="true"
+       name="inventory search editor"
+       width="150" />
       <menu_button
-       name="options_gear_btn"
        follows="top|right"
-       layout="topleft"
-       width="31"
-       height="23"
-       left_pad="1"
        tool_tip="Actions"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="OptionsMenu_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
-      <menu_button
-       name="view_btn"
-       follows="top|right"
        layout="topleft"
-       width="31"
-       height="23"
        left_pad="1"
+       name="options_gear_btn"
+       width="31" />
+      <menu_button
+       follows="top|right"
        tool_tip="View &amp; sort options"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="Conv_toolbar_sort"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
+       layout="topleft"
+       left_pad="1"
+       name="view_btn"
+       width="31" />
       <button
-       name="add_btn"
        follows="top|right"
-       layout="topleft"
-       width="31"
        height="23"
-       left_pad="1"
-       tool_tip="Create new item"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="AddItem_Off"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
-      <button
-       name="view_mode_btn"
-       follows="top|right"
        layout="topleft"
-       width="31"
-       height="23"
        left_pad="1"
+       name="add_btn"
+       tool_tip="Create new item"
+       width="31" />
+      <button
+       follows="top|right"
        tool_tip="Switch between views"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
        image_overlay="Single_Folder_Mode"
        image_selected="Toolbar_Middle_Selected"
        image_unselected="Toolbar_Middle_Off"
-       image_hover_unselected="Toolbar_Middle_Over" />
+       layout="topleft"
+       left_pad="1"
+       name="view_mode_btn"
+       width="31" />
     </layout_panel>
-  </layout_stack>
-  <panel
-   name="default_inventory_panel"
-   layout="topleft"
-   follows="all"
-   height="372"
-   top_pad="10"
-   halign="center">
-    <tab_container
-     name="inventory filter tabs"
+    </layout_stack>
+    <panel
      follows="all"
+     halign="center"
+     height="372"
      layout="topleft"
-     top="0"
-     bottom="-1"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
-     halign="center">
-      <inventory_panel
-       name="All Items"
-       label="MY INVENTORY"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
-       layout="topleft"
+     left="7"
+     name="default_inventory_panel"
+     top_pad="10"
+     width="312">
+      <tab_container
        follows="all"
-       help_topic="my_inventory_tab"
-       show_item_link_overlays="true"
-       preinitialize_views="false"
-       sort_order_setting="InventorySortOrder"
-       scroll.reserve_scroll_corner="false">
-        <folder double_click_override="true"/>
-      </inventory_panel>
-      <recent_inventory_panel
-       name="Recent Items"
-       label="RECENT"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
+       halign="center"
+       height="372"
        layout="topleft"
-       follows="all"
-       left_pad="10"
-       help_topic="recent_inventory_tab"
-       show_item_link_overlays="true"
-       preinitialize_views="false"
-       scroll.reserve_scroll_corner="false">
-        <folder double_click_override="true"/>
-      </recent_inventory_panel>
-      <inventory_panel
-       name="Worn Items"
-       label="WORN"
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
-       background_visible="true"
-       layout="topleft"
-       follows="all"
-       show_item_link_overlays="true"
-       preinitialize_views="false"
-       show_empty_message="false"
-       scroll.reserve_scroll_corner="false">
-        <folder double_click_override="true"/>
-      </inventory_panel>
-    </tab_container>
-  </panel>
-  <panel
-   follows="all"
-   halign="center"
-   height="372"
-   layout="topleft"
-   left="7"
-   name="combination_view_inventory"
-   top_delta="0"
-   visible="false"
-   xwidth="306">
-    <layout_stack
+       left="0"
+       name="inventory filter tabs"
+       tab_height="30"
+       tab_position="top"
+       tab_min_width="100"
+       top="0"
+       width="312">
+        <inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="MY INVENTORY"
+         help_topic="my_inventory_tab"
+         layout="topleft"
+         left="0"
+         name="All Items"
+         sort_order_setting="InventorySortOrder"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         top="16"
+         width="288">
+            <folder double_click_override="true"/>
+        </inventory_panel>
+        <recent_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="RECENT"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         left_delta="0"
+         name="Recent Items"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         width="290">
+            <folder double_click_override="true"/>
+        </recent_inventory_panel>
+        <inventory_panel
+         name="Worn Items"
+         label="WORN"
+         show_empty_message="false"
+         follows="all"
+         layout="topleft"
+         width="290"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         preinitialize_views="false"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+            <folder double_click_override="true"/>
+        </inventory_panel>
+      </tab_container>
+    </panel>
+    <panel
      follows="all"
-     layout="topleft"
+     halign="center"
      height="372"
-     xwidth="306"
-     animate="false"
-     drag_handle_gap="13"
-     drag_handle_thickness="6"
-     drag_handle_first_indent="18"
-     drag_handle_second_indent="18"
-     drag_handle_shift="5"
-     show_drag_handle="true"
-     top="0"
-     left="0"
-     orientation="vertical">
-      <layout_panel
-       border="false"
-       bevel_style="in"
-       user_resize="true"
-       auto_resize="true"
-       height="246"
-       xwidth="306"
-       min_width="150"
-       name="comb_gallery_layout">
+     layout="topleft"
+     left="7"
+     name="combination_view_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+     <layout_stack
+      follows="all"
+      layout="topleft"
+      height="372"
+      width="312"
+      animate="false"
+      drag_handle_gap="13"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_shift="5"
+      show_drag_handle="true"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="246"
+        width="312"
+        min_width="150"
+        name="comb_gallery_layout">
         <panel
          class="inventory_gallery"
          filename="panel_inventory_gallery.xml"
          left="0"
          top="1"
          height="246"
-         xwidth="304"
+         width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
          layout="topleft">
         </panel>
-      </layout_panel>
-      <layout_panel
-       border="false"
-       bevel_style="in"
-       user_resize="true"
-       auto_resize="true"
-       height="126"
-       xwidth="306"
-       min_height="100"
-       name="comb_inventory_layout">
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="126"
+        width="312"
+        min_height="100"
+        name="comb_inventory_layout">
         <single_folder_inventory_panel
          name="comb_single_folder_inv"
          follows="all"
          left="0"
          top="1"
          height="126"
-         xwidth="304"
+         width="312"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
@@ -329,14 +346,14 @@
          border="false"
          bevel_style="none"
          scroll.reserve_scroll_corner="false">
-          <item
-           single_folder_mode="true"
-           folder_indentation="-8"/>
-          <folder
-           single_folder_mode="true"
-           folder_indentation="-8"/>
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
         </single_folder_inventory_panel>
-      </layout_panel>
-    </layout_stack>
-  </panel>
+       </layout_panel>
+     </layout_stack>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index c1c534f734..dfd3e3bf9d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -1,113 +1,137 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="objects panel"
- label="Things"
- layout="topleft"
- follows="all"
- height="570"
- min_height="350"
- min_width="240">
-  <panel
-   name="sidepanel_inventory_panel"
-   layout="topleft"
-   follows="all"
-   top="0"
-   height="570"
-   default_tab_group="1">
-    <layout_stack
-     name="inventory_layout_stack"
-     layout="topleft"
-     follows="all"
-     top="0"
-     height="560"
-     tab_group="1"
-     orientation="vertical">
-      <layout_panel
-       name="main_inventory_layout_panel"
-       layout="topleft"
-       follows="bottom|left|right"
-       height="300"
-       auto_resize="true"
-       user_resize="true"
-       min_dim="150">
-        <panel
-         name="panel_main_inventory"
-         class="panel_main_inventory"
-         filename="panel_main_inventory.xml"
-         layout="topleft"
-         follows="all"
-         top="0"
-         height="300" />
-      </layout_panel>
-      <layout_panel
-       name="inbox_layout_panel"
-       follows="left|right|top"
-       layout="topleft"
-       min_dim="35"
-       expanded_min_dim="90"
-       auto_resize="false"
-       user_resize="true" >
-        <panel
-         name="marketplace_inbox"
-         class="panel_marketplace_inbox"
-         layout="topleft"
-         follows="all" >
-          <string name="InboxLabelWithArg">Received items ([NUM])</string>
-          <string name="InboxLabelNoArg">Received items</string>
-          <button
-           name="inbox_btn"
-           control_name="InventoryInboxToggleState"
-           label="Received items"
-           font="SansSerifMedium"
-           follows="top|left|right"
-           height="35"
-           image_unselected="MarketplaceBtn_Off"
-           image_selected="MarketplaceBtn_Selected"
-           pad_left="35"
-           left="10"
-           right="-10"
-           halign="left"
-           is_toggle="true"
-           tab_stop="false"
-           handle_right_mouse="false" />
-          <text
-           name="inbox_fresh_new_count"
-           font="SansSerifMedium"
-           type="string"
-           length="1"
-           follows="right|top"
-           layout="topleft"
-           height="13"
-           top_pad="0"
-           top="10"
-           right="-20"
-           halign="right">
-            [NUM] new
-          </text>
-          <panel
-           name="inbox_inventory_placeholder_panel"
-           bg_opaque_color="InventoryBackgroundColor"
-           background_visible="true"
-           background_opaque="true"
-           follows="all"
-           top="36"
-           right="-10"
-           bottom="10"
-           tool_tip="Drag and drop items to your inventory to use them" >
-            <text
-             name="inbox_inventory_placeholder"
-             type="string"
-             follows="all"
-             layout="topleft"
-             top="1"
-             bottom="-1"
-             wrap="true"
-             halign="center">
-              Purchases from the marketplace will be delivered here.
-            </text>
-          </panel>
-        </panel>
-      </layout_panel>
-    </layout_stack>
-  </panel>
+	  follows="all"
+	  height="570"
+	  label="Things"
+	  layout="topleft"
+	  min_height="350"
+	  min_width="240"
+	  name="objects panel"
+	  width="358">
+    <panel
+		 follows="all"
+		 layout="topleft"
+		 left="0"
+		 name="sidepanel_inventory_panel"
+		 top="0"
+		 label=""
+		 height="570"
+		 visible="true"
+		 default_tab_group="1"
+		 width="395">
+      <layout_stack
+              follows="left|right|top|bottom"
+              layout="topleft"
+              left="0"
+              top="0"
+							tab_group="1"
+              orientation="vertical"
+              name="inventory_layout_stack"
+              height="565"
+              width="395">
+             <layout_panel
+                 name="main_inventory_layout_panel"
+                 layout="topleft"
+                 auto_resize="true"
+                 user_resize="true"
+                 min_dim="150"
+                 width="395"
+                 follows="bottom|left|right"
+                 height="300">
+                 <panel
+                      class="panel_main_inventory"
+                      filename="panel_main_inventory.xml"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_main_inventory"
+                      top="0"
+                      label=""
+                      height="300"
+                      width="395" />
+             </layout_panel>
+			    <layout_panel
+                 width="355"
+                 layout="topleft"
+                 auto_resize="false"
+                 user_resize="true"
+                 follows="left|right|top"
+                 name="inbox_layout_panel"
+                 visible="true"
+                 min_dim="35"
+                 expanded_min_dim="90"
+                 height="235">
+                 <panel
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="marketplace_inbox"
+                      class="panel_marketplace_inbox"
+                      top="0"
+                      label=""
+                      height="235"
+                      width="330">
+                     <string name="InboxLabelWithArg">Received items ([NUM])</string>
+                     <string name="InboxLabelNoArg">Received items</string>
+                     <button
+                        control_name="InventoryInboxToggleState"
+                        label="Received items"
+												font="SansSerifMedium"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        handle_right_mouse="false"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
+                        left="10" />
+                     <text
+                        type="string"
+                        length="1"
+                        follows="right|top"
+                        layout="topleft"
+                        height="13"
+                        top="10"
+                        right="-20"
+                        name="inbox_fresh_new_count"
+                        font="SansSerifMedium"
+                        halign="right"
+                        top_pad="0"
+                        width="300">
+                        [NUM] new
+                     </text>
+                     <panel
+                        name="inbox_inventory_placeholder_panel"
+                        follows="all"
+                        left="10"
+                        bottom="235"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items to your inventory to use them"
+                        >
+                        <text name="inbox_inventory_placeholder"
+															type="string"
+															follows="all"
+															layout="topleft"
+															top="0"
+															left="0"
+															width="308"
+															height="200"
+															wrap="true"
+															halign="center">
+Purchases from the marketplace will be delivered here.
+												</text>
+                    </panel>
+                 </panel>
+             </layout_panel>
+         </layout_stack>
+	</panel>
 </panel>
-- 
cgit v1.2.3


From e99878083155b81c93b0c8b05f300a4501a2d775 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 00:15:57 +0300
Subject: SL-19686 Don't reshape excessively

---
 indra/newview/llinventorygallery.cpp | 9 ++++++---
 indra/newview/llinventorygallery.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index a7dfbb5938..694881372d 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -379,7 +379,7 @@ void LLInventoryGallery::reArrangeRows(S32 row_diff)
     std::vector<LLInventoryGalleryItem*> buf_items = mItems;
     for (std::vector<LLInventoryGalleryItem*>::const_reverse_iterator it = buf_items.rbegin(); it != buf_items.rend(); ++it)
     {
-        removeFromGalleryLast(*it);
+        removeFromGalleryLast(*it, false);
     }
     for (std::vector<LLInventoryGalleryItem*>::const_reverse_iterator it = mHiddenItems.rbegin(); it != mHiddenItems.rend(); ++it)
     {
@@ -492,7 +492,7 @@ void LLInventoryGallery::addToGallery(LLInventoryGalleryItem* item)
 }
 
 
-void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item)
+void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item, bool needs_reshape)
 {
     if(item->isHidden())
     {
@@ -518,7 +518,10 @@ void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item)
         }
         removeLastRow();
     }
-    reshapeGalleryPanel(row_count);
+    if (needs_reshape)
+    {
+        reshapeGalleryPanel(row_count);
+    }
 }
 
 
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index e314281a07..ce618602df 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -189,7 +189,7 @@ protected:
 
 private:
     void addToGallery(LLInventoryGalleryItem* item);
-    void removeFromGalleryLast(LLInventoryGalleryItem* item);
+    void removeFromGalleryLast(LLInventoryGalleryItem* item, bool needs_reshape = true);
     void removeFromGalleryMiddle(LLInventoryGalleryItem* item);
     LLPanel* addLastRow();
     void removeLastRow();
-- 
cgit v1.2.3


From 3561724b8c2b2e45a65d0adb85b4a082439a7eba Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 00:39:12 +0300
Subject: SL-19686 Fix filtering returning wrong value

---
 indra/newview/llinventorygallery.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 694881372d..53b62c7fb7 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -661,10 +661,11 @@ bool LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
 {
     if(item)
     {
-        item->setHidden(!checkAgainstFilters(item, filter_substring));
-        return false;
+        bool visible = checkAgainstFilters(item, filter_substring);
+        item->setHidden(!visible);
+        return visible;
     }
-    return true;
+    return false;
 }
 
 bool LLInventoryGallery::checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring)
@@ -762,6 +763,7 @@ void LLInventoryGallery::onIdle(void* userdata)
     {
         self->mNeedsArrange = false;
         self->reArrangeRows();
+        self->updateMessageVisibility();
     }
 
     if (self->mItemToSelect.notNull())
-- 
cgit v1.2.3


From d9a8ccc2c061bc034ebb6fb13b0950615d8bf30d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 12:22:56 +0300
Subject: SL-19882 Fix LLInventoryGalleryItem redeclaring mName

To avoid confusion and potential inheritance issues
---
 indra/newview/llinventorygallery.cpp | 16 ++++++++--------
 indra/newview/llinventorygallery.h   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 53b62c7fb7..c584def3eb 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -565,8 +565,8 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     giparams.visible = true;
     giparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
     giparams.rect(LLRect(0,mItemHeight, mItemWidth, 0));
-    giparams.name = name;
     LLInventoryGalleryItem* gitem = LLUICtrlFactory::create<LLInventoryGalleryItem>(giparams);
+    gitem->setItemName(name);
     gitem->setUUID(item_id);
     gitem->setGallery(this);
     gitem->setType(type, inventory_type, flags, is_link);
@@ -889,7 +889,7 @@ void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
         LLInventoryGalleryItem* item = iter->second;
         if (item)
         {
-            item->setName(name);
+            item->setItemName(name);
         }
     }
 }
@@ -2001,7 +2001,7 @@ LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
     : LLPanel(p),
     mSelected(false),
     mDefaultImage(true),
-    mName(""),
+    mItemName(""),
     mWornSuffix(""),
     mPermSuffix(""),
     mUUID(LLUUID()),
@@ -2117,9 +2117,9 @@ void LLInventoryGalleryItem::draw()
     gl_rect_2d(border, border_color.get(), FALSE);
 }
 
-void LLInventoryGalleryItem::setName(std::string name)
+void LLInventoryGalleryItem::setItemName(std::string name)
 {
-    mName = name;
+    mItemName = name;
     updateNameText();
 }
 
@@ -2287,9 +2287,9 @@ LLFontGL* LLInventoryGalleryItem::getTextFont()
 void LLInventoryGalleryItem::updateNameText()
 {
     mNameText->setFont(getTextFont());
-    mNameText->setText(mName + mPermSuffix + mWornSuffix);
-    mNameText->setToolTip(mName + mPermSuffix + mWornSuffix);
-    getChild<LLThumbnailCtrl>("preview_thumbnail")->setToolTip(mName + mPermSuffix + mWornSuffix);
+    mNameText->setText(mItemName + mPermSuffix + mWornSuffix);
+    mNameText->setToolTip(mItemName + mPermSuffix + mWornSuffix);
+    getChild<LLThumbnailCtrl>("preview_thumbnail")->setToolTip(mItemName + mPermSuffix + mWornSuffix);
 }
 
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index ce618602df..cb95f61255 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -288,7 +288,7 @@ public:
 
     LLFontGL* getTextFont();
 
-    void setName(std::string name);
+    void setItemName(std::string name);
     void setSelected(bool value);
     void setWorn(bool value);
     void setUUID(LLUUID id) {mUUID = id;}
@@ -301,7 +301,7 @@ public:
     void setCreatorName(std::string name) {mCreatorName = name;}
     std::string getCreatorName() { return mCreatorName;}
 
-    std::string getItemName() {return mName;}
+    std::string getItemName() {return mItemName;}
     std::string getItemNameSuffix() {return mPermSuffix + mWornSuffix;}
     bool isDefaultImage() {return mDefaultImage;}
     
@@ -335,7 +335,7 @@ private:
 
     EInventorySortGroup mSortGroup;
     LLAssetType::EType mType;
-    std::string mName;
+    std::string mItemName;
     std::string mWornSuffix;
     std::string mPermSuffix;
     LLInventoryGallery* mGallery;
-- 
cgit v1.2.3


From 26f64e4f0a007edc01996cdc0bc69121a16749b9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 13:06:37 +0300
Subject: SL-19873 Clear gallery selection when right-clicking outside of
 selected items

---
 indra/newview/llinventorygallery.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c584def3eb..40c76a4b5f 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -936,13 +936,13 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
 
 BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-    LLUUID old_selection = mSelectedItemID;
-    BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
-    if (!res)
+    if(mItemMap[mSelectedItemID])
     {
-        clearSelection();
-        mItemMap[old_selection]->setFocus(false);
+        mItemMap[mSelectedItemID]->setFocus(false);
+        setFocus(true);
     }
+    clearSelection();
+    BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
 
     if (mSelectedItemID.isNull())
     {
-- 
cgit v1.2.3


From f608eafc3724899a16d01d4b9464a21f8fbc08d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 22:22:59 +0300
Subject: SL-19496 Fix attempts to open trash for thumnail assigment do not
 work.

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 4 ++--
 indra/newview/llinventorybridge.cpp            | 2 ++
 indra/newview/llinventorygallerymenu.cpp       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index c3392889fb..48378cb724 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -295,8 +295,8 @@ void LLFloaterChangeItemThumbnail::refreshFromInventory()
     if (obj)
     {
         const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-        bool in_trash = (obj->getUUID() == trash_id) || gInventory.isObjectDescendentOf(obj->getUUID(), trash_id);
-        if (in_trash)
+        bool in_trash = gInventory.isObjectDescendentOf(obj->getUUID(), trash_id);
+        if (in_trash && obj->getUUID() != trash_id)
         {
             // Close properties when moving to trash
             // Aren't supposed to view properties from trash
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 02a29f2ac9..a2bf9e7cd2 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4218,6 +4218,8 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 		{
 			disabled_items.push_back(std::string("Empty Trash"));
 		}
+
+        items.push_back(std::string("thumbnail"));
 	}
 	else if(isItemInTrash())
 	{
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 68ead64839..e30883d564 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -334,7 +334,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
     if(!is_link)
     {
         items.push_back(std::string("thumbnail"));
-        if (!is_agent_inventory)
+        if (!is_agent_inventory || (is_in_trash && !is_trash))
         {
             disabled_items.push_back(std::string("thumbnail"));
         }
-- 
cgit v1.2.3


From 47c15e9dabf887a83186acf98213316fe5f807c5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 22:51:21 +0300
Subject: SL-19795 Slight gallery scroll improvement

use scroll's rect instead of gallery's rect
---
 indra/newview/llinventorygallery.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 40c76a4b5f..200a9b2a91 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -342,12 +342,15 @@ void LLInventoryGallery::onVisibilityChange(BOOL new_visibility)
 
 bool LLInventoryGallery::updateRowsIfNeeded()
 {
-    if(((getRect().getWidth() - mRowPanelWidth) > mItemWidth) && mRowCount > 1)
+    S32 scroll_content_width = mScrollPanel ? mScrollPanel->getVisibleContentRect().getWidth() : getRect().getWidth();
+    if(((scroll_content_width - mRowPanelWidth) > mItemWidth)
+       && mRowCount > 1)
     {
         reArrangeRows(1);
         return true;
     }
-    else if((mRowPanelWidth > (getRect().getWidth() + mItemHorizontalGap)) && mItemsInRow > GALLERY_ITEMS_PER_ROW_MIN)
+    else if((mRowPanelWidth > (scroll_content_width + mItemHorizontalGap))
+            && mItemsInRow > GALLERY_ITEMS_PER_ROW_MIN)
     {
         reArrangeRows(-1);
         return true;
-- 
cgit v1.2.3


From f1ff6c7ec131d0058333070f52e63365229af4d2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 22:55:55 +0300
Subject: Revert "SL-19404 Navigation bar coordinates slightly off"

This reverts commit 94fd5bcca5723f9779bf1c719e8b2ec6016dc0e8.
Would be present in DRTVWR-582, reverting to not confuse QA
---
 indra/newview/llagentui.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index acb1a37ff5..c19ad2ae6f 100644
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -82,9 +82,9 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
 
 	if (!region || !parcel) return FALSE;
 
-	S32 pos_x = S32(agent_pos_region.mV[VX] + 0.5f);
-	S32 pos_y = S32(agent_pos_region.mV[VY] + 0.5f);
-	S32 pos_z = S32(agent_pos_region.mV[VZ] + 0.5f);
+	S32 pos_x = S32(agent_pos_region.mV[VX]);
+	S32 pos_y = S32(agent_pos_region.mV[VY]);
+	S32 pos_z = S32(agent_pos_region.mV[VZ]);
 
 	// Round the numbers based on the velocity
 	F32 velocity_mag_sq = gAgent.getVelocity().magVecSquared();
-- 
cgit v1.2.3


From 7607047a95a8b1cb89e3007138fbb00986067c2b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 23:42:45 +0300
Subject: SL-19863 FIXED Items are not copied when attempting to paste into
 gallery mode

---
 indra/newview/llinventorygallery.cpp                  |  2 +-
 indra/newview/llinventorypanel.cpp                    | 17 +++++++++++------
 indra/newview/llinventorypanel.h                      |  2 +-
 indra/newview/skins/default/xui/en/menu_inventory.xml |  3 ++-
 4 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 200a9b2a91..f81beefc28 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1315,7 +1315,7 @@ void LLInventoryGallery::paste()
     }
 
     const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
-    if (gInventory.isObjectDescendentOf(mSelectedItemID, marketplacelistings_id))
+    if (!mSelectedItemID.isNull() && gInventory.isObjectDescendentOf(mSelectedItemID, marketplacelistings_id))
     {
         return;
     }
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index f7a24a09c0..a53f2f85cb 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2196,7 +2196,7 @@ LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     getFilter().setEmptyLookupMessage("InventorySingleFolderNoMatches");
     getFilter().setDefaultEmptyLookupMessage("InventorySingleFolderEmpty");
 
-    mCommitCallbackRegistrar.add("Inventory.OpenSelectedFolder", boost::bind(&LLInventorySingleFolderPanel::openInCurrentWindow, this, _2));
+    mCommitCallbackRegistrar.replace("Inventory.DoToSelected", boost::bind(&LLInventorySingleFolderPanel::doToSelected, this, _2));
     mCommitCallbackRegistrar.replace("Inventory.DoCreate", boost::bind(&LLInventorySingleFolderPanel::doCreate, this, _2));
     mCommitCallbackRegistrar.replace("Inventory.Share", boost::bind(&LLInventorySingleFolderPanel::doShare, this));
 }
@@ -2230,11 +2230,6 @@ void LLInventorySingleFolderPanel::initFolderRoot(const LLUUID& start_folder_id)
     mFolderRoot.get()->setSingleFolderMode(true);
 }
 
-void LLInventorySingleFolderPanel::openInCurrentWindow(const LLSD& userdata)
-{
-    changeFolderRoot(LLFolderBridge::sSelf.get()->getUUID());
-}
-
 void LLInventorySingleFolderPanel::changeFolderRoot(const LLUUID& new_id)
 {
     if (mFolderID != new_id)
@@ -2365,6 +2360,16 @@ void LLInventorySingleFolderPanel::doCreate(const LLSD& userdata)
     menu_create_inventory_item(this, dest_id, userdata);
 }
 
+void LLInventorySingleFolderPanel::doToSelected(const LLSD& userdata)
+{
+    if (("open_in_current_window" == userdata.asString()))
+    {
+        changeFolderRoot(LLFolderBridge::sSelf.get()->getUUID());
+        return;
+    }
+    LLInventoryPanel::doToSelected(userdata);
+}
+
 void LLInventorySingleFolderPanel::doShare()
 {
     LLAvatarActions::shareWithAvatars(this);
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 20c9584015..341be0cf86 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -408,7 +408,6 @@ public:
 
     void initFolderRoot(const LLUUID& start_folder_id = LLUUID::null);
 
-    void openInCurrentWindow(const LLSD& userdata);
     void changeFolderRoot(const LLUUID& new_id);
     void onForwardFolder();
     void onBackwardFolder();
@@ -416,6 +415,7 @@ public:
     LLUUID getSingleFolderRoot() { return mFolderID; }
 
     void doCreate(const LLSD& userdata);
+    void doToSelected(const LLSD& userdata);
     void doShare();
 
     bool isBackwardAvailable();
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 8374e63219..e650c10603 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -386,7 +386,8 @@
      layout="topleft"
      name="open_in_current_window">
         <menu_item_call.on_click
-         function="Inventory.OpenSelectedFolder"/>
+         function="Inventory.DoToSelected"
+         parameter="open_in_current_window" />
     </menu_item_call>
     <menu_item_call
      label="Open in new window"
-- 
cgit v1.2.3


From b5b0c174390b4158c69eeff7efd59c4f1615e491 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 17 Jun 2023 01:31:02 +0300
Subject: SL-19886 Fix onidle crash after closing inventory floater

---
 indra/llcommon/llcallbacklist.cpp    |  2 +-
 indra/newview/llinventorygallery.cpp | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llcallbacklist.cpp b/indra/llcommon/llcallbacklist.cpp
index 93d0a035da..9f23ce5317 100644
--- a/indra/llcommon/llcallbacklist.cpp
+++ b/indra/llcommon/llcallbacklist.cpp
@@ -55,7 +55,7 @@ void LLCallbackList::addFunction( callback_t func, void *data)
 
 	// only add one callback per func/data pair
 	//
-	if (containsFunction(func))
+	if (containsFunction(func, data))
 	{
 		return;
 	}
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index f81beefc28..cfaff512ff 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -143,8 +143,8 @@ LLInventoryGallery::~LLInventoryGallery()
     delete mInventoryGalleryMenu;
     delete mRootGalleryMenu;
     delete mFilter;
-    
-    gIdleCallbacks.deleteFunction(onIdle, this);
+
+    gIdleCallbacks.deleteFunction(onIdle, (void*)this);
 
     while (!mUnusedRowPanels.empty())
     {
@@ -184,8 +184,6 @@ LLInventoryGallery::~LLInventoryGallery()
 
 void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
 {
-    gIdleCallbacks.deleteFunction(onIdle, this);
-
     LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
     if(!category || (mFolderID == cat_id))
     {
@@ -195,7 +193,13 @@ void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
     {
         mBackwardFolders.push_back(mFolderID);
     }
+
+    gIdleCallbacks.deleteFunction(onIdle, (void*)this);
+
     mFolderID = cat_id;
+    mItemToSelect.setNull();
+    mItemBuildQuery.clear();
+    mNeedsArrange = false;
     dirtyRootFolder();
 }
 
-- 
cgit v1.2.3


From 30209314ac02cf5ac868b5207b684b9fadb706bb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 19 Jun 2023 19:18:35 +0300
Subject: SL-19686 Fix gallery causing lags

---
 indra/newview/llinventorygallery.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index cfaff512ff..347611dfe2 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -337,9 +337,16 @@ void LLInventoryGallery::draw()
 
 void LLInventoryGallery::onVisibilityChange(BOOL new_visibility)
 {
-    if (new_visibility && mRootDirty)
+    if (new_visibility)
     {
-        updateRootFolder();
+        if (mRootDirty)
+        {
+            updateRootFolder();
+        }
+        else if (mNeedsArrange)
+        {
+            gIdleCallbacks.addFunction(onIdle, (void*)this);
+        }
     }
     LLPanel::onVisibilityChange(new_visibility);
 }
@@ -751,9 +758,10 @@ void LLInventoryGallery::onIdle(void* userdata)
         return;
     }
 
+    bool visible = self->getVisible(); // In visible chain?
     const F64 MAX_TIME_VISIBLE = 0.020f;
     const F64 MAX_TIME_HIDDEN = 0.001f; // take it slow
-    const F64 max_time = self->getVisible() ? MAX_TIME_VISIBLE : MAX_TIME_HIDDEN;
+    const F64 max_time = visible ? MAX_TIME_VISIBLE : MAX_TIME_HIDDEN;
     F64 curent_time = LLTimer::getTotalSeconds();
     const F64 end_time = curent_time + max_time;
 
@@ -766,7 +774,7 @@ void LLInventoryGallery::onIdle(void* userdata)
         curent_time = LLTimer::getTotalSeconds();
     }
 
-    if (self->mNeedsArrange)
+    if (self->mNeedsArrange && visible)
     {
         self->mNeedsArrange = false;
         self->reArrangeRows();
-- 
cgit v1.2.3


From 6d4862dad1a3c073859bfebfef58b85fce27b8be Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 19 Jun 2023 20:44:54 +0300
Subject: SL-19888 Fix flat list loading partially

---
 indra/newview/llinventorypanel.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index a53f2f85cb..4bf447cb95 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1224,6 +1224,7 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
         const S32 starting_item_count = mItemMap.size();
 
         LLFolderViewFolder *parentp = dynamic_cast<LLFolderViewFolder*>(folder_view_item);
+        bool done = true;
 
 		if(categories)
         {
@@ -1261,6 +1262,7 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                     if (mBuildViewsEndTime < curent_time)
                     {
                         mBuildViewsQueue.push_back(id);
+                        done = false;
                         break;
                     }
                 }
@@ -1296,13 +1298,14 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                     if (mBuildViewsEndTime < curent_time)
                     {
                         mBuildViewsQueue.push_back(id);
+                        done = false;
                         break;
                     }
                 }
 			}
 		}
 
-        if (!mBuildChildrenViews)
+        if (!mBuildChildrenViews && done)
         {
             // flat list is done initializing folder
             folder_view_item->setChildrenInited(true);
-- 
cgit v1.2.3


From b721d20ea9999abbc3fdc72a6eb83fc331b962c7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 19 Jun 2023 21:18:49 +0300
Subject: SL-19686 Slight menu optimization

Add and Replace elements aren't displayed for system folders yet take a while to look for worn items through whole inventory.
---
 indra/newview/llinventorybridge.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a2bf9e7cd2..5d793cdac1 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4448,26 +4448,29 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
 			if (type != LLFolderType::FT_OUTFIT)
 			{
 				items.push_back(std::string("Add To Outfit"));
+                if (!LLAppearanceMgr::instance().getCanAddToCOF(mUUID))
+                {
+                    disabled_items.push_back(std::string("Add To Outfit"));
+                }
 			}
 
 			items.push_back(std::string("Replace Outfit"));
+            if (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))
+            {
+                disabled_items.push_back(std::string("Replace Outfit"));
+            }
 		}
 		if (is_agent_inventory)
 		{
 			items.push_back(std::string("Folder Wearables Separator"));
+            // Note: If user tries to unwear "My Inventory", it's going to deactivate everything including gestures
+            // Might be safer to disable this for "My Inventory"
 			items.push_back(std::string("Remove From Outfit"));
-			if (!LLAppearanceMgr::getCanRemoveFromCOF(mUUID))
-			{
-					disabled_items.push_back(std::string("Remove From Outfit"));
-			}
-		}
-		if (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))
-		{
-			disabled_items.push_back(std::string("Replace Outfit"));
-		}
-		if (!LLAppearanceMgr::instance().getCanAddToCOF(mUUID))
-		{
-			disabled_items.push_back(std::string("Add To Outfit"));
+            if (type != LLFolderType::FT_ROOT_INVENTORY // Unless COF is empty, whih shouldn't be, warrantied to have worn items
+                && !LLAppearanceMgr::getCanRemoveFromCOF(mUUID)) // expensive from root!
+            {
+                disabled_items.push_back(std::string("Remove From Outfit"));
+            }
 		}
 		items.push_back(std::string("Outfit Separator"));
 
-- 
cgit v1.2.3


From 93ab02b672efc5388230629bafb5519e725a3683 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 19 Jun 2023 23:03:06 +0300
Subject: SL-19885 add sorting by date for Gallery view

---
 indra/newview/llinventorygallery.cpp   | 48 +++++++++++++++++++++++++++++-----
 indra/newview/llinventorygallery.h     |  9 ++++++-
 indra/newview/llpanelmaininventory.cpp | 15 ++++++++++-
 3 files changed, 64 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 347611dfe2..d76f0a45b2 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -87,7 +87,8 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mIsInitialized(false),
       mRootDirty(false),
       mNeedsArrange(false),
-      mSearchType(LLInventoryFilter::SEARCHTYPE_NAME)
+      mSearchType(LLInventoryFilter::SEARCHTYPE_NAME),
+      mSortOrder(LLInventoryFilter::SO_DATE)
 {
     updateGalleryWidth();
     mFilter = new LLInventoryFilter();
@@ -369,19 +370,35 @@ bool LLInventoryGallery::updateRowsIfNeeded()
     return false;
 }
 
-bool compareGalleryItem(LLInventoryGalleryItem* item1, LLInventoryGalleryItem* item2)
+bool compareGalleryItem(LLInventoryGalleryItem* item1, LLInventoryGalleryItem* item2, bool sort_by_date, bool sort_folders_by_name)
 {
     if (item1->getSortGroup() != item2->getSortGroup())
     {
         return (item1->getSortGroup() < item2->getSortGroup());
     }
-    if(((item1->isDefaultImage() && item2->isDefaultImage()) || (!item1->isDefaultImage() && !item2->isDefaultImage())))
+
+    if(sort_folders_by_name && (item1->getSortGroup() != LLInventoryGalleryItem::SG_ITEM))
     {
         std::string name1 = item1->getItemName();
         std::string name2 = item2->getItemName();
 
         return (LLStringUtil::compareDict(name1, name2) < 0);
     }
+
+    if(((item1->isDefaultImage() && item2->isDefaultImage()) || (!item1->isDefaultImage() && !item2->isDefaultImage())))
+    {
+        if(sort_by_date)
+        {
+            return item1->getCreationDate() > item2->getCreationDate();
+        }
+        else
+        {
+            std::string name1 = item1->getItemName();
+            std::string name2 = item2->getItemName();
+
+            return (LLStringUtil::compareDict(name1, name2) < 0);
+        }
+    }
     else
     {
         return item2->isDefaultImage();
@@ -403,7 +420,13 @@ void LLInventoryGallery::reArrangeRows(S32 row_diff)
     
     mItemsInRow+= row_diff;
     updateGalleryWidth();
-    std::sort(buf_items.begin(), buf_items.end(), compareGalleryItem);
+
+    bool sort_by_date = (mSortOrder & LLInventoryFilter::SO_DATE);
+    bool sort_folders_by_name = (mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_NAME);
+    std::sort(buf_items.begin(), buf_items.end(), [sort_by_date, sort_folders_by_name](LLInventoryGalleryItem* item1, LLInventoryGalleryItem* item2)
+    {
+        return compareGalleryItem(item1, item2, sort_by_date, sort_folders_by_name);
+    });
     
     for (std::vector<LLInventoryGalleryItem*>::const_iterator it = buf_items.begin(); it != buf_items.end(); ++it)
     {
@@ -573,7 +596,7 @@ void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
     mItemPanels.pop_back();
 }
 
-LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link, bool is_worn)
+LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn)
 {
     LLInventoryGalleryItem::Params giparams;
     giparams.visible = true;
@@ -589,6 +612,7 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     gitem->setCreatorName(get_searchable_creator_name(&gInventory, item_id));
     gitem->setDescription(get_searchable_description(&gInventory, item_id));
     gitem->setAssetIDStr(get_searchable_UUID(&gInventory, item_id));
+    gitem->setCreationDate(creation_date);
     return gitem;
 }
 
@@ -857,7 +881,8 @@ bool LLInventoryGallery::updateAddedItem(LLUUID item_id)
     }
 
     bool res = false;
-    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getIsLinkType(), is_worn);
+
+    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getCreationDate(), obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id, false));
@@ -2006,6 +2031,17 @@ void LLInventoryGallery::handleModifiedFilter()
     }
 }
 
+void LLInventoryGallery::setSortOrder(U32 order, bool update)
+{
+    bool dirty = (mSortOrder != order);
+
+    mSortOrder = order;
+    if(update && dirty)
+    {
+        mNeedsArrange = true;
+        gIdleCallbacks.addFunction(onIdle, (void*)this);
+    }
+}
 //-----------------------------
 // LLInventoryGalleryItem
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index cb95f61255..f686d8aa2b 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -157,6 +157,9 @@ public:
     bool canDeleteSelection();
     void pasteAsLink();
 
+    void setSortOrder(U32 order, bool update = false);
+    U32 getSortOrder() { return mSortOrder; };
+
     void claimEditHandler();
     static bool isItemCopyable(const LLUUID & item_id);
 
@@ -202,7 +205,7 @@ private:
     bool updateRowsIfNeeded();
     void updateGalleryWidth();
 
-    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, bool is_link, bool is_worn);
+    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn);
 
     void buildGalleryPanel(int row_count);
     void reshapeGalleryPanel(int row_count);
@@ -242,6 +245,7 @@ private:
     LLInventoryGalleryContextMenu* mRootGalleryMenu;
     std::string mFilterSubString;
     LLInventoryFilter* mFilter;
+    U32 mSortOrder;
 
     typedef std::map<LLUUID, LLInventoryGalleryItem*> gallery_item_map_t;
     gallery_item_map_t mItemMap;
@@ -300,6 +304,8 @@ public:
     std::string getDescription() { return mDesc;}
     void setCreatorName(std::string name) {mCreatorName = name;}
     std::string getCreatorName() { return mCreatorName;}
+    void setCreationDate(time_t date) {mCreationDate = date;}
+    time_t getCreationDate() { return mCreationDate;}
 
     std::string getItemName() {return mItemName;}
     std::string getItemNameSuffix() {return mPermSuffix + mWornSuffix;}
@@ -332,6 +338,7 @@ private:
     std::string mAssetIDStr;
     std::string mDesc;
     std::string mCreatorName;
+    time_t mCreationDate;
 
     EInventorySortGroup mSortGroup;
     LLAssetType::EType mType;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 107a00f35a..30364e06eb 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -265,6 +265,7 @@ BOOL LLPanelMainInventory::postBuild()
     mListViewRootUpdatedConnection = mCombinationInventoryPanel->setRootChangedCallback(boost::bind(&LLPanelMainInventory::onCombinationRootChanged, this, false));
 
     mCombinationGalleryPanel = getChild<LLInventoryGallery>("comb_gallery_view_inv");
+    mCombinationGalleryPanel->setSortOrder(mCombinationInventoryPanel->getSortOrder());
     LLInventoryFilter& comb_gallery_filter = mCombinationGalleryPanel->getFilter();
     comb_gallery_filter.setFilterThumbnails(LLInventoryFilter::FILTER_ONLY_THUMBNAILS);
     comb_gallery_filter.markDefault();
@@ -631,6 +632,10 @@ void LLPanelMainInventory::setSortBy(const LLSD& userdata)
 			sort_order_mask |= LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
 		}
 	}
+    if(mSingleFolderMode && !isListViewMode())
+    {
+        mCombinationGalleryPanel->setSortOrder(sort_order_mask, true);
+    }
 
 	getActivePanel()->setSortOrder(sort_order_mask);
     if (isRecentItemsPanelSelected())
@@ -2150,7 +2155,7 @@ bool LLPanelMainInventory::isActionVisible(const LLSD& userdata)
 
 BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 {
-	U32 sort_order_mask = getActivePanel()->getSortOrder();
+	U32 sort_order_mask = (mSingleFolderMode && isGalleryViewMode()) ? mCombinationGalleryPanel->getSortOrder() :  getActivePanel()->getSortOrder();
 	const std::string command_name = userdata.asString();
 	if (command_name == "sort_by_name")
 	{
@@ -2500,20 +2505,24 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
     {
         std::list<LLUUID> forward_history;
         std::list<LLUUID> backward_history;
+        U32 sort_order;
         switch(mViewMode)
         {
             case MODE_LIST:
                 forward_history = mCombinationInventoryPanel->getNavForwardList();
                 backward_history = mCombinationInventoryPanel->getNavBackwardList();
+                sort_order = mCombinationInventoryPanel->getSortOrder();
                 break;
             case MODE_GALLERY:
                 forward_history = mCombinationGalleryPanel->getNavForwardList();
                 backward_history = mCombinationGalleryPanel->getNavBackwardList();
+                sort_order = mCombinationGalleryPanel->getSortOrder();
                 break;
             case MODE_COMBINATION:
                 forward_history = mCombinationInventoryPanel->getNavForwardList();
                 backward_history = mCombinationInventoryPanel->getNavBackwardList();
                 mCombinationInventoryPanel->getRootFolder()->setForceArrange(false);
+                sort_order = mCombinationInventoryPanel->getSortOrder();
                 break;
         }
             
@@ -2527,12 +2536,14 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
             mCombinationInventoryPanel->changeFolderRoot(cur_root);
             mCombinationInventoryPanel->setNavForwardList(forward_history);
             mCombinationInventoryPanel->setNavBackwardList(backward_history);
+            mCombinationInventoryPanel->setSortOrder(sort_order);
         }
         if(isGalleryViewMode())
         {
             mCombinationGalleryPanel->setRootFolder(cur_root);
             mCombinationGalleryPanel->setNavForwardList(forward_history);
             mCombinationGalleryPanel->setNavBackwardList(backward_history);
+            mCombinationGalleryPanel->setSortOrder(sort_order, true);
         }
         if(isCombinationViewMode())
         {
@@ -2542,6 +2553,8 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
             mCombinationInventoryPanel->setNavBackwardList(backward_history);
             mCombinationGalleryPanel->setNavForwardList(forward_history);
             mCombinationGalleryPanel->setNavBackwardList(backward_history);
+            mCombinationInventoryPanel->setSortOrder(sort_order);
+            mCombinationGalleryPanel->setSortOrder(sort_order, true);
         }
 
         updateNavButtons();
-- 
cgit v1.2.3


From 2a035c080dec2aa16b9628aac7b120e4f15135c2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 16 Jun 2023 08:42:23 +0200
Subject: SL-18977 Borders of inventory view in inventory floater seem to be
 cut a bit

---
 indra/llui/llbutton.cpp                            |  3 +-
 indra/llui/llscrollcontainer.cpp                   | 12 ++---
 indra/llui/lltabcontainer.cpp                      |  8 +--
 indra/newview/llinventorypanel.cpp                 |  1 -
 indra/newview/llpanelmaininventory.cpp             |  2 +-
 .../default/xui/en/panel_inventory_gallery.xml     | 17 +++----
 .../skins/default/xui/en/panel_main_inventory.xml  | 57 +++++++++-------------
 .../skins/default/xui/en/sidepanel_inventory.xml   | 55 +++++++++------------
 8 files changed, 64 insertions(+), 91 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 8028f397f3..a38b3323be 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -203,7 +203,8 @@ LLButton::LLButton(const LLButton::Params& p)
 	}
 
 	// Hack to make sure there is space for at least one character
-	if (getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" ")))
+	if (getRect().mRight >= 0 && getRect().getWidth() > 0 &&
+		getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" ")))
 	{
 		// Use old defaults
 		mLeftHPad = llbutton_orig_h_pad;
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index c4cb739f0a..ad32f7186c 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -105,8 +105,8 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
 	LLView::addChild( mBorder );
 
-	mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 );
-	mInnerRect.stretch( -getBorderWidth()  );
+	mInnerRect = getLocalRect();
+	mInnerRect.stretch( -getBorderWidth() );
 
 	LLRect vertical_scroll_rect = mInnerRect;
 	vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - scrollbar_size;
@@ -124,9 +124,9 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	mScrollbar[VERTICAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[VERTICAL] );
 	
-	LLRect horizontal_scroll_rect = mInnerRect;
-	horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + scrollbar_size;
-	horizontal_scroll_rect.mLeft += 3;
+	LLRect horizontal_scroll_rect;
+	horizontal_scroll_rect.mTop = scrollbar_size;
+	horizontal_scroll_rect.mRight = mInnerRect.getWidth();
 	sbparams.name("scrollable horizontal");
 	sbparams.rect(horizontal_scroll_rect);
 	sbparams.orientation(LLScrollbar::HORIZONTAL);
@@ -135,7 +135,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	sbparams.page_size(mInnerRect.getWidth());
 	sbparams.step_size(VERTICAL_MULTIPLE);
 	sbparams.visible(false);
-	sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT);
+	sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
 	sbparams.change_callback(p.scroll_callback);
 	mScrollbar[HORIZONTAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[HORIZONTAL] );
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 8c841540a5..f15e9771c0 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1002,7 +1002,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	}
 	else
 	{
-		//Scip tab button space if they are invisible(EXT - 576)
+		// Skip tab button space if tabs are invisible (EXT-576)
 		tab_panel_top = getRect().getHeight();
 		tab_panel_bottom = LLPANEL_BORDER_WIDTH;
 	}
@@ -1017,9 +1017,9 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	}
 	else
 	{
-		tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH, 
+		tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH * 3,
 								tab_panel_top,
-								getRect().getWidth()-LLPANEL_BORDER_WIDTH,
+								getRect().getWidth() - LLPANEL_BORDER_WIDTH * 2,
 								tab_panel_bottom );
 	}
 	child->setFollowsAll();
@@ -1106,7 +1106,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 		  p.follows.flags = p.follows.flags() | FOLLOWS_TOP;
 		}
 		else
-		  { 
+		{ 
 		    p.name("htab_"+std::string(child->getName()));
 		    p.visible(false);
 		    p.image_unselected(tab_img);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 4bf447cb95..95f15c9c55 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -298,7 +298,6 @@ void LLInventoryPanel::initFolderRoot()
     // Scroller
     LLRect scroller_view_rect = getRect();
     scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
-	scroller_view_rect.mTop -= 3;
     LLScrollContainer::Params scroller_params(mParams.scroll());
     scroller_params.rect(scroller_view_rect);
     mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 30364e06eb..5ae61f0c36 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2505,7 +2505,7 @@ void LLPanelMainInventory::setViewMode(EViewModeType mode)
     {
         std::list<LLUUID> forward_history;
         std::list<LLUUID> backward_history;
-        U32 sort_order;
+        U32 sort_order = 0;
         switch(mViewMode)
         {
             case MODE_LIST:
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index 2b80e30696..22cc926e75 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -6,19 +6,15 @@
    follows="all"
    height="390"
    name="Inventory Gallery"
-   layout="topleft"
-   left="0"
-   top="0"
-   width="404">
+   layout="topleft">
   <text
     type="string"
     clip_partial="false"
-    follows="left|top"
+    follows="all"
     layout="topleft"
-    left="13"
     name="empty_txt"
-    top="0"
-    height="32"
+    height="390"
+    halign="center"
     valign="center"
     parse_urls="true"
     wrap="true">
@@ -28,10 +24,9 @@
    follows="all"
    height="390"
    layout="topleft"
-   left="4"
+   left="0"
    top="0"
    name="gallery_scroll_panel"
-   opaque="false"
-   top_pad="0">
+   opaque="false">
   </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 64b885c222..b735dcf528 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -6,8 +6,7 @@
  layout="topleft"
  min_height="300"
  min_width="240"
- name="main inventory panel"
- width="355">
+ name="main inventory panel">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -27,18 +26,18 @@
   <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
   <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
-		     type="string"
-		     length="1"
-		     follows="left|top|right"
-		     height="13"
-		     layout="topleft"
-    		 left="12"
-		     name="ItemcountText"
-		     font="SansSerifMedium"
-		     text_color="InventoryItemLinkColor"
-		     use_ellipses="true"
-		     top_pad="0"
-		     width="300">
+     type="string"
+     length="1"
+     follows="left|top|right"
+     height="13"
+     layout="topleft"
+  	 left="12"
+  	 right="-12"
+     name="ItemcountText"
+     font="SansSerifMedium"
+     text_color="InventoryItemLinkColor"
+     use_ellipses="true"
+     top_pad="0">
     Items:
   </text>
   <layout_stack
@@ -47,6 +46,7 @@
    animate="false"
    top_pad="10"
    left="2"
+   right="-4"
    orientation="horizontal">
     <layout_panel
      border="false"
@@ -100,7 +100,7 @@
       bevel_style="in"
       user_resize="false"
       height="25"
-      width="375"
+      width="381"
       visible="true">
       <combo_box
        height="23"
@@ -203,10 +203,10 @@
      halign="center"
      height="372"
      layout="topleft"
-     left="7"
+     left="3"
+     right="-3"
      name="default_inventory_panel"
-     top_pad="10"
-     width="312">
+     top_pad="5">
       <tab_container
        follows="all"
        halign="center"
@@ -217,8 +217,7 @@
        tab_height="30"
        tab_position="top"
        tab_min_width="100"
-       top="0"
-       width="312">
+       top="0">
         <inventory_panel
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
@@ -226,17 +225,14 @@
          border="false"
          bevel_style="none"
          follows="all"
-         height="338"
          label="MY INVENTORY"
          help_topic="my_inventory_tab"
          layout="topleft"
-         left="0"
          name="All Items"
          sort_order_setting="InventorySortOrder"
          show_item_link_overlays="true"
          preinitialize_views="false"
-         top="16"
-         width="288">
+         scroll.reserve_scroll_corner="false">
             <folder double_click_override="true"/>
         </inventory_panel>
         <recent_inventory_panel
@@ -246,15 +242,13 @@
          border="false"
          bevel_style="none"
          follows="all"
-         height="338"
          label="RECENT"
          help_topic="recent_inventory_tab"
          layout="topleft"
-         left_delta="0"
          name="Recent Items"
          show_item_link_overlays="true"
          preinitialize_views="false"
-         width="290">
+         scroll.reserve_scroll_corner="false">
             <folder double_click_override="true"/>
         </recent_inventory_panel>
         <inventory_panel
@@ -263,7 +257,6 @@
          show_empty_message="false"
          follows="all"
          layout="topleft"
-         width="290"
          bg_opaque_color="DkGray2"
          bg_alpha_color="DkGray2"
          background_visible="true"
@@ -283,13 +276,11 @@
      left="7"
      name="combination_view_inventory"
      top_delta="0"
-     visible="false"
-     width="312">
+     visible="false">
      <layout_stack
       follows="all"
       layout="topleft"
       height="372"
-      width="312"
       animate="false"
       drag_handle_gap="13"
       drag_handle_thickness="6"
@@ -306,7 +297,6 @@
         user_resize="true"
         auto_resize="true"
         height="246"
-        width="312"
         min_width="150"
         name="comb_gallery_layout">
         <panel
@@ -315,7 +305,6 @@
          left="0"
          top="1"
          height="246"
-         width="312"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
@@ -328,7 +317,6 @@
         user_resize="true"
         auto_resize="true"
         height="126"
-        width="312"
         min_height="100"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
@@ -337,7 +325,6 @@
          left="0"
          top="1"
          height="126"
-         width="312"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index dfd3e3bf9d..76d0ffcb8e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -6,8 +6,7 @@
 	  layout="topleft"
 	  min_height="350"
 	  min_width="240"
-	  name="objects panel"
-	  width="358">
+	  name="objects panel">
     <panel
 		 follows="all"
 		 layout="topleft"
@@ -17,25 +16,22 @@
 		 label=""
 		 height="570"
 		 visible="true"
-		 default_tab_group="1"
-		 width="395">
+		 default_tab_group="1">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
               left="0"
               top="0"
-							tab_group="1"
+              tab_group="1"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="565"
-              width="395">
+              height="560">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="395"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -47,11 +43,9 @@
                       name="panel_main_inventory"
                       top="0"
                       label=""
-                      height="300"
-                      width="395" />
+                      height="300" />
              </layout_panel>
 			    <layout_panel
-                 width="355"
                  layout="topleft"
                  auto_resize="false"
                  user_resize="true"
@@ -69,17 +63,15 @@
                       class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="235"
-                      width="330">
+                      height="235">
                      <string name="InboxLabelWithArg">Received items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received items</string>
                      <button
                         control_name="InventoryInboxToggleState"
                         label="Received items"
-												font="SansSerifMedium"
+                        font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
-                        width="308"
                         image_unselected="MarketplaceBtn_Off"
                         image_selected="MarketplaceBtn_Selected"
                         halign="left"
@@ -89,7 +81,8 @@
                         tab_stop="false"
                         pad_left="35"
                         top="0"
-                        left="10" />
+                        left="5"
+                        right="-5" />
                      <text
                         type="string"
                         length="1"
@@ -101,34 +94,32 @@
                         name="inbox_fresh_new_count"
                         font="SansSerifMedium"
                         halign="right"
-                        top_pad="0"
-                        width="300">
+                        top_pad="0">
                         [NUM] new
                      </text>
                      <panel
                         name="inbox_inventory_placeholder_panel"
                         follows="all"
-                        left="10"
-                        bottom="235"
-                        width="308"
+                        left="5"
+                        right="-5"
                         top="35"
+                        height="200"
                         bg_opaque_color="InventoryBackgroundColor"
                         background_visible="true"
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to use them"
                         >
                         <text name="inbox_inventory_placeholder"
-															type="string"
-															follows="all"
-															layout="topleft"
-															top="0"
-															left="0"
-															width="308"
-															height="200"
-															wrap="true"
-															halign="center">
-Purchases from the marketplace will be delivered here.
-												</text>
+                            type="string"
+                            follows="all"
+                            layout="topleft"
+                            top="0"
+                            height="200"
+                            wrap="true"
+                            halign="center"
+                            valign="center">
+                          Purchases from the marketplace will be delivered here.
+                        </text>
                     </panel>
                  </panel>
              </layout_panel>
-- 
cgit v1.2.3


From 6c0891473ff1d5f740e3d3624cec2f5c17da0ad6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 20 Jun 2023 17:38:23 +0300
Subject: SL-19892 add missing menu items for Landmarks in Gallery view

---
 indra/newview/llinventorygallerymenu.cpp | 59 ++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index e30883d564..541fed8172 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -33,9 +33,12 @@
 #include "llavataractions.h"
 #include "llclipboard.h"
 #include "llfloaterreg.h"
+#include "llfloatersidepanelcontainer.h"
+#include "llfloaterworldmap.h"
 #include "llinventorybridge.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
+#include "lllandmarkactions.h"
 #include "llmarketplacefunctions.h"
 #include "llmenugl.h"
 #include "llnotificationsutil.h"
@@ -217,6 +220,55 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     {
         LLFloaterReg::showInstance("linkreplace", LLSD(selected_id));
     }
+    else if ("copy_slurl" == action)
+    {
+        boost::function<void(LLLandmark*)> copy_slurl_cb = [](LLLandmark* landmark)
+        {
+            LLVector3d global_pos;
+            landmark->getGlobalPos(global_pos);
+            boost::function<void(std::string& slurl)> copy_slurl_to_clipboard_cb = [](const std::string& slurl)
+            {
+               gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(slurl));
+               LLSD args;
+               args["SLURL"] = slurl;
+               LLNotificationsUtil::add("CopySLURL", args);
+            };
+            LLLandmarkActions::getSLURLfromPosGlobal(global_pos, copy_slurl_to_clipboard_cb, true);
+        };
+        LLLandmark* landmark = LLLandmarkActions::getLandmark(selected_id, copy_slurl_cb);
+        if (landmark)
+        {
+            copy_slurl_cb(landmark);
+        }
+    }
+    else if ("about" == action)
+    {
+        LLSD key;
+        key["type"] = "landmark";
+        key["id"] = selected_id;
+        LLFloaterSidePanelContainer::showPanel("places", key);
+    }
+    else if ("show_on_map" == action)
+    {
+        boost::function<void(LLLandmark*)> show_on_map_cb = [](LLLandmark* landmark)
+        {
+            LLVector3d landmark_global_pos;
+            if (landmark->getGlobalPos(landmark_global_pos))
+            {
+                LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+                if (!landmark_global_pos.isExactlyZero() && worldmap_instance)
+                {
+                    worldmap_instance->trackLocation(landmark_global_pos);
+                    LLFloaterReg::showInstance("world_map", "center");
+                }
+            }
+        };
+        LLLandmark* landmark = LLLandmarkActions::getLandmark(selected_id, show_on_map_cb);
+        if(landmark)
+        {
+            show_on_map_cb(landmark);
+        }
+    }
 }
 
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
@@ -357,6 +409,13 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
         {
             items.push_back(std::string("Replace Links"));
         }
+        if (obj->getType() == LLAssetType::AT_LANDMARK)
+        {
+            items.push_back(std::string("Landmark Separator"));
+            items.push_back(std::string("url_copy"));
+            items.push_back(std::string("About Landmark"));
+            items.push_back(std::string("show_on_map"));
+        }
     }
 
     if(is_trash)
-- 
cgit v1.2.3


From 5c420babdcceafbe8ecfd786f37ece5d0581714d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 20 Jun 2023 20:44:44 +0300
Subject: SL-19860 Fixed messages from muted objects being shown upon login

---
 indra/newview/llimprocessing.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 3536b83989..948793681d 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1631,14 +1631,19 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
             from_group = message_data["from_group"].asString() == "Y";
         }
 
-
+        EInstantMessage dialog = static_cast<EInstantMessage>(message_data["dialog"].asInteger());
+        LLUUID session_id = message_data["transaction-id"].asUUID();
+        if (session_id.isNull() && dialog == IM_FROM_TASK)
+        {
+            session_id = message_data["asset_id"].asUUID();
+        }
         LLIMProcessing::processNewMessage(
             message_data["from_agent_id"].asUUID(),
             from_group,
             message_data["to_agent_id"].asUUID(),
             message_data.has("offline") ? static_cast<U8>(message_data["offline"].asInteger()) : IM_OFFLINE,
-            static_cast<EInstantMessage>(message_data["dialog"].asInteger()),
-            message_data["transaction-id"].asUUID(),
+            dialog,
+            session_id,
             static_cast<U32>(message_data["timestamp"].asInteger()),
             message_data["from_agent_name"].asString(),
             message_data["message"].asString(),
-- 
cgit v1.2.3


From 6f8b812ecd73bf25d44445e1b791f9e1b01f429f Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 21 Jun 2023 15:01:59 +0200
Subject: SL-19692 Z Offset is applied twice in Mouselook

---
 indra/newview/llagentcamera.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 2cf86cb001..d2fe570069 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1764,13 +1764,24 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 			LL_WARNS() << "Null avatar drawable!" << LL_ENDL;
 			return LLVector3d::zero;
 		}
+
 		head_offset.clearVec();
+		F32 fixup;
+		if (gAgentAvatarp->hasPelvisFixup(fixup))
+		{
+			head_offset[VZ] -= fixup;
+		}
+		if (gAgentAvatarp->isSitting())
+		{
+			head_offset.mdV[VZ] += 0.1;
+		}
+
 		if (gAgentAvatarp->isSitting() && gAgentAvatarp->getParent())
 		{
 			gAgentAvatarp->updateHeadOffset();
-			head_offset.mdV[VX] = gAgentAvatarp->mHeadOffset.mV[VX];
-			head_offset.mdV[VY] = gAgentAvatarp->mHeadOffset.mV[VY];
-			head_offset.mdV[VZ] = gAgentAvatarp->mHeadOffset.mV[VZ] + 0.1f;
+			head_offset.mdV[VX] += gAgentAvatarp->mHeadOffset.mV[VX];
+			head_offset.mdV[VY] += gAgentAvatarp->mHeadOffset.mV[VY];
+			head_offset.mdV[VZ] += gAgentAvatarp->mHeadOffset.mV[VZ];
 			const LLMatrix4& mat = ((LLViewerObject*) gAgentAvatarp->getParent())->getRenderMatrix();
 			camera_position_global = gAgent.getPosGlobalFromAgent
 								((gAgentAvatarp->getPosition()+
@@ -1778,11 +1789,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 		}
 		else
 		{
-			head_offset.mdV[VZ] = gAgentAvatarp->mHeadOffset.mV[VZ];
-			if (gAgentAvatarp->isSitting())
-			{
-				head_offset.mdV[VZ] += 0.1;
-			}
+			head_offset.mdV[VZ] += gAgentAvatarp->mHeadOffset.mV[VZ];
 			camera_position_global = gAgent.getPosGlobalFromAgent(gAgentAvatarp->getRenderPosition());//frame_center_global;
 			head_offset = head_offset * gAgentAvatarp->getRenderRotation();
 			camera_position_global = camera_position_global + head_offset;
-- 
cgit v1.2.3


From 7e0dceca68e4b9d9d94b9e530954cba9366dc97e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 21 Jun 2023 18:38:10 +0300
Subject: SL-19898 FIXED Contents purchased from items do not show in Recent
 Items until selecting folder

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 0eb07523ae..26288e6b0a 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -357,6 +357,8 @@ void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id,
 {
     if (mFetchFolderQueue.empty() || mFetchFolderQueue.front().mUUID != cat_id)
     {
+        mBackgroundFetchActive = true;
+
         // Specific folder requests go to front of queue.
         mFetchFolderQueue.push_front(FetchQueueInfo(cat_id, forced ? FT_FORCED : FT_DEFAULT));
         gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
-- 
cgit v1.2.3


From c24849f9da07f72a1dab83ccc69ec61c3448d027 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 23 Jun 2023 12:48:57 +0300
Subject: SL-19912 allow drag-n-drop items from Object's content to the Gallery

---
 indra/newview/llinventorybridge.cpp  | 13 -------------
 indra/newview/llinventorybridge.h    | 15 ++++++++++++++-
 indra/newview/llinventorygallery.cpp | 12 +++++-------
 3 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5d793cdac1..f582207614 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -89,24 +89,11 @@
 
 void copy_slurl_to_clipboard_callback_inv(const std::string& slurl);
 
-typedef std::pair<LLUUID, LLUUID> two_uuids_t;
-typedef std::list<two_uuids_t> two_uuids_list_t;
-
 const F32 SOUND_GAIN = 1.0f;
 
-struct LLMoveInv
-{
-	LLUUID mObjectID;
-	LLUUID mCategoryID;
-	two_uuids_list_t mMoveList;
-	void (*mCallback)(S32, void*);
-	void* mUserData;
-};
-
 using namespace LLOldEvents;
 
 // Function declarations
-bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr<LLMoveInv>);
 bool confirm_attachment_rez(const LLSD& notification, const LLSD& response);
 void teleport_via_landmark(const LLUUID& asset_id);
 static bool check_category(LLInventoryModel* model,
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 30a9bbe372..1990545381 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -48,7 +48,8 @@ class LLViewerJointAttachment;
 class LLFolderView;
 
 typedef std::vector<std::string> menuentry_vec_t;
-
+typedef std::pair<LLUUID, LLUUID> two_uuids_t;
+typedef std::list<two_uuids_t> two_uuids_list_t;
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLInvFVBridge
 //
@@ -772,4 +773,16 @@ public:
     bool canWearSelected(const uuid_vec_t& item_ids) const;
 };
 
+struct LLMoveInv
+{
+    LLUUID mObjectID;
+    LLUUID mCategoryID;
+    two_uuids_list_t mMoveList;
+    void (*mCallback)(S32, void*);
+    void* mUserData;
+};
+
+void warn_move_inventory(LLViewerObject* object, boost::shared_ptr<LLMoveInv> move_inv);
+bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr<LLMoveInv>);
+
 #endif // LL_LLINVENTORYBRIDGE_H
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index d76f0a45b2..0cff30f1aa 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2714,6 +2714,7 @@ BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop,
         // coming from a task. Need to figure out if the person can
         // move/copy this item.
         LLPermissions perm(inv_item->getPermissions());
+        bool is_move = false;
         if ((perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID())
             && perm.allowTransferTo(gAgent.getID())))
             // || gAgent.isGodlike())
@@ -2725,6 +2726,7 @@ BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop,
             // If the object cannot be copied, but the object the
             // inventory is owned by the agent, then the item can be
             // moved from the task to agent inventory.
+            is_move = true;
             accept = TRUE;
         }
 
@@ -2749,9 +2751,7 @@ BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop,
 
         if (accept && drop)
         {
-            //todo: dnd from SOURCE_WORLD
-
-            /*boost::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
+            boost::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
             move_inv->mObjectID = inv_item->getParentUUID();
             std::pair<LLUUID, LLUUID> item_pair(folder_id, inv_item->getUUID());
             move_inv->mMoveList.push_back(item_pair);
@@ -2769,7 +2769,7 @@ BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop,
                 LLNotification::Params params("MoveInventoryFromObject");
                 params.functor.function(boost::bind(move_task_inventory_callback, _1, _2, move_inv));
                 LLNotifications::instance().forceResponse(params, 0);
-            }*/
+            }
         }
     }
     else if(LLToolDragAndDrop::SOURCE_NOTECARD == source)
@@ -3185,9 +3185,7 @@ BOOL dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
         }
         else
         {
-            //todo: dnd from SOURCE_WORLD
-            accept = FALSE;
-            //accept = move_inv_category_world_to_agent(cat_id, mUUID, drop, NULL, NULL, filter);
+            accept = move_inv_category_world_to_agent(cat_id, dest_id, drop);
         }
     }
     else if (LLToolDragAndDrop::SOURCE_LIBRARY == source)
-- 
cgit v1.2.3


From f137e04c38ece6a26709378f4adbe15d54f023a1 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 23 Jun 2023 02:09:35 +0200
Subject: SL-19805 Second Life Viewer last update made invisible parts visible

---
 indra/newview/llvovolume.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 7a73ee1339..efcb049c3f 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5864,9 +5864,10 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 								add_face(sAlphaFaces, alpha_count, facep);
 							}
 							else if (LLDrawPoolAlpha::sShowDebugAlpha ||
-								(gPipeline.sRenderHighlight &&
-								(LLPipeline::getRenderScriptedBeacons() || LLPipeline::getRenderScriptedTouchBeacons()) &&
-								drawablep->getVObj() && drawablep->getVObj()->flagScripted()))
+								(gPipeline.sRenderHighlight && !drawablep->getParent() &&
+								drawablep->getVObj() && drawablep->getVObj()->flagScripted() &&
+								(LLPipeline::getRenderScriptedBeacons() ||
+								LLPipeline::getRenderScriptedTouchBeacons() && drawablep->getVObj()->flagHandleTouch())))
 							{ //draw the transparent face for debugging purposes using a custom texture
 								add_face(sAlphaFaces, alpha_count, facep);
 							}
-- 
cgit v1.2.3


From f30ae5c7812f5449a327a470fd4acaed7546d853 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 23 Jun 2023 21:59:55 +0300
Subject: SL-19914 Inventory gallery Tab support

---
 indra/newview/llinventorygallery.cpp               | 80 +++++++++++++++++++++-
 indra/newview/llinventorygallery.h                 |  7 ++
 .../default/xui/en/panel_inventory_gallery.xml     |  1 +
 3 files changed, 87 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 0cff30f1aa..248f3ed649 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -63,6 +63,25 @@ BOOL dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat, BOOL d
 BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg, BOOL user_confirm);
 void dropToMyOutfits(LLInventoryCategory* inv_cat);
 
+class LLGalleryPanel: public LLPanel
+{
+public:
+
+    BOOL canFocusChildren() const override
+    {
+        // Tell Tab to not focus children
+        return FALSE;
+    }
+
+protected:
+
+    LLGalleryPanel(const LLPanel::Params& params): LLPanel(params)
+    {
+    };
+
+    friend class LLUICtrlFactory;
+};
+
 //-----------------------------
 // LLInventoryGallery
 //-----------------------------
@@ -622,7 +641,7 @@ void LLInventoryGallery::buildGalleryPanel(int row_count)
     params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
     params.visible = true;
     params.use_bounding_rect = false;
-    mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
+    mGalleryPanel = LLUICtrlFactory::create<LLGalleryPanel>(params);
     reshapeGalleryPanel(row_count);
 }
 
@@ -647,6 +666,8 @@ LLPanel* LLInventoryGallery::buildItemPanel(int left)
         lpparams.visible = true;
         lpparams.rect(LLRect(left, top + mItemHeight, left + mItemWidth + mItemHorizontalGap, top));
         lpparams.use_bounding_rect = false;
+        lpparams.focus_root = false;
+        //lpparams.tab_stop = false;
         lpanel = LLUICtrlFactory::create<LLPanel>(lpparams);
     }
     else
@@ -669,6 +690,8 @@ LLPanel* LLInventoryGallery::buildRowPanel(int left, int bottom)
         sparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
         sparams.use_bounding_rect = false;
         sparams.visible = true;
+        sparams.focus_root = false;
+        //sparams.tab_stop = false;
         stack = LLUICtrlFactory::create<LLPanel>(sparams);
     }
     else
@@ -1207,6 +1230,35 @@ void LLInventoryGallery::moveRight()
     }
 }
 
+void LLInventoryGallery::onFocusLost()
+{
+    // inventory no longer handles cut/copy/paste/delete
+    if (gEditMenuHandler == this)
+    {
+        gEditMenuHandler = NULL;
+    }
+
+    LLPanel::onFocusLost();
+
+    if (mSelectedItemID.notNull() && mItemMap[mSelectedItemID])
+    {
+        mItemMap[mSelectedItemID]->setSelected(false);
+    }
+}
+
+void LLInventoryGallery::onFocusReceived()
+{
+    // inventory now handles cut/copy/paste/delete
+    gEditMenuHandler = this;
+
+    LLPanel::onFocusReceived();
+
+    if (mSelectedItemID.notNull() && mItemMap[mSelectedItemID])
+    {
+        mItemMap[mSelectedItemID]->setSelected(true);
+    }
+}
+
 void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
 {
     if (mInventoryGalleryMenu && item_id.notNull())
@@ -1595,6 +1647,14 @@ void LLInventoryGallery::claimEditHandler()
     gEditMenuHandler = this;
 }
 
+void LLInventoryGallery::resetEditHandler()
+{
+    if (gEditMenuHandler == this)
+    {
+        gEditMenuHandler = NULL;
+    }
+}
+
 bool LLInventoryGallery::isItemCopyable(const LLUUID & item_id)
 {
     const LLInventoryCategory* cat = gInventory.getCategory(item_id);
@@ -2310,6 +2370,24 @@ BOOL LLInventoryGalleryItem::handleKeyHere(KEY key, MASK mask)
     return handled;
 }
 
+void LLInventoryGalleryItem::onFocusLost()
+{
+    // inventory no longer handles cut/copy/paste/delete
+    mGallery->resetEditHandler();
+    setSelected(false);
+
+    LLPanel::onFocusLost();
+}
+
+void LLInventoryGalleryItem::onFocusReceived()
+{
+    // inventory now handles cut/copy/paste/delete
+    mGallery->claimEditHandler();
+    setSelected(true);
+
+    LLPanel::onFocusReceived();
+}
+
 void LLInventoryGalleryItem::setWorn(bool value)
 {
     mWorn = value;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index f686d8aa2b..d695da4f95 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -86,6 +86,9 @@ public:
     void moveLeft();
     void moveRight();
 
+    void onFocusLost();
+    void onFocusReceived();
+
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
     LLInventoryFilter& getFilter() const { return *mFilter; }
@@ -161,6 +164,7 @@ public:
     U32 getSortOrder() { return mSortOrder; };
 
     void claimEditHandler();
+    void resetEditHandler();
     static bool isItemCopyable(const LLUUID & item_id);
 
     BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop, EDragAndDropType cargo_type,
@@ -290,6 +294,9 @@ public:
                                    std::string& tooltip_msg);
     BOOL handleKeyHere(KEY key, MASK mask);
 
+    void onFocusLost();
+    void onFocusReceived();
+
     LLFontGL* getTextFont();
 
     void setItemName(std::string name);
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index 22cc926e75..ed04e12193 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -26,6 +26,7 @@
    layout="topleft"
    left="0"
    top="0"
+   tab_stop="true"
    name="gallery_scroll_panel"
    opaque="false">
   </scroll_container>
-- 
cgit v1.2.3


From 5eef9143d0272c969337a3db191b07ffd396139e Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 23 Jun 2023 22:26:52 +0300
Subject: SL-19805 Follow-up fix

---
 indra/newview/llvovolume.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index efcb049c3f..d1bae2f68a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5866,8 +5866,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 							else if (LLDrawPoolAlpha::sShowDebugAlpha ||
 								(gPipeline.sRenderHighlight && !drawablep->getParent() &&
 								drawablep->getVObj() && drawablep->getVObj()->flagScripted() &&
-								(LLPipeline::getRenderScriptedBeacons() ||
-								LLPipeline::getRenderScriptedTouchBeacons() && drawablep->getVObj()->flagHandleTouch())))
+								(LLPipeline::getRenderScriptedBeacons() || LLPipeline::getRenderScriptedTouchBeacons()) && 
+								drawablep->getVObj()->flagHandleTouch()))
 							{ //draw the transparent face for debugging purposes using a custom texture
 								add_face(sAlphaFaces, alpha_count, facep);
 							}
-- 
cgit v1.2.3


From 7d3750c15bde9527e182513124cfd72818c1a282 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sat, 24 Jun 2023 00:17:48 +0200
Subject: SL-19805 Fix touch handling logic

---
 indra/newview/llvovolume.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index d1bae2f68a..bf9a4dfa12 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5865,9 +5865,10 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 							}
 							else if (LLDrawPoolAlpha::sShowDebugAlpha ||
 								(gPipeline.sRenderHighlight && !drawablep->getParent() &&
+								//only root objects are highlighted with red color in this case
 								drawablep->getVObj() && drawablep->getVObj()->flagScripted() &&
-								(LLPipeline::getRenderScriptedBeacons() || LLPipeline::getRenderScriptedTouchBeacons()) && 
-								drawablep->getVObj()->flagHandleTouch()))
+								(LLPipeline::getRenderScriptedBeacons() ||
+								(LLPipeline::getRenderScriptedTouchBeacons() && drawablep->getVObj()->flagHandleTouch()))))
 							{ //draw the transparent face for debugging purposes using a custom texture
 								add_face(sAlphaFaces, alpha_count, facep);
 							}
-- 
cgit v1.2.3


From 65fe37a93029e17f45e488619a5e589a2983757f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 24 Jun 2023 01:49:27 +0300
Subject: SL-19604 Fix gallery view having huge ident at the bottom

---
 indra/llui/lllayoutstack.cpp                               |  9 +++++++++
 indra/llui/lllayoutstack.h                                 |  1 +
 indra/newview/llpanelmaininventory.cpp                     |  6 ++++++
 indra/newview/llpanelmaininventory.h                       |  3 ++-
 .../newview/skins/default/xui/en/panel_main_inventory.xml  | 14 +++++++-------
 5 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 08ce31ffc5..b1968e6a42 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -523,6 +523,15 @@ void LLLayoutStack::updateLayout()
 	mNeedsLayout = continue_animating;
 } // end LLLayoutStack::updateLayout
 
+void LLLayoutStack::setPanelSpacing(S32 val)
+{
+    if (mPanelSpacing != val)
+    {
+        mPanelSpacing = val;
+        mNeedsLayout = true;
+    }
+}
+
 LLLayoutPanel* LLLayoutStack::findEmbeddedPanel(LLPanel* panelp) const
 {
 	if (!panelp) return NULL;
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 02685281ef..000b919ae7 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -91,6 +91,7 @@ public:
 	void updateLayout();
 
 	S32 getPanelSpacing() const { return mPanelSpacing; }
+    void setPanelSpacing(S32 val);
 	
 	static void updateClass();
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 5ae61f0c36..27c8f10889 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -256,6 +256,7 @@ BOOL LLPanelMainInventory::postBuild()
     mCombinationViewPanel = getChild<LLPanel>("combination_view_inventory");
     mCombinationGalleryLayoutPanel = getChild<LLLayoutPanel>("comb_gallery_layout");
     mCombinationListLayoutPanel = getChild<LLLayoutPanel>("comb_inventory_layout");
+    mCombinationLayoutStack = getChild<LLLayoutStack>("combination_view_stack");
 
     mCombinationInventoryPanel = getChild<LLInventorySingleFolderPanel>("comb_single_folder_inv");
     LLInventoryFilter& comb_inv_filter = mCombinationInventoryPanel->getFilter();
@@ -2371,6 +2372,7 @@ void LLPanelMainInventory::updatePanelVisibility()
             comb_gallery_filter.setFilterThumbnails(LLInventoryFilter::FILTER_INCLUDE_THUMBNAILS);
             comb_gallery_filter.markDefault();
 
+            mCombinationLayoutStack->setPanelSpacing(0);
             mCombinationGalleryLayoutPanel->setVisible(mSingleFolderMode && isGalleryViewMode());
             mCombinationGalleryPanel->setVisible(mSingleFolderMode && isGalleryViewMode()); // to prevent or process updates
             mCombinationListLayoutPanel->setVisible(mSingleFolderMode && isListViewMode());
@@ -2390,6 +2392,10 @@ void LLPanelMainInventory::updateCombinationVisibility()
     {
         bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
         bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
+
+        const S32 DRAG_HANDLE_PADDING = 12; // for drag handle to not overlap gallery when both inventories are visible
+        mCombinationLayoutStack->setPanelSpacing(show_inv_pane ? DRAG_HANDLE_PADDING : 0);
+
         mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty);
         mCombinationListLayoutPanel->setVisible(show_inv_pane);
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index bdc62fd8f7..79501e63bc 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -210,7 +210,8 @@ private:
     LLInventorySingleFolderPanel* mCombinationInventoryPanel;
     LLInventoryGallery* mCombinationGalleryPanel;
     LLPanel* mCombinationGalleryLayoutPanel;
-    LLPanel* mCombinationListLayoutPanel;
+    LLLayoutPanel* mCombinationListLayoutPanel;
+    LLLayoutStack* mCombinationLayoutStack;
 
     boost::signals2::connection mListViewRootUpdatedConnection;
     boost::signals2::connection mGalleryRootUpdatedConnection;
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index b735dcf528..f7a9c552cc 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -271,7 +271,7 @@
     <panel
      follows="all"
      halign="center"
-     height="372"
+     height="375"
      layout="topleft"
      left="7"
      name="combination_view_inventory"
@@ -280,9 +280,9 @@
      <layout_stack
       follows="all"
       layout="topleft"
-      height="372"
+      height="375"
+      name="combination_view_stack"
       animate="false"
-      drag_handle_gap="13"
       drag_handle_thickness="6"
       drag_handle_first_indent="18"
       drag_handle_second_indent="18"
@@ -296,7 +296,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="246"
+        height="248"
         min_width="150"
         name="comb_gallery_layout">
         <panel
@@ -304,7 +304,7 @@
          filename="panel_inventory_gallery.xml"
          left="0"
          top="1"
-         height="246"
+         height="248"
          name="comb_gallery_view_inv"
          background_visible="true"
          follows="all"
@@ -316,7 +316,7 @@
         bevel_style="in"
         user_resize="true"
         auto_resize="true"
-        height="126"
+        height="127"
         min_height="100"
         name="comb_inventory_layout">
         <single_folder_inventory_panel
@@ -324,7 +324,7 @@
          follows="all"
          left="0"
          top="1"
-         height="126"
+         height="127"
          layout="topleft"
          show_item_link_overlays="true"
          bg_opaque_color="DkGray2"
-- 
cgit v1.2.3


From 97daf1ed1cb9b28905ddf8b9caa51b05975e9511 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 26 Jun 2023 17:12:46 +0300
Subject: mac build fix

---
 indra/newview/llinventorygallery.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index d695da4f95..5f9c191fc5 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -86,8 +86,8 @@ public:
     void moveLeft();
     void moveRight();
 
-    void onFocusLost();
-    void onFocusReceived();
+    void onFocusLost() override;
+    void onFocusReceived() override;
 
     void setFilterSubString(const std::string& string);
     std::string getFilterSubString() { return mFilterSubString; }
-- 
cgit v1.2.3


From 434f2ee512dc6edf4a6dfbafd7265d121038bf0b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 26 Jun 2023 18:39:51 +0300
Subject: SL-19918 "Save as" menu item is missing for textures in Gallery view

---
 indra/newview/llinventorygallerymenu.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 541fed8172..bca10b9c0e 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -42,6 +42,7 @@
 #include "llmarketplacefunctions.h"
 #include "llmenugl.h"
 #include "llnotificationsutil.h"
+#include "llpreviewtexture.h"
 #include "lltrans.h"
 #include "llviewerfoldertype.h"
 #include "llviewerwindow.h"
@@ -269,6 +270,15 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
             show_on_map_cb(landmark);
         }
     }
+    else if ("save_as" == action)
+    {
+        LLPreviewTexture* preview_texture = LLFloaterReg::getTypedInstance<LLPreviewTexture>("preview_texture", selected_id);
+        if (preview_texture)
+        {
+            preview_texture->openToSave();
+            preview_texture->saveAs();
+        }
+    }
 }
 
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
@@ -620,6 +630,15 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                 }
             }
         }
+        if(obj->getType() == LLAssetType::AT_TEXTURE)
+        {
+            items.push_back(std::string("Save As"));
+            bool can_copy = selected_item && selected_item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED);
+            if (!can_copy)
+            {
+                disabled_items.push_back(std::string("Save As"));
+            }
+        }
         if (is_link)
         {
             items.push_back(std::string("Find Original"));
-- 
cgit v1.2.3


From cd0c40c71af767dd66694dc3329e08823aa6b6e7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 00:24:13 +0300
Subject: SL-19904 Outfit gallery keyboard support

---
 indra/newview/lloutfitgallery.cpp                  | 353 +++++++++++++++++++--
 indra/newview/lloutfitgallery.h                    |  31 +-
 .../skins/default/xui/en/panel_outfit_gallery.xml  |  42 +--
 3 files changed, 356 insertions(+), 70 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 415d0a96d7..de988555c5 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -146,6 +146,264 @@ void LLOutfitGallery::draw()
     }
 }
 
+BOOL LLOutfitGallery::handleKeyHere(KEY key, MASK mask)
+{
+    BOOL handled = FALSE;
+    switch (key)
+    {
+        case KEY_RETURN:
+            // Open selected items if enter key hit on the inventory panel
+            if (mask == MASK_NONE && mSelectedOutfitUUID.notNull())
+            {
+                // Or should it wearSelectedOutfit?
+                getSelectedItem()->openOutfitsContent();
+            }
+            handled = TRUE;
+            break;
+        case KEY_DELETE:
+#if LL_DARWIN
+        case KEY_BACKSPACE:
+#endif
+            // Delete selected items if delete or backspace key hit on the inventory panel
+            // Note: on Mac laptop keyboards, backspace and delete are one and the same
+            if (mSelectedOutfitUUID.notNull())
+            {
+                onRemoveOutfit(mSelectedOutfitUUID);
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_F2:
+            LLAppearanceMgr::instance().renameOutfit(mSelectedOutfitUUID);
+            handled = TRUE;
+            break;
+
+        case KEY_PAGE_UP:
+            if (mScrollPanel)
+            {
+                mScrollPanel->pageUp(30);
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_PAGE_DOWN:
+            if (mScrollPanel)
+            {
+                mScrollPanel->pageDown(30);
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_HOME:
+            if (mScrollPanel)
+            {
+                mScrollPanel->goToTop();
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_END:
+            if (mScrollPanel)
+            {
+                mScrollPanel->goToBottom();
+            }
+            handled = TRUE;
+            break;
+
+        case KEY_LEFT:
+            moveLeft();
+            handled = TRUE;
+            break;
+
+        case KEY_RIGHT:
+            moveRight();
+            handled = TRUE;
+            break;
+
+        case KEY_UP:
+            moveUp();
+            handled = TRUE;
+            break;
+
+        case KEY_DOWN:
+            moveDown();
+            handled = TRUE;
+            break;
+
+        default:
+            break;
+    }
+
+    if (handled)
+    {
+        mOutfitGalleryMenu->hide();
+    }
+
+    return handled;
+}
+
+void LLOutfitGallery::moveUp()
+{
+    if (mSelectedOutfitUUID.notNull() && mItemsAddedCount > 1)
+    {
+        LLOutfitGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            S32 n = mItemIndexMap[item];
+            n -= mItemsInRow;
+            if (n >= 0)
+            {
+                item = mIndexToItemMap[n];
+                LLUUID item_id = item->getUUID();
+                ChangeOutfitSelection(nullptr, item_id);
+                item->setFocus(TRUE);
+
+                scrollToShowItem(mSelectedOutfitUUID);
+            }
+        }
+    }
+}
+
+void LLOutfitGallery::moveDown()
+{
+    if (mSelectedOutfitUUID.notNull() && mItemsAddedCount > 1)
+    {
+        LLOutfitGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            S32 n = mItemIndexMap[item];
+            n += mItemsInRow;
+            if (n < mItemsAddedCount)
+            {
+                item = mIndexToItemMap[n];
+                LLUUID item_id = item->getUUID();
+                ChangeOutfitSelection(nullptr, item_id);
+                item->setFocus(TRUE);
+
+                scrollToShowItem(mSelectedOutfitUUID);
+            }
+        }
+    }
+}
+
+void LLOutfitGallery::moveLeft()
+{
+    if (mSelectedOutfitUUID.notNull() && mItemsAddedCount > 1)
+    {
+        LLOutfitGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            // Might be better to get item from panel
+            S32 n = mItemIndexMap[item];
+            n--;
+            if (n < 0)
+            {
+                n = mItemsAddedCount - 1;
+            }
+            item = mIndexToItemMap[n];
+            LLUUID item_id = item->getUUID();
+            ChangeOutfitSelection(nullptr, item_id);
+            item->setFocus(TRUE);
+
+            scrollToShowItem(mSelectedOutfitUUID);
+        }
+    }
+}
+
+void LLOutfitGallery::moveRight()
+{
+    if (mSelectedOutfitUUID.notNull() && mItemsAddedCount > 1)
+    {
+        LLOutfitGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            S32 n = mItemIndexMap[item];
+            n++;
+            if (n == mItemsAddedCount)
+            {
+                n = 0;
+            }
+            item = mIndexToItemMap[n];
+            LLUUID item_id = item->getUUID();
+            ChangeOutfitSelection(nullptr, item_id);
+            item->setFocus(TRUE);
+
+            scrollToShowItem(mSelectedOutfitUUID);
+        }
+    }
+}
+
+void LLOutfitGallery::onFocusLost()
+{
+    LLOutfitListBase::onFocusLost();
+
+    if (mSelectedOutfitUUID.notNull())
+    {
+        LLOutfitGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            item->setSelected(false);
+        }
+    }
+}
+
+void LLOutfitGallery::onFocusReceived()
+{
+    LLOutfitListBase::onFocusReceived();
+
+    if (mSelectedOutfitUUID.notNull())
+    {
+        LLOutfitGalleryItem* item = getSelectedItem();
+        if (item)
+        {
+            item->setSelected(true);
+        }
+    }
+}
+
+void LLOutfitGallery::onRemoveOutfit(const LLUUID& outfit_cat_id)
+{
+    LLNotificationsUtil::add("DeleteOutfits", LLSD(), LLSD(), boost::bind(onOutfitsRemovalConfirmation, _1, _2, outfit_cat_id));
+}
+
+void LLOutfitGallery::onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response, const LLUUID& outfit_cat_id)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (option != 0) return; // canceled
+
+    if (outfit_cat_id.notNull())
+    {
+        gInventory.removeCategory(outfit_cat_id);
+    }
+}
+
+void LLOutfitGallery::scrollToShowItem(const LLUUID& item_id)
+{
+    LLOutfitGalleryItem* item = mOutfitMap[item_id];
+    if (item)
+    {
+        const LLRect visible_content_rect = mScrollPanel->getVisibleContentRect();
+
+        LLRect item_rect;
+        item->localRectToOtherView(item->getLocalRect(), &item_rect, mScrollPanel);
+        LLRect overlap_rect(item_rect);
+        overlap_rect.intersectWith(visible_content_rect);
+
+        //Scroll when the selected item is outside the visible area
+        if (overlap_rect.getHeight() + 5 < item->getRect().getHeight())
+        {
+            LLRect content_rect = mScrollPanel->getContentWindowRect();
+            LLRect constraint_rect;
+            constraint_rect.setOriginAndSize(0, 0, content_rect.getWidth(), content_rect.getHeight());
+
+            LLRect item_doc_rect;
+            item->localRectToOtherView(item->getLocalRect(), &item_doc_rect, mGalleryPanel);
+
+            mScrollPanel->scrollToShowRect(item_doc_rect, constraint_rect);
+        }
+    }
+}
+
 void LLOutfitGallery::updateRowsIfNeeded()
 {
     if(((getRect().getWidth() - mRowPanelWidth) > mItemWidth) && mRowCount > 1)
@@ -266,8 +524,9 @@ void LLOutfitGallery::addToGallery(LLOutfitGalleryItem* item)
         mHiddenItems.push_back(item);
         return;
     }
+    mItemIndexMap[item] = mItemsAddedCount;
+    mIndexToItemMap[mItemsAddedCount] = item;
     mItemsAddedCount++;
-    mItemIndexMap[item] = mItemsAddedCount - 1;
     int n = mItemsAddedCount;
     int row_count = (n % mItemsInRow) == 0 ? n / mItemsInRow : n / mItemsInRow + 1;
     int n_prev = n - 1;
@@ -303,6 +562,7 @@ void LLOutfitGallery::removeFromGalleryLast(LLOutfitGalleryItem* item)
     int row_count = (n % mItemsInRow) == 0 ? n / mItemsInRow : n / mItemsInRow + 1;
     int row_count_prev = (n_prev % mItemsInRow) == 0 ? n_prev / mItemsInRow : n_prev / mItemsInRow + 1;
     mItemsAddedCount--;
+    mIndexToItemMap.erase(mItemsAddedCount);
 
     bool remove_row = row_count != row_count_prev;
     removeFromLastRow(mItems[mItemsAddedCount]);
@@ -328,6 +588,7 @@ void LLOutfitGallery::removeFromGalleryMiddle(LLOutfitGalleryItem* item)
     }
     int n = mItemIndexMap[item];
     mItemIndexMap.erase(item);
+    mIndexToItemMap.erase(n);
     std::vector<LLOutfitGalleryItem*> saved;
     for (int i = mItemsAddedCount - 1; i > n; i--)
     {
@@ -361,9 +622,15 @@ LLOutfitGalleryItem* LLOutfitGallery::buildGalleryItem(std::string name, LLUUID
     gitem->setFollowsTop();
     gitem->setOutfitName(name);
     gitem->setUUID(outfit_id);
+    gitem->setGallery(this);
     return gitem;
 }
 
+LLOutfitGalleryItem* LLOutfitGallery::getSelectedItem()
+{
+    return mOutfitMap[mSelectedOutfitUUID];
+}
+
 void LLOutfitGallery::buildGalleryPanel(int row_count)
 {
     LLPanel::Params params;
@@ -608,6 +875,7 @@ void LLOutfitGallery::onChangeOutfitSelection(LLWearableItemsList* list, const L
     {
         mOutfitMap[category_id]->setSelected(TRUE);
     }
+    // mSelectedOutfitUUID will be set in LLOutfitListBase::ChangeOutfitSelection
 }
 
 void LLOutfitGallery::wearSelectedOutfit()
@@ -659,7 +927,8 @@ static LLDefaultChildRegistry::Register<LLOutfitGalleryItem> r("outfit_gallery_i
 
 LLOutfitGalleryItem::LLOutfitGalleryItem(const Params& p)
     : LLPanel(p),
-    mTexturep(NULL),
+    mGallery(nullptr),
+    mTexturep(nullptr),
     mSelected(false),
     mWorn(false),
     mDefaultImage(true),
@@ -763,9 +1032,64 @@ BOOL LLOutfitGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
 }
 
 BOOL LLOutfitGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    return openOutfitsContent() || LLPanel::handleDoubleClick(x, y, mask);
+}
+
+BOOL LLOutfitGalleryItem::handleKeyHere(KEY key, MASK mask)
+{
+    if (!mGallery)
+    {
+        return FALSE;
+    }
+
+    BOOL handled = FALSE;
+    switch (key)
+    {
+        case KEY_LEFT:
+            mGallery->moveLeft();
+            handled = true;
+            break;
+
+        case KEY_RIGHT:
+            mGallery->moveRight();
+            handled = true;
+            break;
+
+        case KEY_UP:
+            mGallery->moveUp();
+            handled = true;
+            break;
+
+        case KEY_DOWN:
+            mGallery->moveDown();
+            handled = true;
+            break;
+
+        default:
+            break;
+    }
+    return handled;
+}
+
+void LLOutfitGalleryItem::onFocusLost()
+{
+    setSelected(false);
+
+    LLPanel::onFocusLost();
+}
+
+void LLOutfitGalleryItem::onFocusReceived()
+{
+    setSelected(true);
+
+    LLPanel::onFocusReceived();
+}
+
+bool LLOutfitGalleryItem::openOutfitsContent()
 {
     LLTabContainer* appearence_tabs = LLPanelOutfitsInventory::findInstance()->getChild<LLTabContainer>("appearance_tabs");
-    if (appearence_tabs && (mUUID != LLUUID()))
+    if (appearence_tabs && mUUID.notNull())
     {
         appearence_tabs->selectTabByName("outfitslist_tab");
         LLPanel* panel = appearence_tabs->getCurrentPanel();
@@ -778,12 +1102,11 @@ BOOL LLOutfitGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
                 outfit_list->setSelectedOutfitByUUID(mUUID);
                 LLAccordionCtrlTab* tab = accordion->getSelectedTab();
                 tab->showAndFocusHeader();
-                return TRUE;
+                return true;
             }
         }
     }
-
-    return LLPanel::handleDoubleClick(x, y, mask);
+    return false;
 }
 
 bool LLOutfitGalleryItem::setImageAssetId(LLUUID image_asset_id)
@@ -829,7 +1152,7 @@ LLContextMenu* LLOutfitGalleryContextMenu::createMenu()
                   boost::bind(&LLAppearanceMgr::takeOffOutfit, &LLAppearanceMgr::instance(), selected_id));
     registrar.add("Outfit.Edit", boost::bind(editOutfit));
     registrar.add("Outfit.Rename", boost::bind(renameOutfit, selected_id));
-    registrar.add("Outfit.Delete", boost::bind(&LLOutfitGalleryContextMenu::onRemoveOutfit, this, selected_id));
+    registrar.add("Outfit.Delete", boost::bind(LLOutfitGallery::onRemoveOutfit, selected_id));
     registrar.add("Outfit.Create", boost::bind(&LLOutfitGalleryContextMenu::onCreate, this, _2));
     registrar.add("Outfit.Thumbnail", boost::bind(&LLOutfitGalleryContextMenu::onThumbnail, this, selected_id));
     enable_registrar.add("Outfit.OnEnable", boost::bind(&LLOutfitGalleryContextMenu::onEnable, this, _2));
@@ -848,22 +1171,6 @@ void LLOutfitGalleryContextMenu::onThumbnail(const LLUUID& outfit_cat_id)
     }
 }
 
-void LLOutfitGalleryContextMenu::onRemoveOutfit(const LLUUID& outfit_cat_id)
-{
-    LLNotificationsUtil::add("DeleteOutfits", LLSD(), LLSD(), boost::bind(&LLOutfitGalleryContextMenu::onOutfitsRemovalConfirmation, this, _1, _2, outfit_cat_id));
-}
-
-void LLOutfitGalleryContextMenu::onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response, const LLUUID& outfit_cat_id)
-{
-    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    if (option != 0) return; // canceled
-    
-    if (outfit_cat_id.notNull())
-    {
-        gInventory.removeCategory(outfit_cat_id);
-    }
-}
-
 void LLOutfitGalleryContextMenu::onCreate(const LLSD& data)
 {
     LLWearableType::EType type = LLWearableType::getInstance()->typeNameToType(data.asString());
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 16116d4b71..9915752962 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -74,6 +74,18 @@ public:
     /*virtual*/ BOOL postBuild();
     /*virtual*/ void onOpen(const LLSD& info);
     /*virtual*/ void draw();
+    /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
+    void moveUp();
+    void moveDown();
+    void moveLeft();
+    void moveRight();
+
+    /*virtual*/ void onFocusLost();
+    /*virtual*/ void onFocusReceived();
+
+    static void onRemoveOutfit(const LLUUID& outfit_cat_id);
+    static void onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response, const LLUUID& outfit_cat_id);
+    void scrollToShowItem(const LLUUID& item_id);
 
     void wearSelectedOutfit();
 
@@ -108,8 +120,6 @@ protected:
     void applyFilter(LLOutfitGalleryItem* item, const std::string& filter_substring);
 
 private:
-    void uploadPhoto(LLUUID outfit_id);
-    void uploadOutfitImage(const std::vector<std::string>& filenames, LLUUID outfit_id);
     LLUUID getPhotoAssetId(const LLUUID& outfit_id);
     LLUUID getDefaultPhoto();
     void addToGallery(LLOutfitGalleryItem* item);
@@ -127,6 +137,7 @@ private:
     void updateGalleryWidth();
 
     LLOutfitGalleryItem* buildGalleryItem(std::string name, LLUUID outfit_id);
+    LLOutfitGalleryItem* getSelectedItem();
 
     void onTextureSelectionChanged(LLInventoryItem* itemp);
 
@@ -170,9 +181,10 @@ private:
     typedef std::map<LLUUID, LLOutfitGalleryItem*>      outfit_map_t;
     typedef outfit_map_t::value_type                    outfit_map_value_t;
     outfit_map_t                                        mOutfitMap;
-    typedef std::map<LLOutfitGalleryItem*, int>         item_num_map_t;
+    typedef std::map<LLOutfitGalleryItem*, S32>         item_num_map_t;
     typedef item_num_map_t::value_type                  item_numb_map_value_t;
     item_num_map_t                                      mItemIndexMap;
+    std::map<S32, LLOutfitGalleryItem*>                 mIndexToItemMap;
 
 
     LLInventoryCategoriesObserver* 	mOutfitsObserver;
@@ -185,14 +197,13 @@ public:
     LLOutfitGalleryContextMenu(LLOutfitListBase* outfit_list)
     : LLOutfitContextMenu(outfit_list),
     mOutfitList(outfit_list){}
+
 protected:
     /* virtual */ LLContextMenu* createMenu();
     bool onEnable(LLSD::String param);
     bool onVisible(LLSD::String param);
     void onThumbnail(const LLUUID& outfit_cat_id);
     void onCreate(const LLSD& data);
-    void onRemoveOutfit(const LLUUID& outfit_cat_id);
-    void onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response, const LLUUID& outfit_cat_id);
 private:
     LLOutfitListBase*	mOutfitList;
 };
@@ -226,14 +237,21 @@ public:
     /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
     /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
     /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+    /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
+    /*virtual*/ void onFocusLost();
+    /*virtual*/ void onFocusReceived();
+
+    bool openOutfitsContent();
 
+    void setGallery(LLOutfitGallery* gallery) { mGallery = gallery; }
     void setDefaultImage();
     bool setImageAssetId(LLUUID asset_id);
     LLUUID getImageAssetId();
     void setOutfitName(std::string name);
     void setOutfitWorn(bool value);
     void setSelected(bool value);
-    void setUUID(LLUUID outfit_id) {mUUID = outfit_id;}
+    void setUUID(const LLUUID &outfit_id) {mUUID = outfit_id;}
+    LLUUID getUUID() const { return mUUID; }
     
     std::string getItemName() {return mOutfitName;}
     bool isDefaultImage() {return mDefaultImage;}
@@ -242,6 +260,7 @@ public:
     void setHidden(bool hidden) {mHidden = hidden;}
     
 private:
+    LLOutfitGallery* mGallery;
     LLPointer<LLViewerFetchedTexture> mTexturep;
     LLUUID mUUID;
     LLUUID mImageAssetId;
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index e3790ae09b..e951d25391 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -40,50 +40,10 @@
    layout="topleft"
    left="4"
    top="0"
+   tab_stop="true"
    name="gallery_scroll_panel"
    opaque="false"
    top_pad="0">
-   <!--outfit_gallery_item
-    layout="topleft"
-    left="10"
-    name="preview_outfit1"
-    height="175"
-    width="150"
-    follows="left|top"/-->
-     <!--layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="0" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="190" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-     <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="380" name="top_gallery_stack" orientation="horizontal">
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-     </layout_stack-->
-    <!--</panel>-->  
   </scroll_container> 
   <panel
      background_visible="true"
-- 
cgit v1.2.3


From 7849e12c3104771a96806e8e721e3d5d92f856d2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 00:25:38 +0300
Subject: SL-19815 Fix missed 'handled' flags

---
 indra/newview/llinventorygallery.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 248f3ed649..2a71735a53 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1045,6 +1045,7 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
                     }
                 }
             }
+            handled = TRUE;
             break;
         case KEY_DELETE:
 #if LL_DARWIN
@@ -1056,6 +1057,7 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
             {
                 deleteSelection();
             }
+            handled = TRUE;
             break;
 
         case KEY_F2:
-- 
cgit v1.2.3


From 04fc8c4db45175cbe036474c53eacdd3b9f56eaa Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 00:26:32 +0300
Subject: SL-18629 Fixed missed case of unpacking metadata

---
 indra/llinventory/llinventory.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index ecd070236f..f0b593bba7 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -215,6 +215,26 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 		{
 			mType = LLAssetType::lookup(valuestr);
 		}
+        else if (0 == strcmp("metadata", keyword))
+        {
+            LLSD metadata(valuestr);
+            if (metadata.has("thumbnail"))
+            {
+                const LLSD& thumbnail = metadata["thumbnail"];
+                if (thumbnail.has("asset_id"))
+                {
+                    setThumbnailUUID(thumbnail["asset_id"].asUUID());
+                }
+                else
+                {
+                    setThumbnailUUID(LLUUID::null);
+                }
+            }
+            else
+            {
+                setThumbnailUUID(LLUUID::null);
+            }
+        }
 		else if(0 == strcmp("name", keyword))
 		{
 			//strcpy(valuestr, buffer + strlen(keyword) + 3);
-- 
cgit v1.2.3


From d35ef7e5d8f3968479543819501bd201e6321355 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 20:20:56 +0300
Subject: SL-19924 Update profile type names

---
 indra/newview/llpanelprofile.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 34e1fd09d8..8ac1efe8e7 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1295,14 +1295,14 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
         childSetVisible("badge_layout", TRUE);
         childSetVisible("partner_spacer_layout", FALSE);
     }
-    else if (customer_lower == "premium_lifetime")
+    else if (customer_lower == "secondlifetime_premium")
     {
-        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Premium_Lifetime");
+        getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Premium_Lifetime");
         getChild<LLUICtrl>("badge_text")->setValue(getString("BadgePremiumLifetime"));
         childSetVisible("badge_layout", TRUE);
         childSetVisible("partner_spacer_layout", FALSE);
     }
-    else if (customer_lower == "pplus_lifetime" || customer_lower == "premium_plus_lifetime")
+    else if (customer_lower == "secondlifetime_premium_plus")
     {
         getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Pplus_Lifetime");
         getChild<LLUICtrl>("badge_text")->setValue(getString("BadgePremiumPlusLifetime"));
-- 
cgit v1.2.3


From 4a5ffb70c448f4fdf3e937c0da07ed8cb1d976e9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 22:04:34 +0300
Subject: SL-19274 Update 'switch view' label

---
 indra/newview/skins/default/xui/en/floater_inventory_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index bfac79ac46..2e619d91fb 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -63,7 +63,7 @@
      <radio_item
       height="20"
       follows="left|top"
-      label="Switch view"
+      label="Switches view"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
-- 
cgit v1.2.3


From ed63ef3c0b6ceddf9ed667c1d69441d132b34983 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 28 Jun 2023 00:34:15 +0300
Subject: SL-19572 Fix some obscure cases of residents bypasing mute list

---
 indra/llmessage/llcachename.cpp | 4 +++-
 indra/newview/llmutelist.h      | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 66bd85f4e6..a2e85cf6c2 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -552,7 +552,9 @@ std::string LLCacheName::buildUsername(const std::string& full_name)
 
 	// if the input wasn't a correctly formatted legacy name, just return it  
 	// cleaned up from a potential terminal "Resident"
-	return cleanFullName(full_name);
+    std::string clean_name = cleanFullName(full_name);
+    LLStringUtil::toLower(clean_name);
+	return clean_name;
 }
 
 //static 
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index 2c45014321..14840f1b2e 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -99,6 +99,7 @@ public:
 	BOOL isMuted(const LLUUID& id, const std::string& name = LLStringUtil::null, U32 flags = 0) const;
 
 	// Workaround for username-based mute search, a lot of string conversions so use cautiously
+    // Expects lower case username
 	BOOL isMuted(const std::string& username, U32 flags = 0) const;
 
 	// Alternate (convenience) form for places we don't need to pass the name, but do need flags
-- 
cgit v1.2.3


From 8eade6f074bf90ca914d8cb2a8f7cd58bfea7bb0 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 28 Jun 2023 12:38:43 +0300
Subject: SL-19923 FIXED Unable to drag and drop items from Library in Gallery
 mode

---
 indra/newview/llinventorygallery.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 2a71735a53..fa50261c9b 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -36,6 +36,7 @@
 #include "llinventoryfunctions.h"
 #include "llinventoryicon.h"
 #include "llinventorymodel.h"
+#include "llinventorymodelbackgroundfetch.h"
 #include "llthumbnailctrl.h"
 #include "lltextbox.h"
 #include "llviewerfoldertype.h"
@@ -2240,6 +2241,15 @@ void LLInventoryGalleryItem::setSelected(bool value)
 {
     mSelected = value;
     mTextBgPanel->setBackgroundVisible(value);
+
+    if(mSelected)
+    {
+        LLViewerInventoryItem* item = gInventory.getItem(mUUID);
+        if(item && !item->isFinished())
+        {
+            LLInventoryModelBackgroundFetch::instance().start(mUUID, false);
+        }
+    }
 }
 
 BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
-- 
cgit v1.2.3


From 7c100d54dda03db62a8d2c8be6a5e02ea9280f9b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Jun 2023 02:33:58 +0300
Subject: SL-19928 Make thumbnail selection failures more user friendly

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     |   4 +-
 indra/newview/llpanelprofile.cpp                   |   4 +-
 indra/newview/lltexturectrl.cpp                    | 110 +++++++++++++++------
 indra/newview/lltexturectrl.h                      |  14 ++-
 .../skins/default/xui/en/floater_texture_ctrl.xml  |  16 +++
 5 files changed, 114 insertions(+), 34 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 48378cb724..1ad235ac0a 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -710,7 +710,9 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
             texture_floaterp->setLocalTextureEnabled(FALSE);
             texture_floaterp->setBakeTextureEnabled(FALSE);
             texture_floaterp->setCanApplyImmediately(false);
-            texture_floaterp->setCanApply(false, true);
+            texture_floaterp->setCanApply(false, true, false /*Hide 'preview disabled'*/);
+            texture_floaterp->setDimentionsLimits(LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX,
+                                                 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN);
 
             addDependentFloater(texture_floaterp);
         }
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 078c1370ee..a49effc342 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1923,7 +1923,7 @@ void LLPanelProfileSecondLife::onShowTexturePicker()
             });
             texture_floaterp->setLocalTextureEnabled(FALSE);
             texture_floaterp->setBakeTextureEnabled(FALSE);
-            texture_floaterp->setCanApply(false, true);
+            texture_floaterp->setCanApply(false, true, false);
 
             parent_floater->addDependentFloater(mFloaterTexturePickerHandle);
 
@@ -2263,7 +2263,7 @@ void LLPanelProfileFirstLife::onChangePhoto()
                 }
             });
             texture_floaterp->setLocalTextureEnabled(FALSE);
-            texture_floaterp->setCanApply(false, true);
+            texture_floaterp->setCanApply(false, true, false);
 
             parent_floater->addDependentFloater(mFloaterTexturePickerHandle);
 
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 6f29d45f6b..ec0ae39573 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -176,6 +176,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mSelectedItemPinned( FALSE ),
 	mCanApply(true),
 	mCanPreview(true),
+    mMaxDim(S32_MAX),
+    mMinDim(0),
 	mPreviewSettingChanged(false),
 	mOnFloaterCommitCallback(NULL),
 	mOnFloaterCloseCallback(NULL),
@@ -270,19 +272,36 @@ void LLFloaterTexturePicker::stopUsingPipette()
 	}
 }
 
-void LLFloaterTexturePicker::updateImageStats()
+bool LLFloaterTexturePicker::updateImageStats()
 {
+    bool result = true;
 	if (mTexturep.notNull())
 	{
 		//RN: have we received header data for this image?
-		if (mTexturep->getFullWidth() > 0 && mTexturep->getFullHeight() > 0)
+        S32 width = mTexturep->getFullWidth();
+        S32 height = mTexturep->getFullHeight();
+		if (width > 0 && height > 0)
 		{
-			std::string formatted_dims = llformat("%d x %d", mTexturep->getFullWidth(),mTexturep->getFullHeight());
-			mResolutionLabel->setTextArg("[DIMENSIONS]", formatted_dims);
-			if (mOnUpdateImageStatsCallback)
-			{
-				mOnUpdateImageStatsCallback(mTexturep);
-			}
+            if (width < mMinDim
+                || width > mMaxDim
+                || height < mMinDim
+                || height > mMaxDim
+                )
+            {
+                std::string formatted_dims = llformat("%d x %d", width, height);
+                mResolutionWarning->setTextArg("[TEXDIM]", formatted_dims);
+                result = false;
+            }
+            else
+            {
+                std::string formatted_dims = llformat("%d x %d", width, height);
+                mResolutionLabel->setTextArg("[DIMENSIONS]", formatted_dims);
+            }
+
+            if (mOnUpdateImageStatsCallback)
+            {
+                mOnUpdateImageStatsCallback(mTexturep);
+            }
 		}
 		else
 		{
@@ -293,6 +312,21 @@ void LLFloaterTexturePicker::updateImageStats()
 	{
 		mResolutionLabel->setTextArg("[DIMENSIONS]", std::string(""));
 	}
+    mResolutionLabel->setVisible(result);
+    mResolutionWarning->setVisible(!result);
+
+    // Hide buttons and pipete to make space for mResolutionWarning
+    // Hiding buttons is suboptimal, but at the moment limited to inventory thumbnails
+    // may be this should be an info/warning icon with a tooltip?
+    S32 index = mModeSelector->getValue().asInteger();
+    if (index == 0)
+    {
+        mDefaultBtn->setVisible(result);
+        mNoneBtn->setVisible(result);
+        mBlankBtn->setVisible(result);
+        mPipetteBtn->setVisible(result);
+    }
+    return result;
 }
 
 // virtual
@@ -410,11 +444,22 @@ BOOL LLFloaterTexturePicker::postBuild()
 	mTentativeLabel = getChild<LLTextBox>("Multiple");
 
 	mResolutionLabel = getChild<LLTextBox>("size_lbl");
+    mResolutionWarning = getChild<LLTextBox>("over_limit_lbl");
 
 
-	childSetAction("Default",LLFloaterTexturePicker::onBtnSetToDefault,this);
-	childSetAction("None", LLFloaterTexturePicker::onBtnNone,this);
-	childSetAction("Blank", LLFloaterTexturePicker::onBtnBlank,this);
+    mDefaultBtn = getChild<LLButton>("Default");
+    mNoneBtn = getChild<LLButton>("None");
+    mBlankBtn = getChild<LLButton>("Blank");
+    mPipetteBtn = getChild<LLButton>("Pipette");
+    mSelectBtn = getChild<LLButton>("Select");
+    mCancelBtn = getChild<LLButton>("Cancel");
+
+    mDefaultBtn->setClickedCallback(boost::bind(LLFloaterTexturePicker::onBtnSetToDefault,this));
+    mNoneBtn->setClickedCallback(boost::bind(LLFloaterTexturePicker::onBtnNone, this));
+    mBlankBtn->setClickedCallback(boost::bind(LLFloaterTexturePicker::onBtnBlank, this));
+    mPipetteBtn->setCommitCallback(boost::bind(&LLFloaterTexturePicker::onBtnPipette, this));
+    mSelectBtn->setClickedCallback(boost::bind(LLFloaterTexturePicker::onBtnSelect, this));
+    mCancelBtn->setClickedCallback(boost::bind(LLFloaterTexturePicker::onBtnCancel, this));
 
 
 	childSetCommitCallback("show_folders_check", onShowFolders, this);
@@ -481,10 +526,6 @@ BOOL LLFloaterTexturePicker::postBuild()
 		getChildView("show_folders_check")->setEnabled(FALSE);
 	}
 
-	getChild<LLUICtrl>("Pipette")->setCommitCallback( boost::bind(&LLFloaterTexturePicker::onBtnPipette, this));
-	childSetAction("Cancel", LLFloaterTexturePicker::onBtnCancel,this);
-	childSetAction("Select", LLFloaterTexturePicker::onBtnSelect,this);
-
 	// update permission filter once UI is fully initialized
 	updateFilterPermMask();
 	mSavedFolderState.setApply(FALSE);
@@ -504,13 +545,13 @@ void LLFloaterTexturePicker::draw()
     static LLCachedControl<F32> max_opacity(gSavedSettings, "PickerContextOpacity", 0.4f);
     drawConeToOwner(mContextConeOpacity, max_opacity, mOwner);
 
-	updateImageStats();
+	bool valid_dims = updateImageStats();
 
 	// if we're inactive, gray out "apply immediate" checkbox
 	getChildView("show_folders_check")->setEnabled(mActive && mCanApplyImmediately && !mNoCopyTextureSelected);
-	getChildView("Select")->setEnabled(mActive && mCanApply);
-	getChildView("Pipette")->setEnabled(mActive);
-	getChild<LLUICtrl>("Pipette")->setValue(LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance());
+	mSelectBtn->setEnabled(mActive && mCanApply && valid_dims);
+	mPipetteBtn->setEnabled(mActive);
+    mPipetteBtn->setValue(LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance());
 
 	//BOOL allow_copy = FALSE;
 	if( mOwner ) 
@@ -544,9 +585,9 @@ void LLFloaterTexturePicker::draw()
 			mTentativeLabel->setVisible( FALSE  );
 		}
 
-		getChildView("Default")->setEnabled(mImageAssetID != mDefaultImageAssetID || mTentative);
-		getChildView("Blank")->setEnabled(mImageAssetID != mBlankImageAssetID || mTentative);
-		getChildView("None")->setEnabled(mAllowNoTexture && (!mImageAssetID.isNull() || mTentative));
+		mDefaultBtn->setEnabled(mImageAssetID != mDefaultImageAssetID || mTentative);
+		mBlankBtn->setEnabled(mImageAssetID != mBlankImageAssetID || mTentative);
+		mNoneBtn->setEnabled(mAllowNoTexture && (!mImageAssetID.isNull() || mTentative));
 
 		LLFloater::draw();
 
@@ -820,10 +861,10 @@ void LLFloaterTexturePicker::onModeSelect(LLUICtrl* ctrl, void *userdata)
 	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
     int index = self->mModeSelector->getValue().asInteger();
 
-	self->getChild<LLButton>("Default")->setVisible(index == 0 ? TRUE : FALSE);
-	self->getChild<LLButton>("Blank")->setVisible(index == 0 ? TRUE : FALSE);
-	self->getChild<LLButton>("None")->setVisible(index == 0 ? TRUE : FALSE);
-	self->getChild<LLButton>("Pipette")->setVisible(index == 0 ? TRUE : FALSE);
+	self->mDefaultBtn->setVisible(index == 0 ? TRUE : FALSE);
+	self->mBlankBtn->setVisible(index == 0 ? TRUE : FALSE);
+	self->mNoneBtn->setVisible(index == 0 ? TRUE : FALSE);
+	self->mPipetteBtn->setVisible(index == 0 ? TRUE : FALSE);
 	self->getChild<LLFilterEditor>("inventory search editor")->setVisible(index == 0 ? TRUE : FALSE);
 	self->getChild<LLInventoryPanel>("inventory panel")->setVisible(index == 0 ? TRUE : FALSE);
 
@@ -1098,10 +1139,10 @@ void LLFloaterTexturePicker::updateFilterPermMask()
 	//mInventoryPanel->setFilterPermMask( getFilterPermMask() );  Commented out due to no-copy texture loss.
 }
 
-void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply)
+void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply, bool inworld_image)
 {
-	getChildRef<LLUICtrl>("Select").setEnabled(can_apply);
-	getChildRef<LLUICtrl>("preview_disabled").setVisible(!can_preview);
+	mSelectBtn->setEnabled(can_apply);
+	getChildRef<LLUICtrl>("preview_disabled").setVisible(!can_preview && inworld_image);
 	getChildRef<LLUICtrl>("apply_immediate_check").setVisible(can_preview);
 
 	mCanApply = can_apply;
@@ -1109,6 +1150,17 @@ void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply)
 	mPreviewSettingChanged = true;
 }
 
+void LLFloaterTexturePicker::setDimentionsLimits(S32 max_dim, S32 min_dim)
+{
+    mMaxDim = max_dim;
+    mMinDim = min_dim;
+
+    std::string formatted_dims = llformat("%d x %d", mMinDim, mMinDim);
+    mResolutionWarning->setTextArg("[MINTEXDIM]", formatted_dims);
+    formatted_dims = llformat("%d x %d", mMaxDim, mMaxDim);
+    mResolutionWarning->setTextArg("[MAXTEXDIM]", formatted_dims);
+}
+
 void LLFloaterTexturePicker::onFilterEdit(const std::string& search_string )
 {
 	std::string upper_case_search_string = search_string;
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index fbb38c4464..8ef6d9bee7 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -295,7 +295,7 @@ public:
 
 	// New functions
 	void setImageID(const LLUUID& image_asset_id, bool set_selection = true);
-	void updateImageStats();
+	bool updateImageStats(); // true if within limits
 	const LLUUID&	getAssetID() { return mImageAssetID; }
 	const LLUUID&	findItemID(const LLUUID& asset_id, BOOL copyable_only, BOOL ignore_library = FALSE);
 	void			setCanApplyImmediately(BOOL b);
@@ -313,7 +313,8 @@ public:
 
 	void onFilterEdit(const std::string& search_string);
 
-	void setCanApply(bool can_preview, bool can_apply);
+	void setCanApply(bool can_preview, bool can_apply, bool inworld_image = true);
+    void setDimentionsLimits(S32 max_dim, S32 min_dim);
 	void setTextureSelectedCallback(const texture_selected_callback& cb) { mTextureSelectedCallback = cb; }
 	void setOnFloaterCloseCallback(const floater_close_callback& cb) { mOnFloaterCloseCallback = cb; }
 	void setOnFloaterCommitCallback(const floater_commit_callback& cb) { mOnFloaterCommitCallback = cb; }
@@ -364,6 +365,7 @@ protected:
 
 	LLTextBox*			mTentativeLabel;
 	LLTextBox*			mResolutionLabel;
+    LLTextBox*          mResolutionWarning;
 
 	std::string			mPendingName;
 	BOOL				mActive;
@@ -381,11 +383,19 @@ protected:
 
 	LLComboBox*			mModeSelector;
 	LLScrollListCtrl*	mLocalScrollCtrl;
+    LLButton*           mDefaultBtn;
+    LLButton*           mNoneBtn;
+    LLButton*           mBlankBtn;
+    LLButton*           mPipetteBtn;
+    LLButton*           mSelectBtn;
+    LLButton*           mCancelBtn;
 
 private:
 	bool mCanApply;
 	bool mCanPreview;
 	bool mPreviewSettingChanged;
+    S32 mMaxDim;
+    S32 mMinDim;
 
 
 	texture_selected_callback mTextureSelectedCallback;
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 3a66911389..dc68bd0d4a 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -83,6 +83,22 @@
      top_pad="4">
         [DIMENSIONS]
     </text>
+    <text
+     type="string"
+     text_color="Yellow"
+     length="1"
+     word_wrap="true"
+     follows="left|top"
+     height="56"
+     width="164"
+     layout="topleft"
+     left="8"
+     name="over_limit_lbl"
+     visible="false"
+     top_delta="0">
+        Selected texture is [TEXDIM], inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
+    </text>
+    
 <!--  middle: inventory mode -->
 
     <button
-- 
cgit v1.2.3


From fb62ef12102186c9854d4f28c68e49be74d09ba6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 29 Jun 2023 13:13:10 +0300
Subject: SL-19932 FIXED Drag and drop or paste of new item in existing
 marketplace entry does not work

---
 indra/newview/llinventoryfunctions.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 034488c011..3a53425e43 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1518,11 +1518,15 @@ bool move_item_to_marketplacelistings(LLInventoryItem* inv_item, LLUUID dest_fol
                                                                              callback_dest_create);
                                             });
             }
-            if (depth == 1)
+            else if (depth == 1)
             {
                 // We need a version folder
                 gInventory.createNewCategory(dest_folder, LLFolderType::FT_NONE, viewer_inv_item->getName(), callback_dest_create);
             }
+            else
+            {
+                callback_dest_create(dest_folder);
+            }
         }
         else
         {
-- 
cgit v1.2.3


From f149b87fcc152a7e6232d1a2eb81bb2ac72697da Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Jun 2023 23:53:22 +0300
Subject: SL-19929 New inventory feature notification

---
 indra/newview/CMakeLists.txt                       |  2 +
 indra/newview/app_settings/settings.xml            | 11 ++++
 indra/newview/llagent.cpp                          | 33 ++++++++++--
 indra/newview/llagent.h                            | 12 +++--
 indra/newview/llfloaternewfeaturenotification.cpp  | 63 ++++++++++++++++++++++
 indra/newview/llfloaternewfeaturenotification.h    | 49 +++++++++++++++++
 indra/newview/llsidepanelinventory.cpp             |  2 +
 indra/newview/llstartup.cpp                        |  4 +-
 indra/newview/llviewerfloaterreg.cpp               |  4 ++
 .../xui/en/floater_new_feature_notification.xml    | 54 +++++++++++++++++++
 10 files changed, 224 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/llfloaternewfeaturenotification.cpp
 create mode 100644 indra/newview/llfloaternewfeaturenotification.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_new_feature_notification.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index eedc24f973..c37d03221c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -246,6 +246,7 @@ set(viewer_SOURCE_FILES
     llfloatermyscripts.cpp
     llfloatermyenvironment.cpp
     llfloaternamedesc.cpp
+    llfloaternewfeaturenotification.cpp
     llfloaternotificationsconsole.cpp
     llfloaternotificationstabbed.cpp
     llfloaterobjectweights.cpp
@@ -894,6 +895,7 @@ set(viewer_HEADER_FILES
     llfloatermyscripts.h
     llfloatermyenvironment.h
     llfloaternamedesc.h
+    llfloaternewfeaturenotification.h
     llfloaternotificationsconsole.h
     llfloaternotificationstabbed.h
     llfloaterobjectweights.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dd87f827df..df3dd65a0e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5497,6 +5497,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LastUIFeatureVersion</key>
+    <map>
+        <key>Comment</key>
+        <string>UI Feature Version number for tracking feature notification between viewer builds</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>S32</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
     <key>LastFindPanel</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8cc9be7244..2430ca5f83 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -120,6 +120,8 @@ const F64 CHAT_AGE_FAST_RATE = 3.0;
 const F32 MIN_FIDGET_TIME = 8.f; // seconds
 const F32 MAX_FIDGET_TIME = 20.f; // seconds
 
+const S32 UI_FEATURE_VERSION = 1;
+
 // The agent instance.
 LLAgent gAgent;
 
@@ -372,7 +374,7 @@ LLAgent::LLAgent() :
 	mHideGroupTitle(FALSE),
 	mGroupID(),
 
-	mInitialized(FALSE),
+	mInitialized(false),
 	mListener(),
 
 	mDoubleTapRunTimer(),
@@ -447,7 +449,7 @@ LLAgent::LLAgent() :
 
 	mNextFidgetTime(0.f),
 	mCurrentFidget(0),
-	mFirstLogin(FALSE),
+	mFirstLogin(false),
 	mOutfitChosen(FALSE),
 
 	mVoiceConnected(false),
@@ -504,7 +506,7 @@ void LLAgent::init()
 
 	mHttpPolicy = app_core_http.getPolicy(LLAppCoreHttp::AP_AGENT);
 
-	mInitialized = TRUE;
+	mInitialized = true;
 }
 
 //-----------------------------------------------------------------------------
@@ -559,6 +561,31 @@ void LLAgent::onAppFocusGained()
 	}
 }
 
+void LLAgent::setFirstLogin(bool b)
+{
+    mFirstLogin = b;
+
+    if (mFirstLogin)
+    {
+        // Don't notify new users about new features
+        S32 feature_version = gSavedSettings.getS32("LastUIFeatureVersion");
+        if (feature_version < UI_FEATURE_VERSION)
+        {
+            gSavedSettings.setS32("LastUIFeatureVersion", UI_FEATURE_VERSION);
+        }
+    }
+}
+
+void LLAgent::showLatestFeatureNotification()
+{
+    // Notify user about new thumbnail support
+    S32 feature_version = gSavedSettings.getS32("LastUIFeatureVersion");
+    if (feature_version < UI_FEATURE_VERSION)
+    {
+        LLFloaterReg::showInstance("new_feature_notification");
+        gSavedSettings.setS32("LastUIFeatureVersion", UI_FEATURE_VERSION);
+    }
+}
 
 void LLAgent::ageChat()
 {
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 498bea3c07..fb9ac402e1 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -117,15 +117,17 @@ private:
 	//--------------------------------------------------------------------
 public:
 	void			onAppFocusGained();
-	void			setFirstLogin(BOOL b) 	{ mFirstLogin = b; }
+	void			setFirstLogin(bool b);
 	// Return TRUE if the database reported this login as the first for this particular user.
-	BOOL 			isFirstLogin() const 	{ return mFirstLogin; }
-	BOOL 			isInitialized() const 	{ return mInitialized; }
+	bool 			isFirstLogin() const 	{ return mFirstLogin; }
+	bool 			isInitialized() const 	{ return mInitialized; }
+
+    void            showLatestFeatureNotification();
 public:
 	std::string		mMOTD; 					// Message of the day
 private:
-	BOOL			mInitialized;
-	BOOL			mFirstLogin;
+	bool			mInitialized;
+	bool			mFirstLogin;
 	boost::shared_ptr<LLAgentListener> mListener;
 
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
new file mode 100644
index 0000000000..e04b1a5da5
--- /dev/null
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -0,0 +1,63 @@
+/** 
+ * @file llfloaternewfeaturenotification.cpp
+ * @brief LLFloaterNewFeatureNotification class implementation
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaternewfeaturenotification.h"
+
+
+LLFloaterNewFeatureNotification::LLFloaterNewFeatureNotification(const LLSD& key)
+	:	LLFloater(key)
+{
+}
+
+LLFloaterNewFeatureNotification::~LLFloaterNewFeatureNotification()
+{
+}
+
+BOOL LLFloaterNewFeatureNotification::postBuild()
+{
+	setCanDrag(FALSE);
+	getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterNewFeatureNotification::onCloseBtn, this));
+	return TRUE;
+}
+
+void LLFloaterNewFeatureNotification::onOpen(const LLSD& key)
+{
+	centerOnScreen();
+}
+
+void LLFloaterNewFeatureNotification::onCloseBtn()
+{
+	closeFloater();
+}
+
+void LLFloaterNewFeatureNotification::centerOnScreen()
+{
+	LLVector2 window_size = LLUI::getInstance()->getWindowSize();
+	centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY])));
+}
+
diff --git a/indra/newview/llfloaternewfeaturenotification.h b/indra/newview/llfloaternewfeaturenotification.h
new file mode 100644
index 0000000000..86e9683def
--- /dev/null
+++ b/indra/newview/llfloaternewfeaturenotification.h
@@ -0,0 +1,49 @@
+/** 
+ * @file llfloaternewfeaturenotification.h
+ * @brief LLFloaterNewFeatureNotification class definition
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_FLOATER_NEW_FEATURE_NOTOFICATION_H
+#define LL_FLOATER_NEW_FEATURE_NOTOFICATION_H
+
+#include "llfloater.h"
+
+class LLFloaterNewFeatureNotification:
+	public LLFloater
+{
+	friend class LLFloaterReg;
+public:
+	BOOL postBuild() override;
+	void onOpen(const LLSD& key) override;
+
+private:
+    LLFloaterNewFeatureNotification(const LLSD& key);
+    /*virtual*/	~LLFloaterNewFeatureNotification();
+
+	void centerOnScreen();
+
+	void onCloseBtn();	
+};
+
+#endif
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 5eb853f44c..dde260eb7f 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -400,6 +400,8 @@ void LLSidepanelInventory::onOpen(const LLSD& key)
 		gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());
 	}
 #endif
+
+    gAgent.showLatestFeatureNotification();
 }
 
 void LLSidepanelInventory::performActionOnSelection(const std::string &action)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index a37bde6eb8..edd46f7423 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3627,7 +3627,7 @@ bool process_login_success_response()
 		std::string flag = login_flags["ever_logged_in"];
 		if(!flag.empty())
 		{
-			gAgent.setFirstLogin((flag == "N") ? TRUE : FALSE);
+			gAgent.setFirstLogin(flag == "N");
 		}
 
 		/*  Flag is currently ignored by the viewer.
@@ -3718,7 +3718,7 @@ bool process_login_success_response()
 	std::string fake_initial_outfit_name = gSavedSettings.getString("FakeInitialOutfitName");
 	if (!fake_initial_outfit_name.empty())
 	{
-		gAgent.setFirstLogin(TRUE);
+		gAgent.setFirstLogin(true);
 		sInitialOutfit = fake_initial_outfit_name;
 		if (sInitialOutfitGender.empty())
 		{
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 0c6e2de3ed..060bdb6995 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -100,6 +100,7 @@
 #include "llfloatermyscripts.h"
 #include "llfloatermyenvironment.h"
 #include "llfloaternamedesc.h"
+#include "llfloaternewfeaturenotification.h"
 #include "llfloaternotificationsconsole.h"
 #include "llfloaternotificationstabbed.h"
 #include "llfloaterobjectweights.h"
@@ -229,6 +230,7 @@ public:
                 "avatar_picker",
                 "camera",
                 "camera_presets",
+                "change_item_thumbnail"
                 "classified",
                 "add_landmark",
                 "delete_pref_preset",
@@ -247,6 +249,7 @@ public:
                 "message_critical", // Modal!!! Login specific. If this is in use elsewhere, better to create a non modal variant
                 "message_tos", // Modal!!! Login specific.
                 "mute_object_by_name",
+                "new_feature_notification",
                 "publish_classified",
                 "save_pref_preset",
                 "save_camera_preset",
@@ -402,6 +405,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("moveview", "floater_moveview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMove>);
 	LLFloaterReg::add("mute_object_by_name", "floater_mute_object.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGetBlockedObjectName>);
 	LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>);
+    LLFloaterReg::add("new_feature_notification", "floater_new_feature_notification.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNewFeatureNotification>);
 
 	LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>);
 	
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
new file mode 100644
index 0000000000..370a08f16a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="130"
+ width="300"
+ layout="topleft"
+ name="floater_new_feature_notification"
+ title="NEW FEATURE"
+ show_title="false"
+ header_height="0"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_close="false">
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   font="SansSerifLargeBold"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="14"
+   top="10"
+   right="-10"
+   name="title_txt">
+New inventory features
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="40"
+   top_pad="14"
+   right="-10"
+   word_wrap="true"
+   name="description_txt">
+You can now add preview images to inventory items and view a folder in its own window.
+Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+  </text>
+  <button
+   follows="bottom|left|right"
+   layout="topleft"
+   height="24"
+   label="Got it!"
+   left="104"
+   bottom="-10"
+   name="close_btn"
+   width="90"/>
+</floater>
-- 
cgit v1.2.3


From ab18293d35c4ce391f65efaa65be53cdbe84f550 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 30 Jun 2023 00:42:55 +0300
Subject: SL-19929 Picker's warning small adjustment

---
 indra/newview/lltexturectrl.cpp                             | 6 +++---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index ec0ae39573..21bb855704 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -288,7 +288,7 @@ bool LLFloaterTexturePicker::updateImageStats()
                 || height > mMaxDim
                 )
             {
-                std::string formatted_dims = llformat("%d x %d", width, height);
+                std::string formatted_dims = llformat("%dx%d", width, height);
                 mResolutionWarning->setTextArg("[TEXDIM]", formatted_dims);
                 result = false;
             }
@@ -1155,9 +1155,9 @@ void LLFloaterTexturePicker::setDimentionsLimits(S32 max_dim, S32 min_dim)
     mMaxDim = max_dim;
     mMinDim = min_dim;
 
-    std::string formatted_dims = llformat("%d x %d", mMinDim, mMinDim);
+    std::string formatted_dims = llformat("%dx%d", mMinDim, mMinDim);
     mResolutionWarning->setTextArg("[MINTEXDIM]", formatted_dims);
-    formatted_dims = llformat("%d x %d", mMaxDim, mMaxDim);
+    formatted_dims = llformat("%dx%d", mMaxDim, mMaxDim);
     mResolutionWarning->setTextArg("[MAXTEXDIM]", formatted_dims);
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index dc68bd0d4a..771113d989 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -96,7 +96,7 @@
      name="over_limit_lbl"
      visible="false"
      top_delta="0">
-        Selected texture is [TEXDIM], inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
+        Selected texture is [TEXDIM]. Inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
     </text>
     
 <!--  middle: inventory mode -->
-- 
cgit v1.2.3


From 924869900ae2646987ce2a8f0b494345701c50a6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 30 Jun 2023 01:53:39 +0300
Subject: SL-19938 Make sure marketplace removes empty folder it automatically
 moved items from

when folder was recreated into stock fodler
---
 indra/newview/llinventoryfunctions.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 3a53425e43..f813639073 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1825,6 +1825,7 @@ void validate_marketplacelistings(
                 {
                     // Create a new folder
                     const LLUUID parent_uuid = (depth > 2 ? viewer_cat->getParentUUID() : viewer_cat->getUUID());
+                    const LLUUID origin_uuid = viewer_cat->getUUID();
                     LLViewerInventoryItem* viewer_inv_item = gInventory.getItem(items_vector_it->second.back());
                     std::string folder_name = (depth >= 1 ? viewer_cat->getName() : viewer_inv_item->getName());
                     LLFolderType::EType new_folder_type = (items_vector_it->first == default_key ? LLFolderType::FT_NONE : LLFolderType::FT_MARKETPLACE_STOCK);
@@ -1848,7 +1849,7 @@ void validate_marketplacelistings(
                         parent_uuid,
                         new_folder_type,
                         folder_name,
-                        [uuid_vector, cb_result, cb_msg, depth, parent_uuid, notify_observers](const LLUUID &new_category_id)
+                        [uuid_vector, cb_result, cb_msg, depth, parent_uuid, origin_uuid, notify_observers](const LLUUID &new_category_id)
                     {
                         // Move each item to the new folder
                         std::vector<LLUUID>::const_reverse_iterator iter = uuid_vector.rbegin();
@@ -1869,6 +1870,31 @@ void validate_marketplacelistings(
                             iter++;
                         }
 
+                        if (origin_uuid != parent_uuid)
+                        {
+                            // We might have moved last item from a folder, check if it needs to be removed
+                            LLViewerInventoryCategory* cat = gInventory.getCategory(origin_uuid);
+                            if (cat->getDescendentCount() == 0)
+                            {
+                                // Remove previous folder if it ends up empty
+                                if (cb_msg)
+                                {
+                                    std::string indent;
+                                    for (int i = 1; i < depth; i++)
+                                    {
+                                        indent += "    ";
+                                    }
+                                    std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning Delete");
+                                    cb_msg(message, depth, LLError::LEVEL_WARN);
+                                }
+                                gInventory.removeCategory(cat->getUUID());
+                                if (notify_observers)
+                                {
+                                    gInventory.notifyObservers();
+                                }
+                            }
+                        }
+
                         // Next type
                         update_marketplace_category(parent_uuid);
                         update_marketplace_category(new_category_id);
-- 
cgit v1.2.3


From bbcedf9c847f1f768e6c34e74a6a4373b0e7ae24 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 1 Jul 2023 00:20:01 +0300
Subject: SL-19914 Inventory gallery Tab support #2

---
 indra/llui/llscrollbar.cpp             |  4 ++--
 indra/llui/llscrollbar.h               |  4 ++--
 indra/llui/llscrollcontainer.h         |  6 ++++--
 indra/newview/llinventorygallery.cpp   | 20 ++++++++++++++---
 indra/newview/llinventorypanel.cpp     | 39 ++++++++++++++++++++++++++++++++++
 indra/newview/llpanelmaininventory.cpp |  9 --------
 6 files changed, 64 insertions(+), 18 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index 62be0c28e8..735e2d529e 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -188,12 +188,12 @@ void LLScrollbar::setPageSize( S32 page_size )
 	}
 }
 
-BOOL LLScrollbar::isAtBeginning()
+bool LLScrollbar::isAtBeginning() const
 {
 	return mDocPos == 0;
 }
 
-BOOL LLScrollbar::isAtEnd()
+bool LLScrollbar::isAtEnd() const
 {
 	return mDocPos == getDocPosMax();
 }
diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h
index 5f2f490d81..9be9d22db8 100644
--- a/indra/llui/llscrollbar.h
+++ b/indra/llui/llscrollbar.h
@@ -105,8 +105,8 @@ public:
 	bool				setDocPos( S32 pos, BOOL update_thumb = TRUE );
 	S32					getDocPos() const		{ return mDocPos; }
 
-	BOOL				isAtBeginning();
-	BOOL				isAtEnd();
+	bool				isAtBeginning() const;
+	bool				isAtEnd() const;
 
 	// Setting both at once.
 	void				setDocParams( S32 size, S32 pos );
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index c14099dbd5..dacea2a987 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -98,8 +98,10 @@ public:
 	void			pageDown(S32 overlap = 0);
 	void			goToTop();
 	void			goToBottom();
-	bool			isAtTop() { return mScrollbar[VERTICAL]->isAtBeginning(); }
-	bool			isAtBottom() { return mScrollbar[VERTICAL]->isAtEnd(); }
+	bool			isAtTop() const { return mScrollbar[VERTICAL]->isAtBeginning(); }
+	bool			isAtBottom() const { return mScrollbar[VERTICAL]->isAtEnd(); }
+    S32             getDocPosVertical() const { return mScrollbar[VERTICAL]->getDocPos(); }
+    S32             getDocPosHorizontal() const { return mScrollbar[HORIZONTAL]->getDocPos(); }
 	S32				getBorderWidth() const;
 
 	// LLView functionality
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index fa50261c9b..271cc3e037 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1254,12 +1254,26 @@ void LLInventoryGallery::onFocusReceived()
     // inventory now handles cut/copy/paste/delete
     gEditMenuHandler = this;
 
-    LLPanel::onFocusReceived();
-
+    // Tab support, when tabbing into this view, select first item
     if (mSelectedItemID.notNull() && mItemMap[mSelectedItemID])
     {
-        mItemMap[mSelectedItemID]->setSelected(true);
+        LLInventoryGalleryItem* focus_item = mItemMap[mSelectedItemID];
+        focus_item->setSelected(true);
+        focus_item->setFocus(TRUE);
     }
+    else if (mIndexToItemMap.size() > 0)
+    {
+        // choose any items from visible rect
+        S32 vert_offset = mScrollPanel->getDocPosVertical();
+        S32 panel_size = mVerticalGap + mRowPanelHeight;
+        S32 n = llclamp((S32)(vert_offset / panel_size) * mItemsInRow, 0, (S32)(mIndexToItemMap.size() - 1) );
+
+        LLInventoryGalleryItem* focus_item = mIndexToItemMap[n];
+        changeItemSelection(focus_item->getUUID(), true);
+        focus_item->setFocus(TRUE);
+    }
+
+    LLPanel::onFocusReceived();
 }
 
 void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 95f15c9c55..54f91451ac 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1449,6 +1449,45 @@ void LLInventoryPanel::onFocusReceived()
 	// inventory now handles cut/copy/paste/delete
 	LLEditMenuHandler::gEditMenuHandler = mFolderRoot.get();
 
+    // Tab support, when tabbing into this view, select first item
+    // (ideally needs to account for scroll)
+    bool select_first = mSelectThisID.isNull() && mFolderRoot.get() && mFolderRoot.get()->getSelectedCount() == 0;
+
+    if (select_first)
+    {
+        LLFolderViewFolder::folders_t::const_iterator folders_it = mFolderRoot.get()->getFoldersBegin();
+        LLFolderViewFolder::folders_t::const_iterator folders_end = mFolderRoot.get()->getFoldersEnd();
+
+        for (; folders_it != folders_end; ++folders_it)
+        {
+            const LLFolderViewFolder* folder_view = *folders_it;
+            if (folder_view->getVisible())
+            {
+                const LLFolderViewModelItemInventory* modelp = static_cast<const LLFolderViewModelItemInventory*>(folder_view->getViewModelItem());
+                setSelectionByID(modelp->getUUID(), TRUE);
+                select_first = false;
+                break;
+            }
+        }
+    }
+
+    if (select_first)
+    {
+        LLFolderViewFolder::items_t::const_iterator items_it = mFolderRoot.get()->getItemsBegin();
+        LLFolderViewFolder::items_t::const_iterator items_end = mFolderRoot.get()->getItemsEnd();
+
+        for (; items_it != items_end; ++items_it)
+        {
+            const LLFolderViewItem* item_view = *items_it;
+            if (item_view->getVisible())
+            {
+                const LLFolderViewModelItemInventory* modelp = static_cast<const LLFolderViewModelItemInventory*>(item_view->getViewModelItem());
+                setSelectionByID(modelp->getUUID(), TRUE);
+                break;
+            }
+        }
+    }
+
 	LLPanel::onFocusReceived();
 }
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 27c8f10889..b63d6b9308 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2322,20 +2322,11 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked)
 
 void LLPanelMainInventory::onCombinationGallerySelectionChanged(const LLUUID& category_id)
 {
-    if(category_id != LLUUID::null)
-    {
-        mCombinationInventoryPanel->unSelectAll();
-    }
 }
 
 void LLPanelMainInventory::onCombinationInventorySelectionChanged(const std::deque<LLFolderViewItem*>& items, BOOL user_action)
 {
     onSelectionChange(mCombinationInventoryPanel, items, user_action);
-
-    if(!items.empty())
-    {
-        mCombinationGalleryPanel->clearSelection();
-    }
 }
 
 void LLPanelMainInventory::updatePanelVisibility()
-- 
cgit v1.2.3


From 35d68ce7373812d5ab028505ed035a4678da3ec9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 1 Jul 2023 00:46:02 +0300
Subject: SL-19914 Inventory gallery Tab support #3

Don't try to select something if we are waiting for an item
---
 indra/newview/llinventorygallery.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 271cc3e037..75df5c1043 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1261,7 +1261,7 @@ void LLInventoryGallery::onFocusReceived()
         focus_item->setSelected(true);
         focus_item->setFocus(TRUE);
     }
-    else if (mIndexToItemMap.size() > 0)
+    else if (mIndexToItemMap.size() > 0 && mItemToSelect.isNull())
     {
         // choose any items from visible rect
         S32 vert_offset = mScrollPanel->getDocPosVertical();
-- 
cgit v1.2.3


From d3233e787aaf1ba0558a714d5216ea70c7249c36 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 3 Jul 2023 23:29:01 +0300
Subject: SL-19929 New inventory feature notification should appear on top

---
 indra/newview/llagent.cpp                         |  7 ++++++-
 indra/newview/llfloaternewfeaturenotification.cpp | 21 +++++++++++++--------
 indra/newview/llfloaternewfeaturenotification.h   | 12 ++++++------
 3 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 2430ca5f83..8574134032 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -582,7 +582,12 @@ void LLAgent::showLatestFeatureNotification()
     S32 feature_version = gSavedSettings.getS32("LastUIFeatureVersion");
     if (feature_version < UI_FEATURE_VERSION)
     {
-        LLFloaterReg::showInstance("new_feature_notification");
+        // Need to open on top even if called from onOpen,
+        // do on idle to make sure it's on top
+        doOnIdleOneTime([]()
+                        {
+                            LLFloaterReg::showInstance("new_feature_notification");
+                        });
         gSavedSettings.setS32("LastUIFeatureVersion", UI_FEATURE_VERSION);
     }
 }
diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
index e04b1a5da5..7c3fe8cdc8 100644
--- a/indra/newview/llfloaternewfeaturenotification.cpp
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -30,7 +30,7 @@
 
 
 LLFloaterNewFeatureNotification::LLFloaterNewFeatureNotification(const LLSD& key)
-	:	LLFloater(key)
+  : LLFloater(key)
 {
 }
 
@@ -40,24 +40,29 @@ LLFloaterNewFeatureNotification::~LLFloaterNewFeatureNotification()
 
 BOOL LLFloaterNewFeatureNotification::postBuild()
 {
-	setCanDrag(FALSE);
-	getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterNewFeatureNotification::onCloseBtn, this));
-	return TRUE;
+    setCanDrag(FALSE);
+    getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterNewFeatureNotification::onCloseBtn, this));
+    return TRUE;
 }
 
 void LLFloaterNewFeatureNotification::onOpen(const LLSD& key)
 {
-	centerOnScreen();
+    centerOnScreen();
 }
 
 void LLFloaterNewFeatureNotification::onCloseBtn()
 {
-	closeFloater();
+    closeFloater();
 }
 
 void LLFloaterNewFeatureNotification::centerOnScreen()
 {
-	LLVector2 window_size = LLUI::getInstance()->getWindowSize();
-	centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY])));
+    LLVector2 window_size = LLUI::getInstance()->getWindowSize();
+    centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY])));
+    LLFloaterView* parent = dynamic_cast<LLFloaterView*>(getParent());
+    if (parent)
+    {
+        parent->bringToFront(this);
+    }
 }
 
diff --git a/indra/newview/llfloaternewfeaturenotification.h b/indra/newview/llfloaternewfeaturenotification.h
index 86e9683def..95501451dc 100644
--- a/indra/newview/llfloaternewfeaturenotification.h
+++ b/indra/newview/llfloaternewfeaturenotification.h
@@ -30,20 +30,20 @@
 #include "llfloater.h"
 
 class LLFloaterNewFeatureNotification:
-	public LLFloater
+    public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 public:
-	BOOL postBuild() override;
-	void onOpen(const LLSD& key) override;
+    BOOL postBuild() override;
+    void onOpen(const LLSD& key) override;
 
 private:
     LLFloaterNewFeatureNotification(const LLSD& key);
     /*virtual*/	~LLFloaterNewFeatureNotification();
 
-	void centerOnScreen();
+    void centerOnScreen();
 
-	void onCloseBtn();	
+    void onCloseBtn();	
 };
 
 #endif
-- 
cgit v1.2.3


From 7df2aedb6f6704c903075f804d3cd432b3b05e2c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 5 Jul 2023 13:51:54 +0300
Subject: Reverted changes to installer_template.msi introduced by PR #259

Changes do not appear to add anything sans mac's line ending which triggers coding policy protection and shouldn't be present in window's installer file.
---
 .../installers/windows/installer_template.nsi      | 1804 ++++++++++----------
 1 file changed, 902 insertions(+), 902 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 6bcce93704..ed37f541c8 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -1,902 +1,902 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Second Life setup.nsi
-;; Copyright 2004-2015, Linden Research, Inc.
-;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation;
-;; version 2.1 of the License only.
-;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-;;
-;; Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-;;
-;; NSIS 3 or higher required for Unicode support
-;;
-;; Author: James Cook, TankMaster Finesmith, Don Kjer, Callum Prentice
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Compiler flags
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Unicode true
-SetOverwrite on				# Overwrite files
-SetCompress auto			# Compress if saves space
-SetCompressor /solid lzma	# Compress whole installer as one block
-SetDatablockOptimize off	# Only saves us 0.1%, not worth it
-XPStyle on                  # Add an XP manifest to the installer
-RequestExecutionLevel admin	# For when we write to Program Files
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Project flags
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-# This placeholder is replaced by viewer_manifest.py
-%%VERSION%%
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; - language files - one for each language (or flavor thereof)
-;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 
-;; application directory so we have to add a path to these include files)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Ansariel notes: "Under certain circumstances the installer will fall back
-;; to the first defined (aka default) language version. So you want to include
-;; en-us as first language file."
-!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"
-
-# Danish and Polish no longer supported by the viewer itself
-##!include "%%SOURCE%%\installers\windows\lang_da.nsi"
-!include "%%SOURCE%%\installers\windows\lang_de.nsi"
-!include "%%SOURCE%%\installers\windows\lang_es.nsi"
-!include "%%SOURCE%%\installers\windows\lang_fr.nsi"
-!include "%%SOURCE%%\installers\windows\lang_ja.nsi"
-!include "%%SOURCE%%\installers\windows\lang_it.nsi"
-##!include "%%SOURCE%%\installers\windows\lang_pl.nsi"
-!include "%%SOURCE%%\installers\windows\lang_pt-br.nsi"
-!include "%%SOURCE%%\installers\windows\lang_ru.nsi"
-!include "%%SOURCE%%\installers\windows\lang_tr.nsi"
-!include "%%SOURCE%%\installers\windows\lang_zh.nsi"
-
-# *TODO: Move these into the language files themselves
-##LangString LanguageCode ${LANG_DANISH}   "da"
-LangString LanguageCode ${LANG_GERMAN}   "de"
-LangString LanguageCode ${LANG_ENGLISH}  "en"
-LangString LanguageCode ${LANG_SPANISH}  "es"
-LangString LanguageCode ${LANG_FRENCH}   "fr"
-LangString LanguageCode ${LANG_JAPANESE} "ja"
-LangString LanguageCode ${LANG_ITALIAN}  "it"
-##LangString LanguageCode ${LANG_POLISH}   "pl"
-LangString LanguageCode ${LANG_PORTUGUESEBR} "pt"
-LangString LanguageCode ${LANG_RUSSIAN}  "ru"
-LangString LanguageCode ${LANG_TURKISH}  "tr"
-LangString LanguageCode ${LANG_TRADCHINESE}  "zh"
-
-# This placeholder is replaced by viewer_manifest.py
-%%INST_VARS%%
-
-Name ${INSTNAME}
-
-SubCaption 0 $(LicenseSubTitleSetup)	# Override "license agreement" text
-
-!define MUI_ICON   "%%SOURCE%%\installers\windows\install_icon.ico"
-!define MUI_UNICON "%%SOURCE%%\installers\windows\uninstall_icon.ico"
-
-BrandingText " "						# Bottom of window text
-Icon          "${MUI_ICON}"
-UninstallIcon "${MUI_UNICON}"
-WindowIcon on							# Show our icon in left corner
-BGGradient off							# No big background window
-CRCCheck on								# Make sure CRC is OK
-InstProgressFlags smooth colored		# New colored smooth look
-SetOverwrite on							# Overwrite files by default
-AutoCloseWindow true					# After all files install, close window
-
-# Registry key paths, ours and Microsoft's
-!define LINDEN_KEY      "SOFTWARE\Linden Research, Inc."
-!define INSTNAME_KEY    "${LINDEN_KEY}\${INSTNAME}"
-!define MSCURRVER_KEY   "SOFTWARE\Microsoft\Windows\CurrentVersion"
-!define MSNTCURRVER_KEY "SOFTWARE\Microsoft\Windows NT\CurrentVersion"
-!define MSUNINSTALL_KEY "${MSCURRVER_KEY}\Uninstall\${INSTNAME}"
-
-# from http://nsis.sourceforge.net/Docs/MultiUser/Readme.html
-### Highest level permitted for user: Admin for Admin, Standard for Standard
-##!define MULTIUSER_EXECUTIONLEVEL Highest
-!define MULTIUSER_EXECUTIONLEVEL Admin
-!define MULTIUSER_MUI
-### Look for /AllUsers or /CurrentUser switches
-##!define MULTIUSER_INSTALLMODE_COMMANDLINE
-# appended to $PROGRAMFILES, as affected by MULTIUSER_USE_PROGRAMFILES64
-!define MULTIUSER_INSTALLMODE_INSTDIR "${INSTNAME}"
-# expands to !define MULTIUSER_USE_PROGRAMFILES64 or nothing
-%%PROGRAMFILES%%
-# should make MultiUser.nsh initialization read existing INSTDIR from registry
-## SL-10506: don't
-##!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${INSTNAME_KEY}"
-##!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
-# Don't set MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY and
-# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME to cause the installer to
-# write $MultiUser.InstallMode to the registry, because when the user installs
-# multiple viewers with the same channel (same ${INSTNAME}, hence same
-# ${INSTNAME_KEY}), the registry entry is overwritten. Instead we'll write a
-# little file into the install directory -- see .onInstSuccess and un.onInit.
-!include MultiUser.nsh
-!include MUI2.nsh
-!define MUI_BGCOLOR FFFFFF
-!insertmacro MUI_FUNCTION_GUIINIT
-
-UninstallText $(UninstallTextMsg)
-DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
-##!insertmacro MULTIUSER_PAGE_INSTALLMODE
-!define MUI_PAGE_CUSTOMFUNCTION_PRE dirPre
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Variables
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Var INSTNAME
-Var INSTEXE
-Var VIEWER_EXE
-Var INSTSHORTCUT
-Var COMMANDLINE         # Command line passed to this installer, set in .onInit
-Var SHORTCUT_LANG_PARAM # "--set InstallLanguage de", Passes language to viewer
-Var SKIP_DIALOGS        # Set from command line in  .onInit. autoinstall GUI and the defaults.
-Var SKIP_AUTORUN		# Skip automatic launch of the viewer after install
-Var DO_UNINSTALL_V2     # If non-null, path to a previous Viewer 2 installation that will be uninstalled.
-
-# Function definitions should go before file includes, because calls to
-# DLLs like LangDLL trigger an implicit file include, so if that call is at
-# the end of this script NSIS has to decompress the whole installer before 
-# it can call the DLL function. JC
-
-!include "FileFunc.nsh"     # For GetParameters, GetOptions
-!insertmacro GetParameters
-!insertmacro GetOptions
-!include WinVer.nsh			# For OS and SP detection
-!include 'LogicLib.nsh'     # for value comparison
-!include "x64.nsh"			# for 64bit detection
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Pre-directory page callback
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function dirPre
-    StrCmp $SKIP_DIALOGS "true" 0 +2
-	Abort
-
-FunctionEnd    
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Prep Installer Section
-;;
-;; Note: to add new languages, add a language file include to the list 
-;; at the top of this file, add an entry to the menu and then add an 
-;; entry to the language ID selector below
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function .onInit
-!insertmacro MULTIUSER_INIT
-
-%%ENGAGEREGISTRY%%
-
-# SL-10506: Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and
-# MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should
-# read the current location of the install for this version into INSTDIR.
-# However, SL-10506 complains about the resulting behavior, so the logic below
-# is adapted from before we introduced MultiUser.nsh.
-
-# if $0 is empty, this is the first time for this viewer name
-ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" ""
-
-# viewer with this name was installed before
-${If} $0 != ""
-	# use the value we got from registry as install location
-    StrCpy $INSTDIR $0
-${EndIf}
-
-Call CheckCPUFlags							# Make sure we have SSE2 support
-Call CheckWindowsVersion					# Don't install On unsupported systems
-    Push $0
-    ${GetParameters} $COMMANDLINE			# Get our command line
-
-    ${GetOptions} $COMMANDLINE "/SKIP_DIALOGS" $0   
-    IfErrors +2 0	# If error jump past setting SKIP_DIALOGS
-        StrCpy $SKIP_DIALOGS "true"
-
-	${GetOptions} $COMMANDLINE "/SKIP_AUTORUN" $0
-	IfErrors +2 0 ; If error jump past setting SKIP_AUTORUN
-		StrCpy $SKIP_AUTORUN "true"
-
-    ${GetOptions} $COMMANDLINE "/LANGID=" $0	# /LANGID=1033 implies US English
-
-# If no language (error), then proceed
-    IfErrors lbl_configure_default_lang
-# No error means we got a language, so use it
-    StrCpy $LANGUAGE $0
-    Goto lbl_return
-
-lbl_configure_default_lang:
-# If we currently have a version of SL installed, default to the language of that install
-# Otherwise don't change $LANGUAGE and it will default to the OS UI language.
-    ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage"
-    IfErrors +2 0	# If error skip the copy instruction 
-	StrCpy $LANGUAGE $0
-
-# For silent installs, no language prompt, use default
-    IfSilent 0 +3
-    StrCpy $SKIP_AUTORUN "true"
-    Goto lbl_return
-    StrCmp $SKIP_DIALOGS "true" lbl_return
-  
-	Push ""
-# Use separate file so labels can be UTF-16 but we can still merge changes into this ASCII file. JC
-    !include "%%SOURCE%%\installers\windows\language_menu.nsi"
-    
-	Push A	# A means auto count languages for the auto count to work the first empty push (Push "") must remain
-	LangDLL::LangDialog $(InstallerLanguageTitle) $(SelectInstallerLanguage)
-	Pop $0
-	StrCmp $0 "cancel" 0 +2
-		Abort
-    StrCpy $LANGUAGE $0
-
-# Save language in registry		
-	WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage" $LANGUAGE
-lbl_return:
-    Pop $0
-    Return
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Prep Uninstaller Section
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.onInit
-    # Save $INSTDIR -- it appears to have the correct value before
-    # MULTIUSER_UNINIT, but then gets munged by MULTIUSER_UNINIT?!
-    Push $INSTDIR
-    !insertmacro MULTIUSER_UNINIT
-    Pop $INSTDIR
-
-    # Now read InstallMode.txt from $INSTDIR
-    Push $0
-    ClearErrors
-    FileOpen $0 "$INSTDIR\InstallMode.txt" r
-    IfErrors skipread
-    FileRead $0 $MultiUser.InstallMode
-    FileClose $0
-skipread:
-    Pop $0
-
-%%ENGAGEREGISTRY%%
-
-# Read language from registry and set for uninstaller. Key will be removed on successful uninstall
-	ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage"
-    IfErrors lbl_end
-	StrCpy $LANGUAGE $0
-lbl_end:
-
-##  MessageBox MB_OK "After restoring:$\n$$INSTDIR = '$INSTDIR'$\n$$MultiUser.InstallMode = '$MultiUser.InstallMode'$\n$$LANGUAGE = '$LANGUAGE'"
-
-    Return
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Checks for CPU valid (must have SSE2 support)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckCPUFlags
-    Push $1
-    System::Call 'kernel32::IsProcessorFeaturePresent(i) i(10) .r1'
-    IntCmp $1 1 OK_SSE2
-    MessageBox MB_OKCANCEL $(MissingSSE2) /SD IDOK IDOK OK_SSE2
-    Quit
-
-  OK_SSE2:
-    Pop $1
-    Return
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Make sure this computer meets the minimum system requirements.
-;; Currently: Windows Vista SP2
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckWindowsVersion
-  ${If} ${AtMostWin2003}
-    MessageBox MB_OK $(CheckWindowsVersionMB)
-    Quit
-  ${EndIf}
-
-  ${If} ${IsWinVista}
-  ${AndIfNot} ${IsServicePack} 2
-    MessageBox MB_OK $(CheckWindowsVersionMB)
-    Quit
-  ${EndIf}
-
-  ${If} ${IsWin2008}
-  ${AndIfNot} ${IsServicePack} 2
-    MessageBox MB_OK $(CheckWindowsVersionMB)
-    Quit
-  ${EndIf}
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Install Section
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Section ""
-
-# SetShellVarContext is set by MultiUser.nsh initialization.
-
-# Start with some default values.
-StrCpy $INSTNAME "${INSTNAME}"
-StrCpy $INSTEXE "${INSTEXE}"
-StrCpy $VIEWER_EXE "${VIEWER_EXE}"
-StrCpy $INSTSHORTCUT "${SHORTCUT}"
-
-Call CheckIfAdministrator		# Make sure the user can install/uninstall
-Call CloseSecondLife			# Make sure Second Life not currently running
-Call CheckWillUninstallV2		# Check if Second Life is already installed
-
-StrCmp $DO_UNINSTALL_V2 "" PRESERVE_DONE
-PRESERVE_DONE:
-
-# Viewer had "SLLauncher" for some time and we was seting "IsHostApp" for viewer, make sure to clean it up
-DeleteRegValue HKEY_CLASSES_ROOT "Applications\$VIEWER_EXE" "IsHostApp"
-DeleteRegValue HKEY_CLASSES_ROOT "Applications\$VIEWER_EXE" "NoStartPage"
-ClearErrors
-
-INSTALL_FILES_START:
-
-Call RemoveProgFilesOnInst		# Remove existing files to prevent certain errors when running the new version of the viewer
-
-# This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
-%%INSTALL_FILES%%
-
-IfErrors 0 INSTALL_FILES_DONE
-  StrCmp $SKIP_DIALOGS "true" INSTALL_FILES_DONE
-	MessageBox MB_ABORTRETRYIGNORE $(ErrorSecondLifeInstallRetry) IDABORT INSTALL_FILES_CANCEL IDRETRY INSTALL_FILES_START
-    # MB_ABORTRETRYIGNORE does not accept IDIGNORE
-    Goto INSTALL_FILES_DONE
-
-INSTALL_FILES_CANCEL:
-  # We are quiting, cleanup.
-  # Silence warnings from RemoveProgFilesOnInst.
-  StrCpy $SKIP_DIALOGS "true"
-  Call RemoveProgFilesOnInst
-  MessageBox MB_OK $(ErrorSecondLifeInstallSupport)
-  Quit
-
-INSTALL_FILES_DONE:
-
-# Pass the installer's language to the client to use as a default
-StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"
-
-# Shortcuts in start menu
-CreateDirectory	"$SMPROGRAMS\$INSTSHORTCUT"
-SetOutPath "$INSTDIR"
-CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \
-				"$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE"
-
-
-WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Create Account.url" \
-				"InternetShortcut" "URL" \
-				"http://join.secondlife.com/"
-WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \
-				"InternetShortcut" "URL" \
-				"http://www.secondlife.com/account/"
-WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.url" \
-				"InternetShortcut" "URL" \
-                "http://wiki.secondlife.com/wiki/LSL_Portal"
-CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
-				'"$INSTDIR\uninst.exe"' ''
-
-# Other shortcuts
-SetOutPath "$INSTDIR"
-CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \
-        "$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE"
-CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \
-        "$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE"
-CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
-				'"$INSTDIR\uninst.exe"' ''
-
-# Write registry
-WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "" "$INSTDIR"
-WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Version" "${VERSION_LONG}"
-WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Shortcut" "$INSTSHORTCUT"
-WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Exe" "$VIEWER_EXE"
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "Publisher" "Linden Research, Inc."
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLInfoAbout" "http://secondlife.com/whatis/"
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLUpdateInfo" "http://secondlife.com/support/downloads/"
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "HelpLink" "https://support.secondlife.com/contact-support/"
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayName" "$INSTNAME"
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "UninstallString" '"$INSTDIR\uninst.exe"'
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayVersion" "${VERSION_LONG}"
-WriteRegDWORD SHELL_CONTEXT "${MSUNINSTALL_KEY}" "EstimatedSize" "0x0001D500"		# ~117 MB
-
-# from FS:Ansariel
-WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayIcon" '"$INSTDIR\$VIEWER_EXE"'
-
-# BUG-2707 Disable SEHOP for installed viewer.
-WriteRegDWORD SHELL_CONTEXT "${MSNTCURRVER_KEY}\Image File Execution Options\$VIEWER_EXE" "DisableExceptionChainValidation" 1
-
-# Write URL registry info
-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"
-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""
-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
-
-# URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
-# MAINT-8305: On SLURL click, directly invoke the viewer, not the launcher.
-WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
-WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "(default)" "URL:Second Life"
-WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""
-WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
-
-# URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
-WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
-
-WriteRegStr HKEY_CLASSES_ROOT "Applications\$INSTEXE" "IsHostApp" ""
-##WriteRegStr HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}" "NoStartPage" ""
-
-# Write out uninstaller
-WriteUninstaller "$INSTDIR\uninst.exe"
-
-# Uninstall existing "Second Life Viewer 2" install if needed.
-StrCmp $DO_UNINSTALL_V2 "" REMOVE_SLV2_DONE
-  ExecWait '"$PROGRAMFILES\SecondLifeViewer2\uninst.exe" /S _?=$PROGRAMFILES\SecondLifeViewer2'
-  Delete "$PROGRAMFILES\SecondLifeViewer2\uninst.exe"	# With _? option above, uninst.exe will be left behind.
-  RMDir "$PROGRAMFILES\SecondLifeViewer2"	# Will remove only if empty.
-
-REMOVE_SLV2_DONE:
-
-SectionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Uninstall Section
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Section Uninstall
-
-# Start with some default values.
-StrCpy $INSTNAME "${INSTNAME}"
-StrCpy $INSTEXE "${INSTEXE}"
-StrCpy $VIEWER_EXE "${VIEWER_EXE}"
-StrCpy $INSTSHORTCUT "${SHORTCUT}"
-
-# SetShellVarContext per the mode saved at install time in registry at
-# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY
-# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME
-# Couldn't get NSIS to expand $MultiUser.InstallMode into the function name at Call time
-${If} $MultiUser.InstallMode == 'AllUsers'
-##MessageBox MB_OK "Uninstalling for all users"
-  Call un.MultiUser.InstallMode.AllUsers
-${Else}
-##MessageBox MB_OK "Uninstalling for current user"
-  Call un.MultiUser.InstallMode.CurrentUser
-${EndIf}
-
-# Make sure we're not running
-Call un.CloseSecondLife
-
-# Clean up registry keys and subkeys (these should all be !defines somewhere)
-DeleteRegKey SHELL_CONTEXT "${INSTNAME_KEY}"
-DeleteRegKey SHELL_CONTEXT "${MSCURRVER_KEY}\Uninstall\$INSTNAME"
-# BUG-2707 Remove entry that disabled SEHOP
-DeleteRegKey SHELL_CONTEXT "${MSNTCURRVER_KEY}\Image File Execution Options\$VIEWER_EXE"
-DeleteRegKey HKEY_CLASSES_ROOT "Applications\$INSTEXE"
-DeleteRegKey HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}"
-
-# Clean up shortcuts
-Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"
-RMDir  "$SMPROGRAMS\$INSTSHORTCUT"
-
-Delete "$DESKTOP\$INSTSHORTCUT.lnk"
-Delete "$INSTDIR\$INSTSHORTCUT.lnk"
-Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"
-
-# Remove the main installation directory
-Call un.ProgramFiles
-
-# Clean up cache and log files, but leave them in-place for non AGNI installs.
-Call un.UserSettingsFiles
-
-SectionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Make sure the user can install/uninstall
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckIfAdministrator
-    DetailPrint $(CheckAdministratorInstDP)
-    UserInfo::GetAccountType
-    Pop $R0
-    StrCmp $R0 "Admin" lbl_is_admin
-        MessageBox MB_OK $(CheckAdministratorInstMB)
-        Quit
-lbl_is_admin:
-    Return
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Function CheckWillUninstallV2               
-;;
-;; If called through auto-update, need to uninstall any existing V2 installation.
-;; Don't want to end up with SecondLifeViewer2 and SecondLifeViewer installations
-;;  existing side by side with no indication on which to use.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckWillUninstallV2
-
-  StrCpy $DO_UNINSTALL_V2 ""
-
-  StrCmp $SKIP_DIALOGS "true" 0 CHECKV2_DONE
-  StrCmp $INSTDIR "$PROGRAMFILES\SecondLifeViewer2" CHECKV2_DONE	# Don't uninstall our own install dir.
-  IfFileExists "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" CHECKV2_FOUND CHECKV2_DONE
-
-CHECKV2_FOUND:
-  StrCpy $DO_UNINSTALL_V2 "true"
-
-CHECKV2_DONE:
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Close the program, if running. Modifies no variables.
-;; Allows user to bail out of install process.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CloseSecondLife
-  Push $0
-  FindWindow $0 "Second Life" ""
-  IntCmp $0 0 DONE
-  
-  StrCmp $SKIP_DIALOGS "true" CLOSE
-    MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
-
-  CANCEL_INSTALL:
-    Quit
-
-  CLOSE:
-    DetailPrint $(CloseSecondLifeInstDP)
-    SendMessage $0 16 0 0
-
-  LOOP:
-	  FindWindow $0 "Second Life" ""
-	  IntCmp $0 0 SLEEP
-	  Sleep 500
-	  Goto LOOP
-	  
-  SLEEP:
-    # Second life window just closed, but program might not be fully done yet
-    # and OS might have not released some locks, wait a bit more to make sure
-    # all file handles were released.
-	# If something still isn't unlocked, it will trigger a notification from
-	# RemoveProgFilesOnInst
-    Sleep 1000
-  DONE:
-    Pop $0
-    Return
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Close the program, if running. Modifies no variables.
-;; Allows user to bail out of uninstall process.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.CloseSecondLife
-  Push $0
-  FindWindow $0 "Second Life" ""
-  IntCmp $0 0 DONE
-  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
-
-  CANCEL_UNINSTALL:
-    Quit
-
-  CLOSE:
-    DetailPrint $(CloseSecondLifeUnInstDP)
-    SendMessage $0 16 0 0
-
-  LOOP:
-	  FindWindow $0 "Second Life" ""
-	  IntCmp $0 0 DONE
-	  Sleep 500
-	  Goto LOOP
-
-  DONE:
-    Pop $0
-    Return
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Delete files on install if previous install exists to prevent undesired behavior
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function RemoveProgFilesOnInst
-
-# We do not remove whole pervious install folder on install, since
-# there is a chance that viewer was installed into some important
-# folder by intent or accident
-# RMDir /r $INSTDIR is especially unsafe if user installed somewhere
-# like Program Files
-
-# Set retry counter. All integers are strings.
-Push $0
-StrCpy $0 0
-
-ClearErrors
-
-PREINSTALL_REMOVE:
-
-# Remove old SecondLife.exe to invalidate any old shortcuts to it that may be in non-standard locations. See MAINT-3575
-Delete "$INSTDIR\$INSTEXE"
-Delete "$INSTDIR\$VIEWER_EXE"
-
-# Remove old shader files first so fallbacks will work. See DEV-5663
-RMDir /r "$INSTDIR\app_settings\shaders"
-
-# Remove folders to clean up files removed during development
-RMDir /r "$INSTDIR\app_settings"
-RMDir /r "$INSTDIR\skins"
-RMDir /r "$INSTDIR\vmp_icons"
-
-# Remove llplugin, plugins can crash or malfunction if they
-# find modules from different versions
-RMDir /r "$INSTDIR\llplugin"
-
-IntOp $0 $0 + 1
-
-IfErrors 0 PREINSTALL_DONE
-  IntCmp $0 1 PREINSTALL_REMOVE #try again once
-    StrCmp $SKIP_DIALOGS "true" PREINSTALL_DONE
-      MessageBox MB_ABORTRETRYIGNORE $(CloseSecondLifeInstRM) IDABORT PREINSTALL_FAIL IDRETRY PREINSTALL_REMOVE
-      # MB_ABORTRETRYIGNORE does not accept IDIGNORE
-      Goto PREINSTALL_DONE
-
-PREINSTALL_FAIL:
-    Quit
-
-PREINSTALL_DONE:
-
-# We are no longer including release notes with the viewer, so remove them.
-Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
-Delete "$INSTDIR\releasenotes.txt"
-
-Pop $0
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Delete files in \Users\<User>\AppData\
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.UserSettingsFiles
-
-StrCmp $DO_UNINSTALL_V2 "true" Keep			# Don't remove user's settings files on auto upgrade
-
-# Ask if user wants to keep data files or not
-MessageBox MB_YESNO|MB_ICONQUESTION $(RemoveDataFilesMB) IDYES Remove IDNO Keep
-
-Remove:
-Push $0
-Push $1
-Push $2
-
-  DetailPrint "Deleting Second Life data files"
-
-  StrCpy $0 0	# Index number used to iterate via EnumRegKey
-
-  LOOP:
-    EnumRegKey $1 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList" $0
-    StrCmp $1 "" DONE               # No more users
-
-    ReadRegStr $2 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList\$1" "ProfileImagePath" 
-    StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing
-
-# Required since ProfileImagePath is of type REG_EXPAND_SZ
-    ExpandEnvStrings $2 $2
-
-# Delete files in \Users\<User>\AppData\Roaming\SecondLife
-# Remove all settings files but leave any other .txt files to preserve the chat logs
-;    RMDir /r "$2\AppData\Roaming\SecondLife\logs"
-    RMDir /r "$2\AppData\Roaming\SecondLife\browser_profile"
-    RMDir /r "$2\AppData\Roaming\SecondLife\user_settings"
-    Delete  "$2\AppData\Roaming\SecondLife\*.xml"
-    Delete  "$2\AppData\Roaming\SecondLife\*.bmp"
-    Delete  "$2\AppData\Roaming\SecondLife\search_history.txt"
-    Delete  "$2\AppData\Roaming\SecondLife\plugin_cookies.txt"
-    Delete  "$2\AppData\Roaming\SecondLife\typed_locations.txt"
-# Delete files in \Users\<User>\AppData\Local\SecondLife
-    RmDir /r  "$2\AppData\Local\SecondLife"							#Delete the cache folder
-
-  CONTINUE:
-    IntOp $0 $0 + 1
-    Goto LOOP
-  DONE:
-
-Pop $2
-Pop $1
-Pop $0
-
-# Delete files in ProgramData\Secondlife
-Push $0
-  ReadRegStr $0 SHELL_CONTEXT "${MSCURRVER_KEY}\Explorer\Shell Folders" "Common AppData"
-  StrCmp $0 "" +2
-  RMDir /r "$0\SecondLife"
-Pop $0
-
-Keep:
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Delete the installed files
-;; This deletes the uninstall executable, but it works because it is copied to temp directory before running
-;;
-;; Note:  You must list all files here, because we only want to delete our files,
-;; not things users left in the program directory.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.ProgramFiles
-
-# This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py
-%%DELETE_FILES%%
-
-# our InstallMode.txt
-Delete "$INSTDIR\InstallMode.txt"
-
-# Optional/obsolete files.  Delete won't fail if they don't exist.
-Delete "$INSTDIR\autorun.bat"
-Delete "$INSTDIR\dronesettings.ini"
-Delete "$INSTDIR\message_template.msg"
-Delete "$INSTDIR\newview.pdb"
-Delete "$INSTDIR\newview.map"
-Delete "$INSTDIR\SecondLife.pdb"
-Delete "$INSTDIR\SecondLife.map"
-Delete "$INSTDIR\comm.dat"
-Delete "$INSTDIR\*.glsl"
-Delete "$INSTDIR\motions\*.lla"
-Delete "$INSTDIR\trial\*.html"
-Delete "$INSTDIR\newview.exe"
-Delete "$INSTDIR\SecondLife.exe"
-
-# MAINT-3099 workaround - prevent these log files, if present, from causing a user alert
-Delete "$INSTDIR\VivoxVoiceService-*.log"
-
-# Remove entire help directory
-RMDir /r  "$INSTDIR\help"
-
-Delete "$INSTDIR\uninst.exe"
-RMDir "$INSTDIR"
-
-IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER
-
-FOLDERFOUND:
-  MessageBox MB_OK $(DeleteProgramFilesMB) /SD IDOK IDOK NOFOLDER
-
-NOFOLDER:
-
-MessageBox MB_YESNO $(DeleteRegistryKeysMB) IDYES DeleteKeys IDNO NoDelete
-
-DeleteKeys:
-  DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\x-grid-location-info"
-  DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\secondlife"
-  DeleteRegKey HKEY_CLASSES_ROOT "x-grid-location-info"
-  DeleteRegKey HKEY_CLASSES_ROOT "secondlife"
-
-NoDelete:
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; After install completes, launch app
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function .onInstSuccess
-        Push $0
-        FileOpen $0 "$INSTDIR\InstallMode.txt" w
-        # No newline -- this is for our use, not for users to read.
-        FileWrite $0 "$MultiUser.InstallMode"
-        FileClose $0
-        Pop $0
-
-        Push $R0
-        Push $0
-        ;; MAINT-7812: Only write nsis.winstall file with /marker switch
-        ${GetParameters} $R0
-        ${GetOptionsS} $R0 "/marker" $0
-        ;; If no /marker switch, skip to ClearErrors
-        IfErrors +4 0
-        ;; $EXEDIR is where we find the installer file
-        ;; Put a marker file there so VMP will know we're done
-        ;; and it can delete the download directory next time.
-        ;; http://nsis.sourceforge.net/Write_text_to_a_file
-        FileOpen $0 "$EXEDIR\nsis.winstall" w
-        FileWrite $0 "NSIS done$\n"
-        FileClose $0
-
-        ClearErrors
-        Pop $0
-        Pop $R0
-
-        Call CheckWindowsServPack		# Warn if not on the latest SP before asking to launch.
-        StrCmp $SKIP_AUTORUN "true" +2;
-        # Assumes SetOutPath $INSTDIR
-        # Run INSTEXE (our updater), passing VIEWER_EXE plus the command-line
-        # arguments built into our shortcuts. This gives the updater a chance
-        # to verify that the viewer we just installed is appropriate for the
-        # running system -- or, if not, to download and install a different
-        # viewer. For instance, if a user running 32-bit Windows installs a
-        # 64-bit viewer, it cannot run on this system. But since the updater
-        # is a 32-bit executable even in the 64-bit viewer package, the
-        # updater can detect the problem and adapt accordingly.
-        # Once everything is in order, the updater will run the specified
-        # viewer with the specified params.
-        # Quote the updater executable and the viewer executable because each
-        # must be a distinct command-line token, but DO NOT quote the language
-        # string because it must decompose into separate command-line tokens.
-        Exec '"$INSTDIR\$INSTEXE" precheck "$INSTDIR\$VIEWER_EXE" $SHORTCUT_LANG_PARAM'
-# 
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Recommend Upgrading to Service Pack 1 for Windows 7, if not present
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckWindowsServPack
-  ${If} ${IsWin7}
-  ${AndIfNot} ${IsServicePack} 1
-    MessageBox MB_OK $(CheckWindowsServPackMB)
-    DetailPrint $(UseLatestServPackDP)
-    Return
-  ${EndIf}
-
-  ${If} ${IsWin2008R2}
-  ${AndIfNot} ${IsServicePack} 1
-    MessageBox MB_OK $(CheckWindowsServPackMB)
-    DetailPrint $(UseLatestServPackDP)
-    Return
-  ${EndIf}
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Clobber user files - TEST ONLY
-;; This is here for testing, DO NOT USE UNLESS YOU KNOW WHAT YOU ARE TESTING FOR!
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;Function ClobberUserFilesTESTONLY
-
-;Push $0
-;Push $1
-;Push $2
-;
-;    StrCpy $0 0	# Index number used to iterate via EnumRegKey
-;
-;  LOOP:
-;    EnumRegKey $1 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList" $0
-;    StrCmp $1 "" DONE               # no more users
-;
-;    ReadRegStr $2 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList\$1" "ProfileImagePath"
-;    StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing
-;
-;# Required since ProfileImagePath is of type REG_EXPAND_SZ
-;    ExpandEnvStrings $2 $2
-;
-;    RMDir /r "$2\Application Data\SecondLife\"
-;
-;  CONTINUE:
-;    IntOp $0 $0 + 1
-;    Goto LOOP
-;  DONE:
-;
-;Pop $2
-;Pop $1
-;Pop $0
-;
-;# Copy files in Documents and Settings\All Users\SecondLife
-;Push $0
-;    ReadRegStr $0 SHELL_CONTEXT "${MSCURRVER_KEY}\Explorer\Shell Folders" "Common AppData"
-;    StrCmp $0 "" +2
-;    RMDir /r "$2\Application Data\SecondLife\"
-;Pop $0
-;
-;FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Second Life setup.nsi
+;; Copyright 2004-2015, Linden Research, Inc.
+;;
+;; This library is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation;
+;; version 2.1 of the License only.
+;;
+;; This library is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with this library; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+;;
+;; Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+;;
+;; NSIS 3 or higher required for Unicode support
+;;
+;; Author: James Cook, TankMaster Finesmith, Don Kjer, Callum Prentice
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Compiler flags
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Unicode true
+SetOverwrite on				# Overwrite files
+SetCompress auto			# Compress if saves space
+SetCompressor /solid lzma	# Compress whole installer as one block
+SetDatablockOptimize off	# Only saves us 0.1%, not worth it
+XPStyle on                  # Add an XP manifest to the installer
+RequestExecutionLevel admin	# For when we write to Program Files
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Project flags
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+# This placeholder is replaced by viewer_manifest.py
+%%VERSION%%
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; - language files - one for each language (or flavor thereof)
+;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 
+;; application directory so we have to add a path to these include files)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ansariel notes: "Under certain circumstances the installer will fall back
+;; to the first defined (aka default) language version. So you want to include
+;; en-us as first language file."
+!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"
+
+# Danish and Polish no longer supported by the viewer itself
+##!include "%%SOURCE%%\installers\windows\lang_da.nsi"
+!include "%%SOURCE%%\installers\windows\lang_de.nsi"
+!include "%%SOURCE%%\installers\windows\lang_es.nsi"
+!include "%%SOURCE%%\installers\windows\lang_fr.nsi"
+!include "%%SOURCE%%\installers\windows\lang_ja.nsi"
+!include "%%SOURCE%%\installers\windows\lang_it.nsi"
+##!include "%%SOURCE%%\installers\windows\lang_pl.nsi"
+!include "%%SOURCE%%\installers\windows\lang_pt-br.nsi"
+!include "%%SOURCE%%\installers\windows\lang_ru.nsi"
+!include "%%SOURCE%%\installers\windows\lang_tr.nsi"
+!include "%%SOURCE%%\installers\windows\lang_zh.nsi"
+
+# *TODO: Move these into the language files themselves
+##LangString LanguageCode ${LANG_DANISH}   "da"
+LangString LanguageCode ${LANG_GERMAN}   "de"
+LangString LanguageCode ${LANG_ENGLISH}  "en"
+LangString LanguageCode ${LANG_SPANISH}  "es"
+LangString LanguageCode ${LANG_FRENCH}   "fr"
+LangString LanguageCode ${LANG_JAPANESE} "ja"
+LangString LanguageCode ${LANG_ITALIAN}  "it"
+##LangString LanguageCode ${LANG_POLISH}   "pl"
+LangString LanguageCode ${LANG_PORTUGUESEBR} "pt"
+LangString LanguageCode ${LANG_RUSSIAN}  "ru"
+LangString LanguageCode ${LANG_TURKISH}  "tr"
+LangString LanguageCode ${LANG_TRADCHINESE}  "zh"
+
+# This placeholder is replaced by viewer_manifest.py
+%%INST_VARS%%
+
+Name ${INSTNAME}
+
+SubCaption 0 $(LicenseSubTitleSetup)	# Override "license agreement" text
+
+!define MUI_ICON   "%%SOURCE%%\installers\windows\install_icon.ico"
+!define MUI_UNICON "%%SOURCE%%\installers\windows\uninstall_icon.ico"
+
+BrandingText " "						# Bottom of window text
+Icon          "${MUI_ICON}"
+UninstallIcon "${MUI_UNICON}"
+WindowIcon on							# Show our icon in left corner
+BGGradient off							# No big background window
+CRCCheck on								# Make sure CRC is OK
+InstProgressFlags smooth colored		# New colored smooth look
+SetOverwrite on							# Overwrite files by default
+AutoCloseWindow true					# After all files install, close window
+
+# Registry key paths, ours and Microsoft's
+!define LINDEN_KEY      "SOFTWARE\Linden Research, Inc."
+!define INSTNAME_KEY    "${LINDEN_KEY}\${INSTNAME}"
+!define MSCURRVER_KEY   "SOFTWARE\Microsoft\Windows\CurrentVersion"
+!define MSNTCURRVER_KEY "SOFTWARE\Microsoft\Windows NT\CurrentVersion"
+!define MSUNINSTALL_KEY "${MSCURRVER_KEY}\Uninstall\${INSTNAME}"
+
+# from http://nsis.sourceforge.net/Docs/MultiUser/Readme.html
+### Highest level permitted for user: Admin for Admin, Standard for Standard
+##!define MULTIUSER_EXECUTIONLEVEL Highest
+!define MULTIUSER_EXECUTIONLEVEL Admin
+!define MULTIUSER_MUI
+### Look for /AllUsers or /CurrentUser switches
+##!define MULTIUSER_INSTALLMODE_COMMANDLINE
+# appended to $PROGRAMFILES, as affected by MULTIUSER_USE_PROGRAMFILES64
+!define MULTIUSER_INSTALLMODE_INSTDIR "${INSTNAME}"
+# expands to !define MULTIUSER_USE_PROGRAMFILES64 or nothing
+%%PROGRAMFILES%%
+# should make MultiUser.nsh initialization read existing INSTDIR from registry
+## SL-10506: don't
+##!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${INSTNAME_KEY}"
+##!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
+# Don't set MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY and
+# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME to cause the installer to
+# write $MultiUser.InstallMode to the registry, because when the user installs
+# multiple viewers with the same channel (same ${INSTNAME}, hence same
+# ${INSTNAME_KEY}), the registry entry is overwritten. Instead we'll write a
+# little file into the install directory -- see .onInstSuccess and un.onInit.
+!include MultiUser.nsh
+!include MUI2.nsh
+!define MUI_BGCOLOR FFFFFF
+!insertmacro MUI_FUNCTION_GUIINIT
+
+UninstallText $(UninstallTextMsg)
+DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
+##!insertmacro MULTIUSER_PAGE_INSTALLMODE
+!define MUI_PAGE_CUSTOMFUNCTION_PRE dirPre
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Variables
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Var INSTNAME
+Var INSTEXE
+Var VIEWER_EXE
+Var INSTSHORTCUT
+Var COMMANDLINE         # Command line passed to this installer, set in .onInit
+Var SHORTCUT_LANG_PARAM # "--set InstallLanguage de", Passes language to viewer
+Var SKIP_DIALOGS        # Set from command line in  .onInit. autoinstall GUI and the defaults.
+Var SKIP_AUTORUN		# Skip automatic launch of the viewer after install
+Var DO_UNINSTALL_V2     # If non-null, path to a previous Viewer 2 installation that will be uninstalled.
+
+# Function definitions should go before file includes, because calls to
+# DLLs like LangDLL trigger an implicit file include, so if that call is at
+# the end of this script NSIS has to decompress the whole installer before 
+# it can call the DLL function. JC
+
+!include "FileFunc.nsh"     # For GetParameters, GetOptions
+!insertmacro GetParameters
+!insertmacro GetOptions
+!include WinVer.nsh			# For OS and SP detection
+!include 'LogicLib.nsh'     # for value comparison
+!include "x64.nsh"			# for 64bit detection
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Pre-directory page callback
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function dirPre
+    StrCmp $SKIP_DIALOGS "true" 0 +2
+	Abort
+
+FunctionEnd    
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Prep Installer Section
+;;
+;; Note: to add new languages, add a language file include to the list 
+;; at the top of this file, add an entry to the menu and then add an 
+;; entry to the language ID selector below
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function .onInit
+!insertmacro MULTIUSER_INIT
+
+%%ENGAGEREGISTRY%%
+
+# SL-10506: Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and
+# MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should
+# read the current location of the install for this version into INSTDIR.
+# However, SL-10506 complains about the resulting behavior, so the logic below
+# is adapted from before we introduced MultiUser.nsh.
+
+# if $0 is empty, this is the first time for this viewer name
+ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" ""
+
+# viewer with this name was installed before
+${If} $0 != ""
+	# use the value we got from registry as install location
+    StrCpy $INSTDIR $0
+${EndIf}
+
+Call CheckCPUFlags							# Make sure we have SSE2 support
+Call CheckWindowsVersion					# Don't install On unsupported systems
+    Push $0
+    ${GetParameters} $COMMANDLINE			# Get our command line
+
+    ${GetOptions} $COMMANDLINE "/SKIP_DIALOGS" $0   
+    IfErrors +2 0	# If error jump past setting SKIP_DIALOGS
+        StrCpy $SKIP_DIALOGS "true"
+
+	${GetOptions} $COMMANDLINE "/SKIP_AUTORUN" $0
+	IfErrors +2 0 ; If error jump past setting SKIP_AUTORUN
+		StrCpy $SKIP_AUTORUN "true"
+
+    ${GetOptions} $COMMANDLINE "/LANGID=" $0	# /LANGID=1033 implies US English
+
+# If no language (error), then proceed
+    IfErrors lbl_configure_default_lang
+# No error means we got a language, so use it
+    StrCpy $LANGUAGE $0
+    Goto lbl_return
+
+lbl_configure_default_lang:
+# If we currently have a version of SL installed, default to the language of that install
+# Otherwise don't change $LANGUAGE and it will default to the OS UI language.
+    ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage"
+    IfErrors +2 0	# If error skip the copy instruction 
+	StrCpy $LANGUAGE $0
+
+# For silent installs, no language prompt, use default
+    IfSilent 0 +3
+    StrCpy $SKIP_AUTORUN "true"
+    Goto lbl_return
+    StrCmp $SKIP_DIALOGS "true" lbl_return
+  
+	Push ""
+# Use separate file so labels can be UTF-16 but we can still merge changes into this ASCII file. JC
+    !include "%%SOURCE%%\installers\windows\language_menu.nsi"
+    
+	Push A	# A means auto count languages for the auto count to work the first empty push (Push "") must remain
+	LangDLL::LangDialog $(InstallerLanguageTitle) $(SelectInstallerLanguage)
+	Pop $0
+	StrCmp $0 "cancel" 0 +2
+		Abort
+    StrCpy $LANGUAGE $0
+
+# Save language in registry		
+	WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage" $LANGUAGE
+lbl_return:
+    Pop $0
+    Return
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Prep Uninstaller Section
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.onInit
+    # Save $INSTDIR -- it appears to have the correct value before
+    # MULTIUSER_UNINIT, but then gets munged by MULTIUSER_UNINIT?!
+    Push $INSTDIR
+    !insertmacro MULTIUSER_UNINIT
+    Pop $INSTDIR
+
+    # Now read InstallMode.txt from $INSTDIR
+    Push $0
+    ClearErrors
+    FileOpen $0 "$INSTDIR\InstallMode.txt" r
+    IfErrors skipread
+    FileRead $0 $MultiUser.InstallMode
+    FileClose $0
+skipread:
+    Pop $0
+
+%%ENGAGEREGISTRY%%
+
+# Read language from registry and set for uninstaller. Key will be removed on successful uninstall
+	ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage"
+    IfErrors lbl_end
+	StrCpy $LANGUAGE $0
+lbl_end:
+
+##  MessageBox MB_OK "After restoring:$\n$$INSTDIR = '$INSTDIR'$\n$$MultiUser.InstallMode = '$MultiUser.InstallMode'$\n$$LANGUAGE = '$LANGUAGE'"
+
+    Return
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Checks for CPU valid (must have SSE2 support)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckCPUFlags
+    Push $1
+    System::Call 'kernel32::IsProcessorFeaturePresent(i) i(10) .r1'
+    IntCmp $1 1 OK_SSE2
+    MessageBox MB_OKCANCEL $(MissingSSE2) /SD IDOK IDOK OK_SSE2
+    Quit
+
+  OK_SSE2:
+    Pop $1
+    Return
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Make sure this computer meets the minimum system requirements.
+;; Currently: Windows Vista SP2
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckWindowsVersion
+  ${If} ${AtMostWin2003}
+    MessageBox MB_OK $(CheckWindowsVersionMB)
+    Quit
+  ${EndIf}
+
+  ${If} ${IsWinVista}
+  ${AndIfNot} ${IsServicePack} 2
+    MessageBox MB_OK $(CheckWindowsVersionMB)
+    Quit
+  ${EndIf}
+
+  ${If} ${IsWin2008}
+  ${AndIfNot} ${IsServicePack} 2
+    MessageBox MB_OK $(CheckWindowsVersionMB)
+    Quit
+  ${EndIf}
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Install Section
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Section ""
+
+# SetShellVarContext is set by MultiUser.nsh initialization.
+
+# Start with some default values.
+StrCpy $INSTNAME "${INSTNAME}"
+StrCpy $INSTEXE "${INSTEXE}"
+StrCpy $VIEWER_EXE "${VIEWER_EXE}"
+StrCpy $INSTSHORTCUT "${SHORTCUT}"
+
+Call CheckIfAdministrator		# Make sure the user can install/uninstall
+Call CloseSecondLife			# Make sure Second Life not currently running
+Call CheckWillUninstallV2		# Check if Second Life is already installed
+
+StrCmp $DO_UNINSTALL_V2 "" PRESERVE_DONE
+PRESERVE_DONE:
+
+# Viewer had "SLLauncher" for some time and we was seting "IsHostApp" for viewer, make sure to clean it up
+DeleteRegValue HKEY_CLASSES_ROOT "Applications\$VIEWER_EXE" "IsHostApp"
+DeleteRegValue HKEY_CLASSES_ROOT "Applications\$VIEWER_EXE" "NoStartPage"
+ClearErrors
+
+INSTALL_FILES_START:
+
+Call RemoveProgFilesOnInst		# Remove existing files to prevent certain errors when running the new version of the viewer
+
+# This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
+%%INSTALL_FILES%%
+
+IfErrors 0 INSTALL_FILES_DONE
+  StrCmp $SKIP_DIALOGS "true" INSTALL_FILES_DONE
+	MessageBox MB_ABORTRETRYIGNORE $(ErrorSecondLifeInstallRetry) IDABORT INSTALL_FILES_CANCEL IDRETRY INSTALL_FILES_START
+    # MB_ABORTRETRYIGNORE does not accept IDIGNORE
+    Goto INSTALL_FILES_DONE
+
+INSTALL_FILES_CANCEL:
+  # We are quiting, cleanup.
+  # Silence warnings from RemoveProgFilesOnInst.
+  StrCpy $SKIP_DIALOGS "true"
+  Call RemoveProgFilesOnInst
+  MessageBox MB_OK $(ErrorSecondLifeInstallSupport)
+  Quit
+
+INSTALL_FILES_DONE:
+
+# Pass the installer's language to the client to use as a default
+StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"
+
+# Shortcuts in start menu
+CreateDirectory	"$SMPROGRAMS\$INSTSHORTCUT"
+SetOutPath "$INSTDIR"
+CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \
+				"$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE"
+
+
+WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Create Account.url" \
+				"InternetShortcut" "URL" \
+				"http://join.secondlife.com/"
+WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \
+				"InternetShortcut" "URL" \
+				"http://www.secondlife.com/account/"
+WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.url" \
+				"InternetShortcut" "URL" \
+                "http://wiki.secondlife.com/wiki/LSL_Portal"
+CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
+				'"$INSTDIR\uninst.exe"' ''
+
+# Other shortcuts
+SetOutPath "$INSTDIR"
+CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \
+        "$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE"
+CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \
+        "$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE"
+CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
+				'"$INSTDIR\uninst.exe"' ''
+
+# Write registry
+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "" "$INSTDIR"
+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Version" "${VERSION_LONG}"
+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Shortcut" "$INSTSHORTCUT"
+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Exe" "$VIEWER_EXE"
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "Publisher" "Linden Research, Inc."
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLInfoAbout" "http://secondlife.com/whatis/"
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLUpdateInfo" "http://secondlife.com/support/downloads/"
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "HelpLink" "https://support.secondlife.com/contact-support/"
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayName" "$INSTNAME"
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "UninstallString" '"$INSTDIR\uninst.exe"'
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayVersion" "${VERSION_LONG}"
+WriteRegDWORD SHELL_CONTEXT "${MSUNINSTALL_KEY}" "EstimatedSize" "0x0001D500"		# ~117 MB
+
+# from FS:Ansariel
+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayIcon" '"$INSTDIR\$VIEWER_EXE"'
+
+# BUG-2707 Disable SEHOP for installed viewer.
+WriteRegDWORD SHELL_CONTEXT "${MSNTCURRVER_KEY}\Image File Execution Options\$VIEWER_EXE" "DisableExceptionChainValidation" 1
+
+# Write URL registry info
+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"
+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""
+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
+
+# URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
+# MAINT-8305: On SLURL click, directly invoke the viewer, not the launcher.
+WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
+WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "(default)" "URL:Second Life"
+WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""
+WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
+
+# URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
+WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
+
+WriteRegStr HKEY_CLASSES_ROOT "Applications\$INSTEXE" "IsHostApp" ""
+##WriteRegStr HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}" "NoStartPage" ""
+
+# Write out uninstaller
+WriteUninstaller "$INSTDIR\uninst.exe"
+
+# Uninstall existing "Second Life Viewer 2" install if needed.
+StrCmp $DO_UNINSTALL_V2 "" REMOVE_SLV2_DONE
+  ExecWait '"$PROGRAMFILES\SecondLifeViewer2\uninst.exe" /S _?=$PROGRAMFILES\SecondLifeViewer2'
+  Delete "$PROGRAMFILES\SecondLifeViewer2\uninst.exe"	# With _? option above, uninst.exe will be left behind.
+  RMDir "$PROGRAMFILES\SecondLifeViewer2"	# Will remove only if empty.
+
+REMOVE_SLV2_DONE:
+
+SectionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Uninstall Section
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Section Uninstall
+
+# Start with some default values.
+StrCpy $INSTNAME "${INSTNAME}"
+StrCpy $INSTEXE "${INSTEXE}"
+StrCpy $VIEWER_EXE "${VIEWER_EXE}"
+StrCpy $INSTSHORTCUT "${SHORTCUT}"
+
+# SetShellVarContext per the mode saved at install time in registry at
+# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY
+# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME
+# Couldn't get NSIS to expand $MultiUser.InstallMode into the function name at Call time
+${If} $MultiUser.InstallMode == 'AllUsers'
+##MessageBox MB_OK "Uninstalling for all users"
+  Call un.MultiUser.InstallMode.AllUsers
+${Else}
+##MessageBox MB_OK "Uninstalling for current user"
+  Call un.MultiUser.InstallMode.CurrentUser
+${EndIf}
+
+# Make sure we're not running
+Call un.CloseSecondLife
+
+# Clean up registry keys and subkeys (these should all be !defines somewhere)
+DeleteRegKey SHELL_CONTEXT "${INSTNAME_KEY}"
+DeleteRegKey SHELL_CONTEXT "${MSCURRVER_KEY}\Uninstall\$INSTNAME"
+# BUG-2707 Remove entry that disabled SEHOP
+DeleteRegKey SHELL_CONTEXT "${MSNTCURRVER_KEY}\Image File Execution Options\$VIEWER_EXE"
+DeleteRegKey HKEY_CLASSES_ROOT "Applications\$INSTEXE"
+DeleteRegKey HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}"
+
+# Clean up shortcuts
+Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"
+RMDir  "$SMPROGRAMS\$INSTSHORTCUT"
+
+Delete "$DESKTOP\$INSTSHORTCUT.lnk"
+Delete "$INSTDIR\$INSTSHORTCUT.lnk"
+Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"
+
+# Remove the main installation directory
+Call un.ProgramFiles
+
+# Clean up cache and log files, but leave them in-place for non AGNI installs.
+Call un.UserSettingsFiles
+
+SectionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Make sure the user can install/uninstall
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckIfAdministrator
+    DetailPrint $(CheckAdministratorInstDP)
+    UserInfo::GetAccountType
+    Pop $R0
+    StrCmp $R0 "Admin" lbl_is_admin
+        MessageBox MB_OK $(CheckAdministratorInstMB)
+        Quit
+lbl_is_admin:
+    Return
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Function CheckWillUninstallV2               
+;;
+;; If called through auto-update, need to uninstall any existing V2 installation.
+;; Don't want to end up with SecondLifeViewer2 and SecondLifeViewer installations
+;;  existing side by side with no indication on which to use.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckWillUninstallV2
+
+  StrCpy $DO_UNINSTALL_V2 ""
+
+  StrCmp $SKIP_DIALOGS "true" 0 CHECKV2_DONE
+  StrCmp $INSTDIR "$PROGRAMFILES\SecondLifeViewer2" CHECKV2_DONE	# Don't uninstall our own install dir.
+  IfFileExists "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" CHECKV2_FOUND CHECKV2_DONE
+
+CHECKV2_FOUND:
+  StrCpy $DO_UNINSTALL_V2 "true"
+
+CHECKV2_DONE:
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Close the program, if running. Modifies no variables.
+;; Allows user to bail out of install process.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CloseSecondLife
+  Push $0
+  FindWindow $0 "Second Life" ""
+  IntCmp $0 0 DONE
+  
+  StrCmp $SKIP_DIALOGS "true" CLOSE
+    MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
+
+  CANCEL_INSTALL:
+    Quit
+
+  CLOSE:
+    DetailPrint $(CloseSecondLifeInstDP)
+    SendMessage $0 16 0 0
+
+  LOOP:
+	  FindWindow $0 "Second Life" ""
+	  IntCmp $0 0 SLEEP
+	  Sleep 500
+	  Goto LOOP
+	  
+  SLEEP:
+    # Second life window just closed, but program might not be fully done yet
+    # and OS might have not released some locks, wait a bit more to make sure
+    # all file handles were released.
+	# If something still isn't unlocked, it will trigger a notification from
+	# RemoveProgFilesOnInst
+    Sleep 1000
+  DONE:
+    Pop $0
+    Return
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Close the program, if running. Modifies no variables.
+;; Allows user to bail out of uninstall process.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.CloseSecondLife
+  Push $0
+  FindWindow $0 "Second Life" ""
+  IntCmp $0 0 DONE
+  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
+
+  CANCEL_UNINSTALL:
+    Quit
+
+  CLOSE:
+    DetailPrint $(CloseSecondLifeUnInstDP)
+    SendMessage $0 16 0 0
+
+  LOOP:
+	  FindWindow $0 "Second Life" ""
+	  IntCmp $0 0 DONE
+	  Sleep 500
+	  Goto LOOP
+
+  DONE:
+    Pop $0
+    Return
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Delete files on install if previous install exists to prevent undesired behavior
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function RemoveProgFilesOnInst
+
+# We do not remove whole pervious install folder on install, since
+# there is a chance that viewer was installed into some important
+# folder by intent or accident
+# RMDir /r $INSTDIR is especially unsafe if user installed somewhere
+# like Program Files
+
+# Set retry counter. All integers are strings.
+Push $0
+StrCpy $0 0
+
+ClearErrors
+
+PREINSTALL_REMOVE:
+
+# Remove old SecondLife.exe to invalidate any old shortcuts to it that may be in non-standard locations. See MAINT-3575
+Delete "$INSTDIR\$INSTEXE"
+Delete "$INSTDIR\$VIEWER_EXE"
+
+# Remove old shader files first so fallbacks will work. See DEV-5663
+RMDir /r "$INSTDIR\app_settings\shaders"
+
+# Remove folders to clean up files removed during development
+RMDir /r "$INSTDIR\app_settings"
+RMDir /r "$INSTDIR\skins"
+RMDir /r "$INSTDIR\vmp_icons"
+
+# Remove llplugin, plugins can crash or malfunction if they
+# find modules from different versions
+RMDir /r "$INSTDIR\llplugin"
+
+IntOp $0 $0 + 1
+
+IfErrors 0 PREINSTALL_DONE
+  IntCmp $0 1 PREINSTALL_REMOVE #try again once
+    StrCmp $SKIP_DIALOGS "true" PREINSTALL_DONE
+      MessageBox MB_ABORTRETRYIGNORE $(CloseSecondLifeInstRM) IDABORT PREINSTALL_FAIL IDRETRY PREINSTALL_REMOVE
+      # MB_ABORTRETRYIGNORE does not accept IDIGNORE
+      Goto PREINSTALL_DONE
+
+PREINSTALL_FAIL:
+    Quit
+
+PREINSTALL_DONE:
+
+# We are no longer including release notes with the viewer, so remove them.
+Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
+Delete "$INSTDIR\releasenotes.txt"
+
+Pop $0
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Delete files in \Users\<User>\AppData\
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.UserSettingsFiles
+
+StrCmp $DO_UNINSTALL_V2 "true" Keep			# Don't remove user's settings files on auto upgrade
+
+# Ask if user wants to keep data files or not
+MessageBox MB_YESNO|MB_ICONQUESTION $(RemoveDataFilesMB) IDYES Remove IDNO Keep
+
+Remove:
+Push $0
+Push $1
+Push $2
+
+  DetailPrint "Deleting Second Life data files"
+
+  StrCpy $0 0	# Index number used to iterate via EnumRegKey
+
+  LOOP:
+    EnumRegKey $1 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList" $0
+    StrCmp $1 "" DONE               # No more users
+
+    ReadRegStr $2 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList\$1" "ProfileImagePath" 
+    StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing
+
+# Required since ProfileImagePath is of type REG_EXPAND_SZ
+    ExpandEnvStrings $2 $2
+
+# Delete files in \Users\<User>\AppData\Roaming\SecondLife
+# Remove all settings files but leave any other .txt files to preserve the chat logs
+;    RMDir /r "$2\AppData\Roaming\SecondLife\logs"
+    RMDir /r "$2\AppData\Roaming\SecondLife\browser_profile"
+    RMDir /r "$2\AppData\Roaming\SecondLife\user_settings"
+    Delete  "$2\AppData\Roaming\SecondLife\*.xml"
+    Delete  "$2\AppData\Roaming\SecondLife\*.bmp"
+    Delete  "$2\AppData\Roaming\SecondLife\search_history.txt"
+    Delete  "$2\AppData\Roaming\SecondLife\plugin_cookies.txt"
+    Delete  "$2\AppData\Roaming\SecondLife\typed_locations.txt"
+# Delete files in \Users\<User>\AppData\Local\SecondLife
+    RmDir /r  "$2\AppData\Local\SecondLife"							#Delete the cache folder
+
+  CONTINUE:
+    IntOp $0 $0 + 1
+    Goto LOOP
+  DONE:
+
+Pop $2
+Pop $1
+Pop $0
+
+# Delete files in ProgramData\Secondlife
+Push $0
+  ReadRegStr $0 SHELL_CONTEXT "${MSCURRVER_KEY}\Explorer\Shell Folders" "Common AppData"
+  StrCmp $0 "" +2
+  RMDir /r "$0\SecondLife"
+Pop $0
+
+Keep:
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Delete the installed files
+;; This deletes the uninstall executable, but it works because it is copied to temp directory before running
+;;
+;; Note:  You must list all files here, because we only want to delete our files,
+;; not things users left in the program directory.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.ProgramFiles
+
+# This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py
+%%DELETE_FILES%%
+
+# our InstallMode.txt
+Delete "$INSTDIR\InstallMode.txt"
+
+# Optional/obsolete files.  Delete won't fail if they don't exist.
+Delete "$INSTDIR\autorun.bat"
+Delete "$INSTDIR\dronesettings.ini"
+Delete "$INSTDIR\message_template.msg"
+Delete "$INSTDIR\newview.pdb"
+Delete "$INSTDIR\newview.map"
+Delete "$INSTDIR\SecondLife.pdb"
+Delete "$INSTDIR\SecondLife.map"
+Delete "$INSTDIR\comm.dat"
+Delete "$INSTDIR\*.glsl"
+Delete "$INSTDIR\motions\*.lla"
+Delete "$INSTDIR\trial\*.html"
+Delete "$INSTDIR\newview.exe"
+Delete "$INSTDIR\SecondLife.exe"
+
+# MAINT-3099 workaround - prevent these log files, if present, from causing a user alert
+Delete "$INSTDIR\VivoxVoiceService-*.log"
+
+# Remove entire help directory
+RMDir /r  "$INSTDIR\help"
+
+Delete "$INSTDIR\uninst.exe"
+RMDir "$INSTDIR"
+
+IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER
+
+FOLDERFOUND:
+  MessageBox MB_OK $(DeleteProgramFilesMB) /SD IDOK IDOK NOFOLDER
+
+NOFOLDER:
+
+MessageBox MB_YESNO $(DeleteRegistryKeysMB) IDYES DeleteKeys IDNO NoDelete
+
+DeleteKeys:
+  DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\x-grid-location-info"
+  DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\secondlife"
+  DeleteRegKey HKEY_CLASSES_ROOT "x-grid-location-info"
+  DeleteRegKey HKEY_CLASSES_ROOT "secondlife"
+
+NoDelete:
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; After install completes, launch app
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function .onInstSuccess
+        Push $0
+        FileOpen $0 "$INSTDIR\InstallMode.txt" w
+        # No newline -- this is for our use, not for users to read.
+        FileWrite $0 "$MultiUser.InstallMode"
+        FileClose $0
+        Pop $0
+
+        Push $R0
+        Push $0
+        ;; MAINT-7812: Only write nsis.winstall file with /marker switch
+        ${GetParameters} $R0
+        ${GetOptionsS} $R0 "/marker" $0
+        ;; If no /marker switch, skip to ClearErrors
+        IfErrors +4 0
+        ;; $EXEDIR is where we find the installer file
+        ;; Put a marker file there so VMP will know we're done
+        ;; and it can delete the download directory next time.
+        ;; http://nsis.sourceforge.net/Write_text_to_a_file
+        FileOpen $0 "$EXEDIR\nsis.winstall" w
+        FileWrite $0 "NSIS done$\n"
+        FileClose $0
+
+        ClearErrors
+        Pop $0
+        Pop $R0
+
+        Call CheckWindowsServPack		# Warn if not on the latest SP before asking to launch.
+        StrCmp $SKIP_AUTORUN "true" +2;
+        # Assumes SetOutPath $INSTDIR
+        # Run INSTEXE (our updater), passing VIEWER_EXE plus the command-line
+        # arguments built into our shortcuts. This gives the updater a chance
+        # to verify that the viewer we just installed is appropriate for the
+        # running system -- or, if not, to download and install a different
+        # viewer. For instance, if a user running 32-bit Windows installs a
+        # 64-bit viewer, it cannot run on this system. But since the updater
+        # is a 32-bit executable even in the 64-bit viewer package, the
+        # updater can detect the problem and adapt accordingly.
+        # Once everything is in order, the updater will run the specified
+        # viewer with the specified params.
+        # Quote the updater executable and the viewer executable because each
+        # must be a distinct command-line token, but DO NOT quote the language
+        # string because it must decompose into separate command-line tokens.
+        Exec '"$INSTDIR\$INSTEXE" precheck "$INSTDIR\$VIEWER_EXE" $SHORTCUT_LANG_PARAM'
+# 
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Recommend Upgrading to Service Pack 1 for Windows 7, if not present
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckWindowsServPack
+  ${If} ${IsWin7}
+  ${AndIfNot} ${IsServicePack} 1
+    MessageBox MB_OK $(CheckWindowsServPackMB)
+    DetailPrint $(UseLatestServPackDP)
+    Return
+  ${EndIf}
+
+  ${If} ${IsWin2008R2}
+  ${AndIfNot} ${IsServicePack} 1
+    MessageBox MB_OK $(CheckWindowsServPackMB)
+    DetailPrint $(UseLatestServPackDP)
+    Return
+  ${EndIf}
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Clobber user files - TEST ONLY
+;; This is here for testing, DO NOT USE UNLESS YOU KNOW WHAT YOU ARE TESTING FOR!
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Function ClobberUserFilesTESTONLY
+
+;Push $0
+;Push $1
+;Push $2
+;
+;    StrCpy $0 0	# Index number used to iterate via EnumRegKey
+;
+;  LOOP:
+;    EnumRegKey $1 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList" $0
+;    StrCmp $1 "" DONE               # no more users
+;
+;    ReadRegStr $2 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList\$1" "ProfileImagePath"
+;    StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing
+;
+;# Required since ProfileImagePath is of type REG_EXPAND_SZ
+;    ExpandEnvStrings $2 $2
+;
+;    RMDir /r "$2\Application Data\SecondLife\"
+;
+;  CONTINUE:
+;    IntOp $0 $0 + 1
+;    Goto LOOP
+;  DONE:
+;
+;Pop $2
+;Pop $1
+;Pop $0
+;
+;# Copy files in Documents and Settings\All Users\SecondLife
+;Push $0
+;    ReadRegStr $0 SHELL_CONTEXT "${MSCURRVER_KEY}\Explorer\Shell Folders" "Common AppData"
+;    StrCmp $0 "" +2
+;    RMDir /r "$2\Application Data\SecondLife\"
+;Pop $0
+;
+;FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.3


From 79198eddf76dfa69e8161f7646d8da19853a8a5a Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 7 Jul 2023 20:24:49 +0300
Subject: SL-19966 Reverted "SL-18721: Faster viewer shutdown time since
 performance improvements can lead to perceived inventory loss due to cache
 corruption"

This reverts commit cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99.
---
 indra/llcommon/threadpool.cpp    | 5 -----
 indra/llcommon/threadpool.h      | 4 ----
 indra/llwindow/llwindowwin32.cpp | 3 ---
 3 files changed, 12 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index 4a7ead2110..d5adf11264 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -39,11 +39,6 @@ void LL::ThreadPool::start()
                 run(tname);
             });
     }
-
-    // Special workflow for LLWindowWin32Thread - it's close() should be called explicitly
-    if (mExplicitShutdown)
-        return;
-
     // Listen on "LLApp", and when the app is shutting down, close the queue
     // and join the workers.
     LLEventPumps::instance().obtain("LLApp").listen(
diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index 0a5f14529b..f8eec3b457 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -59,10 +59,6 @@ namespace LL
          */
         virtual void run();
 
-    protected:
-        // LLWindowWin32Thread should set this flag to true
-        bool mExplicitShutdown { false };
-
     private:
         void run(const std::string& name);
 
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 2f1a631585..2e560ddb0a 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -4592,9 +4592,6 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList()
 inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
     : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE)
 {
-    // Set this flag to true to avoid of implicit call of close() from start()
-    mExplicitShutdown = true;
-
     ThreadPool::start();
 }
 
-- 
cgit v1.2.3


From 4aa44bdfc9bae011bdfbb01bd888f7ab92e18215 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 6 Jul 2023 21:46:19 +0300
Subject: SL-19702 restore previous double clicking behavior for objects

---
 indra/newview/llviewerinput.cpp  | 5 +++--
 indra/newview/llviewerwindow.cpp | 3 ++-
 indra/newview/llviewerwindow.h   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 6bab2c2100..226e0a9a56 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -1597,7 +1597,8 @@ bool LLViewerInput::scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
 
 BOOL LLViewerInput::handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down)
 {
-    BOOL handled = gViewerWindow->handleAnyMouseClick(window_impl, pos, mask, clicktype, down);
+    bool is_toolmgr_action = false;
+    BOOL handled = gViewerWindow->handleAnyMouseClick(window_impl, pos, mask, clicktype, down, is_toolmgr_action);
 
     if (clicktype != CLICK_NONE)
     {
@@ -1616,7 +1617,7 @@ BOOL LLViewerInput::handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask,
 
         // If the first LMB click is handled by the menu, skip the following double click
         static bool skip_double_click = false;
-        if (clicktype == CLICK_LEFT && down )
+        if (clicktype == CLICK_LEFT && down && !is_toolmgr_action)
         {
             skip_double_click = handled;
         }
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b9fcc25310..e8fd74b37b 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1050,7 +1050,7 @@ void LLViewerWindow::handlePieMenu(S32 x, S32 y, MASK mask)
     }
 }
 
-BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down)
+BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down, bool& is_toolmgr_action)
 {
 	const char* buttonname = "";
 	const char* buttonstatestr = "";
@@ -1199,6 +1199,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK m
 	if(!gDisconnected && LLToolMgr::getInstance()->getCurrentTool()->handleAnyMouseClick( x, y, mask, clicktype, down ) )
 	{
 		LLViewerEventRecorder::instance().clear_xui(); 
+        is_toolmgr_action = true;
 		return TRUE;
 	}
 
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 1927e01ddb..92905ef21a 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -179,7 +179,7 @@ public:
 
     void            reshapeStatusBarContainer();
 
-	BOOL handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down);
+	BOOL handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down, bool &is_toolmgr_action);
 
 	//
 	// LLWindowCallback interface implementation
-- 
cgit v1.2.3


From bce11a1fa03b95782378ecb431850f77f762a348 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 7 Jul 2023 23:13:04 +0300
Subject: SL-19958 An inventory material without asset should default to a
 blank material

A New Material created in Inventory should be immediately usable.
---
 indra/newview/lltooldraganddrop.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 6633951db3..4705970c7b 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -40,6 +40,7 @@
 #include "llfloatertools.h"
 #include "llgesturemgr.h"
 #include "llgiveinventory.h"
+#include "llgltfmateriallist.h"
 #include "llhudmanager.h"
 #include "llhudeffecttrail.h"
 #include "llimview.h"
@@ -1095,12 +1096,17 @@ void LLToolDragAndDrop::dropMaterialOneFace(LLViewerObject* hit_obj,
         LL_WARNS() << "LLToolDragAndDrop::dropTextureOneFace no material item." << LL_ENDL;
         return;
     }
-    LLUUID asset_id = item->getAssetUUID();
     BOOL success = handleDropMaterialProtections(hit_obj, item, source, src_id);
     if (!success)
     {
         return;
     }
+    LLUUID asset_id = item->getAssetUUID();
+    if (asset_id.isNull())
+    {
+        // use blank material
+        asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+    }
 
     hit_obj->setRenderMaterialID(hit_face, asset_id);
 
@@ -1121,13 +1127,19 @@ void LLToolDragAndDrop::dropMaterialAllFaces(LLViewerObject* hit_obj,
         LL_WARNS() << "LLToolDragAndDrop::dropTextureAllFaces no material item." << LL_ENDL;
         return;
     }
-    LLUUID asset_id = item->getAssetUUID();
     BOOL success = handleDropMaterialProtections(hit_obj, item, source, src_id);
     if (!success)
     {
         return;
     }
 
+    LLUUID asset_id = item->getAssetUUID();
+    if (asset_id.isNull())
+    {
+        // use blank material
+        asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+    }
+
     hit_obj->setRenderMaterialIDs(asset_id);
     dialog_refresh_all();
     // send the update to the simulator
-- 
cgit v1.2.3


From ba4b596894e8eb9b9eb51169b9b3f88c21173c29 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Jul 2023 01:24:22 +0300
Subject: SL-19141 Fixed applying a no-copy texture to two objects failing
 silently

---
 indra/newview/llpanelface.cpp                      | 22 ++++++++++++++++----
 indra/newview/llselectmgr.cpp                      | 24 ++++++++++++++--------
 indra/newview/llselectmgr.h                        |  4 ++--
 .../newview/skins/default/xui/en/notifications.xml | 20 ++++++++++++++++++
 4 files changed, 56 insertions(+), 14 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 7d6015f557..702a8a82e2 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -520,7 +520,11 @@ void LLPanelFace::sendTexture()
 		{
 			id = mTextureCtrl->getImageAssetID();
 		}
-		LLSelectMgr::getInstance()->selectionSetImage(id);
+        if (!LLSelectMgr::getInstance()->selectionSetImage(id))
+        {
+            // need to refresh value in texture ctrl
+            refresh();
+        }
 	}
 }
 
@@ -3032,7 +3036,11 @@ void LLPanelFace::onCommitPbr(const LLSD& data)
         {
             id = pbr_ctrl->getImageAssetID();
         }
-        LLSelectMgr::getInstance()->selectionSetGLTFMaterial(id);
+        if (!LLSelectMgr::getInstance()->selectionSetGLTFMaterial(id))
+        {
+            // If failed to set material, refresh pbr_ctrl's value
+            refresh();
+        }
     }
 }
 
@@ -3056,8 +3064,14 @@ void LLPanelFace::onSelectPbr(const LLSD& data)
         {
             id = pbr_ctrl->getImageAssetID();
         }
-        LLSelectMgr::getInstance()->selectionSetGLTFMaterial(id);
-        LLSelectedTEMaterial::setMaterialID(this, id);
+        if (LLSelectMgr::getInstance()->selectionSetGLTFMaterial(id))
+        {
+            LLSelectedTEMaterial::setMaterialID(this, id);
+        }
+        else
+        {
+            refresh();
+        }
     }
 }
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index dca341e5a2..3b20ed1e00 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1821,7 +1821,7 @@ void LLObjectSelection::applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item)
 // selectionSetImage()
 //-----------------------------------------------------------------------------
 // *TODO: re-arch texture applying out of lltooldraganddrop
-void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
+bool LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 {
 	// First for (no copy) textures and multiple object selection
 	LLViewerInventoryItem* item = gInventory.getItem(imageid);
@@ -1829,9 +1829,11 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 		&& !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID())
 		&& (mSelectedObjects->getNumNodes() > 1) )
 	{
-		LL_WARNS() << "Attempted to apply no-copy texture to multiple objects"
-				<< LL_ENDL;
-		return;
+         LL_DEBUGS() << "Attempted to apply no-copy texture " << imageid
+             << " to multiple objects" << LL_ENDL;
+
+        LLNotificationsUtil::add("FailedToApplyTextureNoCopyToMultiple");
+        return false;
 	}
 
 	struct f : public LLSelectedTEFunctor
@@ -1896,12 +1898,14 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 		}
 	} sendfunc(item);
 	getSelection()->applyToObjects(&sendfunc);
+
+    return true;
 }
 
 //-----------------------------------------------------------------------------
 // selectionSetGLTFMaterial()
 //-----------------------------------------------------------------------------
-void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
+bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
 {
     // First for (no copy) textures and multiple object selection
     LLViewerInventoryItem* item = gInventory.getItem(mat_id);
@@ -1909,9 +1913,11 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
         && !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID())
         && (mSelectedObjects->getNumNodes() > 1))
     {
-        LL_WARNS() << "Attempted to apply no-copy material to multiple objects"
-            << LL_ENDL;
-        return;
+        LL_DEBUGS() << "Attempted to apply no-copy material " << mat_id
+            << "to multiple objects" << LL_ENDL;
+
+        LLNotificationsUtil::add("FailedToApplyGLTFNoCopyToMultiple");
+        return false;
     }
 
     struct f : public LLSelectedTEFunctor
@@ -1983,6 +1989,8 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
     getSelection()->applyToObjects(&sendfunc);
 
     LLGLTFMaterialList::flushUpdates();
+
+    return true;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index ca9a32f0db..327134a487 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -634,8 +634,8 @@ public:
 	void selectionSetDensity(F32 density);
 	void selectionSetRestitution(F32 restitution);
 	void selectionSetMaterial(U8 material);
-	void selectionSetImage(const LLUUID& imageid); // could be item or asset id
-    void selectionSetGLTFMaterial(const LLUUID& mat_id); // could be item or asset id
+	bool selectionSetImage(const LLUUID& imageid); // could be item or asset id
+    bool selectionSetGLTFMaterial(const LLUUID& mat_id); // could be item or asset id
 	void selectionSetColor(const LLColor4 &color);
 	void selectionSetColorOnly(const LLColor4 &color); // Set only the RGB channels
 	void selectionSetAlphaOnly(const F32 alpha); // Set only the alpha channel
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f77b235408..c4abd27a01 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9211,6 +9211,26 @@ Paste failed. [REASON]
     yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToApplyTextureNoCopyToMultiple"
+   type="alertmodal">
+Failed to apply texture. You can not apply a no-copy texture to multiple objects.
+   <usetemplate
+    name="okbutton"
+    yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToApplyGLTFNoCopyToMultiple"
+   type="alertmodal">
+Failed to apply GLTF material. You can not apply a no-copy material to multiple objects.
+   <usetemplate
+    name="okbutton"
+    yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="FacePasteTexturePermissions"
-- 
cgit v1.2.3


From 834a8eeddeda035551ed4071273c26e806946147 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 11 Jul 2023 21:25:10 +0200
Subject: SL-19728 Objects that cannot be clicked or cammed unless in edit mode

---
 indra/llcommon/indra_constants.h                   |  1 +
 indra/newview/llpanelpermissions.cpp               | 37 +++++++++++++---------
 indra/newview/llsidepaneltaskinfo.cpp              |  5 +--
 indra/newview/llspatialpartition.cpp               |  5 +++
 .../newview/skins/default/xui/en/floater_tools.xml |  6 +++-
 .../skins/default/xui/en/sidepanel_task_info.xml   |  4 +++
 6 files changed, 40 insertions(+), 18 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index 10b98f49aa..679f79039b 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -345,6 +345,7 @@ const U8 CLICK_ACTION_PLAY = 5;
 const U8 CLICK_ACTION_OPEN_MEDIA = 6;
 const U8 CLICK_ACTION_ZOOM = 7;
 const U8 CLICK_ACTION_DISABLED = 8;
+const U8 CLICK_ACTION_IGNORE = 9;
 // DO NOT CHANGE THE SEQUENCE OF THIS LIST!!
 
 
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 3e770958da..67f913a067 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -76,30 +76,34 @@ std::string click_action_to_string_value( U8 action);
 
 U8 string_value_to_click_action(std::string p_value)
 {
-	if(p_value == "Touch")
+	if (p_value == "Touch")
 	{
 		return CLICK_ACTION_TOUCH;
 	}
-	if(p_value == "Sit")
+	if (p_value == "Sit")
 	{
 		return CLICK_ACTION_SIT;
 	}
-	if(p_value == "Buy")
+	if (p_value == "Buy")
 	{
 		return CLICK_ACTION_BUY;
 	}
-	if(p_value == "Pay")
+	if (p_value == "Pay")
 	{
 		return CLICK_ACTION_PAY;
 	}
-	if(p_value == "Open")
+	if (p_value == "Open")
 	{
 		return CLICK_ACTION_OPEN;
 	}
-	if(p_value == "Zoom")
+	if (p_value == "Zoom")
 	{
 		return CLICK_ACTION_ZOOM;
 	}
+	if (p_value == "Ignore")
+	{
+		return CLICK_ACTION_IGNORE;
+	}
 	if (p_value == "None")
 	{
 		return CLICK_ACTION_DISABLED;
@@ -130,6 +134,9 @@ std::string click_action_to_string_value( U8 action)
 		case CLICK_ACTION_ZOOM:
 			return "Zoom";
 			break;
+		case CLICK_ACTION_IGNORE:
+			return "Ignore";
+			break;
 		case CLICK_ACTION_DISABLED:
 			return "None";
 			break;
@@ -274,12 +281,12 @@ void LLPanelPermissions::disableAll()
 		combo_click_action->setEnabled(FALSE);
 		combo_click_action->clear();
 	}
-	getChildView("B:")->setVisible(								FALSE);
-	getChildView("O:")->setVisible(								FALSE);
-	getChildView("G:")->setVisible(								FALSE);
-	getChildView("E:")->setVisible(								FALSE);
-	getChildView("N:")->setVisible(								FALSE);
-	getChildView("F:")->setVisible(								FALSE);
+	getChildView("B:")->setVisible(FALSE);
+	getChildView("O:")->setVisible(FALSE);
+	getChildView("G:")->setVisible(FALSE);
+	getChildView("E:")->setVisible(FALSE);
+	getChildView("N:")->setVisible(FALSE);
+	getChildView("F:")->setVisible(FALSE);
 }
 
 void LLPanelPermissions::refresh()
@@ -949,19 +956,19 @@ void LLPanelPermissions::refresh()
 	getChild<LLUICtrl>("search_check")->setValue(include_in_search);
 	getChild<LLUICtrl>("search_check")->setTentative( 				!all_include_in_search);
 
-	// Click action (touch, sit, buy)
+	// Click action (touch, sit, buy, pay, open, play, open media, zoom, ignore)
 	U8 click_action = 0;
 	if (LLSelectMgr::getInstance()->selectionGetClickAction(&click_action))
 	{
 		LLComboBox*	combo_click_action = getChild<LLComboBox>("clickaction");
-		if(combo_click_action)
+		if (combo_click_action)
 		{
 			const std::string combo_value = click_action_to_string_value(click_action);
 			combo_click_action->setValue(LLSD(combo_value));
 		}
 	}
 
-	if(LLSelectMgr::getInstance()->getSelection()->isAttachment())
+	if (LLSelectMgr::getInstance()->getSelection()->isAttachment())
 	{
 		getChildView("checkbox for sale")->setEnabled(FALSE);
 		getChildView("Edit Cost")->setEnabled(FALSE);
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 7fa06f51e3..225751ab92 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -849,7 +849,7 @@ void LLSidepanelTaskInfo::refresh()
 	const BOOL all_include_in_search = LLSelectMgr::getInstance()->selectionGetIncludeInSearch(&include_in_search);
 	getChildView("search_check")->setEnabled(has_change_sale_ability && all_volume);
 	getChild<LLUICtrl>("search_check")->setValue(include_in_search);
-	getChild<LLUICtrl>("search_check")->setTentative( 				!all_include_in_search);
+	getChild<LLUICtrl>("search_check")->setTentative(!all_include_in_search);
 
 	// Click action (touch, sit, buy)
 	U8 click_action = 0;
@@ -1150,7 +1150,8 @@ static U8 string_value_to_click_action(std::string p_value)
 void LLSidepanelTaskInfo::onCommitClickAction(LLUICtrl* ctrl, void*)
 {
 	LLComboBox* box = (LLComboBox*)ctrl;
-	if (!box) return;
+	if (!box)
+		return;
 	std::string value = box->getValue().asString();
 	U8 click_action = string_value_to_click_action(value);
 	doClickAction(click_action);
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 3e801a47d7..17c834326c 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -4003,6 +4003,11 @@ public:
 
 			if (vobj)
 			{
+				if (vobj->getClickAction() == CLICK_ACTION_IGNORE && !LLFloater::isVisible(gFloaterTools))
+				{
+					return false;
+				}
+
 				LLVector4a intersection;
 				bool skip_check = false;
 				if (vobj->isAvatar())
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d9b0ac0060..684470e0fc 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1114,10 +1114,14 @@
                  label="Open"
                  name="Open"
                  value="Open" />
-				 <combo_box.item
+                <combo_box.item
                  label="Zoom"
                  name="Zoom"
                  value="Zoom" />
+                <combo_box.item
+                 label="Ignore object"
+                 name="Ignoreobject"
+                 value="Ignore" />
                 <combo_box.item
                  label="None"
                  name="None"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 0b32215964..5f0241512a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -299,6 +299,10 @@
                  label="Zoom"
                  name="Zoom"
                  value="Zoom" />
+                <combo_box.item
+                 label="Ignore object"
+                 name="Ignoreobject"
+                 value="Ignore" />
                 <combo_box.item
                  label="None"
                  name="None"
-- 
cgit v1.2.3


From 59a626c2a22aa7cbccf87ce435012583d7610cd4 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 11 Jul 2023 16:08:03 -0700
Subject: SL-19992: Fix assert in LLVolumeLODGroup::refLOD when
 LLMeshRepository::notifyMeshUnavailable is called on the highest LOD

---
 indra/llmath/llvolumemgr.cpp       | 18 +++++++++---------
 indra/newview/llmeshrepository.cpp | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'indra')

diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp
index 89cdb1c6b9..9399504529 100644
--- a/indra/llmath/llvolumemgr.cpp
+++ b/indra/llmath/llvolumemgr.cpp
@@ -89,7 +89,7 @@ BOOL LLVolumeMgr::cleanup()
 // Note however that LLVolumeLODGroup that contains the volume
 //  also holds a LLPointer so the volume will only go away after
 //  anything holding the volume and the LODGroup are destroyed
-LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32 detail)
+LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32 lod)
 {
 	LLVolumeLODGroup* volgroupp;
 	if (mDataMutex)
@@ -109,7 +109,7 @@ LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32
 	{
 		mDataMutex->unlock();
 	}
-	return volgroupp->refLOD(detail);
+	return volgroupp->refLOD(lod);
 }
 
 // virtual
@@ -287,18 +287,18 @@ bool LLVolumeLODGroup::cleanupRefs()
 	return res;
 }
 
-LLVolume* LLVolumeLODGroup::refLOD(const S32 detail)
+LLVolume* LLVolumeLODGroup::refLOD(const S32 lod)
 {
-	llassert(detail >=0 && detail < NUM_LODS);
-	mAccessCount[detail]++;
+	llassert(lod >=0 && lod < NUM_LODS);
+	mAccessCount[lod]++;
 	
 	mRefs++;
-	if (mVolumeLODs[detail].isNull())
+	if (mVolumeLODs[lod].isNull())
 	{
-		mVolumeLODs[detail] = new LLVolume(mVolumeParams, mDetailScales[detail]);
+		mVolumeLODs[lod] = new LLVolume(mVolumeParams, mDetailScales[lod]);
 	}
-	mLODRefs[detail]++;
-	return mVolumeLODs[detail];
+	mLODRefs[lod]++;
+	return mVolumeLODs[lod];
 }
 
 BOOL LLVolumeLODGroup::derefLOD(LLVolume *volumep)
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 57ac111fdf..2118ee74d3 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3021,7 +3021,7 @@ S32 LLMeshRepository::getActualMeshLOD(LLMeshHeader& header, S32 lod)
 	}
 
 	//search up to find then ext available higher lod
-	for (S32 i = lod+1; i < 4; ++i)
+	for (S32 i = lod+1; i < LLVolumeLODGroup::NUM_LODS; ++i)
 	{
 		if (header.mLodSize[i] > 0)
 		{
@@ -3183,7 +3183,7 @@ void LLMeshHeaderHandler::processFailure(LLCore::HttpStatus status)
 
 	// Can't get the header so none of the LODs will be available
 	LLMutexLock lock(gMeshRepo.mThread->mMutex);
-	for (int i(0); i < 4; ++i)
+	for (int i(0); i < LLVolumeLODGroup::NUM_LODS; ++i)
 	{
 		gMeshRepo.mThread->mUnavailableQ.push_back(LLMeshRepoThread::LODRequest(mMeshParams, i));
 	}
@@ -3212,7 +3212,7 @@ void LLMeshHeaderHandler::processData(LLCore::BufferArray * /* body */, S32 /* b
 
 		// Can't get the header so none of the LODs will be available
 		LLMutexLock lock(gMeshRepo.mThread->mMutex);
-		for (int i(0); i < 4; ++i)
+		for (int i(0); i < LLVolumeLODGroup::NUM_LODS; ++i)
 		{
 			gMeshRepo.mThread->mUnavailableQ.push_back(LLMeshRepoThread::LODRequest(mMeshParams, i));
 		}
@@ -3293,7 +3293,7 @@ void LLMeshHeaderHandler::processData(LLCore::BufferArray * /* body */, S32 /* b
 
 			// headerReceived() parsed header, but header's data is invalid so none of the LODs will be available
 			LLMutexLock lock(gMeshRepo.mThread->mMutex);
-			for (int i(0); i < 4; ++i)
+			for (int i(0); i < LLVolumeLODGroup::NUM_LODS; ++i)
 			{
 				gMeshRepo.mThread->mUnavailableQ.push_back(LLMeshRepoThread::LODRequest(mMeshParams, i));
 			}
@@ -3654,7 +3654,7 @@ S32 LLMeshRepository::loadMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_para
 	// Manage time-to-load metrics for mesh download operations.
 	metricsProgress(1);
 
-	if (detail < 0 || detail >= 4)
+	if (detail < 0 || detail >= LLVolumeLODGroup::NUM_LODS)
 	{
 		return detail;
 	}
@@ -3717,7 +3717,7 @@ S32 LLMeshRepository::loadMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_para
 			}
 
 			//no lower LOD is a available, is a higher lod available?
-			for (S32 i = detail+1; i < 4; ++i)
+			for (S32 i = detail+1; i < LLVolumeLODGroup::NUM_LODS; ++i)
 			{
 				LLVolume* lod = group->refLOD(i);
 				if (lod && lod->isMeshAssetLoaded() && lod->getNumVolumeFaces() > 0)
@@ -3918,7 +3918,7 @@ void LLMeshRepository::notifyLoadedMeshes()
 				//create score map
 				std::map<LLUUID, F32> score_map;
 
-				for (U32 i = 0; i < 4; ++i)
+				for (U32 i = 0; i < LLVolumeLODGroup::NUM_LODS; ++i)
 				{
 					for (mesh_load_map::iterator iter = mLoadingMeshes[i].begin();  iter != mLoadingMeshes[i].end(); ++iter)
 					{
@@ -4099,7 +4099,7 @@ void LLMeshRepository::notifyMeshUnavailable(const LLVolumeParams& mesh_params,
 	{
 		F32 detail = LLVolumeLODGroup::getVolumeScaleFromDetail(lod);
 
-        LLVolume* sys_volume = LLPrimitive::getVolumeManager()->refVolume(mesh_params, detail);
+        LLVolume* sys_volume = LLPrimitive::getVolumeManager()->refVolume(mesh_params, lod);
         if (sys_volume)
         {
             sys_volume->setMeshAssetUnavaliable(true);
@@ -4480,7 +4480,7 @@ F32 LLMeshRepository::getStreamingCostLegacy(LLUUID mesh_id, F32 radius, S32* by
             {
                 LL_WARNS() << mesh_id << "bytes mismatch " << *bytes << " " << data.getSizeTotal() << LL_ENDL;
             }
-            if (bytes_visible && (lod >=0) && (lod < 4) && (*bytes_visible != data.getSizeByLOD(lod)))
+            if (bytes_visible && (lod >=0) && (lod < LLVolumeLODGroup::NUM_LODS) && (*bytes_visible != data.getSizeByLOD(lod)))
             {
                 LL_WARNS() << mesh_id << "bytes_visible mismatch " << *bytes_visible << " " << data.getSizeByLOD(lod) << LL_ENDL;
             }
@@ -4640,7 +4640,7 @@ bool LLMeshCostData::init(const LLMeshHeader& header)
     static LLCachedControl<U32> minimum_size(gSavedSettings, "MeshMinimumByteSize", 16); //make sure nothing is "free"
     static LLCachedControl<U32> bytes_per_triangle(gSavedSettings, "MeshBytesPerTriangle", 16);
 
-    for (S32 i=0; i<4; i++)
+    for (S32 i=0; i<LLVolumeLODGroup::NUM_LODS; i++)
     {
         mEstTrisByLOD[i] = llmax((F32)mSizeByLOD[i] - (F32)metadata_discount, (F32)minimum_size) / (F32)bytes_per_triangle;
     }
-- 
cgit v1.2.3


From 68a064431c6a5d3339727e7c58fcf338cf5d413f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 12 Jul 2023 12:44:23 +0300
Subject: SL-19702 don't skip double clicks when clicking scripted objects

---
 indra/newview/llviewerinput.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 226e0a9a56..7207d6c6ba 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -1617,9 +1617,9 @@ BOOL LLViewerInput::handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask,
 
         // If the first LMB click is handled by the menu, skip the following double click
         static bool skip_double_click = false;
-        if (clicktype == CLICK_LEFT && down && !is_toolmgr_action)
+        if (clicktype == CLICK_LEFT && down)
         {
-            skip_double_click = handled;
+            skip_double_click = is_toolmgr_action ? false : handled;
         }
 
         if (double_click_sp && down)
-- 
cgit v1.2.3


From 0a93c3e22d8df03a9989ebd89e85c4f5a578a2ce Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 12 Jul 2023 15:21:28 +0300
Subject: SL-19990 Brightness slider should be named HDR Scale unless
 Reflection Probe Ambiance (HDR) is 0

---
 indra/newview/llpaneleditsky.cpp | 6 +++---
 indra/newview/llpaneleditsky.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp
index 761d856aae..0a7a4763be 100644
--- a/indra/newview/llpaneleditsky.cpp
+++ b/indra/newview/llpaneleditsky.cpp
@@ -217,7 +217,7 @@ void LLPanelSettingsSkyAtmosTab::refresh()
     getChild<LLUICtrl>(FIELD_SKY_DENSITY_ICE_LEVEL)->setValue(ice_level);
     getChild<LLUICtrl>(FIELD_REFLECTION_PROBE_AMBIANCE)->setValue(rp_ambiance);
 
-    updateGammaLabel();
+    updateGammaLabel(should_auto_adjust);
 }
 
 //-------------------------------------------------------------------------
@@ -335,10 +335,10 @@ void LLPanelSettingsSkyAtmosTab::onReflectionProbeAmbianceChanged()
 }
 
 
-void LLPanelSettingsSkyAtmosTab::updateGammaLabel()
+void LLPanelSettingsSkyAtmosTab::updateGammaLabel(bool auto_adjust)
 {
     if (!mSkySettings) return;
-    F32 ambiance = mSkySettings->getReflectionProbeAmbiance();
+    F32 ambiance = mSkySettings->getReflectionProbeAmbiance(auto_adjust);
     if (ambiance != 0.f)
     {
         childSetValue("scene_gamma_label", getString("hdr_string"));
diff --git a/indra/newview/llpaneleditsky.h b/indra/newview/llpaneleditsky.h
index 33af667ab7..523cc134a8 100644
--- a/indra/newview/llpaneleditsky.h
+++ b/indra/newview/llpaneleditsky.h
@@ -80,7 +80,7 @@ private:
     void                    onDropletRadiusChanged();
     void                    onIceLevelChanged();
     void                    onReflectionProbeAmbianceChanged();
-    void                    updateGammaLabel();
+    void                    updateGammaLabel(bool auto_adjust = false);
 
 };
 
-- 
cgit v1.2.3


From 162f10e021d778e499836bd1f9d1f88b004b8017 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Wed, 12 Jul 2023 14:18:20 -0700
Subject: added info log lines for assistance diagnosing SL-19968

---
 indra/newview/llvocache.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 55fc663496..8d1f5b5f5b 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -1086,6 +1086,8 @@ void LLVOCache::initCache(ELLPath location, U32 size, U32 cache_version)
 
 	readCacheHeader();	
 
+	LL_INFOS() << "Viewer Object Cache Versions - expected: " << cache_version << " found: " << mMetaInfo.mVersion <<  LL_ENDL;
+
 	if( mMetaInfo.mVersion != cache_version
 		|| mMetaInfo.mAddressSize != expected_address) 
 	{
@@ -1096,7 +1098,8 @@ void LLVOCache::initCache(ELLPath location, U32 size, U32 cache_version)
 			clearCacheInMemory();
 		}
 		else //delete the current cache if the format does not match.
-		{			
+		{
+			LL_INFOS() << "Viewer Object Cache Versions unmatched.  clearing cache." <<  LL_ENDL;
 			removeCache();
 		}
 	}	
-- 
cgit v1.2.3


From afcb421bdc666d9b45fb5adb7098b7e433042823 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Thu, 6 Jul 2023 12:53:42 -0700
Subject: SL-19567: (WIP) Add options to use higher precision for glow and
 post-process buffers. Disabled by default.

---
 indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++
 indra/newview/llviewercontrol.cpp       |  2 ++
 indra/newview/pipeline.cpp              |  8 ++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 09eda2534c..9f3a5bd5b9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9340,6 +9340,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>RenderPostProcessingHDR</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable HDR for post processing buffer</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>RenderMaxOpenGLVersion</key>
   <map>
     <key>Comment</key>
@@ -10155,6 +10166,17 @@
       <key>Value</key>
       <integer>9</integer>
     </map>
+    <key>RenderGlowHDR</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable HDR for glow map</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>RenderGlowStrength</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index aae4409167..9707a2a7e6 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -700,6 +700,7 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "RenderUIBuffer", handleWindowResized);
     setting_setup_signal_listener(gSavedSettings, "RenderDepthOfField", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderFSAASamples", handleReleaseGLBufferChanged);
+    setting_setup_signal_listener(gSavedSettings, "RenderPostProcessingHDR", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderSpecularResX", handleLUTBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderSpecularResY", handleLUTBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderSpecularExponent", handleLUTBufferChanged);
@@ -708,6 +709,7 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "RenderGlow", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGlow", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGlowResolutionPow", handleReleaseGLBufferChanged);
+    setting_setup_signal_listener(gSavedSettings, "RenderGlowHDR", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGammaFull", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderVolumeLODFactor", handleVolumeLODChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderAvatarLODFactor", handleAvatarLODChanged);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 0c767e7767..4183990261 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -840,7 +840,9 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)
         mSceneMap.allocate(resX, resY, GL_RGB, true);
     }
 
-    mPostMap.allocate(resX, resY, GL_RGBA);
+	const bool post_hdr = gSavedSettings.getBOOL("RenderPostProcessingHDR");
+    const U32 post_color_fmt = post_hdr ? GL_RGBA16F : GL_RGBA;
+    mPostMap.allocate(resX, resY, post_color_fmt);
 
     //HACK make screenbuffer allocations start failing after 30 seconds
     if (gSavedSettings.getBOOL("SimulateFBOFailure"))
@@ -1163,9 +1165,11 @@ void LLPipeline::createGLBuffers()
 
     // allocate screen space glow buffers
     const U32 glow_res = llmax(1, llmin(512, 1 << gSavedSettings.getS32("RenderGlowResolutionPow")));
+	const bool glow_hdr = gSavedSettings.getBOOL("RenderGlowHDR");
+    const U32 glow_color_fmt = glow_hdr ? GL_RGBA16F : GL_RGBA;
     for (U32 i = 0; i < 3; i++)
     {
-        mGlow[i].allocate(512, glow_res, GL_RGBA);
+        mGlow[i].allocate(512, glow_res, glow_color_fmt);
     }
 
     allocateScreenBuffer(resX, resY);
-- 
cgit v1.2.3


From 66283201301b0e55336f4b20407fed811acdc739 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 11 Jul 2023 09:51:14 -0700
Subject: SL-19567: Add option RenderGlowNoise for low precision glow
 dithering, enabled by default

---
 indra/llrender/llshadermgr.cpp                           |  3 ++-
 indra/llrender/llshadermgr.h                             |  1 +
 indra/newview/app_settings/settings.xml                  | 11 +++++++++++
 .../shaders/class1/effects/glowExtractF.glsl             | 15 ++++++++++++++-
 indra/newview/llviewercontrol.cpp                        |  1 +
 indra/newview/llviewershadermgr.cpp                      | 11 ++++++++++-
 indra/newview/pipeline.cpp                               | 16 ++++++++++++++++
 indra/newview/pipeline.h                                 |  1 +
 8 files changed, 56 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 75d6ef6c46..22940dc703 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1300,8 +1300,9 @@ void LLShaderMgr::initAttribsAndUniforms()
 	mReservedUniforms.push_back("warmthAmount");
 	mReservedUniforms.push_back("glowStrength");
 	mReservedUniforms.push_back("glowDelta");
+	mReservedUniforms.push_back("glowNoiseMap");
 
-	llassert(mReservedUniforms.size() == LLShaderMgr::GLOW_DELTA+1);
+	llassert(mReservedUniforms.size() == LLShaderMgr::GLOW_NOISE_MAP+1);
 
 
 	mReservedUniforms.push_back("minimum_alpha");
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index 46f352aa58..ac4b393fb7 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -131,6 +131,7 @@ public:
         GLOW_WARMTH_AMOUNT,                 //  "warmthAmount"
         GLOW_STRENGTH,                      //  "glowStrength"
         GLOW_DELTA,                         //  "glowDelta"
+        GLOW_NOISE_MAP,                     //  "glowNoiseMap"
 
         MINIMUM_ALPHA,                      //  "minimum_alpha"
         EMISSIVE_BRIGHTNESS,                //  "emissive_brightness"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9f3a5bd5b9..8e5e092250 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10225,6 +10225,17 @@
       <key>Value</key>
       <real>1.3</real>
     </map>
+    <key>RenderGlowNoise</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables glow noise (dithering). Reduces banding from glow in certain cases.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>1</real>
+    </map>
     <key>DisableAllRenderTypes</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl
index 7a5e14566b..b5437d43d2 100644
--- a/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl
+++ b/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl
@@ -28,6 +28,10 @@
 out vec4 frag_color;
 
 uniform sampler2D diffuseMap;
+#if HAS_NOISE
+uniform sampler2D glowNoiseMap;
+uniform vec2 screen_res;
+#endif
 uniform float minLuminance;
 uniform float maxExtractAlpha;
 uniform vec3 lumWeights;
@@ -44,7 +48,16 @@ void main()
 	float lum = smoothstep(minLuminance, minLuminance+1.0, dot(col.rgb, lumWeights ) );
 	float warmth = smoothstep(minLuminance, minLuminance+1.0, max(col.r * warmthWeights.r, max(col.g * warmthWeights.g, col.b * warmthWeights.b)) ); 
 	
-	frag_color.rgb = col.rgb; 
+#if HAS_NOISE
+    float TRUE_NOISE_RES = 128; // See mTrueNoiseMap
+    // *NOTE: Usually this is vary_fragcoord not vary_texcoord0, but glow extraction is in screen space
+    vec3 glow_noise = texture(glowNoiseMap, vary_texcoord0.xy * (screen_res / TRUE_NOISE_RES)).xyz;
+    // Dithering. Reduces banding effects in the reduced precision glow buffer.
+    float NOISE_DEPTH = 64.0;
+    col.rgb += glow_noise / NOISE_DEPTH;
+    col.rgb = max(col.rgb, vec3(0));
+#endif
+	frag_color.rgb = col.rgb;
 	frag_color.a = max(col.a, mix(lum, warmth, warmthAmount) * maxExtractAlpha);
 	
 }
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 9707a2a7e6..9f4287c23d 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -710,6 +710,7 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "RenderGlow", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGlowResolutionPow", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGlowHDR", handleReleaseGLBufferChanged);
+    setting_setup_signal_listener(gSavedSettings, "RenderGlowNoise", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGammaFull", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderVolumeLODFactor", handleVolumeLODChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderAvatarLODFactor", handleAvatarLODChanged);
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 4559d71d6d..82b16d67bd 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -898,11 +898,20 @@ BOOL LLViewerShaderMgr::loadShadersEffects()
 	
 	if (success)
 	{
-		gGlowExtractProgram.mName = "Glow Extract Shader (Post)";
+        const bool use_glow_noise = gSavedSettings.getBOOL("RenderGlowNoise");
+        const std::string glow_noise_label = use_glow_noise ? " (+Noise)" : "";
+
+		gGlowExtractProgram.mName = llformat("Glow Extract Shader (Post)%s", glow_noise_label.c_str());
 		gGlowExtractProgram.mShaderFiles.clear();
 		gGlowExtractProgram.mShaderFiles.push_back(make_pair("effects/glowExtractV.glsl", GL_VERTEX_SHADER));
 		gGlowExtractProgram.mShaderFiles.push_back(make_pair("effects/glowExtractF.glsl", GL_FRAGMENT_SHADER));
 		gGlowExtractProgram.mShaderLevel = mShaderLevel[SHADER_EFFECT];
+
+        if (use_glow_noise)
+        {
+            gGlowExtractProgram.addPermutation("HAS_NOISE", "1");
+        }
+
 		success = gGlowExtractProgram.createShader(NULL, NULL);
 		if (!success)
 		{
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 4183990261..d50e671e05 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -157,6 +157,7 @@ S32 LLPipeline::RenderGlowResolutionPow;
 S32 LLPipeline::RenderGlowIterations;
 F32 LLPipeline::RenderGlowWidth;
 F32 LLPipeline::RenderGlowStrength;
+bool LLPipeline::RenderGlowNoise;
 bool LLPipeline::RenderDepthOfField;
 bool LLPipeline::RenderDepthOfFieldInEditMode;
 F32 LLPipeline::CameraFocusTransitionTime;
@@ -517,6 +518,7 @@ void LLPipeline::init()
 	connectRefreshCachedSettingsSafe("RenderGlowIterations");
 	connectRefreshCachedSettingsSafe("RenderGlowWidth");
 	connectRefreshCachedSettingsSafe("RenderGlowStrength");
+	connectRefreshCachedSettingsSafe("RenderGlowNoise");
 	connectRefreshCachedSettingsSafe("RenderDepthOfField");
 	connectRefreshCachedSettingsSafe("RenderDepthOfFieldInEditMode");
 	connectRefreshCachedSettingsSafe("CameraFocusTransitionTime");
@@ -1007,6 +1009,7 @@ void LLPipeline::refreshCachedSettings()
 	RenderGlowIterations = gSavedSettings.getS32("RenderGlowIterations");
 	RenderGlowWidth = gSavedSettings.getF32("RenderGlowWidth");
 	RenderGlowStrength = gSavedSettings.getF32("RenderGlowStrength");
+	RenderGlowNoise = gSavedSettings.getBOOL("RenderGlowNoise");
 	RenderDepthOfField = gSavedSettings.getBOOL("RenderDepthOfField");
 	RenderDepthOfFieldInEditMode = gSavedSettings.getBOOL("RenderDepthOfFieldInEditMode");
 	CameraFocusTransitionTime = gSavedSettings.getF32("CameraFocusTransitionTime");
@@ -6886,6 +6889,19 @@ void LLPipeline::generateGlow(LLRenderTarget* src)
 			warmthWeights.mV[2]);
 		gGlowExtractProgram.uniform1f(LLShaderMgr::GLOW_WARMTH_AMOUNT, warmthAmount);
 
+        if (RenderGlowNoise)
+        {
+            S32 channel = gGlowExtractProgram.enableTexture(LLShaderMgr::GLOW_NOISE_MAP);
+            if (channel > -1)
+            {
+                gGL.getTexUnit(channel)->bindManual(LLTexUnit::TT_TEXTURE, mTrueNoiseMap);
+                gGL.getTexUnit(channel)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
+            }
+            gGlowExtractProgram.uniform2f(LLShaderMgr::DEFERRED_SCREEN_RES,
+                                          mGlow[2].getWidth(),
+                                          mGlow[2].getHeight());
+        }
+
 		{
 			LLGLEnable blend_on(GL_BLEND);
 
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 961a55330a..c0559ce83b 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -1001,6 +1001,7 @@ public:
 	static S32 RenderGlowIterations;
 	static F32 RenderGlowWidth;
 	static F32 RenderGlowStrength;
+	static bool RenderGlowNoise;
 	static bool RenderDepthOfField;
 	static bool RenderDepthOfFieldInEditMode;
 	static F32 CameraFocusTransitionTime;
-- 
cgit v1.2.3


From 5ce4d42f55187e710fac64efbd34947900ef2d58 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 13 Jul 2023 18:52:45 +0300
Subject: SL-19993 Warn of automatic changes to Day Cycle when it's opened

---
 indra/newview/llfloatereditextdaycycle.cpp | 24 ++++++++++++++++++++++++
 indra/newview/llfloatereditextdaycycle.h   |  2 ++
 2 files changed, 26 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 6e8143384a..bb47feaa95 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -475,6 +475,8 @@ void LLFloaterEditExtDayCycle::refresh()
 void LLFloaterEditExtDayCycle::setEditSettingsAndUpdate(const LLSettingsBase::ptr_t &settings)
 {
     setEditDayCycle(std::dynamic_pointer_cast<LLSettingsDay>(settings));
+
+    showHDRNotification(std::dynamic_pointer_cast<LLSettingsDay>(settings));
 }
 
 void LLFloaterEditExtDayCycle::setEditDayCycle(const LLSettingsDay::ptr_t &pday)
@@ -1710,6 +1712,28 @@ void LLFloaterEditExtDayCycle::onPickerCommitSetting(LLUUID item_id, S32 track)
     }
 }
 
+void LLFloaterEditExtDayCycle::showHDRNotification(const LLSettingsDay::ptr_t &pday)
+{
+    for (U32 i = LLSettingsDay::TRACK_GROUND_LEVEL; i <= LLSettingsDay::TRACK_MAX; i++)
+    {
+        LLSettingsDay::CycleTrack_t &day_track = pday->getCycleTrack(i);
+
+        LLSettingsDay::CycleTrack_t::iterator iter = day_track.begin();
+        LLSettingsDay::CycleTrack_t::iterator end = day_track.end();
+
+        while (iter != end)
+        {
+            LLSettingsSky::ptr_t sky = std::static_pointer_cast<LLSettingsSky>(iter->second);
+            if (sky && sky->canAutoAdjust()) 
+            {
+                LLNotificationsUtil::add("AutoAdjustHDRSky");
+                return;
+            }
+            iter++;
+        }
+    }
+}
+
 void LLFloaterEditExtDayCycle::onAssetLoadedForInsertion(LLUUID item_id, LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status, S32 source_track, S32 dest_track, LLSettingsBase::TrackPosition frame)
 {
     std::function<void()> cb = [this, settings, frame, source_track, dest_track]()
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index ab5d12fa36..025a2ee5d1 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -188,6 +188,8 @@ private:
     bool                        isRemovingFrameAllowed();
     bool                        isAddingFrameAllowed();
 
+    void                        showHDRNotification(const LLSettingsDay::ptr_t &pday);
+
     LLSettingsDay::ptr_t        mEditDay; // edited copy
     LLSettingsDay::Seconds      mDayLength;
     U32                         mCurrentTrack;
-- 
cgit v1.2.3


From df1eb38b2109bf9cb57b42e2c361c4143276ae5a Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Thu, 13 Jul 2023 10:08:19 -0700
Subject: SL-19999 stop outputing debug info about created material asset id
 unnecessarily

---
 indra/newview/llmaterialeditor.cpp                   | 4 +---
 indra/newview/skins/default/xui/en/notifications.xml | 7 -------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 609d8ea5d7..3a0e64985c 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1327,9 +1327,7 @@ void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std:
                 [](LLUUID item_id, LLUUID new_asset_id, LLUUID new_item_id, LLSD response)
                 {
                     // done callback
-                    LL_INFOS("Material") << "inventory item uploaded.  item: " << item_id << " asset: " << new_asset_id << " new_item_id: " << new_item_id << " response: " << response << LL_ENDL;
-                    LLSD params = llsd::map("ASSET_ID", new_asset_id);
-                    LLNotificationsUtil::add("MaterialCreated", params);
+                    LL_INFOS("Material") << "inventory item uploaded.  item: " << item_id << " new_item_id: " << new_item_id << " response: " << response << LL_ENDL;
                 },
                 nullptr // failure callback, floater already closed
             );
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c4abd27a01..3d151a9868 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12098,13 +12098,6 @@ Would you like to save them first?
        yestext="Yes"/>
   </notification>
     
-<notification
- icon="notifytip.tga"
- name="MaterialCreated"
- type="notifytip">
-Material successfully created.  Asset ID: [ASSET_ID]
-</notification>
-
   <notification
     icon="notifytip.tga"
     name="ReflectionProbeApplied"
-- 
cgit v1.2.3


From d192d91db95ec9ed3ad47039e126134bc05ad5f4 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Thu, 13 Jul 2023 11:28:36 -0700
Subject: Fixed failure to open Material Editor when creating or uploading a
 new material

found this warning found while working on SL-19999
---
 indra/newview/llviewermessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f14e3ed737..b756d3d87f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1532,7 +1532,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
 						LLFloaterReg::showInstance("preview_sound", LLSD(obj_id), take_focus);
 						break;
                     case LLAssetType::AT_MATERIAL:
-                        LLFloaterReg::showInstance("material editor", LLSD(obj_id), take_focus);
+                        LLFloaterReg::showInstance("material_editor", LLSD(obj_id), take_focus);
                         break;
 					default:
 						LL_DEBUGS("Messaging") << "No preview method for previewable asset type : " << LLAssetType::lookupHumanReadable(asset_type)  << LL_ENDL;
-- 
cgit v1.2.3


From 2f8f1c7a44f45490db5b5f040914e42aef2f5280 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Fri, 14 Jul 2023 12:46:20 -0700
Subject: Fix crash SL-20013 crash when applying nocopy material via
 drag-and-drop

---
 indra/newview/lltooldraganddrop.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 4705970c7b..1918d11964 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1096,12 +1096,16 @@ void LLToolDragAndDrop::dropMaterialOneFace(LLViewerObject* hit_obj,
         LL_WARNS() << "LLToolDragAndDrop::dropTextureOneFace no material item." << LL_ENDL;
         return;
     }
+
+    // SL-20013 must save asset_id before handleDropMaterialProtections since our item instance
+    // may be deleted if it is moved into task inventory
+    LLUUID asset_id = item->getAssetUUID();
     BOOL success = handleDropMaterialProtections(hit_obj, item, source, src_id);
     if (!success)
     {
         return;
     }
-    LLUUID asset_id = item->getAssetUUID();
+
     if (asset_id.isNull())
     {
         // use blank material
@@ -1127,13 +1131,17 @@ void LLToolDragAndDrop::dropMaterialAllFaces(LLViewerObject* hit_obj,
         LL_WARNS() << "LLToolDragAndDrop::dropTextureAllFaces no material item." << LL_ENDL;
         return;
     }
+
+    // SL-20013 must save asset_id before handleDropMaterialProtections since our item instance
+    // may be deleted if it is moved into task inventory
+    LLUUID asset_id = item->getAssetUUID();
     BOOL success = handleDropMaterialProtections(hit_obj, item, source, src_id);
+
     if (!success)
     {
         return;
     }
 
-    LLUUID asset_id = item->getAssetUUID();
     if (asset_id.isNull())
     {
         // use blank material
-- 
cgit v1.2.3


From ec4135da63a3f3877222fba4ecb59b15650371fe Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 17 Jul 2023 16:12:39 -0400
Subject: Increment viewer version to 6.6.14 following promotion of DRTVWR-580

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 97154f804c..e9d5f8c17f 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.6.13
+6.6.14
-- 
cgit v1.2.3


From 4b268a5d6add40b7d948485f062ca60e77062bc8 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Mon, 17 Jul 2023 15:32:28 -0700
Subject: Delete unprintable chars that accidentally got into the merge in
 kdiff3 for DRTVWR-559

---
 indra/newview/llpanelface.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index e9586d478f..ff21438085 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1024,7 +1024,6 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         mComboMatMedia->setEnabled(editable);
 
         LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
-
         if (radio_mat_type->getSelectedIndex() < MATTYPE_DIFFUSE)
         {
             radio_mat_type->selectNthItem(MATTYPE_DIFFUSE);
-- 
cgit v1.2.3


From f9f5b538b21ae57f34009b36d4831d2a7000c20c Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Mon, 17 Jul 2023 15:50:59 -0700
Subject: DRTVWR-559 fix for lines lost in the merge

---
 indra/newview/llfilepicker.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 353861969c..4ad136e13a 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -194,12 +194,14 @@ BOOL LLFilePicker::setupFilter(ELoadFilter filter)
 		mOFN.lpstrFilter = ANIM_FILTER \
 			L"\0";
 		break;
-    case FFLOAD_GLTF:
-        mOFN.lpstrFilter = GLTF_FILTER \
-            L"\0";
-        break;
-    case FFLOAD_COLLADA:
+	case FFLOAD_GLTF:
+		mOFN.lpstrFilter = GLTF_FILTER \
+			L"\0";
+		break;
+	case FFLOAD_COLLADA:
 		mOFN.lpstrFilter = COLLADA_FILTER \
+			L"\0";
+		break;
 	case FFLOAD_XML:
 		mOFN.lpstrFilter = XML_FILTER \
 			L"\0";
-- 
cgit v1.2.3


From bc3f2d53d10c64ccded6aaa14ea37eac78ef6856 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 18 Jul 2023 01:56:42 +0300
Subject: SL-19891 Make sure focusable elements clear focus on destruction

---
 indra/llcharacter/llkeyframemotion.cpp | 21 ++++++++++++++-------
 indra/llui/lldraghandle.cpp            |  1 +
 indra/llui/llfolderviewitem.cpp        |  1 +
 indra/llui/lllayoutstack.cpp           |  2 ++
 indra/llui/llresizehandle.cpp          |  5 +++++
 indra/llui/llresizehandle.h            |  1 +
 indra/newview/llviewermediafocus.cpp   |  1 +
 7 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 3cef382bbf..d95ec159f2 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -497,13 +497,20 @@ LLMotion::LLMotionInitStatus LLKeyframeMotion::onInitialize(LLCharacter *charact
 		// request asset
 		mAssetStatus = ASSET_FETCHED;
 
-        LL_DEBUGS("Animation") << "Requesting data fetch for: " << mID << LL_ENDL;
-		character_id = new LLUUID(mCharacter->getID());
-		gAssetStorage->getAssetData(mID,
-						LLAssetType::AT_ANIMATION,
-						onLoadComplete,
-						(void *)character_id,
-						FALSE);
+        if (mID.notNull())
+        {
+            LL_DEBUGS("Animation") << "Requesting data fetch for: " << mID << LL_ENDL;
+            character_id = new LLUUID(mCharacter->getID());
+            gAssetStorage->getAssetData(mID,
+                                        LLAssetType::AT_ANIMATION,
+                                        onLoadComplete,
+                                        (void*)character_id,
+                                        FALSE);
+        }
+        else
+        {
+            LL_INFOS("Animation") << "Attempted to fetch animation " << mName << " with null id for character " << mCharacter->getID() << LL_ENDL;
+        }
 
 		return STATUS_HOLD;
 	case ASSET_FETCHED:
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp
index 48bf5bb80f..220f5ee825 100644
--- a/indra/llui/lldraghandle.cpp
+++ b/indra/llui/lldraghandle.cpp
@@ -68,6 +68,7 @@ LLDragHandle::LLDragHandle(const LLDragHandle::Params& p)
 
 LLDragHandle::~LLDragHandle()
 {
+    gFocusMgr.removeKeyboardFocusWithoutCallback(this);
 	removeChild(mTitleBox);
 	delete mTitleBox;
 }
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index e2b5279aab..5319af1b60 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -177,6 +177,7 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 LLFolderViewItem::~LLFolderViewItem()
 {
 	mViewModelItem = NULL;
+    gFocusMgr.removeKeyboardFocusWithoutCallback(this);
 }
 
 BOOL LLFolderViewItem::postBuild()
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index ae9dba5945..7b22f9dbdc 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -89,6 +89,8 @@ LLLayoutPanel::~LLLayoutPanel()
 	// probably not necessary, but...
 	delete mResizeBar;
 	mResizeBar = NULL;
+
+    gFocusMgr.removeKeyboardFocusWithoutCallback(this);
 }
 
 F32 LLLayoutPanel::getAutoResizeFactor() const
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp
index 24794305ac..13ef0fdb7f 100644
--- a/indra/llui/llresizehandle.cpp
+++ b/indra/llui/llresizehandle.cpp
@@ -70,6 +70,11 @@ LLResizeHandle::LLResizeHandle(const LLResizeHandle::Params& p)
 	}
 }
 
+LLResizeHandle::~LLResizeHandle()
+{
+    gFocusMgr.removeKeyboardFocusWithoutCallback(this);
+}
+
 
 BOOL LLResizeHandle::handleMouseDown(S32 x, S32 y, MASK mask)
 {
diff --git a/indra/llui/llresizehandle.h b/indra/llui/llresizehandle.h
index 7541b9e6c0..ae20ecaa77 100644
--- a/indra/llui/llresizehandle.h
+++ b/indra/llui/llresizehandle.h
@@ -45,6 +45,7 @@ public:
 		Params();
 	};
 
+    ~LLResizeHandle();
 protected:
 	LLResizeHandle(const LLResizeHandle::Params&);
 	friend class LLUICtrlFactory;
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index ba80eeb6b6..e914e2121c 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -63,6 +63,7 @@ LLViewerMediaFocus::~LLViewerMediaFocus()
 {
 	// The destructor for LLSingletons happens at atexit() time, which is too late to do much.
 	// Clean up in cleanupClass() instead.
+    gFocusMgr.removeKeyboardFocusWithoutCallback(this);
 }
 
 void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal)
-- 
cgit v1.2.3


From 71e7c7c705434b8290d802b46c92c0eb808dd2f1 Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Wed, 7 Jun 2023 16:16:06 -0700
Subject: Fixes for compatibility with new xcode 15 beta for any viewer branch
 after DRTVWR-577 (#232)

---
 indra/cmake/00-Common.cmake        | 4 ++++
 indra/newview/llviewerthrottle.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index a44fe5a8d5..c708199309 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -171,6 +171,10 @@ if (DARWIN)
 ## Really?? On developer machines too?
 ##set(ENABLE_SIGNING TRUE)
 ##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
+
+  # required for clang-15/xcode-15 since our boost package still uses deprecated std::unary_function/binary_function
+  # see https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#C++-Standard-Library
+  add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
 endif (DARWIN)
 
 if (LINUX OR DARWIN)
diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp
index 2729253d18..20390a316a 100644
--- a/indra/newview/llviewerthrottle.cpp
+++ b/indra/newview/llviewerthrottle.cpp
@@ -84,7 +84,7 @@ LLViewerThrottleGroup::LLViewerThrottleGroup()
 }
 
 
-LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[])
+LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[TC_EOF])
 {
 	mThrottleTotal = 0.f;
 	S32 i;
-- 
cgit v1.2.3


From a0089c432ac9008f5d2f7ef2a332afa10c5a2615 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 18 Jul 2023 12:18:07 -0500
Subject: SL-19954 Fix for rigged alpha pbr sometimes not getting reflection
 probe parameters

---
 indra/newview/lldrawpoolalpha.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 07b7be0fc8..65c7c1413b 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -204,6 +204,10 @@ void LLDrawPoolAlpha::renderPostDeferred(S32 pass)
 
     prepare_alpha_shader(pbr_shader, false, true, water_sign);
 
+    // explicitly unbind here so render loop doesn't make assumptions about the last shader
+    // already being setup for rendering
+    LLGLSLShader::unbind();
+
     if (!LLPipeline::sRenderingHUDs)
     {
         // first pass, render rigged objects only and render to depth buffer
-- 
cgit v1.2.3


From bb5e40a1fdc35b3a41925f91684bc76854338cfb Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 18 Jul 2023 12:23:03 -0500
Subject: SL-19953 Change label of alpha value in GLTF material editor to
 "Alpha"

---
 indra/newview/skins/default/xui/en/panel_gltf_material.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index 6975525b3d..45df40bc05 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -98,7 +98,7 @@
       top_pad="5"
       width="96"
       name="base_color_transparency_lbl">
-      Transparency
+      Alpha
     </text>
     <spinner
       decimal_digits="3"
-- 
cgit v1.2.3


From ca247e9a8003c11e8a0c49a68a24944539ec5e02 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 18 Jul 2023 22:04:32 +0300
Subject: SL-5161 SL-20025 Unref volume

---
 indra/newview/llmeshrepository.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 2118ee74d3..9ccb42cdc5 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -4103,6 +4103,7 @@ void LLMeshRepository::notifyMeshUnavailable(const LLVolumeParams& mesh_params,
         if (sys_volume)
         {
             sys_volume->setMeshAssetUnavaliable(true);
+            LLPrimitive::getVolumeManager()->unrefVolume(sys_volume);
         }
 
 		for (LLVOVolume* vobj : obj_iter->second)
-- 
cgit v1.2.3


From f8139b1bc47fd7b930498e0b2b19676834521025 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 18 Jul 2023 13:01:50 -0700
Subject: SL-20018: Fix PBR glow affected by Blinn-Phong alpha

---
 indra/newview/llvovolume.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 08d2e99c40..e8623b1cc3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -6484,12 +6484,15 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
                 }
             }
 
-            F32 te_alpha = te->getColor().mV[3]; 
+            F32 blinn_phong_alpha = te->getColor().mV[3];
 			bool use_legacy_bump = te->getBumpmap() && (te->getBumpmap() < 18) && (!mat || mat->getNormalID().isNull());
-			bool opaque = te_alpha >= 0.999f;
-            bool transparent = te_alpha < 0.999f;
+			bool blinn_phong_opaque = blinn_phong_alpha >= 0.999f;
+            bool blinn_phong_transparent = blinn_phong_alpha < 0.999f;
 
-            is_alpha = (is_alpha || transparent) ? TRUE : FALSE;
+            if (!gltf_mat)
+            {
+                is_alpha = (is_alpha || blinn_phong_transparent) ? TRUE : FALSE;
+            }
 
 			if (gltf_mat || (mat && !hud_group))
 			{
@@ -6519,7 +6522,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
 				{
 					if (mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_MASK)
 					{
-						if (opaque)
+						if (blinn_phong_opaque)
 						{
 							registerFace(group, facep, LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK);
 						}
@@ -6540,7 +6543,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
 						}
 						else
 						{
-                            if (opaque)
+                            if (blinn_phong_opaque)
 						    {
 							    registerFace(group, facep, LLRenderPass::PASS_FULLBRIGHT);
                             }
@@ -6551,7 +6554,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
 						}
 					}
 				}
-				else if (transparent)
+				else if (blinn_phong_transparent)
 				{
 					registerFace(group, facep, LLRenderPass::PASS_ALPHA);
 				}
-- 
cgit v1.2.3


From bb08f68db1233870fd4615a68543220c8d608b93 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 19 Jul 2023 09:40:33 -0500
Subject: SL-19977 Fix for glow not getting applied to both sides of double
 sided alpha

---
 indra/newview/lldrawpoolalpha.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 0f4466044c..7aa3450be1 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -514,6 +514,7 @@ void LLDrawPoolAlpha::renderPbrEmissives(std::vector<LLDrawInfo*>& emissives)
     for (LLDrawInfo* draw : emissives)
     {
         llassert(draw->mGLTFMaterial);
+        LLGLDisable cull_face(draw->mGLTFMaterial->mDoubleSided ? GL_CULL_FACE : 0);
         draw->mGLTFMaterial->bind(draw->mTexture);
         draw->mVertexBuffer->setBuffer();
         draw->mVertexBuffer->drawRange(LLRender::TRIANGLES, draw->mStart, draw->mEnd, draw->mCount, draw->mOffset);
@@ -569,6 +570,7 @@ void LLDrawPoolAlpha::renderRiggedPbrEmissives(std::vector<LLDrawInfo*>& emissiv
             lastMeshId = draw->mSkinInfo->mHash;
         }
 
+        LLGLDisable cull_face(draw->mGLTFMaterial->mDoubleSided ? GL_CULL_FACE : 0);
         draw->mGLTFMaterial->bind(draw->mTexture);
         draw->mVertexBuffer->setBuffer();
         draw->mVertexBuffer->drawRange(LLRender::TRIANGLES, draw->mStart, draw->mEnd, draw->mCount, draw->mOffset);
-- 
cgit v1.2.3


From c85bb7846d270ba23c447c1b0073cd238d5fd1bc Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 19 Jul 2023 12:52:36 -0500
Subject: DRTVWR-559 Fix for shadows not respecting double sided on opaque PBR
 surfaces

---
 indra/newview/lldrawpool.cpp | 82 ++++++++++++++++++++++++++++++++++++++++++++
 indra/newview/lldrawpool.h   | 21 +++++++++++-
 indra/newview/pipeline.cpp   | 24 +++++++++++--
 indra/newview/pipeline.h     |  3 +-
 4 files changed, 126 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
index a9f35b3360..fca0f1c978 100644
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -696,6 +696,18 @@ void teardown_texture_matrix(LLDrawInfo& params)
     }
 }
 
+void LLRenderPass::pushGLTFBatches(U32 type, bool textured)
+{
+    if (textured)
+    {
+        pushGLTFBatches(type);
+    }
+    else
+    {
+        pushRiggedGLTFBatches(type);
+    }
+}
+
 void LLRenderPass::pushGLTFBatches(U32 type)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWPOOL;
@@ -711,6 +723,21 @@ void LLRenderPass::pushGLTFBatches(U32 type)
     }
 }
 
+void LLRenderPass::pushUntexturedGLTFBatches(U32 type)
+{
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWPOOL;
+    auto* begin = gPipeline.beginRenderMap(type);
+    auto* end = gPipeline.endRenderMap(type);
+    for (LLCullResult::drawinfo_iterator i = begin; i != end; )
+    {
+        LL_PROFILE_ZONE_NAMED_CATEGORY_DRAWPOOL("pushGLTFBatch");
+        LLDrawInfo& params = **i;
+        LLCullResult::increment_iterator(i, end);
+
+        pushUntexturedGLTFBatch(params);
+    }
+}
+
 void LLRenderPass::pushGLTFBatch(LLDrawInfo& params)
 {
     auto& mat = params.mGLTFMaterial;
@@ -729,6 +756,30 @@ void LLRenderPass::pushGLTFBatch(LLDrawInfo& params)
     teardown_texture_matrix(params);
 }
 
+void LLRenderPass::pushUntexturedGLTFBatch(LLDrawInfo& params)
+{
+    auto& mat = params.mGLTFMaterial;
+
+    LLGLDisable cull_face(mat->mDoubleSided ? GL_CULL_FACE : 0);
+
+    applyModelMatrix(params);
+
+    params.mVertexBuffer->setBuffer();
+    params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
+}
+
+void LLRenderPass::pushRiggedGLTFBatches(U32 type, bool textured)
+{
+    if (textured)
+    {
+        pushRiggedGLTFBatches(type);
+    }
+    else
+    {
+        pushUntexturedRiggedGLTFBatches(type);
+    }
+}
+
 void LLRenderPass::pushRiggedGLTFBatches(U32 type)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWPOOL;
@@ -747,6 +798,25 @@ void LLRenderPass::pushRiggedGLTFBatches(U32 type)
     }
 }
 
+void LLRenderPass::pushUntexturedRiggedGLTFBatches(U32 type)
+{
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWPOOL;
+    LLVOAvatar* lastAvatar = nullptr;
+    U64 lastMeshId = 0;
+
+    auto* begin = gPipeline.beginRenderMap(type);
+    auto* end = gPipeline.endRenderMap(type);
+    for (LLCullResult::drawinfo_iterator i = begin; i != end; )
+    {
+        LL_PROFILE_ZONE_NAMED_CATEGORY_DRAWPOOL("pushRiggedGLTFBatch");
+        LLDrawInfo& params = **i;
+        LLCullResult::increment_iterator(i, end);
+
+        pushUntexturedRiggedGLTFBatch(params, lastAvatar, lastMeshId);
+    }
+}
+
+
 void LLRenderPass::pushRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvatar, U64& lastMeshId)
 {
     if (params.mAvatar.notNull() && (lastAvatar != params.mAvatar || lastMeshId != params.mSkinInfo->mHash))
@@ -759,3 +829,15 @@ void LLRenderPass::pushRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvat
     pushGLTFBatch(params);
 }
 
+void LLRenderPass::pushUntexturedRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvatar, U64& lastMeshId)
+{
+    if (params.mAvatar.notNull() && (lastAvatar != params.mAvatar || lastMeshId != params.mSkinInfo->mHash))
+    {
+        uploadMatrixPalette(params);
+        lastAvatar = params.mAvatar;
+        lastMeshId = params.mSkinInfo->mHash;
+    }
+
+    pushUntexturedGLTFBatch(params);
+}
+
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h
index d5ef734c4b..5414dba6bf 100644
--- a/indra/newview/lldrawpool.h
+++ b/indra/newview/lldrawpool.h
@@ -356,10 +356,29 @@ public:
 
     void pushRiggedBatches(U32 type, bool texture = true, bool batch_textures = false);
     void pushUntexturedRiggedBatches(U32 type);
+
+    // push full GLTF batches
+    // assumes draw infos of given type have valid GLTF materials
     void pushGLTFBatches(U32 type);
-    void pushGLTFBatch(LLDrawInfo& params);
+
+    // like pushGLTFBatches, but will not bind textures or set up texture transforms
+    void pushUntexturedGLTFBatches(U32 type);
+
+    // helper function for dispatching to textured or untextured pass based on bool
+    void pushGLTFBatches(U32 type, bool textured);
+
+
+    // rigged variants of above
     void pushRiggedGLTFBatches(U32 type);
+    void pushRiggedGLTFBatches(U32 type, bool textured);
+    void pushUntexturedRiggedGLTFBatches(U32 type);
+
+    // push a single GLTF draw call
+    void pushGLTFBatch(LLDrawInfo& params);
     void pushRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvatar, U64& lastMeshId);
+    void pushUntexturedGLTFBatch(LLDrawInfo& params);
+    void pushUntexturedRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvatar, U64& lastMeshId);
+
 	void pushMaskBatches(U32 type, bool texture = true, bool batch_textures = false);
     void pushRiggedMaskBatches(U32 type, bool texture = true, bool batch_textures = false);
 	void pushBatch(LLDrawInfo& params, bool texture, bool batch_textures = false);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index d50e671e05..1402591015 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6494,6 +6494,25 @@ void LLPipeline::renderObjects(U32 type, bool texture, bool batch_texture, bool
 	gGLLastMatrix = NULL;		
 }
 
+void LLPipeline::renderGLTFObjects(U32 type, bool texture, bool rigged)
+{
+    assertInitialized();
+    gGL.loadMatrix(gGLModelView);
+    gGLLastMatrix = NULL;
+
+    if (rigged)
+    {
+        mSimplePool->pushRiggedGLTFBatches(type + 1, texture);
+    }
+    else
+    {
+        mSimplePool->pushGLTFBatches(type, texture);
+    }
+
+    gGL.loadMatrix(gGLModelView);
+    gGLLastMatrix = NULL;
+}
+
 // Currently only used for shadows -Cosmic,2023-04-19
 void LLPipeline::renderAlphaObjects(bool rigged)
 {
@@ -8601,8 +8620,7 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera
         LLRenderPass::PASS_NORMMAP,
         LLRenderPass::PASS_NORMMAP_EMISSIVE,
         LLRenderPass::PASS_NORMSPEC,
-        LLRenderPass::PASS_NORMSPEC_EMISSIVE,
-        LLRenderPass::PASS_GLTF_PBR
+        LLRenderPass::PASS_NORMSPEC_EMISSIVE
     };
 
     LLGLEnable cull(GL_CULL_FACE);
@@ -8665,6 +8683,8 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera
             renderObjects(type, false, false, rigged);
         }
 
+        renderGLTFObjects(LLRenderPass::PASS_GLTF_PBR, false, rigged);
+
         gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
     }
 
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index c0559ce83b..427240aad7 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -284,7 +284,8 @@ public:
 	void forAllVisibleDrawables(void (*func)(LLDrawable*));
 
     void renderObjects(U32 type, bool texture = true, bool batch_texture = false, bool rigged = false);
-
+    void renderGLTFObjects(U32 type, bool texture = true, bool rigged = false);
+    
     void renderAlphaObjects(bool rigged = false);
 	void renderMaskedObjects(U32 type, bool texture = true, bool batch_texture = false, bool rigged = false);
     void renderFullbrightMaskedObjects(U32 type, bool texture = true, bool batch_texture = false, bool rigged = false);
-- 
cgit v1.2.3


From 3058e6e6fd66ad4abb91fa5354ee11f6b7843a02 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 19 Jul 2023 21:15:52 +0300
Subject: SL-20015 wait for the outfit items to load before wearing it

---
 indra/newview/llaisapi.cpp         | 36 ++++++++++++++++++++++++++++++++++++
 indra/newview/llaisapi.h           |  2 ++
 indra/newview/llappearancemgr.cpp  | 29 +++++++++++++++++++++++++++++
 indra/newview/llappearancemgr.h    |  1 +
 indra/newview/llinventorymodel.cpp | 12 +++++++++++-
 indra/newview/llinventorymodel.h   |  4 ++++
 indra/newview/llstartup.cpp        | 25 ++++++++++++++++++++++++-
 indra/newview/llstartup.h          |  1 +
 8 files changed, 108 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 4ac2acf1d1..f3799361db 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -709,6 +709,40 @@ void AISAPI::FetchCOF(completion_t callback)
     EnqueueAISCommand("FetchCOF", proc);
 }
 
+void AISAPI::FetchCategoryLinks(const LLUUID &catId, completion_t callback)
+{
+    std::string cap = getInvCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        if (callback)
+        {
+            callback(LLUUID::null);
+        }
+        return;
+    }
+    std::string url = cap + std::string("/category/") + catId.asString() + "/links";
+
+    invokationFn_t getFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD (LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &,
+                                                                   LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend),
+        _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(
+        boost::bind(&AISAPI::InvokeAISCommandCoro, _1, getFn, url, LLUUID::null, LLSD(), callback, FETCHCATEGORYLINKS));
+
+    EnqueueAISCommand("FetchCategoryLinks", proc);
+}
+
 /*static*/
 void AISAPI::FetchOrphans(completion_t callback)
 {
@@ -938,6 +972,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         case FETCHCATEGORYCATEGORIES:
         case FETCHCATEGORYCHILDREN:
         case FETCHCATEGORYSUBSET:
+        case FETCHCATEGORYLINKS:
         case FETCHCOF:
             if (result.has("category_id"))
             {
@@ -1002,6 +1037,7 @@ AISUpdate::AISUpdate(const LLSD& update, AISAPI::COMMAND_TYPE type, const LLSD&
         || (type == AISAPI::FETCHCATEGORYCATEGORIES)
         || (type == AISAPI::FETCHCATEGORYSUBSET)
         || (type == AISAPI::FETCHCOF)
+        || (type == AISAPI::FETCHCATEGORYLINKS)
         || (type == AISAPI::FETCHORPHANS);
     // parse update llsd into stuff to do or parse received items.
     mFetchDepth = MAX_FOLDER_DEPTH_REQUEST;
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 973c82a847..53c74ae078 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -62,6 +62,7 @@ public:
     static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCategorySubset(const LLUUID& catId, const uuid_vec_t specificChildren, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
     static void FetchCOF(completion_t callback = completion_t());
+    static void FetchCategoryLinks(const LLUUID &catId, completion_t callback = completion_t());
     static void FetchOrphans(completion_t callback = completion_t() );
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
@@ -81,6 +82,7 @@ public:
         FETCHCATEGORYSUBSET,
         FETCHCOF,
         FETCHORPHANS,
+        FETCHCATEGORYLINKS
     } COMMAND_TYPE;
 
 private:
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 454ac5d88c..d4fc6a9f9d 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4612,6 +4612,35 @@ void callAfterCategoryFetch(const LLUUID& cat_id, nullary_func_t cb)
     }
 }
 
+void callAfterCategoryLinksFetch(const LLUUID &cat_id, nullary_func_t cb)
+{
+    LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
+    if (AISAPI::isAvailable())
+    {
+        // Mark folder (update timer) so that background fetch won't request it
+        cat->setFetching(LLViewerInventoryCategory::FETCH_RECURSIVE);
+        // Assume that we have no relevant cache. Fetch folder, and items folder's links point to.
+        AISAPI::FetchCategoryLinks(cat_id,
+            [cb, cat_id](const LLUUID &id)
+            {
+                cb();
+                LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
+                if (cat)
+                {
+                    cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+                }
+            });
+        }
+        else
+        {
+            LL_WARNS() << "AIS API v3 not available, can't use AISAPI::FetchCOF" << LL_ENDL;
+            // startup should have marked folder as fetching, remove that
+            cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+            callAfterCategoryFetch(cat_id, cb);
+        }
+    
+}
+
 void add_wearable_type_counts(const uuid_vec_t& ids,
                               S32& clothing_count,
                               S32& bodypart_count,
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index f6aa30d865..43839e47a6 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -340,6 +340,7 @@ LLUUID findDescendentCategoryIDByName(const LLUUID& parent_id,const std::string&
 // Invoke a given callable after category contents are fully fetched.
 void callAfterCOFFetch(nullary_func_t cb);
 void callAfterCategoryFetch(const LLUUID& cat_id, nullary_func_t cb);
+void callAfterCategoryLinksFetch(const LLUUID &cat_id, nullary_func_t cb);
 
 // Wear all items in a uuid vector.
 void wear_multiple(const uuid_vec_t& ids, bool replace);
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index ed375661b8..586f1388ff 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -79,6 +79,8 @@
 const S32 LLInventoryModel::sCurrentInvCacheVersion = 3;
 BOOL LLInventoryModel::sFirstTimeInViewer2 = TRUE;
 
+S32 LLInventoryModel::sPendingSystemFolders = 0;
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -861,8 +863,9 @@ void LLInventoryModel::ensureCategoryForTypeExists(LLFolderType::EType preferred
                     }
                     else
                     {
-                        LL_DEBUGS("Inventory") << "Created category: " << new_cat_id
+                        LL_WARNS("Inventory") << "Created category: " << new_cat_id
                             << " for type: " << preferred_type << LL_ENDL;
+                        sPendingSystemFolders--;
                     }
             }
             );
@@ -873,6 +876,10 @@ void LLInventoryModel::ensureCategoryForTypeExists(LLFolderType::EType preferred
                 << " because inventory is not usable" << LL_ENDL;
         }
     }
+    else
+    {
+        sPendingSystemFolders--;
+    }
 }
 
 const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
@@ -3253,6 +3260,9 @@ LLCore::HttpHandle LLInventoryModel::requestPost(bool foreground,
 
 void LLInventoryModel::createCommonSystemCategories()
 {
+    //amount of System Folder we should wait for
+    sPendingSystemFolders = 8;
+
 	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_TRASH);
 	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_FAVORITE);
 	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_CALLINGCARD);
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index db159d480a..a90ed2bf42 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -227,10 +227,14 @@ private:
 	//--------------------------------------------------------------------
 public:
 	static BOOL getIsFirstTimeInViewer2();
+    static bool  isSysFoldersReady() { return (sPendingSystemFolders == 0); }
+
 private:
 	static BOOL sFirstTimeInViewer2;
 	const static S32 sCurrentInvCacheVersion; // expected inventory cache version
 
+    static S32 sPendingSystemFolders;
+
 /**                    Initialization/Setup
  **                                                                            **
  *******************************************************************************/
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 9f9e117760..c925563919 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1912,7 +1912,22 @@ bool idle_startup()
 		
         LLInventoryModelBackgroundFetch::instance().start();
 		gInventory.createCommonSystemCategories();
+        LLStartUp::setStartupState(STATE_INVENTORY_CALLBACKS );
+        display_startup();
+
+        return FALSE;
+    }
 
+    //---------------------------------------------------------------------
+    // STATE_INVENTORY_CALLBACKS 
+    //---------------------------------------------------------------------
+    if (STATE_INVENTORY_CALLBACKS  == LLStartUp::getStartupState())
+    {
+        if (!LLInventoryModel::isSysFoldersReady())
+        {
+            display_startup();
+            return FALSE;
+        }
         LLInventoryModelBackgroundFetch::instance().start();
         LLUUID cof_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
         LLViewerInventoryCategory* cof = gInventory.getCategory(cof_id);
@@ -2850,8 +2865,15 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
 		bool do_append = false;
 		LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
 		// Need to fetch cof contents before we can wear.
-		callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(),
+        if (do_copy)
+        {
+            callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(),
 							   boost::bind(&LLAppearanceMgr::wearInventoryCategory, LLAppearanceMgr::getInstance(), cat, do_copy, do_append));
+        }
+        else
+        {
+            callAfterCategoryLinksFetch(cat_id, boost::bind(&LLAppearanceMgr::wearInventoryCategory, LLAppearanceMgr::getInstance(), cat, do_copy, do_append));
+        }
 		LL_DEBUGS() << "initial outfit category id: " << cat_id << LL_ENDL;
 	}
 
@@ -2904,6 +2926,7 @@ std::string LLStartUp::startupStateToString(EStartupState state)
 		RTNENUM( STATE_AGENT_SEND );
 		RTNENUM( STATE_AGENT_WAIT );
 		RTNENUM( STATE_INVENTORY_SEND );
+        RTNENUM(STATE_INVENTORY_CALLBACKS );
 		RTNENUM( STATE_MISC );
 		RTNENUM( STATE_PRECACHE );
 		RTNENUM( STATE_WEARABLES_WAIT );
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
index fe8e215f76..921f088423 100644
--- a/indra/newview/llstartup.h
+++ b/indra/newview/llstartup.h
@@ -71,6 +71,7 @@ typedef enum {
 	STATE_AGENT_SEND,				// Connect to a region
 	STATE_AGENT_WAIT,				// Wait for region
 	STATE_INVENTORY_SEND,			// Do inventory transfer
+	STATE_INVENTORY_CALLBACKS,		// Wait for missing system folders and register callbacks
 	STATE_MISC,						// Do more things (set bandwidth, start audio, save location, etc)
 	STATE_PRECACHE,					// Wait a bit for textures to download
 	STATE_WEARABLES_WAIT,			// Wait for clothing to download
-- 
cgit v1.2.3


From e3565ff4ddbabdf51dd7a317239977b1b93b7508 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 19 Jul 2023 11:23:31 -0700
Subject: SL-20036: Set probe ambiance to 0 for legacy midday

---
 indra/newview/llenvironment.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index d73a486877..f672d2a6f1 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -816,7 +816,7 @@ const F64Seconds LLEnvironment::TRANSITION_ALTITUDE(5.0f);
 
 const LLUUID LLEnvironment::KNOWN_SKY_SUNRISE("01e41537-ff51-2f1f-8ef7-17e4df760bfb");
 const LLUUID LLEnvironment::KNOWN_SKY_MIDDAY("651510b8-5f4d-8991-1592-e7eeab2a5a06");
-const LLUUID LLEnvironment::KNOWN_SKY_LEGACY_MIDDAY("6c83e853-e7f8-cad7-8ee6-5f31c453721c");
+const LLUUID LLEnvironment::KNOWN_SKY_LEGACY_MIDDAY("cef49723-0292-af49-9b14-9598a616b8a3");
 const LLUUID LLEnvironment::KNOWN_SKY_SUNSET("084e26cd-a900-28e8-08d0-64a9de5c15e2");
 const LLUUID LLEnvironment::KNOWN_SKY_MIDNIGHT("8a01b97a-cb20-c1ea-ac63-f7ea84ad0090");
 
-- 
cgit v1.2.3


From 33e0766ee08cccb480675a75d83b3a6e78849906 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 20 Jul 2023 01:55:50 +0300
Subject: SL-19948 Update estate manager and ban list limits to match new
 values from simulator

---
 indra/llmessage/llregionflags.h       |  5 +++--
 indra/newview/llfloaterregioninfo.cpp | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h
index 8548ed51e7..464bf05250 100644
--- a/indra/llmessage/llregionflags.h
+++ b/indra/llmessage/llregionflags.h
@@ -171,8 +171,9 @@ const U32 ESTATE_ACCESS_MANAGER_REMOVE				= 1U << 9;
 const U32 ESTATE_ACCESS_NO_REPLY						= 1U << 10;
 const U32 ESTATE_ACCESS_FAILED_BAN_ESTATE_MANAGER	= 1U << 11;
 
-const S32 ESTATE_MAX_MANAGERS = 15;
-const S32 ESTATE_MAX_ACCESS_IDS = 500;	// max for access, banned
+const S32 ESTATE_MAX_MANAGERS = 20;
+const S32 ESTATE_MAX_ACCESS_IDS = 500;	// max for access
+const S32 ESTATE_MAX_BANNED_IDS = 750;	// max for banned
 const S32 ESTATE_MAX_GROUP_IDS = (S32) ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET;
 
 // 'Sim Wide Delete' flags
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index a24f04ccfb..d4eb40ff92 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2795,7 +2795,7 @@ BOOL LLPanelEstateAccess::postBuild()
 	if (banned_name_list)
 	{
 		banned_name_list->setCommitOnSelectionChange(TRUE);
-		banned_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
+		banned_name_list->setMaxItemCount(ESTATE_MAX_BANNED_IDS);
 	}
 
 	getChild<LLUICtrl>("banned_search_input")->setCommitCallback(boost::bind(&LLPanelEstateAccess::onBannedSearchEdit, this, _2));
@@ -2939,10 +2939,10 @@ void LLPanelEstateAccess::onClickAddBannedAgent()
 {
 	LLCtrlListInterface *list = childGetListInterface("banned_avatar_name_list");
 	if (!list) return;
-	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
+	if (list->getItemCount() >= ESTATE_MAX_BANNED_IDS)
 	{
 		LLSD args;
-		args["MAX_BANNED"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
+		args["MAX_BANNED"] = llformat("%d", ESTATE_MAX_BANNED_IDS);
 		LLNotificationsUtil::add("MaxBannedAgentsOnRegion", args);
 		return;
 	}
@@ -3180,13 +3180,13 @@ void LLPanelEstateAccess::accessAddCore3(const uuid_vec_t& ids, std::vector<LLAv
 		LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");
 		LLNameListCtrl* em_list = panel->getChild<LLNameListCtrl>("estate_manager_name_list");
 		int currentCount = (name_list ? name_list->getItemCount() : 0);
-		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
+		if (ids.size() + currentCount > ESTATE_MAX_BANNED_IDS)
 		{
 			LLSD args;
 			args["NUM_ADDED"] = llformat("%d", ids.size());
-			args["MAX_AGENTS"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
+			args["MAX_AGENTS"] = llformat("%d", ESTATE_MAX_BANNED_IDS);
 			args["LIST_TYPE"] = LLTrans::getString("RegionInfoListTypeBannedAgents");
-			args["NUM_EXCESS"] = llformat("%d", (ids.size() + currentCount) - ESTATE_MAX_ACCESS_IDS);
+			args["NUM_EXCESS"] = llformat("%d", (ids.size() + currentCount) - ESTATE_MAX_BANNED_IDS);
 			LLNotificationsUtil::add("MaxAgentOnRegionBatch", args);
 			delete change_info;
 			return;
@@ -3565,7 +3565,7 @@ void LLPanelEstateAccess::requestEstateGetAccessCoro(std::string url)
 	{
 		LLStringUtil::format_map_t args;
 		args["[BANNEDAGENTS]"] = llformat("%d", result["BannedAgents"].size());
-		args["[MAXBANNED]"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
+		args["[MAXBANNED]"] = llformat("%d", ESTATE_MAX_BANNED_IDS);
 		std::string msg = LLTrans::getString("RegionInfoBannedResidents", args);
 		panel->getChild<LLUICtrl>("ban_resident_label")->setValue(LLSD(msg));
 
-- 
cgit v1.2.3


From f1f8253689c65adcd8e7dc939b478bb82b8975ec Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 20 Jul 2023 17:46:59 +0300
Subject: SL-20042 remove extra space from the message text

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d3a31f16ec..af0bda16d0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12124,7 +12124,7 @@ Would you like to save them first?
     name="AutoAdjustHDRSky"
     persist="true"
     type="alertmodal">
-      You are editing a non-HDR sky that has been automatically converted to HDR.  To remove HDR and tone mapping, set Reflection Probe Ambiance to zero.
+      You are editing a non-HDR sky that has been automatically converted to HDR. To remove HDR and tone mapping, set Reflection Probe Ambiance to zero.
     <usetemplate
         ignoretext="HDR Sky adjustment warning"
         name="okignore"
-- 
cgit v1.2.3


From 864a15f9957fa7624a9b8685baaa4ed5a7e73be7 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 20 Jul 2023 20:47:58 +0300
Subject: SL-20043 notification shouldn't persist between sessions

---
 indra/newview/skins/default/xui/en/notifications.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af0bda16d0..ca07aacb21 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12122,7 +12122,6 @@ Would you like to save them first?
   <notification
     icon="notifytip.tga"
     name="AutoAdjustHDRSky"
-    persist="true"
     type="alertmodal">
       You are editing a non-HDR sky that has been automatically converted to HDR. To remove HDR and tone mapping, set Reflection Probe Ambiance to zero.
     <usetemplate
-- 
cgit v1.2.3


From 4fb9a3f469c2cb0197d686acb68827f0fa32b451 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 20 Jul 2023 23:47:05 +0300
Subject: SL-20040 Fix selection and context menu issues

---
 indra/newview/llinventorygallery.cpp   | 287 ++++++++++++++++++++++-----------
 indra/newview/llinventorygallery.h     |  15 +-
 indra/newview/llpanelmaininventory.cpp |  20 +--
 3 files changed, 212 insertions(+), 110 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 75df5c1043..ca1b2eb09e 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -107,6 +107,7 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mIsInitialized(false),
       mRootDirty(false),
       mNeedsArrange(false),
+      mNeedsSelection(false),
       mSearchType(LLInventoryFilter::SEARCHTYPE_NAME),
       mSortOrder(LLInventoryFilter::SO_DATE)
 {
@@ -221,6 +222,7 @@ void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
     mItemToSelect.setNull();
     mItemBuildQuery.clear();
     mNeedsArrange = false;
+    mNeedsSelection = false;
     dirtyRootFolder();
 }
 
@@ -829,14 +831,15 @@ void LLInventoryGallery::onIdle(void* userdata)
         self->updateMessageVisibility();
     }
 
-    if (self->mItemToSelect.notNull())
+    if (self->mNeedsSelection)
     {
         LLUUID item_to_select = self->mItemToSelect;
         self->mItemToSelect = LLUUID::null;
+        self->mNeedsSelection = false;
         self->changeItemSelection(item_to_select, true);
     }
 
-    if (self->mItemToSelect.isNull() && self->mItemBuildQuery.empty())
+    if (!self->mNeedsSelection && self->mItemBuildQuery.empty())
     {
         gIdleCallbacks.deleteFunction(onIdle, (void*)self);
     }
@@ -908,7 +911,6 @@ bool LLInventoryGallery::updateAddedItem(LLUUID item_id)
 
     LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getCreationDate(), obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
-    item->setRightMouseDownCallback(boost::bind(&LLInventoryGallery::showContextMenu, this, _1, _2, _3, item_id));
     item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id, false));
     if (mGalleryCreated)
     {
@@ -1000,15 +1002,21 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
 
 BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-    if(mItemMap[mSelectedItemID])
+    if (mSelectedItemIDs.size() > 0)
     {
-        mItemMap[mSelectedItemID]->setFocus(false);
-        setFocus(true);
+        selection_deque::iterator iter = mSelectedItemIDs.begin();
+        if (mItemMap[*iter])
+        {
+            mItemMap[*iter]->setFocus(false);
+            setFocus(true);
+        }
     }
     clearSelection();
+
+    // Scroll is going to always return true
     BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
 
-    if (mSelectedItemID.isNull())
+    if (mSelectedItemIDs.empty())
     {
         if (mInventoryGalleryMenu && mFolderID.notNull())
         {
@@ -1029,20 +1037,21 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
     {
         case KEY_RETURN:
             // Open selected items if enter key hit on the inventory panel
-            if (mask == MASK_NONE && mInventoryGalleryMenu && mSelectedItemID.notNull())
+            if (mask == MASK_NONE && mInventoryGalleryMenu && mSelectedItemIDs.size() == 1)
             {
-                LLViewerInventoryCategory* category = gInventory.getCategory(mSelectedItemID);
+                selection_deque::iterator iter = mSelectedItemIDs.begin();
+                LLViewerInventoryCategory* category = gInventory.getCategory(*iter);
                 if (category)
                 {
-                    setRootFolder(mSelectedItemID);
+                    setRootFolder(*iter);
                     handled = TRUE;
                 }
                 else
                 {
-                    LLViewerInventoryItem* item = gInventory.getItem(mSelectedItemID);
+                    LLViewerInventoryItem* item = gInventory.getItem(*iter);
                     if (item)
                     {
-                        LLInvFVBridgeAction::doAction(item->getType(), mSelectedItemID, &gInventory);
+                        LLInvFVBridgeAction::doAction(item->getType(), *iter, &gInventory);
                     }
                 }
             }
@@ -1063,9 +1072,10 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
 
         case KEY_F2:
             mFilterSubString.clear();
-            if (mInventoryGalleryMenu && mSelectedItemID.notNull())
+            if (mInventoryGalleryMenu && mSelectedItemIDs.size() == 1)
             {
-                mInventoryGalleryMenu->doToSelected("rename", mSelectedItemID);
+                selection_deque::iterator iter = mSelectedItemIDs.begin();
+                mInventoryGalleryMenu->doToSelected("rename", *iter);
             }
             handled = TRUE;
             break;
@@ -1142,9 +1152,9 @@ void LLInventoryGallery::moveUp()
 {
     mFilterSubString.clear();
 
-    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getSelectedItem();
+        LLInventoryGalleryItem* item = getFirstSelectedItem();
         if (item)
         {
             S32 n = mItemIndexMap[item];
@@ -1165,9 +1175,9 @@ void LLInventoryGallery::moveDown()
 {
     mFilterSubString.clear();
 
-    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getSelectedItem();
+        LLInventoryGalleryItem* item = getFirstSelectedItem();
         if (item)
         {
             S32 n = mItemIndexMap[item];
@@ -1188,9 +1198,9 @@ void LLInventoryGallery::moveLeft()
 {
     mFilterSubString.clear();
 
-    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getSelectedItem();
+        LLInventoryGalleryItem* item = getFirstSelectedItem();
         if (item)
         {
             // Might be better to get item from panel
@@ -1213,9 +1223,9 @@ void LLInventoryGallery::moveRight()
 {
     mFilterSubString.clear();
 
-    if (mInventoryGalleryMenu && mSelectedItemID.notNull() && mItemsAddedCount > 1)
+    if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getSelectedItem();
+        LLInventoryGalleryItem* item = getFirstSelectedItem();
         if (item)
         {
             S32 n = mItemIndexMap[item];
@@ -1243,9 +1253,12 @@ void LLInventoryGallery::onFocusLost()
 
     LLPanel::onFocusLost();
 
-    if (mSelectedItemID.notNull() && mItemMap[mSelectedItemID])
+    for (const LLUUID& id : mSelectedItemIDs)
     {
-        mItemMap[mSelectedItemID]->setSelected(false);
+        if (mItemMap[id])
+        {
+            mItemMap[id]->setSelected(false);
+        }
     }
 }
 
@@ -1255,13 +1268,19 @@ void LLInventoryGallery::onFocusReceived()
     gEditMenuHandler = this;
 
     // Tab support, when tabbing into this view, select first item
-    if (mSelectedItemID.notNull() && mItemMap[mSelectedItemID])
+    if (mSelectedItemIDs.size() > 0)
     {
-        LLInventoryGalleryItem* focus_item = mItemMap[mSelectedItemID];
-        focus_item->setSelected(true);
-        focus_item->setFocus(TRUE);
+        for (const LLUUID& id : mSelectedItemIDs)
+        {
+            if (mItemMap[id])
+            {
+                LLInventoryGalleryItem* focus_item = mItemMap[id];
+                focus_item->setSelected(true);
+                focus_item->setFocus(TRUE);
+            }
+        }
     }
-    else if (mIndexToItemMap.size() > 0 && mItemToSelect.isNull())
+    else if (mIndexToItemMap.size() > 0 && !mNeedsSelection)
     {
         // choose any items from visible rect
         S32 vert_offset = mScrollPanel->getDocPosVertical();
@@ -1280,6 +1299,11 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
 {
     if (mInventoryGalleryMenu && item_id.notNull())
     {
+        if (std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) == mSelectedItemIDs.end())
+        {
+            mSelectedItemIDs.clear();
+            mSelectedItemIDs.push_back(item_id);
+        }
         uuid_vec_t selected_uuids;
         selected_uuids.push_back(item_id);
         mInventoryGalleryMenu->show(ctrl, selected_uuids, x, y);
@@ -1291,32 +1315,32 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
     if ((mItemMap.count(item_id) == 0) || mNeedsArrange)
     {
         mItemToSelect = item_id;
+        mNeedsSelection = true;
         return;
     }
-    if (mSelectedItemID == item_id)
-    {
-        return;
-    }
-    if (mNeedsArrange && item_id.notNull())
+    if (std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) == mSelectedItemIDs.end())
     {
-        mItemToSelect = item_id;
         return;
     }
 
-    if (mItemMap[mSelectedItemID])
+    for (const LLUUID& id : mSelectedItemIDs)
     {
-        mItemMap[mSelectedItemID]->setSelected(FALSE);
+        if (mItemMap[id])
+        {
+            mItemMap[id]->setSelected(FALSE);
+        }
     }
+
     if (mItemMap[item_id])
     {
         mItemMap[item_id]->setSelected(TRUE);
     }
-    mSelectedItemID = item_id;
+    mSelectedItemIDs.push_back(item_id);
     signalSelectionItemID(item_id);
 
     if (scroll_to_selection)
     {
-        scrollToShowItem(mSelectedItemID);
+        scrollToShowItem(item_id);
     }
 }
 
@@ -1347,31 +1371,45 @@ void LLInventoryGallery::scrollToShowItem(const LLUUID& item_id)
     }
 }
 
-LLInventoryGalleryItem* LLInventoryGallery::getSelectedItem()
+LLInventoryGalleryItem* LLInventoryGallery::getFirstSelectedItem()
 {
-    return mItemMap[mSelectedItemID];
+    if (mSelectedItemIDs.size() > 0)
+    {
+        selection_deque::iterator iter = mSelectedItemIDs.begin();
+        return mItemMap[*iter];
+    }
+    return NULL;
 }
 
 void LLInventoryGallery::copy()
 {
+    if (!getVisible() || !getEnabled())
+    {
+        return;
+    }
+
     LLClipboard::instance().reset();
-    if (getVisible() && getEnabled() && mSelectedItemID.notNull())
+
+    for (const LLUUID& id : mSelectedItemIDs)
     {
-        LLClipboard::instance().addToClipboard(mSelectedItemID);
+        LLClipboard::instance().addToClipboard(id);
     }
     mFilterSubString.clear();
 }
 
 BOOL LLInventoryGallery::canCopy() const
 {
-    if (!getVisible() || !getEnabled() || mSelectedItemID.isNull())
+    if (!getVisible() || !getEnabled() || mSelectedItemIDs.empty())
     {
         return FALSE;
     }
 
-    if (!isItemCopyable(mSelectedItemID))
+    for (const LLUUID& id : mSelectedItemIDs)
     {
-        return FALSE;
+        if (!isItemCopyable(id))
+        {
+            return FALSE;
+        }
     }
 
     return TRUE;
@@ -1379,36 +1417,45 @@ BOOL LLInventoryGallery::canCopy() const
 
 void LLInventoryGallery::cut()
 {
+    if (!getVisible() || !getEnabled())
+    {
+        return;
+    }
+
     // clear the inventory clipboard
     LLClipboard::instance().reset();
-    if (getVisible() && getEnabled() && mSelectedItemID.notNull())
+    LLClipboard::instance().setCutMode(true);
+    for (const LLUUID& id : mSelectedItemIDs)
     {
         // todo: fade out selected item
-        LLClipboard::instance().setCutMode(true);
-        LLClipboard::instance().addToClipboard(mSelectedItemID);
+        LLClipboard::instance().addToClipboard(id);
     }
+
     mFilterSubString.clear();
 }
 
 BOOL LLInventoryGallery::canCut() const
 {
-    if (!getVisible() || !getEnabled() || mSelectedItemID.isNull())
+    if (!getVisible() || !getEnabled() || mSelectedItemIDs.empty())
     {
         return FALSE;
     }
 
-    LLViewerInventoryCategory* cat = gInventory.getCategory(mSelectedItemID);
-    if (cat)
+    for (const LLUUID& id : mSelectedItemIDs)
     {
-        if (!get_is_category_removable(&gInventory, mSelectedItemID))
+        LLViewerInventoryCategory* cat = gInventory.getCategory(id);
+        if (cat)
+        {
+            if (!get_is_category_removable(&gInventory, id))
+            {
+                return FALSE;
+            }
+        }
+        else if (!get_is_item_removable(&gInventory, id))
         {
             return FALSE;
         }
     }
-    else if (!get_is_item_removable(&gInventory, mSelectedItemID))
-    {
-        return FALSE;
-    }
 
     return TRUE;
 }
@@ -1421,14 +1468,20 @@ void LLInventoryGallery::paste()
     }
 
     const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
-    if (!mSelectedItemID.isNull() && gInventory.isObjectDescendentOf(mSelectedItemID, marketplacelistings_id))
+    if (mSelectedItemIDs.size() == 1 && gInventory.isObjectDescendentOf(*mSelectedItemIDs.begin(), marketplacelistings_id))
     {
         return;
     }
 
-    LLInventoryObject* obj = gInventory.getObject(mSelectedItemID);
+    LLUUID first_selected_id;
+    if (mSelectedItemIDs.size() > 0)
+    {
+        first_selected_id = *mSelectedItemIDs.begin();
+    }
+
+    LLInventoryObject* obj = gInventory.getObject(first_selected_id);
     bool is_folder = obj && (obj->getType() == LLAssetType::AT_CATEGORY);
-    LLUUID dest = is_folder ? mSelectedItemID : mFolderID;
+    LLUUID dest = is_folder ? first_selected_id : mFolderID;
     bool is_cut_mode = LLClipboard::instance().isCutMode();
 
     std::vector<LLUUID> objects;
@@ -1463,6 +1516,7 @@ void LLInventoryGallery::paste()
                 gInventory.changeCategoryParent(cat, dest, false);
                 // Don't select immediately, wait for item to arrive
                 mItemToSelect = item_id;
+                mNeedsSelection = true;
             }
             else
             {
@@ -1479,6 +1533,7 @@ void LLInventoryGallery::paste()
                     gInventory.changeItemParent(item, dest, false);
                     // Don't select immediately, wait for item to arrive
                     mItemToSelect = item_id;
+                    mNeedsSelection = true;
                 }
                 else
                 {
@@ -1535,28 +1590,31 @@ BOOL LLInventoryGallery::canPaste() const
     return TRUE;
 }
 
-void LLInventoryGallery::onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id)
+void LLInventoryGallery::onDelete(const LLSD& notification, const LLSD& response, const selection_deque selected_ids)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
     if (option == 0)
     {
-        LLInventoryObject* obj = gInventory.getObject(selected_id);
-        if (!obj)
-        {
-            return;
-        }
-        if (obj->getType() == LLAssetType::AT_CATEGORY)
+        for (const LLUUID& id : selected_ids)
         {
-            if (get_is_category_removable(&gInventory, selected_id))
+            LLInventoryObject* obj = gInventory.getObject(id);
+            if (!obj)
             {
-                gInventory.removeCategory(selected_id);
+                return;
             }
-        }
-        else
-        {
-            if (get_is_item_removable(&gInventory, selected_id))
+            if (obj->getType() == LLAssetType::AT_CATEGORY)
+            {
+                if (get_is_category_removable(&gInventory, id))
+                {
+                    gInventory.removeCategory(id);
+                }
+            }
+            else
             {
-                gInventory.removeItem(selected_id);
+                if (get_is_item_removable(&gInventory, id))
+                {
+                    gInventory.removeItem(id);
+                }
             }
         }
     }
@@ -1572,31 +1630,39 @@ void LLInventoryGallery::deleteSelection()
 
     LLSD args;
     args["QUESTION"] = LLTrans::getString("DeleteItem");
-    LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGallery::onDelete, _1, _2, mSelectedItemID));
+    LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGallery::onDelete, _1, _2, mSelectedItemIDs));
 }
 
 bool LLInventoryGallery::canDeleteSelection()
 {
-    if (mSelectedItemID.isNull())
+    if (mSelectedItemIDs.empty())
     {
         return false;
     }
 
-    LLViewerInventoryCategory* cat = gInventory.getCategory(mSelectedItemID);
-    if (cat)
+    const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+    if (mFolderID == trash_id || gInventory.isObjectDescendentOf(mFolderID, trash_id))
+    {
+        return false;
+    }
+
+    for (const LLUUID& id : mSelectedItemIDs)
     {
-        if (!get_is_category_removable(&gInventory, mSelectedItemID))
+        LLViewerInventoryCategory* cat = gInventory.getCategory(id);
+        if (cat)
+        {
+            if (!get_is_category_removable(&gInventory, id))
+            {
+                return false;
+            }
+        }
+        else if (!get_is_item_removable(&gInventory, id))
         {
             return false;
         }
     }
-    else if (!get_is_item_removable(&gInventory, mSelectedItemID))
-    {
-        return false;
-    }
 
-    const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-    return !gInventory.isObjectDescendentOf(mSelectedItemID, trash_id);
+    return true;
 }
 
 void LLInventoryGallery::pasteAsLink()
@@ -1611,12 +1677,12 @@ void LLInventoryGallery::pasteAsLink()
     const LLUUID& my_outifts_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
     LLUUID dest;
-    LLInventoryObject* obj = gInventory.getObject(mSelectedItemID);
-    if (obj && obj->getType() == LLAssetType::AT_CATEGORY)
+    if (mSelectedItemIDs.size() > 0)
     {
-        dest = mSelectedItemID;
+        dest = *mSelectedItemIDs.begin();
     }
-    else
+    LLInventoryObject* obj = gInventory.getObject(dest);
+    if (!obj || obj->getType() != LLAssetType::AT_CATEGORY)
     {
         dest = mFolderID;
     }
@@ -1894,18 +1960,35 @@ void LLInventoryGallery::onGesturesChanged()
 void LLInventoryGallery::deselectItem(const LLUUID& category_id)
 {
     // Reset selection if the item is selected.
-    if (category_id == mSelectedItemID)
+    LLInventoryGalleryItem* item = mItemMap[category_id];
+    if (item && item->isSelected())
     {
-        mSelectedItemID = LLUUID::null;
-        signalSelectionItemID(mSelectedItemID);
+        mItemMap[category_id]->setSelected(FALSE);
+        setFocus(true);
+        // Todo: support multiselect
+        signalSelectionItemID(LLUUID::null);
+    }
+
+    selection_deque::iterator found = std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), category_id);
+    if (found != mSelectedItemIDs.end())
+    {
+        mSelectedItemIDs.erase(found);
     }
 }
 
 void LLInventoryGallery::clearSelection()
 {
-    if(mSelectedItemID != LLUUID::null)
+    for (const LLUUID& id: mSelectedItemIDs)
+    {
+        if (mItemMap[id])
+        {
+            mItemMap[id]->setSelected(FALSE);
+        }
+    }
+    if (!mSelectedItemIDs.empty())
     {
-        changeItemSelection(LLUUID::null);
+        mSelectedItemIDs.clear();
+        signalSelectionItemID(LLUUID::null);
     }
 }
 
@@ -1919,6 +2002,15 @@ boost::signals2::connection LLInventoryGallery::setSelectionChangeCallback(selec
     return mSelectionChangeSignal.connect(cb);
 }
 
+LLUUID LLInventoryGallery::getFirstSelectedItemID()
+{
+    if (mSelectedItemIDs.size() > 0)
+    {
+        return *mSelectedItemIDs.begin();
+    }
+    return LLUUID::null;
+}
+
 LLUUID LLInventoryGallery::getOutfitImageID(LLUUID outfit_id)
 {
     LLUUID thumbnail_id;
@@ -2284,6 +2376,10 @@ BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
     setFocus(TRUE);
     mGallery->claimEditHandler();
 
+    //S32 gal_x, gal_y;
+    //localPointToOtherView(x, y, &gal_x, &gal_y, mGallery);
+    mGallery->showContextMenu(this, x, y, mUUID);
+
     LLUICtrl::handleRightMouseDown(x, y, mask);
     return TRUE;
 }
@@ -2532,6 +2628,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             {
                 // Don't select immediately, wait for item to arrive
                 mItemToSelect = inv_item->getUUID();
+                mNeedsSelection = true;
             }
             break;
         case DAD_LINK:
@@ -2553,6 +2650,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             if (accepted && drop && inv_item)
             {
                 mItemToSelect = inv_item->getUUID();
+                mNeedsSelection = true;
             }
             break;
         case DAD_CATEGORY:
@@ -2567,6 +2665,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
                 if (accepted && drop)
                 {
                     mItemToSelect = cat_ptr->getUUID();
+                    mNeedsSelection = true;
                 }
             }
             break;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 5f9c191fc5..42bda59c5a 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -51,6 +51,7 @@ public:
 
     typedef boost::signals2::signal<void(const LLUUID&)> selection_change_signal_t;
     typedef boost::function<void(const LLUUID&)> selection_change_callback_t;
+    typedef std::deque<LLUUID> selection_deque;
 
     struct Params
         : public LLInitParam::Block<Params, LLPanel::Params>
@@ -132,7 +133,7 @@ public:
     void scrollToShowItem(const LLUUID& item_id);
     void signalSelectionItemID(const LLUUID& category_id);
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
-    LLUUID getSelectedItemID() { return mSelectedItemID; }
+    LLUUID getFirstSelectedItemID();
 
     void setSearchType(LLInventoryFilter::ESearchType type);
     LLInventoryFilter::ESearchType getSearchType() { return mSearchType; }
@@ -142,7 +143,7 @@ public:
     bool hasVisibleItems();
     void handleModifiedFilter();
     LLScrollContainer* getScrollableContainer() { return mScrollPanel; }
-    LLInventoryGalleryItem* getSelectedItem();
+    LLInventoryGalleryItem* getFirstSelectedItem();
 
     // Copy & paste (LLEditMenuHandler)
     void	copy() override;
@@ -155,7 +156,7 @@ public:
     BOOL canPaste() const override;
 
     // Copy & paste & delete
-    static void onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id);
+    static void onDelete(const LLSD& notification, const LLSD& response, const selection_deque selected_ids);
     void deleteSelection();
     bool canDeleteSelection();
     void pasteAsLink();
@@ -170,10 +171,10 @@ public:
     BOOL baseHandleDragAndDrop(LLUUID dest_id, BOOL drop, EDragAndDropType cargo_type,
                                void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
 
-protected:
-
     void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
 
+protected:
+
     bool applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
     bool checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring);
     static void onIdle(void* userdata);
@@ -183,8 +184,9 @@ protected:
     LLThumbnailsObserver*              mThumbnailsObserver;
     LLGalleryGestureObserver*          mGestureObserver;
     LLInventoryObserver*               mInventoryObserver;
-    LLUUID                             mSelectedItemID;
+    selection_deque                    mSelectedItemIDs;
     LLUUID                             mItemToSelect;
+    bool                               mNeedsSelection;
     bool                               mIsInitialized;
     bool                               mRootDirty;
 
@@ -300,6 +302,7 @@ public:
     LLFontGL* getTextFont();
 
     void setItemName(std::string name);
+    bool isSelected() { return mSelected; }
     void setSelected(bool value);
     void setWorn(bool value);
     void setUUID(LLUUID id) {mUUID = id;}
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index b63d6b9308..30f301027c 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1750,7 +1750,7 @@ void LLPanelMainInventory::saveTexture(const LLSD& userdata)
     LLUUID item_id;
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        item_id = mCombinationGalleryPanel->getSelectedItemID();
+        item_id = mCombinationGalleryPanel->getFirstSelectedItemID();
         if (item_id.isNull()) return;
     }
     else
@@ -1848,7 +1848,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 	{
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getSelectedItemID());
+            LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getFirstSelectedItemID());
             if (obj && obj->getIsLinkType())
             {
                 show_item_original(obj->getUUID());
@@ -1878,7 +1878,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
                     LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
                     if (main_inventory)
                     {
-                        LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getSelectedItemID());
+                        LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getFirstSelectedItemID());
                         if (obj)
                         {
                             main_inventory->findLinks(obj->getUUID(), obj->getName());
@@ -1905,7 +1905,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
         LLSD params;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            params = LLSD(mCombinationGalleryPanel->getSelectedItemID());
+            params = LLSD(mCombinationGalleryPanel->getFirstSelectedItemID());
         }
         else
         {
@@ -1965,7 +1965,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
     {
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            std::set<LLUUID> uuids{ mCombinationGalleryPanel->getSelectedItemID()};
+            std::set<LLUUID> uuids{ mCombinationGalleryPanel->getFirstSelectedItemID()};
             LLAvatarActions::shareWithAvatars(uuids, gFloaterView->getParentFloater(this));
         }
         else
@@ -2009,7 +2009,7 @@ bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
     LLViewerInventoryItem *inv_item = NULL;
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        inv_item = gInventory.getItem(mCombinationGalleryPanel->getSelectedItemID());
+        inv_item = gInventory.getItem(mCombinationGalleryPanel->getFirstSelectedItemID());
     }
     else
     {
@@ -2059,7 +2059,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
         LLUUID item_id;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            item_id = mCombinationGalleryPanel->getSelectedItemID();
+            item_id = mCombinationGalleryPanel->getFirstSelectedItemID();
         }
         else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
@@ -2079,7 +2079,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
         LLUUID item_id;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            item_id = mCombinationGalleryPanel->getSelectedItemID();
+            item_id = mCombinationGalleryPanel->getFirstSelectedItemID();
         }
         else{
 		LLFolderView* root = getActivePanel()->getRootFolder();
@@ -2114,7 +2114,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 	{
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            return can_share_item(mCombinationGalleryPanel->getSelectedItemID());
+            return can_share_item(mCombinationGalleryPanel->getFirstSelectedItemID());
         }
         else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
@@ -2626,7 +2626,7 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_w
 
 void LLPanelMainInventory::scrollToGallerySelection()
 {
-    mCombinationGalleryPanel->scrollToShowItem(mCombinationGalleryPanel->getSelectedItemID());
+    mCombinationGalleryPanel->scrollToShowItem(mCombinationGalleryPanel->getFirstSelectedItemID());
 }
 
 void LLPanelMainInventory::scrollToInvPanelSelection()
-- 
cgit v1.2.3


From 0941fcd5a48e9d4d95fb88750db3b964aa983486 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 21 Jul 2023 00:47:14 +0300
Subject: SL-20047 Indicate when gallery items are being cut

---
 indra/newview/llinventorygallery.cpp | 40 +++++++++++++++++++++++++++++-------
 indra/newview/llinventorygallery.h   |  4 ++++
 2 files changed, 37 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index ca1b2eb09e..99bd772773 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2230,7 +2230,9 @@ LLInventoryGalleryItem::LLInventoryGalleryItem(const Params& p)
     mHidden(false),
     mGallery(NULL),
     mType(LLAssetType::AT_NONE),
-    mSortGroup(SG_ITEM)
+    mSortGroup(SG_ITEM),
+    mCutGeneration(0),
+    mSelectedForCut(false)
 {
     buildFromFile("panel_inventory_gallery_item.xml");
 }
@@ -2328,13 +2330,24 @@ void LLInventoryGalleryItem::setThumbnail(LLUUID id)
 
 void LLInventoryGalleryItem::draw()
 {
-    LLPanel::draw();
+    if (isFadeItem())
+    {
+        // Fade out to indicate it's being cut
+        LLViewDrawContext context(0.5f);
+        LLPanel::draw();
+    }
+    else
+    {
+        LLPanel::draw();
+
+        // Draw border
+        LLUIColor border_color = LLUIColorTable::instance().getColor(mSelected ? "MenuItemHighlightBgColor" : "TextFgTentativeColor", LLColor4::white);
+        LLRect border = getChildView("preview_thumbnail")->getRect();
+        border.mRight = border.mRight + 1;
+        gl_rect_2d(border, border_color.get(), FALSE);
+    }
+
 
-    // Draw border
-    LLUIColor border_color = LLUIColorTable::instance().getColor(mSelected ? "MenuItemHighlightBgColor" : "TextFgTentativeColor", LLColor4::white);
-    LLRect border = getChildView("preview_thumbnail")->getRect();
-    border.mRight = border.mRight + 1;
-    gl_rect_2d(border, border_color.get(), FALSE);
 }
 
 void LLInventoryGalleryItem::setItemName(std::string name)
@@ -2543,6 +2556,19 @@ void LLInventoryGalleryItem::updateNameText()
     getChild<LLThumbnailCtrl>("preview_thumbnail")->setToolTip(mItemName + mPermSuffix + mWornSuffix);
 }
 
+bool LLInventoryGalleryItem::isFadeItem()
+{
+    LLClipboard& clipboard = LLClipboard::instance();
+    if (mCutGeneration == clipboard.getGeneration())
+    {
+        return mSelectedForCut;
+    }
+
+    mCutGeneration = clipboard.getGeneration();
+    mSelectedForCut = clipboard.isCutMode() && clipboard.isOnClipboard(mUUID);
+    return mSelectedForCut;
+}
+
 //-----------------------------
 // LLThumbnailsObserver
 //-----------------------------
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 42bda59c5a..f2e5e38940 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -335,6 +335,8 @@ public:
     void updateNameText();
     
 private:
+    bool isFadeItem();
+
     LLUUID mUUID;
     LLTextBox* mNameText;
     LLPanel* mTextBgPanel;
@@ -344,6 +346,8 @@ private:
     bool     mHidden;
     bool     mIsFolder;
     bool     mIsLink;
+    S32      mCutGeneration;
+    bool     mSelectedForCut;
 
     std::string mAssetIDStr;
     std::string mDesc;
-- 
cgit v1.2.3


From d237b9ee1b0bbcdb3431f8afc873af4ee9e21a4e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 21 Jul 2023 17:19:04 +0300
Subject: SL-20040 Fix selection callback

---
 indra/newview/llinventorygallery.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 99bd772773..87dba5f100 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1302,7 +1302,7 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
         if (std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) == mSelectedItemIDs.end())
         {
             mSelectedItemIDs.clear();
-            mSelectedItemIDs.push_back(item_id);
+            changeItemSelection(item_id, false);
         }
         uuid_vec_t selected_uuids;
         selected_uuids.push_back(item_id);
@@ -1318,8 +1318,10 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
         mNeedsSelection = true;
         return;
     }
-    if (std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) == mSelectedItemIDs.end())
+    if (mSelectedItemIDs.size() == 1
+        && std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) != mSelectedItemIDs.end())
     {
+        // Already selected
         return;
     }
 
@@ -1330,6 +1332,7 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
             mItemMap[id]->setSelected(FALSE);
         }
     }
+    mSelectedItemIDs.clear();
 
     if (mItemMap[item_id])
     {
@@ -2388,9 +2391,6 @@ BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
     setFocus(TRUE);
     mGallery->claimEditHandler();
-
-    //S32 gal_x, gal_y;
-    //localPointToOtherView(x, y, &gal_x, &gal_y, mGallery);
     mGallery->showContextMenu(this, x, y, mUUID);
 
     LLUICtrl::handleRightMouseDown(x, y, mask);
-- 
cgit v1.2.3


From b67172aa12be4a37c83042437844747ff0e02e34 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 21 Jul 2023 15:46:12 -0500
Subject: SL-20010 Make reflection probes ignore touch actions.

---
 indra/newview/llreflectionmap.cpp    |  2 +-
 indra/newview/llspatialpartition.cpp | 15 +++++---
 indra/newview/llspatialpartition.h   |  2 ++
 indra/newview/lltoolpie.cpp          |  2 +-
 indra/newview/llviewerwindow.cpp     | 68 +++++++++++++++++++-----------------
 indra/newview/llviewerwindow.h       |  5 ++-
 indra/newview/pipeline.cpp           | 11 +++---
 indra/newview/pipeline.h             |  1 +
 8 files changed, 61 insertions(+), 45 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index efaf068bd2..a039c8072a 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -117,7 +117,7 @@ void LLReflectionMap::autoAdjustOrigin()
             {
                 int face = -1;
                 LLVector4a intersection;
-                LLDrawable* drawable = mGroup->lineSegmentIntersect(bounds[0], corners[i], false, false, true, &face, &intersection);
+                LLDrawable* drawable = mGroup->lineSegmentIntersect(bounds[0], corners[i], false, false, true, true, &face, &intersection);
                 if (drawable != nullptr)
                 {
                     hit = true;
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index f52f1a925d..32c891dbb6 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -3507,8 +3507,9 @@ public:
 	BOOL mPickTransparent;
 	BOOL mPickRigged;
     BOOL mPickUnselectable;
+    BOOL mPickReflectionProbe;
 
-	LLOctreeIntersect(const LLVector4a& start, const LLVector4a& end, BOOL pick_transparent, BOOL pick_rigged, BOOL pick_unselectable,
+	LLOctreeIntersect(const LLVector4a& start, const LLVector4a& end, BOOL pick_transparent, BOOL pick_rigged, BOOL pick_unselectable, BOOL pick_reflection_probe,
 					  S32* face_hit, LLVector4a* intersection, LLVector2* tex_coord, LLVector4a* normal, LLVector4a* tangent)
 		: mStart(start),
 		  mEnd(end),
@@ -3520,7 +3521,8 @@ public:
 		  mHit(NULL),
 		  mPickTransparent(pick_transparent),
 		  mPickRigged(pick_rigged),
-          mPickUnselectable(pick_unselectable)
+          mPickUnselectable(pick_unselectable),
+          mPickReflectionProbe(pick_reflection_probe)
 	{
 	}
 	
@@ -3596,7 +3598,8 @@ public:
 		{
 			LLViewerObject* vobj = drawable->getVObj();
 
-			if (vobj)
+            if (vobj &&
+                (!vobj->isReflectionProbe() || mPickReflectionProbe))
 			{
 				LLVector4a intersection;
 				bool skip_check = false;
@@ -3642,6 +3645,7 @@ LLDrawable* LLSpatialPartition::lineSegmentIntersect(const LLVector4a& start, co
 													 BOOL pick_transparent,
 													 BOOL pick_rigged,
                                                      BOOL pick_unselectable,
+                                                     BOOL pick_reflection_probe,
 													 S32* face_hit,                   // return the face hit
 													 LLVector4a* intersection,         // return the intersection point
 													 LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -3650,7 +3654,7 @@ LLDrawable* LLSpatialPartition::lineSegmentIntersect(const LLVector4a& start, co
 	)
 
 {
-	LLOctreeIntersect intersect(start, end, pick_transparent, pick_rigged, pick_unselectable, face_hit, intersection, tex_coord, normal, tangent);
+	LLOctreeIntersect intersect(start, end, pick_transparent, pick_rigged, pick_unselectable, pick_reflection_probe, face_hit, intersection, tex_coord, normal, tangent);
 	LLDrawable* drawable = intersect.check(mOctree);
 
 	return drawable;
@@ -3660,6 +3664,7 @@ LLDrawable* LLSpatialGroup::lineSegmentIntersect(const LLVector4a& start, const
     BOOL pick_transparent,
     BOOL pick_rigged,
     BOOL pick_unselectable,
+    BOOL pick_reflection_probe,
     S32* face_hit,                   // return the face hit
     LLVector4a* intersection,         // return the intersection point
     LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -3668,7 +3673,7 @@ LLDrawable* LLSpatialGroup::lineSegmentIntersect(const LLVector4a& start, const
 )
 
 {
-    LLOctreeIntersect intersect(start, end, pick_transparent, pick_rigged, pick_unselectable, face_hit, intersection, tex_coord, normal, tangent);
+    LLOctreeIntersect intersect(start, end, pick_transparent, pick_rigged, pick_unselectable, pick_reflection_probe, face_hit, intersection, tex_coord, normal, tangent);
     LLDrawable* drawable = intersect.check(getOctreeNode());
 
     return drawable;
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 88584f535a..fe23670bea 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -315,6 +315,7 @@ public:
         BOOL pick_transparent,
         BOOL pick_rigged,
         BOOL pick_unselectable,
+        BOOL pick_reflection_probe,
         S32* face_hit,                          // return the face hit
         LLVector4a* intersection = NULL,         // return the intersection point
         LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -389,6 +390,7 @@ public:
 									 BOOL pick_transparent, 
 									 BOOL pick_rigged,
                                      BOOL pick_unselectable,
+                                     BOOL pick_reflection_probe,
 									 S32* face_hit,                          // return the face hit
 									 LLVector4a* intersection = NULL,         // return the intersection point
 									 LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 2c5b8ffae4..84cc3f03c2 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -114,7 +114,7 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 	mMouseDownY = y;
 	LLTimer pick_timer;
 	BOOL pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick");
-	LLPickInfo transparent_pick = gViewerWindow->pickImmediate(x, y, TRUE /*includes transparent*/, pick_rigged);
+	LLPickInfo transparent_pick = gViewerWindow->pickImmediate(x, y, TRUE /*includes transparent*/, pick_rigged, FALSE, TRUE, FALSE);
 	LLPickInfo visible_pick = gViewerWindow->pickImmediate(x, y, FALSE, pick_rigged);
 	LLViewerObject *transp_object = transparent_pick.getObject();
 	LLViewerObject *visible_object = visible_pick.getObject();
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index c6ed6ffb7d..71fe893091 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3344,7 +3344,7 @@ void LLViewerWindow::updateUI()
 	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST))
 	{
 		gDebugRaycastFaceHit = -1;
-		gDebugRaycastObject = cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE, FALSE, TRUE,
+		gDebugRaycastObject = cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE, FALSE, TRUE, FALSE,
 											  &gDebugRaycastFaceHit,
 											  &gDebugRaycastIntersection,
 											  &gDebugRaycastTexCoord,
@@ -4229,7 +4229,7 @@ void LLViewerWindow::pickAsync( S32 x,
         pick_transparent = TRUE;
     }
 
-	LLPickInfo pick_info(LLCoordGL(x, y_from_bot), mask, pick_transparent, pick_rigged, FALSE, TRUE, pick_unselectable, callback);
+	LLPickInfo pick_info(LLCoordGL(x, y_from_bot), mask, pick_transparent, pick_rigged, FALSE, TRUE, pick_unselectable, TRUE, callback);
 	schedulePick(pick_info);
 }
 
@@ -4285,7 +4285,7 @@ void LLViewerWindow::returnEmptyPicks()
 }
 
 // Performs the GL object/land pick.
-LLPickInfo LLViewerWindow::pickImmediate(S32 x, S32 y_from_bot, BOOL pick_transparent, BOOL pick_rigged, BOOL pick_particle, BOOL pick_unselectable)
+LLPickInfo LLViewerWindow::pickImmediate(S32 x, S32 y_from_bot, BOOL pick_transparent, BOOL pick_rigged, BOOL pick_particle, BOOL pick_unselectable, BOOL pick_reflection_probe)
 {
 	BOOL in_build_mode = LLFloaterReg::instanceVisible("build");
 	if ((in_build_mode && gSavedSettings.getBOOL("SelectInvisibleObjects")) || LLDrawPoolAlpha::sShowDebugAlpha)
@@ -4297,7 +4297,7 @@ LLPickInfo LLViewerWindow::pickImmediate(S32 x, S32 y_from_bot, BOOL pick_transp
 	
 	// shortcut queueing in mPicks and just update mLastPick in place
 	MASK	key_mask = gKeyboard->currentMask(TRUE);
-	mLastPick = LLPickInfo(LLCoordGL(x, y_from_bot), key_mask, pick_transparent, pick_rigged, pick_particle, TRUE, FALSE, NULL);
+	mLastPick = LLPickInfo(LLCoordGL(x, y_from_bot), key_mask, pick_transparent, pick_rigged, pick_particle, pick_reflection_probe, TRUE, FALSE, NULL);
 	mLastPick.fetchResults();
 
 	return mLastPick;
@@ -4335,6 +4335,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
 												BOOL pick_transparent,
 												BOOL pick_rigged,
                                                 BOOL pick_unselectable,
+                                                BOOL pick_reflection_probe,
 												S32* face_hit,
 												LLVector4a *intersection,
 												LLVector2 *uv,
@@ -4413,7 +4414,8 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
 		}
 		else // is a world object
 		{
-			if (this_object->lineSegmentIntersect(mw_start, mw_end, this_face, pick_transparent, pick_rigged, pick_unselectable,
+            if ((pick_reflection_probe || !this_object->isReflectionProbe())
+                && this_object->lineSegmentIntersect(mw_start, mw_end, this_face, pick_transparent, pick_rigged, pick_unselectable,
 												  face_hit, intersection, uv, normal, tangent))
 			{
 				found = this_object;
@@ -4427,7 +4429,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
 
 		if (!found) // if not found in HUD, look in world:
 		{
-			found = gPipeline.lineSegmentIntersectInWorld(mw_start, mw_end, pick_transparent, pick_rigged, pick_unselectable,
+			found = gPipeline.lineSegmentIntersectInWorld(mw_start, mw_end, pick_transparent, pick_rigged, pick_unselectable, pick_reflection_probe,
 														  face_hit, intersection, uv, normal, tangent);
 			if (found && !pick_transparent)
 			{
@@ -6085,30 +6087,32 @@ LLPickInfo::LLPickInfo()
 {
 }
 
-LLPickInfo::LLPickInfo(const LLCoordGL& mouse_pos, 
-		       MASK keyboard_mask, 
-		       BOOL pick_transparent,
-			   BOOL pick_rigged,
-			   BOOL pick_particle,
-		       BOOL pick_uv_coords,
-			   BOOL pick_unselectable,
-		       void (*pick_callback)(const LLPickInfo& pick_info))
-	: mMousePt(mouse_pos),
-	  mKeyMask(keyboard_mask),
-	  mPickCallback(pick_callback),
-	  mPickType(PICK_INVALID),
-	  mWantSurfaceInfo(pick_uv_coords),
-	  mObjectFace(-1),
-	  mUVCoords(-1.f, -1.f),
-	  mSTCoords(-1.f, -1.f),
-	  mXYCoords(-1, -1),
-	  mNormal(),
-	  mTangent(),
-	  mBinormal(),
-	  mHUDIcon(NULL),
-	  mPickTransparent(pick_transparent),
-	  mPickRigged(pick_rigged),
-	  mPickParticle(pick_particle),
+LLPickInfo::LLPickInfo(const LLCoordGL& mouse_pos,
+    MASK keyboard_mask,
+    BOOL pick_transparent,
+    BOOL pick_rigged,
+    BOOL pick_particle,
+    BOOL pick_reflection_probe,
+    BOOL pick_uv_coords,
+    BOOL pick_unselectable,
+    void (*pick_callback)(const LLPickInfo& pick_info))
+    : mMousePt(mouse_pos),
+    mKeyMask(keyboard_mask),
+    mPickCallback(pick_callback),
+    mPickType(PICK_INVALID),
+    mWantSurfaceInfo(pick_uv_coords),
+    mObjectFace(-1),
+    mUVCoords(-1.f, -1.f),
+    mSTCoords(-1.f, -1.f),
+    mXYCoords(-1, -1),
+    mNormal(),
+    mTangent(),
+    mBinormal(),
+    mHUDIcon(NULL),
+    mPickTransparent(pick_transparent),
+    mPickRigged(pick_rigged),
+    mPickParticle(pick_particle),
+    mPickReflectionProbe(pick_reflection_probe),
 	  mPickUnselectable(pick_unselectable)
 {
 }
@@ -6139,7 +6143,7 @@ void LLPickInfo::fetchResults()
 	}
 
 	LLViewerObject* hit_object = gViewerWindow->cursorIntersect(mMousePt.mX, mMousePt.mY, 512.f,
-									NULL, -1, mPickTransparent, mPickRigged, mPickUnselectable, &face_hit,
+									NULL, -1, mPickTransparent, mPickRigged, mPickUnselectable, mPickReflectionProbe, &face_hit,
 									&intersection, &uv, &normal, &tangent, &start, &end);
 	
 	mPickPt = mMousePt;
@@ -6284,7 +6288,7 @@ void LLPickInfo::getSurfaceInfo()
 	if (objectp)
 	{
 		if (gViewerWindow->cursorIntersect(ll_round((F32)mMousePt.mX), ll_round((F32)mMousePt.mY), 1024.f,
-										   objectp, -1, mPickTransparent, mPickRigged, mPickUnselectable,
+										   objectp, -1, mPickTransparent, mPickRigged, mPickUnselectable, mPickReflectionProbe,
 										   &mObjectFace,
 										   &intersection,
 										   &mSTCoords,
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index bbce9a25f6..943cdf2fc4 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -94,6 +94,7 @@ public:
 		BOOL pick_transparent,
 		BOOL pick_rigged,
 		BOOL pick_particle,
+        BOOL pick_reflection_probe,
 		BOOL pick_surface_info,
 		BOOL pick_unselectable,
 		void (*pick_callback)(const LLPickInfo& pick_info));
@@ -130,6 +131,7 @@ public:
 	BOOL			mPickRigged;
 	BOOL			mPickParticle;
 	BOOL			mPickUnselectable;
+    BOOL            mPickReflectionProbe = FALSE;
 	void		    getSurfaceInfo();
 
 private:
@@ -407,7 +409,7 @@ public:
 								BOOL pick_transparent = FALSE,
 								BOOL pick_rigged = FALSE,
 								BOOL pick_unselectable = FALSE);
-	LLPickInfo		pickImmediate(S32 x, S32 y, BOOL pick_transparent, BOOL pick_rigged = FALSE, BOOL pick_particle = FALSE, BOOL pick_unselectable = TRUE);
+	LLPickInfo		pickImmediate(S32 x, S32 y, BOOL pick_transparent, BOOL pick_rigged = FALSE, BOOL pick_particle = FALSE, BOOL pick_unselectable = TRUE, BOOL pick_reflection_probe = TRUE);
 	LLHUDIcon* cursorIntersectIcon(S32 mouse_x, S32 mouse_y, F32 depth,
 										   LLVector4a* intersection);
 
@@ -417,6 +419,7 @@ public:
 									BOOL pick_transparent = FALSE,
 									BOOL pick_rigged = FALSE,
                                     BOOL pick_unselectable = TRUE,
+                                    BOOL pick_reflection_probe = TRUE,
 									S32* face_hit = NULL,
 									LLVector4a *intersection = NULL,
 									LLVector2 *uv = NULL,
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1402591015..1b4c8f65a6 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6223,7 +6223,7 @@ LLVOPartGroup* LLPipeline::lineSegmentIntersectParticle(const LLVector4a& start,
 		LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_PARTICLE);
 		if (part && hasRenderType(part->mDrawableType))
 		{
-			LLDrawable* hit = part->lineSegmentIntersect(start, local_end, TRUE, FALSE, TRUE, face_hit, &position, NULL, NULL, NULL);
+			LLDrawable* hit = part->lineSegmentIntersect(start, local_end, TRUE, FALSE, TRUE, FALSE, face_hit, &position, NULL, NULL, NULL);
 			if (hit)
 			{
 				drawable = hit;
@@ -6252,6 +6252,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start,
 														bool pick_transparent,
 														bool pick_rigged,
                                                         bool pick_unselectable,
+                                                        bool pick_reflection_probe,
 														S32* face_hit,
 														LLVector4a* intersection,         // return the intersection point
 														LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -6285,7 +6286,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start,
 				LLSpatialPartition* part = region->getSpatialPartition(j);
 				if (part && hasRenderType(part->mDrawableType))
 				{
-					LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, pick_rigged, pick_unselectable, face_hit, &position, tex_coord, normal, tangent);
+					LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, pick_rigged, pick_unselectable, pick_reflection_probe, face_hit, &position, tex_coord, normal, tangent);
 					if (hit)
 					{
 						drawable = hit;
@@ -6342,7 +6343,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start,
 			LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_AVATAR);
 			if (part && hasRenderType(part->mDrawableType))
 			{
-				LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, pick_rigged, pick_unselectable, face_hit, &position, tex_coord, normal, tangent);
+				LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, pick_rigged, pick_unselectable, pick_reflection_probe, face_hit, &position, tex_coord, normal, tangent);
 				if (hit)
 				{
 					LLVector4a delta;
@@ -6430,7 +6431,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector4a& start, c
 		LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_HUD);
 		if (part)
 		{
-			LLDrawable* hit = part->lineSegmentIntersect(start, end, pick_transparent, FALSE, TRUE, face_hit, intersection, tex_coord, normal, tangent);
+			LLDrawable* hit = part->lineSegmentIntersect(start, end, pick_transparent, FALSE, TRUE, FALSE, face_hit, intersection, tex_coord, normal, tangent);
 			if (hit)
 			{
 				drawable = hit;
@@ -7165,7 +7166,7 @@ void LLPipeline::renderDoF(LLRenderTarget* src, LLRenderTarget* dst)
 					LLVector4a result;
 					result.clear();
 
-					gViewerWindow->cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE, FALSE, TRUE, NULL, &result);
+					gViewerWindow->cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE, FALSE, TRUE, TRUE, NULL, &result);
 
 					focus_point.set(result.getF32ptr());
 				}
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 427240aad7..fe92c69cbb 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -205,6 +205,7 @@ public:
 												bool pick_transparent,
 												bool pick_rigged,
                                                 bool pick_unselectable,
+                                                bool pick_reflection_probe,
 												S32* face_hit,                          // return the face hit
 												LLVector4a* intersection = NULL,         // return the intersection point
 												LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
-- 
cgit v1.2.3


From 7b9206dfd15ee90fde421525254b0a29d94f1ef2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 22 Jul 2023 00:22:35 +0300
Subject: SL-20045 Texture picker should apply the exact texture inventory item

---
 indra/newview/llfloaterchangeitemthumbnail.cpp |   6 +-
 indra/newview/llfloaterchangeitemthumbnail.h   |   2 +-
 indra/newview/llpanelprofile.cpp               |  36 +-----
 indra/newview/lltexturectrl.cpp                | 145 +++++++++++++++++--------
 indra/newview/lltexturectrl.h                  |  13 ++-
 5 files changed, 118 insertions(+), 84 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 1ad235ac0a..d7fbf1384b 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -698,11 +698,11 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
         {
             //texture_floaterp->setTextureSelectedCallback();
             //texture_floaterp->setOnUpdateImageStatsCallback();
-            texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLUUID id)
+            texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLPickerSource, const LLUUID&, const LLUUID&)
             {
                 if (op == LLTextureCtrl::TEXTURE_SELECT)
                 {
-                    onTexturePickerCommit(id);
+                    onTexturePickerCommit();
                 }
             }
             );
@@ -722,7 +722,7 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
     floaterp->setFocus(TRUE);
 }
 
-void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id)
+void LLFloaterChangeItemThumbnail::onTexturePickerCommit()
 {
     LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mPickerHandle.get();
 
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index de2a20bf2a..02f934337b 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -92,7 +92,7 @@ private:
         void* userdata);
 
     void showTexturePicker(const LLUUID &thumbnail_id);
-    void onTexturePickerCommit(LLUUID id);
+    void onTexturePickerCommit();
 
     void setThumbnailId(const LLUUID &new_thumbnail_id);
     static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id);
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index c67be5bb28..b6c2d1f0fd 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1956,25 +1956,11 @@ void LLPanelProfileSecondLife::onShowTexturePicker()
 
             mFloaterTexturePickerHandle = texture_floaterp->getHandle();
 
-            texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLUUID id)
+            texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLPickerSource source, const LLUUID& asset_id, const LLUUID&)
             {
                 if (op == LLTextureCtrl::TEXTURE_SELECT)
                 {
-                    LLUUID image_asset_id;
-                    LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterTexturePickerHandle.get();
-                    if (floaterp)
-                    {
-                        if (id.notNull())
-                        {
-                            image_asset_id = id;
-                        }
-                        else
-                        {
-                            image_asset_id = floaterp->getAssetID();
-                        }
-                    }
-
-                    onCommitProfileImage(image_asset_id);
+                    onCommitProfileImage(asset_id);
                 }
             });
             texture_floaterp->setLocalTextureEnabled(FALSE);
@@ -2297,25 +2283,11 @@ void LLPanelProfileFirstLife::onChangePhoto()
 
             mFloaterTexturePickerHandle = texture_floaterp->getHandle();
 
-            texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLUUID id)
+            texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLPickerSource source, const LLUUID& asset_id, const LLUUID&)
             {
                 if (op == LLTextureCtrl::TEXTURE_SELECT)
                 {
-                    LLUUID image_asset_id;
-                    LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterTexturePickerHandle.get();
-                    if (floaterp)
-                    {
-                        if (id.notNull())
-                        {
-                            image_asset_id = id;
-                        }
-                        else
-                        {
-                            image_asset_id = floaterp->getAssetID();
-                        }
-                    }
-
-                    onCommitPhoto(image_asset_id);
+                    onCommitPhoto(asset_id);
                 }
             });
             texture_floaterp->setLocalTextureEnabled(FALSE);
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 21bb855704..36fa4e9a37 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -713,17 +713,76 @@ PermissionMask LLFloaterTexturePicker::getFilterPermMask()
 
 void LLFloaterTexturePicker::commitIfImmediateSet()
 {
-	if (!mNoCopyTextureSelected && mOnFloaterCommitCallback && mCanApply)
+	if (!mNoCopyTextureSelected && mCanApply)
 	{
-		mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CHANGE, LLUUID::null);
+        commitCallback();
 	}
 }
 
+void LLFloaterTexturePicker::commitCallback()
+{
+    if (!mOnFloaterCommitCallback)
+    {
+        return;
+    }
+    LLUUID asset_id = mImageAssetID;
+    LLUUID inventory_id;
+    LLPickerSource mode = (LLPickerSource)mModeSelector->getValue().asInteger();
+
+    switch (mode)
+    {
+        case PICKER_INVENTORY:
+            {
+                LLFolderView* root_folder = mInventoryPanel->getRootFolder();
+                if (root_folder && root_folder->getCurSelectedItem())
+                {
+                    LLFolderViewItem* last_selected = root_folder->getCurSelectedItem();
+                    LLFolderViewModelItemInventory* inv_view = static_cast<LLFolderViewModelItemInventory*>(last_selected->getViewModelItem());
+
+                    LLInventoryItem* itemp = gInventory.getItem(inv_view->getUUID());
+                    if (itemp && itemp->getAssetUUID() == mImageAssetID)
+                    {
+                        inventory_id = inv_view->getUUID();
+                    }
+                    else
+                    {
+                        mode = PICKER_UNKNOWN; // source of id unknown
+                    }
+                }
+                else
+                {
+                    mode = PICKER_UNKNOWN; // source of id unknown
+                }
+                break;
+            }
+        case PICKER_LOCAL:
+            {
+                if (!mLocalScrollCtrl->getAllSelected().empty())
+                {
+                    LLUUID temp_id = mLocalScrollCtrl->getFirstSelected()->getColumn(LOCAL_TRACKING_ID_COLUMN)->getValue().asUUID();
+                    asset_id = LLLocalBitmapMgr::getInstance()->getWorldID(temp_id);
+                }
+                else
+                {
+                    asset_id = mImageAssetID;
+                    mode = PICKER_UNKNOWN; // source of id unknown
+                }
+                break;
+            }
+        case PICKER_BAKE:
+            break;
+        default:
+            mode = PICKER_UNKNOWN; // source of id unknown
+            break;
+    }
+
+    mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CHANGE, mode, asset_id, inventory_id);
+}
 void LLFloaterTexturePicker::commitCancel()
 {
 	if (!mNoCopyTextureSelected && mOnFloaterCommitCallback && mCanApply)
 	{
-		mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CANCEL, LLUUID::null);
+		mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CANCEL, PICKER_UNKNOWN, mOriginalImageAssetID, LLUUID::null);
 	}
 }
 
@@ -776,7 +835,7 @@ void LLFloaterTexturePicker::onBtnCancel(void* userdata)
 	self->setImageID( self->mOriginalImageAssetID );
 	if (self->mOnFloaterCommitCallback)
 	{
-		self->mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CANCEL, LLUUID::null);
+		self->mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CANCEL, PICKER_UNKNOWN, self->mOriginalImageAssetID, LLUUID::null);
 	}
 	self->mViewModel->resetDirty();
 	self->closeFloater();
@@ -786,20 +845,7 @@ void LLFloaterTexturePicker::onBtnCancel(void* userdata)
 void LLFloaterTexturePicker::onBtnSelect(void* userdata)
 {
 	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-	LLUUID local_id = LLUUID::null;
-	if (self->mOwner)
-	{
-		if (self->mLocalScrollCtrl->getVisible() && !self->mLocalScrollCtrl->getAllSelected().empty())
-		{
-			LLUUID temp_id = self->mLocalScrollCtrl->getFirstSelected()->getColumn(LOCAL_TRACKING_ID_COLUMN)->getValue().asUUID();
-			local_id = LLLocalBitmapMgr::getInstance()->getWorldID(temp_id);
-		}
-	}
-	
-	if (self->mOnFloaterCommitCallback)
-	{
-		self->mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_SELECT, local_id);
-	}
+	self->commitCallback();
 	self->closeFloater();
 }
 
@@ -861,25 +907,25 @@ void LLFloaterTexturePicker::onModeSelect(LLUICtrl* ctrl, void *userdata)
 	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
     int index = self->mModeSelector->getValue().asInteger();
 
-	self->mDefaultBtn->setVisible(index == 0 ? TRUE : FALSE);
-	self->mBlankBtn->setVisible(index == 0 ? TRUE : FALSE);
-	self->mNoneBtn->setVisible(index == 0 ? TRUE : FALSE);
-	self->mPipetteBtn->setVisible(index == 0 ? TRUE : FALSE);
-	self->getChild<LLFilterEditor>("inventory search editor")->setVisible(index == 0 ? TRUE : FALSE);
-	self->getChild<LLInventoryPanel>("inventory panel")->setVisible(index == 0 ? TRUE : FALSE);
+	self->mDefaultBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+	self->mBlankBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+	self->mNoneBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+	self->mPipetteBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+	self->getChild<LLFilterEditor>("inventory search editor")->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+	self->getChild<LLInventoryPanel>("inventory panel")->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
 
 	/*self->getChild<LLCheckBox>("show_folders_check")->setVisible(mode);
 	  no idea under which conditions the above is even shown, needs testing. */
 
-	self->getChild<LLButton>("l_add_btn")->setVisible(index == 1 ? TRUE : FALSE);
-	self->getChild<LLButton>("l_rem_btn")->setVisible(index == 1 ? TRUE : FALSE);
-	self->getChild<LLButton>("l_upl_btn")->setVisible(index == 1 ? TRUE : FALSE);
-	self->getChild<LLScrollListCtrl>("l_name_list")->setVisible(index == 1 ? TRUE : FALSE);
+	self->getChild<LLButton>("l_add_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
+	self->getChild<LLButton>("l_rem_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
+	self->getChild<LLButton>("l_upl_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
+	self->getChild<LLScrollListCtrl>("l_name_list")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
 
-	self->getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(index == 2 ? TRUE : FALSE);
+	self->getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(index == PICKER_BAKE ? TRUE : FALSE);
 	self->getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(FALSE);// index == 2 ? TRUE : FALSE);
 
-	if (index == 2)
+	if (index == PICKER_BAKE)
 	{
 		self->stopUsingPipette();
 
@@ -1020,7 +1066,7 @@ void LLFloaterTexturePicker::onLocalScrollCommit(LLUICtrl* ctrl, void* userdata)
 		{
 			if (self->mOnFloaterCommitCallback)
 			{
-				self->mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CHANGE, inworld_id);
+				self->mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CHANGE, PICKER_LOCAL, inworld_id, LLUUID::null);
 			}
 		}
 	}
@@ -1457,7 +1503,7 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
 		}
 		if (texture_floaterp)
 		{
-			texture_floaterp->setOnFloaterCommitCallback(boost::bind(&LLTextureCtrl::onFloaterCommit, this, _1, _2));
+			texture_floaterp->setOnFloaterCommitCallback(boost::bind(&LLTextureCtrl::onFloaterCommit, this, _1, _2, _3, _4));
 		}
 		if (texture_floaterp)
 		{
@@ -1574,7 +1620,7 @@ void LLTextureCtrl::onFloaterClose()
 	mFloaterHandle.markDead();
 }
 
-void LLTextureCtrl::onFloaterCommit(ETexturePickOp op, LLUUID id)
+void LLTextureCtrl::onFloaterCommit(ETexturePickOp op, LLPickerSource source, const LLUUID& asset_id, const LLUUID& inv_id)
 {
 	LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
 
@@ -1588,22 +1634,29 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op, LLUUID id)
 		else if (mCommitOnSelection || op == TEXTURE_SELECT)
 			mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
 			
-		if(floaterp->isDirty() || id.notNull()) // mModelView->setDirty does not work.
+		if(floaterp->isDirty() || asset_id.notNull()) // mModelView->setDirty does not work.
 		{
 			setTentative( FALSE );
 
-			if (id.notNull())
-			{
-				mImageItemID = id;
-				mImageAssetID = id;
-			}
-			else
-			{
-			mImageItemID = floaterp->findItemID(floaterp->getAssetID(), FALSE);
-			LL_DEBUGS() << "mImageItemID: " << mImageItemID << LL_ENDL;
-			mImageAssetID = floaterp->getAssetID();
-			LL_DEBUGS() << "mImageAssetID: " << mImageAssetID << LL_ENDL;
-			}
+            switch(source)
+            {
+                case PICKER_INVENTORY:
+                    mImageItemID = inv_id;
+                    mImageAssetID = asset_id;
+                    break;
+                case PICKER_BAKE:
+                case PICKER_LOCAL:
+                    mImageItemID = LLUUID::null;
+                    mImageAssetID = asset_id;
+                    break;
+                case PICKER_UNKNOWN:
+                default:
+                    mImageItemID = floaterp->findItemID(asset_id, FALSE);
+                    mImageAssetID = asset_id;
+                    break;
+            }
+
+            LL_DEBUGS() << "mImageAssetID: " << mImageAssetID << ", mImageItemID: " << mImageItemID << LL_ENDL;
 
 			if (op == TEXTURE_SELECT && mOnSelectCallback)
 			{
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 8ef6d9bee7..3cf8861075 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -63,6 +63,14 @@ bool get_is_predefined_texture(LLUUID asset_id);
 LLUUID get_copy_free_item_by_asset_id(LLUUID image_id, bool no_trans_perm = false);
 bool get_can_copy_texture(LLUUID image_id);
 
+enum LLPickerSource
+{
+    PICKER_INVENTORY,
+    PICKER_LOCAL,
+    PICKER_BAKE,
+    PICKER_UNKNOWN, // on cancel, default ids
+};
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // LLTextureCtrl
 
@@ -188,7 +196,7 @@ public:
 	void			closeDependentFloater();
 
 	void			onFloaterClose();
-	void			onFloaterCommit(ETexturePickOp op, LLUUID id);
+	void			onFloaterCommit(ETexturePickOp op, LLPickerSource source, const LLUUID& local_id, const LLUUID& inv_id);
 
 	// This call is returned when a drag is detected. Your callback
 	// should return TRUE if the drag is acceptable.
@@ -256,7 +264,7 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // LLFloaterTexturePicker
-typedef boost::function<void(LLTextureCtrl::ETexturePickOp op, LLUUID id)> floater_commit_callback;
+typedef boost::function<void(LLTextureCtrl::ETexturePickOp op, LLPickerSource source, const LLUUID& asset_id, const LLUUID& inventory_id)> floater_commit_callback;
 typedef boost::function<void()> floater_close_callback;
 typedef boost::function<void(const LLUUID& asset_id)> set_image_asset_id_callback;
 typedef boost::function<void(LLPointer<LLViewerTexture> texture)> set_on_update_image_stats_callback;
@@ -309,6 +317,7 @@ public:
 
 	void updateFilterPermMask();
 	void commitIfImmediateSet();
+    void commitCallback();
 	void commitCancel();
 
 	void onFilterEdit(const std::string& search_string);
-- 
cgit v1.2.3


From bf0fea7b8894515522ed2e5f77497268bbf4a082 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 25 Jul 2023 09:59:04 -0500
Subject: DRTVWR-559 Fix for depth of field causing alpha objects to poke holes
 in water.

---
 indra/newview/lldrawpoolalpha.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 7aa3450be1..052a1d796a 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -218,7 +218,7 @@ void LLDrawPoolAlpha::renderPostDeferred(S32 pass)
     forwardRender();
 
     // final pass, render to depth for depth of field effects
-    if (!LLPipeline::sImpostorRender && gSavedSettings.getBOOL("RenderDepthOfField") && !gCubeSnapshot && !LLPipeline::sRenderingHUDs)
+    if (!LLPipeline::sImpostorRender && gSavedSettings.getBOOL("RenderDepthOfField") && !gCubeSnapshot && !LLPipeline::sRenderingHUDs && getType() == LLDrawPool::POOL_ALPHA_POST_WATER)
     { 
         //update depth buffer sampler
         simple_shader = fullbright_shader = &gDeferredFullbrightAlphaMaskProgram;
-- 
cgit v1.2.3


From b267515922f6bca9034810ab7f18626f39cec356 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Jul 2023 22:06:23 +0300
Subject: SL-20068 Selecting from texture picker for thumbnail does not assign
 thumbnail

---
 indra/newview/lltexturectrl.cpp | 8 ++++----
 indra/newview/lltexturectrl.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 36fa4e9a37..29891ba235 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -715,11 +715,11 @@ void LLFloaterTexturePicker::commitIfImmediateSet()
 {
 	if (!mNoCopyTextureSelected && mCanApply)
 	{
-        commitCallback();
+        commitCallback(LLTextureCtrl::TEXTURE_CHANGE);
 	}
 }
 
-void LLFloaterTexturePicker::commitCallback()
+void LLFloaterTexturePicker::commitCallback(LLTextureCtrl::ETexturePickOp op)
 {
     if (!mOnFloaterCommitCallback)
     {
@@ -776,7 +776,7 @@ void LLFloaterTexturePicker::commitCallback()
             break;
     }
 
-    mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CHANGE, mode, asset_id, inventory_id);
+    mOnFloaterCommitCallback(op, mode, asset_id, inventory_id);
 }
 void LLFloaterTexturePicker::commitCancel()
 {
@@ -845,7 +845,7 @@ void LLFloaterTexturePicker::onBtnCancel(void* userdata)
 void LLFloaterTexturePicker::onBtnSelect(void* userdata)
 {
 	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-	self->commitCallback();
+	self->commitCallback(LLTextureCtrl::TEXTURE_SELECT);
 	self->closeFloater();
 }
 
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 3cf8861075..60543191b6 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -317,7 +317,7 @@ public:
 
 	void updateFilterPermMask();
 	void commitIfImmediateSet();
-    void commitCallback();
+    void commitCallback(LLTextureCtrl::ETexturePickOp op);
 	void commitCancel();
 
 	void onFilterEdit(const std::string& search_string);
-- 
cgit v1.2.3


From a22dfc28a132c0cf888a7ee6e47b29f50b6193af Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 26 Jul 2023 17:53:45 +0200
Subject: SL-18619 Eyes not rendering in Shape floater thumbnails

---
 indra/llappearance/llavatarappearance.cpp |  1 -
 indra/newview/lldrawpoolavatar.cpp        | 12 ++++++------
 indra/newview/llvoavatar.cpp              |  5 -----
 3 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 7946a3e705..18b03c1f89 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -1050,7 +1050,6 @@ BOOL LLAvatarAppearance::loadSkeletonNode ()
 	mRoot->addChild(mMeshLOD[MESH_ID_UPPER_BODY]);
 	mRoot->addChild(mMeshLOD[MESH_ID_LOWER_BODY]);
 	mRoot->addChild(mMeshLOD[MESH_ID_SKIRT]);
-	mRoot->addChild(mMeshLOD[MESH_ID_HEAD]);
 
 	LLAvatarJoint *skull = (LLAvatarJoint*)mRoot->findJoint("mSkull");
 	if (skull)
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index f3a6c4a3a7..342b76d93b 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -171,8 +171,8 @@ void LLDrawPoolAvatar::beginDeferredPass(S32 pass)
 	is_deferred_render = true;
 	
 	if (LLPipeline::sImpostorRender)
-	{ //impostor pass does not have rigid or impostor rendering
-		pass += 2;
+	{ //impostor pass does not have impostor rendering
+		++pass;
 	}
 
 	switch (pass)
@@ -198,7 +198,7 @@ void LLDrawPoolAvatar::endDeferredPass(S32 pass)
 
 	if (LLPipeline::sImpostorRender)
 	{
-		pass += 2;
+		++pass;
 	}
 
 	switch (pass)
@@ -418,7 +418,7 @@ void LLDrawPoolAvatar::render(S32 pass)
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 	if (LLPipeline::sImpostorRender)
 	{
-		renderAvatars(NULL, pass+2);
+		renderAvatars(NULL, ++pass);
 		return;
 	}
 
@@ -433,7 +433,7 @@ void LLDrawPoolAvatar::beginRenderPass(S32 pass)
 
 	if (LLPipeline::sImpostorRender)
 	{ //impostor render does not have impostors or rigid rendering
-		pass += 2;
+		++pass;
 	}
 
 	switch (pass)
@@ -461,7 +461,7 @@ void LLDrawPoolAvatar::endRenderPass(S32 pass)
 
 	if (LLPipeline::sImpostorRender)
 	{
-		pass += 2;		
+		++pass;
 	}
 
 	switch (pass)
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 22cd9f71b3..10a257fbb5 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5232,11 +5232,6 @@ U32 LLVOAvatar::renderRigid()
 	{
 		return 0;
 	}
-	
-	if (!mIsBuilt)
-	{
-		return 0;
-	}
 
 	if (isTextureVisible(TEX_EYES_BAKED) || (getOverallAppearance() == AOA_JELLYDOLL && !isControlAvatar()) || isUIAvatar())
 	{
-- 
cgit v1.2.3


From 1cf4a2c95210ba94c330710e0a98f762bf54c605 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 27 Jul 2023 13:30:09 +0300
Subject: SL-20080 Show warning message when selecting a non square texture for
 thumbnails

---
 indra/newview/lltexturectrl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 29891ba235..a746744e53 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -282,7 +282,8 @@ bool LLFloaterTexturePicker::updateImageStats()
         S32 height = mTexturep->getFullHeight();
 		if (width > 0 && height > 0)
 		{
-            if (width < mMinDim
+            if (width != height
+                || width < mMinDim
                 || width > mMaxDim
                 || height < mMinDim
                 || height > mMaxDim
-- 
cgit v1.2.3


From d8872d5273b5cc952f692d970f19db90588a1508 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 26 Jul 2023 21:30:24 +0300
Subject: SL-18720 getDataBegin() and stateSort() crashes

No repro, but likely cause is in mOctreeNode being NULL.
Marked octree group as dead when destroyed and added isDead verification
---
 indra/newview/llvieweroctree.cpp |  6 +++++-
 indra/newview/pipeline.cpp       | 32 +++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index a2d8d30fb2..9d63241300 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -627,13 +627,17 @@ void LLViewerOctreeGroup::handleRemoval(const TreeNode* node, LLViewerOctreeEntr
 //virtual 
 void LLViewerOctreeGroup::handleDestruction(const TreeNode* node)
 {
+    if (isDead())
+    {
+        return;
+    }
+    setState(DEAD);
 	for (OctreeNode::element_iter i = mOctreeNode->getDataBegin(); i != mOctreeNode->getDataEnd(); ++i)
 	{
 		LLViewerOctreeEntry* obj = *i;
 		if (obj && obj->getGroup() == this)
 		{
 			obj->nullGroup();
-			//obj->setGroup(NULL);
 		}
 	}
 	mOctreeNode = NULL;
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1b4c8f65a6..1620b1ff4c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2466,8 +2466,11 @@ void LLPipeline::doOcclusion(LLCamera& camera)
 		for (LLCullResult::sg_iterator iter = sCull->beginOcclusionGroups(); iter != sCull->endOcclusionGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
-			group->doOcclusion(&camera);
-			group->clearOcclusionState(LLSpatialGroup::ACTIVE_OCCLUSION);
+            if (!group->isDead())
+            {
+                group->doOcclusion(&camera);
+                group->clearOcclusionState(LLSpatialGroup::ACTIVE_OCCLUSION);
+            }
 		}
 	
 		//apply occlusion culling to object cache tree
@@ -2912,6 +2915,10 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	for (LLCullResult::sg_iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
 	{
 		LLSpatialGroup* group = *iter;
+        if (group->isDead())
+        {
+            continue;
+        }
 		group->checkOcclusion();
 		if (sUseOcclusion > 1 && group->isOcclusionState(LLSpatialGroup::OCCLUDED))
 		{
@@ -2971,6 +2978,10 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	for (LLCullResult::sg_iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
 	{
 		LLSpatialGroup* group = *iter;
+        if (group->isDead())
+        {
+            continue;
+        }
 		group->checkOcclusion();
 		if (sUseOcclusion > 1 && group->isOcclusionState(LLSpatialGroup::OCCLUDED))
 		{
@@ -3130,7 +3141,12 @@ void forAllDrawables(LLCullResult::sg_iterator begin,
 {
 	for (LLCullResult::sg_iterator i = begin; i != end; ++i)
 	{
-		for (LLSpatialGroup::element_iter j = (*i)->getDataBegin(); j != (*i)->getDataEnd(); ++j)
+        LLSpatialGroup* group = *i;
+        if (group->isDead())
+        {
+            continue;
+        }
+		for (LLSpatialGroup::element_iter j = group->getDataBegin(); j != group->getDataEnd(); ++j)
 		{
 			if((*j)->hasDrawable())
 			{
@@ -3339,6 +3355,10 @@ void LLPipeline::postSort(LLCamera &camera)
         for (LLCullResult::sg_iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i)
         {
             LLSpatialGroup *group = *i;
+            if (group->isDead())
+            {
+                continue;
+            }
             if (!sUseOcclusion || !group->isOcclusionState(LLSpatialGroup::OCCLUDED))
             {
                 group->rebuildGeom();
@@ -3357,6 +3377,12 @@ void LLPipeline::postSort(LLCamera &camera)
     for (LLCullResult::sg_iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
     {
         LLSpatialGroup *group = *i;
+
+        if (group->isDead())
+        {
+            continue;
+        }
+
         if ((sUseOcclusion && group->isOcclusionState(LLSpatialGroup::OCCLUDED)) ||
             (RenderAutoHideSurfaceAreaLimit > 0.f &&
              group->mSurfaceArea > RenderAutoHideSurfaceAreaLimit * llmax(group->mObjectBoxSize, 10.f)))
-- 
cgit v1.2.3


From 119b02937ed42502549ba3dab2db48c6edef9425 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Jul 2023 23:20:17 +0300
Subject: SL-19958 An inventory material without asset should default to a
 blank material #2

---
 indra/newview/lltexturectrl.cpp | 18 +++++++++++++-----
 indra/newview/lltexturectrl.h   |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 0dd1ff5483..b3310a1f9a 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -232,12 +232,20 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selecti
 				mInventoryPanel->setSelection(item_id, TAKE_FOCUS_NO);
 			}
 		}
-		
-
-		
 	}
 }
 
+void LLFloaterTexturePicker::setImageIDFromItem(const LLInventoryItem* itemp, bool set_selection)
+{
+    LLUUID asset_id = itemp->getAssetUUID();
+    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL && asset_id.isNull())
+    {
+        // If an inventory item has a null asset, consider it a valid blank material(gltf)
+        asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+    }
+    setImageID(asset_id, set_selection);
+}
+
 void LLFloaterTexturePicker::setActive( BOOL active )					
 {
 	if (!active && getChild<LLUICtrl>("Pipette")->getValue().asBoolean())
@@ -388,7 +396,7 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
 		{
 			if (drop)
 			{
-				setImageID( item->getAssetUUID() );
+                setImageIDFromItem(item);
 				commitIfImmediateSet();
 			}
 
@@ -860,7 +868,7 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem
 			{
 				mNoCopyTextureSelected = TRUE;
 			}
-			setImageID(itemp->getAssetUUID(),false);
+            setImageIDFromItem(itemp, false);
 			mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
 
 			if(!mPreviewSettingChanged)
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index c66e618782..ba310dd9a6 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -357,6 +357,7 @@ public:
 protected:
     void refreshLocalList();
     void refreshInventoryFilter();
+    void setImageIDFromItem(const LLInventoryItem* itemp, bool set_selection = true);
 
 	LLPointer<LLViewerTexture> mTexturep;
     LLPointer<LLFetchedGLTFMaterial> mGLTFMaterial;
-- 
cgit v1.2.3


From 5e344813dc9bb4e5ecb8187642f97377c157955f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Jul 2023 23:06:26 +0300
Subject: SL-18396 PBR and blinn phong should not be allowed to be edited
 together

---
 indra/newview/llpanelface.cpp  | 39 ++++++++++++++++++++++++++++-----------
 indra/newview/llpanelface.h    |  4 ++--
 indra/newview/llviewermenu.cpp | 14 ++++++++++++--
 3 files changed, 42 insertions(+), 15 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index ff21438085..83a330af37 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1000,7 +1000,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced();
 
         bool has_pbr_material;
-        updateUIGLTF(objectp, has_pbr_material, force_set_values);
+        bool has_faces_without_pbr;
+        updateUIGLTF(objectp, has_pbr_material, has_faces_without_pbr, force_set_values);
 
         const bool has_material = !has_pbr_material;
 
@@ -1536,7 +1537,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 			getChild<LLUICtrl>("checkbox fullbright")->setValue((S32)(fullbright_flag != 0));
 			getChildView("checkbox fullbright")->setEnabled(editable && !has_pbr_material);
 			getChild<LLUICtrl>("checkbox fullbright")->setTentative(!identical_fullbright);
-            getChild<LLComboBox>("combobox matmedia")->setEnabledByValue("Materials", !has_pbr_material);
+            mComboMatMedia->setEnabledByValue("Materials", !has_pbr_material);
 		}
 		
 		// Repeats per meter
@@ -1800,7 +1801,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 	}
 }
 
-void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool force_set_values)
+void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values)
 {
     has_pbr_material = false;
 
@@ -1813,9 +1814,7 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
     {
         LLUUID pbr_id;
         bool identical_pbr;
-        LLSelectedTE::getPbrMaterialId(pbr_id, identical_pbr);
-
-        has_pbr_material = pbr_id.notNull();
+        LLSelectedTE::getPbrMaterialId(pbr_id, identical_pbr, has_pbr_material, has_faces_without_pbr);
 
         pbr_ctrl->setTentative(identical_pbr ? FALSE : TRUE);
         pbr_ctrl->setEnabled(editable && has_pbr_capabilities);
@@ -1823,13 +1822,13 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
     }
 
     getChildView("pbr_from_inventory")->setEnabled(editable && has_pbr_capabilities);
-    getChildView("edit_selected_pbr")->setEnabled(editable && has_pbr_material && has_pbr_capabilities);
-    getChildView("save_selected_pbr")->setEnabled(objectp->permCopy() && has_pbr_material && has_pbr_capabilities);
+    getChildView("edit_selected_pbr")->setEnabled(editable && has_pbr_material && !has_faces_without_pbr && has_pbr_capabilities);
+    getChildView("save_selected_pbr")->setEnabled(objectp->permCopy() && has_pbr_material && !has_faces_without_pbr && has_pbr_capabilities);
 
     const bool show_pbr = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR && mComboMatMedia->getEnabled();
     if (show_pbr)
     {
-        const bool new_state = has_pbr_capabilities && has_pbr_material;
+        const bool new_state = has_pbr_capabilities && has_pbr_material && !has_faces_without_pbr;
 
         LLUICtrl* gltfCtrlTextureScaleU = getChild<LLUICtrl>("gltfTextureScaleU");
         LLUICtrl* gltfCtrlTextureScaleV = getChild<LLUICtrl>("gltfTextureScaleV");
@@ -5057,16 +5056,34 @@ void LLPanelFace::LLSelectedTE::getTexId(LLUUID& id, bool& identical)
 	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, id );
 }
 
-void LLPanelFace::LLSelectedTE::getPbrMaterialId(LLUUID& id, bool& identical)
+void LLPanelFace::LLSelectedTE::getPbrMaterialId(LLUUID& id, bool& identical, bool& has_faces_with_pbr, bool& has_faces_without_pbr)
 {
     struct LLSelectedTEGetmatId : public LLSelectedTEGetFunctor<LLUUID>
     {
+        LLSelectedTEGetmatId()
+            : mHasFacesWithoutPBR(false)
+            , mHasFacesWithPBR(false)
+        {
+        }
         LLUUID get(LLViewerObject* object, S32 te_index)
         {
-            return object->getRenderMaterialID(te_index);
+            LLUUID pbr_id = object->getRenderMaterialID(te_index);
+            if (pbr_id.isNull())
+            {
+                mHasFacesWithoutPBR = true;
+            }
+            else
+            {
+                mHasFacesWithPBR = true;
+            }
+            return pbr_id;
         }
+        bool mHasFacesWithoutPBR;
+        bool mHasFacesWithPBR;
     } func;
     identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&func, id);
+    has_faces_with_pbr = func.mHasFacesWithPBR;
+    has_faces_without_pbr = func.mHasFacesWithoutPBR;
 }
 
 void LLPanelFace::LLSelectedTEMaterial::getCurrent(LLMaterialPtr& material_ptr, bool& identical_material)
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 4dfef5d9bc..7d567c7ce8 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -452,7 +452,7 @@ private:
     void onTextureSelectionChanged(LLInventoryItem* itemp);
     void onPbrSelectionChanged(LLInventoryItem* itemp);
 
-    void updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool force_set_values);
+    void updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values);
     void updateVisibilityGLTF();
 
     void updateSelectedGLTFMaterials(std::function<void(LLGLTFMaterial*)> func);
@@ -595,7 +595,7 @@ public:
 		static void getFace(class LLFace*& face_to_return, bool& identical_face);
 		static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face);
 		static void getTexId(LLUUID& id, bool& identical);
-        static void getPbrMaterialId(LLUUID& id, bool& identical);
+        static void getPbrMaterialId(LLUUID& id, bool& identical, bool& has_pbr, bool& has_faces_without_pbr);
 		static void getObjectScaleS(F32& scale_s, bool& identical);
 		static void getObjectScaleT(F32& scale_t, bool& identical);
 		static void getMaxDiffuseRepeats(F32& repeats, bool& identical);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 6e5c268c00..ae04d536f1 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2800,7 +2800,12 @@ bool enable_object_inspect()
 
 struct LLSelectedTEGetmatIdAndPermissions : public LLSelectedTEFunctor
 {
-    LLSelectedTEGetmatIdAndPermissions() : mCanCopy(true), mCanModify(true), mCanTransfer(true) {}
+    LLSelectedTEGetmatIdAndPermissions()
+        : mCanCopy(true)
+        , mCanModify(true)
+        , mCanTransfer(true)
+        , mHasNonPbrFaces(false)
+    {}
     bool apply(LLViewerObject* objectp, S32 te_index)
     {
         mCanCopy &= (bool)objectp->permCopy();
@@ -2811,11 +2816,16 @@ struct LLSelectedTEGetmatIdAndPermissions : public LLSelectedTEFunctor
         {
             mMaterialId = mat_id;
         }
+        else
+        {
+            mHasNonPbrFaces = true;
+        }
         return true;
     }
     bool mCanCopy;
     bool mCanModify;
     bool mCanTransfer;
+    bool mHasNonPbrFaces;
     LLUUID mMaterialId;
 };
 
@@ -2828,7 +2838,7 @@ bool enable_object_edit_gltf_material()
 
     LLSelectedTEGetmatIdAndPermissions func;
     LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
-    return func.mCanModify && func.mMaterialId.notNull();
+    return func.mCanModify && !func.mHasNonPbrFaces;
 }
 
 bool enable_object_open()
-- 
cgit v1.2.3


From 5a706086fefa6058389dc35707fc6b0c8ccece2d Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 21 Jul 2023 17:32:08 -0700
Subject: SL-20053: Fix sometimes unable to unset a PBR material on a prim.

Caused by inventory item asset IDs being null. Seems suspicious. But working around it for now seems best.
---
 indra/newview/lltexturectrl.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index b3310a1f9a..c13376d0a6 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -693,6 +693,11 @@ void LLFloaterTexturePicker::draw()
 
 const LLUUID& LLFloaterTexturePicker::findItemID(const LLUUID& asset_id, BOOL copyable_only, BOOL ignore_library)
 {
+	if (asset_id.isNull())
+	{
+		return LLUUID::null;
+	}
+
 	LLViewerInventoryCategory::cat_array_t cats;
 	LLViewerInventoryItem::item_array_t items;
 	LLAssetIDMatches asset_id_matches(asset_id);
-- 
cgit v1.2.3


From ff4477397b443fae59a4d7b98b2b894eb1dc77e0 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 28 Jul 2023 10:30:33 -0500
Subject: DRTVWR-559 Stop some light leak on spot shadows.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fca3f7e72a..acca415b60 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9637,7 +9637,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>-0.001</real>
+    <real>-0.0002</real>
   </map>
   <key>RenderSpotShadowOffset</key>
   <map>
-- 
cgit v1.2.3


From 9be08fc56bd6079fd58d43ceb5d6a7bb5e45b42c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 28 Jul 2023 10:31:31 -0500
Subject: SL-20037 Don't pop up the material editor implicitly.

---
 indra/newview/llviewermessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b756d3d87f..539951b939 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1532,7 +1532,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
 						LLFloaterReg::showInstance("preview_sound", LLSD(obj_id), take_focus);
 						break;
                     case LLAssetType::AT_MATERIAL:
-                        LLFloaterReg::showInstance("material_editor", LLSD(obj_id), take_focus);
+                        // Explicitly do nothing -- we don't want to open the material editor every time you add a material to inventory
                         break;
 					default:
 						LL_DEBUGS("Messaging") << "No preview method for previewable asset type : " << LLAssetType::lookupHumanReadable(asset_type)  << LL_ENDL;
-- 
cgit v1.2.3


From 7a4b8edf9c02818651efad7b277bbb08d18e22f5 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 28 Jul 2023 18:10:40 -0500
Subject: SL-20067 Make new default midday the new default sky setting

---
 indra/llinventory/llsettingssky.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 8338245897..3f4b15b8b1 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -133,7 +133,7 @@ const std::string LLSettingsSky::SETTING_SKY_ICE_LEVEL("ice_level");
 
 const std::string LLSettingsSky::SETTING_REFLECTION_PROBE_AMBIANCE("reflection_probe_ambiance");
 
-const LLUUID LLSettingsSky::DEFAULT_ASSET_ID("3ae23978-ac82-bcf3-a9cb-ba6e52dcb9ad");
+const LLUUID LLSettingsSky::DEFAULT_ASSET_ID("651510b8-5f4d-8991-1592-e7eeab2a5a06");
 
 static const LLUUID DEFAULT_SUN_ID("32bfbcea-24b1-fb9d-1ef9-48a28a63730f"); // dataserver
 static const LLUUID DEFAULT_MOON_ID("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver
-- 
cgit v1.2.3


From ec1d1f43540bac02e6cd2e814ee14da0cd33a67c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 28 Jul 2023 19:15:28 -0500
Subject: SL-20094 Add "Select Reflection Probes" checkbox

---
 indra/newview/app_settings/settings.xml            | 11 +++++++++++
 indra/newview/llspatialpartition.cpp               |  4 +++-
 indra/newview/lltoolcomp.cpp                       |  3 ++-
 indra/newview/lltoolselect.cpp                     |  4 +++-
 indra/newview/llviewermenu.cpp                     | 13 +++++++++++++
 indra/newview/llviewerwindow.cpp                   |  5 +++--
 indra/newview/llviewerwindow.h                     |  5 +++--
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 +++++++++
 8 files changed, 47 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index acca415b60..0cd63d9d5f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11520,6 +11520,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+  <key>SelectReflectionProbes</key>
+    <map>
+      <key>Comment</key>
+      <string>Select reflection probes</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>SelectOwnedOnly</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 32c891dbb6..79711794db 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -3624,7 +3624,9 @@ public:
 					}
 				}
 
-				if (!skip_check && vobj->lineSegmentIntersect(mStart, mEnd, -1, mPickTransparent, mPickRigged, mPickUnselectable, mFaceHit, &intersection, mTexCoord, mNormal, mTangent))
+				if (!skip_check && vobj->lineSegmentIntersect(mStart, mEnd, -1, 
+                    (mPickReflectionProbe && vobj->isReflectionProbe()) ? TRUE : mPickTransparent, // always pick transparent when picking selection probe
+                    mPickRigged, mPickUnselectable, mFaceHit, &intersection, mTexCoord, mNormal, mTangent))
 				{
 					mEnd = intersection;  // shorten ray so we only find CLOSER hits
 					if (mIntersection)
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index b8357b3454..aaf2bacc7b 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -268,7 +268,8 @@ BOOL LLToolCompTranslate::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	mMouseDown = TRUE;
-	gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ FALSE, LLFloaterReg::instanceVisible("build"));
+    gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ FALSE, LLFloaterReg::instanceVisible("build"), FALSE,
+        gSavedSettings.getBOOL("SelectReflectionProbes"));;
 	return TRUE;
 }
 
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp
index c6f3905ddc..f7455c6cb8 100644
--- a/indra/newview/lltoolselect.cpp
+++ b/indra/newview/lltoolselect.cpp
@@ -66,7 +66,9 @@ BOOL LLToolSelect::handleMouseDown(S32 x, S32 y, MASK mask)
 	// do immediate pick query
     BOOL pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick");
     BOOL pick_transparent = gSavedSettings.getBOOL("SelectInvisibleObjects");
-	mPick = gViewerWindow->pickImmediate(x, y, pick_transparent, pick_rigged);
+    BOOL pick_reflection_probe = gSavedSettings.getBOOL("SelectReflectionProbes");
+
+	mPick = gViewerWindow->pickImmediate(x, y, pick_transparent, pick_rigged, FALSE, TRUE, pick_reflection_probe);
 
 	// Pass mousedown to agent
 	LLTool::handleMouseDown(x, y, mask);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ae04d536f1..f84c6fbc3e 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8128,6 +8128,18 @@ class LLToolsSelectInvisibleObjects : public view_listener_t
     }
 };
 
+class LLToolsSelectReflectionProbes: public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        BOOL cur_val = gSavedSettings.getBOOL("SelectReflectionProbes");
+
+        gSavedSettings.setBOOL("SelectReflectionProbes", !cur_val);
+
+        return true;
+    }
+};
+
 class LLToolsSelectBySurrounding : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -9365,6 +9377,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
 	view_listener_t::addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
     view_listener_t::addMenu(new LLToolsSelectInvisibleObjects(), "Tools.SelectInvisibleObjects");
+    view_listener_t::addMenu(new LLToolsSelectReflectionProbes(), "Tools.SelectReflectionProbes");
 	view_listener_t::addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
 	view_listener_t::addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
 	view_listener_t::addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 71fe893091..ba2b6e1c7c 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4219,7 +4219,8 @@ void LLViewerWindow::pickAsync( S32 x,
 								void (*callback)(const LLPickInfo& info),
 								BOOL pick_transparent,
 								BOOL pick_rigged,
-								BOOL pick_unselectable)
+								BOOL pick_unselectable,
+                                BOOL pick_reflection_probes)
 {
 	// "Show Debug Alpha" means no object actually transparent
     BOOL in_build_mode = LLFloaterReg::instanceVisible("build");
@@ -4229,7 +4230,7 @@ void LLViewerWindow::pickAsync( S32 x,
         pick_transparent = TRUE;
     }
 
-	LLPickInfo pick_info(LLCoordGL(x, y_from_bot), mask, pick_transparent, pick_rigged, FALSE, TRUE, pick_unselectable, TRUE, callback);
+	LLPickInfo pick_info(LLCoordGL(x, y_from_bot), mask, pick_transparent, pick_rigged, FALSE, pick_reflection_probes, pick_unselectable, TRUE, callback);
 	schedulePick(pick_info);
 }
 
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 943cdf2fc4..6e8a5b2f4e 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -408,8 +408,9 @@ public:
 								void (*callback)(const LLPickInfo& pick_info),
 								BOOL pick_transparent = FALSE,
 								BOOL pick_rigged = FALSE,
-								BOOL pick_unselectable = FALSE);
-	LLPickInfo		pickImmediate(S32 x, S32 y, BOOL pick_transparent, BOOL pick_rigged = FALSE, BOOL pick_particle = FALSE, BOOL pick_unselectable = TRUE, BOOL pick_reflection_probe = TRUE);
+								BOOL pick_unselectable = FALSE,
+                                BOOL pick_reflection_probes = FALSE);
+	LLPickInfo		pickImmediate(S32 x, S32 y, BOOL pick_transparent, BOOL pick_rigged = FALSE, BOOL pick_particle = FALSE, BOOL pick_unselectable = TRUE, BOOL pick_reflection_probe = FALSE);
 	LLHUDIcon* cursorIntersectIcon(S32 mouse_x, S32 mouse_y, F32 depth,
 										   LLVector4a* intersection);
 
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7a29d68a4c..bb19ae2b98 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1445,6 +1445,15 @@ function="World.EnvPreset"
                     <menu_item_check.on_click
                      function="Tools.SelectInvisibleObjects"
                      parameter="invisible" />
+            </menu_item_check>
+            <menu_item_check
+                 label="Select Reflection Probes"
+                 name="Select Reflection Probes">
+                    <menu_item_check.on_check
+                     control="SelectReflectionProbes" />
+                    <menu_item_check.on_click
+                     function="Tools.SelectReflectionProbes"
+                     parameter="reflection_probes" />
             </menu_item_check>
                 <menu_item_check
                  label="Select By Surrounding"
-- 
cgit v1.2.3


From cc69541358e294943d0e4f88034644af1a346ac7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 31 Jul 2023 23:29:24 +0300
Subject: SL-20096 Thumbnails shouldn't be editable for items in the library

---
 indra/newview/llsidepaneliteminfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 48e610a135..6fc9c8c6b5 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -446,7 +446,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	}
 
     // Not yet supported for task inventories
-    mChangeThumbnailBtn->setEnabled(mObjectID.isNull());
+    mChangeThumbnailBtn->setEnabled(mObjectID.isNull() && ALEXANDRIA_LINDEN_ID != perm.getOwner());
 	
 	////////////
 	// ORIGIN //
-- 
cgit v1.2.3


From 2f035e45500788d069ba2551df3b0f0ac8da55d7 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Mon, 31 Jul 2023 16:36:53 -0700
Subject: DRTVWR-559 remove extra debug logging of Capabilities tag

---
 indra/newview/app_settings/logcontrol.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 2a26cb9a43..482012cdd6 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -73,7 +73,6 @@
 						     <string>Avatar</string>
 						     <string>Voice</string>		
 						-->
-              <string>Capabilities</string>
 						</array>
 				</map>
       </array>
-- 
cgit v1.2.3


From 87c337047dbfcdf11a04b2395b0165db24238823 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 1 Aug 2023 18:31:29 +0300
Subject: SL-20100 remove inappropriate param to get rid of parse warning

---
 indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index ec2961b0f3..726cb38481 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -54,7 +54,6 @@
   <text
     name="item_name"
     font="SansSerif"
-    max_length_bytes="127"
     use_ellipses="true"
     follows="left|top|right"
     layout="topleft"
-- 
cgit v1.2.3


From 5048b3878c027859dcc9005dff550f0afc38f623 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 1 Aug 2023 22:31:46 +0300
Subject: SL-20101 Fix ThumbnailDimentionsLimit poping up on success

---
 indra/newview/llfloaterchangeitemthumbnail.cpp | 34 ++++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index d7fbf1384b..692ef3b163 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -546,12 +546,21 @@ struct ImageLoadedData
     LLUUID mThumbnailId;
     LLUUID mObjectId;
     LLHandle<LLFloater> mFloaterHandle;
+    bool mSilent;
 };
 
 void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id, bool silent)
 {
     LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::getFetchedTexture(asset_id);
-    if (texturep->getFullWidth() == 0 && !texturep->isFullyLoaded() && !texturep->isMissingAsset())
+    if (texturep->isMissingAsset())
+    {
+        LL_WARNS() << "Attempted to assign missing asset " << asset_id << LL_ENDL;
+        if (!silent)
+        {
+            LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+        }
+    }
+    else if (texturep->getFullWidth() == 0)
     {
         if (silent)
         {
@@ -566,9 +575,10 @@ void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id
         data->mObjectId = mItemId;
         data->mThumbnailId = asset_id;
         data->mFloaterHandle = getHandle();
+        data->mSilent = silent;
 
         texturep->setLoadedCallback(onImageLoaded,
-            MAX_DISCARD_LEVEL, // don't actually need max one, 3 or 4 should be enough
+            MAX_DISCARD_LEVEL, // Don't need full image, just size data
             FALSE,
             FALSE,
             (void*)data,
@@ -648,16 +658,20 @@ void LLFloaterChangeItemThumbnail::onImageLoaded(
         {
             setThumbnailId(data->mThumbnailId, data->mObjectId);
         }
+        else if (!data->mSilent)
+        {
+            // Should this only appear if floater is alive?
+            LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+        }
+    }
 
-        // Update floater
-        if (!data->mFloaterHandle.isDead())
+    // Update floater
+    if (!data->mSilent && !data->mFloaterHandle.isDead())
+    {
+        LLFloaterChangeItemThumbnail* self = static_cast<LLFloaterChangeItemThumbnail*>(data->mFloaterHandle.get());
+        if (self && self->mExpectingAssetId == data->mThumbnailId)
         {
-            LLFloaterChangeItemThumbnail* self = static_cast<LLFloaterChangeItemThumbnail*>(data->mFloaterHandle.get());
-            if (self && self->mExpectingAssetId == data->mThumbnailId)
-            {
-                LLNotificationsUtil::add("ThumbnailDimentionsLimit");
-                self->mExpectingAssetId = LLUUID::null;
-            }
+            self->mExpectingAssetId = LLUUID::null;
         }
     }
 
-- 
cgit v1.2.3


From 05b5540fe70067180be6bb664752742b31a49eb7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 1 Aug 2023 23:53:57 +0300
Subject: SL-20107 Detaching items from COF in gallery view didn't update COF

---
 indra/newview/llaisapi.cpp           | 30 +++++++++++++++++++++---------
 indra/newview/llinventorygallery.cpp |  3 +++
 2 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index f3799361db..f26549cc3d 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -1321,6 +1321,7 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
 
     if (curr_cat
         && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN
+        && curr_cat->getDescendentCount() != LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN
         && version > LLViewerInventoryCategory::VERSION_UNKNOWN
         && version < curr_cat->getVersion())
     {
@@ -1429,15 +1430,26 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
 
 void AISUpdate::parseDescendentCount(const LLUUID& category_id, const LLSD& embedded)
 {
-	// We can only determine true descendent count if this contains all descendent types.
-	if (embedded.has("categories") &&
-		embedded.has("links") &&
-		embedded.has("items"))
-	{
-		mCatDescendentsKnown[category_id]  = embedded["categories"].size();
-		mCatDescendentsKnown[category_id] += embedded["links"].size();
-		mCatDescendentsKnown[category_id] += embedded["items"].size();
-	}
+    if (mType == AISAPI::FETCHCOF)
+    {
+        // contains only links
+        if (embedded.has("links"))
+        {
+            mCatDescendentsKnown[category_id] = embedded["links"].size();
+        }
+    }
+    else
+    {
+        // We can only determine true descendent count if this contains all descendent types.
+        if (embedded.has("categories") &&
+            embedded.has("links") &&
+            embedded.has("items"))
+        {
+            mCatDescendentsKnown[category_id] = embedded["categories"].size();
+            mCatDescendentsKnown[category_id] += embedded["links"].size();
+            mCatDescendentsKnown[category_id] += embedded["items"].size();
+        }
+    }
 }
 
 void AISUpdate::parseEmbedded(const LLSD& embedded, S32 depth)
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 87dba5f100..0801b71e34 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2376,6 +2376,9 @@ void LLInventoryGalleryItem::setSelected(bool value)
 
 BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+    // call changeItemSelection directly, before setFocus
+    // to avoid autoscroll from LLInventoryGallery::onFocusReceived()
+    mGallery->changeItemSelection(mUUID, false);
     setFocus(TRUE);
     mGallery->claimEditHandler();
 
-- 
cgit v1.2.3


From c4c5778b263a1f9036ba6c6c18f96d1311988fcb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 2 Aug 2023 18:00:02 +0300
Subject: SL-20098 handleDoubleClick crashes in new inventory panels

---
 indra/llui/llfolderviewitem.cpp      | 22 ++++++++++++++++++++--
 indra/newview/llinventorygallery.cpp | 14 +++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 0093f4c17c..38a1a9a1ab 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -32,6 +32,7 @@
 #include "llfolderview.h"
 #include "llfolderviewmodel.h"
 #include "llpanel.h"
+#include "llcallbacklist.h"
 #include "llcriticaldamp.h"
 #include "llclipboard.h"
 #include "llfocusmgr.h"		// gFocusMgr
@@ -1844,7 +1845,12 @@ void LLFolderViewFolder::setOpen(BOOL openitem)
 {
     if(mSingleFolderMode)
     {
-        getViewModelItem()->navigateToFolder();
+        // navigateToFolder can destroy this view
+        // delay it in case setOpen was called from click or key processing
+        doOnIdleOneTime([this]()
+                        {
+                            getViewModelItem()->navigateToFolder();
+                        });
     }
     else
     {
@@ -2074,7 +2080,19 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
     if(mSingleFolderMode)
     {
         static LLUICachedControl<bool> double_click_new_window("SingleModeDoubleClickOpenWindow", false);
-        getViewModelItem()->navigateToFolder(double_click_new_window);
+        if (double_click_new_window)
+        {
+            getViewModelItem()->navigateToFolder(true);
+        }
+        else
+        {
+            // navigating is going to destroy views and change children
+            // delay it untill handleDoubleClick processing is complete
+            doOnIdleOneTime([this]()
+                            {
+                                getViewModelItem()->navigateToFolder(false);
+                            });
+        }
         return TRUE;
     }
 
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 0801b71e34..eb603f0ac3 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2449,7 +2449,19 @@ BOOL LLInventoryGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
     if (mIsFolder && mGallery)
     {
-        mGallery->setRootFolder(mUUID);
+        // setRootFolder can destroy this item.
+        // Delay it until handleDoubleClick processing is complete
+        // or make gallery handle doubleclicks.
+        LLHandle<LLPanel> handle = mGallery->getHandle();
+        LLUUID navigate_to = mUUID;
+        doOnIdleOneTime([handle, navigate_to]()
+                        {
+                            LLInventoryGallery* gallery = (LLInventoryGallery*)handle.get();
+                            if (gallery)
+                            {
+                                gallery->setRootFolder(navigate_to);
+                            }
+                        });
     }
     else
     {
-- 
cgit v1.2.3


From 4705515e785b56165f1b936d4e2baec6a2836b6c Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 3 Aug 2023 20:29:30 +0300
Subject: SL-19303 switch automatically between Materials/PBR/Media based on
 current values

---
 indra/newview/llpanelface.cpp | 70 ++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 24 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 83a330af37..b5ed4f50af 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1022,6 +1022,52 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
             }
         }
 
+        // *NOTE: The "identical" variable is currently only used to decide if
+        // the texgen control should be tentative - this is not used by GLTF
+        // materials. -Cosmic;2022-11-09
+        bool identical         = true;  // true because it is anded below
+        bool identical_diffuse = false;
+        bool identical_norm    = false;
+        bool identical_spec    = false;
+
+        LLTextureCtrl *texture_ctrl      = getChild<LLTextureCtrl>("texture control");
+        LLTextureCtrl *shinytexture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
+        LLTextureCtrl *bumpytexture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
+
+        LLUUID id;
+        LLUUID normmap_id;
+        LLUUID specmap_id;
+
+        LLSelectedTE::getTexId(id, identical_diffuse);
+        LLSelectedTEMaterial::getNormalID(normmap_id, identical_norm);
+        LLSelectedTEMaterial::getSpecularID(specmap_id, identical_spec);
+
+        static S32 selected_te = -1;
+        if ((LLToolFace::getInstance() == LLToolMgr::getInstance()->getCurrentTool()) && 
+            !LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected()) 
+        {
+            S32 new_selection = LLSelectMgr::getInstance()->getSelection()->getFirstNode()->getLastSelectedTE();
+            if (new_selection != selected_te)
+            {
+                bool te_has_media = objectp->getTE(new_selection) && objectp->getTE(new_selection)->hasMedia();
+                bool te_has_pbr = objectp->getRenderMaterialID(new_selection).notNull();
+
+                if (te_has_pbr && !((mComboMatMedia->getCurrentIndex() == MATMEDIA_MEDIA) && te_has_media))
+                {
+                    mComboMatMedia->selectNthItem(MATMEDIA_PBR);
+                }
+                else if (te_has_media) 
+                {
+                    mComboMatMedia->selectNthItem(MATMEDIA_MEDIA);
+                }
+                else if (id.notNull() || normmap_id.notNull() || specmap_id.notNull()) 
+                {
+                    mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL);
+                }
+                selected_te = new_selection;
+            }
+        }
+
         mComboMatMedia->setEnabled(editable);
 
         LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
@@ -1045,22 +1091,6 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
 		updateVisibility();
 
-        // *NOTE: The "identical" variable is currently only used to decide if
-        // the texgen control should be tentative - this is not used by GLTF
-        // materials. -Cosmic;2022-11-09
-		bool identical			= true;	// true because it is anded below
-        bool identical_diffuse	= false;
-        bool identical_norm		= false;
-        bool identical_spec		= false;
-
-		LLTextureCtrl*	texture_ctrl = getChild<LLTextureCtrl>("texture control");
-		LLTextureCtrl*	shinytexture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
-		LLTextureCtrl*	bumpytexture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
-		
-		LLUUID id;
-		LLUUID normmap_id;
-		LLUUID specmap_id;
-		
 		// Color swatch
 		{
 			getChildView("color label")->setEnabled(editable);
@@ -1090,9 +1120,6 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		getChild<LLUICtrl>("ColorTrans")->setValue(editable ? transparency : 0);
 		getChildView("ColorTrans")->setEnabled(editable && has_material);
 
-		// Specular map
-		LLSelectedTEMaterial::getSpecularID(specmap_id, identical_spec);
-		
 		U8 shiny = 0;
 		bool identical_shiny = false;
 
@@ -1158,11 +1185,6 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
 		// Texture
 		{
-			LLSelectedTE::getTexId(id,identical_diffuse);
-
-			// Normal map
-			LLSelectedTEMaterial::getNormalID(normmap_id, identical_norm);
-
 			mIsAlpha = FALSE;
 			LLGLenum image_format = GL_RGB;
 			bool identical_image_format = false;
-- 
cgit v1.2.3


From 706448f549edd82620b8f0bd37ea75ff832fa615 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 4 Aug 2023 12:38:25 +0300
Subject: SL-20105 Add materials asset to 'Adjust Content Permissions' floater

---
 indra/newview/llfloaterbulkpermission.cpp                 |  5 +++++
 indra/newview/llfloaterbulkpermission.h                   |  2 ++
 indra/newview/skins/default/xui/en/floater_bulk_perms.xml | 14 ++++++++++++++
 3 files changed, 21 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index a3cc939f85..abc9cdbcc2 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -76,6 +76,8 @@ BOOL LLFloaterBulkPermission::postBuild()
 	mBulkChangeIncludeSounds = gSavedSettings.getBOOL("BulkChangeIncludeSounds");
 	mBulkChangeIncludeTextures = gSavedSettings.getBOOL("BulkChangeIncludeTextures");
 	mBulkChangeIncludeSettings = gSavedSettings.getBOOL("BulkChangeIncludeSettings");
+    mBulkChangeIncludeMaterials = gSavedSettings.getBOOL("BulkChangeIncludeMaterials");
+
 	mBulkChangeShareWithGroup = gSavedSettings.getBOOL("BulkChangeShareWithGroup");
 	mBulkChangeEveryoneCopy = gSavedSettings.getBOOL("BulkChangeEveryoneCopy");
 	mBulkChangeNextOwnerModify = gSavedSettings.getBOOL("BulkChangeNextOwnerModify");
@@ -188,6 +190,8 @@ void LLFloaterBulkPermission::onCloseBtn()
 	gSavedSettings.setBOOL("BulkChangeIncludeSounds", mBulkChangeIncludeSounds);
 	gSavedSettings.setBOOL("BulkChangeIncludeTextures", mBulkChangeIncludeTextures);
 	gSavedSettings.setBOOL("BulkChangeIncludeSettings", mBulkChangeIncludeSettings);
+    gSavedSettings.setBOOL("BulkChangeIncludeMaterials", mBulkChangeIncludeMaterials);
+
 	gSavedSettings.setBOOL("BulkChangeShareWithGroup", mBulkChangeShareWithGroup);
 	gSavedSettings.setBOOL("BulkChangeEveryoneCopy", mBulkChangeEveryoneCopy);
 	gSavedSettings.setBOOL("BulkChangeNextOwnerModify", mBulkChangeNextOwnerModify);
@@ -284,6 +288,7 @@ void LLFloaterBulkPermission::doCheckUncheckAll(BOOL check)
 	gSavedSettings.setBOOL("BulkChangeIncludeSounds"    , check);
 	gSavedSettings.setBOOL("BulkChangeIncludeTextures"  , check);
 	gSavedSettings.setBOOL("BulkChangeIncludeSettings"  , check);
+    gSavedSettings.setBOOL("BulkChangeIncludeMaterials"  , check);
 }
 
 
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index 1afc876bba..ab5d568667 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -103,6 +103,8 @@ private:
 	bool mBulkChangeIncludeSounds;
 	bool mBulkChangeIncludeTextures;
 	bool mBulkChangeIncludeSettings;
+    bool mBulkChangeIncludeMaterials;
+
 	bool mBulkChangeShareWithGroup;
 	bool mBulkChangeEveryoneCopy;
 	bool mBulkChangeNextOwnerModify;
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 431c33a339..7aa31bed71 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -170,6 +170,20 @@
     name="icon_setting"
     tool_tip="Environment settings"
     left_pad="2" />
+  <check_box
+    control_name="BulkChangeIncludeMaterials"
+    height="16"
+    name="check_materials"
+    top_pad="5"
+    left="245"
+    width="16" />
+  <icon
+    height="16"
+    image_name="Inv_Material"
+    mouse_opaque="true"
+    name="icon_materials"
+    tool_tip="Materials"
+    left_pad="2" />
     <button
       height="23"
     layout="topleft"
-- 
cgit v1.2.3


From dd699f84c92020868656a2ad8086a73372e5a19d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 5 Aug 2023 02:05:11 +0300
Subject: SL-20120 Do not account for deltas when fetching

Is supposed to set version and descendant info in parseCategory
---
 indra/newview/llaisapi.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index f26549cc3d..34c6a1e8ab 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -1210,7 +1210,6 @@ void AISUpdate::parseItem(const LLSD& item_map)
         if (mFetch)
         {
             mItemsCreated[item_id] = new_item;
-            mCatDescendentDeltas[new_item->getParentUUID()];
             new_item->setComplete(true);
 
             if (new_item->getParentUUID().isNull())
@@ -1264,7 +1263,6 @@ void AISUpdate::parseLink(const LLSD& link_map, S32 depth)
             new_link->setSaleInfo(default_sale_info);
             //LL_DEBUGS("Inventory") << "creating link from llsd: " << ll_pretty_print_sd(link_map) << LL_ENDL;
             mItemsCreated[item_id] = new_link;
-            mCatDescendentDeltas[parent_id];
             new_link->setComplete(true);
 
             if (new_link->getParentUUID().isNull())
@@ -1381,7 +1379,6 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
                 new_cat->setDescendentCount(descendent_count);
             }
             mCategoriesCreated[category_id] = new_cat;
-            mCatDescendentDeltas[new_cat->getParentUUID()];
         }
 		else if (curr_cat)
 		{
-- 
cgit v1.2.3


From 201cd961055d532d77e06f7d4c14fc082ef84a04 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 5 Aug 2023 17:28:43 +0300
Subject: SL-20120 Fix folders with unknown content being assigned a version

---
 indra/newview/llaisapi.cpp | 65 ++++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 25 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 34c6a1e8ab..07c6afc635 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -706,6 +706,10 @@ void AISAPI::FetchCOF(completion_t callback)
     LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
                                                          _1, getFn, url, LLUUID::null, LLSD(), callback, FETCHCOF));
 
+    LLSD body;
+    // Only cof folder will be full, but cof can contain an outfit
+    // link with embedded outfit folder for request to parse
+    body["depth"] = 0;
     EnqueueAISCommand("FetchCOF", proc);
 }
 
@@ -1359,17 +1363,6 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
 	{
         if (mFetch)
         {
-            // set version only if previous one was already known 
-            // or if we are sure this update has full data and embeded items (depth 0+)
-            // since bulk fetch uses this to decide what still needs fetching
-            if (version > LLViewerInventoryCategory::VERSION_UNKNOWN
-                && (depth >= 0 || (curr_cat && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN)))
-            {
-                // Set version/descendents for newly fetched categories.
-                LL_DEBUGS("Inventory") << "Setting version to " << version
-                    << " for category " << category_id << LL_ENDL;
-                new_cat->setVersion(version);
-            }
             uuid_int_map_t::const_iterator lookup_it = mCatDescendentsKnown.find(category_id);
             if (mCatDescendentsKnown.end() != lookup_it)
             {
@@ -1377,6 +1370,26 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
                 LL_DEBUGS("Inventory") << "Setting descendents count to " << descendent_count
                     << " for category " << category_id << LL_ENDL;
                 new_cat->setDescendentCount(descendent_count);
+
+                // set version only if we are sure this update has full data and embeded items
+                // since viewer uses version to decide if folder and content still need fetching
+                if (version > LLViewerInventoryCategory::VERSION_UNKNOWN
+                    && (depth >= 0 || (curr_cat && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN)))
+                {
+                    LL_DEBUGS("Inventory") << "Setting version to " << version
+                        << " for category " << category_id << LL_ENDL;
+                    new_cat->setVersion(version);
+                }
+            }
+            else if (curr_cat
+                     && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN
+                     && version > curr_cat->getVersion())
+            {
+                // Potentially should new_cat->setVersion(unknown) here,
+                // but might be waiting for a callback that would increment
+                LL_DEBUGS("Inventory") << "Category " << category_id
+                    << " is stale. Known version: " << curr_cat->getVersion()
+                    << " server version: " << version << LL_ENDL;
             }
             mCategoriesCreated[category_id] = new_cat;
         }
@@ -1393,20 +1406,22 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
 		else
 		{
 			// Set version/descendents for newly created categories.
-			if (category_map.has("version"))
-			{
-				S32 version = category_map["version"].asInteger();
-				LL_DEBUGS("Inventory") << "Setting version to " << version
-									   << " for new category " << category_id << LL_ENDL;
-				new_cat->setVersion(version);
-			}
-			uuid_int_map_t::const_iterator lookup_it = mCatDescendentsKnown.find(category_id);
-			if (mCatDescendentsKnown.end() != lookup_it)
-			{
-				S32 descendent_count = lookup_it->second;
-				LL_DEBUGS("Inventory") << "Setting descendents count to " << descendent_count 
-									   << " for new category " << category_id << LL_ENDL;
-				new_cat->setDescendentCount(descendent_count);
+            uuid_int_map_t::const_iterator lookup_it = mCatDescendentsKnown.find(category_id);
+            if (mCatDescendentsKnown.end() != lookup_it)
+            {
+                S32 descendent_count = lookup_it->second;
+                LL_DEBUGS("Inventory") << "Setting descendents count to " << descendent_count
+                    << " for new category " << category_id << LL_ENDL;
+                new_cat->setDescendentCount(descendent_count);
+
+                // Don't set version unles correct children count is present
+                if (category_map.has("version"))
+                {
+                    S32 version = category_map["version"].asInteger();
+                    LL_DEBUGS("Inventory") << "Setting version to " << version
+                        << " for new category " << category_id << LL_ENDL;
+                    new_cat->setVersion(version);
+                }
 			}
 			mCategoriesCreated[category_id] = new_cat;
 			mCatDescendentDeltas[new_cat->getParentUUID()]++;
-- 
cgit v1.2.3


From 6b5345eabd75e62b99333c51877b02e5a54f66d2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 5 Aug 2023 17:36:38 +0300
Subject: SL-20120 Fix unneeded warnings

- Don't Warn about unknown cof version, it's expected during fetch, Info is enough
- Fix 'unexpected attachments' due to unknown cof, also should fix viewer trying to create a link before cof is ready
- Fix 'accounting' warnings when getting item updates for unfetched folders (Note: viewer doesn't know folders version, if fetch is already in progress we might get an old version)
---
 indra/newview/llappearancemgr.cpp  |  2 +-
 indra/newview/llattachmentsmgr.cpp |  6 ++++++
 indra/newview/llinventorymodel.cpp | 43 ++++++++++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index d4fc6a9f9d..6251737699 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3821,7 +3821,7 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAd
 
         if (cofVersion == LLViewerInventoryCategory::VERSION_UNKNOWN)
         {
-            LL_WARNS("AVatar") << "COF version is unknown... not requesting until COF version is known." << LL_ENDL;
+            LL_INFOS("AVatar") << "COF version is unknown... not requesting until COF version is known." << LL_ENDL;
             return;
         }
         else
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index d43048a8b6..926cab403e 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -239,6 +239,12 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
             return;
         }
 
+        if (LLAppearanceMgr::instance().getCOFVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+        {
+            // Wait for cof to load
+            return;
+        }
+
         LL_DEBUGS("Avatar") << "ATT checking COF linkability for " << mRecentlyArrivedAttachments.size()
                             << " recently arrived items" << LL_ENDL;
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 586f1388ff..aa750a19b0 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3788,15 +3788,22 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 			LLViewerInventoryCategory* folderp = gInventory.getCategory(tfolder->getUUID());
 			if(folderp)
 			{
-				if(tfolder->getParentUUID() == folderp->getParentUUID())
-				{
-					update[tfolder->getParentUUID()];
-				}
-				else
-				{
-					++update[tfolder->getParentUUID()];
-					--update[folderp->getParentUUID()];
-				}
+                if (folderp->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN)
+                {
+                    if (tfolder->getParentUUID() == folderp->getParentUUID())
+                    {
+                        update[tfolder->getParentUUID()];
+                    }
+                    else
+                    {
+                        ++update[tfolder->getParentUUID()];
+                        --update[folderp->getParentUUID()];
+                    }
+                }
+                else
+                {
+                    folderp->fetch();
+                }
 			}
 			else
 			{
@@ -3806,7 +3813,14 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 				folderp = gInventory.getCategory(tfolder->getParentUUID());
 				if(folderp)
 				{
-					++update[tfolder->getParentUUID()];
+                    if (folderp->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN)
+                    {
+                        ++update[tfolder->getParentUUID()];
+                    }
+                    else
+                    {
+                        folderp->fetch();
+                    }
 				}
 			}
 		}
@@ -3852,7 +3866,14 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 				LLViewerInventoryCategory* folderp = gInventory.getCategory(titem->getParentUUID());
 				if(folderp)
 				{
-					++update[titem->getParentUUID()];
+                    if (folderp->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN)
+                    {
+                        ++update[titem->getParentUUID()];
+                    }
+                    else
+                    {
+                        folderp->fetch();
+                    }
 				}
 			}
 		}
-- 
cgit v1.2.3


From cd8fcec5fefd607957ef2560fbe92241795c091b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 6 Aug 2023 15:22:38 +0300
Subject: SL-20120 Fix ais depth 'body' being misplaced.

---
 indra/newview/llaisapi.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 07c6afc635..0f58908251 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -703,13 +703,13 @@ void AISAPI::FetchCOF(completion_t callback)
         // _6 -> httpHeaders
         (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
 
-    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
-                                                         _1, getFn, url, LLUUID::null, LLSD(), callback, FETCHCOF));
-
     LLSD body;
     // Only cof folder will be full, but cof can contain an outfit
     // link with embedded outfit folder for request to parse
     body["depth"] = 0;
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+                                                         _1, getFn, url, LLUUID::null, body, callback, FETCHCOF));
+
     EnqueueAISCommand("FetchCOF", proc);
 }
 
-- 
cgit v1.2.3


From ce0300e9668318d061046e309ae0e0b618b8a099 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 8 Aug 2023 21:04:04 +0300
Subject: SL-20131 Don't let viewer in without caps

Previously was bounced to login screen on error only,
now should be bounced back if failed too many times as well
---
 indra/newview/llstartup.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index c925563919..5511ab2c62 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -256,7 +256,7 @@ static bool mLoginStatePastUI = false;
 static bool mBenefitsSuccessfullyInit = false;
 
 const F32 STATE_AGENT_WAIT_TIMEOUT = 240; //seconds
-const S32 MAX_SEED_CAP_ATTEMPTS_BEFORE_LOGIN = 3; // Give region 3 chances
+const S32 MAX_SEED_CAP_ATTEMPTS_BEFORE_ABORT = 4; // Give region 4 chances
 
 std::unique_ptr<LLEventPump> LLStartUp::sStateWatcher(new LLEventStream("StartupState"));
 std::unique_ptr<LLStartupListener> LLStartUp::sListener(new LLStartupListener());
@@ -1409,11 +1409,18 @@ bool idle_startup()
 		else
 		{
 			U32 num_retries = regionp->getNumSeedCapRetries();
-            if (num_retries > MAX_SEED_CAP_ATTEMPTS_BEFORE_LOGIN)
+            if (num_retries > MAX_SEED_CAP_ATTEMPTS_BEFORE_ABORT)
             {
-                // Region will keep trying to get capabilities,
-                // but for now continue as if caps were granted
-                LLStartUp::setStartupState(STATE_SEED_CAP_GRANTED);
+                LL_WARNS("AppInit") << "Failed to get capabilities. Backing up to login screen!" << LL_ENDL;
+                if (gRememberPassword)
+                {
+                    LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status);
+                }
+                else
+                {
+                    LLNotificationsUtil::add("LoginPacketNeverReceivedNoTP", LLSD(), LLSD(), login_alert_status);
+                }
+                reset_login();
             }
 			else if (num_retries > 0)
 			{
-- 
cgit v1.2.3


From 8e1c5fee2b9c329eef9be503af740894aac27635 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 9 Aug 2023 12:52:17 +0300
Subject: SL-18629 Better item fetch error handling

---
 indra/newview/llaisapi.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 0f58908251..4546574955 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -986,6 +986,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
         case FETCHITEM:
             if (result.has("item_id"))
             {
+                // Error message might contain an item_id!!!
                 id = result["item_id"];
             }
             if (result.has("linked_id"))
@@ -1167,11 +1168,15 @@ void AISUpdate::parseMeta(const LLSD& update)
 
 void AISUpdate::parseContent(const LLSD& update)
 {
-	if (update.has("linked_id"))
+    // Errors from a fetch request might contain id without
+    // full item or folder.
+    // Todo: Depending on error we might want to do something,
+    // like removing a 404 item or refetching parent folder
+	if (update.has("linked_id") && update.has("parent_id"))
 	{
 		parseLink(update, mFetchDepth);
 	}
-	else if (update.has("item_id"))
+	else if (update.has("item_id") && update.has("parent_id"))
 	{
 		parseItem(update);
 	}
@@ -1185,7 +1190,7 @@ void AISUpdate::parseContent(const LLSD& update)
             parseEmbedded(update["_embedded"], mFetchDepth - 1);
         }
     }
-    else if (update.has("category_id"))
+    else if (update.has("category_id") && update.has("parent_id"))
     {
         parseCategory(update, mFetchDepth);
     }
-- 
cgit v1.2.3


From 03db9132db54e9366305e79e63adc4fe2f4722dc Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 10 Aug 2023 13:53:34 +0300
Subject: SL-20118 tweak the top border line

---
 indra/newview/llinventorygallery.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index eb603f0ac3..8170c0c63b 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2347,6 +2347,7 @@ void LLInventoryGalleryItem::draw()
         LLUIColor border_color = LLUIColorTable::instance().getColor(mSelected ? "MenuItemHighlightBgColor" : "TextFgTentativeColor", LLColor4::white);
         LLRect border = getChildView("preview_thumbnail")->getRect();
         border.mRight = border.mRight + 1;
+        border.mTop = border.mTop + 1;
         gl_rect_2d(border, border_color.get(), FALSE);
     }
 
-- 
cgit v1.2.3


From 87c00d8daa25ea284c85bdd19e044c1127eca927 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 10 Aug 2023 00:45:25 +0300
Subject: SL-20133 Shift clicking selected face leaves Editor's Texture tab in
 a weird state

---
 indra/newview/llpanelface.cpp | 58 +++++++++++++++++++++++++++----------------
 indra/newview/llpanelface.h   |  7 ++----
 2 files changed, 39 insertions(+), 26 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index b5ed4f50af..7075752a50 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -991,7 +991,8 @@ void LLPanelFace::getState()
 
 void LLPanelFace::updateUI(bool force_set_values /*false*/)
 { //set state of UI to match state of texture entry(ies)  (calls setEnabled, setValue, etc, but NOT setVisible)
-	LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+    LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode();
+	LLViewerObject* objectp = node ? node->getObject() : NULL;
 
 	if (objectp
 		&& objectp->getPCode() == LL_PCODE_VOLUME
@@ -1046,7 +1047,17 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         if ((LLToolFace::getInstance() == LLToolMgr::getInstance()->getCurrentTool()) && 
             !LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected()) 
         {
-            S32 new_selection = LLSelectMgr::getInstance()->getSelection()->getFirstNode()->getLastSelectedTE();
+            S32 new_selection = -1; // Don't use getLastSelectedTE, it could have been deselected
+            S32 num_tes = llmin((S32)objectp->getNumTEs(), (S32)objectp->getNumFaces());
+            for (S32 te = 0; te < num_tes; ++te)
+            {
+                if (node->isTESelected(te))
+                {
+                    new_selection = te;
+                    break;
+                }
+            }
+
             if (new_selection != selected_te)
             {
                 bool te_has_media = objectp->getTE(new_selection) && objectp->getTE(new_selection)->hasMedia();
@@ -4698,13 +4709,6 @@ void LLPanelFace::updateGLTFTextureTransform(float value, U32 pbr_type, std::fun
             edit(&new_transform);
         }
     });
-
-    LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode();
-    if (node)
-    {
-        LLViewerObject* object = node->getObject();
-        sMaterialOverrideSelection.setObjectUpdatePending(object->getID(), node->getLastSelectedTE());
-    }
 }
 
 void LLPanelFace::setMaterialOverridesFromSelection()
@@ -4817,17 +4821,22 @@ bool LLPanelFace::Selection::update()
     return changed;
 }
 
-void LLPanelFace::Selection::setObjectUpdatePending(const LLUUID &object_id, S32 side)
-{
-    mPendingObjectID = object_id;
-    mPendingSide = side;
-}
-
 void LLPanelFace::Selection::onSelectedObjectUpdated(const LLUUID& object_id, S32 side)
 {
-    if (object_id == mSelectedObjectID && side == mSelectedSide)
+    if (object_id == mSelectedObjectID)
     {
-        mChanged = true;
+        if (side == mLastSelectedSide)
+        {
+            mChanged = true;
+        }
+        else if (mLastSelectedSide == -1) // if last selected face was deselected
+        {
+            LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode();
+            if (node && node->isTESelected(side))
+            {
+                mChanged = true;
+            }
+        }
     }
 }
 
@@ -4840,8 +4849,9 @@ bool LLPanelFace::Selection::compareSelection()
     mNeedsSelectionCheck = false;
 
     const S32 old_object_count = mSelectedObjectCount;
+    const S32 old_te_count = mSelectedTECount;
     const LLUUID old_object_id = mSelectedObjectID;
-    const S32 old_side = mSelectedSide;
+    const S32 old_side = mLastSelectedSide;
 
     LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
     LLSelectNode* node = selection->getFirstNode();
@@ -4849,17 +4859,23 @@ bool LLPanelFace::Selection::compareSelection()
     {
         LLViewerObject* object = node->getObject();
         mSelectedObjectCount = selection->getObjectCount();
+        mSelectedTECount = selection->getTECount();
         mSelectedObjectID = object->getID();
-        mSelectedSide = node->getLastSelectedTE();
+        mLastSelectedSide = node->getLastSelectedTE();
     }
     else
     {
         mSelectedObjectCount = 0;
+        mSelectedTECount = 0;
         mSelectedObjectID = LLUUID::null;
-        mSelectedSide = -1;
+        mLastSelectedSide = -1;
     }
 
-    const bool selection_changed = old_object_count != mSelectedObjectCount || old_object_id != mSelectedObjectID || old_side != mSelectedSide;
+    const bool selection_changed =
+        old_object_count != mSelectedObjectCount
+        || old_te_count != mSelectedTECount
+        || old_object_id != mSelectedObjectID
+        || old_side != mLastSelectedSide;
     mChanged = mChanged || selection_changed;
     return selection_changed;
 }
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 7d567c7ce8..f6a813f9e5 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -482,7 +482,6 @@ private:
         // Prevents update() returning true until the provided object is
         // updated. Necessary to prevent controls updating when the mouse is
         // held down.
-        void setObjectUpdatePending(const LLUUID &object_id, S32 side);
         void setDirty() { mChanged = true; };
 
         // Callbacks
@@ -497,11 +496,9 @@ private:
         boost::signals2::scoped_connection mSelectConnection;
         bool mNeedsSelectionCheck = true;
         S32 mSelectedObjectCount = 0;
+        S32 mSelectedTECount = 0;
         LLUUID mSelectedObjectID;
-        S32 mSelectedSide = -1;
-
-        LLUUID mPendingObjectID;
-        S32 mPendingSide = -1;
+        S32 mLastSelectedSide = -1;
     };
 
     static Selection sMaterialOverrideSelection;
-- 
cgit v1.2.3


From d8e4572b901b429439f991703f2bc12f81e03901 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 9 Aug 2023 22:26:24 +0300
Subject: SL-20039 "Save to inventory" should only allow saving identical faces

---
 indra/newview/llpanelface.cpp | 53 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 7075752a50..837217387f 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1840,13 +1840,13 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
 
     const bool editable = objectp->permModify() && !objectp->isPermanentEnforced();
     bool has_pbr_capabilities = LLMaterialEditor::capabilitiesAvailable();
+    bool identical_pbr = true;
 
     // pbr material
     LLTextureCtrl* pbr_ctrl = findChild<LLTextureCtrl>("pbr_control");
     if (pbr_ctrl)
     {
         LLUUID pbr_id;
-        bool identical_pbr;
         LLSelectedTE::getPbrMaterialId(pbr_id, identical_pbr, has_pbr_material, has_faces_without_pbr);
 
         pbr_ctrl->setTentative(identical_pbr ? FALSE : TRUE);
@@ -1856,7 +1856,7 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
 
     getChildView("pbr_from_inventory")->setEnabled(editable && has_pbr_capabilities);
     getChildView("edit_selected_pbr")->setEnabled(editable && has_pbr_material && !has_faces_without_pbr && has_pbr_capabilities);
-    getChildView("save_selected_pbr")->setEnabled(objectp->permCopy() && has_pbr_material && !has_faces_without_pbr && has_pbr_capabilities);
+    getChildView("save_selected_pbr")->setEnabled(objectp->permCopy() && has_pbr_material && identical_pbr && has_pbr_capabilities);
 
     const bool show_pbr = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR && mComboMatMedia->getEnabled();
     if (show_pbr)
@@ -5096,14 +5096,18 @@ void LLPanelFace::LLSelectedTE::getTexId(LLUUID& id, bool& identical)
 
 void LLPanelFace::LLSelectedTE::getPbrMaterialId(LLUUID& id, bool& identical, bool& has_faces_with_pbr, bool& has_faces_without_pbr)
 {
-    struct LLSelectedTEGetmatId : public LLSelectedTEGetFunctor<LLUUID>
+    struct LLSelectedTEGetmatId : public LLSelectedTEFunctor
     {
         LLSelectedTEGetmatId()
             : mHasFacesWithoutPBR(false)
             , mHasFacesWithPBR(false)
+            , mIdenticalId(true)
+            , mIdenticalOverride(true)
+            , mInitialized(false)
+            , mMaterialOverride(LLGLTFMaterial::sDefault)
         {
         }
-        LLUUID get(LLViewerObject* object, S32 te_index)
+        bool apply(LLViewerObject* object, S32 te_index) override
         {
             LLUUID pbr_id = object->getRenderMaterialID(te_index);
             if (pbr_id.isNull())
@@ -5114,12 +5118,49 @@ void LLPanelFace::LLSelectedTE::getPbrMaterialId(LLUUID& id, bool& identical, bo
             {
                 mHasFacesWithPBR = true;
             }
-            return pbr_id;
+            if (mInitialized)
+            {
+                if (mPBRId != pbr_id)
+                {
+                    mIdenticalId = false;
+                }
+                
+                LLGLTFMaterial* te_override = object->getTE(te_index)->getGLTFMaterialOverride();
+                if (te_override)
+                {
+                    LLGLTFMaterial override = *te_override;
+                    override.sanitizeAssetMaterial();
+                    mIdenticalOverride &= (override == mMaterialOverride);
+                }
+                else
+                {
+                    mIdenticalOverride &= (mMaterialOverride == LLGLTFMaterial::sDefault);
+                }
+            }
+            else
+            {
+                mInitialized = true;
+                mPBRId = pbr_id;
+                LLGLTFMaterial* override = object->getTE(te_index)->getGLTFMaterialOverride();
+                if (override)
+                {
+                    mMaterialOverride = *override;
+                    mMaterialOverride.sanitizeAssetMaterial();
+                }
+            }
+            return true;
         }
         bool mHasFacesWithoutPBR;
         bool mHasFacesWithPBR;
+        bool mIdenticalId;
+        bool mIdenticalOverride;
+        bool mInitialized;
+        LLGLTFMaterial mMaterialOverride;
+        LLUUID mPBRId;
     } func;
-    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&func, id);
+    LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
+    id = func.mPBRId;
+    identical = func.mIdenticalId && func.mIdenticalOverride;
     has_faces_with_pbr = func.mHasFacesWithPBR;
     has_faces_without_pbr = func.mHasFacesWithoutPBR;
 }
-- 
cgit v1.2.3


From a4012ea073283b1e360333dfd9a13ede009f24d9 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 19 Jul 2023 16:49:26 -0700
Subject: SL-20024: Generalize some comments/error

---
 indra/newview/lltooldraganddrop.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 1918d11964..c123501059 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -948,7 +948,14 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 	{
 		hit_obj->requestInventory();
 		LLSD args;
-		args["ERROR_MESSAGE"] = "Unable to add texture.\nPlease wait a few seconds and try again.";
+        if (LLAssetType::AT_MATERIAL == item->getType())
+        {
+            args["ERROR_MESSAGE"] = "Unable to add material.\nPlease wait a few seconds and try again.";
+        }
+        else
+        {
+            args["ERROR_MESSAGE"] = "Unable to add texture.\nPlease wait a few seconds and try again.";
+        }
 		LLNotificationsUtil::add("ErrorMessage", args);
 		return FALSE;
 	}
@@ -957,7 +964,7 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 		// if the asset is already in the object's inventory 
 		// then it can always be added to a side.
 		// This saves some work if the task's inventory is already loaded
-		// and ensures that the texture item is only added once.
+		// and ensures that the asset item is only added once.
 		return TRUE;
 	}
 
@@ -995,7 +1002,7 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 				return FALSE;
 			}
 		}
-		// Add the texture item to the target object's inventory.
+		// Add the asset item to the target object's inventory.
         if (LLAssetType::AT_TEXTURE == new_item->getType()
             || LLAssetType::AT_MATERIAL == new_item->getType())
         {
@@ -1011,14 +1018,14 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 	else if (!item->getPermissions().allowOperationBy(PERM_TRANSFER,
 													 gAgent.getID()))
 	{
-		// Check that we can add the texture as inventory to the object
+		// Check that we can add the asset as inventory to the object
 		if (willObjectAcceptInventory(hit_obj,item) < ACCEPT_YES_COPY_SINGLE )
 		{
 			return FALSE;
 		}
 		// *FIX: may want to make sure agent can paint hit_obj.
 
-		// Add the texture item to the target object's inventory.
+		// Add the asset item to the target object's inventory.
 		if (LLAssetType::AT_TEXTURE == new_item->getType()
             || LLAssetType::AT_MATERIAL == new_item->getType())
 		{
@@ -1028,7 +1035,7 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 		{
 			hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
 		}
-		// Force the object to update and refetch its inventory so it has this texture.
+		// Force the object to update and refetch its inventory so it has this asset.
 		hit_obj->dirtyInventory();
 		hit_obj->requestInventory();
 		// TODO: Check to see if adding the item was successful; if not, then
-- 
cgit v1.2.3


From 9be8103142dc16b58dcf930d5d1f70f49272837f Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 19 Jul 2023 16:56:36 -0700
Subject: SL-20024: Early return

---
 indra/newview/lltooldraganddrop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index c123501059..dd5f607b04 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -930,6 +930,8 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 													 LLToolDragAndDrop::ESource source,
 													 const LLUUID& src_id)
 {
+	if (!item) return FALSE;
+
 	// Always succeed if....
 	// material is from the library 
 	// or already in the contents of the object
@@ -967,8 +969,6 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 		// and ensures that the asset item is only added once.
 		return TRUE;
 	}
-
-	if (!item) return FALSE;
 	
 	LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 	if (!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
-- 
cgit v1.2.3


From e7e565dc6e7e0c666132ffffa4798b2cfc00d6a4 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 21 Jul 2023 13:01:11 -0700
Subject: SL-20024: Put material in object inventory when material is no-modify
 or no-transfer

---
 indra/llprimitive/llmaterial.cpp    | 11 -----------
 indra/llprimitive/llmaterial.h      |  2 --
 indra/newview/llpanelface.cpp       |  7 +------
 indra/newview/llpanelface.h         |  1 -
 indra/newview/llselectmgr.cpp       | 36 ++++++++++++++++++++++++++----------
 indra/newview/llselectmgr.h         | 14 ++++++++++++--
 indra/newview/lltooldraganddrop.cpp | 20 ++++++++++++++++++++
 7 files changed, 59 insertions(+), 32 deletions(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index f6cb3c8b70..0d146de949 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -332,17 +332,6 @@ void LLMaterial::setAlphaMaskCutoff(U8 cutoff)
     mAlphaMaskCutoff = cutoff;
 }
 
-LLUUID LLMaterial::getMaterialID() const
-{
-    // TODO - not null
-    return LLUUID::null;
-}
-
-void LLMaterial::setMaterialID(const LLUUID &material_id)
-{
-    // TODO - set
-}
-
 LLSD LLMaterial::asLLSD() const
 {
     LLSD material_data;
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h
index b46d85c2d1..81f41ddc51 100644
--- a/indra/llprimitive/llmaterial.h
+++ b/indra/llprimitive/llmaterial.h
@@ -115,8 +115,6 @@ public:
     void        setDiffuseAlphaMode(U8 alpha_mode);
     U8          getAlphaMaskCutoff() const;
     void        setAlphaMaskCutoff(U8 cutoff);
-    LLUUID      getMaterialID() const;
-    void        setMaterialID(LLUUID const & material_id);
 
     bool        isNull() const;
     static const LLMaterial null;
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 837217387f..b633ccc5d5 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -3093,12 +3093,7 @@ void LLPanelFace::onSelectPbr(const LLSD& data)
         {
             id = pbr_ctrl->getImageAssetID();
         }
-        if (LLSelectMgr::getInstance()->selectionSetGLTFMaterial(id))
-        {
-            LLSelectedTEMaterial::setMaterialID(this, id);
-        }
-        else
-        {
+        if (!LLSelectMgr::getInstance()->selectionSetGLTFMaterial(id))
             refresh();
         }
     }
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index f6a813f9e5..e2d9f65e58 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -583,7 +583,6 @@ public:
 		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID);
 		DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID);
 		DEF_EDIT_MAT_STATE(LLColor4U,	const LLColor4U&,setSpecularLightColor);
-		DEF_EDIT_MAT_STATE(LLUUID, const LLUUID&, setMaterialID);
 	};
 
 	class LLSelectedTE
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 5c1a339570..6692d124d8 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1773,15 +1773,17 @@ void LLObjectSelection::applyNoCopyTextureToTEs(LLViewerInventoryItem* item)
 	}
 }
 
-void LLObjectSelection::applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item)
+bool LLObjectSelection::applyRestrictedPbrMaterialToTEs(LLViewerInventoryItem* item)
 {
     if (!item)
     {
-        return;
+        return false;
     }
 
     LLUUID asset_id = item->getAssetUUID();
 
+    bool material_copied_all_faces = true;
+
     for (iterator iter = begin(); iter != end(); ++iter)
     {
         LLSelectNode* node = *iter;
@@ -1797,12 +1799,17 @@ void LLObjectSelection::applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item)
         {
             if (node->isTESelected(te))
             {
-                //(no-copy) materials must be moved to the object's inventory only once
+                //(no-copy), (no-modify), and (no-transfer) materials must be moved to the object's inventory only once
                 // without making any copies
                 if (!material_copied && asset_id.notNull())
                 {
-                    LLToolDragAndDrop::handleDropMaterialProtections(object, item, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null);
-                    material_copied = true;
+                    material_copied = (bool)LLToolDragAndDrop::handleDropMaterialProtections(object, item, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null);
+                }
+                if (!material_copied)
+                {
+                    // Applying the material is not possible for this object given the current inventory
+					material_copied_all_faces = false;
+                    break;
                 }
 
                 // apply texture for the selected faces
@@ -1814,6 +1821,8 @@ void LLObjectSelection::applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item)
     }
 
     LLGLTFMaterialList::flushUpdates();
+
+    return material_copied_all_faces;
 }
 
 
@@ -1924,6 +1933,8 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
     {
         LLViewerInventoryItem* mItem;
         LLUUID mMatId;
+        bool material_copied_any_face = false;
+        bool material_copied_all_faces = true;
         f(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mMatId(id) {}
         bool apply(LLViewerObject* objectp, S32 te)
         {
@@ -1950,14 +1961,19 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
         }
     };
 
-    if (item && !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
+    bool success = true;
+    if (item &&
+            (!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()) ||
+             !item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID()) ||
+             !item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID())
+            ))
     {
-        getSelection()->applyNoCopyPbrMaterialToTEs(item);
+        success = success && getSelection()->applyRestrictedPbrMaterialToTEs(item);
     }
     else
     {
         f setfunc(item, mat_id);
-        getSelection()->applyToTEs(&setfunc);
+        success = success && getSelection()->applyToTEs(&setfunc);
     }
 
     struct g : public LLSelectedObjectFunctor
@@ -1986,11 +2002,11 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
             return true;
         }
     } sendfunc(item);
-    getSelection()->applyToObjects(&sendfunc);
+    success = success && getSelection()->applyToObjects(&sendfunc);
 
     LLGLTFMaterialList::flushUpdates();
 
-    return true;
+    return success;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 327134a487..f89209b437 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -378,7 +378,17 @@ public:
 	 * Then this only texture is used for all selected faces.
 	 */
 	void applyNoCopyTextureToTEs(LLViewerInventoryItem* item);
-    void applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item);
+    /*
+     * Multi-purpose function for applying PBR materials to the
+     * selected object or faces, any combination of copy/mod/transfer
+     * permission restrictions. This method moves the restricted
+     * material to the object's inventory and doesn't make a copy of the
+     * material for each face. Then this only material is used for
+     * all selected faces.
+     * Returns false if applying the material failed on one or more selected
+     * faces.
+     */
+    bool applyRestrictedPbrMaterialToTEs(LLViewerInventoryItem* item);
 
 	ESelectType getSelectType() const { return mSelectType; }
 
@@ -635,7 +645,7 @@ public:
 	void selectionSetRestitution(F32 restitution);
 	void selectionSetMaterial(U8 material);
 	bool selectionSetImage(const LLUUID& imageid); // could be item or asset id
-    bool selectionSetGLTFMaterial(const LLUUID& mat_id); // could be item or asset id
+    bool selectionSetGLTFMaterial(const LLUUID& mat_id); // material id only
 	void selectionSetColor(const LLColor4 &color);
 	void selectionSetColorOnly(const LLColor4 &color); // Set only the RGB channels
 	void selectionSetAlphaOnly(const F32 alpha); // Set only the alpha channel
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index dd5f607b04..23a6634154 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1042,6 +1042,26 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 		// we should return false here. This will requre a separate listener
 		// since without listener, we have no way to receive update
 	}
+	else if (LLAssetType::AT_MATERIAL == new_item->getType() &&
+             !item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID()))
+	{
+		// Check that we can add the material as inventory to the object
+		if (willObjectAcceptInventory(hit_obj,item) < ACCEPT_YES_COPY_SINGLE )
+		{
+			return FALSE;
+		}
+		// *FIX: may want to make sure agent can paint hit_obj.
+
+		// Add the material item to the target object's inventory.
+        hit_obj->updateMaterialInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+
+		// Force the object to update and refetch its inventory so it has this material.
+		hit_obj->dirtyInventory();
+		hit_obj->requestInventory();
+		// TODO: Check to see if adding the item was successful; if not, then
+		// we should return false here. This will requre a separate listener
+		// since without listener, we have no way to receive update
+	}
 	return TRUE;
 }
 
-- 
cgit v1.2.3


From a4030031f895f8497e106f0547eb29780d6ec4e9 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 21 Jul 2023 17:28:09 -0700
Subject: SL-20024: Do not show material preview for no-modify materials

---
 indra/newview/app_settings/settings.xml              |  2 +-
 indra/newview/llpanelface.cpp                        | 16 +++++++++-------
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0cd63d9d5f..b92a829f36 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -250,7 +250,7 @@
     <key>TextureLivePreview</key>
     <map>
       <key>Comment</key>
-      <string>Preview selections in texture picker immediately</string>
+      <string>Preview selections in texture picker or material picker immediately</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index b633ccc5d5..e91b14a453 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -3094,6 +3094,7 @@ void LLPanelFace::onSelectPbr(const LLSD& data)
             id = pbr_ctrl->getImageAssetID();
         }
         if (!LLSelectMgr::getInstance()->selectionSetGLTFMaterial(id))
+        {
             refresh();
         }
     }
@@ -4989,23 +4990,24 @@ void LLPanelFace::onPbrSelectionChanged(LLInventoryItem* itemp)
         LLSaleInfo sale_info;
         LLSelectMgr::instance().selectGetSaleInfo(sale_info);
 
-        bool can_copy = itemp->getPermissions().allowCopyBy(gAgentID); // do we have perm to copy this texture?
-        bool can_transfer = itemp->getPermissions().allowOperationBy(PERM_TRANSFER, gAgentID); // do we have perm to transfer this texture?
-        bool is_object_owner = gAgentID == obj_owner_id; // does object for which we are going to apply texture belong to the agent?
-        bool not_for_sale = !sale_info.isForSale(); // is object for which we are going to apply texture not for sale?
+        bool can_copy = itemp->getPermissions().allowCopyBy(gAgentID); // do we have perm to copy this material?
+        bool can_transfer = itemp->getPermissions().allowOperationBy(PERM_TRANSFER, gAgentID); // do we have perm to transfer this material?
+        bool can_modify = itemp->getPermissions().allowOperationBy(PERM_MODIFY, gAgentID); // do we have perm to transfer this material?
+        bool is_object_owner = gAgentID == obj_owner_id; // does object for which we are going to apply material belong to the agent?
+        bool not_for_sale = !sale_info.isForSale(); // is object for which we are going to apply material not for sale?
 
-        if (can_copy && can_transfer)
+        if (can_copy && can_transfer && can_modify)
         {
             pbr_ctrl->setCanApply(true, true);
             return;
         }
 
-        // if texture has (no-transfer) attribute it can be applied only for object which we own and is not for sale
+        // if material has (no-transfer) attribute it can be applied only for object which we own and is not for sale
         pbr_ctrl->setCanApply(false, can_transfer ? true : is_object_owner && not_for_sale);
 
         if (gSavedSettings.getBOOL("TextureLivePreview"))
         {
-            LLNotificationsUtil::add("LivePreviewUnavailable");
+            LLNotificationsUtil::add("LivePreviewUnavailablePBR");
         }
     }
 }
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ca07aacb21..bbc3798034 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9209,6 +9209,18 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran
     yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="LivePreviewUnavailablePBR"
+   type="alert">
+   
+We cannot display a preview of this material because it is no-copy, no-transfer, and/or no-modify.
+  <usetemplate
+    ignoretext="Warn me that Live Preview mode is not available for no-copy, no-transfer, and/or no-modify materials"
+    name="okignore"
+    yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="FacePasteFailed"
-- 
cgit v1.2.3


From ca6f465088be904fa5b85297396227f905792a3b Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 24 Jul 2023 16:16:52 -0700
Subject: SL-20024: Disable material editor on prim when contained material is
 no mod

---
 indra/newview/llmaterialeditor.cpp |  7 ++++++-
 indra/newview/llpreview.cpp        | 20 ++++++++++++++------
 indra/newview/llpreview.h          |  2 ++
 3 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 3a0e64985c..b30f94e145 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -238,6 +238,7 @@ struct LLSelectedTEGetMatData : public LLSelectedTEFunctor
     LLUUID mTexNormalId;
     LLUUID mObjectId;
     S32 mObjectTE;
+    LLUUID mMaterialId;
     LLPointer<LLGLTFMaterial> mMaterial;
     LLPointer<LLLocalGLTFMaterial> mLocalMaterial;
 };
@@ -259,6 +260,7 @@ bool LLSelectedTEGetMatData::apply(LLViewerObject* objectp, S32 te_index)
         return false;
     }
     LLUUID mat_id = objectp->getRenderMaterialID(te_index);
+    mMaterialId = mat_id;
     bool can_use = mIsOverride ? objectp->permModify() : objectp->permCopy();
     LLTextureEntry *tep = objectp->getTE(te_index);
     // We might want to disable this entirely if at least
@@ -2708,7 +2710,10 @@ bool LLMaterialEditor::setFromSelection()
     if (func.mMaterial.notNull())
     {
         setFromGLTFMaterial(func.mMaterial);
-        setEnableEditing(true);
+        LLViewerObject* selected_object = selected_objects->getFirstSelectedObject(NULL);
+        const LLViewerInventoryItem* item = selected_object->getInventoryItemByAsset(func.mMaterialId);
+        const bool allow_modify = !item || canModify(selected_object, item);
+        setEnableEditing(allow_modify);
     }
     else
     {
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index b9b2279e77..0117db86e8 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -241,14 +241,22 @@ void LLPreview::refreshFromItem()
 // static
 BOOL LLPreview::canModify(const LLUUID taskUUID, const LLInventoryItem* item)
 {
+    const LLViewerObject* object = nullptr;
 	if (taskUUID.notNull())
 	{
-		LLViewerObject* object = gObjectList.findObject(taskUUID);
-		if(object && !object->permModify())
-		{
-			// No permission to edit in-world inventory
-			return FALSE;
-		}
+		object = gObjectList.findObject(taskUUID);
+	}
+
+	return canModify(object, item);
+}
+
+// static
+BOOL LLPreview::canModify(const LLViewerObject* object, const LLInventoryItem* item)
+{
+	if (object && !object->permModify())
+	{
+        // No permission to edit in-world inventory
+        return FALSE;
 	}
 
 	return item && gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE);
diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h
index ab60f4c008..3688ee0192 100644
--- a/indra/newview/llpreview.h
+++ b/indra/newview/llpreview.h
@@ -36,6 +36,7 @@
 #include <map>
 
 class LLInventoryItem;
+class LLViewerObject;
 class LLLineEditor;
 class LLRadioGroup;
 class LLPreview;
@@ -109,6 +110,7 @@ public:
 	// We can't modify Item or description in preview if either in-world Object
 	// or Item  itself is unmodifiable
 	static BOOL canModify(const LLUUID taskUUID, const LLInventoryItem* item);
+	static BOOL canModify(const LLViewerObject* object, const LLInventoryItem* item);
 
 protected:
 	virtual void onCommit();
-- 
cgit v1.2.3


From 7bf6103ad95c281c2ed680c9eb9b07cc584ddc91 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 25 Jul 2023 14:52:56 -0700
Subject: SL-20024: (WIP) (not tested) Improved behavior for saving material to
 inventory. Check perms, keep perms.

---
 indra/llinventory/llpermissions.h  |   4 +-
 indra/newview/llmaterialeditor.cpp | 164 +++++++++++++++++++++++++++----------
 indra/newview/llmaterialeditor.h   |   8 +-
 indra/newview/llpanelface.cpp      |   2 +-
 4 files changed, 129 insertions(+), 49 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 27252f7b97..32fae844fb 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -251,7 +251,9 @@ public:
 	BOOL setNextOwnerBits(const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits);
 	
 	// This is currently only used in the Viewer to handle calling cards
-	// where the creator is actually used to store the target. Use with care.
+	// where the creator is actually used to store the target.
+	// It is also used for saving a GLTF material on a prim.
+	// Use with care.
 	void setCreator(const LLUUID& creator) { mCreator = creator; }
 	
 	//
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index b30f94e145..6e043ecee5 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -237,6 +237,7 @@ struct LLSelectedTEGetMatData : public LLSelectedTEFunctor
     LLUUID mTexEmissiveId;
     LLUUID mTexNormalId;
     LLUUID mObjectId;
+    LLViewerObject* mObject = nullptr;
     S32 mObjectTE;
     LLUUID mMaterialId;
     LLPointer<LLGLTFMaterial> mMaterial;
@@ -293,6 +294,7 @@ bool LLSelectedTEGetMatData::apply(LLViewerObject* objectp, S32 te_index)
                 mTexNormalId = tex_normal_id;
                 mObjectTE = te_index;
                 mObjectId = objectp->getID();
+                mObject = objectp;
                 mFirst = false;
             }
             else
@@ -1194,7 +1196,9 @@ bool LLMaterialEditor::saveIfNeeded()
     { 
         //make a new inventory item
         std::string res_desc = buildMaterialDescription();
-        createInventoryItem(buffer, mMaterialName, res_desc);
+        LLPermissions local_permissions;
+        local_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+        createInventoryItem(buffer, mMaterialName, res_desc, local_permissions);
 
         // We do not update floater with uploaded asset yet, so just close it.
         closeFloater();
@@ -1288,7 +1292,7 @@ bool LLMaterialEditor::updateInventoryItem(const std::string &buffer, const LLUU
     return true;
 }
 
-void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc)
+void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& owner_permissions)
 {
     // gen a new uuid for this asset
     LLTransactionID tid;
@@ -1299,7 +1303,7 @@ void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std:
 
     create_inventory_item(gAgent.getID(), gAgent.getSessionID(), parent, tid, name, desc,
         LLAssetType::AT_MATERIAL, LLInventoryType::IT_MATERIAL, subtype, next_owner_perm,
-        new LLBoostFuncInventoryCallback([output = buffer](LLUUID const& inv_item_id)
+        new LLBoostFuncInventoryCallback([output = buffer, owner_permissions](LLUUID const& inv_item_id)
     {
         LLViewerInventoryItem* item = gInventory.getItem(inv_item_id);
         if (item)
@@ -1309,8 +1313,15 @@ void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std:
             if (perm.getMaskEveryone() != LLFloaterPerms::getEveryonePerms("Materials")
                 || perm.getMaskGroup() != LLFloaterPerms::getGroupPerms("Materials"))
             {
-                perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Materials"));
-                perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Materials"));
+                LLPermissions floater_perm;
+                floater_perm.set(perm);
+                floater_perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Materials"));
+                floater_perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Materials"));
+                perm.accumulate(floater_perm);
+                perm.accumulate(owner_permissions);
+                // TODO: Decide if these are needed
+                perm.setCreator(owner_permissions.getCreator());
+                perm.setLastOwner(owner_permissions.getLastOwner());
 
                 item->setPermissions(perm);
 
@@ -1794,55 +1805,112 @@ void LLMaterialEditor::loadLive()
     }
 }
 
-void LLMaterialEditor::saveObjectsMaterialAs()
+// *NOTE: permissions_out ignores user preferences for new item creation
+// (LLFloaterPerms).  Those are applied later on in
+// LLMaterialEditor::createInventoryItem.
+bool can_save_objects_material(LLSelectedTEGetMatData& func, LLPermissions& permissions_out)
 {
-    LLSelectedTEGetMatData func(false);
     LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func, true /*first applicable*/);
-    saveMaterialAs(func.mMaterial, func.mLocalMaterial);
-}
-void LLMaterialEditor::savePickedMaterialAs()
-{
-    LLPickInfo pick = LLToolPie::getInstance()->getPick();
-    if (pick.mPickType != LLPickInfo::PICK_OBJECT || !pick.getObject())
+    LLViewerObject* selected_object = func.mObject;
+    llassert(selected_object); // Note the function name
+    const LLViewerInventoryItem* item = selected_object->getInventoryItemByAsset(func.mMaterialId);
+
+    LLPermissions item_permissions;
+    const bool previous_item_owned = item && item->getPermissions().getLastOwner().notNull();
+    if (item)
     {
-        return;
+        item_permissions.set(item->getPermissions());
+        if (!gAgent.allowOperation(PERM_MODIFY, item_permissions, GP_OBJECT_MANIPULATE))
+        {
+            return false;
+        }
+        if (!gAgent.allowOperation(PERM_COPY, item_permissions, GP_OBJECT_MANIPULATE))
+        {
+            return false;
+        }
+        if (!item_permissions.setOwnerAndGroup(LLUUID::null, gAgent.getID(), LLUUID::null, true))
+        {
+            llassert(false);
+            return false;
+        }
     }
-
-    LLPointer<LLGLTFMaterial> render_material;
-    LLPointer<LLLocalGLTFMaterial> local_material;
-
-    LLViewerObject *objectp = pick.getObject();
-    LLUUID mat_id = objectp->getRenderMaterialID(pick.mObjectFace);
-    if (mat_id.notNull() && objectp->permCopy())
+    else
     {
-        // Try a face user picked first
-        // (likely the only method we need, but in such case
-        // enable_object_save_gltf_material will need to check this)
-        LLTextureEntry *tep = objectp->getTE(pick.mObjectFace);
-        LLGLTFMaterial *mat = tep->getGLTFMaterial();
-        LLLocalGLTFMaterial *local_mat = dynamic_cast<LLLocalGLTFMaterial*>(mat);
+        item_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+    }
 
-        if (local_mat)
+    LLPermissions* object_permissions_p = LLSelectMgr::getInstance()->findObjectPermissions(selected_object);
+    LLPermissions object_permissions;
+    const bool previous_object_owned = object_permissions_p && object_permissions_p->getLastOwner().notNull();
+    if (object_permissions_p)
+    {
+        object_permissions.set(*object_permissions_p);
+        if (!gAgent.allowOperation(PERM_MODIFY, object_permissions, GP_OBJECT_MANIPULATE))
         {
-            local_material = local_mat;
+            return false;
+        }
+        if (!gAgent.allowOperation(PERM_COPY, object_permissions, GP_OBJECT_MANIPULATE))
+        {
+            return false;
+        }
+        if (!object_permissions.setOwnerAndGroup(LLUUID::null, gAgent.getID(), LLUUID::null, true))
+        {
+            llassert(false);
+            return false;
         }
-        render_material = tep->getGLTFRenderMaterial();
     }
     else
     {
-        // Find an applicable material.
-        // Do this before showing message, because
-        // message is going to drop selection.
-        LLSelectedTEGetMatData func(false);
-        LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func, true /*first applicable*/);
-        local_material = func.mLocalMaterial;
-        render_material = func.mMaterial;
+        object_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
     }
 
-    saveMaterialAs(render_material, local_material);
+    permissions_out.set(item_permissions);
+    permissions_out.accumulate(object_permissions);
+
+    if (previous_item_owned != previous_object_owned)
+    {
+        // Likely ownership history conflict. Prefer the item history. Fall
+        // back to object history if no associated item.
+        if (previous_item_owned)
+        {
+            permissions_out.setCreator(item_permissions.getCreator());
+            permissions_out.setLastOwner(item_permissions.getLastOwner());
+        }
+        else if (previous_object_owned)
+        {
+            permissions_out.setCreator(object_permissions.getCreator());
+            permissions_out.setLastOwner(object_permissions.getLastOwner());
+        }
+    }
+
+    llassert(permissions_out.getOwner() == gAgent.getID());
+    llassert(permissions_out.getCreator().notNull());
+    llassert(permissions_out.getGroup().isNull());
+
+    return true;
+}
+
+bool LLMaterialEditor::canSaveObjectsMaterial()
+{
+    LLSelectedTEGetMatData func(false);
+    LLPermissions permissions;
+    return can_save_objects_material(func, permissions);
 }
 
-void LLMaterialEditor::saveMaterialAs(const LLGLTFMaterial* render_material, const LLLocalGLTFMaterial *local_material)
+void LLMaterialEditor::saveObjectsMaterialAs()
+{
+    LLSelectedTEGetMatData func(false);
+    LLPermissions permissions;
+    bool allowed = can_save_objects_material(func, permissions);
+    if (!allowed)
+    {
+        LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
+        return;
+    }
+    saveMaterialAs(func.mMaterial, func.mLocalMaterial, permissions);
+}
+
+void LLMaterialEditor::saveMaterialAs(const LLGLTFMaterial* render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions)
 {
     if (local_material)
     {
@@ -1918,10 +1986,20 @@ void LLMaterialEditor::saveMaterialAs(const LLGLTFMaterial* render_material, con
     LLSD args;
     args["DESC"] = LLTrans::getString("New Material");
 
-    LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback, _1, _2));
+    // At this point, last owner, etc should be set. LLFloaterPerms will be honored later on
+    if (local_material)
+    {
+        LLPermissions local_permissions;
+        local_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+        LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback, _1, _2, local_permissions));
+    }
+    else
+    {
+        LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback, _1, _2, permissions));
+    }
 }
 
-void LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response)
+void LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
     if (0 == option)
@@ -1936,7 +2014,7 @@ void LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback(const LLSD& notificati
         LLSDSerialize::serialize(asset, str, LLSDSerialize::LLSD_BINARY);
 
         std::string new_name = response["message"].asString();
-        createInventoryItem(str.str(), new_name, std::string());
+        createInventoryItem(str.str(), new_name, std::string(), permissions);
     }
 }
 
@@ -2710,7 +2788,7 @@ bool LLMaterialEditor::setFromSelection()
     if (func.mMaterial.notNull())
     {
         setFromGLTFMaterial(func.mMaterial);
-        LLViewerObject* selected_object = selected_objects->getFirstSelectedObject(NULL);
+        LLViewerObject* selected_object = func.mObject;
         const LLViewerInventoryItem* item = selected_object->getInventoryItemByAsset(func.mMaterialId);
         const bool allow_modify = !item || canModify(selected_object, item);
         setEnableEditing(allow_modify);
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 6f674a4170..5ee42f65f4 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -112,9 +112,9 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     static void updateLive(const LLUUID &object_id, S32 te);
     static void loadLive();
 
+    static bool canSaveObjectsMaterial();
     static void saveObjectsMaterialAs();
-    static void savePickedMaterialAs();
-    static void onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response);
+    static void onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions);
 
     static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status);
 
@@ -229,10 +229,10 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     static bool capabilitiesAvailable();
 
 private:
-    static void saveMaterialAs(const LLGLTFMaterial *render_material, const LLLocalGLTFMaterial *local_material);
+    static void saveMaterialAs(const LLGLTFMaterial *render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions);
 
     static bool updateInventoryItem(const std::string &buffer, const LLUUID &item_id, const LLUUID &task_id);
-    static void createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc);
+    static void createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& owner_permissions);
 
     void setFromGLTFMaterial(LLGLTFMaterial* mat);
     bool setFromSelection();
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index e91b14a453..b9daf19284 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1856,7 +1856,7 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
 
     getChildView("pbr_from_inventory")->setEnabled(editable && has_pbr_capabilities);
     getChildView("edit_selected_pbr")->setEnabled(editable && has_pbr_material && !has_faces_without_pbr && has_pbr_capabilities);
-    getChildView("save_selected_pbr")->setEnabled(objectp->permCopy() && has_pbr_material && identical_pbr && has_pbr_capabilities);
+    getChildView("save_selected_pbr")->setEnabled(LLMaterialEditor::canSaveObjectsMaterial() && identical_pbr);
 
     const bool show_pbr = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR && mComboMatMedia->getEnabled();
     if (show_pbr)
-- 
cgit v1.2.3


From a5d318567cc5c3e8f2f86fce1132f5883014e14e Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 28 Jul 2023 17:29:09 -0700
Subject: SL-20024: (WIP) (untested) Fix GLTF material permissions in some more
 edge cases

---
 indra/newview/llmaterialeditor.cpp | 139 ++++++++++++++++++++-----------------
 indra/newview/llmaterialeditor.h   |   1 +
 indra/newview/llpanelface.cpp      |  57 +++++++++++++--
 indra/newview/llpanelface.h        |   6 ++
 4 files changed, 134 insertions(+), 69 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 6e043ecee5..af40c9e931 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -293,8 +293,8 @@ bool LLSelectedTEGetMatData::apply(LLViewerObject* objectp, S32 te_index)
                 mTexEmissiveId = tex_emissive_id;
                 mTexNormalId = tex_normal_id;
                 mObjectTE = te_index;
-                mObjectId = objectp->getID();
                 mObject = objectp;
+                mObjectId = objectp->getID();
                 mFirst = false;
             }
             else
@@ -322,6 +322,7 @@ bool LLSelectedTEGetMatData::apply(LLViewerObject* objectp, S32 te_index)
             LLGLTFMaterial *mat = tep->getGLTFMaterial();
             LLLocalGLTFMaterial *local_mat = dynamic_cast<LLLocalGLTFMaterial*>(mat);
 
+            mObject = objectp;
             if (local_mat)
             {
                 mLocalMaterial = local_mat;
@@ -1297,38 +1298,39 @@ void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std:
     // gen a new uuid for this asset
     LLTransactionID tid;
     tid.generate();     // timestamp-based randomization + uniquification
-    U32 next_owner_perm = LLFloaterPerms::getNextOwnerPerms("Materials");
+    LLPermissions final_perm;
+    {
+        final_perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+
+        LLPermissions floater_perm;
+        floater_perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+        floater_perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Materials"));
+        floater_perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Materials"));
+        floater_perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("Materials"));
+
+        final_perm.accumulate(floater_perm);
+        final_perm.accumulate(owner_permissions);
+    }
+    // NOTE: create_inventory_item doesn't allow presetting some permissions.
+    // The rest will be fixed after the callback.
     LLUUID parent = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_MATERIAL);
     const U8 subtype = NO_INV_SUBTYPE;  // TODO maybe use AT_SETTINGS and LLSettingsType::ST_MATERIAL ?
 
     create_inventory_item(gAgent.getID(), gAgent.getSessionID(), parent, tid, name, desc,
-        LLAssetType::AT_MATERIAL, LLInventoryType::IT_MATERIAL, subtype, next_owner_perm,
-        new LLBoostFuncInventoryCallback([output = buffer, owner_permissions](LLUUID const& inv_item_id)
+        LLAssetType::AT_MATERIAL, LLInventoryType::IT_MATERIAL, subtype, final_perm.getMaskNextOwner(),
+        new LLBoostFuncInventoryCallback([output = buffer, final_perm](LLUUID const& inv_item_id)
     {
         LLViewerInventoryItem* item = gInventory.getItem(inv_item_id);
         if (item)
         {
             // create_inventory_item doesn't allow presetting some permissions, fix it now
             LLPermissions perm = item->getPermissions();
-            if (perm.getMaskEveryone() != LLFloaterPerms::getEveryonePerms("Materials")
-                || perm.getMaskGroup() != LLFloaterPerms::getGroupPerms("Materials"))
-            {
-                LLPermissions floater_perm;
-                floater_perm.set(perm);
-                floater_perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Materials"));
-                floater_perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Materials"));
-                perm.accumulate(floater_perm);
-                perm.accumulate(owner_permissions);
-                // TODO: Decide if these are needed
-                perm.setCreator(owner_permissions.getCreator());
-                perm.setLastOwner(owner_permissions.getLastOwner());
+            perm.accumulate(final_perm);
+            item->setPermissions(perm);
 
-                item->setPermissions(perm);
-
-                item->updateServer(FALSE);
-                gInventory.updateItem(item);
-                gInventory.notifyObservers();
-            }
+            item->updateServer(FALSE);
+            gInventory.updateItem(item);
+            gInventory.notifyObservers();
         }
 
         // from reference in LLSettingsVOBase::createInventoryItem()/updateInventoryItem()
@@ -1805,29 +1807,47 @@ void LLMaterialEditor::loadLive()
     }
 }
 
-// *NOTE: permissions_out ignores user preferences for new item creation
-// (LLFloaterPerms).  Those are applied later on in
+// *NOTE: permissions_out ignores user preferences for new item creation. See
+// LLFloaterPerms.  Preferences are applied later on in
 // LLMaterialEditor::createInventoryItem.
-bool can_save_objects_material(LLSelectedTEGetMatData& func, LLPermissions& permissions_out)
+bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<PermissionBit>& ops, LLPermissions& permissions_out)
 {
+    if (!LLMaterialEditor::capabilitiesAvailable())
+    {
+        return false;
+    }
+
     LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func, true /*first applicable*/);
     LLViewerObject* selected_object = func.mObject;
-    llassert(selected_object); // Note the function name
+    if (!selected_object)
+    {
+        // LLSelectedTEGetMatData can fail if there are no selected faces
+        // with materials, but we expect at least some object is selected.
+        llassert(LLSelectMgr::getInstance()->getSelection()->getFirstObject());
+        return false;
+    }
+    for (PermissionBit op : ops)
+    {
+        if (op == PERM_MODIFY && selected_object->isPermanentEnforced())
+        {
+            return false;
+        }
+    }
+
     const LLViewerInventoryItem* item = selected_object->getInventoryItemByAsset(func.mMaterialId);
 
     LLPermissions item_permissions;
-    const bool previous_item_owned = item && item->getPermissions().getLastOwner().notNull();
     if (item)
     {
         item_permissions.set(item->getPermissions());
-        if (!gAgent.allowOperation(PERM_MODIFY, item_permissions, GP_OBJECT_MANIPULATE))
-        {
-            return false;
-        }
-        if (!gAgent.allowOperation(PERM_COPY, item_permissions, GP_OBJECT_MANIPULATE))
+        for (PermissionBit op : ops)
         {
-            return false;
+            if (!gAgent.allowOperation(op, item_permissions, GP_OBJECT_MANIPULATE))
+            {
+                return false;
+            }
         }
+        // Update flags for new owner
         if (!item_permissions.setOwnerAndGroup(LLUUID::null, gAgent.getID(), LLUUID::null, true))
         {
             llassert(false);
@@ -1839,20 +1859,21 @@ bool can_save_objects_material(LLSelectedTEGetMatData& func, LLPermissions& perm
         item_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
     }
 
-    LLPermissions* object_permissions_p = LLSelectMgr::getInstance()->findObjectPermissions(selected_object);
+    // Use root object for permissions checking
+    LLViewerObject* root_object = selected_object->getRootEdit();
+    LLPermissions* object_permissions_p = LLSelectMgr::getInstance()->findObjectPermissions(root_object);
     LLPermissions object_permissions;
-    const bool previous_object_owned = object_permissions_p && object_permissions_p->getLastOwner().notNull();
     if (object_permissions_p)
     {
         object_permissions.set(*object_permissions_p);
-        if (!gAgent.allowOperation(PERM_MODIFY, object_permissions, GP_OBJECT_MANIPULATE))
+        for (PermissionBit op : ops)
         {
-            return false;
-        }
-        if (!gAgent.allowOperation(PERM_COPY, object_permissions, GP_OBJECT_MANIPULATE))
-        {
-            return false;
+            if (!gAgent.allowOperation(op, object_permissions, GP_OBJECT_MANIPULATE))
+            {
+                return false;
+            }
         }
+        // Update flags for new owner
         if (!object_permissions.setOwnerAndGroup(LLUUID::null, gAgent.getID(), LLUUID::null, true))
         {
             llassert(false);
@@ -1865,43 +1886,34 @@ bool can_save_objects_material(LLSelectedTEGetMatData& func, LLPermissions& perm
     }
 
     permissions_out.set(item_permissions);
+    // *NOTE: A close inspection of LLPermissions::accumulate shows that
+    // conflicting UUIDs will be unset. This is acceptable behavior for now.
+    // The server doesn't allow us to create an item while claiming someone
+    // else was the creator/previous owner.
     permissions_out.accumulate(object_permissions);
 
-    if (previous_item_owned != previous_object_owned)
-    {
-        // Likely ownership history conflict. Prefer the item history. Fall
-        // back to object history if no associated item.
-        if (previous_item_owned)
-        {
-            permissions_out.setCreator(item_permissions.getCreator());
-            permissions_out.setLastOwner(item_permissions.getLastOwner());
-        }
-        else if (previous_object_owned)
-        {
-            permissions_out.setCreator(object_permissions.getCreator());
-            permissions_out.setLastOwner(object_permissions.getLastOwner());
-        }
-    }
-
-    llassert(permissions_out.getOwner() == gAgent.getID());
-    llassert(permissions_out.getCreator().notNull());
-    llassert(permissions_out.getGroup().isNull());
-
     return true;
 }
 
+bool LLMaterialEditor::canModifyObjectsMaterial()
+{
+    LLSelectedTEGetMatData func(false);
+    LLPermissions permissions;
+    return can_use_objects_material(func, std::vector({PERM_MODIFY}), permissions);
+}
+
 bool LLMaterialEditor::canSaveObjectsMaterial()
 {
     LLSelectedTEGetMatData func(false);
     LLPermissions permissions;
-    return can_save_objects_material(func, permissions);
+    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions);
 }
 
 void LLMaterialEditor::saveObjectsMaterialAs()
 {
     LLSelectedTEGetMatData func(false);
     LLPermissions permissions;
-    bool allowed = can_save_objects_material(func, permissions);
+    bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions);
     if (!allowed)
     {
         LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
@@ -1986,7 +1998,6 @@ void LLMaterialEditor::saveMaterialAs(const LLGLTFMaterial* render_material, con
     LLSD args;
     args["DESC"] = LLTrans::getString("New Material");
 
-    // At this point, last owner, etc should be set. LLFloaterPerms will be honored later on
     if (local_material)
     {
         LLPermissions local_permissions;
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 5ee42f65f4..54e59fcdf8 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -112,6 +112,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     static void updateLive(const LLUUID &object_id, S32 te);
     static void loadLive();
 
+    static bool canModifyObjectsMaterial();
     static bool canSaveObjectsMaterial();
     static void saveObjectsMaterialAs();
     static void onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions);
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index b9daf19284..90271b75b2 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -51,6 +51,7 @@
 #include "llinventorymodelbackgroundfetch.h"
 #include "llfloatermediasettings.h"
 #include "llfloaterreg.h"
+#include "llfloatertools.h"
 #include "lllineeditor.h"
 #include "llmaterialmgr.h"
 #include "llmaterialeditor.h"
@@ -77,6 +78,7 @@
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llvovolume.h"
+#include "llvoinventorylistener.h"
 #include "lluictrlfactory.h"
 #include "llpluginclassmedia.h"
 #include "llviewertexturelist.h"// Update sel manager as to which channel we're editing so it can reflect the correct overlay UI
@@ -1834,13 +1836,48 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 	}
 }
 
+// One-off listener that updates the build floater UI when the prim inventory updates
+class PBRPickerItemListener : public LLVOInventoryListener
+{
+protected:
+    LLViewerObject* mObjectp;
+public:
+
+    PBRPickerItemListener(LLViewerObject* object)
+    : mObjectp(object)
+    {
+        registerVOInventoryListener(mObjectp, nullptr);
+    }
+
+    const LLViewerObject* const getObject() { return mObjectp; }
+
+    void inventoryChanged(LLViewerObject* object,
+        LLInventoryObject::object_list_t* inventory,
+        S32 serial_num,
+        void* user_data) override
+    {
+        if (gFloaterTools)
+        {
+            gFloaterTools->dirty();
+        }
+        removeVOInventoryListener();
+    }
+
+    ~PBRPickerItemListener()
+    {
+        removeVOInventoryListener();
+    }
+};
+
 void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values)
 {
     has_pbr_material = false;
 
-    const bool editable = objectp->permModify() && !objectp->isPermanentEnforced();
     bool has_pbr_capabilities = LLMaterialEditor::capabilitiesAvailable();
     bool identical_pbr = true;
+    const bool settable = has_pbr_capabilities && objectp->permModify() && !objectp->isPermanentEnforced();
+    const bool editable = LLMaterialEditor::canModifyObjectsMaterial();
+    const bool saveable = LLMaterialEditor::canSaveObjectsMaterial();
 
     // pbr material
     LLTextureCtrl* pbr_ctrl = findChild<LLTextureCtrl>("pbr_control");
@@ -1850,13 +1887,23 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
         LLSelectedTE::getPbrMaterialId(pbr_id, identical_pbr, has_pbr_material, has_faces_without_pbr);
 
         pbr_ctrl->setTentative(identical_pbr ? FALSE : TRUE);
-        pbr_ctrl->setEnabled(editable && has_pbr_capabilities);
+        pbr_ctrl->setEnabled(settable);
         pbr_ctrl->setImageAssetID(pbr_id);
     }
 
-    getChildView("pbr_from_inventory")->setEnabled(editable && has_pbr_capabilities);
-    getChildView("edit_selected_pbr")->setEnabled(editable && has_pbr_material && !has_faces_without_pbr && has_pbr_capabilities);
-    getChildView("save_selected_pbr")->setEnabled(LLMaterialEditor::canSaveObjectsMaterial() && identical_pbr);
+    const bool inventory_pending = objectp->isInventoryPending();
+    getChildView("pbr_from_inventory")->setEnabled(settable);
+    getChildView("edit_selected_pbr")->setEnabled(editable && !inventory_pending && !has_faces_without_pbr);
+    getChildView("save_selected_pbr")->setEnabled(saveable && !inventory_pending && identical_pbr);
+    // TODO: Vet inventory updates and memory management
+    if (inventory_pending && (!mInventoryListener || mInventoryListener->getObject() != objectp))
+    {
+        mInventoryListener = std::make_unique<PBRPickerItemListener>(objectp);
+    }
+    else
+    {
+        mInventoryListener = nullptr;
+    }
 
     const bool show_pbr = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR && mComboMatMedia->getEnabled();
     if (show_pbr)
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index e2d9f65e58..d737665ad0 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -35,6 +35,8 @@
 #include "lltextureentry.h"
 #include "llselectmgr.h"
 
+#include <memory>
+
 class LLButton;
 class LLCheckBoxCtrl;
 class LLColorSwatchCtrl;
@@ -51,6 +53,8 @@ class LLMaterialID;
 class LLMediaCtrl;
 class LLMenuButton;
 
+class PBRPickerItemListener;
+
 // Represents an edit for use in replicating the op across one or more materials in the selection set.
 //
 // The apply function optionally performs the edit which it implements
@@ -503,6 +507,8 @@ private:
 
     static Selection sMaterialOverrideSelection;
 
+    std::unique_ptr<PBRPickerItemListener> mInventoryListener;
+
 public:
 	#if defined(DEF_GET_MAT_STATE)
 		#undef DEF_GET_MAT_STATE
-- 
cgit v1.2.3


From 27842d0c5f34b03f6ce16ebbff0e7cb39d3a4fd8 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 31 Jul 2023 16:30:50 -0700
Subject: SL-20024: Fix material edit/save buttons on build floater sometimes
 not re-enabling after object inventory load

---
 indra/newview/llpanelface.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 90271b75b2..790c693a3d 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1841,6 +1841,7 @@ class PBRPickerItemListener : public LLVOInventoryListener
 {
 protected:
     LLViewerObject* mObjectp;
+    bool mChangePending = true;
 public:
 
     PBRPickerItemListener(LLViewerObject* object)
@@ -1849,7 +1850,10 @@ public:
         registerVOInventoryListener(mObjectp, nullptr);
     }
 
-    const LLViewerObject* const getObject() { return mObjectp; }
+    const bool isListeningFor(const LLViewerObject* objectp) const
+    {
+        return mChangePending && (objectp == mObjectp);
+    }
 
     void inventoryChanged(LLViewerObject* object,
         LLInventoryObject::object_list_t* inventory,
@@ -1861,11 +1865,13 @@ public:
             gFloaterTools->dirty();
         }
         removeVOInventoryListener();
+        mChangePending = false;
     }
 
     ~PBRPickerItemListener()
     {
         removeVOInventoryListener();
+        mChangePending = false;
     }
 };
 
@@ -1893,12 +1899,16 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
 
     const bool inventory_pending = objectp->isInventoryPending();
     getChildView("pbr_from_inventory")->setEnabled(settable);
+    // TODO: Put message on these two buttons when material permissions are still loading
     getChildView("edit_selected_pbr")->setEnabled(editable && !inventory_pending && !has_faces_without_pbr);
     getChildView("save_selected_pbr")->setEnabled(saveable && !inventory_pending && identical_pbr);
-    // TODO: Vet inventory updates and memory management
-    if (inventory_pending && (!mInventoryListener || mInventoryListener->getObject() != objectp))
+    if (inventory_pending)
     {
-        mInventoryListener = std::make_unique<PBRPickerItemListener>(objectp);
+        // Reuse the same listener when possible
+        if (!mInventoryListener || !mInventoryListener->isListeningFor(objectp))
+        {
+            mInventoryListener = std::make_unique<PBRPickerItemListener>(objectp);
+        }
     }
     else
     {
-- 
cgit v1.2.3


From 6c8ced0edd9e2b86914e3e316ba65ae9492d3e6f Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 1 Aug 2023 12:36:49 -0700
Subject: SL-20024: Show loading message when inventory permissions are loading

---
 indra/newview/llpanelface.cpp                            | 15 ++++++++-------
 indra/newview/llpanelface.h                              |  4 ++--
 .../newview/skins/default/xui/en/panel_tools_texture.xml | 16 +++++++++++++++-
 3 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 790c693a3d..21651899db 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1102,7 +1102,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		getChildView("checkbox_sync_settings")->setEnabled(editable);
 		childSetValue("checkbox_sync_settings", gSavedSettings.getBOOL("SyncMaterialSettings"));
 
-		updateVisibility();
+		updateVisibility(objectp);
 
 		// Color swatch
 		{
@@ -1899,7 +1899,6 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
 
     const bool inventory_pending = objectp->isInventoryPending();
     getChildView("pbr_from_inventory")->setEnabled(settable);
-    // TODO: Put message on these two buttons when material permissions are still loading
     getChildView("edit_selected_pbr")->setEnabled(editable && !inventory_pending && !has_faces_without_pbr);
     getChildView("save_selected_pbr")->setEnabled(saveable && !inventory_pending && identical_pbr);
     if (inventory_pending)
@@ -1938,9 +1937,10 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
     }
 }
 
-void LLPanelFace::updateVisibilityGLTF()
+void LLPanelFace::updateVisibilityGLTF(LLViewerObject* objectp /*= nullptr */)
 {
     const bool show_pbr = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR && mComboMatMedia->getEnabled();
+    const bool inventory_pending = objectp && objectp->isInventoryPending();
 
     LLRadioGroup* radio_pbr_type = findChild<LLRadioGroup>("radio_pbr_type");
     radio_pbr_type->setVisible(show_pbr);
@@ -1951,8 +1951,9 @@ void LLPanelFace::updateVisibilityGLTF()
     getChildView("pbr_control")->setVisible(show_pbr_render_material_id);
 
     getChildView("pbr_from_inventory")->setVisible(show_pbr_render_material_id);
-    getChildView("edit_selected_pbr")->setVisible(show_pbr_render_material_id);
-    getChildView("save_selected_pbr")->setVisible(show_pbr_render_material_id);
+    getChildView("edit_selected_pbr")->setVisible(show_pbr_render_material_id && !inventory_pending);
+    getChildView("save_selected_pbr")->setVisible(show_pbr_render_material_id && !inventory_pending);
+    getChildView("material_permissions_loading_label")->setVisible(show_pbr_render_material_id && inventory_pending);
 
     getChildView("gltfTextureScaleU")->setVisible(show_pbr);
     getChildView("gltfTextureScaleV")->setVisible(show_pbr);
@@ -2793,7 +2794,7 @@ void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata)
 	self->refreshMedia();
 }
 
-void LLPanelFace::updateVisibility()
+void LLPanelFace::updateVisibility(LLViewerObject* objectp /* = nullptr */)
 {
     LLRadioGroup* radio_mat_type = findChild<LLRadioGroup>("radio_material_type");
     LLRadioGroup* radio_pbr_type = findChild<LLRadioGroup>("radio_pbr_type");
@@ -2884,7 +2885,7 @@ void LLPanelFace::updateVisibility()
     getChild<LLSpinCtrl>("rptctrl")->setVisible(show_material || show_media);
 
     // PBR controls
-    updateVisibilityGLTF();
+    updateVisibilityGLTF(objectp);
 }
 
 // static
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index d737665ad0..d07be2e4b4 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -296,7 +296,7 @@ private:
 	//
 	// Do NOT call updateUI from within this function.
 	//
-	void updateVisibility();
+	void updateVisibility(LLViewerObject* objectp = nullptr);
 
 	// Hey look everyone, a type-safe alternative to copy and paste! :)
 	//
@@ -457,7 +457,7 @@ private:
     void onPbrSelectionChanged(LLInventoryItem* itemp);
 
     void updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values);
-    void updateVisibilityGLTF();
+    void updateVisibilityGLTF(LLViewerObject* objectp = nullptr);
 
     void updateSelectedGLTFMaterials(std::function<void(LLGLTFMaterial*)> func);
     void updateGLTFTextureTransform(float value, U32 pbr_type, std::function<void(LLGLTFMaterial::TextureTransform*)> edit);
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 51e6099ceb..5b15752eb7 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -284,12 +284,26 @@
              name="pbr_from_inventory"
              label="Choose from inventory"
              width="140"/>
+            <text
+             visible="false"
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             top_pad="4"
+             left_delta="0"
+             name="material_permissions_loading_label"
+             text_readonly_color="LabelDisabledColor"
+             width="160">
+                Loading contents...
+            </text>
             <button
              follows="left|top"
              height="23"
              layout="topleft"
              left_delta="0"
-             top_pad="4"
+             top_delta="0"
              name="edit_selected_pbr"
              label="Edit Selected"
              width="140"/>
-- 
cgit v1.2.3


From 76c8cca9363c0ef55bf66a2bbff4a86a02f37acf Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 7 Aug 2023 14:26:33 -0700
Subject: SL-20024: Fix author attributions not transferring for saved object
 materials, fix item not renamed

---
 indra/newview/llmaterialeditor.cpp  | 178 ++++++++++++++++++++++++++----------
 indra/newview/llmaterialeditor.h    |   6 +-
 indra/newview/llviewerinventory.cpp |  63 +++++++++++++
 indra/newview/llviewerinventory.h   |   4 +
 indra/newview/llviewerobject.cpp    |  11 +++
 indra/newview/llviewerobject.h      |   2 +
 6 files changed, 214 insertions(+), 50 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index af40c9e931..bc3d5b88ab 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -37,6 +37,7 @@
 #include "llfilesystem.h"
 #include "llgltfmateriallist.h"
 #include "llinventorymodel.h"
+#include "llinventoryobserver.h"
 #include "lllocalgltfmaterials.h"
 #include "llnotificationsutil.h"
 #include "lltexturectrl.h"
@@ -323,6 +324,7 @@ bool LLSelectedTEGetMatData::apply(LLViewerObject* objectp, S32 te_index)
             LLLocalGLTFMaterial *local_mat = dynamic_cast<LLLocalGLTFMaterial*>(mat);
 
             mObject = objectp;
+            mObjectId = objectp->getID();
             if (local_mat)
             {
                 mLocalMaterial = local_mat;
@@ -1293,44 +1295,38 @@ bool LLMaterialEditor::updateInventoryItem(const std::string &buffer, const LLUU
     return true;
 }
 
-void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& owner_permissions)
+// Callback intended for when an item is copied from an object's inventory and
+// needs to be modified to reflect the new asset/name. For example: When saving
+// a modified material to the inventory from the build floater.
+class LLObjectsMaterialItemCallback : public LLInventoryCallback
 {
-    // gen a new uuid for this asset
-    LLTransactionID tid;
-    tid.generate();     // timestamp-based randomization + uniquification
-    LLPermissions final_perm;
+public:
+    LLObjectsMaterialItemCallback(const LLPermissions& permissions, const std::string& asset_data, const std::string& new_name)
+        : mPermissions(permissions),
+        mAssetData(asset_data),
+        mNewName(new_name)
     {
-        final_perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
-
-        LLPermissions floater_perm;
-        floater_perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
-        floater_perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Materials"));
-        floater_perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Materials"));
-        floater_perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("Materials"));
-
-        final_perm.accumulate(floater_perm);
-        final_perm.accumulate(owner_permissions);
     }
-    // NOTE: create_inventory_item doesn't allow presetting some permissions.
-    // The rest will be fixed after the callback.
-    LLUUID parent = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_MATERIAL);
-    const U8 subtype = NO_INV_SUBTYPE;  // TODO maybe use AT_SETTINGS and LLSettingsType::ST_MATERIAL ?
 
-    create_inventory_item(gAgent.getID(), gAgent.getSessionID(), parent, tid, name, desc,
-        LLAssetType::AT_MATERIAL, LLInventoryType::IT_MATERIAL, subtype, final_perm.getMaskNextOwner(),
-        new LLBoostFuncInventoryCallback([output = buffer, final_perm](LLUUID const& inv_item_id)
+    void fire(const LLUUID& inv_item_id) override
     {
         LLViewerInventoryItem* item = gInventory.getItem(inv_item_id);
-        if (item)
+        if (!item)
         {
-            // create_inventory_item doesn't allow presetting some permissions, fix it now
-            LLPermissions perm = item->getPermissions();
-            perm.accumulate(final_perm);
-            item->setPermissions(perm);
+            return;
+        }
 
-            item->updateServer(FALSE);
-            gInventory.updateItem(item);
-            gInventory.notifyObservers();
+        // create_inventory_item/copy_inventory_item don't allow presetting some permissions, fix it now
+        item->setPermissions(mPermissions);
+        item->updateServer(FALSE);
+        gInventory.updateItem(item);
+        gInventory.notifyObservers();
+
+        if (item->getName() != mNewName)
+        {
+            LLSD updates;
+            updates["name"] = mNewName;
+            update_inventory_item(inv_item_id, updates, NULL);
         }
 
         // from reference in LLSettingsVOBase::createInventoryItem()/updateInventoryItem()
@@ -1338,7 +1334,7 @@ void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std:
             std::make_shared<LLBufferedAssetUploadInfo>(
                 inv_item_id,
                 LLAssetType::AT_MATERIAL,
-                output,
+                mAssetData,
                 [](LLUUID item_id, LLUUID new_asset_id, LLUUID new_item_id, LLSD response)
                 {
                     // done callback
@@ -1357,8 +1353,25 @@ void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std:
             }
             LLViewerAssetUpload::EnqueueInventoryUpload(agent_url, uploadInfo);
         }
-    })
-    );
+    }
+private:
+    LLPermissions mPermissions;
+    std::string mAssetData;
+    std::string mNewName;
+};
+
+void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& permissions)
+{
+    // gen a new uuid for this asset
+    LLTransactionID tid;
+    tid.generate();     // timestamp-based randomization + uniquification
+    LLUUID parent = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_MATERIAL);
+    const U8 subtype = NO_INV_SUBTYPE;  // TODO maybe use AT_SETTINGS and LLSettingsType::ST_MATERIAL ?
+
+    LLPointer<LLObjectsMaterialItemCallback> cb = new LLObjectsMaterialItemCallback(permissions, buffer, name);
+    create_inventory_item(gAgent.getID(), gAgent.getSessionID(), parent, tid, name, desc,
+        LLAssetType::AT_MATERIAL, LLInventoryType::IT_MATERIAL, subtype, permissions.getMaskNextOwner(),
+        cb);
 }
 
 void LLMaterialEditor::finishInventoryUpload(LLUUID itemId, LLUUID newAssetId, LLUUID newItemId)
@@ -1807,10 +1820,8 @@ void LLMaterialEditor::loadLive()
     }
 }
 
-// *NOTE: permissions_out ignores user preferences for new item creation. See
-// LLFloaterPerms.  Preferences are applied later on in
-// LLMaterialEditor::createInventoryItem.
-bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<PermissionBit>& ops, LLPermissions& permissions_out)
+// *NOTE: permissions_out includes user preferences for new item creation (LLFloaterPerms)
+bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<PermissionBit>& ops, LLPermissions& permissions_out, LLViewerInventoryItem*& item_out)
 {
     if (!LLMaterialEditor::capabilitiesAvailable())
     {
@@ -1834,12 +1845,12 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe
         }
     }
 
-    const LLViewerInventoryItem* item = selected_object->getInventoryItemByAsset(func.mMaterialId);
+    item_out = selected_object->getInventoryItemByAsset(func.mMaterialId);
 
     LLPermissions item_permissions;
-    if (item)
+    if (item_out)
     {
-        item_permissions.set(item->getPermissions());
+        item_permissions.set(item_out->getPermissions());
         for (PermissionBit op : ops)
         {
             if (!gAgent.allowOperation(op, item_permissions, GP_OBJECT_MANIPULATE))
@@ -1885,12 +1896,19 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe
         object_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
     }
 
+    LLPermissions floater_perm;
+    floater_perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+    floater_perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Materials"));
+    floater_perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Materials"));
+    floater_perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("Materials"));
+
     permissions_out.set(item_permissions);
     // *NOTE: A close inspection of LLPermissions::accumulate shows that
     // conflicting UUIDs will be unset. This is acceptable behavior for now.
-    // The server doesn't allow us to create an item while claiming someone
-    // else was the creator/previous owner.
+    // The server will populate creator info based on the item creation method
+    // used.
     permissions_out.accumulate(object_permissions);
+    permissions_out.accumulate(floater_perm);
 
     return true;
 }
@@ -1899,30 +1917,34 @@ bool LLMaterialEditor::canModifyObjectsMaterial()
 {
     LLSelectedTEGetMatData func(false);
     LLPermissions permissions;
-    return can_use_objects_material(func, std::vector({PERM_MODIFY}), permissions);
+    LLViewerInventoryItem* item_out;
+    return can_use_objects_material(func, std::vector({PERM_MODIFY}), permissions, item_out);
 }
 
 bool LLMaterialEditor::canSaveObjectsMaterial()
 {
     LLSelectedTEGetMatData func(false);
     LLPermissions permissions;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions);
+    LLViewerInventoryItem* item_out;
+    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions, item_out);
 }
 
 void LLMaterialEditor::saveObjectsMaterialAs()
 {
     LLSelectedTEGetMatData func(false);
     LLPermissions permissions;
-    bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions);
+    LLViewerInventoryItem* item = nullptr;
+    bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions, item);
     if (!allowed)
     {
         LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
         return;
     }
-    saveMaterialAs(func.mMaterial, func.mLocalMaterial, permissions);
+    saveObjectsMaterialAs(func.mMaterial, func.mLocalMaterial, permissions, func.mObjectId, item);
 }
 
-void LLMaterialEditor::saveMaterialAs(const LLGLTFMaterial* render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions)
+
+void LLMaterialEditor::saveObjectsMaterialAs(const LLGLTFMaterial* render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions, const LLUUID& object_id, LLViewerInventoryItem* item) // TODO: item should probably just be an ID at this point
 {
     if (local_material)
     {
@@ -2006,10 +2028,65 @@ void LLMaterialEditor::saveMaterialAs(const LLGLTFMaterial* render_material, con
     }
     else
     {
-        LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback, _1, _2, permissions));
+        if (item)
+        {
+            // Copy existing item from object inventory, and create new composite asset on top of it
+            LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onCopyObjectsMaterialAsMsgCallback, _1, _2, permissions, object_id, item->getUUID()));
+        }
+        else
+        {
+            LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback, _1, _2, permissions));
+        }
     }
 }
 
+// static
+void LLMaterialEditor::onCopyObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions, const LLUUID& object_id, const LLUUID& item_id)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (0 == option)
+    {
+        LLSD asset;
+        asset["version"] = LLGLTFMaterial::ASSET_VERSION;
+        asset["type"] = LLGLTFMaterial::ASSET_TYPE;
+        // This is the string serialized from LLGLTFMaterial::asJSON
+        asset["data"] = notification["payload"]["data"];
+
+        std::ostringstream str;
+        LLSDSerialize::serialize(asset, str, LLSDSerialize::LLSD_BINARY);
+
+        LLViewerObject* object = gObjectList.findObject(object_id);
+        if (!object)
+        {
+            return;
+        }
+        const LLInventoryItem* item = object->getInventoryItem(item_id);
+        if (!item)
+        {
+            return;
+        }
+
+        std::string new_name = response["message"].asString();
+        LLInventoryObject::correctInventoryName(new_name);
+        if (new_name.empty())
+        {
+            return;
+        }
+
+        const LLUUID destination_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MATERIAL);
+
+        // TODO: Test
+        // TODO: Rename the item
+        LLPointer<LLInventoryCallback> cb = new LLObjectsMaterialItemCallback(permissions, str.str(), new_name);
+        // NOTE: This should be an item copy. Saving a material to an inventory should be disabled when the associated material is no-copy.
+        move_or_copy_inventory_from_object(destination_id,
+                                           object_id,
+                                           item_id,
+                                           cb);
+    }
+}
+
+// static
 void LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
@@ -2025,6 +2102,11 @@ void LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback(const LLSD& notificati
         LLSDSerialize::serialize(asset, str, LLSDSerialize::LLSD_BINARY);
 
         std::string new_name = response["message"].asString();
+        LLInventoryObject::correctInventoryName(new_name);
+        if (new_name.empty())
+        {
+            return;
+        }
         createInventoryItem(str.str(), new_name, std::string(), permissions);
     }
 }
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 54e59fcdf8..2176f493a9 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -38,6 +38,7 @@ class LLGLTFMaterial;
 class LLLocalGLTFMaterial;
 class LLTextureCtrl;
 class LLTextBox;
+class LLViewerInventoryItem;
 
 namespace tinygltf
 {
@@ -115,6 +116,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     static bool canModifyObjectsMaterial();
     static bool canSaveObjectsMaterial();
     static void saveObjectsMaterialAs();
+    static void onCopyObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions, const LLUUID& object_id, const LLUUID& item_id);
     static void onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions);
 
     static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status);
@@ -230,10 +232,10 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     static bool capabilitiesAvailable();
 
 private:
-    static void saveMaterialAs(const LLGLTFMaterial *render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions);
+    static void saveObjectsMaterialAs(const LLGLTFMaterial *render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions, const LLUUID& object_id /* = LLUUID::null */, LLViewerInventoryItem* item /* = nullptr */);
 
     static bool updateInventoryItem(const std::string &buffer, const LLUUID &item_id, const LLUUID &task_id);
-    static void createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& owner_permissions);
+    static void createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& permissions);
 
     void setFromGLTFMaterial(LLGLTFMaterial* mat);
     bool setFromSelection();
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 518967709d..b722e715b6 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1604,6 +1604,69 @@ void copy_inventory_from_notecard(const LLUUID& destination_id,
     }
 }
 
+void move_or_copy_inventory_from_object(const LLUUID& destination_id,
+                                        const LLUUID& object_id,
+                                        const LLUUID& item_id,
+                                        LLPointer<LLInventoryCallback> cb)
+{
+    // TODO: Implement
+
+    LLViewerObject* object = gObjectList.findObject(object_id);
+    if (!object)
+    {
+        return;
+    }
+    const LLInventoryItem* item = object->getInventoryItem(item_id);
+    if (!item)
+    {
+        return;
+    }
+
+    class LLItemAddedObserver : public LLInventoryObserver
+    {
+    public:
+        LLItemAddedObserver(const LLUUID& copied_asset_id, LLPointer<LLInventoryCallback> cb)
+        : LLInventoryObserver(),
+          mAssetId(copied_asset_id),
+          mCallback(cb)
+        {
+        }
+
+        void changed(U32 mask) override
+        {
+            if((mask & (LLInventoryObserver::ADD)) == 0)
+            {
+                return;
+            }
+            for (const LLUUID& changed_id : gInventory.getChangedIDs())
+            {
+                LLViewerInventoryItem* changed_item = gInventory.getItem(changed_id);
+                if (changed_item->getAssetUUID() == mAssetId)
+                {
+                    changeComplete(changed_item->getUUID());
+                    return;
+                }
+            }
+        }
+
+    private:
+        void changeComplete(const LLUUID& item_id)
+        {
+			mCallback->fire(item_id);
+            gInventory.removeObserver(this);
+            delete this;
+        }
+
+        LLUUID mAssetId;
+        LLPointer<LLInventoryCallback> mCallback;
+    };
+
+	const LLUUID& asset_id = item->getAssetUUID();
+    LLItemAddedObserver* observer = new LLItemAddedObserver(asset_id, cb);
+    gInventory.addObserver(observer);
+    object->moveInventory(destination_id, item_id);
+}
+
 void create_new_item(const std::string& name,
 				   const LLUUID& parent_id,
 				   LLAssetType::EType asset_type,
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 24b632632b..6c0f1b8d07 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -439,6 +439,10 @@ void copy_inventory_from_notecard(const LLUUID& destination_id,
 								  const LLInventoryItem *src,
 								  U32 callback_id = 0);
 
+void move_or_copy_inventory_from_object(const LLUUID& destination_id,
+                                        const LLUUID& object_id,
+                                        const LLUUID& item_id,
+                                        LLPointer<LLInventoryCallback> cb);
 
 void menu_create_inventory_item(LLInventoryPanel* root,
 								LLFolderBridge* bridge,
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d21d6f7027..69e62ace97 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3610,6 +3610,17 @@ LLInventoryObject* LLViewerObject::getInventoryObject(const LLUUID& item_id)
 	return rv;
 }
 
+LLInventoryItem* LLViewerObject::getInventoryItem(const LLUUID& item_id)
+{
+	LLInventoryObject* iobj = getInventoryObject(item_id);
+	if (!iobj || iobj->getType() == LLAssetType::AT_CATEGORY)
+	{
+		return NULL;
+	}
+	LLInventoryItem* item = dynamic_cast<LLInventoryItem*>(iobj);
+	return item;
+}
+
 void LLViewerObject::getInventoryContents(LLInventoryObject::object_list_t& objects)
 {
 	if(mInventory)
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 3665c64965..ff28937f81 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -494,6 +494,8 @@ public:
 	void updateInventoryLocal(LLInventoryItem* item, U8 key); // Update without messaging.
 	void updateMaterialInventory(LLViewerInventoryItem* item, U8 key, bool is_new);
 	LLInventoryObject* getInventoryObject(const LLUUID& item_id);
+	// TODO: Decide if this is worth keeping - Returns NULL if item does not exist or is a category
+	LLInventoryItem* getInventoryItem(const LLUUID& item_id);
 
 	// Get content except for root category
 	void getInventoryContents(LLInventoryObject::object_list_t& objects);
-- 
cgit v1.2.3


From 57cc252fd6e3956d53da3c4eb4cad512ddf75e8c Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 7 Aug 2023 16:31:03 -0700
Subject: SL-20024: Miscellaneous cleanup

---
 indra/newview/llmaterialeditor.cpp  | 110 +++++++++++++++++++-----------------
 indra/newview/llmaterialeditor.h    |   2 +-
 indra/newview/llviewerinventory.cpp |   2 -
 indra/newview/llviewerobject.h      |   1 -
 4 files changed, 58 insertions(+), 57 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index bc3d5b88ab..989f18f1f4 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1940,11 +1940,12 @@ void LLMaterialEditor::saveObjectsMaterialAs()
         LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
         return;
     }
-    saveObjectsMaterialAs(func.mMaterial, func.mLocalMaterial, permissions, func.mObjectId, item);
+    const LLUUID item_id = item ? item->getUUID() : LLUUID::null;
+    saveObjectsMaterialAs(func.mMaterial, func.mLocalMaterial, permissions, func.mObjectId, item_id);
 }
 
 
-void LLMaterialEditor::saveObjectsMaterialAs(const LLGLTFMaterial* render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions, const LLUUID& object_id, LLViewerInventoryItem* item) // TODO: item should probably just be an ID at this point
+void LLMaterialEditor::saveObjectsMaterialAs(const LLGLTFMaterial* render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions, const LLUUID& object_id, const LLUUID& item_id)
 {
     if (local_material)
     {
@@ -2028,10 +2029,10 @@ void LLMaterialEditor::saveObjectsMaterialAs(const LLGLTFMaterial* render_materi
     }
     else
     {
-        if (item)
+        if (item_id.notNull())
         {
             // Copy existing item from object inventory, and create new composite asset on top of it
-            LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onCopyObjectsMaterialAsMsgCallback, _1, _2, permissions, object_id, item->getUUID()));
+            LLNotificationsUtil::add("SaveMaterialAs", args, payload, boost::bind(&LLMaterialEditor::onCopyObjectsMaterialAsMsgCallback, _1, _2, permissions, object_id, item_id));
         }
         else
         {
@@ -2044,71 +2045,74 @@ void LLMaterialEditor::saveObjectsMaterialAs(const LLGLTFMaterial* render_materi
 void LLMaterialEditor::onCopyObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions, const LLUUID& object_id, const LLUUID& item_id)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    if (0 == option)
+    if (0 != option)
     {
-        LLSD asset;
-        asset["version"] = LLGLTFMaterial::ASSET_VERSION;
-        asset["type"] = LLGLTFMaterial::ASSET_TYPE;
-        // This is the string serialized from LLGLTFMaterial::asJSON
-        asset["data"] = notification["payload"]["data"];
-
-        std::ostringstream str;
-        LLSDSerialize::serialize(asset, str, LLSDSerialize::LLSD_BINARY);
+        return;
+    }
 
-        LLViewerObject* object = gObjectList.findObject(object_id);
-        if (!object)
-        {
-            return;
-        }
-        const LLInventoryItem* item = object->getInventoryItem(item_id);
-        if (!item)
-        {
-            return;
-        }
+    LLSD asset;
+    asset["version"] = LLGLTFMaterial::ASSET_VERSION;
+    asset["type"] = LLGLTFMaterial::ASSET_TYPE;
+    // This is the string serialized from LLGLTFMaterial::asJSON
+    asset["data"] = notification["payload"]["data"];
 
-        std::string new_name = response["message"].asString();
-        LLInventoryObject::correctInventoryName(new_name);
-        if (new_name.empty())
-        {
-            return;
-        }
+    std::ostringstream str;
+    LLSDSerialize::serialize(asset, str, LLSDSerialize::LLSD_BINARY);
 
-        const LLUUID destination_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MATERIAL);
+    LLViewerObject* object = gObjectList.findObject(object_id);
+    if (!object)
+    {
+        return;
+    }
+    const LLInventoryItem* item = object->getInventoryItem(item_id);
+    if (!item)
+    {
+        return;
+    }
 
-        // TODO: Test
-        // TODO: Rename the item
-        LLPointer<LLInventoryCallback> cb = new LLObjectsMaterialItemCallback(permissions, str.str(), new_name);
-        // NOTE: This should be an item copy. Saving a material to an inventory should be disabled when the associated material is no-copy.
-        move_or_copy_inventory_from_object(destination_id,
-                                           object_id,
-                                           item_id,
-                                           cb);
+    std::string new_name = response["message"].asString();
+    LLInventoryObject::correctInventoryName(new_name);
+    if (new_name.empty())
+    {
+        return;
     }
+
+    const LLUUID destination_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MATERIAL);
+
+    LLPointer<LLInventoryCallback> cb = new LLObjectsMaterialItemCallback(permissions, str.str(), new_name);
+    // NOTE: This should be an item copy. Saving a material to an inventory should be disabled when the associated material is no-copy.
+    move_or_copy_inventory_from_object(destination_id,
+                                       object_id,
+                                       item_id,
+                                       cb);
 }
 
 // static
 void LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    if (0 == option)
+    if (0 != option)
     {
-        LLSD asset;
-        asset["version"] = LLGLTFMaterial::ASSET_VERSION;
-        asset["type"] = LLGLTFMaterial::ASSET_TYPE;
-        // This is the string serialized from LLGLTFMaterial::asJSON
-        asset["data"] = notification["payload"]["data"];
+        return;
+    }
+
+    LLSD asset;
+    asset["version"] = LLGLTFMaterial::ASSET_VERSION;
+    asset["type"] = LLGLTFMaterial::ASSET_TYPE;
+    // This is the string serialized from LLGLTFMaterial::asJSON
+    asset["data"] = notification["payload"]["data"];
 
-        std::ostringstream str;
-        LLSDSerialize::serialize(asset, str, LLSDSerialize::LLSD_BINARY);
+    std::ostringstream str;
+    LLSDSerialize::serialize(asset, str, LLSDSerialize::LLSD_BINARY);
 
-        std::string new_name = response["message"].asString();
-        LLInventoryObject::correctInventoryName(new_name);
-        if (new_name.empty())
-        {
-            return;
-        }
-        createInventoryItem(str.str(), new_name, std::string(), permissions);
+    std::string new_name = response["message"].asString();
+    LLInventoryObject::correctInventoryName(new_name);
+    if (new_name.empty())
+    {
+        return;
     }
+
+    createInventoryItem(str.str(), new_name, std::string(), permissions);
 }
 
 const void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter type);
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 2176f493a9..6b2f49e2fc 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -232,7 +232,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     static bool capabilitiesAvailable();
 
 private:
-    static void saveObjectsMaterialAs(const LLGLTFMaterial *render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions, const LLUUID& object_id /* = LLUUID::null */, LLViewerInventoryItem* item /* = nullptr */);
+    static void saveObjectsMaterialAs(const LLGLTFMaterial *render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions, const LLUUID& object_id /* = LLUUID::null */, const LLUUID& item /* = LLUUID::null */);
 
     static bool updateInventoryItem(const std::string &buffer, const LLUUID &item_id, const LLUUID &task_id);
     static void createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& permissions);
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index b722e715b6..aa1827a8e2 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1609,8 +1609,6 @@ void move_or_copy_inventory_from_object(const LLUUID& destination_id,
                                         const LLUUID& item_id,
                                         LLPointer<LLInventoryCallback> cb)
 {
-    // TODO: Implement
-
     LLViewerObject* object = gObjectList.findObject(object_id);
     if (!object)
     {
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index ff28937f81..898b21e1ae 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -494,7 +494,6 @@ public:
 	void updateInventoryLocal(LLInventoryItem* item, U8 key); // Update without messaging.
 	void updateMaterialInventory(LLViewerInventoryItem* item, U8 key, bool is_new);
 	LLInventoryObject* getInventoryObject(const LLUUID& item_id);
-	// TODO: Decide if this is worth keeping - Returns NULL if item does not exist or is a category
 	LLInventoryItem* getInventoryItem(const LLUUID& item_id);
 
 	// Get content except for root category
-- 
cgit v1.2.3


From 076a02e2d8ddb10856602c3f5f3115ace41327b5 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 7 Aug 2023 17:27:30 -0700
Subject: SL-20024: Strike a better balance with saved material permissions
 handling, w/r/t author intent and being easier to understand

---
 indra/newview/llmaterialeditor.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 989f18f1f4..41df58914b 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1295,9 +1295,8 @@ bool LLMaterialEditor::updateInventoryItem(const std::string &buffer, const LLUU
     return true;
 }
 
-// Callback intended for when an item is copied from an object's inventory and
-// needs to be modified to reflect the new asset/name. For example: When saving
-// a modified material to the inventory from the build floater.
+// Callback intended for when a material is saved from an object and needs to
+// be modified to reflect the new asset/name.
 class LLObjectsMaterialItemCallback : public LLInventoryCallback
 {
 public:
@@ -1902,12 +1901,22 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe
     floater_perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Materials"));
     floater_perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("Materials"));
 
-    permissions_out.set(item_permissions);
     // *NOTE: A close inspection of LLPermissions::accumulate shows that
     // conflicting UUIDs will be unset. This is acceptable behavior for now.
     // The server will populate creator info based on the item creation method
     // used.
-    permissions_out.accumulate(object_permissions);
+    // *NOTE: As far as I'm aware, there is currently no good way to preserve
+    // creation history when there's no material item present. In that case,
+    // the agent who saved the material will be considered the creator.
+    // -Cosmic,2023-08-07
+    if (item_out)
+    {
+        permissions_out.set(item_permissions);
+    }
+    else
+    {
+        permissions_out.set(object_permissions);
+    }
     permissions_out.accumulate(floater_perm);
 
     return true;
-- 
cgit v1.2.3


From 466914e122f201e62d8e969dcc684791e06333d3 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 11 Aug 2023 17:18:06 -0700
Subject: SL-20024: Double-check object inventory is not pending when save
 button pressed

---
 indra/newview/llmaterialeditor.cpp | 4 ++++
 indra/newview/llpanelface.cpp      | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 41df58914b..92042ad49f 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1836,6 +1836,10 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe
         llassert(LLSelectMgr::getInstance()->getSelection()->getFirstObject());
         return false;
     }
+    if (selected_object->isInventoryPending())
+    {
+        return false;
+    }
     for (PermissionBit op : ops)
     {
         if (op == PERM_MODIFY && selected_object->isPermanentEnforced())
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 21651899db..8f09136ccf 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1897,11 +1897,10 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
         pbr_ctrl->setImageAssetID(pbr_id);
     }
 
-    const bool inventory_pending = objectp->isInventoryPending();
     getChildView("pbr_from_inventory")->setEnabled(settable);
-    getChildView("edit_selected_pbr")->setEnabled(editable && !inventory_pending && !has_faces_without_pbr);
-    getChildView("save_selected_pbr")->setEnabled(saveable && !inventory_pending && identical_pbr);
-    if (inventory_pending)
+    getChildView("edit_selected_pbr")->setEnabled(editable && !has_faces_without_pbr);
+    getChildView("save_selected_pbr")->setEnabled(saveable && identical_pbr);
+    if (objectp->isInventoryPending())
     {
         // Reuse the same listener when possible
         if (!mInventoryListener || !mInventoryListener->isListeningFor(objectp))
-- 
cgit v1.2.3


From 809ebe7d6a98ec2ed450f3fd0bdb95dc8bd648cd Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 14 Aug 2023 20:07:46 +0300
Subject: SL-20143 Alpha thumbnails should show solid color instead of
 checkerboard

---
 indra/newview/llthumbnailctrl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
index 340dba3717..04130fc724 100644
--- a/indra/newview/llthumbnailctrl.cpp
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -100,7 +100,8 @@ void LLThumbnailCtrl::draw()
     {
         if( mTexturep->getComponents() == 4 )
         {
-            gl_rect_2d_checkerboard( draw_rect, alpha );
+            const LLColor4 color(.098f, .098f, .098f);
+            gl_rect_2d( draw_rect, color, TRUE);
         }
         
         gl_draw_scaled_image( draw_rect.mLeft, draw_rect.mBottom, draw_rect.getWidth(), draw_rect.getHeight(), mTexturep, UI_VERTEX_COLOR % alpha);
-- 
cgit v1.2.3


From fa5af90e30aaaf638d5083dff6258a66da06c00c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 15 Aug 2023 00:00:40 +0300
Subject: SL-18629 Fix observers failing to start fetching items in some cases

start(folder.first) ignored fetch request due to folder having version
---
 indra/newview/llinventoryobserver.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 0b02528246..0d96c7a005 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -266,8 +266,8 @@ void LLInventoryFetchItemsObserver::startFetch()
 
 	LLSD items_llsd;
 
-    typedef std::map<LLUUID, uuid_vec_t> requests_by_fodlers_t;
-    requests_by_fodlers_t requests;
+    typedef std::map<LLUUID, uuid_vec_t> requests_by_folders_t;
+    requests_by_folders_t requests;
 	for (uuid_vec_t::const_iterator it = mIDs.begin(); it < mIDs.end(); ++it)
 	{
         LLViewerInventoryItem* item = gInventory.getItem(*it);
@@ -335,12 +335,19 @@ void LLInventoryFetchItemsObserver::startFetch()
     if (aisv3)
     {
         const S32 MAX_INDIVIDUAL_REQUESTS = 10;
-        for (requests_by_fodlers_t::value_type &folder : requests)
+        for (requests_by_folders_t::value_type &folder : requests)
         {
+            LLViewerInventoryCategory* cat = gInventory.getCategory(folder.first);
             if (folder.second.size() > MAX_INDIVIDUAL_REQUESTS)
             {
                 // requesting one by one will take a while
                 // do whole folder
+                if (cat)
+                {
+                    // Either drop version or use scheduleFolderFetch to force-fetch
+                    // otherwise background fetch will ignore folders with set version
+                    cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
+                }
                 LLInventoryModelBackgroundFetch::getInstance()->start(folder.first);
             }
             else
@@ -355,7 +362,8 @@ void LLInventoryFetchItemsObserver::startFetch()
                     }
                     else if (cat->getViewerDescendentCount() <= folder.second.size())
                     {
-                        // start fetching whole folder since we need all items
+                        // Start fetching whole folder since we need all items
+                        // Drop version or use scheduleFolderFetch
                         cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
                         cat->fetch();
 
-- 
cgit v1.2.3


From f4d25ca795aed6ab4ad5d024d981ed7ed75710d4 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 14 Aug 2023 17:13:38 -0700
Subject: SL-20024: Remove misleading permissions comment left over from
 previous implementation

---
 indra/llinventory/llpermissions.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 32fae844fb..27252f7b97 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -251,9 +251,7 @@ public:
 	BOOL setNextOwnerBits(const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits);
 	
 	// This is currently only used in the Viewer to handle calling cards
-	// where the creator is actually used to store the target.
-	// It is also used for saving a GLTF material on a prim.
-	// Use with care.
+	// where the creator is actually used to store the target. Use with care.
 	void setCreator(const LLUUID& creator) { mCreator = creator; }
 	
 	//
-- 
cgit v1.2.3


From 465632214aad5e9979d12247149aa716a23d6899 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 14 Aug 2023 17:18:52 -0700
Subject: SL-20024: Fix inventory not marked dirty for drag and drop if copy
 permission bit is unset

---
 indra/newview/lltooldraganddrop.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 23a6634154..afcdb26f1a 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1012,8 +1012,12 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 		{
 			hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
 		}
- 		// TODO: Check to see if adding the item was successful; if not, then
-		// we should return false here.
+		// Force the object to update and refetch its inventory so it has this asset.
+		hit_obj->dirtyInventory();
+		hit_obj->requestInventory();
+		// TODO: Check to see if adding the item was successful; if not, then
+		// we should return false here. This will requre a separate listener
+		// since without listener, we have no way to receive update
 	}
 	else if (!item->getPermissions().allowOperationBy(PERM_TRANSFER,
 													 gAgent.getID()))
-- 
cgit v1.2.3


From 00e7311960e6ae9f951355db243c6787bc7132d9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 16 Aug 2023 16:39:50 +0300
Subject: SL-20151 allow right-clicking reflection probes if 'Select Reflection
 Probes' is enabled

---
 indra/newview/lltoolpie.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 84cc3f03c2..935d61f7ea 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -183,11 +183,15 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 // an item.
 BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
+    BOOL pick_reflection_probe = gSavedSettings.getBOOL("SelectReflectionProbes");
+
 	// don't pick transparent so users can't "pay" transparent objects
 	mPick = gViewerWindow->pickImmediate(x, y,
                                          /*BOOL pick_transparent*/ FALSE,
                                          /*BOOL pick_rigged*/ TRUE,
-                                         /*BOOL pick_particle*/ TRUE);
+                                         /*BOOL pick_particle*/ TRUE,
+                                         /*BOOL pick_unselectable*/ TRUE, 
+                                         pick_reflection_probe);
 	mPick.mKeyMask = mask;
 
 	// claim not handled so UI focus stays same
-- 
cgit v1.2.3


From 74a1d2582c457aff738bf73c21e137015acfe6cb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 17 Aug 2023 19:49:37 +0300
Subject: SL-20162 Better cof version logging

And fixed some typos
---
 indra/newview/llaisapi.cpp                        | 4 ++--
 indra/newview/llinventorymodelbackgroundfetch.cpp | 8 ++++----
 indra/newview/llpanellandmarkinfo.cpp             | 4 ++--
 indra/newview/llpanellandmarkinfo.h               | 2 +-
 indra/newview/llvoavatar.cpp                      | 9 ++++++++-
 5 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 4546574955..d8d30037c8 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -1646,7 +1646,7 @@ void AISUpdate::doUpdate()
 		gInventory.updateCategory(new_category, LLInventoryObserver::CREATE);
 		LL_DEBUGS("Inventory") << "created category " << category_id << LL_ENDL;
 
-        // fetching can receive massive amount of items and fodlers
+        // fetching can receive massive amount of items and folders
         if (gInventory.getChangedIDs().size() > MAX_UPDATE_BACKLOG)
         {
             gInventory.notifyObservers();
@@ -1707,7 +1707,7 @@ void AISUpdate::doUpdate()
 		LL_DEBUGS("Inventory") << "created item " << item_id << LL_ENDL;
 		gInventory.updateItem(new_item, LLInventoryObserver::CREATE);
 
-        // fetching can receive massive amount of items and fodlers
+        // fetching can receive massive amount of items and folders
         if (gInventory.getChangedIDs().size() > MAX_UPDATE_BACKLOG)
         {
             gInventory.notifyObservers();
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 03205cfbda..44eccd955e 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -657,7 +657,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
         || mLastFetchCount != mFetchCount) // if anything was substracted
     {
         LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << mLastFetchCount << "->" << last_fetch_count << "->" << mFetchCount
-            << ", scheduled fodler fetches: " << (S32)mFetchFolderQueue.size()
+            << ", scheduled folder fetches: " << (S32)mFetchFolderQueue.size()
             << ", scheduled item fetches: " << (S32)mFetchItemQueue.size()
             << LL_ENDL;
         mLastFetchCount = mFetchCount;
@@ -1384,10 +1384,10 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
             while (iter != end)
             {
                 folders.append(*iter);
-                LLUUID fodler_id = iter->get("folder_id").asUUID();
-                if (std::find(mRecursiveCatUUIDs.begin(), mRecursiveCatUUIDs.end(), fodler_id) != mRecursiveCatUUIDs.end())
+                LLUUID folder_id = iter->get("folder_id").asUUID();
+                if (std::find(mRecursiveCatUUIDs.begin(), mRecursiveCatUUIDs.end(), folder_id) != mRecursiveCatUUIDs.end())
                 {
-                    recursive_cats.push_back(fodler_id);
+                    recursive_cats.push_back(folder_id);
                 }
                 if (folders.size() == (S32)(size / 2))
                 {
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index 834e664723..cc3c51dd83 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -111,9 +111,9 @@ void LLPanelLandmarkInfo::setInfoType(EInfoType type)
 }
 
 // Sets CREATE_LANDMARK infotype and creates landmark at desired folder
-void LLPanelLandmarkInfo::setInfoAndCreateLandmark(const LLUUID& fodler_id)
+void LLPanelLandmarkInfo::setInfoAndCreateLandmark(const LLUUID& folder_id)
 {
-    setInfoType(CREATE_LANDMARK, fodler_id);
+    setInfoType(CREATE_LANDMARK, folder_id);
 }
 
 void LLPanelLandmarkInfo::setInfoType(EInfoType type, const LLUUID &folder_id)
diff --git a/indra/newview/llpanellandmarkinfo.h b/indra/newview/llpanellandmarkinfo.h
index 46e2a1935b..8802ce066e 100644
--- a/indra/newview/llpanellandmarkinfo.h
+++ b/indra/newview/llpanellandmarkinfo.h
@@ -48,7 +48,7 @@ public:
 	/*virtual*/ void setInfoType(EInfoType type);
 
     // Sets CREATE_LANDMARK infotype and creates landmark at desired folder
-    void setInfoAndCreateLandmark(const LLUUID& fodler_id);
+    void setInfoAndCreateLandmark(const LLUUID& folder_id);
 
 	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 305c489cc8..57a78181bd 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -9447,7 +9447,14 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 	// RequestAgentUpdateAppearanceResponder::onRequestRequested()
 	// assumes that cof version is only updated with server-bake
 	// appearance messages.
-    LL_INFOS("Avatar") << "Processing appearance message version " << thisAppearanceVersion << LL_ENDL;
+    if (isSelf())
+    {
+        LL_INFOS("Avatar") << "Processing appearance message version " << thisAppearanceVersion << LL_ENDL;
+    }
+    else
+    {
+        LL_INFOS("Avatar") << "Processing appearance message for " << getID() << ", version " << thisAppearanceVersion << LL_ENDL;
+    }
 
     // Note:
     // locally the COF is maintained via LLInventoryModel::accountForUpdate
-- 
cgit v1.2.3


From 78d66efe1a60ad599ede4e459fb04bb9cb962404 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Aug 2023 00:57:15 +0300
Subject: SL-20143 Alpha thumbnails should show solid color instead of
 checkerboard #2

---
 indra/newview/llinspecttexture.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index 82676bced8..da4e3c0949 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -140,8 +140,11 @@ void LLTexturePreviewView::draw()
 	{
 		LLRect rctClient = getLocalRect();
 
-		if (4 == m_Image->getComponents())
-			gl_rect_2d_checkerboard(rctClient);
+        if (4 == m_Image->getComponents())
+        {
+            const LLColor4 color(.098f, .098f, .098f);
+            gl_rect_2d(rctClient, color, TRUE);
+        }
 		gl_draw_scaled_image(rctClient.mLeft, rctClient.mBottom, rctClient.getWidth(), rctClient.getHeight(), m_Image);
 
 		bool isLoading = (!m_Image->isFullyLoaded()) && (m_Image->getDiscardLevel() > 0);
-- 
cgit v1.2.3


From 4800e3e4164640bc98f92f9c50d2ab7b882f97a1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 17 Aug 2023 21:51:05 +0300
Subject: SL-20099 Thumbnail upload scale textures to be square

thumbnail copy&paste only allows square textures and wasn't allowing
none square ones despite those already being used as thumbnails
---
 indra/newview/llfloatersimplesnapshot.cpp |  2 +-
 indra/newview/llviewertexturelist.cpp     | 19 +++++++++++++++----
 indra/newview/llviewertexturelist.h       |  7 +++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
index cf596fd82f..757ac605e3 100644
--- a/indra/newview/llfloatersimplesnapshot.cpp
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -386,7 +386,7 @@ void LLFloaterSimpleSnapshot::uploadThumbnail(const std::string &file_path, cons
     // generate a temp texture file for coroutine
     std::string temp_file = gDirUtilp->getTempFilename();
     U32 codec = LLImageBase::getCodecFromExtension(gDirUtilp->getExtension(file_path));
-    if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, THUMBNAIL_SNAPSHOT_DIM_MAX, THUMBNAIL_SNAPSHOT_DIM_MIN))
+    if (!LLViewerTextureList::createUploadFile(file_path, temp_file, codec, THUMBNAIL_SNAPSHOT_DIM_MAX, THUMBNAIL_SNAPSHOT_DIM_MIN, true))
     {
         LLSD notif_args;
         notif_args["REASON"] = LLImage::getLastError().c_str();
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 60c7fb6b8c..d10e1ea8c9 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1290,7 +1290,8 @@ BOOL LLViewerTextureList::createUploadFile(const std::string& filename,
 										 const std::string& out_filename,
 										 const U8 codec,
 										 const S32 max_image_dimentions,
-										 const S32 min_image_dimentions)
+										 const S32 min_image_dimentions,
+										 bool force_square)
 {	
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
 	// Load the image
@@ -1329,7 +1330,7 @@ BOOL LLViewerTextureList::createUploadFile(const std::string& filename,
         return FALSE;
     }
 	// Convert to j2c (JPEG2000) and save the file locally
-	LLPointer<LLImageJ2C> compressedImage = convertToUploadFile(raw_image, max_image_dimentions);
+	LLPointer<LLImageJ2C> compressedImage = convertToUploadFile(raw_image, max_image_dimentions, force_square);
 	if (compressedImage.isNull())
 	{
 		image->setLastError("Couldn't convert the image to jpeg2000.");
@@ -1354,10 +1355,20 @@ BOOL LLViewerTextureList::createUploadFile(const std::string& filename,
 }
 
 // note: modifies the argument raw_image!!!!
-LLPointer<LLImageJ2C> LLViewerTextureList::convertToUploadFile(LLPointer<LLImageRaw> raw_image, const S32 max_image_dimentions)
+LLPointer<LLImageJ2C> LLViewerTextureList::convertToUploadFile(LLPointer<LLImageRaw> raw_image, const S32 max_image_dimentions, bool force_square)
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-	raw_image->biasedScaleToPowerOfTwo(max_image_dimentions);
+    if (force_square)
+    {
+        S32 biggest_side = llmax(raw_image->getWidth(), raw_image->getHeight());
+        S32 square_size = raw_image->biasedDimToPowerOfTwo(biggest_side, max_image_dimentions);
+
+        raw_image->scale(square_size, square_size);
+    }
+    else
+    {
+        raw_image->biasedScaleToPowerOfTwo(max_image_dimentions);
+    }
 	LLPointer<LLImageJ2C> compressedImage = new LLImageJ2C();
 	
 	if (gSavedSettings.getBOOL("LosslessJ2CUpload") &&
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index eac26ab0eb..8fc65fc9ce 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -96,8 +96,11 @@ public:
                                  const std::string& out_filename,
                                  const U8 codec,
                                  const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,
-                                 const S32 min_image_dimentions = 0);
-	static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image, const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT);
+                                 const S32 min_image_dimentions = 0,
+                                 bool force_square = false);
+	static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image,
+                                                     const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,
+                                                     bool force_square = false);
 	static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );
 
 public:
-- 
cgit v1.2.3


From d32e685d96e19be3711e09ab626203d248d3594b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Aug 2023 18:51:42 +0300
Subject: SL-19929 Small rework of a 'feature' notification

To make multiple parallel features possible
---
 indra/newview/app_settings/settings.xml            |  4 +-
 indra/newview/llagent.cpp                          | 80 ++++++++++++++++++----
 indra/newview/llagent.h                            |  5 +-
 indra/newview/llfloaternewfeaturenotification.cpp  |  8 +++
 indra/newview/llsidepanelinventory.cpp             |  2 +-
 .../xui/en/floater_new_feature_notification.xml    | 12 +++-
 6 files changed, 90 insertions(+), 21 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b812219685..edb0c6b4d1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5504,9 +5504,9 @@
         <key>Persist</key>
         <integer>1</integer>
         <key>Type</key>
-        <string>S32</string>
+        <string>LLSD</string>
         <key>Value</key>
-        <integer>0</integer>
+        <string></string>
     </map>
     <key>LastFindPanel</key>
     <map>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8574134032..8cda46d390 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -121,6 +121,8 @@ const F32 MIN_FIDGET_TIME = 8.f; // seconds
 const F32 MAX_FIDGET_TIME = 20.f; // seconds
 
 const S32 UI_FEATURE_VERSION = 1;
+// for version 1: 1 - inventory, 2 - gltf
+const S32 UI_FEATURE_FLAGS = 1;
 
 // The agent instance.
 LLAgent gAgent;
@@ -568,27 +570,77 @@ void LLAgent::setFirstLogin(bool b)
     if (mFirstLogin)
     {
         // Don't notify new users about new features
-        S32 feature_version = gSavedSettings.getS32("LastUIFeatureVersion");
-        if (feature_version < UI_FEATURE_VERSION)
+        if (getFeatureVersion() <= UI_FEATURE_VERSION)
         {
-            gSavedSettings.setS32("LastUIFeatureVersion", UI_FEATURE_VERSION);
+            setFeatureVersion(UI_FEATURE_VERSION, UI_FEATURE_FLAGS);
         }
     }
 }
 
-void LLAgent::showLatestFeatureNotification()
+void LLAgent::setFeatureVersion(S32 version, S32 flags)
 {
-    // Notify user about new thumbnail support
-    S32 feature_version = gSavedSettings.getS32("LastUIFeatureVersion");
-    if (feature_version < UI_FEATURE_VERSION)
+    LLSD updated_version;
+    updated_version["version"] = version;
+    updated_version["flags"] = flags;
+    gSavedSettings.setLLSD("LastUIFeatureVersion", updated_version);
+}
+
+S32 LLAgent::getFeatureVersion()
+{
+    S32 version;
+    S32 flags;
+    getFeatureVersionAndFlags(version, flags);
+    return version;
+}
+
+void LLAgent::getFeatureVersionAndFlags(S32& version, S32& flags)
+{
+    version = 0;
+    flags = 0;
+    LLSD feature_version = gSavedSettings.getLLSD("LastUIFeatureVersion");
+    if (feature_version.isInteger())
+    {
+        version = feature_version.asInteger();
+        flags = UI_FEATURE_FLAGS;
+    }
+    else if (feature_version.isMap())
+    {
+        version = feature_version["version"];
+        flags = feature_version["flags"];
+    }
+    else if (!feature_version.isString() && !feature_version.isUndefined())
     {
-        // Need to open on top even if called from onOpen,
-        // do on idle to make sure it's on top
-        doOnIdleOneTime([]()
-                        {
-                            LLFloaterReg::showInstance("new_feature_notification");
-                        });
-        gSavedSettings.setS32("LastUIFeatureVersion", UI_FEATURE_VERSION);
+        // is something newer inside?
+        version = UI_FEATURE_VERSION;
+        flags = UI_FEATURE_FLAGS;
+    }
+}
+
+void LLAgent::showLatestFeatureNotification(const std::string key)
+{
+    S32 version;
+    S32 flags; // a single release can have multiple new features
+    getFeatureVersionAndFlags(version, flags);
+    if (version <= UI_FEATURE_VERSION && (flags & UI_FEATURE_FLAGS) != UI_FEATURE_FLAGS)
+    {
+        if (key == "inventory")
+        {
+            S32 flag = 1;
+
+            // Notify user about new thumbnail support
+            if ((flags & flag) == 0)
+            {
+                // Need to open on top even if called from onOpen,
+                // do on idle to make sure it's on top
+                LLSD floater_key(key);
+                doOnIdleOneTime([floater_key]()
+                                {
+                                    LLFloaterReg::showInstance("new_feature_notification", floater_key);
+                                });
+
+                setFeatureVersion(UI_FEATURE_VERSION, flags | flag);
+            }
+        }
     }
 }
 
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index fb9ac402e1..0ce6fda131 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -122,7 +122,10 @@ public:
 	bool 			isFirstLogin() const 	{ return mFirstLogin; }
 	bool 			isInitialized() const 	{ return mInitialized; }
 
-    void            showLatestFeatureNotification();
+    void            setFeatureVersion(S32 version, S32 flags);
+    S32             getFeatureVersion();
+    void            getFeatureVersionAndFlags(S32 &version, S32 &flags);
+    void            showLatestFeatureNotification(const std::string key);
 public:
 	std::string		mMOTD; 					// Message of the day
 private:
diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
index 7c3fe8cdc8..3a2035b9b9 100644
--- a/indra/newview/llfloaternewfeaturenotification.cpp
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -42,6 +42,14 @@ BOOL LLFloaterNewFeatureNotification::postBuild()
 {
     setCanDrag(FALSE);
     getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterNewFeatureNotification::onCloseBtn, this));
+
+    const std::string title_txt = "title_txt";
+    const std::string dsc_txt = "description_txt";
+    std::string feature = "_" + getKey().asString();
+    
+    getChild<LLUICtrl>(title_txt)->setValue(getString(title_txt + feature));
+    getChild<LLUICtrl>(dsc_txt)->setValue(getString(dsc_txt + feature));
+
     return TRUE;
 }
 
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index dde260eb7f..e970f70e92 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -401,7 +401,7 @@ void LLSidepanelInventory::onOpen(const LLSD& key)
 	}
 #endif
 
-    gAgent.showLatestFeatureNotification();
+    gAgent.showLatestFeatureNotification("inventory");
 }
 
 void LLSidepanelInventory::performActionOnSelection(const std::string &action)
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
index 370a08f16a..5f0eeab71c 100644
--- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -13,6 +13,13 @@
  can_drag_on_left="false"
  can_minimize="false"
  can_close="false">
+    <floater.string name="title_txt_inventory">
+New inventory features
+    </floater.string>
+    <floater.string name="description_txt_inventory">
+You can now add preview images to inventory items and view a folder in its own window.
+Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+    </floater.string>
   <text
    type="string"
    length="1"
@@ -25,7 +32,7 @@
    top="10"
    right="-10"
    name="title_txt">
-New inventory features
+New feature
   </text>
   <text
    type="string"
@@ -39,8 +46,7 @@ New inventory features
    right="-10"
    word_wrap="true"
    name="description_txt">
-You can now add preview images to inventory items and view a folder in its own window.
-Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+Feature description
   </text>
   <button
    follows="bottom|left|right"
-- 
cgit v1.2.3


From 42870208598a374628987b9f2504176b369b798b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Aug 2023 19:08:55 +0300
Subject: SL-19929 Minimize feature conflicts with gltf viewer

---
 indra/newview/llagent.cpp | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8cda46d390..bca2ce4b99 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -121,7 +121,8 @@ const F32 MIN_FIDGET_TIME = 8.f; // seconds
 const F32 MAX_FIDGET_TIME = 20.f; // seconds
 
 const S32 UI_FEATURE_VERSION = 1;
-// for version 1: 1 - inventory, 2 - gltf
+// For version 1: 1 - inventory, 2 - gltf
+// Will need to change to 3 once either inventory or gltf releases and cause a conflict
 const S32 UI_FEATURE_FLAGS = 1;
 
 // The agent instance.
@@ -601,7 +602,7 @@ void LLAgent::getFeatureVersionAndFlags(S32& version, S32& flags)
     if (feature_version.isInteger())
     {
         version = feature_version.asInteger();
-        flags = UI_FEATURE_FLAGS;
+        flags = 1; // inventory flag
     }
     else if (feature_version.isMap())
     {
@@ -623,23 +624,30 @@ void LLAgent::showLatestFeatureNotification(const std::string key)
     getFeatureVersionAndFlags(version, flags);
     if (version <= UI_FEATURE_VERSION && (flags & UI_FEATURE_FLAGS) != UI_FEATURE_FLAGS)
     {
+        S32 flag = 0;
+
         if (key == "inventory")
         {
-            S32 flag = 1;
-
             // Notify user about new thumbnail support
-            if ((flags & flag) == 0)
-            {
-                // Need to open on top even if called from onOpen,
-                // do on idle to make sure it's on top
-                LLSD floater_key(key);
-                doOnIdleOneTime([floater_key]()
-                                {
-                                    LLFloaterReg::showInstance("new_feature_notification", floater_key);
-                                });
-
-                setFeatureVersion(UI_FEATURE_VERSION, flags | flag);
-            }
+            flag = 1;
+        }
+
+        if (key == "gltf")
+        {
+            flag = 2;
+        }
+
+        if ((flags & flag) == 0)
+        {
+            // Need to open on top even if called from onOpen,
+            // do on idle to make sure it's on top
+            LLSD floater_key(key);
+            doOnIdleOneTime([floater_key]()
+                            {
+                                LLFloaterReg::showInstance("new_feature_notification", floater_key);
+                            });
+
+            setFeatureVersion(UI_FEATURE_VERSION, flags | flag);
         }
     }
 }
-- 
cgit v1.2.3


From a388c5494e2e5b6669820995a2f4d62a308b870f Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 18 Aug 2023 16:08:03 -0700
Subject: SL-20024: Fix unable to modify a no-copy material from the build
 floater

---
 indra/newview/llmaterialeditor.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 92042ad49f..54d85c87ac 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1827,7 +1827,12 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe
         return false;
     }
 
+    // func.mIsOverride=true is used for the singleton material editor floater
+    // associated with the build floater. This flag also excludes objects from
+    // the selection that do not satisfy PERM_MODIFY.
+    llassert(func.mIsOverride);
     LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func, true /*first applicable*/);
+
     LLViewerObject* selected_object = func.mObject;
     if (!selected_object)
     {
@@ -1928,7 +1933,7 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe
 
 bool LLMaterialEditor::canModifyObjectsMaterial()
 {
-    LLSelectedTEGetMatData func(false);
+    LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
     return can_use_objects_material(func, std::vector({PERM_MODIFY}), permissions, item_out);
@@ -1936,7 +1941,7 @@ bool LLMaterialEditor::canModifyObjectsMaterial()
 
 bool LLMaterialEditor::canSaveObjectsMaterial()
 {
-    LLSelectedTEGetMatData func(false);
+    LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
     return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions, item_out);
@@ -1944,7 +1949,7 @@ bool LLMaterialEditor::canSaveObjectsMaterial()
 
 void LLMaterialEditor::saveObjectsMaterialAs()
 {
-    LLSelectedTEGetMatData func(false);
+    LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item = nullptr;
     bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions, item);
-- 
cgit v1.2.3


From 0b85c05f8eefc79315c5695531335ec76a7504d2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Jun 2023 23:53:22 +0300
Subject: SL-20145 New inventory feature notification

Pulled in relevant parts from SL-19929
---
 indra/newview/CMakeLists.txt                       |  2 +
 indra/newview/app_settings/settings.xml            | 11 +++
 indra/newview/llagent.cpp                          | 98 +++++++++++++++++++++-
 indra/newview/llagent.h                            | 15 ++--
 indra/newview/llfloaternewfeaturenotification.cpp  | 76 +++++++++++++++++
 indra/newview/llfloaternewfeaturenotification.h    | 49 +++++++++++
 indra/newview/llstartup.cpp                        |  4 +-
 indra/newview/llviewerfloaterreg.cpp               |  4 +
 .../xui/en/floater_new_feature_notification.xml    | 60 +++++++++++++
 9 files changed, 309 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/llfloaternewfeaturenotification.cpp
 create mode 100644 indra/newview/llfloaternewfeaturenotification.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_new_feature_notification.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c6d82ea260..d413c12de9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -246,6 +246,7 @@ set(viewer_SOURCE_FILES
     llfloatermyscripts.cpp
     llfloatermyenvironment.cpp
     llfloaternamedesc.cpp
+    llfloaternewfeaturenotification.cpp
     llfloaternotificationsconsole.cpp
     llfloaternotificationstabbed.cpp
     llfloateroutfitphotopreview.cpp 
@@ -895,6 +896,7 @@ set(viewer_HEADER_FILES
     llfloatermyscripts.h
     llfloatermyenvironment.h
     llfloaternamedesc.h
+    llfloaternewfeaturenotification.h
     llfloaternotificationsconsole.h
     llfloaternotificationstabbed.h
     llfloateroutfitphotopreview.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b92a829f36..85f6101050 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5519,6 +5519,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LastUIFeatureVersion</key>
+    <map>
+        <key>Comment</key>
+        <string>UI Feature Version number for tracking feature notification between viewer builds</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>LLSD</string>
+        <key>Value</key>
+        <string></string>
+    </map>
     <key>LastFindPanel</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index ea176dd8de..be764287cc 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -120,6 +120,11 @@ const F64 CHAT_AGE_FAST_RATE = 3.0;
 const F32 MIN_FIDGET_TIME = 8.f; // seconds
 const F32 MAX_FIDGET_TIME = 20.f; // seconds
 
+const S32 UI_FEATURE_VERSION = 1;
+// For version 1: 1 - inventory, 2 - gltf
+// Will need to change to 3 once either inventory or gltf releases and cause a conflict
+const S32 UI_FEATURE_FLAGS = 2;
+
 // The agent instance.
 LLAgent gAgent;
 
@@ -372,7 +377,7 @@ LLAgent::LLAgent() :
 	mHideGroupTitle(FALSE),
 	mGroupID(),
 
-	mInitialized(FALSE),
+	mInitialized(false),
 	mListener(),
 
 	mDoubleTapRunTimer(),
@@ -447,7 +452,7 @@ LLAgent::LLAgent() :
 
 	mNextFidgetTime(0.f),
 	mCurrentFidget(0),
-	mFirstLogin(FALSE),
+	mFirstLogin(false),
 	mOutfitChosen(FALSE),
 
 	mVoiceConnected(false),
@@ -504,7 +509,7 @@ void LLAgent::init()
 
 	mHttpPolicy = app_core_http.getPolicy(LLAppCoreHttp::AP_AGENT);
 
-	mInitialized = TRUE;
+	mInitialized = true;
 }
 
 //-----------------------------------------------------------------------------
@@ -559,6 +564,93 @@ void LLAgent::onAppFocusGained()
 	}
 }
 
+void LLAgent::setFirstLogin(bool b)
+{
+    mFirstLogin = b;
+
+    if (mFirstLogin)
+    {
+        // Don't notify new users about new features
+        if (getFeatureVersion() <= UI_FEATURE_VERSION)
+        {
+            setFeatureVersion(UI_FEATURE_VERSION, UI_FEATURE_FLAGS);
+        }
+    }
+}
+
+void LLAgent::setFeatureVersion(S32 version, S32 flags)
+{
+    LLSD updated_version;
+    updated_version["version"] = version;
+    updated_version["flags"] = flags;
+    gSavedSettings.setLLSD("LastUIFeatureVersion", updated_version);
+}
+
+S32 LLAgent::getFeatureVersion()
+{
+    S32 version;
+    S32 flags;
+    getFeatureVersionAndFlags(version, flags);
+    return version;
+}
+
+void LLAgent::getFeatureVersionAndFlags(S32& version, S32& flags)
+{
+    version = 0;
+    flags = 0;
+    LLSD feature_version = gSavedSettings.getLLSD("LastUIFeatureVersion");
+    if (feature_version.isInteger())
+    {
+        version = feature_version.asInteger();
+        flags = 1; // inventory flag
+    }
+    else if (feature_version.isMap())
+    {
+        version = feature_version["version"];
+        flags = feature_version["flags"];
+    }
+    else if (!feature_version.isString() && !feature_version.isUndefined())
+    {
+        // is something newer inside?
+        version = UI_FEATURE_VERSION;
+        flags = UI_FEATURE_FLAGS;
+    }
+}
+
+void LLAgent::showLatestFeatureNotification(const std::string key)
+{
+    S32 version;
+    S32 flags; // a single release can have multiple new features
+    getFeatureVersionAndFlags(version, flags);
+    if (version <= UI_FEATURE_VERSION && (flags & UI_FEATURE_FLAGS) != UI_FEATURE_FLAGS)
+    {
+        S32 flag = 0;
+
+        if (key == "inventory")
+        {
+            // Notify user about new thumbnail support
+            flag = 1;
+        }
+
+        if (key == "gltf")
+        {
+            flag = 2;
+        }
+
+        if ((flags & flag) == 0)
+        {
+            // Need to open on top even if called from onOpen,
+            // do on idle to make sure it's on top
+            LLSD floater_key(key);
+            doOnIdleOneTime([floater_key]()
+                            {
+                                LLFloaterReg::showInstance("new_feature_notification", floater_key);
+                            });
+
+            setFeatureVersion(UI_FEATURE_VERSION, flags | flag);
+        }
+    }
+}
 
 void LLAgent::ageChat()
 {
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 498bea3c07..0ce6fda131 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -117,15 +117,20 @@ private:
 	//--------------------------------------------------------------------
 public:
 	void			onAppFocusGained();
-	void			setFirstLogin(BOOL b) 	{ mFirstLogin = b; }
+	void			setFirstLogin(bool b);
 	// Return TRUE if the database reported this login as the first for this particular user.
-	BOOL 			isFirstLogin() const 	{ return mFirstLogin; }
-	BOOL 			isInitialized() const 	{ return mInitialized; }
+	bool 			isFirstLogin() const 	{ return mFirstLogin; }
+	bool 			isInitialized() const 	{ return mInitialized; }
+
+    void            setFeatureVersion(S32 version, S32 flags);
+    S32             getFeatureVersion();
+    void            getFeatureVersionAndFlags(S32 &version, S32 &flags);
+    void            showLatestFeatureNotification(const std::string key);
 public:
 	std::string		mMOTD; 					// Message of the day
 private:
-	BOOL			mInitialized;
-	BOOL			mFirstLogin;
+	bool			mInitialized;
+	bool			mFirstLogin;
 	boost::shared_ptr<LLAgentListener> mListener;
 
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
new file mode 100644
index 0000000000..3a2035b9b9
--- /dev/null
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -0,0 +1,76 @@
+/** 
+ * @file llfloaternewfeaturenotification.cpp
+ * @brief LLFloaterNewFeatureNotification class implementation
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaternewfeaturenotification.h"
+
+
+LLFloaterNewFeatureNotification::LLFloaterNewFeatureNotification(const LLSD& key)
+  : LLFloater(key)
+{
+}
+
+LLFloaterNewFeatureNotification::~LLFloaterNewFeatureNotification()
+{
+}
+
+BOOL LLFloaterNewFeatureNotification::postBuild()
+{
+    setCanDrag(FALSE);
+    getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterNewFeatureNotification::onCloseBtn, this));
+
+    const std::string title_txt = "title_txt";
+    const std::string dsc_txt = "description_txt";
+    std::string feature = "_" + getKey().asString();
+    
+    getChild<LLUICtrl>(title_txt)->setValue(getString(title_txt + feature));
+    getChild<LLUICtrl>(dsc_txt)->setValue(getString(dsc_txt + feature));
+
+    return TRUE;
+}
+
+void LLFloaterNewFeatureNotification::onOpen(const LLSD& key)
+{
+    centerOnScreen();
+}
+
+void LLFloaterNewFeatureNotification::onCloseBtn()
+{
+    closeFloater();
+}
+
+void LLFloaterNewFeatureNotification::centerOnScreen()
+{
+    LLVector2 window_size = LLUI::getInstance()->getWindowSize();
+    centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY])));
+    LLFloaterView* parent = dynamic_cast<LLFloaterView*>(getParent());
+    if (parent)
+    {
+        parent->bringToFront(this);
+    }
+}
+
diff --git a/indra/newview/llfloaternewfeaturenotification.h b/indra/newview/llfloaternewfeaturenotification.h
new file mode 100644
index 0000000000..95501451dc
--- /dev/null
+++ b/indra/newview/llfloaternewfeaturenotification.h
@@ -0,0 +1,49 @@
+/** 
+ * @file llfloaternewfeaturenotification.h
+ * @brief LLFloaterNewFeatureNotification class definition
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_FLOATER_NEW_FEATURE_NOTOFICATION_H
+#define LL_FLOATER_NEW_FEATURE_NOTOFICATION_H
+
+#include "llfloater.h"
+
+class LLFloaterNewFeatureNotification:
+    public LLFloater
+{
+    friend class LLFloaterReg;
+public:
+    BOOL postBuild() override;
+    void onOpen(const LLSD& key) override;
+
+private:
+    LLFloaterNewFeatureNotification(const LLSD& key);
+    /*virtual*/	~LLFloaterNewFeatureNotification();
+
+    void centerOnScreen();
+
+    void onCloseBtn();	
+};
+
+#endif
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e84894b395..8ffab761f4 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3617,7 +3617,7 @@ bool process_login_success_response()
 		std::string flag = login_flags["ever_logged_in"];
 		if(!flag.empty())
 		{
-			gAgent.setFirstLogin((flag == "N") ? TRUE : FALSE);
+			gAgent.setFirstLogin(flag == "N");
 		}
 
 		/*  Flag is currently ignored by the viewer.
@@ -3708,7 +3708,7 @@ bool process_login_success_response()
 	std::string fake_initial_outfit_name = gSavedSettings.getString("FakeInitialOutfitName");
 	if (!fake_initial_outfit_name.empty())
 	{
-		gAgent.setFirstLogin(TRUE);
+		gAgent.setFirstLogin(true);
 		sInitialOutfit = fake_initial_outfit_name;
 		if (sInitialOutfitGender.empty())
 		{
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index ca87ff0092..0d78bfd753 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -98,6 +98,7 @@
 #include "llfloatermyscripts.h"
 #include "llfloatermyenvironment.h"
 #include "llfloaternamedesc.h"
+#include "llfloaternewfeaturenotification.h"
 #include "llfloaternotificationsconsole.h"
 #include "llfloaternotificationstabbed.h"
 #include "llfloaterobjectweights.h"
@@ -229,6 +230,7 @@ public:
                 "avatar_picker",
                 "camera",
                 "camera_presets",
+                "change_item_thumbnail"
                 "classified",
                 "add_landmark",
                 "delete_pref_preset",
@@ -247,6 +249,7 @@ public:
                 "message_critical", // Modal!!! Login specific. If this is in use elsewhere, better to create a non modal variant
                 "message_tos", // Modal!!! Login specific.
                 "mute_object_by_name",
+                "new_feature_notification",
                 "publish_classified",
                 "save_pref_preset",
                 "save_camera_preset",
@@ -395,6 +398,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("moveview", "floater_moveview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMove>);
 	LLFloaterReg::add("mute_object_by_name", "floater_mute_object.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGetBlockedObjectName>);
 	LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>);
+    LLFloaterReg::add("new_feature_notification", "floater_new_feature_notification.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNewFeatureNotification>);
 
 	LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>);
 	
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
new file mode 100644
index 0000000000..5f0eeab71c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="130"
+ width="300"
+ layout="topleft"
+ name="floater_new_feature_notification"
+ title="NEW FEATURE"
+ show_title="false"
+ header_height="0"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_close="false">
+    <floater.string name="title_txt_inventory">
+New inventory features
+    </floater.string>
+    <floater.string name="description_txt_inventory">
+You can now add preview images to inventory items and view a folder in its own window.
+Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+    </floater.string>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   font="SansSerifLargeBold"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="14"
+   top="10"
+   right="-10"
+   name="title_txt">
+New feature
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="40"
+   top_pad="14"
+   right="-10"
+   word_wrap="true"
+   name="description_txt">
+Feature description
+  </text>
+  <button
+   follows="bottom|left|right"
+   layout="topleft"
+   height="24"
+   label="Got it!"
+   left="104"
+   bottom="-10"
+   name="close_btn"
+   width="90"/>
+</floater>
-- 
cgit v1.2.3


From ef33902f220df35727ba54ee8bc3ed02bc53d6be Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Aug 2023 19:59:14 +0300
Subject: SL-20145 GLTF specific feature notification

---
 indra/newview/llfloaternewfeaturenotification.cpp             |  7 +++++++
 indra/newview/llpanelface.cpp                                 |  9 +++++++++
 indra/newview/llpanelface.h                                   |  1 +
 .../skins/default/xui/en/floater_new_feature_notification.xml | 11 ++++++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaternewfeaturenotification.cpp b/indra/newview/llfloaternewfeaturenotification.cpp
index 3a2035b9b9..1e50024967 100644
--- a/indra/newview/llfloaternewfeaturenotification.cpp
+++ b/indra/newview/llfloaternewfeaturenotification.cpp
@@ -50,6 +50,13 @@ BOOL LLFloaterNewFeatureNotification::postBuild()
     getChild<LLUICtrl>(title_txt)->setValue(getString(title_txt + feature));
     getChild<LLUICtrl>(dsc_txt)->setValue(getString(dsc_txt + feature));
 
+    if (getKey().asString() == "gltf")
+    {
+        LLRect rect = getRect();
+        // make automatic?
+        reshape(rect.getWidth() + 90, rect.getHeight() + 45);
+    }
+
     return TRUE;
 }
 
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 8f09136ccf..b502fa3546 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -492,6 +492,15 @@ LLPanelFace::~LLPanelFace()
     unloadMedia();
 }
 
+void LLPanelFace::onVisibilityChange(BOOL new_visibility)
+{
+    if (new_visibility)
+    {
+        gAgent.showLatestFeatureNotification("gltf");
+    }
+    LLPanel::onVisibilityChange(new_visibility);
+}
+
 void LLPanelFace::draw()
 {
     updateCopyTexButton();
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index d07be2e4b4..d36662c11b 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -109,6 +109,7 @@ public:
 
     static void onMaterialOverrideReceived(const LLUUID& object_id, S32 side);
 
+    /*virtual*/ void onVisibilityChange(BOOL new_visibility);
     /*virtual*/ void draw();
 
 	LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material)
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
index 5f0eeab71c..c8726d36b4 100644
--- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -20,6 +20,15 @@ New inventory features
 You can now add preview images to inventory items and view a folder in its own window.
 Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
     </floater.string>
+    <floater.string name="title_txt_gltf">
+New GLTF PBR materials support
+    </floater.string>
+    <floater.string name="description_txt_gltf">
+You can now use expanded material support with the ability to import and edit GLTF Physically Based Rendering (PBR) Materials.
+In order to support the addition of the GLTF format, some areas in the viewer may appear darker than usual.
+
+Learn more about [https://wiki.secondlife.com/wiki/PBR_Materials Physically Based Rendering (PBR)]
+    </floater.string>
   <text
    type="string"
    length="1"
@@ -37,7 +46,7 @@ New feature
   <text
    type="string"
    length="1"
-   follows="top|left|right"
+   follows="top|left|right|bottom"
    text_color="White"
    layout="topleft"
    left="10"
-- 
cgit v1.2.3


From d882609973c0430f4cad5d09d1e9571d585578a8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 21 Aug 2023 21:15:55 +0300
Subject: SL-18629 Marketplace folder creation loop avoidance

Probably shouldn't happen since we do not allow logins without caps, but
to be sure added validation.
---
 indra/newview/llfloatermarketplacelistings.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index c09e9f523d..71b3b16809 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -481,11 +481,22 @@ void LLFloaterMarketplaceListings::setRootFolder()
                 LLStringUtil::null,
                 [](const LLUUID &new_cat_id)
             {
-                LLFloaterMarketplaceListings *marketplace = LLFloaterReg::findTypedInstance<LLFloaterMarketplaceListings>("marketplace_listings");
+                LLFloaterMarketplaceListings* marketplace = LLFloaterReg::findTypedInstance<LLFloaterMarketplaceListings>("marketplace_listings");
                 if (marketplace)
                 {
-                    // will call setRootFolder again
-                    marketplace->updateView();
+                    if (new_cat_id.notNull())
+                    {
+                        // will call setRootFolder again
+                        marketplace->updateView();
+                    }
+                    // don't update in case of failure, createNewCategory can return
+                    // immediately if cap is missing and will cause a loop
+                    else
+                    {
+                        // unblock
+                        marketplace->mRootFolderCreating = false;
+                        LL_WARNS("SLM") << "Inventory warning: Failed to create marketplace listings folder for a merchant" << LL_ENDL;
+                    }
                 }
             }
             );
-- 
cgit v1.2.3


From 4b5b048cb6280cbd9fd303acd96fce73461d1fb4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 22 Aug 2023 21:14:06 +0300
Subject: SL-20187 [AIS3] Don't fill thumbnail field if null thumbnail is set

---
 indra/llinventory/llinventory.cpp              |  9 ++++++++-
 indra/newview/llfloaterchangeitemthumbnail.cpp | 12 ++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index f0b593bba7..13a496b4d7 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1140,7 +1140,14 @@ LLSD LLInventoryCategory::asAISLLSD() const
     S8 type                 = static_cast<S8>(mPreferredType);
     sd[INV_ASSET_TYPE_LABEL_WS] = type;
     sd[INV_NAME_LABEL] = mName;
-    sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+    else
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD();
+    }
 
     return sd;
 }
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 692ef3b163..77212507ab 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -787,8 +787,16 @@ void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID& new_thumbnail_id
     if (obj->getThumbnailUUID() != new_thumbnail_id)
     {
         LLSD updates;
-        // At the moment server expects id as a string
-        updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id.asString());
+        if (new_thumbnail_id.notNull())
+        {
+            // At the moment server expects id as a string
+            updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id.asString());
+        }
+        else
+        {
+            // No thumbnail isntead of 'null id thumbnail'
+            updates["thumbnail"] = LLSD();
+        }
         LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj);
         if (view_folder)
         {
-- 
cgit v1.2.3


From 894c9e0417e7b29aaf31c673ca040dff93eb36ef Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 22 Aug 2023 13:17:58 -0500
Subject: SL-19842 WIP -- Move sky auto adjustment magic numbers to debug
 settings.

---
 indra/llinventory/llsettingssky.cpp                |  5 +-
 indra/llinventory/llsettingssky.h                  |  2 +
 indra/llrender/llrender.cpp                        |  4 +-
 indra/llrender/llshadermgr.cpp                     |  2 +
 indra/llrender/llshadermgr.h                       |  2 +
 indra/newview/app_settings/settings.xml            | 67 ++++++++++++++++++++++
 .../class1/windlight/atmosphericsFuncs.glsl        |  6 +-
 indra/newview/llsettingsvo.cpp                     | 22 ++++++-
 indra/newview/pipeline.cpp                         |  4 +-
 9 files changed, 105 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 3f4b15b8b1..976a61fb69 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -32,6 +32,7 @@
 #include "llfasttimer.h"
 #include "v3colorutil.h"
 
+
 //=========================================================================
 namespace
 {
@@ -135,6 +136,8 @@ const std::string LLSettingsSky::SETTING_REFLECTION_PROBE_AMBIANCE("reflection_p
 
 const LLUUID LLSettingsSky::DEFAULT_ASSET_ID("651510b8-5f4d-8991-1592-e7eeab2a5a06");
 
+F32 LLSettingsSky::sAutoAdjustProbeAmbiance = 1.f;
+
 static const LLUUID DEFAULT_SUN_ID("32bfbcea-24b1-fb9d-1ef9-48a28a63730f"); // dataserver
 static const LLUUID DEFAULT_MOON_ID("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver
 static const LLUUID DEFAULT_CLOUD_ID("1dc1368f-e8fe-f02d-a08d-9d9f11c1af6b");
@@ -1438,7 +1441,7 @@ F32 LLSettingsSky::getReflectionProbeAmbiance(bool auto_adjust) const
 {
     if (auto_adjust && canAutoAdjust())
     {
-        return 1.f;
+        return sAutoAdjustProbeAmbiance;
     }
 
     return mSettings[SETTING_REFLECTION_PROBE_AMBIANCE].asReal();
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index f55e9f0631..7ba7a9ba06 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -103,6 +103,8 @@ public:
 
     static const LLUUID DEFAULT_ASSET_ID;
 
+    static F32 sAutoAdjustProbeAmbiance;
+
     typedef PTR_NAMESPACE::shared_ptr<LLSettingsSky> ptr_t;
 
     //---------------------------------------------------------------------
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 8430d13093..ee66122774 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -975,8 +975,8 @@ void LLRender::syncLightState()
         shader->uniform3fv(LLShaderMgr::LIGHT_AMBIENT, 1, mAmbientLightColor.mV);
         shader->uniform1i(LLShaderMgr::SUN_UP_FACTOR, sun_primary[0] ? 1 : 0);
         //shader->uniform3fv(LLShaderMgr::AMBIENT, 1, mAmbientLightColor.mV);
-        shader->uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, 1, diffuse[0].mV);
-        shader->uniform3fv(LLShaderMgr::MOONLIGHT_COLOR, 1, diffuse_b[0].mV);
+        //shader->uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, 1, diffuse[0].mV);
+        //shader->uniform3fv(LLShaderMgr::MOONLIGHT_COLOR, 1, diffuse_b[0].mV);
     }
 }
 
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 22940dc703..0e7f9e1331 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1267,6 +1267,8 @@ void LLShaderMgr::initAttribsAndUniforms()
 	mReservedUniforms.push_back("sunlight_color");
 	mReservedUniforms.push_back("ambient_color");
     mReservedUniforms.push_back("sky_hdr_scale");
+    mReservedUniforms.push_back("sky_sunlight_scale");
+    mReservedUniforms.push_back("sky_ambient_scale");
 	mReservedUniforms.push_back("blue_horizon");
     mReservedUniforms.push_back("blue_density");
     mReservedUniforms.push_back("haze_horizon");
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index ac4b393fb7..79a24773e1 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -103,6 +103,8 @@ public:
         SUNLIGHT_COLOR,                     //  "sunlight_color"
         AMBIENT,                            //  "ambient_color"
         SKY_HDR_SCALE,                      //  "sky_hdr_scale"
+        SKY_SUNLIGHT_SCALE,                 //  "sky_sunlight_scale"
+        SKY_AMBIENT_SCALE,                  //  "sky_ambient_scale"
         BLUE_HORIZON,                       //  "blue_horizon"
         BLUE_DENSITY,                       //  "blue_density"
         HAZE_HORIZON,                       //  "haze_horizon"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0cd63d9d5f..4612ee1a82 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10656,6 +10656,73 @@
     <key>Value</key>
     <real>2.0</real>
   </map>
+  <key>RendeSkyAutoAdjustBlueHorizonScale</key>
+  <map>
+    <key>Comment</key>
+    <string>Blue Horizon Scale value to use when auto-adjusting legacy skies</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.0</real>
+  </map>
+  <key>RendeSkyAutoAdjustBlueDensityScale</key>
+  <map>
+    <key>Comment</key>
+    <string>Blue Horizon Scale value to use when auto-adjusting legacy skies</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.0</real>
+  </map>
+  <key>RenderSkyAutoAdjustSunColorScale</key>
+  <map>
+    <key>Comment</key>
+    <string>Sun color scalar when auto-adjusting legacy skies</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.0</real>
+  </map>
+  <key>RenderSkyAutoAdjustProbeAmbiance</key>
+  <map>
+    <key>Comment</key>
+    <string>Probe ambiance value when auto-adjusting legacy skies</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.0</real>
+  </map>
+  <key>RenderSkySunlightScale</key>
+  <map>
+    <key>Comment</key>
+    <string>Sunlight scale fudge factor for matching with pre-PBR viewer</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.5</real>
+  </map>
+  <key>RenderSkyAmbientScale</key>
+  <map>
+    <key>Comment</key>
+    <string>Ambient scale fudge factor for matching with pre-PBR viewer</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.5</real>
+  </map>
+  
   <key>RenderReflectionProbeMaxLocalLightAmbiance</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 437fa0a6d5..53474ded7f 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -40,6 +40,8 @@ uniform vec3  glow;
 uniform float scene_light_strength;
 uniform float sun_moon_glow_factor;
 uniform float sky_hdr_scale;
+uniform float sky_sunlight_scale;
+uniform float sky_ambient_scale;
 
 float getAmbientClamp() { return 1.0f; }
 
@@ -148,8 +150,8 @@ void calcAtmosphericVarsLinear(vec3 inPositionEye, vec3 norm, vec3 light_dir, ou
 
     // multiply to get similar colors as when the "scaleSoftClip" implementation was doubling color values
     // (allows for mixing of light sources other than sunlight e.g. reflection probes)
-    sunlit *= 1.5;
-    amblit *= 0.5;
+    sunlit *= sky_sunlight_scale; //1.5;
+    amblit *= sky_ambient_scale; //0.5;
     
     // override amblit with ambient_color if sky probe ambiance is not zero
     amblit = mix(amblit, ambient_color, clamp(sky_hdr_scale-1.0, 0.0, 1.0));
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 264359a3a9..9ccac82e63 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -721,6 +721,15 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
     static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
     static LLCachedControl<F32> auto_adjust_ambient_scale(gSavedSettings, "RenderSkyAutoAdjustAmbientScale", 0.75f);
     static LLCachedControl<F32> auto_adjust_hdr_scale(gSavedSettings, "RenderSkyAutoAdjustHDRScale", 2.f);
+    static LLCachedControl<F32> auto_adjust_blue_horizon_scale(gSavedSettings, "RenderSkyAutoAdjustBlueHorizonScale", 1.f);
+    static LLCachedControl<F32> auto_adjust_blue_density_scale(gSavedSettings, "RenderSkyAutoAdjustBlueDensityScale", 1.f);
+    static LLCachedControl<F32> auto_adjust_sun_color_scale(gSavedSettings, "RenderSkyAutoAdjustSunColorScale", 1.f);
+    static LLCachedControl<F32> auto_adjust_probe_ambiance(gSavedSettings, "RenderSkyAutoAdjustProbeAmbiance", 1.f);
+    static LLCachedControl<F32> sunlight_scale(gSavedSettings, "RenderSkySunlightScale", 1.5f);
+    static LLCachedControl<F32> ambient_scale(gSavedSettings, "RenderSkyAmbientScale", 1.5f);
+
+    shader->uniform1f(LLShaderMgr::SKY_SUNLIGHT_SCALE, sunlight_scale);
+    shader->uniform1f(LLShaderMgr::SKY_AMBIENT_SCALE, ambient_scale);
 
     static LLCachedControl<F32> cloud_shadow_scale(gSavedSettings, "RenderCloudShadowAmbianceFactor", 0.125f);
     F32 probe_ambiance = getTotalReflectionProbeAmbiance(cloud_shadow_scale);
@@ -740,7 +749,16 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
         { // auto-adjust legacy sky to take advantage of probe ambiance 
             shader->uniform3fv(LLShaderMgr::AMBIENT, (ambient * auto_adjust_ambient_scale).mV);
             shader->uniform1f(LLShaderMgr::SKY_HDR_SCALE, auto_adjust_hdr_scale);
-            probe_ambiance = 1.f;  // NOTE -- must match LLSettingsSky::getReflectionProbeAmbiance value for "auto_adjust" true
+            LLColor3 blue_horizon = getBlueHorizon() * auto_adjust_blue_horizon_scale;
+            LLColor3 blue_density = getBlueDensity() * auto_adjust_blue_density_scale;
+            LLColor3 sun_diffuse = getSunDiffuse() * auto_adjust_sun_color_scale;
+            
+            shader->uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, sun_diffuse.mV);
+            shader->uniform3fv(LLShaderMgr::BLUE_DENSITY, blue_density.mV);
+            shader->uniform3fv(LLShaderMgr::BLUE_HORIZON, blue_horizon.mV);
+
+            LLSettingsSky::sAutoAdjustProbeAmbiance = auto_adjust_probe_ambiance;
+            probe_ambiance = auto_adjust_probe_ambiance;  // NOTE -- must match LLSettingsSky::getReflectionProbeAmbiance value for "auto_adjust" true
         }
         else
         {
@@ -755,7 +773,7 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
     shader->uniform1f(LLShaderMgr::SUN_MOON_GLOW_FACTOR, getSunMoonGlowFactor());
     shader->uniform1f(LLShaderMgr::DENSITY_MULTIPLIER, getDensityMultiplier());
     shader->uniform1f(LLShaderMgr::DISTANCE_MULTIPLIER, getDistanceMultiplier());
-
+    
     shader->uniform1f(LLShaderMgr::GAMMA, g);
 }
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1620b1ff4c..0b5908a440 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7730,8 +7730,8 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_
 		shader.uniformMatrix4fv(LLShaderMgr::DEFERRED_NORM_MATRIX, 1, FALSE, norm_mat.m);
 	}
 
-    shader.uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, 1, mSunDiffuse.mV);
-    shader.uniform3fv(LLShaderMgr::MOONLIGHT_COLOR, 1, mMoonDiffuse.mV);
+    //shader.uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, 1, mSunDiffuse.mV);
+    //shader.uniform3fv(LLShaderMgr::MOONLIGHT_COLOR, 1, mMoonDiffuse.mV);
 
     shader.uniform1f(LLShaderMgr::REFLECTION_PROBE_MAX_LOD, mReflectionMapManager.mMaxProbeLOD);
 }
-- 
cgit v1.2.3


From d454512050e636a19e4b7545515dea4f4b1bbf0d Mon Sep 17 00:00:00 2001
From: Vir Linden <Vir@vir-macbookpro.fios-router.home>
Date: Wed, 23 Aug 2023 15:20:19 -0400
Subject: Increment viewer version to 6.6.15 following promotion of DRTVWR-582

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index e9d5f8c17f..b69c12176f 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.6.14
+6.6.15
-- 
cgit v1.2.3


From 167bf822acd51c68bb4812b77eacc7dc5e00105a Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Wed, 23 Aug 2023 14:12:01 -0700
Subject: Fix merge breakage in windows installer_templete.nsi for DRTVWR-559

---
 indra/newview/installers/windows/installer_template.nsi | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 599e5a0fa4..39247b3f47 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -518,10 +518,7 @@ Function CheckIfAdministrator
         Quit
 lbl_is_admin:
     Return
-/* Unused
-
 FunctionEnd
-*/
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Function CheckWillUninstallV2               
-- 
cgit v1.2.3


From c382d4e9756ec407188afcd94a64a07cd883bba1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 25 Aug 2023 19:26:58 +0300
Subject: SL-20199 Error creating new folder

---
 indra/llinventory/llinventory.cpp  | 6 +-----
 indra/llinventory/llinventory.h    | 2 +-
 indra/newview/llinventorymodel.cpp | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 13a496b4d7..5adf1fa0e6 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1132,7 +1132,7 @@ LLSD LLInventoryCategory::asLLSD() const
     return sd;
 }
 
-LLSD LLInventoryCategory::asAISLLSD() const
+LLSD LLInventoryCategory::asAISCreateCatLLSD() const
 {
     LLSD sd                 = LLSD();
     sd[INV_FOLDER_ID_LABEL_WS]  = mUUID;
@@ -1144,10 +1144,6 @@ LLSD LLInventoryCategory::asAISLLSD() const
     {
         sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
     }
-    else
-    {
-        sd[INV_THUMBNAIL_LABEL] = LLSD();
-    }
 
     return sd;
 }
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 516cfc6a24..6d4535af27 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -253,7 +253,7 @@ public:
 	LLFolderType::EType getPreferredType() const;
 	void setPreferredType(LLFolderType::EType type);
 	LLSD asLLSD() const;
-    LLSD asAISLLSD() const;
+    LLSD asAISCreateCatLLSD() const;
 	bool fromLLSD(const LLSD& sd);
 
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index a41ab4eec3..ea771661ec 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1029,7 +1029,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		new_inventory["categories"] = LLSD::emptyArray();
 		LLViewerInventoryCategory cat(LLUUID::null, parent_id, preferred_type, name, gAgent.getID());
         cat.setThumbnailUUID(thumbnail_id);
-		LLSD cat_sd = cat.asAISLLSD();
+		LLSD cat_sd = cat.asAISCreateCatLLSD();
 		new_inventory["categories"].append(cat_sd);
 		AISAPI::CreateInventory(
             parent_id,
-- 
cgit v1.2.3


From 89f2165b4170d9fddc10a55292c28750093a22a0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 25 Aug 2023 22:14:29 +0200
Subject: SL-20197 Remove 'Edit PBR material' from context menu when editing an
 attachment

---
 indra/newview/skins/default/xui/en/menu_attachment_self.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 943bfb8122..8e041f8de3 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -17,7 +17,7 @@
      name="EditGLTFMaterial">
         <menu_item_call.on_click
          function="Object.EditGLTFMaterial" />
-        <menu_item_call.on_enable
+        <menu_item_call.on_visible
          function="Object.EnableEditGLTFMaterial"/>
     </menu_item_call>
     <menu_item_call
-- 
cgit v1.2.3


From 455bbcf742691b709353aa3c3e35a76d0ff38ee4 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 29 Aug 2023 16:42:55 -0500
Subject: SL-20229 Add GenericStreamingMessage and use it to receive GLTF
 material overrides

---
 indra/llmessage/CMakeLists.txt                |   2 +
 indra/llmessage/llgenericstreamingmessage.cpp |  72 +++++++++++
 indra/llmessage/llgenericstreamingmessage.h   |  50 ++++++++
 indra/llmessage/message_prehash.cpp           |   1 +
 indra/llmessage/message_prehash.h             |   1 +
 indra/llprimitive/llgltfmaterial.cpp          | 172 ++++++++++++++++++++++++++
 indra/llprimitive/llgltfmaterial.h            |   9 ++
 indra/newview/llappviewer.cpp                 |   2 +-
 indra/newview/llgltfmateriallist.cpp          |  75 +++++++++--
 indra/newview/llgltfmateriallist.h            |   3 +
 indra/newview/llstartup.cpp                   |   1 +
 indra/newview/llviewergenericmessage.cpp      |  18 ++-
 indra/newview/llviewergenericmessage.h        |   1 +
 indra/newview/llviewerregion.cpp              |  16 +--
 indra/newview/llvocache.cpp                   |  34 ++---
 indra/newview/llvocache.h                     |   2 +-
 16 files changed, 410 insertions(+), 49 deletions(-)
 create mode 100644 indra/llmessage/llgenericstreamingmessage.cpp
 create mode 100644 indra/llmessage/llgenericstreamingmessage.h

(limited to 'indra')

diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 4786956e85..e44309476b 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -30,6 +30,7 @@ set(llmessage_SOURCE_FILES
     lldispatcher.cpp
     llexperiencecache.cpp
     llfiltersd2xmlrpc.cpp
+    llgenericstreamingmessage.cpp
     llhost.cpp
     llhttpnode.cpp
     llhttpsdhandler.cpp
@@ -114,6 +115,7 @@ set(llmessage_HEADER_FILES
     llextendedstatus.h
     llfiltersd2xmlrpc.h
     llfollowcamparams.h
+    llgenericstreamingmessage.h
     llhost.h
     llhttpnode.h
     llhttpnodeadapter.h
diff --git a/indra/llmessage/llgenericstreamingmessage.cpp b/indra/llmessage/llgenericstreamingmessage.cpp
new file mode 100644
index 0000000000..8627675c54
--- /dev/null
+++ b/indra/llmessage/llgenericstreamingmessage.cpp
@@ -0,0 +1,72 @@
+/**
+ * @file llgenericstreamingmessage.cpp
+ * @brief Generic Streaming Message helpers.  Shared between viewer and simulator.
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llgenericstreamingmessage.h"
+
+#include "message.h"
+
+void LLGenericStreamingMessage::send(LLMessageSystem* msg)
+{
+#if 0 // viewer cannot send GenericStreamingMessage
+    msg->newMessageFast(_PREHASH_GenericStreamingMessage);
+
+    if (mData.size() < 1024 * 7)
+    { // disable warning about big messages unless we're sending a REALLY big message
+        msg->tempDisableWarnAboutBigMessage();
+    }
+    else
+    {
+        LL_WARNS("Messaging") << "Attempted to send too large GenericStreamingMessage, dropping." << LL_ENDL;
+        return;
+    }
+
+    msg->nextBlockFast(_PREHASH_MethodData);
+    msg->addU16Fast(_PREHASH_Method, mMethod);
+    msg->nextBlockFast(_PREHASH_DataBlock);
+    msg->addStringFast(_PREHASH_Data, mData.c_str());
+#endif
+}
+
+void LLGenericStreamingMessage::unpack(LLMessageSystem* msg)
+{
+    U16* m = (U16*)&mMethod; // squirrely pass enum as U16 by reference
+    msg->getU16Fast(_PREHASH_MethodData, _PREHASH_Method, *m);
+
+    constexpr int MAX_SIZE = 7 * 1024;
+
+    char buffer[MAX_SIZE];
+
+    // NOTE: don't use getStringFast to avoid 1200 byte truncation
+    U32 size = msg->getSizeFast(_PREHASH_DataBlock, _PREHASH_Data);
+    msg->getBinaryDataFast(_PREHASH_DataBlock, _PREHASH_Data, buffer, size, 0, MAX_SIZE);
+
+    mData.assign(buffer, size);
+}
+
+
+
diff --git a/indra/llmessage/llgenericstreamingmessage.h b/indra/llmessage/llgenericstreamingmessage.h
new file mode 100644
index 0000000000..9ac9719ea1
--- /dev/null
+++ b/indra/llmessage/llgenericstreamingmessage.h
@@ -0,0 +1,50 @@
+/**
+ * @file llgenericstreamingmessage.h
+ * @brief Generic Streaming Message helpers.  Shared between viewer and simulator.
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#pragma once
+
+#include <string>
+#include "stdtypes.h"
+
+class LLMessageSystem;
+
+class LLGenericStreamingMessage
+{
+public:
+    enum Method : U16
+    {
+        METHOD_GLTF_MATERIAL_OVERRIDE = 0x4175,
+        METHOD_UNKNOWN = 0xFFFF,
+    };
+
+    void send(LLMessageSystem* msg);
+    void unpack(LLMessageSystem* msg);
+
+    Method mMethod = METHOD_UNKNOWN;
+    std::string mData;
+};
+
+
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index 57ea954054..4dccacb889 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -1367,6 +1367,7 @@ char const* const _PREHASH_MuteType = LLMessageStringTable::getInstance()->getSt
 char const* const _PREHASH_IMViaEMail = LLMessageStringTable::getInstance()->getString("IMViaEMail");
 char const* const _PREHASH_RentPrice = LLMessageStringTable::getInstance()->getString("RentPrice");
 char const* const _PREHASH_GenericMessage = LLMessageStringTable::getInstance()->getString("GenericMessage");
+char const* const _PREHASH_GenericStreamingMessage = LLMessageStringTable::getInstance()->getString("GenericStreamingMessage");
 char const* const _PREHASH_ChildAgentAlive = LLMessageStringTable::getInstance()->getString("ChildAgentAlive");
 char const* const _PREHASH_AssetType = LLMessageStringTable::getInstance()->getString("AssetType");
 char const* const _PREHASH_SpawnPointBlock = LLMessageStringTable::getInstance()->getString("SpawnPointBlock");
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h
index 572dadd408..a393bbabb2 100644
--- a/indra/llmessage/message_prehash.h
+++ b/indra/llmessage/message_prehash.h
@@ -1368,6 +1368,7 @@ extern char const* const _PREHASH_MuteType;
 extern char const* const _PREHASH_IMViaEMail;
 extern char const* const _PREHASH_RentPrice;
 extern char const* const _PREHASH_GenericMessage;
+extern char const* const _PREHASH_GenericStreamingMessage;
 extern char const* const _PREHASH_ChildAgentAlive;
 extern char const* const _PREHASH_AssetType;
 extern char const* const _PREHASH_SpawnPointBlock;
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index c16803d39d..8475e7231a 100644
--- a/indra/llprimitive/llgltfmaterial.cpp
+++ b/indra/llprimitive/llgltfmaterial.cpp
@@ -27,6 +27,7 @@
 #include "linden_common.h"
 
 #include "llgltfmaterial.h"
+#include "llsdserialize.h"
 
 // NOTE -- this should be the one and only place tiny_gltf.h is included
 #include "tinygltf/tiny_gltf.h"
@@ -693,6 +694,177 @@ void LLGLTFMaterial::applyOverride(const LLGLTFMaterial& override_mat)
     }
 }
 
+void LLGLTFMaterial::getOverrideLLSD(const LLGLTFMaterial& override_mat, LLSD& data)
+{
+    LL_PROFILE_ZONE_SCOPED;
+    llassert(data.isUndefined());
+
+    // make every effort to shave bytes here
+
+    for (int i = 0; i < GLTF_TEXTURE_INFO_COUNT; ++i)
+    {
+        LLUUID& texture_id = mTextureId[i];
+        const LLUUID& override_texture_id = override_mat.mTextureId[i];
+        if (override_texture_id.notNull() && override_texture_id != texture_id)
+        {
+            data["tex"][i] = LLSD::UUID(override_texture_id);
+        }
+
+    }
+
+    if (override_mat.mBaseColor != getDefaultBaseColor())
+    {
+        data["bc"] = override_mat.mBaseColor.getValue();
+    }
+
+    if (override_mat.mEmissiveColor != getDefaultEmissiveColor())
+    {
+        data["ec"] = override_mat.mEmissiveColor.getValue();
+    }
+
+    if (override_mat.mMetallicFactor != getDefaultMetallicFactor())
+    {
+        data["mf"] = override_mat.mMetallicFactor;
+    }
+
+    if (override_mat.mRoughnessFactor != getDefaultRoughnessFactor())
+    {
+        data["rf"] = override_mat.mRoughnessFactor;
+    }
+
+    if (override_mat.mAlphaMode != getDefaultAlphaMode() || override_mat.mOverrideAlphaMode)
+    {
+        data["am"] = override_mat.mAlphaMode;
+    }
+
+    if (override_mat.mAlphaCutoff != getDefaultAlphaCutoff())
+    {
+        data["ac"] = override_mat.mAlphaCutoff;
+    }
+
+    if (override_mat.mDoubleSided != getDefaultDoubleSided() || override_mat.mOverrideDoubleSided)
+    {
+        data["ds"] = override_mat.mDoubleSided;
+    }
+
+    for (int i = 0; i < GLTF_TEXTURE_INFO_COUNT; ++i)
+    {
+        if (override_mat.mTextureTransform[i].mOffset != getDefaultTextureOffset())
+        {
+            data["ti"][i]["o"] = override_mat.mTextureTransform[i].mOffset.getValue();
+        }
+
+        if (override_mat.mTextureTransform[i].mScale != getDefaultTextureScale())
+        {
+            data["ti"][i]["s"] = override_mat.mTextureTransform[i].mScale.getValue();
+        }
+
+        if (override_mat.mTextureTransform[i].mRotation != getDefaultTextureRotation())
+        {
+            data["ti"][i]["r"] = override_mat.mTextureTransform[i].mRotation;
+        }
+    }
+
+#if 0
+    {
+        std::ostringstream ostr;
+        LLSDSerialize::serialize(data, ostr, LLSDSerialize::LLSD_NOTATION);
+        std::string param_str(ostr.str());
+        LL_INFOS() << param_str << LL_ENDL;
+        LL_INFOS() << "Notation size: " << param_str.size() << LL_ENDL;
+    }
+
+    {
+        std::ostringstream ostr;
+        LLSDSerialize::serialize(data, ostr, LLSDSerialize::LLSD_BINARY);
+        std::string param_str(ostr.str());
+        LL_INFOS() << "Binary size: " << param_str.size() << LL_ENDL;
+    }
+#endif
+}
+
+
+void LLGLTFMaterial::applyOverrideLLSD(const LLSD& data)
+{
+    const LLSD& tex = data["tex"];
+
+    if (tex.isArray())
+    {
+        for (int i = 0; i < tex.size(); ++i)
+        {
+            mTextureId[i] = tex[i].asUUID();
+        }
+    }
+
+    const LLSD& bc = data["bc"];
+    if (bc.isDefined())
+    {
+        mBaseColor.setValue(bc);
+    }
+
+    const LLSD& ec = data["ec"];
+    if (ec.isDefined())
+    {
+        mEmissiveColor.setValue(ec);
+    }
+
+    const LLSD& mf = data["mf"];
+    if (mf.isReal())
+    {
+        mMetallicFactor = mf.asReal();
+    }
+
+    const LLSD& rf = data["rf"];
+    if (rf.isReal())
+    {
+        mRoughnessFactor = rf.asReal();
+    }
+
+    const LLSD& am = data["am"];
+    if (am.isInteger())
+    {
+        mAlphaMode = (AlphaMode) am.asInteger();
+    }
+
+    const LLSD& ac = data["ac"];
+    if (ac.isReal())
+    {
+        mAlphaCutoff = ac.asReal();
+    }
+
+    const LLSD& ds = data["ds"];
+    if (data.isBoolean())
+    {
+        mDoubleSided = ds.asBoolean();
+        mOverrideDoubleSided = true;
+    }
+
+    const LLSD& ti = data["ti"];
+    if (ti.isArray())
+    {
+        for (int i = 0; i < GLTF_TEXTURE_INFO_COUNT; ++i)
+        {
+            const LLSD& o = ti[i]["o"];
+            if (o.isDefined())
+            {
+                mTextureTransform[i].mOffset.setValue(o);
+            }
+
+            const LLSD& s = ti[i]["s"];
+            if (s.isDefined())
+            {
+                mTextureTransform[i].mScale.setValue(s);
+            }
+
+            const LLSD& r = ti[i]["r"];
+            if (r.isReal())
+            {
+                mTextureTransform[i].mRotation = r.asReal();
+            }
+        }
+    }
+}
+
 LLUUID LLGLTFMaterial::getHash() const
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index ad7784f6d1..ca27507707 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -176,6 +176,7 @@ public:
     // get the contents of this LLGLTFMaterial as a json string
     std::string asJSON(bool prettyprint = false) const;
 
+
     // initialize from given tinygltf::Model
     // model - the model to reference
     // mat_index - index of material in model's material array
@@ -185,6 +186,14 @@ public:
     void writeToModel(tinygltf::Model& model, S32 mat_index) const;
 
     void applyOverride(const LLGLTFMaterial& override_mat);
+    
+    // apply the given LLSD override data
+    void applyOverrideLLSD(const LLSD& data);
+
+    // Get the given override on this LLGLTFMaterial as LLSD
+    // override_mat -- the override source data
+    // data -- output LLSD object (should be passed in empty)
+    void getOverrideLLSD(const LLGLTFMaterial& override_mat, LLSD& data);
 
     // For base materials only (i.e. assets). Clears transforms to
     // default since they're not supported in assets yet.
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 343778fe03..a6e938e54c 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4138,7 +4138,7 @@ U32 LLAppViewer::getObjectCacheVersion()
 {
 	// Viewer object cache version, change if object update
 	// format changes. JC
-	const U32 INDRA_OBJECT_CACHE_VERSION = 16;
+	const U32 INDRA_OBJECT_CACHE_VERSION = 17;
 
 	return INDRA_OBJECT_CACHE_VERSION;
 }
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 99a052f719..a204315a2a 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -160,9 +160,9 @@ public:
         //  sides - array of S32 indices of texture entries
         //  gltf_json - array of corresponding Strings of GLTF json for override data
 
-
         LLSD message;
         bool success = true;
+#if 0 //deprecated
         for(const std::string& llsdRaw : strings)
         {
             std::istringstream llsdData(llsdRaw);
@@ -198,6 +198,7 @@ public:
             applyData(object_override);
         }
 
+#endif
         return success;
     }
 
@@ -213,6 +214,7 @@ public:
     {
         // Parse the data
 
+#if 0 // DEPRECATED
         LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
         LL::WorkQueue::ptr_t general_queue = LL::WorkQueue::getInstance("General");
 
@@ -235,24 +237,17 @@ public:
 
                 results.reserve(sides.size());
                 // parse json
-                std::unordered_map<S32, std::string>::const_iterator iter = sides.begin();
-                std::unordered_map<S32, std::string>::const_iterator end = sides.end();
+                std::unordered_map<S32, LLSD>::const_iterator iter = sides.begin();
+                std::unordered_map<S32, LLSD>::const_iterator end = sides.end();
                 while (iter != end)
                 {
-                    std::string warn_msg, error_msg;
-
                     ReturnData result;
 
-                    bool success = result.mMaterial.fromJSON(iter->second, warn_msg, error_msg);
-
-                    result.mSuccess = success;
+                    result.mMaterial.applyOverrideLLSD(iter->second);
+                    
+                    result.mSuccess = true;
                     result.mSide = iter->first;
 
-                    if (!success)
-                    {
-                        LL_WARNS("GLTF") << "failed to parse GLTF override data.  errors: " << error_msg << " | warnings: " << warn_msg << LL_ENDL;
-                    }
-
                     results.push_back(result);
                     iter++;
                 }
@@ -318,6 +313,7 @@ public:
                 }
             });
         }
+#endif
     }
 
 private:
@@ -330,6 +326,59 @@ namespace
     LLGLTFMaterialOverrideDispatchHandler handle_gltf_override_message;
 }
 
+void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::string& data_in)
+{
+    std::istringstream str(data_in);
+
+    LLSD data;
+
+    LLSDSerialize::fromNotation(data, str, data_in.length());
+
+    const LLHost& host = msg->getSender();
+    
+    LLViewerRegion* region = LLWorld::instance().getRegion(host);
+
+    if (region)
+    {
+        U32 local_id = data.get("id").asInteger();
+        LLUUID id;
+        gObjectList.getUUIDFromLocal(id, local_id, host.getAddress(), host.getPort());
+        LLViewerObject* obj = gObjectList.findObject(id);
+
+        if (obj)
+        {
+            const LLSD& tes = data["te"];
+            const LLSD& od = data["od"];
+
+            if (tes.isArray())
+            {
+                LLGLTFOverrideCacheEntry cache;
+                cache.mLocalId = local_id;
+                cache.mObjectId = id;
+                cache.mRegionHandle = region->getHandle();
+
+                for (int i = 0; i < tes.size(); ++i)
+                {
+                    S32 te = tes[i].asInteger();
+                    LLGLTFMaterial* mat = new LLGLTFMaterial(); // setTEGLTFMaterialOverride will take ownership
+                    mat->applyOverrideLLSD(od[i]);
+                    obj->setTEGLTFMaterialOverride(te, mat);
+
+                    cache.mSides[te] = od[i];
+                    cache.mGLTFMaterial[te] = mat;
+
+                    if (obj->getTE(te) && obj->getTE(te)->isSelected())
+                    {
+                        handle_gltf_override_message.doSelectionCallbacks(id, te);
+                    }
+                }
+
+                region->cacheFullUpdateGLTFOverride(cache);
+            }
+        }
+    }
+}
+
 void LLGLTFMaterialList::queueOverrideUpdate(const LLUUID& id, S32 side, LLGLTFMaterial* override_data)
 {
 #if 0
diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index ce8781baba..7317214019 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -101,6 +101,9 @@ public:
 
     static void loadCacheOverrides(const LLGLTFOverrideCacheEntry& override);
 
+    // Apply an override update with the given data
+    void applyOverrideMessage(LLMessageSystem* msg, const std::string& data);
+
 private:
     friend class LLGLTFMaterialOverrideDispatchHandler;
     // save an override update that we got from the simulator for later (for example, if an override arrived for an unknown object)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 8ffab761f4..eccfd40fe6 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2709,6 +2709,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
 	msg->setHandlerFunc("InitiateDownload", process_initiate_download);
 	msg->setHandlerFunc("LandStatReply", LLFloaterTopObjects::handle_land_reply);
     msg->setHandlerFunc("GenericMessage", process_generic_message);
+    msg->setHandlerFunc("GenericStreamingMessage", process_generic_streaming_message);
     msg->setHandlerFunc("LargeGenericMessage", process_large_generic_message);
 
 	msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message);
diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp
index d3de9d72bf..7ea792c404 100644
--- a/indra/newview/llviewergenericmessage.cpp
+++ b/indra/newview/llviewergenericmessage.cpp
@@ -32,9 +32,10 @@
 #include "lldispatcher.h"
 #include "lluuid.h"
 #include "message.h"
+#include "llgenericstreamingmessage.h"
 
 #include "llagent.h"
-
+#include "llgltfmateriallist.h"
 
 LLDispatcher gGenericDispatcher;
 
@@ -92,6 +93,21 @@ void process_generic_message(LLMessageSystem* msg, void**)
 	}
 }
 
+void process_generic_streaming_message(LLMessageSystem* msg, void**)
+{
+    LLGenericStreamingMessage data;
+    data.unpack(msg);
+    switch (data.mMethod)
+    {
+    case LLGenericStreamingMessage::METHOD_GLTF_MATERIAL_OVERRIDE:
+        gGLTFMaterialList.applyOverrideMessage(msg, data.mData);
+        break;
+    default:
+        LL_WARNS() << "GenericStreamingMessage received unknown method: " << data.mMethod << LL_ENDL;
+        break;
+    }
+}
+
 void process_large_generic_message(LLMessageSystem* msg, void**)
 {
     LLUUID agent_id;
diff --git a/indra/newview/llviewergenericmessage.h b/indra/newview/llviewergenericmessage.h
index 170f38a485..96a73a3d5f 100644
--- a/indra/newview/llviewergenericmessage.h
+++ b/indra/newview/llviewergenericmessage.h
@@ -38,6 +38,7 @@ void send_generic_message(const std::string& method,
 						  const LLUUID& invoice = LLUUID::null);
 
 void process_generic_message(LLMessageSystem* msg, void**);
+void process_generic_streaming_message(LLMessageSystem* msg, void**);
 void process_large_generic_message(LLMessageSystem* msg, void**);
 
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 6b92b16ef4..ead1e8c073 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -215,7 +215,7 @@ public:
 	LLVOCacheEntry::vocache_entry_set_t   mVisibleEntries; //must-be-created visible entries wait for objects creation.	
 	LLVOCacheEntry::vocache_entry_priority_list_t mWaitingList; //transient list storing sorted visible entries waiting for object creation.
 	std::set<U32>                          mNonCacheableCreatedList; //list of local ids of all non-cacheable objects
-    LLVOCacheEntry::vocache_gltf_overrides_map_t mGLTFOverridesJson; // for materials
+    LLVOCacheEntry::vocache_gltf_overrides_map_t mGLTFOverridesLLSD; // for materials
 
 	// time?
 	// LRU info?
@@ -787,7 +787,7 @@ void LLViewerRegion::loadObjectCache()
 	{
         LLVOCache & vocache = LLVOCache::instance();
 		vocache.readFromCache(mHandle, mImpl->mCacheID, mImpl->mCacheMap);
-        vocache.readGenericExtrasFromCache(mHandle, mImpl->mCacheID, mImpl->mGLTFOverridesJson);
+        vocache.readGenericExtrasFromCache(mHandle, mImpl->mCacheID, mImpl->mGLTFOverridesLLSD);
 
 		if (mImpl->mCacheMap.empty())
 		{
@@ -817,7 +817,7 @@ void LLViewerRegion::saveObjectCache()
         LLVOCache & instance = LLVOCache::instance();
 
         instance.writeToCache(mHandle, mImpl->mCacheID, mImpl->mCacheMap, mCacheDirty, removal_enabled);
-        instance.writeGenericExtrasToCache(mHandle, mImpl->mCacheID, mImpl->mGLTFOverridesJson, mCacheDirty, removal_enabled);
+        instance.writeGenericExtrasToCache(mHandle, mImpl->mCacheID, mImpl->mGLTFOverridesLLSD, mCacheDirty, removal_enabled);
 		mCacheDirty = FALSE;
 	}
 
@@ -2656,7 +2656,7 @@ LLViewerRegion::eCacheUpdateResult LLViewerRegion::cacheFullUpdate(LLViewerObjec
 void LLViewerRegion::cacheFullUpdateGLTFOverride(const LLGLTFOverrideCacheEntry &override_data)
 {
     U32 local_id = override_data.mLocalId;
-    mImpl->mGLTFOverridesJson[local_id] = override_data;
+    mImpl->mGLTFOverridesLLSD[local_id] = override_data;
 }
 
 LLVOCacheEntry* LLViewerRegion::getCacheEntryForOctree(U32 local_id)
@@ -3546,8 +3546,8 @@ std::string LLViewerRegion::getSimHostName()
 
 void LLViewerRegion::loadCacheMiscExtras(U32 local_id)
 {
-    auto iter = mImpl->mGLTFOverridesJson.find(local_id);
-    if (iter != mImpl->mGLTFOverridesJson.end())
+    auto iter = mImpl->mGLTFOverridesLLSD.find(local_id);
+    if (iter != mImpl->mGLTFOverridesLLSD.end())
     {
         LLGLTFMaterialList::loadCacheOverrides(iter->second);
     }
@@ -3559,8 +3559,8 @@ void LLViewerRegion::applyCacheMiscExtras(LLViewerObject* obj)
     llassert(obj);
 
     U32 local_id = obj->getLocalID();
-    auto iter = mImpl->mGLTFOverridesJson.find(local_id);
-    if (iter != mImpl->mGLTFOverridesJson.end())
+    auto iter = mImpl->mGLTFOverridesLLSD.find(local_id);
+    if (iter != mImpl->mGLTFOverridesLLSD.end())
     {
         llassert(iter->second.mGLTFMaterial.size() == iter->second.mSides.size());
 
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index a92057d010..dd5b9f9fd5 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -85,40 +85,24 @@ bool LLGLTFOverrideCacheEntry::fromLLSD(const LLSD& data)
 
     // message should be interpreted thusly:
     ///  sides is a list of face indices
-    //   gltf_json is a list of corresponding json
+    //   gltf_llsd is a list of corresponding GLTF override LLSD
     //   any side not represented in "sides" has no override
-    if (data.has("sides") && data.has("gltf_json"))
+    if (data.has("sides") && data.has("gltf_llsd"))
     {
         LLSD const& sides = data.get("sides");
-        LLSD const& gltf_json = data.get("gltf_json");
+        LLSD const& gltf_llsd = data.get("gltf_llsd");
 
-        if (sides.isArray() && gltf_json.isArray() &&
+        if (sides.isArray() && gltf_llsd.isArray() &&
             sides.size() != 0 &&
-            sides.size() == gltf_json.size())
+            sides.size() == gltf_llsd.size())
         {
             for (int i = 0; i < sides.size(); ++i)
             {
                 S32 side_idx = sides[i].asInteger();
-                std::string gltf_json_str = gltf_json[i].asString();
-                mSides[side_idx] = gltf_json_str;
+                mSides[side_idx] = gltf_llsd[i];
                 LLGLTFMaterial* override_mat = new LLGLTFMaterial();
-                std::string error, warn;
-                if (override_mat->fromJSON(gltf_json_str, warn, error))
-                {
-                    mGLTFMaterial[side_idx] = override_mat;
-                }
-                else
-                {
-                    LL_WARNS() << "Invalid GLTF string: \n" << gltf_json_str << LL_ENDL;
-                    if (!error.empty())
-                    {
-                        LL_WARNS() << "Error: " << error << LL_ENDL;
-                    }
-                    if (!warn.empty())
-                    {
-                        LL_WARNS() << "Warning: " << warn << LL_ENDL;
-                    }
-                }
+                override_mat->applyOverrideLLSD(gltf_llsd[i]);
+                mGLTFMaterial[side_idx] = override_mat;
             }
         }
         else
@@ -157,7 +141,7 @@ LLSD LLGLTFOverrideCacheEntry::toLLSD() const
         // check that mSides and mGLTFMaterial have exactly the same keys present
         llassert(mGLTFMaterial.count(side.first) == 1);
         data["sides"].append(LLSD::Integer(side.first));
-        data["gltf_json"].append(side.second);
+        data["gltf_llsd"].append(side.second);
     }
 
     return data;
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index ec0df31828..8525edd121 100644
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -48,7 +48,7 @@ public:
 
     LLUUID mObjectId;
     U32    mLocalId = 0;
-    std::unordered_map<S32, std::string> mSides; //json per side
+    std::unordered_map<S32, LLSD> mSides; //override LLSD per side
     std::unordered_map<S32, LLPointer<LLGLTFMaterial> > mGLTFMaterial; //GLTF material per side
     U64 mRegionHandle = 0;
 };
-- 
cgit v1.2.3


From 6a1846e91acf0b003c19f2d08a6ccb13d30f39a0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 16:16:26 +0200
Subject: SL-18366 Crash in LLCullResult::assertDrawMapsEmpty - make the error
 message more informative

---
 indra/newview/llspatialpartition.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index c5df09d6e5..29d42b3c00 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -4076,7 +4076,8 @@ void LLCullResult::assertDrawMapsEmpty()
 	{
 		if (mRenderMapSize[i] != 0)
 		{
-			LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!" << LL_ENDL;
+			LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!"
+				<< " (mRenderMapSize[" << i << "] = " << mRenderMapSize[i] << ")" << LL_ENDL;
 		}
 	}
 }
-- 
cgit v1.2.3


From 200696f25c0db21469c64b89799a2dab54d082d9 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 16:57:36 +0200
Subject: SL-19664 Crash in LLAppViewer::initStrings - make the error message
 more informative

---
 indra/newview/llappviewer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a0135fb6e2..ed9bcd9bc6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2980,7 +2980,10 @@ void LLAppViewer::initStrings()
 	{
 		// initial check to make sure files are there failed
 		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
-		LL_ERRS() << "Viewer failed to find localization and UI files. Please reinstall viewer from  https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
+		LL_ERRS() << "Viewer failed to find localization and UI files"
+			<< " (strings_path_full = '" << strings_path_full << "')."
+			<< " Please reinstall viewer from https://secondlife.com/support/downloads"
+			<< " and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
 	}
 	LLTransUtil::parseStrings(strings_file, default_trans_args);
 	LLTransUtil::parseLanguageStrings("language_settings.xml");
-- 
cgit v1.2.3


From 2ce27627a18787113c1b9a1fd99b5a516d693a8c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 30 Aug 2023 11:20:11 -0500
Subject: SL-19842 Followup -- fix sunlight going black and make automatic
 object probes more wishy-washy (removes dark splotches where probes get stuck
 in walls)

---
 indra/newview/llreflectionmap.cpp |  9 +++++++++
 indra/newview/pipeline.cpp        | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index a039c8072a..2a2f4dbd5a 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -157,6 +157,7 @@ void LLReflectionMap::autoAdjustOrigin()
             }
 
             mRadius = llmax(sqrtf(r2.getF32()), 8.f);
+            
         }
     }
     else if (mViewerObject)
@@ -204,6 +205,14 @@ F32 LLReflectionMap::getNearClip()
     {
         ret = ((LLVOVolume*)mViewerObject)->getReflectionProbeNearClip();
     }
+    else if (mGroup)
+    {
+        ret = mRadius * 0.5f; // default to half radius for automatic object probes
+    }
+    else
+    {
+        ret = 1.f; // default to 1m for automatic terrain probes
+    }
 
     return llmax(ret, MINIMUM_NEAR_CLIP);
 }
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 0b5908a440..78d4e65d42 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7730,8 +7730,18 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_
 		shader.uniformMatrix4fv(LLShaderMgr::DEFERRED_NORM_MATRIX, 1, FALSE, norm_mat.m);
 	}
 
-    //shader.uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, 1, mSunDiffuse.mV);
-    //shader.uniform3fv(LLShaderMgr::MOONLIGHT_COLOR, 1, mMoonDiffuse.mV);
+    // auto adjust legacy sun color if needed
+    static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
+    static LLCachedControl<F32> auto_adjust_sun_color_scale(gSavedSettings, "RenderSkyAutoAdjustSunColorScale", 1.f);
+    LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
+    LLColor3 sun_diffuse(mSunDiffuse.mV);
+    if (should_auto_adjust && psky->canAutoAdjust())
+    {
+        sun_diffuse *= auto_adjust_sun_color_scale;
+    }
+
+    shader.uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, 1, sun_diffuse.mV);
+    shader.uniform3fv(LLShaderMgr::MOONLIGHT_COLOR, 1, mMoonDiffuse.mV);
 
     shader.uniform1f(LLShaderMgr::REFLECTION_PROBE_MAX_LOD, mReflectionMapManager.mMaxProbeLOD);
 }
-- 
cgit v1.2.3


From 75a0719ff59118c0a5c6713e952cab4d0640a7d5 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 30 Aug 2023 12:57:48 -0500
Subject: SL-19842 Followup -- less aggressive ambient kill.

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/llreflectionmap.cpp       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ee4c76943e..b4e149f0e0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10654,7 +10654,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.5</real>
+    <real>0.7</real>
   </map>
   <key>RenderSkyAutoAdjustHDRScale</key>
   <map>
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index 2a2f4dbd5a..ec54fa1165 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -157,6 +157,9 @@ void LLReflectionMap::autoAdjustOrigin()
             }
 
             mRadius = llmax(sqrtf(r2.getF32()), 8.f);
+
+            // make sure near clip doesn't poke through ground
+            fp[2] = llmax(fp[2], height+mRadius*0.5f);
             
         }
     }
-- 
cgit v1.2.3


From 71a02a8d359f9a916f3119fa947addec07260c28 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 22:26:58 +0300
Subject: SL-20242 UI overlap in object profile with DebugPermissions on

---
 indra/newview/llsidepaneltaskinfo.cpp              | 110 +++++++++++++--------
 indra/newview/llsidepaneltaskinfo.h                |  16 +--
 .../default/xui/en/floater_task_properties.xml     |   4 +-
 3 files changed, 81 insertions(+), 49 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 3331bc4d68..1d6b3cd80c 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -76,6 +76,7 @@ static LLPanelInjector<LLSidepanelTaskInfo> t_task_info("sidepanel_task_info");
 
 // Default constructor
 LLSidepanelTaskInfo::LLSidepanelTaskInfo()
+    : mVisibleDebugPermissions(true) // space was allocated by default
 {
 	setMouseOpaque(FALSE);
 	LLSelectMgr::instance().mUpdateSignal.connect(boost::bind(&LLSidepanelTaskInfo::refreshAll, this));
@@ -147,12 +148,12 @@ BOOL LLSidepanelTaskInfo::postBuild()
 	mDALabelClickAction = getChildView("label click action");
 	mDAComboClickAction = getChild<LLComboBox>("clickaction");
 	mDAPathfindingAttributes = getChild<LLTextBase>("pathfinding_attributes_value");
-	mDAB = getChildView("B:");
-	mDAO = getChildView("O:");
-	mDAG = getChildView("G:");
-	mDAE = getChildView("E:");
-	mDAN = getChildView("N:");
-	mDAF = getChildView("F:");
+	mDAB = getChild<LLUICtrl>("B:");
+	mDAO = getChild<LLUICtrl>("O:");
+	mDAG = getChild<LLUICtrl>("G:");
+	mDAE = getChild<LLUICtrl>("E:");
+	mDAN = getChild<LLUICtrl>("N:");
+	mDAF = getChild<LLUICtrl>("F:");
 	
 	return TRUE;
 }
@@ -202,12 +203,22 @@ void LLSidepanelTaskInfo::disableAll()
 
 	disablePermissions();
 
-	mDAB->setVisible(FALSE);
-	mDAO->setVisible(FALSE);
-	mDAG->setVisible(FALSE);
-	mDAE->setVisible(FALSE);
-	mDAN->setVisible(FALSE);
-	mDAF->setVisible(FALSE);
+    if (mVisibleDebugPermissions)
+    {
+        mDAB->setVisible(FALSE);
+        mDAO->setVisible(FALSE);
+        mDAG->setVisible(FALSE);
+        mDAE->setVisible(FALSE);
+        mDAN->setVisible(FALSE);
+        mDAF->setVisible(FALSE);
+
+        LLFloater* parent_floater = gFloaterView->getParentFloater(this);
+        LLRect parent_rect = parent_floater->getRect();
+        LLRect debug_rect = mDAB->getRect();
+        // use double the debug rect for padding (since it isn't trivial to extract top_pad)
+        parent_floater->reshape(parent_rect.getWidth(), parent_rect.getHeight() - (debug_rect.getHeight() * 2));
+        mVisibleDebugPermissions = false;
+    }
 
 	mOpenBtn->setEnabled(FALSE);
 	mPayBtn->setEnabled(FALSE);
@@ -609,23 +620,23 @@ void LLSidepanelTaskInfo::refresh()
 	
 	if (gSavedSettings.getBOOL("DebugPermissions") )
 	{
-		if (valid_base_perms)
-		{
-			getChild<LLUICtrl>("B:")->setValue("B: " + mask_to_string(base_mask_on));
-			getChildView("B:")->setVisible(							TRUE);
-			
-			getChild<LLUICtrl>("O:")->setValue("O: " + mask_to_string(owner_mask_on));
-			getChildView("O:")->setVisible(							TRUE);
-			
-			getChild<LLUICtrl>("G:")->setValue("G: " + mask_to_string(group_mask_on));
-			getChildView("G:")->setVisible(							TRUE);
-			
-			getChild<LLUICtrl>("E:")->setValue("E: " + mask_to_string(everyone_mask_on));
-			getChildView("E:")->setVisible(							TRUE);
-			
-			getChild<LLUICtrl>("N:")->setValue("N: " + mask_to_string(next_owner_mask_on));
-			getChildView("N:")->setVisible(							TRUE);
-		}
+        if (valid_base_perms)
+        {
+            mDAB->setValue("B: " + mask_to_string(base_mask_on));
+            mDAB->setVisible(							TRUE);
+
+            mDAO->setValue("O: " + mask_to_string(owner_mask_on));
+            mDAO->setVisible(							TRUE);
+
+            mDAG->setValue("G: " + mask_to_string(group_mask_on));
+            mDAG->setVisible(							TRUE);
+
+            mDAE->setValue("E: " + mask_to_string(everyone_mask_on));
+            mDAE->setVisible(							TRUE);
+
+            mDAN->setValue("N: " + mask_to_string(next_owner_mask_on));
+            mDAN->setVisible(							TRUE);
+        }
 
 		U32 flag_mask = 0x0;
 		if (objectp->permMove()) 		flag_mask |= PERM_MOVE;
@@ -633,18 +644,35 @@ void LLSidepanelTaskInfo::refresh()
 		if (objectp->permCopy()) 		flag_mask |= PERM_COPY;
 		if (objectp->permTransfer()) 	flag_mask |= PERM_TRANSFER;
 
-		getChild<LLUICtrl>("F:")->setValue("F:" + mask_to_string(flag_mask));
-		getChildView("F:")->setVisible(								TRUE);
-	}
-	else
-	{
-		getChildView("B:")->setVisible(								FALSE);
-		getChildView("O:")->setVisible(								FALSE);
-		getChildView("G:")->setVisible(								FALSE);
-		getChildView("E:")->setVisible(								FALSE);
-		getChildView("N:")->setVisible(								FALSE);
-		getChildView("F:")->setVisible(								FALSE);
-	}
+        mDAF->setValue("F:" + mask_to_string(flag_mask));
+        mDAF->setVisible(TRUE);
+
+        if (!mVisibleDebugPermissions)
+        {
+            LLFloater* parent_floater = gFloaterView->getParentFloater(this);
+            LLRect parent_rect = parent_floater->getRect();
+            LLRect debug_rect = mDAB->getRect();
+            // use double the debug rect for padding (since it isn't trivial to extract top_pad)
+            parent_floater->reshape(parent_rect.getWidth(), parent_rect.getHeight() + (debug_rect.getHeight() * 2));
+            mVisibleDebugPermissions = true;
+        }
+    }
+    else if (mVisibleDebugPermissions)
+    {
+        mDAB->setVisible(FALSE);
+        mDAO->setVisible(FALSE);
+        mDAG->setVisible(FALSE);
+        mDAE->setVisible(FALSE);
+        mDAN->setVisible(FALSE);
+        mDAF->setVisible(FALSE);
+
+        LLFloater* parent_floater = gFloaterView->getParentFloater(this);
+        LLRect parent_rect = parent_floater->getRect();
+        LLRect debug_rect = mDAB->getRect();
+        // use double the debug rect for padding (since it isn't trivial to extract top_pad)
+        parent_floater->reshape(parent_rect.getWidth(), parent_rect.getHeight() - (debug_rect.getHeight() * 2));
+        mVisibleDebugPermissions = false;
+    }
 
 	BOOL has_change_perm_ability = FALSE;
 	BOOL has_change_sale_ability = FALSE;
diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index fbecf6f79f..852d36293b 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -125,6 +125,10 @@ protected:
 private:
 	LLPointer<LLViewerObject>	mObject;
 	LLObjectSelectionHandle		mObjectSelection;
+
+    // mVisibleDebugPermissions doesn't nessesarily matche state
+    // of viewes and is primarily for floater resize
+    bool                        mVisibleDebugPermissions;
 	static LLSidepanelTaskInfo* sActivePanel;
 	
 private:
@@ -152,12 +156,12 @@ private:
 	LLView*		mDALabelClickAction;
 	LLComboBox*	mDAComboClickAction;
 	LLTextBase* mDAPathfindingAttributes;
-	LLView*		mDAB;
-	LLView*		mDAO;
-	LLView*		mDAG;
-	LLView*		mDAE;
-	LLView*		mDAN;
-	LLView*		mDAF;
+    LLUICtrl*   mDAB;
+    LLUICtrl*   mDAO;
+    LLUICtrl*   mDAG;
+    LLUICtrl*   mDAE;
+    LLUICtrl*   mDAN;
+    LLUICtrl*   mDAF;
 };
 
 
diff --git a/indra/newview/skins/default/xui/en/floater_task_properties.xml b/indra/newview/skins/default/xui/en/floater_task_properties.xml
index 4b5c207577..56c236eab4 100644
--- a/indra/newview/skins/default/xui/en/floater_task_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_task_properties.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="570"
+ height="590"
  layout="topleft"
  name="Task Properties"
  help_topic="item+properties"
@@ -17,7 +17,7 @@
    name="sidepanel"
    top="20"
    label=""
-   height="550"
+   height="570"
    visible="true"
    width="330">
  </panel>
-- 
cgit v1.2.3


From a44959c00a8ec4675d40dcd81e217f905f948735 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 1 Sep 2023 19:53:05 +0200
Subject: SL-19664 Crash in LLAppViewer::initStrings(2985) - log extended info

---
 indra/newview/llappviewer.cpp | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ed9bcd9bc6..ce5430104e 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -36,6 +36,7 @@
 #include "llenvironment.h"
 #include "llerrorcontrol.h"
 #include "lleventtimer.h"
+#include "llfile.h"
 #include "llviewertexturelist.h"
 #include "llgroupmgr.h"
 #include "llagent.h"
@@ -2978,10 +2979,31 @@ void LLAppViewer::initStrings()
 	std::string strings_path_full = gDirUtilp->findSkinnedFilenameBaseLang(LLDir::XUI, strings_file);
 	if (strings_path_full.empty() || !LLFile::isfile(strings_path_full))
 	{
+		if (strings_path_full.empty())
+		{
+			LL_WARNS() << "The file '" << strings_file << "' is not found" << LL_ENDL;
+		}
+		else
+		{
+			llstat st;
+			int rc = LLFile::stat(strings_path_full, &st);
+			if (rc != 0)
+			{
+				LL_WARNS() << "The file '" << strings_path_full << "' failed to get status. Error code: " << rc << LL_ENDL;
+			}
+			else if (S_ISDIR(st.st_mode))
+			{
+				LL_WARNS() << "The filename '" << strings_path_full << "' is a directory name" << LL_ENDL;
+			}
+			else
+			{
+				LL_WARNS() << "The filename '" << strings_path_full << "' doesn't seem to be a regular file name" << LL_ENDL;
+			}
+		}
+
 		// initial check to make sure files are there failed
 		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
-		LL_ERRS() << "Viewer failed to find localization and UI files"
-			<< " (strings_path_full = '" << strings_path_full << "')."
+		LL_ERRS() << "Viewer failed to find localization and UI files."
 			<< " Please reinstall viewer from https://secondlife.com/support/downloads"
 			<< " and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
 	}
-- 
cgit v1.2.3


From 05c8ef3f3c002e71805bb04e9eddc3280630fca1 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 1 Sep 2023 17:36:00 -0700
Subject: SL-20167: Grey out the clipboard when copying the material to
 clipboard is not allowed

---
 indra/newview/llmaterialeditor.cpp | 8 ++++++++
 indra/newview/llmaterialeditor.h   | 1 +
 indra/newview/llpanelface.cpp      | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 54d85c87ac..8f4e0658f6 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1947,6 +1947,14 @@ bool LLMaterialEditor::canSaveObjectsMaterial()
     return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions, item_out);
 }
 
+bool LLMaterialEditor::canClipboardObjectsMaterial()
+{
+    LLSelectedTEGetMatData func(true);
+    LLPermissions permissions;
+    LLViewerInventoryItem* item_out;
+    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), permissions, item_out);
+}
+
 void LLMaterialEditor::saveObjectsMaterialAs()
 {
     LLSelectedTEGetMatData func(true);
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 6b2f49e2fc..b29db706f8 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -115,6 +115,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
 
     static bool canModifyObjectsMaterial();
     static bool canSaveObjectsMaterial();
+    static bool canClipboardObjectsMaterial();
     static void saveObjectsMaterialAs();
     static void onCopyObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions, const LLUUID& object_id, const LLUUID& item_id);
     static void onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions);
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index b502fa3546..d86956e370 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1975,7 +1975,8 @@ void LLPanelFace::updateCopyTexButton()
     LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
     mMenuClipboardTexture->setEnabled(objectp && objectp->getPCode() == LL_PCODE_VOLUME && objectp->permModify() 
                                                     && !objectp->isPermanentEnforced() && !objectp->isInventoryPending() 
-                                                    && (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1));
+                                                    && (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)
+                                                    && LLMaterialEditor::canClipboardObjectsMaterial());
     std::string tooltip = (objectp && objectp->isInventoryPending()) ? LLTrans::getString("LoadingContents") : getString("paste_options");
     mMenuClipboardTexture->setToolTip(tooltip);
 }
@@ -4147,7 +4148,8 @@ void LLPanelFace::onCopyTexture()
         || objectp->getPCode() != LL_PCODE_VOLUME
         || !objectp->permModify()
         || objectp->isPermanentEnforced()
-        || selected_count > 1)
+        || selected_count > 1
+        || !LLMaterialEditor::canClipboardObjectsMaterial())
     {
         return;
     }
-- 
cgit v1.2.3


From f7e6b2e2e1335a0086ccaa2cf435c388a9858236 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sat, 2 Sep 2023 12:35:35 +0200
Subject: SL-20236 BugSplat Crash in LLVertexBuffer::validateRange(708)

---
 indra/newview/llvopartgroup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index 3ac04cf665..99874b8185 100644
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -572,7 +572,7 @@ void LLVOPartGroup::getGeometry(const LLViewerPart& part,
 		up.setCross3(right, at);
 		up.normalize3fast();
 
-		if (part.mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK)
+		if (part.mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK && !part.mVelocity.isExactlyZero())
 		{
 			LLVector4a normvel;
 			normvel.load3(part.mVelocity.mV);
-- 
cgit v1.2.3


From 8d0af77d0b931781fd44e83e672f40fdb1ee458e Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 5 Sep 2023 16:54:03 +0200
Subject: SL-19709 Fix for fullbright shiny not factoring out exposure (update)

---
 indra/llrender/llvertexbuffer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index b5dda23828..de27636c33 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -703,7 +703,7 @@ bool LLVertexBuffer::validateRange(U32 start, U32 end, U32 count, U32 indices_of
 
         for (U32 i = start; i <= end; ++i)
         {
-            if (!v->isFinite3())
+            if (!v[i].isFinite3())
             {
                 LL_ERRS() << "Non-finite vertex position data detected." << LL_ENDL;
             }
-- 
cgit v1.2.3


From acc7f6a271ce7695fd681ae67dd4071ad5246f10 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 4 Sep 2023 17:08:43 +0300
Subject: SL-18125 Fixed default upload permissions being ignored

---
 indra/newview/llmaterialeditor.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 54d85c87ac..daf6fdb20d 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1197,10 +1197,16 @@ bool LLMaterialEditor::saveIfNeeded()
     }
     else
     { 
-        //make a new inventory item
-        std::string res_desc = buildMaterialDescription();
+        // Make a new inventory item and set upload permissions
         LLPermissions local_permissions;
         local_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+
+        U32 everyone_perm = LLFloaterPerms::getEveryonePerms("Materials");
+        U32 group_perm = LLFloaterPerms::getGroupPerms("Materials");
+        U32 next_owner_perm = LLFloaterPerms::getNextOwnerPerms("Materials");
+        local_permissions.initMasks(PERM_ALL, PERM_ALL, everyone_perm, group_perm, next_owner_perm);
+
+        std::string res_desc = buildMaterialDescription();
         createInventoryItem(buffer, mMaterialName, res_desc, local_permissions);
 
         // We do not update floater with uploaded asset yet, so just close it.
-- 
cgit v1.2.3


From 88a4d1f5d30bd354d9e9813c2fb3bc3f140256f4 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 5 Sep 2023 16:59:27 +0200
Subject: SL-19655 Remove a couple unused debug settings and related code
 (update)

---
 indra/newview/llface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 3c71d3e49d..cec1f47a4c 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1174,7 +1174,6 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		{
 			if (gDebugGL)
 			{
-                llassert(false);
 				LL_WARNS()	<< "Index buffer overflow!" << LL_ENDL;
 				LL_WARNS() << "Indices Count: " << mIndicesCount
 						<< " VF Num Indices: " << num_indices
@@ -1182,6 +1181,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 						<< " VB Num Indices: " << mVertexBuffer->getNumIndices() << LL_ENDL;
 				LL_WARNS()	<< " Face Index: " << f
 						<< " Pool Type: " << mPoolType << LL_ENDL;
+				llassert(false);
 			}
 			return FALSE;
 		}
@@ -1190,8 +1190,8 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		{
 			if (gDebugGL)
 			{
-                llassert(false);
 				LL_WARNS() << "Vertex buffer overflow!" << LL_ENDL;
+				llassert(false);
 			}
 			return FALSE;
 		}
-- 
cgit v1.2.3


From a93fc959c78a5f90c1f9dd79af5c10b2eea7ae34 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 28 Aug 2023 21:48:32 +0300
Subject: SL-20214 Crash at LLControlAVBridge::updateSpatialExtents

(cherry picked from commit 3d2da2b2c09fc637c2eaccac1607e3480bede145)
---
 indra/newview/llvovolume.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4ddba872f1..269c5666cc 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5114,8 +5114,6 @@ void LLControlAVBridge::updateSpatialExtents()
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWABLE
 
-	LLControlAvatar* controlAvatar = getVObj()->getControlAvatar();
-
 	LLSpatialGroup* root = (LLSpatialGroup*)mOctree->getListener(0);
 
 	bool rootWasDirty = root->isDirty();
@@ -5126,7 +5124,11 @@ void LLControlAVBridge::updateSpatialExtents()
 	// disappear when root goes off-screen"
 	//
 	// Expand extents to include Control Avatar placed outside of the bounds
-	if (controlAvatar && (rootWasDirty || controlAvatar->mPlaying))
+    LLControlAvatar* controlAvatar = getVObj() ? getVObj()->getControlAvatar() : NULL;
+    if (controlAvatar
+        && controlAvatar->mDrawable
+        && controlAvatar->mDrawable->getEntry()
+        && (rootWasDirty || controlAvatar->mPlaying))
 	{
 		root->expandExtents(controlAvatar->mDrawable->getSpatialExtents(), *mDrawable->getXform());
 	}
-- 
cgit v1.2.3


From 43cd4e84bc01abcf2820b9557abe761fbf5e8432 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 6 Sep 2023 10:31:03 -0500
Subject: SL-19842 WIP -- Change how probe ambiance mixes with sky ambient.

---
 .../class1/deferred/postDeferredGammaCorrect.glsl  |  3 ++-
 .../shaders/class2/deferred/alphaF.glsl            |  6 ++---
 .../shaders/class2/deferred/pbralphaF.glsl         |  9 +++----
 .../shaders/class2/deferred/reflectionProbeF.glsl  |  8 +++---
 .../shaders/class3/deferred/fullbrightShinyF.glsl  |  4 +--
 .../shaders/class3/deferred/materialF.glsl         |  7 +++--
 .../shaders/class3/deferred/reflectionProbeF.glsl  | 31 ++++++++++++----------
 .../shaders/class3/deferred/softenLightF.glsl      | 16 +++++------
 .../shaders/class3/environment/waterF.glsl         |  4 +--
 9 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
index 53e4f02314..64e6bc9da2 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
@@ -105,7 +105,8 @@ vec3 toneMap(vec3 color)
     
     color *= exposure * exp_scale;
 
-    color = toneMapACES_Hill(color);
+    // mix ACES and Linear here as a compromise to avoid over-darkening legacy content
+    color = mix(toneMapACES_Hill(color), color, 0.333);
 #endif
 
     return color;
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
index da5f997429..3a251af240 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
@@ -85,7 +85,7 @@ float sampleDirectionalShadow(vec3 pos, vec3 norm, vec2 pos_screen);
 float getAmbientClamp();
 
 void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent);
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear);
 
 vec3 calcPointLightOrSpotLight(vec3 light_col, vec3 diffuse, vec3 v, vec3 n, vec4 lp, vec3 ln, float la, float fa, float is_pointlight, float ambiance)
 {
@@ -251,7 +251,7 @@ void main()
     vec3 irradiance;
     vec3 glossenv;
     vec3 legacyenv;
-    sampleReflectionProbesLegacy(irradiance, glossenv, legacyenv, frag, pos.xyz, norm.xyz, 0.0, 0.0, true);
+    sampleReflectionProbesLegacy(irradiance, glossenv, legacyenv, frag, pos.xyz, norm.xyz, 0.0, 0.0, true, amblit_linear);
     
 
     float da = dot(norm.xyz, light_dir.xyz);
@@ -266,7 +266,7 @@ void main()
 
     vec3 sun_contrib = min(final_da, shadow) * sunlit_linear;
 
-    color.rgb = max(amblit, irradiance);
+    color.rgb = irradiance;
 
     color.rgb += sun_contrib;
 
diff --git a/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
index e8db856b1f..be66b6feb2 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
@@ -92,7 +92,7 @@ void calcHalfVectors(vec3 lv, vec3 n, vec3 v, out vec3 h, out vec3 l, out float
 float calcLegacyDistanceAttenuation(float distance, float falloff);
 float sampleDirectionalShadow(vec3 pos, vec3 norm, vec2 pos_screen);
 void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv, 
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent);
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit_linear);
 
 void waterClip(vec3 pos);
 
@@ -224,11 +224,8 @@ void main()
     float gloss      = 1.0 - perceptualRoughness;
     vec3  irradiance = vec3(0);
     vec3  radiance  = vec3(0);
-    sampleReflectionProbes(irradiance, radiance, vary_position.xy*0.5+0.5, pos.xyz, norm.xyz, gloss, true);
-    // Take maximium of legacy ambient vs irradiance sample as irradiance
-    // NOTE: ao is applied in pbrIbl (see pbrBaseLight), do not apply here
-    irradiance       = max(amblit,irradiance);
-
+    sampleReflectionProbes(irradiance, radiance, vary_position.xy*0.5+0.5, pos.xyz, norm.xyz, gloss, true, amblit);
+    
     vec3 diffuseColor;
     vec3 specularColor;
     calcDiffuseSpecular(col.rgb, metallic, diffuseColor, specularColor);
diff --git a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl
index aa6f5a3b62..52e71edcac 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl
@@ -34,7 +34,7 @@ uniform mat3 env_mat;
 vec3 srgb_to_linear(vec3 c);
 
 void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent)
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit_linear)
 {
     ambenv = vec3(reflection_probe_ambiance * 0.25);
     
@@ -44,9 +44,9 @@ void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv,
 }
 
 void sampleReflectionProbesWater(inout vec3 ambenv, inout vec3 glossenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness)
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, vec3 amblit_linear)
 {
-    sampleReflectionProbes(ambenv, glossenv, tc, pos, norm, glossiness, false);
+    sampleReflectionProbes(ambenv, glossenv, tc, pos, norm, glossiness, false, amblit_linear);
 }
 
 vec4 sampleReflectionProbesDebug(vec3 pos)
@@ -56,7 +56,7 @@ vec4 sampleReflectionProbesDebug(vec3 pos)
 }
 
 void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent)
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear)
 {
     ambenv = vec3(reflection_probe_ambiance * 0.25);
     
diff --git a/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl
index 1537714bb7..54a887262b 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl
@@ -49,7 +49,7 @@ vec3 srgb_to_linear(vec3 c);
 
 // reflection probe interface
 void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent);
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear);
 
 void applyLegacyEnv(inout vec3 color, vec3 legacyenv, vec4 spec, vec3 pos, vec3 norm, float envIntensity);
 
@@ -80,7 +80,7 @@ void main()
     vec3 legacyenv;
     vec3 norm = normalize(vary_texcoord1.xyz);
     vec4 spec = vec4(0,0,0,0);
-    sampleReflectionProbesLegacy(ambenv, glossenv, legacyenv, vec2(0), pos.xyz, norm.xyz, spec.a, env_intensity, false);
+    sampleReflectionProbesLegacy(ambenv, glossenv, legacyenv, vec2(0), pos.xyz, norm.xyz, spec.a, env_intensity, false, amblit);
 
     color.rgb = legacy_adjust(color.rgb);
     color.rgb = srgb_to_linear(color.rgb);
diff --git a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
index 82e2de0c0f..319f2f25b7 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
@@ -60,7 +60,7 @@ float sampleDirectionalShadow(vec3 pos, vec3 norm, vec2 pos_screen);
 #endif
 
 void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent);
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear);
 void applyGlossEnv(inout vec3 color, vec3 glossenv, vec4 spec, vec3 pos, vec3 norm);
 void applyLegacyEnv(inout vec3 color, vec3 legacyenv, vec4 spec, vec3 pos, vec3 norm, float envIntensity);
 
@@ -339,10 +339,9 @@ void main()
     vec3 ambenv;
     vec3 glossenv;
     vec3 legacyenv;
-    sampleReflectionProbesLegacy(ambenv, glossenv, legacyenv, pos.xy*0.5+0.5, pos.xyz, norm.xyz, glossiness, env, true);
+    sampleReflectionProbesLegacy(ambenv, glossenv, legacyenv, pos.xy*0.5+0.5, pos.xyz, norm.xyz, glossiness, env, true, amblit_linear);
     
-    // use sky settings ambient or irradiance map sample, whichever is brighter
-    color = max(amblit_linear, ambenv);
+    color = ambenv;
 
     float da          = clamp(dot(norm.xyz, light_dir.xyz), 0.0, 1.0);
     vec3 sun_contrib = min(da, shadow) * sunlit_linear;
diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
index 41821def8e..906e66ecc8 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
@@ -530,7 +530,7 @@ vec3 tapRefMap(vec3 pos, vec3 dir, out float w, out float dw, float lod, vec3 c,
 // w - weight of sample (distance and angular attenuation)
 // dw - weight of sample (distance only)
 // i - index of probe 
-vec3 tapIrradianceMap(vec3 pos, vec3 dir, out float w, out float dw, vec3 c, int i)
+vec3 tapIrradianceMap(vec3 pos, vec3 dir, out float w, out float dw, vec3 c, int i, vec3 amblit)
 {
     // parallax adjustment
     vec3 v;
@@ -556,9 +556,12 @@ vec3 tapIrradianceMap(vec3 pos, vec3 dir, out float w, out float dw, vec3 c, int
 
     v -= c;
     v = env_mat * v;
-    {
-        return textureLod(irradianceProbes, vec4(v.xyz, refIndex[i].x), 0).rgb * refParams[i].x;
-    }
+    
+    vec3 col = textureLod(irradianceProbes, vec4(v.xyz, refIndex[i].x), 0).rgb * refParams[i].x;
+
+    col = mix(amblit, col, min(refParams[i].x, 1.0));
+
+    return col;
 }
 
 vec3 sampleProbes(vec3 pos, vec3 dir, float lod)
@@ -619,7 +622,7 @@ vec3 sampleProbes(vec3 pos, vec3 dir, float lod)
     return col[1]+col[0];
 }
 
-vec3 sampleProbeAmbient(vec3 pos, vec3 dir)
+vec3 sampleProbeAmbient(vec3 pos, vec3 dir, vec3 amblit)
 {
     // modified copy/paste of sampleProbes follows, will likely diverge from sampleProbes further
     // as irradiance map mixing is tuned independently of radiance map mixing
@@ -649,7 +652,7 @@ vec3 sampleProbeAmbient(vec3 pos, vec3 dir)
             float w = 0;
             float dw = 0;
 
-            vec3 refcol = tapIrradianceMap(pos, dir, w, dw, refSphere[i].xyz, i);
+            vec3 refcol = tapIrradianceMap(pos, dir, w, dw, refSphere[i].xyz, i, amblit);
 
             col[p] += refcol*w;
             wsum[p] += w;
@@ -679,14 +682,14 @@ vec3 sampleProbeAmbient(vec3 pos, vec3 dir)
 }
 
 void doProbeSample(inout vec3 ambenv, inout vec3 glossenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent)
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit)
 {
     // TODO - don't hard code lods
     float reflection_lods = max_probe_lod;
 
     vec3 refnormpersp = reflect(pos.xyz, norm.xyz);
 
-    ambenv = sampleProbeAmbient(pos, norm);
+    ambenv = sampleProbeAmbient(pos, norm, amblit);
 
     float lod = (1.0-glossiness)*reflection_lods;
     glossenv = sampleProbes(pos, normalize(refnormpersp), lod);
@@ -712,14 +715,14 @@ void doProbeSample(inout vec3 ambenv, inout vec3 glossenv,
 }
 
 void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent)
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit)
 {
     preProbeSample(pos);
-    doProbeSample(ambenv, glossenv, tc, pos, norm, glossiness, transparent);
+    doProbeSample(ambenv, glossenv, tc, pos, norm, glossiness, transparent, amblit);
 }
 
 void sampleReflectionProbesWater(inout vec3 ambenv, inout vec3 glossenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness)
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, vec3 amblit)
 {
     // don't sample automatic probes for water
     sample_automatic = false;
@@ -728,7 +731,7 @@ void sampleReflectionProbesWater(inout vec3 ambenv, inout vec3 glossenv,
     // always include void probe on water
     probeIndex[probeInfluences++] = 0;
 
-    doProbeSample(ambenv, glossenv, tc, pos, norm, glossiness, false);
+    doProbeSample(ambenv, glossenv, tc, pos, norm, glossiness, false, amblit);
 
     // fudge factor to get PBR water at a similar luminance ot legacy water
     glossenv *= 0.4;
@@ -783,14 +786,14 @@ vec4 sampleReflectionProbesDebug(vec3 pos)
 }
 
 void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent)
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit)
 {
     float reflection_lods = max_probe_lod;
     preProbeSample(pos);
 
     vec3 refnormpersp = reflect(pos.xyz, norm.xyz);
 
-    ambenv = sampleProbeAmbient(pos, norm);
+    ambenv = sampleProbeAmbient(pos, norm, amblit);
 
     if (glossiness > 0.0)
     {
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index 4ef003e0cb..8b0ea23897 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -69,9 +69,9 @@ vec3  scaleSoftClipFragLinear(vec3 l);
 
 // reflection probe interface
 void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv,
-    vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent);
+    vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit_linear);
 void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent);
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear);
 void applyGlossEnv(inout vec3 color, vec3 glossenv, vec4 spec, vec3 pos, vec3 norm);
 void applyLegacyEnv(inout vec3 color, vec3 legacyenv, vec4 spec, vec3 pos, vec3 norm, float envIntensity);
 float getDepth(vec2 pos_screen);
@@ -117,10 +117,10 @@ vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor,
                     vec3 l); //surface point to light
 
 
-void adjustIrradiance(inout vec3 irradiance, vec3 amblit_linear, float ambocc)
+void adjustIrradiance(inout vec3 irradiance, float ambocc)
 {
     // use sky settings ambient or irradiance map sample, whichever is brighter
-    irradiance = max(amblit_linear, irradiance);
+    //irradiance = max(amblit_linear, irradiance);
 
 #if defined(HAS_SSAO)
     irradiance = mix(ssao_effect_mat * min(irradiance.rgb*ssao_irradiance_scale, vec3(ssao_irradiance_max)), irradiance.rgb, ambocc);
@@ -194,9 +194,9 @@ void main()
         // PBR IBL
         float gloss      = 1.0 - perceptualRoughness;
         
-        sampleReflectionProbes(irradiance, radiance, tc, pos.xyz, norm.xyz, gloss, false);
+        sampleReflectionProbes(irradiance, radiance, tc, pos.xyz, norm.xyz, gloss, false, amblit_linear);
         
-        adjustIrradiance(irradiance, amblit_linear, ambocc);
+        adjustIrradiance(irradiance, ambocc);
 
         vec3 diffuseColor;
         vec3 specularColor;
@@ -232,9 +232,9 @@ void main()
         vec3 glossenv = vec3(0);
         vec3 legacyenv = vec3(0);
 
-        sampleReflectionProbesLegacy(irradiance, glossenv, legacyenv, tc, pos.xyz, norm.xyz, spec.a, envIntensity, false);
+        sampleReflectionProbesLegacy(irradiance, glossenv, legacyenv, tc, pos.xyz, norm.xyz, spec.a, envIntensity, false, amblit_linear);
         
-        adjustIrradiance(irradiance, amblit_linear, ambocc);
+        adjustIrradiance(irradiance, ambocc);
 
         // apply lambertian IBL only (see pbrIbl)
         color.rgb = irradiance;
diff --git a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
index 8fee259933..4f79dd1ac5 100644
--- a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
@@ -124,7 +124,7 @@ vec3 transform_normal(vec3 vNt)
 }
 
 void sampleReflectionProbesWater(inout vec3 ambenv, inout vec3 glossenv,
-        vec2 tc, vec3 pos, vec3 norm, float glossiness);
+        vec2 tc, vec3 pos, vec3 norm, float glossiness, vec3 amblit_linear);
 
 vec3 getPositionWithNDC(vec3 ndc);
 
@@ -237,7 +237,7 @@ void main()
     
     vec3  irradiance = vec3(0);
     vec3  radiance  = vec3(0);
-    sampleReflectionProbesWater(irradiance, radiance, distort2, pos.xyz, wave_ibl.xyz, gloss);
+    sampleReflectionProbesWater(irradiance, radiance, distort2, pos.xyz, wave_ibl.xyz, gloss, amblit);
 
     irradiance       = vec3(0);
 
-- 
cgit v1.2.3


From ab66df94cb7c4cc9a4530ea547aaf81dddec34de Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 6 Sep 2023 11:02:31 -0700
Subject: SL-20167: Also check permission on paste to be certain

---
 indra/newview/llpanelface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index d86956e370..df464bc7e5 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4344,7 +4344,8 @@ void LLPanelFace::onPasteTexture()
         || objectp->getPCode() != LL_PCODE_VOLUME
         || !objectp->permModify()
         || objectp->isPermanentEnforced()
-        || selected_count > 1)
+        || selected_count > 1
+        || !LLMaterialEditor::canClipboardObjectsMaterial())
     {
         // not supposed to happen
         LL_WARNS() << "Failed to paste texture due to missing or wrong selection" << LL_ENDL;
-- 
cgit v1.2.3


From c0bcc3740ea4c6662f9707d49ab5c7132bb2a0a8 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 6 Sep 2023 11:47:34 -0700
Subject: SL-20167: Don't block clipboard if GLTF material is null

---
 indra/newview/llmaterialeditor.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 8f4e0658f6..d4ea725af7 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1949,6 +1949,24 @@ bool LLMaterialEditor::canSaveObjectsMaterial()
 
 bool LLMaterialEditor::canClipboardObjectsMaterial()
 {
+    if (LLSelectMgr::getInstance()->getSelection()->getObjectCount() != 1)
+    {
+        return false;
+    }
+
+    struct LLSelectedTEGetNullMat : public LLSelectedTEFunctor
+    {
+        bool apply(LLViewerObject* objectp, S32 te_index)
+        {
+            return objectp->getRenderMaterialID(te_index).isNull();
+        }
+    } null_func;
+
+    if (LLSelectMgr::getInstance()->getSelection()->applyToTEs(&null_func))
+    {
+        return true;
+    }
+
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-- 
cgit v1.2.3


From 6675321e6abe92fa9968e998125bcc0f520234f0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 2 Sep 2023 01:40:03 +0300
Subject: SL-19826 Implement feedback for pasting into flat folder view Part#1

---
 indra/newview/llinventorybridge.cpp | 119 ++++++++++++++++++++++++++++++------
 indra/newview/llinventorybridge.h   |   8 +--
 2 files changed, 106 insertions(+), 21 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f582207614..e8c4a1ae02 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -162,6 +162,51 @@ public:
 	}
 };
 
+class LLPasteIntoFolderCallback: public LLInventoryCallback
+{
+public:
+    LLPasteIntoFolderCallback(LLHandle<LLInventoryPanel>& handle)
+        : mInventoryPanel(handle)
+    {
+        LLInventoryPanel* panel = mInventoryPanel.get();
+        if (panel)
+        {
+            panel->clearSelection();
+        }
+    }
+    ~LLPasteIntoFolderCallback()
+    {
+        LLInventoryPanel* panel = mInventoryPanel.get();
+        if (panel && panel->getRootFolder()->getSelectedCount() > 0)
+        {
+            panel->getRootFolder()->scrollToShowSelection();
+        }
+    }
+
+    void fire(const LLUUID& inv_item)
+    {
+        LLInventoryItem* item = gInventory.getItem(inv_item);
+        LLInventoryPanel* panel = mInventoryPanel.get();
+        if (item && panel)
+        {
+            LLUUID root_id = panel->getRootFolderID();
+
+            if (inv_item == root_id)
+            {
+                return;
+            }
+
+            LLFolderViewItem* item = panel->getItemByID(inv_item);
+            if (item)
+            {
+                panel->getRootFolder()->changeSelection(item, TRUE);
+            }
+        }
+    }
+private:
+    LLHandle<LLInventoryPanel> mInventoryPanel;
+};
+
 // +=================================================+
 // |        LLInvFVBridge                            |
 // +=================================================+
@@ -3814,8 +3859,16 @@ void LLFolderBridge::perform_pasteFromClipboard()
 		const BOOL move_is_into_favorites = (mUUID == favorites_id);
 		const BOOL move_is_into_lost_and_found = model->isObjectDescendentOf(mUUID, lost_and_found_id);
 
+        std::vector<LLUUID> result;
 		std::vector<LLUUID> objects;
 		LLClipboard::instance().pasteFromClipboard(objects);
+
+        LLPointer<LLInventoryCallback> cb = NULL;
+        LLInventoryPanel* panel = mInventoryPanel.get();
+        if (panel->getRootFolder()->isSingleFolderMode() && panel->getRootFolderID() == mUUID)
+        {
+            cb = new LLPasteIntoFolderCallback(mInventoryPanel);
+        }
         
         LLViewerInventoryCategory * dest_folder = getCategory();
 		if (move_is_into_marketplacelistings)
@@ -3891,7 +3944,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
 				{
 					if (!move_is_into_my_outfits && item && can_move_to_outfit(item, move_is_into_current_outfit))
 					{
-						dropToOutfit(item, move_is_into_current_outfit);
+						dropToOutfit(item, move_is_into_current_outfit, cb);
 					}
 					else if (move_is_into_my_outfits && LLAssetType::AT_CATEGORY == obj->getType())
 					{
@@ -3899,7 +3952,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
 						U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
 						if (cat && can_move_to_my_outfits(model, cat, max_items_to_wear))
 						{
-							dropToMyOutfits(cat);
+							dropToMyOutfits(cat, cb);
 						}
 						else
 						{
@@ -3915,7 +3968,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
 				{
 					if (item && can_move_to_outfit(item, move_is_into_current_outfit))
 					{
-						dropToOutfit(item, move_is_into_current_outfit);
+						dropToOutfit(item, move_is_into_current_outfit, cb);
 					}
 					else
 					{
@@ -3934,11 +3987,12 @@ void LLFolderBridge::perform_pasteFromClipboard()
                             {
                                 //changeItemParent() implicity calls dirtyFilter
                                 changeItemParent(model, viitem, parent_id, FALSE);
+                                result.push_back(item_id);
                             }
                         }
                         else
                         {
-                            dropToFavorites(item);
+                            dropToFavorites(item, cb);
                         }
 					}
 				}
@@ -3966,6 +4020,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                 //changeCategoryParent() implicity calls dirtyFilter
                                 changeCategoryParent(model, vicat, parent_id, FALSE);
                             }
+                            result.push_back(item_id);
 						}
 					}
 					else
@@ -3987,6 +4042,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                 //changeItemParent() implicity calls dirtyFilter
                                 changeItemParent(model, viitem, parent_id, FALSE);
                             }
+                            result.push_back(item_id);
                         }
                     }
 				}
@@ -4007,6 +4063,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                             {
                                 copy_inventory_category(model, vicat, parent_id);
                             }
+                            result.push_back(item_id);
 						}
 					}
                     else
@@ -4022,11 +4079,12 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                     // Stop pasting into the marketplace as soon as we get an error
                                     break;
                                 }
+                                result.push_back(item_id);
                             }
                             else if (item->getIsLinkType())
                             {
                                 link_inventory_object(parent_id, item_id,
-                                    LLPointer<LLInventoryCallback>(NULL));
+                                    cb);
                             }
                             else
                             {
@@ -4036,7 +4094,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                                     item->getUUID(),
                                                     parent_id,
                                                     std::string(),
-                                                    LLPointer<LLInventoryCallback>(NULL));
+                                                    cb);
                             }
                         }
                     }
@@ -4045,6 +4103,14 @@ void LLFolderBridge::perform_pasteFromClipboard()
         }
 		// Change mode to paste for next paste
 		LLClipboard::instance().setCutMode(false);
+
+        if (cb.notNull())
+        {
+            for (LLUUID& pasted_id : result)
+            {
+                cb->fire(pasted_id);
+            }
+        }
 	}
 }
 
@@ -4072,6 +4138,14 @@ void LLFolderBridge::pasteLinkFromClipboard()
 
 		std::vector<LLUUID> objects;
 		LLClipboard::instance().pasteFromClipboard(objects);
+
+        LLPointer<LLInventoryCallback> cb = NULL;
+        LLInventoryPanel* panel = mInventoryPanel.get();
+        if (panel->getRootFolder()->isSingleFolderMode())
+        {
+            cb = new LLPasteIntoFolderCallback(mInventoryPanel);
+        }
+
 		for (std::vector<LLUUID>::const_iterator iter = objects.begin();
 			 iter != objects.end();
 			 ++iter)
@@ -4082,12 +4156,12 @@ void LLFolderBridge::pasteLinkFromClipboard()
 				LLInventoryItem *item = model->getItem(object_id);
 				if (item && can_move_to_outfit(item, move_is_into_current_outfit))
 				{
-					dropToOutfit(item, move_is_into_current_outfit);
+					dropToOutfit(item, move_is_into_current_outfit, cb);
 				}
 			}
 			else if (LLConstPointer<LLInventoryObject> obj = model->getObject(object_id))
 			{
-				link_inventory_object(parent_id, obj, LLPointer<LLInventoryCallback>(NULL));
+				link_inventory_object(parent_id, obj, cb);
 			}
 		}
 		// Change mode to paste for next paste
@@ -4880,29 +4954,41 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
 	return false;
 }
 
-void LLFolderBridge::dropToFavorites(LLInventoryItem* inv_item)
+void drop_to_favorites_cb(const LLUUID& id, LLPointer<LLInventoryCallback> cb1, LLPointer<LLInventoryCallback> cb2)
+{
+    cb1->fire(id);
+    cb2->fire(id);
+}
+
+void LLFolderBridge::dropToFavorites(LLInventoryItem* inv_item, LLPointer<LLInventoryCallback> cb)
 {
 	// use callback to rearrange favorite landmarks after adding
 	// to have new one placed before target (on which it was dropped). See EXT-4312.
-	LLPointer<AddFavoriteLandmarkCallback> cb = new AddFavoriteLandmarkCallback();
+	LLPointer<AddFavoriteLandmarkCallback> cb_fav = new AddFavoriteLandmarkCallback();
 	LLInventoryPanel* panel = mInventoryPanel.get();
 	LLFolderViewItem* drag_over_item = panel ? panel->getRootFolder()->getDraggingOverItem() : NULL;
 	LLFolderViewModelItemInventory* view_model = drag_over_item ? static_cast<LLFolderViewModelItemInventory*>(drag_over_item->getViewModelItem()) : NULL;
 	if (view_model)
 	{
-		cb.get()->setTargetLandmarkId(view_model->getUUID());
+		cb_fav.get()->setTargetLandmarkId(view_model->getUUID());
 	}
 
+    LLPointer <LLInventoryCallback> callback = cb_fav;
+    if (cb)
+    {
+        callback = new LLBoostFuncInventoryCallback(boost::bind(drop_to_favorites_cb, _1, cb, cb_fav));
+    }
+
 	copy_inventory_item(
 		gAgent.getID(),
 		inv_item->getPermissions().getOwner(),
 		inv_item->getUUID(),
 		mUUID,
 		std::string(),
-		cb);
+        callback);
 }
 
-void LLFolderBridge::dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit)
+void LLFolderBridge::dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit, LLPointer<LLInventoryCallback> cb)
 {
 	if((inv_item->getInventoryType() == LLInventoryType::IT_TEXTURE) || (inv_item->getInventoryType() == LLInventoryType::IT_SNAPSHOT))
 	{
@@ -4927,14 +5013,14 @@ void LLFolderBridge::dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_c
 	}
 }
 
-void LLFolderBridge::dropToMyOutfits(LLInventoryCategory* inv_cat)
+void LLFolderBridge::dropToMyOutfits(LLInventoryCategory* inv_cat, LLPointer<LLInventoryCallback> cb)
 {
     // make a folder in the My Outfits directory.
     const LLUUID dest_id = getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
     // Note: creation will take time, so passing folder id to callback is slightly unreliable,
     // but so is collecting and passing descendants' ids
-    inventory_func_type func = boost::bind(&LLFolderBridge::outfitFolderCreatedCallback, this, inv_cat->getUUID(), _1);
+    inventory_func_type func = boost::bind(&LLFolderBridge::outfitFolderCreatedCallback, this, inv_cat->getUUID(), _1, cb);
     gInventory.createNewCategory(dest_id,
                                  LLFolderType::FT_OUTFIT,
                                  inv_cat->getName(),
@@ -4942,7 +5028,7 @@ void LLFolderBridge::dropToMyOutfits(LLInventoryCategory* inv_cat)
                                  inv_cat->getThumbnailUUID());
 }
 
-void LLFolderBridge::outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id)
+void LLFolderBridge::outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id, LLPointer<LLInventoryCallback> cb)
 {
     LLInventoryModel::cat_array_t* categories;
     LLInventoryModel::item_array_t* items;
@@ -4973,7 +5059,6 @@ void LLFolderBridge::outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID ca
 
     if (!link_array.empty())
     {
-        LLPointer<LLInventoryCallback> cb = NULL;
         link_inventory_array(cat_dest_id, link_array, cb);
     }
 }
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 1990545381..7653208d90 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -366,9 +366,9 @@ protected:
 	void copyOutfitToClipboard();
 	void determineFolderType();
 
-	void dropToFavorites(LLInventoryItem* inv_item);
-	void dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit);
-	void dropToMyOutfits(LLInventoryCategory* inv_cat);
+	void dropToFavorites(LLInventoryItem* inv_item, LLPointer<LLInventoryCallback> cb = NULL);
+	void dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit, LLPointer<LLInventoryCallback> cb = NULL);
+	void dropToMyOutfits(LLInventoryCategory* inv_cat, LLPointer<LLInventoryCallback> cb = NULL);
 
 	//--------------------------------------------------------------------
 	// Messy hacks for handling folder options
@@ -378,7 +378,7 @@ public:
 	static void staticFolderOptionsMenu();
 
 protected:
-    void outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id);
+    void outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id, LLPointer<LLInventoryCallback> cb);
     void callback_pasteFromClipboard(const LLSD& notification, const LLSD& response);
     void perform_pasteFromClipboard();
     void gatherMessage(std::string& message, S32 depth, LLError::ELevel log_level);
-- 
cgit v1.2.3


From 992d4ec36f8b37b6451cb0e76bfa29bc3bec365e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 4 Sep 2023 20:56:10 +0300
Subject: SL-19826 Implement feedback for dropping into flat folder view Part#2

---
 indra/newview/llfloateropenobject.cpp |  11 ++-
 indra/newview/llinventorybridge.cpp   | 156 ++++++++++++++++++++++------------
 indra/newview/llinventorybridge.h     |   9 +-
 3 files changed, 115 insertions(+), 61 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 73eaced562..d3ab22f792 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -184,9 +184,14 @@ void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category
 	
 	// Copy and/or move the items into the newly created folder.
 	// Ignore any "you're going to break this item" messages.
-	BOOL success = move_inv_category_world_to_agent(object_id, category_id, TRUE,
-													callbackMoveInventory, 
-													(void*)wear_data);
+	BOOL success = move_inv_category_world_to_agent(object_id,
+                                                    category_id,
+                                                    TRUE,
+                                                    [](S32 result, void* data, const LLMoveInv*)
+                                                    {
+                                                        callbackMoveInventory(result, data);
+                                                    },
+                                                    (void*)wear_data);
 	if (!success)
 	{
 		delete wear_data;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index e8c4a1ae02..49b6275c3e 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -168,43 +168,57 @@ public:
     LLPasteIntoFolderCallback(LLHandle<LLInventoryPanel>& handle)
         : mInventoryPanel(handle)
     {
-        LLInventoryPanel* panel = mInventoryPanel.get();
-        if (panel)
-        {
-            panel->clearSelection();
-        }
     }
     ~LLPasteIntoFolderCallback()
     {
-        LLInventoryPanel* panel = mInventoryPanel.get();
-        if (panel && panel->getRootFolder()->getSelectedCount() > 0)
-        {
-            panel->getRootFolder()->scrollToShowSelection();
-        }
+        processItems();
     }
 
     void fire(const LLUUID& inv_item)
     {
-        LLInventoryItem* item = gInventory.getItem(inv_item);
+        mChangedIds.push_back(inv_item);
+    }
+
+    void processItems()
+    {
         LLInventoryPanel* panel = mInventoryPanel.get();
-        if (item && panel)
+        bool has_elements = false;
+        for (LLUUID& inv_item : mChangedIds)
         {
-            LLUUID root_id = panel->getRootFolderID();
-
-            if (inv_item == root_id)
+            LLInventoryItem* item = gInventory.getItem(inv_item);
+            if (item && panel)
             {
-                return;
-            }
+                LLUUID root_id = panel->getRootFolderID();
 
-            LLFolderViewItem* item = panel->getItemByID(inv_item);
-            if (item)
-            {
-                panel->getRootFolder()->changeSelection(item, TRUE);
+                if (inv_item == root_id)
+                {
+                    return;
+                }
+
+                LLFolderViewItem* item = panel->getItemByID(inv_item);
+                if (item)
+                {
+                    if (!has_elements)
+                    {
+                        panel->clearSelection();
+                        panel->getRootFolder()->clearSelection();
+                        panel->getRootFolder()->requestArrange();
+                        panel->getRootFolder()->update();
+                        has_elements = true;
+                    }
+                    panel->getRootFolder()->changeSelection(item, TRUE);
+                }
             }
         }
+
+        if (has_elements)
+        {
+            panel->getRootFolder()->scrollToShowSelection();
+        }
     }
 private:
     LLHandle<LLInventoryPanel> mInventoryPanel;
+    std::vector<LLUUID> mChangedIds;
 };
 
 // +=================================================+
@@ -2557,7 +2571,8 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 											BOOL drop,
 											std::string& tooltip_msg,
 											BOOL is_link,
-											BOOL user_confirm)
+											BOOL user_confirm,
+                                            LLPointer<LLInventoryCallback> cb)
 {
 
 	LLInventoryModel* model = getInventoryModel();
@@ -2862,7 +2877,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 			{
 				// Category can contains objects,
 				// create a new folder and populate it with links to original objects
-				dropToMyOutfits(inv_cat);
+				dropToMyOutfits(inv_cat, cb);
 			}
 			// if target is current outfit folder we use link
 			else if (move_is_into_current_outfit &&
@@ -2872,10 +2887,12 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 				// traverse category and add all contents to currently worn.
 				BOOL append = true;
 				LLAppearanceMgr::instance().wearInventoryCategory(inv_cat, false, append);
+                if (cb) cb->fire(inv_cat->getUUID());
 			}
 			else if (move_is_into_marketplacelistings)
 			{
 				move_folder_to_marketplacelistings(inv_cat, mUUID);
+                if (cb) cb->fire(inv_cat->getUUID());
 			}
 			else
 			{
@@ -2891,6 +2908,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 					(LLViewerInventoryCategory*)inv_cat,
 					mUUID,
 					move_is_into_trash);
+                if (cb) cb->fire(inv_cat->getUUID());
 			}
             if (move_is_from_marketplacelistings)
             {
@@ -2922,6 +2940,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                     }
                     // In all cases, update the listing we moved from so suffix are updated
                     update_marketplace_category(from_folder_uuid);
+                    if (cb) cb->fire(inv_cat->getUUID());
                 }
             }
 		}
@@ -2935,7 +2954,19 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 		}
 		else
 		{
-			accept = move_inv_category_world_to_agent(cat_id, mUUID, drop, NULL, NULL, filter);
+            // Todo: fix me. moving from task inventory doesn't have a completion callback,
+            // yet making a copy creates new item id so this doesn't work right
+            std::function<void(S32, void*, const LLMoveInv*)> callback = [cb](S32, void*, const LLMoveInv* move_inv) mutable
+            {
+                two_uuids_list_t::const_iterator move_it;
+                for (move_it = move_inv->mMoveList.begin();
+                     move_it != move_inv->mMoveList.end();
+                     ++move_it)
+                {
+                    cb->fire(move_it->second);
+                }
+            };
+			accept = move_inv_category_world_to_agent(cat_id, mUUID, drop, callback, NULL, filter);
 		}
 	}
 	else if (LLToolDragAndDrop::SOURCE_LIBRARY == source)
@@ -3006,7 +3037,7 @@ void warn_move_inventory(LLViewerObject* object, boost::shared_ptr<LLMoveInv> mo
 BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
 									  const LLUUID& category_id,
 									  BOOL drop,
-									  void (*callback)(S32, void*),
+									  std::function<void(S32, void*, const LLMoveInv*)> callback,
 									  void* user_data,
 									  LLInventoryFilter* filter)
 {
@@ -3859,7 +3890,6 @@ void LLFolderBridge::perform_pasteFromClipboard()
 		const BOOL move_is_into_favorites = (mUUID == favorites_id);
 		const BOOL move_is_into_lost_and_found = model->isObjectDescendentOf(mUUID, lost_and_found_id);
 
-        std::vector<LLUUID> result;
 		std::vector<LLUUID> objects;
 		LLClipboard::instance().pasteFromClipboard(objects);
 
@@ -3987,7 +4017,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                             {
                                 //changeItemParent() implicity calls dirtyFilter
                                 changeItemParent(model, viitem, parent_id, FALSE);
-                                result.push_back(item_id);
+                                if (cb) cb->fire(item_id);
                             }
                         }
                         else
@@ -4020,7 +4050,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                 //changeCategoryParent() implicity calls dirtyFilter
                                 changeCategoryParent(model, vicat, parent_id, FALSE);
                             }
-                            result.push_back(item_id);
+                            if (cb) cb->fire(item_id);
 						}
 					}
 					else
@@ -4042,7 +4072,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                 //changeItemParent() implicity calls dirtyFilter
                                 changeItemParent(model, viitem, parent_id, FALSE);
                             }
-                            result.push_back(item_id);
+                            if (cb) cb->fire(item_id);
                         }
                     }
 				}
@@ -4063,7 +4093,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                             {
                                 copy_inventory_category(model, vicat, parent_id);
                             }
-                            result.push_back(item_id);
+                            if (cb) cb->fire(item_id);
 						}
 					}
                     else
@@ -4079,12 +4109,13 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                     // Stop pasting into the marketplace as soon as we get an error
                                     break;
                                 }
-                                result.push_back(item_id);
+                                if (cb) cb->fire(item_id);
                             }
                             else if (item->getIsLinkType())
                             {
-                                link_inventory_object(parent_id, item_id,
-                                    cb);
+                                link_inventory_object(parent_id,
+                                                      item_id,
+                                                      cb);
                             }
                             else
                             {
@@ -4103,14 +4134,6 @@ void LLFolderBridge::perform_pasteFromClipboard()
         }
 		// Change mode to paste for next paste
 		LLClipboard::instance().setCutMode(false);
-
-        if (cb.notNull())
-        {
-            for (LLUUID& pasted_id : result)
-            {
-                cb->fire(pasted_id);
-            }
-        }
 	}
 }
 
@@ -4594,6 +4617,18 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
 {
 	LLInventoryItem* inv_item = (LLInventoryItem*)cargo_data;
 
+    static LLPointer<LLInventoryCallback> drop_cb = NULL;
+    LLInventoryPanel* panel = mInventoryPanel.get();
+    LLToolDragAndDrop* drop_tool = LLToolDragAndDrop::getInstance();
+    if (drop
+        && panel->getRootFolder()->isSingleFolderMode()
+        && panel->getRootFolderID() == mUUID
+        && drop_tool->getCargoIndex() == 0)
+    {
+        drop_cb = new LLPasteIntoFolderCallback(mInventoryPanel);
+    }
+
+
 	//LL_INFOS() << "LLFolderBridge::dragOrDrop()" << LL_ENDL;
 	BOOL accept = FALSE;
 	switch(cargo_type)
@@ -4611,7 +4646,7 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
 		case DAD_GESTURE:
 		case DAD_MESH:
         case DAD_SETTINGS:
-			accept = dragItemIntoFolder(inv_item, drop, tooltip_msg);
+			accept = dragItemIntoFolder(inv_item, drop, tooltip_msg, TRUE, drop_cb);
 			break;
 		case DAD_LINK:
 			// DAD_LINK type might mean one of two asset types: AT_LINK or AT_LINK_FOLDER.
@@ -4622,12 +4657,12 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
 				LLInventoryCategory* linked_category = gInventory.getCategory(inv_item->getLinkedUUID());
 				if (linked_category)
 				{
-					accept = dragCategoryIntoFolder((LLInventoryCategory*)linked_category, drop, tooltip_msg, TRUE);
+					accept = dragCategoryIntoFolder((LLInventoryCategory*)linked_category, drop, tooltip_msg, TRUE, TRUE, drop_cb);
 				}
 			}
 			else
 			{
-				accept = dragItemIntoFolder(inv_item, drop, tooltip_msg);
+				accept = dragItemIntoFolder(inv_item, drop, tooltip_msg, TRUE, drop_cb);
 			}
 			break;
 		case DAD_CATEGORY:
@@ -4637,7 +4672,7 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
 			}
 			else
 			{
-				accept = dragCategoryIntoFolder((LLInventoryCategory*)cargo_data, drop, tooltip_msg);
+				accept = dragCategoryIntoFolder((LLInventoryCategory*)cargo_data, drop, tooltip_msg, FALSE, TRUE, drop_cb);
 			}
 			break;
 		case DAD_ROOT_CATEGORY:
@@ -4647,6 +4682,11 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
 			LL_WARNS() << "Unhandled cargo type for drag&drop " << cargo_type << LL_ENDL;
 			break;
 	}
+
+    if (!drop || drop_tool->getCargoIndex() + 1 == drop_tool->getCargoCount())
+    {
+        drop_cb = NULL;
+    }
 	return accept;
 }
 
@@ -4947,7 +4987,7 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
 
 	if (move_inv->mCallback)
 	{
-		move_inv->mCallback(option, move_inv->mUserData);
+		move_inv->mCallback(option, move_inv->mUserData, move_inv.get());
 	}
 
 	move_inv.reset(); //since notification will persist
@@ -5091,7 +5131,8 @@ void LLFolderBridge::callback_dropCategoryIntoFolder(const LLSD& notification, c
 BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 										BOOL drop,
 										std::string& tooltip_msg,
-                                        BOOL user_confirm)
+                                        BOOL user_confirm,
+                                        LLPointer<LLInventoryCallback> cb)
 {
 	LLInventoryModel* model = getInventoryModel();
 
@@ -5271,19 +5312,20 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 			// (copy the item)
 			else if (move_is_into_favorites)
 			{
-				dropToFavorites(inv_item);
+				dropToFavorites(inv_item, cb);
 			}
 			// CURRENT OUTFIT or OUTFIT folder
 			// (link the item)
 			else if (move_is_into_current_outfit || move_is_into_outfit)
 			{
-				dropToOutfit(inv_item, move_is_into_current_outfit);
+				dropToOutfit(inv_item, move_is_into_current_outfit, cb);
 			}
             // MARKETPLACE LISTINGS folder
             // Move the item
             else if (move_is_into_marketplacelistings)
             {
                 move_item_to_marketplacelistings(inv_item, mUUID);
+                if (cb) cb->fire(inv_item->getUUID());
             }
 			// NORMAL or TRASH folder
 			// (move the item, restamp if into trash)
@@ -5300,6 +5342,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 					(LLViewerInventoryItem*)inv_item,
 					mUUID,
 					move_is_into_trash);
+                if (cb) cb->fire(inv_item->getUUID());
 			}
             
             if (move_is_from_marketplacelistings)
@@ -5384,11 +5427,16 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 
 		if (accept && drop)
 		{
+            LLUUID item_id = inv_item->getUUID();
             boost::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
 			move_inv->mObjectID = inv_item->getParentUUID();
-			two_uuids_t item_pair(mUUID, inv_item->getUUID());
+			two_uuids_t item_pair(mUUID, item_id);
 			move_inv->mMoveList.push_back(item_pair);
-			move_inv->mCallback = NULL;
+            if (cb)
+            {
+                move_inv->mCallback = [item_id, cb](S32, void*, const LLMoveInv* move_inv) mutable
+                    { cb->fire(item_id); };
+            }
 			move_inv->mUserData = NULL;
 			if(is_move)
 			{
@@ -5480,13 +5528,13 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 				// (copy the item)
 				if (move_is_into_favorites)
 				{
-					dropToFavorites(inv_item);
+					dropToFavorites(inv_item, cb);
 				}
 				// CURRENT OUTFIT or OUTFIT folder
 				// (link the item)
 				else if (move_is_into_current_outfit || move_is_into_outfit)
 				{
-					dropToOutfit(inv_item, move_is_into_current_outfit);
+					dropToOutfit(inv_item, move_is_into_current_outfit, cb);
 				}
 				else
 				{
@@ -5496,7 +5544,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 						inv_item->getUUID(),
 						mUUID,
 						std::string(),
-						LLPointer<LLInventoryCallback>(NULL));
+						cb);
 				}
 			}
 		}
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 7653208d90..decaee7db3 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -46,6 +46,7 @@ class LLMenuGL;
 class LLCallingCardObserver;
 class LLViewerJointAttachment;
 class LLFolderView;
+struct LLMoveInv;
 
 typedef std::vector<std::string> menuentry_vec_t;
 typedef std::pair<LLUUID, LLUUID> two_uuids_t;
@@ -279,8 +280,8 @@ public:
 		mShowDescendantsCount(false)
 	{}
 		
-	BOOL dragItemIntoFolder(LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg, BOOL user_confirm = TRUE);
-	BOOL dragCategoryIntoFolder(LLInventoryCategory* inv_category, BOOL drop, std::string& tooltip_msg, BOOL is_link = FALSE, BOOL user_confirm = TRUE);
+	BOOL dragItemIntoFolder(LLInventoryItem* inv_item, BOOL drop, std::string& tooltip_msg, BOOL user_confirm = TRUE, LLPointer<LLInventoryCallback> cb = NULL);
+	BOOL dragCategoryIntoFolder(LLInventoryCategory* inv_category, BOOL drop, std::string& tooltip_msg, BOOL is_link = FALSE, BOOL user_confirm = TRUE, LLPointer<LLInventoryCallback> cb = NULL);
     void callback_dropItemIntoFolder(const LLSD& notification, const LLSD& response, LLInventoryItem* inv_item);
     void callback_dropCategoryIntoFolder(const LLSD& notification, const LLSD& response, LLInventoryCategory* inv_category);
 
@@ -747,7 +748,7 @@ void rez_attachment(LLViewerInventoryItem* item,
 BOOL move_inv_category_world_to_agent(const LLUUID& object_id, 
 									  const LLUUID& category_id,
 									  BOOL drop,
-									  void (*callback)(S32, void*) = NULL,
+									  std::function<void(S32, void*, const LLMoveInv *)> callback = NULL,
 									  void* user_data = NULL,
 									  LLInventoryFilter* filter = NULL);
 
@@ -778,7 +779,7 @@ struct LLMoveInv
     LLUUID mObjectID;
     LLUUID mCategoryID;
     two_uuids_list_t mMoveList;
-    void (*mCallback)(S32, void*);
+    std::function<void(S32, void*, const LLMoveInv*)> mCallback;
     void* mUserData;
 };
 
-- 
cgit v1.2.3


From f24f72d2f9db7490b169daea16f8ab8400ca12b4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 6 Sep 2023 02:56:11 +0300
Subject: SL-19826 Gallery multiselect support Part#3

wip
---
 indra/newview/llinventoryfunctions.cpp             |   5 +-
 indra/newview/llinventorygallery.cpp               | 480 ++++++++++++++++-----
 indra/newview/llinventorygallery.h                 |  25 +-
 indra/newview/llinventorygallerymenu.cpp           | 162 ++++---
 indra/newview/llinventorygallerymenu.h             |   6 +-
 .../default/xui/en/menu_gallery_inventory.xml      |  26 +-
 6 files changed, 509 insertions(+), 195 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index f5f0d74f0f..4aeacae6ed 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -454,7 +454,10 @@ void copy_inventory_category(LLInventoryModel* model,
     inventory_func_type func = [model, cat, root_copy_id, move_no_copy_items, callback](const LLUUID &new_id)
     {
         copy_inventory_category_content(new_id, model, cat, root_copy_id, move_no_copy_items);
-        callback(new_id);
+        if (callback)
+        {
+            callback(new_id);
+        }
     };
 	gInventory.createNewCategory(parent_id, LLFolderType::FT_NONE, cat->getName(), func, cat->getThumbnailUUID());
 }
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 8170c0c63b..eab15b79ad 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -107,7 +107,6 @@ LLInventoryGallery::LLInventoryGallery(const LLInventoryGallery::Params& p)
       mIsInitialized(false),
       mRootDirty(false),
       mNeedsArrange(false),
-      mNeedsSelection(false),
       mSearchType(LLInventoryFilter::SEARCHTYPE_NAME),
       mSortOrder(LLInventoryFilter::SO_DATE)
 {
@@ -219,10 +218,10 @@ void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
     gIdleCallbacks.deleteFunction(onIdle, (void*)this);
 
     mFolderID = cat_id;
-    mItemToSelect.setNull();
+    mItemsToSelect.clear();
+    mSelectedItemIDs.clear();
     mItemBuildQuery.clear();
     mNeedsArrange = false;
-    mNeedsSelection = false;
     dirtyRootFolder();
 }
 
@@ -831,15 +830,17 @@ void LLInventoryGallery::onIdle(void* userdata)
         self->updateMessageVisibility();
     }
 
-    if (self->mNeedsSelection)
+    if (!self->mItemsToSelect.empty() && !self->mNeedsArrange)
     {
-        LLUUID item_to_select = self->mItemToSelect;
-        self->mItemToSelect = LLUUID::null;
-        self->mNeedsSelection = false;
-        self->changeItemSelection(item_to_select, true);
+        selection_deque selection_list(self->mItemsToSelect);
+        self->mItemsToSelect.clear();
+        for (LLUUID & item_to_select : selection_list)
+        {
+            self->addItemSelection(item_to_select, true);
+        }
     }
 
-    if (!self->mNeedsSelection && self->mItemBuildQuery.empty())
+    if (self->mItemsToSelect.empty() && self->mItemBuildQuery.empty())
     {
         gIdleCallbacks.deleteFunction(onIdle, (void*)self);
     }
@@ -911,7 +912,6 @@ bool LLInventoryGallery::updateAddedItem(LLUUID item_id)
 
     LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getCreationDate(), obj->getIsLinkType(), is_worn);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
-    item->setFocusReceivedCallback(boost::bind(&LLInventoryGallery::changeItemSelection, this, item_id, false));
     if (mGalleryCreated)
     {
         res = applyFilter(item, mFilterSubString);
@@ -1074,8 +1074,7 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
             mFilterSubString.clear();
             if (mInventoryGalleryMenu && mSelectedItemIDs.size() == 1)
             {
-                selection_deque::iterator iter = mSelectedItemIDs.begin();
-                mInventoryGalleryMenu->doToSelected("rename", *iter);
+                mInventoryGalleryMenu->rename(mSelectedItemIDs.front());
             }
             handled = TRUE;
             break;
@@ -1117,22 +1116,22 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
             break;
 
         case KEY_LEFT:
-            moveLeft();
+            moveLeft(mask);
             handled = TRUE;
             break;
 
         case KEY_RIGHT:
-            moveRight();
+            moveRight(mask);
             handled = TRUE;
             break;
 
         case KEY_UP:
-            moveUp();
+            moveUp(mask);
             handled = TRUE;
             break;
 
         case KEY_DOWN:
-            moveDown();
+            moveDown(mask);
             handled = TRUE;
             break;
 
@@ -1148,59 +1147,107 @@ BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
     return handled;
 }
 
-void LLInventoryGallery::moveUp()
+void LLInventoryGallery::moveUp(MASK mask)
 {
     mFilterSubString.clear();
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getFirstSelectedItem();
+        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
         if (item)
         {
-            S32 n = mItemIndexMap[item];
-            n -= mItemsInRow;
-            if (n >= 0)
+            if (mask == MASK_NONE || mask == MASK_CONTROL)
             {
-                item = mIndexToItemMap[n];
-                LLUUID item_id = item->getUUID();
-                changeItemSelection(item_id, true);
-                item->setFocus(TRUE);
-                claimEditHandler();
+                S32 n = mItemIndexMap[item];
+                n -= mItemsInRow;
+                if (n >= 0)
+                {
+                    item = mIndexToItemMap[n];
+                    LLUUID item_id = item->getUUID();
+                    if (mask == MASK_CONTROL)
+                    {
+                        addItemSelection(item_id, true);
+                    }
+                    else
+                    {
+                        changeItemSelection(item_id, true);
+                    }
+                    item->setFocus(TRUE);
+                    claimEditHandler();
+                }
+            }
+            else if (mask == MASK_SHIFT)
+            {
+                S32 n = mItemIndexMap[item];
+                S32 target  = llmax(0, n - mItemsInRow);
+                toggleSelectionRange(target, n - 1);
+                if (target != n)
+                {
+                    item = mIndexToItemMap[target];
+                    item->setFocus(TRUE);
+                    claimEditHandler();
+                }
             }
         }
     }
 }
 
-void LLInventoryGallery::moveDown()
+void LLInventoryGallery::moveDown(MASK mask)
 {
     mFilterSubString.clear();
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getFirstSelectedItem();
+        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
         if (item)
         {
-            S32 n = mItemIndexMap[item];
-            n += mItemsInRow;
-            if (n < mItemsAddedCount)
+            if (mask == MASK_NONE || mask == MASK_CONTROL)
             {
-                item = mIndexToItemMap[n];
-                LLUUID item_id = item->getUUID();
-                changeItemSelection(item_id, true);
-                item->setFocus(TRUE);
-                claimEditHandler();
+                S32 n = mItemIndexMap[item];
+                n += mItemsInRow;
+                if (n < mItemsAddedCount)
+                {
+                    item = mIndexToItemMap[n];
+                    LLUUID item_id = item->getUUID();
+                    if (mask == MASK_CONTROL)
+                    {
+                        addItemSelection(item_id, true);
+                    }
+                    else
+                    {
+                        changeItemSelection(item_id, true);
+                    }
+                    item->setFocus(TRUE);
+                    claimEditHandler();
+                }
+            }
+            else if (mask == MASK_SHIFT)
+            {
+                S32 n = mItemIndexMap[item];
+                S32 target = llmin(mItemsAddedCount - 1, n + mItemsInRow);
+                toggleSelectionRange(n + 1, target);
+                if (target != n)
+                {
+                    item = mIndexToItemMap[target];
+                    item->setFocus(TRUE);
+                    claimEditHandler();
+                }
             }
         }
     }
 }
 
-void LLInventoryGallery::moveLeft()
+void LLInventoryGallery::moveLeft(MASK mask)
 {
     mFilterSubString.clear();
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getFirstSelectedItem();
+        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
+        if (mask == MASK_SHIFT)
+        {
+            item = mItemMap[mLastSelectedUUID];
+        }
         if (item)
         {
             // Might be better to get item from panel
@@ -1212,20 +1259,31 @@ void LLInventoryGallery::moveLeft()
             }
             item = mIndexToItemMap[n];
             LLUUID item_id = item->getUUID();
-            changeItemSelection(item_id, true);
+            if (mask == MASK_CONTROL)
+            {
+                addItemSelection(item_id, true);
+            }
+            else if (mask == MASK_SHIFT)
+            {
+                toggleItemSelection(item_id, true);
+            }
+            else
+            {
+                changeItemSelection(item_id, true);
+            }
             item->setFocus(TRUE);
             claimEditHandler();
         }
     }
 }
 
-void LLInventoryGallery::moveRight()
+void LLInventoryGallery::moveRight(MASK mask)
 {
     mFilterSubString.clear();
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = getFirstSelectedItem();
+        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
         if (item)
         {
             S32 n = mItemIndexMap[item];
@@ -1236,13 +1294,58 @@ void LLInventoryGallery::moveRight()
             }
             item = mIndexToItemMap[n];
             LLUUID item_id = item->getUUID();
-            changeItemSelection(item_id, true);
+            if (mask == MASK_CONTROL)
+            {
+                addItemSelection(item_id, true);
+            }
+            else if (mask == MASK_SHIFT)
+            {
+                toggleItemSelection(item_id, true);
+            }
+            else
+            {
+                changeItemSelection(item_id, true);
+            }
             item->setFocus(TRUE);
             claimEditHandler();
         }
     }
 }
 
+void LLInventoryGallery::toggleSelectionRange(S32 start_idx, S32 end_idx)
+{
+    LLInventoryGalleryItem* item = NULL;
+    for (S32 i = start_idx; i <= end_idx; i++)
+    {
+        item = mIndexToItemMap[i];
+        LLUUID item_id = item->getUUID();
+        toggleItemSelection(item_id, true);
+    }
+}
+
+void LLInventoryGallery::toggleSelectionRangeFromLast(const LLUUID target)
+{
+    if (mLastSelectedUUID == target)
+    {
+        return;
+    }
+    LLInventoryGalleryItem* last_item = mItemMap[mLastSelectedUUID];
+    LLInventoryGalleryItem* next_item = mItemMap[target];
+    if (last_item && next_item)
+    {
+        S32 last_idx = mItemIndexMap[last_item];
+        S32 next_idx = mItemIndexMap[next_item];
+        if (last_idx < next_idx)
+        {
+            toggleSelectionRange(last_idx + 1, next_idx);
+        }
+        else
+        {
+            toggleSelectionRange(next_idx, last_idx - 1);
+        }
+    }
+}
+
 void LLInventoryGallery::onFocusLost()
 {
     // inventory no longer handles cut/copy/paste/delete
@@ -1270,17 +1373,21 @@ void LLInventoryGallery::onFocusReceived()
     // Tab support, when tabbing into this view, select first item
     if (mSelectedItemIDs.size() > 0)
     {
+        LLInventoryGalleryItem* focus_item = NULL;
         for (const LLUUID& id : mSelectedItemIDs)
         {
             if (mItemMap[id])
             {
-                LLInventoryGalleryItem* focus_item = mItemMap[id];
+                focus_item = mItemMap[id];
                 focus_item->setSelected(true);
-                focus_item->setFocus(TRUE);
             }
         }
+        if (focus_item)
+        {
+            focus_item->setFocus(TRUE);
+        }
     }
-    else if (mIndexToItemMap.size() > 0 && !mNeedsSelection)
+    else if (mIndexToItemMap.size() > 0 && mItemsToSelect.empty())
     {
         // choose any items from visible rect
         S32 vert_offset = mScrollPanel->getDocPosVertical();
@@ -1304,18 +1411,26 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
             mSelectedItemIDs.clear();
             changeItemSelection(item_id, false);
         }
-        uuid_vec_t selected_uuids;
-        selected_uuids.push_back(item_id);
+        uuid_vec_t selected_uuids(mSelectedItemIDs.begin(), mSelectedItemIDs.end());
         mInventoryGalleryMenu->show(ctrl, selected_uuids, x, y);
     }
 }
 
 void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_to_selection)
 {
+    for (const LLUUID& id : mSelectedItemIDs)
+    {
+        if (mItemMap[id])
+        {
+            mItemMap[id]->setSelected(FALSE);
+        }
+    }
+    mSelectedItemIDs.clear();
+
     if ((mItemMap.count(item_id) == 0) || mNeedsArrange)
     {
-        mItemToSelect = item_id;
-        mNeedsSelection = true;
+        mItemsToSelect.clear();
+        mItemsToSelect.push_back(item_id);
         return;
     }
     if (mSelectedItemIDs.size() == 1
@@ -1325,14 +1440,32 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
         return;
     }
 
-    for (const LLUUID& id : mSelectedItemIDs)
+    if (mItemMap[item_id])
     {
-        if (mItemMap[id])
-        {
-            mItemMap[id]->setSelected(FALSE);
-        }
+        mItemMap[item_id]->setSelected(TRUE);
+    }
+    mSelectedItemIDs.push_back(item_id);
+    signalSelectionItemID(item_id);
+    mLastSelectedUUID = item_id;
+
+    if (scroll_to_selection)
+    {
+        scrollToShowItem(item_id);
+    }
+}
+
+void LLInventoryGallery::addItemSelection(const LLUUID& item_id, bool scroll_to_selection)
+{
+    if ((mItemMap.count(item_id) == 0) || mNeedsArrange)
+    {
+        mItemsToSelect.push_back(item_id);
+        return;
+    }
+    if (std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) != mSelectedItemIDs.end())
+    {
+        // Already selected
+        return;
     }
-    mSelectedItemIDs.clear();
 
     if (mItemMap[item_id])
     {
@@ -1340,6 +1473,7 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
     }
     mSelectedItemIDs.push_back(item_id);
     signalSelectionItemID(item_id);
+    mLastSelectedUUID = item_id;
 
     if (scroll_to_selection)
     {
@@ -1347,6 +1481,43 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
     }
 }
 
+bool LLInventoryGallery::toggleItemSelection(const LLUUID& item_id, bool scroll_to_selection)
+{
+    bool result = false;
+    if ((mItemMap.count(item_id) == 0) || mNeedsArrange)
+    {
+        mItemsToSelect.push_back(item_id);
+        return result;
+    }
+    selection_deque::iterator found = std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id);
+    if (found != mSelectedItemIDs.end())
+    {
+        if (mItemMap[item_id])
+        {
+            mItemMap[item_id]->setSelected(FALSE);
+        }
+        mSelectedItemIDs.erase(found);
+        result = false;
+    }
+    else
+    {
+        if (mItemMap[item_id])
+        {
+            mItemMap[item_id]->setSelected(TRUE);
+        }
+        mSelectedItemIDs.push_back(item_id);
+        signalSelectionItemID(item_id);
+        mLastSelectedUUID = item_id;
+        result = true;
+    }
+
+    if (scroll_to_selection)
+    {
+        scrollToShowItem(item_id);
+    }
+    return result;
+}
+
 void LLInventoryGallery::scrollToShowItem(const LLUUID& item_id)
 {
     LLInventoryGalleryItem* item = mItemMap[item_id];
@@ -1476,32 +1647,63 @@ void LLInventoryGallery::paste()
         return;
     }
 
-    LLUUID first_selected_id;
-    if (mSelectedItemIDs.size() > 0)
-    {
-        first_selected_id = *mSelectedItemIDs.begin();
-    }
-
-    LLInventoryObject* obj = gInventory.getObject(first_selected_id);
-    bool is_folder = obj && (obj->getType() == LLAssetType::AT_CATEGORY);
-    LLUUID dest = is_folder ? first_selected_id : mFolderID;
     bool is_cut_mode = LLClipboard::instance().isCutMode();
-
     std::vector<LLUUID> objects;
     LLClipboard::instance().pasteFromClipboard(objects);
 
-    LLHandle<LLPanel> handle = getHandle();
-    std::function <void(const LLUUID)> on_copy_callback = [handle](const LLUUID& inv_item)
+    bool paste_into_root = mSelectedItemIDs.empty();
+    for (LLUUID& dest : mSelectedItemIDs)
     {
-        LLInventoryGallery* panel = (LLInventoryGallery*)handle.get();
-        if (panel)
+        LLInventoryObject* obj = gInventory.getObject(dest);
+        if (!obj || (obj->getType() != LLAssetType::AT_CATEGORY))
         {
-            // Scroll to pasted item and highlight it
-            // Should it only highlight the last one?
-            panel->changeItemSelection(inv_item, true);
+            paste_into_root = true;
+            continue;
         }
-    };
-    LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(on_copy_callback);
+
+        paste(dest, objects, is_cut_mode, marketplacelistings_id);
+        is_cut_mode = false;
+    }
+
+    if (paste_into_root)
+    {
+        for (const LLUUID& id : mSelectedItemIDs)
+        {
+            if (mItemMap[id])
+            {
+                mItemMap[id]->setSelected(FALSE);
+            }
+        }
+        mSelectedItemIDs.clear();
+
+        paste(mFolderID, objects, is_cut_mode, marketplacelistings_id);
+    }
+
+    LLClipboard::instance().setCutMode(false);
+}
+
+void LLInventoryGallery::paste(const LLUUID& dest,
+                               std::vector<LLUUID>& objects,
+                               bool is_cut_mode,
+                               const LLUUID& marketplacelistings_id)
+{
+    LLHandle<LLPanel> handle = getHandle();
+    std::function <void(const LLUUID)> on_copy_callback = NULL;
+    LLPointer<LLInventoryCallback> cb = NULL;
+    if (dest == mFolderID)
+    {
+        on_copy_callback = [handle](const LLUUID& inv_item)
+            {
+                LLInventoryGallery* panel = (LLInventoryGallery*)handle.get();
+                if (panel)
+                {
+                    // Scroll to pasted item and highlight it
+                    // Should it only highlight the last one?
+                    panel->addItemSelection(inv_item, true);
+                }
+            };
+        cb = new LLBoostFuncInventoryCallback(on_copy_callback);
+    }
 
     for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
     {
@@ -1517,9 +1719,11 @@ void LLInventoryGallery::paste()
             if (is_cut_mode)
             {
                 gInventory.changeCategoryParent(cat, dest, false);
-                // Don't select immediately, wait for item to arrive
-                mItemToSelect = item_id;
-                mNeedsSelection = true;
+                if (dest == mFolderID)
+                {
+                    // Don't select immediately, wait for item to arrive
+                    mItemsToSelect.push_back(item_id);
+                }
             }
             else
             {
@@ -1534,9 +1738,11 @@ void LLInventoryGallery::paste()
                 if (is_cut_mode)
                 {
                     gInventory.changeItemParent(item, dest, false);
-                    // Don't select immediately, wait for item to arrive
-                    mItemToSelect = item_id;
-                    mNeedsSelection = true;
+                    if (dest == mFolderID)
+                    {
+                        // Don't select immediately, wait for item to arrive
+                        mItemsToSelect.push_back(item_id);
+                    }
                 }
                 else
                 {
@@ -1679,17 +1885,45 @@ void LLInventoryGallery::pasteAsLink()
     const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
     const LLUUID& my_outifts_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
 
-    LLUUID dest;
-    if (mSelectedItemIDs.size() > 0)
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+
+    bool paste_into_root = mSelectedItemIDs.empty();
+    for (LLUUID& dest : mSelectedItemIDs)
     {
-        dest = *mSelectedItemIDs.begin();
+        LLInventoryObject* obj = gInventory.getObject(dest);
+        if (!obj || obj->getType() != LLAssetType::AT_CATEGORY)
+        {
+            paste_into_root = true;
+            continue;
+        }
+
+        pasteAsLink(dest, objects, current_outfit_id, marketplacelistings_id, my_outifts_id);
     }
-    LLInventoryObject* obj = gInventory.getObject(dest);
-    if (!obj || obj->getType() != LLAssetType::AT_CATEGORY)
+
+    if (paste_into_root)
     {
-        dest = mFolderID;
+        for (const LLUUID& id : mSelectedItemIDs)
+        {
+            if (mItemMap[id])
+            {
+                mItemMap[id]->setSelected(FALSE);
+            }
+        }
+        mSelectedItemIDs.clear();
+
+        pasteAsLink(mFolderID, objects, current_outfit_id, marketplacelistings_id, my_outifts_id);
     }
 
+    LLClipboard::instance().setCutMode(false);
+}
+
+void LLInventoryGallery::pasteAsLink(const LLUUID& dest,
+                                     std::vector<LLUUID>& objects,
+                                     const LLUUID& current_outfit_id,
+                                     const LLUUID& marketplacelistings_id,
+                                     const LLUUID& my_outifts_id)
+{
     const BOOL move_is_into_current_outfit = (dest == current_outfit_id);
     const BOOL move_is_into_my_outfits = (dest == my_outifts_id) || gInventory.isObjectDescendentOf(dest, my_outifts_id);
     const BOOL move_is_into_marketplacelistings = gInventory.isObjectDescendentOf(dest, marketplacelistings_id);
@@ -1698,21 +1932,23 @@ void LLInventoryGallery::pasteAsLink()
     {
         return;
     }
-    std::vector<LLUUID> objects;
-    LLClipboard::instance().pasteFromClipboard(objects);
 
-    LLHandle<LLPanel> handle = getHandle();
-    std::function <void(const LLUUID)> on_link_callback = [handle](const LLUUID& inv_item)
+    LLPointer<LLInventoryCallback> cb = NULL;
+    if (dest == mFolderID)
     {
-        LLInventoryGallery *panel = (LLInventoryGallery*)handle.get();
-        if (panel)
-        {
-            // Scroll to pasted item and highlight it
-            // Should it only highlight the last one?
-            panel->changeItemSelection(inv_item, true);
-        }
-    };
-    LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(on_link_callback);
+        LLHandle<LLPanel> handle = getHandle();
+        std::function <void(const LLUUID)> on_link_callback = [handle](const LLUUID& inv_item)
+            {
+                LLInventoryGallery* panel = (LLInventoryGallery*)handle.get();
+                if (panel)
+                {
+                    // Scroll to pasted item and highlight it
+                    // Should it only highlight the last one?
+                    panel->addItemSelection(inv_item, true);
+                }
+            };
+        cb = new LLBoostFuncInventoryCallback(on_link_callback);
+    }
 
     for (std::vector<LLUUID>::const_iterator iter = objects.begin();
          iter != objects.end();
@@ -1724,8 +1960,6 @@ void LLInventoryGallery::pasteAsLink()
             link_inventory_object(dest, link_obj, cb);
         }
     }
-
-    LLClipboard::instance().setCutMode(false);
 }
 
 void LLInventoryGallery::claimEditHandler()
@@ -1852,7 +2086,7 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id)
         mNeedsArrange = true;
     }
 
-    if(mNeedsArrange || mItemToSelect.notNull())
+    if(mNeedsArrange || !mItemsToSelect.empty())
     {
         // Don't scroll to target/arrange immediately
         // since more updates might be pending
@@ -1969,7 +2203,7 @@ void LLInventoryGallery::deselectItem(const LLUUID& category_id)
         mItemMap[category_id]->setSelected(FALSE);
         setFocus(true);
         // Todo: support multiselect
-        signalSelectionItemID(LLUUID::null);
+        // signalSelectionItemID(LLUUID::null);
     }
 
     selection_deque::iterator found = std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), category_id);
@@ -1991,6 +2225,7 @@ void LLInventoryGallery::clearSelection()
     if (!mSelectedItemIDs.empty())
     {
         mSelectedItemIDs.clear();
+        // BUG: wrong, item can be null
         signalSelectionItemID(LLUUID::null);
     }
 }
@@ -2350,8 +2585,6 @@ void LLInventoryGalleryItem::draw()
         border.mTop = border.mTop + 1;
         gl_rect_2d(border, border_color.get(), FALSE);
     }
-
-
 }
 
 void LLInventoryGalleryItem::setItemName(std::string name)
@@ -2379,7 +2612,18 @@ BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
 {
     // call changeItemSelection directly, before setFocus
     // to avoid autoscroll from LLInventoryGallery::onFocusReceived()
-    mGallery->changeItemSelection(mUUID, false);
+    if (mask == MASK_CONTROL)
+    {
+        mGallery->addItemSelection(mUUID, false);
+    }
+    else if (mask == MASK_SHIFT)
+    {
+        mGallery->toggleSelectionRangeFromLast(mUUID);
+    }
+    else
+    {
+        mGallery->changeItemSelection(mUUID, false);
+    }
     setFocus(TRUE);
     mGallery->claimEditHandler();
 
@@ -2496,22 +2740,22 @@ BOOL LLInventoryGalleryItem::handleKeyHere(KEY key, MASK mask)
     switch (key)
     {
         case KEY_LEFT:
-            mGallery->moveLeft();
+            mGallery->moveLeft(mask);
             handled = true;
             break;
 
         case KEY_RIGHT:
-            mGallery->moveRight();
+            mGallery->moveRight(mask);
             handled = true;
             break;
 
         case KEY_UP:
-            mGallery->moveUp();
+            mGallery->moveUp(mask);
             handled = true;
             break;
 
         case KEY_DOWN:
-            mGallery->moveDown();
+            mGallery->moveDown(mask);
             handled = true;
             break;
 
@@ -2525,7 +2769,6 @@ void LLInventoryGalleryItem::onFocusLost()
 {
     // inventory no longer handles cut/copy/paste/delete
     mGallery->resetEditHandler();
-    setSelected(false);
 
     LLPanel::onFocusLost();
 }
@@ -2534,7 +2777,6 @@ void LLInventoryGalleryItem::onFocusReceived()
 {
     // inventory now handles cut/copy/paste/delete
     mGallery->claimEditHandler();
-    setSelected(true);
 
     LLPanel::onFocusReceived();
 }
@@ -2649,6 +2891,11 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
 {
     LLInventoryItem* inv_item = (LLInventoryItem*)cargo_data;
 
+    if (drop && LLToolDragAndDrop::getInstance()->getCargoIndex() == 0)
+    {
+        clearSelection();
+    }
+
     BOOL accepted = FALSE;
     switch(cargo_type)
     {
@@ -2669,8 +2916,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             if (accepted && drop)
             {
                 // Don't select immediately, wait for item to arrive
-                mItemToSelect = inv_item->getUUID();
-                mNeedsSelection = true;
+                mItemsToSelect.push_back(inv_item->getUUID());
             }
             break;
         case DAD_LINK:
@@ -2691,8 +2937,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
             }
             if (accepted && drop && inv_item)
             {
-                mItemToSelect = inv_item->getUUID();
-                mNeedsSelection = true;
+                mItemsToSelect.push_back(inv_item->getUUID());
             }
             break;
         case DAD_CATEGORY:
@@ -2706,8 +2951,7 @@ BOOL LLInventoryGallery::baseHandleDragAndDrop(LLUUID dest_id, BOOL drop,
                 accepted = dragCategoryIntoFolder(dest_id, cat_ptr, drop, tooltip_msg, FALSE);
                 if (accepted && drop)
                 {
-                    mItemToSelect = cat_ptr->getUUID();
-                    mNeedsSelection = true;
+                    mItemsToSelect.push_back(cat_ptr->getUUID());
                 }
             }
             break;
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index f2e5e38940..44e0dcf960 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -82,10 +82,12 @@ public:
                            void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) override;
     BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
     BOOL handleKeyHere(KEY key, MASK mask) override;
-    void moveUp();
-    void moveDown();
-    void moveLeft();
-    void moveRight();
+    void moveUp(MASK mask);
+    void moveDown(MASK mask);
+    void moveLeft(MASK mask);
+    void moveRight(MASK mask);
+    void toggleSelectionRange(S32 start_idx, S32 end_idx);
+    void toggleSelectionRangeFromLast(const LLUUID target);
 
     void onFocusLost() override;
     void onFocusReceived() override;
@@ -130,6 +132,8 @@ public:
     void deselectItem(const LLUUID& category_id);
     void clearSelection();
     void changeItemSelection(const LLUUID& item_id, bool scroll_to_selection = false);
+    void addItemSelection(const LLUUID& item_id, bool scroll_to_selection = false);
+    bool toggleItemSelection(const LLUUID& item_id, bool scroll_to_selection = false);
     void scrollToShowItem(const LLUUID& item_id);
     void signalSelectionItemID(const LLUUID& category_id);
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
@@ -174,6 +178,15 @@ public:
     void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
 
 protected:
+    void paste(const LLUUID& dest,
+               std::vector<LLUUID>& objects,
+               bool is_cut_mode,
+               const LLUUID& marketplacelistings_id);
+    void pasteAsLink(const LLUUID& dest,
+                     std::vector<LLUUID>& objects,
+                     const LLUUID& current_outfit_id,
+                     const LLUUID& marketplacelistings_id,
+                     const LLUUID& my_outifts_id);
 
     bool applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
     bool checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring);
@@ -185,8 +198,8 @@ protected:
     LLGalleryGestureObserver*          mGestureObserver;
     LLInventoryObserver*               mInventoryObserver;
     selection_deque                    mSelectedItemIDs;
-    LLUUID                             mItemToSelect;
-    bool                               mNeedsSelection;
+    selection_deque                    mItemsToSelect;
+    LLUUID                             mLastSelectedUUID;
     bool                               mIsInitialized;
     bool                               mRootDirty;
 
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index bca10b9c0e..5f4b816b99 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -51,16 +51,17 @@
 LLContextMenu* LLInventoryGalleryContextMenu::createMenu()
 {
     LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
-    //LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
-    LLUUID selected_id = mUUIDs.front();
+    LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
 
-    registrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryGalleryContextMenu::doToSelected, this, _2, selected_id));
-    registrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryGalleryContextMenu::fileUploadLocation, this, _2, selected_id));
+    registrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryGalleryContextMenu::doToSelected, this, _2));
+    registrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryGalleryContextMenu::fileUploadLocation, this, _2));
     registrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH));
     registrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND));
 
-    std::set<LLUUID> uuids{selected_id};
+    std::set<LLUUID> uuids(mUUIDs.begin(), mUUIDs.end());
     registrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars, uuids, gFloaterView->getParentFloater(mGallery)));
+
+    enable_registrar.add("Inventory.CanSetUploadLocation", boost::bind(&LLInventoryGalleryContextMenu::canSetUploadLocation, this, _2));
     
     LLContextMenu* menu = createFromFile("menu_gallery_inventory.xml");
 
@@ -69,49 +70,52 @@ LLContextMenu* LLInventoryGalleryContextMenu::createMenu()
     return menu;
 }
 
-void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLUUID& selected_id)
+void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata)
 {
     std::string action = userdata.asString();
-    LLInventoryObject* obj = gInventory.getObject(selected_id);
+    LLInventoryObject* obj = gInventory.getObject(mUUIDs.front());
     if(!obj) return;
 
     if ("open_selected_folder" == action)
     {
-        mGallery->setRootFolder(selected_id);
+        mGallery->setRootFolder(mUUIDs.front());
     }
     else if ("open_in_new_window" == action)
     {
-        new_folder_window(selected_id);
+        new_folder_window(mUUIDs.front());
     }
     else if ("properties" == action)
     {
-        show_item_profile(selected_id);
+        show_item_profile(mUUIDs.front());
     }
     else if ("restore" == action)
     {
-        LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);
-        if(cat)
+        for (LLUUID& selected_id : mUUIDs)
         {
-            const LLUUID new_parent = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(cat->getType()));
-            // do not restamp children on restore
-            gInventory.changeCategoryParent(cat, new_parent, false);
-        }
-        else
-        {
-            LLViewerInventoryItem* item = gInventory.getItem(selected_id);
-            if(item)
+            LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);
+            if (cat)
             {
-                bool is_snapshot = (item->getInventoryType() == LLInventoryType::IT_SNAPSHOT);
-
-                const LLUUID new_parent = gInventory.findCategoryUUIDForType(is_snapshot? LLFolderType::FT_SNAPSHOT_CATEGORY : LLFolderType::assetTypeToFolderType(item->getType()));
+                const LLUUID new_parent = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(cat->getType()));
                 // do not restamp children on restore
-                gInventory.changeItemParent(item, new_parent, false);
+                gInventory.changeCategoryParent(cat, new_parent, false);
+            }
+            else
+            {
+                LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+                if (item)
+                {
+                    bool is_snapshot = (item->getInventoryType() == LLInventoryType::IT_SNAPSHOT);
+
+                    const LLUUID new_parent = gInventory.findCategoryUUIDForType(is_snapshot ? LLFolderType::FT_SNAPSHOT_CATEGORY : LLFolderType::assetTypeToFolderType(item->getType()));
+                    // do not restamp children on restore
+                    gInventory.changeItemParent(item, new_parent, false);
+                }
             }
         }
     }
     else if ("copy_uuid" == action)
     {
-        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+        LLViewerInventoryItem* item = gInventory.getItem(mUUIDs.front());
         if(item)
         {
             LLUUID asset_id = item->getProtectedAssetUUID();
@@ -123,15 +127,18 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("purge" == action)
     {
-        remove_inventory_object(selected_id, NULL);
+        for (LLUUID& selected_id : mUUIDs)
+        {
+            remove_inventory_object(selected_id, NULL);
+        }
     }
     else if ("goto" == action)
     {
-        show_item_original(selected_id);
+        show_item_original(mUUIDs.front());
     }
     else if ("thumbnail" == action)
     {
-        LLSD data(selected_id);
+        LLSD data(mUUIDs.front());
         LLFloaterReg::showInstance("change_item_thumbnail", data);
     }
     else if ("cut" == action)
@@ -165,61 +172,70 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("rename" == action)
     {
-        LLSD args;
-        args["NAME"] = obj->getName();
-
-        LLSD payload;
-        payload["id"] = selected_id;
-
-        LLNotificationsUtil::add("RenameItem", args, payload, boost::bind(onRename, _1, _2));
+        rename(mUUIDs.front());
     }
     else if ("open" == action || "open_original" == action)
     {
-        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+        LLViewerInventoryItem* item = gInventory.getItem(mUUIDs.front());
         if (item)
         {
-            LLInvFVBridgeAction::doAction(item->getType(), selected_id , &gInventory);
+            LLInvFVBridgeAction::doAction(item->getType(), mUUIDs.front(), &gInventory);
         }
     }
     else if ("ungroup_folder_items" == action)
     {
-        ungroup_folder_items(selected_id);
+        ungroup_folder_items(mUUIDs.front());
     }
     else if ("take_off" == action || "detach" == action)
     {
-        LLAppearanceMgr::instance().removeItemFromAvatar(selected_id);
+        for (LLUUID& selected_id : mUUIDs)
+        {
+            LLAppearanceMgr::instance().removeItemFromAvatar(selected_id);
+        }
     }
     else if ("wear_add" == action)
     {
-        LLAppearanceMgr::instance().wearItemOnAvatar(selected_id, true, false); // Don't replace if adding.
+        for (LLUUID& selected_id : mUUIDs)
+        {
+            LLAppearanceMgr::instance().wearItemOnAvatar(selected_id, true, false); // Don't replace if adding.
+        }
     }
     else if ("wear" == action)
     {
-        LLAppearanceMgr::instance().wearItemOnAvatar(selected_id, true, true);
+        for (LLUUID& selected_id : mUUIDs)
+        {
+            LLAppearanceMgr::instance().wearItemOnAvatar(selected_id, true, true);
+        }
     }
     else if ("activate" == action)
     {
-        LLGestureMgr::instance().activateGesture(selected_id);
+        for (LLUUID& selected_id : mUUIDs)
+        {
+            LLGestureMgr::instance().activateGesture(selected_id);
 
-        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
-        if (!item) return;
+            LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+            if (!item) return;
 
-        gInventory.updateItem(item);
+            gInventory.updateItem(item);
+        }
         gInventory.notifyObservers();
     }
     else if ("deactivate" == action)
     {
-        LLGestureMgr::instance().deactivateGesture(selected_id);
+        for (LLUUID& selected_id : mUUIDs)
+        {
+            LLGestureMgr::instance().deactivateGesture(selected_id);
 
-        LLViewerInventoryItem* item = gInventory.getItem(selected_id);
-        if (!item) return;
+            LLViewerInventoryItem* item = gInventory.getItem(selected_id);
+            if (!item) return;
 
-        gInventory.updateItem(item);
+            gInventory.updateItem(item);
+        }
         gInventory.notifyObservers();
     }
     else if ("replace_links" == action)
     {
-        LLFloaterReg::showInstance("linkreplace", LLSD(selected_id));
+        LLFloaterReg::showInstance("linkreplace", LLSD(mUUIDs.front()));
     }
     else if ("copy_slurl" == action)
     {
@@ -236,7 +252,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
             };
             LLLandmarkActions::getSLURLfromPosGlobal(global_pos, copy_slurl_to_clipboard_cb, true);
         };
-        LLLandmark* landmark = LLLandmarkActions::getLandmark(selected_id, copy_slurl_cb);
+        LLLandmark* landmark = LLLandmarkActions::getLandmark(mUUIDs.front(), copy_slurl_cb);
         if (landmark)
         {
             copy_slurl_cb(landmark);
@@ -246,7 +262,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     {
         LLSD key;
         key["type"] = "landmark";
-        key["id"] = selected_id;
+        key["id"] = mUUIDs.front();
         LLFloaterSidePanelContainer::showPanel("places", key);
     }
     else if ("show_on_map" == action)
@@ -264,7 +280,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
                 }
             }
         };
-        LLLandmark* landmark = LLLandmarkActions::getLandmark(selected_id, show_on_map_cb);
+        LLLandmark* landmark = LLLandmarkActions::getLandmark(mUUIDs.front(), show_on_map_cb);
         if(landmark)
         {
             show_on_map_cb(landmark);
@@ -272,7 +288,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("save_as" == action)
     {
-        LLPreviewTexture* preview_texture = LLFloaterReg::getTypedInstance<LLPreviewTexture>("preview_texture", selected_id);
+        LLPreviewTexture* preview_texture = LLFloaterReg::getTypedInstance<LLPreviewTexture>("preview_texture", mUUIDs.front());
         if (preview_texture)
         {
             preview_texture->openToSave();
@@ -281,6 +297,20 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
 }
 
+void LLInventoryGalleryContextMenu::rename(const LLUUID& item_id)
+{
+    LLInventoryObject* obj = gInventory.getObject(item_id);
+    if (!obj) return;
+
+    LLSD args;
+    args["NAME"] = obj->getName();
+
+    LLSD payload;
+    payload["id"] = mUUIDs.front();
+
+    LLNotificationsUtil::add("RenameItem", args, payload, boost::bind(onRename, _1, _2));
+}
+
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
@@ -311,25 +341,39 @@ void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLS
     }
 }
 
-void LLInventoryGalleryContextMenu::fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id)
+void LLInventoryGalleryContextMenu::fileUploadLocation(const LLSD& userdata)
 {
     const std::string param = userdata.asString();
     if (param == "model")
     {
-        gSavedPerAccountSettings.setString("ModelUploadFolder", selected_id.asString());
+        gSavedPerAccountSettings.setString("ModelUploadFolder", mUUIDs.front().asString());
     }
     else if (param == "texture")
     {
-        gSavedPerAccountSettings.setString("TextureUploadFolder", selected_id.asString());
+        gSavedPerAccountSettings.setString("TextureUploadFolder", mUUIDs.front().asString());
     }
     else if (param == "sound")
     {
-        gSavedPerAccountSettings.setString("SoundUploadFolder", selected_id.asString());
+        gSavedPerAccountSettings.setString("SoundUploadFolder", mUUIDs.front().asString());
     }
     else if (param == "animation")
     {
-        gSavedPerAccountSettings.setString("AnimationUploadFolder", selected_id.asString());
+        gSavedPerAccountSettings.setString("AnimationUploadFolder", mUUIDs.front().asString());
+    }
+}
+
+bool LLInventoryGalleryContextMenu::canSetUploadLocation(const LLSD& userdata)
+{
+    if (mUUIDs.size() != 1)
+    {
+        return false;
+    }
+    LLInventoryCategory* cat = gInventory.getCategory(mUUIDs.front());
+    if (!cat)
+    {
+        return false;
     }
+    return true;
 }
 
 bool is_inbox_folder(LLUUID item_id)
diff --git a/indra/newview/llinventorygallerymenu.h b/indra/newview/llinventorygallerymenu.h
index 67cf9a569a..7c3545432b 100644
--- a/indra/newview/llinventorygallerymenu.h
+++ b/indra/newview/llinventorygallerymenu.h
@@ -39,13 +39,15 @@ public:
 
     bool isRootFolder() { return mRootFolder; }
     void setRootFolder(bool is_root) { mRootFolder = is_root; }
-    void doToSelected(const LLSD& userdata, const LLUUID& selected_id);
+    void doToSelected(const LLSD& userdata);
+    void rename(const LLUUID& item_id);
 
 protected:
     //virtual void buildContextMenu(class LLMenuGL& menu, U32 flags);
     void updateMenuItemsVisibility(LLContextMenu* menu);
 
-    void fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id);
+    void fileUploadLocation(const LLSD& userdata);
+    bool canSetUploadLocation(const LLSD& userdata);
 
     static void onRename(const LLSD& notification, const LLSD& response);
 
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index 46afa3821b..d82c453e5f 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -453,30 +453,38 @@
       <menu_item_call.on_click
        function="Inventory.FileUploadLocation"
         parameter="texture" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
     <menu_item_call
      label="Sound uploads"
      layout="topleft"
      name="Sound uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="sound" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="sound" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
     <menu_item_call
      label="Animation uploads"
      layout="topleft"
      name="Animation uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="animation" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="animation" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
     <menu_item_call
      label="Model uploads"
      layout="topleft"
      name="Model uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="model" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="model" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
     </menu_item_call>
   </menu>
 	<menu_item_separator
-- 
cgit v1.2.3


From 167c5121d3a448dcbc15a9553c374c32a4f85eb9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 6 Sep 2023 21:47:33 +0300
Subject: SL-19826 Basic 'shift' support for gallery Part#4

---
 indra/newview/llinventorygallery.cpp | 159 +++++++++++++++++++++++++----------
 indra/newview/llinventorygallery.h   |   3 +-
 2 files changed, 116 insertions(+), 46 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index eab15b79ad..1ee08eb01c 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -217,6 +217,14 @@ void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
 
     gIdleCallbacks.deleteFunction(onIdle, (void*)this);
 
+    for (const LLUUID& id : mSelectedItemIDs)
+    {
+        if (mItemMap[id])
+        {
+            mItemMap[id]->setSelected(FALSE);
+        }
+    }
+
     mFolderID = cat_id;
     mItemsToSelect.clear();
     mSelectedItemIDs.clear();
@@ -1153,7 +1161,7 @@ void LLInventoryGallery::moveUp(MASK mask)
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
+        LLInventoryGalleryItem* item = mItemMap[mLastInteractedUUID];
         if (item)
         {
             if (mask == MASK_NONE || mask == MASK_CONTROL)
@@ -1180,10 +1188,10 @@ void LLInventoryGallery::moveUp(MASK mask)
             {
                 S32 n = mItemIndexMap[item];
                 S32 target  = llmax(0, n - mItemsInRow);
-                toggleSelectionRange(target, n - 1);
                 if (target != n)
                 {
                     item = mIndexToItemMap[target];
+                    toggleSelectionRangeFromLast(item->getUUID());
                     item->setFocus(TRUE);
                     claimEditHandler();
                 }
@@ -1198,7 +1206,7 @@ void LLInventoryGallery::moveDown(MASK mask)
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
+        LLInventoryGalleryItem* item = mItemMap[mLastInteractedUUID];
         if (item)
         {
             if (mask == MASK_NONE || mask == MASK_CONTROL)
@@ -1225,10 +1233,10 @@ void LLInventoryGallery::moveDown(MASK mask)
             {
                 S32 n = mItemIndexMap[item];
                 S32 target = llmin(mItemsAddedCount - 1, n + mItemsInRow);
-                toggleSelectionRange(n + 1, target);
                 if (target != n)
                 {
                     item = mIndexToItemMap[target];
+                    toggleSelectionRangeFromLast(item->getUUID());
                     item->setFocus(TRUE);
                     claimEditHandler();
                 }
@@ -1243,10 +1251,10 @@ void LLInventoryGallery::moveLeft(MASK mask)
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
+        LLInventoryGalleryItem* item = mItemMap[mLastInteractedUUID];
         if (mask == MASK_SHIFT)
         {
-            item = mItemMap[mLastSelectedUUID];
+            item = mItemMap[mLastInteractedUUID];
         }
         if (item)
         {
@@ -1265,7 +1273,15 @@ void LLInventoryGallery::moveLeft(MASK mask)
             }
             else if (mask == MASK_SHIFT)
             {
-                toggleItemSelection(item_id, true);
+                if (item->isSelected())
+                {
+                    toggleItemSelection(mLastInteractedUUID, true);
+                }
+                else
+                {
+                    toggleItemSelection(item_id, true);
+                }
+                mLastInteractedUUID = item_id;
             }
             else
             {
@@ -1283,7 +1299,7 @@ void LLInventoryGallery::moveRight(MASK mask)
 
     if (mInventoryGalleryMenu && mSelectedItemIDs.size() > 0 && mItemsAddedCount > 1)
     {
-        LLInventoryGalleryItem* item = mItemMap[mLastSelectedUUID];
+        LLInventoryGalleryItem* item = mItemMap[mLastInteractedUUID];
         if (item)
         {
             S32 n = mItemIndexMap[item];
@@ -1300,7 +1316,15 @@ void LLInventoryGallery::moveRight(MASK mask)
             }
             else if (mask == MASK_SHIFT)
             {
-                toggleItemSelection(item_id, true);
+                if (item->isSelected())
+                {
+                    toggleItemSelection(mLastInteractedUUID, true);
+                }
+                else
+                {
+                    toggleItemSelection(item_id, true);
+                }
+                mLastInteractedUUID = item_id;
             }
             else
             {
@@ -1315,35 +1339,62 @@ void LLInventoryGallery::moveRight(MASK mask)
 void LLInventoryGallery::toggleSelectionRange(S32 start_idx, S32 end_idx)
 {
     LLInventoryGalleryItem* item = NULL;
-    for (S32 i = start_idx; i <= end_idx; i++)
+    if (end_idx > start_idx)
+    {
+        for (S32 i = start_idx; i <= end_idx; i++)
+        {
+            item = mIndexToItemMap[i];
+            LLUUID item_id = item->getUUID();
+            toggleItemSelection(item_id, true);
+        }
+    }
+    else
     {
-        item = mIndexToItemMap[i];
-        LLUUID item_id = item->getUUID();
-        toggleItemSelection(item_id, true);
+        for (S32 i = start_idx; i >= end_idx; i--)
+        {
+            item = mIndexToItemMap[i];
+            LLUUID item_id = item->getUUID();
+            toggleItemSelection(item_id, true);
+        }
     }
 }
 
 void LLInventoryGallery::toggleSelectionRangeFromLast(const LLUUID target)
 {
-    if (mLastSelectedUUID == target)
+    if (mLastInteractedUUID == target)
     {
         return;
     }
-    LLInventoryGalleryItem* last_item = mItemMap[mLastSelectedUUID];
+    LLInventoryGalleryItem* last_item = mItemMap[mLastInteractedUUID];
     LLInventoryGalleryItem* next_item = mItemMap[target];
     if (last_item && next_item)
     {
         S32 last_idx = mItemIndexMap[last_item];
         S32 next_idx = mItemIndexMap[next_item];
-        if (last_idx < next_idx)
+        if (next_item->isSelected())
         {
-            toggleSelectionRange(last_idx + 1, next_idx);
+            if (last_idx < next_idx)
+            {
+                toggleSelectionRange(last_idx, next_idx - 1);
+            }
+            else
+            {
+                toggleSelectionRange(last_idx, next_idx + 1);
+            }
         }
         else
         {
-            toggleSelectionRange(next_idx, last_idx - 1);
+            if (last_idx < next_idx)
+            {
+                toggleSelectionRange(last_idx + 1, next_idx);
+            }
+            else
+            {
+                toggleSelectionRange(last_idx - 1, next_idx);
+            }
         }
     }
+    mLastInteractedUUID = next_item->getUUID();
 }
 
 void LLInventoryGallery::onFocusLost()
@@ -1408,7 +1459,6 @@ void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLU
     {
         if (std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) == mSelectedItemIDs.end())
         {
-            mSelectedItemIDs.clear();
             changeItemSelection(item_id, false);
         }
         uuid_vec_t selected_uuids(mSelectedItemIDs.begin(), mSelectedItemIDs.end());
@@ -1426,10 +1476,10 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
         }
     }
     mSelectedItemIDs.clear();
+    mItemsToSelect.clear();
 
     if ((mItemMap.count(item_id) == 0) || mNeedsArrange)
     {
-        mItemsToSelect.clear();
         mItemsToSelect.push_back(item_id);
         return;
     }
@@ -1446,7 +1496,7 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
     }
     mSelectedItemIDs.push_back(item_id);
     signalSelectionItemID(item_id);
-    mLastSelectedUUID = item_id;
+    mLastInteractedUUID = item_id;
 
     if (scroll_to_selection)
     {
@@ -1473,7 +1523,7 @@ void LLInventoryGallery::addItemSelection(const LLUUID& item_id, bool scroll_to_
     }
     mSelectedItemIDs.push_back(item_id);
     signalSelectionItemID(item_id);
-    mLastSelectedUUID = item_id;
+    mLastInteractedUUID = item_id;
 
     if (scroll_to_selection)
     {
@@ -1507,9 +1557,9 @@ bool LLInventoryGallery::toggleItemSelection(const LLUUID& item_id, bool scroll_
         }
         mSelectedItemIDs.push_back(item_id);
         signalSelectionItemID(item_id);
-        mLastSelectedUUID = item_id;
         result = true;
     }
+    mLastInteractedUUID = item_id;
 
     if (scroll_to_selection)
     {
@@ -2338,6 +2388,43 @@ BOOL LLInventoryGallery::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
     return handled;
 }
 
+void LLInventoryGallery::startDrag()
+{
+    std::vector<EDragAndDropType> types;
+    uuid_vec_t ids;
+    LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_AGENT;
+    for (LLUUID& selected_id : mSelectedItemIDs)
+    {
+        const LLInventoryItem* item = gInventory.getItem(selected_id);
+        if (item)
+        {
+            if (item->getPermissions().getOwner() == ALEXANDRIA_LINDEN_ID)
+            {
+                src = LLToolDragAndDrop::SOURCE_LIBRARY;
+            }
+
+            EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(item->getType());
+            types.push_back(type);
+            ids.push_back(selected_id);
+        }
+
+        const LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);        
+        if (cat && gInventory.isObjectDescendentOf(selected_id, gInventory.getRootFolderID())
+            && !LLFolderType::lookupIsProtectedType((cat)->getPreferredType()))
+        {
+            if (cat->getOwnerID() == ALEXANDRIA_LINDEN_ID)
+            {
+                src = LLToolDragAndDrop::SOURCE_LIBRARY;
+            }
+
+            EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(cat->getType());
+            types.push_back(type);
+            ids.push_back(selected_id);
+        }
+    }
+    LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, LLToolDragAndDrop::SOURCE_AGENT);
+}
+
 bool LLInventoryGallery::areViewsInitialized()
 {
     return mGalleryCreated && mItemBuildQuery.empty();
@@ -2620,7 +2707,7 @@ BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
     {
         mGallery->toggleSelectionRangeFromLast(mUUID);
     }
-    else
+    else if (!isSelected())
     {
         mGallery->changeItemSelection(mUUID, false);
     }
@@ -2663,28 +2750,10 @@ BOOL LLInventoryGalleryItem::handleHover(S32 x, S32 y, MASK mask)
         S32 screen_y;
         localPointToScreen(x, y, &screen_x, &screen_y );
 
-        if(LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
+        if(LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y) && mGallery)
         {
-            const LLInventoryItem *item = gInventory.getItem(mUUID);
-            if(item)
-            {
-                EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(item->getType());
-                LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_LIBRARY;
-                if(item->getPermissions().getOwner() == gAgent.getID())
-                {
-                    src = LLToolDragAndDrop::SOURCE_AGENT;
-                }
-                LLToolDragAndDrop::getInstance()->beginDrag(type, item->getUUID(), src);
-                return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask );
-            }
-
-            const LLInventoryCategory *cat = gInventory.getCategory(mUUID);
-            if(cat && gInventory.isObjectDescendentOf(mUUID, gInventory.getRootFolderID())
-                   && !LLFolderType::lookupIsProtectedType((cat)->getPreferredType()))
-            {
-                LLToolDragAndDrop::getInstance()->beginDrag(LLViewerAssetType::lookupDragAndDropType(cat->getType()), cat->getUUID(), LLToolDragAndDrop::SOURCE_AGENT);
-                return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask );
-            }
+            mGallery->startDrag();
+            return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask);
         }
     }
     return LLUICtrl::handleHover(x,y,mask);
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 44e0dcf960..9b3f12701f 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -80,6 +80,7 @@ public:
     void onVisibilityChange(BOOL new_visibility) override;
     BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type,
                            void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) override;
+    void startDrag();
     BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
     BOOL handleKeyHere(KEY key, MASK mask) override;
     void moveUp(MASK mask);
@@ -199,7 +200,7 @@ protected:
     LLInventoryObserver*               mInventoryObserver;
     selection_deque                    mSelectedItemIDs;
     selection_deque                    mItemsToSelect;
-    LLUUID                             mLastSelectedUUID;
+    LLUUID                             mLastInteractedUUID;
     bool                               mIsInitialized;
     bool                               mRootDirty;
 
-- 
cgit v1.2.3


From 46425b2e49377acc186e41c67a793f7f6b7f583b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 7 Sep 2023 01:35:37 +0300
Subject: SL-19826 Keep scroll from acting up if selection changed

Unfulfilled scroll (due to fetching) persisted after selection changed
---
 indra/llui/llfolderview.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 630d93cde0..650ae9ae75 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -611,6 +611,7 @@ void LLFolderView::clearSelection()
 	}
 
 	mSelectedItems.clear();
+    mNeedsScroll = false;
 }
 
 std::set<LLFolderViewItem*> LLFolderView::getSelectionList() const
-- 
cgit v1.2.3


From cfb69846f1e8309ed86d4a18eb26a889f6dbaccc Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 9 Sep 2023 00:00:22 +0300
Subject: SL-20261 Allow and resize existing textures as necessary for
 thumbnails

---
 indra/newview/llfloaterchangeitemthumbnail.cpp     | 132 ++++++++++++++++++++-
 indra/newview/llfloaterchangeitemthumbnail.h       |   9 +-
 indra/newview/llfloatersimplesnapshot.cpp          |  15 +++
 indra/newview/llfloatersimplesnapshot.h            |   1 +
 indra/newview/llsnapshotlivepreview.cpp            |  32 +----
 indra/newview/lltexturectrl.cpp                    |   5 +-
 indra/newview/lltexturectrl.h                      |   2 +-
 indra/newview/llviewertexturelist.cpp              |  39 ++++++
 indra/newview/llviewertexturelist.h                |   4 +
 .../skins/default/xui/en/floater_texture_ctrl.xml  |   2 +-
 10 files changed, 197 insertions(+), 44 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 77212507ab..780130039b 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -512,6 +512,13 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata)
                 asset_id = potential_uuid;
             }
         }
+
+        LLInventoryObject* obj = self->getInventoryObject();
+        if (obj && obj->getThumbnailUUID() == asset_id)
+        {
+            // nothing to do
+            return;
+        }
         if (asset_id.notNull())
         {
             self->assignAndValidateAsset(asset_id);
@@ -547,6 +554,8 @@ struct ImageLoadedData
     LLUUID mObjectId;
     LLHandle<LLFloater> mFloaterHandle;
     bool mSilent;
+    // Keep image reference to prevent deletion on timeout
+    LLPointer<LLViewerFetchedTexture> mTexturep;
 };
 
 void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id, bool silent)
@@ -576,8 +585,9 @@ void LLFloaterChangeItemThumbnail::assignAndValidateAsset(const LLUUID &asset_id
         data->mThumbnailId = asset_id;
         data->mFloaterHandle = getHandle();
         data->mSilent = silent;
+        data->mTexturep = texturep;
 
-        texturep->setLoadedCallback(onImageLoaded,
+        texturep->setLoadedCallback(onImageDataLoaded,
             MAX_DISCARD_LEVEL, // Don't need full image, just size data
             FALSE,
             FALSE,
@@ -636,7 +646,7 @@ bool LLFloaterChangeItemThumbnail::validateAsset(const LLUUID &asset_id)
 }
 
 //static
-void LLFloaterChangeItemThumbnail::onImageLoaded(
+void LLFloaterChangeItemThumbnail::onImageDataLoaded(
     BOOL success,
     LLViewerFetchedTexture *src_vi,
     LLImageRaw* src,
@@ -678,6 +688,45 @@ void LLFloaterChangeItemThumbnail::onImageLoaded(
     delete data;
 }
 
+//static
+void LLFloaterChangeItemThumbnail::onFullImageLoaded(
+    BOOL success,
+    LLViewerFetchedTexture* src_vi,
+    LLImageRaw* src,
+    LLImageRaw* aux_src,
+    S32 discard_level,
+    BOOL final,
+    void* userdata)
+{
+    if (!userdata) return;
+
+    if (!final && success) return; //not done yet
+
+    ImageLoadedData* data = (ImageLoadedData*)userdata;
+
+    if (success)
+    {
+        if (src_vi->getFullWidth() != src_vi->getFullHeight()
+            || src_vi->getFullWidth() < LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN)
+        {
+            if (!data->mSilent)
+            {
+                LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+            }
+        }
+        else if (src_vi->getFullWidth() > LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX)
+        {
+            LLFloaterSimpleSnapshot::uploadThumbnail(src, data->mObjectId, LLUUID::null);
+        }
+        else
+        {
+            setThumbnailId(data->mThumbnailId, data->mObjectId);
+        }
+    }
+
+    delete data;
+}
+
 void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
 {
     // show hourglass cursor when loading inventory window
@@ -725,8 +774,7 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
             texture_floaterp->setBakeTextureEnabled(FALSE);
             texture_floaterp->setCanApplyImmediately(false);
             texture_floaterp->setCanApply(false, true, false /*Hide 'preview disabled'*/);
-            texture_floaterp->setDimentionsLimits(LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX,
-                                                 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN);
+            texture_floaterp->setMinDimentionsLimits(LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN);
 
             addDependentFloater(texture_floaterp);
         }
@@ -743,14 +791,86 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit()
     if (floaterp)
     {
         LLUUID asset_id = floaterp->getAssetID();
-        if (validateAsset(asset_id))
+
+        if (asset_id.isNull())
         {
             setThumbnailId(asset_id);
+            return;
         }
-        else
+
+        LLInventoryObject* obj = getInventoryObject();
+        if (obj && obj->getThumbnailUUID() == asset_id)
+        {
+            // nothing to do
+            return;
+        }
+
+        LLPointer<LLViewerFetchedTexture> texturep = LLViewerTextureManager::findFetchedTexture(asset_id, TEX_LIST_STANDARD);
+        if (!texturep)
+        {
+            LL_WARNS() << "Image " << asset_id << " doesn't exist" << LL_ENDL;
+            return;
+        }
+
+        if (texturep->isMissingAsset())
+        {
+            LL_WARNS() << "Image " << asset_id << " is missing" << LL_ENDL;
+            return;
+        }
+
+        if (texturep->getFullWidth() != texturep->getFullHeight())
+        {
+            LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+            return;
+        }
+
+        if (texturep->getFullWidth() < LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN
+            && texturep->getFullWidth() > 0)
         {
             LLNotificationsUtil::add("ThumbnailDimentionsLimit");
+            return;
+        }
+
+        if (texturep->getFullWidth() > LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX
+            || texturep->getFullWidth() == 0)
+        {
+            if (texturep->isFullyLoaded()
+                && (texturep->getCachedRawImageLevel() == 0 || texturep->getRawImageLevel() == 0)
+                && (texturep->isCachedRawImageReady() || texturep->isRawImageValid()))
+            {
+                if (texturep->isRawImageValid())
+                {
+                    LLFloaterSimpleSnapshot::uploadThumbnail(texturep->getRawImage(), mItemId, mTaskId);
+                }
+                else
+                {
+                    LLFloaterSimpleSnapshot::uploadThumbnail(texturep->getCachedRawImage(), mItemId, mTaskId);
+                }
+            }
+            else
+            {
+                ImageLoadedData* data = new ImageLoadedData();
+                data->mObjectId = mItemId;
+                data->mThumbnailId = asset_id;
+                data->mFloaterHandle = getHandle();
+                data->mSilent = false;
+                data->mTexturep = texturep;
+
+                texturep->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
+                texturep->setMinDiscardLevel(0);
+                texturep->setLoadedCallback(onFullImageLoaded,
+                                            0, // Need best quality
+                                            TRUE,
+                                            FALSE,
+                                            (void*)data,
+                                            NULL,
+                                            FALSE);
+                texturep->forceToSaveRawImage(0);
+            }
+            return;
         }
+
+        setThumbnailId(asset_id);
     }
 }
 
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 02f934337b..a91e9b8ee9 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -83,13 +83,20 @@ private:
     static void onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle);
 
     void assignAndValidateAsset(const LLUUID &asset_id, bool silent = false);
-    static void onImageLoaded(BOOL success,
+    static void onImageDataLoaded(BOOL success,
         LLViewerFetchedTexture *src_vi,
         LLImageRaw* src,
         LLImageRaw* aux_src,
         S32 discard_level,
         BOOL final,
         void* userdata);
+    static void onFullImageLoaded(BOOL success,
+                                  LLViewerFetchedTexture* src_vi,
+                                  LLImageRaw* src,
+                                  LLImageRaw* aux_src,
+                                  S32 discard_level,
+                                  BOOL final,
+                                  void* userdata);
 
     void showTexturePicker(const LLUUID &thumbnail_id);
     void onTexturePickerCommit();
diff --git a/indra/newview/llfloatersimplesnapshot.cpp b/indra/newview/llfloatersimplesnapshot.cpp
index 757ac605e3..58604c5628 100644
--- a/indra/newview/llfloatersimplesnapshot.cpp
+++ b/indra/newview/llfloatersimplesnapshot.cpp
@@ -397,6 +397,21 @@ void LLFloaterSimpleSnapshot::uploadThumbnail(const std::string &file_path, cons
     uploadImageUploadFile(temp_file, inventory_id, task_id);
 }
 
+// static
+void LLFloaterSimpleSnapshot::uploadThumbnail(LLPointer<LLImageRaw> raw_image, const LLUUID& inventory_id, const LLUUID& task_id)
+{
+    std::string temp_file = gDirUtilp->getTempFilename();
+    if (!LLViewerTextureList::createUploadFile(raw_image, temp_file, THUMBNAIL_SNAPSHOT_DIM_MAX, THUMBNAIL_SNAPSHOT_DIM_MIN))
+    {
+        LLSD notif_args;
+        notif_args["REASON"] = LLImage::getLastError().c_str();
+        LLNotificationsUtil::add("CannotUploadTexture", notif_args);
+        LL_WARNS("Thumbnail") << "Failed to upload thumbnail for " << inventory_id << " " << task_id << ", reason: " << notif_args["REASON"].asString() << LL_ENDL;
+        return;
+    }
+    uploadImageUploadFile(temp_file, inventory_id, task_id);
+}
+
 // static
 void LLFloaterSimpleSnapshot::uploadImageUploadFile(const std::string &temp_file, const LLUUID &inventory_id, const LLUUID &task_id)
 {
diff --git a/indra/newview/llfloatersimplesnapshot.h b/indra/newview/llfloatersimplesnapshot.h
index a2bf2946d4..91a81ee5c3 100644
--- a/indra/newview/llfloatersimplesnapshot.h
+++ b/indra/newview/llfloatersimplesnapshot.h
@@ -63,6 +63,7 @@ public:
 
     void postSave();
     static void uploadThumbnail(const std::string &file_path, const LLUUID &inventory_id, const LLUUID &task_id);
+    static void uploadThumbnail(LLPointer<LLImageRaw> raw_image, const LLUUID& inventory_id, const LLUUID& task_id);
 
     class Impl;
     friend class Impl;
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index 37ebcd1266..b7a1832b17 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -876,37 +876,7 @@ LLPointer<LLImageRaw> LLSnapshotLivePreview::getEncodedImage()
 
 bool LLSnapshotLivePreview::createUploadFile(const std::string &out_filename, const S32 max_image_dimentions, const S32 min_image_dimentions)
 {
-    // make a copy, since convertToUploadFile modifies raw image
-    LLPointer<LLImageRaw> raw_image = new LLImageRaw(
-        mPreviewImage->getData(),
-        mPreviewImage->getWidth(),
-        mPreviewImage->getHeight(),
-        mPreviewImage->getComponents());
-
-    LLPointer<LLImageJ2C> compressedImage = LLViewerTextureList::convertToUploadFile(raw_image, max_image_dimentions);
-    if (compressedImage->getWidth() < min_image_dimentions || compressedImage->getHeight() < min_image_dimentions)
-    {
-        std::string reason = llformat("Images below %d x %d pixels are not allowed. Actual size: %d x %dpx",
-            min_image_dimentions,
-            min_image_dimentions,
-            compressedImage->getWidth(),
-            compressedImage->getHeight());
-        compressedImage->setLastError(reason);
-        return FALSE;
-    }
-    if (compressedImage.isNull())
-    {
-        compressedImage->setLastError("Couldn't convert the image to jpeg2000.");
-        LL_INFOS() << "Couldn't convert to j2c, file : " << out_filename << LL_ENDL;
-        return false;
-    }
-    if (!compressedImage->save(out_filename))
-    {
-        compressedImage->setLastError("Couldn't create the jpeg2000 image for upload.");
-        LL_INFOS() << "Couldn't create output file : " << out_filename << LL_ENDL;
-        return false;
-    }
-    return true;
+    return LLViewerTextureList::createUploadFile(mPreviewImage, out_filename, max_image_dimentions, min_image_dimentions);
 }
 
 // We actually estimate the data size so that we do not require actual compression when showing the preview
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index a746744e53..0c3730d084 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1197,15 +1197,12 @@ void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply, bool
 	mPreviewSettingChanged = true;
 }
 
-void LLFloaterTexturePicker::setDimentionsLimits(S32 max_dim, S32 min_dim)
+void LLFloaterTexturePicker::setMinDimentionsLimits(S32 min_dim)
 {
-    mMaxDim = max_dim;
     mMinDim = min_dim;
 
     std::string formatted_dims = llformat("%dx%d", mMinDim, mMinDim);
     mResolutionWarning->setTextArg("[MINTEXDIM]", formatted_dims);
-    formatted_dims = llformat("%dx%d", mMaxDim, mMaxDim);
-    mResolutionWarning->setTextArg("[MAXTEXDIM]", formatted_dims);
 }
 
 void LLFloaterTexturePicker::onFilterEdit(const std::string& search_string )
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 60543191b6..7239b97552 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -323,7 +323,7 @@ public:
 	void onFilterEdit(const std::string& search_string);
 
 	void setCanApply(bool can_preview, bool can_apply, bool inworld_image = true);
-    void setDimentionsLimits(S32 max_dim, S32 min_dim);
+    void setMinDimentionsLimits(S32 min_dim);
 	void setTextureSelectedCallback(const texture_selected_callback& cb) { mTextureSelectedCallback = cb; }
 	void setOnFloaterCloseCallback(const floater_close_callback& cb) { mOnFloaterCloseCallback = cb; }
 	void setOnFloaterCommitCallback(const floater_commit_callback& cb) { mOnFloaterCommitCallback = cb; }
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index d10e1ea8c9..f9fe8054a4 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1285,6 +1285,45 @@ void LLViewerTextureList::decodeAllImages(F32 max_time)
 	<< LL_ENDL;
 }
 
+bool LLViewerTextureList::createUploadFile(LLPointer<LLImageRaw> raw_image,
+                                           const std::string& out_filename,
+                                           const S32 max_image_dimentions,
+                                           const S32 min_image_dimentions)
+{
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
+
+    // make a copy, since convertToUploadFile scales raw image
+    LLPointer<LLImageRaw> scale_image = new LLImageRaw(
+        raw_image->getData(),
+        raw_image->getWidth(),
+        raw_image->getHeight(),
+        raw_image->getComponents());
+
+    LLPointer<LLImageJ2C> compressedImage = LLViewerTextureList::convertToUploadFile(scale_image, max_image_dimentions);
+    if (compressedImage->getWidth() < min_image_dimentions || compressedImage->getHeight() < min_image_dimentions)
+    {
+        std::string reason = llformat("Images below %d x %d pixels are not allowed. Actual size: %d x %dpx",
+                                      min_image_dimentions,
+                                      min_image_dimentions,
+                                      compressedImage->getWidth(),
+                                      compressedImage->getHeight());
+        compressedImage->setLastError(reason);
+        return false;
+    }
+    if (compressedImage.isNull())
+    {
+        compressedImage->setLastError("Couldn't convert the image to jpeg2000.");
+        LL_INFOS() << "Couldn't convert to j2c, file : " << out_filename << LL_ENDL;
+        return false;
+    }
+    if (!compressedImage->save(out_filename))
+    {
+        compressedImage->setLastError("Couldn't create the jpeg2000 image for upload.");
+        LL_INFOS() << "Couldn't create output file : " << out_filename << LL_ENDL;
+        return false;
+    }
+    return true;
+}
 
 BOOL LLViewerTextureList::createUploadFile(const std::string& filename,
 										 const std::string& out_filename,
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 8fc65fc9ce..82dec6b329 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -92,6 +92,10 @@ class LLViewerTextureList
 	friend class LLLocalBitmap;
 	
 public:
+    static bool createUploadFile(LLPointer<LLImageRaw> raw_image,
+                                 const std::string& out_filename,
+                                 const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,
+                                 const S32 min_image_dimentions = 0);
     static BOOL createUploadFile(const std::string& filename,
                                  const std::string& out_filename,
                                  const U8 codec,
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 771113d989..8081af6673 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -96,7 +96,7 @@
      name="over_limit_lbl"
      visible="false"
      top_delta="0">
-        Selected texture is [TEXDIM]. Inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
+        Selected texture is [TEXDIM]. Inventory image must be square, no less than [MINTEXDIM].
     </text>
     
 <!--  middle: inventory mode -->
-- 
cgit v1.2.3


From 1514ade10dc0f64c476ff405256b86fb6a1d9b57 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 11 Sep 2023 09:20:00 -0500
Subject: SL-19842 WIP -- Now that probes can override ambient, unroll ambient
 darkening hacks.

---
 indra/llinventory/llsettingssky.cpp                               | 4 ++++
 indra/newview/app_settings/settings.xml                           | 8 ++++----
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl  | 8 ++------
 indra/newview/llsettingsvo.cpp                                    | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 976a61fb69..fedbed2990 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1449,6 +1449,7 @@ F32 LLSettingsSky::getReflectionProbeAmbiance(bool auto_adjust) const
 
 F32 LLSettingsSky::getTotalReflectionProbeAmbiance(F32 cloud_shadow_scale, bool auto_adjust) const
 {
+#if 0
     // feed cloud shadow back into reflection probe ambiance to mimic pre-reflection-probe behavior 
     // without brightening dark/interior spaces
     F32 probe_ambiance = getReflectionProbeAmbiance(auto_adjust);
@@ -1459,6 +1460,9 @@ F32 LLSettingsSky::getTotalReflectionProbeAmbiance(F32 cloud_shadow_scale, bool
     }
 
     return probe_ambiance;
+#else
+    return getReflectionProbeAmbiance(auto_adjust);
+#endif
 }
 
 F32 LLSettingsSky::getSkyBottomRadius() const
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b4e149f0e0..35ab1e9d40 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10654,7 +10654,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.7</real>
+    <real>1.0</real>
   </map>
   <key>RenderSkyAutoAdjustHDRScale</key>
   <map>
@@ -10709,7 +10709,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>1.0</real>
+    <real>0.001</real>
   </map>
   <key>RenderSkySunlightScale</key>
   <map>
@@ -10720,7 +10720,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>1.5</real>
+    <real>1.0</real>
   </map>
   <key>RenderSkyAmbientScale</key>
   <map>
@@ -10731,7 +10731,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.5</real>
+    <real>0.7</real>
   </map>
   
   <key>RenderReflectionProbeMaxLocalLightAmbiance</key>
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 53474ded7f..a8aa5a36a3 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -39,7 +39,6 @@ uniform float max_y;
 uniform vec3  glow;
 uniform float scene_light_strength;
 uniform float sun_moon_glow_factor;
-uniform float sky_hdr_scale;
 uniform float sky_sunlight_scale;
 uniform float sky_ambient_scale;
 
@@ -150,12 +149,9 @@ void calcAtmosphericVarsLinear(vec3 inPositionEye, vec3 norm, vec3 light_dir, ou
 
     // multiply to get similar colors as when the "scaleSoftClip" implementation was doubling color values
     // (allows for mixing of light sources other than sunlight e.g. reflection probes)
-    sunlit *= sky_sunlight_scale; //1.5;
-    amblit *= sky_ambient_scale; //0.5;
+    sunlit *= sky_sunlight_scale;
+    amblit *= sky_ambient_scale;
     
-    // override amblit with ambient_color if sky probe ambiance is not zero
-    amblit = mix(amblit, ambient_color, clamp(sky_hdr_scale-1.0, 0.0, 1.0));
-
     amblit = srgb_to_linear(amblit);
     amblit *= ambientLighting(norm, light_dir);
 }
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 9ccac82e63..b7c4dbe648 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -742,7 +742,7 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
     {
         if (psky->getReflectionProbeAmbiance() != 0.f)
         {
-            shader->uniform3fv(LLShaderMgr::AMBIENT, getAmbientColor().mV);
+            shader->uniform3fv(LLShaderMgr::AMBIENT, LLVector3(ambient.mV));
             shader->uniform1f(LLShaderMgr::SKY_HDR_SCALE, sqrtf(g)*2.0); // use a modifier here so 1.0 maps to the "most desirable" default and the maximum value doesn't go off the rails
         }
         else if (psky->canAutoAdjust() && should_auto_adjust)
-- 
cgit v1.2.3


From f107d8431ccbd85bbe6f2ac0fd47cd409b8c0cfc Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 11 Sep 2023 17:31:08 +0300
Subject: SL-20199 Fix invalid or oversized folder being refetched indefinetely

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 44eccd955e..07d5713fc8 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -549,6 +549,13 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
         {
             LL_WARNS() << "Failed to download folder: " << request_id << " Requesting known content separately" << LL_ENDL;
             mFetchFolderQueue.push_back(FetchQueueInfo(request_id, FT_CONTENT_RECURSIVE));
+
+            // set folder's version to prevent viewer from trying to request folder indefinetely
+            LLViewerInventoryCategory* cat(gInventory.getCategory(request_id));
+            if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+            {
+                cat->setVersion(0);
+            }
         }
     }
     else
-- 
cgit v1.2.3


From 0b02bf5d262fe9a6de968686420c4d525ac04077 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 7 Aug 2023 18:44:04 +0200
Subject: SL-20090 BugSplat Crash: LLViewerFetchedTexture::updateFetch(2099)

---
 indra/newview/llviewertexture.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index cb58588848..9fc092d4b9 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2096,7 +2096,8 @@ bool LLViewerFetchedTexture::updateFetch()
 		}
 	}
 	
-	llassert_always(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid));
+	llassert_always(mRawImage.notNull() || !mIsRawImageValid);
+	llassert_always(mRawImage.notNull() || !mNeedsCreateTexture);
 	
 	return mIsFetching ? true : false;
 }
-- 
cgit v1.2.3


From b5c745185f4e3d2d215b5a171dc96a57d01eb079 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 12 Sep 2023 19:51:13 +0300
Subject: SL-20162 Option for debuging folder version in UI

Shows folder's data instead of a suffix.
Will need either a new inventory window or to toggle UI debug on early.
---
 indra/newview/llinventorybridge.cpp            | 21 ++++++++++++++++++++-
 indra/newview/skins/default/xui/en/strings.xml |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 49b6275c3e..481b221870 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2321,13 +2321,32 @@ void LLFolderBridge::buildDisplayName() const
 std::string LLFolderBridge::getLabelSuffix() const
 {
     static LLCachedControl<F32> folder_loading_message_delay(gSavedSettings, "FolderLoadingMessageWaitTime", 0.5f);
+    static LLCachedControl<bool> xui_debug(gSavedSettings, "DebugShowXUINames", 0);
     
     if (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= folder_loading_message_delay())
     {
         return llformat(" ( %s ) ", LLTrans::getString("LoadingData").c_str());
     }
     std::string suffix = "";
-    if(mShowDescendantsCount)
+    if (xui_debug)
+    {
+        LLInventoryModel::cat_array_t* cats;
+        LLInventoryModel::item_array_t* items;
+        gInventory.getDirectDescendentsOf(getUUID(), cats, items);
+        
+        LLViewerInventoryCategory* cat = gInventory.getCategory(getUUID());
+        if (cat)
+        {
+            LLStringUtil::format_map_t args;
+            args["[FOLDER_COUNT]"] = llformat("%d", cats->size());
+            args["[ITEMS_COUNT]"] = llformat("%d", items->size());
+            args["[VERSION]"] = llformat("%d", cat->getVersion());
+            args["[VIEWER_DESCENDANT_COUNT]"] = llformat("%d", cats->size() + items->size());
+            args["[SERVER_DESCENDANT_COUNT]"] = llformat("%d", cat->getDescendentCount());
+            suffix = " " + LLTrans::getString("InventoryFolderDebug", args);
+        }
+    }
+    else if(mShowDescendantsCount)
     {
         LLInventoryModel::cat_array_t cat_array;
         LLInventoryModel::item_array_t item_array;
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4cdc8f2835..04b374cb00 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2355,6 +2355,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InventoryMarketplaceListingsNoItems">
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
+    <string name="InventoryFolderDebug">( F:[FOLDER_COUNT] I:[ITEMS_COUNT] V:[VERSION] DC:[VIEWER_DESCENDANT_COUNT]/[SERVER_DESCENDANT_COUNT] )</string>
 	<string name="InventoryItemsCount">( [ITEMS_COUNT] Items )</string>
 	<string name="Marketplace Validation Log"></string>
 	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
-- 
cgit v1.2.3


From a280bacfea5453df3453322223b677adc2780511 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 11 Sep 2023 17:11:03 -0700
Subject: SL-20157: Fix scale of avatar mesh parts when mikktspace tangent
 generation fails

---
 indra/llmath/llvolume.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 0e3792fda3..6d36daa92a 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5626,29 +5626,29 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
                     mWeights[dst_idx].loadua(data.w[src_idx].mV);
                 }
             }
+
+            // put back in normalized coordinate frame
+            LLVector4a inv_scale(1.f/mNormalizedScale.mV[0], 1.f / mNormalizedScale.mV[1], 1.f / mNormalizedScale.mV[2]);
+            LLVector4a scale;
+            scale.load3(mNormalizedScale.mV);
+            scale.getF32ptr()[3] = 1.f;
+
+            for (int i = 0; i < mNumVertices; ++i)
+            {
+                mPositions[i].mul(inv_scale);
+                mNormals[i].mul(scale);
+                mNormals[i].normalize3();
+                F32 w = mTangents[i].getF32ptr()[3];
+                mTangents[i].mul(scale);
+                mTangents[i].normalize3();
+                mTangents[i].getF32ptr()[3] = w;
+            }
         }
         else
         {
             // blew past the max vertex size limit, use legacy tangent generation which never adds verts
             createTangents();
         }
-
-        // put back in normalized coordinate frame
-        LLVector4a inv_scale(1.f/mNormalizedScale.mV[0], 1.f / mNormalizedScale.mV[1], 1.f / mNormalizedScale.mV[2]);
-        LLVector4a scale;
-        scale.load3(mNormalizedScale.mV);
-        scale.getF32ptr()[3] = 1.f;
-
-        for (int i = 0; i < mNumVertices; ++i)
-        {
-            mPositions[i].mul(inv_scale);
-            mNormals[i].mul(scale);
-            mNormals[i].normalize3();
-            F32 w = mTangents[i].getF32ptr()[3];
-            mTangents[i].mul(scale);
-            mTangents[i].normalize3();
-            mTangents[i].getF32ptr()[3] = w;
-        }
     }
 
     // cache optimize index buffer
-- 
cgit v1.2.3


From 2e7cf2c1afd9cec1b2e69a5ac7fbbe7ad745c457 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 14 Sep 2023 14:55:41 +0300
Subject: SL-20268 FIXED clicking Cancel doesn't revert Materials perms

---
 indra/newview/llfloaterperms.cpp | 2 +-
 indra/newview/llfloaterperms.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index fb55c6c6c4..b53839977e 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -122,7 +122,7 @@ const std::string LLFloaterPermsDefault::sCategoryNames[CAT_LAST] =
 	"Notecards",
 	"Gestures",
 	"Wearables",
-	"Settings"
+	"Settings",
 	"Materials"
 };
 
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index 02359a256e..97ddec7cba 100644
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h
@@ -75,6 +75,7 @@ enum Categories
 	CAT_GESTURES,
 	CAT_WEARABLES,
 	CAT_SETTINGS,
+    CAT_MATERIALS,
 	CAT_LAST
 };
 
-- 
cgit v1.2.3


From fa47e4402b7925a45c5fec9fb9d92fb5e34a589e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 14 Sep 2023 18:42:42 +0300
Subject: SL-20285 Sturdier cof and fixed link fetching

---
 indra/newview/llaisapi.cpp            | 62 +++++++++++++++++++----------------
 indra/newview/llaisapi.h              |  2 +-
 indra/newview/llappearancemgr.cpp     | 58 ++++++++++++++++----------------
 indra/newview/llattachmentsmgr.cpp    |  1 +
 indra/newview/llinventoryobserver.cpp | 19 ++++-------
 5 files changed, 70 insertions(+), 72 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index d8d30037c8..087cfb8d48 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -741,8 +741,10 @@ void AISAPI::FetchCategoryLinks(const LLUUID &catId, completion_t callback)
         (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend),
         _1, _2, _3, _5, _6);
 
+    LLSD body;
+    body["depth"] = 0;
     LLCoprocedureManager::CoProcedure_t proc(
-        boost::bind(&AISAPI::InvokeAISCommandCoro, _1, getFn, url, LLUUID::null, LLSD(), callback, FETCHCATEGORYLINKS));
+        boost::bind(&AISAPI::InvokeAISCommandCoro, _1, getFn, url, LLUUID::null, body, callback, FETCHCATEGORYLINKS));
 
     EnqueueAISCommand("FetchCategoryLinks", proc);
 }
@@ -1337,13 +1339,6 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
         return;
     }
 
-	// Check descendent count first, as it may be needed
-	// to populate newly created categories
-	if (category_map.has("_embedded"))
-	{
-		parseDescendentCount(category_id, category_map["_embedded"]);
-	}
-
 	LLPointer<LLViewerInventoryCategory> new_cat;
 	if (curr_cat)
 	{
@@ -1366,6 +1361,13 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
 	// *NOTE: unpackMessage does not unpack version or descendent count.
 	if (rv)
 	{
+        // Check descendent count first, as it may be needed
+        // to populate newly created categories
+        if (category_map.has("_embedded"))
+        {
+            parseDescendentCount(category_id, new_cat->getPreferredType(), category_map["_embedded"]);
+        }
+
         if (mFetch)
         {
             uuid_int_map_t::const_iterator lookup_it = mCatDescendentsKnown.find(category_id);
@@ -1379,10 +1381,20 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
                 // set version only if we are sure this update has full data and embeded items
                 // since viewer uses version to decide if folder and content still need fetching
                 if (version > LLViewerInventoryCategory::VERSION_UNKNOWN
-                    && (depth >= 0 || (curr_cat && curr_cat->getVersion() > LLViewerInventoryCategory::VERSION_UNKNOWN)))
+                    && depth >= 0)
                 {
-                    LL_DEBUGS("Inventory") << "Setting version to " << version
-                        << " for category " << category_id << LL_ENDL;
+                    if (curr_cat && curr_cat->getVersion() > version)
+                    {
+                        LL_WARNS("Inventory") << "Version was " << curr_cat->getVersion()
+                            << ", but fetch returned version " << version
+                            << " for category " << category_id << LL_ENDL;
+                    }
+                    else
+                    {
+                        LL_DEBUGS("Inventory") << "Setting version to " << version
+                            << " for category " << category_id << LL_ENDL;
+                    }
+
                     new_cat->setVersion(version);
                 }
             }
@@ -1445,27 +1457,21 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
 	}
 }
 
-void AISUpdate::parseDescendentCount(const LLUUID& category_id, const LLSD& embedded)
+void AISUpdate::parseDescendentCount(const LLUUID& category_id, LLFolderType::EType type, const LLSD& embedded)
 {
-    if (mType == AISAPI::FETCHCOF)
+    // We can only determine true descendent count if this contains all descendent types.
+    if (embedded.has("categories") &&
+        embedded.has("links") &&
+        embedded.has("items"))
     {
-        // contains only links
-        if (embedded.has("links"))
-        {
-            mCatDescendentsKnown[category_id] = embedded["links"].size();
-        }
+        mCatDescendentsKnown[category_id] = embedded["categories"].size();
+        mCatDescendentsKnown[category_id] += embedded["links"].size();
+        mCatDescendentsKnown[category_id] += embedded["items"].size();
     }
-    else
+    else if (mFetch && embedded.has("links") && (type == LLFolderType::FT_CURRENT_OUTFIT || type == LLFolderType::FT_OUTFIT))
     {
-        // We can only determine true descendent count if this contains all descendent types.
-        if (embedded.has("categories") &&
-            embedded.has("links") &&
-            embedded.has("items"))
-        {
-            mCatDescendentsKnown[category_id] = embedded["categories"].size();
-            mCatDescendentsKnown[category_id] += embedded["links"].size();
-            mCatDescendentsKnown[category_id] += embedded["items"].size();
-        }
+        // COF and outfits contain links only
+        mCatDescendentsKnown[category_id] = embedded["links"].size();
     }
 }
 
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 53c74ae078..0fdf4a0b74 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -118,7 +118,7 @@ public:
 	void parseLink(const LLSD& link_map, S32 depth);
 	void parseItem(const LLSD& link_map);
 	void parseCategory(const LLSD& link_map, S32 depth);
-	void parseDescendentCount(const LLUUID& category_id, const LLSD& embedded);
+	void parseDescendentCount(const LLUUID& category_id, LLFolderType::EType type, const LLSD& embedded);
 	void parseEmbedded(const LLSD& embedded, S32 depth);
 	void parseEmbeddedLinks(const LLSD& links, S32 depth);
 	void parseEmbeddedItems(const LLSD& items);
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 80ef5e3bae..876ae23e62 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4446,7 +4446,7 @@ public:
         {
             LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
             if (!cat) continue;
-            if (!isCategoryComplete(cat))
+            if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
             {
                 // CHECK IT: isCategoryComplete() checks both version and descendant count but
                 // fetch() only works for Unknown version and doesn't care about descentants,
@@ -4456,6 +4456,12 @@ public:
                 cat->fetch();		//blindly fetch it without seeing if anything else is fetching it.
                 mIncomplete.push_back(*it);	//Add to list of things being downloaded for this observer.
             }
+            else if (!isCategoryComplete(cat))
+            {
+                LL_DEBUGS("Inventory") << "Categoty " << *it << " incomplete despite having version" << LL_ENDL;
+                LLInventoryModelBackgroundFetch::instance().scheduleFolderFetch(*it, true);
+                mIncomplete.push_back(*it);
+            }
             else if (ais3)
             {
                 LLInventoryModel::cat_array_t* cats;
@@ -4484,10 +4490,7 @@ public:
                     if (incomplete_count > MAX_INDIVIDUAL_FETCH
                         || (incomplete_count > 1 && complete_count == 0))
                     {
-                        // To prevent premature removal from mIncomplete and
-                        // since we are doing a full refetch anyway, mark unknown
-                        cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
-                        cat->fetch();
+                        LLInventoryModelBackgroundFetch::instance().scheduleFolderFetch(*it, true);
                         mIncomplete.push_back(*it);
                     }
                     else
@@ -4496,6 +4499,7 @@ public:
                         mComplete.push_back(*it);
                     }
                 }
+                // else should have been handled by isCategoryComplete
             }
             else
             {
@@ -4519,13 +4523,11 @@ public:
 		// What we do here is get the complete information on the
 		// items in the requested category, and set up an observer
 		// that will wait for that to happen.
-		LLInventoryModel::cat_array_t cat_array;
-		LLInventoryModel::item_array_t item_array;
-		gInventory.collectDescendents(mComplete.front(),
-									  cat_array,
-									  item_array,
-									  LLInventoryModel::EXCLUDE_TRASH);
-		S32 count = item_array.size();
+        LLInventoryModel::cat_array_t* cats;
+        LLInventoryModel::item_array_t* items;
+        gInventory.getDirectDescendentsOf(mComplete.front(), cats, items);
+
+		S32 count = items->size();
 		if(!count)
 		{
 			LL_WARNS() << "Nothing fetched in category " << mComplete.front()
@@ -4537,11 +4539,13 @@ public:
 			return;
 		}
 
-		LL_INFOS() << "stage1 got " << item_array.size() << " items, passing to stage2 " << LL_ENDL;
+        LLViewerInventoryCategory* cat = gInventory.getCategory(mComplete.front());
+        S32 version = cat ? cat->getVersion() : -2;
+		LL_INFOS() << "stage1, category " << mComplete.front() << " got " << count << " items, version " << version << " passing to stage2 " << LL_ENDL;
 		uuid_vec_t ids;
 		for(S32 i = 0; i < count; ++i)
 		{
-			ids.push_back(item_array.at(i)->getUUID());
+			ids.push_back(items->at(i)->getUUID());
 		}
 		
 		gInventory.removeObserver(this);
@@ -4570,14 +4574,14 @@ void callAfterCOFFetch(nullary_func_t cb)
 {
     LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
     LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
-    if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+
+    if (AISAPI::isAvailable())
     {
-        if (AISAPI::isAvailable())
-        {
-            // Mark cof (update timer) so that background fetch won't request it
-            cat->setFetching(LLViewerInventoryCategory::FETCH_RECURSIVE);
-            // Assume that we have no relevant cache. Fetch cof, and items cof's links point to.
-            AISAPI::FetchCOF([cb](const LLUUID& id)
+        // Mark cof (update timer) so that background fetch won't request it
+        cat->setFetching(LLViewerInventoryCategory::FETCH_RECURSIVE);
+        // For reliability assume that we have no relevant cache, so
+        // fetch cof along with items cof's links point to.
+        AISAPI::FetchCOF([cb](const LLUUID& id)
                          {
                              cb();
                              LLUUID cat_id = LLAppearanceMgr::instance().getCOF();
@@ -4587,18 +4591,12 @@ void callAfterCOFFetch(nullary_func_t cb)
                                  cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
                              }
                          });
-        }
-        else
-        {
-            LL_WARNS() << "AIS API v3 not available, can't use AISAPI::FetchCOF" << LL_ENDL;
-            // startup should have marked folder as fetching, remove that
-            cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
-            callAfterCategoryFetch(cat_id, cb);
-        }
     }
     else
     {
-        // Assume that cache is present. Process like a normal folder.
+        LL_INFOS() << "AIS API v3 not available, using callAfterCategoryFetch" << LL_ENDL;
+        // startup should have marked folder as fetching, remove that
+        cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
         callAfterCategoryFetch(cat_id, cb);
     }
 }
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index bcd89cf8db..d3fce306bc 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -243,6 +243,7 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
         if (LLAppearanceMgr::instance().getCOFVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
         {
             // Wait for cof to load
+            LL_DEBUGS_ONCE("Avatar") << "Received atachments, but cof isn't loaded yet, postponing processing" << LL_ENDL;
             return;
         }
 
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 227d4285eb..51be44bef4 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -334,21 +334,14 @@ void LLInventoryFetchItemsObserver::startFetch()
 
     if (aisv3)
     {
-        const S32 MAX_INDIVIDUAL_REQUESTS = 10;
+        const S32 MAX_INDIVIDUAL_REQUESTS = 7;
         for (requests_by_folders_t::value_type &folder : requests)
         {
-            LLViewerInventoryCategory* cat = gInventory.getCategory(folder.first);
             if (folder.second.size() > MAX_INDIVIDUAL_REQUESTS)
             {
                 // requesting one by one will take a while
                 // do whole folder
-                if (cat)
-                {
-                    // Either drop version or use scheduleFolderFetch to force-fetch
-                    // otherwise background fetch will ignore folders with set version
-                    cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
-                }
-                LLInventoryModelBackgroundFetch::getInstance()->start(folder.first);
+                LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(folder.first, true);
             }
             else
             {
@@ -360,12 +353,11 @@ void LLInventoryFetchItemsObserver::startFetch()
                         // start fetching whole folder since it's not ready either way
                         cat->fetch();
                     }
-                    else if (cat->getViewerDescendentCount() <= folder.second.size())
+                    else if (cat->getViewerDescendentCount() <= folder.second.size()
+                             || cat->getDescendentCount() <= folder.second.size())
                     {
                         // Start fetching whole folder since we need all items
-                        // Drop version or use scheduleFolderFetch
-                        cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);
-                        cat->fetch();
+                        LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(folder.first, true);
 
                     }
                     else
@@ -382,6 +374,7 @@ void LLInventoryFetchItemsObserver::startFetch()
                     // Isn't supposed to happen? We should have all folders
                     // and if item exists, folder is supposed to exist as well.
                     llassert(false);
+                    LL_WARNS("Inventory") << "Missing folder: " << folder.first << " fetching items individually" << LL_ENDL;
 
                     // get items one by one
                     for (LLUUID &item_id : folder.second)
-- 
cgit v1.2.3


From b09c19d27ceb2a3695cd688b1ccffcb3084f0e46 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 14 Sep 2023 20:58:42 +0300
Subject: SL-20285 Updated individual request count declaration

---
 indra/newview/llappearancemgr.cpp     | 3 +--
 indra/newview/llinventoryobserver.cpp | 4 ++--
 indra/newview/llinventoryobserver.h   | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 876ae23e62..8010b84c20 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4486,8 +4486,7 @@ public:
                     // AIS can fetch couple items, but if there
                     // is more than a dozen it will be very slow
                     // it's faster to get whole folder in such case
-                    const S32 MAX_INDIVIDUAL_FETCH = 10;
-                    if (incomplete_count > MAX_INDIVIDUAL_FETCH
+                    if (incomplete_count > LLInventoryFetchItemsObserver::MAX_INDIVIDUAL_ITEM_REQUESTS
                         || (incomplete_count > 1 && complete_count == 0))
                     {
                         LLInventoryModelBackgroundFetch::instance().scheduleFolderFetch(*it, true);
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 51be44bef4..281a8bc789 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -58,6 +58,7 @@
 #include "llsdutil.h"
 #include <deque>
 
+const S32 LLInventoryFetchItemsObserver::MAX_INDIVIDUAL_ITEM_REQUESTS = 7;
 const F32 LLInventoryFetchItemsObserver::FETCH_TIMER_EXPIRY = 60.0f;
 
 
@@ -334,10 +335,9 @@ void LLInventoryFetchItemsObserver::startFetch()
 
     if (aisv3)
     {
-        const S32 MAX_INDIVIDUAL_REQUESTS = 7;
         for (requests_by_folders_t::value_type &folder : requests)
         {
-            if (folder.second.size() > MAX_INDIVIDUAL_REQUESTS)
+            if (folder.second.size() > MAX_INDIVIDUAL_ITEM_REQUESTS)
             {
                 // requesting one by one will take a while
                 // do whole folder
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index 93109a70ac..bec08d2cdf 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -104,6 +104,9 @@ public:
 
 	/*virtual*/ void startFetch();
 	/*virtual*/ void changed(U32 mask);
+
+    // For attempts to group requests if too many items are requested
+    static const S32 MAX_INDIVIDUAL_ITEM_REQUESTS;
 private:
 	LLTimer mFetchingPeriod;
 
-- 
cgit v1.2.3


From 28e6ce451c3d01333a805f11286dacc9f3157c54 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 14 Sep 2023 23:34:57 +0300
Subject: SL-20269 Tab's focus jumps over item when clicking on edge items

---
 indra/llui/lltabcontainer.cpp | 8 +++++++-
 indra/llui/lltabcontainer.h   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index f15e9771c0..76b9e448a1 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -605,6 +605,7 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
 			LLButton* tab_button = getTab(index)->mButton;
 			gFocusMgr.setMouseCapture(this);
 			tab_button->setFocus(TRUE);
+            mMouseDownTimer.start();
 		}
 	}
 	if (handled) {
@@ -653,7 +654,11 @@ BOOL LLTabContainer::handleHover( S32 x, S32 y, MASK mask )
 		handled = LLPanel::handleHover(x, y, mask);
 	}
 
-	commitHoveredButton(x, y);
+    F32 drag_delay = 0.25f; // filter out clicks from dragging
+    if (mMouseDownTimer.getElapsedTimeF32() > drag_delay)
+    {
+        commitHoveredButton(x, y);
+    }
 	return handled;
 }
 
@@ -699,6 +704,7 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
 	}
 
 	commitHoveredButton(x, y);
+    mMouseDownTimer.stop();
 	LLPanel* cur_panel = getCurrentPanel();
 	if (hasMouseCapture())
 	{
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index 8f8cedb1b9..aa4a08c4ff 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -320,6 +320,7 @@ private:
 	LLUIColor						mTabsFlashingColor;
 	S32								mTabIconCtrlPad;
 	bool							mUseTabEllipses;
+    LLFrameTimer					mMouseDownTimer;
 };
 
 #endif  // LL_TABCONTAINER_H
-- 
cgit v1.2.3


From 76c6dc025d39adba54cff2c112337274efaddd10 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 14 Sep 2023 23:59:58 +0300
Subject: SL-19826 Gallery multiselect support, fix right click

---
 indra/newview/llinventorygallery.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 1ee08eb01c..4838ba7a47 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1012,20 +1012,16 @@ BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
     if (mSelectedItemIDs.size() > 0)
     {
-        selection_deque::iterator iter = mSelectedItemIDs.begin();
-        if (mItemMap[*iter])
-        {
-            mItemMap[*iter]->setFocus(false);
-            setFocus(true);
-        }
+        setFocus(true);
     }
-    clearSelection();
+    mLastInteractedUUID = LLUUID::null;
 
     // Scroll is going to always return true
     BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
 
-    if (mSelectedItemIDs.empty())
+    if (mLastInteractedUUID.isNull()) // no child were hit
     {
+        clearSelection();
         if (mInventoryGalleryMenu && mFolderID.notNull())
         {
             uuid_vec_t selected_uuids;
@@ -1487,6 +1483,7 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_
         && std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) != mSelectedItemIDs.end())
     {
         // Already selected
+        mLastInteractedUUID = item_id;
         return;
     }
 
@@ -1514,6 +1511,7 @@ void LLInventoryGallery::addItemSelection(const LLUUID& item_id, bool scroll_to_
     if (std::find(mSelectedItemIDs.begin(), mSelectedItemIDs.end(), item_id) != mSelectedItemIDs.end())
     {
         // Already selected
+        mLastInteractedUUID = item_id;
         return;
     }
 
@@ -2707,7 +2705,7 @@ BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
     {
         mGallery->toggleSelectionRangeFromLast(mUUID);
     }
-    else if (!isSelected())
+    else
     {
         mGallery->changeItemSelection(mUUID, false);
     }
@@ -2724,6 +2722,15 @@ BOOL LLInventoryGalleryItem::handleMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLInventoryGalleryItem::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
+    if (!isSelected())
+    {
+        mGallery->changeItemSelection(mUUID, false);
+    }
+    else
+    {
+        // refresh last interacted
+        mGallery->addItemSelection(mUUID, false);
+    }
     setFocus(TRUE);
     mGallery->claimEditHandler();
     mGallery->showContextMenu(this, x, y, mUUID);
-- 
cgit v1.2.3


From 69a98a8465f910d58911456dfe840a7b829ccc65 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 13 Sep 2023 18:50:42 +0300
Subject: SL-20278 Disconnect saving MFA from saving password

---
 indra/newview/llfloaterforgetuser.cpp              |  1 +
 indra/newview/lllogininstance.cpp                  | 28 +++++++++++++++------
 indra/newview/lllogininstance.h                    |  3 +++
 indra/newview/llpanellogin.cpp                     |  5 ----
 indra/newview/llstartup.cpp                        | 11 +++++++-
 indra/newview/lltoastalertpanel.cpp                |  8 ++++++
 .../newview/skins/default/xui/en/notifications.xml | 29 ++++++++++++++++++++--
 7 files changed, 69 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp
index 97b022699f..05e0b07584 100644
--- a/indra/newview/llfloaterforgetuser.cpp
+++ b/indra/newview/llfloaterforgetuser.cpp
@@ -229,6 +229,7 @@ void LLFloaterForgetUser::forgetUser(const std::string &userid, const std::strin
 {
     // Remove creds
     gSecAPIHandler->removeFromCredentialMap("login_list", grid, userid);
+    gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid, userid);
 
     LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(grid);
     if (cred.notNull() && cred->userID() == userid)
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index dd8c9b2dde..01496fa7ce 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -87,6 +87,7 @@ LLLoginInstance::LLLoginInstance() :
 	mLoginModule(new LLLogin()),
 	mNotifications(NULL),
 	mLoginState("offline"),
+    mSaveMFA(true),
 	mAttemptComplete(false),
 	mTransferRate(0.0f),
 	mDispatcher("LLLoginInstance", "change")
@@ -449,10 +450,7 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
             gViewerWindow->setShowProgress(FALSE);
         }
 
-        LLSD args(llsd::map( "MESSAGE", LLTrans::getString(response["message_id"]) ));
-        LLSD payload;
-        LLNotificationsUtil::add("PromptMFAToken", args, payload,
-            boost::bind(&LLLoginInstance::handleMFAChallenge, this, _1, _2));
+        showMFAChallange(LLTrans::getString(response["message_id"]));
     }
     else if(   reason_response == "key"
             || reason_response == "presence"
@@ -540,10 +538,7 @@ bool LLLoginInstance::handleTOSResponse(bool accepted, const std::string& key)
         {
             // SL-18511 this TOS failure happened while we are in the middle of an MFA challenge/response.
             // the previously entered token is very likely expired, so prompt again
-            LLSD args(llsd::map( "MESSAGE", LLTrans::getString("LoginFailedAuthenticationMFARequired") ));
-            LLSD payload;
-            LLNotificationsUtil::add("PromptMFAToken", args, payload,
-                boost::bind(&LLLoginInstance::handleMFAChallenge, this, _1, _2));
+            showMFAChallange(LLTrans::getString("LoginFailedAuthenticationMFARequired"));
         }
         else
         {
@@ -561,6 +556,22 @@ bool LLLoginInstance::handleTOSResponse(bool accepted, const std::string& key)
     return true;
 }
 
+void LLLoginInstance::showMFAChallange(const std::string& message)
+{
+    LLSD args(llsd::map("MESSAGE", message));
+    LLSD payload;
+    if (gSavedSettings.getBOOL("RememberUser"))
+    {
+        LLNotificationsUtil::add("PromptMFATokenWithSave", args, payload,
+                                 boost::bind(&LLLoginInstance::handleMFAChallenge, this, _1, _2));
+    }
+    else
+    {
+        LLNotificationsUtil::add("PromptMFAToken", args, payload,
+                                 boost::bind(&LLLoginInstance::handleMFAChallenge, this, _1, _2));
+    }
+}
+
 bool LLLoginInstance::handleMFAChallenge(LLSD const & notif, LLSD const & response)
 {
     bool continue_clicked = response["continue"].asBoolean();
@@ -576,6 +587,7 @@ bool LLLoginInstance::handleMFAChallenge(LLSD const & notif, LLSD const & respon
 
         // Set the request data to true and retry login.
         mRequestData["params"]["token"] = token;
+        mSaveMFA = response.has("ignore") ? response["ignore"].asBoolean() : false;
         reconnect();
     } else {
         LL_INFOS("LLLogin") << "PromptMFAToken: no token, attemptComplete" << LL_ENDL;
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index ee3ef0e4b1..2e9aab7c00 100644
--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@@ -56,6 +56,7 @@ public:
 	bool authSuccess() { return mAttemptComplete && mLoginState == "online"; }
 
 	const std::string& getLoginState() { return mLoginState; }
+    bool saveMFA() const { return mSaveMFA; }
 	LLSD getResponse(const std::string& key) { return getResponse()[key]; }
 	LLSD getResponse();
 
@@ -84,6 +85,7 @@ private:
 	void syncWithUpdater(ResponsePtr resp, const LLSD& notification, const LLSD& response);
 
 	bool handleTOSResponse(bool v, const std::string& key);
+    void showMFAChallange(const std::string& message);
     bool handleMFAChallenge(LLSD const & notif, LLSD const & response);
 
 	void attemptComplete() { mAttemptComplete = true; } // In the future an event?
@@ -95,6 +97,7 @@ private:
 	LLSD mRequestData;
 	LLSD mResponseData;
 	bool mAttemptComplete;
+    bool mSaveMFA;
 	F64 mTransferRate;
 	std::string mSerialNumber;
 	int mLastExecEvent;
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 8f1e57e44c..49756a4e09 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -1110,11 +1110,6 @@ void LLPanelLogin::onRememberPasswordCheck(void*)
 
         std::string grid(LLGridManager::getInstance()->getGridId());
         std::string user_id(cred->userID());
-        if (!remember_password)
-        {
-            gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid, user_id);
-            gSecAPIHandler->syncProtectedMap();
-        }
     }
 }
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index ced6ffa32e..ad87fca25b 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3795,7 +3795,9 @@ bool process_login_success_response()
 
 
 	// Only save mfa_hash for future logins if the user wants their info remembered.
-	if(response.has("mfa_hash") && gSavedSettings.getBOOL("RememberUser") && gSavedSettings.getBOOL("RememberPassword"))
+	if(response.has("mfa_hash")
+       && gSavedSettings.getBOOL("RememberUser")
+       && LLLoginInstance::getInstance()->saveMFA())
 	{
 		std::string grid(LLGridManager::getInstance()->getGridId());
 		std::string user_id(gUserCredential->userID());
@@ -3803,6 +3805,13 @@ bool process_login_success_response()
 		// TODO(brad) - related to SL-17223 consider building a better interface that sync's automatically
 		gSecAPIHandler->syncProtectedMap();
 	}
+    else if (!LLLoginInstance::getInstance()->saveMFA())
+    {
+        std::string grid(LLGridManager::getInstance()->getGridId());
+        std::string user_id(gUserCredential->userID());
+        gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid, user_id);
+        gSecAPIHandler->syncProtectedMap();
+    }
 
 	bool success = false;
 	// JC: gesture loading done below, when we have an asset system
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index 692e8d91a9..d35833fac9 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -279,6 +279,10 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 	if (!edit_text_name.empty())
 	{
 		S32 y = VPAD + BTN_HEIGHT + VPAD/2;
+        if (form->getIgnoreType() != LLNotificationForm::IGNORE_NO)
+        {
+            y += EDITOR_HEIGHT;
+        }
 		mLineEditor = LLUICtrlFactory::getInstance()->createFromFile<LLLineEditor>("alert_line_editor.xml", this, LLPanel::child_registry_t::instance());
 	
 		if (mLineEditor)
@@ -522,6 +526,10 @@ void LLToastAlertPanel::onButtonPressed( const LLSD& data, S32 button )
 	{
 		response[mLineEditor->getName()] = mLineEditor->getValue();
 	}
+    if (mNotification->getForm()->getIgnoreType() != LLNotificationForm::IGNORE_NO)
+    {
+        response["ignore"] = mNotification->isIgnored();
+    }
 	response[button_data->mButton->getName()] = true;
 
 	// If we declared a URL and chose the URL option, go to the url
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ef720e65e3..204fead7e0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11988,16 +11988,41 @@ Packing: [PACK_TIME]s [PSIZE]KB
 Unpacking: [UNPACK_TIME]s [USIZE]KB
     <tag>fail</tag>
   </notification>
-  
+
+    <notification
+     icon="alertmodal.tga"
+     label="Prompt for MFA Token"
+     name="PromptMFAToken"
+     type="alertmodal">
+        [MESSAGE]
+        <tag>confirm</tag>
+        <form name="form">
+            <input name="token" type="text" width="400" />
+            <button
+             default="true"
+             index="0"
+             name="continue"
+             text="Continue"/>
+            <button
+             index="1"
+             name="cancel"
+             text="Cancel"/>
+        </form>
+    </notification>
+
   <notification
    icon="alertmodal.tga"
    label="Prompt for MFA Token"
-   name="PromptMFAToken"
+   name="PromptMFATokenWithSave"
    type="alertmodal">
     [MESSAGE]
     <tag>confirm</tag>
     <form name="form">
       <input name="token" type="text" width="400" />
+      <ignore
+       name="ignore"
+       checkbox_only="true"
+       text="Remember this computer for 30 days."/>
       <button
        default="true"
        index="0"
-- 
cgit v1.2.3


From f479c54fbf4a2264f705f153dd944b637eaa860a Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sat, 2 Sep 2023 18:17:33 +0200
Subject: SEC-430 'WARNING: LLFace::getGeometryVolume: Index buffer overflow'
 occuring 500 times plus per minute

---
 indra/newview/llface.cpp     | 46 +++++++++++++++++++++++++++-----------------
 indra/newview/llface.h       | 10 ++++++----
 indra/newview/llvovolume.cpp | 18 +++++++++++------
 3 files changed, 46 insertions(+), 28 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index cec1f47a4c..c1776705f9 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1144,22 +1144,32 @@ void push_for_transform(LLVertexBuffer* buff, U32 source_count, U32 dest_count)
 }
 
 BOOL LLFace::getGeometryVolume(const LLVolume& volume,
-							   const S32 &f,
-								const LLMatrix4& mat_vert_in, const LLMatrix3& mat_norm_in,
-								const U16 &index_offset,
-								bool force_rebuild)
+                                S32 face_index,
+                                const LLMatrix4& mat_vert_in,
+                                const LLMatrix3& mat_norm_in,
+                                U16 index_offset,
+                                bool force_rebuild,
+                                bool no_debug_assert)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_FACE;
 	llassert(verify());
 
-	if (volume.getNumVolumeFaces() <= f) {
-        LL_WARNS() << "Attempt get volume face out of range! Total Faces: " << volume.getNumVolumeFaces() << " Attempt get access to: " << f << LL_ENDL;
-		return FALSE;
-	}
+    if (face_index < 0 || face_index >= volume.getNumVolumeFaces())
+    {
+        if (gDebugGL)
+        {
+            LL_WARNS() << "Face index is out of bounds!" << LL_ENDL;
+            LL_WARNS() << "Attempt get volume face out of range!"
+                " Total Faces: " << volume.getNumVolumeFaces() <<
+                " Attempt get access to: " << face_index << LL_ENDL;
+            llassert(no_debug_assert);
+        }
+        return FALSE;
+    }
 
     bool rigged = isState(RIGGED);
 
-    const LLVolumeFace &vf = volume.getVolumeFace(f);
+    const LLVolumeFace &vf = volume.getVolumeFace(face_index);
 	S32 num_vertices = (S32)vf.mNumVertices;
 	S32 num_indices = (S32) vf.mNumIndices;
 	
@@ -1174,14 +1184,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		{
 			if (gDebugGL)
 			{
-				LL_WARNS()	<< "Index buffer overflow!" << LL_ENDL;
+				LL_WARNS() << "Index buffer overflow!" << LL_ENDL;
 				LL_WARNS() << "Indices Count: " << mIndicesCount
 						<< " VF Num Indices: " << num_indices
 						<< " Indices Index: " << mIndicesIndex
 						<< " VB Num Indices: " << mVertexBuffer->getNumIndices() << LL_ENDL;
-				LL_WARNS()	<< " Face Index: " << f
+				LL_WARNS()	<< " Face Index: " << face_index
 						<< " Pool Type: " << mPoolType << LL_ENDL;
-				llassert(false);
+				llassert(no_debug_assert);
 			}
 			return FALSE;
 		}
@@ -1191,7 +1201,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			if (gDebugGL)
 			{
 				LL_WARNS() << "Vertex buffer overflow!" << LL_ENDL;
-				llassert(false);
+				llassert(no_debug_assert);
 			}
 			return FALSE;
 		}
@@ -1228,7 +1238,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 	bool rebuild_tangent = rebuild_pos && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TANGENT);
 	bool rebuild_weights = rebuild_pos && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_WEIGHT4);
 
-	const LLTextureEntry *tep = mVObjp->getTE(f);
+	const LLTextureEntry *tep = mVObjp->getTE(face_index);
 	const U8 bump_code = tep ? tep->getBumpmap() : 0;
 
 	BOOL is_static = mDrawablep->isStatic();
@@ -1443,7 +1453,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		
 			if (bump_code)
 			{
-				mVObjp->getVolume()->genTangents(f);
+				mVObjp->getVolume()->genTangents(face_index);
 				F32 offset_multiple; 
 				switch( bump_code )
 				{
@@ -1492,7 +1502,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			U8 texgen = getTextureEntry()->getTexGen();
 			if (rebuild_tcoord && texgen != LLTextureEntry::TEX_GEN_DEFAULT)
 			{ //planar texgen needs binormals
-				mVObjp->getVolume()->genTangents(f);
+				mVObjp->getVolume()->genTangents(face_index);
 			}
 
 			U8 tex_mode = 0;
@@ -1775,7 +1785,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 				{
 					mVertexBuffer->getTexCoord1Strider(tex_coords1, mGeomIndex, mGeomCount);
 		
-                    mVObjp->getVolume()->genTangents(f);
+                    mVObjp->getVolume()->genTangents(face_index);
 
 					for (S32 i = 0; i < num_vertices; i++)
 					{
@@ -1895,7 +1905,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			mVertexBuffer->getTangentStrider(tangent, mGeomIndex, mGeomCount);
 			F32* tangents = (F32*) tangent.get();
 			
-            mVObjp->getVolume()->genTangents(f);
+            mVObjp->getVolume()->genTangents(face_index);
 			
 			LLVector4Logical mask;
 			mask.clear();
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index 0a66dc6ba6..eb3b47d6d6 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -156,10 +156,12 @@ public:
 	void updateRebuildFlags();
 	bool canRenderAsMask(); // logic helper
 	BOOL getGeometryVolume(const LLVolume& volume,
-						const S32 &f,
-						const LLMatrix4& mat_vert, const LLMatrix3& mat_normal,
-						const U16 &index_offset,
-						bool force_rebuild = false);
+                            S32 face_index,
+                            const LLMatrix4& mat_vert,
+                            const LLMatrix3& mat_normal,
+                            U16 index_offset,
+                            bool force_rebuild = false,
+                            bool no_debug_assert = false);
 
 	// For avatar
 	U16			 getGeometryAvatar(
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 34f55d3341..73b00489d4 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -6080,12 +6080,18 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
 							LLVertexBuffer* buff = face->getVertexBuffer();
 							if (buff)
 							{
-								if (!face->getGeometryVolume(*volume, face->getTEOffset(), 
-									vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), face->getGeomIndex()))
-								{ //something's gone wrong with the vertex buffer accounting, rebuild this group 
-									group->dirtyGeom();
-									gPipeline.markRebuild(group);
-								}
+                                if (!face->getGeometryVolume(*volume, // volume
+                                    face->getTEOffset(),              // face_index
+                                    vobj->getRelativeXform(),         // mat_vert_in
+                                    vobj->getRelativeXformInvTrans(), // mat_norm_in
+                                    face->getGeomIndex(),             // index_offset
+                                    false,                            // force_rebuild
+                                    true))                            // no_debug_assert
+                                {   // Something's gone wrong with the vertex buffer accounting,
+                                    // rebuild this group with no debug assert because MESH_DIRTY
+                                    group->dirtyGeom();
+                                    gPipeline.markRebuild(group);
+                                }
 
                                 buff->unmapBuffer();
 							}
-- 
cgit v1.2.3


From 1057880d2fc70fafce4053415a879372a8719b1e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 18 Sep 2023 21:17:53 +0300
Subject: SL-20308 Clearing user's data should clear mfa

---
 indra/newview/llfloaterforgetuser.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp
index 05e0b07584..7f168df0c5 100644
--- a/indra/newview/llfloaterforgetuser.cpp
+++ b/indra/newview/llfloaterforgetuser.cpp
@@ -228,8 +228,13 @@ void LLFloaterForgetUser::processForgetUser()
 void LLFloaterForgetUser::forgetUser(const std::string &userid, const std::string &fav_id, const std::string &grid, bool delete_data)
 {
     // Remove creds
-    gSecAPIHandler->removeFromCredentialMap("login_list", grid, userid);
-    gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid, userid);
+    std::string grid_id = LLGridManager::getInstance()->getGridId(grid);
+    if (grid_id.empty())
+    {
+        grid_id = grid;
+    }
+    gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid_id, userid); // doesn't write
+    gSecAPIHandler->removeFromCredentialMap("login_list", grid, userid); // write operation
 
     LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(grid);
     if (cred.notNull() && cred->userID() == userid)
-- 
cgit v1.2.3


From db480d11fe69e54fb0387c6624657673b2f414e9 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 18 Sep 2023 14:16:15 -0500
Subject: SL-20229 Add blip for GLTF messages to "Show Updates to Objects"

---
 indra/newview/llgltfmateriallist.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index a204315a2a..655311f53d 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -347,6 +347,12 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
 
         if (obj)
         {
+            if (gShowObjectUpdates)
+            { // display a cyan blip for override updates when "Show Updates to Objects" enabled
+                LLColor4 color(0.f, 1.f, 1.f, 1.f);
+                gPipeline.addDebugBlip(obj->getPositionAgent(), color);
+            }
+
             const LLSD& tes = data["te"];
             const LLSD& od = data["od"];
 
-- 
cgit v1.2.3


From 83fb74720f27b8a203bc7a143931ecc5b4770c01 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 18 Sep 2023 15:55:23 -0500
Subject: SL-20229 Cache GLTF updates that are received before the object
 they're applied to is loaded.

---
 indra/newview/llgltfmateriallist.cpp | 53 ++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 24 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 655311f53d..0bdfcf05e7 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -337,6 +337,7 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
     const LLHost& host = msg->getSender();
     
     LLViewerRegion* region = LLWorld::instance().getRegion(host);
+    llassert(region);
 
     if (region)
     {
@@ -345,43 +346,47 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
         gObjectList.getUUIDFromLocal(id, local_id, host.getAddress(), host.getPort());
         LLViewerObject* obj = gObjectList.findObject(id);
 
-        if (obj)
-        {
-            if (gShowObjectUpdates)
-            { // display a cyan blip for override updates when "Show Updates to Objects" enabled
-                LLColor4 color(0.f, 1.f, 1.f, 1.f);
-                gPipeline.addDebugBlip(obj->getPositionAgent(), color);
-            }
+        // NOTE: obj may be null if the viewer hasn't heard about the object yet, cache update in any case
+
+        if (obj && gShowObjectUpdates)
+        { // display a cyan blip for override updates when "Show Updates to Objects" enabled
+            LLColor4 color(0.f, 1.f, 1.f, 1.f);
+            gPipeline.addDebugBlip(obj->getPositionAgent(), color);
+        }
 
-            const LLSD& tes = data["te"];
-            const LLSD& od = data["od"];
+        const LLSD& tes = data["te"];
+        const LLSD& od = data["od"];
 
-            if (tes.isArray())
+        if (tes.isArray())
+        {
+            LLGLTFOverrideCacheEntry cache;
+            cache.mLocalId = local_id;
+            cache.mObjectId = id;
+            cache.mRegionHandle = region->getHandle();
+
+            for (int i = 0; i < tes.size(); ++i)
             {
-                LLGLTFOverrideCacheEntry cache;
-                cache.mLocalId = local_id;
-                cache.mObjectId = id;
-                cache.mRegionHandle = region->getHandle();
+                LLGLTFMaterial* mat = new LLGLTFMaterial(); // setTEGLTFMaterialOverride and cache will take ownership
+                mat->applyOverrideLLSD(od[i]);
 
-                for (int i = 0; i < tes.size(); ++i)
-                {
-                    S32 te = tes[i].asInteger();
-                    LLGLTFMaterial* mat = new LLGLTFMaterial(); // setTEGLTFMaterialOverride will take ownership
-                    mat->applyOverrideLLSD(od[i]);
-                    obj->setTEGLTFMaterialOverride(te, mat);
+                S32 te = tes[i].asInteger();
 
-                    cache.mSides[te] = od[i];
-                    cache.mGLTFMaterial[te] = mat;
+                cache.mSides[te] = od[i];
+                cache.mGLTFMaterial[te] = mat;
 
+                if (obj)
+                {
+                    obj->setTEGLTFMaterialOverride(te, mat);
                     if (obj->getTE(te) && obj->getTE(te)->isSelected())
                     {
                         handle_gltf_override_message.doSelectionCallbacks(id, te);
                     }
                 }
-
-                region->cacheFullUpdateGLTFOverride(cache);
             }
+
+            region->cacheFullUpdateGLTFOverride(cache);
         }
+
     }
 }
 
-- 
cgit v1.2.3


From 97ee8b207bf43a8acb3f2702d26eb5f3b7471e45 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 19 Sep 2023 00:54:14 +0300
Subject: SL-5522 Fix applying textuers and materials with limited restrictions
 to attachments

1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions
---
 indra/newview/llpanelface.cpp       | 40 ++++++++++++++++++++++++++
 indra/newview/llpanelvolume.cpp     | 22 ++++++++++++++
 indra/newview/llselectmgr.cpp       | 57 ++++++++++++++++++++++++++++++++++---
 indra/newview/lltexturectrl.cpp     | 17 +++++++++++
 indra/newview/lltexturectrl.h       |  4 +--
 indra/newview/lltooldraganddrop.cpp |  2 ++
 6 files changed, 136 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index df464bc7e5..e1f08915fa 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1010,6 +1010,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		&& objectp->permModify())
 	{
 		BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced();
+        BOOL attachment = objectp->isAttachment();
 
         bool has_pbr_material;
         bool has_faces_without_pbr;
@@ -1306,6 +1307,18 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 					
 					texture_ctrl->setBakeTextureEnabled(TRUE);
 				}
+
+                if (attachment)
+                {
+                    // attachments are in world and in inventory,
+                    // server doesn't support changing permissions
+                    // in such case
+                    texture_ctrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                }
+                else
+                {
+                    texture_ctrl->setImmediateFilterPermMask(PERM_NONE);
+                }
 			}
 
 			if (shinytexture_ctrl)
@@ -1313,6 +1326,15 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 				shinytexture_ctrl->setTentative( !identical_spec );
 				shinytexture_ctrl->setEnabled( editable && !has_pbr_material);
 				shinytexture_ctrl->setImageAssetID( specmap_id );
+
+                if (attachment)
+                {
+                    shinytexture_ctrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                }
+                else
+                {
+                    shinytexture_ctrl->setImmediateFilterPermMask(PERM_NONE);
+                }
 			}
 
 			if (bumpytexture_ctrl)
@@ -1320,6 +1342,15 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 				bumpytexture_ctrl->setTentative( !identical_norm );
 				bumpytexture_ctrl->setEnabled( editable && !has_pbr_material);
 				bumpytexture_ctrl->setImageAssetID( normmap_id );
+
+                if (attachment)
+                {
+                    bumpytexture_ctrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                }
+                else
+                {
+                    bumpytexture_ctrl->setImmediateFilterPermMask(PERM_NONE);
+                }
 			}
 		}
 
@@ -1904,6 +1935,15 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material,
         pbr_ctrl->setTentative(identical_pbr ? FALSE : TRUE);
         pbr_ctrl->setEnabled(settable);
         pbr_ctrl->setImageAssetID(pbr_id);
+
+        if (objectp->isAttachment())
+        {
+            pbr_ctrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER | PERM_MODIFY);
+        }
+        else
+        {
+            pbr_ctrl->setImmediateFilterPermMask(PERM_NONE);
+        }
     }
 
     getChildView("pbr_from_inventory")->setEnabled(settable);
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index ed244f773c..d6c36bbfb7 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -365,6 +365,15 @@ void LLPanelVolume::getState( )
 		{
 			LightTextureCtrl->setEnabled(FALSE);
 			LightTextureCtrl->setValid(FALSE);
+
+            if (objectp->isAttachment())
+            {
+                LightTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+            }
+            else
+            {
+                LightTextureCtrl->setImmediateFilterPermMask(PERM_NONE);
+            }
 		}
 
 		getChildView("Light Intensity")->setEnabled(false);
@@ -1409,6 +1418,19 @@ void LLPanelVolume::setLightTextureID(const LLUUID &asset_id, const LLUUID &item
     if (volobjp)
     {
         LLViewerInventoryItem* item = gInventory.getItem(item_id);
+
+        if (item && volobjp->isAttachment())
+        {
+            const LLPermissions& perm = item->getPermissions();
+            BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
+            if (!unrestricted)
+            {
+                // Attachments are in world and in inventory simultaneously,
+                // at the moment server doesn't support such a situation.
+                return;
+            }
+        }
+
         if (item && !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
         {
             LLToolDragAndDrop::handleDropMaterialProtections(volobjp, item, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null);
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 6692d124d8..ecc2783eb1 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1852,10 +1852,24 @@ bool LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 		f(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mImageID(id) {}
 		bool apply(LLViewerObject* objectp, S32 te)
 		{
-		    if(objectp && !objectp->permModify())
+		    if(!objectp || !objectp->permModify())
 		    {
 		        return false;
 		    }
+
+            // Might be better to run willObjectAcceptInventory
+            if (mItem && objectp->isAttachment())
+            {
+                const LLPermissions& perm = mItem->getPermissions();
+                BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
+                if (!unrestricted)
+                {
+                    // Attachments are in world and in inventory simultaneously,
+                    // at the moment server doesn't support such a situation.
+                    return false;
+                }
+            }
+
 		    if (mItem)
 			{
                 LLToolDragAndDrop::dropTextureOneFace(objectp,
@@ -1938,10 +1952,21 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
         f(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mMatId(id) {}
         bool apply(LLViewerObject* objectp, S32 te)
         {
-            if (objectp && !objectp->permModify())
+            if (!objectp || !objectp->permModify())
             {
                 return false;
             }
+            if (mItem && objectp->isAttachment())
+            {
+                const LLPermissions& perm = mItem->getPermissions();
+                BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
+                if (!unrestricted)
+                {
+                    // Attachments are in world and in inventory simultaneously,
+                    // at the moment server doesn't support such a situation.
+                    return false;
+                }
+            }
             LLUUID asset_id = mMatId;
             if (mItem)
             {
@@ -2256,7 +2281,19 @@ void LLSelectMgr::selectionSetBumpmap(U8 bumpmap, const LLUUID &image_id)
     if (item && !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
     {
         LLViewerObject *object = mSelectedObjects->getFirstRootObject();
-        if (!object) return;
+        if (!object)
+        {
+            return;
+        }
+        const LLPermissions& perm = item->getPermissions();
+        BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
+        BOOL attached = object->isAttachment();
+        if (attached && !unrestricted)
+        {
+            // Attachments are in world and in inventory simultaneously,
+            // at the moment server doesn't support such a situation.
+            return;
+        }
         LLToolDragAndDrop::handleDropMaterialProtections(object, item, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null);
     }
     getSelection()->applyToTEs(&setfunc);
@@ -2316,7 +2353,19 @@ void LLSelectMgr::selectionSetShiny(U8 shiny, const LLUUID &image_id)
     if (item && !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
     {
         LLViewerObject *object = mSelectedObjects->getFirstRootObject();
-        if (!object) return;
+        if (!object)
+        {
+            return;
+        }
+        const LLPermissions& perm = item->getPermissions();
+        BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
+        BOOL attached = object->isAttachment();
+        if (attached && !unrestricted)
+        {
+            // Attachments are in world and in inventory simultaneously,
+            // at the moment server doesn't support such a situation.
+            return;
+        }
         LLToolDragAndDrop::handleDropMaterialProtections(object, item, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null);
     }
     getSelection()->applyToTEs(&setfunc);
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index c13376d0a6..7e399a6808 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1339,6 +1339,12 @@ void LLFloaterTexturePicker::setInventoryPickType(LLTextureCtrl::EPickInventoryT
     }
 }
 
+void LLFloaterTexturePicker::setImmediateFilterPermMask(PermissionMask mask)
+{
+    mImmediateFilterPermMask = mask;
+    mInventoryPanel->setFilterPermMask(mask);
+}
+
 void LLFloaterTexturePicker::onPickerCallback(const std::vector<std::string>& filenames, LLHandle<LLFloater> handle)
 {
     std::vector<std::string>::const_iterator iter = filenames.begin();
@@ -1526,6 +1532,17 @@ void LLTextureCtrl::setCanApply(bool can_preview, bool can_apply)
 	}
 }
 
+void LLTextureCtrl::setImmediateFilterPermMask(PermissionMask mask)
+{
+    mImmediateFilterPermMask = mask;
+
+    LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
+    if (floaterp)
+    {
+        floaterp->setImmediateFilterPermMask(mask);
+    }
+}
+
 void LLTextureCtrl::setVisible( BOOL visible ) 
 {
 	if( !visible )
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index ba310dd9a6..d82a167c93 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -184,8 +184,7 @@ public:
 
 	void			setCanApply(bool can_preview, bool can_apply);
 
-	void			setImmediateFilterPermMask(PermissionMask mask)
-					{ mImmediateFilterPermMask = mask; }
+	void			setImmediateFilterPermMask(PermissionMask mask);
 	void			setDnDFilterPermMask(PermissionMask mask)
 						{ mDnDFilterPermMask = mask; }
 	PermissionMask	getImmediateFilterPermMask() { return mImmediateFilterPermMask; }
@@ -351,6 +350,7 @@ public:
 	void 			setBakeTextureEnabled(BOOL enabled);
 
     void setInventoryPickType(LLTextureCtrl::EPickInventoryType type);
+    void setImmediateFilterPermMask(PermissionMask mask);
 
     static void		onPickerCallback(const std::vector<std::string>& filenames, LLHandle<LLFloater> handle);
 
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index afcdb26f1a..1b65439b2b 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1648,6 +1648,8 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL
 	BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
 	if(attached && !unrestricted)
 	{
+        // Attachments are in world and in inventory simultaneously,
+        // at the moment server doesn't support such a situation.
 		return ACCEPT_NO_LOCKED;
 	}
 	else if(modify && transfer && volume && !worn)
-- 
cgit v1.2.3


From 61ca550e64730afaaefd4db2234f886fb968f27e Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 19 Sep 2023 12:34:05 -0500
Subject: SL-20229 Fix for mac build (and don't spam log on viewers that don't
 know about a particular GenericStreamingMessage method)

---
 indra/newview/llviewergenericmessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp
index 7ea792c404..aaa1313ff6 100644
--- a/indra/newview/llviewergenericmessage.cpp
+++ b/indra/newview/llviewergenericmessage.cpp
@@ -103,7 +103,7 @@ void process_generic_streaming_message(LLMessageSystem* msg, void**)
         gGLTFMaterialList.applyOverrideMessage(msg, data.mData);
         break;
     default:
-        LL_WARNS() << "GenericStreamingMessage received unknown method: " << data.mMethod << LL_ENDL;
+        LL_WARNS_ONCE() << "Received unknown method" << LL_ENDL;
         break;
     }
 }
-- 
cgit v1.2.3


From 5b2de090c1ac44c415e8573e0d6b1136cd689f35 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 18 Sep 2023 17:05:45 -0700
Subject: SL-20177: Blind attempt at fixing crash in SetWindowLongPtr. Guess
 based on the fact that crashes started around the time VRAM accounting was
 added.

---
 indra/llwindow/llwindowwin32.cpp | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 1f91cbbaa8..42ec4ee29d 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -352,6 +352,11 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
 
     void run() override;
 
+    void glReady()
+    {
+        mGLReady = true;
+    }
+
     // initialzie DXGI adapter (for querying available VRAM)
     void initDX();
     
@@ -410,6 +415,9 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
     HWND mWindowHandle = NULL;
     HDC mhDC = 0;
 
+    // *HACK: Attempt to prevent startup crashes by deferring memory accounting
+    // until after some graphics setup. See SL-20177. -Cosmic,2023-09-18
+    bool mGLReady = false;
     // best guess at available video memory in MB
     std::atomic<U32> mAvailableVRAM;
 
@@ -1720,6 +1728,13 @@ const	S32   max_format  = (S32)num_formats - 1;
 	// ok to post quit messages now
 	mPostQuit = TRUE;
 
+    // *HACK: Attempt to prevent startup crashes by deferring memory accounting
+    // until after some graphics setup. See SL-20177. -Cosmic,2023-09-18
+    mWindowThread->post([=]()
+    {
+        mWindowThread->glReady();
+    });
+
 	if (auto_show)
 	{
 		show();
@@ -4692,6 +4707,8 @@ void debugEnumerateGraphicsAdapters()
 
 void LLWindowWin32::LLWindowWin32Thread::initDX()
 {
+    if (!mGLReady) { return; }
+
     if (mDXGIAdapter == NULL)
     {
         debugEnumerateGraphicsAdapters();
@@ -4726,6 +4743,8 @@ void LLWindowWin32::LLWindowWin32Thread::initDX()
 
 void LLWindowWin32::LLWindowWin32Thread::initD3D()
 {
+    if (!mGLReady) { return; }
+
     if (mDXGIAdapter == NULL && mD3DDevice == NULL && mWindowHandle != 0)
     {
         mD3D = Direct3DCreate9(D3D_SDK_VERSION);
@@ -4752,6 +4771,8 @@ void LLWindowWin32::LLWindowWin32Thread::initD3D()
 void LLWindowWin32::LLWindowWin32Thread::updateVRAMUsage()
 {
     LL_PROFILE_ZONE_SCOPED;
+    if (!mGLReady) { return; }
+
     if (mDXGIAdapter != nullptr)
     {
         // NOTE: what lies below is hand wavy math based on compatibility testing and observation against a variety of hardware
@@ -4825,8 +4846,6 @@ void LLWindowWin32::LLWindowWin32Thread::run()
     sWindowThreadId = std::this_thread::get_id();
     LogChange logger("Window");
 
-    initDX();
-
     //as good a place as any to up the MM timer resolution (see ms_sleep)
     //attempt to set timer resolution to 1ms
     TIMECAPS tc;
@@ -4839,9 +4858,12 @@ void LLWindowWin32::LLWindowWin32Thread::run()
     {
         LL_PROFILE_ZONE_SCOPED_CATEGORY_WIN32;
 
+        // lazily call initD3D inside this loop to catch when mGLReady has been set to true
+        initDX();
+
         if (mWindowHandle != 0)
         {
-            // lazily call initD3D inside this loop to catch when mWindowHandle has been set
+            // lazily call initD3D inside this loop to catch when mWindowHandle has been set, and mGLReady has been set to true
             // *TODO: Shutdown if this fails when mWindowHandle exists
             initD3D();
 
-- 
cgit v1.2.3


From 81752116e1243d68ae67c4771f267c4170dd9028 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 20 Sep 2023 18:48:13 +0300
Subject: SL-20298 Fix recursive fetch not working properly.

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 07d5713fc8..91adef8047 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -864,7 +864,8 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                 else
                 {
                     // Already fetched, check if anything inside needs fetching
-                    if (fetch_info.mFetchType == FT_RECURSIVE)
+                    if (fetch_info.mFetchType == FT_RECURSIVE
+                        || fetch_info.mFetchType == FT_FOLDER_AND_CONTENT)
                     {
                         LLInventoryModel::cat_array_t * categories(NULL);
                         LLInventoryModel::item_array_t * items(NULL);
-- 
cgit v1.2.3


From b88f0e40a584e3a0d9ff3fe11b1eda41fb89a29a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 20 Sep 2023 21:14:30 +0300
Subject: SL-20308 Clearing user's data should clear mfa #2

---
 indra/newview/llfloaterforgetuser.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp
index 7f168df0c5..f576ce7a76 100644
--- a/indra/newview/llfloaterforgetuser.cpp
+++ b/indra/newview/llfloaterforgetuser.cpp
@@ -164,6 +164,12 @@ bool LLFloaterForgetUser::onConfirmLogout(const LLSD& notification, const LLSD&
     if (option == 0)
     {
         // Remove creds
+        std::string grid_id = LLGridManager::getInstance()->getGridId(grid);
+        if (grid_id.empty())
+        {
+            grid_id = grid;
+        }
+        gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid_id, LLStartUp::getUserId()); // doesn't write
         gSecAPIHandler->removeFromCredentialMap("login_list", grid, LLStartUp::getUserId());
 
         LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(grid);
-- 
cgit v1.2.3


From 360ffff2885bff2f816c099dc414dc126cb7e258 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 21 Sep 2023 14:54:22 -0500
Subject: SL-20321 Interpret missing TEs in override messages as indication
 overrides should be nulled out if present.

---
 indra/newview/llgltfmateriallist.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 0bdfcf05e7..a92e699c42 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -357,6 +357,9 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
         const LLSD& tes = data["te"];
         const LLSD& od = data["od"];
 
+        constexpr U32 MAX_TES = 45;
+        bool has_te[MAX_TES] = { false };
+
         if (tes.isArray())
         {
             LLGLTFOverrideCacheEntry cache;
@@ -364,13 +367,15 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
             cache.mObjectId = id;
             cache.mRegionHandle = region->getHandle();
 
-            for (int i = 0; i < tes.size(); ++i)
+            U32 count = llmin(tes.size(), MAX_TES);
+            for (U32 i = 0; i < count; ++i)
             {
                 LLGLTFMaterial* mat = new LLGLTFMaterial(); // setTEGLTFMaterialOverride and cache will take ownership
                 mat->applyOverrideLLSD(od[i]);
 
                 S32 te = tes[i].asInteger();
 
+                has_te[te] = true;
                 cache.mSides[te] = od[i];
                 cache.mGLTFMaterial[te] = mat;
 
@@ -384,6 +389,20 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
                 }
             }
 
+            if (obj)
+            { // null out overrides on TEs that shouldn't have them
+                U32 count = llmin(obj->getNumTEs(), MAX_TES);
+                for (U32 i = 0; i < count; ++i)
+                {
+                    LLTextureEntry* te = obj->getTE(i);
+                    if (te && te->getGLTFMaterialOverride())
+                    {
+                        obj->setTEGLTFMaterialOverride(i, nullptr);
+                        handle_gltf_override_message.doSelectionCallbacks(id, i);
+                    }
+                }
+            }
+
             region->cacheFullUpdateGLTFOverride(cache);
         }
 
-- 
cgit v1.2.3


From 813acc39feec14b0c78fd9f704b358331ff87896 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 22 Sep 2023 14:23:07 -0500
Subject: SL-20325 Fix for double sided not working.

---
 indra/llprimitive/llgltfmaterial.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index 8475e7231a..19b7413934 100644
--- a/indra/llprimitive/llgltfmaterial.cpp
+++ b/indra/llprimitive/llgltfmaterial.cpp
@@ -833,7 +833,7 @@ void LLGLTFMaterial::applyOverrideLLSD(const LLSD& data)
     }
 
     const LLSD& ds = data["ds"];
-    if (data.isBoolean())
+    if (ds.isBoolean())
     {
         mDoubleSided = ds.asBoolean();
         mOverrideDoubleSided = true;
-- 
cgit v1.2.3


From 3da26ee8df6cc7e57ba3acbb91437ec97e151002 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 22 Sep 2023 15:31:49 -0500
Subject: SL-20321 Fix for missing "has_te" check (thanks Henri)

---
 indra/newview/llgltfmateriallist.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index a92e699c42..8919229c78 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -360,8 +360,8 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
         constexpr U32 MAX_TES = 45;
         bool has_te[MAX_TES] = { false };
 
-        if (tes.isArray())
-        {
+        if (tes.isArray()) // NOTE: if no "te" array exists, this is a malformed message (null out all overrides will come in as an empty te array)
+        { 
             LLGLTFOverrideCacheEntry cache;
             cache.mLocalId = local_id;
             cache.mObjectId = id;
@@ -395,7 +395,7 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s
                 for (U32 i = 0; i < count; ++i)
                 {
                     LLTextureEntry* te = obj->getTE(i);
-                    if (te && te->getGLTFMaterialOverride())
+                    if (!has_te[i] && te && te->getGLTFMaterialOverride())
                     {
                         obj->setTEGLTFMaterialOverride(i, nullptr);
                         handle_gltf_override_message.doSelectionCallbacks(id, i);
-- 
cgit v1.2.3


From 627a6a2d0fb9b041d42d98a7b6301793ca8a7184 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 25 Sep 2023 20:17:06 +0300
Subject: SL-20332 Crash at dragCategoryIntoFolder

---
 indra/newview/llinventorybridge.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 481b221870..73005d6903 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2982,7 +2982,10 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                      move_it != move_inv->mMoveList.end();
                      ++move_it)
                 {
-                    cb->fire(move_it->second);
+                    if (cb)
+                    {
+                        cb->fire(move_it->second);
+                    }
                 }
             };
 			accept = move_inv_category_world_to_agent(cat_id, mUUID, drop, callback, NULL, filter);
-- 
cgit v1.2.3


From 226081b27511ad45fbeaa16b9226265dc446976b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 25 Sep 2023 20:24:57 +0300
Subject: SL-20334 Unable to use non-square textures from inventory

---
 indra/newview/lltexturectrl.cpp | 4 +++-
 indra/newview/lltexturectrl.h   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 0c3730d084..2e137a8e12 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -176,6 +176,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mSelectedItemPinned( FALSE ),
 	mCanApply(true),
 	mCanPreview(true),
+    mLimitsSet(false),
     mMaxDim(S32_MAX),
     mMinDim(0),
 	mPreviewSettingChanged(false),
@@ -282,7 +283,7 @@ bool LLFloaterTexturePicker::updateImageStats()
         S32 height = mTexturep->getFullHeight();
 		if (width > 0 && height > 0)
 		{
-            if (width != height
+            if ((mLimitsSet && (width != height))
                 || width < mMinDim
                 || width > mMaxDim
                 || height < mMinDim
@@ -1200,6 +1201,7 @@ void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply, bool
 void LLFloaterTexturePicker::setMinDimentionsLimits(S32 min_dim)
 {
     mMinDim = min_dim;
+    mLimitsSet = true;
 
     std::string formatted_dims = llformat("%dx%d", mMinDim, mMinDim);
     mResolutionWarning->setTextArg("[MINTEXDIM]", formatted_dims);
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 7239b97552..e2bfe286d3 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -403,6 +403,7 @@ private:
 	bool mCanApply;
 	bool mCanPreview;
 	bool mPreviewSettingChanged;
+    bool mLimitsSet;
     S32 mMaxDim;
     S32 mMinDim;
 
-- 
cgit v1.2.3


From 6e32993c8787e7ba569d5a9ebcdb994c2ba03671 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 26 Sep 2023 13:59:31 +0300
Subject: SL-20338 FIXED Texture tab Material drop-down does not change if same
 numbered face is selected

---
 indra/newview/llpanelface.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index e1f08915fa..1428f7fe23 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1056,6 +1056,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         LLSelectedTEMaterial::getSpecularID(specmap_id, identical_spec);
 
         static S32 selected_te = -1;
+        static LLUUID prev_obj_id;
         if ((LLToolFace::getInstance() == LLToolMgr::getInstance()->getCurrentTool()) && 
             !LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected()) 
         {
@@ -1070,7 +1071,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                 }
             }
 
-            if (new_selection != selected_te)
+            if ((new_selection != selected_te)
+                || (prev_obj_id != objectp->getID()))
             {
                 bool te_has_media = objectp->getTE(new_selection) && objectp->getTE(new_selection)->hasMedia();
                 bool te_has_pbr = objectp->getRenderMaterialID(new_selection).notNull();
@@ -1088,6 +1090,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                     mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL);
                 }
                 selected_te = new_selection;
+                prev_obj_id = objectp->getID();
             }
         }
 
-- 
cgit v1.2.3


From f352fd1090ce4d50db349cdadfa61d66783a20e8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 26 Sep 2023 19:36:39 +0300
Subject: SL-20341 Item Properties floater closes on changes for task inventory
 item

---
 indra/newview/llsidepaneliteminfo.cpp | 11 +++++++++++
 indra/newview/llviewerobject.cpp      |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 6fc9c8c6b5..d6d5a4ef2d 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -257,6 +257,17 @@ void LLSidepanelItemInfo::refresh()
         }
 		return;
 	}
+
+    if (mObjectID.notNull())
+    {
+        LLViewerObject* object = gObjectList.findObject(mObjectID);
+        if (object)
+        {
+            // Object exists, but object's content is not nessesary
+            // loaded, so assume item exists as well
+            return;
+        }
+    }
     
     if (mParentFloater)
     {
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 011bea71a4..9275cfb86d 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -6034,7 +6034,7 @@ LLViewerObject::ExtraParameter* LLViewerObject::createNewParameterEntry(U16 para
       }
 	  default:
 	  {
-		  LL_INFOS() << "Unknown param type." << LL_ENDL;
+		  LL_INFOS_ONCE() << "Unknown param type: " << param_type << LL_ENDL;
 		  break;
 	  }
 	};
-- 
cgit v1.2.3


From b894570e9af5eafd5de06f401fdc782599c063a2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 Sep 2023 20:59:07 +0300
Subject: SL-19958 Fix default material not droping into texture ctrl

---
 indra/newview/lltexturectrl.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 7e399a6808..bbacec843b 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -2101,8 +2101,16 @@ BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)
 		return mDropCallback(this, item);
 	}
 
-	// no callback installed, so just set the image ids and carry on.
-	setImageAssetID( item->getAssetUUID() );
+    // no callback installed, so just set the image ids and carry on.
+    LLUUID asset_id = item->getAssetUUID();
+
+    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL && asset_id.isNull())
+    {
+        // If an inventory material has a null asset, consider it a valid blank material(gltf)
+        asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+    }
+
+	setImageAssetID(asset_id);
 	mImageItemID = item->getUUID();
 	return TRUE;
 }
-- 
cgit v1.2.3


From 1b493d56905a2d3875648196ac1bc39fc71e895a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 Sep 2023 21:11:01 +0300
Subject: SL-20343 Material floater was disconnected from object's face

---
 indra/newview/llmaterialeditor.cpp | 27 +--------------------------
 indra/newview/llmaterialeditor.h   |  1 -
 indra/newview/llpanelface.cpp      |  1 +
 3 files changed, 2 insertions(+), 27 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index a0c3fd9a28..0897ed14c6 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -412,9 +412,6 @@ BOOL LLMaterialEditor::postBuild()
 
     if (mIsOverride)
     {
-        // Material override change success callback
-        LLGLTFMaterialList::addSelectionUpdateCallback(&LLMaterialEditor::updateLive);
-
         // Live editing needs a recovery mechanism on cancel
         mBaseColorTextureCtrl->setOnCancelCallback(boost::bind(&LLMaterialEditor::onCancelCtrl, this, _1, _2, MATERIAL_BASE_COLOR_TEX_DIRTY));
         mMetallicTextureCtrl->setOnCancelCallback(boost::bind(&LLMaterialEditor::onCancelCtrl, this, _1, _2, MATERIAL_METALLIC_ROUGHTNESS_TEX_DIRTY));
@@ -542,12 +539,6 @@ void LLMaterialEditor::draw()
 {
     if (mIsOverride)
     {
-        bool selection_empty = LLSelectMgr::getInstance()->getSelection()->isEmpty();
-        if (selection_empty && mHasSelection)
-        {
-            mSelectionNeedsUpdate = true;
-        }
-
         if (mSelectionNeedsUpdate)
         {
             mSelectionNeedsUpdate = false;
@@ -1790,22 +1781,6 @@ void LLMaterialEditor::updateLive()
     mOverrideInProgress = false;
 }
 
-void LLMaterialEditor::updateLive(const LLUUID &object_id, S32 te)
-{
-    if (mOverrideObjectId != object_id
-        || mOverrideObjectTE != te)
-    {
-        // Ignore if waiting for override,
-        // if not waiting, mark selection dirty
-        mSelectionNeedsUpdate |= !mOverrideInProgress;
-        return;
-    }
-
-    // update for currently displayed object and face
-    mSelectionNeedsUpdate = true;
-    mOverrideInProgress = false;
-}
-
 void LLMaterialEditor::loadLive()
 {
     LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::getInstance("live_material_editor");
@@ -2816,7 +2791,7 @@ public:
             // something went wrong update selection
             LLMaterialEditor::updateLive();
         }
-        // else we will get updateLive(obj, id) from applied overrides
+        // else we will get updateLive() from panel face
     }
 
     bool getResult() { return mSuccess; }
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index b29db706f8..1c40fcc348 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -110,7 +110,6 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     void onSelectionChanged(); // live overrides selection changes
 
     static void updateLive();
-    static void updateLive(const LLUUID &object_id, S32 te);
     static void loadLive();
 
     static bool canModifyObjectsMaterial();
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 1428f7fe23..cb28fb4770 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -515,6 +515,7 @@ void LLPanelFace::draw()
     if (sMaterialOverrideSelection.update())
     {
         setMaterialOverridesFromSelection();
+        LLMaterialEditor::updateLive();
     }
 }
 
-- 
cgit v1.2.3


From b49632f4278078b0d10129a8c6742e145946cfff Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 Sep 2023 22:49:36 +0300
Subject: SL-20343 Close material live editor if editor floater closes

Closing tools floater disabled selection, material editor can't work without that
---
 indra/newview/llfloatertools.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index b6acba6558..5fb4fb9b07 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -925,6 +925,9 @@ void LLFloaterTools::onClose(bool app_quitting)
 	// hide the advanced object weights floater
 	LLFloaterReg::hideInstance("object_weights");
 
+    // hide gltf material editor
+    LLFloaterReg::hideInstance("live_material_editor");
+
 	// prepare content for next call
 	mPanelContents->clearContents();
 
-- 
cgit v1.2.3


From a4c2eab969b1971389408de5a3927f87d74a6d6d Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 28 Sep 2023 16:05:37 -0400
Subject: Fix integer overflow when framebuffers are extremely high resolution
 resulting in INT_MAX texture bias (#393)

---
 indra/llrender/llimagegl.cpp      | 24 ++++++++++++------------
 indra/llrender/llimagegl.h        |  8 ++++----
 indra/newview/llviewertexture.cpp |  5 ++++-
 3 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'indra')

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index b77f98d65e..c6fd824c4e 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -58,7 +58,7 @@ U32 wpo2(U32 i);
 
 // texture memory accounting (for OS X)
 static LLMutex sTexMemMutex;
-static std::unordered_map<U32, U32> sTextureAllocs;
+static std::unordered_map<U32, U64> sTextureAllocs;
 static U64 sTextureBytes = 0;
 
 // track a texture alloc on the currently bound texture.
@@ -67,7 +67,7 @@ static void alloc_tex_image(U32 width, U32 height, U32 pixformat)
 {
     U32 texUnit = gGL.getCurrentTexUnitIndex();
     U32 texName = gGL.getTexUnit(texUnit)->getCurrTexture();
-    S32 size = LLImageGL::dataFormatBytes(pixformat, width, height);
+    U64 size = LLImageGL::dataFormatBytes(pixformat, width, height);
 
     llassert(size >= 0);
 
@@ -296,7 +296,7 @@ S32 LLImageGL::dataFormatBits(S32 dataformat)
 }
 
 //static
-S32 LLImageGL::dataFormatBytes(S32 dataformat, S32 width, S32 height)
+S64 LLImageGL::dataFormatBytes(S32 dataformat, S32 width, S32 height)
 {
     switch (dataformat)
     {
@@ -312,8 +312,8 @@ S32 LLImageGL::dataFormatBytes(S32 dataformat, S32 width, S32 height)
     default:
         break;
     }
-	S32 bytes ((width*height*dataFormatBits(dataformat)+7)>>3);
-	S32 aligned = (bytes+3)&~3;
+	S64 bytes (((S64)width * (S64)height * (S64)dataFormatBits(dataformat)+7)>>3);
+	S64 aligned = (bytes+3)&~3;
 	return aligned;
 }
 
@@ -518,7 +518,7 @@ void LLImageGL::init(BOOL usemipmaps)
 	// so that it is obvious by visual inspection if we forgot to
 	// init a field.
 
-	mTextureMemory = (S32Bytes)0;
+	mTextureMemory = S64Bytes(0);
 	mLastBindTime = 0.f;
 
 	mPickMask = NULL;
@@ -1744,7 +1744,7 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_
     }
 
     
-    mTextureMemory = (S32Bytes)getMipBytes(mCurrentDiscardLevel);
+    mTextureMemory = (S64Bytes)getMipBytes(mCurrentDiscardLevel);
     mTexelsInGLTexture = getWidth() * getHeight();
 
     // mark this as bound at this point, so we don't throw it out immediately
@@ -1938,9 +1938,9 @@ void LLImageGL::destroyGLTexture()
 
 	if (mTexName != 0)
 	{
-		if(mTextureMemory != S32Bytes(0))
+		if(mTextureMemory != S64Bytes(0))
 		{
-			mTextureMemory = (S32Bytes)0;
+			mTextureMemory = (S64Bytes)0;
 		}
 		
 		LLImageGL::deleteTextures(1, &mTexName);
@@ -2036,7 +2036,7 @@ S32 LLImageGL::getWidth(S32 discard_level) const
 	return width;
 }
 
-S32 LLImageGL::getBytes(S32 discard_level) const
+S64 LLImageGL::getBytes(S32 discard_level) const
 {
 	if (discard_level < 0)
 	{
@@ -2049,7 +2049,7 @@ S32 LLImageGL::getBytes(S32 discard_level) const
 	return dataFormatBytes(mFormatPrimary, w, h);
 }
 
-S32 LLImageGL::getMipBytes(S32 discard_level) const
+S64 LLImageGL::getMipBytes(S32 discard_level) const
 {
 	if (discard_level < 0)
 	{
@@ -2057,7 +2057,7 @@ S32 LLImageGL::getMipBytes(S32 discard_level) const
 	}
 	S32 w = mWidth>>discard_level;
 	S32 h = mHeight>>discard_level;
-	S32 res = dataFormatBytes(mFormatPrimary, w, h);
+	S64 res = dataFormatBytes(mFormatPrimary, w, h);
 	if (mUseMipMaps)
 	{
 		while (w > 1 && h > 1)
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index 243aeaea25..a9a6b93cb3 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -65,7 +65,7 @@ public:
 
 	// Size calculation
 	static S32 dataFormatBits(S32 dataformat);
-	static S32 dataFormatBytes(S32 dataformat, S32 width, S32 height);
+	static S64 dataFormatBytes(S32 dataformat, S32 width, S32 height);
 	static S32 dataFormatComponents(S32 dataformat);
 
 	BOOL updateBindStats() const ;
@@ -145,8 +145,8 @@ public:
 	S32	 getWidth(S32 discard_level = -1) const;
 	S32	 getHeight(S32 discard_level = -1) const;
 	U8	 getComponents() const { return mComponents; }
-	S32  getBytes(S32 discard_level = -1) const;
-	S32  getMipBytes(S32 discard_level = -1) const;
+	S64  getBytes(S32 discard_level = -1) const;
+	S64  getMipBytes(S32 discard_level = -1) const;
 	BOOL getBoundRecently() const;
 	BOOL isJustBound() const;
 	BOOL getHasExplicitFormat() const { return mHasExplicitFormat; }
@@ -208,7 +208,7 @@ public:
 
 public:
 	// Various GL/Rendering options
-	S32Bytes mTextureMemory;
+	S64Bytes mTextureMemory;
 	mutable F32  mLastBindTime;	// last time this was bound, by discard level
 	
 private:
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 9fc092d4b9..9336d99555 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -534,9 +534,12 @@ void LLViewerTexture::updateClass()
 
     static LLCachedControl<U32> max_vram_budget(gSavedSettings, "RenderMaxVRAMBudget", 0);
 
+	F64 texture_bytes_alloc = LLImageGL::getTextureBytesAllocated() / 1024.0 / 512.0;
+	F64 vertex_bytes_alloc = LLVertexBuffer::getBytesAllocated() / 1024.0 / 512.0;
+
     // get an estimate of how much video memory we're using 
     // NOTE: our metrics miss about half the vram we use, so this biases high but turns out to typically be within 5% of the real number
-    F32 used = (LLImageGL::getTextureBytesAllocated() + LLVertexBuffer::getBytesAllocated()) / 1024 / 512;
+	F32 used = (F32)ll_round(texture_bytes_alloc + vertex_bytes_alloc);
     
     F32 budget = max_vram_budget == 0 ? gGLManager.mVRAM : max_vram_budget;
 
-- 
cgit v1.2.3


From a95ad7aac7248c5b81e5d9dd9e606b5ecb61e301 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 Sep 2023 23:35:09 +0300
Subject: SL-20337 Add tooltips for HDR Scale and Reflection Probe Ambience
 environment sliders

---
 indra/newview/llfloaterenvironmentadjust.cpp                      | 2 ++
 indra/newview/llpaneleditsky.cpp                                  | 2 ++
 indra/newview/skins/default/xui/en/floater_adjust_environment.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml   | 2 ++
 4 files changed, 8 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterenvironmentadjust.cpp b/indra/newview/llfloaterenvironmentadjust.cpp
index 18be4fffda..f3133ecb37 100644
--- a/indra/newview/llfloaterenvironmentadjust.cpp
+++ b/indra/newview/llfloaterenvironmentadjust.cpp
@@ -495,10 +495,12 @@ void LLFloaterEnvironmentAdjust::updateGammaLabel()
     if (ambiance != 0.f)
     {
         childSetValue("scene_gamma_label", getString("hdr_string"));
+        getChild<LLUICtrl>(FIELD_SKY_SCENE_GAMMA)->setToolTip(getString("hdr_tooltip"));
     }
     else
     {
         childSetValue("scene_gamma_label", getString("brightness_string"));
+        getChild<LLUICtrl>(FIELD_SKY_SCENE_GAMMA)->setToolTip(std::string());
     }
 }
 
diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp
index 0a7a4763be..839f25761a 100644
--- a/indra/newview/llpaneleditsky.cpp
+++ b/indra/newview/llpaneleditsky.cpp
@@ -342,10 +342,12 @@ void LLPanelSettingsSkyAtmosTab::updateGammaLabel(bool auto_adjust)
     if (ambiance != 0.f)
     {
         childSetValue("scene_gamma_label", getString("hdr_string"));
+        getChild<LLUICtrl>(FIELD_SKY_SCENE_GAMMA)->setToolTip(getString("hdr_tooltip"));
     }
     else
     {
         childSetValue("scene_gamma_label", getString("brightness_string"));
+        getChild<LLUICtrl>(FIELD_SKY_SCENE_GAMMA)->setToolTip(std::string());
     }
 
 }
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index 518a83f846..91a1dffcb5 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -12,6 +12,7 @@
          can_resize="false">
   <string name="hdr_string">HDR Scale:</string>
   <string name="brightness_string">Brightness:</string>
+  <string name="hdr_tooltip">Intensity of lightning effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
     <layout_stack name="outer_stack"
                   width="845"
                   height="275"
@@ -263,6 +264,7 @@
                           min_val="0"
                           max_val="10"
                           name="probe_ambiance"
+                          tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
                           top_pad="5"
                           width="185"
                           can_edit_text="true"/>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 2d79bc74ab..da82c95c83 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -9,6 +9,7 @@
         top="0">
   <string name="hdr_string">HDR Scale:</string>
   <string name="brightness_string">Brightness:</string>
+  <string name="hdr_tooltip">Intensity of lightning effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
     <layout_stack
             name="main_ls"
             follows="all"
@@ -332,6 +333,7 @@
                           min_val="0"
                           max_val="10"
                           name="probe_ambiance"
+                          tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
                           top_delta="20"
                           width="219"
                           can_edit_text="true"/>
-- 
cgit v1.2.3


From 153bd41bebae9f41e7c5e88dc54526eee152f6cf Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 2 Oct 2023 11:29:31 -0400
Subject: Fix ssao define in under water light softening shader (#403)

---
 indra/newview/llviewershadermgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 82b16d67bd..d52f0b68fa 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -2286,12 +2286,12 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
         if (local_light_kill)
         {
             gDeferredSoftenWaterProgram.addPermutation("LOCAL_LIGHT_KILL", "1");
-            gDeferredSoftenWaterProgram.addPermutation("HAS_SSAO", "1");
         }
 
 		if (gSavedSettings.getBOOL("RenderDeferredSSAO"))
 		{ //if using SSAO, take screen space light map into account as if shadows are enabled
 			gDeferredSoftenWaterProgram.mShaderLevel = llmax(gDeferredSoftenWaterProgram.mShaderLevel, 2);
+            gDeferredSoftenWaterProgram.addPermutation("HAS_SSAO", "1");
 		}
 
 		success = gDeferredSoftenWaterProgram.createShader(NULL, NULL);
-- 
cgit v1.2.3


From bc4e90ea5e462662f90c860d69aaa53b88f189c5 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 2 Oct 2023 14:19:04 -0500
Subject: SL-20124 Wipe reflection probes when applying parcel EEP settings and
 pause updates on probes until transition completes.

---
 indra/newview/llenvironment.cpp          | 15 +++++++++++++++
 indra/newview/llreflectionmapmanager.cpp | 17 +++++++++++++++--
 indra/newview/llreflectionmapmanager.h   |  9 +++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index f672d2a6f1..edc7bdef5f 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2954,12 +2954,20 @@ void LLEnvironment::DayTransition::animate()
                 setWater(mNextInstance->getWater());
     });
 
+
+    // pause probe updates and reset reflection maps on sky change
+    gPipeline.mReflectionMapManager.pause();
+    gPipeline.mReflectionMapManager.reset();
+
     mSky = mStartSky->buildClone();
     mBlenderSky = std::make_shared<LLSettingsBlenderTimeDelta>(mSky, mStartSky, mNextInstance->getSky(), mTransitionTime);
     mBlenderSky->setOnFinished(
         [this](LLSettingsBlender::ptr_t blender) {
         mBlenderSky.reset();
 
+        // resume reflection probe updates
+        gPipeline.mReflectionMapManager.resume();
+
         if (!mBlenderSky && !mBlenderWater)
             LLEnvironment::instance().mCurrentEnvironment = mNextInstance;
         else
@@ -3550,12 +3558,19 @@ namespace
             LLSettingsSky::ptr_t target_sky(start_sky->buildClone());
             mInjectedSky->setSource(target_sky);
 
+            // clear reflection probes and pause updates during sky change
+            gPipeline.mReflectionMapManager.pause();
+            gPipeline.mReflectionMapManager.reset();
+
             mBlenderSky = std::make_shared<LLSettingsBlenderTimeDelta>(target_sky, start_sky, psky, transition);
             mBlenderSky->setOnFinished(
                 [this, psky](LLSettingsBlender::ptr_t blender) 
                 {
                     mBlenderSky.reset();
                     mInjectedSky->setSource(psky);
+
+                    // resume updating reflection probes when done animating sky
+                    gPipeline.mReflectionMapManager.resume();
                     setSky(mInjectedSky);
                     if (!mBlenderWater && (countExperiencesActive() == 0))
                     {
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index bb0bb04797..915c8893a4 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -244,11 +244,14 @@ void LLReflectionMapManager::update()
             continue;
         }
         
-        if (probe != mDefaultProbe && !probe->isRelevant())
-        {
+        if (probe != mDefaultProbe && 
+            (!probe->isRelevant() || mPaused))
+        { // skip irrelevant probes (or all non-default probes if paused)
             continue;
         }
 
+        
+
         LLVector4a d;
 
         if (probe != mDefaultProbe)
@@ -807,6 +810,16 @@ void LLReflectionMapManager::reset()
     mReset = true;
 }
 
+void LLReflectionMapManager::pause()
+{
+    mPaused = true;
+}
+
+void LLReflectionMapManager::resume()
+{
+    mPaused = false;
+}
+
 void LLReflectionMapManager::shift(const LLVector4a& offset)
 {
     for (auto& probe : mProbes)
diff --git a/indra/newview/llreflectionmapmanager.h b/indra/newview/llreflectionmapmanager.h
index 5a3901cae9..b77a33da89 100644
--- a/indra/newview/llreflectionmapmanager.h
+++ b/indra/newview/llreflectionmapmanager.h
@@ -84,6 +84,12 @@ public:
     // reset all state on the next update
     void reset();
 
+    // pause all updates other than the default probe
+    void pause();
+
+    // unpause (see pause)
+    void resume();
+
     // called on region crossing to "shift" probes into new coordinate frame
     void shift(const LLVector4a& offset);
 
@@ -191,5 +197,8 @@ private:
 
     // if true, reset all probe render state on the next update (for teleports and sky changes)
     bool mReset = false;
+
+    // if true, only update the default probe
+    bool mPaused = false;
 };
 
-- 
cgit v1.2.3


From 41433fdb08b50e4721b2285a045cc8f14e82433c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 2 Oct 2023 15:16:53 -0500
Subject: SL-20394 Remove "glare" effect from PBR alpha shaders.

---
 .../shaders/class1/deferred/deferredUtil.glsl      | 52 +++-------------------
 .../shaders/class2/deferred/pbralphaF.glsl         | 23 +++-------
 2 files changed, 12 insertions(+), 63 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
index c8eaba6418..f9ebf33b4a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
@@ -382,8 +382,7 @@ vec3 pbrIbl(vec3 diffuseColor,
             vec3 irradiance, // irradiance map sample
             float ao,       // ambient occlusion factor
             float nv,       // normal dot view vector
-            float perceptualRough,
-            out vec3 specContrib)
+            float perceptualRough)
 {
     // retrieve a scale and bias to F0. See [1], Figure 3
 	vec2 brdf = BRDF(clamp(nv, 0, 1), 1.0-perceptualRough);
@@ -393,23 +392,9 @@ vec3 pbrIbl(vec3 diffuseColor,
 	vec3 diffuse = diffuseLight * diffuseColor;
 	vec3 specular = specularLight * (specularColor * brdf.x + brdf.y);
 
-    specContrib = specular * ao;
-
 	return (diffuse + specular) * ao;
 }
 
-vec3 pbrIbl(vec3 diffuseColor,
-            vec3 specularColor,
-            vec3 radiance, // radiance map sample
-            vec3 irradiance, // irradiance map sample
-            float ao,       // ambient occlusion factor
-            float nv,       // normal dot view vector
-            float perceptualRough)
-{
-    vec3 specContrib;
-    return pbrIbl(diffuseColor, specularColor, radiance, irradiance, ao, nv, perceptualRough, specContrib);
-}
-
 
 // Encapsulate the various inputs used by the various functions in the shading equation
 // We store values in this struct to simplify the integration of alternative implementations
@@ -475,8 +460,7 @@ vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor,
                     float metallic,
                     vec3 n, // normal
                     vec3 v, // surface point to camera
-                    vec3 l, //surface point to light
-                    out vec3 specContrib) //specular contribution (exposed to alpha shaders to calculate "glare")
+                    vec3 l) //surface point to light
 {
     // make sure specular highlights from punctual lights don't fall off of polished surfaces
     perceptualRoughness = max(perceptualRoughness, 8.0/255.0);
@@ -524,28 +508,13 @@ vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor,
 
 	// Calculation of analytical lighting contribution
 	vec3 diffuseContrib = (1.0 - F) * diffuse(pbrInputs);
-	specContrib = F * G * D / (4.0 * NdotL * NdotV);
+	vec3 specContrib = F * G * D / (4.0 * NdotL * NdotV);
 	// Obtain final intensity as reflectance (BRDF) scaled by the energy of the light (cosine law)
 	vec3 color = NdotL * (diffuseContrib + specContrib);
 
-    specContrib *= NdotL;
-    specContrib = max(specContrib, vec3(0));
-
     return clamp(color, vec3(0), vec3(10));
 }
 
-vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor, 
-                    float perceptualRoughness, 
-                    float metallic,
-                    vec3 n, // normal
-                    vec3 v, // surface point to camera
-                    vec3 l) //surface point to light
-{
-    vec3 specContrib;
-
-    return pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n, v, l, specContrib);
-}
-
 void calcDiffuseSpecular(vec3 baseColor, float metallic, inout vec3 diffuseColor, inout vec3 specularColor)
 {
     vec3 f0 = vec3(0.04);
@@ -554,30 +523,21 @@ void calcDiffuseSpecular(vec3 baseColor, float metallic, inout vec3 diffuseColor
     specularColor = mix(f0, baseColor, metallic);
 }
 
-vec3 pbrBaseLight(vec3 diffuseColor, vec3 specularColor, float metallic, vec3 v, vec3 norm, float perceptualRoughness, vec3 light_dir, vec3 sunlit, float scol, vec3 radiance, vec3 irradiance, vec3 colorEmissive, float ao, vec3 additive, vec3 atten, out vec3 specContrib)
+vec3 pbrBaseLight(vec3 diffuseColor, vec3 specularColor, float metallic, vec3 v, vec3 norm, float perceptualRoughness, vec3 light_dir, vec3 sunlit, float scol, vec3 radiance, vec3 irradiance, vec3 colorEmissive, float ao, vec3 additive, vec3 atten)
 {
     vec3 color = vec3(0);
 
     float NdotV = clamp(abs(dot(norm, v)), 0.001, 1.0);
     
-    vec3 ibl_spec;
-    color += pbrIbl(diffuseColor, specularColor, radiance, irradiance, ao, NdotV, perceptualRoughness, ibl_spec);
+    color += pbrIbl(diffuseColor, specularColor, radiance, irradiance, ao, NdotV, perceptualRoughness);
     
-    color += pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, norm, v, normalize(light_dir), specContrib) * sunlit * 3.0 * scol; //magic number to balance with legacy materials
-    specContrib *= sunlit * 2.75 * scol;
-    specContrib += ibl_spec;
+    color += pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, norm, v, normalize(light_dir)) * sunlit * 3.0 * scol; //magic number to balance with legacy materials
 
     color += colorEmissive;
 
     return color;
 }
 
-vec3 pbrBaseLight(vec3 diffuseColor, vec3 specularColor, float metallic, vec3 v, vec3 norm, float perceptualRoughness, vec3 light_dir, vec3 sunlit, float scol, vec3 radiance, vec3 irradiance, vec3 colorEmissive, float ao, vec3 additive, vec3 atten)
-{
-    vec3 specContrib;
-    return pbrBaseLight(diffuseColor, specularColor, metallic, v, norm, perceptualRoughness, light_dir, sunlit, scol, radiance, irradiance, colorEmissive, ao, additive, atten, specContrib);
-}
-
 uniform vec4 waterPlane;
 uniform float waterSign;
 
diff --git a/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
index be66b6feb2..35d752be02 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
@@ -112,16 +112,14 @@ vec3 pbrBaseLight(vec3 diffuseColor,
                   vec3 colorEmissive,
                   float ao,
                   vec3 additive,
-                  vec3 atten,
-                  out vec3 specContrib);
+                  vec3 atten);
 
 vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor, 
                     float perceptualRoughness, 
                     float metallic,
                     vec3 n, // normal
                     vec3 v, // surface point to camera
-                    vec3 l, //surface point to light
-                    out vec3 specContrib); 
+                    vec3 l); //surface point to light
 
 vec3 calcPointLightOrSpotLight(vec3 diffuseColor, vec3 specularColor, 
                     float perceptualRoughness, 
@@ -132,7 +130,7 @@ vec3 calcPointLightOrSpotLight(vec3 diffuseColor, vec3 specularColor,
                     vec3 lp, // light position
                     vec3 ld, // light direction (for spotlights)
                     vec3 lightColor,
-                    float lightSize, float falloff, float is_pointlight, inout float glare, float ambiance)
+                    float lightSize, float falloff, float is_pointlight, float ambiance)
 {
     vec3 color = vec3(0,0,0);
 
@@ -154,10 +152,7 @@ vec3 calcPointLightOrSpotLight(vec3 diffuseColor, vec3 specularColor,
 
         vec3 intensity = spot_atten * dist_atten * lightColor * 3.0; //magic number to balance with legacy materials
 
-        vec3 speccol;
-        color = intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, lv, speccol);
-        speccol *= intensity;
-        glare += max(max(speccol.r, speccol.g), speccol.b);
+        color = intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, lv);
     }
 
     return color;
@@ -166,7 +161,6 @@ vec3 calcPointLightOrSpotLight(vec3 diffuseColor, vec3 specularColor,
 void main()
 {
     vec3 color = vec3(0,0,0);
-    float glare = 0.0;
 
     vec3  light_dir   = (sun_up_factor == 1) ? sun_dir : moon_dir;
     vec3  pos         = vary_position;
@@ -232,9 +226,7 @@ void main()
 
     vec3 v = -normalize(pos.xyz);
 
-    vec3 spec;
-    color = pbrBaseLight(diffuseColor, specularColor, metallic, v, norm.xyz, perceptualRoughness, light_dir, sunlit_linear, scol, radiance, irradiance, colorEmissive, ao, additive, atten, spec);
-    glare += max(max(spec.r, spec.g), spec.b);
+    color = pbrBaseLight(diffuseColor, specularColor, metallic, v, norm.xyz, perceptualRoughness, light_dir, sunlit_linear, scol, radiance, irradiance, colorEmissive, ao, additive, atten);
 
     color.rgb = atmosFragLightingLinear(color.rgb, additive, atten);
     
@@ -246,7 +238,7 @@ void main()
     vec3 light = vec3(0);
 
     // Punctual lights
-#define LIGHT_LOOP(i) light += calcPointLightOrSpotLight(diffuseColor, specularColor, perceptualRoughness, metallic, norm.xyz, pos.xyz, v, light_position[i].xyz, light_direction[i].xyz, light_diffuse[i].rgb, light_deferred_attenuation[i].x, light_deferred_attenuation[i].y, light_attenuation[i].z, glare, light_attenuation[i].w);
+#define LIGHT_LOOP(i) light += calcPointLightOrSpotLight(diffuseColor, specularColor, perceptualRoughness, metallic, norm.xyz, pos.xyz, v, light_position[i].xyz, light_direction[i].xyz, light_diffuse[i].rgb, light_deferred_attenuation[i].x, light_deferred_attenuation[i].y, light_attenuation[i].z, light_attenuation[i].w);
 
     LIGHT_LOOP(1)
     LIGHT_LOOP(2)
@@ -261,9 +253,6 @@ void main()
     
     float a = basecolor.a*vertex_color.a;
     
-    glare = min(glare, 1.0);
-    a = max(a, glare);
-
     frag_color = max(vec4(color.rgb,a), vec4(0));
 }
 
-- 
cgit v1.2.3


From 2465470817957c8378e81ec1a7e32551fbac7b26 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 3 Oct 2023 11:20:43 -0400
Subject: Increment viewer version to 6.6.16 following promotion of DRTVWR-567

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index b69c12176f..5235a3e6f4 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.6.15
+6.6.16
-- 
cgit v1.2.3


From 5566f28b039e2f3999e397a26243707affc80991 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 3 Oct 2023 19:27:26 +0300
Subject: D559 Post merge fixes

---
 indra/newview/llaisapi.cpp                     | 27 +++----------
 indra/newview/llfloaterchangeitemthumbnail.cpp |  1 -
 indra/newview/llinventorymodel.cpp             |  2 +-
 indra/newview/llinventorypanel.cpp             |  1 -
 indra/newview/llmaterialeditor.cpp             |  2 +-
 indra/newview/lltexturectrl.cpp                | 54 +++++++-------------------
 6 files changed, 22 insertions(+), 65 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 087cfb8d48..b7d0b1ef1a 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -873,26 +873,9 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     LLSD httpResults;
     LLCore::HttpStatus status;
 
-    if (debugLoggingEnabled("Inventory"))
-    {
-        LLTimer ais_timer;
-        ais_timer.start();
-        result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
-        httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
-        status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
-        F32MillisecondsImplicit elapsed_time = ais_timer.getElapsedTimeF32();
-
-        LL_DEBUGS("Inventory") << "Request type: " << (S32)type
-            << " \nRequest target: " << targetId
-            << " \nElapsed time since request: " << elapsed_time
-            << " \nstatus: " << status.toULong() << LL_ENDL;
-    }
-    else
-    {
-        result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
-        httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
-        status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
-    }
+    result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
+    httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
 
     if (!status || !result.isMap())
     {
@@ -1053,7 +1036,7 @@ AISUpdate::AISUpdate(const LLSD& update, AISAPI::COMMAND_TYPE type, const LLSD&
         mFetchDepth = request_body["depth"].asInteger();
     }
 
-    mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
+    mTimer.setTimerExpirySec(EXPIRY_SECONDS_LIVE);
     mTimer.start();
 	parseUpdate(update);
 }
@@ -1079,7 +1062,7 @@ void AISUpdate::checkTimeout()
     {
         llcoro::suspend();
         LLCoros::checkStop();
-        mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
+        mTimer.setTimerExpirySec(EXPIRY_SECONDS_LIVE);
     }
 }
 
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 780130039b..f54240f6f4 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -750,7 +750,6 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
             "SELECT PHOTO",
             PERM_NONE,
             PERM_NONE,
-            PERM_NONE,
             FALSE,
             NULL);
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index e6fe00b044..f7c327c699 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3269,7 +3269,7 @@ LLCore::HttpHandle LLInventoryModel::requestPost(bool foreground,
 void LLInventoryModel::createCommonSystemCategories()
 {
     //amount of System Folder we should wait for
-    sPendingSystemFolders = 8;
+    sPendingSystemFolders = 9;
 
 	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_TRASH);
 	gInventory.ensureCategoryForTypeExists(LLFolderType::FT_FAVORITE);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index f9af63a80e..355d222b27 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2425,7 +2425,6 @@ void LLInventorySingleFolderPanel::doShare()
 
 LLAssetFilteredInventoryPanel::LLAssetFilteredInventoryPanel(const Params& p)
     : LLInventoryPanel(p)
-    , mAssetType(LLAssetType::AT_NONE)
 {
 }
 
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 0897ed14c6..be6f8d72e5 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1530,7 +1530,7 @@ void LLMaterialEditor::onSaveAsMsgCallback(const LLSD& notification, const LLSD&
             }
             if (item)
             {
-                const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+                const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
                 LLUUID parent_id = item->getParentUUID();
                 if (mObjectUUID.notNull() || marketplacelistings_id == parent_id || gInventory.isObjectDescendentOf(item->getUUID(), gInventory.getLibraryRootFolderID()))
                 {
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 796753955b..8a8abc222f 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -593,8 +593,6 @@ BOOL LLFloaterTexturePicker::postBuild()
 	childSetAction("Cancel", LLFloaterTexturePicker::onBtnCancel,this);
 	childSetAction("Select", LLFloaterTexturePicker::onBtnSelect,this);
 
-	// update permission filter once UI is fully initialized
-	updateFilterPermMask();
 	mSavedFolderState.setApply(FALSE);
 
 	LLToolPipette::getInstance()->setToolSelectCallback(boost::bind(&LLFloaterTexturePicker::onTextureSelect, this, _1));
@@ -837,8 +835,18 @@ void LLFloaterTexturePicker::commitCallback(LLTextureCtrl::ETexturePickOp op)
             {
                 if (!mLocalScrollCtrl->getAllSelected().empty())
                 {
-                    LLUUID temp_id = mLocalScrollCtrl->getFirstSelected()->getColumn(LOCAL_TRACKING_ID_COLUMN)->getValue().asUUID();
-                    asset_id = LLLocalBitmapMgr::getInstance()->getWorldID(temp_id);
+                    LLSD data = mLocalScrollCtrl->getFirstSelected()->getValue();
+                    LLUUID temp_id = data["id"];
+                    S32 asset_type = data["type"].asInteger();
+
+                    if (LLAssetType::AT_MATERIAL == asset_type)
+                    {
+                        asset_id = LLLocalGLTFMaterialMgr::getInstance()->getWorldID(temp_id);
+                    }
+                    else
+                    {
+                        asset_id = LLLocalBitmapMgr::getInstance()->getWorldID(temp_id);
+                    }
                 }
                 else
                 {
@@ -923,30 +931,10 @@ void LLFloaterTexturePicker::onBtnCancel(void* userdata)
 // static
 void LLFloaterTexturePicker::onBtnSelect(void* userdata)
 {
-	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-	LLUUID local_id = LLUUID::null;
-	if (self->mOwner)
-	{
-		if (self->mLocalScrollCtrl->getVisible() && !self->mLocalScrollCtrl->getAllSelected().empty())
-		{
-            LLSD data = self->mLocalScrollCtrl->getFirstSelected()->getValue();
-            LLUUID temp_id = data["id"];
-            S32 asset_type = data["type"].asInteger();
-
-            if (LLAssetType::AT_MATERIAL == asset_type)
-            {
-                local_id = LLLocalGLTFMaterialMgr::getInstance()->getWorldID(temp_id);
-            }
-            else
-            {
-                local_id = LLLocalBitmapMgr::getInstance()->getWorldID(temp_id);
-            }
-		}
-	}
-	
+	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;	
 	if (self->mOnFloaterCommitCallback)
 	{
-		self->commitCallback(LLTextureCtrl::TEXTURE_SELECT, local_id);
+		self->commitCallback(LLTextureCtrl::TEXTURE_SELECT);
 	}
 	self->closeFloater();
 }
@@ -1306,19 +1294,7 @@ void LLFloaterTexturePicker::onBakeTextureSelect(LLUICtrl* ctrl, void *user_data
 	}
 }
 
-//static
-void LLFloaterTexturePicker::onHideBaseMeshRegionCheck(LLUICtrl* ctrl, void *user_data)
-{
-	//LLFloaterTexturePicker* picker = (LLFloaterTexturePicker*)user_data;
-	//LLCheckBoxCtrl* check_box = (LLCheckBoxCtrl*)ctrl;
-}
-
-void LLFloaterTexturePicker::updateFilterPermMask()
-{
-	//mInventoryPanel->setFilterPermMask( getFilterPermMask() );  Commented out due to no-copy texture loss.
-}
-
-void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply)
+void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply, bool inworld_image)
 {
 	mSelectBtn->setEnabled(can_apply);
 	getChildRef<LLUICtrl>("preview_disabled").setVisible(!can_preview && inworld_image);
-- 
cgit v1.2.3


From 5d7b1b09ff195611548bababf36d412ef76ed924 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 4 Oct 2023 00:01:51 +0300
Subject: MacOS build fix

---
 indra/newview/llaisapi.cpp | 4 ++--
 indra/newview/llaisapi.h   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index b7d0b1ef1a..17e1a27934 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -1036,7 +1036,7 @@ AISUpdate::AISUpdate(const LLSD& update, AISAPI::COMMAND_TYPE type, const LLSD&
         mFetchDepth = request_body["depth"].asInteger();
     }
 
-    mTimer.setTimerExpirySec(EXPIRY_SECONDS_LIVE);
+    mTimer.setTimerExpirySec(AIS_EXPIRY_SECONDS);
     mTimer.start();
 	parseUpdate(update);
 }
@@ -1062,7 +1062,7 @@ void AISUpdate::checkTimeout()
     {
         llcoro::suspend();
         LLCoros::checkStop();
-        mTimer.setTimerExpirySec(EXPIRY_SECONDS_LIVE);
+        mTimer.setTimerExpirySec(AIS_EXPIRY_SECONDS);
     }
 }
 
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 0fdf4a0b74..f254f21e42 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -130,10 +130,9 @@ private:
 	void clearParseResults();
     void checkTimeout();
 
-    // Debug is very log-heavy, give it more time or it will take forever to process
-    // Todo: find a way to make throttle static isntead of per-request
-    const F32 EXPIRY_SECONDS_DEBUG = 1.f;
-    const F32 EXPIRY_SECONDS_LIVE = 0.008f;
+    // Fetch can return large packets of data, throttle it to not cause lags
+    // Todo: make throttle work over all fetch requests isntead of per-request
+    const F32 AIS_EXPIRY_SECONDS = 0.008f;
 
 	typedef std::map<LLUUID,S32> uuid_int_map_t;
 	uuid_int_map_t mCatDescendentDeltas;
-- 
cgit v1.2.3


From 50133bdebe3f07e9d6889769077e4360b0a5ff8c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 4 Oct 2023 20:55:07 +0300
Subject: SL-20400 Fixed cannot touch objects with "Select Only My Objects"

---
 indra/newview/llvovolume.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index c9f3d86793..20a6a189b4 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4617,7 +4617,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
 
     if (!pick_unselectable)
     {
-        if (!LLSelectMgr::instance().canSelectObject(this))
+        if (!LLSelectMgr::instance().canSelectObject(this, TRUE))
         {
             return FALSE;
         }
-- 
cgit v1.2.3


From 70abb3085d763f9d9dbb7bcaa49fe9e3004d54ed Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 3 Oct 2023 17:24:46 -0700
Subject: SL-20254: Fix blinn-phong alpha of 0 making GLTF materials invisible
 for non-root prims.

---
 indra/newview/llvovolume.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 20a6a189b4..468943423a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5856,7 +5856,16 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 						}
 						else
 						{
-							if (te->getColor().mV[3] > 0.f || te->getGlow() > 0.f)
+                            F32 alpha;
+                            if (is_pbr)
+                            {
+                                alpha = gltf_mat ? gltf_mat->mBaseColor.mV[3] : 1.0;
+                            }
+                            else
+                            {
+                                alpha = te->getColor().mV[3];
+                            }
+                            if (alpha > 0.f || te->getGlow() > 0.f)
 							{ //only treat as alpha in the pipeline if < 100% transparent
 								drawablep->setState(LLDrawable::HAS_ALPHA);
 								add_face(sAlphaFaces, alpha_count, facep);
-- 
cgit v1.2.3


From a1a32edf52365415f35cea26b26c011fc4d35984 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 4 Oct 2023 15:41:44 -0500
Subject: SL-20141 Remove "Local Lights" checkbox and instead make the number
 of lights rendered scale with the "Quality & speed" slider

---
 indra/newview/app_settings/settings.xml            |   8 +-
 indra/newview/featuretable.txt                     |  22 ++---
 indra/newview/featuretable_mac.txt                 |  23 +++--
 indra/newview/llviewercontrol.cpp                  |   7 --
 indra/newview/llviewershadermgr.cpp                |  18 ----
 indra/newview/llviewerstats.cpp                    |   2 -
 indra/newview/pipeline.cpp                         | 107 ++++++---------------
 indra/newview/pipeline.h                           |   9 --
 .../en/floater_preferences_graphics_advanced.xml   |  11 ---
 9 files changed, 54 insertions(+), 153 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c7a23552c2..837f801add 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9046,16 +9046,16 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RenderLocalLights</key>
+  <key>RenderLocalLightCount</key>
   <map>
     <key>Comment</key>
-    <string>Whether or not to render local lights.</string>
+    <string>Number of local lights to render.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>Boolean</string>
+    <string>S32</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>256</integer>
   </map>
   <key>RenderShadowSplitExponent</key>
   <map>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 39f7996c7c..f92d9a2a0e 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 58
+version 59
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -42,7 +42,7 @@ RenderGamma					1	0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
-RenderLocalLights			1	1
+RenderLocalLightCount		1	4096
 RenderTransparentWater      1   1
 RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	2
@@ -87,10 +87,10 @@ RenderAvatarMaxComplexity          1	35000
 RenderFarClip				1	64
 RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
-RenderLocalLights			1	0
+RenderLocalLightCount		1	8
 RenderMaxPartCount			1	0
 RenderTransparentWater      1   0
-RenderReflectionsEnabled    1   0
+RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
@@ -117,7 +117,7 @@ RenderFarClip				1	96
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	8
 RenderMaxPartCount			1	2048
-RenderLocalLights			1	1
+RenderLocalLightCount		1	256
 RenderTransparentWater      1   0
 RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	0
@@ -146,7 +146,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	512
 RenderTransparentWater      1   0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
@@ -175,7 +175,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	1024
 RenderTransparentWater      1   1
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
@@ -204,7 +204,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	2048
 RenderTransparentWater      1   1
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
@@ -233,7 +233,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	4096
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
@@ -260,7 +260,7 @@ RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
-RenderLocalLights			1	1
+RenderLocalLightCount		1	8192
 RenderMaxPartCount			1	8192
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
@@ -299,7 +299,7 @@ list safe
 RenderAnisotropic			1	0
 RenderAvatarMaxNonImpostors 1	16
 RenderAvatarMaxComplexity          1	80000
-RenderLocalLights			1	0
+RenderLocalLightCount		1	0
 RenderMaxPartCount			1	1024
 RenderTerrainDetail 		1	0
 RenderTransparentWater      1   0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index cce403c7aa..d86412a237 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 53
+version 54
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -42,7 +42,7 @@ RenderGamma					1	0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
-RenderLocalLights			1	1
+RenderLocalLightCount		1	4096
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
@@ -85,7 +85,7 @@ RenderAvatarMaxComplexity          1	35000
 RenderFarClip				1	64
 RenderFlexTimeFactor		1	0
 RenderGlowResolutionPow		1	8
-RenderLocalLights			1	0
+RenderLocalLightCount		1	8
 RenderMaxPartCount			1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
@@ -97,7 +97,7 @@ RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	0
 WLSkyDetail					1	96
 RenderFSAASamples			1	0
-RenderReflectionsEnabled    1   0
+RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	0
 RenderScreenSpaceReflections 1  0
 RenderReflectionProbeLevel  1   0
@@ -115,7 +115,7 @@ RenderFarClip				1	96
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	8
 RenderMaxPartCount			1	2048
-RenderLocalLights			1	1
+RenderLocalLightCount		1	256
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
@@ -144,7 +144,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	512
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
@@ -173,7 +173,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	1024
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
@@ -202,7 +202,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	2048
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
@@ -231,7 +231,7 @@ RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderMaxPartCount			1	4096
-RenderLocalLights			1	1
+RenderLocalLightCount		1	4096
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
@@ -258,7 +258,7 @@ RenderAvatarMaxNonImpostors 1   16
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
-RenderLocalLights			1	1
+RenderLocalLightCount		1	8192
 RenderMaxPartCount			1	8192
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
@@ -298,7 +298,7 @@ list safe
 RenderAnisotropic			1	0
 RenderAvatarMaxNonImpostors 1	16
 RenderAvatarMaxComplexity          1	80000
-RenderLocalLights			1	0
+RenderLocalLightCount		1	0
 RenderMaxPartCount			1	1024
 RenderTerrainDetail 		1	0
 RenderDeferredSSAO			0	0
@@ -313,7 +313,6 @@ RenderDeferredSSAO			1	0
 
 list Intel
 RenderAnisotropic			1	0
-RenderLocalLights			1	0
 RenderFSAASamples			1	0
 
 list GL3
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 9f4287c23d..7738cb904e 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -414,12 +414,6 @@ static bool handleRenderDynamicLODChanged(const LLSD& newvalue)
 	return true;
 }
 
-static bool handleRenderLocalLightsChanged(const LLSD& newvalue)
-{
-	gPipeline.setLightingDetail(-1);
-	return true;
-}
-
 static bool handleReflectionProbeDetailChanged(const LLSD& newvalue)
 {
     if (gPipeline.isInit())
@@ -722,7 +716,6 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "RenderFogRatio", handleFogRatioChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderMaxPartCount", handleMaxPartCountChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderDynamicLOD", handleRenderDynamicLODChanged);
-    setting_setup_signal_listener(gSavedSettings, "RenderLocalLights", handleRenderLocalLightsChanged);
 	setting_setup_signal_listener(gSavedSettings, "RenderVSyncEnable", handleVSyncChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderDeferredNoise", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderDebugPipeline", handleRenderDebugPipelineChanged);
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index d52f0b68fa..5adc26dc73 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -413,9 +413,6 @@ void LLViewerShaderMgr::setShaders()
         gViewerWindow->setCursor(UI_CURSOR_WAIT);
     }
 
-    // Lighting
-    gPipeline.setLightingDetail(-1);
-
     // Shaders
     LL_INFOS("ShaderLoading") << "\n~~~~~~~~~~~~~~~~~~\n Loading Shaders:\n~~~~~~~~~~~~~~~~~~" << LL_ENDL;
     LL_INFOS("ShaderLoading") << llformat("Using GLSL %d.%d", gGLManager.mGLSLVersionMajor, gGLManager.mGLSLVersionMinor) << LL_ENDL;
@@ -580,21 +577,6 @@ std::string LLViewerShaderMgr::loadBasicShaders()
 	
 	S32 sum_lights_class = 3;
 
-	// class one cards will get the lower sum lights
-	// class zero we're not going to think about
-	// since a class zero card COULD be a ridiculous new card
-	// and old cards should have the features masked
-	if(LLFeatureManager::getInstance()->getGPUClass() == GPU_CLASS_1)
-	{
-		sum_lights_class = 2;
-	}
-
-	// If we have sun and moon only checked, then only sum those lights.
-	if (gPipeline.getLightingDetail() == 0)
-	{
-		sum_lights_class = 1;
-	}
-
 #if LL_DARWIN
 	// Work around driver crashes on older Macs when using deferred rendering
 	// NORSPEC-59
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 490cadee5c..6ac94fe4c4 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -192,7 +192,6 @@ LLTrace::SampleStatHandle<>	FPS_SAMPLE("fpssample"),
 							NUM_OBJECTS("numobjectsstat"),
 							NUM_ACTIVE_OBJECTS("numactiveobjectsstat"),
 							ENABLE_VBO("enablevbo", "Vertex Buffers Enabled"),
-							LIGHTING_DETAIL("lightingdetail", "Lighting Detail"),
 							VISIBLE_AVATARS("visibleavatars", "Visible Avatars"),
 							SHADER_OBJECTS("shaderobjects", "Object Shaders"),
 							DRAW_DISTANCE("drawdistance", "Draw Distance"),
@@ -402,7 +401,6 @@ void update_statistics()
 	record(LLStatViewer::TRIANGLES_DRAWN_PER_FRAME, last_frame_recording.getSum(LLStatViewer::TRIANGLES_DRAWN));
 
 	sample(LLStatViewer::ENABLE_VBO,      (F64)gSavedSettings.getBOOL("RenderVBOEnable"));
-	sample(LLStatViewer::LIGHTING_DETAIL, (F64)gPipeline.getLightingDetail());
 	sample(LLStatViewer::DRAW_DISTANCE,   (F64)gSavedSettings.getF32("RenderFarClip"));
 	sample(LLStatViewer::CHAT_BUBBLES,    gSavedSettings.getBOOL("UseChatBubbles"));
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 78d4e65d42..9266c84540 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -130,7 +130,6 @@ S32 LLPipeline::RenderShadowDetail;
 S32 LLPipeline::RenderShadowSplits;
 bool LLPipeline::RenderDeferredSSAO;
 F32 LLPipeline::RenderShadowResolutionScale;
-bool LLPipeline::RenderLocalLights;
 bool LLPipeline::RenderDelayCreation;
 bool LLPipeline::RenderAnimateRes;
 bool LLPipeline::FreezeTime;
@@ -349,8 +348,7 @@ LLPipeline::LLPipeline() :
 	mResetVertexBuffers(false),
 	mLastRebuildPool(NULL),
 	mLightMask(0),
-	mLightMovingMask(0),
-	mLightingDetail(0)
+	mLightMovingMask(0)
 {
 	mNoiseMap = 0;
 	mTrueNoiseMap = 0;
@@ -471,8 +469,6 @@ void LLPipeline::init()
         mScreenTriangleVB->unmapBuffer();
     }
 
-    setLightingDetail(-1);
-	
 	//
 	// Update all settings to trigger a cached settings refresh
 	//
@@ -491,7 +487,6 @@ void LLPipeline::init()
     connectRefreshCachedSettingsSafe("RenderShadowSplits");
 	connectRefreshCachedSettingsSafe("RenderDeferredSSAO");
 	connectRefreshCachedSettingsSafe("RenderShadowResolutionScale");
-	connectRefreshCachedSettingsSafe("RenderLocalLights");
 	connectRefreshCachedSettingsSafe("RenderDelayCreation");
 	connectRefreshCachedSettingsSafe("RenderAnimateRes");
 	connectRefreshCachedSettingsSafe("FreezeTime");
@@ -982,7 +977,6 @@ void LLPipeline::refreshCachedSettings()
     RenderShadowSplits = gSavedSettings.getS32("RenderShadowSplits");
 	RenderDeferredSSAO = gSavedSettings.getBOOL("RenderDeferredSSAO");
 	RenderShadowResolutionScale = gSavedSettings.getF32("RenderShadowResolutionScale");
-	RenderLocalLights = gSavedSettings.getBOOL("RenderLocalLights");
 	RenderDelayCreation = gSavedSettings.getBOOL("RenderDelayCreation");
 	RenderAnimateRes = gSavedSettings.getBOOL("RenderAnimateRes");
 	FreezeTime = gSavedSettings.getBOOL("FreezeTime");
@@ -1356,39 +1350,6 @@ void LLPipeline::enableShadows(const bool enable_shadows)
 	//should probably do something here to wrangle shadows....	
 }
 
-S32 LLPipeline::getMaxLightingDetail() const
-{
-	/*if (mShaderLevel[SHADER_OBJECT] >= LLDrawPoolSimple::SHADER_LEVEL_LOCAL_LIGHTS)
-	{
-		return 3;
-	}
-	else*/
-	{
-		return 1;
-	}
-}
-
-S32 LLPipeline::setLightingDetail(S32 level)
-{
-	refreshCachedSettings();
-
-	if (level < 0)
-	{
-		if (RenderLocalLights)
-		{
-			level = 1;
-		}
-		else
-		{
-			level = 0;
-		}
-	}
-	level = llclamp(level, 0, getMaxLightingDetail());
-	mLightingDetail = level;
-	
-	return mLightingDetail;
-}
-
 class LLOctreeDirtyTexture : public OctreeTraveler
 {
 public:
@@ -5251,7 +5212,9 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
 		return;
 	}
 
-	if (mLightingDetail >= 1)
+    static LLCachedControl<S32> local_light_count(gSavedSettings, "RenderLocalLightCount", 256);
+
+	if (local_light_count >= 1)
 	{
 		// mNearbyLight (and all light_set_t's) are sorted such that
 		// begin() == the closest light and rbegin() == the farthest light
@@ -5518,7 +5481,9 @@ void LLPipeline::setupHWLights()
 
 	mLightMovingMask = 0;
 	
-	if (mLightingDetail >= 1)
+    static LLCachedControl<S32> local_light_count(gSavedSettings, "RenderLocalLightCount", 256);
+
+	if (local_light_count >= 1)
 	{
 		for (light_set_t::iterator iter = mNearbyLights.begin();
 			 iter != mNearbyLights.end(); ++iter)
@@ -5661,10 +5626,6 @@ void LLPipeline::enableLights(U32 mask)
 {
 	assertInitialized();
 
-	if (mLightingDetail == 0)
-	{
-		mask &= 0xf003; // sun and backlight only (and fullbright bit)
-	}
 	if (mLightMask != mask)
 	{
 		stop_glerror();
@@ -5692,28 +5653,13 @@ void LLPipeline::enableLights(U32 mask)
 	}
 }
 
-void LLPipeline::enableLightsStatic()
-{
-	assertInitialized();
-	U32 mask = 0x01; // Sun
-	if (mLightingDetail >= 2)
-	{
-		mask |= mLightMovingMask; // Hardware moving lights
-	}
-	else
-	{
-		mask |= 0xff & (~2); // Hardware local lights
-	}
-	enableLights(mask);
-}
-
 void LLPipeline::enableLightsDynamic()
 {
 	assertInitialized();
 	U32 mask = 0xff & (~2); // Local lights
 	enableLights(mask);
 	
-	if (isAgentAvatarValid() && getLightingDetail() <= 0)
+	if (isAgentAvatarValid())
 	{
 		if (gAgentAvatarp->mSpecialRenderMode == 0) // normal
 		{
@@ -7961,9 +7907,9 @@ void LLPipeline::renderDeferredLighting()
             unbindDeferredShader(LLPipeline::sUnderWaterRender ? gDeferredSoftenWaterProgram : gDeferredSoftenProgram);
         }
 
-        bool render_local = RenderLocalLights; // && !gCubeSnapshot;
+        static LLCachedControl<S32> local_light_count(gSavedSettings, "RenderLocalLightCount", 256);
 
-        if (render_local)
+        if (local_light_count > 0)
         {
             gGL.setSceneBlendType(LLRender::BT_ADD);
             std::list<LLVector4>        fullscreen_lights;
@@ -7998,8 +7944,15 @@ void LLPipeline::renderDeferredLighting()
                 // mNearbyLights already includes distance calculation and excludes muted avatars.
                 // It is calculated from mLights
                 // mNearbyLights also provides fade value to gracefully fade-out out of range lights
+                S32 count = 0;
                 for (light_set_t::iterator iter = mNearbyLights.begin(); iter != mNearbyLights.end(); ++iter)
                 {
+                    count++;
+                    if (count > local_light_count)
+                    { //stop collecting lights once we hit the limit
+                        break;
+                    }
+
                     LLDrawable * drawablep = iter->drawable;
                     LLVOVolume * volume = drawablep->getVOVolume();
                     if (!volume)
@@ -8046,24 +7999,20 @@ void LLPipeline::renderDeferredLighting()
                         camera->getOrigin().mV[1] > c[1] + s + 0.2f || camera->getOrigin().mV[1] < c[1] - s - 0.2f ||
                         camera->getOrigin().mV[2] > c[2] + s + 0.2f || camera->getOrigin().mV[2] < c[2] - s - 0.2f)
                     {  // draw box if camera is outside box
-                        if (render_local)
+                        if (volume->isLightSpotlight())
                         {
-                            if (volume->isLightSpotlight())
-                            {
-                                drawablep->getVOVolume()->updateSpotLightPriority();
-                                spot_lights.push_back(drawablep);
-                                continue;
-                            }
+                            drawablep->getVOVolume()->updateSpotLightPriority();
+                            spot_lights.push_back(drawablep);
+                            continue;
+                        }
 
-                            gDeferredLightProgram.uniform3fv(LLShaderMgr::LIGHT_CENTER, 1, c);
-                            gDeferredLightProgram.uniform1f(LLShaderMgr::LIGHT_SIZE, s);
-                            gDeferredLightProgram.uniform3fv(LLShaderMgr::DIFFUSE_COLOR, 1, col.mV);
-                            gDeferredLightProgram.uniform1f(LLShaderMgr::LIGHT_FALLOFF, volume->getLightFalloff(DEFERRED_LIGHT_FALLOFF));
-                            gGL.syncMatrices();
+                        gDeferredLightProgram.uniform3fv(LLShaderMgr::LIGHT_CENTER, 1, c);
+                        gDeferredLightProgram.uniform1f(LLShaderMgr::LIGHT_SIZE, s);
+                        gDeferredLightProgram.uniform3fv(LLShaderMgr::DIFFUSE_COLOR, 1, col.mV);
+                        gDeferredLightProgram.uniform1f(LLShaderMgr::LIGHT_FALLOFF, volume->getLightFalloff(DEFERRED_LIGHT_FALLOFF));
+                        gGL.syncMatrices();
 
-                            mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, center));
-                            stop_glerror();
-                        }
+                        mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, center));
                     }
                     else
                     {
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index fe92c69cbb..d4c6432e55 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -239,12 +239,6 @@ public:
     void        releaseSunShadowTargets();
     void        releaseSunShadowTarget(U32 index);
 
-// 	void		setLocalLighting(const bool local_lighting);
-// 	bool		isLocalLightingEnabled() const;
-	S32			setLightingDetail(S32 level);
-	S32			getLightingDetail() const { return mLightingDetail; }
-	S32			getMaxLightingDetail() const;
-		
 	bool		shadersLoaded();
 	bool		canUseWindLightShaders() const;
 	bool		canUseAntiAliasing() const;
@@ -348,7 +342,6 @@ public:
 	void setupHWLights();
 	void setupAvatarLights(bool for_edit = false);
 	void enableLights(U32 mask);
-	void enableLightsStatic();
 	void enableLightsDynamic();
 	void enableLightsAvatar();
 	void enableLightsPreview();
@@ -945,7 +938,6 @@ protected:
 	
 	U32						mLightMask;
 	U32						mLightMovingMask;
-	S32						mLightingDetail;
 		
 	static bool				sRenderPhysicalBeacons;
 	static bool				sRenderMOAPBeacons;
@@ -975,7 +967,6 @@ public:
     static S32 RenderShadowSplits;
 	static bool RenderDeferredSSAO;
 	static F32 RenderShadowResolutionScale;
-	static bool RenderLocalLights;
 	static bool RenderDelayCreation;
 	static bool RenderAnimateRes;
 	static bool FreezeTime;
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index fd80673903..bc237322af 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -540,17 +540,6 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <check_box
-    control_name="RenderLocalLights"
-    height="16"
-    initial_value="true"
-    label="Local Lights"
-    layout="topleft"
-    left="420"
-    name="LocalLights"
-    top_delta="16"
-    width="300" />
-
   <slider
     control_name="WLSkyDetail"
     decimal_digits="0"
-- 
cgit v1.2.3


From b6109a0da5be5f6fdbdd8647dda0b2a8d54928d6 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 4 Oct 2023 02:29:17 +0200
Subject: SL-20348 Focus should be in the chat bar when the Conversations
 floater is opened

---
 indra/newview/llfloaterimcontainer.cpp  | 3 +++
 indra/newview/llfloaterimsessiontab.cpp | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 2720b7fcf7..011ad67011 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -289,6 +289,9 @@ void LLFloaterIMContainer::onOpen(const LLSD& key)
 	LLMultiFloater::onOpen(key);
 	reSelectConversation();
 	assignResizeLimits();
+
+	LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(mSelectedSession);
+	session_floater->onOpen(key);
 }
 
 // virtual
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index af4e7f5aff..0b0dce29fb 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -986,6 +986,8 @@ void LLFloaterIMSessionTab::onOpen(const LLSD& key)
 	}
 
 	mInputButtonPanel->setVisible(isTornOff());
+
+	setFocus(TRUE);
 }
 
 
-- 
cgit v1.2.3


From 85470fc4d29cb2fd7d168debdeed3544778592b8 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 4 Oct 2023 16:56:49 -0700
Subject: SL-20396: Apply blinn-phong rotation to texture translation
 animations for GLTF materials, for more consistent behavior

---
 indra/newview/llvovolume.cpp | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 468943423a..f1d4d9039b 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -666,7 +666,25 @@ void LLVOVolume::animateTextures()
                 {
                     if (!(result & LLViewerTextureAnim::ROTATE))
                     {
-                        rot = 0.0f;
+                        if (result & LLViewerTextureAnim::TRANSLATE)
+                        {
+                            // The current LSL texture animation system is
+                            // based on Blinn-Phong texture transforms, which
+                            // is incompatible with the GLTF texture
+                            // transforms. As a compromise, apply Blinn-Phong
+                            // texture rotation on top of the GLTF texture
+                            // transforms during a translation animation. This
+                            // ensures that the animation loops for trivial
+                            // GLTF texture transforms, when it would for
+                            // similar Blinn-Phong animations. This is not
+                            // guaranteed to loop for nontrivial GLTF texture
+                            // transforms.
+                            te->getRotation(&rot);
+                        }
+                        else
+                        {
+                            rot = 0.0f;
+                        }
                     }
                     if (!(result & LLViewerTextureAnim::TRANSLATE))
                     {
@@ -679,29 +697,20 @@ void LLVOVolume::animateTextures()
                         scale_t = 1.0f;
                     }
 
-                    // For PBR materials, use Blinn-Phong rotation as hint for
-                    // translation direction. In a Blinn-Phong material, the
-                    // translation direction would be a byproduct the texture
-                    // transform.
-                    F32 rot_frame;
-                    te->getRotation(&rot_frame);
-
                     tex_mat.translate(LLVector3(-0.5f, -0.5f, 0.f));
 
                     LLQuaternion quat;
                     quat.setQuat(rot, 0, 0, -1.f);
-                    tex_mat.rotate(quat);				
+                    tex_mat.rotate(quat);
 
                     LLMatrix4 mat;
-                    LLVector3 scale(scale_s, scale_t, 1.f);			
+                    LLVector3 scale(scale_s, scale_t, 1.f);
                     mat.initAll(scale, LLQuaternion(), LLVector3());
                     tex_mat *= mat;
-            
-                    LLVector3 off(off_s, off_t, 0.f);
-                    off.rotVec(rot_frame, 0, 0, 1.f);
-                    tex_mat.translate(off);
 
-                    tex_mat.translate(LLVector3(0.5f, 0.5f, 0.f));
+                    LLVector3 trans;
+                    trans.set(LLVector3(off_s+0.5f, off_t+0.5f, 0.f));
+                    tex_mat.translate(trans);
                 }
 			}
 		}
-- 
cgit v1.2.3


From 7297f0270473c1c42dcd44741eb38b4d1e8c6ac6 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 6 Oct 2023 11:08:44 -0700
Subject: SL-20396: On second thought, just apply the whole Blinn-Phong
 transform stack to PBR, but only during texture animations

---
 indra/newview/llvovolume.cpp | 107 ++++++++++---------------------------------
 1 file changed, 25 insertions(+), 82 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index f1d4d9039b..ec2f490742 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -619,8 +619,18 @@ void LLVOVolume::animateTextures()
 					continue;
 				}
 		
-                LLGLTFMaterial *gltf_mat = te->getGLTFRenderMaterial();
-                const bool is_pbr = gltf_mat != nullptr;
+				if (!(result & LLViewerTextureAnim::ROTATE))
+				{
+					te->getRotation(&rot);
+				}
+				if (!(result & LLViewerTextureAnim::TRANSLATE))
+				{
+					te->getOffset(&off_s,&off_t);
+				}			
+				if (!(result & LLViewerTextureAnim::SCALE))
+				{
+					te->getScale(&scale_s, &scale_t);
+				}
 
 				if (!facep->mTextureMatrix)
 				{
@@ -629,89 +639,22 @@ void LLVOVolume::animateTextures()
 
 				LLMatrix4& tex_mat = *facep->mTextureMatrix;
 				tex_mat.setIdentity();
+				LLVector3 trans ;
 
-                if (!is_pbr)
-                {
-                    if (!(result & LLViewerTextureAnim::ROTATE))
-                    {
-                        te->getRotation(&rot);
-                    }
-                    if (!(result & LLViewerTextureAnim::TRANSLATE))
-                    {
-                        te->getOffset(&off_s,&off_t);
-                    }
-                    if (!(result & LLViewerTextureAnim::SCALE))
-                    {
-                        te->getScale(&scale_s, &scale_t);
-                    }
-
-                    LLVector3 trans ;
-
-                        trans.set(LLVector3(off_s+0.5f, off_t+0.5f, 0.f));			
-                        tex_mat.translate(LLVector3(-0.5f, -0.5f, 0.f));
-
-                    LLVector3 scale(scale_s, scale_t, 1.f);			
-                    LLQuaternion quat;
-                    quat.setQuat(rot, 0, 0, -1.f);
-            
-                    tex_mat.rotate(quat);				
-
-                    LLMatrix4 mat;
-                    mat.initAll(scale, LLQuaternion(), LLVector3());
-                    tex_mat *= mat;
-            
-                    tex_mat.translate(trans);
-                }
-                else
-                {
-                    if (!(result & LLViewerTextureAnim::ROTATE))
-                    {
-                        if (result & LLViewerTextureAnim::TRANSLATE)
-                        {
-                            // The current LSL texture animation system is
-                            // based on Blinn-Phong texture transforms, which
-                            // is incompatible with the GLTF texture
-                            // transforms. As a compromise, apply Blinn-Phong
-                            // texture rotation on top of the GLTF texture
-                            // transforms during a translation animation. This
-                            // ensures that the animation loops for trivial
-                            // GLTF texture transforms, when it would for
-                            // similar Blinn-Phong animations. This is not
-                            // guaranteed to loop for nontrivial GLTF texture
-                            // transforms.
-                            te->getRotation(&rot);
-                        }
-                        else
-                        {
-                            rot = 0.0f;
-                        }
-                    }
-                    if (!(result & LLViewerTextureAnim::TRANSLATE))
-                    {
-                        off_s = 0.0f;
-                        off_t = 0.0f;
-                    }
-                    if (!(result & LLViewerTextureAnim::SCALE))
-                    {
-                        scale_s = 1.0f;
-                        scale_t = 1.0f;
-                    }
-
-                    tex_mat.translate(LLVector3(-0.5f, -0.5f, 0.f));
+					trans.set(LLVector3(off_s+0.5f, off_t+0.5f, 0.f));			
+					tex_mat.translate(LLVector3(-0.5f, -0.5f, 0.f));
 
-                    LLQuaternion quat;
-                    quat.setQuat(rot, 0, 0, -1.f);
-                    tex_mat.rotate(quat);
-
-                    LLMatrix4 mat;
-                    LLVector3 scale(scale_s, scale_t, 1.f);
-                    mat.initAll(scale, LLQuaternion(), LLVector3());
-                    tex_mat *= mat;
+				LLVector3 scale(scale_s, scale_t, 1.f);			
+				LLQuaternion quat;
+				quat.setQuat(rot, 0, 0, -1.f);
+		
+				tex_mat.rotate(quat);				
 
-                    LLVector3 trans;
-                    trans.set(LLVector3(off_s+0.5f, off_t+0.5f, 0.f));
-                    tex_mat.translate(trans);
-                }
+				LLMatrix4 mat;
+				mat.initAll(scale, LLQuaternion(), LLVector3());
+				tex_mat *= mat;
+		
+				tex_mat.translate(trans);
 			}
 		}
 		else
-- 
cgit v1.2.3


From c6f469a2b48bea9074f3e5def581a4330e5c9428 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 6 Oct 2023 22:50:04 +0200
Subject: SL-20420 Emoji - Increase nearby chat history buffer size

---
 indra/newview/lllogchat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index ba82ff0b0f..07825c1b0c 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -59,7 +59,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/local_time_adjustor.hpp>
 
-const S32 LOG_RECALL_SIZE = 2048;
+const S32 LOG_RECALL_SIZE = 20480;
 
 const std::string LL_IM_TIME("time");
 const std::string LL_IM_DATE_TIME("datetime");
-- 
cgit v1.2.3


From 18f3ecfc04f937f2034afafff8d037b8b25d303d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 2 Oct 2023 21:44:31 +0300
Subject: SL-20383 Fix scroll locking view

---
 indra/llui/llfolderview.h          |  1 +
 indra/newview/llinventorypanel.cpp | 86 +++++++++++++++++++++-----------------
 indra/newview/llinventorypanel.h   |  2 +
 3 files changed, 50 insertions(+), 39 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 6de366044c..5f8a173889 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -217,6 +217,7 @@ public:
 	virtual void draw();
 	virtual void deleteAllChildren();
 
+    void stopAutoScollining() {mNeedsScroll = false;}
 	void scrollToShowSelection();
 	void scrollToShowItem(LLFolderViewItem* item, const LLRect& constraint_rect);
 	void setScrollContainer( LLScrollContainer* parent ) { mScrollContainer = parent; }
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 355d222b27..154d8e2e18 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1449,45 +1449,6 @@ void LLInventoryPanel::onFocusReceived()
 	// inventory now handles cut/copy/paste/delete
 	LLEditMenuHandler::gEditMenuHandler = mFolderRoot.get();
 
-    // Tab support, when tabbing into this view, select first item
-    // (ideally needs to account for scroll)
-    bool select_first = mSelectThisID.isNull() && mFolderRoot.get() && mFolderRoot.get()->getSelectedCount() == 0;
-
-    if (select_first)
-    {
-        LLFolderViewFolder::folders_t::const_iterator folders_it = mFolderRoot.get()->getFoldersBegin();
-        LLFolderViewFolder::folders_t::const_iterator folders_end = mFolderRoot.get()->getFoldersEnd();
-
-        for (; folders_it != folders_end; ++folders_it)
-        {
-            const LLFolderViewFolder* folder_view = *folders_it;
-            if (folder_view->getVisible())
-            {
-                const LLFolderViewModelItemInventory* modelp = static_cast<const LLFolderViewModelItemInventory*>(folder_view->getViewModelItem());
-                setSelectionByID(modelp->getUUID(), TRUE);
-                select_first = false;
-                break;
-            }
-        }
-    }
-
-    if (select_first)
-    {
-        LLFolderViewFolder::items_t::const_iterator items_it = mFolderRoot.get()->getItemsBegin();
-        LLFolderViewFolder::items_t::const_iterator items_end = mFolderRoot.get()->getItemsEnd();
-
-        for (; items_it != items_end; ++items_it)
-        {
-            const LLFolderViewItem* item_view = *items_it;
-            if (item_view->getVisible())
-            {
-                const LLFolderViewModelItemInventory* modelp = static_cast<const LLFolderViewModelItemInventory*>(item_view->getViewModelItem());
-                setSelectionByID(modelp->getUUID(), TRUE);
-                break;
-            }
-        }
-    }
-
 	LLPanel::onFocusReceived();
 }
 
@@ -2258,6 +2219,53 @@ void LLInventorySingleFolderPanel::initFromParams(const Params& p)
     LLPanel::initFromParams(mParams);
 }
 
+void LLInventorySingleFolderPanel::onFocusReceived()
+{
+    // Tab support, when tabbing into this view, select first item
+    // (ideally needs to account for scroll)
+    bool select_first = mSelectThisID.isNull() && mFolderRoot.get() && mFolderRoot.get()->getSelectedCount() == 0;
+
+    if (select_first)
+    {
+        LLFolderViewFolder::folders_t::const_iterator folders_it = mFolderRoot.get()->getFoldersBegin();
+        LLFolderViewFolder::folders_t::const_iterator folders_end = mFolderRoot.get()->getFoldersEnd();
+
+        for (; folders_it != folders_end; ++folders_it)
+        {
+            const LLFolderViewFolder* folder_view = *folders_it;
+            if (folder_view->getVisible())
+            {
+                const LLFolderViewModelItemInventory* modelp = static_cast<const LLFolderViewModelItemInventory*>(folder_view->getViewModelItem());
+                setSelectionByID(modelp->getUUID(), TRUE);
+                // quick and dirty fix: don't scroll on switching focus
+                // todo: better 'tab' support, one that would work for LLInventoryPanel
+                mFolderRoot.get()->stopAutoScollining();
+                select_first = false;
+                break;
+            }
+        }
+    }
+
+    if (select_first)
+    {
+        LLFolderViewFolder::items_t::const_iterator items_it = mFolderRoot.get()->getItemsBegin();
+        LLFolderViewFolder::items_t::const_iterator items_end = mFolderRoot.get()->getItemsEnd();
+
+        for (; items_it != items_end; ++items_it)
+        {
+            const LLFolderViewItem* item_view = *items_it;
+            if (item_view->getVisible())
+            {
+                const LLFolderViewModelItemInventory* modelp = static_cast<const LLFolderViewModelItemInventory*>(item_view->getViewModelItem());
+                setSelectionByID(modelp->getUUID(), TRUE);
+                mFolderRoot.get()->stopAutoScollining();
+                break;
+            }
+        }
+    }
+    LLInventoryPanel::onFocusReceived();
+}
+
 void LLInventorySingleFolderPanel::initFolderRoot(const LLUUID& start_folder_id)
 {
     if(mRootInited) return;
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 4d69bdf17d..b68433bab0 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -404,6 +404,8 @@ public:
     {};
 
     void initFromParams(const Params& p);
+    void onFocusReceived() override;
+
     bool isSelectionRemovable() { return false; }
 
     void initFolderRoot(const LLUUID& start_folder_id = LLUUID::null);
-- 
cgit v1.2.3


From eab9396579842ae0202bfa3318ffc527e7ee6d1a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 7 Oct 2023 00:06:34 +0300
Subject: SL-20386 Fix default material recognition in picker's inventory

---
 indra/newview/llselectmgr.cpp   |  8 +++++++
 indra/newview/lltexturectrl.cpp | 52 +++++++++++++++++++++++++++++++++++------
 2 files changed, 53 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 98ee6a6859..c86e43333c 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1780,6 +1780,10 @@ bool LLObjectSelection::applyRestrictedPbrMaterialToTEs(LLViewerInventoryItem* i
     }
 
     LLUUID asset_id = item->getAssetUUID();
+    if (asset_id.isNull())
+    {
+        asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+    }
 
     bool material_copied_all_faces = true;
 
@@ -1976,6 +1980,10 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
                     return false;
                 }
                 asset_id = mItem->getAssetUUID();
+                if (asset_id.isNull())
+                {
+                    asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+                }
             }
 
             // Blank out most override data on the object and send to server
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 8a8abc222f..4e5dcf5fca 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -213,15 +213,38 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selecti
 				mModeSelector->selectByValue(0);
 				onModeSelect(0,this);
 			}
-			
-			LLUUID item_id = findItemID(mImageAssetID, FALSE);
+
+            LLUUID item_id;
+            LLFolderView* root_folder = mInventoryPanel->getRootFolder();
+            if (root_folder && root_folder->getCurSelectedItem())
+            {
+                LLFolderViewItem* last_selected = root_folder->getCurSelectedItem();
+                LLFolderViewModelItemInventory* inv_view = static_cast<LLFolderViewModelItemInventory*>(last_selected->getViewModelItem());
+
+                LLInventoryItem* itemp = gInventory.getItem(inv_view->getUUID());
+
+                if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL
+                    && mImageAssetID == LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID
+                    && itemp && itemp->getAssetUUID().isNull())
+                {
+                    item_id = inv_view->getUUID();
+                }
+                else if (itemp && itemp->getAssetUUID() == mImageAssetID)
+                {
+                    item_id = inv_view->getUUID();
+                }
+            }
+            if (item_id.isNull())
+            {
+                item_id = findItemID(mImageAssetID, FALSE);
+            }
 			if (item_id.isNull())
 			{
 				mInventoryPanel->getRootFolder()->clearSelection();
 			}
 			else
 			{
-				LLInventoryItem* itemp = gInventory.getItem(image_id);
+				LLInventoryItem* itemp = gInventory.getItem(item_id);
 				if (itemp && !itemp->getPermissions().allowCopyBy(gAgent.getID()))
 				{
 					// no copy texture
@@ -741,14 +764,22 @@ void LLFloaterTexturePicker::draw()
 
 const LLUUID& LLFloaterTexturePicker::findItemID(const LLUUID& asset_id, BOOL copyable_only, BOOL ignore_library)
 {
-	if (asset_id.isNull())
+    LLUUID loockup_id = asset_id;
+	if (loockup_id.isNull())
 	{
-		return LLUUID::null;
+        if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+        {
+            loockup_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+        }
+        else
+        {
+            return LLUUID::null;
+        }
 	}
 
 	LLViewerInventoryCategory::cat_array_t cats;
 	LLViewerInventoryItem::item_array_t items;
-	LLAssetIDMatches asset_id_matches(asset_id);
+	LLAssetIDMatches asset_id_matches(loockup_id);
 	gInventory.collectDescendentsIf(LLUUID::null,
 							cats,
 							items,
@@ -816,7 +847,14 @@ void LLFloaterTexturePicker::commitCallback(LLTextureCtrl::ETexturePickOp op)
                     LLFolderViewModelItemInventory* inv_view = static_cast<LLFolderViewModelItemInventory*>(last_selected->getViewModelItem());
 
                     LLInventoryItem* itemp = gInventory.getItem(inv_view->getUUID());
-                    if (itemp && itemp->getAssetUUID() == mImageAssetID)
+
+                    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL
+                        && mImageAssetID == LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID
+                        && itemp && itemp->getAssetUUID().isNull())
+                    {
+                        inventory_id = inv_view->getUUID();
+                    }
+                    else if (itemp && itemp->getAssetUUID() == mImageAssetID)
                     {
                         inventory_id = inv_view->getUUID();
                     }
-- 
cgit v1.2.3


From d22ea319a51707bdcc0a8cb946143208d8c3f553 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Mon, 9 Oct 2023 16:05:58 -0700
Subject: SL-20225: LLGLTFMaterial code sync

---
 indra/llprimitive/CMakeLists.txt             |   1 +
 indra/llprimitive/llgltfmaterial.cpp         | 161 +++++----------------------
 indra/llprimitive/llgltfmaterial.h           |  38 +++++--
 indra/llprimitive/llgltfmaterial_templates.h | 142 +++++++++++++++++++++++
 4 files changed, 197 insertions(+), 145 deletions(-)
 create mode 100644 indra/llprimitive/llgltfmaterial_templates.h

(limited to 'indra')

diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 76d261ab3e..2bd1edaacc 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -34,6 +34,7 @@ set(llprimitive_HEADER_FILES
     lldaeloader.h
     llgltfloader.h
     llgltfmaterial.h
+    llgltfmaterial_templates.h
     legacy_object_types.h
     llmaterial.h
     llmaterialid.h
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index 19b7413934..f42c11ee21 100644
--- a/indra/llprimitive/llgltfmaterial.cpp
+++ b/indra/llprimitive/llgltfmaterial.cpp
@@ -24,25 +24,28 @@
  * $/LicenseInfo$
  */
 
+
 #include "linden_common.h"
 
 #include "llgltfmaterial.h"
+
 #include "llsdserialize.h"
 
 // NOTE -- this should be the one and only place tiny_gltf.h is included
 #include "tinygltf/tiny_gltf.h"
+#include "llgltfmaterial_templates.h"
 
 const char* const LLGLTFMaterial::ASSET_VERSION = "1.1";
 const char* const LLGLTFMaterial::ASSET_TYPE = "GLTF 2.0";
 const std::array<std::string, 2> LLGLTFMaterial::ACCEPTED_ASSET_VERSIONS = { "1.0", "1.1" };
 
-const char* const GLTF_FILE_EXTENSION_TRANSFORM = "KHR_texture_transform";
-const char* const GLTF_FILE_EXTENSION_TRANSFORM_SCALE = "scale";
-const char* const GLTF_FILE_EXTENSION_TRANSFORM_OFFSET = "offset";
-const char* const GLTF_FILE_EXTENSION_TRANSFORM_ROTATION = "rotation";
+const char* const LLGLTFMaterial::GLTF_FILE_EXTENSION_TRANSFORM = "KHR_texture_transform";
+const char* const LLGLTFMaterial::GLTF_FILE_EXTENSION_TRANSFORM_SCALE = "scale";
+const char* const LLGLTFMaterial::GLTF_FILE_EXTENSION_TRANSFORM_OFFSET = "offset";
+const char* const LLGLTFMaterial::GLTF_FILE_EXTENSION_TRANSFORM_ROTATION = "rotation";
 
 // special UUID that indicates a null UUID in override data
-static const LLUUID GLTF_OVERRIDE_NULL_UUID = LLUUID("ffffffff-ffff-ffff-ffff-ffffffffffff");
+const LLUUID LLGLTFMaterial::GLTF_OVERRIDE_NULL_UUID = LLUUID("ffffffff-ffff-ffff-ffff-ffffffffffff");
 
 void LLGLTFMaterial::TextureTransform::getPacked(F32 (&packed)[8]) const
 {
@@ -68,14 +71,14 @@ LLGLTFMaterial::LLGLTFMaterial(const LLGLTFMaterial& rhs)
 
 LLGLTFMaterial& LLGLTFMaterial::operator=(const LLGLTFMaterial& rhs)
 {
-    //have to do a manual operator= because of LLRefCount 
+    //have to do a manual operator= because of LLRefCount
     mTextureId = rhs.mTextureId;
 
     mTextureTransform = rhs.mTextureTransform;
 
     mBaseColor = rhs.mBaseColor;
     mEmissiveColor = rhs.mEmissiveColor;
-    
+
     mMetallicFactor = rhs.mMetallicFactor;
     mRoughnessFactor = rhs.mRoughnessFactor;
     mAlphaCutoff = rhs.mAlphaCutoff;
@@ -97,7 +100,7 @@ bool LLGLTFMaterial::operator==(const LLGLTFMaterial& rhs) const
 
         mBaseColor == rhs.mBaseColor &&
         mEmissiveColor == rhs.mEmissiveColor &&
-        
+
         mMetallicFactor == rhs.mMetallicFactor &&
         mRoughnessFactor == rhs.mRoughnessFactor &&
         mAlphaCutoff == rhs.mAlphaCutoff &&
@@ -122,6 +125,7 @@ bool LLGLTFMaterial::fromJSON(const std::string& json, std::string& warn_msg, st
 
         return true;
     }
+
     return false;
 }
 
@@ -190,7 +194,8 @@ void LLGLTFMaterial::setFromModel(const tinygltf::Model& model, S32 mat_index)
     }
 }
 
-LLVector2 vec2_from_json(const tinygltf::Value::Object& object, const char* key, const LLVector2& default_value)
+// static
+LLVector2 LLGLTFMaterial::vec2FromJson(const tinygltf::Value::Object& object, const char* key, const LLVector2& default_value)
 {
     const auto it = object.find(key);
     if (it == object.end())
@@ -215,7 +220,8 @@ LLVector2 vec2_from_json(const tinygltf::Value::Object& object, const char* key,
     return value;
 }
 
-F32 float_from_json(const tinygltf::Value::Object& object, const char* key, const F32 default_value)
+// static
+F32 LLGLTFMaterial::floatFromJson(const tinygltf::Value::Object& object, const char* key, const F32 default_value)
 {
     const auto it = object.find(key);
     if (it == object.end())
@@ -230,52 +236,6 @@ F32 float_from_json(const tinygltf::Value::Object& object, const char* key, cons
     return (F32)real_json.GetNumberAsDouble();
 }
 
-template<typename T>
-std::string gltf_get_texture_image(const tinygltf::Model& model, const T& texture_info)
-{
-    const S32 texture_idx = texture_info.index;
-    if (texture_idx < 0 || texture_idx >= model.textures.size())
-    {
-        return "";
-    }
-    const tinygltf::Texture& texture = model.textures[texture_idx];
-
-    // Ignore texture.sampler for now
-
-    const S32 image_idx = texture.source;
-    if (image_idx < 0 || image_idx >= model.images.size())
-    {
-        return "";
-    }
-    const tinygltf::Image& image = model.images[image_idx];
-
-    return image.uri;
-}
-
-// *NOTE: Use template here as workaround for the different similar texture info classes
-template<typename T>
-void LLGLTFMaterial::setFromTexture(const tinygltf::Model& model, const T& texture_info, TextureInfo texture_info_id)
-{
-    LL_PROFILE_ZONE_SCOPED;
-    const std::string uri = gltf_get_texture_image(model, texture_info);
-    mTextureId[texture_info_id].set(uri);
-
-    const tinygltf::Value::Object& extensions_object = texture_info.extensions;
-    const auto transform_it = extensions_object.find(GLTF_FILE_EXTENSION_TRANSFORM);
-    if (transform_it != extensions_object.end())
-    {
-        const tinygltf::Value& transform_json = std::get<1>(*transform_it);
-        if (transform_json.IsObject())
-        {
-            const tinygltf::Value::Object& transform_object = transform_json.Get<tinygltf::Value::Object>();
-            TextureTransform& transform = mTextureTransform[texture_info_id];
-            transform.mOffset = vec2_from_json(transform_object, GLTF_FILE_EXTENSION_TRANSFORM_OFFSET, getDefaultTextureOffset());
-            transform.mScale = vec2_from_json(transform_object, GLTF_FILE_EXTENSION_TRANSFORM_SCALE, getDefaultTextureScale());
-            transform.mRotation = float_from_json(transform_object, GLTF_FILE_EXTENSION_TRANSFORM_ROTATION, getDefaultTextureRotation());
-        }
-    }
-}
-
 void LLGLTFMaterial::writeToModel(tinygltf::Model& model, S32 mat_index) const
 {
     LL_PROFILE_ZONE_SCOPED;
@@ -302,7 +262,7 @@ void LLGLTFMaterial::writeToModel(tinygltf::Model& model, S32 mat_index) const
 
     material_out.alphaMode = getAlphaMode();
     material_out.alphaCutoff = mAlphaCutoff;
-    
+
     mBaseColor.write(material_out.pbrMetallicRoughness.baseColorFactor);
 
     if (mEmissiveColor != LLGLTFMaterial::getDefaultEmissiveColor())
@@ -320,7 +280,7 @@ void LLGLTFMaterial::writeToModel(tinygltf::Model& model, S32 mat_index) const
     tinygltf::Value::Object extras;
     bool write_extras = false;
     if (mOverrideAlphaMode && mAlphaMode == getDefaultAlphaMode())
-    { 
+    {
         extras["override_alpha_mode"] = tinygltf::Value(mOverrideAlphaMode);
         write_extras = true;
     }
@@ -339,57 +299,6 @@ void LLGLTFMaterial::writeToModel(tinygltf::Model& model, S32 mat_index) const
     model.asset.version = "2.0";
 }
 
-template<typename T>
-void gltf_allocate_texture_image(tinygltf::Model& model, T& texture_info, const std::string& uri)
-{
-    const S32 image_idx = model.images.size();
-    model.images.emplace_back();
-    model.images[image_idx].uri = uri;
-
-    // The texture, not to be confused with the texture info
-    const S32 texture_idx = model.textures.size();
-    model.textures.emplace_back();
-    tinygltf::Texture& texture = model.textures[texture_idx];
-    texture.source = image_idx;
-
-    texture_info.index = texture_idx;
-}
-
-template<typename T>
-void LLGLTFMaterial::writeToTexture(tinygltf::Model& model, T& texture_info, TextureInfo texture_info_id, bool force_write) const
-{
-    LL_PROFILE_ZONE_SCOPED;
-    const LLUUID& texture_id = mTextureId[texture_info_id];
-    const TextureTransform& transform = mTextureTransform[texture_info_id];
-    const bool is_blank_transform = transform == sDefault.mTextureTransform[0];
-    // Check if this material matches all the fallback values, and if so, then
-    // skip including it to reduce material size
-    if (!force_write && texture_id.isNull() && is_blank_transform)
-    {
-        return;
-    }
-
-    // tinygltf will discard this texture info if there is no valid texture,
-    // causing potential loss of information for overrides, so ensure one is
-    // defined. -Cosmic,2023-01-30
-    gltf_allocate_texture_image(model, texture_info, texture_id.asString());
-
-    if (!is_blank_transform)
-    {
-        tinygltf::Value::Object transform_map;
-        transform_map[GLTF_FILE_EXTENSION_TRANSFORM_OFFSET] = tinygltf::Value(tinygltf::Value::Array({
-            tinygltf::Value(transform.mOffset.mV[VX]),
-            tinygltf::Value(transform.mOffset.mV[VY])
-        }));
-        transform_map[GLTF_FILE_EXTENSION_TRANSFORM_SCALE] = tinygltf::Value(tinygltf::Value::Array({
-            tinygltf::Value(transform.mScale.mV[VX]),
-            tinygltf::Value(transform.mScale.mV[VY])
-        }));
-        transform_map[GLTF_FILE_EXTENSION_TRANSFORM_ROTATION] = tinygltf::Value(transform.mRotation);
-        texture_info.extensions[GLTF_FILE_EXTENSION_TRANSFORM] = tinygltf::Value(transform_map);
-    }
-}
-
 void LLGLTFMaterial::sanitizeAssetMaterial()
 {
     mTextureTransform = sDefault.mTextureTransform;
@@ -403,19 +312,19 @@ bool LLGLTFMaterial::setBaseMaterial()
     return *this != old_override;
 }
 
-bool LLGLTFMaterial::isClearedForBaseMaterial()
-{
-    LLGLTFMaterial cleared_override = sDefault;
-    cleared_override.setBaseMaterial(*this);
-    return *this == cleared_override;
-}
-
 // For material overrides only. Copies transforms from the old override.
 void LLGLTFMaterial::setBaseMaterial(const LLGLTFMaterial& old_override_mat)
 {
     mTextureTransform = old_override_mat.mTextureTransform;
 }
 
+bool LLGLTFMaterial::isClearedForBaseMaterial() const
+{
+    LLGLTFMaterial cleared_override = sDefault;
+    cleared_override.setBaseMaterial(*this);
+    return *this == cleared_override;
+}
+
 
 // static
 void LLGLTFMaterial::hackOverrideUUID(LLUUID& id)
@@ -516,7 +425,7 @@ void LLGLTFMaterial::setAlphaMode(const std::string& mode, bool for_override)
     {
         m = ALPHA_MODE_BLEND;
     }
-    
+
     setAlphaMode(m, for_override);
 }
 
@@ -709,7 +618,6 @@ void LLGLTFMaterial::getOverrideLLSD(const LLGLTFMaterial& override_mat, LLSD& d
         {
             data["tex"][i] = LLSD::UUID(override_texture_id);
         }
-
     }
 
     if (override_mat.mBaseColor != getDefaultBaseColor())
@@ -764,23 +672,6 @@ void LLGLTFMaterial::getOverrideLLSD(const LLGLTFMaterial& override_mat, LLSD& d
             data["ti"][i]["r"] = override_mat.mTextureTransform[i].mRotation;
         }
     }
-
-#if 0
-    {
-        std::ostringstream ostr;
-        LLSDSerialize::serialize(data, ostr, LLSDSerialize::LLSD_NOTATION);
-        std::string param_str(ostr.str());
-        LL_INFOS() << param_str << LL_ENDL;
-        LL_INFOS() << "Notation size: " << param_str.size() << LL_ENDL;
-    }
-
-    {
-        std::ostringstream ostr;
-        LLSDSerialize::serialize(data, ostr, LLSDSerialize::LLSD_BINARY);
-        std::string param_str(ostr.str());
-        LL_INFOS() << "Binary size: " << param_str.size() << LL_ENDL;
-    }
-#endif
 }
 
 
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index ca27507707..a078a530a4 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -35,10 +35,13 @@
 #include "hbxxh.h"
 
 #include <string>
+#include <map>
 
 namespace tinygltf
 {
     class Model;
+    struct TextureInfo;
+    class Value;
 }
 
 class LLTextureEntry;
@@ -52,6 +55,9 @@ public:
 
     static const char* const ASSET_VERSION;
     static const char* const ASSET_TYPE;
+    // Max allowed size of a GLTF material asset or override, when serialized
+    // as a minified JSON string
+    static constexpr size_t MAX_ASSET_LENGTH = 2048;
     static const std::array<std::string, 2> ACCEPTED_ASSET_VERSIONS;
     static bool isAcceptedVersion(const std::string& version) { return std::find(ACCEPTED_ASSET_VERSIONS.cbegin(), ACCEPTED_ASSET_VERSIONS.cend(), version) != ACCEPTED_ASSET_VERSIONS.cend(); }
 
@@ -64,6 +70,7 @@ public:
         void getPacked(F32 (&packed)[8]) const;
 
         bool operator==(const TextureTransform& other) const;
+        bool operator!=(const TextureTransform& other) const { return !(*this == other); }
     };
 
     enum AlphaMode
@@ -96,8 +103,13 @@ public:
         GLTF_TEXTURE_INFO_COUNT
     };
 
-    std::array<LLUUID, GLTF_TEXTURE_INFO_COUNT> mTextureId;
+    static const char* const GLTF_FILE_EXTENSION_TRANSFORM;
+    static const char* const GLTF_FILE_EXTENSION_TRANSFORM_SCALE;
+    static const char* const GLTF_FILE_EXTENSION_TRANSFORM_OFFSET;
+    static const char* const GLTF_FILE_EXTENSION_TRANSFORM_ROTATION;
+    static const LLUUID GLTF_OVERRIDE_NULL_UUID;
 
+    std::array<LLUUID, GLTF_TEXTURE_INFO_COUNT> mTextureId;
     std::array<TextureTransform, GLTF_TEXTURE_INFO_COUNT> mTextureTransform;
 
     // NOTE: initialize values to defaults according to the GLTF spec
@@ -137,7 +149,7 @@ public:
     void setAlphaMode(S32 mode, bool for_override = false);
     void setDoubleSided(bool double_sided, bool for_override = false);
 
-    //NOTE: texture offsets only exist in overrides, so "for_override" is not needed
+    // *NOTE: texture offsets only exist in overrides, so "for_override" is not needed
 
     void setTextureOffset(TextureInfo texture_info, const LLVector2& offset);
     void setTextureScale(TextureInfo texture_info, const LLVector2& scale);
@@ -155,7 +167,6 @@ public:
     static LLVector2 getDefaultTextureScale();
     static F32 getDefaultTextureRotation();
 
-
     static void hackOverrideUUID(LLUUID& id);
     static void applyOverrideUUID(LLUUID& dst_id, const LLUUID& override_id);
 
@@ -164,7 +175,7 @@ public:
     void setAlphaMode(const std::string& mode, bool for_override = false);
 
     const char* getAlphaMode() const;
-    
+
     // set the contents of this LLGLTFMaterial from the given json
     // returns true if successful
     // if unsuccessful, the contents of this LLGLTFMaterial should be left unchanged and false is returned
@@ -176,7 +187,6 @@ public:
     // get the contents of this LLGLTFMaterial as a json string
     std::string asJSON(bool prettyprint = false) const;
 
-
     // initialize from given tinygltf::Model
     // model - the model to reference
     // mat_index - index of material in model's material array
@@ -202,21 +212,29 @@ public:
     // For material overrides only. Clears most properties to
     // default/fallthrough, but preserves the transforms.
     bool setBaseMaterial();
+    void setBaseMaterial(const LLGLTFMaterial& old_override_mat);
     // True if setBaseMaterial() was just called
-    bool isClearedForBaseMaterial();
+    bool isClearedForBaseMaterial() const;
 
     // For local materials, they have to keep track of where
     // they are assigned to for full updates
     virtual void addTextureEntry(LLTextureEntry* te) {};
     virtual void removeTextureEntry(LLTextureEntry* te) {};
 
-private:
+protected:
+    static LLVector2 vec2FromJson(const std::map<std::string, tinygltf::Value>& object, const char* key, const LLVector2& default_value);
+    static F32 floatFromJson(const std::map<std::string, tinygltf::Value>& object, const char* key, const F32 default_value);
+
+    template<typename T>
+    static void allocateTextureImage(tinygltf::Model& model, T& texture_info, const std::string& uri);
+
     template<typename T>
     void setFromTexture(const tinygltf::Model& model, const T& texture_info, TextureInfo texture_info_id);
+    template<typename T>
+    static void setFromTexture(const tinygltf::Model& model, const T& texture_info, LLUUID& texture_id, TextureTransform& transform);
 
     template<typename T>
     void writeToTexture(tinygltf::Model& model, T& texture_info, TextureInfo texture_info_id, bool force_write = false) const;
-
-    void setBaseMaterial(const LLGLTFMaterial& old_override_mat);
+    template<typename T>
+    static void writeToTexture(tinygltf::Model& model, T& texture_info, const LLUUID& texture_id, const TextureTransform& transform, bool force_write = false);
 };
-
diff --git a/indra/llprimitive/llgltfmaterial_templates.h b/indra/llprimitive/llgltfmaterial_templates.h
new file mode 100644
index 0000000000..f607dfe967
--- /dev/null
+++ b/indra/llprimitive/llgltfmaterial_templates.h
@@ -0,0 +1,142 @@
+/**
+ * @file llgltfmaterial_templates.h
+ * @brief Material template definition
+ *
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2023, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#pragma once
+
+#include "llgltfmaterial.h"
+
+// Use templates here as workaround for the different similar texture info classes in tinygltf
+// Includer must first include tiny_gltf.h with the desired flags
+
+template<typename T>
+std::string gltf_get_texture_image(const tinygltf::Model& model, const T& texture_info)
+{
+    const S32 texture_idx = texture_info.index;
+    if (texture_idx < 0 || texture_idx >= model.textures.size())
+    {
+        return "";
+    }
+    const tinygltf::Texture& texture = model.textures[texture_idx];
+
+    // Ignore texture.sampler for now
+
+    const S32 image_idx = texture.source;
+    if (image_idx < 0 || image_idx >= model.images.size())
+    {
+        return "";
+    }
+    const tinygltf::Image& image = model.images[image_idx];
+
+    return image.uri;
+}
+
+template<typename T>
+void LLGLTFMaterial::setFromTexture(const tinygltf::Model& model, const T& texture_info, TextureInfo texture_info_id)
+{
+    setFromTexture(model, texture_info, mTextureId[texture_info_id], mTextureTransform[texture_info_id]);
+    const std::string uri = gltf_get_texture_image(model, texture_info);
+}
+
+// static
+template<typename T>
+void LLGLTFMaterial::setFromTexture(const tinygltf::Model& model, const T& texture_info, LLUUID& texture_id, TextureTransform& transform)
+{
+    LL_PROFILE_ZONE_SCOPED;
+    const std::string uri = gltf_get_texture_image(model, texture_info);
+    texture_id.set(uri);
+
+    const tinygltf::Value::Object& extensions_object = texture_info.extensions;
+    const auto transform_it = extensions_object.find(GLTF_FILE_EXTENSION_TRANSFORM);
+    if (transform_it != extensions_object.end())
+    {
+        const tinygltf::Value& transform_json = std::get<1>(*transform_it);
+        if (transform_json.IsObject())
+        {
+            const tinygltf::Value::Object& transform_object = transform_json.Get<tinygltf::Value::Object>();
+            transform.mOffset = vec2FromJson(transform_object, GLTF_FILE_EXTENSION_TRANSFORM_OFFSET, getDefaultTextureOffset());
+            transform.mScale = vec2FromJson(transform_object, GLTF_FILE_EXTENSION_TRANSFORM_SCALE, getDefaultTextureScale());
+            transform.mRotation = floatFromJson(transform_object, GLTF_FILE_EXTENSION_TRANSFORM_ROTATION, getDefaultTextureRotation());
+        }
+    }
+}
+
+// static
+template<typename T>
+void LLGLTFMaterial::allocateTextureImage(tinygltf::Model& model, T& texture_info, const std::string& uri)
+{
+    const S32 image_idx = model.images.size();
+    model.images.emplace_back();
+    model.images[image_idx].uri = uri;
+
+    // The texture, not to be confused with the texture info
+    const S32 texture_idx = model.textures.size();
+    model.textures.emplace_back();
+    tinygltf::Texture& texture = model.textures[texture_idx];
+    texture.source = image_idx;
+
+    texture_info.index = texture_idx;
+}
+
+// static
+template<typename T>
+void LLGLTFMaterial::writeToTexture(tinygltf::Model& model, T& texture_info, TextureInfo texture_info_id, bool force_write) const
+{
+    writeToTexture(model, texture_info, mTextureId[texture_info_id], mTextureTransform[texture_info_id], force_write);
+}
+
+// static
+template<typename T>
+void LLGLTFMaterial::writeToTexture(tinygltf::Model& model, T& texture_info, const LLUUID& texture_id, const TextureTransform& transform, bool force_write)
+{
+    LL_PROFILE_ZONE_SCOPED;
+    const bool is_blank_transform = transform == sDefault.mTextureTransform[0];
+    // Check if this material matches all the fallback values, and if so, then
+    // skip including it to reduce material size
+    if (!force_write && texture_id.isNull() && is_blank_transform)
+    {
+        return;
+    }
+
+    // tinygltf will discard this texture info if there is no valid texture,
+    // causing potential loss of information for overrides, so ensure one is
+    // defined. -Cosmic,2023-01-30
+    allocateTextureImage(model, texture_info, texture_id.asString());
+
+    if (!is_blank_transform)
+    {
+        tinygltf::Value::Object transform_map;
+        transform_map[GLTF_FILE_EXTENSION_TRANSFORM_OFFSET] = tinygltf::Value(tinygltf::Value::Array({
+            tinygltf::Value(transform.mOffset.mV[VX]),
+            tinygltf::Value(transform.mOffset.mV[VY])
+        }));
+        transform_map[GLTF_FILE_EXTENSION_TRANSFORM_SCALE] = tinygltf::Value(tinygltf::Value::Array({
+            tinygltf::Value(transform.mScale.mV[VX]),
+            tinygltf::Value(transform.mScale.mV[VY])
+        }));
+        transform_map[GLTF_FILE_EXTENSION_TRANSFORM_ROTATION] = tinygltf::Value(transform.mRotation);
+        texture_info.extensions[GLTF_FILE_EXTENSION_TRANSFORM] = tinygltf::Value(transform_map);
+    }
+}
-- 
cgit v1.2.3


From fa368f8bcdbf991064cf3350f29c733fec7d21c8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 9 Oct 2023 22:25:52 +0300
Subject: SL-20372 Picker should remember choice of texture source

---
 indra/newview/lltexturectrl.cpp | 171 +++++++++++++++++++++-------------------
 indra/newview/lltexturectrl.h   |   4 +
 2 files changed, 96 insertions(+), 79 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 4e5dcf5fca..10667b02d9 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -138,6 +138,8 @@ bool get_can_copy_texture(LLUUID asset_id)
     return get_is_predefined_texture(asset_id) || get_copy_free_item_by_asset_id(asset_id).notNull();
 }
 
+S32 LLFloaterTexturePicker::sLastPickerMode = 0;
+
 LLFloaterTexturePicker::LLFloaterTexturePicker(	
 	LLView* owner,
 	LLUUID image_asset_id,
@@ -515,6 +517,15 @@ BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask)
 	return LLFloater::handleKeyHere(key, mask);
 }
 
+void LLFloaterTexturePicker::onOpen(const LLSD& key)
+{
+    if (sLastPickerMode != 0
+        && mModeSelector->selectByValue(sLastPickerMode))
+    {
+        changeMode();
+    }
+}
+
 void LLFloaterTexturePicker::onClose(bool app_quitting)
 {
 	if (mOwner && mOnFloaterCloseCallback)
@@ -522,6 +533,7 @@ void LLFloaterTexturePicker::onClose(bool app_quitting)
 		mOnFloaterCloseCallback();
 	}
 	stopUsingPipette();
+    sLastPickerMode = mModeSelector->getValue().asInteger();
 }
 
 // virtual
@@ -1032,85 +1044,8 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem
 // static
 void LLFloaterTexturePicker::onModeSelect(LLUICtrl* ctrl, void *userdata)
 {
-	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-    int index = self->mModeSelector->getValue().asInteger();
-
-	self->mDefaultBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
-	self->mBlankBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
-	self->mNoneBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
-	self->getChild<LLFilterEditor>("inventory search editor")->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
-	self->getChild<LLInventoryPanel>("inventory panel")->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
-
-	/*self->getChild<LLCheckBox>("show_folders_check")->setVisible(mode);
-	  no idea under which conditions the above is even shown, needs testing. */
-
-	self->getChild<LLButton>("l_add_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
-	self->getChild<LLButton>("l_rem_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
-	self->getChild<LLButton>("l_upl_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
-	self->getChild<LLScrollListCtrl>("l_name_list")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
-
-	self->getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(index == PICKER_BAKE ? TRUE : FALSE);
-	self->getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(FALSE);// index == 2 ? TRUE : FALSE);
-
-    bool pipette_visible = (index == PICKER_INVENTORY)
-        && (self->mInventoryPickType != LLTextureCtrl::PICK_MATERIAL);
-	self->mPipetteBtn->setVisible(pipette_visible);
-
-	if (index == PICKER_BAKE)
-	{
-		self->stopUsingPipette();
-
-		S8 val = -1;
-
-		LLUUID imageID = self->mImageAssetID;
-		if (imageID == IMG_USE_BAKED_HEAD)
-		{
-			val = 0;
-		}
-		else if (imageID == IMG_USE_BAKED_UPPER)
-		{
-			val = 1;
-		}
-		else if (imageID == IMG_USE_BAKED_LOWER)
-		{
-			val = 2;
-		}
-		else if (imageID == IMG_USE_BAKED_EYES)
-		{
-			val = 3;
-		}
-		else if (imageID == IMG_USE_BAKED_SKIRT)
-		{
-			val = 4;
-		}
-		else if (imageID == IMG_USE_BAKED_HAIR)
-		{
-			val = 5;
-		}
-		else if (imageID == IMG_USE_BAKED_LEFTARM)
-		{
-			val = 6;
-		}
-		else if (imageID == IMG_USE_BAKED_LEFTLEG)
-		{
-			val = 7;
-		}
-		else if (imageID == IMG_USE_BAKED_AUX1)
-		{
-			val = 8;
-		}
-		else if (imageID == IMG_USE_BAKED_AUX2)
-		{
-			val = 9;
-		}
-		else if (imageID == IMG_USE_BAKED_AUX3)
-		{
-			val = 10;
-		}
-
-
-		self->getChild<LLComboBox>("l_bake_use_texture_combo_box")->setSelectedByValue(val, TRUE);
-	}
+    LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
+    self->changeMode();
 }
 
 // static
@@ -1386,6 +1321,84 @@ void LLFloaterTexturePicker::onFilterEdit(const std::string& search_string )
 	mInventoryPanel->setFilterSubString(search_string);
 }
 
+void LLFloaterTexturePicker::changeMode()
+{
+    int index = mModeSelector->getValue().asInteger();
+
+    mDefaultBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+    mBlankBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+    mNoneBtn->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+    mFilterEdit->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+    mInventoryPanel->setVisible(index == PICKER_INVENTORY ? TRUE : FALSE);
+
+    getChild<LLButton>("l_add_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
+    getChild<LLButton>("l_rem_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
+    getChild<LLButton>("l_upl_btn")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
+    getChild<LLScrollListCtrl>("l_name_list")->setVisible(index == PICKER_LOCAL ? TRUE : FALSE);
+
+    getChild<LLComboBox>("l_bake_use_texture_combo_box")->setVisible(index == PICKER_BAKE ? TRUE : FALSE);
+    getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(FALSE);// index == 2 ? TRUE : FALSE);
+
+    bool pipette_visible = (index == PICKER_INVENTORY)
+        && (mInventoryPickType != LLTextureCtrl::PICK_MATERIAL);
+    mPipetteBtn->setVisible(pipette_visible);
+
+    if (index == PICKER_BAKE)
+    {
+        stopUsingPipette();
+
+        S8 val = -1;
+
+        LLUUID imageID = mImageAssetID;
+        if (imageID == IMG_USE_BAKED_HEAD)
+        {
+            val = 0;
+        }
+        else if (imageID == IMG_USE_BAKED_UPPER)
+        {
+            val = 1;
+        }
+        else if (imageID == IMG_USE_BAKED_LOWER)
+        {
+            val = 2;
+        }
+        else if (imageID == IMG_USE_BAKED_EYES)
+        {
+            val = 3;
+        }
+        else if (imageID == IMG_USE_BAKED_SKIRT)
+        {
+            val = 4;
+        }
+        else if (imageID == IMG_USE_BAKED_HAIR)
+        {
+            val = 5;
+        }
+        else if (imageID == IMG_USE_BAKED_LEFTARM)
+        {
+            val = 6;
+        }
+        else if (imageID == IMG_USE_BAKED_LEFTLEG)
+        {
+            val = 7;
+        }
+        else if (imageID == IMG_USE_BAKED_AUX1)
+        {
+            val = 8;
+        }
+        else if (imageID == IMG_USE_BAKED_AUX2)
+        {
+            val = 9;
+        }
+        else if (imageID == IMG_USE_BAKED_AUX3)
+        {
+            val = 10;
+        }
+
+        getChild<LLComboBox>("l_bake_use_texture_combo_box")->setSelectedByValue(val, TRUE);
+    }
+}
+
 void LLFloaterTexturePicker::refreshLocalList()
 {
     mLocalScrollCtrl->clearRows();
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index b742ea2da3..180c4fa4b8 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -306,6 +306,7 @@ public:
 
 	// LLFloater overrides
 	/*virtual*/ BOOL    postBuild();
+    /*virtual*/ void	onOpen(const LLSD& key);
 	/*virtual*/ void	onClose(bool app_settings);
 
 	// New functions
@@ -365,6 +366,7 @@ public:
     static void		onPickerCallback(const std::vector<std::string>& filenames, LLHandle<LLFloater> handle);
 
 protected:
+    void changeMode();
     void refreshLocalList();
     void refreshInventoryFilter();
     void setImageIDFromItem(const LLInventoryItem* itemp, bool set_selection = true);
@@ -427,6 +429,8 @@ private:
 	set_on_update_image_stats_callback mOnUpdateImageStatsCallback;
 
 	BOOL mBakeTextureEnabled;
+
+    static S32 sLastPickerMode;
 };
 
 #endif  // LL_LLTEXTURECTRL_H
-- 
cgit v1.2.3


From 7b2dfc4e826775017218100ee17b2afe2151da4c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 5 Oct 2023 01:14:30 +0300
Subject: SL-19311 Grey textures after teleport

There is no asset capability during teleport and it can take some time
to arrive, texture shouldn't just fail to fetch if capability arrives
after content.
---
 indra/newview/lltexturefetch.cpp | 95 +++++++++++++++++++++++++++++++++-------
 1 file changed, 79 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index fd46d54a1d..e669393dba 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -239,6 +239,10 @@ static const S32 HTTP_NONPIPE_REQUESTS_LOW_WATER = 20;
 // request (e.g. 'Range: <start>-') which seems to fix the problem.
 static const S32 HTTP_REQUESTS_RANGE_END_MAX = 20000000;
 
+// stop after 720 seconds, might be overkill, but cap request can keep going forever.
+static const S32 MAX_CAP_MISSING_RETRIES = 720;
+static const S32 CAP_MISSING_EXPIRATION_DELAY = 1; // seconds
+
 //////////////////////////////////////////////////////////////////////////////
 namespace
 {
@@ -526,6 +530,7 @@ private:
 
 	e_state mState;
 	void setState(e_state new_state);
+    LLViewerRegion* getRegion();
 
 	e_write_to_cache_state mWriteToCacheState;
 	LLTextureFetch* mFetcher;
@@ -579,6 +584,10 @@ private:
 	LLCore::HttpStatus mGetStatus;
 	std::string mGetReason;
 	LLAdaptiveRetryPolicy mFetchRetryPolicy;
+    bool mCanUseCapability;
+    LLTimer mRegionRetryTimer;
+    S32 mRegionRetryAttempt;
+    LLUUID mLastRegionId;
 
 	
 	// Work Data
@@ -928,7 +937,9 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
 	  mCacheReadCount(0U),
 	  mCacheWriteCount(0U),
 	  mResourceWaitCount(0U),
-	  mFetchRetryPolicy(10.f,3600.f,2.f,10)
+      mFetchRetryPolicy(10.f,3600.f,2.f,10),
+      mCanUseCapability(true),
+      mRegionRetryAttempt(0)
 {
 	mType = host.isOk() ? LLImageBase::TYPE_AVATAR_BAKE : LLImageBase::TYPE_NORMAL;
 // 	LL_INFOS(LOG_TXT) << "Create: " << mID << " mHost:" << host << " Discard=" << discard << LL_ENDL;
@@ -1089,6 +1100,18 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			return true; // abort
 		}
 	}
+    if (mState > CACHE_POST && !mCanUseCapability && mCanUseHTTP)
+    {
+        if (mRegionRetryAttempt > MAX_CAP_MISSING_RETRIES)
+        {
+            mCanUseHTTP = false;
+        }
+        else if (!mRegionRetryTimer.hasExpired())
+        {
+            return false;
+        }
+        // else retry
+    }
 	if(mState > CACHE_POST && !mCanUseHTTP)
 	{
         LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - state > cache_post");
@@ -1290,16 +1313,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 // 		if (mHost.isInvalid()) get_url = false;
 		if ( use_http && mCanUseHTTP && mUrl.empty())//get http url.
 		{
-			LLViewerRegion* region = NULL;
-            if (mHost.isInvalid())
-            {
-                region = gAgent.getRegion();
-            }
-            else if (LLWorld::instanceExists())
-            {
-                region = LLWorld::getInstance()->getRegion(mHost);
-            }
-
+			LLViewerRegion* region = getRegion();
 			if (region)
 			{
 				std::string http_url = region->getViewerAssetUrl();
@@ -1312,19 +1326,27 @@ bool LLTextureFetchWorker::doWork(S32 param)
 					setUrl(http_url + "/?texture_id=" + mID.asString().c_str());
 					LL_DEBUGS(LOG_TXT) << "Texture URL: " << mUrl << LL_ENDL;
 					mWriteToCacheState = CAN_WRITE ; //because this texture has a fixed texture id.
+                    mCanUseCapability = true;
+                    mRegionRetryAttempt = 0;
+                    mLastRegionId = region->getRegionID();
 				}
 				else
 				{
-					mCanUseHTTP = false ;
-					LL_WARNS(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
+					mCanUseCapability = false;
+                    mRegionRetryAttempt++;
+                    mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
+                    // ex: waiting for caps
+					LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
 				}
 			}
 			else
 			{
+                mCanUseCapability = false;
+                mRegionRetryAttempt++;
+                mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
 				// This will happen if not logged in or if a region deoes not have HTTP Texture enabled
 				//LL_WARNS(LOG_TXT) << "Region not found for host: " << mHost << LL_ENDL;
-                LL_WARNS(LOG_TXT) << "Texture not available via HTTP: no region " << mUrl << LL_ENDL;
-				mCanUseHTTP = false;
+                LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: no region " << mUrl << LL_ENDL;
 			}
 		}
 		else if (mFTType == FTT_SERVER_BAKE)
@@ -1332,7 +1354,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			mWriteToCacheState = CAN_WRITE;
 		}
 
-		if (mCanUseHTTP && !mUrl.empty())
+		if (mCanUseCapability && mCanUseHTTP && !mUrl.empty())
 		{
 			setState(WAIT_HTTP_RESOURCE);
 			if(mWriteToCacheState != NOT_WRITE)
@@ -1534,10 +1556,37 @@ bool LLTextureFetchWorker::doWork(S32 param)
 						}
 						return true; 
 					}
+
+                    if (mCanUseHTTP && !mUrl.empty() && cur_size <= 0)
+                    {
+                        LLViewerRegion* region = getRegion();
+                        if (!region || mLastRegionId != region->getRegionID())
+                        {
+                            // cap failure? try on new region.
+                            mUrl.clear();
+                            ++mRetryAttempt;
+                            mLastRegionId.setNull();
+                            setState(INIT);
+                            return false;
+                        }
+                    }
 				}
 				else if (http_service_unavail == mGetStatus)
 				{
 					LL_INFOS_ONCE(LOG_TXT) << "Texture server busy (503): " << mUrl << LL_ENDL;
+                    if (mCanUseHTTP && !mUrl.empty() && cur_size <= 0)
+                    {
+                        LLViewerRegion* region = getRegion();
+                        if (!region || mLastRegionId != region->getRegionID())
+                        {
+                            // try on new region.
+                            mUrl.clear();
+                            ++mRetryAttempt;
+                            mLastRegionId.setNull();
+                            setState(INIT);
+                            return false;
+                        }
+                    }
 				}
 				else if (http_not_sat == mGetStatus)
 				{
@@ -3054,6 +3103,20 @@ void LLTextureFetchWorker::setState(e_state new_state)
 	mState = new_state;
 }
 
+LLViewerRegion* LLTextureFetchWorker::getRegion()
+{
+    LLViewerRegion* region = NULL;
+    if (mHost.isInvalid())
+    {
+        region = gAgent.getRegion();
+    }
+    else if (LLWorld::instanceExists())
+    {
+        region = LLWorld::getInstance()->getRegion(mHost);
+    }
+    return region;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 // Threads:  T*
-- 
cgit v1.2.3


From 61a04f5ee1582d2d53874b8ef81a0e773df0fbfe Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 10 Oct 2023 23:18:41 +0200
Subject: SL-20288 Lags in Appearance floater (code format in LLAccordionCtrl)

---
 indra/llui/llaccordionctrl.cpp    | 330 ++++++++++++++++-----------------
 indra/llui/llaccordionctrl.h      |   2 +-
 indra/llui/llaccordionctrltab.cpp | 371 ++++++++++++++++++++------------------
 indra/llui/llaccordionctrltab.h   |   2 +-
 indra/llui/llflatlistview.cpp     |  52 +++---
 5 files changed, 387 insertions(+), 370 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index 809d72208f..0a82bed896 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -60,7 +60,7 @@ LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params)
 	initNoTabsWidget(params.no_matched_tabs_text);
 
 	mSingleExpansion = params.single_expansion;
-	if(mFitParent && !mSingleExpansion)
+	if (mFitParent && !mSingleExpansion)
 	{
 		LL_INFOS() << "fit_parent works best when combined with single_expansion" << LL_ENDL;
 	}
@@ -102,14 +102,13 @@ void LLAccordionCtrl::draw()
 	LLPanel::draw();
 }
 
-
 //---------------------------------------------------------------------------------
 BOOL LLAccordionCtrl::postBuild()
 {
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
 
 	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
+	scroll_rect.setOriginAndSize(
 		getRect().getWidth() - scrollbar_size,
 		1,
 		scrollbar_size,
@@ -126,39 +125,42 @@ BOOL LLAccordionCtrl::postBuild()
 	sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
 	sbparams.change_callback(boost::bind(&LLAccordionCtrl::onScrollPosChangeCallback, this, _1, _2));
 	
-	mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
-	LLView::addChild( mScrollbar );
-	mScrollbar->setVisible( false );
+	mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
+	LLView::addChild(mScrollbar);
+	mScrollbar->setVisible(FALSE);
 	mScrollbar->setFollowsRight();
 	mScrollbar->setFollowsTop();
 	mScrollbar->setFollowsBottom();
 
 	//if it was created from xml...
 	std::vector<LLUICtrl*> accordion_tabs;
-	for(child_list_const_iter_t it = getChildList()->begin(); 
+	for (child_list_const_iter_t it = getChildList()->begin(); 
 		getChildList()->end() != it; ++it)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(*it);
-		if(accordion_tab == NULL)
+		if (accordion_tab == NULL)
 			continue;
-		if(std::find(mAccordionTabs.begin(),mAccordionTabs.end(),accordion_tab) == mAccordionTabs.end())
+		if (std::find(mAccordionTabs.begin(), mAccordionTabs.end(), accordion_tab) == mAccordionTabs.end())
 		{
 			accordion_tabs.push_back(accordion_tab);
 		}
 	}
 
-	for(std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();it!=accordion_tabs.rend();++it)
+	for (std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();
+		it < accordion_tabs.rend(); ++it)
+	{
 		addCollapsibleCtrl(*it);
+	}
 
-	arrange	();
+	arrange();
 
-	if(mSingleExpansion)
+	if (mSingleExpansion)
 	{
-		if(!mAccordionTabs[0]->getDisplayChildren())
+		if (!mAccordionTabs[0]->getDisplayChildren())
 			mAccordionTabs[0]->setDisplayChildren(true);
-		for(size_t i=1;i<mAccordionTabs.size();++i)
+		for (size_t i = 1; i < mAccordionTabs.size(); ++i)
 		{
-			if(mAccordionTabs[i]->getDisplayChildren())
+			if (mAccordionTabs[i]->getDisplayChildren())
 				mAccordionTabs[i]->setDisplayChildren(false);
 		}
 	}
@@ -205,23 +207,22 @@ BOOL LLAccordionCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::shiftAccordionTabs(S16 panel_num, S32 delta)
 {
-	for(size_t i = panel_num; i < mAccordionTabs.size(); i++ )
+	for (size_t i = panel_num; i < mAccordionTabs.size(); ++i)
 	{
 		ctrlShiftVertical(mAccordionTabs[i],delta);
 	}	
 }
 
-
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num) 
 {
-	if(mSingleExpansion)
+	if (mSingleExpansion)
 	{
-		for(size_t i=0;i<mAccordionTabs.size();++i)
+		for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 		{
-			if(i==panel_num)
+			if (i == panel_num)
 				continue;
-			if(mAccordionTabs[i]->getDisplayChildren())
+			if (mAccordionTabs[i]->getDisplayChildren())
 				mAccordionTabs[i]->setDisplayChildren(false);
 		}
 
@@ -232,64 +233,63 @@ void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num)
 void LLAccordionCtrl::show_hide_scrollbar(S32 width, S32 height)
 {
 	calcRecuiredHeight();
-	if(getRecuiredHeight() > height )
-		showScrollbar(width,height);
+	if (getRecuiredHeight() > height)
+		showScrollbar(width, height);
 	else
-		hideScrollbar(width,height);
+		hideScrollbar(width, height);
 }
 
-void	LLAccordionCtrl::showScrollbar(S32 width, S32 height)
+void LLAccordionCtrl::showScrollbar(S32 width, S32 height)
 {
 	bool was_visible = mScrollbar->getVisible();
 
-	mScrollbar->setVisible(true);
+	mScrollbar->setVisible(TRUE);
 	
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	ctrlSetLeftTopAndSize(mScrollbar
-		,width-scrollbar_size - PARENT_BORDER_MARGIN/2
-		,height-PARENT_BORDER_MARGIN
-		,scrollbar_size
-		,height-2*PARENT_BORDER_MARGIN);
+		, width - scrollbar_size - PARENT_BORDER_MARGIN / 2
+		, height - PARENT_BORDER_MARGIN
+		, scrollbar_size
+		, height - PARENT_BORDER_MARGIN * 2);
 	
 	mScrollbar->setPageSize(height);
-	mScrollbar->setDocParams(mInnerRect.getHeight(),mScrollbar->getDocPos());
+	mScrollbar->setDocParams(mInnerRect.getHeight(), mScrollbar->getDocPos());
 
-	if(was_visible)
+	if (was_visible)
 	{
 		S32 scroll_pos = llmin(mScrollbar->getDocPos(), getRecuiredHeight() - height - 1);
 		mScrollbar->setDocPos(scroll_pos);
 	}
 }
 
-void	LLAccordionCtrl::hideScrollbar( S32 width, S32 height )
+void LLAccordionCtrl::hideScrollbar(S32 width, S32 height)
 {
-	if(mScrollbar->getVisible() == false)
+	if (mScrollbar->getVisible() == FALSE)
 		return;
-	mScrollbar->setVisible(false);
+	mScrollbar->setVisible(FALSE);
 
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	S32 panel_width = width - 2*BORDER_MARGIN;
 
-	//reshape all accordeons and shift all draggers
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	// Reshape all accordions and shift all draggers
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLRect panel_rect = mAccordionTabs[i]->getRect();
-		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_rect.mTop,panel_width,panel_rect.getHeight());
+		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_rect.mTop, panel_width, panel_rect.getHeight());
 	}
 
 	mScrollbar->setDocPos(0);
 
-	if(mAccordionTabs.size()>0)
+	if (!mAccordionTabs.empty())
 	{
-		S32 panel_top = height - BORDER_MARGIN;		  // Top coordinate of the first panel
+		S32 panel_top = height - BORDER_MARGIN; // Top coordinate of the first panel
 		S32 diff = panel_top - mAccordionTabs[0]->getRect().mTop;
-		shiftAccordionTabs(0,diff);
+		shiftAccordionTabs(0, diff);
 	}
 }
 
-
 //---------------------------------------------------------------------------------
 S32 LLAccordionCtrl::calcRecuiredHeight()
 {
@@ -305,7 +305,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
 		}
 	}
 
-	mInnerRect.setLeftTopAndSize(0,rec_height + BORDER_MARGIN*2,getRect().getWidth(),rec_height + BORDER_MARGIN);
+	mInnerRect.setLeftTopAndSize(0, rec_height + BORDER_MARGIN * 2, getRect().getWidth(), rec_height + BORDER_MARGIN);
 
 	return mInnerRect.getHeight();
 }
@@ -313,7 +313,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	LLRect panel_rect = panel->getRect();
 	panel_rect.setLeftTopAndSize( left, top, width, height);
@@ -321,9 +321,9 @@ void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S3
 	panel->setRect(panel_rect);
 }
 
-void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
+void LLAccordionCtrl::ctrlShiftVertical(LLView* panel, S32 delta)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	panel->translate(0,delta);
 }
@@ -333,9 +333,9 @@ void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
 void LLAccordionCtrl::addCollapsibleCtrl(LLView* view)
 {
 	LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(view);
-	if(!accordion_tab)
+	if (!accordion_tab)
 		return;
-	if(std::find(beginChild(), endChild(), accordion_tab) == endChild())
+	if (std::find(beginChild(), endChild(), accordion_tab) == endChild())
 		addChild(accordion_tab);
 	mAccordionTabs.push_back(accordion_tab);
 
@@ -369,7 +369,7 @@ void LLAccordionCtrl::removeCollapsibleCtrl(LLView* view)
 	}
 }
 
-void	LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
+void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
 {
 	LLTextBox::Params tp = tb_params;
 	tp.rect(getLocalRect());
@@ -377,39 +377,39 @@ void	LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
 	mNoVisibleTabsHelpText = LLUICtrlFactory::create<LLTextBox>(tp, this);
 }
 
-void	LLAccordionCtrl::updateNoTabsHelpTextVisibility()
+void LLAccordionCtrl::updateNoTabsHelpTextVisibility()
 {
 	bool visible_exists = false;
 	std::vector<LLAccordionCtrlTab*>::const_iterator it = mAccordionTabs.begin();
 	const std::vector<LLAccordionCtrlTab*>::const_iterator it_end = mAccordionTabs.end();
-	for (; it != it_end; ++it)
+	while (it < it_end)
 	{
-		if ((*it)->getVisible())
+		if ((*(it++))->getVisible())
 		{
 			visible_exists = true;
 			break;
 		}
 	}
 
-	mNoVisibleTabsHelpText->setVisible(!visible_exists);
+	mNoVisibleTabsHelpText->setVisible(visible_exists ? FALSE : TRUE);
 }
 
-void	LLAccordionCtrl::arrangeSinge()
+void LLAccordionCtrl::arrangeSingle()
 {
-	S32 panel_left = BORDER_MARGIN;	  // Margin from left side of Splitter
-	S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-	S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+	S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
+	S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+	S32 panel_width = getRect().getWidth() - 4;
 	S32 panel_height;
 
 	S32 collapsed_height = 0;
 
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			collapsed_height+=mAccordionTabs[i]->getRect().getHeight();
 		}
@@ -417,28 +417,28 @@ void	LLAccordionCtrl::arrangeSinge()
 
 	S32 expanded_height = getRect().getHeight() - BORDER_MARGIN - collapsed_height;
 	
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			panel_height = accordion_tab->getRect().getHeight();
 		}
 		else
 		{
-			if(mFitParent)
+			if (mFitParent)
 			{
 				panel_height = expanded_height;
 			}
 			else
 			{
-				if(accordion_tab->getAccordionView())
+				if (accordion_tab->getAccordionView())
 				{
 					panel_height = accordion_tab->getAccordionView()->getRect().getHeight() + 
-						accordion_tab->getHeaderHeight() + 2*BORDER_MARGIN;
+						accordion_tab->getHeaderHeight() + BORDER_MARGIN * 2;
 				}
 				else
 				{
@@ -451,67 +451,67 @@ void	LLAccordionCtrl::arrangeSinge()
 		panel_height = llmax(panel_height, accordion_tab->getHeaderHeight());
 
 		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
-		panel_top-=mAccordionTabs[i]->getRect().getHeight();
+		panel_top -= mAccordionTabs[i]->getRect().getHeight();
 	}
 
 	show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
-void	LLAccordionCtrl::arrangeMultiple()
+void LLAccordionCtrl::arrangeMultiple()
 {
-	S32 panel_left = BORDER_MARGIN;	  // Margin from left side of Splitter
-	S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-	S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+	S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
+	S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+	S32 panel_width = getRect().getWidth() - 4;
 
 	//Calculate params	
-	for(size_t i = 0; i < mAccordionTabs.size(); i++ )
+	for (size_t i = 0; i < mAccordionTabs.size(); i++ )
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
 		
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, accordion_tab->getRect().getHeight());
-			panel_top-=mAccordionTabs[i]->getRect().getHeight();
+			panel_top -= mAccordionTabs[i]->getRect().getHeight();
 		}
 		else
 		{
 			S32 panel_height = accordion_tab->getRect().getHeight();
 			
-			if(mFitParent)
+			if (mFitParent)
 			{
-				// all expanded tabs will have equal height
+				// All expanded tabs will have equal height
 				panel_height = calcExpandedTabHeight(i, panel_top);
 				ctrlSetLeftTopAndSize(accordion_tab, panel_left, panel_top, panel_width, panel_height);
 
-				// try to make accordion tab fit accordion view height.
+				// Try to make accordion tab fit accordion view height.
 				// Accordion View should implement getRequiredRect() and provide valid height
 				S32 optimal_height = accordion_tab->getAccordionView()->getRequiredRect().getHeight();
 				optimal_height += accordion_tab->getHeaderHeight() + 2 * BORDER_MARGIN;
-				if(optimal_height < panel_height)
+				if (optimal_height < panel_height)
 				{
 					panel_height = optimal_height;
 				}
 
 				// minimum tab height is equal to header height
-				if(mAccordionTabs[i]->getHeaderHeight() > panel_height)
+				if (mAccordionTabs[i]->getHeaderHeight() > panel_height)
 				{
 					panel_height = mAccordionTabs[i]->getHeaderHeight();
 				}
 			}
 			
 			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
-			panel_top-=panel_height;
+			panel_top -= panel_height;
 			
 		}
 	}	
 
-	show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+	show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 
-	updateLayout(getRect().getWidth(),getRect().getHeight());
+	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
 
@@ -519,70 +519,67 @@ void LLAccordionCtrl::arrange()
 {
 	updateNoTabsHelpTextVisibility();
 
-	if( mAccordionTabs.size() == 0)
+	if (mAccordionTabs.empty())
 	{
-		//We do not arrange if we do not have what should be arranged
+		// Nothing to arrange
 		return;
 	}
 
-
-	if(mAccordionTabs.size() == 1)
+	if (mAccordionTabs.size() == 1)
 	{
-		S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-		S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+		S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+		S32 panel_width = getRect().getWidth() - 4;
 		
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[0]);
 		
 		LLRect panel_rect = accordion_tab->getRect();
 		
-		S32 panel_height = getRect().getHeight() - 2*BORDER_MARGIN;
-
+		S32 panel_height = getRect().getHeight() - BORDER_MARGIN * 2;
 		if (accordion_tab->getFitParent())
 			panel_height = accordion_tab->getRect().getHeight();
-		ctrlSetLeftTopAndSize(accordion_tab,panel_rect.mLeft,panel_top,panel_width,panel_height);
+
+		ctrlSetLeftTopAndSize(accordion_tab, panel_rect.mLeft, panel_top, panel_width, panel_height);
 		
-		show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+		show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 		return;
-
 	}
 
-	if(mSingleExpansion)
-		arrangeSinge ();
+	if (mSingleExpansion)
+		arrangeSingle();
 	else
-		arrangeMultiple ();
+		arrangeMultiple();
 }
 
 //---------------------------------------------------------------------------------
 
-BOOL LLAccordionCtrl::handleScrollWheel		( S32 x, S32 y, S32 clicks )
+BOOL LLAccordionCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	if(LLPanel::handleScrollWheel(x,y,clicks))
+	if (LLPanel::handleScrollWheel(x, y, clicks))
 		return TRUE;
-	if( mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
+	if (mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
 		return TRUE;
-	return false;
-
+	return FALSE;
 }
 
-BOOL LLAccordionCtrl::handleKeyHere			(KEY key, MASK mask)
+BOOL LLAccordionCtrl::handleKeyHere(KEY key, MASK mask)
 {
-	if( mScrollbar->getVisible() && mScrollbar->handleKeyHere( key,mask ) )
+	if (mScrollbar->getVisible() && mScrollbar->handleKeyHere(key, mask))
 		return TRUE;
-	return LLPanel::handleKeyHere(key,mask);
+	return LLPanel::handleKeyHere(key, mask);
 }
 
-BOOL LLAccordionCtrl::handleDragAndDrop		(S32 x, S32 y, MASK mask,
-											 BOOL drop,
-											 EDragAndDropType cargo_type,
-											 void* cargo_data,
-											 EAcceptance* accept,
-											 std::string& tooltip_msg)
+BOOL LLAccordionCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
+										BOOL drop,
+										EDragAndDropType cargo_type,
+										void* cargo_data,
+										EAcceptance* accept,
+										std::string& tooltip_msg)
 {
 	// Scroll folder view if needed.  Never accepts a drag or drop.
 	*accept = ACCEPT_NO;
 	BOOL handled = autoScroll(x, y);
 
-	if( !handled )
+	if (!handled)
 	{
 		handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
 											cargo_data, accept, tooltip_msg) != NULL;
@@ -590,14 +587,14 @@ BOOL LLAccordionCtrl::handleDragAndDrop		(S32 x, S32 y, MASK mask,
 	return TRUE;
 }
 
-BOOL LLAccordionCtrl::autoScroll		(S32 x, S32 y)
+BOOL LLAccordionCtrl::autoScroll(S32 x, S32 y)
 {
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	bool scrolling = false;
-	if( mScrollbar->getVisible() )
+	if (mScrollbar->getVisible())
 	{
-		LLRect rect_local( 0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0 );
+		LLRect rect_local(0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0);
 		LLRect screen_local_extents;
 
 		// clip rect against root view
@@ -610,51 +607,52 @@ BOOL LLAccordionCtrl::autoScroll		(S32 x, S32 y)
 
 		LLRect bottom_scroll_rect = screen_local_extents;
 		bottom_scroll_rect.mTop = rect_local.mBottom + auto_scroll_region_height;
-		if( bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()) )
+		if (bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()))
 		{
-			mScrollbar->setDocPos( mScrollbar->getDocPos() + auto_scroll_speed );
+			mScrollbar->setDocPos(mScrollbar->getDocPos() + auto_scroll_speed);
 			mAutoScrolling = true;
 			scrolling = true;
 		}
 
 		LLRect top_scroll_rect = screen_local_extents;
 		top_scroll_rect.mBottom = rect_local.mTop - auto_scroll_region_height;
-		if( top_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() > 0) )
+		if (top_scroll_rect.pointInRect(x, y) && (mScrollbar->getDocPos() > 0))
 		{
-			mScrollbar->setDocPos( mScrollbar->getDocPos() - auto_scroll_speed );
+			mScrollbar->setDocPos(mScrollbar->getDocPos() - auto_scroll_speed);
 			mAutoScrolling = true;
 			scrolling = true;
 		}
 	}
-	return scrolling;
+
+	return scrolling ? TRUE : FALSE;
 }
 
-void	LLAccordionCtrl::updateLayout	(S32 width, S32 height)
+void LLAccordionCtrl::updateLayout(S32 width, S32 height)
 {
 	S32 panel_top = height - BORDER_MARGIN ;
-	if(mScrollbar->getVisible())
-		panel_top+=mScrollbar->getDocPos();
+	if (mScrollbar->getVisible())
+		panel_top += mScrollbar->getDocPos();
 
-	S32 panel_width = width - 2*BORDER_MARGIN;
+	S32 panel_width = width - BORDER_MARGIN * 2;
 
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	if(mScrollbar->getVisible())
-		panel_width-=scrollbar_size;
+	if (mScrollbar->getVisible())
+		panel_width -= scrollbar_size;
 
-	//set sizes for first panels and dragbars
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	// set sizes for first panels and dragbars
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
-		if(!mAccordionTabs[i]->getVisible())
+		if (!mAccordionTabs[i]->getVisible())
 			continue;
 		LLRect panel_rect = mAccordionTabs[i]->getRect();
-		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
-		panel_top-=panel_rect.getHeight();
+		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
+		panel_top -= panel_rect.getHeight();
 	}
 }
 
-void	LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
+void LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
 {
-	updateLayout(getRect().getWidth(),getRect().getHeight());
+	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
 // virtual
@@ -687,42 +685,43 @@ void LLAccordionCtrl::onUpdateScrollToChild(const LLUICtrl *cntrl)
     LLUICtrl::onUpdateScrollToChild(cntrl);
 }
 
-void	LLAccordionCtrl::onOpen		(const LLSD& key)
+void LLAccordionCtrl::onOpen(const LLSD& key)
 {
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		LLPanel* panel = dynamic_cast<LLPanel*>(accordion_tab->getAccordionView());
-		if(panel!=NULL)
+		if (panel != NULL)
 		{
 			panel->onOpen(key);
 		}
 	}
 }
+
 S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "size_changes")
+		if (str_action == "size_changes")
 		{
 			//
 			arrange();
 			return 1;
 		}
-		else if(str_action == "select_next")
+		if (str_action == "select_next")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
-				if(accordion_tab->hasFocus())
+				if (accordion_tab->hasFocus())
 				{
-					while(++i<mAccordionTabs.size())
+					while (++i < mAccordionTabs.size())
 					{
-						if(mAccordionTabs[i]->getVisible())
+						if (mAccordionTabs[i]->getVisible())
 							break;
 					}
-					if(i<mAccordionTabs.size())
+					if (i < mAccordionTabs.size())
 					{
 						accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 						accordion_tab->notify(LLSD().with("action","select_first"));
@@ -733,17 +732,17 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "select_prev")
+		if (str_action == "select_prev")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
-				if(accordion_tab->hasFocus() && i>0)
+				if (accordion_tab->hasFocus() && i > 0)
 				{
 					bool prev_visible_tab_found = false;
-					while(i>0)
+					while (i > 0)
 					{
-						if(mAccordionTabs[--i]->getVisible())
+						if (mAccordionTabs[--i]->getVisible())
 						{
 							prev_visible_tab_found = true;
 							break;
@@ -761,12 +760,12 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "select_current")
+		if (str_action == "select_current")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				// Set selection to the currently focused tab.
-				if(mAccordionTabs[i]->hasFocus())
+				if (mAccordionTabs[i]->hasFocus())
 				{
 					if (mAccordionTabs[i] != mSelectedTab)
 					{
@@ -783,7 +782,7 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "deselect_current")
+		if (str_action == "deselect_current")
 		{
 			// Reset selection to the currently selected tab.
 			if (mSelectedTab)
@@ -802,9 +801,9 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 		screenRectToLocal(screen_rc, &local_rc);
 
 		// Translate to parent coordinatess to check if we are in visible rectangle
-		local_rc.translate( getRect().mLeft, getRect().mBottom );
+		local_rc.translate(getRect().mLeft, getRect().mBottom);
 
-		if ( !getRect().contains (local_rc) )
+		if (!getRect().contains (local_rc))
 		{
 			// Back to local coords and calculate position for scroller
 			S32 bottom = mScrollbar->getDocPos() - local_rc.mBottom + getRect().mBottom;
@@ -814,7 +813,7 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 									 bottom, // min vertical scroll
 									 top); // max vertical scroll 
 
-			mScrollbar->setDocPos( scroll_pos );
+			mScrollbar->setDocPos(scroll_pos);
 		}
 		return 1;
 	}
@@ -834,15 +833,16 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 	}
 	return LLPanel::notifyParent(info);
 }
-void	LLAccordionCtrl::reset		()
+
+void LLAccordionCtrl::reset()
 {
-	if(mScrollbar)
+	if (mScrollbar)
 		mScrollbar->setDocPos(0);
 }
 
 void LLAccordionCtrl::expandDefaultTab()
 {
-	if (mAccordionTabs.size() > 0)
+	if (!mAccordionTabs.empty())
 	{
 		LLAccordionCtrlTab* tab = mAccordionTabs.front();
 
@@ -877,7 +877,7 @@ void LLAccordionCtrl::sort()
 	arrange();
 }
 
-void	LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
+void LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
 {
 	LLStringUtil::format_map_t args;
 	args["[SEARCH_TERM]"] = LLURI::escape(filter_string);
@@ -907,7 +907,7 @@ const LLAccordionCtrlTab* LLAccordionCtrl::getExpandedTab() const
 
 S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 available_height /* = 0 */)
 {
-	if(tab_index < 0)
+	if (tab_index < 0)
 	{
 		return available_height;
 	}
@@ -915,9 +915,9 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
 	S32 collapsed_tabs_height = 0;
 	S32 num_expanded = 0;
 
-	for(size_t n = tab_index; n < mAccordionTabs.size(); ++n)
+	for (size_t n = tab_index; n < mAccordionTabs.size(); ++n)
 	{
-		if(!mAccordionTabs[n]->isExpanded())
+		if (!mAccordionTabs[n]->isExpanded())
 		{
 			collapsed_tabs_height += mAccordionTabs[n]->getHeaderHeight();
 		}
@@ -927,7 +927,7 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
 		}
 	}
 
-	if(0 == num_expanded)
+	if (0 == num_expanded)
 	{
 		return available_height;
 	}
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 2828254472..6a1989afba 100644
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -144,7 +144,7 @@ private:
 	void	initNoTabsWidget(const LLTextBox::Params& tb_params);
 	void	updateNoTabsHelpTextVisibility();
 
-	void	arrangeSinge();
+	void	arrangeSingle();
 	void	arrangeMultiple();
 
 	// Calc Splitter's height that is necessary to display all child content
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 04485c6262..20da568746 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -69,13 +69,13 @@ public:
 	virtual BOOL postBuild();
 
 	std::string getTitle();
-	void	setTitle(const std::string& title, const std::string& hl);
+	void setTitle(const std::string& title, const std::string& hl);
 
-	void	setTitleFontStyle(std::string style);
+	void setTitleFontStyle(std::string style);
 
-	void	setTitleColor(LLUIColor);
+	void setTitleColor(LLUIColor);
 
-	void	setSelected(bool is_selected) { mIsSelected = is_selected; }
+	void setSelected(bool is_selected) { mIsSelected = is_selected; }
 
 	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
 	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
@@ -85,8 +85,8 @@ public:
 								   void* cargo_data,
 								   EAcceptance* accept,
 								   std::string& tooltip_msg);
-private:
 
+private:
 	LLTextBox* mHeaderTextbox;
 
 	// Overlay images (arrows)
@@ -102,7 +102,7 @@ private:
 	LLPointer<LLUIImage> mImageHeaderFocused;
 
 	// style saved when applying it in setTitleFontStyle
-	LLStyle::Params			mStyleParams;
+	LLStyle::Params mStyleParams;
 
 	LLUIColor mHeaderBGColor;
 
@@ -157,19 +157,17 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::postBuild()
 
 std::string LLAccordionCtrlTab::LLAccordionCtrlTabHeader::getTitle()
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		return mHeaderTextbox->getText();
 	}
-	else
-	{
-		return LLStringUtil::null;
-	}
+
+	return LLStringUtil::null;
 }
 
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitle(const std::string& title, const std::string& hl)
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		LLTextUtil::textboxSetHighlightedVal(
 			mHeaderTextbox,
@@ -192,7 +190,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleFontStyle(std::string
 
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleColor(LLUIColor color)
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		mHeaderTextbox->setColor(color);
 	}
@@ -204,11 +202,11 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 	S32 height = getRect().getHeight();
 
 	F32 alpha = getCurrentTransparency();
-	gl_rect_2d(0,0,width - 1 ,height - 1,mHeaderBGColor.get() % alpha,true);
+	gl_rect_2d(0, 0, width - 1, height - 1, mHeaderBGColor.get() % alpha, TRUE);
 
 	LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
-	bool collapsible = (parent && parent->getCollapsible());
-	bool expanded = (parent && parent->getDisplayChildren());
+	bool collapsible = parent && parent->getCollapsible();
+	bool expanded = parent && parent->getDisplayChildren();
 
 	// Handle overlay images, if needed
 	// Only show green "focus" background image if the accordion is open,
@@ -218,23 +216,22 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 		/*&& !(collapsible && !expanded)*/ // WHY??
 		)
 	{
-		mImageHeaderFocused->draw(0,0,width,height);
+		mImageHeaderFocused->draw(0, 0, width, height);
 	}
 	else
 	{
-		mImageHeader->draw(0,0,width,height);
+		mImageHeader->draw(0, 0, width, height);
 	}
 
-	if(mNeedsHighlight)
+	if (mNeedsHighlight)
 	{
-		mImageHeaderOver->draw(0,0,width,height);
+		mImageHeaderOver->draw(0, 0, width, height);
 	}
-	
 
-	if(collapsible)
+	if (collapsible)
 	{
 		LLPointer<LLUIImage> overlay_image;
-		if(expanded)
+		if (expanded)
 		{
 			overlay_image = mImageExpanded;
 		}
@@ -242,8 +239,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 		{
 			overlay_image = mImageCollapsed;
 		}
-		overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET,
-							(height - overlay_image->getHeight()) / 2);
+		overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET, (height - overlay_image->getHeight()) / 2);
 	}
 	
 	LLUICtrl::draw();
@@ -253,7 +249,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::reshape(S32 width, S32 height
 {
 	S32 header_height = mHeaderTextbox->getTextPixelHeight();
 
-	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET,(height+header_height)/2 ,width,(height-header_height)/2);
+	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET, (height + header_height) / 2, width, (height - header_height) / 2);
 	mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
 	mHeaderTextbox->setRect(textboxRect);
 
@@ -272,20 +268,24 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseEnter(S32 x, S32 y, MA
 	LLUICtrl::onMouseEnter(x, y, mask);
 	mNeedsHighlight = true;
 }
+
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	LLUICtrl::onMouseLeave(x, y, mask);
 	mNeedsHighlight = false;
 	mAutoOpenTimer.stop();
 }
+
 BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	if ( ( key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
+	if ((key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
 	{
 		return getParent()->handleKey(key, mask, called_from_parent);
 	}
+
 	return LLUICtrl::handleKey(key, mask, called_from_parent);
 }
+
 BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32 y, MASK mask,
 																	 BOOL drop,
 																	 EDragAndDropType cargo_type,
@@ -295,7 +295,7 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
 {
 	LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
 
-	if ( parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose() )
+	if (parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose())
 	{
 		if (mAutoOpenTimer.getStarted())
 		{
@@ -307,12 +307,15 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
 			}
 		}
 		else
+		{
 			mAutoOpenTimer.start();
+		}
 	}
 
 	return LLUICtrl::handleDragAndDrop(x, y, mask, drop, cargo_type,
 									   cargo_data, accept, tooltip_msg);
 }
+
 LLAccordionCtrlTab::Params::Params()
 	: title("title")
 	,display_children("expanded", true)
@@ -384,41 +387,39 @@ LLAccordionCtrlTab::~LLAccordionCtrlTab()
 {
 }
 
-
 void LLAccordionCtrlTab::setDisplayChildren(bool display)
 {
 	mDisplayChildren = display;
 	LLRect rect = getRect();
 
-	rect.mBottom = rect.mTop - (getDisplayChildren() ? 
-		mExpandedHeight : HEADER_HEIGHT);
+	rect.mBottom = rect.mTop - (getDisplayChildren() ? mExpandedHeight : HEADER_HEIGHT);
 	setRect(rect);
 
-	if(mContainerPanel)
+	if (mContainerPanel)
+	{
 		mContainerPanel->setVisible(getDisplayChildren());
+	}
 
-	if(mDisplayChildren)
+	if (mDisplayChildren)
 	{
 		adjustContainerPanel();
 	}
 	else
 	{
-		if(mScrollbar)
-			mScrollbar->setVisible(false);
+		if (mScrollbar)
+			mScrollbar->setVisible(FALSE);
 	}
-
 }
 
 void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
 {
 	LLRect headerRect;
 
-	headerRect.setLeftTopAndSize(
-		0,height,width,HEADER_HEIGHT);
+	headerRect.setLeftTopAndSize(0, height, width, HEADER_HEIGHT);
 	mHeader->setRect(headerRect);
 	mHeader->reshape(headerRect.getWidth(), headerRect.getHeight());
 
-	if(!mDisplayChildren)
+	if (!mDisplayChildren)
 		return;
 
 	LLRect childRect;
@@ -426,7 +427,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
 	childRect.setLeftTopAndSize(
 		getPaddingLeft(),
 		height - getHeaderHeight() - getPaddingTop(),
-		width - getPaddingLeft() - getPaddingRight(), 
+		width - getPaddingLeft() - getPaddingRight(),
 		height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
 
 	adjustContainerPanel(childRect);
@@ -434,7 +435,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
 
 void LLAccordionCtrlTab::changeOpenClose(bool is_open)
 {
-	if(is_open)
+	if (is_open)
 		mExpandedHeight = getRect().getHeight();
 
 	setDisplayChildren(!is_open);
@@ -483,14 +484,14 @@ void LLAccordionCtrlTab::onUpdateScrollToChild(const LLUICtrl *cntrl)
 
 BOOL LLAccordionCtrlTab::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	if(mCollapsible && mHeaderVisible && mCanOpenClose)
+	if (mCollapsible && mHeaderVisible && mCanOpenClose)
 	{
-		if(y >= (getRect().getHeight() - HEADER_HEIGHT) )
+		if (y >= (getRect().getHeight() - HEADER_HEIGHT))
 		{
 			mHeader->setFocus(true);
 			changeOpenClose(getDisplayChildren());
 
-			//reset stored state
+			// Reset stored state
 			mWasStateStored = false;
 			return TRUE;
 		}
@@ -510,7 +511,7 @@ boost::signals2::connection LLAccordionCtrlTab::setDropDownStateChangedCallback(
 
 bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 {
-	if(DD_HEADER_NAME != child->getName())
+	if (DD_HEADER_NAME != child->getName())
 	{
 		reshape(child->getRect().getWidth() , child->getRect().getHeight() + HEADER_HEIGHT );
 		mExpandedHeight = getRect().getHeight();
@@ -518,12 +519,12 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 
 	bool res = LLUICtrl::addChild(child, tab_group);
 
-	if(DD_HEADER_NAME != child->getName())
+	if (DD_HEADER_NAME != child->getName())
 	{
-		if(!mCollapsible)
+		if (!mCollapsible)
 			setDisplayChildren(true);
 		else
-			setDisplayChildren(getDisplayChildren());	
+			setDisplayChildren(getDisplayChildren());
 	}
 
 	if (!mContainerPanel)
@@ -534,7 +535,7 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 
 void LLAccordionCtrlTab::setAccordionView(LLView* panel)
 {
-	addChild(panel,0);
+	addChild(panel, 0);
 }
 
 std::string LLAccordionCtrlTab::getTitle() const
@@ -543,10 +544,8 @@ std::string LLAccordionCtrlTab::getTitle() const
 	{
 		return mHeader->getTitle();
 	}
-	else
-	{
-		return LLStringUtil::null;
-	}
+
+	return LLStringUtil::null;
 }
 
 void LLAccordionCtrlTab::setTitle(const std::string& title, const std::string& hl)
@@ -579,6 +578,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusReceivedCallback(const f
 	{
 		return mHeader->setFocusReceivedCallback(cb);
 	}
+
 	return boost::signals2::connection();
 }
 
@@ -588,6 +588,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusLostCallback(const focus
 	{
 		return mHeader->setFocusLostCallback(cb);
 	}
+
 	return boost::signals2::connection();
 }
 
@@ -601,59 +602,65 @@ void LLAccordionCtrlTab::setSelected(bool is_selected)
 
 LLView*	LLAccordionCtrlTab::findContainerView()
 {
-	for(child_list_const_iter_t it = getChildList()->begin(); 
-		getChildList()->end() != it; ++it)
+	child_list_const_iter_t it = getChildList()->begin(), it_end = getChildList()->end();
+	while (it != it_end)
 	{
-		LLView* child = *it;
-		if(DD_HEADER_NAME == child->getName())
-			continue;
-		if(!child->getVisible())
-			continue;
-		return child;
+		LLView* child = *(it++);
+		if (DD_HEADER_NAME != child->getName() && child->getVisible())
+			return child;
 	}
+
 	return NULL;
 }
 
 void LLAccordionCtrlTab::selectOnFocusReceived()
 {
 	if (getParent()) // A parent may not be set if tabs are added dynamically.
+	{
 		getParent()->notifyParent(LLSD().with("action", "select_current"));
+	}
 }
 
 void LLAccordionCtrlTab::deselectOnFocusLost()
 {
-	if(getParent()) // A parent may not be set if tabs are added dynamically.
+	if (getParent()) // A parent may not be set if tabs are added dynamically.
 	{
 		getParent()->notifyParent(LLSD().with("action", "deselect_current"));
 	}
-
 }
 
 S32 LLAccordionCtrlTab::getHeaderHeight()
 {
-	return mHeaderVisible?HEADER_HEIGHT:0; 
+	return mHeaderVisible ? HEADER_HEIGHT : 0;
 }
 
-void LLAccordionCtrlTab::setHeaderVisible(bool value) 
+void LLAccordionCtrlTab::setHeaderVisible(bool value)
 {
-	if(mHeaderVisible == value)
+	if (mHeaderVisible == value)
 		return;
+
 	mHeaderVisible = value;
-	if(mHeader)
-		mHeader->setVisible(value);
+
+	if (mHeader)
+	{
+		mHeader->setVisible(value ? TRUE : FALSE);
+	}
+
 	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
 };
 
 //virtual
 BOOL LLAccordionCtrlTab::postBuild()
 {
-	if(mHeader)
+	if (mHeader)
+	{
 		mHeader->setVisible(mHeaderVisible);
-	
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	}
+
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
 
 	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
+	scroll_rect.setOriginAndSize(
 		getRect().getWidth() - scrollbar_size,
 		1,
 		scrollbar_size,
@@ -661,7 +668,7 @@ BOOL LLAccordionCtrlTab::postBuild()
 
 	mContainerPanel = findContainerView();
 
-	if(!mFitPanel)
+	if (!mFitPanel)
 	{
 		LLScrollbar::Params sbparams;
 		sbparams.name("scrollable vertical");
@@ -674,9 +681,8 @@ BOOL LLAccordionCtrlTab::postBuild()
 		sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
 		sbparams.change_callback(boost::bind(&LLAccordionCtrlTab::onScrollPosChangeCallback, this, _1, _2));
 
-
-		mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
-		LLView::addChild( mScrollbar );
+		mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
+		LLView::addChild(mScrollbar);
 		mScrollbar->setFollowsRight();
 		mScrollbar->setFollowsTop();
 		mScrollbar->setFollowsBottom();
@@ -684,44 +690,48 @@ BOOL LLAccordionCtrlTab::postBuild()
 		mScrollbar->setVisible(false);
 	}
 
-	if(mContainerPanel)
+	if (mContainerPanel)
+	{
 		mContainerPanel->setVisible(mDisplayChildren);
+	}
 
 	return LLUICtrl::postBuild();
 }
-bool	LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
+
+bool LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "store_state")
+		if (str_action == "store_state")
 		{
 			storeOpenCloseState();
 			return true;
 		}
-		if(str_action == "restore_state")
+
+		if (str_action == "restore_state")
 		{
 			restoreOpenCloseState();
 			return true;
 		}
 	}	
+
 	return LLUICtrl::notifyChildren(info);
 }
 
 S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "size_changes")
+		if (str_action == "size_changes")
 		{
-			//
 			S32 height = info["height"];
-			height = llmax(height,10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
+			height = llmax(height, 10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
 			
 			mExpandedHeight = height;
 			
-			if(isExpanded() && !mSkipChangesOnNotifyParent)
+			if (isExpanded() && !mSkipChangesOnNotifyParent)
 			{
 				LLRect panel_rect = getRect();
 				panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), height);
@@ -729,12 +739,13 @@ S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 				setRect(panel_rect);
 			}
 			
-			//LLAccordionCtrl should rearrange accordion tab if one of accordion change its size
+			// LLAccordionCtrl should rearrange accordion tab if one of accordions changed its size
 			if (getParent()) // A parent may not be set if tabs are added dynamically.
 				getParent()->notifyParent(info);
 			return 1;
 		}
-		else if(str_action == "select_prev") 
+
+		if (str_action == "select_prev") 
 		{
 			showAndFocusHeader();
 			return 1;
@@ -772,78 +783,85 @@ S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 
 S32 LLAccordionCtrlTab::notify(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "select_first")
+		if (str_action == "select_first")
 		{
 			showAndFocusHeader();
 			return 1;
 		}
-		else if( str_action == "select_last" )
+
+		if (str_action == "select_last")
 		{
-			if(getDisplayChildren() == false)
+			if (!getDisplayChildren())
 			{
 				showAndFocusHeader();
 			}
 			else
 			{
 				LLView* view = getAccordionView();
-				if(view)
-					view->notify(LLSD().with("action","select_last"));
+				if (view)
+				{
+					view->notify(LLSD().with("action", "select_last"));
+				}
 			}
 		}
 	}
+
 	return 0;
 }
 
 BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	if( !mHeader->hasFocus() )
+	if (!mHeader->hasFocus())
 		return LLUICtrl::handleKey(key, mask, called_from_parent);
 
-	if ( (key == KEY_RETURN )&& mask == MASK_NONE)
+	if ((key == KEY_RETURN) && mask == MASK_NONE)
 	{
 		changeOpenClose(getDisplayChildren());
 		return TRUE;
 	}
 
-	if ( (key == KEY_ADD || key == KEY_RIGHT)&& mask == MASK_NONE)
+	if ((key == KEY_ADD || key == KEY_RIGHT) && mask == MASK_NONE)
 	{
-		if(getDisplayChildren() == false)
+		if (!getDisplayChildren())
 		{
 			changeOpenClose(getDisplayChildren());
 			return TRUE;
 		}
 	}
-	if ( (key == KEY_SUBTRACT || key == KEY_LEFT)&& mask == MASK_NONE)
+
+	if ((key == KEY_SUBTRACT || key == KEY_LEFT) && mask == MASK_NONE)
 	{
-		if(getDisplayChildren() == true)
+		if (getDisplayChildren())
 		{
 			changeOpenClose(getDisplayChildren());
 			return TRUE;
 		}
 	}
 
-	if ( key == KEY_DOWN && mask == MASK_NONE)
+	if (key == KEY_DOWN && mask == MASK_NONE)
 	{
-		//if collapsed go to the next accordion
-		if(getDisplayChildren() == false)
-			//we processing notifyParent so let call parent directly
-			getParent()->notifyParent(LLSD().with("action","select_next"));
+		// if collapsed go to the next accordion
+		if (!getDisplayChildren())
+		{
+			// we're processing notifyParent so let call parent directly
+			getParent()->notifyParent(LLSD().with("action", "select_next"));
+		}
 		else
 		{
-			getAccordionView()->notify(LLSD().with("action","select_first"));
+			getAccordionView()->notify(LLSD().with("action", "select_first"));
 		}
 		return TRUE;
 	}
 
-	if ( key == KEY_UP && mask == MASK_NONE)
+	if (key == KEY_UP && mask == MASK_NONE)
 	{
-		//go to the previous accordion
+		// go to the previous accordion
 
-		//we processing notifyParent so let call parent directly
-		getParent()->notifyParent(LLSD().with("action","select_prev"));
+		// we're processing notifyParent so let call parent directly
+		getParent()->notifyParent(LLSD().with("action", "select_prev"));
 		return TRUE;
 	}
 
@@ -869,28 +887,29 @@ void LLAccordionCtrlTab::showAndFocusHeader()
 	// accordion tab (assuming that the parent is an LLAccordionCtrl) the calls chain
 	// is shortened and messages from inside the collapsed tabs are avoided.
 	// See STORM-536.
-	getParent()->notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));
+	getParent()->notifyParent(LLSD().with("scrollToShowRect", screen_rc.getValue()));
 }
-void    LLAccordionCtrlTab::storeOpenCloseState()
+
+void LLAccordionCtrlTab::storeOpenCloseState()
 {
-	if(mWasStateStored)
+	if (mWasStateStored)
 		return;
 	mStoredOpenCloseState = getDisplayChildren();
 	mWasStateStored = true;
 }
 
-void   LLAccordionCtrlTab::restoreOpenCloseState()
+void LLAccordionCtrlTab::restoreOpenCloseState()
 {
-	if(!mWasStateStored)
+	if (!mWasStateStored)
 		return;
-	if(getDisplayChildren() != mStoredOpenCloseState)
+	if (getDisplayChildren() != mStoredOpenCloseState)
 	{
 		changeOpenClose(getDisplayChildren());
 	}
 	mWasStateStored = false;
 }
 
-void LLAccordionCtrlTab::adjustContainerPanel	()
+void LLAccordionCtrlTab::adjustContainerPanel()
 {
 	S32 width = getRect().getWidth();
 	S32 height = getRect().getHeight();
@@ -907,83 +926,83 @@ void LLAccordionCtrlTab::adjustContainerPanel	()
 
 void LLAccordionCtrlTab::adjustContainerPanel(const LLRect& child_rect)
 {
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return; 
 
-	if(!mFitPanel)
+	if (!mFitPanel)
 	{
 		show_hide_scrollbar(child_rect);
 		updateLayout(child_rect);
 	}
 	else
 	{
-		mContainerPanel->reshape(child_rect.getWidth(),child_rect.getHeight());
+		mContainerPanel->reshape(child_rect.getWidth(), child_rect.getHeight());
 		mContainerPanel->setRect(child_rect);
 	}
 }
 
 S32 LLAccordionCtrlTab::getChildViewHeight()
 {
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return 0;
 	return mContainerPanel->getRect().getHeight();
 }
 
 void LLAccordionCtrlTab::show_hide_scrollbar(const LLRect& child_rect)
 {
-	if(getChildViewHeight() > child_rect.getHeight() )
+	if (getChildViewHeight() > child_rect.getHeight())
 		showScrollbar(child_rect);
 	else
 		hideScrollbar(child_rect);
 }
+
 void LLAccordionCtrlTab::showScrollbar(const LLRect& child_rect)
 {
-	if(!mContainerPanel || !mScrollbar)
+	if (!mContainerPanel || !mScrollbar)
 		return;
 	bool was_visible = mScrollbar->getVisible();
 	mScrollbar->setVisible(true);
 	
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
-	{
-		ctrlSetLeftTopAndSize(mScrollbar,child_rect.getWidth()-scrollbar_size, 
-			child_rect.getHeight()-PARENT_BORDER_MARGIN, 
-			scrollbar_size, 
-			child_rect.getHeight()-2*PARENT_BORDER_MARGIN);
-	}
+	ctrlSetLeftTopAndSize(mScrollbar,
+		child_rect.getWidth() - scrollbar_size,
+		child_rect.getHeight() - PARENT_BORDER_MARGIN,
+		scrollbar_size, 
+		child_rect.getHeight() - PARENT_BORDER_MARGIN * 2);
 
 	LLRect orig_rect = mContainerPanel->getRect();
 
 	mScrollbar->setPageSize(child_rect.getHeight());
-	mScrollbar->setDocParams(orig_rect.getHeight(),mScrollbar->getDocPos());
+	mScrollbar->setDocParams(orig_rect.getHeight(), mScrollbar->getDocPos());
 	
-	if(was_visible)
+	if (was_visible)
 	{
 		S32 scroll_pos = llmin(mScrollbar->getDocPos(), orig_rect.getHeight() - child_rect.getHeight() - 1);
 		mScrollbar->setDocPos(scroll_pos);
 	}
-	else//shrink child panel
+	else // Shrink child panel
 	{
 		updateLayout(child_rect);
 	}
-	
 }
 
-void	LLAccordionCtrlTab::hideScrollbar( const LLRect& child_rect )
+void LLAccordionCtrlTab::hideScrollbar(const LLRect& child_rect)
 {
-	if(!mContainerPanel || !mScrollbar)
+	if (!mContainerPanel || !mScrollbar)
 		return;
 
-	if(mScrollbar->getVisible() == false)
+	if (mScrollbar->getVisible() == FALSE)
 		return;
-	mScrollbar->setVisible(false);
+
+	mScrollbar->setVisible(FALSE);
 	mScrollbar->setDocPos(0);
 
 	//shrink child panel
 	updateLayout(child_rect);
 }
 
-void	LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
+void LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
 {
 	LLRect child_rect;
 
@@ -999,21 +1018,20 @@ void	LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
 	updateLayout(child_rect);
 }
 
-void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
+void LLAccordionCtrlTab::drawChild(const LLRect& root_rect, LLView* child)
 {
 	if (child && child->getVisible() && child->getRect().isValid())
 	{
 		LLRect screen_rect;
-		localRectToScreen(child->getRect(),&screen_rect);
-		
-		if ( root_rect.overlaps(screen_rect)  && sDirtyRect.overlaps(screen_rect))
+		localRectToScreen(child->getRect(), &screen_rect);
+
+		if (root_rect.overlaps(screen_rect) && sDirtyRect.overlaps(screen_rect))
 		{
 			gGL.matrixMode(LLRender::MM_MODELVIEW);
 			LLUI::pushMatrix();
 			{
 				LLUI::translate((F32)child->getRect().mLeft, (F32)child->getRect().mBottom);
 				child->draw();
-
 			}
 			LLUI::popMatrix();
 		}
@@ -1022,64 +1040,67 @@ void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
 
 void LLAccordionCtrlTab::draw()
 {
-	if(mFitPanel)
+	if (mFitPanel)
+	{
 		LLUICtrl::draw();
+	}
 	else
 	{
-		LLRect root_rect = getRootView()->getRect();
-		drawChild(root_rect,mHeader);
-		drawChild(root_rect,mScrollbar );
-		{
-			LLRect child_rect;
+		LLRect root_rect(getRootView()->getRect());
+		drawChild(root_rect, mHeader);
+		drawChild(root_rect, mScrollbar);
 
-			S32 width = getRect().getWidth();
-			S32 height = getRect().getHeight();
+		LLRect child_rect;
 
-			child_rect.setLeftTopAndSize(
-				getPaddingLeft(),
-				height - getHeaderHeight() - getPaddingTop(),
-				width - getPaddingLeft() - getPaddingRight(), 
-				height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
+		S32 width = getRect().getWidth();
+		S32 height = getRect().getHeight();
 
-			LLLocalClipRect clip(child_rect);
-			drawChild(root_rect,mContainerPanel);
-		}
+		child_rect.setLeftTopAndSize(
+			getPaddingLeft(),
+			height - getHeaderHeight() - getPaddingTop(),
+			width - getPaddingLeft() - getPaddingRight(),
+			height - getHeaderHeight() - getPaddingTop() - getPaddingBottom());
+
+		LLLocalClipRect clip(child_rect);
+		drawChild(root_rect,mContainerPanel);
 	}
 }
 
-void	LLAccordionCtrlTab::updateLayout	( const LLRect& child_rect )
+void LLAccordionCtrlTab::updateLayout(const LLRect& child_rect)
 {
 	LLView*	child = getAccordionView();
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return;
 
 	S32 panel_top = child_rect.getHeight();
 	S32 panel_width = child_rect.getWidth();
 
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	if(mScrollbar && mScrollbar->getVisible() != false)
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
+	if (mScrollbar && mScrollbar->getVisible())
 	{
-		panel_top+=mScrollbar->getDocPos();
-		panel_width-=scrollbar_size;
+		panel_top += mScrollbar->getDocPos();
+		panel_width -= scrollbar_size;
 	}
 
-	//set sizes for first panels and dragbars
+	// Set sizes for first panels and dragbars
 	LLRect panel_rect = child->getRect();
-	ctrlSetLeftTopAndSize(mContainerPanel,child_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
+	ctrlSetLeftTopAndSize(mContainerPanel, child_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
 }
+
 void LLAccordionCtrlTab::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	LLRect panel_rect = panel->getRect();
-	panel_rect.setLeftTopAndSize( left, top, width, height);
+	panel_rect.setLeftTopAndSize(left, top, width, height);
 	panel->reshape( width, height, 1);
 	panel->setRect(panel_rect);
 }
+
 BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 {
 	//header may be not the first child but we need to process it first
-	if(y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT/2) )
+	if (y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT / 2))
 	{
 		//inside tab header
 		//fix for EXT-6619
@@ -1088,16 +1109,18 @@ BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 	}
 	return LLUICtrl::handleToolTip(x, y, mask);
 }
-BOOL LLAccordionCtrlTab::handleScrollWheel		( S32 x, S32 y, S32 clicks )
+
+BOOL LLAccordionCtrlTab::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	if( LLUICtrl::handleScrollWheel(x,y,clicks))
+	if (LLUICtrl::handleScrollWheel(x, y, clicks))
 	{
 		return TRUE;
 	}
-	if( mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
+
+	if (mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
 	{
 		return TRUE;
 	}
+
 	return FALSE;
 }
-
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 2c72e8c036..896a34cac4 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -104,7 +104,7 @@ public:
 	virtual void setDisplayChildren(bool display);
 
 	// Returns expand/collapse state
-	virtual bool getDisplayChildren() const {return mDisplayChildren;};
+	virtual bool getDisplayChildren() const { return mDisplayChildren; };
 
 	//set LLAccordionCtrlTab panel
 	void		setAccordionView(LLView* panel);
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index b13e7389cc..460bd0945b 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1198,7 +1198,7 @@ void LLFlatListView::onFocusReceived()
 {
 	if (size())
 	{
-	mSelectedItemsBorder->setVisible(TRUE);
+		mSelectedItemsBorder->setVisible(TRUE);
 	}
 	gEditMenuHandler = this;
 }
@@ -1207,7 +1207,7 @@ void LLFlatListView::onFocusLost()
 {
 	mSelectedItemsBorder->setVisible(FALSE);
 	// Route menu back to the default
- 	if( gEditMenuHandler == this )
+	if (gEditMenuHandler == this)
 	{
 		gEditMenuHandler = NULL;
 	}
@@ -1216,16 +1216,16 @@ void LLFlatListView::onFocusLost()
 //virtual 
 S32 LLFlatListView::notify(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "select_first")
+		if (str_action == "select_first")
 		{
 			setFocus(true);
 			selectFirstItem();
 			return 1;
 		}
-		else if(str_action == "select_last")
+		else if (str_action == "select_last")
 		{
 			setFocus(true);
 			selectLastItem();
@@ -1238,6 +1238,7 @@ S32 LLFlatListView::notify(const LLSD& info)
 		notifyParentItemsRectChanged();
 		return 1;
 	}
+
 	return 0;
 }
 
@@ -1249,10 +1250,8 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 	detached_items.clear();
 	// Go through items and detach valid items, remove them from items panel
 	// and add to detached_items.
-	for (pairs_iterator_t
-			 iter = mItemPairs.begin(),
-			 iter_end = mItemPairs.end();
-		 iter != iter_end; ++iter)
+	pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+	while (iter != iter_end)
 	{
 		LLPanel* pItem = (*iter)->first;
 		if (1 == pItem->notify(action))
@@ -1261,6 +1260,7 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 			mItemsPanel->removeChild(pItem);
 			detached_items.push_back(pItem);
 		}
+		iter++;
 	}
 	if (!detached_items.empty())
 	{
@@ -1268,13 +1268,12 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 		if (detached_items.size() == mItemPairs.size())
 		{
 			// This way will be faster if all items were disconnected
-			for (pairs_iterator_t
-					 iter = mItemPairs.begin(),
-					 iter_end = mItemPairs.end();
-				 iter != iter_end; ++iter)
+			pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+			while (iter != iter_end)
 			{
 				(*iter)->first = NULL;
 				delete *iter;
+				iter++;
 			}
 			mItemPairs.clear();
 			// Also set items panel height to zero.
@@ -1287,16 +1286,14 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 		}
 		else
 		{
-			for (std::vector<LLPanel*>::const_iterator
-					 detached_iter = detached_items.begin(),
-					 detached_iter_end = detached_items.end();
-				 detached_iter != detached_iter_end; ++detached_iter)
+			std::vector<LLPanel*>::const_iterator
+				detached_iter = detached_items.begin(),
+				detached_iter_end = detached_items.end();
+			while (detached_iter < detached_iter_end)
 			{
 				LLPanel* pDetachedItem = *detached_iter;
-				for (pairs_iterator_t
-						 iter = mItemPairs.begin(),
-						 iter_end = mItemPairs.end();
-					 iter != iter_end; ++iter)
+				pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+				while (iter != iter_end)
 				{
 					item_pair_t* item_pair = *iter;
 					if (item_pair->first == pDetachedItem)
@@ -1306,7 +1303,9 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 						delete item_pair;
 						break;
 					}
+					iter++;
 				}
+				detached_iter++;
 			}
 			rearrangeItems();
 		}
@@ -1322,7 +1321,6 @@ LLFlatListViewEx::Params::Params()
 : no_items_msg("no_items_msg")
 , no_filtered_items_msg("no_filtered_items_msg")
 {
-
 }
 
 LLFlatListViewEx::LLFlatListViewEx(const Params& p)
@@ -1332,7 +1330,6 @@ LLFlatListViewEx::LLFlatListViewEx(const Params& p)
 , mForceShowingUnmatchedItems(false)
 , mHasMatchedItems(false)
 {
-
 }
 
 void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
@@ -1352,7 +1349,6 @@ void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
 		// list does not contain any items at all
 		setNoItemsCommentText(mNoItemsMsg);
 	}
-
 }
 
 bool LLFlatListViewEx::getForceShowingUnmatchedItems()
@@ -1411,12 +1407,10 @@ void LLFlatListViewEx::filterItems()
 	getItems(items);
 
 	mHasMatchedItems = false;
-	for (item_panel_list_t::iterator
-			 iter = items.begin(),
-			 iter_end = items.end();
-		 iter != iter_end; ++iter)
+    item_panel_list_t::iterator iter = items.begin(), iter_end = items.end();
+	while (iter < iter_end)
 	{
-		LLPanel* pItem = (*iter);
+		LLPanel* pItem = *(iter++);
 		updateItemVisibility(pItem, action);
 	}
 
-- 
cgit v1.2.3


From 478703e3c82df7b5751d80007264468bf44cb379 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 11 Oct 2023 14:20:47 -0500
Subject: SL-20440 Fix for projector ambiance destroying PBR shading.  Also fix
 longstanding bug with hard line in projector ambiance lighting.  Incidental
 decruft of legacy_adjust and LOCAL_LIGHT_KILL, etc.

---
 indra/newview/app_settings/settings.xml            |  33 ---
 .../shaders/class1/deferred/fullbrightF.glsl       |   4 -
 .../shaders/class1/environment/srgbF.glsl          |  28 ---
 .../class1/windlight/atmosphericsFuncs.glsl        |   1 -
 .../shaders/class2/deferred/alphaF.glsl            |   4 -
 .../shaders/class3/deferred/fullbrightShinyF.glsl  |   6 +-
 .../shaders/class3/deferred/materialF.glsl         |   5 +-
 .../shaders/class3/deferred/multiPointLightF.glsl  |   6 -
 .../shaders/class3/deferred/multiSpotLightF.glsl   | 263 ---------------------
 .../shaders/class3/deferred/pointLightF.glsl       |   2 -
 .../shaders/class3/deferred/softenLightF.glsl      |   3 -
 .../shaders/class3/deferred/spotLightF.glsl        | 106 ++++-----
 indra/newview/llviewershadermgr.cpp                | 179 +-------------
 13 files changed, 48 insertions(+), 592 deletions(-)
 delete mode 100644 indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 837f801add..5d8d4b199c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12944,39 +12944,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-  <key>AmbientDisable</key>
-  <map>
-    <key>Comment</key>
-    <string>If TRUE, ambient light has no effect</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>SunlightDisable</key>
-  <map>
-    <key>Comment</key>
-    <string>If TRUE, sunlight has no effect</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>LocalLightDisable</key>
-  <map>
-    <key>Comment</key>
-    <string>If TRUE, local lights have no effect</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
     <key>TextureDiscardLevel</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index b752307d13..5d58cc91cd 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -40,8 +40,6 @@ vec4 applyWaterFogView(vec3 pos, vec4 color);
 #endif
 
 vec3 srgb_to_linear(vec3 cs);
-vec3 legacy_adjust_fullbright(vec3 c);
-vec3 legacy_adjust(vec3 c);
 vec3 linear_to_srgb(vec3 cl);
 vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten);
 void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten);
@@ -98,9 +96,7 @@ void main()
 #endif
 
 #ifndef IS_HUD
-    color.rgb = legacy_adjust(color.rgb);
     color.rgb = srgb_to_linear(color.rgb);
-    color.rgb = legacy_adjust_fullbright(color.rgb);
     color.rgb = atmosFragLighting(color.rgb, additive, atten);
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl b/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
index 31b02377da..e3fd10447e 100644
--- a/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
+++ b/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
@@ -113,31 +113,3 @@ vec3 inv_toneMapACES_Hill(vec3 color)
     return color;
 }
 
-// adjust legacy colors to back out tonemapping and exposure 
-//   NOTE: obsolete now that setting probe ambiance to zero removes tonemapping and exposure, but keeping for a minute
-//   while that change goes through testing - davep 6/1/2023
-#define LEGACY_ADJUST 0
-
-vec3 legacy_adjust(vec3 c)
-{
-#if LEGACY_ADJUST
-    vec3 desat = rgb2hsv(c.rgb);
-    desat.g *= 1.0-(1.0-desat.b)*0.5;
-    desat.b += (1.0-desat.b)*0.1f;
-    desat.rgb = hsv2rgb(desat);
-    return desat;
-#else
-    return c;
-#endif
-}
-
-vec3 legacy_adjust_fullbright(vec3 c)
-{
-#if LEGACY_ADJUST
-    float exp_scale = clamp(texture(exposureMap, vec2(0.5, 0.5)).r, 0.01, 10.0);
-    return c / exp_scale * 1.34; //magic 1.34 arrived at by binary search for a value that reproduces midpoint grey consistenty
-#else
-    return c;
-#endif
-}
-
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index a8aa5a36a3..a1da4b1f9a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -45,7 +45,6 @@ uniform float sky_ambient_scale;
 float getAmbientClamp() { return 1.0f; }
 
 vec3 srgb_to_linear(vec3 col);
-vec3 legacy_adjust(vec3 col);
 
 // return colors in sRGB space
 void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive,
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
index 3a251af240..b63f3b60f9 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
@@ -71,7 +71,6 @@ vec4 applyWaterFogViewLinear(vec3 pos, vec4 color, vec3 sunlit);
 
 vec3 srgb_to_linear(vec3 c);
 vec3 linear_to_srgb(vec3 c);
-vec3 legacy_adjust(vec3 c);
 
 vec2 encode_normal (vec3 n);
 vec3 atmosFragLightingLinear(vec3 light, vec3 additive, vec3 atten);
@@ -234,7 +233,6 @@ void main()
     }
 
     diffuse_srgb.rgb *= vertex_color.rgb;
-    diffuse_srgb.rgb = legacy_adjust(diffuse_srgb.rgb);
     diffuse_linear.rgb = srgb_to_linear(diffuse_srgb.rgb);
 #endif // USE_VERTEX_COLOR
 
@@ -291,9 +289,7 @@ void main()
     LIGHT_LOOP(7)
 
     // sum local light contrib in linear colorspace
-#if !defined(LOCAL_LIGHT_KILL)
     color.rgb += light.rgb;
-#endif // !defined(LOCAL_LIGHT_KILL)
 
 #endif // #else // FOR_IMPOSTOR
 
diff --git a/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl
index 54a887262b..5483a4e29c 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl
@@ -40,8 +40,6 @@ in vec3 vary_position;
 uniform samplerCube environmentMap;
 
 vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten);
-vec3 legacy_adjust_fullbright(vec3 c);
-vec3 legacy_adjust(vec3 c);
 void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten);
 
 vec3 linear_to_srgb(vec3 c);
@@ -82,10 +80,8 @@ void main()
     vec4 spec = vec4(0,0,0,0);
     sampleReflectionProbesLegacy(ambenv, glossenv, legacyenv, vec2(0), pos.xyz, norm.xyz, spec.a, env_intensity, false, amblit);
 
-    color.rgb = legacy_adjust(color.rgb);
     color.rgb = srgb_to_linear(color.rgb);
-    color.rgb = legacy_adjust_fullbright(color.rgb);
-    
+
     applyLegacyEnv(color.rgb, legacyenv, spec, pos, norm, env_intensity);
     color.rgb = atmosFragLighting(color.rgb, additive, atten);
 #endif
diff --git a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
index 319f2f25b7..acff03ec4b 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
@@ -48,8 +48,6 @@ void calcHalfVectors(vec3 lv, vec3 n, vec3 v, out vec3 h, out vec3 l, out float
 
 vec3 srgb_to_linear(vec3 cs);
 vec3 linear_to_srgb(vec3 cs);
-vec3 legacy_adjust(vec3 c);
-vec3 legacy_adjust_fullbright(vec3 c);
 
 #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND)
 
@@ -311,7 +309,6 @@ void main()
 
 #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND)
     //forward rendering, output lit linear color
-    diffcol.rgb = legacy_adjust(diffcol.rgb);
     diffcol.rgb = srgb_to_linear(diffcol.rgb);
     spec.rgb = srgb_to_linear(spec.rgb);
     spec.a = glossiness; // pack glossiness into spec alpha for lighting functions
@@ -377,7 +374,7 @@ void main()
         applyGlossEnv(color, glossenv, spec, pos.xyz, norm.xyz);
     }
 
-    color = mix(color.rgb, legacy_adjust_fullbright(diffcol.rgb), emissive);
+    color = mix(color.rgb, diffcol.rgb, emissive);
 
     if (env > 0.0)
     {  // add environmentmap
diff --git a/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl
index 2a096a98ec..dbccfa8597 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl
@@ -52,7 +52,6 @@ vec4 getNormalEnvIntensityFlags(vec2 screenpos, out vec3 n, out float envIntensi
 vec2 getScreenXY(vec4 clip);
 vec2 getScreenCoord(vec4 clip);
 vec3 srgb_to_linear(vec3 c);
-vec3 legacy_adjust(vec3 c);
 
 // Util
 vec3 hue_to_rgb(float hue);
@@ -67,9 +66,6 @@ vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor,
 
 void main()
 {
-#if defined(LOCAL_LIGHT_KILL)
-    discard;  // Bail immediately
-#else
     vec3 final_color = vec3(0, 0, 0);
     vec2 tc          = getScreenCoord(vary_fragcoord);
     vec3 pos         = getPosition(tc).xyz;
@@ -126,7 +122,6 @@ void main()
     }
     else
     {
-        diffuse.rgb = legacy_adjust(diffuse.rgb);
         diffuse = srgb_to_linear(diffuse);
         spec.rgb = srgb_to_linear(spec.rgb);
 
@@ -174,7 +169,6 @@ void main()
 
     frag_color.rgb = max(final_color, vec3(0));
     frag_color.a   = 0.0;
-#endif // LOCAL_LIGHT_KILL
 
 #ifdef IS_AMD_CARD
     // If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage
diff --git a/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl
deleted file mode 100644
index 23120bbbbe..0000000000
--- a/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl
+++ /dev/null
@@ -1,263 +0,0 @@
-/** 
- * @file class3\deferred\multiSpotLightF.glsl
- *
- * $LicenseInfo:firstyear=2022&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2022, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
- 
-/*[EXTRA_CODE_HERE]*/
-
-out vec4 frag_color;
-
-uniform sampler2D diffuseRect;
-uniform sampler2D specularRect;
-uniform sampler2D depthMap;
-uniform sampler2D normalMap;
-uniform sampler2D emissiveRect; // PBR linear packed Occlusion, Roughness, Metal. See: pbropaqueF.glsl
-uniform samplerCube environmentMap;
-uniform sampler2D lightMap;
-uniform sampler2D projectionMap; // rgba
-uniform sampler2D lightFunc;
-
-uniform mat4 proj_mat; //screen space to light space
-uniform float proj_near; //near clip for projection
-uniform vec3 proj_p; //plane projection is emitting from (in screen space)
-uniform vec3 proj_n;
-uniform float proj_focus; //distance from plane to begin blurring
-uniform float proj_lod;  //(number of mips in proj map)
-uniform float proj_range; //range between near clip and far clip plane of projection
-uniform float proj_ambient_lod;
-uniform float proj_ambiance;
-uniform float near_clip;
-uniform float far_clip;
-
-uniform vec3 proj_origin; //origin of projection to be used for angular attenuation
-uniform float sun_wash;
-uniform int proj_shadow_idx;
-uniform float shadow_fade;
-
-// Light params
-uniform vec3 center;
-uniform float size;
-uniform vec3 color;
-uniform float falloff;
-
-in vec4 vary_fragcoord;
-uniform vec2 screen_res;
-
-uniform mat4 inv_proj;
-
-void calcHalfVectors(vec3 lv, vec3 n, vec3 v, out vec3 h, out vec3 l, out float nh, out float nl, out float nv, out float vh, out float lightDist);
-float calcLegacyDistanceAttenuation(float distance, float falloff);
-vec3 colorized_dot(float x);
-bool clipProjectedLightVars(vec3 center, vec3 pos, out float dist, out float l_dist, out vec3 lv, out vec4 proj_tc );
-vec4 getNormalEnvIntensityFlags(vec2 screenpos, out vec3 n, out float envIntensity);
-vec3 getProjectedLightAmbiance(float amb_da, float attenuation, float lit, float nl, float noise, vec2 projected_uv);
-vec3 getProjectedLightDiffuseColor(float light_distance, vec2 projected_uv );
-vec3 getProjectedLightSpecularColor(vec3 pos, vec3 n);
-vec2 getScreenXY(vec4 clip);
-vec2 getScreenCoord(vec4 clip);
-vec3 srgb_to_linear(vec3 cs);
-vec3 legacy_adjust(vec3 c);
-vec4 texture2DLodSpecular(vec2 tc, float lod);
-
-vec4 getPosition(vec2 pos_screen);
-
-const float M_PI = 3.14159265;
-
-vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor, 
-                    float perceptualRoughness, 
-                    float metallic,
-                    vec3 n, // normal
-                    vec3 v, // surface point to camera
-                    vec3 l); //surface point to light
-
-void main()
-{
-#if defined(LOCAL_LIGHT_KILL)
-    discard;
-#else
-    vec3 final_color = vec3(0,0,0);
-    vec2 tc          = getScreenCoord(vary_fragcoord);
-    vec3 pos         = getPosition(tc).xyz;
-
-    vec3 lv;
-    vec4 proj_tc;
-    float dist, l_dist;
-    if (clipProjectedLightVars(center, pos, dist, l_dist, lv, proj_tc))
-    {
-        discard;
-    }
-
-    float shadow = 1.0;
-    
-    if (proj_shadow_idx >= 0)
-    {
-        vec4 shd = texture(lightMap, tc);
-        shadow = (proj_shadow_idx==0)?shd.b:shd.a;
-        shadow += shadow_fade;
-        shadow = clamp(shadow, 0.0, 1.0);        
-    }
-
-    float envIntensity;
-    vec3 n;
-    vec4 norm = getNormalEnvIntensityFlags(tc, n, envIntensity);
-
-    float dist_atten = calcLegacyDistanceAttenuation(dist, falloff);
-    if (dist_atten <= 0.0)
-    {
-        discard;
-    }
-
-    lv = proj_origin-pos.xyz;
-    vec3  h, l, v = -normalize(pos);
-    float nh, nl, nv, vh, lightDist;
-    calcHalfVectors(lv, n, v, h, l, nh, nl, nv, vh, lightDist);
-
-    vec3 diffuse = texture(diffuseRect, tc).rgb;
-    vec4 spec    = texture(specularRect, tc);
-    vec3 dlit    = vec3(0, 0, 0);
-    vec3 slit    = vec3(0, 0, 0);
-
-    vec3 amb_rgb = vec3(0);
-
-    if (GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_PBR))
-    {
-        vec3 colorEmissive = texture(emissiveRect, tc).rgb; 
-        vec3 orm = spec.rgb;
-        float perceptualRoughness = orm.g;
-        float metallic = orm.b;
-        vec3 f0 = vec3(0.04);
-        vec3 baseColor = diffuse.rgb;
-        
-        vec3 diffuseColor = baseColor.rgb*(vec3(1.0)-f0);
-        diffuseColor *= 1.0 - metallic;
-
-        vec3 specularColor = mix(f0, baseColor.rgb, metallic);
-
-        // We need this additional test inside a light's frustum since a spotlight's ambiance can be applied
-        if (proj_tc.x > 0.0 && proj_tc.x < 1.0
-        &&  proj_tc.y > 0.0 && proj_tc.y < 1.0)
-        {
-            float lit = 0.0;
-            float amb_da = 0.0;
-
-            if (nl > 0.0)
-            {
-                amb_da += (nl*0.5 + 0.5) * proj_ambiance;
-                
-                dlit = getProjectedLightDiffuseColor( l_dist, proj_tc.xy );
-
-                vec3 intensity = dist_atten * dlit * 3.9 * shadow; // Legacy attenuation, magic number to balance with legacy materials
-                final_color += intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, normalize(lv));
-            }
-
-            amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
-            final_color += diffuse.rgb * amb_rgb;
-        }
-    }
-    else
-    {
-        diffuse = legacy_adjust(diffuse);
-        diffuse = srgb_to_linear(diffuse);
-        spec.rgb = srgb_to_linear(spec.rgb);
-
-        if (proj_tc.z > 0.0 &&
-            proj_tc.x < 1.0 &&
-            proj_tc.y < 1.0 &&
-            proj_tc.x > 0.0 &&
-            proj_tc.y > 0.0)
-        {
-            float amb_da = 0;
-            float lit = 0.0;
-
-            if (nl > 0.0)
-            {
-                lit = nl * dist_atten;
-
-                dlit = getProjectedLightDiffuseColor( l_dist, proj_tc.xy );
-
-                final_color = dlit*lit*diffuse*shadow;
-
-                // unshadowed for consistency between forward and deferred?
-                amb_da += (nl*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
-            }
-        
-            amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
-            final_color += diffuse.rgb * amb_rgb;
-        }
-    
-        if (spec.a > 0.0)
-        {
-            dlit *= min(nl*6.0, 1.0) * dist_atten;
-
-            float fres = pow(1 - vh, 5)*0.4+0.5;
-
-            float gtdenom = 2 * nh;
-            float gt = max(0, min(gtdenom * nv / vh, gtdenom * nl / vh));
-                                
-            if (nh > 0.0)
-            {
-                float scol = fres*texture(lightFunc, vec2(nh, spec.a)).r*gt/(nh*nl);
-                vec3 speccol = dlit*scol*spec.rgb*shadow;
-                speccol = clamp(speccol, vec3(0), vec3(1));
-                final_color += speccol;
-            }
-        }   
-
-        if (envIntensity > 0.0)
-        {
-            vec3 ref = reflect(normalize(pos), n);
-        
-            //project from point pos in direction ref to plane proj_p, proj_n
-            vec3 pdelta = proj_p-pos;
-            float ds = dot(ref, proj_n);
-        
-            if (ds < 0.0)
-            {
-                vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds;
-            
-                vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0));
-
-                if (stc.z > 0.0)
-                {
-                    stc /= stc.w;
-                                
-                    if (stc.x < 1.0 &&
-                        stc.y < 1.0 &&
-                        stc.x > 0.0 &&
-                        stc.y > 0.0)
-                    {
-                        final_color += color.rgb * texture2DLodSpecular(stc.xy, (1 - spec.a) * (proj_lod * 0.6)).rgb * shadow * envIntensity;
-                    }
-                }
-            }
-        }
-    }
-
-    //not sure why, but this line prevents MATBUG-194
-    final_color = max(final_color, vec3(0.0));
-
-    //output linear
-    frag_color.rgb = final_color;
-    frag_color.a = 0.0;
-#endif // LOCAL_LIGHT_KILL
-}
diff --git a/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl
index 42ba96148c..210e944e45 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl
@@ -57,7 +57,6 @@ vec4 getPosition(vec2 pos_screen);
 vec2 getScreenXY(vec4 clip);
 vec2 getScreenCoord(vec4 clip);
 vec3 srgb_to_linear(vec3 c);
-vec3 legacy_adjust(vec3 c);
 float getDepth(vec2 tc);
 
 vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor, 
@@ -116,7 +115,6 @@ void main()
         {
             discard;
         }
-        diffuse = legacy_adjust(diffuse);
         diffuse = srgb_to_linear(diffuse);
         spec.rgb = srgb_to_linear(spec.rgb);
 
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index 8b0ea23897..35e99c5bd2 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -78,7 +78,6 @@ float getDepth(vec2 pos_screen);
 
 vec3 linear_to_srgb(vec3 c);
 vec3 srgb_to_linear(vec3 c);
-vec3 legacy_adjust(vec3 c);
 
 uniform vec4 waterPlane;
 
@@ -220,8 +219,6 @@ void main()
     else
     {
         // legacy shaders are still writng sRGB to gbuffer
-        baseColor.rgb = legacy_adjust(baseColor.rgb);
-        
         baseColor.rgb = srgb_to_linear(baseColor.rgb);
         
         spec.rgb = srgb_to_linear(spec.rgb);
diff --git a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
index 1ea801d7d7..357f3b6e3b 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
@@ -25,16 +25,6 @@
  
 /*[EXTRA_CODE_HERE]*/
 
-#define DEBUG_ANY_LIGHT_TYPE         0 // Output green light cone
-#define DEBUG_LEG_LIGHT_TYPE         0 // Show Legacy objects in green
-#define DEBUG_PBR_LIGHT_TYPE         0 // Show PBR objects in green
-#define DEBUG_PBR_SPOT               0
-#define DEBUG_PBR_SPOT_DIFFUSE       0
-#define DEBUG_PBR_SPOT_SPECULAR      0
-
-#define DEBUG_SPOT_NL                  0 // monochome area effected by light
-#define DEBUG_SPOT_ZERO                0 // Output zero for spotlight
-
 out vec4 frag_color;
 
 uniform sampler2D diffuseRect;
@@ -64,11 +54,16 @@ uniform float sun_wash;
 uniform int proj_shadow_idx;
 uniform float shadow_fade;
 
+// Light params
+#if defined(MULTI_SPOTLIGHT)
+uniform vec3 center;
+#else
+in vec3 trans_center;
+#endif
 uniform float size;
 uniform vec3 color;
 uniform float falloff;
 
-in vec3 trans_center;
 in vec4 vary_fragcoord;
 uniform vec2 screen_res;
 
@@ -80,11 +75,8 @@ bool clipProjectedLightVars(vec3 center, vec3 pos, out float dist, out float l_d
 vec4 getNormalEnvIntensityFlags(vec2 screenpos, out vec3 n, out float envIntensity);
 vec3 getProjectedLightAmbiance(float amb_da, float attenuation, float lit, float nl, float noise, vec2 projected_uv);
 vec3 getProjectedLightDiffuseColor(float light_distance, vec2 projected_uv );
-vec3 getProjectedLightSpecularColor(vec3 pos, vec3 n);
-vec2 getScreenXY(vec4 clip_point);
-vec2 getScreenCoord(vec4 clip_point);
-vec3 srgb_to_linear(vec3 c);
-vec3 legacy_adjust(vec3 c);
+vec2 getScreenCoord(vec4 clip);
+vec3 srgb_to_linear(vec3 cs);
 vec4 texture2DLodSpecular(vec2 tc, float lod);
 
 vec4 getPosition(vec2 pos_screen);
@@ -100,9 +92,6 @@ vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor,
 
 void main()
 {
-#if defined(LOCAL_LIGHT_KILL)
-    discard;
-#else
     vec3 final_color = vec3(0,0,0);
     vec2 tc          = getScreenCoord(vary_fragcoord);
     vec3 pos         = getPosition(tc).xyz;
@@ -110,24 +99,31 @@ void main()
     vec3 lv;
     vec4 proj_tc;
     float dist, l_dist;
-    if (clipProjectedLightVars(trans_center, pos, dist, l_dist, lv, proj_tc))
+    vec3 c;
+#if defined(MULTI_SPOTLIGHT)
+    c = center;
+#else
+    c = trans_center;
+#endif
+
+    if (clipProjectedLightVars(c, pos, dist, l_dist, lv, proj_tc))
     {
         discard;
     }
 
     float shadow = 1.0;
-
+    
     if (proj_shadow_idx >= 0)
     {
         vec4 shd = texture(lightMap, tc);
-        shadow = (proj_shadow_idx == 0) ? shd.b : shd.a;
+        shadow = (proj_shadow_idx==0)?shd.b:shd.a;
         shadow += shadow_fade;
-        shadow = clamp(shadow, 0.0, 1.0);
+        shadow = clamp(shadow, 0.0, 1.0);        
     }
 
     float envIntensity;
     vec3 n;
-    vec4 norm = getNormalEnvIntensityFlags(tc, n, envIntensity); // need `norm.w` for GET_GBUFFER_FLAG()
+    vec4 norm = getNormalEnvIntensityFlags(tc, n, envIntensity);
 
     float dist_atten = calcLegacyDistanceAttenuation(dist, falloff);
     if (dist_atten <= 0.0)
@@ -135,7 +131,7 @@ void main()
         discard;
     }
 
-    lv = proj_origin-pos.xyz; // NOTE: Re-using lv
+    lv = proj_origin-pos.xyz;
     vec3  h, l, v = -normalize(pos);
     float nh, nl, nv, vh, lightDist;
     calcHalfVectors(lv, n, v, h, l, nh, nl, nv, vh, lightDist);
@@ -146,10 +142,11 @@ void main()
     vec3 slit    = vec3(0, 0, 0);
 
     vec3 amb_rgb = vec3(0);
+
     if (GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_PBR))
     {
-        vec3 colorEmissive = texture(emissiveRect, tc).rgb;
-        vec3 orm = spec.rgb; 
+        vec3 colorEmissive = texture(emissiveRect, tc).rgb; 
+        vec3 orm = spec.rgb;
         float perceptualRoughness = orm.g;
         float metallic = orm.b;
         vec3 f0 = vec3(0.04);
@@ -173,27 +170,27 @@ void main()
                 
                 dlit = getProjectedLightDiffuseColor( l_dist, proj_tc.xy );
 
-                vec3 intensity = dist_atten * dlit * 3.9 * shadow; // Legacy attenuation
-                final_color += intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, normalize(lv));
+                vec3 intensity = dist_atten * dlit * 3.9 * shadow; // Legacy attenuation, magic number to balance with legacy materials
+                lv = normalize(lv);
+                final_color += intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, lv);
             }
 
             amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
-            final_color += diffuse.rgb * amb_rgb;
+            final_color += amb_rgb * pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, -lv);
         }
     }
     else
     {
-        diffuse = legacy_adjust(diffuse);
         diffuse = srgb_to_linear(diffuse);
         spec.rgb = srgb_to_linear(spec.rgb);
-        
+
         if (proj_tc.z > 0.0 &&
             proj_tc.x < 1.0 &&
             proj_tc.y < 1.0 &&
             proj_tc.x > 0.0 &&
             proj_tc.y > 0.0)
         {
-            float amb_da = proj_ambiance;
+            float amb_da = 0;
             float lit = 0.0;
 
             if (nl > 0.0)
@@ -204,24 +201,23 @@ void main()
 
                 final_color = dlit*lit*diffuse*shadow;
 
+                // unshadowed for consistency between forward and deferred?
                 amb_da += (nl*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
             }
-
-            vec3 amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
-            final_color += diffuse.rgb*amb_rgb;
-  #if DEBUG_LEG_LIGHT_TYPE
-            final_color = vec3(0,0.5,0);
-  #endif
+        
+            amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
+            final_color += diffuse.rgb * amb_rgb * max(dot(-normalize(lv), n), 0.0);
         }
-
+    
         if (spec.a > 0.0)
         {
             dlit *= min(nl*6.0, 1.0) * dist_atten;
-            float fres = pow(1 - dot(h, v), 5)*0.4+0.5;
+
+            float fres = pow(1 - vh, 5)*0.4+0.5;
 
             float gtdenom = 2 * nh;
             float gt = max(0, min(gtdenom * nv / vh, gtdenom * nl / vh));
-
+                                
             if (nh > 0.0)
             {
                 float scol = fres*texture(lightFunc, vec2(nh, spec.a)).r*gt/(nh*nl);
@@ -229,26 +225,26 @@ void main()
                 speccol = clamp(speccol, vec3(0), vec3(1));
                 final_color += speccol;
             }
-        }
+        }   
 
         if (envIntensity > 0.0)
         {
             vec3 ref = reflect(normalize(pos), n);
-
+        
             //project from point pos in direction ref to plane proj_p, proj_n
             vec3 pdelta = proj_p-pos;
             float ds = dot(ref, proj_n);
-
+        
             if (ds < 0.0)
             {
                 vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds;
-
+            
                 vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0));
 
                 if (stc.z > 0.0)
                 {
                     stc /= stc.w;
-
+                                
                     if (stc.x < 1.0 &&
                         stc.y < 1.0 &&
                         stc.x > 0.0 &&
@@ -261,24 +257,10 @@ void main()
         }
     }
 
-#if DEBUG_PBR_SPOT_DIFFUSE
-    final_color = vec3(nl * dist_atten);
-#endif
-#if DEBUG_SPOT_NL
-    final_color = vec3(nl);
-#endif
-#if DEBUG_SPOT_ZERO
-    final_color = vec3(0,0,0);
-#endif
-#if DEBUG_ANY_LIGHT_TYPE
-    final_color = vec3(0,0.3333,0);
-#endif
-
     //not sure why, but this line prevents MATBUG-194
     final_color = max(final_color, vec3(0.0));
 
-    //output linear colors as gamma correction happens down stream
+    //output linear
     frag_color.rgb = final_color;
     frag_color.a = 0.0;
-#endif // LOCAL_LIGHT_KILL
 }
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 5adc26dc73..61ccc1d43f 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -618,30 +618,12 @@ std::string LLViewerShaderMgr::loadBasicShaders()
 	attribs["MAX_JOINTS_PER_MESH_OBJECT"] = 
 		boost::lexical_cast<std::string>(LLSkinningUtil::getMaxJointCount());
 
-    BOOL ambient_kill = gSavedSettings.getBOOL("AmbientDisable");
-	BOOL sunlight_kill = gSavedSettings.getBOOL("SunlightDisable");
-    BOOL local_light_kill = gSavedSettings.getBOOL("LocalLightDisable");
     BOOL ssr = gSavedSettings.getBOOL("RenderScreenSpaceReflections");
 
 	bool has_reflection_probes = gSavedSettings.getBOOL("RenderReflectionsEnabled") && gGLManager.mGLVersion > 3.99f;
 
 	S32 probe_level = llclamp(gSavedSettings.getS32("RenderReflectionProbeLevel"), 0, 3);
 
-    if (ambient_kill)
-    {
-        attribs["AMBIENT_KILL"] = "1";
-    }
-
-    if (sunlight_kill)
-    {
-        attribs["SUNLIGHT_KILL"] = "1";
-    }
-
-    if (local_light_kill)
-    {
-       attribs["LOCAL_LIGHT_KILL"] = "1";
-    }
-
     S32 shadow_detail            = gSavedSettings.getS32("RenderShadowDetail");
 
     if (shadow_detail >= 1)
@@ -911,10 +893,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
     bool use_sun_shadow = mShaderLevel[SHADER_DEFERRED] > 1 && 
         gSavedSettings.getS32("RenderShadowDetail") > 0;
 
-    BOOL ambient_kill = gSavedSettings.getBOOL("AmbientDisable");
-	BOOL sunlight_kill = gSavedSettings.getBOOL("SunlightDisable");
-    BOOL local_light_kill = gSavedSettings.getBOOL("LocalLightDisable");
-
 	if (mShaderLevel[SHADER_DEFERRED] == 0)
 	{
 		gDeferredTreeProgram.unload();
@@ -1145,21 +1123,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 				gDeferredMaterialProgram[i].addPermutation("HAS_SPECULAR_MAP", "1");
 			}
 
-            if (ambient_kill)
-            {
-                gDeferredMaterialProgram[i].addPermutation("AMBIENT_KILL", "1");
-            }
-
-            if (sunlight_kill)
-            {
-                gDeferredMaterialProgram[i].addPermutation("SUNLIGHT_KILL", "1");
-            }
-
-            if (local_light_kill)
-            {
-                gDeferredMaterialProgram[i].addPermutation("LOCAL_LIGHT_KILL", "1");
-            }
-
             gDeferredMaterialProgram[i].addPermutation("DIFFUSE_ALPHA_MODE", llformat("%d", alpha_mode));
 
             if (alpha_mode != 0)
@@ -1248,21 +1211,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
             }
             gDeferredMaterialWaterProgram[i].addPermutation("WATER_FOG","1");
 
-            if (ambient_kill)
-            {
-                gDeferredMaterialWaterProgram[i].addPermutation("AMBIENT_KILL", "1");
-            }
-
-            if (sunlight_kill)
-            {
-                gDeferredMaterialWaterProgram[i].addPermutation("SUNLIGHT_KILL", "1");
-            }
-
-            if (local_light_kill)
-            {
-                gDeferredMaterialWaterProgram[i].addPermutation("LOCAL_LIGHT_KILL", "1");
-            }
-
             gDeferredMaterialWaterProgram[i].mFeatures.hasReflectionProbes = true;
             gDeferredMaterialWaterProgram[i].mFeatures.hasWaterFog = true;
             gDeferredMaterialWaterProgram[i].mFeatures.hasSrgb = true;
@@ -1547,21 +1495,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 
         gDeferredLightProgram.clearPermutations();
 
-        if (ambient_kill)
-        {
-            gDeferredLightProgram.addPermutation("AMBIENT_KILL", "1");
-        }
-
-        if (sunlight_kill)
-        {
-            gDeferredLightProgram.addPermutation("SUNLIGHT_KILL", "1");
-        }
-
-        if (local_light_kill)
-        {
-            gDeferredLightProgram.addPermutation("LOCAL_LIGHT_KILL", "1");
-        }
-
 		success = gDeferredLightProgram.createShader(NULL, NULL);
         llassert(success);
 	}
@@ -1582,21 +1515,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 			gDeferredMultiLightProgram[i].mShaderLevel = mShaderLevel[SHADER_DEFERRED];
 			gDeferredMultiLightProgram[i].addPermutation("LIGHT_COUNT", llformat("%d", i+1));
 
-            if (ambient_kill)
-            {
-                gDeferredMultiLightProgram[i].addPermutation("AMBIENT_KILL", "1");
-            }
-
-            if (sunlight_kill)
-            {
-                gDeferredMultiLightProgram[i].addPermutation("SUNLIGHT_KILL", "1");
-            }
-
-            if (local_light_kill)
-            {
-                gDeferredMultiLightProgram[i].addPermutation("LOCAL_LIGHT_KILL", "1");
-            }
-
 			success = gDeferredMultiLightProgram[i].createShader(NULL, NULL);
             llassert(success);
 		}
@@ -1615,21 +1533,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 		gDeferredSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/spotLightF.glsl", GL_FRAGMENT_SHADER));
 		gDeferredSpotLightProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED];
 
-        if (ambient_kill)
-        {
-            gDeferredSpotLightProgram.addPermutation("AMBIENT_KILL", "1");
-        }
-
-        if (sunlight_kill)
-        {
-            gDeferredSpotLightProgram.addPermutation("SUNLIGHT_KILL", "1");
-        }
-
-        if (local_light_kill)
-        {
-            gDeferredSpotLightProgram.addPermutation("LOCAL_LIGHT_KILL", "1");
-        }
-
 		success = gDeferredSpotLightProgram.createShader(NULL, NULL);
         llassert(success);
 	}
@@ -1642,16 +1545,12 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 		gDeferredMultiSpotLightProgram.mFeatures.hasShadows = true;
 
         gDeferredMultiSpotLightProgram.clearPermutations();
+        gDeferredMultiSpotLightProgram.addPermutation("MULTI_SPOTLIGHT", "1");
 		gDeferredMultiSpotLightProgram.mShaderFiles.clear();
 		gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/multiPointLightV.glsl", GL_VERTEX_SHADER));
-		gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/multiSpotLightF.glsl", GL_FRAGMENT_SHADER));
+		gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/spotLightF.glsl", GL_FRAGMENT_SHADER));
 		gDeferredMultiSpotLightProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED];
 
-        if (local_light_kill)
-        {
-            gDeferredMultiSpotLightProgram.addPermutation("LOCAL_LIGHT_KILL", "1");
-        }
-
 		success = gDeferredMultiSpotLightProgram.createShader(NULL, NULL);
         llassert(success);
 	}
@@ -1757,21 +1656,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
                 shader->addPermutation("HAS_SUN_SHADOW", "1");
             }
 
-            if (ambient_kill)
-            {
-                shader->addPermutation("AMBIENT_KILL", "1");
-            }
-
-            if (sunlight_kill)
-            {
-                shader->addPermutation("SUNLIGHT_KILL", "1");
-            }
-
-            if (local_light_kill)
-            {
-                shader->addPermutation("LOCAL_LIGHT_KILL", "1");
-            }
-
             if (rigged)
             {
                 shader->addPermutation("HAS_SKIN", "1");
@@ -1895,21 +1779,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
                 shader[i]->addPermutation("HAS_SUN_SHADOW", "1");
             }
 
-            if (ambient_kill)
-            {
-                shader[i]->addPermutation("AMBIENT_KILL", "1");
-            }
-
-            if (sunlight_kill)
-            {
-                shader[i]->addPermutation("SUNLIGHT_KILL", "1");
-            }
-
-            if (local_light_kill)
-            {
-                shader[i]->addPermutation("LOCAL_LIGHT_KILL", "1");
-            }
-
             if (i == 1)
             { // rigged variant
                 shader[i]->mFeatures.hasObjectSkinning = true;
@@ -2205,21 +2074,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
             gDeferredSoftenProgram.addPermutation("HAS_SUN_SHADOW", "1");
         }
 
-        if (ambient_kill)
-        {
-            gDeferredSoftenProgram.addPermutation("AMBIENT_KILL", "1");
-        }
-
-        if (sunlight_kill)
-        {
-            gDeferredSoftenProgram.addPermutation("SUNLIGHT_KILL", "1");
-        }
-
-        if (local_light_kill)
-        {
-            gDeferredSoftenProgram.addPermutation("LOCAL_LIGHT_KILL", "1");
-        }
-
 		if (gSavedSettings.getBOOL("RenderDeferredSSAO"))
 		{ //if using SSAO, take screen space light map into account as if shadows are enabled
 			gDeferredSoftenProgram.mShaderLevel = llmax(gDeferredSoftenProgram.mShaderLevel, 2);
@@ -2255,21 +2109,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
             gDeferredSoftenWaterProgram.addPermutation("HAS_SUN_SHADOW", "1");
         }
 
-        if (ambient_kill)
-        {
-            gDeferredSoftenWaterProgram.addPermutation("AMBIENT_KILL", "1");
-        }
-
-        if (sunlight_kill)
-        {
-            gDeferredSoftenWaterProgram.addPermutation("SUNLIGHT_KILL", "1");
-        }
-
-        if (local_light_kill)
-        {
-            gDeferredSoftenWaterProgram.addPermutation("LOCAL_LIGHT_KILL", "1");
-        }
-
 		if (gSavedSettings.getBOOL("RenderDeferredSSAO"))
 		{ //if using SSAO, take screen space light map into account as if shadows are enabled
 			gDeferredSoftenWaterProgram.mShaderLevel = llmax(gDeferredSoftenWaterProgram.mShaderLevel, 2);
@@ -2505,20 +2344,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 			gDeferredAvatarAlphaProgram.addPermutation("HAS_SUN_SHADOW", "1");
 		}
 
-        if (ambient_kill)
-        {
-            gDeferredAvatarAlphaProgram.addPermutation("AMBIENT_KILL", "1");
-        }
-
-        if (sunlight_kill)
-        {
-            gDeferredAvatarAlphaProgram.addPermutation("SUNLIGHT_KILL", "1");
-        }
-
-        if (local_light_kill)
-        {
-            gDeferredAvatarAlphaProgram.addPermutation("LOCAL_LIGHT_KILL", "1");
-        }
 		gDeferredAvatarAlphaProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED];
 
 		success = gDeferredAvatarAlphaProgram.createShader(NULL, NULL);
-- 
cgit v1.2.3


From 5431ad7e567c0bbdf5dcf0efbed4c4a59fee3c29 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 11 Oct 2023 14:57:35 -0500
Subject: SL-20440 Followup -- remove UI for decrufted LOCAL_LIGHT_KILL et al.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 30 ----------------------
 1 file changed, 30 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e254ae8859..8b39ea192b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3229,36 +3229,6 @@ function="World.EnvPreset"
                  function="ToggleControl"
                  parameter="TextureDisable" />
             </menu_item_check>
-            <menu_item_check
-              label="Disable Ambient"
-             name="Disable Ambient">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="AmbientDisable" />
-            <menu_item_check.on_click
-             function="ToggleShaderControl"
-             parameter="AmbientDisable" />
-          </menu_item_check>
-          <menu_item_check
-             label="Disable Sunlight"
-             name="Disable Sunlight">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="SunlightDisable" />
-            <menu_item_check.on_click
-             function="ToggleShaderControl"
-             parameter="SunlightDisable" />
-          </menu_item_check>
-          <menu_item_check
-             label="Disable Local Lights"
-             name="Disable Local Lights">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="LocalLightDisable" />
-            <menu_item_check.on_click
-             function="ToggleShaderControl"
-             parameter="LocalLightDisable" />
-          </menu_item_check>
             <menu_item_check
               label="Full Res Textures"
              name="Rull Res Textures">
-- 
cgit v1.2.3


From ede7b04f87806278ab7615f90958b9e7b2ff9584 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 11 Oct 2023 15:25:43 -0500
Subject: SL-20440 Followup -- fix for non-normalized vector and balance PBR
 spotlight with legacy spotlight

---
 indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
index 357f3b6e3b..d31b37fb60 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
@@ -164,18 +164,19 @@ void main()
             float lit = 0.0;
             float amb_da = 0.0;
 
+            lv = normalize(lv);
+
             if (nl > 0.0)
             {
                 amb_da += (nl*0.5 + 0.5) * proj_ambiance;
                 
                 dlit = getProjectedLightDiffuseColor( l_dist, proj_tc.xy );
 
-                vec3 intensity = dist_atten * dlit * 3.9 * shadow; // Legacy attenuation, magic number to balance with legacy materials
-                lv = normalize(lv);
+                vec3 intensity = dist_atten * dlit * 3.25 * shadow; // Legacy attenuation, magic number to balance with legacy materials
                 final_color += intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, lv);
             }
 
-            amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
+            amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy ) * 3.25; //magic number to balance with legacy ambiance
             final_color += amb_rgb * pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, -lv);
         }
     }
-- 
cgit v1.2.3


From 0d47ea31e38601683ef7351300950ec075cc35dd Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 11 Oct 2023 15:55:12 -0500
Subject: SL-20440 Followup -- balance PBR point light with legacy point light

---
 .../newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl  | 2 +-
 indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl
index dbccfa8597..ec8168465e 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/multiPointLightF.glsl
@@ -114,7 +114,7 @@ void main()
 
                 float dist_atten = calcLegacyDistanceAttenuation(dist, falloff);
 
-                vec3 intensity = dist_atten * lightColor * 3.9;
+                vec3 intensity = dist_atten * lightColor * 3.25;
 
                 final_color += intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, lv);
             }
diff --git a/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl
index 210e944e45..31af1208bd 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/pointLightF.glsl
@@ -106,7 +106,7 @@ void main()
 
         vec3 specularColor = mix(f0, baseColor.rgb, metallic);
 
-        vec3 intensity = dist_atten * color * 3.9; // Legacy attenuation, magic number to balance with legacy materials
+        vec3 intensity = dist_atten * color * 3.25; // Legacy attenuation, magic number to balance with legacy materials
         final_color += intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, normalize(lv));
     }
     else
-- 
cgit v1.2.3


From 68cf572514415bcd7ff014ae728c376b8928c159 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 11 Oct 2023 15:17:42 -0700
Subject: SL-20450: Fix missing LSL keyword INVENTORY_MATERIAL

---
 indra/newview/app_settings/keywords.ini             | 1 +
 indra/newview/app_settings/keywords_lsl_default.xml | 9 +++++++++
 2 files changed, 10 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 9699eda96b..4e177ab518 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -274,6 +274,7 @@ INVENTORY_NOTECARD	Passed to task inventory library functions to reference notec
 INVENTORY_BODYPART	Passed to task inventory library functions to reference body parts
 INVENTORY_ANIMATION	Passed to task inventory library functions to reference animations
 INVENTORY_GESTURE	Passed to task inventory library functions to reference gestures
+INVENTORY_MATERIAL	Passed to task inventory library functions to reference materials
 INVENTORY_ALL		Passed to task inventory library functions to reference all inventory items
 INVENTORY_NONE		Returned by llGetInventoryType when no item is found
 
diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index d641883d5a..893b017367 100644
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -1963,6 +1963,15 @@
             <key>tooltip</key>
             <string/>
          </map>
+         <key>INVENTORY_MATERIAL</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>57</integer>
+            <key>tooltip</key>
+            <string/>
+         </map>
          <key>JSON_APPEND</key>
          <map>
             <key>type</key>
-- 
cgit v1.2.3


From ea67abf78fad1c924659305296c51b2af99b0793 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 12 Oct 2023 18:12:05 +0300
Subject: SL-20437 Make the "Unable to load material" message a modal
 notification.

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 812716ac7f..f2473e98d3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6978,12 +6978,15 @@ Please try again.
   </notification>
 
   <notification
-   icon="notifytip.tga"
+   icon="alertmodal.tga"
    name="UnableToLoadMaterial"
-   type="notifytip">
-    Unable to load material.
-    Please try again.
+   type="alertmodal">
+Unable to load material.
+Please try again.
     <tag>fail</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 07a830a4cef1ccc600f8c4dc5e4fcdba83df839b Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Thu, 12 Oct 2023 13:02:23 -0700
Subject: SL-20062: Fix near clip on reflection probes being clamped to at or
 below 10

---
 indra/llmath/llcamera.h           | 2 +-
 indra/llprimitive/llprimitive.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h
index 27eaa614c9..c4d04f5d02 100644
--- a/indra/llmath/llcamera.h
+++ b/indra/llmath/llcamera.h
@@ -39,7 +39,7 @@ const F32 DEFAULT_NEAR_PLANE 		= 0.25f;
 const F32 DEFAULT_FAR_PLANE 		= 64.f;	// far reaches across two horizontal, not diagonal, regions
 
 const F32 MAX_ASPECT_RATIO 	= 50.0f;
-const F32 MAX_NEAR_PLANE 	= 10.f;
+const F32 MAX_NEAR_PLANE 	= 1023.9f; // Clamp the near plane just before the skybox ends
 const F32 MAX_FAR_PLANE 	= 100000.0f; //1000000.0f; // Max allowed. Not good Z precision though.
 const F32 MAX_FAR_CLIP		= 512.0f;
 
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 5dfce4ae16..350d84ae6c 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -85,6 +85,8 @@ const F32 LIGHT_MAX_CUTOFF = 180.f;
 const F32 REFLECTION_PROBE_MIN_AMBIANCE = 0.f;
 const F32 REFLECTION_PROBE_MAX_AMBIANCE = 100.f;
 const F32 REFLECTION_PROBE_DEFAULT_AMBIANCE = 0.f;
+// *NOTE: Clip distances are clamped in LLCamera::setNear. The max clip
+// distance is currently limited by the skybox
 const F32 REFLECTION_PROBE_MIN_CLIP_DISTANCE = 0.f;
 const F32 REFLECTION_PROBE_MAX_CLIP_DISTANCE = 1024.f;
 const F32 REFLECTION_PROBE_DEFAULT_CLIP_DISTANCE = 0.f;
-- 
cgit v1.2.3


From 66da7af77c999c099f8b44e59fcace87af8ead30 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 12 Oct 2023 21:05:59 +0300
Subject: SL-20453 Fix dupplicate items in menu

Cleanup. Caused by a merge of main(D567) into D559
---
 .../skins/default/xui/en/menu_inventory.xml        | 287 +--------------------
 1 file changed, 8 insertions(+), 279 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 641078e822..1907dc2438 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -466,285 +466,6 @@
          function="Inventory.DoToSelected"
          parameter="delete_system_folder" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft"
-     name="Create Separator" />
-    <menu_item_call
-     label="New Folder"
-     layout="topleft"
-     name="New Folder">
-      <menu_item_call.on_click
-       function="Inventory.DoCreate"
-       parameter="category" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Outfit"
-     layout="topleft"
-     name="New Outfit">
-      <menu_item_call.on_click
-       function="Inventory.DoCreate"
-       parameter="outfit" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Script"
-     layout="topleft"
-     name="New Script">
-      <menu_item_call.on_click
-       function="Inventory.DoCreate"
-       parameter="lsl" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Notecard"
-     layout="topleft"
-     name="New Note">
-      <menu_item_call.on_click
-       function="Inventory.DoCreate"
-       parameter="notecard" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Gesture"
-     layout="topleft"
-     name="New Gesture">
-      <menu_item_call.on_click
-       function="Inventory.DoCreate"
-       parameter="gesture" />
-    </menu_item_call>
-    <menu_item_call
-       label="New Material"
-       layout="topleft"
-       name="New Material">
-      <menu_item_call.on_click
-       function="Inventory.DoCreate"
-       parameter="material" />
-      <menu_item_call.on_enable
-              function="Inventory.MaterialsEnabled" />
-    </menu_item_call>
-    <menu
-     label="New Clothes"
-     layout="topleft"
-     name="New Clothes">
-      <menu_item_call
-       label="New Shirt"
-       layout="topleft"
-       name="New Shirt">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="shirt" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Pants"
-       layout="topleft"
-       name="New Pants">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="pants" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Shoes"
-       layout="topleft"
-       name="New Shoes">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="shoes" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Socks"
-       layout="topleft"
-       name="New Socks">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="socks" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Jacket"
-       layout="topleft"
-       name="New Jacket">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="jacket" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Skirt"
-       layout="topleft"
-       name="New Skirt">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="skirt" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Gloves"
-       layout="topleft"
-       name="New Gloves">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="gloves" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Undershirt"
-       layout="topleft"
-       name="New Undershirt">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="undershirt" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Underpants"
-       layout="topleft"
-       name="New Underpants">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="underpants" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Alpha Mask"
-       layout="topleft"
-       name="New Alpha Mask">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="alpha" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Tattoo"
-       layout="topleft"
-       name="New Tattoo">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="tattoo" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Universal"
-       layout="topleft"
-       name="New Universal">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="universal" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Physics"
-       layout="topleft"
-       name="New Physics">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="physics" />
-      </menu_item_call>
-    </menu>
-    <menu
-     label="New Body Parts"
-     layout="topleft"
-     name="New Body Parts">
-      <menu_item_call
-       label="New Shape"
-       layout="topleft"
-       name="New Shape">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="shape" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Skin"
-       layout="topleft"
-       name="New Skin">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="skin" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Hair"
-       layout="topleft"
-       name="New Hair">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="hair" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Eyes"
-       layout="topleft"
-       name="New Eyes">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="eyes" />
-      </menu_item_call>
-    </menu>
-    <menu
-     label="New Settings"
-     layout="topleft"
-     name="New Settings">
-      <menu_item_call
-       label="New Sky"
-       layout="topleft"
-       name="New Sky">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="sky"/>
-        <menu_item_call.on_enable
-                function="Inventory.EnvironmentEnabled" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Water"
-       layout="topleft"
-       name="New Water">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="water"/>
-        <menu_item_call.on_enable
-                function="Inventory.EnvironmentEnabled" />
-      </menu_item_call>
-      <menu_item_call
-       label="New Day Cycle"
-       layout="topleft"
-       name="New Day Cycle">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="daycycle"/>
-        <menu_item_call.on_enable
-                function="Inventory.EnvironmentEnabled" />
-      </menu_item_call>
-    </menu>
-    <menu
-     label="Use as default for"
-     layout="topleft"
-     name="upload_def">
-      <menu_item_call
-       label="Image uploads"
-       layout="topleft"
-       name="Image uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="texture" />
-      </menu_item_call>
-      <menu_item_call
-       label="Sound uploads"
-       layout="topleft"
-       name="Sound uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="sound" />
-      </menu_item_call>
-      <menu_item_call
-       label="Animation uploads"
-       layout="topleft"
-       name="Animation uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="animation" />
-      </menu_item_call>
-      <menu_item_call
-       label="Model uploads"
-       layout="topleft"
-       name="Model uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="model" />
-      </menu_item_call>
-      <menu_item_call
-       label="PBR material uploads"
-       layout="topleft"
-       name="PBR uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="pbr_material" />
-      </menu_item_call>
-    </menu>
     <menu_item_separator
      layout="topleft" />
     <menu_item_separator
@@ -1030,6 +751,14 @@
      function="Inventory.FileUploadLocation"
      parameter="model" />
     </menu_item_call>
+    <menu_item_call
+     label="PBR material uploads"
+     layout="topleft"
+     name="PBR uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="pbr_material" />
+    </menu_item_call>
   </menu>
 	<menu_item_separator
 	 layout="topleft"
-- 
cgit v1.2.3